Skip site navigation (1)Skip section navigation (2)
Date:      Mon, 6 Jan 2003 14:51:18 GMT
From:      Dominic Marks <dom@cus.org.uk>
To:        FreeBSD-gnats-submit@FreeBSD.org
Subject:   ports/46801: Port Fix: security/john
Message-ID:  <200301061451.h06EpIpI023115@moo.cus.org.uk>

next in thread | raw e-mail | index | archive | help

>Number:         46801
>Category:       ports
>Synopsis:       Port Fix: security/john
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-ports
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          maintainer-update
>Submitter-Id:   current-users
>Arrival-Date:   Mon Jan 06 06:50:02 PST 2003
>Closed-Date:
>Last-Modified:
>Originator:     Dominic Marks
>Release:        FreeBSD 4.6-STABLE i386
>Organization:
UMIST
>Environment:
System: FreeBSD moo.cus.org.uk 4.6-STABLE FreeBSD 4.6-STABLE #0: Sat Jul 20 15:11:50 BST 2002 root@moo.cus.org.uk:/usr/obj/usr/src/sys/MOO i386

	
>Description:
	1. switch to using REINPLACE replace than sed directly
	2. include a patch should make john compile and run on alpha,
	sparc64, and other architectures that FreeBSD supports now,
	or will support in the future.
	
>How-To-Repeat:
	NA.
	
>Fix:

Index: Makefile
===================================================================
RCS file: /home/ncvs/ports/security/john/Makefile,v
retrieving revision 1.22
diff -u -3 -p -r1.22 Makefile
--- Makefile	2003/01/04 22:34:19	1.22
+++ Makefile	2003/01/06 14:41:04
@@ -15,6 +15,7 @@ MASTER_SITES=	ftp://ftp.ca.openwall.com/
 		ftp://ftp.false.com/pub/security/projects/ \
 		http://www.false.com/security/john/
 
+USE_REINPLACE=	yes
 MAINTAINER=	d.marks@student.umist.ac.uk
 
 .include <bsd.port.pre.mk>
@@ -30,8 +31,11 @@ ALL_TARGET=	${OSNAME}-${ARCHNAME}-mmx-el
 . else
 ALL_TARGET=	${OSNAME}-${ARCHNAME}-any-elf
 . endif
+.elif ${MACHINE_ARCH} == "alpha"
+ARCHNAME=	alpha
+ALL_TARGET=	${OSNAME}-${ARCHNAME}-any-elf
 .else
-ARCHNAME=	${MACHINE_ARCH}
+ALL_TARGET=	generic
 .endif
 
 WRKSRC=		${WRKDIR}/${DISTNAME}/src
@@ -40,12 +44,12 @@ pre-fetch:
 	@${ECHO} "Building for ${ALL_TARGET}"
 
 do-configure:
-	@${MV} ${WRKDIR}/${DISTNAME}/run/john.ini ${WRKDIR}/${DISTNAME}/run/john.ini.in
-	@${SED} -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.in > ${WRKDIR}/${DISTNAME}/run/john.ini
+	@${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
 
 do-install:
 	@${MKDIR} ${DATADIR}

	


>Release-Note:
>Audit-Trail:
>Unformatted:

To Unsubscribe: send mail to majordomo@FreeBSD.org
with "unsubscribe freebsd-ports" in the body of the message




Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200301061451.h06EpIpI023115>