forked from pool/xtables-addons
Accepting request 575806 from security:netfilter
- Update to new upstream release 3.0 OBS-URL: https://build.opensuse.org/request/show/575806 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/xtables-addons?expand=0&rev=56
This commit is contained in:
Dominique Leuenberger
Git OBS Bridge
commit
2d09f700bf
@ -1,37 +0,0 @@
|
||||
--- a/extensions/pknock/xt_pknock.c
|
||||
+++ b/extensions/pknock/xt_pknock.c
|
||||
@@ -357,11 +357,18 @@
|
||||
*
|
||||
* @r: rule
|
||||
*/
|
||||
-static void
|
||||
-peer_gc(unsigned long r)
|
||||
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 15, 0)
|
||||
+static void peer_gc(struct timer_list *tl)
|
||||
+#else
|
||||
+static void peer_gc(unsigned long r)
|
||||
+#endif
|
||||
{
|
||||
unsigned int i;
|
||||
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 15, 0)
|
||||
+ struct xt_pknock_rule *rule = from_timer(rule, tl, timer);
|
||||
+#else
|
||||
struct xt_pknock_rule *rule = (struct xt_pknock_rule *)r;
|
||||
+#endif
|
||||
struct peer *peer;
|
||||
struct list_head *pos, *n;
|
||||
|
||||
@@ -469,9 +476,13 @@
|
||||
if (rule->peer_head == NULL)
|
||||
goto out;
|
||||
|
||||
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 15, 0)
|
||||
+ timer_setup(&rule->timer, peer_gc, 0);
|
||||
+#else
|
||||
init_timer(&rule->timer);
|
||||
rule->timer.function = peer_gc;
|
||||
rule->timer.data = (unsigned long)rule;
|
||||
+#endif
|
||||
|
||||
rule->status_proc = proc_create_data(info->rule_name, 0, pde,
|
||||
&pknock_proc_ops, rule);
|
||||
@ -1,16 +0,0 @@
|
||||
-----BEGIN PGP SIGNATURE-----
|
||||
|
||||
iQIzBAABCgAdFiEEZ6M9qwrMkjBQqThHajkz2il9+30FAloVthgACgkQajkz2il9
|
||||
+32Cdw/+KkFeUmZ9uNMah1DWBobfzmpMiVh4NTNSYxhnzMzDaikGLHxfFG79bh46
|
||||
1ZzCoytoMQb6dV8OD50XLHGHpkYstGNwcPVETZhqKvnmol0GGWmyuIgJHLgbbWTy
|
||||
9tOXuL1hrv4nN7qgRBsuL+dID+d6plEo8wCCSwuLELS1PhT5mL4JVLmKUEznFgno
|
||||
sNgum4vE5rxQGjHTZO1R9WRaEZhCYyTmCMTGw61VoCoPuN5pjv3qmjyeWfYoji6C
|
||||
/Dv/ToFq3mj2zoDe7uvEBat/AyXURjp/N4DciLIMXDcmLSmVlPugqMJKGbbvMj5o
|
||||
nb8qtde6v/tG2t7NkDIwBd8OjRp9xYenmxRR4vb26cJWswxy08l0vNEA9Fy24RDA
|
||||
eNj8xTvsYc4XpMt1AO79oIRjY98iWXQKl4Bmx7aVU5xuZ6d20FfhZRCnfoS0BLyo
|
||||
EBDX6cd6+iTsMXnjN12hpUvzu50P1g9EE6fRgf9tEggJzFpAeWbgz8TUXHzUmYDh
|
||||
fh0IskxW7pEHP90K9t/suUw1qZihU8mTUX+YzDv4hDObeY/KmjeVb57vn+Lv4UE+
|
||||
p8AOEMTVgms0t5d10o3GyEBcAsk/h9TBqn2sILwnJF5e944ASkVBCCTlD5jELADT
|
||||
F2Y2eB7Tdedgcu39qNtPbNg8NnwbvdRWchvF15fhy33HSUtYSjg=
|
||||
=ICMS
|
||||
-----END PGP SIGNATURE-----
|
||||
@ -1,3 +0,0 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:d215a9a8b8e66aae04b982fa2e1228e8a71e7dfe42320df99e34e5000cbdf152
|
||||
size 322296
|
||||
16
xtables-addons-3.0.tar.asc
Normal file
16
xtables-addons-3.0.tar.asc
Normal file
@ -0,0 +1,16 @@
|
||||
-----BEGIN PGP SIGNATURE-----
|
||||
|
||||
iQIzBAABCgAdFiEEZ6M9qwrMkjBQqThHajkz2il9+30FAlqBofcACgkQajkz2il9
|
||||
+30Ssg/9FozpsftA0sMpa5iz59ljq5EkUg4V1JXvPrIqiK0xVUOSztw0M+3qJoIH
|
||||
FAonfc/JkRDsG99nLWcqfQPe6cS3O0sbx3j01Ivgyof2ugaGLuypq64zaAqrk9nL
|
||||
5wwHbVYLApdjgtSffZV9Or5O3fy5SYrCGnETwf3D+DJoVc/QpsF03DKylkL7P7Zd
|
||||
loNdwXrnc+aAWP/JHdpvo/UQJOPbmWA8WrkdUcJ8bKoxsbPxr8nXE++e/0YIAAl+
|
||||
+x+VkdTj6iyC0AyoANrCLMBRJvu+KRvA4K3tJN6a7AEWqd8OeZ6AVT9F6MQdSb24
|
||||
6BdlyEgGLTsqQvSwFxYD383Ft1JQIQGjik/9Gjzg3DZ8O8q5T4xGj5ZnIj568McU
|
||||
lECx5McKqujWId4AJv6BOx/dUKy9qSdExl9kjy/Ce+LmFlTSsxIAj9wY0Imurqaf
|
||||
hNjrKXlIiaKBwyJdbl6n74GWzB4U0BXL0Uyb7nDB3HbCZZRgEWgrM2F3oZbuGO13
|
||||
cJPvy/yoT1SVPiJh9/7v8E61z6YOaOEeb2eb5iphLs8Gkx3FWMW8Wv2adrNX7/sL
|
||||
NYErnqe79VuN+9uhl6z9yXhxPg3yBHuRf7M/W71hrzpjTJSZc+TGKguzKZB17h9i
|
||||
ky9B7Pj4mkBQFmuPZK4BoGxGBZiKECb9hY0YgmG7rcRTtv/51Bw=
|
||||
=CsLM
|
||||
-----END PGP SIGNATURE-----
|
||||
3
xtables-addons-3.0.tar.xz
Normal file
3
xtables-addons-3.0.tar.xz
Normal file
@ -0,0 +1,3 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:95580b851c79c0bbc484e0d0ea23f53e5c7f439ad73d509e426598565392690d
|
||||
size 321960
|
||||
@ -1,3 +1,11 @@
|
||||
-------------------------------------------------------------------
|
||||
Mon Feb 12 14:18:55 UTC 2018 - jengelh@inai.de
|
||||
|
||||
- Update to new upstream release 3.0
|
||||
* Support for Linux 4.16
|
||||
* Dropped support for Linux kernels older than 4.15
|
||||
- Remove init_timer.patch
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Mon Feb 5 17:55:51 UTC 2018 - suse+build@de-korte.org
|
||||
|
||||
|
||||
@ -17,7 +17,7 @@
|
||||
|
||||
|
||||
Name: xtables-addons
|
||||
Version: 2.14
|
||||
Version: 3.0
|
||||
Release: 0
|
||||
Summary: IP Packet Filter Administration Extensions
|
||||
License: GPL-2.0 and GPL-2.0+
|
||||
@ -30,14 +30,12 @@ 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
|
||||
Patch: init_timer.patch
|
||||
|
||||
BuildRoot: %{_tmppath}/%{name}-%{version}-build
|
||||
BuildRequires: %kernel_module_package_buildreqs
|
||||
BuildRequires: kernel-syms >= 3.7
|
||||
BuildRequires: kernel-syms >= 4.15
|
||||
BuildRequires: pkg-config >= 0.21
|
||||
BuildRequires: xz
|
||||
BuildRequires: pkgconfig(xtables) >= 1.4.5
|
||||
BuildRequires: pkgconfig(xtables) >= 1.6.0
|
||||
Recommends: %name-kmp
|
||||
Recommends: xtables-geoip
|
||||
|
||||
@ -67,7 +65,6 @@ main kernel/iptables packages.
|
||||
|
||||
%prep
|
||||
%setup -q
|
||||
%patch -p1
|
||||
|
||||
%build
|
||||
pushd ../
|
||||
|
||||
Loading…
Reference in New Issue
Block a user