1
0
Jan Engelhardt 2019-09-06 09:02:15 +00:00 committed by Git OBS Bridge
parent 5ddec3de5b
commit 032a554b7c
7 changed files with 30 additions and 51 deletions

View File

@ -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;

View File

@ -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-----

View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:efa62c7df6cd3b82d7195105bf6fe177b605f91f3522e4114d2f4e0ad54320d6
size 322676

View File

@ -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-----

View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:1152205156ceb4ea02307a361d7c4888f07eabc6bb844bd82e7ffab8d1ebd627
size 325016

View File

@ -1,3 +1,10 @@
-------------------------------------------------------------------
Fri Sep 6 08:45:29 UTC 2019 - Jan Engelhardt <jengelh@inai.de>
- 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 <suse+build@de-korte.org> Sun Aug 4 10:29:06 UTC 2019 - Arjen de Korte <suse+build@de-korte.org>

View File

@ -17,12 +17,12 @@
Name: xtables-addons Name: xtables-addons
Version: 3.3 Version: 3.4
Release: 0 Release: 0
Summary: IP Packet Filter Administration Extensions Summary: IP Packet Filter Administration Extensions
License: GPL-2.0-only AND GPL-2.0-or-later License: GPL-2.0-only AND GPL-2.0-or-later
Group: Productivity/Networking/Security 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-Clone: git://xtables-addons.git.sf.net/gitroot/xtables-addons/xtables-addons
#Git-Web: http://xtables-addons.git.sf.net/ #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 Source2: http://downloads.sf.net/%name/%name-%version.tar.asc
Source3: %name-preamble Source3: %name-preamble
Source4: %name.keyring Source4: %name.keyring
Patch0: remove_flags.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-build
BuildRequires: %kernel_module_package_buildreqs BuildRequires: %kernel_module_package_buildreqs
BuildRequires: kernel-syms >= 4.15 BuildRequires: kernel-syms >= 4.15
BuildRequires: pkg-config >= 0.21 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. main kernel/iptables packages.
%prep %prep
%setup -q %autosetup -p1
%patch0 -p1
%build %build
pushd ../ pushd ../
@ -100,12 +97,11 @@ find "$b/%_libdir" -maxdepth 1 -type l -iname "*.so" -delete
%postun -p /sbin/ldconfig %postun -p /sbin/ldconfig
%files %files
%defattr(-,root,root)
%_mandir/man*/* %_mandir/man*/*
%_sbindir/* %_sbindir/*
%_libdir/*.so.* %_libdir/*.so.*
%xtlibdir/ %xtlibdir/
%_libexecdir/xtables-addons/ %_libexecdir/xtables-addons/
%doc LICENSE %license LICENSE
%changelog %changelog