Accepting request 55916 from home:duwe:Factory

OBS-URL: https://build.opensuse.org/request/show/55916
OBS-URL: https://build.opensuse.org/package/show/security:chipcard/pcsc-lite?expand=0&rev=32

pcsc-lite-1.5.5.tar.bz2

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

pcsc-lite-1.6.5.tar.bz2

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

pcsc-lite.changes

@@ -1,3 +1,11 @@
+-------------------------------------------------------------------
+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
 

pcsc-lite.spec

@@ -22,9 +22,9 @@ 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.5.5
+Version:        1.6.5
 Release:        2
-PreReq:         %{insserv_prereq} %{fillup_prereq}
+PreReq:         %{insserv_prereq} %{fillup_prereq} sysvinit(syslog)
 Group:          Productivity/Security
 License:        BSD3c(or similar)
 Url:            http://pcsclite.alioth.debian.org/
@@ -34,7 +34,7 @@ Source1:        %{name}.sysconfig
 Source2:        README.SUSE
 Source3:        pre_checkin.sh
 Source4:        baselibs.conf
-Patch1:         pcsc-lite-init.patch
+Source5:	rcpcscd
 Requires:       libpcsclite1 >= %{version}
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 
@@ -120,7 +120,6 @@ Authors:
 %prep
 %setup -q
 cp -a %{S:1} %{S:2} .
-%patch1
 
 %build
 %if %suse_version > 1110
@@ -135,11 +134,11 @@ make %{?jobs:-j%jobs}
 %install
 %makeinstall
 touch $RPM_BUILD_ROOT%{_sysconfdir}/reader.conf
-mkdir $RPM_BUILD_ROOT%{ifddir}
+mkdir -p $RPM_BUILD_ROOT%{ifddir}
 # this program is noinst in the package
 install src/.libs/testpcsc $RPM_BUILD_ROOT%{_sbindir}/
-mkdir $RPM_BUILD_ROOT/etc/init.d
+mkdir -p $RPM_BUILD_ROOT/etc/init.d
-install -m 755 etc/pcscd.init $RPM_BUILD_ROOT/etc/init.d/pcscd
+install -m 755 %{S:5} $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
@@ -170,9 +169,8 @@ rm -rf $RPM_BUILD_ROOT
 %{_libdir}/*.so
 %doc %{_mandir}/man?/*.*
 %{_sbindir}/*
-%ghost %{_sysconfdir}/reader.conf
 %dir %{_sysconfdir}/reader.conf.d
-%config %{_sysconfdir}/reader.conf.d/reader.conf
+%config %{_sysconfdir}/reader.conf
 %{ifddir}
 /etc/init.d/pcscd
 /var/adm/fillup-templates/sysconfig.pcscd

rcpcscd

@@ -0,0 +1,95 @@
+#!/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