Author: qboosh Date: Mon Feb 7 18:02:12 2011 GMT Module: packages Tag: HEAD ---- Log message: - cleanup - libxt_TEE no longer built by default - ghost soname symlink - restrict xt_sysrq.conf permissions according to note placed inside
---- Files affected: packages/xtables-addons: xtables-addons.spec (1.88 -> 1.89) ---- Diffs: ================================================================ Index: packages/xtables-addons/xtables-addons.spec diff -u packages/xtables-addons/xtables-addons.spec:1.88 packages/xtables-addons/xtables-addons.spec:1.89 --- packages/xtables-addons/xtables-addons.spec:1.88 Wed Feb 2 13:03:36 2011 +++ packages/xtables-addons/xtables-addons.spec Mon Feb 7 19:02:07 2011 @@ -33,10 +33,10 @@ Group: Networking/Admin Source0: http://downloads.sourceforge.net/xtables-addons/%{name}-%{version}.tar.xz # Source0-md5: 97ac895a67df67c28def98763023d51b -URL: http://xtables-addons.sourceforge.net/ Patch0: kernelrelease.patch -BuildRequires: autoconf -BuildRequires: automake >= 1.10.2 +URL: http://xtables-addons.sourceforge.net/ +BuildRequires: autoconf >= 2.50 +BuildRequires: automake >= 1:1.10.2 BuildRequires: iptables-devel >= 1.4.3 %{?with_dist_kernel:BuildRequires: kernel%{_alt_kernel}-module-build >= 3:2.6.25} BuildRequires: libtool @@ -105,6 +105,7 @@ %{__libtoolize} %{__aclocal} %{__autoconf} +%{__autoheader} %{__automake} %configure \ --with-kbuild=no @@ -115,31 +116,20 @@ %endif %if %{with userspace} -%{__make} +%{__make} \ + V=1 %endif %install rm -rf $RPM_BUILD_ROOT -install -d $RPM_BUILD_ROOT{/etc/modprobe.d,/lib/modules/%{_kernel_ver}/kernel/net/ipv4/netfilter,%{_mandir}/man8} %if %{with kernel} +install -d $RPM_BUILD_ROOT{/etc/modprobe.d,/lib/modules/%{_kernel_ver}/kernel/net/ipv4/netfilter} 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 {ACCOUNT/,pknock/,}xt_*.ko $RPM_BUILD_ROOT/lib/modules/%{_kernel_ver}/kernel/net/netfilter cd .. -%endif - -%if %{with userspace} -%{__make} -C extensions install \ - DESTDIR=$RPM_BUILD_ROOT - -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, @@ -149,6 +139,17 @@ # 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 + +%if %{with userspace} +%{__make} -C extensions install \ + DESTDIR=$RPM_BUILD_ROOT + +%{__rm} $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 +%endif %clean rm -rf $RPM_BUILD_ROOT @@ -166,15 +167,17 @@ %files %defattr(644,root,root,755) %attr(755,root,root) %{_sbindir}/iptaccount +%attr(755,root,root) %{_libdir}/libxt_ACCOUNT_cl.so.*.*.* +%attr(755,root,root) %ghost %{_libdir}/libxt_ACCOUNT_cl.so.0 %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 +# restricted permissions - may contain password +%attr(600,root,root) %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 @@ -186,6 +189,12 @@ All persons listed below can be reached at <cvs_login>@pld-linux.org $Log$ +Revision 1.89 2011/02/07 18:02:07 qboosh +- cleanup +- libxt_TEE no longer built by default +- ghost soname symlink +- restrict xt_sysrq.conf permissions according to note placed inside + Revision 1.88 2011/02/02 12:03:36 baggins - release 8 ================================================================ ---- CVS-web: http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/xtables-addons/xtables-addons.spec?r1=1.88&r2=1.89&f=u _______________________________________________ pld-cvs-commit mailing list [email protected] http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
