]> git.pld-linux.org Git - packages/net-snmp.git/commitdiff
projects / packages / net-snmp.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 0044377)
- up to 5.7.2 auto/th/net-snmp-5.7.2-1 auto/ti/net-snmp-5.7.2-1
authorArkadiusz Miśkiewicz <arekm@maven.pl>
Fri, 7 Dec 2012 13:36:48 +0000 (14:36 +0100)
committerArkadiusz Miśkiewicz <arekm@maven.pl>
Fri, 7 Dec 2012 13:36:48 +0000 (14:36 +0100)
bug-3460364.patch [deleted file] patch | blob | blame | history
net-snmp-link.patch patch | blob | blame | history
net-snmp-logging.patch patch | blob | blame | history
net-snmp-recognize-reiserfs.patch [deleted file] patch | blob | blame | history
net-snmp-use-rpm-hrmib.patch patch | blob | blame | history
net-snmp.spec patch | blob | blame | history

diff --git a/bug-3460364.patch b/bug-3460364.patch
deleted file mode 100644 (file)
index 6b42d09..0000000
--- a/bug-3460364.patch
+++ /dev/null
@@ -1,40 +0,0 @@
-From: Dave Shield <D.T.Shield@liverpool.ac.uk>
-Date: Tue, 28 Feb 2012 10:44:41 +0000 (+0000)
-Subject: CHANGES: snmpd: BUGS: 3460364: Fix use of block factor when detecting error conditions
-X-Git-Tag: v5.6.2.pre1~18
-X-Git-Url: http://net-snmp.git.sourceforge.net/git/gitweb.cgi?p=net-snmp%2Fnet-snmp;a=commitdiff_plain;h=879bf7079d34fa46f6fcf54a01c8500beaece59a
-
-CHANGES: snmpd: BUGS: 3460364: Fix use of block factor when detecting error conditions
----
-
-diff --git a/agent/mibgroup/ucd-snmp/disk_hw.c b/agent/mibgroup/ucd-snmp/disk_hw.c
-index ba26479..2b80476 100644
---- a/agent/mibgroup/ucd-snmp/disk_hw.c
-+++ b/agent/mibgroup/ucd-snmp/disk_hw.c
-@@ -389,8 +389,9 @@ tryAgain:
- 
-     case ERRORFLAG:
-         long_ret = 0;
-+        val = netsnmp_fsys_avail_ull(entry);
-         if (( entry->minspace >= 0 ) &&
--            ( entry->avail < entry->minspace ))
-+            ( val < entry->minspace ))
-             long_ret = 1;
-         else if (( entry->minpercent >= 0 ) &&
-                  (_percent( entry->avail, entry->size ) < entry->minpercent ))
-@@ -399,12 +400,13 @@ tryAgain:
- 
-     case ERRORMSG:
-         errmsg[0] = 0;
-+        val = netsnmp_fsys_avail_ull(entry);
-         if (( entry->minspace >= 0 ) &&
--            ( entry->avail < entry->minspace ))
-+            ( val < entry->minspace ))
-                 snprintf(errmsg, sizeof(errmsg),
-                         "%s: less than %d free (= %d)",
-                         entry->path, entry->minspace,
--                        (int) entry->avail);
-+                        (int) val);
-         else if (( entry->minpercent >= 0 ) &&
-                  (_percent( entry->avail, entry->size ) < entry->minpercent ))
-                 snprintf(errmsg, sizeof(errmsg),
diff --git a/net-snmp-link.patch b/net-snmp-link.patch
index ef64864278c82cae2ab7c98a1d4fcf07b4a4c8cc..dd01ae3a93309e0bcce5d51968073df12f8c1f05 100644 (file)
--- a/net-snmp-link.patch
+++ b/net-snmp-link.patch
@@ -18,8 +18,8 @@
        $(RANLIB) $(AGENTLIB)
  
  libnetsnmpmibs.$(LIB_EXTENSION)$(LIB_VERSION): ${LMIBOBJS} $(AGENTLIB) $(USELIBS)
--      $(LIB_LD_CMD) $(MIBLIB) ${LMIBOBJS} $(AGENTLIB) $(USELIBS) @LD_NO_UNDEFINED@ $(LDFLAGS) ${LMIBLIBS} $(LIB_LD_LIBS) @AGENTLIBS@
-+      $(LIB_LD_CMD) $(MIBLIB) ${LMIBOBJS} $(LDFLAGS) $(AGENTLIB) $(USELIBS) @LD_NO_UNDEFINED@ ${LMIBLIBS} $(LIB_LD_LIBS) @AGENTLIBS@
+-      $(LIB_LD_CMD) $(MIBLIB) ${LMIBOBJS} $(AGENTLIB) $(USELIBS) @LD_NO_UNDEFINED@ $(LDFLAGS) ${LMIBLIBS} $(PERLLDOPTS_FOR_LIBS) $(LIB_LD_LIBS) @AGENTLIBS@
++      $(LIB_LD_CMD) $(MIBLIB) ${LMIBOBJS} $(LDFLAGS) $(AGENTLIB) $(USELIBS) @LD_NO_UNDEFINED@ ${LMIBLIBS} $(PERLLDOPTS_FOR_LIBS) $(LIB_LD_LIBS) @AGENTLIBS@
        $(RANLIB) $(MIBLIB)
  
  agentlib: $(AGENTLIB)
diff --git a/net-snmp-logging.patch b/net-snmp-logging.patch
index d8ee8a37db59bec205b8d25ef4ebbdfa94c2af07..26337b08d557effb66ebf313ea705db632e50346 100644 (file)
--- a/net-snmp-logging.patch
+++ b/net-snmp-logging.patch
@@ -43,16 +43,6 @@ diff -r -u net-snmp-5.4.1~dfsg/agent/mibgroup/ucd-snmp/vmstat_linux.c net-snmp-5
            *swpin = *swpout = 0;
        }
      }
