Merge "Uninstall SNMP RPM Host-Based from STX."

base/net-snmp/PKG-INFO

@@ -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

base/net-snmp/centos/build_srpm.data

@@ -1,2 +0,0 @@
-TIS_PATCH_VER=PKG_GITREVCOUNT
-BUILD_IS_SLOW=3

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

@@ -1,25 +0,0 @@
-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] 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
-

base/net-snmp/centos/meta_patches/PATCH_ORDER

@@ -1,2 +0,0 @@
-0001-Update-package-versioning-for-TIS-format.patch
-spec-build-configure-changes.patch

base/net-snmp/centos/meta_patches/spec-build-configure-changes.patch

@@ -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" <<EOF
- EOF
-
---
-1.8.3.1
-

base/net-snmp/centos/srpm_path

@@ -1 +0,0 @@
-mirror:Source/net-snmp-5.7.2-37.el7.src.rpm

centos_iso_image.inc

@@ -123,11 +123,6 @@ sudo
 
 # config files
 
-# net-snmp
-net-snmp-utils
-net-snmp-libs
-net-snmp-python
-
 # openldap
 openldap
 openldap-servers

centos_pkg_dirs

@@ -17,7 +17,6 @@ security/shim-signed
 base/sudo
 virt/cloud-init
 base/watchdog
-base/net-snmp
 ldap/openldap
 networking/openvswitch
 base/libevent

centos_srpms_centos.lst

@@ -10,7 +10,6 @@ initscripts-9.49.46-1.el7.src.rpm
 libevent-2.0.21-4.el7.src.rpm
 lighttpd-1.4.54-1.el7.src.rpm
 logrotate-3.8.6-17.el7.src.rpm
-net-snmp-5.7.2-37.el7.src.rpm
 net-tools-2.0-0.24.20131004git.el7.src.rpm
 ntp-4.2.6p5-29.el7.centos.src.rpm
 openldap-2.4.44-20.el7.src.rpm

networking/lldpd/centos/lldpd.spec

@@ -13,7 +13,9 @@
 %bcond_without dot1
 %bcond_without dot3
 %bcond_without custom
-%bcond_without snmp
+# This has been conditionally removed since starlingx host code no longer
+# manages or uses net-snmp because it's now containerized.
+%bcond_with snmp
 %bcond_with json
 
 # On RHEL <= 6, compile with oldies