Date: Mon, 26 Aug 2013 22:16:09 GMT From: Matthieu BOUTHORS <matthieu@labs.fr> To: freebsd-gnats-submit@FreeBSD.org Subject: ports/181575: security/john port update Message-ID: <201308262216.r7QMG9TS049362@oldred.freebsd.org> Resent-Message-ID: <201308262220.r7QMK0In001990@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 181575 >Category: ports >Synopsis: security/john port update >Confidential: no >Severity: non-critical >Priority: low >Responsible: freebsd-ports-bugs >State: open >Quarter: >Keywords: >Date-Required: >Class: update >Submitter-Id: current-users >Arrival-Date: Mon Aug 26 22:20:00 UTC 2013 >Closed-Date: >Last-Modified: >Originator: Matthieu BOUTHORS >Release: 9.1-RELEASE-p3 >Organization: >Environment: FreeBSD majinbox.labs.fr 9.1-RELEASE-p3 FreeBSD 9.1-RELEASE-p3 #0: Mon Apr 29 18:27:25 UTC 2013 root@amd64-builder.daemonology.net:/usr/obj/usr/src/sys/GENERIC amd64 >Description: security/ports is for the moment based on 1.7.9-jumbo-5, new version 1.7.9-jumbo-7 contains a lot of community new features (e.g. sha512 support) >How-To-Repeat: >Fix: Update to 1.7.9-jumbo-7 does not need any special modification to the port (see attached diff files) Patch attached with submission follows: diff -rupN john/Makefile john-j7/Makefile --- john/Makefile 2013-04-29 13:31:38.000000000 +0200 +++ john-j7/Makefile 2013-08-26 23:59:51.459468585 +0200 @@ -2,7 +2,7 @@ # $FreeBSD: security/john/Makefile 316807 2013-04-29 11:31:38Z bdrewery $ 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 -rupN john/Makefile~ john-j7/Makefile~ --- john/Makefile~ 1970-01-01 01:00:00.000000000 +0100 +++ john-j7/Makefile~ 2013-08-26 23:59:03.163614289 +0200 @@ -0,0 +1,98 @@ +# Created by: David O'Brien <obrien@FreeBSD.org> +# $FreeBSD: security/john/Makefile 316807 2013-04-29 11:31:38Z bdrewery $ + +PORTNAME= john +DISTVERSION= 1.7.9-jumbo-6 +CATEGORIES= security +MASTER_SITES= http://www.openwall.com/john/g/ \ + http://mirrors.kernel.org/openwall/projects/john/${DISTVERSION:C/-.*//}/ \ + http://distro.ibiblio.org/pub/linux/distributions/openwall/projects/john/${DISTVERSION:C/-.*//}/ \ + http://gd.tuwien.ac.at/opsys/linux/openwall/projects/john/${DISTVERSION:C/-.*//}/ + +MAINTAINER= danfe@FreeBSD.org +COMMENT= Featureful Unix password cracker + +LICENSE= GPLv2 + +USE_BZIP2= yes +USE_GMAKE= yes +BUILD_WRKSRC= ${WRKDIR}/${DISTNAME}/src + +# We prefer -jumbo (community-enhanced) versions instead of vanilla releases +# due to the sad fact that `-jumbo-???' suffixed versions *precede* official +# ones per pkg_version(1) -t check. So, when Alexander rolls out new "plain" +# release, just hold the horses and wait for corresponding -jumbo one, which +# usually does not take too long to appear. +# +PORTSCOUT= limit:.*-jumbo + +OSNAME= ${OPSYS:L} +CFLAGS+= -DJOHN_SYSTEMWIDE=1 \ + -DJOHN_SYSTEMWIDE_HOME=\\"${DATADIR}\\" \ + -DCFG_FULL_NAME=\\"${PREFIX}/etc/${PORTNAME}.conf\\" + +PORTDOCS= CHANGES CONFIG EXAMPLES EXTERNAL FAQ MODES OPTIONS README \ + RULES CONTACT CREDITS + +OPTIONS_DEFINE= OPENMP DOCS +OPENMP_DESC= Compile with OpenMP support + +.include <bsd.port.pre.mk> + +.if ${ARCH} == "i386" +. if ${MACHINE_CPU:Msse2} +ALL_TARGET= ${OSNAME}-x86-sse2 +. elif ${MACHINE_CPU:Mmmx} +ALL_TARGET= ${OSNAME}-x86-mmx +. else +ALL_TARGET= ${OSNAME}-x86-any +. endif +.elif ${ARCH} == "amd64" +ALL_TARGET= ${OSNAME}-x86-64 +.elif ${ARCH} == "alpha" +ALL_TARGET= ${OSNAME}-alpha +.else +ALL_TARGET= generic +.endif + +.if ${ARCH} == "sparc64" +BROKEN= Does not compile on sparc64 +.endif + +post-patch: + @${REINPLACE_CMD} -e 's|= gcc|= ${CC}|' \ + -e '/^CFLAGS =/s|-O2|${CFLAGS}|' ${WRKSRC}/src/Makefile +.if ${PORT_OPTIONS:MOPENMP} + @${REINPLACE_CMD} -E \ + '/(fopenmp|-m${MACHINE_CPU:Msse2})$$/s,#(OMPFLAGS =),\1,' \ + ${WRKSRC}/src/Makefile +.endif + @${REINPLACE_CMD} -i '' -e 's|/usr/bin|${LOCALBASE}/bin|' \ + ${WRKSRC}/run/*.rb + @${REINPLACE_CMD} -e '/_XOPEN_SOURCE/d' ${WRKSRC}/src/recovery.c + +pre-build: + @${ECHO_CMD} + @${ECHO_CMD} "Building John the Ripper for ${ALL_TARGET}" \ + ${WITH_OPENMP:C/.*/with/}${WITHOUT_OPENMP:C/.*/without/} \ + "OpenMP support" + @${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_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 + +.include <bsd.port.post.mk> diff -rupN john/distinfo john-j7/distinfo --- john/distinfo 2012-07-14 16:29:18.000000000 +0200 +++ john-j7/distinfo 2013-08-27 00:01:24.872467356 +0200 @@ -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 -rupN john/distinfo~ john-j7/distinfo~ --- john/distinfo~ 1970-01-01 01:00:00.000000000 +0100 +++ john-j7/distinfo~ 2012-07-14 16:29:18.000000000 +0200 @@ -0,0 +1,2 @@ +SHA256 (john-1.7.9-jumbo-5.tar.bz2) = 4007aec40d2fedb1ce3287c62f23f8a1a8b8029d22cd3cbc60bb1a42f56c1a7f +SIZE (john-1.7.9-jumbo-5.tar.bz2) = 1214046 >Release-Note: >Audit-Trail: >Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201308262216.r7QMG9TS049362>