ports/97162: [MAINTAINER] security/john: update to 1.7.1
Rainer Alves
rainer.alves at gmail.com
Fri May 12 05:10:18 UTC 2006
>Number: 97162
>Category: ports
>Synopsis: [MAINTAINER] security/john: update to 1.7.1
>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: Fri May 12 05:10:16 GMT 2006
>Closed-Date:
>Last-Modified:
>Originator: Rainer Alves
>Release: FreeBSD 7.0-CURRENT i386
>Organization:
BrasilTelecom
>Environment:
>Description:
- Update to 1.7.1
- Add OPTIONS for new SSE2 optimizations
>How-To-Repeat:
>Fix:
--- john-1.7.1.diff begins here ---
diff -ruN /usr/ports/security/john/Makefile security/john/Makefile
--- /usr/ports/security/john/Makefile Tue May 9 03:51:22 2006
+++ security/john/Makefile Fri May 12 01:16:07 2006
@@ -6,8 +6,7 @@
#
PORTNAME= john
-PORTVERSION= 1.7.0.2
-PORTREVISION= 1
+PORTVERSION= 1.7.1
CATEGORIES= security
MASTER_SITES= http://www.openwall.com/john/f/ \
ftp://ftp.ru.openwall.com/pub/projects/john/${PORTVERSION}/
@@ -22,29 +21,42 @@
WRKSRC= ${WRKDIR}/${DISTNAME}/src
USE_BZIP2= yes
-.include <bsd.port.pre.mk>
-
OSNAME= ${OPSYS:L}
CFLAGS+= -DJOHN_SYSTEMWIDE=1 \
-DJOHN_SYSTEMWIDE_HOME=\\"${DATADIR}\\" \
-DCFG_FULL_NAME=\\"${PREFIX}/etc/${PORTNAME}.conf\\"
-ALL_TARGET= generic
+# workaround for OSVERSION/ARCH detection before bsd.port.pre.mk
+# (required for OPTIONS usage)
+ARCH!= /usr/bin/uname -p
+OSVERSION!= /sbin/sysctl -n kern.osreldate
+
+.if ${ARCH} == "i386" || ${ARCH} == "amd64"
+. if ${OSVERSION} > 500000
+# dumps core with sse2 + gcc 2.95
+OPTIONS= SSE2 "Enable SSE2 optimizations" on
+. endif
+.endif
.if ${ARCH} == "i386"
-. if defined(WITHOUT_MMX)
-ALL_TARGET= ${OSNAME}-x86-any
+OPTIONS+= MMX "Enable MMX optimizations" off
+.endif
+
+.include <bsd.port.pre.mk>
+
+ALL_TARGET= generic
+
+.if defined(WITH_MMX)
+. if defined(WITH_SSE2)
+ALL_TARGET= ${OSNAME}-x86-sse2
. else
ALL_TARGET= ${OSNAME}-x86-mmx
. endif
+.elif defined(WITH_SSE2)
+ALL_TARGET= ${OSNAME}-x86-sse2
.elif ${ARCH} == "alpha"
ALL_TARGET= ${OSNAME}-alpha
-.endif
-
-pre-everything::
-.if !defined(WITHOUT_MMX) && ${ARCH} == "i386"
- @${ECHO_MSG}
- @${ECHO_MSG} "You can disable MMX optimizations by defining WITHOUT_MMX"
- @${ECHO_MSG}
+.else
+ALL_TARGET= ${OSNAME}-x86-any
.endif
post-patch:
diff -ruN /usr/ports/security/john/distinfo security/john/distinfo
--- /usr/ports/security/john/distinfo Thu May 4 10:25:49 2006
+++ security/john/distinfo Thu May 11 23:08:57 2006
@@ -1,3 +1,3 @@
-MD5 (john-1.7.0.2.tar.bz2) = 0a87dca1f149493fc087ea8a8b6ae5d5
-SHA256 (john-1.7.0.2.tar.bz2) = d97ce0595befc940187930ab8185e5503e2a200fbd795e07a6b1f304de408b38
-SIZE (john-1.7.0.2.tar.bz2) = 690516
+MD5 (john-1.7.1.tar.bz2) = 38eea8aae42f9da08513ef2629b61bd9
+SHA256 (john-1.7.1.tar.bz2) = 959b6179f7eee5a5754604abd4f10d6c5d6cff07e256d0666514bf1a1867b85c
+SIZE (john-1.7.1.tar.bz2) = 692049
--- john-1.7.1.diff ends here ---
>Release-Note:
>Audit-Trail:
>Unformatted:
More information about the freebsd-ports-bugs
mailing list