SPECS: xtables-addons.spec - updated to 1.5.7. it includes ipset v2.3.2a now.

pluto pluto at pld-linux.org
Fri Sep 12 11:26:20 CEST 2008 

Author: pluto                        Date: Fri Sep 12 09:26:20 2008 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- updated to 1.5.7. it includes ipset v2.3.2a now.

---- Files affected:
SPECS:
   xtables-addons.spec (1.6 -> 1.7) 

---- Diffs:

================================================================
Index: SPECS/xtables-addons.spec
diff -u SPECS/xtables-addons.spec:1.6 SPECS/xtables-addons.spec:1.7
--- SPECS/xtables-addons.spec:1.6	Fri May 23 13:52:38 2008
+++ SPECS/xtables-addons.spec	Fri Sep 12 11:26:14 2008
@@ -9,7 +9,7 @@
 %bcond_without	kernel
 %bcond_without	userspace
 #
-%define		rel 0.9
+%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
@@ -17,12 +17,12 @@
 Summary(uk.UTF-8):	Утиліти для керування пакетними фільтрами ядра Linux
 Summary(zh_CN.UTF-8):	Linux内核包过滤管理工具
 Name:		xtables-addons
-Version:	1.5.4.1
+Version:	1.5.7
 Release:	%{rel}@%{_kernel_ver_str}
 License:	GPL
 Group:		Networking/Daemons
 Source0:	http://dev.computergmbh.de/files/xtables/%{name}-%{version}.tar.bz2
-# Source0-md5:	f78352e9021986347cd347edc82c40c2
+# Source0-md5:	cfd0a0997efd4084d0505f93ff28c4cf
 Patch0:		%{name}-libs.patch
 Patch1:		%{name}-geoip-dbpath.patch
 #BuildRequires:	xtables-devel >= 1.5.2
@@ -32,6 +32,7 @@
 %{?with_dist_kernel:%requires_releq_kernel}
 Requires(post,postun):	/sbin/depmod
 Requires:	iptables >= 1.4.1
+Obsoletes:	ipset
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %description
@@ -67,6 +68,7 @@
 %configure \
 	--with-kbuild=%{_kernelsrcdir} \
 	--with-ksource=%{_kernelsrcdir}
+
 export XA_TOPSRCDIR=$PWD
 
 %if %{with kernel}
@@ -74,19 +76,33 @@
 %endif
 
 %if %{with userspace}
-%{__make} -C extensions libs
+%{__make} -C extensions
+%{__make} -C extensions/ipset
 %endif
 
 %install
 rm -rf $RPM_BUILD_ROOT
+install -d $RPM_BUILD_ROOT{/lib/modules/%{_kernel_ver}/kernel/net/ipv4/netfilter,%{_mandir}/man8}
 
 %if %{with kernel}
