<pre style='margin:0'>
Ryan Schmidt (ryandesign) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/786fa10f20a07f92d263139c90815926d657f260">https://github.com/macports/macports-ports/commit/786fa10f20a07f92d263139c90815926d657f260</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 786fa10f20a ike-scan: Update to 1.9.4 with fixes
</span>786fa10f20a is described below
<span style='display:block; white-space:pre;color:#808000;'>commit 786fa10f20a07f92d263139c90815926d657f260
</span>Author: Ryan Schmidt <ryandesign@macports.org>
AuthorDate: Thu Jul 1 07:39:47 2021 -0500
<span style='display:block; white-space:pre;color:#404040;'> ike-scan: Update to 1.9.4 with fixes
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> Add additional post-1.9.4 upstream fixes for implicit declaration of
</span><span style='display:block; white-space:pre;color:#404040;'> functions, resource leakage, and potential null pointer dereference.
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> Remove gettext dependency; this software doesn't seem to use gettext.
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> Now use archive tarball and use autoreconf; post-1.9 versions have no
</span><span style='display:block; white-space:pre;color:#404040;'> release tarballs.
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> Closes: https://trac.macports.org/ticket/63156
</span>---
security/ike-scan/Portfile | 24 +++++++++++++++---------
security/ike-scan/files/fclose.patch | 15 +++++++++++++++
security/ike-scan/files/implicit.patch | 22 ++++++++++++++++++++++
security/ike-scan/files/null-pointer-deref.patch | 13 +++++++++++++
4 files changed, 65 insertions(+), 9 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/security/ike-scan/Portfile b/security/ike-scan/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 5d008cbccb5..b7da4057fc4 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/security/ike-scan/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/security/ike-scan/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,11 +1,11 @@
</span> PortSystem 1.0
PortGroup github 1.0
<span style='display:block; white-space:pre;background:#ffe0e0;'>-github.setup royhills ike-scan 1.9
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-revision 3
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-checksums rmd160 1d5c1fb5b9200ad098616bc7f2d2913c8217dc1d \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 05d15c7172034935d1e46b01dacf1101a293ae0d06c0e14025a4507656f1a7b6 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- size 1412689
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+github.setup royhills ike-scan 1.9.4
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+revision 0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+checksums rmd160 fd743f703f16f2b06679eb29eb85e26fdd01683c \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 2865014185c129ac443beb7bf80f3c5eb93adb504cd307c5b6709199abf7c121 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 1360202
</span>
description ike-scan can discover and identify IPsec VPN systems running IKE.
long_description ${description}
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -14,11 +14,17 @@ categories security net
</span> license {GPL-2+ OpenSSLException}
platforms darwin
<span style='display:block; white-space:pre;background:#ffe0e0;'>-github.tarball_from releases
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+github.tarball_from archive
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>-depends_lib port:gettext path:lib/libssl.dylib:openssl
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-configure.args --mandir=${prefix}/share/man --with-openssl=${prefix}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-configure.ldflags-append "-lgettextlib"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+depends_lib path:lib/libssl.dylib:openssl
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+patchfiles fclose.patch \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ implicit.patch \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ null-pointer-deref.patch
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+use_autoreconf yes
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+configure.args --with-openssl=${prefix}
</span>
test.run yes
test.target check
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/security/ike-scan/files/fclose.patch b/security/ike-scan/files/fclose.patch
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 00000000000..24730906134
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/security/ike-scan/files/fclose.patch
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,15 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Fix resource leak.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+https://github.com/royhills/ike-scan/commit/0e884b07ccc3f36804a4f516e9ec634342fb2a59
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- isakmp.c.orig
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ isakmp.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -2720,6 +2720,10 @@ print_psk_crack_values(const char *psk_crack_file) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ hexdata=hexstring(psk_values.hash_r, psk_values.hash_r_len);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ fprintf(fp, "%s\n", hexdata);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ free(hexdata);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ if (psk_crack_file[0]) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ fclose(fp);
</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;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ /*
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/security/ike-scan/files/implicit.patch b/security/ike-scan/files/implicit.patch
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 00000000000..9107f04156a
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/security/ike-scan/files/implicit.patch
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,22 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Fix implicit declaration of functions.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+https://github.com/royhills/ike-scan/commit/c9ef0569443b03fda5339911acb8056a73c952de
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- acinclude.m4.orig
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ acinclude.m4
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -145,7 +145,7 @@ int does_int64_work()
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ return 1;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ main() {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- exit(! does_int64_work());
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ return ! does_int64_work();
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }],
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ [Ac_cachevar=yes],
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ [Ac_cachevar=no],
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -201,7 +201,7 @@ int does_int64_snprintf_work()
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ return 1;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ main() {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- exit(! does_int64_snprintf_work());
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ return ! does_int64_snprintf_work();
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }],
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ [pgac_cv_snprintf_long_long_int_format=$pgac_format; break],
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ [],
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/security/ike-scan/files/null-pointer-deref.patch b/security/ike-scan/files/null-pointer-deref.patch
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 00000000000..36dd53e3de3
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/security/ike-scan/files/null-pointer-deref.patch
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,13 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Fix null pointer dereference.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+https://github.com/royhills/ike-scan/commit/c1a31cfb3e3e9596b5bd2a62523555e3be945562
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- ike-scan.c.orig
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ ike-scan.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -1325,7 +1325,7 @@ add_host(const char *name, unsigned timeout, unsigned *num_hosts,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ Gettimeofday(&now);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ he->n = *num_hosts;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- if (no_dns_flag)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ if (no_dns_flag || numeric_only)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ memcpy(&(he->addr), &inp, sizeof(struct in_addr));
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ else
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ memcpy(&(he->addr), hp->h_addr_list[0], sizeof(struct in_addr));
</span></pre><pre style='margin:0'>
</pre>