Changes - j0ke.net Open Build Service

Changes of Revision 9

[-] [+]	Changed	blocksshd.spec
@@ -11,17 +11,24 @@ Source2: blocksshd.sysconfig Patch0: blocksshd-1.1.diff Patch1: blocksshd-suse-config.diff +Patch2: blocksshd-redhat-config.diff +Patch3: blocksshd-redhat-init.diff Requires: perl >= 5, /sbin/chkconfig + %if 0%{?suse_version} +Requires: whois +%endif +%if 0%{?centos_version} \|\| 0%{?fedora_version} +Requires: jwhois +%endif + Requires: perl-Net-Subnets Requires: perl-File-Tail Requires: perl-Net-DNS -Requires: whois Requires: iptables Requires: sed Requires: mailx -%endif AutoReq: no BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root @@ -40,6 +47,11 @@ %patch1 -p1 %endif +%if 0%{?centos_version} \|\| 0%{?fedora_version} +%patch2 -p1 +%patch3 -p1 +%endif + %build %{__make} @@ -65,6 +77,7 @@ %else %{__make} init DESTDIR="%{buildroot}" \ INITRDDIR="%{_initrddir}" +install -m 644 %{S:2} %{buildroot}/etc/sysconfig/blocksshd %endif %clean @@ -80,9 +93,7 @@ %{_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 @@ -91,6 +102,10 @@ /sbin/chkconfig --add blocksshd %changelog +* Tue Jan 22 2008 Carsten Schoene <cs@linux-administrator.com> +- added more requirements +- added configuration patch & sysconfig for redhat based systems + * Mon Jan 21 2008 Carsten Schoene <cs@linux-administrator.com> - adapted spec to SuSE distributions - added SuSE init script and configuration patch
[-] [+]	Added	blocksshd-redhat-config.diff ^
@@ -0,0 +1,11 @@ +--- blocksshd-1.1/blocksshd.conf.orig 2008-01-21 16:58:44.000000000 +0100 ++++ blocksshd-1.1/blocksshd.conf 2008-01-22 12:42:45.000000000 +0100 +@@ -10,7 +10,7 @@ + unblock => '1', # Enable unblocking + unblock_timeout => '43200', # Time in seconds after which to unblock a blocked IP address + restore_blocked => '0', # Turn on checking for previously blocked IPs +- log_ips => '/usr/local/etc/blocksshd.list', # Log file for blocked IPs ++ log_ips => '/var/log/blocksshd.list', # Log file for blocked IPs + pid_file => '/var/run/blocksshd.pid', # Location of PID file + send_email => '1', # Enable the sending of email notifications + email => 'root', # Email address to send notifications
[-] [+]	Added	blocksshd-redhat-init.diff ^
@@ -0,0 +1,18 @@ +--- blocksshd-1.1/init/blocksshd.orig 2008-01-22 12:45:13.000000000 +0100 ++++ blocksshd-1.1/init/blocksshd 2008-01-22 12:46:03.000000000 +0100 +@@ -30,6 +30,7 @@ + RETVAL=$? + echo + [ $RETVAL = 0 ] && touch /var/lock/subsys/blocksshd ++ $STARTCMD + return $RETVAL + ;; + stop) +@@ -39,6 +40,7 @@ + RETVAL=$? + echo + [ $RETVAL = 0 ] && rm -f /var/lock/subsys/blocksshd ++ $STOPCMD + ;; + reload) + $0 stop