4 files changed, 36 insertions, 18 deletions
diff --git a/user/dracut/APKBUILD b/user/dracut/APKBUILD
index 8782ed974..6be168f60 100644
--- a/user/dracut/APKBUILD
+++ b/user/dracut/APKBUILD
@@ -2,7 +2,7 @@
 # Maintainer: A. Wilcox <awilfox@adelielinux.org>
 pkgname=dracut
 pkgver=048
-pkgrel=1
+pkgrel=2
 pkgdesc="Event-driven initramfs infrastructure"
 url="https://dracut.wiki.kernel.org/"
 arch="all"
@@ -53,13 +53,13 @@ bashcomp() {
 }
 
 crypt() {
-	depends="cryptsetup device-mapper dracut"
+	depends="cryptsetup dracut lvm2"
 	pkgdesc="$pkgname - LUKS / disk encryption support (crypt) module"
 	mkdir -p "$subpkgdir"
 }
 
 lvm() {
-	depends="device-mapper dracut lvm2"
+	depends="dracut lvm2"
 	pkgdesc="$pkgname - LVM2 module"
 	mkdir -p "$subpkgdir"
 }
diff --git a/user/php7-apcu/APKBUILD b/user/php7-apcu/APKBUILD
index 4398a424d..e9ad17ae4 100644
--- a/user/php7-apcu/APKBUILD
+++ b/user/php7-apcu/APKBUILD
@@ -1,21 +1,20 @@
 # Contributor: zlg <zlg+adelie@zlg.space>
