From f0f8b14bb39e4145e0017077d2d05054bce3cd94e39b0e63842ffebd9d846ce4 Mon Sep 17 00:00:00 2001 From: Kristyna Streitova Date: Mon, 30 Sep 2019 17:58:09 +0000 Subject: [PATCH] Accepting request 734141 from home:kstreitova:branches:security:netfilter - Add Conflicts with iptables-nft = 1.6.2 as during the update to iptables 1.8 ip6tables-restore-translate, ip6tables-translate, iptables-restore-translate and iptables-translate were moved from iptables-nft subpackage (now iptables-backend-nft) to the main package. So we need to add a conflict here otherwise we hit file conflicts error during the update. OBS-URL: https://build.opensuse.org/request/show/734141 OBS-URL: https://build.opensuse.org/package/show/security:netfilter/iptables?expand=0&rev=134 --- iptables.changes | 10 ++++++++++ iptables.spec | 5 +++++ 2 files changed, 15 insertions(+) diff --git a/iptables.changes b/iptables.changes index fad14f8..77e1d3f 100644 --- a/iptables.changes +++ b/iptables.changes @@ -1,3 +1,13 @@ +------------------------------------------------------------------- +Mon Sep 30 13:21:38 UTC 2019 - Kristyna Streitova + +- Add Conflicts with iptables-nft = 1.6.2 as during the update to + iptables 1.8 ip6tables-restore-translate, ip6tables-translate, + iptables-restore-translate and iptables-translate were moved from + iptables-nft subpackage (now iptables-backend-nft) to the main + package. So we need to add a conflict here otherwise we hit file + conflicts error during the update. + ------------------------------------------------------------------- Fri Sep 6 10:19:25 UTC 2019 - Kristyna Streitova diff --git a/iptables.spec b/iptables.spec index 6e172e9..e0904df 100644 --- a/iptables.spec +++ b/iptables.spec @@ -48,6 +48,11 @@ Requires: netcfg >= 11.6 Requires: xtables-plugins = %version-%release Requires(post): update-alternatives Requires(postun): update-alternatives +# During the update to iptables 1.8, ip6tables-restore-translate, ip6tables-translate, +# iptables-restore-translate and iptables-translate were moved from iptables-nft subpackage +# (now iptables-backend-nft) to the main package so we need to add a conflict here otherwise +# we hit file conflicts error during the update +Conflicts: iptables-nft = 1.6.2 %description iptables is used to set up, maintain, and inspect the rule tables of