14 files changed, 33 insertions, 40 deletions
diff --git a/system/bc/APKBUILD b/system/bc/APKBUILD
index b25801a20..4d2e5bf70 100644
--- a/system/bc/APKBUILD
+++ b/system/bc/APKBUILD
@@ -1,7 +1,7 @@
 # Contributor: A. Wilcox <awilfox@adelielinux.org>
 # Maintainer: A. Wilcox <awilfox@adelielinux.org>
 pkgname=bc
-pkgver=2.7.2
+pkgver=3.0.1
 pkgrel=0
 pkgdesc="An arbitrary precision numeric processing language (calculator)"
 url="https://github.com/gavinhoward/bc"
@@ -25,4 +25,4 @@ package() {
 	make install
 }
 
-sha512sums="c2014b16165bf5f8bdadf42bb60ea967a060753c17e13a7c3569d16d218bb3fb644e6a46950e9e7b3aa5a9f6bee4da9b158694909a0ab1fe390b7bb4dc20b303  bc-2.7.2.tar.xz"
+sha512sums="553d14b3439e6f7d5ec370db3a7104808e263692fdae795d5f97fca3bb40d371e75bbab615d81975c87da9c84fbbb39bc148cf12a122b0e0e3c9036abb9b7cd8  bc-3.0.1.tar.xz"
diff --git a/system/byacc/APKBUILD b/system/byacc/APKBUILD
index f50b95754..770521ce7 100644
--- a/system/byacc/APKBUILD
+++ b/system/byacc/APKBUILD
@@ -1,7 +1,7 @@
 # Contributor: Nathan Angelacos <nangel@alpinelinux.org>
 # Maintainer: 
 pkgname=byacc
-pkgver=20191103
+pkgver=20200330
 pkgrel=0
 pkgdesc="The Berkeley Yacc general-purpose parser generator"
 url="https://invisible-island.net/byacc/byacc.html"
@@ -30,4 +30,4 @@ package() {
 	make DESTDIR="$pkgdir" install
 }
 
-sha512sums="247cf5469da618733a9ce8d2f079e56ef485354c4fce462014ac9d3108ebf7eccb0147a3e005374a541895eff28b9a63f5f840a7576a26cb23ab34d968a2d05c  byacc-20191103.tgz"
+sha512sums="df8cc1aa550d633ab547a13a4f091d8c940a9a67b52dc5ecacad5b005fd54c3ceb1269593068c1a7949049e85b6e6eea20cffbbf4b408e049fde75c0ffe51f07  byacc-20200330.tgz"
diff --git a/system/ed/APKBUILD b/system/ed/APKBUILD
index d13ab5a2b..f57513f33 100644
--- a/system/ed/APKBUILD
+++ b/system/ed/APKBUILD
@@ -1,6 +1,6 @@
 # Maintainer: 
 pkgname=ed
-pkgver=1.15
+pkgver=1.16
 pkgrel=0
 pkgdesc="GNU version of standard text editor"
 url="https://www.gnu.org/software/ed/"
@@ -30,4 +30,4 @@ package() {
 	make DESTDIR="$pkgdir" install
 }
 
-sha512sums="27a16db41e88626b9718b1868f2fc629b609e436aca2450846f87492c61bf60cec3db0c54ff9a421d9bcbf59fe91a8c672aee5772e1b1eec8a365f227c30ecba  ed-1.15.tar.lz"
+sha512sums="1ca999edd7007c56bf9aa91436997a813e665910dda19a3307fa5b85adc05667eb120cb54cb6544b919f1c7f631baf3ee03079abe1171b875fb9653f535fa7bd  ed-1.16.tar.lz"
diff --git a/system/kbd/APKBUILD b/system/kbd/APKBUILD
index deb7fb205..144ddcefc 100644
--- a/system/kbd/APKBUILD
+++ b/system/kbd/APKBUILD
@@ -2,7 +2,7 @@
 # Maintainer: A. Wilcox <awilfox@adelielinux.org>
 pkgname=kbd
 pkgver=2.2.0_git20190823
-pkgrel=1
+pkgrel=2
 pkgdesc="Console keyboard and font management utilities"
 url="https://kbd-project.org/"
 arch="all"
