rpms/denyhosts/devel denyhosts-1.0.0-daemon-control.patch, NONE, 1.1 denyhosts.logrotate, NONE, 1.1 denyhosts.init, 1.4, 1.5 denyhosts.spec, 1.9, 1.10 denyhosts-0.9.8-daemon-control.patch, 1.2, NONE

[Jason Tibbitts (tibbs)]

Author: tibbs

Update of /cvs/extras/rpms/denyhosts/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5441

Modified Files:
	denyhosts.init denyhosts.spec 
Added Files:
	denyhosts-1.0.0-daemon-control.patch denyhosts.logrotate 
Removed Files:
	denyhosts-0.9.8-daemon-control.patch 
Log Message:
* Tue Aug 16 2005 Jason L Tibbitts III <tibbs at math.uh.edu> - 1.0.0-1
- Fix condrestart
- Actually install logrotate entry


denyhosts-1.0.0-daemon-control.patch:

--- NEW FILE denyhosts-1.0.0-daemon-control.patch ---
--- daemon-control-dist.orig	2005-08-16 17:31:58.285358954 -0500
+++ daemon-control-dist	2005-08-16 17:33:00.510336919 -0500
@@ -7,7 +7,7 @@
 
 DENYHOSTS_BIN   = "/usr/bin/denyhosts.py"
 DENYHOSTS_LOCK  = "/var/lock/subsys/denyhosts"
-DENYHOSTS_CFG   = "/usr/share/denyhosts/denyhosts.cfg"
+DENYHOSTS_CFG   = "/etc/denyhosts.conf"
 
 
 ###############################################
@@ -104,7 +104,7 @@
     try:
         option = sys.argv[1]
         
-        if option in ('start', 'restart'):
+        if option in ('start', 'restart', 'condrestart'):
             if '--config' not in args and '-c' not in args:
                 args.append("--config=%s" % DENYHOSTS_CFG)
 


--- NEW FILE denyhosts.logrotate ---
/var/log/denyhosts {
    missingok
    notifempty
    size 100k
    create 0644 root root
}


Index: denyhosts.init
===================================================================
RCS file: /cvs/extras/rpms/denyhosts/devel/denyhosts.init,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- denyhosts.init	16 Aug 2005 03:30:56 -0000	1.4
+++ denyhosts.init	16 Aug 2005 22:41:43 -0000	1.5
@@ -55,25 +55,17 @@
 	fi
 }
 
+d_condrestart() { $CONTROL condrestart; RETVAL=$?; }
+d_restart()     { $CONTROL restart;     RETVAL=$?; }
+d_start()       { $CONTROL start;       RETVAL=$?; }
+d_status()      { $CONTROL status;      RETVAL=$?; }
+d_stop()        { $CONTROL stop;        RETVAL=$?; }
 
-d_start()   { $CONTROL start;   RETVAL=$?; }
-d_restart() { $CONTROL restart; RETVAL=$?; }
-d_stop()    { $CONTROL stop;    RETVAL=$?; }
-d_status()  { $CONTROL status;  RETVAL=$?; }
-
-
-d_condrestart() { 
-	# It's a layering violation to test the location of the
-	# lockfile, but the control script doesn't support condrestart
-	# yet
-	[ -f $LOCKFILE ] && d_restart
-}
-
-start()       { if [ $DAEMON = "yes" ]; then d_start;       else c_start;   fi }
-stop()        { if [ $DAEMON = "yes" ]; then d_stop;        else c_stop;    fi }
-restart()     { if [ $DAEMON = "yes" ]; then d_restart;     else c_restart; fi }
 condrestart() { if [ $DAEMON = "yes" ]; then d_condrestart; else c_restart; fi }
+restart()     { if [ $DAEMON = "yes" ]; then d_restart;     else c_restart; fi }
+start()       { if [ $DAEMON = "yes" ]; then d_start;       else c_start;   fi }
 status()      { if [ $DAEMON = "yes" ]; then d_status;      else c_status;  fi }
+stop()        { if [ $DAEMON = "yes" ]; then d_stop;        else c_stop;    fi }
 
 case "$1" in
   start)


Index: denyhosts.spec
===================================================================
RCS file: /cvs/extras/rpms/denyhosts/devel/denyhosts.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- denyhosts.spec	16 Aug 2005 03:30:56 -0000	1.9
+++ denyhosts.spec	16 Aug 2005 22:41:43 -0000	1.10
@@ -1,6 +1,6 @@
 Name:           denyhosts
 Version:        1.0.0
-release:	0%{?dist}
+release:	1%{?dist}
 Summary:        A script to help thwart ssh server attacks
 
 Group:          Applications/System
@@ -15,7 +15,7 @@
 Source6:	README.fedora
 Patch0:		denyhosts-1.0.0-config.patch
 Patch1:		denyhosts-0.9.8-setup.patch
-Patch2:		denyhosts-0.9.8-daemon-control.patch
+Patch2:		denyhosts-1.0.0-daemon-control.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildArchitectures: noarch
 
@@ -52,6 +52,7 @@
 
 install -d $RPM_BUILD_ROOT%{_initrddir}
 install -d $RPM_BUILD_ROOT%{_sysconfdir}/cron.d
+install -d $RPM_BUILD_ROOT%{_sysconfdir}/logrotate.d
 install -d $RPM_BUILD_ROOT%{_sysconfdir}/sysconfig
 
 install -d -m 700 $RPM_BUILD_ROOT%{_localstatedir}/lib/denyhosts
@@ -63,6 +64,7 @@
 install -p -m 755 %{SOURCE2} $RPM_BUILD_ROOT%{_initrddir}/denyhosts
 install -p -m 644 %{SOURCE3} $RPM_BUILD_ROOT%{_localstatedir}/lib/denyhosts/allowed-hosts
 install -p -m 644 %{SOURCE4} $RPM_BUILD_ROOT%{_sysconfdir}/sysconfig/denyhosts
+install -p -m 644 %{SOURCE5} $RPM_BUILD_ROOT%{_sysconfdir}/logrotate.d/denyhosts
 
 touch $RPM_BUILD_ROOT%{_localstatedir}/log/denyhosts
 
@@ -99,6 +101,7 @@
 %doc README.fedora README.txt setup.py
 %config(noreplace) %{_sysconfdir}/denyhosts.conf
 %config(noreplace) %{_sysconfdir}/cron.d/denyhosts
+%config(noreplace) %{_sysconfdir}/logrotate.d/denyhosts
 %config(noreplace) %{_sysconfdir}/sysconfig/denyhosts
 %config(noreplace) %{_localstatedir}/lib/denyhosts/allowed-hosts
 
@@ -117,6 +120,10 @@
 %{_bindir}/denyhosts-control
 
 %changelog
+* Tue Aug 16 2005 Jason L Tibbitts III <tibbs at math.uh.edu> - 1.0.0-1
+- Fix condrestart
+- Actually install logrotate entry
+
 * Mon Aug 15 2005 Jason L Tibbitts III <tibbs at math.uh.edu> - 1.0.0-0
 - Update to 1.0.0
 - Add logrotate entry


--- denyhosts-0.9.8-daemon-control.patch DELETED ---