From f3bb64deb1f2c2337f48b202b6284b96c003b9d6 Mon Sep 17 00:00:00 2001
From: Phil Sutter <psutter@redhat.com>
Date: Fri, 13 Dec 2019 16:07:56 +0100
Subject: [PATCH 1/2] iptables-1.8.3-6

- Remove dependencies on initscripts package
---
 iptables.init | 18 ++++++++++++++++--
 iptables.spec |  5 ++++-
 2 files changed, 20 insertions(+), 3 deletions(-)

diff --git a/iptables.init b/iptables.init
index 8f74bb3..acb650c 100755
--- a/iptables.init
+++ b/iptables.init
@@ -18,8 +18,22 @@
 # Description: Start, stop and save iptables firewall
 ### END INIT INFO
 
-# Source function library.
-. /etc/init.d/functions
+# compat for removed initscripts dependency
+
+success() {
+       echo -n "[  OK  ]"
+       return 0
+}
+
+warning() {
+       echo -n "[WARNING]"
+       return 1
+}
+
+failure() {
+       echo -n "[FAILED]"
+       return 1
+}
 
 IPTABLES=iptables
 IPTABLES_DATA=/etc/sysconfig/$IPTABLES
diff --git a/iptables.spec b/iptables.spec
index 77da8ba..50a3ad4 100644
--- a/iptables.spec
+++ b/iptables.spec
@@ -19,7 +19,7 @@ Name: iptables
 Summary: Tools for managing Linux kernel packet filtering capabilities
 URL: http://www.netfilter.org/projects/iptables
 Version: 1.8.3
-Release: 5%{?dist}
+Release: 6%{?dist}
 Source: %{url}/files/%{name}-%{version}.tar.bz2
 Source1: iptables.init
 Source2: iptables-config
@@ -446,6 +446,9 @@ fi
 
 
 %changelog
+* Fri Dec 13 2019 Phil Sutter <psutter@redhat.com> - 1.8.3-6
+- Remove dependencies on initscripts package
+
 * Thu Jul 25 2019 Fedora Release Engineering <releng@fedoraproject.org> - 1.8.3-5
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
 

From 2403cc4b3c927e72c634481644de3f8720c67bb2 Mon Sep 17 00:00:00 2001
From: Phil Sutter <psutter@redhat.com>
Date: Thu, 19 Dec 2019 12:02:45 +0100
Subject: [PATCH 2/2] iptables-1.8.3-7

- Drop leftover include in arptables-nft-helper
---
 arptables-nft-helper | 16 ++++++++++++----
 iptables.spec        |  5 ++++-
 2 files changed, 16 insertions(+), 5 deletions(-)

diff --git a/arptables-nft-helper b/arptables-nft-helper
index 8bb0629..7380abf 100644
--- a/arptables-nft-helper
+++ b/arptables-nft-helper
@@ -1,11 +1,19 @@
 #!/bin/sh
-# config: /etc/sysconfig/arptables
-
-# Source 'em up
-. /etc/init.d/functions
 
 ARPTABLES_CONFIG=/etc/sysconfig/arptables
 
+# compat for removed initscripts dependency
+
+success() {
+	echo -n "[  OK  ]"
+	return 0
+}
+
+failure() {
+	echo -n "[FAILED]"
+	return 1
+}
+
 start() {
 	if [ ! -x /usr/sbin/arptables ]; then
 		exit 4
diff --git a/iptables.spec b/iptables.spec
index 50a3ad4..093f0ff 100644
--- a/iptables.spec
+++ b/iptables.spec
@@ -19,7 +19,7 @@ Name: iptables
 Summary: Tools for managing Linux kernel packet filtering capabilities
 URL: http://www.netfilter.org/projects/iptables
 Version: 1.8.3
-Release: 6%{?dist}
+Release: 7%{?dist}
 Source: %{url}/files/%{name}-%{version}.tar.bz2
 Source1: iptables.init
 Source2: iptables-config
@@ -446,6 +446,9 @@ fi
 
 
 %changelog
+* Thu Dec 19 2019 Phil Sutter <psutter@redhat.com> - 1.8.3-7
+- Drop leftover include in arptables-nft-helper
+
 * Fri Dec 13 2019 Phil Sutter <psutter@redhat.com> - 1.8.3-6
 - Remove dependencies on initscripts package