From owner-svn-ports-all@freebsd.org Fri Mar 8 12:12:58 2019 Return-Path: Delivered-To: svn-ports-all@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id A3451153BB82; Fri, 8 Mar 2019 12:12:58 +0000 (UTC) (envelope-from danfe@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) server-signature RSA-PSS (4096 bits) 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 3B5D7712D4; Fri, 8 Mar 2019 12:12:58 +0000 (UTC) (envelope-from danfe@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 E91112B04A; Fri, 8 Mar 2019 12:12:57 +0000 (UTC) (envelope-from danfe@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id x28CCvx9047684; Fri, 8 Mar 2019 12:12:57 GMT (envelope-from danfe@FreeBSD.org) Received: (from danfe@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id x28CCv0C047682; Fri, 8 Mar 2019 12:12:57 GMT (envelope-from danfe@FreeBSD.org) Message-Id: <201903081212.x28CCv0C047682@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: danfe set sender to danfe@FreeBSD.org using -f From: Alexey Dokuchaev Date: Fri, 8 Mar 2019 12:12:57 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r495038 - head/security/john X-SVN-Group: ports-head X-SVN-Commit-Author: danfe X-SVN-Commit-Paths: head/security/john X-SVN-Commit-Revision: 495038 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Rspamd-Queue-Id: 3B5D7712D4 X-Spamd-Bar: -- Authentication-Results: mx1.freebsd.org X-Spamd-Result: default: False [-2.95 / 15.00]; local_wl_from(0.00)[FreeBSD.org]; NEURAL_HAM_MEDIUM(-1.00)[-1.000,0]; NEURAL_HAM_LONG(-1.00)[-1.000,0]; NEURAL_HAM_SHORT(-0.95)[-0.951,0]; ASN(0.00)[asn:11403, ipnet:2610:1c1:1::/48, country:US] X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.29 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: Fri, 08 Mar 2019 12:12:58 -0000 Author: danfe Date: Fri Mar 8 12:12:57 2019 New Revision: 495038 URL: https://svnweb.freebsd.org/changeset/ports/495038 Log: Do a little spring cleaning: - Drop the note that we prefer -jumbo (community-enhanced) versions instead of vanilla JtR releases and accompanying PORTSCOUT knob, add a nota bene to handle this with next JtR version update - Remove broken mirror (gd.tuwien.ac.at) from the MASTER_SITES - Remove BROKEN_SSL knob, it should build fine after recent changes - Shorten BROKEN_$arch messages and fix a minor typo there - While Solar Designer recommends to pass JOHN_SYSTEMWIDE_HOME and JOHN_SYSTEMWIDE_EXEC overrides via command line, in practice it is easier and cleaner (avoids plenty of those ``warning: missing terminating '"' character [-Winvalid-pp-token]'' messages during configure stage) to patch `params.h' file in place, so do it - For JOHN_SYSTEMWIDE=1, pass it via environment (as CFLAGS_EXTRA) instead of appending to global CFLAGS value - GC `pfx2john' symlink (should've been part of r494924) Modified: head/security/john/Makefile head/security/john/pkg-plist Modified: head/security/john/Makefile ============================================================================== --- head/security/john/Makefile Fri Mar 8 12:12:20 2019 (r495037) +++ head/security/john/Makefile Fri Mar 8 12:12:57 2019 (r495038) @@ -2,55 +2,41 @@ # $FreeBSD$ PORTNAME= john +# NB: starting from the next version, community-enhanced (jumbo) patch +# should be offered as an option (suggested by Solar Designer himself). DISTVERSION= 1.8.0-jumbo-1 PORTREVISION= 5 CATEGORIES= security MASTER_SITES= http://www.openwall.com/john/j/ \ http://mirrors.kernel.org/openwall/projects/john/${DISTVERSION:C/-.*//}/ \ - http://distro.ibiblio.org/openwall/projects/john/${DISTVERSION:C/-.*//}/ \ - http://gd.tuwien.ac.at/opsys/linux/openwall/projects/john/${DISTVERSION:C/-.*//}/ + http://distro.ibiblio.org/openwall/projects/john/${DISTVERSION:C/-.*//}/ MAINTAINER= danfe@FreeBSD.org COMMENT= Featureful Unix password cracker LICENSE= GPLv2 -BROKEN_SSL= openssl111 - LIB_DEPENDS= libgmp.so:math/gmp -BROKEN_aarch64= Fails to build: Cannot detect CPU architechture -BROKEN_mips64= Fails to build: Cannot detect CPU architechture +BROKEN_aarch64= cannot detect CPU architecture +BROKEN_mips64= cannot detect CPU architecture USES= gmake shebangfix ssl tar:xz GNU_CONFIGURE= yes -CONFIGURE_ENV= OPENSSL_CFLAGS="-I${OPENSSLINC}" \ +CONFIGURE_ENV= CFLAGS_EXTRA="-DJOHN_SYSTEMWIDE=1" \ + OPENSSL_CFLAGS="-I${OPENSSLINC}" \ OPENSSL_LIBS="-L${OPENSSLLIB} -lcrypto -lssl" SHEBANG_FILES= ../run/*.pl ../run/*.rb ../run/benchmark-unify ../run/relbench WRKSRC_SUBDIR= src ALL_TARGET= default -CFLAGS+= -DJOHN_SYSTEMWIDE=1 \ - -DJOHN_SYSTEMWIDE_HOME=\\\"${DATADIR}\\\" \ - -DJOHN_SYSTEMWIDE_EXEC=\\\"${LOCALBASE}/libexec/${PORTNAME}\\\" -# 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. -# -# Starting from the next version, community-enhanced (jumbo) should be added -# as an optional feature, as suggested by Alexander himself. -# -PORTSCOUT= limit:.*-jumbo - BINARIES= calc_stat cprepair genmkvpwd john luks2john mkvcalcproba \ raw2dyna SIPdump tgtsnarf uaf2john vncpcap2john wpapcap2john BINLINKS= base64conv dmg2john gpg2john hccap2john keepass2john \ keychain2john keyring2john keystore2john kwallet2john \ - pfx2john putty2john pwsafe2john racf2john rar2john \ + putty2john pwsafe2john racf2john rar2john \ truecrypt_volume2john unafs undrop unique unshadow zip2john PORTDOCS= * @@ -63,6 +49,7 @@ post-extract: ${WRKSRC}/ssh_fmt_plug.c \ post-patch: + @${REINPLACE_CMD} -e 's|/usr|${PREFIX}|' ${WRKSRC}/params.h # Replace methods and types that were marked deprecated by OpenSSL 0.9.7 # and removed in OpenSSL 1.1.0 and LibreSSL @${REINPLACE_CMD} -e 's|des_string_to_key|DES_string_to_key|' \ Modified: head/security/john/pkg-plist ============================================================================== --- head/security/john/pkg-plist Fri Mar 8 12:12:20 2019 (r495037) +++ head/security/john/pkg-plist Fri Mar 8 12:12:57 2019 (r495038) @@ -14,7 +14,6 @@ bin/keystore2john bin/kwallet2john bin/luks2john bin/mkvcalcproba -bin/pfx2john bin/putty2john bin/pwsafe2john bin/racf2john