@@ -11,7 +11,9 @@ license="GPL-2.0+"
 depends=""
 checkdepends="check-dev"
 makedepends="linux-headers linux-pam-dev autoconf automake libtool"
-subpackages="$pkgname-doc $pkgname-fonts::noarch $pkgname-keymaps::noarch
+provides="$pkgname-keymaps"
+replaces="$pkgname-keymaps"
+subpackages="$pkgname-doc $pkgname-fonts::noarch
 	$pkgname-lang $pkgname-openrc"
 source="https://dev.sick.bike/dist/$pkgname-$pkgver.tar.xz
 	consolefont.confd
@@ -62,16 +64,8 @@ fonts() {
 	mkdir -p "$subpkgdir"/usr/share
 	mv "$pkgdir"/usr/share/consolefonts "$subpkgdir"/usr/share/
 }
-
-keymaps() {
-	pkgdesc="Legacy keymaps shipped with Linux kbd tools"
-	mkdir -p "$subpkgdir"/usr/share
-	mv "$pkgdir"/usr/share/keymaps "$subpkgdir"/usr/share/
-	mv "$pkgdir"/usr/share/unimaps "$subpkgdir"/usr/share/
-}
-
 sha512sums="7f6202aeb17d6224095447a92d999478220457e1e7cadb90a7c40ca7f3b0c5b1f672db1995fb69652ca37558a75df582bfb5fea5772f3b1e040fe39f8f54504e  kbd-2.2.0_git20190823.tar.xz
-19761fdd2b32c1bbcc9254b89b7893741e144b917a75410af3f274553fe61e2f56cbbd17ff77ac929e9377604663cbbfd9e53c73e7d41e71de6de573730950c7  consolefont.confd
+837054b29050b955b4c3f1ddd6481c79792a66e2415bafbcfbf3e12a27066ddd3ce35e069448dfb1b2a00e843cec180dd6940edbd9014cd2a0c2aaa1b76c9fb0  consolefont.confd
 1e67f75f27ec5de8f71489c83f78e53e8fd0925ae2d82dabf516f98905c5aff206a8e943e92b6af413eae5f0ecb9c2240526dfc3c56811a8dc1d19ced561bba3  consolefont.initd
-af7d37fc6be1382414ca8245ca6f8d2ee8b82650b8a08eebbd980cf6dd2b92524fce2851ce0b2cd67e915488c12044ab50c5ab1f01c3072af87eed3e058ac268  keymaps.confd
+9391671bbe8b3b7b4eba63ff4e4b7f17297712393abca69f0e24e3a5304a545faa213de8bc799de922b69ee52048d6e6cf352d7213b459991286ef6dea77e8c3  keymaps.confd
 510d7eb582a914fa7cfb868d0c3d55a21ee1519033117d0943a153528b5810d09f6421ddc02d93906c1a66fb7e07e86240f38dad0d38cfb5a8c7e9a6335a937f  keymaps.initd"
diff --git a/system/kbd/consolefont.confd b/system/kbd/consolefont.confd
index 4c41d0633..9e8a30505 100644
--- a/system/kbd/consolefont.confd
+++ b/system/kbd/consolefont.confd
@@ -15,6 +15,6 @@
 #consoletranslation="8859-1_to_uni"
 
 # unicodemap is the unicode map file to use. Leave commented to use the
-# default one. Have a look in /usr/share/unimaps (from the kbd-keymaps
-# package) for a selection of map files you can use.
+# default one. Have a look in /usr/share/unimaps for a selection of map
+# files you can use.
 #unicodemap="iso01"
diff --git a/system/kbd/keymaps.confd b/system/kbd/keymaps.confd
index 9a2863413..30e65188a 100644
--- a/system/kbd/keymaps.confd
+++ b/system/kbd/keymaps.confd
@@ -1,6 +1,5 @@
 # Use keymap to specify the default console keymap. There is a complete tree
-# of keymaps in /usr/share/keymaps to choose from (from the kbd-keymaps
-# package).
+# of keymaps in /usr/share/keymaps to choose from.
 keymap="us"
 
 # Should we first load the 'windowkeys' console keymap?  Most x86 users will
