From owner-freebsd-ports Tue Jan 14 9:40: 8 2003 Delivered-To: freebsd-ports@hub.freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 55FCC37B401 for ; Tue, 14 Jan 2003 09:40:03 -0800 (PST) Received: from freefall.freebsd.org (freefall.freebsd.org [216.136.204.21]) by mx1.FreeBSD.org (Postfix) with ESMTP id 6434043F3F for ; Tue, 14 Jan 2003 09:40: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 h0EHe1NS081931 for ; Tue, 14 Jan 2003 09:40: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 h0EHe1Ya081930; Tue, 14 Jan 2003 09:40:01 -0800 (PST) Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id EDABC37B401; Tue, 14 Jan 2003 09:33:08 -0800 (PST) Received: from moo.cus.org.uk (host213-106-240-81.no-dns-yet.ntli.net [213.106.240.81]) by mx1.FreeBSD.org (Postfix) with ESMTP id 06F4843F13; Tue, 14 Jan 2003 09:33:03 -0800 (PST) (envelope-from dom@moo.cus.org.uk) Received: from moo.cus.org.uk (localhost.cus.org.uk [127.0.0.1]) by moo.cus.org.uk (8.12.5/8.11.3) with ESMTP id h0EHb9pH032783; Tue, 14 Jan 2003 17:37:09 GMT (envelope-from dom@moo.cus.org.uk) Received: (from dom@localhost) by moo.cus.org.uk (8.12.5/8.12.5/Submit) id h0EHb9Sx032782; Tue, 14 Jan 2003 17:37:09 GMT Message-Id: <200301141737.h0EHb9Sx032782@moo.cus.org.uk> Date: Tue, 14 Jan 2003 17:37:09 GMT From: Dominic Marks Reply-To: Dominic Marks To: FreeBSD-gnats-submit@FreeBSD.org Cc: freebsd-sparc@FreeBSD.org X-Send-Pr-Version: 3.113 Subject: ports/47058: Port Fix: security/john Sender: owner-freebsd-ports@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.org >Number: 47058 >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: Tue Jan 14 09:40:00 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: My previous patch for this port doesn't seem to have worked as I hoped it would, build still fails for alpha and sparc64 machines. Here is a new patch which hopefully will make the port build on bento, also, add 'native' support to john for FreeBSD/sparc64, it should use the sparc assembler routines now. I don't have an alpha or sparc64 machine running FreeBSD at the moment so any feedback (positive or negative) would be very helpful. >How-To-Repeat: Apply patch && make >Fix: Index: Makefile =================================================================== RCS file: /home/ncvs/ports/security/john/Makefile,v retrieving revision 1.23 diff -u -3 -p -r1.23 Makefile --- Makefile 2003/01/06 21:33:36 1.23 +++ Makefile 2003/01/14 17:30:53 @@ -34,13 +34,16 @@ ALL_TARGET= ${OSNAME}-${ARCHNAME}-any-el .elif ${MACHINE_ARCH} == "alpha" ARCHNAME= alpha ALL_TARGET= ${OSNAME}-${ARCHNAME}-any-elf +.elif ${MACHINE_ARCH} == "sparc64" +ARCHNAME= sparc +ALL_TARGET= ${OSNAME}-${ARCHNAME}-v9-elf .else ALL_TARGET= generic .endif WRKSRC= ${WRKDIR}/${DISTNAME}/src -pre-fetch: +pre-build: @${ECHO} "Building for ${ALL_TARGET}" do-configure: Updated files/patch-aa --- Makefile.orig Thu Dec 3 00:29:50 1998 +++ Makefile Tue Jan 14 17:20:06 2003 @@ -3,17 +3,18 @@ # Copyright (c) 1996-98 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 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 @@ -89,8 +90,10 @@ @echo "freebsd-x86-any-a.out FreeBSD, x86, a.out binaries" @echo "freebsd-x86-k6-a.out FreeBSD, AMD K6, a.out binaries" @echo "freebsd-x86-any-elf FreeBSD, x86, ELF binaries" + @echo "freebsd-alpha-any-elf FreeBSD, Alpha, ELF binaries" @echo "freebsd-x86-mmx-elf FreeBSD, x86 with MMX, ELF binaries" @echo "freebsd-x86-k6-elf FreeBSD, AMD K6, ELF binaries" + @echo "freebsd-sparc-v9-elf FreeBSD, SPARC v9, ELF binaries" @echo "openbsd-x86-any OpenBSD, x86" @echo "openbsd-x86-k6 OpenBSD, AMD K6" @echo "solaris-sparc-gcc Solaris, SPARC, gcc" @@ -156,6 +159,16 @@ BENCH_DES_OBJS_DEPEND="$(BENCH_DES_OBJS_ORIG) sparc.o" \ JOHN_OBJS="$(BITSLICE_OBJS) $(JOHN_OBJS_ORIG) sparc.o" +freebsd-sparc-v9-elf: + $(MAKE) HAMMER=use-freebsd-sparc sparc.h + $(LN) sparc.h arch.h + $(MAKE) use-freebsd-sparc NAIL="$(PROJ)" + +use-freebsd-sparc: + $(MAKE) $(NAIL) \ + BENCH_DES_OBJS_DEPEND="$(BENCH_DES_OBJS_ORIG) sparc.o" \ + JOHN_OBJS="$(BITSLICE_OBJS) $(JOHN_OBJS_ORIG) sparc.o " + freebsd-x86-any-a.out: $(LN) x86-any.h arch.h $(MAKE) $(PROJ) \ @@ -173,14 +186,19 @@ $(LN) x86-any.h arch.h $(MAKE) $(PROJ) \ JOHN_OBJS="$(JOHN_OBJS) x86.o" \ - CFLAGS="$(CFLAGS) -m486" \ + CFLAGS="$(CFLAGS)" \ ASFLAGS="$(ASFLAGS) -DBSD" +freebsd-alpha-any-elf: + $(LN) alpha.h arch.h + $(MAKE) $(PROJ) \ + JOHN_OBJS="$(BITSLICE_OBJS) $(JOHN_OBJS) alpha.o" + freebsd-x86-mmx-elf: $(LN) x86-mmx.h arch.h $(MAKE) $(PROJ) \ JOHN_OBJS="$(JOHN_OBJS) x86.o" \ - CFLAGS="$(CFLAGS) -m486" \ + CFLAGS="$(CFLAGS)" \ ASFLAGS="$(ASFLAGS) -DBSD" freebsd-x86-k6-elf: >Release-Note: >Audit-Trail: >Unformatted: To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe freebsd-ports" in the body of the message