<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/adda814ca49108d664933ce14bd0ed2add4e8a89">https://github.com/macports/macports-ports/commit/adda814ca49108d664933ce14bd0ed2add4e8a89</a></p>
<pre style="white-space: pre; background: #F8F8F8"><span style='display:block; white-space:pre;color:#808000;'>commit adda814ca49108d664933ce14bd0ed2add4e8a89
</span>Author: Joshua Root <jmr@macports.org>
AuthorDate: Tue Nov 9 13:21:08 2021 +1100
<span style='display:block; white-space:pre;color:#404040;'> squid5: new port
</span>---
net/squid2/Portfile | 4 +--
net/squid3/Portfile | 9 ++++--
net/squid4/Portfile | 26 ++++++++++-----
net/{squid4 => squid5}/Portfile | 37 ++++++++++++----------
net/squid5/files/include_autoconf.h.ed | 22 +++++++++++++
.../files/kerberos_ldap_group_Makefile.in.diff | 11 +++++++
net/squid5/files/patch-basic_pam_auth.cc.diff | 14 ++++++++
net/squid5/files/patch-cf.data.pre.diff | 11 +++++++
net/squid5/files/patch-compat_types.h.diff | 20 ++++++++++++
net/squid5/files/snowleopard-bool.diff | 11 +++++++
10 files changed, 136 insertions(+), 29 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 7d78c2768c2..bfb57e62d64 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;'>@@ -21,7 +21,7 @@ long_description Squid is a high-performance proxy caching server for \
</span> implements negative caching of failed requests. \
Squid 2.x is an old release series, which is mostly \
obsolete but still has a few features that have not \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- yet been ported to 3.x or 4.x.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ yet been ported to 5.x.
</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;'>@@ -46,7 +46,7 @@ patchfiles patch-cf.data.pre.diff \
</span>
depends_lib port:zlib
<span style='display:block; white-space:pre;background:#ffe0e0;'>-conflicts squid3 squid4
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+conflicts squid3 squid4 squid5
</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 1caffa2410a..74b3a989d6e 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;'>@@ -18,7 +18,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 3.x is the latest release series that does not \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ need a 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;'>@@ -49,7 +51,7 @@ platform darwin 10 {
</span> depends_build port:pkgconfig
depends_lib port:zlib
<span style='display:block; white-space:pre;background:#ffe0e0;'>-conflicts squid2 squid4
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+conflicts squid2 squid4 squid5
</span>
set pidfile ${prefix}/var/run/squid/squid.pid
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -149,6 +151,9 @@ variant kerberos description "Enable MIT kerberos support" {
</span> configure.args-append --enable-auth-negotiate
}
<span style='display:block; white-space:pre;background:#e0ffe0;'>+notes "Squid 3.x is an older release series, and it is recommended to\
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+migrate to squid5 if possible."
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> livecheck.type regex
livecheck.url http://www.squid-cache.org/Versions/v3/${branch}/
livecheck.regex "squid-(\[0-9.\]+)-RELEASENOTES\\.html"
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/net/squid4/Portfile b/net/squid4/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index f1426e7d647..9b4d5cb60dd 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/net/squid4/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;'>@@ -18,8 +18,8 @@ long_description Squid is a high-performance proxy caching server for \
</span> especially hot objects cached in RAM, caches DNS \
lookups, supports non-blocking DNS lookups, and \
implements negative caching of failed requests. \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- Squid 4.x is the latest release series, and needs a \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- C++11 compiler to build.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ Squid 4.x is the previous release series, and \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ migrating to squid5 is recommended.
</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;'>@@ -50,7 +50,7 @@ platform darwin 10 {
</span> depends_build port:pkgconfig
depends_lib port:expat port:zlib
<span style='display:block; white-space:pre;background:#ffe0e0;'>-conflicts squid2 squid3
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+conflicts squid2 squid3 squid5
</span>
compiler.cxx_standard 2011
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -105,7 +105,12 @@ add_users squid group=squid home=${prefix}/var/squid
</span>
notes "Before starting $name for the first time, create the cache directories\
with:
<span style='display:block; white-space:pre;background:#ffe0e0;'>- ${prefix}/sbin/squid -s -z --foreground"
</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><span style='display:block; white-space:pre;background:#e0ffe0;'>+Squid 4.x is no longer the current release series. Migrating to squid5\
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+is recommended. The squid4 port will be marked as replaced by squid5 on\
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+around 2022-11-09, at which point upgrading squid4 will automatically\
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+install squid5."
</span>
post-destroot {
xinstall -o squid -g squid -m 755 -d \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -132,17 +137,22 @@ post-activate {
</span>
variant openssl conflicts gnutls description "Enable SSL/TLS support using OpenSSL" {
# This release does not work with LibreSSL.
<span style='display:block; white-space:pre;background:#ffe0e0;'>- PortGroup openssl 1.0
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- openssl.branch 1.1
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- openssl.configure pkgconfig build_flags
</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> configure.args-delete --without-openssl
<span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.args-append --with-openssl=[openssl::install_area]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #configure.args-append --with-openssl=${prefix}
</span> }
if {![variant_isset gnutls]} {
default_variants +openssl
}
<span style='display:block; white-space:pre;background:#e0ffe0;'>+if {[variant_isset openssl]} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ PortGroup openssl 1.0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ openssl.branch 1.1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.args-append --with-openssl=[openssl::install_area]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> variant gnutls conflicts openssl description "Enable SSL/TLS support using GnuTLS (experimental)" {
depends_lib-append port:gnutls
configure.args-delete --without-gnutls
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/net/squid4/Portfile b/net/squid5/Portfile
</span>similarity index 87%
copy from net/squid4/Portfile
copy to net/squid5/Portfile
<span style='display:block; white-space:pre;color:#808080;'>index f1426e7d647..fada2e7977d 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/net/squid4/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/net/squid5/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -2,9 +2,8 @@
</span>
PortSystem 1.0
<span style='display:block; white-space:pre;background:#ffe0e0;'>-name squid4
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-version 4.17
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-revision 2
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+name squid5
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+version 5.2
</span> categories net
platforms darwin
license GPL-2+
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -12,13 +11,11 @@ maintainers {jmr @jmroot} openmaintainer
</span> description advanced proxy caching server for http, https, ftp, gopher
long_description Squid is a high-performance proxy caching server for \
web clients, supporting FTP, gopher, and HTTP data \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- objects. Unlike traditional caching software, Squid \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- handles all requests in a single, non-blocking, \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- I/O-driven process. Squid keeps meta data and \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ objects. Squid keeps metadata and \
</span> especially hot objects cached in RAM, caches DNS \
lookups, supports non-blocking DNS lookups, and \
implements negative caching of failed requests. \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- Squid 4.x is the latest release series, and needs a \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ Squid 5.x is the latest release series, and needs a \
</span> C++11 compiler to build.
homepage http://www.squid-cache.org/
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -27,15 +24,15 @@ 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/v4/ \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ http://www.squid-cache.org/Versions/v5/ \
</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 47b94b2d27516f1764c9d5dc1b9645e5 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha1 f6bd15fabbd67b53a831fe9f67de3279868036c1 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- rmd160 bbd2ade0960eac70298b78a34bb85cdf6cce617c \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 cb928ac08c7c86b151b1c8f827abe1a84d83181a2a86e0d512286163e1e31418
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+checksums md5 102984f3ea382a1fa5bd917c2ee155ec \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha1 0568a55c8bf20fbcbfadf126347f3e790945e5d2 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ rmd160 59e93616a92d6a6ebe8c438a1d07b21fb037e5fa \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 ea921f055c6cc4b3c6542d995f5a7c5980f2f91adaaa10fe8260d0f1527aaf80
</span>
patchfiles patch-cf.data.pre.diff \
patch-compat_types.h.diff \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -50,7 +47,7 @@ platform darwin 10 {
</span> depends_build port:pkgconfig
depends_lib port:expat port:zlib
<span style='display:block; white-space:pre;background:#ffe0e0;'>-conflicts squid2 squid3
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+conflicts squid2 squid3 squid4
</span>
compiler.cxx_standard 2011
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -132,17 +129,23 @@ post-activate {
</span>
variant openssl conflicts gnutls description "Enable SSL/TLS support using OpenSSL" {
# This release does not work with LibreSSL.
<span style='display:block; white-space:pre;background:#ffe0e0;'>- PortGroup openssl 1.0
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- openssl.branch 1.1
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- openssl.configure pkgconfig build_flags
</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> configure.args-delete --without-openssl
<span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.args-append --with-openssl=[openssl::install_area]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #configure.args-append --with-openssl=${prefix}
</span> }
if {![variant_isset gnutls]} {
default_variants +openssl
}
<span style='display:block; white-space:pre;background:#e0ffe0;'>+if {[variant_isset openssl]} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # https://bugs.squid-cache.org/show_bug.cgi?id=5133
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ PortGroup openssl 1.0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ openssl.branch 1.1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.args-append --with-openssl=[openssl::install_area]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> variant gnutls conflicts openssl description "Enable SSL/TLS support using GnuTLS (experimental)" {
depends_lib-append port:gnutls
configure.args-delete --without-gnutls
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/net/squid5/files/include_autoconf.h.ed b/net/squid5/files/include_autoconf.h.ed
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 00000000000..fb8da08394b
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/net/squid5/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/squid5/files/kerberos_ldap_group_Makefile.in.diff b/net/squid5/files/kerberos_ldap_group_Makefile.in.diff
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 00000000000..292f527170b
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/net/squid5/files/kerberos_ldap_group_Makefile.in.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/acl/external/kerberos_ldap_group/Makefile.in.orig 2018-10-28 07:45:10.000000000 +1100
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ src/acl/external/kerberos_ldap_group/Makefile.in 2018-11-22 13:23:53.000000000 +1100
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -650,7 +650,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ WBINFO = @WBINFO@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ WIN32_PSAPI = @WIN32_PSAPI@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ XMLLIB = @XMLLIB@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-XTRA_LIBS = @XTRA_LIBS@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++XTRA_LIBS = @XTRA_LIBS@ -lresolv
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ XTRA_OBJS = @XTRA_OBJS@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ abs_builddir = @abs_builddir@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ abs_srcdir = @abs_srcdir@
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/net/squid5/files/patch-basic_pam_auth.cc.diff b/net/squid5/files/patch-basic_pam_auth.cc.diff
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 00000000000..a0bd44d0776
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/net/squid5/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/squid5/files/patch-cf.data.pre.diff b/net/squid5/files/patch-cf.data.pre.diff
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 00000000000..05ecdc69ce2
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/net/squid5/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/squid5/files/patch-compat_types.h.diff b/net/squid5/files/patch-compat_types.h.diff
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 00000000000..7ab841f073e
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/net/squid5/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/squid5/files/snowleopard-bool.diff b/net/squid5/files/snowleopard-bool.diff
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 00000000000..9a7ba2a87da
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/net/squid5/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>