<pre style='margin:0'>
Joshua Root (jmroot) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/2176e957f8389cc830b9605da73ace4e2c3f8071">https://github.com/macports/macports-ports/commit/2176e957f8389cc830b9605da73ace4e2c3f8071</a></p>
<pre style="white-space: pre; background: #F8F8F8">The following commit(s) were added to refs/heads/master by this push:
<span style='display:block; white-space:pre;color:#404040;'> new 2176e95 New port: squid4
</span>2176e95 is described below
<span style='display:block; white-space:pre;color:#808000;'>commit 2176e957f8389cc830b9605da73ace4e2c3f8071
</span>Author: Joshua Root <jmr@macports.org>
AuthorDate: Sun Jul 22 15:24:04 2018 +1000
<span style='display:block; white-space:pre;color:#404040;'> New port: squid4
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> Fixes: https://trac.macports.org/ticket/54193
</span>---
net/squid2/Portfile | 2 +-
net/squid3/Portfile | 2 +-
net/{squid3 => squid4}/Portfile | 72 +++++++++++++--------------
net/squid4/files/include_autoconf.h.ed | 22 ++++++++
net/squid4/files/patch-basic_pam_auth.cc.diff | 14 ++++++
net/squid4/files/patch-cf.data.pre.diff | 11 ++++
net/squid4/files/patch-compat_types.h.diff | 20 ++++++++
net/squid4/files/snowleopard-bool.diff | 11 ++++
8 files changed, 116 insertions(+), 38 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/net/squid2/Portfile b/net/squid2/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 9718894..c7df455 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/net/squid2/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/net/squid2/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -45,7 +45,7 @@ patchfiles patch-cf.data.pre.diff \
</span>
depends_lib port:zlib
<span style='display:block; white-space:pre;background:#ffe0e0;'>-conflicts squid3
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+conflicts squid3 squid4
</span>
configure.args --with-pthreads \
--mandir=${prefix}/share/man \
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/net/squid3/Portfile b/net/squid3/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index d33a452..e1d9a17 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/net/squid3/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/net/squid3/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -45,7 +45,7 @@ platform darwin 10 {
</span>
depends_lib port:zlib
<span style='display:block; white-space:pre;background:#ffe0e0;'>-conflicts squid2
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+conflicts squid2 squid4
</span>
set pidfile ${prefix}/var/run/squid/squid.pid
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/net/squid3/Portfile b/net/squid4/Portfile
</span>similarity index 74%
copy from net/squid3/Portfile
copy to net/squid4/Portfile
<span style='display:block; white-space:pre;color:#808080;'>index d33a452..d97ec39 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/net/squid3/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/net/squid4/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,10 +1,10 @@
</span> # -*- coding: utf-8; mode: tcl; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- vim:fenc=utf-8:ft=tcl:et:sw=4:ts=4:sts=4
PortSystem 1.0
<span style='display:block; white-space:pre;background:#e0ffe0;'>+PortGroup cxx11 1.1
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>-name squid3
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-version 3.5.28
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-set branch [join [lrange [split ${version} .] 0 1] .]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+name squid4
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+version 4.1
</span> categories net
platforms darwin
license GPL-2+
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -17,7 +17,9 @@ long_description Squid is a high-performance proxy caching server for \
</span> I/O-driven process. Squid keeps meta data and \
especially hot objects cached in RAM, caches DNS \
lookups, supports non-blocking DNS lookups, and \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- implements negative caching of failed requests.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ implements negative caching of failed requests. \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ Squid 4.x is the latest release series, and needs a \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ C++11 compiler to build.
</span>
homepage http://www.squid-cache.org/
master_sites https://mirror.aarnet.edu.au/pub/squid/squid/ \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -25,14 +27,14 @@ master_sites https://mirror.aarnet.edu.au/pub/squid/squid/ \
</span> http://ftp.ring.gr.jp/archives/net/www/squid/ \
ftp://ftp.is.co.za/pub/squid/ \
ftp://ftp1.cl.squid-cache.org/pub/squid/ \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- http://www.squid-cache.org/Versions/v3/${branch}/ \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ http://www.squid-cache.org/Versions/v4/ \
</span> ftp://ftp.squid-cache.org/pub/squid/
distname squid-${version}
use_xz yes
<span style='display:block; white-space:pre;background:#ffe0e0;'>-checksums md5 9367e0375ea53ba0e99f77054d4402c5 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha1 721241a270ec27d629d65ae17a50be56510e8441 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- rmd160 5c102be674a567d780590035e0ac3362e5b1a4b8
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+checksums md5 9c6356352f25cac9fd0586344f349fbf \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha1 591828f9524a6250b3d3926eb589ea598bc43d98 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ rmd160 2a798dacdb95b39072c06c05c37c24a6849ff6e5
</span>
patchfiles patch-cf.data.pre.diff \
patch-compat_types.h.diff \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -43,11 +45,10 @@ platform darwin 10 {
</span> patchfiles-append snowleopard-bool.diff
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-depends_lib port:zlib
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+depends_build port:pkgconfig
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+depends_lib port:expat port:zlib
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>-conflicts squid2
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-set pidfile ${prefix}/var/run/squid/squid.pid
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+conflicts squid2 squid3
</span>
configure.args --mandir=${prefix}/share/man \
--sysconfdir=${prefix}/etc/squid \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -55,27 +56,29 @@ configure.args --mandir=${prefix}/share/man \
</span> --localstatedir=${prefix}/var/squid \
--libexecdir=${prefix}/libexec/squid \
--with-swapdir=${prefix}/var/squid/cache \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- --with-pidfile=${pidfile} \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ --with-pidfile=${prefix}/var/run/squid/squid.pid \
</span> --disable-strict-error-checking \
--disable-loadable-modules \
--disable-arch-native \
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ --without-cppunit \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ --without-gnugss \
</span> --without-gnutls \
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ --without-libxml2 \
</span> --without-mit-krb5 \
--without-heimdal-krb5 \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- --without-gnugss \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ --without-nettle \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ --without-openssl \
</span> --enable-delay-pools \
--enable-zph-qos \
--enable-removal-policies \
--enable-storeio=ufs,aufs,diskd,rock \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- --enable-disk-io=AIO,Blocking,DiskDaemon,DiskThreads,Mmapped \
</span> --enable-log-daemon-helpers \
--with-default-user=squid \
--enable-auth \
--enable-auth-basic \
--enable-auth-digest \
--enable-auth-negotiate="wrapper" \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- --enable-auth-ntlm \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- --enable-external-acl-helpers="SQL_session eDirectory_userip file_userip time_quota unix_group wbinfo_group"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ --enable-auth-ntlm
</span> post-configure {
if {[variant_isset universal]} {
system -W ${worksrcpath} "ed - include/autoconf.h < ${filespath}/include_autoconf.h.ed && touch include/stamp-h1"
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -85,25 +88,14 @@ post-configure {
</span> startupitem.create yes
startupitem.name Squid
startupitem.netchange yes
<span style='display:block; white-space:pre;background:#ffe0e0;'>-startupitem.pidfile clean ${pidfile}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-startupitem.start \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- "cd ${prefix}/var/squid" \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- "if \[ ! -d \"${prefix}/var/squid/cache/00\" \]; then" \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- " ${prefix}/sbin/squid -s -z" \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- "fi" \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- "${prefix}/sbin/squid -s"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-startupitem.stop \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- "cd ${prefix}/var/squid" \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- "${prefix}/sbin/squid -k shutdown" \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- "while ${prefix}/sbin/squid -k check; do" \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- " sleep 1" \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- "done"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-startupitem.restart \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- "cd ${prefix}/var/squid" \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- "${prefix}/sbin/squid -k reconfigure"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+startupitem.executable ${prefix}/sbin/squid -s --foreground
</span>
add_users squid group=squid home=${prefix}/var/squid
<span style='display:block; white-space:pre;background:#e0ffe0;'>+notes "Before starting $name for the first time, create the cache directories\
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+with:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ${prefix}/sbin/squid -s -z --foreground"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> post-destroot {
xinstall -o squid -g squid -m 755 -d \
${destroot}${prefix}/var/run/squid ${destroot}${prefix}/var/squid \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -127,13 +119,21 @@ post-activate {
</span> }
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-variant openssl description "Enable SSL/TLS support using OpenSSL" {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- depends_lib-append path:lib/libssl.dylib:openssl
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+variant openssl conflicts gnutls description "Enable SSL/TLS support using OpenSSL" {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # This release does not work with LibreSSL.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #depends_lib-append path:lib/libssl.dylib:openssl
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ depends_lib-append port:openssl
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.args-delete --without-openssl
</span> configure.args-append --with-openssl=${prefix}
}
default_variants +openssl
<span style='display:block; white-space:pre;background:#e0ffe0;'>+variant gnutls conflicts openssl description "Enable SSL/TLS support using GnuTLS (experimental)" {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ depends_lib-append port:gnutls
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.args-delete --without-gnutls
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> variant ipfw_transparent description "Enable transparent proxy support using IPFW" {
configure.args-append --enable-ipfw-transparent
}
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -146,5 +146,5 @@ variant kerberos description "Enable MIT kerberos support" {
</span> }
livecheck.type regex
<span style='display:block; white-space:pre;background:#ffe0e0;'>-livecheck.url http://www.squid-cache.org/Versions/v3/${branch}/
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+livecheck.url http://www.squid-cache.org/Versions/v4/
</span> livecheck.regex "squid-(\[0-9.\]+)-RELEASENOTES\\.html"
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/net/squid4/files/include_autoconf.h.ed b/net/squid4/files/include_autoconf.h.ed
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 0000000..fb8da08
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/net/squid4/files/include_autoconf.h.ed
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,22 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+/#define SIZEOF_LONG/c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+#ifdef __LP64__
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+#define SIZEOF_LONG 8
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+#else
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+#define SIZEOF_LONG 4
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+#endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+/#define SIZEOF_SIZE_T/c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+#ifdef __LP64__
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+#define SIZEOF_SIZE_T 8
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+#else
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+#define SIZEOF_SIZE_T 4
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+#endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+/#define SIZEOF_VOID_P/c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+#ifdef __LP64__
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+#define SIZEOF_VOID_P 8
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+#else
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+#define SIZEOF_VOID_P 4
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+#endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+w
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/net/squid4/files/patch-basic_pam_auth.cc.diff b/net/squid4/files/patch-basic_pam_auth.cc.diff
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 0000000..a0bd44d
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/net/squid4/files/patch-basic_pam_auth.cc.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,14 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- src/auth/basic/PAM/basic_pam_auth.cc.orig 2018-07-02 13:26:07.000000000 +1000
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ src/auth/basic/PAM/basic_pam_auth.cc 2018-07-22 14:11:40.000000000 +1000
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -84,6 +84,11 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #if HAVE_SECURITY_PAM_APPL_H
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include <security/pam_appl.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#elif defined(__APPLE__)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#include <AvailabilityMacros.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#if defined(MAC_OS_X_VERSION_MIN_REQUIRED) && MAC_OS_X_VERSION_MIN_REQUIRED < 1060
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#include <pam/pam_appl.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ /* The default PAM service name */
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/net/squid4/files/patch-cf.data.pre.diff b/net/squid4/files/patch-cf.data.pre.diff
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 0000000..05ecdc6
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/net/squid4/files/patch-cf.data.pre.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,11 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- src/cf.data.pre.orig 2015-02-18 23:17:02.000000000 +1100
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ src/cf.data.pre 2015-02-21 20:42:21.000000000 +1100
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -1387,7 +1387,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # We strongly recommend the following be uncommented to protect innocent
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # web applications running on the proxy server who think the only
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # one who can access services on "localhost" is a local user
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-#http_access deny to_localhost
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++http_access deny to_localhost
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # INSERT YOUR OWN RULE(S) HERE TO ALLOW ACCESS FROM YOUR CLIENTS
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/net/squid4/files/patch-compat_types.h.diff b/net/squid4/files/patch-compat_types.h.diff
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 0000000..7ab841f
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/net/squid4/files/patch-compat_types.h.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,20 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- compat/types.h.orig 2009-08-04 21:57:45.000000000 +1000
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ compat/types.h 2009-08-09 11:34:31.000000000 +1000
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -93,7 +93,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #ifndef PRId64
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #if _SQUID_WINDOWS_
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #define PRId64 "I64d"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-#elif SIZEOF_INT64_T > SIZEOF_LONG
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#elif SIZEOF_INT64_T >= SIZEOF_LONG
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #define PRId64 "lld"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #else
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #define PRId64 "ld"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -103,7 +103,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #ifndef PRIu64
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #if _SQUID_WINDOWS_
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #define PRIu64 "I64u"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-#elif SIZEOF_INT64_T > SIZEOF_LONG
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#elif SIZEOF_INT64_T >= SIZEOF_LONG
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #define PRIu64 "llu"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #else
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #define PRIu64 "lu"
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/net/squid4/files/snowleopard-bool.diff b/net/squid4/files/snowleopard-bool.diff
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 0000000..9a7ba2a
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/net/squid4/files/snowleopard-bool.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,11 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- src/auth/basic/NIS/nis_support.cc.orig 2018-07-02 13:26:07.000000000 +1000
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ src/auth/basic/NIS/nis_support.cc 2018-07-22 14:15:33.000000000 +1000
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -23,7 +23,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include <rpc/rpc.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-#if _SQUID_FREEBSD_ && !defined(BOOL_DEFINED)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#ifndef BOOL_DEFINED
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ // BUG: FreeBSD rpcsvc/yp_* headers try to redefine bool unless we match their non-standard hack.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #define BOOL_DEFINED
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #endif
</span></pre><pre style='margin:0'>
</pre>