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

glen glen at pld-linux.org
Tue Apr 27 09:22:11 CEST 2010 

Author: glen                         Date: Tue Apr 27 07:22:11 2010 GMT
Module: packages                      Tag: HEAD
---- Log message:
- up to 1.25
- GeoIP DB moved to /usr/share/xt_geoip

---- Files affected:
packages/xtables-addons:
   kernelrelease.patch (1.2 -> 1.3) , xtables-addons.spec (1.50 -> 1.51) , xtables-addons-geoip-dbpath.patch (1.2 -> NONE)  (REMOVED), xtables-addons-libs.patch (1.3 -> NONE)  (REMOVED)

---- Diffs:

================================================================
Index: packages/xtables-addons/kernelrelease.patch
diff -u packages/xtables-addons/kernelrelease.patch:1.2 packages/xtables-addons/kernelrelease.patch:1.3
--- packages/xtables-addons/kernelrelease.patch:1.2	Mon Nov  2 11:22:06 2009
+++ packages/xtables-addons/kernelrelease.patch	Tue Apr 27 09:22:05 2010
@@ -1,8 +1,8 @@
---- 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;
+--- 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}\\\" \
+ 	-I\${XA_TOPSRCDIR}/include";
  
 -#
 -# check kernel version
@@ -20,17 +20,16 @@
 -kminor="${krel%%.*}";
 -krel="${krel#*.}";
 -kmicro="${krel%%.*}";
--krel2="${krel#*.}";
--if test "$krel" = "$krel2"; then
+-if test "$kmicro" = "$krel"; then
 -	kstable=0;
 -else
--	kstable="${krel%%.*}";
+-	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 31; then
+-if test "$kmajor" -gt 2 -o "$kminor" -gt 6 -o "$kmicro" -gt 34; 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 \
@@ -40,5 +39,5 @@
 -fi;
 -
  AC_SUBST([regular_CFLAGS])
- AC_SUBST([xtables_CFLAGS])
- AC_SUBST([kinclude_CFLAGS])
+ AC_SUBST([kbuilddir])
+ AC_SUBST([xtlibdir])

================================================================
Index: packages/xtables-addons/xtables-addons.spec
diff -u packages/xtables-addons/xtables-addons.spec:1.50 packages/xtables-addons/xtables-addons.spec:1.51
--- packages/xtables-addons/xtables-addons.spec:1.50	Wed Mar 17 08:29:16 2010
+++ packages/xtables-addons/xtables-addons.spec	Tue Apr 27 09:22:05 2010
@@ -1,7 +1,14 @@
 # $Revision$, $Date$
-#
 # TODO
 # - descriptions
+# - package referenec implementation iptaccount(8) and userspace lib
+#   /usr/lib64/libxt_ACCOUNT_cl.la
+#   /usr/lib64/libxt_ACCOUNT_cl.so
+#   /usr/lib64/libxt_ACCOUNT_cl.so.0
+#   /usr/lib64/libxt_ACCOUNT_cl.so.0.0.0
+#   /usr/sbin/iptaccount
+#   and if packaged can remove debuginfo package omit
+# - subpackage for geoip due extra deps
 #
 # Conditional build:
 %bcond_without	dist_kernel	# without distribution kernel
@@ -20,7 +27,7 @@
 %define		_enable_debug_packages	0
 %endif
 
-%define		rel	11
+%define		rel	0.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,16 +35,14 @@
 Summary(uk.UTF-8):	Утиліти для керування пакетними фільтрами ядра Linux
 Summary(zh_CN.UTF-8):	Linux内核包过滤管理工具
 Name:		xtables-addons
-Version:	1.18
+Version:	1.25
 Release:	%{rel}
 License:	GPL
 Group:		Networking/Admin
-Source0:	http://dl.sourceforge.net/xtables-addons/%{name}-%{version}.tar.bz2
-# Source0-md5:	5a8d2edbf5a3470bba58d6a60c350805
+Source0:	http://downloads.sourceforge.net/xtables-addons/%{name}-%{version}.tar.bz2
+# Source0-md5:	d2765d1e6be6194b2c24efa6684a6874
 URL:		http://xtables-addons.sourceforge.net/
-Patch0:		%{name}-libs.patch
-Patch1:		%{name}-geoip-dbpath.patch
-Patch2:		kernelrelease.patch
+Patch0:		kernelrelease.patch
 BuildRequires:	autoconf
 BuildRequires:	automake
 BuildRequires:	iptables-devel >= 1.4.3
@@ -82,6 +87,7 @@
 Summary(pl.UTF-8):	Moudły jądra dla xtables addons
 Release:	%{rel}@%{_kernel_ver_str}
 Group:		Base/Kernel
+Conflicts:	xtables-geoip < 20090901-2
 # VERSION only dependency is intentional, for allowing multiple kernel pkgs and
 # single userspace package installs.
 Requires:	%{name} = %{version}
@@ -97,8 +103,6 @@
 %prep
 %setup -q
 %patch0 -p1
-%patch1 -p1
-%patch2 -p1
 
 %{__sed} -i -e 's#build_ipset=m#build_ipset=n#' mconfig
 
@@ -108,17 +112,15 @@
 %{__autoconf}
 %{__automake}
 %configure \
-	--with-kbuild=%{_kernelsrcdir} \
-	--with-ksource=%{_kernelsrcdir}
-
-export XA_TOPSRCDIR=$PWD
+	--with-kbuild=no
 
 %if %{with kernel}
-%build_kernel_modules -C extensions -m compat_xtables
+srcdir=${PWD:-$(pwd)}
+%build_kernel_modules XA_ABSTOPSRCDIR=$srcdir -C extensions -m compat_xtables
 %endif
 
 %if %{with userspace}
-%{__make} -C extensions
+%{__make}
 %endif
 
 %install
@@ -136,11 +138,8 @@
 %{__make} -C extensions install \
 	DESTDIR=$RPM_BUILD_ROOT
 
-cd extensions
-for m in $(cat .manpages.lst); do
-	cp -a libxt_$m.man $RPM_BUILD_ROOT%{_mandir}/man8/libxt_$m.8
-done
-cd ..
+install -d $RPM_BUILD_ROOT%{_mandir}/man8
+cp -a xtables-addons.8 $RPM_BUILD_ROOT%{_mandir}/man8
 %endif
 
 %clean
@@ -156,7 +155,7 @@
 %files
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_libdir}/xtables/libxt_*.so
-%{_mandir}/man8/libxt_*.*
+%{_mandir}/man8/xtables-addons.8*
 %endif
 
 %if %{with kernel}
@@ -172,6 +171,10 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.51  2010/04/27 07:22:05  glen
+- up to 1.25
+- GeoIP DB moved to /usr/share/xt_geoip
+
 Revision 1.50  2010/03/17 07:29:16  arekm
 - release 11
 
================================================================

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

More information about the pld-cvs-commit mailing list