<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[133180] trunk/dports/net/squid3</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="https://trac.macports.org/changeset/133180">133180</a></dd>
<dt>Author</dt> <dd>jmr@macports.org</dd>
<dt>Date</dt> <dd>2015-02-23 03:59:53 -0800 (Mon, 23 Feb 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>squid3: update to 3.5.2</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkdportsnetsquid3Portfile">trunk/dports/net/squid3/Portfile</a></li>
<li><a href="#trunkdportsnetsquid3filespatchcfdataprediff">trunk/dports/net/squid3/files/patch-cf.data.pre.diff</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#trunkdportsnetsquid3filesSegmentccdiff">trunk/dports/net/squid3/files/Segment.cc.diff</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkdportsnetsquid3Portfile"></a>
<div class="modfile"><h4>Modified: trunk/dports/net/squid3/Portfile (133179 => 133180)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -5,7 +5,7 @@
</span><span class="cx"> PortGroup compiler_blacklist_versions 1.0
</span><span class="cx">
</span><span class="cx"> name squid3
</span><del>-version 3.4.11
</del><ins>+version 3.5.2
</ins><span class="cx"> set branch [join [lrange [split ${version} .] 0 1] .]
</span><span class="cx"> categories net
</span><span class="cx"> platforms darwin
</span><span class="lines">@@ -32,13 +32,14 @@
</span><span class="cx">
</span><span class="cx"> distname squid-${version}
</span><span class="cx"> use_xz yes
</span><del>-checksums md5 e79ddb108d24823da8c1dbc0fc4a31fb \
- sha1 7de0949714cda4d3f19073aa846f00768a6f841b \
- rmd160 f8d643d4cecdee382d90152afd50cf0db121328c
</del><ins>+checksums md5 0330ec9f69e333c2a81fa4502ba96a22 \
+ sha1 9c546d72df741c9ddaa6da87baa2112503bcbb45 \
+ rmd160 57d93f15987adea3789219d633d9d9e7b1dc8b63
</ins><span class="cx">
</span><span class="cx"> patchfiles patch-cf.data.pre.diff \
</span><span class="cx"> patch-compat_types.h.diff \
</span><del>- patch-basic_pam_auth.cc.diff
</del><ins>+ patch-basic_pam_auth.cc.diff \
+ Segment.cc.diff
</ins><span class="cx">
</span><span class="cx"> platform darwin 10 {
</span><span class="cx"> # ticket #37102, /usr/include/rpcsvc/yp_prot.h tries to redefine bool
</span><span class="lines">@@ -63,12 +64,15 @@
</span><span class="cx"> --disable-strict-error-checking \
</span><span class="cx"> --disable-loadable-modules \
</span><span class="cx"> --disable-arch-native \
</span><ins>+ --without-gnutls \
+ --without-mit-krb5 \
+ --without-heimdal-krb5 \
+ --without-gnugss \
</ins><span class="cx"> --enable-delay-pools \
</span><span class="cx"> --enable-zph-qos \
</span><span class="cx"> --enable-removal-policies \
</span><del>- --enable-storeio=ufs,aufs,diskd \
- --enable-disk-io=AIO,Blocking,DiskDaemon,DiskThreads \
- --enable-icap-client \
</del><ins>+ --enable-storeio=ufs,aufs,diskd,rock \
+ --enable-disk-io=AIO,Blocking,DiskDaemon,DiskThreads,Mmapped \
</ins><span class="cx"> --enable-log-daemon-helpers \
</span><span class="cx"> --with-default-user=squid \
</span><span class="cx"> --enable-auth \
</span><span class="lines">@@ -76,11 +80,10 @@
</span><span class="cx"> --enable-auth-digest \
</span><span class="cx"> --enable-auth-negotiate="wrapper" \
</span><span class="cx"> --enable-auth-ntlm \
</span><del>- --with-krb5-config=no \
</del><span class="cx"> --enable-external-acl-helpers="SQL_session eDirectory_userip file_userip time_quota unix_group wbinfo_group"
</span><span class="cx"> post-configure {
</span><span class="cx"> if {[variant_isset universal]} {
</span><del>- system "cd ${worksrcpath} && ed - ${worksrcpath}/include/autoconf.h < ${filespath}/include_autoconf.h.ed && touch include/stamp-h1"
</del><ins>+ system -W ${worksrcpath} "ed - include/autoconf.h < ${filespath}/include_autoconf.h.ed && touch include/stamp-h1"
</ins><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -110,7 +113,6 @@
</span><span class="cx"> file delete -force ${destroot}${prefix}/etc/squid/squid.conf \
</span><span class="cx"> ${destroot}${prefix}/etc/squid/mime.conf \
</span><span class="cx"> ${destroot}${prefix}/etc/squid/cachemgr.conf \
</span><del>- ${destroot}${prefix}/etc/squid/msntauth.conf \
</del><span class="cx"> ${destroot}${prefix}/etc/squid/errorpage.css
</span><span class="cx"> }
</span><span class="cx"> destroot.keepdirs ${destroot}${prefix}/var/run/squid \
</span><span class="lines">@@ -119,7 +121,7 @@
</span><span class="cx">
</span><span class="cx"> post-activate {
</span><span class="cx"> # Make sure initial conf files are present and setup correctly
</span><del>- foreach f { squid.conf mime.conf cachemgr.conf msntauth.conf errorpage.css } {
</del><ins>+ foreach f { squid.conf mime.conf cachemgr.conf errorpage.css } {
</ins><span class="cx"> if {![file exists ${prefix}/etc/squid/${f}]} {
</span><span class="cx"> file copy ${prefix}/etc/squid/${f}.default \
</span><span class="cx"> ${prefix}/etc/squid/${f}
</span><span class="lines">@@ -129,8 +131,7 @@
</span><span class="cx">
</span><span class="cx"> variant openssl description "Enable SSL/TLS support using OpenSSL" {
</span><span class="cx"> depends_lib-append port:openssl
</span><del>- configure.args-append --with-openssl=${prefix} \
- --enable-ssl
</del><ins>+ configure.args-append --with-openssl=${prefix}
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> default_variants +openssl
</span><span class="lines">@@ -139,10 +140,10 @@
</span><span class="cx"> configure.args-append --enable-ipfw-transparent
</span><span class="cx"> }
</span><span class="cx">
</span><del>-variant kerberos description "Enable kerberos support" {
</del><ins>+variant kerberos description "Enable MIT kerberos support" {
</ins><span class="cx"> depends_lib-append port:kerberos5
</span><span class="cx"> configure.args-delete --enable-auth-negotiate="wrapper" \
</span><del>- --with-krb5-config=no
</del><ins>+ --without-mit-krb5
</ins><span class="cx"> configure.args-append --enable-auth-negotiate
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkdportsnetsquid3filesSegmentccdiff"></a>
<div class="addfile"><h4>Added: trunk/dports/net/squid3/files/Segment.cc.diff (0 => 133180)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -0,0 +1,33 @@
</span><ins>+--- 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;
+
</ins></span></pre></div>
<a id="trunkdportsnetsquid3filespatchcfdataprediff"></a>
<div class="modfile"><h4>Modified: trunk/dports/net/squid3/files/patch-cf.data.pre.diff (133179 => 133180)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -1,6 +1,6 @@
</span><del>---- 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 @@
</del><ins>+--- 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 @@
</ins><span class="cx"> # We strongly recommend the following be uncommented to protect innocent
</span><span class="cx"> # web applications running on the proxy server who think the only
</span><span class="cx"> # one who can access services on "localhost" is a local user
</span><span class="lines">@@ -9,9 +9,3 @@
</span><span class="cx">
</span><span class="cx"> #
</span><span class="cx"> # INSERT YOUR OWN RULE(S) HERE TO ALLOW ACCESS FROM YOUR CLIENTS
</span><del>- #
--
-+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
</del></span></pre>
</div>
</div>
</body>
</html>