From nobody@FreeBSD.org  Sat Dec 28 17:58:59 2013
Return-Path: <nobody@FreeBSD.org>
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1])
	(using TLSv1 with cipher ADH-AES256-SHA (256/256 bits))
	(No client certificate requested)
	by hub.freebsd.org (Postfix) with ESMTPS id 06CAFFC7
	for <freebsd-gnats-submit@FreeBSD.org>; Sat, 28 Dec 2013 17:58:59 +0000 (UTC)
Received: from oldred.freebsd.org (oldred.freebsd.org [IPv6:2001:1900:2254:206a::50:4])
	(using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits))
	(No client certificate requested)
	by mx1.freebsd.org (Postfix) with ESMTPS id C9C5B1E60
	for <freebsd-gnats-submit@FreeBSD.org>; Sat, 28 Dec 2013 17:58:58 +0000 (UTC)
Received: from oldred.freebsd.org ([127.0.1.6])
	by oldred.freebsd.org (8.14.5/8.14.7) with ESMTP id rBSHwwZl015461
	for <freebsd-gnats-submit@FreeBSD.org>; Sat, 28 Dec 2013 17:58:58 GMT
	(envelope-from nobody@oldred.freebsd.org)
Received: (from nobody@localhost)
	by oldred.freebsd.org (8.14.5/8.14.5/Submit) id rBSHwwqB015455;
	Sat, 28 Dec 2013 17:58:58 GMT
	(envelope-from nobody)
Message-Id: <201312281758.rBSHwwqB015455@oldred.freebsd.org>
Date: Sat, 28 Dec 2013 17:58:58 GMT
From: Royce Williams <royce@tycho.org>
To: freebsd-gnats-submit@FreeBSD.org
Subject: security/john: update to 1.7.9-jumbo-7
X-Send-Pr-Version: www-3.1
X-GNATS-Notify:

>Number:         185246
>Category:       ports
>Synopsis:       security/john: update to 1.7.9-jumbo-7
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    danfe
>State:          closed
>Quarter:        
>Keywords:       
>Date-Required:  
>Class:          update
>Submitter-Id:   current-users
>Arrival-Date:   Sat Dec 28 18:00:01 UTC 2013
>Closed-Date:    Tue Dec 31 10:45:13 UTC 2013
>Last-Modified:  Tue Dec 31 10:50:00 UTC 2013
>Originator:     Royce Williams
>Release:        8.3-RELEASE
>Organization:
>Environment:
hostname.redacted 8.3-RELEASE-p11 FreeBSD 8.3-RELEASE-p11 #0: Tue Sep 10 00:06:55 UTC 2013     root@amd64-builder.daemonology.net:/usr/obj/usr/src/sys/GENERIC  amd64
>Description:
Formal port update request, following up on a chain of informal requests starting in August 2012, including additional requests in October 2013, November 2013, and December 2013.

Maintainer has stated that he prefers to make significant improvements to the port rather than making this basic update.  In my view, they are not mutually exclusive.
>How-To-Repeat:
n/a
>Fix:
Apply patch.

Patch attached with submission follows:

diff -ur john.orig.j5-to-j7/Makefile john.new.j5-to-j7/Makefile
--- john.orig.j5-to-j7/Makefile 2013-09-20 14:55:24.000000000 -0800
+++ john.new.j5-to-j7/Makefile  2013-10-26 09:46:49.000000000 -0800
@@ -2,7 +2,7 @@
 # $FreeBSD: security/john/Makefile 327769 2013-09-20 22:55:24Z bapt $

 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/-.*//}/ \

diff -ur john.orig.j5-to-j7/distinfo john.new.j5-to-j7/distinfo
--- john.orig.j5-to-j7/distinfo 2012-07-14 06:29:18.000000000 -0800
+++ john.new.j5-to-j7/distinfo  2013-10-26 09:49:04.000000000 -0800
@@ -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

diff -ur john.orig.j5-to-j7/pkg-plist john.new.j5-to-j7/pkg-plist
--- john.orig.j5-to-j7/pkg-plist        2012-07-14 06:29:18.000000000 -0800
+++ john.new.j5-to-j7/pkg-plist 2013-11-20 07:25:29.000000000 -0900
@@ -7,7 +7,7 @@
 %%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 @@
 %%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%%


>Release-Note:
>Audit-Trail:
Responsible-Changed-From-To: freebsd-ports-bugs->danfe 
Responsible-Changed-By: edwin 
Responsible-Changed-When: Sat Dec 28 18:00:09 UTC 2013 
Responsible-Changed-Why:  
Over to maintainer (via the GNATS Auto Assign Tool) 

http://www.freebsd.org/cgi/query-pr.cgi?pr=185246 

From: Royce Williams <royce@tycho.org>
To: bug-followup@freebsd.org, royce@tycho.org
Cc:  
Subject: Re: ports/185246: security/john: update to 1.7.9-jumbo-7
Date: Sat, 28 Dec 2013 09:01:59 -0900

 Related PRs:
 
 http://www.freebsd.org/cgi/query-pr.cgi?pr=ports/180794
 http://www.freebsd.org/cgi/query-pr.cgi?pr=ports/181575
State-Changed-From-To: open->closed 
State-Changed-By: mat 
State-Changed-When: Tue Dec 31 10:45:09 UTC 2013 
State-Changed-Why:  
Committed, thanks! 

http://www.freebsd.org/cgi/query-pr.cgi?pr=185246 

From: dfilter@FreeBSD.ORG (dfilter service)
To: bug-followup@FreeBSD.org
Cc:  
Subject: Re: ports/185246: commit references a PR
Date: Tue, 31 Dec 2013 10:45:56 +0000 (UTC)

 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 <bsd.port.pre.mk>
  
  .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 <bsd.port.post.mk>
 
 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%%
 _______________________________________________
 svn-ports-all@freebsd.org mailing list
 http://lists.freebsd.org/mailman/listinfo/svn-ports-all
 To unsubscribe, send any mail to "svn-ports-all-unsubscribe@freebsd.org"
 
>Unformatted:
