X-Original-To: alpine-aports@lists.alpinelinux.org Received: from mail.ovgu.de (mail.ovgu.de [141.44.1.66]) by lists.alpinelinux.org (Postfix) with ESMTP id BB94C5C5081 for ; Mon, 4 Jun 2018 07:41:10 +0000 (GMT) Received: from mail.ovgu.de (localhost [127.0.0.1]) by localhost (Postfix) with SMTP id 7C2AC41610; Mon, 4 Jun 2018 09:41:08 +0200 (CEST) Received: from faultier2go (faultier-2go.iks.cs.ovgu.de [141.44.29.99]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.ovgu.de (Postfix) with ESMTPSA id 297244160F; Mon, 4 Jun 2018 09:41:08 +0200 (CEST) Date: Mon, 4 Jun 2018 09:41:05 +0200 From: Marian Buschsieweke To: Leonardo Arena Cc: alpine-aports Subject: Re: [alpine-aports] [PATCH] main/gnupg: Enabled smartcard support as subpkg Message-ID: <20180604094105.3a99e755@faultier2go> In-Reply-To: References: <20180509212658.4009-1-marian.buschsieweke@ovgu.de> Organization: =?UTF-8?B?T3R0by12b24tR3Vlcmlja2UtVW5pdmVyc2l0w6R0?= Magdeburg X-Mailer: Claws Mail 3.15.1-dirty (GTK+ 2.24.31; x86_64-alpine-linux-musl) X-Mailinglist: alpine-aports Precedence: list List-Id: Alpine Development List-Unsubscribe: List-Post: List-Help: List-Subscribe: MIME-Version: 1.0 Content-Type: multipart/signed; micalg=pgp-sha256; boundary="Sig_/8iY5T0JCxs.zwWn+vjIkTLe"; protocol="application/pgp-signature" X-PMX-Version: 6.4.3.2751440, Antispam-Engine: 2.7.2.2107409, Antispam-Data: 2018.6.4.73316, AntiVirus-Engine: 5.50.0, AntiVirus-Data: 2018.6.4.5500000 X-PMX-Spam: Gauge=IIIIIIII, Probability=8%, Report=' INVOICE_ATTACHMENT 0.1, HTML_00_01 0.05, HTML_00_10 0.05, BODY_SIZE_10000_PLUS 0, ECARD_WORD 0, INVALID_MSGID_NO_FQDN 0, IN_REP_TO 0, LEGITIMATE_SIGNS 0, MSG_THREAD 0, MULTIPLE_REAL_RCPTS 0, REFERENCES 0, __ANY_URI 0, __ATTACHMENT_SIZE_0_10K 0, __ATTACHMENT_SIZE_10_25K 0, __BOUNCE_CHALLENGE_SUBJ 0, __BOUNCE_NDR_SUBJ_EXEMPT 0, __C230066_P5 0, __CC_NAME 0, __CP_URI_IN_BODY 0, __CT 0, __CTYPE_HAS_BOUNDARY 0, __CTYPE_MULTIPART 0, __DQ_NEG_HEUR 0, __DQ_NEG_IP 0, __FORWARDED_MSG 0, __FRAUD_BODY_WEBMAIL 0, __FRAUD_MONEY 0, __FRAUD_MONEY_BIG_COIN 0, __FRAUD_MONEY_BIG_COIN_DIG 0, __FRAUD_MONEY_CURRENCY 0, __FRAUD_MONEY_CURRENCY_DOLLAR 0, __FRAUD_MONEY_VALUE 0, __FRAUD_WEBMAIL 0, __HAS_ATTACHMENT 0, __HAS_ATTACHMENT1 0, __HAS_ATTACHMENT2 0, __HAS_CC_HDR 0, __HAS_FROM 0, __HAS_MSGID 0, __HAS_X_MAILER 0, __HTTPS_URI 0, __INVOICE_MULTILINGUAL 0, __IN_REP_TO 0, __MIME_TEXT_P 0, __MIME_TEXT_P1 0, __MIME_TEXT_P2 0, __MIME_VERSION 0, __MULTIPLE_URI_TEXT 0, __NO_HTML_TAG_RAW 0, __PHISH_SPEAR_SUBJ_TEAM 0, __PHISH_SUBJ_PHRASE3 0, __REFERENCES 0, __SANE_MSGID 0, __SUBJ_ALPHA_END 0, __SUBJ_ALPHA_NEGATE 0, __SUBJ_REPLY 0, __TO_MALFORMED_2 0, __TO_NAME 0, __TO_NAME_DIFF_FROM_ACC 0, __TO_REAL_NAMES 0, __URI_IN_BODY 0, __URI_NOT_IMG 0, __URI_NS , __URI_WITHOUT_PATH 0, __URI_WITH_PATH 0' X-Spam-Score: Gauge=IIIIIIII X-PMX-consideredAsSpam: no --Sig_/8iY5T0JCxs.zwWn+vjIkTLe Content-Type: multipart/mixed; boundary="MP_/sgL8Qk8qJJVm8zVE/9jxP2Q" --MP_/sgL8Qk8qJJVm8zVE/9jxP2Q Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: quoted-printable Content-Disposition: inline Hi, sorry for the late reply. I just tested it two times and the unit tests ran just fine. Please check if the unit tests are passed on your machine withou= t my modifications, as the enabled smart card driver is not tested in the unit t= ests at all (as far as I know). Thus, the hang in the unit test might be unrelat= ed to the modifications. (I noticed that I incremented the pkgrel two times :-( I atteched a patch w= ith that fixed.) Kind regards, Marian On Thu, 31 May 2018 11:54:02 +0200 Leonardo Arena wrote: > Hi, >=20 > it appears that while running the tests it stucks whenever signing is use= d: >=20 > sigs.scm, sigs-dsa.scm, seat.scm, clearsig.scm, detach.scm are just some > examples. >=20 > Here is the last test I run (after disabling those above), detachm.scm. > Eventually I stopped it: >=20 > Checking armored signatures > > plain-1 plain-2 ^Cmake[2]: *** [Makefile:942: xcheck] Interrupt =20 > make[1]: *** [Makefile:534: check-recursive] Interrupt > make: *** [Makefile:590: check-recursive] Interrupt >=20 > I've let them run for several minutes but they do not appear to make any > progress. I did not investigate further. >=20 > How about your environment? Do they behave the same? May be not since you > submitted the patch... >=20 > Thanks! >=20 > /eo >=20 >=20 >=20 > On Wed, May 9, 2018 at 11:26 PM, Marian Buschsieweke < > marian.buschsieweke@ovgu.de> wrote: =20 >=20 > > - Added gnupg-scdaemon as subpackage > > - Enabled internal CCID driver (support for Gnuk, NitroKey, YubiKey, ..= .) > > - Added 60-scdaemon.rules udev rules to provide access to group gnupg > > - Added pre-install for subpackage to create group gnupg > > > > This feature was requested here: https://bugs.alpinelinux.org/issues/86= 21 > > --- > > main/gnupg/60-scdaemon.rules | 63 +++++++++++++++++++++++++++ > > main/gnupg/APKBUILD | 29 +++++++++--- > > main/gnupg/gnupg-scdaemon.pre-install | 2 + > > 3 files changed, 88 insertions(+), 6 deletions(-) > > create mode 100644 main/gnupg/60-scdaemon.rules > > create mode 100644 main/gnupg/gnupg-scdaemon.pre-install > > > > diff --git a/main/gnupg/60-scdaemon.rules b/main/gnupg/60-scdaemon.rules > > new file mode 100644 > > index 0000000000..55ca5c1663 > > --- /dev/null > > +++ b/main/gnupg/60-scdaemon.rules > > @@ -0,0 +1,63 @@ > > +# do not edit this file, it will be overwritten on update > > + > > +SUBSYSTEM!=3D"usb", GOTO=3D"gnupg_rules_end" > > +ACTION!=3D"add", GOTO=3D"gnupg_rules_end" > > + > > +# USB SmartCard Readers > > +## Cherry GmbH (XX33, ST2000) > > +ATTR{idVendor}=3D=3D"046a", ATTR{idProduct}=3D=3D"0005", > > ENV{ID_SMARTCARD_READER}=3D"1", ENV{ID_SMARTCARD_READER_DRIVER}=3D"gnup= g", > > GROUP+=3D"gnupg" > > +ATTR{idVendor}=3D=3D"046a", ATTR{idProduct}=3D=3D"0010", > > ENV{ID_SMARTCARD_READER}=3D"1", ENV{ID_SMARTCARD_READER_DRIVER}=3D"gnup= g", > > GROUP+=3D"gnupg" > > +ATTR{idVendor}=3D=3D"046a", ATTR{idProduct}=3D=3D"003e", > > ENV{ID_SMARTCARD_READER}=3D"1", ENV{ID_SMARTCARD_READER_DRIVER}=3D"gnup= g", > > GROUP+=3D"gnupg" > > +## SCM Microsystems, Inc (SCR331-DI, SCR335, SCR3320, SCR331, SCR3310 = and > > SPR532) > > +ATTR{idVendor}=3D=3D"04e6", ATTR{idProduct}=3D=3D"5111", > > ENV{ID_SMARTCARD_READER}=3D"1", ENV{ID_SMARTCARD_READER_DRIVER}=3D"gnup= g", > > GROUP+=3D"gnupg" > > +ATTR{idVendor}=3D=3D"04e6", ATTR{idProduct}=3D=3D"5115", > > ENV{ID_SMARTCARD_READER}=3D"1", ENV{ID_SMARTCARD_READER_DRIVER}=3D"gnup= g", > > GROUP+=3D"gnupg" > > +ATTR{idVendor}=3D=3D"04e6", ATTR{idProduct}=3D=3D"5116", > > ENV{ID_SMARTCARD_READER}=3D"1", ENV{ID_SMARTCARD_READER_DRIVER}=3D"gnup= g", > > GROUP+=3D"gnupg" > > +ATTR{idVendor}=3D=3D"04e6", ATTR{idProduct}=3D=3D"5117", > > ENV{ID_SMARTCARD_READER}=3D"1", ENV{ID_SMARTCARD_READER_DRIVER}=3D"gnup= g", > > GROUP+=3D"gnupg" > > +ATTR{idVendor}=3D=3D"04e6", ATTR{idProduct}=3D=3D"e001", > > ENV{ID_SMARTCARD_READER}=3D"1", ENV{ID_SMARTCARD_READER_DRIVER}=3D"gnup= g", > > GROUP+=3D"gnupg" > > +ATTR{idVendor}=3D=3D"04e6", ATTR{idProduct}=3D=3D"e003", > > ENV{ID_SMARTCARD_READER}=3D"1", ENV{ID_SMARTCARD_READER_DRIVER}=3D"gnup= g", > > GROUP+=3D"gnupg" > > +## Omnikey AG (CardMan 3821, CardMan 6121) > > +ATTR{idVendor}=3D=3D"076b", ATTR{idProduct}=3D=3D"3821", > > ENV{ID_SMARTCARD_READER}=3D"1", ENV{ID_SMARTCARD_READER_DRIVER}=3D"gnup= g", > > GROUP+=3D"gnupg" > > +ATTR{idVendor}=3D=3D"076b", ATTR{idProduct}=3D=3D"6622", > > ENV{ID_SMARTCARD_READER}=3D"1", ENV{ID_SMARTCARD_READER_DRIVER}=3D"gnup= g", > > GROUP+=3D"gnupg" > > +## Gemalto > > +ATTR{idVendor}=3D=3D"08e6", ATTR{idProduct}=3D=3D"3437", > > ENV{ID_SMARTCARD_READER}=3D"1", ENV{ID_SMARTCARD_READER_DRIVER}=3D"gnup= g", > > GROUP+=3D"gnupg" > > +ATTR{idVendor}=3D=3D"08e6", ATTR{idProduct}=3D=3D"3438", > > ENV{ID_SMARTCARD_READER}=3D"1", ENV{ID_SMARTCARD_READER_DRIVER}=3D"gnup= g", > > GROUP+=3D"gnupg" > > +ATTR{idVendor}=3D=3D"08e6", ATTR{idProduct}=3D=3D"3478", > > ENV{ID_SMARTCARD_READER}=3D"1", ENV{ID_SMARTCARD_READER_DRIVER}=3D"gnup= g", > > GROUP+=3D"gnupg" > > +ATTR{idVendor}=3D=3D"08e6", ATTR{idProduct}=3D=3D"34c2", > > ENV{ID_SMARTCARD_READER}=3D"1", ENV{ID_SMARTCARD_READER_DRIVER}=3D"gnup= g", > > GROUP+=3D"gnupg" > > +ATTR{idVendor}=3D=3D"08e6", ATTR{idProduct}=3D=3D"34ec", > > ENV{ID_SMARTCARD_READER}=3D"1", ENV{ID_SMARTCARD_READER_DRIVER}=3D"gnup= g", > > GROUP+=3D"gnupg" > > +## Reiner (SCT cyberJack) > > +ATTR{idVendor}=3D=3D"0c4b", ATTR{idProduct}=3D=3D"0500", > > ENV{ID_SMARTCARD_READER}=3D"1", ENV{ID_SMARTCARD_READER_DRIVER}=3D"gnup= g", > > GROUP+=3D"gnupg" > > +## Kobil (KAAN) > > +ATTR{idVendor}=3D=3D"0d46", ATTR{idProduct}=3D=3D"2012", > > ENV{ID_SMARTCARD_READER}=3D"1", ENV{ID_SMARTCARD_READER_DRIVER}=3D"gnup= g", > > GROUP+=3D"gnupg" > > +## VASCO (DIGIPASS 920) > > +ATTR{idVendor}=3D=3D"1a44", ATTR{idProduct}=3D=3D"0920", > > ENV{ID_SMARTCARD_READER}=3D"1", ENV{ID_SMARTCARD_READER_DRIVER}=3D"gnup= g", > > GROUP+=3D"gnupg" > > +## Crypto Stick > > +ATTR{idVendor}=3D=3D"20a0", ATTR{idProduct}=3D=3D"4107", > > ENV{ID_SMARTCARD_READER}=3D"1", ENV{ID_SMARTCARD_READER_DRIVER}=3D"gnup= g", > > GROUP+=3D"gnupg" > > +## Nitrokey > > +ATTR{idVendor}=3D=3D"20a0", ATTR{idProduct}=3D=3D"4108", > > ENV{ID_SMARTCARD_READER}=3D"1", ENV{ID_SMARTCARD_READER_DRIVER}=3D"gnup= g", > > GROUP+=3D"gnupg" > > +ATTR{idVendor}=3D=3D"20a0", ATTR{idProduct}=3D=3D"4109", > > ENV{ID_SMARTCARD_READER}=3D"1", ENV{ID_SMARTCARD_READER_DRIVER}=3D"gnup= g", > > GROUP+=3D"gnupg" > > +ATTR{idVendor}=3D=3D"20a0", ATTR{idProduct}=3D=3D"4211", > > ENV{ID_SMARTCARD_READER}=3D"1", ENV{ID_SMARTCARD_READER_DRIVER}=3D"gnup= g", > > GROUP+=3D"gnupg" > > +## Gnuk Token > > +ATTR{idVendor}=3D=3D"234b", ATTR{idProduct}=3D=3D"0000", > > ENV{ID_SMARTCARD_READER}=3D"1", ENV{ID_SMARTCARD_READER_DRIVER}=3D"gnup= g", > > GROUP+=3D"gnupg" > > +## Alcor Micro Corp cardreader (in ThinkPad X250) > > +ATTR{idVendor}=3D=3D"058f", ATTR{idProduct}=3D=3D"9540", > > ENV{ID_SMARTCARD_READER}=3D"1", ENV{ID_SMARTCARD_READER_DRIVER}=3D"gnup= g", > > GROUP+=3D"gnupg" > > +## Fujitsu Siemens > > +ATTR{idVendor}=3D=3D"0bf8", ATTR{idProduct}=3D=3D"1006", > > ENV{ID_SMARTCARD_READER}=3D"1", ENV{ID_SMARTCARD_READER_DRIVER}=3D"gnup= g", > > GROUP+=3D"gnupg" > > +## Yubico > > +# Yubikey NEO OTP+CCID > > +ATTRS{idVendor}=3D=3D"1050", ATTRS{idProduct}=3D=3D"0111", > > ENV{ID_SMARTCARD_READER}=3D"1", ENV{ID_SMARTCARD_READER_DRIVER}=3D"gnup= g", > > GROUP+=3D"gnupg" > > +# Yubikey NEO CCID > > +ATTRS{idVendor}=3D=3D"1050", ATTRS{idProduct}=3D=3D"0112", > > ENV{ID_SMARTCARD_READER}=3D"1", ENV{ID_SMARTCARD_READER_DRIVER}=3D"gnup= g", > > GROUP+=3D"gnupg" > > +# Yubikey NEO U2F+CCID > > +ATTRS{idVendor}=3D=3D"1050", ATTRS{idProduct}=3D=3D"0115", > > ENV{ID_SMARTCARD_READER}=3D"1", ENV{ID_SMARTCARD_READER_DRIVER}=3D"gnup= g", > > GROUP+=3D"gnupg" > > +# Yubikey NEO OTP+U2F+CCID > > +ATTRS{idVendor}=3D=3D"1050", ATTRS{idProduct}=3D=3D"0116", > > ENV{ID_SMARTCARD_READER}=3D"1", ENV{ID_SMARTCARD_READER_DRIVER}=3D"gnup= g", > > GROUP+=3D"gnupg" > > +# Yubikey 4 CCID > > +ATTRS{idVendor}=3D=3D"1050", ATTRS{idProduct}=3D=3D"0404", > > ENV{ID_SMARTCARD_READER}=3D"1", ENV{ID_SMARTCARD_READER_DRIVER}=3D"gnup= g", > > GROUP+=3D"gnupg" > > +# Yubikey 4 OTP+CCID > > +ATTRS{idVendor}=3D=3D"1050", ATTRS{idProduct}=3D=3D"0405", > > ENV{ID_SMARTCARD_READER}=3D"1", ENV{ID_SMARTCARD_READER_DRIVER}=3D"gnup= g", > > GROUP+=3D"gnupg" > > +# Yubikey 4 U2F+CCID > > +ATTRS{idVendor}=3D=3D"1050", ATTRS{idProduct}=3D=3D"0406", > > ENV{ID_SMARTCARD_READER}=3D"1", ENV{ID_SMARTCARD_READER_DRIVER}=3D"gnup= g", > > GROUP+=3D"gnupg" > > +# Yubikey 4 OTP+U2F+CCID > > +ATTRS{idVendor}=3D=3D"1050", ATTRS{idProduct}=3D=3D"0407", > > ENV{ID_SMARTCARD_READER}=3D"1", ENV{ID_SMARTCARD_READER_DRIVER}=3D"gnup= g", > > GROUP+=3D"gnupg" > > + > > +LABEL=3D"gnupg_rules_end" > > diff --git a/main/gnupg/APKBUILD b/main/gnupg/APKBUILD > > index b2a7978e62..7a9620b523 100644 > > --- a/main/gnupg/APKBUILD > > +++ b/main/gnupg/APKBUILD > > @@ -3,7 +3,7 @@ > > pkgname=3Dgnupg > > pkgver=3D2.2.6 > > _ver=3D${pkgver/_beta/-beta} > > -pkgrel=3D0 > > +pkgrel=3D2 > > pkgdesc=3D"GNU Privacy Guard 2 - a PGP replacement tool" > > url=3D"https://www.gnupg.org/" > > arch=3D"all" > > @@ -12,11 +12,13 @@ options=3D"" > > depends=3D"pinentry" > > makedepends=3D"gnutls-dev libksba-dev libgcrypt-dev libgpg-error-dev > > npth-dev zlib-dev libassuan-dev openldap-dev bzip2-dev > > - sqlite-dev" > > -subpackages=3D"$pkgname-doc" > > + sqlite-dev libusb-dev" > > +subpackages=3D"$pkgname-doc $pkgname-scdaemon" > > source=3D"https://gnupg.org/ftp/gcrypt/$pkgname/$pkgname-$_ver.tar.bz2 > > 0001-Include-sys-select.h-for-FD_SETSIZE.patch > > - fix-i18n.patch" > > + fix-i18n.patch > > + 60-scdaemon.rules" > > +install=3D"$pkgname-scdaemon.pre-install" > > builddir=3D"$srcdir"/$pkgname-$_ver > > > > build() { > > @@ -31,7 +33,9 @@ build() { > > --localstatedir=3D/var \ > > --disable-nls \ > > --enable-bzip2 \ > > - --enable-tofu > > + --enable-tofu \ > > + --enable-scdaemon \ > > + --enable-ccid-driver > > make > > } > > > > @@ -49,6 +53,19 @@ package() { > > ln -s gpgv "$pkgdir"/usr/bin/gpgv2 > > } > > > > +scdaemon() { > > + pkgdesc=3D"GNU Privacy Guard 2 - smart card support" > > + depends=3D"gnupg" > > + > > + mkdir -p "${subpkgdir}/usr/libexec" > > + mkdir -p "${subpkgdir}/lib/udev/rules.d" > > + > > + install -Dm644 -t "${subpkgdir}/lib/udev/rules.d/" \ > > + "${srcdir}/60-scdaemon.rules" > > + mv "${pkgdir}/usr/libexec/scdaemon" "${subpkgdir}/usr/libexec/" > > +} > > + > > sha512sums=3D"ad0861c86c1886f701ae05e7cd439449cf0684a7bf461ca2b729c5e9= 3833 > > ee36f8438cd4d7f73a4c60e57060f3d8f4890a809b2bbc31b083f9f61d2f66ccacc4 > > gnupg-2.2.6.tar.bz2 > > c6cc4595081c5b025913fa3ebecf0dff87a84f3c669e3fef106e4fa040f1 > > d4314ee52dd4c0e0002b213034fb0810221cfdd0033eae5349b6e3978f05d08bcac7 > > 0001-Include-sys-select.h-for-FD_SETSIZE.patch > > -b19a44dacf061dd02b439ab8bd820e3c721aab77168f705f5ce65661f265 > > 27b03ea88eec16d78486a633c474120589ec8736692ebff57ab9b95f52f57190ba6b > > fix-i18n.patch" > > +b19a44dacf061dd02b439ab8bd820e3c721aab77168f705f5ce65661f265 > > 27b03ea88eec16d78486a633c474120589ec8736692ebff57ab9b95f52f57190ba6b > > fix-i18n.patch > > +4bfb9742279c2d1c872d63cd4bcb01f6a2a13d94618eff954d3a37451fa8 > > 70a9bb29687330854ee47e8876d6e60dc81cb2569c3931beaefacda33db23c464402 > > 60-scdaemon.rules" > > diff --git a/main/gnupg/gnupg-scdaemon.pre-install > > b/main/gnupg/gnupg-scdaemon.pre-install > > new file mode 100644 > > index 0000000000..8d8262ceea > > --- /dev/null > > +++ b/main/gnupg/gnupg-scdaemon.pre-install > > @@ -0,0 +1,2 @@ > > +#!/bin/sh > > +addgroup -S gnupg 2> /dev/null > > -- > > 2.17.0 > > > > > > > > --- > > Unsubscribe: alpine-aports+unsubscribe@lists.alpinelinux.org > > Help: alpine-aports+help@lists.alpinelinux.org > > --- > > > > =20 --MP_/sgL8Qk8qJJVm8zVE/9jxP2Q Content-Type: text/x-patch Content-Transfer-Encoding: quoted-printable Content-Disposition: attachment; filename=0001-main-gnupg-Enabled-smartcard-support-as-subpkg.patch =46rom 3d17767837f7a9643adaf70f62c9933bfdc20c4d Mon Sep 17 00:00:00 2001 From: Marian Buschsieweke Date: Mon, 4 Jun 2018 09:39:01 +0200 Subject: [PATCH] main/gnupg: Enabled smartcard support as subpkg - Added gnupg-scdaemon as subpackage - Enabled internal CCID driver (support for Gnuk, NitroKey, YubiKey, ...) - Added 60-scdaemon.rules udev rules to provide access to group gnupg - Added pre-install for subpackage to create group gnupg This feature was requested here: https://bugs.alpinelinux.org/issues/8621 --- main/gnupg/60-scdaemon.rules | 63 +++++++++++++++++++++++++++ main/gnupg/APKBUILD | 29 +++++++++--- main/gnupg/gnupg-scdaemon.pre-install | 2 + 3 files changed, 88 insertions(+), 6 deletions(-) create mode 100644 main/gnupg/60-scdaemon.rules create mode 100644 main/gnupg/gnupg-scdaemon.pre-install diff --git a/main/gnupg/60-scdaemon.rules b/main/gnupg/60-scdaemon.rules new file mode 100644 index 0000000000..55ca5c1663 --- /dev/null +++ b/main/gnupg/60-scdaemon.rules @@ -0,0 +1,63 @@ +# do not edit this file, it will be overwritten on update + +SUBSYSTEM!=3D"usb", GOTO=3D"gnupg_rules_end" +ACTION!=3D"add", GOTO=3D"gnupg_rules_end" + +# USB SmartCard Readers +## Cherry GmbH (XX33, ST2000) +ATTR{idVendor}=3D=3D"046a", ATTR{idProduct}=3D=3D"0005", ENV{ID_SMARTCARD_= READER}=3D"1", ENV{ID_SMARTCARD_READER_DRIVER}=3D"gnupg", GROUP+=3D"gnupg" +ATTR{idVendor}=3D=3D"046a", ATTR{idProduct}=3D=3D"0010", ENV{ID_SMARTCARD_= READER}=3D"1", ENV{ID_SMARTCARD_READER_DRIVER}=3D"gnupg", GROUP+=3D"gnupg" +ATTR{idVendor}=3D=3D"046a", ATTR{idProduct}=3D=3D"003e", ENV{ID_SMARTCARD_= READER}=3D"1", ENV{ID_SMARTCARD_READER_DRIVER}=3D"gnupg", GROUP+=3D"gnupg" +## SCM Microsystems, Inc (SCR331-DI, SCR335, SCR3320, SCR331, SCR3310 and = SPR532) +ATTR{idVendor}=3D=3D"04e6", ATTR{idProduct}=3D=3D"5111", ENV{ID_SMARTCARD_= READER}=3D"1", ENV{ID_SMARTCARD_READER_DRIVER}=3D"gnupg", GROUP+=3D"gnupg" +ATTR{idVendor}=3D=3D"04e6", ATTR{idProduct}=3D=3D"5115", ENV{ID_SMARTCARD_= READER}=3D"1", ENV{ID_SMARTCARD_READER_DRIVER}=3D"gnupg", GROUP+=3D"gnupg" +ATTR{idVendor}=3D=3D"04e6", ATTR{idProduct}=3D=3D"5116", ENV{ID_SMARTCARD_= READER}=3D"1", ENV{ID_SMARTCARD_READER_DRIVER}=3D"gnupg", GROUP+=3D"gnupg" +ATTR{idVendor}=3D=3D"04e6", ATTR{idProduct}=3D=3D"5117", ENV{ID_SMARTCARD_= READER}=3D"1", ENV{ID_SMARTCARD_READER_DRIVER}=3D"gnupg", GROUP+=3D"gnupg" +ATTR{idVendor}=3D=3D"04e6", ATTR{idProduct}=3D=3D"e001", ENV{ID_SMARTCARD_= READER}=3D"1", ENV{ID_SMARTCARD_READER_DRIVER}=3D"gnupg", GROUP+=3D"gnupg" +ATTR{idVendor}=3D=3D"04e6", ATTR{idProduct}=3D=3D"e003", ENV{ID_SMARTCARD_= READER}=3D"1", ENV{ID_SMARTCARD_READER_DRIVER}=3D"gnupg", GROUP+=3D"gnupg" +## Omnikey AG (CardMan 3821, CardMan 6121) +ATTR{idVendor}=3D=3D"076b", ATTR{idProduct}=3D=3D"3821", ENV{ID_SMARTCARD_= READER}=3D"1", ENV{ID_SMARTCARD_READER_DRIVER}=3D"gnupg", GROUP+=3D"gnupg" +ATTR{idVendor}=3D=3D"076b", ATTR{idProduct}=3D=3D"6622", ENV{ID_SMARTCARD_= READER}=3D"1", ENV{ID_SMARTCARD_READER_DRIVER}=3D"gnupg", GROUP+=3D"gnupg" +## Gemalto +ATTR{idVendor}=3D=3D"08e6", ATTR{idProduct}=3D=3D"3437", ENV{ID_SMARTCARD_= READER}=3D"1", ENV{ID_SMARTCARD_READER_DRIVER}=3D"gnupg", GROUP+=3D"gnupg" +ATTR{idVendor}=3D=3D"08e6", ATTR{idProduct}=3D=3D"3438", ENV{ID_SMARTCARD_= READER}=3D"1", ENV{ID_SMARTCARD_READER_DRIVER}=3D"gnupg", GROUP+=3D"gnupg" +ATTR{idVendor}=3D=3D"08e6", ATTR{idProduct}=3D=3D"3478", ENV{ID_SMARTCARD_= READER}=3D"1", ENV{ID_SMARTCARD_READER_DRIVER}=3D"gnupg", GROUP+=3D"gnupg" +ATTR{idVendor}=3D=3D"08e6", ATTR{idProduct}=3D=3D"34c2", ENV{ID_SMARTCARD_= READER}=3D"1", ENV{ID_SMARTCARD_READER_DRIVER}=3D"gnupg", GROUP+=3D"gnupg" +ATTR{idVendor}=3D=3D"08e6", ATTR{idProduct}=3D=3D"34ec", ENV{ID_SMARTCARD_= READER}=3D"1", ENV{ID_SMARTCARD_READER_DRIVER}=3D"gnupg", GROUP+=3D"gnupg" +## Reiner (SCT cyberJack) +ATTR{idVendor}=3D=3D"0c4b", ATTR{idProduct}=3D=3D"0500", ENV{ID_SMARTCARD_= READER}=3D"1", ENV{ID_SMARTCARD_READER_DRIVER}=3D"gnupg", GROUP+=3D"gnupg" +## Kobil (KAAN) +ATTR{idVendor}=3D=3D"0d46", ATTR{idProduct}=3D=3D"2012", ENV{ID_SMARTCARD_= READER}=3D"1", ENV{ID_SMARTCARD_READER_DRIVER}=3D"gnupg", GROUP+=3D"gnupg" +## VASCO (DIGIPASS 920) +ATTR{idVendor}=3D=3D"1a44", ATTR{idProduct}=3D=3D"0920", ENV{ID_SMARTCARD_= READER}=3D"1", ENV{ID_SMARTCARD_READER_DRIVER}=3D"gnupg", GROUP+=3D"gnupg" +## Crypto Stick +ATTR{idVendor}=3D=3D"20a0", ATTR{idProduct}=3D=3D"4107", ENV{ID_SMARTCARD_= READER}=3D"1", ENV{ID_SMARTCARD_READER_DRIVER}=3D"gnupg", GROUP+=3D"gnupg" +## Nitrokey +ATTR{idVendor}=3D=3D"20a0", ATTR{idProduct}=3D=3D"4108", ENV{ID_SMARTCARD_= READER}=3D"1", ENV{ID_SMARTCARD_READER_DRIVER}=3D"gnupg", GROUP+=3D"gnupg" +ATTR{idVendor}=3D=3D"20a0", ATTR{idProduct}=3D=3D"4109", ENV{ID_SMARTCARD_= READER}=3D"1", ENV{ID_SMARTCARD_READER_DRIVER}=3D"gnupg", GROUP+=3D"gnupg" +ATTR{idVendor}=3D=3D"20a0", ATTR{idProduct}=3D=3D"4211", ENV{ID_SMARTCARD_= READER}=3D"1", ENV{ID_SMARTCARD_READER_DRIVER}=3D"gnupg", GROUP+=3D"gnupg" +## Gnuk Token +ATTR{idVendor}=3D=3D"234b", ATTR{idProduct}=3D=3D"0000", ENV{ID_SMARTCARD_= READER}=3D"1", ENV{ID_SMARTCARD_READER_DRIVER}=3D"gnupg", GROUP+=3D"gnupg" +## Alcor Micro Corp cardreader (in ThinkPad X250) +ATTR{idVendor}=3D=3D"058f", ATTR{idProduct}=3D=3D"9540", ENV{ID_SMARTCARD_= READER}=3D"1", ENV{ID_SMARTCARD_READER_DRIVER}=3D"gnupg", GROUP+=3D"gnupg" +## Fujitsu Siemens +ATTR{idVendor}=3D=3D"0bf8", ATTR{idProduct}=3D=3D"1006", ENV{ID_SMARTCARD_= READER}=3D"1", ENV{ID_SMARTCARD_READER_DRIVER}=3D"gnupg", GROUP+=3D"gnupg" +## Yubico +# Yubikey NEO OTP+CCID +ATTRS{idVendor}=3D=3D"1050", ATTRS{idProduct}=3D=3D"0111", ENV{ID_SMARTCAR= D_READER}=3D"1", ENV{ID_SMARTCARD_READER_DRIVER}=3D"gnupg", GROUP+=3D"gnupg" +# Yubikey NEO CCID +ATTRS{idVendor}=3D=3D"1050", ATTRS{idProduct}=3D=3D"0112", ENV{ID_SMARTCAR= D_READER}=3D"1", ENV{ID_SMARTCARD_READER_DRIVER}=3D"gnupg", GROUP+=3D"gnupg" +# Yubikey NEO U2F+CCID +ATTRS{idVendor}=3D=3D"1050", ATTRS{idProduct}=3D=3D"0115", ENV{ID_SMARTCAR= D_READER}=3D"1", ENV{ID_SMARTCARD_READER_DRIVER}=3D"gnupg", GROUP+=3D"gnupg" +# Yubikey NEO OTP+U2F+CCID +ATTRS{idVendor}=3D=3D"1050", ATTRS{idProduct}=3D=3D"0116", ENV{ID_SMARTCAR= D_READER}=3D"1", ENV{ID_SMARTCARD_READER_DRIVER}=3D"gnupg", GROUP+=3D"gnupg" +# Yubikey 4 CCID +ATTRS{idVendor}=3D=3D"1050", ATTRS{idProduct}=3D=3D"0404", ENV{ID_SMARTCAR= D_READER}=3D"1", ENV{ID_SMARTCARD_READER_DRIVER}=3D"gnupg", GROUP+=3D"gnupg" +# Yubikey 4 OTP+CCID +ATTRS{idVendor}=3D=3D"1050", ATTRS{idProduct}=3D=3D"0405", ENV{ID_SMARTCAR= D_READER}=3D"1", ENV{ID_SMARTCARD_READER_DRIVER}=3D"gnupg", GROUP+=3D"gnupg" +# Yubikey 4 U2F+CCID +ATTRS{idVendor}=3D=3D"1050", ATTRS{idProduct}=3D=3D"0406", ENV{ID_SMARTCAR= D_READER}=3D"1", ENV{ID_SMARTCARD_READER_DRIVER}=3D"gnupg", GROUP+=3D"gnupg" +# Yubikey 4 OTP+U2F+CCID +ATTRS{idVendor}=3D=3D"1050", ATTRS{idProduct}=3D=3D"0407", ENV{ID_SMARTCAR= D_READER}=3D"1", ENV{ID_SMARTCARD_READER_DRIVER}=3D"gnupg", GROUP+=3D"gnupg" + +LABEL=3D"gnupg_rules_end" diff --git a/main/gnupg/APKBUILD b/main/gnupg/APKBUILD index b2a7978e62..1a4d58fe99 100644 --- a/main/gnupg/APKBUILD +++ b/main/gnupg/APKBUILD @@ -3,7 +3,7 @@ pkgname=3Dgnupg pkgver=3D2.2.6 _ver=3D${pkgver/_beta/-beta} -pkgrel=3D0 +pkgrel=3D1 pkgdesc=3D"GNU Privacy Guard 2 - a PGP replacement tool" url=3D"https://www.gnupg.org/" arch=3D"all" @@ -12,11 +12,13 @@ options=3D"" depends=3D"pinentry" makedepends=3D"gnutls-dev libksba-dev libgcrypt-dev libgpg-error-dev npth-dev zlib-dev libassuan-dev openldap-dev bzip2-dev - sqlite-dev" -subpackages=3D"$pkgname-doc" + sqlite-dev libusb-dev" +subpackages=3D"$pkgname-doc $pkgname-scdaemon" source=3D"https://gnupg.org/ftp/gcrypt/$pkgname/$pkgname-$_ver.tar.bz2 0001-Include-sys-select.h-for-FD_SETSIZE.patch - fix-i18n.patch" + fix-i18n.patch + 60-scdaemon.rules" +install=3D"$pkgname-scdaemon.pre-install" builddir=3D"$srcdir"/$pkgname-$_ver =20 build() { @@ -31,7 +33,9 @@ build() { --localstatedir=3D/var \ --disable-nls \ --enable-bzip2 \ - --enable-tofu + --enable-tofu \ + --enable-scdaemon \ + --enable-ccid-driver make } =20 @@ -49,6 +53,19 @@ package() { ln -s gpgv "$pkgdir"/usr/bin/gpgv2 } =20 +scdaemon() { + pkgdesc=3D"GNU Privacy Guard 2 - smart card support" + depends=3D"gnupg" + + mkdir -p "${subpkgdir}/usr/libexec" + mkdir -p "${subpkgdir}/lib/udev/rules.d" + + install -Dm644 -t "${subpkgdir}/lib/udev/rules.d/" \ + "${srcdir}/60-scdaemon.rules" + mv "${pkgdir}/usr/libexec/scdaemon" "${subpkgdir}/usr/libexec/" +} + sha512sums=3D"ad0861c86c1886f701ae05e7cd439449cf0684a7bf461ca2b729c5e93833= ee36f8438cd4d7f73a4c60e57060f3d8f4890a809b2bbc31b083f9f61d2f66ccacc4 gnupg= -2.2.6.tar.bz2 c6cc4595081c5b025913fa3ebecf0dff87a84f3c669e3fef106e4fa040f1d4314ee52dd4c0= e0002b213034fb0810221cfdd0033eae5349b6e3978f05d08bcac7 0001-Include-sys-se= lect.h-for-FD_SETSIZE.patch -b19a44dacf061dd02b439ab8bd820e3c721aab77168f705f5ce65661f26527b03ea88eec16= d78486a633c474120589ec8736692ebff57ab9b95f52f57190ba6b fix-i18n.patch" +b19a44dacf061dd02b439ab8bd820e3c721aab77168f705f5ce65661f26527b03ea88eec16= d78486a633c474120589ec8736692ebff57ab9b95f52f57190ba6b fix-i18n.patch +4bfb9742279c2d1c872d63cd4bcb01f6a2a13d94618eff954d3a37451fa870a9bb29687330= 854ee47e8876d6e60dc81cb2569c3931beaefacda33db23c464402 60-scdaemon.rules" diff --git a/main/gnupg/gnupg-scdaemon.pre-install b/main/gnupg/gnupg-scdae= mon.pre-install new file mode 100644 index 0000000000..8d8262ceea --- /dev/null +++ b/main/gnupg/gnupg-scdaemon.pre-install @@ -0,0 +1,2 @@ +#!/bin/sh +addgroup -S gnupg 2> /dev/null --=20 2.17.1 --MP_/sgL8Qk8qJJVm8zVE/9jxP2Q-- --Sig_/8iY5T0JCxs.zwWn+vjIkTLe Content-Type: application/pgp-signature Content-Description: OpenPGP digital signature -----BEGIN PGP SIGNATURE----- iHUEARYIAB0WIQTCygBuMypPDEZ59jZh9kxlmbFTnwUCWxTtEQAKCRBh9kxlmbFT n3TfAP4hJZB5ECC2hzhPUfSVcTaPGexqieY5iH9X18lxYZSKgQD+ON612FjLqTsH vlnl+Wjcmi5tTguy2NETeiQu+LToLAQ= =TAi0 -----END PGP SIGNATURE----- --Sig_/8iY5T0JCxs.zwWn+vjIkTLe-- --- Unsubscribe: alpine-aports+unsubscribe@lists.alpinelinux.org Help: alpine-aports+help@lists.alpinelinux.org ---