From 9bd02c279a6d74a44f236f4bbb01a3c62d292bf7532f1ccf1f2d38b2c734c165 Mon Sep 17 00:00:00 2001 From: Wolfgang Rosenauer Date: Tue, 5 Apr 2011 18:42:13 +0000 Subject: [PATCH] Accepting request 66063 from home:wrosenauer:devel OBS-URL: https://build.opensuse.org/request/show/66063 OBS-URL: https://build.opensuse.org/package/show/security:chipcard/pcsc-lite?expand=0&rev=43 --- README.SUSE | 2 +- pcsc-lite-1.6.6.tar.bz2 | 3 --- pcsc-lite-1.7.2.tar.bz2 | 3 +++ pcsc-lite-init | 11 +++++----- pcsc-lite.changes | 12 +++++++++++ pcsc-lite.spec | 48 +++++++++++++---------------------------- 6 files changed, 36 insertions(+), 43 deletions(-) delete mode 100644 pcsc-lite-1.6.6.tar.bz2 create mode 100644 pcsc-lite-1.7.2.tar.bz2 diff --git a/README.SUSE b/README.SUSE index a8ad333..33f4594 100644 --- a/README.SUSE +++ b/README.SUSE @@ -1,2 +1,2 @@ -On SUSE Linux, drivers for various card readers can be found +On openSUSE, drivers for various card readers can be found in separate packages named pcsc- diff --git a/pcsc-lite-1.6.6.tar.bz2 b/pcsc-lite-1.6.6.tar.bz2 deleted file mode 100644 index 6658062..0000000 --- a/pcsc-lite-1.6.6.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:7a94c27ae687619435b29ad63e0561aca20413333187b4301c75d1a1547ceea8 -size 480232 diff --git a/pcsc-lite-1.7.2.tar.bz2 b/pcsc-lite-1.7.2.tar.bz2 new file mode 100644 index 0000000..a67f862 --- /dev/null +++ b/pcsc-lite-1.7.2.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:41f13d552eaa2c3978fbb6f2125e81903a0767011d999052fd1a6ee03880b398 +size 484630 diff --git a/pcsc-lite-init b/pcsc-lite-init index 4aa455b..c85df66 100644 --- a/pcsc-lite-init +++ b/pcsc-lite-init @@ -17,7 +17,7 @@ # Required-Stop: $local_fs $remote_fs $syslog # Should-Start: udev hal openct # Should-Stop: udev hal openct -# Default-Start: 2 3 5 +# Default-Start: 2 3 4 5 # Default-Stop: 0 1 6 # Short-Description: Daemon to access a smart card using PC/SC # Description: The PC/SC smart card daemon is a resource manager for the @@ -46,21 +46,19 @@ if [ -f /etc/sysconfig/pcscd ] ; then fi start() { - echo -n $"Starting PC/SC smart card daemon ($prog): " + echo -n "Starting PC/SC smart card daemon ($prog): " startproc $exec $PCSCD_OPTIONS retval=$? rc_status - echo [ $retval -eq 0 ] && touch $lockfile rc_status -v } stop() { - echo -n $"Stopping PC/SC smart card daemon ($prog): " + echo -n "Stopping PC/SC smart card daemon ($prog): " killproc $exec retval=$? rc_status - echo - [ $retval -eq 0 ] && rm -f $lockfile + [ $retval -eq 0 ] && rm -f $lockfile && rm -f /var/run/pcscd/* rc_status -v } restart() { @@ -77,6 +75,7 @@ case "$1" in restart ;; status) + echo -n "Checking for PC/SC smart card daemon ($prog): " checkproc $exec rc_status -v ;; diff --git a/pcsc-lite.changes b/pcsc-lite.changes index 333e2ec..941226e 100644 --- a/pcsc-lite.changes +++ b/pcsc-lite.changes @@ -1,3 +1,15 @@ +------------------------------------------------------------------- +Tue Apr 5 09:37:24 UTC 2011 - wr@rosenauer.org + +- Updated to version 1.7.2: + * use libudev only on Linux and libusb elsewhere + * Try to use a (CCID) class driver if a specific driver fails + to use the reader. + * add support of multi-interfaces readers with libusb + * fix a problem with a multi-slots reader + * some other minor improvements and bug corrections +- cosmetic changes to init script output + ------------------------------------------------------------------- Mon Mar 7 14:44:11 UTC 2011 - coolo@novell.com diff --git a/pcsc-lite.spec b/pcsc-lite.spec index 5e41b37..65fea23 100644 --- a/pcsc-lite.spec +++ b/pcsc-lite.spec @@ -22,18 +22,22 @@ Name: pcsc-lite # FIXME: Maybe we should use /usr/lib/pcsc/drivers as others do: %define ifddir %{_libdir}/readers BuildRequires: pkg-config readline-devel -%if %suse_version >= 1110 +%if %suse_version >= 1120 +BuildRequires: libudev-devel +%endif +%if %suse_version == 1110 BuildRequires: libusb-1_0-devel -%else +%endif +%if %suse_version < 1110 BuildRequires: hal-devel %endif -Version: 1.6.6 -Release: 6 +Version: 1.7.2 +Release: 1 PreReq: %{insserv_prereq} %{fillup_prereq} Group: Productivity/Security License: BSD3c(or similar) Url: http://pcsclite.alioth.debian.org/ -Summary: PCS Smart Cards Library +Summary: PCSC Smart Cards Library Source: %{name}-%{version}.tar.bz2 Source1: %{name}.sysconfig Source2: README.SUSE @@ -67,15 +71,6 @@ an APDU like manner sent normally through the SCardTransmit() function. This functionality is exercised in the driver. - -Authors: --------- - David Corcoran - Ludovic Rousseau - Damien Sauveron - Carlos Prados - Antti Tapaninen - %package -n libpcsclite1 License: BSD3c(or similar) Group: System/Libraries @@ -99,15 +94,6 @@ an APDU like manner sent normally through the SCardTransmit() function. This functionality is exercised in the driver. - -Authors: --------- - David Corcoran - Ludovic Rousseau - Damien Sauveron - Carlos Prados - Antti Tapaninen - %package devel License: BSD3c(or similar) Group: Development/Libraries/C and C++ @@ -119,15 +105,6 @@ This package contains the development files for pcsc-lite. It allows to compile plugins for the pcsc-lite package. - -Authors: --------- - David Corcoran - Ludovic Rousseau - Damien Sauveron - Carlos Prados - Antti Tapaninen - %prep %setup -q cp -a %{S:1} %{S:2} %{S:5} %{S:6} . @@ -140,13 +117,18 @@ ACLOCAL="aclocal -I m4" autoreconf -f -i --docdir=%{_docdir}/%{name}\ --enable-usbdropdir=%{ifddir}\ %if %suse_version >= 1110 - --disable-libhal\ + --disable-libhal \ +%endif +%if %suse_version == 1110 + --disable-libudev \ %endif --disable-static make %{?jobs:-j%jobs} %install %makeinstall +mkdir -p $RPM_BUILD_ROOT%{ifddir} +mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/reader.conf.d/ sed s:@ifddir@:%{ifddir}: $RPM_BUILD_ROOT%{_sysconfdir}/reader.conf.d/reader.conf # this program is noinst in the package install src/.libs/testpcsc $RPM_BUILD_ROOT%{_sbindir}/