CVS commit: pkgsrc/net/net-snmp

To: pkgsrc-changes%NetBSD.org@localhost
Subject: CVS commit: pkgsrc/net/net-snmp
From: "Sevan Janiyan" <sevan%netbsd.org@localhost>
Date: Fri, 12 Jun 2020 02:22:08 +0000

Module Name:    pkgsrc
Committed By:   sevan
Date:           Fri Jun 12 02:22:08 UTC 2020

Modified Files:
        pkgsrc/net/net-snmp: Makefile Makefile.common PLIST distinfo
        pkgsrc/net/net-snmp/patches: patch-agent_mibgroup_mibII_tcpTable.c
            patch-agent_mibgroup_mibII_udpTable.c
Added Files:
        pkgsrc/net/net-snmp/patches: patch-configure
Removed Files:
        pkgsrc/net/net-snmp/patches: patch-af
            patch-agent_mibgroup_agentx_master.c
            patch-agent_mibgroup_agentx_master_admin.c
            patch-agent_mibgroup_at.c
            patch-agent_mibgroup_host_data__access_swrun__procfs__psinfo.c
            patch-agent_mibgroup_ip-mib_data__access_arp__sysctl.c
            patch-agent_mibgroup_mibII_ipv6.c patch-agent_snmp__agent.c
            patch-apps_snmpusm.c patch-configure.d_config__os__libs2
            patch-include_net-snmp_agent_snmp__agent.h
            patch-include_net-snmp_system_netbsd.h patch-perl_ASN_Makefile.PL
            patch-perl_AnyData__SNMP_Makefile.PL patch-perl_OID_Makefile.PL
            patch-perl_SNMP_Makefile.PL patch-perl_SNMP_SNMP.xs
            patch-perl_TrapReceiver_Makefile.PL
            patch-perl_TrapReceiver_TrapReceiver.xs
            patch-perl_agent_Makefile.PL patch-perl_agent_Support_Makefile.PL
            patch-perl_agent_agent.xs
            patch-perl_agent_default__store_Makefile.PL
            patch-perl_default__store_Makefile.PL
            patch-perl_manager_Makefile.PL patch-snmplib_keytools.c
            patch-snmplib_scapi.c patch-snmplib_snmp__api.c

Log Message:
Update to net-snmp 5.8

*5.8*
    snmplib:
      - TLS/DTLS fixes
      - fix usm keychanges for new algorithms and longer keylengths
      - IP address formatting fixes
      - BUG: 2592: from Stuart Kendrick - increase MAXTC to 16384
      - add new sha2 auth protocols
      - Restore AES-192 and AES-256 privacy protocols - from
        draft-blumenthal-aes-usm-04 (precursor to RFC 3826)
        - Use OIDs from http://www.snmp.com/eso/esoConsortiumMIB.txt
        - Some code borrowed from PATCH 1346, thanks to
          Alexander Ivanov and Vladimir Sukhorukov.
      - BUG: 2622: Fix excessive indents in log file
      - new config tokens:
        - sendMessageMaxSize
        - disableSNMPv1 / disableSNMPv2c
      - new api for dynamic debug log level (netsnmp_set_debug_log_level)

    snmpd:
      - SNMP-TARGET-MIB: Fix snmpTargetAddrTAddress
      - Com2sec and com2sec6 SOURCE values may deny sources as well as
        permit.
      - allow trap sinks to set Target-MIB characteristics (name, tag, profile)
      - add source addr/port option to trapsink/trap2sink/informsink
      - packet filtering by source ip (enableSourceFiltering/filtersource)
      - several getbulk handling improvements
      - several new APIs introduced for run-time configuration of agent:
        - netsnmp_vacm_simple_usm_add/del
        - usm_create_usmUser_*
        - netsnmp_udp_com2SecEntry_create/netsnmp_udp_com2SecList_remove
        - netsnmp_agent_listen_on to open agent port

    Win32:
      - Add support for the DTLS-UDP and TLS-TCP transports

    scripts:
      - A new 'checkbandwidth' script to check host min/max bandwidth

    snmptranslate:
      - Introduce bulk translation mode The special argument "-" causes
        snmptranslate to enter bulk translation mode, in which it expects
        one OID per line.  Whitespace is treated as the end of the OID, and
        only that portion of the line is replaced, meaning that this can be
        used to translate, e.g., "snmpwalk" output without the proper MIBs
        loaded: snmptranslate -m all -OX < numeric.txt > symbolic.txt

    building:
      - Add Travis and Appveyor CI support
      - IPv6 support is now compiled by default.  If you need an IPv4-only
        agent, use --disable-ipv6.
      - Fixed/improved support for several non-Linux platforms
      - Many fixes found by Coverity anf Fortify scans


