upgrade to 2.2

PR:		95044
Submitted by:	maintainer

6 files changed, 68 insertions, 21 deletions

diff --git a/security/denyhosts/Makefile b/security/denyhosts/Makefile
index e4ba941658a7..42ea4106d306 100644
--- a/security/denyhosts/Makefile
+++ b/security/denyhosts/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	denyhosts
-PORTVERSION=	1.1.2
+PORTVERSION=	2.2
 CATEGORIES=	security
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
@@ -34,5 +34,6 @@ post-install:
 	@${INSTALL_DATA} ${WRKSRC}/${file} ${DOCSDIR}
 .endfor
 .endif
+	 @${CAT} ${PKGMESSAGE}
 
 .include <bsd.port.mk>
diff --git a/security/denyhosts/distinfo b/security/denyhosts/distinfo
index 9ccba8302cae..2fad049f45b6 100644
--- a/security/denyhosts/distinfo
+++ b/security/denyhosts/distinfo
@@ -1,3 +1,3 @@
-MD5 (DenyHosts-1.1.2.tar.gz) = d2c6f00243c0fcd0f4498c3c71a1074e
-SHA256 (DenyHosts-1.1.2.tar.gz) = e570af443d87a1b6cc4262c2e4f769e07ba5de7d75f9980f8f914160ed9c1a04
-SIZE (DenyHosts-1.1.2.tar.gz) = 31000
+MD5 (DenyHosts-2.2.tar.gz) = feba0e9a48dbf1fa9cbd2b5b8907f349
+SHA256 (DenyHosts-2.2.tar.gz) = 369d37528287550ae152b2cd553549c021dab3c5a6b15fea93656749e7559bfd
+SIZE (DenyHosts-2.2.tar.gz) = 40972
diff --git a/security/denyhosts/files/patch-denyhosts.cfg-dist b/security/denyhosts/files/patch-denyhosts.cfg-dist
index 49f7b56fb701..5505eb82602b 100644
--- a/security/denyhosts/files/patch-denyhosts.cfg-dist
+++ b/security/denyhosts/files/patch-denyhosts.cfg-dist
@@ -6,30 +6,53 @@ $FreeBSD$
 @@ -9,10 +9,10 @@
  # argument
  #
- # Redhat:
+ # Redhat or Fedora Core:
 -SECURE_LOG = /var/log/secure
 +#SECURE_LOG = /var/log/secure
  #
- # Mandrake or FreeBSD: 
+ # Mandrake, FreeBSD or OpenBSD: 
 -#SECURE_LOG = /var/log/auth.log
 +SECURE_LOG = /var/log/auth.log
  #
  # SuSE:
  #SECURE_LOG = /var/log/messages
-@@ -23,10 +23,10 @@
+@@ -23,7 +23,7 @@
  # HOSTS_DENY: the file which contains restricted host access information
  #
  # Most operating systems:
 -HOSTS_DENY = /etc/hosts.deny
-+#HOSTS_DENY = /etc/hosts.deny
++HOSTS_DENY = /etc/hosts.deniedssh
  #
  # Some BSD (FreeBSD) Unixes:
--#HOSTS_DENY = /etc/hosts.allow
-+HOSTS_DENY = /etc/hosts.allow
+ #HOSTS_DENY = /etc/hosts.allow
+@@ -66,7 +66,7 @@
+ # To block all services for the offending host:
+ #BLOCK_SERVICE = ALL
+ # To block only sshd:
+-BLOCK_SERVICE  = sshd
++#BLOCK_SERVICE  = sshd
+ # To only record the offending host and nothing else (if using
+ # an auxilary file to list the hosts).  Refer to: 
+ # http://denyhosts.sourceforge.net/faq.html#aux
+@@ -126,7 +126,7 @@
+ # Note: it is recommended that you use an absolute pathname
+ # for this value (eg. /home/foo/denyhosts/data)
  #
- # Another possibility (also see the next option):
- #HOSTS_DENY = /etc/hosts.evil
-@@ -157,10 +157,10 @@
+-WORK_DIR = /usr/share/denyhosts/data
++WORK_DIR = %%PREFIX%%/share/denyhosts/data
+ #
+ #######################################################################
+ 
+@@ -152,7 +152,7 @@
+ # the corresponding hostname will be looked up and reported as well
+ # (if available).
+ #
+-HOSTNAME_LOOKUP=YES
++HOSTNAME_LOOKUP=NO
+ #
+ ######################################################################
+ 
+@@ -168,10 +168,10 @@
  # running at a time.
  #
  # Redhat/Fedora:
