revert to factory version for now

OBS-URL: https://build.opensuse.org/package/show/security:chipcard/pcsc-lite?expand=0&rev=34
This commit is contained in:
Wolfgang Rosenauer
2010-12-21 21:14:09 +00:00
committed by Git OBS Bridge
parent 5b98dde807
commit d36c3ec764
6 changed files with 105 additions and 122 deletions

3
pcsc-lite-1.5.5.tar.bz2 Normal file
View File

@@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:051de6f3c1deff9a9c6f72995f6b9d271a23fc8aea74737f1902cabf1a71ed26
size 465947

View File

@@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:ddbb0b6ef334103c76b49652826056c36cf7519f961fd07e5b1cd897b392a29b
size 480154

66
pcsc-lite-init.patch Normal file
View File

@@ -0,0 +1,66 @@
--- etc/pcscd.init.in
+++ etc/pcscd.init.in
@@ -24,12 +24,14 @@
# PC/SC lite and Musclecard frameworks. It coordinates
# communications with smart card readers, smart cards, and
# cryptographic tokens that are connected to the system.
+# X-UnitedLinux-Default-Enabled: yes
### END INIT INFO
#
# Note! pcscd should be started after pcmcia, and shut down before it
# for smooth experience with PCMCIA readers.
-. @sysconfdir_exp@/init.d/functions
+. @sysconfdir_exp@/rc.status
+rc_reset
umask 077
@@ -45,19 +47,21 @@
start() {
echo -n $"Starting PC/SC smart card daemon ($prog): "
- @sbindir_exp@/update-reader.conf && daemon $prog $PCSCD_OPTIONS
+ @sbindir_exp@/update-reader.conf && startproc $exec $PCSCD_OPTIONS
retval=$?
+ rc_status
echo
[ $retval -eq 0 ] && touch $lockfile
- return $retval
+ rc_status -v
}
stop() {
echo -n $"Stopping PC/SC smart card daemon ($prog): "
- killproc $prog
+ killproc $exec
retval=$?
+ rc_status
echo
[ $retval -eq 0 ] && rm -f $lockfile
- return $retval
+ rc_status -v
}
restart() {
stop
@@ -73,12 +77,19 @@
restart
;;
status)
- status $prog
+ checkproc $exec
+ rc_status -v
;;
condrestart|try-restart)
- [ ! -f $lockfile ] || restart
+ if test -f $lockfile ; then
+ restart
+ else
+ rc_reset
+ fi
+ rc_status
;;
*)
echo $"Usage: $0 {start|stop|status|restart|try-restart|reload|force-reload}"
exit 2
esac
+rc_exit

View File

@@ -1,17 +1,3 @@
-------------------------------------------------------------------
Tue Dec 21 20:19:48 UTC 2010 - wr@rosenauer.org
- keep it building for older distributions as well by moving
the sysvinit requirement into a conditional
-------------------------------------------------------------------
Thu Dec 9 15:52:33 CET 2010 - duwe@suse.de
- update to 1.6.5 (many minor improvements)
- copy rc script from old version
- drop obsolete (?) config file reader.conf in
favour of reader.conf.d
-------------------------------------------------------------------
Tue Dec 15 01:39:25 CET 2009 - jengelh@medozas.de

View File

