9 files changed, 44 insertions, 40 deletions
diff --git a/user/dovecot/APKBUILD b/user/dovecot/APKBUILD
index b7aaceef8..6f9a8d145 100644
--- a/user/dovecot/APKBUILD
+++ b/user/dovecot/APKBUILD
@@ -5,10 +5,10 @@
 # Contributor: Natanael Copa <ncopa@alpinelinux.org>
 # Maintainer: Lee Starnes <lee@canned-death.us>
 pkgname=dovecot
-pkgver=2.3.13
+pkgver=2.3.14
 _pkgvermajor=2.3
 pkgrel=0
-_pigeonholever=0.5.13
+_pigeonholever=0.5.14
 _pigeonholevermajor=${_pigeonholever%.*}
 pkgdesc="IMAP and POP3 server"
 url="https://www.dovecot.org/"
@@ -258,13 +258,13 @@ _submv() {
 	done
 }
 
-sha512sums="758a169fba8925637ed18fa7522a6f06c9fe01a1707b1ca0d0a4d8757c578a8e117c91733e8314403839f9a484bbcac71ce3532c82379eb583b480756d556a95  dovecot-2.3.13.tar.gz
-fcbc13d71af4e6dd4e34192484e203d755e5015da76a4774b11a79182b2baad36cab5a471346093111ace36a7775dfe8294555f8b777786dde386820b3ec5cd3  dovecot-2.3-pigeonhole-0.5.13.tar.gz
+sha512sums="69df234cb739c7ee7ae3acfb9756bc22481e94c95463d32bfac315c7ec4b1ba0dfbff552b769f2ab7ee554087ca2ebbe331aa008d3af26417016612dc7cad103  dovecot-2.3.14.tar.gz
+c5d5d309769eabe2c0971646d0c14d166b6b524acf59e1069eca803f764544fa2535c09c9a630ca706aa70442b688ee26af831d29e674823bac7ea7c0e1f33cc  dovecot-2.3-pigeonhole-0.5.14.tar.gz
 fe4fbeaedb377d809f105d9dbaf7c1b961aa99f246b77189a73b491dc1ae0aa9c68678dde90420ec53ec877c08f735b42d23edb13117d7268420e001aa30967a  skip-iconv-check.patch
 794875dbf0ded1e82c5c3823660cf6996a7920079149cd8eed54231a53580d931b966dfb17185ab65e565e108545ecf6591bae82f935ab1b6ff65bb8ee93d7d5  split-protocols.patch
 0d8f89c7ba6f884719b5f9fc89e8b2efbdc3e181de308abf9b1c1b0e42282f4df72c7bf62f574686967c10a8677356560c965713b9d146e2770aab17e95bcc07  default-config.patch
 5e68a0042a7c11b3d8c411fc157f5960e2e3305dac11f4b6b880441e2b4105769ddf6c56f67a995af6e1a58f3bfa2c199ea51318a3a0e37c7ef0ae6c4109b13f  ssl-paths.patch
 277d0b55583908cd6c063fb190eb3d2a362a3a33306e35a069a0bca28968f11627c455887d82d01884313b7f7e18530c056bd7a4cda0a1f9c4be7065cd033aa9  test-file-cache-enomem.patch
-ee2e1916c712db77409567b4ded9c7fb7dfed295e044c19694bc369af3d4a7086caf14e97809531f76b630bc578271af6e5137985b7d4e8d2afb2a71f800912f  time64.patch
+28e0e3efcb1dd06cd971f1a8caa88989a165dbf14fdebf26ec1ab083020c6831231fec08c2a9d363e6af74003deeeb27122d044eccd02cf7945b464758e04622  time64.patch
 9f19698ab45969f1f94dc4bddf6de59317daee93c9421c81f2dbf8a7efe6acf89689f1d30f60f536737bb9526c315215d2bce694db27e7b8d7896036a59c31f0  dovecot.logrotate
 d91951b81150d7a3ef6a674c0dc7b012f538164dac4b9d27a6801d31da6813b764995a438f69b6a680463e1b60a3b4f2959654f68e565fe116ea60312d5e5e70  dovecot.initd"
