* [gentoo-commits] repo/gentoo:master commit in: sys-apps/pcsc-lite/files/, sys-apps/pcsc-lite/
@ 2019-10-10 16:04 Craig Andrews
0 siblings, 0 replies; 4+ messages in thread
From: Craig Andrews @ 2019-10-10 16:04 UTC (permalink / raw
To: gentoo-commits
commit: 1123ad37dafee0cc747fc8e55b18d7f143e08957
Author: Michael Weiser <michael.weiser <AT> gmx <DOT> de>
AuthorDate: Thu Oct 10 15:42:43 2019 +0000
Commit: Craig Andrews <candrews <AT> gentoo <DOT> org>
CommitDate: Thu Oct 10 16:04:49 2019 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1123ad37
sys-apps/pcsc-lite: Provide systemd-aware udev rule
Provide a systemd-aware udev rule. Move OpenRC logic to helper script
which behaves as a no-op on non-OpenRC systems.
Closes: https://bugs.gentoo.org/554118
Signed-off-by: Michael Weiser <michael.weiser <AT> gmx.de>
Package-Manager: Portage-2.3.76, Repoman-2.3.17
Signed-off-by: Craig Andrews <candrews <AT> gentoo.org>
sys-apps/pcsc-lite/files/99-pcscd-hotplug-r1.rules | 6 ++
sys-apps/pcsc-lite/files/pcscd-udev | 14 +++
sys-apps/pcsc-lite/pcsc-lite-1.8.25-r1.ebuild | 107 +++++++++++++++++++++
3 files changed, 127 insertions(+)
diff --git a/sys-apps/pcsc-lite/files/99-pcscd-hotplug-r1.rules b/sys-apps/pcsc-lite/files/99-pcscd-hotplug-r1.rules
new file mode 100644
index 00000000000..fc612d5e25f
--- /dev/null
+++ b/sys-apps/pcsc-lite/files/99-pcscd-hotplug-r1.rules
@@ -0,0 +1,6 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+# We add this here so that it runs after ccid's and ifd-gempc's rules;
+# if we just added a pcscd-owned device, we hotplug the pcscd service.
+ACTION=="add", ENV{PCSCD}=="1", GROUP="pcscd", TAG+="systemd", ENV{SYSTEMD_WANTS}+="pcscd.service", RUN+="pcscd.sh"
diff --git a/sys-apps/pcsc-lite/files/pcscd-udev b/sys-apps/pcsc-lite/files/pcscd-udev
new file mode 100644
index 00000000000..e6d6c734888
--- /dev/null
+++ b/sys-apps/pcsc-lite/files/pcscd-udev
@@ -0,0 +1,14 @@
+#!/bin/sh
+#
+# pcscd.sh: udev external RUN script
+#
+# based on netifrc net.sh helper
+# Copyright 2007 Roy Marples <uberlord@gentoo.org>
+# Distributed under the terms of the GNU General Public License v2
+
+# make sure openrc is managing services
+if [ ! -d /run/openrc ]; then
+ exit 0
+fi
+
+IN_HOTPLUG=1 /etc/init.d/pcscd --quiet start
diff --git a/sys-apps/pcsc-lite/pcsc-lite-1.8.25-r1.ebuild b/sys-apps/pcsc-lite/pcsc-lite-1.8.25-r1.ebuild
new file mode 100644
index 00000000000..87907e6517d
--- /dev/null
+++ b/sys-apps/pcsc-lite/pcsc-lite-1.8.25-r1.ebuild
@@ -0,0 +1,107 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+PYTHON_COMPAT=( python{2_7,3_{5,6,7}} )
+
+inherit python-single-r1 systemd udev user multilib-minimal
+
+DESCRIPTION="PC/SC Architecture smartcard middleware library"
+HOMEPAGE="https://pcsclite.apdu.fr/"
+
+SRC_URI="https://pcsclite.apdu.fr/files/${P}.tar.bz2"
+
+# GPL-2 is there for the init script; everything else comes from
+# upstream.
+LICENSE="BSD ISC MIT GPL-3+ GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+
+# This is called libusb so that it doesn't fool people in thinking that
+# it is _required_ for USB support. Otherwise they'll disable udev and
+# that's going to be worse.
+IUSE="python libusb policykit selinux systemd +udev"
+
+REQUIRED_USE="^^ ( udev libusb )
+ python? ( ${PYTHON_REQUIRED_USE} )"
+
+# No dependencies need the MULTILIB_DEPS because the libraries are actually
+# standalone, the deps are only needed for the daemon itself.
+DEPEND="libusb? ( virtual/libusb:1 )
+ udev? ( virtual/udev )
+ policykit? ( >=sys-auth/polkit-0.111 )
+ python? ( ${PYTHON_DEPS} )"
+RDEPEND="${DEPEND}
+ !<app-crypt/ccid-1.4.1-r1
+ !<sys-apps/baselayout-2
+ !<sys-apps/openrc-0.11.8
+ selinux? ( sec-policy/selinux-pcscd )"
+BDEPEND="virtual/pkgconfig"
+
+PATCHES=(
+ "${FILESDIR}"/${PN}-1.8.11-polkit-pcscd.patch
+)
+
+DOCS=( AUTHORS HELP README SECURITY ChangeLog )
+
+pkg_setup() {
+ use python && python-single-r1_pkg_setup
+ enewgroup openct # make sure it exists
+ enewgroup pcscd
+ enewuser pcscd -1 -1 /run/pcscd pcscd,openct
+}
+
+multilib_src_configure() {
+ ECONF_SOURCE="${S}" econf \
+ --disable-maintainer-mode \
+ --enable-usbdropdir="${EPREFIX}/usr/$(get_libdir)/readers/usb" \
+ --enable-ipcdir=/run/pcscd \
+ --with-systemdsystemunitdir="$(systemd_get_systemunitdir)" \
+ $(multilib_native_use_enable systemd libsystemd) \
+ $(multilib_native_use_enable udev libudev) \
+ $(multilib_native_use_enable libusb) \
+ $(multilib_native_use_enable policykit polkit)
+}
+
+multilib_src_install_all() {
+ einstalldocs
+
+ newinitd "${FILESDIR}"/pcscd-init.7 pcscd
+
+ if use udev; then
+ exeinto "$(get_udevdir)"
+ newexe "${FILESDIR}"/pcscd-udev pcscd.sh
+
+ insinto "$(get_udevdir)"/rules.d
+ newins "${FILESDIR}"/99-pcscd-hotplug-r1.rules 99-pcscd-hotplug.rules
+ fi
+
+ for f in "${ED}/usr/bin/pcsc-spy"; do
+ if use python; then
+ python_fix_shebang "${f}"
+ else
+ rm "${f}" || die
+ fi
+ done
+}
+
+pkg_postinst() {
+ elog "Starting from version 1.6.5, pcsc-lite will start as user nobody in"
+ elog "the pcscd group, to avoid running as root."
+ elog ""
+ elog "This also means you need the newest drivers available so that the"
+ elog "devices get the proper owner."
+ elog ""
+ elog "Furthermore, a conf.d file is no longer installed by default, as"
+ elog "the default configuration does not require one. If you need to"
+ elog "pass further options to pcscd, create a file and set the"
+ elog "EXTRA_OPTS variable."
+ elog ""
+ if use udev; then
+ elog "Hotplug support is provided by udev rules."
+ elog "When using OpenRC you additionally need to tell it to hotplug"
+ elog "pcscd by setting this variable in /etc/rc.conf:"
+ elog ""
+ elog " rc_hotplug=\"pcscd\""
+ fi
+}
^ permalink raw reply related [flat|nested] 4+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: sys-apps/pcsc-lite/files/, sys-apps/pcsc-lite/
@ 2022-06-02 3:53 Sam James
0 siblings, 0 replies; 4+ messages in thread
From: Sam James @ 2022-06-02 3:53 UTC (permalink / raw
To: gentoo-commits
commit: 490ec56d3c8446df1752fbe0a661cfdd4470b316
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Thu Jun 2 03:53:03 2022 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Thu Jun 2 03:53:03 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=490ec56d
sys-apps/pcsc-lite: drop 1.9.0, 1.9.1, 1.9.4, 1.9.5
Signed-off-by: Sam James <sam <AT> gentoo.org>
sys-apps/pcsc-lite/Manifest | 4 -
sys-apps/pcsc-lite/files/99-pcscd-hotplug.rules | 6 --
.../files/pcsc-lite-1.9.5-no-libusb-udev.patch | 29 ------
sys-apps/pcsc-lite/pcsc-lite-1.9.0.ebuild | 104 --------------------
sys-apps/pcsc-lite/pcsc-lite-1.9.1.ebuild | 104 --------------------
sys-apps/pcsc-lite/pcsc-lite-1.9.4.ebuild | 104 --------------------
sys-apps/pcsc-lite/pcsc-lite-1.9.5.ebuild | 105 ---------------------
7 files changed, 456 deletions(-)
diff --git a/sys-apps/pcsc-lite/Manifest b/sys-apps/pcsc-lite/Manifest
index 54241ee2c3af..f04c8fba3b43 100644
--- a/sys-apps/pcsc-lite/Manifest
+++ b/sys-apps/pcsc-lite/Manifest
@@ -1,5 +1 @@
-DIST pcsc-lite-1.9.0.tar.bz2 755963 BLAKE2B 30d027ac61aba1f57224c88ffc4ec8568dcc2747f3f7e24be07e7ce52bd23ad7a71b6a2f78d912f827a4c02a22c13ff16bc1450c02bafd92bc87ac0e34a2bbcb SHA512 35c85b15ab54c14403a080d6671b3d986910372651d46a5477111172d42c6d2cf58f4a3ce95427e7a84f6b4d3bee30ea57bf69b855f753160a3c6e72f93e34f3
-DIST pcsc-lite-1.9.1.tar.bz2 763525 BLAKE2B b85364f5e2a92450b020bfc28439774c6a6ffb9016ea4072d1925fbc1cef76cd370b298c0b414ba322205d859018308bd7101ef89c5b6f96b97e4f223035ac35 SHA512 4f59ea6acb5b258092018f10609987e12b8e601049e6ffed4b4b82abd3c4b35c38a60e1cda28fdc884202e694d1bc3a3b5d930c5b1e9c1b9c309bd17ef463e63
-DIST pcsc-lite-1.9.4.tar.bz2 776581 BLAKE2B fb870fab3bfc7ae372a62c678a0321445f14c36c84c4fff8b7bf4e17f14b64575128fdcf7c8642cd03cb3586d6846845196a93d02b037090f49b88bbee896caa SHA512 d812fd4c6e906f277a73863c4170d96c30245c5fd0a8329e78923533320d71c6591b3f282695bcd69823c8cc381d8d438736bb7ab2262ab24c9d89434368659e
-DIST pcsc-lite-1.9.5.tar.bz2 775736 BLAKE2B 2e42fa3864ec68725f90338ae981c758328c3129278739bb7bd0e8d62f0cd984dfe2bc0268226614110833db7c0ba48f7c2cd3808a505d836e95cd9709938170 SHA512 0315c2cf97cc9da0f5faf115f24e523b5a1746cea250a4fe6c4d5d7b2fbfc7c3ea0f068611072ca84866c672eb679e8067101437573148ccd1ac5ad26b18cd78
DIST pcsc-lite-1.9.7.tar.bz2 784685 BLAKE2B 74848b06ce9e497287cc4a8f307a194d766091a35af46300bd1dcdbf730c3f86f14928ff2e576ac83c07a37234b866e0b2cb3afd3d963b8570051c5c4880f4b9 SHA512 0c7f6c0efcfd6f6996e9e751dd0dd9969590b19144099aa6003c089d95d5ffdfddf3a50b82ece31e0f22e8213317dd827e5fbb4cdde614818b81a80c434788dd
diff --git a/sys-apps/pcsc-lite/files/99-pcscd-hotplug.rules b/sys-apps/pcsc-lite/files/99-pcscd-hotplug.rules
deleted file mode 100644
index e6ee464344ff..000000000000
--- a/sys-apps/pcsc-lite/files/99-pcscd-hotplug.rules
+++ /dev/null
@@ -1,6 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-# We add this here so that it runs after ccid's and ifd-gempc's rules;
-# if we just added a pcscd-owned device, we hotplug the pcscd service.
-ACTION=="add", ENV{PCSCD}=="1", GROUP="pcscd", RUN+="/bin/env IN_HOTPLUG=1 /etc/init.d/pcscd --quiet start"
diff --git a/sys-apps/pcsc-lite/files/pcsc-lite-1.9.5-no-libusb-udev.patch b/sys-apps/pcsc-lite/files/pcsc-lite-1.9.5-no-libusb-udev.patch
deleted file mode 100644
index 2f4793b03fb4..000000000000
--- a/sys-apps/pcsc-lite/files/pcsc-lite-1.9.5-no-libusb-udev.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-https://github.com/LudovicRousseau/PCSC/commit/a4bdfd2eb6e908c8306fe421137a83573ba05d8c
-https://bugs.gentoo.org/832593
-
-From: Fabrice Fontaine <fontaine.fabrice@gmail.com>
-Date: Tue, 14 Dec 2021 08:20:59 +0100
-Subject: [PATCH] src/hotplug_generic.c: fix build without lib{udev,usb}
-
-Fix the following build failure without lib{udev,usb} raised since
-version 1.9.5 and
-https://github.com/LudovicRousseau/PCSC/commit/6f8f170db3c88c59a5ddb5ae5319b921a901a6aa:
-
-/home/giuliobenetti/autobuild/run/instance-2/output-1/host/lib/gcc/arm-buildroot-linux-gnueabihf/11.2.0/../../../../arm-buildroot-linux-gnueabihf/bin/ld: pcscd-pcscdaemon.o: in function `signal_thread':
-pcscdaemon.c:(.text+0x444): undefined reference to `HPReCheckSerialReaders'
-
-Fixes:
- - http://autobuild.buildroot.org/results/6cf323229f32967aa554418410dc94b7094d09af
-
-Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
---- a/src/hotplug_generic.c
-+++ b/src/hotplug_generic.c
-@@ -48,7 +48,7 @@ THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- #define FALSE 0
- #endif
-
--#if !defined(__APPLE__) && !defined(HAVE_LIBUSB) && !defined(__linux__) && !defined(HAVE_LIBUDEV)
-+#if !defined(__APPLE__) && !defined(HAVE_LIBUSB) && !defined(HAVE_LIBUDEV)
-
- LONG HPSearchHotPluggables(void)
- {
diff --git a/sys-apps/pcsc-lite/pcsc-lite-1.9.0.ebuild b/sys-apps/pcsc-lite/pcsc-lite-1.9.0.ebuild
deleted file mode 100644
index 5d6b8904ec10..000000000000
--- a/sys-apps/pcsc-lite/pcsc-lite-1.9.0.ebuild
+++ /dev/null
@@ -1,104 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python{3_7,3_8,3_9} )
-
-inherit python-single-r1 systemd udev multilib-minimal
-
-DESCRIPTION="PC/SC Architecture smartcard middleware library"
-HOMEPAGE="https://pcsclite.apdu.fr https://github.com/LudovicRousseau/PCSC"
-
-SRC_URI="https://pcsclite.apdu.fr/files/${P}.tar.bz2"
-
-# GPL-2 is there for the init script; everything else comes from
-# upstream.
-LICENSE="BSD ISC MIT GPL-3+ GPL-2"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
-
-# This is called libusb so that it doesn't fool people in thinking that
-# it is _required_ for USB support. Otherwise they'll disable udev and
-# that's going to be worse.
-IUSE="doc embedded libusb policykit selinux systemd +udev"
-
-REQUIRED_USE="^^ ( udev libusb ) ${PYTHON_REQUIRED_USE}"
-
-# No dependencies need the MULTILIB_DEPS because the libraries are actually
-# standalone, the deps are only needed for the daemon itself.
-DEPEND="libusb? ( virtual/libusb:1 )
- udev? ( virtual/libudev:= )
- policykit? ( >=sys-auth/polkit-0.111 )
- acct-group/openct
- acct-group/pcscd
- acct-user/pcscd
- ${PYTHON_DEPS}"
-
-RDEPEND="${DEPEND}
- selinux? ( sec-policy/selinux-pcscd )"
-
-BDEPEND="virtual/pkgconfig"
-
-PATCHES=(
- "${FILESDIR}"/${PN}-1.8.11-polkit-pcscd.patch
-)
-
-DOCS=( AUTHORS HELP README SECURITY ChangeLog )
-
-pkg_setup() {
- python-single-r1_pkg_setup
-}
-
-multilib_src_configure() {
- ECONF_SOURCE="${S}" econf \
- --disable-maintainer-mode \
- --enable-usbdropdir="${EPREFIX}/usr/$(get_libdir)/readers/usb" \
- --enable-ipcdir=/run/pcscd \
- --with-systemdsystemunitdir="$(systemd_get_systemunitdir)" \
- $(use_enable doc documentation) \
- $(multilib_native_use_enable embedded) \
- $(multilib_native_use_enable systemd libsystemd) \
- $(multilib_native_use_enable udev libudev) \
- $(multilib_native_use_enable libusb) \
- $(multilib_native_use_enable policykit polkit)
-}
-
-multilib_src_install_all() {
- einstalldocs
-
- newinitd "${FILESDIR}"/pcscd-init.7 pcscd
-
- if use udev; then
- exeinto "$(get_udevdir)"
- newexe "${FILESDIR}"/pcscd-udev pcscd.sh
-
- insinto "$(get_udevdir)"/rules.d
- newins "${FILESDIR}"/99-pcscd-hotplug-r1.rules 99-pcscd-hotplug.rules
- fi
-
- python_fix_shebang "${ED}"/usr/bin/pcsc-spy
-
- find "${ED}" -name '*.la' -delete || die
-}
-
-pkg_postinst() {
- elog "Starting from version 1.6.5, pcsc-lite will start as user nobody in"
- elog "the pcscd group, to avoid running as root."
- elog ""
- elog "This also means you need the newest drivers available so that the"
- elog "devices get the proper owner."
- elog ""
- elog "Furthermore, a conf.d file is no longer installed by default, as"
- elog "the default configuration does not require one. If you need to"
- elog "pass further options to pcscd, create a file and set the"
- elog "EXTRA_OPTS variable."
- elog ""
- if use udev; then
- elog "Hotplug support is provided by udev rules."
- elog "When using OpenRC you additionally need to tell it to hotplug"
- elog "pcscd by setting this variable in /etc/rc.conf:"
- elog ""
- elog " rc_hotplug=\"pcscd\""
- fi
-}
diff --git a/sys-apps/pcsc-lite/pcsc-lite-1.9.1.ebuild b/sys-apps/pcsc-lite/pcsc-lite-1.9.1.ebuild
deleted file mode 100644
index 5ad5f5d7b9f6..000000000000
--- a/sys-apps/pcsc-lite/pcsc-lite-1.9.1.ebuild
+++ /dev/null
@@ -1,104 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python{3_7,3_8,3_9} )
-
-inherit python-single-r1 systemd udev multilib-minimal
-
-DESCRIPTION="PC/SC Architecture smartcard middleware library"
-HOMEPAGE="https://pcsclite.apdu.fr https://github.com/LudovicRousseau/PCSC"
-
-SRC_URI="https://pcsclite.apdu.fr/files/${P}.tar.bz2"
-
-# GPL-2 is there for the init script; everything else comes from
-# upstream.
-LICENSE="BSD ISC MIT GPL-3+ GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
-
-# This is called libusb so that it doesn't fool people in thinking that
-# it is _required_ for USB support. Otherwise they'll disable udev and
-# that's going to be worse.
-IUSE="doc embedded libusb policykit selinux systemd +udev"
-
-REQUIRED_USE="^^ ( udev libusb ) ${PYTHON_REQUIRED_USE}"
-
-# No dependencies need the MULTILIB_DEPS because the libraries are actually
-# standalone, the deps are only needed for the daemon itself.
-DEPEND="libusb? ( virtual/libusb:1 )
- udev? ( virtual/libudev:= )
- policykit? ( >=sys-auth/polkit-0.111 )
- acct-group/openct
- acct-group/pcscd
- acct-user/pcscd
- ${PYTHON_DEPS}"
-
-RDEPEND="${DEPEND}
- selinux? ( sec-policy/selinux-pcscd )"
-
-BDEPEND="virtual/pkgconfig"
-
-PATCHES=(
- "${FILESDIR}"/${PN}-1.8.11-polkit-pcscd.patch
-)
-
-DOCS=( AUTHORS HELP README SECURITY ChangeLog )
-
-pkg_setup() {
- python-single-r1_pkg_setup
-}
-
-multilib_src_configure() {
- ECONF_SOURCE="${S}" econf \
- --disable-maintainer-mode \
- --enable-usbdropdir="${EPREFIX}/usr/$(get_libdir)/readers/usb" \
- --enable-ipcdir=/run/pcscd \
- --with-systemdsystemunitdir="$(systemd_get_systemunitdir)" \
- $(use_enable doc documentation) \
- $(multilib_native_use_enable embedded) \
- $(multilib_native_use_enable systemd libsystemd) \
- $(multilib_native_use_enable udev libudev) \
- $(multilib_native_use_enable libusb) \
- $(multilib_native_use_enable policykit polkit)
-}
-
-multilib_src_install_all() {
- einstalldocs
-
- newinitd "${FILESDIR}"/pcscd-init.7 pcscd
-
- if use udev; then
- exeinto "$(get_udevdir)"
- newexe "${FILESDIR}"/pcscd-udev pcscd.sh
-
- insinto "$(get_udevdir)"/rules.d
- newins "${FILESDIR}"/99-pcscd-hotplug-r1.rules 99-pcscd-hotplug.rules
- fi
-
- python_fix_shebang "${ED}"/usr/bin/pcsc-spy
-
- find "${ED}" -name '*.la' -delete || die
-}
-
-pkg_postinst() {
- elog "Starting from version 1.6.5, pcsc-lite will start as user nobody in"
- elog "the pcscd group, to avoid running as root."
- elog ""
- elog "This also means you need the newest drivers available so that the"
- elog "devices get the proper owner."
- elog ""
- elog "Furthermore, a conf.d file is no longer installed by default, as"
- elog "the default configuration does not require one. If you need to"
- elog "pass further options to pcscd, create a file and set the"
- elog "EXTRA_OPTS variable."
- elog ""
- if use udev; then
- elog "Hotplug support is provided by udev rules."
- elog "When using OpenRC you additionally need to tell it to hotplug"
- elog "pcscd by setting this variable in /etc/rc.conf:"
- elog ""
- elog " rc_hotplug=\"pcscd\""
- fi
-}
diff --git a/sys-apps/pcsc-lite/pcsc-lite-1.9.4.ebuild b/sys-apps/pcsc-lite/pcsc-lite-1.9.4.ebuild
deleted file mode 100644
index a282e00b2aa9..000000000000
--- a/sys-apps/pcsc-lite/pcsc-lite-1.9.4.ebuild
+++ /dev/null
@@ -1,104 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python{3_8,3_9,3_10} )
-
-inherit python-single-r1 systemd udev multilib-minimal
-
-DESCRIPTION="PC/SC Architecture smartcard middleware library"
-HOMEPAGE="https://pcsclite.apdu.fr https://github.com/LudovicRousseau/PCSC"
-
-SRC_URI="https://pcsclite.apdu.fr/files/${P}.tar.bz2"
-
-# GPL-2 is there for the init script; everything else comes from
-# upstream.
-LICENSE="BSD ISC MIT GPL-3+ GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
-
-# This is called libusb so that it doesn't fool people in thinking that
-# it is _required_ for USB support. Otherwise they'll disable udev and
-# that's going to be worse.
-IUSE="doc embedded libusb policykit selinux systemd +udev"
-
-REQUIRED_USE="^^ ( udev libusb ) ${PYTHON_REQUIRED_USE}"
-
-# No dependencies need the MULTILIB_DEPS because the libraries are actually
-# standalone, the deps are only needed for the daemon itself.
-DEPEND="libusb? ( virtual/libusb:1 )
- udev? ( virtual/libudev:= )
- policykit? ( >=sys-auth/polkit-0.111 )
- acct-group/openct
- acct-group/pcscd
- acct-user/pcscd
- ${PYTHON_DEPS}"
-
-RDEPEND="${DEPEND}
- selinux? ( sec-policy/selinux-pcscd )"
-
-BDEPEND="virtual/pkgconfig"
-
-PATCHES=(
- "${FILESDIR}"/${PN}-1.8.11-polkit-pcscd.patch
-)
-
-DOCS=( AUTHORS HELP README SECURITY ChangeLog )
-
-pkg_setup() {
- python-single-r1_pkg_setup
-}
-
-multilib_src_configure() {
- ECONF_SOURCE="${S}" econf \
- --disable-maintainer-mode \
- --enable-usbdropdir="${EPREFIX}/usr/$(get_libdir)/readers/usb" \
- --enable-ipcdir=/run/pcscd \
- --with-systemdsystemunitdir="$(systemd_get_systemunitdir)" \
- $(use_enable doc documentation) \
- $(multilib_native_use_enable embedded) \
- $(multilib_native_use_enable systemd libsystemd) \
- $(multilib_native_use_enable udev libudev) \
- $(multilib_native_use_enable libusb) \
- $(multilib_native_use_enable policykit polkit)
-}
-
-multilib_src_install_all() {
- einstalldocs
-
- newinitd "${FILESDIR}"/pcscd-init.7 pcscd
-
- if use udev; then
- exeinto "$(get_udevdir)"
- newexe "${FILESDIR}"/pcscd-udev pcscd.sh
-
- insinto "$(get_udevdir)"/rules.d
- newins "${FILESDIR}"/99-pcscd-hotplug-r1.rules 99-pcscd-hotplug.rules
- fi
-
- python_fix_shebang "${ED}"/usr/bin/pcsc-spy
-
- find "${ED}" -name '*.la' -delete || die
-}
-
-pkg_postinst() {
- elog "Starting from version 1.6.5, pcsc-lite will start as user nobody in"
- elog "the pcscd group, to avoid running as root."
- elog ""
- elog "This also means you need the newest drivers available so that the"
- elog "devices get the proper owner."
- elog ""
- elog "Furthermore, a conf.d file is no longer installed by default, as"
- elog "the default configuration does not require one. If you need to"
- elog "pass further options to pcscd, create a file and set the"
- elog "EXTRA_OPTS variable."
- elog ""
- if use udev; then
- elog "Hotplug support is provided by udev rules."
- elog "When using OpenRC you additionally need to tell it to hotplug"
- elog "pcscd by setting this variable in /etc/rc.conf:"
- elog ""
- elog " rc_hotplug=\"pcscd\""
- fi
-}
diff --git a/sys-apps/pcsc-lite/pcsc-lite-1.9.5.ebuild b/sys-apps/pcsc-lite/pcsc-lite-1.9.5.ebuild
deleted file mode 100644
index 3b34179b63c5..000000000000
--- a/sys-apps/pcsc-lite/pcsc-lite-1.9.5.ebuild
+++ /dev/null
@@ -1,105 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python{3_8,3_9,3_10} )
-
-inherit python-single-r1 systemd udev multilib-minimal
-
-DESCRIPTION="PC/SC Architecture smartcard middleware library"
-HOMEPAGE="https://pcsclite.apdu.fr https://github.com/LudovicRousseau/PCSC"
-
-SRC_URI="https://pcsclite.apdu.fr/files/${P}.tar.bz2"
-
-# GPL-2 is there for the init script; everything else comes from
-# upstream.
-LICENSE="BSD ISC MIT GPL-3+ GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
-
-# This is called libusb so that it doesn't fool people in thinking that
-# it is _required_ for USB support. Otherwise they'll disable udev and
-# that's going to be worse.
-IUSE="doc embedded libusb policykit selinux systemd +udev"
-
-REQUIRED_USE="^^ ( udev libusb ) ${PYTHON_REQUIRED_USE}"
-
-# No dependencies need the MULTILIB_DEPS because the libraries are actually
-# standalone, the deps are only needed for the daemon itself.
-DEPEND="libusb? ( virtual/libusb:1 )
- udev? ( virtual/libudev:= )
- policykit? ( >=sys-auth/polkit-0.111 )
- acct-group/openct
- acct-group/pcscd
- acct-user/pcscd
- ${PYTHON_DEPS}"
-
-RDEPEND="${DEPEND}
- selinux? ( sec-policy/selinux-pcscd )"
-
-BDEPEND="virtual/pkgconfig"
-
-PATCHES=(
- "${FILESDIR}"/${PN}-1.8.11-polkit-pcscd.patch
- "${FILESDIR}"/${P}-no-libusb-udev.patch
-)
-
-DOCS=( AUTHORS HELP README SECURITY ChangeLog )
-
-pkg_setup() {
- python-single-r1_pkg_setup
-}
-
-multilib_src_configure() {
- ECONF_SOURCE="${S}" econf \
- --disable-maintainer-mode \
- --enable-usbdropdir="${EPREFIX}/usr/$(get_libdir)/readers/usb" \
- --enable-ipcdir=/run/pcscd \
- --with-systemdsystemunitdir="$(systemd_get_systemunitdir)" \
- $(use_enable doc documentation) \
- $(multilib_native_use_enable embedded) \
- $(multilib_native_use_enable systemd libsystemd) \
- $(multilib_native_use_enable udev libudev) \
- $(multilib_native_use_enable libusb) \
- $(multilib_native_use_enable policykit polkit)
-}
-
-multilib_src_install_all() {
- einstalldocs
-
- newinitd "${FILESDIR}"/pcscd-init.7 pcscd
-
- if use udev; then
- exeinto "$(get_udevdir)"
- newexe "${FILESDIR}"/pcscd-udev pcscd.sh
-
- insinto "$(get_udevdir)"/rules.d
- newins "${FILESDIR}"/99-pcscd-hotplug-r1.rules 99-pcscd-hotplug.rules
- fi
-
- python_fix_shebang "${ED}"/usr/bin/pcsc-spy
-
- find "${ED}" -name '*.la' -delete || die
-}
-
-pkg_postinst() {
- elog "Starting from version 1.6.5, pcsc-lite will start as user nobody in"
- elog "the pcscd group, to avoid running as root."
- elog ""
- elog "This also means you need the newest drivers available so that the"
- elog "devices get the proper owner."
- elog ""
- elog "Furthermore, a conf.d file is no longer installed by default, as"
- elog "the default configuration does not require one. If you need to"
- elog "pass further options to pcscd, create a file and set the"
- elog "EXTRA_OPTS variable."
- elog ""
- if use udev; then
- elog "Hotplug support is provided by udev rules."
- elog "When using OpenRC you additionally need to tell it to hotplug"
- elog "pcscd by setting this variable in /etc/rc.conf:"
- elog ""
- elog " rc_hotplug=\"pcscd\""
- fi
-}
^ permalink raw reply related [flat|nested] 4+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: sys-apps/pcsc-lite/files/, sys-apps/pcsc-lite/
@ 2022-09-03 22:20 David Seifert
0 siblings, 0 replies; 4+ messages in thread
From: David Seifert @ 2022-09-03 22:20 UTC (permalink / raw
To: gentoo-commits
commit: 6c83a787829ad36a5cf7e165769ec5463c22bd60
Author: David Seifert <soap <AT> gentoo <DOT> org>
AuthorDate: Sat Sep 3 22:19:50 2022 +0000
Commit: David Seifert <soap <AT> gentoo <DOT> org>
CommitDate: Sat Sep 3 22:19:50 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6c83a787
sys-apps/pcsc-lite: run daemon under 'pcscd'
Closes: https://bugs.gentoo.org/545390
Closes: https://bugs.gentoo.org/845174
Signed-off-by: David Seifert <soap <AT> gentoo.org>
.../files/pcsc-lite-1.9.8-systemd-user.patch | 14 +++++++++
...lite-1.9.8.ebuild => pcsc-lite-1.9.8-r1.ebuild} | 34 ++++++++++++----------
2 files changed, 33 insertions(+), 15 deletions(-)
diff --git a/sys-apps/pcsc-lite/files/pcsc-lite-1.9.8-systemd-user.patch b/sys-apps/pcsc-lite/files/pcsc-lite-1.9.8-systemd-user.patch
new file mode 100644
index 000000000000..4cda6999224e
--- /dev/null
+++ b/sys-apps/pcsc-lite/files/pcsc-lite-1.9.8-systemd-user.patch
@@ -0,0 +1,14 @@
+Don't run the daemon as root
+https://bugs.gentoo.org/545390
+
+--- a/etc/pcscd.service.in
++++ b/etc/pcscd.service.in
+@@ -7,6 +7,8 @@
+ ExecStart=@sbindir_exp@/pcscd --foreground --auto-exit $PCSCD_ARGS
+ ExecReload=@sbindir_exp@/pcscd --hotplug
+ EnvironmentFile=-@sysconfdir@/default/pcscd
++User=pcscd
++Group=pcscd
+
+ [Install]
+ Also=pcscd.socket
diff --git a/sys-apps/pcsc-lite/pcsc-lite-1.9.8.ebuild b/sys-apps/pcsc-lite/pcsc-lite-1.9.8-r1.ebuild
similarity index 90%
rename from sys-apps/pcsc-lite/pcsc-lite-1.9.8.ebuild
rename to sys-apps/pcsc-lite/pcsc-lite-1.9.8-r1.ebuild
index 95d5695bbf69..2443f777b019 100644
--- a/sys-apps/pcsc-lite/pcsc-lite-1.9.8.ebuild
+++ b/sys-apps/pcsc-lite/pcsc-lite-1.9.8-r1.ebuild
@@ -3,13 +3,12 @@
EAPI=8
-PYTHON_COMPAT=( python3_{8..10} )
+PYTHON_COMPAT=( python3_{8..11} )
inherit python-single-r1 systemd udev multilib-minimal
DESCRIPTION="PC/SC Architecture smartcard middleware library"
HOMEPAGE="https://pcsclite.apdu.fr https://github.com/LudovicRousseau/PCSC"
-
SRC_URI="https://pcsclite.apdu.fr/files/${P}.tar.bz2"
# GPL-2 is there for the init script; everything else comes from
@@ -17,41 +16,38 @@ SRC_URI="https://pcsclite.apdu.fr/files/${P}.tar.bz2"
LICENSE="BSD ISC MIT GPL-3+ GPL-2"
SLOT="0"
KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
-
# This is called libusb so that it doesn't fool people in thinking that
# it is _required_ for USB support. Otherwise they'll disable udev and
# that's going to be worse.
IUSE="doc embedded libusb policykit selinux systemd +udev"
-
REQUIRED_USE="^^ ( udev libusb ) ${PYTHON_REQUIRED_USE}"
# No dependencies need the MULTILIB_DEPS because the libraries are actually
# standalone, the deps are only needed for the daemon itself.
-DEPEND="libusb? ( virtual/libusb:1 )
+DEPEND="
+ libusb? ( virtual/libusb:1 )
udev? ( virtual/libudev:= )
policykit? ( >=sys-auth/polkit-0.111 )
acct-group/openct
acct-group/pcscd
acct-user/pcscd
${PYTHON_DEPS}"
-
RDEPEND="${DEPEND}
selinux? ( sec-policy/selinux-pcscd )"
-
-BDEPEND="sys-devel/flex
+BDEPEND="
+ sys-devel/flex
virtual/pkgconfig"
PATCHES=(
"${FILESDIR}"/${PN}-1.8.11-polkit-pcscd.patch
+ "${FILESDIR}"/${PN}-1.9.8-systemd-user.patch
)
-DOCS=( AUTHORS HELP README SECURITY ChangeLog )
-
multilib_src_configure() {
ECONF_SOURCE="${S}" econf \
--disable-maintainer-mode \
--disable-strict \
- --enable-usbdropdir="${EPREFIX}/usr/$(get_libdir)/readers/usb" \
+ --enable-usbdropdir="${EPREFIX}"/usr/$(get_libdir)/readers/usb \
--enable-ipcdir=/run/pcscd \
--with-systemdsystemunitdir="$(systemd_get_systemunitdir)" \
$(multilib_native_use_enable doc documentation) \
@@ -64,6 +60,7 @@ multilib_src_configure() {
multilib_src_install_all() {
einstalldocs
+ dodoc HELP SECURITY
newinitd "${FILESDIR}"/pcscd-init.7 pcscd
@@ -83,20 +80,27 @@ multilib_src_install_all() {
pkg_postinst() {
elog "Starting from version 1.6.5, pcsc-lite will start as user nobody in"
elog "the pcscd group, to avoid running as root."
- elog ""
+ elog
elog "This also means you need the newest drivers available so that the"
elog "devices get the proper owner."
- elog ""
+ elog
elog "Furthermore, a conf.d file is no longer installed by default, as"
elog "the default configuration does not require one. If you need to"
elog "pass further options to pcscd, create a file and set the"
elog "EXTRA_OPTS variable."
- elog ""
+ elog
+
if use udev; then
elog "Hotplug support is provided by udev rules."
elog "When using OpenRC you additionally need to tell it to hotplug"
elog "pcscd by setting this variable in /etc/rc.conf:"
- elog ""
+ elog
elog " rc_hotplug=\"pcscd\""
fi
+
+ use udev && udev_reload
+}
+
+pkg_postrm() {
+ use udev && udev_reload
}
^ permalink raw reply related [flat|nested] 4+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: sys-apps/pcsc-lite/files/, sys-apps/pcsc-lite/
@ 2022-09-03 23:54 David Seifert
0 siblings, 0 replies; 4+ messages in thread
From: David Seifert @ 2022-09-03 23:54 UTC (permalink / raw
To: gentoo-commits
commit: 53b29173a0335a701414cc0128e200312e5e73b2
Author: David Seifert <soap <AT> gentoo <DOT> org>
AuthorDate: Sat Sep 3 23:54:23 2022 +0000
Commit: David Seifert <soap <AT> gentoo <DOT> org>
CommitDate: Sat Sep 3 23:54:23 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=53b29173
sys-apps/pcsc-lite: adjust permissions for /run/pcscd/pcscd.pid
Signed-off-by: David Seifert <soap <AT> gentoo.org>
sys-apps/pcsc-lite/files/pcsc-lite-1.9.8-systemd-user.patch | 6 +++++-
sys-apps/pcsc-lite/files/pcscd.conf | 1 +
.../{pcsc-lite-1.9.8-r1.ebuild => pcsc-lite-1.9.8-r2.ebuild} | 5 ++++-
3 files changed, 10 insertions(+), 2 deletions(-)
diff --git a/sys-apps/pcsc-lite/files/pcsc-lite-1.9.8-systemd-user.patch b/sys-apps/pcsc-lite/files/pcsc-lite-1.9.8-systemd-user.patch
index 4cda6999224e..4d64c5c032f0 100644
--- a/sys-apps/pcsc-lite/files/pcsc-lite-1.9.8-systemd-user.patch
+++ b/sys-apps/pcsc-lite/files/pcsc-lite-1.9.8-systemd-user.patch
@@ -3,7 +3,11 @@ https://bugs.gentoo.org/545390
--- a/etc/pcscd.service.in
+++ b/etc/pcscd.service.in
-@@ -7,6 +7,8 @@
+@@ -4,9 +4,12 @@
+ Documentation=man:pcscd(8)
+
+ [Service]
++PIDFile=/run/pcscd/pcscd.pid
ExecStart=@sbindir_exp@/pcscd --foreground --auto-exit $PCSCD_ARGS
ExecReload=@sbindir_exp@/pcscd --hotplug
EnvironmentFile=-@sysconfdir@/default/pcscd
diff --git a/sys-apps/pcsc-lite/files/pcscd.conf b/sys-apps/pcsc-lite/files/pcscd.conf
new file mode 100644
index 000000000000..168c860e88c8
--- /dev/null
+++ b/sys-apps/pcsc-lite/files/pcscd.conf
@@ -0,0 +1 @@
+d /run/pcscd 0755 pcscd pcscd -
diff --git a/sys-apps/pcsc-lite/pcsc-lite-1.9.8-r1.ebuild b/sys-apps/pcsc-lite/pcsc-lite-1.9.8-r2.ebuild
similarity index 96%
rename from sys-apps/pcsc-lite/pcsc-lite-1.9.8-r1.ebuild
rename to sys-apps/pcsc-lite/pcsc-lite-1.9.8-r2.ebuild
index 2443f777b019..6ec37345d133 100644
--- a/sys-apps/pcsc-lite/pcsc-lite-1.9.8-r1.ebuild
+++ b/sys-apps/pcsc-lite/pcsc-lite-1.9.8-r2.ebuild
@@ -5,7 +5,7 @@ EAPI=8
PYTHON_COMPAT=( python3_{8..11} )
-inherit python-single-r1 systemd udev multilib-minimal
+inherit python-single-r1 systemd tmpfiles udev multilib-minimal
DESCRIPTION="PC/SC Architecture smartcard middleware library"
HOMEPAGE="https://pcsclite.apdu.fr https://github.com/LudovicRousseau/PCSC"
@@ -63,6 +63,7 @@ multilib_src_install_all() {
dodoc HELP SECURITY
newinitd "${FILESDIR}"/pcscd-init.7 pcscd
+ dotmpfiles "${FILESDIR}"/pcscd.conf
if use udev; then
exeinto "$(get_udevdir)"
@@ -98,6 +99,8 @@ pkg_postinst() {
elog " rc_hotplug=\"pcscd\""
fi
+ tmpfiles_process pcscd.conf
+
use udev && udev_reload
}
^ permalink raw reply related [flat|nested] 4+ messages in thread
end of thread, other threads:[~2022-09-03 23:54 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2022-09-03 22:20 [gentoo-commits] repo/gentoo:master commit in: sys-apps/pcsc-lite/files/, sys-apps/pcsc-lite/ David Seifert
-- strict thread matches above, loose matches on Subject: below --
2022-09-03 23:54 David Seifert
2022-06-02 3:53 Sam James
2019-10-10 16:04 Craig Andrews
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox