CVS commit: pkgsrc/net

To: pkgsrc-changes%NetBSD.org@localhost
Subject: CVS commit: pkgsrc/net
From: "Thomas Klausner" <wiz%netbsd.org@localhost>
Date: Wed, 21 Feb 2024 10:21:01 +0000

Module Name:    pkgsrc
Committed By:   wiz
Date:           Wed Feb 21 10:21:01 UTC 2024

Modified Files:
        pkgsrc/net/net-snmp: Makefile Makefile.common PLIST buildlink3.mk
            builtin.mk distinfo
        pkgsrc/net/net-snmp/patches:
            patch-agent_mibgroup_if-mib_data__access_interface.h
            patch-agent_mibgroup_mibII_tcp.c
            patch-agent_mibgroup_mibII_var__route.c patch-agent_snmp__perl.c
            patch-configure
        pkgsrc/net/py-netsnmp: Makefile
Removed Files:
        pkgsrc/net/net-snmp/files: disklabel.h
        pkgsrc/net/net-snmp/patches: patch-agent_mibgroup_host_hr__storage.c
            patch-agent_mibgroup_mibII_interfaces.c
            patch-agent_mibgroup_mibII_ipv6.c
            patch-agent_mibgroup_mibII_tcpTable.c
            patch-agent_mibgroup_mibII_udp.c
            patch-agent_mibgroup_mibII_udpTable.c
            patch-agent_mibgroup_ucd-snmp_memory__netbsd1.c

Log Message:
*net-snmp: update to 5.9.4

*5.9.4*:

    IMPORTANT: SNMP over TLS and/or DTLS are not functioning properly
    in this release with various versions of OpenSSL and will be fixed
    in a future release.

    libsnmp:
      - Remove the SNMP_SWIPE_MEM() macro Remove this macro since it is not
        used in the Net-SNMP code base.
      - DISPLAY-HINT fixes
      - Miscellanious improvements to the transports
      - Handle multiple oldEngineID configuration lines
      - fixes for DNS names longer than 63 characters

    agent:
      - Added a ignoremount configuration option for the HOST-MIB
      - disallow SETs with a NULL varbind
      - fix the --enable-minimalist build

    apps:
      - snmpset: allow SET with NULL varbind for testing
      - snmptrapd: improved MySQL logging code

    general:
      - configure: Remove -Wno-deprecated as it is no longer needed
      - miscellanious ther bug fixes, build fixes and cleanups


To generate a diff of this commit:
cvs rdiff -u -r1.142 -r1.143 pkgsrc/net/net-snmp/Makefile
cvs rdiff -u -r1.7 -r1.8 pkgsrc/net/net-snmp/Makefile.common
cvs rdiff -u -r1.30 -r1.31 pkgsrc/net/net-snmp/PLIST
cvs rdiff -u -r1.19 -r1.20 pkgsrc/net/net-snmp/buildlink3.mk
cvs rdiff -u -r1.4 -r1.5 pkgsrc/net/net-snmp/builtin.mk
cvs rdiff -u -r1.102 -r1.103 pkgsrc/net/net-snmp/distinfo
cvs rdiff -u -r1.1.1.1 -r0 pkgsrc/net/net-snmp/files/disklabel.h
cvs rdiff -u -r1.1 -r0 \
    pkgsrc/net/net-snmp/patches/patch-agent_mibgroup_host_hr__storage.c \
    pkgsrc/net/net-snmp/patches/patch-agent_mibgroup_mibII_interfaces.c \
    pkgsrc/net/net-snmp/patches/patch-agent_mibgroup_mibII_udp.c \
    pkgsrc/net/net-snmp/patches/patch-agent_mibgroup_ucd-snmp_memory__netbsd1.c
cvs rdiff -u -r1.1 -r1.2 \
    pkgsrc/net/net-snmp/patches/patch-agent_mibgroup_if-mib_data__access_interface.h \
    pkgsrc/net/net-snmp/patches/patch-agent_mibgroup_mibII_tcp.c \
    pkgsrc/net/net-snmp/patches/patch-agent_mibgroup_mibII_var__route.c \
    pkgsrc/net/net-snmp/patches/patch-agent_snmp__perl.c
cvs rdiff -u -r1.3 -r0 \
    pkgsrc/net/net-snmp/patches/patch-agent_mibgroup_mibII_ipv6.c \
    pkgsrc/net/net-snmp/patches/patch-agent_mibgroup_mibII_tcpTable.c
