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

[arekm]

Author: arekm                        Date: Mon Jun  7 20:57:16 2010 GMT
Module: packages                      Tag: HEAD
---- Log message:
- up to 1.27

---- Files affected:
packages/xtables-addons:
   kernelrelease.patch (1.3 -> 1.4) , xtables-addons.spec (1.54 -> 1.55) 

---- Diffs:

================================================================
Index: packages/xtables-addons/kernelrelease.patch
diff -u packages/xtables-addons/kernelrelease.patch:1.3 packages/xtables-addons/kernelrelease.patch:1.4
--- packages/xtables-addons/kernelrelease.patch:1.3	Tue Apr 27 09:22:05 2010
+++ packages/xtables-addons/kernelrelease.patch	Mon Jun  7 22:57:11 2010
@@ -1,10 +1,9 @@
---- xtables-addons-1.25/configure.ac~	2010-04-26 15:12:03.000000000 +0300
-+++ xtables-addons-1.25/configure.ac	2010-04-27 09:56:25.995761262 +0300
-@@ -37,40 +37,6 @@
- 	-Winline -pipe -DXTABLES_LIBDIR=\\\"\${xtlibdir}\\\" \
+--- xtables-addons-1.27/configure.ac~	2010-05-16 22:19:02.000000000 +0200
++++ xtables-addons-1.27/configure.ac	2010-06-07 22:46:52.942325149 +0200
+@@ -38,38 +38,6 @@
  	-I\${XA_TOPSRCDIR}/include";
  
--#
+ #
 -# check kernel version
 -#
 -if grep -q "CentOS release 5\." /etc/redhat-release 2>/dev/null ||
@@ -29,7 +28,7 @@
 -	fi;
 -fi;
 -echo "Found kernel version $kmajor.$kminor.$kmicro.$kstable in $kbuilddir";
--if test "$kmajor" -gt 2 -o "$kminor" -gt 6 -o "$kmicro" -gt 34; then
+-if test "$kmajor" -gt 2 -o "$kminor" -gt 6 -o "$kmicro" -gt 35; 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 \
@@ -37,7 +36,6 @@
 -	echo "ERROR: That kernel version is not supported. Please see INSTALL for minimum configuration.";
 -	exit 1;
 -fi;
--
+ 
  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.54 packages/xtables-addons/xtables-addons.spec:1.55
--- packages/xtables-addons/xtables-addons.spec:1.54	Fri May 28 20:38:33 2010
+++ packages/xtables-addons/xtables-addons.spec	Mon Jun  7 22:57:11 2010
@@ -28,7 +28,7 @@
 %define		_enable_debug_packages	0
 %endif
 
-%define		rel	2
+%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
@@ -36,12 +36,12 @@
 Summary(uk.UTF-8):	Утиліти для керування пакетними фільтрами ядра Linux
 Summary(zh_CN.UTF-8):	Linux内核包过滤管理工具
 Name:		xtables-addons
-Version:	1.26
+Version:	1.27
 Release:	%{rel}
 License:	GPL
 Group:		Networking/Admin
-Source0:	http://downloads.sourceforge.net/xtables-addons/%{name}-%{version}.tar.bz2
-# Source0-md5:	6091032318ee7fb46d82dec9ae5ae422
+Source0:	http://downloads.sourceforge.net/xtables-addons/%{name}-%{version}.tar.xz
+# Source0-md5:	f4f65ce5361d7f8c0908ca3db37fa8ee
 URL:		http://xtables-addons.sourceforge.net/
 Patch0:		kernelrelease.patch
 BuildRequires:	autoconf
@@ -117,7 +117,7 @@
 
 %if %{with kernel}
 srcdir=${PWD:-$(pwd)}
-%build_kernel_modules XA_ABSTOPSRCDIR=$srcdir -C extensions -m compat_xtables
+%build_kernel_modules V=1 XA_ABSTOPSRCDIR=$srcdir -C extensions -m compat_xtables
 %endif
 
 %if %{with userspace}
@@ -146,6 +146,9 @@
 %clean
 rm -rf $RPM_BUILD_ROOT
 
+%post -p /sbin/ldconfig
+%postun -p /sbin/ldconfig
+
 %post -n kernel%{_alt_kernel}-net-xtables-addons
 %depmod %{_kernel_ver}
 
@@ -155,7 +158,9 @@
 %if %{with userspace}
 %files
 %defattr(644,root,root,755)
+%attr(755,root,root) %{_sbindir}/iptaccount
 %attr(755,root,root) %{_libdir}/xtables/libxt_*.so
+%attr(755,root,root) %{_libdir}/libxt_ACCOUNT_cl.so.*
 %{_mandir}/man8/xtables-addons.8*
 %endif
 
@@ -172,6 +177,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.55  2010/06/07 20:57:11  arekm
+- up to 1.27
+
 Revision 1.54  2010/05/28 18:38:33  arekm
 - release 2
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/xtables-addons/kernelrelease.patch?r1=1.3&r2=1.4&f=u
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/xtables-addons/xtables-addons.spec?r1=1.54&r2=1.55&f=u