<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/c3cd228524c0e3f680886d1bd2c25d91222482cf">https://github.com/macports/macports-ports/commit/c3cd228524c0e3f680886d1bd2c25d91222482cf</a></p>
<pre style="white-space: pre; background: #F8F8F8"><span style='display:block; white-space:pre;color:#808000;'>commit c3cd228524c0e3f680886d1bd2c25d91222482cf
</span>Author: Ryan Schmidt <ryandesign@macports.org>
AuthorDate: Tue Aug 29 01:54:38 2023 -0500
<span style='display:block; white-space:pre;color:#404040;'> net-snmp: Update to 5.9.4
</span>---
net/net-snmp/Portfile | 25 ++++++------------
net/net-snmp/files/Makefile.top-libtool-tag.patch | 12 ++++-----
net/net-snmp/files/configure-frameworks.patch | 31 ++++++++++++-----------
net/net-snmp/files/configure-perl-cc.patch | 14 ----------
net/net-snmp/files/icmp.h.patch | 12 ---------
5 files changed, 30 insertions(+), 64 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/net/net-snmp/Portfile b/net/net-snmp/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 2dfcc7033b4..0df2e74ece9 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/net/net-snmp/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/net/net-snmp/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -4,11 +4,11 @@ PortSystem 1.0
</span> PortGroup perl5 1.0
name net-snmp
<span style='display:block; white-space:pre;background:#ffe0e0;'>-version 5.9.1
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-revision 1
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-checksums rmd160 3e9cdfbb383abfb981854aede71476fe7df35ae6 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 eb7fd4a44de6cddbffd9a92a85ad1309e5c1054fb9d5a7dd93079c8953f48c3f \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- size 6711774
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+version 5.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 f889d5aafce06974756503fe2beb109f5a2081a8 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 8b4de01391e74e3c7014beb43961a2d6d6fa03acc34280b9585f4930745b0544 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 6681606
</span>
categories net
license BSD
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -31,8 +31,6 @@ perl5.branches 5.28 5.30 5.32 5.34
</span> perl5.default_branch 5.34
perl5.create_variants ${perl5.branches}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-depends_build port:automake
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span> depends_lib port:bzip2 \
port:libpcap \
port:pcre \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -40,25 +38,18 @@ depends_lib port:bzip2 \
</span> port:zlib
patchfiles-append configure-frameworks.patch
<span style='display:block; white-space:pre;background:#ffe0e0;'>-patchfiles-append configure-perl-cc.patch
</span> patchfiles-append fix-order-of-L-flags.patch
patchfiles-append Makefile.top-libtool-tag.patch
<span style='display:block; white-space:pre;background:#ffe0e0;'>-patchfiles-append icmp.h.patch
</span>
post-patch {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- # Update config.guess and config.sub for arm64 support.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # https://github.com/petdance/tidyp/issues/15
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # https://github.com/petdance/tidyp/issues/17
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # https://github.com/petdance/tidyp/issues/19
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- set automake_dirs [glob -directory ${prefix}/share automake-*]
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- set automake_dir [lindex [lsort -command vercmp $automake_dirs] end]
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- copy -force ${automake_dir}/config.guess ${automake_dir}/config.sub \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ${worksrcpath}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # https://github.com/net-snmp/net-snmp/issues/646
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ reinplace "s|5\\.9\\.4\\.pre2|${version}|g" ${worksrcpath}/configure
</span> }
configure.env-append PERLPROG=${perl5.bin}
configure.args --disable-embedded-perl \
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ --disable-perl-cc-checks \
</span> --with-defaults \
--with-sys-contact=nobody@no.where \
--with-perl-modules \
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/net/net-snmp/files/Makefile.top-libtool-tag.patch b/net/net-snmp/files/Makefile.top-libtool-tag.patch
</span><span style='display:block; white-space:pre;color:#808080;'>index 62cd3f1de93..14fdb6d79d0 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/net/net-snmp/files/Makefile.top-libtool-tag.patch
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/net/net-snmp/files/Makefile.top-libtool-tag.patch
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -5,14 +5,14 @@ libtool: error: specify a tag with '--tag'
</span>
https://github.com/net-snmp/net-snmp/issues/647
https://github.com/net-snmp/net-snmp/pull/648
<span style='display:block; white-space:pre;background:#ffe0e0;'>---- Makefile.top.orig 2021-05-25 17:19:35.000000000 -0500
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ Makefile.top 2023-08-29 01:35:02.000000000 -0500
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- Makefile.top.orig 2023-08-15 15:32:01.000000000 -0500
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ Makefile.top 2023-08-29 01:38:51.000000000 -0500
</span> @@ -86,18 +86,18 @@
<span style='display:block; white-space:pre;background:#ffe0e0;'>- LIBAGE = 1
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- LIBREVISION = 0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ LIBAGE = 2
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ LIBREVISION = 1
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>--LIB_LD_CMD = $(LIBTOOL) --mode=link $(LINKCC) $(CFLAGS) -rpath $(libdir) -version-info $(LIBCURRENT):$(LIBREVISION):$(LIBAGE) -o
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+LIB_LD_CMD = $(LIBTOOL) --mode=link --tag=CC $(LINKCC) $(CFLAGS) -rpath $(libdir) -version-info $(LIBCURRENT):$(LIBREVISION):$(LIBAGE) -o
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-LIB_LD_CMD = $(LIBTOOL) --mode=link $(LINKCC) $(CFLAGS) -rpath $(libdir) -version-info $(LIBCURRENT):$(LIBREVISION):$(LIBAGE) @LD_NO_UNDEFINED@ -o
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++LIB_LD_CMD = $(LIBTOOL) --mode=link --tag=CC $(LINKCC) $(CFLAGS) -rpath $(libdir) -version-info $(LIBCURRENT):$(LIBREVISION):$(LIBAGE) @LD_NO_UNDEFINED@ -o
</span> LIB_EXTENSION = la
LIB_VERSION =
LIB_LDCONFIG_CMD = $(LIBTOOL) --mode=finish $(INSTALL_PREFIX)$(libdir)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/net/net-snmp/files/configure-frameworks.patch b/net/net-snmp/files/configure-frameworks.patch
</span><span style='display:block; white-space:pre;color:#808080;'>index 46877041f5a..f1334458582 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/net/net-snmp/files/configure-frameworks.patch
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/net/net-snmp/files/configure-frameworks.patch
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,16 +1,16 @@
</span> Always link with macOS frameworks but don't use -flat_namespace.
https://sourceforge.net/p/net-snmp/bugs/2634/
<span style='display:block; white-space:pre;background:#ffe0e0;'>---- configure.orig 2021-05-25 17:19:37.000000000 -0500
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ configure 2021-06-27 04:28:24.000000000 -0500
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -17327,37 +17327,9 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- configure.orig 2023-08-15 15:32:24.000000000 -0500
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ configure 2023-08-28 22:52:19.000000000 -0500
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -18348,38 +18348,9 @@
</span> ;;
darwin*)
- # Flat Namespace linking (Mac OS/X)
+ # Add frameworks (macOS)
#
<span style='display:block; white-space:pre;background:#ffe0e0;'>-- { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether darwin ld might need -flat_namespace" >&5
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--$as_echo_n "checking whether darwin ld might need -flat_namespace... " >&6; }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether darwin ld might need -flat_namespace" >&5
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-printf %s "checking whether darwin ld might need -flat_namespace... " >&6; }
</span> - if test -z "$MACOSX_DEPLOYMENT_TARGET"; then
- saved_LDFLAGS="$LDFLAGS"
- LDFLAGS="-flat_namespace -framework CoreFoundation -framework CoreServices -framework DiskArbitration -framework IOKit $LDFLAGS"
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -18,25 +18,26 @@ https://sourceforge.net/p/net-snmp/bugs/2634/
</span> -/* end confdefs.h. */
-
-int
<span style='display:block; white-space:pre;background:#ffe0e0;'>--main ()
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-main (void)
</span> -{
-
- ;
- return 0;
-}
-_ACEOF
<span style='display:block; white-space:pre;background:#ffe0e0;'>--if ac_fn_c_try_link "$LINENO"; then :
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--$as_echo "yes" >&6; }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--else
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- LDFLAGS="$saved_LDFLAGS"; { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--$as_echo "no" >&6; }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-if ac_fn_c_try_link "$LINENO"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-then :
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-printf "%s\n" "yes" >&6; }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-else $as_nop
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- LDFLAGS="$saved_LDFLAGS"; { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-printf "%s\n" "no" >&6; }
</span> -fi
<span style='display:block; white-space:pre;background:#ffe0e0;'>--rm -f core conftest.err conftest.$ac_objext \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-rm -f core conftest.err conftest.$ac_objext conftest.beam \
</span> - conftest$ac_exeext conftest.$ac_ext
- else
<span style='display:block; white-space:pre;background:#ffe0e0;'>-- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--$as_echo "no" >&6; }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-printf "%s\n" "no" >&6; }
</span> - fi
+ LDFLAGS="-framework CoreFoundation -framework CoreServices -framework DiskArbitration -framework IOKit $LDFLAGS"
;;
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/net/net-snmp/files/configure-perl-cc.patch b/net/net-snmp/files/configure-perl-cc.patch
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 829ccfff8d2..00000000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/net/net-snmp/files/configure-perl-cc.patch
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,14 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-Allow the compiler name to contain periods.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-https://sourceforge.net/p/net-snmp/patches/1375/
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-https://github.com/net-snmp/net-snmp/pull/309
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- configure.orig 2021-05-25 17:19:37.000000000 -0500
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ configure 2021-06-27 04:01:44.000000000 -0500
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -26240,7 +26240,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for Perl cc" >&5
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- $as_echo_n "checking for Perl cc... " >&6; }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- PERLCC=`$myperl -V:cc | $myperl -n -e 'print if (s/^\s*cc=.([-=\w\s\/]+).;\s*/$1/);'`
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ PERLCC=`$myperl -V:cc | $myperl -n -e 'print if (s/^\s*cc=.([-=\w\s\/.]+).;\s*/$1/);'`
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if test "x$PERLCC" != "x" ; then
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $PERLCC" >&5
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/net/net-snmp/files/icmp.h.patch b/net/net-snmp/files/icmp.h.patch
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index e32e90ddc63..00000000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/net/net-snmp/files/icmp.h.patch
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,12 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-https://github.com/net-snmp/net-snmp/issues/226
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- agent/mibgroup/mibII/icmp.h.orig 2021-05-25 17:19:35.000000000 -0500
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ agent/mibgroup/mibII/icmp.h 2021-06-27 05:02:43.000000000 -0500
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -10,7 +10,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #elif defined(linux)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- config_require(mibII/kernel_linux)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #elif defined(freebsd4) || defined(openbsd4) || defined(dragonfly2) || \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- defined(darwin10)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ defined(darwin)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- config_require(mibII/kernel_sysctl)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #elif defined(netbsd) || defined(netbsdelf)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- config_require(mibII/kernel_netbsd)
</span></pre><pre style='margin:0'>
</pre>