From cabaf9abc82a2a1962c6b53b7b5a165496e6babc Mon Sep 17 00:00:00 2001 From: slin14 Date: Fri, 28 Sep 2018 07:50:25 +0800 Subject: [PATCH] de-fuzz iptables patches 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: I9a7172154b286ec2873f2e4aa81412afc5859e57 Signed-off-by: slin14 --- .../meta_patches/0002-default-service-enabled.patch | 10 +++++----- .../meta_patches/spec-include-custom-rules.patch | 12 ++++++------ 2 files changed, 11 insertions(+), 11 deletions(-) diff --git a/networking/iptables/centos/meta_patches/0002-default-service-enabled.patch b/networking/iptables/centos/meta_patches/0002-default-service-enabled.patch index 34869386c..3ec6c8459 100644 --- a/networking/iptables/centos/meta_patches/0002-default-service-enabled.patch +++ b/networking/iptables/centos/meta_patches/0002-default-service-enabled.patch @@ -1,17 +1,17 @@ -From 48e4805ac9d088837bd639b06388dd34f0a6e0f1 Mon Sep 17 00:00:00 2001 +From ef71415934f45a6f8ce0c5b67b03e61ded784b63 Mon Sep 17 00:00:00 2001 From: Scott Little Date: Mon, 2 Oct 2017 16:15:33 -0400 -Subject: [PATCH 3/3] WRS: 0002-default-service-enabled.patch +Subject: WRS: 0002-default-service-enabled.patch --- SPECS/iptables.spec | 1 + 1 file changed, 1 insertion(+) diff --git a/SPECS/iptables.spec b/SPECS/iptables.spec -index 9d65fc7..9f59ede 100644 +index 0de8812..d83cf8c 100644 --- a/SPECS/iptables.spec +++ b/SPECS/iptables.spec -@@ -223,6 +223,7 @@ done +@@ -222,6 +222,7 @@ done %post services %systemd_post iptables.service ip6tables.service @@ -20,5 +20,5 @@ index 9d65fc7..9f59ede 100644 %preun services %systemd_preun iptables.service ip6tables.service -- -1.9.1 +2.7.4 diff --git a/networking/iptables/centos/meta_patches/spec-include-custom-rules.patch b/networking/iptables/centos/meta_patches/spec-include-custom-rules.patch index fc7c926b4..6db326aa8 100644 --- a/networking/iptables/centos/meta_patches/spec-include-custom-rules.patch +++ b/networking/iptables/centos/meta_patches/spec-include-custom-rules.patch @@ -1,14 +1,14 @@ -From 2c6bfc5f39203c8293f1db33804816c9d881ddde Mon Sep 17 00:00:00 2001 +From 5b16910e95db49953a82fa583d99a0ac255dca1b Mon Sep 17 00:00:00 2001 From: Scott Little Date: Mon, 2 Oct 2017 16:15:33 -0400 -Subject: [PATCH 1/3] WRS: spec-include-custom-rules.patch +Subject: WRS: spec-include-custom-rules.patch --- SPECS/iptables.spec | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/SPECS/iptables.spec b/SPECS/iptables.spec -index fc07a38..ddf75a0 100644 +index b3c208d..1bcfb4d 100644 --- a/SPECS/iptables.spec +++ b/SPECS/iptables.spec @@ -16,6 +16,11 @@ Source4: iptables.save-legacy @@ -23,7 +23,7 @@ index fc07a38..ddf75a0 100644 Patch1: iptables-1.4.21-rhbz_1054871.patch Patch2: iptables-1.4.21-libxt_cgroup.patch Patch3: iptables-1.4.21-wait_seconds.patch -@@ -76,8 +81,8 @@ Requires(post): systemd +@@ -74,8 +79,8 @@ Requires(post): systemd Requires(preun): systemd Requires(postun): systemd # provide and obsolete old main package @@ -34,7 +34,7 @@ index fc07a38..ddf75a0 100644 # provide and obsolete ipv6 sub package Provides: %{name}-ipv6 = 1.4.11.1 Obsoletes: %{name}-ipv6 < 1.4.11.1 -@@ -179,6 +184,10 @@ sed -e 's;iptables.init;ip6tables.init;g' -e 's;IPTABLES;IP6TABLES;g' < %{buildr +@@ -178,6 +183,10 @@ sed -e 's;iptables.init;ip6tables.init;g' -e 's;IPTABLES;IP6TABLES;g' < %{buildr install -c -m 755 ip6tabes.save-legacy %{buildroot}/%{legacy_actions}/ip6tables/save install -c -m 755 ip6tabes.panic-legacy %{buildroot}/%{legacy_actions}/ip6tables/panic @@ -46,5 +46,5 @@ index fc07a38..ddf75a0 100644 %pre for p in %{_sysconfdir}/alternatives/iptables.*; do -- -1.9.1 +2.7.4