To generate a diff of this commit:
cvs rdiff -u -r1.128 -r1.129 pkgsrc/net/net-snmp/Makefile
cvs rdiff -u -r1.5 -r1.6 pkgsrc/net/net-snmp/Makefile.common
cvs rdiff -u -r1.25 -r1.26 pkgsrc/net/net-snmp/PLIST
cvs rdiff -u -r1.95 -r1.96 pkgsrc/net/net-snmp/distinfo
cvs rdiff -u -r1.16 -r0 pkgsrc/net/net-snmp/patches/patch-af
cvs rdiff -u -r1.1 -r0 \
    pkgsrc/net/net-snmp/patches/patch-agent_mibgroup_agentx_master.c \
    pkgsrc/net/net-snmp/patches/patch-agent_mibgroup_agentx_master_admin.c \
    pkgsrc/net/net-snmp/patches/patch-agent_mibgroup_at.c \
    pkgsrc/net/net-snmp/patches/patch-agent_mibgroup_ip-mib_data__access_arp__sysctl.c \
    pkgsrc/net/net-snmp/patches/patch-agent_mibgroup_mibII_ipv6.c \
    pkgsrc/net/net-snmp/patches/patch-agent_snmp__agent.c \
    pkgsrc/net/net-snmp/patches/patch-apps_snmpusm.c \
    pkgsrc/net/net-snmp/patches/patch-configure.d_config__os__libs2 \
    pkgsrc/net/net-snmp/patches/patch-include_net-snmp_agent_snmp__agent.h \
    pkgsrc/net/net-snmp/patches/patch-include_net-snmp_system_netbsd.h \
    pkgsrc/net/net-snmp/patches/patch-perl_ASN_Makefile.PL \
    pkgsrc/net/net-snmp/patches/patch-perl_AnyData__SNMP_Makefile.PL \
    pkgsrc/net/net-snmp/patches/patch-perl_OID_Makefile.PL \
    pkgsrc/net/net-snmp/patches/patch-perl_SNMP_Makefile.PL \
    pkgsrc/net/net-snmp/patches/patch-perl_SNMP_SNMP.xs \
    pkgsrc/net/net-snmp/patches/patch-perl_TrapReceiver_Makefile.PL \
    pkgsrc/net/net-snmp/patches/patch-perl_TrapReceiver_TrapReceiver.xs \
    pkgsrc/net/net-snmp/patches/patch-perl_agent_Support_Makefile.PL \
    pkgsrc/net/net-snmp/patches/patch-perl_agent_agent.xs \
    pkgsrc/net/net-snmp/patches/patch-perl_agent_default__store_Makefile.PL \
    pkgsrc/net/net-snmp/patches/patch-perl_default__store_Makefile.PL \
    pkgsrc/net/net-snmp/patches/patch-perl_manager_Makefile.PL \
    pkgsrc/net/net-snmp/patches/patch-snmplib_keytools.c \
    pkgsrc/net/net-snmp/patches/patch-snmplib_scapi.c \
    pkgsrc/net/net-snmp/patches/patch-snmplib_snmp__api.c
cvs rdiff -u -r1.2 -r0 \
    pkgsrc/net/net-snmp/patches/patch-agent_mibgroup_host_data__access_swrun__procfs__psinfo.c \
    pkgsrc/net/net-snmp/patches/patch-perl_agent_Makefile.PL
cvs rdiff -u -r1.1 -r1.2 \
    pkgsrc/net/net-snmp/patches/patch-agent_mibgroup_mibII_tcpTable.c \
    pkgsrc/net/net-snmp/patches/patch-agent_mibgroup_mibII_udpTable.c
cvs rdiff -u -r0 -r1.1 pkgsrc/net/net-snmp/patches/patch-configure

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.128 pkgsrc/net/net-snmp/Makefile:1.129
--- pkgsrc/net/net-snmp/Makefile:1.128  Fri Apr 24 13:27:48 2020
+++ pkgsrc/net/net-snmp/Makefile        Fri Jun 12 02:22:07 2020
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.128 2020/04/24 13:27:48 adam Exp $
+# $NetBSD: Makefile,v 1.129 2020/06/12 02:22:07 sevan Exp $
 
 .include "Makefile.common"
 CATEGORIES=    net
-PKGREVISION=   13
 
 MAINTAINER=    adam%NetBSD.org@localhost
 COMMENT=       Extensible SNMP implementation

Index: pkgsrc/net/net-snmp/Makefile.common
diff -u pkgsrc/net/net-snmp/Makefile.common:1.5 pkgsrc/net/net-snmp/Makefile.common:1.6
--- pkgsrc/net/net-snmp/Makefile.common:1.5     Sat Mar  5 11:27:52 2016
+++ pkgsrc/net/net-snmp/Makefile.common Fri Jun 12 02:22:07 2020
@@ -1,10 +1,9 @@
-# $NetBSD: Makefile.common,v 1.5 2016/03/05 11:27:52 jperkin Exp $
+# $NetBSD: Makefile.common,v 1.6 2020/06/12 02:22:07 sevan Exp $
 # used by net/net-snmp/Makefile
 # used by net/py-netsnmp/Makefile
 
