Hey Daniel,
I just merged this patch, but it has not been against the last version of "next" or "master".
Please make sure to pull or rebase before submitting patches. That saves me some work.
Best, -Michael
On Wed, 2017-04-05 at 12:25 +0200, Daniel Weismüller wrote:
Signed-off-by: Daniel Weismüller daniel.weismueller@ipfire.org
config/rootfiles/packages/netsnmpd | 3 +++ lfs/netsnmpd | 13 ++++++++++--- 2 files changed, 13 insertions(+), 3 deletions(-)
diff --git a/config/rootfiles/packages/netsnmpd b/config/rootfiles/packages/netsnmpd index 6328949..9d80ec2 100644 --- a/config/rootfiles/packages/netsnmpd +++ b/config/rootfiles/packages/netsnmpd @@ -542,6 +542,8 @@ usr/share/snmp/mibs/IPV6-MIB.txt usr/share/snmp/mibs/IPV6-TC.txt usr/share/snmp/mibs/IPV6-TCP-MIB.txt usr/share/snmp/mibs/IPV6-UDP-MIB.txt +usr/share/snmp/mibs/LM-SENSORS-MIB.txt +usr/share/snmp/mibs/MTA-MIB.txt usr/share/snmp/mibs/NET-SNMP-AGENT-MIB.txt usr/share/snmp/mibs/NET-SNMP-EXAMPLES-MIB.txt usr/share/snmp/mibs/NET-SNMP-EXTEND-MIB.txt @@ -549,6 +551,7 @@ usr/share/snmp/mibs/NET-SNMP-MIB.txt usr/share/snmp/mibs/NET-SNMP-PASS-MIB.txt usr/share/snmp/mibs/NET-SNMP-TC.txt usr/share/snmp/mibs/NET-SNMP-VACM-MIB.txt +usr/share/snmp/mibs/NETWORK-SERVICES-MIB.txt usr/share/snmp/mibs/NOTIFICATION-LOG-MIB.txt usr/share/snmp/mibs/RFC-1215.txt usr/share/snmp/mibs/RFC1155-SMI.txt diff --git a/lfs/netsnmpd b/lfs/netsnmpd index b513678..d91ae91 100644 --- a/lfs/netsnmpd +++ b/lfs/netsnmpd @@ -32,7 +32,7 @@ DL_FROM = $(URL_IPFIRE) DIR_APP = $(DIR_SRC)/$(THISAPP) TARGET = $(DIR_INFO)/$(THISAPP) PROG = netsnmpd -PAK_VER = 4 +PAK_VER = 5 DEPS = "" ############################################################################# ## @@ -83,14 +83,21 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) --with-sys-location="localhost" \ --with-logfile="/var/log/snmpd.log" \ --with-persistent-directory="/var/net-snmp" \
--with-mib-modules="host agentx smux \ucd-snmp/diskio tcp-mib udp-mib mibII/mta_sendmail \ip-mib/ipv4InterfaceTable ip-mib/ipv6InterfaceTable \ip-mib/ipAddressPrefixTable/ipAddressPrefixTable \ip-mib/ipDefaultRouterTable/ipDefaultRouterTable \ip-mib/ipv6ScopeZoneIndexTable ip-mib/ipIfStatsTable \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 -m644 $(DIR_SRC)/config/netsnmpd/snmpd.conf
/etc/snmpd.conf
- install -v -m 644 $(DIR_SRC)/config/netsnmpd/snmpd.conf
/etc/snmpd.conf install -v -m 644 $(DIR_SRC)/config/backup/includes/netsnmpd \ /var/ipfire/backup/addons/includes/netsnmpd
- install -v -m755 $(DIR_SRC)/src/initscripts/init.d/netsnmpd
/etc/init.d/netsnmpd
- install -v -m 755 $(DIR_SRC)/src/initscripts/init.d/netsnmpd
/etc/init.d/netsnmpd ln -sf ../init.d/netsnmpd /etc/rc.d/rc3.d/S65netsnmpd ln -sf ../init.d/netsnmpd /etc/rc.d/rc0.d/K02netsnmpd ln -sf ../init.d/netsnmpd /etc/rc.d/rc6.d/K02netsnmpd