rpms/pcsc-lite/devel pcsc-lite-1.3.2-no-wakeup.patch, NONE, 1.1 pcsc-lite.spec, 1.6, 1.7

[fedora-cvs-commits at redhat.com]

Author: rrelyea

Update of /cvs/dist/rpms/pcsc-lite/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv25727/devel

Modified Files:
	pcsc-lite.spec 
Added Files:
	pcsc-lite-1.3.2-no-wakeup.patch 
Log Message:
auto-import pcsc-lite-1.3.1-7 on branch devel from pcsc-lite-1.3.1-7.src.rpm

pcsc-lite-1.3.2-no-wakeup.patch:
 winscard_msg_srv.c |    9 +--------
 1 files changed, 1 insertion(+), 8 deletions(-)

--- NEW FILE pcsc-lite-1.3.2-no-wakeup.patch ---
Modified: trunk/PCSC/src/winscard_msg_srv.c
===================================================================
--- trunk/PCSC/src/winscard_msg_srv.c	2006-09-05 12:01:43 UTC (rev 2147)
+++ trunk/PCSC/src/winscard_msg_srv.c	2006-09-05 16:39:58 UTC (rev 2148)
@@ -169,11 +169,7 @@
 {
 	fd_set read_fd;
 	int selret;
-	struct timeval tv;
 	
-	tv.tv_sec = 1;
-	tv.tv_usec = 0;
-
 	FD_ZERO(&read_fd);
 
 	/*
@@ -182,7 +178,7 @@
 	FD_SET(commonSocket, &read_fd);
 
 	selret = select(commonSocket + 1, &read_fd, (fd_set *) NULL,
-		(fd_set *) NULL, &tv);
+		(fd_set *) NULL, NULL);
 
 	if (selret < 0)
 	{
@@ -192,9 +188,6 @@
 		return -1;
 	}
 
-	if (selret == 0)
-		/* timeout */
-		return 2;
 	/*
 	 * A common pipe packet has arrived - it could be a new application  
 	 */


Index: pcsc-lite.spec
===================================================================
RCS file: /cvs/dist/rpms/pcsc-lite/devel/pcsc-lite.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- pcsc-lite.spec	31 Jul 2006 20:41:37 -0000	1.6
+++ pcsc-lite.spec	15 Sep 2006 17:53:51 -0000	1.7
@@ -1,6 +1,6 @@
 Name:           pcsc-lite
 Version:        1.3.1
-Release:        6
+Release:        7
 Summary:        PC/SC Lite smart card framework and applications
 
 Group:          System Environment/Daemons
@@ -9,6 +9,8 @@
 Source0:        http://alioth.debian.org/download.php/1565/%{name}-%{version}.tar.gz
 Patch0:         %{name}-docinst.patch
 Patch1:         %{name}-1.3.0-rpath64.patch
+Patch2:         %{name}-1.3.2-no-wakeup.patch
+
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  libusb-devel >= 0.1.7
@@ -59,8 +61,9 @@
 
 %prep
 %setup -q
-%patch0 -p0
-%patch1 -p1
+%patch0 -p0 -b .docinst
+%patch1 -p1 -b .rpath64
+%patch2 -p2 -b .no-wakeup
 
 %build
 %configure \
@@ -146,6 +149,10 @@
 
 
 %changelog
+* Thu Sep 14 2006  Bob Relyea <rrelyea at redhat.com> - 1.3.1-7
+- Incorporate patch from Ludovic to stop the pcsc daemon from
+  unnecessarily waking up.
+
 * Mon Jul 31 2006 Ray Strode <rstrode at redhat.com> - 1.3.1-6
 - follow packaging guidelines for setting up init service
   (bug 200778)