X-Git-Url: http://git.pld-linux.org/?p=packages%2Fxtables-addons.git;a=blobdiff_plain;f=xtables-addons.spec;h=54200bff61e50ebb68ab237362956189bc374114;hp=898119147980e7dce15e25f719c584d0af22180b;hb=5eb71b8061eed071b09dcb07c37fec8eaf91a88a;hpb=4a0596022ae6fac6de00400571a3a6e0484ecbbb

diff --git a/xtables-addons.spec b/xtables-addons.spec
index 8981191..54200bf 100644
--- a/xtables-addons.spec
+++ b/xtables-addons.spec
@@ -1,14 +1,5 @@
 # TODO
 # - descriptions
-# - package reference 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? (it goes silly as then need THREE
-#   packages installed for functionality (userspace,kernel,data packages...)
 #
 # Conditional build:
 %bcond_without	dist_kernel	# without distribution kernel
@@ -27,7 +18,7 @@
 %define		_enable_debug_packages	0
 %endif
 
-%define		rel	2
+%define		rel	5
 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
@@ -35,32 +26,34 @@ Summary(ru.UTF-8):	Утилиты для управления пакетными
 Summary(uk.UTF-8):	Утиліти для керування пакетними фільтрами ядра Linux
 Summary(zh_CN.UTF-8):	Linux内核包过滤管理工具
 Name:		xtables-addons
-Version:	1.26
+Version:	1.30
 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:	38d369a29fdd1ea86fe83df262e03064
 URL:		http://xtables-addons.sourceforge.net/
 Patch0:		kernelrelease.patch
 BuildRequires:	autoconf
-BuildRequires:	automake
+BuildRequires:	automake >= 1.10.2
 BuildRequires:	iptables-devel >= 1.4.3
 %{?with_dist_kernel:BuildRequires:	kernel%{_alt_kernel}-module-build >= 3:2.6.25}
 BuildRequires:	libtool
-BuildRequires:	pkgconfig
+BuildRequires:	pkgconfig >= 0.9.0
 BuildRequires:	rpmbuild(macros) >= 1.379
+BuildRequires:	tar >= 1.22
+BuildRequires:	xz
 Requires:	iptables >= 1.4.3
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 # use macro, so adapter won't try to wrap
-%define		kpackage	kernel%{_alt_kernel}-net-xtables-addons = %{rel}@%{_kernel_ver_str}
+%define		kpackage	kernel%{_alt_kernel}-net-xtables-addons = %{version}-%{rel}@%{_kernel_ver_str}
 
 %description
 An extensible NAT system, and an extensible packet filtering system.
 Replacement of ipchains in 2.6 and higher kernels.
 
-You need %{kpackage} installed for the tools to work.
+You should have %{kpackage} installed for the tools to work.
 
 %description -l pl.UTF-8
 Wydajny system translacji adresów (NAT) oraz system filtrowania
@@ -87,10 +80,11 @@ Summary:	Kernel modules for xtables addons
 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}
+Suggests:	xtables-geoip
+Conflicts:	xtables-geoip < 20090901-2
 %{?with_dist_kernel:%requires_releq_kernel}
 Requires(post,postun):	/sbin/depmod
 
@@ -116,7 +110,7 @@ Moduły jądra dla xtables addons.
 
 %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}
@@ -125,12 +119,13 @@ srcdir=${PWD:-$(pwd)}
 
 %install
 rm -rf $RPM_BUILD_ROOT
-install -d $RPM_BUILD_ROOT{/etc/rc.d/init.d,/lib/modules/%{_kernel_ver}/kernel/net/ipv4/netfilter,%{_mandir}/man8}
+install -d $RPM_BUILD_ROOT{/etc/modprobe.d,/lib/modules/%{_kernel_ver}/kernel/net/ipv4/netfilter,%{_mandir}/man8}
 
 %if %{with kernel}
 cd extensions
+install iptable_rawpost.ko $RPM_BUILD_ROOT/lib/modules/%{_kernel_ver}/kernel/net/ipv4/netfilter
 %install_kernel_modules -m compat_xtables -d kernel/net/netfilter
-install -p xt_*ko $RPM_BUILD_ROOT/lib/modules/%{_kernel_ver}/kernel/net/netfilter
+install -p {ACCOUNT/,pknock/,}xt_*.ko $RPM_BUILD_ROOT/lib/modules/%{_kernel_ver}/kernel/net/netfilter
 cd ..
 %endif
 
@@ -138,13 +133,28 @@ cd ..
 %{__make} -C extensions install \
 	DESTDIR=$RPM_BUILD_ROOT
 
-install -d $RPM_BUILD_ROOT%{_mandir}/man8
+rm -f $RPM_BUILD_ROOT%{_libdir}/libxt_ACCOUNT_cl.{la,so}
+# provided by iptables
+rm -f $RPM_BUILD_ROOT%{_libdir}/xtables/libxt_TEE.so
+
 cp -a xtables-addons.8 $RPM_BUILD_ROOT%{_mandir}/man8
 %endif
 
+cat <<'EOF' > $RPM_BUILD_ROOT/etc/modprobe.d/xt_sysrq.conf
+# Set password at modprobe time. if this file is secure if properly guarded,
+# i.e only readable by root.
+#options xt_SYSRQ password=cookies
+
+# The hash algorithm can also be specified as a module option, for example, to use SHA-256 instead of the default SHA-1:
+#options xt_SYSRQ hash=sha256
+EOF
+
 %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}
 
@@ -154,13 +164,17 @@ rm -rf $RPM_BUILD_ROOT
 %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
 
 %if %{with kernel}
 %files -n kernel%{_alt_kernel}-net-xtables-addons
 %defattr(644,root,root,755)
+%config(noreplace) %verify(not md5 mtime size) /etc/modprobe.d/xt_sysrq.conf
+/lib/modules/%{_kernel_ver}/kernel/net/ipv4/netfilter/iptable_rawpost.ko.gz
 /lib/modules/%{_kernel_ver}/kernel/net/netfilter/compat_xtables.ko.gz
 /lib/modules/%{_kernel_ver}/kernel/net/netfilter/xt_*.ko.gz
 %endif