Author: glen Date: Wed Dec 15 23:12:03 2010 GMT Module: packages Tag: HEAD ---- Log message: - seems the hrSWInstalledTable code is now in more generic host/data_access package too (weirdly duplicated agents is net-snmp)
---- Files affected: packages/net-snmp: net-snmp-use-rpm-hrmib.patch (1.4 -> 1.5) ---- Diffs: ================================================================ Index: packages/net-snmp/net-snmp-use-rpm-hrmib.patch diff -u packages/net-snmp/net-snmp-use-rpm-hrmib.patch:1.4 packages/net-snmp/net-snmp-use-rpm-hrmib.patch:1.5 --- packages/net-snmp/net-snmp-use-rpm-hrmib.patch:1.4 Sun Oct 24 22:33:01 2010 +++ packages/net-snmp/net-snmp-use-rpm-hrmib.patch Thu Dec 16 00:11:58 2010 @@ -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) ================================================================ ---- CVS-web: http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/net-snmp/net-snmp-use-rpm-hrmib.patch?r1=1.4&r2=1.5&f=u _______________________________________________ pld-cvs-commit mailing list pld-cvs-commit@lists.pld-linux.org http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit