[96680] trunk/dports/net/squid3
jmr at macports.org
jmr at macports.org
Fri Aug 17 03:30:13 PDT 2012
Revision: 96680
https://trac.macports.org/changeset/96680
Author: jmr at macports.org
Date: 2012-08-17 03:30:12 -0700 (Fri, 17 Aug 2012)
Log Message:
-----------
squid3: update to 3.2.1
Modified Paths:
--------------
trunk/dports/net/squid3/Portfile
Added Paths:
-----------
trunk/dports/net/squid3/files/patch-basic_pam_auth.cc.diff
trunk/dports/net/squid3/files/patch-compat_types.h.diff
trunk/dports/net/squid3/files/patch-configure.diff
Removed Paths:
-------------
trunk/dports/net/squid3/files/patch-include_squid_types.h.diff
trunk/dports/net/squid3/files/patch-pam_auth.c.diff
trunk/dports/net/squid3/files/patch-src_ssl_gadgets.cc.diff
Modified: trunk/dports/net/squid3/Portfile
===================================================================
--- trunk/dports/net/squid3/Portfile 2012-08-17 10:29:03 UTC (rev 96679)
+++ trunk/dports/net/squid3/Portfile 2012-08-17 10:30:12 UTC (rev 96680)
@@ -4,7 +4,7 @@
PortSystem 1.0
name squid3
-version 3.1.20
+version 3.2.1
set branch [join [lrange [split ${version} .] 0 1] .]
categories net
platforms darwin
@@ -21,8 +21,7 @@
implements negative caching of failed requests.
homepage http://www.squid-cache.org/
-master_sites http://mirrors.24-7-solutions.net/pub/squid/ \
- http://mirror.aarnet.edu.au/pub/squid/squid/ \
+master_sites http://mirror.aarnet.edu.au/pub/squid/squid/ \
http://www.mirrorservice.org/sites/ftp.squid-cache.org/pub/squid/ \
http://ftp.ring.gr.jp/archives/net/www/squid/ \
ftp://ftp.is.co.za/pub/squid/ \
@@ -31,15 +30,15 @@
ftp://ftp.squid-cache.org/pub/squid/
distname squid-${version}
-checksums md5 c4d733a383c0508fd0746d64a2d7278a \
- sha1 caa8e65f5720dfd1bc4160946cdb86d9b23c20ab \
- rmd160 35442cc00d3ea3f0dd15128aaf58ee5c16152532
+checksums md5 929f7a3988fe63ec188d2ad920d92d82 \
+ sha1 896b50960c2ae327966b8c3715f3e73be9e4b24a \
+ rmd160 3e1a30e06c51b4be349559e7274d2f241e4254f7
use_bzip2 yes
patchfiles patch-cf.data.pre.diff \
- patch-include_squid_types.h.diff \
- patch-pam_auth.c.diff \
- patch-src_ssl_gadgets.cc.diff
+ patch-compat_types.h.diff \
+ patch-basic_pam_auth.cc.diff \
+ patch-configure.diff
depends_lib port:zlib
@@ -54,7 +53,6 @@
--libexecdir=${prefix}/libexec/squid \
--with-pidfile=${pidfile} \
--disable-strict-error-checking \
- --disable-ipv6 \
--disable-loadable-modules \
--enable-delay-pools \
--enable-zph-qos \
@@ -62,12 +60,13 @@
--enable-storeio=ufs,aufs,diskd \
--enable-disk-io=AIO,Blocking,DiskDaemon,DiskThreads \
--enable-icap-client \
+ --enable-log-daemon-helpers \
--with-default-user=squid \
- --enable-auth=negotiate,ntlm,digest,basic \
- --enable-negotiate-auth-helpers=squid_kerb_auth \
- --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,SMB,YP,getpwnam,multi-domain-NTLM,squid_radius_auth
+ --enable-auth \
+ --enable-auth-basic \
+ --enable-auth-digest \
+ --enable-auth-negotiate \
+ --enable-auth-ntlm
post-configure {
if {[variant_isset universal]} {
system "cd ${worksrcpath} && ed - ${worksrcpath}/include/autoconf.h < ${filespath}/include_autoconf.h.ed && touch include/stamp-h1"
Copied: trunk/dports/net/squid3/files/patch-basic_pam_auth.cc.diff (from rev 96670, trunk/dports/net/squid3/files/patch-pam_auth.c.diff)
===================================================================
--- trunk/dports/net/squid3/files/patch-basic_pam_auth.cc.diff (rev 0)
+++ trunk/dports/net/squid3/files/patch-basic_pam_auth.cc.diff 2012-08-17 10:30:12 UTC (rev 96680)
@@ -0,0 +1,14 @@
+--- helpers/basic_auth/PAM/basic_pam_auth.cc.orig 2012-08-15 13:24:19.000000000 +1000
++++ helpers/basic_auth/PAM/basic_pam_auth.cc 2012-08-17 16:54:29.000000000 +1000
+@@ -90,6 +90,11 @@
+ #endif
+ #if HAVE_SECURITY_PAM_APPL_H
+ #include <security/pam_appl.h>
++#elif defined(__APPLE__)
++#include <AvailabilityMacros.h>
++#if defined(MAC_OS_X_VERSION_MIN_REQUIRED) && MAC_OS_X_VERSION_MIN_REQUIRED < 1060
++#include <pam/pam_appl.h>
++#endif
+ #endif
+
+ /* The default PAM service name */
Copied: trunk/dports/net/squid3/files/patch-compat_types.h.diff (from rev 96670, trunk/dports/net/squid3/files/patch-include_squid_types.h.diff)
===================================================================
--- trunk/dports/net/squid3/files/patch-compat_types.h.diff (rev 0)
+++ trunk/dports/net/squid3/files/patch-compat_types.h.diff 2012-08-17 10:30:12 UTC (rev 96680)
@@ -0,0 +1,20 @@
+--- compat/types.h.orig 2009-08-04 21:57:45.000000000 +1000
++++ compat/types.h 2009-08-09 11:34:31.000000000 +1000
+@@ -95,7 +95,7 @@
+ #ifndef PRId64
+ #if _SQUID_MSWIN_ /* Windows native port using MSVCRT */
+ #define PRId64 "I64d"
+-#elif SIZEOF_INT64_T > SIZEOF_LONG
++#elif SIZEOF_INT64_T >= SIZEOF_LONG
+ #define PRId64 "lld"
+ #else
+ #define PRId64 "ld"
+@@ -105,7 +105,7 @@
+ #ifndef PRIu64
+ #if _SQUID_MSWIN_ /* Windows native port using MSVCRT */
+ #define PRIu64 "I64u"
+-#elif SIZEOF_INT64_T > SIZEOF_LONG
++#elif SIZEOF_INT64_T >= SIZEOF_LONG
+ #define PRIu64 "llu"
+ #else
+ #define PRIu64 "lu"
Added: trunk/dports/net/squid3/files/patch-configure.diff
===================================================================
--- trunk/dports/net/squid3/files/patch-configure.diff (rev 0)
+++ trunk/dports/net/squid3/files/patch-configure.diff 2012-08-17 10:30:12 UTC (rev 96680)
@@ -0,0 +1,10 @@
+--- configure.orig 2012-08-15 13:25:31.000000000 +1000
++++ configure 2012-08-17 19:53:32.000000000 +1000
+@@ -26716,6 +26716,7 @@
+ else
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+ /* end confdefs.h. */
++#define HAVE_SETRLIMIT 1
+
+ #include <stdio.h>
+ #include <unistd.h>
Deleted: trunk/dports/net/squid3/files/patch-include_squid_types.h.diff
===================================================================
--- trunk/dports/net/squid3/files/patch-include_squid_types.h.diff 2012-08-17 10:29:03 UTC (rev 96679)
+++ trunk/dports/net/squid3/files/patch-include_squid_types.h.diff 2012-08-17 10:30:12 UTC (rev 96680)
@@ -1,20 +0,0 @@
---- include/squid_types.h.orig 2009-08-04 21:57:45.000000000 +1000
-+++ include/squid_types.h 2009-08-09 11:34:31.000000000 +1000
-@@ -86,7 +86,7 @@
- #ifndef PRId64
- #ifdef _SQUID_MSWIN_ /* Windows native port using MSVCRT */
- #define PRId64 "I64d"
--#elif SIZEOF_INT64_T > SIZEOF_LONG
-+#elif SIZEOF_INT64_T >= SIZEOF_LONG
- #define PRId64 "lld"
- #else
- #define PRId64 "ld"
-@@ -96,7 +96,7 @@
- #ifndef PRIu64
- #ifdef _SQUID_MSWIN_ /* Windows native port using MSVCRT */
- #define PRIu64 "I64u"
--#elif SIZEOF_INT64_T > SIZEOF_LONG
-+#elif SIZEOF_INT64_T >= SIZEOF_LONG
- #define PRIu64 "llu"
- #else
- #define PRIu64 "lu"
Deleted: trunk/dports/net/squid3/files/patch-pam_auth.c.diff
===================================================================
--- trunk/dports/net/squid3/files/patch-pam_auth.c.diff 2012-08-17 10:29:03 UTC (rev 96679)
+++ trunk/dports/net/squid3/files/patch-pam_auth.c.diff 2012-08-17 10:30:12 UTC (rev 96680)
@@ -1,18 +0,0 @@
---- 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,15 @@
- #include <time.h>
- #include <unistd.h>
-
-+#if defined(__APPLE__)
-+#include <AvailabilityMacros.h>
-+#endif
-+
-+#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
-
Deleted: trunk/dports/net/squid3/files/patch-src_ssl_gadgets.cc.diff
===================================================================
--- trunk/dports/net/squid3/files/patch-src_ssl_gadgets.cc.diff 2012-08-17 10:29:03 UTC (rev 96679)
+++ trunk/dports/net/squid3/files/patch-src_ssl_gadgets.cc.diff 2012-08-17 10:30:12 UTC (rev 96680)
@@ -1,11 +0,0 @@
---- src/ssl/gadgets.cc.orig 2011-08-28 17:53:14.000000000 +1000
-+++ src/ssl/gadgets.cc 2011-09-09 03:23:29.000000000 +1000
-@@ -2,7 +2,7 @@
- * $Id$
- */
-
--#include "config.h"
-+#include <config.h>
- #include "ssl/gadgets.h"
-
- /**
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20120817/ec7cac1a/attachment-0001.html>
More information about the macports-changes
mailing list