From 4afbb4efcfd8697fc2be9d36dfe5cc622f722dca Mon Sep 17 00:00:00 2001 From: CentOS Sources Date: Mar 31 2020 09:34:18 +0000 Subject: import net-snmp-5.7.2-47.el7 --- diff --git a/SOURCES/net-snmp-5.7.2-CVE-2018-18066.patch b/SOURCES/net-snmp-5.7.2-CVE-2018-18066.patch new file mode 100644 index 0000000..ea9ae37 --- /dev/null +++ b/SOURCES/net-snmp-5.7.2-CVE-2018-18066.patch @@ -0,0 +1,21 @@ +diff -urNp o/agent/helpers/table.c n/agent/helpers/table.c +--- o/agent/helpers/table.c 2019-08-14 11:12:30.693772682 +0200 ++++ n/agent/helpers/table.c 2019-08-14 11:22:14.674403722 +0200 +@@ -406,6 +406,8 @@ table_helper_handler(netsnmp_mib_handler + if (reqinfo->mode == MODE_GET) + table_helper_cleanup(reqinfo, request, + SNMP_NOSUCHOBJECT); ++ else ++ request->processed = 1; /* skip if next handler called */ + continue; + } + +@@ -483,6 +485,8 @@ table_helper_handler(netsnmp_mib_handler + #endif /* NETSNMP_NO_WRITE_SUPPORT */ + table_helper_cleanup(reqinfo, request, + SNMP_NOSUCHOBJECT); ++ else ++ request->processed = 1; /* skip if next handler called */ + continue; + } + /* diff --git a/SOURCES/net-snmp-5.7.2-counter64.patch b/SOURCES/net-snmp-5.7.2-counter64.patch new file mode 100644 index 0000000..dd49098 --- /dev/null +++ b/SOURCES/net-snmp-5.7.2-counter64.patch @@ -0,0 +1,309 @@ +From 0dc151a72ce495d3d94704efba609505e465292b Mon Sep 17 00:00:00 2001 +From: Niels Baggesen +Date: Mon, 13 Jun 2016 16:50:08 +0200 +Subject: [PATCH] UCD-SNMP-MIB: Add 64-bit memory objects for large servers. + +--- + agent/mibgroup/ucd-snmp/memory.c | 100 ++++++++++++++++++++++++-- + agent/mibgroup/ucd-snmp/memory.h | 9 +++ + mibs/UCD-SNMP-MIB.txt | 116 ++++++++++++++++++++++++++++++- + 3 files changed, 220 insertions(+), 5 deletions(-) + +diff --git a/agent/mibgroup/ucd-snmp/memory.c b/agent/mibgroup/ucd-snmp/memory.c +index 742186f3a..a7f060a50 100644 +--- a/agent/mibgroup/ucd-snmp/memory.c ++++ b/agent/mibgroup/ucd-snmp/memory.c +@@ -26,7 +26,7 @@ init_memory(void) + netsnmp_create_handler_registration("memory", handle_memory, + memory_oid, OID_LENGTH(memory_oid), + HANDLER_CAN_RONLY), +- 1, 17); ++ 1, 26); + netsnmp_register_scalar( + netsnmp_create_handler_registration("memSwapError", handle_memory, + memSwapError_oid, OID_LENGTH(memSwapError_oid), +@@ -59,7 +59,9 @@ handle_memory(netsnmp_mib_handler *handler, + netsnmp_request_info *requests) + { + netsnmp_memory_info *mem_info; +- int val; ++ unsigned long val; ++ struct counter64 c64; ++ int type = ASN_INTEGER; + char buf[1024]; + + /* +@@ -184,6 +186,92 @@ handle_memory(netsnmp_mib_handler *handler, + val = (mem_info->size - mem_info->free); /* cached */ + val *= (mem_info->units/1024); + break; ++ case MEMORY_SWAP_TOTAL_X: ++ type = ASN_COUNTER64; ++ mem_info = netsnmp_memory_get_byIdx( NETSNMP_MEM_TYPE_SWAP, 0 ); ++ if (!mem_info) ++ goto NOSUCH; ++ val = mem_info->size; ++ val *= (mem_info->units/1024); ++ c64.low = val & 0xFFFFFFFF; ++ c64.high = val >>32; ++ break; ++ case MEMORY_SWAP_AVAIL_X: ++ type = ASN_COUNTER64; ++ mem_info = netsnmp_memory_get_byIdx( NETSNMP_MEM_TYPE_SWAP, 0 ); ++ if (!mem_info) ++ goto NOSUCH; ++ val = mem_info->free; ++ val *= (mem_info->units/1024); ++ c64.low = val & 0xFFFFFFFF; ++ c64.high = val >>32; ++ break; ++ case MEMORY_REAL_TOTAL_X: ++ type = ASN_COUNTER64; ++ mem_info = netsnmp_memory_get_byIdx( NETSNMP_MEM_TYPE_PHYSMEM, 0 ); ++ if (!mem_info) ++ goto NOSUCH; ++ val = mem_info->size; ++ val *= (mem_info->units/1024); ++ c64.low = val & 0xFFFFFFFF; ++ c64.high = val >>32; ++ break; ++ case MEMORY_REAL_AVAIL_X: ++ type = ASN_COUNTER64; ++ mem_info = netsnmp_memory_get_byIdx( NETSNMP_MEM_TYPE_PHYSMEM, 0 ); ++ if (!mem_info) ++ goto NOSUCH; ++ val = mem_info->free; ++ val *= (mem_info->units/1024); ++ c64.low = val & 0xFFFFFFFF; ++ c64.high = val >>32; ++ break; ++ case MEMORY_SWAP_MIN_X: ++ type = ASN_COUNTER64; ++ val = minimum_swap; ++ c64.low = val & 0xFFFFFFFF; ++ c64.high = val >>32; ++ break; ++ case MEMORY_FREE_X: ++ type = ASN_COUNTER64; ++ mem_info = netsnmp_memory_get_byIdx( NETSNMP_MEM_TYPE_VIRTMEM, 0 ); ++ if (!mem_info) ++ goto NOSUCH; ++ val = mem_info->free; ++ val *= (mem_info->units/1024); ++ c64.low = val & 0xFFFFFFFF; ++ c64.high = val >>32; ++ break; ++ case MEMORY_SHARED_X: ++ type = ASN_COUNTER64; ++ mem_info = netsnmp_memory_get_byIdx( NETSNMP_MEM_TYPE_SHARED, 0 ); ++ if (!mem_info) ++ goto NOSUCH; ++ val = mem_info->size; ++ val *= (mem_info->units/1024); ++ c64.low = val & 0xFFFFFFFF; ++ c64.high = val >>32; ++ break; ++ case MEMORY_BUFFER_X: ++ type = ASN_COUNTER64; ++ mem_info = netsnmp_memory_get_byIdx( NETSNMP_MEM_TYPE_MBUF, 0 ); ++ if (!mem_info) ++ goto NOSUCH; ++ val = mem_info->size - mem_info->free; ++ val *= (mem_info->units/1024); ++ c64.low = val & 0xFFFFFFFF; ++ c64.high = val >>32; ++ break; ++ case MEMORY_CACHED_X: ++ type = ASN_COUNTER64; ++ mem_info = netsnmp_memory_get_byIdx( NETSNMP_MEM_TYPE_CACHED, 0 ); ++ if (!mem_info) ++ goto NOSUCH; ++ val = mem_info->size - mem_info->free; ++ val *= (mem_info->units/1024); ++ c64.low = val & 0xFFFFFFFF; ++ c64.high = val >>32; ++ break; + case MEMORY_SWAP_ERROR: + mem_info = netsnmp_memory_get_byIdx( NETSNMP_MEM_TYPE_SWAP, 0 ); + if (!mem_info) +@@ -213,8 +301,12 @@ handle_memory(netsnmp_mib_handler *handler, + * All non-integer objects (and errors) have already been + * processed. So return the integer value. + */ +- snmp_set_var_typed_value(requests->requestvb, ASN_INTEGER, +- (u_char *)&val, sizeof(val)); ++ if (type == ASN_INTEGER) ++ snmp_set_var_typed_value(requests->requestvb, ASN_INTEGER, ++ (u_char *)&val, sizeof(val)); ++ else ++ snmp_set_var_typed_value(requests->requestvb, ASN_COUNTER64, ++ (u_char *)&c64, sizeof(c64)); + break; + + default: +diff --git a/agent/mibgroup/ucd-snmp/memory.h b/agent/mibgroup/ucd-snmp/memory.h +index a44d82e51..ded214022 100644 +--- a/agent/mibgroup/ucd-snmp/memory.h ++++ b/agent/mibgroup/ucd-snmp/memory.h +@@ -32,6 +32,15 @@ Netsnmp_Node_Handler handle_memory; + #define MEMORY_CACHED 15 + #define MEMORY_STXT_USED 16 + #define MEMORY_RTXT_USED 17 ++#define MEMORY_SWAP_TOTAL_X 18 ++#define MEMORY_SWAP_AVAIL_X 19 ++#define MEMORY_REAL_TOTAL_X 20 ++#define MEMORY_REAL_AVAIL_X 21 ++#define MEMORY_FREE_X 22 ++#define MEMORY_SWAP_MIN_X 23 ++#define MEMORY_SHARED_X 24 ++#define MEMORY_BUFFER_X 25 ++#define MEMORY_CACHED_X 26 + #define MEMORY_SWAP_ERROR 100 + #define MEMORY_SWAP_ERRMSG 101 + #endif /* MEMORY_H */ +diff --git a/mibs/UCD-SNMP-MIB.txt b/mibs/UCD-SNMP-MIB.txt +index e8acc8c0d..cde67feb5 100644 +--- a/mibs/UCD-SNMP-MIB.txt ++++ b/mibs/UCD-SNMP-MIB.txt +@@ -33,11 +33,14 @@ IMPORTS + Integer32, Opaque, enterprises, Counter32, Unsigned32 + FROM SNMPv2-SMI + ++ CounterBasedGauge64 ++ FROM HCNUM-TC ++ + TEXTUAL-CONVENTION, DisplayString, TruthValue + FROM SNMPv2-TC; + + ucdavis MODULE-IDENTITY +- LAST-UPDATED "200901190000Z" ++ LAST-UPDATED "201606100000Z" + ORGANIZATION "University of California, Davis" + CONTACT-INFO + "This mib is no longer being maintained by the University of +@@ -55,6 +58,10 @@ ucdavis MODULE-IDENTITY + DESCRIPTION + "This file defines the private UCD SNMP MIB extensions." + ++ REVISION "201606100000Z" ++ DESCRIPTION ++ "New 64-bit memory objects" ++ + REVISION "201105140000Z" + DESCRIPTION + "New objects for monitoring CPU Steal, Guest and Nice values" +@@ -629,6 +636,113 @@ memUsedRealTXT OBJECT-TYPE + pages from other uses of physical memory." + ::= { memory 17 } + ++memTotalSwapX OBJECT-TYPE ++ SYNTAX CounterBasedGauge64 ++ UNITS "kB" ++ MAX-ACCESS read-only ++ STATUS current ++ DESCRIPTION ++ "The total amount of swap space configured for this host." ++ ::= { memory 18 } ++ ++memAvailSwapX OBJECT-TYPE ++ SYNTAX CounterBasedGauge64 ++ UNITS "kB" ++ MAX-ACCESS read-only ++ STATUS current ++ DESCRIPTION ++ "The amount of swap space currently unused or available." ++ ::= { memory 19 } ++ ++memTotalRealX OBJECT-TYPE ++ SYNTAX CounterBasedGauge64 ++ UNITS "kB" ++ MAX-ACCESS read-only ++ STATUS current ++ DESCRIPTION ++ "The total amount of real/physical memory installed ++ on this host." ++ ::= { memory 20 } ++ ++memAvailRealX OBJECT-TYPE ++ SYNTAX CounterBasedGauge64 ++ UNITS "kB" ++ MAX-ACCESS read-only ++ STATUS current ++ DESCRIPTION ++ "The amount of real/physical memory currently unused ++ or available." ++ ::= { memory 21 } ++ ++ ++memTotalFreeX OBJECT-TYPE ++ SYNTAX CounterBasedGauge64 ++ UNITS "kB" ++ MAX-ACCESS read-only ++ STATUS current ++ DESCRIPTION ++ "The total amount of memory free or available for use on ++ this host. This value typically covers both real memory ++ and swap space or virtual memory." ++ ::= { memory 22 } ++ ++memMinimumSwapX OBJECT-TYPE ++ SYNTAX CounterBasedGauge64 ++ UNITS "kB" ++ MAX-ACCESS read-only ++ STATUS current ++ DESCRIPTION ++ "The minimum amount of swap space expected to be kept ++ free or available during normal operation of this host. ++ ++ If this value (as reported by 'memAvailSwap(4)') falls ++ below the specified level, then 'memSwapError(100)' will ++ be set to 1 and an error message made available via ++ 'memSwapErrorMsg(101)'." ++ ::= { memory 23 } ++ ++memSharedX OBJECT-TYPE ++ SYNTAX CounterBasedGauge64 ++ UNITS "kB" ++ MAX-ACCESS read-only ++ STATUS current ++ DESCRIPTION ++ "The total amount of real or virtual memory currently ++ allocated for use as shared memory. ++ ++ This object will not be implemented on hosts where the ++ underlying operating system does not explicitly identify ++ memory as specifically reserved for this purpose." ++ ::= { memory 24 } ++ ++memBufferX OBJECT-TYPE ++ SYNTAX CounterBasedGauge64 ++ UNITS "kB" ++ MAX-ACCESS read-only ++ STATUS current ++ DESCRIPTION ++ "The total amount of real or virtual memory currently ++ allocated for use as memory buffers. ++ ++ This object will not be implemented on hosts where the ++ underlying operating system does not explicitly identify ++ memory as specifically reserved for this purpose." ++ ::= { memory 25 } ++ ++memCachedX OBJECT-TYPE ++ SYNTAX CounterBasedGauge64 ++ UNITS "kB" ++ MAX-ACCESS read-only ++ STATUS current ++ DESCRIPTION ++ "The total amount of real or virtual memory currently ++ allocated for use as cached memory. ++ ++ This object will not be implemented on hosts where the ++ underlying operating system does not explicitly identify ++ memory as specifically reserved for this purpose." ++ ::= { memory 26 } ++ + memSwapError OBJECT-TYPE + SYNTAX UCDErrorFlag + MAX-ACCESS read-only + diff --git a/SOURCES/net-snmp-5.7.2-diskio-whitelist.patch b/SOURCES/net-snmp-5.7.2-diskio-whitelist.patch index 1ea62b2..754d863 100644 --- a/SOURCES/net-snmp-5.7.2-diskio-whitelist.patch +++ b/SOURCES/net-snmp-5.7.2-diskio-whitelist.patch @@ -315,7 +315,7 @@ diff -up net-snmp-5.7.2/agent/mibgroup/ucd-snmp/diskio.c.test net-snmp-5.7.2/age + pTemp->major = disks[i].major; + pTemp->minor = disks[i].minor; + strlcpy( pTemp->name, disks[i].shortname, sizeof(pTemp->name) - 1 ); -+ if (sscanf (buffer, "%*[ \n\t]%lu%*[ \n\t]%lu%*[ \n\t]%lu%*[ \n\t]%lu%*[ \n\t]%lu%*[ \n\t]%lu%*[ \n\t]%lu%*[ \n\t]%lu%*[ \n\t]%lu%*[ \n\t]%lu%*[ \n\t]%lu\n", ++ if (sscanf (buffer, "%lu%*[ \n\t]%lu%*[ \n\t]%lu%*[ \n\t]%lu%*[ \n\t]%lu%*[ \n\t]%lu%*[ \n\t]%lu%*[ \n\t]%lu%*[ \n\t]%lu%*[ \n\t]%lu%*[ \n\t]%lu\n", + &pTemp->rio, &pTemp->rmerge, &pTemp->rsect, &pTemp->ruse, + &pTemp->wio, &pTemp->wmerge, &pTemp->wsect, &pTemp->wuse, + &pTemp->running, &pTemp->use, &pTemp->aveq) != 11) diff --git a/SOURCES/net-snmp-5.7.2-glusterfs.patch b/SOURCES/net-snmp-5.7.2-glusterfs.patch new file mode 100644 index 0000000..4642afd --- /dev/null +++ b/SOURCES/net-snmp-5.7.2-glusterfs.patch @@ -0,0 +1,28 @@ +diff -urNp d/agent/mibgroup/hardware/fsys/fsys_mntent.c c/agent/mibgroup/hardware/fsys/fsys_mntent.c +--- d/agent/mibgroup/hardware/fsys/fsys_mntent.c 2019-04-10 14:07:48.901299146 +0200 ++++ c/agent/mibgroup/hardware/fsys/fsys_mntent.c 2019-07-31 10:31:36.330220324 +0200 +@@ -133,6 +133,8 @@ _fsys_type( char *typename ) + !strcmp(typename, MNTTYPE_TMPFS) || + !strcmp(typename, MNTTYPE_GFS) || + !strcmp(typename, MNTTYPE_GFS2) || ++ !strcmp(typename, MNTTYPE_GLUSTERFS) || ++ !strcmp(typename, MNTTYPE_FUSEGLUSTERFS) || + !strcmp(typename, MNTTYPE_XFS) || + !strcmp(typename, MNTTYPE_JFS) || + !strcmp(typename, MNTTYPE_VXFS) || +diff -urNp d/agent/mibgroup/hardware/fsys/mnttypes.h c/agent/mibgroup/hardware/fsys/mnttypes.h +--- d/agent/mibgroup/hardware/fsys/mnttypes.h 2019-04-10 14:07:48.901299146 +0200 ++++ c/agent/mibgroup/hardware/fsys/mnttypes.h 2019-07-31 10:30:41.018819039 +0200 +@@ -121,6 +121,12 @@ + #ifndef MNTTYPE_GFS2 + #define MNTTYPE_GFS2 "gfs2" + #endif ++#ifndef MNTTYPE_GLUSTERFS ++#define MNTTYPE_GLUSTERFS "glusterfs" ++#endif ++#ifndef MNTTYPE_FUSEGLUSTERFS ++#define MNTTYPE_FUSEGLUSTERFS "fuse.glusterfs" ++#endif + #ifndef MNTTYPE_XFS + #define MNTTYPE_XFS "xfs" + #endif diff --git a/SOURCES/net-snmp-5.7.2-icmp.patch b/SOURCES/net-snmp-5.7.2-icmp.patch new file mode 100644 index 0000000..ae6f730 --- /dev/null +++ b/SOURCES/net-snmp-5.7.2-icmp.patch @@ -0,0 +1,12 @@ +diff -urNp old/agent/mibgroup/mibII/kernel_linux.c new/agent/mibgroup/mibII/kernel_linux.c +--- old/agent/mibgroup/mibII/kernel_linux.c 2019-04-02 13:54:36.000548869 +0200 ++++ new/agent/mibgroup/mibII/kernel_linux.c 2019-04-02 14:09:33.909641083 +0200 +@@ -29,7 +29,7 @@ struct udp_mib cached_udp_mib; + struct udp6_mib cached_udp6_mib; + + #define IP_STATS_LINE "Ip: %lu %lu %lu %lu %lu %lu %lu %lu %lu %lu %lu %lu %lu %lu %lu %lu %lu %lu %lu" +-#define ICMP_STATS_LINE "Icmp: %lu %lu %lu %lu %lu %lu %lu %lu %lu %lu %lu %lu %lu %lu %lu %lu %lu %lu %lu %lu %lu %lu %lu %lu %lu %lu" ++#define ICMP_STATS_LINE "Icmp: %lu %lu %*lu %lu %lu %lu %lu %lu %lu %lu %lu %lu %lu %lu %lu %lu %lu %lu %lu %lu %lu %lu %lu %lu %lu %lu %lu" + #define ICMP_MSG_STATS_LINE "IcmpMsg: " + #define TCP_STATS_LINE "Tcp: %lu %lu %lu %lu %lu %lu %lu %lu %lu %lu %lu %lu %lu %lu" + #define UDP_STATS_LINE "Udp: %lu %lu %lu %lu" diff --git a/SOURCES/net-snmp-5.7.2-ifTable-interface_fadeout.patch b/SOURCES/net-snmp-5.7.2-ifTable-interface_fadeout.patch new file mode 100644 index 0000000..4c3b3ea --- /dev/null +++ b/SOURCES/net-snmp-5.7.2-ifTable-interface_fadeout.patch @@ -0,0 +1,11 @@ +diff -urNp a/agent/mibgroup/if-mib/ifTable/ifTable_data_access.c b/agent/mibgroup/if-mib/ifTable/ifTable_data_access.c +--- a/agent/mibgroup/if-mib/ifTable/ifTable_data_access.c 2019-07-29 12:58:53.871166649 +0200 ++++ b/agent/mibgroup/if-mib/ifTable/ifTable_data_access.c 2019-07-29 13:02:34.718033022 +0200 +@@ -352,6 +352,7 @@ _check_interface_entry_for_updates(ifTab + rowreq_ctx->data.ifAdminStatus = IFADMINSTATUS_DOWN; + rowreq_ctx->data.ifOperStatus = IFOPERSTATUS_DOWN; + oper_changed = 1; ++ rowreq_ctx->data.ifLastChange = netsnmp_get_agent_uptime(); + } + if (rowreq_ctx->known_missing) { + time_t now = netsnmp_get_agent_uptime(); diff --git a/SOURCES/net-snmp-5.7.2-memory.patch b/SOURCES/net-snmp-5.7.2-memory.patch index d353e70..2b5864f 100644 --- a/SOURCES/net-snmp-5.7.2-memory.patch +++ b/SOURCES/net-snmp-5.7.2-memory.patch @@ -24,24 +24,6 @@ diff -urNp c/agent/mibgroup/hardware/memory/memory_linux.c d/agent/mibgroup/hard b = strstr(buff, "SwapFree: "); if (b) sscanf(b, "SwapFree: %lu", &swapfree); -@@ -147,7 +154,7 @@ int netsnmp_mem_arch_load( netsnmp_cache - mem->descr = strdup("Physical memory"); - mem->units = 1024; - mem->size = memtotal; -- mem->free = memfree; -+ mem->free = memfree+buffers+cached+sreclaimable; - mem->other = -1; - } - -@@ -159,7 +166,7 @@ int netsnmp_mem_arch_load( netsnmp_cache - mem->descr = strdup("Virtual memory"); - mem->units = 1024; - mem->size = memtotal+swaptotal; -- mem->free = memfree +swapfree; -+ mem->free = memfree+swapfree+buffers+cached+sreclaimable; - mem->other = -1; - } - @@ -182,7 +189,7 @@ int netsnmp_mem_arch_load( netsnmp_cache if (!mem->descr) mem->descr = strdup("Cached memory"); diff --git a/SOURCES/net-snmp-5.7.2-pass_common.patch b/SOURCES/net-snmp-5.7.2-pass_common.patch index 93927af..006b8e0 100644 --- a/SOURCES/net-snmp-5.7.2-pass_common.patch +++ b/SOURCES/net-snmp-5.7.2-pass_common.patch @@ -1,6 +1,6 @@ -diff -ruNp a/agent/mibgroup/ucd-snmp/pass_common.c b/agent/mibgroup/ucd-snmp/pass_common.c ---- a/agent/mibgroup/ucd-snmp/pass_common.c 2019-07-23 14:24:40.378049638 +0200 -+++ b/agent/mibgroup/ucd-snmp/pass_common.c 2019-07-23 14:26:27.862983889 +0200 +diff -urNp old/agent/mibgroup/ucd-snmp/pass_common.c new/agent/mibgroup/ucd-snmp/pass_common.c +--- old/agent/mibgroup/ucd-snmp/pass_common.c 2019-04-03 11:09:47.957025775 +0200 ++++ new/agent/mibgroup/ucd-snmp/pass_common.c 2019-04-03 11:27:04.133155491 +0200 @@ -250,15 +250,15 @@ netsnmp_internal_pass_set_format(char *b sprintf(buf, "string \"\"\n"); else if (netsnmp_internal_bin2asc(buf2, var_val_len) == diff --git a/SOURCES/snmpd.service b/SOURCES/snmpd.service index adb394d..8f6cb2e 100644 --- a/SOURCES/snmpd.service +++ b/SOURCES/snmpd.service @@ -1,6 +1,6 @@ [Unit] Description=Simple Network Management Protocol (SNMP) Daemon. -After=syslog.target network.target +After=syslog.target network-online.target [Service] Type=notify diff --git a/SOURCES/snmptrapd.service b/SOURCES/snmptrapd.service index 9835a38..ec71e75 100644 --- a/SOURCES/snmptrapd.service +++ b/SOURCES/snmptrapd.service @@ -1,6 +1,6 @@ [Unit] Description=Simple Network Management Protocol (SNMP) Trap Daemon. -After=syslog.target network.target +After=syslog.target network-online.target [Service] Type=notify diff --git a/SPECS/net-snmp.spec b/SPECS/net-snmp.spec index 148d75b..2272cc2 100644 --- a/SPECS/net-snmp.spec +++ b/SPECS/net-snmp.spec @@ -11,7 +11,7 @@ Summary: A collection of SNMP protocol tools and libraries Name: net-snmp Version: 5.7.2 -Release: 43%{?dist}.3 +Release: 47%{?dist} Epoch: 1 License: BSD @@ -114,8 +114,13 @@ Patch78: net-snmp-5.7.2-traptomail.patch Patch79: net-snmp-5.7.2-null-magic.patch Patch80: net-snmp-5.7.2-v3-forward.patch Patch81: net-snmp-5.7.2-memory.patch -Patch82: net-snmp-5.7.2-pass_common.patch -Patch83: net-snmp-5.7.2-SHA-fix.patch +Patch82: net-snmp-5.7.2-glusterfs.patch +Patch83: net-snmp-5.7.2-ifTable-interface_fadeout.patch +Patch84: net-snmp-5.7.2-icmp.patch +Patch85: net-snmp-5.7.2-pass_common.patch +Patch86: net-snmp-5.7.2-CVE-2018-18066.patch +Patch87: net-snmp-5.7.2-counter64.patch +Patch88: net-snmp-5.7.2-SHA-fix.patch Requires(post): chkconfig Requires(preun): chkconfig @@ -350,8 +355,13 @@ The net-snmp-sysvinit package provides SysV init scripts for Net-SNMP daemons. %patch79 -p1 -b .null-magic %patch80 -p1 -b .v3-forward %patch81 -p1 -b .memory -%patch82 -p1 -b .pass_common -%patch83 -p1 -b .SHA-fix +%patch82 -p1 -b .glusterfs +%patch83 -p1 -b .interface-fadeout +%patch84 -p1 -b .icmp +%patch85 -p1 -b .pass_common +%patch86 -p1 -b .CVE-2018-18066 +%patch87 -p1 -b .counter64 +%patch88 -p1 -b .SHA-fix %ifarch sparc64 s390 s390x # disable failing test - see https://bugzilla.redhat.com/show_bug.cgi?id=680697 @@ -647,14 +657,24 @@ rm -rf ${RPM_BUILD_ROOT} %{_initrddir}/snmptrapd %changelog -* Mon Dec 02 2019 Josef Ridky - 1:5.7.2-43.3 -- fix sha224 and sha384 declaration check (#1778733) - -* Tue Sep 17 2019 Josef Ridky - 1:5.7.2-43.2 -- fix memory leak introduced by trap v3 forwarding fix (#1752778) - -* Mon Aug 19 2019 Josef Ridky - 1:5.7.2-43.1 -- fix buffer size in pass_common.c file (#1741925) +* Mon Dec 09 2019 Josef Ridky - 1:5.7.2-47 +- revert calculation of free space (#1779609) + +* Mon Dec 02 2019 Josef Ridky - 1:5.7.2-46 +- fix sha224 and sha384 declaration check (#1774693) + +* Tue Sep 17 2019 Josef Ridky - 1:5.7.2-45 +- fix memory leak introduced by fix of snmp v3 traps forwarding (#1751195) + +* Wed Aug 14 2019 Josef Ridky - 1:5.7.2-44 +- add support for glusterfs (#1316386) +- change services to start after network-online.target (#1388118) +- fix interface fadeout configuration (#1547355) +- fix scanf pattern for ICMP stats (#1693547) +- change buffer size in pass_common.c file (#1695363 and #1731357) +- remove initial whitespace reading from scanf pattern of /sys/dev/block/../stat file (#1700494) +- fix for CVE-2018-18066 (#1638911) +- add Counter64 support for UCD-SNMP-MIB (#1703752) * Wed May 22 2019 Josef Ridky - 1:5.7.2-43 - fix available memory calculation (#1250060)