From 87ca8061dbf8f8bf96c73e6dc604ad409ae984d2 Mon Sep 17 00:00:00 2001
From: Kalev Lember <kalev@smartlink.ee>
Date: Feb 25 2011 15:40:15 +0000
Subject: Update to 1.6.7


Rebased noautostart patch.

---

diff --git a/.gitignore b/.gitignore
index 74e0692..f73c611 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,3 @@
 /pcsc-lite-1.6.4.tar.bz2
 /pcsc-lite-1.6.6.tar.bz2
+/pcsc-lite-1.6.7.tar.bz2
diff --git a/pcsc-lite-1.6.4-noautostart.patch b/pcsc-lite-1.6.4-noautostart.patch
deleted file mode 100644
index 6e58f8d..0000000
--- a/pcsc-lite-1.6.4-noautostart.patch
+++ /dev/null
@@ -1,99 +0,0 @@
-diff -up pcsc-lite-1.6.4/src/winscard_clnt.c.noautostart pcsc-lite-1.6.4/src/winscard_clnt.c
---- pcsc-lite-1.6.4/src/winscard_clnt.c.noautostart	2010-12-12 23:46:43.228293593 +0200
-+++ pcsc-lite-1.6.4/src/winscard_clnt.c	2010-12-12 23:52:44.388532774 +0200
-@@ -387,79 +387,15 @@ LONG SCardEstablishContext(DWORD dwScope
- 	LPCVOID pvReserved2, LPSCARDCONTEXT phContext)
- {
- 	LONG rv;
--	int daemon_launched = FALSE;
--	int retries = 0;
- 
- 	PROFILE_START
- 
--again:
- 	/* Check if the server is running */
- 	rv = SCardCheckDaemonAvailability();
- 	if (SCARD_E_INVALID_HANDLE == rv)
- 		/* we reconnected to a daemon or we got called from a forked child */
- 		rv = SCardCheckDaemonAvailability();
- 
--	if (SCARD_E_NO_SERVICE == rv)
--	{
--launch:
--		if (daemon_launched)
--		{
--			retries++;
--			if (retries < 50)	/* 50 x 100ms = 5 seconds */
--			{
--				/* give some more time to the server to start */
--				SYS_USleep(100*1000);	/* 100 ms */
--				goto again;
--			}
--
--			/* the server failed to start (in time) */
--			goto end;
--		}
--		else
--		{
--			int pid;
--
--			pid = fork();
--
--			if (pid < 0)
--			{
--				Log2(PCSC_LOG_CRITICAL, "fork failed: %s", strerror(errno));
--				rv = SCARD_F_INTERNAL_ERROR;
--				goto end;
--			}
--
--			if (0 == pid)
--			{
--				int ret, i, max;
--				char *param = getenv("PCSCLITE_PCSCD_ARGS");
--
--				/* close all file handles except stdin, stdout and
--				 * stderr so that pcscd does not confiscate ressources
--				 * allocated by the application */
--				max = sysconf(_SC_OPEN_MAX);
--				if (-1 == max)
--					max = 1024;
--				for (i=3; i<max; i++)
--					(void)close(i);
--
--				/* son process */
--				ret = execl(PCSCD_BINARY, "pcscd", "--auto-exit", param,
--					(char *)NULL);
--				Log2(PCSC_LOG_CRITICAL, "exec " PCSCD_BINARY " failed: %s",
--					strerror(errno));
--				exit(1);
--			}
--
--			/* father process */
--			daemon_launched = TRUE;
--
--			if (waitpid(pid, NULL, 0) < 0)
--				Log2(PCSC_LOG_CRITICAL, "waitpid failed: %s", strerror(errno));
--
--			goto again;
--		}
--	}
--
- 	if (rv != SCARD_S_SUCCESS)
- 		goto end;
- 
-@@ -468,15 +404,6 @@ launch:
- 		pvReserved2, phContext);
- 	(void)SCardUnlockThread();
- 
--	/* SCardEstablishContextTH may fail if the previous pcscd crashed
--	 * without cleaning /var/run/pcscd/pcscd.comm */
--	if (SCARD_E_NO_SERVICE == rv)
--	{
--		retries++;
--		if (retries <= 1)
--			goto launch;
--	}
--
- end:
- 	PROFILE_END(rv)
- 
diff --git a/pcsc-lite-1.6.7-noautostart.patch b/pcsc-lite-1.6.7-noautostart.patch
new file mode 100644
index 0000000..fe5a764
--- /dev/null
+++ b/pcsc-lite-1.6.7-noautostart.patch
@@ -0,0 +1,100 @@
+diff -up pcsc-lite-1.6.7/src/winscard_clnt.c.noautostart pcsc-lite-1.6.7/src/winscard_clnt.c
+--- pcsc-lite-1.6.7/src/winscard_clnt.c.noautostart	2011-02-23 00:20:25.000000000 +0200
++++ pcsc-lite-1.6.7/src/winscard_clnt.c	2011-02-25 17:17:32.201085695 +0200
+@@ -444,80 +444,16 @@ LONG SCardEstablishContext(DWORD dwScope
+ 	LPCVOID pvReserved2, LPSCARDCONTEXT phContext)
+ {
+ 	LONG rv;
+-	int daemon_launched = FALSE;
+-	int retries = 0;
+ 
+ 	API_TRACE_IN("%ld, %p, %p", dwScope, pvReserved1, pvReserved2)
+ 	PROFILE_START
+ 
+-again:
+ 	/* Check if the server is running */
+ 	rv = SCardCheckDaemonAvailability();
+ 	if (SCARD_E_INVALID_HANDLE == rv)
+ 		/* we reconnected to a daemon or we got called from a forked child */
+ 		rv = SCardCheckDaemonAvailability();
+ 
+-	if (SCARD_E_NO_SERVICE == rv)
+-	{
+-launch:
+-		if (daemon_launched)
+-		{
+-			retries++;
+-			if (retries < 50)	/* 50 x 100ms = 5 seconds */
+-			{
+-				/* give some more time to the server to start */
+-				SYS_USleep(100*1000);	/* 100 ms */
+-				goto again;
+-			}
+-
+-			/* the server failed to start (in time) */
+-			goto end;
+-		}
+-		else
+-		{
+-			int pid;
+-
+-			pid = fork();
+-
+-			if (pid < 0)
+-			{
+-				Log2(PCSC_LOG_CRITICAL, "fork failed: %s", strerror(errno));
+-				rv = SCARD_F_INTERNAL_ERROR;
+-				goto end;
+-			}
+-
+-			if (0 == pid)
+-			{
+-				int i, max;
+-				char *param = getenv("PCSCLITE_PCSCD_ARGS");
+-
+-				/* close all file handles except stdin, stdout and
+-				 * stderr so that pcscd does not confiscate ressources
+-				 * allocated by the application */
+-				max = sysconf(_SC_OPEN_MAX);
+-				if (-1 == max)
+-					max = 1024;
+-				for (i=3; i<max; i++)
+-					(void)close(i);
+-
+-				/* son process */
+-				execl(PCSCD_BINARY, "pcscd", "--auto-exit", param,
+-					(char *)NULL);
+-				Log2(PCSC_LOG_CRITICAL, "exec " PCSCD_BINARY " failed: %s",
+-					strerror(errno));
+-				exit(1);
+-			}
+-
+-			/* father process */
+-			daemon_launched = TRUE;
+-
+-			if (waitpid(pid, NULL, 0) < 0)
+-				Log2(PCSC_LOG_CRITICAL, "waitpid failed: %s", strerror(errno));
+-
+-			goto again;
+-		}
+-	}
+-
+ 	if (rv != SCARD_S_SUCCESS)
+ 		goto end;
+ 
+@@ -526,15 +462,6 @@ launch:
+ 		pvReserved2, phContext);
+ 	(void)SCardUnlockThread();
+ 
+-	/* SCardEstablishContextTH may fail if the previous pcscd crashed
+-	 * without cleaning /var/run/pcscd/pcscd.comm */
+-	if (SCARD_E_NO_SERVICE == rv)
+-	{
+-		retries++;
+-		if (retries <= 1)
+-			goto launch;
+-	}
+-
+ end:
+ 	PROFILE_END(rv)
+ 	API_TRACE_OUT("%ld", *phContext)
diff --git a/pcsc-lite.spec b/pcsc-lite.spec
index 88d2b3c..5510a4a 100644
--- a/pcsc-lite.spec
+++ b/pcsc-lite.spec
@@ -1,8 +1,8 @@
-%global upstream_build 3479
+%global upstream_build 3516
 
 Name:           pcsc-lite
