From c4230ff6f80b495243e27b256aaf81fee1d904d0 Mon Sep 17 00:00:00 2001
From: la Fleur <lafleur@boum.org>
Date: Wed, 21 Apr 2021 17:00:31 +0000
Subject: [PATCH 01/87] include pam_limits.so in autologin.pamd's session

---
 community/autologin/autologin.pamd | 1 +
 1 file changed, 1 insertion(+)

diff --git a/community/autologin/autologin.pamd b/community/autologin/autologin.pamd
index e63fb583185c..f02bf5ed267f 100644
--- a/community/autologin/autologin.pamd
+++ b/community/autologin/autologin.pamd
@@ -16,6 +16,7 @@ account   required pam_unix.so
 password  required pam_deny.so
 
 # Setup session
+session   required pam_limits.so
 session   required pam_unix.so
 session   optional pam_elogind.so
 
-- 
GitLab


From 5d1f67db1573bfdc1de0ac8abc3b2129dbf0ea51 Mon Sep 17 00:00:00 2001
From: Kevin Daudt <kdaudt@alpinelinux.org>
Date: Wed, 21 Apr 2021 17:15:08 +0000
Subject: [PATCH 02/87] main/redis: update secfixes

---
 main/redis/APKBUILD | 1 +
 1 file changed, 1 insertion(+)

diff --git a/main/redis/APKBUILD b/main/redis/APKBUILD
index 19ae822a318b..fb98d06173ea 100644
--- a/main/redis/APKBUILD
+++ b/main/redis/APKBUILD
@@ -26,6 +26,7 @@ source="https://download.redis.io/releases/redis-$pkgver.tar.gz
 # secfixes:
 #   6.2.0-r0:
 #     - CVE-2021-21309
+#     - CVE-2021-3470
 #   6.0.3-r0:
 #     - CVE-2020-14147
 #   5.0.8-r0:
-- 
GitLab


From 262781728f3a5889a575c32be3ec623dc6e89626 Mon Sep 17 00:00:00 2001
From: Bart Ribbers <bribbers@disroot.org>
Date: Wed, 21 Apr 2021 19:44:51 +0200
Subject: [PATCH 03/87] community/py3-qtwebengine: re-enable on armv7

---
 community/py3-qtwebengine/APKBUILD | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/community/py3-qtwebengine/APKBUILD b/community/py3-qtwebengine/APKBUILD
index 26846ca414a5..2309308604db 100644
--- a/community/py3-qtwebengine/APKBUILD
+++ b/community/py3-qtwebengine/APKBUILD
@@ -6,8 +6,7 @@ pkgdesc="Python 3 bindings for QtWebEngine"
 url="https://www.riverbankcomputing.com/software/pyqtwebengine/intro"
 # mips, ppc64le and s390x are not supported
 # armhf blocked by py3-qt5 -> qt5-qtdeclarative
-# armv7 temporarily blocked by qt5-qtwebengine
-arch="all !ppc64le !s390x !armhf !mips !mips64 !armv7"
+arch="all !ppc64le !s390x !armhf !mips !mips64"
 license="GPL-2.0-or-later"
 depends="python3"
 makedepends="python3-dev py3-qt5 qt5-qtwebengine-dev py-sip-dev"
-- 
GitLab


From 9cf00f7686fb2b54657ac9763d593244b9cf9e5b Mon Sep 17 00:00:00 2001
From: Bart Ribbers <bribbers@disroot.org>
Date: Wed, 21 Apr 2021 19:45:14 +0200
Subject: [PATCH 04/87] community/aura-browser: re-enable on armv7

---
 community/aura-browser/APKBUILD | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/community/aura-browser/APKBUILD b/community/aura-browser/APKBUILD
index 8a8be9f7c6e2..6bd6185a898c 100644
--- a/community/aura-browser/APKBUILD
+++ b/community/aura-browser/APKBUILD
@@ -8,8 +8,7 @@ pkgdesc="Browser for a fully immersed Big Screen experience allowing you to navi
 url="https://invent.kde.org/adityam/aura-browser"
 # armhf blocked by extra-cmake-modules
 # s390x, ppc64le and mips64 blocked by qt5-qtwebengine
-# armv7 temporarily blocked by qt5-qtwebengine
-arch="all !armhf !s390x !ppc64le !mips64 !armv7"
+arch="all !armhf !s390x !ppc64le !mips64"
 license="GPL-2.0-or-later"
 depends="
 	kirigami2
-- 
GitLab


From de98219bbc8cffcfb4b85c5b285f0722945dcbe9 Mon Sep 17 00:00:00 2001
From: Bart Ribbers <bribbers@disroot.org>
Date: Wed, 21 Apr 2021 19:51:05 +0200
Subject: [PATCH 05/87] community/qutebrowser: re-enable on armv7

---
 community/qutebrowser/APKBUILD | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/community/qutebrowser/APKBUILD b/community/qutebrowser/APKBUILD
index 482af3a6951e..7c141ae5c3e4 100644
--- a/community/qutebrowser/APKBUILD
+++ b/community/qutebrowser/APKBUILD
@@ -7,15 +7,14 @@ pkgdesc="Keyboard-driven, vim-like browser based on PyQT5"
 url="https://qutebrowser.org/"
 # Blocked on mips, s390x and ppc64le by qt5-qtwebengine
 # Blocked on armhf by py3-qt5 -> qt5-qtdeclarative-dev
-# Temporarily blocked on armv7 by qt5-qtwebengine
-arch="noarch !s390x !ppc64le !armhf !mips64 !armv7"
+arch="noarch !s390x !ppc64le !armhf !mips64"
 license="GPL-3.0-only"
 options="!check" # missing pytest dependencies
 depends="
 	py3-jinja2 py3-qt5 py3-yaml qt5-qtbase
 	qt5-qtwebengine qt5-qtbase-sqlite py3-qtwebengine
 	py3-sip-pyqt5 py3-importlib-resources
-"
+	"
 makedepends="asciidoc py3-setuptools"
 checkdepends="py3-pytest py3-pytest-benchmark py3-pytest-rerunfailures py3-pytest-mock py3-hypothesis"
 subpackages="$pkgname-doc"
-- 
GitLab


From 9554f8439d5e1e232340679ccd11b47ecc42efdc Mon Sep 17 00:00:00 2001
From: Marian Buschsieweke <marian.buschsieweke@ovgu.de>
Date: Tue, 30 Mar 2021 17:36:35 +0200
Subject: [PATCH 06/87] testing/rtkit: new aport

https://github.com/heftig/rtkit
D-Bus system service that enables real time scheduling on request
---
 testing/rtkit/APKBUILD                        | 55 +++++++++++
 testing/rtkit/rtkit.confd                     |  5 +
 testing/rtkit/rtkit.initd                     | 19 ++++
 testing/rtkit/rtkit.pre-install               |  6 ++
 ...ched_getscheduler_sched_setscheduler.patch | 91 +++++++++++++++++++
 5 files changed, 176 insertions(+)
 create mode 100644 testing/rtkit/APKBUILD
 create mode 100644 testing/rtkit/rtkit.confd
 create mode 100644 testing/rtkit/rtkit.initd
 create mode 100644 testing/rtkit/rtkit.pre-install
 create mode 100644 testing/rtkit/sched_getscheduler_sched_setscheduler.patch

