- updated to 1.35

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

diff --git a/kernelrelease.patch b/kernelrelease.patch
index 36b6f3d3840bdd65cdbec5689f238e1c8fae9a60..ec496faec8c8ee843ec32dc61ab337f55e975c06 100644 (file)
--- a/kernelrelease.patch
+++ b/kernelrelease.patch
@@ -1,43 +1,47 @@
-diff -ur xtables-addons-1.30/configure.ac xtables-addons-1.30.new//configure.ac
---- xtables-addons-1.30/configure.ac   2010-10-02 00:41:47.000000000 +0200
-+++ xtables-addons-1.30.new//configure.ac      2010-10-15 16:59:31.936357030 +0200
-@@ -38,38 +38,6 @@
-       -I\${XA_TOPSRCDIR}/include";
+--- xtables-addons-1.35/configure.ac.orig      2011-04-11 18:37:32.000000000 +0200
++++ xtables-addons-1.35/configure.ac   2011-05-06 20:03:27.286191084 +0200
+@@ -40,44 +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;
--krel="$(make -sC ${kbuilddir} kernelrelease)";
--krel="${krel%%-*}";
--kmajor="${krel%%.*}";
--krel="${krel#*.}";
--kminor="${krel%%.*}";
--krel="${krel#*.}";
--kmicro="${krel%%.*}";
--if test "$kmicro" = "$krel"; then
--      kstable=0;
--else
--      kstable="${krel#*.}";
--      if test -z "$kstable"; then
--              kstable=0;
+-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))";
+-      krel="${krel:${#kmicro}}";
+-      krel="${krel#.}";
+-      kstable="${krel%%[[^0-9]]*}";
+-      kstable="$(($kstable+0))";
+-      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 38; then
+-                      echo "WARNING: You are trying a newer kernel. Results may vary. :-)";
+-              elif test "$kmajor" -eq 2 -a "$kminor" -eq 6 -a "$kmicro" -ge 29; then
+-                      :; # everything ok
+-              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 at all. Please see INSTALL for minimum configuration.";
+-                      exit 1;
+-              else
+-                      echo "WARNING: That kernel version has been recently deprecated for use with Xtables-addons). Compilation may fail.";
+-              fi;
 -      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_CPPFLAGS])
  AC_SUBST([regular_CFLAGS])
  AC_SUBST([kbuilddir])
-Tylko w xtables-addons-1.30.new/: configure.ac~