Merge branch 'bump.djt.20190625' into 'master'

djt's June 2019 Package Bumps

This MR bumps most of the outdated packages that I maintain to their latest versions.

See merge request !256

25 files changed, 116 insertions, 209 deletions

diff --git a/user/bind/APKBUILD b/user/bind/APKBUILD
index 7e0b38e15..41eca142e 100644
--- a/user/bind/APKBUILD
+++ b/user/bind/APKBUILD
@@ -4,7 +4,7 @@
 # Contributor: Natanael Copa <ncopa@alpinelinux.org>
 # Maintainer: Dan Theisen <djt@hxx.in>
 pkgname=bind
-pkgver=9.13.3
+pkgver=9.14.3
 _p=${pkgver#*_p}
 _ver=${pkgver%_p*}
 _major=${pkgver%%.*}
@@ -24,7 +24,7 @@ options="!check"
 license="ISC AND Apache-2.0 AND OpenSSL AND BSD-2-Clause AND BSD-3-Clause AND BSD-4-Clause"
 pkgusers="named"
 pkggroups="named"
-makedepends="bash openssl-dev libcap-dev perl linux-headers bsd-compat-headers libxml2-dev json-c-dev"
+makedepends="bash openssl-dev libcap-dev perl linux-headers bsd-compat-headers libxml2-dev json-c-dev py3-ply"
 install="$pkgname.pre-install"
 subpackages="$pkgname-doc $pkgname-dev $pkgname-libs $pkgname-openrc $pkgname-tools"
 source="https://ftp.isc.org/isc/${pkgname}${_major}/$_ver/$pkgname-$_ver.tar.gz
@@ -40,6 +40,13 @@ source="https://ftp.isc.org/isc/${pkgname}${_major}/$_ver/$pkgname-$_ver.tar.gz
 builddir="$srcdir/$pkgname-$_ver"
 
 # secfixes:
+#   9.14.3:
+#     - CVE-2018-5744
+#     - CVE-2018-5745
+#     - CVE-2019-6465
+#     - CVE-2018-5743
+#     - CVE-2019-6467
+#     - CVE-2019-6471
 #   9.13.3:
 #     - CVE-2018-5741
 #     - CVE-2018-5740
@@ -147,7 +154,7 @@ tools() {
 	done
 }
 
-sha512sums="980f294ef7b75c9a0917212e26300037ad6a33ff3565c099a6bad15350f0738491396a22a40dd552efd7fd25634f82f236abca4f83b4c8a9c580099851dd3c83  bind-9.13.3.tar.gz
+sha512sums="46974be2adea512c58b82184566ea5e8a9faf67aeb78ea33356861f0a7edce37eac05c21e8fbbc7f7db4e87404fe71ed59d9eac46e6e4758d95139a21891f437  bind-9.14.3.tar.gz
 7167dccdb2833643dfdb92994373d2cc087e52ba23b51bd68bd322ff9aca6744f01fa9d8a4b9cd8c4ce471755a85c03ec956ec0d8a1d4fae02124ddbed6841f6  bind.so_bsdcompat.patch
 196c0a3b43cf89e8e3547d7fb63a93ff9a3306505658dfd9aa78e6861be6b226580b424dd3dd44b955b2d9f682b1dc62c457f3ac29ce86200ef070140608c015  named.initd
 127bdcc0b5079961f0951344bc3fad547450c81aee2149eac8c41a8c0c973ea0ffe3f956684c6fcb735a29c43d2ff48c153b6a71a0f15757819a72c492488ddf  named.confd
diff --git a/user/chrony/APKBUILD b/user/chrony/APKBUILD
index dc2fe5d4f..46516b598 100644
--- a/user/chrony/APKBUILD
+++ b/user/chrony/APKBUILD
@@ -3,8 +3,8 @@
 # Contributor: Natanael Copa <ncopa@alpinelinux.org>
 # Maintainer: Dan Theisen <djt@hxx.in>
 pkgname=chrony
-pkgver=3.4
-pkgrel=1
+pkgver=3.5
+pkgrel=0
 _ver=${pkgver/_/-}
 pkgdesc="NTP client and server programs"
 url="https://chrony.tuxfamily.org"
@@ -20,7 +20,6 @@ subpackages="$pkgname-doc $pkgname-openrc"
 source="https://download.tuxfamily.org/$pkgname/$pkgname-$_ver.tar.gz
 	fix-tests.patch
 	max_resolve_interval.patch
-	chrony-include-util.patch
 	chronyd.confd
 	chronyd.initd
 	chrony.logrotate
@@ -90,10 +89,9 @@ package() {
 	chown -R $pkgusers:$pkggroups "$pkgdir"/var/lib/chrony
 }
 
-sha512sums="4fbb0311c8d363a87edd6f5d1be3d8554da169f260ba23c1ad9e8c567808258c6fd7513ba630d6fa27453ecfd81f0ece0e26d5ee2f98ca47fbc9887181a36918  chrony-3.4.tar.gz
+sha512sums="c4f6376a44d71b6ac2b6d86e3d6fb4348642faeef7f3f3a4d6431627b5645efcc868b005cc398c8292bc3b63a1161fbd1a042c6ac2a0595843f908fe32eed90c  chrony-3.5.tar.gz
 067d47224a8c075ec8f63ffc58e65b030fdf228a72c4f03d50a2f2c17414da65bb5d27c7c2e4ba99e909f452041db83eaebe3c9e34c0c8fce18e05ebb489735e  fix-tests.patch
 b26581ed32680585edea5b8163a0062a87f648394c0f363c77a7d01a36608fcf4d005d9e6ab179ed2827b8a08f598f7bad4801bb5e135cad5107eb77fb19b247  max_resolve_interval.patch
-30f1ed28e0d956c994abd770c68634c7d5c69ded04a2fbfd387bbd8009bc0102ce57934ce41e468fc6b2c7f8fefdab73d97f6d6ff39ec93fffa6575fa1451fbd  chrony-include-util.patch
 1ebb72341b4421060a43d6db164d743de9144f1c23370e052f0db92a17e5e34f24ac98baddeb5dbfef27f67479142d448c4401d927394e55024760730a27e8de  chronyd.confd
 9a18c9744d7b78d9b9be3f0ae0b43cb988b294c342764802e0d5df835d450e748584c0b345f7161f14d84e15c8bbd491514ee9dc45e4a65f1276c52124d2e312  chronyd.initd
 ab38f06bf45888846778ad935e24abb30d13b6805e9a750bc694ff953695fa8c5b33aac560f5f7f96dc46031c1a38660e5c418b6fce6fb34a87908a9a3c99357  chrony.logrotate
diff --git a/user/chrony/chrony-include-util.patch b/user/chrony/chrony-include-util.patch
deleted file mode 100644
index 20b43c187..000000000
--- a/user/chrony/chrony-include-util.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- chrony-3.4/hash_intmd5.c.old	2018-09-27 19:29:57.386348229 -0700
-+++ chrony-3.4/hash_intmd5.c	2018-09-27 19:30:07.696494803 -0700
-@@ -29,6 +29,7 @@
- #include "sysincl.h"
- #include "hash.h"
- #include "memory.h"
-+#include "util.h"
- 
- #include "md5.c"
- 
diff --git a/user/ddrescue/APKBUILD b/user/ddrescue/APKBUILD
index f1c42d607..6fd0c0a02 100644
--- a/user/ddrescue/APKBUILD
+++ b/user/ddrescue/APKBUILD
@@ -1,7 +1,7 @@
 # Contributor: Leonardo Arena <rnalrd@alpinelinux.org>
 # Maintainer: Dan Theisen <djt@hxx.in>
 pkgname=ddrescue
-pkgver=1.23
+pkgver=1.24
 pkgrel=0
 pkgdesc="Data recovery tool for block devices with errors"
 url="https://www.gnu.org/s/ddrescue/ddrescue.html"
@@ -34,4 +34,4 @@ package() {
 	make DESTDIR="$pkgdir" install
 }
 
-sha512sums="4f0b27067966b71efaae809d4f38714863cf3663f3b8c3f26055d482debb15c0fab77752411a9d242f18dbb8e4edc68494f866721dae9c95cfc5354439eaa656  ddrescue-1.23.tar.lz"
+sha512sums="2c6a86c80bad122e0c44d6f8da49239e10362fbfbdb70acf39055ce02637daa05cce4f24adac732a1bb3a6fc97cf6985dd20827e99ab3bf6bad4db015a00fbaa  ddrescue-1.24.tar.lz"
diff --git a/user/dhcpcd/APKBUILD b/user/dhcpcd/APKBUILD
index e42405db5..7dc1343f9 100644
--- a/user/dhcpcd/APKBUILD
+++ b/user/dhcpcd/APKBUILD
@@ -3,7 +3,7 @@
 # Contributor: Natanael Copa <ncopa@alpinelinux.org>
 # Maintainer: Dan Theisen <djt@hxx.in>
 pkgname=dhcpcd
-pkgver=7.0.8
+pkgver=7.2.2
 pkgrel=0
 pkgdesc="RFC2131 compliant DHCP client"
 url="https://roy.marples.name/projects/dhcpcd"
@@ -47,6 +47,6 @@ package() {
 		"$pkgdir"/etc/init.d/dhcpcd
 }
 
-sha512sums="82cd845eb35670788b8f31b973945460f4c5f1a0a3025e3a452b79230dc30704e129d97140e6aec6d0281e0c89c333c0ce0af03c4767b2e5e66547ed3e071953  dhcpcd-7.0.8.tar.xz
+sha512sums="a774c4788efbb9712be04d3f29943b801043f9ec1ea1925282330afa00b9f3db5c29a85969ef004bf85b20045b4cc6ab241ceaae050a18051079d396845845e8  dhcpcd-7.2.2.tar.xz
 1c19eed0f7a008ee96ea392beb327169ff8c83fc27fed20f65f05c9125f60629ebe3474c5e6a7cf4aeeea448fde4264c9b84916efacd67d47ab908c47b1fc3a5  fix-chrony-conf-location.patch
 e777432c2efc84285b41e63a4687f3bd543f6864218d037529ab78b5ad934de154f28f478bd9facb56628f2953aad8a932bc2eb8b1dfffa0ce2278ffcfc4d880  dhcpcd.initd"
diff --git a/user/dmenu/APKBUILD b/user/dmenu/APKBUILD
index 39a27bc5a..ec90c9934 100644
--- a/user/dmenu/APKBUILD
+++ b/user/dmenu/APKBUILD
@@ -2,7 +2,7 @@
 # Contributor: Sören Tempel <soeren+alpine@soeren-tempel.net>
 # Maintainer: Dan Theisen <djt@hxx.in>
 pkgname=dmenu
-pkgver=4.8
+pkgver=4.9
 pkgrel=0
 pkgdesc="Dynamic menu for X"
 url="https://tools.suckless.org/dmenu/"
@@ -33,4 +33,4 @@ package() {
 		-C "$builddir" install
 }
 
-sha512sums="fa2700018cfb912a21f867ef3ca771a58a25c2cb8e1fb37acef046bb15d8d8b92dcc5bfce486befae0f143495d0283910988e181a9eb143be3bb1b5be9738d77  dmenu-4.8.tar.gz"
+sha512sums="c2779209fe012de8ca1cdd72923da6d594f4a8368c85c3c0e0afd4ae489a95fe0e6f05a947d115b6b389aa7170ab14c2c645a2031353b0a08f38327ab461fe65  dmenu-4.9.tar.gz"
diff --git a/user/i3wm/APKBUILD b/user/i3wm/APKBUILD
index 59c94e802..7b8bd9469 100644
--- a/user/i3wm/APKBUILD
+++ b/user/i3wm/APKBUILD
@@ -2,7 +2,7 @@
 # Contributor: Natanael Copa <ncopa@alpinelinux.org>
 # Maintainer: Dan Theisen <djt@hxx.in>
 pkgname=i3wm
-pkgver=4.15
+pkgver=4.16.1
 pkgrel=0
 pkgdesc="Improved dynamic tiling window manager"
 url="https://i3wm.org"
@@ -43,7 +43,7 @@ package() {
 	install -m644 man/*.1 "$pkgdir"/usr/share/man/man1/
 }
 
-sha512sums="60ab61b7e380342126bea12fb4371f98fcf18f6435f79a9519d3f59cfabdb170634366036e1aa20c5592da0832b03140ad1f0c72bad3cfaace0b7c57ad01dfc4  i3-4.15.tar.bz2
-8ce7d00371c43b93dabbe0dadf9caf7c58a68f4a0079f5a9b9552c15c55bfa0df16d7e87a281595af2ac5254632ba28ccf82a467cea16159b41490f6f2910299  i3wm-musl-glob-tilde.patch
+sha512sums="3e328f8c7216697c5e484ca854605350f78844e24cc6cfb9c10e71368c2c0457387a14f819abdf8be2370d437889297f452fbf63f3924766ca81c157ab27e1b0  i3-4.16.1.tar.bz2
+6378e3619076c03345b4faa1f9d54cab2e7173068bc4d5f2f2894af9cc0e5792fe45ce95cb06328f5040f0ba6d43f3e49c523968732ac2d2046b698042338caa  i3wm-musl-glob-tilde.patch
 77224b994397b2e2487ae28dfd5781b3630654191813eb3c685f05ebf446e65c36e53a665ff3cc8323ea67e87f7cf977044025dade0a6ed22cbd84f0e6b4cbc7  i3wm-test-fix-off_t.patch
 a80384965dff62c51ce77e2baa3cf1b0b6db1df68994ce98383f96554bd296b4b59527fb5b1cb24b08c123699e294ba9b3baaa52afe88d87e7a76f0629194b1f  i3wm-test-disable-branch-check.patch"
diff --git a/user/i3wm/i3wm-musl-glob-tilde.patch b/user/i3wm/i3wm-musl-glob-tilde.patch
index 82ad6195b..d4c2d832e 100644
--- a/user/i3wm/i3wm-musl-glob-tilde.patch
+++ b/user/i3wm/i3wm-musl-glob-tilde.patch
@@ -4,7 +4,7 @@ diff -urp i3-4.11/i3bar/src/main.c i3-4.11.new/i3bar/src/main.c
 @@ -45,14 +45,20 @@ void debuglog(char *fmt, ...) {
   *
   */
- char *expand_path(char *path) {
+ static char *expand_path(char *path) {
 -    static glob_t globbuf;
 -    if (glob(path, GLOB_NOCHECK | GLOB_TILDE, NULL, &globbuf) < 0) {
 -        ELOG("glob() failed\n");
@@ -28,11 +28,11 @@ diff -urp i3-4.11/i3bar/src/main.c i3-4.11.new/i3bar/src/main.c
 +    return sstrdup(path);
  }
  
- void print_usage(char *elf_name) {
+ static void print_usage(char *elf_name) {
 diff -urp i3-4.11/libi3/resolve_tilde.c i3-4.11.new/libi3/resolve_tilde.c
 --- i3-4.11/libi3/resolve_tilde.c	2015-09-30 07:55:10.000000000 +0100
 +++ i3-4.11.new/libi3/resolve_tilde.c	2016-02-08 20:03:47.849230953 +0000
-@@ -19,27 +19,18 @@
+@@ -19,28 +19,18 @@
   *
   */
  char *resolve_tilde(const char *path) {
@@ -53,9 +53,9 @@ diff -urp i3-4.11/libi3/resolve_tilde.c i3-4.11.new/libi3/resolve_tilde.c
 -    } else {
 -        head = globbuf.gl_pathv[0];
 -        result = scalloc(strlen(head) + (tail ? strlen(tail) : 0) + 1, 1);
--        strncpy(result, head, strlen(head));
--        if (tail)
--            strncat(result, tail, strlen(tail));
+-        strcpy(result, head);
+-        if (tail) {
+-            strcat(result, tail);
 +    if (strncmp(path, "~/", 2) == 0) {
 +        home = getenv("HOME");
 +        if (home != NULL) {
@@ -64,7 +64,7 @@ diff -urp i3-4.11/libi3/resolve_tilde.c i3-4.11.new/libi3/resolve_tilde.c
 +            strcpy(expanded, home);
 +            strcat(expanded, path+1);
 +            return expanded;
-+        }
+         }
      }
 -    globfree(&globbuf);
  
diff --git a/user/imake/APKBUILD b/user/imake/APKBUILD
index b2eb2284b..db1fd9f55 100644
--- a/user/imake/APKBUILD
+++ b/user/imake/APKBUILD
@@ -1,7 +1,7 @@
 # Contributor: Natanael Copa <ncopa@alpinelinux.org>
 # Maintainer: Dan Theisen <djt@hxx.in>
 pkgname=imake
-pkgver=1.0.7
+pkgver=1.0.8
 pkgrel=0
 pkgdesc="X Windows make utility"
 url="https://www.x.org"
@@ -24,4 +24,4 @@ package() {
 	make DESTDIR="$pkgdir" install
 }
 
-sha512sums="b3527c8fead25c6e093e1fe4a39e60ff210212dcd323e206505b9e872a3f36d9db85f85cab5a6f0fa914fa5c558ef54b499b2b13ccd66739223e4e72ef805d08  imake-1.0.7.tar.bz2"
+sha512sums="5352b0148664506c8eb7ba80f95fced146d150398673547ba0b2c7c966a382bc21de43dfb8e0d74e38a0a563f16ddbec48bf8c8e6daa1a0899a95403579d7728  imake-1.0.8.tar.bz2"
diff --git a/user/iperf3/APKBUILD b/user/iperf3/APKBUILD
index 1e1fad965..906d8cd30 100644
--- a/user/iperf3/APKBUILD
+++ b/user/iperf3/APKBUILD
@@ -3,7 +3,7 @@
 # Maintainer: Dan Theisen <djt@hxx.in>
 pkgname=iperf3
 _pkgname=iperf
-pkgver=3.6
+pkgver=3.7
 pkgrel=0
 pkgdesc="A tool to measure IP bandwidth using UDP or TCP"
 url="https://software.es.net/iperf/"
@@ -17,9 +17,7 @@ source="$pkgname-$pkgver.tar.gz::https://downloads.es.net/pub/$_pkgname/$_pkgnam
 	$_pkgname.initd
 	$_pkgname.confd
 
-	build-fixes.patch
-	remove-pg-flags.patch
-	"
+	build-fixes.patch"
 builddir="$srcdir/$_pkgname-$pkgver"
 
 build() {
@@ -31,7 +29,8 @@ build() {
 		--prefix=/usr \
 		--sysconfdir=/etc \
 		--mandir=/usr/share/man \
-		--infodir=/usr/share/info
+		--infodir=/usr/share/info \
+		--disable-profiling
 	make
 }
 
@@ -50,8 +49,7 @@ package() {
 		"$pkgdir"/etc/conf.d/$_pkgname
 }
 
-sha512sums="322a6893ad28c6ce9c9849e8a0326408ed76f09bbb13591c01c3d051bd4777a2acdb8f5032b9d1bb37d47ad3818d8b18ab6c0be4d40559040eb7e57bbfc06f39  iperf3-3.6.tar.gz
+sha512sums="9b8d1ac6bdebb00e38e196db9a71ae6ff3b8b763cd4b1336d078c31f6d0a5ab53bbe70ba949c601af5efe674dbd032ed5d58a761d5159dae4e50122b68a8f086  iperf3-3.7.tar.gz
 339fb04b41cce11e8ea8694d95c13af9c88e0d1143356d913ec810c9b11efa27212d585b5dcc49cc2eb860a6d8bc557092c8659d7d5cfe532c5afdb36f8eedf8  iperf.initd
 fb5e155fff568a72488cc1511d30358835a48bcce309f8f46d040160932b4a4ccb85040c27c60dee477900a25bd34c50eac21d1d0bea984b40faa401be2ba7e8  iperf.confd
-126043503eebf84bccf26758f18715eaf81131e2fc9ef1fe829e55acb2f14e97db18e9b890b8bf13c230ac80c7537615272af4e072808e25bde8ddd6f326f198  build-fixes.patch
-ed0fb3a3af0dae3e9f58ff6643cb15defdd31f65cf966a6013fdf2a7fd67a7f8ef522a7c8f3269bd43d5ca991a86d758526c384ebc0984b1403bb24f61a1779b  remove-pg-flags.patch"
+126043503eebf84bccf26758f18715eaf81131e2fc9ef1fe829e55acb2f14e97db18e9b890b8bf13c230ac80c7537615272af4e072808e25bde8ddd6f326f198  build-fixes.patch"
diff --git a/user/iperf3/remove-pg-flags.patch b/user/iperf3/remove-pg-flags.patch
deleted file mode 100644
index 1ed47eebf..000000000
--- a/user/iperf3/remove-pg-flags.patch
+++ /dev/null
@@ -1,29 +0,0 @@
---- a/src/Makefile.am
-+++ b/src/Makefile.am
-@@ -50,9 +50,9 @@
- iperf3_profile_SOURCES  = main.c \
- 						  $(libiperf_la_SOURCES)
- 
--iperf3_profile_CFLAGS   = -pg -g
-+iperf3_profile_CFLAGS   = -g
- iperf3_profile_LDADD    = libiperf.la
--iperf3_profile_LDFLAGS  = -pg -g
-+iperf3_profile_LDFLAGS  = -g
- 
- # Specify the sources and various flags for the test cases
- t_timer_SOURCES         = t_timer.c
-
---- a/src/Makefile.in
-+++ b/src/Makefile.in
-@@ -643,9 +643,9 @@
- iperf3_profile_SOURCES = main.c \
- 						  $(libiperf_la_SOURCES)
- 
--iperf3_profile_CFLAGS = -pg -g
-+iperf3_profile_CFLAGS = -g
- iperf3_profile_LDADD = libiperf.la
--iperf3_profile_LDFLAGS = -pg -g
-+iperf3_profile_LDFLAGS = -g
- 
- # Specify the sources and various flags for the test cases
- t_timer_SOURCES = t_timer.c
diff --git a/user/iputils/APKBUILD b/user/iputils/APKBUILD
index fc6b1b3e6..4a35f931b 100644
--- a/user/iputils/APKBUILD
+++ b/user/iputils/APKBUILD
@@ -1,55 +1,42 @@
 # Contributor: Natanael Copa <ncopa@alpinelinux.org>
 # Maintainer: Dan Theisen <djt@hxx.in>
 pkgname=iputils
-pkgver=20180629
+pkgver=20190515
 pkgrel=0
 pkgdesc="IP Configuration Utilities (and Ping)"
 url="https://github.com/iputils/iputils/"
 arch="all"
 license="BSD-3-Clause AND GPL-2.0-or-later"
-makedepends="libcap-dev openssl-dev libxslt docbook-xsl"
+makedepends="meson libcap-dev libxslt docbook-xsl-ns openssl-dev libgcrypt-dev"
 replaces="bbsuid"
-subpackages="$pkgname-doc"
+subpackages="$pkgname-doc $pkgname-lang $pkgname-openrc"
 source="$pkgname-$pkgver.tgz::https://github.com/$pkgname/$pkgname/archive/s$pkgver.tar.gz
-	time.patch
-	fix-init-of-cmsg.patch
-        fix-idn.patch
+	docbook-man.patch
 	"
-options="!check suid"  # there is no testsuite for these applications
+options="suid"
 builddir="$srcdir/$pkgname-s$pkgver"
 
 build() {
 	cd "$builddir"
         # we're waiting for idn support in musl so that we can enable it here
         # https://wiki.musl-libc.org/functional-differences-from-glibc.html#Name-Resolver/DNS
-	make all ninfod USE_IDN=no USE_NETTLE=no KERNEL_INCLUDE=/usr/include
-        make man
+	meson --prefix /usr --buildtype=plain builddir -DUSE_IDN=false
+	ninja -v -C builddir
 }
 
-package() {
-	local name
+check() {
 	cd "$builddir"
+	ninja -C builddir test
+}
 
-	for name in arping clockdiff ipg rarpd rdisc tftpd tracepath; do
-		install -D -m755 $name "$pkgdir"/usr/sbin/$name
-	done
-	install -D -m755 ninfod/ninfod "$pkgdir"/usr/sbin/ninfod
-
-	for name in ping traceroute6; do
-		install -D -m4755 $name "$pkgdir"/bin/$name
-	done
+package() {
+	cd "$builddir"
 
-        mkdir -p "$pkgdir"/usr/share/man/man8
-	for doc in ./doc/*.8; do
-		gzip $doc
-		install -m644 "$doc".gz "$pkgdir"/usr/share/man/man8/
-	done
+	DESTDIR=$pkgdir ninja -C builddir install
 
-	ln -s tracepath "$pkgdir"/usr/sbin/tracepath6
-	ln -s ping "$pkgdir"/bin/ping6
+	ln -s tracepath "$pkgdir"/usr/bin/tracepath6
+	ln -s ping "$pkgdir"/usr/bin/ping6
 }
 
-sha512sums="16b8f5ad1cf88083ebaee0a71fddb14bb0a904336fd0baebfcca86c27ac0773553b21d12790b05cab7661d6432c75bbb1523e871e5e1b77faacd13ccc84f4476  iputils-20180629.tgz
-530532d16574921d0789af6a82706915e8103e712195c4f2eb6379192cc7126ba6bc9f33e8454118628d59f8932ffd2bb5aaba3b61fa93df83088e3b0d93d227  time.patch
-2779b9d987089a2a9a39c27a092f16da85881e9dfbc99edcca6baea42912b8a1a7e16b00c19684d2ea1a6123d66f78be12bef43398e63be7d7c97d3d6269a5bf  fix-init-of-cmsg.patch
-b3a5e5ef9ed1ed12a137f176db6a444f15db67dfaef3706514bc4d0cd2a332fb8aeeae0460fca8a1dfef2e0ce2ae0cf2218a74e3f61c46fcb27715a030425ac0  fix-idn.patch"
+sha512sums="adb8831ca3a567b9a5f3762227c631aefa62eedbaa7578c2bfea90b6d494b9e0cccf49b68713912611ec56c352d6c517df9e8409c9c9478cfc5732371c8cf250  iputils-20190515.tgz
+411f45a2d16c88b09f3547e3f04aa20e257f54650c7783123e4cb021bd8850cd96896480fbf9305d6df72abe32d8d5c2239ce4ac4ef9bfa821c205309451d6ff  docbook-man.patch"
diff --git a/user/iputils/docbook-man.patch b/user/iputils/docbook-man.patch
new file mode 100644
index 000000000..1793858e4
--- /dev/null
+++ b/user/iputils/docbook-man.patch
@@ -0,0 +1,33 @@
+--- iputils-s20190515/doc/custom-man.xsl.old	2019-06-25 11:48:48.790000000 +0000
++++ iputils-s20190515/doc/custom-man.xsl	2019-06-25 11:49:06.250000000 +0000
+@@ -5,7 +5,7 @@
+                 extension-element-prefixes="exsl"
+                 version="1.0">
+ 
+-<xsl:import href="http://docbook.sourceforge.net/release/xsl-ns/current/manpages/docbook.xsl"/>
++<xsl:import href="file:///usr/share/xml/docbook/xsl-stylesheets-ns/manpages/docbook.xsl"/>
+ 
+ <xsl:template name="top.comment" />
+ 
+--- iputils-s20190515/doc/meson.build.old	2019-06-25 14:54:58.170000000 +0000
++++ iputils-s20190515/doc/meson.build	2019-06-25 14:55:28.460000000 +0000
+@@ -48,7 +48,7 @@
+ ]
+ 
+ if xsltproc.found()
+-	xsl = 'http://docbook.sourceforge.net/release/xsl/current/manpages/docbook.xsl'
++	xsl = 'file:///usr/share/xml/docbook/xsl-stylesheets-ns/manpages/docbook.xsl'
+ 	testrun = run_command([xsltproc, '--nonet', xsl])
+ 	xsltproc_works = testrun.returncode() == 0
+ 	if xsltproc_works == false
+--- iputils-s20190515/doc/custom-html.xsl.old	2019-06-25 14:56:50.460000000 +0000
++++ iputils-s20190515/doc/custom-html.xsl	2019-06-25 14:57:11.680000000 +0000
+@@ -2,7 +2,7 @@
+ 
+ <xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" version="1.0">
+ 
+-<xsl:import href="http://docbook.sourceforge.net/release/xsl-ns/current/html/docbook.xsl"/>
++<xsl:import href="file:///usr/share/xml/docbook/xsl-stylesheets-ns/html/docbook.xsl"/>
+ <!--
+   - The docbook stylesheet injects empty anchor tags into generated HTML, identified by an auto-generated ID.
+   - Ask the docbook stylesheet to generate reproducible output when generating (these) ID values.
diff --git a/user/iputils/fix-idn.patch b/user/iputils/fix-idn.patch
deleted file mode 100644
index 4aaae8e82..000000000
--- a/user/iputils/fix-idn.patch
+++ /dev/null
@@ -1,14 +0,0 @@
---- iputils-s20180629/ping.c.orig	2018-06-29 11:00:46.000000000 -0700
-+++ iputils-s20180629/ping.c	2018-07-06 01:09:10.479830175 -0700
-@@ -207,9 +210,10 @@
- 
- #ifdef USE_IDN
- 	setlocale(LC_ALL, "");
--#endif
-+
- 	if (!strcmp(setlocale(LC_ALL, NULL), "C"))
- 		hints.ai_flags &= ~ AI_CANONIDN;
-+#endif
- 
- 	/* Support being called using `ping4` or `ping6` symlinks */
- 	if (argv[0][strlen(argv[0])-1] == '4')
diff --git a/user/iputils/fix-init-of-cmsg.patch b/user/iputils/fix-init-of-cmsg.patch
deleted file mode 100644
index 76ebc16c2..000000000
--- a/user/iputils/fix-init-of-cmsg.patch
+++ /dev/null
@@ -1,20 +0,0 @@
-Fixes ping on s390x.
-
-diff --git a/ping.c b/ping.c
-index a0857a1..329553d 100644
---- a/ping.c
-+++ b/ping.c
-@@ -108,8 +108,11 @@ static int parsetos(char *str);
- static struct {
- 	struct cmsghdr cm;
- 	struct in_pktinfo ipi;
--} cmsg = { {sizeof(struct cmsghdr) + sizeof(struct in_pktinfo), SOL_IP, IP_PKTINFO},
--	   {0, }};
-+} cmsg = { .cm = {
-+		.cmsg_len = sizeof(struct cmsghdr) + sizeof(struct in_pktinfo),
-+		.cmsg_level = SOL_IP,
-+		.cmsg_type = IP_PKTINFO},
-+	   .ipi = {0, }};
- int cmsg_len;
- 
- struct sockaddr_in source;
diff --git a/user/iputils/time.patch b/user/iputils/time.patch
deleted file mode 100644
index 1d6033f7a..000000000
--- a/user/iputils/time.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- ./tracepath.c.orig
-+++ ./tracepath.c
-@@ -12,6 +12,7 @@
- #include <stdio.h>
- #include <stdlib.h>
- #include <unistd.h>
-+#include <time.h>
- #include <sys/socket.h>
- #include <linux/types.h>
- #include <linux/errqueue.h>
diff --git a/user/libidn2/APKBUILD b/user/libidn2/APKBUILD
index b08fa94db..ee0936554 100644
--- a/user/libidn2/APKBUILD
+++ b/user/libidn2/APKBUILD
@@ -1,8 +1,8 @@
 # Contributor: Dan Theisen <djt@hxx.in>
 # Maintainer: Dan Theisen <djt@hxx.in>
 pkgname=libidn2
-pkgver=2.0.5
-pkgrel=1
+pkgver=2.2.0
+pkgrel=0
 pkgdesc="Free implementation of IDNA2008, Punycode, and TR46"
 url="https://gitlab.com/libidn/libidn2"
 arch="all"
@@ -34,4 +34,4 @@ package() {
 	make DESTDIR="$pkgdir" install
 }
 
-sha512sums="9d040d60de40316788825d8720d509d5b8a82287415e09e17792c2f32fad99ca77f43e55888b9484db69426eaa0ece59e9671eee9cc46411afbdb0f81af31a79  libidn2-2.0.5.tar.gz"
+sha512sums="ccf56056a378d49a28ff67a2a23cd3d32ce51f86a78f84839b98dad709a1d0d03ac8d7c1496f0e4d3536bca00e3d09d34d76a37317b2ce87e3aa66bdf4e877b8  libidn2-2.2.0.tar.gz"
diff --git a/user/nano/APKBUILD b/user/nano/APKBUILD
index 5c9e06bd5..079af13e3 100644
--- a/user/nano/APKBUILD
+++ b/user/nano/APKBUILD
@@ -1,7 +1,7 @@
 # Contributor: Michael Mason <ms13sp@gmail.com>
 # Maintainer: Dan Theisen <djt@hxx.in>
 pkgname=nano
-pkgver=4.2
+pkgver=4.3
 pkgrel=0
 pkgdesc="Enhanced clone of the Pico text editor"
 url="https://www.nano-editor.org"
@@ -44,4 +44,4 @@ package() {
 	rm -rf "$pkgdir"/usr/lib/charset.alias
 }
 
-sha512sums="280c986ebbc83875270da659232910568bcade962b75ddf9ddc2af6e0fb9aab2b0d029a80d632b5c67fc385958ef4d724aafeeb10299c9e2bc281e737a11845c  nano-4.2.tar.xz"
+sha512sums="3b16b70bdd98ea92cef99dfe5ee859e198bdb1dfa44e25aa200362958f77f8127c7c66aaf204637b768f10b3ea6f45f41417359b2f2608fab28ee9041057bf4f  nano-4.3.tar.xz"
diff --git a/user/protobuf/APKBUILD b/user/protobuf/APKBUILD
index af46fd009..78a480016 100644
--- a/user/protobuf/APKBUILD
+++ b/user/protobuf/APKBUILD
@@ -3,8 +3,8 @@
 # Maintainer: Dan Theisen <djt@hxx.in>
 pkgname=protobuf
 _gemname=google-protobuf
-pkgver=3.7.1
-_tstver=1.8.0
+pkgver=3.8.0
+_tstver=1.8.1
 pkgrel=0
 pkgdesc="Library for extensible, efficient structure packing"
 url="https://github.com/google/protobuf"
@@ -116,5 +116,5 @@ vim() {
 		"$subpkgdir"/usr/share/vim/vimfiles/syntax/proto.vim
 }
 
-sha512sums="7d4cfabd4bd55926336a3baafa0bc1f1f15380b1b2af945f70a2bb3ba24c6ac6567f49c492326d6d1c43a488166bff178f9266377758a05d8541d8b242f4f80f  protobuf-3.7.1.tar.gz
-1dbece324473e53a83a60601b02c92c089f5d314761351974e097b2cf4d24af4296f9eb8653b6b03b1e363d9c5f793897acae1f0c7ac40149216035c4d395d9d  googletest-1.8.0.tar.gz"
+sha512sums="ba27c64e5193cd4a144bf0c9dc0d195fbbe6e580aaca01960362f0f185074588ca40046d3bcea76e1deae7508b722f6c5be484ea957122ae8e98229c7c3a4ad2  protobuf-3.8.0.tar.gz
+e6283c667558e1fd6e49fa96e52af0e415a3c8037afe1d28b7ff1ec4c2ef8f49beb70a9327b7fc77eb4052a58c4ccad8b5260ec90e4bceeac7a46ff59c4369d7  googletest-1.8.1.tar.gz"
diff --git a/user/ruby-rspec-core/APKBUILD b/user/ruby-rspec-core/APKBUILD
index 34deeb73d..e6f3cc048 100644
--- a/user/ruby-rspec-core/APKBUILD
+++ b/user/ruby-rspec-core/APKBUILD
@@ -2,10 +2,10 @@
 # Maintainer: Dan Theisen <djt@hxx.in>
 pkgname=ruby-rspec-core
 _gemname=${pkgname#ruby-}
-pkgver=3.8.0
+pkgver=3.8.1
 pkgrel=0
 pkgdesc="RSpec runner and formatters"
-url="https://relishapp.com/rspec/rspec-core/"
+url="https://relishapp.com/rspec/rspec-core"
 arch="noarch"
 options="!check"  # rspec's tests are written in rspec
 license="MIT"
@@ -37,5 +37,5 @@ package() {
 		"$gemdir"/doc
 }
 
-sha512sums="6d3f431a1f9485009f5029bea967f36cb789be8cf33722b36c40df44e12a2284674c6c8af333bfe8ba8825e032576569fd42c92f798988faad732ac3a720c5e6  ruby-rspec-core-3.8.0.tar.gz
+sha512sums="fb9d6098e9c43b0fb0b7344521861c6095bee09d3fcaec526bed7b67f21cdff067a4a913f7cf17af9436587a20caab172670058785f138f50103708475057941  ruby-rspec-core-3.8.1.tar.gz
 e0cbcfddcc4c73d9b9673907e3b1a785b399c0b3b213761e9dbca9fadc55d50a88389eaf561f5603bd674eb94ce9f2ecf829d884eaa77df8ef1b565c0c7f25f2  gemspec.patch"
diff --git a/user/ruby-rspec-expectations/APKBUILD b/user/ruby-rspec-expectations/APKBUILD
index 1cf7cf5cc..ab3808053 100644
--- a/user/ruby-rspec-expectations/APKBUILD
+++ b/user/ruby-rspec-expectations/APKBUILD
@@ -2,7 +2,7 @@
 # Maintainer: Dan Theisen <djt@hxx.in>
 pkgname=ruby-rspec-expectations
 _gemname=${pkgname#ruby-}
-pkgver=3.8.3
+pkgver=3.8.4
 pkgrel=0
 pkgdesc="Provides a readable API to express expected outcomes of a code example in RSpec"
 url="https://relishapp.com/rspec/rspec-expectations/"
@@ -36,5 +36,5 @@ package() {
 		"$gemdir"/doc
 }
 
-sha512sums="328b3403e7ac2864ed6ad1a196ca24df6693797e35525559f2082c7e1c161d60da7776ca1a68a82364a7ea55115ac2c12ebf6af8486ef88757a4818a9683ae80  ruby-rspec-expectations-3.8.3.tar.gz
+sha512sums="0ecb16f11ccf19c02c40ce587f33846fb2241f1663dd87f012b9b782338c213362dac624c434dee6e00ad2cc7ec4a1cd0af7f2edf1a8e9ebb0a0dfb31cd244d8  ruby-rspec-expectations-3.8.4.tar.gz
 1d477004521852e23d01b197187dbb434a2c7fd179e506c82a12e17f5d52470fe2a113112e7052b9479077eafa6759beb07c03301de1f8ea7f5c4643c92d8346  gemspec.patch"
diff --git a/user/ruby-rspec-mocks/APKBUILD b/user/ruby-rspec-mocks/APKBUILD
index 70a6b801c..314915d92 100644
--- a/user/ruby-rspec-mocks/APKBUILD
+++ b/user/ruby-rspec-mocks/APKBUILD
@@ -2,7 +2,7 @@
 # Maintainer: Dan Theisen <djt@hxx.in>
 pkgname=ruby-rspec-mocks
 _gemname=${pkgname#ruby-}
-pkgver=3.8.0
+pkgver=3.8.1
 pkgrel=0
 pkgdesc="RSpec's 'test double' framework, with support for stubbing and mocking"
 url="https://relishapp.com/rspec/rspec-mocks/"
@@ -36,5 +36,5 @@ package() {
 		"$gemdir"/doc
 }
 
-sha512sums="0649c3722479013aa1a20f750b3a83a9b426e5f79cb0edff995b09d1e2fa674fb8e91c0c94e7f9513f338c3c2e9c5b824a9473e91955cf928542324b8b1463ba  ruby-rspec-mocks-3.8.0.tar.gz
+sha512sums="ec71c4b815beef315f8db329bd2b0e60cdbb1fa37939c624799c1589d94dd28f74b3d1a4c0b9025bc98a809f80d625315458351fe7dec8291bad20e79beecca8  ruby-rspec-mocks-3.8.1.tar.gz
 6fd7ab08b20a93f806a8d3c42da5da0a99162793079ecb1695341a04dff2a7cefdb12592d1798fb844dfbdf8ead6ad0b8729e461d3cd5af46d853b182d15228d  gemspec.patch"
diff --git a/user/ruby-rspec-support/APKBUILD b/user/ruby-rspec-support/APKBUILD
index ba2389e72..12c754fc0 100644
--- a/user/ruby-rspec-support/APKBUILD
+++ b/user/ruby-rspec-support/APKBUILD
@@ -2,10 +2,10 @@
 # Maintainer: Dan Theisen <djt@hxx.in>
 pkgname=ruby-rspec-support
 _gemname=${pkgname#ruby-}
-pkgver=3.8.0
+pkgver=3.8.2
 pkgrel=0
 pkgdesc="Support utilities for RSpec gems"
-url="https://relishapp.com/rspec/rspec-support/"
+url="https://rubygems.org/gems/rspec-support"
 arch="noarch"
 options="!check"  # rspec's tests are written in rspec
 license="MIT"
@@ -36,5 +36,5 @@ package() {
 		"$gemdir"/doc
 }
 
-sha512sums="e16cc7bcc3de797e78c4f6ed475b0e60d492d0442dc048b4b2769a4819b80d1fb4a12aefaee3cc6a35f08d35f5fea82e00cc0fcf04363e57e74a6f5ed73d0693  ruby-rspec-support-3.8.0.tar.gz
+sha512sums="9fb9f8f2507edee5e7c414d32c1641803eed7a5e17fd300308449277ec6efb786f07207d8f28bcea0a669b8d76a2da53057488d149990ae973c0f7a0343180dc  ruby-rspec-support-3.8.2.tar.gz
 e9d611ea1789e835f742aa92f1e668840139e2621898edf158dc53e111db4119a324da65d2d28f5c6e737c82f261f4adb3beb8c244ee01d2f618778ed62d3731  gemspec.patch"
diff --git a/user/tcsh/002-test_123-posix_fix.patch b/user/tcsh/002-test_123-posix_fix.patch
deleted file mode 100644
index 6ed59de38..000000000
--- a/user/tcsh/002-test_123-posix_fix.patch
+++ /dev/null
@@ -1,34 +0,0 @@
-Author: Dan Theisen <djt@hxx.in>
-Date:   Wed Jun 06 03:30:25 2018 -0800
-
-The following lines have a subtle change around [:blank:], changing it
-to [[:blank:]] instead. This is required because POSIX treats characters
-inside of brackets as a group of characters to match against. In this case,
-[[:space:]] means [] group of characters, and [:space:] is the group, as per:
-IEEE Std 1003.1-2017 (Revision of IEEE Std 1003.1-2008), Chapter 9
-http://pubs.opengroup.org/onlinepubs/9699919799/basedefs/V1_chap09.html
-
---- tcsh-6.20.00/tests/lexical.at.old	2018-06-06 02:20:16.787145186 -0700
-+++ tcsh-6.20.00/tests/lexical.at	2018-06-06 02:21:09.537890842 -0700
-@@ -567,10 +567,10 @@
- ]])
- AT_DATA([uniformity_test.csh],
- [[
--set SERVICE_NAME_LOG = `cat batchsystem.properties | grep '^jdbc_url' | sed -ne 's/^[^=]*=[^@]*@[:blank:]*\([^$]*\)$/\1/p' | perl -pe 's/\s//g'  |  perl -pe 's/\)/\\\)/g' | perl -pe 's/\(/\\\(/g'`
-+set SERVICE_NAME_LOG = `cat batchsystem.properties | grep '^jdbc_url' | sed -ne 's/^[^=]*=[^@]*@[[:blank:]]*\([^$]*\)$/\1/p' | perl -pe 's/\s//g'  |  perl -pe 's/\)/\\\)/g' | perl -pe 's/\(/\\\(/g'`
- echo -n "$SERVICE_NAME_LOG" > ./output1
- 
--cat batchsystem.properties | grep '^jdbc_url' | sed -ne 's/^[^=]*=[^@]*@[:blank:]*\([^$]*\)$/\1/p' | perl -pe 's/\s//g'  |  perl -pe 's/\)/\\\)/g' | perl -pe 's/\(/\\\(/g' > ./output2
-+cat batchsystem.properties | grep '^jdbc_url' | sed -ne 's/^[^=]*=[^@]*@[[:blank:]]*\([^$]*\)$/\1/p' | perl -pe 's/\s//g'  |  perl -pe 's/\)/\\\)/g' | perl -pe 's/\(/\\\(/g' > ./output2
- 
- diff -uprN ./output1 ./output2 >& /dev/null
- 
-@@ -587,7 +587,7 @@
- echo "(DESCRIPTION=(ADDRESS=(PROTOCOL=TCP\)(HOST=db\)(PORT=1521\)\)(CONNECT_DATA=(SERVER=DEDICATED\)(SERVICE_NAME=bns03\)\)\)" > ./expected_result
- 
- set string = "jdbc_url=jdbc:oracle:thin:@(DESCRIPTION=(ADDRESS=(PROTOCOL=TCP)(HOST=db)(PORT=1521))(CONNECT_DATA=(SERVER=DEDICATED)(SERVICE_NAME=bns03)))"
--set SERVICE_NAME_LOG  = `echo "$string" | grep '^jdbc_url' | sed -ne 's/^[^=]*=[^@]*@[:blank:]*\([^$]*\)$/\1/p' | perl -pe 's/\)/\\\)/g'`
-+set SERVICE_NAME_LOG  = `echo "$string" | grep '^jdbc_url' | sed -ne 's/^[^=]*=[^@]*@[[:blank:]]*\([^$]*\)$/\1/p' | perl -pe 's/\)/\\\)/g'`
- 
- echo "$SERVICE_NAME_LOG" > ./actual_result
- 
diff --git a/user/tcsh/APKBUILD b/user/tcsh/APKBUILD
index 2fdfac0b2..ee876adff 100644
--- a/user/tcsh/APKBUILD
+++ b/user/tcsh/APKBUILD
@@ -1,10 +1,12 @@
 # Contributor: Dan Theisen <djt@hxx.in>
 # Maintainer: Dan Theisen <djt@hxx.in>
 pkgname=tcsh
-pkgver=6.20.00
-pkgrel=2
+pkgver=6.21.00
+_pkgver=${pkgver%.*.*}_${pkgver#*.}
+_pkgver=${_pkgver%.*}_${_pkgver#*.}
+pkgrel=0
 pkgdesc="extended C-shell"
-url="http://www.tcsh.org"
+url="https://www.tcsh.org"
 arch="all"
 license="BSD-3-Clause"
 depends=""
@@ -13,10 +15,10 @@ makedepends="ncurses-dev ncurses-terminfo utmps-dev gettext-tiny-dev"
 install="$pkgname.post-install $pkgname.post-upgrade $pkgname.pre-deinstall"
 subpackages="$pkgname-doc"
 options="!checkroot"
-source="$pkgname-$pkgver.tar.gz::http://http.debian.net/debian/pool/main/t/tcsh/${pkgname}_${pkgver}.orig.tar.gz
-	001-sysmalloc.patch
-	002-test_123-posix_fix.patch"
+source="$pkgname-$pkgver.tar.gz::https://github.com/tcsh-org/tcsh/archive/TCSH${_pkgver}.tar.gz
+	001-sysmalloc.patch"
 
+builddir="$srcdir/${pkgname}-TCSH${_pkgver}"
 build() {
 	cd "$builddir"
 	LIBS="-lutmps -lskarnet -ltinfo" ./configure \
@@ -42,6 +44,5 @@ package() {
 	make DESTDIR="$pkgdir" install
 }
 
-sha512sums="c5635393c22341e62fb9a0b953ddf8871a876ab09deb08c98237f93afa9257b4a3381d1db65eefe769e22ef845db29ab7bc78773f1f609d73c8205689a6683e9  tcsh-6.20.00.tar.gz
-40149d8eb2fc0fe5184f3c24c7a1b728e881cc0048ccd37a986c3b2d2094499ec1c37ae2bae4c209fb8a847aa943e83e81f79e3d2f55c59990bc00d9d07f5a94  001-sysmalloc.patch
-b4c1afe04554d117b1402608bcdb243148c0c7b2442bdc10dde3ed6601db5e7c5a2341373f9bdc31fda8860e47a6e152cdcc4e3a8b273742037eebc624df282c  002-test_123-posix_fix.patch"
+sha512sums="305380fd065ca4703ffba002358b41727056481573a78301cb8c2390d5fe1a4107af5d482db5abf26f0ce9f7193c8aeb0e34fedcc40971499be2e6dc13bf3405  tcsh-6.21.00.tar.gz
+40149d8eb2fc0fe5184f3c24c7a1b728e881cc0048ccd37a986c3b2d2094499ec1c37ae2bae4c209fb8a847aa943e83e81f79e3d2f55c59990bc00d9d07f5a94  001-sysmalloc.patch"