Hi,
This diff adds the jumbo patch to john including support for over 40 of
additional hash and cipher types.
Tested on amd64.
Comments ? OK ?
Cheers,
benoit
Index: Makefile
===================================================================
RCS file: /cvs/ports/security/john/Makefile,v
retrieving revision 1.40
diff -u -r1.40 Makefile
--- Makefile 17 Jul 2010 22:46:00 -0000 1.40
+++ Makefile 4 Dec 2010 16:27:05 -0000
@@ -1,8 +1,10 @@
# $OpenBSD: Makefile,v 1.40 2010/07/17 22:46:00 benoit Exp $
-COMMENT = extremely fast password cracker
+COMMENT-main = extremely fast password cracker
-DISTNAME = john-1.7.6
+V = 1.7.6
+DISTNAME = john-${V}
+PKGNAME-main = ${DISTNAME}
CATEGORIES = security
HOMEPAGE = http://www.openwall.com/john/
@@ -18,6 +20,12 @@
WANTLIB = c
MASTER_SITES = ${HOMEPAGE}/g/
+MASTER_SITES0 = http://www.openwall.com/john/contrib/
+
+MULTI_PACKAGES = -main
+
+FLAVORS = contrib
+FLAVOR ?=
WRKSRC = ${WRKDIST}/src
@@ -48,6 +56,18 @@
ALL_TARGET= generic
.endif
+.if ${FLAVOR:L:Mcontrib}
+MULTI_PACKAGES += -contrib
+COMMENT-contrib = extremely fast password cracker
+PKGNAME-contrib = john-contrib-${V}
+PATCH_DIST_STRIP = -p1
+PATCHFILES += john-1.7.6-jumbo-9.diff.gz:0
+WANTLIB += m crypto ldap_r lber
+BUILD_DEPENDS += databases/mysql
+LIB_DEPENDS += databases/openldap
+MAKE_FLAGS += LDFLAGS="-lcrypto -lm"
+.endif
+
do-configure:
${SUBST_CMD} ${WRKSRC}/params.h
@@ -65,6 +85,9 @@
ln -sf john unafs && \
ln -sf john unique
${INSTALL_DATA} ${WRKDIST}/run/john.conf ${PREFIX}/share/examples/john
+.if ${FLAVOR:L:Mcontrib}
+ @rm ${WRKDIST}/doc/*.bak.orig
+.endif
${INSTALL_DATA} ${WRKDIST}/doc/* ${PREFIX}/share/doc/john
${INSTALL_DATA} ${WRKDIST}/run/*.chr ${PREFIX}/share/john
${INSTALL_DATA} ${WRKDIST}/run/words.lst
${PREFIX}/share/john/password.lst
Index: distinfo
===================================================================
RCS file: /cvs/ports/security/john/distinfo,v
retrieving revision 1.13
diff -u -r1.13 distinfo
--- distinfo 17 Jul 2010 22:46:00 -0000 1.13
+++ distinfo 4 Dec 2010 16:27:05 -0000
@@ -1,5 +1,10 @@
+MD5 (john-1.7.6-jumbo-9.diff.gz) = 9r4+1rlNIgy5iTqbC0KruA==
MD5 (john-1.7.6.tar.gz) = zh3/xuNHkGIF0UxNaiEEkQ==
+RMD160 (john-1.7.6-jumbo-9.diff.gz) = xtWgdx1d4NNYAthTGRRu6VxOvfQ=
RMD160 (john-1.7.6.tar.gz) = KU+po4G0Xfb9puU3vJIOdMHZZrA=
+SHA1 (john-1.7.6-jumbo-9.diff.gz) = HQRuyMAW4kl2U0h5F6NZQiIDH0k=
SHA1 (john-1.7.6.tar.gz) = 2gtimObgRWBtSIgN8EUJbovIf8s=
+SHA256 (john-1.7.6-jumbo-9.diff.gz) =
7jfLPcNBNIpXP2w8L0OxNsDmoXNDCGO9O2Un5rEUM2g=
SHA256 (john-1.7.6.tar.gz) = d+RNBo0xdkjEHTrGG46h3xjVx0AQg+ek9mgYFpAMGnM=
+SIZE (john-1.7.6-jumbo-9.diff.gz) = 218658
SIZE (john-1.7.6.tar.gz) = 832790
Index: pkg/DESCR
===================================================================
RCS file: pkg/DESCR
diff -N pkg/DESCR
--- pkg/DESCR 6 Sep 2007 19:15:14 -0000 1.7
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,22 +0,0 @@
-John the Ripper -- Password Cracker
-=====================================
-
-John the Ripper is designed to be both powerful and fast. It combines
-several cracking modes in one program, and is fully configurable for your
-particular needs (you can even define a custom cracking mode using the
-built-in compiler supporting a subset of C).
-
-Out of the box, John supports (and autodetects) the following ciphertext
-formats: standard and double-length DES-based, BSDI's extended DES-based,
-FreeBSD's (and not only) MD5-based and OpenBSD's Blowfish-based.
-
-With just one extra command (required to extract the passwords), John can
-crack AFS passwords and WinNT LM hashes.
-
-Unlike other crackers, John doesn't use a crypt(3)-style routine. Instead,
-it has its own highly optimized modules for different ciphertext formats
-and architectures. Some of the algorithms used couldn't be implemented in
-a crypt(3)-style routine: they require a more powerful interface (bitslice
-DES is an example). Additionally, there're assembly routines for several
-processors and architectures (special Intel Pentium version, x86 with MMX,
-generic x86, Alpha EV4, SPARC V8).
Index: pkg/DESCR-contrib
===================================================================
RCS file: pkg/DESCR-contrib
diff -N pkg/DESCR-contrib
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ pkg/DESCR-contrib 4 Dec 2010 16:27:05 -0000
@@ -0,0 +1,26 @@
+John the Ripper -- Password Cracker
+=====================================
+
+John the Ripper is designed to be both powerful and fast. It combines
+several cracking modes in one program, and is fully configurable for your
+particular needs (you can even define a custom cracking mode using the
+built-in compiler supporting a subset of C).
+
+Out of the box, John supports (and autodetects) the following ciphertext
+formats: standard and double-length DES-based, BSDI's extended DES-based,
+FreeBSD's (and not only) MD5-based and OpenBSD's Blowfish-based.
+
+With just one extra command (required to extract the passwords), John can
+crack AFS passwords and WinNT LM hashes.
+
+Unlike other crackers, John doesn't use a crypt(3)-style routine. Instead,
+it has its own highly optimized modules for different ciphertext formats
+and architectures. Some of the algorithms used couldn't be implemented in
+a crypt(3)-style routine: they require a more powerful interface (bitslice
+DES is an example). Additionally, there're assembly routines for several
+processors and architectures (special Intel Pentium version, x86 with MMX,
+generic x86, Alpha EV4, SPARC V8).
+
+This version integrates lots of contributed patches adding support for over 40
+of additional hash and cipher types (including popular ones such as NTLM,
+raw MD5, etc.), as well as some optimizations and features.
Index: pkg/DESCR-main
===================================================================
RCS file: pkg/DESCR-main
diff -N pkg/DESCR-main
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ pkg/DESCR-main 4 Dec 2010 16:27:05 -0000
@@ -0,0 +1,22 @@
+John the Ripper -- Password Cracker
+=====================================
+
+John the Ripper is designed to be both powerful and fast. It combines
+several cracking modes in one program, and is fully configurable for your
+particular needs (you can even define a custom cracking mode using the
+built-in compiler supporting a subset of C).
+
+Out of the box, John supports (and autodetects) the following ciphertext
+formats: standard and double-length DES-based, BSDI's extended DES-based,
+FreeBSD's (and not only) MD5-based and OpenBSD's Blowfish-based.
+
+With just one extra command (required to extract the passwords), John can
+crack AFS passwords and WinNT LM hashes.
+
+Unlike other crackers, John doesn't use a crypt(3)-style routine. Instead,
+it has its own highly optimized modules for different ciphertext formats
+and architectures. Some of the algorithms used couldn't be implemented in
+a crypt(3)-style routine: they require a more powerful interface (bitslice
+DES is an example). Additionally, there're assembly routines for several
+processors and architectures (special Intel Pentium version, x86 with MMX,
+generic x86, Alpha EV4, SPARC V8).
Index: pkg/MESSAGE
===================================================================
RCS file: pkg/MESSAGE
diff -N pkg/MESSAGE
--- pkg/MESSAGE 15 Sep 2005 22:52:01 -0000 1.1
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,2 +0,0 @@
-Up-to-date documentation can be found at
-http://www.openwall.com/john/doc/
Index: pkg/MESSAGE-contrib
===================================================================
RCS file: pkg/MESSAGE-contrib
diff -N pkg/MESSAGE-contrib
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ pkg/MESSAGE-contrib 4 Dec 2010 16:27:05 -0000
@@ -0,0 +1,2 @@
+Up-to-date documentation can be found at
+http://www.openwall.com/john/doc/
Index: pkg/MESSAGE-main
===================================================================
RCS file: pkg/MESSAGE-main
diff -N pkg/MESSAGE-main
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ pkg/MESSAGE-main 4 Dec 2010 16:27:05 -0000
@@ -0,0 +1,2 @@
+Up-to-date documentation can be found at
+http://www.openwall.com/john/doc/
Index: pkg/PLIST
===================================================================
RCS file: pkg/PLIST
diff -N pkg/PLIST
--- pkg/PLIST 8 Mar 2009 11:57:53 -0000 1.13
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,30 +0,0 @@
-...@comment $OpenBSD: PLIST,v 1.13 2009/03/08 11:57:53 jasper Exp $
-...@bin bin/john
-bin/mailer
-bin/unafs
-bin/unique
-bin/unshadow
-share/doc/john/
-share/doc/john/CHANGES
-share/doc/john/CONFIG
-share/doc/john/CONTACT
-...@comment share/doc/john/CREDITS
-share/doc/john/EXAMPLES
-share/doc/john/EXTERNAL
-share/doc/john/FAQ
-share/doc/john/INSTALL
-share/doc/john/LICENSE
-share/doc/john/MODES
-share/doc/john/OPTIONS
-share/doc/john/README
-share/doc/john/RULES
-share/examples/john/
-share/examples/john/john.conf
-...@sample ${SYSCONFDIR}/john.conf
-share/john/
-share/john/all.chr
-share/john/alnum.chr
-share/john/alpha.chr
-share/john/digits.chr
-share/john/lanman.chr
-share/john/password.lst
Index: pkg/PLIST-contrib
===================================================================
RCS file: pkg/PLIST-contrib
diff -N pkg/PLIST-contrib
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ pkg/PLIST-contrib 4 Dec 2010 16:27:05 -0000
@@ -0,0 +1,35 @@
+...@comment $OpenBSD: PLIST,v 1.13 2009/03/08 11:57:53 jasper Exp $
+...@comment share/doc/john/CREDITS
+...@comment share/doc/john/CREDITS
+...@bin bin/john
+bin/mailer
+bin/unafs
+bin/unique
+bin/unshadow
+share/doc/john/
+share/doc/john/CHANGES
+share/doc/john/CONFIG
+share/doc/john/CONTACT
+...@comment share/doc/john/CREDITS
+...@comment share/doc/john/CREDITS
+share/doc/john/EPi.patch.README
+share/doc/john/EXAMPLES
+share/doc/john/EXTERNAL
+share/doc/john/FAQ
+share/doc/john/INSTALL
+share/doc/john/LICENSE
+share/doc/john/MARKOV
+share/doc/john/MODES
+share/doc/john/OPTIONS
+share/doc/john/README
+share/doc/john/RULES
+share/examples/john/
+share/examples/john/john.conf
+...@sample ${SYSCONFDIR}/john.conf
+share/john/
+share/john/all.chr
+share/john/alnum.chr
+share/john/alpha.chr
+share/john/digits.chr
+share/john/lanman.chr
+share/john/password.lst
Index: pkg/PLIST-main
===================================================================
RCS file: pkg/PLIST-main
diff -N pkg/PLIST-main
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ pkg/PLIST-main 4 Dec 2010 16:27:05 -0000
@@ -0,0 +1,30 @@
+...@comment $OpenBSD: PLIST,v 1.13 2009/03/08 11:57:53 jasper Exp $
+...@bin bin/john
+bin/mailer
+bin/unafs
+bin/unique
+bin/unshadow
+share/doc/john/
+share/doc/john/CHANGES
+share/doc/john/CONFIG
+share/doc/john/CONTACT
+...@comment share/doc/john/CREDITS
+share/doc/john/EXAMPLES
+share/doc/john/EXTERNAL
+share/doc/john/FAQ
+share/doc/john/INSTALL
+share/doc/john/LICENSE
+share/doc/john/MODES
+share/doc/john/OPTIONS
+share/doc/john/README
+share/doc/john/RULES
+share/examples/john/
+share/examples/john/john.conf
+...@sample ${SYSCONFDIR}/john.conf
+share/john/
+share/john/all.chr
+share/john/alnum.chr
+share/john/alpha.chr
+share/john/digits.chr
+share/john/lanman.chr
+share/john/password.lst
