Revision: 134543 https://trac.macports.org/changeset/134543 Author: jmr@macports.org Date: 2015-03-29 12:28:19 -0700 (Sun, 29 Mar 2015) Log Message: ----------- squid3: update to 3.5.3, and remove blacklisting of old clang due to missing atomics, since configure should now detect that itself Modified Paths: -------------- trunk/dports/net/squid3/Portfile Removed Paths: ------------- trunk/dports/net/squid3/files/Segment.cc.diff Modified: trunk/dports/net/squid3/Portfile =================================================================== --- trunk/dports/net/squid3/Portfile 2015-03-29 17:07:44 UTC (rev 134542) +++ trunk/dports/net/squid3/Portfile 2015-03-29 19:28:19 UTC (rev 134543) @@ -2,10 +2,9 @@ # $Id$ PortSystem 1.0 -PortGroup compiler_blacklist_versions 1.0 name squid3 -version 3.5.2 +version 3.5.3 set branch [join [lrange [split ${version} .] 0 1] .] categories net platforms darwin @@ -32,14 +31,13 @@ distname squid-${version} use_xz yes -checksums md5 0330ec9f69e333c2a81fa4502ba96a22 \ - sha1 9c546d72df741c9ddaa6da87baa2112503bcbb45 \ - rmd160 57d93f15987adea3789219d633d9d9e7b1dc8b63 +checksums md5 6cd553300a2253c0913f498beb79ee51 \ + sha1 6919305e16f59387197cf543f525e41f510b4727 \ + rmd160 93bb66becb703e0e1f205e6232d4931d0fb2c7d2 patchfiles patch-cf.data.pre.diff \ patch-compat_types.h.diff \ - patch-basic_pam_auth.cc.diff \ - Segment.cc.diff + patch-basic_pam_auth.cc.diff platform darwin 10 { # ticket #37102, /usr/include/rpcsvc/yp_prot.h tries to redefine bool @@ -48,9 +46,6 @@ depends_lib port:zlib -# http://llvm.org/bugs/show_bug.cgi?id=9041 -compiler.blacklist {clang <= 211.10.1} - conflicts squid set pidfile ${prefix}/var/run/squid/squid.pid Deleted: trunk/dports/net/squid3/files/Segment.cc.diff =================================================================== --- trunk/dports/net/squid3/files/Segment.cc.diff 2015-03-29 17:07:44 UTC (rev 134542) +++ trunk/dports/net/squid3/files/Segment.cc.diff 2015-03-29 19:28:19 UTC (rev 134543) @@ -1,33 +0,0 @@ ---- 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; -