From 3d759b19ce785fbc0c54555533a3ca832b1a3f77 Mon Sep 17 00:00:00 2001 From: Jo-Philipp Wich Date: Fri, 10 Dec 2010 21:15:47 +0000 Subject: [PATCH] xtables-addons: r24433 or r24435 broke compilation - remove not applying kernel detect patch - depmod was still called, so fix 001-no_depmod.patch SVN-Revision: 24456 --- net/xtables-addons/Makefile | 2 +- .../patches/001-no_depmod.patch | 8 ++ .../patches/005-kernel_detect.patch | 101 ------------------ 3 files changed, 9 insertions(+), 102 deletions(-) delete mode 100644 net/xtables-addons/patches/005-kernel_detect.patch diff --git a/net/xtables-addons/Makefile b/net/xtables-addons/Makefile index 72e298b57..f329be748 100644 --- a/net/xtables-addons/Makefile +++ b/net/xtables-addons/Makefile @@ -106,7 +106,7 @@ $(eval $(call BuildTemplate,chaos,CHAOS,xt_CHAOS,xt_CHAOS,47,+kmod-ipt-compat-xt $(eval $(call BuildTemplate,condition,Condition,xt_condition,xt_condition,46,)) $(eval $(call BuildTemplate,delude,DELUDE,xt_DELUDE,xt_DELUDE,46,+kmod-ipt-compat-xtables)) $(eval $(call BuildTemplate,tarpit,TARPIT,xt_TARPIT,xt_TARPIT,46,+kmod-ipt-compat-xtables)) -$(eval $(call BuildTemplate,tee,TEE,xt_TEE,xt_TEE,46,+kmod-ipt-compat-xtables)) +#$(eval $(call BuildTemplate,tee,TEE,xt_TEE,xt_TEE,46,+kmod-ipt-compat-xtables)) $(eval $(call BuildTemplate,ipp2p,IPP2P,xt_ipp2p,xt_ipp2p,46,)) $(eval $(call BuildTemplate,rawpost,RAWPOST,,iptable_rawpost,46,+kmod-ipt-compat-xtables)) $(eval $(call BuildTemplate,rawnat,RAWNAT,xt_RAWDNAT xt_RAWSNAT,xt_RAWNAT,46,+kmod-ipt-compat-xtables)) diff --git a/net/xtables-addons/patches/001-no_depmod.patch b/net/xtables-addons/patches/001-no_depmod.patch index 08ba7b4d8..9a9938934 100644 --- a/net/xtables-addons/patches/001-no_depmod.patch +++ b/net/xtables-addons/patches/001-no_depmod.patch @@ -14,3 +14,11 @@ install-html: install-html-recursive install-html-am: +@@ -827,7 +826,6 @@ xtables-addons.8: FORCE + ${MAKE} -f Makefile.mans all; + + install-exec-hook: +- depmod -a || :; + + config.status: Makefile.iptrules.in + diff --git a/net/xtables-addons/patches/005-kernel_detect.patch b/net/xtables-addons/patches/005-kernel_detect.patch deleted file mode 100644 index a158960ac..000000000 --- a/net/xtables-addons/patches/005-kernel_detect.patch +++ /dev/null @@ -1,101 +0,0 @@ ---- xtables-addons-1.31/configure.ac.old 2010-12-06 16:34:40.566685991 +0100 -+++ xtables-addons-1.31/configure.ac 2010-12-06 16:35:29.978686360 +0100 -@@ -48,7 +48,6 @@ - # Well, just a warning. Maybe the admin updated the kernel. - echo "WARNING: This distribution's shipped kernel is not supported."; - fi; --AC_MSG_CHECKING([kernel version that we will build against]) - krel="$(make -sC ${kbuilddir} kernelrelease)"; - krel="${krel%%-*}"; - kmajor="${krel%%.*}"; -@@ -57,28 +56,22 @@ - krel="${krel#*.}"; - kmicro="${krel%%.*}"; - if test "$kmicro" = "$krel"; then -- kmicro="$(($kmicro+0))"; # Get rid of non numbers ("2.6.36+" -> "2.6.36") - kstable=0; - else -- kmicro="$(($kmicro+0))"; - kstable="${krel#*.}"; -- kstable="$(($kstable+0))"; --fi; --if test -z "$kmajor" -o -z "$kminor" -o -z "$kmicro"; then -- echo "WARNING: Version detection did not succeed. Continue at own luck."; --else -- echo "$kmajor.$kminor.$kmicro.$kstable in $kbuilddir"; -- if test "$kmajor" -gt 2 -o "$kminor" -gt 6 -o "$kmicro" -gt 36; then -- echo "WARNING: You are trying a newer kernel. Results may vary. :-)"; -- elif test \( "$kmajor" -lt 2 -o \ -- \( "$kmajor" -eq 2 -a "$kminor" -lt 6 \) -o \ -- \( "$kmajor" -eq 2 -a "$kminor" -eq 0 -a "$kmicro" -lt 17 \) -o \ -- \( "$kmajor" -eq 2 -a "$kminor" -eq 6 -a "$kmicro" -eq 18 -a \ -- "$kstable" -lt 5 \) \); then -- echo "ERROR: That kernel version is not supported. Please see INSTALL for minimum configuration."; -- exit 1; -+ if test -z "$kstable"; then -+ kstable=0; - fi; - fi; -+echo "Found kernel version $kmajor.$kminor.$kmicro.$kstable in $kbuilddir"; -+if test "$kmajor" -gt 2 -o "$kminor" -gt 6 -o "$kmicro" -gt 36; then -+ echo "WARNING: You are trying a newer kernel. Results may vary. :-)"; -+elif test \( "$kmajor" -lt 2 -o "$kminor" -lt 6 -o "$kmicro" -lt 17 \) -o \ -+ \( "$kmajor" -eq 2 -a "$kminor" -eq 6 -a "$kmicro" -eq 18 -a \ -+ "$kstable" -lt 5 \); then -+ echo "ERROR: That kernel version is not supported. Please see INSTALL for minimum configuration."; -+ exit 1; -+fi; - - AC_SUBST([regular_CFLAGS]) - AC_SUBST([kbuilddir]) ---- xtables-addons-1.31/configure.old 2010-12-06 16:54:55.450685329 +0100 -+++ xtables-addons-1.31/configure 2010-12-06 16:55:51.878685448 +0100 -@@ -10809,8 +10809,6 @@ - # Well, just a warning. Maybe the admin updated the kernel. - echo "WARNING: This distribution's shipped kernel is not supported."; - fi; --{ $as_echo "$as_me:${as_lineno-$LINENO}: checking kernel version that we will build against" >&5 --$as_echo_n "checking kernel version that we will build against... " >&6; } - krel="$(make -sC ${kbuilddir} kernelrelease)"; - krel="${krel%%-*}"; - kmajor="${krel%%.*}"; -@@ -10819,28 +10817,22 @@ - krel="${krel#*.}"; - kmicro="${krel%%.*}"; - if test "$kmicro" = "$krel"; then -- kmicro="$(($kmicro+0))"; # Get rid of non numbers ("2.6.36+" -> "2.6.36") - kstable=0; - else -- kmicro="$(($kmicro+0))"; - kstable="${krel#*.}"; -- kstable="$(($kstable+0))"; --fi; --if test -z "$kmajor" -o -z "$kminor" -o -z "$kmicro"; then -- echo "WARNING: Version detection did not succeed. Continue at own luck."; --else -- echo "$kmajor.$kminor.$kmicro.$kstable in $kbuilddir"; -- if test "$kmajor" -gt 2 -o "$kminor" -gt 6 -o "$kmicro" -gt 36; then -- echo "WARNING: You are trying a newer kernel. Results may vary. :-)"; -- elif test \( "$kmajor" -lt 2 -o \ -- \( "$kmajor" -eq 2 -a "$kminor" -lt 6 \) -o \ -- \( "$kmajor" -eq 2 -a "$kminor" -eq 0 -a "$kmicro" -lt 17 \) -o \ -- \( "$kmajor" -eq 2 -a "$kminor" -eq 6 -a "$kmicro" -eq 18 -a \ -- "$kstable" -lt 5 \) \); then -- echo "ERROR: That kernel version is not supported. Please see INSTALL for minimum configuration."; -- exit 1; -+ if test -z "$kstable"; then -+ kstable=0; - fi; - fi; -+echo "Found kernel version $kmajor.$kminor.$kmicro.$kstable in $kbuilddir"; -+if test "$kmajor" -gt 2 -o "$kminor" -gt 6 -o "$kmicro" -gt 36; then -+ echo "WARNING: You are trying a newer kernel. Results may vary. :-)"; -+elif test \( "$kmajor" -lt 2 -o "$kminor" -lt 6 -o "$kmicro" -lt 17 \) -o \ -+ \( "$kmajor" -eq 2 -a "$kminor" -eq 6 -a "$kmicro" -eq 18 -a \ -+ "$kstable" -lt 5 \); then -+ echo "ERROR: That kernel version is not supported. Please see INSTALL for minimum configuration."; -+ exit 1; -+fi; - - - -- 2.30.2