<pre style='margin:0'>
Herby Gillot (herbygillot) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/9f878b50b91737881a163851285bff66e000adaa">https://github.com/macports/macports-ports/commit/9f878b50b91737881a163851285bff66e000adaa</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 9f878b50b91 ike-scan: update to 1.9.5
</span>9f878b50b91 is described below
<span style='display:block; white-space:pre;color:#808000;'>commit 9f878b50b91737881a163851285bff66e000adaa
</span>Author: Herby Gillot <herby.gillot@gmail.com>
AuthorDate: Sat Jun 24 12:46:50 2023 -0400
<span style='display:block; white-space:pre;color:#404040;'> ike-scan: update to 1.9.5
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> - drop patches, these are now in upstream source
</span>---
security/ike-scan/Portfile | 25 ++++++++++--------------
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, 10 insertions(+), 65 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 29690f3d96d..f1900257c7f 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;'>@@ -3,27 +3,22 @@
</span> PortSystem 1.0
PortGroup github 1.0
<span style='display:block; white-space:pre;background:#ffe0e0;'>-github.setup royhills ike-scan 1.9.4
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-revision 1
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-checksums rmd160 fd743f703f16f2b06679eb29eb85e26fdd01683c \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 2865014185c129ac443beb7bf80f3c5eb93adb504cd307c5b6709199abf7c121 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- size 1360202
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+github.setup royhills ike-scan 1.9.5
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+github.tarball_from archive
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+revision 0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+checksums rmd160 97182a08e59cf834a2f9d9f114698e414287214b \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 5152bf06ac82d0cadffb93a010ffb6bca7efd35ea169ca7539cf2860ce2b263f \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 1542264
</span>
categories security net
<span style='display:block; white-space:pre;background:#ffe0e0;'>-platforms darwin
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-maintainers nomaintainer
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+installs_libs no
</span> license {GPL-2+ OpenSSLException}
<span style='display:block; white-space:pre;background:#e0ffe0;'>+maintainers nomaintainer
</span>
description ike-scan can discover and identify IPsec VPN systems running IKE.
<span style='display:block; white-space:pre;background:#ffe0e0;'>-long_description ${description}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-github.tarball_from archive
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-depends_lib path:lib/libssl.dylib:openssl
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+long_description {*}${description}
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>-patchfiles fclose.patch \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- implicit.patch \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- null-pointer-deref.patch
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+depends_lib-append path:lib/libssl.dylib:openssl
</span>
use_autoreconf yes
<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>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 24730906134..00000000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/security/ike-scan/files/fclose.patch
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,15 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-Fix resource leak.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-https://github.com/royhills/ike-scan/commit/0e884b07ccc3f36804a4f516e9ec634342fb2a59
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- isakmp.c.orig
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ isakmp.c
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -2720,6 +2720,10 @@ print_psk_crack_values(const char *psk_crack_file) {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- hexdata=hexstring(psk_values.hash_r, psk_values.hash_r_len);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- fprintf(fp, "%s\n", hexdata);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- free(hexdata);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ if (psk_crack_file[0]) {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ fclose(fp);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- /*
</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>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 9107f04156a..00000000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/security/ike-scan/files/implicit.patch
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,22 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-Fix implicit declaration of functions.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-https://github.com/royhills/ike-scan/commit/c9ef0569443b03fda5339911acb8056a73c952de
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- acinclude.m4.orig
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ acinclude.m4
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -145,7 +145,7 @@ int does_int64_work()
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- return 1;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- main() {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- exit(! does_int64_work());
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ return ! does_int64_work();
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }],
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- [Ac_cachevar=yes],
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- [Ac_cachevar=no],
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -201,7 +201,7 @@ int does_int64_snprintf_work()
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- return 1;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- main() {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- exit(! does_int64_snprintf_work());
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ return ! does_int64_snprintf_work();
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }],
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- [pgac_cv_snprintf_long_long_int_format=$pgac_format; break],
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- [],
</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>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 36dd53e3de3..00000000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/security/ike-scan/files/null-pointer-deref.patch
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,13 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-Fix null pointer dereference.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-https://github.com/royhills/ike-scan/commit/c1a31cfb3e3e9596b5bd2a62523555e3be945562
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- ike-scan.c.orig
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ ike-scan.c
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -1325,7 +1325,7 @@ add_host(const char *name, unsigned timeout, unsigned *num_hosts,
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- Gettimeofday(&now);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- he->n = *num_hosts;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- if (no_dns_flag)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ if (no_dns_flag || numeric_only)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- memcpy(&(he->addr), &inp, sizeof(struct in_addr));
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- else
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- memcpy(&(he->addr), hp->h_addr_list[0], sizeof(struct in_addr));
</span></pre><pre style='margin:0'>
</pre>