Changes - j0ke.net Open Build Service

Changes of Revision 5

[-] [+]	Changed	blocksshd.spec
@@ -8,6 +8,7 @@ BuildArch: noarch Source: http://downloads.sourgeforge.net/blocksshd/blocksshd-%{version}.tar.bz2 Source1: blocksshd-suse.init +Source2: blocksshd.sysconfig Patch0: blocksshd-1.1.diff Patch1: blocksshd-suse-config.diff @@ -49,7 +50,12 @@ %if 0%{?suse_version} install -D -m 755 -d %{buildroot}/etc/init.d/ +install -D -m 755 -d %{buildroot}/etc/sysconfig/ +instlal -D -m 755 -d %{buildroot}/usr/sbin +cd %{buildroot}/usr/sbin +ln -s ../../etc/init.d/blocksshd rcblocksshd install -m 755 %{S:1} %{buildroot}/etc/init.d/blocksshd +install -m 644 %{S:2} %{buildroot}/etc/sysconfig/blocksshd %else %{__make} init DESTDIR="%{buildroot}" \ INITRDDIR="%{_initrddir}" @@ -62,10 +68,15 @@ %defattr(-,root,root,-) %doc CHANGELOG README CREDITS INSTALL %{_bindir}/blocksshd -%{_sysconfdir}/blocksshd.conf +%if 0%{?suse_version} +%{_sbindir}/rcblocksshd +%endif %{_mandir}/man1/blocksshd.1* %{_initrddir}/blocksshd %config(noreplace) %{_sysconfdir}/blocksshd.conf +%if 0%{?suse_version} +%config(noreplace) %{_sysconfdir}/sysconfig/blocksshd +%endif %post /sbin/chkconfig --add blocksshd x 1 @@ -8,6 +8,7 @@ 2 BuildArch: noarch 3 Source: http://downloads.sourgeforge.net/blocksshd/blocksshd-%{version}.tar.bz2 4 Source1: blocksshd-suse.init 5 +Source2: blocksshd.sysconfig 6 Patch0: blocksshd-1.1.diff 7 Patch1: blocksshd-suse-config.diff 8 9 @@ -49,7 +50,12 @@ 10 11 %if 0%{?suse_version} 12 install -D -m 755 -d %{buildroot}/etc/init.d/ 13 +install -D -m 755 -d %{buildroot}/etc/sysconfig/ 14 +instlal -D -m 755 -d %{buildroot}/usr/sbin 15 +cd %{buildroot}/usr/sbin 16 +ln -s ../../etc/init.d/blocksshd rcblocksshd 17 install -m 755 %{S:1} %{buildroot}/etc/init.d/blocksshd 18 +install -m 644 %{S:2} %{buildroot}/etc/sysconfig/blocksshd 19 %else 20 %{__make} init DESTDIR="%{buildroot}" \ 21 INITRDDIR="%{_initrddir}" 22 @@ -62,10 +68,15 @@ 23 %defattr(-,root,root,-) 24 %doc CHANGELOG README CREDITS INSTALL 25 %{_bindir}/blocksshd 26 -%{_sysconfdir}/blocksshd.conf 27 +%if 0%{?suse_version} 28 +%{_sbindir}/rcblocksshd 29 +%endif 30 %{_mandir}/man1/blocksshd.1* 31 %{_initrddir}/blocksshd 32 %config(noreplace) %{_sysconfdir}/blocksshd.conf 33 +%if 0%{?suse_version} 34 +%config(noreplace) %{_sysconfdir}/sysconfig/blocksshd 35 +%endif 36 37 %post 38 /sbin/chkconfig --add blocksshd 39
[-] [+]	Changed	blocksshd-suse.init ^
@@ -20,8 +20,11 @@ test -x $BLOCKSSHD_BIN \|\| { echo "$BLOCKSSHD_BIN not installed"; if [ "$1" = "stop" ]; then exit 0; else exit 5; fi; } -# Read config -. $BLOCKSSHD_CONFIG +BLOCKSSHD_SYSCONFIG=/etc/sysconfig/blocksshd +test -e $BLOCKSSHD_SYSCONFIG \|\| { echo "BLOCKSSHD_SYSCONFIG not installed"; + if [ "$1" = "stop" ]; then exit 0; else exit 5; fi; } + +. $BLOCKSSHD_SYSCONFIG . /etc/rc.status rc_reset @@ -29,12 +32,14 @@ case "$1" in start) echo -n "Starting blocksshd daemon" - startproc $BLOCKSSHD_BIN --start + startproc $BLOCKSSHD_BIN --start + $STARTCMD rc_status -v ;; stop) echo -n "Shutting down blocksshd daemon" - $BLOCKSSHD_BIN --stop + killproc -TERM $BLOCKSSHD_BIN + $STOPCMD rc_status -v ;; try-restart)
[-] [+]	Added	blocksshd.sysconfig ^
@@ -0,0 +1,12 @@ +# blocksshd startup & stop configuration + +# startup +# e.g. iptables -A INPUT -j blocksshd +# STARTCMD="sleep 1 ; /usr/sbin/iptables -A INPUT -j `grep chain /etc/blocksshd.conf \| awk -F\' '{print $2}'`" + +STARTCMD="" +# stop +# set all chains to accept, flush chains , remove extra chains +# STOPCMD="/usr/sbin/iptables -P INPUT ACCEPT ; /usr/sbin/iptables -P FORWARD ACCEPT ; /usr/sbin/iptables -P OUTPUT ACCEPT ; /usr/sbin/iptables -F ; /usr/sbin/iptables -X" + +STOPCMD=""