Hello community, here is the log from the commit of package net-snmp for openSUSE:Factory checked in at Wed Sep 14 15:00:42 CEST 2011.
-------- --- net-snmp/net-snmp.changes 2011-07-14 19:47:53.000000000 +0200 +++ /mounts/work_src_done/STABLE/net-snmp/net-snmp.changes 2011-09-09 22:55:42.000000000 +0200 @@ -2 +2,39 @@ -Thu Jul 14 17:46:57 UTC 2011 - [email protected] +Fri Sep 9 20:41:31 UTC 2011 - [email protected] + +- update to version 5.7.1.rc1 but keep package version as 5.7.1 + to avoid update problems when the final version is released + +------------------------------------------------------------------- +Fri Sep 9 20:18:31 UTC 2011 - [email protected] + +- small fixes to snmpd and snmptrapd init scripts: + - if $SNMPD_LOGLEVEL is not defined, use LOG_NOTICE instead of + LOG_DEBUG + - improve messages printed and service description + - write snmptrapd logs to /var/log/net-snmpd.log + +------------------------------------------------------------------- +Fri Sep 9 19:36:55 UTC 2011 - [email protected] + +- update README.SUSE to reflect some recent changes and drop a bit + of outdated information +- update baselibs to reflect new library version +- spec file cleanup: rename some source files for consistency + +------------------------------------------------------------------- +Thu Sep 1 12:48:57 UTC 2011 - [email protected] + +- add ReiserFS to the list of known file systems (bnc#715199) + +------------------------------------------------------------------- +Tue Aug 30 01:43:26 UTC 2011 - [email protected] + +- install snmptrapd init script by default (bnc#712175) + +------------------------------------------------------------------- +Tue Aug 30 01:37:28 UTC 2011 - [email protected] + +- fix logging option in snmptrapd init script (bnc#712174) + +------------------------------------------------------------------- +Thu Jul 14 17:46:57 UTC 2011 - [email protected] @@ -7 +45 @@ -Tue Jul 5 12:28:00 UTC 2011 - [email protected] +Tue Jul 5 12:28:00 UTC 2011 - [email protected] @@ -25 +63 @@ -Thu May 12 14:49:34 UTC 2011 - [email protected] +Thu May 12 14:49:34 UTC 2011 - [email protected] @@ -30 +68 @@ -Wed Apr 13 17:30:28 UTC 2011 - [email protected] +Wed Apr 13 17:30:28 UTC 2011 - [email protected] @@ -35 +73 @@ -Mon Mar 28 18:53:16 UTC 2011 - [email protected] +Mon Mar 28 18:53:16 UTC 2011 - [email protected] @@ -40 +78 @@ -Tue Jan 4 11:34:19 UTC 2011 - [email protected] +Tue Jan 4 11:34:19 UTC 2011 - [email protected] @@ -45 +83 @@ -Tue Jan 4 11:26:48 UTC 2011 - [email protected] +Tue Jan 4 11:26:48 UTC 2011 - [email protected] @@ -54 +92 @@ -Tue Nov 30 18:09:58 UTC 2010 - [email protected] +Tue Nov 30 18:09:58 UTC 2010 - [email protected] @@ -59 +97 @@ -Mon Nov 29 10:43:34 UTC 2010 - [email protected] +Mon Nov 29 10:43:34 UTC 2010 - [email protected] @@ -69 +107 @@ -Wed Nov 3 12:04:50 UTC 2010 - [email protected] +Wed Nov 3 12:04:50 UTC 2010 - [email protected] @@ -74 +112 @@ -Mon Nov 1 17:54:34 UTC 2010 - [email protected] +Mon Nov 1 17:54:34 UTC 2010 - [email protected] @@ -80 +118 @@ -Wed Oct 27 16:48:40 UTC 2010 - [email protected] +Wed Oct 27 16:48:40 UTC 2010 - [email protected] @@ -86 +124 @@ -Thu Oct 21 14:37:36 UTC 2010 - [email protected] +Thu Oct 21 14:37:36 UTC 2010 - [email protected] @@ -91 +129 @@ -Tue Oct 19 23:59:46 UTC 2010 - [email protected] +Tue Oct 19 23:59:46 UTC 2010 - [email protected] @@ -101 +139 @@ -Tue Aug 3 18:33:33 UTC 2010 - [email protected] +Tue Aug 3 18:33:33 UTC 2010 - [email protected] @@ -106 +144 @@ -Mon Jul 19 16:36:49 UTC 2010 - [email protected] +Mon Jul 19 16:36:49 UTC 2010 - [email protected] @@ -111 +149 @@ -Fri Jul 16 01:04:14 UTC 2010 - [email protected] +Fri Jul 16 01:04:14 UTC 2010 - [email protected] @@ -116 +154 @@ -Thu Jun 3 11:43:52 UTC 2010 - [email protected] +Thu Jun 3 11:43:52 UTC 2010 - [email protected] @@ -122 +160 @@ -Mon May 31 13:48:27 UTC 2010 - [email protected] +Mon May 31 13:48:27 UTC 2010 - [email protected] @@ -131 +169 @@ -Fri Apr 30 16:01:08 UTC 2010 - [email protected] +Fri Apr 30 16:01:08 UTC 2010 - [email protected] @@ -137 +175 @@ -Wed Apr 28 21:41:22 UTC 2010 - [email protected] +Wed Apr 28 21:41:22 UTC 2010 - [email protected] @@ -149 +187 @@ -Wed Apr 28 21:38:21 UTC 2010 - [email protected] +Wed Apr 28 21:38:21 UTC 2010 - [email protected] @@ -154 +192 @@ -Mon Apr 5 15:58:58 UTC 2010 - [email protected] +Mon Apr 5 15:58:58 UTC 2010 - [email protected] @@ -166 +204 @@ -Fri Mar 5 17:33:34 UTC 2010 - [email protected] +Fri Mar 5 17:33:34 UTC 2010 - [email protected] @@ -186 +224 @@ -Tue Jan 19 12:01:54 UTC 2010 - [email protected] +Tue Jan 19 12:01:54 UTC 2010 - [email protected] @@ -194 +232 @@ -Tue Dec 22 09:41:44 UTC 2009 - [email protected] +Tue Dec 22 09:41:44 UTC 2009 - [email protected] calling whatdependson for head-i586 Old: ---- README.SuSE net-snmp-5.7-upstream-20110714.patch.bz2 net-snmp-5.7.tar.bz2 rc.net-snmp New: ---- README.SUSE net-snmp-5.7.0-recognize-reiserfs.patch net-snmp-5.7.1.rc1.tar.bz2 rc.snmpd ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ net-snmp.spec ++++++ --- /var/tmp/diff_new_pack.QvMzPh/_old 2011-09-14 15:00:34.000000000 +0200 +++ /var/tmp/diff_new_pack.QvMzPh/_new 2011-09-14 15:00:34.000000000 +0200 @@ -27,7 +27,7 @@ %define netsnmp_agentx_socket_dir_rfc /var/agentx Name: net-snmp -Version: 5.7 +Version: 5.7.1 Release: 1 License: BSD3c(or similar) ; MIT License (or similar) Group: Productivity/Networking/Other @@ -45,25 +45,23 @@ %endif # Url: http://sourceforge.net/projects/net-snmp -Source: %{pkg_name}-%{version}.tar.bz2 -Source1: rc.net-snmp +Source: %{pkg_name}-%{version}.rc1.tar.bz2 +Source1: rc.snmpd Source2: snmpd.conf -Source3: README.SuSE +Source3: README.SUSE Source4: rc.snmptrapd Source5: net-snmp.logrotate Source6: test_installed Source7: net-snmp.sysconfig Source8: net-snmp-rpmlintrc Source9: baselibs.conf -%define patchdate 20110714 -Patch0: net-snmp-%{version}-upstream-%{patchdate}.patch.bz2 -# unused patch atm Patch1: net-snmp-5.5.0-socket-path.patch Patch2: net-snmp-5.5.0-testing-empty-arptable.patch Patch3: net-snmp-5.7.0-pie.patch Patch5: net-snmp-5.6.1-net-snmp-config-headercheck.patch Patch6: net-snmp-5.5.0-perl-tk-warning.patch Patch7: net-snmp-5.7.0-velocity-mib.patch +Patch8: net-snmp-5.7.0-recognize-reiserfs.patch # Summary: SNMP Daemon @@ -197,14 +195,14 @@ G.S. Marzot <[email protected]> %prep -%setup -q -n %{pkg_name}-%{version} -%patch0 -p1 +%setup -q -n %{pkg_name}-%{version}.rc1 %patch1 -p1 %patch2 -p1 %patch3 -p1 %patch5 -p1 %patch6 -p1 %patch7 -p1 +%patch8 -p1 %build MIBS="misc/ipfwacc ucd-snmp/diskio etherlike-mib rmon-mib velocity smux \ @@ -251,12 +249,14 @@ %makeinstall INSTALL_PREFIX=%{buildroot} %{__install} -Dd %{buildroot}/var/log %{buildroot}/var/lib/net-snmp %{buildroot}/usr/lib/net-snmp/agents %{buildroot}%{netsnmp_agentx_socket_dir_fhs} %{__install} -D -m 0755 %{SOURCE1} %{buildroot}/etc/init.d/snmpd +%{__install} -D -m 0755 %{SOURCE4} %{buildroot}/etc/init.d/snmptrapd %{__install} -D -m 0600 %{SOURCE2} %{buildroot}/etc/snmp/snmpd.conf %{__install} -m 0644 %{SOURCE3} . %{__install} -m 0644 %{SOURCE4} . %{__install} -D -m 0644 %{SOURCE5} %{buildroot}/etc/logrotate.d/net-snmp %{__install} -m 0744 %{SOURCE6} testing/ %{__ln_s} -f /etc/init.d/snmpd %{buildroot}%{_sbindir}/rcsnmpd +%{__ln_s} -f /etc/init.d/snmptrapd %{buildroot}%{_sbindir}/rcsnmptrapd %{__install} -m 0644 /dev/null %{buildroot}%{netsnmp_logfile} pushd perl %perl_make_install @@ -284,6 +284,7 @@ %postun %restart_on_update snmpd +%restart_on_update snmptrapd %{insserv_cleanup} %post -n %{library_name} -p /sbin/ldconfig @@ -293,11 +294,12 @@ %files %defattr(-,root,root) %doc AGENT.txt COPYING EXAMPLE.conf EXAMPLE.conf.def -%doc FAQ NEWS TODO rc.snmptrapd +%doc FAQ NEWS TODO %doc README README.agent-mibs README.agentx README.krb5 README.snmpv3 README.thread %dir /etc/snmp %config(noreplace) /etc/snmp/snmpd.conf %config /etc/init.d/snmpd +%config /etc/init.d/snmptrapd %{_bindir}/encode_keychange %{_bindir}/fixproc %{_bindir}/ipf-mod.pl ++++++ README.SUSE ++++++ An SNMP agent is a powerful and complex software and, as such, may be affected by flaws and security issues. We recommend that SNMP access (161/udp,162/udp) be blocked at your firewall. There are also some important changes that have been made in this release of our package: o the daemon now sets a PID file in /var/run/ o logging is now done directly to /var/log/net-snmpd.log instead of sending stderr/stdout through syslog. o the daemon is now started with the '-r'. This option prevents snmpd from exiting if it doesn't have permission to read something. This only occurs if you start snmpd on a high port as a non-root root user. o If you need to run snmptrapd, we've provided an init script in /etc/init.d/snmptrapd, but the service is disabled by default. SNMP traps should be avoided whenever possible because they are unreliable (you should poll with snmpget instead) and snmptrapd has been the source of many of the security problems with SNMP so please don't run this unless you are sure of what you are doing. To enable the service, run chkconfig snmptrapd on and create a configuration file named /etc/snmp/snmptrapd.conf. Then, start the daemon with rcsnmptrapd start Logging is done to /var/log/net-snmpd.log. For more information see the manpages for snmptrapd and snmptrapd.conf. o Master AgentX support is enabled if you have modules in /usr/lib/net-snmp/agents. The domain socket is created as /var/run/agentx/master. You can change this to a network interface if needed (see snmpd(1)). The snmpd init script automatically detects and starts any sub-agents in placed into /var/lib/net-snmp. More documentation on the net-snmp package can be found in this directory as well as the project's homepage: http://www.net-snmp.org/ ++++++ baselibs.conf ++++++ --- /var/tmp/diff_new_pack.QvMzPh/_old 2011-09-14 15:00:34.000000000 +0200 +++ /var/tmp/diff_new_pack.QvMzPh/_new 2011-09-14 15:00:34.000000000 +0200 @@ -1,4 +1,4 @@ -libsnmp25 +libsnmp30 arch ppc package net-snmp-devel requires -net-snmp-<targettype> - requires "libsnmp25-<targettype> = <version>" + requires "libsnmp30-<targettype> = <version>" ++++++ net-snmp-5.7.0-recognize-reiserfs.patch ++++++ From: Mendel Mobach <[email protected]> Add ReiserFS to the list of recognized file systems and move JFS and XFS defines below the right comment. --- agent/mibgroup/hardware/fsys/fsys_mntent.c | 1 + agent/mibgroup/hardware/fsys/mnttypes.h | 13 ++++++------- 2 files changed, 7 insertions(+), 7 deletions(-) Index: net-snmp-5.7/agent/mibgroup/hardware/fsys/fsys_mntent.c =================================================================== --- net-snmp-5.7.orig/agent/mibgroup/hardware/fsys/fsys_mntent.c +++ net-snmp-5.7/agent/mibgroup/hardware/fsys/fsys_mntent.c @@ -135,6 +135,7 @@ _fsys_type( char *typename ) !strcmp(typename, MNTTYPE_GFS2) || !strcmp(typename, MNTTYPE_XFS) || !strcmp(typename, MNTTYPE_JFS) || + !strcmp(typename, MNTTYPE_REISERFS) || !strcmp(typename, MNTTYPE_LOFS)) return NETSNMP_FS_TYPE_OTHER; Index: net-snmp-5.7/agent/mibgroup/hardware/fsys/mnttypes.h =================================================================== --- net-snmp-5.7.orig/agent/mibgroup/hardware/fsys/mnttypes.h +++ net-snmp-5.7/agent/mibgroup/hardware/fsys/mnttypes.h @@ -114,6 +114,12 @@ #ifndef MNTTYPE_GFS2 #define MNTTYPE_GFS2 "gfs2" #endif +#ifndef MNTTYPE_XFS +#define MNTTYPE_XFS "xfs" +#endif +#ifndef MNTTYPE_JFS +#define MNTTYPE_JFS "jfs" +#endif /* * File systems to monitor, but not covered by HR-TYPES enumerations @@ -156,12 +162,5 @@ #ifndef MNTTYPE_RPCPIPE #define MNTTYPE_RPCPIPE "rpc_pipefs" #endif -#ifndef MNTTYPE_XFS -#define MNTTYPE_XFS "xfs" -#endif -#ifndef MNTTYPE_JFS -#define MNTTYPE_JFS "jfs" -#endif - #endif /* _NETSNMP_FSYS_MNTTYPES_H */ ++++++ rc.snmpd ++++++ #! /bin/sh # Copyright (c) 1996-2011 SuSE GmbH Nuernberg, Germany. All rights reserved. # # Author: Christopher Mahmood, Remo Behn # # /etc/init.d/snmpd # ### BEGIN INIT INFO # Provides: net-snmp snmp # Required-Start: $remote_fs # Should-Start: $syslog $network # Required-Stop: $remote_fs # Should-Stop: $syslog $network # Default-Start: 2 3 5 # Default-Stop: 0 1 6 # Description: Net-SNMP agent # Short-Description: Net-SNMP agent ### END INIT INFO SNMPD=/usr/sbin/snmpd AGENTDIR=/usr/lib/net-snmp/agents SNMPDCONF=/etc/snmp/snmpd.conf SNMPD_PID=/var/run/snmpd.pid test -x $SNMPD || exit 5 # Check for existence of needed config file and read it SNMPD_CONFIG=/etc/sysconfig/net-snmp test -r $SNMPD_CONFIG || { echo "$SNMPD_CONFIG not existing"; if [ "$1" = "stop" ]; then exit 0; else exit 6; fi; } # Read config . $SNMPD_CONFIG # Shell functions sourced from /etc/rc.status: # rc_check check and set local and overall rc status # rc_status check and set local and overall rc status # rc_status -v ditto but be verbose in local rc status # rc_status -v -r ditto and clear the local rc status # rc_failed set local and overall rc status to failed # rc_failed <num> set local and overall rc status to <num><num> # rc_reset clear local rc status (overall remains) # rc_exit exit appropriate to overall rc status . /etc/rc.status # First reset status of this service rc_reset # Return values acc. to LSB for all commands but status: # 0 - success # 1 - generic or unspecified error # 2 - invalid or excess argument(s) # 3 - unimplemented feature (e.g. "reload") # 4 - insufficient privilege # 5 - program is not installed # 6 - program is not configured # 7 - program is not running # # Note that starting an already running service, stopping # or restarting a not-running service as well as the restart # with force-reload (in case signalling is not supported) are # considered a success. # check whether to enable agentx support and get list of installed # agents get_agents() { agents= agentargs='' for agent in $AGENTDIR/*; do test -x $agent || continue agents="$agents $agent" agentargs="-x /var/run/agentx/master" done } case "$1" in start) echo -n "Starting snmpd" # # do not even try to start if the log file is (2GB-1MB) big. # the snmpd doesnt handle LFS properly # SNMPD_LOGFILE="${SNMPD_LOGFILE:-/var/log/net-snmpd.log}" if [ -e "$SNMPD_LOGFILE" ] ; then SNMPD_SIZE_LOGFILE="$(stat -c "%s" $SNMPD_LOGFILE)" SNMPD_SIZE_MAX="1073741824" if [ $SNMPD_SIZE_LOGFILE -gt $SNMPD_SIZE_MAX ] ; then echo -e "\n\"$SNMPD_LOGFILE\" is too large. Running 'logrotate' for net-snmp." >&2 /usr/sbin/logrotate /etc/logrotate.d/net-snmp fi fi get_agents # Don't add -c /etc/snmp/snmpd.conf, as it is loaded by default. if [ $SNMPDCONF = "/etc/snmp/snmpd.conf" ]; then SNMPDCONF="" else SNMPDCONF="-c $SNMPDCONF" fi case "${SNMPD_USE_SMUX:-yes}" in [Nn][Oo]) SNMPDNOSMUX="-I -smux" ;; esac case "${SNMPD_LOG_SUCCESSFUL_CONNECTIONS:-yes}" in [Nn][Oo]) SNMPDNOTCPWRAPPERLOG="--dontLogTCPWrappersConnects" ;; esac # /var/run can now be mounted as tmpfs if [ ! -d /var/run/agentx ]; then mkdir -m 0700 /var/run/agentx fi startproc $SNMPD $SNMPDCONF -r -A -LF ${SNMPD_LOGLEVEL:-n} $SNMPD_LOGFILE -p $SNMPD_PID $agentargs $SNMPDNOSMUX $SNMPDNOTCPWRAPPERLOG rc_status -v rc_reset # start all agents if test -n "$agents"; then usleep 300000 for agent in $agents; do echo -en "\tStarting `basename $agent`" startproc -t1 $agent rc_status -v ; rc_reset done fi ;; stop) echo -n "Shutting down snmpd:" killproc -TERM $SNMPD rc_status -v ; rc_reset # we also need to make sure all agents die if test -n "$agents"; then for agent in $AGENTDIR/*; do test -x $agent || continue echo -ne "\tShutting down `basename $agent`:" killproc $agent rc_status -v ; rc_reset done fi ;; try-restart) $0 status >/dev/null && $0 restart rc_status ;; restart) $0 stop $0 start rc_status ;; force-reload) echo -n "Reload service snmpd:" killproc -HUP $SNMPD rc_status -v ;; reload) echo -n "Reload service snmpd:" killproc -HUP $SNMPD rc_status -v ;; status) echo -n "Checking for service snmpd:" checkproc $SNMPD rc_status -v get_agents if test -n "$agents"; then echo -e "Checking for agents:" for agent in $agents; do echo -en "\t`basename $agent`" checkproc $agent rc_status -v done fi ;; *) echo "Usage: $0 {start|stop|try-restart|restart|force-reload|reload|status}" exit 1 ;; esac rc_exit ++++++ rc.snmptrapd ++++++ --- /var/tmp/diff_new_pack.QvMzPh/_old 2011-09-14 15:00:34.000000000 +0200 +++ /var/tmp/diff_new_pack.QvMzPh/_new 2011-09-14 15:00:34.000000000 +0200 @@ -1,28 +1,30 @@ #! /bin/sh -# Copyright (c) 1996-2002 SuSE GmbH Nuernberg, Germany. All rights reserved. +# Copyright (c) 1996-2011 SuSE GmbH Nuernberg, Germany. All rights reserved. # -# Author: Christopher Mahmood <[email protected]>, 2002 +# Author: Christopher Mahmood # # /etc/init.d/snmptrapd # ### BEGIN INIT INFO -# Provides: snmpdtrapd +# Provides: snmptrapd # Required-Start: $network # Required-Stop: $network # Default-Start: 2 3 5 # Default-Stop: 0 1 6 -# Description: start net-snmptrapd +# Description: Receive and log SNMP trap messages +# Short-Description: Receive and log SNMP trap messages ### END INIT INFO SNMPTRAPD=/usr/sbin/snmptrapd SNMPTRAPD_CONF="/etc/snmp/snmptrapd.conf" -SNMPTRAPD_LOGFILE="/var/log/net-snmp.log" +SNMPTRAPD_LOGFILE="/var/log/net-snmpd.log" +SNMPTRAPD_PID="/var/run/snmptrapd.pid" test -x $SNMPTRAPD || exit 5 # Check for existence of needed config file and read it SNMPD_CONFIG=/etc/sysconfig/net-snmp -test -r $SNMPD_CONFIG || { echo "$SNMPD_CONFIG not existing"; +test -r $SNMPD_CONFIG || { echo "$SNMPD_CONFIG doesn't exist."; if [ "$1" = "stop" ]; then exit 0; else exit 6; fi; } @@ -52,7 +54,7 @@ # 5 - program is not installed # 6 - program is not configured # 7 - program is not running -# +# # Note that starting an already running service, stopping # or restarting a not-running service as well as the restart # with force-reload (in case signalling is not supported) are @@ -62,11 +64,11 @@ else SNMPTRAPD_CONF="-c $SNMPTRAPD_CONF" fi -SNMPTRAPD_LOGFILE="${SNMPTRAPD_LOGFILE:-/var/log/net-snmp.log}" +SNMPTRAPD_LOGFILE="${SNMPTRAPD_LOGFILE:-/var/log/net-snmpd.log}" case "$1" in start) echo -n "Starting snmptrapd:" - startproc $SNMPTRAPD $SNMPTRAPD_CONF -A -Lf ${SNMPD_LOGLEVEL:-d} $SNMPTRAPD_LOGFILE -p /var/run/snmptrapd.pid + startproc $SNMPTRAPD $SNMPTRAPD_CONF -A -LF ${SNMPD_LOGLEVEL:-n} $SNMPTRAPD_LOGFILE -p $SNMPTRAPD_PID rc_status -v ;; stop) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
