Merge branch 'pcsc' into 'master'

Drop pcsc-lite



See merge request !180

10 files changed, 15 insertions, 192 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/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/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"