rpms/denyhosts/devel denyhosts-2.6-daemon-control.patch, NONE, 1.1 denyhosts-2.6-config.patch, 1.1, 1.2 denyhosts.spec, 1.49, 1.50 denyhosts-2.2-daemon-control.patch, 1.2, NONE

[Jason ティビツ]

Author: tibbs

Update of /cvs/extras/rpms/denyhosts/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv5046

Modified Files:
	denyhosts-2.6-config.patch denyhosts.spec 
Added Files:
	denyhosts-2.6-daemon-control.patch 
Removed Files:
	denyhosts-2.2-daemon-control.patch 
Log Message:
* Thu Aug 28 2008 Jason L Tibbitts III <tibbs at math.uh.edu> - 2.6-12
- Fix up patches to apply with --fuzz=0.


denyhosts-2.6-daemon-control.patch:

--- NEW FILE denyhosts-2.6-daemon-control.patch ---
diff -up ./daemon-control-dist.orig ./daemon-control-dist
--- ./daemon-control-dist.orig	2006-04-21 18:04:43.000000000 -0500
+++ ./daemon-control-dist	2008-08-28 11:05:01.000000000 -0500
@@ -13,7 +13,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"
 
 PYTHON_BIN      = "/usr/bin/env python"
 

denyhosts-2.6-config.patch:

Index: denyhosts-2.6-config.patch
===================================================================
RCS file: /cvs/extras/rpms/denyhosts/devel/denyhosts-2.6-config.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- denyhosts-2.6-config.patch	8 Dec 2006 01:28:56 -0000	1.1
+++ denyhosts-2.6-config.patch	28 Aug 2008 16:06:38 -0000	1.2
@@ -1,6 +1,7 @@
---- denyhosts.cfg-dist.config	2006-04-04 18:37:48.000000000 -0500
-+++ denyhosts.cfg-dist	2006-04-06 10:09:13.219892334 -0500
-@@ -53,13 +53,18 @@
+diff -up ./denyhosts.cfg-dist.orig ./denyhosts.cfg-dist
+--- ./denyhosts.cfg-dist.orig	2006-08-20 09:09:57.000000000 -0500
++++ ./denyhosts.cfg-dist	2008-08-28 11:03:16.000000000 -0500
+@@ -55,13 +55,18 @@ HOSTS_DENY = /etc/hosts.deny
  #            'y' = years
  #
  # never purge:
@@ -19,8 +20,8 @@
 +PURGE_DENY = 4w
  #######################################################################
  
- 
-@@ -133,7 +138,7 @@
+ #######################################################################
+@@ -150,7 +155,7 @@ DENY_THRESHOLD_RESTRICTED = 1
  # Note: it is recommended that you use an absolute pathname
  # for this value (eg. /home/foo/denyhosts/data)
  #
@@ -29,16 +30,16 @@
  #
  #######################################################################
  
-@@ -196,7 +201,7 @@
- # match your email address.  If you do not want to receive these reports
- # leave this field blank (or run with the --noemail option)
+@@ -216,7 +221,7 @@ LOCK_FILE = /var/lock/subsys/denyhosts
+ # Multiple email addresses can be delimited by a comma, eg:
+ # ADMIN_EMAIL = foo at bar.com, bar at foo.com, etc at foobar.com
  #
 -ADMIN_EMAIL = 
 +ADMIN_EMAIL = root
  #
  #######################################################################
  
-@@ -235,7 +240,7 @@
+@@ -255,7 +260,7 @@ SMTP_FROM = DenyHosts <nobody at localhost>
  #
  # SMTP_SUBJECT: you can specify the "Subject:" of messages sent
  # by DenyHosts when it reports thwarted abuse attempts


Index: denyhosts.spec
===================================================================
RCS file: /cvs/extras/rpms/denyhosts/devel/denyhosts.spec,v
retrieving revision 1.49
retrieving revision 1.50
diff -u -r1.49 -r1.50
--- denyhosts.spec	11 Jul 2008 23:41:18 -0000	1.49
+++ denyhosts.spec	28 Aug 2008 16:06:38 -0000	1.50
@@ -1,6 +1,6 @@
 Name:       denyhosts
 Version:    2.6
-Release:    11%{?dist}
+Release:    12%{?dist}
 Summary:    A script to help thwart ssh server attacks
 
 Group:      Applications/System
@@ -15,7 +15,7 @@
 Source6:    README.fedora
 Patch0:     denyhosts-2.6-config.patch
 Patch1:     denyhosts-2.4-setup.patch
-Patch2:     denyhosts-2.2-daemon-control.patch
+Patch2:     denyhosts-2.6-daemon-control.patch
 Patch3:     denyhosts-2.6-defconffile.patch
 # Patch10 is a security fix
 Patch10:    denyhosts-2.6-regex.patch
@@ -158,6 +158,9 @@
 
 
 %changelog
+* Thu Aug 28 2008 Jason L Tibbitts III <tibbs at math.uh.edu> - 2.6-12
+- Fix up patches to apply with --fuzz=0.
+
 * Fri Jul 11 2008 Jason L Tibbitts III <tibbs at math.uh.edu> - 2.6-11
 - Tweak initscript priorities to ensure that the MTA is started first.
 


--- denyhosts-2.2-daemon-control.patch DELETED ---