-DISTNAME=      net-snmp-5.7.3
+DISTNAME=      net-snmp-5.8
 MASTER_SITES=  ${MASTER_SITE_SOURCEFORGE:=net-snmp/}
-PKGREVISION=   2
 
 HOMEPAGE=      http://www.net-snmp.org/
 LICENSE=       modified-bsd

Index: pkgsrc/net/net-snmp/PLIST
diff -u pkgsrc/net/net-snmp/PLIST:1.25 pkgsrc/net/net-snmp/PLIST:1.26
--- pkgsrc/net/net-snmp/PLIST:1.25      Wed Dec 31 10:06:57 2014
+++ pkgsrc/net/net-snmp/PLIST   Fri Jun 12 02:22:07 2020
@@ -1,5 +1,6 @@
-@comment $NetBSD: PLIST,v 1.25 2014/12/31 10:06:57 adam Exp $
+@comment $NetBSD: PLIST,v 1.26 2020/06/12 02:22:07 sevan Exp $
 bin/agentxtrap
+bin/checkbandwidth
 bin/encode_keychange
 ${PLIST.perl}bin/fixproc
 ${PLIST.perl}bin/ipf-mod.pl
@@ -19,10 +20,14 @@ bin/snmpget
 bin/snmpgetnext
 bin/snmpinform
 bin/snmpnetstat
+bin/snmppcap
+bin/snmpping
+bin/snmpps
 bin/snmpset
 bin/snmpstatus
 bin/snmptable
 bin/snmptest
+bin/snmptop
 bin/snmptranslate
 bin/snmptrap
 bin/snmpusm
@@ -53,6 +58,7 @@ include/net-snmp/agent/mib_modules.h
 include/net-snmp/agent/mode_end_call.h
 include/net-snmp/agent/multiplexer.h
 include/net-snmp/agent/net-snmp-agent-includes.h
+include/net-snmp/agent/netsnmp_close_fds.h
 include/net-snmp/agent/null.h
 include/net-snmp/agent/old_api.h
 include/net-snmp/agent/read_only.h
@@ -107,6 +113,7 @@ include/net-snmp/library/lcd_time.h
 include/net-snmp/library/md5.h
 include/net-snmp/library/mib.h
 include/net-snmp/library/mt_support.h
+include/net-snmp/library/netsnmp-attribute-format.h
 include/net-snmp/library/oid.h
 include/net-snmp/library/oid_stash.h
 include/net-snmp/library/parse.h
@@ -168,6 +175,13 @@ include/net-snmp/system/bsdi4.h
 include/net-snmp/system/cygwin.h
 include/net-snmp/system/darwin.h
 include/net-snmp/system/darwin10.h
+include/net-snmp/system/darwin11.h
+include/net-snmp/system/darwin12.h
+include/net-snmp/system/darwin13.h
+include/net-snmp/system/darwin14.h
+include/net-snmp/system/darwin15.h
+include/net-snmp/system/darwin16.h
+include/net-snmp/system/darwin17.h
 include/net-snmp/system/darwin7.h
 include/net-snmp/system/darwin8.h
 include/net-snmp/system/darwin9.h
@@ -188,13 +202,17 @@ include/net-snmp/system/freebsd9.h
 include/net-snmp/system/generic.h
 include/net-snmp/system/hpux.h
 include/net-snmp/system/irix.h
+include/net-snmp/system/kfreebsd.h
 include/net-snmp/system/linux.h
 include/net-snmp/system/mingw32.h
+include/net-snmp/system/mingw32msvc.h
 include/net-snmp/system/mips.h
 include/net-snmp/system/netbsd.h
+include/net-snmp/system/nto-qnx6.h
 include/net-snmp/system/openbsd.h
 include/net-snmp/system/openbsd4.h
 include/net-snmp/system/openbsd5.h
+include/net-snmp/system/openbsd6.h
 include/net-snmp/system/osf5.h
 include/net-snmp/system/solaris.h
 include/net-snmp/system/solaris2.3.h
@@ -256,6 +274,40 @@ lib/libnetsnmphelpers.la
 lib/libnetsnmpmibs.la
 lib/libnetsnmptrapd.la
 lib/libsnmp.la
