23 files changed, 600 insertions, 196 deletions
diff --git a/user/ccid/APKBUILD b/user/ccid/APKBUILD
deleted file mode 100644
index bddade1d6..000000000
--- a/user/ccid/APKBUILD
+++ /dev/null
@@ -1,33 +0,0 @@
-# Contributor: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com>
-# Maintainer: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com>
-pkgname=ccid
-pkgver=1.4.30
-pkgrel=0
-pkgdesc="Open-source driver for Chip/SmartCard Interface Devices (CCID)"
-url="https://ccid.apdu.fr/"
-arch="all"
-options="!check" # no tests
-license="LGPL-2.1+ AND GPL-2.0+ AND ISC"
-depends="pcsc-lite"
-makedepends="pcsc-lite-dev libusb-dev"
-source="https://ccid.apdu.fr/files/ccid-$pkgver.tar.bz2"
-
-build() {
-	cd "$builddir"
-	./configure \
-		--build=$CBUILD \
-		--host=$CHOST \
-		--prefix=/usr \
-		--sysconfdir=/etc \
-		--mandir=/usr/share/man \
-		--localstatedir=/var
-	make
-}
-
-package() {
-	cd "$builddir"
-	make DESTDIR="$pkgdir" install
-	install -Dm644 src/92_pcscd_ccid.rules "$pkgdir"/lib/udev/rules.d/92_pcscd_ccid.rules
-}
-
-sha512sums="1761a4053a99eb28184d0ffece951aec5d4b646080597b4ae36b18a31fb7a76c55fabfa57ee8e5d7f2db1a6e13d209f7fa995fe6ed067f44558bea34a26d46da  ccid-1.4.30.tar.bz2"
diff --git a/user/dina/APKBUILD b/user/dina/APKBUILD
new file mode 100644
index 000000000..4612562c9
--- /dev/null
+++ b/user/dina/APKBUILD
@@ -0,0 +1,31 @@
+# Contributor: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com>
+# Maintainer: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com>
+pkgname=dina
+pkgver=2.92
+pkgrel=0
+pkgdesc="Bitmap-based programming font"
+url="https://www.dcmembers.com/jibsen/download/61/"
+arch="noarch"
+options="!check" # No tests
+license="MIT"
+depends="encodings font-alias fontconfig mkfontdir"
+makedepends="bdftopcf"
+source="$pkgname-$pkgver.zip::https://www.dcmembers.com/jibsen/download/61/?wpdmdl=61&refresh=5c64600776bf51550082055"
+
+build() {
+	cd "$srcdir"/BDF
+	for i in *.bdf; do
+		bdftopcf -o ${i%.bdf}.pcf $i
+		gzip ${i%.bdf}.pcf
+	done
+}
+
+package() {
+	cd "$srcdir"/BDF
+	mkdir -p "$pkgdir"/usr/share/fonts/X11/misc
+	for i in *.pcf.gz; do
+		install -Dm644 "$i" "$pkgdir"/usr/share/fonts/X11/misc
+	done
+}
+
+sha512sums="ff4e3b6031c815c9c5d469852f094243022a1ac889fb6667c734ac1498fa99d1253abf4d02e8eadb55d7d4d7d80be4fac32730bc24660451d78d2600ceb0ee6f  dina-2.92.zip"
diff --git a/user/gnupg/60-scdaemon.rules b/user/gnupg/60-scdaemon.rules
new file mode 100644
index 000000000..55ca5c166
--- /dev/null
+++ b/user/gnupg/60-scdaemon.rules
@@ -0,0 +1,63 @@
+# do not edit this file, it will be overwritten on update
+
+SUBSYSTEM!="usb", GOTO="gnupg_rules_end"
+ACTION!="add", GOTO="gnupg_rules_end"
+
+# USB SmartCard Readers
+## Cherry GmbH (XX33, ST2000)
+ATTR{idVendor}=="046a", ATTR{idProduct}=="0005", ENV{ID_SMARTCARD_READER}="1", ENV{ID_SMARTCARD_READER_DRIVER}="gnupg", GROUP+="gnupg"
+ATTR{idVendor}=="046a", ATTR{idProduct}=="0010", ENV{ID_SMARTCARD_READER}="1", ENV{ID_SMARTCARD_READER_DRIVER}="gnupg", GROUP+="gnupg"
+ATTR{idVendor}=="046a", ATTR{idProduct}=="003e", ENV{ID_SMARTCARD_READER}="1", ENV{ID_SMARTCARD_READER_DRIVER}="gnupg", GROUP+="gnupg"
+## SCM Microsystems, Inc (SCR331-DI, SCR335, SCR3320, SCR331, SCR3310 and SPR532)
+ATTR{idVendor}=="04e6", ATTR{idProduct}=="5111", ENV{ID_SMARTCARD_READER}="1", ENV{ID_SMARTCARD_READER_DRIVER}="gnupg", GROUP+="gnupg"
+ATTR{idVendor}=="04e6", ATTR{idProduct}=="5115", ENV{ID_SMARTCARD_READER}="1", ENV{ID_SMARTCARD_READER_DRIVER}="gnupg", GROUP+="gnupg"
+ATTR{idVendor}=="04e6", ATTR{idProduct}=="5116", ENV{ID_SMARTCARD_READER}="1", ENV{ID_SMARTCARD_READER_DRIVER}="gnupg", GROUP+="gnupg"
+ATTR{idVendor}=="04e6", ATTR{idProduct}=="5117", ENV{ID_SMARTCARD_READER}="1", ENV{ID_SMARTCARD_READER_DRIVER}="gnupg", GROUP+="gnupg"
+ATTR{idVendor}=="04e6", ATTR{idProduct}=="e001", ENV{ID_SMARTCARD_READER}="1", ENV{ID_SMARTCARD_READER_DRIVER}="gnupg", GROUP+="gnupg"
+ATTR{idVendor}=="04e6", ATTR{idProduct}=="e003", ENV{ID_SMARTCARD_READER}="1", ENV{ID_SMARTCARD_READER_DRIVER}="gnupg", GROUP+="gnupg"
+## Omnikey AG (CardMan 3821, CardMan 6121)
+ATTR{idVendor}=="076b", ATTR{idProduct}=="3821", ENV{ID_SMARTCARD_READER}="1", ENV{ID_SMARTCARD_READER_DRIVER}="gnupg", GROUP+="gnupg"
+ATTR{idVendor}=="076b", ATTR{idProduct}=="6622", ENV{ID_SMARTCARD_READER}="1", ENV{ID_SMARTCARD_READER_DRIVER}="gnupg", GROUP+="gnupg"
+## Gemalto
+ATTR{idVendor}=="08e6", ATTR{idProduct}=="3437", ENV{ID_SMARTCARD_READER}="1", ENV{ID_SMARTCARD_READER_DRIVER}="gnupg", GROUP+="gnupg"
+ATTR{idVendor}=="08e6", ATTR{idProduct}=="3438", ENV{ID_SMARTCARD_READER}="1", ENV{ID_SMARTCARD_READER_DRIVER}="gnupg", GROUP+="gnupg"
+ATTR{idVendor}=="08e6", ATTR{idProduct}=="3478", ENV{ID_SMARTCARD_READER}="1", ENV{ID_SMARTCARD_READER_DRIVER}="gnupg", GROUP+="gnupg"
+ATTR{idVendor}=="08e6", ATTR{idProduct}=="34c2", ENV{ID_SMARTCARD_READER}="1", ENV{ID_SMARTCARD_READER_DRIVER}="gnupg", GROUP+="gnupg"
+ATTR{idVendor}=="08e6", ATTR{idProduct}=="34ec", ENV{ID_SMARTCARD_READER}="1", ENV{ID_SMARTCARD_READER_DRIVER}="gnupg", GROUP+="gnupg"
+## Reiner (SCT cyberJack)
+ATTR{idVendor}=="0c4b", ATTR{idProduct}=="0500", ENV{ID_SMARTCARD_READER}="1", ENV{ID_SMARTCARD_READER_DRIVER}="gnupg", GROUP+="gnupg"
+## Kobil (KAAN)
+ATTR{idVendor}=="0d46", ATTR{idProduct}=="2012", ENV{ID_SMARTCARD_READER}="1", ENV{ID_SMARTCARD_READER_DRIVER}="gnupg", GROUP+="gnupg"
+## VASCO (DIGIPASS 920)
+ATTR{idVendor}=="1a44", ATTR{idProduct}=="0920", ENV{ID_SMARTCARD_READER}="1", ENV{ID_SMARTCARD_READER_DRIVER}="gnupg", GROUP+="gnupg"
+## Crypto Stick
+ATTR{idVendor}=="20a0", ATTR{idProduct}=="4107", ENV{ID_SMARTCARD_READER}="1", ENV{ID_SMARTCARD_READER_DRIVER}="gnupg", GROUP+="gnupg"
+## Nitrokey
+ATTR{idVendor}=="20a0", ATTR{idProduct}=="4108", ENV{ID_SMARTCARD_READER}="1", ENV{ID_SMARTCARD_READER_DRIVER}="gnupg", GROUP+="gnupg"
+ATTR{idVendor}=="20a0", ATTR{idProduct}=="4109", ENV{ID_SMARTCARD_READER}="1", ENV{ID_SMARTCARD_READER_DRIVER}="gnupg", GROUP+="gnupg"
+ATTR{idVendor}=="20a0", ATTR{idProduct}=="4211", ENV{ID_SMARTCARD_READER}="1", ENV{ID_SMARTCARD_READER_DRIVER}="gnupg", GROUP+="gnupg"
+## Gnuk Token
+ATTR{idVendor}=="234b", ATTR{idProduct}=="0000", ENV{ID_SMARTCARD_READER}="1", ENV{ID_SMARTCARD_READER_DRIVER}="gnupg", GROUP+="gnupg"
+## Alcor Micro Corp cardreader (in ThinkPad X250)
+ATTR{idVendor}=="058f", ATTR{idProduct}=="9540", ENV{ID_SMARTCARD_READER}="1", ENV{ID_SMARTCARD_READER_DRIVER}="gnupg", GROUP+="gnupg"
+## Fujitsu Siemens
+ATTR{idVendor}=="0bf8", ATTR{idProduct}=="1006", ENV{ID_SMARTCARD_READER}="1", ENV{ID_SMARTCARD_READER_DRIVER}="gnupg", GROUP+="gnupg"
+## Yubico
+# Yubikey NEO OTP+CCID
+ATTRS{idVendor}=="1050", ATTRS{idProduct}=="0111", ENV{ID_SMARTCARD_READER}="1", ENV{ID_SMARTCARD_READER_DRIVER}="gnupg", GROUP+="gnupg"
+# Yubikey NEO CCID
+ATTRS{idVendor}=="1050", ATTRS{idProduct}=="0112", ENV{ID_SMARTCARD_READER}="1", ENV{ID_SMARTCARD_READER_DRIVER}="gnupg", GROUP+="gnupg"
+# Yubikey NEO U2F+CCID
+ATTRS{idVendor}=="1050", ATTRS{idProduct}=="0115", ENV{ID_SMARTCARD_READER}="1", ENV{ID_SMARTCARD_READER_DRIVER}="gnupg", GROUP+="gnupg"
+# Yubikey NEO OTP+U2F+CCID
+ATTRS{idVendor}=="1050", ATTRS{idProduct}=="0116", ENV{ID_SMARTCARD_READER}="1", ENV{ID_SMARTCARD_READER_DRIVER}="gnupg", GROUP+="gnupg"
+# Yubikey 4 CCID
+ATTRS{idVendor}=="1050", ATTRS{idProduct}=="0404", ENV{ID_SMARTCARD_READER}="1", ENV{ID_SMARTCARD_READER_DRIVER}="gnupg", GROUP+="gnupg"
+# Yubikey 4 OTP+CCID
+ATTRS{idVendor}=="1050", ATTRS{idProduct}=="0405", ENV{ID_SMARTCARD_READER}="1", ENV{ID_SMARTCARD_READER_DRIVER}="gnupg", GROUP+="gnupg"
+# Yubikey 4 U2F+CCID
+ATTRS{idVendor}=="1050", ATTRS{idProduct}=="0406", ENV{ID_SMARTCARD_READER}="1", ENV{ID_SMARTCARD_READER_DRIVER}="gnupg", GROUP+="gnupg"
+# Yubikey 4 OTP+U2F+CCID
+ATTRS{idVendor}=="1050", ATTRS{idProduct}=="0407", ENV{ID_SMARTCARD_READER}="1", ENV{ID_SMARTCARD_READER_DRIVER}="gnupg", GROUP+="gnupg"
+
+LABEL="gnupg_rules_end"
diff --git a/user/gnupg/APKBUILD b/user/gnupg/APKBUILD
index 400967285..baf95d212 100644
--- a/user/gnupg/APKBUILD
+++ b/user/gnupg/APKBUILD
@@ -2,18 +2,21 @@
 # Maintainer: A. Wilcox <awilfox@adelielinux.org>
 pkgname=gnupg
 pkgver=2.2.11
