From 0222d2ce6e355ecef5953ebce3c64138b69ea18d Mon Sep 17 00:00:00 2001 From: Robert Relyea Date: Wed, 16 Jan 2008 23:33:19 +0000 Subject: [PATCH] Fix typo. Quite warnings --- pcsc-lite-1.4.4-quiet.patch | 20 ++++++++++++++++++++ pcsc-lite-1.4.4-service.patch | 11 +++++++++++ pcsc-lite.spec | 11 ++++++++++- 3 files changed, 41 insertions(+), 1 deletion(-) create mode 100644 pcsc-lite-1.4.4-quiet.patch create mode 100644 pcsc-lite-1.4.4-service.patch diff --git a/pcsc-lite-1.4.4-quiet.patch b/pcsc-lite-1.4.4-quiet.patch new file mode 100644 index 0000000..69069c5 --- /dev/null +++ b/pcsc-lite-1.4.4-quiet.patch @@ -0,0 +1,20 @@ +--- ./src/winscard_clnt.c.quiet 2008-01-16 12:35:22.351449000 -0800 ++++ ./src/winscard_clnt.c 2008-01-16 12:35:38.034369000 -0800 +@@ -3415,7 +3415,7 @@ + + if (rv != 0) + { +- Log1(PCSC_LOG_ERROR, "PCSC Not Running"); ++ Log1(PCSC_LOG_INFO, "PCSC Not Running"); + return SCARD_E_NO_SERVICE; + } + +@@ -3434,7 +3434,7 @@ + { + int i; + +- Log1(PCSC_LOG_ERROR, "PCSC restarted"); ++ Log1(PCSC_LOG_INFO, "PCSC restarted"); + + /* invalid all handles */ + SCardLockThread(); diff --git a/pcsc-lite-1.4.4-service.patch b/pcsc-lite-1.4.4-service.patch new file mode 100644 index 0000000..7538a08 --- /dev/null +++ b/pcsc-lite-1.4.4-service.patch @@ -0,0 +1,11 @@ +--- ./etc/pcscd.init.in.service 2008-01-16 12:50:03.040049000 -0800 ++++ ./etc/pcscd.init.in 2008-01-16 12:50:29.460919000 -0800 +@@ -37,7 +37,7 @@ + PCSCD_OPTIONS= + + # Source config +-if [ -f @sysconfdir_exp@/sysconfig/pscsd ] ; then ++if [ -f @sysconfdir_exp@/sysconfig/pcscd ] ; then + . @sysconfdir_exp@/sysconfig/pcscd + fi + diff --git a/pcsc-lite.spec b/pcsc-lite.spec index 477b189..41d223d 100644 --- a/pcsc-lite.spec +++ b/pcsc-lite.spec @@ -1,6 +1,6 @@ Name: pcsc-lite Version: 1.4.4 -Release: 1%{dist} +Release: 2%{dist} Summary: PC/SC Lite smart card framework and applications Group: System Environment/Daemons @@ -9,6 +9,9 @@ URL: http://pcsclite.alioth.debian.org/ Source0: http://alioth.debian.org/download.php/2106/%{name}-%{version}.tar.gz Patch0: %{name}-1.4-docinst.patch Patch1: %{name}-1.3.0-rpath64.patch +# upstream rev 2731 +Patch2: %{name}-1.4.4-quiet.patch +Patch3: %{name}-1.4.4-service.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -62,6 +65,8 @@ Group: Documentation %setup -q %patch0 -p0 -b .docinst %patch1 -p1 -b .rpath64 +%patch2 -p0 -b .quiet +%patch3 -p0 -b .service %build %configure \ @@ -148,6 +153,10 @@ fi %changelog +* Wed Jan 16 2008 Bob Relyea - 1.4.4-2 +- 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 - 1.4.4-1 - Pick up 1.4.4