+${PERL5_SUB_INSTALLARCHLIB}/perllocal.pod
+${PERL5_SUB_INSTALLVENDORARCH}/Bundle/MakefileSubs.pm
+${PERL5_SUB_INSTALLVENDORARCH}/NetSNMP/ASN.pm
+${PERL5_SUB_INSTALLVENDORARCH}/NetSNMP/OID.pm
+${PERL5_SUB_INSTALLVENDORARCH}/NetSNMP/TrapReceiver.pm
+${PERL5_SUB_INSTALLVENDORARCH}/NetSNMP/agent.pm
+${PERL5_SUB_INSTALLVENDORARCH}/NetSNMP/agent/Support.pm
+${PERL5_SUB_INSTALLVENDORARCH}/NetSNMP/agent/default_store.pm
+${PERL5_SUB_INSTALLVENDORARCH}/NetSNMP/agent/netsnmp_request_infoPtr.pm
+${PERL5_SUB_INSTALLVENDORARCH}/NetSNMP/default_store.pm
+${PERL5_SUB_INSTALLVENDORARCH}/SNMP.pm
+${PERL5_SUB_INSTALLVENDORARCH}/auto/Bundle/NetSNMP/.packlist
+${PERL5_SUB_INSTALLVENDORARCH}/auto/NetSNMP/ASN/ASN.so
+${PERL5_SUB_INSTALLVENDORARCH}/auto/NetSNMP/ASN/autosplit.ix
+${PERL5_SUB_INSTALLVENDORARCH}/auto/NetSNMP/OID/OID.so
+${PERL5_SUB_INSTALLVENDORARCH}/auto/NetSNMP/OID/autosplit.ix
+${PERL5_SUB_INSTALLVENDORARCH}/auto/NetSNMP/TrapReceiver/TrapReceiver.so
+${PERL5_SUB_INSTALLVENDORARCH}/auto/NetSNMP/TrapReceiver/autosplit.ix
+${PERL5_SUB_INSTALLVENDORARCH}/auto/NetSNMP/agent/agent.so
+${PERL5_SUB_INSTALLVENDORARCH}/auto/NetSNMP/agent/autosplit.ix
+${PERL5_SUB_INSTALLVENDORARCH}/auto/NetSNMP/agent/default_store/autosplit.ix
+${PERL5_SUB_INSTALLVENDORARCH}/auto/NetSNMP/agent/default_store/default_store.so
+${PERL5_SUB_INSTALLVENDORARCH}/auto/NetSNMP/default_store/autosplit.ix
+${PERL5_SUB_INSTALLVENDORARCH}/auto/NetSNMP/default_store/default_store.so
+${PERL5_SUB_INSTALLVENDORARCH}/auto/SNMP/SNMP.so
+${PERL5_SUB_INSTALLVENDORARCH}/auto/SNMP/autosplit.ix
+${PLIST.perl}${PERL5_SUB_INSTALLVENDORMAN3DIR}/NetSNMP::ASN.3
+${PLIST.perl}${PERL5_SUB_INSTALLVENDORMAN3DIR}/NetSNMP::OID.3
+${PLIST.perl}${PERL5_SUB_INSTALLVENDORMAN3DIR}/NetSNMP::TrapReceiver.3
+${PLIST.perl}${PERL5_SUB_INSTALLVENDORMAN3DIR}/NetSNMP::agent.3
+${PLIST.perl}${PERL5_SUB_INSTALLVENDORMAN3DIR}/NetSNMP::agent::default_store.3
+${PLIST.perl}${PERL5_SUB_INSTALLVENDORMAN3DIR}/NetSNMP::default_store.3
+${PLIST.perl}${PERL5_SUB_INSTALLVENDORMAN3DIR}/NetSNMP::netsnmp_request_infoPtr.3
+${PLIST.perl}${PERL5_SUB_INSTALLVENDORMAN3DIR}/SNMP.3
 man/man1/agentxtrap.1
 man/man1/encode_keychange.1
 man/man1/fixproc.1
@@ -274,10 +326,12 @@ man/man1/snmpget.1
 man/man1/snmpgetnext.1
 man/man1/snmpinform.1
 man/man1/snmpnetstat.1
+man/man1/snmpps.1
 man/man1/snmpset.1
 man/man1/snmpstatus.1
 man/man1/snmptable.1
 man/man1/snmptest.1
+man/man1/snmptop.1
 man/man1/snmptranslate.1
 man/man1/snmptrap.1
 man/man1/snmpusm.1
@@ -475,6 +529,7 @@ ${PLIST.perl}share/snmp/mib2c.iterate_ac
 ${PLIST.perl}share/snmp/mib2c.mfd.conf
 ${PLIST.perl}share/snmp/mib2c.notify.conf
 ${PLIST.perl}share/snmp/mib2c.old-api.conf
+${PLIST.perl}share/snmp/mib2c.org-mode.conf
 ${PLIST.perl}share/snmp/mib2c.perl.conf
 ${PLIST.perl}share/snmp/mib2c.raw-table.conf
 ${PLIST.perl}share/snmp/mib2c.scalar.conf