diff --git a/user/dovecot/time64.patch b/user/dovecot/time64.patch
index c6f8e6261..4cd5c46e1 100644
--- a/user/dovecot/time64.patch
+++ b/user/dovecot/time64.patch
@@ -1,27 +1,17 @@
---- dovecot-2.3.11.3/src/lib-oauth2/oauth2-jwt.c.old	2020-08-12 12:20:41.000000000 +0000
-+++ dovecot-2.3.11.3/src/lib-oauth2/oauth2-jwt.c	2020-09-15 14:21:24.285796733 +0000
-@@ -31,13 +31,13 @@
+--- dovecot-2.3.14.orig/src/lib-oauth2/oauth2-jwt.c	2021-03-13 23:56:53.250000000 +0000
++++ dovecot-2.3.14/src/lib-oauth2/oauth2-jwt.c	2021-03-13 23:57:23.640000000 +0000
+@@ -31,7 +31,7 @@
  }
  
- static int get_time_field(const struct json_tree *tree, const char *key,
--			  long *value_r)
-+			  long long *value_r)
+ static int
+-get_time_field(const struct json_tree *tree, const char *key, long *value_r)
++get_time_field(const struct json_tree *tree, const char *key, long long *value_r)
  {
  	const char *value = get_field(tree, key);
  	int tz_offset ATTR_UNUSED;
- 	if (value == NULL)
- 		return 0;
--	if ((str_to_long(value, value_r) < 0 &&
-+	if ((str_to_llong(value, value_r) < 0 &&
- 	     !iso8601_date_parse((const unsigned char*)value, strlen(value),
- 				 value_r, &tz_offset)) ||
- 	    *value_r < 0)
-@@ -283,9 +283,9 @@
- 	const char *sub = get_field(tree, "sub");
- 
+@@ -313,7 +313,7 @@
  	int ret;
--	long t0 = time(NULL);
-+	long long t0 = time(NULL);
+ 	long t0 = time(NULL);
  	/* default IAT and NBF to now */
 -	long iat, nbf, exp;
 +	long long iat, nbf, exp;
diff --git a/user/marble/APKBUILD b/user/marble/APKBUILD
index 2f32e4c3f..7e452f5cf 100644
--- a/user/marble/APKBUILD
+++ b/user/marble/APKBUILD
@@ -32,6 +32,15 @@ build() {
 	make
 }
 
+libs() {
+	pkgdesc="$pkgdesc (libraries)"
+	local file=
+	for file in "$pkgdir"/usr/lib/lib*.so.[0-9]*; do
+		mkdir -p "$subpkgdir"/usr/lib
+		mv "$file" "$subpkgdir"/usr/lib/
+	done
+}
+
 package() {
 	make DESTDIR="$pkgdir" install
 }
diff --git a/user/mksh/APKBUILD b/user/mksh/APKBUILD
index 695fdc5c2..8c0e47752 100644
--- a/user/mksh/APKBUILD
+++ b/user/mksh/APKBUILD
@@ -1,12 +1,12 @@
 # Contributor: Marek Benc <dusxmt@gmx.com>
 # Maintainer: Marek Benc <dusxmt@gmx.com>
 pkgname=mksh
-pkgver=59b
+pkgver=59c
 pkgrel=0
 pkgdesc="MirBSD Korn Shell, a free Korn Shell interpreter"
 url="http://mirbsd.de/mksh"
 arch="all"
-license="MirOS OR ISC"
+license="MirOS AND Unicode-DFS-2016"
 depends=""
 checkdepends="ed perl"
 makedepends=""
@@ -24,6 +24,9 @@ build() {
 	CFLAGS="$CFLAGS -DMKSH_BINSHPOSIX -DMKSH_BINSHREDUCED" \
 		/bin/sh ./Build.sh -r -L
 	mv test.sh test_lksh.sh
+
+	# Build the HTML FAQ:
+	/bin/sh ./FAQ2HTML.sh
 }
 
 check() {
@@ -45,6 +48,7 @@ package() {
 
 	mkdir -p "$pkgdir"/usr/share/doc/mksh/examples/
 	install -m 644 dot.mkshrc "$pkgdir"/usr/share/doc/mksh/examples/
+	install -m 644 FAQ.htm    "$pkgdir"/usr/share/doc/mksh/
 }
 
-sha512sums="4ae330a79a09d2dd989116b1a836ab7f179d920eb34c97ea5da7d1434361911a93ba77ca47c5e473e5a5ce1877f2a2e919a807bb6139ec6c89c87969054d021d  mksh-R59b.tgz"
+sha512sums="f56b6956f9e1dd88ddce2294301a5eb698050d9d4f49286fdcd8f9df8554eabbcc71d37e2bf3eb7234e3968a17231cc6de8aa7efbf17768834a90b14e8cdf340  mksh-R59c.tgz"
diff --git a/user/openvpn/APKBUILD b/user/openvpn/APKBUILD
index e34112fc3..60c5f77f1 100644
--- a/user/openvpn/APKBUILD
+++ b/user/openvpn/APKBUILD
@@ -2,7 +2,7 @@
 # Contributor: Natanael Copa <ncopa@alpinelinux.org>
 # Maintainer: Lee Starnes <lee@canned-death.us>
 pkgname=openvpn
-pkgver=2.4.9
+pkgver=2.4.11
 pkgrel=0
 pkgdesc="A robust, and highly configurable VPN (Virtual Private Network)"
 url="https://openvpn.net/"
@@ -20,6 +20,8 @@ source="https://swupdate.openvpn.net/community/releases/$pkgname-$pkgver.tar.gz
 	"
 
 # secfixes:
+#   2.4.11-r0:
+#     - CVE-2020-15078
 #   2.4.9-r0:
 #     - CVE-2020-11810
 
@@ -63,7 +65,7 @@ pam() {
 		"$subpkgdir"/usr/lib/openvpn/plugins/
 }
 
-sha512sums="a05cbd6c73809f26cd1b68bd491ceb8fb4ddf2cde0407f73f4c16d97477a4853722a1618e6dcf0b111283f73d9499b593b25107bb1441d9b38c80e76d6bcc69b  openvpn-2.4.9.tar.gz
+sha512sums="dc9500406b6f4d195d8039bce6ed39b091c2f46f8cdfd2cc8ca472cf609e70711269023cfff4ee91db27b3c194524bde79c14d39811687460702c0c76111c8a6  openvpn-2.4.11.tar.gz
 3594937d4cc9d7b87ac6a3af433f651ed9695f41586994f9d9789554fbe3f87f054b997b89486eda4ae0b852d816aac9007222168d585910aa9f255073324bd9  openvpn.initd
 6b2353aca9df7f43044e4e37990491b4ba077e259ebe13b8f2eb43e35ca7a617c1a65c5bfb8ab05e87cf12c4444184ae064f01f9abbb3c023dbbc07ff3f9c84e  openvpn.confd
 cdb73c9a5b1eb56e9cbd29955d94297ce5a87079419cd626d6a0b6680d88cbf310735a53f794886df02030b687eaea553c7c569a8ea1282a149441add1c65760  openvpn.up
diff --git a/user/s6-dns/APKBUILD b/user/s6-dns/APKBUILD
index 2b593fc90..2adad7910 100644
--- a/user/s6-dns/APKBUILD
+++ b/user/s6-dns/APKBUILD
@@ -1,14 +1,14 @@
 # Contributor: Laurent Bercot <ska-adelie@skarnet.org>
 # Maintainer: Laurent Bercot <ska-adelie@skarnet.org>
 pkgname=s6-dns
-pkgver=2.3.4.0
+pkgver=2.3.5.0
 pkgrel=0
 pkgdesc="skarnet.org's DNS client libraries and command-line DNS client utilities"
 url="https://skarnet.org/software/s6-dns/"
 arch="all"
 options="!check"
 license="ISC"
-_skalibs_version=2.10
+_skalibs_version=2.10.0.0
 depends=""
 makedepends="skalibs-dev>=$_skalibs_version skalibs-libs-dev>=$_skalibs_version"
 subpackages="$pkgname-libs $pkgname-dev $pkgname-libs-dev:libsdev $pkgname-doc"
@@ -59,4 +59,4 @@ doc() {
 	cp -a "$builddir/doc" "$subpkgdir/usr/share/doc/$pkgname"
 }
 
-sha512sums="dde618c292696fd686b9346273504be82fb82d4f6ee46b4255874bd2411aa6b8199cf13d4a436d7d121b126da0d0021acf3d142f81f23a0ac4cd301906d3df32  s6-dns-2.3.4.0.tar.gz"
+sha512sums="994a786b8d725cc98640be102e05a25f033624fbf8762fc53361555f4a721f5be819e282b907ceedaa0c1adbd670c80e1819096dc2ff7e2a2e476098bded3ade  s6-dns-2.3.5.0.tar.gz"
diff --git a/user/s6-networking/APKBUILD b/user/s6-networking/APKBUILD
index bb81a620e..6683aecdd 100644
--- a/user/s6-networking/APKBUILD
+++ b/user/s6-networking/APKBUILD
@@ -1,14 +1,14 @@
 # Contributor: Laurent Bercot <ska-adelie@skarnet.org>
 # Maintainer: Laurent Bercot <ska-adelie@skarnet.org>
 pkgname=s6-networking
-pkgver=2.4.0.0
+pkgver=2.4.1.0
 pkgrel=0
 pkgdesc="skarnet.org's UCSPI TCP tools, access control tools, and network time management utilities."
 url="https://skarnet.org/software/$pkgname/"
 arch="all"
 options="!check"  # No test suite.
 license="ISC"
-_skalibs_version=2.10
+_skalibs_version=2.10.0.0
 depends="execline"
 makedepends="skalibs-dev>=$_skalibs_version skalibs-libs-dev>=$_skalibs_version execline-dev s6-dev s6-libs-dev s6-dns-dev s6-dns-libs-dev bearssl-dev"
 subpackages="$pkgname-libs $pkgname-dev $pkgname-libs-dev:libsdev $pkgname-doc"
@@ -62,4 +62,4 @@ doc() {
 	cp -a "$builddir/doc" "$subpkgdir/usr/share/doc/$pkgname"
 }
 
-sha512sums="e8646bbfe965db0a736b1624e3533151182fd0d0337c08ab6af52f6872af1e8c82e3afa85fd146fec3f0640360173aa57182065982e1f3d60ec16862f449115b  s6-networking-2.4.0.0.tar.gz"
+sha512sums="4f889228b5409bbd7241f1cb38cb1f739572dc28bb59740188531fa62f433030a085b7582108d9ee96b3a22a6280b38fff2b5080f743370e0f59358005583e22  s6-networking-2.4.1.0.tar.gz"
diff --git a/user/wireguard-module/APKBUILD b/user/wireguard-module/APKBUILD
index 8b9f11117..60df4133b 100644
--- a/user/wireguard-module/APKBUILD
+++ b/user/wireguard-module/APKBUILD
@@ -1,7 +1,7 @@
 # Contributor: Mira Ressel <aranea@aixah.de>
 # Maintainer: Laurent Bercot <ska-adelie@skarnet.org>
-_kver="5.4.5-mc0"
-pkgver=1.0.20200506
+_kver="5.4.66-mc1"
+pkgver=1.0.20210424
 pkgrel=0
 _pkgname="wireguard-module"
 pkgname="$_pkgname-$_kver"
@@ -38,5 +38,4 @@ _patch() {
 	mkdir -p "$subpkgdir/usr/share/wireguard"
 	"$builddir"/kernel-tree-scripts/create-patch.sh > "$subpkgdir/usr/share/wireguard/wireguard-$pkgver.patch"
 }
-
-sha512sums="39a27a515919933dbed71624be3f8f3f512073b522e1e16248c9eda749dd72a3db5a02d85d29855160eb182415f489a4c02c1659ef9589507c99dbfe74ea3074  wireguard-linux-compat-1.0.20200506.tar.xz"
+sha512sums="f3485978fdd5a1cccdd8ee269c223e805bc533b79189765324a383142934b12f4f6bf476147a09703fa674da4a1eaca13fe400553b27843dbf8da133ce19207b  wireguard-linux-compat-1.0.20210424.tar.xz"
diff --git a/user/wireguard-tools/APKBUILD b/user/wireguard-tools/APKBUILD
index 7e283e759..ece7397aa 100644
--- a/user/wireguard-tools/APKBUILD
+++ b/user/wireguard-tools/APKBUILD
@@ -1,7 +1,7 @@
 # Contributor: Mira Ressel <aranea@aixah.de>
 # Maintainer: Laurent Bercot <ska-adelie@skarnet.org>
 pkgname=wireguard-tools
-pkgver=1.0.20200513
+pkgver=1.0.20210424
 pkgrel=0
 pkgdesc="Userland tools for the WireGuard VPN"
 url="https://www.wireguard.com/"
@@ -29,4 +29,4 @@ bashcomp() {
 	mv "$pkgdir/usr/share/bash-completion" "$subpkgdir/usr/share/"
 }
 
-sha512sums="4d27b262350b6b47843a323c2e7ab8d2bdd48065c265778abdec85b3f6fc92aa9af77d76e368df9cc8e435eae1c0ce50fed52e1d78db54358c1884d34be08d2c  wireguard-tools-1.0.20200513.tar.xz"
+sha512sums="b919c7ce1e8ee8660ccc1490d3dad7817f3d6f0ab79f26866e8ed10d40545a9ddca67959ff6cc84ac36a91683c1f58d274d91d47f40c0b9a7bfee4009dcbbf59  wireguard-tools-1.0.20210424.tar.xz"