From e885bc71815e747cdf379970b1a499d285b01d353a1497e78e1a2cd6df9052cb Mon Sep 17 00:00:00 2001 From: Jan Engelhardt Date: Fri, 14 Jul 2023 11:58:26 +0000 Subject: [PATCH 1/5] - Update to release 1.0.8 OBS-URL: https://build.opensuse.org/package/show/security:netfilter/nftables?expand=0&rev=76 --- nftables-1.0.7.tar.xz | 3 --- nftables-1.0.7.tar.xz.sig | Bin 566 -> 0 bytes nftables-1.0.8.tar.xz | 3 +++ nftables-1.0.8.tar.xz.sig | Bin 0 -> 566 bytes nftables.changes | 16 ++++++++++++++++ nftables.spec | 2 +- 6 files changed, 20 insertions(+), 4 deletions(-) delete mode 100644 nftables-1.0.7.tar.xz delete mode 100644 nftables-1.0.7.tar.xz.sig create mode 100644 nftables-1.0.8.tar.xz create mode 100644 nftables-1.0.8.tar.xz.sig diff --git a/nftables-1.0.7.tar.xz b/nftables-1.0.7.tar.xz deleted file mode 100644 index d416892..0000000 --- a/nftables-1.0.7.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:c12ac941fff9adaedf17367d5ce213789b98a0d314277bc22b3d71e10891f412 -size 857140 diff --git a/nftables-1.0.7.tar.xz.sig b/nftables-1.0.7.tar.xz.sig deleted file mode 100644 index 1cf93d66846b8245f50db97d1b40e37c775404efe2e4919d2cea6cd7397f0c73..0000000000000000000000000000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 566 zcmV-60?GY}0y6{v0SW*e79j*T*<`H1NrA^z0Q;NOU6+cA6d>dU0%Q+Pt^f)N5Y=6m zii#8<ALh>Wjb-`OSet`L=kdlckhBmhB9 z*Aqae4RFccE@(Njuj)+UZWXO0^??+Yc8mPY^OR(kh$1tO0v38cJ;kDMkI;!B9Vj#h z&SBG_jfVZl*+(A;eUsEzaN8OsWyF}S!E=)>~qBrczeUF#}(|1+afQVIXC`v&fEH2aid3UT;N zGo~0M-B7d$olBfVKV&q}*fDaQ>vqhdr3+nM5@a-tfB~&kH&lD$_MSM=Vo#Ke)p%>n z6PD>Cf`+NMzCajz93a%mOkhpgHW1^|{-U=c!85H&M2NUrV(gN{7-t=aIlC$|*KHlm z$lvF6nwCgso&;%@8v2yyI(|=Gn_H;i`~EmS^^GibP@O}+*nu{V0osTWuSG2$q8SYjn)mzJ`FllmB8|l6&I6wWykV_4Y$#`dM|9p{-V}0(IRZ#sE*{Rf zfHFN~2|6*;!zfEGPdU0%WlzasUbm5Y=6m zii#8<3FZCF>rL90GT0_%fJH76iEOS{Kl z;qR29G08|*fvb0TXC2!ZkbJ>f_Q^DEAA&AIXkia<_>hY>Ee%k3i#YvN`^)+mD3z2K zGZg{XYWvJWRS+*BK>ea8M_CkkIA7mxSArOJ6MBAu4VI_`GU^w<^#9lNV}F8!5Lgus zGgRADJ^WQO2X0YUiQBr{om{agEQpjX%MmXVTu4N7iTCp9_8(ulB>$XGIxB}ay7Nz; z18gCFJX)W>zHDB$!{XTNf#DD?-@MBchk=fJX;)(1I?#sr+wK0_?p~8A&%@;?cuMp6 ze6!|@zCJvyT~A$YLp@+IM3%FORR#7Hheg)O#Gv|*n5klfb3-|tlQwr&vkHK{>ED!3 z1w){wipIidSzK_YJFz648Punl#koI8#&II^RB2@Ai|JVNDIb_d1y$Cdu_LvU3BNSS z9=KZ3HKKw{U}ZIC1x%tundq=Jg!hdX$vYmDi=o2{z>% literal 0 HcmV?d00001 diff --git a/nftables.changes b/nftables.changes index 68903a4..08982e2 100644 --- a/nftables.changes +++ b/nftables.changes @@ -1,3 +1,19 @@ +------------------------------------------------------------------- +Fri Jul 14 11:56:43 UTC 2023 - Jan Engelhardt + +- Update to release 1.0.8 + * Support for setting meta and ct mark from other fields in + rules, e.g. set meta mark to ip dscp header field. + * Enhacements for -o/--optimize to deal with NAT statements, to + compact masquerade statements. + * Support for stateful statements in anonymous maps, such as + counters. + * Support for resetting stateful expressions in sets, maps and + elements, e.g. counters. + * broute support to short-circuit bridge logic from the bridge + prerouting hook and pass up packets to the local IP stack. + * JSON support for table and chain comments. + ------------------------------------------------------------------- Mon Mar 13 20:47:53 UTC 2023 - Jan Engelhardt diff --git a/nftables.spec b/nftables.spec index 66ff863..1297d60 100644 --- a/nftables.spec +++ b/nftables.spec @@ -17,7 +17,7 @@ Name: nftables -Version: 1.0.7 +Version: 1.0.8 Release: 0 Summary: Userspace utility to access the nf_tables packet filter License: GPL-2.0-only From 1deed80818bbd43fd53868972d59b29a90c0966a74ea69271a5049b89e2aa1df Mon Sep 17 00:00:00 2001 From: Jan Engelhardt Date: Fri, 14 Jul 2023 12:10:09 +0000 Subject: [PATCH 2/5] dep fixup OBS-URL: https://build.opensuse.org/package/show/security:netfilter/nftables?expand=0&rev=77 --- nftables.spec | 1 + 1 file changed, 1 insertion(+) diff --git a/nftables.spec b/nftables.spec index 1297d60..93bc6fd 100644 --- a/nftables.spec +++ b/nftables.spec @@ -35,6 +35,7 @@ BuildRequires: gmp-devel BuildRequires: libtool BuildRequires: pkg-config >= 0.21 BuildRequires: python3-base +BuildRequires: python3-setuptools BuildRequires: pkgconfig(jansson) BuildRequires: pkgconfig(libedit) BuildRequires: pkgconfig(libmnl) >= 1.0.4 From e51d671d17903f96c7aed0ea308bd7b3f0bb64a67961865e108c2e0d10fd559c Mon Sep 17 00:00:00 2001 From: Jan Engelhardt Date: Sat, 15 Jul 2023 10:12:56 +0000 Subject: [PATCH 3/5] Bump required libnftnl OBS-URL: https://build.opensuse.org/package/show/security:netfilter/nftables?expand=0&rev=78 --- nftables.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nftables.spec b/nftables.spec index 93bc6fd..5f59fcb 100644 --- a/nftables.spec +++ b/nftables.spec @@ -39,7 +39,7 @@ BuildRequires: python3-setuptools BuildRequires: pkgconfig(jansson) BuildRequires: pkgconfig(libedit) BuildRequires: pkgconfig(libmnl) >= 1.0.4 -BuildRequires: pkgconfig(libnftnl) >= 1.2.5 +BuildRequires: pkgconfig(libnftnl) >= 1.2.6 BuildRequires: pkgconfig(xtables) >= 1.6.1 %description From 76b70398d139ce36deec55f0fdb1d892f173825f101fada8026eb647cc94c87c Mon Sep 17 00:00:00 2001 From: Jan Engelhardt Date: Mon, 24 Jul 2023 20:06:49 +0000 Subject: [PATCH 4/5] Add - 0001-Revert-py-replace-distutils-with-setuptools.patch OBS-URL: https://build.opensuse.org/package/show/security:netfilter/nftables?expand=0&rev=79 --- ...py-replace-distutils-with-setuptools.patch | 24 +++++++++++++++++++ nftables.changes | 1 + nftables.spec | 2 +- 3 files changed, 26 insertions(+), 1 deletion(-) create mode 100644 0001-Revert-py-replace-distutils-with-setuptools.patch diff --git a/0001-Revert-py-replace-distutils-with-setuptools.patch b/0001-Revert-py-replace-distutils-with-setuptools.patch new file mode 100644 index 0000000..915e3ed --- /dev/null +++ b/0001-Revert-py-replace-distutils-with-setuptools.patch @@ -0,0 +1,24 @@ +From 2125091e724c399d653790af854d9daba0218b99 Mon Sep 17 00:00:00 2001 +From: Jan Engelhardt +Date: Mon, 17 Jul 2023 12:13:05 +0200 +Subject: [PATCH] Revert "py: replace distutils with setuptools" + +This reverts commit 1acc2fd48c755a8931fa87b8d0560b750316059f. +--- + py/setup.py | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/py/setup.py b/py/setup.py +index 8ad73e7b..72fc8fd9 100755 +--- a/py/setup.py ++++ b/py/setup.py +@@ -1,5 +1,5 @@ + #!/usr/bin/env python +-from setuptools import setup ++from distutils.core import setup + from nftables import NFTABLES_VERSION + + setup(name='nftables', +-- +2.41.0 + diff --git a/nftables.changes b/nftables.changes index 08982e2..818a466 100644 --- a/nftables.changes +++ b/nftables.changes @@ -13,6 +13,7 @@ Fri Jul 14 11:56:43 UTC 2023 - Jan Engelhardt * broute support to short-circuit bridge logic from the bridge prerouting hook and pass up packets to the local IP stack. * JSON support for table and chain comments. +- 0001-Revert-py-replace-distutils-with-setuptools.patch ------------------------------------------------------------------- Mon Mar 13 20:47:53 UTC 2023 - Jan Engelhardt diff --git a/nftables.spec b/nftables.spec index 5f59fcb..2334328 100644 --- a/nftables.spec +++ b/nftables.spec @@ -28,6 +28,7 @@ URL: https://netfilter.org/projects/nftables/ Source: http://ftp.netfilter.org/pub/%name/%name-%version.tar.xz Source2: http://ftp.netfilter.org/pub/%name/%name-%version.tar.xz.sig Source3: %name.keyring +Patch1: 0001-Revert-py-replace-distutils-with-setuptools.patch BuildRequires: asciidoc BuildRequires: bison BuildRequires: flex @@ -35,7 +36,6 @@ BuildRequires: gmp-devel BuildRequires: libtool BuildRequires: pkg-config >= 0.21 BuildRequires: python3-base -BuildRequires: python3-setuptools BuildRequires: pkgconfig(jansson) BuildRequires: pkgconfig(libedit) BuildRequires: pkgconfig(libmnl) >= 1.0.4 From 34ac7985b3068df03c191c71c9a786bef5cdd79f1a9331b19127a37c28c561bf Mon Sep 17 00:00:00 2001 From: Jan Engelhardt Date: Tue, 25 Jul 2023 11:44:17 +0000 Subject: [PATCH 5/5] make our new bot happy OBS-URL: https://build.opensuse.org/package/show/security:netfilter/nftables?expand=0&rev=80 --- nftables.changes | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nftables.changes b/nftables.changes index 818a466..c042f13 100644 --- a/nftables.changes +++ b/nftables.changes @@ -13,7 +13,7 @@ Fri Jul 14 11:56:43 UTC 2023 - Jan Engelhardt * broute support to short-circuit bridge logic from the bridge prerouting hook and pass up packets to the local IP stack. * JSON support for table and chain comments. -- 0001-Revert-py-replace-distutils-with-setuptools.patch +- Added 0001-Revert-py-replace-distutils-with-setuptools.patch ------------------------------------------------------------------- Mon Mar 13 20:47:53 UTC 2023 - Jan Engelhardt