From owner-svn-ports-all@freebsd.org Sun Aug 30 07:14:11 2020 Return-Path: Delivered-To: svn-ports-all@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 997283CEDE3; Sun, 30 Aug 2020 07:14:11 +0000 (UTC) (envelope-from sunpoet@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4BfPhd6XQGz4jtH; Sun, 30 Aug 2020 07:14:09 +0000 (UTC) (envelope-from sunpoet@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id F1C7212E49; Sun, 30 Aug 2020 07:14:08 +0000 (UTC) (envelope-from sunpoet@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 07U7E8ej006874; Sun, 30 Aug 2020 07:14:08 GMT (envelope-from sunpoet@FreeBSD.org) Received: (from sunpoet@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 07U7E7QP006869; Sun, 30 Aug 2020 07:14:07 GMT (envelope-from sunpoet@FreeBSD.org) Message-Id: <202008300714.07U7E7QP006869@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: sunpoet set sender to sunpoet@FreeBSD.org using -f From: Sunpoet Po-Chuan Hsieh Date: Sun, 30 Aug 2020 07:14:07 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r546989 - in head/security/denyhosts: . files X-SVN-Group: ports-head X-SVN-Commit-Author: sunpoet X-SVN-Commit-Paths: in head/security/denyhosts: . files X-SVN-Commit-Revision: 546989 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.33 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 30 Aug 2020 07:14:13 -0000 Author: sunpoet Date: Sun Aug 30 07:14:07 2020 New Revision: 546989 URL: https://svnweb.freebsd.org/changeset/ports/546989 Log: 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 Deleted: head/security/denyhosts/files/patch-DenyHosts-report.py Modified: head/security/denyhosts/Makefile head/security/denyhosts/distinfo head/security/denyhosts/files/patch-daemon-control-dist head/security/denyhosts/files/patch-denyhosts.conf head/security/denyhosts/files/patch-setup.py Modified: head/security/denyhosts/Makefile ============================================================================== --- head/security/denyhosts/Makefile Sun Aug 30 07:14:02 2020 (r546988) +++ head/security/denyhosts/Makefile Sun Aug 30 07:14:07 2020 (r546989) @@ -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 @@ -26,8 +26,6 @@ USE_RC_SUBR= denyhosts 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 \ Modified: head/security/denyhosts/distinfo ============================================================================== --- head/security/denyhosts/distinfo Sun Aug 30 07:14:02 2020 (r546988) +++ head/security/denyhosts/distinfo Sun Aug 30 07:14:07 2020 (r546989) @@ -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 Modified: head/security/denyhosts/files/patch-daemon-control-dist ============================================================================== --- head/security/denyhosts/files/patch-daemon-control-dist Sun Aug 30 07:14:02 2020 (r546988) +++ head/security/denyhosts/files/patch-daemon-control-dist Sun Aug 30 07:14:07 2020 (r546989) @@ -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] Modified: head/security/denyhosts/files/patch-denyhosts.conf ============================================================================== --- head/security/denyhosts/files/patch-denyhosts.conf Sun Aug 30 07:14:02 2020 (r546988) +++ head/security/denyhosts/files/patch-denyhosts.conf Sun Aug 30 07:14:07 2020 (r546989) @@ -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= Modified: head/security/denyhosts/files/patch-setup.py ============================================================================== --- head/security/denyhosts/files/patch-setup.py Sun Aug 30 07:14:02 2020 (r546988) +++ head/security/denyhosts/files/patch-setup.py Sun Aug 30 07:14:07 2020 (r546989) @@ -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( + """