-Version:        1.6.6
-Release:        3%{?dist}
+Version:        1.6.7
+Release:        1%{?dist}
 Summary:        PC/SC Lite smart card framework and applications
 
 Group:          System Environment/Daemons
@@ -13,7 +13,7 @@ Source1:        pcscd.init
 Patch0:         %{name}-1.4-docinst.patch
 Patch1:         %{name}-1.5.5-rpath64.patch
 # Disable pcscd on-demand startup (#653903)
-Patch2:         %{name}-1.6.4-noautostart.patch
+Patch2:         %{name}-1.6.7-noautostart.patch
 # Disable automatic card power down which seems to be unreliable at this point
 Patch3:         %{name}-1.6.6-no_auto_power_down
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -92,6 +92,10 @@ make install DESTDIR=$RPM_BUILD_ROOT
 
 install -Dpm 755 %{SOURCE1} $RPM_BUILD_ROOT%{_initrddir}/pcscd
 
+# Create empty directories
+mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/reader.conf.d
+mkdir -p $RPM_BUILD_ROOT%{_libdir}/pcsc
+
 # remove setuid bit
 chmod 0755 $RPM_BUILD_ROOT%{_sbindir}/pcscd
 
@@ -148,6 +152,10 @@ fi
 
 
 %changelog
+* Fri Feb 25 2011 Kalev Lember <kalev@smartlink.ee> - 1.6.7-1
+- Update to 1.6.7
+- Rebased noautostart patch
+
 * Tue Feb 08 2011 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.6.6-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild
 
diff --git a/sources b/sources
index 08d2abc..5f948d9 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-f80d3ecd9569b71d557f283f16295c74  pcsc-lite-1.6.6.tar.bz2
+62115ae6dc6fc23da7ffe50986e84eb7  pcsc-lite-1.6.7.tar.bz2