Author: qboosh Date: Fri Mar 25 15:42:17 2011 GMT
Module: packages Tag: HEAD
---- Log message:
- updated to 1.33 (2.6.38 support); only userspace build-tested
- updated kernelrelease patch
---- Files affected:
packages/xtables-addons:
kernelrelease.patch (1.7 -> 1.8) , xtables-addons.spec (1.97 -> 1.98)
---- Diffs:
================================================================
Index: packages/xtables-addons/kernelrelease.patch
diff -u packages/xtables-addons/kernelrelease.patch:1.7
packages/xtables-addons/kernelrelease.patch:1.8
--- packages/xtables-addons/kernelrelease.patch:1.7 Mon Feb 7 21:25:59 2011
+++ packages/xtables-addons/kernelrelease.patch Fri Mar 25 16:42:11 2011
@@ -1,6 +1,6 @@
---- xtables-addons-1.32/configure.ac.orig 2011-01-04 04:37:58.000000000
+0100
-+++ xtables-addons-1.32/configure.ac 2011-02-07 20:26:34.200686361 +0100
-@@ -40,47 +40,6 @@
+--- 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 @@
-Wmissing-prototypes -Wredundant-decls -Wshadow -Wstrict-prototypes \
-Winline -pipe";
@@ -13,35 +13,37 @@
- # 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" 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 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;
+-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" -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;
-fi;
-
================================================================
Index: packages/xtables-addons/xtables-addons.spec
diff -u packages/xtables-addons/xtables-addons.spec:1.97
packages/xtables-addons/xtables-addons.spec:1.98
--- packages/xtables-addons/xtables-addons.spec:1.97 Thu Mar 24 01:24:56 2011
+++ packages/xtables-addons/xtables-addons.spec Fri Mar 25 16:42:12 2011
@@ -16,16 +16,16 @@
%define _enable_debug_packages 0
%endif
-%define rel 7
+%define rel 1
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.32
+Version: 1.33
Release: %{rel}
License: GPL v2
Group: Networking/Admin
Source0:
http://downloads.sourceforge.net/xtables-addons/%{name}-%{version}.tar.xz
-# Source0-md5: 978a04e3e532ef0414ae1dd6a405304d
+# Source0-md5: db80618d505bf7a5b9d576d83e3f0f80
Patch0: kernelrelease.patch
URL: http://xtables-addons.sourceforge.net/
BuildRequires: autoconf >= 2.50
@@ -172,6 +172,10 @@
All persons listed below can be reached at <cvs_login>@pld-linux.org
$Log$
+Revision 1.98 2011/03/25 15:42:12 qboosh
+- updated to 1.33 (2.6.38 support); only userspace build-tested
+- updated kernelrelease patch
+
Revision 1.97 2011/03/24 00:24:56 arekm
- release 7
================================================================
---- CVS-web:
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/xtables-addons/kernelrelease.patch?r1=1.7&r2=1.8&f=u
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/xtables-addons/xtables-addons.spec?r1=1.97&r2=1.98&f=u
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
