From e9bf51ed6375817606dd4bc909dc69836a40bfbe Mon Sep 17 00:00:00 2001
From: Eric Garver <eric@garver.life>
Date: Fri, 7 Jun 2019 14:09:01 -0400
Subject: [PATCH] rebase to v0.6.4

---
 .gitignore                                     |  1 +
 ...-patch-to-default-to-iptables-backend.patch | 18 ++++++++++--------
 firewalld.spec                                 | 11 ++++++++---
 sources                                        |  2 +-
 4 files changed, 20 insertions(+), 12 deletions(-)

diff --git a/.gitignore b/.gitignore
index 867bae3..cc71f83 100644
--- a/.gitignore
+++ b/.gitignore
@@ -53,3 +53,4 @@
 /firewalld-0.6.1.tar.gz
 /firewalld-0.6.2.tar.gz
 /firewalld-0.6.3.tar.gz
+/firewalld-0.6.4.tar.gz
diff --git a/0001-fedora-patch-to-default-to-iptables-backend.patch b/0001-fedora-patch-to-default-to-iptables-backend.patch
index d33324d..d26f752 100644
--- a/0001-fedora-patch-to-default-to-iptables-backend.patch
+++ b/0001-fedora-patch-to-default-to-iptables-backend.patch
@@ -1,4 +1,4 @@
-From a628d6e3a710fb8379cf2fb319cdafc06dd2dad6 Mon Sep 17 00:00:00 2001
+From f706135269a84458b839f940d571c2a52e3c1fe6 Mon Sep 17 00:00:00 2001
 From: Eric Garver <e@erig.me>
 Date: Thu, 30 Aug 2018 16:34:19 -0400
 Subject: [PATCH] fedora patch to default to iptables backend
@@ -92,17 +92,19 @@ index 473210de10af..44e649111ffb 100644
  string "IPv6_rpfilter" : variant string "no"],[dnl
  string "IPv6_rpfilter" : variant string "yes"])
 diff --git a/src/tests/functions.at b/src/tests/functions.at
-index 3b79a9f31305..dd7b43d9dac6 100644
+index 6c0260766160..ddb9c4410b81 100644
 --- a/src/tests/functions.at
 +++ b/src/tests/functions.at
-@@ -65,13 +65,13 @@ m4_define([FWD_START_TEST], [
-     fi
- 
-     m4_ifdef([TESTING_FIREWALL_OFFLINE_CMD], [], [
+@@ -67,7 +67,7 @@ m4_define([FWD_START_TEST], [
+     m4_ifdef([TESTING_FIREWALL_OFFLINE_CMD], [
+         AT_KEYWORDS(offline)
+     ], [
 -        m4_define_default([FIREWALL_BACKEND], [nftables])
 +        m4_define_default([FIREWALL_BACKEND], [iptables])
  
-         dnl don't unload modules or bother cleaning up, the namespace will be deleted
+         AT_KEYWORDS(FIREWALL_BACKEND)
+ 
+@@ -75,7 +75,7 @@ m4_define([FWD_START_TEST], [
          AT_CHECK([sed -i 's/^CleanupOnExit.*/CleanupOnExit=no/' ./firewalld.conf])
  
          dnl set the appropriate backend
@@ -112,5 +114,5 @@ index 3b79a9f31305..dd7b43d9dac6 100644
          dnl fib matching is pretty new in nftables. Don't use rpfilter on older
          dnl kernels.
 -- 
-2.18.0
+2.20.1
 
diff --git a/firewalld.spec b/firewalld.spec
index 26a4cf5..287a010 100644
--- a/firewalld.spec
+++ b/firewalld.spec
@@ -1,7 +1,7 @@
 Summary: A firewall daemon with D-Bus interface providing a dynamic firewall
 Name: firewalld
-Version: 0.6.3
-Release: 2%{?dist}
+Version: 0.6.4
+Release: 1%{?dist}
 URL:     http://www.firewalld.org
 License: GPLv2+
 Source0: https://github.com/firewalld/firewalld/archive/v%{version}.tar.gz#/%{name}-%{version}.tar.gz
@@ -100,7 +100,6 @@ firewalld.
 
 %prep
 %autosetup -p1
-./autogen.sh
 
 %build
 %configure --enable-sysconfig --enable-rpmmacros PYTHON=%{__python3}
@@ -139,6 +138,9 @@ sed -i 's|^DefaultZone=.*|DefaultZone=FedoraWorkstation|g' \
 
 rm -f %{buildroot}%{_datadir}/polkit-1/actions/org.fedoraproject.FirewallD1.policy
 
+# remove file mistakenly added to upstream dist tarball
+rm -f %{buildroot}%{_datadir}/man/man1/firewallctl.1
+
 %find_lang %{name} --all-name
 
 %post
@@ -271,6 +273,9 @@ fi
 %{_mandir}/man1/firewall-config*.1*
 
 %changelog
+* Fri Jun 07 2019 Eric Garver <egarver@redhat.com> - 0.6.4-1
+- rebase package to v0.6.4
+
 * Thu Jan 31 2019 Fedora Release Engineering <releng@fedoraproject.org> - 0.6.3-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
 
diff --git a/sources b/sources
index 65a04a3..3cdf1d1 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (firewalld-0.6.3.tar.gz) = ea9e8bad34d3608257ef2a38851855974eff97b21dbab93ca3d8cfad90339734a8124447ed531a978b41546ab4040135bb61c8fdc9677ba0df9188d7ee4422ee
+SHA512 (firewalld-0.6.4.tar.gz) = 3908be450e56ca53766075805e6f52e2de74797f8232870fec4eb7177ae5baf025e879d494c47fbffa2f37fac533fa00d7b4ebe6d632b708c9a4ae9f2598d2c0