* [PATCH 1/2] netsnmpd: Update to version 5.8
@ 2019-02-27 5:03 Erik Kapfer
2019-02-27 5:03 ` [PATCH 2/2] netsnmpd: OpenSSL patch is incl. in new version Erik Kapfer
0 siblings, 1 reply; 2+ messages in thread
From: Erik Kapfer @ 2019-02-27 5:03 UTC (permalink / raw)
To: development
[-- Attachment #1: Type: text/plain, Size: 18459 bytes --]
Overview of the changes can be found in here https://sourceforge.net/p/net-snmp/mailman/message/36386084/ .
Signed-off-by: Erik Kapfer <ummeegge(a)ipfire.org>
---
config/rootfiles/packages/netsnmpd | 163 +++++++++++++++++++++----------------
lfs/netsnmpd | 11 +--
2 files changed, 100 insertions(+), 74 deletions(-)
diff --git a/config/rootfiles/packages/netsnmpd b/config/rootfiles/packages/netsnmpd
index 9d80ec2ad..39ae42056 100644
--- a/config/rootfiles/packages/netsnmpd
+++ b/config/rootfiles/packages/netsnmpd
@@ -1,8 +1,10 @@
+etc/rc.d/init.d/netsnmpd
etc/rc.d/rc0.d/K02netsnmpd
etc/rc.d/rc3.d/S65netsnmpd
etc/rc.d/rc6.d/K02netsnmpd
etc/snmpd.conf
usr/bin/agentxtrap
+usr/bin/checkbandwidth
usr/bin/encode_keychange
usr/bin/fixproc
usr/bin/ipf-mod.pl
@@ -22,10 +24,14 @@ usr/bin/snmpget
usr/bin/snmpgetnext
usr/bin/snmpinform
usr/bin/snmpnetstat
+usr/bin/snmppcap
+usr/bin/snmpping
+usr/bin/snmpps
usr/bin/snmpset
usr/bin/snmpstatus
usr/bin/snmptable
usr/bin/snmptest
+usr/bin/snmptop
usr/bin/snmptranslate
usr/bin/snmptrap
usr/bin/snmpusm
@@ -58,6 +64,7 @@ usr/bin/traptoemail
#usr/include/net-snmp/agent/mode_end_call.h
#usr/include/net-snmp/agent/multiplexer.h
#usr/include/net-snmp/agent/net-snmp-agent-includes.h
+#usr/include/net-snmp/agent/netsnmp_close_fds.h
#usr/include/net-snmp/agent/null.h
#usr/include/net-snmp/agent/old_api.h
#usr/include/net-snmp/agent/read_only.h
@@ -114,6 +121,7 @@ usr/bin/traptoemail
#usr/include/net-snmp/library/md5.h
#usr/include/net-snmp/library/mib.h
#usr/include/net-snmp/library/mt_support.h
+#usr/include/net-snmp/library/netsnmp-attribute-format.h
#usr/include/net-snmp/library/oid.h
#usr/include/net-snmp/library/oid_stash.h
#usr/include/net-snmp/library/parse.h
@@ -124,12 +132,15 @@ usr/bin/traptoemail
#usr/include/net-snmp/library/snmpAliasDomain.h
#usr/include/net-snmp/library/snmpCallbackDomain.h
#usr/include/net-snmp/library/snmpIPv4BaseDomain.h
+#usr/include/net-snmp/library/snmpIPv6BaseDomain.h
#usr/include/net-snmp/library/snmpSocketBaseDomain.h
#usr/include/net-snmp/library/snmpTCPBaseDomain.h
#usr/include/net-snmp/library/snmpTCPDomain.h
+#usr/include/net-snmp/library/snmpTCPIPv6Domain.h
#usr/include/net-snmp/library/snmpUDPBaseDomain.h
#usr/include/net-snmp/library/snmpUDPDomain.h
#usr/include/net-snmp/library/snmpUDPIPv4BaseDomain.h
+#usr/include/net-snmp/library/snmpUDPIPv6Domain.h
#usr/include/net-snmp/library/snmpUnixDomain.h
#usr/include/net-snmp/library/snmp_alarm.h
#usr/include/net-snmp/library/snmp_api.h
@@ -174,6 +185,13 @@ usr/bin/traptoemail
#usr/include/net-snmp/system/cygwin.h
#usr/include/net-snmp/system/darwin.h
#usr/include/net-snmp/system/darwin10.h
+#usr/include/net-snmp/system/darwin11.h
+#usr/include/net-snmp/system/darwin12.h
+#usr/include/net-snmp/system/darwin13.h
+#usr/include/net-snmp/system/darwin14.h
+#usr/include/net-snmp/system/darwin15.h
+#usr/include/net-snmp/system/darwin16.h
+#usr/include/net-snmp/system/darwin17.h
#usr/include/net-snmp/system/darwin7.h
#usr/include/net-snmp/system/darwin8.h
#usr/include/net-snmp/system/darwin9.h
@@ -194,13 +212,17 @@ usr/bin/traptoemail
#usr/include/net-snmp/system/generic.h
#usr/include/net-snmp/system/hpux.h
#usr/include/net-snmp/system/irix.h
+#usr/include/net-snmp/system/kfreebsd.h
#usr/include/net-snmp/system/linux.h
#usr/include/net-snmp/system/mingw32.h
+#usr/include/net-snmp/system/mingw32msvc.h
#usr/include/net-snmp/system/mips.h
#usr/include/net-snmp/system/netbsd.h
+#usr/include/net-snmp/system/nto-qnx6.h
#usr/include/net-snmp/system/openbsd.h
#usr/include/net-snmp/system/openbsd4.h
#usr/include/net-snmp/system/openbsd5.h
+#usr/include/net-snmp/system/openbsd6.h
#usr/include/net-snmp/system/osf5.h
#usr/include/net-snmp/system/solaris.h
#usr/include/net-snmp/system/solaris2.3.h
@@ -217,74 +239,74 @@ usr/bin/traptoemail
#usr/include/net-snmp/version.h
#usr/lib/libnetsnmp.a
#usr/lib/libnetsnmp.la
-usr/lib/libnetsnmp.so
-usr/lib/libnetsnmp.so.30
-usr/lib/libnetsnmp.so.30.0.3
+#usr/lib/libnetsnmp.so
+usr/lib/libnetsnmp.so.35
+usr/lib/libnetsnmp.so.35.0.0
#usr/lib/libnetsnmpagent.a
#usr/lib/libnetsnmpagent.la
-usr/lib/libnetsnmpagent.so
-usr/lib/libnetsnmpagent.so.30
-usr/lib/libnetsnmpagent.so.30.0.3
+#usr/lib/libnetsnmpagent.so
+usr/lib/libnetsnmpagent.so.35
+usr/lib/libnetsnmpagent.so.35.0.0
#usr/lib/libnetsnmphelpers.a
#usr/lib/libnetsnmphelpers.la
-usr/lib/libnetsnmphelpers.so
-usr/lib/libnetsnmphelpers.so.30
-usr/lib/libnetsnmphelpers.so.30.0.3
+#usr/lib/libnetsnmphelpers.so
+usr/lib/libnetsnmphelpers.so.35
+usr/lib/libnetsnmphelpers.so.35.0.0
#usr/lib/libnetsnmpmibs.a
#usr/lib/libnetsnmpmibs.la
-usr/lib/libnetsnmpmibs.so
-usr/lib/libnetsnmpmibs.so.30
-usr/lib/libnetsnmpmibs.so.30.0.3
+#usr/lib/libnetsnmpmibs.so
+usr/lib/libnetsnmpmibs.so.35
+usr/lib/libnetsnmpmibs.so.35.0.0
#usr/lib/libnetsnmptrapd.a
#usr/lib/libnetsnmptrapd.la
-usr/lib/libnetsnmptrapd.so
-usr/lib/libnetsnmptrapd.so.30
-usr/lib/libnetsnmptrapd.so.30.0.3
-#usr/lib/perl5/site_perl/5.12.3/MACHINE-linux-thread-multi/Bundle
-#usr/lib/perl5/site_perl/5.12.3/MACHINE-linux-thread-multi/Bundle/Makefile.subs.pl
-#usr/lib/perl5/site_perl/5.12.3/MACHINE-linux-thread-multi/NetSNMP
-usr/lib/perl5/site_perl/5.12.3/MACHINE-linux-thread-multi/NetSNMP/ASN.pm
-usr/lib/perl5/site_perl/5.12.3/MACHINE-linux-thread-multi/NetSNMP/OID.pm
-usr/lib/perl5/site_perl/5.12.3/MACHINE-linux-thread-multi/NetSNMP/TrapReceiver.pm
-#usr/lib/perl5/site_perl/5.12.3/MACHINE-linux-thread-multi/NetSNMP/agent
-usr/lib/perl5/site_perl/5.12.3/MACHINE-linux-thread-multi/NetSNMP/agent.pm
-usr/lib/perl5/site_perl/5.12.3/MACHINE-linux-thread-multi/NetSNMP/agent/Support.pm
-usr/lib/perl5/site_perl/5.12.3/MACHINE-linux-thread-multi/NetSNMP/agent/default_store.pm
-usr/lib/perl5/site_perl/5.12.3/MACHINE-linux-thread-multi/NetSNMP/agent/netsnmp_request_infoPtr.pm
-usr/lib/perl5/site_perl/5.12.3/MACHINE-linux-thread-multi/NetSNMP/default_store.pm
-usr/lib/perl5/site_perl/5.12.3/MACHINE-linux-thread-multi/SNMP.pm
-#usr/lib/perl5/site_perl/5.12.3/MACHINE-linux-thread-multi/auto/Bundle
-#usr/lib/perl5/site_perl/5.12.3/MACHINE-linux-thread-multi/auto/Bundle/NetSNMP
-#usr/lib/perl5/site_perl/5.12.3/MACHINE-linux-thread-multi/auto/Bundle/NetSNMP/.packlist
-#usr/lib/perl5/site_perl/5.12.3/MACHINE-linux-thread-multi/auto/NetSNMP
-#usr/lib/perl5/site_perl/5.12.3/MACHINE-linux-thread-multi/auto/NetSNMP/ASN
-#usr/lib/perl5/site_perl/5.12.3/MACHINE-linux-thread-multi/auto/NetSNMP/ASN/ASN.bs
-usr/lib/perl5/site_perl/5.12.3/MACHINE-linux-thread-multi/auto/NetSNMP/ASN/ASN.so
-#usr/lib/perl5/site_perl/5.12.3/MACHINE-linux-thread-multi/auto/NetSNMP/ASN/autosplit.ix
-#usr/lib/perl5/site_perl/5.12.3/MACHINE-linux-thread-multi/auto/NetSNMP/OID
-#usr/lib/perl5/site_perl/5.12.3/MACHINE-linux-thread-multi/auto/NetSNMP/OID/OID.bs
-usr/lib/perl5/site_perl/5.12.3/MACHINE-linux-thread-multi/auto/NetSNMP/OID/OID.so
-#usr/lib/perl5/site_perl/5.12.3/MACHINE-linux-thread-multi/auto/NetSNMP/OID/autosplit.ix
-#usr/lib/perl5/site_perl/5.12.3/MACHINE-linux-thread-multi/auto/NetSNMP/TrapReceiver
-#usr/lib/perl5/site_perl/5.12.3/MACHINE-linux-thread-multi/auto/NetSNMP/TrapReceiver/TrapReceiver.bs
-usr/lib/perl5/site_perl/5.12.3/MACHINE-linux-thread-multi/auto/NetSNMP/TrapReceiver/TrapReceiver.so
-#usr/lib/perl5/site_perl/5.12.3/MACHINE-linux-thread-multi/auto/NetSNMP/TrapReceiver/autosplit.ix
-#usr/lib/perl5/site_perl/5.12.3/MACHINE-linux-thread-multi/auto/NetSNMP/agent
-#usr/lib/perl5/site_perl/5.12.3/MACHINE-linux-thread-multi/auto/NetSNMP/agent/agent.bs
-usr/lib/perl5/site_perl/5.12.3/MACHINE-linux-thread-multi/auto/NetSNMP/agent/agent.so
-#usr/lib/perl5/site_perl/5.12.3/MACHINE-linux-thread-multi/auto/NetSNMP/agent/autosplit.ix
-#usr/lib/perl5/site_perl/5.12.3/MACHINE-linux-thread-multi/auto/NetSNMP/agent/default_store
-#usr/lib/perl5/site_perl/5.12.3/MACHINE-linux-thread-multi/auto/NetSNMP/agent/default_store/autosplit.ix
-#usr/lib/perl5/site_perl/5.12.3/MACHINE-linux-thread-multi/auto/NetSNMP/agent/default_store/default_store.bs
-usr/lib/perl5/site_perl/5.12.3/MACHINE-linux-thread-multi/auto/NetSNMP/agent/default_store/default_store.so
-#usr/lib/perl5/site_perl/5.12.3/MACHINE-linux-thread-multi/auto/NetSNMP/default_store
-#usr/lib/perl5/site_perl/5.12.3/MACHINE-linux-thread-multi/auto/NetSNMP/default_store/autosplit.ix
-#usr/lib/perl5/site_perl/5.12.3/MACHINE-linux-thread-multi/auto/NetSNMP/default_store/default_store.bs
-usr/lib/perl5/site_perl/5.12.3/MACHINE-linux-thread-multi/auto/NetSNMP/default_store/default_store.so
-#usr/lib/perl5/site_perl/5.12.3/MACHINE-linux-thread-multi/auto/SNMP
-#usr/lib/perl5/site_perl/5.12.3/MACHINE-linux-thread-multi/auto/SNMP/SNMP.bs
-usr/lib/perl5/site_perl/5.12.3/MACHINE-linux-thread-multi/auto/SNMP/SNMP.so
-#usr/lib/perl5/site_perl/5.12.3/MACHINE-linux-thread-multi/auto/SNMP/autosplit.ix
+#usr/lib/libnetsnmptrapd.so
+usr/lib/libnetsnmptrapd.so.35
+usr/lib/libnetsnmptrapd.so.35.0.0
+#usr/lib/perl5/site_perl/5.12.3/x86_64-linux-thread-multi/Bundle
+usr/lib/perl5/site_perl/5.12.3/x86_64-linux-thread-multi/Bundle/MakefileSubs.pm
+#usr/lib/perl5/site_perl/5.12.3/x86_64-linux-thread-multi/NetSNMP
+usr/lib/perl5/site_perl/5.12.3/x86_64-linux-thread-multi/NetSNMP/ASN.pm
+usr/lib/perl5/site_perl/5.12.3/x86_64-linux-thread-multi/NetSNMP/OID.pm
+usr/lib/perl5/site_perl/5.12.3/x86_64-linux-thread-multi/NetSNMP/TrapReceiver.pm
+#usr/lib/perl5/site_perl/5.12.3/x86_64-linux-thread-multi/NetSNMP/agent
+usr/lib/perl5/site_perl/5.12.3/x86_64-linux-thread-multi/NetSNMP/agent.pm
+usr/lib/perl5/site_perl/5.12.3/x86_64-linux-thread-multi/NetSNMP/agent/Support.pm
+usr/lib/perl5/site_perl/5.12.3/x86_64-linux-thread-multi/NetSNMP/agent/default_store.pm
+usr/lib/perl5/site_perl/5.12.3/x86_64-linux-thread-multi/NetSNMP/agent/netsnmp_request_infoPtr.pm
+usr/lib/perl5/site_perl/5.12.3/x86_64-linux-thread-multi/NetSNMP/default_store.pm
+usr/lib/perl5/site_perl/5.12.3/x86_64-linux-thread-multi/SNMP.pm
+#usr/lib/perl5/site_perl/5.12.3/x86_64-linux-thread-multi/auto/Bundle
+#usr/lib/perl5/site_perl/5.12.3/x86_64-linux-thread-multi/auto/Bundle/NetSNMP
+#usr/lib/perl5/site_perl/5.12.3/x86_64-linux-thread-multi/auto/Bundle/NetSNMP/.packlist
+#usr/lib/perl5/site_perl/5.12.3/x86_64-linux-thread-multi/auto/NetSNMP
+#usr/lib/perl5/site_perl/5.12.3/x86_64-linux-thread-multi/auto/NetSNMP/ASN
+#usr/lib/perl5/site_perl/5.12.3/x86_64-linux-thread-multi/auto/NetSNMP/ASN/ASN.bs
+usr/lib/perl5/site_perl/5.12.3/x86_64-linux-thread-multi/auto/NetSNMP/ASN/ASN.so
+#usr/lib/perl5/site_perl/5.12.3/x86_64-linux-thread-multi/auto/NetSNMP/ASN/autosplit.ix
+#usr/lib/perl5/site_perl/5.12.3/x86_64-linux-thread-multi/auto/NetSNMP/OID
+#usr/lib/perl5/site_perl/5.12.3/x86_64-linux-thread-multi/auto/NetSNMP/OID/OID.bs
+usr/lib/perl5/site_perl/5.12.3/x86_64-linux-thread-multi/auto/NetSNMP/OID/OID.so
+#usr/lib/perl5/site_perl/5.12.3/x86_64-linux-thread-multi/auto/NetSNMP/OID/autosplit.ix
+#usr/lib/perl5/site_perl/5.12.3/x86_64-linux-thread-multi/auto/NetSNMP/TrapReceiver
+#usr/lib/perl5/site_perl/5.12.3/x86_64-linux-thread-multi/auto/NetSNMP/TrapReceiver/TrapReceiver.bs
+usr/lib/perl5/site_perl/5.12.3/x86_64-linux-thread-multi/auto/NetSNMP/TrapReceiver/TrapReceiver.so
+#usr/lib/perl5/site_perl/5.12.3/x86_64-linux-thread-multi/auto/NetSNMP/TrapReceiver/autosplit.ix
+#usr/lib/perl5/site_perl/5.12.3/x86_64-linux-thread-multi/auto/NetSNMP/agent
+#usr/lib/perl5/site_perl/5.12.3/x86_64-linux-thread-multi/auto/NetSNMP/agent/agent.bs
+usr/lib/perl5/site_perl/5.12.3/x86_64-linux-thread-multi/auto/NetSNMP/agent/agent.so
+#usr/lib/perl5/site_perl/5.12.3/x86_64-linux-thread-multi/auto/NetSNMP/agent/autosplit.ix
+#usr/lib/perl5/site_perl/5.12.3/x86_64-linux-thread-multi/auto/NetSNMP/agent/default_store
+#usr/lib/perl5/site_perl/5.12.3/x86_64-linux-thread-multi/auto/NetSNMP/agent/default_store/autosplit.ix
+#usr/lib/perl5/site_perl/5.12.3/x86_64-linux-thread-multi/auto/NetSNMP/agent/default_store/default_store.bs
+usr/lib/perl5/site_perl/5.12.3/x86_64-linux-thread-multi/auto/NetSNMP/agent/default_store/default_store.so
+#usr/lib/perl5/site_perl/5.12.3/x86_64-linux-thread-multi/auto/NetSNMP/default_store
+#usr/lib/perl5/site_perl/5.12.3/x86_64-linux-thread-multi/auto/NetSNMP/default_store/autosplit.ix
+#usr/lib/perl5/site_perl/5.12.3/x86_64-linux-thread-multi/auto/NetSNMP/default_store/default_store.bs
+usr/lib/perl5/site_perl/5.12.3/x86_64-linux-thread-multi/auto/NetSNMP/default_store/default_store.so
+#usr/lib/perl5/site_perl/5.12.3/x86_64-linux-thread-multi/auto/SNMP
+#usr/lib/perl5/site_perl/5.12.3/x86_64-linux-thread-multi/auto/SNMP/SNMP.bs
+usr/lib/perl5/site_perl/5.12.3/x86_64-linux-thread-multi/auto/SNMP/SNMP.so
+#usr/lib/perl5/site_perl/5.12.3/x86_64-linux-thread-multi/auto/SNMP/autosplit.ix
usr/sbin/snmpd
usr/sbin/snmptrapd
#usr/share/man/man1/agentxtrap.1
@@ -305,10 +327,12 @@ usr/sbin/snmptrapd
#usr/share/man/man1/snmpgetnext.1
#usr/share/man/man1/snmpinform.1
#usr/share/man/man1/snmpnetstat.1
+#usr/share/man/man1/snmpps.1
#usr/share/man/man1/snmpset.1
#usr/share/man/man1/snmpstatus.1
#usr/share/man/man1/snmptable.1
#usr/share/man/man1/snmptest.1
+#usr/share/man/man1/snmptop.1
#usr/share/man/man1/snmptranslate.1
#usr/share/man/man1/snmptrap.1
#usr/share/man/man1/snmpusm.1
@@ -427,8 +451,8 @@ usr/sbin/snmptrapd
#usr/share/man/man5/variables.5
#usr/share/man/man8/snmpd.8
#usr/share/man/man8/snmptrapd.8
-usr/share/snmp
-usr/share/snmp/mib2c-data
+#usr/share/snmp
+#usr/share/snmp/mib2c-data
usr/share/snmp/mib2c-data/default-mfd-top.m2c
usr/share/snmp/mib2c-data/details-enums.m2i
usr/share/snmp/mib2c-data/details-node.m2i
@@ -513,11 +537,12 @@ usr/share/snmp/mib2c.iterate_access.conf
usr/share/snmp/mib2c.mfd.conf
usr/share/snmp/mib2c.notify.conf
usr/share/snmp/mib2c.old-api.conf
+usr/share/snmp/mib2c.org-mode.conf
usr/share/snmp/mib2c.perl.conf
usr/share/snmp/mib2c.raw-table.conf
usr/share/snmp/mib2c.scalar.conf
usr/share/snmp/mib2c.table_data.conf
-usr/share/snmp/mibs
+#usr/share/snmp/mibs
usr/share/snmp/mibs/AGENTX-MIB.txt
usr/share/snmp/mibs/BRIDGE-MIB.txt
usr/share/snmp/mibs/DISMAN-EVENT-MIB.txt
@@ -570,6 +595,7 @@ usr/share/snmp/mibs/SNMP-TSM-MIB.txt
usr/share/snmp/mibs/SNMP-USER-BASED-SM-MIB.txt
usr/share/snmp/mibs/SNMP-USM-AES-MIB.txt
usr/share/snmp/mibs/SNMP-USM-DH-OBJECTS-MIB.txt
+usr/share/snmp/mibs/SNMP-USM-HMAC-SHA2-MIB.txt
usr/share/snmp/mibs/SNMP-VIEW-BASED-ACM-MIB.txt
usr/share/snmp/mibs/SNMPv2-CONF.txt
usr/share/snmp/mibs/SNMPv2-MIB.txt
@@ -587,14 +613,14 @@ usr/share/snmp/mibs/UCD-SNMP-MIB.txt
usr/share/snmp/mibs/UDP-MIB.txt
usr/share/snmp/snmp_perl.pl
usr/share/snmp/snmp_perl_trapd.pl
-usr/share/snmp/snmpconf-data
-usr/share/snmp/snmpconf-data/snmp-data
+#usr/share/snmp/snmpconf-data
+#usr/share/snmp/snmpconf-data/snmp-data
usr/share/snmp/snmpconf-data/snmp-data/authopts
usr/share/snmp/snmpconf-data/snmp-data/debugging
usr/share/snmp/snmpconf-data/snmp-data/mibs
usr/share/snmp/snmpconf-data/snmp-data/output
usr/share/snmp/snmpconf-data/snmp-data/snmpconf-config
-usr/share/snmp/snmpconf-data/snmpd-data
+#usr/share/snmp/snmpconf-data/snmpd-data
usr/share/snmp/snmpconf-data/snmpd-data/acl
usr/share/snmp/snmpconf-data/snmpd-data/basic_setup
usr/share/snmp/snmpconf-data/snmpd-data/extending
@@ -603,12 +629,11 @@ usr/share/snmp/snmpconf-data/snmpd-data/operation
usr/share/snmp/snmpconf-data/snmpd-data/snmpconf-config
usr/share/snmp/snmpconf-data/snmpd-data/system
usr/share/snmp/snmpconf-data/snmpd-data/trapsinks
-usr/share/snmp/snmpconf-data/snmptrapd-data
+#usr/share/snmp/snmpconf-data/snmptrapd-data
usr/share/snmp/snmpconf-data/snmptrapd-data/authentication
usr/share/snmp/snmpconf-data/snmptrapd-data/formatting
usr/share/snmp/snmpconf-data/snmptrapd-data/logging
usr/share/snmp/snmpconf-data/snmptrapd-data/runtime
usr/share/snmp/snmpconf-data/snmptrapd-data/snmpconf-config
usr/share/snmp/snmpconf-data/snmptrapd-data/traphandle
-var/ipfire/backup/addons/includes/netsnmpd
-etc/rc.d/init.d/netsnmpd
+var/ipfire/backup/addons/includes/netsnmpd
\ No newline at end of file
diff --git a/lfs/netsnmpd b/lfs/netsnmpd
index 06233f3e9..0af276093 100644
--- a/lfs/netsnmpd
+++ b/lfs/netsnmpd
@@ -1,7 +1,7 @@
###############################################################################
# #
# IPFire.org - A linux based firewall #
-# Copyright (C) 2007-2018 IPFire Team <info(a)ipfire.org> #
+# Copyright (C) 2007-2019 IPFire Team <info(a)ipfire.org> #
# #
# This program is free software: you can redistribute it and/or modify #
# it under the terms of the GNU General Public License as published by #
@@ -24,7 +24,7 @@
include Config
-VER = 5.7.3
+VER = 5.8
THISAPP = net-snmp-$(VER)
DL_FILE = $(THISAPP).tar.gz
@@ -32,7 +32,7 @@ DL_FROM = $(URL_IPFIRE)
DIR_APP = $(DIR_SRC)/$(THISAPP)
TARGET = $(DIR_INFO)/$(THISAPP)
PROG = netsnmpd
-PAK_VER = 7
+PAK_VER = 8
DEPS = ""
@@ -44,7 +44,7 @@ objects = $(DL_FILE)
$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
-$(DL_FILE)_MD5 = d4a3459e1577d0efa8d96ca70a885e53
+$(DL_FILE)_MD5 = 63bfc65fbb86cdb616598df1aff6458a
install : $(TARGET)
@@ -77,7 +77,7 @@ $(subst %,%_MD5,$(objects)) :
$(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
@$(PREBUILD)
@rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE)
- cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/net-snmp-5.7.3-openssl.patch
+
$(UPDATE_AUTOMAKE)
cd $(DIR_APP) && ./configure \
--prefix=/usr \
@@ -95,6 +95,7 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
sctp-mib rmon-mib etherlike-mib ucd-snmp/lmsensorsMib"
--libdir=/usr/lib \
--sysconfdir="/etc"
+
cd $(DIR_APP) && make
cd $(DIR_APP) && make install
install -v -m 644 $(DIR_SRC)/config/netsnmpd/snmpd.conf /etc/snmpd.conf
--
2.12.2
^ permalink raw reply [flat|nested] 2+ messages in thread
* [PATCH 2/2] netsnmpd: OpenSSL patch is incl. in new version
2019-02-27 5:03 [PATCH 1/2] netsnmpd: Update to version 5.8 Erik Kapfer
@ 2019-02-27 5:03 ` Erik Kapfer
0 siblings, 0 replies; 2+ messages in thread
From: Erik Kapfer @ 2019-02-27 5:03 UTC (permalink / raw)
To: development
[-- Attachment #1: Type: text/plain, Size: 12432 bytes --]
Signed-off-by: Erik Kapfer <ummeegge(a)ipfire.org>
---
src/patches/net-snmp-5.7.3-openssl.patch | 303 -------------------------------
1 file changed, 303 deletions(-)
delete mode 100644 src/patches/net-snmp-5.7.3-openssl.patch
diff --git a/src/patches/net-snmp-5.7.3-openssl.patch b/src/patches/net-snmp-5.7.3-openssl.patch
deleted file mode 100644
index 0651a24ec..000000000
--- a/src/patches/net-snmp-5.7.3-openssl.patch
+++ /dev/null
@@ -1,303 +0,0 @@
-diff -urNp old/apps/snmpusm.c new/apps/snmpusm.c
---- old/apps/snmpusm.c 2014-12-08 21:23:22.000000000 +0100
-+++ new/apps/snmpusm.c 2017-02-20 15:20:36.994022905 +0100
-@@ -190,7 +190,7 @@ get_USM_DH_key(netsnmp_variable_list *va
- oid *keyoid, size_t keyoid_len) {
- u_char *dhkeychange;
- DH *dh;
-- BIGNUM *other_pub;
-+ BIGNUM *p, *g, *pub_key, *other_pub;
- u_char *key;
- size_t key_len;
-
-@@ -205,25 +205,29 @@ get_USM_DH_key(netsnmp_variable_list *va
- dh = d2i_DHparams(NULL, &cp, dhvar->val_len);
- }
-
-- if (!dh || !dh->g || !dh->p) {
-+ if (dh)
-+ DH_get0_pqg(dh, &p, NULL, &g);
-+
-+ if (!dh || !g || !p) {
- SNMP_FREE(dhkeychange);
- return SNMPERR_GENERR;
- }
-
-- DH_generate_key(dh);
-- if (!dh->pub_key) {
-+ if (!DH_generate_key(dh)) {
- SNMP_FREE(dhkeychange);
- return SNMPERR_GENERR;
- }
-
-- if (vars->val_len != (unsigned int)BN_num_bytes(dh->pub_key)) {
-+ DH_get0_key(dh, &pub_key, NULL);
-+
-+ if (vars->val_len != (unsigned int)BN_num_bytes(pub_key)) {
- SNMP_FREE(dhkeychange);
- fprintf(stderr,"incorrect diffie-helman lengths (%lu != %d)\n",
-- (unsigned long)vars->val_len, BN_num_bytes(dh->pub_key));
-+ (unsigned long)vars->val_len, BN_num_bytes(pub_key));
- return SNMPERR_GENERR;
- }
-
-- BN_bn2bin(dh->pub_key, dhkeychange + vars->val_len);
-+ BN_bn2bin(pub_key, dhkeychange + vars->val_len);
-
- key_len = DH_size(dh);
- if (!key_len) {
-diff -urNp old/configure new/configure
---- old/configure 2017-02-20 10:08:16.440396223 +0100
-+++ new/configure 2017-02-20 10:57:15.749734281 +0100
-@@ -23176,9 +23176,9 @@ $as_echo "#define HAVE_AES_CFB128_ENCRYP
- fi
-
-
-- as_ac_Lib=`$as_echo "ac_cv_lib_${CRYPTO}''_EVP_MD_CTX_create" | $as_tr_sh`
--{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for EVP_MD_CTX_create in -l${CRYPTO}" >&5
--$as_echo_n "checking for EVP_MD_CTX_create in -l${CRYPTO}... " >&6; }
-+ as_ac_Lib=`$as_echo "ac_cv_lib_${CRYPTO}''_EVP_MD_CTX_new" | $as_tr_sh`
-+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for EVP_MD_CTX_new in -l${CRYPTO}" >&5
-+$as_echo_n "checking for EVP_MD_CTX_new in -l${CRYPTO}... " >&6; }
- if eval \${$as_ac_Lib+:} false; then :
- $as_echo_n "(cached) " >&6
- else
-@@ -23193,11 +23193,11 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_
- #ifdef __cplusplus
- extern "C"
- #endif
--char EVP_MD_CTX_create ();
-+char EVP_MD_CTX_new ();
- int
- main ()
- {
--return EVP_MD_CTX_create ();
-+return EVP_MD_CTX_new ();
- ;
- return 0;
- }
-@@ -23216,10 +23216,10 @@ eval ac_res=\$$as_ac_Lib
- $as_echo "$ac_res" >&6; }
- if eval test \"x\$"$as_ac_Lib"\" = x"yes"; then :
-
--$as_echo "#define HAVE_EVP_MD_CTX_CREATE /**/" >>confdefs.h
-+$as_echo "#define HAVE_EVP_MD_CTX_NEW /**/" >>confdefs.h
-
-
--$as_echo "#define HAVE_EVP_MD_CTX_DESTROY /**/" >>confdefs.h
-+$as_echo "#define HAVE_EVP_MD_CTX_FREE /**/" >>confdefs.h
-
- fi
-
-@@ -23293,7 +23293,7 @@ char SSL_library_init ();
- int
- main ()
- {
--return SSL_library_init ();
-+return OPENSSL_init_ssl(0, NULL);
- ;
- return 0;
- }
-diff -urNp old/configure.d/config_os_libs2 new/configure.d/config_os_libs2
---- old/configure.d/config_os_libs2 2014-12-08 21:23:22.000000000 +0100
-+++ new/configure.d/config_os_libs2 2017-02-20 10:56:21.041616611 +0100
-@@ -292,11 +292,11 @@ if test "x$tryopenssl" != "xno" -a "x$tr
- AC_DEFINE(HAVE_AES_CFB128_ENCRYPT, 1,
- [Define to 1 if you have the `AES_cfb128_encrypt' function.]))
-
-- AC_CHECK_LIB(${CRYPTO}, EVP_MD_CTX_create,
-- AC_DEFINE([HAVE_EVP_MD_CTX_CREATE], [],
-- [Define to 1 if you have the `EVP_MD_CTX_create' function.])
-- AC_DEFINE([HAVE_EVP_MD_CTX_DESTROY], [],
-- [Define to 1 if you have the `EVP_MD_CTX_destroy' function.]))
-+ AC_CHECK_LIB(${CRYPTO}, EVP_MD_CTX_new,
-+ AC_DEFINE([HAVE_EVP_MD_CTX_NEW], [],
-+ [Define to 1 if you have the `EVP_MD_CTX_new' function.])
-+ AC_DEFINE([HAVE_EVP_MD_CTX_FREE], [],
-+ [Define to 1 if you have the `EVP_MD_CTX_free' function.]))
- fi
- if echo " $transport_result_list " | $GREP "DTLS" > /dev/null; then
- AC_CHECK_LIB(ssl, DTLSv1_method,
-@@ -307,7 +307,7 @@ if test "x$tryopenssl" != "xno" -a "x$tr
- TLSPROG=yes
- fi
- if echo " $transport_result_list " | $GREP "TLS" > /dev/null; then
-- AC_CHECK_LIB(ssl, SSL_library_init,
-+ AC_CHECK_LIB(ssl, OPENSSL_init_ssl,
- AC_DEFINE(HAVE_LIBSSL, 1,
- [Define to 1 if you have the `ssl' library (-lssl).])
- LIBCRYPTO=" -lssl $LIBCRYPTO",
-diff -urNp old/include/net-snmp/net-snmp-config.h.in new/include/net-snmp/net-snmp-config.h.in
---- old/include/net-snmp/net-snmp-config.h.in 2017-02-20 10:08:16.443522417 +0100
-+++ new/include/net-snmp/net-snmp-config.h.in 2017-02-20 10:24:05.790584283 +0100
-@@ -149,11 +149,11 @@
- /* Define to 1 if you have the `eval_pv' function. */
- #undef HAVE_EVAL_PV
-
--/* Define to 1 if you have the `EVP_MD_CTX_create' function. */
--#undef HAVE_EVP_MD_CTX_CREATE
-+/* Define to 1 if you have the `EVP_MD_CTX_new' function. */
-+#undef HAVE_EVP_MD_CTX_NEW
-
--/* Define to 1 if you have the `EVP_MD_CTX_destroy' function. */
--#undef HAVE_EVP_MD_CTX_DESTROY
-+/* Define to 1 if you have the `EVP_MD_CTX_free' function. */
-+#undef HAVE_EVP_MD_CTX_FREE
-
- /* Define if you have EVP_sha224/256 in openssl */
- #undef HAVE_EVP_SHA224
-diff -urNp old/snmplib/keytools.c new/snmplib/keytools.c
---- old/snmplib/keytools.c 2014-12-08 21:23:22.000000000 +0100
-+++ new/snmplib/keytools.c 2017-02-20 10:30:27.412068264 +0100
-@@ -149,8 +149,8 @@ generate_Ku(const oid * hashtype, u_int
- */
- #ifdef NETSNMP_USE_OPENSSL
-
--#ifdef HAVE_EVP_MD_CTX_CREATE
-- ctx = EVP_MD_CTX_create();
-+#ifdef HAVE_EVP_MD_CTX_NEW
-+ ctx = EVP_MD_CTX_new();
- #else
- ctx = malloc(sizeof(*ctx));
- if (!EVP_MD_CTX_init(ctx))
-@@ -259,8 +259,8 @@ generate_Ku(const oid * hashtype, u_int
- memset(buf, 0, sizeof(buf));
- #ifdef NETSNMP_USE_OPENSSL
- if (ctx) {
--#ifdef HAVE_EVP_MD_CTX_DESTROY
-- EVP_MD_CTX_destroy(ctx);
-+#ifdef HAVE_EVP_MD_CTX_FREE
-+ EVP_MD_CTX_free(ctx);
- #else
- EVP_MD_CTX_cleanup(ctx);
- free(ctx);
-diff -urNp old/snmplib/scapi.c new/snmplib/scapi.c
---- old/snmplib/scapi.c 2014-12-08 21:23:22.000000000 +0100
-+++ new/snmplib/scapi.c 2017-02-20 10:27:34.152379515 +0100
-@@ -486,14 +486,14 @@ sc_hash(const oid * hashtype, size_t has
- }
-
- /** initialize the pointer */
--#ifdef HAVE_EVP_MD_CTX_CREATE
-- cptr = EVP_MD_CTX_create();
-+#ifdef HAVE_EVP_MD_CTX_NEW
-+ cptr = EVP_MD_CTX_new();
- #else
- cptr = malloc(sizeof(*cptr));
- #if defined(OLD_DES)
- memset(cptr, 0, sizeof(*cptr));
- #else
-- EVP_MD_CTX_init(cptr);
-+ EVP_MD_CTX_init(&cptr);
- #endif
- #endif
- if (!EVP_DigestInit(cptr, hashfn)) {
-@@ -507,11 +507,11 @@ sc_hash(const oid * hashtype, size_t has
- /** do the final pass */
- EVP_DigestFinal(cptr, MAC, &tmp_len);
- *MAC_len = tmp_len;
--#ifdef HAVE_EVP_MD_CTX_DESTROY
-- EVP_MD_CTX_destroy(cptr);
-+#ifdef HAVE_EVP_MD_CTX_FREE
-+ EVP_MD_CTX_free(cptr);
- #else
- #if !defined(OLD_DES)
-- EVP_MD_CTX_cleanup(cptr);
-+ EVP_MD_CTX_cleanup(&cptr);
- #endif
- free(cptr);
- #endif
-diff -urNp old/snmplib/snmp_openssl.c new/snmplib/snmp_openssl.c
---- old/snmplib/snmp_openssl.c 2014-12-08 21:23:22.000000000 +0100
-+++ new/snmplib/snmp_openssl.c 2017-02-20 12:46:00.059727928 +0100
-@@ -47,7 +47,7 @@ void netsnmp_init_openssl(void) {
- DEBUGMSGTL(("snmp_openssl", "initializing\n"));
-
- /* Initializing OpenSSL */
-- SSL_library_init();
-+ OPENSSL_init_ssl(0, NULL);
- SSL_load_error_strings();
- ERR_load_BIO_strings();
- OpenSSL_add_all_algorithms();
-@@ -164,11 +164,11 @@ netsnmp_openssl_cert_dump_names(X509 *oc
- oname_entry = X509_NAME_get_entry(osubj_name, i);
- netsnmp_assert(NULL != oname_entry);
-
-- if (oname_entry->value->type != V_ASN1_PRINTABLESTRING)
-+ if (X509_NAME_ENTRY_get_data(oname_entry)->type != V_ASN1_PRINTABLESTRING)
- continue;
-
- /** get NID */
-- onid = OBJ_obj2nid(oname_entry->object);
-+ onid = OBJ_obj2nid(X509_NAME_ENTRY_get_object(oname_entry));
- if (onid == NID_undef) {
- prefix_long = prefix_short = "UNKNOWN";
- }
-@@ -179,9 +179,9 @@ netsnmp_openssl_cert_dump_names(X509 *oc
-
- DEBUGMSGT(("9:cert:dump:names",
- "[%02d] NID type %d, ASN type %d\n", i, onid,
-- oname_entry->value->type));
-+ X509_NAME_ENTRY_get_data(oname_entry)->type));
- DEBUGMSGT(("9:cert:dump:names", "%s/%s: '%s'\n", prefix_long,
-- prefix_short, ASN1_STRING_data(oname_entry->value)));
-+ prefix_short, ASN1_STRING_data(X509_NAME_ENTRY_get_data(oname_entry))));
- }
- }
- #endif /* NETSNMP_FEATURE_REMOVE_CERT_DUMP_NAMES */
-@@ -470,7 +470,7 @@ netsnmp_openssl_cert_get_hash_type(X509
- if (NULL == ocert)
- return 0;
-
-- return _nid2ht(OBJ_obj2nid(ocert->sig_alg->algorithm));
-+ return _nid2ht(X509_get_signature_nid(ocert));
- }
-
- /**
-@@ -487,7 +487,7 @@ netsnmp_openssl_cert_get_fingerprint(X50
- if (NULL == ocert)
- return NULL;
-
-- nid = OBJ_obj2nid(ocert->sig_alg->algorithm);
-+ nid = X509_get_signature_nid(ocert);
- DEBUGMSGT(("9:openssl:fingerprint", "alg %d, cert nid %d (%d)\n", alg, nid,
- _nid2ht(nid)));
-
-diff -urNp old/win32/net-snmp/net-snmp-config.h new/win32/net-snmp/net-snmp-config.h
---- old/win32/net-snmp/net-snmp-config.h 2014-12-08 21:23:22.000000000 +0100
-+++ new/win32/net-snmp/net-snmp-config.h 2017-02-20 10:23:20.796778512 +0100
-@@ -1366,11 +1366,11 @@
- /* Define to 1 if you have the <openssl/aes.h> header file. */
- #define HAVE_OPENSSL_AES_H 1
-
--/* Define to 1 if you have the `EVP_MD_CTX_create' function. */
--#define HAVE_EVP_MD_CTX_CREATE 1
-+/* Define to 1 if you have the `EVP_MD_CTX_new' function. */
-+#define HAVE_EVP_MD_CTX_NEW 1
-
--/* Define to 1 if you have the `EVP_MD_CTX_destroy' function. */
--#define HAVE_EVP_MD_CTX_DESTROY 1
-+/* Define to 1 if you have the `EVP_MD_CTX_free' function. */
-+#define HAVE_EVP_MD_CTX_FREE 1
-
- /* Define to 1 if you have the `AES_cfb128_encrypt' function. */
- #define HAVE_AES_CFB128_ENCRYPT 1
-diff -urNp old/win32/net-snmp/net-snmp-config.h.in new/win32/net-snmp/net-snmp-config.h.in
---- old/win32/net-snmp/net-snmp-config.h.in 2014-12-08 21:23:22.000000000 +0100
-+++ new/win32/net-snmp/net-snmp-config.h.in 2017-02-20 10:22:51.348367754 +0100
-@@ -1366,11 +1366,11 @@
- /* Define to 1 if you have the <openssl/aes.h> header file. */
- #define HAVE_OPENSSL_AES_H 1
-
--/* Define to 1 if you have the `EVP_MD_CTX_create' function. */
--#define HAVE_EVP_MD_CTX_CREATE 1
-+/* Define to 1 if you have the `EVP_MD_CTX_new' function. */
-+#define HAVE_EVP_MD_CTX_NEW 1
-
--/* Define to 1 if you have the `EVP_MD_CTX_destroy' function. */
--#define HAVE_EVP_MD_CTX_DESTROY 1
-+/* Define to 1 if you have the `EVP_MD_CTX_free' function. */
-+#define HAVE_EVP_MD_CTX_FREE 1
-
- /* Define to 1 if you have the `AES_cfb128_encrypt' function. */
- #define HAVE_AES_CFB128_ENCRYPT 1
--
2.12.2
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2019-02-27 5:03 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2019-02-27 5:03 [PATCH 1/2] netsnmpd: Update to version 5.8 Erik Kapfer
2019-02-27 5:03 ` [PATCH 2/2] netsnmpd: OpenSSL patch is incl. in new version Erik Kapfer
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox