packages: net-snmp/net-snmp.spec, net-snmp/net-snmp-recognize-reiserfs.patc...

[zawadaa]

Author: zawadaa                      Date: Thu Oct  6 18:19:53 2011 GMT
Module: packages                      Tag: HEAD
---- Log message:
- patch: add ReiserFS to the list of recognized file systems
- https://sourceforge.net/tracker/?func=detail&aid=3402376&group_id=12694&atid=312694
- STBR

---- Files affected:
packages/net-snmp:
   net-snmp.spec (1.187 -> 1.188) , net-snmp-recognize-reiserfs.patch (NONE -> 1.1)  (NEW)

---- Diffs:

================================================================
Index: packages/net-snmp/net-snmp.spec
diff -u packages/net-snmp/net-snmp.spec:1.187 packages/net-snmp/net-snmp.spec:1.188
--- packages/net-snmp/net-snmp.spec:1.187	Wed Sep 28 18:08:29 2011
+++ packages/net-snmp/net-snmp.spec	Thu Oct  6 20:19:48 2011
@@ -27,7 +27,7 @@
 Summary(uk.UTF-8):	Набір утиліт для протоколу SNMP від UC-Davis
 Name:		net-snmp
 Version:	5.7.1
-Release:	1
+Release:	2
 License:	BSD-like
 Group:		Networking/Daemons
 Source0:	http://downloads.sourceforge.net/net-snmp/%{name}-%{version}.tar.gz
@@ -57,6 +57,7 @@
 Patch13:	%{name}-TCP_STATS_CACHE_TIMEOUT.patch
 Patch14:	%{name}-libnl.patch
 Patch15:	%{name}-libpci-init.patch
+Patch16:	%{name}-recognize-reiserfs.patch
 URL:		http://www.net-snmp.org/
 BuildRequires:	autoconf >= 2.63
 BuildRequires:	automake
@@ -436,6 +437,7 @@
 %patch13 -p1
 %patch14 -p1
 %patch15 -p1
+%patch16 -p1
 
 %build
 %{__libtoolize}
@@ -816,6 +818,11 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.188  2011/10/06 18:19:48  zawadaa
+- patch: add ReiserFS to the list of recognized file systems
+- https://sourceforge.net/tracker/?func=detail&aid=3402376&group_id=12694&atid=312694
+- STBR
+
 Revision 1.187  2011/09/28 16:08:29  glen
 - up to 5.7.1 Pre-release
 

================================================================
Index: packages/net-snmp/net-snmp-recognize-reiserfs.patch
diff -u /dev/null packages/net-snmp/net-snmp-recognize-reiserfs.patch:1.1
--- /dev/null	Thu Oct  6 20:19:53 2011
+++ packages/net-snmp/net-snmp-recognize-reiserfs.patch	Thu Oct  6 20:19:48 2011
@@ -0,0 +1,52 @@
+From: Mendel Mobach <mendel at 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 */
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/net-snmp/net-snmp.spec?r1=1.187&r2=1.188&f=u