From owner-svn-ports-head@FreeBSD.ORG Sat Aug 30 02:53:45 2014 Return-Path: Delivered-To: svn-ports-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 68DC9A15; Sat, 30 Aug 2014 02:53:45 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 53C8C1CAD; Sat, 30 Aug 2014 02:53:45 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id s7U2rjZ0041624; Sat, 30 Aug 2014 02:53:45 GMT (envelope-from sunpoet@FreeBSD.org) Received: (from sunpoet@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id s7U2ricM041622; Sat, 30 Aug 2014 02:53:44 GMT (envelope-from sunpoet@FreeBSD.org) Message-Id: <201408300253.s7U2ricM041622@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: sunpoet set sender to sunpoet@FreeBSD.org using -f From: Sunpoet Po-Chuan Hsieh Date: Sat, 30 Aug 2014 02:53:44 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r366587 - head/security/denyhosts X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 30 Aug 2014 02:53:45 -0000 Author: sunpoet Date: Sat Aug 30 02:53:44 2014 New Revision: 366587 URL: http://svnweb.freebsd.org/changeset/ports/366587 QAT: https://qat.redports.org/buildarchive/r366587/ Log: - Add missing OPTIONS_DEFINE - Convert PYDISTUTILS_AUTOPLIST and USE_PYDISTUTILS to USE_PYTHON - Remove python from SHEBANG_LANG - Add REINPLACE_ARGS - Move .bak/.orig removal from pre-install: to post-patch: - Use @sample - Bump PORTREVISION for package change - Take maintainership Modified: head/security/denyhosts/Makefile head/security/denyhosts/pkg-plist Modified: head/security/denyhosts/Makefile ============================================================================== --- head/security/denyhosts/Makefile Sat Aug 30 02:32:58 2014 (r366586) +++ head/security/denyhosts/Makefile Sat Aug 30 02:53:44 2014 (r366587) @@ -3,47 +3,41 @@ PORTNAME= denyhosts PORTVERSION= 2.6 -PORTREVISION= 5 +PORTREVISION= 6 CATEGORIES= security MASTER_SITES= SF DISTNAME= DenyHosts-${PORTVERSION} -MAINTAINER= ports@FreeBSD.org +MAINTAINER= sunpoet@FreeBSD.org COMMENT= Script to thwart ssh attacks LICENSE= GPLv2 -USE_PYDISTUTILS= yes -PYDISTUTILS_AUTOPLIST= yes +OPTIONS_DEFINE= DOCS +REINPLACE_ARGS= -i '' +USE_PYTHON= autoplist distutils +USE_RC_SUBR= denyhosts USES= python:2 shebangfix -env_OLD_CMD= /bin/env -env_CMD= ${SETENV} -SHEBANG_LANG= python env -SHEBANG_FILES= plugins/test_deny.py \ - scripts/restricted_from_invalid.py \ - scripts/restricted_from_passwd.py -USE_RC_SUBR= denyhosts -SUB_LIST+= PYTHON=${PYTHON_CMD} +PORTDOCS= CHANGELOG.txt LICENSE.txt README.txt SUB_FILES= pkg-message +SUB_LIST= PYTHON=${PYTHON_CMD} -PORTDOCS= CHANGELOG.txt LICENSE.txt README.txt +SHEBANG_LANG= env +SHEBANG_FILES= plugins/test_deny.py \ + scripts/restricted_from_invalid.py \ + scripts/restricted_from_passwd.py +env_OLD_CMD= /bin/env +env_CMD= ${SETENV} post-patch: - @${REINPLACE_CMD} -e 's,%%PREFIX%%,${PREFIX},' \ - ${WRKSRC}/daemon-control-dist \ - ${WRKSRC}/denyhosts.cfg-dist \ - ${WRKSRC}/setup.py - -pre-install: - @${FIND} ${WRKSRC} -type f \( -name \*.bak -o -name \*.orig \) -delete + @${REINPLACE_CMD} -e 's|%%PREFIX%%|${PREFIX}|' ${WRKSRC}/daemon-control-dist ${WRKSRC}/denyhosts.cfg-dist ${WRKSRC}/setup.py + @${FIND} ${WRKSRC} -type f -name '*.bak' -o -name '*.orig' -delete post-install: - ${INSTALL_DATA} ${WRKSRC}/denyhosts.cfg-dist \ - ${STAGEDIR}${PREFIX}/etc/denyhosts.conf-dist - - @${MKDIR} ${STAGEDIR}${DOCSDIR} - ${INSTALL_DATA} ${PORTDOCS:S|^|${WRKSRC}/|} ${STAGEDIR}${DOCSDIR} + ${INSTALL_DATA} ${WRKSRC}/denyhosts.cfg-dist ${STAGEDIR}${PREFIX}/etc/denyhosts.conf.sample + ${MKDIR} ${STAGEDIR}${DOCSDIR}/ + cd ${WRKSRC}/ && ${INSTALL_DATA} ${PORTDOCS} ${STAGEDIR}${DOCSDIR}/ .include Modified: head/security/denyhosts/pkg-plist ============================================================================== --- head/security/denyhosts/pkg-plist Sat Aug 30 02:32:58 2014 (r366586) +++ head/security/denyhosts/pkg-plist Sat Aug 30 02:53:44 2014 (r366587) @@ -1,3 +1 @@ -@unexec if cmp -s %D/etc/denyhosts.conf %D/etc/denyhosts.conf-dist; then rm -f %D/etc/denyhosts.conf; fi -etc/denyhosts.conf-dist -@exec [ -f %B/denyhosts.conf ] || cp -f %B/%f %B/denyhosts.conf +@sample etc/denyhosts.conf.sample