public inbox for development@lists.ipfire.org
 help / color / mirror / Atom feed
From: Michael Tremer <michael.tremer@ipfire.org>
To: development@lists.ipfire.org
Subject: Re: [PATCH] netsnmpd: added lmsensors and some other mibs
Date: Wed, 05 Apr 2017 12:24:41 +0100	[thread overview]
Message-ID: <1491391481.2643.103.camel@ipfire.org> (raw)
In-Reply-To: <1491387916-4872-1-git-send-email-daniel.weismueller@ipfire.org>

[-- Attachment #1: Type: text/plain, Size: 3379 bytes --]

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(a)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

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 819 bytes --]

      reply	other threads:[~2017-04-05 11:24 UTC|newest]

Thread overview: 2+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2017-04-05 10:25 Daniel Weismüller
2017-04-05 11:24 ` Michael Tremer [this message]

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1491391481.2643.103.camel@ipfire.org \
    --to=michael.tremer@ipfire.org \
    --cc=development@lists.ipfire.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox