starlingx/integ
Code Issues Proposed changes

rebase net-snmp patch to CentOS7.5

Browse Source 
Story: 2003389
Task: 24478

Change-Id: I88d46685c0c293dd6201b9a1575d7d3815489725
Signed-off-by: slin14 <shuicheng.lin@intel.com>
This commit is contained in:
slin14 2018-08-14 01:34:04 +08:00 committed by chenyan
parent 2fec58fae4
commit 342ddde7e4
5 changed files with 37 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
base/net-snmp/centos/meta_patches/0001-Update-package-versioning-for-TIS-format.patch
View File

@ -1,7 +1,7 @@
From 2b9054a9278f5b7a6af660eb5842b9ec32d50e74 Mon Sep 17 00:00:00 2001
From c25a30b4a0c7347234c2af4afab099b5735bbf71 Mon Sep 17 00:00:00 2001
From: Scott Little <scott.little@windriver.com>
Date: Mon, 2 Oct 2017 17:05:59 -0400
Subject: [PATCH 8/9] WRS: 0001-Update-package-versioning-for-TIS-format.patch
Subject: [PATCH] WRS: 0001-Update-package-versioning-for-TIS-format.patch
Conflicts:
SPECS/net-snmp.spec
@ -10,18 +10,18 @@ Conflicts:
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/SPECS/net-snmp.spec b/SPECS/net-snmp.spec
index 0ac1eef..8d109b8 100644
index 9b313cb..b015436 100644
--- a/SPECS/net-snmp.spec
+++ b/SPECS/net-snmp.spec
@@ -14,7 +14,7 @@
Summary: A collection of SNMP protocol tools and libraries
Name: net-snmp
Version: 5.7.2
-Release: 28%{?dist}.1
+Release: 28.el7%{?_tis_dist}.%{tis_patch_ver}
-Release: 33%{?dist}.2
+Release: 33.el7_5.2%{?_tis_dist}.%{tis_patch_ver}
Epoch: 1
License: BSD
--
1.9.1
2.7.4

23
base/net-snmp/centos/meta_patches/run-snmpd-as-non-root-user.patch
View File

@ -1,14 +1,14 @@
From d984ab4a020a20082190e8029f45f06031f320da Mon Sep 17 00:00:00 2001
From 5dc19ad10a3f91803116a88c303134e9ff361bd5 Mon Sep 17 00:00:00 2001
From: Scott Little <scott.little@windriver.com>
Date: Mon, 2 Oct 2017 17:05:59 -0400
Subject: [PATCH 6/9] WRS: run-snmpd-as-non-root-user.patch
Subject: [PATCH] WRS: run-snmpd-as-non-root-user.patch
Conflicts:
SPECS/net-snmp.spec
---
SOURCES/snmpd.service | 2 +-
SPECS/net-snmp.spec | 4 ++--
2 files changed, 3 insertions(+), 3 deletions(-)
SPECS/net-snmp.spec | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/SOURCES/snmpd.service b/SOURCES/snmpd.service
index 84b6ca3..ad689c8 100644
@ -24,19 +24,10 @@ index 84b6ca3..ad689c8 100644
ExecStart=/etc/init.d/snmpd start
ExecStop=/etc/init.d/snmpd stop
diff --git a/SPECS/net-snmp.spec b/SPECS/net-snmp.spec
index a433f40..0ac1eef 100644
index 3e36cb5..9b313cb 100644
--- a/SPECS/net-snmp.spec
+++ b/SPECS/net-snmp.spec
@@ -14,7 +14,7 @@
Summary: A collection of SNMP protocol tools and libraries
Name: net-snmp
Version: 5.7.2
-Release: 28%{?dist}
+Release: 28%{?dist}.1
Epoch: 1
License: BSD
@@ -413,7 +413,7 @@ install -m 644 %SOURCE6 ${RPM_BUILD_ROOT}%{_sysconfdir}/snmp/snmptrapd.conf
@@ -428,7 +428,7 @@ install -m 644 %SOURCE6 ${RPM_BUILD_ROOT}%{_sysconfdir}/snmp/snmptrapd.conf
# WRS
install -m 644 %SOURCE12 ${RPM_BUILD_ROOT}%{_sysconfdir}/snmp/snmpd.conf
@ -46,5 +37,5 @@ index a433f40..0ac1eef 100644
mkdir -p ${RPM_BUILD_ROOT}%{_sysconfdir}/rc.d/init.d
install -m 755 %SOURCE13 ${RPM_BUILD_ROOT}%{_sysconfdir}/rc.d/init.d/snmpd
--
1.9.1
2.7.4

14
base/net-snmp/centos/meta_patches/snmp-spec-add-init-script.patch
View File

