[arch-commits] Commit in john/repos (extra-i686 extra-i686/PKGBUILD)

[Andrea Scarpino]

    Date: Monday, June 8, 2009 @ 19:48:25
  Author: andrea
Revision: 41998

Merged revisions 41997 via svnmerge from 
svn+ssh://archlinux.org/srv/svn-packages/john/trunk

........
  r41997 | andrea | 2009-06-09 01:48:09 +0200 (Tue, 09 Jun 2009) | 1 line
  
  upgpkg: john 1.7.0.2-5
........

Modified:
  john/repos/extra-i686/	(properties)
  john/repos/extra-i686/PKGBUILD

----------+
 PKGBUILD |   22 +++++++++++++++-------
 1 file changed, 15 insertions(+), 7 deletions(-)


Property changes on: john/repos/extra-i686
___________________________________________________________________
Modified: svnmerge-integrated
   - /john/trunk:1-34220
   + /john/trunk:1-41997

Modified: extra-i686/PKGBUILD
===================================================================
--- extra-i686/PKGBUILD	2009-06-08 23:48:09 UTC (rev 41997)
+++ extra-i686/PKGBUILD	2009-06-08 23:48:25 UTC (rev 41998)
@@ -1,12 +1,13 @@
 # $Id$
-# Maintainer: Dale Blount <dale at archlinux.org>
-# Original Contributor: Tom Newsom <Jeepster at gmx.co.uk>
-# Portions from AUR john-devel PKGBUILD used with permission from Michal Krenek <mikos at sg1.cz>
+# Maintainer: Andrea Scarpino <andrea at archlinux.org>
+# Contributor: Dale Blount <dale at archlinux.org>
+# Contributor: Tom Newsom <Jeepster at gmx.co.uk>
+# Contributor: Michal Krenek <mikos at sg1.cz>
 
 pkgname=john
 pkgver=1.7.0.2
-pkgrel=4
-pkgdesc="John the Ripper is a fast password cracker. Additional patches (NTLM, MySQL, Kerberos V5, etc.) included."
+pkgrel=5
+pkgdesc="John The Ripper - A fast password cracker. Additional patches (NTLM, MySQL, Kerberos V5, etc.) included."
 arch=(i686 x86_64)
 url="http://www.openwall.com/$pkgname/"
 license=('GPL2' 'custom')
@@ -15,8 +16,10 @@
 	http://www.openwall.com/john/contrib/john-1.7-all-4.diff.gz \
 	http://www2.psy.uq.edu.au/~ftp/Crypto/DES/libdes-4.04b.tar.gz \
 	params.h.patch)
-md5sums=('084fa03f265491ef7e32c05e9fb027db' '4429722ba242a5a33ca8ebf45fd42797'\
-         '271191f7bf86d16b1a6b0fa3f0f1dad3' 'f69ed632eba8fb9e45847a4b4a323787')
+md5sums=('084fa03f265491ef7e32c05e9fb027db'
+         '4429722ba242a5a33ca8ebf45fd42797'
+         '41bd2e1225c038ce9993ceb485991f0e'
+         'f69ed632eba8fb9e45847a4b4a323787')
 
 build() {
 	# jumbo patch
@@ -54,6 +57,11 @@
 	install -m644 ${srcdir}/john-$pkgver/run/password.lst ${pkgdir}/usr/share/john/	
 	install -D -m644 ${srcdir}/john-$pkgver/doc/LICENSE ${pkgdir}/usr/share/licenses/$pkgname/LICENSE
 
+	# install password list and charset files
+	install -d ${pkgdir}/usr/share/john/
+	install -m644 ${srcdir}/${pkgname}-${pkgver}/run/{{all,alnum,alpha,digits,lanman}.chr,password.lst} \
+          ${pkgdir}/usr/share/john/ || return 1
+
 	# install binaries
 	install -d ${pkgdir}/usr/bin
 	if [ "$CARCH" == "x86_64" ]; then