Hello community, here is the log from the commit of package pcsc-lite for openSUSE:Factory checked in at Wed May 4 14:03:08 CEST 2011.
-------- --- pcsc-lite/pcsc-lite.changes 2011-04-05 11:49:47.000000000 +0200 +++ /mounts/work_src_done/STABLE/pcsc-lite/pcsc-lite.changes 2011-05-03 22:17:00.000000000 +0200 @@ -1,0 +2,10 @@ +Tue May 3 20:15:49 UTC 2011 - [email protected] + +- make startup more robust by checking status files (bnc#686674) + +------------------------------------------------------------------- +Mon May 2 22:26:56 UTC 2011 - [email protected] + +- disable auto power off/on feature + +------------------------------------------------------------------- calling whatdependson for head-i586 New: ---- disable-power-off.diff ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ pcsc-lite.spec ++++++ --- /var/tmp/diff_new_pack.XqcRc1/_old 2011-05-04 13:59:33.000000000 +0200 +++ /var/tmp/diff_new_pack.XqcRc1/_new 2011-05-04 13:59:33.000000000 +0200 @@ -32,7 +32,7 @@ BuildRequires: hal-devel %endif Version: 1.7.2 -Release: 1 +Release: 2 PreReq: %{insserv_prereq} %{fillup_prereq} Group: Productivity/Security License: BSD3c(or similar) @@ -45,6 +45,7 @@ Source4: baselibs.conf Source5: pcsc-lite-init Source6: pcsc-lite-reader-conf +Patch0: disable-power-off.diff Requires: libpcsclite1 >= %{version} %if %suse_version > 1130 PreReq: sysvinit(syslog) @@ -107,6 +108,7 @@ %prep %setup -q +%patch0 cp -a %{S:1} %{S:2} %{S:5} %{S:6} . %build ++++++ disable-power-off.diff ++++++ Index: src/pcscd.h =================================================================== --- src/pcscd.h.orig +++ src/pcscd.h @@ -63,7 +63,7 @@ enum #define PCSCLITE_STATUS_EVENT_TIMEOUT 10*60*1000 /* 10 minutes */ /* Uncomment the next line if you do NOT want to use auto power off */ -/* #define DISABLE_ON_DEMAND_POWER_ON */ +#define DISABLE_ON_DEMAND_POWER_ON /* Uncomment the next line if you do not want the card to be powered on * when inserted */ Index: src/pcscd.h.in =================================================================== --- src/pcscd.h.in.orig +++ src/pcscd.h.in @@ -63,7 +63,7 @@ enum #define PCSCLITE_STATUS_EVENT_TIMEOUT 10*60*1000 /* 10 minutes */ /* Uncomment the next line if you do NOT want to use auto power off */ -/* #define DISABLE_ON_DEMAND_POWER_ON */ +#define DISABLE_ON_DEMAND_POWER_ON /* Uncomment the next line if you do not want the card to be powered on * when inserted */ ++++++ pcsc-lite-init ++++++ --- /var/tmp/diff_new_pack.XqcRc1/_old 2011-05-04 13:59:33.000000000 +0200 +++ /var/tmp/diff_new_pack.XqcRc1/_new 2011-05-04 13:59:33.000000000 +0200 @@ -45,8 +45,18 @@ . /etc/sysconfig/pcscd fi +cleanup() { + # if comm socket exists but pid file is absent pcscd fails to start + # bnc#686674 + if [ -S /var/run/pcscd/pcscd.comm -a ! -e /var/run/pcscd/pcscd.pid ]; then + # check if a pcscd instance is running and remove the socket in case it's not + checkproc $exec || rm /var/run/pcscd/pcscd.comm + fi +} + start() { echo -n "Starting PC/SC smart card daemon ($prog): " + cleanup startproc $exec $PCSCD_OPTIONS retval=$? rc_status @@ -58,7 +68,7 @@ killproc $exec retval=$? rc_status - [ $retval -eq 0 ] && rm -f $lockfile && rm -f /var/run/pcscd/* + [ $retval -eq 0 ] && rm -f $lockfile rc_status -v } restart() { ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
