X-Git-Url: http://git.pld-linux.org/?a=blobdiff_plain;f=kernelrelease.patch;h=28d2531db741fb5ae0ba2986851a5c9238896361;hb=32aaedb1a1bccb42a062591e86f1160f88c5a849;hp=d5d27a75847ff15a0dda7de4c51bf8304bb2077b;hpb=8af0bca68b14a95b97e7467fe97fd6cc9071900b;p=packages%2Fxtables-addons.git

diff --git a/kernelrelease.patch b/kernelrelease.patch
index d5d27a7..28d2531 100644
--- a/kernelrelease.patch
+++ b/kernelrelease.patch
@@ -1,43 +1,42 @@
---- xtables-addons-1.25/configure.ac~	2010-04-26 15:12:03.000000000 +0300
-+++ xtables-addons-1.25/configure.ac	2010-04-27 09:56:25.995761262 +0300
-@@ -37,40 +37,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;
--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 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;
--echo "Found kernel version $kmajor.$kminor.$kmicro.$kstable in $kbuilddir";
--if test "$kmajor" -gt 2 -o "$kminor" -gt 6 -o "$kmicro" -gt 34; 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])
- AC_SUBST([xtlibdir])