From d815cfe2f2003f4a64a5e0b5348b0e9daabb58df Mon Sep 17 00:00:00 2001 From: Nicolas Alvarez Date: Thu, 3 Dec 2020 17:42:31 -0300 Subject: [PATCH] Uninstall SNMP RPM Host-Based from STX. Uninstall SNMP RPM Host-Based from starlingx/integ repo because it will be containerized. Also disable snmp from networking/lldpd/centos/lldpd.spec file. Story: 2008132 Task: 41322 Depends-On: https://review.opendev.org/761792 Signed-off-by: Nicolas Alvarez Change-Id: Ifda06a5eb3bd0ec9683823b643e6d9cc0e7c97e2 --- base/net-snmp/PKG-INFO | 23 ----------- base/net-snmp/centos/build_srpm.data | 2 - ...te-package-versioning-for-TIS-format.patch | 25 ------------ base/net-snmp/centos/meta_patches/PATCH_ORDER | 2 - .../spec-build-configure-changes.patch | 39 ------------------- base/net-snmp/centos/srpm_path | 1 - centos_iso_image.inc | 5 --- centos_pkg_dirs | 1 - centos_srpms_centos.lst | 1 - networking/lldpd/centos/lldpd.spec | 4 +- 10 files changed, 3 insertions(+), 100 deletions(-) delete mode 100644 base/net-snmp/PKG-INFO delete mode 100644 base/net-snmp/centos/build_srpm.data delete mode 100644 base/net-snmp/centos/meta_patches/0001-Update-package-versioning-for-TIS-format.patch delete mode 100644 base/net-snmp/centos/meta_patches/PATCH_ORDER delete mode 100644 base/net-snmp/centos/meta_patches/spec-build-configure-changes.patch delete mode 100644 base/net-snmp/centos/srpm_path diff --git a/base/net-snmp/PKG-INFO b/base/net-snmp/PKG-INFO deleted file mode 100644 index 420722dd7..000000000 --- a/base/net-snmp/PKG-INFO +++ /dev/null @@ -1,23 +0,0 @@ -Metadata-Version: 1.1 -Name: net-snmp -Version: 5.7.2 -Summary: A collection of SNMP protocol tools and libraries -Home-page: -Author: -Author-email: -License: BSD - -Description: -SNMP (Simple Network Management Protocol) is a protocol used for -network management. The NET-SNMP project includes various SNMP tools: -an extensible agent, an SNMP library, tools for requesting or setting -information from SNMP agents, tools for generating and handling SNMP -traps, a version of the netstat command which uses SNMP, and a Tk/Perl -mib browser. This package contains the snmpd and snmptrapd daemons, -documentation, etc. - -You will probably also want to install the net-snmp-utils package, -which contains NET-SNMP utilities. - - -Platform: UNKNOWN diff --git a/base/net-snmp/centos/build_srpm.data b/base/net-snmp/centos/build_srpm.data deleted file mode 100644 index 22c8f12b3..000000000 --- a/base/net-snmp/centos/build_srpm.data +++ /dev/null @@ -1,2 +0,0 @@ -TIS_PATCH_VER=PKG_GITREVCOUNT -BUILD_IS_SLOW=3 diff --git a/base/net-snmp/centos/meta_patches/0001-Update-package-versioning-for-TIS-format.patch b/base/net-snmp/centos/meta_patches/0001-Update-package-versioning-for-TIS-format.patch deleted file mode 100644 index 408b7e8d4..000000000 --- a/base/net-snmp/centos/meta_patches/0001-Update-package-versioning-for-TIS-format.patch +++ /dev/null @@ -1,25 +0,0 @@ -From c25a30b4a0c7347234c2af4afab099b5735bbf71 Mon Sep 17 00:00:00 2001 -From: Scott Little -Date: Mon, 2 Oct 2017 17:05:59 -0400 -Subject: [PATCH] WRS: 0001-Update-package-versioning-for-TIS-format.patch - ---- - SPECS/net-snmp.spec | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/SPECS/net-snmp.spec b/SPECS/net-snmp.spec -index a59db4f..8a24ba1 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: 37%{?dist} -+Release: 37.el7%{?_tis_dist}.%{tis_patch_ver} - Epoch: 1 - - License: BSD --- -2.7.4 - diff --git a/base/net-snmp/centos/meta_patches/PATCH_ORDER b/base/net-snmp/centos/meta_patches/PATCH_ORDER deleted file mode 100644 index a34eb1eca..000000000 --- a/base/net-snmp/centos/meta_patches/PATCH_ORDER +++ /dev/null @@ -1,2 +0,0 @@ -0001-Update-package-versioning-for-TIS-format.patch -spec-build-configure-changes.patch diff --git a/base/net-snmp/centos/meta_patches/spec-build-configure-changes.patch b/base/net-snmp/centos/meta_patches/spec-build-configure-changes.patch deleted file mode 100644 index 1182249a2..000000000 --- a/base/net-snmp/centos/meta_patches/spec-build-configure-changes.patch +++ /dev/null @@ -1,39 +0,0 @@ -diff --git a/SPECS/net-snmp.spec b/SPECS/net-snmp.spec -index 8a24ba1..40af31f 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' -@@ -339,7 +342,7 @@ rm testing/fulltests/default/T200* - %endif - - %build --MIBS="host agentx smux \ -+MIBS="agentx smux \ - ucd-snmp/diskio tcp-mib udp-mib mibII/mta_sendmail \ - ip-mib/ipv4InterfaceTable ip-mib/ipv6InterfaceTable \ - ip-mib/ipAddressPrefixTable/ipAddressPrefixTable \ -@@ -360,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" \ -+ --with-out-mib-modules=host \ - %if %{netsnmp_tcp_wrappers} - --with-libwrap=yes \ - %endif -@@ -378,6 +382,7 @@ MIBS="$MIBS ucd-snmp/lmsensorsMib" - --with-security-modules=tsm \ - --with-mysql \ - --with-systemd \ -+ --without-nl \ - --with-sys-contact="root@localhost" <