nftables-1.0.4-1

- Review package dependencies
- Update to 1.0.4. Fixes rhbz#2056594

.gitignore

@@ -23,3 +23,4 @@
 /nftables-0.9.9.tar.bz2
 /nftables-1.0.0.tar.bz2
 /nftables-1.0.1.tar.bz2
+/nftables-1.0.4.tar.bz2

nftables.spec

@@ -1,6 +1,6 @@
 Name:           nftables
-Version:        1.0.1
-Release:        4%{?dist}
+Version:        1.0.4
+Release:        1%{?dist}
 # Upstream released a 0.100 version, then 0.4. Need Epoch to get back on track.
 Epoch:          1
 Summary:        Netfilter Tables userspace utilites
@@ -14,26 +14,20 @@ Source3:        main.nft
 Source4:        router.nft
 Source5:        nat.nft
 
-# already upstream at https://git.netfilter.org/nftables/commit/?id=8492878961248b4b53fa97383c7c1b15d7062947
-Patch1:         nftables-1.0.1-drop-historyh.patch
-# already upstream at https://git.netfilter.org/nftables/commit/?id=3847fccf004525ceb97db6fbc681835b0ac9a61a
-Patch2:         nftables-1.0.1-fix-terse.patch
-
 #BuildRequires: autogen
 #BuildRequires: autoconf
 #BuildRequires: automake
 #BuildRequires: libtool
 BuildRequires: make
-BuildRequires:  gcc
+BuildRequires: gcc
 BuildRequires: flex
 BuildRequires: bison
-BuildRequires: libmnl-devel
+BuildRequires: pkgconfig(libmnl) >= 1.0.4
 BuildRequires: gmp-devel
-BuildRequires: readline-devel
-BuildRequires: libnftnl-devel
+BuildRequires: pkgconfig(libnftnl) >= 1.2.2
 BuildRequires: systemd
 BuildRequires: asciidoc
-BuildRequires: iptables-devel
+BuildRequires: pkgconfig(xtables) >= 1.6.1
 BuildRequires: jansson-devel
 BuildRequires: python3-devel
 BuildRequires: readline-devel
@@ -131,6 +125,10 @@ sed -i -e 's/\(sofile=\)".*"/\1"'$sofile'"/' \
 %{python3_sitelib}/nftables/
 
 %changelog
+* Fri Jun 10 2022 Phil Sutter <psutter@redhat.com> - 1:1.0.4-1
+- Review package dependencies
+- Update to 1.0.4. Fixes rhbz#2056594
+
 * Tue Mar 08 2022 Phil Sutter <psutter@redhat.com> - 1:1.0.1-4
 - Prevent port-shadow attacks in sample nat config. Fixes rhbz#2061917
 

sources

@@ -1 +1 @@
-SHA512 (nftables-1.0.1.tar.bz2) = a0db4d82725509d2a9c638ba7ba55547ad7b5138a5fe686b0e90260d6a65e060dd72a470969c1d69e945303bd2bfc33b2021d9f4141b88befefddc61b7afe10d
+SHA512 (nftables-1.0.4.tar.bz2) = 7d96c791365d399b3b930a1f9d6c6aa4a8c2180c258bb5163d9d62ea4d094857e2ebb20fc3ef13b89f449f216d0a291d3bcf288704f1e3bd3ceb51b6cadf8215