diff --git a/net-snmp-5.6.0-enable-hrh-filesys.patch b/net-snmp-5.6.0-enable-hrh-filesys.patch deleted file mode 100644 index d3264e1..0000000 --- a/net-snmp-5.6.0-enable-hrh-filesys.patch +++ /dev/null @@ -1,37 +0,0 @@ -Index: net-snmp-5.6/agent/mibgroup/host.h -=================================================================== ---- net-snmp-5.6.orig/agent/mibgroup/host.h -+++ net-snmp-5.6/agent/mibgroup/host.h -@@ -22,8 +22,8 @@ - config_require(host/hr_disk) - config_require(host/hr_partition) - -- config_version_require((host/hr_storage, 5.7, host/hrh_storage)) -- config_version_require((host/hr_filesys, 5.7, host/hrh_filesys)) -+ config_require(host/hrh_storage) -+ config_require(host/hrh_filesys) - - config_version_require((host/hr_swinst, 5.6, host/hrSWInstalledTable)) - config_version_require((host/hr_swrun, 5.6, host/hrSWRunTable)) -Index: net-snmp-5.6/agent/mibgroup/velocity.h -=================================================================== ---- net-snmp-5.6.orig/agent/mibgroup/velocity.h -+++ net-snmp-5.6/agent/mibgroup/velocity.h -@@ -5,7 +5,7 @@ - - config_require(host/hr_system) - config_require(velocity/velocity_system) -- config_require(host/hr_storage) -+ config_require(host/hrh_storage) - config_require(host/hr_device) - config_require(host/hr_other) - config_require(host/hr_proc) -@@ -13,7 +13,7 @@ - config_require(host/hr_print) - config_require(host/hr_disk) - config_require(host/hr_partition) -- config_require(host/hr_filesys) -+ config_require(host/hrh_filesys) - config_require(velocity/velocity_swrun) - config_require(host/hr_swrun) - config_require(host/hr_swinst) diff --git a/net-snmp-5.6.1-recognize-jfs-and-xfs.patch b/net-snmp-5.6.1-recognize-jfs-and-xfs.patch deleted file mode 100644 index 948d909..0000000 --- a/net-snmp-5.6.1-recognize-jfs-and-xfs.patch +++ /dev/null @@ -1,30 +0,0 @@ -Index: net-snmp-5.6.1/agent/mibgroup/hardware/fsys/mnttypes.h -=================================================================== ---- net-snmp-5.6.1.orig/agent/mibgroup/hardware/fsys/mnttypes.h -+++ net-snmp-5.6.1/agent/mibgroup/hardware/fsys/mnttypes.h -@@ -156,5 +156,12 @@ - #ifndef MNTTYPE_RPCPIPE - #define MNTTYPE_RPCPIPE "rpc_pipefs" - #endif -+#ifndef MNTTYPE_XFS -+#define MNTTYPE_XFS "xfs" -+#endif -+#ifndef MNTTYPE_JFS -+#define MNTTYPE_JFS "jfs" -+#endif -+ - - #endif /* _NETSNMP_FSYS_MNTTYPES_H */ -Index: net-snmp-5.6.1/agent/mibgroup/hardware/fsys/fsys_mntent.c -=================================================================== ---- net-snmp-5.6.1.orig/agent/mibgroup/hardware/fsys/fsys_mntent.c -+++ net-snmp-5.6.1/agent/mibgroup/hardware/fsys/fsys_mntent.c -@@ -133,6 +133,8 @@ _fsys_type( char *typename ) - !strcmp(typename, MNTTYPE_TMPFS) || - !strcmp(typename, MNTTYPE_GFS) || - !strcmp(typename, MNTTYPE_GFS2) || -+ !strcmp(typename, MNTTYPE_XFS) || -+ !strcmp(typename, MNTTYPE_JFS) || - !strcmp(typename, MNTTYPE_LOFS)) - return NETSNMP_FS_TYPE_OTHER; - diff --git a/net-snmp-5.6.1-rpm490.patch b/net-snmp-5.6.1-rpm490.patch deleted file mode 100644 index 462fd74..0000000 --- a/net-snmp-5.6.1-rpm490.patch +++ /dev/null @@ -1,145 +0,0 @@ ---- net-snmp-5.6.1/agent/mibgroup/host/data_access/swinst_rpm.c.orig 2011-05-19 13:09:07.000000000 +0000 -+++ net-snmp-5.6.1/agent/mibgroup/host/data_access/swinst_rpm.c 2011-05-19 13:13:43.000000000 +0000 -@@ -34,6 +34,7 @@ - #endif - #ifdef HAVE_RPM_RPMDB_H - #include -+#include - #endif - - #include -@@ -96,9 +97,9 @@ netsnmp_swinst_arch_shutdown(void) - int - netsnmp_swinst_arch_load( netsnmp_container *container, u_int flags) - { -- rpmdb db; -+ rpmts ts; - --#if defined(RPMDBI_PACKAGES) -+#if 1 /* defined(RPMDBI_PACKAGES) */ - rpmdbMatchIterator mi; - #else - int offset; -@@ -111,11 +112,12 @@ netsnmp_swinst_arch_load( netsnmp_contai - int rc, i = 1; - netsnmp_swinst_entry *entry; - -- if (rpmdbOpen("", &db, O_RDONLY, 0644)) -- NETSNMP_LOGONCE((LOG_ERR, "rpmdbOpen() failed\n")); -+ ts = rpmtsCreate(); -+ if (rpmtsOpenDB(ts, O_RDONLY)) -+ NETSNMP_LOGONCE((LOG_ERR, "rpmtsOpenDB() failed\n")); - --#if defined(RPMDBI_PACKAGES) -- mi = rpmdbInitIterator( db, RPMDBI_PACKAGES, NULL, 0); -+#if 1 /* defined(RPMDBI_PACKAGES) */ -+ mi = rpmtsInitIterator( ts, RPMDBI_PACKAGES, NULL, 0); - while (NULL != (h = rpmdbNextIterator( mi ))) - #else - for (offset = rpmdbFirstRecNum( db ); -@@ -129,7 +131,7 @@ netsnmp_swinst_arch_load( netsnmp_contai - continue; /* error already logged by function */ - rc = CONTAINER_INSERT(container, entry); - --#if defined(RPMDBI_PACKAGES) -+#if 1 /* defined(RPMDBI_PACKAGES) */ - h = headerLink( h ); - #else - h = rpmdbGetRecord( db, offset ); -@@ -154,10 +156,11 @@ netsnmp_swinst_arch_load( netsnmp_contai - - headerFree( h ); - } --#if defined(RPMDBI_PACKAGES) -+#if 1 /* defined(RPMDBI_PACKAGES) */ - rpmdbFreeIterator( mi ); - #endif -- rpmdbClose( db ); -+ -+ rpmtsFree( ts ); - - DEBUGMSGTL(("swinst:load:arch", "loaded %d entries\n", - (int)CONTAINER_SIZE(container))); ---- net-snmp-5.6.1/agent/mibgroup/host/hr_swinst.c.orig 2011-05-19 12:33:25.000000000 +0000 -+++ net-snmp-5.6.1/agent/mibgroup/host/hr_swinst.c 2011-05-19 13:01:12.000000000 +0000 -@@ -43,6 +43,7 @@ - #ifdef HAVE_LIBRPM - #include - #include -+#include - #include - - #ifdef HAVE_RPM_RPMFILEUTIL_H -@@ -113,7 +114,7 @@ typedef struct { - int swi_maxrec; /* no. of allocations */ - int swi_nrec; /* no. of valid offsets */ - int *swi_recs; /* db record offsets */ -- rpmdb swi_rpmdb; -+ rpmts swi_rpmts; - Header swi_h; - int swi_prevx; - #else -@@ -567,10 +568,11 @@ Check_HRSW_cache(void *xxx) - int ix = 0; - int offset; - --#if defined(RPMDBI_PACKAGES) -+ -+#if 1 /* defined(RPMDBI_PACKAGES) */ - rpmdbMatchIterator mi = NULL; - Header h; -- mi = rpmdbInitIterator(swi->swi_rpmdb, RPMDBI_PACKAGES, NULL, 0); -+ mi = rpmtsInitIterator(swi->swi_rpmts, RPMDBI_PACKAGES, NULL, 0); - while ((h = rpmdbNextIterator(mi)) != NULL) { - offset = rpmdbGetIteratorOffset(mi); - #else -@@ -588,7 +590,7 @@ Check_HRSW_cache(void *xxx) - } - swi->swi_recs[ix++] = offset; - --#if !defined(RPMDBI_PACKAGES) -+#if 0 /* !defined(RPMDBI_PACKAGES) */ - } - #else - } -@@ -607,10 +609,14 @@ Init_HR_SWInst(void) - swi->swi_index = 0; - - #ifdef HAVE_LIBRPM -- if (swi->swi_rpmdb != NULL) -+ if (swi->swi_rpmts != NULL) - return; -- if (rpmdbOpen("", &swi->swi_rpmdb, O_RDONLY, 0644) != 0) -+ swi->swi_rpmts = rpmtsCreate(); -+ if (rpmtsOpenDB(swi->swi_rpmts, O_RDONLY)) { -+ rpmtsFree(swi->swi_rpmts); -+ swi->swi_rpmts = 0; - swi->swi_index = -1; -+ } - Check_HRSW_cache(swi); - #else - if (swi->swi_directory != NULL) { -@@ -673,10 +679,10 @@ Save_HR_SW_info(int ix) - - offset = swi->swi_recs[ix - 1]; - --#if defined(RPMDBI_PACKAGES) -+#if 1 /* defined(RPMDBI_PACKAGES) */ - { - rpmdbMatchIterator mi; -- mi = rpmdbInitIterator(swi->swi_rpmdb, RPMDBI_PACKAGES, -+ mi = rpmtsInitIterator(swi->swi_rpmts, RPMDBI_PACKAGES, - &offset, sizeof(offset)); - if ((h = rpmdbNextIterator(mi)) != NULL) - h = headerLink(h); -@@ -737,8 +743,8 @@ End_HR_SWInst(void) - SWI_t *swi = &_myswi; /* XXX static for now */ - - #ifdef HAVE_LIBRPM -- rpmdbClose(swi->swi_rpmdb); /* or only on finishing ? */ -- swi->swi_rpmdb = NULL; -+ rpmtsFree(swi->swi_rpmts); /* or only on finishing ? */ -+ swi->swi_rpmts = NULL; - #else - if (swi->swi_dp != NULL) - closedir(swi->swi_dp); diff --git a/net-snmp-5.6.1-upstream-20110512.patch.bz2 b/net-snmp-5.6.1-upstream-20110512.patch.bz2 deleted file mode 100644 index 33f1b50..0000000 --- a/net-snmp-5.6.1-upstream-20110512.patch.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:335d7a15af10ce8d81b42a49eec3a307743b226a413296441a5fd5b4f5f893d6 -size 197979 diff --git a/net-snmp-5.6.1.tar.bz2 b/net-snmp-5.6.1.tar.bz2 deleted file mode 100644 index 280b3d2..0000000 --- a/net-snmp-5.6.1.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:f362bdad5e58f7868dc241a7d6f3e8f054dfd5bbafbdcf7a1c2ea84e0a59a4c5 -size 4281087 diff --git a/net-snmp-5.7-upstream-20110714.patch.bz2 b/net-snmp-5.7-upstream-20110714.patch.bz2 new file mode 100644 index 0000000..ce87507 --- /dev/null +++ b/net-snmp-5.7-upstream-20110714.patch.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:81982968d858af60f94864694fec752e2cc4d0d2f17fa62f22998429a50dc7f3 +size 761 diff --git a/net-snmp-5.6.0-pie.patch b/net-snmp-5.7.0-pie.patch similarity index 74% rename from net-snmp-5.6.0-pie.patch rename to net-snmp-5.7.0-pie.patch index 111e29d..22f8856 100644 --- a/net-snmp-5.6.0-pie.patch +++ b/net-snmp-5.7.0-pie.patch @@ -1,8 +1,8 @@ -Index: net-snmp-5.6/agent/Makefile.in +Index: net-snmp-5.7/agent/Makefile.in =================================================================== ---- net-snmp-5.6.orig/agent/Makefile.in -+++ net-snmp-5.6/agent/Makefile.in -@@ -245,7 +245,7 @@ getmibstat.o: mibgroup/kernel_sunos5.c +--- net-snmp-5.7.orig/agent/Makefile.in ++++ net-snmp-5.7/agent/Makefile.in +@@ -294,7 +294,7 @@ getmibstat.o: mibgroup/kernel_sunos5.c $(CC) $(CFLAGS) -o $@ -D_GETMIBSTAT_TEST -DDODEBUG -c $? snmpd$(EXEEXT): ${LAGENTOBJS} $(USELIBS) $(AGENTLIB) $(MIBLIB) $(LIBTARG) @@ -11,11 +11,11 @@ Index: net-snmp-5.6/agent/Makefile.in libnetsnmpagent.$(LIB_EXTENSION)$(LIB_VERSION): ${LLIBAGENTOBJS} $(USELIBS) -Index: net-snmp-5.6/apps/Makefile.in +Index: net-snmp-5.7/apps/Makefile.in =================================================================== ---- net-snmp-5.6.orig/apps/Makefile.in -+++ net-snmp-5.6/apps/Makefile.in -@@ -127,7 +127,7 @@ snmptest$(EXEEXT): snmptest.$(OSUFFIX +--- net-snmp-5.7.orig/apps/Makefile.in ++++ net-snmp-5.7/apps/Makefile.in +@@ -173,7 +173,7 @@ snmptest$(EXEEXT): snmptest.$(OSUFFIX $(LINK) ${CFLAGS} -o $@ snmptest.$(OSUFFIX) $(LOCAL_LIBS) ${LDFLAGS} ${LIBS} snmptrapd$(EXEEXT): $(TRAPD_OBJECTS) $(USETRAPLIBS) $(INSTALLLIBS) diff --git a/net-snmp-5.5.0-velocity-mib.patch b/net-snmp-5.7.0-velocity-mib.patch similarity index 99% rename from net-snmp-5.5.0-velocity-mib.patch rename to net-snmp-5.7.0-velocity-mib.patch index 23a6d77..9a9ab11 100644 --- a/net-snmp-5.5.0-velocity-mib.patch +++ b/net-snmp-5.7.0-velocity-mib.patch @@ -56,7 +56,7 @@ Index: net-snmp-5.5/agent/mibgroup/velocity.h + + config_require(host/hr_system) + config_require(velocity/velocity_system) -+ config_require(host/hr_storage) ++ config_require(host/hrh_storage) + config_require(host/hr_device) + config_require(host/hr_other) + config_require(host/hr_proc) @@ -64,7 +64,7 @@ Index: net-snmp-5.5/agent/mibgroup/velocity.h + config_require(host/hr_print) + config_require(host/hr_disk) + config_require(host/hr_partition) -+ config_require(host/hr_filesys) ++ config_require(host/hrh_filesys) + config_require(velocity/velocity_swrun) + config_require(host/hr_swrun) + config_require(host/hr_swinst) diff --git a/net-snmp-5.7.tar.bz2 b/net-snmp-5.7.tar.bz2 new file mode 100644 index 0000000..8b056df --- /dev/null +++ b/net-snmp-5.7.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:3f3a1672f532669bf2e0e9e5b0b2f31b5d46cd7798333edd1554ba5a0054b748 +size 4362642 diff --git a/net-snmp.changes b/net-snmp.changes index 4260f74..0144685 100644 --- a/net-snmp.changes +++ b/net-snmp.changes @@ -1,3 +1,21 @@ +------------------------------------------------------------------- +Thu Jul 14 17:46:57 UTC 2011 - lchiquitto@novell.com + +- update upstream patches from branch V5-7-patches to 20110714 + +------------------------------------------------------------------- +Tue Jul 5 12:28:00 UTC 2011 - lchiquitto@novell.com + +- update to version 5.7: + new features and lots of bug fixes +- remove patches that are no longer needed: + net-snmp-5.6.0-enable-hrh-filesys.patch + net-snmp-5.6.1-recognize-jfs-and-xfs.patch + net-snmp-5.6.1-rpm490.patch +- refresh and rename patches to apply cleanly after update: + net-snmp-5.7.0-pie.patch + net-snmp-5.7.0-velocity-mib.patch + ------------------------------------------------------------------- Thu May 19 14:43:13 CEST 2011 - mls@suse.de diff --git a/net-snmp.spec b/net-snmp.spec index 7b4a23a..54b6d72 100644 --- a/net-snmp.spec +++ b/net-snmp.spec @@ -27,7 +27,7 @@ %define netsnmp_agentx_socket_dir_rfc /var/agentx Name: net-snmp -Version: 5.6.1 +Version: 5.7 Release: 10 License: BSD3c(or similar) ; MIT License (or similar) Group: Productivity/Networking/Other @@ -55,17 +55,15 @@ Source6: test_installed Source7: net-snmp.sysconfig Source8: net-snmp-rpmlintrc Source9: baselibs.conf -Patch0: net-snmp-5.6.1-upstream-20110512.patch.bz2 +%define patchdate 20110714 +Patch0: net-snmp-%{version}-upstream-%{patchdate}.patch.bz2 # unused patch atm Patch1: net-snmp-5.5.0-socket-path.patch Patch2: net-snmp-5.5.0-testing-empty-arptable.patch -Patch3: net-snmp-5.6.0-pie.patch +Patch3: net-snmp-5.7.0-pie.patch Patch5: net-snmp-5.6.1-net-snmp-config-headercheck.patch Patch6: net-snmp-5.5.0-perl-tk-warning.patch -Patch7: net-snmp-5.5.0-velocity-mib.patch -Patch9: net-snmp-5.6.0-enable-hrh-filesys.patch -Patch10: net-snmp-5.6.1-recognize-jfs-and-xfs.patch -Patch11: net-snmp-5.6.1-rpm490.patch +Patch7: net-snmp-5.7.0-velocity-mib.patch # Summary: SNMP Daemon @@ -90,9 +88,9 @@ Authors: -------- Wes Hardaker -%define library_name libsnmp25 +%define library_name libsnmp30 -%package -n libsnmp25 +%package -n libsnmp30 License: BSD3c(or similar) ; MIT License (or similar) Group: Productivity/Networking/Other Requires: snmp-mibs = %{version} @@ -100,7 +98,7 @@ Requires: perl-base = %{perl_version} # Summary: Shared Libraries from net-snmp -%description -n libsnmp25 +%description -n libsnmp30 Net-SNMP is a suite of applications used to implement SNMP v1, SNMP v2c and SNMP v3 using both IPv4 and IPv6. The suite includes: @@ -207,9 +205,6 @@ Authors: %patch5 -p1 %patch6 -p1 %patch7 -p1 -%patch9 -p1 -%patch10 -p1 -%patch11 -p1 %build MIBS="misc/ipfwacc ucd-snmp/diskio etherlike-mib rmon-mib velocity smux \