cvs rdiff -u -r1.4 -r0 \
    pkgsrc/net/net-snmp/patches/patch-agent_mibgroup_mibII_udpTable.c
cvs rdiff -u -r1.3 -r1.4 pkgsrc/net/net-snmp/patches/patch-configure
cvs rdiff -u -r1.13 -r1.14 pkgsrc/net/py-netsnmp/Makefile

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/net/net-snmp/Makefile
diff -u pkgsrc/net/net-snmp/Makefile:1.142 pkgsrc/net/net-snmp/Makefile:1.143
--- pkgsrc/net/net-snmp/Makefile:1.142  Tue Oct 24 22:10:26 2023
+++ pkgsrc/net/net-snmp/Makefile        Wed Feb 21 10:21:00 2024
@@ -1,6 +1,5 @@
-# $NetBSD: Makefile,v 1.142 2023/10/24 22:10:26 wiz Exp $
+# $NetBSD: Makefile,v 1.143 2024/02/21 10:21:00 wiz Exp $
 
-PKGREVISION= 2
 .include "Makefile.common"
 CATEGORIES=    net
 
@@ -14,7 +13,8 @@ USE_LIBTOOL=          yes
 GNU_CONFIGURE=         yes
 
 MAKE_ENV+=     OPSYS=${OPSYS}
-MAKE_JOBS_SAFE=        no
+
+CHECK_WRKREF_SKIP+=    bin/net-snmp-config
 
 .include "../../mk/bsd.prefs.mk"
 
@@ -74,10 +74,10 @@ CONFIGURE_ARGS+=    --with-mib-modules="smu
 .else
 CONFIGURE_ARGS+=       --with-mib-modules="smux host"
 .endif
-.if !empty(MACHINE_PLATFORM:MDarwin-[567].*)
+.if ${MACHINE_PLATFORM:MDarwin-[567].*}
 CONFIGURE_ARGS+=       --with-out-mib-modules="ucd-snmp/diskio mibII"
 .endif
-.if !empty(MACHINE_PLATFORM:MDarwin-9.*)
+.if ${MACHINE_PLATFORM:MDarwin-9.*}
 CONFIGURE_ARGS+=       --with-mib-modules="host ucd-snmp/diskio"
 CONFIGURE_ARGS+=       --with-out-mib-modules="mibII/icmp host/hr_swrun"
 CONFIGURE_ARGS+=       --enable-as-needed
@@ -108,17 +108,13 @@ USE_TOOLS+=               sh:run
 
 INSTALLATION_DIRS+=    share/examples/net-snmp
 
+BUILD_DEFS+=   VARBASE
+
 post-extract:
 .if ${OPSYS} == "DragonFly"
        ${CP} ${FILESDIR}/cpu_dragonfly.c ${WRKSRC}/agent/mibgroup/hardware/cpu/cpu_nlist.c
 .endif
 
-post-wrapper:
-.if !empty(MACHINE_PLATFORM:MNetBSD-1.5.[123]*-i386)
-       mkdir ${BUILDLINK_DIR}/include/sys
-       cp ${FILESDIR}/disklabel.h ${BUILDLINK_DIR}/include/sys
-.endif
-
 post-install:
        ${INSTALL_DATA} ${WRKSRC}/EXAMPLE.conf  \
                ${DESTDIR}${PREFIX}/share/examples/net-snmp/EXAMPLE.conf

Index: pkgsrc/net/net-snmp/Makefile.common
diff -u pkgsrc/net/net-snmp/Makefile.common:1.7 pkgsrc/net/net-snmp/Makefile.common:1.8
--- pkgsrc/net/net-snmp/Makefile.common:1.7     Tue Oct 18 12:01:52 2022
+++ pkgsrc/net/net-snmp/Makefile.common Wed Feb 21 10:21:00 2024
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile.common,v 1.7 2022/10/18 12:01:52 adam Exp $
+# $NetBSD: Makefile.common,v 1.8 2024/02/21 10:21:00 wiz Exp $
 # used by net/net-snmp/Makefile
 # used by net/py-netsnmp/Makefile
 
