From e1cbd10bc38b1e04540a213b837f3680f368801a Mon Sep 17 00:00:00 2001
From: "Martin, Chen" <haochuan.z.chen@intel.com>
Date: Wed, 26 Dec 2018 19:20:41 +0800
Subject: [PATCH] rebase net-snmp patch to CentOS 7.6 version

Test:
Pass build and multi-node deploy test

Depends-On: https://review.openstack.org/627383

Story: 2004522
Task: 28406

Change-Id: If2654de0e3a5686d061cf1970b7454363f39c5b5
Signed-off-by: Martin, Chen <haochuan.z.chen@intel.com>
---
 .../0001-Update-package-versioning-for-TIS-format.patch   | 8 ++++----
 .../meta_patches/spec-build-configure-changes.patch       | 6 +++---
 base/net-snmp/centos/srpm_path                            | 2 +-
 3 files changed, 8 insertions(+), 8 deletions(-)

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
index d58305c20..408b7e8d4 100644
--- 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
@@ -15,11 +15,11 @@ index a59db4f..8a24ba1 100644
  Summary: A collection of SNMP protocol tools and libraries
  Name: net-snmp
  Version: 5.7.2
--Release: 33%{?dist}.2
-+Release: 33.el7_5.2%{?_tis_dist}.%{tis_patch_ver}
+-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/spec-build-configure-changes.patch b/base/net-snmp/centos/meta_patches/spec-build-configure-changes.patch
index 907539f8b..1182249a2 100644
--- a/base/net-snmp/centos/meta_patches/spec-build-configure-changes.patch
+++ b/base/net-snmp/centos/meta_patches/spec-build-configure-changes.patch
@@ -9,7 +9,7 @@ index 8a24ba1..40af31f 100644
  # 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'
-@@ -333,7 +336,7 @@ rm testing/fulltests/default/T200*
+@@ -339,7 +342,7 @@ rm testing/fulltests/default/T200*
  %endif
 
  %build
@@ -18,7 +18,7 @@ index 8a24ba1..40af31f 100644
       ucd-snmp/diskio tcp-mib udp-mib mibII/mta_sendmail \
       ip-mib/ipv4InterfaceTable ip-mib/ipv6InterfaceTable \
       ip-mib/ipAddressPrefixTable/ipAddressPrefixTable \
-@@ -354,6 +357,7 @@ MIBS="$MIBS ucd-snmp/lmsensorsMib"
+@@ -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" \
@@ -26,7 +26,7 @@ index 8a24ba1..40af31f 100644
  %if %{netsnmp_tcp_wrappers}
      --with-libwrap=yes \
  %endif
-@@ -372,6 +376,7 @@ MIBS="$MIBS ucd-snmp/lmsensorsMib"
+@@ -378,6 +382,7 @@ MIBS="$MIBS ucd-snmp/lmsensorsMib"
      --with-security-modules=tsm  \
      --with-mysql \
      --with-systemd \
diff --git a/base/net-snmp/centos/srpm_path b/base/net-snmp/centos/srpm_path
index fbb0692ce..4de7e4e99 100644
--- a/base/net-snmp/centos/srpm_path
+++ b/base/net-snmp/centos/srpm_path
@@ -1 +1 @@
-mirror:Source/net-snmp-5.7.2-33.el7_5.2.src.rpm
+mirror:Source/net-snmp-5.7.2-37.el7.src.rpm