Update to 3.1.2

- Use upstream release tarball
- Update manpage location (r523104)

Changes:	https://github.com/denyhosts/denyhosts/releases
		https://github.com/denyhosts/denyhosts/commits/master

6 files changed, 40 insertions, 61 deletions

diff --git a/security/denyhosts/Makefile b/security/denyhosts/Makefile
index 4946ac97ca9f..ab61e2392c9f 100644
--- a/security/denyhosts/Makefile
+++ b/security/denyhosts/Makefile
@@ -2,11 +2,11 @@
 # $FreeBSD$
 
 PORTNAME=	denyhosts
-PORTVERSION=	3.1
-DISTVERSIONPREFIX=	v
-PORTREVISION=	1
+PORTVERSION=	3.1.2
 CATEGORIES=	security
 PKGNAMESUFFIX=	${PYTHON_PKGNAMESUFFIX}
+MASTER_SITES=	https://github.com/denyhosts/denyhosts/releases/download/v${PORTVERSION:R}/
+DISTNAME=	DenyHosts-${PORTVERSION}
 
 MAINTAINER=	sunpoet@FreeBSD.org
 COMMENT=	Script to thwart ssh and imap attacks
@@ -27,8 +27,6 @@ PLIST_FILES=	"@sample etc/denyhosts.conf.sample"
 SUB_FILES=	pkg-message
 SUB_LIST=	PYTHON=${PYTHON_CMD}
 
-USE_GITHUB=	yes
-
 SHEBANG_FILES=	daemon-control-dist \
 		plugins/test_deny.py \
 		scripts/restricted_from_invalid.py \
diff --git a/security/denyhosts/distinfo b/security/denyhosts/distinfo
index 8c8e9398c16c..5ff70f7b8cae 100644
--- a/security/denyhosts/distinfo
+++ b/security/denyhosts/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1567007893
-SHA256 (denyhosts-denyhosts-v3.1_GH0.tar.gz) = 7a6aee5934a56473ad54d373715da1e715ff2ffd19b9dceb54b0297fe8c3a965
-SIZE (denyhosts-denyhosts-v3.1_GH0.tar.gz) = 57160
+TIMESTAMP = 1598627070
+SHA256 (DenyHosts-3.1.2.tar.gz) = cfae79a11ce27e0e8a7a9915139d4c6b68df1022e447432d589e8fbb8e1aa9e7
+SIZE (DenyHosts-3.1.2.tar.gz) = 53086
diff --git a/security/denyhosts/files/patch-DenyHosts-report.py b/security/denyhosts/files/patch-DenyHosts-report.py
deleted file mode 100644
index e31e0674113b..000000000000
--- a/security/denyhosts/files/patch-DenyHosts-report.py
+++ /dev/null
@@ -1,25 +0,0 @@
-Obtained from:	https://github.com/denyhosts/denyhosts/commit/d4cdd64d2e3b2c395193a141db8d3c5cbda91f28
-
---- DenyHosts/report.py.orig	2015-09-16 19:40:15 UTC
-+++ DenyHosts/report.py
-@@ -1,9 +1,6 @@
- import logging
- import re
- import socket
--# Removing this as it causes runtime errors on Python3.4
--# from types import ListType, TupleType
--import types
- from .util import is_true
- try:
-     import syslog
-@@ -39,8 +36,8 @@ class Report:
-     def add_section(self, message, iterable):
-         self.report += "%s:\n\n" % message
-         for i in iterable:
--            # if type(i) in (TupleType, ListType):
--            if (type(i) is types.ListType) or (type(i) is types.TupleType):
-+            # checks the item type (list or tuple)
-+            if isinstance(i, list) or isinstance(i, tuple):
-                 extra = ": %d\n" % i[1]
-                 i = i[0]
-             else:
diff --git a/security/denyhosts/files/patch-daemon-control-dist b/security/denyhosts/files/patch-daemon-control-dist
index 35ffc7a07c11..d066557da26f 100644
--- a/security/denyhosts/files/patch-daemon-control-dist
+++ b/security/denyhosts/files/patch-daemon-control-dist
@@ -1,18 +1,18 @@
---- daemon-control-dist.orig	2015-09-16 19:40:15 UTC
+--- daemon-control-dist.orig	2020-05-08 14:20:42 UTC
 +++ daemon-control-dist
-@@ -11,11 +11,11 @@
- #### Edit these to suit your configuration ####
+@@ -16,11 +16,11 @@ import time  # do not edit
+ #    Edit these to suit your configuration    #
  ###############################################
  
