From 6c02cfcc3b85ed2f0cf9550ab2a47078a9ab6a18a6dcddef17592b8b84d2d46d Mon Sep 17 00:00:00 2001
From: Denisart Benjamin <p.drouand@gmail.com>
Date: Fri, 21 Oct 2016 18:25:09 +0000
Subject: [PATCH 01/13] Accepting request 436723 from home:posophe:branches:vdr

Update; fix build with kernel >= 4.8

OBS-URL: https://build.opensuse.org/request/show/436723
OBS-URL: https://build.opensuse.org/package/show/vdr/lirc?expand=0&rev=71
---
 ...gfault-when-starting-lircd-AUR-41581.patch |  26 ----
 ...-lircd-Fix-bad-default-for-lircdfile.patch |  25 ----
 51-lirc.rules                                 |  11 --
 README.SUSE                                   |  50 -------
 fix-remote-keys.pl                            | 128 ------------------
 lirc-0.9.4a.tar.bz2                           |   3 -
 lirc-0.9.4c.tar.bz2                           |   3 +
 lirc.changes                                  |  41 ++++++
 lirc.spec                                     |  79 +++++------
 ...-of-functions-killed-in-kernel-4.8.0.patch | 110 +++++++++++++++
 10 files changed, 188 insertions(+), 288 deletions(-)
 delete mode 100644 0001-Fix-segfault-when-starting-lircd-AUR-41581.patch
 delete mode 100644 0002-lircd-Fix-bad-default-for-lircdfile.patch
 delete mode 100644 51-lirc.rules
 delete mode 100644 README.SUSE
 delete mode 100644 fix-remote-keys.pl
 delete mode 100644 lirc-0.9.4a.tar.bz2
 create mode 100644 lirc-0.9.4c.tar.bz2
 create mode 100644 lircd-Remove-use-of-functions-killed-in-kernel-4.8.0.patch

