[133180] trunk/dports/net/squid3
jmr at macports.org
jmr at macports.org
Mon Feb 23 03:59:54 PST 2015
Revision: 133180
https://trac.macports.org/changeset/133180
Author: jmr at macports.org
Date: 2015-02-23 03:59:53 -0800 (Mon, 23 Feb 2015)
Log Message:
-----------
squid3: update to 3.5.2
Modified Paths:
--------------
trunk/dports/net/squid3/Portfile
trunk/dports/net/squid3/files/patch-cf.data.pre.diff
Added Paths:
-----------
trunk/dports/net/squid3/files/Segment.cc.diff
Modified: trunk/dports/net/squid3/Portfile
===================================================================
--- trunk/dports/net/squid3/Portfile 2015-02-23 09:39:27 UTC (rev 133179)
+++ trunk/dports/net/squid3/Portfile 2015-02-23 11:59:53 UTC (rev 133180)
@@ -5,7 +5,7 @@
PortGroup compiler_blacklist_versions 1.0
name squid3
-version 3.4.11
+version 3.5.2
set branch [join [lrange [split ${version} .] 0 1] .]
categories net
platforms darwin
@@ -32,13 +32,14 @@
distname squid-${version}
use_xz yes
-checksums md5 e79ddb108d24823da8c1dbc0fc4a31fb \
- sha1 7de0949714cda4d3f19073aa846f00768a6f841b \
- rmd160 f8d643d4cecdee382d90152afd50cf0db121328c
+checksums md5 0330ec9f69e333c2a81fa4502ba96a22 \
+ sha1 9c546d72df741c9ddaa6da87baa2112503bcbb45 \
+ rmd160 57d93f15987adea3789219d633d9d9e7b1dc8b63
patchfiles patch-cf.data.pre.diff \
patch-compat_types.h.diff \
- patch-basic_pam_auth.cc.diff
+ patch-basic_pam_auth.cc.diff \
+ Segment.cc.diff
platform darwin 10 {
# ticket #37102, /usr/include/rpcsvc/yp_prot.h tries to redefine bool
@@ -63,12 +64,15 @@
--disable-strict-error-checking \
--disable-loadable-modules \
--disable-arch-native \
+ --without-gnutls \
+ --without-mit-krb5 \
+ --without-heimdal-krb5 \
+ --without-gnugss \
--enable-delay-pools \
--enable-zph-qos \
--enable-removal-policies \
- --enable-storeio=ufs,aufs,diskd \
- --enable-disk-io=AIO,Blocking,DiskDaemon,DiskThreads \
- --enable-icap-client \
+ --enable-storeio=ufs,aufs,diskd,rock \
+ --enable-disk-io=AIO,Blocking,DiskDaemon,DiskThreads,Mmapped \
--enable-log-daemon-helpers \
--with-default-user=squid \
--enable-auth \
@@ -76,11 +80,10 @@
--enable-auth-digest \
--enable-auth-negotiate="wrapper" \
--enable-auth-ntlm \
- --with-krb5-config=no \
--enable-external-acl-helpers="SQL_session eDirectory_userip file_userip time_quota unix_group wbinfo_group"
post-configure {
if {[variant_isset universal]} {
- system "cd ${worksrcpath} && ed - ${worksrcpath}/include/autoconf.h < ${filespath}/include_autoconf.h.ed && touch include/stamp-h1"
+ system -W ${worksrcpath} "ed - include/autoconf.h < ${filespath}/include_autoconf.h.ed && touch include/stamp-h1"
}
}
@@ -110,7 +113,6 @@
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/errorpage.css
}
destroot.keepdirs ${destroot}${prefix}/var/run/squid \
@@ -119,7 +121,7 @@
post-activate {
# Make sure initial conf files are present and setup correctly
- foreach f { squid.conf mime.conf cachemgr.conf msntauth.conf errorpage.css } {
+ foreach f { squid.conf mime.conf cachemgr.conf errorpage.css } {
if {![file exists ${prefix}/etc/squid/${f}]} {
file copy ${prefix}/etc/squid/${f}.default \
${prefix}/etc/squid/${f}
@@ -129,8 +131,7 @@
variant openssl description "Enable SSL/TLS support using OpenSSL" {
depends_lib-append port:openssl
- configure.args-append --with-openssl=${prefix} \
- --enable-ssl
+ configure.args-append --with-openssl=${prefix}
}
default_variants +openssl
@@ -139,10 +140,10 @@
configure.args-append --enable-ipfw-transparent
}
-variant kerberos description "Enable kerberos support" {
+variant kerberos description "Enable MIT kerberos support" {
depends_lib-append port:kerberos5
configure.args-delete --enable-auth-negotiate="wrapper" \
- --with-krb5-config=no
+ --without-mit-krb5
configure.args-append --enable-auth-negotiate
}
Added: trunk/dports/net/squid3/files/Segment.cc.diff
===================================================================
--- trunk/dports/net/squid3/files/Segment.cc.diff (rev 0)
+++ trunk/dports/net/squid3/files/Segment.cc.diff 2015-02-23 11:59:53 UTC (rev 133180)
@@ -0,0 +1,33 @@
+--- src/ipc/mem/Segment.cc.orig 2015-02-18 23:17:02.000000000 +1100
++++ src/ipc/mem/Segment.cc 2015-02-23 22:30:51.000000000 +1100
+@@ -88,7 +88,7 @@ Ipc::Mem::Segment::create(const off_t aS
+ assert(aSize > 0);
+ assert(theFD < 0);
+
+- theFD = shm_open(theName.termedBuf(), O_CREAT | O_RDWR | O_TRUNC,
++ theFD = shm_open(theName.termedBuf(), O_CREAT | O_RDWR,
+ S_IRUSR | S_IWUSR);
+ if (theFD < 0) {
+ debugs(54, 5, HERE << "shm_open " << theName << ": " << xstrerror());
+@@ -97,14 +97,19 @@ Ipc::Mem::Segment::create(const off_t aS
+ }
+
+ if (ftruncate(theFD, aSize)) {
++ int saved_errno = errno;
++ shm_unlink(theName.termedBuf());
++ errno = saved_errno;
+ debugs(54, 5, HERE << "ftruncate " << theName << ": " << xstrerror());
+ fatalf("Ipc::Mem::Segment::create failed to ftruncate(%s): %s\n",
+ theName.termedBuf(), xstrerror());
+ }
+
+- assert(statSize("Ipc::Mem::Segment::create") == aSize); // paranoid
++ theSize = statSize("Ipc::Mem::Segment::create");
++
++ // OS X will round up to a full page, so not checking for exact size match
++ assert(theSize >= aSize);
+
+- theSize = aSize;
+ theReserved = 0;
+ doUnlink = true;
+
Modified: trunk/dports/net/squid3/files/patch-cf.data.pre.diff
===================================================================
--- trunk/dports/net/squid3/files/patch-cf.data.pre.diff 2015-02-23 09:39:27 UTC (rev 133179)
+++ trunk/dports/net/squid3/files/patch-cf.data.pre.diff 2015-02-23 11:59:53 UTC (rev 133180)
@@ -1,6 +1,6 @@
---- src/cf.data.pre 2005-10-20 19:28:08.000000000 +0200
-+++ src/cf.data.pre 2008-05-29 22:35:11.000000000 +1000
-@@ -855,12 +855,12 @@
+--- src/cf.data.pre.orig 2015-02-18 23:17:02.000000000 +1100
++++ src/cf.data.pre 2015-02-21 20:42:21.000000000 +1100
+@@ -1387,7 +1387,7 @@
# 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
@@ -9,9 +9,3 @@
#
# INSERT YOUR OWN RULE(S) HERE TO ALLOW ACCESS FROM YOUR CLIENTS
- #
--
-+http_access allow localhost
- # Example rule allowing access from your local networks.
- # Adapt localnet in the ACL section to list your (internal) IP networks
- # from where browsing should be allowed
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.macosforge.org/pipermail/macports-changes/attachments/20150223/cfb83363/attachment-0001.html>
More information about the macports-changes
mailing list