Accepting request 49877 from net-snmp:factory

Copy from net-snmp:factory/net-snmp based on submit request 49877 from user coolo

OBS-URL: https://build.opensuse.org/request/show/49877
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/net-snmp?expand=0&rev=33

net-snmp-5.5.0-upstream-20100602.patch.bz2

@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:414ad3ebdf6abfc69d39e648f07a27d0558b38305922c29e19ca48f9c5ce2d29
-size 248726

net-snmp-5.5.0-upstream-20100803.patch.bz2

@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:b42bd8cc1bd4e3a5f4b9dca32e9d2dff9b1180f07b4c00ce4475629ba524473d
+size 261319

net-snmp.changes

@@ -1,3 +1,18 @@
+-------------------------------------------------------------------
+Tue Aug  3 18:33:33 UTC 2010 - lchiquitto@novell.com
+
+- update upstream patches from branch V5-5-patches to 20100803
+
+-------------------------------------------------------------------
+Mon Jul 19 16:36:49 UTC 2010 - lchiquitto@novell.com
+
+- change default log level from DEBUG to NOTICE (bnc#623497)
+
+-------------------------------------------------------------------
+Fri Jul 16 01:04:14 UTC 2010 - lchiquitto@novell.com
+
+- spec file cleanup: remove old backward compatibility scripts
+
 -------------------------------------------------------------------
 Thu Jun  3 11:43:52 UTC 2010 - lchiquitto@novell.com
 

net-snmp.spec

@@ -28,7 +28,7 @@
 
 Name:           net-snmp
 Version:        5.5
-Release:        7
+Release:        12
 License:        BSD3c(or similar) ; MIT License (or similar)
 Group:          Productivity/Networking/Other
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
@@ -39,14 +39,11 @@ BuildRequires:  libsensors4-devel
 Requires:       perl-TermReadKey logrotate
 Requires:       perl-SNMP = %{version}
 PreReq:         %insserv_prereq %fillup_prereq /sbin/chkconfig
-Provides:       snmp ucdsnmp
-Obsoletes:      snmp ucdsnmp
 # bug437293
 %ifarch ppc64
 Obsoletes:      net-snmp-64bit
 %endif
 #
-#
 Url:            http://sourceforge.net/projects/net-snmp
 Source:         %{pkg_name}-%{version}.tar.bz2
 Source1:        rc.net-snmp
@@ -58,7 +55,7 @@ Source6:        test_installed
 Source7:        net-snmp.sysconfig
 Source8:        net-snmp-rpmlintrc
 Source9:        baselibs.conf
-Patch0:         net-snmp-5.5.0-upstream-20100602.patch.bz2
+Patch0:         net-snmp-5.5.0-upstream-20100803.patch.bz2
 # unused patch atm
 Patch1:         net-snmp-5.5.0-socket-path.patch
 Patch2:         net-snmp-5.5.0-testing-empty-arptable.patch
@@ -291,35 +288,6 @@ popd
 %stop_on_removal snmpd
 
 %post
-# if we are upgrading from older distros the config should be moved
-# to the new place
-CONFD="/etc/snmp"
-OCONF="/etc/snmpd.conf"
-NCONF="${CONFD}/snmpd.conf"
-NCONFB="${CONFD}/snmpd.conf.rpmsave"
-if [ -e "$OCONF" ] ; then
-#
-# in worst case we will get:
-# /etc/snmp/snmpd.conf         - the old /etc/snmpd.conf
-# /etc/snmp/snmpd.conf.rpmnew  - the config of the newly installed package.
-# /etc/snmp/snmpd.conf.rpmsave - the old /etc/snmp/snmpd.conf
-#
-    if [ ! -d "$CONFD" ] ; then 
-        mkdir "$CONFD"
-    fi
-#
-# we dont need to handle the case that /etc/snmp/snmpd.conf
-# exists. rpm does that for us.
-# it creates /etc/snmp/snmpd.conf.rpmnew
-#
-    if [ -e "$NCONF" ] ; then
-        mv "$NCONF" "$NCONFB"
-        echo "warning: /etc/snmp/snmpd.conf backed up as /etc/snmp/snmpd.conf.rpmsave" >&2
-    fi
-    echo "warning: /etc/snmpd.conf moved to /etc/snmp/snmpd.conf" >&2
-    mv "$OCONF" "$NCONF"
-fi
-# we might be updating from ucdsnmp soon
 /sbin/chkconfig -c snmpd 2> /dev/null && FIRST_ARG=2
 %{fillup_only}
 

net-snmp.sysconfig

@@ -1,36 +1,36 @@
 ## Path:        System/Net-SNMP
 ## Description: Log level of the snmp server.
 ## Type:        string(!,a,c,e,w,n,i,d,0,1,2,3,4,5,6,7)
-## Default:     d
+## Default:     n
 #
-# Defines the log level for the snmpd.
+# Defines the log level for snmpd.
 #
-# The default is set to d (7, LOG_DEBUG)
+# The default is "n" (5, LOG_NOTICE)
-# This reflects the default for old init script.
 #
-SNMPD_LOGLEVEL="d"
+SNMPD_LOGLEVEL="n"
 
 ## Path:        System/Net-SNMP
 ## Description: En-/Disables SNMP SMUX support.
 ## Type:        yesno
 ## Default:     yes
 #
-# If this setting is set to "no" the snmpd will no longer bind
+# Setting this to "no" prevents snmpd from binding to TCP port 199.
-# the TCP Port 199.
 #
-# The default is set to "yes" to provide backward compatibility.
+# The default is "yes" to provide backward compatibility.
 #
 SNMPD_USE_SMUX="yes"
 
 ## Path:        System/Net-SNMP
-### Description: Connecion logging.
+## Description: Connection logging.
-### Type:        yesno
+## Type:        yesno
-### Default:     yes
+## Default:     yes
-##
+#
-## If this settings is yes, net-snmp will not log any successfull connections.
+# If this setting is "yes" and $SNMPD_LOGLEVEL is set to "i" (LOG_INFO)
-## If it is set to no, "--dontLogTCPWrappersConnects" will added to the
+# or "d" (LOG_DEBUG), snmpd will log all successful connections.
-## snmpd cmdline. (see "man 5 snmpd.conf")
+#
-##
+# Setting it to "no" will prevent this kind of log regardless of the
-## The default is set to "yes" to provide backward compatibility.
+# configured log level.
-##
+#
+# The default is "yes" to provide backward compatibility.
+#
 SNMPD_LOG_SUCCESSFUL_CONNECTIONS="yes"