X-Git-Url: http://git.pld-linux.org/?a=blobdiff_plain;f=firewall-init-ipchains.spec;h=540a49851f8271b42b9507668f62e74bce6d4f82;hb=95b2f91129a12d5bd76adda4d0c315e0799d84f4;hp=4ea79861f63359418b5dd4113a5477a0d1eb0b42;hpb=cff087f872c545b0c9347df74da571b690c143a1;p=packages%2Ffirewall-init-ipchains.git

diff --git a/firewall-init-ipchains.spec b/firewall-init-ipchains.spec
index 4ea7986..540a498 100644
--- a/firewall-init-ipchains.spec
+++ b/firewall-init-ipchains.spec
@@ -1,59 +1,61 @@
 Summary:	Firewall SysV-init style start-up script
 Summary(pl):	Skrypt startowy firewalla
 Name:		firewall-init
-Version:	2.0
-Release:	2
-License:	BSD
+Version:	2.99.5
+Release:	2@2.4
+License:	GPL
 Group:		Networking/Admin
+Group(de):	Netzwerkwesen/Administration
 Group(pl):	Sieciowe/Administacyjne
-Source0:	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.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
+PreReq:		rc-scripts
+Requires(post,preun):	/sbin/chkconfig
+Requires:	iptables >= 1.2.2-2
+Conflicts:	kernel < 2.3.0
+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).
+stopowania filtrów IP j±dra poprzez iptables(8).
 
 %prep
 %setup -q
+%patch0 -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/
-
-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
+%clean
+rm -rf $RPM_BUILD_ROOT
 
 %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 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
+%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