-# Maintainer:
+# Maintainer: Max Rees <maxcrees@me.com>
 pkgname=php7-apcu
 _pkgname=${pkgname#php7-}
-pkgver=5.1.15
+pkgver=5.1.17
 pkgrel=0
 pkgdesc="Userland cache for PHP"
-url="https://github.com/krakjoe/apcu"
+url="https://pecl.php.net/package/APCu"
 arch="all"
 license="PHP-3.01"
 depends="php7"
 makedepends="php7-dev"
 subpackages=""
-source="$pkgname-$pkgver.tar.gz::https://github.com/krakjoe/${_pkgname}/archive/v${pkgver}.tar.gz"
+source="https://pecl.php.net/get/$_pkgname-$pkgver.tgz"
 builddir="$srcdir/$_pkgname-$pkgver"
 
 build() {
-	cd "$builddir"
 	phpize
 	./configure \
 		--build=$CBUILD \
@@ -28,15 +27,13 @@ build() {
 }
 
 check() {
-	cd "$builddir"
 	# The tests have a prompt at the end for sending stats
 	make NO_INTERACTION=1 test
 }
 
 package() {
-	cd "$builddir"
 	# It didn't listen to DESTDIR
 	make INSTALL_ROOT="$pkgdir" install
 }
 
-sha512sums="d95ab6a8a073acfc6af2f83b038f68e4150a1eb518369c163f4d1bc0c8b006c84754759fa9b72ac6f7ca008c27802a3a2aca14ae9d7ca23c02078d720a530b1c  php7-apcu-5.1.15.tar.gz"
+sha512sums="7f6a6cd927ed4ff251497c2c79e8d832d1a44ddd59abdb175886d3c12ea27f26142e6b851ac5bb5acb49a0e3a998e9741ba0ff03310f51b9cd188cdf6cf12793  apcu-5.1.17.tgz"
diff --git a/user/php7/APKBUILD b/user/php7/APKBUILD
index 3afe246c1..fb646c7c1 100644
--- a/user/php7/APKBUILD
+++ b/user/php7/APKBUILD
@@ -41,7 +41,7 @@
 
 pkgname=php7
 _pkgname=php
-pkgver=7.2.19
+pkgver=7.2.20
 pkgrel=0
 _apiver=20170718
 pkgdesc="The PHP7 language runtime engine"
@@ -531,7 +531,7 @@ _mv() {
 	mv $@
 }
 
-sha512sums="79077e73075f4aaba86699c536d8bad4929d351ad40f89c35b6f9ff0d1237b9e3d528be2918dae16519659bdaf93c5ab16fc81653fe13f667e6251871f05d722  php-7.2.19.tar.bz2
+sha512sums="8c32cb46e34440f3af905e9fc73d327e28c62b5b1b4b7f7221b192364b409172a88ae9f35aef40b796a81fbe87b8b64dec214cbf54011f5af53d9e8eddc9b3fa  php-7.2.20.tar.bz2
 23df4e779c809db3e3b8e5b0353b1aafaad2f3dc56f2d1cd45f9b0e3ad71b32e40700d6ebfe914b3c87e8e0b670d0dc862ded1e5c898adf160e33dea372e044f  php-fpm.initd
 01d4ba3ef104ea378eb0e8cbb7bdee3fdf65e4bd6865eb3bc6c0dc4af31c2d52887abdf0150b5ef984b877860285a3b1af84b11ffebb5b8b722ea9faf83edfeb  php-fpm.logrotate
 a7f9ba5e11652fd1cb9e756c3269269a95de083ecb5be936a85c7a09c1396db9088e0251c6a643c40235c0e776fce2a471e5c7f5a033b85c7d3b3110c2b39e48  php-module.conf
diff --git a/user/subversion/APKBUILD b/user/subversion/APKBUILD
index 582a2dfd9..9cb297aa6 100644
--- a/user/subversion/APKBUILD
+++ b/user/subversion/APKBUILD
@@ -2,7 +2,7 @@
 # Maintainer: A. Wilcox <awilfox@adelielinux.org>
 pkgname=subversion
 pkgver=1.12.0
-pkgrel=0
+pkgrel=1
 pkgdesc="Version control system from 2000"
 url="https://subversion.apache.org/"
 arch="all"
@@ -13,9 +13,10 @@ depends=""
 depends_dev="apr-dev apr-util-dev linux-headers"
 makedepends="apr-dev apr-util-dev cyrus-sasl-dev db-dev dbus-dev file-dev
 	kdelibs4support-dev kwallet-dev libsecret-dev lz4-dev openssl-dev
-	serf-dev sqlite-dev utf8proc-dev zlib-dev autoconf automake python3"
+	serf-dev sqlite-dev utf8proc-dev zlib-dev autoconf automake python3
+	perl-dev swig"
 subpackages="$pkgname-dev $pkgname-doc $pkgname-gnome $pkgname-kwallet
-	$pkgname-lang"
+	$pkgname-pl $pkgname-lang"
 source="https://www-eu.apache.org/dist/subversion/subversion-$pkgver.tar.bz2
 	apr-1.7.0.patch
 	python3-bang.patch
@@ -39,16 +40,29 @@ build() {
 		--sysconfdir=/etc \
 		--mandir=/usr/share/man \
 		--localstatedir=/var \
-		--with-kwallet
+		--with-kwallet \
+		--with-swig
 	make
+
+	make swig-pl-lib
+	(cd subversion/bindings/swig/perl/native; perl Makefile.PL)
+	# need override LD_RUN_PATH with something valid, otherwise we get
+	# empty rpath which is not a good idea.
+	make -j1 -C subversion/bindings/swig/perl/native \
+		LD_RUN_PATH="/usr/lib" EXTRALIBS="-lapr-1"
 }
 
 check() {
 	make check
+	make check-swig-pl
 }
 
 package() {
-	make DESTDIR="$pkgdir" -j1 install
+	make DESTDIR="$pkgdir" -j1 install install-swig-pl-lib
+
+	make pure_vendor_install -C subversion/bindings/swig/perl/native \
+		PERL_INSTALL_ROOT="$pkgdir"
+	find "$pkgdir" \( -name perllocal.pod -o -name .packlist \) -delete
 }
 
 gnome() {
@@ -64,6 +78,13 @@ kwallet() {
 	mv "$pkgdir"/usr/lib/libsvn_auth_kwallet* "$subpkgdir"/usr/lib/
 }
 
+pl() {
+	pkgdesc="$pkgdesc (Perl bindings)"
+	install_if="$pkgname=$pkgver-r$pkgrel git"
+	mkdir -p "$subpkgdir"/usr/lib
+	mv "$pkgdir"/usr/lib/*perl* "$subpkgdir"/usr/lib/
+}
+
 sha512sums="87a00b23bdac63124fa00642e2ac7e6f7818b092bc6422cabdeb2ca8fbc8c481fb8c1e4fbd86aac94e8e1fc099fa163aa0609aca23265ceb96ef4ebe78a64c13  subversion-1.12.0.tar.bz2
 71b22f08a972a51347af00f979c4ec540c5795b44f3ced07ab2fcf8b1294b59add945983af4a63815d9f5d3b0ba88c24320cf2ec21189bf48c0ec46c7c0b48cf  apr-1.7.0.patch
 1b96b791f70c2f6e05da8dbc9d42ccadf4603f25392c6676c4e30ecdb142ce74dd9b8dc27dc68b1cb461f4409d79c4c2aeed1d39a5a442d9349079a819358f5a  python3-bang.patch"