From 59f2cc91c9af1c42f432817877478f82215bc0da Mon Sep 17 00:00:00 2001 From: Andrzej Zawadzki Date: Thu, 6 Oct 2011 18:19:48 +0000 Subject: [PATCH] - patch: add ReiserFS to the list of recognized file systems - https://sourceforge.net/tracker/?func=detail&aid=3402376&group_id=12694&atid=312694 - STBR Changed files: net-snmp-recognize-reiserfs.patch -> 1.1 net-snmp.spec -> 1.188 --- net-snmp-recognize-reiserfs.patch | 52 +++++++++++++++++++++++++++++++ net-snmp.spec | 4 ++- 2 files changed, 55 insertions(+), 1 deletion(-) create mode 100644 net-snmp-recognize-reiserfs.patch diff --git a/net-snmp-recognize-reiserfs.patch b/net-snmp-recognize-reiserfs.patch new file mode 100644 index 0000000..ed995ca --- /dev/null +++ b/net-snmp-recognize-reiserfs.patch @@ -0,0 +1,52 @@ +From: Mendel Mobach + +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.spec b/net-snmp.spec index 7737181..66d43fe 100644 --- a/net-snmp.spec +++ b/net-snmp.spec @@ -26,7 +26,7 @@ Summary(ru.UTF-8): Набор утилит для протокола SNMP от U 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 @@ -56,6 +56,7 @@ 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 URL: http://www.net-snmp.org/ BuildRequires: autoconf >= 2.63 BuildRequires: automake @@ -435,6 +436,7 @@ SNMP dla trzech wersji tego protokołu (SNMPv3, SNMPv2c, SNMPv1). %patch13 -p1 %patch14 -p1 %patch15 -p1 +%patch16 -p1 %build %{__libtoolize} -- 2.44.0