- release 6 (by relup.sh)

[packages/net-snmp.git] / net-snmp-use-rpm-hrmib.patch

diff --git a/net-snmp-use-rpm-hrmib.patch b/net-snmp-use-rpm-hrmib.patch
index 6cd5ffe024a0ac11bcc7206a53983602ed7528bb..d7cc4381200ad3616650c40a31afdf3e1c8c6f06 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 @@
@@ -102,14 +102,25 @@
  #elif defined(hpux9)
      snprintf( pkg_directory, SNMP_MAXPATH, "/system" );
  #elif defined(hpux10) ||  defined(hpux11) 
---- net-snmp-5.6/agent/mibgroup/host/data_access/swinst.h~     2010-04-07 03:38:13.000000000 +0300
-+++ net-snmp-5.6/agent/mibgroup/host/data_access/swinst.h      2010-12-16 00:14:13.634392176 +0200
-@@ -24,7 +24,7 @@
-     config_require(host/data_access/swinst_darwin)
+--- net-snmp-5.6/agent/mibgroup/host/data_access/swinst.h      2010-12-16 00:14:13.634392176 +0200
++++ net-snmp-5.6/agent/mibgroup/host/data_access/swinst.h      2010-12-16 01:27:48.195543278 +0200
+@@ -11,6 +11,10 @@
+ #ifndef NETSNMP_ACCESS_SWINST_CONFIG_H
+ #define NETSNMP_ACCESS_SWINST_CONFIG_H
+ 
++// quick fix: this file is consulted before RPM_HRMIB_PATH check is made in configure, hardcode a define for now
++#define RPM_HRMIB_PATH "/var/cache/hrmib"
++
++
+ /*
+  * all platforms use this generic code
+  */
+@@ -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 ) || defined( openbsd )
++#elif defined( HAVE_PKGLOCS_H ) || defined( RPM_HRMIB_PATH ) || defined( hpux9 ) || defined( hpux10 ) || defined( hpux11 ) || defined( freebsd2 ) || defined( linux ) || defined( openbsd )
      config_require(host/data_access/swinst_pkginfo)
  #else
      config_warning(This platform does not yet support hrSWInstalledTable rewrites)