-pkgrel=0
+pkgrel=1
 pkgdesc="GNU Privacy Guard 2 - PGP replacement"
 url="https://www.gnupg.org/"
 arch="all"
 license="GPL-3.0+ AND GPL-2.0+ AND LGPL-2.1+ AND LGPL-3.0+ AND MIT AND BSD-3-Clause AND Public-Domain"
 depends="pinentry"
+pkggroups="gnupg"
 makedepends="bzip2-dev gnutls-dev libassuan-dev libgcrypt-dev libgpg-error-dev
 	libksba-dev libusb-dev npth-dev openldap-dev sqlite-dev zlib-dev"
 subpackages="$pkgname-doc $pkgname-lang"
 source="https://gnupg.org/ftp/gcrypt/$pkgname/$pkgname-$pkgver.tar.bz2
 	0001-Include-sys-select.h-for-FD_SETSIZE.patch
-	fix-i18n.patch"
+	fix-i18n.patch
+	60-scdaemon.rules"
+install="$pkgname.pre-install $pkgname.pre-upgrade"
 
 build() {
 	cd "$builddir"
@@ -27,7 +30,9 @@ build() {
 		--localstatedir=/var \
 		--enable-nls \
 		--enable-bzip2 \
-		--enable-tofu
+		--enable-tofu \
+		--enable-scdaemon \
+		--enable-ccid-driver
 	make
 }
 
@@ -39,8 +44,12 @@ check() {
 package() {
 	cd "$builddir"
 	make DESTDIR="$pkgdir" install
+
+	mkdir -p "$pkgdir"/lib/udev/rules.d
+	install -Dm644 "$srcdir"/60-scdaemon.rules "$pkgdir"/lib/udev/rules.d
 }
 
 sha512sums="8aa8beea877993b6eef155e1a503ffdde9963ff04a24e6a3dea7979efeeeeeab57e942a80ad46ef254d27a83e8cb2e3008da7749afa8e39eade190c0499f95d9  gnupg-2.2.11.tar.bz2
 c6cc4595081c5b025913fa3ebecf0dff87a84f3c669e3fef106e4fa040f1d4314ee52dd4c0e0002b213034fb0810221cfdd0033eae5349b6e3978f05d08bcac7  0001-Include-sys-select.h-for-FD_SETSIZE.patch
-b19a44dacf061dd02b439ab8bd820e3c721aab77168f705f5ce65661f26527b03ea88eec16d78486a633c474120589ec8736692ebff57ab9b95f52f57190ba6b  fix-i18n.patch"
+b19a44dacf061dd02b439ab8bd820e3c721aab77168f705f5ce65661f26527b03ea88eec16d78486a633c474120589ec8736692ebff57ab9b95f52f57190ba6b  fix-i18n.patch
+4bfb9742279c2d1c872d63cd4bcb01f6a2a13d94618eff954d3a37451fa870a9bb29687330854ee47e8876d6e60dc81cb2569c3931beaefacda33db23c464402  60-scdaemon.rules"
diff --git a/user/gnupg/gnupg.pre-install b/user/gnupg/gnupg.pre-install
new file mode 100644
index 000000000..a1fe58661
--- /dev/null
+++ b/user/gnupg/gnupg.pre-install
@@ -0,0 +1,2 @@
+#!/bin/sh
+groupadd -rf gnupg
diff --git a/user/gnupg/gnupg.pre-upgrade b/user/gnupg/gnupg.pre-upgrade
new file mode 120000
index 000000000..f40cd623e
--- /dev/null
+++ b/user/gnupg/gnupg.pre-upgrade
@@ -0,0 +1 @@
+gnupg.pre-install
+\ No newline at end of file
diff --git a/user/otf-culmus/APKBUILD b/user/otf-culmus/APKBUILD
new file mode 100644
index 000000000..d70ab7169
--- /dev/null
+++ b/user/otf-culmus/APKBUILD
@@ -0,0 +1,23 @@
+# Contributor: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com>
+# Maintainer: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com>
+pkgname=otf-culmus
+pkgver=0.133
+pkgrel=0
+pkgdesc="Culmus collections of Hebrew font families"
+url="https://culmus.sourceforge.net"
+arch="noarch"
+options="!check" # No tests
+license="MIT AND GPL-2.0-only WITH font-exception"
+depends="fontconfig"
+source="https://downloads.sourceforge.net/culmus/culmus-$pkgver.tar.gz"
+builddir="$srcdir"/${pkgname#*-}-$pkgver
+
+package() {
+	cd "$builddir"
+	mkdir -p "$pkgdir"/usr/share/fonts/X11/OTF/${pkgname#*-}
+	for i in *.otf; do
+		install -Dm644 "$i" "$pkgdir"/usr/share/fonts/X11/OTF/${pkgname#*-}
+	done
+}
+
+sha512sums="97c17dbe4ad5b542a2bfd6c9c7a7afeeabae942cbbd3a718d46ceb18b4020fe7fdf93ade07a65a2da93dadff645abf0da4648713e3452d30bf2a9a79201f2845  culmus-0.133.tar.gz"
diff --git a/user/pcsc-lite/APKBUILD b/user/pcsc-lite/APKBUILD
deleted file mode 100644
index 3066ad3bc..000000000
--- a/user/pcsc-lite/APKBUILD
+++ /dev/null
@@ -1,68 +0,0 @@
-# Contributor: Carlo Landmeter <clandmeter@gmail.com>
-# Contributor: Timo Teräs <timo.teras@iki.fi>
-# Maintainer: 
-pkgname=pcsc-lite
-pkgver=1.8.24
-pkgrel=0
-pkgdesc="Middleware to access a smart card using SCard API (PC/SC)"
-url="https://pcsclite.apdu.fr/"
-arch="all"
-license="BSD-3-Clause AND GPL-3.0+ AND BSD-2-Clause AND MIT"
-depends=""
-depends_dev="eudev-dev"
-makedepends="$depends_dev perl perl-dev libcap-ng-utils polkit-dev"
-subpackages="$pkgname-dev $pkgname-doc $pkgname-libs $pkgname-openrc"
-install="pcsc-lite.pre-install pcsc-lite.pre-upgrade"
-source="https://pcsclite.apdu.fr/files/pcsc-lite-$pkgver.tar.bz2
-	pcscd.initd"
-
-build() {
-	cd "$builddir"
-	./configure --prefix=/usr \
-		--sysconfdir=/etc \
-		--mandir=/usr/share/man \
-		--infodir=/usr/share/info \
-		--localstatedir=/var \
-		--disable-libusb \
-		--enable-libudev \
-		--disable-maintainer-mode \
-		--disable-silent-rules \
-		--without-systemdsystemunitdir \
-		--enable-ipcdir=/run/pcscd \
-		--enable-usbdropdir=/usr/lib/pcsc/drivers \
-		--disable-libsystemd \
-		--enable-polkit
-	make
-}
-
-check() {
-	cd "$builddir"
-	make check
-}
-
-package() {
-	cd "$builddir"
-	make DESTDIR="$pkgdir" install
-        install -D -m755 "$srcdir"/pcscd.initd \
-		"$pkgdir"/etc/init.d/pcscd
-	mkdir -p "$pkgdir"/usr/lib/pcsc/drivers
-
-	# grant sysfs access
-	filecap "$pkgdir"/usr/sbin/pcscd dac_override
-}
-
-libs() {
-	pkgdesc="Middleware to access a smart card using SCard API (PC/SC) (libraries)"
-	mkdir -p "$subpkgdir"/usr
-	mv "$pkgdir"/usr/lib "$subpkgdir"/usr
-}
-
-dev() {
-	default_dev
-	# move back the /usr/lib/libpcsclite.so
-	# see http://bugs.alpinelinux.org/issues/3236 (and 6392)
-	mv "$subpkgdir"/usr/lib/libpcsclite.so "$pkgdir"/usr/lib/libpcsclite.so
-}
-
-sha512sums="df2e6a7a8179563a6dbf654ab75cf78a4b297b0562214a081d7d2b5d00fd4adf92fd892bd16aacf9d5e2867f3ad46c88a88e5834e311011f37556dd7e8936a0c  pcsc-lite-1.8.24.tar.bz2
-6810ab357b5bcf07bf1ad76ed17ebb8e92be4599303a4e697b87a05d43b8d2bec5d3c29d44d8ddb5d031910ea62ca52a9868e6de9a255227eaeb29d1a7ee0041  pcscd.initd"
diff --git a/user/pcsc-lite/pcsc-lite.pre-install b/user/pcsc-lite/pcsc-lite.pre-install
deleted file mode 100644
index 2e654f28d..000000000
--- a/user/pcsc-lite/pcsc-lite.pre-install
+++ /dev/null
@@ -1,10 +0,0 @@
-#!/bin/sh
-
-username=pcscd
-groupname=$username
-
-addgroup -S $username 2>/dev/null
-adduser -S -D -H -h /var/run/$username -s /sbin/nologin -G $groupname \
-	-g $username $username 2>/dev/null
-
-exit 0
diff --git a/user/pcsc-lite/pcsc-lite.pre-upgrade b/user/pcsc-lite/pcsc-lite.pre-upgrade
deleted file mode 120000
index 46d75afae..000000000
--- a/user/pcsc-lite/pcsc-lite.pre-upgrade
+++ /dev/null
@@ -1 +0,0 @@
-pcsc-lite.pre-install
-\ No newline at end of file
diff --git a/user/pcsc-lite/pcscd.initd b/user/pcsc-lite/pcscd.initd
deleted file mode 100644
index 7c580253a..000000000
--- a/user/pcsc-lite/pcscd.initd
+++ /dev/null
@@ -1,23 +0,0 @@
-#!/sbin/openrc-run
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/pcsc-lite/files/pcscd-init.7,v 1.1 2014/02/14 23:11:54 flameeyes Exp $
-
-name="PC/SC Daemon"
-
-pidfile=/run/pcscd/pcscd.pid
-
-command=/usr/sbin/pcscd
-command_args="${EXTRA_OPTS}"
-
-start_stop_daemon_args="--user pcscd:pcscd"
-
-depend() {
-	need localmount
-	after udev openct dbus
-	use logger
-}
-
-start_pre() {
-	checkpath -d -m 0755 -o pcscd:pcscd /run/pcscd
-}
diff --git a/user/pcsc-tools/APKBUILD b/user/pcsc-tools/APKBUILD
deleted file mode 100644
index 07fd60e32..000000000
--- a/user/pcsc-tools/APKBUILD
+++ /dev/null
@@ -1,37 +0,0 @@
-# Contributor: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com>
-# Maintainer: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com>
-pkgname=pcsc-tools
-pkgver=1.5.4
-pkgrel=0
-pkgdesc="Tools for scanning for and interacting with PC/SC devices"
-url="http://ludovic.rousseau.free.fr/softwares/pcsc-tools/"
-arch="all"
-license="GPL-2.0+"
-depends="perl"
-makedepends="pcsc-lite-dev"
-subpackages="$pkgname-doc"
-source="http://ludovic.rousseau.free.fr/softwares/pcsc-tools/pcsc-tools-$pkgver.tar.bz2"
-
-build() {
-	cd "$builddir"
-	./configure \
-		--build=$CBUILD \
-		--host=$CHOST \
-		--prefix=/usr \
-		--sysconfdir=/etc \
-		--mandir=/usr/share/man \
-		--localstatedir=/var
-	make
-}
-
-check() {
-	cd "$builddir"
-	make check
-}
-
-package() {
-	cd "$builddir"
-	make DESTDIR="$pkgdir" install
-}
-
-sha512sums="c64b9445dcdf72a7e5627380894c1f627ebcb343a497524ee185b64110c2c2b8b6138cae5610439991ab9756fd89ea5de0e054e68698b220d11606b38f7a90c6  pcsc-tools-1.5.4.tar.bz2"
diff --git a/user/rdesktop/APKBUILD b/user/rdesktop/APKBUILD
index 06ed9d766..2bdffb3c5 100644
--- a/user/rdesktop/APKBUILD
+++ b/user/rdesktop/APKBUILD
@@ -2,7 +2,7 @@
 # Maintainer: A. Wilcox <awilfox@adelielinux.org>
 pkgname=rdesktop
 pkgver=1.8.4
-pkgrel=0
+pkgrel=1
 pkgdesc="Remote Desktop Protocol client"
 url="https://www.rdesktop.org/"
 arch="all"
@@ -10,7 +10,7 @@ options="!check"  # No test suite.
 license="GPL-3.0-only"
 depends=""
 makedepends="alsa-lib-dev krb5-dev libice-dev libsamplerate-dev libx11-dev
-	libxrandr-dev openssl-dev pcsc-lite-dev"
+	libxrandr-dev openssl-dev"
 subpackages="$pkgname-doc"
 source="https://github.com/rdesktop/rdesktop/releases/download/v$pkgver/rdesktop-$pkgver.tar.gz
 	gssapi.patch
@@ -33,7 +33,7 @@ build() {
 		--sysconfdir=/etc \
 		--mandir=/usr/share/man \
 		--localstatedir=/var \
-		--enable-smartcard
+		--disable-smartcard
 	make
 }
 
diff --git a/user/tf/0001-Add-DESTDIR-support.patch b/user/tf/0001-Add-DESTDIR-support.patch
new file mode 100644
index 000000000..e45794bd4
--- /dev/null
+++ b/user/tf/0001-Add-DESTDIR-support.patch
@@ -0,0 +1,113 @@
+--- tf-50b8/unix/unix.mak
++++ tf-50b8.new/unix/unix.mak
+@@ -87,57 +87,65 @@
+ 	-test -z "$(STRIP)" || $(STRIP) tf$(X) || true
+ 
+ PREFIXDIRS:
+-	test -d "$(bindir)" || mkdir $(bindir)
+-	test -d "$(datadir)" || mkdir $(datadir)
+ 
+ install_TF $(TF): tf$(X) $(BUILDERS)
+-	-@rm -f $(TF)
+-	cp tf$(X) $(TF)
+-	chmod $(MODE) $(TF)
++	install -Dm755 tf$(X) $(DESTDIR)$(bindir)/tf
+ 
+ SYMLINK $(SYMLINK): $(TF)
+-	test -z "$(SYMLINK)" || { rm -f $(SYMLINK) && ln -s $(TF) $(SYMLINK); }
+ 
+ LIBRARY $(TF_LIBDIR): ../tf-lib/tf-help ../tf-lib/tf-help.idx
+-	@echo '## Creating library directory...'
+-#	@# Overly simplified shell commands, to avoid problems on ultrix
+-	-@test -n "$(TF_LIBDIR)" || echo "TF_LIBDIR is undefined."
+-	test -n "$(TF_LIBDIR)"
+-	test -d "$(TF_LIBDIR)" || mkdir $(TF_LIBDIR)
+-	-@test -d "$(TF_LIBDIR)" || echo "Can't make $(TF_LIBDIR) directory.  See if"
+-	-@test -d "$(TF_LIBDIR)" || echo "there is already a file with that name."
+-	test -d "$(TF_LIBDIR)"
+-#
+-#	@#rm -f $(TF_LIBDIR)/*;  # wrong: this would remove local.tf, etc.
+-	@echo '## Copying library files...'
+-	cd ../tf-lib; \
+-	for f in *; do test -f $$f && files="$$files $$f"; done; \
+-	( cd $(TF_LIBDIR); rm -f $$files tf.help tf.help.index; ); \
+-	cp $$files $(TF_LIBDIR); \
+-	cd $(TF_LIBDIR); \
+-	chmod $(MODE) $$files; chmod ugo-wx $$files
+-	-rm -f $(TF_LIBDIR)/CHANGES 
+-	cp ../CHANGES $(TF_LIBDIR)
+-	chmod $(MODE) $(TF_LIBDIR)/CHANGES; chmod ugo-wx $(TF_LIBDIR)/CHANGES
+-	chmod $(MODE) $(TF_LIBDIR)
+-	-@cd $(TF_LIBDIR); old=`ls replace.tf 2>/dev/null`; \
+-	if [ -n "$$old" ]; then \
+-	    echo "## WARNING: Obsolete files found in $(TF_LIBDIR): $$old"; \
+-	fi
+-	@echo '## Creating links so old library names still work...'
+-#	@# note: ln -sf isn't portable.
+-	@cd $(TF_LIBDIR); \
+-	rm -f bind-bash.tf;    ln -s  kb-bash.tf   bind-bash.tf;    \
+-	rm -f bind-emacs.tf;   ln -s  kb-emacs.tf  bind-emacs.tf;   \
+-	rm -f completion.tf;   ln -s  complete.tf  completion.tf;   \
+-	rm -f factorial.tf;    ln -s  factoral.tf  factorial.tf;    \
+-	rm -f file-xfer.tf;    ln -s  filexfer.tf  file-xfer.tf;    \
+-	rm -f local.tf.sample; ln -s  local-eg.tf  local.tf.sample; \
+-	rm -f pref-shell.tf;   ln -s  psh.tf       pref-shell.tf;   \
+-	rm -f space_page.tf;   ln -s  spc-page.tf  space_page.tf;   \
+-	rm -f speedwalk.tf;    ln -s  spedwalk.tf  speedwalk.tf;    \
+-	rm -f stack_queue.tf;  ln -s  stack-q.tf   stack_queue.tf;  \
+-	rm -f worldqueue.tf;   ln -s  world-q.tf   worldqueue.tf;
++	install -Dm644 ../tf-lib/lisp.tf $(DESTDIR)$(datadir)/tf-lib/lisp.tf
++	install -Dm644 ../tf-lib/hanoi.tf $(DESTDIR)$(datadir)/tf-lib/hanoi.tf
++	install -Dm644 ../tf-lib/spell.tf $(DESTDIR)$(datadir)/tf-lib/spell.tf
++	install -Dm644 ../tf-lib/spedwalk.tf $(DESTDIR)$(datadir)/tf-lib/spedwalk.tf
++	install -Dm644 ../tf-lib/kb-emacs.tf $(DESTDIR)$(datadir)/tf-lib/kb-emacs.tf
++	install -Dm644 ../tf-lib/tf-help.idx $(DESTDIR)$(datadir)/tf-lib/tf-help.idx
++	install -Dm644 ../tf-lib/tools.tf $(DESTDIR)$(datadir)/tf-lib/tools.tf
++	install -Dm644 ../tf-lib/watch.tf $(DESTDIR)$(datadir)/tf-lib/watch.tf
++	install -Dm644 ../tf-lib/kb_badterm.tf $(DESTDIR)$(datadir)/tf-lib/kb_badterm.tf
++	install -Dm644 ../tf-lib/world-q.tf $(DESTDIR)$(datadir)/tf-lib/world-q.tf
++	install -Dm644 ../tf-lib/changes.tf $(DESTDIR)$(datadir)/tf-lib/changes.tf
++	install -Dm644 ../tf-lib/stack-q.tf $(DESTDIR)$(datadir)/tf-lib/stack-q.tf
++	install -Dm644 ../tf-lib/factoral.tf $(DESTDIR)$(datadir)/tf-lib/factoral.tf
++	install -Dm644 ../tf-lib/cylon.tf $(DESTDIR)$(datadir)/tf-lib/cylon.tf
++	install -Dm644 ../tf-lib/quoter.tf $(DESTDIR)$(datadir)/tf-lib/quoter.tf
++	install -Dm644 ../tf-lib/psh.tf $(DESTDIR)$(datadir)/tf-lib/psh.tf
++	install -Dm644 ../tf-lib/textutil.tf $(DESTDIR)$(datadir)/tf-lib/textutil.tf
++	install -Dm644 ../tf-lib/finger.tf $(DESTDIR)$(datadir)/tf-lib/finger.tf
++	install -Dm644 ../tf-lib/savehist.tf $(DESTDIR)$(datadir)/tf-lib/savehist.tf
++	install -Dm644 ../tf-lib/textencode.tf $(DESTDIR)$(datadir)/tf-lib/textencode.tf
++	install -Dm644 ../tf-lib/spc-page.tf $(DESTDIR)$(datadir)/tf-lib/spc-page.tf
++	install -Dm644 ../tf-lib/teraterm.keyboard.cnf $(DESTDIR)$(datadir)/tf-lib/teraterm.keyboard.cnf
++	install -Dm644 ../tf-lib/testcolor.tf $(DESTDIR)$(datadir)/tf-lib/testcolor.tf
++	install -Dm644 ../tf-lib/tintin.tf $(DESTDIR)$(datadir)/tf-lib/tintin.tf
++	install -Dm644 ../tf-lib/grep.tf $(DESTDIR)$(datadir)/tf-lib/grep.tf
++	install -Dm644 ../tf-lib/tfrc $(DESTDIR)$(datadir)/tf-lib/tfrc
++	install -Dm644 ../tf-lib/rwho.tf $(DESTDIR)$(datadir)/tf-lib/rwho.tf
++	install -Dm644 ../tf-lib/alias.tf $(DESTDIR)$(datadir)/tf-lib/alias.tf
++	install -Dm644 ../tf-lib/kbbind.tf $(DESTDIR)$(datadir)/tf-lib/kbbind.tf
++	install -Dm644 ../tf-lib/complete.tf $(DESTDIR)$(datadir)/tf-lib/complete.tf
++	install -Dm644 ../tf-lib/kbregion.tf $(DESTDIR)$(datadir)/tf-lib/kbregion.tf
++	install -Dm644 ../tf-lib/color.tf $(DESTDIR)$(datadir)/tf-lib/color.tf
++	install -Dm644 ../tf-lib/kb-bash.tf $(DESTDIR)$(datadir)/tf-lib/kb-bash.tf
++	install -Dm644 ../tf-lib/kbstack.tf $(DESTDIR)$(datadir)/tf-lib/kbstack.tf
++	install -Dm644 ../tf-lib/filexfer.tf $(DESTDIR)$(datadir)/tf-lib/filexfer.tf
++	install -Dm644 ../tf-lib/activity_status.tf $(DESTDIR)$(datadir)/tf-lib/activity_status.tf
++	install -Dm644 ../tf-lib/tfstatus.tf $(DESTDIR)$(datadir)/tf-lib/tfstatus.tf
++	install -Dm644 ../tf-lib/relog.tf $(DESTDIR)$(datadir)/tf-lib/relog.tf
++	install -Dm644 ../tf-lib/local-eg.tf $(DESTDIR)$(datadir)/tf-lib/local-eg.tf
++	install -Dm644 ../tf-lib/stdlib.tf $(DESTDIR)$(datadir)/tf-lib/stdlib.tf
++	install -Dm644 ../tf-lib/at.tf $(DESTDIR)$(datadir)/tf-lib/at.tf
++	install -Dm644 ../tf-lib/tick.tf $(DESTDIR)$(datadir)/tf-lib/tick.tf
++	install -Dm644 ../tf-lib/kb-os2.tf $(DESTDIR)$(datadir)/tf-lib/kb-os2.tf
++	install -Dm644 ../tf-lib/kbfunc.tf $(DESTDIR)$(datadir)/tf-lib/kbfunc.tf
++	install -Dm644 ../tf-lib/pcmd.tf $(DESTDIR)$(datadir)/tf-lib/pcmd.tf
++	install -Dm644 ../tf-lib/map.tf $(DESTDIR)$(datadir)/tf-lib/map.tf
++	install -Dm644 ../tf-lib/activity_status2.tf $(DESTDIR)$(datadir)/tf-lib/activity_status2.tf
++	install -Dm644 ../tf-lib/kb-old.tf $(DESTDIR)$(datadir)/tf-lib/kb-old.tf
++	install -Dm644 ../tf-lib/tr.tf $(DESTDIR)$(datadir)/tf-lib/tr.tf
++	install -Dm644 ../CHANGES $(DESTDIR)$(datadir)/tf-lib/CHANGES
++	install -Dm644 ../README $(DESTDIR)$(datadir)/tf-lib/README
++	install -Dm644 ../tf-lib/examples.old $(DESTDIR)$(datadir)/tf-lib/examples.old
+ 
+ makehelp: makehelp.c
+ 	$(CC) $(CFLAGS) -o makehelp makehelp.c
diff --git a/user/tf/0002-Correct-use-of-va_list.patch b/user/tf/0002-Correct-use-of-va_list.patch
new file mode 100644
index 000000000..d13fcd854
--- /dev/null
+++ b/user/tf/0002-Correct-use-of-va_list.patch
@@ -0,0 +1,34 @@
+From: Russ Allbery <rra@debian.org>
+Date: Sun, 17 Feb 2008 22:23:24 -0800
+Subject: Correct use of va_list
+
+va_copy a va_list before using it in vsprintf so that we don't use the
+same va_list repeatedly.  Patch taken from the upstream bug tracker
+and will apparently be in the next release after 5.0beta8.
+---
+ src/tfio.c | 5 ++++-
+ 1 file changed, 4 insertions(+), 1 deletion(-)
+
+diff --git a/src/tfio.c b/src/tfio.c
+index 2cd2103..151583e 100644
+--- a/src/tfio.c
++++ b/src/tfio.c
+@@ -497,6 +497,7 @@ void vSprintf(String *buf, int flags, const char *fmt, va_list ap)
+     const conString *Sval;
+     int len, min, max, leftjust, stars;
+     attr_t attrs = buf->attrs;
++    va_list ap_copy;
+ 
+     if (!(flags & SP_APPEND) && buf->data) Stringtrunc(buf, 0);
+     while (*fmt) {
+@@ -522,7 +523,9 @@ void vSprintf(String *buf, int flags, const char *fmt, va_list ap)
+         case 'x': case 'X': case 'u': case 'o':
+         case 'f': case 'e': case 'E': case 'g': case 'G':
+         case 'p':
+-            vsprintf(tempbuf, spec, ap);
++            va_copy(ap_copy, ap);
++            vsprintf(tempbuf, spec, ap_copy);
++            va_end(ap_copy);
+             Stringcat(buf, tempbuf);
+             /* eat the arguments used by vsprintf() */
+             while (stars--) (void)va_arg(ap, int);
diff --git a/user/tf/0003-Minor-man-page-fixes.patch b/user/tf/0003-Minor-man-page-fixes.patch
new file mode 100644
index 000000000..9611744a5
--- /dev/null
+++ b/user/tf/0003-Minor-man-page-fixes.patch
@@ -0,0 +1,112 @@
+From: Russ Allbery <rra@debian.org>
+Date: Sun, 17 Feb 2008 22:17:59 -0800
+Subject: Minor man page fixes
+
+Escape hyphens properly, add a better man page header, fix the
+placement of punctuation around font changes, and fix a spelling
+error.
+---
+ src/tf.1.nroffman | 34 +++++++++++++++++-----------------
+ 1 file changed, 17 insertions(+), 17 deletions(-)
+
+diff --git a/src/tf.1.nroffman b/src/tf.1.nroffman
+index e8daaca..90691db 100644
+--- a/src/tf.1.nroffman
++++ b/src/tf.1.nroffman
+@@ -1,11 +1,11 @@
+ .\" $Id: tf.1.nroffman,v 34000.8 2007/01/13 23:12:39 kkeys Exp $
+-.TH TF 1 LOCAL
++.TH TF 1 "2007-01-13" "TinyFugue 5.0" "TinyFugue"
+ .SH NAME
+ tf \- TinyFugue, a MUD client
+ .SH SYNOPSIS
+-.B "tf [-f\fIfile\fB] [-lnq] [\fIworld\fB]"
++.B "tf [\-f\fIfile\fB] [\-lnq] [\fIworld\fB]"
+ .br
+-.B "tf [-f\fIfile\fB] \fIhost\fB \fIport\fB"
++.B "tf [\-f\fIfile\fB] \fIhost\fB \fIport\fB"
+ .SH DESCRIPTION
+ \fITinyFugue\fR (also known as "Fugue" or "TF") is a line-based client
+ designed for connecting to MUD servers (note: LP, DIKU, and other servers
+@@ -48,15 +48,15 @@ world and try to connect to it.
+ The \fBhost\fR may be an IP number or regular name format.
+ .PP
+ OPTIONS
+-.IP "-f\fIfile\fR"
++.IP "\-f\fIfile\fR"
+ Load \fIfile\fR instead of $HOME/.tfrc at startup.
+-.IP "-f"
++.IP "\-f"
+ Do not load any personal configuration file.  The library will still be loaded.
+-.IP "-l"
++.IP "\-l"
+ Disable automatic login.
+-.IP "-n"
++.IP "\-n"
+ Do not connect to any world at startup.
+-.IP "-q"
++.IP "\-q"
+ Quiet login (overrides %{quiet} flag).
+ 
+ .SH FEATURES
+@@ -109,7 +109,7 @@ Log a session to a file.
+ .sp
+ Separate LP and Diku style prompts from normal output.
+ .sp
+-Page output using a --More-- prompt.
++Page output using a \-\-More\-\- prompt.
+ .sp
+ Recall previously received text.
+ 
+@@ -120,14 +120,14 @@ configuration file "stdlib.tf", located in TFLIBDIR.
+ TFLIBDIR is defined when \fITF\fR is installed, and is often
+ /usr/local/lib/tf.lib, or under the home directory of the installer.
+ This library contains many macros
+-and definitions essential to the correct operation of \fITF.\fR
++and definitions essential to the correct operation of \fITF\fR.
+ 
+ Next, \fITF\fR will attempt to read your personal configuration
+ file, $HOME/.tfrc, in which you can put any \fITF\fR commands you
+ want executed automatically at startup.  Two of the most useful
+ commands to use in a \fITF\fR configuration file are /addworld and /load.
+ 
+-For backward compatability, \fITF\fR will also try
++For backward compatibility, \fITF\fR will also try
+ to read the \fITinyTalk\fR configuration file.
+ Its name defautls to $HOME/.tinytalk, or can be defined by the TINYTALK
+ environment variable.
+@@ -140,19 +140,19 @@ the first Tinyclient with any great number of features, including
+ hiliting and suppression of text, simple triggers, and separating input and
+ output on the screen.
+ Leo Plotkin (Grod) made rather extensive modifications to \fITinytalk\fR
+-to produce \fITinywar,\fR which was plagued with some
++to produce \fITinywar\fR, which was plagued with some
+ serious bugs and was never officially released (the phrase "Tinywar
+ doesn't exist" is often quoted), and is now an unsupported client.
+ \fITF\fR began when Greg Hudson (Explorer_Bob) merged many of the new
+-features of \fITinywar\fR back into \fITinyTalk,\fR
++features of \fITinywar\fR back into \fITinyTalk\fR,
+ and added many new features of his own, most notably the split screen.
+ Some of the code in Greg's releases was contributed by Leo Plotkin.
+-After Greg moved on to \fIVaporTalk,\fR Ken Keys (Hawkeye) took over design
++After Greg moved on to \fIVaporTalk\fR, Ken Keys (Hawkeye) took over design
+ and maintenance of \fITF\fR in July 1991, and continues to make improvements
+ in features and performance.
+ .PP
+ The code size of \fITF\fR has surpassed 300K (unstripped),
+-and is signifigantly larger than \fITinytalk.\fR
++and is signifigantly larger than \fITinytalk\fR.
+ It is, in fact, more than three times the size of a number of existing servers.
+ As of version 3.0, it has 66 builtin commands and 57 library commands,
+ each documented in the helpfile.
+@@ -225,8 +225,8 @@ default macro library.
+ .PP
+ The .tinytalk file may not be supported in the future; use .tfrc instead.
+ .PP
+-The '-' command line option in versions prior to 2.0 is no longer supported,
+-and has been replaced with '-l'.
++The '\-' command line option in versions prior to 2.0 is no longer supported,
++and has been replaced with '\-l'.
+ 
+ .SH BUGS
+ .PP
diff --git a/user/tf/0006-Fix-library-install-path.patch b/user/tf/0006-Fix-library-install-path.patch
new file mode 100644
index 000000000..52c8e885f
--- /dev/null
+++ b/user/tf/0006-Fix-library-install-path.patch
@@ -0,0 +1,38 @@
+From: Russ Allbery <rra@debian.org>
+Date: Sun, 14 Aug 2016 14:14:47 -0700
+Subject: Fix library install path
+
+The upstream top-level configure script doesn't correctly handle
+--program-suffix without this tweak.
+---
+ configure.in | 5 +++--
+ 1 file changed, 3 insertions(+), 2 deletions(-)
+
+diff --git a/configure.in b/configure.in
+index e783564..c938531 100644
+--- a/configure.in
++++ b/configure.in
+@@ -599,13 +599,13 @@ fi
+ dnl The "right" way of using program_transform_name, program_prefix, and
+ dnl program_suffix expects you to use AC_ARG_PROGRAM here and do transformation
+ dnl in the Makefile, but we want the values now, so we do it ourselves.
+-EXENAME="tf"
++EXENAME="tf" PROGNAME="tf"
+ test "${program_prefix}" != "NONE" && EXENAME="${program_prefix}${EXENAME}"
+ test "${program_suffix}" != "NONE" && EXENAME="${EXENAME}${program_suffix}"
+ if test "${program_transform_name}" != "NONE"; then
+     EXENAME=`echo "${EXENAME}" | sed "${program_transform_name}"`
+ fi
+-LIBNAME="${EXENAME}-lib"
++LIBNAME="${PROGNAME}-lib"
+ 
+ if test "$enable_symlink" = "no"; then
+     SYMLINK=""
+@@ -616,6 +616,7 @@ else
+ fi
+ 
+ AC_SUBST(EXENAME)
++AC_SUBST(PROGNAME)
+ AC_SUBST(LIBNAME)
+ AC_SUBST(SYMLINK)
+ 
diff --git a/user/tf/0007-Fix-spelling-errors.patch b/user/tf/0007-Fix-spelling-errors.patch
new file mode 100644
index 000000000..8e78721b7
--- /dev/null
+++ b/user/tf/0007-Fix-spelling-errors.patch
@@ -0,0 +1,59 @@
+From: Russ Allbery <rra@debian.org>
+Date: Sun, 14 Aug 2016 14:22:52 -0700
+Subject: Fix spelling errors
+
+occured -> occurred everywhere
+---
+ CHANGES       | 4 ++--
+ src/command.c | 2 +-
+ src/signals.c | 2 +-
+ 3 files changed, 4 insertions(+), 4 deletions(-)
+
+diff --git a/CHANGES b/CHANGES
+index 037c766..dfc5029 100644
+--- a/CHANGES
++++ b/CHANGES
+@@ -316,7 +316,7 @@ Renamed BACKGROUND hook to BGTRIG (but old name still works).
+ Added BGTEXT hook.
+ Fixed activity_status.tf to update for lines generated by /echo -w.
+ Fixed: ACTIVITY and PREACTIVITY hooks didn't run in the world in which the
+-    activity occured when caused by /echo -w.
++    activity occurred when caused by /echo -w.
+ Fixed order of /dc message relative to text already queued on socket.
+ Fixed: under certain conditions, a dead socket would not go away and could
+     not be foregrounded.
+@@ -972,7 +972,7 @@ Fixed compilation error involving conditional and hstrerror under some
+   lame compilers (socket.c:788).
+ Fixed output misdirection during a read() inside a command sub.
+ Fixed rare bug causing command line to execute in wrong world when a
+-  simultaneous background trigger occured.
++  simultaneous background trigger occurred.
+ Fixed /world with no arguments.
+ Fixed fatal input bug after /histsize -i. (35a21)
+ Fixed bug which disabled history recording after /recall on an empty history.
+diff --git a/src/command.c b/src/command.c
+index 0409787..624d03b 100644
+--- a/src/command.c
++++ b/src/command.c
+@@ -605,7 +605,7 @@ int do_file_load(const char *args, int tinytalk)
+ 		!user_result->u.ival && !warned)
+ 	    {
+ 		eprintf("(This line was implicitly treated as an /addworld "
+-		    "because it occured before the first '/' line and did not "
++		    "because it occurred before the first '/' line and did not "
+ 		    "start with a '/', ';', or '#'.)");
+ 		warned = 1;
+ 	    }
+diff --git a/src/signals.c b/src/signals.c
+index bd96b87..a00c70e 100644
+--- a/src/signals.c
++++ b/src/signals.c
+@@ -410,7 +410,7 @@ static char initial_dir[PATH_MAX+1] = "."; /* default: many users never chdir */
+ static void coremsg(FILE *dumpfile)
+ {
+     fputs("Also describe what you were doing in tf when this\r\n", stderr);
+-    fputs("occured, and whether you can repeat it.\r\n\n", stderr);
++    fputs("occurred, and whether you can repeat it.\r\n\n", stderr);
+     fprintf(dumpfile, "> %.512s\r\n", version);
+     if (*sysname) fprintf(dumpfile, "> %.256s\r\n", sysname);
+     fprintf(dumpfile, "> %.256s\r\n", featurestr->data);
diff --git a/user/tf/0008-Build-on-musl.patch b/user/tf/0008-Build-on-musl.patch
new file mode 100644
index 000000000..9ca62290c
--- /dev/null
+++ b/user/tf/0008-Build-on-musl.patch
@@ -0,0 +1,49 @@
+diff -Nurd tf-50b8/src/malloc.c tf-50b8.new/src/malloc.c
+--- tf-50b8/src/malloc.c	2007-01-13 23:12:39.000000000 +0000
++++ tf-50b8.new/src/malloc.c	2018-01-24 09:13:08.406519279 +0000
+@@ -12,7 +12,7 @@
+ #include "signals.h"
+ #include "malloc.h"
+ 
+-caddr_t mmalloc_base = NULL;
++void *mmalloc_base = NULL;
+ int low_memory_warning = 0;
+ static char *reserve = NULL;
+ 
+diff -Nurd tf-50b8/src/macro.c tf-50b8.new/src/macro.c
+--- tf-50b8/src/macro.c	2007-01-13 23:12:39.000000000 +0000
++++ tf-50b8.new/src/macro.c	2018-01-24 09:26:18.479836714 +0000
+@@ -893,7 +893,8 @@
+     }
+     spec->attr &= ~F_NONE;
+     if (spec->nsubattr) {
+-	int n = pcre_info(spec->trig.ri->re, NULL, NULL);
++	int n = 0;
++	pcre_fullinfo(spec->trig.ri->re, NULL, PCRE_INFO_CAPTURECOUNT, &n);
+ 	for (i = 0; i < spec->nsubattr; i++) {
+ 	    spec->subattr[i].attr &= ~F_NONE;
+ 	    if (spec->subattr[i].subexp > n) {
+diff -Nurd tf-50b8/src/pattern.c tf-50b8.new/src/pattern.c
+--- tf-50b8/src/pattern.c	2007-01-13 23:12:39.000000000 +0000
++++ tf-50b8.new/src/pattern.c	2018-01-24 09:28:21.526500904 +0000
+@@ -151,7 +151,7 @@
+ 	    emsg ? emsg : "unknown error");
+ 	goto tf_reg_compile_error;
+     }
+-    n = pcre_info(ri->re, NULL, NULL);
++    pcre_fullinfo(ri->re, NULL, PCRE_INFO_CAPTURECOUNT, &n);
+     if (n < 0) goto tf_reg_compile_error;
+     ri->ovecsize = 3 * (n + 1);
+     ri->ovector = dmalloc(NULL, sizeof(int) * ri->ovecsize, file, line);
+diff -Nurd tf-50b8/src/pattern.h tf-50b8.new/src/pattern.h
+--- tf-50b8/src/pattern.h	2007-01-13 23:12:39.000000000 +0000
++++ tf-50b8.new/src/pattern.h	2018-01-24 09:28:36.039833945 +0000
+@@ -10,7 +10,7 @@
+ #ifndef PATTERN_H
+ #define PATTERN_H
+ 
+-#include "pcre-2.08/pcre.h"
++#include <pcre.h>
+ 
+ typedef struct RegInfo {
+     pcre *re;
diff --git a/user/tf/APKBUILD b/user/tf/APKBUILD
new file mode 100644
index 000000000..65f205fb7
--- /dev/null
+++ b/user/tf/APKBUILD
@@ -0,0 +1,47 @@
+# Contributor: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com>
+# Maintainer: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com>
+pkgname=tf
+pkgver=5.0b8
+_pkgver=${pkgver%.*}${pkgver#*.}
+pkgrel=0
+pkgdesc="Powerful curses-based MUD client"
+url="http://tinyfugue.sourceforge.net/"
+arch="all"
+options="!check" # no tests
+license="GPL-2.0+"
+depends=""
+makedepends="openssl-dev ncurses-dev pcre-dev"
+source="https://sourceforge.net/projects/tinyfugue/files/tinyfugue/5.0%20beta%208/tf-$_pkgver.tar.gz
+	0001-Add-DESTDIR-support.patch
+	0002-Correct-use-of-va_list.patch
+	0003-Minor-man-page-fixes.patch
+	0006-Fix-library-install-path.patch
+	0007-Fix-spelling-errors.patch
+	0008-Build-on-musl.patch
+	"
+builddir="$srcdir/tf-$_pkgver"
+
+build() {
+	cd "$builddir"
+	./configure \
+		--build=$CBUILD \
+		--host=$CHOST \
+		--prefix=/usr \
+		--sysconfdir=/etc \
+		--mandir=/usr/share/man \
+		--localstatedir=/var
+	make
+}
+
+package() {
+	cd "$builddir"
+	make DESTDIR="$pkgdir" install
+}
+
+sha512sums="3b99c039d7a9c6ab7ee7b1040ff7c99fe39cbe991f373333ea7c130d54383f102f14ae33303a415f5419cd43238caffc46114e842c6964329c0999e0f506e3d0  tf-50b8.tar.gz
+e891f5d4fb2db8f1f875fa2c7fa2a4d76c9ae2a54fdcc61c80e906e4f6f2d11e736fd2579d56cb313209e46c7ea01eba46b19ccf4b3f5e007585fd65fc547b34  0001-Add-DESTDIR-support.patch
+7d2b2da0f4213fcfbce86eb9042cb83751c80aba5881861d5f49d4604a4eba52d60b5254c8b119528f0890ae7a68dfe4fea7eb2c94dd0d01676b194bca4db219  0002-Correct-use-of-va_list.patch
+1e8f05d2744b60cc78f494283bb5f9ef7a804a6811d16028d5486a7394658a03aed04962adfd5bc60fe1517d3831b41f4ca1c3956a624f09a2a4b14f5ab91608  0003-Minor-man-page-fixes.patch
+0066bbb3919e6b157eb276c3975cadc258a195037c0f199c3f9db83868d6035f81b79b9a41a743c99f317fd253a2f670dcf122d5f7c449fc1677c56cfaa8bb6a  0006-Fix-library-install-path.patch
+a84aeaf097eb1ec61f9c86f73795ad9f8c111057837b1a0b127905302372e01b6489f9a19f14a29171cef9a787314d511dc98e1140d0c122dd9af5f526eb4bc0  0007-Fix-spelling-errors.patch
+f9eadd1ffb2bc51db5d2bd0e9636573ef560bf849a780c8ee99bccb3870463a1b2caeaa1d3005e11d99c7689ae6ecd8f75056db09cf2d3df084058b4a3db32f0  0008-Build-on-musl.patch"
diff --git a/user/wpa_supplicant/APKBUILD b/user/wpa_supplicant/APKBUILD
index 0208adaee..ba297f885 100644
--- a/user/wpa_supplicant/APKBUILD
+++ b/user/wpa_supplicant/APKBUILD
@@ -2,15 +2,15 @@
 # Maintainer: A. Wilcox <awilfox@adelielinux.org>
 pkgname=wpa_supplicant
 pkgver=2.6
-pkgrel=10
+pkgrel=11
 pkgdesc="Utility providing key negotiation for WPA wireless networks"
 url="https://w1.fi/wpa_supplicant/"
 arch="all"
 license="BSD-3-Clause AND Public-Domain AND (GPL-2.0+ OR BSD-3-Clause)"
+options="!check" # No test suite
 subpackages="$pkgname-doc $pkgname-openrc wpa_gui"
 depends="dbus"
-makedepends="linux-headers openssl-dev dbus-dev libnl3-dev pcsc-lite-dev
-	qt5-qtbase-dev"
+makedepends="linux-headers openssl-dev dbus-dev libnl3-dev qt5-qtbase-dev"
 source="http://w1.fi/releases/$pkgname-$pkgver.tar.gz
 	rebased-v2.6-0001-hostapd-Avoid-key-reinstallation-in-FT-handshake.patch
 	rebased-v2.6-0002-Prevent-reinstallation-of-an-already-in-use-group-ke.patch
@@ -50,18 +50,13 @@ prepare() {
 
 build() {
 	cd "$builddir"/wpa_supplicant
-	make LIBDIR=/lib BINDIR=/sbin
+	make LIBDIR=/lib BINDIR=/sbin all eapol_test
 
 	# wpa_gui
 	qmake -o wpa_gui-qt4/Makefile wpa_gui-qt4/wpa_gui.pro
 	make -C wpa_gui-qt4
 }
 
-check() {
-	cd "$builddir"/wpa_supplicant
-	make eapol_test
-}
-
 package() {
 	cd "$builddir"/wpa_supplicant
 	make DESTDIR="$pkgdir" LIBDIR=/lib BINDIR=/sbin install
@@ -116,5 +111,5 @@ fc84edd8b30305cc42053c872554098f3f077292ec980ed6a442f37884087ff2f055738fd55977ed
 11eed22f6e793f40c788d586c715deecae03c421d11761b7b4a376660bce812c54cc6f353c7d4d5da9c455aeffd778baefb9e76d380027a729574a756e54ddcc  wpa_supplicant.initd
 29103161ec2b9631fca9e8d9a97fafd60ffac3fe78cf613b834395ddcaf8be1e253c22e060d7d9f9b974b2d7ce794caa932a2125e29f6494b75bce475f7b30e1  wpa_supplicant.confd
 2be055dd1f7da5a3d8e79c2f2c0220ddd31df309452da18f290144d2112d6dbde0fc633bb2ad02c386a39d7785323acaf5f70e5969995a1e8303a094eb5fe232  eloop.patch
-6707991f9a071f2fcb09d164d31d12b1f52b91fbb5574b70b8d6f9727f72bbe42b03dd66d10fcc2126f5b7e49ac785657dec90e88b4bf54a9aa5638582f6e505  config
+221660fa0350442a7d8371686b2118861052a4613fb352b7f80079e3750b82f4e48efc378b9d617455007d1106552b695fdca506a3c338283986641f3848b202  config
 45d3e70c47d0f7d6dc6730853af8cbcb40ed0713ee7b1069698f5a635939f273f66e72d4221e064c3c71a92154cf07841c8c0d4fc14d796dbb6fe0d92776ee2b  wpa_cli.sh"
diff --git a/user/wpa_supplicant/config b/user/wpa_supplicant/config
index f35daa0d1..86833fbce 100644
--- a/user/wpa_supplicant/config
+++ b/user/wpa_supplicant/config
@@ -115,7 +115,7 @@ CONFIG_EAP_GTC=y
 CONFIG_EAP_OTP=y
 
 # EAP-SIM (enable CONFIG_PCSC, if EAP-SIM is used)
-CONFIG_EAP_SIM=y
+#CONFIG_EAP_SIM=y
 
 # EAP-PSK (experimental; this is _not_ needed for WPA-PSK)
 CONFIG_EAP_PSK=y
@@ -130,11 +130,11 @@ CONFIG_EAP_PAX=y
 CONFIG_EAP_LEAP=y
 
 # EAP-AKA (enable CONFIG_PCSC, if EAP-AKA is used)
-CONFIG_EAP_AKA=y
+#CONFIG_EAP_AKA=y
 
 # EAP-AKA' (enable CONFIG_PCSC, if EAP-AKA' is used).
 # This requires CONFIG_EAP_AKA to be enabled, too.
-CONFIG_EAP_AKA_PRIME=y
+#CONFIG_EAP_AKA_PRIME=y
 
 # Enable USIM simulator (Milenage) for EAP-AKA
 #CONFIG_USIM_SIMULATOR=y
@@ -176,7 +176,7 @@ CONFIG_SMARTCARD=y
 
 # PC/SC interface for smartcards (USIM, GSM SIM)
 # Enable this if EAP-SIM or EAP-AKA is included
-CONFIG_PCSC=y
+#CONFIG_PCSC=y
 
 # Support HT overrides (disable HT/HT40, mask MCS rates, etc.)
 #CONFIG_HT_OVERRIDES=y
diff --git a/user/yubico-c/APKBUILD b/user/yubico-c/APKBUILD
index 8e9fd4ded..926ecf235 100644
--- a/user/yubico-c/APKBUILD
+++ b/user/yubico-c/APKBUILD
@@ -2,13 +2,13 @@
 # Maintainer: Kiyoshi Aman <kiyoshi.aman+adelie@gmail.com>
 pkgname=yubico-c
 pkgver=1.13
-pkgrel=1
+pkgrel=2
 pkgdesc="Low-level C library for interacting with YubiKey devices"
 url="https://developers.yubico.com/yubico-c/"
 arch="all"
 license="BSD-2-Clause"
-depends="ccid"
-makedepends="asciidoctor $depends_dev"
+depends=""
+makedepends="asciidoctor"
 subpackages="$pkgname-dev $pkgname-doc"
 source="yubico-c-libyubikey-$pkgver.tar.gz::https://github.com/Yubico/yubico-c/archive/libyubikey-$pkgver.tar.gz
 	use-asciidoctor.patch"