X-Git-Url: http://git.pld-linux.org/?a=blobdiff_plain;f=firewall-init.spec;h=be9ec2a8d9baa7a649c0f09c02ac62a98ecd6614;hb=21d30844a9acf3b356e6665bd71d5bceac1d4816;hp=5ccd0cdb6097bcef4572e1b41d914eec601bf3ad;hpb=561a44308a74fe0ca1f21e33358f3c4367e30ce8;p=packages%2Ffirewall-init.git

diff --git a/firewall-init.spec b/firewall-init.spec
index 5ccd0cd..be9ec2a 100644
--- a/firewall-init.spec
+++ b/firewall-init.spec
@@ -1,24 +1,26 @@
 Summary:	Firewall SysV-init style start-up script
 Summary(pl):	Skrypt startowy firewalla
 Name:		firewall-init
-Version:	2.0
-Release:	2
-Copyright:	BSD
+Version:	2.99.8
+Release:	2		
+License:	GPL
 Group:		Networking/Admin
-Source:		ftp://hunter.mimuw.edu.pl/pub/users/baggins/%{name}-%{version}.tar.gz
-Prereq:		/sbin/chkconfig
-Requires:	ipchains
-Requires:	rc-scripts
-Buildarch:	noarch
+Source0:	ftp://ftp.pld-linux.org/software/firewall-init/%{name}-%{version}.tar.bz2
+# Source0-md5:	1237a67be00e5ecef53a934f86c7507b
+PreReq:		rc-scripts
+Requires(post,preun):	/sbin/chkconfig
+Requires:	iptables >= 1.2.2-2
+Obsoletes:	iptables-init
+BuildArch:	noarch
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %description
-Firewall-init is meant to provide an easy to use interface to start and
-stopping the kernel IP packet filters and accounting through ipchains(8).
+Firewall-init is meant to provide an easy to use interface for starting
+and stopping the kernel IP packet filter through iptables(8).
 
 %description -l pl
-Dziêki firewall-init uzyskuje siê ³atwy interfejs do startowania i stopowania
-filtrów IP j±dra oraz zliczania pakietów poprzez ipchains(8).
+Dziêki firewall-init uzyskuje siê ³atwy interfejs do startowania i
+stopowania filtrów IP j±dra poprzez iptables(8).
 
 %prep
 %setup -q
@@ -26,31 +28,36 @@ filtr
 %install
 rm -rf $RPM_BUILD_ROOT
 
-install -d $RPM_BUILD_ROOT/etc/{sysconfig/firewall-rules,rc.d/init.d}
+%{__make} install \
+	DESTDIR=$RPM_BUILD_ROOT
 
-install firewall.init $RPM_BUILD_ROOT/etc/rc.d/init.d/firewall
-install firewall $RPM_BUILD_ROOT/etc/sysconfig/
+%clean
+rm -rf $RPM_BUILD_ROOT
 
-for i in input output forward; do
-	echo '#<policy> <proto> <s_addr/s_mask> <s_port> <d_addr/d_mask> <d_port> <interface> <options>' > \
-		$RPM_BUILD_ROOT/etc/sysconfig/firewall-rules/${i}
-done
+#%%pre
+#if [ `rpm -q --queryformat='%{VERSION}' firewall-init` < '2.5' ]; then
+#	echo "You need to manually convert your rules to iptables or install"
+#	echo "firewall-init-ipchains"
+#	exit 1
+#fi
 
 %post
 /sbin/chkconfig --add firewall
+/sbin/chkconfig --add firewall-pre
 
-%postun
-if [ $1 = 0 ]; then
-   /sbin/chkconfig --del firewall
+%preun
+if [ "$1" = "0" ]; then
+	/sbin/chkconfig --del firewall
+	/sbin/chkconfig --del firewall-pre
 fi
 
-%clean
-rm -rf $RPM_BUILD_ROOT
-
 %files
-%defattr(644, root, root, 755)
-%doc README input.example
-%attr(600,root,root) %verify(not size mtime md5) %config(noreplace) /etc/sysconfig/firewall
-%attr(600,root,root) %verify(not size mtime md5) %config(noreplace) /etc/sysconfig/firewall-rules/*
-%attr(700,root,root) %dir /etc/sysconfig/firewall-rules
-%attr(754,root,root) /etc/rc.d/init.d/firewall
+%defattr(644,root,root,755)
+%doc README
+%defattr(640,root,root,750)
+%verify(not size mtime md5) %config(noreplace) /etc/sysconfig/firewall
+%verify(not size mtime md5) %config(noreplace) /etc/sysconfig/firewall.d/ip*
+%verify(not size mtime md5) %config(noreplace) /etc/sysconfig/firewall.d/functions.rules
+/etc/sysconfig/firewall.d/functions
+%attr(754,root,root) /etc/rc.d/init.d/firewall*
+%dir /etc/sysconfig/firewall.d