Author: arekm Date: Thu Dec 2 21:16:10 2010 GMT
Module: packages Tag: HEAD
---- Log message:
- rel 3
---- Files affected:
packages/xtables-addons:
kernelrelease.patch (1.5 -> 1.6) , xtables-addons.spec (1.82 -> 1.83)
---- Diffs:
================================================================
Index: packages/xtables-addons/kernelrelease.patch
diff -u packages/xtables-addons/kernelrelease.patch:1.5
packages/xtables-addons/kernelrelease.patch:1.6
--- packages/xtables-addons/kernelrelease.patch:1.5 Fri Oct 15 17:02:50 2010
+++ packages/xtables-addons/kernelrelease.patch Thu Dec 2 22:16:05 2010
@@ -1,10 +1,10 @@
-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 @@
+--- 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";
- #
+-#
-# check kernel version
-#
-if grep -q "CentOS release 5\." /etc/redhat-release 2>/dev/null ||
@@ -13,6 +13,7 @@
- # 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%%.*}";
@@ -21,23 +22,29 @@
-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#*.}";
-- if test -z "$kstable"; then
-- kstable=0;
-- fi;
+- kstable="$(($kstable+0))";
-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;
+-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;
+- fi;
-fi;
-
+-
AC_SUBST([regular_CFLAGS])
AC_SUBST([kbuilddir])
-Tylko w xtables-addons-1.30.new/: configure.ac~
+ AC_SUBST([xtlibdir])
================================================================
Index: packages/xtables-addons/xtables-addons.spec
diff -u packages/xtables-addons/xtables-addons.spec:1.82
packages/xtables-addons/xtables-addons.spec:1.83
--- packages/xtables-addons/xtables-addons.spec:1.82 Thu Dec 2 21:12:11 2010
+++ packages/xtables-addons/xtables-addons.spec Thu Dec 2 22:16:05 2010
@@ -19,7 +19,7 @@
%define _enable_debug_packages 0
%endif
-%define rel 2
+%define rel 3
Summary: Extensible packet filtering system && extensible NAT system
Summary(pl.UTF-8): System filtrowania pakietów oraz system translacji
adresów (NAT)
Summary(pt_BR.UTF-8): Ferramenta para controlar a filtragem de pacotes no
kernel-2.6.x
@@ -186,6 +186,9 @@
All persons listed below can be reached at <cvs_login>@pld-linux.org
$Log$
+Revision 1.83 2010/12/02 21:16:05 arekm
+- rel 3
+
Revision 1.82 2010/12/02 20:12:11 arekm
- release 2
================================================================
---- CVS-web:
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/xtables-addons/kernelrelease.patch?r1=1.5&r2=1.6&f=u
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/xtables-addons/xtables-addons.spec?r1=1.82&r2=1.83&f=u
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