@@ -528,6 +583,7 @@ share/snmp/mibs/SNMP-TSM-MIB.txt
 share/snmp/mibs/SNMP-USER-BASED-SM-MIB.txt
 share/snmp/mibs/SNMP-USM-AES-MIB.txt
 share/snmp/mibs/SNMP-USM-DH-OBJECTS-MIB.txt
+share/snmp/mibs/SNMP-USM-HMAC-SHA2-MIB.txt
 share/snmp/mibs/SNMP-VIEW-BASED-ACM-MIB.txt
 share/snmp/mibs/SNMPv2-CONF.txt
 share/snmp/mibs/SNMPv2-MIB.txt

Index: pkgsrc/net/net-snmp/distinfo
diff -u pkgsrc/net/net-snmp/distinfo:1.95 pkgsrc/net/net-snmp/distinfo:1.96
--- pkgsrc/net/net-snmp/distinfo:1.95   Wed Aug 21 09:30:12 2019
+++ pkgsrc/net/net-snmp/distinfo        Fri Jun 12 02:22:07 2020
@@ -1,38 +1,29 @@
-$NetBSD: distinfo,v 1.95 2019/08/21 09:30:12 otis Exp $
+$NetBSD: distinfo,v 1.96 2020/06/12 02:22:07 sevan Exp $
 
-SHA1 (net-snmp-5.7.3.tar.gz) = 97dc25077257680815de44e34128d365c76bd839
-RMD160 (net-snmp-5.7.3.tar.gz) = c5cf54d5723ee417e07f1f9fa3936aef505104a2
-SHA512 (net-snmp-5.7.3.tar.gz) = 0758bba5844cfd6c80959ac16b83906a2f830ba49fd0ab1bf9e191dc6a79d312a2e4760bd53b3e1a1c82759481f0064d088d5a3cf475d84b25679a6bd0f049bb
-Size (net-snmp-5.7.3.tar.gz) = 6382428 bytes
+SHA1 (net-snmp-5.8.tar.gz) = 78f70731df9dcdb13fe8f60eb7d80d7583da4d2c
+RMD160 (net-snmp-5.8.tar.gz) = 66770d78f2583cda36e90cc35032d7dae2d354c3
+SHA512 (net-snmp-5.8.tar.gz) = 27895a583b23f3e14c48562bc32f3ba83513d81aa848e878be9a3650f0458d45950635c937ef627135f80b757b663e71fab9a3bde4fd91889153998ae3468fe7
+Size (net-snmp-5.8.tar.gz) = 6591680 bytes
 SHA1 (patch-ac) = fa5a32e497a7651f4804082d921bb2e91b17d098
-SHA1 (patch-af) = 4fb96b79f9126dedb8a132d44894ea23c9e8c101
 SHA1 (patch-ag) = d9595eceeb5ee986ab4365f62e3c3ab339e605aa
-SHA1 (patch-agent_mibgroup_agentx_master.c) = c2b3f145280e3fecc26a431ec914cf89d87a17f4
-SHA1 (patch-agent_mibgroup_agentx_master_admin.c) = 3c233c1e3113fbc9c1de34cb4cbacca9ef4a6fe2
-SHA1 (patch-agent_mibgroup_at.c) = 50842f54d98b3cf7bf7028ddbb582b84b7ae682f
 SHA1 (patch-agent_mibgroup_hardware_cpu_cpu__sysctl.c) = d36d2490448c2dfda0383c67deb36fdb31ff18a3
 SHA1 (patch-agent_mibgroup_hardware_fsys_fsys_getfsstats.c) = cee9722d9a3f956726a8760b900ed3a375afde3f
 SHA1 (patch-agent_mibgroup_hardware_memory_memory__netbsd.c) = 928a5aa99e7893ee91dea3110db8098212e328fa
 SHA1 (patch-agent_mibgroup_host_data__access_swrun__kinfo.c) = 39888f6489b89bd6598c453977b29519b2f7968f
-SHA1 (patch-agent_mibgroup_host_data__access_swrun__procfs__psinfo.c) = f2faca89cf4a53ba5d2bd6ba47730f3dbf242789
-SHA1 (patch-agent_mibgroup_ip-mib_data__access_arp__sysctl.c) = cad87b474cdd469c7ba762ed8a47202c3c6f9240
 SHA1 (patch-agent_mibgroup_kernel__sunos5.c) = 3e345f92f42a47959716b0176096c6b0d91aa65a
 SHA1 (patch-agent_mibgroup_kernel__sunos5.h) = eb80eb5e55020014b1e5524fd572839aefdce5a5
 SHA1 (patch-agent_mibgroup_mibII_ipAddr.c) = cd3345a4b30fe2280d0555ee38feb5f957a55b1e
