- updated to 1.36

[packages/xtables-addons.git] / kernelrelease.patch

diff --git a/kernelrelease.patch b/kernelrelease.patch
index ec7206991b70d77d151eb25276b0185cd5d236e7..28d2531db741fb5ae0ba2986851a5c9238896361 100644 (file)
--- a/kernelrelease.patch
+++ b/kernelrelease.patch
@@ -1,50 +1,42 @@
---- xtables-addons-1.31/configure.ac~  2010-12-02 22:13:08.366366978 +0100
-+++ xtables-addons-1.31/configure.ac   2010-12-02 22:14:14.780561896 +0100
-@@ -39,47 +39,6 @@
-       -Winline -pipe -DXTABLES_LIBDIR=\\\"\${xtlibdir}\\\" \
-       -I\${XA_TOPSRCDIR}/include";
+--- xtables-addons-1.36/configure.ac.orig      2011-06-03 16:45:29.000000000 +0200
++++ xtables-addons-1.36/configure.ac   2011-06-11 14:23:36.451762729 +0200
+@@ -40,39 +40,6 @@
+       -Wmissing-prototypes -Wredundant-decls -Wshadow -Wstrict-prototypes \
+       -Winline -pipe";
  
--#
--# check kernel version
--#
--if grep -q "CentOS release 5\." /etc/redhat-release 2>/dev/null ||
--    grep -q "Red Hat Enterprise Linux Server release 5" /etc/redhat-release 2>/dev/null; then
--      # しまった!
--      # 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%%.*}";
--krel="${krel#*.}";
--kminor="${krel%%.*}";
--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
+-if test -n "$kbuilddir"; then
+-      AC_MSG_CHECKING([kernel version that we will build against])
+-      krel="$(make -sC "$kbuilddir" M=. kernelrelease)";
+-      kmajor="${krel%%[[^0-9]]*}";
+-      kmajor="$(($kmajor+0))";
+-      krel="${krel:${#kmajor}}";
+-      krel="${krel#.}";
+-      kminor="${krel%%[[^0-9]]*}";
+-      kminor="$(($kminor+0))";
+-      krel="${krel:${#kminor}}";
+-      krel="${krel#.}";
+-      kmicro="${krel%%[[^0-9]]*}";
 -      kmicro="$(($kmicro+0))";
--      kstable="${krel#*.}";
+-      krel="${krel:${#kmicro}}";
+-      krel="${krel#.}";
+-      kstable="${krel%%[[^0-9]]*}";
 -      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 "$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 3 -o "$kmajor" -eq 3 -a "$kminor" -gt 1; then
+-                      echo "WARNING: You are trying a newer kernel. Results may vary. :-)";
+-              elif test "$kmajor" -eq 3; then
+-                      :;
+-              elif test "$kmajor" -eq 2 -a "$kminor" -ge 29; then
+-                      :;
+-              else
+-                      echo "WARNING: That kernel version is not supported.";
+-              fi;
 -      fi;
 -fi;
 -
+ AC_SUBST([regular_CPPFLAGS])
  AC_SUBST([regular_CFLAGS])
  AC_SUBST([kbuilddir])
- AC_SUBST([xtlibdir])