cpet/openbsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Repair john.

Browse Source 
Flavorize k6, as package buildings should be reproducible
This commit is contained in:
espie 2000-10-31 14:53:58 +00:00
parent ef935f2fe2
commit 1c1b99c22d
2 changed files with 25 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
security/john/Makefile
View File

@ -1,4 +1,4 @@
# $OpenBSD: Makefile,v 1.12 2000/10/22 14:03:44 espie Exp $
# $OpenBSD: Makefile,v 1.13 2000/10/31 14:53:58 espie Exp $
DISTNAME= john-1.6
CATEGORIES= security
@ -15,17 +15,22 @@ PERMIT_DISTFILES_CDROM= Yes
PERMIT_DISTFILES_FTP= Yes
MAKE_FLAGS= CC="${CC}" LD="${CC}" \
CFLAGS="-c -Wall ${CFLAGS} -fomit-frame-pointer \
-DJOHN_HOME=\\\"${PREFIX}/share/john\\\""
CFLAGS="-c -Wall ${CFLAGS} -fomit-frame-pointer"
.if (${MACHINE_ARCH} == "i386")
PTYPE!= uname -p | cut -f2 -d' '
.if (${PTYPE} == "K6")
ALL_TARGET= openbsd-x86-k6
.else
ALL_TARGET= openbsd-x86-any
FLAVORS=k6
FLAVOR?=
.if ${FLAVOR:L} == "k6"
ONLY_FOR_ARCHS=i386
.endif
.elif (${MACHINE_ARCH} == "alpha")
.if ${MACHINE_ARCH} == "i386"
. if ${FLAVOR:L} == "k6"
ALL_TARGET= openbsd-x86-k6
. else
ALL_TARGET= openbsd-x86-any
. endif
.elif ${MACHINE_ARCH} == "alpha"
ALL_TARGET= linux-alpha
.else
ALL_TARGET= generic
@ -33,6 +38,11 @@ ALL_TARGET= generic
WRKDIST= ${WRKDIR}/${DISTNAME}/src
do-configure:
cd ${WRKDIST} && \
sed -e 's,@JOHNHOME@,${PREFIX}/share/john,' <params.h >params.h.new \
&& mv -f params.h.new params.h
do-install:
${INSTALL_DATA_DIR} ${PREFIX}/share/doc/john
${INSTALL_DATA_DIR} ${PREFIX}/share/john

13
security/john/patches/patch-params.h
View File

@ -1,6 +1,6 @@
--- params.h.orig Wed Dec 2 19:29:50 1998
+++ params.h Mon Nov 29 11:03:13 1999
@@ -52,10 +52,14 @@
--- params.h.orig Thu Dec 3 01:29:50 1998
+++ params.h Tue Oct 31 13:59:57 2000
@@ -52,10 +52,11 @@
/*
* File names.
*/
@ -8,14 +8,11 @@
-#define CFG_NAME "~/john.ini"
-#define RECOVERY_NAME "~/restore"
-#define WORDLIST_NAME "~/password.lst"
+#ifndef JOHN_HOME
+#define JOHN_HOME "~"
+#endif
+#define LOG_NAME "john.pot"
+#undef CFG_NAME
+#define CFG_NAME JOHN_HOME "/john.ini"
+#define CFG_NAME "@JOHN_HOME@/john.ini"
+#define RECOVERY_NAME "john.restore"
+#define WORDLIST_NAME JOHN_HOME "/password.lst"
+#define WORDLIST_NAME "@JOHN_HOME@/password.lst"
/*
* Configuration file section names.