0.9.4b-3: Add ABRT fix, update rhbz #1364744 fix.

0005-contrib-Fix-usb-devices-acl-permissions-rhbz-1364744.patch

@@ -1,14 +1,14 @@
-From 6b8fad0fdfd026d437ab6b953e701f2ece307e45 Mon Sep 17 00:00:00 2001
+From aa087cb999b7303d6f14d0928a84909d5bf29529 Mon Sep 17 00:00:00 2001
 From: Alec Leamas <leamas.alec@gmail.com>
 Date: Thu, 18 Aug 2016 21:04:07 +0200
 Subject: [PATCH] contrib: Fix usb devices' acl permissions (rhbz #1364744).
 
 ---
- contrib/60-lirc.rules | 11 ++++++-----
- 1 file changed, 6 insertions(+), 5 deletions(-)
+ contrib/60-lirc.rules | 13 +++++++------
+ 1 file changed, 7 insertions(+), 6 deletions(-)
 
 diff --git a/contrib/60-lirc.rules b/contrib/60-lirc.rules
-index 8147546..687009b 100644
+index 8147546..492aae9 100644
 --- a/contrib/60-lirc.rules
 +++ b/contrib/60-lirc.rules
 @@ -1,8 +1,9 @@
@@ -21,11 +21,12 @@ index 8147546..687009b 100644
  
  KERNEL=="lirc[0-9]*", SUBSYSTEM=="lirc", GROUP="lirc", MODE="0660"
 -ACTION=="add", SUBSYSTEM=="usb", \
+-   RUN+="/usr/bin/setfacl -m g:lirc:rw $env{DEVNAME}"
 +
 +# Grant rw permission to the lirc group for USB devices using acl(5).
 +
 +ACTION=="add", SUBSYSTEM=="usb", ENV{DEVNAME}=="?*", \
-    RUN+="/usr/bin/setfacl -m g:lirc:rw $env{DEVNAME}"
++    RUN+="/usr/bin/sh -c '/usr/bin/setfacl -m g:lirc:rw %E{DEVNAME} 2>/dev/null || :'"
 -- 
 2.5.5
 

0008-lirc-setup-Fix-crasher-bugfix.patch

@@ -0,0 +1,30 @@
+From 33c188c38f5f89e704e4c775205e1d90ca55bc0d Mon Sep 17 00:00:00 2001
+From: Alec Leamas <leamas.alec@gmail.com>
+Date: Sun, 21 Aug 2016 17:33:19 +0200
+Subject: [PATCH] lirc-setup: Fix crasher bugfix.
+
+Fixes https://retrace.fedoraproject.org/faf/reports/1166394/
+---
+ tools/lirc-setup/mvc_model.py | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/tools/lirc-setup/mvc_model.py b/tools/lirc-setup/mvc_model.py
+index 02d1413..48864d8 100644
+--- a/tools/lirc-setup/mvc_model.py
++++ b/tools/lirc-setup/mvc_model.py
+@@ -362,10 +362,10 @@ class DrvctlDeviceListModel(DeviceListModel):
+         self.label_by_device = {}
+         trypath = os.path.abspath(_here("../mode2"))
+         if not os.path.exists(trypath):
+-            trypath = os.path.join(BINDIR, "mode2")
++            trypath = os.path.join(config.BINDIR, "mode2")
+         if not os.path.exists(trypath):
+             raise FileNotFoundError("trypath")
+-        cmd = [trypath, "--driver" , self.driver_id, "--list-devices"]
++        cmd = [trypath, "--driver", self.driver_id, "--list-devices"]
+         try:
+             result = subprocess.check_output(cmd, universal_newlines=True)
+         except (OSError, subprocess.CalledProcessError):
+-- 
+2.5.5
+

0008-plugins-devinput-Make-the-list-devices-support-avail.patch

@@ -1,28 +0,0 @@
-From f1c2f41a04589e019973e06e446205a9a4bfea9f Mon Sep 17 00:00:00 2001
-From: Alec Leamas <leamas.alec@gmail.com>
-Date: Tue, 24 May 2016 21:55:06 +0200
-Subject: [PATCH] plugins/devinput: Make the list-devices support available.
-
----
- plugins/devinput.c | 4 ++++
- 1 file changed, 4 insertions(+)
-
-diff --git a/plugins/devinput.c b/plugins/devinput.c
-index df97ffd..25b21ae 100644
---- a/plugins/devinput.c
-+++ b/plugins/devinput.c
-@@ -89,7 +89,11 @@ const struct driver hw_devinput = {
- 	.api_version	= 4,
- 	.driver_version = "0.9.3",
- 	.info		= "See file://" PLUGINDOCS "/devinput.html",
-+#ifdef HAVE_LIBUDEV_H
-+	.device_hint    = "drvctl",
-+#else
- 	.device_hint    = "/dev/input/event*",
-+#endif
- };
- 
- 
--- 
-2.5.5
-

lirc.spec

@@ -5,7 +5,7 @@
 
 Name:           lirc
 Version:        0.9.4b
-Release:        %{?tag:0.}2%{?tag:.}%{?tag}%{?dist}
+Release:        %{?tag:0.}3%{?tag:.}%{?tag}%{?dist}
 Summary:        The Linux Infrared Remote Control package
 
 %global repo    http://downloads.sourceforge.net/lirc/LIRC/%{version}/
@@ -22,6 +22,7 @@ Patch1:         0004-plugins-audio_alsa-Fix-byte-truncating-in-16-bit-dat.patch
 Patch2:         0005-contrib-Fix-usb-devices-acl-permissions-rhbz-1364744.patch
 Patch3:         0006-include-Update-bundled-lirc.h.patch
 Patch4:         0007-lircd-Remove-use-of-functions-killed-in-kernel-4.8.0.patch
+Patch5:         0008-lirc-setup-Fix-crasher-bugfix.patch
 
 BuildRequires:  alsa-lib-devel
 Buildrequires:  autoconf
@@ -191,6 +192,7 @@ full support for the ftdi device.
 %if 0%fedora > 24
 %patch3 -p1
 %patch4 -p1
+%patch5 -p1
 cp lib/driver.h lib/lirc/driver.h
 %endif
 
@@ -348,6 +350,10 @@ systemd-tmpfiles --create %{_tmpfilesdir}/lirc.conf
 %{_udevrulesdir}/99-remote-control-lirc.rules
 
 %changelog
+* Mon Aug 22 2016 Alec Leamas <leamas.alec@gmail.com> - 0.9.4b-3
+- Add yet another ABRT crasher fix.
+- Update fix for #1364744.
+
 * Wed Aug 17 2016 Alec Leamas <leamas.alec@gmail.com> - 0.9.4b-2
 - Added patch for audio_alsa plugin (#218).
 - Move R: python3-PyYAML to lirc-compat, fixes import error