diff --git a/base/net-snmp/centos/meta_patches/fix-snmpd-initscript.patch b/base/net-snmp/centos/meta_patches/fix-snmpd-initscript.patch index a91b45c65..662ebf6c5 100644 --- a/base/net-snmp/centos/meta_patches/fix-snmpd-initscript.patch +++ b/base/net-snmp/centos/meta_patches/fix-snmpd-initscript.patch @@ -1,4 +1,4 @@ -From 294f4a58442180dc2787b3c67aaea8e83910ae6c Mon Sep 17 00:00:00 2001 +From 3558b107aa5464f867516e2d734592d0f6363b97 Mon Sep 17 00:00:00 2001 From: Scott Little Date: Mon, 2 Oct 2017 17:05:58 -0400 Subject: [PATCH 5/9] WRS: fix-snmpd-initscript.patch @@ -8,10 +8,10 @@ Subject: [PATCH 5/9] WRS: fix-snmpd-initscript.patch 1 file changed, 1 deletion(-) diff --git a/SPECS/net-snmp.spec b/SPECS/net-snmp.spec -index df248ac..a433f40 100644 +index 035d2f8..3e36cb5 100644 --- a/SPECS/net-snmp.spec +++ b/SPECS/net-snmp.spec -@@ -419,7 +419,6 @@ mkdir -p ${RPM_BUILD_ROOT}%{_sysconfdir}/rc.d/init.d +@@ -434,7 +434,6 @@ mkdir -p ${RPM_BUILD_ROOT}%{_sysconfdir}/rc.d/init.d install -m 755 %SOURCE13 ${RPM_BUILD_ROOT}%{_sysconfdir}/rc.d/init.d/snmpd install -d ${RPM_BUILD_ROOT}%{_initrddir} @@ -20,5 +20,5 @@ index df248ac..a433f40 100644 install -d ${RPM_BUILD_ROOT}%{_sysconfdir}/sysconfig -- -1.9.1 +2.7.4 diff --git a/base/net-snmp/centos/meta_patches/snmp-spec-add-snmp-config.patch b/base/net-snmp/centos/meta_patches/snmp-spec-add-snmp-config.patch index a5bb5c171..9ea2ad629 100644 --- a/base/net-snmp/centos/meta_patches/snmp-spec-add-snmp-config.patch +++ b/base/net-snmp/centos/meta_patches/snmp-spec-add-snmp-config.patch @@ -1,4 +1,4 @@ -From 1e57fa5c972496c35b0b1e2aa6f7c9b906cec08c Mon Sep 17 00:00:00 2001 +From 5204f1aaeb0a71eba1cacd16fdf716b3d01c0985 Mon Sep 17 00:00:00 2001 From: Scott Little Date: Mon, 2 Oct 2017 17:05:59 -0400 Subject: [PATCH 9/9] WRS: snmp-spec-add-snmp-config.patch @@ -8,7 +8,7 @@ Subject: [PATCH 9/9] WRS: snmp-spec-add-snmp-config.patch 1 file changed, 4 insertions(+) diff --git a/SPECS/net-snmp.spec b/SPECS/net-snmp.spec -index 8d109b8..f0c1d48 100644 +index b015436..6fc0da2 100644 --- a/SPECS/net-snmp.spec +++ b/SPECS/net-snmp.spec @@ -42,6 +42,7 @@ Source11: snmptrapd.service @@ -19,7 +19,7 @@ index 8d109b8..f0c1d48 100644 Patch1: net-snmp-5.7.2-pie.patch Patch2: net-snmp-5.5-dir-fix.patch -@@ -418,6 +419,8 @@ chmod 660 ${RPM_BUILD_ROOT}%{_sysconfdir}/snmp/* +@@ -433,6 +434,8 @@ chmod 660 ${RPM_BUILD_ROOT}%{_sysconfdir}/snmp/* mkdir -p ${RPM_BUILD_ROOT}%{_sysconfdir}/rc.d/init.d install -m 755 %SOURCE13 ${RPM_BUILD_ROOT}%{_sysconfdir}/rc.d/init.d/snmpd @@ -28,7 +28,7 @@ index 8d109b8..f0c1d48 100644 install -d ${RPM_BUILD_ROOT}%{_initrddir} install -m 755 %SOURCE3 ${RPM_BUILD_ROOT}%{_initrddir}/snmptrapd -@@ -552,6 +555,7 @@ rm -rf ${RPM_BUILD_ROOT} +@@ -567,6 +570,7 @@ rm -rf ${RPM_BUILD_ROOT} %attr(0644,root,root) %{_mandir}/man1/net-snmp-create-v3-user* %attr(0644,root,root) %{_mandir}/man1/snmpconf.1.gz %dir %{_datadir}/snmp @@ -37,5 +37,5 @@ index 8d109b8..f0c1d48 100644 %dir %{_localstatedir}/run/net-snmp %{_prefix}/lib/tmpfiles.d/net-snmp.conf -- -1.9.1 +2.7.4 diff --git a/base/net-snmp/centos/meta_patches/snmp-spec-config-file-permission.patch b/base/net-snmp/centos/meta_patches/snmp-spec-config-file-permission.patch index cbbff7340..c2563614d 100644 --- a/base/net-snmp/centos/meta_patches/snmp-spec-config-file-permission.patch +++ b/base/net-snmp/centos/meta_patches/snmp-spec-config-file-permission.patch @@ -1,4 +1,4 @@ -From a2f64266f7423905b1fd718c405ad25890f6efb5 Mon Sep 17 00:00:00 2001 +From 28917eb0762c08ffa8255fd29555e1d75681d6f8 Mon Sep 17 00:00:00 2001 From: Tao Liu Date: Thu, 4 Jan 2018 11:43:15 -0500 Subject: snmp spec change config file permission @@ -8,10 +8,10 @@ Subject: snmp spec change config file permission 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/SPECS/net-snmp.spec b/SPECS/net-snmp.spec -index 182265b..8600da9 100644 +index 6fc0da2..38afcf1 100644 --- a/SPECS/net-snmp.spec +++ b/SPECS/net-snmp.spec -@@ -545,8 +545,8 @@ rm -rf ${RPM_BUILD_ROOT} +@@ -558,8 +558,8 @@ rm -rf ${RPM_BUILD_ROOT} %doc local/passtest local/ipf-mod.pl %doc README.thread AGENT.txt PORTING local/README.mib2c %dir %{_sysconfdir}/snmp @@ -23,5 +23,5 @@ index 182265b..8600da9 100644 %{_bindir}/agentxtrap %{_bindir}/net-snmp-create-v3-user -- -1.8.3.1 +2.7.4 diff --git a/base/net-snmp/centos/meta_patches/spec-include-TiS-patches.patch b/base/net-snmp/centos/meta_patches/spec-include-TiS-patches.patch index 31c94c64e..8720f84f8 100644 --- a/base/net-snmp/centos/meta_patches/spec-include-TiS-patches.patch +++ b/base/net-snmp/centos/meta_patches/spec-include-TiS-patches.patch @@ -1,4 +1,4 @@ -From 7f219b321341d75f3caa233669b7ae623eb1f705 Mon Sep 17 00:00:00 2001 +From 387d170e5cc224b2bbfb406c03853c339cd4528e Mon Sep 17 00:00:00 2001 From: Scott Little Date: Mon, 2 Oct 2017 17:05:58 -0400 Subject: [PATCH 1/9] WRS: spec-include-TiS-patches.patch @@ -8,7 +8,7 @@ Subject: [PATCH 1/9] WRS: spec-include-TiS-patches.patch 1 file changed, 14 insertions(+), 2 deletions(-) diff --git a/SPECS/net-snmp.spec b/SPECS/net-snmp.spec -index d15029f..85955d0 100644 +index a59db4f..da7706b 100644 --- a/SPECS/net-snmp.spec +++ b/SPECS/net-snmp.spec @@ -1,3 +1,6 @@ @@ -29,7 +29,7 @@ index d15029f..85955d0 100644 Patch1: net-snmp-5.7.2-pie.patch Patch2: net-snmp-5.5-dir-fix.patch Patch3: net-snmp-5.6-multilib.patch -@@ -357,6 +364,7 @@ MIBS="$MIBS ucd-snmp/lmsensorsMib" +@@ -372,6 +379,7 @@ MIBS="$MIBS ucd-snmp/lmsensorsMib" --with-security-modules=tsm \ --with-mysql \ --with-systemd \ @@ -37,7 +37,7 @@ index d15029f..85955d0 100644 --with-sys-contact="root@localhost" <