Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package xtables-addons for openSUSE:Factory checked in at 2021-03-19 16:43:36 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/xtables-addons (Old) and /work/SRC/openSUSE:Factory/.xtables-addons.new.2401 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "xtables-addons" Fri Mar 19 16:43:36 2021 rev:74 rq:880081 version:3.18 Changes: -------- --- /work/SRC/openSUSE:Factory/xtables-addons/xtables-addons.changes 2021-03-18 22:56:03.875602647 +0100 +++ /work/SRC/openSUSE:Factory/.xtables-addons.new.2401/xtables-addons.changes 2021-03-19 16:43:37.774149880 +0100 @@ -1,0 +2,5 @@ +Fri Mar 19 09:37:36 UTC 2021 - Jan Engelhardt <jeng...@inai.de> + +- Add sle-kernels.patch [boo#1183753] + +------------------------------------------------------------------- New: ---- sle-kernels.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ xtables-addons.spec ++++++ --- /var/tmp/diff_new_pack.t7UBNu/_old 2021-03-19 16:43:38.242150272 +0100 +++ /var/tmp/diff_new_pack.t7UBNu/_new 2021-03-19 16:43:38.242150272 +0100 @@ -29,8 +29,11 @@ Source2: https://inai.de/files/%name/%name-%version.tar.asc Source3: %name-preamble Source4: %name.keyring +Patch1: sle-kernels.patch BuildRequires: %kernel_module_package_buildreqs +BuildRequires: automake BuildRequires: kernel-syms >= 4.15 +BuildRequires: libtool BuildRequires: pkg-config >= 0.21 BuildRequires: xz BuildRequires: pkgconfig(xtables) >= 1.6.0 @@ -69,8 +72,13 @@ %prep %autosetup -p1 +autoreconf -fiv %build +%if 0%{?sle_version} == 150300 +export KCFLAGS="-DSLE_15_3" +echo "$KCFLAGS" >kcflags +%endif pushd ../ for flavor in %flavors_to_build; do cp -a "%name-%version" "%name-$flavor-%version" @@ -82,10 +90,12 @@ %install b="%buildroot" +# kernel's make install is picky about flags changing between %%build and %%install +export KCFLAGS="$(cat kcflags)" pushd ../ for flavor in %flavors_to_build; do pushd "%name-$flavor-%version/" - make %{?linux_make_arch} install DESTDIR="$b" + make %{?linux_make_arch} install DESTDIR="$b" V=1 popd done # There is no -devel package. So no need for these files. ++++++ sle-kernels.patch ++++++ From: Jan Engelhardt <jeng...@inai.de> Date: 2021-03-19 10:38:28.244573625 +0100 References: https://bugzilla.suse.com/show_bug.cgi?id=1183753 Workaround the SLE kernels misrepresenting themselves. --- extensions/xt_TARPIT.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) Index: xtables-addons-3.18/extensions/xt_TARPIT.c =================================================================== --- xtables-addons-3.18.orig/extensions/xt_TARPIT.c +++ xtables-addons-3.18/extensions/xt_TARPIT.c @@ -206,7 +206,7 @@ static void tarpit_tcp4(const struct xt_ return; /* This packet will not be the same as the other: clear nf fields */ -#if LINUX_VERSION_CODE >= KERNEL_VERSION(5, 4, 0) +#if LINUX_VERSION_CODE >= KERNEL_VERSION(5, 4, 0) || defined(SLE_15_3) nf_reset_ct(nskb); #else nf_reset(nskb); @@ -352,7 +352,7 @@ static void tarpit_tcp6(const struct xt_ } /* This packet will not be the same as the other: clear nf fields */ -#if LINUX_VERSION_CODE >= KERNEL_VERSION(5, 4, 0) +#if LINUX_VERSION_CODE >= KERNEL_VERSION(5, 4, 0) || defined(SLE_15_3) nf_reset_ct(nskb); #else nf_reset(nskb);