diff --git a/0001-Fix-segfault-when-starting-lircd-AUR-41581.patch b/0001-Fix-segfault-when-starting-lircd-AUR-41581.patch
deleted file mode 100644
index 21ebf64..0000000
--- a/0001-Fix-segfault-when-starting-lircd-AUR-41581.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-From 8459a881fd53525a47ae2f9180fa3644be5df343 Mon Sep 17 00:00:00 2001
-From: Alec Leamas <leamas@nowhere.net>
-Date: Mon, 18 Aug 2014 10:00:49 +0200
-Subject: [PATCH 1/3] Fix segfault when starting lircd (AUR 41581)
-
-See https://bugs.archlinux.org/task/41581
----
- lirc_options.conf | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/lirc_options.conf b/lirc_options.conf
-index d8ddedd..11293e2 100644
---- a/lirc_options.conf
-+++ b/lirc_options.conf
-@@ -10,7 +10,7 @@
- nodaemon        = False
- driver          = devinput
- device          = auto
--output          = /var/run/lirc/lircd
-+lircdfile       = /var/run/lirc/lircd
- pidfile         = /var/run/lirc/lircd.pid
- plugindir       = /usr/lib/lirc/plugins
- permission      = 666
--- 
-1.8.4.2
-
diff --git a/0002-lircd-Fix-bad-default-for-lircdfile.patch b/0002-lircd-Fix-bad-default-for-lircdfile.patch
deleted file mode 100644
index d58b19f..0000000
--- a/0002-lircd-Fix-bad-default-for-lircdfile.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-From 4a9b45822890f50c5ed36660468e0a99cd4531e0 Mon Sep 17 00:00:00 2001
-From: Alec Leamas <leamas@nowhere.net>
-Date: Mon, 18 Aug 2014 10:05:44 +0200
-Subject: [PATCH 2/3] lircd: Fix bad default for lircdfile.
-
----
- daemons/lircd.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/daemons/lircd.cpp b/daemons/lircd.cpp
-index db8ea13..fa8cf17 100644
---- a/daemons/lircd.cpp
-+++ b/daemons/lircd.cpp
-@@ -2179,7 +2179,7 @@
- 		"lircd:device",		NULL,
- 		"lircd:listen",		NULL,
- 		"lircd:connect",	NULL,
--		"lircd:output",		LIRCD,
-+		"lircd:lircdfile",	LIRCD,
- 		"lircd:pidfile",	PIDFILE,
- 		"lircd:logfile",	"syslog",
- 		"lircd:debug",		level,
--- 
-1.8.4.2
-
diff --git a/51-lirc.rules b/51-lirc.rules
deleted file mode 100644
index eba54ed..0000000
--- a/51-lirc.rules
+++ /dev/null
@@ -1,11 +0,0 @@
-#
-# This is a hack since /sys info for event devices is incomplete
-# 
-# Check if the name of the event device contains the string IR and
-# create the /dev/input/ir symlink.
-KERNEL=="event*", SUBSYSTEM=="input", ATTRS{name}=="*IR*", SYMLINK+="input/ir"
-
-# If your remote does not have 'IR' in it's name add a line like the
-# following (this one is for the Cinergy T2). You can look up the
-# name of the device in /proc/bus/input/devices
-KERNEL=="event*", SUBSYSTEM=="input", ATTRS{name}=="TerraTec/qanu USB2.0 Highspeed DVB-T Receiver remote control", SYMLINK+="input/ir"
diff --git a/README.SUSE b/README.SUSE
deleted file mode 100644
index 262067f..0000000
--- a/README.SUSE
+++ /dev/null
@@ -1,50 +0,0 @@
-Quickstart guide for self made serial receivers
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-
-Please read /usr/share/doc/packages/lirc/html/install.html for
-details.
-
-Suppose you have a self made serial receiver as described in
-http://www.lirc.org/receivers.html connected to the first serial
-port serial port:
-
-Ensure that the following values are set in /etc/sysconfig/lirc:
-
-    LIRCD_DEVICE="/dev/lirc"
-    LIRCD_DRIVER="default"
-    LIRC_MODULE="lirc_serial"
-
-Run the following command and add it at the end of
-/etc/init.d/boot.local:
-
-    setserial /dev/ttyS0 uart none
-
-Load the kernel module for the serial receiver:
-
-    modprobe lirc_serial
-
-
-Run irrecord to assign names to keys on your remote. Move the
-resulting config file to /etc/lircd.conf. Start lircd:
-
-    rclirc start
-
-If everything works (check with 'irw'), add lirc to the boot
-process:
-
-    chkconfig lirc on
-
-
-Quickstart guide for remotes that show up as event devices
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-The remotes of most DVB devices show up as event devices in
-/dev/input/. If you have one of those
-
-- check whether udev already created /dev/input/ir for you when you
-  plugged in the device. Edit /etc/udev/rules.d/51-lirc.rules if it
-  didn't. Unplug the device and plug it in again to make
-  /dev/input/ir appear.
-
-- cp /usr/share/lirc/remotes/devinput/lircd.conf.devinput /etc/lircd.conf
-
-- rclirc start; chkconfig lirc on
diff --git a/fix-remote-keys.pl b/fix-remote-keys.pl
deleted file mode 100644
index 9d8e21a..0000000
--- a/fix-remote-keys.pl
+++ /dev/null
@@ -1,128 +0,0 @@
-#!/usr/bin/perl -w
-#
-# This is a perl script to unify the key names in lircd config files.
-#
-# Going to use the KEY_* #defines (without KEY_ prefix)
-# from #include <linux/input.h> for the key names.
-#
-# (c) 2003 Gerd Knorr <kraxel@suse.de>
-#
-use strict;
-use POSIX;
-use File::Find;
-
-#############################################################################
-# translation table
-
-my %table = (
-	# volume keys
-	'vol(ume)?[-_]?(\+|up|plus)'			=> 'VOLUMEUP',
-	'vol(ume)?[-_]?(\-|down|dn|minus)'		=> 'VOLUMEDOWN',
-
-	# switch channels
-	'ch(annel|n|an)?[-_]?(\+|up|plus)'		=> 'CHANNELUP',
-	'ch(annel|n|an)?[-_]?(\-|down|dn|minus)'	=> 'CHANNELDOWN',
-
-	# dummy
-	'dummy'		=> 'dummy'
-);
-my %keys;
-
-
-#############################################################################
-# helpers
-
-sub readfile {
-	my $filename = shift;
-	my $content;
-
-	open FILE, "< $filename" or die "open $filename: $!";
-	{ local $/; undef $/; $content = <FILE>; };
-	close FILE;
-	return $content;
-}
-
-sub writefile {
-	my $filename = shift;
-	my $content  = shift;
-
-	open FILE, "> $filename" or die "open $filename: $!";
-	print FILE $content;
-	close FILE;
-}
-
-sub fix_key {
-	my $name = shift;
-
-	$name =~ s/´//g;
-	for my $regex (keys %table) {
-		$name =~ s/^$regex$/$table{$regex}/i;
-	}
-	$name = POSIX::toupper($name);
-
-	$keys{$name}++;
-	$name = "'$name'";
-	return $name;
-}
-
-sub replacer {
-	my $old = shift;
-	my $new = "";
-	my $codes = 0;
-	my $raw_codes = 0;
-	my ($orig,$name,$code);
-
-	foreach my $line (split /\n/,$old) {
-		if ($line =~ m/begin\s+codes/) {
-			$codes = 1;
-		} elsif ($line =~ m/end\s+codes/) {
-			$codes = 0;
-		} elsif ($line =~ m/begin\s+raw_codes/) {
-			$raw_codes = 1;
-		} elsif ($line =~ m/end\s+raw_codes/) {
-			$raw_codes = 0;
-
-		} elsif ($codes == 1 && $line =~ m/^\s*(\S+)\s+(\S+)\s*$/) {
-			$orig = $1;
-			$code = $2;
-			$name = fix_key($orig);
-			$line = sprintf("\t%-20s  %-20s  # %s",
-					$name,$code,$orig);
-
-		} elsif ($raw_codes == 1 && $line =~ m/^\s*name\s+(\S+)\s*$/) {
-			$orig = $1;
-			$name = fix_key($orig);
-			$line = sprintf("\tname  %-20s  # %s",
-					$name,$orig);
-		}
-		$new .= $line . "\n";
-	}
-	return $new;
-}
-
-sub wanted {
-	my $content;
-
-	return unless -f $_;			# regular files
-
-	print "fixup $File::Find::name\n";
-	$content = readfile($_);
-	if ($content =~ m/begin\s+remote/s) {
-		# is a lircd config file
-		$content = replacer($content);
-		writefile($_,$content);
-	}
-}
-
-#############################################################################
-# main
-
-# handle files
-my $dir   = shift;
-find(\&wanted, $dir);
-
-# print key stats (for building %table ...).
-exit;
-foreach my $key (sort { $keys{$a} <=> $keys{$b} } keys %keys) {
-	printf("%3d %s\n",$keys{$key},$key);
-}
diff --git a/lirc-0.9.4a.tar.bz2 b/lirc-0.9.4a.tar.bz2
deleted file mode 100644
index 038dbcf..0000000
--- a/lirc-0.9.4a.tar.bz2
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:386086a74c7d12e7e8f26f7dbc8f40d20b9968c9ad2a42599483a51dd2da03ba
-size 2292119
diff --git a/lirc-0.9.4c.tar.bz2 b/lirc-0.9.4c.tar.bz2
new file mode 100644
index 0000000..3e4c637
--- /dev/null
+++ b/lirc-0.9.4c.tar.bz2
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:69da31d49268bec966d17d5ba81a37716eb170f3c1f0800a23e9f2315a6edce7
+size 2310317
diff --git a/lirc.changes b/lirc.changes
index ac08fee..b896880 100644
--- a/lirc.changes
+++ b/lirc.changes
@@ -1,3 +1,44 @@
+-------------------------------------------------------------------
+Fri Oct 21 18:14:41 UTC 2016 - p.drouand@gmail.com
+
+- Update to version 0.9.4c
+  * New curl_poll files adds a new MIT license. Lirc now carries GPL,
+    BSD and MIT licenses.
+  * Several patches to make lirc work again on macos (#226, #227).
+  * New tool irtext2udp generates udp plugin data (#197).
+  * plugins: girs: Add udp/receive support (#201).
+  * mode2: Fix broken --raw option (#223).
+  * lirc-make-devinput: Fix that two remotes has the same name (#222).
+  * lircd: Warn for duplicate remote definitions (#222).
+  * lircd: Retry temporary unavailable write sockets (#221).
+  * contrib: Fix usb devices' acl permissions (rhbz #1364744).
+  * lirc-setup: Fix crasher bugfix (Fedora abort trace).
+  * contrib: disable udev /dev/uinput rule requiring lirc user.
+  * plugins: audio_alsa: Fix byte truncating in 16-bit data (#218):
+  * plugins: irtoy: improve error handling (#220).
+  * Minor documentation fixes.
+- Changes from version 0.9.4b
+  * lircd-uinput: A multitude of fixes (#213, #211, #177). Adds new options.
+  * lirc_client: Fix "Can't redirect irsend output" (#207).
+  * lirc_client: Fix un-terminated buffer causing irsend crash (#216).
+  * irrecord: Fix under-sized buffer causing crash (#208).
+  * systemd: Add hardening options comments to services (#204).
+  * lircmd: Options, udev examples and manpage update.
+  * lib: Add missing Makefile.am dep, fixes parallel build failure (#210).
+  * Remove a single python2 dependency [4e3c97c].
+  * build: Don't define docdir - autoconf defines docdir (#215).
+  * build: support runstatedir configure option (#212).
+  * doc: Manpages and configuration guide fixes.
+- Remove fix-remote-keys.pl, README.SUSE and 51-lirc.rules; not relevant
+  for a while already
+- Remove 0001-Fix-segfault-when-starting-lircd-AUR-41581.patch and
+  0002-lircd-Fix-bad-default-for-lircdfile.patch; fixed on upstream
+- Add missing dependency to systemd
+- Global sweeping
+- Add lirc nologgin user; now needed
+- Add lircd-Remove-use-of-functions-killed-in-kernel-4.8.0.patch;
+  fix build on openSUSE > 42.2
+
 -------------------------------------------------------------------
 Wed Jun 29 14:24:22 UTC 2016 - mpluskal@suse.com
 
diff --git a/lirc.spec b/lirc.spec
index d81c422..4747532 100644
--- a/lirc.spec
+++ b/lirc.spec
@@ -22,7 +22,7 @@
 %endif
 Name:           lirc
 #
-Version:        0.9.4a
+Version:        0.9.4c
 Release:        0
 Summary:        Tools for Infrared Receivers
 License:        GPL-2.0+
@@ -30,13 +30,7 @@ Group:          Hardware/Other
 Url:            http://www.lirc.org/
 Source0:        http://downloads.sourceforge.net/project/lirc/LIRC/%{version}/lirc-%{version}.tar.bz2
 Source1:        baselibs.conf
-Source6:        fix-remote-keys.pl
-Source8:        README.SUSE
-Source9:        51-lirc.rules
-# PATCH-FEATURE-UPSTREAM 0001-lirc-Fix-segfault-when-starting-lircd-AUR-41581.patch --lircd fails to start ending in a segfault
-Patch0:         0001-Fix-segfault-when-starting-lircd-AUR-41581.patch
-# PATCH-FEATURE-UPSTREAM 0002-lircd-Fix-bad-default-for-lircdfile.patch -- Fix bad default for lircdfile
-Patch1:         0002-lircd-Fix-bad-default-for-lircdfile.patch
+Patch:          lircd-Remove-use-of-functions-killed-in-kernel-4.8.0.patch
 BuildRequires:  doxygen
 BuildRequires:  fdupes
 BuildRequires:  gcc-c++
@@ -83,6 +77,8 @@ License:        GPL-2.0+
 Group:          Hardware/Other
 Provides:       %{name} = %{version}
 Obsoletes:      %{name} < %{version}
+Requires(pre):  shadow
+%{?systemd_requires}
 
 %description    core
 The LIRC core contains the lircd daemons, the devinput and
@@ -111,8 +107,6 @@ Requires:       libirrecord0 = %{version}
 Requires:       liblirc0 = %{version}
 Requires:       liblirc_client0 = %{version}
 Requires:       liblirc_driver0 = %{version}
-# files were in lirc package previously
-Conflicts:      lirc <= 0.8.4
 
 %description    devel
 LIRC is a package that supports receiving and sending IR signals with
@@ -125,8 +119,6 @@ control your computer with a remote control.
 Summary:        LIRC client library
 License:        GPL-2.0+
 Group:          Hardware/Other
-# files were in lirc package previously
-Conflicts:      lirc <= 0.8.4
 
 %description -n liblirc_client0
 The LIRC client library. To actually use LIRC the lircd daemon from
@@ -203,12 +195,6 @@ Some seldom used X11-based tools for debugging lirc configurations.
 # Don't provide or require anything from _docdir, per policy.
 %global __provides_exclude_from ^%{_docdir}/.*$
 %global __requires_exclude_from ^%{_docdir}/.*$
-
-%prep
-%setup -q
-%patch0 -p1
-%patch1 -p1
-cp %{SOURCE8} .
 %if %{defined _rundir}
 # Fix rundir for openSUSE > 13.1
 sed -i 's|${localstatedir}/run|run|g' configure
@@ -217,18 +203,23 @@ sed -i 's|${localstatedir}/run|run|g' configure
 sed -i 's|run|%{_localstatedir}/run|g' systemd/lircd.socket
 %endif
 
+sed -i -e 's|/usr/local/etc/|/etc/|' contrib/irman2lirc
+sed -i -e 's/#effective-user/effective-user /' lirc_options.conf
+sed -i -e '/^effective-user/s/=$/= lirc/' lirc_options.conf
+
+%prep
+%setup -q
+%if %{?suse_version} > 4220
+%patch -p1
+%endif
+
 %build
-# we are using python3
-sed "s|python|python3|g" -i ./tools/make_rel_symlink.py
-%configure \
-    --enable-ipv6
-# make %%{?_smp_mflags}
-# parallel makes are currently busted, do single-threaded for now
-make
-perl %{SOURCE6} configs
+%configure
+make %{?_smp_mflags}
 
 %install
 make DESTDIR=%{buildroot} install %{?_smp_mflags}
+chmod a+x %{buildroot}%{_bindir}/pronto2lirc
 # Create backward compatibility symlink
 ln -s %{_sbindir}/service %{buildroot}%{_sbindir}/rc%{name}d
 ln -s %{_sbindir}/service %{buildroot}%{_sbindir}/rc%{name}md
@@ -238,7 +229,8 @@ echo "d %{_localstatedir}/run/lirc  0755  root  root  10d" \
 #
 # udev stuff
 install -d -m 755 %{buildroot}/%{_udevdir}/rules.d
-install -m 644 %{SOURCE9} %{buildroot}/%{_udevdir}/rules.d
+install -Dpm 644 contrib/60-lirc.rules \
+    %{buildroot}%{_udevrulesdir}/60-lirc.rules
 #
 install -Dpm 644 contrib/99-remote-control-lirc.rules \
     %{buildroot}%{_udevrulesdir}/99-remote-control-lirc.rules
@@ -249,7 +241,7 @@ find %{buildroot}%{_libdir} -type f -name "*.la" -print -delete
 # Don't install documentation in a non standard directory
 rm -rf %{buildroot}%{_datadir}/doc
 # hide python dependency
-chmod 644 %{buildroot}%{_bindir}/pronto2lirc
+chmod a+x %{buildroot}%{_bindir}/pronto2lirc
 mkdir -p %{buildroot}%{_rundir}
 # Remove old %{_rundir}; depreciated but still installed by lirc, which is not looking for it
 rm -rf %{buildroot}%{_localstatedir}
@@ -258,6 +250,7 @@ rm -rf %{buildroot}%{_datadir}/lirc/contrib
 #
 rm -rf %{buildroot}%{_datadir}/lirc/plugindocs
 #
+rm -rf contrib/.release-process.txt.swp
 %fdupes -s %{buildroot}
 %fdupes -s .
 
@@ -272,37 +265,33 @@ rm -rf %{buildroot}%{_datadir}/lirc/plugindocs
 %postun -n libirrecord0 -p /sbin/ldconfig
 
 %pre core
-%service_add_pre lircd.service lircmd.service lircd.socket irexec.service
+getent group lirc >/dev/null || groupadd -r lirc
+getent passwd lirc >/dev/null || \
+    useradd -r -g lirc -d /var/log/lirc -s /sbin/nologin \
+        -c "LIRC daemon user, runs lircd." lirc
+usermod -a -G dialout lirc &> /dev/null || :
+usermod -a -G lock lirc &> /dev/null || :
+usermod -a -G input lirc &> /dev/null || :
+exit 0
+%service_add_pre lircd.service lircmd.service lircd-uinput.service lircd.socket irexec.service
 
 %post core
-%service_add_post lircd.service lircmd.service lircd.socket irexec.service
+%service_add_post lircd.service lircmd.service lircd-uinput.service lircd.socket irexec.service
 %if 0%{?suse_version} <= 1320
     systemd-tmpfiles --create %{_tmpfilesdir}/%{name}.conf >/dev/null 2>&1 || :
 %else
     %tmpfiles_create %{_tmpfilesdir}/%{name}.conf
 %endif
-# config files moved to /etc/lirc in 0.8.6
-for file in lircd.conf lircmd.conf lircrc; do
-	if [ -e %{_sysconfdir}/$file -a ! -L %{_sysconfdir}/$file ]; then
-		if [ ! -e %{_sysconfdir}/lirc/$file ]; then
-			mv %{_sysconfdir}/$file %{_sysconfdir}/lirc/$file || true
-			ln -s lirc/$file %{_sysconfdir}/$file || true
-		else
-			echo "Warning: lirc ignores %{_sysconfdir}/$file, use %{_sysconfdir}/lirc/$file instead" >&2
-		fi
-	fi
-done
 
 %preun core
-%service_del_preun lircd.service lircmd.service lircd.socket irexec.service
+%service_del_preun lircd.service lircmd.service lircd-uinput.service lircd.socket irexec.service
 
 %postun core
-%service_del_postun lircd.service lircmd.service lircd.socket irexec.service
+%service_del_postun lircd.service lircmd.service lircd-uinput.service lircd.socket irexec.service
 
 %files core
 %defattr (-,root,root)
 %doc AUTHORS COPYING ChangeLog NEWS README
-%doc README.SUSE
 %doc doc/html doc/lirc.hwdb doc/irxevent.keys
 %doc contrib
 %dir %{_datadir}/%{name}
@@ -317,7 +306,7 @@ done
 %{_bindir}/*
 %{_datadir}/%{name}/lirc.hwdb
 %{_sbindir}/*
-%{_udevdir}/rules.d/51-%{name}.rules
+%{_udevdir}/rules.d/60-%{name}.rules
 %{_libdir}/%{name}/plugins
 %exclude %{_libdir}/%{name}/plugins/ftdi.so
 %exclude %{_libdir}/%{name}/plugins/audio.so
diff --git a/lircd-Remove-use-of-functions-killed-in-kernel-4.8.0.patch b/lircd-Remove-use-of-functions-killed-in-kernel-4.8.0.patch
new file mode 100644
index 0000000..fff099e
--- /dev/null
+++ b/lircd-Remove-use-of-functions-killed-in-kernel-4.8.0.patch
@@ -0,0 +1,110 @@
+From 6a57d48e1a233dfc55d436e8d064509cb03973d1 Mon Sep 17 00:00:00 2001
+From: Alec Leamas <leamas.alec@gmail.com>
+Date: Fri, 19 Aug 2016 04:48:02 +0200
+Subject: [PATCH 7/7] lircd: Remove use of functions killed in kernel 4.8.0
+
+From 4.8.0 the kernel no longer supports LIRC_NOTIFY_DECODE,
+LIRC_SETUP_START/LIRC_SETUP_END and several constants related
+to initiating filters. Remove corresponding calls from lircd.
+---
+ daemons/lircd.cpp | 51 ++-------------------------------------------------
+ lib/driver.h      |  7 +++++++
+ 2 files changed, 9 insertions(+), 49 deletions(-)
+
+diff --git a/daemons/lircd.cpp b/daemons/lircd.cpp
+index a7dbc94..a50d11f 100644
+--- a/daemons/lircd.cpp
++++ b/daemons/lircd.cpp
+@@ -464,50 +464,6 @@ static int setup_timeout(void)
+ }
+ 
+ 
+-static int setup_filter(void)
+-{
+-	int ret1, ret2;
+-	lirc_t min_pulse_supported = 0, max_pulse_supported = 0;
+-	lirc_t min_space_supported = 0, max_space_supported = 0;
+-
+-	if (!(curr_driver->features & LIRC_CAN_SET_REC_FILTER))
+-		return 1;
+-	if (curr_driver->drvctl_func(LIRC_GET_MIN_FILTER_PULSE,
+-				     &min_pulse_supported) == -1 ||
+-	    curr_driver->drvctl_func(LIRC_GET_MAX_FILTER_PULSE, &max_pulse_supported) == -1
+-	    || curr_driver->drvctl_func(LIRC_GET_MIN_FILTER_SPACE, &min_space_supported) == -1
+-	    || curr_driver->drvctl_func(LIRC_GET_MAX_FILTER_SPACE, &max_space_supported) == -1) {
+-		log_error("could not get filter range");
+-		log_perror_err(__func__);
+-	}
+-
+-	if (setup_min_pulse > max_pulse_supported)
+-		setup_min_pulse = max_pulse_supported;
+-	else if (setup_min_pulse < min_pulse_supported)
+-		setup_min_pulse = 0;    /* disable filtering */
+-
+-	if (setup_min_space > max_space_supported)
+-		setup_min_space = max_space_supported;
+-	else if (setup_min_space < min_space_supported)
+-		setup_min_space = 0;    /* disable filtering */
+-
+-	ret1 = curr_driver->drvctl_func(LIRC_SET_REC_FILTER_PULSE, &setup_min_pulse);
+-	ret2 = curr_driver->drvctl_func(LIRC_SET_REC_FILTER_SPACE, &setup_min_space);
+-	if (ret1 == -1 || ret2 == -1) {
+-		if (curr_driver->
+-		    drvctl_func(LIRC_SET_REC_FILTER,
+-				setup_min_pulse < setup_min_space ? &setup_min_pulse : &setup_min_space) == -1) {
+-			log_error("could not set filter");
+-			log_perror_err(__func__);
+-			return 0;
+-		}
+-	}
+-	return 1;
+-}
+-
+-
+-
+-
+ static int setup_hardware(void)
+ {
+ 	int ret = 1;
+@@ -516,10 +472,7 @@ static int setup_hardware(void)
+ 		if ((curr_driver->features & LIRC_CAN_SET_REC_CARRIER)
+ 		    || (curr_driver->features & LIRC_CAN_SET_REC_TIMEOUT)
+ 		    || (curr_driver->features & LIRC_CAN_SET_REC_FILTER)) {
+-			(void)curr_driver->drvctl_func(LIRC_SETUP_START, NULL);
+-			ret = setup_frequency() && setup_timeout()
+-			      && setup_filter();
+-			(void)curr_driver->drvctl_func(LIRC_SETUP_END, NULL);
++				ret = setup_frequency() && setup_timeout();
+ 		}
+ 	}
+ 	return ret;
+@@ -2162,7 +2115,7 @@ void loop(void)
+ 			int reps;
+ 
+ 			if (curr_driver->drvctl_func && (curr_driver->features & LIRC_CAN_NOTIFY_DECODE))
+-				curr_driver->drvctl_func(LIRC_NOTIFY_DECODE, NULL);
++				curr_driver->drvctl_func(DRVCTL_NOTIFY_DECODE, NULL);
+ 
+ 			get_release_data(&remote_name, &button_name, &reps);
+ 
+diff --git a/lib/driver.h b/lib/driver.h
+index c7c4a6a..fc7318e 100644
+--- a/lib/driver.h
++++ b/lib/driver.h
+@@ -97,6 +97,13 @@ int drv_handle_options(const char* options);
+ /** drvctl cmd: Free memory in argument obtained using DRVCTL_GET_DEVICES. */
+ #define DRVCTL_FREE_DEVICES             6
+ 
++/**
++ * The former LIRC_NOTIFY_DECODE, informs drier that signal is successfully
++ * decoded e. g., to initiate some visual feedback through a LED.
++ */
++
++#define DRVCTL_NOTIFY_DECODE            7
++
+ /** Last well-known command. Remaining is used in driver-specific controls.*/
+ #define  DRVCTL_MAX                     128
+ 
+-- 
+2.5.5
+

From afb1e3c131871c33a1aeda230a8fe3ac7a8e5b6a765bac348b86bbf7edbe791f Mon Sep 17 00:00:00 2001
From: Denisart Benjamin <p.drouand@gmail.com>
Date: Tue, 1 Nov 2016 17:33:59 +0000
Subject: [PATCH 02/13] OBS-URL:
 https://build.opensuse.org/package/show/vdr/lirc?expand=0&rev=72

---
 lirc-0.9.4c.tar.bz2 | 3 ---
 1 file changed, 3 deletions(-)
 delete mode 100644 lirc-0.9.4c.tar.bz2

diff --git a/lirc-0.9.4c.tar.bz2 b/lirc-0.9.4c.tar.bz2
deleted file mode 100644
index 3e4c637..0000000
--- a/lirc-0.9.4c.tar.bz2
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:69da31d49268bec966d17d5ba81a37716eb170f3c1f0800a23e9f2315a6edce7
-size 2310317

From ab789284ff7056322cb11d6f8153cbfe13da76a63b3bc8bf53afc10157319f24 Mon Sep 17 00:00:00 2001
From: Denisart Benjamin <p.drouand@gmail.com>
Date: Tue, 1 Nov 2016 17:34:39 +0000
Subject: [PATCH 03/13] OBS-URL:
 https://build.opensuse.org/package/show/vdr/lirc?expand=0&rev=73

---
 lirc-0.9.4c.tar.bz2 | 3 +++
 1 file changed, 3 insertions(+)
 create mode 100644 lirc-0.9.4c.tar.bz2

diff --git a/lirc-0.9.4c.tar.bz2 b/lirc-0.9.4c.tar.bz2
new file mode 100644
index 0000000..1adaa2c
--- /dev/null
+++ b/lirc-0.9.4c.tar.bz2
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:8974fe5dc8eaa717daab6785d2aefeec27615f01ec24b96d31e3381b2f70726a
+size 2311300

From 6d48aa536b3ecff9e4d02d8a081f000bb3bc6589d9f32056ff412d79349b60a8 Mon Sep 17 00:00:00 2001
From: Denisart Benjamin <p.drouand@gmail.com>
Date: Tue, 1 Nov 2016 20:55:12 +0000
Subject: [PATCH 04/13] Accepting request 438186 from home:posophe:branches:vdr

fix

OBS-URL: https://build.opensuse.org/request/show/438186
OBS-URL: https://build.opensuse.org/package/show/vdr/lirc?expand=0&rev=74
---
 lirc.spec | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/lirc.spec b/lirc.spec
index 4747532..636e854 100644
--- a/lirc.spec
+++ b/lirc.spec
@@ -30,7 +30,7 @@ Group:          Hardware/Other
 Url:            http://www.lirc.org/
 Source0:        http://downloads.sourceforge.net/project/lirc/LIRC/%{version}/lirc-%{version}.tar.bz2
 Source1:        baselibs.conf
-Patch:          lircd-Remove-use-of-functions-killed-in-kernel-4.8.0.patch
+Patch0:         lircd-Remove-use-of-functions-killed-in-kernel-4.8.0.patch
 BuildRequires:  doxygen
 BuildRequires:  fdupes
 BuildRequires:  gcc-c++
@@ -53,6 +53,7 @@ BuildRequires:  pkgconfig(sm)
 BuildRequires:  pkgconfig(systemd)
 BuildRequires:  pkgconfig(udev)
 BuildRequires:  pkgconfig(x11)
+BuildRequires:  zypper
 Requires:       udev
 Recommends:     lirc-remotes
 Suggests:       lirc-kmp
@@ -209,9 +210,10 @@ sed -i -e '/^effective-user/s/=$/= lirc/' lirc_options.conf
 
 %prep
 %setup -q
-%if %{?suse_version} > 4220
-%patch -p1
-%endif
+if zypper vcmp $(rpm -qf "%%{version}" linux-glibc-devel) 4.8~ | grep
+"is newer"; then
+%patch0
+fi
 
 %build
 %configure

From 458bfb5b07a3e91e979259b1e44f5b07ff0ab7d3675bd4957bf5ff64b5e39ad4 Mon Sep 17 00:00:00 2001
From: Denisart Benjamin <p.drouand@gmail.com>
Date: Wed, 2 Nov 2016 13:47:07 +0000
Subject: [PATCH 05/13] Accepting request 438351 from home:posophe:branches:vdr

fix build against liblirc

OBS-URL: https://build.opensuse.org/request/show/438351
OBS-URL: https://build.opensuse.org/package/show/vdr/lirc?expand=0&rev=75
---
 ...-Ensure-build-on-unconfiguredclients.patch | 35 +++++++++++++++++++
 lirc.changes                                  |  5 +++
 lirc.spec                                     |  4 ++-
 3 files changed, 43 insertions(+), 1 deletion(-)
 create mode 100644 lirc-lib-curl_poll.h-Ensure-build-on-unconfiguredclients.patch

diff --git a/lirc-lib-curl_poll.h-Ensure-build-on-unconfiguredclients.patch b/lirc-lib-curl_poll.h-Ensure-build-on-unconfiguredclients.patch
new file mode 100644
index 0000000..1dc08c9
--- /dev/null
+++ b/lirc-lib-curl_poll.h-Ensure-build-on-unconfiguredclients.patch
@@ -0,0 +1,35 @@
+From 33c40d127877179e0cba2f6595816377bb6bcda1 Mon Sep 17 00:00:00 2001
+From: Alec Leamas <leamas.alec@gmail.com>
+Date: Tue, 25 Oct 2016 10:28:14 +0200
+Subject: [PATCH 05/10] lib: curl_poll.h: Ensure build on unconfiguredclients.
+
+---
+ lib/curl_poll.h | 4 +++-
+ 1 file changed, 3 insertions(+), 1 deletion(-)
+
+diff --git a/lib/curl_poll.h b/lib/curl_poll.h
+index 6144c42..af25381 100644
+--- a/lib/curl_poll.h
++++ b/lib/curl_poll.h
+@@ -21,7 +21,9 @@
+  * KIND, either express or implied.
+  *
+  ***************************************************************************/
++#ifdef HAVE_CONFIG_H
+ #include "config.h"
++#endif
+ 
+ #ifdef __cplusplus
+ extern "C" {
+@@ -29,7 +31,7 @@ extern "C" {
+ 
+ #ifdef HAVE_SYS_POLL_H
+ #include <sys/poll.h>
+-#elif defined(HAVE_POLL_H)
++#else
+ #include <poll.h>
+ #endif
+ 
+-- 
+2.5.5
+
diff --git a/lirc.changes b/lirc.changes
index b896880..1a2c799 100644
--- a/lirc.changes
+++ b/lirc.changes
@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Wed Nov  2 13:46:41 UTC 2016 - p.drouand@gmail.com
+
+- Add lirc-lib-curl_poll.h-Ensure-build-on-unconfiguredclients.patch
+
 -------------------------------------------------------------------
 Fri Oct 21 18:14:41 UTC 2016 - p.drouand@gmail.com
 
diff --git a/lirc.spec b/lirc.spec
index 636e854..25fcb15 100644
--- a/lirc.spec
+++ b/lirc.spec
@@ -31,6 +31,7 @@ Url:            http://www.lirc.org/
 Source0:        http://downloads.sourceforge.net/project/lirc/LIRC/%{version}/lirc-%{version}.tar.bz2
 Source1:        baselibs.conf
 Patch0:         lircd-Remove-use-of-functions-killed-in-kernel-4.8.0.patch
+Patch1:         lirc-lib-curl_poll.h-Ensure-build-on-unconfiguredclients.patch
 BuildRequires:  doxygen
 BuildRequires:  fdupes
 BuildRequires:  gcc-c++
@@ -212,8 +213,9 @@ sed -i -e '/^effective-user/s/=$/= lirc/' lirc_options.conf
 %setup -q
 if zypper vcmp $(rpm -qf "%%{version}" linux-glibc-devel) 4.8~ | grep
 "is newer"; then
-%patch0
+%patch0 -p1
 fi
+%patch1 -p1
 
 %build
 %configure

From 1608301e4f0311651fafed7ae2e887a1cb6905b09ac2d550353d3a225255cc4b Mon Sep 17 00:00:00 2001
From: Denisart Benjamin <p.drouand@gmail.com>
Date: Thu, 3 Nov 2016 10:31:22 +0000
Subject: [PATCH 06/13] Accepting request 438506 from home:posophe:branches:vdr

fix

OBS-URL: https://build.opensuse.org/request/show/438506
OBS-URL: https://build.opensuse.org/package/show/vdr/lirc?expand=0&rev=76
---
 lirc.changes | 5 +++++
 lirc.spec    | 1 -
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/lirc.changes b/lirc.changes
index 1a2c799..8a0f681 100644
--- a/lirc.changes
+++ b/lirc.changes
@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Thu Nov  3 10:30:47 UTC 2016 - p.drouand@gmail.com
+
+- Fix %pre script
+
 -------------------------------------------------------------------
 Wed Nov  2 13:46:41 UTC 2016 - p.drouand@gmail.com
 
diff --git a/lirc.spec b/lirc.spec
index 25fcb15..2c840d4 100644
--- a/lirc.spec
+++ b/lirc.spec
@@ -276,7 +276,6 @@ getent passwd lirc >/dev/null || \
 usermod -a -G dialout lirc &> /dev/null || :
 usermod -a -G lock lirc &> /dev/null || :
 usermod -a -G input lirc &> /dev/null || :
-exit 0
 %service_add_pre lircd.service lircmd.service lircd-uinput.service lircd.socket irexec.service
 
 %post core

From ea9d5f13f794b041600b9118540f22c5172f02dd887a6ea387956c1d2b797d90 Mon Sep 17 00:00:00 2001
From: Dominique Leuenberger <dleuenberger@suse.com>
Date: Tue, 8 Nov 2016 15:57:14 +0000
Subject: [PATCH 07/13] Fix branch

OBS-URL: https://build.opensuse.org/package/show/vdr/lirc?expand=0&rev=80
---
 lirc.spec | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lirc.spec b/lirc.spec
index 2c840d4..1799f47 100644
--- a/lirc.spec
+++ b/lirc.spec
@@ -48,13 +48,13 @@ BuildRequires:  pkgconfig(libudev)
 %endif
 BuildRequires:  python3
 BuildRequires:  python3-PyYAML
+BuildRequires:  zypper
 BuildRequires:  pkgconfig(libusb)
 BuildRequires:  pkgconfig(portaudio-2.0)
 BuildRequires:  pkgconfig(sm)
 BuildRequires:  pkgconfig(systemd)
 BuildRequires:  pkgconfig(udev)
 BuildRequires:  pkgconfig(x11)
-BuildRequires:  zypper
 Requires:       udev
 Recommends:     lirc-remotes
 Suggests:       lirc-kmp

From c94669f170f0b1c1a6bceb57e39dbdfbad73e6983c0dc5378c6e01af414c089a Mon Sep 17 00:00:00 2001
From: Denisart Benjamin <p.drouand@gmail.com>
Date: Tue, 8 Nov 2016 16:01:08 +0000
Subject: [PATCH 08/13] OBS-URL:
 https://build.opensuse.org/package/show/vdr/lirc?expand=0&rev=81

---
 lirc.spec | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lirc.spec b/lirc.spec
index 1799f47..753f41d 100644
--- a/lirc.spec
+++ b/lirc.spec
@@ -194,6 +194,7 @@ Requires:       xorg-x11-fonts-core
 %description   tools-gui
 Some seldom used X11-based tools for debugging lirc configurations.
 
+%prep
 # Don't provide or require anything from _docdir, per policy.
 %global __provides_exclude_from ^%{_docdir}/.*$
 %global __requires_exclude_from ^%{_docdir}/.*$
@@ -209,7 +210,6 @@ sed -i -e 's|/usr/local/etc/|/etc/|' contrib/irman2lirc
 sed -i -e 's/#effective-user/effective-user /' lirc_options.conf
 sed -i -e '/^effective-user/s/=$/= lirc/' lirc_options.conf
 
-%prep
 %setup -q
 if zypper vcmp $(rpm -qf "%%{version}" linux-glibc-devel) 4.8~ | grep
 "is newer"; then

From 8a7169fdca815d25d3d6dea2f00d87853829b350315289800767dd17a5bfb41e Mon Sep 17 00:00:00 2001
From: Denisart Benjamin <p.drouand@gmail.com>
Date: Tue, 8 Nov 2016 16:05:07 +0000
Subject: [PATCH 09/13] OBS-URL:
 https://build.opensuse.org/package/show/vdr/lirc?expand=0&rev=82

---
 lirc.spec | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/lirc.spec b/lirc.spec
index 753f41d..4754d5e 100644
--- a/lirc.spec
+++ b/lirc.spec
@@ -32,6 +32,9 @@ Source0:        http://downloads.sourceforge.net/project/lirc/LIRC/%{version}/li
 Source1:        baselibs.conf
 Patch0:         lircd-Remove-use-of-functions-killed-in-kernel-4.8.0.patch
 Patch1:         lirc-lib-curl_poll.h-Ensure-build-on-unconfiguredclients.patch
+Patch2:         lirc-configure-libudev.patch
+BuildRequires:  autoconf
+BuildRequires:  autogen
 BuildRequires:  doxygen
 BuildRequires:  fdupes
 BuildRequires:  gcc-c++
@@ -216,8 +219,11 @@ if zypper vcmp $(rpm -qf "%%{version}" linux-glibc-devel) 4.8~ | grep
 %patch0 -p1
 fi
 %patch1 -p1
+%patch2 -p1
 
 %build
+# Run autogen; required by lirc-configure-libudev.patch, as it touches configure script
+NOCONFIGURE=1 ./autogen.sh
 %configure
 make %{?_smp_mflags}
 

From a4733a8169861c83cb11475bd58972fd67aa0a58ed2b7148c06dae2bda61a4be Mon Sep 17 00:00:00 2001
From: Denisart Benjamin <p.drouand@gmail.com>
Date: Tue, 8 Nov 2016 16:05:35 +0000
Subject: [PATCH 10/13] OBS-URL:
 https://build.opensuse.org/package/show/vdr/lirc?expand=0&rev=83

---
 lirc-configure-libudev.patch | 27 +++++++++++++++++++++++++++
 1 file changed, 27 insertions(+)
 create mode 100644 lirc-configure-libudev.patch

diff --git a/lirc-configure-libudev.patch b/lirc-configure-libudev.patch
new file mode 100644
index 0000000..9b57482
--- /dev/null
+++ b/lirc-configure-libudev.patch
@@ -0,0 +1,27 @@
+--- a/configure.ac
++++ b/configure.ac
+@@ -48,9 +48,9 @@
+ dnl Checks for header files.
+ AC_HEADER_STDC
+ AC_HEADER_TIME
+-AC_CHECK_HEADERS([fcntl.h limits.h linux/ioctl.h poll.h sys/ioctl.h \
+-		  sys/poll.h sys/time.h syslog.h unistd.h util.h \
+-		  libutil.h pty.h])
++AC_CHECK_HEADERS([fcntl.h libudev.h limits.h linux/ioctl.h poll.h \
++		  sys/ioctl.h  sys/poll.h sys/time.h syslog.h unistd.h \
++		  util.h libutil.h pty.h])
+ 
+ dnl Checks for typedefs, structures, and compiler characteristics.
+ AC_C_CONST
+@@ -390,6 +390,10 @@
+     AC_DEFINE(HAVE_SYSTEMD)
+ fi
+ 
++PKG_CHECK_MODULES([LIBUDEV],[libudev],,[true])
++CFLAGS="$CFLAGS $LIBUDEV_CFLAGS"
++LIBS="$LIBS $LIBUDEV_LIBS"
++
+ dnl Ubuntu's systemd pkg-config seems broken beyond repair. So:
+ kernelversion=`cat /proc/version || echo "non-linux"`
+ case $kernelversion in
+

From e6d71a05ff3f712f9193ae54db9f47a762543c127cfb3b56e21b0c93b376e1df Mon Sep 17 00:00:00 2001
From: Denisart Benjamin <p.drouand@gmail.com>
Date: Tue, 8 Nov 2016 16:07:48 +0000
Subject: [PATCH 11/13] OBS-URL:
 https://build.opensuse.org/package/show/vdr/lirc?expand=0&rev=84

---
 lirc.changes | 57 ++++++++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 57 insertions(+)

diff --git a/lirc.changes b/lirc.changes
index 8a0f681..c7b2d00 100644
--- a/lirc.changes
+++ b/lirc.changes
@@ -1,3 +1,60 @@
+-------------------------------------------------------------------
+Tue Nov  8 16:05:41 UTC 2016 - p.drouand@gmail.com
+
+- Move workarounds to %prep section
+- Add lirc-configure-libudev.patch (boo#1008764)
+
+-------------------------------------------------------------------
+Thu Nov  3 10:30:47 UTC 2016 - p.drouand@gmail.com
+
+- Fix %pre script
+
+-------------------------------------------------------------------
+Wed Nov  2 13:46:41 UTC 2016 - p.drouand@gmail.com
+
+- Add lirc-lib-curl_poll.h-Ensure-build-on-unconfiguredclients.patch
+
+-------------------------------------------------------------------
+Fri Oct 21 18:14:41 UTC 2016 - p.drouand@gmail.com
+
+- Update to version 0.9.4c
+  * New curl_poll files adds a new MIT license. Lirc now carries GPL,
+    BSD and MIT licenses.
+  * Several patches to make lirc work again on macos (#226, #227).
+  * New tool irtext2udp generates udp plugin data (#197).
+  * plugins: girs: Add udp/receive support (#201).
+  * mode2: Fix broken --raw option (#223).
+  * lirc-make-devinput: Fix that two remotes has the same name (#222).
+  * lircd: Warn for duplicate remote definitions (#222).
+  * lircd: Retry temporary unavailable write sockets (#221).
+  * contrib: Fix usb devices' acl permissions (rhbz #1364744).
+  * lirc-setup: Fix crasher bugfix (Fedora abort trace).
+  * contrib: disable udev /dev/uinput rule requiring lirc user.
+  * plugins: audio_alsa: Fix byte truncating in 16-bit data (#218):
+  * plugins: irtoy: improve error handling (#220).
+  * Minor documentation fixes.
+- Changes from version 0.9.4b
+  * lircd-uinput: A multitude of fixes (#213, #211, #177). Adds new options.
+  * lirc_client: Fix "Can't redirect irsend output" (#207).
+  * lirc_client: Fix un-terminated buffer causing irsend crash (#216).
+  * irrecord: Fix under-sized buffer causing crash (#208).
+  * systemd: Add hardening options comments to services (#204).
+  * lircmd: Options, udev examples and manpage update.
+  * lib: Add missing Makefile.am dep, fixes parallel build failure (#210).
+  * Remove a single python2 dependency [4e3c97c].
+  * build: Don't define docdir - autoconf defines docdir (#215).
+  * build: support runstatedir configure option (#212).
+  * doc: Manpages and configuration guide fixes.
+- Remove fix-remote-keys.pl, README.SUSE and 51-lirc.rules; not relevant
+  for a while already
+- Remove 0001-Fix-segfault-when-starting-lircd-AUR-41581.patch and
+  0002-lircd-Fix-bad-default-for-lircdfile.patch; fixed on upstream
+- Add missing dependency to systemd
+- Global sweeping
+- Add lirc nologgin user; now needed
+- Add lircd-Remove-use-of-functions-killed-in-kernel-4.8.0.patch;
+  fix build on openSUSE > 42.2
+
 -------------------------------------------------------------------
 Thu Nov  3 10:30:47 UTC 2016 - p.drouand@gmail.com
 

From 60d24a249f3c6078f4c15caf22ae2d97563e0a08b8d2e92d73f2fdd51d541a1d Mon Sep 17 00:00:00 2001
From: Denisart Benjamin <p.drouand@gmail.com>
Date: Tue, 8 Nov 2016 16:11:14 +0000
Subject: [PATCH 12/13] OBS-URL:
 https://build.opensuse.org/package/show/vdr/lirc?expand=0&rev=85

---
 lirc.spec | 7 -------
 1 file changed, 7 deletions(-)

diff --git a/lirc.spec b/lirc.spec
index 4754d5e..e02e2b3 100644
--- a/lirc.spec
+++ b/lirc.spec
@@ -201,13 +201,6 @@ Some seldom used X11-based tools for debugging lirc configurations.
 # Don't provide or require anything from _docdir, per policy.
 %global __provides_exclude_from ^%{_docdir}/.*$
 %global __requires_exclude_from ^%{_docdir}/.*$
-%if %{defined _rundir}
-# Fix rundir for openSUSE > 13.1
-sed -i 's|${localstatedir}/run|run|g' configure
-%else
-# But fix systemd unit files for openSUSE <= 13.1
-sed -i 's|run|%{_localstatedir}/run|g' systemd/lircd.socket
-%endif
 
 sed -i -e 's|/usr/local/etc/|/etc/|' contrib/irman2lirc
 sed -i -e 's/#effective-user/effective-user /' lirc_options.conf

From b94917b61353a8209029b7885471b912f892a3abefc388dad54e49dec135c6f0 Mon Sep 17 00:00:00 2001
From: Denisart Benjamin <p.drouand@gmail.com>
Date: Tue, 8 Nov 2016 16:57:46 +0000
Subject: [PATCH 13/13] Accepting request 439255 from home:posophe:branches:vdr

OBS-URL: https://build.opensuse.org/request/show/439255
OBS-URL: https://build.opensuse.org/package/show/vdr/lirc?expand=0&rev=88
---
 lirc-configure-libudev.patch | 12 +++------
 lirc.changes                 | 51 ------------------------------------
 lirc.spec                    |  3 +--
 3 files changed, 5 insertions(+), 61 deletions(-)

diff --git a/lirc-configure-libudev.patch b/lirc-configure-libudev.patch
index 9b57482..d559876 100644
--- a/lirc-configure-libudev.patch
+++ b/lirc-configure-libudev.patch
@@ -1,18 +1,14 @@
 --- a/configure.ac
 +++ b/configure.ac
-@@ -48,9 +48,9 @@
+@@ -48,7 +48,7 @@
  dnl Checks for header files.
  AC_HEADER_STDC
  AC_HEADER_TIME
--AC_CHECK_HEADERS([fcntl.h limits.h linux/ioctl.h poll.h sys/ioctl.h \
--		  sys/poll.h sys/time.h syslog.h unistd.h util.h \
--		  libutil.h pty.h])
-+AC_CHECK_HEADERS([fcntl.h libudev.h limits.h linux/ioctl.h poll.h \
-+		  sys/ioctl.h  sys/poll.h sys/time.h syslog.h unistd.h \
-+		  util.h libutil.h pty.h])
+-AC_CHECK_HEADERS([fcntl.h limits.h poll.h sys/ioctl.h sys/poll.h sys/time.h ])
++AC_CHECK_HEADERS([fcntl.h libudev.h limits.h poll.h sys/ioctl.h sys/poll.h sys/time.h ])
+ AC_CHECK_HEADERS([syslog.h unistd.h util.h libutil.h pty.h])
  
  dnl Checks for typedefs, structures, and compiler characteristics.
- AC_C_CONST
 @@ -390,6 +390,10 @@
      AC_DEFINE(HAVE_SYSTEMD)
  fi
diff --git a/lirc.changes b/lirc.changes
index c7b2d00..341ef9d 100644
--- a/lirc.changes
+++ b/lirc.changes
@@ -17,57 +17,6 @@ Wed Nov  2 13:46:41 UTC 2016 - p.drouand@gmail.com
 -------------------------------------------------------------------
 Fri Oct 21 18:14:41 UTC 2016 - p.drouand@gmail.com
 
-- Update to version 0.9.4c
-  * New curl_poll files adds a new MIT license. Lirc now carries GPL,
-    BSD and MIT licenses.
-  * Several patches to make lirc work again on macos (#226, #227).
-  * New tool irtext2udp generates udp plugin data (#197).
-  * plugins: girs: Add udp/receive support (#201).
-  * mode2: Fix broken --raw option (#223).
-  * lirc-make-devinput: Fix that two remotes has the same name (#222).
-  * lircd: Warn for duplicate remote definitions (#222).
-  * lircd: Retry temporary unavailable write sockets (#221).
-  * contrib: Fix usb devices' acl permissions (rhbz #1364744).
-  * lirc-setup: Fix crasher bugfix (Fedora abort trace).
-  * contrib: disable udev /dev/uinput rule requiring lirc user.
-  * plugins: audio_alsa: Fix byte truncating in 16-bit data (#218):
-  * plugins: irtoy: improve error handling (#220).
-  * Minor documentation fixes.
-- Changes from version 0.9.4b
-  * lircd-uinput: A multitude of fixes (#213, #211, #177). Adds new options.
-  * lirc_client: Fix "Can't redirect irsend output" (#207).
-  * lirc_client: Fix un-terminated buffer causing irsend crash (#216).
-  * irrecord: Fix under-sized buffer causing crash (#208).
-  * systemd: Add hardening options comments to services (#204).
-  * lircmd: Options, udev examples and manpage update.
-  * lib: Add missing Makefile.am dep, fixes parallel build failure (#210).
-  * Remove a single python2 dependency [4e3c97c].
-  * build: Don't define docdir - autoconf defines docdir (#215).
-  * build: support runstatedir configure option (#212).
-  * doc: Manpages and configuration guide fixes.
-- Remove fix-remote-keys.pl, README.SUSE and 51-lirc.rules; not relevant
-  for a while already
-- Remove 0001-Fix-segfault-when-starting-lircd-AUR-41581.patch and
-  0002-lircd-Fix-bad-default-for-lircdfile.patch; fixed on upstream
-- Add missing dependency to systemd
-- Global sweeping
-- Add lirc nologgin user; now needed
-- Add lircd-Remove-use-of-functions-killed-in-kernel-4.8.0.patch;
-  fix build on openSUSE > 42.2
-
--------------------------------------------------------------------
-Thu Nov  3 10:30:47 UTC 2016 - p.drouand@gmail.com
-
-- Fix %pre script
-
--------------------------------------------------------------------
-Wed Nov  2 13:46:41 UTC 2016 - p.drouand@gmail.com
-
-- Add lirc-lib-curl_poll.h-Ensure-build-on-unconfiguredclients.patch
-
--------------------------------------------------------------------
-Fri Oct 21 18:14:41 UTC 2016 - p.drouand@gmail.com
-
 - Update to version 0.9.4c
   * New curl_poll files adds a new MIT license. Lirc now carries GPL,
     BSD and MIT licenses.
diff --git a/lirc.spec b/lirc.spec
index e02e2b3..d61996c 100644
--- a/lirc.spec
+++ b/lirc.spec
@@ -198,6 +198,7 @@ Requires:       xorg-x11-fonts-core
 Some seldom used X11-based tools for debugging lirc configurations.
 
 %prep
+%setup -q
 # Don't provide or require anything from _docdir, per policy.
 %global __provides_exclude_from ^%{_docdir}/.*$
 %global __requires_exclude_from ^%{_docdir}/.*$
@@ -205,8 +206,6 @@ Some seldom used X11-based tools for debugging lirc configurations.
 sed -i -e 's|/usr/local/etc/|/etc/|' contrib/irman2lirc
 sed -i -e 's/#effective-user/effective-user /' lirc_options.conf
 sed -i -e '/^effective-user/s/=$/= lirc/' lirc_options.conf
-
-%setup -q
 if zypper vcmp $(rpm -qf "%%{version}" linux-glibc-devel) 4.8~ | grep
 "is newer"; then
 %patch0 -p1