diff --git a/system/pkgconf/APKBUILD b/system/pkgconf/APKBUILD
index 546f8b443..80c9f3a26 100644
--- a/system/pkgconf/APKBUILD
+++ b/system/pkgconf/APKBUILD
@@ -1,6 +1,6 @@
 # Maintainer: A. Wilcox <awilfox@adelielinux.org>
 pkgname=pkgconf
-pkgver=1.7.2
+pkgver=1.7.3
 pkgrel=0
 pkgdesc="Toolkit for maintaining development package metadata"
 url="http://pkgconf.org/"
@@ -46,4 +46,4 @@ dev() {
 	mv "$subpkgdir"/usr/share/aclocal/pkg.m4 "$pkgdir"/usr/share/aclocal/
 }
 
-sha512sums="b0376178e93743fd844bdc94b5fa2678521ffe5022323e20f3c5196d500a87c3546d0edc2ac22e92cb528348116e2826d6f144bd7bd18d3f0afaa5cda74f25cd  pkgconf-1.7.2.tar.xz"
+sha512sums="37b6c4f9f3b93970e35b6970fde22fbbde65e7fa32a5634b3fdfc25cc1f33843582722ad13d9a8e96fd6768406fcbe86bf5feb76996ddd0bb66d6ff91e65f0b6  pkgconf-1.7.3.tar.xz"
diff --git a/system/strace/APKBUILD b/system/strace/APKBUILD
index 879a86235..28df01723 100644
--- a/system/strace/APKBUILD
+++ b/system/strace/APKBUILD
@@ -1,6 +1,6 @@
 # Maintainer: A. Wilcox <awilfox@adelielinux.org>
 pkgname=strace
-pkgver=5.5
+pkgver=5.7
 pkgrel=0
 pkgdesc="A useful diagnositic, instructional, and debugging tool"
 url="https://strace.io/"
@@ -54,5 +54,5 @@ package() {
 	make -j1 DESTDIR="$pkgdir" install
 }
 
-sha512sums="317fe6341000b452cf038433c2a9a7bcdc8ce736e97b242673ce066dd9dbd3b2c3435a014b529429fdf2ac8af5c3a72d62971b293d007b7d3efcbb684c216231  strace-5.5.tar.xz
+sha512sums="aef481238196204495cf9507cd48ce30af799f79904478e6be57a267311a999c868f18540cc1e025f5e486730cfe9ccb256f528f6f796d204a7347ebdf2042f1  strace-5.7.tar.xz
 6616161b6e015c5e56b7171995d28ab63a865156b7f9826b4be26beaac863f0ebc341014910ea53157a810c6afafc10ce80b2d31f4d649d28718a9be78795c6c  nlattr-fix.patch"
diff --git a/system/tcl/APKBUILD b/system/tcl/APKBUILD
index e12202883..bec856ea5 100644
--- a/system/tcl/APKBUILD
+++ b/system/tcl/APKBUILD
@@ -1,7 +1,7 @@
 # Contributor: Sören Tempel <soeren+alpine@soeren-tempel.net>
 # Maintainer: 
 pkgname=tcl
-pkgver=8.6.9
+pkgver=8.6.10
 pkgrel=0
 pkgdesc="The Tcl scripting language"
 url="http://tcl.sourceforge.net/"
@@ -72,5 +72,5 @@ dev() {
 	done
 }
 
-sha512sums="707fc0fb4f45c85e8f21692e5035d727cde27d87a2e1cd2e748ad373ebd3517aeca25ecaef3382a2f0e0a1feff96ce94a62b87abcf085e1a0afe2a23ef460112  tcl8.6.9-src.tar.gz
+sha512sums="c89b886e483320a284033de51b5363758ef4748d6248ae73eb8e90fbe76c180395f485135ca9bf1246dd567159a77ffc1e8cb537bc2fc4a09b01448928d0afd7  tcl8.6.10-src.tar.gz
 cd52cbe80fd2be227c9018dbe38fa0888302293402e7a57f2e231c195b7c1902f1b58bc87d19c9d123915ca757e871abf084c0ef23b1a7f187bc03ba93904cc2  tcl-stat64.patch"
