community/emborg/APKBUILD

 # Contributor: Andy Hawkins <andy@gently.org.uk>
 # Maintainer: Andy Hawkins <andy@gently.org.uk>
 pkgname=emborg
-pkgver=1.23
+pkgver=1.24
 pkgrel=0
 pkgdesc="Front-End to Borg Backup"
 url="https://emborg.readthedocs.io/"
@@ -33,5 +33,5 @@ package() {
 	python3 setup.py install --prefix=/usr --root="$pkgdir"
 }
 sha512sums="
-7011f08c1a0d4468d7230a92002724e149b06d0aa0031d4b34faa1db7dbba3bb986c1061017ac7d5786597f5537589947d7149c6e9f5176651d16b81e9361a40  emborg-v1.23.tar.gz
+fdf89f445c8a13bc2ff102744f11ad7230eee4a739c365f034a89b0161e0c8682f1d7307d7d8b3e9c4a32f0fdb999ab61f4a9349a43823a257d7459d3a011f51  emborg-v1.24.tar.gz
 "

community/hugo/APKBUILD

@@ -2,7 +2,7 @@
 # Contributor: Michał Polański <michal@polanski.me>
 # Maintainer: Thomas Boerger <thomas@webhippie.de>
 pkgname=hugo
-pkgver=0.84.4
+pkgver=0.85.0
 pkgrel=0
 pkgdesc="Fast and flexible static site generator written in Go"
 url="https://gohugo.io/"
@@ -40,7 +40,7 @@ package() {
 }
 
 sha512sums="
-f78ceb7514d87591703ac0f0ff2dfdd6a09d738d319a28f2d9ec13b44ab45d6d9ff02e7378c3764349827fd08d735ebc28b625085130db165232689655dff1e2  hugo-0.84.4.tar.gz
+213ff0d1d87cca7ff87731216d0d0a80c2e5abbcca39a4222615a5a43f7f13f5456609ef47ab7d493a30af8ec65fb8dcfb21bcaacb43fc2d550178f5fe448966  hugo-0.85.0.tar.gz
 f07d458b5df72d0b10e0fd9ec6120502b62af1ee347f0ec83eda99147c525327c0098150db80450da48c5bc03d825279e35f0940dae5d909203757abb6bd1a20  skip-git-tests.patch
 6ba192d8cb67f115f7ce596c297a55fc64713a4cdb0077cfbb7e45051c7560f5b668da88f513d4f34d8e0eeb4a9d991c5312d62e454c85e95960d8a33f0f8f69  skip-para-test.patch
 0eada6d4f318775d24a55bec65349e62148b71322f084874a608596f8248cc948632e5f1823c3e86463090e35777e14784c2bcdb6493ad71be9b98ecc4700f24  skip-js-tests.patch

community/ifstate/APKBUILD

 # Maintainer: Thomas Liske <thomas@fiasko-nw.net>
 pkgname=ifstate
-pkgver=1.5.2
+pkgver=1.5.3
 pkgrel=0
 pkgdesc="Manage host interface settings in a declarative manner"
 url="https://ifstate.net/"
@@ -25,6 +25,6 @@ package() {
 	install -Dm755 "$srcdir"/ifstate.initd "$pkgdir"/etc/init.d/ifstate
 }
 
-sha512sums="ca6533f2fbe1bedce7fa1ba4dfa4da8d55ac4e9966516f4b008f672d98bb34bd4f4e87dfcd7bcd1930686d693d998ae5d34ae46aa200be46c9638738cf98e4c0  ifstate-1.5.2.tar.gz
+sha512sums="5c7d9814df35b677a104308408c0701dd66afeee3e1a1a6bf0284ca942a35e254c29b37f2aa80aa9b8008e771dd2f90d8c1e8540907e6fc5ef59bdbefbaccb10  ifstate-1.5.3.tar.gz
 dfc31dc7452c63ec18d368803ffb3bef1cd96d98345d0c5ef1baeb8b2819130b504d3e6e82d99ee86fa18d4576b7927d0b80d6d79f9f20e388e07faa09a87285  ifstate.conf
 e583c764c65dbf00ce6a4269cef5d8a78c2ec47851671cc25bbebd2d6095c42f0a10eccfd021728e05b3b67d8b950f9e4359da63226da551b8dc5ebd5d8aa0ef  ifstate.initd"

main/glu/APKBUILD

 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=glu
-pkgver=9.0.1
+pkgver=9.0.2
 pkgrel=0
 pkgdesc="Mesa OpenGL Utility library"
 url="https://cgit.freedesktop.org/mesa/glu/"
@@ -11,7 +11,7 @@ depends_dev="mesa-dev"
 makedepends="$depends_dev"
 replaces="mesa-glu"
 subpackages="$pkgname-dev"
