[61695] trunk/dports/net/squid3

[jmr at macports.org]

Revision: 61695
          http://trac.macports.org/changeset/61695
Author:   jmr at macports.org
Date:     2009-12-18 17:30:38 -0800 (Fri, 18 Dec 2009)
Log Message:
-----------
squid3: enable auth helpers

Modified Paths:
--------------
    trunk/dports/net/squid3/Portfile

Added Paths:
-----------
    trunk/dports/net/squid3/files/patch-pam_auth.c.diff

Modified: trunk/dports/net/squid3/Portfile
===================================================================
--- trunk/dports/net/squid3/Portfile	2009-12-19 01:21:31 UTC (rev 61694)
+++ trunk/dports/net/squid3/Portfile	2009-12-19 01:30:38 UTC (rev 61695)
@@ -6,6 +6,7 @@
 name            squid3
 version         3.0.STABLE20
 set branch      [join [lrange [split ${version} .] 0 1] .]
+revision        1
 categories      net
 platforms       darwin
 license         GPLv2+
@@ -36,7 +37,9 @@
                 rmd160 dbdcbab1abb068aa64c98492c01ebb26dd6be328
 
 use_bzip2       yes
-patchfiles      patch-cf.data.pre.diff patch-include_squid_types.h.diff
+patchfiles      patch-cf.data.pre.diff \
+                patch-include_squid_types.h.diff \
+                patch-pam_auth.c.diff
 
 depends_lib     port:openssl port:zlib
 
@@ -48,13 +51,19 @@
                 --sysconfdir=${prefix}/etc/squid \
                 --datadir=${prefix}/share/squid \
                 --localstatedir=${prefix}/var/squid \
+                --libexecdir=${prefix}/libexec/squid \
                 --with-openssl=${prefix} \
                 --enable-delay-pools \
                 --enable-removal-policies \
                 --enable-storeio=ufs,aufs,diskd,null \
                 --enable-disk-io=AIO,Blocking,DiskDaemon,DiskThreads \
                 --enable-icap-client \
-                --with-default-user=squid
+                --with-default-user=squid \
+                --enable-auth=negotiate,ntlm,digest,basic \
+                --enable-negotiate-auth-helpers=squid_kerb_auth \
+                --enable-ntlm-auth-helpers=SMB,fakeauth,no_check \
+                --enable-digest-auth-helpers=eDirectory,ldap,password \
+                --enable-basic-auth-helpers=DB,LDAP,MSNT,NCSA,PAM,POP3,SASL,SMB,YP,getpwnam,multi-domain-NTLM,squid_radius_auth
 post-configure {
     if {[variant_isset universal]} {
         system "cd ${worksrcpath} && ed - ${worksrcpath}/include/autoconf.h < ${filespath}/include_autoconf.h.ed && touch include/stamp-h1"
@@ -82,14 +91,13 @@
     adduser squid gid=${gid} realname=Squid\ Proxy home=${prefix}/var/squid
 }
 post-destroot   {
-    reinplace "s|/etc/squid|${prefix}/etc/squid|g" \
-        ${destroot}${prefix}/share/man/man8/squid.8
     xinstall -o squid -g squid -m 755 -d \
         ${destroot}${prefix}/var/run/squid ${destroot}${prefix}/var/squid \
         ${destroot}${prefix}/var/squid/cache ${destroot}${prefix}/var/squid/logs
     file delete -force ${destroot}${prefix}/etc/squid/squid.conf \
                        ${destroot}${prefix}/etc/squid/mime.conf \
-                       ${destroot}${prefix}/etc/squid/cachemgr.conf
+                       ${destroot}${prefix}/etc/squid/cachemgr.conf \
+                       ${destroot}${prefix}/etc/squid/msntauth.conf
 }
 destroot.keepdirs   ${destroot}${prefix}/var/run/squid \
                 ${destroot}${prefix}/var/squid/cache \
@@ -97,7 +105,7 @@
 
 post-activate {
     # Make sure initial conf files are present and setup correctly
-    foreach f { squid.conf mime.conf cachemgr.conf } {
+    foreach f { squid.conf mime.conf cachemgr.conf msntauth.conf } {
         if {![file exists ${prefix}/etc/squid/${f}]} {
             file copy ${prefix}/etc/squid/${f}.default \
                 ${prefix}/etc/squid/${f}

Added: trunk/dports/net/squid3/files/patch-pam_auth.c.diff
===================================================================
--- trunk/dports/net/squid3/files/patch-pam_auth.c.diff	                        (rev 0)
+++ trunk/dports/net/squid3/files/patch-pam_auth.c.diff	2009-12-19 01:30:38 UTC (rev 61695)
@@ -0,0 +1,14 @@
+--- helpers/basic_auth/PAM/pam_auth.c.orig	2009-10-29 21:05:38.000000000 +1100
++++ helpers/basic_auth/PAM/pam_auth.c	2009-12-19 11:56:26.000000000 +1100
+@@ -73,7 +73,11 @@
+ #include <time.h>
+ #include <unistd.h>
+ 
++#if defined(__MAC_OS_X_VERSION_MIN_REQUIRED) && __MAC_OS_X_VERSION_MIN_REQUIRED < 1060
++#include <pam/pam_appl.h>
++#else
+ #include <security/pam_appl.h>
++#endif
+ 
+ #define BUFSIZE 8192
+ 
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20091218/6fe6ccfd/attachment.html>