diff --git a/system/tzdata/APKBUILD b/system/tzdata/APKBUILD
index 4fbdec71f..445031801 100644
--- a/system/tzdata/APKBUILD
+++ b/system/tzdata/APKBUILD
@@ -2,8 +2,8 @@
 # Contributor: Natanael Copa <ncopa@alpinelinux.org>
 # Maintainer: A. Wilcox <awilfox@adelielinux.org>
 pkgname=tzdata
-pkgver=2019c
-_tzcodever=2019c
+pkgver=2020a
+_tzcodever=2020a
 _ptzver=0.5
 pkgrel=0
 pkgdesc="Time zone data"
@@ -54,7 +54,7 @@ package() {
 		"$pkgdir"/usr/bin/posixtz
 }
 
-sha512sums="61ef36385f501c338c263081486de0d1fccd454b86f8777b0dbad4ea3f21bbde059d0a91c23e207b167ed013127d3db8b7528f0188814a8b44d1f946b19d9b8b  tzcode2019c.tar.gz
-2921cbb2fd44a6b8f7f2ed42c13fbae28195aa5c2eeefa70396bc97cdbaad679c6cc3c143da82cca5b0279065c02389e9af536904288c12886bf345baa8c6565  tzdata2019c.tar.gz
+sha512sums="5235d6590e844491df32375857f5f36ba0046f2d21a078375188dff79b125cf9b69136a0a431624de1ecfa9d53b62a232f0e6ee0b734294cec62b670e6265cb2  tzcode2020a.tar.gz
+2a2fc2e3ad8a6e4c574242296c847ad582c2c1d86add9c556e65c812d19b9528522e3c4dddb5239017091825d2acc5a2ccaf21dc41b900b6c300ef4264cc5a9d  tzdata2020a.tar.gz
 68dbaab9f4aef166ac2f2d40b49366527b840bebe17a47599fe38345835e4adb8a767910745ece9c384b57af815a871243c3e261a29f41d71f8054df3061b3fd  posixtz-0.5.tar.xz
 f54ce213d74c5a8387e1a7c56299bc6eee65a035772288222128abc249a112067b8791b88b45c342b2d4d8d12e9e4f1f2f5c92c5de67f8b6413b1ebf1d7de467  0001-posixtz-fix-up-lseek.patch"
diff --git a/system/util-linux/APKBUILD b/system/util-linux/APKBUILD
index 6d03248ad..7441521c5 100644
--- a/system/util-linux/APKBUILD
+++ b/system/util-linux/APKBUILD
@@ -2,7 +2,7 @@
 # Contributor: Leonardo Arena <rnalrd@alpinelinux.org>
 # Maintainer: A. Wilcox <awilfox@adelielinux.org>
 pkgname=util-linux
-pkgver=2.35.1
+pkgver=2.35.2
 
 case $pkgver in
 	*.*.*) _v=${pkgver%.*};;
@@ -94,5 +94,5 @@ libmount() {
 	mv "$pkgdir"/lib/libmount.so.* "$subpkgdir"/lib/
 }
 
-sha512sums="6e27e08bfc02378970f015decfea5a52d6c342c4c8f4ac48dd07d248485eb797e506d91d290dbbca344c3e5cfe1fc150db80a23d510367427232f5abeabe591a  util-linux-2.35.1.tar.xz
+sha512sums="59e038ba71aa74c9af6f927b357483a965f675ab3ffcd25cf0c1b043656312d2d2d07c55659fd3da69ede165bec313e0ae7e1cd73758e49681ae610604b399a2  util-linux-2.35.2.tar.xz
 876bb9041eca1b2cca1e9aac898f282db576f7860aba690a95c0ac629d7c5b2cdeccba504dda87ff55c2a10b67165985ce16ca41a0694a267507e1e0cafd46d9  ttydefaults.h"
diff --git a/system/vim/APKBUILD b/system/vim/APKBUILD
index 09888c25e..8c0d476c5 100644
--- a/system/vim/APKBUILD
+++ b/system/vim/APKBUILD
@@ -4,7 +4,7 @@
 # Contributor: Natanael Copa <ncopa@alpinelinux.org>
 # Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house>
 pkgname=vim