-%install_kernel_modules -m extensions/compat_xtables -d kernel/net/netfilter
-install extensions/xt_*ko $RPM_BUILD_ROOT/lib/modules/%{_kernel_ver}/kernel/net/netfilter
+cd extensions
+%install_kernel_modules -m compat_xtables -d kernel/net/netfilter
+install xt_*ko $RPM_BUILD_ROOT/lib/modules/%{_kernel_ver}/kernel/net/netfilter
+install ipset/*.ko $RPM_BUILD_ROOT/lib/modules/%{_kernel_ver}/kernel/net/ipv4/netfilter
+cd ..
 %endif
+
 %if %{with userspace}
-%{__make} -C extensions libs_install \
+%{__make} -C extensions install \
+	DESTDIR=$RPM_BUILD_ROOT
+%{__make} -C extensions/ipset install \
 	DESTDIR=$RPM_BUILD_ROOT
+
+cd extensions
+for m in $(cat .manpages.lst); do
+	install libxt_$m.man $RPM_BUILD_ROOT%{_mandir}/man8/libxt_$m.8
+done
+cd ..
 %endif
 
 %clean
@@ -101,19 +117,77 @@
 %files
 %defattr(644,root,root,755)
 %if %{with userspace}
+# ipset
+%attr(755,root,root) %{_libdir}/xtables/libipset_iphash.so
+%attr(755,root,root) %{_libdir}/xtables/libipset_ipmap.so
+%attr(755,root,root) %{_libdir}/xtables/libipset_ipporthash.so
+%attr(755,root,root) %{_libdir}/xtables/libipset_iptree.so
+%attr(755,root,root) %{_libdir}/xtables/libipset_iptreemap.so
+%attr(755,root,root) %{_libdir}/xtables/libipset_macipmap.so
+%attr(755,root,root) %{_libdir}/xtables/libipset_nethash.so
+%attr(755,root,root) %{_libdir}/xtables/libipset_portmap.so
+%attr(755,root,root) %{_sbindir}/ipset
+%{_mandir}/man8/ipset.*
+#
 %attr(755,root,root) %{_libdir}/xtables/libxt_CHAOS.so
 %attr(755,root,root) %{_libdir}/xtables/libxt_DELUDE.so
+%attr(755,root,root) %{_libdir}/xtables/libxt_DHCPADDR.so
 %attr(755,root,root) %{_libdir}/xtables/libxt_IPMARK.so
 %attr(755,root,root) %{_libdir}/xtables/libxt_LOGMARK.so
+%attr(755,root,root) %{_libdir}/xtables/libxt_SYSRQ.so
 %attr(755,root,root) %{_libdir}/xtables/libxt_TARPIT.so
 %attr(755,root,root) %{_libdir}/xtables/libxt_TEE.so
 %attr(755,root,root) %{_libdir}/xtables/libxt_condition.so
+%attr(755,root,root) %{_libdir}/xtables/libxt_dhcpaddr.so
+%attr(755,root,root) %{_libdir}/xtables/libxt_fuzzy.so
 %attr(755,root,root) %{_libdir}/xtables/libxt_geoip.so
 %attr(755,root,root) %{_libdir}/xtables/libxt_ipp2p.so
 %attr(755,root,root) %{_libdir}/xtables/libxt_portscan.so
+%attr(755,root,root) %{_libdir}/xtables/libxt_quota2.so
+%{_mandir}/man8/libxt_CHAOS.*
+%{_mandir}/man8/libxt_DELUDE.*
+%{_mandir}/man8/libxt_DHCPADDR.*
+%{_mandir}/man8/libxt_IPMARK.*
+%{_mandir}/man8/libxt_LOGMARK.*
+%{_mandir}/man8/libxt_SYSRQ.*
+%{_mandir}/man8/libxt_TARPIT.*
+%{_mandir}/man8/libxt_condition.*
+%{_mandir}/man8/libxt_dhcpaddr.*
+%{_mandir}/man8/libxt_fuzzy.*
+%{_mandir}/man8/libxt_geoip.*
+%{_mandir}/man8/libxt_ipp2p.*
+%{_mandir}/man8/libxt_portscan.*
+%{_mandir}/man8/libxt_quota2.*
 %endif
 %if %{with kernel}
-/lib/modules/%{_kernel_ver}/kernel/net/netfilter/*
+# ipset
+/lib/modules/%{_kernel_ver}/kernel/net/ipv4/netfilter/ip_set.ko.gz
+/lib/modules/%{_kernel_ver}/kernel/net/ipv4/netfilter/ip_set_iphash.ko.gz
+/lib/modules/%{_kernel_ver}/kernel/net/ipv4/netfilter/ip_set_ipmap.ko.gz
+/lib/modules/%{_kernel_ver}/kernel/net/ipv4/netfilter/ip_set_ipporthash.ko.gz
+/lib/modules/%{_kernel_ver}/kernel/net/ipv4/netfilter/ip_set_iptree.ko.gz
+/lib/modules/%{_kernel_ver}/kernel/net/ipv4/netfilter/ip_set_iptreemap.ko.gz
+/lib/modules/%{_kernel_ver}/kernel/net/ipv4/netfilter/ip_set_macipmap.ko.gz
+/lib/modules/%{_kernel_ver}/kernel/net/ipv4/netfilter/ip_set_nethash.ko.gz
+/lib/modules/%{_kernel_ver}/kernel/net/ipv4/netfilter/ip_set_portmap.ko.gz
+/lib/modules/%{_kernel_ver}/kernel/net/ipv4/netfilter/ipt_SET.ko.gz
+/lib/modules/%{_kernel_ver}/kernel/net/ipv4/netfilter/ipt_set.ko.gz
+#
+/lib/modules/%{_kernel_ver}/kernel/net/netfilter/compat_xtables.ko.gz
+/lib/modules/%{_kernel_ver}/kernel/net/netfilter/xt_CHAOS.ko.gz
+/lib/modules/%{_kernel_ver}/kernel/net/netfilter/xt_DELUDE.ko.gz
+/lib/modules/%{_kernel_ver}/kernel/net/netfilter/xt_DHCPADDR.ko.gz
+/lib/modules/%{_kernel_ver}/kernel/net/netfilter/xt_IPMARK.ko.gz
+/lib/modules/%{_kernel_ver}/kernel/net/netfilter/xt_LOGMARK.ko.gz
+/lib/modules/%{_kernel_ver}/kernel/net/netfilter/xt_SYSRQ.ko.gz
+/lib/modules/%{_kernel_ver}/kernel/net/netfilter/xt_TARPIT.ko.gz
+/lib/modules/%{_kernel_ver}/kernel/net/netfilter/xt_TEE.ko.gz
+/lib/modules/%{_kernel_ver}/kernel/net/netfilter/xt_condition.ko.gz
+/lib/modules/%{_kernel_ver}/kernel/net/netfilter/xt_fuzzy.ko.gz
+/lib/modules/%{_kernel_ver}/kernel/net/netfilter/xt_geoip.ko.gz
+/lib/modules/%{_kernel_ver}/kernel/net/netfilter/xt_ipp2p.ko.gz
+/lib/modules/%{_kernel_ver}/kernel/net/netfilter/xt_portscan.ko.gz
+/lib/modules/%{_kernel_ver}/kernel/net/netfilter/xt_quota2.ko.gz
 %endif
 
 %define date	%(echo `LC_ALL="C" date +"%a %b %d %Y"`)
@@ -122,7 +196,10 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
-Revision 1.6  2008/05/23 11:52:38  zbyniu
+Revision 1.7  2008/09/12 09:26:14  pluto
+- updated to 1.5.7. it includes ipset v2.3.2a now.
+
+Revision 1.6  2008-05-23 11:52:38  zbyniu
 - geoip-dbpath.patch added; R: iptables >= 1.4.1; works
 
 Revision 1.5  2008-05-22 09:41:12  zbyniu
================================================================

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

More information about the pld-cvs-commit mailing list