17 files changed, 211 insertions, 150 deletions
diff --git a/system/apk-tools/APKBUILD b/system/apk-tools/APKBUILD
index 78478e51e..86a15d28a 100644
--- a/system/apk-tools/APKBUILD
+++ b/system/apk-tools/APKBUILD
@@ -1,8 +1,8 @@
 # Contributor: Natanael Copa <ncopa@alpinelinux.org>
 # Maintainer: Adelie Platform Group <adelie-devel@lists.adelielinux.org>
 pkgname=apk-tools
-pkgver=2.10.3
-pkgrel=2
+pkgver=2.10.4
+pkgrel=0
 pkgdesc="Alpine Package Keeper - package manager"
 url="https://git.alpinelinux.org/cgit/apk-tools/"
 arch="all"
@@ -13,9 +13,9 @@ makedepends_host="zlib-dev openssl openssl-dev linux-headers"
 makedepends="$makedepends_build $makedepends_host"
 subpackages="$pkgname-static"
 source="https://dev.alpinelinux.org/archive/$pkgname/$pkgname-$pkgver.tar.xz
-	deep.patch
-	list.patch
 	pmmx.patch
+	search.patch
+	virtual.patch
 	"
 
 prepare() {
@@ -69,7 +69,7 @@ static() {
 		"$subpkgdir"/sbin/apk.static
 }
 
-sha512sums="1b190cfd04c69369bd4f2b708d4df0f8cf2937e1580c95138fd2c2257e7604d015deaca10a9fe0da6742981caadb6b067c15e417a1951866f781b8a5c71c98ee  apk-tools-2.10.3.tar.xz
-059f0368b096c53357db567bf720f049cf19a88dbf10dc2496a739dfe332a6487b87f07056d7cf6f0c8a385782821547d4aba8c393591c4070838f1c98819dda  deep.patch
-53d446734d32341cbd9ca00aedcd65d4d99220da354a9339837a6c79609a321f61ae917fb3cd9d4bffebcfc171d06c0f0d315e29a2d16285545c4fa085a75639  list.patch
-746d00ce2af554a25db7ecea2b0a4d8f7399d2560efb6bf59ea144012d0163d3e0bad84c799bd706e8be6c0a543d4e35728d6beb269fddbbea626384009129cb  pmmx.patch"
+sha512sums="d2d9fde0aae9059236f68a3fc2f2186104bb9a099b15d296a6202a20ab2912638f10bb3b9edb70f359d060c5839573c3d50ef37d13095fa01c66dc3219ab6e39  apk-tools-2.10.4.tar.xz
+78f863c83af8b245aa38416c47016bcbe95ea8e33802123f6ea54b3752eb3c1ee79e5d6fc76ddedd2fba522b82a7367837f4596321085d54397b27fd5edf3b2f  pmmx.patch
+5ac09eadabe44fe05c952c25df8f6daca292c63e6e5e3481d57603b8b3f1980385ccd87ad4a87b617353d1f936591afb9ee8815e4d8ec3e33913be2b3e3a3f84  search.patch
+4e2a8db82e6e40ae4863d12ee55151468d6e8c383e2e2001015f469e07f47057bc9055ab52a4a04f2bffa41ec225f77a9bd6042d5e1fcbd2908d7393e3aed2a1  virtual.patch"
diff --git a/system/apk-tools/deep.patch b/system/apk-tools/deep.patch
deleted file mode 100644
index b9e361717..000000000
--- a/system/apk-tools/deep.patch
+++ /dev/null
@@ -1,50 +0,0 @@
-From b0be9f610c02bb2d5e681a3904940d311e9de298 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Timo=20Ter=C3=A4s?= <timo.teras@iki.fi>
-Date: Mon, 3 Jun 2019 14:53:46 +0300
-Subject: solver: fix common dependency merging to inherit pinning and flags
-
-Notably this fixes occasional issues when doing upgrade with multiple
-versions of same packages. Without this the upgrade flag is not always
-propagated properly down the dependency chain.
----
- src/solver.c | 10 +++++++---
- 1 file changed, 7 insertions(+), 3 deletions(-)
-
-diff --git a/src/solver.c b/src/solver.c
-index e10cf8b..2121dd9 100644
---- a/src/solver.c
-+++ b/src/solver.c
-@@ -462,6 +462,8 @@ static void reconsider_name(struct apk_solver_state *ss, struct apk_name *name)
- 						   name->name, name0->name);
- 					name0->ss.requirers++;
- 					name_requirers_changed(ss, name0);
-+					foreach_array_item(p, name0->providers)
-+						inherit_pinning_and_flags(ss, p->pkg, pkg);
- 				}
- 			}
- 		}
-@@ -510,7 +512,6 @@ static int compare_providers(struct apk_solver_state *ss,
- 	unsigned int solver_flags;
- 	int r;
- 
--
- 	/* Prefer existing package */
- 	if (pkgA == NULL || pkgB == NULL)
- 		return (pkgA != NULL) - (pkgB != NULL);
-@@ -675,8 +676,11 @@ static void select_package(struct apk_solver_state *ss, struct apk_name *name)
- 
- 	if (name->ss.requirers || name->ss.has_iif) {
- 		foreach_array_item(p, name->providers) {
--			dbg_printf("  consider "PKG_VER_FMT" iif_triggered=%d, tag_ok=%d, selectable=%d, provider_priority=%d, installed=%d\n",
--				PKG_VER_PRINTF(p->pkg), p->pkg->ss.iif_triggered, p->pkg->ss.tag_ok, p->pkg->ss.pkg_selectable,
-+			dbg_printf("  consider "PKG_VER_FMT" iif_triggered=%d, tag_ok=%d, selectable=%d, available=%d, flags=0x%x, provider_priority=%d, installed=%d\n",
-+				PKG_VER_PRINTF(p->pkg),
-+				p->pkg->ss.iif_triggered, p->pkg->ss.tag_ok,
-+				p->pkg->ss.pkg_selectable, p->pkg->ss.pkg_available,
-+				p->pkg->ss.solver_flags,
- 				p->pkg->provider_priority, p->pkg->ipkg != NULL);
- 			/* Ensure valid pinning and install-if trigger */
- 			if (name->ss.requirers == 0 &&
--- 
-cgit v1.2.1
-
diff --git a/system/apk-tools/list.patch b/system/apk-tools/list.patch
deleted file mode 100644
index 9692c0c8c..000000000
--- a/system/apk-tools/list.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-diff --git a/src/list.c b/src/list.c
-index e285e3f..dcbaeea 100644
---- a/src/list.c
-+++ b/src/list.c
-@@ -61,7 +61,7 @@ static int is_orphaned(const struct apk_name *name)
- 	/* repo 1 is always installed-db, so if other bits are set it means the package is available somewhere
- 	 * (either cache or in a proper repo)
- 	 */
--	return (repos & ~BIT(1)) == 0;
-+	return (repos & ~BIT(0)) == 0;
- }
- 
- /* returns the currently installed package if there is a newer package that satisfies `name` */
-@@ -144,7 +144,7 @@ static void filter_package(const struct apk_package *pkg, const struct list_ctx
- 	if (ctx->orphaned && !is_orphaned(pkg->name))
- 		return;
- 
--	if (ctx->available && pkg->repos == BIT(1))
-+	if (ctx->available && pkg->repos == BIT(0))
- 		return;
- 
- 	if (ctx->upgradable && !is_upgradable(pkg->name, pkg))
-0001-list-Detect-orphaned-packages-correctly.patch
-0001-list-Detect-orphaned-packages-correctly.patch
diff --git a/system/apk-tools/pmmx.patch b/system/apk-tools/pmmx.patch
index 1b19edc94..e64ad6c0d 100644
--- a/system/apk-tools/pmmx.patch
+++ b/system/apk-tools/pmmx.patch
@@ -1,6 +1,6 @@
 --- apk-tools-2.10.1/src/apk_defines.h.old	2018-09-10 08:04:03.000000000 +0000
 +++ apk-tools-2.10.1/src/apk_defines.h	2019-01-04 03:31:41.900000000 +0000
-@@ -88,7 +88,7 @@
+@@ -89,7 +89,7 @@
  #if defined(__x86_64__)
  #define APK_DEFAULT_ARCH        "x86_64"
  #elif defined(__i386__)
diff --git a/system/apk-tools/search.patch b/system/apk-tools/search.patch
new file mode 100644
index 000000000..1c652356f
--- /dev/null
+++ b/system/apk-tools/search.patch
@@ -0,0 +1,29 @@
+From 530a6e6847657aa9187acd187269ac25f7cdd932 Mon Sep 17 00:00:00 2001
+From: "A. Wilcox" <AWilcox@Wilcox-Tech.com>
+Date: Tue, 9 Jul 2019 00:40:15 -0500
+Subject: [PATCH] search: Show in "simple" help output
+
+Most users probably want to know about the 'search' applet.
+
+Omission from 'apk --help' output reported by fungalnet[1].
+
+[1]: https://www.reddit.com/r/AdelieLinux/comments/c8mtk9/apk_search/
+---
+ src/search.c | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/src/search.c b/src/search.c
+index 9a71747..0b00a3b 100644
+--- a/src/search.c
++++ b/src/search.c
+@@ -209,6 +209,7 @@ static struct apk_applet apk_search = {
+ 	.help = "Search package by PATTERNs or by indexed dependencies",
+ 	.arguments = "PATTERN",
+ 	.open_flags = APK_OPENF_READ | APK_OPENF_NO_STATE,
++	.command_groups = APK_COMMAND_GROUP_QUERY,
+ 	.context_size = sizeof(struct search_ctx),
+ 	.optgroups = { &optgroup_global, &optgroup_applet },
+ 	.main = search_main,
+-- 
+2.22.0
+
diff --git a/system/apk-tools/virtual.patch b/system/apk-tools/virtual.patch
new file mode 100644
index 000000000..31e6d6807
--- /dev/null
+++ b/system/apk-tools/virtual.patch
@@ -0,0 +1,109 @@
+From b45415b1096e76f40b32326d2798123f81fe5976 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Timo=20Ter=C3=A4s?= <timo.teras@iki.fi>
+Date: Tue, 2 Jul 2019 15:27:57 +0300
+Subject: [PATCH 1/2] add: fix virtual package id generation
+
+Fixes 37fbafcd by adding more input to the hash than just second
+grained time stamp - collisions would happen when running apk
+scripted.
+
+For virtual package the hash works only as unique identifier, so
+try to add elements that should make it unique in most cases.
+
+Fixes #10648
+---
+ src/add.c | 51 +++++++++++++++++++++++++++++++++++----------------
+ 1 file changed, 35 insertions(+), 16 deletions(-)
+
+diff --git a/src/add.c b/src/add.c
+index 2d342ab..e028736 100644
+--- a/src/add.c
++++ b/src/add.c
+@@ -11,6 +11,7 @@
+ 
+ #include <errno.h>
+ #include <stdio.h>
++#include <unistd.h>
+ #include "apk_applet.h"
+ #include "apk_database.h"
+ #include "apk_print.h"
+@@ -80,6 +81,38 @@ static int non_repository_check(struct apk_database *db)
+ 	return 1;
+ }
+ 
++static struct apk_package *create_virtual_package(struct apk_database *db, struct apk_name *name)
++{
++	char ver[32];
++	struct apk_package *virtpkg;
++	struct tm tm;
++	EVP_MD_CTX *mdctx;
++	time_t now = apk_time();
++	pid_t pid = getpid();
++
++	localtime_r(&now, &tm);
++	strftime(ver, sizeof ver, "%Y%m%d.%H%M%S", &tm);
++
++	virtpkg = apk_pkg_new();
++	if (virtpkg == NULL) return 0;
++
++	virtpkg->name = name;
++	virtpkg->version = apk_blob_atomize(APK_BLOB_STR(ver));
++	virtpkg->description = strdup("virtual meta package");
++	virtpkg->arch = apk_blob_atomize(APK_BLOB_STR("noarch"));
++
++	mdctx = EVP_MD_CTX_new();
++	EVP_DigestInit_ex(mdctx, apk_checksum_default(), NULL);
++	EVP_DigestUpdate(mdctx, &tm, sizeof tm);
++	EVP_DigestUpdate(mdctx, &pid, sizeof pid);
++	EVP_DigestUpdate(mdctx, virtpkg->name->name, strlen(virtpkg->name->name) + 1);
++	virtpkg->csum.type = EVP_MD_CTX_size(mdctx);
++	EVP_DigestFinal_ex(mdctx, virtpkg->csum.data, NULL);
++	EVP_MD_CTX_free(mdctx);
++
++	return virtpkg;
++}
++
+ static int add_main(void *ctx, struct apk_database *db, struct apk_string_array *args)
+ {
+ 	struct add_ctx *actx = (struct add_ctx *) ctx;
+@@ -93,10 +126,6 @@ static int add_main(void *ctx, struct apk_database *db, struct apk_string_array
+ 
+ 	if (actx->virtpkg) {
+ 		apk_blob_t b = APK_BLOB_STR(actx->virtpkg);
+-		struct tm tm;
+-		time_t now;
+-		char ver[32];
+-
+ 		apk_blob_pull_dep(&b, db, &virtdep);
+ 		if (APK_BLOB_IS_NULL(b) || virtdep.conflict ||
+ 		    virtdep.result_mask != APK_DEPMASK_ANY ||
+@@ -104,24 +133,14 @@ static int add_main(void *ctx, struct apk_database *db, struct apk_string_array
+ 			apk_error("%s: bad package specifier");
+ 			return -1;
+ 		}
+-
+ 		if (virtdep.name->name[0] != '.' && non_repository_check(db))
+ 			return -1;
+ 
+-		now = apk_time();
+-		localtime_r(&now, &tm);
+-		strftime(ver, sizeof ver, "%Y%m%d.%H%M%S", &tm);
+-
+-		virtpkg = apk_pkg_new();
+-		if (virtpkg == NULL) {
++		virtpkg = create_virtual_package(db, virtdep.name);
++		if (!virtpkg) {
+ 			apk_error("Failed to allocate virtual meta package");
+ 			return -1;
+ 		}
+-		virtpkg->name = virtdep.name;
+-		apk_blob_checksum(APK_BLOB_STR(ver), apk_checksum_default(), &virtpkg->csum);
+-		virtpkg->version = apk_blob_atomize(APK_BLOB_STR(ver));
+-		virtpkg->description = strdup("virtual meta package");
+-		virtpkg->arch = apk_blob_atomize(APK_BLOB_STR("noarch"));
+ 
+ 		virtdep.result_mask = APK_VERSION_EQUAL;
+ 		virtdep.version = virtpkg->version;
+-- 
+2.22.0
+
diff --git a/system/coreutils/APKBUILD b/system/coreutils/APKBUILD
index e8819ca27..e5461c7d2 100644
--- a/system/coreutils/APKBUILD
+++ b/system/coreutils/APKBUILD
@@ -3,7 +3,7 @@
 # Maintainer: A. Wilcox <awilfox@adelielinux.org>
 pkgname=coreutils
 pkgver=8.31
-pkgrel=1
+pkgrel=3
 pkgdesc="Basic file, shell, and text manipulation utilities"
 url="https://www.gnu.org/software/coreutils/"
 arch="all"
@@ -30,17 +30,18 @@ build() {
 	LIBS="-lutmps -lskarnet" ./configure \
 		--build=$CBUILD \
 		--host=$CHOST \
-		--prefix=/usr \
+		--prefix=/ \
 		--sysconfdir=/etc \
 		--mandir=/usr/share/man \
 		--infodir=/usr/share/info \
+		--datarootdir=/usr/share \
+		--libexecdir=/usr/libexec \
 		--enable-nls \
 		--without-gmp \
-		--enable-no-install-program=hostname,su,kill,uptime \
+		--enable-no-install-program=groups,hostname,su,kill,uptime \
 		--enable-install-program=arch \
 		--with-packager="Adélie" \
-		--with-packager-bug-reports="https://bts.adelielinux.org/" \
-		--enable-single-binary=symlinks
+		--with-packager-bug-reports="https://bts.adelielinux.org/"
 
 	if [ ${CBUILD} != ${CHOST} ]; then
 		set -- man/*.x
@@ -56,24 +57,10 @@ check() {
 package() {
 	make DESTDIR="$pkgdir" install
 
-	rm -rf "$pkgdir"/usr/lib/charset.alias
-	rmdir -p "$pkgdir"/usr/lib 2>/dev/null || true
-
-	install -d "$pkgdir"/bin "$pkgdir"/usr/sbin
-	cd "$pkgdir"/usr/bin/
-
-	# We want to put these in /bin to match busybox (?)
-	local busybox_bin="base64 cat chgrp chmod chown cp date dd df echo
-		false ln ls mkdir mknod mktemp mv nice printenv pwd rm rmdir
-		sleep stat stty sync touch true uname"
-
-	for i in $busybox_bin; do
-		rm "$pkgdir"/usr/bin/$i
-		ln -s ../usr/bin/coreutils "$pkgdir"/bin/$i
-	done
-
-	rm "$pkgdir"/usr/bin/chroot
-	ln -s ../bin/coreutils "$pkgdir"/usr/sbin/chroot
+	# stdbuf(1) requires a /usr/libexec/ .so
+	# env(1) needs to be in /usr/bin/ for compatibility with the rest of the world
+	mkdir -p "$pkgdir"/usr/bin
+	mv "$pkgdir"/bin/stdbuf "$pkgdir"/bin/env "$pkgdir"/usr/bin/
 }
 
 sha512sums="ef8941dae845bbf5ae5838bc49e44554a766302930601aada6fa594e8088f0fbad74e481ee392ff89633e68b99e4da3f761fcb5d31ee3b233d540fe2a2d4e1af  coreutils-8.31.tar.xz
diff --git a/system/lddtree/APKBUILD b/system/lddtree/APKBUILD
index fc8fa2101..0780a4fd1 100644
--- a/system/lddtree/APKBUILD
+++ b/system/lddtree/APKBUILD
@@ -2,24 +2,17 @@
 # Maintainer: 
 pkgname=lddtree
 pkgver=1.26
-pkgrel=1
+pkgrel=2
 pkgdesc="List dynamic dependencies as a tree"
 url="https://github.com/ncopa/lddtree"
 arch="noarch"
 options="!check"
 license="GPL-2.0-only"
-depends="scanelf"
-depends_dev=""
-makedepends="$depends_dev"
+depends="scanelf cmd:which"
+makedepends=""
 replaces="pax-utils"
-install=""
 subpackages=""
-source="lddtree-$pkgver.tar.gz::https://github.com/ncopa/lddtree/archive/v$pkgver.tar.gz
-	"
-
-build() {
-	return 0
-}
+source="lddtree-$pkgver.tar.gz::https://github.com/ncopa/lddtree/archive/v$pkgver.tar.gz"
 
 package() {
 	cd "$builddir"
diff --git a/system/lvm2/APKBUILD b/system/lvm2/APKBUILD
index 8287d3813..f00157787 100644
--- a/system/lvm2/APKBUILD
+++ b/system/lvm2/APKBUILD
@@ -2,14 +2,14 @@
 # Maintainer: Dan Theisen <djt@hxx.in>
 pkgname=lvm2
 pkgver=2.03.05
-pkgrel=0
+pkgrel=1
 pkgdesc="Logical Volume Manager 2 utilities"
 url="https://sourceware.org/lvm2/"
 arch="all"
 options="!check"  # Test tries to use real /dev/mapper/control.
 license="GPL-2.0+ AND LGPL-2.1-only"
 # lvm2 will dlopen libs so we need to add explicit depend
-depends="lvm2-libs=$pkgver-r$pkgrel"
+depends="lvm2-libs=$pkgver-r$pkgrel util-linux"
 depends_dev="linux-headers"
 makedepends_build="coreutils libaio-dev"
 makedepends_host="$depends_dev util-linux-dev"
@@ -17,7 +17,6 @@ makedepends="$makedepends_build $makedepends_host"
 source="https://mirrors.kernel.org/sourceware/$pkgname/LVM2.$pkgver.tgz
 	fix-stdio-usage.patch
 	mallinfo.patch
-	library_dir-default-config.patch
 	mlockall-default-config.patch
 	lvm.initd
 	lvm.confd
@@ -32,6 +31,7 @@ subpackages="
 	device-mapper-libs:dm_libs
 	device-mapper-event-libs:dm_event_libs
 	$pkgname-libs
+	$pkgname-udev
 	"
 
 builddir="$srcdir/LVM2.$pkgver"
@@ -84,7 +84,7 @@ dm() {
 
 libs() {
 	pkgdesc="LVM2 shared libraries"
-	depends=
+	depends=""
 	mkdir -p "$subpkgdir"/lib
 	mv "$pkgdir"/lib/liblvm2*.so.* "$subpkgdir"/lib/
 	mv "$pkgdir"/lib/libdevmapper-event-lvm2*.so.* "$subpkgdir"/lib/
@@ -93,22 +93,31 @@ libs() {
 
 dm_libs() {
 	pkgdesc="Device-mapper shared library"
-	depends=
+	depends=""
 	mkdir -p "$subpkgdir"/lib
 	mv "$pkgdir"/lib/libdevmapper.so.* "$subpkgdir"/lib/
 }
 
 dm_event_libs() {
 	pkgdesc="Device-mapper event daemon shared library"
-	depends=
+	depends=""
 	mkdir -p "$subpkgdir"/lib
 	mv "$pkgdir"/lib/libdevmapper-event.so.* "$subpkgdir"/lib/
 }
 
+udev() {
+	pkgdesc="udev rules for LVM and device mapper"
+	install_if="$pkgname=$pkgver-r$pkgrel eudev"
+
+	make -C "$builddir"/udev
+	install -m644 -Dt "$subpkgdir"/lib/udev/rules.d/ \
+		"$builddir"/udev/*.rules
+}
+
+
 sha512sums="3b00f53771e99faa6459ae73353bff06ae37c64bd2659586ec25d0bb43bc3ff8ba5f713c68617fd7662a5f6cb65bca1ad0aea554819048d79c1cce20bf67c50a  LVM2.2.03.05.tgz
 6ea4efad03f8632f2883f33f9d9f8ca295f7d8d2aa1bfbfa7738e7d711727a511758848dde5776b222bd74e6fb60bed8b56a3cd2f74ca448b8d86f50470a42b9  fix-stdio-usage.patch
 9272ec8c5184ef5dc776ead8f74132e072b7563b5119a3a38b712f00d92a1e3878c9b3a54eb2b01dcba038110c686b39d4c17ecd0eb258537e9217d7ed03c408  mallinfo.patch
-33004594a5cce7af1e493a2a66ce8ad2f864dde3b2ec0960d0fda9df9b7bcf65d9455f9eccf7860f48726c48f14111b843b0a0c9bd395ef2952b41aaab8092b2  library_dir-default-config.patch
 d190c40a137b006d7b63298069c93ff08d2804b990e85d44739cd7c48beec9a569903b98f0d940895fc7365723ba886acd7ef0e08f1f65a1a391d1c448ce080e  mlockall-default-config.patch
 a853078660fd2fd943538924f56e81dc5793294e26b8f61d93e6188893f15f4a438d33792b341c1865d61e03f4a371b7c7ee0db5f4130ef7cb7aeaeb9290086a  lvm.initd
 07caf8fa942290f3c953cc2463aaf55bac01d0bcb9351daf3880fa4d0eefb67fe00761c46a7a4da91cd2f8e492a12fed35853a15dc939cd80d19d3303bc3951d  lvm.confd
diff --git a/system/lvm2/library_dir-default-config.patch b/system/lvm2/library_dir-default-config.patch
deleted file mode 100644
index 6e3b95832..000000000
--- a/system/lvm2/library_dir-default-config.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- ./conf/example.conf.in.orig
-+++ ./conf/example.conf.in
-@@ -694,6 +694,7 @@
- 	# Configuration option global/library_dir.
- 	# Search this directory first for shared libraries.
- 	# This configuration option does not have a default value defined.
-+	library_dir="/lib/device-mapper"
- 
- 	# Configuration option global/locking_library.
- 	# The external locking library to use for locking_type 2.
diff --git a/system/nss/APKBUILD b/system/nss/APKBUILD
index 2699bd658..9c41ced39 100644
--- a/system/nss/APKBUILD
+++ b/system/nss/APKBUILD
@@ -1,7 +1,7 @@
 # Contributor: Łukasz Jendrysik <scadu@yandex.com>
 # Maintainer: A. Wilcox <awilfox@adelielinux.org>
 pkgname=nss
-pkgver=3.44
+pkgver=3.44.1
 _ver=${pkgver//./_}
 pkgrel=0
 pkgdesc="Mozilla Network Security Services"
@@ -141,7 +141,7 @@ tools() {
 	mv "$pkgdir"/usr/bin "$subpkgdir"/usr/
 }
 
-sha512sums="c4d7343a66f91c5888a121e266d1f1471da798a21d608a29caf598a828725e4bf9ea7411a105b23335f20bd7c12788dad567922ceeaebeb0c98fbf9bbe4006f7  nss-3.44.tar.gz
+sha512sums="eb8777701a25b54377026633b6bf284e4c62308012058355f348a7c57525afe96db74a07de41ba01754e316a7dff06689de527359a5474ed7ab606779c4cf169  nss-3.44.1.tar.gz
 75dbd648a461940647ff373389cc73bc8ec609139cd46c91bcce866af02be6bcbb0524eb3dfb721fbd5b0bc68c20081ed6f7debf6b24317f2a7ba823e8d3c531  nss.pc.in
 0f2efa8563b11da68669d281b4459289a56f5a3a906eb60382126f3adcfe47420cdcedc6ab57727a3afeeffa2bbb4c750b43bef8b5f343a75c968411dfa30e09  nss-util.pc.in
 09c69d4cc39ec9deebc88696a80d0f15eb2d8c94d9daa234a2adfec941b63805eb4ce7f2e1943857b938bddcaee1beac246a0ec627b71563d9f846e6119a4a15  nss-softokn.pc.in
diff --git a/system/pcre/APKBUILD b/system/pcre/APKBUILD
index 0c0f36a10..96a6e6123 100644
--- a/system/pcre/APKBUILD
+++ b/system/pcre/APKBUILD
@@ -2,16 +2,18 @@
 # Maintainer: A. Wilcox <awilfox@adelielinux.org>
 pkgname=pcre
 pkgver=8.43
-pkgrel=0
+pkgrel=1
 pkgdesc="Perl-compatible regular expression library"
 url="http://pcre.sourceforge.net"
 arch="all"
 license="BSD-3-Clause"
-depends=
+depends=""
 makedepends=""
 subpackages="$pkgname-dev $pkgname-doc $pkgname-tools
 	libpcrecpp libpcre16 libpcre32"
-source="ftp://ftp.csx.cam.ac.uk/pub/software/programming/$pkgname/$pkgname-$pkgver.tar.bz2"
+source="ftp://ftp.csx.cam.ac.uk/pub/software/programming/$pkgname/$pkgname-$pkgver.tar.bz2
+	stack-frame-size-detection.patch
+	"
 
 # secfixes:
 #   8.40-r2:
@@ -74,4 +76,5 @@ tools() {
 	mv "$pkgdir"/usr/bin "$subpkgdir"/usr/
 }
 
-sha512sums="3b4ac2c7ccd77c9575d07a33c3456f40b50731029e62d01fb8f2f5871d7118e12bc9e6bc7a8079769c765e38da5ecf98c4b261b10ff0a2f14f0881b434f67af7  pcre-8.43.tar.bz2"
+sha512sums="3b4ac2c7ccd77c9575d07a33c3456f40b50731029e62d01fb8f2f5871d7118e12bc9e6bc7a8079769c765e38da5ecf98c4b261b10ff0a2f14f0881b434f67af7  pcre-8.43.tar.bz2
+a088304318f7a04f90263efbab20b423e67fb6e3d829e7bc080fd44c29e98bc29cab992b73ed1b992af89cdf4606667af20572558a3a96549b7bd9479d0e6d88  stack-frame-size-detection.patch"
diff --git a/system/pcre/stack-frame-size-detection.patch b/system/pcre/stack-frame-size-detection.patch
new file mode 100644
index 000000000..54179a7d6
--- /dev/null
+++ b/system/pcre/stack-frame-size-detection.patch
@@ -0,0 +1,15 @@
+--- pcre-8.43/pcre_exec.c.old	2018-02-20 15:21:37.000000000 +0000
++++ pcre-8.43/pcre_exec.c	2019-07-06 19:36:59.078411271 +0000
+@@ -509,6 +509,12 @@
+                  (e.g. stopped by repeated call or recursion limit)
+ */
+ 
++#ifdef __GNUC__
++static int
++match(REGISTER PCRE_PUCHAR eptr, REGISTER const pcre_uchar *ecode,
++  PCRE_PUCHAR mstart, int offset_top, match_data *md, eptrblock *eptrb,
++  unsigned int rdepth) __attribute__((noinline,noclone));
++#endif
+ static int
+ match(REGISTER PCRE_PUCHAR eptr, REGISTER const pcre_uchar *ecode,
+   PCRE_PUCHAR mstart, int offset_top, match_data *md, eptrblock *eptrb,
diff --git a/system/perl-cpanel-json-xs/APKBUILD b/system/perl-cpanel-json-xs/APKBUILD
index 08b33c3e9..ef5094438 100644
--- a/system/perl-cpanel-json-xs/APKBUILD
+++ b/system/perl-cpanel-json-xs/APKBUILD
@@ -3,7 +3,7 @@
 # Maintainer: Adélie Perl Team <adelie-perl@lists.adelielinux.org>
 pkgname=perl-cpanel-json-xs
 _pkgreal=Cpanel-JSON-XS
-pkgver=4.11
+pkgver=4.12
 pkgrel=0
 pkgdesc="cPanel's fork of JSON::XS, fast and correct serialising"
 url="https://metacpan.org/release/Cpanel-JSON-XS"
@@ -40,4 +40,4 @@ package() {
 	find "$pkgdir" \( -name perllocal.pod -o -name .packlist \) -delete
 }
 
-sha512sums="a14fe211b769184c28d946b9e88d9a380331d6a16c67a0f286fb4bf0f25e2a3b80f3df907bdf1a7eceaa8a34e69f13b3296cc135bc1ea2d2fcba6355dcf88579  Cpanel-JSON-XS-4.11.tar.gz"
+sha512sums="8545095726d833d7404e8fc2a6e71a4f4b8e6c2f5d7d9939758bb8eb1ffcf33f28867a8e70fb1df995ec6c14eccde53c5c85fb6d3da2929337b15905d4195c5b  Cpanel-JSON-XS-4.12.tar.gz"
diff --git a/system/perl-net-ssleay/APKBUILD b/system/perl-net-ssleay/APKBUILD
index ae01038ca..593eb4886 100644
--- a/system/perl-net-ssleay/APKBUILD
+++ b/system/perl-net-ssleay/APKBUILD
@@ -2,17 +2,17 @@
 # Maintainer: Adélie Perl Team <adelie-perl@lists.adelielinux.org>
 pkgname=perl-net-ssleay
 _realname=Net-SSLeay
-pkgver=1.85
+pkgver=1.88
 pkgrel=0
 pkgdesc="Perl extension for using OpenSSL"
 url="https://metacpan.org/release/Net-SSLeay"
 arch="all"
-license="GPL-2.0-only OR Artistic-1.0-Perl"
+license="Artistic-2.0"
 depends="perl"
 makedepends="perl-dev openssl-dev zlib-dev"
 checkdepends="perl-test-exception perl-test-warn perl-test-nowarnings"
 subpackages="$pkgname-doc"
-source="https://search.cpan.org/CPAN/authors/id/M/MI/MIKEM/Net-SSLeay-$pkgver.tar.gz"
+source="https://cpan.metacpan.org/authors/id/C/CH/CHRISN/Net-SSLeay-$pkgver.tar.gz"
 builddir="$srcdir/$_realname-$pkgver"
 
 build() {
@@ -35,4 +35,4 @@ package() {
 	find "$pkgdir" -name perllocal.pod -delete
 }
 
-sha512sums="74e0f2f56b707f1ff845c78c1fa7ce26a71b8f943bb99e994d4e065d1f42259fe4cd1a6a17d333459727534158f9541f116dbc8515122380807d9450b0faa26b  Net-SSLeay-1.85.tar.gz"
+sha512sums="37fc32ec003337f3dc18bf928139079a3127628c6fa0fccaed0c27b6bf3b216c2c5338ed1aaf9408b0add3be549df3218d3c5a6d6299793c1329d8a0813a1682  Net-SSLeay-1.88.tar.gz"
diff --git a/system/s6-linux-init/APKBUILD b/system/s6-linux-init/APKBUILD
index 70f8bbefa..aed46e575 100644
--- a/system/s6-linux-init/APKBUILD
+++ b/system/s6-linux-init/APKBUILD
@@ -1,7 +1,7 @@
 # Contributor: Laurent Bercot <ska-adelie@skarnet.org>
 # Maintainer: Laurent Bercot <ska-adelie@skarnet.org>
 pkgname=s6-linux-init
-pkgver=1.0.1.0
+pkgver=1.0.2.0
 pkgrel=0
 pkgdesc="A s6-based init system"
 url="https://skarnet.org/software/$pkgname/"
@@ -109,7 +109,7 @@ doc() {
         cp -a "$builddir/doc" "$subpkgdir/usr/share/doc/$pkgname"
 }
 
-sha512sums="0b40601b25f88464b5ff63b7eddf6ffa30eb868d2d9652f3d6a608b8f508e46712214d6e674f74136e57dd4504eb71ef585c725ba1a6566cfc0a025e70cfadc9  s6-linux-init-1.0.1.0.tar.gz
+sha512sums="1140434b07bf85956382a43bc8f58fa32cbefc43e40a48825b9e938d7950d988585e872667b79ba1bd44f0befb69202bcb7347c0e722ab5d20dc9304cd1be843  s6-linux-init-1.0.2.0.tar.gz
 756b0cbbe5dabb4631380c3c7ea199cc213224b2e36e50a2d012a61948170078b78bf49b85d886319fecf59843087f937d3d804723b2553ac9f94d088a2f0fd8  rc.init
 e73c3c32b118831074288d23fadace2158a2b15d5a13ffa73290b92a9e39c2a21c73d3b0eabea29bcbaa5f6381611fd8d0aaa6aa691ec7de91b8ef6ae404b6da  runlevel
 7bb050248a5c2ab6a56c50c35f87cde724f97ff9882f5e60b0f0f2f14bd93c1df7d99fedc3d81c8519cf1a1ed90e03f1cbb9bf891c7b3618aa9a5f5738d262f4  rc.shutdown
diff --git a/system/vim/APKBUILD b/system/vim/APKBUILD
index 4399681eb..aecdbcc4a 100644
--- a/system/vim/APKBUILD
+++ b/system/vim/APKBUILD
@@ -4,7 +4,7 @@
 # Contributor: Natanael Copa <ncopa@alpinelinux.org>
 # Maintainer: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com>
 pkgname=vim
-pkgver=8.1.1583
+pkgver=8.1.1635
 pkgrel=0
 pkgdesc="advanced text editor"
 url="https://www.vim.org"
@@ -81,6 +81,6 @@ vimdiff() {
 	mv "$pkgdir"/usr/bin/vimdiff "$subpkgdir"/usr/bin
 }
 
-sha512sums="ad66bfc031f61d652fe6700656416b3d5d708cc7407bc45c757ce89d1346ba5fc597a2623d7593b819626076f7a74179d768ac425fa5b145a5de0fb27a6474a1  vim-8.1.1583.tar.gz
+sha512sums="41b79ff52438ecbf56366696d3a12d34531a835b64d2ea809597797531950f2f8eb73d753375d23e1411631afaa3f9413fad8af7b0a1fed1532a1714ec1dbb4b  vim-8.1.1635.tar.gz
 12ee3f96c94d74215159fba379ed61907ec5982a9f1643575dcb7c3d5e30824665d683de95f97b5067718b3f2a1238fb7534a70803bc170614498ad026f352d8  vimrc
 16026a3ed3e080b3f8281948579ab678e9acd724ad594463279712fbf1024bcd923155a133bd08118848d2c6cdf11c69489d85b1c7438f60b4c279094714d181  no-default-mouse.patch"