f8cf2f4086
When do Centos 7.5 upgraded, some patches didn't resolve and cause the fuzzy in the line numbers of the patches. And it may cause .orig file is created when do patch. And this .orig file will lead to rpm packaging failure due to the unexpected and unpackaged .orig file. Please visit below link to get more detail info: https://bugs.launchpad.net/starlingx/+bug/1794611 Solution: Safest solution is to de-fuzz our patches. Story: 2003389 Task: 26755 Change-Id: I623f7de6f79ecf9984076844c6816e425b0c3624 Signed-off-by: slin14 <shuicheng.lin@intel.com>
60 lines
2.0 KiB
Diff
60 lines
2.0 KiB
Diff
From 387d170e5cc224b2bbfb406c03853c339cd4528e 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 1/9] WRS: spec-include-TiS-patches.patch
|
|
|
|
---
|
|
SPECS/net-snmp.spec | 16 ++++++++++++++--
|
|
1 file changed, 14 insertions(+), 2 deletions(-)
|
|
|
|
diff --git a/SPECS/net-snmp.spec b/SPECS/net-snmp.spec
|
|
index a59db4f..da7706b 100644
|
|
--- a/SPECS/net-snmp.spec
|
|
+++ b/SPECS/net-snmp.spec
|
|
@@ -1,3 +1,6 @@
|
|
+# WRS: Disable check
|
|
+%global netsnmp_check 0
|
|
+
|
|
# use netsnmp_tcp_wrappers 0 to disable tcp_wrappers support
|
|
%{!?netsnmp_tcp_wrappers:%global netsnmp_tcp_wrappers 1}
|
|
# use nestnmp_check 0 to speed up packaging by disabling 'make test'
|
|
@@ -35,6 +38,10 @@ Source8: net-snmptrapd.sysconfig
|
|
Source9: net-snmp-tmpfs.conf
|
|
Source10: snmpd.service
|
|
Source11: snmptrapd.service
|
|
+
|
|
+# WRS
|
|
+Source12: snmpd.conf.cgcs
|
|
+
|
|
Patch1: net-snmp-5.7.2-pie.patch
|
|
Patch2: net-snmp-5.5-dir-fix.patch
|
|
Patch3: net-snmp-5.6-multilib.patch
|
|
@@ -372,6 +379,7 @@ MIBS="$MIBS ucd-snmp/lmsensorsMib"
|
|
--with-security-modules=tsm \
|
|
--with-mysql \
|
|
--with-systemd \
|
|
+ --without-nl \
|
|
--with-sys-contact="root@localhost" <<EOF
|
|
EOF
|
|
|
|
@@ -413,10 +421,14 @@ mv ${RPM_BUILD_ROOT}/%{_includedir}/net-snmp/net-snmp-config.h ${RPM_BUILD_ROOT}
|
|
install -m644 %SOURCE4 ${RPM_BUILD_ROOT}/%{_includedir}/net-snmp/net-snmp-config.h
|
|
%endif
|
|
|
|
-install -d ${RPM_BUILD_ROOT}%{_sysconfdir}/snmp
|
|
-install -m 644 %SOURCE1 ${RPM_BUILD_ROOT}%{_sysconfdir}/snmp/snmpd.conf
|
|
+install -d -m 750 ${RPM_BUILD_ROOT}%{_sysconfdir}/snmp
|
|
+# install -m 644 %SOURCE1 ${RPM_BUILD_ROOT}%{_sysconfdir}/snmp/snmpd.conf
|
|
install -m 644 %SOURCE6 ${RPM_BUILD_ROOT}%{_sysconfdir}/snmp/snmptrapd.conf
|
|
|
|
+# WRS
|
|
+install -m 644 %SOURCE12 ${RPM_BUILD_ROOT}%{_sysconfdir}/snmp/snmpd.conf
|
|
+chmod 600 ${RPM_BUILD_ROOT}%{_sysconfdir}/snmp/snmptrapd.conf
|
|
+
|
|
install -d ${RPM_BUILD_ROOT}%{_initrddir}
|
|
install -m 755 %SOURCE2 ${RPM_BUILD_ROOT}%{_initrddir}/snmpd
|
|
install -m 755 %SOURCE3 ${RPM_BUILD_ROOT}%{_initrddir}/snmptrapd
|
|
--
|
|
2.7.4
|
|
|