[65973] trunk/dports/net/squid3

[jmr at macports.org]

Revision: 65973
          http://trac.macports.org/changeset/65973
Author:   jmr at macports.org
Date:     2010-04-04 00:00:26 -0700 (Sun, 04 Apr 2010)
Log Message:
-----------
squid3: update to 3.1.1

Modified Paths:
--------------
    trunk/dports/net/squid3/Portfile
    trunk/dports/net/squid3/files/patch-cf.data.pre.diff

Modified: trunk/dports/net/squid3/Portfile
===================================================================
--- trunk/dports/net/squid3/Portfile	2010-04-04 02:54:44 UTC (rev 65972)
+++ trunk/dports/net/squid3/Portfile	2010-04-04 07:00:26 UTC (rev 65973)
@@ -4,7 +4,7 @@
 PortSystem 1.0
 
 name            squid3
-version         3.0.STABLE25
+version         3.1.1
 set branch      [join [lrange [split ${version} .] 0 1] .]
 categories      net
 platforms       darwin
@@ -31,9 +31,9 @@
                 ftp://ftp.squid-cache.org/pub/squid/
 
 distname        squid-${version}
-checksums       md5 6a29be1e4900470aebe93654f9be03e0 \
-                sha1 18306a6dc370930dfbea24674588053e62c13b97 \
-                rmd160 5c10c082335bf707f931cd1ec99647683ba17f3f
+checksums       md5 4316f396d9134049c775c16dc5cf297c \
+                sha1 a8dda19f5ed14db2d53061b71b9866e765d629fc \
+                rmd160 a2a86da42482e6dc8573c7f0eac2e644afb59af5
 
 use_bzip2       yes
 patchfiles      patch-cf.data.pre.diff \
@@ -44,32 +44,32 @@
 
 conflicts       squid
 
-configure.args  --with-pthreads \
-                --enable-shared \
-                --mandir=${prefix}/share/man \
+configure.args  --mandir=${prefix}/share/man \
                 --sysconfdir=${prefix}/etc/squid \
                 --datadir=${prefix}/share/squid \
                 --localstatedir=${prefix}/var/squid \
                 --libexecdir=${prefix}/libexec/squid \
+                --with-pidfile=${prefix}/var/run/squid/squid.pid \
                 --with-openssl=${prefix} \
+                --disable-ipv6 \
                 --enable-delay-pools \
+                --enable-zph-qos \
                 --enable-removal-policies \
-                --enable-storeio=ufs,aufs,diskd,null \
+                --enable-storeio=ufs,aufs,diskd \
                 --enable-disk-io=AIO,Blocking,DiskDaemon,DiskThreads \
                 --enable-icap-client \
                 --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-ntlm-auth-helpers=smb_lm,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
+                --enable-basic-auth-helpers=DB,LDAP,MSNT,NCSA,PAM,POP3,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"
     }
 }
 
-build.args      DEFAULT_PID_FILE=${prefix}/var/run/squid/squid.pid
 use_parallel_build  yes
 
 startupitem.create      yes
@@ -96,7 +96,8 @@
     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/msntauth.conf
+                       ${destroot}${prefix}/etc/squid/msntauth.conf \
+                       ${destroot}${prefix}/etc/squid/errorpage.css
 }
 destroot.keepdirs   ${destroot}${prefix}/var/run/squid \
                 ${destroot}${prefix}/var/squid/cache \
@@ -104,7 +105,7 @@
 
 post-activate {
     # Make sure initial conf files are present and setup correctly
-    foreach f { squid.conf mime.conf cachemgr.conf msntauth.conf } {
+    foreach f { squid.conf mime.conf cachemgr.conf msntauth.conf errorpage.css } {
         if {![file exists ${prefix}/etc/squid/${f}]} {
             file copy ${prefix}/etc/squid/${f}.default \
                 ${prefix}/etc/squid/${f}
@@ -122,4 +123,4 @@
 
 livecheck.type  regex
 livecheck.url   http://www.squid-cache.org/Versions/v3/${branch}/
-livecheck.regex squid-(${branch}\\.STABLE\[0-9\\.\]+)-RELEASENOTES
+livecheck.regex "<a href=\"RELEASENOTES\\.html\">squid-(3\[0-9.\]+)</a>"

Modified: trunk/dports/net/squid3/files/patch-cf.data.pre.diff
===================================================================
--- trunk/dports/net/squid3/files/patch-cf.data.pre.diff	2010-04-04 02:54:44 UTC (rev 65972)
+++ trunk/dports/net/squid3/files/patch-cf.data.pre.diff	2010-04-04 07:00:26 UTC (rev 65973)
@@ -1,13 +1,15 @@
 --- src/cf.data.pre	2005-10-20 19:28:08.000000000 +0200
 +++ src/cf.data.pre	2008-05-29 22:35:11.000000000 +1000
-@@ -715,10 +715,10 @@
+@@ -855,12 +855,12 @@
  # We strongly recommend the following be uncommented to protect innocent
  # web applications running on the proxy server who think the only
  # one who can access services on "localhost" is a local user
 -#http_access deny to_localhost
 +http_access deny to_localhost
+ 
  #
  # INSERT YOUR OWN RULE(S) HERE TO ALLOW ACCESS FROM YOUR CLIENTS
+ #
 -
 +http_access allow localhost
  # Example rule allowing access from your local networks.
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20100404/a2b81d59/attachment.html>