-SHA1 (patch-agent_mibgroup_mibII_ipv6.c) = d6a271145e6ba774cbc1e93caa14e3d22dc43075
-SHA1 (patch-agent_mibgroup_mibII_tcpTable.c) = f547f3fd08848803cbf7ce08a41ba463c4d02992
-SHA1 (patch-agent_mibgroup_mibII_udpTable.c) = 2eb5e5c05ecb23f69cbb0d38a31e14d5b5ddc6b7
+SHA1 (patch-agent_mibgroup_mibII_tcpTable.c) = acea4fdb55622df9ed0a45051412de278695c9da
+SHA1 (patch-agent_mibgroup_mibII_udpTable.c) = 7726d27a52a03c16bd220530ddb41b896cfec089
 SHA1 (patch-agent_mibgroup_var__route.c) = 919348e62849367793e4abf7d608d9824eb8ff2d
-SHA1 (patch-agent_snmp__agent.c) = 2dbfea907d0e1881f5d55c5b270984fc3a562da9
 SHA1 (patch-agent_snmp__perl.c) = 893cf46624d4f26941b3911a64c752c110ba6ef8
 SHA1 (patch-ai) = 04c2a487bad8705c9725ef4a62016051d3898970
 SHA1 (patch-aj) = d110e996d0538d17251d39a5eed46df6944ba0fa
 SHA1 (patch-ak) = 50ac67db8a9ffc16d983b4192e74db25ef439321
 SHA1 (patch-am) = d01e8a93f6e766cedfdc324efd69168f71aac76f
 SHA1 (patch-ap) = 44a4ce6302457094ba2b200e4c47ff6c2a425746
-SHA1 (patch-apps_snmpusm.c) = 5df02e77038cf36cd5fafe19df7bc095b12a4a8f
 SHA1 (patch-aq) = a8fe703d8902c2847ca6692af4400ddbf9cbe74b
-SHA1 (patch-configure.d_config__os__libs2) = 9dd3f200295460b9c43a249c60508ce5f142fbed
+SHA1 (patch-configure) = 9f0c9f936881608842d71a4ee90875dd9a3fe533
 SHA1 (patch-da) = 40e8d78bad93ca12f4c08c43b86e7f13edafc299
 SHA1 (patch-db) = 281be9a88860987880c71770f4050fd965dd8ed9
 SHA1 (patch-dl) = 92563fd6be6f27be5b348cdc8bc02061374026b0
@@ -40,22 +31,4 @@ SHA1 (patch-dt) = 452fee78b37f8ce0eb3004
 SHA1 (patch-du) = 51d2c7e11b3d422e57ea2f5761aff624f7333842
 SHA1 (patch-el) = b23d7ae82d367d457181d231a56c80e648b0ee6e
 SHA1 (patch-es) = 7336d905bac315f344f93664e4118332f88fb6ee
-SHA1 (patch-include_net-snmp_agent_snmp__agent.h) = 2139d849b0ffe004a72f3276a98c0d2cb72dca18
-SHA1 (patch-include_net-snmp_system_netbsd.h) = 7880fded678147b2cc75e035234b89727e213d00
-SHA1 (patch-perl_ASN_Makefile.PL) = 895ad5ccefee6a271650a822e2bac31c5b9d62d5
-SHA1 (patch-perl_AnyData__SNMP_Makefile.PL) = 6d99ac8db72682f9ff074ba8239d7242c149b9bf
-SHA1 (patch-perl_OID_Makefile.PL) = 8cbc9e6e3ee422851df62a400f6df30dfe271c88
-SHA1 (patch-perl_SNMP_Makefile.PL) = 252fe35a8d93f38ae2454e962546a7b77967d9c2
-SHA1 (patch-perl_SNMP_SNMP.xs) = 99860cdfea3170ed3777f61cb8b5abe9d49ce44c
-SHA1 (patch-perl_TrapReceiver_Makefile.PL) = b0e6350d3a4142e6b998ca11131279896abd4eb1
-SHA1 (patch-perl_TrapReceiver_TrapReceiver.xs) = 4a49bc4a767a1ff1ded925876470168baa86359b
-SHA1 (patch-perl_agent_Makefile.PL) = 267dbc5c663ca3823e37e8afcc42f19986bc1a9f
-SHA1 (patch-perl_agent_Support_Makefile.PL) = 7ee55ea96e2eeb275f7eed9d7bbc446c7195af4c
-SHA1 (patch-perl_agent_agent.xs) = de018255afd1790f7cab70591505dabd6cd15047
-SHA1 (patch-perl_agent_default__store_Makefile.PL) = 0599d99ce5226eaeaab3f1af76c68bfe7e57e1bd
-SHA1 (patch-perl_default__store_Makefile.PL) = ed5ad7385680632b2153fa572635c5aea83c9114
-SHA1 (patch-perl_manager_Makefile.PL) = bb34b119a2b3887a1af1f9b88e6d4bad6baf60bb
-SHA1 (patch-snmplib_keytools.c) = c209a42a2767c8639d8535e02542de119264ebfc
-SHA1 (patch-snmplib_scapi.c) = 9a49b1a00df8f9ab6bd69057f806377e9164cf1f
-SHA1 (patch-snmplib_snmp__api.c) = b4f498aa93b61f809e3696df1fc6bf32bd942233
 SHA1 (patch-snmplib_transports_snmpUDPBaseDomain.c) = a7eec599e1cfb2fbd22d0dd53412727b5ff1825d

