testing/autofs: upgrade to 5.1.5

testing/autofs/APKBUILD

@@ -1,53 +1,55 @@
 # Contributor: Alex Laskin <alex@lask.in>
 # Maintainer: Alex Laskin <alex@lask.in>
 pkgname=autofs
-pkgver=5.1.4
-pkgrel=1
+pkgver=5.1.5
+pkgrel=0
 pkgdesc="A kernel-based automounter for Linux"
 url="https://www.kernel.org/pub/linux/daemons/autofs/"
 arch="all"
 license="GPL-2.0-or-later"
-depends=""
 makedepends="linux-headers automake flex bison rpcgen libtirpc-dev libnfs-dev coreutils"
 subpackages="$pkgname-doc $pkgname-openrc"
 options="!check" # no test suite provided
 source="
-  https://www.kernel.org/pub/linux/daemons/${pkgname}/v5/${pkgname}-${pkgver}.tar.xz
-  autofs.initd
-  autofs.confd
-  10-glibc.patch
-  "
+	https://www.kernel.org/pub/linux/daemons/$pkgname/v5/$pkgname-$pkgver.tar.xz
+	autofs.initd
+	autofs.confd
+	10-glibc.patch
+	"
 
-build() {
-  cd "$builddir"
-  ./configure \
-    --prefix=/usr \
-    --sysconfdir=/etc/autofs \
-    --with-mapdir=/etc/autofs \
-    --with-confdir=/etc/conf.d \
-    --without-hesiod \
-    --with-libtirpc \
-    --enable-ignore-busy
-  make
+prepare() {
+	default_prepare
+	sed -i 's,nfs/nfs.h,linux/nfs.h,g' */*.[ch]
+	sed -i 's,__S_IEXEC,S_IXUSR,g' */*.[ch]
 }
 
-check() {
-  cd "$builddir"
-  daemon/automount -V
+build() {
+	./configure \
+		--prefix=/usr \
+		--sysconfdir=/etc/autofs \
+		--with-mapdir=/etc/autofs \
+		--with-confdir=/etc/conf.d \
+		--without-hesiod \
+		--with-libtirpc \
+		--enable-ignore-busy
+	make
 }
 
 package() {
-  cd "$builddir"
-  make DESTDIR="$pkgdir" install
+	make DESTDIR="$pkgdir" install
 
-  install -m755 -D "$srcdir"/$pkgname.initd \
-    "$pkgdir"/etc/init.d/$pkgname
+	install -m755 -D "$srcdir"/$pkgname.initd \
+		"$pkgdir"/etc/init.d/$pkgname
 
-  install -m644 -D "$srcdir"/$pkgname.confd \
-    "$pkgdir"/etc/conf.d/$pkgname
+	install -m644 -D "$srcdir"/$pkgname.confd \
+		"$pkgdir"/etc/conf.d/$pkgname
+
+	rm -f "$pkgdir"/usr/share/man/man5/autofs.5
+	rm -rf "$pkgdir"/etc/default
+	rm -f "$pkgdir"/autofs
 }
 
-sha512sums="1ef48800a1e44d6bf7048923109f3b8299ef266ff0fbaf5f979c32f42c6c5e28620c1876f64b9d913fddb69244ff83226c01c666401ff6271dd6b53d31860589  autofs-5.1.4.tar.xz
-ea4fe994509051d7c7d2ffe820a6767164163acbdd07e38649918e4d4792afc5eaad6b0e1cc5cba790fd45519ad7b321e651351ae5718ee665e98275b695310e  autofs.initd
+sha512sums="c8138929a9e2cfa7e0096c1d490b9d7275d1d43a50f5f87ad457bdd9a49c7dd13a4aa5d86ab1e028d66dae630e1a1342661844e5775625fe585867f0f4778898  autofs-5.1.5.tar.xz
+e7ffe40cf5f302f7de7cc59752699adad4be89fa78fa1a79c32ce4059ec2f563c0f107ca2cec850cabfb1cdebca5ff1f369167479423ab6cfe509225a799a00e  autofs.initd
 74884b94d8c5dc72579c9c0c9f13c8918ee0babe6fc1e6352bb79cfaf6f5ce3daa87a9b2ea2f34a4600c93a971b329aa0892785fe2efd42829fb7953a6130dd7  autofs.confd
 c4edd75443543aa06b7741c2ee4907718d21e791ea70abc7b2b7b8413a7a82a663a3b7ef7bad1661a5d31aab86cc934cba2b4bd0803e502f7db4e73d374adf64  10-glibc.patch"

testing/autofs/autofs.initd

@@ -1,12 +1,12 @@
 #!/sbin/openrc-run
+supervisor=supervise-daemon
 
-name=${RC_SVCNAME}
+name="${RC_SVCNAME}"
+description="Kernel-based automounter"
 
-pidfile="/run/${RC_SVCNAME}.pid"
-
-command="/usr/sbin/automount"
-command_args="$automount_opts --pid-file $pidfile"
-command_background="yes"
+command=/usr/sbin/automount
+command_args="$automount_opts"
+command_args_foreground="-f"
 
 depend() {
   need net