From 349110c7f024c5ccfbf9298222b01762d098e0b5 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Elan=20Ruusam=C3=A4e?= Date: Wed, 15 Dec 2010 23:11:58 +0000 Subject: [PATCH 1/1] - seems the hrSWInstalledTable code is now in more generic host/data_access package too (weirdly duplicated agents is net-snmp) Changed files: net-snmp-use-rpm-hrmib.patch -> 1.5 --- net-snmp-use-rpm-hrmib.patch | 23 ++++++++++++++++++++++- 1 file changed, 22 insertions(+), 1 deletion(-) diff --git a/net-snmp-use-rpm-hrmib.patch b/net-snmp-use-rpm-hrmib.patch index fa85110..6cd5ffe 100644 --- a/net-snmp-use-rpm-hrmib.patch +++ b/net-snmp-use-rpm-hrmib.patch @@ -91,4 +91,25 @@ # statfs( char *, 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 @@ + { + #if defined(PKGLOC) + snprintf( pkg_directory, SNMP_MAXPATH, "%s", PKGLOC ); ++#elif defined(RPM_HRMIB_PATH) ++ snprintf( pkg_directory, SNMP_MAXPATH, "%s", RPM_HRMIB_PATH); + #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) + #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 ) + config_require(host/data_access/swinst_pkginfo) + #else + config_warning(This platform does not yet support hrSWInstalledTable rewrites) -- 2.44.0