diff --git a/testing/rtkit/APKBUILD b/testing/rtkit/APKBUILD
new file mode 100644
index 000000000000..c20827574eb4
--- /dev/null
+++ b/testing/rtkit/APKBUILD
@@ -0,0 +1,55 @@
+# Contributor: Marian Buschsieweke <marian.buschsieweke@ovgu.de>
+# Maintainer: Marian Buschsieweke <marian.buschsieweke@ovgu.de>
+pkgname=rtkit
+pkgver=0.13
+pkgrel=0
+pkgdesc="D-Bus system service that enables real time scheduling on request"
+url="https://github.com/heftig/rtkit"
+arch="all !s390x" # s390x: polkit-elogind-dev
+license="GPL-3.0-only AND MIT" # README says BSD is used for client, but code uses MIT instead
+makedepends="
+	dbus-dev
+	libcap-dev
+	meson
+	polkit-elogind-dev
+	xxd
+	"
+subpackages="
+	$pkgname-doc
+	$pkgname-openrc
+	"
+install="$pkgname.pre-install"
+source="
+	https://github.com/heftig/rtkit/releases/download/v$pkgver/rtkit-$pkgver.tar.xz
+	$pkgname.initd
+	$pkgname.confd
+
+	sched_getscheduler_sched_setscheduler.patch
+	"
+
+build() {
+	abuild-meson \
+		-Ddocs=enabled \
+		-Dman=enabled \
+		. output
+	meson compile ${JOBS:+-j ${JOBS}} -C output
+}
+
+check() {
+	meson test --no-rebuild -v -C output
+}
+
+package() {
+	DESTDIR="$pkgdir" meson install --no-rebuild -C output
+	rm -r "$pkgdir"/usr/lib/systemd
+	# don't add emtpy /usr/lib dir, but use rmdir instead of rm -rf to fail if lib
+	# is no longer empty
+	rmdir "$pkgdir"/usr/lib
+	install -Dm755 "$srcdir"/$pkgname.initd "$pkgdir"/etc/init.d/$pkgname
+	install -Dm644 "$srcdir"/$pkgname.confd "$pkgdir"/etc/conf.d/$pkgname
+}
+
+sha512sums="c058d770a4ccfdf4e2e3a713748b6a705b6d3e148a903b9dbba4bba9d3ded2b819d7dfbfa37b9fad78e57c0a5f10f2f94226f8738f666e692a085ab297a36b36  rtkit-0.13.tar.xz
+764139cada4f51f7822dcf4913af068a129b95286122479f3afe84727ade80705b52aa86bb6ec0527fad57f0f4d4e861dd1be030f845b2a012fbd2ed37537382  rtkit.initd
+84e11b51c0bb6db105353f2123595a802d0f170772edf23606ca126a4861af865600267956d288c2b0121d7be3d2bd1c51cb6d5a9ee54863dad383a121a430eb  rtkit.confd
+9a9bb315e8d207c673cb795f91e025f313bd3a1881323c968777db6c0029de85aaecd06cf833d3ffd7468477f6586de756c077220043631a60155f28c9d66ba3  sched_getscheduler_sched_setscheduler.patch"
diff --git a/testing/rtkit/rtkit.confd b/testing/rtkit/rtkit.confd
new file mode 100644
index 000000000000..93b3ba4fd30a
--- /dev/null
+++ b/testing/rtkit/rtkit.confd
@@ -0,0 +1,5 @@
+# Config file for /etc/init.d/rtkit
+
+# Any extra options you want to pass to rtkit
+# on start-up should be put here.
+RTKIT_OPTS=""
diff --git a/testing/rtkit/rtkit.initd b/testing/rtkit/rtkit.initd
new file mode 100644
index 000000000000..ad9a02dee401
--- /dev/null
+++ b/testing/rtkit/rtkit.initd
@@ -0,0 +1,19 @@
+#!/sbin/openrc-run
+
+depend() {
+	need dbus
+}
+
+start() {
+	ebegin "Starting rtkit"
+	start-stop-daemon --start --quiet --exec /usr/libexec/rtkit-daemon \
+	--background --pidfile /var/run/rtkit.pid --make-pidfile \
+	-- ${RTKIT_OPTS}
+	eend $?
+}
+
+stop() {
+	ebegin "Stopping rtkit"
+	start-stop-daemon --stop --quiet --pidfile /var/run/rtkit.pid --exec /usr/libexec/rtkit-daemon
+	eend $?
+}
diff --git a/testing/rtkit/rtkit.pre-install b/testing/rtkit/rtkit.pre-install
new file mode 100644
index 000000000000..55d1b60cd182
--- /dev/null
+++ b/testing/rtkit/rtkit.pre-install
@@ -0,0 +1,6 @@
+#!/bin/sh
+
+addgroup -S rtkit 2>/dev/null
+adduser -SDH -h /dev/null -s /sbin/nologin -G rtkit -g rtkit rtkit 2>/dev/null
+
+exit 0
diff --git a/testing/rtkit/sched_getscheduler_sched_setscheduler.patch b/testing/rtkit/sched_getscheduler_sched_setscheduler.patch
new file mode 100644
index 000000000000..a09bd300f90f
--- /dev/null
+++ b/testing/rtkit/sched_getscheduler_sched_setscheduler.patch
@@ -0,0 +1,91 @@
+Provide thin stubs for the sched_getscheduler() and sched_getscheduler()
+syscalls, as musl has dropped their implementation. The thin stubs are exactly
+what glibc does and what rtkit expects.
+--- rtkit-0.13.orig/rtkit-daemon.c
++++ rtkit-0.13/rtkit-daemon.c
+@@ -32,6 +32,7 @@
+ #include <sys/stat.h>
+ #include <string.h>
+ #include <sched.h>
++#include <syscall.h>
+ #include <sys/time.h>
+ #include <sys/resource.h>
+ #include <stdlib.h>
+@@ -196,6 +197,14 @@
+ static pthread_t canary_thread_id = 0, watchdog_thread_id = 0;
+ static volatile uint32_t refuse_until = 0;
+ 
++static int _sched_setscheduler(pid_t pid, int sched, const struct sched_param *param) {
++        return syscall(SYS_sched_setscheduler, pid, sched, param);
++}
++
++static int _sched_getscheduler(pid_t pid) {
++        return syscall(SYS_sched_getscheduler, pid);
++}
++
+ static const char *get_proc_path(void) {
+         /* Useful for chroot environments */
+ 
+@@ -439,7 +448,7 @@
+         if (st != t->starttime)
+                 return FALSE;
+ 
+-        if ((r = sched_getscheduler(t->pid)) < 0) {
++        if ((r = _sched_getscheduler(t->pid)) < 0) {
+ 
+                 /* Maybe it died right now? */
+                 if (errno == ESRCH)
+@@ -564,7 +573,7 @@
+         memset(&param, 0, sizeof(param));
+         param.sched_priority = priority;
+ 
+-        if (sched_setscheduler(0, sched_policy|SCHED_RESET_ON_FORK, &param) < 0) {
++        if (_sched_setscheduler(0, sched_policy|SCHED_RESET_ON_FORK, &param) < 0) {
+                 r = -errno;
+                 syslog(LOG_ERR, "Failed to make ourselves RT: %s\n", strerror(errno));
+                 goto finish;
+@@ -581,7 +590,7 @@
+ 
+         memset(&param, 0, sizeof(param));
+ 
+-        if (sched_setscheduler(0, SCHED_OTHER, &param) < 0)
++        if (_sched_setscheduler(0, SCHED_OTHER, &param) < 0)
+                 syslog(LOG_WARNING, "Warning: Failed to reset scheduling to SCHED_OTHER: %s\n", strerror(errno));
+ 
+         if (setpriority(PRIO_PROCESS, 0, nice_level) < 0)
+@@ -696,7 +705,7 @@
+         memset(&param, 0, sizeof(param));
+         param.sched_priority = 0;
+ 
+-        if (sched_setscheduler(tid, SCHED_OTHER, &param) < 0) {
++        if (_sched_setscheduler(tid, SCHED_OTHER, &param) < 0) {
+                 if (errno != ESRCH)
+                         syslog(LOG_WARNING, "Warning: Failed to reset scheduling to SCHED_OTHER for thread %llu: %s\n", (unsigned long long) tid, strerror(errno));
+                 r = -1;
+@@ -748,7 +757,7 @@
+         /* Ok, everything seems to be in order, now, let's do it */
+         memset(&param, 0, sizeof(param));
+         param.sched_priority = (int) priority;
+-        if (sched_setscheduler(t->pid, sched_policy|SCHED_RESET_ON_FORK, &param) < 0) {
++        if (_sched_setscheduler(t->pid, sched_policy|SCHED_RESET_ON_FORK, &param) < 0) {
+                 r = -errno;
+                 syslog(LOG_ERR, "Failed to make thread %llu RT: %s\n", (unsigned long long) t->pid, strerror(errno));
+                 goto finish;
+@@ -809,7 +818,7 @@
+         /* Ok, everything seems to be in order, now, let's do it */
+         memset(&param, 0, sizeof(param));
+         param.sched_priority = 0;
+-        if (sched_setscheduler(t->pid, SCHED_OTHER|SCHED_RESET_ON_FORK, &param) < 0) {
++        if (_sched_setscheduler(t->pid, SCHED_OTHER|SCHED_RESET_ON_FORK, &param) < 0) {
+                 r = -errno;
+                 syslog(LOG_ERR, "Failed to make process %llu SCHED_NORMAL: %s\n", (unsigned long long) t->pid, strerror(errno));
+                 goto finish;
+@@ -943,7 +952,7 @@
+                         if (errno != 0 || !e || *e != 0)
+                                 continue;
+ 
+-                        if ((r = sched_getscheduler(tid)) < 0) {
++                        if ((r = _sched_getscheduler(tid)) < 0) {
+                                 if (errno != ESRCH)
+                                         syslog(LOG_WARNING, "Warning: sched_getscheduler() failed: %s\n", strerror(errno));
+                                 continue;
-- 
GitLab


From 8704a1499dc6db769c7761f196d02c24b9d57420 Mon Sep 17 00:00:00 2001
From: nibon7 <nibon7@163.com>
Date: Wed, 21 Apr 2021 13:31:31 +0800
Subject: [PATCH 07/87] testing/nushell: upgrade to 0.30.0

Signed-off-by: nibon7 <nibon7@163.com>
---
 testing/nushell/APKBUILD | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/testing/nushell/APKBUILD b/testing/nushell/APKBUILD
index 7a700ed45b30..5d4d66521632 100644
--- a/testing/nushell/APKBUILD
+++ b/testing/nushell/APKBUILD
@@ -1,7 +1,7 @@
 # Contributor: nibon7 <nibon7@163.com>
 # Maintainer: nibon7 <nibon7@163.com>
 pkgname=nushell
-pkgver=0.29.0
+pkgver=0.30.0
 pkgrel=1
 pkgdesc="A new type of shell"
 url="https://www.nushell.sh"
@@ -23,4 +23,4 @@ package() {
 	rm "$pkgdir"/usr/.crates*
 }
 
-sha512sums="60dacd3d147df2a151a787a2bcb22fae8b2a45b2db0dcfea3a5d2216b96370430d6aef81c62a180bc498ed6afffa7cdfddf692667a069a33066bdc9af91e89a4  nushell-0.29.0.tar.gz"
+sha512sums="8424279a85c9d7897014d4c7abfe5eb94d75e5b07082475ca9fb9ff6c1c2905af18f3d46533d25be902060c6ef1113ecade79358663ec2b8117332bc70a83c0f  nushell-0.30.0.tar.gz"
-- 
GitLab


From 71d97d39f978f4edb3f336250d48d40c58e02ec9 Mon Sep 17 00:00:00 2001
From: Kevin Daudt <kdaudt@alpinelinux.org>
Date: Wed, 21 Apr 2021 18:11:59 +0000
Subject: [PATCH 08/87] testing/rtkit: disable on mips64

polkit-elogind is missing
---
 testing/rtkit/APKBUILD | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/testing/rtkit/APKBUILD b/testing/rtkit/APKBUILD
index c20827574eb4..c9095d1664ee 100644
--- a/testing/rtkit/APKBUILD
+++ b/testing/rtkit/APKBUILD
@@ -5,7 +5,7 @@ pkgver=0.13
 pkgrel=0
 pkgdesc="D-Bus system service that enables real time scheduling on request"
 url="https://github.com/heftig/rtkit"
-arch="all !s390x" # s390x: polkit-elogind-dev
+arch="all !s390x !mips64" # s390xi, mips64: polkit-elogind-dev
 license="GPL-3.0-only AND MIT" # README says BSD is used for client, but code uses MIT instead
 makedepends="
 	dbus-dev
-- 
GitLab


From 8c9045506f6f12478d98737f62d12d61779afcf8 Mon Sep 17 00:00:00 2001
From: Leo <thinkabit.ukim@gmail.com>
Date: Tue, 20 Apr 2021 14:15:26 -0300
Subject: [PATCH 09/87] testing/vim-go: upgrade to 1.25

---
 testing/vim-go/APKBUILD | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/testing/vim-go/APKBUILD b/testing/vim-go/APKBUILD
index 7d36422c4933..55e1ef7ee7ba 100644
--- a/testing/vim-go/APKBUILD
+++ b/testing/vim-go/APKBUILD
@@ -1,6 +1,6 @@
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=vim-go
-pkgver=1.24
+pkgver=1.25
 pkgrel=0
 pkgdesc="Go development plugin for Vim"
 url="https://github.com/fatih/vim-go"
@@ -30,4 +30,4 @@ package() {
 	find "$destdir" -name '.git*' -delete
 }
 
-sha512sums="0ba737e79cfe9ac4a47d9ec92b2b0d99c6435e8f058b3a40fd142fc9a056dead50213b8f43de55872bf27988293864896976f86870bffd4187427fdd146d8d17  vim-go-1.24.tar.gz"
+sha512sums="42263050893c9ab939346d5572b67e86e3ef3095ab0164ce7932bcf8702703bddffe621e6a658fd772af0e20a9ed06906d9f6b7db4a1cbfb1095e948d5883f56  vim-go-1.25.tar.gz"
-- 
GitLab


From 6657b64d3b505997ebb8f2bec2055552c89dd77a Mon Sep 17 00:00:00 2001
From: Andy Postnikov <apostnikov@gmail.com>
Date: Mon, 19 Apr 2021 22:48:50 +0300
Subject: [PATCH 10/87] main/graphviz: upgrade to 2.47.1

---
 main/graphviz/APKBUILD | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/main/graphviz/APKBUILD b/main/graphviz/APKBUILD
index 0c9372b1262c..b3792f6cf34d 100644
--- a/main/graphviz/APKBUILD
+++ b/main/graphviz/APKBUILD
@@ -2,8 +2,8 @@
 # Contributor: Natanael Copa <ncopa@alpinelinux.org>
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=graphviz
-pkgver=2.47.0
-pkgrel=2
+pkgver=2.47.1
+pkgrel=0
 pkgdesc="Graph Visualization Tools"
 url="https://www.graphviz.org/"
 arch="all"
@@ -112,5 +112,5 @@ graphs() {
 		"$subpkgdir"/usr/share/graphviz/
 }
 
-sha512sums="b0b0ecaee18abfc262432fc0f8b309101cacdb77edf72aceec564e834e73dfeadab41190aaedeb4ab822f2d8d7c0eb34b093aa6fb1ef630c61bb6b7516449fd2  graphviz-2.47.0.tar.gz
+sha512sums="8d12f90bc780d88dda8fe3f64723ee921eda2d345e665fe7e5f2599117b513c7715250e66e630b9de9900ff4b9780f698a6c2d6c25c1aad34d1329ebd69d8d8b  graphviz-2.47.1.tar.gz
 aa4cbc341906a949a6bf78cadd96c437d6bcc90369941fe03519aa4447731ecbf6063a0dd0366d3e7aaadf22b69e4bcab3f8632a7da7a01f8e08a3be05c2bc5d  0001-clone-nameclash.patch"
-- 
GitLab


From b7017e668edebd9d25fc3849a20c0cb9c6c8b7be Mon Sep 17 00:00:00 2001
From: Oleg Titov <oleg.titov@gmail.com>
Date: Fri, 26 Mar 2021 17:16:14 -0600
Subject: [PATCH 11/87] testing/lighthouse: new aport

https://lighthouse.sigmaprime.io/
Ethereum 2.0 client
---
 testing/lighthouse/APKBUILD | 35 +++++++++++++++++++++++++++++++++++
 1 file changed, 35 insertions(+)
 create mode 100644 testing/lighthouse/APKBUILD

diff --git a/testing/lighthouse/APKBUILD b/testing/lighthouse/APKBUILD
new file mode 100644
index 000000000000..a9a4075f6f6a
--- /dev/null
+++ b/testing/lighthouse/APKBUILD
@@ -0,0 +1,35 @@
+# Contributor: Oleg Titov <oleg.titov@gmail.com>
+# Maintainer: Oleg Titov <oleg.titov@gmail.com>
+pkgname=lighthouse
+pkgver=1.3.0
+pkgrel=0
+pkgdesc="Ethereum 2.0 Client"
+url="https://lighthouse.sigmaprime.io/"
+arch="x86_64 aarch64"  # limited by upstream
+license="Apache-2.0"
+makedepends="cargo cmake openssl-dev protoc"
+subpackages="$pkgname-doc"
+source="$pkgname-$pkgver.tar.gz::https://github.com/sigp/lighthouse/archive/v$pkgver/lighthouse-$pkgver.tar.gz"
+
+export OPENSSL_NO_VENDOR=true
+export RUSTFLAGS="$RUSTFLAGS -L /usr/lib/"
+
+build() {
+	cargo build --release --locked
+}
+
+check() {
+	cargo test --release --locked \
+		--workspace \
+			--exclude ef_tests \
+			--exclude eth1 \
+			--exclude genesis
+}
+
+package() {
+	install -D -m755 "target/release/lighthouse" "$pkgdir/usr/bin/lighthouse"
+
+	install -Dm 644 -t "$pkgdir/usr/share/doc/lighthouse" README.md
+}
+
+sha512sums="56c5887c3932d376b82084d1cad810bbfba664cbd8899907021c9ecf6243d5c45c2a79913998fe005abe91e700d349616939958bcb17b3eed9c246ad48712d1e  lighthouse-1.3.0.tar.gz"
-- 
GitLab


From 44afa3a84825703a97eaedadd43866ca1748e8f3 Mon Sep 17 00:00:00 2001
From: Simon Frankenberger <simon-alpine@fraho.eu>
Date: Wed, 21 Apr 2021 20:14:18 +0200
Subject: [PATCH 12/87] community/openjdk13: upgrade to 13.0.7

---
 testing/openjdk13/APKBUILD    | 12 ++++++------
 testing/openjdk13/build.patch | 11 -----------
 2 files changed, 6 insertions(+), 17 deletions(-)

diff --git a/testing/openjdk13/APKBUILD b/testing/openjdk13/APKBUILD
index 61c4114ffcf1..5f4488c3186d 100644
--- a/testing/openjdk13/APKBUILD
+++ b/testing/openjdk13/APKBUILD
@@ -1,12 +1,12 @@
 # Contributor: Simon Frankenberger <simon-alpine@fraho.eu>
 # Maintainer: Simon Frankenberger <simon-alpine@fraho.eu>
 pkgname=openjdk13
-pkgver=13.0.4_p8
+pkgver=13.0.7_p5
 _pkgver=${pkgver%_p*}-ga
-pkgrel=2
+pkgrel=0
 pkgdesc="Oracle OpenJDK 13"
 provider_priority=13
-url="https://hg.openjdk.java.net/jdk-updates/jdk13u"
+url="https://github.com/openjdk/jdk13u"
 arch="all !x86 !armhf !armv7 !mips !mips64" # oracle dropped support for 32 bit
 license="GPL-2.0-with-classpath-exception"
 makedepends="autoconf
@@ -129,7 +129,7 @@ build() {
 		--with-debug-level=release \
 		--with-version-pre= \
 		--with-version-opt="alpine-r$pkgrel" \
-		--with-version-build=${_pkgver#*+} \
+		--with-version-build=${pkgver#*p} \
 		--with-vendor-name="Alpine" \
 		--with-vendor-url="https://alpinelinux.org/" \
 		--with-vendor-bug-url="https://gitlab.alpinelinux.org/alpine/aports/issues" \
@@ -289,8 +289,8 @@ _jdk() {
 	mv "$_fromroot/include" "$_toroot"
 }
 
-sha512sums="d29820da13b45fe64ff20ff277142a3dd73301145b9b7c03b387950928aae99564b7ecb0c1a25d29737de896e06b94f8618c6e141130788a6e87dc23e97a023e  jdk-13.0.4-ga.tar.gz
-ba02f4fa18de956b3c0e6ec367ce3ba6bc8fa237d4e3f5b8c0f761a4c2be8208b135faa0d9062f713680e2c2b94d11fb92758c2a51f6eb6721d64b3ced8afafe  build.patch
+sha512sums="182999c3e5f295d9cf3df39cd419a5c66d01a48a44ff91f38963438c3713bdb036fe230778f638a6295210334a2c16ec89351c1dff8f40aad4850d434b6716d4  jdk-13.0.7-ga.tar.gz
+9786cdbe1fdbdc882092124ebade05bea6d039f62263fb29bae2dc9479d07434f574424e7716a10edf6c9c88ebec7c4d3ef3c5031424d7eb65ee6a68ac038f6b  build.patch
 f7fd94b04740e2a3f966577a5c02f7d6db38ef0ab3ef7b3183cd3ba3d8ff7304e3151fba03a4bcbb9f82f380a723d7823794e168ebf9f2fa8d5e7a9dbc895ce9  aarch64.patch
 2d41f87175b3727c0e71d4d63ee4574d59097527775c98456a311b14e17950274531d422a965f0d7ad5e1b5bf4286fc250565c35f74aad61960d529a1a409eec  ppc64le.patch
 a916200ffdd4e4be0233fa020a30f4b0aabb92dc1956ce75e4372afc6fb22cad8333770d5381086e91c1ed4159a9620a37de3e5b175c8f025ec9040ad016fce2  fix-bootjdk-check.patch
diff --git a/testing/openjdk13/build.patch b/testing/openjdk13/build.patch
index 18256a162e68..080dfdd23f96 100644
--- a/testing/openjdk13/build.patch
+++ b/testing/openjdk13/build.patch
@@ -132,17 +132,6 @@ The base was taken from a diff with the portola project and adjusted for latest
    ScratchBlock  *cur = *prev_ptr;
    while (cur) {
      assert(*prev_ptr == cur, "just checking");
---- old/src/hotspot/share/runtime/vm_version.cpp
-+++ new/src/hotspot/share/runtime/vm_version.cpp
-@@ -277,7 +277,7 @@
-   #endif
- 
-   #define INTERNAL_VERSION_SUFFIX VM_RELEASE ")" \
--         " for " OS "-" CPU FLOAT_ARCH_STR \
-+         " for " OS "-" CPU FLOAT_ARCH_STR LIBC \
-          " JRE (" VERSION_STRING "), built on " __DATE__ " " __TIME__ \
-          " by " XSTR(HOTSPOT_BUILD_USER) " with " HOTSPOT_BUILD_COMPILER
- 
 --- old/src/hotspot/share/utilities/globalDefinitions_gcc.hpp
 +++ new/src/hotspot/share/utilities/globalDefinitions_gcc.hpp
 @@ -204,7 +204,7 @@
-- 
GitLab


From 9283270c19f0141b749dd436b931303c67b96175 Mon Sep 17 00:00:00 2001
From: Bart Ribbers <bribbers@disroot.org>
Date: Wed, 21 Apr 2021 20:22:52 +0200
Subject: [PATCH 13/87] testing/matrix-synapse-rest-password-provider: orphan

---
 testing/matrix-synapse-rest-password-provider/APKBUILD | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/testing/matrix-synapse-rest-password-provider/APKBUILD b/testing/matrix-synapse-rest-password-provider/APKBUILD
index 865566bf9d15..88d5aedd775a 100644
--- a/testing/matrix-synapse-rest-password-provider/APKBUILD
+++ b/testing/matrix-synapse-rest-password-provider/APKBUILD
@@ -1,8 +1,8 @@
 # Contributor: Bart Ribbers <bribbers@disroot.org>
-# Maintainer: Bart Ribbers <bribbers@disroot.org>
+# Maintainer:
 pkgname=matrix-synapse-rest-password-provider
 pkgver=0.1.3
-pkgrel=1
+pkgrel=2
 pkgdesc="Password Provider for Synapse fetching data from a REST endpoint"
 url="https://github.com/ma1uta/matrix-synapse-rest-password-provider"
 arch="noarch"
-- 
GitLab


From a38674d569e0521ec209dc767a6040e26e9f978d Mon Sep 17 00:00:00 2001
From: Luca Weiss <luca@z3ntu.xyz>
Date: Wed, 21 Apr 2021 21:10:01 +0200
Subject: [PATCH 14/87] testing/kmscube: new aport

---
 testing/kmscube/APKBUILD | 26 ++++++++++++++++++++++++++
 1 file changed, 26 insertions(+)
 create mode 100644 testing/kmscube/APKBUILD

diff --git a/testing/kmscube/APKBUILD b/testing/kmscube/APKBUILD
new file mode 100644
index 000000000000..393181b5f28e
--- /dev/null
+++ b/testing/kmscube/APKBUILD
@@ -0,0 +1,26 @@
+# Contributor: Zhuowei Zhang <zhuoweizhang@yahoo.com>
+# Maintainer: Luca Weiss <luca@z3ntu.xyz>
+pkgname=kmscube
+pkgver=0_git20210207
+pkgrel=0
+_commit="9f63f359fab1b5d8e862508e4e51c9dfe339ccb0"
+pkgdesc="Simple demo for testing kernel mode setting support"
+url="https://gitlab.freedesktop.org/mesa/kmscube"
+arch="all"
+license="MIT"
+makedepends="libdrm-dev libpng-dev mesa-dev meson"
+source="https://gitlab.freedesktop.org/mesa/kmscube/-/archive/$_commit/kmscube-$_commit.tar.gz"
+options="!check" # No tests
+builddir="$srcdir/kmscube-$_commit"
+
+build() {
+	abuild-meson \
+		. output
+	meson compile ${JOBS:+-j ${JOBS}} -C output
+}
+
+package() {
+	DESTDIR="$pkgdir" meson install --no-rebuild -C output
+}
+
+sha512sums="f1af98e60f9d36757e83e6e7a6db5331ab2d487039021dca74da2a020b483ce9c12c2f19a952f5acc0a1851be4821d2393036ebbaea150810ad9ba78e9ef69ea  kmscube-9f63f359fab1b5d8e862508e4e51c9dfe339ccb0.tar.gz"
-- 
GitLab


From fb3a74be688c3df977f888c609dbad8c8c3b74c9 Mon Sep 17 00:00:00 2001
From: opal hart <opal@wowana.me>
Date: Wed, 21 Apr 2021 09:53:34 +0000
Subject: [PATCH 15/87] testing/i2pd: upgrade to 2.37.0

> Accidentally sent this to alpine-devel@ instead of here

Fucked up text wrapping as well, look at me go.

Sorry for the noise.
---
 testing/i2pd/APKBUILD | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/testing/i2pd/APKBUILD b/testing/i2pd/APKBUILD
index 7acbb340cbb4..3f67729912e2 100644
--- a/testing/i2pd/APKBUILD
+++ b/testing/i2pd/APKBUILD
@@ -1,8 +1,8 @@
 # Maintainer: l-n-s <supervillain@riseup.net>
 # Contributor: r4sas <r4sas@i2pmail.org>
 pkgname=i2pd
-pkgver=2.34.0
-pkgrel=2
+pkgver=2.37.0
+pkgrel=0
 pkgdesc="I2P Router written in C++"
 url="https://github.com/PurpleI2P/i2pd"
 arch="all"
@@ -49,6 +49,6 @@ package() {
 		"$pkgdir"/etc/conf.d/$pkgname
 }
 
-sha512sums="74c8234b850159c6e680fa61b20e2c22a0f04ca8397b4aa68f92fa20520fb74a63e442ac75c2fbb17dc1e5a193011b9b38085cee08746de4496620778aa7f027  i2pd-2.34.0.tar.gz
+sha512sums="2cf785941b58563a575511ad2ef8b94ec20bfed10f1a4a06e82603f85c9b9586cf10740fcee0d962cd94bf6059c3950f68f2a0b96b55f1c6de23a7d49014d3e6  i2pd-2.37.0.tar.gz
 5a95beef635fc2f5beecee314964fd41713ed61f92c4e972276208e0a2c86604c2b42a8e922863fc658a7a5789c9f43fddf7f76350fc281a44f2f42258a01201  i2pd.initd
 ba94e5505f4eeb9a32159aa0a3b7f68ff077abb9704800f70502ac75fd5bcfcb20450ebd983d0523beca2d13e718d7bf888f53ec455d1f41701c16d09c3b2d28  i2pd.confd"
-- 
GitLab


From 677adaf6c104233f0e96c9629b5dc6af0d7de637 Mon Sep 17 00:00:00 2001
From: Andy Postnikov <apostnikov@gmail.com>
Date: Tue, 20 Apr 2021 23:55:57 +0300
Subject: [PATCH 16/87] main/nginx: upgrade to 1.20.0 and njs to 0.5.3

---
 main/nginx/APKBUILD | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/main/nginx/APKBUILD b/main/nginx/APKBUILD
index 8d246884f504..80a6cd1aeb4f 100644
--- a/main/nginx/APKBUILD
+++ b/main/nginx/APKBUILD
@@ -20,11 +20,11 @@
 pkgname=nginx
 # NOTE: Upgrade only to even-numbered versions (e.g. 1.14.z, 1.16.z)!
 # Odd-numbered versions are mainline (development) versions.
-pkgver=1.18.0
-pkgrel=15
+pkgver=1.20.0
+pkgrel=0
 # Revision of nginx-tests to use for check().
-_tests_hgrev=4e0644119341
-_njs_ver=0.5.2
+_tests_hgrev=feb754918372
+_njs_ver=0.5.3
 pkgdesc="HTTP and reverse proxy server (stable version)"
 url="https://www.nginx.org/"
 arch="all"
@@ -424,9 +424,9 @@ getvar() {
 	eval "printf '%s\n' \"\${$1:-$2}\""
 }
 
-sha512sums="8c21eeb62ab6e32e436932500f700bd2fb99fd2d29e43c08a5bfed4714c189c29c7141db551fcd5d2437303b7439f71758f7407dfd3e801e704e45e7daa78ddb  nginx-1.18.0.tar.gz
-98718e5dd6f3478397f57bb0368a159993ece27b16ab3447b9b11739a49baf908ccb4619cdf03d4a1f62208ea75db18ff72aa308cb64900a23a0bbff41482dba  nginx-tests-4e0644119341.tar.gz
-2ca4212e5dc19b8d11c5c8f2b144acaf1e5604c156e355fbabf9b47bc1e562cb51212ea6083691b07767cbe5bd905ad546ded1779a8ad648a44ab8a8396d555b  nginx-njs-0.5.2.tar.gz
+sha512sums="06433bde23610ab27deeb6bf8c78148e4249b603d194c81e71a08fc159caead07ea659510286fb6d02668d53b9afcdaabdde8692480ae83de4a531adc1b930ca  nginx-1.20.0.tar.gz
+f396879582a7bc17e8823457d3b0ce390dc71a3dbfe0ae5ead7e7c832615f6ba07dce153a2e12dd29180520b37126c871693b8a7fb7c404469050e5070a12031  nginx-tests-feb754918372.tar.gz
+1509d05c43863377a44d0ab58a24152dee6e1e6777e6b2fe91708c56ccd3c491a534c68e4a1bc5d675c84119d17e7c705ef7a7f9c27094403814bf15a5575c32  nginx-njs-0.5.3.tar.gz
 fa96e91f495e9891c03730bcafd948e597e7c5d74f2d30df0a8483ae04f7b30c89065a994a0baa5245470f8991db5844b26da925b23ff26c178a384f5f1a887c  nginx-module-vts~01-938c19d.patch
 1c37e58921478325bb4dd608900588cda49d608e859127f45a1df73176b228b060bf71d9530dc1ad434a287c7a3225e8fe307fcf1bd15758f327436283db6fb9  nginx-module-vts~02-ad40022.patch
 9f9cda2f3f163654100adf9cde892b26f80d3de30ffec9fcdb0b3c1a42856f9219ebb024fd4c156fd8c4c4a6c7b17faca89e16916128da232d9f3bc825d716ff  nginx-module-vts~03-c08781c.patch
-- 
GitLab


From 073c07186a388b8c4313a6ac0342b59e76ae30e2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Micha=C5=82=20Pola=C5=84ski?= <michal@polanski.me>
Date: Wed, 21 Apr 2021 22:25:11 +0200
Subject: [PATCH 17/87] community/podman: upgrade to 3.1.2

---
 community/podman/APKBUILD | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/community/podman/APKBUILD b/community/podman/APKBUILD
index 07c3057d7f35..3df43f129994 100644
--- a/community/podman/APKBUILD
+++ b/community/podman/APKBUILD
@@ -1,7 +1,7 @@
 # Contributor: Michał Polański <michal@polanski.me>
 # Maintainer: Michał Polański <michal@polanski.me>
 pkgname=podman
-pkgver=3.1.1
+pkgver=3.1.2
 pkgrel=0
 pkgdesc="Simple management tool for pods, containers, and images"
 url="https://podman.io/"
@@ -106,6 +106,6 @@ docker_doc() {
 	done
 }
 
-sha512sums="2348b06c81352a86f51ac9c5ab7fe21e1ce577dfd0164c043baa2fb8a89928e3fdcc13fa75dd731572175ba4232fa27a2e31a3715a2b1596a38a64de919da1b7  podman-3.1.1.tar.gz
+sha512sums="fdc26368f3cce6a11fe9adeae34a2f04396a554bb5f245e07fc98d1ce21dff66faba5549e9e0b94793d67768ff03fea2990e7a2759dd41ed2b72778431f5dd9d  podman-3.1.2.tar.gz
 279e3587bf264607402c60130662d192924d2f90f2ebc7b1dc673fd119722ad07eac29658da137afa68af2c1f338680c33709866a8c677a79f87763c4dfca756  podman.initd
 77c71f3d07fa87da5b947287ef9a281eb1764b2682886a214333d910f95b1601d15c3dd0351bbb23ec38f96fc56c8d4196f44b73c01be05088829a02b925c4ca  podman.confd"
-- 
GitLab


From 0bcab3c622978d652dfa27dfb56440440a49eb5c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Milan=20P=2E=20Stani=C4=87?= <mps@arvanta.net>
Date: Wed, 21 Apr 2021 20:52:06 +0000
Subject: [PATCH 18/87] community/exfatprogs: upgrade to 1.1.1

---
 community/exfatprogs/APKBUILD | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/community/exfatprogs/APKBUILD b/community/exfatprogs/APKBUILD
index f23f0fe9c53c..f9310a7b184e 100644
--- a/community/exfatprogs/APKBUILD
+++ b/community/exfatprogs/APKBUILD
@@ -1,7 +1,7 @@
 # Contributor: Milan P. Stanić <mps@arvanta.net>
 # Maintainer: Milan P. Stanić <mps@arvanta.net>
 pkgname=exfatprogs
-pkgver=1.1.0
+pkgver=1.1.1
 pkgrel=0
 pkgdesc="exfat filesystem userspace tools, mkfs and fsck"
 url="https://github.com/exfatprogs/exfatprogs"
@@ -38,4 +38,4 @@ package() {
 	make DESTDIR="$pkgdir" install
 }
 
-sha512sums="98a226745dd2f32f52acac089ce4fc64e45cb6d43979ed0d87fdb97912d18cfcb29164e8367e5f2203adaa67b06ed5aa5a25a05552730a8019702e5d69d04407  exfatprogs-1.1.0.tar.gz"
+sha512sums="cd83b7907e99d42ca34d891b7a8cb68387f9138c39d9e0c0918c0ba8aed86f441d0fe9e0c5d8f9e5d64b901e83e63149099cb8d3285416f1977c18f5e0ffc8b8  exfatprogs-1.1.1.tar.gz"
-- 
GitLab


From 441f9f3a02b608f77f783aa101cc92a48ee80d6d Mon Sep 17 00:00:00 2001
From: Luca Weiss <luca@z3ntu.xyz>
Date: Wed, 21 Apr 2021 22:00:54 +0200
Subject: [PATCH 19/87] testing/ofono-phonesim: new aport

---
 testing/ofono-phonesim/APKBUILD | 39 +++++++++++++++++++++++++++++++++
 1 file changed, 39 insertions(+)
 create mode 100644 testing/ofono-phonesim/APKBUILD

diff --git a/testing/ofono-phonesim/APKBUILD b/testing/ofono-phonesim/APKBUILD
new file mode 100644
index 000000000000..dd87ecb875bc
--- /dev/null
+++ b/testing/ofono-phonesim/APKBUILD
@@ -0,0 +1,39 @@
+# Maintainer: Luca Weiss <luca@z3ntu.xyz>
+pkgname=ofono-phonesim
+pkgver=1.21_git20210125
+pkgrel=0
+_commit="a7c844d45b047b2dae5b0877816c346fce4c47b9"
+pkgdesc="Phone Simulator for modem testing"
+url="https://git.kernel.org/pub/scm/network/ofono/phonesim.git/"
+arch="all"
+license="GPL-2.0-or-later"
+makedepends="autoconf automake qt5-qtdeclarative-dev"
+source="https://git.kernel.org/pub/scm/network/ofono/phonesim.git/snapshot/phonesim-$_commit.tar.gz"
+builddir="$srcdir/phonesim-$_commit"
+options="!check" # No tests
+
+prepare() {
+	default_prepare
+
+	autoreconf -fi
+}
+
+build() {
+	./configure \
+		--build=$CBUILD \
+		--host=$CHOST \
+		--prefix=/usr \
+		--sysconfdir=/etc \
+		--mandir=/usr/share/man \
+		--localstatedir=/var
+	make
+}
+
+package() {
+	make DESTDIR="$pkgdir" install
+
+	mv -v "$pkgdir"/usr/bin/phonesim "$pkgdir"/usr/bin/ofono-phonesim
+	mv -v "$pkgdir"/usr/share/phonesim "$pkgdir"/usr/share/ofono-phonesim
+}
+
+sha512sums="25a4e2fbcfe72573bae21d8d98bbac4b95a2963aead386fc0663912fcd0d988dcb531d583c2c96359467e06763cc2210819ce13a9564725311cc842cb19c3e7b  phonesim-a7c844d45b047b2dae5b0877816c346fce4c47b9.tar.gz"
-- 
GitLab


From fe10fe147a4b24e0a39d477cfb4fd53850d6e3e5 Mon Sep 17 00:00:00 2001
From: J0WI <J0WI@users.noreply.github.com>
Date: Thu, 22 Apr 2021 01:11:13 +0200
Subject: [PATCH 20/87] main/botan: update secfixes

---
 main/botan/APKBUILD | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/main/botan/APKBUILD b/main/botan/APKBUILD
index bb33627fc345..deb13b99f94a 100644
--- a/main/botan/APKBUILD
+++ b/main/botan/APKBUILD
@@ -14,6 +14,8 @@ source="https://botan.randombit.net/releases/Botan-$pkgver.tar.xz"
 builddir="$srcdir/Botan-$pkgver"
 
 # secfixes:
+#   2.17.3-r0:
+#     - CVE-2021-24115
 #   2.9.0-r0:
 #     - CVE-2018-20187
 #   2.7.0-r0:
-- 
GitLab


From 8643d3ede505b44b2eae18ff9e262dde9da2daec Mon Sep 17 00:00:00 2001
From: J0WI <J0WI@users.noreply.github.com>
Date: Thu, 22 Apr 2021 01:15:21 +0200
Subject: [PATCH 21/87] main/protobuf-c: add secfixes

---
 main/protobuf-c/APKBUILD | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/main/protobuf-c/APKBUILD b/main/protobuf-c/APKBUILD
index 6b8e71600f2e..367e16c2ff3b 100644
--- a/main/protobuf-c/APKBUILD
+++ b/main/protobuf-c/APKBUILD
@@ -12,6 +12,10 @@ makedepends="protobuf-dev"
 subpackages="$pkgname-compiler $pkgname-dev"
 source="https://github.com/protobuf-c/protobuf-c/releases/download/v$pkgver/protobuf-c-$pkgver.tar.gz"
 
+# secfixes:
+#   1.3.2-r0:
+#     - CVE-2021-3121
+
 build() {
 	./configure --prefix=/usr \
 		--sysconfdir=/etc \
-- 
GitLab


From be4d41a4e8f37e6c8f423ad9c66e5f5005714cd6 Mon Sep 17 00:00:00 2001
From: Andy Postnikov <apostnikov@gmail.com>
Date: Thu, 22 Apr 2021 04:25:16 +0300
Subject: [PATCH 22/87] community/php7-phalcon: upgrade to 4.1.1

---
 community/php7-phalcon/APKBUILD | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

diff --git a/community/php7-phalcon/APKBUILD b/community/php7-phalcon/APKBUILD
index 3b7f9b4b59ac..67bbd89b793f 100644
--- a/community/php7-phalcon/APKBUILD
+++ b/community/php7-phalcon/APKBUILD
@@ -3,10 +3,10 @@
 pkgname=php7-phalcon
 _pkgext=phalcon
 _pkgreal=cphalcon
-pkgver=4.1.0
+pkgver=4.1.1
 _pkgver=${pkgver/_rc/RC}
 pkgrel=0
-pkgdesc="High performance, full-stack PHP framework delivered as a C extension"
+pkgdesc="High performance, full-stack PHP 7 framework delivered as a C extension"
 url="https://phalcon.io/"
 arch="all"
 license="BSD-3-Clause"
@@ -34,10 +34,11 @@ check() {
 }
 
 package() {
-	make INSTALL_ROOT="$pkgdir/" install
+	make INSTALL_ROOT="$pkgdir" install
 	rm -fr "$pkgdir/usr/include"
-	install -d "$pkgdir"/etc/php7/conf.d
-	echo "extension=$_pkgext.so" > "$pkgdir"/etc/php7/conf.d/$_pkgext.ini
+	local _confdir="$pkgdir"/etc/php7/conf.d
+	install -d $_confdir
+	echo "extension=$_pkgext" > $_confdir/$_pkgext.ini
 }
 
-sha512sums="2e4f8b1502a0c2f850a0e24f4981859cecc7dd262a517510be02c04b6d6b8ef082e574063706db75837762bda8fdc3f5aee9a6a06ad742c8f72f9eb30dc7f1c2  php7-phalcon-4.1.0.tar.gz"
+sha512sums="9eac73a633d0b3fe606dfa9e4209f1a529937260c4441d795fa5e46f50c937e0993d2c0f82755fc8866704482bd74aab00d5f765fa16f5785c504d5fc1482828  php7-phalcon-4.1.1.tar.gz"
-- 
GitLab


From a5806433b881482f85793a254ddc0a30f29219fc Mon Sep 17 00:00:00 2001
From: Kevin Daudt <kdaudt@alpinelinux.org>
Date: Thu, 22 Apr 2021 05:40:10 +0000
Subject: [PATCH 23/87] community/ipython: upgrade to 7.22.0

---
 community/ipython/APKBUILD | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/community/ipython/APKBUILD b/community/ipython/APKBUILD
index bb142e32f6a7..b030f4f4de80 100644
--- a/community/ipython/APKBUILD
+++ b/community/ipython/APKBUILD
@@ -1,8 +1,8 @@
 # Contributor: Kevin Daudt <kdaudt@alpinelinux.org>
 # Maintainer: Kevin Daudt <kdaudt@alpinelinux.org>
 pkgname=ipython
-pkgver=7.21.0
-pkgrel=1
+pkgver=7.22.0
+pkgrel=0
 pkgdesc="A rich toolkit to help you make the most of using Python interactively"
 options="!check" # Too many tests fail
 url="https://ipython.org/"
@@ -45,4 +45,4 @@ package() {
 	python3 setup.py install --prefix=/usr --root="$pkgdir"
 }
 
-sha512sums="ccb30071f35b9e6b2c91b7c67cbaf41d4dcb1c0207a6a4e000427f735f1f1fcfcff0228fb40b72518d4267357f6e78d5f3f01d1e0a2a1e76cc984daef34cb524  ipython-7.21.0.tar.gz"
+sha512sums="0c6922e299b5abcb3b32d40cbb1a1660f3a0d662a4dc1bcaee7e8875c2a89a7d6942341dbeabbae72a3479cae2a198d4ccd16f7c0ba6bc1475479f3d9ed62a32  ipython-7.22.0.tar.gz"
-- 
GitLab


From c624c4ef16bec9c2f4f081db58a11fe65ca016f6 Mon Sep 17 00:00:00 2001
From: Ariadne Conill <ariadne@dereferenced.org>
Date: Thu, 22 Apr 2021 01:52:02 -0600
Subject: [PATCH 24/87] main/ifupdown-ng: upgrade to 0.11.2

---
 main/ifupdown-ng/APKBUILD | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/main/ifupdown-ng/APKBUILD b/main/ifupdown-ng/APKBUILD
index 57a6f58f9d51..faefe4a3bad1 100644
--- a/main/ifupdown-ng/APKBUILD
+++ b/main/ifupdown-ng/APKBUILD
@@ -1,6 +1,6 @@
 # Maintainer: Ariadne Conill <ariadne@dereferenced.org>
 pkgname=ifupdown-ng
-pkgver=0.11.1
+pkgver=0.11.2
 pkgrel=0
 pkgdesc="tools for managing network configuration"
 url="https://github.com/ifupdown-ng/ifupdown-ng"
@@ -105,4 +105,4 @@ openrc() {
 	install -D -m644 "$builddir"/dist/openrc/networking.confd "$subpkgdir"/etc/conf.d/networking
 }
 
-sha512sums="a937ccd5f081c94a32f0bc226d078a0fec6f4589c3c75e1fab07c5655b9e7b56b161d8af6125174e360315baddf34f95b5d35e592ecd7ece064d93c8d048ec8d  ifupdown-ng-0.11.1.tar.xz"
+sha512sums="31009bfe07b45dac49b492f8150526f13a59c164e9f71304b73a7faa4fb154ae22dbdcf5d6d7b8fde6022414522ffc15fd49289ff3bab17c63e2398ac5a985dc  ifupdown-ng-0.11.2.tar.xz"
-- 
GitLab


From 03d6a7b0d416aac8af9cd362256e6318ebb88c8f Mon Sep 17 00:00:00 2001
From: Simon Frankenberger <simon-alpine@fraho.eu>
Date: Wed, 21 Apr 2021 20:18:36 +0200
Subject: [PATCH 25/87] community/openjdk15: upgrade to 15.0.3

---
 testing/openjdk15/APKBUILD | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/testing/openjdk15/APKBUILD b/testing/openjdk15/APKBUILD
index 72f4cdee2e85..379b47c84603 100644
--- a/testing/openjdk15/APKBUILD
+++ b/testing/openjdk15/APKBUILD
@@ -1,12 +1,12 @@
 # Contributor: Simon Frankenberger <simon-alpine@fraho.eu>
 # Maintainer: Simon Frankenberger <simon-alpine@fraho.eu>
 pkgname=openjdk15
-pkgver=15.0.2_p7
+pkgver=15.0.3_p3
 _pkgver=${pkgver%_p*}-ga
-pkgrel=1
+pkgrel=0
 pkgdesc="Oracle OpenJDK 15"
 provider_priority=15
-url="https://hg.openjdk.java.net/jdk-updates/jdk15u"
+url="https://github.com/openjdk/jdk15u"
 arch="all !x86 !armhf !armv7 !mips !mips64" # oracle dropped support for 32 bit
 license="GPL-2.0-with-classpath-exception"
 makedepends="autoconf
@@ -128,7 +128,7 @@ build() {
 		--with-debug-level=release \
 		--with-version-pre= \
 		--with-version-opt="alpine-r$pkgrel" \
-		--with-version-build="${pkgver##*_p}" \
+		--with-version-build="${pkgver#*p}" \
 		--with-vendor-name="Alpine" \
 		--with-vendor-url="https://alpinelinux.org/" \
 		--with-vendor-bug-url="https://gitlab.alpinelinux.org/alpine/aports/issues" \
@@ -287,7 +287,7 @@ _jdk() {
 	mv "$_fromroot/include" "$_toroot"
 }
 
-sha512sums="b8da5518ace3737beea1e2a147357ee370641940a3c0a7504b0766e4c6c7626c790c4977f9bd9f330948120943c0f56b08570ce4997ee2b3461e67ad9b5eec7b  jdk-15.0.2-ga.tar.gz
+sha512sums="c925ed48303a4b30504f3781c6aa55ac4f449310f09acc97c3282a18029175f839b1ad53f96b739c03a67087c9f55b97a78ddb90142c3f8489d38d0b7451e34b  jdk-15.0.3-ga.tar.gz
 e6283c667558e1fd6e49fa96e52af0e415a3c8037afe1d28b7ff1ec4c2ef8f49beb70a9327b7fc77eb4052a58c4ccad8b5260ec90e4bceeac7a46ff59c4369d7  gtest-1.8.1.tar.gz
 83bc3c035add014048cafb651eef342d7412f18111ed39dea2e9e154430e57be90ec36c33ba01f618d525e4331a07c32f51bd694469a9e18a0234879e29c7d60  build.patch
 af79b52faf6fbd7391cf8d6442a1883bb0c3b733d8302096c9faeba36f160aaf7b071f5f16ad18332136ea8a6f474fdc0db7305ef9269fa6873346e2f4c08767  aarch64.patch
-- 
GitLab


From 9529bd6d8d9037e0aaea4aeed0e75c11bcc6508f Mon Sep 17 00:00:00 2001
From: Clayton Craft <clayton@craftyguy.net>
Date: Wed, 21 Apr 2021 23:53:46 -0700
Subject: [PATCH 26/87] community/modemmanager: upgrade to 1.16.4

---
 community/modemmanager/APKBUILD | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/community/modemmanager/APKBUILD b/community/modemmanager/APKBUILD
index 6d3060ea198b..3bfdeb7d8b23 100644
--- a/community/modemmanager/APKBUILD
+++ b/community/modemmanager/APKBUILD
@@ -1,8 +1,8 @@
 # Contributor: Stuart Cardall <developer@it-offshore.co.uk>
 # Maintainer: Stuart Cardall <developer@it-offshore.co.uk>
 pkgname=modemmanager
-pkgver=1.16.2
-pkgrel=4
+pkgver=1.16.4
+pkgrel=0
 pkgdesc="ModemManager library"
 url="http://www.freedesktop.org/wiki/Software/ModemManager"
 arch="all !mips !mips64 !s390x" # polkit
@@ -77,6 +77,6 @@ check() {
 	make check
 }
 
-sha512sums="c0b095972eba6e0f3a1ad22e425b412f17d8b60f0af4d423a92fdebcb6d2801f87e6af98758f8c2dc4db3586a3a15530a318805fda312443fa6abe2265ebd6b6  ModemManager-1.16.2.tar.xz
+sha512sums="5fb7625c9d41ce0179b4e59745b00b815038239552a5438d71ff36b019b398fc3dc6bef709e91a186f5f7427fcb59d79c0b1c3ca9c3dca867f0d5677fd979506  ModemManager-1.16.4.tar.xz
 6fab86c27502b29be0c6610d835a3249a4a81993eb986cff2c3ea9393fadd3f693ba4bb0532ae0e50a83d359559511859dd05f7ea2f0cb52839f535a7e49f8a0  modemmanager.rules
 9f74a2473b9cc7be42a467809639f5720ab251d13f29f8bbd4fd9a13edb80c10c5ee50fbe50819bfe67f231805b92f007c3e7403c46ab998dc843e1f9549659b  modemmanager.initd"
-- 
GitLab


From f8cb33a4d805dbde2449ba15194005ab257c2bb6 Mon Sep 17 00:00:00 2001
From: Simon Frankenberger <simon-alpine@fraho.eu>
Date: Thu, 22 Apr 2021 07:53:45 +0200
Subject: [PATCH 27/87] main/nagios-plugins: fix use-after-free in
 check_mysql_query

---
 main/nagios-plugins/APKBUILD                  |  4 ++-
 ...check_mysql_query-fix-use-after-free.patch | 33 +++++++++++++++++++
 2 files changed, 36 insertions(+), 1 deletion(-)
 create mode 100644 main/nagios-plugins/check_mysql_query-fix-use-after-free.patch

diff --git a/main/nagios-plugins/APKBUILD b/main/nagios-plugins/APKBUILD
index 98844f262a6c..eccb7ef7d473 100644
--- a/main/nagios-plugins/APKBUILD
+++ b/main/nagios-plugins/APKBUILD
@@ -4,7 +4,7 @@
 # Maintainer: Jeff Bilyk <jbilyk@gmail.com>
 pkgname=nagios-plugins
 pkgver=2.3.2
-pkgrel=1
+pkgrel=2
 pkgdesc="Plugins for Nagios to check services on hosts"
 url="https://nagios-plugins.org"
 arch="all"
@@ -29,6 +29,7 @@ pkggroups="nagios"
 options="suid"
 source="https://www.nagios-plugins.org/download/nagios-plugins-$pkgver.tar.gz
 	fix-compilation-warnings-about-sys-poll.patch
+	check_mysql_query-fix-use-after-free.patch
 	check_openrc
 	nagios-openrc.sudoers"
 
@@ -151,5 +152,6 @@ _all() {
 
 sha512sums="c73e13800ad408f9b345fbfc2142ae2275b77e4865ecdb9be33a86024c10be1e54e401450c3f7c848e96bd1152c723426477a1f2874e3bf5dd149f07391b1dd9  nagios-plugins-2.3.2.tar.gz
 7a62e4808eb8b07ca43bc17a625f4199708da6c52b79eca7a756817cb734648fc3054cd89862638ae925022017db32479d2cfcfddeba79ab4557d7b9ec97c323  fix-compilation-warnings-about-sys-poll.patch
+0daff387c80d2132ec16b3d161e5fffe9e2cae1d3e08fc1c4e65b2bfdf4685c42fb129e4df92b08a17f250018f57eac39b2c8ff299ae378d4442681a88e39f9e  check_mysql_query-fix-use-after-free.patch
 12d87542631494df1c961e547c19107a025829509e174e8208111736141c12e20dbf490c55d487af39d47cefca5507cd98c973b7b20ae3f961dcbfd167195d8e  check_openrc
 171c9ad14d1027541b78df76063e6d34483dd536219fb83e0346e191739529d59c8d6be468af7f1c4c93b20baf9a32879510f15ec3d06aa1eefaf5d785ea8546  nagios-openrc.sudoers"
diff --git a/main/nagios-plugins/check_mysql_query-fix-use-after-free.patch b/main/nagios-plugins/check_mysql_query-fix-use-after-free.patch
new file mode 100644
index 000000000000..0f9a2784a581
--- /dev/null
+++ b/main/nagios-plugins/check_mysql_query-fix-use-after-free.patch
@@ -0,0 +1,33 @@
+From: simon-alpine@fraho.eu
+Subject: mysql_check_query crashes on alpine 3.13 after accessing free'd data
+Upstream: reported
+
+see https://gitlab.alpinelinux.org/alpine/aports/-/issues/12601
+and https://github.com/nagios-plugins/nagios-plugins/issues/602
+
+--- a/plugins/check_mysql_query.c
++++ b/plugins/check_mysql_query.c
+@@ -143,17 +143,17 @@
+ 		die (STATE_CRITICAL, "QUERY %s: Fetch row error - %s\n", _("CRITICAL"), error);
+ 	}
+ 
+-	/* free the result */
+-	mysql_free_result (res);
+-
+-	/* close the connection */
+-	mysql_close (&mysql);
+-
+ 	if (! is_numeric(row[0])) {
+ 		die (STATE_CRITICAL, "QUERY %s: %s - '%s'\n", _("CRITICAL"), _("Is not a numeric"), row[0]);
+ 	}
+ 
+ 	value = strtod(row[0], NULL);
++
++	/* free the result */
++	mysql_free_result (res);
++
++	/* close the connection */
++	mysql_close (&mysql);
+ 
+ 	if (verbose >= 3)
+ 		printf("mysql result: %f\n", value);
-- 
GitLab


From 7fca07d1ad7e4c9bb75651818e055c9d74b105f3 Mon Sep 17 00:00:00 2001
From: J0WI <J0WI@users.noreply.github.com>
Date: Thu, 22 Apr 2021 01:51:49 +0200
Subject: [PATCH 28/87] main/sqlite: update secfixes

---
 main/sqlite/APKBUILD | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/main/sqlite/APKBUILD b/main/sqlite/APKBUILD
index ae5eed3db43a..cd62dd78c610 100644
--- a/main/sqlite/APKBUILD
+++ b/main/sqlite/APKBUILD
@@ -33,6 +33,8 @@ source="https://www.sqlite.org/2021/sqlite-autoconf-$_ver.tar.gz
 	"
 
 # secfixes:
+#   3.34.1-r0:
+#     - CVE-2021-20227
 #   3.32.1-r0:
 #     - CVE-2020-13434
 #     - CVE-2020-13435
-- 
GitLab


From 20ecfcabefa000a06a23c528b97bf0561a9b5465 Mon Sep 17 00:00:00 2001
From: J0WI <J0WI@users.noreply.github.com>
Date: Thu, 22 Apr 2021 01:26:30 +0200
Subject: [PATCH 29/87] main/privoxy: add secfixes

---
 main/privoxy/APKBUILD | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/main/privoxy/APKBUILD b/main/privoxy/APKBUILD
index 492143717968..f517834c9959 100644
--- a/main/privoxy/APKBUILD
+++ b/main/privoxy/APKBUILD
@@ -26,6 +26,16 @@ builddir="$srcdir/$pkgname-$pkgver-stable"
 #     - CVE-2021-20274
 #     - CVE-2021-20275
 #     - CVE-2021-20276
+#   3.0.31-r0:
+#     - CVE-2021-20216
+#     - CVE-2021-20217
+#   3.0.29-r0:
+#     - CVE-2021-20210
+#     - CVE-2021-20211
+#     - CVE-2021-20212
+#     - CVE-2021-20213
+#     - CVE-2021-20214
+#     - CVE-2021-20215
 
 prepare() {
 	update_config_sub
-- 
GitLab


From 7f01571c12a04ef1c8d12fe926fd50be73dc2d6e Mon Sep 17 00:00:00 2001
From: Bart Ribbers <bribbers@disroot.org>
Date: Thu, 22 Apr 2021 10:39:42 +0200
Subject: [PATCH 30/87] testing/glacier-home: add missing dep on mce

---
 testing/glacier-home/APKBUILD | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/testing/glacier-home/APKBUILD b/testing/glacier-home/APKBUILD
index 93c6c65f5010..6986c9cf979f 100644
--- a/testing/glacier-home/APKBUILD
+++ b/testing/glacier-home/APKBUILD
@@ -2,7 +2,7 @@
 # Maintainer: Bart Ribbers <bribbers@disroot.org>
 pkgname=glacier-home
 pkgver=0.27.8_git20210325
-pkgrel=0
+pkgrel=1
 _commit="656c70d9b6018f66ebf9d56ca8d3c10cf3187ca2"
 pkgdesc="The Glacier homescreen"
 url="https://github.com/nemomobile-ux/glacier-home"
@@ -12,6 +12,7 @@ license="BSD-3-Clause AND MIT"
 depends="
 	connman
 	libqofonoext
+	mce
 	nemo-qml-plugin-configuration
 	nemo-qml-plugin-connectivity
 	nemo-qml-plugin-contacts
@@ -28,7 +29,7 @@ depends="
 makedepends="
 	bluez-qt-dev
 	extra-cmake-modules
-	lipstick
+	lipstick-dev
 	nemo-qml-plugin-devicelock-dev
 	qt5-qtbase-dev
 	qt5-qtdeclarative-dev
-- 
GitLab


From bfa05ea59c674e6a620c4db6da446ed2e9781a2d Mon Sep 17 00:00:00 2001
From: Leo <thinkabit.ukim@gmail.com>
Date: Thu, 22 Apr 2021 00:47:20 -0300
Subject: [PATCH 31/87] main/mesa: upgrade to 21.0.3

---
 main/mesa/APKBUILD | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/main/mesa/APKBUILD b/main/mesa/APKBUILD
index 1705b1013f19..5b1231dbe1b6 100644
--- a/main/mesa/APKBUILD
+++ b/main/mesa/APKBUILD
@@ -1,6 +1,6 @@
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=mesa
-pkgver=21.0.2
+pkgver=21.0.3
 pkgrel=0
 pkgdesc="Mesa DRI OpenGL library"
 url="https://www.mesa3d.org"
@@ -323,7 +323,7 @@ _vulkan_layer() {
 	mv "$pkgdir"/usr/bin/mesa-overlay-control.py "$subpkgdir"/usr/bin
 }
 
-sha512sums="c3d7969b56e1c31ee642e3b7143d565c4233173dab7cc5576b686c873c27134dc8292a9f2caa0a0dd3c54d0c89d27d6030f36a2c84f85dcedee7ae80b19e5c3b  mesa-21.0.2.tar.xz
+sha512sums="4a8aee48a8ea7f32e8aa3bbbd91db26c6053b9a43e62ff88256929e6bc147884f0fef988726b5a3d59d7008663f017c746a0352fd3fcc1c476b8190af4a2531f  mesa-21.0.3.tar.xz
 adb6ccac89bc5a382689db615184b7b36a267001e8e27f951e68020e45edd318fc278408c9eae922a74db3df3d98d52f13119d4e3691be38bd05e6a57348103e  adjust-cache-deflate-buffer.patch
 77b40d3b70a78e1f261f0a0358f3b5f15d5f0a6d51ba317e38053f426a14487a459743df2e4734e9c086f1f083572e78279eb8a5dde191ef0c2914594513194b  musl-fix-includes.patch
 bebf9f725d49da3de665b69e2ddf4b3006000f59afa47f4a2a3c1d1c552d86bbfcb88e92532172c2f898c3a416b4b1735b6ae7deeb2578660141437f74112784  add-use-elf-tls.patch
-- 
GitLab


From e55d536a979fc5da87f378a2bf2336ea0951fc8d Mon Sep 17 00:00:00 2001
From: Bart Ribbers <bribbers@disroot.org>
Date: Thu, 22 Apr 2021 11:00:11 +0200
Subject: [PATCH 32/87] community/profiled: add XDG autostart desktop file

Also remove a systemd leftover while we're at it
---
 community/profiled/APKBUILD         | 12 +++++++++---
 community/profiled/profiled.desktop |  7 +++++++
 2 files changed, 16 insertions(+), 3 deletions(-)
 create mode 100644 community/profiled/profiled.desktop

diff --git a/community/profiled/APKBUILD b/community/profiled/APKBUILD
index 1fcdf310b807..65664f2f307a 100644
--- a/community/profiled/APKBUILD
+++ b/community/profiled/APKBUILD
@@ -2,7 +2,7 @@
 # Maintainer: Bart Ribbers <bribbers@disroot.org>
 pkgname=profiled
 pkgver=1.0.12
-pkgrel=0
+pkgrel=1
 _commit_dbus_glib="d42176ae4763e5288ef37ea314fe58387faf2005"
 pkgdesc="Gets default set of settings from profile data packages that are installed on the device"
 url="https://git.sailfishos.org/mer-core/profiled"
@@ -10,13 +10,13 @@ arch="all"
 license="BSD-2-Clause"
 makedepends="
 	dbus-dev
-	dbus-glib-dev
 	doxygen
 	glib-dev
 	"
 subpackages="$pkgname-static $pkgname-dev $pkgname-doc"
 source="https://git.sailfishos.org/mer-core/profiled/-/archive/$pkgver/profiled-$pkgver.tar.gz
 	https://github.com/sailfishos-mirror/dbus-glib/archive/$_commit_dbus_glib/dbus-glib-$_commit_dbus_glib.tar.gz
+	profiled.desktop
 	"
 
 prepare() {
@@ -32,7 +32,13 @@ build() {
 
 package() {
 	ROOT="$pkgdir" make install
+
+	install -Dm644 "$srcdir"/profiled.desktop -t "$pkgdir"/etc/xdg/autostart/
+
+	# We don't have systemd
+	rm -r "$pkgdir"/usr/lib/systemd
 }
 
 sha512sums="d4996694c02a2783ea2e42d6a43d7b474918b8ee3f76fd83e6ca3981cb747473149206fd49928e0ac575c2f64aac34b2fd5e170175be261e07203859f8108247  profiled-1.0.12.tar.gz
-665cd6395ee0ea14086ba30188c62a72697b3f63484681e18fc7f54109c9aca162f2e33aa2fa4d45287c6c0b590e81ca310c143dac0232cd5887692cdaf51256  dbus-glib-d42176ae4763e5288ef37ea314fe58387faf2005.tar.gz"
+665cd6395ee0ea14086ba30188c62a72697b3f63484681e18fc7f54109c9aca162f2e33aa2fa4d45287c6c0b590e81ca310c143dac0232cd5887692cdaf51256  dbus-glib-d42176ae4763e5288ef37ea314fe58387faf2005.tar.gz
+c19c3c00aace7bc0b2be3759e9db24a672d1dcf0441868f8a4519e8f60db243e682974f432b20ecce7ed98cb55e5df430d9d70cf0ffe21ee9b079280df37a6d2  profiled.desktop"
diff --git a/community/profiled/profiled.desktop b/community/profiled/profiled.desktop
new file mode 100644
index 000000000000..8b8cc889abc7
--- /dev/null
+++ b/community/profiled/profiled.desktop
@@ -0,0 +1,7 @@
+[Desktop Entry]
+Name=profiled
+Comment=Start profiled
+Type=Application
+Exec=/usr/bin/profiled
+TryExec=/usr/bin/profiled
+Terminal=false
-- 
GitLab


From 458f2bb9ba3708125d3377278795f59ed604bb5c Mon Sep 17 00:00:00 2001
From: Bart Ribbers <bribbers@disroot.org>
Date: Thu, 22 Apr 2021 11:20:13 +0200
Subject: [PATCH 33/87] testing/glacier-home: add missing dep on usb-moded

---
 testing/glacier-home/APKBUILD | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/testing/glacier-home/APKBUILD b/testing/glacier-home/APKBUILD
index 6986c9cf979f..36ac0ee1deb1 100644
--- a/testing/glacier-home/APKBUILD
+++ b/testing/glacier-home/APKBUILD
@@ -2,7 +2,7 @@
 # Maintainer: Bart Ribbers <bribbers@disroot.org>
 pkgname=glacier-home
 pkgver=0.27.8_git20210325
-pkgrel=1
+pkgrel=2
 _commit="656c70d9b6018f66ebf9d56ca8d3c10cf3187ca2"
 pkgdesc="The Glacier homescreen"
 url="https://github.com/nemomobile-ux/glacier-home"
@@ -25,6 +25,7 @@ depends="
 	qt5-qtmultimedia
 	qtmpris
 	qtquickcontrols-nemo
+	usb-moded
 	"
 makedepends="
 	bluez-qt-dev
-- 
GitLab


From 840d196623447417e0d00c907cd68426a029cd79 Mon Sep 17 00:00:00 2001
From: rahmanshaber <rahmanshaber@yahoo.com>
Date: Wed, 21 Apr 2021 22:05:09 -0400
Subject: [PATCH 34/87] testing/paperde: new aport

---
 testing/paperde/APKBUILD | 31 +++++++++++++++++++++++++++++++
 1 file changed, 31 insertions(+)
 create mode 100644 testing/paperde/APKBUILD

diff --git a/testing/paperde/APKBUILD b/testing/paperde/APKBUILD
new file mode 100644
index 000000000000..b52c8b18372a
--- /dev/null
+++ b/testing/paperde/APKBUILD
@@ -0,0 +1,31 @@
+# Contributor: rahmanshaber <rahmanshaber@yahoo.com>
+# Maintainer: rahmanshaber <rahmanshaber@yahoo.com>
+pkgname=paperde
+pkgver=0.1.1
+pkgrel=0
+pkgdesc="A minimalistic Desktop Environment built on top of Qt/Wayland and Wayfire."
+arch="all !s390x !mips64" # polkit
+url="https://gitlab.com/cubocore"
+license="GPL-3.0-or-later"
+depends="qt5-qtbase-dev libcprime-dev libcsys-dev wayfire wayland-protocols libdbusmenu-qt-dev qt5-qttools-dev qt5-qtsvg-dev qt5-qtwayland-dev upower-dev xdg-desktop-portal cmake ninja"
+makedepends="qt5-qtbase-dev extra-cmake-modules"
+source="https://gitlab.com/cubocore/paper/paperde/-/archive/v$pkgver/paperde-v$pkgver.tar.gz"
+builddir="$srcdir/$pkgname-v$pkgver"
+options="!check" # No test suite
+
+build() {
+	cmake -B build \
+		-GNinja \
+		-DCMAKE_INSTALL_PREFIX=/usr \
+		-DCMAKE_INSTALL_LIBDIR=lib \
+		-DPKGSHAREDPATH=share/paperde \
+		-DCMAKE_BUILD_TYPE=None
+	cmake --build build
+}
+
+
+package() {
+	DESTDIR="$pkgdir" cmake --install build
+}
+
+sha512sums="45b1fcd8bc03ae34be7560fe8f369d1bde98da764870298a6f31b8465fd0fc24ace556bf7fadeab756dc4d86115aefc7c8d22eb84602472eeb2c60dc1539b85c  paperde-v0.1.1.tar.gz"
-- 
GitLab


From 0b8e731e6dfbeaff42e2c92abc304b37f17630b8 Mon Sep 17 00:00:00 2001
From: Bart Ribbers <bribbers@disroot.org>
Date: Thu, 22 Apr 2021 12:27:01 +0200
Subject: [PATCH 35/87] community/kdevelop: re-enable on armv7
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

QWE is available again 🎉
---
 community/kdevelop/APKBUILD | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/community/kdevelop/APKBUILD b/community/kdevelop/APKBUILD
index b6571950d35a..39221f71c8de 100644
--- a/community/kdevelop/APKBUILD
+++ b/community/kdevelop/APKBUILD
@@ -4,8 +4,8 @@ pkgname=kdevelop
 pkgver=5.6.2
 pkgrel=2
 # armhf blocked by extra-cmake-modules
-# ppc64le, s390x, mips64, armv7 blocked by qt5-qtwebengine
-arch="all !armhf !ppc64le !s390x !mips64 !armv7"
+# ppc64le, s390x, and mips64 blocked by qt5-qtwebengine
+arch="all !armhf !ppc64le !s390x !mips64"
 url="https://www.kdevelop.org/"
 pkgdesc="A featureful, plugin-extensible IDE for C/C++ and other programming languages"
 license="GPL-2.0-or-later AND LGPL-2.0-or-later AND GFDL-1.2-only"
-- 
GitLab


From 4b0ccc2324ee84a4005f4f72e0b7fa1366ee26a9 Mon Sep 17 00:00:00 2001
From: Natanael Copa <ncopa@alpinelinux.org>
Date: Thu, 22 Apr 2021 06:07:00 +0000
Subject: [PATCH 36/87] main/iaxmodem: fix a use-after-free and enable -dbg

---
 main/iaxmodem/APKBUILD                 |  6 ++-
 main/iaxmodem/fix-use-after-free.patch | 51 ++++++++++++++++++++++++++
 2 files changed, 55 insertions(+), 2 deletions(-)
 create mode 100644 main/iaxmodem/fix-use-after-free.patch

diff --git a/main/iaxmodem/APKBUILD b/main/iaxmodem/APKBUILD
index 545fee0a091d..7f31b3f17d7c 100644
--- a/main/iaxmodem/APKBUILD
+++ b/main/iaxmodem/APKBUILD
@@ -3,7 +3,7 @@
 # Maintainer: Cameron Banta <cbanta@gmail.com>
 pkgname=iaxmodem
 pkgver=1.3.2
-pkgrel=0
+pkgrel=1
 pkgdesc="Softmodem for hylafax that connects to VOIP gateway with IAX"
 url="http://iaxmodem.sourceforge.net/"
 arch="all"
@@ -12,9 +12,10 @@ depends=""
 depends_dev=""
 makedepends="$depends_dev tiff-dev"
 install=""
-subpackages="$pkgname-doc"
+subpackages="$pkgname-dbg $pkgname-doc"
 source="https://downloads.sourceforge.net/$pkgname/$pkgname-$pkgver.tar.gz
 	iaxmodem-fix.patch
+	fix-use-after-free.patch
 	config.guess
 	config.sub
 	$pkgname.confd
@@ -73,6 +74,7 @@ package() {
 
 sha512sums="ec53be179c5651825dc4e0883d8bdd33662e477b964e3130c94ca46c6d9b628a1087d33f87bebe005e306b52d75cd00407958403d9d175944fba0f5d69d34269  iaxmodem-1.3.2.tar.gz
 999ba9d554ffa8ecb00b4e18b2e25d0c077a64560985ffc035fe89dedf7ff9686c347aba16a0bc05ad9a4d11e17b9ddad3b99772b2b61e1fcaea00c63bcbb897  iaxmodem-fix.patch
+9ed5fecaaa86fb0808ea088a7ee6f0b07442f1120d7139b85227322fbfc8afa4622565dc88f36a3d3961ebf080d76336ecebef3fc6a486e62c8f6bc2aac60b6b  fix-use-after-free.patch
 ec32c1c81a460033d1b419292f408974409d08cfc754af92ca5af303cc848fc5dc3a019028c6724346e96ab5d600519862fd9a2c3f01ae6cf7139ff377de4b80  config.guess
 fb999aada492f963fdf86184629a7351e5ff3adac6f4707a2d150ae18cea02478b4ebcb1d2d0bd11698ed74415d2a73bc07d8c0d96a5035bd567d2738fa73128  config.sub
 c5b01eecd8048a99777c0265bc31cd8dcafa7ab2b30798500ec52e759f4ad97ffc13e8e72ad3018e9cd77b2acefdbbe7125b0b0d7f7cefd4ab6d764c690c89a1  iaxmodem.confd
diff --git a/main/iaxmodem/fix-use-after-free.patch b/main/iaxmodem/fix-use-after-free.patch
new file mode 100644
index 000000000000..df1b0b2ce758
--- /dev/null
+++ b/main/iaxmodem/fix-use-after-free.patch
@@ -0,0 +1,51 @@
+make sure that we set the session to NULL when free'ing it
+
+diff --git a/iaxmodem.c b/iaxmodem.c
+index e1ab731..3c80c29 100644
+--- a/iaxmodem.c
++++ b/iaxmodem.c
+@@ -213,8 +213,8 @@ cleanup(int sig)
+ 	iax_unregister(session[1], server, regpeer, regsecret, "Exiting");
+ 	while (!(iaxevent = iax_get_event(1)));
+ 	iax_event_free(iaxevent);
+-	iax_destroy(session[1]);
+-	iax_destroy(session[0]);
++	iax_session_destroy(&session[1]);
++	iax_session_destroy(&session[0]);
+     }
+ 
+     /* Escalate privileges */
+@@ -603,7 +603,7 @@ t31_call_control_handler(t31_state_t *s, void *user_data, int op, const char *nu
+ 		    sleep(1);	// apparently necessary or the answer can be ignored
+ 		}
+ 		iax_hangup(session[0], "Normal disconnect");
+-		iax_destroy(session[0]);
++		iax_session_destroy(&session[0]);
+ 		phonestate = PHONE_FREED;
+ 		if (gothup) sighandler(SIGHUP);
+ 	    }
+@@ -1202,7 +1202,7 @@ iaxmodem(const char *config, int nondaemon)
+ 	     * one.  In any case, omitting it seems harmless, as iax_destroy seems
+ 	     * to do the necessary job.
+ 	     */
+-	    iax_destroy(session[0]);
++	    iax_session_destroy(&session[0]);
+ 	    phonestate = PHONE_FREED;
+ 	    modemstate = MODEM_ONHOOK;
+ 	    if (gothup) sighandler(SIGHUP);
+@@ -1224,13 +1224,13 @@ iaxmodem(const char *config, int nondaemon)
+ 			printlog(LOG_INFO, "Registration completed successfully.\n");
+ 			if (iaxevent->ies.refresh > 0) refresh = iaxevent->ies.refresh;
+ 			regstate = REGISTERED;
+-			iax_destroy(session[1]);
++			iax_session_destroy(&session[1]);
+ 			break;
+ 		    case IAX_EVENT_REGREJ:
+ 			printlog(LOG_ERROR, "Registration failed.\n");
+ 			/* To prevent fast looping with registration-attempts, we leave regstate PENDING. */
+ 			//regstate = UNREGISTERED;
+-			iax_destroy(session[1]);
++			iax_session_destroy(&session[1]);
+ 			break;
+ 		    case IAX_EVENT_TIMEOUT:
+ 			if (regstate == PENDING) {
-- 
GitLab


From 8bead3a73b88b68be5477e6020125ca8539f5108 Mon Sep 17 00:00:00 2001
From: Natanael Copa <ncopa@alpinelinux.org>
Date: Thu, 22 Apr 2021 10:05:49 +0000
Subject: [PATCH 37/87] main/openvpn: upgrade to 2.5.2

---
 main/openvpn/APKBUILD | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/main/openvpn/APKBUILD b/main/openvpn/APKBUILD
index 33d527d3ecd4..e4e0c2514e2e 100644
--- a/main/openvpn/APKBUILD
+++ b/main/openvpn/APKBUILD
@@ -1,7 +1,7 @@
 # Contributor: Valery Kartel <valery.kartel@gmail.com>
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=openvpn
-pkgver=2.5.1
+pkgver=2.5.2
 pkgrel=0
 pkgdesc="Robust, and highly configurable VPN (Virtual Private Network)"
 url="https://openvpn.net/"
@@ -67,7 +67,7 @@ pam() {
 		"$subpkgdir"/usr/lib/openvpn/plugins/
 }
 
-sha512sums="7c0adad384f908bd7dbd839a2b90cbe3a4222cac92ef484df89709ca5dd6cb22b3caf19b696c2bb74d7eda148904a8b25f1fe4640c91f0e68d6e65bcf922e0f4  openvpn-2.5.1.tar.xz
+sha512sums="ae2cac00ae4b9e06e7e70b268ed47d36bbb45409650175e507d5bfa12b0a4f24bccc64f2494d1563f9269c8076d0f753a492f01ea33ce376ba00b7cdcb5c7bd0  openvpn-2.5.2.tar.xz
 111a1ce79bdb41b8a03c0d43f1fd87de8a0d5592a8b1bd878113af79adce3d0a3109badd92b5af9a0f80b6585473a1e01638f7e78e6baa8aac439f0708bc2a72  openvpn.initd
 1f14d4bd7a4a026c276af048ce647501c15358c6b0d184e95c49be5b8184188c8edafb76ed94835cdbb314187ee3b5b3ccd852e3a47add0599814c402309bece  openvpn.confd
 cdb73c9a5b1eb56e9cbd29955d94297ce5a87079419cd626d6a0b6680d88cbf310735a53f794886df02030b687eaea553c7c569a8ea1282a149441add1c65760  openvpn.up
-- 
GitLab


From b89f6bfe9cffbb8ef54258a1f28f87c78ac27c57 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9=20Klitzing?= <aklitzing@gmail.com>
Date: Wed, 14 Apr 2021 12:35:34 +0200
Subject: [PATCH 38/87] testing/croc: upgrade to 9.1.0 and enable check for
 s390x/mips

---
 testing/croc/APKBUILD | 14 ++++++++------
 1 file changed, 8 insertions(+), 6 deletions(-)

diff --git a/testing/croc/APKBUILD b/testing/croc/APKBUILD
index c03004186e17..5c663e952bb4 100644
--- a/testing/croc/APKBUILD
+++ b/testing/croc/APKBUILD
@@ -1,20 +1,21 @@
 # Contributor: André Klitzing <aklitzing@@gmail.com>
 # Maintainer: André Klitzing <aklitzing@gmail.com>
 pkgname=croc
-pkgver=8.6.12
+pkgver=9.1.0
 pkgrel=0
 pkgdesc="Easily and securely send things from one computer to another"
 url="https://github.com/schollz/croc"
 license="MIT"
-# s390x fails: https://github.com/schollz/croc/issues/218
-# mips/mips64 tests fail
-arch="all !s390x !mips !mips64"
+arch="all"
 makedepends="go"
-source="https://github.com/schollz/croc/releases/download/v$pkgver/croc_${pkgver}_src.tar.gz"
+source="https://github.com/schollz/croc/releases/download/v$pkgver/croc_${pkgver}_src.tar.gz
+		https://github.com/schollz/croc/commit/de2bcf114c60d553bbf7a2ebfc3050130613132d.patch
+		"
 
 build() {
 	export CGO_LDFLAGS="$LDFLAGS"
 	export GOFLAGS="$GOFLAGS -trimpath -mod=vendor"
+	go mod vendor
 	go build
 }
 
@@ -26,4 +27,5 @@ package() {
 	install -Dm755 -t "$pkgdir/usr/bin/" "$pkgname"
 }
 
-sha512sums="36f69bb4b2a33d774141d082f06f702890add252f9ba2b1baf34c745fdca0832a9d1bd40684ed84a50c06b74dd363f71b06b86c7052540a346e603bf42deb1b8  croc_8.6.12_src.tar.gz"
+sha512sums="a5a048448b9890907499240c0aa0707db53da45cbb51e2e7e1f5b78537118ff83ce2e91ae1ef6e1a57c8a9d0e682265621e23613cd0dad5ae9158d57df67a0be  croc_9.1.0_src.tar.gz
+c6eec4663d9d423bcbf98b04624a0e01fd57a92ef7f0ef0d758c913bda6470da14d78f2e956b8e405c36919514c4e4d4505807c45e4bdaa2f5bbc1629c5fabcf  de2bcf114c60d553bbf7a2ebfc3050130613132d.patch"
-- 
GitLab


From 497073fdeea5fd469199b505daa29ce93cf41e99 Mon Sep 17 00:00:00 2001
From: Bart Ribbers <bribbers@disroot.org>
Date: Thu, 22 Apr 2021 13:25:10 +0200
Subject: [PATCH 39/87] testing/font-roboto: new aport

---
 testing/font-roboto/90-roboto-regular.conf | 14 ++++++++++++
 testing/font-roboto/APKBUILD               | 25 ++++++++++++++++++++++
 2 files changed, 39 insertions(+)
 create mode 100644 testing/font-roboto/90-roboto-regular.conf
 create mode 100644 testing/font-roboto/APKBUILD

diff --git a/testing/font-roboto/90-roboto-regular.conf b/testing/font-roboto/90-roboto-regular.conf
new file mode 100644
index 000000000000..924c2bf9615d
--- /dev/null
+++ b/testing/font-roboto/90-roboto-regular.conf
@@ -0,0 +1,14 @@
+<?xml version="1.0"?>
+<!DOCTYPE fontconfig SYSTEM "fonts.dtd">
+<fontconfig>
+
+	<match target="pattern">
+		<test name="family" compare="eq"><string>Roboto</string></test>
+		<edit name="weight" mode="append"><const>regular</const></edit>
+	</match>
+	<match target="pattern">
+		<test name="family" compare="eq"><string>Roboto Condensed</string></test>
+		<edit name="weight" mode="append"><const>regular</const></edit>
+	</match>
+
+</fontconfig>
diff --git a/testing/font-roboto/APKBUILD b/testing/font-roboto/APKBUILD
new file mode 100644
index 000000000000..797643eff951
--- /dev/null
+++ b/testing/font-roboto/APKBUILD
@@ -0,0 +1,25 @@
+# Contributor: Bart Ribbers <bribbers@disroot.org>
+# Maintainer: Bart Ribbers <bribbers@disroot.org>
+pkgname=font-roboto
+pkgver=2.138
+pkgrel=0
+pkgdesc="Standard font for Android 4.0 (Ice Cream Sandwich) and later"
+url="https://github.com/google/roboto"
+arch="noarch"
+license="Apache-2.0"
+source="$pkgname-$pkgver.zip::https://github.com/google/roboto/releases/download/v$pkgver/roboto-unhinted.zip
+	90-roboto-regular.conf
+	"
+options="!check" # No code to test
+builddir="$srcdir"
+
+package() {
+	find . -name "*.ttf" | while read -r i; do
+		install -Dm644 $i -t "$pkgdir"/usr/share/fonts/TTF
+	done
+
+	install -Dm644 "$srcdir"/90-roboto-regular.conf -t "$pkgdir"/etc/fonts/conf.d
+}
+
+sha512sums="4cfd20a1e19a986b17f731745a4d5ee909b852649e340d25de8197fbf6656005ccd3b4c591641938edbfebf0de81c71366a2afa007bb403285dea4d3dbfbd2a0  font-roboto-2.138.zip
+cf8e84eeff7c34d5d218c283c43a0440c2af6e46d6d7f8d68c5d0eb5fe6431ce3ecb89ce9f558cbca24a23658e315d2dea4472fd3905ad9f236efda4b7a8a8c0  90-roboto-regular.conf"
-- 
GitLab


From f55cc9a58a8f1e24d62d018166a310d1d05486fd Mon Sep 17 00:00:00 2001
From: Bart Ribbers <bribbers@disroot.org>
Date: Wed, 21 Apr 2021 20:17:16 +0200
Subject: [PATCH 40/87] community/skanlite: move from testing

---
 {testing => community}/skanlite/APKBUILD | 19 ++++++++++++++-----
 1 file changed, 14 insertions(+), 5 deletions(-)
 rename {testing => community}/skanlite/APKBUILD (72%)

diff --git a/testing/skanlite/APKBUILD b/community/skanlite/APKBUILD
similarity index 72%
rename from testing/skanlite/APKBUILD
rename to community/skanlite/APKBUILD
index efe2b5972cc4..2796e38ec06a 100644
--- a/testing/skanlite/APKBUILD
+++ b/community/skanlite/APKBUILD
@@ -3,13 +3,22 @@
 pkgname=skanlite
 pkgver=2.2.0
 pkgrel=0
-arch="all !armhf" # armhf blocked by extra-cmake-modules
-arch="$arch !s390x !mips64" # blocked by kio-dev and kxmlgui-dev
+# armhf blocked by extra-cmake-modules
+# s390x and mips64 blocked by kio-dev and kxmlgui-dev
+arch="all !armhf !s390x !mips64"
 url="https://kde.org/applications/graphics/skanlite"
 pkgdesc="Lite image scanning application"
 license="LicenseRef-KDE-Accepted-GPL"
-makedepends="extra-cmake-modules qt5-qtbase-dev kcoreaddons-dev kdoctools-dev
-	ki18n-dev kio-dev kxmlgui-dev libksane-dev"
+makedepends="
+	extra-cmake-modules
+	kcoreaddons-dev
+	kdoctools-dev
+	ki18n-dev
+	kio-dev
+	kxmlgui-dev
+	libksane-dev
+	qt5-qtbase-dev
+	"
 checkdepends="xvfb-run"
 source="https://download.kde.org/stable/skanlite/${pkgver%.*}/skanlite-$pkgver.tar.xz"
 subpackages="$pkgname-doc $pkgname-lang"
@@ -28,7 +37,7 @@ check() {
 }
 
 package() {
-	DESTDIR="$pkgdir" cmake --build build --target install
+	DESTDIR="$pkgdir" cmake --install build
 }
 
 sha512sums="cbf4c85894c742f025147950f1586252b92e0b3ad9f51b917649c449d46387a4673141e7645cd7f0b005b4c50dd671f2217d35e64ac84e97afa7a6562a961b20  skanlite-2.2.0.tar.xz"
-- 
GitLab


From 2e2be77a6ffcc52f8b89af581b46c1ad2f8bcec3 Mon Sep 17 00:00:00 2001
From: Bart Ribbers <bribbers@disroot.org>
Date: Wed, 21 Apr 2021 20:18:03 +0200
Subject: [PATCH 41/87] community/rkward: move from testing

---
 {testing => community}/rkward/APKBUILD | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
 rename {testing => community}/rkward/APKBUILD (95%)

diff --git a/testing/rkward/APKBUILD b/community/rkward/APKBUILD
similarity index 95%
rename from testing/rkward/APKBUILD
rename to community/rkward/APKBUILD
index 722eadab9588..8b65e2b4ce2f 100644
--- a/testing/rkward/APKBUILD
+++ b/community/rkward/APKBUILD
@@ -43,7 +43,7 @@ check() {
 }
 
 package() {
-	DESTDIR="$pkgdir" cmake --build build --target install
+	DESTDIR="$pkgdir" cmake --install build
 }
 
 sha512sums="af872b59dea8535eb6ddc0b3db56c45114fc64b0b657e5c8373eb2f7b3a63aa13f9e3c8f6050ff3eff0126df595ed30e1d1e66b91c19b7ba950838613798cb6d  rkward-0.7.2.tar.gz"
-- 
GitLab


From 1262b130f800f3128b0ddec5909afd846e58cbbf Mon Sep 17 00:00:00 2001
From: Bart Ribbers <bribbers@disroot.org>
Date: Wed, 21 Apr 2021 20:18:47 +0200
Subject: [PATCH 42/87] community/krename: move from testing

---
 {testing => community}/krename/APKBUILD | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
 rename {testing => community}/krename/APKBUILD (95%)

diff --git a/testing/krename/APKBUILD b/community/krename/APKBUILD
similarity index 95%
rename from testing/krename/APKBUILD
rename to community/krename/APKBUILD
index ef144f48c168..8b0fd4fe4476 100644
--- a/testing/krename/APKBUILD
+++ b/community/krename/APKBUILD
@@ -43,7 +43,7 @@ check() {
 }
 
 package() {
-	DESTDIR="$pkgdir" cmake --build build --target install
+	DESTDIR="$pkgdir" cmake --install build
 }
 
 sha512sums="1e8b17d9b8396354da131132fb6add24c6620ac39ab7ea5954391358369a4749f83df040e8425c74442ec143d1f07b322e592e5744f80eeef4b961d72f9dd379  krename-5.0.1.tar.xz"
-- 
GitLab


From fdac160af051fb72f5bd362917d9ad6afe299458 Mon Sep 17 00:00:00 2001
From: Bart Ribbers <bribbers@disroot.org>
Date: Wed, 21 Apr 2021 20:19:47 +0200
Subject: [PATCH 43/87] community/kdevelop-python: move from testing

---
 {testing => community}/kdevelop-python/APKBUILD | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)
 rename {testing => community}/kdevelop-python/APKBUILD (91%)

diff --git a/testing/kdevelop-python/APKBUILD b/community/kdevelop-python/APKBUILD
similarity index 91%
rename from testing/kdevelop-python/APKBUILD
rename to community/kdevelop-python/APKBUILD
index 7e50abb2ce1f..589a6d867a58 100644
--- a/testing/kdevelop-python/APKBUILD
+++ b/community/kdevelop-python/APKBUILD
@@ -5,7 +5,8 @@ pkgver=5.6.2
 pkgrel=1
 pkgdesc="Python language and documentation plugin for KDevelop"
 url="https://www.kdevelop.org/"
-arch="all !armhf !ppc64le !s390x !mips !mips64" # Blocked by kdevelop -> qt5-qtwebengine
+# armhf, ppc64le, s390x and mips64 blocked by kdevelop
+arch="all !armhf !ppc64le !s390x !mips64"
 license="LGPL-2.0-or-later"
 depends="python3"
 makedepends="
-- 
GitLab


From fb21c07017c3bfe652dcf0750a43b9349262bfef Mon Sep 17 00:00:00 2001
From: Bart Ribbers <bribbers@disroot.org>
Date: Wed, 21 Apr 2021 20:21:46 +0200
Subject: [PATCH 44/87] community/xr-hardware: move from testing

---
 {testing => community}/xr-hardware/APKBUILD | 0
 1 file changed, 0 insertions(+), 0 deletions(-)
 rename {testing => community}/xr-hardware/APKBUILD (100%)

diff --git a/testing/xr-hardware/APKBUILD b/community/xr-hardware/APKBUILD
similarity index 100%
rename from testing/xr-hardware/APKBUILD
rename to community/xr-hardware/APKBUILD
-- 
GitLab


From 8ec5ac1e49ee3d66d6711636b6b75e327a542dd9 Mon Sep 17 00:00:00 2001
From: Bart Ribbers <bribbers@disroot.org>
Date: Wed, 21 Apr 2021 20:22:07 +0200
Subject: [PATCH 45/87] community/steam-devices: move from testing

---
 {testing => community}/steam-devices/APKBUILD | 0
 1 file changed, 0 insertions(+), 0 deletions(-)
 rename {testing => community}/steam-devices/APKBUILD (100%)

diff --git a/testing/steam-devices/APKBUILD b/community/steam-devices/APKBUILD
similarity index 100%
rename from testing/steam-devices/APKBUILD
rename to community/steam-devices/APKBUILD
-- 
GitLab


From e8d13d614cbc49fa127e820e40d785c1fafa31e5 Mon Sep 17 00:00:00 2001
From: Bart Ribbers <bribbers@disroot.org>
Date: Wed, 21 Apr 2021 20:24:51 +0200
Subject: [PATCH 46/87] community/py3-cmudict: move from testing

---
 {testing => community}/py3-cmudict/APKBUILD | 0
 1 file changed, 0 insertions(+), 0 deletions(-)
 rename {testing => community}/py3-cmudict/APKBUILD (100%)

diff --git a/testing/py3-cmudict/APKBUILD b/community/py3-cmudict/APKBUILD
similarity index 100%
rename from testing/py3-cmudict/APKBUILD
rename to community/py3-cmudict/APKBUILD
-- 
GitLab


From b46b9a3a97b867b9417b935b6535a238d866efaa Mon Sep 17 00:00:00 2001
From: Bart Ribbers <bribbers@disroot.org>
Date: Wed, 21 Apr 2021 20:25:17 +0200
Subject: [PATCH 47/87] community/py3-json-database: move from testing

---
 {testing => community}/py3-json-database/APKBUILD | 0
 1 file changed, 0 insertions(+), 0 deletions(-)
 rename {testing => community}/py3-json-database/APKBUILD (100%)

diff --git a/testing/py3-json-database/APKBUILD b/community/py3-json-database/APKBUILD
similarity index 100%
rename from testing/py3-json-database/APKBUILD
rename to community/py3-json-database/APKBUILD
-- 
GitLab


From 7bc3f0f3342cabc95c12264376cf1356f5c7c9ae Mon Sep 17 00:00:00 2001
From: Bart Ribbers <bribbers@disroot.org>
Date: Wed, 21 Apr 2021 20:28:26 +0200
Subject: [PATCH 48/87] community/py3-kthread: move from testing

---
 {testing => community}/py3-kthread/APKBUILD | 0
 1 file changed, 0 insertions(+), 0 deletions(-)
 rename {testing => community}/py3-kthread/APKBUILD (100%)

diff --git a/testing/py3-kthread/APKBUILD b/community/py3-kthread/APKBUILD
similarity index 100%
rename from testing/py3-kthread/APKBUILD
rename to community/py3-kthread/APKBUILD
-- 
GitLab


From 223b66e8881674ce4630ee14326b2eb1bf97b5d7 Mon Sep 17 00:00:00 2001
From: Bart Ribbers <bribbers@disroot.org>
Date: Wed, 21 Apr 2021 20:29:06 +0200
Subject: [PATCH 49/87] community/py3-phoneme-guesser: move from testing

---
 {testing => community}/py3-phoneme-guesser/APKBUILD | 0
 1 file changed, 0 insertions(+), 0 deletions(-)
 rename {testing => community}/py3-phoneme-guesser/APKBUILD (100%)

diff --git a/testing/py3-phoneme-guesser/APKBUILD b/community/py3-phoneme-guesser/APKBUILD
similarity index 100%
rename from testing/py3-phoneme-guesser/APKBUILD
rename to community/py3-phoneme-guesser/APKBUILD
-- 
GitLab


From a2fc03bf62138d5661b615e8a3839a6920ad5cea Mon Sep 17 00:00:00 2001
From: Bart Ribbers <bribbers@disroot.org>
Date: Wed, 21 Apr 2021 20:29:40 +0200
Subject: [PATCH 50/87] community/py3-pronouncing: move from testing

---
 {testing => community}/py3-pronouncing/APKBUILD | 0
 1 file changed, 0 insertions(+), 0 deletions(-)
 rename {testing => community}/py3-pronouncing/APKBUILD (100%)

diff --git a/testing/py3-pronouncing/APKBUILD b/community/py3-pronouncing/APKBUILD
similarity index 100%
rename from testing/py3-pronouncing/APKBUILD
rename to community/py3-pronouncing/APKBUILD
-- 
GitLab


From ea649dad62db35dda8db3cfba8f2bf0d81b4eca7 Mon Sep 17 00:00:00 2001
From: Bart Ribbers <bribbers@disroot.org>
Date: Wed, 21 Apr 2021 20:30:37 +0200
Subject: [PATCH 51/87] community/py3-upnpclient: move from testing

---
 {testing => community}/py3-upnpclient/APKBUILD | 0
 1 file changed, 0 insertions(+), 0 deletions(-)
 rename {testing => community}/py3-upnpclient/APKBUILD (100%)

diff --git a/testing/py3-upnpclient/APKBUILD b/community/py3-upnpclient/APKBUILD
similarity index 100%
rename from testing/py3-upnpclient/APKBUILD
rename to community/py3-upnpclient/APKBUILD
-- 
GitLab


From 504e6c684c1b7772eb577262cb12e6d0cb4e4d11 Mon Sep 17 00:00:00 2001
From: Bart Ribbers <bribbers@disroot.org>
Date: Wed, 21 Apr 2021 20:31:03 +0200
Subject: [PATCH 52/87] community/py3-txaio: move from testing

---
 {testing => community}/py3-txaio/APKBUILD | 0
 1 file changed, 0 insertions(+), 0 deletions(-)
 rename {testing => community}/py3-txaio/APKBUILD (100%)

diff --git a/testing/py3-txaio/APKBUILD b/community/py3-txaio/APKBUILD
similarity index 100%
rename from testing/py3-txaio/APKBUILD
rename to community/py3-txaio/APKBUILD
-- 
GitLab


From cb5e8fec93f15f784c5cd2886a05567f652a0a85 Mon Sep 17 00:00:00 2001
From: Bart Ribbers <bribbers@disroot.org>
Date: Wed, 21 Apr 2021 21:16:56 +0200
Subject: [PATCH 53/87] testing/mbrola-voices: new aport

---
 testing/mbrola-voices/APKBUILD | 22 ++++++++++++++++++++++
 1 file changed, 22 insertions(+)
 create mode 100644 testing/mbrola-voices/APKBUILD

diff --git a/testing/mbrola-voices/APKBUILD b/testing/mbrola-voices/APKBUILD
new file mode 100644
index 000000000000..1813b1c4b0d5
--- /dev/null
+++ b/testing/mbrola-voices/APKBUILD
@@ -0,0 +1,22 @@
+# Contributor: Bart Ribbers <bribbers@disroot.org>
+# Maintainer: Bart Ribbers <bribbers@disroot.org>
+pkgname=mbrola-voices
+pkgver=0_git20200330
+pkgrel=0
+_commit="fe05a0ccef6a941207fd6aaad0b31294a1f93a51"
+pkgdesc="Data files of mbrola speech synthesizer voices"
+url="https://github.com/numediart/MBROLA-voices"
+arch="noarch"
+license="AGPL-3.0-or-later"
+source="https://github.com/numediart/MBROLA-voices/archive/$_commit/MBROLA-voices-$_commit.tar.gz"
+options="!check" # No code to test
+builddir="$srcdir/MBROLA-voices-$_commit"
+
+package() {
+	cd data
+	find . -type d -mindepth 1 -maxdepth 1 | while read -r d; do
+		install -Dm644 $d/$d "$pkgdir"/usr/share/mbrola/$d/$d
+	done
+}
+
+sha512sums="8476e80984279fddab1bda07e9352bee9f11499dc5b59652cd4bc0385b08a83259c080748e7040fa10cc03c9b0f1e1d1a39f80ddd782073c92f49fadc9af9585  MBROLA-voices-fe05a0ccef6a941207fd6aaad0b31294a1f93a51.tar.gz"
-- 
GitLab


From 893dd12a00c1859734f5b29e808270f2d14385fe Mon Sep 17 00:00:00 2001
From: Bart Ribbers <bribbers@disroot.org>
Date: Wed, 21 Apr 2021 21:17:30 +0200
Subject: [PATCH 54/87] testing/py3-voxpopuli: switch source to Github

---
 testing/py3-voxpopuli/APKBUILD | 13 ++++++++-----
 1 file changed, 8 insertions(+), 5 deletions(-)

diff --git a/testing/py3-voxpopuli/APKBUILD b/testing/py3-voxpopuli/APKBUILD
index 144253729f19..3f75ca9eb054 100644
--- a/testing/py3-voxpopuli/APKBUILD
+++ b/testing/py3-voxpopuli/APKBUILD
@@ -9,9 +9,12 @@ arch="noarch"
 license="MIT"
 depends="python3"
 makedepends="py3-setuptools"
-checkdepends="py3-pytest"
-source="https://pypi.python.org/packages/source/v/voxpopuli/voxpopuli-$pkgver.tar.gz"
-options="!check" # No tests in PyPi package https://github.com/hadware/voxpopuli/issues/17
+checkdepends="
+	mbrola-voices
+	py3-pytest
+	"
+source="https://github.com/hadware/voxpopuli/archive/v$pkgver/voxpopuli-v$pkgver.tar.gz"
+options="!check" # Requires mbrola which doesn't currently compile
 builddir="$srcdir/voxpopuli-$pkgver"
 
 build() {
@@ -19,11 +22,11 @@ build() {
 }
 
 check() {
-	pytest
+	PYTHONPATH="$PWD/build/lib" pytest tests/tests.py
 }
 
 package() {
 	python3 setup.py install --prefix=/usr --root="$pkgdir"
 }
 
-sha512sums="5c624af748cbdc9a8ce2169ba8fd9eae96031bcee474b6e55b2a97879d177a070a235893974675f50cd36e86b7f5e718b8075216329d093048a85f46c0806e77  voxpopuli-0.3.6.tar.gz"
+sha512sums="9ef82ab33304da31db82efdf1a0816da5631f4c3344f4373a27bcd03d95c0711b74e9f61cdfdb01aef17759a1054e3406426d8db9893a9e1224756239ca66eec  voxpopuli-v0.3.6.tar.gz"
-- 
GitLab


From 5ed32309bd3d06cb424946ae3793387e31c9213a Mon Sep 17 00:00:00 2001
From: Bart Ribbers <bribbers@disroot.org>
Date: Wed, 21 Apr 2021 21:19:10 +0200
Subject: [PATCH 55/87] community/py3-responsivevoice: move from testing

---
 {testing => community}/py3-responsivevoice/APKBUILD | 0
 1 file changed, 0 insertions(+), 0 deletions(-)
 rename {testing => community}/py3-responsivevoice/APKBUILD (100%)

diff --git a/testing/py3-responsivevoice/APKBUILD b/community/py3-responsivevoice/APKBUILD
similarity index 100%
rename from testing/py3-responsivevoice/APKBUILD
rename to community/py3-responsivevoice/APKBUILD
-- 
GitLab


From 189f4047f060cf93d5063e79e8cfa87df33f5ae4 Mon Sep 17 00:00:00 2001
From: Bart Ribbers <bribbers@disroot.org>
Date: Wed, 21 Apr 2021 21:19:59 +0200
Subject: [PATCH 56/87] community/py3-ratelim: move from testing

---
 {testing => community}/py3-ratelim/APKBUILD | 0
 1 file changed, 0 insertions(+), 0 deletions(-)
 rename {testing => community}/py3-ratelim/APKBUILD (100%)

diff --git a/testing/py3-ratelim/APKBUILD b/community/py3-ratelim/APKBUILD
similarity index 100%
rename from testing/py3-ratelim/APKBUILD
rename to community/py3-ratelim/APKBUILD
-- 
GitLab


From 27b6a96ee21510fb360789018468b1f67daeb772 Mon Sep 17 00:00:00 2001
From: Bart Ribbers <bribbers@disroot.org>
Date: Wed, 21 Apr 2021 21:20:15 +0200
Subject: [PATCH 57/87] community/py3-timezonefinder: move from testing

---
 {testing => community}/py3-timezonefinder/APKBUILD | 0
 1 file changed, 0 insertions(+), 0 deletions(-)
 rename {testing => community}/py3-timezonefinder/APKBUILD (100%)

diff --git a/testing/py3-timezonefinder/APKBUILD b/community/py3-timezonefinder/APKBUILD
similarity index 100%
rename from testing/py3-timezonefinder/APKBUILD
rename to community/py3-timezonefinder/APKBUILD
-- 
GitLab


From 9adf952c282924d8f3dd9c2b90675de19aabb937 Mon Sep 17 00:00:00 2001
From: Bart Ribbers <bribbers@disroot.org>
Date: Wed, 21 Apr 2021 21:20:27 +0200
Subject: [PATCH 58/87] community/py3-geocoder: move from testing

---
 {testing => community}/py3-geocoder/APKBUILD | 0
 1 file changed, 0 insertions(+), 0 deletions(-)
 rename {testing => community}/py3-geocoder/APKBUILD (100%)

diff --git a/testing/py3-geocoder/APKBUILD b/community/py3-geocoder/APKBUILD
similarity index 100%
rename from testing/py3-geocoder/APKBUILD
rename to community/py3-geocoder/APKBUILD
-- 
GitLab


From 2fc274cb064f22429400f0fdeaf2270400ca464c Mon Sep 17 00:00:00 2001
From: Bart Ribbers <bribbers@disroot.org>
Date: Wed, 21 Apr 2021 21:20:40 +0200
Subject: [PATCH 59/87] community/py3-pyscss: move from testing

---
 {testing => community}/py3-pyscss/APKBUILD | 0
 1 file changed, 0 insertions(+), 0 deletions(-)
 rename {testing => community}/py3-pyscss/APKBUILD (100%)

diff --git a/testing/py3-pyscss/APKBUILD b/community/py3-pyscss/APKBUILD
similarity index 100%
rename from testing/py3-pyscss/APKBUILD
rename to community/py3-pyscss/APKBUILD
-- 
GitLab


From c915b5a0be27250ff4f234744cabdce9a28164bc Mon Sep 17 00:00:00 2001
From: Bart Ribbers <bribbers@disroot.org>
Date: Wed, 21 Apr 2021 21:22:14 +0200
Subject: [PATCH 60/87] community/py3-pydocstyle: move from testing

---
 {testing => community}/py3-pydocstyle/APKBUILD | 0
 1 file changed, 0 insertions(+), 0 deletions(-)
 rename {testing => community}/py3-pydocstyle/APKBUILD (100%)

diff --git a/testing/py3-pydocstyle/APKBUILD b/community/py3-pydocstyle/APKBUILD
similarity index 100%
rename from testing/py3-pydocstyle/APKBUILD
rename to community/py3-pydocstyle/APKBUILD
-- 
GitLab


From 247f589ce1db00a3d4a6d649541d033c769f0973 Mon Sep 17 00:00:00 2001
From: Bart Ribbers <bribbers@disroot.org>
Date: Wed, 21 Apr 2021 21:22:29 +0200
Subject: [PATCH 61/87] community/py3-language-server: move from testing

---
 {testing => community}/py3-language-server/APKBUILD               | 0
 .../py3-language-server/bump-jedi-compatibility.patch             | 0
 2 files changed, 0 insertions(+), 0 deletions(-)
 rename {testing => community}/py3-language-server/APKBUILD (100%)
 rename {testing => community}/py3-language-server/bump-jedi-compatibility.patch (100%)

diff --git a/testing/py3-language-server/APKBUILD b/community/py3-language-server/APKBUILD
similarity index 100%
rename from testing/py3-language-server/APKBUILD
rename to community/py3-language-server/APKBUILD
diff --git a/testing/py3-language-server/bump-jedi-compatibility.patch b/community/py3-language-server/bump-jedi-compatibility.patch
similarity index 100%
rename from testing/py3-language-server/bump-jedi-compatibility.patch
rename to community/py3-language-server/bump-jedi-compatibility.patch
-- 
GitLab


From 73c4bc0d5d9cc10f92ffc42627de5f9d7d2db95b Mon Sep 17 00:00:00 2001
From: Bart Ribbers <bribbers@disroot.org>
Date: Thu, 22 Apr 2021 10:02:30 +0200
Subject: [PATCH 62/87] community/py3-fastimport: move from testing

---
 {testing => community}/py3-fastimport/APKBUILD | 0
 1 file changed, 0 insertions(+), 0 deletions(-)
 rename {testing => community}/py3-fastimport/APKBUILD (100%)

diff --git a/testing/py3-fastimport/APKBUILD b/community/py3-fastimport/APKBUILD
similarity index 100%
rename from testing/py3-fastimport/APKBUILD
rename to community/py3-fastimport/APKBUILD
-- 
GitLab


From e8291ccc57d4b845bfd67e20a30e32006f3b6751 Mon Sep 17 00:00:00 2001
From: Bart Ribbers <bribbers@disroot.org>
Date: Thu, 22 Apr 2021 10:07:33 +0200
Subject: [PATCH 63/87] community/py3-dulwich: move from testing

---
 {testing => community}/py3-dulwich/APKBUILD                 | 0
 {testing => community}/py3-dulwich/skip-network-tests.patch | 0
 2 files changed, 0 insertions(+), 0 deletions(-)
 rename {testing => community}/py3-dulwich/APKBUILD (100%)
 rename {testing => community}/py3-dulwich/skip-network-tests.patch (100%)

diff --git a/testing/py3-dulwich/APKBUILD b/community/py3-dulwich/APKBUILD
similarity index 100%
rename from testing/py3-dulwich/APKBUILD
rename to community/py3-dulwich/APKBUILD
diff --git a/testing/py3-dulwich/skip-network-tests.patch b/community/py3-dulwich/skip-network-tests.patch
similarity index 100%
rename from testing/py3-dulwich/skip-network-tests.patch
rename to community/py3-dulwich/skip-network-tests.patch
-- 
GitLab


From 842776f77a4438ea1b3c6765b5a94f716419ebb1 Mon Sep 17 00:00:00 2001
From: Bart Ribbers <bribbers@disroot.org>
Date: Thu, 22 Apr 2021 10:10:45 +0200
Subject: [PATCH 64/87] community/breezy: move from testing

---
 {testing => community}/breezy/APKBUILD | 0
 1 file changed, 0 insertions(+), 0 deletions(-)
 rename {testing => community}/breezy/APKBUILD (100%)

diff --git a/testing/breezy/APKBUILD b/community/breezy/APKBUILD
similarity index 100%
rename from testing/breezy/APKBUILD
rename to community/breezy/APKBUILD
-- 
GitLab


From 5d2d5c6b63f116413f5a343ce46a149f2b72f12f Mon Sep 17 00:00:00 2001
From: Bart Ribbers <bribbers@disroot.org>
Date: Wed, 21 Apr 2021 20:21:23 +0200
Subject: [PATCH 65/87] community/kdesrc-build: move from testing

---
 {testing => community}/kdesrc-build/APKBUILD | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)
 rename {testing => community}/kdesrc-build/APKBUILD (80%)

diff --git a/testing/kdesrc-build/APKBUILD b/community/kdesrc-build/APKBUILD
similarity index 80%
rename from testing/kdesrc-build/APKBUILD
rename to community/kdesrc-build/APKBUILD
index c7bf2f0a8a48..5ab429cff8b9 100644
--- a/testing/kdesrc-build/APKBUILD
+++ b/community/kdesrc-build/APKBUILD
@@ -2,11 +2,11 @@
 # Maintainer: Bart Ribbers <bribbers@disroot.org>
 pkgname=kdesrc-build
 pkgver=20.06
-pkgrel=0
+pkgrel=1
 arch="noarch !armhf" # armhf blocked by extra-cmake-modules
-url="https://kde.org/applications/system/dolphin"
-pkgdesc="KDE File Manager"
-license="GPL-2.0-only"
+url="https://invent.kde.org/sdk/kdesrc-build"
+pkgdesc="Script to streamline setting up and maintaining KDE software development environment"
+license="GPL-2.0-or-later"
 depends="
 	breezy
 	cmake
@@ -38,7 +38,7 @@ check() {
 }
 
 package() {
-	DESTDIR="$pkgdir" cmake --build build --target install
+	DESTDIR="$pkgdir" cmake --install build
 }
 
 sha512sums="107dc917a1ee535ac15ee89d328502b3550ca4bff8efbdca59e3a82bcf6faba5d23b441a4e0ca37f361a5c24cde5629d462af368d24023b5a070f71673ef4bae  kdesrc-build-v20.06.tar.gz"
-- 
GitLab


From e49ea2ea10a2dbee3461e6bcdf3a6f3f0cc695dd Mon Sep 17 00:00:00 2001
From: Bart Ribbers <bribbers@disroot.org>
Date: Thu, 22 Apr 2021 10:12:04 +0200
Subject: [PATCH 66/87] community/py3-sphinxcontrib-images: move from testing

---
 {testing => community}/py3-sphinxcontrib-images/APKBUILD | 0
 1 file changed, 0 insertions(+), 0 deletions(-)
 rename {testing => community}/py3-sphinxcontrib-images/APKBUILD (100%)

diff --git a/testing/py3-sphinxcontrib-images/APKBUILD b/community/py3-sphinxcontrib-images/APKBUILD
similarity index 100%
rename from testing/py3-sphinxcontrib-images/APKBUILD
rename to community/py3-sphinxcontrib-images/APKBUILD
-- 
GitLab


From fcdaf5967f592d226396c1a43ff6fdecfb44342e Mon Sep 17 00:00:00 2001
From: Bart Ribbers <bribbers@disroot.org>
Date: Wed, 21 Apr 2021 21:18:30 +0200
Subject: [PATCH 67/87] community/py3-autobahn: move from testing

---
 {testing => community}/py3-autobahn/APKBUILD | 0
 1 file changed, 0 insertions(+), 0 deletions(-)
 rename {testing => community}/py3-autobahn/APKBUILD (100%)

diff --git a/testing/py3-autobahn/APKBUILD b/community/py3-autobahn/APKBUILD
similarity index 100%
rename from testing/py3-autobahn/APKBUILD
rename to community/py3-autobahn/APKBUILD
-- 
GitLab


From e5a07c56a15694fcfb37742a421270acdb9e4dc9 Mon Sep 17 00:00:00 2001
From: Bart Ribbers <bribbers@disroot.org>
Date: Thu, 22 Apr 2021 10:13:40 +0200
Subject: [PATCH 68/87] community/py3-d2to1: move from testing

---
 {testing => community}/py3-d2to1/APKBUILD | 0
 1 file changed, 0 insertions(+), 0 deletions(-)
 rename {testing => community}/py3-d2to1/APKBUILD (100%)

diff --git a/testing/py3-d2to1/APKBUILD b/community/py3-d2to1/APKBUILD
similarity index 100%
rename from testing/py3-d2to1/APKBUILD
rename to community/py3-d2to1/APKBUILD
-- 
GitLab


From 9330eeee41c23a88577e9b537a7c655ceb4adc7c Mon Sep 17 00:00:00 2001
From: Bart Ribbers <bribbers@disroot.org>
Date: Wed, 21 Apr 2021 20:27:39 +0200
Subject: [PATCH 69/87] community/py3-colour: move from testing and modernize

---
 {testing => community}/py3-colour/APKBUILD | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)
 rename {testing => community}/py3-colour/APKBUILD (83%)

diff --git a/testing/py3-colour/APKBUILD b/community/py3-colour/APKBUILD
similarity index 83%
rename from testing/py3-colour/APKBUILD
rename to community/py3-colour/APKBUILD
index 7076b6e63d14..6df6a19d29d7 100644
--- a/testing/py3-colour/APKBUILD
+++ b/community/py3-colour/APKBUILD
@@ -1,7 +1,6 @@
 # Contributor: Fabian Affolter <fabian@affolter-engineering.ch>
 # Maintainer: Fabian Affolter <fabian@affolter-engineering.ch>
 pkgname=py3-colour
-_pkgname=colour
 pkgver=0.1.5
 pkgrel=2
 pkgdesc="Python module to convert and manipulate color representations"
@@ -11,8 +10,8 @@ license="BSD-2-Clause"
 depends="python3"
 makedepends="py3-setuptools py3-d2to1"
 checkdepends="py3-coverage py3-nose"
-source="https://files.pythonhosted.org/packages/source/${_pkgname:0:1}/$_pkgname/$_pkgname-$pkgver.tar.gz"
-builddir="$srcdir"/$_pkgname-$pkgver
+source="https://files.pythonhosted.org/packages/source/c/colour/colour-$pkgver.tar.gz"
+builddir="$srcdir/colour-$pkgver"
 
 replaces="py-colour" # Backwards compatibility
 replaces="py-colour=$pkgver-r$pkgrel" # Backwards compatibility
-- 
GitLab


From b6c2b9f9262f58e5a708b9f03d40ff2732be02b9 Mon Sep 17 00:00:00 2001
From: Bart Ribbers <bribbers@disroot.org>
Date: Wed, 21 Apr 2021 20:29:54 +0200
Subject: [PATCH 70/87] community/py3-ovos-utils: move from testing

---
 {testing => community}/py3-ovos-utils/APKBUILD | 0
 1 file changed, 0 insertions(+), 0 deletions(-)
 rename {testing => community}/py3-ovos-utils/APKBUILD (100%)

diff --git a/testing/py3-ovos-utils/APKBUILD b/community/py3-ovos-utils/APKBUILD
similarity index 100%
rename from testing/py3-ovos-utils/APKBUILD
rename to community/py3-ovos-utils/APKBUILD
-- 
GitLab


From 5c9ccdee5412447648ea717ba1353b01f1e091b2 Mon Sep 17 00:00:00 2001
From: Bart Ribbers <bribbers@disroot.org>
Date: Wed, 21 Apr 2021 21:19:37 +0200
Subject: [PATCH 71/87] community/py3-jarbas-hive-mind: move from testing

---
 {testing => community}/py3-jarbas-hive-mind/APKBUILD | 0
 1 file changed, 0 insertions(+), 0 deletions(-)
 rename {testing => community}/py3-jarbas-hive-mind/APKBUILD (100%)

diff --git a/testing/py3-jarbas-hive-mind/APKBUILD b/community/py3-jarbas-hive-mind/APKBUILD
similarity index 100%
rename from testing/py3-jarbas-hive-mind/APKBUILD
rename to community/py3-jarbas-hive-mind/APKBUILD
-- 
GitLab


From f83e461d0df96a72357f35b81875b1476bb24b46 Mon Sep 17 00:00:00 2001
From: Bart Ribbers <bribbers@disroot.org>
Date: Thu, 22 Apr 2021 11:41:15 +0200
Subject: [PATCH 72/87] community/user-managerd: replace systemd service file
 for OpenRC one

---
 community/user-managerd/APKBUILD            | 16 +++++++++++++---
 community/user-managerd/user-managerd.confd |  1 +
 community/user-managerd/user-managerd.initd | 10 ++++++++++
 3 files changed, 24 insertions(+), 3 deletions(-)
 create mode 100644 community/user-managerd/user-managerd.confd
 create mode 100644 community/user-managerd/user-managerd.initd

diff --git a/community/user-managerd/APKBUILD b/community/user-managerd/APKBUILD
index adf6bc34d53d..7236b8c1ff5f 100644
--- a/community/user-managerd/APKBUILD
+++ b/community/user-managerd/APKBUILD
@@ -2,7 +2,7 @@
 # Maintainer: Bart Ribbers <bribbers@disroot.org>
 pkgname=user-managerd
 pkgver=0.8.3
-pkgrel=0
+pkgrel=1
 pkgdesc="Daemon for handling Sailfish OS device users"
 url="https://github.com/sailfishos/user-managerd"
 arch="all"
@@ -15,9 +15,11 @@ depends_dev="
 	sailfish-access-control
 	"
 makedepends="$depends_dev"
-subpackages="$pkgname-dev"
+subpackages="$pkgname-dev $pkgname-openrc"
 source="https://github.com/sailfishos/user-managerd/archive/$pkgver/user-managerd-$pkgver.tar.gz
 	0001-Include-linux-quota.h.patch
+	user-managerd.initd
+	user-managerd.confd
 	"
 
 build() {
@@ -27,7 +29,15 @@ build() {
 
 package() {
 	INSTALL_ROOT="$pkgdir" make install
+
+	install -Dm755 "$srcdir"/user-managerd.initd "$pkgdir"/etc/init.d/user-managerd
+	install -Dm755 "$srcdir"/user-managerd.confd "$pkgdir"/etc/conf.d/user-managerd
+
+	# We don't ship systemd
+	rm -r "$pkgdir"/usr/lib/systemd
 }
 
 sha512sums="3e6268ce56bfa0c2d63b816edd73f90954ff206d6d1c8568b1e1a6a9f2e6c4b94585e2835cb72cec4d16f833961c3831513efb13ee61b934f247f2d16f80968b  user-managerd-0.8.3.tar.gz
-58e860fcf2015f7f8971e1c73d15a9629d324c85ae4418936a6b5a3c7e39d8430cea77a37326b6b163865ced161d0cb5c664ecf642d025edef217c83db5b846b  0001-Include-linux-quota.h.patch"
+58e860fcf2015f7f8971e1c73d15a9629d324c85ae4418936a6b5a3c7e39d8430cea77a37326b6b163865ced161d0cb5c664ecf642d025edef217c83db5b846b  0001-Include-linux-quota.h.patch
+487de9186cd34de6a18272c2c98f189def80c02480f77da49a1fcbe884320f67532c9ef65b63ef28ba5befec8dc40f7deb320319a9ce5ae73e69c4547deeca2a  user-managerd.initd
+b841282b96110ec59a7aa539db0737327b09549d55c78dc4b2c3b28b4a6ad1facf015b3175cb6d3a38f13e47aa6314ef3dc1514a4e60dd653a97409ec54ba706  user-managerd.confd"
diff --git a/community/user-managerd/user-managerd.confd b/community/user-managerd/user-managerd.confd
new file mode 100644
index 000000000000..9bd312c0c008
--- /dev/null
+++ b/community/user-managerd/user-managerd.confd
@@ -0,0 +1 @@
+supervisor=supervise-daemon
diff --git a/community/user-managerd/user-managerd.initd b/community/user-managerd/user-managerd.initd
new file mode 100644
index 000000000000..a3cbd8fde569
--- /dev/null
+++ b/community/user-managerd/user-managerd.initd
@@ -0,0 +1,10 @@
+#!/sbin/openrc-run
+
+name=user-managerd
+description="Sailfish user manager service"
+command="/usr/bin/user-managerd"
+command_background=yes
+
+depend() {
+	need dbus
+}
-- 
GitLab


From ebcfdab0329e9c4049d0f4134c38f916a7c23042 Mon Sep 17 00:00:00 2001
From: Bart Ribbers <bribbers@disroot.org>
Date: Thu, 22 Apr 2021 11:48:46 +0200
Subject: [PATCH 73/87] community/amazfish: replace systemd service file for
 XDG autostart one

---
 community/amazfish/APKBUILD         | 11 +++++++++--
 community/amazfish/amazfish.desktop |  7 +++++++
 2 files changed, 16 insertions(+), 2 deletions(-)
 create mode 100644 community/amazfish/amazfish.desktop

diff --git a/community/amazfish/APKBUILD b/community/amazfish/APKBUILD
index fe5fa701a5e8..19f57ae249bc 100644
--- a/community/amazfish/APKBUILD
+++ b/community/amazfish/APKBUILD
@@ -2,7 +2,7 @@
 # Maintainer: Bart Ribbers <bribbers@disroot.org>
 pkgname=amazfish
 pkgver=1.9.8
-pkgrel=0
+pkgrel=1
 _commit_qble="d531225632b8872997e9facc8bcf15423a9b96c0"
 _commit_libwatchfish="e3bf99e47c8c339b15eb4c8d6a485c22e9c7c2cd"
 pkgdesc="Companion application for Huami Devices (such as Amazfit Bip, Cor, MiBand2/3 and GTS and GTS) and the Pinetime Infinitime"
@@ -24,6 +24,7 @@ makedepends="
 source="https://github.com/piggz/harbour-amazfish/archive/$pkgver/harbour-amazfish-$pkgver.tar.gz
 	https://github.com/piggz/qble/archive/$_commit_qble/qble-$_commit_qble.tar.gz
 	https://github.com/piggz/libwatchfish/archive/$_commit_libwatchfish/libwatchfish-$_commit_libwatchfish.tar.gz
+	amazfish.desktop
 	"
 options="!check" # No tests
 builddir="$srcdir/harbour-amazfish-$pkgver"
@@ -45,8 +46,14 @@ build() {
 
 package() {
 	make INSTALL_ROOT="$pkgdir" install
+
+	install -Dm644 "$srcdir"/amazfish.desktop -t "$pkgdir"/etc/xdg/autostart/
+
+	# We don't ship systemd
+	rm -r "$pkgdir"/usr/lib/systemd
 }
 
 sha512sums="2d74a8f2b7439693aae8d47c00fb8d6d134a9eff27d399a084c1282add3d30e1def5f32126eb5479f5711a4cfdc5bffbbbe0b2548879b3f8adad837db67b6776  harbour-amazfish-1.9.8.tar.gz
 4ac649f4f532ac644535a51b4c1d38d27f30e8b0c56afc2c46f5593fd95d9c17661afa26f352023b87cf30c390206644acc6763d0519d5f9895784a64d27dbc6  qble-d531225632b8872997e9facc8bcf15423a9b96c0.tar.gz
-79a1f258c73b6ecf73ad757695cd5656a0ab73aa319f986ae2a3132906947f1bdecfa834de711e67ae56129003ff83379a2d7ded3d9add7b684b3d14e83af885  libwatchfish-e3bf99e47c8c339b15eb4c8d6a485c22e9c7c2cd.tar.gz"
+79a1f258c73b6ecf73ad757695cd5656a0ab73aa319f986ae2a3132906947f1bdecfa834de711e67ae56129003ff83379a2d7ded3d9add7b684b3d14e83af885  libwatchfish-e3bf99e47c8c339b15eb4c8d6a485c22e9c7c2cd.tar.gz
+3f1677d7b954bea6bcf2336edd29915f1d8b5d34acf9b8bd9ed774ae2b595e64c93cb707d80f5f022f3fd5d4ca7c820bac222d2df0c8fa4f6b55ac7ba40e81d6  amazfish.desktop"
diff --git a/community/amazfish/amazfish.desktop b/community/amazfish/amazfish.desktop
new file mode 100644
index 000000000000..8be8c61b0d99
--- /dev/null
+++ b/community/amazfish/amazfish.desktop
@@ -0,0 +1,7 @@
+[Desktop Entry]
+Name=amazfish
+Comment=Start amazfish
+Type=Application
+Exec=/usr/bin/harbour-amazfishd
+TryExec=/usr/bin/harbour-amazfishd
+Terminal=false
-- 
GitLab


From 34b06644682e1bb9dcfbcd4a34b421fe7bf7f7b5 Mon Sep 17 00:00:00 2001
From: Bart Ribbers <bribbers@disroot.org>
Date: Thu, 22 Apr 2021 11:52:26 +0200
Subject: [PATCH 74/87] community/spectacle: replace systemd service file for
 XDG autostart one

---
 community/spectacle/APKBUILD          | 44 +++++++++++++++++++++++----
 community/spectacle/spectacle.desktop |  7 +++++
 2 files changed, 45 insertions(+), 6 deletions(-)
 create mode 100644 community/spectacle/spectacle.desktop

diff --git a/community/spectacle/APKBUILD b/community/spectacle/APKBUILD
index af175ecae20b..554a3a68d0a5 100644
--- a/community/spectacle/APKBUILD
+++ b/community/spectacle/APKBUILD
@@ -2,13 +2,39 @@
 # Maintainer: Bart Ribbers <bribbers@disroot.org>
 pkgname=spectacle
 pkgver=20.12.3
-pkgrel=0
+pkgrel=1
 pkgdesc="Application for capturing desktop screenshots"
-arch="all !armhf !s390x !mips64" # armhf blocked by extra-cmake-modules
+# armhf blocked by extra-cmake-modules
+# s390x and mips64 blocked by kdeclarative
+arch="all !armhf !s390x !mips64"
 url="https://kde.org/applications/utilities/org.kde.spectacle"
 license="GPL-2.0-only"
-makedepends="extra-cmake-modules qt5-qtbase-dev qt5-qtx11extras-dev kcoreaddons-dev kwidgetsaddons-dev kdbusaddons-dev knotifications-dev kconfig-dev ki18n-dev kio-dev kwindowsystem-dev kdoctools-dev knewstuff-dev kdeclarative-dev libkipi-dev purpose-dev kwayland-dev xcb-util-image-dev xcb-util-cursor-dev libxcb-dev xcb-util-renderutil-dev"
-source="https://download.kde.org/stable/release-service/$pkgver/src/spectacle-$pkgver.tar.xz"
+makedepends="
+	extra-cmake-modules
+	kconfig-dev
+	kcoreaddons-dev
+	kdbusaddons-dev
+	kdeclarative-dev
+	kdoctools-dev
+	ki18n-dev
+	kio-dev
+	knewstuff-dev
+	knotifications-dev
+	kwayland-dev
+	kwidgetsaddons-dev
+	kwindowsystem-dev
+	libkipi-dev
+	libxcb-dev
+	purpose-dev
+	qt5-qtbase-dev
+	qt5-qtx11extras-dev
+	xcb-util-cursor-dev
+	xcb-util-image-dev
+	xcb-util-renderutil-dev
+	"
+source="https://download.kde.org/stable/release-service/$pkgver/src/spectacle-$pkgver.tar.xz
+	spectacle.desktop
+	"
 subpackages="$pkgname-doc $pkgname-lang"
 
 build() {
@@ -25,6 +51,12 @@ check() {
 }
 
 package() {
-	DESTDIR="$pkgdir" cmake --build build --target install
+	DESTDIR="$pkgdir" cmake --install build
+
+	install -Dm644 "$srcdir"/spectacle.desktop -t "$pkgdir"/etc/xdg/autostart/
+
+	# We don't ship systemd
+	rm -r "$pkgdir"/usr/lib/systemd
 }
-sha512sums="4749916ff1557d89c3a8aeae06ce2da4e3f5bbbc3495a588209d797453b265447a857266889a81178f33b12631f6ec29be7a65a3f98f27de604c198e997795dc  spectacle-20.12.3.tar.xz"
+sha512sums="4749916ff1557d89c3a8aeae06ce2da4e3f5bbbc3495a588209d797453b265447a857266889a81178f33b12631f6ec29be7a65a3f98f27de604c198e997795dc  spectacle-20.12.3.tar.xz
+7c563d811f30d26f83e01a465e803b95167c5b2b842315257216ab282e07c69e7582a14d7f429cd19678199179ad8f3f2854265092f5a4c9ce9b65c87ed3849d  spectacle.desktop"
diff --git a/community/spectacle/spectacle.desktop b/community/spectacle/spectacle.desktop
new file mode 100644
index 000000000000..6392a23e7f5f
--- /dev/null
+++ b/community/spectacle/spectacle.desktop
@@ -0,0 +1,7 @@
+[Desktop Entry]
+Name=spectacle
+Comment=Start spectacle DBus service
+Type=Application
+Exec=/usr/bin/spectacle --dbus
+TryExec=/usr/bin/spectacle
+Terminal=false
-- 
GitLab


From 8277f77e6d497d0acb169e564527e43f2597e1d0 Mon Sep 17 00:00:00 2001
From: Bart Ribbers <bribbers@disroot.org>
Date: Thu, 22 Apr 2021 11:54:45 +0200
Subject: [PATCH 75/87] community/kio-fuse: replace systemd service file for
 XDG autostart one

---
 community/kio-fuse/APKBUILD         | 12 ++++++++----
 community/kio-fuse/kio-fuse.desktop |  7 +++++++
 2 files changed, 15 insertions(+), 4 deletions(-)
 create mode 100644 community/kio-fuse/kio-fuse.desktop

diff --git a/community/kio-fuse/APKBUILD b/community/kio-fuse/APKBUILD
index 6984a1e8baf2..c57e9bab08cc 100644
--- a/community/kio-fuse/APKBUILD
+++ b/community/kio-fuse/APKBUILD
@@ -2,7 +2,7 @@
 # Maintainer: Bart Ribbers <bribbers@disroot.org>
 pkgname=kio-fuse
 pkgver=5.0.1
-pkgrel=0
+pkgrel=1
 arch="all !armhf !s390x !mips64"
 url="https://kde.org/"
 pkgdesc="FUSE interface for KIO"
@@ -18,6 +18,7 @@ makedepends="
 checkdepends="dbus"
 source="https://download.kde.org/stable/kio-fuse/$pkgver/kio-fuse-$pkgver.tar.xz
 	modules-load.conf
+	kio-fuse.desktop
 	"
 install="$pkgname.post-install"
 options="!check" # Only test is broken
@@ -39,10 +40,13 @@ package() {
 	DESTDIR="$pkgdir" cmake --install build
 
 	install -Dm644 "$srcdir"/modules-load.conf "$pkgdir"/usr/lib/modules-load.d/kio-fuse.conf
+	install -Dm644 "$srcdir"/kio-fuse.desktop -t "$pkgdir"/etc/xdg/autostart/
 
-	# Part of systemd-tmpfiles
-	rm -rf "$pkgdir"/usr/lib/tmpfiles.d
+	# We don't ship systemd
+	rm -r "$pkgdir"/usr/lib/tmpfiles.d
+	rm -r "$pkgdir"/usr/lib/systemd
 }
 
 sha512sums="6423c461c001bb27d4e17e6f9a69e4a28c2e7834b6702bd14e4b34db9fc3156cdbb5400ec2c3f15975e78e563abbf14412f8f1b1db05f6313a8520bab030e7bd  kio-fuse-5.0.1.tar.xz
-57d23d2778556eafc3035e6be575bf95b4032f123b35f2b1657eff5e7496de253173edc657f90531ee58e25673f4f27a5cd1cc76b14a038edb244f104a231771  modules-load.conf"
+57d23d2778556eafc3035e6be575bf95b4032f123b35f2b1657eff5e7496de253173edc657f90531ee58e25673f4f27a5cd1cc76b14a038edb244f104a231771  modules-load.conf
+94a5acc6d6b622f923e6fa077cac63f365ad1a0828690336421368f7300179b39318b10c5e6490de7c442e2713dc25b2b3fb17fee4ac4064595a474ea50c2137  kio-fuse.desktop"
diff --git a/community/kio-fuse/kio-fuse.desktop b/community/kio-fuse/kio-fuse.desktop
new file mode 100644
index 000000000000..f05118ff0d9e
--- /dev/null
+++ b/community/kio-fuse/kio-fuse.desktop
@@ -0,0 +1,7 @@
+[Desktop Entry]
+Name=kio-fuse
+Comment=Fuse interface for KIO
+Type=Application
+Exec=/usr/lib/libexec/kio-fuse -f
+TryExec=/usr/lib/libexec/kio-fuse
+Terminal=false
-- 
GitLab


From a6da50f8d999896da9e0f825797f5f6cd8e33dd1 Mon Sep 17 00:00:00 2001
From: Bart Ribbers <bribbers@disroot.org>
Date: Thu, 22 Apr 2021 11:56:53 +0200
Subject: [PATCH 76/87] community/kded: remove systemd leftovers

---
 community/kded/APKBUILD | 21 +++++++++++++++++----
 1 file changed, 17 insertions(+), 4 deletions(-)

diff --git a/community/kded/APKBUILD b/community/kded/APKBUILD
index 7d820986d23c..03fc51a2c350 100644
--- a/community/kded/APKBUILD
+++ b/community/kded/APKBUILD
@@ -2,13 +2,23 @@
 # Maintainer: Bart Ribbers <bribbers@disroot.org>
 pkgname=kded
 pkgver=5.81.0
-pkgrel=0
+pkgrel=1
 pkgdesc="Extensible deamon for providing system level services"
 arch="all !armhf" # armhf blocked by extra-cmake-modules
 url="https://community.kde.org/Frameworks"
 license="LGPL-2.1-only AND LGPL-2.1-or-later"
-depends_dev="qt5-qtbase-dev kconfig-dev kcoreaddons-dev kcrash-dev kdbusaddons-dev kservice-dev"
-makedepends="$depends_dev extra-cmake-modules kdoctools-dev"
+depends_dev="
+	kconfig-dev
+	kcoreaddons-dev
+	kcrash-dev
+	kdbusaddons-dev
+	kservice-dev
+	qt5-qtbase-dev
+	"
+makedepends="$depends_dev
+	extra-cmake-modules
+	kdoctools-dev
+	"
 source="https://download.kde.org/stable/frameworks/${pkgver%.*}/kded-$pkgver.tar.xz"
 subpackages="$pkgname-dev $pkgname-doc"
 
@@ -27,6 +37,9 @@ check() {
 
 
 package() {
-	DESTDIR="$pkgdir" cmake --build build --target install
+	DESTDIR="$pkgdir" cmake --install build
+
+	# We don't ship systemd
+	rm -r "$pkgdir"/usr/lib/systemd
 }
 sha512sums="525ee674e2f20851d319e53a8119c8b248db22c72f7ad5ce6efaad1b352182f3a884633e33a7370225978057aff4ee4cb633580f2f54ae7cfc30da5f9b187007  kded-5.81.0.tar.xz"
-- 
GitLab


From ce5c322ad79ac6b4d1074d7e5cb988256d669e06 Mon Sep 17 00:00:00 2001
From: Bart Ribbers <bribbers@disroot.org>
Date: Thu, 22 Apr 2021 11:59:37 +0200
Subject: [PATCH 77/87] community/powerdevil: remove systemd leftovers

---
 community/powerdevil/APKBUILD | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/community/powerdevil/APKBUILD b/community/powerdevil/APKBUILD
index 6c999e194277..a486fd82ce1d 100644
--- a/community/powerdevil/APKBUILD
+++ b/community/powerdevil/APKBUILD
@@ -2,7 +2,7 @@
 # Maintainer: Bart Ribbers <bribbers@disroot.org>
 pkgname=powerdevil
 pkgver=5.21.4
-pkgrel=0
+pkgrel=1
 pkgdesc="Manages the power consumption settings of a Plasma Shell"
 # armhf blocked by extra-cmake-modules
 # s390x blocked by libksysguard
@@ -60,6 +60,9 @@ check() {
 package() {
 	DESTDIR="$pkgdir" cmake --install build
 
+	# We don't ship systemd
+	rm -r "$pkgdir"/usr/lib/systemd
+
 	# org_kde_powerdevil has CAP_WAKE_ALARM set and this breaks dbus
 	# Remove CAP_WAKE_ALARM from org_kde_powerdevil to make it work again
 	setcap -r "$pkgdir"/usr/lib/libexec/org_kde_powerdevil
-- 
GitLab


From d53dbe3ee33df059389a4721449db090b4cc1777 Mon Sep 17 00:00:00 2001
From: Bart Ribbers <bribbers@disroot.org>
Date: Thu, 22 Apr 2021 12:00:22 +0200
Subject: [PATCH 78/87] community/kwin: remove systemd leftovers

---
 community/kwin/APKBUILD | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/community/kwin/APKBUILD b/community/kwin/APKBUILD
index ecab0e182f80..9641a16f8103 100644
--- a/community/kwin/APKBUILD
+++ b/community/kwin/APKBUILD
@@ -2,7 +2,7 @@
 # Maintainer: Bart Ribbers <bribbers@disroot.org>
 pkgname=kwin
 pkgver=5.21.4
-pkgrel=0
+pkgrel=1
 pkgdesc="An easy to use, but flexible, composited Window Manager"
 # armhf blocked by qt5-qtdeclarative
 # s390x blocked by kscreenlocker
@@ -98,6 +98,9 @@ check() {
 package() {
 	DESTDIR="$pkgdir" cmake --install build
 
+	# We don't ship systemd
+	rm -r "$pkgdir"/usr/lib/systemd
+
 	# kwin_wayland has CAP_SYS_NICE set. Because of this, libdbus doesn't trust the
 	# environment and ignores it, causing for example keyboard shortcuts to not work
 	# Remove CAP_SYS_NICE from kwin_wayland to make them work again
-- 
GitLab


From 51fe4507dabb5ba7b39f5f879784a26fe7a1b925 Mon Sep 17 00:00:00 2001
From: Bart Ribbers <bribbers@disroot.org>
Date: Thu, 22 Apr 2021 12:01:59 +0200
Subject: [PATCH 79/87] community/plasma-workspace: remove systemd leftovers

---
 community/plasma-workspace/APKBUILD | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/community/plasma-workspace/APKBUILD b/community/plasma-workspace/APKBUILD
index e3767912b993..a6a0453003c4 100644
--- a/community/plasma-workspace/APKBUILD
+++ b/community/plasma-workspace/APKBUILD
@@ -2,7 +2,7 @@
 # Maintainer: Bart Ribbers <bribbers@disroot.org>
 pkgname=plasma-workspace
 pkgver=5.21.4
-pkgrel=0
+pkgrel=1
 pkgdesc="KDE Plasma Workspace"
 # armhf blocked by kirigami2
 # s390x blocked by kactivitymanagerd
@@ -96,5 +96,8 @@ check() {
 
 package() {
 	DESTDIR="$pkgdir" cmake --install build
+
+	# We don't ship systemd
+	rm -r "$pkgdir"/usr/lib/systemd
 }
 sha512sums="80f4b55ce982c3e2d0761cba1d4f14659b2ef9ce9f6d362c4439c5ee404ea7bc9e458cfbfd7e37f9ff67b53cc02f1aa3c62c7b7ad9fcf57646ad59e9f60b94c5  plasma-workspace-5.21.4.tar.xz"
-- 
GitLab


From 7ab03b9c691478af18bdf3f74a8ac794644eece2 Mon Sep 17 00:00:00 2001
From: Bart Ribbers <bribbers@disroot.org>
Date: Thu, 22 Apr 2021 12:03:01 +0200
Subject: [PATCH 80/87] community/polkit-kde-agent-1: remove systemd leftovers

---
 community/polkit-kde-agent-1/APKBUILD | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/community/polkit-kde-agent-1/APKBUILD b/community/polkit-kde-agent-1/APKBUILD
index 3ecc1c41a8b0..0b7c925fe696 100644
--- a/community/polkit-kde-agent-1/APKBUILD
+++ b/community/polkit-kde-agent-1/APKBUILD
@@ -2,7 +2,7 @@
 # Maintainer: Bart Ribbers <bribbers@disroot.org>
 pkgname=polkit-kde-agent-1
 pkgver=5.21.4
-pkgrel=0
+pkgrel=1
 pkgdesc="Daemon providing a polkit authentication UI for KDE"
 # armhf blocked by extra-cmake-modules
 # mips, mips64, s390x blocked by polkit-qt-1
@@ -41,6 +41,9 @@ build() {
 
 package() {
 	DESTDIR="$pkgdir" cmake --install build
+
+	# We don't ship systemd
+	rm -r "$pkgdir"/usr/lib/systemd
 }
 
 sha512sums="2cef98043244cc4b21af173287d1cacecfe428a25924937fa69c2a7eca35ceb10f0f951ad3449d397c261f945e317b1c5f20331a1cadb33ede36c9fd10f00574  polkit-kde-agent-1-5.21.4.tar.xz"
-- 
GitLab


From 298d43d714b6201bed37902d62a985090b737dbd Mon Sep 17 00:00:00 2001
From: Bart Ribbers <bribbers@disroot.org>
Date: Thu, 22 Apr 2021 12:04:01 +0200
Subject: [PATCH 81/87] community/kactivitymanagerd: remove systemd leftovers

---
 community/kactivitymanagerd/APKBUILD | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/community/kactivitymanagerd/APKBUILD b/community/kactivitymanagerd/APKBUILD
index b8e8479bf812..fb0e67f69b0b 100644
--- a/community/kactivitymanagerd/APKBUILD
+++ b/community/kactivitymanagerd/APKBUILD
@@ -2,7 +2,7 @@
 # Maintainer: Bart Ribbers <bribbers@disroot.org>
 pkgname=kactivitymanagerd
 pkgver=5.21.4
-pkgrel=1
+pkgrel=2
 pkgdesc="System service to manage user's activities and track the usage patterns"
 # armhf blocked by qt5-qtdeclarative
 # s390x, mips64 blocked by kxmlgui, kio
@@ -46,5 +46,8 @@ check() {
 
 package() {
 	DESTDIR="$pkgdir" cmake --install build
+
+	# We don't ship systemd
+	rm -r "$pkgdir"/usr/lib/systemd
 }
 sha512sums="80ca4cb42e7f4d9e02b9248623a263be655ff787e9e81bab1470a65c2a90761c1c9161ba6980a9a38b26cfc28796f0284b2b1816b8272c3ee759ea1f00dd51af  kactivitymanagerd-5.21.4.tar.xz"
-- 
GitLab


From ec2df36ebee0de2753530d2e09b7b268dfedf9e0 Mon Sep 17 00:00:00 2001
From: Bart Ribbers <bribbers@disroot.org>
Date: Thu, 22 Apr 2021 12:11:03 +0200
Subject: [PATCH 82/87] testing/mapplauncherd-qt: remove systemd leftovers

---
 testing/mapplauncherd-qt/APKBUILD | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/testing/mapplauncherd-qt/APKBUILD b/testing/mapplauncherd-qt/APKBUILD
index 11bb635da9da..06aa3df2ba0a 100644
--- a/testing/mapplauncherd-qt/APKBUILD
+++ b/testing/mapplauncherd-qt/APKBUILD
@@ -2,7 +2,7 @@
 # Maintainer: Bart Ribbers <bribbers@disroot.org>
 pkgname=mapplauncherd-qt
 pkgver=1.1.17
-pkgrel=0
+pkgrel=1
 pkgdesc="Application launch boosters for Qt5"
 url="https://git.sailfishos.org/mer-core/mapplauncherd-qt"
 arch="all"
@@ -26,5 +26,8 @@ build() {
 
 package() {
 	INSTALL_ROOT="$pkgdir" make install
+
+	# We don't ship systemd
+	rm -r "$pkgdir"/usr/lib/systemd
 }
 sha512sums="da9be4f6c121927627ef2a18e07c82a5973bc3a8086e49955677a44c13673a78eef441b159b7d6c43003564fa12d1f8b3e93ed2917baf3a1e0dd36c37da950fe  mapplauncherd-qt-1.1.17.tar.gz"
-- 
GitLab


From fe1a2d48223b061417020072ca4b30edf229b77b Mon Sep 17 00:00:00 2001
From: Bart Ribbers <bribbers@disroot.org>
Date: Thu, 22 Apr 2021 12:12:19 +0200
Subject: [PATCH 83/87] testing/asteroid-alarmclock: remove systemd leftovers

---
 testing/asteroid-alarmclock/APKBUILD | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/testing/asteroid-alarmclock/APKBUILD b/testing/asteroid-alarmclock/APKBUILD
index be3a3d11730d..0f47cfa00af1 100644
--- a/testing/asteroid-alarmclock/APKBUILD
+++ b/testing/asteroid-alarmclock/APKBUILD
@@ -2,7 +2,7 @@
 # Maintainer: Bart Ribbers <bribbers@disroot.org>
 pkgname=asteroid-alarmclock
 pkgver=0_git20210410
-pkgrel=0
+pkgrel=1
 _commit="40f1f1cb1d450c7030130a8bfe1cc457ccdb2b98"
 pkgdesc="Default alarm clock app for AsteroidOS"
 url="https://github.com/AsteroidOS/asteroid-alarmclock"
@@ -48,6 +48,9 @@ package() {
 	INSTALL_ROOT="$pkgdir" make install
 
 	install -Dm644 alarmclock/asteroid-alarmclock.desktop -t "$pkgdir"/usr/share/applications
+
+	# We don't ship systemd
+	rm -r "$pkgdir"/usr/lib/systemd
 }
 
 lang() {
-- 
GitLab


From 35d397cc47768659c96832432b4cf584f030f513 Mon Sep 17 00:00:00 2001
From: Bart Ribbers <bribbers@disroot.org>
Date: Thu, 22 Apr 2021 13:39:05 +0200
Subject: [PATCH 84/87] testing/font-roboto: remove MACOSX files

---
 testing/font-roboto/APKBUILD | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/testing/font-roboto/APKBUILD b/testing/font-roboto/APKBUILD
index 797643eff951..aa29b3596141 100644
--- a/testing/font-roboto/APKBUILD
+++ b/testing/font-roboto/APKBUILD
@@ -2,7 +2,7 @@
 # Maintainer: Bart Ribbers <bribbers@disroot.org>
 pkgname=font-roboto
 pkgver=2.138
-pkgrel=0
+pkgrel=1
 pkgdesc="Standard font for Android 4.0 (Ice Cream Sandwich) and later"
 url="https://github.com/google/roboto"
 arch="noarch"
@@ -14,7 +14,7 @@ options="!check" # No code to test
 builddir="$srcdir"
 
 package() {
-	find . -name "*.ttf" | while read -r i; do
+	find . -name "*.ttf" -maxdepth 1 | while read -r i; do
 		install -Dm644 $i -t "$pkgdir"/usr/share/fonts/TTF
 	done
 
-- 
GitLab


From ce2e8f2542b02a90f93e78dab17adf8f005b9297 Mon Sep 17 00:00:00 2001
From: Bart Ribbers <bribbers@disroot.org>
Date: Thu, 22 Apr 2021 13:43:36 +0200
Subject: [PATCH 85/87] community/mlite: upgrade to 0.3.7

---
 community/mlite/APKBUILD | 10 ++++------
 1 file changed, 4 insertions(+), 6 deletions(-)

diff --git a/community/mlite/APKBUILD b/community/mlite/APKBUILD
index 143d9b3c92b2..a8caed21b04d 100644
--- a/community/mlite/APKBUILD
+++ b/community/mlite/APKBUILD
@@ -1,7 +1,7 @@
 # Contributor: Bart Ribbers <bribbers@disroot.org>
 # Maintainer: Bart Ribbers <bribbers@disroot.org>
 pkgname=mlite
-pkgver=0.3.6
+pkgver=0.3.7
 pkgrel=0
 pkgdesc="Useful classes originating from MeeGo Touch"
 url="https://git.sailfishos.org/mer-core/mlite"
@@ -13,9 +13,7 @@ makedepends="$depends_dev
 	qt5-qttools-dev
 	"
 subpackages="$pkgname-dev"
-source="https://git.sailfishos.org/mer-core/mlite/-/archive/$pkgver/mlite-$pkgver.tar.gz
-	0001-Don-t-wrap-dconf.h-in-a-C-block.patch
-	"
+source="https://git.sailfishos.org/mer-core/mlite/-/archive/$pkgver/mlite-$pkgver.tar.gz"
 
 build() {
 	qmake-qt5
@@ -25,7 +23,7 @@ build() {
 package() {
 	INSTALL_ROOT="$pkgdir" make install
 
+	# Remove installed tests
 	rm -r "$pkgdir/opt"
 }
-sha512sums="4d6c8688ce6b29da00eb71954fcaada65bacbc3ee04050bdd0b29ef086bf8cd608f1ac427cd347112409478aeac47ca0e8f1e01038cd8e8be9253ec3ce4485e2  mlite-0.3.6.tar.gz
-94823a928c5e2a1353c512c4dba17714933feb9ec063fa8f2d492f12add32fde8408f272a38e2696e569e54f8e14a2cb81651c25dfc94e4c29a93975bb343b78  0001-Don-t-wrap-dconf.h-in-a-C-block.patch"
+sha512sums="f738718306bc322b116005a0102942883a3786510b7f3fa395f0d135e0dd90274bfbeb6486c34a38b8ec42ccd32c3ddcc1f450b1916e8969d4fbd94d74b92097  mlite-0.3.7.tar.gz"
-- 
GitLab


From ab8ea9a6b6ae08980ae3ddc6a0674c0789b45ea1 Mon Sep 17 00:00:00 2001
From: lafleur <lafleur@boum.org>
Date: Thu, 22 Apr 2021 15:34:39 +0200
Subject: [PATCH 86/87] community/autologin: source pam_limits.so

---
 community/autologin/APKBUILD | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/community/autologin/APKBUILD b/community/autologin/APKBUILD
index b068232d2f5d..c4fde46f8196 100644
--- a/community/autologin/APKBUILD
+++ b/community/autologin/APKBUILD
@@ -23,5 +23,5 @@ package() {
 	install -Dm644 "$srcdir"/autologin.pamd "$pkgdir"/etc/pam.d/autologin
 }
 
-sha512sums="5a6d128acede98278a3de23da13ae48a692cbcdbdb16519327b58e090fbf177b8e44093a161d04787135da57e67c4819a0907359d94b80baa9cd170610cb056c  autologin-1.0.0.tar.gz
-4427a41eb5d841f2eddd2c976d6694da7a02adf392fe68323fdb5b9da143efa53fccf271ffe931ff144cc50d19b8138f362ca2819704f49ae326d7c60339ab4b  autologin.pamd"
+sha512sums="b2714c1f9385228d8f4a8e68a4abdfcbab0877a4334be609bb70e0aabb280d6d9885ab8d0881eb24085693a0048e51c5b9a98e5118835a74edb3ebbf745561b4  autologin-1.0.0.tar.gz
+e4e90afed8a129f7fa32db7b6dbf72272a6fad43d6bf17bb5ea9767160a4f890f7d160b0365dd66148ea91baa9a98b2b2ec5bc2ae246fcb8191881bdd4677182  autologin.pamd"
-- 
GitLab


From eee03b20e023eb91b1190c63a22c0fed88196ab3 Mon Sep 17 00:00:00 2001
From: lafleur <lafleur@boum.org>
Date: Wed, 20 Oct 2021 21:13:15 +0200
Subject: [PATCH 87/87] main/nftnl: add static subpackage

---
 main/libnftnl/APKBUILD | 19 ++++++++++++++-----
 1 file changed, 14 insertions(+), 5 deletions(-)

diff --git a/main/libnftnl/APKBUILD b/main/libnftnl/APKBUILD
index 188749710962..ff71ad33af2c 100644
--- a/main/libnftnl/APKBUILD
+++ b/main/libnftnl/APKBUILD
@@ -1,15 +1,15 @@
 # Contributor: Sören Tempel <soeren+alpine@soeren-tempel.net>
 # Maintainer: Sören Tempel <soeren+alpine@soeren-tempel.net>
 pkgname=libnftnl
-pkgver=1.1.9
-pkgrel=0
+pkgver=1.2.0
+pkgrel=1
 pkgdesc="Netfilter library providing interface to the nf_tables subsystem"
 url="https://netfilter.org/projects/libnftnl"
 arch="all"
 license="GPL-2.0-or-later"
 depends_dev="libmnl-dev"
 makedepends="$depends_dev bash jansson-dev"
-subpackages="$pkgname-dev $pkgname-libs"
+subpackages="$pkgname-dev $pkgname-static $pkgname-libs"
 source="https://netfilter.org/projects/libnftnl/files/libnftnl-$pkgver.tar.bz2"
 
 case "$CARCH" in
@@ -25,7 +25,8 @@ build() {
 		--sysconfdir=/etc \
 		--mandir=/usr/share/man \
 		--localstatedir=/var \
-		--with-json-parsing
+		--with-json-parsing \
+		--enable-static
 	make
 }
 
@@ -39,4 +40,12 @@ package() {
 	make DESTDIR="$pkgdir" install
 }
 
-sha512sums="8e2551a902a320769198e0ebce52596501c548e230c3172ba4989e25dcb3dd6c9b97a104af69b93ede4ef298811cff10608758e6f1d274e758d87306c4b50f25  libnftnl-1.1.9.tar.bz2"
+static() {
+	mkdir -p "$subpkgdir/usr/lib"
+	install "$builddir/src/.libs/libnftnl.a" "$subpkgdir/usr/lib"
+}
+
+
+sha512sums="
+2a068e7eab308442bbfba5325f3aebeb874c142b029ff5906cadf63a1f879b20930bc55cd9554c5d256a0642f0f5a6d36177d9ae88cf507ab5dfc7fabffbb380  libnftnl-1.2.0.tar.bz2
+"
-- 
GitLab