packages: xtables-addons/kernelrelease.patch, xtables-addons/xtables-addons...

[qboosh]

Author: qboosh                       Date: Fri May  6 18:05:14 2011 GMT
Module: packages                      Tag: HEAD
---- Log message:
- updated to 1.35

---- Files affected:
packages/xtables-addons:
   kernelrelease.patch (1.8 -> 1.9) , xtables-addons.spec (1.103 -> 1.104) 

---- Diffs:

================================================================
Index: packages/xtables-addons/kernelrelease.patch
diff -u packages/xtables-addons/kernelrelease.patch:1.8 packages/xtables-addons/kernelrelease.patch:1.9
--- packages/xtables-addons/kernelrelease.patch:1.8	Fri Mar 25 16:42:11 2011
+++ packages/xtables-addons/kernelrelease.patch	Fri May  6 20:05:09 2011
@@ -1,18 +1,9 @@
---- xtables-addons-1.33/configure.ac.orig	2011-02-02 05:21:56.000000000 +0100
-+++ xtables-addons-1.33/configure.ac	2011-03-25 16:15:47.004912129 +0100
-@@ -40,49 +40,6 @@
+--- 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;
 -if test -n "$kbuilddir"; then
 -	AC_MSG_CHECKING([kernel version that we will build against])
 -	krel="$(make -sC "$kbuilddir" M=. kernelrelease)";
@@ -36,13 +27,17 @@
 -		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. Please see INSTALL for minimum configuration.";
+-			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;

================================================================
Index: packages/xtables-addons/xtables-addons.spec
diff -u packages/xtables-addons/xtables-addons.spec:1.103 packages/xtables-addons/xtables-addons.spec:1.104
--- packages/xtables-addons/xtables-addons.spec:1.103	Fri Apr  8 06:57:57 2011
+++ packages/xtables-addons/xtables-addons.spec	Fri May  6 20:05:09 2011
@@ -20,12 +20,12 @@
 Summary:	Additional extensions for xtables packet filtering system
 Summary(pl.UTF-8):	Dodatkowe rozszerzenia do systemu filtrowania pakietów xtables
 Name:		xtables-addons
-Version:	1.33
+Version:	1.35
 Release:	%{rel}
 License:	GPL v2
 Group:		Networking/Admin
 Source0:	http://downloads.sourceforge.net/xtables-addons/%{name}-%{version}.tar.xz
-# Source0-md5:	db80618d505bf7a5b9d576d83e3f0f80
+# Source0-md5:	c2d8c972182945c5535c90e33992250c
 Patch0:		kernelrelease.patch
 URL:		http://xtables-addons.sourceforge.net/
 BuildRequires:	autoconf >= 2.50
@@ -172,6 +172,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.104  2011/05/06 18:05:09  qboosh
+- updated to 1.35
+
 Revision 1.103  2011/04/08 04:57:57  arekm
 - release 6
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/xtables-addons/kernelrelease.patch?r1=1.8&r2=1.9&f=u
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/xtables-addons/xtables-addons.spec?r1=1.103&r2=1.104&f=u