Hello community, here is the log from the commit of package xtables-addons for openSUSE:Factory checked in at 2018-02-06 16:49:37 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/xtables-addons (Old) and /work/SRC/openSUSE:Factory/.xtables-addons.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "xtables-addons" Tue Feb 6 16:49:37 2018 rev:55 rq:573172 version:2.14 Changes: -------- --- /work/SRC/openSUSE:Factory/xtables-addons/xtables-addons.changes 2017-11-23 09:45:00.831201008 +0100 +++ /work/SRC/openSUSE:Factory/.xtables-addons.new/xtables-addons.changes 2018-02-06 16:49:39.750641160 +0100 @@ -1,0 +2,6 @@ +Mon Feb 5 17:55:51 UTC 2018 - [email protected] + +- Backport from upstream + * Support for Linux 4.15 (add init_timer.patch) + +------------------------------------------------------------------- New: ---- init_timer.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ xtables-addons.spec ++++++ --- /var/tmp/diff_new_pack.BzW94e/_old 2018-02-06 16:49:40.594601671 +0100 +++ /var/tmp/diff_new_pack.BzW94e/_new 2018-02-06 16:49:40.598601483 +0100 @@ -1,7 +1,7 @@ # # spec file for package xtables-addons # -# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2018 SUSE LINUX GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -30,6 +30,7 @@ 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 @@ -66,6 +67,7 @@ %prep %setup -q +%patch -p1 %build pushd ../ ++++++ init_timer.patch ++++++ --- 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);
