Merge branch 'master' of ssh://vparabola/home/parabola/abslibre-pre-mips64el

Conflicts:
	core/systemd/PKGBUILD
	core/sysvinit/PKGBUILD
	extra/hyphen/PKGBUILD
	extra/imagemagick/PKGBUILD
	extra/lynx/PKGBUILD
	extra/pyqt/PKGBUILD
	extra/sip/PKGBUILD
	libre/kdelibs-libre/PKGBUILD
	testing/libdrm/PKGBUILD
	testing/xf86-video-ati/PKGBUILD

2 files changed, 57 insertions, 27 deletions

diff --git a/community/john/PKGBUILD b/community/john/PKGBUILD
index 323a033ce..1b6183e7d 100644
--- a/community/john/PKGBUILD
+++ b/community/john/PKGBUILD
@@ -6,8 +6,8 @@
 
 pkgname=john
 pkgver=1.7.9
-pkgrel=3
-_jumbover=5
+pkgrel=4
+_jumbover=6
 pkgdesc="John The Ripper - A fast password cracker (jumbo-$_jumbover included)"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://www.openwall.com/$pkgname/"
@@ -17,12 +17,13 @@ optdepends=("perl: for executing some of the scripts at /usr/share/john"
             "ruby: for executing some of the scripts at /usr/share/john"
             "python: for executing some of the scripts at /usr/share/john")
 backup=('etc/john/john.conf')
-source=(http://www.openwall.com/$pkgname/g/$pkgname-$pkgver.tar.bz2 
-	http://www.openwall.com/john/g/john-$pkgver-jumbo-$_jumbover.diff.gz 
-	ftp://ftp.kfki.hu/pub/packages/security/ssh/ossh/libdes-4.04b.tar.gz
-	params.h.patch)
+install=john.install
+source=(http://www.openwall.com/$pkgname/g/$pkgname-$pkgver.tar.bz2
+        http://www.openwall.com/john/g/john-$pkgver-jumbo-$_jumbover.diff.gz
+        ftp://ftp.kfki.hu/pub/packages/security/ssh/ossh/libdes-4.04b.tar.gz
+        params.h.patch)
 md5sums=('45f54fc59386ecd67daaef9f19781d93'
-         '68cacb612f20c71eed6c24cbaf28148a'
+         '685c759ec6f865ea81f40a487cd56882'
          'c8d5c69f86c2eedb485583b0305284a1'
          'f69ed632eba8fb9e45847a4b4a323787')
 
@@ -58,32 +59,46 @@ package() {
 	# config file
 	sed -i 's|$JOHN|/usr/share/john|g' ${srcdir}/john-$pkgver/run/john.conf
 	install -Dm644 ${srcdir}/john-$pkgver/run/john.conf ${pkgdir}/etc/john/john.conf
-	
+
 	# docs
 	install -d ${pkgdir}/usr/share/doc/john
 	install -m644 ${srcdir}/john-$pkgver/doc/* ${pkgdir}/usr/share/doc/john/
 	install -Dm644 ${srcdir}/john-$pkgver/doc/LICENSE ${pkgdir}/usr/share/licenses/$pkgname/LICENSE
 
-	# install password list, charset files and other stuff
+	# install password list, charset files
 	install -d ${pkgdir}/usr/share/john/
 	install -m644 ${srcdir}/${pkgname}-${pkgver}/run/password.lst ${pkgdir}/usr/share/john/
+	install -m644 ${srcdir}/${pkgname}-${pkgver}/run/dictionary.rfc2865 ${pkgdir}/usr/share/john/
 	install -m644 ${srcdir}/${pkgname}-${pkgver}/run/stats ${pkgdir}/usr/share/john/
 	install -m644 ${srcdir}/${pkgname}-${pkgver}/run/{all,alnum,alpha,digits,lanman}.chr \
-          ${pkgdir}/usr/share/john/
+ 			${pkgdir}/usr/share/john/
 	install -m644 ${srcdir}/${pkgname}-${pkgver}/run/{dumb16,dumb32,dynamic}.conf \
-          ${pkgdir}/usr/share/john/
-	install -m644 ${srcdir}/${pkgname}-${pkgver}/run/{cmpt_cp,ldif2john,lion2john-alt,lion2john}.pl \
-          ${pkgdir}/usr/share/john
-	install -m644 ${srcdir}/${pkgname}-${pkgver}/run/{netntlm,radius2john,sap_prepare,sha-dump}.pl \
-          ${pkgdir}/usr/share/john
-  install -m644 ${srcdir}/${pkgname}-${pkgver}/run/sha-test.pl \
-          ${pkgdir}/usr/share/john
-  install -m644 ${srcdir}/${pkgname}-${pkgver}/run/genincstats.rb \
-          ${pkgdir}/usr/share/john
-  install -m644 ${srcdir}/${pkgname}-${pkgver}/run/netscreen.py \
-          ${pkgdir}/usr/share/john
+			${pkgdir}/usr/share/john/
+
+	# install scripts
+	john_scripts=(benchmark-unify \
+		cracf2john.py \
+		genincstats.rb \
+		ldif2john.pl \
+		lion2john-alt.pl \
+		lion2john.pl \
+		netntlm.pl \
+		netscreen.py \
+		odf2john.py \
+		pass_gen.pl \
+		radius2john.pl \
+		sap2john.pl \
+		sha-dump.pl \
+		sha-test.pl \
+		sipdump2john.py)
+	for john_script in "${john_scripts[@]}"; do
+		install -m755 ${srcdir}/${pkgname}-${pkgver}/run/${john_script} \
+			${pkgdir}/usr/share/john
+	done
 
 	install -m644 ${srcdir}/${pkgname}-${pkgver}/run/dynamic.conf ${pkgdir}/etc/john/
+	install -Dm644 ${srcdir}/${pkgname}-${pkgver}/run/john.bash_completion \
+		${pkgdir}/etc/bash_completion.d/john
 
 	# install binaries
 	install -Dm755 ${srcdir}/john-$pkgver/run/john ${pkgdir}/usr/bin/john
@@ -93,16 +108,21 @@ package() {
 	install -Dm755 ${srcdir}/john-$pkgver/run/relbench ${pkgdir}/usr/bin/relbench
 	install -Dm755 ${srcdir}/john-$pkgver/run/tgtsnarf ${pkgdir}/usr/bin/tgtsnarf
 	install -Dm755 ${srcdir}/john-$pkgver/run/mailer ${pkgdir}/usr/bin/john-mailer
-	
-  # create links
-  cd ${pkgdir}/usr/bin
+	install -Dm755 ${srcdir}/john-$pkgver/run/raw2dyna ${pkgdir}/usr/bin/raw2dyna
+
+	# create links
+	cd ${pkgdir}/usr/bin
+	ln -s john hccap2john
+	ln -s john keepass2john
+	ln -s john pdf2john
+	ln -s john pwsafe2john
+	ln -s john racf2john
+	ln -s john rar2john
+	ln -s john ssh2john
 	ln -s john unafs
 	ln -s john unique
 	ln -s john unshadow
 	ln -s john undrop
-	ln -s john pdf2john
-	ln -s john rar2john
-	ln -s john ssh2john
 	ln -s john zip2john
 }
 
diff --git a/community/john/john.install b/community/john/john.install
new file mode 100644
index 000000000..21bc51c70
--- /dev/null
+++ b/community/john/john.install
@@ -0,0 +1,10 @@
+post_install() {
+  touch /etc/john/john.local.conf 2> /dev/null
+}
+
+
+post_upgrade() {
+  post_install $1
+}
+
+# vim:set ts=2 sw=2 et: