Author: gotar Date: Mon Nov 2 10:22:11 2009 GMT
Module: packages Tag: HEAD
---- Log message:
- upgraded to 1.18; 2.6.31 support
---- Files affected:
packages/xtables-addons:
kernelrelease.patch (1.1 -> 1.2) , xtables-addons.spec (1.36 -> 1.37)
---- Diffs:
================================================================
Index: packages/xtables-addons/kernelrelease.patch
diff -u packages/xtables-addons/kernelrelease.patch:1.1
packages/xtables-addons/kernelrelease.patch:1.2
--- packages/xtables-addons/kernelrelease.patch:1.1 Wed Jun 3 02:21:55 2009
+++ packages/xtables-addons/kernelrelease.patch Mon Nov 2 11:22:06 2009
@@ -1,6 +1,6 @@
---- xtables-addons-1.15/configure.ac~ 2009-04-30 18:58:23.000000000 +0000
-+++ xtables-addons-1.15/configure.ac 2009-06-03 00:16:46.747444821 +0000
-@@ -63,37 +63,6 @@ if [[ -n "$ksourcedir" ]]; then
+--- xtables-addons-1.18/configure.ac~ 2009-09-09 17:37:07.000000000 +0200
++++ xtables-addons-1.18/configure.ac 2009-11-02 11:19:36.000000000 +0100
+@@ -63,41 +63,6 @@
kinclude_CFLAGS="$kinclude_CFLAGS -I $ksourcedir/include";
fi;
@@ -20,13 +20,17 @@
-kminor="${krel%%.*}";
-krel="${krel#*.}";
-kmicro="${krel%%.*}";
--krel="${krel#*.}";
--kstable="${krel%%.*}";
--if test -z "$kstable"; then
+-krel2="${krel#*.}";
+-if test "$krel" = "$krel2"; then
- kstable=0;
+-else
+- kstable="${krel%%.*}";
+- if test -z "$kstable"; then
+- kstable=0;
+- fi;
-fi;
-echo "Found kernel version $kmajor.$kminor.$kmicro.$kstable in $kbuilddir";
--if test "$kmajor" -gt 2 -o "$kminor" -gt 6 -o "$kmicro" -gt 30; then
+-if test "$kmajor" -gt 2 -o "$kminor" -gt 6 -o "$kmicro" -gt 31; 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 \
================================================================
Index: packages/xtables-addons/xtables-addons.spec
diff -u packages/xtables-addons/xtables-addons.spec:1.36
packages/xtables-addons/xtables-addons.spec:1.37
--- packages/xtables-addons/xtables-addons.spec:1.36 Sun Nov 1 17:39:34 2009
+++ packages/xtables-addons/xtables-addons.spec Mon Nov 2 11:22:06 2009
@@ -20,7 +20,7 @@
%define _enable_debug_packages 0
%endif
-%define rel 4
+%define rel 1
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
@@ -28,12 +28,12 @@
Summary(uk.UTF-8): Утиліти для керування пакетними фільтрами ядра Linux
Summary(zh_CN.UTF-8): Linux内核包过滤管理工具
Name: xtables-addons
-Version: 1.17
+Version: 1.18
Release: %{rel}
License: GPL
Group: Networking/Admin
Source0:
http://dl.sourceforge.net/xtables-addons/%{name}-%{version}.tar.bz2
-# Source0-md5: eca2e3f4f4904814e3a301539876fae6
+# Source0-md5: 5a8d2edbf5a3470bba58d6a60c350805
URL: http://xtables-addons.sourceforge.net/
Patch0: %{name}-libs.patch
Patch1: %{name}-geoip-dbpath.patch
@@ -220,6 +220,9 @@
All persons listed below can be reached at <cvs_login>@pld-linux.org
$Log$
+Revision 1.37 2009/11/02 10:22:06 gotar
+- upgraded to 1.18; 2.6.31 support
+
Revision 1.36 2009/11/01 16:39:34 arekm
- release 4
================================================================
---- CVS-web:
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/xtables-addons/kernelrelease.patch?r1=1.1&r2=1.2&f=u
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/xtables-addons/xtables-addons.spec?r1=1.36&r2=1.37&f=u
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