Index: pkgsrc/net/net-snmp/patches/patch-agent_mibgroup_mibII_tcpTable.c
diff -u pkgsrc/net/net-snmp/patches/patch-agent_mibgroup_mibII_tcpTable.c:1.1 pkgsrc/net/net-snmp/patches/patch-agent_mibgroup_mibII_tcpTable.c:1.2
--- pkgsrc/net/net-snmp/patches/patch-agent_mibgroup_mibII_tcpTable.c:1.1       Fri Nov 29 12:59:51 2013
+++ pkgsrc/net/net-snmp/patches/patch-agent_mibgroup_mibII_tcpTable.c   Fri Jun 12 02:22:08 2020
@@ -1,20 +1,21 @@
-$NetBSD: patch-agent_mibgroup_mibII_tcpTable.c,v 1.1 2013/11/29 12:59:51 joerg Exp $
+$NetBSD: patch-agent_mibgroup_mibII_tcpTable.c,v 1.2 2020/06/12 02:22:08 sevan Exp $
 
---- agent/mibgroup/mibII/tcpTable.c.orig       2013-11-26 22:24:01.000000000 +0000
-+++ agent/mibgroup/mibII/tcpTable.c
-@@ -946,7 +946,11 @@ tcpTable_load(netsnmp_cache *cache, void
+
+--- agent/mibgroup/mibII/tcpTable.c.orig       2020-06-12 02:28:28.274144065 +0100
++++ agent/mibgroup/mibII/tcpTable.c    2020-06-12 02:30:19.848438704 +0100
+@@ -1043,7 +1043,11 @@
      /*
       *  Set up a linked list
       */
 +#if defined(__NetBSD__) && __NetBSD_Version__ >= 699002800
 +    entry  = TAILQ_FIRST(&table.inpt_queue);
 +#else
-     entry  = table.inpt_queue.cqh_first;
+     entry  = table.INP_FIRST_SYMBOL;
 +#endif
      while (entry) {
     
          nnew = SNMP_MALLOC_TYPEDEF(netsnmp_inpcb);
-@@ -970,8 +974,13 @@ tcpTable_load(netsnmp_cache *cache, void
+@@ -1067,8 +1071,13 @@
        nnew->inp_next = tcp_head;
        tcp_head   = nnew;
  
@@ -22,7 +23,7 @@ $NetBSD: patch-agent_mibgroup_mibII_tcpT
 +        if (entry == TAILQ_FIRST(&table.inpt_queue))
 +            break;
 +#else
-         if (entry == table.inpt_queue.cqh_first)
+         if (entry == table.INP_FIRST_SYMBOL)
              break;
 +#endif
      }
Index: pkgsrc/net/net-snmp/patches/patch-agent_mibgroup_mibII_udpTable.c
diff -u pkgsrc/net/net-snmp/patches/patch-agent_mibgroup_mibII_udpTable.c:1.1 pkgsrc/net/net-snmp/patches/patch-agent_mibgroup_mibII_udpTable.c:1.2
--- pkgsrc/net/net-snmp/patches/patch-agent_mibgroup_mibII_udpTable.c:1.1       Fri Nov 29 12:59:51 2013
+++ pkgsrc/net/net-snmp/patches/patch-agent_mibgroup_mibII_udpTable.c   Fri Jun 12 02:22:08 2020
@@ -1,8 +1,9 @@
-$NetBSD: patch-agent_mibgroup_mibII_udpTable.c,v 1.1 2013/11/29 12:59:51 joerg Exp $
+$NetBSD: patch-agent_mibgroup_mibII_udpTable.c,v 1.2 2020/06/12 02:22:08 sevan Exp $
 
---- agent/mibgroup/mibII/udpTable.c.orig       2013-11-26 22:25:02.000000000 +0000
-+++ agent/mibgroup/mibII/udpTable.c
-@@ -395,7 +395,11 @@ udpTable_next_entry( void **loop_context
+
+--- agent/mibgroup/mibII/udpTable.c.orig       2020-06-12 01:53:58.092446674 +0100
++++ agent/mibgroup/mibII/udpTable.c    2020-06-12 02:01:40.556941658 +0100
+@@ -426,7 +426,11 @@
       * and update the loop context ready for the next one.
       */
      *data_context = (void*)entry;
@@ -14,7 +15,7 @@ $NetBSD: patch-agent_mibgroup_mibII_udpT
      return index;
  }
  
-@@ -405,7 +409,11 @@ udpTable_free(netsnmp_cache *cache, void
+@@ -436,7 +440,11 @@
      UDPTABLE_ENTRY_TYPE        *p;
      while (udp_head) {
          p = udp_head;
@@ -26,28 +27,28 @@ $NetBSD: patch-agent_mibgroup_mibII_udpT
          free(p);
      }
  
-@@ -705,7 +713,11 @@ udpTable_load(netsnmp_cache *cache, void
+@@ -744,7 +752,11 @@
      /*
       *  Set up a linked list
       */
 +#if defined(__NetBSD__) && __NetBSD_Version__ >= 699002800
 +    entry  = TAILQ_FIRST(&table.inpt_queue);
 +#else
-     entry  = table.inpt_queue.cqh_first;
+     entry  = table.INP_FIRST_SYMBOL;
 +#endif
      while (entry) {
     
          nnew = SNMP_MALLOC_TYPEDEF(struct inpcb);
-@@ -717,12 +729,22 @@ udpTable_load(netsnmp_cache *cache, void
+@@ -801,12 +813,22 @@
              break;
          }
  
 +#if defined(__NetBSD__) && __NetBSD_Version__ >= 699002800
-+        entry    = TAILQ_NEXT(nnew, inp_queue);       /* Next kernel entry */
-+      TAILQ_NEXT(nnew, inp_queue) = udp_head;
++        entry    = TAILQ_NEXT(nnew, inp_queue);        /* Next kernel entry */
++       TAILQ_NEXT(nnew, inp_queue) = udp_head;
 +#else
-         entry    = nnew->inp_queue.cqe_next;  /* Next kernel entry */
-       nnew->inp_queue.cqe_next = udp_head;
+         entry    = nnew->INP_NEXT_SYMBOL;             /* Next kernel entry */
+       nnew->INP_NEXT_SYMBOL = udp_head;
 +#endif
        udp_head = nnew;
  
@@ -55,7 +56,7 @@ $NetBSD: patch-agent_mibgroup_mibII_udpT
 +        if (entry == TAILQ_FIRST(&table.inpt_queue))
 +            break;
 +#else
-         if (entry == table.inpt_queue.cqh_first)
+         if (entry == udp_inpcb.INP_NEXT_SYMBOL)
              break;
 +#endif
      }

Added files:

Index: pkgsrc/net/net-snmp/patches/patch-configure
diff -u /dev/null pkgsrc/net/net-snmp/patches/patch-configure:1.1
--- /dev/null   Fri Jun 12 02:22:08 2020
+++ pkgsrc/net/net-snmp/patches/patch-configure Fri Jun 12 02:22:08 2020
@@ -0,0 +1,137 @@
+$NetBSD: patch-configure,v 1.1 2020/06/12 02:22:08 sevan Exp $
+
+- Fix configure to look for des_cbc_encrypt in -ldes
+- Fix configure on FreeBSD 10 & newer
+- Fix portability bug in test
+
+--- configure.orig     2018-07-16 15:33:50.000000000 +0100
++++ configure  2020-06-12 00:08:19.741995000 +0100
+@@ -13923,7 +13923,7 @@
+       hardcode_shlibpath_var=no
+       ;;
+ 
+-    freebsd1*)
++    freebsd1.*)
+       ld_shlibs=no
+       ;;
+ 
+@@ -14917,7 +14917,7 @@
+   shlibpath_var=LD_LIBRARY_PATH
+   ;;
+ 
+-freebsd1*)
++freebsd1.*)
+   dynamic_linker=no
+   ;;
+ 
+@@ -14928,7 +14928,7 @@
+     objformat=`/usr/bin/objformat`
+   else
+     case $host_os in
+-    freebsd[123]*) objformat=aout ;;
++    freebsd[123].*) objformat=aout ;;
+     *) objformat=elf ;;
+     esac
+   fi
+@@ -19637,7 +19637,7 @@
+ fi
+ 
+ # Linux systemd
+-if test "x$with_systemd" == "xyes"; then
++if test "x$with_systemd" = "xyes"; then
+   other_src_list="$other_src_list sd-daemon.c"
+   other_objs_list="$other_objs_list sd-daemon.o"
+   other_lobjs_list="$other_lobjs_list sd-daemon.lo"
+@@ -22715,6 +22715,81 @@
+ ##
+ #########################################
+ 
++
++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
+ ##
+@@ -32360,6 +32435,10 @@
+   case $ac_option in
+   # Handling of the options.
+   -recheck | --recheck | --rechec | --reche | --rech | --rec | --re | --r)
++      : Avoid regenerating within pkgsrc
++      exit 0
++      : Avoid regenerating within pkgsrc
++      exit 0
+     ac_cs_recheck=: ;;
+   --version | --versio | --versi | --vers | --ver | --ve | --v | -V )
+     $as_echo "$ac_cs_version"; exit ;;

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