Merge branch 'bump.sroracle.20190417' into 'master'

bump.sroracle.20190417



See merge request !219

23 files changed, 112 insertions, 137 deletions

diff --git a/user/checkbashisms/APKBUILD b/user/checkbashisms/APKBUILD
index 09f3359c8..a916e2915 100644
--- a/user/checkbashisms/APKBUILD
+++ b/user/checkbashisms/APKBUILD
@@ -1,7 +1,7 @@
 # Contributor: Natanael Copa <ncopa@alpinelinux.org>
 # Maintainer: Max Rees <maxcrees@me.com>
 pkgname=checkbashisms
-pkgver=2.18.6
+pkgver=2.19.4
 pkgrel=0
 pkgdesc="Check shell scripts for POSIX compliance"
 url="https://tracker.debian.org/pkg/devscripts"
@@ -20,12 +20,10 @@ prepare() {
 }
 
 check() {
-	cd "$builddir"
 	./test/test_checkbashisms
 }
 
 package() {
-	cd "$builddir"
 	install -Dm755 "scripts/$pkgname.pl" "$pkgdir/usr/bin/$pkgname"
 	install -Dm644 "scripts/$pkgname.1" "$pkgdir/usr/share/man/man1/$pkgname.1"
 }
@@ -40,4 +38,4 @@ bashcomp() {
 		"$subpkgdir/usr/share/bash-completion/completions/$pkgname"
 }
 
-sha512sums="6bbd5ab2ac522bf4201cf57cc481d3885dd26b0a57338812b5a7ae10ca4575a2942b84b6bd05934898551eae7263ed28f0f7d8d295d055aa5c80111da1531014  devscripts_2.18.6.tar.xz"
+sha512sums="43d9484dbbff6f48cf8e2cbcf50a5ee752796db881ec6ca2d1b038c938d7d3fe6d45d0f88d5f62a7bf5889366618fa85c8c0089869e6d6a39f6a87e8f1b5c97c  devscripts_2.19.4.tar.xz"
diff --git a/user/cifs-utils/APKBUILD b/user/cifs-utils/APKBUILD
index f5987a037..436e0d909 100644
--- a/user/cifs-utils/APKBUILD
+++ b/user/cifs-utils/APKBUILD
@@ -1,7 +1,7 @@
 # Contributor: Francesco Colista <fcolista@alpinelinux.org>
 # Maintainer: Max Rees <maxcrees@me.com>
 pkgname=cifs-utils
-pkgver=6.8
+pkgver=6.9
 pkgrel=0
 pkgdesc="CIFS filesystem user-space tools"
 url="https://wiki.samba.org/index.php/LinuxCIFS_utils"
