gentoo auto-resync : 04:09:2022 - 04:20:30

4 files changed, 45 insertions, 17 deletions

diff --git a/sys-apps/pcsc-lite/Manifest b/sys-apps/pcsc-lite/Manifest
index 449d399a36f9..90f559f89f63 100644
--- a/sys-apps/pcsc-lite/Manifest
+++ b/sys-apps/pcsc-lite/Manifest
@@ -1,9 +1,11 @@
 AUX 99-pcscd-hotplug-r1.rules 363 BLAKE2B 65049122751de2d50f60449cebaa948ce276680d969ef1a13700a3fc7577c90e24b96b69f2285389361aeb6dfbdd7f0eb49faa953855ba39473270aa530c395f SHA512 45c1d50175844b4f46d0a5a15855bfb929d4848f9570e92c3327a95fce7aeb11fda7cecd1c24338aed96b696134baa1715ab59ac578af7c11e43bbc73b27a990
 AUX pcsc-lite-1.8.11-polkit-pcscd.patch 744 BLAKE2B b9a846a989d1708a30bb62e93ab19fbf5cfe4c2c601d435b53a8933117d919a4fbac8835e68b895507840a25a9aab85e35f6b4c2e7461ec3c7893d483e12f759 SHA512 4f8b774ec888d51c0ad82431cb9d041be6b69af0bfa2a535c6b7e47afb0056147c08ab9265d7da2259a74347ceba9dba320ad0892d3a25797efc64b79113f4a5
+AUX pcsc-lite-1.9.8-systemd-user.patch 415 BLAKE2B dd29a0965167cde394e95bb751f6d193935234f15b2eb6ab03a1c70fb5c7fcf43d2c2b81be9c8c9e29d87affca68d1b236ea1db3fbb1ca7ddcd63e4e3da4c35c SHA512 8c1fde18596e1642aef08adb6a23be36930f0f1a6946c6e27b283cff6556afd75f54e6995ca0c62cbf86aa56157961637981cf046a04d17ede93518408ffe65a
 AUX pcscd-init.7 408 BLAKE2B 54e4995a169b7f816b0de9b409ae94a8328e792b50872d583988cc87ad20b5c2d20559f3702dc4525dcc46c4afabf817c1e76f4a080ca277f9ab01ebcf67441f SHA512 24fbd0fe2847f6c7bb961e4e0d9fa5197d408971fc33fa7652893ce9dbba958d19b02be7688afd4e9617520f93b6544af74968d6fcc3b31ad73b3ac585e87500
 AUX pcscd-udev 330 BLAKE2B 50e99953aec238fe98c6aee5219d3978b44d37c90ce74c9cb8e19b37c8677001e9b1b3701df8246bf051c6cf8b5c971f86bf1f580bfcbff270b8937328ca887d SHA512 06b672135fda9f83af4f030ff8078f8e1194ced529334c17c1a93f81ee9a5d4448bcea5ffec398f01d957a6607fbde7f69fbc23d727bb3ffad48a305cefe5c26
