main/*: remove invalid options and modernize

23 files changed, 36 insertions, 119 deletions

diff --git a/main/augeas/APKBUILD b/main/augeas/APKBUILD
index f24d2e3a42..85803b7803 100644
--- a/main/augeas/APKBUILD
+++ b/main/augeas/APKBUILD
@@ -13,7 +13,6 @@ source="http://download.augeas.net/augeas-$pkgver.tar.gz
 	acf.aug
 	awall.aug
 	"
-options="!checkroot"
 
 prepare() {
 	default_prepare
diff --git a/main/bash/APKBUILD b/main/bash/APKBUILD
index d78d4b41ef..8463452148 100644
--- a/main/bash/APKBUILD
+++ b/main/bash/APKBUILD
@@ -15,7 +15,6 @@ makedepends_build="bison flex"
 makedepends_host="readline-dev>8 ncurses-dev"
 install="$pkgname.post-install $pkgname.post-upgrade $pkgname.pre-deinstall"
 subpackages="$pkgname-dbg $pkgname-dev $pkgname-doc"
-options="!checkroot"
 source="https://ftp.gnu.org/gnu/bash/bash-$_myver.tar.gz
 	bash-noinfo.patch
 	fix-jobs.patch
diff --git a/main/boost/APKBUILD b/main/boost/APKBUILD
index 9c26f5ed3d..2f323f8e64 100644
--- a/main/boost/APKBUILD
+++ b/main/boost/APKBUILD
@@ -16,7 +16,6 @@ source="https://dl.bintray.com/boostorg/release/$pkgver/source/boost_$_pkgver.ta
 	boost-1.57.0-python-libpython_dep.patch
 	0001-revert-cease-dependence-on-range.patch
 	"
-options="!checkroot"
 builddir="$srcdir/${pkgname}_$_pkgver"
 
 _enginedir="tools/build/src/engine"
diff --git a/main/byacc/APKBUILD b/main/byacc/APKBUILD
index e8f7cdb16d..1370e8a81a 100644
--- a/main/byacc/APKBUILD
+++ b/main/byacc/APKBUILD
@@ -5,14 +5,12 @@ pkgrel=0
 pkgdesc="The Berkeley Yacc general-purpose parser generator"
 url="https://invisible-island.net/byacc/byacc.html"
 arch="all"
-options="!checkroot"
 license="Public-Domain"
 depends="!bison"
 subpackages="$pkgname-doc"
 source="https://invisible-mirror.net/archives/byacc/byacc-$pkgver.tgz"
 
 build() {
-	cd "$builddir"
 	./configure \
 		--build=$CBUILD \
 		--host=$CHOST \
@@ -24,12 +22,10 @@ build() {
 }
 
 check() {
-	cd "$builddir"
 	make check
 }
 
 package() {
-	cd "$builddir"
 	make DESTDIR="$pkgdir" install
 }
 
diff --git a/main/c-ares/APKBUILD b/main/c-ares/APKBUILD
index 74a2284cf4..6b1b2073d5 100644
--- a/main/c-ares/APKBUILD
+++ b/main/c-ares/APKBUILD
@@ -6,15 +6,12 @@ pkgrel=1
 pkgdesc="An asynchronously DNS/names resolver library"
 url="https://c-ares.haxx.se/"
 arch="all"
-options="!check !checkroot"
+options="!check"
 license="MIT"
-depends=""
-makedepends=""
 subpackages="$pkgname-doc $pkgname-static $pkgname-dev"
-source="https://c-ares.haxx.se/download/$pkgname-$pkgver.tar.gz"
+source="https://c-ares.haxx.se/download/c-ares-$pkgver.tar.gz"
 
 build() {
-	cd "$builddir"
 	./configure \
 		--build=$CBUILD \
 		--host=$CHOST \
@@ -26,8 +23,6 @@ build() {
 }
 
 check() {
-	cd "$builddir"
-
 	# This is only needed for < 1.14.0, where the .sh file was not
 	# distributed properly - see https://da.gd/carestest
 	echo "#!/bin/true" > test/fuzzcheck.sh
@@ -38,7 +33,6 @@ check() {
 
 
 package() {
-	cd "$builddir"
 	make -j1 DESTDIR="$pkgdir" install
 }
 
diff --git a/main/cmake/APKBUILD b/main/cmake/APKBUILD
index 92fa0e9c77..f9b47cad92 100644
--- a/main/cmake/APKBUILD
+++ b/main/cmake/APKBUILD
@@ -9,7 +9,7 @@ arch="all"
 license="BSD-3-Clause"
 makedepends="bzip2-dev curl-dev expat-dev libarchive-dev linux-headers
 	libuv-dev ncurses-dev rhash-dev xz-dev zlib-dev"
-options="!checkroot !check"
+options="!check"
 checkdepends="file musl-utils"
 subpackages="$pkgname-doc $pkgname-bash-completion:bashcomp:noarch
 	"
diff --git a/main/cryptsetup/APKBUILD b/main/cryptsetup/APKBUILD
index 82a183ddda..e78d5dfd7a 100644
--- a/main/cryptsetup/APKBUILD
+++ b/main/cryptsetup/APKBUILD
@@ -6,7 +6,6 @@ pkgrel=0
 pkgdesc="Userspace setup tool for transparent encryption of block devices using the Linux 2.6 cryptoapi"
 url="https://gitlab.com/cryptsetup/cryptsetup"
 arch="all"
-options="!checkroot"
 license="GPL-2.0-or-later"
 makedepends_host="lvm2-dev openssl-dev popt-dev util-linux-dev
 	json-c-dev argon2-dev"
diff --git a/main/duply/APKBUILD b/main/duply/APKBUILD
index ba3303a996..7a27f88ed5 100644
--- a/main/duply/APKBUILD
+++ b/main/duply/APKBUILD
@@ -3,25 +3,20 @@
 # Maintainer: Francesco Colista <fcolista@alpinelinux.org>
 pkgname=duply
 pkgver=2.2.2
-pkgrel=0
+pkgrel=1
 pkgdesc="Wrapper for duplicity"
 url="https://duply.net"
 arch="noarch"
-license="GPL-2.0"
+license="GPL-2.0-or-later"
 depends="duplicity bash"
 # no test provided upstream
-options="!nocheck"
-makedepends="$depends_dev txt2man"
+options="!check"
+makedepends="txt2man"
 subpackages="$pkgname-doc"
-source="https://netix.dl.sourceforge.net/project/ftplicity/duply%20(simple%20duplicity)/2.2.x/duply_${pkgver}.tgz"
-builddir="$srcdir"/duply_${pkgver}
-
-build() {
-	cd "$builddir"
-}
+source="https://netix.dl.sourceforge.net/project/ftplicity/duply%20(simple%20duplicity)/2.2.x/duply_$pkgver.tgz"
+builddir="$srcdir"/duply_$pkgver
 
 package() {
-	cd "$builddir"
 	install -Dm755 duply \
 		"$pkgdir"/usr/bin/duply
 	mkdir -p "$pkgdir"/usr/share/man/man1
diff --git a/main/etckeeper/APKBUILD b/main/etckeeper/APKBUILD
index 2e92269856..7e58d192d2 100644
--- a/main/etckeeper/APKBUILD
+++ b/main/etckeeper/APKBUILD
@@ -1,6 +1,5 @@
 # Contributor: Henrik Riomar <henrik.riomar@gmail.com>
 # Maintainer: Henrik Riomar <henrik.riomar@gmail.com>
-
 pkgname=etckeeper
 pkgver=1.18.14
 pkgrel=0
@@ -15,7 +14,6 @@ subpackages="
 	$pkgname-bash-completion:bashcomp:noarch
 	$pkgname-zsh-completion:zshcomp:noarch
 	"
-options="!checkroot"
 install="$pkgname.post-install $pkgname.pre-deinstall"
 source="$pkgname-$pkgver.tar.gz::https://git.joeyh.name/index.cgi/etckeeper.git/snapshot/etckeeper-$pkgver.tar.gz
 	apk-commit_hook
diff --git a/main/eudev/APKBUILD b/main/eudev/APKBUILD
index d48ebc4ab8..975f01eaa9 100644
--- a/main/eudev/APKBUILD
+++ b/main/eudev/APKBUILD
@@ -2,12 +2,11 @@
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=eudev
 pkgver=3.2.9
-pkgrel=1
+pkgrel=2
 pkgdesc="OpenRC compatible fork of systemd-udev"
 url="https://wiki.gentoo.org/wiki/Project:Eudev"
 arch="all"
-options="!checkroot"
-license="GPL-2.0"
+license="GPL-2.0-only"
 depends="udev-init-scripts"
 replaces="udev"
 provides="udev=176"
diff --git a/main/fakeroot/APKBUILD b/main/fakeroot/APKBUILD
index 392050f765..7f09542073 100644
--- a/main/fakeroot/APKBUILD
+++ b/main/fakeroot/APKBUILD
@@ -6,8 +6,6 @@ pkgdesc="Gives a fake root environment, useful for building packages as a non-pr
 arch="all"
 license="GPL-3.0-or-later"
 url="https://packages.debian.org/fakeroot"
-depends=
-options="!checkroot"
 checkdepends="bash"
 makedepends_build="libtool autoconf automake po4a"
 makedepends_host="libcap-dev acl-dev linux-headers"
@@ -21,16 +19,12 @@ source="http://ftp.debian.org/debian/pool/main/f/fakeroot/fakeroot_$pkgver.orig.
 	xstatjunk.patch
 	fix-shell-in-fakeroot.patch
 	"
-builddir="$srcdir"/$pkgname-$pkgver
 
 check() {
-	cd "$builddir"
 	make check
 }
 
 build() {
-	cd "$builddir"
-
 	if [ "$CLIBC" = "musl" ]; then
 		# musl does not have _STAT_VER, it's really not used for
 		# anything, so define it as zero (just like uclibc does)
@@ -50,7 +44,6 @@ build() {
 }
 
 package() {
-	cd "$builddir"
 	make DESTDIR="$pkgdir" install
 }
 
diff --git a/main/findutils/APKBUILD b/main/findutils/APKBUILD
index f6a477c201..e0d293e28e 100644
--- a/main/findutils/APKBUILD
+++ b/main/findutils/APKBUILD
@@ -10,13 +10,10 @@ arch="all"
 license="GPL-3.0-or-later"
 checkdepends="coreutils diffutils dejagnu"
 subpackages="$pkgname-doc"
-source="https://ftp.gnu.org/pub/gnu/$pkgname/$pkgname-$pkgver.tar.xz
+source="https://ftp.gnu.org/pub/gnu/findutils/findutils-$pkgver.tar.xz
 	test-parse-datetime.patch"
-options="!checkroot"
 
 build() {
-	cd "$builddir"
-
 	./configure \
 		--build=$CBUILD \
 		--host=$CHOST \
@@ -29,12 +26,10 @@ build() {
 }
 
 check() {
-	cd "$builddir"
 	make check
 }
 
 package() {
-	cd "$builddir"
 	make DESTDIR="$pkgdir" install
 	rm -rf "$pkgdir"/usr/lib
 }
diff --git a/main/flac/APKBUILD b/main/flac/APKBUILD
index df6145f56d..d358fe2167 100644
--- a/main/flac/APKBUILD
+++ b/main/flac/APKBUILD
@@ -6,7 +6,7 @@ pkgdesc="Free Lossless Audio Codec"
 url="https://xiph.org/flac/"
 arch="all"
 license="custom:Xiph LGPL GPL FDL"
-options="!checkroot !check" # Tests are infinite
+options="!check" # Tests are infinite
 subpackages="$pkgname-dev $pkgname-doc"
 makedepends="libogg-dev !libiconv"
 source="http://downloads.xiph.org/releases/flac/flac-$pkgver.tar.xz"
@@ -17,10 +17,8 @@ source="http://downloads.xiph.org/releases/flac/flac-$pkgver.tar.xz"
 
 
 build() {
-	cd "$builddir"
-
 	local _arch_conf
-	case "${CARCH}" in
+	case "$CARCH" in
 		ppc*)	_arch_conf="--enable-altivec" ;;
 		x86_64)	_arch_conf="--enable-sse" ;;
 		x86)	_arch_conf="--disable-sse" ;;
@@ -40,12 +38,10 @@ build() {
 }
 
 check() {
-	cd "$builddir"
 	make check
 }
 
 package() {
-	cd "$builddir"
 	make DESTDIR="$pkgdir" install
 
 	install -Dm0644 COPYING.Xiph \
diff --git a/main/kyua/APKBUILD b/main/kyua/APKBUILD
index a1e2ea6d02..d7eb0bbd6a 100644
--- a/main/kyua/APKBUILD
+++ b/main/kyua/APKBUILD
@@ -1,21 +1,16 @@
-# Maintainer: 
+# Maintainer:
 pkgname=kyua
 pkgver=0.13
-pkgrel=3
+pkgrel=4
 pkgdesc="testing framework for infrastructure software"
 url="https://github.com/jmmv/kyua"
 arch="all"
-license="BSD"
-depends=""
+license="BSD-3-Clause"
 makedepends="atf-dev lutok-dev sqlite-dev"
-install=""
-options="!checkroot"
 subpackages="$pkgname-doc"
 source="https://github.com/jmmv/kyua/releases/download/kyua-$pkgver/kyua-$pkgver.tar.gz"
-builddir="$srcdir/kyua-$pkgver"
 
 build() {
-	cd "$builddir"
 	./configure \
 		--build=$CBUILD \
 		--host=$CHOST \
@@ -27,7 +22,6 @@ build() {
 }
 
 package() {
-	cd "$builddir"
 	make -j1 DESTDIR="$pkgdir" install
 }
 
diff --git a/main/libgcrypt/APKBUILD b/main/libgcrypt/APKBUILD
index 2d1dc8211b..1ed022721c 100644
--- a/main/libgcrypt/APKBUILD
+++ b/main/libgcrypt/APKBUILD
@@ -9,8 +9,7 @@ license="LGPL-2.1-or-later"
 depends_dev="libgpg-error-dev"
 makedepends="$depends_dev texinfo"
 subpackages="$pkgname-static $pkgname-dev $pkgname-doc"
-source="https://www.gnupg.org/ftp/gcrypt/libgcrypt/$pkgname-$pkgver.tar.bz2"
-options="!checkroot"
+source="https://www.gnupg.org/ftp/gcrypt/libgcrypt/libgcrypt-$pkgver.tar.bz2"
 
 # secfixes:
 #   1.8.5-r0:
@@ -21,8 +20,6 @@ options="!checkroot"
 #     - CVE-2018-0495
 
 build() {
-	cd "$builddir"
-
 	local _arch_configure=
 	case "$CARCH" in
 	arm*)
@@ -50,14 +47,12 @@ build() {
 check() {
 	# t-secmem fails on ppc64le, see https://dev.gnupg.org/T3375
 	[ "$CARCH" != ppc64le ] || return 0
-	cd "$builddir"
 	make check
 }
 
 package() {
-	cd "$builddir"
 	make -j1 DESTDIR="$pkgdir" install
-	rm -f ${pkgdir}/usr/share/info/dir
+	rm -f $pkgdir/usr/share/info/dir
 }
 
 static() {
diff --git a/main/mariadb/APKBUILD b/main/mariadb/APKBUILD
index 4eda543da3..96e9f82559 100644
--- a/main/mariadb/APKBUILD
+++ b/main/mariadb/APKBUILD
@@ -27,7 +27,7 @@ subpackages="$pkgname-static $pkgname-test:mytest $pkgname-embedded-dev:_embedde
 	$pkgname-client $pkgname-bench $pkgname-backup $pkgname-embedded $pkgname-mytop
 	$pkgname-server-utils:_server_utils
 	mysql mysql-client:_compat_client mysql-bench:_compat_bench"
-options="!checkroot suid"
+options="suid"
 
 case "$CARCH" in
 	x86|s390x|mips64) _enable_rocksdb=NO ;;
@@ -350,7 +350,7 @@ client() {
 		mariadb-import mariadb-show mariadb-waitpid"
 	mkdir -p "$subpkgdir"/usr/bin/
 	for i in $bins $symlinks; do
-		mv "$pkgdir"/usr/bin/${i} "$subpkgdir"/usr/bin/
+		mv "$pkgdir"/usr/bin/$i "$subpkgdir"/usr/bin/
 	done
 }
 
diff --git a/main/parted/APKBUILD b/main/parted/APKBUILD
index 1d8fbbc5c1..cb34522b1b 100644
--- a/main/parted/APKBUILD
+++ b/main/parted/APKBUILD
@@ -9,14 +9,13 @@ license="GPL-3.0-or-later"
 subpackages="$pkgname-dev $pkgname-doc"
 checkdepends="perl eudev util-linux"
 makedepends="readline-dev ncurses-dev lvm2-dev bash util-linux-dev"
-source="https://ftp.gnu.org/gnu/$pkgname/$pkgname-$pkgver.tar.xz
+source="https://ftp.gnu.org/gnu/parted/parted-$pkgver.tar.xz
 	fix-includes.patch
 	fix-libintl-header-s390x.patch
 	parted-include-sysmacros.patch
 	make-tests.patch
 	skip-duplicate-bsd-test-on-s390x.patch
 	"
-options="!checkroot"
 
 build() {
 	./configure \
diff --git a/main/postgresql/APKBUILD b/main/postgresql/APKBUILD
index d62f9743b6..84891dceb8 100644
--- a/main/postgresql/APKBUILD
+++ b/main/postgresql/APKBUILD
@@ -31,7 +31,6 @@ source="https://ftp.postgresql.org/pub/source/v$pkgver/postgresql-$pkgver.tar.bz
 	pg-restore.confd
 	pltcl_create_tables.sql
 	"
-options="!checkroot"
 
 # secfixes:
 #   12.2-r0:
diff --git a/main/postgrey/APKBUILD b/main/postgrey/APKBUILD
index c705b213b1..b65f2cfdd7 100644
--- a/main/postgrey/APKBUILD
+++ b/main/postgrey/APKBUILD
@@ -2,37 +2,27 @@
 # Maintainer: Michael Mason <ms13sp@gmail.com>
 pkgname=postgrey
 pkgver=1.37
-pkgrel=1
+pkgrel=2
 pkgdesc="Postfix policy server implementing greylisting"
 url="http://postgrey.schweikert.ch/"
 arch="noarch"
-license="GPL"
+license="GPL-2.0-or-later"
 depends="perl perl-db perl-net-dns perl-net-server perl-io-multiplex
 	perl-net-rblclient perl-parse-syslog perl-netaddr-ip"
 pkgusers="postgrey"
 pkggroups="postgrey"
-makedepends=""
 checkdepends="perl-file-slurper"
 install=postgrey.pre-install
-subpackages=""
-source="https://postgrey.schweikert.ch/pub/$pkgname-$pkgver.tar.gz
+source="https://postgrey.schweikert.ch/pub/postgrey-$pkgver.tar.gz
 	postgrey.confd
 	postgrey.initd"
-builddir="$srcdir"/postgrey-$pkgver
-options="!checkroot"
-
-build() {
-	return 0
-}
 
 check() {
-	cd "$builddir"/test
+	cd test
 	perl test.pl
 }
 
 package() {
-	cd "$srcdir"/$pkgname-$pkgver
-
 	install -m755 -D $pkgname  "$pkgdir"/usr/sbin/$pkgname
 	mkdir -p "$pkgdir"/var/spool/postfix/$pkgname
 	chown postgrey:postgrey "$pkgdir"/var/spool/postfix/$pkgname
diff --git a/main/pth/APKBUILD b/main/pth/APKBUILD
index 9bf7814ba0..70204f8c81 100644
--- a/main/pth/APKBUILD
+++ b/main/pth/APKBUILD
@@ -1,48 +1,35 @@
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=pth
 pkgver=2.0.7
-pkgrel=4
-pkgdesc="The GNU Portable Threads."
+pkgrel=5
+pkgdesc="GNU Portable Threads"
 url="https://www.gnu.org/software/pth"
 arch="all"
-license="LGPL-2.1"
-depends=""
+license="LGPL-2.1-or-later"
 subpackages="$pkgname-dev $pkgname-doc"
-options="!libc_musl"
-source="https://ftp.gnu.org/gnu/$pkgname/$pkgname-$pkgver.tar.gz
+source="https://ftp.gnu.org/gnu/pth/pth-$pkgver.tar.gz
 	pth-2.0.5-parallelfix.patch
 	pth-2.0.6-ldflags.patch
 	pth-2.0.6-sigstack.patch
 	"
 
-_builddir="$srcdir/$pkgname-$pkgver"
-
 prepare() {
-	cd "$_builddir"
-	update_config_sub || return 1
-
-	for i in ../*.patch; do
-		msg "Applying $i..."
-		patch -p1 < $i || return 1
-	done
+	default_prepare
+	update_config_sub
 }
 
 build() {
-	cd "$_builddir"
 	./configure \
 		--build=$CBUILD \
 		--host=$CHOST \
 		--prefix=/usr \
 		--sysconfdir=/etc \
 		--localstatedir=/var \
-		--mandir=/usr/share/man \
-		|| return 1
-
-	make || return 1
+		--mandir=/usr/share/man
+	make
 }
 
 package() {
-	cd "$_builddir"
 	make -j1 DESTDIR="$pkgdir" install
 }
 
diff --git a/main/rsync/APKBUILD b/main/rsync/APKBUILD
index a8efcdc10f..144eff8bd1 100644
--- a/main/rsync/APKBUILD
+++ b/main/rsync/APKBUILD
@@ -5,7 +5,6 @@ pkgrel=3
 pkgdesc="A file transfer program to keep remote files in sync"
 url="https://rsync.samba.org/"
 arch="all"
-options="!checkroot"
 license="GPL-3.0-or-later"
 makedepends="perl acl-dev attr-dev popt-dev zlib-dev"
 subpackages="$pkgname-doc $pkgname-openrc rrsync"
@@ -20,19 +19,15 @@ source="https://download.samba.org/pub/rsync/rsync-$pkgver.tar.gz
 #   3.1.2-r7:
 #     - CVE-2017-16548
 #     - CVE-2017-17433
-#     - CVE-2017-17434-1
-#     - CVE-2017-17434-2
+#     - CVE-2017-17434
 
 # delete the itemize test because it is flawed and depends on filesystem-specific behavior
 prepare() {
-	cd "$builddir"
 	default_prepare
 	rm testsuite/itemize.test
 }
 
 build() {
-	cd "$builddir"
-
 	# Force IPv6 enabled, upstream bug https://bugzilla.samba.org/show_bug.cgi?id=10715
 	CFLAGS="$CFLAGS -DINET6" \
 
@@ -49,12 +44,10 @@ build() {
 }
 
 check() {
-	cd "$builddir"
 	make check
 }
 
 package() {
-	cd "$builddir"
 	make DESTDIR="$pkgdir" install
 
 	install -Dm755 "$srcdir"/rsyncd.initd "$pkgdir"/etc/init.d/rsyncd
diff --git a/main/sed/APKBUILD b/main/sed/APKBUILD
index 9dd5c69f12..a4f9f5cd9d 100644
--- a/main/sed/APKBUILD
+++ b/main/sed/APKBUILD
@@ -15,7 +15,7 @@ install="$pkgname.post-deinstall"
 source="https://ftp.heanet.ie/mirrors/ftp.gnu.org/gnu/sed/sed-$pkgver.tar.xz
 	"
 # testsuite fails because busybox provides a /usr/bin/timeout
-options="!checkroot !check"
+options="!check"
 
 build() {
 	./configure \
diff --git a/main/yasm/APKBUILD b/main/yasm/APKBUILD
index 133152d158..0178d7cd21 100644
--- a/main/yasm/APKBUILD
+++ b/main/yasm/APKBUILD
@@ -9,8 +9,6 @@ license="BSD-2-Clause"
 subpackages="$pkgname-dev $pkgname-doc"
 source="http://www.tortall.net/projects/yasm/releases/yasm-$pkgver.tar.gz
 	74184586228af6c362f970c84fce58da3fcbdec8.patch"
-options="!checkroot"
-
 
 prepare() {
 	default_prepare