- up to 5.6.1

Changed files:
    net-snmp-nodebug.patch -> 1.2
    net-snmp-rpm-implicit-libs.patch -> 1.5
    net-snmp-use-rpm-hrmib.patch -> 1.7
    net-snmp.spec -> 1.172

diff --git a/net-snmp-nodebug.patch b/net-snmp-nodebug.patch
deleted file mode 100644 (file)
index ad6c6a4..0000000
--- a/net-snmp-nodebug.patch
+++ /dev/null
@@ -1,9 +0,0 @@
---- net-snmp-5.6/agent/mibgroup/agent_mibs.h.orig      2006-09-05 10:37:04.000000000 +0200
-+++ net-snmp-5.6/agent/mibgroup/agent_mibs.h   2010-10-24 18:14:05.891736015 +0200
-@@ -1,6 +1,5 @@
- config_require(agent/nsTransactionTable)
- config_require(agent/nsModuleTable)
--config_require(agent/nsDebug)
- config_require(agent/nsCache)
- config_require(agent/nsLogging)
- config_require(agent/nsVacmAccessTable)

diff --git a/net-snmp-rpm-implicit-libs.patch b/net-snmp-rpm-implicit-libs.patch
index 731916ef234d462a03ec1321165d40ffb4a8df0c..961df6bd5baf3fa30c0137d13528467118125577 100644 (file)
--- a/net-snmp-rpm-implicit-libs.patch
+++ b/net-snmp-rpm-implicit-libs.patch
@@ -1,5 +1,5 @@
---- net-snmp-5.5/configure.d/config_os_libs~   2009-07-11 23:04:37.000000000 +0200
-+++ net-snmp-5.5/configure.d/config_os_libs    2010-05-12 14:24:23.649259395 +0200
+--- net-snmp-5.5/configure.d/config_os_libs1~  2009-07-11 23:04:37.000000000 +0200
++++ net-snmp-5.5/configure.d/config_os_libs1   2010-05-12 14:24:23.649259395 +0200
 @@ -310,18 +310,6 @@
      NETSNMP_SEARCH_LIBS(BZ2_bzread, bz2,,, $LMIBLIBS, _rpmlibs)
    fi

diff --git a/net-snmp-use-rpm-hrmib.patch b/net-snmp-use-rpm-hrmib.patch
index 6f7686db3abff782166e88f64e7177dba74547f7..90427ec2df3b3c1d9273f13f5f39f97944326ccc 100644 (file)
--- a/net-snmp-use-rpm-hrmib.patch
+++ b/net-snmp-use-rpm-hrmib.patch
@@ -11,8 +11,8 @@
  void
  init_hr_swinst(void)
  {
---- net-snmp-5.6/configure.d/config_os_libs.orig       2010-10-24 10:37:25.527741043 +0200
-+++ net-snmp-5.6/configure.d/config_os_libs    2010-10-24 10:40:56.519744396 +0200
+--- net-snmp-5.6/configure.d/config_os_libs1.orig      2010-10-24 10:37:25.527741043 +0200
++++ net-snmp-5.6/configure.d/config_os_libs1   2010-10-24 10:40:56.519744396 +0200
 @@ -425,20 +425,34 @@
  #   RPM checks
  #
@@ -75,22 +75,22 @@
  ##
 --- net-snmp-5.5/configure.d/config_os_functions~      2009-07-26 20:20:55.000000000 +0200
 +++ net-snmp-5.5/configure.d/config_os_functions       2010-05-12 14:35:39.421276242 +0200
-@@ -67,15 +67,6 @@
+@@ -114,15 +114,6 @@
  #           (Agent)
  ##
  
 -#       rpmGetPath check needs clean LIBS environment   (Linux)
 -#
--if test "x$with_rpm" != "xno" && \
--        echo " $module_list " | $GREP " host/hr_swinst " > /dev/null; then
+-if test "x$with_rpm" != "xno"; then
 -    OLDLIBS=$LIBS
 -    LIBS=$LMIBLIBS
 -    AC_CHECK_FUNCS(rpmGetPath)
 -    LIBS=$OLDLIBS
 -fi
- 
+-
  #       statfs( char *, struct fs_data* )               (Ultrix)
  #
+ AC_MSG_CHECKING([[for two-argument statfs with struct fs_data (Ultrix)]])
 --- net-snmp-5.6/agent/mibgroup/host/data_access/swinst_pkginfo.c~     2010-01-26 23:24:14.000000000 +0200
 +++ net-snmp-5.6/agent/mibgroup/host/data_access/swinst_pkginfo.c      2010-12-16 00:13:22.027247692 +0200
 @@ -52,6 +52,8 @@

diff --git a/net-snmp.spec b/net-snmp.spec
index 09533c0d5dbfbd2153c94a1e0d77ed976fcf306c..ecff9462705cccd0bee529ff15a06b3f374d273e 100644 (file)
--- a/net-snmp.spec
+++ b/net-snmp.spec
@@ -27,12 +27,12 @@ Summary(pt_BR.UTF-8):       Agente SNMP da UCD
 Summary(ru.UTF-8):     Набор утилит для протокола SNMP от UC-Davis
 Summary(uk.UTF-8):     Набір утиліт для протоколу SNMP від UC-Davis
 Name:          net-snmp
-Version:       5.6
-Release:       4
+Version:       5.6.1
+Release:       1
 License:       BSD-like
 Group:         Networking/Daemons
 Source0:       http://downloads.sourceforge.net/net-snmp/%{name}-%{version}.tar.gz
-# Source0-md5: 89b3a7a77e68daef925abee43a3f7018
+# Source0-md5: b4e30ead5783b0bb1d280172c6095ea4
 Source1:       %{name}d.init
 Source2:       %{name}d.conf
 Source3:       %{name}d.sysconfig
@@ -55,7 +55,6 @@ Patch10:      %{name}-lvalue.patch
 Patch11:       %{name}-defaultconfig.patch
 Patch12:       %{name}-use-rpm-hrmib.patch
 Patch13:       %{name}-TCP_STATS_CACHE_TIMEOUT.patch
-Patch14:       %{name}-nodebug.patch
 URL:           http://www.net-snmp.org/
 BuildRequires: autoconf >= 2.63
 BuildRequires: automake
@@ -430,7 +429,6 @@ SNMP dla trzech wersji tego protokołu (SNMPv3, SNMPv2c, SNMPv1).
 %patch11 -p1
 %patch12 -p1
 %patch13 -p1
-%patch14 -p1
 
 %build
 %{__libtoolize}
@@ -467,6 +465,7 @@ MIBS="$MIBS ucd-snmp/lmsensorsMib"
        --with-logfile=%{logfile} \
        --with-zlib=%{_prefix} \
        --with-bzip2=%{_prefix} \
+       --with-nl \
        --with%{!?with_perl:out}-perl-modules \
        --with%{!?with_python:out}-python-modules \
        --enable-local-smux \
@@ -479,6 +478,7 @@ MIBS="$MIBS ucd-snmp/lmsensorsMib"
        --with-persistent-directory="/var/lib/net-snmp" \
        --enable-ucd-snmp-compatibility \
        --enable-ipv6 \
+       %{!?debug:--disable-debugging} \
        --with%{!?with_rpm:out}-rpm
 
 %{__make} -j1