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

[qboosh]

Author: qboosh                       Date: Mon Feb  7 20:26:04 2011 GMT
Module: packages                      Tag: HEAD
---- Log message:
- up to 1.32; only userspace build-tested

---- Files affected:
packages/xtables-addons:
   kernelrelease.patch (1.6 -> 1.7) , xtables-addons.spec (1.90 -> 1.91) 

---- Diffs:

================================================================
Index: packages/xtables-addons/kernelrelease.patch
diff -u packages/xtables-addons/kernelrelease.patch:1.6 packages/xtables-addons/kernelrelease.patch:1.7
--- packages/xtables-addons/kernelrelease.patch:1.6	Thu Dec  2 22:16:05 2010
+++ packages/xtables-addons/kernelrelease.patch	Mon Feb  7 21:25:59 2011
@@ -1,8 +1,8 @@
---- 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";
+--- 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 @@
+ 	-Wmissing-prototypes -Wredundant-decls -Wshadow -Wstrict-prototypes \
+ 	-Winline -pipe";
  
 -#
 -# check kernel version
@@ -14,21 +14,21 @@
 -	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%%.*}";
--krel="${krel#*.}";
--kminor="${krel%%.*}";
--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#*.}";
--	kstable="$(($kstable+0))";
--fi;
+-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
@@ -45,6 +45,6 @@
 -	fi;
 -fi;
 -
+ AC_SUBST([regular_CPPFLAGS])
  AC_SUBST([regular_CFLAGS])
  AC_SUBST([kbuilddir])
- AC_SUBST([xtlibdir])

================================================================
Index: packages/xtables-addons/xtables-addons.spec
diff -u packages/xtables-addons/xtables-addons.spec:1.90 packages/xtables-addons/xtables-addons.spec:1.91
--- packages/xtables-addons/xtables-addons.spec:1.90	Mon Feb  7 20:26:22 2011
+++ packages/xtables-addons/xtables-addons.spec	Mon Feb  7 21:25:59 2011
@@ -16,16 +16,16 @@
 %define		_enable_debug_packages	0
 %endif
 
-%define		rel	8
+%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.31
+Version:	1.32
 Release:	%{rel}
 License:	GPL v2
 Group:		Networking/Admin
 Source0:	http://downloads.sourceforge.net/xtables-addons/%{name}-%{version}.tar.xz
-# Source0-md5:	97ac895a67df67c28def98763023d51b
+# Source0-md5:	978a04e3e532ef0414ae1dd6a405304d
 Patch0:		kernelrelease.patch
 URL:		http://xtables-addons.sourceforge.net/
 BuildRequires:	autoconf >= 2.50
@@ -81,7 +81,7 @@
 %setup -q
 %patch0 -p1
 
-%{__sed} -i -e 's#build_ipset=m#build_ipset=n#' mconfig
+%{__sed} -i -e 's#build_ipset4=m#build_ipset4=#' mconfig
 
 %build
 %{__libtoolize}
@@ -90,7 +90,7 @@
 %{__autoheader}
 %{__automake}
 %configure \
-	--with-kbuild=no
+	--without-kbuild
 
 %if %{with kernel}
 srcdir=${PWD:-$(pwd)}
@@ -148,7 +148,7 @@
 %if %{with userspace}
 %files
 %defattr(644,root,root,755)
-%doc README
+%doc README doc/{README.psd,changelog.txt}
 %attr(755,root,root) %{_sbindir}/iptaccount
 %attr(755,root,root) %{_libdir}/libxt_ACCOUNT_cl.so.*.*.*
 %attr(755,root,root) %ghost %{_libdir}/libxt_ACCOUNT_cl.so.0
@@ -172,6 +172,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.91  2011/02/07 20:25:59  qboosh
+- up to 1.32; only userspace build-tested
+
 Revision 1.90  2011/02/07 19:26:22  qboosh
 - package README, updated descriptions
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/xtables-addons/kernelrelease.patch?r1=1.6&r2=1.7&f=u
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/xtables-addons/xtables-addons.spec?r1=1.90&r2=1.91&f=u