---- net-snmp-5.7.1/./agent/mibgroup/hardware/cpu/cpu_linux.c~  2011-12-27 15:05:21.000000000 +0200
-+++ net-snmp-5.7.1/./agent/mibgroup/hardware/cpu/cpu_linux.c   2011-12-27 15:06:39.795180506 +0200
-@@ -320,5 +320,7 @@
-       if (first)
-           snmp_log(LOG_ERR, "No ctxt line in %s\n", STAT_FILE);
-     }
-+
-+      first = 0;
- }
- 
 --- net-snmp-5.7.1/./agent/mibgroup/ucd-snmp/diskio.c~ 2011-09-28 07:53:47.000000000 +0300
 +++ net-snmp-5.7.1/./agent/mibgroup/ucd-snmp/diskio.c  2011-12-27 16:33:10.128099629 +0200
 @@ -979,7 +979,8 @@
diff --git a/net-snmp-recognize-reiserfs.patch b/net-snmp-recognize-reiserfs.patch
deleted file mode 100644 (file)
index ed995ca..0000000
--- a/net-snmp-recognize-reiserfs.patch
+++ /dev/null
@@ -1,52 +0,0 @@
-From: Mendel Mobach <mendel@mobach.nl>
-
-Add ReiserFS to the list of recognized file systems and move
-JFS and XFS defines below the right comment.
-
----
- agent/mibgroup/hardware/fsys/fsys_mntent.c |    1 +
- agent/mibgroup/hardware/fsys/mnttypes.h    |   13 ++++++-------
- 2 files changed, 7 insertions(+), 7 deletions(-)
-
-Index: net-snmp/agent/mibgroup/hardware/fsys/fsys_mntent.c
-===================================================================
---- net-snmp.orig/agent/mibgroup/hardware/fsys/fsys_mntent.c
-+++ net-snmp/agent/mibgroup/hardware/fsys/fsys_mntent.c
-@@ -135,6 +135,7 @@ _fsys_type( char *typename )
-               !strcmp(typename, MNTTYPE_GFS2) ||
-               !strcmp(typename, MNTTYPE_XFS) ||
-               !strcmp(typename, MNTTYPE_JFS) ||
-+              !strcmp(typename, MNTTYPE_REISERFS) ||
-               !strcmp(typename, MNTTYPE_LOFS))
-        return NETSNMP_FS_TYPE_OTHER;
- 
-Index: net-snmp/agent/mibgroup/hardware/fsys/mnttypes.h
-===================================================================
---- net-snmp.orig/agent/mibgroup/hardware/fsys/mnttypes.h
-+++ net-snmp/agent/mibgroup/hardware/fsys/mnttypes.h
-@@ -114,6 +114,12 @@
- #ifndef MNTTYPE_GFS2
- #define MNTTYPE_GFS2     "gfs2"
- #endif
-+#ifndef MNTTYPE_XFS
-+#define MNTTYPE_XFS      "xfs"
-+#endif
-+#ifndef MNTTYPE_JFS
-+#define MNTTYPE_JFS      "jfs"
-+#endif
- 
- /*
-  *  File systems to monitor, but not covered by HR-TYPES enumerations
-@@ -156,12 +162,5 @@
- #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 */
diff --git a/net-snmp-use-rpm-hrmib.patch b/net-snmp-use-rpm-hrmib.patch
index 4d4364176620f90f5d9ed482e61ac3cbe7327ba2..d7cc4381200ad3616650c40a31afdf3e1c8c6f06 100644 (file)
--- a/net-snmp-use-rpm-hrmib.patch
+++ b/net-snmp-use-rpm-hrmib.patch
@@ -119,8 +119,8 @@
      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 ) || defined( linux )
