<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/a653522cce4dd9be408e50aef836a409d19fe1da">https://github.com/macports/macports-ports/commit/a653522cce4dd9be408e50aef836a409d19fe1da</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 a653522cce4 squid2: arm64 fixes
</span>a653522cce4 is described below
<span style='display:block; white-space:pre;color:#808000;'>commit a653522cce4dd9be408e50aef836a409d19fe1da
</span>Author: Joshua Root <jmr@macports.org>
AuthorDate: Wed Nov 10 00:27:49 2021 +1100
<span style='display:block; white-space:pre;color:#404040;'> squid2: arm64 fixes
</span>---
net/squid2/Portfile | 12 ++++++-
net/squid2/files/implicit.diff | 71 ++++++++++++++++++++++++++++++++++++++++++
2 files changed, 82 insertions(+), 1 deletion(-)
<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 bfb57e62d64..068e9f6763b 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;'>@@ -42,12 +42,22 @@ use_bzip2 yes
</span> patchfiles patch-cf.data.pre.diff \
patch-configure.diff \
patch-pam_auth.c.diff \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- src__ssl_support.c.diff
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ src__ssl_support.c.diff \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ implicit.diff
</span>
depends_lib port:zlib
conflicts squid3 squid4 squid5
<span style='display:block; white-space:pre;background:#e0ffe0;'>+# replace old config.{guess,sub} with recent versions from automake
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+depends_build-append port:automake
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+post-patch {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set automake_dirs [glob -directory ${prefix}/share automake-*]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set automake_dir [lindex [lsort -command vercmp $automake_dirs] end]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ copy -force ${automake_dir}/config.guess ${automake_dir}/config.sub \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ${worksrcpath}/cfgaux/
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> configure.args --with-pthreads \
--mandir=${prefix}/share/man \
--sysconfdir=${prefix}/etc/squid \
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/net/squid2/files/implicit.diff b/net/squid2/files/implicit.diff
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 00000000000..0d665827eb6
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/net/squid2/files/implicit.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,71 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- configure.orig 2021-11-10 00:09:17.000000000 +1100
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ configure 2021-11-10 00:21:14.000000000 +1100
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -27627,7 +27627,15 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ cat >>conftest.$ac_ext <<_ACEOF
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ /* end confdefs.h. */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#if HAVE_STDLIB_H
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include <stdlib.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#if HAVE_STDIO_H
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#include <stdio.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#if HAVE_UNISTD_H
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#include <unistd.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ int main() {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if(setresuid(-1,-1,-1)) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ perror("setresuid:");
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -27741,7 +27749,9 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ cat confdefs.h >>conftest.$ac_ext
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ cat >>conftest.$ac_ext <<_ACEOF
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ /* end confdefs.h. */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#if HAVE_STDLIB_H
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#include <stdlib.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include <stdarg.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ void f (int i, ...) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ va_list args1, args2;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -27823,7 +27833,9 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ cat confdefs.h >>conftest.$ac_ext
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ cat >>conftest.$ac_ext <<_ACEOF
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ /* end confdefs.h. */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#if HAVE_STDLIB_H
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#include <stdlib.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include <stdarg.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ void f (int i, ...) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ va_list args1, args2;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -28248,10 +28260,10 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #if HAVE_WINSOCK2_H
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include <winsock2.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-main() {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++int main() {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ FILE *fp = fopen("conftestval", "w");
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ fprintf (fp, "%d\n", FD_SETSIZE);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- exit(0);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ return (0);
</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;'>+ _ACEOF
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -28341,7 +28353,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include <sys/time.h> /* needed on FreeBSD */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include <sys/param.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include <sys/resource.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-main() {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++int main() {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ FILE *fp;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ int i,j;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #if defined(__CYGWIN32__) || defined (__CYGWIN__)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -28394,7 +28406,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #endif /* IF !DEF CYGWIN */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ fp = fopen("conftestval", "w");
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ fprintf (fp, "%d\n", i & ~0x3F);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- exit(0);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ return (0);
</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;'>+ _ACEOF
</span></pre><pre style='margin:0'>
</pre>