Merge remote-tracking branch 'x/master'

* x/master:
  New package: john-1.7.9 (jumbo-5 patch included).
  acpid: update to 2.0.14.

srcpkgs/acpid/template

@@ -1,13 +1,13 @@
 # Template file for 'acpid'
 pkgname=acpid
-version=2.0.13
+version=2.0.14
 homepage="http://tedfelix.com/linux/acpid-netlink.html"
 distfiles="http://tedfelix.com/linux/acpid-$version.tar.gz"
 build_style=gnu-makefile
 short_desc="The ACPI Daemon (acpid) With Netlink Support"
 maintainer="Juan RP <xtraeme@gmail.com>"
 license="GPL-2"
-checksum=00c789ec5078ddfc07b827c632d91e92a35db5c7130f4f2ee05e1952136d3d93
+checksum=88158b889280017072362b37a4b378826285756489857b93fc5888acf5b4db0b
 long_desc="
  In recent linux kernels, the /proc/acpi/event interface has been deprecated.
  The same information (and more) is available via netlink (a way for the kernel

srcpkgs/john/john.rshlibs

@@ -0,0 +1,9 @@
+libcrypt.so.1
+libgomp.so.1
+libpthread.so.0
+libc.so.6
+libcrypto.so.1
+libssl.so.1
+libm.so.6
+libz.so.1
+libdl.so.2

srcpkgs/john/template

@@ -0,0 +1,67 @@
+# Template file for 'john'
+pkgname=john
+version=1.7.9
+_jumbover=5
+wrksrc=${pkgname}-${version}-jumbo-${_jumbover}
+homepage="http://www.openwall.com/john/"
+distfiles="$homepage/g/$pkgname-${version}-jumbo-${_jumbover}.tar.bz2"
+short_desc="John the Ripper password cracker (jumbo-${_jumbover} patch included)"
+maintainer="Juan RP <xtraeme@gmail.com>"
+license="GPL-2"
+checksum=4007aec40d2fedb1ce3287c62f23f8a1a8b8029d22cd3cbc60bb1a42f56c1a7f
+long_desc="
+ John the Ripper is a fast password cracker, currently available for many
+ flavors of Unix, Windows, DOS, BeOS, and OpenVMS. Its primary purpose is
+ to detect weak Unix passwords. Besides several crypt(3) password hash
+ types most commonly found on various Unix systems, supported out of the
+ box are Windows LM hashes, plus lots of other hashes and ciphers in the
+ community-enhanced version.
+
+ This package contains the community edition with the jump-${_jumbover} patch
+ included by default."
+
+conf_files="/etc/john/john.conf"
+
+Add_dependency build openssl-devel
+
+do_build() {
+	sed -i 's|CFLAGS = -c -Wall -O2|CFLAGS += -c -Wall -DJOHN_SYSTEMWIDE=1|' src/Makefile
+	sed -i 's|^LDFLAGS =\(.*\)|LDFLAGS +=\1 -lm|' src/Makefile
+	sed -i 's|-m486||g' src/Makefile
+	sed -i 's|#OMPFLAGS = -fopenmp|OMPFLAGS = -fopenmp|' src/Makefile
+
+	if [ "${XBPS_MACHINE}" = "x86_64" ]; then
+		make ${makejobs} -C src linux-x86-64
+	elif [ "${XBPS_MACHINE}" = "i686" ]; then
+		make ${makejobs} -C src linux-x86-mmx
+	fi
+}
+
+do_install() {
+	# config file
+	sed -i 's|$JOHN|/usr/share/john|g' run/john.conf
+	install -Dm644 run/john.conf ${DESTDIR}/etc/john/john.conf
+	# docs
+	vmkdir usr/share/doc/john
+	install -m644 doc/* ${DESTDIR}/usr/share/doc/john
+	vmkdir usr/share/john
+	vmove usr/share/doc/$pkgname/LICENSE usr/share/licenses/$pkgname
+	# install password list and charset files
+	install -m644 run/{{all,alnum,alpha,digits,lanman}.chr,password.lst} \
+		${DESTDIR}/usr/share/john
+	install -m644 run/{dumb16,dumb32,dynamic}.conf \
+		${DESTDIR}/usr/share/john
+	# install binaries
+	install -Dm755 run/john ${DESTDIR}/usr/bin/john
+	install -Dm755 run/mailer ${DESTDIR}/usr/bin/john-mailer
+
+	cd ${DESTDIR}/usr/bin
+	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
+}