-pkgver=8.2.0959
+pkgver=8.2.1017
 _pkgver=${pkgver%.*.*}${pkgver#*.}
 _pkgver=${_pkgver%.*}
 pkgrel=0
@@ -79,5 +79,5 @@ vimdiff() {
 	mv "$pkgdir"/usr/bin/vimdiff "$subpkgdir"/usr/bin
 }
 
-sha512sums="040c0a72bb27dfd428c06f103e7f0b919f9680b91da798a91c34634c559f349332fc8ebd3d9c6889cd6319666005bb889322e9541d62754ed6d839bb06b06b49  vim-8.2.0959.tar.gz
+sha512sums="6fe243c3aeefe2d63d67e1710d5212a4b76b8fd49e037ca588655e25901ca2af4285128cc97146622c42d0df77194e18fb7d5a2bdd74f26c3534f0c2cc0e5d8b  vim-8.2.1017.tar.gz
 12ee3f96c94d74215159fba379ed61907ec5982a9f1643575dcb7c3d5e30824665d683de95f97b5067718b3f2a1238fb7534a70803bc170614498ad026f352d8  vimrc"
diff --git a/system/xfsprogs/APKBUILD b/system/xfsprogs/APKBUILD
index b1083da33..8a2058955 100644
--- a/system/xfsprogs/APKBUILD
+++ b/system/xfsprogs/APKBUILD
@@ -1,7 +1,7 @@
 # Contributor: Valery Kartel <valery.kartel@gmail.com>
 # Maintainer: A. Wilcox <awilfox@adelielinux.org>
 pkgname=xfsprogs
-pkgver=5.4.0
+pkgver=5.6.0
 pkgrel=0
 pkgdesc="XFS filesystem utilities"
 url="https://xfs.org/index.php/Main_Page"
@@ -48,6 +48,6 @@ base() {
 	mv "$subpkgdir"/sbin/xfs_scrub "$pkgdir"/sbin/
 }
 
-sha512sums="4d520881f4556976c3d64c5f72f51ea5531c7f380b22c48a1fb72bfde078ac725c70899c8c58263aa2a7aed2213de604121f2863e88b5cf8fb0dcc54446e133e  xfsprogs-5.4.0.tar.gz
+sha512sums="ee96e0789657c4a5dc5710e472957e861e7aab65eb99f30c9598bc4bb3f2c998b27a4ed0112bae311b1a9e0a4b7dc9dbbdc3089da40405a3f30668a25ded9969  xfsprogs-5.6.0.tar.gz
 c23d5dca744c4589ede517701fc8ea02f9b7a59568d907269048741806d2e6c9e56ed3493163d63dbf16193ff99471206548b25efcda18e3e5dff14eb38066d4  fix-mmap.patch
 29c77c550fa8f7a0b3794649d278a2cb3a65c9368db19415866910160adb6d5a52f1be4f8713b58c5c87f149b6212c068ae27a4547a6c4e4fe7b1584e1261dae  no-utmp-header.patch"
diff --git a/system/zstd/APKBUILD b/system/zstd/APKBUILD
index adc82aec3..948afd7e8 100644
--- a/system/zstd/APKBUILD
+++ b/system/zstd/APKBUILD
@@ -1,7 +1,7 @@
 # Contributor: A. Wilcox <awilfox@adelielinux.org>
 # Maintainer: A. Wilcox <awilfox@adelielinux.org>
 pkgname=zstd
-pkgver=1.4.4
+pkgver=1.4.5
 pkgrel=0
 pkgdesc="Fast real-time compression algorithm"
 url="https://facebook.github.io/zstd/"
@@ -25,4 +25,4 @@ package() {
 	make PREFIX="/usr" DESTDIR="$pkgdir" install
 }
 
-sha512sums="f12b6f38bd322a0538179ef90e4c83d2cba29e1fef391a8e8e964785e5761e7ba685f62e9a5a1d6b66171fd64e4fd6374e607569531e2f4c05c470cff2294454  zstd-1.4.4.tar.gz"
+sha512sums="417b813ade6c8436690bd9d6da34a9f87f50e7378752b72e63066befbee496392a4b72896fa56688d814f461871ab31d3c6637497ff2ed7a282d58513631a38b  zstd-1.4.5.tar.gz"