Updated to pcsc-lite 1.5.5
This commit is contained in:
Kalev Lember
parent
482276a8d0
commit
673c7d91d5
|
|
@ -1 +1 @@
|
|||
pcsc-lite-1.5.2.tar.bz2
|
||||
pcsc-lite-1.5.5.tar.bz2
|
||||
|
|
|
|||
|
|
@ -1,49 +0,0 @@
|
|||
diff -up ./src/pcscdaemon.c.permissions ./src/pcscdaemon.c
|
||||
--- ./src/pcscdaemon.c.permissions 2009-02-06 00:46:20.000000000 -0800
|
||||
+++ ./src/pcscdaemon.c 2009-06-17 10:06:49.419656000 -0700
|
||||
@@ -438,7 +438,8 @@ int main(int argc, char **argv)
|
||||
rv = SYS_Stat(PCSCLITE_EVENTS_DIR, &fStatBuf);
|
||||
if (rv < 0)
|
||||
{
|
||||
- int mode = S_IRWXU | S_IWGRP | S_IXGRP | S_IWOTH | S_IXOTH; /* 0755 */
|
||||
+ /* 1733 : world writable + sticky bit */
|
||||
+ int mode = S_IRWXU | S_IWGRP | S_IXGRP | S_IWOTH | S_IXOTH | S_ISVTX;
|
||||
|
||||
rv = SYS_Mkdir(PCSCLITE_EVENTS_DIR, mode);
|
||||
if (rv != 0)
|
||||
diff -up ./src/winscard_clnt.c.permissions ./src/winscard_clnt.c
|
||||
--- ./src/winscard_clnt.c.permissions 2009-02-06 00:46:20.000000000 -0800
|
||||
+++ ./src/winscard_clnt.c 2009-06-17 10:07:32.392742000 -0700
|
||||
@@ -1717,7 +1717,7 @@ static long WaitForPcscdEvent(SCARDCONTE
|
||||
{
|
||||
char filename[FILENAME_MAX];
|
||||
char buf[1];
|
||||
- int fd;
|
||||
+ int fd, r;
|
||||
struct timeval tv, *ptv = NULL;
|
||||
struct timeval before, after;
|
||||
fd_set read_fd;
|
||||
@@ -1734,7 +1734,14 @@ static long WaitForPcscdEvent(SCARDCONTE
|
||||
|
||||
(void)snprintf(filename, sizeof(filename), "%s/event.%d.%ld",
|
||||
PCSCLITE_EVENTS_DIR, SYS_GetPID(), hContext);
|
||||
- (void)mkfifo(filename, 0644);
|
||||
+ r = mkfifo(filename, 0644);
|
||||
+ if (-1 == r)
|
||||
+ {
|
||||
+ Log2(PCSC_LOG_CRITICAL, "Can't create event fifo: %s", strerror(errno));
|
||||
+ goto exit;
|
||||
+ }
|
||||
+
|
||||
+
|
||||
fd = SYS_OpenFile(filename, O_RDONLY | O_NONBLOCK, 0);
|
||||
|
||||
FD_ZERO(&read_fd);
|
||||
@@ -1755,6 +1762,7 @@ static long WaitForPcscdEvent(SCARDCONTE
|
||||
dwTime -= diff/1000;
|
||||
}
|
||||
|
||||
+exit:
|
||||
return dwTime;
|
||||
}
|
||||
|
||||
|
|
@ -1,20 +1,20 @@
|
|||
--- pcsc-lite-1.4.101/configure.rpath64 2008-04-30 08:14:32.000000000 -0700
|
||||
+++ pcsc-lite-1.4.101/configure 2008-05-06 17:13:11.168871000 -0700
|
||||
@@ -10503,7 +10503,7 @@
|
||||
--- pcsc-lite-1.5.5/configure.rpath64 2009-11-18 14:03:19.000000000 +0200
|
||||
+++ pcsc-lite-1.5.5/configure 2009-11-18 14:06:08.000000000 +0200
|
||||
@@ -11135,7 +11135,7 @@
|
||||
shlibpath_overrides_runpath=unknown
|
||||
version_type=none
|
||||
dynamic_linker="$host_os ld.so"
|
||||
-sys_lib_dlsearch_path_spec="/lib /usr/lib"
|
||||
+sys_lib_dlsearch_path_spec="/lib64 /usr/lib64 /lib /usr/lib"
|
||||
need_lib_prefix=unknown
|
||||
hardcode_into_libs=no
|
||||
|
||||
if test "$GCC" = yes; then
|
||||
case $host_os in
|
||||
@@ -10902,7 +10902,7 @@
|
||||
@@ -11552,7 +11552,7 @@
|
||||
# Append ld.so.conf contents to the search path
|
||||
if test -f /etc/ld.so.conf; then
|
||||
lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s 2>/dev/null", \$2)); skip = 1; } { if (!skip) print \$0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;/^[ ]*hwcap[ ]/d;s/[:, ]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;/^$/d' | tr '\n' ' '`
|
||||
lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s 2>/dev/null", \$2)); skip = 1; } { if (!skip) print \$0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;/^[ ]*hwcap[ ]/d;s/[:, ]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;/^$/d' | tr '\n' ' '`
|
||||
- sys_lib_dlsearch_path_spec="/lib /usr/lib $lt_ld_extra"
|
||||
+ sys_lib_dlsearch_path_spec="/lib64 /usr/lib/64 /lib /usr/lib $lt_ld_extra"
|
||||
+ sys_lib_dlsearch_path_spec="/lib64 /usr/lib64 /lib /usr/lib $lt_ld_extra"
|
||||
fi
|
||||
|
||||
# We used to test for /lib/ld.so.1 and disable shared libraries on
|
||||
|
|
@ -1,17 +1,16 @@
|
|||
Name: pcsc-lite
|
||||
Version: 1.5.2
|
||||
Release: 3%{?dist}
|
||||
Version: 1.5.5
|
||||
Release: 1%{?dist}
|
||||
Summary: PC/SC Lite smart card framework and applications
|
||||
%define upstream_build 2795
|
||||
%define upstream_build 3082
|
||||
|
||||
Group: System Environment/Daemons
|
||||
License: BSD
|
||||
URL: http://pcsclite.alioth.debian.org/
|
||||
Source0: http://alioth.debian.org/download.php/%{upstream_build}/%{name}-%{version}.tar.bz2
|
||||
Patch0: %{name}-1.4-docinst.patch
|
||||
Patch1: %{name}-1.4.100-rpath64.patch
|
||||
Patch1: %{name}-1.5.5-rpath64.patch
|
||||
Patch2: %{name}-close_on_exec.patch
|
||||
Patch3: %{name}-1.5-permissions.patch
|
||||
|
||||
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
|
||||
|
||||
|
|
@ -65,7 +64,6 @@ Group: Documentation
|
|||
%patch0 -p0 -b .docinst
|
||||
%patch1 -p1 -b .rpath64
|
||||
%patch2 -p1 -b .close_on_exec
|
||||
%patch3 -p0 -b .permissions
|
||||
|
||||
%build
|
||||
%configure \
|
||||
|
|
@ -152,6 +150,11 @@ fi
|
|||
|
||||
|
||||
%changelog
|
||||
* Wed Nov 18 2009 Kalev Lember <kalev@smartlink.ee> - 1.5.5-1
|
||||
- Updated to pcsc-lite 1.5.5
|
||||
- Rebased rpath64 patch
|
||||
- Dropped upstreamed pcsc-lite-1.5-permissions.patch
|
||||
|
||||
* Sat Jul 25 2009 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.5.2-3
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
|
||||
|
||||
|
|
|
|||
Loading…
Reference in New Issue