- up to 1.28

[packages/xtables-addons.git] / xtables-addons.spec

diff --git a/xtables-addons.spec b/xtables-addons.spec
index b0240dbf1f77e44d2d6f7febabe715c1b8a3173d..2157df74e50c8a71db5e9cdfe5b2099b08deb9fa 100644 (file)
--- a/xtables-addons.spec
+++ b/xtables-addons.spec
@@ -1,4 +1,3 @@
-#
 # TODO
 # - descriptions
 #
@@ -19,7 +18,7 @@
 %define                _enable_debug_packages  0
 %endif
 
-%define                rel     7
+%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
@@ -27,16 +26,14 @@ Summary(ru.UTF-8):  Утилиты для управления пакетными
 Summary(uk.UTF-8):     Утиліти для керування пакетними фільтрами ядра Linux
 Summary(zh_CN.UTF-8):  Linux内核包过滤管理工具
 Name:          xtables-addons
-Version:       1.18
+Version:       1.28
 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.xz
+# Source0-md5: b94fe23370a1294b985e9a06a0f9d129
 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
@@ -81,7 +78,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
-Requires:      %{name} = %{version}-%{rel}
+# 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
 
@@ -94,8 +95,6 @@ Moduły jądra dla xtables addons.
 %prep
 %setup -q
 %patch0 -p1
-%patch1 -p1
-%patch2 -p1
 
 %{__sed} -i -e 's#build_ipset=m#build_ipset=n#' mconfig
 
@@ -105,17 +104,15 @@ Moduły jądra dla xtables addons.
 %{__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 V=1 XA_ABSTOPSRCDIR=$srcdir -C extensions -m compat_xtables
 %endif
 
 %if %{with userspace}
-%{__make} -C extensions
+%{__make}
 %endif
 
 %install
@@ -133,16 +130,29 @@ cd ..
 %{__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 ..
+rm -f $RPM_BUILD_ROOT%{_libdir}/libxt_ACCOUNT_cl.{la,so}
+
+install -d $RPM_BUILD_ROOT%{_mandir}/man8
+cp -a xtables-addons.8 $RPM_BUILD_ROOT%{_mandir}/man8
+
+install -d $RPM_BUILD_ROOT/etc/modprobe.d
+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
+
 %endif
 
 %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}
 
@@ -152,13 +162,16 @@ 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
-%{_mandir}/man8/libxt_*.*
+%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/netfilter/compat_xtables.ko.gz
 /lib/modules/%{_kernel_ver}/kernel/net/netfilter/xt_*.ko.gz
 %endif