@ -1,14 +1,14 @@
From 05124f2495f4173848cac245c6579247a0e255d6 Mon Sep 17 00:00:00 2001
From 492d89dca4ca498b77847abc1f1313a800fec85e Mon Sep 17 00:00:00 2001
From: Scott Little <scott.little@windriver.com>
Date: Mon, 2 Oct 2017 17:05:58 -0400
Subject: [PATCH 3/9] WRS: snmp-spec-add-init-script.patch
Subject: [PATCH] WRS: snmp-spec-add-init-script.patch
---
SPECS/net-snmp.spec | 5 +++++
1 file changed, 5 insertions(+)
diff --git a/SPECS/net-snmp.spec b/SPECS/net-snmp.spec
index 85955d0..df248ac 100644
index da7706b..035d2f8 100644
--- a/SPECS/net-snmp.spec
+++ b/SPECS/net-snmp.spec
@@ -41,6 +41,7 @@ Source11: snmptrapd.service
@ -19,7 +19,7 @@ index 85955d0..df248ac 100644
Patch1: net-snmp-5.7.2-pie.patch
Patch2: net-snmp-5.5-dir-fix.patch
@@ -414,6 +415,9 @@ install -m 644 %SOURCE6 ${RPM_BUILD_ROOT}%{_sysconfdir}/snmp/snmptrapd.conf
@@ -429,6 +430,9 @@ install -m 644 %SOURCE6 ${RPM_BUILD_ROOT}%{_sysconfdir}/snmp/snmptrapd.conf
install -m 644 %SOURCE12 ${RPM_BUILD_ROOT}%{_sysconfdir}/snmp/snmpd.conf
chmod 600 ${RPM_BUILD_ROOT}%{_sysconfdir}/snmp/snmptrapd.conf
@ -29,14 +29,14 @@ index 85955d0..df248ac 100644
install -d ${RPM_BUILD_ROOT}%{_initrddir}
install -m 755 %SOURCE2 ${RPM_BUILD_ROOT}%{_initrddir}/snmpd
install -m 755 %SOURCE3 ${RPM_BUILD_ROOT}%{_initrddir}/snmptrapd
@@ -553,6 +557,7 @@ rm -rf ${RPM_BUILD_ROOT}
@@ -568,6 +572,7 @@ rm -rf ${RPM_BUILD_ROOT}
%dir %{_localstatedir}/run/net-snmp
%{_prefix}/lib/tmpfiles.d/net-snmp.conf
%{_unitdir}/snmp*
+%{_sysconfdir}/rc.d/init.d/snmpd
%config(noreplace) %{_sysconfdir}/sysconfig/snmpd
%config(noreplace) %{_sysconfdir}/sysconfig/snmptrapd
%attr(0755,root,root) %{_bindir}/net-snmp-config*
--
1.9.1
2.7.4

19
base/net-snmp/centos/meta_patches/spec-configure-without-HOST-RESOURCES-MIB.patch
View File

@ -1,8 +1,18 @@
From 0358f8ee4e56fbd3f4c54409b3dbe5c9fdff3a27 Mon Sep 17 00:00:00 2001
From: slin14 <shuicheng.lin@intel.com>
Date: Sun, 12 Aug 2018 22:07:24 +0800
Subject: [PATCH] spec-configure-without-HOST-RESOURCES-MIB
Signed-off-by: slin14 <shuicheng.lin@intel.com>
---
SPECS/net-snmp.spec | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/SPECS/net-snmp.spec b/SPECS/net-snmp.spec
index 12323a4..1e23fba 100644
index a1b3720..e6e5d8c 100644
--- a/SPECS/net-snmp.spec
+++ b/SPECS/net-snmp.spec
@@ -331,7 +331,7 @@ rm testing/fulltests/default/T200*
@@ -342,7 +342,7 @@ rm testing/fulltests/default/T200*
%endif
%build
@ -11,7 +21,7 @@ index 12323a4..1e23fba 100644
ucd-snmp/diskio tcp-mib udp-mib mibII/mta_sendmail \
ip-mib/ipv4InterfaceTable ip-mib/ipv6InterfaceTable \
ip-mib/ipAddressPrefixTable/ipAddressPrefixTable \
@@ -352,6 +352,7 @@ MIBS="$MIBS ucd-snmp/lmsensorsMib"
@@ -363,6 +363,7 @@ MIBS="$MIBS ucd-snmp/lmsensorsMib"
--with-logfile="/var/log/snmpd.log" \
--with-persistent-directory="/var/lib/net-snmp" \
--with-mib-modules="$MIBS" \
@ -19,3 +29,6 @@ index 12323a4..1e23fba 100644
%if %{netsnmp_tcp_wrappers}
--with-libwrap=yes \
%endif
--
2.7.4

2
base/net-snmp/centos/srpm_path
View File

@ -1 +1 @@
mirror:Source/net-snmp-5.7.2-28.el7.src.rpm
mirror:Source/net-snmp-5.7.2-33.el7_5.2.src.rpm