@@ -1,5 +1,5 @@
#
# spec file for package pcsc-lite (Version 1.6.5)
# spec file for package pcsc-lite (Version 1.5.5)
#
# Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany.
#
@@ -22,7 +22,7 @@ Name: pcsc-lite
# FIXME: Maybe we should use /usr/lib/pcsc/drivers as others do:
%define ifddir %{_libdir}/readers
BuildRequires: hal-devel pkg-config readline-devel
Version: 1.6.5
Version: 1.5.5
Release: 2
PreReq: %{insserv_prereq} %{fillup_prereq}
Group: Productivity/Security
@@ -34,11 +34,8 @@ Source1: %{name}.sysconfig
Source2: README.SUSE
Source3: pre_checkin.sh
Source4: baselibs.conf
Source5: rcpcscd
Patch1: pcsc-lite-init.patch
Requires: libpcsclite1 >= %{version}
%if %suse_version > 1130
Requires: sysvinit(syslog)
%endif
BuildRoot: %{_tmppath}/%{name}-%{version}-build
%description
@@ -59,6 +56,15 @@ an APDU like manner sent normally through the SCardTransmit() function.
This functionality is exercised in the driver.
Authors:
--------
David Corcoran <corcoran@linuxnet.com>
Ludovic Rousseau <ludovic.rousseau@free.fr>
Damien Sauveron <sauveron@labri.fr>
Carlos Prados <cprados@yahoo.com>
Antti Tapaninen <aet@cc.hut.fi>
%package -n libpcsclite1
License: BSD3c(or similar)
Group: System/Libraries
@@ -82,6 +88,15 @@ an APDU like manner sent normally through the SCardTransmit() function.
This functionality is exercised in the driver.
Authors:
--------
David Corcoran <corcoran@linuxnet.com>
Ludovic Rousseau <ludovic.rousseau@free.fr>
Damien Sauveron <sauveron@labri.fr>
Carlos Prados <cprados@yahoo.com>
Antti Tapaninen <aet@cc.hut.fi>
%package devel
License: BSD3c(or similar)
Group: Development/Libraries/C and C++
@@ -93,9 +108,19 @@ This package contains the development files for pcsc-lite. It allows to
compile plugins for the pcsc-lite package.
Authors:
--------
David Corcoran <corcoran@linuxnet.com>
Ludovic Rousseau <ludovic.rousseau@free.fr>
Damien Sauveron <sauveron@labri.fr>
Carlos Prados <cprados@yahoo.com>
Antti Tapaninen <aet@cc.hut.fi>
%prep
%setup -q
cp -a %{S:1} %{S:2} .
%patch1
%build
%if %suse_version > 1110
@@ -110,11 +135,11 @@ make %{?jobs:-j%jobs}
%install
%makeinstall
touch $RPM_BUILD_ROOT%{_sysconfdir}/reader.conf
mkdir -p $RPM_BUILD_ROOT%{ifddir}
mkdir $RPM_BUILD_ROOT%{ifddir}
# this program is noinst in the package
install src/.libs/testpcsc $RPM_BUILD_ROOT%{_sbindir}/
mkdir -p $RPM_BUILD_ROOT/etc/init.d
install -m 755 %{S:5} $RPM_BUILD_ROOT/etc/init.d/pcscd
mkdir $RPM_BUILD_ROOT/etc/init.d
install -m 755 etc/pcscd.init $RPM_BUILD_ROOT/etc/init.d/pcscd
ln -sf ../../etc/init.d/pcscd $RPM_BUILD_ROOT%{_sbindir}/rcpcscd
mkdir -p $RPM_BUILD_ROOT/var/adm/fillup-templates
cp %{name}.sysconfig $RPM_BUILD_ROOT/var/adm/fillup-templates/sysconfig.pcscd
@@ -145,8 +170,9 @@ rm -rf $RPM_BUILD_ROOT
%{_libdir}/*.so
%doc %{_mandir}/man?/*.*
%{_sbindir}/*
%ghost %{_sysconfdir}/reader.conf
%dir %{_sysconfdir}/reader.conf.d
%config %{_sysconfdir}/reader.conf
%config %{_sysconfdir}/reader.conf.d/reader.conf
%{ifddir}
/etc/init.d/pcscd
/var/adm/fillup-templates/sysconfig.pcscd

95
rcpcscd
View File

@@ -1,95 +0,0 @@
#!/bin/sh
#
# pcscd Starts the pcscd Daemon
#
# chkconfig: 2345 25 88
# description: The PC/SC smart card daemon is a resource manager for the \
# PC/SC lite and Musclecard frameworks. It coordinates \
# communications with smart card readers, smart cards, and \
# cryptographic tokens that are connected to the system.
#
# processname: pcscd
# config: /etc/reader.conf.d
#
### BEGIN INIT INFO
# Provides: pcscd
# Required-Start: $local_fs $remote_fs $syslog
# Required-Stop: $local_fs $remote_fs $syslog
# Should-Start: udev hal openct
# Should-Stop: udev hal openct
# Default-Start: 2 3 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
# PC/SC lite and Musclecard frameworks. It coordinates
# communications with smart card readers, smart cards, and
# cryptographic tokens that are connected to the system.
# X-UnitedLinux-Default-Enabled: yes
### END INIT INFO
#
# Note! pcscd should be started after pcmcia, and shut down before it
# for smooth experience with PCMCIA readers.
. /etc/rc.status
rc_reset
umask 077
exec=/usr/sbin/pcscd
prog=$(basename $exec)
lockfile=/var/lock/subsys/$prog
PCSCD_OPTIONS=
# Source config
if [ -f /etc/sysconfig/pcscd ] ; then
. /etc/sysconfig/pcscd
fi
start() {
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): "
killproc $exec
retval=$?
rc_status
echo
[ $retval -eq 0 ] && rm -f $lockfile
rc_status -v
}
restart() {
stop
start
}
case "$1" in
start|stop|restart)
$1
;;
reload|force-reload)
restart
;;
status)
checkproc $exec
rc_status -v
;;
condrestart|try-restart)
if test -f $lockfile ; then
restart
else
rc_reset
fi
rc_status
;;
*)
echo $"Usage: $0 {start|stop|status|restart|try-restart|reload|force-reload}"
exit 2
esac
rc_exit