23 files changed, 592 insertions, 110 deletions

diff --git a/system/fcron/APKBUILD b/system/fcron/APKBUILD
index 718ed33f8..79f12c416 100644
--- a/system/fcron/APKBUILD
+++ b/system/fcron/APKBUILD
@@ -2,7 +2,7 @@
 # Maintainer: A. Wilcox <awilfox@adelielinux.org>
 pkgname=fcron
 pkgver=3.2.1
-pkgrel=0
+pkgrel=1
 pkgdesc="periodical command scheduler for systems not always up"
 url="http://fcron.free.fr/"
 pkgusers="fcron"
@@ -48,4 +48,4 @@ package() {
 
 sha512sums="ddfd3e3a297b843c924aacccffaa5c1c6b300497f39daa1cdb90dc4cf4bc757042b0b2c1f055c119c8128c64d830ee0e8757091610432f5ffcacca25d369e5cd  fcron-3.2.1.src.tar.gz
 7516c9a51b1f6c29f1256c4697028b47f7883bf5fb08ccc585cf49e4edc7598a9730a225a03aaf3749698a94b9d01dda76cd3f352c0c868960fd09374df44199  systab.orig
-c5ea27dc7197c1a8d2e00372e3a6f38777c825c7913c320bc6fcc6d8d0e5cc7a11c7f5977d1ed1f05f4b7b55f2f8906fd960900107de6bec757b8b4045b1adaa  fcron.initd"
+8674743ca9080e3cc1e4ebc610dfe362f9d6bd5525447f1f1aa2066a6746d3323ce23ba1fae2e49b222ed0418f9492bbb3a3c73c8239631c5d6ead4b9259630f  fcron.initd"
diff --git a/system/fcron/fcron.initd b/system/fcron/fcron.initd
index ff0aba09c..8727468bf 100755
--- a/system/fcron/fcron.initd
+++ b/system/fcron/fcron.initd
@@ -1,15 +1,100 @@
 #!/sbin/openrc-run
-
-# Initscript by Diaz Devera Victor <vitronic2@gmail.com>
-# Copyright 2014 Alpine Linux
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-#name="advanced periodic command scheduler fcron"
-name="fcron"
-pidfile="/run/fcron"
-command=/usr/sbin/fcron
+FCRON_INSTANCE="${SVCNAME##*.}"
+FCRON_OPTS=${FCRON_OPTS:-""}
+
+if [ -n "${FCRON_INSTANCE}" ] && [ "${SVCNAME}" != "fcron" ]; then
+	FCRON_CONFIGFILE="/etc/fcron/fcron.${FCRON_INSTANCE}.conf"
+else
+	FCRON_CONFIGFILE="/etc/fcron/fcron.conf"
+fi
+
+getconfig() {
+	local key="$1"
+	local value_default="$2"
+	local value=
+
+	if service_started; then
+		value="$(service_get_value "${key}")"
+	fi
+
+	if [ -z "${value}" ] && [ -r "${FCRON_CONFIGFILE}" ]; then
+		value="$(sed -n -e 's:^'"${key}"'[ \t]*=[ \t]*::p' "${FCRON_CONFIGFILE}")"
+	fi
+
+	if [ -z "${value}" ]; then
+		# Value not explicitly set in the configfile or configfile does not exist
+		# or is not readable
+		echo "${value_default}"
+	else
+		echo "${value}"
+	fi
+
+	return 0
+}
 
 depend() {
-	need localmount
-	need logger
+	config "${FCRON_CONFIGFILE}"
+
+	use clock logger
+	need hostname
+
+	# provide the cron service if we are the main instance
+	[ "${SVCNAME}" = "fcron" ] && provide cron
+}
+
+
+command="/usr/sbin/fcron"
+command_args="${FCRON_OPTS} -c \"${FCRON_CONFIGFILE}\""
+start_stop_daemon_args=${FCRON_SSDARGS:-"--wait 1000"}
+pidfile="$(getconfig pidfile /run/fcron.pid)"
+fcrontabs="$(getconfig fcrontabs /var/spool/fcron)"
+fifofile="$(getconfig fifofile /run/fcron.fifo)"
+required_files="${FCRON_CONFIGFILE}"
+
+extra_started_commands="reload"
+
+reload() {
+	 start-stop-daemon --signal HUP --pidfile "${pidfile}"
+}
+
+start_pre() {
+	if [ "${SVCNAME}" != "fcron" ]; then
+		local _has_invalid_instance_cfg=0
+
+		if [ "${pidfile}" = "/run/fcron.pid" ]; then
+			eerror "You cannot use the same pidfile like the default instance!"
+			eerror "Please adjust your 'pidfile' setting in '${FCRON_CONFIGFILE}'."
+			_has_invalid_instance_cfg=1
+		fi
+
+		if [ "${fcrontabs}" = "/var/spool/fcron" ]; then
+			eerror "You cannot use the same fcrontabs location like the default instance!"
+			eerror "Please adjust your 'fcrontabs' setting in '${FCRON_CONFIGFILE}'."
+			_has_invalid_instance_cfg=1
+		fi
+
+		if [ "${fifofile}" = "/run/fcron.fifo" ]; then
+			eerror "You cannot use the same fifo file like the default instance!"
+			eerror "Please adjust your 'fifofile' setting in '${FCRON_CONFIGFILE}'."
+			_has_invalid_instance_cfg=1
+		fi
+
+		[ ${_has_invalid_instance_cfg} -ne 0 ] && return 1
+	fi
+
+	checkpath --file "${FCRON_CONFIGFILE}" --owner root:fcron --mode 0640
+
+	if [ ! -d "${fcrontabs}" ]; then
+		ebegin "Creating missing spooldir '${fcrontabs}'"
+		${command} --newspooldir "${fcrontabs}"
+		eend $?
+	fi
+}
+
+start_post() {
+	service_set_value fcrontabs "${fcrontabs}"
+	service_set_value fifofile "${fifofile}"
 }
diff --git a/system/musl/APKBUILD b/system/musl/APKBUILD
index 08f4342dd..dbbfe640c 100644
--- a/system/musl/APKBUILD
+++ b/system/musl/APKBUILD
@@ -2,7 +2,7 @@
 # Maintainer: A. Wilcox <awilfox@adelielinux.org>
 pkgname=musl
 pkgver=1.1.20
-pkgrel=4
+pkgrel=5
 pkgdesc="System library (libc) implementation"
 url="http://www.musl-libc.org/"
 arch="all"
@@ -11,7 +11,7 @@ license="MIT"
 depends=""
 depends_dev="!uclibc-dev"
 makedepends="$depends_dev"
-subpackages="$pkgname-dev $pkgname-dbg"
+subpackages="$pkgname-dev"
 case "$BOOTSTRAP" in
 nocc)	pkgname="musl-dev"
 	subpackages=""
@@ -32,6 +32,7 @@ source="http://www.musl-libc.org/releases/musl-$pkgver.tar.gz
 	dcngettext-null-deref.patch
 	getaddrinfo-regression.patch
 	ppc64-atomic.patch
+	dynamic-binary-stack-size.patch
 
 	ldconfig
 	getent.c
@@ -127,6 +128,7 @@ b967339d9048161583523e847be91779adb0e16cc225d6ff85ef51748269b2dab08a0b8e558ad014
 a08d1b170356beea333ace1da12f8a8399ca80c5d9c32ff2fcd8562537a670214f566e4b1219a11b32129078e22fbf7009bb277b7de8550a89352a64b3b5090d  dcngettext-null-deref.patch
 e3953a3a73ef11696dd3eb216e18b152ae35198d8bff686d157e27bc90fb558f9a0be518025a90534e9afd6ea1bf731ffdb6fcb202bb9368f2c8eec7ca886141  getaddrinfo-regression.patch
 aae9110eccb8cd7dcd3c957fcb01ed524598f79f7fa1a16b9993af40793545d1ec211e7e6aeabe7af7715d94cc26a473ea0acf6d6e66019bf65f03d4b8e24a4b  ppc64-atomic.patch