-DISTNAME=      net-snmp-5.9.3
+DISTNAME=      net-snmp-5.9.4
 MASTER_SITES=  ${MASTER_SITE_SOURCEFORGE:=net-snmp/}
 
 HOMEPAGE=      http://www.net-snmp.org/

Index: pkgsrc/net/net-snmp/PLIST
diff -u pkgsrc/net/net-snmp/PLIST:1.30 pkgsrc/net/net-snmp/PLIST:1.31
--- pkgsrc/net/net-snmp/PLIST:1.30      Tue Oct 18 12:01:52 2022
+++ pkgsrc/net/net-snmp/PLIST   Wed Feb 21 10:21:00 2024
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.30 2022/10/18 12:01:52 adam Exp $
+@comment $NetBSD: PLIST,v 1.31 2024/02/21 10:21:00 wiz Exp $
 bin/agentxtrap
 ${PLIST.perl}bin/checkbandwidth
 bin/encode_keychange
@@ -122,7 +122,6 @@ include/net-snmp/library/snmp-tc.h
 include/net-snmp/library/snmp.h
 include/net-snmp/library/snmpAliasDomain.h
 include/net-snmp/library/snmpCallbackDomain.h
-include/net-snmp/library/snmpIPBaseDomain.h
 include/net-snmp/library/snmpIPv4BaseDomain.h
 ${PLIST.inet6}include/net-snmp/library/snmpIPv6BaseDomain.h
 include/net-snmp/library/snmpSocketBaseDomain.h

Index: pkgsrc/net/net-snmp/buildlink3.mk
diff -u pkgsrc/net/net-snmp/buildlink3.mk:1.19 pkgsrc/net/net-snmp/buildlink3.mk:1.20
--- pkgsrc/net/net-snmp/buildlink3.mk:1.19      Tue Oct 24 22:10:26 2023
+++ pkgsrc/net/net-snmp/buildlink3.mk   Wed Feb 21 10:21:00 2024
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.19 2023/10/24 22:10:26 wiz Exp $
+# $NetBSD: buildlink3.mk,v 1.20 2024/02/21 10:21:00 wiz Exp $
 
 BUILDLINK_TREE+=       net-snmp
 
@@ -12,7 +12,7 @@ BUILDLINK_PKGSRCDIR.net-snmp?=                ../../ne
 pkgbase := net-snmp
 .include "../../mk/pkg-build-options.mk"
 
-.if !empty(PKG_BUILD_OPTIONS.net-snmp:Mssl)
+.if ${PKG_BUILD_OPTIONS.net-snmp:Mssl}
 .  include "../../security/openssl/buildlink3.mk"
 .endif
 

Index: pkgsrc/net/net-snmp/builtin.mk
diff -u pkgsrc/net/net-snmp/builtin.mk:1.4 pkgsrc/net/net-snmp/builtin.mk:1.5
--- pkgsrc/net/net-snmp/builtin.mk:1.4  Sat Jan 13 20:07:34 2024
+++ pkgsrc/net/net-snmp/builtin.mk      Wed Feb 21 10:21:00 2024
@@ -1,4 +1,4 @@
-# $NetBSD: builtin.mk,v 1.4 2024/01/13 20:07:34 riastradh Exp $
+# $NetBSD: builtin.mk,v 1.5 2024/02/21 10:21:00 wiz Exp $
 
 BUILTIN_PKG:=  net-snmp
 
@@ -24,7 +24,7 @@ MAKEVARS+=            IS_BUILTIN.net-snmp
 ### a package name to represent the built-in package.
 ###
 .if !defined(BUILTIN_PKG.net-snmp) && \
-    !empty(IS_BUILTIN.net-snmp:M[yY][eE][sS]) && \
+    ${IS_BUILTIN.net-snmp:tl} == yes && \
     empty(H_NETSNMP:M__nonexistent__)
 BUILTIN_VERSION.net-snmp!=                             \
        ${AWK} '/\#define[       ]*PACKAGE_VERSION/ {   \
@@ -47,10 +47,10 @@ USE_BUILTIN.net-snmp=       no
 .  else
 USE_BUILTIN.net-snmp=  ${IS_BUILTIN.net-snmp}
 .    if defined(BUILTIN_PKG.net-snmp) && \
-        !empty(IS_BUILTIN.net-snmp:M[yY][eE][sS])
+        ${IS_BUILTIN.net-snmp:tl} == yes
 USE_BUILTIN.net-snmp=  yes
 .      for _dep_ in ${BUILDLINK_API_DEPENDS.net-snmp}