--DENYHOSTS_BIN   = "/usr/sbin/denyhosts"
--DENYHOSTS_LOCK  = "/run/denyhosts.pid"
--DENYHOSTS_CFG   = "/etc/denyhosts.conf"
-+DENYHOSTS_BIN   = "%%PREFIX%%/bin/denyhosts.py"
-+DENYHOSTS_LOCK  = "/var/run/denyhosts.pid"
-+DENYHOSTS_CFG   = "%%PREFIX%%/etc/denyhosts.conf"
+-DENYHOSTS_BIN = "/usr/sbin/denyhosts.py"
+-DENYHOSTS_LOCK = "/run/denyhosts.pid"
+-DENYHOSTS_CFG = "/etc/denyhosts.conf"
++DENYHOSTS_BIN = "%%PREFIX%%/sbin/denyhosts.py"
++DENYHOSTS_LOCK = "/var/run/denyhosts.pid"
++DENYHOSTS_CFG = "%%PREFIX%%/etc/denyhosts.conf"
  
--PYTHON_BIN      = "/usr/bin/env python"
-+PYTHON_BIN      = "%%PYTHON_CMD%%"
+-PYTHON_BIN = "/usr/bin/python3"
++PYTHON_BIN = "%%PYTHON_CMD%%"
  
- ###############################################
- ####         Do not edit below             ####
+ distro = platform.uname()[3]
+ distro2 = platform.uname()[2]
diff --git a/security/denyhosts/files/patch-denyhosts.conf b/security/denyhosts/files/patch-denyhosts.conf
index e237a090a203..20a96738afab 100644
--- a/security/denyhosts/files/patch-denyhosts.conf
+++ b/security/denyhosts/files/patch-denyhosts.conf
@@ -1,4 +1,4 @@
---- denyhosts.conf.orig	2015-09-16 19:40:15 UTC
+--- denyhosts.conf.orig	2020-05-08 14:20:42 UTC
 +++ denyhosts.conf
 @@ -12,7 +12,7 @@
  #SECURE_LOG = /var/log/secure
@@ -47,16 +47,19 @@
  #
  #######################################################################
  
-@@ -220,7 +222,7 @@ HOSTNAME_LOOKUP=NO
- # Redhat/Fedora:
+@@ -221,8 +223,10 @@ HOSTNAME_LOOKUP=NO
  #LOCK_FILE = /var/lock/subsys/denyhosts
  #
--# Debian or Gentoo
-+# FreeBSD, Debian or Gentoo
- LOCK_FILE = /var/run/denyhosts.pid
+ # Debian or Gentoo
+-LOCK_FILE = /run/denyhosts.pid
++#LOCK_FILE = /run/denyhosts.pid
  #
++# FreeBSD
++LOCK_FILE = /var/run/denyhosts.pid
  # Misc
-@@ -502,6 +504,8 @@ AGE_RESET_INVALID=10d
+ #LOCK_FILE = /tmp/denyhosts.lock
+ #
+@@ -508,6 +512,8 @@ AGE_RESET_INVALID=10d
  #    http://denyhost.sf.net/faq.html#userdef_regex
  #
  #USERDEF_FAILED_ENTRY_REGEX=
diff --git a/security/denyhosts/files/patch-setup.py b/security/denyhosts/files/patch-setup.py
index fc7f031912a5..8a6d3ed5d1b8 100644
--- a/security/denyhosts/files/patch-setup.py
+++ b/security/denyhosts/files/patch-setup.py
@@ -1,21 +1,24 @@
---- setup.py.orig	2015-09-16 19:40:15 UTC
+--- setup.py.orig	2020-05-08 14:20:42 UTC
 +++ setup.py
-@@ -11,8 +11,8 @@ from DenyHosts.util import normalize_whi
+@@ -13,8 +13,8 @@ from DenyHosts.util import normalize_whitespace
  from DenyHosts.version import VERSION
  
  etcpath = "/etc"
 -manpath = "/usr/share/man/man8"
 -libpath = "/usr/share/denyhosts"
-+manpath = "%%PREFIX%%/man/man8"
++manpath = "%%PREFIX%%/share/man/man8"
 +libpath = "%%PREFIX%%/share/denyhosts"
  scriptspath = ospj("scripts", libpath)
  pluginspath = ospj("plugins", libpath)
- 
-@@ -28,7 +28,6 @@ setup(
+ denyhostsman = 'denyhosts.8'
+@@ -50,10 +50,6 @@ setup(
+     package_dir={'DenyHosts': 'DenyHosts'},
      packages=["DenyHosts"],
      requires=["ipaddr"],
-     data_files=[
+-    data_files=[
 -        (etcpath, glob("denyhosts.conf")),
-         (manpath, glob("denyhosts.8")),
-     ],
+-        (manpath, glob(denyhostsman)),
+-    ],
      license="GPL v2",
+     long_description=normalize_whitespace(
+         """