From owner-freebsd-ports-bugs Wed Jan 15 17:30:10 2003 Delivered-To: freebsd-ports-bugs@hub.freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id CAD5A37B401 for ; Wed, 15 Jan 2003 17:30:02 -0800 (PST) Received: from freefall.freebsd.org (freefall.freebsd.org [216.136.204.21]) by mx1.FreeBSD.org (Postfix) with ESMTP id B833E43F65 for ; Wed, 15 Jan 2003 17:30:01 -0800 (PST) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (gnats@localhost [127.0.0.1]) by freefall.freebsd.org (8.12.6/8.12.6) with ESMTP id h0G1U1NS017775 for ; Wed, 15 Jan 2003 17:30:01 -0800 (PST) (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.12.6/8.12.6/Submit) id h0G1U1p5017774; Wed, 15 Jan 2003 17:30:01 -0800 (PST) Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id B0B2737B401 for ; Wed, 15 Jan 2003 17:21:47 -0800 (PST) Received: from cus.org.uk (host213-106-240-81.no-dns-yet.ntli.net [213.106.240.81]) by mx1.FreeBSD.org (Postfix) with ESMTP id AA85643F3F for ; Wed, 15 Jan 2003 17:21:41 -0800 (PST) (envelope-from dom@cus.org.uk) Received: from cus.org.uk (localhost.cus.org.uk [127.0.0.1]) by cus.org.uk (8.12.6/8.11.3) with ESMTP id h0G1LdMs018022 for ; Thu, 16 Jan 2003 01:21:39 GMT (envelope-from dom@cus.org.uk) Received: (from dom@localhost) by cus.org.uk (8.12.6/8.12.6/Submit) id h0G1LddW018021; Thu, 16 Jan 2003 01:21:39 GMT Message-Id: <200301160121.h0G1LddW018021@cus.org.uk> Date: Thu, 16 Jan 2003 01:21:39 GMT From: Dominic Marks Reply-To: Dominic Marks To: FreeBSD-gnats-submit@FreeBSD.org X-Send-Pr-Version: 3.113 Subject: ports/47124: Port Update: security/john Sender: owner-freebsd-ports-bugs@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.org >Number: 47124 >Category: ports >Synopsis: Port Update: security/john >Confidential: no >Severity: non-critical >Priority: low >Responsible: freebsd-ports-bugs >State: open >Quarter: >Keywords: >Date-Required: >Class: maintainer-update >Submitter-Id: current-users >Arrival-Date: Wed Jan 15 17:30:01 PST 2003 >Closed-Date: >Last-Modified: >Originator: Dominic Marks >Release: FreeBSD 4.7-RELEASE-p3 i386 >Organization: UMIST >Environment: System: FreeBSD moo.cus.org.uk 4.7-RELEASE-p3 FreeBSD 4.7-RELEASE-p3 #2: Fri Jan 10 20:38:55 GMT 2003 root@baa.cus.org.uk:/usr/obj/usr/src/sys/BAA i386 >Description: security/john 1.6 -> 1.6.32 This PR obsoletes PRs 47052 and 47058, which can now be closed. - update to 1.6.32 (devel) at authors advice - fix sparc64 build (discussed with author, should have been using generic build type as john doesn't know about 64-bit sparc assembly) - patch john to be a little more helpful (copying john.ini or john.conf as it is known in 1.6.32 is no longer a requirement, and having your own personal john.conf in ~/.john/ should work just as well) It took me a few tries, but this time I think (hope) john will build and work properly on all architectures. Tilman Linneweh and Solar Designer have helped my a great deal. Thanks guys. >How-To-Repeat: NA. >Fix: Dead Files: pkg-message files/patch-aa New Files: files/patch-Makefile files/patch-params.h files/patch-john.conf src/Makefile --- /dev/null Wed Jan 15 23:56:24 2003 +++ files/patch-Makefile Wed Jan 15 23:29:11 2003 @@ -0,0 +1,27 @@ +--- Makefile Wed Apr 10 14:35:25 2002 ++++ Makefile Wed Jan 15 23:28:44 2003 +@@ -3,10 +3,10 @@ + # Copyright (c) 1996-2002 by Solar Designer + # + +-CPP = gcc +-CC = gcc +-AS = gcc +-LD = gcc ++CC ?= gcc ++CPP = $(CC) ++AS = $(CC) ++LD = $(CC) + CP = cp + LN = ln -sf + RM = rm -f +@@ -14,7 +14,8 @@ + SED = sed + NULL = /dev/null + CPPFLAGS = -E +-CFLAGS = -c -Wall -O2 -fomit-frame-pointer ++CFLAGS ?= -O2 ++CFLAGS += -c -Wall -fomit-frame-pointer + ASFLAGS = -c + LDFLAGS = -s + OPT_NORMAL = -funroll-loops src/params.h --- /dev/null Thu Jan 16 00:00:00 2003 +++ files/patch-params.h Wed Jan 15 23:50:52 2003 @@ -0,0 +1,33 @@ +--- params.h Sun Sep 15 20:19:20 2002 ++++ params.h Wed Jan 15 23:50:29 2003 +@@ -26,8 +26,8 @@ + #endif + + #if JOHN_SYSTEMWIDE +-#define JOHN_SYSTEMWIDE_EXEC "/usr/libexec/john" +-#define JOHN_SYSTEMWIDE_HOME "/usr/share/john" ++#define JOHN_SYSTEMWIDE_EXEC "%%PREFIX%%/bin/john" ++#define JOHN_SYSTEMWIDE_HOME "%%PREFIX%%/share/john" + #define JOHN_PRIVATE_HOME "~/.john" + #endif + +@@ -67,8 +67,8 @@ + /* + * File names. + */ +-#define CFG_FULL_NAME "$JOHN/john.conf" +-#define CFG_ALT_NAME "$JOHN/john.ini" ++#define CFG_FULL_NAME "%%PREFIX%%/share/john/john.conf" ++#define CFG_ALT_NAME "%%PREFIX%%/share/john/john.ini" + #if JOHN_SYSTEMWIDE + #define CFG_PRIVATE_FULL_NAME JOHN_PRIVATE_HOME "/john.conf" + #define CFG_PRIVATE_ALT_NAME JOHN_PRIVATE_HOME "/john.ini" +@@ -78,7 +78,7 @@ + #define LOG_NAME "$JOHN/john.pot" + #define RECOVERY_NAME "$JOHN/restore" + #endif +-#define WORDLIST_NAME "$JOHN/password.lst" ++#define WORDLIST_NAME "%%PREFIX%%/share/john/password.lst" + + /* + * Configuration file section names. run/john.conf --- /dev/null Thu Jan 16 00:00:00 2003 +++ files/patch-john.conf Wed Jan 15 23:27:17 2003 @@ -0,0 +1,41 @@ +--- ../run/john.conf Fri May 10 19:16:35 2002 ++++ ../run/john.conf Wed Jan 15 23:18:43 2003 +@@ -5,7 +5,7 @@ + + [Options] + # Wordlist file name, to be used in batch mode +-Wordfile = $JOHN/password.lst ++Wordfile = %%PREFIX%%/share/john/password.lst + # Use idle cycles only + Idle = N + # Crash recovery file saving delay in seconds +@@ -316,25 +316,25 @@ + + # Incremental modes + [Incremental:All] +-File = $JOHN/all.chr ++File = %%PREFIX%%/share/john/all.chr + MinLen = 0 + MaxLen = 8 + CharCount = 95 + + [Incremental:Alpha] +-File = $JOHN/alpha.chr ++File = %%PREFIX%%/share/john/alpha.chr + MinLen = 1 + MaxLen = 8 + CharCount = 26 + + [Incremental:Digits] +-File = $JOHN/digits.chr ++File = %%PREFIX%%/share/john/digits.chr + MinLen = 1 + MaxLen = 8 + CharCount = 10 + + [Incremental:LanMan] +-File = $JOHN/lanman.chr ++File = %%PREFIX%%/share/john/lanman.chr + MinLen = 0 + MaxLen = 7 + CharCount = 69 cvs diff ? john.old/files/patch-Makefile ? john.old/files/patch-john.conf ? john.old/files/patch-params.h Index: john.old/Makefile =================================================================== RCS file: /home/ncvs/ports/security/john/Makefile,v retrieving revision 1.23 diff -u -3 -p -r1.23 Makefile --- john.old/Makefile 2003/01/06 21:33:36 1.23 +++ john.old/Makefile 2003/01/16 00:49:10 @@ -7,49 +7,43 @@ # PORTNAME= john -PORTVERSION= 1.6 +PORTVERSION= 1.6.32 CATEGORIES= security -MASTER_SITES= ftp://ftp.ca.openwall.com/pub/projects/john/ \ - http://www.openwall.com/john/ \ - ftp://ftp.ru.openwall.com/pub/projects/john/ \ - ftp://ftp.false.com/pub/security/projects/ \ - http://www.false.com/security/john/ +MASTER_SITES= http://www.openwall.com/john/ \ + ftp://ftp.ca.openwall.com/pub/projects/john/ \ + ftp://ftp.ru.openwall.com/pub/projects/john/ +DISTFILES= ${PORTNAME}-${PORTVERSION}.tar.gz \ + ${PORTNAME}-1.6.tar.gz -USE_REINPLACE= yes MAINTAINER= d.marks@student.umist.ac.uk +USE_REINPLACE= yes + .include OSNAME= ${OPSYS:S/F/f/:S/N/n/:S/O/o/:S/B/b/:S/S/s/:S/D/d/} +ALL_TARGET= generic .if ${MACHINE_ARCH} == "i386" -ARCHNAME= x86 -. if ${MACHINE_CPU:Mk6} -ALL_TARGET= ${OSNAME}-${ARCHNAME}-k6-elf -. elif ${MACHINE_CPU:Mmmx} -ALL_TARGET= ${OSNAME}-${ARCHNAME}-mmx-elf +. if ${MACHINE_CPU:Mmmx} +ALL_TARGET= ${OSNAME}-x86-mmx-elf . else -ALL_TARGET= ${OSNAME}-${ARCHNAME}-any-elf +ALL_TARGET= ${OSNAME}-x86-any-elf . endif .elif ${MACHINE_ARCH} == "alpha" -ARCHNAME= alpha -ALL_TARGET= ${OSNAME}-${ARCHNAME}-any-elf -.else -ALL_TARGET= generic +ALL_TARGET= ${OSNAME}-alpha .endif WRKSRC= ${WRKDIR}/${DISTNAME}/src +OLDSRC= ${WRKDIR}/${PORTNAME}-1.6/run -pre-fetch: +pre-build: @${ECHO} "Building for ${ALL_TARGET}" do-configure: - @${REINPLACE_CMD} \ - -e 's,~/all.chr,${PREFIX}/share/john/all.chr,' \ - -e 's,~/alpha.chr,${PREFIX}/share/john/alpha.chr,' \ - -e 's,~/digits.chr,${PREFIX}/share/john/digits.chr,' \ - -e 's,~/lanman.chr,${PREFIX}/share/john/lanman.chr,' \ - ${WRKDIR}/${DISTNAME}/run/john.ini + @${REINPLACE_CMD} -e 's,%%PREFIX%%,${PREFIX},g' \ + ${WRKDIR}/${DISTNAME}/src/params.h \ + ${WRKDIR}/${DISTNAME}/run/john.conf do-install: @${MKDIR} ${DATADIR} @@ -57,17 +51,16 @@ do-install: @cd ${PREFIX}/bin ; ${LN} -sf john xtract @cd ${PREFIX}/bin ; ${LN} -sf john unshadow @${INSTALL_DATA} \ - ${WRKDIR}/${DISTNAME}/run/all.chr \ - ${WRKDIR}/${DISTNAME}/run/alpha.chr \ - ${WRKDIR}/${DISTNAME}/run/digits.chr \ - ${WRKDIR}/${DISTNAME}/run/lanman.chr \ + ${OLDSRC}/all.chr \ + ${OLDSRC}/alpha.chr \ + ${OLDSRC}/digits.chr \ + ${OLDSRC}/lanman.chr \ ${WRKDIR}/${DISTNAME}/run/password.lst \ - ${WRKDIR}/${DISTNAME}/run/john.ini \ - ${DATADIR} + ${WRKDIR}/${DISTNAME}/run/john.conf \ + ${DATADIR} .if !defined(NOPORTDOCS) @${MKDIR} ${DOCSDIR} @${INSTALL_DATA} ${WRKDIR}/${DISTNAME}/doc/* ${DOCSDIR} .endif - @${CAT} ${PKGMESSAGE} .include Index: john.old/distinfo =================================================================== RCS file: /home/ncvs/ports/security/john/distinfo,v retrieving revision 1.5 diff -u -3 -p -r1.5 distinfo --- john.old/distinfo 1998/12/07 08:59:21 1.5 +++ john.old/distinfo 2003/01/16 00:49:10 @@ -1 +1,2 @@ +MD5 (john-1.6.32.tar.gz) = fc43647268a2841bf9c8df819fafef26 MD5 (john-1.6.tar.gz) = aae782f160041b2bdc624b0a84054e32 Index: john.old/pkg-plist =================================================================== RCS file: /home/ncvs/ports/security/john/pkg-plist,v retrieving revision 1.6 diff -u -3 -p -r1.6 pkg-plist --- john.old/pkg-plist 2003/01/04 22:34:19 1.6 +++ john.old/pkg-plist 2003/01/16 00:49:10 @@ -6,18 +6,10 @@ share/john/all.chr share/john/alpha.chr share/john/digits.chr share/john/lanman.chr -share/john/john.ini +share/john/john.conf share/john/password.lst -share/doc/john/CONFIG -share/doc/john/CREDITS -share/doc/john/EXAMPLES -share/doc/john/EXTERNAL -share/doc/john/FAQ -share/doc/john/INSTALL -share/doc/john/MODES -share/doc/john/NEWS -share/doc/john/OPTIONS +share/doc/john/CHANGES +share/doc/john/LICENSING share/doc/john/README -share/doc/john/RULES @dirrm share/doc/john @dirrm share/john >Release-Note: >Audit-Trail: >Unformatted: To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe freebsd-ports-bugs" in the body of the message