-.        if !empty(USE_BUILTIN.net-snmp:M[yY][eE][sS])
+.        if ${USE_BUILTIN.net-snmp:tl} == yes
 USE_BUILTIN.net-snmp!=                                                 \
        if ${PKG_ADMIN} pmatch ${_dep_:Q} ${BUILTIN_PKG.net-snmp}; then \
                ${ECHO} yes;                                            \

Index: pkgsrc/net/net-snmp/distinfo
diff -u pkgsrc/net/net-snmp/distinfo:1.102 pkgsrc/net/net-snmp/distinfo:1.103
--- pkgsrc/net/net-snmp/distinfo:1.102  Sat Jan 14 21:11:35 2023
+++ pkgsrc/net/net-snmp/distinfo        Wed Feb 21 10:21:00 2024
@@ -1,31 +1,24 @@
-$NetBSD: distinfo,v 1.102 2023/01/14 21:11:35 mrg Exp $
+$NetBSD: distinfo,v 1.103 2024/02/21 10:21:00 wiz Exp $
 
-BLAKE2s (net-snmp-5.9.3.tar.gz) = c5f3e30c73294c0f8b7db2a776a0a28e6f63ed1d55f32acb4328fbbb277cbe4a
-SHA512 (net-snmp-5.9.3.tar.gz) = a476df4967029a2eb03d27b0e250170785d0a8c143d49b900ee958c3cbdfaccd415b70af40f6fbed9cb8819d522c35a6073a431091d908ccc7c018fa0aaa2abc
-Size (net-snmp-5.9.3.tar.gz) = 6646950 bytes
+BLAKE2s (net-snmp-5.9.4.tar.gz) = 44b2e38afb93da994d7d90f342a9971c266f710e232c84206e204bb9a1266fe6
+SHA512 (net-snmp-5.9.4.tar.gz) = a510fa91a21e9ddc86a12fd1d0bc6b356e63f3ea53f184d2e31439004d41d902390664134dc40b3b828eabb4282eaf3da628a07c4d480fa00eff7e700950c423
+Size (net-snmp-5.9.4.tar.gz) = 6681606 bytes
 SHA1 (patch-agent_auto__nlist.c) = a8fe703d8902c2847ca6692af4400ddbf9cbe74b
 SHA1 (patch-agent_mibgroup_hardware_cpu_cpu__sysctl.c) = 22fd0b95e06117fd8f59bd0112b2c91e40d61e70
 SHA1 (patch-agent_mibgroup_hardware_memory_memory__freebsd.c) = 51d2c7e11b3d422e57ea2f5761aff624f7333842
 SHA1 (patch-agent_mibgroup_hardware_memory_memory__netbsd.c) = 928a5aa99e7893ee91dea3110db8098212e328fa
 SHA1 (patch-agent_mibgroup_host_data__access_swrun__kinfo.c) = f983ae0d99d85ab1ac6dc7cf2d2c0415b6935258
-SHA1 (patch-agent_mibgroup_host_hr__storage.c) = d9595eceeb5ee986ab4365f62e3c3ab339e605aa
 SHA1 (patch-agent_mibgroup_host_hr__swrun.c) = d01e8a93f6e766cedfdc324efd69168f71aac76f
-SHA1 (patch-agent_mibgroup_if-mib_data__access_interface.h) = f888d65ec32020dc75d60d5d67ec54614d934489
+SHA1 (patch-agent_mibgroup_if-mib_data__access_interface.h) = 839003d31a74db7ea71774da0f8c80748c3fc7d3
 SHA1 (patch-agent_mibgroup_kernel__sunos5.c) = e1cfb194ec2ef784ae8bdf1ff3537edc9b30b66c
 SHA1 (patch-agent_mibgroup_kernel__sunos5.h) = eb80eb5e55020014b1e5524fd572839aefdce5a5
 SHA1 (patch-agent_mibgroup_mibII_icmp.c) = 50ac67db8a9ffc16d983b4192e74db25ef439321
-SHA1 (patch-agent_mibgroup_mibII_interfaces.c) = 44a4ce6302457094ba2b200e4c47ff6c2a425746
 SHA1 (patch-agent_mibgroup_mibII_ip.c) = 04c2a487bad8705c9725ef4a62016051d3898970
 SHA1 (patch-agent_mibgroup_mibII_ipAddr.c) = cd3345a4b30fe2280d0555ee38feb5f957a55b1e
