From mboxrd@z Thu Jan 1 00:00:00 1970 From: Michael Tremer To: development@lists.ipfire.org Subject: Re: [PATCH] netsnmpd: added lmsensors and some other mibs Date: Wed, 05 Apr 2017 12:24:41 +0100 Message-ID: <1491391481.2643.103.camel@ipfire.org> In-Reply-To: <1491387916-4872-1-git-send-email-daniel.weismueller@ipfire.org> MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="===============8263573595349688018==" List-Id: --===============8263573595349688018== Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Hey Daniel, I just merged this patch, but it has not been against the last version of "ne= xt" or "master". Please make sure to pull or rebase before submitting patches. That saves me s= ome work. Best, -Michael On Wed, 2017-04-05 at 12:25 +0200, Daniel Weism=C3=BCller wrote: > Signed-off-by: Daniel Weism=C3=BCller > --- > =C2=A0config/rootfiles/packages/netsnmpd |=C2=A0=C2=A03 +++ > =C2=A0lfs/netsnmpd=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2= =A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0= =C2=A0| 13 ++++++++++--- > =C2=A02 files changed, 13 insertions(+), 3 deletions(-) >=20 > 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 > =C2=A0usr/share/snmp/mibs/IPV6-TC.txt > =C2=A0usr/share/snmp/mibs/IPV6-TCP-MIB.txt > =C2=A0usr/share/snmp/mibs/IPV6-UDP-MIB.txt > +usr/share/snmp/mibs/LM-SENSORS-MIB.txt > +usr/share/snmp/mibs/MTA-MIB.txt > =C2=A0usr/share/snmp/mibs/NET-SNMP-AGENT-MIB.txt > =C2=A0usr/share/snmp/mibs/NET-SNMP-EXAMPLES-MIB.txt > =C2=A0usr/share/snmp/mibs/NET-SNMP-EXTEND-MIB.txt > @@ -549,6 +551,7 @@ usr/share/snmp/mibs/NET-SNMP-MIB.txt > =C2=A0usr/share/snmp/mibs/NET-SNMP-PASS-MIB.txt > =C2=A0usr/share/snmp/mibs/NET-SNMP-TC.txt > =C2=A0usr/share/snmp/mibs/NET-SNMP-VACM-MIB.txt > +usr/share/snmp/mibs/NETWORK-SERVICES-MIB.txt > =C2=A0usr/share/snmp/mibs/NOTIFICATION-LOG-MIB.txt > =C2=A0usr/share/snmp/mibs/RFC-1215.txt > =C2=A0usr/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=C2=A0=C2=A0=C2=A0=C2=A0=3D $(URL_IPFIRE) > =C2=A0DIR_APP=C2=A0=C2=A0=C2=A0=C2=A0=3D $(DIR_SRC)/$(THISAPP) > =C2=A0TARGET=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=3D $(DIR_INFO)/$(THISAPP) > =C2=A0PROG=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=3D netsnmpd > -PAK_VER=C2=A0=C2=A0=C2=A0=C2=A0=3D 4 > +PAK_VER=C2=A0=C2=A0=C2=A0=C2=A0=3D 5 > =C2=A0DEPS=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=C2=A0=3D "" > =C2=A0 > =C2=A0#####################################################################= ######## > ## > @@ -83,14 +83,21 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) > =C2=A0 --with-sys-location=3D"localhost" \ > =C2=A0 --with-logfile=3D"/var/log/snmpd.log" \ > =C2=A0 --with-persistent-directory=3D"/var/net-snmp" \ > + --with-mib-modules=3D"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" > =C2=A0 --libdir=3D/usr/lib \ > =C2=A0 --sysconfdir=3D"/etc" > =C2=A0 cd $(DIR_APP) && make=C2=A0 > =C2=A0 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 > =C2=A0 install -v -m 644 $(DIR_SRC)/config/backup/includes/netsnmpd \ > =C2=A0 /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 > =C2=A0 ln -sf ../init.d/netsnmpd /etc/rc.d/rc3.d/S65netsnmpd > =C2=A0 ln -sf ../init.d/netsnmpd /etc/rc.d/rc0.d/K02netsnmpd > =C2=A0 ln -sf ../init.d/netsnmpd /etc/rc.d/rc6.d/K02netsnmpd --===============8263573595349688018== Content-Type: application/pgp-signature Content-Transfer-Encoding: base64 Content-Disposition: attachment; filename="signature.asc" MIME-Version: 1.0 LS0tLS1CRUdJTiBQR1AgU0lHTkFUVVJFLS0tLS0KVmVyc2lvbjogR251UEcgdjIKCmlRSWNCQUFC Q2dBR0JRSlk1TlA1QUFvSkVJQjU4UDl2a0FrSE4rNFAvUlFlRjh6emVVVnoxVVRZMit2eEVlc2kK RGxMM1dzTnVMWW5kSVlPcmFodGU4bFFOSkQ5cVFBODlOWEFxZlR0ZWF0TFZJSDh1dU9BSkRtVUh1 WFRtTnA4TwpiUWJIL1BtS3lxNkIzUFBrNk4vWHAwNDlQcTNONmdxTHJjRTlCd2hYYU95elZNc01m Q0c3MkcxUmhrakhtZW9CCmtxdktHQmphbjdwNDFuOXYyTk5MWjUrSlJtYy9LYUkrSDhKWDAxZVp0 UXVWek1iUUlWN2EvQUpXSnBST0hyRU8KT25mRVB5U2E0K3ZTK2dCeXh5alRHM3ZtL2d5LzlxVE41 TnRYVjM3YWFoc0pUcG5ZSS9yR2lkRGpaazYwbVFzYwpTUHVmUjJoOHdRRUZHMUJYVVg0T0NMK0NY c2x6REw1aCs0NUhzVC9KWUpHOHdsbUVuUFlGbGh0SDhpdUdZME1TCjN2clpJR0N4Yk9TeVJTV05m TzZ6YTIybEVMSzZ2ZDdwTGJzV2dyUFNtY1hNUk1YNFhMN3FXSTI0c1dUN2hqbTYKYloyU3Uwd0dR dGNDL2tRck5USW1pdzh0QjVneTlZd3FaWUtYUDFxY1B1T0x3Rmk5SkhJQ0VNeHJxTzVGeXlNRwox MnFSc2xRUnpNWVpiNXoycjhLSDhwZVpzNSt5U3dpUDQ5VnY2WGJsSVpTd08rZXBJcGhYWHFGMTF1 U2MyZ3htCk1KK0t0aW9LU3NnUDlGTXVXNXpKaXpEWU0rY0hjK2RQeHF3UVA2TjR4Rm5DR2lKSXJD bmo1cXlaZnUvVUR2UHkKZW1GVUIxYTlFOG5Ma1ViUEpZNE5tL0EyNlFHZFRVWW1PZjMwbHhKZVgr aTZlRUhUaGozQ0ZIdHFJWlRJek5HNQo5aExkaEwwa3NRT0VtZitvazVDdwo9c1prdgotLS0tLUVO RCBQR1AgU0lHTkFUVVJFLS0tLS0K --===============8263573595349688018==--