Update to 1.6.7
Rebased noautostart patch.
This commit is contained in:
parent
3ea230dc78
commit
87ca8061db
1
.gitignore
vendored
1
.gitignore
vendored
@ -1,2 +1,3 @@
|
|||||||
/pcsc-lite-1.6.4.tar.bz2
|
/pcsc-lite-1.6.4.tar.bz2
|
||||||
/pcsc-lite-1.6.6.tar.bz2
|
/pcsc-lite-1.6.6.tar.bz2
|
||||||
|
/pcsc-lite-1.6.7.tar.bz2
|
||||||
|
@ -1,13 +1,14 @@
|
|||||||
diff -up pcsc-lite-1.6.4/src/winscard_clnt.c.noautostart pcsc-lite-1.6.4/src/winscard_clnt.c
|
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.4/src/winscard_clnt.c.noautostart 2010-12-12 23:46:43.228293593 +0200
|
--- pcsc-lite-1.6.7/src/winscard_clnt.c.noautostart 2011-02-23 00:20:25.000000000 +0200
|
||||||
+++ pcsc-lite-1.6.4/src/winscard_clnt.c 2010-12-12 23:52:44.388532774 +0200
|
+++ pcsc-lite-1.6.7/src/winscard_clnt.c 2011-02-25 17:17:32.201085695 +0200
|
||||||
@@ -387,79 +387,15 @@ LONG SCardEstablishContext(DWORD dwScope
|
@@ -444,80 +444,16 @@ LONG SCardEstablishContext(DWORD dwScope
|
||||||
LPCVOID pvReserved2, LPSCARDCONTEXT phContext)
|
LPCVOID pvReserved2, LPSCARDCONTEXT phContext)
|
||||||
{
|
{
|
||||||
LONG rv;
|
LONG rv;
|
||||||
- int daemon_launched = FALSE;
|
- int daemon_launched = FALSE;
|
||||||
- int retries = 0;
|
- int retries = 0;
|
||||||
|
|
||||||
|
API_TRACE_IN("%ld, %p, %p", dwScope, pvReserved1, pvReserved2)
|
||||||
PROFILE_START
|
PROFILE_START
|
||||||
|
|
||||||
-again:
|
-again:
|
||||||
@ -48,7 +49,7 @@ diff -up pcsc-lite-1.6.4/src/winscard_clnt.c.noautostart pcsc-lite-1.6.4/src/win
|
|||||||
-
|
-
|
||||||
- if (0 == pid)
|
- if (0 == pid)
|
||||||
- {
|
- {
|
||||||
- int ret, i, max;
|
- int i, max;
|
||||||
- char *param = getenv("PCSCLITE_PCSCD_ARGS");
|
- char *param = getenv("PCSCLITE_PCSCD_ARGS");
|
||||||
-
|
-
|
||||||
- /* close all file handles except stdin, stdout and
|
- /* close all file handles except stdin, stdout and
|
||||||
@ -61,7 +62,7 @@ diff -up pcsc-lite-1.6.4/src/winscard_clnt.c.noautostart pcsc-lite-1.6.4/src/win
|
|||||||
- (void)close(i);
|
- (void)close(i);
|
||||||
-
|
-
|
||||||
- /* son process */
|
- /* son process */
|
||||||
- ret = execl(PCSCD_BINARY, "pcscd", "--auto-exit", param,
|
- execl(PCSCD_BINARY, "pcscd", "--auto-exit", param,
|
||||||
- (char *)NULL);
|
- (char *)NULL);
|
||||||
- Log2(PCSC_LOG_CRITICAL, "exec " PCSCD_BINARY " failed: %s",
|
- Log2(PCSC_LOG_CRITICAL, "exec " PCSCD_BINARY " failed: %s",
|
||||||
- strerror(errno));
|
- strerror(errno));
|
||||||
@ -81,7 +82,7 @@ diff -up pcsc-lite-1.6.4/src/winscard_clnt.c.noautostart pcsc-lite-1.6.4/src/win
|
|||||||
if (rv != SCARD_S_SUCCESS)
|
if (rv != SCARD_S_SUCCESS)
|
||||||
goto end;
|
goto end;
|
||||||
|
|
||||||
@@ -468,15 +404,6 @@ launch:
|
@@ -526,15 +462,6 @@ launch:
|
||||||
pvReserved2, phContext);
|
pvReserved2, phContext);
|
||||||
(void)SCardUnlockThread();
|
(void)SCardUnlockThread();
|
||||||
|
|
||||||
@ -96,4 +97,4 @@ diff -up pcsc-lite-1.6.4/src/winscard_clnt.c.noautostart pcsc-lite-1.6.4/src/win
|
|||||||
-
|
-
|
||||||
end:
|
end:
|
||||||
PROFILE_END(rv)
|
PROFILE_END(rv)
|
||||||
|
API_TRACE_OUT("%ld", *phContext)
|
@ -1,8 +1,8 @@
|
|||||||
%global upstream_build 3479
|
%global upstream_build 3516
|
||||||
|
|
||||||
Name: pcsc-lite
|
Name: pcsc-lite
|
||||||
Version: 1.6.6
|
Version: 1.6.7
|
||||||
Release: 3%{?dist}
|
Release: 1%{?dist}
|
||||||
Summary: PC/SC Lite smart card framework and applications
|
Summary: PC/SC Lite smart card framework and applications
|
||||||
|
|
||||||
Group: System Environment/Daemons
|
Group: System Environment/Daemons
|
||||||
@ -13,7 +13,7 @@ Source1: pcscd.init
|
|||||||
Patch0: %{name}-1.4-docinst.patch
|
Patch0: %{name}-1.4-docinst.patch
|
||||||
Patch1: %{name}-1.5.5-rpath64.patch
|
Patch1: %{name}-1.5.5-rpath64.patch
|
||||||
# Disable pcscd on-demand startup (#653903)
|
# 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
|
# Disable automatic card power down which seems to be unreliable at this point
|
||||||
Patch3: %{name}-1.6.6-no_auto_power_down
|
Patch3: %{name}-1.6.6-no_auto_power_down
|
||||||
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
|
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
|
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
|
# remove setuid bit
|
||||||
chmod 0755 $RPM_BUILD_ROOT%{_sbindir}/pcscd
|
chmod 0755 $RPM_BUILD_ROOT%{_sbindir}/pcscd
|
||||||
|
|
||||||
@ -148,6 +152,10 @@ fi
|
|||||||
|
|
||||||
|
|
||||||
%changelog
|
%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
|
* 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
|
- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user