- rel 3

- R libpci that's not completely brain-dead

Changed files:
    net-snmp-libpci-init.patch -> 1.4
    net-snmp.spec -> 1.185

diff --git a/net-snmp-libpci-init.patch b/net-snmp-libpci-init.patch
index b0a80f53e5b355af78ccb41bc129e5f529368bee..4adca98f434097e89f6423168959cefd78e9c87a 100644 (file)
--- a/net-snmp-libpci-init.patch
+++ b/net-snmp-libpci-init.patch
@@ -19,7 +19,7 @@
  #endif
  
  #ifdef HAVE_LINUX_ETHTOOL_H
-@@ -146,9 +158,14 @@
+@@ -146,9 +158,15 @@
  
  #ifdef HAVE_PCI_LOOKUP_NAME
      pci_access = pci_alloc();
@@ -31,6 +31,7 @@
 +      if (_net_snmp_pci_status == 0) {
 +          pci_cleanup(pci_access);
 +          pci_access = NULL;
++          snmp_log(LOG_ERR, "Unable to create pci access method (libpci)\n");
 +      }
 +    } else
        snmp_log(LOG_ERR, "Unable to create pci access method\n");

diff --git a/net-snmp.spec b/net-snmp.spec
index 0f15b89ce124642f71bc5bd7c93cf92453995767..ff13f58fb301dd46d31e810bf3289a8096073cf4 100644 (file)
--- a/net-snmp.spec
+++ b/net-snmp.spec
@@ -26,7 +26,7 @@ Summary(ru.UTF-8):    Набор утилит для протокола SNMP от U
 Summary(uk.UTF-8):     Набір утиліт для протоколу SNMP від UC-Davis
 Name:          net-snmp
 Version:       5.7
-Release:       2.1
+Release:       3
 License:       BSD-like
 Group:         Networking/Daemons
 Source0:       http://downloads.sourceforge.net/net-snmp/%{name}-%{version}.tar.gz
@@ -85,6 +85,7 @@ Requires(post,preun): /sbin/chkconfig
 Requires:      %{name}-libs = %{version}-%{release}
 Requires:      /usr/bin/setsid
 Requires:      mibs-%{name} = %{version}-%{release}
+Requires:      pciutils >= 3.1.7-5
 Requires:      rc-scripts >= 0.4.3.0
 Provides:      snmpd
 Obsoletes:     cmu-snmp