COMMITSTYLE.md

@@ -182,10 +182,49 @@ One commit per rebuilt aport.
 #### Exceptions
 
 When various aports need to be rebuilt for the same reason the commit can
-hold all `Rebuilds` but split instead by by repository.
+hold all `Rebuilds` but split instead by repository.
 
 Example: `community/*: rebuild for so:libfoo.so.2`
 
+---
+
+### Addition of maintainership
+
+Adding yourself as maintainer.
+
+#### Template
+
+- `$repository/$pkgname: take over maintainership`
+
+Example: `community/foo: take over maintainership`
+
+#### Rules
+
+One commit per aport assumed maintainership of.
+
+---
+
+### Removal of maintainership
+
+Removing yourself as maintainer.
+
+#### Template
+
+- `$repository/$pkgname: drop maintainership`
+
+Example: `community/foo: drop maintainership`
+
+#### Rules
+
+One commit per aport maintainership is removed from.
+
+#### Exceptions
+
+When removing maintainership from all aports you maintain, the commit can
+hold all maintainership removals but instead be split by repository.
+
+Example: `community/*: drop maintainership`
+
 <!--
 Missing improvements
 Also missing tree-wide changes like usage of abuild-meson instead of meson

README.md

@@ -10,10 +10,10 @@ It also contains some extra files and directories related to testing
 
 If you want to contribute, please read the
 [contributor guide](https://wiki.alpinelinux.org/wiki/Alpine_Linux:Contribute)
-and feel free to either submit a git patch on the Alpine aports
-mailing list (~alpine/aports@lists.alpinelinux.org), or to submit a
-merge request on [GitLab](https://gitlab.alpinelinux.org/alpine/aports).
-
+and feel free to either submit a merge request on
+[GitLab](https://gitlab.alpinelinux.org/alpine/aports),
+or to submit a git patch on the Alpine aports mailing list
+(~alpine/aports@lists.alpinelinux.org). (note: this mailing list is presently not functional)
 
 Git Hooks
 ---------
@@ -24,3 +24,9 @@ To use them, run the following command after cloning this repository:
 ```sh
 git config --local core.hooksPath .githooks
 ```
+
+Guidelines
+----------
+
+- [Coding style](CODINGSTYLE.md) - Guidelines for writing APKBUILDs.
+- [Commit style](COMMITSTYLE.md) - Guidelines for git commit messages.

community/2bwm/APKBUILD

@@ -2,7 +2,7 @@
 # Maintainer: prspkt <prspkt@protonmail.com>
 pkgname=2bwm
 pkgver=0.3
-pkgrel=1
+pkgrel=2
 pkgdesc="Fast floating window manager"
 url="https://github.com/venam/2bwm"
 arch="all"

community/6tunnel/APKBUILD

@@ -2,7 +2,7 @@
 # Maintainer: Stuart Cardall <developer@it-offshore.co.uk>
 pkgname=6tunnel
 pkgver=0.13
-pkgrel=1
+pkgrel=2
 pkgdesc="TCP proxy for non-IPv6 applications"
 url="http://toxygen.net/6tunnel"
 arch="all"

community/R/APKBUILD

@@ -2,11 +2,11 @@
 # Contributor: Jakub Jirutka <jakub@jirutka.cz>
 # Maintainer: Jakub Jirutka <jakub@jirutka.cz>
 pkgname=R
-pkgver=4.2.2
-pkgrel=2
+pkgver=4.3.0
+pkgrel=0
 pkgdesc="Language and environment for statistical computing"
 url="https://www.r-project.org/"
-# riscv64 blocked by java-jre-headless
+# riscv64: blocked by java-jre-headless
 arch="all !riscv64"
 license="(GPL-2.0-only OR GPL-3.0-only) AND LGPL-2.1-or-later"
 depends="$pkgname-mathlib"
@@ -29,7 +29,7 @@ depends_dev="
 makedepends="
 	$depends_dev
 	cairo-dev
-	openjdk8-jre-base
+	java-jdk
 	libxmu-dev
 	pango-dev
 	perl
@@ -55,6 +55,7 @@ build() {
 	# htps://github.com/RcppCore/Rcpp/issues/448
 	export CXXFLAGS="$CXXFLAGS -D__MUSL__"
 
+	r_cv_have_curl728=y \
 	./configure \
 		--prefix=/usr \
 		--sysconfdir=/etc/R \
@@ -131,5 +132,5 @@ _dev() {
 }
 
 sha512sums="
-abbf1c7d016f8e1a9a0c4ad5dee2509a164449da34729f3e98d99ad8678ab398005fb8ed20288d4a6ed1e46ad4c70ad246f31a1a07aab99ba8fc6a5f02e1a309  R-4.2.2.tar.gz
+7f9bc8360818d7fdf05e26a4213df01468669514a4c2ad62dee358f53dcfa05a71ee72241db91fed59574c26d7caee5d3e0717637e1666daec99446e42c07813  R-4.3.0.tar.gz
 "

community/a2ps/APKBUILD

 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=a2ps
-pkgver=4.15.3
+pkgver=4.15.4
 pkgrel=0
 pkgdesc="a2ps is an Any to PostScript filter"
 url="https://www.gnu.org/software/a2ps/"
@@ -54,6 +54,6 @@ emacs() {
 }
 
 sha512sums="
-41f0590c5f794af767b57bfe2eeea105b73232ea9a9fcf87380d93cb4ccaaf652c69990bcb06d1da5f398f4c7d0ab6d23d9c3f5b6a85c37f36e72dc03e7ddc2a  a2ps-4.15.3.tar.gz
+aac3dfed21919682afa688b7315eeea012c5d496aad163b801021ed81d6056362d149745dcf48a99d139909c2ec796ce56bd4e63adb103d746ad89c691ea7779  a2ps-4.15.4.tar.gz
 4263f1ed74a9c3ae70c92954b8d91ca5807668be3825411902e4b9871f6d08ffb981996e7bc10f807d2e7ce82fbb4a485e304ec74d6cb25e8570b5fc0cb5c3e0  failing-test.patch
 "

community/a52dec/APKBUILD

 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=a52dec
 pkgver=0.8.0
-pkgrel=8
+pkgrel=10
 pkgdesc="A free library for decoding ATSC A/52 streams."
 url="https://liba52.sourceforge.net/"
 arch="all"

community/aaaaxy/APKBUILD

 # Contributor: Rudolf Polzer <divVerent@gmail.com>
 # Maintainer: Rudolf Polzer <divVerent@gmail.com>
 pkgname=aaaaxy
-pkgver=1.3.421
+pkgver=1.4.6
 pkgrel=0
 pkgdesc="A nonlinear puzzle platformer taking place in impossible spaces"
 url="https://divVerent.github.io/aaaaxy/"
 arch="all !s390x !armhf !armv7 !riscv64"
 license="Apache-2.0"
 makedepends="
+	advancecomp
 	alsa-lib-dev
 	go
 	libx11-dev
@@ -16,6 +17,7 @@ makedepends="
 	libxi-dev
 	libxrandr-dev
 	mesa-dev
+	zip
 "
 checkdepends="xvfb-run mesa-dri-gallium"
 source="
@@ -43,7 +45,7 @@ build() {
 
 check() {
 	xvfb-run sh scripts/regression-test-demo.sh aaaaxy \
-		"on track for Any%, All Paths and No Teleports" \
+		"on track for Any%, All Paths, No Teleports and No Coil" \
 		./aaaaxy assets/demos/benchmark.dem
 }
 
@@ -59,6 +61,6 @@ package() {
 }
 
 sha512sums="
-7050d30e0fd3f35b3f01a40455a2c6fab747bbc02c60fea6bba7007e10e7feaad3c733495ff31e8097df8d940fe128934625af706a8a1ba4d86671cc2bce6b90  aaaaxy-1.3.421.tar.gz
-3f625c5fdfced70c11f1146de9bf13193ac3949647179e64dc4a744e18699aee7f5e73636a5fbe6d6be1afe057ec0866038f2fd72d451d31bb4c0be726607903  sdl-gamecontrollerdb-for-aaaaxy-v1.3.421.zip
+ea1c5f2a473fa780717abf98dd9895fb958f5ee494c09f9ea83a15a372abc70a41fe855804abfaa38c9ab697d036df4e4d8f9a0767af806c851ca79b6439ec44  aaaaxy-1.4.6.tar.gz
+f603396553b76b691bfb6814b883d576f2018aaa23eba59184bb94320f88535a50ac861a89c52dd21dc33d30d89a06e6c0f9b8bb0b6b506877ef1fbb41442d16  sdl-gamecontrollerdb-for-aaaaxy-v1.4.6.zip
 "

community/aardvark-dns/APKBUILD

 # Contributor: Michał Polański <michal@polanski.me>
 # Maintainer: Michał Polański <michal@polanski.me>
 pkgname=aardvark-dns
-pkgver=1.5.0
+pkgver=1.6.0
 pkgrel=0
 pkgdesc="Authoritative DNS server for A/AAAA container records"
 url="https://github.com/containers/aardvark-dns"
@@ -12,7 +12,6 @@ makedepends="cargo"
 source="https://github.com/containers/aardvark-dns/archive/v$pkgver/aardvark-dns-$pkgver.tar.gz"
 options="net !check" # no test suite
 
-export CARGO_REGISTRIES_CRATES_IO_PROTOCOL="sparse"
 
 build() {
 	make
@@ -23,5 +22,5 @@ package() {
 }
 
 sha512sums="
-a648f44023bdbcbd4db502a307e42f1e1eb7718be5b559e6e9f1df43ac3a8982afe83ed866ca64bcf9bbece0eca4877713967654e195f7c6958e13aa0440189f  aardvark-dns-1.5.0.tar.gz
+699d65e426986204d9cddf04e88930ef59dca21ef5beb025dcad52e63a58421f8c8ee314d490b2f7b3f4a2d0df8444d4e706ca45b21153fc72f905b19e508090  aardvark-dns-1.6.0.tar.gz
 "

community/abduco/APKBUILD

@@ -2,7 +2,7 @@
 # Maintainer: Drew DeVault <sir@cmpwn.com>
 pkgname=abduco
 pkgver=0.6
-pkgrel=4
+pkgrel=5
 pkgdesc="Session management in a clean and simple way"
 url="https://www.brain-dump.org/projects/abduco/"
 arch="all"

community/abiword/APKBUILD

 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=abiword
 pkgver=3.0.5
-pkgrel=6
+pkgrel=10
 pkgdesc="A fully-featured word processor"
 url="https://www.abisource.com/"
 arch="all"

community/abook/APKBUILD

@@ -2,7 +2,7 @@
 # Maintainer: ScrumpyJack <scrumpyjack@st.ilet.to>
 pkgname=abook
 pkgver=0.6.1
-pkgrel=6
+pkgrel=7
 pkgdesc="Text-based addressbook designed for use with Mutt"
 url="https://abook.sourceforge.net/"
 license="GPL-2.0-or-later"

community/abseil-cpp/APKBUILD

 # Contributor: Bart Ribbers <bribbers@disroot.org>
 # Maintainer: Duncan Bellamy <dunk@denkimushi.com>
 pkgname=abseil-cpp
-pkgver=20230125.2
-pkgrel=0
+pkgver=20230125.3
+pkgrel=1
 pkgdesc="Abseil Common Libraries (C++) "
 url="https://abseil.io/"
 arch="all"
@@ -21,6 +21,7 @@ source="https://github.com/abseil/abseil-cpp/archive/$pkgver/abseil-cpp-$pkgver.
 	"
 
 _libs="
+	atomic_hook_test_helper
 	bad_any_cast_impl
 	bad_optional_access
 	bad_variant_access
@@ -41,6 +42,7 @@ _libs="
 	demangle_internal
 	die_if_null
 	examine_stack
+	exception_safety_testing
 	exponential_biased
 	failure_signal_handler
 	flags
@@ -57,6 +59,7 @@ _libs="
 	flags_usage_internal
 	graphcycles_internal
 	hash
+	hash_generator_testing
 	hashtablez_sampler
 	int128
 	leak_check
@@ -72,11 +75,16 @@ _libs="
 	log_internal_message
 	log_internal_nullguard
 	log_internal_proto
+	log_internal_test_actions
+	log_internal_test_helpers
+	log_internal_test_matchers
 	log_severity
 	log_sink
 	low_level_hash
 	malloc_internal
+	per_thread_sem_test_common
 	periodic_sampler
+	pow10_helper
 	random_distributions
 	random_internal_distribution_test_util
 	random_internal_platform
@@ -90,8 +98,11 @@ _libs="
 	random_seed_sequences
 	raw_hash_set
 	raw_logging_internal
+	scoped_mock_log
 	scoped_set_env
+	spinlock_test_common
 	spinlock_wait
+	stack_consumption
 	stacktrace
 	status
 	statusor
@@ -101,8 +112,10 @@ _libs="
 	strings_internal
 	symbolize
 	synchronization
+	test_instance_tracker
 	throw_delegate
 	time
+	time_internal_test_util
 	time_zone
 	"
 
@@ -143,6 +156,6 @@ abseillib() {
 }
 
 sha512sums="
-b2ba5023610aacb680b22bef894372810e6e7df76e630e56ac2f4b9498f70a872171f4562f6560ab78e837437b7bcfd3c47bfc2a5bb7fb20f28ec490dc8ed61f  abseil-cpp-20230125.2.tar.gz
+50509acfc4128fd31435631f71ac8cd0350acd9e290f78502723149016e7f07c9d84182ba99e0938b1873fecda09393d3fd7af8dabfb0d89cdcdd8a69a917e70  abseil-cpp-20230125.3.tar.gz
 aca4f4d89c38ca9038fdeb5b9e92c68d7ce0dda79f83335238f5e8de08c1a4d1e1ddd00e9ad6da18f0ab4ee22b58d73039f5523dc9311c7dbe1998f0f59a0e58  0002-abseil.patch
 "

community/accel-ppp/APKBUILD

 # Contributor: Thomas Liske <thomas@fiasko-nw.net>
 # Maintainer: Thomas Liske <thomas@fiasko-nw.net>
 pkgname=accel-ppp
-_pkgver=1.12.0-181-g85beb6b
-pkgver=${_pkgver%-*}
-pkgver=${pkgver/-/.}
-pkgrel=2
+pkgver=1.12.0_git20230404
+_gitrev=8bb85f829aae15e370a3289735bf2428bd4236dd
+pkgrel=1
 pkgdesc="PPtP/L2TP/PPPoE/SSTP server for Linux"
 url="https://accel-ppp.org/"
 arch="all"
@@ -20,16 +19,18 @@ makedepends="
 	samurai
 	"
 subpackages="$pkgname-doc $pkgname-openrc"
-source="accel-ppp-$_pkgver.tar.gz::https://github.com/accel-ppp/accel-ppp/archive/refs/tags/$_pkgver.tar.gz
+source="$pkgname-$pkgver.tar.gz::https://github.com/accel-ppp/accel-ppp/archive/$_gitrev.tar.gz
 	0001-ucontext.patch
 	0002-printf.patch
 	0003-tsearch.patch
 	0004-if_arp.patch
 	accel-pppd.initd
 	"
-builddir="$srcdir/accel-ppp-$_pkgver"
+builddir="$srcdir/accel-ppp-$_gitrev"
 
 build() {
+	export CFLAGS="${CFLAGS/-fno-plt}"
+	export CXXFLAGS="${CXXFLAGS/-fno-plt}"
 	export LDFLAGS="$LDFLAGS -Wl,-z,lazy"
 	if [ "$CBUILD" != "$CHOST" ]; then
 		CMAKE_CROSSOPTS="-DCMAKE_SYSTEM_NAME=Linux -DCMAKE_HOST_SYSTEM_NAME=Linux"
@@ -60,7 +61,7 @@ package() {
 }
 
 sha512sums="
-1554c5b3905ee53fa40f4111c29fcf25865c5a0d185407893fc035b1290a13f479685a29574388d10b7d010ba0b4ed597ce09e914b5128bc3a7a99a620d6649e  accel-ppp-1.12.0-181-g85beb6b.tar.gz
+f67bf67b50f7561b0bdb87dac0cfa11a3c6d142d1b90cfc262e5978769d71568c235743e7e9cfbe9dc4b3f9e4ee93639673c49bb1943e0fe9e9c154334291bb7  accel-ppp-1.12.0_git20230404.tar.gz
 fc49b789e80a6e25863d56711079e5ffe853afb6b6c6caaec9f119813edae4342198b962c659b7a5a3af14afab69daa447efdde8ac6c9a13b6420c697bf9c40f  0001-ucontext.patch
 cf793663b2beb85f07f9817286d4e53e9913c33fa1dfe30f1cec8a6b14b143f1f73f995f56f137a96c5645075db76c9268488a7205f17a1a2ebe4e31834a40c1  0002-printf.patch
 87210bb02fea7f4af15ab10ae479805ae0b8eb61dcf71b5c7a7f55b725a8df40b20c0907d35f8eaf698d573d0b5d045468fd473bb793fa7b659f8880bd5bbf4a  0003-tsearch.patch

community/accerciser/APKBUILD

@@ -2,7 +2,7 @@
 # Maintainer: Rasmus Thomsen <oss@cogitri.dev>
 pkgname=accerciser
 pkgver=3.40.0
-pkgrel=1
+pkgrel=2
 pkgdesc="Interactive Python accessibility explorer"
 url="https://wiki.gnome.org/Apps/Accerciser"
 arch="noarch"
@@ -28,7 +28,7 @@ makedepends="
 	yelp-tools
 	"
 options="!check" # no tests
-subpackages="$pkgname-lang $pkgname-doc"
+subpackages="$pkgname-lang $pkgname-doc $pkgname-pyc"
 source="https://gitlab.gnome.org/GNOME/accerciser/-/archive/$pkgver/accerciser-$pkgver.tar.gz"
 
 prepare() {

community/accounts-qml-module/APKBUILD

@@ -2,7 +2,7 @@
 # Maintainer: Bart Ribbers <bribbers@disroot.org>
 pkgname=accounts-qml-module
 pkgver=0.7_git20190605
-pkgrel=2
+pkgrel=3
 _commit="69e17dec5add40655cd9334ec7ad4eef13fed8a4"
 arch="all"
 url="https://gitlab.com/accounts-sso/accounts-qml-module"

community/accountsservice/APKBUILD

 # Contributor: Carlo Landmeter <clandmeter@alpinelinux.org>
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=accountsservice
-pkgver=22.08.8
-pkgrel=0
+pkgver=23.13.9
+pkgrel=2
 pkgdesc="D-Bus interface for user account query and manipulation"
 url="https://www.freedesktop.org/software/accountsservice/"
 arch="all"
@@ -12,7 +12,6 @@ makedepends="
 	$depends_dev
 	elogind-dev
 	glib-dev
-	intltool
 	meson
 	polkit-dev
 	vala
@@ -21,18 +20,23 @@ subpackages="$pkgname-dev $pkgname-lang lib$pkgname:libs"
 source="https://www.freedesktop.org/software/accountsservice/accountsservice-$pkgver.tar.xz
 	musl-fgetspent_r.patch
 	musl-wtmp.patch
+	opt-tests.patch
 	"
+# mocklibc fails to build with implicits
+options="!check"
 
 build() {
 	abuild-meson \
+		-Db_lto=true \
 		-Dsystemdsystemunitdir=no \
 		-Delogind=true \
 		-Dintrospection=true \
 		-Ddocbook=false \
 		-Dgtk_doc=false \
 		-Dadmin_group=wheel \
-		output
-	meson compile ${JOBS:+-j ${JOBS}} -C output
+		-Dtests="$(want_check && echo true || echo false)" \
+		. output
+	meson compile -C output
 }
 
 check() {
@@ -44,7 +48,8 @@ package() {
 }
 
 sha512sums="
-2ca3ceb1b44338d9924b86788256d4eef7ec10e0c2197bfb8cc6c31ae224fab3051f03cb406a526f90057684965bef4ba0f2cc01b26198ec1fc6baec36ad3ff8  accountsservice-22.08.8.tar.xz
+c6eb543ce2e07b61bbdfa454e388949bc688517be0536b14f30c66383ed105b15d3fab8b6c62b1eaa08f67d9bdc29b928729d9f7c704f47de4decf0de8e12f89  accountsservice-23.13.9.tar.xz
 469392beca8f5941eafaa193c4fcb0472770ee4183ce520416a1b5d6abafe0e201990eb74d06bfbd9e20af08e55aff5f0031f267083f6c6879f0fe4e5028103c  musl-fgetspent_r.patch
-054dc551808cfdb98a9876f1f24fee38c5aaf9686267cd7e871066caa8ec3029822e65549165a23222581319672c1ccb29213159c3b00804cf4119b89a7256ac  musl-wtmp.patch
+6d81caed730473d5c94d575c580a236b4267b374bf50588860922a7ecbeef0b2a1d50124fa3ae195c4f26abe8c3bd6df2aea6d27a0ce23e99acef9fff3eb9652  musl-wtmp.patch
+cc5ea18d885ccc5a85f5f4191d3157f3953878af289a9cabc373afea67726042144d66fd9f8d08dac7090fc23037ab98adb4101e8378a16ab2eb04043c88378f  opt-tests.patch
 "

community/accountsservice/musl-wtmp.patch

 the assert expects a working /var/log/wtmp at build time
+diff --git a/meson.build b/meson.build
+index 4a509e7..f995d28 100644
 --- a/meson.build
-+++ a/meson.build
-@@ -101,7 +101,6 @@
++++ b/meson.build
+@@ -103,8 +103,7 @@ elif cc.has_header_symbol('paths.h', '_PATH_WTMPX')
  
    config_h.set('PATH_WTMP', '_PATH_WTMPX')
  else
 -  path_wtmp = '/var/log/utx.log'
--  assert(run_command('test', '-e', path_wtmp).returncode() == 0, 'Do not know which filename to watch for wtmp changes')
+-  assert(run_command('test', '-e', path_wtmp, check: false).returncode() == 0, 'Do not know which filename to watch for wtmp changes')
 +  path_wtmp = '/var/log/wtmp'
    config_h.set_quoted('PATH_WTMP', path_wtmp)
  endif
+ 

community/accountsservice/opt-tests.patch

+diff --git a/meson.build b/meson.build
+index 4a509e7..5119fab 100644
+--- a/meson.build
++++ b/meson.build
+@@ -232,7 +232,9 @@ if get_option('gtk_doc')
+   subdir('doc/libaccountsservice')
+ endif
+ 
+-subdir('tests')
++if get_option('tests')
++  subdir('tests')
++endif
+ 
+ configure_file(
+   output: 'config.h',
+diff --git a/meson_options.txt b/meson_options.txt
+index b34a0fa..56872c7 100644
+--- a/meson_options.txt
++++ b/meson_options.txt
+@@ -13,3 +13,4 @@ option('vapi', type: 'boolean', value: true, description : 'Enable Vala bindings
+ 
+ option('docbook', type: 'boolean', value: false, description: 'build documentation (requires xmlto)')
+ option('gtk_doc', type: 'boolean', value: false, description: 'use gtk-doc to build documentation')
++option('tests', type: 'boolean', value: true, description: 'tests')

community/acme-client/APKBUILD

 # Contributor: Jordan Christiansen <xordspar0@gmail.com>
 # Maintainer: Jordan Christiansen <xordspar0@gmail.com>
 pkgname=acme-client
-pkgver=1.3.1
+pkgver=1.3.2
 pkgrel=0
 pkgdesc="Client for issuing certificates from ACME-complaint servers"
 url="https://git.sr.ht/~graywolf/acme-client-portable"
@@ -28,5 +28,5 @@ package() {
 }
 
 sha512sums="
-9e261c61b287bdd35c828289664b42e1364a4d575acd5021bea1618251bcd5d9fc7662e3a1c117676d9fc3d775674dbe3f4184090fd327b1b5832a01a7413355  acme-client-1.3.1.tar.gz
+84f4eeadbe1310ef07eb06e752124c5b899d5e5550b8e22dfae896a8ecbed6c34e10232e874703541577ba0dd0e696de29cbffb73493fe6be2b530b1964d2888  acme-client-1.3.2.tar.gz
 "