-source="ftp://ftp.freedesktop.org/pub/mesa/glu/glu-$pkgver.tar.xz"
+source="https://mesa.freedesktop.org/archive/glu/glu-$pkgver.tar.xz"
 
 build() {
 	cd "$builddir"
@@ -28,4 +28,6 @@ package() {
 	make DESTDIR="$pkgdir" install
 }
 
-sha512sums="8a6dae5b4bd63efb96d15f23ccda4ad9c2ffaa964897e5fa63d1e58360d8d4e6732c5efd2109dba04155d5fc457ab1718a65cf9b544ce0d452679ba988d04018  glu-9.0.1.tar.xz"
+sha512sums="
+2517d7406bb643d12c017a95dcb5d8716f307344332638bcbdf274a90752a7c22165d34745f1b082ed916bb07d40e62d1d1d67d96426225be63166f3480d6f64  glu-9.0.2.tar.xz
+"

main/ncdu/APKBUILD

 # Contributor: Fabian Affolter <fabian@affolter-engineering.ch>
 # Maintainer: Fabian Affolter <fabian@affolter-engineering.ch>
 pkgname=ncdu
-pkgver=1.15.1
+pkgver=1.16
 pkgrel=0
 pkgdesc="Text-based disk usage viewer"
 url="https://dev.yorhel.nl/ncdu"
@@ -26,4 +26,6 @@ package() {
 	make DESTDIR="$pkgdir" install
 }
 
-sha512sums="572379264b9bd0d782151bd2f79add0e7a6d092029a041ff8f9288e928a4b6a6733467bca7c1702cbb44c3861279da1bc3d4278df6fba1814fe1dc909f2d8087  ncdu-1.15.1.tar.gz"
+sha512sums="
+ac8b7e573332e4e006bf743224096b697517b6899744f189ea5a31665c1ef5e50c7fdaaa0a50a8d7bc3d471656f1f1c6681c21368bdaf983257d8cc311a0dfd0  ncdu-1.16.tar.gz
+"

main/valgrind/APKBUILD

 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=valgrind
 pkgver=3.17.0
-pkgrel=0
+pkgrel=1
 pkgdesc="A tool to help find memory-management problems in programs"
-url="http://valgrind.org/"
+url="https://valgrind.org/"
 arch="all !mips64 !riscv64" # TODO: fix with mips64 softfloat
 license="GPL-2.0-or-later"
 # it seems like busybox sed works but the configure script requires GNU sed
@@ -15,7 +15,7 @@ makedepends="sed perl bash autoconf automake libtool"
 #   messages.
 options="!strip !check"
 subpackages="$pkgname-dev $pkgname-doc"
-source="ftp://sourceware.org/pub/$pkgname/$pkgname-$pkgver.tar.bz2
+source="https://sourceware.org/pub/valgrind/valgrind-$pkgver.tar.bz2
 	musl.supp
 	uclibc.patch
 	arm.patch
@@ -49,7 +49,7 @@ build() {
 }
 
 check() {
-	cd "$buildir"
+	cd "$builddir"
 	make check
 }
 

testing/apparmor/0002-utils-remove-vim-from-the-default-build.patch

-From 24aca47716b70c1d0e3b58a1fbd8e312fec70e07 Mon Sep 17 00:00:00 2001
-From: allgdante <allan.garret@gmail.com>
-Date: Wed, 4 Jul 2018 17:02:34 +0200
-Subject: [PATCH 2/7] utils: remove vim from the default build
-
-We will build the vim utils as a separate target
----
- utils/Makefile | 4 ----
- 1 file changed, 4 deletions(-)
-
-diff --git a/utils/Makefile b/utils/Makefile
-index 68f8c376..01604796 100644
---- a/utils/Makefile
-+++ b/utils/Makefile
-@@ -32,7 +32,6 @@ MANPAGES = ${TOOLS:=.8} logprof.conf.5
- 
- all: docs
- 	$(MAKE) -C po all
--	$(MAKE) -C vim all
- 
- .PHONY: docs
- docs: ${MANPAGES} ${HTMLMANPAGES}
-@@ -58,7 +57,6 @@ install: ${MANPAGES} ${HTMLMANPAGES}
- 	install -m 755 $(filter-out aa-easyprof, ${TOOLS}) ${BINDIR}
- 	$(MAKE) -C po install DESTDIR=${DESTDIR} NAME=${NAME}
- 	$(MAKE) install_manpages DESTDIR=${DESTDIR}
--	$(MAKE) -C vim install DESTDIR=${DESTDIR}
- 	ln -sf aa-status.8 ${DESTDIR}/${MANDIR}/man8/apparmor_status.8
- 	${PYTHON} ${PYSETUP} install --prefix=${PYPREFIX} --root=${DESTDIR} --version=${VERSION}
- 
-@@ -69,7 +67,6 @@ endif
- clean: pod_clean
- 	rm -f core core.* *.o *.s *.a *~
- 	$(MAKE) -C po clean
--	$(MAKE) -C vim clean
- 	$(MAKE) -C test clean
- 	rm -rf staging/ build/
- 	rm -f apparmor/*.pyc apparmor/rule/*.pyc
-@@ -100,4 +97,3 @@ check: check_severity_db check_pod_files
- 		$(PYFLAKES) $$i || exit 1; \
- 	done
- 	$(MAKE) -C test check
--	$(MAKE) -C vim check
--- 
-2.20.1
-

testing/apparmor/0008-Fix-profile-loading-in-busybox.patch

-From 2a6a482eac7c6290d2e4349ff4bae1b9a749497f Mon Sep 17 00:00:00 2001
-From: allgdante <allan.garret@gmail.com>
-Date: Sun, 22 Mar 2020 17:30:20 +0000
-Subject: [PATCH 08/12] Fix profile loading in busybox
-
-Just apply the patch present in
-https://gitlab.com/apparmor/apparmor/-/issues/80
----
- parser/rc.apparmor.functions | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/parser/rc.apparmor.functions b/parser/rc.apparmor.functions
-index 22e8367f..8c1c57c5 100644
---- a/parser/rc.apparmor.functions
-+++ b/parser/rc.apparmor.functions
-@@ -140,7 +140,7 @@ force_complain() {
- 	local profile=$1
- 
- 	# if profile not in complain mode
--	if ! egrep -q "^/.*[ \t]+flags[ \t]*=[ \t]*\([ \t]*complain[ \t]*\)[ \t]+{" $profile ; then
-+	if ! egrep -q '^/.*[ \t]+flags[ \t]*=[ \t]*\([ \t]*complain[ \t]*\)[ \t]+\{' $profile ; then
- 		local link="${PROFILE_DIR}/force-complain/`basename ${profile}`"
- 		if [ -e "$link" ] ; then
- 			aa_log_warning_msg "found $link, forcing complain mode"
--- 
-2.25.2
-

testing/apparmor/0009-ensure-make-apparmor_parser-is-cached.patch

-From 71bbc6a4ce79802ad037227382817c5998ffbb2e Mon Sep 17 00:00:00 2001
-From: Eric Chiang <ericchiang@google.com>
-Date: Thu, 17 Jan 2019 11:02:57 -0800
-Subject: [PATCH 09/12] *: ensure make apparmor_parser is cached
-
-This change updates parser/Makefile to respect target dependencies and
-not rebuild apparmor_parser if nothing's changed. The goal is to allow
-cross-compiled tests #17 to run on a target system without the tests
-attempting to rebuild the parser.
-
-Two changes were made:
-
-* Generate af_names.h in a script so the script timestamp is compared.
-* Use FORCE instead of PHONY for libapparmor_re/libapparmor_re.a
-
-Changes to list_af_names are intended to exactly replicate the old
-behavior.
-
-Signed-off-by: Eric Chiang <ericchiang@google.com>
----
- common/Make.rules                | 21 ---------------------
- common/list_af_names.sh          | 19 +++++++++++++++++++
- parser/Makefile                  | 13 +++++--------
- utils/vim/create-apparmor.vim.py |  2 +-
- 4 files changed, 25 insertions(+), 30 deletions(-)
- create mode 100755 common/list_af_names.sh
-
-diff --git a/common/Make.rules b/common/Make.rules
-index d2149fcd..357bdec8 100644
---- a/common/Make.rules
-+++ b/common/Make.rules
-@@ -87,27 +87,6 @@ CAPABILITIES=$(shell echo "\#include <linux/capability.h>" | cpp -dM | LC_ALL=C
- list_capabilities: /usr/include/linux/capability.h
- 	@echo "$(CAPABILITIES)"
- 
--# =====================
--# generate list of network protocols based on
--# sys/socket.h for use in multiple locations in
--# the source tree
--# =====================
--
--# These are the families that it doesn't make sense for apparmor
--# to mediate. We use PF_ here since that is what is required in
--# bits/socket.h, but we will rewrite these as AF_.
--
--FILTER_FAMILIES=PF_UNIX
--
--__FILTER=$(shell echo $(strip $(FILTER_FAMILIES)) | sed -e 's/ /\\\|/g')
--
--# emits the AF names in a "AF_NAME NUMBER," pattern
--AF_NAMES=$(shell echo "\#include <sys/socket.h>" | cpp -dM | LC_ALL=C sed -n -e '/$(__FILTER)/d' -e 's/PF_LOCAL/PF_UNIX/' -e 's/^\#define[ \t]\+PF_\([A-Z0-9_]\+\)[ \t]\+\([0-9]\+\).*$$/AF_\1 \2,/p' | sort -n -k2)
--
--.PHONY: list_af_names
--list_af_names:
--	@echo "$(AF_NAMES)"
--
- # =====================
- # manpages
- # =====================
-diff --git a/common/list_af_names.sh b/common/list_af_names.sh
-new file mode 100755
-index 00000000..d7987537
---- /dev/null
-+++ b/common/list_af_names.sh
-@@ -0,0 +1,19 @@
-+#!/bin/bash -e
-+
-+# =====================
-+# generate list of network protocols based on
-+# sys/socket.h for use in multiple locations in
-+# the source tree
-+# =====================
-+
-+# It doesn't make sence for AppArmor to mediate PF_UNIX, filter it out. Search
-+# for "PF_" constants since that is what is required in bits/socket.h, but
-+# rewrite as "AF_".
-+
-+echo "#include <sys/socket.h>" | \
-+  cpp -dM | \
-+  LC_ALL=C sed -n \
-+    -e '/PF_UNIX/d' \
-+    -e 's/PF_LOCAL/PF_UNIX/' \
-+    -e 's/^#define[ \t]\+PF_\([A-Z0-9_]\+\)[ \t]\+\([0-9]\+\).*$/AF_\1 \2,/p' | \
-+  sort -n -k2
-diff --git a/parser/Makefile b/parser/Makefile
-index c1ca4b45..aa5ab730 100644
---- a/parser/Makefile
-+++ b/parser/Makefile
-@@ -281,10 +281,9 @@ parser_version.h: Makefile
- # as well as the filtering that occurs for network protocols that
- # apparmor should not mediate.
- 
--.PHONY: af_names.h
--af_names.h:
--	echo "$(AF_NAMES)" | LC_ALL=C sed -n -e 's/[ \t]\?AF_MAX[ \t]\+[0-9]\+,//g'  -e 's/[ \t]\+\?AF_\([A-Z0-9_]\+\)[ \t]\+\([0-9]\+\),/#ifndef AF_\1\n#  define AF_\1 \2\n#endif\nAA_GEN_NET_ENT("\L\1", \UAF_\1)\n\n/pg' > $@
--	echo "$(AF_NAMES)" | LC_ALL=C sed -n -e 's/.*,[ \t]\+AF_MAX[ \t]\+\([0-9]\+\),\?.*/#define AA_AF_MAX \1\n/p' >> $@
-+af_names.h: ../common/list_af_names.sh
-+	../common/list_af_names.sh | LC_ALL=C sed -n -e 's/[ \t]\?AF_MAX[ \t]\+[0-9]\+,//g'  -e 's/[ \t]\+\?AF_\([A-Z0-9_]\+\)[ \t]\+\([0-9]\+\),/#ifndef AF_\1\n#  define AF_\1 \2\n#endif\nAA_GEN_NET_ENT("\L\1", \UAF_\1)\n/pg' > $@
-+	../common/list_af_names.sh | LC_ALL=C sed -n -e 's/AF_MAX[ \t]\+\([0-9]\+\),\?.*/\n#define AA_AF_MAX \1\n/p' >> $@
- 	# cat $@
- 
- cap_names.h: /usr/include/linux/capability.h
-@@ -304,10 +303,7 @@ tests: apparmor_parser ${TESTS}
- 	sh -e -c 'for test in ${TESTS} ; do echo "*** running $${test}" && ./$${test}; done'
- 	$(Q)$(MAKE) -s -C tst tests
- 
--# always need to rebuild.
--.SILENT: $(AAREOBJECT)
--.PHONY: $(AAREOBJECT)
--$(AAREOBJECT):
-+$(AAREOBJECT): FORCE
- 	$(MAKE) -C $(AAREDIR) CFLAGS="$(EXTRA_CXXFLAGS)"
- 
- .PHONY: install-rhel4
-@@ -408,3 +404,4 @@ clean: pod_clean
- 	$(MAKE) -s -C po clean
- 	$(MAKE) -s -C tst clean
- 
-+FORCE:
-diff --git a/utils/vim/create-apparmor.vim.py b/utils/vim/create-apparmor.vim.py
-index 10bd5b8d..fea134f6 100644
---- a/utils/vim/create-apparmor.vim.py
-+++ b/utils/vim/create-apparmor.vim.py
-@@ -57,7 +57,7 @@ for cap in capabilities:
-         benign_caps.append(cap)
- 
- # get network protos list
--(rc, output) = cmd(['make', '-s', '--no-print-directory', 'list_af_names'])
-+(rc, output) = cmd(['../../common/list_af_names.sh'])
- if rc != 0:
-     sys.stderr.write("make list_af_names failed: " + output)
-     exit(rc)
--- 
-2.25.2
-

testing/apparmor/0010-Revert-utils-test-network.py-fix-failing-testcase.patch

-From 03baa934e415e4181bb43e466e09af2ec1f512f0 Mon Sep 17 00:00:00 2001
-From: allgdante <allan.garret@gmail.com>
-Date: Mon, 23 Mar 2020 16:17:59 +0000
-Subject: [PATCH 10/12] Revert "utils/test-network.py: fix failing testcase"
-
-This reverts commit 0c65b9aeb925297b95e249caa57d33221295d5ea.
----
- utils/test/test-network.py | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/utils/test/test-network.py b/utils/test/test-network.py
-index 8605786d..73a6b9d1 100644
---- a/utils/test/test-network.py
-+++ b/utils/test/test-network.py
-@@ -31,7 +31,7 @@ exp = namedtuple('exp', ['audit', 'allow_keyword', 'deny', 'comment',
- 
- class NetworkKeywordsTest(AATest):
-     def test_network_keyword_list(self):
--        rc, output = cmd(['make', '-s', '--no-print-directory', 'list_af_names'])
-+        rc, output = cmd('../../common/list_af_names.sh')
-         self.assertEqual(rc, 0)
- 
-         af_names = []
--- 
-2.25.2
-

testing/apparmor/0011-Generate-CAPABILITIES-in-a-script-due-to-make-4.3.patch

-From e23c66c45436833046a0f7bdd80ad41fc6ebd050 Mon Sep 17 00:00:00 2001
-From: allgdante <allan.garret@gmail.com>
-Date: Mon, 23 Mar 2020 15:09:15 +0000
-Subject: [PATCH 11/12] Generate CAPABILITIES in a script due to make 4.3
-
-This way we could generate the capabilities in a way that works with
-every version of make.
-Changes to list_capabilities are intended to exactly replicate the old
-behavior.
----
- common/Make.rules                | 13 -------------
- common/list_capabilities.sh      | 14 ++++++++++++++
- parser/Makefile                  |  2 +-
- utils/Makefile                   |  2 +-
- utils/vim/create-apparmor.vim.py |  2 +-
- 5 files changed, 17 insertions(+), 16 deletions(-)
- create mode 100755 common/list_capabilities.sh
-
-diff --git a/common/Make.rules b/common/Make.rules
-index 357bdec8..ecc6181a 100644
---- a/common/Make.rules
-+++ b/common/Make.rules
-@@ -74,19 +74,6 @@ endif
- pod_clean:
- 	-rm -f ${MANPAGES} *.[0-9].gz ${HTMLMANPAGES} pod2htm*.tmp
- 
--# =====================
--# generate list of capabilities based on
--# /usr/include/linux/capabilities.h for use in multiple locations in
--# the source tree
--# =====================
--
--# emits defined capabilities in a simple list, e.g. "CAP_NAME CAP_NAME2"
--CAPABILITIES=$(shell echo "\#include <linux/capability.h>" | cpp -dM | LC_ALL=C sed -n -e '/CAP_EMPTY_SET/d' -e 's/^\#define[ \t]\+CAP_\([A-Z0-9_]\+\)[ \t]\+\([0-9xa-f]\+\)\(.*\)$$/CAP_\1/p' | LC_ALL=C sort)
--
--.PHONY: list_capabilities
--list_capabilities: /usr/include/linux/capability.h
--	@echo "$(CAPABILITIES)"
--
- # =====================
- # manpages
- # =====================
-diff --git a/common/list_capabilities.sh b/common/list_capabilities.sh
-new file mode 100755
-index 00000000..4e37cda7
---- /dev/null
-+++ b/common/list_capabilities.sh
-@@ -0,0 +1,14 @@
-+#!/bin/bash -e
-+
-+# =====================
-+# generate list of capabilities based on
-+# /usr/include/linux/capabilities.h for use in multiple locations in
-+# the source tree
-+# =====================
-+
-+echo "#include <linux/capability.h>" | \
-+  cpp -dM | \
-+  LC_ALL=C sed -n \
-+    -e '/CAP_EMPTY_SET/d' \
-+    -e 's/^\#define[ \t]\+CAP_\([A-Z0-9_]\+\)[ \t]\+\([0-9xa-f]\+\)\(.*\)$/CAP_\1/p' | \
-+  LC_ALL=C sort
-diff --git a/parser/Makefile b/parser/Makefile
-index aa5ab730..1df7c143 100644
---- a/parser/Makefile
-+++ b/parser/Makefile
-@@ -287,7 +287,7 @@ af_names.h: ../common/list_af_names.sh
- 	# cat $@
- 
- cap_names.h: /usr/include/linux/capability.h
--	echo "$(CAPABILITIES)" | LC_ALL=C sed -n -e "s/[ \\t]\\?CAP_\\([A-Z0-9_]\\+\\)/\{\"\\L\\1\", \\UCAP_\\1\},\\n/pg" > $@
-+	../common/list_capabilities.sh | LC_ALL=C sed -n -e "s/[ \\t]\\?CAP_\\([A-Z0-9_]\\+\\)/\{\"\\L\\1\", \\UCAP_\\1\},\\n/pg" > $@
- 
- tst_lib: lib.c parser.h $(filter-out lib.o, ${TEST_OBJECTS})
- 	$(CXX) $(TEST_CFLAGS) -o $@ $< $(filter-out $(<:.c=.o), ${TEST_OBJECTS}) $(TEST_LDFLAGS) $(TEST_LDLIBS)
-diff --git a/utils/Makefile b/utils/Makefile
-index 01604796..16248083 100644
---- a/utils/Makefile
-+++ b/utils/Makefile
-@@ -77,7 +77,7 @@ clean: pod_clean
- .SILENT: check_severity_db
- check_severity_db: /usr/include/linux/capability.h severity.db
- 	# The sed statement is based on the one in the parser's makefile
--	RC=0 ; for cap in ${CAPABILITIES} ; do \
-+	RC=0 ; for cap in $(shell ../common/list_capabilities.sh) ; do \
- 	    if !  grep -q -w $${cap} severity.db ; then \
- 		echo "Warning! capability $${cap} not found in severity.db" ; \
- 		RC=1 ; \
-diff --git a/utils/vim/create-apparmor.vim.py b/utils/vim/create-apparmor.vim.py
-index fea134f6..6a5f02a2 100644
---- a/utils/vim/create-apparmor.vim.py
-+++ b/utils/vim/create-apparmor.vim.py
-@@ -45,7 +45,7 @@ def cmd(command, input=None, stderr=subprocess.STDOUT, stdout=subprocess.PIPE, s
-     return [sp.returncode, out + outerr]
- 
- # get capabilities list
--(rc, output) = cmd(['make', '-s', '--no-print-directory', 'list_capabilities'])
-+(rc, output) = cmd(['../../common/list_capabilities.sh'])
- if rc != 0:
-     sys.stderr.write("make list_capabilities failed: " + output)
-     exit(rc)
--- 
-2.25.2
-

testing/apparmor/APKBUILD

 # Contributor: Allan Garret <allan.garret@gmail.com>
 # Maintainer: Allan Garret <allan.garret@gmail.com>
 pkgname=apparmor
-pkgver=2.13.4
-pkgrel=1
+pkgver=3.0.1
+pkgrel=0
 pkgdesc="Linux application security framework - mandatory access control for programs"
 url="https://gitlab.com/apparmor/apparmor/wikis/home"
-arch="all"
+# mips64 blocked by py3-notify2
+arch="all !mips64"
 license="GPL-2.0-only"
 depends="bash"
 makedepends="sed python3 autoconf automake libtool bison flex perl-dev swig
 	gettext-dev python3-dev linux-pam-dev linux-headers"
-checkdepends="dejagnu py3-pyflakes"
+checkdepends="
+	dejagnu
+	py3-notify2
+	py3-psutil
+	py3-pyflakes
+	"
 
 subpackages="
 	libapparmor:_libapparmor
@@ -34,19 +40,14 @@ source="
 	apparmor.initd
 
 	0001-Fix-linking-against-gettext-on-musl-libc.patch
-	0002-utils-remove-vim-from-the-default-build.patch
 	0003-parser-remove-specific-tests-for-rttime.patch
 	0004-parser-remove-specific-tests-for-ofile.patch
 	0005-utils-adjust-tests-to-match-the-Alpine-layout.patch
 	0006-utils-adjust-rc-functions-for-aa-remove-unknown.patch
 	0007-Remove-Locale-gettext-from-parser-tests.patch
-	0008-Fix-profile-loading-in-busybox.patch
-	0009-ensure-make-apparmor_parser-is-cached.patch
-	0010-Revert-utils-test-network.py-fix-failing-testcase.patch
-	0011-Generate-CAPABILITIES-in-a-script-due-to-make-4.3.patch
 	"
 
-builddir="$srcdir"/$pkgname-v$pkgver
+builddir="$srcdir/$pkgname-v$pkgver"
 
 prepare() {
 	default_prepare
@@ -224,16 +225,13 @@ _apparmor_vim() {
 
 
 
-sha512sums="a3800abc736da725fba3f831d4f26f2ce00179c1c8ad46fc5f27a068dc99c610031979c401cb9f86921bbea9dcb5c33dd2dac0536627040e0068c906c3cda942  apparmor-v2.13.4.tar.gz
+sha512sums="
+34e4e2b0a90d27fe434baeabc8837bb782d2fb8574e9e30816de6e440e75ec256facd9a2726199ab5e182b04df26e8cea62ee008e8a08f84a86d12d7b9eadeb0  apparmor-v3.0.1.tar.gz
 1a57cc577ba3aedfbe10ef6148c1e8f5d0bbf65c99e60eec80c52409c9dab59ae002024500c6e4fd0e01e8c7aeb0c85e3e6b41cacee08c17fdd869d31bca614e  apparmor.initd
 e94f44427ed3c6f64462170939ffc92ce9ac1a58c61c7c7c3483fe16fe8e1c419daade9d56cdd342132e4d823dcac1963a86ad889f10bf71fd52b7f54c4694ed  0001-Fix-linking-against-gettext-on-musl-libc.patch
-20817633590c40eb5f6132c11396cf0bbd532b6e436aa90b6ccc61d7c914794d868ec981b91406f6c11f550102aa25a32982610445cc8e5e703ee90697233263  0002-utils-remove-vim-from-the-default-build.patch
 568e10bda27745ac6e1b9495bb6863e93466ee1c387912393c2c7396bcedd7400b13ee233dd953f82460328e3aae45dd2f7aba92962edef31330d6b4dbc9951b  0003-parser-remove-specific-tests-for-rttime.patch
 3a84fb3b2b19ccf52e179190e98ec0da2469727eaaa73d0094b0e9c85b80738c9cb9da9242d17a472a649e6042933bedb5f78c3f574d555369a4ece38a1d8a8a  0004-parser-remove-specific-tests-for-ofile.patch
 ebe2494e0023d45a41623038f8126fd5366606507d7c1caadf776253a5a64e2979ed157b00d2240556945c414fd3a6dff3d5ce971a5c975033dfb53db60abecc  0005-utils-adjust-tests-to-match-the-Alpine-layout.patch
 38ebb30a0185f8eabd9103925959da365f64ef485f66ffb10180ac596fc172f9c98df39baec0b035138e9ab32056148e69a066faba9faebf9e92bf7a09c150c0  0006-utils-adjust-rc-functions-for-aa-remove-unknown.patch
 093c2f216776c5cc67294a134af6ef788dd5a82477592093abbdd244d65591006890a7c911d4f72d7c0ceac5d3ee33927b055a6d3731284701057b35372e7265  0007-Remove-Locale-gettext-from-parser-tests.patch
-017de8d6632204b0bdf025d25ef94be639adf742281693dc028eca428171409dcf86c7547f61ad6c4c7f4175480940eaca3e3ad888e5a9649946f56eafc50e40  0008-Fix-profile-loading-in-busybox.patch
-4e8dc9e0ca8c68b13a5a6c8c0eb1c8fb11fc1d59741753a0fd55a80f1b7f8e6d73c7c13a53a855f374d7555389ca7853adf2e3ee273b084967141a4b30d58fab  0009-ensure-make-apparmor_parser-is-cached.patch
-3ffb2927fbdab331bc70391eaae8ed56026245ec7e91a2d88a5a480a344b22b17ce7f45f43e1ff6be531d2c87f0c4b19d73014d7bcfe4d86ff888e2a2fb9fd83  0010-Revert-utils-test-network.py-fix-failing-testcase.patch
-938ebb8c88e8d567f434cd849db283fa8aa6184249db7bb4dee0be77d0ddd2362ac1f6d457f822073e0e135520c330f251de36b0d98539cea5ad8816d5c1cb12  0011-Generate-CAPABILITIES-in-a-script-due-to-make-4.3.patch"
+"

testing/freeciv/APKBUILD

 # Contributor: Thomas Kienlen <kommander@laposte.net>
 # Maintainer: Thomas Kienlen <kommander@laposte.net>
 pkgname=freeciv
-pkgver=2.6.4
+pkgver=2.6.5
 pkgrel=0
 pkgdesc="Free and Open Source empire-building strategy game"
 url="http://www.freeciv.org"
@@ -93,4 +93,6 @@ server() {
 	done
 }
 
-sha512sums="4dca3a09f4538ce865f5bfef2fa0cdd00b21e30d80bd24343a6d77564bb5239101254155295ccc18593af6f9a32b77ecb8d50c38d0710a37960372e9b1227221  freeciv-2.6.4.tar.bz2"
+sha512sums="
+a80d319d62395a65f089ba4e9f60af29e94209c06ab6e7dd0fb30009857e59f3b54f89f4aa0bd7671ca14bc4d17d468fc37f21bf447840292ab3cacb976ae17b  freeciv-2.6.5.tar.bz2
+"

testing/gpg-tui/APKBUILD

@@ -6,7 +6,7 @@ pkgrel=0
 pkgdesc="Terminal user interface for GnuPG"
 url="https://github.com/orhun/gpg-tui"
 license="MIT"
-arch="all !s390x !mips64" # limited by rust/cargo
+arch="all !s390x !mips64 !riscv64" # blocked by rust/cargo
 makedepends="cargo gpgme-dev libxcb-dev libgpg-error-dev"
 subpackages="
 	$pkgname-doc

testing/libmhash/APKBUILD

 # Contributor: Francesco Colista <fcolista@alpinelinux.org>
 # Maintainer: Francesco Colista <fcolista@alpinelinux.org>
 pkgname=libmhash
-_pkgname=mhash
 pkgver=0.9.9.9
-pkgrel=1
+pkgrel=2
 pkgdesc="Library which provides a uniform interface to a large number of hash algorithms"
 url="http://mhash.sourceforge.net/"
 arch="all"
-license="GPL"
-depends=""
-makedepends=""
-install=""
+license="LGPL-2.0-only and LGPL-2.1-or-later"
 subpackages="$pkgname-dev $pkgname-doc"
-source="$pkgname-$pkgver.tar.gz::https://downloads.sourceforge.net/project/$_pkgname/$_pkgname/$pkgver/$_pkgname-$pkgver.tar.gz
-musl-fix-bool-includes.patch"
-builddir="$srcdir"/$_pkgname-$pkgver
+source="$pkgname-$pkgver.tar.gz::https://downloads.sourceforge.net/project/mhash/mhash/$pkgver/mhash-$pkgver.tar.gz
+	musl-fix-bool-includes.patch
+	"
+builddir="$srcdir/mhash-$pkgver"
 
 prepare() {
-	default_prepare || return 1
-	update_config_guess || return 1
+	default_prepare
+
+	update_config_sub
+	update_config_guess
 }
 
 build() {
-	cd "$builddir"
 	./configure --prefix=/usr
-	make || return 1
+	make
 }
 
 package() {
-	cd "$builddir"
-	make DESTDIR="$pkgdir" install || return 1
+	make DESTDIR="$pkgdir" install
 }
 
-sha512sums="82ad8b8e9b0463c5a14f5c0e572badc42c4697bac5505443b144287b3f8510b1410721b4277f092a0d6045c4342e997831011cdfcbfa8f1dae6edd5d9e3cefee  libmhash-0.9.9.9.tar.gz
-848c687be7da956884b287ecf57d445c974db9421d1e3a6648837aa18ebe86ace1366e0863ba62a898010b56c85ffd2f8294aaa7744ed31cfcec67b0021cc731  musl-fix-bool-includes.patch"
+sha512sums="
+82ad8b8e9b0463c5a14f5c0e572badc42c4697bac5505443b144287b3f8510b1410721b4277f092a0d6045c4342e997831011cdfcbfa8f1dae6edd5d9e3cefee  libmhash-0.9.9.9.tar.gz
+848c687be7da956884b287ecf57d445c974db9421d1e3a6648837aa18ebe86ace1366e0863ba62a898010b56c85ffd2f8294aaa7744ed31cfcec67b0021cc731  musl-fix-bool-includes.patch
+"

testing/ruby-build/APKBUILD

 # Contributor: Thomas Kienlen <kommander@laposte.net>
 # Maintainer: Thomas Kienlen <kommander@laposte.net>
 pkgname=ruby-build
-pkgver=20210526
+pkgver=20210611
 pkgrel=0
 pkgdesc="Compile and install Ruby"
 url="https://github.com/rbenv/ruby-build"
@@ -16,4 +16,6 @@ package() {
 	PREFIX="$pkgdir/usr" ./install.sh
 }
 
-sha512sums="5893a3e093a4cb9cd009262bba5553b93f61f44dda2a1905c6da4e49ea8d86849cdd06b669b660d762d20e0fcb0ee46cc34fc98cebda98eccce9fa775689a2f7  ruby-build-20210526.tar.gz"
+sha512sums="
+cc2722f6baae78a153dc715086c97db31ed96c37e07c4110256c43e84e9df764f54d3cf2d7189439ba7906081e8d5165e9be7899b59195deebdd6646ae8c969c  ruby-build-20210611.tar.gz
+"

testing/steghide/APKBUILD

@@ -2,38 +2,43 @@
 # Maintainer: Francesco Colista <fcolista@alpinelinux.org>
 pkgname=steghide
 pkgver=0.5.1
-pkgrel=1
+pkgrel=2
 pkgdesc="Steganography program that is able to hide data in various kinds of image- and audio-files"
 url="http://steghide.sourceforge.net/index.php"
 arch="all"
-license="GPL"
+license="GPL-2.0-or-later"
 makedepends="libmcrypt-dev jpeg-dev zlib-dev libmhash-dev
-bash libtool automake autoconf"
-install=""
+	bash libtool automake autoconf"
 subpackages="$pkgname-doc"
-source="$pkgname-$pkgver.tar.gz::https://prdownloads.sourceforge.net/$pkgname/$pkgname-$pkgver.tar.gz
-steghide-0.5.1-am.patch
-build-fixes-new-gcc.patch
-missing-files-configure-in.patch"
-builddir="$srcdir"/$pkgname-$pkgver
+source="https://prdownloads.sourceforge.net/steghide/steghide-$pkgver.tar.gz
+	steghide-0.5.1-am.patch
+	build-fixes-new-gcc.patch
+	missing-files-configure-in.patch
+	"
+
+prepare() {
+	default_prepare
+
+	update_config_sub
+	update_config_guess
+}
 
 build() {
-	cd "$builddir"
-	update_config_guess || return 1
 	autoreconf -i
 	./configure \
 		--prefix=/usr \
 		--disable-rpath \
 		--disable-nls
-	make CXXFLAGS="$CXXFLAGS -fpermissive" || return 1
+	make CXXFLAGS="$CXXFLAGS -fpermissive"
 }
 
 package() {
-	cd "$builddir"
-	make DESTDIR="$pkgdir" install || return 1
+	make DESTDIR="$pkgdir" install
 }
 
-sha512sums="6cda3e33e91123fbc5caa112efcacf09180505abd4f6f229878cd443817c60a04498aead02509c7532fd6924225c6b752820c51e452a83c520f228273d610a57  steghide-0.5.1.tar.gz
+sha512sums="
+6cda3e33e91123fbc5caa112efcacf09180505abd4f6f229878cd443817c60a04498aead02509c7532fd6924225c6b752820c51e452a83c520f228273d610a57  steghide-0.5.1.tar.gz
 b41652a1cfcd5313cb79c220cebc308c5491de4b56433ca5c6099c0b23c532c565cb67b553c32d24398c0e26cec3d1749acd8890e45596464ed499a83fd04fb3  steghide-0.5.1-am.patch
 66443a0ca340969d568e0343fafcef6623f429f6a718b5ea55afcceb444f907521db22702c213d9b72a82e6b353c138f2703afcb4a6d573fe37f70891bc69334  build-fixes-new-gcc.patch
-27dbae3ef3ab4373ddd046bad07a4d3d0df014717b3a1a4b178c761f39f9b3c74aef7aeeb037c93e083445026e96cf46a64a1351074938af9b87ab9bd9e95bbe  missing-files-configure-in.patch"
+27dbae3ef3ab4373ddd046bad07a4d3d0df014717b3a1a4b178c761f39f9b3c74aef7aeeb037c93e083445026e96cf46a64a1351074938af9b87ab9bd9e95bbe  missing-files-configure-in.patch
+"

testing/oha/APKBUILD → unmaintained/oha/APKBUILD

 # Contributor: Michał Polański <michal@polanski.me>
-# Maintainer: Michał Polański <michal@polanski.me>
+# Maintainer:
 pkgname=oha
-pkgver=0.4.5
+pkgver=0.4.6
 pkgrel=0
 pkgdesc="HTTP load generator, inspired by rakyll/hey with tui animation"
 url="https://github.com/hatoo/oha"
@@ -25,5 +25,5 @@ package() {
 }
 
 sha512sums="
-2e6e05157ebac56a54839e2473cc443fc779310c9aea7bc1090d66b321d45c408869db6f0af3250717c04d906141d02094c4a686b75f17669e7f320055ac871d  oha-0.4.5.tar.gz
+9d2b8306c5663daca2c3b55a2c0e313bb72a42044ef5ef56ab91dac44027e12b380b3a03b35b0bf6b6c28bf81a7789668cb9740264788ed7d83b078405b28310  oha-0.4.6.tar.gz
 "