Compare commits
1 Commits
Author | SHA1 | Date |
---|---|---|
Nikos Mavrogiannopoulos | 31d0166d35 |
|
@ -2,7 +2,7 @@
|
||||||
|
|
||||||
Name: pcsc-lite
|
Name: pcsc-lite
|
||||||
Version: 1.8.10
|
Version: 1.8.10
|
||||||
Release: 1%{?dist}
|
Release: 2%{?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,6 +10,8 @@ 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
|
||||||
|
|
||||||
|
Patch0: pcscd-1.8.10-safer-udev-usage.patch
|
||||||
|
|
||||||
BuildRequires: doxygen
|
BuildRequires: doxygen
|
||||||
BuildRequires: graphviz
|
BuildRequires: graphviz
|
||||||
BuildRequires: systemd-devel
|
BuildRequires: systemd-devel
|
||||||
|
@ -57,6 +59,7 @@ 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
|
||||||
|
@ -131,6 +134,9 @@ rm $RPM_BUILD_ROOT%{_docdir}/pcsc-lite/README.DAEMON
|
||||||
|
|
||||||
|
|
||||||
%changelog
|
%changelog
|
||||||
|
* Tue Jun 03 2014 Nikos Mavrogiannopoulos <nmav@redhat.com> - 1.8.10-2
|
||||||
|
- Safer usage of udev functions (#1071243)
|
||||||
|
|
||||||
* Sun Oct 20 2013 Kalev Lember <kalevlember@gmail.com> - 1.8.10-1
|
* Sun Oct 20 2013 Kalev Lember <kalevlember@gmail.com> - 1.8.10-1
|
||||||
- Update to 1.8.10
|
- Update to 1.8.10
|
||||||
- Update source URL
|
- Update source URL
|
||||||
|
|
|
@ -0,0 +1,28 @@
|
||||||
|
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