-+#elif defined( HAVE_PKGLOCS_H ) || defined( RPM_HRMIB_PATH ) || defined( hpux9 ) || defined( hpux10 ) || defined( hpux11 ) || defined( freebsd2 ) || defined( linux )
+-#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)
diff --git a/net-snmp.spec b/net-snmp.spec
index 4e94ee8eb02e4073dcf509de4686bcc985908e87..39132cd2fb21c5a365cc5ed3ca55a07b9dc31f7b 100644 (file)
--- a/net-snmp.spec
+++ b/net-snmp.spec
@@ -25,12 +25,12 @@ Summary(pt_BR.UTF-8):       Agente SNMP da UCD
 Summary(ru.UTF-8):     Набор утилит для протокола SNMP от UC-Davis
 Summary(uk.UTF-8):     Набір утиліт для протоколу SNMP від UC-Davis
 Name:          net-snmp
-Version:       5.7.1
-Release:       7
+Version:       5.7.2
+Release:       1
 License:       BSD-like
 Group:         Networking/Daemons
 Source0:       http://downloads.sourceforge.net/net-snmp/%{name}-%{version}.tar.gz
-# Source0-md5: c95d08fd5d93df0c11a2e1bdf0e01e0b
+# Source0-md5: 5bddd02e2f82b62daa79f82717737a14
 Source1:       %{name}d.init
 Source2:       %{name}d.conf
 Source3:       %{name}d.sysconfig
@@ -56,9 +56,8 @@ Patch12:      %{name}-use-rpm-hrmib.patch
 Patch13:       %{name}-TCP_STATS_CACHE_TIMEOUT.patch
 Patch14:       %{name}-libnl.patch
 Patch15:       %{name}-libpci-init.patch
-Patch16:       %{name}-recognize-reiserfs.patch
+
 Patch17:       %{name}-logging.patch
-Patch18:       bug-3460364.patch
 URL:           http://www.net-snmp.org/
 BuildRequires: autoconf >= 2.63
 BuildRequires: automake
@@ -438,9 +437,8 @@ SNMP dla trzech wersji tego protokołu (SNMPv3, SNMPv2c, SNMPv1).
 %patch13 -p1
 %patch14 -p1
 %patch15 -p1
-%patch16 -p1
+
 %patch17 -p1
-%patch18 -p1
 
 %build
 %{__libtoolize}
A collection of SNMP protocol tools
This page took 0.118935 seconds and 4 git commands to generate.