summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorxtraeme <xtraeme@pkgsrc.org>2003-11-18 14:03:14 +0000
committerxtraeme <xtraeme@pkgsrc.org>2003-11-18 14:03:14 +0000
commit47acf3181b564eb8c9f633b0bc942ef0d8a988a8 (patch)
tree9bb6e2c6d1b43f026001f59801398d7d8cc6ab1c
parenta3f50f4b07a89ed540f4c79c3b578ab1d28769ad (diff)
downloadpkgsrc-47acf3181b564eb8c9f633b0bc942ef0d8a988a8.tar.gz
Remove harcoded CFLAGS from Makefile, pass our CFLAGS instead.
Patch provided by Christian Biere in PR pkg/23461. Bump PKGREVISION.
-rw-r--r--security/john/Makefile3
-rw-r--r--security/john/distinfo3
-rw-r--r--security/john/patches/patch-aa19
3 files changed, 23 insertions, 2 deletions
diff --git a/security/john/Makefile b/security/john/Makefile
index b003564a9b2..69ea810eca0 100644
--- a/security/john/Makefile
+++ b/security/john/Makefile
@@ -1,8 +1,9 @@
-# $NetBSD: Makefile,v 1.2 2003/03/29 12:42:23 jmmv Exp $
+# $NetBSD: Makefile,v 1.3 2003/11/18 14:03:14 xtraeme Exp $
#
DISTNAME= john-1.6
WRKSRC= ${WRKDIR}/${DISTNAME}/src
+PKGREVISION= 1
CATEGORIES= security textproc
MASTER_SITES= http://www.openwall.com/john/
diff --git a/security/john/distinfo b/security/john/distinfo
index 3a700cfe8bf..30715b853e4 100644
--- a/security/john/distinfo
+++ b/security/john/distinfo
@@ -1,4 +1,5 @@
-$NetBSD: distinfo,v 1.2 2001/04/19 15:40:32 agc Exp $
+$NetBSD: distinfo,v 1.3 2003/11/18 14:03:14 xtraeme Exp $
SHA1 (john-1.6.tar.gz) = b49d371496b8ba5e439665b83190b1e4d4640bea
Size (john-1.6.tar.gz) = 497341 bytes
+SHA1 (patch-aa) = 207c2ba3bd17a3caec164d595ddeaba794afe016
diff --git a/security/john/patches/patch-aa b/security/john/patches/patch-aa
new file mode 100644
index 00000000000..a25b8a94b73
--- /dev/null
+++ b/security/john/patches/patch-aa
@@ -0,0 +1,19 @@
+$NetBSD: patch-aa,v 1.1 2003/11/18 14:03:14 xtraeme Exp $
+
+--- Makefile.orig 2003-11-18 14:51:45.000000000 +0100
++++ Makefile 2003-11-18 14:52:31.000000000 +0100
+@@ -13,11 +13,11 @@
+ SED = sed
+ NULL = /dev/null
+ CPPFLAGS = -E
+-CFLAGS = -c -Wall -O2 -fomit-frame-pointer
++CFLAGS += -c
+ ASFLAGS = -c
+ LDFLAGS = -s
+-OPT_NORMAL = -funroll-loops
+-OPT_INLINE = -finline-functions
++OPT_NORMAL =
++OPT_INLINE =
+
+ JOHN_VERSION = 1.6
+ JOHN_ARCHIVE = john-$(JOHN_VERSION)