@@ -17,7 +17,6 @@ source="https://ftp.samba.org/pub/linux-cifs/$pkgname/$pkgname-$pkgver.tar.bz2
 	xattr_size_max.patch"
 
 build() {
-	cd "$builddir"
 	# --enable-cifsidmap and --enable-cifsacl require libwbclient (samba)
 
 	autoreconf -i
@@ -35,19 +34,15 @@ build() {
 }
 
 check() {
-	cd "$builddir"
-
 	make check
 }
 
 package() {
-	cd "$builddir"
-
 	make DESTDIR="$pkgdir" install
 	# Allow unprivileged mount
 	chmod u+s "$pkgdir"/sbin/mount.cifs
 }
 
-sha512sums="54a094f78c9e07acc997adfe0c8d4c2fb8e15c18adcc1805450e2180f8539aaec8619e781e985b289e097932637e2de3e6815e32f59ec2fc06cfc3762b832e13  cifs-utils-6.8.tar.bz2
+sha512sums="b92e4e39eeed1032bb175659296cde034703fb3ca63aae00419d46a33dadf821fedaf03734128112c164c84bcbb48d92d03cdc275c4a7cba26f984aeca40a40a  cifs-utils-6.9.tar.bz2
 99a2fab05bc2f14a600f89526ae0ed2c183cfa179fe386cb327075f710aee3aed5ae823f7c2f51913d1217c2371990d6d4609fdb8d80288bd3a6139df3c8aebe  musl-fix-includes.patch
 2a9366ec1ddb0389c535d2fa889f63287cb8374535a47232de102c7e50b6874f67a3d5ef3318df23733300fd8459c7ec4b11f3211508aca7800b756119308e98  xattr_size_max.patch"
diff --git a/user/cups-filters/APKBUILD b/user/cups-filters/APKBUILD
index 98205aecb..7ebfd4e0d 100644
--- a/user/cups-filters/APKBUILD
+++ b/user/cups-filters/APKBUILD
@@ -1,6 +1,6 @@
 # Maintainer: Max Rees <maxcrees@me.com>
 pkgname=cups-filters
-pkgver=1.21.6
+pkgver=1.22.5
 pkgrel=0
 pkgdesc="OpenPrinting CUPS filters and backends"
 url="https://wiki.linuxfoundation.org/openprinting/cups-filters"
@@ -15,7 +15,6 @@ subpackages="$pkgname-dev $pkgname-doc $pkgname-libs"
 source="https://www.openprinting.org/download/cups-filters/cups-filters-$pkgver.tar.xz"
 
 build() {
-	cd "$builddir"
 	./configure \
 		--build=$CBUILD \
 		--host=$CHOST \
@@ -37,12 +36,10 @@ build() {
 }
 
 check() {
-	cd "$builddir"
 	make check
 }
 
 package() {
-	cd "$builddir"
 	make -j1 DESTDIR="$pkgdir" install
 	# the pdf.utf-8 symlink isn't quite good enough
 	cd "$pkgdir"/usr/share/cups/charsets && \
@@ -62,4 +59,4 @@ libs() {
 	mv "$pkgdir"/usr/lib/lib*.so.* "$subpkgdir"/usr/lib/
 }
 
-sha512sums="804250745ac710706ff1bfa6e161c0b1a8a65a74850a76a311b7614694a7e5d07f01dfd15f277ad79ed7fe1e84ea680bab1643e0b82cefa3e26603fa2eea935a  cups-filters-1.21.6.tar.xz"
+sha512sums="ed33e6d6f090c00f0f0d1d012d3b394bfaa1f81feeb5b0b7ead1dffa2399f0165ce916a99c3bf28aca7f279bffba5b6575feff700130cabfcd46eb4c904d5c59  cups-filters-1.22.5.tar.xz"
diff --git a/user/ethtool/APKBUILD b/user/ethtool/APKBUILD
index 8d4823e3d..e24ad4d76 100644
--- a/user/ethtool/APKBUILD
+++ b/user/ethtool/APKBUILD
@@ -1,7 +1,7 @@
 # Contributor: Natanael Copa <ncopa@alpinelinux.org>
 # Maintainer: Max Rees <maxcrees@me.com>
 pkgname=ethtool
-pkgver=4.18
+pkgver=5.0
 pkgrel=0
 pkgdesc="Utility for controlling network drivers and hardware"
 url="https://mirrors.edge.kernel.org/pub/software/network/ethtool/"
@@ -12,7 +12,6 @@ subpackages="$pkgname-doc"
 source="https://www.kernel.org/pub/software/network/ethtool/$pkgname-$pkgver.tar.xz"
 
 build() {
-	cd "$builddir"
 	./configure \
 		--build=$CBUILD \
 		--host=$CHOST \
@@ -24,13 +23,11 @@ build() {
 }
 
 check() {
-	cd "$builddir"
 	make check
 }
 
 package() {
-	cd "$builddir"
 	make DESTDIR="$pkgdir" install
 }
 
-sha512sums="e77f9967be4634955640d9dccbc539455d333bcbad61326617dffea32cfd13a72a7dda4087caf6fff41b49c9ce476435cc1310e131705d0ad402685e10b4fb0e  ethtool-4.18.tar.xz"
+sha512sums="9ff6433466585e38dd0dbb99ed06430cd885f26ef4e11f6b95c024ed7511c376f8d86ff53c298cb8e811193500514737ce21eb0cd925bede0373799eb3a990b6  ethtool-5.0.tar.xz"
diff --git a/user/fuse/APKBUILD b/user/fuse/APKBUILD
index 92840ed41..690b69d51 100644
--- a/user/fuse/APKBUILD
+++ b/user/fuse/APKBUILD
@@ -1,8 +1,8 @@
 # Contributor: Natanael Copa <ncopa@alpinelinux.org>
 # Maintainer: Max Rees <maxcrees@me.com>
 pkgname=fuse
-pkgver=2.9.8
-pkgrel=2
+pkgver=2.9.9
+pkgrel=0
 pkgdesc="Linux Filesystem in Userspace (legacy version)"
 url="https://github.com/libfuse/libfuse"
 arch="all"
@@ -20,7 +20,6 @@ source="https://github.com/libfuse/libfuse/releases/download/$pkgname-$pkgver/$p
 #   - CVE-2018-10906
 
 build() {
-	cd "$builddir"
 	UDEV_RULES_PATH='/lib/udev/rules.d' ./configure \
 		--build=$CBUILD \
 		--host=$CHOST \
@@ -36,10 +35,9 @@ build() {
 }
 
 package() {
-	cd "$builddir"
 	make DESTDIR="$pkgdir" install
 	rm -r "$pkgdir"/dev "$pkgdir"/etc/init.d
 }
 
-sha512sums="0a9b14d96c6f98f5c903baf00114bfff72f9aeb97224702bbed370516b2b582401d5b436fcef979918ffd85d69ba4a82c8f722c0b35ebd50f7aa5f4ddfdcf8ad  fuse-2.9.8.tar.gz
+sha512sums="3d82fafd04f2924299bb09d2bb144935fa004a43fb9a6568e2e1cc5a60fded2efa1711029a0d7f12b3e6e4501f7217f2ee3545646d89da8dece083cb390f23e2  fuse-2.9.9.tar.gz
 5672ceb35acabb4bd97b6efc30614f22def62882fe198e2a8598a074d45b6b5337c082a5e09b5e399b6e5212dc1fbde9071c2a5051534c32091444c350b9c657  fix-realpath.patch"
diff --git a/user/fuse3/APKBUILD b/user/fuse3/APKBUILD
index dc049071d..31ef0032c 100644
--- a/user/fuse3/APKBUILD
+++ b/user/fuse3/APKBUILD
@@ -2,7 +2,7 @@
 # Maintainer: Max Rees <maxcrees@me.com>
 pkgname=fuse3
 _pkgname=fuse
-pkgver=3.2.6
+pkgver=3.5.0
 pkgrel=0
 pkgdesc="The reference implementation of the Linux FUSE (Filesystem in Userspace) interface"
 url="https://github.com/libfuse/libfuse"
@@ -25,7 +25,6 @@ builddir="$srcdir/$_pkgname-$pkgver"
 #     - CVE-2018-10906
 
 build() {
-	cd "$builddir"
 	meson \
 		--prefix=/usr \
 		--sysconfdir=/etc \
@@ -42,7 +41,6 @@ check() {
 }
 
 package() {
-	cd "$builddir"
 	DESTDIR="$pkgdir" ninja -C output install
 	rm -r "$pkgdir"/dev "$pkgdir"/etc/init.d
 
@@ -72,6 +70,6 @@ openrc() {
 	install_if="openrc fuse-common=$pkgver-r$pkgrel"
 }
 
-sha512sums="3a1ef77ab4c79a24aad0b259e17f568a30a5faf53ac17eb25d05f30dc7423f0081583f5b3c284ca9196a01885843e97c323a84231272b7e2b55c8e73848a61b8  fuse-3.2.6.tar.xz
+sha512sums="953066a25ab2f67fd5a1f15e97f8d739271c42a6260aa29ccc7b9ffddb9c972d2797d93d9ff0d34c6b51a20f3254ef6f748c14f852603280b318b36899867a27  fuse-3.5.0.tar.xz
 1a9e1d1e8a7b0778ffde328e4322c73b5d57ec98d52767c846d755cce861ab27989823a75b6c5f994432ddb77fa351dfa4a8f948c9467c5f7d5f471e4608358b  fix-realpath.patch
 7f6a503ef23cfa8b809c544375c2d83ad56525269b48ad1a7dff0ce36f4bf2f2a3fafed9dc70a71ff6281b261db5f01829e16c06f041921a5d8c8d715a04a8c1  fuse.initd"
diff --git a/user/i3lock/APKBUILD b/user/i3lock/APKBUILD
index 8080867c7..7d04a82af 100644
--- a/user/i3lock/APKBUILD
+++ b/user/i3lock/APKBUILD
@@ -1,7 +1,7 @@
 # Contributor: Johannes Matheis <jomat+alpinebuild@jmt.gr>
 # Maintainer: Max Rees <maxcrees@me.com>
 pkgname=i3lock
-pkgver=2.11
+pkgver=2.11.1
 pkgrel=0
 pkgdesc="Simple X11 screen locker"
 url="https://i3wm.org/i3lock/"
@@ -15,7 +15,6 @@ subpackages="$pkgname-doc"
 source="$url/$pkgname-$pkgver.tar.bz2"
 
 prepare() {
-	cd "$builddir"
 	default_prepare
 	# At present, this has no functional difference.
 	# But when we start developing our PAM stack into something more
@@ -24,8 +23,6 @@ prepare() {
 }
 
 build() {
-	cd "$builddir"
-
 	./configure \
 		--build=$CBUILD \
 		--host=$CHOST \
@@ -38,8 +35,7 @@ build() {
 }
 
 package() {
-	cd "$builddir"
 	make DESTDIR="$pkgdir" install
 }
 
-sha512sums="c00741a66fdb5477a4b7e993d173f98fe95f0254fa74c50f83ddf8078a477d26a9fab126fbe31b509df2dbd35ed5ec64b95475621b8babf6f6c0f6db38160c8a  i3lock-2.11.tar.bz2"
+sha512sums="8b779aa0a560884adc1a508e1f07f712bdf043f72c377c24d5e7e186a6b97f34a5bda7aa67de41f5e15a1a541f4a2c2d28bc284057926a5833d70b67437d073c  i3lock-2.11.1.tar.bz2"
diff --git a/user/keepassxc/APKBUILD b/user/keepassxc/APKBUILD
index 14d9235fc..67159dc98 100644
--- a/user/keepassxc/APKBUILD
+++ b/user/keepassxc/APKBUILD
@@ -1,22 +1,22 @@
 # Contributor: Max Rees <maxcrees@me.com>
 # Maintainer: Max Rees <maxcrees@me.com>
 pkgname=keepassxc
-pkgver=2.3.4
+pkgver=2.4.1
 pkgrel=0
 pkgdesc="A community revival of the KeePassX password manager"
 url="https://keepassxc.org"
 arch="all"
 license="(GPL-2.0-only OR GPL-3.0-only) AND MIT AND BSD-4-Clause AND ISC AND (LGPL-2.1-only OR GPL-3.0-only) AND (LGPL-2.1-only OR LGPL-3.0-only) AND CC0-1.0 AND Public-Domain AND LGPL-2.1+ AND LGPL-3.0+"
 depends="hicolor-icon-theme"
-makedepends="cmake xz qt5-qtbase-dev qt5-qttools-dev libgcrypt-dev
-	zlib-dev libxi-dev libxtst-dev qt5-qtx11extras-dev argon2-dev"
+makedepends="argon2-dev cmake libgcrypt-dev libqrencode-dev
+	libxi-dev libxtst-dev qt5-qtbase-dev qt5-qtsvg-dev qt5-qttools-dev
+	qt5-qtx11extras-dev xz zlib-dev"
 subpackages="$pkgname-doc"
 source="https://github.com/keepassxreboot/$pkgname/releases/download/$pkgver/$pkgname-$pkgver-src.tar.xz"
 
 prepare() {
-	cd "$builddir"
-	mkdir build
 	default_prepare
+	mkdir build
 }
 
 build() {
@@ -37,4 +37,4 @@ package() {
 	make DESTDIR="$pkgdir" install
 }
 
-sha512sums="edca22ef9d7c553d21d8ea6115a5635265176acc56fdf055f1961a3e65046de49ed5b67eb68ecf4f925226fb5bca140d5d473a5082301168f6a8bb7979f562a8  keepassxc-2.3.4-src.tar.xz"
+sha512sums="4369043700d3de4fece0a1dd0f8aab3f621df379bc9d0214b4c70ab72d081f978104aa09fd39c4b4bf8b8df8f78266835dc206c31e7174bdf872a977c0d79502  keepassxc-2.4.1-src.tar.xz"
diff --git a/user/libzip/APKBUILD b/user/libzip/APKBUILD
index 32f0a956c..9c1836e60 100644
--- a/user/libzip/APKBUILD
+++ b/user/libzip/APKBUILD
@@ -3,8 +3,8 @@
 # Contributor: Carlo Landmeter <clandmeter@gmail.com>
 # Maintainer: Max Rees <maxcrees@me.com>
 pkgname=libzip
-pkgver=1.5.1
-pkgrel=2
+pkgver=1.5.2
+pkgrel=0
 pkgdesc="C library for manipulating ZIP archives"
 url="https://libzip.org/"
 arch="all"
@@ -19,7 +19,6 @@ source="https://libzip.org/download/$pkgname-$pkgver.tar.xz"
 #     - CVE-2017-14107
 
 build() {
-	cd "$builddir"
 	cmake \
 		-DCMAKE_INSTALL_PREFIX=/usr \
 		-DCMAKE_INSTALL_LIBDIR=lib \
@@ -31,12 +30,10 @@ build() {
 }
 
 check() {
-	cd "$builddir"
 	make check
 }
 
 package() {
-	cd "$builddir"
 	make DESTDIR="$pkgdir" -j1 install
 }
 
@@ -46,4 +43,4 @@ tools() {
 	mv "$pkgdir"/usr/bin "$subpkgdir"/usr
 }
 
-sha512sums="92df9490a9910ebb1da49ecaec96f364fce39a779e1bc739f7796b27b3a864301f5e1ba0108947708dda1d90af7a9e751be54cbb8a0de2a04a48f9f3eb728e3d  libzip-1.5.1.tar.xz"
+sha512sums="1e6d48ddbac4d270f70b314f6ada3c93a3196a8cc3b8d17c6cf5ea8409ff29f36ac351206675f9d81351fcf633b0c15d7b0b5530c30c4140e4fe55e64c602643  libzip-1.5.2.tar.xz"
diff --git a/user/mutt/APKBUILD b/user/mutt/APKBUILD
index cb717ec1b..e13de2e06 100644
--- a/user/mutt/APKBUILD
+++ b/user/mutt/APKBUILD
@@ -3,10 +3,10 @@
 # Contributor: Natanael Copa <ncopa@alpinelinux.org>
 # Maintainer: Max Rees <maxcrees@me.com>
 pkgname=mutt
-pkgver=1.10.1
+pkgver=1.11.4
 pkgrel=0
 pkgdesc="Small but very powerful text-mode email client"
-url="http://www.mutt.org"
+url="http://www.mutt.org"  # No HTTPS
 arch="all"
 options="suid !check"  # No test suite.
 license="GPL-2.0+ AND LGPL-2.0+ AND LGPL-2.1+ AND Public-Domain"
@@ -16,7 +16,6 @@ subpackages="$pkgname-doc $pkgname-lang"
 source="https://bitbucket.org/$pkgname/$pkgname/downloads/$pkgname-$pkgver.tar.gz"
 
 build() {
-	cd "$builddir"
 	ISPELL=/usr/bin/hunspell \
 	./configure \
 		--build=$CBUILD \
@@ -42,7 +41,6 @@ build() {
 }
 
 package() {
-	cd "$builddir"
 	make DESTDIR="$pkgdir" install
 
 	rm "$pkgdir"/etc/*.dist \
@@ -58,4 +56,4 @@ package() {
 		"$pkgdir"/etc/Muttrc.gpg.dist
 }
 
-sha512sums="13509ff159c65e23614696967b4bd8baf7b8e16c0e85cfd89e2df8201de2dc97e6c4a426f5919f05051dee2b14f847c7203e0b236931d3cdf81dbbb221551726  mutt-1.10.1.tar.gz"
+sha512sums="18c5bfa5c45ef70b3307afccf28f613a36de035f1b5c493f84f0571f7ba297cd0b25e01be9102a028c51c28c459c4bc62281da88926e16ce58c3c1407609e0eb  mutt-1.11.4.tar.gz"
diff --git a/user/php7/APKBUILD b/user/php7/APKBUILD
index 187646dd3..8da8caab5 100644
--- a/user/php7/APKBUILD
+++ b/user/php7/APKBUILD
@@ -36,7 +36,7 @@
 
 pkgname=php7
 _pkgname=php
-pkgver=7.2.16
+pkgver=7.2.17
 pkgrel=0
 _apiver=20170718
 pkgdesc="The PHP7 language runtime engine"
@@ -82,7 +82,7 @@ makedepends="autoconf
 subpackages="$pkgname-dev $pkgname-doc $pkgname-apache $pkgname-phpdbg
 	$pkgname-embed $pkgname-litespeed $pkgname-cgi $pkgname-fpm
 	$pkgname-pear::noarch $pkgname-dbg"
-source="http://php.net/distributions/$_pkgname-$pkgver.tar.bz2
+source="https://www.php.net/distributions/$_pkgname-$pkgver.tar.bz2
 	$_pkgname-fpm.initd
 	$_pkgname-fpm.logrotate
 	$_pkgname-module.conf
@@ -526,7 +526,7 @@ _mv() {
 	mv $@
 }
 
-sha512sums="f97545905a3ec4bc1ce431e306bffb2d7b6357164ea035a6899ea1589d8df4e6617af3924fa1abcb5da428ad691967504c3f94187d4cae6f2ef285e963d07e3d  php-7.2.16.tar.bz2
+sha512sums="6d14311cb3699eec7a8eacfb82e0a00e8f5dcfb31474dd32071c1c3261ddf52157a43a1ead4762da01283b0f5ccbbae8dfbbad2fb59e0900a1769e9f318e5830  php-7.2.17.tar.bz2
 23df4e779c809db3e3b8e5b0353b1aafaad2f3dc56f2d1cd45f9b0e3ad71b32e40700d6ebfe914b3c87e8e0b670d0dc862ded1e5c898adf160e33dea372e044f  php-fpm.initd
 01d4ba3ef104ea378eb0e8cbb7bdee3fdf65e4bd6865eb3bc6c0dc4af31c2d52887abdf0150b5ef984b877860285a3b1af84b11ffebb5b8b722ea9faf83edfeb  php-fpm.logrotate
 a7f9ba5e11652fd1cb9e756c3269269a95de083ecb5be936a85c7a09c1396db9088e0251c6a643c40235c0e776fce2a471e5c7f5a033b85c7d3b3110c2b39e48  php-module.conf
diff --git a/user/physlock/APKBUILD b/user/physlock/APKBUILD
index a2c4e471f..f9a5f9574 100644
--- a/user/physlock/APKBUILD
+++ b/user/physlock/APKBUILD
@@ -1,7 +1,7 @@
 # Contributor: Max Rees <maxcrees@me.com>
 # Maintainer: Max Rees <maxcrees@me.com>
 pkgname=physlock
-pkgver=11
+pkgver=13
 pkgrel=0
 pkgdesc="Lightweight Linux console-locking tool"
 url="https://github.com/muennich/physlock"
@@ -12,17 +12,17 @@ depends=""
 makedepends="linux-headers linux-pam-dev utmps-dev"
 subpackages="$pkgname-doc"
 source="$pkgname-$pkgver.tar.gz::https://github.com/muennich/physlock/archive/v$pkgver.tar.gz
-	utmps.patch"
+	utmps.patch
+	makefile.patch"
 
 build() {
-	cd "$builddir"
 	make
 }
 
 package() {
-	cd "$builddir"
 	make PREFIX="/usr" DESTDIR="$pkgdir" install
 }
 
-sha512sums="d3badf5c99e4e3e16f4e7ec5c59ee8320c845f1b180463900d816206362ce1aa8652f2489453ad5e190cceee2ed61a90acc52e25bb6b4c4a9dc8c4ebd3054938  physlock-11.tar.gz
-d461b462dedfb7505f506ce1050d5140b8729f50a383157157e4f65465f63174cc11dc0a46cc1eed57cec0293006c5ec6cc6e96af9acab009ab3c9fe5e2381d5  utmps.patch"
+sha512sums="85c291fb7b146fbd81aacbf94d8af07e727dd9b37b458988eaee5f7a51f9923871f9b19fd9438428635963864de67d3f2a72f938d99ffe6dc3015c3a1b99ea1c  physlock-13.tar.gz
+69367872c48985db31f2d84b038089da71e48ca79db0b0089f4a94f0cd853409bf9253fd5ee0b0729c01d9252072be1998141fad675baee97e93af1100ce71e6  utmps.patch
+54119c1059231f15ab5ea5543583e12f7e3f9907e9c71b3ec76b10ee5df64a0303d6caf88be9c768d7b679cfcaf0a374c924a3232f221329bc54d22b31c771ce  makefile.patch"
diff --git a/user/physlock/makefile.patch b/user/physlock/makefile.patch
new file mode 100644
index 000000000..9cae82168
--- /dev/null
+++ b/user/physlock/makefile.patch
@@ -0,0 +1,14 @@
+--- physlock-13/Makefile	2019-01-28 18:46:20.000000000 +0000
++++ physlock-13/Makefile	2019-04-18 07:17:28.779909174 +0000
+@@ -7,9 +7,9 @@
+ MANPREFIX = $(PREFIX)/share/man
+ 
+ # enable user detection using libsystemd
+-HAVE_SYSTEMD = 1
++HAVE_SYSTEMD = 0
+ 
+-cflags = -Wall -pedantic $(CFLAGS)
++cflags = -D_GNU_SOURCE -Wall -pedantic $(CFLAGS)
+ cppflags = -I. $(CPPFLAGS) -D_XOPEN_SOURCE=500
+ 
+ lib_systemd_0 =
diff --git a/user/physlock/utmps.patch b/user/physlock/utmps.patch
index efae166a9..f3ba5e575 100644
--- a/user/physlock/utmps.patch
+++ b/user/physlock/utmps.patch
@@ -1,31 +1,23 @@
---- physlock-11/auth.c	2017-07-13 07:23:52.000000000 +0000
-+++ physlock-11/auth.c	2018-09-21 21:21:36.240024566 +0000
-@@ -16,13 +16,14 @@
-  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
-  */
- 
-+#define _GNU_SOURCE
- #include <paths.h>
- #include <stdio.h>
- #include <stdlib.h>
- #include <string.h>
+--- physlock-13/session.c	2019-01-28 18:46:20.000000000 +0000
++++ physlock-13/session.c	2019-04-18 07:11:54.749911535 +0000
+@@ -6,7 +7,7 @@
  #include <pwd.h>
  #include <unistd.h>
+ #include <errno.h>
 -#include <utmp.h>
 +#include <utmpx.h>
- #include <errno.h>
- #include <security/pam_misc.h>
- 
-@@ -41,12 +42,12 @@ static void get_pam(userinfo_t *uinfo) {
  
- void get_user(userinfo_t *uinfo, int vt, uid_t owner) {
+ #if HAVE_SYSTEMD
+ #include <systemd/sd-login.h>
+@@ -50,11 +51,11 @@
+ int get_user_utmp(userinfo_t *uinfo, int vt) {
+ 	int ret = -1;
  	FILE *uf;
 -	struct utmp r;
 +	struct utmpx r;
- 	struct passwd *pw;
- 	char tty[16], name[UT_NAMESIZE+1];
+ 	char tty[UT_LINESIZE+1], name[UT_NAMESIZE+1];
  
- 	uinfo->name = NULL;
+ 	name[0] = '\0';
 -	while ((uf = fopen(_PATH_UTMP, "r")) == NULL && errno == EINTR);
 +	while ((uf = fopen(UTMPX_FILE, "r")) == NULL && errno == EINTR);
  
diff --git a/user/sshfs/APKBUILD b/user/sshfs/APKBUILD
index 32fcfbd7c..0bf08fdb1 100644
--- a/user/sshfs/APKBUILD
+++ b/user/sshfs/APKBUILD
@@ -1,7 +1,7 @@
 # Contributor: Natanael Copa <ncopa@alpinelinux.org>
 # Maintainer: Max Rees <maxcrees@me.com>
 pkgname=sshfs
-pkgver=3.5.0
+pkgver=3.5.2
 pkgrel=0
 pkgdesc="FUSE client based on the SSH File Transfer Protocol"
 url="https://github.com/libfuse/sshfs"
@@ -15,7 +15,6 @@ subpackages="$pkgname-doc"
 source="https://github.com/libfuse/$pkgname/releases/download/$pkgname-$pkgver/$pkgname-$pkgver.tar.xz"
 
 build() {
-	cd "$builddir"
 	# NOTE: --prefix=/ is intentional. If --prefix=/usr, mount(8) will not be
 	# able to find mount.fuse.sshfs or mount.sshfs - it only looks in /sbin, not
 	# /usr/sbin. The omission of the absolute slash in --mandir=usr/share/man is
@@ -38,8 +37,7 @@ check() {
 }
 
 package() {
-	cd "$builddir"
 	DESTDIR="$pkgdir" ninja -C output install
 }
 
-sha512sums="6ba7be4bcad401d99fb864f105a6c8fc8b7c832d5b25f18cba27eee422fe65ee7bda8982466d624792a1fb21528c0cb078a59db48e93da4880a36aad7b506b0c  sshfs-3.5.0.tar.xz"
+sha512sums="52f874196eef2327dfb11c7f6a9771c1837a89a9208e6503dd7bb839e63d65b3f42d61c2d9140c8100041794923c1bea1f6917ff04b3c1d0236071ff4811c272  sshfs-3.5.2.tar.xz"
diff --git a/user/talloc/APKBUILD b/user/talloc/APKBUILD
index 82ba9d682..bf6cb12c8 100644
--- a/user/talloc/APKBUILD
+++ b/user/talloc/APKBUILD
@@ -1,7 +1,7 @@
 # Contributor: William Pitcock <nenolod@dereferenced.org>
 # Maintainer: Max Rees <maxcrees@me.com>
 pkgname=talloc
-pkgver=2.1.15
+pkgver=2.2.0
 pkgrel=0
 pkgdesc="Memory pool management library"
 url="https://talloc.samba.org"
@@ -9,13 +9,11 @@ arch="all"
 license="LGPL-3.0+ AND GPL-3.0+ AND ISC AND LGPL-2.1+ AND BSD-3-Clause AND PostgreSQL"
 replaces="samba-common"
 depends=""
-makedepends="docbook-xsl libxslt python3-dev"
+makedepends="cmd:which docbook-xsl libxslt python3-dev"
 subpackages="$pkgname-dev py3-$pkgname:py3 $pkgname-doc"
-source="https://samba.org/ftp/$pkgname/$pkgname-$pkgver.tar.gz
-	waf-location.patch"
+source="https://samba.org/ftp/$pkgname/$pkgname-$pkgver.tar.gz"
 
 build() {
-	cd "$builddir"
 	PYTHON=python3 ./configure \
 		--build=$CBUILD \
 		--host=$CHOST \
@@ -32,12 +30,10 @@ build() {
 }
 
 check() {
-	cd "$builddir"
 	make check
 }
 
 package() {
-	cd "$builddir"
 	make DESTDIR="$pkgdir" install
 }
 
@@ -49,5 +45,4 @@ py3() {
 		"$pkgdir"/usr/lib/python3* "$subpkgdir"/usr/lib/
 }
 
-sha512sums="41896f8877e9a52e70b9881c41667dc52d7c1b03c3b248020fd909b794a4c5a4addee3eb944aa80ecfa3b03e6e5e1f67a62b5f3a5dcdc412b3e975352057ff40  talloc-2.1.15.tar.gz
-d19553fae679b5db10ab77a86f9fa0525ccba37a3ef30e530cd96245ee5fc94d4570079bbfe0271c32fbc84a3556c4bf86cc1cab6ffb61863cbce3f5a911efec  waf-location.patch"
+sha512sums="e762c6443ff2c0c35a9dbf7ac6e64a9182c04a218ad0f26fd67ac9620d9ae26d68b8dd2b21ff37e1df0e53748c84bece27890c5c4939eaeb61c502a698802388  talloc-2.2.0.tar.gz"
diff --git a/user/talloc/waf-location.patch b/user/talloc/waf-location.patch
deleted file mode 100644
index a5ca47f44..000000000
--- a/user/talloc/waf-location.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- talloc-2.1.15/Makefile	2019-01-14 17:24:45.000000000 -0500
-+++ talloc-2.1.15/Makefile	2019-01-27 22:57:15.919981283 -0500
-@@ -1,6 +1,6 @@
- # simple makefile wrapper to run waf
- 
--WAF_BINARY=$(PYTHON) ../../buildtools/bin/waf
-+WAF_BINARY=$(PYTHON) buildtools/bin/waf
- WAF=PYTHONHASHSEED=1 WAF_MAKE=1 $(WAF_BINARY)
- 
- all:
diff --git a/user/terminus-font/75-yes-terminus.conf b/user/terminus-font/75-yes-terminus.conf
new file mode 100644
index 000000000..84b0a95a0
--- /dev/null
+++ b/user/terminus-font/75-yes-terminus.conf
@@ -0,0 +1,17 @@
+<?xml version="1.0"?>
+<!DOCTYPE fontconfig SYSTEM "fonts.dtd">
+<fontconfig>
+<!-- Accept terminus font -->
+ <selectfont>
+  <acceptfont>
+   <pattern>
+     <patelt name="family"><string>Terminus</string></patelt>
+   </pattern>
+  </acceptfont>
+ </selectfont>
+ <alias>
+  <family>xos4 Terminus</family>
+  <prefer><family>Terminus</family></prefer>
+  <default><family>fixed</family></default>
+ </alias>
+</fontconfig>
diff --git a/user/terminus-font/APKBUILD b/user/terminus-font/APKBUILD
index 10ebdd481..c3fc0fd6f 100644
--- a/user/terminus-font/APKBUILD
+++ b/user/terminus-font/APKBUILD
@@ -1,8 +1,8 @@
 # Contributor: Max Rees <maxcrees@me.com>
 # Maintainer: Max Rees <maxcrees@me.com>
 pkgname=terminus-font
-pkgver=4.46
-pkgrel=1
+pkgver=4.47
+pkgrel=0
 pkgdesc="Monospace bitmap font (for X11 and console)"
 url="http://terminus-font.sourceforge.net/"  # No HTTPS
 arch="noarch"
@@ -10,10 +10,10 @@ options="!check"  # Fonts have no test suite
 license="OFL-1.1"
 depends=""
 makedepends="bdftopcf python3"
-source="https://downloads.sourceforge.net/project/$pkgname/$pkgname-$pkgver/$pkgname-$pkgver.tar.gz"
+source="https://downloads.sourceforge.net/project/$pkgname/$pkgname-$pkgver/$pkgname-$pkgver.tar.gz
+	75-yes-terminus.conf"
 
 build() {
-	cd "$builddir"
 	./configure \
 		--prefix=/usr \
 		--psfdir=/usr/share/consolefonts \
@@ -22,14 +22,16 @@ build() {
 }
 
 package() {
-	cd "$builddir"
 	make DESTDIR="$pkgdir" install
 
-	install -Dm644 75-yes-terminus.conf \
+	# Use custom fontconfig since the shipped one doesn't provide
+	# a correct alias
+	install -Dm644 "$srcdir"/75-yes-terminus.conf \
 		"$pkgdir/etc/fonts/conf.avail/75-yes-terminus.conf"
 	install -d "$pkgdir/etc/fonts/conf.d"
 	cd "$pkgdir/etc/fonts/conf.d"
 	ln -s /etc/fonts/conf.avail/75-yes-terminus.conf .
 }
 
-sha512sums="ae221920ecff54b9575a25d30a429feee6e19ef1e9669896c34f86f80d5495c3654f5423ff1df76e86bc999d1f37c306048b44d8ca55144f0f299926d3d33b58  terminus-font-4.46.tar.gz"
+sha512sums="09455d107a09c422f4fedfcc70ae1483063c844fb01b0adfa3d2a0e28c9502e9ca922542b5ad735cbebb491d148c453d0213d61ebebf64c79f16cb582964fa47  terminus-font-4.47.tar.gz
+ac7bdf367bbff1e5735b5bd65fc1bc06b55bcb72aaafeb08c7d8e969aabad863474b1104faa42ead7d838433c80cfc50f05578dad03c8081cd82cfda0af86a83  75-yes-terminus.conf"
diff --git a/user/tlp/APKBUILD b/user/tlp/APKBUILD
index 54f478361..d1bdefb23 100644
--- a/user/tlp/APKBUILD
+++ b/user/tlp/APKBUILD
@@ -2,7 +2,7 @@
 # Maintainer: Max Rees <maxcrees@me.com>
 pkgname=tlp
 _pkgname=TLP
-pkgver=1.1
+pkgver=1.2.1
 pkgrel=0
 pkgdesc="Linux Advanced Power Management"
 url="https://linrunner.de/en/tlp/tlp.html"
@@ -18,14 +18,11 @@ source="$pkgname-$pkgver.tar.gz::https://github.com/linrunner/$_pkgname/archive/
 builddir="$srcdir/$_pkgname-$pkgver"
 
 build() {
-	cd "$builddir"
 	make
 }
 
 package() {
-	cd "$builddir"
-
-	make DESTDIR="$pkgdir" install-tlp install-man
+	make DESTDIR="$pkgdir" TLP_WITH_SYSTEMD=0 install-tlp install-man
 	install -Dm755 "$srcdir"/tlp.initd "$pkgdir"/etc/init.d/"$pkgname"
 	# We don't ship systemd
 	find "$pkgdir"/usr/share/man/man8 -name '*.service*' -delete
@@ -36,7 +33,7 @@ rdw() {
 	depends="tlp"
 
 	cd "$builddir"
-	make DESTDIR="$subpkgdir" install-rdw
+	make DESTDIR="$subpkgdir" TLP_WITH_SYSTEMD=0 install-rdw
 }
 
 bashcomp() {
@@ -44,9 +41,12 @@ bashcomp() {
 	depends=""
 	install_if="$pkgname=$pkgver-r$pkgrel bash-completion"
 
-	mkdir -p "$subpkgdir"/usr/share
-	mv "$pkgdir"/usr/share/bash-completion "$subpkgdir"/usr/share
+	mkdir -p "$subpkgdir"/usr/share/bash-completion/completions
+	mv "$pkgdir"/usr/share/bash-completion/completions/* \
+		"$subpkgdir"/usr/share/bash-completion/completions
+	mv "$pkgbasedir/$pkgname-rdw"/usr/share/bash-completion/completions/* \
+		"$subpkgdir"/usr/share/bash-completion/completions
 }
 
-sha512sums="3400f2b6c249fd2e1bbbc61f23e3450ff90fabb8dd74f2903ce1f0d07e7ce3d1e61b07295736138d4697235dbee9157d3f32a8d296a649c93f73e03e3555af1e  tlp-1.1.tar.gz
+sha512sums="c5cf2c9cb4d5e1e0ad693ab73f7971486671dab9b785a4e121b3550f5b096a8b028bd9d116851db6402ab7ccd9b3fe944d138fd35dc17d826482c59257f12c9f  tlp-1.2.1.tar.gz
 e6de216b2540413812711b3304cdc29c8729d527080cfd747ba382db50166dd21c6c27ff467f9f2a967e92007c7a311b00e88262952c34a22f417578c66cf4e7  tlp.initd"
diff --git a/user/xhost/APKBUILD b/user/xhost/APKBUILD
index f263a2a79..39be52023 100644
--- a/user/xhost/APKBUILD
+++ b/user/xhost/APKBUILD
@@ -1,8 +1,8 @@
 # Contributor: Natanael Copa <ncopa@alpinelinux.org>
 # Maintainer: Max Rees <maxcrees@me.com>
 pkgname=xhost
-pkgver=1.0.7
-pkgrel=1
+pkgver=1.0.8
+pkgrel=0
 pkgdesc="Controls host and/or user access to a running X server"
 url="https://www.X.Org/"
 arch="all"
@@ -14,7 +14,6 @@ makedepends="libx11-dev libxmu-dev libxau-dev util-macros"
 source="https://www.X.Org/releases/individual/app/$pkgname-$pkgver.tar.bz2"
 
 build() {
-	cd "$builddir"
 	./configure \
 		--build=$CBUILD \
 		--host=$CHOST \
@@ -24,8 +23,7 @@ build() {
 }
 
 package() {
-	cd "$builddir"
 	make DESTDIR="$pkgdir" install
 }
 
-sha512sums="670a8c97291565f6c36c94e135f7bd60a572bb42b4fca9d2460823db0d0576187c64f9b876ed60d348029d3f74a732862eea4ce889a6b6b9c97665746a38b1d7  xhost-1.0.7.tar.bz2"
+sha512sums="55581f9bc45a70a73b13fe718ca83c4cb0a6116d26addc0f07659ebeb5bf7d2379e84cab5a1702ae77a298a66f42ae03f41ddc7d5acd61c6f18448e58ad7cb6b  xhost-1.0.8.tar.bz2"
diff --git a/user/xmlsec/APKBUILD b/user/xmlsec/APKBUILD
index fb55ea436..171427b55 100644
--- a/user/xmlsec/APKBUILD
+++ b/user/xmlsec/APKBUILD
@@ -1,6 +1,7 @@
 # Maintainer: Max Rees <maxcrees@me.com>
 pkgname=xmlsec
-pkgver=1.2.27
+pkgver=1.2.28
+_pkgver=1_2_28
 pkgrel=0
 pkgdesc="C-based XML signature and encryption syntax and processing library"
 url="https://github.com/lsh123/$pkgname/"
@@ -12,17 +13,15 @@ checkdepends="nss-tools"
 makedepends="$depends_dev libxml2-dev libxslt-dev nss-dev openssl-dev
 	autoconf automake libtool"
 subpackages="$pkgname-nss $pkgname-dev $pkgname-doc"
-source="$url/archive/$pkgname-${pkgver//./_}.tar.gz"
-builddir="$srcdir/$pkgname-$pkgname-${pkgver//./_}"
+source="$url/archive/$pkgname-$_pkgver.tar.gz"
+builddir="$srcdir/$pkgname-$pkgname-$_pkgver"
 
 prepare() {
-	cd "$builddir"
 	default_prepare
 	./autogen.sh
 }
 
 build() {
-	cd "$builddir"
 	./configure \
 		--build=$CBUILD \
 		--host=$CHOST \
@@ -37,12 +36,10 @@ build() {
 }
 
 check() {
-	cd "$builddir"
 	make -k check
 }
 
 package() {
-	cd "$builddir"
 	make DESTDIR="$pkgdir" install
 
 	install -m755 -d "$pkgdir/usr/share/licenses/$pkgname"
@@ -56,4 +53,4 @@ nss() {
 	mv "$pkgdir"/usr/lib/libxmlsec1-nss.so* "$subpkgdir"/usr/lib/
 }
 
-sha512sums="261528086adc379942861b5950e5b34ffa52a49d0fedcb46bece50c920fd56af4f0472494419bfa5e3cb40abda335b3e9c11466c42273f125b50d204b4604798  xmlsec-1_2_27.tar.gz"
+sha512sums="fb0c775f6455ce5a5579a69bb91d60fe90c023e538c32bdf2a70aa413a53b22ef938349a3ce6b42bb23f8f70b4e00f1b9917f877487bb1507c927ec70c3d95f5  xmlsec-1_2_28.tar.gz"
diff --git a/user/youtube-dl/APKBUILD b/user/youtube-dl/APKBUILD
index af5d02712..d7a2f6888 100644
--- a/user/youtube-dl/APKBUILD
+++ b/user/youtube-dl/APKBUILD
@@ -3,7 +3,7 @@
 # Contributor: Timo Teräs <timo.teras@iki.fi>
 # Maintainer: Max Rees <maxcrees@me.com>
 pkgname=youtube-dl
-pkgver=2018.11.23
+pkgver=2019.04.17
 pkgrel=0
 pkgdesc="Command-line program to download videos from YouTube and many other sites"
 url="https://youtube-dl.org"
@@ -27,12 +27,10 @@ prepare() {
 }
 
 check() {
-	cd "$builddir"
 	python3 -m unittest discover
 }
 
 package() {
-	cd "$builddir"
 	python3 setup.py install --root="$pkgdir/" --optimize=1
 }
 
@@ -65,4 +63,4 @@ fishcomp() {
 		"$subpkgdir/usr/share/fish/completions/"
 }
 
-sha512sums="d4d2813657972c37d3493743a44055d7a776aeb5c5a97902e07caa317a3b2db30332507c37b56b3d8554e0bdc2a0ec6a9862977b449b363343a4de2df12bf059  youtube-dl-2018.11.23.tar.gz"
+sha512sums="6277a96a6487d81be23e0772c8e6fa36337d5b2b90a50b9be328579334b92c6e1a6eb9634a66969435c0d47e734fb907e286578cbc2f693565055ed1111b8148  youtube-dl-2019.04.17.tar.gz"