-SHA1 (patch-agent_mibgroup_mibII_ipv6.c) = f1e99ab8b5d5f31660112b85d863cc9ff90e0fdb
-SHA1 (patch-agent_mibgroup_mibII_tcp.c) = 92563fd6be6f27be5b348cdc8bc02061374026b0
-SHA1 (patch-agent_mibgroup_mibII_tcpTable.c) = 7996885e155e8283c41c842f1e5d92d27ea8d8ae
-SHA1 (patch-agent_mibgroup_mibII_udp.c) = d110e996d0538d17251d39a5eed46df6944ba0fa
-SHA1 (patch-agent_mibgroup_mibII_udpTable.c) = 21505245b5c5f159e3eff616ffb639ae180d8362
-SHA1 (patch-agent_mibgroup_mibII_var__route.c) = 919348e62849367793e4abf7d608d9824eb8ff2d
-SHA1 (patch-agent_mibgroup_ucd-snmp_memory__netbsd1.c) = 7336d905bac315f344f93664e4118332f88fb6ee
-SHA1 (patch-agent_snmp__perl.c) = 893cf46624d4f26941b3911a64c752c110ba6ef8
-SHA1 (patch-configure) = 26012c2d7e22b01db3ab3a6d7d959645185065bb
+SHA1 (patch-agent_mibgroup_mibII_tcp.c) = fb065ad10b375b47608a12cf81f29fd473e6fba1
+SHA1 (patch-agent_mibgroup_mibII_var__route.c) = 6050099b8c060f857ec7d05409bc077db21bd650
+SHA1 (patch-agent_snmp__perl.c) = 52b7b26ce8cae6d892b017c50831565fc138a337
+SHA1 (patch-configure) = a6447c8291638d7a3575f53b2f25442ce4d7e487
 SHA1 (patch-ov_UCD-fields) = 40e8d78bad93ca12f4c08c43b86e7f13edafc299
 SHA1 (patch-ov_oid__to__type.in) = 281be9a88860987880c71770f4050fd965dd8ed9
 SHA1 (patch-perl_OID_OID.xs) = b23d7ae82d367d457181d231a56c80e648b0ee6e

Index: pkgsrc/net/net-snmp/patches/patch-agent_mibgroup_if-mib_data__access_interface.h
diff -u pkgsrc/net/net-snmp/patches/patch-agent_mibgroup_if-mib_data__access_interface.h:1.1 pkgsrc/net/net-snmp/patches/patch-agent_mibgroup_if-mib_data__access_interface.h:1.2
--- pkgsrc/net/net-snmp/patches/patch-agent_mibgroup_if-mib_data__access_interface.h:1.1        Tue Oct 18 12:01:52 2022
+++ pkgsrc/net/net-snmp/patches/patch-agent_mibgroup_if-mib_data__access_interface.h    Wed Feb 21 10:21:01 2024
@@ -1,16 +1,16 @@
-$NetBSD: patch-agent_mibgroup_if-mib_data__access_interface.h,v 1.1 2022/10/18 12:01:52 adam Exp $
+$NetBSD: patch-agent_mibgroup_if-mib_data__access_interface.h,v 1.2 2024/02/21 10:21:01 wiz Exp $
 
 Improve portability to newer NetBSD versions.
 
