From 032a554b7c987e8c870bbcb702089d566e044fd2db1905166af70eaf917c421e Mon Sep 17 00:00:00 2001 From: Jan Engelhardt Date: Fri, 6 Sep 2019 09:02:15 +0000 Subject: [PATCH 1/2] - Update to release 3.4 OBS-URL: https://build.opensuse.org/package/show/security:netfilter/xtables-addons?expand=0&rev=130 --- remove_flags.patch | 24 ------------------------ xtables-addons-3.3.tar.asc | 16 ---------------- xtables-addons-3.3.tar.xz | 3 --- xtables-addons-3.4.tar.asc | 16 ++++++++++++++++ xtables-addons-3.4.tar.xz | 3 +++ xtables-addons.changes | 7 +++++++ xtables-addons.spec | 12 ++++-------- 7 files changed, 30 insertions(+), 51 deletions(-) delete mode 100644 remove_flags.patch delete mode 100644 xtables-addons-3.3.tar.asc delete mode 100644 xtables-addons-3.3.tar.xz create mode 100644 xtables-addons-3.4.tar.asc create mode 100644 xtables-addons-3.4.tar.xz diff --git a/remove_flags.patch b/remove_flags.patch deleted file mode 100644 index 687cee0..0000000 --- a/remove_flags.patch +++ /dev/null @@ -1,24 +0,0 @@ ---- xtables-addons-3.3/extensions/pknock/xt_pknock.c 2019-03-07 10:24:08.000000000 +0100 -+++ xtables-addons-3.3/extensions/pknock/xt_pknock.c 2019-08-03 12:03:23.853137954 +0200 -@@ -1125,7 +1125,9 @@ static int __init xt_pknock_mt_init(void - - crypto.size = crypto_shash_digestsize(crypto.tfm); - crypto.desc.tfm = crypto.tfm; -+#if LINUX_VERSION_CODE < KERNEL_VERSION(5, 2, 0) - crypto.desc.flags = 0; -+#endif - - pde = proc_mkdir("xt_pknock", init_net.proc_net); - if (pde == NULL) { ---- xtables-addons-3.3/extensions/xt_SYSRQ.c 2019-03-07 10:24:08.000000000 +0100 -+++ xtables-addons-3.3/extensions/xt_SYSRQ.c 2019-08-03 12:16:23.823303357 +0200 -@@ -114,7 +114,9 @@ static unsigned int sysrq_tg(const void - } - - desc.tfm = sysrq_tfm; -+#if LINUX_VERSION_CODE < KERNEL_VERSION(5, 2, 0) - desc.flags = 0; -+#endif - ret = crypto_shash_init(&desc); - if (ret != 0) - goto hash_fail; diff --git a/xtables-addons-3.3.tar.asc b/xtables-addons-3.3.tar.asc deleted file mode 100644 index 534191a..0000000 --- a/xtables-addons-3.3.tar.asc +++ /dev/null @@ -1,16 +0,0 @@ ------BEGIN PGP SIGNATURE----- - -iQIzBAABCgAdFiEEZ6M9qwrMkjBQqThHajkz2il9+30FAlyA43UACgkQajkz2il9 -+33ZYA//fc4A4CmoiThaIT0jNFPH3/qP99agxqjeto33CaGKFAUfgUlwDryDimru -9wG5HaQsjGPpGIGUX+llfqYWjyeZZBEcYR8wBKlqQ+QN4s9lJCqc+wmlre5TYp1m -M/Rbk2d5+267ozqZEllR3ItKn9P+ZPG8f7yGhvD3Eiij7Xhz5bRWgwO80C4yguTc -/UsSVF6NmC3q1aSWcay5JCJ2ra+tdyDDvlFas7u9N2xZ/iOS3ZaRK9XoOQGIyN56 -sRFiUs2Wrju4DeIc+ciZ8rYbqqDhNeXnXYn4a97YYrBhJEskbMj0DYvbvgoBWH9k -Ln5v7SmsnWF/A/9kl4SLHM3UCVwp9KtAVqzF1+i4RpO73EDxsBHbgQIMr5BSkVcL -jbutYGgBOMF5j5OPp6npLsCbknQU0nGchTpjIs79RQRIXzLdtVBWzi1M50m4wZ6M -TPA1MRVG2bG/X88/VYZbYJV1MkZwbPAWC30uABJdmHqPbU8IG4DhVMkoCDOu4ZNN -YDacdzvIJfM9BqOSKQhJ5TSWSN9dxnLcmJDumoC7tSrEFe5EJJ5Jw6JzDtbwk9cz -br3UQh5PPxv1alGsduaSpGSSQMPn7XOehLow0bzXII1Y9SLHQtntPbvq7iHYuFNE -MYIR47UMOn/oRKAzAIua8orSzkc83f21PoRxKoQ4fCvlswUGhFk= -=WKYL ------END PGP SIGNATURE----- diff --git a/xtables-addons-3.3.tar.xz b/xtables-addons-3.3.tar.xz deleted file mode 100644 index 331633c..0000000 --- a/xtables-addons-3.3.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:efa62c7df6cd3b82d7195105bf6fe177b605f91f3522e4114d2f4e0ad54320d6 -size 322676 diff --git a/xtables-addons-3.4.tar.asc b/xtables-addons-3.4.tar.asc new file mode 100644 index 0000000..26fdea9 --- /dev/null +++ b/xtables-addons-3.4.tar.asc @@ -0,0 +1,16 @@ +-----BEGIN PGP SIGNATURE----- + +iQIzBAABCgAdFiEEZ6M9qwrMkjBQqThHajkz2il9+30FAl1yHJsACgkQajkz2il9 ++33axRAAgnArmQ5d0QIa5ruJLynAOgbhyW0lA+OfCmvaqKjNCRZooLHSr7RQIibd +IJzVvKAJwEFecXF50LCoih7LktAMXzAJxMhQnQDEI8M5eE5S+HCgOKbWNrCG2YYJ +s4gf5PTWry+8+FbtcobCdRfSxNcy32b2ovUM/FhF6WaKpqdRtUszO67sMevvgqTm +x9F2RtGip4h0isTVHlQIUZ1bA1qo2WwnWB1yY94tAwxF+oKSrpqUS52KReK/T0Dw +D+ZV9k/tlY1T8+7R2oM+N7Z/0F5qppVGM2Ql9/wDVg/R2F+HPAE9DqQiKJXfCnpJ +8lRWSWy8RO5GBBJShW3y1NZlty6N7Zt4mjQmrce3vOCDLT9/WVby7ZXRzWY7Wsev +rTnMzI/r0C2cVgB2HeuFykWDKk+1jnLdlpUiGIOhj3z+gHXbii7qJgGRKEQEe6Ay +BsQ4QlxJG2t9E90VuUN1W9WnSiy1m4BCPpGHzUjMTyjUDn3AbtNOwYNlo1giOM8K +7PIZV2uJg/Nft4jzzPszken7Meg5oFqGxJe8+YwcJaxJcQPnZS9WHvLeP9ZtZZvb +ITFyHMQiv0xZFiUaVZ05z9JoGXoebfkdZkiE8Caityo78+Jpy8r8v/V73GaKUlv2 +pHdB2oQ+9Xs4kMc7sGCD9rkFiFeO//4CKEXNti/Lw/0PiQNie+k= +=ELhP +-----END PGP SIGNATURE----- diff --git a/xtables-addons-3.4.tar.xz b/xtables-addons-3.4.tar.xz new file mode 100644 index 0000000..b44dd3d --- /dev/null +++ b/xtables-addons-3.4.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:1152205156ceb4ea02307a361d7c4888f07eabc6bb844bd82e7ffab8d1ebd627 +size 325016 diff --git a/xtables-addons.changes b/xtables-addons.changes index c89149f..dc41ba4 100644 --- a/xtables-addons.changes +++ b/xtables-addons.changes @@ -1,3 +1,10 @@ +------------------------------------------------------------------- +Fri Sep 6 08:45:29 UTC 2019 - Jan Engelhardt + +- Update to release 3.4 + * Support for Linux 5.3 +- Drop remove_flags.patch + ------------------------------------------------------------------- Sun Aug 4 10:29:06 UTC 2019 - Arjen de Korte diff --git a/xtables-addons.spec b/xtables-addons.spec index 469330e..d3d5f01 100644 --- a/xtables-addons.spec +++ b/xtables-addons.spec @@ -17,12 +17,12 @@ Name: xtables-addons -Version: 3.3 +Version: 3.4 Release: 0 Summary: IP Packet Filter Administration Extensions License: GPL-2.0-only AND GPL-2.0-or-later Group: Productivity/Networking/Security -Url: http://xtables-addons.sf.net/ +URL: http://xtables-addons.sf.net/ #Git-Clone: git://xtables-addons.git.sf.net/gitroot/xtables-addons/xtables-addons #Git-Web: http://xtables-addons.git.sf.net/ @@ -30,8 +30,6 @@ Source: http://downloads.sf.net/%name/%name-%version.tar.xz Source2: http://downloads.sf.net/%name/%name-%version.tar.asc Source3: %name-preamble Source4: %name.keyring -Patch0: remove_flags.patch -BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRequires: %kernel_module_package_buildreqs BuildRequires: kernel-syms >= 4.15 BuildRequires: pkg-config >= 0.21 @@ -71,8 +69,7 @@ contains extensions that were not, or are not yet, accepted in the main kernel/iptables packages. %prep -%setup -q -%patch0 -p1 +%autosetup -p1 %build pushd ../ @@ -100,12 +97,11 @@ find "$b/%_libdir" -maxdepth 1 -type l -iname "*.so" -delete %postun -p /sbin/ldconfig %files -%defattr(-,root,root) %_mandir/man*/* %_sbindir/* %_libdir/*.so.* %xtlibdir/ %_libexecdir/xtables-addons/ -%doc LICENSE +%license LICENSE %changelog From 609d4694ee53c365a7a7f7ff1fb5dbd72fa3821b61c8c0b388eef77705c509f9 Mon Sep 17 00:00:00 2001 From: Jan Engelhardt Date: Tue, 10 Sep 2019 09:17:55 +0000 Subject: [PATCH 2/2] - Update to release 3.5 OBS-URL: https://build.opensuse.org/package/show/security:netfilter/xtables-addons?expand=0&rev=131 --- xtables-addons-3.4.tar.asc | 16 ---------------- xtables-addons-3.4.tar.xz | 3 --- xtables-addons-3.5.tar.asc | 16 ++++++++++++++++ xtables-addons-3.5.tar.xz | 3 +++ xtables-addons.changes | 7 +++++++ xtables-addons.spec | 2 +- 6 files changed, 27 insertions(+), 20 deletions(-) delete mode 100644 xtables-addons-3.4.tar.asc delete mode 100644 xtables-addons-3.4.tar.xz create mode 100644 xtables-addons-3.5.tar.asc create mode 100644 xtables-addons-3.5.tar.xz diff --git a/xtables-addons-3.4.tar.asc b/xtables-addons-3.4.tar.asc deleted file mode 100644 index 26fdea9..0000000 --- a/xtables-addons-3.4.tar.asc +++ /dev/null @@ -1,16 +0,0 @@ ------BEGIN PGP SIGNATURE----- - -iQIzBAABCgAdFiEEZ6M9qwrMkjBQqThHajkz2il9+30FAl1yHJsACgkQajkz2il9 -+33axRAAgnArmQ5d0QIa5ruJLynAOgbhyW0lA+OfCmvaqKjNCRZooLHSr7RQIibd -IJzVvKAJwEFecXF50LCoih7LktAMXzAJxMhQnQDEI8M5eE5S+HCgOKbWNrCG2YYJ -s4gf5PTWry+8+FbtcobCdRfSxNcy32b2ovUM/FhF6WaKpqdRtUszO67sMevvgqTm -x9F2RtGip4h0isTVHlQIUZ1bA1qo2WwnWB1yY94tAwxF+oKSrpqUS52KReK/T0Dw -D+ZV9k/tlY1T8+7R2oM+N7Z/0F5qppVGM2Ql9/wDVg/R2F+HPAE9DqQiKJXfCnpJ -8lRWSWy8RO5GBBJShW3y1NZlty6N7Zt4mjQmrce3vOCDLT9/WVby7ZXRzWY7Wsev -rTnMzI/r0C2cVgB2HeuFykWDKk+1jnLdlpUiGIOhj3z+gHXbii7qJgGRKEQEe6Ay -BsQ4QlxJG2t9E90VuUN1W9WnSiy1m4BCPpGHzUjMTyjUDn3AbtNOwYNlo1giOM8K -7PIZV2uJg/Nft4jzzPszken7Meg5oFqGxJe8+YwcJaxJcQPnZS9WHvLeP9ZtZZvb -ITFyHMQiv0xZFiUaVZ05z9JoGXoebfkdZkiE8Caityo78+Jpy8r8v/V73GaKUlv2 -pHdB2oQ+9Xs4kMc7sGCD9rkFiFeO//4CKEXNti/Lw/0PiQNie+k= -=ELhP ------END PGP SIGNATURE----- diff --git a/xtables-addons-3.4.tar.xz b/xtables-addons-3.4.tar.xz deleted file mode 100644 index b44dd3d..0000000 --- a/xtables-addons-3.4.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:1152205156ceb4ea02307a361d7c4888f07eabc6bb844bd82e7ffab8d1ebd627 -size 325016 diff --git a/xtables-addons-3.5.tar.asc b/xtables-addons-3.5.tar.asc new file mode 100644 index 0000000..c1b8fd6 --- /dev/null +++ b/xtables-addons-3.5.tar.asc @@ -0,0 +1,16 @@ +-----BEGIN PGP SIGNATURE----- + +iQIzBAABCgAdFiEEZ6M9qwrMkjBQqThHajkz2il9+30FAl13aX4ACgkQajkz2il9 ++332eg/8CcENSBFhmVxh5yVFGZbL4pGAIcbnsqFkaO1LyslDU4EXeLIHKE2Un27K +w8vCcofd9hHzekaDNIrVxjuPJbd6uJ4w+GqrDcmSo7jEbq+N2wvTtl/BjNzgUQN2 +kDKp01me8MD9PVzN9El8xufncA1Re8+ZGI63Y9I2DZbVTonOtn8gPWwkLC/0jES4 +mQDXymbvnAKHbByr4n2fSsaCFoCPy4IhX99m210gXHVaFzv3Y30AxsNMNrMfWFF5 +PebtMx0pCwEcJtQ+M8LhTFNe1aJp0Zf+k5a7sBS9xfDMqskYAKZvckrN0w19UcXq +ycNSm99cTjG0qYSNndVVC2B/iHZkaSZOkJvAYk12Efdm+LWfe0btIlAcWjmdut9v +AxlMMqEXIJxcFNUAwHrlXeHOwzFOoz3DyEGCRt9WmjlM3jvtENmx1r6InLp4ycZ3 +Ipdj0Sn8fMj8JWHteNreImGI69Kl3pr/GcDlBGfDEArYnJpIc4aSULHkdtiDQE6x +9G+OTO6sjvcocjzo8Hi+Ov2MHN88pHTqF/0rymNiqaEoW09eoeCdZo5hRuXE+D/T +fhhrarl2wDtUBIzb8n6gPOvNhnxvu8tXdFN6T9e/w7Eef2P8RYZGZUKV3CuuRcGp +P/GJOGNQ/5S283hMZ9S//TjntmJxT5Jn7oXxfGCPDW0UvYxNX4M= +=rwwK +-----END PGP SIGNATURE----- diff --git a/xtables-addons-3.5.tar.xz b/xtables-addons-3.5.tar.xz new file mode 100644 index 0000000..6bea2e0 --- /dev/null +++ b/xtables-addons-3.5.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:189ff57a0b8960969bd99141a6c79c345efa67e4461f450e2f162c9bd3d17da6 +size 325044 diff --git a/xtables-addons.changes b/xtables-addons.changes index dc41ba4..1371bbe 100644 --- a/xtables-addons.changes +++ b/xtables-addons.changes @@ -1,3 +1,10 @@ +------------------------------------------------------------------- +Tue Sep 10 09:14:53 UTC 2019 - Jan Engelhardt + +- Update to release 3.5 + * Make xt_DELUDE and xt_TARPIT work under Linux >= 5.0 + when used in conjunction with bridges. + ------------------------------------------------------------------- Fri Sep 6 08:45:29 UTC 2019 - Jan Engelhardt diff --git a/xtables-addons.spec b/xtables-addons.spec index d3d5f01..00515ea 100644 --- a/xtables-addons.spec +++ b/xtables-addons.spec @@ -17,7 +17,7 @@ Name: xtables-addons -Version: 3.4 +Version: 3.5 Release: 0 Summary: IP Packet Filter Administration Extensions License: GPL-2.0-only AND GPL-2.0-or-later