- up to 5.7

Changed files:
    net-snmp-config-noflags.patch -> 1.7
    net-snmp-rpm-implicit-libs.patch -> 1.6
    net-snmp-use-rpm-hrmib.patch -> 1.8
    net-snmp.spec -> 1.180

diff --git a/net-snmp-config-noflags.patch b/net-snmp-config-noflags.patch
index 3c015bb878fec76c97baf103304ba0d073debfc2..cec0ea84ca0777a0b3eaf83bb7bd00cf96e5c48a 100644 (file)
--- a/net-snmp-config-noflags.patch
+++ b/net-snmp-config-noflags.patch
@@ -6,9 +6,9 @@
  datarootdir=@datarootdir@
 -NSC_LDFLAGS="@LDFLAGS@"
 +NSC_LDFLAGS=""
+ 
+ NSC_LIBS="@LIBS@"
  NSC_LNETSNMPLIBS="@LNETSNMPLIBS@"
- NSC_INCLUDEDIR=${includedir}
- NSC_LIBDIR=-L${libdir}
 @@ -124,10 +124,10 @@
        ;;
      #################################################### compile

diff --git a/net-snmp-rpm-implicit-libs.patch b/net-snmp-rpm-implicit-libs.patch
index 961df6bd5baf3fa30c0137d13528467118125577..0aa61c0edd1efdbe1d9c664993b533aee9d5969a 100644 (file)
--- a/net-snmp-rpm-implicit-libs.patch
+++ b/net-snmp-rpm-implicit-libs.patch
@@ -1,20 +1,11 @@
---- 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
+--- net-snmp-5.7/configure.d/config_os_libs1~  2011-07-02 00:35:46.000000000 +0200
++++ net-snmp-5.7/configure.d/config_os_libs1   2011-07-30 21:24:38.780738542 +0200
+@@ -33,9 +33,6 @@
+   # FWIW librpm.la, librpmio.la, and libpopt.la have correct dependencies.
+   _rpmlibs=""
  
--  # two variants of db1 need checking.
--  NETSNMP_SEARCH_LIBS(dbopen, [db1 db],,, $LMIBLIBS, _rpmlibs)
--
--  # two variants of db3 need checking.
--  NETSNMP_SEARCH_LIBS(db_create, [db-3.1 db-3.0],,, $LMIBLIBS, _rpmlibs)
--  
--  # rpm-3.0.5 and later needs popt.
--  NETSNMP_SEARCH_LIBS(poptParseArgvString, popt,,, $LMIBLIBS, _rpmlibs)
--  
 -  # rpm-4.0.x needs rpmio.
--  NETSNMP_SEARCH_LIBS(Fopen, rpmio,,, $LMIBLIBS, _rpmlibs)
+-  NETSNMP_SEARCH_LIBS(rpmGetPath, rpmio,,, $LMIBLIBS, _rpmlibs)
 -  
    # rpm-4.0.3 librpmdb actually contains what we need.
    NETSNMP_SEARCH_LIBS(rpmdbOpen, rpmdb,,, $LMIBLIBS, _rpmlibs)

diff --git a/net-snmp-use-rpm-hrmib.patch b/net-snmp-use-rpm-hrmib.patch
index 90427ec2df3b3c1d9273f13f5f39f97944326ccc..4d4364176620f90f5d9ed482e61ac3cbe7327ba2 100644 (file)
--- a/net-snmp-use-rpm-hrmib.patch
+++ b/net-snmp-use-rpm-hrmib.patch
@@ -115,12 +115,12 @@
  /*
   * all platforms use this generic code
   */
-@@ -24,7 +28,7 @@
-     config_require(host/data_access/swinst_darwin)
+@@ -29,7 +29,7 @@
+     config_require(host/data_access/swinst_apt)
  #elif defined( HAVE_LIBRPM ) && defined( linux )
      config_require(host/data_access/swinst_rpm)
--#elif defined( HAVE_PKGLOCS_H ) || defined( hpux9 ) || defined( hpux10 ) || defined( hpux11 ) || defined( freebsd2 )
-+#elif defined( HAVE_PKGLOCS_H ) || defined( RPM_HRMIB_PATH ) || defined( hpux9 ) || defined( hpux10 ) || defined( hpux11 ) || defined( freebsd2 )
+-#elif defined( HAVE_PKGLOCS_H ) || defined( hpux9 ) || defined( hpux10 ) || defined( hpux11 ) || defined( freebsd2 ) || defined( linux )
++#elif defined( HAVE_PKGLOCS_H ) || defined( RPM_HRMIB_PATH ) || defined( hpux9 ) || defined( hpux10 ) || defined( hpux11 ) || defined( freebsd2 ) || defined( linux )
      config_require(host/data_access/swinst_pkginfo)
  #else
      config_warning(This platform does not yet support hrSWInstalledTable rewrites)

diff --git a/net-snmp.spec b/net-snmp.spec
index d330ed283dde027ae36e32c20157348b237f584e..b779366b08337c6b524b35ea98ee493236ca66b5 100644 (file)
--- a/net-snmp.spec
+++ b/net-snmp.spec
@@ -18,7 +18,7 @@
 %undefine      with_lm_sensors
 %endif
 
-%define                so_version      25
+%define                so_version      30
 %include       /usr/lib/rpm/macros.perl
 Summary:       A collection of SNMP protocol tools
 Summary(es.UTF-8):     Agente SNMP de la UCD
@@ -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.1.1
-Release:       3
+Version:       5.7
+Release:       1
 License:       BSD-like
 Group:         Networking/Daemons
 Source0:       http://downloads.sourceforge.net/net-snmp/%{name}-%{version}.tar.gz
-# Source0-md5: 79e2b9cac947567a01ae2cc67ad8fe53
+# Source0-md5: 1038e960d6d616c64c0979180daf0e19
 Source1:       %{name}d.init
 Source2:       %{name}d.conf
 Source3:       %{name}d.sysconfig