---- agent/mibgroup/if-mib/data_access/interface.h.orig 2022-07-13 21:14:14.000000000 +0000
+--- agent/mibgroup/if-mib/data_access/interface.h.orig 2023-08-15 20:32:01.000000000 +0000
 +++ agent/mibgroup/if-mib/data_access/interface.h
 @@ -34,7 +34,8 @@ config_require(if-mib/data_access/interf
- config_require(if-mib/data_access/interface_ioctl)
+ config_require(if-mib/data_access/interface_ioctl);
  #elif defined( openbsd3 ) ||                                         \
      defined( freebsd4 ) || defined( freebsd5 ) || defined( freebsd6 ) || \
 -    defined( darwin )   || defined( dragonfly ) || defined( netbsd1 )
 +    defined( darwin )   || defined( dragonfly ) || defined( netbsd1 ) || \
 +    defined(netbsd) || defined(netbsdelf) || defined(netbsdelf2) || defined(netbsdelf3)
- config_require(if-mib/data_access/interface_sysctl)
+ config_require(if-mib/data_access/interface_sysctl);
  #elif defined(solaris2)
- config_require(if-mib/data_access/interface_solaris2)
+ config_require(if-mib/data_access/interface_solaris2);
Index: pkgsrc/net/net-snmp/patches/patch-agent_mibgroup_mibII_tcp.c
diff -u pkgsrc/net/net-snmp/patches/patch-agent_mibgroup_mibII_tcp.c:1.1 pkgsrc/net/net-snmp/patches/patch-agent_mibgroup_mibII_tcp.c:1.2
--- pkgsrc/net/net-snmp/patches/patch-agent_mibgroup_mibII_tcp.c:1.1    Tue Oct 18 12:01:52 2022
+++ pkgsrc/net/net-snmp/patches/patch-agent_mibgroup_mibII_tcp.c        Wed Feb 21 10:21:01 2024
@@ -1,8 +1,8 @@
-$NetBSD: patch-agent_mibgroup_mibII_tcp.c,v 1.1 2022/10/18 12:01:52 adam Exp $
+$NetBSD: patch-agent_mibgroup_mibII_tcp.c,v 1.2 2024/02/21 10:21:01 wiz Exp $
 
---- agent/mibgroup/mibII/tcp.c.orig    2012-10-09 22:28:58.000000000 +0000
+--- agent/mibgroup/mibII/tcp.c.orig    2023-08-15 20:32:01.000000000 +0000
 +++ agent/mibgroup/mibII/tcp.c
-@@ -197,6 +197,16 @@ init_tcp(void)
+@@ -205,6 +205,16 @@ typedef uint32_t tcp_stats[TCP_NSTATS];
  #define USES_TRADITIONAL_TCPSTAT
  #endif
  
@@ -19,10 +19,10 @@ $NetBSD: patch-agent_mibgroup_mibII_tcp.
  #if !defined(TCP_STAT_STRUCTURE)
  #define TCP_STAT_STRUCTURE    struct tcpstat
  #define USES_TRADITIONAL_TCPSTAT
-@@ -324,6 +334,75 @@ tcp_handler(netsnmp_mib_handler         
- #endif                        /* linux */
-         netsnmp_set_request_error(reqinfo, request, SNMP_NOSUCHOBJECT);
-         continue;
+@@ -332,6 +342,75 @@ tcp_handler(netsnmp_mib_handler         
+ #elif defined(solaris2)
+         ret_value = tcpstat.tcpOutRsts;
+         break;
 +#elif defined(TCP_NSTAT)
 +    case TCPRTOALGORITHM:      /* Assume Van Jacobsen's algorithm */
 +        ret_value = 4;
@@ -92,6 +92,6 @@ $NetBSD: patch-agent_mibgroup_mibII_tcp.
 +    case TCPOUTRSTS:
 +        ret_value = tcpstat[TCP_STAT_SNDCTRL] - tcpstat[TCP_STAT_CLOSED];
 +        break;
- #elif defined(USES_TRADITIONAL_TCPSTAT) && !defined(_USE_FIRST_PROTOCOL)
- #ifdef HAVE_SYS_TCPIPSTATS_H
-     /*
+ #endif                        /* linux */
+         netsnmp_set_request_error(reqinfo, request, SNMP_NOSUCHOBJECT);
+         continue;
Index: pkgsrc/net/net-snmp/patches/patch-agent_mibgroup_mibII_var__route.c
diff -u pkgsrc/net/net-snmp/patches/patch-agent_mibgroup_mibII_var__route.c:1.1 pkgsrc/net/net-snmp/patches/patch-agent_mibgroup_mibII_var__route.c:1.2
--- pkgsrc/net/net-snmp/patches/patch-agent_mibgroup_mibII_var__route.c:1.1     Tue Oct 18 12:01:52 2022
+++ pkgsrc/net/net-snmp/patches/patch-agent_mibgroup_mibII_var__route.c Wed Feb 21 10:21:01 2024
@@ -1,12 +1,12 @@
-$NetBSD: patch-agent_mibgroup_mibII_var__route.c,v 1.1 2022/10/18 12:01:52 adam Exp $
+$NetBSD: patch-agent_mibgroup_mibII_var__route.c,v 1.2 2024/02/21 10:21:01 wiz Exp $
 
 Fix for systems with RTF_LLDATA in place of RTF_LLINFO.
 
---- agent/mibgroup/mibII/var_route.c.orig      2016-04-29 19:35:23.000000000 +0000
+--- agent/mibgroup/mibII/var_route.c.orig      2023-08-15 20:32:01.000000000 +0000
 +++ agent/mibgroup/mibII/var_route.c
-@@ -954,8 +954,12 @@ load_rtentries(struct radix_node *pt)
+@@ -956,8 +956,12 @@ load_rtentries(struct radix_node *pt)
          }
- #if CHECK_RT_FLAGS
+ #ifdef CHECK_RT_FLAGS
          if (((rt.rt_flags & RTF_CLONING) != RTF_CLONING)
 +#ifdef RTF_LLDATA
 +            && ((rt.rt_flags & RTF_LLDATA) != RTF_LLDATA)) {
Index: pkgsrc/net/net-snmp/patches/patch-agent_snmp__perl.c
diff -u pkgsrc/net/net-snmp/patches/patch-agent_snmp__perl.c:1.1 pkgsrc/net/net-snmp/patches/patch-agent_snmp__perl.c:1.2
--- pkgsrc/net/net-snmp/patches/patch-agent_snmp__perl.c:1.1    Mon Jun  6 14:11:35 2016
+++ pkgsrc/net/net-snmp/patches/patch-agent_snmp__perl.c        Wed Feb 21 10:21:01 2024
@@ -1,10 +1,10 @@
-$NetBSD: patch-agent_snmp__perl.c,v 1.1 2016/06/06 14:11:35 he Exp $
+$NetBSD: patch-agent_snmp__perl.c,v 1.2 2024/02/21 10:21:01 wiz Exp $
 
---- agent/snmp_perl.c.orig     2014-12-08 20:23:22.000000000 +0000
+--- agent/snmp_perl.c.orig     2023-08-15 20:32:01.000000000 +0000
 +++ agent/snmp_perl.c
-@@ -5,6 +5,10 @@
- #include <EXTERN.h>
+@@ -4,6 +4,10 @@
  #include "perl.h"
+ #pragma GCC diagnostic pop
  
 +#ifdef U64TYPE
 +#define U64 U64pairU32

Index: pkgsrc/net/net-snmp/patches/patch-configure
diff -u pkgsrc/net/net-snmp/patches/patch-configure:1.3 pkgsrc/net/net-snmp/patches/patch-configure:1.4
--- pkgsrc/net/net-snmp/patches/patch-configure:1.3     Tue Oct 18 12:01:52 2022
+++ pkgsrc/net/net-snmp/patches/patch-configure Wed Feb 21 10:21:01 2024
@@ -1,102 +1,15 @@
-$NetBSD: patch-configure,v 1.3 2022/10/18 12:01:52 adam Exp $
+$NetBSD: patch-configure,v 1.4 2024/02/21 10:21:01 wiz Exp $
 
 - Do not store configure options as these might be polluted with workdir.
-- Fix configure to look for des_cbc_encrypt in -ldes
 
---- configure.orig     2022-07-13 21:14:22.000000000 +0000
+--- configure.orig     2024-02-21 09:11:27.578146251 +0000
 +++ configure
-@@ -3350,10 +3350,10 @@ ac_config_headers="$ac_config_headers in
+@@ -3752,7 +3752,7 @@ ac_config_headers="$ac_config_headers in
+ # save the configure arguments
  #
  
- cat >>confdefs.h <<_ACEOF
--#define NETSNMP_CONFIGURE_OPTIONS "${NETSNMP_CONFIGURE_OPTIONS-$ac_configure_args}"
-+#define NETSNMP_CONFIGURE_OPTIONS ""
- _ACEOF
+-printf "%s\n" "#define NETSNMP_CONFIGURE_OPTIONS \"${NETSNMP_CONFIGURE_OPTIONS-$ac_configure_args}\"" >>confdefs.h
++printf "%s\n" "#define NETSNMP_CONFIGURE_OPTIONS \"\"" >>confdefs.h
  
--CONFIGURE_OPTIONS="\"$ac_configure_args\""
-+CONFIGURE_OPTIONS="\"\""
+ CONFIGURE_OPTIONS="\"$ac_configure_args\""
  
- 
- #
-@@ -23440,6 +23440,81 @@ fi
- ##
- #########################################
- 
-+
-+echo "$as_me:$LINENO: checking for des_cbc_encrypt in -ldes" >&5
-+echo $ECHO_N "checking for des_cbc_encrypt in -ldes... $ECHO_C" >&6
-+if test "${ac_cv_lib_des_des_cbc_encrypt+set}" = set; then
-+  echo $ECHO_N "(cached) $ECHO_C" >&6
-+else
-+  ac_check_lib_save_LIBS=$LIBS
-+LIBS="-ldes  $LIBS"
-+cat >conftest.$ac_ext <<_ACEOF
-+/* confdefs.h.  */
-+_ACEOF
-+cat confdefs.h >>conftest.$ac_ext
-+cat >>conftest.$ac_ext <<_ACEOF
-+/* end confdefs.h.  */
-+
-+/* Override any gcc2 internal prototype to avoid an error.  */
-+#ifdef __cplusplus
-+extern "C"
-+#endif
-+/* We use char because int might match the return type of a gcc2
-+   builtin and then its argument prototype would still apply.  */
-+char des_cbc_encrypt ();
-+int
-+main ()
-+{
-+des_cbc_encrypt ();
-+  ;
-+  return 0;
-+}
-+_ACEOF
-+rm -f conftest.$ac_objext conftest$ac_exeext
-+if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-+  (eval $ac_link) 2>conftest.er1
-+  ac_status=$?
-+  grep -v '^ *+' conftest.er1 >conftest.err
-+  rm -f conftest.er1
-+  cat conftest.err >&5
-+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  (exit $ac_status); } &&
-+       { ac_try='test -z "$ac_c_werror_flag"
-+                       || test ! -s conftest.err'
-+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-+  (eval $ac_try) 2>&5
-+  ac_status=$?
-+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  (exit $ac_status); }; } &&
-+       { ac_try='test -s conftest$ac_exeext'
-+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-+  (eval $ac_try) 2>&5
-+  ac_status=$?
-+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-+  (exit $ac_status); }; }; then
-+  ac_cv_lib_des_des_cbc_encrypt=yes
-+else
-+  echo "$as_me: failed program was:" >&5
-+sed 's/^/| /' conftest.$ac_ext >&5
-+
-+ac_cv_lib_des_des_cbc_encrypt=no
-+fi
-+rm -f conftest.err conftest.$ac_objext \
-+      conftest$ac_exeext conftest.$ac_ext
-+LIBS=$ac_check_lib_save_LIBS
-+fi
-+echo "$as_me:$LINENO: result: $ac_cv_lib_des_des_cbc_encrypt" >&5
-+echo "${ECHO_T}$ac_cv_lib_des_des_cbc_encrypt" >&6
-+if test $ac_cv_lib_des_des_cbc_encrypt = yes; then
-+  cat >>confdefs.h <<_ACEOF
-+#define HAVE_LIBDES 1
-+_ACEOF
-+
-+  LIBS="-ldes $LIBS"
-+
-+fi
-+
-+
- ##
- #   Compilation-related
- ##

Index: pkgsrc/net/py-netsnmp/Makefile
diff -u pkgsrc/net/py-netsnmp/Makefile:1.13 pkgsrc/net/py-netsnmp/Makefile:1.14
--- pkgsrc/net/py-netsnmp/Makefile:1.13 Tue Jan 16 13:37:11 2024
+++ pkgsrc/net/py-netsnmp/Makefile      Wed Feb 21 10:21:01 2024
@@ -1,6 +1,5 @@
-# $NetBSD: Makefile,v 1.13 2024/01/16 13:37:11 wiz Exp $
+# $NetBSD: Makefile,v 1.14 2024/02/21 10:21:01 wiz Exp $
 
-PKGREVISION= 1
 .include "../../net/net-snmp/Makefile.common"
 
 PKGNAME=       ${PYPKGPREFIX}-${DISTNAME:S/net-snmp/netsnmp/}

Prev by Date: CVS commit: pkgsrc/doc
Next by Date: CVS commit: pkgsrc/doc
Previous by Thread: CVS commit: pkgsrc/doc
Next by Thread: CVS commit: pkgsrc/doc
Indexes:

Home | Main Index | Thread Index | Old Index