+654f76c96ed0e69e19b1a20569e83751bb207a8c181b26742f505638095dde3f4dd3f785deb92c49a603bd15cd8d4932129f567de8cd2edffdd8551c4dfd6976  dynamic-binary-stack-size.patch
 cce2f1eeb61e55674469c26871a573cce61d739c3defe9c8f56f2b774f6ba5435849ad542a6714120efddc98c297098e9c98a1a424ac593df2243d4aa479f9a9  ldconfig
 378d70e65bcc65bb4e1415354cecfa54b0c1146dfb24474b69e418cdbf7ad730472cd09f6f103e1c99ba6c324c9560bccdf287f5889bbc3ef0bdf0e08da47413  getent.c
 9d42d66fb1facce2b85dad919be5be819ee290bd26ca2db00982b2f8e055a0196290a008711cbe2b18ec9eee8d2270e3b3a4692c5a1b807013baa5c2b70a2bbf  iconv.c"
diff --git a/system/musl/dynamic-binary-stack-size.patch b/system/musl/dynamic-binary-stack-size.patch
new file mode 100644
index 000000000..e2e3f12d3
--- /dev/null
+++ b/system/musl/dynamic-binary-stack-size.patch
@@ -0,0 +1,97 @@
+From 7b3348a98c139b4b4238384e52d4b0eb237e4833 Mon Sep 17 00:00:00 2001
+From: Rich Felker <dalias@aerifal.cx>
+Date: Tue, 18 Sep 2018 23:54:18 -0400
+Subject: support setting of default thread stack size via PT_GNU_STACK header
+
+this facilitates building software that assumes a large default stack
+size without any patching to call pthread_setattr_default_np or
+pthread_attr_setstacksize at each thread creation site, using just
+LDFLAGS.
+
+normally the PT_GNU_STACK header is used only to reflect whether
+executable stack is desired, but with GNU ld at least, passing
+-Wl,-z,stack-size=N will set a size on the program header. with this
+patch, that size will be incorporated into the default stack size
+(subject to increase-only rule and DEFAULT_STACK_MAX limit).
+
+both static and dynamic linking honor the program header. for dynamic
+linking, all libraries loaded at program start, including preloaded
+ones, are considered. dlopened libraries are not considered, for
+several reasons. extra logic would be needed to defer processing until
+the load of the new library is commited, synchronization woud be
+needed since other threads may be running concurrently, and the
+effectiveness woud be limited since the larger size would not apply to
+threads that already existed at the time of dlopen. programs that will
+dlopen code expecting a large stack need to declare the requirement
+themselves, or pthread_setattr_default_np can be used.
+---
+ ldso/dynlink.c       | 12 ++++++++++++
+ src/env/__init_tls.c |  5 +++++
+ 2 files changed, 17 insertions(+)
+
+diff --git a/ldso/dynlink.c b/ldso/dynlink.c
+index e4829c3a..3ecbddfa 100644
+--- a/ldso/dynlink.c
++++ b/ldso/dynlink.c
+@@ -22,6 +22,7 @@
+ #include "dynlink.h"
+ 
+ static void error(const char *, ...);
++extern size_t __default_stacksize;
+ 
+ #define MAXP2(a,b) (-(-(a)&-(b)))
+ #define ALIGN(x,y) ((x)+(y)-1 & -(y))
+@@ -609,6 +610,12 @@ static void *map_library(int fd, struct dso *dso)
+ 		} else if (ph->p_type == PT_GNU_RELRO) {
+ 			dso->relro_start = ph->p_vaddr & -PAGE_SIZE;
+ 			dso->relro_end = (ph->p_vaddr + ph->p_memsz) & -PAGE_SIZE;
++		} else if (ph->p_type == PT_GNU_STACK) {
++			if (!runtime && ph->p_memsz > __default_stacksize) {
++				__default_stacksize =
++					ph->p_memsz < (8<<20) ?
++					ph->p_memsz : (8<<20);
++			}
+ 		}
+ 		if (ph->p_type != PT_LOAD) continue;
+ 		nsegs++;
+@@ -1238,6 +1245,12 @@ static void kernel_mapped_dso(struct dso *p)
+ 		} else if (ph->p_type == PT_GNU_RELRO) {
+ 			p->relro_start = ph->p_vaddr & -PAGE_SIZE;
+ 			p->relro_end = (ph->p_vaddr + ph->p_memsz) & -PAGE_SIZE;
++		} else if (ph->p_type == PT_GNU_STACK) {
++			if (!runtime && ph->p_memsz > __default_stacksize) {
++				__default_stacksize =
++					ph->p_memsz < (8<<20) ?
++					ph->p_memsz : (8<<20);
++			}
+ 		}
+ 		if (ph->p_type != PT_LOAD) continue;
+ 		if (ph->p_vaddr < min_addr)
+diff --git a/src/env/__init_tls.c b/src/env/__init_tls.c
+index e0224243..96d0e284 100644
+--- a/src/env/__init_tls.c
++++ b/src/env/__init_tls.c
+@@ -8,6 +8,8 @@
+ #include "atomic.h"
+ #include "syscall.h"
+ 
++extern size_t __default_stacksize;
++
+ int __init_tp(void *p)
+ {
+ 	pthread_t td = p;
+@@ -90,6 +91,11 @@ static void static_init_tls(size_t *aux)
+ 			base = (size_t)_DYNAMIC - phdr->p_vaddr;
+ 		if (phdr->p_type == PT_TLS)
+ 			tls_phdr = phdr;
++		if (phdr->p_type == PT_GNU_STACK &&
++		    phdr->p_memsz > __default_stacksize)
++			__default_stacksize =
++				phdr->p_memsz < (8<<20) ?
++				phdr->p_memsz : (8<<20);
+ 	}
+ 
+ 	if (tls_phdr) {
+-- 
+cgit v1.2.1
+
diff --git a/system/yaml/APKBUILD b/system/yaml/APKBUILD
index 323ac3b40..4dfac01b3 100644
--- a/system/yaml/APKBUILD
+++ b/system/yaml/APKBUILD
@@ -2,7 +2,7 @@
 # Maintainer: A. Wilcox <awilfox@adelielinux.org>
 pkgname=yaml
 pkgver=0.2.1
-pkgrel=0
+pkgrel=1
 pkgdesc="YAML 1.1 parser and emitter written in C"
 url="https://pyyaml.org/wiki/LibYAML"
 arch="all"
@@ -10,7 +10,9 @@ license="MIT"
 depends=""
 makedepends=""
 subpackages="$pkgname-dev"
-source="http://pyyaml.org/download/libyaml/yaml-$pkgver.tar.gz"
+source="http://pyyaml.org/download/libyaml/yaml-$pkgver.tar.gz
+	fix-emitter-$pkgver.patch
+	skip-trailing-doc-term-$pkgver.patch"
 
 build() {
 	cd "$builddir"
@@ -35,4 +37,6 @@ package() {
 	make DESTDIR="$pkgdir" install
 }
 
-sha512sums="97ebeea2a2c877b24de2e1ffbf175d07d97d5c8b90e06d21fd057e1114d10b96c04fd92c2ed4e956db751b7ac1686b3fd5778927912ca5bb0d096908a1351235  yaml-0.2.1.tar.gz"
+sha512sums="97ebeea2a2c877b24de2e1ffbf175d07d97d5c8b90e06d21fd057e1114d10b96c04fd92c2ed4e956db751b7ac1686b3fd5778927912ca5bb0d096908a1351235  yaml-0.2.1.tar.gz
+ad35c3b893cfeb33fab748b39b06ad0c54215941f68d0df591b8e4e4edc3b67f27ea3206321b7621c0e9e6faf749255fd80209da017c77a91d8de68eec54fd2b  fix-emitter-0.2.1.patch
+715ad72a4a74b19fdf03b8be96b9e5c3801bab5475eeee4c98b109eabcf86e193d5884ad6466b6765ccc2174ebaedade25e43fff711d9522fb8f370bcea5eef4  skip-trailing-doc-term-0.2.1.patch"
diff --git a/system/yaml/fix-emitter-0.2.1.patch b/system/yaml/fix-emitter-0.2.1.patch
new file mode 100644
index 000000000..f3614e349
--- /dev/null
+++ b/system/yaml/fix-emitter-0.2.1.patch
@@ -0,0 +1,35 @@
+Contributor Note: This patch will be part of v0.2.2 which hasn't been
+formally released as of 2018-11-20. It should be removed once this
+package is version bumped.
+
+From e5ebb70a01cc0fbd9e519050d51d704f58c2a33d Mon Sep 17 00:00:00 2001
+From: James Clarke <jrtc27@jrtc27.com>
+Date: Thu, 29 Jun 2017 02:26:09 +0100
+Subject: [PATCH 2/2] Skip trailing document terminator at the end of the
+ stream
+
+---
+ src/emitter.c | 8 --------
+ 1 file changed, 8 deletions(-)
+
+diff --git a/src/emitter.c b/src/emitter.c
+index c593a7d..1502590 100644
+--- a/src/emitter.c
++++ b/src/emitter.c
+@@ -649,14 +649,6 @@ yaml_emitter_emit_document_start(yaml_emitter_t *emitter,
+ 
+     else if (event->type == YAML_STREAM_END_EVENT)
+     {
+-        if (emitter->open_ended)
+-        {
+-            if (!yaml_emitter_write_indicator(emitter, "...", 1, 0, 0))
+-                return 0;
+-            if (!yaml_emitter_write_indent(emitter))
+-                return 0;
+-        }
+-
+         if (!yaml_emitter_flush(emitter))
+             return 0;
+ 
+-- 
+2.13.2
diff --git a/system/yaml/skip-trailing-doc-term-0.2.1.patch b/system/yaml/skip-trailing-doc-term-0.2.1.patch
new file mode 100644
index 000000000..7e10cd9ea
--- /dev/null
+++ b/system/yaml/skip-trailing-doc-term-0.2.1.patch
@@ -0,0 +1,30 @@
+Contributor Note: As with fix-emitter-0.2.1.patch, this patch should
+not be necessary when v0.2.2 is released.
+
+From 7c2e6f47e1b12ca3dfa9ea2f6c65e9bd8a02e8c8 Mon Sep 17 00:00:00 2001
+From: James Clarke <jrtc27@jrtc27.com>
+Date: Thu, 29 Jun 2017 02:24:53 +0100
+Subject: [PATCH 1/2] Revert "This code is not needed and breaks tests"
+
+This reverts commit 56400d976a1999156b1abfd674c3122843980260.
+---
+ src/emitter.c | 4 ++++
+ 1 file changed, 4 insertions(+)
+
+diff --git a/src/emitter.c b/src/emitter.c
+index a5b7ff8..c593a7d 100644
+--- a/src/emitter.c
++++ b/src/emitter.c
+@@ -1946,6 +1946,10 @@ yaml_emitter_write_plain_scalar(yaml_emitter_t *emitter,
+ 
+     emitter->whitespace = 0;
+     emitter->indention = 0;
++    if (emitter->root_context)
++    {
++        emitter->open_ended = 1;
++    }
+ 
+     return 1;
+ }
+-- 
+2.13.2
diff --git a/user/kcachegrind/APKBUILD b/user/kcachegrind/APKBUILD
new file mode 100644
index 000000000..68dc6519c
--- /dev/null
+++ b/user/kcachegrind/APKBUILD
@@ -0,0 +1,43 @@
+# Contributor: A. Wilcox <awilfox@adelielinux.org>
+# Maintainer: A. Wilcox <awilfox@adelielinux.org>
+pkgname=kcachegrind
+pkgver=18.08.3
+pkgrel=0
+pkgdesc="Profile data visualisation tool and call graph viewer"
+url="https://kcachegrind.github.io/html/Home.html"
+arch="all"
+license="GPL-2.0-only"
+depends="binutils graphviz"
+makedepends="cmake extra-cmake-modules qt5-qtbase-dev qt5-qttools-dev
+	karchive-dev kconfig-dev kcoreaddons-dev kdoctools-dev ki18n-dev kio-dev
+	kwidgetsaddons-dev kxmlgui-dev"
+subpackages="$pkgname-doc $pkgname-lang"
+source="https://download.kde.org/stable/applications/$pkgver/src/kcachegrind-$pkgver.tar.xz"
+
+build() {
+	cd "$builddir"
+	if [ "$CBUILD" != "$CHOST" ]; then
+		CMAKE_CROSSOPTS="-DCMAKE_SYSTEM_NAME=Linux -DCMAKE_HOST_SYSTEM_NAME=Linux"
+	fi
+	cmake \
+		-DCMAKE_INSTALL_PREFIX=/usr \
+		-DCMAKE_INSTALL_LIBDIR=lib \
+		-DBUILD_SHARED_LIBS=True \
+		-DCMAKE_BUILD_TYPE=RelWithDebugInfo \
+		-DCMAKE_CXX_FLAGS="$CXXFLAGS" \
+		-DCMAKE_C_FLAGS="$CFLAGS" \
+		${CMAKE_CROSSOPTS}
+	make
+}
+
+check() {
+	cd "$builddir"
+	CTEST_OUTPUT_ON_FAILURE=TRUE ctest
+}
+
+package() {
+	cd "$builddir"
+	make DESTDIR="$pkgdir" install
+}
+
+sha512sums="abbbf7ba539da1fa71d31e4603d1b8a76178a48bf503c735ebce9bbc9887e9ec64b2338ce77de2f38114faa27dee51e19af61cf4d3e9fbbe942a417edf2558c1  kcachegrind-18.08.3.tar.xz"
diff --git a/user/keychain/APKBUILD b/user/keychain/APKBUILD
new file mode 100644
index 000000000..10c0ab99d
--- /dev/null
+++ b/user/keychain/APKBUILD
@@ -0,0 +1,29 @@
+# Contributor: zlg <zlg+adelie@zlg.space>
+# Maintainer: zlg <zlg+adelie@zlg.space>
+pkgname=keychain
+pkgver=2.8.5
+pkgrel=0
+pkgdesc="Agent manager for OpenSSH and GnuPG"
+url="https://funtoo.org/Keychain"
+arch="noarch"
+options="!check" # no tests
+license="GPL-2.0-only"
+depends=""
+makedepends="perl"
+install=""
+subpackages="$pkgname-doc"
+source="$pkgname-$pkgver.tar.gz::https://github.com/funtoo/$pkgname/archive/$pkgver.tar.gz"
+builddir="$srcdir/$pkgname-$pkgver"
+
+build() {
+	cd "$builddir"
+	make
+}
+
+package() {
+	cd "$builddir"
+	install -Dm755 "./${pkgname}" "${pkgdir}/usr/bin/${pkgname}"
+	install -Dm644 "./${pkgname}.1" "${pkgdir}/usr/share/man/man1/${pkgname}.1"
+}
+
+sha512sums="2b98a9937b058267150d62d4f95653c4bbab6117a0774ac266abf95020c41905412b1522a82abf71722f25f6af31ba3498f6d54622009498c845802bf2df6024  keychain-2.8.5.tar.gz"
diff --git a/user/lxqt-desktop/APKBUILD b/user/lxqt-desktop/APKBUILD
index 7b21a9c87..177ab98e3 100644
--- a/user/lxqt-desktop/APKBUILD
+++ b/user/lxqt-desktop/APKBUILD
@@ -2,7 +2,7 @@
 # Maintainer: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com>
 pkgname=lxqt-desktop
 pkgver=0.13.0
-pkgrel=0
+pkgrel=1
 arch="noarch"
 pkgdesc="Complete LXQt desktop"
 url="https://lxqt.org"
diff --git a/user/lxqt-desktop/startlxqt b/user/lxqt-desktop/startlxqt
index 09b73f337..a11a37ae9 100755
--- a/user/lxqt-desktop/startlxqt
+++ b/user/lxqt-desktop/startlxqt
@@ -24,7 +24,7 @@ fi
 export XDG_DATA_DIRS
 
 if [ -z "$XDG_CONFIG_DIRS" ]; then
-    export XDG_CONFIG_DIRS="/etc/xdg"
+    export XDG_CONFIG_DIRS="/etc/xdg:/usr/share"
 else
     if ! contains "$XDG_CONFIG_DIRS" '/etc/xdg'; then
         XDG_CONFIG_DIRS="$XDG_CONFIG_DIRS:/etc/xdg"
diff --git a/user/perl-file-slurp/APKBUILD b/user/perl-file-slurp/APKBUILD
index 803f37b85..b4a84c3ee 100644
--- a/user/perl-file-slurp/APKBUILD
+++ b/user/perl-file-slurp/APKBUILD
@@ -1,7 +1,7 @@
 # Contributor: A. Wilcox <awilfox@adelielinux.org>
 # Maintainer: Adélie Perl Team <adelie-perl@lists.adelielinux.org>
 pkgname=perl-file-slurp
-pkgver=9999.24
+pkgver=9999.25
 pkgrel=0
 pkgdesc="Simple and efficient file manipulation in Perl"
 url="https://metacpan.org/release/File-Slurp"
@@ -31,4 +31,4 @@ package() {
 	find "$pkgdir" \( -name perllocal.pod -o -name .packlist \) -delete
 }
 
-sha512sums="b866b96384e07e735b8e52391a6a003be39fdf416855064c28e94d5fc28ccb90dc18dfb8db4bfe13e403f92544fb05a6a1feaa6f7bc5ca774d5074c23a64074c  File-Slurp-9999.24.tar.gz"
+sha512sums="cea59f2aecfe314540c1022c44ce85d5d53a3c69273b71a727acbfacbd09a9e45ef435c61b28d8d883a758e29c296ca98167dceed74bbf3a278fe5fa7019ce8a  File-Slurp-9999.25.tar.gz"
diff --git a/user/perl-pegex/APKBUILD b/user/perl-pegex/APKBUILD
index 468e3d7a4..e7bc13966 100644
--- a/user/perl-pegex/APKBUILD
+++ b/user/perl-pegex/APKBUILD
@@ -1,7 +1,7 @@
 # Contributor: Dan Theisen <djt@hxx.in>
 # Maintainer: Adélie Perl Team <adelie-perl@lists.adelielinux.org>
 pkgname=perl-pegex
-pkgver=0.67
+pkgver=0.70
 pkgrel=0
 pkgdesc="Acmeist PEG Parser Framework"
 url="https://metacpan.org/pod/Pegex"
@@ -32,4 +32,4 @@ package() {
 	find "$pkgdir" \( -name perllocal.pod -o -name .packlist \) -delete
 }
 
-sha512sums="905e22e54bdf8050bc470a2184d8b2444f583cae82b450f2e94e00ff78441687636927bf814a8f1a1e35a4b6126a6b7270d43b3dd55d68718a8c709176412274  Pegex-0.67.tar.gz"
+sha512sums="9a24c27fbbb36f83b2437cb17321e58167b3d5c857383ef0422557c0d4a956b90c24f11048843d29622670ea731ca589dd09f0fd68b48d89b3c885d1c86b5f6e  Pegex-0.70.tar.gz"
diff --git a/user/py3-pygobject/APKBUILD b/user/py3-pygobject/APKBUILD
index 62c3717b7..2859cdb51 100644
--- a/user/py3-pygobject/APKBUILD
+++ b/user/py3-pygobject/APKBUILD
@@ -1,7 +1,7 @@
 # Contributor: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com>
 # Maintainer: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com>
 pkgname=py3-pygobject
-pkgver=3.30.1
+pkgver=3.30.2
 pkgrel=0
 pkgdesc="Python bindings for GObject libraries"
 url="https://pygobject.readthedocs.io/"
@@ -28,4 +28,4 @@ package() {
 	python3 setup.py install --prefix=/usr --root="$pkgdir"
 }
 
-sha512sums="99f25e19d36b9700670f1e6c6d279104ec449f958001e1c0dc7225169aeaccf882420badac419a2cb4ef8c39f847102d2d62435e95e1a334c440ee5de03b3f7f  pygobject-3.30.1.tar.bz2"
+sha512sums="a643b800fbaf659957879ca8b4fa4cc3556a8e6bb4d061ffe205204d7ea197baf77d8836a733562552fa9ee56c7831359313c2403062cc46b5d72d5d7fd3030e  pygobject-3.30.2.tar.bz2"
diff --git a/user/rust/APKBUILD b/user/rust/APKBUILD
index f8a51a87f..aa155ac3b 100644
--- a/user/rust/APKBUILD
+++ b/user/rust/APKBUILD
@@ -306,30 +306,30 @@ sha512sums="e466db81b9a82239670c48b876dc7390fcdda28c6390308691ddf2e0c12a39b57bd5
 0f7c92e69f15cb014a1a6c263df2d0675842db9a3789467aa0d8811130adb1ffb3e0a344cfb59c069f5aa0f99b1f2422536ec96064b71374a3077b3a2a02d0fa  cargo-0.30.0-powerpc64-foxkit-linux-musl.tar.xz
 95f447bd698177732f4105ddcf4e60d5695a4345f6eb49d5d49ff2402de6d28199ca1aba1a630088beee40b8063477bed4dd47532c53cbb72de3ee5687a9c689  rust-std-1.29.2-powerpc64-foxkit-linux-musl.tar.xz
 a140b9f524205a756192fed740492bbc01205ce77196dd44244752a99d8e6ede03cb9b8ef0d986e23ea882ebf24e773d6e426054c5840989379d81427ad37f07  rustc-1.29.2-powerpc64-foxkit-linux-musl.tar.xz
-4ffea7a1e90eed9a69630ea2724450ffc5012593050c0109fff45dc70aec6d5b215f52777d4ecb72a6a78e2ba7ac0bea9117b68adc0e729ae482749462f0a83a  0001-Don-t-pass-CFLAGS-to-the-C-compiler.patch
-e87a7ac69a007cc21cbdd6a8ec36003989803be55f1f96a5866ff07b113286ecc6fb9cec6614b1b5e63ca07b84d6c167b1e3d2bd1e104dab02d24597a176b31d  0002-Fix-LLVM-build.patch
-03c3edd924a8751407c41a9ab67b5d2848e56c5b3da3556d1f83b72d33e982c97dabbec36a8ab4f8ec22143efeb2c77fabc922c9b0f11fee02c6f04868d2d90b  0003-Allow-rustdoc-to-work-when-cross-compiling-on-musl.patch
-2a8b1f4d5f3ff49d74b2308cf8e4e6e04d0af0f9a7d29b3ae25c94c24ded7ce59f16b5277ec946f1a5fa61dcac857a897b63883d8f5ed753ba36f109498aee80  0004-Require-static-native-libraries-when-linking-static-.patch
-1c41ff8163119c49116a7c6a1e4934fcfac36ad6240672ebded65e04dd478d86cb2627f47ae0b7871435bf8b30844fa10caaec03d2d3d27313b777b7be22bc4e  0005-Remove-nostdlib-and-musl_root-from-musl-targets.patch
-58c14405cd27d3f825689d8df06f04cebf8b149132ede3317915059dbca2eb9599eb224105f4120a75df52bdc0e77a6412bf3a34f803752787c7bd3a25622046  0006-Prefer-libgcc_eh-over-libunwind-for-musl.patch
-8cfb9ce9bdbf5ff75e85780af202caa431408d362a8e1f3119975275e00dfa8dc5724146625dc04ad9c31bb061d141857f693e4fb7611330e42277faa9a0f83e  0007-Add-powerpc-unknown-linux-musl-target.patch
-b9f9cb032805614c7d30d426a8e1ce0d83658175bc1d173946673b614a3577abf89ae029a91ec8d55e77114fc45a48db4f750fd95294259f19ef1e60431ad8d7  0008-Fix-powerpc64-ELFv2-big-endian-struct-passing-ABI.patch
-c5b1315ac9c622d32e9721cb807971fada8187a097be9923f09556da4828aa780b51509a7d95b3f2debd91a1a4ea1ecd40c641f23b426a2586a2a48a78671280  0009-Use-the-ELFv2-ABI-on-powerpc64-musl.patch
-ed231ff4bfa3e4fd7dfb185f0af347ef6fe40d4c788ee38f064a8b6ebcb0767565a94cd4759664864b5c70508bd5e60008dde94b35d67a800baae118a351419c  0010-Add-powerpc64-unknown-linux-musl-target.patch
-5a32ed9c224765a44635ff88f9d1d071868b27417d1a60c1f9db40d1557d8152f8858c760cda638952aa2c13ffd412aac516833460975339de5d0b79345a4d2c  0011-Add-missing-OpenSSL-configurations-for-musl-targets.patch
-27f71d6849abb00a788326e28b01f92e238101b2cb9270275b6bd6042c38138fc92faf2ed9df1e3658ebb74686058ef748fdf9c6f211f38fa786355830552dba  0012-rustc_data_structures-use-libc-types-constants-in-fl.patch
-d3b595f6d4561594efa170ce737f9b330d540a617272baaf8f7a22494fc15bfbdb3b0bfc381a50995ac79d99fbf11a7f786ffa71f8d88701ba1b247a2bb5fd3a  0013-runtest-Fix-proc-macro-tests-on-musl-hosts.patch
-b8d62857b0260fe2566757686c9346245df2977aa8b09713e66f3d6626a5493fa23cbb80576627d4ce3b164ec6aabd2a3281c109a68bd5494a42a0fc1e786fe8  0014-Fix-double_check-tests-on-big-endian-targets.patch
-cd9c0ab80c111b7a30d1d7887e746ff095083a31570723bd316e1f2772303484cf18f418368205585d86e6f142b2e102d34131990fcc5af0010e2b10237911ad  0015-test-invalid_const_promotion-Accept-SIGTRAP-as-a-val.patch
-cd7894b166d230713e2bd55ffa8edcc91626170439e956ce87e0fead4ae80fcf20770a611f6ac0b0b5f12008f8d3d31bb36d708d7b970fb800d39b9056cd0f65  0016-test-linkage-visibility-Ensure-symbols-are-visible-t.patch
-fbed66fd91f86ab24315170003bdb15d083de41b284fc20ada5d26c71a11b60ee9d2040b1ce5688801d02a2c4f0b183bd02444f7f7265ed0070ac083e293b7b4  0017-x.py-Use-python3-instead-of-python.patch
-9a466ada691a3b05801bdfd6af3416817cc9bb9cc3018ec5bda47f7cbe2475f13b1928be5a34f919d34a1e304595c06a98ca337d259c17a2813a01ca38264734  0018-test-target-feature-gate-Only-run-on-relevant-target.patch
-841c6f67f01a3e0714ae46b3ab14de6bb072bf9fbdc10e9b58eb0b0102786cad5667356fafa51e03eadcf12c0f5efe85106ef1b325906a3a4cb6a009cacc6f34  0019-test-use-extern-for-plugins-Don-t-assume-multilib.patch
-e3f7b9d7b605156d14afc7e6012f0b19053eb4cf23d2f708860fb5de7390bb245910a03d844ba0dce933dddff8bac015361435cdfb8ce695687994344a2542c2  0020-test-sysroot-crates-are-unstable-Fix-test-when-rpath.patch
-34ba04178ddd3f8d632ff45a274b4a4352fdc867829aee9635bd26224c49728e7c46e683f814fce09b11d6e30e3739bc7098cb4bb48fa97785570cf19c763dd2  0021-Ignore-broken-and-non-applicable-tests.patch
-3e298b3040e5a5ae2ac794d375302d7277d59758101831ca3646c40f3eea42454a3a8793a2a41879dfdf623f63603815b0923209b0068170d63c9d28580c1228  0022-Link-stage-2-tools-dynamically-to-libstd.patch
-86be931b629a5212be2821c918d95753686afa5ac9923f234186bd460545d094c38d63c680aa32dd1f90ae2a477f06bbe4343fbfa6a3d02ad43e6bdd3d3f4f9f  0023-Move-debugger-scripts-to-usr-share-rust.patch
-5ce1947cdd51d5221c03fefe1d2bef8700b560a889e09ec7a3e7d906146111049864c9ed5688005e215a18f1102a01f3987db606d4a9a05ec83f1619d1d901e9  0024-Add-foxkit-target-specs.patch
+efab6cffae2569ea022f099a461629bdfc01604772baf0fc56a03b63954c0540f1f2039b364ed06bfac4e6a3a3e86e5bd6aadcbf90cac769c74f810f9a19cdd9  0001-Don-t-pass-CFLAGS-to-the-C-compiler.patch
+92b3c418ae96e97049c3c9bf5aef0ba85f6d95bc82262f902ae48af25c02e2f06a5e270136dee3fc6c56ec4f80e44c2575d2ab61d626ab2cc460081458caecd2  0002-Fix-LLVM-build.patch
+069bb3809eb3a5ff364e45ed0625cf70038f866ea24328b1d7f6b163ad02a00a23c9dad02799acff0b78ca79a68df7f59a49b68ad30df033741f482cd4141d83  0003-Allow-rustdoc-to-work-when-cross-compiling-on-musl.patch
+1ac789ff4bc5f73d707fd36bcabf7c51077d31355ed1d4de2d1bbd6445fb2cfaeaf93aaf789493959df47faafdd04acc17d7212b2dd157e0865be9c55f919e37  0004-Require-static-native-libraries-when-linking-static-.patch
+d14d322141964d3b80e29ad195e9df8ea62c88bc3890fc00dabea3ec7de4b4e4c796a7b1f1fc2014356724d6d5b631e92a72446a7c05c6b06a4e250be0f83b45  0005-Remove-nostdlib-and-musl_root-from-musl-targets.patch
+21267b1d2408d08324864453f08d7bb26008f7799da08d24ed0dccbb02ae0d8f40a894bc77cc45bf8dee7fbc655aa3a8ee9bc7e5fcf1bdc3a9b46b363d6dfaa5  0006-Prefer-libgcc_eh-over-libunwind-for-musl.patch
+a50fb08f4e52213fef4e8303a3978661b43cd58c36676ed35c79b05767c2b02a3ac9416f7a3229f14821c433d2a47b38bc03bf419d70ae597a4f5145de2ed20b  0007-Add-powerpc-unknown-linux-musl-target.patch
+35e93fcc03d3afee55ab0c9a6c3b832e74ee0ff5e9e37f0d134ac934ed70afc2b485e141103715e661aff280b9513d02e1802ff4829d0c7283600e047306f4d8  0008-Fix-powerpc64-ELFv2-big-endian-struct-passing-ABI.patch
+4bcef503d82b1f5676cd2d4f3deaac606abebd68002586e0e64b5c6c3c2846c473fa3f23a9227451ca42b971542dea2384b29d7c4e7543549e00fbc4d0039458  0009-Use-the-ELFv2-ABI-on-powerpc64-musl.patch
+6ff6d6014a4e64486aef97239520239adf9b755f9e16309e4b529d6be5fab845ad9c9b943036db5c29125b4d58870911cf124d61b235f4e4ed81d9b182f9b5e9  0010-Add-powerpc64-unknown-linux-musl-target.patch
+4f74438f47c42e205934c96d4e0920eacd9e3829c77d9253b7a12188c134de8c9ad79f6453c7bd49b71f5bfd3ce95864401b947275f8d73f0028374236694985  0011-Add-missing-OpenSSL-configurations-for-musl-targets.patch
+352f77e0480a9762b7520fabbec9a0adea15783044ae16ec383cede1b714fb10594c7a6a26d3d59cea33980e1fd38836987eeb99828e33b1a26111274df7e84e  0012-rustc_data_structures-use-libc-types-constants-in-fl.patch
+3da23479210496db34dae495b7b98c44aad24363650e35e887b97e9d3b90084f4d57dd2fc0ae0b69de2bd42dc920d6d2829b9b190b16f4c6acd072c8b7cb2988  0013-runtest-Fix-proc-macro-tests-on-musl-hosts.patch
+a170e78757e3d31eb0d6869ca082bcd1b919bc192cb1b9c4940c12b09e4948956bf0c06e63261484c2f868320fbc69a9156f4477bf3ccefad334dab495ea758e  0014-Fix-double_check-tests-on-big-endian-targets.patch
+7e4fdbe3d4c12dc1bdd1f2c9bae01999cc50949628a61f210599f146c2a29ea3450b242cac8fced0fef7334b825a1114da9b632b2e8020dbae085d8a1d2c5168  0015-test-invalid_const_promotion-Accept-SIGTRAP-as-a-val.patch
+35abfcfc12781870b1b3d58afb4a40ba3ed4873a171defec6af170f9b671e46e0daefd258a29fa546aba8b62b80cbae4365d4b4ffc4864a90ec21eac0cca03fe  0016-test-linkage-visibility-Ensure-symbols-are-visible-t.patch
+3efd92224b2bddd1c539b578fcc1f13d69f66bcfef678502f2b2f34a0b44307ac92a87854f136234af860e787048835047aab24428a867aefa16784c6b553673  0017-x.py-Use-python3-instead-of-python.patch
+b19e6f892bc428c577b6bbaed8f764072e320fa03fcab509b2ac1c3e9284dcd0f62ac43fddb71b2fe756de47bbc158d815e37b735d55585071bcf0d6bce40c5f  0018-test-target-feature-gate-Only-run-on-relevant-target.patch
+315a325ae6dbfbfefb237f17843c6dfbedb244378fb9118d441208d879ee6913d2c99e8fe519d3924485bd74f2d95d1b68804e290311eab58fcc50631d4e6f7a  0019-test-use-extern-for-plugins-Don-t-assume-multilib.patch
+285220c4c2faace1abcbc5c4e96f18435fcd2203736240cffc107737f4b424132052b62a9ffa790de4c88323d4b20ccbf61607104d773a385cd3c83c0d2b056a  0020-test-sysroot-crates-are-unstable-Fix-test-when-rpath.patch
+05eb137c7f6fc00e40f55c24e8191fd42a0d39dc1758d40779624ba4c1654bf97383b6ababcc36f5850e1fe10dedb47cfad7a176b2ac4fd0b8659bf3cf969a58  0021-Ignore-broken-and-non-applicable-tests.patch
+02a15f2ad61acbea8dbba54e78f4c4343bbc4f26fc3f48e522f19ef79287e83d3d45b338ae4820fd770677f6cd0f52b0d38050318c60d9d2d3d2e57b196379bf  0022-Link-stage-2-tools-dynamically-to-libstd.patch
+9d6d1761b6348d2e6ec7773d14cce2a6b1bc579ba4f2689ff245017d399e24895128617376ed26f009ebe5e9a0ba1a79bb71bc95373c3565e88d4f1a78a47161  0023-Move-debugger-scripts-to-usr-share-rust.patch
+4837e36aacffd82fcc5cb63e971b02de906087b5865331c6d61f5ab112bf728ec55d9481d328b5462a08142167e8fad2f5e7cbd24700948a04c4d8de9d281324  0024-Add-foxkit-target-specs.patch
 f94abe390798b968bccfba1c908ab5895220ed0d167314b790a9c28b10cac81fb2e3b08760b4e8551ad5a5d02cd052d3d0d647ad8f8634e97f4d3b0470a21c42  0030-liblibc-linkage.patch
-ba7b8c3504b7d24d6686d2dea2819d2def75c268848128a7beb63108f9a4e5610352ef5bdda7a9956193f0786c3bdd9ea39eedd6fe733e6243b08af36810ed24  0031-liblibc-1b130d4c349d.patch
+875f0b676c61c1ec67894fc7866233869ced8fc975960b8b99585bad370066f9a6bf591590a745c73a0bcc93b9f7fda74a703829c50d04b80846aecc92ae725a  0031-liblibc-1b130d4c349d.patch
 41ab9d6f361ee2fba267c9836c1a382dc86101d1bfb59cd942be8e8fc526ad65d845c9395cba7f760808d345d107f32e75af9057d67c450b8fbdd8a73636fb2e  0040-rls-atomics.patch"
diff --git a/user/tellico/APKBUILD b/user/tellico/APKBUILD
new file mode 100644
index 000000000..a38fa7618
--- /dev/null
+++ b/user/tellico/APKBUILD
@@ -0,0 +1,55 @@
+# Contributor: A. Wilcox <awilfox@adelielinux.org>
+# Maintainer: A. Wilcox <awilfox@adelielinux.org>
+pkgname=tellico
+pkgver=3.1.3
+pkgrel=0
+pkgdesc="Collection manager"
+url="http://tellico-project.org/"
+arch="all"
+license="GPL-2.0-only OR GPL-3.0-only"
+depends=""
+makedepends="cmake extra-cmake-modules qt5-qtbase-dev libxml2-dev libxslt-dev
+	karchive-dev kcodecs-dev kconfig-dev kconfigwidgets-dev kcoreaddons-dev
+	kcrash-dev kdoctools-dev kguiaddons-dev khtml-dev ki18n-dev
+	kiconthemes-dev kio-dev kitemmodels-dev kjobwidgets-dev kwallet-dev
+	kwidgetsaddons-dev kwindowsystem-dev kxmlgui-dev solid-dev
+
+	kfilemetadata-dev knewstuff-dev libcdio-dev libksane-dev poppler-dev
+	poppler-qt5-dev taglib-dev"
+subpackages="$pkgname-doc $pkgname-lang"
+source="http://tellico-project.org/files/tellico-$pkgver.tar.xz
+	btparse-strcasecmp.patch
+	"
+
+build() {
+	cd "$builddir"
+	if [ "$CBUILD" != "$CHOST" ]; then
+		CMAKE_CROSSOPTS="-DCMAKE_SYSTEM_NAME=Linux -DCMAKE_HOST_SYSTEM_NAME=Linux"
+	fi
+	cmake \
+		-DCMAKE_INSTALL_PREFIX=/usr \
+		-DCMAKE_INSTALL_LIBDIR=lib \
+		-DBUILD_SHARED_LIBS=True \
+		-DCMAKE_BUILD_TYPE=RelWithDebugInfo \
+		-DCMAKE_CXX_FLAGS="$CXXFLAGS" \
+		-DCMAKE_C_FLAGS="$CFLAGS -std=gnu99" \
+		${CMAKE_CROSSOPTS}
+	make
+}
+
+check() {
+	cd "$builddir"
+	# imagejob: needs running X11
+	# htmlexporter: needs plasma desktop
+	# filelisting: needs dbus
+	# tellicoread: needs network
+	CTEST_OUTPUT_ON_FAILURE=TRUE ctest -E '(filelisting|imagejob|htmlexporter|tellicoread)test'
+}
+
+package() {
+	cd "$builddir"
+	make DESTDIR="$pkgdir" install
+}
+
+sha512sums="9024f423f0685e834ed46e7038c5b95fab5b684aaac00d6298e23493fb4290daeda994faf36a0f04973093a477be5506591e6b0e7f57ef5591fb10953ad8ec5e  tellico-3.1.3.tar.xz
+4627e717d67340de6d88f7a21604a66ba236c651a0ae38d9d3569b76ad58c79f046cfd5686dd688de86d6acafc17ba3959902babdc7f00ab8e9d65717c4fab4a  btparse-strcasecmp.patch"
diff --git a/user/tellico/btparse-strcasecmp.patch b/user/tellico/btparse-strcasecmp.patch
new file mode 100644
index 000000000..2afd4dec3
--- /dev/null
+++ b/user/tellico/btparse-strcasecmp.patch
@@ -0,0 +1,20 @@
+--- tellico-3.1.3/src/3rdparty/btparse/lex_auxiliary.c.old	2018-09-03 00:35:39.883417043 +0000
++++ tellico-3.1.3/src/3rdparty/btparse/lex_auxiliary.c	2018-11-25 06:07:20.260000000 +0000
+@@ -32,6 +32,7 @@
+ #include "bt_debug.h"
+ #include <stdlib.h>
+ #include <string.h>
++#include <strings.h>
+ #include <ctype.h>
+ #include <stdarg.h>
+ #include <assert.h>
+--- tellico-3.1.3/src/3rdparty/btparse/sym.c.old	2018-09-03 00:35:39.887417131 +0000
++++ tellico-3.1.3/src/3rdparty/btparse/sym.c	2018-11-25 06:07:11.570000000 +0000
+@@ -110,6 +110,7 @@
+ /*#include "bt_config.h"*/
+ #include <stdio.h>
+ #include <string.h>
++#include <strings.h>
+ #include <stdlib.h>
+ #ifdef MEMCHK
+ #include "trax.h"
diff --git a/user/unrar/APKBUILD b/user/unrar/APKBUILD
deleted file mode 100644
index f50447699..000000000
--- a/user/unrar/APKBUILD
+++ /dev/null
@@ -1,33 +0,0 @@
-# Contributor: Sören Tempel <soeren+alpine@soeren-tempel.net>
-# Contributor: Carlo Landmeter <clandmeter@gmail.com>
-# Maintainer: Dan Theisen <djt@hxx.in>
-pkgname=unrar
-pkgver=5.6.8
-pkgrel=0
-pkgdesc="The RAR uncompression program"
-url="https://www.rarlab.com"
-arch="all"
-options="!check"  # No test suite.
-license="custom:UnRAR"
-depends=""
-makedepends=""
-subpackages="$pkgname-doc"
-source="https://www.rarlab.com/rar/unrarsrc-$pkgver.tar.gz
-	makefile.patch"
-builddir="$srcdir"/$pkgname
-
-build() {
-	cd "$builddir"
-	make CXX="${CXX:-g++}" CXXFLAGS="$CXXFLAGS" \
-		LDFLAGS="$LDFLAGS" STRIP=: -f makefile
-}
-
-package() {
-	cd "$builddir"
-	install -Dm755 unrar "$pkgdir"/usr/bin/unrar
-	install -Dm644 license.txt \
-		"$pkgdir/usr/share/licenses/$pkgname/license.txt"
-}
-
-sha512sums="5410308d7f462824bc10087cdc4515c58aaad776cc09eb6491864a338ae00ff35e3b54d1e7250c0a9576554ea382383155be718a0b95d7af00f27d5df04f4f56  unrarsrc-5.6.8.tar.gz
-7da30d8454a67999e7052ed2c0ee8d29627b1d47bfdf36e8cf1e24f3c36ee58b17f7e7a6505a4b38e0ca3162067368a1bf554829fd824f7c17a3a2a5b35ca29c  makefile.patch"
diff --git a/user/unrar/makefile.patch b/user/unrar/makefile.patch
deleted file mode 100644
index 1892dab24..000000000
--- a/user/unrar/makefile.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-diff -upr unrar.orig/makefile unrar/makefile
---- unrar.orig/makefile	2017-06-30 21:34:46.228703991 +0200
-+++ unrar/makefile	2017-06-30 21:35:07.535424717 +0200
-@@ -3,12 +3,12 @@
- 
- # Linux using GCC
- CXX=c++
--CXXFLAGS=-O2 -Wno-logical-op-parentheses -Wno-switch -Wno-dangling-else
-+CXXFLAGS?=-O2 -Wno-logical-op-parentheses -Wno-switch -Wno-dangling-else
- LIBFLAGS=-fPIC
- DEFINES=-D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE -DRAR_SMP
- STRIP=strip
- AR=ar
--LDFLAGS=-pthread
-+LDFLAGS+=-pthread
- DESTDIR=/usr
- 
- # Linux using LCC
-@@ -140,7 +140,7 @@ uninstall:	uninstall-unrar
- clean:
- 	@rm -f *.o *.bak *~
- 
--unrar:	clean $(OBJECTS) $(UNRAR_OBJ)
-+unrar:	$(OBJECTS) $(UNRAR_OBJ)
- 	@rm -f unrar
- 	$(LINK) -o unrar $(LDFLAGS) $(OBJECTS) $(UNRAR_OBJ) $(LIBS)	
- 	$(STRIP) unrar
diff --git a/user/weechat/APKBUILD b/user/weechat/APKBUILD
index 3cca9f41a..6f8bb3701 100644
--- a/user/weechat/APKBUILD
+++ b/user/weechat/APKBUILD
@@ -1,8 +1,9 @@
 # Contributor: Leonardo Arena <rnalrd@alpinelinux.org>
+# Contributor: zlg <zlg+adelie@zlg.space>
 # Maintainer: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com>
 pkgname=weechat
 pkgver=2.3
-pkgrel=0
+pkgrel=1
 pkgdesc="Fast, light, extensible ncurses-based chat client"
 url="https://www.weechat.org"
 arch="all"
@@ -16,6 +17,7 @@ subpackages="$pkgname-dev $pkgname-aspell:_plugin $pkgname-lua:_plugin
 	$pkgname-perl:_plugin $pkgname-python:_plugin $pkgname-lang"
 source="https://www.weechat.org/files/src/$pkgname-$pkgver.tar.gz
 	fix-python-linking.patch
+	fix-unsigned-char.patch
 	libintl-fix.patch
 	"
 
@@ -63,4 +65,5 @@ check() {
 
 sha512sums="3315eb672d099dec041a6ece268e3efac9f766fe8273b13810c9ed6bc9129ed0db9730a027db6cdf157338472caf99d60aaf3de9b096a3c395fdf889b106aaea  weechat-2.3.tar.gz
 95f6d1405141421fae70288ec560a6d61f0bde1ce0bfa6e522e24a9673e699099594e83511b39e413aff28010ea1f7f1672af051ac370b152c732d6ca36a9056  fix-python-linking.patch
+e9dddc914f08660c49fd3331ebdca73a3df7e165b284d8b19e0487974ec2d8d75d03cd6d07da6ba9783015ddb19d6c118b697a830dcbea13f078ca7826223370  fix-unsigned-char.patch
 59841bc343b1d10a542631eb01380789f96cac896380dbb3b159444c4806bd6367952e457b9ffd42fb87c1e19fc77eba78c38fd2178ef202ab9f7f1a543417ca  libintl-fix.patch"
diff --git a/user/weechat/fix-unsigned-char.patch b/user/weechat/fix-unsigned-char.patch
new file mode 100644
index 000000000..d4acd1986
--- /dev/null
+++ b/user/weechat/fix-unsigned-char.patch
@@ -0,0 +1,37 @@
+This patch is backported from the upcoming 2.4 release. It corrects
+highlighting behavior for plugins such as urlserver.py.
+
+See-Also: https://github.com/weechat/weechat/issues/1277
+Patch-Author: Sébastien Helleu <flashcode@flashtux.org>
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 0ae69ea0f..1d7738af5 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -27,8 +27,8 @@ project(weechat C)
+ set(CMAKE_VERBOSE_MAKEFILE OFF)
+ set(CMAKE_MODULE_PATH ${CMAKE_SOURCE_DIR}/cmake ${CMAKE_MODULE_PATH})
+ set(CMAKE_SKIP_RPATH ON)
+-set(CMAKE_C_FLAGS   "${CMAKE_C_FLAGS} -Wall -Wextra -Werror-implicit-function-declaration")
+-set(CMAKE_CXX_FLAGS "${CMAKE_C_FLAGS} -Wall -Wextra -Werror-implicit-function-declaration")
++set(CMAKE_C_FLAGS   "${CMAKE_C_FLAGS} -fsigned-char -Wall -Wextra -Werror-implicit-function-declaration")
++set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fsigned-char -Wall -Wextra -Werror-implicit-function-declaration")
+ 
+ # version
+ execute_process(COMMAND ${CMAKE_SOURCE_DIR}/version.sh devel-major OUTPUT_VARIABLE VERSION_MAJOR)
+diff --git a/configure.ac b/configure.ac
+index d267ca10f..a0bf00078 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -1330,7 +1330,7 @@ AC_DEFINE_UNQUOTED(WEECHAT_SHAREDIR, "$WEECHAT_SHAREDIR")
+ weechat_libdir=${libdir}/weechat
+ AC_SUBST(weechat_libdir)
+ 
+-COMMON_CFLAGS="-Wall -Wextra -Werror-implicit-function-declaration"
++COMMON_CFLAGS="-fsigned-char -Wall -Wextra -Werror-implicit-function-declaration"
+ AC_MSG_CHECKING([whether we have GNU assembler])
+ GAS=`as --version < /dev/null 2>/dev/null | grep GNU`
+ if test "$GAS"; then
+-- 
+2.19.1
+
diff --git a/user/xf86-video-fbdev/APKBUILD b/user/xf86-video-fbdev/APKBUILD
new file mode 100644
index 000000000..628551019
--- /dev/null
+++ b/user/xf86-video-fbdev/APKBUILD
@@ -0,0 +1,34 @@
+# Maintainer: A. Wilcox <awilfox@adelielinux.org>
+pkgname=xf86-video-fbdev
+pkgver=0.5.0
+pkgrel=0
+pkgdesc="X.Org driver for video over framebuffers"
+url="https://www.X.Org/"
+arch="all"
+license="MIT"
+subpackages="$pkgname-doc"
+depends=""
+makedepends="libxi-dev util-macros xorgproto-dev xorg-server-dev"
+source="https://www.X.org/releases/individual/driver/$pkgname-$pkgver.tar.bz2"
+
+build() {
+	cd "$builddir"
+	export LDFLAGS="$LDFLAGS -Wl,-z,lazy"
+	./configure \
+		--build=$CBUILD \
+		--host=$CHOST \
+		--prefix=/usr
+	make
+}
+
+check() {
+	cd "$builddir"
+	make check
+}
+
+package() {
+	cd "$builddir"
+	make DESTDIR="$pkgdir" install
+	install -Dm644 COPYING "$pkgdir"/usr/share/licenses/$pkgname/COPYING
+}
+sha512sums="c1217b943bbe3301b3c2a8649ed1004c3c67b02607bd56bbc14f6dfa05e7f0184332c81a6a19595514745501ed88526aee932e555779b7c3a8233646b0979448  xf86-video-fbdev-0.5.0.tar.bz2"
diff --git a/user/youtube-dl/APKBUILD b/user/youtube-dl/APKBUILD
new file mode 100644
index 000000000..af5d02712
--- /dev/null
+++ b/user/youtube-dl/APKBUILD
@@ -0,0 +1,68 @@
+# Contributor: Peter Bui <pnutzh4x0r@gmail.com>
+# Contributor: Sören Tempel <soeren+alpine@soeren-tempel.net>
+# Contributor: Timo Teräs <timo.teras@iki.fi>
+# Maintainer: Max Rees <maxcrees@me.com>
+pkgname=youtube-dl
+pkgver=2018.11.23
+pkgrel=0
+pkgdesc="Command-line program to download videos from YouTube and many other sites"
+url="https://youtube-dl.org"
+arch="noarch"
+options="!check"  # Takes way too long, and uses network
+license="Unlicense AND Public-Domain"
+depends="ffmpeg python3"
+subpackages="$pkgname-doc
+	$pkgname-zsh-completion:zshcomp
+	$pkgname-bash-completion:bashcomp
+	$pkgname-fish-completion:fishcomp"
+source="https://github.com/rg3/$pkgname/releases/download/$pkgver/$pkgname-$pkgver.tar.gz"
+builddir="$srcdir/$pkgname"
+
+prepare() {
+	default_prepare
+	sed -i \
+		-e 's|etc/bash_completion.d|share/bash-completion/completions|' \
+		-e 's|etc/fish/completions|share/fish/completions|' \
+		"$builddir/setup.py"
+}
+
+check() {
+	cd "$builddir"
+	python3 -m unittest discover
+}
+
+package() {
+	cd "$builddir"
+	python3 setup.py install --root="$pkgdir/" --optimize=1
+}
+
+zshcomp() {
+	pkgdesc="Zsh completions for $pkgname"
+	depends=""
+	install_if="$pkgname=$pkgver-r$pkgrel zsh"
+
+	install -Dm644 "$builddir/$pkgname.zsh" \
+		"$subpkgdir/usr/share/zsh/site-functions/_$pkgname"
+}
+
+bashcomp() {
+	pkgdesc="Bash completions for $pkgname"
+	depends=""
+	install_if="$pkgname=$pkgver-r$pkgrel bash-completion"
+
+	mkdir -p "$subpkgdir/usr/share/bash-completion/completions/"
+	mv "$pkgdir/usr/share/bash-completion/completions/$pkgname.bash-completion" \
+		"$subpkgdir/usr/share/bash-completion/completions/$pkgname"
+}
+
+fishcomp() {
+	pkgdesc="Fish completions for $pkgname"
+	depends=""
+	install_if="$pkgname=$pkgver-r$pkgrel fish"
+
+	mkdir -p "$subpkgdir/usr/share/fish/completions/"
+	mv "$pkgdir/usr/share/fish/completions/$pkgname.fish" \
+		"$subpkgdir/usr/share/fish/completions/"
+}
+
+sha512sums="d4d2813657972c37d3493743a44055d7a776aeb5c5a97902e07caa317a3b2db30332507c37b56b3d8554e0bdc2a0ec6a9862977b449b363343a4de2df12bf059  youtube-dl-2018.11.23.tar.gz"