Compare commits
3 Commits
Author | SHA1 | Date | |
---|---|---|---|
|
ad0ddbabee | ||
|
60ef11679e | ||
|
9e3ab8862c |
2
.gitignore
vendored
2
.gitignore
vendored
@ -1,2 +1,4 @@
|
|||||||
/pcsc-lite-*.tar.bz2
|
/pcsc-lite-*.tar.bz2
|
||||||
/pcsc-lite-1.8.11.tar.bz2.asc
|
/pcsc-lite-1.8.11.tar.bz2.asc
|
||||||
|
/pcsc-lite-1.8.12.tar.bz2.asc
|
||||||
|
/pcsc-lite-1.8.13.tar.bz2.asc
|
||||||
|
@ -1,8 +1,8 @@
|
|||||||
%global upstream_build 3963
|
%global upstream_build 3963
|
||||||
|
|
||||||
Name: pcsc-lite
|
Name: pcsc-lite
|
||||||
Version: 1.8.11
|
Version: 1.8.13
|
||||||
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
|
||||||
@ -10,7 +10,6 @@ License: BSD
|
|||||||
URL: http://pcsclite.alioth.debian.org/
|
URL: http://pcsclite.alioth.debian.org/
|
||||||
Source0: https://alioth.debian.org/frs/download.php/file/%{upstream_build}/%{name}-%{version}.tar.bz2
|
Source0: https://alioth.debian.org/frs/download.php/file/%{upstream_build}/%{name}-%{version}.tar.bz2
|
||||||
Source1: org.debian.pcsc-lite.policy
|
Source1: org.debian.pcsc-lite.policy
|
||||||
Patch0: pcscd-1.8.10-safer-udev-usage.patch
|
|
||||||
|
|
||||||
BuildRequires: doxygen
|
BuildRequires: doxygen
|
||||||
BuildRequires: graphviz
|
BuildRequires: graphviz
|
||||||
@ -65,8 +64,6 @@ Requires: %{name}-libs = %{version}-%{release}
|
|||||||
%prep
|
%prep
|
||||||
%setup -q
|
%setup -q
|
||||||
|
|
||||||
%patch0 -p1 -b .udev
|
|
||||||
|
|
||||||
# Convert to utf-8
|
# Convert to utf-8
|
||||||
for file in ChangeLog; do
|
for file in ChangeLog; do
|
||||||
iconv -f ISO-8859-1 -t UTF-8 -o $file.new $file && \
|
iconv -f ISO-8859-1 -t UTF-8 -o $file.new $file && \
|
||||||
@ -147,6 +144,12 @@ rm $RPM_BUILD_ROOT%{_docdir}/pcsc-lite/README.DAEMON
|
|||||||
|
|
||||||
|
|
||||||
%changelog
|
%changelog
|
||||||
|
* Fri Nov 7 2014 Nikos Mavrogiannopoulos <nmav@redhat.com> - 1.8.13-1
|
||||||
|
- New upstream release
|
||||||
|
|
||||||
|
* Wed Sep 24 2014 Nikos Mavrogiannopoulos <nmav@redhat.com> - 1.8.12-1
|
||||||
|
- New upstream release (#1079514)
|
||||||
|
|
||||||
* Sun Aug 17 2014 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.8.11-3
|
* Sun Aug 17 2014 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.8.11-3
|
||||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild
|
- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild
|
||||||
|
|
||||||
|
@ -1,28 +0,0 @@
|
|||||||
diff -ur pcsc-lite-1.8.10.orig/src/hotplug_libudev.c pcsc-lite-1.8.10/src/hotplug_libudev.c
|
|
||||||
--- pcsc-lite-1.8.10.orig/src/hotplug_libudev.c 2013-10-06 12:25:18.000000000 +0200
|
|
||||||
+++ pcsc-lite-1.8.10/src/hotplug_libudev.c 2014-06-03 09:54:44.289011617 +0200
|
|
||||||
@@ -541,6 +541,12 @@
|
|
||||||
fd_set fds;
|
|
||||||
|
|
||||||
udev_monitor = udev_monitor_new_from_netlink(udev, "udev");
|
|
||||||
+ if (udev_monitor == NULL)
|
|
||||||
+ {
|
|
||||||
+ Log1(PCSC_LOG_ERROR, "udev_monitor_new_from_netlink() error\n");
|
|
||||||
+ return;
|
|
||||||
+ }
|
|
||||||
+
|
|
||||||
|
|
||||||
/* filter only the interfaces */
|
|
||||||
r = udev_monitor_filter_add_match_subsystem_devtype(udev_monitor, "usb",
|
|
||||||
@@ -560,6 +566,11 @@
|
|
||||||
|
|
||||||
/* udev monitor file descriptor */
|
|
||||||
fd = udev_monitor_get_fd(udev_monitor);
|
|
||||||
+ if (fd < 0)
|
|
||||||
+ {
|
|
||||||
+ Log2(PCSC_LOG_ERROR, "udev_monitor_get_fd() error: %d\n", fd);
|
|
||||||
+ return;
|
|
||||||
+ }
|
|
||||||
|
|
||||||
while (!AraKiriHotPlug)
|
|
||||||
{
|
|
Loading…
Reference in New Issue
Block a user