rpms/denyhosts/devel denyhosts-2.2-config.patch, NONE, 1.1 denyhosts.init, 1.5, 1.6 denyhosts.spec, 1.27, 1.28 denyhosts-1.1.4-config.patch, 1.1, NONE

[Jason Tibbitts (tibbs)]

Author: tibbs

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

Modified Files:
	denyhosts.init denyhosts.spec 
Added Files:
	denyhosts-2.2-config.patch 
Removed Files:
	denyhosts-1.1.4-config.patch 
Log Message:
* Wed Mar 29 2006 Jason L Tibbitts III <tibbs at math.uh.edu> - 2.2-2
- Specfile cleanups.
- Add hostname to default report subject.


denyhosts-2.2-config.patch:

--- NEW FILE denyhosts-2.2-config.patch ---
--- denyhosts.cfg-dist.orig	2006-03-13 15:15:24.000000000 -0600
+++ denyhosts.cfg-dist	2006-03-29 21:53:36.198459392 -0600
@@ -46,13 +46,18 @@
 #            'y' = years
 #
 # never purge:
-PURGE_DENY = 
+#PURGE_DENY = 
 #
 # purge entries older than 1 week
 #PURGE_DENY = 1w
 #
 # purge entries older than 5 days
 #PURGE_DENY = 5d
+#
+# For the default Fedora Extras install, we want timestamping but no
+# expiration (at least by default) so this is deliberately set high.
+# Adjust to taste.
+PURGE_DENY = 4w
 #######################################################################
 
 
@@ -126,7 +131,7 @@
 # Note: it is recommended that you use an absolute pathname
 # for this value (eg. /home/foo/denyhosts/data)
 #
-WORK_DIR = /usr/share/denyhosts/data
+WORK_DIR = /var/lib/denyhosts
 #
 #######################################################################
 
@@ -189,7 +194,7 @@
 # match your email address.  If you do not want to receive these reports
 # leave this field blank (or run with the --noemail option)
 #
-ADMIN_EMAIL = 
+ADMIN_EMAIL = root
 #
 #######################################################################
 
@@ -228,7 +233,7 @@
 #
 # SMTP_SUBJECT: you can specify the "Subject:" of messages sent
 # by DenyHosts when it reports thwarted abuse attempts
-SMTP_SUBJECT = DenyHosts Report
+SMTP_SUBJECT = DenyHosts Report from $[HOSTNAME]
 #
 ######################################################################
 


Index: denyhosts.init
===================================================================
RCS file: /cvs/extras/rpms/denyhosts/devel/denyhosts.init,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- denyhosts.init	16 Aug 2005 22:41:43 -0000	1.5
+++ denyhosts.init	30 Mar 2006 16:36:17 -0000	1.6
@@ -15,6 +15,11 @@
 # source function library
 . /etc/rc.d/init.d/functions
 
+# Make sure HOSTNAME is in the environment so denyhosts can
+# use it in report subjects
+HOSTNAME=$(hostname)
+export HOSTNAME
+
 CONTROL=/usr/bin/denyhosts-control
 CRONLOCK=/var/lock/subsys/denyhosts.init
 LOCKFILE=/var/lock/subsys/denyhosts


Index: denyhosts.spec
===================================================================
RCS file: /cvs/extras/rpms/denyhosts/devel/denyhosts.spec,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -r1.27 -r1.28
--- denyhosts.spec	14 Mar 2006 17:37:48 -0000	1.27
+++ denyhosts.spec	30 Mar 2006 16:36:17 -0000	1.28
@@ -1,6 +1,6 @@
 Name:           denyhosts
 Version:        2.2
-release:	1%{?dist}
+Release:	2%{?dist}
 Summary:        A script to help thwart ssh server attacks
 
 Group:          Applications/System
@@ -13,11 +13,11 @@
 Source4:	denyhosts.sysconfig
 Source5:	denyhosts.logrotate
 Source6:	README.fedora
-Patch0:		denyhosts-1.1.4-config.patch
+Patch0:		denyhosts-2.2-config.patch
 Patch1:		denyhosts-2.1-setup.patch
 Patch2:		denyhosts-2.0-daemon-control.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-BuildArchitectures: noarch
+BuildArch:	noarch
 
 BuildRequires:  python-devel
 Requires:       openssh-server
@@ -142,6 +142,10 @@
 
 
 %changelog
+* Wed Mar 29 2006 Jason L Tibbitts III <tibbs at math.uh.edu> - 2.2-2
+- Specfile cleanups.
+- Add hostname to default report subject.
+
 * Tue Mar 14 2006 Jason L Tibbitts III <tibbs at math.uh.edu> - 2.2-1
 - Update to 2.2.
 


--- denyhosts-1.1.4-config.patch DELETED ---