Merge branch 'bumps.aerdan.20200807' into 'master'

Bumps for packages owned by Kiyoshi Aman for 7 August 2020

See merge request adelie/packages!492

8 files changed, 24 insertions, 20 deletions

diff --git a/system/vim/APKBUILD b/system/vim/APKBUILD
index 8c0d476c5..cfe3a7d51 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.1017
+pkgver=8.2.1382
 _pkgver=${pkgver%.*.*}${pkgver#*.}
 _pkgver=${_pkgver%.*}
 pkgrel=0
@@ -79,5 +79,5 @@ vimdiff() {
 	mv "$pkgdir"/usr/bin/vimdiff "$subpkgdir"/usr/bin
 }
 
-sha512sums="6fe243c3aeefe2d63d67e1710d5212a4b76b8fd49e037ca588655e25901ca2af4285128cc97146622c42d0df77194e18fb7d5a2bdd74f26c3534f0c2cc0e5d8b  vim-8.2.1017.tar.gz
+sha512sums="3e8a8cc5e566983fd1da3a9f4434b9c5b9dad91d08e807cb5b4b8f5029e201d3dd4bc2badc5cf6b1e41339fd6667cd91a6fb6c95a0914abe93b1e42fcec07fbd  vim-8.2.1382.tar.gz
 12ee3f96c94d74215159fba379ed61907ec5982a9f1643575dcb7c3d5e30824665d683de95f97b5067718b3f2a1238fb7534a70803bc170614498ad026f352d8  vimrc"
diff --git a/user/apache-httpd/APKBUILD b/user/apache-httpd/APKBUILD
index 48fcaf26d..a14c25cc8 100644
--- a/user/apache-httpd/APKBUILD
+++ b/user/apache-httpd/APKBUILD
@@ -2,7 +2,7 @@
 # Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house>
 pkgname=apache-httpd
 _pkgreal=httpd
-pkgver=2.4.43
+pkgver=2.4.46
 pkgrel=0
 pkgdesc="Open-source HTTP server"
 url="https://httpd.apache.org"
@@ -37,6 +37,10 @@ builddir="$srcdir/$_pkgreal-$pkgver"
 options="suid !check"
 
 # secfixes: http_server
+#   2.4.46-r0:
+#     - CVE-2020-9490
+#     - CVE-2020-11984
+#     - CVE-2020-11993
 #   2.4.43-r0:
 #     - CVE-2020-1934
 #     - CVE-2020-1927
@@ -146,7 +150,7 @@ ldap() {
 		"$subpkgdir"/usr/libexec/apache2
 }
 
-sha512sums="d9879b8f8ef7d94dee1024e9c25b56d963a3b072520878a88a044629ad577c109a5456791b39016bf4f6672c04bf4a0e5cfd32381211e9acdc81d4a50b359e5e  httpd-2.4.43.tar.gz
+sha512sums="5801c1dd0365f706a5e2365e58599b5adac674f3c66b0f39249909841e6cdf16bfdfe001fbd668f323bf7b6d14b116b5e7af49867d456336fad5e685ba020b15  httpd-2.4.46.tar.gz
 c8bc2bb06ae51b0956e0ee673e80c444551c9b33dfcbb845106477c46d9e52786a8896022e1f00102264fecdf66e35e47fc6cf0abe9836fa536735cff4e6adf4  adelie.layout
 336e81fa0d08f8fbe6243d52bd59b12cf2e925deb49b29d7a22953c5d40a951b6b753f51e5a396752cb0bbaf1cf25b1358902f375fb65639d00e62db7ae55ff2  apache-httpd.confd
 5762d53f39ce7ecd730e05ddf6c063ede65cd75b9e7d67217784c80366646491ef9474306e8eb119c8fb5b4358407b07636a4e9cd82325d8df4e3e00dabc3459  apache-httpd.initd
diff --git a/user/gvim/APKBUILD b/user/gvim/APKBUILD
index 4742f1256..e8a0a2f35 100644
--- a/user/gvim/APKBUILD
+++ b/user/gvim/APKBUILD
@@ -5,7 +5,7 @@
 # Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house>
 pkgname=gvim
 _pkgreal=vim
-pkgver=8.2.1017
+pkgver=8.2.1382
 pkgrel=0
 pkgdesc="advanced text editor"
 url="http://www.vim.org"
@@ -71,4 +71,4 @@ package() {
 	ln -s gvim rgvim
 }
 
-sha512sums="6fe243c3aeefe2d63d67e1710d5212a4b76b8fd49e037ca588655e25901ca2af4285128cc97146622c42d0df77194e18fb7d5a2bdd74f26c3534f0c2cc0e5d8b  vim-8.2.1017.tar.gz"
+sha512sums="3e8a8cc5e566983fd1da3a9f4434b9c5b9dad91d08e807cb5b4b8f5029e201d3dd4bc2badc5cf6b1e41339fd6667cd91a6fb6c95a0914abe93b1e42fcec07fbd  vim-8.2.1382.tar.gz"
diff --git a/user/libpsl/APKBUILD b/user/libpsl/APKBUILD
index 66d49e293..2b842085b 100644
--- a/user/libpsl/APKBUILD
+++ b/user/libpsl/APKBUILD
@@ -1,7 +1,7 @@
 # Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house>
 # Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house>
 pkgname=libpsl
-pkgver=0.21.0
+pkgver=0.21.1
 pkgrel=0
 pkgdesc="C library for examining the Public Suffix List"
 url="https://rockdaboot.github.io/libpsl"
@@ -10,7 +10,7 @@ license="MIT AND BSD-3-Clause"
 depends=""
 makedepends="python3 libidn2-dev libunistring-dev"
 subpackages="$pkgname-dev $pkgname-doc"
-source="https://github.com/rockdaboot/libpsl/releases/download/libpsl-$pkgver/libpsl-$pkgver.tar.gz
+source="https://github.com/rockdaboot/libpsl/releases/download/$pkgver/libpsl-$pkgver.tar.gz
 	use-python3.patch
 	"
 
@@ -33,5 +33,5 @@ package() {
 	make DESTDIR="$pkgdir" install
 }
 
-sha512sums="165c4f0b0640a813d512bd916e1532e32e43c8c81a5efd048f3a5b07b1b3c9129b4c4b5008b8b11a7c1b3914caea17564321389cd350bf1d687d53a97f2afa4d  libpsl-0.21.0.tar.gz
+sha512sums="a5084b9df4ff2a0b1f5074b20972efe0da846473396d27b57967c7f6aa190ab3c910b4bfc4f8f03802f08decbbad5820d850c36ad59610262ae37fe77de0c7f5  libpsl-0.21.1.tar.gz
 00c9c09bac334efcd7ae6240b740ac88453425cc380cc23b443a0579f4ccabf86eafdb90f5f05027cc55ee20f6c1d4388939792a55cd95705d5e6919d40b30e5  use-python3.patch"
diff --git a/user/marco/APKBUILD b/user/marco/APKBUILD
index 30c55065c..b138a4789 100644
--- a/user/marco/APKBUILD
+++ b/user/marco/APKBUILD
@@ -1,7 +1,7 @@
 # Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house>
 # Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house>
 pkgname=marco
-pkgver=1.24.0
+pkgver=1.24.1
 pkgrel=0
 pkgdesc="Window manager for the MATE desktop environment"
 url="https://mate-desktop.org"
@@ -34,5 +34,5 @@ package() {
 	make DESTDIR="$pkgdir" install
 }
 
-sha512sums="b257994c097f174fe83f3f0f4d6b6991e8c0f402daffd99f8a9521d588b609c56953e73dd4d143be64f5c9a4caa8d890ff30a120e18a9d5b36c6f856a7190428  marco-1.24.0.tar.xz
+sha512sums="55607898b64f0da3a85dd8d7fd092d847c8f67cefa096a63dbe074c197157a3d661fcb3f2a495b4425340b583b600cda3d1c92ac08b7327904dbd4aab8e92c85  marco-1.24.1.tar.xz
 b377b2a7d2af094a8b4bd6d1827c85f9675656cd8bdc6892b334c8479d188459ec8585fed3c746fdaef5820f768ce93605586693a3308f0db2d6f58e08f4df49  correctly-posix.patch"
diff --git a/user/qt5ct/APKBUILD b/user/qt5ct/APKBUILD
index 1aa673cea..462e54241 100644
--- a/user/qt5ct/APKBUILD
+++ b/user/qt5ct/APKBUILD
@@ -1,7 +1,7 @@
 # Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house>
 # Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house>
 pkgname=qt5ct
-pkgver=1.0
+pkgver=1.1
 pkgrel=0
 pkgdesc="GUI utility for configuring Qt5"
 url="https://sourceforge.net/projects/qt5ct/"
@@ -21,4 +21,4 @@ package() {
 	make INSTALL_ROOT="$pkgdir" install
 }
 
-sha512sums="f650362c90782128e1b3ddb61e73d0295bc5b108a75c8a10d085ce9df7dc0926ac40baf80705136b39cc779212fc97e121757c440f2728aab12b761caace78b2  qt5ct-1.0.tar.bz2"
+sha512sums="0df00c0680aefb0eada1ddb70886fd63641c403ab42843f8d209413a56895dce0a88eb88a98d09d23a30df3b15ca1d595237592958769a1be86719f2a16cbdf7  qt5ct-1.1.tar.bz2"
diff --git a/user/ttf-sudo/APKBUILD b/user/ttf-sudo/APKBUILD
index 9d5b07819..6c200fa5c 100644
--- a/user/ttf-sudo/APKBUILD
+++ b/user/ttf-sudo/APKBUILD
@@ -1,7 +1,7 @@
 # Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house>
 # Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house>
 pkgname=ttf-sudo
-pkgver=0.42
+pkgver=0.50
 pkgrel=0
 pkgdesc="Monospaced font family for programming and console users"
 url="https://www.kutilek.de/sudo-font/"
@@ -9,9 +9,9 @@ arch="noarch"
 options="!check"  # No test suite.
 license="OFL-1.1"
 depends="fontconfig"
-makedepends=""
-source="https://github.com/jenskutilek/sudo-font/releases/download/v$pkgver/sudo.zip"
-builddir="$srcdir/sudo"
+makedepends="unzip"
+source="$pkgname-$pkgver.tar.gz::https://github.com/jenskutilek/sudo-font/archive/v${pkgver}.tar.gz"
+builddir="$srcdir/sudo-font-$pkgver/sudo"
 
 package() {
 	mkdir -p "$pkgdir"/usr/share/fonts/X11/TTF/${pkgname#*-}
@@ -20,4 +20,4 @@ package() {
 	done
 }
 
-sha512sums="e48016ed1a4f6cc29f7301667a7e6a4cb7c09c85a2410c8eea3cfadb0b89ed29495834c5ac007f05b3fa25d63f3597118ac468fba4c2913282810cc23dd755e0  sudo.zip"
+sha512sums="d48020d5261f9b968ad2fc92f88ce4b1482e3b752b33b50452875951b09cd7472d520b60380321af49404de7986b06d6e653017a07e6a8687792f333a96e8532  ttf-sudo-0.50.tar.gz"
diff --git a/user/tumbler/APKBUILD b/user/tumbler/APKBUILD
index 723a1b2ff..a1946e12d 100644
--- a/user/tumbler/APKBUILD
+++ b/user/tumbler/APKBUILD
@@ -1,7 +1,7 @@
 # Contributor: Kiyoshi Aman <adelie@aerdan.vulpine.house>
 # Maintainer: Kiyoshi Aman <adelie@aerdan.vulpine.house>
 pkgname=tumbler
-pkgver=0.2.8
+pkgver=0.2.9
 pkgrel=0
 pkgdesc="Thumbnail generation service for the XFCE desktop environment"
 url="https://xfce.org"
@@ -33,4 +33,4 @@ package() {
 	make DESTDIR="$pkgdir" install
 }
 
-sha512sums="cfb322fb960b4f4d25c6dc68db5087c46845592fd0af839269598dc22930f5d460aae5df7c852024de3733fad9b0e53a8906700cb4ba43ab60883a6104f3e7cb  tumbler-0.2.8.tar.bz2"
+sha512sums="df9cf9b2ba77e220f11c5ca3ec4601c973802b802e989dcd24d1b2c7c13e97c185071488c866f3ed5ed1cc6defde1a4879b5fc2c48bfc015456508e526d6bf0f  tumbler-0.2.9.tar.bz2"