Compare commits

...

90 Commits
f16 ... rawhide

Author SHA1 Message Date
Fedora Release Engineering 3d4d432393 Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild
Signed-off-by: Fedora Release Engineering <releng@fedoraproject.org>
2023-01-19 23:33:45 +00:00
Lumir Balhar a778786377 Switch from pathfix.py to %py3_shebang_fix
For more info see https://fedoraproject.org/wiki/Changes/Python3.12#pathfix.py_tool_will_be_removed
2022-11-03 19:04:04 +01:00
Jakub Jelen 4272428e1b pcsc-lite-1.9.9-2 2022-11-01 16:14:37 +01:00
Jakub Jelen 330bcc20f3 Drop support for more than 16 readers to unbreak flatpak (#2054826) 2022-11-01 16:13:52 +01:00
Jakub Jelen 9a496f324e pcsc-lite-1.9.9-1 2022-09-19 13:31:28 +02:00
Jakub Jelen 8121f3d07a Use explicit unit directory as the pkgconfig detection looks broken 2022-09-19 13:31:28 +02:00
Fedora Release Engineering 6c53acc9b2 Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild
Signed-off-by: Fedora Release Engineering <releng@fedoraproject.org>
2022-07-22 02:53:14 +00:00
Jakub Jelen ac56c5855b pcsc-lite-1.9.8-1 2022-06-13 08:59:08 +02:00
Jakub Jelen e6d18cee6c pcsc-lite-1.9.7-1 2022-05-13 19:20:48 +02:00
Jakub Jelen 0337f401bd add sources 2022-05-12 19:08:41 +02:00
Jakub Jelen 7cdb01ad72 New upstream release (#2084468) 2022-05-12 18:52:28 +02:00
Jakub Jelen 99550479bd fix typos 2022-05-12 17:40:49 +02:00
Jay W 0c7c15d36f Update pcsc-lite.spec to allow flatpak builds 2022-02-11 02:22:03 +00:00
Fedora Release Engineering 040635b9c1 - Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild
Signed-off-by: Fedora Release Engineering <releng@fedoraproject.org>
2022-01-20 23:04:34 +00:00
Jakub Jelen e1270b53e1 Avoid rpmlint warnings/errors
pcsc-lite.spec:10: W: mixed-use-of-spaces-and-tabs (spaces: line 1, tab: line 10)
pcsc-lite.spec: E: specfile-error error: %changelog not in descending chronological order
2021-12-08 17:28:58 +01:00
Jakub Jelen bd2a6b2926 pcsc-lite-1.9.5-1 2021-12-06 12:51:59 +01:00
Jakub Jelen db40ee7cba pcsc-lite-1.9.4-1 2021-10-04 10:53:34 +02:00
Jakub Jelen acfce4c37b pcsc-lite-1.9.3 2021-08-09 09:13:56 +02:00
Jakub Jelen 7227818ae8 pcsc-lite-1.9.2-1 2021-08-04 12:09:08 +02:00
Jakub Jelen 5c948aa002 pcsc-lite-1.9.1-5 2021-08-02 09:14:08 +02:00
Jakub Jelen af345491c0 Drop downstream polkit policy (#1478345)
This will use more restrictive from upstream preventing non-local users to access
pcsc and preventing annonying prompts in remote sessions such as VNC
2021-08-02 09:13:35 +02:00
Fedora Release Engineering cc2e03558c - Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild
Signed-off-by: Fedora Release Engineering <releng@fedoraproject.org>
2021-07-22 17:52:29 +00:00
Jakub Jelen 48f7d18455 pcsc-lite-1.9.1-3 2021-06-25 17:23:59 +02:00
Jakub Jelen 0f5bfe6b39 Add support for more readers 2021-06-25 17:23:11 +02:00
Zbigniew Jędrzejewski-Szmek 183f19723c Rebuilt for updated systemd-rpm-macros
See https://pagure.io/fesco/issue/2583.
2021-03-02 16:13:06 +01:00
Jakub Jelen 204a1d7ec8 pcsc-lite-1.9.1-1 2021-02-25 11:56:30 +01:00
Fedora Release Engineering 89ecd85159 - Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
Signed-off-by: Fedora Release Engineering <releng@fedoraproject.org>
2021-01-26 23:06:33 +00:00
Tom Stellard d430cf7537 Add BuildRequires: make
https://fedoraproject.org/wiki/Changes/Remove_make_from_BuildRoot
2021-01-08 01:11:55 +00:00
Jakub Jelen c5ce1b9dc3 Use make macros
Based on https://src.fedoraproject.org/rpms/pcsc-lite/pull-request/1

https://fedoraproject.org/wiki/Changes/UseMakeBuildInstallMacro
2020-07-31 15:24:51 +02:00
Fedora Release Engineering 545c0b1c1a - Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
Signed-off-by: Fedora Release Engineering <releng@fedoraproject.org>
2020-07-28 13:19:42 +00:00
Jakub Jelen 34c0c97392 pcsc-lite-1.9.0-1 2020-06-15 11:49:32 +02:00
Fedora Release Engineering 60cd4f246f - Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild
Signed-off-by: Fedora Release Engineering <releng@fedoraproject.org>
2020-01-29 21:06:37 +00:00
Jakub Jelen dd12aed23a pcsc-lite-1.8.26-1 2020-01-20 08:58:03 +01:00
Jakub Jelen 4a4a855587 Add a comment about bundling 2019-09-30 13:21:23 +02:00
Fedora Release Engineering 1e8301e9c8 - Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
Signed-off-by: Fedora Release Engineering <releng@fedoraproject.org>
2019-07-26 00:15:29 +00:00
Jakub Jelen 86feaeed2a pcsc-lite-1.8.25 2019-04-05 13:03:15 +02:00
Jakub Jelen 05466448c2 Attempt to start the socket after installation (#1545027) 2019-04-05 13:02:30 +02:00
Fedora Release Engineering 5aaa51ec63 - Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
Signed-off-by: Fedora Release Engineering <releng@fedoraproject.org>
2019-02-01 18:09:22 +00:00
Igor Gnatenko a3e7b6ccec Remove obsolete Group tag
References: https://fedoraproject.org/wiki/Changes/Remove_Group_Tag
2019-01-28 20:24:25 +01:00
Igor Gnatenko 99d0851222
Remove obsolete ldconfig scriptlets
References: https://fedoraproject.org/wiki/Changes/RemoveObsoleteScriptlets
Signed-off-by: Igor Gnatenko <ignatenkobrain@fedoraproject.org>
2019-01-22 18:40:40 +01:00
Jakub Jelen a61691941a Make sure the correct python path is used 2018-11-20 10:26:34 +01:00
Jakub Jelen 5dac192f57 New upstream release (#1651353) 2018-11-20 09:52:34 +01:00
Jakub Jelen 485d777113 Add missing dependencies (#1605389) 2018-07-23 14:58:34 +02:00
Fedora Release Engineering dcbc60843f - Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild
Signed-off-by: Fedora Release Engineering <releng@fedoraproject.org>
2018-07-13 15:36:48 +00:00
Fedora Release Engineering 98725a41d1 - Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild
Signed-off-by: Fedora Release Engineering <releng@fedoraproject.org>
2018-02-08 18:29:06 +00:00
Nikos Mavrogiannopoulos b06a1707ba updated to 1.8.23 2017-12-19 13:35:53 +01:00
Fedora Release Engineering 3c8db3b6b4 - Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild 2017-08-03 04:55:51 +00:00
Fedora Release Engineering 8e98e84ca3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild 2017-07-27 02:18:53 +00:00
Nikos Mavrogiannopoulos 110b8790b5 updated to 1.8.22 2017-06-27 15:41:52 +02:00
Fedora Release Engineering 743ef34772 - Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild 2017-02-11 01:22:46 +00:00
Nikos Mavrogiannopoulos 6cc74902ec updated to 1.8.20 2017-01-02 08:34:03 +01:00
Nikos Mavrogiannopoulos e1953a4cb8 updated to 1.8.19 2016-12-09 14:00:48 +01:00
Nikos Mavrogiannopoulos cf14e86860 updated to 1.8.18 2016-11-30 08:11:48 +01:00
Ville Skyttä 0a2e4dbaff Add dependency on polkit, COPYING => %license, fix bogus dates in %changelog
https://bugzilla.redhat.com/show_bug.cgi?id=1351437
2016-06-30 08:32:11 +02:00
Nikos Mavrogiannopoulos 62987aa666 updated to 1.8.17 2016-06-21 13:49:15 +02:00
Nikos Mavrogiannopoulos 83847912e6 Added gpg key verification as part of build process 2016-04-01 13:06:45 +02:00
Nikos Mavrogiannopoulos c1be910712 Updated to 1.8.16 2016-04-01 13:01:43 +02:00
Fedora Release Engineering ecb7364417 - Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild 2016-02-04 12:02:33 +00:00
Nikos Mavrogiannopoulos 92b3d283da Updated 1.8.15 2016-01-11 09:52:26 +01:00
Nikos Mavrogiannopoulos 8f731c0054 recommend pcsc-lite-ccid
Resolves: rhbz#1280447
2015-11-18 09:31:45 +01:00
Nikos Mavrogiannopoulos 7a798a0dbc Updated to 1.8.14
Resolves: rhbz#1250530
2015-08-05 14:24:39 +02:00
Dennis Gilmore e24da492b4 - Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild 2015-06-18 00:54:14 +00:00
Nikos Mavrogiannopoulos 317ff328c5 new upstream release 2014-11-07 14:19:33 +01:00
Nikos Mavrogiannopoulos a21aad9a8b removed old patch 2014-09-24 16:51:38 +02:00
Nikos Mavrogiannopoulos 855a3e5dce new upstream release
Related: rhbz#1079514
2014-09-24 16:21:44 +02:00
Peter Robinson 2bbca3d282 - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild 2014-08-17 15:08:16 +00:00
Dennis Gilmore 261a8be1fd - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild 2014-06-06 18:57:46 -05:00
Nikos Mavrogiannopoulos 24e9134327 Removed autoreconf; it is no longer needed. 2014-06-03 10:47:02 +02:00
Nikos Mavrogiannopoulos 94e15f1564 new upstream release. 2014-06-03 10:17:35 +02:00
Nikos Mavrogiannopoulos 7ca80f4d98 Safer usage of libudev functions 2014-06-03 10:17:32 +02:00
Nikos Mavrogiannopoulos 5d49035ba2 The default installed polkit policy only allows console users to access smart cards
Non-interactive or remote usage now requires admin rights, or a specific policy (see README.polkit)
2014-03-13 09:14:24 +01:00
Nikos Mavrogiannopoulos db032e045f Added support for Polkit and force sanity of parameters received by the client 2014-02-11 14:51:10 +01:00
Kalev Lember 8d28bb26f1 Drop large ChangeLog.svn from %doc 2013-10-20 23:03:47 +02:00
Kalev Lember 61ab4c27d1 Update source URL 2013-10-20 23:02:08 +02:00
Kalev Lember f62bc28ede Update to 1.8.10 2013-10-20 23:01:24 +02:00
Dennis Gilmore 5270dae459 - Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild 2013-08-03 11:46:13 -05:00
Kalev Lember 2faeee9483 Fix the build
List pod2man as a build dep; it's used for building the man page.
2013-02-28 21:56:57 +01:00
Kalev Lember 65d9e94bca Use new systemd macros
https://bugzilla.redhat.com/show_bug.cgi?id=850264
2013-02-28 21:39:23 +01:00
Kalev Lember 2c8ae8fcbd Drop the sysv -> systemd init script conversion
The pcsc-lite systemd support was introduced in F16 and we are now at
F19. Drop the sysv -> systemd conversion; direct F15 -> F19 upgrades are
unsupported.
2013-02-28 21:33:24 +01:00
Kalev Lember 804118d1ca Update to 1.8.8 2013-02-28 21:28:40 +01:00
Dennis Gilmore cfdac56b35 - Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild 2013-02-14 03:57:57 -06:00
Kalev Lember f65bb4f955 Update to 1.8.7 2012-11-30 14:58:11 +01:00
Kalev Lember 09427f5060 Update to 1.8.6 2012-09-18 12:35:30 +02:00
Kalev Lember bbf6ba7733 Update to 1.8.5 2012-08-06 11:30:26 +03:00
Dennis Gilmore 0f2defb35a - Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild 2012-07-20 04:12:54 -05:00
Kalev Lember 9616084412 Update to 1.8.4 2012-06-26 22:55:56 +03:00
Kalev Lember 9022291342 Rebuild for new libudev
BuildRequire systemd-devel instead of libudev-devel as the libudev
project was merged into systemd.

https://bugzilla.redhat.com/show_bug.cgi?id=831987
2012-06-14 12:01:25 +03:00
Kalev Lember d16ee7d49e Update to 1.8.3 2012-03-30 16:09:10 +03:00
Kalev Lember 0c8cc1580f Update to 1.8.2
- Drop the systemd support patches which are now upstreamed
- Package the new pcsc-spay tool in -devel subpackage
2012-02-06 23:35:15 +02:00
Dennis Gilmore 58a491a615 - Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild 2012-01-13 06:06:07 -06:00
7 changed files with 312 additions and 1329 deletions

25
.gitignore vendored
View File

@ -1 +1,26 @@
/pcsc-lite-*.tar.bz2
/pcsc-lite-1.8.11.tar.bz2.asc
/pcsc-lite-1.8.12.tar.bz2.asc
/pcsc-lite-1.8.13.tar.bz2.asc
/pcsc-lite-1.8.14.tar.bz2.asc
/pcsc-lite-1.8.15.tar.bz2.asc
/pcsc-lite-1.8.16.tar.bz2.asc
/pcsc-lite-1.8.17.tar.bz2.asc
/pcsc-lite-1.8.18.tar.bz2.asc
/pcsc-lite-1.8.19.tar.bz2.asc
/pcsc-lite-1.8.20.tar.bz2.asc
/pcsc-lite-1.8.22.tar.bz2.asc
/pcsc-lite-1.8.23.tar.bz2.asc
/pcsc-lite-1.8.24.tar.bz2.asc
/pcsc-lite-1.8.25.tar.bz2.asc
/pcsc-lite-1.8.26.tar.bz2.asc
/pcsc-lite-1.9.0.tar.bz2.asc
/pcsc-lite-1.9.1.tar.bz2.asc
/pcsc-lite-1.9.2.tar.bz2.asc
/pcsc-lite-1.9.3.tar.bz2.asc
/pcsc-lite-1.9.4.tar.bz2.asc
/pcsc-lite-1.9.5.tar.bz2.asc
/pcsc-lite-1.9.6.tar.bz2.asc
/pcsc-lite-1.9.7.tar.bz2.asc
/pcsc-lite-1.9.8.tar.bz2.asc
/pcsc-lite-1.9.9.tar.bz2.asc

File diff suppressed because it is too large Load Diff

View File

@ -1,94 +0,0 @@
From c7f825b2c4a5c7d4ac8abe5690737c2c8fffbfcc Mon Sep 17 00:00:00 2001
From: Kalev Lember <kalev@smartlink.ee>
Date: Fri, 24 Jun 2011 00:46:13 +0300
Subject: [PATCH 2/3] Add --disable-autostart option
This option disables pcscd autostarting code in the libpcsclite library.
With systemd socket activation in place, pcscd can be started
automatically by systemd when a request arrives on the IPC socket. That
makes starting the service as a fork from user library unnecessary.
---
PCSC/configure.in | 11 +++++++++++
PCSC/src/winscard_clnt.c | 6 ++++++
2 files changed, 17 insertions(+), 0 deletions(-)
diff --git a/PCSC/configure.in b/PCSC/configure.in
index 831ee88..97e3360 100644
--- a/PCSC/configure.in
+++ b/PCSC/configure.in
@@ -274,6 +274,16 @@ if test x$use_libusb = xyes; then
PCSCLITE_FEATURES="${PCSCLITE_FEATURES} libusb"
fi
+# --disable-autostart
+AC_ARG_ENABLE(autostart,
+ AC_HELP_STRING([--disable-autostart], [disable pcscd automatic startup]),
+ [ use_autostart="${enableval}" ], [ use_autostart="yes" ] )
+
+if test x$use_autostart != xno; then
+ AC_DEFINE(ENABLE_AUTOSTART, 1, [Enable pcscd automatic startup])
+ PCSCLITE_FEATURES="${PCSCLITE_FEATURES} autostart"
+fi
+
# --enable-embedded
AC_ARG_ENABLE(embedded,
AC_HELP_STRING([--enable-embedded], [limit RAM and CPU ressources by disabling features (log)]),
@@ -381,6 +391,7 @@ ATR parsing messages: ${debugatr}
ipcdir: ${ipcdir}
use serial: ${use_serial}
use usb: ${use_usb}
+use autostart: ${use_autostart}
PCSCLITE_FEATURES: ${PCSCLITE_FEATURES}
diff --git a/PCSC/src/winscard_clnt.c b/PCSC/src/winscard_clnt.c
index 92c8481..982be01 100644
--- a/PCSC/src/winscard_clnt.c
+++ b/PCSC/src/winscard_clnt.c
@@ -444,8 +444,10 @@ LONG SCardEstablishContext(DWORD dwScope, LPCVOID pvReserved1,
LPCVOID pvReserved2, LPSCARDCONTEXT phContext)
{
LONG rv;
+#ifdef ENABLE_AUTOSTART
int daemon_launched = FALSE;
int retries = 0;
+#endif
API_TRACE_IN("%ld, %p, %p", dwScope, pvReserved1, pvReserved2)
PROFILE_START
@@ -457,6 +459,7 @@ again:
/* we reconnected to a daemon or we got called from a forked child */
rv = SCardCheckDaemonAvailability();
+#ifdef ENABLE_AUTOSTART
if (SCARD_E_NO_SERVICE == rv)
{
launch:
@@ -517,6 +520,7 @@ launch:
goto again;
}
}
+#endif
if (rv != SCARD_S_SUCCESS)
goto end;
@@ -526,6 +530,7 @@ launch:
pvReserved2, phContext);
(void)SCardUnlockThread();
+#ifdef ENABLE_AUTOSTART
/* SCardEstablishContextTH may fail if the previous pcscd crashed
* without cleaning /var/run/pcscd/pcscd.comm */
if (SCARD_E_NO_SERVICE == rv)
@@ -534,6 +539,7 @@ launch:
if (retries <= 1)
goto launch;
}
+#endif
end:
PROFILE_END(rv)
--
1.7.5.4

View File

@ -1,144 +0,0 @@
From 0f85375fd8949e529a6f46c07cdabda74040fd8a Mon Sep 17 00:00:00 2001
From: Kalev Lember <kalev@smartlink.ee>
Date: Fri, 24 Jun 2011 22:32:33 +0300
Subject: [PATCH 3/3] Install systemd service files
---
PCSC/Makefile.am | 5 ++++-
PCSC/configure.in | 32 ++++++++++++++++++++++----------
PCSC/etc/Makefile.am | 9 +++++++++
PCSC/etc/pcscd.service.in | 13 +++++++++++++
PCSC/etc/pcscd.socket.in | 8 ++++++++
5 files changed, 56 insertions(+), 11 deletions(-)
create mode 100644 PCSC/etc/Makefile.am
create mode 100644 PCSC/etc/pcscd.service.in
create mode 100644 PCSC/etc/pcscd.socket.in
diff --git a/PCSC/Makefile.am b/PCSC/Makefile.am
index 079b58a..c515128 100644
--- a/PCSC/Makefile.am
+++ b/PCSC/Makefile.am
@@ -1,10 +1,13 @@
-SUBDIRS = m4 src doc
+SUBDIRS = m4 src etc doc
fix-rights:
$(MAKE) -C src $@
ACLOCAL_AMFLAGS = -I m4
+DISTCHECK_CONFIGURE_FLAGS = \
+ --with-systemdsystemunitdir=$$dc_install_base/$(systemdsystemunitdir)
+
EXTRA_DIST = DRIVERS SECURITY bootstrap HELP ChangeLog.svn
DISTCLEANFILES = ChangeLog.svn
diff --git a/PCSC/configure.in b/PCSC/configure.in
index 97e3360..cc6fe5f 100644
--- a/PCSC/configure.in
+++ b/PCSC/configure.in
@@ -274,6 +274,14 @@ if test x$use_libusb = xyes; then
PCSCLITE_FEATURES="${PCSCLITE_FEATURES} libusb"
fi
+AC_ARG_WITH([systemdsystemunitdir],
+ AS_HELP_STRING([--with-systemdsystemunitdir=DIR], [Directory for systemd service files]),
+ [], [with_systemdsystemunitdir=$($PKG_CONFIG --variable=systemdsystemunitdir systemd)])
+if test "x$with_systemdsystemunitdir" != xno; then
+ AC_SUBST([systemdsystemunitdir], [$with_systemdsystemunitdir])
+fi
+AM_CONDITIONAL(HAVE_SYSTEMD, [test -n "$with_systemdsystemunitdir" -a "x$with_systemdsystemunitdir" != xno ])
+
# --disable-autostart
AC_ARG_ENABLE(autostart,
AC_HELP_STRING([--disable-autostart], [disable pcscd automatic startup]),
@@ -383,17 +391,18 @@ PTHREAD_CFLAGS: ${PTHREAD_CFLAGS}
PTHREAD_LIBS: ${PTHREAD_LIBS}
PCSC_ARCH: ${PCSC_ARCH}
-pcscd binary ${PCSCD_BINARY}
-libudev support: ${use_libudev}
-libusb support: ${use_libusb}
-USB drop directory: ${usbdropdir}
-ATR parsing messages: ${debugatr}
-ipcdir: ${ipcdir}
-use serial: ${use_serial}
-use usb: ${use_usb}
-use autostart: ${use_autostart}
+pcscd binary ${PCSCD_BINARY}
+libudev support: ${use_libudev}
+libusb support: ${use_libusb}
+USB drop directory: ${usbdropdir}
+ATR parsing messages: ${debugatr}
+ipcdir: ${ipcdir}
+use serial: ${use_serial}
+use usb: ${use_usb}
+use autostart: ${use_autostart}
+systemd unit directory: ${with_systemdsystemunitdir}
-PCSCLITE_FEATURES: ${PCSCLITE_FEATURES}
+PCSCLITE_FEATURES: ${PCSCLITE_FEATURES}
EOF
@@ -406,6 +415,9 @@ doc/doxygen.conf
doc/pcscd.8
doc/reader.conf.5
doc/example/Makefile
+etc/Makefile
+etc/pcscd.service
+etc/pcscd.socket
src/Makefile
src/libpcsclite.pc
src/pcscd.h
diff --git a/PCSC/etc/Makefile.am b/PCSC/etc/Makefile.am
new file mode 100644
index 0000000..6ab04fc
--- /dev/null
+++ b/PCSC/etc/Makefile.am
@@ -0,0 +1,9 @@
+if HAVE_SYSTEMD
+SCRIPT_IN_FILES = \
+ pcscd.service.in \
+ pcscd.socket.in
+
+systemdsystemunit_DATA = \
+ pcscd.service \
+ pcscd.socket
+endif
diff --git a/PCSC/etc/pcscd.service.in b/PCSC/etc/pcscd.service.in
new file mode 100644
index 0000000..4800d32
--- /dev/null
+++ b/PCSC/etc/pcscd.service.in
@@ -0,0 +1,13 @@
+[Unit]
+Description=PC/SC Smart Card Daemon
+Requires=pcscd.socket
+After=syslog.target
+
+[Service]
+ExecStart=@sbindir_exp@/pcscd -f
+ExecReload=@sbindir_exp@/pcscd -H
+StandardOutput=syslog
+
+[Install]
+WantedBy=multi-user.target
+Also=pcscd.socket
diff --git a/PCSC/etc/pcscd.socket.in b/PCSC/etc/pcscd.socket.in
new file mode 100644
index 0000000..6fc93da
--- /dev/null
+++ b/PCSC/etc/pcscd.socket.in
@@ -0,0 +1,8 @@
+[Unit]
+Description=PC/SC Smart Card Daemon Activation Socket
+
+[Socket]
+ListenStream=@ipcdir@/pcscd.comm
+
+[Install]
+WantedBy=sockets.target
--
1.7.5.4

Binary file not shown.

View File

@ -1,32 +1,52 @@
%global upstream_build 3598
# doesn't make sense to install a polkit configuration inside a Flatpak
%if 0%{?flatpak}
%global with_polkit 0
%else
%global with_polkit 1
%endif
Name: pcsc-lite
Version: 1.7.4
Release: 6%{?dist}
Version: 1.9.9
Release: 3%{?dist}
Summary: PC/SC Lite smart card framework and applications
Group: System Environment/Daemons
License: BSD
URL: http://pcsclite.alioth.debian.org/
Source0: http://alioth.debian.org/download.php/%{upstream_build}/%{name}-%{version}.tar.bz2
# Patches for systemd support
# http://archives.neohapsis.com/archives/dev/muscle/2011-q2/0138.html
Patch0: 0001-Support-systemd-socket-activation.patch
Patch1: 0002-Add-disable-autostart-option.patch
Patch2: 0003-Install-systemd-service-files.patch
URL: https://pcsclite.apdu.fr/
Source0: https://pcsclite.apdu.fr/files/%{name}-%{version}.tar.bz2
Source1: https://pcsclite.apdu.fr/files/%{name}-%{version}.tar.bz2.asc
Source2: gpgkey-F5E11B9FFE911146F41D953D78A1B4DFE8F9C57E.gpg
BuildRequires: automake libtool
BuildRequires: libudev-devel
BuildRequires: make
BuildRequires: doxygen
BuildRequires: graphviz
BuildRequires: systemd-units
BuildRequires: systemd-devel
BuildRequires: systemd-rpm-macros
BuildRequires: /usr/bin/pod2man
%if %{with_polkit}
BuildRequires: polkit-devel
%endif
BuildRequires: autoconf
BuildRequires: automake
BuildRequires: gettext-devel
BuildRequires: libtool
BuildRequires: gnupg2
BuildRequires: gcc
BuildRequires: python3-devel
BuildRequires: flex
Requires(post): systemd-sysv
Requires(post): systemd-units
Requires(preun): systemd-units
Requires(postun): systemd-units
Requires(post): systemd
Requires(preun): systemd
Requires(postun): systemd
Requires: pcsc-ifd-handler
Requires: %{name}-libs = %{version}-%{release}
%if %{with_polkit}
Requires: polkit
%endif
Requires: python3
Recommends: pcsc-lite-ccid
# This is bundled in upstream without simple way to remove
Provides: bundled(simclist) = 1.6
%description
The purpose of PC/SC Lite is to provide a Windows(R) SCard interface
@ -39,14 +59,12 @@ line tools.
%package libs
Summary: PC/SC Lite libraries
Group: System Environment/Libraries
%description libs
PC/SC Lite libraries.
%package devel
Summary: PC/SC Lite development files
Group: Development/Libraries
Requires: %{name}-libs = %{version}-%{release}
%description devel
@ -54,7 +72,6 @@ PC/SC Lite development files.
%package doc
Summary: PC/SC Lite developer documentation
Group: Documentation
BuildArch: noarch
Requires: %{name}-libs = %{version}-%{release}
@ -63,12 +80,9 @@ Requires: %{name}-libs = %{version}-%{release}
%prep
%setup -q
%patch0 -p2 -b .socket_activation
%patch1 -p2 -b .noautostart
%patch2 -p2 -b .service_files
gpgv2 --keyring %{SOURCE2} %{SOURCE1} %{SOURCE0}
autoreconf -f
%setup -q
# Convert to utf-8
for file in ChangeLog; do
@ -81,14 +95,18 @@ done
%build
%configure \
--disable-static \
--disable-autostart \
%if %{with_polkit}
--enable-polkit \
%endif
--with-systemdsystemunitdir=%{_unitdir} \
--enable-usbdropdir=%{_libdir}/pcsc/drivers
make %{?_smp_mflags}
%make_build
doxygen doc/doxygen.conf ; rm -f doc/api/*.{map,md5}
%py3_shebang_fix src/spy/pcsc-spy
%install
make install DESTDIR=$RPM_BUILD_ROOT
%make_install
# Create empty directories
mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/reader.conf.d
@ -97,55 +115,32 @@ mkdir -p $RPM_BUILD_ROOT%{_localstatedir}/run/pcscd
rm $RPM_BUILD_ROOT%{_libdir}/*.la
# Remove documentation installed in a wrong directory
rm $RPM_BUILD_ROOT%{_docdir}/pcsc-lite/README.DAEMON
%post
%systemd_post pcscd.socket pcscd.service
# If install, test if pcscd socket is enabled.
# If enabled, then attempt to start it. This will silently fail
# in chroots or other environments where services aren't expected
# to be started.
if [ $1 -eq 1 ] ; then
# Initial installation
/bin/systemctl enable pcscd.socket >/dev/null 2>&1 || :
if systemctl -q is-enabled pcscd.socket > /dev/null 2>&1 ; then
systemctl start pcscd.socket > /dev/null 2>&1 || :
fi
fi
%preun
if [ $1 -eq 0 ] ; then
# Package removal, not upgrade
/bin/systemctl --no-reload disable pcscd.service pcscd.socket >/dev/null 2>&1 || :
/bin/systemctl stop pcscd.service pcscd.socket >/dev/null 2>&1 || :
fi
%systemd_preun pcscd.socket pcscd.service
%postun
/bin/systemctl daemon-reload >/dev/null 2>&1 || :
if [ $1 -ge 1 ] ; then
# Package upgrade, not uninstall
/bin/systemctl try-restart pcscd.service >/dev/null 2>&1 || :
fi
%systemd_postun_with_restart pcscd.socket pcscd.service
%triggerun -- pcsc-lite < 1.7.4-2
# Save the current service runlevel info
# User must manually run systemd-sysv-convert --apply pcscd
# to migrate them to systemd targets
%{_bindir}/systemd-sysv-convert --save pcscd >/dev/null 2>&1 ||:
# Enable pcscd socket activation
/bin/systemctl enable pcscd.socket >/dev/null 2>&1 || :
# Run these because the SysV package being removed won't do them
/sbin/chkconfig --del pcscd >/dev/null 2>&1 || :
# Restart the service if it's already running
if /bin/systemctl is-active pcscd.service >/dev/null 2>&1 ; then
/bin/systemctl stop pcscd.service >/dev/null 2>&1 ||:
/bin/systemctl start pcscd.socket pcscd.service >/dev/null 2>&1 ||:
fi
%post libs -p /sbin/ldconfig
%postun libs -p /sbin/ldconfig
%ldconfig_scriptlets libs
%files
%doc AUTHORS ChangeLog* DRIVERS HELP README SECURITY TODO
%doc AUTHORS ChangeLog HELP README SECURITY TODO
%doc doc/README.polkit
%doc install_spy.sh uninstall_spy.sh
%dir %{_sysconfdir}/reader.conf.d/
%{_unitdir}/pcscd.service
%{_unitdir}/pcscd.socket
@ -155,21 +150,237 @@ fi
%{_mandir}/man5/reader.conf.5*
%{_mandir}/man8/pcscd.8*
%ghost %dir %{_localstatedir}/run/pcscd/
%if %{with_polkit}
%{_datadir}/polkit-1/actions/org.debian.pcsc-lite.policy
%endif
%files libs
%doc COPYING
%license COPYING
%{_libdir}/libpcsclite.so.*
%files devel
%{_bindir}/pcsc-spy
%{_includedir}/PCSC/
%{_libdir}/libpcsclite.so
%{_libdir}/libpcscspy.so*
%{_libdir}/pkgconfig/libpcsclite.pc
%{_mandir}/man1/pcsc-spy.1*
%files doc
%doc doc/api/ doc/example/pcsc_demo.c
%changelog
* Thu Jan 19 2023 Fedora Release Engineering <releng@fedoraproject.org> - 1.9.9-3
- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild
* Tue Nov 01 2022 Jakub Jelen <jjelen@redhat.com> - 1.9.9-2
- Remove downstream patch breaking flatpak (#2054826)
* Mon Sep 19 2022 Jakub Jelen <jjelen@redhat.com> - 1.9.9-1
- New upstream release (#2126065)
* Fri Jul 22 2022 Fedora Release Engineering <releng@fedoraproject.org> - 1.9.8-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild
* Mon Jun 13 2022 Jakub Jelen <jjelen@redhat.com> - 1.9.8-1
- New upstream release (#2095962)
* Fri May 13 2022 Jakub Jelen <jjelen@redhat.com> - 1.9.7-1
- New upstream release (#2085514)
* Thu May 12 2022 Jakub Jelen <jjelen@redhat.com> - 1.9.6-1
- New upstream release (#2084468)
* Thu Jan 20 2022 Fedora Release Engineering <releng@fedoraproject.org> - 1.9.5-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild
* Mon Dec 06 2021 Jakub Jelen <jjelen@redhat.com> - 1.9.5-1
- New upstream release (#2029098)
* Mon Oct 04 2021 Jakub Jelen <jjelen@redhat.com> - 1.9.4-1
- New upstream release (#2009927)
* Mon Aug 09 2021 Jakub Jelen <jjelen@redhat.com> - 1.9.3-1
- New upstream release (#1991071)
* Wed Aug 04 2021 Jakub Jelen <jjelen@redhat.com> - 1.9.2-1
- New upstream release (#1989875)
* Fri Jul 23 2021 Jakub Jelen <jjelen@redhat.com> - 1.9.1-5
- Use upstream polkit policy to avoid annoying prompts in remote sessions (#1478345)
* Thu Jul 22 2021 Fedora Release Engineering <releng@fedoraproject.org> - 1.9.1-4
- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild
* Fri Jun 25 2021 Jakub Jelen <jjelen@redhat.com> - 1.9.1-3
- Add support for more readers
* Tue Mar 02 2021 Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl> - 1.9.1-2
- Rebuilt for updated systemd-rpm-macros
See https://pagure.io/fesco/issue/2583.
* Thu Feb 25 2021 Jakub Jelen <jjelen@redhat.com> - 1.9.1-1
- New upstream release (#1932519)
* Tue Jan 26 2021 Fedora Release Engineering <releng@fedoraproject.org> - 1.9.0-3
- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
* Tue Jul 28 2020 Fedora Release Engineering <releng@fedoraproject.org> - 1.9.0-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
* Mon Jun 15 2020 Jakub Jelen <jjelen@redhat.com> - 1.9.0-1
- New upstream release (#1846925)
* Wed Jan 29 2020 Fedora Release Engineering <releng@fedoraproject.org> - 1.8.26-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild
* Mon Jan 20 2020 Jakub Jelen <jjelen@redhat.com> - 1.8.26-1
- New upstream release
* Fri Jul 26 2019 Fedora Release Engineering <releng@fedoraproject.org> - 1.8.25-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
* Fri Apr 05 2019 Jakub Jelen <jjelen@redhat.com> - 1.8.25-1
- New upstream release (#1692559)
- Fix memory leak in SCardEstablishContextTH() (#1684674)
- Enable socket activation after installation (#1545027)
* Fri Feb 01 2019 Fedora Release Engineering <releng@fedoraproject.org> - 1.8.24-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
* Tue Nov 20 2018 Jakub Jelen <jjelen@redhat.com> - 1.8.24-1
- New upstream release (#1651353)
* Mon Jul 23 2018 Jakub Jelen <jjelen@redhat.com> - 1.8.23-4
- Add missing dependencies (#1605389)
* Fri Jul 13 2018 Fedora Release Engineering <releng@fedoraproject.org> - 1.8.23-3
- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild
* Thu Feb 08 2018 Fedora Release Engineering <releng@fedoraproject.org> - 1.8.23-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild
* Tue Dec 19 2017 Nikos Mavrogiannopoulos <nmav@redhat.com> - 1.8.23-1
- New upstream release
* Thu Aug 03 2017 Fedora Release Engineering <releng@fedoraproject.org> - 1.8.22-3
- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild
* Thu Jul 27 2017 Fedora Release Engineering <releng@fedoraproject.org> - 1.8.22-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild
* Tue Jun 27 2017 Nikos Mavrogiannopoulos <nmav@redhat.com> - 1.8.22-1
- New upstream release
* Sat Feb 11 2017 Fedora Release Engineering <releng@fedoraproject.org> - 1.8.20-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild
* Mon Jan 2 2017 Nikos Mavrogiannopoulos <nmav@redhat.com> - 1.8.20-1
- New upstream release
* Fri Dec 9 2016 Nikos Mavrogiannopoulos <nmav@redhat.com> - 1.8.19-1
- New upstream release
* Wed Nov 30 2016 Nikos Mavrogiannopoulos <nmav@redhat.com> - 1.8.18-1
- New upstream release
* Thu Jun 30 2016 Ville Skyttä <ville.skytta@iki.fi> - 1.8.17-2
- Add dependency on polkit
- Mark COPYING as %%license
- Fix bogus dates in %%changelog
* Tue Jun 21 2016 Nikos Mavrogiannopoulos <nmav@redhat.com> - 1.8.17-1
- New upstream release
* Fri Apr 1 2016 Nikos Mavrogiannopoulos <nmav@redhat.com> - 1.8.16-1
- New upstream release (#1319539)
- Added gpg key verification as part of build process
* Thu Feb 04 2016 Fedora Release Engineering <releng@fedoraproject.org> - 1.8.15-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild
* Mon Jan 11 2016 Nikos Mavrogiannopoulos <nmav@redhat.com> - 1.8.15-1
- New upstream release (#1294262)
* Wed Nov 18 2015 Nikos Mavrogiannopoulos <nmav@redhat.com> - 1.8.14-2
- Recommend pcsc-lite-ccid package (#1280447)
* Wed Aug 5 2015 Nikos Mavrogiannopoulos <nmav@redhat.com> - 1.8.14-1
- New upstream release
* Thu Jun 18 2015 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.8.13-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild
* Fri Nov 7 2014 Nikos Mavrogiannopoulos <nmav@redhat.com> - 1.8.13-1
- New upstream release
* Wed Sep 24 2014 Nikos Mavrogiannopoulos <nmav@redhat.com> - 1.8.12-1
- New upstream release (#1079514)
* Sun Aug 17 2014 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.8.11-3
- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild
* Fri Jun 06 2014 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.8.11-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild
* Tue Jun 03 2014 Nikos Mavrogiannopoulos <nmav@redhat.com> - 1.8.11-1
- New upstream release
- Safer usage of libudev functions
* Tue Mar 11 2014 Nikos Mavrogiannopoulos <nmav@redhat.com> - 1.8.10-3
- The default installed polkit policy allows console users to access
smart cards. Non-interactive or remote usage now requires admin
rights, or a specific policy (see README.polkit)
* Tue Feb 11 2014 Nikos Mavrogiannopoulos <nmav@redhat.com> - 1.8.10-2
- Added upstream patch to support polkit
- Force sanity of parameters received by the client
* Sun Oct 20 2013 Kalev Lember <kalevlember@gmail.com> - 1.8.10-1
- Update to 1.8.10
- Update source URL
- Drop large ChangeLog.svn from %%doc
* Sat Aug 03 2013 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.8.8-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild
* Thu Feb 28 2013 Kalev Lember <kalevlember@gmail.com> - 1.8.8-1
- Update to 1.8.8
- Use new systemd macros (#850264)
* Thu Feb 14 2013 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.8.7-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild
* Fri Nov 30 2012 Kalev Lember <kalevlember@gmail.com> - 1.8.7-1
- Update to 1.8.7
* Tue Sep 18 2012 Kalev Lember <kalevlember@gmail.com> - 1.8.6-1
- Update to 1.8.6
* Mon Aug 06 2012 Kalev Lember <kalevlember@gmail.com> - 1.8.5-1
- Update to 1.8.5
* Fri Jul 20 2012 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.8.4-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild
* Tue Jun 26 2012 Kalev Lember <kalevlember@gmail.com> - 1.8.4-1
- Update to 1.8.4
* Thu Jun 14 2012 Kalev Lember <kalevlember@gmail.com> - 1.8.3-2
- Rebuild for new libudev (#831987)
* Fri Mar 30 2012 Kalev Lember <kalevlember@gmail.com> - 1.8.3-1
- Update to 1.8.3
* Mon Feb 06 2012 Kalev Lember <kalevlember@gmail.com> - 1.8.2-1
- Update to 1.8.2
- Drop the systemd support patches which are now upstreamed
- Package the new pcsc-spay tool in -devel subpackage
* Fri Jan 13 2012 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.7.4-7
- Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild
* Mon Oct 10 2011 Kalev Lember <kalevlember@gmail.com> - 1.7.4-6
- Remove the automatic card power down disabling patch again;
no longer needed with latest libusb1 1.0.9 rc1 (#737988)
@ -292,16 +503,16 @@ fi
even though s390 does not have libusb or smartCards, the libusb
packages are required to build other packages.
* Thu Aug 18 2008 Bob Relyea <rrelyea@redhat.com> - 1.4.102-3
* Thu Aug 28 2008 Bob Relyea <rrelyea@redhat.com> - 1.4.102-3
- bump tag becaue the build system can't deal with mistakes.
* Thu Aug 18 2008 Bob Relyea <rrelyea@redhat.com> - 1.4.102-2
* Thu Aug 28 2008 Bob Relyea <rrelyea@redhat.com> - 1.4.102-2
- mock build changes
* Wed Aug 17 2008 Bob Relyea <rrelyea@redhat.com> - 1.4.102-1
* Thu Aug 28 2008 Bob Relyea <rrelyea@redhat.com> - 1.4.102-1
- Pick up 1.4.102
* Wed May 6 2008 Bob Relyea <rrelyea@redhat.com> - 1.4.101-1
* Tue May 6 2008 Bob Relyea <rrelyea@redhat.com> - 1.4.101-1
- Pick up 1.4.101
* Tue Feb 19 2008 Fedora Release Engineering <rel-eng@fedoraproject.org> - 1.4.4-3
@ -311,7 +522,7 @@ fi
- Silence libpcsc-lite even when the daemon isn't running.
- fix typo in init file which prevents the config file from being read.
* Tue Nov 22 2007 Bob Relyea <rrelyea@redhat.com> - 1.4.4-1
* Thu Nov 22 2007 Bob Relyea <rrelyea@redhat.com> - 1.4.4-1
- Pick up 1.4.4
* Tue Feb 06 2007 Bob Relyea <rrelyea@redhat.com> - 1.3.3-1
@ -328,7 +539,7 @@ fi
- follow packaging guidelines for setting up init service
(bug 200778)
* Sun Jul 24 2006 Bob Relyea <rrelyea@redhat.com> - 1.3.1-5
* Mon Jul 24 2006 Bob Relyea <rrelyea@redhat.com> - 1.3.1-5
- start pcscd when pcsc-lite is installed
* Sun Jul 16 2006 Florian La Roche <laroche@redhat.com> - 1.3.1-4
@ -366,7 +577,7 @@ fi
* Thu May 19 2005 Ville Skyttä <ville.skytta at iki.fi> - 1.2.0-12
- Rebuild.
* Fri Apr 7 2005 Michael Schwendt <mschwendt[AT]users.sf.net> - 1.2.0-11
* Thu Apr 7 2005 Michael Schwendt <mschwendt[AT]users.sf.net> - 1.2.0-11
- rebuilt
* Tue Aug 17 2004 Ville Skyttä <ville.skytta at iki.fi> - 0:1.2.0-10

View File

@ -1 +1,2 @@
1caf0b8ca2ecbf82fe3b035b3fff22dd pcsc-lite-1.7.4.tar.bz2
SHA512 (pcsc-lite-1.9.9.tar.bz2) = 748ec3d82ff48af1a8dc5a581863e5d94adc47ab8f3158ceb838c2b521ece3a746b737c7b4bb2ba8b545be85ff18b9639443864e50b2e065cf2fbfdf79ef9700
SHA512 (pcsc-lite-1.9.9.tar.bz2.asc) = b2f81fb9ec4dfdf73fce16b139206a5d606038d728ec6a5cdc5d3fb13b908add597baa490df9132155714b295222fef62ae2e0b50de212461af9ac8008297400