diff --git a/security/denyhosts/files/patch-setup.py b/security/denyhosts/files/patch-setup.py
index 0e959b394b81..43abf0958c65 100644
--- a/security/denyhosts/files/patch-setup.py
+++ b/security/denyhosts/files/patch-setup.py
@@ -3,24 +3,25 @@ $FreeBSD$
 
 --- setup.py.orig
 +++ setup.py
-@@ -7,7 +7,7 @@
+@@ -8,7 +8,7 @@
  from glob import glob
  
  
 -libpath = "/usr/share/denyhosts"
 +libpath = "%%PREFIX%%/share/denyhosts"
+ scriptspath = "%s/scripts" % libpath
+ pluginspath = "%s/plugins" % libpath
  
- #########################################################################
- 
-@@ -24,10 +24,7 @@
+@@ -26,11 +26,8 @@
        data_files=[(libpath, glob("denyhosts.cfg-dist")),
-                   (libpath, glob("denyhosts-daemon-initscript")),
                    (libpath, glob("setup.py")),
--                  (libpath, glob("daemon-control-dist")),
+                   (libpath, glob("daemon-control-dist")),
 -                  (libpath, glob("CHANGELOG.txt")),
 -                  (libpath, glob("README.txt")),
+                   (scriptspath, glob("scripts/*")),
+-                  (pluginspath, glob("plugins/*")),
 -                  (libpath, glob("LICENSE.txt"))],
-+                  (libpath, glob("daemon-control-dist"))],
-       license="GPL",
++                  (pluginspath, glob("plugins/*"))],
+       license="GPL v2",
        ##extra_path='denyhosts',
        long_description="""
diff --git a/security/denyhosts/pkg-message b/security/denyhosts/pkg-message
new file mode 100644
index 000000000000..2d720d859820
--- /dev/null
+++ b/security/denyhosts/pkg-message
@@ -0,0 +1,8 @@
+-------------------------------------------------------------------------------
+In order to proper working of denyhosts
+1. edit your /etc/hosts.allow file and add:
+sshd : /etc/hosts.deniedssh : deny
+sshd : ALL : allow
+2. issue the following command if /etc/hosts.deniedssh does not exist yet
+touch /etc/hosts.deniedssh 
+-------------------------------------------------------------------------------
diff --git a/security/denyhosts/pkg-plist b/security/denyhosts/pkg-plist
index 1916a1637304..a6d7618f95bf 100644
--- a/security/denyhosts/pkg-plist
+++ b/security/denyhosts/pkg-plist
@@ -2,6 +2,12 @@ bin/denyhosts.py
 %%DATADIR%%/denyhosts.cfg-dist
 %%DATADIR%%/setup.py
 %%DATADIR%%/daemon-control-dist
+%%DATADIR%%/scripts/restricted_from_invalid.py
+%%DATADIR%%/scripts/restricted_from_passwd.py
+%%DATADIR%%/plugins/README.contrib
+%%DATADIR%%/plugins/shorewall_allow.sh
+%%DATADIR%%/plugins/shorewall_deny.sh
+%%DATADIR%%/plugins/test_deny.py
 %%PYTHON_SITELIBDIR%%/DenyHosts/loginattempt.py
 %%PYTHON_SITELIBDIR%%/DenyHosts/loginattempt.pyc
 %%PYTHON_SITELIBDIR%%/DenyHosts/loginattempt.pyo
@@ -56,9 +62,17 @@ bin/denyhosts.py
 %%PYTHON_SITELIBDIR%%/DenyHosts/regex.py
 %%PYTHON_SITELIBDIR%%/DenyHosts/regex.pyc
 %%PYTHON_SITELIBDIR%%/DenyHosts/regex.pyo
+%%PYTHON_SITELIBDIR%%/DenyHosts/sync.py
+%%PYTHON_SITELIBDIR%%/DenyHosts/sync.pyc
+%%PYTHON_SITELIBDIR%%/DenyHosts/sync.pyo
+%%PYTHON_SITELIBDIR%%/DenyHosts/restricted.py
+%%PYTHON_SITELIBDIR%%/DenyHosts/restricted.pyc
+%%PYTHON_SITELIBDIR%%/DenyHosts/restricted.pyo
 %%PORTDOCS%%%%DOCSDIR%%/CHANGELOG.txt
 %%PORTDOCS%%%%DOCSDIR%%/LICENSE.txt
 %%PORTDOCS%%%%DOCSDIR%%/README.txt
 %%PORTDOCS%%@dirrm %%DOCSDIR%%
 @dirrm %%PYTHON_SITELIBDIR%%/DenyHosts
+@dirrm %%DATADIR%%/scripts
+@dirrm %%DATADIR%%/plugins
 @dirrm %%DATADIR%%