From 3a91f4cfb40f8732ee643ef77fa235a58ae44995 Mon Sep 17 00:00:00 2001 From: slin14 Date: Tue, 14 Aug 2018 00:33:44 +0800 Subject: [PATCH] rebase iptables patch to CentOS7.5 Story: 2003389 Task: 24472 Change-Id: Ie7fa1821325295f1b5fadf85b5bb8edb4248fd3a Signed-off-by: slin14 --- ...01-Update-package-versioning-for-TIS-format.patch | 12 ++++++------ networking/iptables/centos/srpm_path | 2 +- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/networking/iptables/centos/meta_patches/0001-Update-package-versioning-for-TIS-format.patch b/networking/iptables/centos/meta_patches/0001-Update-package-versioning-for-TIS-format.patch index c8292cdea..9564f9450 100644 --- a/networking/iptables/centos/meta_patches/0001-Update-package-versioning-for-TIS-format.patch +++ b/networking/iptables/centos/meta_patches/0001-Update-package-versioning-for-TIS-format.patch @@ -1,7 +1,7 @@ -From d34bb2d38b4a62db5be32ddd901b1ebd6966165c Mon Sep 17 00:00:00 2001 +From a198eb6f0fe109511ebfd69bc5e21fe346cc9e31 Mon Sep 17 00:00:00 2001 From: Scott Little Date: Mon, 2 Oct 2017 16:15:33 -0400 -Subject: [PATCH 2/3] WRS: 0001-Update-package-versioning-for-TIS-format.patch +Subject: [PATCH] WRS: 0001-Update-package-versioning-for-TIS-format.patch Conflicts: SPECS/iptables.spec @@ -10,18 +10,18 @@ Conflicts: 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/SPECS/iptables.spec b/SPECS/iptables.spec -index ddf75a0..9d65fc7 100644 +index 1bcfb4d..0de8812 100644 --- a/SPECS/iptables.spec +++ b/SPECS/iptables.spec @@ -7,7 +7,7 @@ Name: iptables Summary: Tools for managing Linux kernel packet filtering capabilities Version: 1.4.21 --Release: 18.0.1%{?dist} -+Release: 18.0.1.el7%{?_tis_dist}.%{tis_patch_ver} +-Release: 24.1%{?dist} ++Release: 24.1.el7_5%{?_tis_dist}.%{tis_patch_ver} Source: http://www.netfilter.org/projects/iptables/files/%{name}-%{version}.tar.bz2 Source1: iptables.init Source2: iptables-config -- -1.9.1 +2.7.4 diff --git a/networking/iptables/centos/srpm_path b/networking/iptables/centos/srpm_path index d46cdfd76..f8e842f49 100644 --- a/networking/iptables/centos/srpm_path +++ b/networking/iptables/centos/srpm_path @@ -1 +1 @@ -mirror:Source/iptables-1.4.21-18.0.1.el7.centos.src.rpm +mirror:Source/iptables-1.4.21-24.1.el7_5.src.rpm