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

[Eric Bélanger]

    Date: Wednesday, April 8, 2009 @ 04:13:04
  Author: eric
Revision: 34221

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

........
  r34219 | eric | 2009-04-08 04:08:40 -0400 (Wed, 08 Apr 2009) | 2 lines
  
  upgpkg: john 1.7.0.2-4
      Added license, FHS docs
........

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

----------+
 PKGBUILD |   50 ++++++++++++++++++++++++++------------------------
 1 file changed, 26 insertions(+), 24 deletions(-)


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

Modified: extra-i686/PKGBUILD
===================================================================
--- extra-i686/PKGBUILD	2009-04-08 08:08:55 UTC (rev 34220)
+++ extra-i686/PKGBUILD	2009-04-08 08:13:04 UTC (rev 34221)
@@ -5,35 +5,36 @@
 
 pkgname=john
 pkgver=1.7.0.2
-pkgrel=3
+pkgrel=4
 pkgdesc="John the Ripper is 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 \
 	http://www2.psy.uq.edu.au/~ftp/Crypto/DES/libdes-4.04b.tar.gz \
 	params.h.patch)
 md5sums=('084fa03f265491ef7e32c05e9fb027db' '4429722ba242a5a33ca8ebf45fd42797'\
-         'c8d5c69f86c2eedb485583b0305284a1' 'f69ed632eba8fb9e45847a4b4a323787')
+         '271191f7bf86d16b1a6b0fa3f0f1dad3' 'f69ed632eba8fb9e45847a4b4a323787')
 
 build() {
 	# jumbo patch
-	cd ${startdir}/src/$pkgname-$pkgver
-	patch -p0 < ${startdir}/src/$pkgname-1.7-all-4.diff || return 1
-	cd ${startdir}/src/john-$pkgver/src/
+	cd ${srcdir}/$pkgname-$pkgver
+	patch -p0 < ${srcdir}/$pkgname-1.7-all-4.diff || return 1
+	cd ${srcdir}/john-$pkgver/src/
 
 	# patch default params
-	patch -p0 < ${startdir}/src/params.h.patch
+	patch -p0 < ${srcdir}/params.h.patch || return 1
 	if [ "$CARCH" == "x86_64" ]; then
-	    sed -i 's|CFLAGS = -c -Wall -O2|CFLAGS = -c -Wall -O2 -march=x86-64 -DJOHN_SYSTEMWIDE=1|' Makefile
-	    sed -i 's|^LDFLAGS =\(.*\)|LDFLAGS =\1 -lm|' Makefile
-	    sed -i -e 's|-m486||g' Makefile
-	  else sed -i 's|CFLAGS = -c -Wall -O2|CFLAGS = -c -Wall -O2 -march=i686 -DJOHN_SYSTEMWIDE=1|' Makefile
+	    sed -i 's|CFLAGS = -c -Wall -O2|CFLAGS = -c -Wall -O2 -march=x86-64 -DJOHN_SYSTEMWIDE=1|' Makefile || return 1
+	    sed -i 's|^LDFLAGS =\(.*\)|LDFLAGS =\1 -lm|' Makefile || return 1
+	    sed -i -e 's|-m486||g' Makefile || return 1
+	  else sed -i 's|CFLAGS = -c -Wall -O2|CFLAGS = -c -Wall -O2 -march=i686 -DJOHN_SYSTEMWIDE=1|' Makefile || return 1
 	fi
-	sed -i 's|LIBS = -ldes|LIBS = -ldes -Ldes|' Makefile
-	sed -i 's|#include <des.h>|#include "des/des.h"|' KRB5_fmt.c
-	sed -i 's|#include <des.h>|#include "des/des.h"|' KRB5_std.h
+	sed -i 's|LIBS = -ldes|LIBS = -ldes -Ldes|' Makefile || return 1
+	sed -i 's|#include <des.h>|#include "des/des.h"|' KRB5_fmt.c || return 1
+	sed -i 's|#include <des.h>|#include "des/des.h"|' KRB5_std.h || return 1
 
 	# build john
 	if [ "$CARCH" == "x86_64" ]; then
@@ -42,25 +43,26 @@
 	fi
 
 	# config file
-	mkdir -p ${startdir}/pkg/etc/john
-	sed -i 's|$JOHN|/usr/share/john|g' ${startdir}/src/john-$pkgver/run/john.conf
-	install -m644 ${startdir}/src/john-$pkgver/run/john.conf ${startdir}/pkg/etc/john/john.conf
+	install -d ${pkgdir}/etc/john
+	sed -i 's|$JOHN|/usr/share/john|g' ${srcdir}/john-$pkgver/run/john.conf || return 1
+	install -m644 ${srcdir}/john-$pkgver/run/john.conf ${pkgdir}/etc/john/john.conf
 	
 	# docs
-	mkdir -p ${startdir}/pkg/usr/share/john/doc
-	install -m644 ${startdir}/src/john-$pkgver/doc/* ${startdir}/pkg/usr/share/john/doc/
-	install -m644 ${startdir}/src/john-$pkgver/run/*.chr ${startdir}/pkg/usr/share/john/	
-	install -m644 ${startdir}/src/john-$pkgver/run/password.lst ${startdir}/pkg/usr/share/john/	
+	install -d ${pkgdir}/usr/share/doc/john
+	install -m644 ${srcdir}/john-$pkgver/doc/* ${pkgdir}/usr/share/doc/john
+	install -m644 ${srcdir}/john-$pkgver/run/*.chr ${pkgdir}/usr/share/john/	
+	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 binaries
-	mkdir -p ${startdir}/pkg/usr/bin
+	install -d ${pkgdir}/usr/bin
 	if [ "$CARCH" == "x86_64" ]; then
 	    make linux-x86-64 || return 1
 	  else 	make linux-x86-mmx || return 1
 	fi
-	install -m755 ${startdir}/src/john-$pkgver/run/john ${startdir}/pkg/usr/bin/john
-	install -m755 ${startdir}/src/john-$pkgver/run/mailer ${startdir}/pkg/usr/bin/john-mailer
-	cd ${startdir}/pkg/usr/bin
+	install -m755 ${srcdir}/john-$pkgver/run/john ${pkgdir}/usr/bin/john
+	install -m755 ${srcdir}/john-$pkgver/run/mailer ${pkgdir}/usr/bin/john-mailer
+	cd ${pkgdir}/usr/bin
 	ln -s john unafs
 	ln -s john unique
 	ln -s john unshadow