X-Git-Url: http://git.pld-linux.org/?p=packages%2Ffirewall-init-ipchains.git;a=blobdiff_plain;f=firewall-init-ipchains.spec;h=826d065fbefb671d346b5e15a80242c80af9e050;hp=a00e577ce28445b9e75bfa36765e5d1e251e2f38;hb=f5a6c7f89a8b43c58eb9f73c846b9e168273a7af;hpb=5c831dc999e8302a6ae8b54d66d42d15cec475c9

diff --git a/firewall-init-ipchains.spec b/firewall-init-ipchains.spec
index a00e577..826d065 100644
--- a/firewall-init-ipchains.spec
+++ b/firewall-init-ipchains.spec
@@ -1,62 +1,62 @@
-Summary:	Firewall SysV-init style start-up script
-Summary(pl):	Skrypt startowy firewalla
+Summary:	ipchains firewall SysV-init style start-up script
+Summary(pl):	Skrypt startowy firewalla ipchains
 Name:		firewall-init
-Version:	2.99.5
-Release:	2@2.4
-License:	GPL
+Version:	2.1
+Release:	4
+License:	BSD
 Group:		Networking/Admin
-Group(de):	Netzwerkwesen/Administration
-Group(pl):	Sieciowe/Administacyjne
-# Source0:	ftp://ftp.pld.org.pl/software/firewall-init/%{name}-%{version}.tar.gz
-# Source0-md5:	e336e02377ef26c258d8ccabeaefcf8c
-Source0:	http://aramin.one.pl/~undefine/%{name}-%{version}.tar.gz
-Patch0:		%{name}-pre.patch
+Source0:	%{name}-%{version}.tar.gz
+# Source0-md5:	07ba7a897e2d903d629e6607e3b495f3
+Patch0:		%{name}-syntax_verify.patch
+Requires:	ipchains
 PreReq:		rc-scripts
-Requires(post,preun):	/sbin/chkconfig
-Requires:	iptables >= 1.2.2-2
-Conflicts:	kernel < 2.3.0
-Obsoletes:	iptables-init
-BuildArch:	noarch
+PreReq:		/sbin/chkconfig
+Obsoletes:	firewall-init < 2.2
+Conflicts:	firewall-init >= 2.99
+Buildarch:	noarch
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %description
-Firewall-init is meant to provide an easy to use interface for starting
-and stopping the kernel IP packet filter through iptables(8).
+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).
 
 %description -l pl
 Dziêki firewall-init uzyskuje siê ³atwy interfejs do startowania i
-stopowania filtrów IP j±dra poprzez iptables(8).
+stopowania filtrów IP j±dra oraz zliczania pakietów poprzez
+ipchains(8).
 
 %prep
 %setup -q
-%patch0 -p1
+%patch -p1
 
 %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
 
 %post
 /sbin/chkconfig --add firewall
-/sbin/chkconfig --add firewall-pre
 
 %postun
 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
-%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
+%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