From owner-svn-ports-head@FreeBSD.ORG Tue Dec 31 10:45:49 2013 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 951C8969; Tue, 31 Dec 2013 10:45:49 +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)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 8175116DB; Tue, 31 Dec 2013 10:45:49 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id rBVAjnua041905; Tue, 31 Dec 2013 10:45:49 GMT (envelope-from mat@svn.freebsd.org) Received: (from mat@localhost) by svn.freebsd.org (8.14.7/8.14.7/Submit) id rBVAjmqM041902; Tue, 31 Dec 2013 10:45:48 GMT (envelope-from mat@svn.freebsd.org) Message-Id: <201312311045.rBVAjmqM041902@svn.freebsd.org> From: Mathieu Arnold Date: Tue, 31 Dec 2013 10:45:48 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r338280 - head/security/john 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.17 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: Tue, 31 Dec 2013 10:45:49 -0000 Author: mat Date: Tue Dec 31 10:45:48 2013 New Revision: 338280 URL: http://svnweb.freebsd.org/changeset/ports/338280 Log: - Update from 1.7.9-jumbo-5 to 1.7.9-jumbo-7 [1] - Support staging - Minor fixes maintainer timeout [1] PR: ports/180794, ports/185246 [1] Submitted by: Hung-Yi Chen, Royce Williams [1] Modified: head/security/john/Makefile (contents, props changed) head/security/john/distinfo (contents, props changed) head/security/john/pkg-plist (contents, props changed) Modified: head/security/john/Makefile ============================================================================== --- head/security/john/Makefile Tue Dec 31 10:10:07 2013 (r338279) +++ head/security/john/Makefile Tue Dec 31 10:45:48 2013 (r338280) @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= john -DISTVERSION= 1.7.9-jumbo-5 +DISTVERSION= 1.7.9-jumbo-7 CATEGORIES= security MASTER_SITES= http://www.openwall.com/john/g/ \ http://mirrors.kernel.org/openwall/projects/john/${DISTVERSION:C/-.*//}/ \ @@ -14,8 +14,9 @@ COMMENT= Featureful Unix password cracke LICENSE= GPLv2 +USES= gmake shebangfix USE_BZIP2= yes -USE_GMAKE= yes +SHEBANG_FILES= run/*.pl BUILD_WRKSRC= ${WRKDIR}/${DISTNAME}/src # We prefer -jumbo (community-enhanced) versions instead of vanilla releases @@ -37,7 +38,6 @@ PORTDOCS= CHANGES CONFIG EXAMPLES EXTERN OPTIONS_DEFINE= OPENMP DOCS OPENMP_DESC= Compile with OpenMP support -NO_STAGE= yes .include .if ${ARCH} == "i386" @@ -80,20 +80,15 @@ pre-build: @${ECHO_CMD} do-install: - ${INSTALL_PROGRAM} ${WRKSRC}/run/john ${PREFIX}/bin - ${LN} -sf john ${PREFIX}/bin/xtract - ${LN} -sf john ${PREFIX}/bin/unshadow - @${MKDIR} ${DATADIR} - cd ${WRKSRC}/run && ${INSTALL_DATA} *.??? [^j]*.conf ${DATADIR} - cd ${WRKSRC}/run && ${INSTALL_SCRIPT} *.?? mailer ${DATADIR} + ${INSTALL_PROGRAM} ${WRKSRC}/run/john ${STAGEDIR}${PREFIX}/bin + ${LN} -sf john ${STAGEDIR}${PREFIX}/bin/xtract + ${LN} -sf john ${STAGEDIR}${PREFIX}/bin/unshadow + @${MKDIR} ${STAGEDIR}${DATADIR} + cd ${WRKSRC}/run && ${INSTALL_DATA} *.??? [^j]*.conf ${STAGEDIR}${DATADIR} + cd ${WRKSRC}/run && ${INSTALL_SCRIPT} *.?? mailer ${STAGEDIR}${DATADIR} ${INSTALL_DATA} ${WRKSRC}/run/john.conf \ - ${PREFIX}/etc/john.conf.default -.if !exists(${PREFIX}/etc/john.conf) - ${INSTALL_DATA} ${WRKSRC}/run/john.conf ${PREFIX}/etc -.endif -.if ${PORT_OPTIONS:MDOCS} - @${MKDIR} ${DOCSDIR} - ${INSTALL_DATA} ${PORTDOCS:S|^|${WRKSRC}/doc/|} ${DOCSDIR} -.endif + ${STAGEDIR}${PREFIX}/etc/john.conf.default + @${MKDIR} ${STAGEDIR}${DOCSDIR} + ${INSTALL_DATA} ${PORTDOCS:S|^|${WRKSRC}/doc/|} ${STAGEDIR}${DOCSDIR} .include Modified: head/security/john/distinfo ============================================================================== --- head/security/john/distinfo Tue Dec 31 10:10:07 2013 (r338279) +++ head/security/john/distinfo Tue Dec 31 10:45:48 2013 (r338280) @@ -1,2 +1,2 @@ -SHA256 (john-1.7.9-jumbo-5.tar.bz2) = 4007aec40d2fedb1ce3287c62f23f8a1a8b8029d22cd3cbc60bb1a42f56c1a7f -SIZE (john-1.7.9-jumbo-5.tar.bz2) = 1214046 +SHA256 (john-1.7.9-jumbo-7.tar.bz2) = fa7e5a1a31e61d516a97318fac27758ca40b1a626f4dbf353ecece8a41f54d32 +SIZE (john-1.7.9-jumbo-7.tar.bz2) = 1595514 Modified: head/security/john/pkg-plist ============================================================================== --- head/security/john/pkg-plist Tue Dec 31 10:10:07 2013 (r338279) +++ head/security/john/pkg-plist Tue Dec 31 10:45:48 2013 (r338280) @@ -7,7 +7,7 @@ etc/john.conf.default %%DATADIR%%/all.chr %%DATADIR%%/alnum.chr %%DATADIR%%/alpha.chr -%%DATADIR%%/cmpt_cp.pl +%%DATADIR%%/cracf2john.py %%DATADIR%%/digits.chr %%DATADIR%%/dumb16.conf %%DATADIR%%/dumb32.conf @@ -20,9 +20,12 @@ etc/john.conf.default %%DATADIR%%/mailer %%DATADIR%%/netntlm.pl %%DATADIR%%/netscreen.py +%%DATADIR%%/odf2john.py +%%DATADIR%%/pass_gen.pl %%DATADIR%%/password.lst %%DATADIR%%/radius2john.pl -%%DATADIR%%/sap_prepare.pl +%%DATADIR%%/sap2john.pl %%DATADIR%%/sha-dump.pl %%DATADIR%%/sha-test.pl +%%DATADIR%%/sipdump2john.py @dirrm %%DATADIR%%