[arch-commits] Commit in john/repos (4 files)

[Eric Bélanger]

    Date: Saturday, February 6, 2010 @ 23:47:43
  Author: eric
Revision: 67442

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

........
  r67441 | eric | 2010-02-06 23:46:51 -0500 (Sat, 06 Feb 2010) | 2 lines
  
  upgpkg: john 1.7.3.4-1
      Upstream update, Added backup array
........

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

-----------------------+
 extra-i686/PKGBUILD   |   19 ++++++++++---------
 extra-x86_64/PKGBUILD |   19 ++++++++++---------
 2 files changed, 20 insertions(+), 18 deletions(-)


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

Modified: extra-i686/PKGBUILD
===================================================================
--- extra-i686/PKGBUILD	2010-02-07 04:46:51 UTC (rev 67441)
+++ extra-i686/PKGBUILD	2010-02-07 04:47:43 UTC (rev 67442)
@@ -5,26 +5,27 @@
 # Contributor: Michal Krenek <mikos at sg1.cz>
 
 pkgname=john
-pkgver=1.7.0.2
-pkgrel=5
+pkgver=1.7.3.4
+pkgrel=1
 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')
 depends=('openssl')
-source=(http://www.openwall.com/$pkgname/f/$pkgname-$pkgver.tar.gz \
-	http://www.openwall.com/john/contrib/john-1.7-all-4.diff.gz \
+backup=('etc/john/john.conf')
+source=(http://www.openwall.com/$pkgname/g/$pkgname-$pkgver.tar.bz2 \
+	http://www.openwall.com/john/contrib/john-$pkgver-jumbo-2.diff.gz \
 	http://www2.psy.uq.edu.au/~ftp/Crypto/DES/libdes-4.04b.tar.gz \
 	params.h.patch)
-md5sums=('084fa03f265491ef7e32c05e9fb027db'
-         '4429722ba242a5a33ca8ebf45fd42797'
-         '41bd2e1225c038ce9993ceb485991f0e'
-         'f69ed632eba8fb9e45847a4b4a323787')
+md5sums=('2f2310c49961c3edea6f92b8dcd45ff4' 'c27dbe12662a767c9803964c2c76a732'\
+         '5372bfa2fc40bf4fad1231b9a135a992' 'f69ed632eba8fb9e45847a4b4a323787')
+sha1sums=('3919cac037360512e6d72d04d72d492ee9673ded' '3642de43c9739072715758bcd5ffb4c221c9e21d'\
+         '705fea4572f86c824ebda2579478bed0788b3e48' 'b06813c25989f361cf04dba99927e84a0793b8e1')
 
 build() {
 	# jumbo patch
 	cd ${srcdir}/$pkgname-$pkgver
-	patch -p0 < ${srcdir}/$pkgname-1.7-all-4.diff || return 1
+	patch -p1 < ${srcdir}/$pkgname-$pkgver-jumbo-2.diff || return 1
 	cd ${srcdir}/john-$pkgver/src/
 
 	# patch default params


Property changes on: john/repos/extra-x86_64
___________________________________________________________________
Modified: svnmerge-integrated
   - /john/trunk:1-42034
   + /john/trunk:1-67441

Modified: extra-x86_64/PKGBUILD
===================================================================
--- extra-x86_64/PKGBUILD	2010-02-07 04:46:51 UTC (rev 67441)
+++ extra-x86_64/PKGBUILD	2010-02-07 04:47:43 UTC (rev 67442)
@@ -5,26 +5,27 @@
 # Contributor: Michal Krenek <mikos at sg1.cz>
 
 pkgname=john
-pkgver=1.7.0.2
-pkgrel=5
+pkgver=1.7.3.4
+pkgrel=1
 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')
 depends=('openssl')
-source=(http://www.openwall.com/$pkgname/f/$pkgname-$pkgver.tar.gz \
-	http://www.openwall.com/john/contrib/john-1.7-all-4.diff.gz \
+backup=('etc/john/john.conf')
+source=(http://www.openwall.com/$pkgname/g/$pkgname-$pkgver.tar.bz2 \
+	http://www.openwall.com/john/contrib/john-$pkgver-jumbo-2.diff.gz \
 	http://www2.psy.uq.edu.au/~ftp/Crypto/DES/libdes-4.04b.tar.gz \
 	params.h.patch)
-md5sums=('084fa03f265491ef7e32c05e9fb027db'
-         '4429722ba242a5a33ca8ebf45fd42797'
-         '41bd2e1225c038ce9993ceb485991f0e'
-         'f69ed632eba8fb9e45847a4b4a323787')
+md5sums=('2f2310c49961c3edea6f92b8dcd45ff4' 'c27dbe12662a767c9803964c2c76a732'\
+         '5372bfa2fc40bf4fad1231b9a135a992' 'f69ed632eba8fb9e45847a4b4a323787')
+sha1sums=('3919cac037360512e6d72d04d72d492ee9673ded' '3642de43c9739072715758bcd5ffb4c221c9e21d'\
+         '705fea4572f86c824ebda2579478bed0788b3e48' 'b06813c25989f361cf04dba99927e84a0793b8e1')
 
 build() {
 	# jumbo patch
 	cd ${srcdir}/$pkgname-$pkgver
-	patch -p0 < ${srcdir}/$pkgname-1.7-all-4.diff || return 1
+	patch -p1 < ${srcdir}/$pkgname-$pkgver-jumbo-2.diff || return 1
 	cd ${srcdir}/john-$pkgver/src/
 
 	# patch default params