summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBenjamin Smee <strerror@gentoo.org>2006-04-19 16:41:45 +0000
committerBenjamin Smee <strerror@gentoo.org>2006-04-19 16:41:45 +0000
commitaded7c49c670661737cc4addca60e6f197b79e5b (patch)
tree05312b80de9ada7af5133787308170d8f357dadf /app-admin/denyhosts
parentPut in correct order R/DEPEND and need-kde. (diff)
downloadgentoo-2-aded7c49c670661737cc4addca60e6f197b79e5b.tar.gz
gentoo-2-aded7c49c670661737cc4addca60e6f197b79e5b.tar.bz2
gentoo-2-aded7c49c670661737cc4addca60e6f197b79e5b.zip
Change to config file for bug #130488
(Portage version: 2.0.54)
Diffstat (limited to 'app-admin/denyhosts')
-rw-r--r--app-admin/denyhosts/ChangeLog6
-rw-r--r--app-admin/denyhosts/files/denyhosts-2.4-gentoo.patch61
2 files changed, 23 insertions, 44 deletions
diff --git a/app-admin/denyhosts/ChangeLog b/app-admin/denyhosts/ChangeLog
index fbbdf74134f6..d48f13debfda 100644
--- a/app-admin/denyhosts/ChangeLog
+++ b/app-admin/denyhosts/ChangeLog
@@ -1,6 +1,10 @@
# ChangeLog for app-admin/denyhosts
# Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-admin/denyhosts/ChangeLog,v 1.8 2006/04/18 15:36:51 strerror Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-admin/denyhosts/ChangeLog,v 1.9 2006/04/19 16:41:45 strerror Exp $
+
+ 19 Apr 2006; Benjamin Smee <strerror@gentoo.org>
+ files/denyhosts-2.4-gentoo.patch:
+ Change to config file for bug #130488
*denyhosts-2.4 (18 Apr 2006)
diff --git a/app-admin/denyhosts/files/denyhosts-2.4-gentoo.patch b/app-admin/denyhosts/files/denyhosts-2.4-gentoo.patch
index d33467bf625a..68d95e226418 100644
--- a/app-admin/denyhosts/files/denyhosts-2.4-gentoo.patch
+++ b/app-admin/denyhosts/files/denyhosts-2.4-gentoo.patch
@@ -1,6 +1,6 @@
---- DenyHosts-2.2/denyhosts.cfg-dist 2006-02-28 10:28:21.000000000 +0000
-+++ DenyHosts-2.2-new/denyhosts.cfg-dist 2006-02-28 10:42:13.000000000 +0000
-@@ -9,13 +9,16 @@
+--- DenyHosts-2.4/denyhosts.cfg-dist 2006-04-09 13:37:46.000000000 +0000
++++ DenyHosts-2.4-new/denyhosts.cfg-dist 2006-04-19 16:25:57.000000000 +0000
+@@ -9,20 +9,22 @@
# argument
#
# Redhat or Fedora Core:
@@ -14,13 +14,20 @@
-#SECURE_LOG = /var/log/messages
+# Gentoo/SuSE:
+SECURE_LOG = /var/log/messages
-+#
+ #
+# Metalog:
-+#SECURE_LOG = /var/log/sshd/current
++SECURE_LOG = /var/log/sshd/current
+ # Mac OS X (v10.4 or greater -
+ # also refer to: http://www.denyhosts.net/faq.html#macos
+ #SECURE_LOG = /private/var/log/asl.log
+ #
+ # Mac OS X (v10.3 or earlier):
+-SECURE_LOG=/private/var/log/system.log
++#SECURE_LOG=/private/var/log/system.log
#
########################################################################
-@@ -126,7 +129,7 @@
+@@ -150,7 +152,7 @@
# Note: it is recommended that you use an absolute pathname
# for this value (eg. /home/foo/denyhosts/data)
#
@@ -29,49 +36,17 @@
#
#######################################################################
-@@ -168,11 +171,14 @@
+@@ -192,10 +194,10 @@
# running at a time.
#
# Redhat/Fedora:
-LOCK_FILE = /var/lock/subsys/denyhosts
+#LOCK_FILE = /var/lock/subsys/denyhosts
#
- # Debian
- #LOCK_FILE = /var/run/denyhosts.pid
- #
-+# Gentoo
+-# Debian
+-#LOCK_FILE = /var/run/denyhosts.pid
++# Gentoo/Debian
+LOCK_FILE = /var/run/denyhosts.pid
-+#
+ #
# Misc
#LOCK_FILE = /tmp/denyhosts.lock
- #
-diff -urN DenyHosts-2.1/setup.py DenyHosts-2.1-new/setup.py
---- DenyHosts-2.1/setup.py 2006-02-10 01:03:39.000000000 +0000
-+++ DenyHosts-2.1-new/setup.py 2006-02-13 11:03:08.000000000 +0000
-@@ -20,17 +20,17 @@
- author="Phil Schwartz",
- author_email="phil_schwartz@users.sourceforge.net",
- url="http://denyhosts.sourceforge.net",
-- scripts=['denyhosts.py'],
-+## scripts=['denyhosts.py'],
- package_dir={'DenyHosts': 'DenyHosts'},
- packages=["DenyHosts"],
-- data_files=[(libpath, glob("denyhosts.cfg-dist")),
-- (libpath, glob("setup.py")),
-- (libpath, glob("daemon-control-dist")),
-- (libpath, glob("CHANGELOG.txt")),
-- (libpath, glob("README.txt")),
-- (scriptspath, glob("scripts/*")),
-- (pluginspath, glob("plugins/*")),
-- (libpath, glob("LICENSE.txt"))],
-+## data_files=[(libpath, glob("denyhosts.cfg-dist")),
-+## (libpath, glob("setup.py")),
-+## (libpath, glob("daemon-control-dist")),
-+## (libpath, glob("CHANGELOG.txt")),
-+## (libpath, glob("README.txt")),
-+## (scriptspath, glob("scripts/*")),
-+## (pluginspath, glob("plugins/*")),
-+## (libpath, glob("LICENSE.txt"))],
- license="GPL v2",
- ##extra_path='denyhosts',
- long_description="""