+AUX pcscd.conf 32 BLAKE2B 2407e00c654d7e259ebf69ab420800f5605cb3ead23eb4aa07317928c38b6328eae2e566fab84c8844fb80e8a165cd32982fee753498b20c7a750f52fbb1f995 SHA512 ae27cdab8a60201639b9d9aca2d7f760146a5c5238878a0ebb562740385bf58f04bbc37a19cd1a2c8c69ee463f10beecc6531dde733cb6a6d4b06816f54b1569
 DIST pcsc-lite-1.9.7.tar.bz2 784685 BLAKE2B 74848b06ce9e497287cc4a8f307a194d766091a35af46300bd1dcdbf730c3f86f14928ff2e576ac83c07a37234b866e0b2cb3afd3d963b8570051c5c4880f4b9 SHA512 0c7f6c0efcfd6f6996e9e751dd0dd9969590b19144099aa6003c089d95d5ffdfddf3a50b82ece31e0f22e8213317dd827e5fbb4cdde614818b81a80c434788dd
 DIST pcsc-lite-1.9.8.tar.bz2 787198 BLAKE2B ba7297e567e5ad7fdb8041d6cddd61e772795d725d91be7f041493a2404a42acf51b41a4e0e82765f4d2a93517d8d9345abd7520dc03eeb48d2eb83bb6082390 SHA512 6275eee849c5572264f5a1ef1ea2a2db5fec9c4129b348bd6e2c1d4444c46c945b8ecab682c003913e9d06da7034b383199b6e392ae178ffae296017e7c61812
 EBUILD pcsc-lite-1.9.7.ebuild 3189 BLAKE2B 08e57b481cd8219db76426a7a147a4394f7f51cc78a590db1bdcc163fda46f82d0af43dabfad5e013f6862f83beb5a7ec1e47d8247a36bd8bcf0f6b47b440ea7 SHA512 274c12d4a46365abe5cf8e971b5c8d5e439fbaaf622d5431491e6c4058d9fcd577928da8e30282a6ca7086e3140dd54b991344a7989bde625d3cb0d833960f41
-EBUILD pcsc-lite-1.9.8.ebuild 3191 BLAKE2B f3d04f51499b3d1d9c34cc3866ec8a2a8a9ccf7a178e3114c5455af5e3dcbc73813cf64a29a3e433e8f89c0f817c56f273b0a260d15c8bcc540047be00f9c73f SHA512 dd8ee12e165975ef2dd5e30085d3aab65e148f95084d9f6515f7574e5f12c2b652299efdfce883d92ce5ba51ea6ed20094a109c3a4acd30e10f89417965111c3
+EBUILD pcsc-lite-1.9.8-r2.ebuild 3342 BLAKE2B c780d5297f180ed52338238bfc6a21ec678ee72217f7b1339b6cb5604b989434f0c875ac56f911ccfe6ad3645e8374c85b6cc9b5c015e55f29cf879d0c3d143b SHA512 876846379bca56a1e4f6d44c3715102876f9aade1c66cbd737647011eb0f32600572a16b2b1b44e77165c57e62eb414e670386ad58d64cdc110125e0bcb788fe
 MISC metadata.xml 1083 BLAKE2B 8dc3fe1bbd660b4ea9db99fb8f82b905843d96005928f42aa4007e13aa6e0a75af83f1552b434136c8584b98ddae6a0c68776fbb1096da29433864536405fdf3 SHA512 da7d9e3842429795970dd73ffab39e031188e6fd585d144e6348007c55eeb67dcb8e5e04aea1115796f73ff1d455887e0c00301da2b9e689551fef8144c2f388
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..4d64c5c032f0
--- /dev/null
+++ b/sys-apps/pcsc-lite/files/pcsc-lite-1.9.8-systemd-user.patch
@@ -0,0 +1,18 @@
+Don't run the daemon as root
+https://bugs.gentoo.org/545390
+
+--- a/etc/pcscd.service.in
++++ b/etc/pcscd.service.in
+@@ -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
++User=pcscd
++Group=pcscd
+ 
+ [Install]
+ Also=pcscd.socket
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.ebuild b/sys-apps/pcsc-lite/pcsc-lite-1.9.8-r2.ebuild
index 95d5695bbf69..6ec37345d133 100644
--- a/sys-apps/pcsc-lite/pcsc-lite-1.9.8.ebuild
+++ b/sys-apps/pcsc-lite/pcsc-lite-1.9.8-r2.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
+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"
-
 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,8 +60,10 @@ multilib_src_configure() {
 
 multilib_src_install_all() {
 	einstalldocs
+	dodoc HELP SECURITY
 
 	newinitd "${FILESDIR}"/pcscd-init.7 pcscd
+	dotmpfiles "${FILESDIR}"/pcscd.conf
 
 	if use udev; then
 		exeinto "$(get_udevdir)"
@@ -83,20 +81,29 @@ 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
+
+	tmpfiles_process pcscd.conf
+
+	use udev && udev_reload
+}
+
+pkg_postrm() {
+	use udev && udev_reload
 }