<pre style='margin:0'>
Blair Zajac (blair) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/2ce8dcf6744c0c249c4e27a46d0fd5f9e0386350">https://github.com/macports/macports-ports/commit/2ce8dcf6744c0c249c4e27a46d0fd5f9e0386350</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 2ce8dcf6744 fwknop-client: work around build errors on Somona
</span>2ce8dcf6744 is described below
<span style='display:block; white-space:pre;color:#808000;'>commit 2ce8dcf6744c0c249c4e27a46d0fd5f9e0386350
</span>Author: Blair Zajac <blair@macports.org>
AuthorDate: Mon May 27 16:06:25 2024 -0700
<span style='display:block; white-space:pre;color:#404040;'> fwknop-client: work around build errors on Somona
</span>---
net/fwknop-client/Portfile | 2 +
net/fwknop-client/files/patch-configure.ac.diff | 160 ++++++++++++++++++++++++
2 files changed, 162 insertions(+)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/net/fwknop-client/Portfile b/net/fwknop-client/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 18fa0ab9702..12c7982fe5b 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/net/fwknop-client/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/net/fwknop-client/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -43,6 +43,8 @@ depends_lib-append path:bin/gpg:gnupg2 \
</span>
conflicts_build ${name}
<span style='display:block; white-space:pre;background:#e0ffe0;'>+patchfiles-append patch-configure.ac.diff
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> use_autoreconf yes
configure.args-append --disable-server
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/net/fwknop-client/files/patch-configure.ac.diff b/net/fwknop-client/files/patch-configure.ac.diff
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 00000000000..6f1581e8e9b
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/net/fwknop-client/files/patch-configure.ac.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,160 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# Comment out code that generates this configure error. This code
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# looks for specific firewall implementations but this necessary for
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# only the client portion of fwknop.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+#
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# checking for gpg... /opt/local/bin/gpg
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# checking for wget... /opt/local/bin/wget
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# ./configure: line 18794: syntax error near unexpected token `;;'
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# ./configure: line 18794: ` ;;'
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# Command failed: cd "/opt/local/var/macports/build/...../fwknop-client/work/fwknop-2.6.10" && ./configure --prefix=/opt/local --disable-server
</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;'>+--- configure.ac.orig 2018-08-06 17:41:32
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ configure.ac 2024-05-27 15:56:16
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -611,146 +611,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ AM_CONDITIONAL([USE_NDBM], [test x$use_ndbm = xyes])
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ AM_CONDITIONAL([CONFIG_FILE_CACHE], [test x$want_file_cache = xyes])
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-dnl Check for firewalld
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-dnl
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- AC_ARG_WITH([firewall-cmd],
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- [AS_HELP_STRING([--with-firewall-cmd=/path/to/firewall-cmd],
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- [Specify path to the firewall-cmd executable @<:@default=check path@:>@])],
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- [
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- AS_IF([ test "x$withval" = xno ], [],
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- AS_IF([ test "x$withval" = x -o "x$withval" = xyes ],
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- [AC_MSG_ERROR([--with-firewall-cmd requires an argument specifying a path to firewall-cmd])],
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- [ FORCE_FIREWALLD_EXE=$withval ]
</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;background:#e0ffe0;'>+- AC_PATH_PROG(FIREWALLD_EXE, [firewall-cmd], [], [$APP_PATH])
</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;'>+- AC_ARG_WITH([firewalld],
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- [AS_HELP_STRING([--with-firewalld=/path/to/firewall-cmd],
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- [Synonym for --with-firewall-cmd, specify path to the firewall-cmd executable @<:@default=check path@:>@])],
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- [
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- AS_IF([ test "x$withval" = xno ], [],
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- AS_IF([ test "x$withval" = x -o "x$withval" = xyes ],
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- [AC_MSG_ERROR([--with-firewalld requires an argument specifying a path to firewall-cmd])],
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- [ FORCE_FIREWALLD_EXE=$withval ]
</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;background:#e0ffe0;'>+- AC_PATH_PROG(FIREWALLD_EXE, [firewalld], [], [$APP_PATH])
</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;'>+-dnl Check for iptables
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-dnl
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- AC_ARG_WITH([iptables],
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- [AS_HELP_STRING([--with-iptables=/path/to/iptables],
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- [Specify path to the iptables executable @<:@default=check path@:>@])],
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- [
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- AS_IF([ test "x$withval" = xno ], [],
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- AS_IF([ test "x$withval" = x -o "x$withval" = xyes ],
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- [AC_MSG_ERROR([--with-iptables requires an argument specifying a path to iptables])],
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- [ FORCE_IPTABLES_EXE=$withval ]
</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;background:#e0ffe0;'>+- AC_PATH_PROG(IPTABLES_EXE, [iptables], [], [$APP_PATH])
</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;'>+-dnl Check for ipfw
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-dnl
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- AC_ARG_WITH([ipfw],
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- [AS_HELP_STRING([--with-ipfw=/path/to/ipfw],
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- [Specify path to the ipfw executable @<:@default=check path@:>@])],
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- [
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- AS_IF([ test "x$withval" = xno ], [],
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- AS_IF([ test "x$withval" = x -o "x$withval" = xyes ],
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- [AC_MSG_ERROR([--with-ipfw requires an argument specifying a path to ipfw])],
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- [ FORCE_IPFW_EXE=$withval ]
</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;background:#e0ffe0;'>+- AC_PATH_PROG(IPFW_EXE, [ipfw], [], [$APP_PATH])
</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;'>+-dnl Check for pf from OpenBSD
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-dnl
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- AC_ARG_WITH([pf],
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- [AS_HELP_STRING([--with-pf=/path/to/pfctl],
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- [Specify path to the pf executable @<:@default=check path@:>@])],
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- [
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- AS_IF([ test "x$withval" = xno ], [],
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- AS_IF([ test "x$withval" = x -o "x$withval" = xyes ],
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- [AC_MSG_ERROR([--with-pf requires an argument specifying a path to pf])],
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- [ FORCE_PF_EXE=$withval ]
</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;background:#e0ffe0;'>+- AC_PATH_PROG(PF_EXE, [pfctl], [], [$APP_PATH])
</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;'>+-dnl Check for ipf (ipfilter)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-dnl
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- AC_ARG_WITH([ipf],
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- [AS_HELP_STRING([--with-ipf=/path/to/ipf],
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- [Specify path to the ipf executable @<:@default=check path@:>@])],
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- [
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- AS_IF([ test "x$withval" = xno ], [],
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- AS_IF([ test "x$withval" = x -o "x$withval" = xyes ],
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- [AC_MSG_ERROR([--with-ipf requires an argument specifying a path to ipf])],
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- [ FORCE_IPF_EXE=$withval ]
</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;background:#e0ffe0;'>+- AC_PATH_PROG(IPF_EXE, [ipf], [], [$APP_PATH])
</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;'>+-dnl If a firewall was forced. set the appropriate _EXE var and clear the others.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-dnl
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- AS_IF([test "x$FORCE_FIREWALLD_EXE" != x], [
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- FIREWALLD_EXE="$FORCE_FIREWALLD_EXE"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- ],[
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- AS_IF([test "x$FORCE_IPTABLES_EXE" != x], [
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- IPTABLES_EXE="$FORCE_IPTABLES_EXE"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- FIREWALLD_EXE=""
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- ],[
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- AS_IF([test "x$FORCE_IPFW_EXE" != x], [
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- IPFW_EXE="$FORCE_IPFW_EXE"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- IPTABLES_EXE=""
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- FIREWALLD_EXE=""
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- ],[
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- AS_IF([test "x$FORCE_PF_EXE" != x], [
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- PF_EXE="$FORCE_PF_EXE"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- IPFW_EXE=""
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- IPTABLES_EXE=""
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- FIREWALLD_EXE=""
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- ],[
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- AS_IF([test "x$FORCE_IPF_EXE" != x], [
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- IPF_EXE="$FORCE_IPF_EXE"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- PF_EXE=""
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- IPFW_EXE=""
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- IPTABLES_EXE=""
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- FIREWALLD_EXE=""
</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;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;'>+ dnl Determine which firewall exe we use (if we have one).
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ dnl If firewalld was found or specified, it wins, then we fallback to iptables,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ dnl then ipfw, pf, and otherwise we try ipf.
</span></pre><pre style='margin:0'>
</pre>