From 3b7cb6d53c643acc877af72be304cec541c379f2 Mon Sep 17 00:00:00 2001
From: cvsextras <cvsextras@fedoraproject.org>
Date: Mon, 8 Nov 2004 04:49:37 +0000
Subject: [PATCH 001/204] auto-import changelog data from
 lirc-0.6.6-3.1.fc2.fr.src.rpm //freshrpms.net/> 0.6.6-3 - Added missing
 /sbin/ldconfig calls. //freshrpms.net/> 0.6.6-2 - Rebuild for Fedora Core
 2... this spec file still _really_ needs     reworking! //freshrpms.net/>
 0.6.6-2 - Rebuild for Fedora Core 1... this spec file _really_ needs
 reworking! //freshrpms.net/> - Rebuilt for Red Hat Linux 9... this spec file
 needs some reworking! //freshrpms.net/> - Update to 0.6.6 final.
 //freshrpms.net/> - Updated to latest pre-version. - Kernel modules still
 need to be compiled separately and with a custom     kernel :-(
 //freshrpms.net/> - Update to 0.6.5. - Rebuilt against Red Hat Linux 7.3. -
 Added the %{?_smp_mflags} expansion. //freshrpms.net/> - Initial RPM release.

---
 .cvsignore      |   1 +
 lirc.spec       | 144 ++++++++++++++++++++++++++++++++++++++++++++++++
 lircd.init      |  81 +++++++++++++++++++++++++++
 lircd.logrotate |   8 +++
 sources         |   1 +
 5 files changed, 235 insertions(+)
 create mode 100644 lirc.spec
 create mode 100755 lircd.init
 create mode 100644 lircd.logrotate

diff --git a/.cvsignore b/.cvsignore
index e69de29..08b1a75 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -0,0 +1 @@
+lirc-0.6.6.tar.bz2
diff --git a/lirc.spec b/lirc.spec
new file mode 100644
index 0000000..049afb4
--- /dev/null
+++ b/lirc.spec
@@ -0,0 +1,144 @@
+# $Id: lirc.spec 2135 2004-08-30 13:51:15Z dude $
+# Authority: matthias
+
+# The driver(s) you want to compile in, e.g. "pctv", "serial", "any"
+%define driver "pctv"
+
+# Are we compiling drivers that will need a kernel module too
+# (you'll still need to recompile an entire kernel, keep the sources, then
+# recompile lirc to get the modules...)
+%define kmodule 0
+
+#%%if %{kmodule}
+#%%define	kunamer	%%(uname -r)
+#%%define	kver	%%(echo $(uname -r) | sed -e s/smp// -)
+#%%define	karch	%%(rpm -q --qf '%%%{arch}' kernel-%%{kversion})
+#%%define	krelver	%%(echo %%{kunamer} | tr -s '-' '_')
+#%%endif
+
+Summary: The Linux Infrared Remote Control package
+Name: lirc
+Version: 0.6.6
+#%%if %{kmodule}
+#Release: fr1_%{krelver}
+#%%else
+Release: 3.1.fc2.fr
+#%%endif
+License: GPL
+Group: System Environment/Daemons
+URL: http://www.lirc.org/
+Source0: http://dl.sf.net/lirc/%{name}-%{version}.tar.bz2
+Source1: lircd.init
+Source2: lircd.logrotate
+BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
+PreReq: /sbin/chkconfig, /sbin/service
+BuildRequires: perl
+#%%if %{kmodule}
+#Requires: kernel = %{kver}
+#BuildRequires: kernel-source = %{kver}
+#%%endif
+
+%description
+LIRC is the Linux Infrared Remote Control package.
+This package features a clean lircd initscript and a logrotate config file.
+
+The default binary build of this package will only work with the Pinnacle
+PCTV serial remote, if you have a different device, you will probably need
+to recompile the source RPM changing the "--with-driver=" configure option
+to your device.
+
+If your remote requires special kernel modules to run, I guess you're stuck
+having to recompile a kernel and recompile lirc manually to get the modules!
+
+
+%prep
+%setup
+
+
+%build
+%configure \
+    --with-driver=%{driver} \
+    --disable-manage-devices
+%{__make} %{?_smp_mflags}
+
+
+%install
+%{__rm} -rf %{buildroot}
+%{__make} install DESTDIR=%{buildroot}
+%{__install} -m 755 -D %{SOURCE1} %{buildroot}/etc/init.d/lircd
+%{__install} -m 644 -D %{SOURCE2} %{buildroot}/etc/logrotate.d/lircd
+%{__perl} -pi -e 's|\@SBINDIR\@|%{_sbindir}|g' %{buildroot}/etc/init.d/lircd
+%{__rm} -f doc/Makefile*
+%{__mkdir_p} %{buildroot}/dev
+%{__ln_s} -f ttyS0 %{buildroot}/dev/lirc
+touch %{buildroot}/etc/lircd.conf
+touch %{buildroot}/etc/lircmd.conf
+
+%post
+/sbin/ldconfig
+/sbin/chkconfig --add lircd
+
+%preun
+if [ $1 = 0 ]; then
+    /sbin/service lircd stop > /dev/null 2>&1 || :
+    /sbin/chkconfig --del lircd
+fi
+
+%postun
+/sbin/ldconfig
+if [ "$1" -ge "1" ]; then
+    /sbin/service lircd condrestart >/dev/null 2>&1 || :
+fi
+
+%clean
+%{__rm} -rf %{buildroot}
+
+%files
+%defattr(-, root, root, 0755)
+%doc ANNOUNCE AUTHORS ChangeLog COPYING NEWS README TODO doc remotes
+%doc contrib/*.conf contrib/irman2lirc contrib/lircrc contrib/lircs
+/etc/init.d/lircd
+/etc/logrotate.d/lircd
+%ghost %config(noreplace) /etc/lircd.conf
+%ghost %config(noreplace) /etc/lircmd.conf
+%{_bindir}/*
+%{_sbindir}/*
+%{_includedir}/lirc
+%{_libdir}/liblirc_*
+%{_mandir}/man?/*
+%if %{kmodule}
+#/lib/modules/%{kver}/misc/*
+%attr(0644, root, root) %dev(c, 61, 0) /dev/lirc
+%else
+/dev/lirc
+%endif
+
+%changelog
+* Mon Aug 30 2004 Matthias Saou <http://freshrpms.net/> 0.6.6-3
+- Added missing /sbin/ldconfig calls.
+
+* Wed May 19 2004 Matthias Saou <http://freshrpms.net/> 0.6.6-2
+- Rebuild for Fedora Core 2... this spec file still _really_ needs reworking!
+
+* Fri Nov  7 2003 Matthias Saou <http://freshrpms.net/> 0.6.6-2
+- Rebuild for Fedora Core 1... this spec file _really_ needs reworking!
+
+* Mon Mar 31 2003 Matthias Saou <http://freshrpms.net/>
+- Rebuilt for Red Hat Linux 9... this spec file needs some reworking!
+
+* Mon Oct  7 2002 Matthias Saou <http://freshrpms.net/>
+- Update to 0.6.6 final.
+
+* Mon Sep 16 2002 Matthias Saou <http://freshrpms.net/>
+- Updated to latest pre-version.
+- Kernel modules still need to be compiled separately and with a custom
+  kernel :-(
+
+* Thu May  2 2002 Matthias Saou <http://freshrpms.net/>
+- Update to 0.6.5.
+- Rebuilt against Red Hat Linux 7.3.
+- Added the %%{?_smp_mflags} expansion.
+
+* Thu Oct  4 2001 Matthias Saou <http://freshrpms.net/>
+- Initial RPM release.
+
diff --git a/lircd.init b/lircd.init
new file mode 100755
index 0000000..f3aa6ac
--- /dev/null
+++ b/lircd.init
@@ -0,0 +1,81 @@
+#!/bin/sh
+#
+# $Id: lircd.init,v 1.1 2004/02/26 17:54:30 thias Exp $
+# Startup script for the Linux Infrared Remote Control.
+#
+# chkconfig: - 90 10
+# description: Enables infrared controls through LIRC.
+#
+# config: /etc/lircd.conf
+
+# Source 'em up
+. /etc/init.d/functions
+
+[ -x @SBINDIR@/lircd ]  || exit 1
+[ -x @SBINDIR@/lircmd ] || exit 1
+[ -f /etc/lircd.conf ]  || [ -f /etc/lircmd.conf ] || exit 1
+
+RETVAL=0
+
+start(){
+	if [ -f /etc/lircd.conf ]; then
+		echo -n $"Starting infrared remote control daemon: "
+		daemon lircd
+		RETVAL=$?
+		echo
+	fi
+	if [ -f /etc/lircmd.conf ]; then
+		echo -n $"Starting infrared remote control mouse daemon: "
+		daemon lircmd
+		RETVAL=$?
+		echo
+	fi
+	touch /var/lock/subsys/lircd
+	return $RETVAL
+}
+
+stop(){
+	if [ -f /etc/lircmd.conf ]; then
+		echo -n $"Stopping infrared remote control mouse daemon: "
+		killproc lircmd
+		echo
+	fi
+	if [ -f /etc/lircd.conf ]; then
+		echo -n $"Stopping infrared remote control daemon: "
+		killproc lircd
+		echo
+	fi
+	RETVAL=$?
+	rm -f /var/lock/subsys/lircd
+	return $RETVAL
+}
+
+restart(){
+	stop
+	start
+}
+
+
+# See how we were called.
+case "$1" in
+	start)
+		start
+		;;
+	stop)
+		stop
+		;;
+	restart)
+		restart
+		;;
+	status)
+		status lircd
+		;;
+	condrestart)
+		[ -e /var/lock/subsys/lircd ] && restart
+		;;
+	*)
+		echo $"Usage: $0 {start|stop|status|restart|condrestart}"
+		RETVAL=1
+esac
+
+exit $RETVAL
diff --git a/lircd.logrotate b/lircd.logrotate
new file mode 100644
index 0000000..05ade79
--- /dev/null
+++ b/lircd.logrotate
@@ -0,0 +1,8 @@
+# $Id: lircd.logrotate,v 1.1 2004/11/08 04:49:37 cvsextras Exp $
+
+/var/log/lircd {
+    missingok
+    postrotate
+        [ -e /var/lock/subsys/lircd ] && /bin/kill -HUP `/bin/cat /var/run/lircd.pid` || /bin/true
+    endscript
+}
diff --git a/sources b/sources
index e69de29..4ce285c 100644
--- a/sources
+++ b/sources
@@ -0,0 +1 @@
+6e7b5ba2fd479961d067730e16df7c54  lirc-0.6.6.tar.bz2

From 3ccfe2a10891ee3d54a08b0fc5ba59cf0a9e860a Mon Sep 17 00:00:00 2001
From: Matthias Saou <thias@fedoraproject.org>
Date: Thu, 11 Nov 2004 19:13:50 +0000
Subject: [PATCH 002/204] Small test commit to see if things are fixed for me
 or not...

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

diff --git a/lirc.spec b/lirc.spec
index 049afb4..6a6ce9c 100644
--- a/lirc.spec
+++ b/lirc.spec
@@ -22,7 +22,7 @@ Version: 0.6.6
 #%%if %{kmodule}
 #Release: fr1_%{krelver}
 #%%else
-Release: 3.1.fc2.fr
+Release: 4
 #%%endif
 License: GPL
 Group: System Environment/Daemons

From 4512cde79fd32b4fae6d0899d57610b6a0eb0af1 Mon Sep 17 00:00:00 2001
From: gafton <gafton@fedoraproject.org>
Date: Wed, 24 Nov 2004 04:29:00 +0000
Subject: [PATCH 003/204] Fix braindead typo from the original import

---
 Makefile | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/Makefile b/Makefile
index 63320b5..3df5896 100644
--- a/Makefile
+++ b/Makefile
@@ -1,5 +1,5 @@
 # Makefile for source rpm: lirc
-# $Id$
+# $Id: Makefile,v 1.1 2004/11/08 04:49:35 cvsextras Exp $
 NAME := lirc
 SPECFILE = $(firstword $(wildcard *.spec))
 
@@ -12,7 +12,7 @@ MAKEFILE_COMMON	:= $(shell $(find-makefile-common))
 ifeq ($(MAKEFILE_COMMON),)
 # attept a checkout
 define checkout-makefile-common
-test -f CVS/Rootx && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2
+test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2
 endef
 
 MAKEFILE_COMMON := $(shell $(checkout-makefile-common))

From b830d9a5157b7c320e8ecbd77252c22a66b48346 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ville=20Skytt=C3=A4?= <scop@fedoraproject.org>
Date: Sun, 5 Dec 2004 23:17:51 +0000
Subject: [PATCH 004/204] Update to 0.7.0; major rework of the package.

---
 .cvsignore      |   2 +-
 lirc.init       |  94 ++++++++++++++++
 lirc.makedev    |   3 +
 lirc.spec       | 281 +++++++++++++++++++++++++++++++++---------------
 lirc.sysconfig  |  13 +++
 lircd.init      |  81 --------------
 lircd.logrotate |   8 --
 sources         |   2 +-
 8 files changed, 309 insertions(+), 175 deletions(-)
 create mode 100644 lirc.init
 create mode 100644 lirc.makedev
 create mode 100644 lirc.sysconfig
 delete mode 100755 lircd.init
 delete mode 100644 lircd.logrotate

diff --git a/.cvsignore b/.cvsignore
index 08b1a75..1a88123 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1 +1 @@
-lirc-0.6.6.tar.bz2
+lirc-0.7.0.tar.bz2
diff --git a/lirc.init b/lirc.init
new file mode 100644
index 0000000..77799d6
--- /dev/null
+++ b/lirc.init
@@ -0,0 +1,94 @@
+#!/bin/sh
+#
+# lirc         Startup script for the Linux Infrared Remote Control daemons
+#
+# chkconfig:   - 90 10
+# description: Enables infrared controls through LIRC.
+# processname: lircd
+# processname: lircmd
+# config:      /etc/lircd.conf
+# config:      /etc/lircmd.conf
+# pidfile:     /var/run/lircd.pid
+
+# Source function library.
+. /etc/init.d/functions
+
+exec="/usr/sbin/lircd"
+exec2="/usr/sbin/lircmd"
+prog=$(basename $exec)
+prog2=$(basename $exec2)
+
+[ -e /etc/sysconfig/lirc ] && . /etc/sysconfig/lirc
+
+lockfile=/var/lock/subsys/lirc
+
+start() {
+    echo -n $"Starting infrared remote control daemon ($prog): "
+    daemon $exec $LIRCD_OPTIONS
+    retval=$?
+    echo
+    status $prog >/dev/null 2>&1
+    if [ $? -eq 0 -a "$ENABLE_LIRCMD" = "yes" ] ; then
+        echo -n $"Starting infrared remote control mouse daemon ($prog2): "
+        daemon $exec2 $LIRCMD_OPTIONS
+        retval=$?
+        echo
+    fi
+    [ $retval -eq 0 ] && touch $lockfile
+    return $retval
+}
+
+stop() {
+    retval=0
+    if status $prog2 >/dev/null 2>&1 ; then
+        echo -n $"Stopping infrared remote control mouse daemon ($prog2): "
+        killproc $prog2
+        retval=$?
+        echo
+    fi
+    if [ $retval -eq 0 ] ; then
+        echo -n $"Stopping infrared remote control daemon ($prog): "
+        killproc $prog
+        retval=$?
+        echo
+    fi
+    [ $retval -eq 0 ] && rm -f $lockfile
+    return $retval
+}
+
+restart() {
+    stop
+    start
+}
+
+reload() {
+    # lircmd doesn't apparently respond to HUP, so if it's running, restart.
+    if status $prog2 >/dev/null 2>&1 ; then
+        restart
+    else
+        echo -n $"Reloading infrared remote control daemon ($prog): "
+        killproc $prog -HUP
+        retval=$?
+        echo
+        return $retval
+    fi
+}
+
+case "$1" in
+    start|stop|restart|reload)
+        $1
+        ;;
+    force-reload)
+        reload || restart
+        ;;
+    status)
+        status $prog2
+        status $prog
+        ;;
+    try-restart|condrestart)
+  	[ ! -f $lockfile ] || restart
+	;;
+    *)
+        echo $"Usage: $0 {start|stop|status|restart|try-restart|reload|force-reload}"
+        exit 2
+esac
diff --git a/lirc.makedev b/lirc.makedev
new file mode 100644
index 0000000..87586d4
--- /dev/null
+++ b/lirc.makedev
@@ -0,0 +1,3 @@
+# LIRC, <http://www.lirc.org/>
+
+c $ALLREAD              61   0  1   1 lirc
diff --git a/lirc.spec b/lirc.spec
index 6a6ce9c..bd1c932 100644
--- a/lirc.spec
+++ b/lirc.spec
@@ -1,119 +1,232 @@
-# $Id: lirc.spec 2135 2004-08-30 13:51:15Z dude $
-# Authority: matthias
-
-# The driver(s) you want to compile in, e.g. "pctv", "serial", "any"
-%define driver "pctv"
-
-# Are we compiling drivers that will need a kernel module too
-# (you'll still need to recompile an entire kernel, keep the sources, then
-# recompile lirc to get the modules...)
-%define kmodule 0
-
-#%%if %{kmodule}
-#%%define	kunamer	%%(uname -r)
-#%%define	kver	%%(echo $(uname -r) | sed -e s/smp// -)
-#%%define	karch	%%(rpm -q --qf '%%%{arch}' kernel-%%{kversion})
-#%%define	krelver	%%(echo %%{kunamer} | tr -s '-' '_')
-#%%endif
-
-Summary: The Linux Infrared Remote Control package
-Name: lirc
-Version: 0.6.6
-#%%if %{kmodule}
-#Release: fr1_%{krelver}
-#%%else
-Release: 4
-#%%endif
-License: GPL
-Group: System Environment/Daemons
-URL: http://www.lirc.org/
-Source0: http://dl.sf.net/lirc/%{name}-%{version}.tar.bz2
-Source1: lircd.init
-Source2: lircd.logrotate
-BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
-PreReq: /sbin/chkconfig, /sbin/service
-BuildRequires: perl
-#%%if %{kmodule}
-#Requires: kernel = %{kver}
-#BuildRequires: kernel-source = %{kver}
-#%%endif
+# Driver TODO, sometime maybe:
+# - audio (req: portaudio)
+# - caraca (req: caraca_client)
+# - irman: (req: libirman)
+# - drivers that need drivers/media/video/bttv*.h (not in kernel-module-devel)
+#   - gpio: flyvideo avermedia avermedia98
+#   - i2c: hauppauge
+# Other TODO:
+# - move to -devel (?): irw, *mode2, others?
+# - don't run as root and/or create dedicated group, reduce fifo permissions?
+# - Fixup /etc/lirc(m)d.conf %%ghost'ification, existence after erase etc.
+# - kernel modules: Figure out sane permissions for /dev/lirc, use
+#   console.perms/udev, general FC3 adjustments.
+
+%{!?kernel: %{expand: %%define kernel %(uname -r)}}
+%define ksrc %{_libdir}/kernel-module-devel/%{kernel}-%{_target_cpu}
+# Kernel module drivers
+%define drivers sir_com3 it87 tekram_bt829 com1 atiusb mceusb lpt1
+
+Name:           lirc
+Version:        0.7.0
+Release:        1
+Summary:        The Linux Infrared Remote Control package
+
+Group:          System Environment/Daemons
+License:        GPL
+URL:            http://www.lirc.org/
+Source0:        http://download.sourceforge.net/lirc/%{name}-%{version}.tar.bz2
+Source1:        %{name}.init
+Source2:        %{name}.sysconfig
+Source3:        %{name}.makedev
+BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+
+BuildRequires:  %{__perl}
+%if 0%{!?_with_kmod:1}
+BuildRequires:  alsa-lib-devel XFree86-devel libusb-devel
+BuildConflicts: svgalib-devel
+%endif
+Requires(post): /sbin/chkconfig /sbin/ldconfig
+Requires(preun): /sbin/chkconfig
+Requires(postun): /sbin/ldconfig
 
 %description
 LIRC is the Linux Infrared Remote Control package.
-This package features a clean lircd initscript and a logrotate config file.
 
-The default binary build of this package will only work with the Pinnacle
-PCTV serial remote, if you have a different device, you will probably need
-to recompile the source RPM changing the "--with-driver=" configure option
-to your device.
+%package        devel
+Summary:        Development files for LIRC
+Group:          Development/Libraries
+Requires:       %{name} = %{version}-%{release}
+
+%description    devel
+%{summary}.
+
+%package     -n kernel-module-%{name}-%{kernel}
+Summary:        Kernel modules for LIRC
+Group:          System Environment/Kernel
+Provides:       kernel-module
+Provides:       kernel-module-%{name} = %{version}
+%if 0%{?_with_kmod:1}
+BuildRequires:  %{ksrc} MAKEDEV
+%endif
+Requires:       modutils %{name} = %{version}
+Requires:       /boot/vmlinuz-%{kernel}
 
-If your remote requires special kernel modules to run, I guess you're stuck
-having to recompile a kernel and recompile lirc manually to get the modules!
+%description -n kernel-module-%{name}-%{kernel}
+LIRC kernel modules built for kernel
+%{kernel} (%{_target_cpu}).
 
 
 %prep
-%setup
+%setup -q
+%{__perl} -pi -e 's|^CFLAGS="-O2 -g -Wall"|CFLAGS="\$CFLAGS -Wall"|' configure
+chmod 644 contrib/*
 
 
 %build
+%if 0%{?_with_kmod:1}
+for driver in %{drivers} ; do
+  # lpt1 is not smp safe @@@ TODO: verify this?
+  test $driver = lpt1 && grep -q '^CONFIG_SMP=y' %{ksrc}/.config && continue
+  mkdir -p buildroot/"$driver"
+  %configure \
+    --enable-sandboxed \
+    --enable-debug \
+    --disable-dependency-tracking \
+    --with-kerneldir=%{ksrc} \
+    --with-moduledir=/tmp \
+    --with-driver=$driver
+  make %{?_smp_mflags} -C drivers
+  make -C drivers install DESTDIR=$PWD/buildroot/$driver
+done
+%else
 %configure \
-    --with-driver=%{driver} \
-    --disable-manage-devices
-%{__make} %{?_smp_mflags}
+  --with-syslog=LOG_DAEMON \
+  --enable-sandboxed \
+  --enable-debug \
+  --disable-dependency-tracking \
+  --with-driver=any
+make %{?_smp_mflags}
+%endif
 
 
 %install
-%{__rm} -rf %{buildroot}
-%{__make} install DESTDIR=%{buildroot}
-%{__install} -m 755 -D %{SOURCE1} %{buildroot}/etc/init.d/lircd
-%{__install} -m 644 -D %{SOURCE2} %{buildroot}/etc/logrotate.d/lircd
-%{__perl} -pi -e 's|\@SBINDIR\@|%{_sbindir}|g' %{buildroot}/etc/init.d/lircd
-%{__rm} -f doc/Makefile*
-%{__mkdir_p} %{buildroot}/dev
-%{__ln_s} -f ttyS0 %{buildroot}/dev/lirc
-touch %{buildroot}/etc/lircd.conf
-touch %{buildroot}/etc/lircmd.conf
+rm -rf $RPM_BUILD_ROOT __docs
+
+%if 0%{?_with_kmod:1}
+for driver in %{drivers} ; do
+  # lpt1 is not SMP safe @@@ TODO: verify this?
+  test $driver = lpt1 && grep -q '^CONFIG_SMP=y' %{ksrc}/.config && continue
+  install -dm 755 $RPM_BUILD_ROOT/lib/modules/%{kernel}/updates/lirc
+  # 0755 here to allow stripping, fixed later in %%files
+  install -pm 755 buildroot/$driver/tmp/* \
+    $RPM_BUILD_ROOT/lib/modules/%{kernel}/updates/lirc
+done
+install -Dpm 644 %{SOURCE3} $RPM_BUILD_ROOT%{_sysconfdir}/makedev.d/lirc
+cp -p %{_sysconfdir}/makedev.d/00macros $RPM_BUILD_ROOT%{_sysconfdir}/makedev.d
+/dev/MAKEDEV -M \
+  -c $RPM_BUILD_ROOT%{_sysconfdir}/makedev.d \
+  -d $RPM_BUILD_ROOT/dev lirc \
+  | sed "s|$RPM_BUILD_ROOT||g" \
+  | grep -v ' /dev$' \
+  > devices.list
+rm -f $RPM_BUILD_ROOT%{_sysconfdir}/makedev.d/00macros
+
+%else
+make install DESTDIR=$RPM_BUILD_ROOT
+rm -f $RPM_BUILD_ROOT%{_mandir}/man1/smode2.1* # if no svgalib
+install -Dpm 755 %{SOURCE1} $RPM_BUILD_ROOT%{_initrddir}/lirc
+%{__perl} -pi -e \
+  's|/etc/|%{_sysconfdir}/|g ;
+   s|/var/|%{_localstatedir}/|g ;
+   s|/usr/sbin/|%{_sbindir}/|g' \
+  $RPM_BUILD_ROOT%{_initrddir}/lirc
+install -Dpm 644 %{SOURCE2} $RPM_BUILD_ROOT%{_sysconfdir}/sysconfig/lirc
+mkdir __docs
+cp -pR doc contrib __docs
+cd __docs
+rm -rf doc/Makefile* doc/.libs doc/man* contrib/lirc.* contrib/sendxevent.c
+cd ..
+touch $RPM_BUILD_ROOT%{_sysconfdir}/lirc{d,md}.conf
+install -dm 755 $RPM_BUILD_ROOT/dev
+touch $RPM_BUILD_ROOT/dev/lirc{d,m}
+%endif
+
+
+%clean
+rm -rf $RPM_BUILD_ROOT
+
 
 %post
 /sbin/ldconfig
-/sbin/chkconfig --add lircd
+/sbin/chkconfig --add lirc
+# Backwards compatibility (init script lircd -> lirc rename):
+if [ $1 -gt 0 -a -x %{_initrddir}/lircd ] ; then
+  %{_initrddir}/lircd status >/dev/null 2>&1
+  ret=$?
+  %{_initrddir}/lircd stop >/dev/null || :
+  /sbin/chkconfig --del lircd || :
+  if [ $ret -eq 0 ] ; then
+    %{_initrddir}/lirc start >/dev/null || :
+  fi
+fi
+
+%post -n kernel-module-%{name}-%{kernel}
+depmod -ae -F /boot/System.map-%{kernel} %{kernel} >/dev/null || :
 
 %preun
-if [ $1 = 0 ]; then
-    /sbin/service lircd stop > /dev/null 2>&1 || :
-    /sbin/chkconfig --del lircd
+if [ $1 -eq 0 ] ; then
+  %{_initrddir}/lirc stop >/dev/null || :
+  /sbin/chkconfig --del lirc || :
 fi
 
 %postun
 /sbin/ldconfig
-if [ "$1" -ge "1" ]; then
-    /sbin/service lircd condrestart >/dev/null 2>&1 || :
+if [ $1 -gt 0 ] ; then
+  %{_initrddir}/lirc try-restart >/dev/null || :
 fi
 
-%clean
-%{__rm} -rf %{buildroot}
+%postun -n kernel-module-%{name}-%{kernel}
+depmod -ae -F /boot/System.map-%{kernel} %{kernel} >/dev/null || :
 
+
+%if 0%{!?_with_kmod:1}
 %files
-%defattr(-, root, root, 0755)
-%doc ANNOUNCE AUTHORS ChangeLog COPYING NEWS README TODO doc remotes
-%doc contrib/*.conf contrib/irman2lirc contrib/lircrc contrib/lircs
-/etc/init.d/lircd
-/etc/logrotate.d/lircd
-%ghost %config(noreplace) /etc/lircd.conf
-%ghost %config(noreplace) /etc/lircmd.conf
-%{_bindir}/*
-%{_sbindir}/*
+%defattr(-,root,root,-)
+%doc ANNOUNCE AUTHORS ChangeLog COPYING NEWS README TODO remotes __docs/*
+%ghost %config(noreplace) %{_sysconfdir}/lirc*d.conf
+%config(noreplace) %{_sysconfdir}/sysconfig/lirc
+%config %{_initrddir}/lirc
+%{_bindir}/ir*
+%{_bindir}/*mode2
+%{_sbindir}/lirc*d
+%{_libdir}/liblirc_client.so.*
+%{_mandir}/man1/ir*.1*
+%{_mandir}/man1/*mode2*.1*
+%{_mandir}/man8/lirc*d.8*
+%ghost /dev/lirc*
+
+%files devel
+%defattr(-,root,root,-)
 %{_includedir}/lirc
-%{_libdir}/liblirc_*
-%{_mandir}/man?/*
-%if %{kmodule}
-#/lib/modules/%{kver}/misc/*
-%attr(0644, root, root) %dev(c, 61, 0) /dev/lirc
-%else
-/dev/lirc
+%{_libdir}/liblirc_client.a
+%{_libdir}/liblirc_client.so
+%exclude %{_libdir}/liblirc_client.la
 %endif
 
+%if 0%{?_with_kmod:1}
+%files -n kernel-module-%{name}-%{kernel} -f devices.list
+%defattr(644,root,root,755)
+%config %{_sysconfdir}/makedev.d
+/lib/modules/%{kernel}/updates
+%endif
+
+
 %changelog
+* Sun Dec  5 2004 Ville Skyttä <ville.skytta at iki.fi> - 0.7.0-1
+- Update to 0.7.0; major rework of the package:
+- Change default driver to "any".
+- Add -devel subpackage.
+- Improve init script, add %%{_sysconfdir}/sysconfig/lirc for options.
+- Rename init script to "lirc" to follow upstream; the script is not only
+  for lircd, but lircmd as well.
+- Log to syslog instead of separate log file.
+- %%ghost'ify /dev/lirc*.
+- Build kernel modules when rebuilt with "--with kmod".  This stuff was mostly
+  borrowed from Axel Thimm's packages, and is not really ready for FC3+ yet.
+- Enable debugging features.
+- Specfile cleanups.
+
 * Mon Aug 30 2004 Matthias Saou <http://freshrpms.net/> 0.6.6-3
 - Added missing /sbin/ldconfig calls.
 
diff --git a/lirc.sysconfig b/lirc.sysconfig
new file mode 100644
index 0000000..049e13f
--- /dev/null
+++ b/lirc.sysconfig
@@ -0,0 +1,13 @@
+# Note: in addition to these parameters, you need to have working    -*- sh -*-
+# configuration file for lircd (and lircmd if enabled).
+
+# Options to lircd(8).  Typically, at least a remote controller driver
+# ("-H foo") needs to be specified here.  Run "/usr/sbin/lircd -H help" to get
+# a listing of supported drivers.
+LIRCD_OPTIONS=""
+
+# If "yes", the init script will try to start lircmd(8) too.
+ENABLE_LIRCMD="no"
+
+# Options to lircmd(8).
+LIRCMD_OPTIONS=""
diff --git a/lircd.init b/lircd.init
deleted file mode 100755
index f3aa6ac..0000000
--- a/lircd.init
+++ /dev/null
@@ -1,81 +0,0 @@
-#!/bin/sh
-#
-# $Id: lircd.init,v 1.1 2004/02/26 17:54:30 thias Exp $
-# Startup script for the Linux Infrared Remote Control.
-#
-# chkconfig: - 90 10
-# description: Enables infrared controls through LIRC.
-#
-# config: /etc/lircd.conf
-
-# Source 'em up
-. /etc/init.d/functions
-
-[ -x @SBINDIR@/lircd ]  || exit 1
-[ -x @SBINDIR@/lircmd ] || exit 1
-[ -f /etc/lircd.conf ]  || [ -f /etc/lircmd.conf ] || exit 1
-
-RETVAL=0
-
-start(){
-	if [ -f /etc/lircd.conf ]; then
-		echo -n $"Starting infrared remote control daemon: "
-		daemon lircd
-		RETVAL=$?
-		echo
-	fi
-	if [ -f /etc/lircmd.conf ]; then
-		echo -n $"Starting infrared remote control mouse daemon: "
-		daemon lircmd
-		RETVAL=$?
-		echo
-	fi
-	touch /var/lock/subsys/lircd
-	return $RETVAL
-}
-
-stop(){
-	if [ -f /etc/lircmd.conf ]; then
-		echo -n $"Stopping infrared remote control mouse daemon: "
-		killproc lircmd
-		echo
-	fi
-	if [ -f /etc/lircd.conf ]; then
-		echo -n $"Stopping infrared remote control daemon: "
-		killproc lircd
-		echo
-	fi
-	RETVAL=$?
-	rm -f /var/lock/subsys/lircd
-	return $RETVAL
-}
-
-restart(){
-	stop
-	start
-}
-
-
-# See how we were called.
-case "$1" in
-	start)
-		start
-		;;
-	stop)
-		stop
-		;;
-	restart)
-		restart
-		;;
-	status)
-		status lircd
-		;;
-	condrestart)
-		[ -e /var/lock/subsys/lircd ] && restart
-		;;
-	*)
-		echo $"Usage: $0 {start|stop|status|restart|condrestart}"
-		RETVAL=1
-esac
-
-exit $RETVAL
diff --git a/lircd.logrotate b/lircd.logrotate
deleted file mode 100644
index 05ade79..0000000
--- a/lircd.logrotate
+++ /dev/null
@@ -1,8 +0,0 @@
-# $Id: lircd.logrotate,v 1.1 2004/11/08 04:49:37 cvsextras Exp $
-
-/var/log/lircd {
-    missingok
-    postrotate
-        [ -e /var/lock/subsys/lircd ] && /bin/kill -HUP `/bin/cat /var/run/lircd.pid` || /bin/true
-    endscript
-}
diff --git a/sources b/sources
index 4ce285c..e3734a3 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-6e7b5ba2fd479961d067730e16df7c54  lirc-0.6.6.tar.bz2
+4fbcc8b0d69ca5ecbdda40576964573f  lirc-0.7.0.tar.bz2

From 610580f90b658170ce3996c562ac792ed1d33324 Mon Sep 17 00:00:00 2001
From: Michael Schwendt <mschwendt@fedoraproject.org>
Date: Wed, 6 Apr 2005 22:12:23 +0000
Subject: [PATCH 005/204] mass release bump for packages not rebuilt after
 FC-3-split

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

diff --git a/lirc.spec b/lirc.spec
index bd1c932..7d0a7eb 100644
--- a/lirc.spec
+++ b/lirc.spec
@@ -19,7 +19,8 @@
 
 Name:           lirc
 Version:        0.7.0
-Release:        1
+Release:        2
+
 Summary:        The Linux Infrared Remote Control package
 
 Group:          System Environment/Daemons
@@ -213,6 +214,9 @@ depmod -ae -F /boot/System.map-%{kernel} %{kernel} >/dev/null || :
 
 
 %changelog
+* Fri Apr  7 2005 Michael Schwendt <mschwendt[AT]users.sf.net>
+- rebuilt
+
 * Sun Dec  5 2004 Ville Skyttä <ville.skytta at iki.fi> - 0.7.0-1
 - Update to 0.7.0; major rework of the package:
 - Change default driver to "any".

From c88c456a3373382cc26c92bc96598bf09ddad294 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ville=20Skytt=C3=A4?= <scop@fedoraproject.org>
Date: Sun, 17 Apr 2005 14:34:10 +0000
Subject: [PATCH 006/204] 0.7.1.

---
 .cvsignore | 2 +-
 lirc.spec  | 6 ++++--
 sources    | 2 +-
 3 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/.cvsignore b/.cvsignore
index 1a88123..84defd2 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1 +1 @@
-lirc-0.7.0.tar.bz2
+lirc-0.7.1.tar.bz2
diff --git a/lirc.spec b/lirc.spec
index 7d0a7eb..70abd4c 100644
--- a/lirc.spec
+++ b/lirc.spec
@@ -18,9 +18,8 @@
 %define drivers sir_com3 it87 tekram_bt829 com1 atiusb mceusb lpt1
 
 Name:           lirc
-Version:        0.7.0
+Version:        0.7.1
 Release:        2
-
 Summary:        The Linux Infrared Remote Control package
 
 Group:          System Environment/Daemons
@@ -214,6 +213,9 @@ depmod -ae -F /boot/System.map-%{kernel} %{kernel} >/dev/null || :
 
 
 %changelog
+* Sun Apr 17 2005 Ville Skyttä <ville.skytta at iki.fi> - 0.7.1-2
+- 0.7.1.
+
 * Fri Apr  7 2005 Michael Schwendt <mschwendt[AT]users.sf.net>
 - rebuilt
 
diff --git a/sources b/sources
index e3734a3..561067b 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-4fbcc8b0d69ca5ecbdda40576964573f  lirc-0.7.0.tar.bz2
+642e543e25dd6ad72416784bb6166d54  lirc-0.7.1.tar.bz2

From 5580f8470ab0f51935c97da9d6499a83df03d7b8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ville=20Skytt=C3=A4?= <scop@fedoraproject.org>
Date: Thu, 26 May 2005 19:16:18 +0000
Subject: [PATCH 007/204] Kernel module build improvements, disabled by default
 and possibly     incomplete.

---
 lirc.makedev |  3 ---
 lirc.spec    | 58 +++++++++++++++++++++++++---------------------------
 2 files changed, 28 insertions(+), 33 deletions(-)
 delete mode 100644 lirc.makedev

diff --git a/lirc.makedev b/lirc.makedev
deleted file mode 100644
index 87586d4..0000000
--- a/lirc.makedev
+++ /dev/null
@@ -1,3 +0,0 @@
-# LIRC, <http://www.lirc.org/>
-
-c $ALLREAD              61   0  1   1 lirc
diff --git a/lirc.spec b/lirc.spec
index 70abd4c..2a595bd 100644
--- a/lirc.spec
+++ b/lirc.spec
@@ -2,24 +2,24 @@
 # - audio (req: portaudio)
 # - caraca (req: caraca_client)
 # - irman: (req: libirman)
-# - drivers that need drivers/media/video/bttv*.h (not in kernel-module-devel)
-#   - gpio: flyvideo avermedia avermedia98
-#   - i2c: hauppauge
+# - drivers that need drivers/media/video/bttv*.h (not in kernel-devel)
+#   - gpio: avermedia avermedia98 flyvideo
 # Other TODO:
 # - move to -devel (?): irw, *mode2, others?
 # - don't run as root and/or create dedicated group, reduce fifo permissions?
 # - Fixup /etc/lirc(m)d.conf %%ghost'ification, existence after erase etc.
-# - kernel modules: Figure out sane permissions for /dev/lirc, use
-#   console.perms/udev, general FC3 adjustments.
+# - Verify that the kernel modules work and correct /dev entries get created
+#   automagically with proper permissions etc.
 
 %{!?kernel: %{expand: %%define kernel %(uname -r)}}
-%define ksrc %{_libdir}/kernel-module-devel/%{kernel}-%{_target_cpu}
+%define ksrc %{_usrsrc}/kernels/%{kernel}-%{_target_cpu}
+
 # Kernel module drivers
-%define drivers sir_com3 it87 tekram_bt829 com1 atiusb mceusb lpt1
+%define drivers atiusb com1 hauppauge igorplugusb imon it87 lpt1 mceusb sasem sir_com3 streamzap tekram_bt829
 
 Name:           lirc
 Version:        0.7.1
-Release:        2
+Release:        3
 Summary:        The Linux Infrared Remote Control package
 
 Group:          System Environment/Daemons
@@ -28,11 +28,10 @@ URL:            http://www.lirc.org/
 Source0:        http://download.sourceforge.net/lirc/%{name}-%{version}.tar.bz2
 Source1:        %{name}.init
 Source2:        %{name}.sysconfig
-Source3:        %{name}.makedev
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  %{__perl}
-%if 0%{!?_with_kmod:1}
+%if 0%{!?_with_modules:1}
 BuildRequires:  alsa-lib-devel XFree86-devel libusb-devel
 BuildConflicts: svgalib-devel
 %endif
@@ -56,11 +55,13 @@ Summary:        Kernel modules for LIRC
 Group:          System Environment/Kernel
 Provides:       kernel-module
 Provides:       kernel-module-%{name} = %{version}
-%if 0%{?_with_kmod:1}
-BuildRequires:  %{ksrc} MAKEDEV
+%if 0%{?_with_modules:1}
+BuildRequires:  kernel-devel-%{_target_cpu} = %{kernel}
 %endif
-Requires:       modutils %{name} = %{version}
-Requires:       /boot/vmlinuz-%{kernel}
+Requires:       %{name} = %{version}
+Requires:       modutils
+Requires:       kernel-%{_target_cpu} = %{kernel}
+Requires:       udev
 
 %description -n kernel-module-%{name}-%{kernel}
 LIRC kernel modules built for kernel
@@ -74,7 +75,7 @@ chmod 644 contrib/*
 
 
 %build
-%if 0%{?_with_kmod:1}
+%if 0%{?_with_modules:1}
 for driver in %{drivers} ; do
   # lpt1 is not smp safe @@@ TODO: verify this?
   test $driver = lpt1 && grep -q '^CONFIG_SMP=y' %{ksrc}/.config && continue
@@ -89,6 +90,7 @@ for driver in %{drivers} ; do
   make %{?_smp_mflags} -C drivers
   make -C drivers install DESTDIR=$PWD/buildroot/$driver
 done
+
 %else
 %configure \
   --with-syslog=LOG_DAEMON \
@@ -103,7 +105,7 @@ make %{?_smp_mflags}
 %install
 rm -rf $RPM_BUILD_ROOT __docs
 
-%if 0%{?_with_kmod:1}
+%if 0%{?_with_modules:1}
 for driver in %{drivers} ; do
   # lpt1 is not SMP safe @@@ TODO: verify this?
   test $driver = lpt1 && grep -q '^CONFIG_SMP=y' %{ksrc}/.config && continue
@@ -112,15 +114,6 @@ for driver in %{drivers} ; do
   install -pm 755 buildroot/$driver/tmp/* \
     $RPM_BUILD_ROOT/lib/modules/%{kernel}/updates/lirc
 done
-install -Dpm 644 %{SOURCE3} $RPM_BUILD_ROOT%{_sysconfdir}/makedev.d/lirc
-cp -p %{_sysconfdir}/makedev.d/00macros $RPM_BUILD_ROOT%{_sysconfdir}/makedev.d
-/dev/MAKEDEV -M \
-  -c $RPM_BUILD_ROOT%{_sysconfdir}/makedev.d \
-  -d $RPM_BUILD_ROOT/dev lirc \
-  | sed "s|$RPM_BUILD_ROOT||g" \
-  | grep -v ' /dev$' \
-  > devices.list
-rm -f $RPM_BUILD_ROOT%{_sysconfdir}/makedev.d/00macros
 
 %else
 make install DESTDIR=$RPM_BUILD_ROOT
@@ -150,7 +143,8 @@ rm -rf $RPM_BUILD_ROOT
 %post
 /sbin/ldconfig
 /sbin/chkconfig --add lirc
-# Backwards compatibility (init script lircd -> lirc rename):
+# Backwards compatibility (init script lircd -> lirc rename),
+# drop this in FC5:
 if [ $1 -gt 0 -a -x %{_initrddir}/lircd ] ; then
   %{_initrddir}/lircd status >/dev/null 2>&1
   ret=$?
@@ -180,7 +174,7 @@ fi
 depmod -ae -F /boot/System.map-%{kernel} %{kernel} >/dev/null || :
 
 
-%if 0%{!?_with_kmod:1}
+%if 0%{!?_with_modules:1}
 %files
 %defattr(-,root,root,-)
 %doc ANNOUNCE AUTHORS ChangeLog COPYING NEWS README TODO remotes __docs/*
@@ -204,15 +198,19 @@ depmod -ae -F /boot/System.map-%{kernel} %{kernel} >/dev/null || :
 %exclude %{_libdir}/liblirc_client.la
 %endif
 
-%if 0%{?_with_kmod:1}
-%files -n kernel-module-%{name}-%{kernel} -f devices.list
+%if 0%{?_with_modules:1}
+%files -n kernel-module-%{name}-%{kernel}
 %defattr(644,root,root,755)
-%config %{_sysconfdir}/makedev.d
 /lib/modules/%{kernel}/updates
 %endif
 
 
 %changelog
+* Thu May 26 2005 Ville Skyttä <ville.skytta at iki.fi> - 0.7.1-3
+- Adjust kernel module build for FC4 and add hauppauge, igorplugusb, imon,
+  sasem, and streamzap to the list of modules to build.  This stuff is still
+  disabled by default, rebuild with "--with modules --target $arch" to enable.
+
 * Sun Apr 17 2005 Ville Skyttä <ville.skytta at iki.fi> - 0.7.1-2
 - 0.7.1.
 

From 1041431f036618ef9adaf3063d42adebafea684d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ville=20Skytt=C3=A4?= <scop@fedoraproject.org>
Date: Sun, 14 Aug 2005 17:45:54 +0000
Subject: [PATCH 008/204] - 0.7.2, patch to fix crash at startup when no device
 is specified. - Enable audio input driver support (portaudio). - Improve
 package description. - Don't ship static libraries. - Drop pre Fedora Extras
 backwards compatibility hacks. - Make svgalib support (smode2) build
 conditional, disabled by default. - Simplify module package build (still work
 in progress, disabled by     default). - Other minor specfile cleanups and
 maintainability improvements.

---
 .cvsignore             |   2 +-
 lirc-gpio.patch        |  39 +++++++++++
 lirc-nodev-crash.patch |  11 ++++
 lirc-nomodules.patch   |  96 +++++++++++++++++++++++++++
 lirc-optflags.patch    |  18 ++++++
 lirc.spec              | 143 +++++++++++++++++++----------------------
 sources                |   2 +-
 7 files changed, 233 insertions(+), 78 deletions(-)
 create mode 100644 lirc-gpio.patch
 create mode 100644 lirc-nodev-crash.patch
 create mode 100644 lirc-nomodules.patch
 create mode 100644 lirc-optflags.patch

diff --git a/.cvsignore b/.cvsignore
index 84defd2..4822260 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1 +1 @@
-lirc-0.7.1.tar.bz2
+lirc-0.7.2.tar.bz2
diff --git a/lirc-gpio.patch b/lirc-gpio.patch
new file mode 100644
index 0000000..bec1ef9
--- /dev/null
+++ b/lirc-gpio.patch
@@ -0,0 +1,39 @@
+The gpio driver doesn't compile against kernel-devel due to missing
+drivers/media/video/{bttv,bttvp}.h.
+
+--- lirc-0.7.2/configure.drivers	2005-08-14 17:14:08.000000000 +0300
++++ lirc-0.7.2/configure	2005-08-14 17:25:56.000000000 +0300
+@@ -8027,7 +8027,6 @@
+ 	(lirc_dev lirc_atiusb) \
+ 	(lirc_dev lirc_bt829) \
+ 	(lirc_dev lirc_cmdir) \
+-	(lirc_dev lirc_gpio) \
+ 	(lirc_dev lirc_i2c) \
+ 	(lirc_dev lirc_igorplugusb) \
+ 	(lirc_dev lirc_imon) \
+@@ -9382,7 +9381,6 @@
+ 	lirc_atiusb \
+ 	lirc_bt829 \
+ 	lirc_cmdir \
+-	lirc_gpio \
+ 	lirc_i2c \
+ 	lirc_igorplugusb \
+ 	lirc_imon \
+--- lirc-0.7.2/configure.in.drivers	2005-08-14 13:23:48.000000000 +0300
++++ lirc-0.7.2/configure.in	2005-08-14 17:28:15.000000000 +0300
+@@ -169,7 +169,6 @@
+ 	(lirc_dev lirc_atiusb) \
+ 	(lirc_dev lirc_bt829) \
+ 	(lirc_dev lirc_cmdir) \
+-	(lirc_dev lirc_gpio) \
+ 	(lirc_dev lirc_i2c) \
+ 	(lirc_dev lirc_igorplugusb) \
+ 	(lirc_dev lirc_imon) \
+@@ -1090,7 +1089,6 @@
+ 	lirc_atiusb \
+ 	lirc_bt829 \
+ 	lirc_cmdir \
+-	lirc_gpio \
+ 	lirc_i2c \
+ 	lirc_igorplugusb \
+ 	lirc_imon \
diff --git a/lirc-nodev-crash.patch b/lirc-nodev-crash.patch
new file mode 100644
index 0000000..9c1772e
--- /dev/null
+++ b/lirc-nodev-crash.patch
@@ -0,0 +1,11 @@
+--- daemons/lircd.c~	2005-07-10 11:34:12.000000000 +0300
++++ daemons/lircd.c	2005-08-14 19:29:50.000000000 +0300
+@@ -1974,7 +1974,7 @@
+ 			"no peers are specified\n",progname);
+ 		return(EXIT_FAILURE);
+ 	}
+-	if(strcmp(hw.device, lircdfile)==0)
++	if(hw.device != NULL && strcmp(hw.device, lircdfile)==0)
+ 	{
+ 		fprintf(stderr, "%s: refusing to connect to myself\n",
+ 			progname);
diff --git a/lirc-nomodules.patch b/lirc-nomodules.patch
new file mode 100644
index 0000000..1bdd98c
--- /dev/null
+++ b/lirc-nomodules.patch
@@ -0,0 +1,96 @@
+--- lirc-0.7.2/Makefile.am.orig	2003-05-07 19:31:48.000000000 +0300
++++ lirc-0.7.2/Makefile.am	2005-08-14 18:39:49.000000000 +0300
+@@ -9,7 +9,7 @@
+ EXTRA_DIST =  setup.sh setup-driver.sh setup.data data2setup.sh ANNOUNCE TODO
+ 
+ ## daemons/ and tools/ should appear before doc/ for help2man to work.
+-SUBDIRS = drivers daemons tools doc
++SUBDIRS = daemons tools doc
+ 
+ ## From automake documentation:
+ ## Note that EXTRA_DIST can only handle files in the current
+--- lirc-0.7.2/configure.orig	2005-08-14 18:39:36.000000000 +0300
++++ lirc-0.7.2/configure	2005-08-14 18:40:14.000000000 +0300
+@@ -7995,6 +7995,7 @@
+ echo "$ac_t""" 1>&6
+ 
+ possible_drivers="(none) \
++	(any) \
+ 	(bte) \
+ 	(bw6130) \
+ 	(creative) \
+@@ -8020,26 +8021,6 @@
+ 	(uirt2_raw) \
+ 	(udp)"
+ 
+-if test x${no_kernel} != xyes; then
+-  possible_drivers="${possible_drivers} \
+-	(any) \
+-	(lirc_dev) \
+-	(lirc_dev lirc_atiusb) \
+-	(lirc_dev lirc_bt829) \
+-	(lirc_dev lirc_cmdir) \
+-	(lirc_dev lirc_i2c) \
+-	(lirc_dev lirc_igorplugusb) \
+-	(lirc_dev lirc_imon) \
+-	(lirc_dev lirc_it87) \
+-	(lirc_dev lirc_mceusb) \
+-	(lirc_dev lirc_mceusb2) \
+-	(lirc_dev lirc_parallel) \
+-	(lirc_dev lirc_sasem) \
+-	(lirc_dev lirc_serial) \
+-	(lirc_dev lirc_sir) \
+-	(lirc_dev lirc_streamzap)"
+-fi
+-
+ if test -n "${LIBUSB_CONFIG}"; then
+   cat >> confdefs.h <<\EOF
+ #define HAVE_LIBUSB 1
+--- lirc-0.7.2/Makefile.in.orig	2005-08-14 13:27:43.000000000 +0300
++++ lirc-0.7.2/Makefile.in	2005-08-14 18:39:49.000000000 +0300
+@@ -113,7 +113,7 @@
+ 
+ EXTRA_DIST = setup.sh setup-driver.sh setup.data data2setup.sh ANNOUNCE TODO
+ 
+-SUBDIRS = drivers daemons tools doc
++SUBDIRS = daemons tools doc
+ 
+ DISTCLEANFILES = configure.sh .setup.config
+ 
+--- lirc-0.7.2/configure.in.orig	2005-08-14 18:39:36.000000000 +0300
++++ lirc-0.7.2/configure.in	2005-08-14 18:40:08.000000000 +0300
+@@ -137,6 +137,7 @@
+ AC_MSG_RESULT()
+ 
+ possible_drivers="(none) \
++	(any) \
+ 	(bte) \
+ 	(bw6130) \
+ 	(creative) \
+@@ -162,26 +163,6 @@
+ 	(uirt2_raw) \
+ 	(udp)"
+ 
+-if test x${no_kernel} != xyes; then
+-  possible_drivers="${possible_drivers} \
+-	(any) \
+-	(lirc_dev) \
+-	(lirc_dev lirc_atiusb) \
+-	(lirc_dev lirc_bt829) \
+-	(lirc_dev lirc_cmdir) \
+-	(lirc_dev lirc_i2c) \
+-	(lirc_dev lirc_igorplugusb) \
+-	(lirc_dev lirc_imon) \
+-	(lirc_dev lirc_it87) \
+-	(lirc_dev lirc_mceusb) \
+-	(lirc_dev lirc_mceusb2) \
+-	(lirc_dev lirc_parallel) \
+-	(lirc_dev lirc_sasem) \
+-	(lirc_dev lirc_serial) \
+-	(lirc_dev lirc_sir) \
+-	(lirc_dev lirc_streamzap)"
+-fi
+-
+ if test -n "${LIBUSB_CONFIG}"; then
+   AC_DEFINE(HAVE_LIBUSB)
+   possible_drivers="${possible_drivers} (atilibusb)"
diff --git a/lirc-optflags.patch b/lirc-optflags.patch
new file mode 100644
index 0000000..0f7707c
--- /dev/null
+++ b/lirc-optflags.patch
@@ -0,0 +1,18 @@
+--- lirc-0.7.2/configure.in.optflags	2005-08-14 17:53:43.000000000 +0300
++++ lirc-0.7.2/configure.in	2005-08-14 17:54:18.000000000 +0300
+@@ -17,5 +17,5 @@
+ AM_CONFIG_HEADER(config.h)
+ 
+-CFLAGS="-O2 -g -Wall"
++CFLAGS="$CFLAGS -Wall"
+ 
+ dnl Checks for programs.
+--- lirc-0.7.2/configure.optflags	2005-08-14 17:53:50.000000000 +0300
++++ lirc-0.7.2/configure	2005-08-14 17:54:07.000000000 +0300
+@@ -1076,5 +1076,5 @@
+ 
+ 
+-CFLAGS="-O2 -g -Wall"
++CFLAGS="$CFLAGS -Wall"
+ 
+ # Extract the first word of "gcc", so it can be a program name with args.
diff --git a/lirc.spec b/lirc.spec
index 2a595bd..620a777 100644
--- a/lirc.spec
+++ b/lirc.spec
@@ -1,25 +1,21 @@
 # Driver TODO, sometime maybe:
-# - audio (req: portaudio)
-# - caraca (req: caraca_client)
-# - irman: (req: libirman)
-# - drivers that need drivers/media/video/bttv*.h (not in kernel-devel)
-#   - gpio: avermedia avermedia98 flyvideo
+# - caraca (req: caraca, http://caraca.sf.net/)
+# - irman: (req: libirman, http://lirc.sf.net/software/snapshots/)
 # Other TODO:
 # - move to -devel (?): irw, *mode2, others?
+#   note: xmode2 inflicts a dependency on X, and smode2 on svgalib
 # - don't run as root and/or create dedicated group, reduce fifo permissions?
 # - Fixup /etc/lirc(m)d.conf %%ghost'ification, existence after erase etc.
 # - Verify that the kernel modules work and correct /dev entries get created
 #   automagically with proper permissions etc.
 
-%{!?kernel: %{expand: %%define kernel %(uname -r)}}
-%define ksrc %{_usrsrc}/kernels/%{kernel}-%{_target_cpu}
-
-# Kernel module drivers
-%define drivers atiusb com1 hauppauge igorplugusb imon it87 lpt1 mceusb sasem sir_com3 streamzap tekram_bt829
+%{!?kver: %{expand: %%define kver %(uname -r)}}
+%define ksrc %{_usrsrc}/kernels/%{kver}-%{_target_cpu}
+%define mdir /lib/modules/%{kver}/extra
 
 Name:           lirc
-Version:        0.7.1
-Release:        3
+Version:        0.7.2
+Release:        2%{?dist}
 Summary:        The Linux Infrared Remote Control package
 
 Group:          System Environment/Daemons
@@ -28,19 +24,31 @@ URL:            http://www.lirc.org/
 Source0:        http://download.sourceforge.net/lirc/%{name}-%{version}.tar.bz2
 Source1:        %{name}.init
 Source2:        %{name}.sysconfig
+Patch0:         %{name}-optflags.patch
+Patch1:         %{name}-gpio.patch
+Patch2:         %{name}-nomodules.patch
+Patch3:         %{name}-nodev-crash.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-BuildRequires:  %{__perl}
 %if 0%{!?_with_modules:1}
-BuildRequires:  alsa-lib-devel XFree86-devel libusb-devel
-BuildConflicts: svgalib-devel
+BuildRequires:  %{__perl}
+BuildRequires:  alsa-lib-devel
+BuildRequires:  xorg-x11-devel
+BuildRequires:  libusb-devel
+BuildRequires:  portaudio-devel >= 18
+Build%{?_with_svgalib:Requires}%{!?_with_svgalib:Conflicts}: svgalib-devel
 %endif
-Requires(post): /sbin/chkconfig /sbin/ldconfig
+Requires(post): /sbin/chkconfig
+Requires(post): /sbin/ldconfig
 Requires(preun): /sbin/chkconfig
 Requires(postun): /sbin/ldconfig
 
 %description
-LIRC is the Linux Infrared Remote Control package.
+LIRC is a package that allows you to decode and send infra-red and
+other signals of many (but not all) commonly used remote controls.
+Included applications include daemons which decode the received
+signals as well as user space applications which allow controlling a
+computer with a remote control.
 
 %package        devel
 Summary:        Development files for LIRC
@@ -50,74 +58,59 @@ Requires:       %{name} = %{version}-%{release}
 %description    devel
 %{summary}.
 
-%package     -n kernel-module-%{name}-%{kernel}
+%package     -n kernel-module-%{name}-%{kver}
 Summary:        Kernel modules for LIRC
 Group:          System Environment/Kernel
 Provides:       kernel-module
 Provides:       kernel-module-%{name} = %{version}
 %if 0%{?_with_modules:1}
-BuildRequires:  kernel-devel-%{_target_cpu} = %{kernel}
+BuildRequires:  kernel-devel-%{_target_cpu} = %{kver}
 %endif
 Requires:       %{name} = %{version}
-Requires:       modutils
-Requires:       kernel-%{_target_cpu} = %{kernel}
+Requires:       module-init-tools
+Requires:       kernel-%{_target_cpu} = %{kver}
 Requires:       udev
 
-%description -n kernel-module-%{name}-%{kernel}
+%description -n kernel-module-%{name}-%{kver}
 LIRC kernel modules built for kernel
-%{kernel} (%{_target_cpu}).
+%{kver} (%{_target_cpu}).
 
 
 %prep
 %setup -q
-%{__perl} -pi -e 's|^CFLAGS="-O2 -g -Wall"|CFLAGS="\$CFLAGS -Wall"|' configure
+%patch0 -p1
+%patch1 -p1
+# patch2 needs to be applied on top of patch1
+%{!?_with_modules:%patch2 -p1}
+%patch3 -p0
 chmod 644 contrib/*
+touch -r aclocal.m4 configure.in # avoid autofoo re-run
 
 
 %build
-%if 0%{?_with_modules:1}
-for driver in %{drivers} ; do
-  # lpt1 is not smp safe @@@ TODO: verify this?
-  test $driver = lpt1 && grep -q '^CONFIG_SMP=y' %{ksrc}/.config && continue
-  mkdir -p buildroot/"$driver"
-  %configure \
-    --enable-sandboxed \
-    --enable-debug \
-    --disable-dependency-tracking \
-    --with-kerneldir=%{ksrc} \
-    --with-moduledir=/tmp \
-    --with-driver=$driver
-  make %{?_smp_mflags} -C drivers
-  make -C drivers install DESTDIR=$PWD/buildroot/$driver
-done
-
-%else
 %configure \
-  --with-syslog=LOG_DAEMON \
-  --enable-sandboxed \
-  --enable-debug \
+  --disable-static \
   --disable-dependency-tracking \
+  --enable-debug \
+  --enable-sandboxed \
+  --with-syslog=LOG_DAEMON \
+  --with-kerneldir=%{ksrc} \
+  --with-moduledir=%{mdir}/%{name} \
   --with-driver=any
-make %{?_smp_mflags}
-%endif
+make %{?_smp_mflags} %{?_with_modules:-C drivers}
 
 
 %install
 rm -rf $RPM_BUILD_ROOT __docs
 
 %if 0%{?_with_modules:1}
-for driver in %{drivers} ; do
-  # lpt1 is not SMP safe @@@ TODO: verify this?
-  test $driver = lpt1 && grep -q '^CONFIG_SMP=y' %{ksrc}/.config && continue
-  install -dm 755 $RPM_BUILD_ROOT/lib/modules/%{kernel}/updates/lirc
-  # 0755 here to allow stripping, fixed later in %%files
-  install -pm 755 buildroot/$driver/tmp/* \
-    $RPM_BUILD_ROOT/lib/modules/%{kernel}/updates/lirc
-done
+make install DESTDIR=$RPM_BUILD_ROOT -C drivers
+# executable here to allow stripping, fixed later in %%files
+chmod +x $RPM_BUILD_ROOT%{mdir}/%{name}/*.ko
 
 %else
 make install DESTDIR=$RPM_BUILD_ROOT
-rm -f $RPM_BUILD_ROOT%{_mandir}/man1/smode2.1* # if no svgalib
+%{!?_with_svgalib:rm $RPM_BUILD_ROOT%{_mandir}/man1/smode2.1*}
 install -Dpm 755 %{SOURCE1} $RPM_BUILD_ROOT%{_initrddir}/lirc
 %{__perl} -pi -e \
   's|/etc/|%{_sysconfdir}/|g ;
@@ -133,6 +126,7 @@ cd ..
 touch $RPM_BUILD_ROOT%{_sysconfdir}/lirc{d,md}.conf
 install -dm 755 $RPM_BUILD_ROOT/dev
 touch $RPM_BUILD_ROOT/dev/lirc{d,m}
+rm $RPM_BUILD_ROOT%{_libdir}/liblirc_client.la
 %endif
 
 
@@ -143,20 +137,9 @@ rm -rf $RPM_BUILD_ROOT
 %post
 /sbin/ldconfig
 /sbin/chkconfig --add lirc
-# Backwards compatibility (init script lircd -> lirc rename),
-# drop this in FC5:
-if [ $1 -gt 0 -a -x %{_initrddir}/lircd ] ; then
-  %{_initrddir}/lircd status >/dev/null 2>&1
-  ret=$?
-  %{_initrddir}/lircd stop >/dev/null || :
-  /sbin/chkconfig --del lircd || :
-  if [ $ret -eq 0 ] ; then
-    %{_initrddir}/lirc start >/dev/null || :
-  fi
-fi
 
-%post -n kernel-module-%{name}-%{kernel}
-depmod -ae -F /boot/System.map-%{kernel} %{kernel} >/dev/null || :
+%post -n kernel-module-%{name}-%{kver}
+depmod -ae -F /boot/System.map-%{kver} %{kver} >/dev/null || :
 
 %preun
 if [ $1 -eq 0 ] ; then
@@ -170,8 +153,8 @@ if [ $1 -gt 0 ] ; then
   %{_initrddir}/lirc try-restart >/dev/null || :
 fi
 
-%postun -n kernel-module-%{name}-%{kernel}
-depmod -ae -F /boot/System.map-%{kernel} %{kernel} >/dev/null || :
+%postun -n kernel-module-%{name}-%{kver}
+depmod -ae -F /boot/System.map-%{kver} %{kver} >/dev/null || :
 
 
 %if 0%{!?_with_modules:1}
@@ -180,7 +163,7 @@ depmod -ae -F /boot/System.map-%{kernel} %{kernel} >/dev/null || :
 %doc ANNOUNCE AUTHORS ChangeLog COPYING NEWS README TODO remotes __docs/*
 %ghost %config(noreplace) %{_sysconfdir}/lirc*d.conf
 %config(noreplace) %{_sysconfdir}/sysconfig/lirc
-%config %{_initrddir}/lirc
+%{_initrddir}/lirc
 %{_bindir}/ir*
 %{_bindir}/*mode2
 %{_sbindir}/lirc*d
@@ -192,20 +175,28 @@ depmod -ae -F /boot/System.map-%{kernel} %{kernel} >/dev/null || :
 
 %files devel
 %defattr(-,root,root,-)
-%{_includedir}/lirc
-%{_libdir}/liblirc_client.a
+%{_includedir}/lirc/
 %{_libdir}/liblirc_client.so
-%exclude %{_libdir}/liblirc_client.la
 %endif
 
 %if 0%{?_with_modules:1}
-%files -n kernel-module-%{name}-%{kernel}
+%files -n kernel-module-%{name}-%{kver}
 %defattr(644,root,root,755)
-/lib/modules/%{kernel}/updates
+%{mdir}/
 %endif
 
 
 %changelog
+* Sun Aug 14 2005 Ville Skyttä <ville.skytta at iki.fi> - 0.7.2-2
+- 0.7.2, patch to fix crash at startup when no device is specified.
+- Enable audio input driver support (portaudio).
+- Improve package description.
+- Don't ship static libraries.
+- Drop pre Fedora Extras backwards compatibility hacks.
+- Make svgalib support (smode2) build conditional, disabled by default.
+- Simplify module package build (still work in progress, disabled by default).
+- Other minor specfile cleanups and maintainability improvements.
+
 * Thu May 26 2005 Ville Skyttä <ville.skytta at iki.fi> - 0.7.1-3
 - Adjust kernel module build for FC4 and add hauppauge, igorplugusb, imon,
   sasem, and streamzap to the list of modules to build.  This stuff is still
diff --git a/sources b/sources
index 561067b..b4e5433 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-642e543e25dd6ad72416784bb6166d54  lirc-0.7.1.tar.bz2
+4510cf711f5c146f80c5bdfd61ca3f4a  lirc-0.7.2.tar.bz2

From 99564553237bc2778f3370f55a28d4d289ec8b8e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ville=20Skytt=C3=A4?= <scop@fedoraproject.org>
Date: Wed, 31 Aug 2005 16:02:04 +0000
Subject: [PATCH 009/204] Make the init script startup earlier and shutdown
 later by default.

---
 lirc.init | 2 +-
 lirc.spec | 5 ++++-
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/lirc.init b/lirc.init
index 77799d6..8062616 100644
--- a/lirc.init
+++ b/lirc.init
@@ -2,7 +2,7 @@
 #
 # lirc         Startup script for the Linux Infrared Remote Control daemons
 #
-# chkconfig:   - 90 10
+# chkconfig:   - 29 71
 # description: Enables infrared controls through LIRC.
 # processname: lircd
 # processname: lircmd
diff --git a/lirc.spec b/lirc.spec
index 620a777..bbcede4 100644
--- a/lirc.spec
+++ b/lirc.spec
@@ -15,7 +15,7 @@
 
 Name:           lirc
 Version:        0.7.2
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        The Linux Infrared Remote Control package
 
 Group:          System Environment/Daemons
@@ -187,6 +187,9 @@ depmod -ae -F /boot/System.map-%{kver} %{kver} >/dev/null || :
 
 
 %changelog
+* Wed Aug 31 2005 Ville Skyttä <ville.skytta at iki.fi> - 0.7.2-3
+- Make the init script startup earlier and shutdown later by default.
+
 * Sun Aug 14 2005 Ville Skyttä <ville.skytta at iki.fi> - 0.7.2-2
 - 0.7.2, patch to fix crash at startup when no device is specified.
 - Enable audio input driver support (portaudio).

From b0fc0d577b9fb6351ea688d64c6f0473fa7f7f78 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ville=20Skytt=C3=A4?= <scop@fedoraproject.org>
Date: Tue, 29 Nov 2005 08:58:17 +0000
Subject: [PATCH 010/204] =?UTF-8?q?-=20Pull=20security=20fix=20for=20the?=
 =?UTF-8?q?=20new=20lirc=5Fclientd=20from=20upstream=20CVS,=20and=20while?=
 =?UTF-8?q?=20=20=20=20=20at=20it,=20some=20other=20useful=20post-0.8.0pre?=
 =?UTF-8?q?1=20changes.=20-=20Kernel=20>=3D=202.6.15=20patchwork=20based?=
 =?UTF-8?q?=20on=20initial=20patch=20from=20Andy=20Burns=20=20=20=20=20(#1?=
 =?UTF-8?q?72404).=20-=20Disable=20lirc=5Fcmdir=20kernel=20module=20(unkno?=
 =?UTF-8?q?wn=20symbols).=20-=20Adapt=20to=20modular=20X.Org=20packaging.?=
 =?UTF-8?q?=20Wed=20Nov=209=202005=20Ville=20Skytt=C3=A4=20<ville.skytta?=
 =?UTF-8?q?=20at=20iki.fi>=20-=200.8.0-0.1.pre1=20-=200.8.0pre1,=20usage?=
 =?UTF-8?q?=20message=20patch=20applied=20upstream.=20Sun=20Oct=2030=20200?=
 =?UTF-8?q?5=20Ville=20Skytt=C3=A4=20<ville.skytta=20at=20iki.fi>=20-=200.?=
 =?UTF-8?q?7.3-0.1.pre1=20-=200.7.3pre1,=20"no=20device"=20crash=20fix=20a?=
 =?UTF-8?q?pplied=20upstream.=20-=20Fix=20lircd=20and=20lircmd=20usage=20m?=
 =?UTF-8?q?essages.?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .cvsignore                   |   2 +-
 lirc-0.8.0pre1-2615usb.patch |  72 +++++++
 lirc-cvs20051129.patch       | 405 +++++++++++++++++++++++++++++++++++
 lirc-gpio.patch              |  39 ----
 lirc-nodev-crash.patch       |  11 -
 lirc-nomodules.patch         |  96 ---------
 lirc.spec                    |  53 +++--
 sources                      |   2 +-
 8 files changed, 518 insertions(+), 162 deletions(-)
 create mode 100644 lirc-0.8.0pre1-2615usb.patch
 create mode 100644 lirc-cvs20051129.patch
 delete mode 100644 lirc-gpio.patch
 delete mode 100644 lirc-nodev-crash.patch
 delete mode 100644 lirc-nomodules.patch

diff --git a/.cvsignore b/.cvsignore
index 4822260..ba7091e 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1 +1 @@
-lirc-0.7.2.tar.bz2
+lirc-0.8.0pre1.tar.bz2
diff --git a/lirc-0.8.0pre1-2615usb.patch b/lirc-0.8.0pre1-2615usb.patch
new file mode 100644
index 0000000..b872650
--- /dev/null
+++ b/lirc-0.8.0pre1-2615usb.patch
@@ -0,0 +1,72 @@
+Index: drivers/lirc_dev/lirc_dev.c
+===================================================================
+RCS file: /cvsroot/lirc/lirc/drivers/lirc_dev/lirc_dev.c,v
+retrieving revision 1.44
+diff -u -r1.44 lirc_dev.c
+--- drivers/lirc_dev/lirc_dev.c	8 Aug 2005 06:04:48 -0000	1.44
++++ drivers/lirc_dev/lirc_dev.c	29 Nov 2005 01:15:17 -0000
+@@ -382,7 +382,11 @@
+ 			S_IFCHR|S_IRUSR|S_IWUSR,
+ 			DEV_LIRC "/%u", ir->p.minor);
+ #endif
+-	(void) class_device_create(lirc_class, MKDEV(IRCTL_DEV_MAJOR, ir->p.minor),
++	(void) class_device_create(lirc_class,
++#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,15)
++				       NULL,
++#endif
++				       MKDEV(IRCTL_DEV_MAJOR, ir->p.minor),
+ 				       NULL, "lirc%u", ir->p.minor);
+ 
+ 	if(p->sample_rate || p->get_queue) {
+Index: drivers/lirc_imon/lirc_imon.c
+===================================================================
+RCS file: /cvsroot/lirc/lirc/drivers/lirc_imon/lirc_imon.c,v
+retrieving revision 1.8
+diff -u -r1.8 lirc_imon.c
+--- drivers/lirc_imon/lirc_imon.c	29 Oct 2005 14:18:53 -0000	1.8
++++ drivers/lirc_imon/lirc_imon.c	29 Nov 2005 01:15:18 -0000
+@@ -72,7 +72,7 @@
+ 
+ #define VFD_MINOR_BASE	144	/* Same as LCD */
+ #define DEVFS_MODE	S_IFCHR | S_IRUSR | S_IWUSR | S_IRGRP | S_IWGRP | S_IROTH
+-#define DEVFS_NAME	"usb/lcd%d"
++#define DEVFS_NAME	"lcd%d"
+ 
+ #define BUF_CHUNK_SIZE	4
+ #define BUF_SIZE	128
+@@ -216,7 +216,9 @@
+ static struct usb_class_driver imon_class = {
+ 	.name 		= DEVFS_NAME,
+ 	.fops		= &vfd_fops,
++#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,15)
+ 	.mode		= DEVFS_MODE,
++#endif
+ 	.minor_base	= VFD_MINOR_BASE,
+ };
+ #endif
+Index: drivers/lirc_sasem/lirc_sasem.c
+===================================================================
+RCS file: /cvsroot/lirc/lirc/drivers/lirc_sasem/lirc_sasem.c,v
+retrieving revision 1.11
+diff -u -r1.11 lirc_sasem.c
+--- drivers/lirc_sasem/lirc_sasem.c	29 Oct 2005 14:18:53 -0000	1.11
++++ drivers/lirc_sasem/lirc_sasem.c	29 Nov 2005 01:15:19 -0000
+@@ -81,7 +81,7 @@
+ 
+ #define VFD_MINOR_BASE	144	/* Same as LCD */
+ #define DEVFS_MODE	S_IFCHR | S_IRUSR | S_IWUSR | S_IRGRP | S_IWGRP | S_IROTH
+-#define DEVFS_NAME	"usb/lcd%d"
++#define DEVFS_NAME	"lcd%d"
+ 
+ #define BUF_CHUNK_SIZE	8
+ #define BUF_SIZE	128
+@@ -204,7 +204,9 @@
+ static struct usb_class_driver sasem_class = {
+ 	.name 		= DEVFS_NAME,
+ 	.fops		= &vfd_fops,
++#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,15)
+ 	.mode		= DEVFS_MODE,
++#endif
+ 	.minor_base	= VFD_MINOR_BASE,
+ };
+ #endif
diff --git a/lirc-cvs20051129.patch b/lirc-cvs20051129.patch
new file mode 100644
index 0000000..3693864
--- /dev/null
+++ b/lirc-cvs20051129.patch
@@ -0,0 +1,405 @@
+--- lirc-0.8.0pre1/configure.in.orig	2005-11-05 18:52:50.000000000 +0200
++++ lirc-0.8.0pre1/configure.in	2005-11-29 00:23:03.000000000 +0200
+@@ -137,6 +137,7 @@
+ AC_MSG_RESULT()
+ 
+ possible_drivers="(none) \
++	(userspace)
+ 	(bte) \
+ 	(bw6130) \
+ 	(creative) \
+@@ -164,7 +165,7 @@
+ 
+ if test x${no_kernel} != xyes; then
+   possible_drivers="${possible_drivers} \
+-	(any) \
++	(all) \
+ 	(lirc_dev) \
+ 	(lirc_dev lirc_atiusb) \
+ 	(lirc_dev lirc_bt829) \
+@@ -301,9 +302,9 @@
+   HW_DEFAULT="hw_null"
+ fi
+ 
+-if test "$driver" = "any"; then
++if test "$driver" = "userspace" -o "$driver" = "all"; then
+   AC_DEFINE(LIRC_DRIVER_ANY)
+-  lirc_driver="any"
++  lirc_driver=$driver
+   
+   any_possible_drivers=`echo ${possible_drivers} | sed -e's/ /-/g' \
+ 			  -e's/)-(/ /g'  -e's/(//g' -e's/)//g' \
+@@ -1039,7 +1040,7 @@
+     AC_MSG_ERROR([*** you need to first install the caraca package
+ 	before you can use this driver])
+     ;;
+-  any|lirc_*)
++  all|lirc_*)
+     AC_MSG_ERROR([*** you need to have the Linux kernel source installed
+ 	for this driver])
+     ;;
+@@ -1078,6 +1079,7 @@
+ 
+ if test "$lirc_driver" = "none" || \
+ 	test "$lirc_driver" = "alsa_usb" || \
++	test "$lirc_driver" = "userspace" || \
+ 	test "$lirc_driver" = "atilibusb" || \
+ 	test "$lirc_driver" = "audio" || \
+ 	test "$lirc_driver" = "audio_alsa" || \
+@@ -1085,7 +1087,7 @@
+ 	test "$lirc_driver" = "irman" || \
+ 	test "$lirc_driver" = "irman_sw"; then
+   lirc_driver=
+-elif test "$lirc_driver" = "any"; then
++elif test "$lirc_driver" = "all"; then
+   lirc_driver="lirc_dev \
+ 	lirc_atiusb \
+ 	lirc_bt829 \
+@@ -1316,7 +1318,7 @@
+ ])
+ 
+ echo
+-if test "$driver" = "any"; then
++if test "$driver" = "all"; then
+   echo "All kernel modules will be built."
+ elif test "$driver" = "mediafocusI"; then
+   echo "You will have to use the MediaFocus driver from:"
+--- lirc-0.8.0pre1/drivers/lirc_bt829/lirc_bt829.c.orig	2005-02-19 17:12:58.000000000 +0200
++++ lirc-0.8.0pre1/drivers/lirc_bt829/lirc_bt829.c	2005-11-29 00:21:39.000000000 +0200
+@@ -65,7 +65,8 @@
+ 	}while(0)
+ 
+ static int atir_minor;
+-static unsigned long pci_addr_phys, pci_addr_lin;
++static unsigned long pci_addr_phys;
++static unsigned char *pci_addr_lin;
+ 
+ static struct lirc_plugin atir_plugin;
+ 
+@@ -81,7 +82,7 @@
+ 	my_dev = (struct pci_dev *)pci_find_device(PCI_VENDOR_ID_ATI, PCI_DEVICE_ID_ATI_264VT,NULL);
+ 	if ( my_dev ) {
+ 		printk(KERN_ERR "ATIR: Using device: %s\n",
+-		       pci_pretty_name(my_dev));
++		       pci_name(my_dev));
+ 		pci_addr_phys = 0;
+ 		if ( my_dev->resource[0].flags & IORESOURCE_MEM ) {
+ 			pci_addr_phys = my_dev->resource[0].start;
+@@ -161,7 +162,7 @@
+ 
+ static int atir_init_start(void)
+ {
+-	pci_addr_lin = (unsigned long)ioremap(pci_addr_phys + DATA_PCI_OFF,0x400);
++	pci_addr_lin = ioremap(pci_addr_phys + DATA_PCI_OFF,0x400);
+ 	if ( pci_addr_lin == 0 ) {
+ 		printk(KERN_INFO "atir: pci mem must be mapped\n");
+ 		return 0;
+@@ -363,7 +364,8 @@
+ 
+ static unsigned int read_index(unsigned char index)
+ {
+-	unsigned int addr, value;
++	unsigned char *addr;
++	unsigned int value;
+ 	//  addr = pci_addr_lin + DATA_PCI_OFF + ((index & 0xFF) << 2);
+ 	addr = pci_addr_lin + ((index & 0xFF) << 2);
+ 	value = readl(addr);
+@@ -372,7 +374,7 @@
+ 
+ static void write_index(unsigned char index,unsigned int reg_val)
+ {
+-	unsigned int addr;
++	unsigned char *addr;
+ 	addr = pci_addr_lin + ((index & 0xFF) << 2);
+ 	writel(reg_val,addr);
+ }
+--- lirc-0.8.0pre1/drivers/kcompat.h.orig	2005-10-29 17:18:53.000000000 +0300
++++ lirc-0.8.0pre1/drivers/kcompat.h	2005-11-29 00:21:39.000000000 +0200
+@@ -187,9 +187,12 @@
+ #define local_irq_restore(flags) do{ restore_flags(flags); } while(0)
+ #endif
+ 
+-#if !defined(pci_pretty_name)
+-#define pci_pretty_name(dev) ((dev)->name)
+-#endif
++#if LINUX_VERSION_CODE < KERNEL_VERSION(2,4,22)
++static inline char *pci_name(struct pci_dev *pdev)
++{
++	return pdev->slot_name;
++}
++#endif//Kernel<2.4.22
+ 
+ /*************************** I2C specific *****************************/
+ #include <linux/i2c.h>
+--- lirc-0.8.0pre1/tools/lirc_client.h.orig	2005-11-01 21:12:16.000000000 +0200
++++ lirc-0.8.0pre1/tools/lirc_client.h	2005-11-29 00:21:39.000000000 +0200
+@@ -14,6 +14,8 @@
+ #ifndef LIRC_CLIENT_H
+ #define LIRC_CLIENT_H
+ 
++#include <stddef.h>
++
+ #ifdef __cplusplus
+ extern "C" {
+ #endif
+@@ -91,6 +93,7 @@
+ int lirc_code2charprog(struct lirc_config *config,char *code,char **string,
+ 		       char **prog);
+ size_t lirc_getsocketname(const char *filename, char *buf, size_t size);
++const char *lirc_getmode(struct lirc_config *config);
+ 
+ /* new interface for transmit */
+ int lirc_send_command(int sockfd, const char *command, char *buf, size_t *buf_len, int *ret_status);
+--- lirc-0.8.0pre1/tools/lirc_client.c.orig	2005-11-01 21:12:16.000000000 +0200
++++ lirc-0.8.0pre1/tools/lirc_client.c	2005-11-29 00:21:39.000000000 +0200
+@@ -1723,7 +1723,7 @@
+ 			char *new_buffer;
+ 
+ 			packet_size+=PACKET_SIZE;
+-			new_buffer=(char *) realloc(lirc_buffer,packet_size);
++			new_buffer=(char *) realloc(lirc_buffer,packet_size+1);
+ 			if(new_buffer==NULL)
+ 			{
+ 				return(-1);
+@@ -1767,6 +1767,33 @@
+ 	return strlen(filename)+2;
+ }
+ 
++const char *lirc_getmode(struct lirc_config *config)
++{
++	if(config->sockfd!=-1)
++	{
++		static char buf[LIRC_PACKET_SIZE];
++		size_t buf_len = LIRC_PACKET_SIZE;
++		int success;
++		int ret;
++		
++		ret = lirc_send_command(config->sockfd, "GETMODE\n",
++					buf, &buf_len, &success);
++		if(success == LIRC_RET_SUCCESS)
++		{
++			if(ret > 0)
++			{
++				return buf;
++			}
++			else
++			{
++				return NULL;
++			}
++		}
++		return NULL;
++	}
++	return config->current_mode;
++}
++
+ static const char *lirc_read_string(int fd)
+ {
+ 	static char buffer[LIRC_PACKET_SIZE+1]="";
+--- lirc-0.8.0pre1/tools/lirc_clientd.c.orig	2005-11-01 21:12:16.000000000 +0200
++++ lirc-0.8.0pre1/tools/lirc_clientd.c	2005-11-29 00:21:39.000000000 +0200
+@@ -67,6 +67,7 @@
+ 
+ static int code_func(int fd,char *message,char *arguments);
+ static int ident_func(int fd,char *message,char *arguments);
++static int getmode_func(int fd,char *message,char *arguments);
+ static int send_result(int fd, char *message, const char *result);
+ static int send_success(int fd,char *message);
+ 
+@@ -74,6 +75,7 @@
+ {
+ 	{"CODE",code_func},
+ 	{"IDENT",ident_func},
++	{"GETMODE",getmode_func},
+ 	{NULL,NULL}
+ 	/*
+ 	{"DEBUG",debug},
+@@ -114,7 +116,10 @@
+   do {} while(0)
+ #endif
+ 
+-const char *progname="lirc_clientd " VERSION;
++#define logprintf syslog
++#define logperror(prio,s) if((s)!=NULL) syslog(prio,"%s: %m\n",(char *) s); else syslog(prio,"%m\n")
++
++const char *progname="lirc_clientd";
+ 
+ static sig_atomic_t term=0;
+ static int termsig;
+@@ -122,53 +127,12 @@
+ static struct client_data clis[MAX_CLIENTS];
+ 
+ static int daemonized=0;
+-static FILE *lf=NULL;
+-static const char *hostname="";
+ 
+ static struct lirc_config *config;
+ 
+ static int send_error(int fd,char *message,char *format_str, ...);
+ static int handle_input();
+ 
+-void logprintf(int prio,char *format_str, ...)
+-{
+-	time_t current;
+-	char *currents;
+-	va_list ap;  
+-	
+-	current=time(&current);
+-	currents=ctime(&current);
+-	
+-	if(lf) fprintf(lf,"%15.15s %s %s: ",currents+4,hostname,progname);
+-	if(!daemonized) fprintf(stderr,"%s: ",progname);
+-	va_start(ap,format_str);
+-	if(lf)
+-	{
+-		if(prio==LOG_WARNING) fprintf(lf,"WARNING: ");
+-		vfprintf(lf,format_str,ap);
+-		fputc('\n',lf);fflush(lf);
+-	}
+-	if(!daemonized)
+-	{
+-		if(prio==LOG_WARNING) fprintf(stderr,"WARNING: ");
+-		vfprintf(stderr,format_str,ap);
+-		fputc('\n',stderr);fflush(stderr);
+-	}
+-	va_end(ap);
+-}
+-
+-void logperror(int prio,const char *s)
+-{
+-	if(s!=NULL)
+-	{
+-		logprintf(prio,"%s: %s",s,strerror(errno));
+-	}
+-	else
+-	{
+-		logprintf(prio,"%s",strerror(errno));
+-	}
+-}
+-
+ static inline int max(int a,int b)
+ {
+ 	return(a>b ? a:b);
+@@ -554,6 +518,16 @@
+ 	return(send_success(fd,message));
+ }
+ 
++static int getmode_func(int fd,char *message,char *arguments)
++{
++	LOGPRINTF(2, "GETMODE %s", arguments);
++	if(lirc_getmode(config))
++	{
++		return send_result(fd, message, lirc_getmode(config));
++	}
++	return(send_success(fd,message));
++}
++
+ static int send_result(int fd, char *message, const char *result)
+ {
+ 	char *count = "1\n";
+@@ -938,7 +912,7 @@
+                         printf("\t -o --output=socket\t\toutput socket filename\n");
+ 			return(EXIT_SUCCESS);
+ 		case 'v':
+-			printf("%s\n",progname);
++			printf("%s %s\n",progname,VERSION);
+ 			return(EXIT_SUCCESS);
+ 		case 'p':
+ 			if(oatoi(optarg)==-1)
+@@ -988,7 +962,6 @@
+ 		return EXIT_FAILURE;
+ 	}
+ 	
+-	LOGPRINTF(3, "fork");
+ 	/* fork */
+ 	if(daemon(0,0)==-1)
+ 	{
+@@ -1001,8 +974,7 @@
+ 	}
+ 	daemonized=1;
+ 
+-	lf = fopen("/tmp/lirc_clientd.log", "a");
+-
++	openlog(progname, LOG_CONS|LOG_PID, LOG_USER);
+ 	umask(0);
+ 	signal(SIGPIPE,SIG_IGN);
+ 	
+@@ -1013,8 +985,10 @@
+ 	sigaction(SIGINT,&act,NULL);
+ 	sigaction(SIGHUP,&act,NULL);
+ 	
++	logprintf(LOG_NOTICE, "%s started", progname);
+ 	loop(socket, lircdfd);
+ 	
++	closelog();
+ 	shutdown(socket, 2);
+ 	close(socket);
+ 	lirc_freeconfig(config);
+--- lirc-0.8.0pre1/configure.orig	2005-11-05 18:55:58.000000000 +0200
++++ lirc-0.8.0pre1/configure	2005-11-29 00:24:39.000000000 +0200
+@@ -7995,6 +7995,7 @@
+ echo "$ac_t""" 1>&6
+ 
+ possible_drivers="(none) \
++	(userspace) \
+ 	(bte) \
+ 	(bw6130) \
+ 	(creative) \
+@@ -8022,7 +8023,7 @@
+ 
+ if test x${no_kernel} != xyes; then
+   possible_drivers="${possible_drivers} \
+-	(any) \
++	(all) \
+ 	(lirc_dev) \
+ 	(lirc_dev lirc_atiusb) \
+ 	(lirc_dev lirc_bt829) \
+@@ -8568,12 +8569,12 @@
+   HW_DEFAULT="hw_null"
+ fi
+ 
+-if test "$driver" = "any"; then
++if test "$driver" = "userspace" -o "$driver" = "all"; then
+   cat >> confdefs.h <<\EOF
+ #define LIRC_DRIVER_ANY 1
+ EOF
+ 
+-  lirc_driver="any"
++  lirc_driver=$driver
+   
+   any_possible_drivers=`echo ${possible_drivers} | sed -e's/ /-/g' \
+ 			  -e's/)-(/ /g'  -e's/(//g' -e's/)//g' \
+@@ -9332,7 +9333,7 @@
+     { echo "configure: error: *** you need to first install the caraca package
+ 	before you can use this driver" 1>&2; exit 1; }
+     ;;
+-  any|lirc_*)
++  all|lirc_*)
+     { echo "configure: error: *** you need to have the Linux kernel source installed
+ 	for this driver" 1>&2; exit 1; }
+     ;;
+@@ -9370,6 +9371,7 @@
+ 
+ if test "$lirc_driver" = "none" || \
+ 	test "$lirc_driver" = "alsa_usb" || \
++	test "$lirc_driver" = "userspace" || \
+ 	test "$lirc_driver" = "atilibusb" || \
+ 	test "$lirc_driver" = "audio" || \
+ 	test "$lirc_driver" = "audio_alsa" || \
+@@ -9377,7 +9379,7 @@
+ 	test "$lirc_driver" = "irman" || \
+ 	test "$lirc_driver" = "irman_sw"; then
+   lirc_driver=
+-elif test "$lirc_driver" = "any"; then
++elif test "$lirc_driver" = "all"; then
+   lirc_driver="lirc_dev \
+ 	lirc_atiusb \
+ 	lirc_bt829 \
+@@ -10245,7 +10247,7 @@
+ 
+ 
+ echo
+-if test "$driver" = "any"; then
++if test "$driver" = "all"; then
+   echo "All kernel modules will be built."
+ elif test "$driver" = "mediafocusI"; then
+   echo "You will have to use the MediaFocus driver from:"
diff --git a/lirc-gpio.patch b/lirc-gpio.patch
deleted file mode 100644
index bec1ef9..0000000
--- a/lirc-gpio.patch
+++ /dev/null
@@ -1,39 +0,0 @@
-The gpio driver doesn't compile against kernel-devel due to missing
-drivers/media/video/{bttv,bttvp}.h.
-
---- lirc-0.7.2/configure.drivers	2005-08-14 17:14:08.000000000 +0300
-+++ lirc-0.7.2/configure	2005-08-14 17:25:56.000000000 +0300
-@@ -8027,7 +8027,6 @@
- 	(lirc_dev lirc_atiusb) \
- 	(lirc_dev lirc_bt829) \
- 	(lirc_dev lirc_cmdir) \
--	(lirc_dev lirc_gpio) \
- 	(lirc_dev lirc_i2c) \
- 	(lirc_dev lirc_igorplugusb) \
- 	(lirc_dev lirc_imon) \
-@@ -9382,7 +9381,6 @@
- 	lirc_atiusb \
- 	lirc_bt829 \
- 	lirc_cmdir \
--	lirc_gpio \
- 	lirc_i2c \
- 	lirc_igorplugusb \
- 	lirc_imon \
---- lirc-0.7.2/configure.in.drivers	2005-08-14 13:23:48.000000000 +0300
-+++ lirc-0.7.2/configure.in	2005-08-14 17:28:15.000000000 +0300
-@@ -169,7 +169,6 @@
- 	(lirc_dev lirc_atiusb) \
- 	(lirc_dev lirc_bt829) \
- 	(lirc_dev lirc_cmdir) \
--	(lirc_dev lirc_gpio) \
- 	(lirc_dev lirc_i2c) \
- 	(lirc_dev lirc_igorplugusb) \
- 	(lirc_dev lirc_imon) \
-@@ -1090,7 +1089,6 @@
- 	lirc_atiusb \
- 	lirc_bt829 \
- 	lirc_cmdir \
--	lirc_gpio \
- 	lirc_i2c \
- 	lirc_igorplugusb \
- 	lirc_imon \
diff --git a/lirc-nodev-crash.patch b/lirc-nodev-crash.patch
deleted file mode 100644
index 9c1772e..0000000
--- a/lirc-nodev-crash.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- daemons/lircd.c~	2005-07-10 11:34:12.000000000 +0300
-+++ daemons/lircd.c	2005-08-14 19:29:50.000000000 +0300
-@@ -1974,7 +1974,7 @@
- 			"no peers are specified\n",progname);
- 		return(EXIT_FAILURE);
- 	}
--	if(strcmp(hw.device, lircdfile)==0)
-+	if(hw.device != NULL && strcmp(hw.device, lircdfile)==0)
- 	{
- 		fprintf(stderr, "%s: refusing to connect to myself\n",
- 			progname);
diff --git a/lirc-nomodules.patch b/lirc-nomodules.patch
deleted file mode 100644
index 1bdd98c..0000000
--- a/lirc-nomodules.patch
+++ /dev/null
@@ -1,96 +0,0 @@
---- lirc-0.7.2/Makefile.am.orig	2003-05-07 19:31:48.000000000 +0300
-+++ lirc-0.7.2/Makefile.am	2005-08-14 18:39:49.000000000 +0300
-@@ -9,7 +9,7 @@
- EXTRA_DIST =  setup.sh setup-driver.sh setup.data data2setup.sh ANNOUNCE TODO
- 
- ## daemons/ and tools/ should appear before doc/ for help2man to work.
--SUBDIRS = drivers daemons tools doc
-+SUBDIRS = daemons tools doc
- 
- ## From automake documentation:
- ## Note that EXTRA_DIST can only handle files in the current
---- lirc-0.7.2/configure.orig	2005-08-14 18:39:36.000000000 +0300
-+++ lirc-0.7.2/configure	2005-08-14 18:40:14.000000000 +0300
-@@ -7995,6 +7995,7 @@
- echo "$ac_t""" 1>&6
- 
- possible_drivers="(none) \
-+	(any) \
- 	(bte) \
- 	(bw6130) \
- 	(creative) \
-@@ -8020,26 +8021,6 @@
- 	(uirt2_raw) \
- 	(udp)"
- 
--if test x${no_kernel} != xyes; then
--  possible_drivers="${possible_drivers} \
--	(any) \
--	(lirc_dev) \
--	(lirc_dev lirc_atiusb) \
--	(lirc_dev lirc_bt829) \
--	(lirc_dev lirc_cmdir) \
--	(lirc_dev lirc_i2c) \
--	(lirc_dev lirc_igorplugusb) \
--	(lirc_dev lirc_imon) \
--	(lirc_dev lirc_it87) \
--	(lirc_dev lirc_mceusb) \
--	(lirc_dev lirc_mceusb2) \
--	(lirc_dev lirc_parallel) \
--	(lirc_dev lirc_sasem) \
--	(lirc_dev lirc_serial) \
--	(lirc_dev lirc_sir) \
--	(lirc_dev lirc_streamzap)"
--fi
--
- if test -n "${LIBUSB_CONFIG}"; then
-   cat >> confdefs.h <<\EOF
- #define HAVE_LIBUSB 1
---- lirc-0.7.2/Makefile.in.orig	2005-08-14 13:27:43.000000000 +0300
-+++ lirc-0.7.2/Makefile.in	2005-08-14 18:39:49.000000000 +0300
-@@ -113,7 +113,7 @@
- 
- EXTRA_DIST = setup.sh setup-driver.sh setup.data data2setup.sh ANNOUNCE TODO
- 
--SUBDIRS = drivers daemons tools doc
-+SUBDIRS = daemons tools doc
- 
- DISTCLEANFILES = configure.sh .setup.config
- 
---- lirc-0.7.2/configure.in.orig	2005-08-14 18:39:36.000000000 +0300
-+++ lirc-0.7.2/configure.in	2005-08-14 18:40:08.000000000 +0300
-@@ -137,6 +137,7 @@
- AC_MSG_RESULT()
- 
- possible_drivers="(none) \
-+	(any) \
- 	(bte) \
- 	(bw6130) \
- 	(creative) \
-@@ -162,26 +163,6 @@
- 	(uirt2_raw) \
- 	(udp)"
- 
--if test x${no_kernel} != xyes; then
--  possible_drivers="${possible_drivers} \
--	(any) \
--	(lirc_dev) \
--	(lirc_dev lirc_atiusb) \
--	(lirc_dev lirc_bt829) \
--	(lirc_dev lirc_cmdir) \
--	(lirc_dev lirc_i2c) \
--	(lirc_dev lirc_igorplugusb) \
--	(lirc_dev lirc_imon) \
--	(lirc_dev lirc_it87) \
--	(lirc_dev lirc_mceusb) \
--	(lirc_dev lirc_mceusb2) \
--	(lirc_dev lirc_parallel) \
--	(lirc_dev lirc_sasem) \
--	(lirc_dev lirc_serial) \
--	(lirc_dev lirc_sir) \
--	(lirc_dev lirc_streamzap)"
--fi
--
- if test -n "${LIBUSB_CONFIG}"; then
-   AC_DEFINE(HAVE_LIBUSB)
-   possible_drivers="${possible_drivers} (atilibusb)"
diff --git a/lirc.spec b/lirc.spec
index bbcede4..537e989 100644
--- a/lirc.spec
+++ b/lirc.spec
@@ -4,6 +4,7 @@
 # Other TODO:
 # - move to -devel (?): irw, *mode2, others?
 #   note: xmode2 inflicts a dependency on X, and smode2 on svgalib
+#   - does someone actually need xmode2/smode2 for something?
 # - don't run as root and/or create dedicated group, reduce fifo permissions?
 # - Fixup /etc/lirc(m)d.conf %%ghost'ification, existence after erase etc.
 # - Verify that the kernel modules work and correct /dev entries get created
@@ -14,26 +15,26 @@
 %define mdir /lib/modules/%{kver}/extra
 
 Name:           lirc
-Version:        0.7.2
-Release:        3%{?dist}
+Version:        0.8.0
+Release:        0.2.pre1%{?dist}
 Summary:        The Linux Infrared Remote Control package
 
 Group:          System Environment/Daemons
 License:        GPL
 URL:            http://www.lirc.org/
-Source0:        http://download.sourceforge.net/lirc/%{name}-%{version}.tar.bz2
+#Source0:        http://download.sourceforge.net/lirc/%{name}-%{version}.tar.bz2
+Source0:        http://lirc.sf.net/software/snapshots/lirc-0.8.0pre1.tar.bz2
 Source1:        %{name}.init
 Source2:        %{name}.sysconfig
 Patch0:         %{name}-optflags.patch
-Patch1:         %{name}-gpio.patch
-Patch2:         %{name}-nomodules.patch
-Patch3:         %{name}-nodev-crash.patch
+Patch1:         %{name}-cvs20051129.patch
+Patch2:         %{name}-0.8.0pre1-2615usb.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 %if 0%{!?_with_modules:1}
 BuildRequires:  %{__perl}
 BuildRequires:  alsa-lib-devel
-BuildRequires:  xorg-x11-devel
+BuildRequires:  libXt-devel
 BuildRequires:  libusb-devel
 BuildRequires:  portaudio-devel >= 18
 Build%{?_with_svgalib:Requires}%{!?_with_svgalib:Conflicts}: svgalib-devel
@@ -77,13 +78,18 @@ LIRC kernel modules built for kernel
 
 
 %prep
-%setup -q
+%setup -q -n %{name}-%{version}pre1
 %patch0 -p1
 %patch1 -p1
-# patch2 needs to be applied on top of patch1
-%{!?_with_modules:%patch2 -p1}
-%patch3 -p0
+%patch2
+echo %{kver} | grep -q _FC5 && \
+   sed -i -e s/2,6,15/2,6,14/ drivers/lirc_{dev,imon,sasem}/lirc_*.c # *cough*
 chmod 644 contrib/*
+# cmdir: unknown symbols
+# gpio: missing drivers/media/video/{bttv,bttvp}.h in kernel-devel
+for drv in cmdir gpio ; do
+  sed -i -e "/^\\s*(lirc_dev lirc_$drv)/d" -e "/^\\s*lirc_$drv/d" configure*
+done
 touch -r aclocal.m4 configure.in # avoid autofoo re-run
 
 
@@ -94,10 +100,15 @@ touch -r aclocal.m4 configure.in # avoid autofoo re-run
   --enable-debug \
   --enable-sandboxed \
   --with-syslog=LOG_DAEMON \
+%if 0%{?_with_modules:1}
   --with-kerneldir=%{ksrc} \
   --with-moduledir=%{mdir}/%{name} \
-  --with-driver=any
-make %{?_smp_mflags} %{?_with_modules:-C drivers}
+  --with-driver=all
+make %{?_smp_mflags} -C drivers
+%else
+  --with-driver=userspace
+make %{?_smp_mflags}
+%endif
 
 
 %install
@@ -164,7 +175,7 @@ depmod -ae -F /boot/System.map-%{kver} %{kver} >/dev/null || :
 %ghost %config(noreplace) %{_sysconfdir}/lirc*d.conf
 %config(noreplace) %{_sysconfdir}/sysconfig/lirc
 %{_initrddir}/lirc
-%{_bindir}/ir*
+%{_bindir}/*ir*
 %{_bindir}/*mode2
 %{_sbindir}/lirc*d
 %{_libdir}/liblirc_client.so.*
@@ -187,6 +198,20 @@ depmod -ae -F /boot/System.map-%{kver} %{kver} >/dev/null || :
 
 
 %changelog
+* Tue Nov 29 2005 Ville Skyttä <ville.skytta at iki.fi> - 0.8.0-0.2.pre1
+- Pull security fix for the new lirc_clientd from upstream CVS, and
+  while at it, some other useful post-0.8.0pre1 changes.
+- Kernel >= 2.6.15 patchwork based on initial patch from Andy Burns (#172404).
+- Disable lirc_cmdir kernel module (unknown symbols).
+- Adapt to modular X.Org packaging.
+
+* Wed Nov  9 2005 Ville Skyttä <ville.skytta at iki.fi> - 0.8.0-0.1.pre1
+- 0.8.0pre1, usage message patch applied upstream.
+
+* Sun Oct 30 2005 Ville Skyttä <ville.skytta at iki.fi> - 0.7.3-0.1.pre1
+- 0.7.3pre1, "no device" crash fix applied upstream.
+- Fix lircd and lircmd usage messages.
+
 * Wed Aug 31 2005 Ville Skyttä <ville.skytta at iki.fi> - 0.7.2-3
 - Make the init script startup earlier and shutdown later by default.
 
diff --git a/sources b/sources
index b4e5433..e3dd4de 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-4510cf711f5c146f80c5bdfd61ca3f4a  lirc-0.7.2.tar.bz2
+d115ec757ee1f3b25071f24c8256ee31  lirc-0.8.0pre1.tar.bz2

From 274244a523c35fc9fb64eddf854152f2bc862d21 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ville=20Skytt=C3=A4?= <scop@fedoraproject.org>
Date: Wed, 14 Dec 2005 21:07:23 +0000
Subject: [PATCH 011/204] - 0.8.0pre2, kernel >= 2.6.15 USB patch applied
 upstream. - lirc_clientd renamed to lircrcd.

---
 .cvsignore                   |   2 +-
 lirc-0.8.0pre1-2615usb.patch |  72 -------
 lirc-cvs20051129.patch       | 405 -----------------------------------
 lirc.spec                    |  28 ++-
 sources                      |   2 +-
 5 files changed, 20 insertions(+), 489 deletions(-)
 delete mode 100644 lirc-0.8.0pre1-2615usb.patch
 delete mode 100644 lirc-cvs20051129.patch

diff --git a/.cvsignore b/.cvsignore
index ba7091e..c1cf0f8 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1 +1 @@
-lirc-0.8.0pre1.tar.bz2
+lirc-0.8.0pre2.tar.bz2
diff --git a/lirc-0.8.0pre1-2615usb.patch b/lirc-0.8.0pre1-2615usb.patch
deleted file mode 100644
index b872650..0000000
--- a/lirc-0.8.0pre1-2615usb.patch
+++ /dev/null
@@ -1,72 +0,0 @@
-Index: drivers/lirc_dev/lirc_dev.c
-===================================================================
-RCS file: /cvsroot/lirc/lirc/drivers/lirc_dev/lirc_dev.c,v
-retrieving revision 1.44
-diff -u -r1.44 lirc_dev.c
---- drivers/lirc_dev/lirc_dev.c	8 Aug 2005 06:04:48 -0000	1.44
-+++ drivers/lirc_dev/lirc_dev.c	29 Nov 2005 01:15:17 -0000
-@@ -382,7 +382,11 @@
- 			S_IFCHR|S_IRUSR|S_IWUSR,
- 			DEV_LIRC "/%u", ir->p.minor);
- #endif
--	(void) class_device_create(lirc_class, MKDEV(IRCTL_DEV_MAJOR, ir->p.minor),
-+	(void) class_device_create(lirc_class,
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,15)
-+				       NULL,
-+#endif
-+				       MKDEV(IRCTL_DEV_MAJOR, ir->p.minor),
- 				       NULL, "lirc%u", ir->p.minor);
- 
- 	if(p->sample_rate || p->get_queue) {
-Index: drivers/lirc_imon/lirc_imon.c
-===================================================================
-RCS file: /cvsroot/lirc/lirc/drivers/lirc_imon/lirc_imon.c,v
-retrieving revision 1.8
-diff -u -r1.8 lirc_imon.c
---- drivers/lirc_imon/lirc_imon.c	29 Oct 2005 14:18:53 -0000	1.8
-+++ drivers/lirc_imon/lirc_imon.c	29 Nov 2005 01:15:18 -0000
-@@ -72,7 +72,7 @@
- 
- #define VFD_MINOR_BASE	144	/* Same as LCD */
- #define DEVFS_MODE	S_IFCHR | S_IRUSR | S_IWUSR | S_IRGRP | S_IWGRP | S_IROTH
--#define DEVFS_NAME	"usb/lcd%d"
-+#define DEVFS_NAME	"lcd%d"
- 
- #define BUF_CHUNK_SIZE	4
- #define BUF_SIZE	128
-@@ -216,7 +216,9 @@
- static struct usb_class_driver imon_class = {
- 	.name 		= DEVFS_NAME,
- 	.fops		= &vfd_fops,
-+#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,15)
- 	.mode		= DEVFS_MODE,
-+#endif
- 	.minor_base	= VFD_MINOR_BASE,
- };
- #endif
-Index: drivers/lirc_sasem/lirc_sasem.c
-===================================================================
-RCS file: /cvsroot/lirc/lirc/drivers/lirc_sasem/lirc_sasem.c,v
-retrieving revision 1.11
-diff -u -r1.11 lirc_sasem.c
---- drivers/lirc_sasem/lirc_sasem.c	29 Oct 2005 14:18:53 -0000	1.11
-+++ drivers/lirc_sasem/lirc_sasem.c	29 Nov 2005 01:15:19 -0000
-@@ -81,7 +81,7 @@
- 
- #define VFD_MINOR_BASE	144	/* Same as LCD */
- #define DEVFS_MODE	S_IFCHR | S_IRUSR | S_IWUSR | S_IRGRP | S_IWGRP | S_IROTH
--#define DEVFS_NAME	"usb/lcd%d"
-+#define DEVFS_NAME	"lcd%d"
- 
- #define BUF_CHUNK_SIZE	8
- #define BUF_SIZE	128
-@@ -204,7 +204,9 @@
- static struct usb_class_driver sasem_class = {
- 	.name 		= DEVFS_NAME,
- 	.fops		= &vfd_fops,
-+#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,15)
- 	.mode		= DEVFS_MODE,
-+#endif
- 	.minor_base	= VFD_MINOR_BASE,
- };
- #endif
diff --git a/lirc-cvs20051129.patch b/lirc-cvs20051129.patch
deleted file mode 100644
index 3693864..0000000
--- a/lirc-cvs20051129.patch
+++ /dev/null
@@ -1,405 +0,0 @@
---- lirc-0.8.0pre1/configure.in.orig	2005-11-05 18:52:50.000000000 +0200
-+++ lirc-0.8.0pre1/configure.in	2005-11-29 00:23:03.000000000 +0200
-@@ -137,6 +137,7 @@
- AC_MSG_RESULT()
- 
- possible_drivers="(none) \
-+	(userspace)
- 	(bte) \
- 	(bw6130) \
- 	(creative) \
-@@ -164,7 +165,7 @@
- 
- if test x${no_kernel} != xyes; then
-   possible_drivers="${possible_drivers} \
--	(any) \
-+	(all) \
- 	(lirc_dev) \
- 	(lirc_dev lirc_atiusb) \
- 	(lirc_dev lirc_bt829) \
-@@ -301,9 +302,9 @@
-   HW_DEFAULT="hw_null"
- fi
- 
--if test "$driver" = "any"; then
-+if test "$driver" = "userspace" -o "$driver" = "all"; then
-   AC_DEFINE(LIRC_DRIVER_ANY)
--  lirc_driver="any"
-+  lirc_driver=$driver
-   
-   any_possible_drivers=`echo ${possible_drivers} | sed -e's/ /-/g' \
- 			  -e's/)-(/ /g'  -e's/(//g' -e's/)//g' \
-@@ -1039,7 +1040,7 @@
-     AC_MSG_ERROR([*** you need to first install the caraca package
- 	before you can use this driver])
-     ;;
--  any|lirc_*)
-+  all|lirc_*)
-     AC_MSG_ERROR([*** you need to have the Linux kernel source installed
- 	for this driver])
-     ;;
-@@ -1078,6 +1079,7 @@
- 
- if test "$lirc_driver" = "none" || \
- 	test "$lirc_driver" = "alsa_usb" || \
-+	test "$lirc_driver" = "userspace" || \
- 	test "$lirc_driver" = "atilibusb" || \
- 	test "$lirc_driver" = "audio" || \
- 	test "$lirc_driver" = "audio_alsa" || \
-@@ -1085,7 +1087,7 @@
- 	test "$lirc_driver" = "irman" || \
- 	test "$lirc_driver" = "irman_sw"; then
-   lirc_driver=
--elif test "$lirc_driver" = "any"; then
-+elif test "$lirc_driver" = "all"; then
-   lirc_driver="lirc_dev \
- 	lirc_atiusb \
- 	lirc_bt829 \
-@@ -1316,7 +1318,7 @@
- ])
- 
- echo
--if test "$driver" = "any"; then
-+if test "$driver" = "all"; then
-   echo "All kernel modules will be built."
- elif test "$driver" = "mediafocusI"; then
-   echo "You will have to use the MediaFocus driver from:"
---- lirc-0.8.0pre1/drivers/lirc_bt829/lirc_bt829.c.orig	2005-02-19 17:12:58.000000000 +0200
-+++ lirc-0.8.0pre1/drivers/lirc_bt829/lirc_bt829.c	2005-11-29 00:21:39.000000000 +0200
-@@ -65,7 +65,8 @@
- 	}while(0)
- 
- static int atir_minor;
--static unsigned long pci_addr_phys, pci_addr_lin;
-+static unsigned long pci_addr_phys;
-+static unsigned char *pci_addr_lin;
- 
- static struct lirc_plugin atir_plugin;
- 
-@@ -81,7 +82,7 @@
- 	my_dev = (struct pci_dev *)pci_find_device(PCI_VENDOR_ID_ATI, PCI_DEVICE_ID_ATI_264VT,NULL);
- 	if ( my_dev ) {
- 		printk(KERN_ERR "ATIR: Using device: %s\n",
--		       pci_pretty_name(my_dev));
-+		       pci_name(my_dev));
- 		pci_addr_phys = 0;
- 		if ( my_dev->resource[0].flags & IORESOURCE_MEM ) {
- 			pci_addr_phys = my_dev->resource[0].start;
-@@ -161,7 +162,7 @@
- 
- static int atir_init_start(void)
- {
--	pci_addr_lin = (unsigned long)ioremap(pci_addr_phys + DATA_PCI_OFF,0x400);
-+	pci_addr_lin = ioremap(pci_addr_phys + DATA_PCI_OFF,0x400);
- 	if ( pci_addr_lin == 0 ) {
- 		printk(KERN_INFO "atir: pci mem must be mapped\n");
- 		return 0;
-@@ -363,7 +364,8 @@
- 
- static unsigned int read_index(unsigned char index)
- {
--	unsigned int addr, value;
-+	unsigned char *addr;
-+	unsigned int value;
- 	//  addr = pci_addr_lin + DATA_PCI_OFF + ((index & 0xFF) << 2);
- 	addr = pci_addr_lin + ((index & 0xFF) << 2);
- 	value = readl(addr);
-@@ -372,7 +374,7 @@
- 
- static void write_index(unsigned char index,unsigned int reg_val)
- {
--	unsigned int addr;
-+	unsigned char *addr;
- 	addr = pci_addr_lin + ((index & 0xFF) << 2);
- 	writel(reg_val,addr);
- }
---- lirc-0.8.0pre1/drivers/kcompat.h.orig	2005-10-29 17:18:53.000000000 +0300
-+++ lirc-0.8.0pre1/drivers/kcompat.h	2005-11-29 00:21:39.000000000 +0200
-@@ -187,9 +187,12 @@
- #define local_irq_restore(flags) do{ restore_flags(flags); } while(0)
- #endif
- 
--#if !defined(pci_pretty_name)
--#define pci_pretty_name(dev) ((dev)->name)
--#endif
-+#if LINUX_VERSION_CODE < KERNEL_VERSION(2,4,22)
-+static inline char *pci_name(struct pci_dev *pdev)
-+{
-+	return pdev->slot_name;
-+}
-+#endif//Kernel<2.4.22
- 
- /*************************** I2C specific *****************************/
- #include <linux/i2c.h>
---- lirc-0.8.0pre1/tools/lirc_client.h.orig	2005-11-01 21:12:16.000000000 +0200
-+++ lirc-0.8.0pre1/tools/lirc_client.h	2005-11-29 00:21:39.000000000 +0200
-@@ -14,6 +14,8 @@
- #ifndef LIRC_CLIENT_H
- #define LIRC_CLIENT_H
- 
-+#include <stddef.h>
-+
- #ifdef __cplusplus
- extern "C" {
- #endif
-@@ -91,6 +93,7 @@
- int lirc_code2charprog(struct lirc_config *config,char *code,char **string,
- 		       char **prog);
- size_t lirc_getsocketname(const char *filename, char *buf, size_t size);
-+const char *lirc_getmode(struct lirc_config *config);
- 
- /* new interface for transmit */
- int lirc_send_command(int sockfd, const char *command, char *buf, size_t *buf_len, int *ret_status);
---- lirc-0.8.0pre1/tools/lirc_client.c.orig	2005-11-01 21:12:16.000000000 +0200
-+++ lirc-0.8.0pre1/tools/lirc_client.c	2005-11-29 00:21:39.000000000 +0200
-@@ -1723,7 +1723,7 @@
- 			char *new_buffer;
- 
- 			packet_size+=PACKET_SIZE;
--			new_buffer=(char *) realloc(lirc_buffer,packet_size);
-+			new_buffer=(char *) realloc(lirc_buffer,packet_size+1);
- 			if(new_buffer==NULL)
- 			{
- 				return(-1);
-@@ -1767,6 +1767,33 @@
- 	return strlen(filename)+2;
- }
- 
-+const char *lirc_getmode(struct lirc_config *config)
-+{
-+	if(config->sockfd!=-1)
-+	{
-+		static char buf[LIRC_PACKET_SIZE];
-+		size_t buf_len = LIRC_PACKET_SIZE;
-+		int success;
-+		int ret;
-+		
-+		ret = lirc_send_command(config->sockfd, "GETMODE\n",
-+					buf, &buf_len, &success);
-+		if(success == LIRC_RET_SUCCESS)
-+		{
-+			if(ret > 0)
-+			{
-+				return buf;
-+			}
-+			else
-+			{
-+				return NULL;
-+			}
-+		}
-+		return NULL;
-+	}
-+	return config->current_mode;
-+}
-+
- static const char *lirc_read_string(int fd)
- {
- 	static char buffer[LIRC_PACKET_SIZE+1]="";
---- lirc-0.8.0pre1/tools/lirc_clientd.c.orig	2005-11-01 21:12:16.000000000 +0200
-+++ lirc-0.8.0pre1/tools/lirc_clientd.c	2005-11-29 00:21:39.000000000 +0200
-@@ -67,6 +67,7 @@
- 
- static int code_func(int fd,char *message,char *arguments);
- static int ident_func(int fd,char *message,char *arguments);
-+static int getmode_func(int fd,char *message,char *arguments);
- static int send_result(int fd, char *message, const char *result);
- static int send_success(int fd,char *message);
- 
-@@ -74,6 +75,7 @@
- {
- 	{"CODE",code_func},
- 	{"IDENT",ident_func},
-+	{"GETMODE",getmode_func},
- 	{NULL,NULL}
- 	/*
- 	{"DEBUG",debug},
-@@ -114,7 +116,10 @@
-   do {} while(0)
- #endif
- 
--const char *progname="lirc_clientd " VERSION;
-+#define logprintf syslog
-+#define logperror(prio,s) if((s)!=NULL) syslog(prio,"%s: %m\n",(char *) s); else syslog(prio,"%m\n")
-+
-+const char *progname="lirc_clientd";
- 
- static sig_atomic_t term=0;
- static int termsig;
-@@ -122,53 +127,12 @@
- static struct client_data clis[MAX_CLIENTS];
- 
- static int daemonized=0;
--static FILE *lf=NULL;
--static const char *hostname="";
- 
- static struct lirc_config *config;
- 
- static int send_error(int fd,char *message,char *format_str, ...);
- static int handle_input();
- 
--void logprintf(int prio,char *format_str, ...)
--{
--	time_t current;
--	char *currents;
--	va_list ap;  
--	
--	current=time(&current);
--	currents=ctime(&current);
--	
--	if(lf) fprintf(lf,"%15.15s %s %s: ",currents+4,hostname,progname);
--	if(!daemonized) fprintf(stderr,"%s: ",progname);
--	va_start(ap,format_str);
--	if(lf)
--	{
--		if(prio==LOG_WARNING) fprintf(lf,"WARNING: ");
--		vfprintf(lf,format_str,ap);
--		fputc('\n',lf);fflush(lf);
--	}
--	if(!daemonized)
--	{
--		if(prio==LOG_WARNING) fprintf(stderr,"WARNING: ");
--		vfprintf(stderr,format_str,ap);
--		fputc('\n',stderr);fflush(stderr);
--	}
--	va_end(ap);
--}
--
--void logperror(int prio,const char *s)
--{
--	if(s!=NULL)
--	{
--		logprintf(prio,"%s: %s",s,strerror(errno));
--	}
--	else
--	{
--		logprintf(prio,"%s",strerror(errno));
--	}
--}
--
- static inline int max(int a,int b)
- {
- 	return(a>b ? a:b);
-@@ -554,6 +518,16 @@
- 	return(send_success(fd,message));
- }
- 
-+static int getmode_func(int fd,char *message,char *arguments)
-+{
-+	LOGPRINTF(2, "GETMODE %s", arguments);
-+	if(lirc_getmode(config))
-+	{
-+		return send_result(fd, message, lirc_getmode(config));
-+	}
-+	return(send_success(fd,message));
-+}
-+
- static int send_result(int fd, char *message, const char *result)
- {
- 	char *count = "1\n";
-@@ -938,7 +912,7 @@
-                         printf("\t -o --output=socket\t\toutput socket filename\n");
- 			return(EXIT_SUCCESS);
- 		case 'v':
--			printf("%s\n",progname);
-+			printf("%s %s\n",progname,VERSION);
- 			return(EXIT_SUCCESS);
- 		case 'p':
- 			if(oatoi(optarg)==-1)
-@@ -988,7 +962,6 @@
- 		return EXIT_FAILURE;
- 	}
- 	
--	LOGPRINTF(3, "fork");
- 	/* fork */
- 	if(daemon(0,0)==-1)
- 	{
-@@ -1001,8 +974,7 @@
- 	}
- 	daemonized=1;
- 
--	lf = fopen("/tmp/lirc_clientd.log", "a");
--
-+	openlog(progname, LOG_CONS|LOG_PID, LOG_USER);
- 	umask(0);
- 	signal(SIGPIPE,SIG_IGN);
- 	
-@@ -1013,8 +985,10 @@
- 	sigaction(SIGINT,&act,NULL);
- 	sigaction(SIGHUP,&act,NULL);
- 	
-+	logprintf(LOG_NOTICE, "%s started", progname);
- 	loop(socket, lircdfd);
- 	
-+	closelog();
- 	shutdown(socket, 2);
- 	close(socket);
- 	lirc_freeconfig(config);
---- lirc-0.8.0pre1/configure.orig	2005-11-05 18:55:58.000000000 +0200
-+++ lirc-0.8.0pre1/configure	2005-11-29 00:24:39.000000000 +0200
-@@ -7995,6 +7995,7 @@
- echo "$ac_t""" 1>&6
- 
- possible_drivers="(none) \
-+	(userspace) \
- 	(bte) \
- 	(bw6130) \
- 	(creative) \
-@@ -8022,7 +8023,7 @@
- 
- if test x${no_kernel} != xyes; then
-   possible_drivers="${possible_drivers} \
--	(any) \
-+	(all) \
- 	(lirc_dev) \
- 	(lirc_dev lirc_atiusb) \
- 	(lirc_dev lirc_bt829) \
-@@ -8568,12 +8569,12 @@
-   HW_DEFAULT="hw_null"
- fi
- 
--if test "$driver" = "any"; then
-+if test "$driver" = "userspace" -o "$driver" = "all"; then
-   cat >> confdefs.h <<\EOF
- #define LIRC_DRIVER_ANY 1
- EOF
- 
--  lirc_driver="any"
-+  lirc_driver=$driver
-   
-   any_possible_drivers=`echo ${possible_drivers} | sed -e's/ /-/g' \
- 			  -e's/)-(/ /g'  -e's/(//g' -e's/)//g' \
-@@ -9332,7 +9333,7 @@
-     { echo "configure: error: *** you need to first install the caraca package
- 	before you can use this driver" 1>&2; exit 1; }
-     ;;
--  any|lirc_*)
-+  all|lirc_*)
-     { echo "configure: error: *** you need to have the Linux kernel source installed
- 	for this driver" 1>&2; exit 1; }
-     ;;
-@@ -9370,6 +9371,7 @@
- 
- if test "$lirc_driver" = "none" || \
- 	test "$lirc_driver" = "alsa_usb" || \
-+	test "$lirc_driver" = "userspace" || \
- 	test "$lirc_driver" = "atilibusb" || \
- 	test "$lirc_driver" = "audio" || \
- 	test "$lirc_driver" = "audio_alsa" || \
-@@ -9377,7 +9379,7 @@
- 	test "$lirc_driver" = "irman" || \
- 	test "$lirc_driver" = "irman_sw"; then
-   lirc_driver=
--elif test "$lirc_driver" = "any"; then
-+elif test "$lirc_driver" = "all"; then
-   lirc_driver="lirc_dev \
- 	lirc_atiusb \
- 	lirc_bt829 \
-@@ -10245,7 +10247,7 @@
- 
- 
- echo
--if test "$driver" = "any"; then
-+if test "$driver" = "all"; then
-   echo "All kernel modules will be built."
- elif test "$driver" = "mediafocusI"; then
-   echo "You will have to use the MediaFocus driver from:"
diff --git a/lirc.spec b/lirc.spec
index 537e989..06a90cc 100644
--- a/lirc.spec
+++ b/lirc.spec
@@ -16,19 +16,17 @@
 
 Name:           lirc
 Version:        0.8.0
-Release:        0.2.pre1%{?dist}
+Release:        0.2.pre2%{?dist}
 Summary:        The Linux Infrared Remote Control package
 
 Group:          System Environment/Daemons
 License:        GPL
 URL:            http://www.lirc.org/
 #Source0:        http://download.sourceforge.net/lirc/%{name}-%{version}.tar.bz2
-Source0:        http://lirc.sf.net/software/snapshots/lirc-0.8.0pre1.tar.bz2
+Source0:        http://lirc.sf.net/software/snapshots/lirc-0.8.0pre2.tar.bz2
 Source1:        %{name}.init
 Source2:        %{name}.sysconfig
 Patch0:         %{name}-optflags.patch
-Patch1:         %{name}-cvs20051129.patch
-Patch2:         %{name}-0.8.0pre1-2615usb.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 %if 0%{!?_with_modules:1}
@@ -78,18 +76,24 @@ LIRC kernel modules built for kernel
 
 
 %prep
-%setup -q -n %{name}-%{version}pre1
+%setup -q -n %{name}-%{version}pre2
 %patch0 -p1
-%patch1 -p1
-%patch2
+
+# *cough*
 echo %{kver} | grep -q _FC5 && \
-   sed -i -e s/2,6,15/2,6,14/ drivers/lirc_{dev,imon,sasem}/lirc_*.c # *cough*
+   sed -i -e 's/KERNEL_VERSION(2,\s*6,\s*15)/KERNEL_VERSION(2,6,14)/' \
+   drivers/kcompat.h drivers/lirc_{imon,sasem}/lirc_*.c
+
 chmod 644 contrib/*
-# cmdir: unknown symbols
+
+sed -i -e 's/\r//' remotes/{imon,hercules}/lircd.conf*
+
+# cmdir: unknown symbols (cmdir_{read,write}, set_tx_channels)
 # gpio: missing drivers/media/video/{bttv,bttvp}.h in kernel-devel
 for drv in cmdir gpio ; do
   sed -i -e "/^\\s*(lirc_dev lirc_$drv)/d" -e "/^\\s*lirc_$drv/d" configure*
 done
+
 touch -r aclocal.m4 configure.in # avoid autofoo re-run
 
 
@@ -179,7 +183,7 @@ depmod -ae -F /boot/System.map-%{kver} %{kver} >/dev/null || :
 %{_bindir}/*mode2
 %{_sbindir}/lirc*d
 %{_libdir}/liblirc_client.so.*
-%{_mandir}/man1/ir*.1*
+%{_mandir}/man1/*ir*.1*
 %{_mandir}/man1/*mode2*.1*
 %{_mandir}/man8/lirc*d.8*
 %ghost /dev/lirc*
@@ -198,6 +202,10 @@ depmod -ae -F /boot/System.map-%{kver} %{kver} >/dev/null || :
 
 
 %changelog
+* Wed Dec 14 2005 Ville Skyttä <ville.skytta at iki.fi> - 0.8.0-0.2.pre2
+- 0.8.0pre2, kernel >= 2.6.15 USB patch applied upstream.
+- lirc_clientd renamed to lircrcd.
+
 * Tue Nov 29 2005 Ville Skyttä <ville.skytta at iki.fi> - 0.8.0-0.2.pre1
 - Pull security fix for the new lirc_clientd from upstream CVS, and
   while at it, some other useful post-0.8.0pre1 changes.
diff --git a/sources b/sources
index e3dd4de..0c0f7ea 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-d115ec757ee1f3b25071f24c8256ee31  lirc-0.8.0pre1.tar.bz2
+80aaee5c1b5815f115b1e14d49f36cd5  lirc-0.8.0pre2.tar.bz2

From 58b3320709fd5c8fe551e077f1fdf342424695f1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ville=20Skytt=C3=A4?= <scop@fedoraproject.org>
Date: Tue, 27 Dec 2005 20:13:13 +0000
Subject: [PATCH 012/204] - Split kernel modules into separate package. -
 Disable debugging features.

---
 lirc.spec | 85 +++++++++----------------------------------------------
 1 file changed, 13 insertions(+), 72 deletions(-)

diff --git a/lirc.spec b/lirc.spec
index 06a90cc..e55f90c 100644
--- a/lirc.spec
+++ b/lirc.spec
@@ -1,18 +1,12 @@
-# Driver TODO, sometime maybe:
-# - caraca (req: caraca, http://caraca.sf.net/)
-# - irman: (req: libirman, http://lirc.sf.net/software/snapshots/)
-# Other TODO:
+# TODO:
+# - caraca driver (req: caraca, http://caraca.sf.net/)
+# - irman driver (req: libirman, http://lirc.sf.net/software/snapshots/)
 # - move to -devel (?): irw, *mode2, others?
 #   note: xmode2 inflicts a dependency on X, and smode2 on svgalib
 #   - does someone actually need xmode2/smode2 for something?
+# - bcond_without for alsa, portaudio, x?
 # - don't run as root and/or create dedicated group, reduce fifo permissions?
 # - Fixup /etc/lirc(m)d.conf %%ghost'ification, existence after erase etc.
-# - Verify that the kernel modules work and correct /dev entries get created
-#   automagically with proper permissions etc.
-
-%{!?kver: %{expand: %%define kver %(uname -r)}}
-%define ksrc %{_usrsrc}/kernels/%{kver}-%{_target_cpu}
-%define mdir /lib/modules/%{kver}/extra
 
 Name:           lirc
 Version:        0.8.0
@@ -29,14 +23,12 @@ Source2:        %{name}.sysconfig
 Patch0:         %{name}-optflags.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-%if 0%{!?_with_modules:1}
 BuildRequires:  %{__perl}
 BuildRequires:  alsa-lib-devel
 BuildRequires:  libXt-devel
 BuildRequires:  libusb-devel
 BuildRequires:  portaudio-devel >= 18
 Build%{?_with_svgalib:Requires}%{!?_with_svgalib:Conflicts}: svgalib-devel
-%endif
 Requires(post): /sbin/chkconfig
 Requires(post): /sbin/ldconfig
 Requires(preun): /sbin/chkconfig
@@ -57,43 +49,12 @@ Requires:       %{name} = %{version}-%{release}
 %description    devel
 %{summary}.
 
-%package     -n kernel-module-%{name}-%{kver}
-Summary:        Kernel modules for LIRC
-Group:          System Environment/Kernel
-Provides:       kernel-module
-Provides:       kernel-module-%{name} = %{version}
-%if 0%{?_with_modules:1}
-BuildRequires:  kernel-devel-%{_target_cpu} = %{kver}
-%endif
-Requires:       %{name} = %{version}
-Requires:       module-init-tools
-Requires:       kernel-%{_target_cpu} = %{kver}
-Requires:       udev
-
-%description -n kernel-module-%{name}-%{kver}
-LIRC kernel modules built for kernel
-%{kver} (%{_target_cpu}).
-
 
 %prep
 %setup -q -n %{name}-%{version}pre2
 %patch0 -p1
-
-# *cough*
-echo %{kver} | grep -q _FC5 && \
-   sed -i -e 's/KERNEL_VERSION(2,\s*6,\s*15)/KERNEL_VERSION(2,6,14)/' \
-   drivers/kcompat.h drivers/lirc_{imon,sasem}/lirc_*.c
-
 chmod 644 contrib/*
-
 sed -i -e 's/\r//' remotes/{imon,hercules}/lircd.conf*
-
-# cmdir: unknown symbols (cmdir_{read,write}, set_tx_channels)
-# gpio: missing drivers/media/video/{bttv,bttvp}.h in kernel-devel
-for drv in cmdir gpio ; do
-  sed -i -e "/^\\s*(lirc_dev lirc_$drv)/d" -e "/^\\s*lirc_$drv/d" configure*
-done
-
 touch -r aclocal.m4 configure.in # avoid autofoo re-run
 
 
@@ -101,31 +62,18 @@ touch -r aclocal.m4 configure.in # avoid autofoo re-run
 %configure \
   --disable-static \
   --disable-dependency-tracking \
-  --enable-debug \
   --enable-sandboxed \
   --with-syslog=LOG_DAEMON \
-%if 0%{?_with_modules:1}
-  --with-kerneldir=%{ksrc} \
-  --with-moduledir=%{mdir}/%{name} \
-  --with-driver=all
-make %{?_smp_mflags} -C drivers
-%else
   --with-driver=userspace
 make %{?_smp_mflags}
-%endif
 
 
 %install
 rm -rf $RPM_BUILD_ROOT __docs
 
-%if 0%{?_with_modules:1}
-make install DESTDIR=$RPM_BUILD_ROOT -C drivers
-# executable here to allow stripping, fixed later in %%files
-chmod +x $RPM_BUILD_ROOT%{mdir}/%{name}/*.ko
-
-%else
 make install DESTDIR=$RPM_BUILD_ROOT
 %{!?_with_svgalib:rm $RPM_BUILD_ROOT%{_mandir}/man1/smode2.1*}
+
 install -Dpm 755 %{SOURCE1} $RPM_BUILD_ROOT%{_initrddir}/lirc
 %{__perl} -pi -e \
   's|/etc/|%{_sysconfdir}/|g ;
@@ -133,16 +81,19 @@ install -Dpm 755 %{SOURCE1} $RPM_BUILD_ROOT%{_initrddir}/lirc
    s|/usr/sbin/|%{_sbindir}/|g' \
   $RPM_BUILD_ROOT%{_initrddir}/lirc
 install -Dpm 644 %{SOURCE2} $RPM_BUILD_ROOT%{_sysconfdir}/sysconfig/lirc
+
 mkdir __docs
 cp -pR doc contrib __docs
 cd __docs
 rm -rf doc/Makefile* doc/.libs doc/man* contrib/lirc.* contrib/sendxevent.c
 cd ..
+
 touch $RPM_BUILD_ROOT%{_sysconfdir}/lirc{d,md}.conf
+
 install -dm 755 $RPM_BUILD_ROOT/dev
 touch $RPM_BUILD_ROOT/dev/lirc{d,m}
+
 rm $RPM_BUILD_ROOT%{_libdir}/liblirc_client.la
-%endif
 
 
 %clean
@@ -153,9 +104,6 @@ rm -rf $RPM_BUILD_ROOT
 /sbin/ldconfig
 /sbin/chkconfig --add lirc
 
-%post -n kernel-module-%{name}-%{kver}
-depmod -ae -F /boot/System.map-%{kver} %{kver} >/dev/null || :
-
 %preun
 if [ $1 -eq 0 ] ; then
   %{_initrddir}/lirc stop >/dev/null || :
@@ -168,11 +116,7 @@ if [ $1 -gt 0 ] ; then
   %{_initrddir}/lirc try-restart >/dev/null || :
 fi
 
-%postun -n kernel-module-%{name}-%{kver}
-depmod -ae -F /boot/System.map-%{kver} %{kver} >/dev/null || :
-
 
-%if 0%{!?_with_modules:1}
 %files
 %defattr(-,root,root,-)
 %doc ANNOUNCE AUTHORS ChangeLog COPYING NEWS README TODO remotes __docs/*
@@ -192,16 +136,13 @@ depmod -ae -F /boot/System.map-%{kver} %{kver} >/dev/null || :
 %defattr(-,root,root,-)
 %{_includedir}/lirc/
 %{_libdir}/liblirc_client.so
-%endif
-
-%if 0%{?_with_modules:1}
-%files -n kernel-module-%{name}-%{kver}
-%defattr(644,root,root,755)
-%{mdir}/
-%endif
 
 
 %changelog
+* Tue Dec 27 2005 Ville Skyttä <ville.skytta at iki.fi>
+- Split kernel modules into separate package.
+- Disable debugging features.
+
 * Wed Dec 14 2005 Ville Skyttä <ville.skytta at iki.fi> - 0.8.0-0.2.pre2
 - 0.8.0pre2, kernel >= 2.6.15 USB patch applied upstream.
 - lirc_clientd renamed to lircrcd.

From 1344e6642d652eaad12457355761bf83d8572d40 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ville=20Skytt=C3=A4?= <scop@fedoraproject.org>
Date: Sun, 1 Jan 2006 18:42:40 +0000
Subject: [PATCH 013/204] - 0.8.0pre3.

---
 .cvsignore | 2 +-
 lirc.spec  | 9 ++++++---
 sources    | 2 +-
 3 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/.cvsignore b/.cvsignore
index c1cf0f8..22dfb69 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1 +1 @@
-lirc-0.8.0pre2.tar.bz2
+lirc-0.8.0pre3.tar.bz2
diff --git a/lirc.spec b/lirc.spec
index e55f90c..f02e27c 100644
--- a/lirc.spec
+++ b/lirc.spec
@@ -10,14 +10,14 @@
 
 Name:           lirc
 Version:        0.8.0
-Release:        0.2.pre2%{?dist}
+Release:        0.2.pre3%{?dist}
 Summary:        The Linux Infrared Remote Control package
 
 Group:          System Environment/Daemons
 License:        GPL
 URL:            http://www.lirc.org/
 #Source0:        http://download.sourceforge.net/lirc/%{name}-%{version}.tar.bz2
-Source0:        http://lirc.sf.net/software/snapshots/lirc-0.8.0pre2.tar.bz2
+Source0:        http://lirc.sf.net/software/snapshots/lirc-0.8.0pre3.tar.bz2
 Source1:        %{name}.init
 Source2:        %{name}.sysconfig
 Patch0:         %{name}-optflags.patch
@@ -51,7 +51,7 @@ Requires:       %{name} = %{version}-%{release}
 
 
 %prep
-%setup -q -n %{name}-%{version}pre2
+%setup -q -n %{name}-%{version}pre3
 %patch0 -p1
 chmod 644 contrib/*
 sed -i -e 's/\r//' remotes/{imon,hercules}/lircd.conf*
@@ -139,6 +139,9 @@ fi
 
 
 %changelog
+* Sun Jan  1 2006 Ville Skyttä <ville.skytta at iki.fi> - 0.8.0-0.2.pre3
+- 0.8.0pre3.
+
 * Tue Dec 27 2005 Ville Skyttä <ville.skytta at iki.fi>
 - Split kernel modules into separate package.
 - Disable debugging features.
diff --git a/sources b/sources
index 0c0f7ea..4060008 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-80aaee5c1b5815f115b1e14d49f36cd5  lirc-0.8.0pre2.tar.bz2
+c20cf756b0b5cad96437bc25e81b166a  lirc-0.8.0pre3.tar.bz2

From e9e569ca99b883208885faa1c01097ba90e0e550 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ville=20Skytt=C3=A4?= <scop@fedoraproject.org>
Date: Sat, 14 Jan 2006 19:34:32 +0000
Subject: [PATCH 014/204] - 0.8.0pre4.

---
 .cvsignore | 2 +-
 lirc.spec  | 9 ++++++---
 sources    | 2 +-
 3 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/.cvsignore b/.cvsignore
index 22dfb69..a0e3e71 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1 +1 @@
-lirc-0.8.0pre3.tar.bz2
+lirc-0.8.0pre4.tar.bz2
diff --git a/lirc.spec b/lirc.spec
index f02e27c..ffb382e 100644
--- a/lirc.spec
+++ b/lirc.spec
@@ -10,14 +10,14 @@
 
 Name:           lirc
 Version:        0.8.0
-Release:        0.2.pre3%{?dist}
+Release:        0.2.pre4%{?dist}
 Summary:        The Linux Infrared Remote Control package
 
 Group:          System Environment/Daemons
 License:        GPL
 URL:            http://www.lirc.org/
 #Source0:        http://download.sourceforge.net/lirc/%{name}-%{version}.tar.bz2
-Source0:        http://lirc.sf.net/software/snapshots/lirc-0.8.0pre3.tar.bz2
+Source0:        http://lirc.sf.net/software/snapshots/lirc-0.8.0pre4.tar.bz2
 Source1:        %{name}.init
 Source2:        %{name}.sysconfig
 Patch0:         %{name}-optflags.patch
@@ -51,7 +51,7 @@ Requires:       %{name} = %{version}-%{release}
 
 
 %prep
-%setup -q -n %{name}-%{version}pre3
+%setup -q -n %{name}-%{version}pre4
 %patch0 -p1
 chmod 644 contrib/*
 sed -i -e 's/\r//' remotes/{imon,hercules}/lircd.conf*
@@ -139,6 +139,9 @@ fi
 
 
 %changelog
+* Sat Jan 14 2006 Ville Skyttä <ville.skytta at iki.fi> - 0.8.0-0.2.pre4
+- 0.8.0pre4.
+
 * Sun Jan  1 2006 Ville Skyttä <ville.skytta at iki.fi> - 0.8.0-0.2.pre3
 - 0.8.0pre3.
 
diff --git a/sources b/sources
index 4060008..477c438 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-c20cf756b0b5cad96437bc25e81b166a  lirc-0.8.0pre3.tar.bz2
+8e69494b32a14d7513499bd7d4a350d2  lirc-0.8.0pre4.tar.bz2

From c4d0fb1354b75977c2d5fd4b56a32c0aac0db689 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ville=20Skytt=C3=A4?= <scop@fedoraproject.org>
Date: Sat, 21 Jan 2006 15:13:25 +0000
Subject: [PATCH 015/204] - 0.8.0.

---
 .cvsignore |  2 +-
 lirc.spec  | 10 ++++++----
 sources    |  2 +-
 3 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/.cvsignore b/.cvsignore
index a0e3e71..d6c541a 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1 +1 @@
-lirc-0.8.0pre4.tar.bz2
+lirc-0.8.0.tar.bz2
diff --git a/lirc.spec b/lirc.spec
index ffb382e..6745cf2 100644
--- a/lirc.spec
+++ b/lirc.spec
@@ -10,14 +10,13 @@
 
 Name:           lirc
 Version:        0.8.0
-Release:        0.2.pre4%{?dist}
+Release:        2%{?dist}
 Summary:        The Linux Infrared Remote Control package
 
 Group:          System Environment/Daemons
 License:        GPL
 URL:            http://www.lirc.org/
-#Source0:        http://download.sourceforge.net/lirc/%{name}-%{version}.tar.bz2
-Source0:        http://lirc.sf.net/software/snapshots/lirc-0.8.0pre4.tar.bz2
+Source0:        http://download.sourceforge.net/lirc/%{name}-%{version}.tar.bz2
 Source1:        %{name}.init
 Source2:        %{name}.sysconfig
 Patch0:         %{name}-optflags.patch
@@ -51,7 +50,7 @@ Requires:       %{name} = %{version}-%{release}
 
 
 %prep
-%setup -q -n %{name}-%{version}pre4
+%setup -q
 %patch0 -p1
 chmod 644 contrib/*
 sed -i -e 's/\r//' remotes/{imon,hercules}/lircd.conf*
@@ -139,6 +138,9 @@ fi
 
 
 %changelog
+* Sat Jan 21 2006 Ville Skyttä <ville.skytta at iki.fi> - 0.8.0-2
+- 0.8.0.
+
 * Sat Jan 14 2006 Ville Skyttä <ville.skytta at iki.fi> - 0.8.0-0.2.pre4
 - 0.8.0pre4.
 
diff --git a/sources b/sources
index 477c438..285dc1e 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-8e69494b32a14d7513499bd7d4a350d2  lirc-0.8.0pre4.tar.bz2
+0bf28bf82c7766a462f90927b6bf3af1  lirc-0.8.0.tar.bz2

From c3a0c1a83c861b463c47e437cca43c05b9e139e0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ville=20Skytt=C3=A4?= <scop@fedoraproject.org>
Date: Tue, 14 Feb 2006 20:29:59 +0000
Subject: [PATCH 016/204] - Avoid standard rpaths on lib64 archs.

---
 lirc-0.8.0-rpath64.patch | 22 ++++++++++++++++++++++
 lirc.spec                |  9 +++++++--
 2 files changed, 29 insertions(+), 2 deletions(-)
 create mode 100644 lirc-0.8.0-rpath64.patch

diff --git a/lirc-0.8.0-rpath64.patch b/lirc-0.8.0-rpath64.patch
new file mode 100644
index 0000000..b0ecfeb
--- /dev/null
+++ b/lirc-0.8.0-rpath64.patch
@@ -0,0 +1,22 @@
+--- lirc-0.8.0/configure~	2006-01-21 11:03:45.000000000 +0200
++++ lirc-0.8.0/configure	2006-02-14 22:19:00.000000000 +0200
+@@ -4282,7 +4282,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"
+ sys_lib_search_path_spec="/lib /usr/lib /usr/local/lib"
+ 
+ case $host_os in
+--- lirc-0.8.0/aclocal.m4~	2006-01-21 11:03:43.000000000 +0200
++++ lirc-0.8.0/aclocal.m4	2006-02-14 22:19:11.000000000 +0200
+@@ -2531,7 +2531,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"
+ sys_lib_search_path_spec="/lib /usr/lib /usr/local/lib"
+ 
+ case $host_os in
diff --git a/lirc.spec b/lirc.spec
index 6745cf2..e99481b 100644
--- a/lirc.spec
+++ b/lirc.spec
@@ -10,7 +10,7 @@
 
 Name:           lirc
 Version:        0.8.0
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        The Linux Infrared Remote Control package
 
 Group:          System Environment/Daemons
@@ -20,6 +20,7 @@ Source0:        http://download.sourceforge.net/lirc/%{name}-%{version}.tar.bz2
 Source1:        %{name}.init
 Source2:        %{name}.sysconfig
 Patch0:         %{name}-optflags.patch
+Patch1:         %{name}-0.8.0-rpath64.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  %{__perl}
@@ -52,9 +53,10 @@ Requires:       %{name} = %{version}-%{release}
 %prep
 %setup -q
 %patch0 -p1
+%patch1 -p1
 chmod 644 contrib/*
 sed -i -e 's/\r//' remotes/{imon,hercules}/lircd.conf*
-touch -r aclocal.m4 configure.in # avoid autofoo re-run
+touch -r acconfig.h aclocal.m4 configure.in # avoid autofoo re-run
 
 
 %build
@@ -138,6 +140,9 @@ fi
 
 
 %changelog
+* Tue Feb 14 2006 Ville Skyttä <ville.skytta at iki.fi> - 0.8.0-3
+- Avoid standard rpaths on lib64 archs.
+
 * Sat Jan 21 2006 Ville Skyttä <ville.skytta at iki.fi> - 0.8.0-2
 - 0.8.0.
 

From 15c053a6d0174783cc0f539b286bb081be075fdb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ville=20Skytt=C3=A4?= <scop@fedoraproject.org>
Date: Sun, 2 Jul 2006 09:02:42 +0000
Subject: [PATCH 017/204] - 0.8.1pre1. - Add rpmbuild options for
 enabling/disabling ALSA, portaudio and/or X     support, ALSA and X enabled
 by default, portaudio not. - Split most of the documentation to -doc
 subpackage. - Install irman2lirc as non-doc.

---
 .cvsignore |  2 +-
 lirc.spec  | 91 ++++++++++++++++++++++++++++++++++++++++++++++--------
 sources    |  2 +-
 3 files changed, 80 insertions(+), 15 deletions(-)

diff --git a/.cvsignore b/.cvsignore
index d6c541a..8d80460 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1 +1 @@
-lirc-0.8.0.tar.bz2
+lirc-0.8.1pre1.tar.bz2
diff --git a/lirc.spec b/lirc.spec
index e99481b..7dfaa0e 100644
--- a/lirc.spec
+++ b/lirc.spec
@@ -4,19 +4,25 @@
 # - move to -devel (?): irw, *mode2, others?
 #   note: xmode2 inflicts a dependency on X, and smode2 on svgalib
 #   - does someone actually need xmode2/smode2 for something?
-# - bcond_without for alsa, portaudio, x?
+# - split into -libs and -utils (daemons in main package)?
 # - don't run as root and/or create dedicated group, reduce fifo permissions?
 # - Fixup /etc/lirc(m)d.conf %%ghost'ification, existence after erase etc.
 
+%bcond_without  alsa
+%bcond_with     portaudio
+%bcond_with     svgalib
+%bcond_without  x
+
 Name:           lirc
-Version:        0.8.0
-Release:        3%{?dist}
+Version:        0.8.1
+Release:        0.1.pre1%{?dist}
 Summary:        The Linux Infrared Remote Control package
 
 Group:          System Environment/Daemons
 License:        GPL
 URL:            http://www.lirc.org/
-Source0:        http://download.sourceforge.net/lirc/%{name}-%{version}.tar.bz2
+#Source0:        http://download.sourceforge.net/lirc/%{name}-%{version}.tar.bz2
+Source0:        http://lirc.sourceforge.net/software/snapshots/%{name}-%{version}pre1.tar.bz2
 Source1:        %{name}.init
 Source2:        %{name}.sysconfig
 Patch0:         %{name}-optflags.patch
@@ -24,11 +30,19 @@ Patch1:         %{name}-0.8.0-rpath64.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  %{__perl}
-BuildRequires:  alsa-lib-devel
-BuildRequires:  libXt-devel
 BuildRequires:  libusb-devel
+%if %{with alsa}
+BuildRequires:  alsa-lib-devel
+%endif
+%if %{with portaudio}
 BuildRequires:  portaudio-devel >= 18
-Build%{?_with_svgalib:Requires}%{!?_with_svgalib:Conflicts}: svgalib-devel
+%endif
+%if %{with svgalib}
+BuildRequires:  svgalib-devel
+%endif
+%if %{with x}
+BuildRequires:  libXt-devel
+%endif
 Requires(post): /sbin/chkconfig
 Requires(post): /sbin/ldconfig
 Requires(preun): /sbin/chkconfig
@@ -47,15 +61,44 @@ Group:          Development/Libraries
 Requires:       %{name} = %{version}-%{release}
 
 %description    devel
-%{summary}.
+LIRC is a package that allows you to decode and send infra-red and
+other signals of many (but not all) commonly used remote controls.
+Included applications include daemons which decode the received
+signals as well as user space applications which allow controlling a
+computer with a remote control.  This package includes files for
+developing applications that use LIRC.
+
+%package        doc
+Summary:        LIRC documentation
+Group:          Documentation
+
+%description    doc
+LIRC is a package that allows you to decode and send infra-red and
+other signals of many (but not all) commonly used remote controls.
+Included applications include daemons which decode the received
+signals as well as user space applications which allow controlling a
+computer with a remote control.  This package contains LIRC
+documentation and a collection of remote control configuration files.
 
 
 %prep
-%setup -q
+%setup -q -n %{name}-%{version}pre1
 %patch0 -p1
 %patch1 -p1
 chmod 644 contrib/*
-sed -i -e 's/\r//' remotes/{imon,hercules}/lircd.conf*
+sed -i -e 's|/usr/local/etc/|/etc/|' contrib/irman2lirc
+sed -i -e 's/\r//' remotes/hercules/lircd.conf.smarttv_stereo
+sed -i -e 's|/sbin/init.d/lircd|%{_initrddir}/lirc|' contrib/lircs
+# *cough* I wish there was a good way to disable alsa/portaudio/svgalib...
+%if ! %{with alsa}
+sed -i -e 's/asoundlib.h/ALSA_DISABLED/g' configure*
+%endif
+%if ! %{with portaudio}
+sed -i -e 's/portaudio.h/PORTAUDIO_DISABLED/g' configure*
+%endif
+%if ! %{with svgalib}
+sed -i -e 's/vga.h/SVGALIB_DISABLED/g' configure*
+%endif
 touch -r acconfig.h aclocal.m4 configure.in # avoid autofoo re-run
 
 
@@ -64,6 +107,9 @@ touch -r acconfig.h aclocal.m4 configure.in # avoid autofoo re-run
   --disable-static \
   --disable-dependency-tracking \
   --enable-sandboxed \
+%if ! %{with x}
+  --without-x \
+%endif
   --with-syslog=LOG_DAEMON \
   --with-driver=userspace
 make %{?_smp_mflags}
@@ -73,7 +119,14 @@ make %{?_smp_mflags}
 rm -rf $RPM_BUILD_ROOT __docs
 
 make install DESTDIR=$RPM_BUILD_ROOT
-%{!?_with_svgalib:rm $RPM_BUILD_ROOT%{_mandir}/man1/smode2.1*}
+install -pm 755 contrib/irman2lirc $RPM_BUILD_ROOT%{_bindir}
+%if ! %{with svgalib}
+rm -f $RPM_BUILD_ROOT%{_mandir}/man1/smode2.1*
+%endif
+%if ! %{with x}
+rm -f $RPM_BUILD_ROOT%{_mandir}/man1/irxevent.1*
+rm -f $RPM_BUILD_ROOT%{_mandir}/man1/xmode2.1*
+%endif
 
 install -Dpm 755 %{SOURCE1} $RPM_BUILD_ROOT%{_initrddir}/lirc
 %{__perl} -pi -e \
@@ -86,7 +139,8 @@ install -Dpm 644 %{SOURCE2} $RPM_BUILD_ROOT%{_sysconfdir}/sysconfig/lirc
 mkdir __docs
 cp -pR doc contrib __docs
 cd __docs
-rm -rf doc/Makefile* doc/.libs doc/man* contrib/lirc.* contrib/sendxevent.c
+rm -rf doc/Makefile* doc/.libs doc/man*
+rm -rf contrib/irman2lirc contrib/lirc.* contrib/sendxevent.c
 cd ..
 
 touch $RPM_BUILD_ROOT%{_sysconfdir}/lirc{d,md}.conf
@@ -120,7 +174,7 @@ fi
 
 %files
 %defattr(-,root,root,-)
-%doc ANNOUNCE AUTHORS ChangeLog COPYING NEWS README TODO remotes __docs/*
+%doc ANNOUNCE AUTHORS ChangeLog COPYING NEWS README TODO
 %ghost %config(noreplace) %{_sysconfdir}/lirc*d.conf
 %config(noreplace) %{_sysconfdir}/sysconfig/lirc
 %{_initrddir}/lirc
@@ -138,8 +192,19 @@ fi
 %{_includedir}/lirc/
 %{_libdir}/liblirc_client.so
 
+%files doc
+%defattr(-,root,root,-)
+%doc __docs/* remotes/
+
 
 %changelog
+* Sat Jul  1 2006 Ville Skyttä <ville.skytta at iki.fi> - 0.8.1-0.1.pre1
+- 0.8.1pre1.
+- Add rpmbuild options for enabling/disabling ALSA, portaudio and/or X
+  support, ALSA and X enabled by default, portaudio not.
+- Split most of the documentation to -doc subpackage.
+- Install irman2lirc as non-doc.
+
 * Tue Feb 14 2006 Ville Skyttä <ville.skytta at iki.fi> - 0.8.0-3
 - Avoid standard rpaths on lib64 archs.
 
diff --git a/sources b/sources
index 285dc1e..d1f3d86 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-0bf28bf82c7766a462f90927b6bf3af1  lirc-0.8.0.tar.bz2
+acb6340078bde9628f5ae848fec0583c  lirc-0.8.1pre1.tar.bz2

From a969894d7d032223087e9cd114292aa05cb5697e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ville=20Skytt=C3=A4?= <scop@fedoraproject.org>
Date: Sun, 27 Aug 2006 20:39:04 +0000
Subject: [PATCH 018/204] 
 http://fedoraproject.org/wiki/Extras/Schedule/FC6MassRebuild

---
 needs.rebuild | 1 +
 1 file changed, 1 insertion(+)
 create mode 100644 needs.rebuild

diff --git a/needs.rebuild b/needs.rebuild
new file mode 100644
index 0000000..815fd29
--- /dev/null
+++ b/needs.rebuild
@@ -0,0 +1 @@
+http://fedoraproject.org/wiki/Extras/Schedule/FC6MassRebuild

From b6176575f8a3c2e01904b8070a5be627e3de2ada Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ville=20Skytt=C3=A4?= <scop@fedoraproject.org>
Date: Mon, 28 Aug 2006 16:36:47 +0000
Subject: [PATCH 019/204] - Rebuild.

---
 lirc.spec | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/lirc.spec b/lirc.spec
index 7dfaa0e..0469adb 100644
--- a/lirc.spec
+++ b/lirc.spec
@@ -15,7 +15,7 @@
 
 Name:           lirc
 Version:        0.8.1
-Release:        0.1.pre1%{?dist}
+Release:        0.2.pre1%{?dist}
 Summary:        The Linux Infrared Remote Control package
 
 Group:          System Environment/Daemons
@@ -198,6 +198,9 @@ fi
 
 
 %changelog
+* Mon Aug 28 2006 Ville Skyttä <ville.skytta at iki.fi> - 0.8.1-0.2.pre1
+- Rebuild.
+
 * Sat Jul  1 2006 Ville Skyttä <ville.skytta at iki.fi> - 0.8.1-0.1.pre1
 - 0.8.1pre1.
 - Add rpmbuild options for enabling/disabling ALSA, portaudio and/or X

From 51963c18357cd64d27b33c6bc0f42502063d50f2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ville=20Skytt=C3=A4?= <scop@fedoraproject.org>
Date: Tue, 29 Aug 2006 15:58:02 +0000
Subject: [PATCH 020/204] Rebuilt.

---
 needs.rebuild | 1 -
 1 file changed, 1 deletion(-)
 delete mode 100644 needs.rebuild

diff --git a/needs.rebuild b/needs.rebuild
deleted file mode 100644
index 815fd29..0000000
--- a/needs.rebuild
+++ /dev/null
@@ -1 +0,0 @@
-http://fedoraproject.org/wiki/Extras/Schedule/FC6MassRebuild

From 285123d93e7e9966f7829ca46d768c74aeb5dfbf Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ville=20Skytt=C3=A4?= <scop@fedoraproject.org>
Date: Sun, 15 Oct 2006 20:24:14 +0000
Subject: [PATCH 021/204] - 0.8.1pre2, optflags patch no longer needed.

---
 .cvsignore               |  2 +-
 lirc-0.8.0-rpath64.patch | 22 ----------------------
 lirc-optflags.patch      | 18 ------------------
 lirc.spec                | 19 ++++++++++++-------
 sources                  |  2 +-
 5 files changed, 14 insertions(+), 49 deletions(-)
 delete mode 100644 lirc-0.8.0-rpath64.patch
 delete mode 100644 lirc-optflags.patch

diff --git a/.cvsignore b/.cvsignore
index 8d80460..092791f 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1 +1 @@
-lirc-0.8.1pre1.tar.bz2
+lirc-0.8.1pre2.tar.bz2
diff --git a/lirc-0.8.0-rpath64.patch b/lirc-0.8.0-rpath64.patch
deleted file mode 100644
index b0ecfeb..0000000
--- a/lirc-0.8.0-rpath64.patch
+++ /dev/null
@@ -1,22 +0,0 @@
---- lirc-0.8.0/configure~	2006-01-21 11:03:45.000000000 +0200
-+++ lirc-0.8.0/configure	2006-02-14 22:19:00.000000000 +0200
-@@ -4282,7 +4282,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"
- sys_lib_search_path_spec="/lib /usr/lib /usr/local/lib"
- 
- case $host_os in
---- lirc-0.8.0/aclocal.m4~	2006-01-21 11:03:43.000000000 +0200
-+++ lirc-0.8.0/aclocal.m4	2006-02-14 22:19:11.000000000 +0200
-@@ -2531,7 +2531,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"
- sys_lib_search_path_spec="/lib /usr/lib /usr/local/lib"
- 
- case $host_os in
diff --git a/lirc-optflags.patch b/lirc-optflags.patch
deleted file mode 100644
index 0f7707c..0000000
--- a/lirc-optflags.patch
+++ /dev/null
@@ -1,18 +0,0 @@
---- lirc-0.7.2/configure.in.optflags	2005-08-14 17:53:43.000000000 +0300
-+++ lirc-0.7.2/configure.in	2005-08-14 17:54:18.000000000 +0300
-@@ -17,5 +17,5 @@
- AM_CONFIG_HEADER(config.h)
- 
--CFLAGS="-O2 -g -Wall"
-+CFLAGS="$CFLAGS -Wall"
- 
- dnl Checks for programs.
---- lirc-0.7.2/configure.optflags	2005-08-14 17:53:50.000000000 +0300
-+++ lirc-0.7.2/configure	2005-08-14 17:54:07.000000000 +0300
-@@ -1076,5 +1076,5 @@
- 
- 
--CFLAGS="-O2 -g -Wall"
-+CFLAGS="$CFLAGS -Wall"
- 
- # Extract the first word of "gcc", so it can be a program name with args.
diff --git a/lirc.spec b/lirc.spec
index 0469adb..36031bd 100644
--- a/lirc.spec
+++ b/lirc.spec
@@ -1,6 +1,7 @@
 # TODO:
 # - caraca driver (req: caraca, http://caraca.sf.net/)
 # - irman driver (req: libirman, http://lirc.sf.net/software/snapshots/)
+# - iguanaIR driver (req: http://iguanaworks.net/ir/usb/installation.shtml)
 # - move to -devel (?): irw, *mode2, others?
 #   note: xmode2 inflicts a dependency on X, and smode2 on svgalib
 #   - does someone actually need xmode2/smode2 for something?
@@ -15,18 +16,16 @@
 
 Name:           lirc
 Version:        0.8.1
-Release:        0.2.pre1%{?dist}
+Release:        0.2.pre2%{?dist}
 Summary:        The Linux Infrared Remote Control package
 
 Group:          System Environment/Daemons
 License:        GPL
 URL:            http://www.lirc.org/
 #Source0:        http://download.sourceforge.net/lirc/%{name}-%{version}.tar.bz2
-Source0:        http://lirc.sourceforge.net/software/snapshots/%{name}-%{version}pre1.tar.bz2
+Source0:        http://lirc.sourceforge.net/software/snapshots/%{name}-%{version}pre2.tar.bz2
 Source1:        %{name}.init
 Source2:        %{name}.sysconfig
-Patch0:         %{name}-optflags.patch
-Patch1:         %{name}-0.8.0-rpath64.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  %{__perl}
@@ -82,13 +81,16 @@ documentation and a collection of remote control configuration files.
 
 
 %prep
-%setup -q -n %{name}-%{version}pre1
-%patch0 -p1
-%patch1 -p1
+%setup -q -n %{name}-%{version}pre2
 chmod 644 contrib/*
 sed -i -e 's|/usr/local/etc/|/etc/|' contrib/irman2lirc
 sed -i -e 's/\r//' remotes/hercules/lircd.conf.smarttv_stereo
 sed -i -e 's|/sbin/init.d/lircd|%{_initrddir}/lirc|' contrib/lircs
+for f in remotes/chronos/lircd.conf.chronos \
+    remotes/creative/lircd.conf.livedrive remotes/atiusb/lircd.conf.atiusb ; do
+    iconv -f iso-8859-1 -t utf-8 $f > $f.utf8 ; mv $f.utf8 $f
+done
+sed -i -e 's|"/lib /usr/lib |"/%{_lib} %{_libdir} |' configure # lib64 rpath
 # *cough* I wish there was a good way to disable alsa/portaudio/svgalib...
 %if ! %{with alsa}
 sed -i -e 's/asoundlib.h/ALSA_DISABLED/g' configure*
@@ -198,6 +200,9 @@ fi
 
 
 %changelog
+* Sun Oct 15 2006 Ville Skyttä <ville.skytta at iki.fi> - 0.8.1-0.2.pre2
+- 0.8.1pre2, optflags patch no longer needed.
+
 * Mon Aug 28 2006 Ville Skyttä <ville.skytta at iki.fi> - 0.8.1-0.2.pre1
 - Rebuild.
 
diff --git a/sources b/sources
index d1f3d86..6cef89c 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-acb6340078bde9628f5ae848fec0583c  lirc-0.8.1pre1.tar.bz2
+c8c1f5f692222050bcbafbf1ba6a1217  lirc-0.8.1pre2.tar.bz2

From cc59c06e9613c172b0012b9d2790be1981dc3a6e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ville=20Skytt=C3=A4?= <scop@fedoraproject.org>
Date: Thu, 30 Nov 2006 20:52:55 +0000
Subject: [PATCH 022/204] - 0.8.1pre3.

---
 .cvsignore | 2 +-
 lirc.spec  | 9 ++++++---
 sources    | 2 +-
 3 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/.cvsignore b/.cvsignore
index 092791f..31243c4 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1 +1 @@
-lirc-0.8.1pre2.tar.bz2
+lirc-0.8.1pre3.tar.bz2
diff --git a/lirc.spec b/lirc.spec
index 36031bd..c803a36 100644
--- a/lirc.spec
+++ b/lirc.spec
@@ -16,14 +16,14 @@
 
 Name:           lirc
 Version:        0.8.1
-Release:        0.2.pre2%{?dist}
+Release:        0.2.pre3%{?dist}
 Summary:        The Linux Infrared Remote Control package
 
 Group:          System Environment/Daemons
 License:        GPL
 URL:            http://www.lirc.org/
 #Source0:        http://download.sourceforge.net/lirc/%{name}-%{version}.tar.bz2
-Source0:        http://lirc.sourceforge.net/software/snapshots/%{name}-%{version}pre2.tar.bz2
+Source0:        http://lirc.sourceforge.net/software/snapshots/%{name}-%{version}pre3.tar.bz2
 Source1:        %{name}.init
 Source2:        %{name}.sysconfig
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -81,7 +81,7 @@ documentation and a collection of remote control configuration files.
 
 
 %prep
-%setup -q -n %{name}-%{version}pre2
+%setup -q -n %{name}-%{version}pre3
 chmod 644 contrib/*
 sed -i -e 's|/usr/local/etc/|/etc/|' contrib/irman2lirc
 sed -i -e 's/\r//' remotes/hercules/lircd.conf.smarttv_stereo
@@ -200,6 +200,9 @@ fi
 
 
 %changelog
+* Thu Nov 30 2006 Ville Skyttä <ville.skytta at iki.fi> - 0.8.1-0.2.pre3
+- 0.8.1pre3.
+
 * Sun Oct 15 2006 Ville Skyttä <ville.skytta at iki.fi> - 0.8.1-0.2.pre2
 - 0.8.1pre2, optflags patch no longer needed.
 
diff --git a/sources b/sources
index 6cef89c..bc84f4a 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-c8c1f5f692222050bcbafbf1ba6a1217  lirc-0.8.1pre2.tar.bz2
+68ea2f504f45e528ee8b5d3ff23c5181  lirc-0.8.1pre3.tar.bz2

From a42399dcbaa9034ad7aa8a635bff0687a50ba3a2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ville=20Skytt=C3=A4?= <scop@fedoraproject.org>
Date: Tue, 12 Dec 2006 21:28:17 +0000
Subject: [PATCH 023/204] - 0.8.1pre4.

---
 .cvsignore | 2 +-
 lirc.spec  | 9 ++++++---
 sources    | 2 +-
 3 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/.cvsignore b/.cvsignore
index 31243c4..2037b30 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1 +1 @@
-lirc-0.8.1pre3.tar.bz2
+lirc-0.8.1pre4.tar.bz2
diff --git a/lirc.spec b/lirc.spec
index c803a36..5393ec3 100644
--- a/lirc.spec
+++ b/lirc.spec
@@ -16,14 +16,14 @@
 
 Name:           lirc
 Version:        0.8.1
-Release:        0.2.pre3%{?dist}
+Release:        0.2.pre4%{?dist}
 Summary:        The Linux Infrared Remote Control package
 
 Group:          System Environment/Daemons
 License:        GPL
 URL:            http://www.lirc.org/
 #Source0:        http://download.sourceforge.net/lirc/%{name}-%{version}.tar.bz2
-Source0:        http://lirc.sourceforge.net/software/snapshots/%{name}-%{version}pre3.tar.bz2
+Source0:        http://lirc.sourceforge.net/software/snapshots/%{name}-%{version}pre4.tar.bz2
 Source1:        %{name}.init
 Source2:        %{name}.sysconfig
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -81,7 +81,7 @@ documentation and a collection of remote control configuration files.
 
 
 %prep
-%setup -q -n %{name}-%{version}pre3
+%setup -q -n %{name}-%{version}pre4
 chmod 644 contrib/*
 sed -i -e 's|/usr/local/etc/|/etc/|' contrib/irman2lirc
 sed -i -e 's/\r//' remotes/hercules/lircd.conf.smarttv_stereo
@@ -200,6 +200,9 @@ fi
 
 
 %changelog
+* Tue Dec 12 2006 Ville Skyttä <ville.skytta at iki.fi> - 0.8.1-0.2.pre4
+- 0.8.1pre4.
+
 * Thu Nov 30 2006 Ville Skyttä <ville.skytta at iki.fi> - 0.8.1-0.2.pre3
 - 0.8.1pre3.
 
diff --git a/sources b/sources
index bc84f4a..6b3a7da 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-68ea2f504f45e528ee8b5d3ff23c5181  lirc-0.8.1pre3.tar.bz2
+6dc1435946bec20ffbfbd103ddb1e2a0  lirc-0.8.1pre4.tar.bz2

From 203f33574aa958d1b482f2eb98e220228fddccb9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ville=20Skytt=C3=A4?= <scop@fedoraproject.org>
Date: Sat, 30 Dec 2006 13:08:46 +0000
Subject: [PATCH 024/204] - 0.8.1pre5.

---
 .cvsignore | 2 +-
 lirc.spec  | 9 ++++++---
 sources    | 2 +-
 3 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/.cvsignore b/.cvsignore
index 2037b30..d24cec7 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1 +1 @@
-lirc-0.8.1pre4.tar.bz2
+lirc-0.8.1pre5.tar.bz2
diff --git a/lirc.spec b/lirc.spec
index 5393ec3..a83c023 100644
--- a/lirc.spec
+++ b/lirc.spec
@@ -16,14 +16,14 @@
 
 Name:           lirc
 Version:        0.8.1
-Release:        0.2.pre4%{?dist}
+Release:        0.2.pre5%{?dist}
 Summary:        The Linux Infrared Remote Control package
 
 Group:          System Environment/Daemons
 License:        GPL
 URL:            http://www.lirc.org/
 #Source0:        http://download.sourceforge.net/lirc/%{name}-%{version}.tar.bz2
-Source0:        http://lirc.sourceforge.net/software/snapshots/%{name}-%{version}pre4.tar.bz2
+Source0:        http://lirc.sourceforge.net/software/snapshots/%{name}-%{version}pre5.tar.bz2
 Source1:        %{name}.init
 Source2:        %{name}.sysconfig
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -81,7 +81,7 @@ documentation and a collection of remote control configuration files.
 
 
 %prep
-%setup -q -n %{name}-%{version}pre4
+%setup -q -n %{name}-%{version}pre5
 chmod 644 contrib/*
 sed -i -e 's|/usr/local/etc/|/etc/|' contrib/irman2lirc
 sed -i -e 's/\r//' remotes/hercules/lircd.conf.smarttv_stereo
@@ -200,6 +200,9 @@ fi
 
 
 %changelog
+* Sat Dec 30 2006 Ville Skyttä <ville.skytta at iki.fi> - 0.8.1-0.2.pre5
+- 0.8.1pre5.
+
 * Tue Dec 12 2006 Ville Skyttä <ville.skytta at iki.fi> - 0.8.1-0.2.pre4
 - 0.8.1pre4.
 
diff --git a/sources b/sources
index 6b3a7da..9245d01 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-6dc1435946bec20ffbfbd103ddb1e2a0  lirc-0.8.1pre4.tar.bz2
+9a00b010ef4869173c9f8f91257ffe20  lirc-0.8.1pre5.tar.bz2

From 3453c0dd0a041f7b54105a81921c5484e2b82ce4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ville=20Skytt=C3=A4?= <scop@fedoraproject.org>
Date: Sun, 7 Jan 2007 13:58:28 +0000
Subject: [PATCH 025/204] - 0.8.1.

---
 .cvsignore |  2 +-
 lirc.spec  | 10 ++++++----
 sources    |  2 +-
 3 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/.cvsignore b/.cvsignore
index d24cec7..465531d 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1 +1 @@
-lirc-0.8.1pre5.tar.bz2
+lirc-0.8.1.tar.bz2
diff --git a/lirc.spec b/lirc.spec
index a83c023..90b44ee 100644
--- a/lirc.spec
+++ b/lirc.spec
@@ -16,14 +16,13 @@
 
 Name:           lirc
 Version:        0.8.1
-Release:        0.2.pre5%{?dist}
+Release:        1%{?dist}
 Summary:        The Linux Infrared Remote Control package
 
 Group:          System Environment/Daemons
 License:        GPL
 URL:            http://www.lirc.org/
-#Source0:        http://download.sourceforge.net/lirc/%{name}-%{version}.tar.bz2
-Source0:        http://lirc.sourceforge.net/software/snapshots/%{name}-%{version}pre5.tar.bz2
+Source0:        http://downloads.sf.net/lirc/%{name}-%{version}.tar.bz2
 Source1:        %{name}.init
 Source2:        %{name}.sysconfig
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -81,7 +80,7 @@ documentation and a collection of remote control configuration files.
 
 
 %prep
-%setup -q -n %{name}-%{version}pre5
+%setup -q
 chmod 644 contrib/*
 sed -i -e 's|/usr/local/etc/|/etc/|' contrib/irman2lirc
 sed -i -e 's/\r//' remotes/hercules/lircd.conf.smarttv_stereo
@@ -200,6 +199,9 @@ fi
 
 
 %changelog
+* Sun Jan  7 2007 Ville Skyttä <ville.skytta at iki.fi> - 0.8.1-1
+- 0.8.1.
+
 * Sat Dec 30 2006 Ville Skyttä <ville.skytta at iki.fi> - 0.8.1-0.2.pre5
 - 0.8.1pre5.
 
diff --git a/sources b/sources
index 9245d01..3a02b86 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-9a00b010ef4869173c9f8f91257ffe20  lirc-0.8.1pre5.tar.bz2
+3a42083fc6c54797351e52c77537c586  lirc-0.8.1.tar.bz2

From 71d0dcc941290528202b1f13be1adffd2ba12fc2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ville=20Skytt=C3=A4?= <scop@fedoraproject.org>
Date: Fri, 18 May 2007 17:31:52 +0000
Subject: [PATCH 026/204] - 0.8.2pre2.

---
 .cvsignore |  2 +-
 lirc.spec  | 12 ++++++++----
 sources    |  2 +-
 3 files changed, 10 insertions(+), 6 deletions(-)

diff --git a/.cvsignore b/.cvsignore
index 465531d..9966059 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1 +1 @@
-lirc-0.8.1.tar.bz2
+lirc-0.8.2pre2.tar.bz2
diff --git a/lirc.spec b/lirc.spec
index 90b44ee..79d7ba4 100644
--- a/lirc.spec
+++ b/lirc.spec
@@ -15,14 +15,15 @@
 %bcond_without  x
 
 Name:           lirc
-Version:        0.8.1
-Release:        1%{?dist}
+Version:        0.8.2
+Release:        0.1.pre2%{?dist}
 Summary:        The Linux Infrared Remote Control package
 
 Group:          System Environment/Daemons
 License:        GPL
 URL:            http://www.lirc.org/
-Source0:        http://downloads.sf.net/lirc/%{name}-%{version}.tar.bz2
+#Source0:        http://downloads.sourceforge.net/lirc/%{name}-%{version}.tar.bz2
+Source0:        http://lirc.sourceforge.net/software/snapshots/lirc-%{version}pre2.tar.bz2
 Source1:        %{name}.init
 Source2:        %{name}.sysconfig
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -80,7 +81,7 @@ documentation and a collection of remote control configuration files.
 
 
 %prep
-%setup -q
+%setup -q -n %{name}-%{version}pre2
 chmod 644 contrib/*
 sed -i -e 's|/usr/local/etc/|/etc/|' contrib/irman2lirc
 sed -i -e 's/\r//' remotes/hercules/lircd.conf.smarttv_stereo
@@ -199,6 +200,9 @@ fi
 
 
 %changelog
+* Fri May 18 2007 Ville Skyttä <ville.skytta at iki.fi> - 0.8.2-0.1.pre2
+- 0.8.2pre2.
+
 * Sun Jan  7 2007 Ville Skyttä <ville.skytta at iki.fi> - 0.8.1-1
 - 0.8.1.
 
diff --git a/sources b/sources
index 3a02b86..9a5ffd7 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-3a42083fc6c54797351e52c77537c586  lirc-0.8.1.tar.bz2
+574d09ccea8162cacac7fd1be4331860  lirc-0.8.2pre2.tar.bz2

From cd4f79636f73639f8f8f452b587cda64931d387c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ville=20Skytt=C3=A4?= <scop@fedoraproject.org>
Date: Wed, 6 Jun 2007 16:00:34 +0000
Subject: [PATCH 027/204] - 0.8.2pre3. - Fix up linefeeds and char encodings of
 more docs.

---
 .cvsignore |  2 +-
 lirc.spec  | 16 +++++++++++-----
 sources    |  2 +-
 3 files changed, 13 insertions(+), 7 deletions(-)

diff --git a/.cvsignore b/.cvsignore
index 9966059..ed32c97 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1 +1 @@
-lirc-0.8.2pre2.tar.bz2
+lirc-0.8.2pre3.tar.bz2
diff --git a/lirc.spec b/lirc.spec
index 79d7ba4..ec8e96a 100644
--- a/lirc.spec
+++ b/lirc.spec
@@ -16,14 +16,14 @@
 
 Name:           lirc
 Version:        0.8.2
-Release:        0.1.pre2%{?dist}
+Release:        0.1.pre3%{?dist}
 Summary:        The Linux Infrared Remote Control package
 
 Group:          System Environment/Daemons
 License:        GPL
 URL:            http://www.lirc.org/
 #Source0:        http://downloads.sourceforge.net/lirc/%{name}-%{version}.tar.bz2
-Source0:        http://lirc.sourceforge.net/software/snapshots/lirc-%{version}pre2.tar.bz2
+Source0:        http://lirc.sourceforge.net/software/snapshots/lirc-%{version}pre3.tar.bz2
 Source1:        %{name}.init
 Source2:        %{name}.sysconfig
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -81,13 +81,15 @@ documentation and a collection of remote control configuration files.
 
 
 %prep
-%setup -q -n %{name}-%{version}pre2
+%setup -q -n %{name}-%{version}pre3
 chmod 644 contrib/*
 sed -i -e 's|/usr/local/etc/|/etc/|' contrib/irman2lirc
-sed -i -e 's/\r//' remotes/hercules/lircd.conf.smarttv_stereo
+sed -i -e 's/\r//' remotes/hercules/lircd.conf.smarttv_stereo \
+    remotes/adstech/lircd.conf.usbx-707
 sed -i -e 's|/sbin/init.d/lircd|%{_initrddir}/lirc|' contrib/lircs
 for f in remotes/chronos/lircd.conf.chronos \
-    remotes/creative/lircd.conf.livedrive remotes/atiusb/lircd.conf.atiusb ; do
+    remotes/creative/lircd.conf.livedrive remotes/atiusb/lircd.conf.atiusb \
+    NEWS ChangeLog AUTHORS contrib/lircrc ; do
     iconv -f iso-8859-1 -t utf-8 $f > $f.utf8 ; mv $f.utf8 $f
 done
 sed -i -e 's|"/lib /usr/lib |"/%{_lib} %{_libdir} |' configure # lib64 rpath
@@ -200,6 +202,10 @@ fi
 
 
 %changelog
+* Wed Jun  6 2007 Ville Skyttä <ville.skytta at iki.fi> - 0.8.2-0.1.pre3
+- 0.8.2pre3.
+- Fix up linefeeds and char encodings of more docs.
+
 * Fri May 18 2007 Ville Skyttä <ville.skytta at iki.fi> - 0.8.2-0.1.pre2
 - 0.8.2pre2.
 
diff --git a/sources b/sources
index 9a5ffd7..e13d44b 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-574d09ccea8162cacac7fd1be4331860  lirc-0.8.2pre2.tar.bz2
+a9f5586cb95a17d175990510ccc39566  lirc-0.8.2pre3.tar.bz2

From 3c80c36b39e9b6d8782e4523979e8e1889795768 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ville=20Skytt=C3=A4?= <scop@fedoraproject.org>
Date: Sun, 10 Jun 2007 08:28:44 +0000
Subject: [PATCH 028/204] - 0.8.2.

---
 .cvsignore |  2 +-
 lirc.spec  | 15 ++++++++++-----
 sources    |  2 +-
 3 files changed, 12 insertions(+), 7 deletions(-)

diff --git a/.cvsignore b/.cvsignore
index ed32c97..b0e86d8 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1 +1 @@
-lirc-0.8.2pre3.tar.bz2
+lirc-0.8.2.tar.bz2
diff --git a/lirc.spec b/lirc.spec
index ec8e96a..ef07112 100644
--- a/lirc.spec
+++ b/lirc.spec
@@ -16,14 +16,13 @@
 
 Name:           lirc
 Version:        0.8.2
-Release:        0.1.pre3%{?dist}
+Release:        1%{?dist}
 Summary:        The Linux Infrared Remote Control package
 
 Group:          System Environment/Daemons
 License:        GPL
 URL:            http://www.lirc.org/
-#Source0:        http://downloads.sourceforge.net/lirc/%{name}-%{version}.tar.bz2
-Source0:        http://lirc.sourceforge.net/software/snapshots/lirc-%{version}pre3.tar.bz2
+Source0:        http://downloads.sourceforge.net/lirc/%{name}-%{version}.tar.bz2
 Source1:        %{name}.init
 Source2:        %{name}.sysconfig
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -81,7 +80,7 @@ documentation and a collection of remote control configuration files.
 
 
 %prep
-%setup -q -n %{name}-%{version}pre3
+%setup -q
 chmod 644 contrib/*
 sed -i -e 's|/usr/local/etc/|/etc/|' contrib/irman2lirc
 sed -i -e 's/\r//' remotes/hercules/lircd.conf.smarttv_stereo \
@@ -132,6 +131,8 @@ rm -f $RPM_BUILD_ROOT%{_mandir}/man1/irxevent.1*
 rm -f $RPM_BUILD_ROOT%{_mandir}/man1/xmode2.1*
 %endif
 
+install -Dpm 644 doc/lirc.hwdb $RPM_BUILD_ROOT%{_datadir}/lirc/lirc.hwdb
+
 install -Dpm 755 %{SOURCE1} $RPM_BUILD_ROOT%{_initrddir}/lirc
 %{__perl} -pi -e \
   's|/etc/|%{_sysconfdir}/|g ;
@@ -143,7 +144,7 @@ install -Dpm 644 %{SOURCE2} $RPM_BUILD_ROOT%{_sysconfdir}/sysconfig/lirc
 mkdir __docs
 cp -pR doc contrib __docs
 cd __docs
-rm -rf doc/Makefile* doc/.libs doc/man*
+rm -rf doc/Makefile* doc/.libs doc/man* doc/lirc.hwdb
 rm -rf contrib/irman2lirc contrib/lirc.* contrib/sendxevent.c
 cd ..
 
@@ -186,6 +187,7 @@ fi
 %{_bindir}/*mode2
 %{_sbindir}/lirc*d
 %{_libdir}/liblirc_client.so.*
+%{_datadir}/lirc/
 %{_mandir}/man1/*ir*.1*
 %{_mandir}/man1/*mode2*.1*
 %{_mandir}/man8/lirc*d.8*
@@ -202,6 +204,9 @@ fi
 
 
 %changelog
+* Sun Jun 10 2007 Ville Skyttä <ville.skytta at iki.fi> - 0.8.2-1
+- 0.8.2.
+
 * Wed Jun  6 2007 Ville Skyttä <ville.skytta at iki.fi> - 0.8.2-0.1.pre3
 - 0.8.2pre3.
 - Fix up linefeeds and char encodings of more docs.
diff --git a/sources b/sources
index e13d44b..20b9996 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-a9f5586cb95a17d175990510ccc39566  lirc-0.8.2pre3.tar.bz2
+83e7060a6693b81075c178d7e3b215af  lirc-0.8.2.tar.bz2

From 61175736b593e05f30bae18e00d74ec6b2aad99e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ville=20Skytt=C3=A4?= <scop@fedoraproject.org>
Date: Thu, 16 Aug 2007 09:16:35 +0000
Subject: [PATCH 029/204] - License: GPLv2+

---
 lirc.init | 8 ++++++++
 lirc.spec | 8 ++++++--
 2 files changed, 14 insertions(+), 2 deletions(-)

diff --git a/lirc.init b/lirc.init
index 8062616..4946651 100644
--- a/lirc.init
+++ b/lirc.init
@@ -10,6 +10,14 @@
 # config:      /etc/lircmd.conf
 # pidfile:     /var/run/lircd.pid
 
+### BEGIN INIT INFO
+# Provides: lirc
+# Should-Start: $syslog $network
+# Should-Stop: $syslog $network
+# Short-Description: Linux Infrared Remote Control daemon
+# Description: Enables remote control devices through LIRC.
+### END INIT INFO
+
 # Source function library.
 . /etc/init.d/functions
 
diff --git a/lirc.spec b/lirc.spec
index ef07112..8c6ab45 100644
--- a/lirc.spec
+++ b/lirc.spec
@@ -2,6 +2,7 @@
 # - caraca driver (req: caraca, http://caraca.sf.net/)
 # - irman driver (req: libirman, http://lirc.sf.net/software/snapshots/)
 # - iguanaIR driver (req: http://iguanaworks.net/ir/usb/installation.shtml)
+#   -> would cause license change to "GPLv2"
 # - move to -devel (?): irw, *mode2, others?
 #   note: xmode2 inflicts a dependency on X, and smode2 on svgalib
 #   - does someone actually need xmode2/smode2 for something?
@@ -16,11 +17,11 @@
 
 Name:           lirc
 Version:        0.8.2
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        The Linux Infrared Remote Control package
 
 Group:          System Environment/Daemons
-License:        GPL
+License:        GPLv2+
 URL:            http://www.lirc.org/
 Source0:        http://downloads.sourceforge.net/lirc/%{name}-%{version}.tar.bz2
 Source1:        %{name}.init
@@ -204,6 +205,9 @@ fi
 
 
 %changelog
+* Wed Aug 15 2007 Ville Skyttä <ville.skytta at iki.fi> - 0.8.2-2
+- License: GPLv2+
+
 * Sun Jun 10 2007 Ville Skyttä <ville.skytta at iki.fi> - 0.8.2-1
 - 0.8.2.
 

From 1cf3fcfdf880913ae1472c74084184bab5ea2a70 Mon Sep 17 00:00:00 2001
From: Jarod Wilson <jwilson@fedoraproject.org>
Date: Thu, 18 Oct 2007 20:55:01 +0000
Subject: [PATCH 030/204] - 0.8.3pre1 - adds Mac IR support, resolves bz
 #284291

---
 .cvsignore |  1 +
 lirc.spec  | 14 ++++++++++----
 sources    |  2 +-
 3 files changed, 12 insertions(+), 5 deletions(-)

diff --git a/.cvsignore b/.cvsignore
index b0e86d8..f7ef0a8 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1 +1,2 @@
 lirc-0.8.2.tar.bz2
+lirc-0.8.3pre1.tar.bz2
diff --git a/lirc.spec b/lirc.spec
index 8c6ab45..f8f6184 100644
--- a/lirc.spec
+++ b/lirc.spec
@@ -14,16 +14,18 @@
 %bcond_with     portaudio
 %bcond_with     svgalib
 %bcond_without  x
+%define pre pre1
 
 Name:           lirc
-Version:        0.8.2
-Release:        2%{?dist}
+Version:        0.8.3
+Release:        0.1.%{?pre}%{?dist}
 Summary:        The Linux Infrared Remote Control package
 
 Group:          System Environment/Daemons
 License:        GPLv2+
 URL:            http://www.lirc.org/
-Source0:        http://downloads.sourceforge.net/lirc/%{name}-%{version}.tar.bz2
+#Source0:        http://downloads.sourceforge.net/lirc/%{name}-%{version}.tar.bz2
+Source0:        http://lirc.sourceforge.net/software/snapshots/%{name}-%{version}%{pre}.tar.bz2
 Source1:        %{name}.init
 Source2:        %{name}.sysconfig
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -81,7 +83,7 @@ documentation and a collection of remote control configuration files.
 
 
 %prep
-%setup -q
+%setup -q -n %{name}-%{version}%{?pre}
 chmod 644 contrib/*
 sed -i -e 's|/usr/local/etc/|/etc/|' contrib/irman2lirc
 sed -i -e 's/\r//' remotes/hercules/lircd.conf.smarttv_stereo \
@@ -205,6 +207,10 @@ fi
 
 
 %changelog
+* Thu Oct 18 2007 Jarod Wilson <jwilson@redhat.com> - 0.8.3-0.1.pre1
+- 0.8.3pre1
+- adds Mac IR support, resolves bz #284291
+
 * Wed Aug 15 2007 Ville Skyttä <ville.skytta at iki.fi> - 0.8.2-2
 - License: GPLv2+
 
diff --git a/sources b/sources
index 20b9996..2df78fb 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-83e7060a6693b81075c178d7e3b215af  lirc-0.8.2.tar.bz2
+1fe9ab0a8e4fe2113040f6c576e51759  lirc-0.8.3pre1.tar.bz2

From e6acbb565a793cb0de650bfce064fb9ab63c2739 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ville=20Skytt=C3=A4?= <scop@fedoraproject.org>
Date: Thu, 14 Feb 2008 18:58:02 +0000
Subject: [PATCH 031/204] - Split libraries into -libs subpackage. - Refresh
 autotools re-run avoidance hack.

---
 lirc.spec | 46 ++++++++++++++++++++++++++++++++++++++--------
 1 file changed, 38 insertions(+), 8 deletions(-)

diff --git a/lirc.spec b/lirc.spec
index f8f6184..7dab4a2 100644
--- a/lirc.spec
+++ b/lirc.spec
@@ -6,7 +6,7 @@
 # - move to -devel (?): irw, *mode2, others?
 #   note: xmode2 inflicts a dependency on X, and smode2 on svgalib
 #   - does someone actually need xmode2/smode2 for something?
-# - split into -libs and -utils (daemons in main package)?
+# - split utils into subpackage (keep daemons in main package)
 # - don't run as root and/or create dedicated group, reduce fifo permissions?
 # - Fixup /etc/lirc(m)d.conf %%ghost'ification, existence after erase etc.
 
@@ -14,11 +14,11 @@
 %bcond_with     portaudio
 %bcond_with     svgalib
 %bcond_without  x
-%define pre pre1
+%define pre     pre1
 
 Name:           lirc
 Version:        0.8.3
-Release:        0.1.%{?pre}%{?dist}
+Release:        0.2%{?pre:.%{pre}}%{?dist}
 Summary:        The Linux Infrared Remote Control package
 
 Group:          System Environment/Daemons
@@ -44,6 +44,7 @@ BuildRequires:  svgalib-devel
 %if %{with x}
 BuildRequires:  libXt-devel
 %endif
+Requires:       %{name}-libs = %{version}-%{release}
 Requires(post): /sbin/chkconfig
 Requires(post): /sbin/ldconfig
 Requires(preun): /sbin/chkconfig
@@ -56,10 +57,22 @@ Included applications include daemons which decode the received
 signals as well as user space applications which allow controlling a
 computer with a remote control.
 
+%package        libs
+Summary:        LIRC libraries
+Group:          System Environment/Libraries
+
+%description    libs
+LIRC is a package that allows you to decode and send infra-red and
+other signals of many (but not all) commonly used remote controls.
+Included applications include daemons which decode the received
+signals as well as user space applications which allow controlling a
+computer with a remote control.  This package includes shared libraries
+that applications use to interface with LIRC.
+
 %package        devel
 Summary:        Development files for LIRC
 Group:          Development/Libraries
-Requires:       %{name} = %{version}-%{release}
+Requires:       %{name}-libs = %{version}-%{release}
 
 %description    devel
 LIRC is a package that allows you to decode and send infra-red and
@@ -84,17 +97,24 @@ documentation and a collection of remote control configuration files.
 
 %prep
 %setup -q -n %{name}-%{version}%{?pre}
+
 chmod 644 contrib/*
+
 sed -i -e 's|/usr/local/etc/|/etc/|' contrib/irman2lirc
+
 sed -i -e 's/\r//' remotes/hercules/lircd.conf.smarttv_stereo \
     remotes/adstech/lircd.conf.usbx-707
+
 sed -i -e 's|/sbin/init.d/lircd|%{_initrddir}/lirc|' contrib/lircs
+
 for f in remotes/chronos/lircd.conf.chronos \
     remotes/creative/lircd.conf.livedrive remotes/atiusb/lircd.conf.atiusb \
     NEWS ChangeLog AUTHORS contrib/lircrc ; do
     iconv -f iso-8859-1 -t utf-8 $f > $f.utf8 ; mv $f.utf8 $f
 done
+
 sed -i -e 's|"/lib /usr/lib |"/%{_lib} %{_libdir} |' configure # lib64 rpath
+
 # *cough* I wish there was a good way to disable alsa/portaudio/svgalib...
 %if ! %{with alsa}
 sed -i -e 's/asoundlib.h/ALSA_DISABLED/g' configure*
@@ -105,7 +125,8 @@ sed -i -e 's/portaudio.h/PORTAUDIO_DISABLED/g' configure*
 %if ! %{with svgalib}
 sed -i -e 's/vga.h/SVGALIB_DISABLED/g' configure*
 %endif
-touch -r acconfig.h aclocal.m4 configure.in # avoid autofoo re-run
+
+touch -r acconfig.h aclocal.m4 configure.ac # avoid autofoo re-run
 
 
 %build
@@ -164,9 +185,10 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %post
-/sbin/ldconfig
 /sbin/chkconfig --add lirc
 
+%post libs -p /sbin/ldconfig
+
 %preun
 if [ $1 -eq 0 ] ; then
   %{_initrddir}/lirc stop >/dev/null || :
@@ -174,11 +196,12 @@ if [ $1 -eq 0 ] ; then
 fi
 
 %postun
-/sbin/ldconfig
 if [ $1 -gt 0 ] ; then
   %{_initrddir}/lirc try-restart >/dev/null || :
 fi
 
+%postun libs -p /sbin/ldconfig
+
 
 %files
 %defattr(-,root,root,-)
@@ -189,13 +212,16 @@ fi
 %{_bindir}/*ir*
 %{_bindir}/*mode2
 %{_sbindir}/lirc*d
-%{_libdir}/liblirc_client.so.*
 %{_datadir}/lirc/
 %{_mandir}/man1/*ir*.1*
 %{_mandir}/man1/*mode2*.1*
 %{_mandir}/man8/lirc*d.8*
 %ghost /dev/lirc*
 
+%files libs
+%defattr(-,root,root,-)
+%{_libdir}/liblirc_client.so.*
+
 %files devel
 %defattr(-,root,root,-)
 %{_includedir}/lirc/
@@ -207,6 +233,10 @@ fi
 
 
 %changelog
+* Tue Feb 12 2008 Ville Skyttä <ville.skytta at iki.fi> - 0.8.3-0.2.pre1
+- Split libraries into -libs subpackage.
+- Refresh autotools re-run avoidance hack.
+
 * Thu Oct 18 2007 Jarod Wilson <jwilson@redhat.com> - 0.8.3-0.1.pre1
 - 0.8.3pre1
 - adds Mac IR support, resolves bz #284291

From 4ffbb7aadfebf93ca4424e3fac5471499b93a85d Mon Sep 17 00:00:00 2001
From: Jarod Wilson <jwilson@fedoraproject.org>
Date: Mon, 7 Apr 2008 00:29:02 +0000
Subject: [PATCH 032/204] - Update to 0.8.3pre2

---
 .cvsignore | 1 +
 lirc.spec  | 9 ++++++---
 sources    | 2 +-
 3 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/.cvsignore b/.cvsignore
index f7ef0a8..41e0381 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1,2 +1,3 @@
 lirc-0.8.2.tar.bz2
 lirc-0.8.3pre1.tar.bz2
+lirc-0.8.3pre2.tar.bz2
diff --git a/lirc.spec b/lirc.spec
index 7dab4a2..563a75f 100644
--- a/lirc.spec
+++ b/lirc.spec
@@ -14,11 +14,11 @@
 %bcond_with     portaudio
 %bcond_with     svgalib
 %bcond_without  x
-%define pre     pre1
+%define pre     pre2
 
 Name:           lirc
 Version:        0.8.3
-Release:        0.2%{?pre:.%{pre}}%{?dist}
+Release:        0.3%{?pre:.%{pre}}%{?dist}
 Summary:        The Linux Infrared Remote Control package
 
 Group:          System Environment/Daemons
@@ -126,7 +126,7 @@ sed -i -e 's/portaudio.h/PORTAUDIO_DISABLED/g' configure*
 sed -i -e 's/vga.h/SVGALIB_DISABLED/g' configure*
 %endif
 
-touch -r acconfig.h aclocal.m4 configure.ac # avoid autofoo re-run
+touch -r aclocal.m4 configure.ac # avoid autofoo re-run
 
 
 %build
@@ -233,6 +233,9 @@ fi
 
 
 %changelog
+* Sun Apr 06 2008 Jarod Wilson <jwilson@redhat.com> - 0.8.3-0.3.pre2
+- Update to 0.8.3pre2
+
 * Tue Feb 12 2008 Ville Skyttä <ville.skytta at iki.fi> - 0.8.3-0.2.pre1
 - Split libraries into -libs subpackage.
 - Refresh autotools re-run avoidance hack.
diff --git a/sources b/sources
index 2df78fb..c973c13 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-1fe9ab0a8e4fe2113040f6c576e51759  lirc-0.8.3pre1.tar.bz2
+4152aeaa826e066ae7c37bdf5059e537  lirc-0.8.3pre2.tar.bz2

From 075a07873759177077f4412a99cd1f5247729c2c Mon Sep 17 00:00:00 2001
From: Jarod Wilson <jwilson@fedoraproject.org>
Date: Sun, 27 Apr 2008 17:29:33 +0000
Subject: [PATCH 033/204] - Update to 0.8.3pre3

---
 lirc.spec | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/lirc.spec b/lirc.spec
index 563a75f..4b897bb 100644
--- a/lirc.spec
+++ b/lirc.spec
@@ -14,11 +14,11 @@
 %bcond_with     portaudio
 %bcond_with     svgalib
 %bcond_without  x
-%define pre     pre2
+%define pre     pre3
 
 Name:           lirc
 Version:        0.8.3
-Release:        0.3%{?pre:.%{pre}}%{?dist}
+Release:        0.4%{?pre:.%{pre}}%{?dist}
 Summary:        The Linux Infrared Remote Control package
 
 Group:          System Environment/Daemons
@@ -233,6 +233,9 @@ fi
 
 
 %changelog
+* Sun Apr 27 2008 Jarod Wilson <jwilson@redhat.com> - 0.8.3-0.4.pre3
+- Update to 0.8.3pre3
+
 * Sun Apr 06 2008 Jarod Wilson <jwilson@redhat.com> - 0.8.3-0.3.pre2
 - Update to 0.8.3pre2
 

From 211d95e4b40642e4fcbaad4fc081b0dae85e4c04 Mon Sep 17 00:00:00 2001
From: Jarod Wilson <jwilson@fedoraproject.org>
Date: Sun, 27 Apr 2008 17:32:45 +0000
Subject: [PATCH 034/204] Oops, update sources..

---
 .cvsignore | 1 +
 sources    | 1 +
 2 files changed, 2 insertions(+)

diff --git a/.cvsignore b/.cvsignore
index 41e0381..b6d94f4 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1,3 +1,4 @@
 lirc-0.8.2.tar.bz2
 lirc-0.8.3pre1.tar.bz2
 lirc-0.8.3pre2.tar.bz2
+lirc-0.8.3pre3.tar.bz2
diff --git a/sources b/sources
index c973c13..cc8abba 100644
--- a/sources
+++ b/sources
@@ -1 +1,2 @@
 4152aeaa826e066ae7c37bdf5059e537  lirc-0.8.3pre2.tar.bz2
+516b00fc3f5b11b791ae345fbd7ea754  lirc-0.8.3pre3.tar.bz2

From c3203b814745593eb784e7d5bcaf875fe46f9e0d Mon Sep 17 00:00:00 2001
From: Jarod Wilson <jwilson@fedoraproject.org>
Date: Sun, 4 May 2008 18:08:35 +0000
Subject: [PATCH 035/204] - Update to 0.8.3 release

---
 .cvsignore |  5 +----
 lirc.spec  | 11 +++++++----
 sources    |  3 +--
 3 files changed, 9 insertions(+), 10 deletions(-)

diff --git a/.cvsignore b/.cvsignore
index b6d94f4..b567347 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1,4 +1 @@
-lirc-0.8.2.tar.bz2
-lirc-0.8.3pre1.tar.bz2
-lirc-0.8.3pre2.tar.bz2
-lirc-0.8.3pre3.tar.bz2
+lirc-0.8.3.tar.bz2
diff --git a/lirc.spec b/lirc.spec
index 4b897bb..59054b2 100644
--- a/lirc.spec
+++ b/lirc.spec
@@ -14,18 +14,18 @@
 %bcond_with     portaudio
 %bcond_with     svgalib
 %bcond_without  x
-%define pre     pre3
+#define pre     pre3
 
 Name:           lirc
 Version:        0.8.3
-Release:        0.4%{?pre:.%{pre}}%{?dist}
+Release:        1%{?pre:.%{pre}}%{?dist}
 Summary:        The Linux Infrared Remote Control package
 
 Group:          System Environment/Daemons
 License:        GPLv2+
 URL:            http://www.lirc.org/
-#Source0:        http://downloads.sourceforge.net/lirc/%{name}-%{version}.tar.bz2
-Source0:        http://lirc.sourceforge.net/software/snapshots/%{name}-%{version}%{pre}.tar.bz2
+Source0:        http://downloads.sourceforge.net/lirc/%{name}-%{version}.tar.bz2
+#Source0:        http://lirc.sourceforge.net/software/snapshots/%{name}-%{version}%{pre}.tar.bz2
 Source1:        %{name}.init
 Source2:        %{name}.sysconfig
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -233,6 +233,9 @@ fi
 
 
 %changelog
+* Sun May 04 2008 Jarod Wilson <jwilson@redhat.com> - 0.8.3-1
+- Update to 0.8.3 release
+
 * Sun Apr 27 2008 Jarod Wilson <jwilson@redhat.com> - 0.8.3-0.4.pre3
 - Update to 0.8.3pre3
 
diff --git a/sources b/sources
index cc8abba..d3ad5e4 100644
--- a/sources
+++ b/sources
@@ -1,2 +1 @@
-4152aeaa826e066ae7c37bdf5059e537  lirc-0.8.3pre2.tar.bz2
-516b00fc3f5b11b791ae345fbd7ea754  lirc-0.8.3pre3.tar.bz2
+8e78eeded7b31e5ad02e328970437c0f  lirc-0.8.3.tar.bz2

From a7224d291362f351617179a38343081910c53a98 Mon Sep 17 00:00:00 2001
From: Jarod Wilson <jwilson@fedoraproject.org>
Date: Mon, 12 May 2008 22:13:46 +0000
Subject: [PATCH 036/204] - Include upstream patch for lircd.conf remote
 include directives (#442248) - Include upstream patch to validate transmit
 buffers

---
 lirc.spec | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/lirc.spec b/lirc.spec
index 59054b2..6b9fa4e 100644
--- a/lirc.spec
+++ b/lirc.spec
@@ -18,7 +18,7 @@
 
 Name:           lirc
 Version:        0.8.3
-Release:        1%{?pre:.%{pre}}%{?dist}
+Release:        2%{?pre:.%{pre}}%{?dist}
 Summary:        The Linux Infrared Remote Control package
 
 Group:          System Environment/Daemons
@@ -28,6 +28,8 @@ Source0:        http://downloads.sourceforge.net/lirc/%{name}-%{version}.tar.bz2
 #Source0:        http://lirc.sourceforge.net/software/snapshots/%{name}-%{version}%{pre}.tar.bz2
 Source1:        %{name}.init
 Source2:        %{name}.sysconfig
+Patch0:         lirc-0.8.3-remote-includes-directive.patch
+Patch1:         lirc-0.8.3-validate-transmit-buffer.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  %{__perl}
@@ -97,6 +99,8 @@ documentation and a collection of remote control configuration files.
 
 %prep
 %setup -q -n %{name}-%{version}%{?pre}
+%patch0 -p1 -b .incl
+%patch1 -p1 -b .xbuf
 
 chmod 644 contrib/*
 
@@ -233,6 +237,10 @@ fi
 
 
 %changelog
+* Mon May 12 2008 Jarod Wilson <jwilson@redhat.com> - 0.8.3-2
+- Include upstream patch for lircd.conf remote include directives (#442248)
+- Include upstream patch to validate transmit buffers
+
 * Sun May 04 2008 Jarod Wilson <jwilson@redhat.com> - 0.8.3-1
 - Update to 0.8.3 release
 

From 2968a4b0aac4be17885b5107c2b3d2b8270224b8 Mon Sep 17 00:00:00 2001
From: Jarod Wilson <jwilson@fedoraproject.org>
Date: Mon, 12 May 2008 22:15:58 +0000
Subject: [PATCH 037/204] Helps to cvs add the patches...

---
 lirc-0.8.3-remote-includes-directive.patch | 341 +++++++++++++++++++++
 lirc-0.8.3-validate-transmit-buffer.patch  |  58 ++++
 2 files changed, 399 insertions(+)
 create mode 100644 lirc-0.8.3-remote-includes-directive.patch
 create mode 100644 lirc-0.8.3-validate-transmit-buffer.patch

diff --git a/lirc-0.8.3-remote-includes-directive.patch b/lirc-0.8.3-remote-includes-directive.patch
new file mode 100644
index 0000000..988ecec
--- /dev/null
+++ b/lirc-0.8.3-remote-includes-directive.patch
@@ -0,0 +1,341 @@
+diff -Naurp lirc-0.8.3.orig/daemons/config_file.c lirc-0.8.3/daemons/config_file.c
+--- lirc-0.8.3.orig/daemons/config_file.c	2007-07-29 14:20:06.000000000 -0400
++++ lirc-0.8.3/daemons/config_file.c	2008-05-12 18:02:32.000000000 -0400
+@@ -1,4 +1,4 @@
+-/*      $Id: config_file.c,v 5.27 2007/07/29 18:20:06 lirc Exp $      */
++/*      $Id: config_file.c,v 5.28 2008/05/09 18:40:59 lirc Exp $      */
+ 
+ /****************************************************************************
+  ** config_file.c ***********************************************************
+@@ -20,6 +20,7 @@
+ #include <stdio.h>
+ #include <stdlib.h>
+ #include <string.h>
++#include <libgen.h>
+ #include <sys/socket.h>
+ #include <sys/un.h>
+ #include <sys/stat.h>
+@@ -32,9 +33,14 @@
+ #include "config_file.h"
+ 
+ #define LINE_LEN 1024
++#define MAX_INCLUDES 10
+ 
+-int line;
+-int parse_error;
++const char *whitespace = " \t";
++
++static int line;
++static int parse_error;
++
++static struct ir_remote * read_config_recursive(FILE *f, const char *name, int depth);
+ 
+ void **init_void_array(struct void_array *ar,size_t chunk_size, size_t item_size)
+ {
+@@ -643,7 +649,84 @@ struct ir_remote *sort_by_bit_count(stru
+ 	return top;
+ }
+ 
+-struct ir_remote * read_config(FILE *f)
++static const char *lirc_parse_include(char *s)
++{
++	char *last;
++	size_t len;
++	
++	len=strlen(s);
++	if(len<2)
++	{
++		return NULL;
++	}
++	last = s+len-1;
++	while(last >  s && strchr(whitespace, *last) != NULL)
++	{
++		last--;
++	}
++	if(last <= s)
++	{
++		return NULL;
++	}
++	if(*s!='"' && *s!='<')
++	{
++		return NULL;
++	}
++	if(*s=='"' && *last!='"')
++	{
++		return NULL;
++	}
++	else if(*s=='<' && *last!='>')
++	{
++		return NULL;
++	}
++	*last = 0;
++	memmove(s, s+1, len-2+1); /* terminating 0 is copied, and
++				     maybe more, but we don't care */
++	return s;
++}
++
++static const char *lirc_parse_relative(char *dst, size_t dst_size,
++				 const char *child, const char *current)
++{
++	char *dir;
++	size_t dirlen;
++
++	if (!current)
++		return child;
++
++	/* Not a relative path */
++	if (*child == '/')
++		return child;
++
++	if(strlen(current) >= dst_size)
++	{
++		return NULL;
++	}
++	strcpy(dst, current);
++	dir = dirname(dst);
++	dirlen = strlen(dir);
++	if(dir != dst)
++	{
++		memmove(dst, dir, dirlen + 1);
++	}
++
++	if(dirlen + 1 + strlen(child) + 1 > dst_size)
++	{
++		return NULL;
++	}
++	strcat(dst, "/");
++	strcat(dst, child);
++	
++	return dst;
++}
++
++struct ir_remote * read_config(FILE *f, const char *name)
++{
++	return read_config_recursive(f, name, 0);
++}
++
++static struct ir_remote * read_config_recursive(FILE *f, const char *name, int depth)
+ {
+ 	char buf[LINE_LEN+1], *key, *val, *val2;
+         int len,argc;
+@@ -656,6 +739,7 @@ struct ir_remote * read_config(FILE *f)
+ 
+ 	line=0;
+ 	parse_error=0;
++	LOGPRINTF(2, "parsing '%s'", name);
+ 
+ 	while(fgets(buf,LINE_LEN,f)!=NULL)
+ 	{
+@@ -683,14 +767,74 @@ struct ir_remote * read_config(FILE *f)
+                 if(buf[0]=='#'){
+ 			continue;
+                 }
+-		key=strtok(buf," \t");
++		key=strtok(buf, whitespace);
+ 		/* ignore empty lines */
+ 		if(key==NULL) continue;
+-		val=strtok(NULL, " \t");
++		val=strtok(NULL, whitespace);
+ 		if(val!=NULL){
+-			val2=strtok(NULL, " \t");
++			val2=strtok(NULL, whitespace);
+ 			LOGPRINTF(3,"\"%s\" \"%s\"",key,val);
+-                        if (strcasecmp("begin",key)==0){
++			if (strcasecmp("include",key)==0){
++                                FILE* childFile;
++				const char *childName;
++				const char *fullPath;
++				char result[FILENAME_MAX+1];
++
++
++				if (depth > MAX_INCLUDES) {
++					logprintf(LOG_ERR,"error opening child file defined at %s:%d",name,line);
++					logprintf(LOG_ERR,"too many files included");
++					parse_error=-1;
++					break;
++				}
++
++				childName = lirc_parse_include(val);
++				if (!childName){
++					logprintf(LOG_ERR,"error parsing child file value defined at line %d:",line);
++					logprintf(LOG_ERR,"invalid quoting");
++					parse_error=-1;
++					break;
++				}
++
++				fullPath = lirc_parse_relative(result, sizeof(result), childName, name);
++				if (!fullPath) {
++					logprintf(LOG_ERR,"error composing relative file path defined at line %d:",line);
++					logprintf(LOG_ERR,"resulting path too long");
++					parse_error=-1;
++					break;
++				}
++
++				childFile = fopen(fullPath, "r");
++				if (childFile == NULL){
++					logprintf(LOG_ERR,"error opening child file '%s' defined at line %d:",fullPath, line);
++					logprintf(LOG_ERR,"ignoring this child file for now.");
++				}
++				else{
++					int save_line = line;
++					
++					if (!top_rem){
++						/* create first remote */
++						LOGPRINTF(2,"creating first remote");
++						rem = read_config_recursive(childFile, fullPath, depth + 1);
++						if(rem != (void *) -1 && rem != NULL) {
++							top_rem = rem;
++						} else {
++							rem = NULL;
++						}
++					}else{
++						/* create new remote */
++						LOGPRINTF(2,"creating next remote");
++						rem->next=read_config_recursive(childFile, fullPath, depth + 1);
++						if(rem->next != (void *) -1 && rem->next != NULL) {
++							rem=rem->next;
++						} else {
++							rem->next = NULL;
++						}
++					}
++					fclose(childFile);
++					line = save_line;
++				}
++			}else if (strcasecmp("begin",key)==0){
+ 				if (strcasecmp("codes", val)==0){
+                                         /* init codes mode */
+ 					LOGPRINTF(2,"    begin codes");
+@@ -744,7 +888,7 @@ struct ir_remote * read_config(FILE *f)
+ 						
+ 						if(val2[0]=='#') break; /* comment */
+ 						node=defineNode(code, val2);
+-						val2=strtok(NULL, " \t");
++						val2=strtok(NULL, whitespace);
+ 					}
+ 					code->current=NULL;
+ 					add_void_array(&codes_list, code);
+@@ -822,7 +966,7 @@ struct ir_remote * read_config(FILE *f)
+ 						
+ 						if(val2[0]=='#') break; /* comment */
+ 						node=defineNode(code, val2);
+-						val2=strtok(NULL, " \t");
++						val2=strtok(NULL, whitespace);
+ 					}
+ 					code->current=NULL;
+ 					add_void_array(&codes_list, code);
+@@ -842,7 +986,7 @@ struct ir_remote * read_config(FILE *f)
+ 				case ID_remote:
+ 					argc=defineRemote(key, val, val2, rem);
+ 					if(!parse_error && ((argc==1 && val2!=NULL) || 
+-					   (argc==2 && val2!=NULL && strtok(NULL," \t")!=NULL)))
++					   (argc==2 && val2!=NULL && strtok(NULL, whitespace)!=NULL)))
+ 					{
+ 						logprintf(LOG_WARNING,"garbage after '%s'"
+ 							  " token in line %d ignored",
+@@ -857,7 +1001,7 @@ struct ir_remote * read_config(FILE *f)
+ 						
+ 						if(val2[0]=='#') break; /* comment */
+ 						node=defineNode(code, val2);
+-						val2=strtok(NULL, " \t");
++						val2=strtok(NULL, whitespace);
+ 					}
+ 					code->current=NULL;
+ 					add_void_array(&codes_list, code);
+@@ -905,7 +1049,7 @@ struct ir_remote * read_config(FILE *f)
+ 								break;
+ 							}
+ 						}
+-						while ((val=strtok(NULL," \t"))){
++						while ((val=strtok(NULL, whitespace))){
+ 							if (!addSignal(&signals, val)) break;
+ 						}
+ 					}
+@@ -950,7 +1094,15 @@ struct ir_remote * read_config(FILE *f)
+ 		}
+ 	}
+         if (parse_error){
++		static int print_error = 1;
++		
++		if(print_error) {
++			logprintf(LOG_ERR, "reading of file '%s' failed",
++				  name);
++			print_error = 0;
++		}
+ 		free_config(top_rem);
++		if(depth == 0) print_error = 1;
+                 return((void *) -1);
+         }
+ 	/* kick reverse flag */
+diff -Naurp lirc-0.8.3.orig/daemons/config_file.h lirc-0.8.3/daemons/config_file.h
+--- lirc-0.8.3.orig/daemons/config_file.h	2006-01-28 13:36:44.000000000 -0500
++++ lirc-0.8.3/daemons/config_file.h	2008-05-12 18:02:22.000000000 -0400
+@@ -1,4 +1,4 @@
+-/*      $Id: config_file.h,v 5.10 2006/01/28 18:36:44 lirc Exp $      */
++/*      $Id: config_file.h,v 5.11 2008/05/09 18:40:59 lirc Exp $      */
+ 
+ /****************************************************************************
+  ** config_file.h ***********************************************************
+@@ -86,7 +86,7 @@ int addSignal(struct void_array *signals
+ struct ir_ncode * defineCode(char *key, char *val, struct ir_ncode *code);
+ struct ir_code_node *defineNode(struct ir_ncode *code, const char *val);
+ int defineRemote(char * key, char * val, char *val2, struct ir_remote *rem);
+-struct ir_remote *read_config(FILE *f);
++struct ir_remote *read_config(FILE *f, const char *name);
+ void free_config(struct ir_remote *remotes);
+ 
+ #endif
+diff -Naurp lirc-0.8.3.orig/daemons/irrecord.c lirc-0.8.3/daemons/irrecord.c
+--- lirc-0.8.3.orig/daemons/irrecord.c	2008-02-14 15:42:56.000000000 -0500
++++ lirc-0.8.3/daemons/irrecord.c	2008-05-12 18:03:51.000000000 -0400
+@@ -1,4 +1,4 @@
+-/*      $Id: irrecord.c,v 5.69 2008/02/14 20:42:56 lirc Exp $      */
++/*      $Id: irrecord.c,v 5.71 2008/05/09 18:40:59 lirc Exp $      */
+ 
+ /****************************************************************************
+  ** irrecord.c **************************************************************
+@@ -311,7 +311,7 @@ int main(int argc,char **argv)
+ 				progname, filename, progname);
+ 			exit(EXIT_FAILURE);
+ 		}
+-		remotes=read_config(fin);
++		remotes=read_config(fin, filename);
+ 		fclose(fin);
+ 		if(remotes==(void *) -1 || remotes==NULL)
+ 		{
+@@ -748,7 +748,7 @@ int main(int argc,char **argv)
+ 		if(hw.deinit_func) hw.deinit_func();
+ 		exit(EXIT_FAILURE);
+ 	}
+-	remotes=read_config(fin);
++	remotes=read_config(fin,filename);
+ 	fclose(fin);
+ 	if(remotes==NULL)
+ 	{
+diff -Naurp lirc-0.8.3.orig/daemons/lircd.c lirc-0.8.3/daemons/lircd.c
+--- lirc-0.8.3.orig/daemons/lircd.c	2008-03-30 10:53:06.000000000 -0400
++++ lirc-0.8.3/daemons/lircd.c	2008-05-12 18:02:12.000000000 -0400
+@@ -1,4 +1,4 @@
+-/*      $Id: lircd.c,v 5.76 2008/03/30 14:53:06 lirc Exp $      */
++/*      $Id: lircd.c,v 5.77 2008/05/09 18:40:59 lirc Exp $      */
+ 
+ /****************************************************************************
+  ** lircd.c *****************************************************************
+@@ -406,7 +406,7 @@ void config(void)
+ 		logperror(LOG_ERR,NULL);
+ 		return;
+ 	}
+-	config_remotes=read_config(fd);
++	config_remotes=read_config(fd, configfile);
+ 	fclose(fd);
+ 	if(config_remotes==(void *) -1)
+ 	{
+diff -Naurp lirc-0.8.3.orig/NEWS lirc-0.8.3/NEWS
+--- lirc-0.8.3.orig/NEWS	2008-05-12 17:59:40.000000000 -0400
++++ lirc-0.8.3/NEWS	2008-05-12 18:05:04.000000000 -0400
+@@ -1,3 +1,6 @@
++0.8.4-CVS: future
++  * support for include directive in lircd.conf
++
+ 0.8.3: 05/04/08
+   * added support for Samsung USB IR Receiver (Robert Schedel)
+   * added support for Soundgraph iMON IR/LCD (Dean Harding)
diff --git a/lirc-0.8.3-validate-transmit-buffer.patch b/lirc-0.8.3-validate-transmit-buffer.patch
new file mode 100644
index 0000000..4eb0715
--- /dev/null
+++ b/lirc-0.8.3-validate-transmit-buffer.patch
@@ -0,0 +1,58 @@
+--- transmit.c	2007/07/29 18:20:13	5.27
++++ transmit.c	2008/05/11 13:29:47	5.28
+@@ -1,4 +1,4 @@
+-/*      $Id: transmit.c,v 5.27 2007/07/29 18:20:13 lirc Exp $      */
++/*      $Id: transmit.c,v 5.28 2008/05/11 13:29:47 lirc Exp $      */
+ 
+ /****************************************************************************
+  ** transmit.c **************************************************************
+@@ -116,6 +116,34 @@
+ 	return(0);
+ }
+ 
++static int check_send_buffer(void)
++{
++	int i;
++
++	if (send_buffer.wptr == 0) 
++	{
++		LOGPRINTF(1, "nothing to send");
++		return(0);
++	}
++	for (i = 0; i < send_buffer.wptr; i++)
++	{
++		if(send_buffer.data[i] == 0)
++		{
++			if(i%2)
++			{
++				LOGPRINTF(1, "invalid space: %d", i);
++			}
++			else
++			{
++				LOGPRINTF(1, "invalid pulse: %d", i);
++			}
++			return 0;
++		}
++	}
++	
++	return 1;
++}
++
+ static inline void flush_send_buffer(void)
+ {
+ 	if(send_buffer.pendingp>0)
+@@ -500,5 +528,13 @@
+ 		goto init_send_loop;
+ 	}
+ 	LOGPRINTF(3, "transmit buffer ready");
+-	return(1);
++	if(!check_send_buffer())
++	{
++		logprintf(LOG_ERR, "invalid send buffer");
++		logprintf(LOG_ERR,
++			  "this remote configuration cannot be used "
++			  "to transmit");
++		return 0;
++	}
++	return 1;
+ }

From 89675d7bc3e374cade157d78307a80f84c91e76a Mon Sep 17 00:00:00 2001
From: Jarod Wilson <jwilson@fedoraproject.org>
Date: Mon, 2 Jun 2008 18:57:47 +0000
Subject: [PATCH 038/204] - Add additional required patches for
 gnome-lirc-properties (#442248) - Put remote definitions in their own
 sub-package (#442328)

---
 lirc-0.8.3-validate-transmit-buffer.patch     |   4 +-
 lirc-add-resume-switch-to-irrecord.patch      | 109 ++++++++++++++++++
 ...w-instead-of-conf-as-filename-suffix.patch |  28 +++++
 lirc.spec                                     |  33 +++++-
 4 files changed, 169 insertions(+), 5 deletions(-)
 create mode 100644 lirc-add-resume-switch-to-irrecord.patch
 create mode 100644 lirc-use-new-instead-of-conf-as-filename-suffix.patch

diff --git a/lirc-0.8.3-validate-transmit-buffer.patch b/lirc-0.8.3-validate-transmit-buffer.patch
index 4eb0715..6db6c1d 100644
--- a/lirc-0.8.3-validate-transmit-buffer.patch
+++ b/lirc-0.8.3-validate-transmit-buffer.patch
@@ -1,5 +1,5 @@
---- transmit.c	2007/07/29 18:20:13	5.27
-+++ transmit.c	2008/05/11 13:29:47	5.28
+--- lirc/daemons/transmit.c	2007/07/29 18:20:13	5.27
++++ lirc/daemons/transmit.c	2008/05/11 13:29:47	5.28
 @@ -1,4 +1,4 @@
 -/*      $Id: transmit.c,v 5.27 2007/07/29 18:20:13 lirc Exp $      */
 +/*      $Id: transmit.c,v 5.28 2008/05/11 13:29:47 lirc Exp $      */
diff --git a/lirc-add-resume-switch-to-irrecord.patch b/lirc-add-resume-switch-to-irrecord.patch
new file mode 100644
index 0000000..fc234f4
--- /dev/null
+++ b/lirc-add-resume-switch-to-irrecord.patch
@@ -0,0 +1,109 @@
+From d5f3f9853d87c319c33ade71811c225db11855f7 Mon Sep 17 00:00:00 2001
+From: Mathias Hasselmann <mathias@openismus.com>
+Date: Wed, 13 Feb 2008 21:23:43 +0100
+Subject: Add --resume switch to irrecord.
+
+This switch asks irrecord to take hardware parameters from the provided
+template file, instead of trying to interactively discover them.
+
+This change is needed for gnome-lirc-properties to allow it having a
+self-contained key-code learning mode, that's consistent with
+gnome-keybinding-properties.
+
+The 'remotes==NULL' check for LIRC_MODE_MODE2 seems to indicate, that its
+author had a similar behaviour in mind. Still I prefer having that switch,
+instead of silently switching to --resume behaviour when a templates file
+was found, for backwards compability and for being able to detect that
+feature.
+---
+ daemons/irrecord.c |   17 ++++++++++++-----
+ 1 files changed, 12 insertions(+), 5 deletions(-)
+
+diff --git a/daemons/irrecord.c b/daemons/irrecord.c
+index df03c7b..a2420a8 100644
+--- a/daemons/irrecord.c
++++ b/daemons/irrecord.c
+@@ -192,6 +192,7 @@ int main(int argc,char **argv)
+ 	lirc_t min_remaining_gap, max_remaining_gap;
+ 	int force;
+ 	int retries;
++	int resume;
+ 	struct ir_remote *remotes=NULL;
+ 	char *device=NULL;
+ #ifdef DEBUG
+@@ -200,6 +201,7 @@ int main(int argc,char **argv)
+ 
+ 	progname=argv[0];
+ 	force=0;
++	resume=0;
+ 	hw_choose_driver(NULL);
+ 	while(1)
+ 	{
+@@ -211,6 +213,7 @@ int main(int argc,char **argv)
+ 			{"device",required_argument,NULL,'d'},
+ 			{"driver",required_argument,NULL,'H'},
+ 			{"force",no_argument,NULL,'f'},
++			{"resume",no_argument,NULL,'r'},
+ #ifdef DEBUG
+ 			{"pre",no_argument,NULL,'p'},
+ 			{"post",no_argument,NULL,'P'},
+@@ -221,9 +224,9 @@ int main(int argc,char **argv)
+ 			{0, 0, 0, 0}
+ 		};
+ #ifdef DEBUG
+-		c = getopt_long(argc,argv,"hvd:H:fpPtiT",long_options,NULL);
++		c = getopt_long(argc,argv,"hvd:H:frpPtiT",long_options,NULL);
+ #else
+-		c = getopt_long(argc,argv,"hvd:H:f",long_options,NULL);
++		c = getopt_long(argc,argv,"hvd:H:fr",long_options,NULL);
+ #endif
+ 		if(c==-1)
+ 			break;
+@@ -234,6 +237,7 @@ int main(int argc,char **argv)
+ 			printf("\t -h --help\t\tdisplay this message\n");
+ 			printf("\t -v --version\t\tdisplay version\n");
+ 			printf("\t -f --force\t\tforce raw mode\n");
++			printf("\t -r --resume\t\tcontinue recording\n");
+ 			printf("\t -H --driver=driver\tuse given driver\n");
+ 			printf("\t -d --device=device\tread from given device\n");
+ 			exit(EXIT_SUCCESS);
+@@ -254,6 +258,9 @@ int main(int argc,char **argv)
+ 		case 'f':
+ 			force=1;
+ 			break;
++		case 'r':
++			resume=1;
++			break;
+ #ifdef DEBUG
+ 		case 'p':
+ 			get_pre=1;
+@@ -460,7 +467,7 @@ int main(int argc,char **argv)
+ 	switch(hw.rec_mode)
+ 	{
+ 	case LIRC_MODE_MODE2:
+-		if(remotes==NULL && !get_lengths(&remote,force))
++		if((!remotes || !resume) && !get_lengths(&remote,force))
+ 		{
+ 			if(remote.gap==0)
+ 			{
+@@ -494,7 +501,7 @@ int main(int argc,char **argv)
+ 	case LIRC_MODE_LIRCCODE:
+ 		if(hw.rec_mode==LIRC_MODE_CODE) remote.bits=CHAR_BIT;
+ 		else remote.bits=hw.code_length;
+-		if(!get_gap_length(&remote))
++		if((!remotes || !resume) && !get_gap_length(&remote))
+ 		{
+ 			fprintf(stderr,"%s: gap not found,"
+ 				" can't continue\n",progname);
+@@ -767,7 +774,7 @@ int main(int argc,char **argv)
+ 		exit(EXIT_FAILURE);
+ 	}
+ 	
+-	if(!has_toggle_bit_mask(remotes))
++	if((!remotes || !resume) && !has_toggle_bit_mask(remotes))
+ 	{
+ 		get_toggle_bit_mask(remotes);
+ 	}
+-- 
+1.5.3.7
+
diff --git a/lirc-use-new-instead-of-conf-as-filename-suffix.patch b/lirc-use-new-instead-of-conf-as-filename-suffix.patch
new file mode 100644
index 0000000..54d9ba9
--- /dev/null
+++ b/lirc-use-new-instead-of-conf-as-filename-suffix.patch
@@ -0,0 +1,28 @@
+From 3e45e512719feccaa16edfd208273bade4f724e4 Mon Sep 17 00:00:00 2001
+From: Mathias Hasselmann <mathias@openismus.com>
+Date: Wed, 13 Feb 2008 21:16:09 +0100
+Subject: Use '.new' instead of '.conf' as filename suffix in template mode,
+ and append that the suffix to 'filename_new' instead of 'filename',
+ to prevent a buffer overrun for 'argv[optind]'.
+
+---
+ daemons/irrecord.c |    3 ++-
+ 1 files changed, 2 insertions(+), 1 deletions(-)
+
+diff --git a/daemons/irrecord.c b/daemons/irrecord.c
+index ea298e3..df03c7b 100644
+--- a/daemons/irrecord.c
++++ b/daemons/irrecord.c
+@@ -364,7 +364,7 @@ int main(int argc,char **argv)
+ 			exit(EXIT_FAILURE);
+ 		}
+ 		strcpy(filename_new, filename);
+-		strcat(filename_new, ".conf");
++		strcat(filename_new,".new");
+		filename = filename_new;
+ 	}
+ 	fout=fopen(filename,"w");
+ 	if(fout==NULL)
+-- 
+1.5.3.7
+
diff --git a/lirc.spec b/lirc.spec
index 6b9fa4e..9def1c4 100644
--- a/lirc.spec
+++ b/lirc.spec
@@ -18,7 +18,7 @@
 
 Name:           lirc
 Version:        0.8.3
-Release:        2%{?pre:.%{pre}}%{?dist}
+Release:        3%{?pre:.%{pre}}%{?dist}
 Summary:        The Linux Infrared Remote Control package
 
 Group:          System Environment/Daemons
@@ -30,6 +30,8 @@ Source1:        %{name}.init
 Source2:        %{name}.sysconfig
 Patch0:         lirc-0.8.3-remote-includes-directive.patch
 Patch1:         lirc-0.8.3-validate-transmit-buffer.patch
+Patch2:         lirc-use-new-instead-of-conf-as-filename-suffix.patch
+Patch3:         lirc-add-resume-switch-to-irrecord.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  %{__perl}
@@ -94,13 +96,27 @@ other signals of many (but not all) commonly used remote controls.
 Included applications include daemons which decode the received
 signals as well as user space applications which allow controlling a
 computer with a remote control.  This package contains LIRC
-documentation and a collection of remote control configuration files.
+documentation.
+
+%package        remotes
+Summary:        LIRC remote definitions
+Group:          System Environment/Daemons
+
+%description    remotes
+LIRC is a package that allows you to decode and send infra-red and
+other signals of many (but not all) commonly used remote controls.
+Included applications include daemons which decode the received
+signals as well as user space applications which allow controlling a
+computer with a remote control.  This package contains a collection
+of remote control configuration files.
 
 
 %prep
 %setup -q -n %{name}-%{version}%{?pre}
 %patch0 -p1 -b .incl
 %patch1 -p1 -b .xbuf
+%patch2 -p1 -b .suf
+%patch3 -p1 -b .res
 
 chmod 644 contrib/*
 
@@ -183,6 +199,8 @@ touch $RPM_BUILD_ROOT/dev/lirc{d,m}
 
 rm $RPM_BUILD_ROOT%{_libdir}/liblirc_client.la
 
+# Put remote definitions in place
+cp -ar remotes $RPM_BUILD_ROOT%{_datadir}/lirc-remotes
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -233,10 +251,19 @@ fi
 
 %files doc
 %defattr(-,root,root,-)
-%doc __docs/* remotes/
+%doc __docs/*
+
+%files remotes
+%defattr(-,root,root,-)
+%dir %{_datadir}/lirc-remotes
+%{_datadir}/lirc-remotes/*
 
 
 %changelog
+* Mon Jun 02 2008 Jarod Wilson <jwilson@redhat.com> - 0.8.3-3
+- Add additional required patches for gnome-lirc-properties (#442248)
+- Put remote definitions in their own sub-package (#442328)
+
 * Mon May 12 2008 Jarod Wilson <jwilson@redhat.com> - 0.8.3-2
 - Include upstream patch for lircd.conf remote include directives (#442248)
 - Include upstream patch to validate transmit buffers

From 9600db33438dd032098ef9777963d1b88e728713 Mon Sep 17 00:00:00 2001
From: Jarod Wilson <jwilson@fedoraproject.org>
Date: Mon, 23 Jun 2008 18:06:40 +0000
Subject: [PATCH 039/204] - Drop resume switch patch, no longer required - Add
 support for config option style used by gnome-lirc-properties     (#442341)

---
 lirc-add-resume-switch-to-irrecord.patch | 109 -----------------------
 lirc.init                                |  33 ++++++-
 lirc.spec                                |   8 +-
 lirc.sysconfig                           |  16 +++-
 4 files changed, 50 insertions(+), 116 deletions(-)
 delete mode 100644 lirc-add-resume-switch-to-irrecord.patch

diff --git a/lirc-add-resume-switch-to-irrecord.patch b/lirc-add-resume-switch-to-irrecord.patch
deleted file mode 100644
index fc234f4..0000000
--- a/lirc-add-resume-switch-to-irrecord.patch
+++ /dev/null
@@ -1,109 +0,0 @@
-From d5f3f9853d87c319c33ade71811c225db11855f7 Mon Sep 17 00:00:00 2001
-From: Mathias Hasselmann <mathias@openismus.com>
-Date: Wed, 13 Feb 2008 21:23:43 +0100
-Subject: Add --resume switch to irrecord.
-
-This switch asks irrecord to take hardware parameters from the provided
-template file, instead of trying to interactively discover them.
-
-This change is needed for gnome-lirc-properties to allow it having a
-self-contained key-code learning mode, that's consistent with
-gnome-keybinding-properties.
-
-The 'remotes==NULL' check for LIRC_MODE_MODE2 seems to indicate, that its
-author had a similar behaviour in mind. Still I prefer having that switch,
-instead of silently switching to --resume behaviour when a templates file
-was found, for backwards compability and for being able to detect that
-feature.
----
- daemons/irrecord.c |   17 ++++++++++++-----
- 1 files changed, 12 insertions(+), 5 deletions(-)
-
-diff --git a/daemons/irrecord.c b/daemons/irrecord.c
-index df03c7b..a2420a8 100644
---- a/daemons/irrecord.c
-+++ b/daemons/irrecord.c
-@@ -192,6 +192,7 @@ int main(int argc,char **argv)
- 	lirc_t min_remaining_gap, max_remaining_gap;
- 	int force;
- 	int retries;
-+	int resume;
- 	struct ir_remote *remotes=NULL;
- 	char *device=NULL;
- #ifdef DEBUG
-@@ -200,6 +201,7 @@ int main(int argc,char **argv)
- 
- 	progname=argv[0];
- 	force=0;
-+	resume=0;
- 	hw_choose_driver(NULL);
- 	while(1)
- 	{
-@@ -211,6 +213,7 @@ int main(int argc,char **argv)
- 			{"device",required_argument,NULL,'d'},
- 			{"driver",required_argument,NULL,'H'},
- 			{"force",no_argument,NULL,'f'},
-+			{"resume",no_argument,NULL,'r'},
- #ifdef DEBUG
- 			{"pre",no_argument,NULL,'p'},
- 			{"post",no_argument,NULL,'P'},
-@@ -221,9 +224,9 @@ int main(int argc,char **argv)
- 			{0, 0, 0, 0}
- 		};
- #ifdef DEBUG
--		c = getopt_long(argc,argv,"hvd:H:fpPtiT",long_options,NULL);
-+		c = getopt_long(argc,argv,"hvd:H:frpPtiT",long_options,NULL);
- #else
--		c = getopt_long(argc,argv,"hvd:H:f",long_options,NULL);
-+		c = getopt_long(argc,argv,"hvd:H:fr",long_options,NULL);
- #endif
- 		if(c==-1)
- 			break;
-@@ -234,6 +237,7 @@ int main(int argc,char **argv)
- 			printf("\t -h --help\t\tdisplay this message\n");
- 			printf("\t -v --version\t\tdisplay version\n");
- 			printf("\t -f --force\t\tforce raw mode\n");
-+			printf("\t -r --resume\t\tcontinue recording\n");
- 			printf("\t -H --driver=driver\tuse given driver\n");
- 			printf("\t -d --device=device\tread from given device\n");
- 			exit(EXIT_SUCCESS);
-@@ -254,6 +258,9 @@ int main(int argc,char **argv)
- 		case 'f':
- 			force=1;
- 			break;
-+		case 'r':
-+			resume=1;
-+			break;
- #ifdef DEBUG
- 		case 'p':
- 			get_pre=1;
-@@ -460,7 +467,7 @@ int main(int argc,char **argv)
- 	switch(hw.rec_mode)
- 	{
- 	case LIRC_MODE_MODE2:
--		if(remotes==NULL && !get_lengths(&remote,force))
-+		if((!remotes || !resume) && !get_lengths(&remote,force))
- 		{
- 			if(remote.gap==0)
- 			{
-@@ -494,7 +501,7 @@ int main(int argc,char **argv)
- 	case LIRC_MODE_LIRCCODE:
- 		if(hw.rec_mode==LIRC_MODE_CODE) remote.bits=CHAR_BIT;
- 		else remote.bits=hw.code_length;
--		if(!get_gap_length(&remote))
-+		if((!remotes || !resume) && !get_gap_length(&remote))
- 		{
- 			fprintf(stderr,"%s: gap not found,"
- 				" can't continue\n",progname);
-@@ -767,7 +774,7 @@ int main(int argc,char **argv)
- 		exit(EXIT_FAILURE);
- 	}
- 	
--	if(!has_toggle_bit_mask(remotes))
-+	if((!remotes || !resume) && !has_toggle_bit_mask(remotes))
- 	{
- 		get_toggle_bit_mask(remotes);
- 	}
--- 
-1.5.3.7
-
diff --git a/lirc.init b/lirc.init
index 4946651..b68b6ad 100644
--- a/lirc.init
+++ b/lirc.init
@@ -30,9 +30,40 @@ prog2=$(basename $exec2)
 
 lockfile=/var/lock/subsys/lirc
 
+build_lirc_args ()
+{
+	local LIRC_ARGS="$*"
+
+	# For remote only detection support, we need
+	# LIRC_DEVICE undefined
+	if [ -z "$LIRC_DEVICE" ] ; then
+		for dev in /dev/lirc0; do
+			if [ -c $dev ]; then
+				LIRC_DEVICE="$dev"
+				break
+			fi
+		done
+	fi
+
+	# If we have a LIRC_DEVICE or LIRC_DRIVER defined (either because
+	# no devices were defined, OR if we explicitly did), then
+	# populate LIRC_ARGS
+	if [ ! -z "$LIRC_DEVICE" ] || [ ! -z "$LIRC_DRIVER" ]; then
+		if [ -n "$LIRC_DEVICE" ] && [ "$LIRC_DEVICE" != "none" ]; then
+			LIRC_ARGS="--device=$LIRC_DEVICE $LIRC_ARGS"
+		fi
+		if [ -n "$LIRC_DRIVER" ] && [ "$LIRC_DRIVER" != "none" ]; then
+			LIRC_ARGS="--driver=$LIRC_DRIVER $LIRC_ARGS"
+		fi
+	fi
+	echo $LIRC_ARGS
+}
+
 start() {
+    LIRC_ARGS=`build_lirc_args $LIRC_ARGS`
+
     echo -n $"Starting infrared remote control daemon ($prog): "
-    daemon $exec $LIRCD_OPTIONS
+    daemon $exec $LIRC_ARGS $LIRCD_OPTIONS
     retval=$?
     echo
     status $prog >/dev/null 2>&1
diff --git a/lirc.spec b/lirc.spec
index 9def1c4..30a95eb 100644
--- a/lirc.spec
+++ b/lirc.spec
@@ -18,7 +18,7 @@
 
 Name:           lirc
 Version:        0.8.3
-Release:        3%{?pre:.%{pre}}%{?dist}
+Release:        4%{?pre:.%{pre}}%{?dist}
 Summary:        The Linux Infrared Remote Control package
 
 Group:          System Environment/Daemons
@@ -31,7 +31,6 @@ Source2:        %{name}.sysconfig
 Patch0:         lirc-0.8.3-remote-includes-directive.patch
 Patch1:         lirc-0.8.3-validate-transmit-buffer.patch
 Patch2:         lirc-use-new-instead-of-conf-as-filename-suffix.patch
-Patch3:         lirc-add-resume-switch-to-irrecord.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  %{__perl}
@@ -116,7 +115,6 @@ of remote control configuration files.
 %patch0 -p1 -b .incl
 %patch1 -p1 -b .xbuf
 %patch2 -p1 -b .suf
-%patch3 -p1 -b .res
 
 chmod 644 contrib/*
 
@@ -260,6 +258,10 @@ fi
 
 
 %changelog
+* Mon Jun 23 2008 Jarod Wilson <jwilson@redhat.com> - 0.8.3-4
+- Drop resume switch patch, no longer required
+- Add support for config option style used by gnome-lirc-properties (#442341)
+
 * Mon Jun 02 2008 Jarod Wilson <jwilson@redhat.com> - 0.8.3-3
 - Add additional required patches for gnome-lirc-properties (#442248)
 - Put remote definitions in their own sub-package (#442328)
diff --git a/lirc.sysconfig b/lirc.sysconfig
index 049e13f..a9ce795 100644
--- a/lirc.sysconfig
+++ b/lirc.sysconfig
@@ -1,13 +1,23 @@
 # Note: in addition to these parameters, you need to have working    -*- sh -*-
 # configuration file for lircd (and lircmd if enabled).
 
-# Options to lircd(8).  Typically, at least a remote controller driver
-# ("-H foo") needs to be specified here.  Run "/usr/sbin/lircd -H help" to get
-# a listing of supported drivers.
+# Options to lircd(8).  Typically, this will be empty, as which driver to use
+# should be specified using the LIRC_DRIVER variable below.
 LIRCD_OPTIONS=""
 
+# The infrared receiver (and/or transmitter) driver to be used by lircd(8),
+# similar to passing "-H driver" to lircd(8).
+# Run "/usr/sbin/lircd -H help" to get a listing of supported drivers.
+LIRC_DRIVER=""
+
+# Which lirc device will be used by lircd(8).
+# This is the same as passing "-d device" to lircd.
+# An empty value will use the default /dev/lirc device.
+LIRC_DEVICE=""
+
 # If "yes", the init script will try to start lircmd(8) too.
 ENABLE_LIRCMD="no"
 
 # Options to lircmd(8).
 LIRCMD_OPTIONS=""
+

From c73c3bd6e69db8ec30396214c9cfbcbef613643a Mon Sep 17 00:00:00 2001
From: Bastien Nocera <hadess@fedoraproject.org>
Date: Thu, 14 Aug 2008 09:12:29 +0000
Subject: [PATCH 040/204] - Add huge patch to fix the majority of remotes to
 have sensible keycodes,     so they work out-of-the-box (#457273)

---
 lirc.spec | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

diff --git a/lirc.spec b/lirc.spec
index 30a95eb..3802885 100644
--- a/lirc.spec
+++ b/lirc.spec
@@ -18,7 +18,7 @@
 
 Name:           lirc
 Version:        0.8.3
-Release:        4%{?pre:.%{pre}}%{?dist}
+Release:        5%{?pre:.%{pre}}%{?dist}
 Summary:        The Linux Infrared Remote Control package
 
 Group:          System Environment/Daemons
@@ -31,6 +31,9 @@ Source2:        %{name}.sysconfig
 Patch0:         lirc-0.8.3-remote-includes-directive.patch
 Patch1:         lirc-0.8.3-validate-transmit-buffer.patch
 Patch2:         lirc-use-new-instead-of-conf-as-filename-suffix.patch
+# https://bugzilla.redhat.com/show_bug.cgi?id=457273
+# http://thread.gmane.org/gmane.comp.hardware.lirc/6884
+Patch3:		lirc-0.8.3-fix-remote-keycodes.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  %{__perl}
@@ -115,6 +118,7 @@ of remote control configuration files.
 %patch0 -p1 -b .incl
 %patch1 -p1 -b .xbuf
 %patch2 -p1 -b .suf
+%patch3 -p1 -b .keycode
 
 chmod 644 contrib/*
 
@@ -159,7 +163,6 @@ touch -r aclocal.m4 configure.ac # avoid autofoo re-run
   --with-driver=userspace
 make %{?_smp_mflags}
 
-
 %install
 rm -rf $RPM_BUILD_ROOT __docs
 
@@ -258,6 +261,10 @@ fi
 
 
 %changelog
+* Thu Aug 14 2008 - Bastien Nocera <bnocera@redhat.com> - 0.8.3-5
+- Add huge patch to fix the majority of remotes to have sensible keycodes,
+  so they work out-of-the-box (#457273)
+
 * Mon Jun 23 2008 Jarod Wilson <jwilson@redhat.com> - 0.8.3-4
 - Drop resume switch patch, no longer required
 - Add support for config option style used by gnome-lirc-properties (#442341)

From 6a6e021cffccfe405a43c5ad78dcb0380da71c0a Mon Sep 17 00:00:00 2001
From: Bastien Nocera <hadess@fedoraproject.org>
Date: Thu, 14 Aug 2008 09:21:43 +0000
Subject: [PATCH 041/204] - Add huge patch to fix the majority of remotes to
 have sensible keycodes,     so they work out-of-the-box (#457273)

---
 lirc-0.8.3-fix-remote-keycodes.patch | 4661 ++++++++++++++++++++++++++
 lirc.spec                            |    3 +-
 2 files changed, 4663 insertions(+), 1 deletion(-)
 create mode 100644 lirc-0.8.3-fix-remote-keycodes.patch

diff --git a/lirc-0.8.3-fix-remote-keycodes.patch b/lirc-0.8.3-fix-remote-keycodes.patch
new file mode 100644
index 0000000..26024b8
--- /dev/null
+++ b/lirc-0.8.3-fix-remote-keycodes.patch
@@ -0,0 +1,4661 @@
+diff -upr lirc-0.8.3.orig/remotes/adaptec/lircd.conf.AVC-2410 lirc-0.8.3/remotes/adaptec/lircd.conf.AVC-2410
+--- lirc-0.8.3.orig/remotes/adaptec/lircd.conf.AVC-2410	2005-03-28 10:25:36.000000000 +0100
++++ lirc-0.8.3/remotes/adaptec/lircd.conf.AVC-2410	2008-08-12 16:14:40.000000000 +0100
+@@ -29,30 +29,30 @@ begin remote
+           Live                     0x00000000000025DA
+           Timeshift                0x00000000000017E8
+           Scan                     0x00000000000018e7
+-          Power                    0x00000000000009f6
+-          1                        0x00000000000026D9
+-          2                        0x00000000000019E6
+-          3                        0x00000000000010EF
+-          4                        0x00000000000027D8
+-          5                        0x00000000000020DF
+-          6                        0x00000000000011EE
+-          7                        0x00000000000028D7
+-          8                        0x00000000000021DE
+-          9                        0x00000000000012ED
+-          0                        0x00000000000022DD
+-          Mute                     0x00000000000013EC
++          KEY_POWER                    0x00000000000009f6
++          KEY_1                        0x00000000000026D9
++          KEY_2                        0x00000000000019E6
++          KEY_3                        0x00000000000010EF
++          KEY_4                        0x00000000000027D8
++          KEY_5                        0x00000000000020DF
++          KEY_6                        0x00000000000011EE
++          KEY_7                        0x00000000000028D7
++          KEY_8                        0x00000000000021DE
++          KEY_9                        0x00000000000012ED
++          KEY_0                        0x00000000000022DD
++          KEY_MUTE                     0x00000000000013EC
+           Full                     0x00000000000029D6
+-          Play                     0x00000000000030CF
+-          Stop                     0x00000000000023DC
+-          Skip                     0x00000000000024DB
+-          Replay                   0x00000000000014EB
+-          Rewind                   0x00000000000031CE
+-          Forward                  0x00000000000015EA
+-          Ch+                      0x00000000000001FE
+-          Ch-                      0x00000000000005FA
+-          Vol+                     0x00000000000004FB
+-          Vol-                     0x00000000000002FD
+-          Enter                    0x00000000000003FC
++          KEY_PLAY                     0x00000000000030CF
++          KEY_STOP                     0x00000000000023DC
++          KEY_NEXT                     0x00000000000024DB
++          KEY_AGAIN                   0x00000000000014EB
++          KEY_REWIND                   0x00000000000031CE
++          KEY_FORWARD                  0x00000000000015EA
++          KEY_CHANNELUP                      0x00000000000001FE
++          KEY_CHANNELDOWN                      0x00000000000005FA
++          KEY_VOLUMEUP                     0x00000000000004FB
++          KEY_VOLUMEDOWN                     0x00000000000002FD
++          KEY_ENTER                    0x00000000000003FC
+           OSD                      0x00000000000032CD
+           cc                       0x00000000000016E9
+       end codes
+diff -upr lirc-0.8.3.orig/remotes/adstech/lircd.conf.usbx-707 lirc-0.8.3/remotes/adstech/lircd.conf.usbx-707
+--- lirc-0.8.3.orig/remotes/adstech/lircd.conf.usbx-707	2008-08-12 16:13:39.000000000 +0100
++++ lirc-0.8.3/remotes/adstech/lircd.conf.usbx-707	2008-08-12 16:14:39.000000000 +0100
+@@ -26,50 +26,50 @@ begin remote
+   toggle_bit_mask 0x0
+ 
+       begin codes
+-          Power                    0x02FD5BA400
+-          Mute                     0x02FD5FA000
+-          1                        0x02FD57A800
+-          2                        0x02FD4FB000
+-          3                        0x02FD53AC00
+-          4                        0x02FD56A900
+-          5                        0x02FD4EB100
+-          6                        0x02FD5EA100
+-          7                        0x02FD54AB00
+-          8                        0x02FD4CB300
+-          9                        0x02FD5CA300
+-          Jump                     0x02FD55AA00
+-          0                        0x02FD4DB200
+-          Search                   0x02FD5DA200
++          KEY_POWER                    0x02FD5BA400
++          KEY_MUTE                     0x02FD5FA000
++          KEY_1                        0x02FD57A800
++          KEY_2                        0x02FD4FB000
++          KEY_3                        0x02FD53AC00
++          KEY_4                        0x02FD56A900
++          KEY_5                        0x02FD4EB100
++          KEY_6                        0x02FD5EA100
++          KEY_7                        0x02FD54AB00
++          KEY_8                        0x02FD4CB300
++          KEY_9                        0x02FD5CA300
++                               0x02FD55AA00
++          KEY_0                        0x02FD4DB200
++                             0x02FD5DA200
+           Guide                    0x02FD17E800
+-          Up                       0x02FD0FF000
+-          Menu                     0x02FD1FE000
+-          Left                     0x02FD16E900
+-          Enter                    0x02FD0EF100
+-          Right                    0x02FD1EE100
+-          Info                     0x02FD5AA500
+-          Down                     0x02FD46B900
+-          Exit                     0x02FD52AD00
+-          Replay                   0x02FD59A600
+-          Skip                     0x02FD51AE00
+-          Rewind                   0x02FD58A700
+-          Play                     0x02FD44BB00
+-          Forward                  0x02FD50AF00
+-          Stop                     0x02FD07F800
+-          Record                   0x02FD1BE400
++          KEY_UP                       0x02FD0FF000
++          KEY_MENU                     0x02FD1FE000
++          KEY_LEFT                     0x02FD16E900
++          KEY_ENTER                    0x02FD0EF100
++          KEY_RIGHT                    0x02FD1EE100
++          KEY_INFO                     0x02FD5AA500
++          KEY_DOWN                     0x02FD46B900
++                               0x02FD52AD00
++          KEY_AGAIN                   0x02FD59A600
++          KEY_NEXT                     0x02FD51AE00
++          KEY_REWIND                   0x02FD58A700
++          KEY_PLAY                     0x02FD44BB00
++          KEY_FORWARD                  0x02FD50AF00
++          KEY_STOP                     0x02FD07F800
++          KEY_RECORD                   0x02FD1BE400
+           Live                     0x02FD13EC00
+-          A                        0x02FD0AF500
+-          DVD                      0x02FD06F900
+-          B                        0x02FD12ED00
++          KEY_A                        0x02FD0AF500
++          KEY_DVD                      0x02FD06F900
++          KEY_B                        0x02FD12ED00
+           Photo                    0x02FD48B700
+-          Video                    0x02FD40BF00
+-          Music                    0x02FD19E600
+-          Ch+                      0x02FD0BF400
+-          Ch-                      0x02FD08F700
++          KEY_VIDEO                    0x02FD40BF00
++          KEY_AUDIO                    0x02FD19E600
++          KEY_CHANNELUP                      0x02FD0BF400
++          KEY_CHANNELDOWN                      0x02FD08F700
+           S1                       0x02FD03FC00
+           S2                       0x02FD01FE00
+           S3                       0x02FD00FF00
+-          Vol+                     0x02FD15EA00
+-          Vol-                     0x02FD1CE300
++          KEY_VOLUMEUP                     0x02FD15EA00
++          KEY_VOLUMEDOWN                     0x02FD1CE300
+       end codes
+ 
+ end remote
+diff -upr lirc-0.8.3.orig/remotes/animax/lircd.conf.animax lirc-0.8.3/remotes/animax/lircd.conf.animax
+--- lirc-0.8.3.orig/remotes/animax/lircd.conf.animax	1999-04-29 22:30:59.000000000 +0100
++++ lirc-0.8.3/remotes/animax/lircd.conf.animax	2008-08-12 16:14:40.000000000 +0100
+@@ -38,79 +38,79 @@ begin remote
+ 
+       begin codes
+           CD_DOWN                  0x000000000000DB24
+-          CD_UP                    0x0000000000005BA4
++          KEY_CD                    0x0000000000005BA4
+           TV_DOWN                  0x000000000000DC23
+-          TV_UP                    0x0000000000005CA3
++          KEY_TV                    0x0000000000005CA3
+           PHONE_DOWN               0x000000000000DD22
+-          PHONE_UP                 0x0000000000005DA2
++          KEY_PHONE                 0x0000000000005DA2
+           RADIO_DOWN               0x000000000000DE21
+-          RADIO_UP                 0x0000000000005EA1
++          KEY_RADIO                 0x0000000000005EA1
+           VIDEO_DOWN               0x000000000000DF20
+-          VIDEO_UP                 0x0000000000005FA0
++          KEY_VIDEO                 0x0000000000005FA0
+           AUX1_DOWN                0x000000000000E01F
+-          AUX1_UP                  0x000000000000609F
++          KEY_AUX                  0x000000000000609F
+           MAIL_DOWN                0x000000000000E11E
+-          MAIL_UP                  0x000000000000619E
++          KEY_MAIL                  0x000000000000619E
+           AUX2_DOWN                0x000000000000E21D
+           AUX2_UP                  0x000000000000629D
+           POWER_DOWN               0x000000000000E31C
+-          POWER_UP                 0x000000000000639C
++          KEY_POWER                 0x000000000000639C
+           LEFT_MOUSE_BUTTON_TOUCH_DOWN 0x000000000000E41B
+           LEFT_MOUSE_BUTTON_TOUCH_UP 0x000000000000649B
+           REWIND_DOWN              0x000000000000E51A
+-          REWIND_UP                0x000000000000659A
++          KEY_REWIND                0x000000000000659A
+           PLAY_DOWN                0x000000000000E619
+-          PLAY_UP                  0x0000000000006699
++          KEY_PLAY                  0x0000000000006699
+           FORWARD_DOWN             0x000000000000E718
+-          FORWARD_UP               0x0000000000006798
++          KEY_FORWARD               0x0000000000006798
+           SKIP_BACKWARD_DOWN       0x000000000000E817
+           SKIP_BACKWARD            0x0000000000006897
+           STOP_DOWN                0x000000000000E916
+-          STOP_UP                  0x0000000000006996
++          KEY_STOP                  0x0000000000006996
+           SKIP_FORWARD_DOWN        0x000000000000EA15
+           SKIP_FORWARD_UP          0x0000000000006A95
+           CHANNEL_UP_DOWN          0x000000000000EB14
+-          CHANNEL_UP_UP            0x0000000000006B94
++          KEY_CHANNELUP            0x0000000000006B94
+           MENU_DOWN                0x000000000000EC13
+-          MENU_UP                  0x0000000000006C93
++          KEY_MENU                  0x0000000000006C93
+           VOLUME_UP_DOWN           0x000000000000ED12
+-          VOLUME_UP_UP             0x0000000000006D92
++          KEY_VOLUMEUP             0x0000000000006D92
+           BLUE_BUTTON_DOWN         0x000000000000EE11
+-          BLUE_BUTTON_UP           0x0000000000006E91
++          KEY_BLUE           0x0000000000006E91
+           MUTE_DOWN                0x000000000000EF10
+-          MUTE_UP                  0x0000000000006F90
++          KEY_MUTE                  0x0000000000006F90
+           VOLUME_DOWN_DOWN         0x000000000000F00F
+-          VOLUME_DOWN_UP           0x000000000000708F
++          KEY_VOLUMEDOWN           0x000000000000708F
+           RED_BUTTON_DOWN          0x000000000000F10E
+-          RED_BUTTON_UP            0x000000000000718E
++          KEY_RED            0x000000000000718E
+           GREEN_BUTTON_DOWN        0x000000000000F20D
+-          GREEN_BUTTON_UP          0x000000000000728D
++          KEY_GREEN          0x000000000000728D
+           CHANNEL_DOWN_DOWN        0x000000000000F30C
+-          CHANNEL_DOWN_UP          0x000000000000738C
++          KEY_CHANNELDOWN          0x000000000000738C
+           1_DOWN                   0x000000000000F40B
+-          1_UP                     0x000000000000748B
++          KEY_1                     0x000000000000748B
+           2_DOWN                   0x000000000000F50A
+-          2_UP                     0x000000000000758A
++          KEY_2                     0x000000000000758A
+           3_DOWN                   0x000000000000F609
+-          3_UP                     0x0000000000007689
++          KEY_3                     0x0000000000007689
+           4_DOWN                   0x000000000000F708
+-          4_UP                     0x0000000000007788
++          KEY_4                     0x0000000000007788
+           5_DOWN                   0x000000000000F807
+-          5_UP                     0x0000000000007887
++          KEY_5                     0x0000000000007887
+           6_DOWN                   0x000000000000F906
+-          6_UP                     0x0000000000007986
++          KEY_6                     0x0000000000007986
+           7_DOWN                   0x000000000000FA05
+-          7_UP                     0x0000000000007A85
++          KEY_7                     0x0000000000007A85
+           8_DOWN                   0x000000000000FB04
+-          8_UP                     0x0000000000007B84
++          KEY_8                     0x0000000000007B84
+           9_DOWN                   0x000000000000FC03
+-          9_UP                     0x0000000000007C83
++          KEY_9                     0x0000000000007C83
+           SLASH_DOWN               0x000000000000FD02
+-          SLASH_UP                 0x0000000000007D82
++          KEY_SLASH                 0x0000000000007D82
+           0_DOWN                   0x000000000000FE01
+-          0_UP                     0x0000000000007E81
++          KEY_0                     0x0000000000007E81
+           MINUS_DOWN               0x000000000000FF00
+-          MINUS_UP                 0x0000000000007F80
++          KEY_KPMINUS                 0x0000000000007F80
+       end codes
+ 
+ end remote
+diff -upr lirc-0.8.3.orig/remotes/apple/lircd.conf.macmini lirc-0.8.3/remotes/apple/lircd.conf.macmini
+--- lirc-0.8.3.orig/remotes/apple/lircd.conf.macmini	2007-12-13 12:30:38.000000000 +0000
++++ lirc-0.8.3/remotes/apple/lircd.conf.macmini	2008-08-12 16:14:39.000000000 +0100
+@@ -23,12 +23,12 @@ begin remote
+   gap          211995
+ 
+       begin codes
+-          1                        0x09
+-          2                        0x06
+-          3                        0x0A
+-          4                        0x0C
+-          5                        0x05
+-          6                        0x03
++          KEY_1                        0x09
++          KEY_2                        0x06
++          KEY_3                        0x0A
++          KEY_4                        0x0C
++          KEY_5                        0x05
++          KEY_6                        0x03
+       end codes
+ 
+ end remote
+diff -upr lirc-0.8.3.orig/remotes/asus/lircd.conf.asus lirc-0.8.3/remotes/asus/lircd.conf.asus
+--- lirc-0.8.3.orig/remotes/asus/lircd.conf.asus	2007-02-20 04:09:47.000000000 +0000
++++ lirc-0.8.3/remotes/asus/lircd.conf.asus	2008-08-12 16:14:39.000000000 +0100
+@@ -19,38 +19,38 @@ begin remote
+   toggle_bit	0
+ 
+ 	begin codes
+-	  0			0x0000000000000000
+-	  1			0x0000000000000008
+-	  2			0x0000000000000010
+-	  3			0x0000000000000018
+-	  4			0x0000000000000020
+-	  5			0x0000000000000028
+-	  6			0x0000000000000030
+-	  7			0x0000000000000038
+-	  8			0x0000000000000040
+-	  9			0x0000000000000048
+-	  PREV			0x0000000000000050
+-	  ENTER			0x0000000000000058
+-	  CH+			0x0000000000000060
+-	  CH-			0x0000000000000068
+-	  VOL+			0x0000000000000070
+-	  VOL-			0x0000000000000078
+-	  MAXIMIZE		0x0000000000000080
+-	  MUTE			0x0000000000000088
+-	  POWER			0x0000000000000090
+-	  MENU			0x0000000000000098
+-	  UP			0x00000000000000A0
+-	  DOWN			0x00000000000000A8
+-	  LEFT			0x00000000000000B0
+-	  RIGHT			0x00000000000000B8
++	  KEY_0			0x0000000000000000
++	  KEY_1			0x0000000000000008
++	  KEY_2			0x0000000000000010
++	  KEY_3			0x0000000000000018
++	  KEY_4			0x0000000000000020
++	  KEY_5			0x0000000000000028
++	  KEY_6			0x0000000000000030
++	  KEY_7			0x0000000000000038
++	  KEY_8			0x0000000000000040
++	  KEY_9			0x0000000000000048
++	  KEY_PREVIOUS			0x0000000000000050
++	  KEY_ENTER			0x0000000000000058
++	  KEY_CHANNELUP			0x0000000000000060
++	  KEY_CHANNELDOWN			0x0000000000000068
++	  KEY_VOLUMEUP			0x0000000000000070
++	  KEY_VOLUMEDOWN			0x0000000000000078
++	  KEY_MAX		0x0000000000000080
++	  KEY_MUTE			0x0000000000000088
++	  KEY_POWER			0x0000000000000090
++	  KEY_MENU			0x0000000000000098
++	  KEY_UP			0x00000000000000A0
++	  KEY_DOWN			0x00000000000000A8
++	  KEY_LEFT			0x00000000000000B0
++	  KEY_RIGHT			0x00000000000000B8
+ 	  CAPTION		0x00000000000000C0
+ 	  MTS/SAP		0x00000000000000C8
+ 	  DISPLAY		0x00000000000000D0
+ 	  SCAN			0x00000000000000D8
+-	  RED			0x00000000000000E0
+-	  GREEN			0x00000000000000E8
+-	  YELLOW		0x00000000000000F0
+-	  BLUE			0x00000000000000F8
++	  KEY_RED			0x00000000000000E0
++	  KEY_GREEN			0x00000000000000E8
++	  KEY_YELLOW		0x00000000000000F0
++	  KEY_BLUE			0x00000000000000F8
+         end codes
+ 
+ end remote
+diff -upr lirc-0.8.3.orig/remotes/asus/lircd.conf.asusdh lirc-0.8.3/remotes/asus/lircd.conf.asusdh
+--- lirc-0.8.3.orig/remotes/asus/lircd.conf.asusdh	2007-07-08 15:01:27.000000000 +0100
++++ lirc-0.8.3/remotes/asus/lircd.conf.asusdh	2008-08-12 16:14:39.000000000 +0100
+@@ -14,17 +14,17 @@ begin remote
+   post_data_bits  0
+ 
+ 	begin codes
+-	  POWER			0x01
++	  KEY_POWER			0x01
+ 	  QUICK_POWER		0x02
+ 	  NOISE_OFF		0x03
+ 	  WIFI			0x04
+ 	  AP_LAUNCH		0x05
+-	  MAXIMIZE		0x06
+-	  PLUS			0x07
++	  KEY_MAX		0x06
++	  			0x07
+ 	  REV			0x08
+-	  PLAY/PAUSE		0x09
+-	  FWD			0x0A
+-	  MINUS			0x0B
++	  		0x09
++	  KEY_FORWARD			0x0A
++	  			0x0B
+         end codes
+ 
+ end remote
+diff -upr lirc-0.8.3.orig/remotes/asus/lircd.conf.digimatrix lirc-0.8.3/remotes/asus/lircd.conf.digimatrix
+--- lirc-0.8.3.orig/remotes/asus/lircd.conf.digimatrix	2005-09-06 18:12:17.000000000 +0100
++++ lirc-0.8.3/remotes/asus/lircd.conf.digimatrix	2008-08-12 16:14:39.000000000 +0100
+@@ -28,43 +28,43 @@ begin remote
+ 
+ 
+       begin codes
+-          up                       0x000000000000E817
+-          down                     0x00000000000018E7
+-          enter                    0x000000000000D02F
+-          left                     0x0000000000009867
+-          right                    0x00000000000058A7
+-          1                        0x00000000000000FF
+-          2                        0x000000000000807F
+-          3                        0x00000000000040BF
+-          4                        0x000000000000C03F
+-          5                        0x00000000000020DF
+-          6                        0x000000000000A05F
+-          7                        0x000000000000609F
+-          8                        0x000000000000E01F
+-          9                        0x00000000000010EF
+-          0                        0x000000000000906F
+-          on_off                   0x000000000000B04F
++          KEY_UP                       0x000000000000E817
++          KEY_DOWN                     0x00000000000018E7
++          KEY_ENTER                    0x000000000000D02F
++          KEY_LEFT                     0x0000000000009867
++          KEY_RIGHT                    0x00000000000058A7
++          KEY_1                        0x00000000000000FF
++          KEY_2                        0x000000000000807F
++          KEY_3                        0x00000000000040BF
++          KEY_4                        0x000000000000C03F
++          KEY_5                        0x00000000000020DF
++          KEY_6                        0x000000000000A05F
++          KEY_7                        0x000000000000609F
++          KEY_8                        0x000000000000E01F
++          KEY_9                        0x00000000000010EF
++          KEY_0                        0x000000000000906F
++          KEY_POWER                   0x000000000000B04F
+           dvd_vcd                  0x000000000000F00F
+-          tv                       0x00000000000008F7
++          KEY_TV                       0x00000000000008F7
+           os_start                 0x00000000000030CF
+           photo                    0x00000000000048B7
+-          home                     0x00000000000044BB
+-          back                     0x000000000000A857
+-          ch+                      0x000000000000B847
+-          stop                     0x000000000000946B
+-          play                     0x000000000000C43B
+-          vol+                     0x000000000000F807
+-          ch-                      0x0000000000007887
++          KEY_HOME                     0x00000000000044BB
++          KEY_BACK                     0x000000000000A857
++          KEY_CHANNELUP                      0x000000000000B847
++          KEY_STOP                     0x000000000000946B
++          KEY_PLAY                     0x000000000000C43B
++          KEY_VOLUMEUP                     0x000000000000F807
++          KEY_CHANNELDOWN                      0x0000000000007887
+           step-                    0x000000000000E41B
+           step+                    0x000000000000649B
+-          vol-                     0x00000000000004FB
+-          pause                    0x00000000000024DB
+-          pre                      0x00000000000014EB
+-          next                     0x000000000000A45B
+-          mute                     0x000000000000847B
+-          rec                      0x000000000000D42B
+-          subtitle                 0x000000000000C837
+-          menu                     0x00000000000038C7
++          KEY_VOLUMEDOWN                     0x00000000000004FB
++          KEY_PAUSE                    0x00000000000024DB
++          KEY_PREVIOUS                      0x00000000000014EB
++          KEY_NEXT                     0x000000000000A45B
++          KEY_MUTE                     0x000000000000847B
++          KEY_RECORD                      0x000000000000D42B
++          KEY_SUBTITLE                 0x000000000000C837
++          KEY_MENU                     0x00000000000038C7
+           dvd_audio                0x00000000000050AF
+           ui_size                  0x0000000000008877
+           ui_on_off                0x00000000000028D7
+diff -upr lirc-0.8.3.orig/remotes/atiusb/lircd.conf.atilibusb lirc-0.8.3/remotes/atiusb/lircd.conf.atilibusb
+--- lirc-0.8.3.orig/remotes/atiusb/lircd.conf.atilibusb	2007-09-14 20:45:18.000000000 +0100
++++ lirc-0.8.3/remotes/atiusb/lircd.conf.atilibusb	2008-08-12 16:14:39.000000000 +0100
+@@ -30,58 +30,58 @@ begin remote
+ 
+ 
+       begin codes
+-          stop                     0x000231
+-          pause                    0x000230
+-          fforward                 0x000228
+-          rec                      0x000237
+-          rewind                   0x000229
+-          play                     0x00022C
+-          d                        0x00027B
+-          c                        0x00027A
+-          e                        0x00027C
+-          f                        0x00027D
+-          right                    0x00025B
+-          left                     0x00025A
+-          up                       0x000258
+-          down                     0x000259
+-          ok                       0x00025C
+-          info                     0x0002F9
++          KEY_STOP                     0x000231
++          KEY_PAUSE                    0x000230
++                           0x000228
++          KEY_RECORD                      0x000237
++          KEY_REWIND                   0x000229
++          KEY_PLAY                     0x00022C
++          KEY_D                        0x00027B
++          KEY_C                        0x00027A
++          KEY_E                        0x00027C
++          KEY_F                        0x00027D
++          KEY_RIGHT                    0x00025B
++          KEY_LEFT                     0x00025A
++          KEY_UP                       0x000258
++          KEY_DOWN                     0x000259
++          KEY_OK                       0x00025C
++          KEY_INFO                     0x0002F9
+           timer                    0x000296
+-          menu                     0x000254
++          KEY_MENU                     0x000254
+           check                    0x000282
+-          0                        0x000200
+-          1                        0x000201
+-          2                        0x000202
+-          3                        0x000203
+-          4                        0x000204
+-          5                        0x000205
+-          6                        0x000206
+-          7                        0x000207
+-          8                        0x000208
+-          9                        0x000209
+-          volup                    0x000210
+-          voldown                  0x000211
+-          mute                     0x00020D
+-          chup                     0x000220
+-          chdown                   0x000221
++          KEY_0                        0x000200
++          KEY_1                        0x000201
++          KEY_2                        0x000202
++          KEY_3                        0x000203
++          KEY_4                        0x000204
++          KEY_5                        0x000205
++          KEY_6                        0x000206
++          KEY_7                        0x000207
++          KEY_8                        0x000208
++          KEY_9                        0x000209
++          KEY_VOLUMEUP                    0x000210
++          KEY_VOLUMEDOWN                  0x000211
++          KEY_MUTE                     0x00020D
++          KEY_CHANNELUP                     0x000220
++          KEY_CHANNELDOWN                   0x000221
+           mouse_up                 0x0001FF
+           mouse_down               0x0002FF
+-          mouse_left               0x0020FF
+-          mouse_right              0x0010FF
+-          mouse_up_right           0x0011FF
++          BTN_LEFT               0x0020FF
++          BTN_RIGHT              0x0010FF
++          BTN_RIGHT           0x0011FF
+           mouse_down_right         0x0012FF
+-          mouse_up_left            0x0021FF
++          BTN_LEFT            0x0021FF
+           mouse_down_left          0x0022FF
+           right_click              0x0002AA
+           left_click               0x0002A9
+           hand                     0x0002D0
+           shrink_resize            0x0002D5
+           ?                        0x0002BE
+-          dvd                      0x000238
+-          tv                       0x000239
+-          a                        0x000278
+-          b                        0x000279
+-          power                    0x00020C
++          KEY_DVD                      0x000238
++          KEY_TV                       0x000239
++          KEY_A                        0x000278
++          KEY_B                        0x000279
++          KEY_POWER                    0x00020C
+       end codes
+ 
+ end remote
+diff -upr lirc-0.8.3.orig/remotes/atiusb/lircd.conf.atiusb lirc-0.8.3/remotes/atiusb/lircd.conf.atiusb
+--- lirc-0.8.3.orig/remotes/atiusb/lircd.conf.atiusb	2008-08-12 16:13:39.000000000 +0100
++++ lirc-0.8.3/remotes/atiusb/lircd.conf.atiusb	2008-08-12 16:14:39.000000000 +0100
+@@ -37,54 +37,54 @@ begin remote
+ 
+ 
+       begin codes
+-          A                        0x000000000000F500
+-          B                        0x000000000000F601
+-          C                        0x0000000000000E19
+-          D                        0x000000000000101B
+-          E                        0x0000000000001621
+-          F                        0x0000000000001823
+-          TV                       0x000000000000F803
+-          DVD                      0x000000000000F904
+-          WEB                      0x000000000000FA05
++          KEY_A                        0x000000000000F500
++          KEY_B                        0x000000000000F601
++          KEY_C                        0x0000000000000E19
++          KEY_D                        0x000000000000101B
++          KEY_E                        0x0000000000001621
++          KEY_F                        0x0000000000001823
++          KEY_TV                       0x000000000000F803
++          KEY_DVD                      0x000000000000F904
++          KEY_WWW                      0x000000000000FA05
+           BOOK                     0x000000000000FB06
+           HAND                     0x000000000000FC07
+-          POWER                    0x000000000000F702
+-          MOUSE_LEFT_BTN           0x0000000000006D78
+-          MOUSE_RIGHT_BTN          0x000000000000717C
++          KEY_POWER                    0x000000000000F702
++          BTN_LEFT           0x0000000000006D78
++          BTN_RIGHT          0x000000000000717C
+           MOUSE_UP                 0x0000000000006772
+           MOUSE_DOWN               0x0000000000006B76
+-          MOUSE_LEFT               0x0000000000006C77
+-          MOUSE_RIGHT              0x0000000000006B76
+-          VOL_UP                   0x000000000000FD08
+-          VOL_DOWN                 0x000000000000FE09
+-          MUTE                     0x000000000000FF0A
+-          CH_UP                    0x000000000000000B
+-          CH_DOWN                  0x000000000000010C
+-          1                        0x000000000000020D
+-          2                        0x000000000000030E
+-          3                        0x000000000000040F
+-          4                        0x0000000000000510
+-          5                        0x0000000000000611
+-          6                        0x0000000000000712
+-          7                        0x0000000000000813
+-          8                        0x0000000000000914
+-          9                        0x0000000000000A15
+-          0                        0x0000000000000C17
+-          LIST                     0x0000000000000B16
++          BTN_LEFT               0x0000000000006C77
++          BTN_RIGHT              0x0000000000006B76
++          KEY_VOLUMEUP                   0x000000000000FD08
++          KEY_VOLUMEDOWN                 0x000000000000FE09
++          KEY_MUTE                     0x000000000000FF0A
++          KEY_CHANNELUP                    0x000000000000000B
++          KEY_CHANNELDOWN                  0x000000000000010C
++          KEY_1                        0x000000000000020D
++          KEY_2                        0x000000000000030E
++          KEY_3                        0x000000000000040F
++          KEY_4                        0x0000000000000510
++          KEY_5                        0x0000000000000611
++          KEY_6                        0x0000000000000712
++          KEY_7                        0x0000000000000813
++          KEY_8                        0x0000000000000914
++          KEY_9                        0x0000000000000A15
++          KEY_0                        0x0000000000000C17
++          KEY_LIST                     0x0000000000000B16
+           CHECK                    0x0000000000000D18
+-          UP                       0x0000000000000F1A
+-          DOWN                     0x0000000000001722
+-          LEFT                     0x000000000000121D
+-          RIGHT                    0x000000000000141F
+-          OK                       0x000000000000131E
++          KEY_UP                       0x0000000000000F1A
++          KEY_DOWN                     0x0000000000001722
++          KEY_LEFT                     0x000000000000121D
++          KEY_RIGHT                    0x000000000000141F
++          KEY_OK                       0x000000000000131E
+           TIMER                    0x000000000000111C
+-          MAX                      0x0000000000001520
+-          REWIND                   0x0000000000001924
+-          PLAY                     0x0000000000001A25
+-          FFWD                     0x0000000000001B26
+-          REC                      0x0000000000001C27
+-          STOP                     0x0000000000001D28
+-          PAUSE                    0x0000000000001E29
++          KEY_MAX                      0x0000000000001520
++          KEY_REWIND                   0x0000000000001924
++          KEY_PLAY                     0x0000000000001A25
++          KEY_FASTFORWARD                     0x0000000000001B26
++          KEY_RECORD                      0x0000000000001C27
++          KEY_STOP                     0x0000000000001D28
++          KEY_PAUSE                    0x0000000000001E29
+       end codes
+ 
+ end remote
+diff -upr lirc-0.8.3.orig/remotes/avermedia/lircd.conf.avermedia lirc-0.8.3/remotes/avermedia/lircd.conf.avermedia
+--- lirc-0.8.3.orig/remotes/avermedia/lircd.conf.avermedia	2001-01-11 07:54:25.000000000 +0000
++++ lirc-0.8.3/remotes/avermedia/lircd.conf.avermedia	2008-08-12 16:14:40.000000000 +0100
+@@ -34,37 +34,37 @@ begin remote
+ 
+ 
+       begin codes
+-          TV                       0x0000000000006897
+-          FM                       0x000000000000A857
+-          EXIT                     0x00000000000048B7
++          KEY_TV                       0x0000000000006897
++          KEY_RADIO                       0x000000000000A857
++          KEY_EXIT                     0x00000000000048B7
+           DISPLAY                  0x00000000000030CF
+           FREEZE                   0x00000000000028D7
+           CAPTURE                  0x0000000000008877
+-          VIDEO                    0x00000000000038C7
+-          1                        0x000000000000807F
+-          2                        0x00000000000040BF
+-          3                        0x000000000000C03F
+-          AUDIO                    0x00000000000018E7
+-          4                        0x00000000000020DF
+-          5                        0x000000000000A05F
+-          6                        0x000000000000609F
++          KEY_VIDEO                    0x00000000000038C7
++          KEY_1                        0x000000000000807F
++          KEY_2                        0x00000000000040BF
++          KEY_3                        0x000000000000C03F
++          KEY_AUDIO                    0x00000000000018E7
++          KEY_4                        0x00000000000020DF
++          KEY_5                        0x000000000000A05F
++          KEY_6                        0x000000000000609F
+           FULLSCREEN               0x000000000000F00F
+-          7                        0x000000000000E01F
+-          8                        0x00000000000010EF
+-          9                        0x000000000000906F
++          KEY_7                        0x000000000000E01F
++          KEY_8                        0x00000000000010EF
++          KEY_9                        0x000000000000906F
+           LOOP                     0x000000000000C837
+-          0                        0x00000000000050AF
+-          LEFTARROW                0x00000000000000FF
+-          RIGHTARROW               0x000000000000E817
+-          MUTE                     0x00000000000008F7
++          KEY_0                        0x00000000000050AF
++          KEY_LEFT                0x00000000000000FF
++          KEY_RIGHT               0x000000000000E817
++          KEY_MUTE                     0x00000000000008F7
+           COLOR                    0x000000000000B04F
+-          PREVIEW                  0x000000000000708F
+-          CHANNELUP                0x000000000000D827
+-          VOL_UP                   0x00000000000058A7
++          KEY_PREVIOUS                  0x000000000000708F
++          KEY_CHANNELUP                0x000000000000D827
++          KEY_VOLUMEUP                   0x00000000000058A7
+           AUTOSCAN                 0x000000000000B847
+-          ENTER                    0x0000000000009867
+-          CHANNELDOWN              0x000000000000F807
+-          VOL_DOWN                 0x0000000000007887
++          KEY_ENTER                    0x0000000000009867
++          KEY_CHANNELDOWN              0x000000000000F807
++          KEY_VOLUMEDOWN                 0x0000000000007887
+       end codes
+ 
+ end remote
+diff -upr lirc-0.8.3.orig/remotes/avermedia/lircd.conf.avermedia98 lirc-0.8.3/remotes/avermedia/lircd.conf.avermedia98
+--- lirc-0.8.3.orig/remotes/avermedia/lircd.conf.avermedia98	2001-01-10 22:08:00.000000000 +0000
++++ lirc-0.8.3/remotes/avermedia/lircd.conf.avermedia98	2008-08-12 16:14:40.000000000 +0100
+@@ -29,49 +29,49 @@ begin remote
+ 
+       begin codes
+           TV/FM                    0x0000000000000023
+-          CD                       0x0000000000000022
++          KEY_CD                       0x0000000000000022
+ #          TELETEXT                 0x000000000000C03F
+-          POWER                    0x0000000000000027
++          KEY_POWER                    0x0000000000000027
+ 
+-          1                        0x0000000000000018
+-          2                        0x0000000000000010
+-          3                        0x0000000000000008
+-          VIDEO                    0x0000000000000000
+-
+-          4                        0x0000000000000019
+-          5                        0x0000000000000011
+-          6                        0x0000000000000009
+-          AUDIO                    0x0000000000000001
+-
+-          7                        0x000000000000001A
+-          8                        0x0000000000000012
+-          9                        0x000000000000000A
++          KEY_1                        0x0000000000000018
++          KEY_2                        0x0000000000000010
++          KEY_3                        0x0000000000000008
++          KEY_VIDEO                    0x0000000000000000
++
++          KEY_4                        0x0000000000000019
++          KEY_5                        0x0000000000000011
++          KEY_6                        0x0000000000000009
++          KEY_AUDIO                    0x0000000000000001
++
++          KEY_7                        0x000000000000001A
++          KEY_8                        0x0000000000000012
++          KEY_9                        0x000000000000000A
+           FULLSCREEN               0x0000000000000002
+ 
+-          0                        0x000000000000001B
++          KEY_0                        0x000000000000001B
+           DISPLAY                  0x0000000000000013
+           COLOR                    0x000000000000000B
+           LOOP                     0x0000000000000003
+ 
+           UNLABELED                0x000000000000001C
+-          LEFT                     0x0000000000000014
+-          RIGHT                    0x000000000000000C
+-          PREVIEW                  0x0000000000000004
++          KEY_LEFT                     0x0000000000000014
++          KEY_RIGHT                    0x000000000000000C
++          KEY_PREVIOUS                  0x0000000000000004
+ 
+           AUTOSCAN                 0x000000000000001D
+           FREEZE                   0x0000000000000015
+           CAPTURE                  0x000000000000000D
+-          MUTE                     0x0000000000000005
++          KEY_MUTE                     0x0000000000000005
+ 
+-          RED                      0x000000000000001E
+-          VOL_DOWN                 0x0000000000000016
+-          VOL_UP                   0x000000000000000E
+-          YELLOW                   0x0000000000000006
+-
+-          GREEN                    0x000000000000001F
+-          CH_DOWN                  0x0000000000000017
+-          CH_UP                    0x000000000000000F
+-          BLUE                     0x0000000000000007
++          KEY_RED                      0x000000000000001E
++          KEY_VOLUMEDOWN                 0x0000000000000016
++          KEY_VOLUMEUP                   0x000000000000000E
++          KEY_YELLOW                   0x0000000000000006
++
++          KEY_GREEN                    0x000000000000001F
++          KEY_CHANNELDOWN                  0x0000000000000017
++          KEY_CHANNELUP                    0x000000000000000F
++          KEY_BLUE                     0x0000000000000007
+       end codes
+ 
+ end remote
+diff -upr lirc-0.8.3.orig/remotes/avermedia/lircd.conf.vdomate lirc-0.8.3/remotes/avermedia/lircd.conf.vdomate
+--- lirc-0.8.3.orig/remotes/avermedia/lircd.conf.vdomate	2002-10-25 21:42:55.000000000 +0100
++++ lirc-0.8.3/remotes/avermedia/lircd.conf.vdomate	2008-08-12 16:14:40.000000000 +0100
+@@ -27,33 +27,33 @@ begin remote
+ 
+ 
+       begin codes
+-          power                    0x0000000040BF00FF
+-          one                      0x0000000040BFA05F
+-          two                      0x0000000040BF609F
+-          three                    0x0000000040BFE01F
+-          four                     0x0000000040BF906F
+-          five                     0x0000000040BF50AF
+-          six                      0x0000000040BFD02F
+-          seven                    0x0000000040BFB04F
+-          eight                    0x0000000040BF708F
+-          nine                     0x0000000040BFF00F
+-          zero                     0x0000000040BF8877
+-          video                    0x0000000040BF20DF
++          KEY_POWER                    0x0000000040BF00FF
++          KEY_1                      0x0000000040BFA05F
++          KEY_2                      0x0000000040BF609F
++          KEY_3                    0x0000000040BFE01F
++          KEY_4                     0x0000000040BF906F
++          KEY_5                     0x0000000040BF50AF
++          KEY_6                      0x0000000040BFD02F
++          KEY_7                    0x0000000040BFB04F
++          KEY_8                    0x0000000040BF708F
++          KEY_9                     0x0000000040BFF00F
++          KEY_0                     0x0000000040BF8877
++          KEY_VIDEO                    0x0000000040BF20DF
+           fullscreen               0x0000000040BF30CF
+           display                  0x0000000040BF48B7
+           color                    0x0000000040BFC837
+           loop                     0x0000000040BF08F7
+           coloup                   0x0000000040BF6897
+           colordn                  0x0000000040BFE817
+-          preview                  0x0000000040BF28D7
++          KEY_PREVIOUS                  0x0000000040BF28D7
+           autoscan                 0x0000000040BF9867
+           freeze                   0x0000000040BF58A7
+           capture                  0x0000000040BFD827
+-          mute                     0x0000000040BF18E7
+-          volumeup                 0x0000000040BF7887
+-          volumedown               0x0000000040BFF807
+-          chnldown                 0x00000000C03F40BF
+-          chnlup                   0x00000000C03FC03F
++          KEY_MUTE                     0x0000000040BF18E7
++          KEY_VOLUMEUP                 0x0000000040BF7887
++          KEY_VOLUMEDOWN               0x0000000040BFF807
++          KEY_CHANNELDOWN                 0x00000000C03F40BF
++          KEY_CHANNELUP                   0x00000000C03FC03F
+       end codes
+ 
+ end remote
+diff -upr lirc-0.8.3.orig/remotes/bestbuy/lircd.conf.bestbuy lirc-0.8.3/remotes/bestbuy/lircd.conf.bestbuy
+--- lirc-0.8.3.orig/remotes/bestbuy/lircd.conf.bestbuy	2001-04-25 21:07:50.000000000 +0100
++++ lirc-0.8.3/remotes/bestbuy/lircd.conf.bestbuy	2008-08-12 16:14:39.000000000 +0100
+@@ -26,36 +26,36 @@ begin remote
+ 
+ 
+       begin codes
+-          0                        0x0000000000000000
+-          1                        0x0000000000000001
+-          2                        0x0000000000000002
+-          3                        0x0000000000000003
+-          4                        0x0000000000000004
+-          5                        0x0000000000000005
+-          6                        0x0000000000000006
+-          7                        0x0000000000000007
+-          8                        0x0000000000000008
+-          9                        0x0000000000000009
+-          TV                       0x000000000000001C
+-          POWER                    0x0000000000000012
+-          VIDEO                    0x0000000000000011
+-          PREVIEW                  0x000000000000000F
+-          MUTE                     0x0000000000000013
++          KEY_0                        0x0000000000000000
++          KEY_1                        0x0000000000000001
++          KEY_2                        0x0000000000000002
++          KEY_3                        0x0000000000000003
++          KEY_4                        0x0000000000000004
++          KEY_5                        0x0000000000000005
++          KEY_6                        0x0000000000000006
++          KEY_7                        0x0000000000000007
++          KEY_8                        0x0000000000000008
++          KEY_9                        0x0000000000000009
++          KEY_TV                       0x000000000000001C
++          KEY_POWER                    0x0000000000000012
++          KEY_VIDEO                    0x0000000000000011
++          KEY_PREVIOUS                  0x000000000000000F
++          KEY_MUTE                     0x0000000000000013
+           SCAN                     0x0000000000000010
+-          CHANNEL_UP               0x000000000000001A
+-          CHANNEL_DOWN             0x000000000000001E
+-          VOL_UP                   0x000000000000001B
+-          VOL_DOWN                 0x000000000000001F
++          KEY_CHANNELUP               0x000000000000001A
++          KEY_CHANNELDOWN             0x000000000000001E
++          KEY_VOLUMEUP                   0x000000000000001B
++          KEY_VOLUMEDOWN                 0x000000000000001F
+           LOOP                     0x000000000000000A
+           100                      0x0000000000000017
+-          ZOOM                     0x000000000000000D
+-          RECORD                   0x000000000000000E
+-          STOP                     0x000000000000001D
+-          PLAY                     0x0000000000000019
++          KEY_ZOOM                     0x000000000000000D
++          KEY_RECORD                   0x000000000000000E
++          KEY_STOP                     0x000000000000001D
++          KEY_PLAY                     0x0000000000000019
+           FREEZE                   0x0000000000000016
+           COLOR                    0x0000000000000014
+-          LEFT                     0x0000000000000018
+-          RIGHT                    0x000000000000000C
++          KEY_LEFT                     0x0000000000000018
++          KEY_RIGHT                    0x000000000000000C
+       end codes
+ 
+ end remote
+diff -upr lirc-0.8.3.orig/remotes/bestbuy/lircd.conf.bestbuy2 lirc-0.8.3/remotes/bestbuy/lircd.conf.bestbuy2
+--- lirc-0.8.3.orig/remotes/bestbuy/lircd.conf.bestbuy2	2005-10-29 21:10:15.000000000 +0100
++++ lirc-0.8.3/remotes/bestbuy/lircd.conf.bestbuy2	2008-08-12 16:14:39.000000000 +0100
+@@ -27,29 +27,29 @@ begin remote
+       begin codes
+           TV/FM                    0x0000000000000043
+           SCAN                     0x0000000000000047
+-          ZOOM                     0x000000000000005C
+-          POWER                    0x000000000000005E
+-          1                        0x0000000000000041
+-          2                        0x000000000000004B
+-          3                        0x000000000000005B
+-          VOL+                     0x000000000000005F
+-          4                        0x0000000000000045
+-          5                        0x0000000000000049
+-          6                        0x0000000000000055
+-          VOL-                     0x0000000000000057
+-          7                        0x0000000000000046
+-          8                        0x000000000000004A
+-          9                        0x0000000000000052
+-          CH+                      0x0000000000000056
+-          0                        0x0000000000000042
++          KEY_ZOOM                     0x000000000000005C
++          KEY_POWER                    0x000000000000005E
++          KEY_1                        0x0000000000000041
++          KEY_2                        0x000000000000004B
++          KEY_3                        0x000000000000005B
++          KEY_VOLUMEUP                     0x000000000000005F
++          KEY_4                        0x0000000000000045
++          KEY_5                        0x0000000000000049
++          KEY_6                        0x0000000000000055
++          KEY_VOLUMEDOWN                     0x0000000000000057
++          KEY_7                        0x0000000000000046
++          KEY_8                        0x000000000000004A
++          KEY_9                        0x0000000000000052
++          KEY_CHANNELUP                      0x0000000000000056
++          KEY_0                        0x0000000000000042
+           LOOP                     0x0000000000000053
+           +100                     0x0000000000000050
+-          CH-                      0x0000000000000054
++          KEY_CHANNELDOWN                      0x0000000000000054
+           SOURCE                   0x0000000000000040
+-          MUTE                     0x0000000000000058
+-          -                        0x0000000000000044
++          KEY_MUTE                     0x0000000000000058
++          KEY_KPMINUS                        0x0000000000000044
+           FUNCTION                 0x000000000000004E
+-          +                        0x000000000000004C
++          KEY_KPPLUS                        0x000000000000004C
+           RESET                    0x000000000000004D
+           FREEZE                   0x000000000000004F
+       end codes
+diff -upr lirc-0.8.3.orig/remotes/caraca/lircd.conf.caraca lirc-0.8.3/remotes/caraca/lircd.conf.caraca
+--- lirc-0.8.3.orig/remotes/caraca/lircd.conf.caraca	2000-08-25 20:21:17.000000000 +0100
++++ lirc-0.8.3/remotes/caraca/lircd.conf.caraca	2008-08-12 16:14:40.000000000 +0100
+@@ -17,29 +17,29 @@ begin remote
+   bits           16
+ 
+       begin codes
+-          POWER                    0x3ff3
+-          1                        0x3ffe
+-          2                        0x3ffd
+-          3                        0x3ffc
+-          4                        0x3ffb
+-          5                        0x3ffa
+-          6                        0x3ff9
+-          7                        0x3ff8
+-          8                        0x3ff7
+-          9                        0x3ff6
+-          0                        0x3ff5
+-          PAUSE                    0x3fcf
+-          EJECT                    0x3fe2
++          KEY_POWER                    0x3ff3
++          KEY_1                        0x3ffe
++          KEY_2                        0x3ffd
++          KEY_3                        0x3ffc
++          KEY_4                        0x3ffb
++          KEY_5                        0x3ffa
++          KEY_6                        0x3ff9
++          KEY_7                        0x3ff8
++          KEY_8                        0x3ff7
++          KEY_9                        0x3ff6
++          KEY_0                        0x3ff5
++          KEY_PAUSE                    0x3fcf
++          KEY_EJECTCD                    0x3fe2
+           SEEK-                    0x3fcd
+-          PLAY                     0x3fca
++          KEY_PLAY                     0x3fca
+           SEEK+                    0x3fcb
+-          RECORD                   0x3fd2
+-          STOP                     0x3fc9
+-          CH-                      0x3fde
+-          CH+                      0x3fdf
+-          VOL-                     0x3fee
+-          VOL+                     0x3fef
+-          MUTE                     0x3ff2
++          KEY_RECORD                   0x3fd2
++          KEY_STOP                     0x3fc9
++          KEY_CHANNELDOWN                      0x3fde
++          KEY_CHANNELUP                      0x3fdf
++          KEY_VOLUMEDOWN                     0x3fee
++          KEY_VOLUMEUP                     0x3fef
++          KEY_MUTE                     0x3ff2
+           TV/FM                    0x3fe3
+       end codes
+ 
+diff -upr lirc-0.8.3.orig/remotes/chronos/lircd.conf.chronos lirc-0.8.3/remotes/chronos/lircd.conf.chronos
+--- lirc-0.8.3.orig/remotes/chronos/lircd.conf.chronos	2008-08-12 16:13:39.000000000 +0100
++++ lirc-0.8.3/remotes/chronos/lircd.conf.chronos	2008-08-12 16:14:39.000000000 +0100
+@@ -20,37 +20,37 @@ begin remote
+   toggle_bit      0
+ 
+       begin codes
+-          POWER                    0x0000000000000000
+-          MOUSE_MODE               0x0000000000000010
++          KEY_POWER                    0x0000000000000000
++          BTN_MODE               0x0000000000000010
+           FULL_SCREEN              0x0000000000000008
+-          CH+                      0x0000000000000009
+-          CH-                      0x0000000000000019
+-          1                        0x0000000000000018
+-          2                        0x0000000000000004
+-          3                        0x0000000000000014
+-          4                        0x000000000000001C
+-          5                        0x0000000000000002
+-          6                        0x0000000000000012
+-          7                        0x000000000000001A
+-          8                        0x0000000000000006
+-          9                        0x0000000000000016
+-          0                        0x000000000000001E
+-          VOL+                     0x0000000000000005
+-          VOL-                     0x000000000000001D
++          KEY_CHANNELUP                      0x0000000000000009
++          KEY_CHANNELDOWN                      0x0000000000000019
++          KEY_1                        0x0000000000000018
++          KEY_2                        0x0000000000000004
++          KEY_3                        0x0000000000000014
++          KEY_4                        0x000000000000001C
++          KEY_5                        0x0000000000000002
++          KEY_6                        0x0000000000000012
++          KEY_7                        0x000000000000001A
++          KEY_8                        0x0000000000000006
++          KEY_9                        0x0000000000000016
++          KEY_0                        0x000000000000001E
++          KEY_VOLUMEUP                     0x0000000000000005
++          KEY_VOLUMEDOWN                     0x000000000000001D
+           SOURCE                   0x0000000000000003
+-          MUTE                     0x000000000000001B
+-          AUDIO                    0x0000000000000015
+-          VIDEO                    0x0000000000000011
+-          CANCEL                   0x000000000000001F
+-          ENTER                    0x0000000000000001
+-          ESC                      0x000000000000000B
++          KEY_MUTE                     0x000000000000001B
++          KEY_AUDIO                    0x0000000000000015
++          KEY_VIDEO                    0x0000000000000011
++          KEY_CANCEL                   0x000000000000001F
++          KEY_ENTER                    0x0000000000000001
++          KEY_ESC                      0x000000000000000B
+           RECALL                   0x000000000000000C
+           AIR_CATV                 0x000000000000000E
+           INC                      0x000000000000000A
+           DEC                      0x000000000000000D
+           BOX                      0x0000000000000017
+-          DOWN_ARROW               0x0000000000000013
+-          LEFT_ARROW_TERM          0x000000000000000F
+-          RIGHT_ARROW_TERM         0x0000000000000007
++          KEY_DOWN               0x0000000000000013
++          KEY_LEFT          0x000000000000000F
++          KEY_RIGHT         0x0000000000000007
+       end codes
+ end remote
+diff -upr lirc-0.8.3.orig/remotes/cph03x/lircd.conf.cph03x lirc-0.8.3/remotes/cph03x/lircd.conf.cph03x
+--- lirc-0.8.3.orig/remotes/cph03x/lircd.conf.cph03x	2001-06-14 16:49:16.000000000 +0100
++++ lirc-0.8.3/remotes/cph03x/lircd.conf.cph03x	2008-08-12 16:14:40.000000000 +0100
+@@ -32,39 +32,39 @@ begin remote
+   repeat_bit      0
+ 
+       begin codes
+-          0                        0x00000000000000FF
+-          1                        0x000000000000807F
+-          2                        0x00000000000040BF
+-          3                        0x000000000000C03F
+-          4                        0x00000000000020DF
+-          5                        0x000000000000A05F
+-          6                        0x000000000000609F
+-          7                        0x000000000000E01F
+-          8                        0x00000000000010EF
+-          9                        0x000000000000906F
++          KEY_0                        0x00000000000000FF
++          KEY_1                        0x000000000000807F
++          KEY_2                        0x00000000000040BF
++          KEY_3                        0x000000000000C03F
++          KEY_4                        0x00000000000020DF
++          KEY_5                        0x000000000000A05F
++          KEY_6                        0x000000000000609F
++          KEY_7                        0x000000000000E01F
++          KEY_8                        0x00000000000010EF
++          KEY_9                        0x000000000000906F
+           LOOP                     0x00000000000050AF
+ # unused
+           FINE_UP(PLUS)            0x00000000000030CF
+-          ZOOM                     0x000000000000B04F
+-          RECORD                   0x000000000000708F
+-          PREVIEW                  0x000000000000F00F
++          KEY_ZOOM                     0x000000000000B04F
++          KEY_RECORD                   0x000000000000708F
++          KEY_PREVIOUS                  0x000000000000F00F
+ 
+           SCAN                     0x00000000000008F7
+-          VIDEO                    0x0000000000008877
+-          POWER                    0x00000000000048B7
+-          MUTE                     0x000000000000C837
++          KEY_VIDEO                    0x0000000000008877
++          KEY_POWER                    0x00000000000048B7
++          KEY_MUTE                     0x000000000000C837
+           COLOR                    0x00000000000028D7
+ #unused
+           FREEZE                   0x0000000000006897
+           100                      0x000000000000E817
+           FINE_DOWN(MINUS)         0x00000000000018E7
+-          PLAY                     0x0000000000009867
+-          CH_UP                    0x00000000000058A7
+-          VOL_UP                   0x000000000000D827
+-          TV                       0x00000000000038C7
+-          STOP                     0x000000000000B847
+-          CH_DOWN                  0x0000000000007887
+-          VOL_DOWN                 0x000000000000F807
++          KEY_PLAY                     0x0000000000009867
++          KEY_CHANNELUP                    0x00000000000058A7
++          KEY_VOLUMEUP                   0x000000000000D827
++          KEY_TV                       0x00000000000038C7
++          KEY_STOP                     0x000000000000B847
++          KEY_CHANNELDOWN                  0x0000000000007887
++          KEY_VOLUMEDOWN                 0x000000000000F807
+       end codes
+ 
+ end remote
+diff -upr lirc-0.8.3.orig/remotes/creative/lircd.conf.alsa_usb lirc-0.8.3/remotes/creative/lircd.conf.alsa_usb
+--- lirc-0.8.3.orig/remotes/creative/lircd.conf.alsa_usb	2008-01-26 09:01:16.000000000 +0000
++++ lirc-0.8.3/remotes/creative/lircd.conf.alsa_usb	2008-08-12 16:14:40.000000000 +0100
+@@ -34,38 +34,38 @@ begin remote
+ 
+ 
+       begin codes
+-          Power                    0x000000000000619E
+-          1                        0x0000000000008B74
+-          2                        0x0000000000008F70
+-          3                        0x000000000000906F
+-          4                        0x0000000000008A75
+-          5                        0x000000000000847B
+-          6                        0x0000000000007887
+-          7                        0x0000000000008976
+-          8                        0x000000000000837C
+-          9                        0x0000000000007788
+-          0                        0x000000000000807F
++          KEY_POWER                    0x000000000000619E
++          KEY_1                        0x0000000000008B74
++          KEY_2                        0x0000000000008F70
++          KEY_3                        0x000000000000906F
++          KEY_4                        0x0000000000008A75
++          KEY_5                        0x000000000000847B
++          KEY_6                        0x0000000000007887
++          KEY_7                        0x0000000000008976
++          KEY_8                        0x000000000000837C
++          KEY_9                        0x0000000000007788
++          KEY_0                        0x000000000000807F
+           CMSS                     0x000000000000718E
+           EAX                      0x0000000000008C73
+-          Mute                     0x0000000000006E91
+-          Vol_Down                 0x000000000000639C
+-          Vol_Up                   0x000000000000629D
+-          Up                       0x0000000000007B84
+-          Left                     0x0000000000008778
+-          Ok                       0x000000000000817E
+-          Right                    0x000000000000758A
+-          Down                     0x0000000000008D72
++          KEY_MUTE                     0x0000000000006E91
++          KEY_VOLUMEDOWN                 0x000000000000639C
++          KEY_VOLUMEUP                   0x000000000000629D
++          KEY_UP                       0x0000000000007B84
++          KEY_LEFT                     0x0000000000008778
++          KEY_OK                       0x000000000000817E
++          KEY_RIGHT                    0x000000000000758A
++          KEY_DOWN                     0x0000000000008D72
+           Return                   0x0000000000008E71
+           Start                    0x0000000000008877
+-          Cancel                   0x0000000000007C83
+-          Rec                      0x000000000000738C
+-          Options                  0x000000000000827D
++          KEY_CANCEL                   0x0000000000007C83
++          KEY_RECORD                      0x000000000000738C
++          KEY_OPTION                  0x000000000000827D
+           Display                  0x0000000000007689
+-          Previous                 0x0000000000007F80
+-          Play                     0x0000000000007986
+-          Next                     0x0000000000007A85
+-          Slow                     0x0000000000007D82
+-          Stop                     0x000000000000857A
++          KEY_PREVIOUS                 0x0000000000007F80
++          KEY_PLAY                     0x0000000000007986
++          KEY_NEXT                     0x0000000000007A85
++          KEY_SLOW                     0x0000000000007D82
++          KEY_STOP                     0x000000000000857A
+           Step                     0x0000000000007E81
+       end codes
+ 
+diff -upr lirc-0.8.3.orig/remotes/creative/lircd.conf.breakoutbox lirc-0.8.3/remotes/creative/lircd.conf.breakoutbox
+--- lirc-0.8.3.orig/remotes/creative/lircd.conf.breakoutbox	2007-02-20 04:08:04.000000000 +0000
++++ lirc-0.8.3/remotes/creative/lircd.conf.breakoutbox	2008-08-12 16:14:40.000000000 +0100
+@@ -19,37 +19,37 @@ begin remote
+       begin codes
+           DVD/CD                   0x0000000000000001
+           DVR/TV                   0x0000000000000000
+-          MENU                     0x0000000000000003
+-          LANG                     0x0000000000000005
++          KEY_MENU                     0x0000000000000003
++          KEY_LANGUAGE                     0x0000000000000005
+           PLAYLIST                 0x0000000000000011
+-          BACKWARD                 0x000000000000000A
+-          PLAY                     0x0000000000000008
+-          FORWARD                  0x000000000000000F
++          KEY_REWIND                 0x000000000000000A
++          KEY_PLAY                     0x0000000000000008
++          KEY_FORWARD                  0x000000000000000F
+           LAST                     0x0000000000000002
+-          STOP                     0x0000000000000007
+-          NEXT                     0x0000000000000006
+-          MUTE                     0x0000000000000014
++          KEY_STOP                     0x0000000000000007
++          KEY_NEXT                     0x0000000000000006
++          KEY_MUTE                     0x0000000000000014
+           STEP                     0x0000000000000009
+-          UP                       0x000000000000000C
+-          LEFT                     0x000000000000000B
+-          RIGHT                    0x000000000000000D
+-          DOWN                     0x000000000000000E
+-          VOL+                     0x0000000000000012
+-          VOL-                     0x0000000000000015
+-          OK                       0x0000000000000011
++          KEY_UP                       0x000000000000000C
++          KEY_LEFT                     0x000000000000000B
++          KEY_RIGHT                    0x000000000000000D
++          KEY_DOWN                     0x000000000000000E
++          KEY_VOLUMEUP                     0x0000000000000012
++          KEY_VOLUMEDOWN                     0x0000000000000015
++          KEY_OK                       0x0000000000000011
+           ANGLE+                   0x0000000000000010
+           ANGLE-                   0x0000000000000013
+-          REC                      0x0000000000000004
+-          1                        0x0000000000000016
+-          2                        0x0000000000000017
+-          3                        0x0000000000000018
+-          4                        0x0000000000000019
+-          5                        0x000000000000001A
+-          6                        0x000000000000001B
+-          7                        0x000000000000001C
+-          8                        0x000000000000001D
+-          9                        0x000000000000001E
+-          0                        0x000000000000001F
++          KEY_RECORD                      0x0000000000000004
++          KEY_1                        0x0000000000000016
++          KEY_2                        0x0000000000000017
++          KEY_3                        0x0000000000000018
++          KEY_4                        0x0000000000000019
++          KEY_5                        0x000000000000001A
++          KEY_6                        0x000000000000001B
++          KEY_7                        0x000000000000001C
++          KEY_8                        0x000000000000001D
++          KEY_9                        0x000000000000001E
++          KEY_0                        0x000000000000001F
+       end codes
+ 
+ end remote
+diff -upr lirc-0.8.3.orig/remotes/creative/lircd.conf.creative lirc-0.8.3/remotes/creative/lircd.conf.creative
+--- lirc-0.8.3.orig/remotes/creative/lircd.conf.creative	2007-03-10 20:15:49.000000000 +0000
++++ lirc-0.8.3/remotes/creative/lircd.conf.creative	2008-08-12 16:14:40.000000000 +0100
+@@ -23,30 +23,30 @@ begin remote
+   toggle_bit      0
+ 
+       begin codes
+-          play                     0x19e6
+-          stop                     0x1ae5
+-          pause                    0x1be4
+-          eject                    0x1ce3
++          KEY_PLAY                     0x19e6
++          KEY_STOP                     0x1ae5
++          KEY_PAUSE                    0x1be4
++          KEY_EJECTCD                    0x1ce3
+           last                     0x1de2
+           rrev                     0x1ee1
+-          ffwd                     0x1fe0
+-          next                     0x20df
+-          1                        0x21de
+-          2                        0x22dd
+-          3                        0x23dc
++          KEY_FASTFORWARD                     0x1fe0
++          KEY_NEXT                     0x20df
++          KEY_1                        0x21de
++          KEY_2                        0x22dd
++          KEY_3                        0x23dc
+           shift                    0x24db
+-          4                        0x25da
+-          5                        0x26d9
+-          6                        0x27d8
++          KEY_4                        0x25da
++          KEY_5                        0x26d9
++          KEY_6                        0x27d8
+           mouse                    0x28d7
+-          7                        0x29d6
+-          8                        0x2ad5
+-          9                        0x2bd4
+-          vol+                     0x2cd3
++          KEY_7                        0x29d6
++          KEY_8                        0x2ad5
++          KEY_9                        0x2bd4
++          KEY_VOLUMEUP                     0x2cd3
+           start                    0x2dd2
+-          0                        0x2ed1
+-          mute                     0x2fd0
+-          vol-                     0x30cf
++          KEY_0                        0x2ed1
++          KEY_MUTE                     0x2fd0
++          KEY_VOLUMEDOWN                     0x30cf
+       end codes
+ 
+ end remote
+diff -upr lirc-0.8.3.orig/remotes/creative/lircd.conf.infracd lirc-0.8.3/remotes/creative/lircd.conf.infracd
+--- lirc-0.8.3.orig/remotes/creative/lircd.conf.infracd	2003-05-07 18:30:41.000000000 +0100
++++ lirc-0.8.3/remotes/creative/lircd.conf.infracd	2008-08-12 16:14:40.000000000 +0100
+@@ -30,30 +30,30 @@ begin remote
+ 
+ 
+       begin codes
+-          PAUSE                    0x00000000000001FE
+-          PLAY                     0x00000000000002FD
+-          STOP                     0x00000000000003FC
+-          REW                      0x00000000000005FA
+-          PREV                     0x00000000000006F9
+-          FF                       0x00000000000007F8
+-          MENU                     0x00000000000004FB
++          KEY_PAUSE                    0x00000000000001FE
++          KEY_PLAY                     0x00000000000002FD
++          KEY_STOP                     0x00000000000003FC
++          KEY_REWIND                      0x00000000000005FA
++          KEY_PREVIOUS                     0x00000000000006F9
++          KEY_FASTFORWARD                       0x00000000000007F8
++          KEY_MENU                     0x00000000000004FB
+           MOUSE                    0x00000000000008F7
+-          1                        0x00000000000009F6
+-          2                        0x0000000000000AF5
+-          3                        0x0000000000000BF4
+-          4                        0x0000000000000DF2
+-          5                        0x0000000000000EF1
+-          6                        0x0000000000000FF0
+-          7                        0x00000000000011EE
+-          8                        0x00000000000012ED
+-          9                        0x00000000000013EC
+-          0                        0x00000000000016E9
+-          MUTE                     0x0000000000000CF3
+-          VOL_UP                   0x00000000000010EF
+-          VOL_DOWN                 0x00000000000014EB
++          KEY_1                        0x00000000000009F6
++          KEY_2                        0x0000000000000AF5
++          KEY_3                        0x0000000000000BF4
++          KEY_4                        0x0000000000000DF2
++          KEY_5                        0x0000000000000EF1
++          KEY_6                        0x0000000000000FF0
++          KEY_7                        0x00000000000011EE
++          KEY_8                        0x00000000000012ED
++          KEY_9                        0x00000000000013EC
++          KEY_0                        0x00000000000016E9
++          KEY_MUTE                     0x0000000000000CF3
++          KEY_VOLUMEUP                   0x00000000000010EF
++          KEY_VOLUMEDOWN                 0x00000000000014EB
+           SHIFT                    0x00000000000015EA
+-          ENTER                    0x00000000000017E8
+-          ZOOM                     0x00000000000018E7
++          KEY_ENTER                    0x00000000000017E8
++          KEY_ZOOM                     0x00000000000018E7
+       end codes
+ 
+ end remote
+diff -upr lirc-0.8.3.orig/remotes/creative/lircd.conf.livedrive lirc-0.8.3/remotes/creative/lircd.conf.livedrive
+--- lirc-0.8.3.orig/remotes/creative/lircd.conf.livedrive	2008-08-12 16:13:39.000000000 +0100
++++ lirc-0.8.3/remotes/creative/lircd.conf.livedrive	2008-08-12 16:14:40.000000000 +0100
+@@ -29,40 +29,40 @@ begin remote
+ 
+ 
+       begin codes
+-          1                        0x0000000000008B74
+-          2                        0x0000000000008F70
+-          3                        0x000000000000906F
+-          4                        0x0000000000008A75
+-          5                        0x000000000000847B
+-          6                        0x0000000000007887
+-          7                        0x0000000000008976
+-          8                        0x000000000000837C
+-          9                        0x0000000000007788
+-          0                        0x000000000000807F
+-          stop                     0x000000000000857A
+-          play                     0x0000000000007986
+-          pause                    0x0000000000007986
+-          slow                     0x0000000000007D82
++          KEY_1                        0x0000000000008B74
++          KEY_2                        0x0000000000008F70
++          KEY_3                        0x000000000000906F
++          KEY_4                        0x0000000000008A75
++          KEY_5                        0x000000000000847B
++          KEY_6                        0x0000000000007887
++          KEY_7                        0x0000000000008976
++          KEY_8                        0x000000000000837C
++          KEY_9                        0x0000000000007788
++          KEY_0                        0x000000000000807F
++          KEY_STOP                     0x000000000000857A
++          KEY_PLAY                     0x0000000000007986
++          KEY_PAUSE                    0x0000000000007986
++          KEY_SLOW                     0x0000000000007D82
+           step                     0x0000000000007E81
+-          prev                     0x0000000000007F80
+-          next                     0x0000000000007A85
+-          mute                     0x0000000000006E91
+-          vol-                     0x000000000000639C
+-          vol+                     0x000000000000629D
++          KEY_PREVIOUS                     0x0000000000007F80
++          KEY_NEXT                     0x0000000000007A85
++          KEY_MUTE                     0x0000000000006E91
++          KEY_VOLUMEDOWN                     0x000000000000639C
++          KEY_VOLUMEUP                     0x000000000000629D
+           eax                      0x0000000000008C73
+-          options                  0x000000000000827D
++          KEY_OPTION                  0x000000000000827D
+           display                  0x0000000000007689
+           return                   0x0000000000008E71
+           start                    0x0000000000008877
+-          close                    0x0000000000007C83
+-          up                       0x0000000000007B84
+-          down                     0x0000000000008D72
+-          left                     0x0000000000008778
+-          right                    0x000000000000758A
+-          ok                       0x000000000000817E
+-	  power                    0x000000000000619e
++          KEY_CLOSE                    0x0000000000007C83
++          KEY_UP                       0x0000000000007B84
++          KEY_DOWN                     0x0000000000008D72
++          KEY_LEFT                     0x0000000000008778
++          KEY_RIGHT                    0x000000000000758A
++          KEY_OK                       0x000000000000817E
++	  KEY_POWER                    0x000000000000619e
+ 	  cmss                     0x000000000000718e
+-	  record                   0x000000000000738c
++	  KEY_RECORD                   0x000000000000738c
+ 	  
+       end codes
+ 
+diff -upr lirc-0.8.3.orig/remotes/dvico/lircd.conf.fusionHDTV lirc-0.8.3/remotes/dvico/lircd.conf.fusionHDTV
+--- lirc-0.8.3.orig/remotes/dvico/lircd.conf.fusionHDTV	2006-05-06 05:38:39.000000000 +0100
++++ lirc-0.8.3/remotes/dvico/lircd.conf.fusionHDTV	2008-08-12 16:14:39.000000000 +0100
+@@ -22,42 +22,42 @@ begin remote
+   toggle_bit     0
+ 
+       begin codes
+-          1                        0x00000000000011F9
+-          2                        0x00000000000012F9
+-          3                        0x00000000000013F9
+-          4                        0x00000000000014F9
+-          5                        0x00000000000015F9
+-          6                        0x00000000000016F9
+-          7                        0x00000000000017F9
+-          8                        0x00000000000018F9
+-          9                        0x00000000000019F9
+-          0                        0x00000000000010F9
+-          power                    0x0000000000000AF9
++          KEY_1                        0x00000000000011F9
++          KEY_2                        0x00000000000012F9
++          KEY_3                        0x00000000000013F9
++          KEY_4                        0x00000000000014F9
++          KEY_5                        0x00000000000015F9
++          KEY_6                        0x00000000000016F9
++          KEY_7                        0x00000000000017F9
++          KEY_8                        0x00000000000018F9
++          KEY_9                        0x00000000000019F9
++          KEY_0                        0x00000000000010F9
++          KEY_POWER                    0x0000000000000AF9
+           pcoff                    0x0000000000000CF9
+-          camera                   0x0000000000001AF9
+-          record                   0x0000000000001BF9
+-          chup                     0x00000000000000F9
+-          chdown                   0x00000000000001F9
+-          volup                    0x00000000000002F9
+-          voldown                  0x00000000000003F9
+-          playpause                0x0000000000001FF9
+-          rew                      0x0000000000001CF9
+-          stop                     0x0000000000001EF9
+-          ff                       0x0000000000001DF9
+-          folder                   0x00000000000040F9
++          KEY_CAMERA                   0x0000000000001AF9
++          KEY_RECORD                   0x0000000000001BF9
++          KEY_CHANNELUP                     0x00000000000000F9
++          KEY_CHANNELDOWN                   0x00000000000001F9
++          KEY_VOLUMEUP                    0x00000000000002F9
++          KEY_VOLUMEDOWN                  0x00000000000003F9
++          KEY_PLAYPAUSE                0x0000000000001FF9
++          KEY_REWIND                      0x0000000000001CF9
++          KEY_STOP                     0x0000000000001EF9
++          KEY_FASTFORWARD                       0x0000000000001DF9
++          KEY_DIRECTORY                   0x00000000000040F9
+           atvdtv                   0x00000000000006F9
+           dvhs                     0x00000000000041F9
+-          menu                     0x00000000000008F9
++          KEY_MENU                     0x00000000000008F9
+           aspect                   0x00000000000007F9
+-          zoom                     0x00000000000004F9
+-          epg                      0x0000000000000BF9
+-          mute                     0x0000000000000DF9
+-          back                     0x0000000000000EF9
++          KEY_ZOOM                     0x00000000000004F9
++          KEY_EPG                      0x0000000000000BF9
++          KEY_MUTE                     0x0000000000000DF9
++          KEY_BACK                     0x0000000000000EF9
+           hd                       0x0000000000000FF9
+-          red                      0x00000000000005F9
+-          green                    0x00000000000009F9
+-          yellow                   0x00000000000042F9
+-          blue                     0x00000000000043F9
++          KEY_RED                      0x00000000000005F9
++          KEY_GREEN                    0x00000000000009F9
++          KEY_YELLOW                   0x00000000000042F9
++          KEY_BLUE                     0x00000000000043F9
+       end codes
+ 
+ end remote
+diff -upr lirc-0.8.3.orig/remotes/ea65/lircd.conf.ea65 lirc-0.8.3/remotes/ea65/lircd.conf.ea65
+--- lirc-0.8.3.orig/remotes/ea65/lircd.conf.ea65	2004-11-20 13:43:48.000000000 +0000
++++ lirc-0.8.3/remotes/ea65/lircd.conf.ea65	2008-08-12 16:14:39.000000000 +0100
+@@ -18,53 +18,53 @@ begin remote
+         htpc        0x0011811b
+         dvd/vcd     0x00128100
+         cd/mp3      0x00138152
+-        fm          0x00158111
+-        video       0x0016810f
++        KEY_RADIO          0x00158111
++        KEY_VIDEO       0x0016810f
+ 
+-        1           0x0041810b
+-        2           0x00428115
+-        3           0x00438112
+-        4           0x00448141
+-        5           0x00458119
+-        6           0x00468116
+-        7           0x00478150
+-        8           0x0048811a
+-        9           0x00498155
++        KEY_1           0x0041810b
++        KEY_2           0x00428115
++        KEY_3           0x00438112
++        KEY_4           0x00448141
++        KEY_5           0x00458119
++        KEY_6           0x00468116
++        KEY_7           0x00478150
++        KEY_8           0x0048811a
++        KEY_9           0x00498155
+         *           0x00328156
+-        0           0x00408158
++        KEY_0           0x00408158
+         #           0x0030814d
+         
+-        menu        0x00188104
+-        exit        0x001d8154
+-        enter       0x001e8101
+-        up          0x00198159
+-        down        0x001a811c
+-        left        0x001c8102
+-        right       0x001b815d
++        KEY_MENU        0x00188104
++        KEY_EXIT        0x001d8154
++        KEY_ENTER       0x001e8101
++        KEY_UP          0x00198159
++        KEY_DOWN        0x001a811c
++        KEY_LEFT        0x001c8102
++        KEY_RIGHT       0x001b815d
+ 
+- 	vol+        0x00298103
+- 	vol-        0x002a814e
+- 	ch+         0x002c8113
+- 	ch-         0x002d8117
+- 	mute        0x00288105
++ 	KEY_VOLUMEUP        0x00298103
++ 	KEY_VOLUMEDOWN        0x002a814e
++ 	KEY_CHANNELUP         0x002c8113
++ 	KEY_CHANNELDOWN         0x002d8117
++ 	KEY_MUTE        0x00288105
+  	tune+       0x002e8144
+  	tune-       0x002f8148
+  	mem         0x00318145
+  	scan        0x00278151
+ 
+  	display     0x0034811f
+- 	eject       0x0035815c
+- 	rwnd        0x00228118
+- 	ffwd        0x00218110
+- 	rec         0x002b810a
+- 	repeate     0x0038815a
+- 	prev        0x00238107
+- 	next        0x00248114
++ 	KEY_EJECTCD       0x0035815c
++ 	KEY_REWIND        0x00228118
++ 	KEY_FASTFORWARD        0x00218110
++ 	KEY_RECORD         0x002b810a
++ 	KEY_AGAIN     0x0038815a
++ 	KEY_PREVIOUS        0x00238107
++ 	KEY_NEXT        0x00248114
+  	time/shift  0x00338108
+- 	stop        0x0020811d
+- 	play/pause  0x001f8109
++ 	KEY_STOP        0x0020811d
++ 	KEY_PLAYPAUSE  0x001f8109
+ 
+-        play-pause  0x0080811d
++        KEY_PLAYPAUSE  0x0080811d
+         stop-eject  0x00238107
+         mode-       0x00ff1080
+         mode+       0x00ff1180
+diff -upr lirc-0.8.3.orig/remotes/ericsson/lircd.conf.bte lirc-0.8.3/remotes/ericsson/lircd.conf.bte
+--- lirc-0.8.3.orig/remotes/ericsson/lircd.conf.bte	2005-03-25 20:40:25.000000000 +0000
++++ lirc-0.8.3/remotes/ericsson/lircd.conf.bte	2008-08-12 16:14:39.000000000 +0100
+@@ -15,38 +15,38 @@ begin remote
+     bits    16
+ 
+     begin codes
+-        0               0x0030
+-        1               0x0031
+-        2               0x0032
+-        3               0x0033
+-        4               0x0034
+-        5               0x0035
+-        6               0x0036
+-        7               0x0037
+-        8               0x0038
+-        9               0x0039
+-        STAR            0x002a  # '*'
+-        HASH            0x0023  # '#'
+-        UP              0x005e  # '^'
+-        DOWN            0x0076  # 'v'
+-        LEFT            0x003c  # '<'
+-        RIGHT           0x003e  # '>'
+-        CANCEL          0x0063  # 'c'
+-        VOL_UP          0x0075  # 'u'
+-        VOL_DOWN        0x0064  # 'd'
++        KEY_0               0x0030
++        KEY_1               0x0031
++        KEY_2               0x0032
++        KEY_3               0x0033
++        KEY_4               0x0034
++        KEY_5               0x0035
++        KEY_6               0x0036
++        KEY_7               0x0037
++        KEY_8               0x0038
++        KEY_9               0x0039
++                    0x002a  # '*'
++                    0x0023  # '#'
++        KEY_UP              0x005e  # '^'
++        KEY_DOWN            0x0076  # 'v'
++        KEY_LEFT            0x003c  # '<'
++        KEY_RIGHT           0x003e  # '>'
++        KEY_CANCEL          0x0063  # 'c'
++        KEY_VOLUMEUP          0x0075  # 'u'
++        KEY_VOLUMEDOWN        0x0064  # 'd'
+ 
+ # t520m
+         NO              0x0065  # 'e'
+-        YES             0x0073  # 's'
+-        OPTION          0x004c  # 'L'
+-        MEMO            0x0047  # 'G' - hides dialog widget!
++                     0x0073  # 's'
++                  0x004c  # 'L'
++                    0x0047  # 'G' - hides dialog widget!
+ 
+ # t630
+         F_LEFT          0x005b  # '['
+         F_RIGHT         0x005d  # ']'  - triggers 'e'
+         J_CLICK         0x3a4a  # ':J' - triggers 'e'
+         RETURN          0x3a52  # ':R' - triggers 'e'
+-        CAMERA          0x3a43  # ':C'
++                  0x3a43  # ':C'
+         WAP             0x3a4f  # ':O'
+ 
+       end codes
+diff -upr lirc-0.8.3.orig/remotes/hauppauge/lircd.conf.hauppauge lirc-0.8.3/remotes/hauppauge/lircd.conf.hauppauge
+--- lirc-0.8.3.orig/remotes/hauppauge/lircd.conf.hauppauge	2005-10-05 21:28:15.000000000 +0100
++++ lirc-0.8.3/remotes/hauppauge/lircd.conf.hauppauge	2008-08-12 16:14:39.000000000 +0100
+@@ -27,25 +27,25 @@ begin remote
+   repeat_bit      2
+ 
+       begin codes
+-          TV                       0x000000000000100F
+-          RADIO                    0x000000000000100C
++          KEY_TV                       0x000000000000100F
++          KEY_RADIO                    0x000000000000100C
+           FULL_SCREEN              0x000000000000102E
+-          CH+                      0x0000000000001020
+-          CH-                      0x0000000000001021
+-          VOL-                     0x0000000000001011
+-          VOL+                     0x0000000000001010
+-          MUTE                     0x000000000000100D
++          KEY_CHANNELUP                      0x0000000000001020
++          KEY_CHANNELDOWN                      0x0000000000001021
++          KEY_VOLUMEDOWN                     0x0000000000001011
++          KEY_VOLUMEUP                     0x0000000000001010
++          KEY_MUTE                     0x000000000000100D
+           SOURCE                   0x0000000000001022
+-          1                        0x0000000000001001
+-          2                        0x0000000000001002
+-          3                        0x0000000000001003
+-          4                        0x0000000000001004
+-          5                        0x0000000000001005
+-          6                        0x0000000000001006
+-          7                        0x0000000000001007
+-          8                        0x0000000000001008
+-          9                        0x0000000000001009
+-          0                        0x0000000000001000
++          KEY_1                        0x0000000000001001
++          KEY_2                        0x0000000000001002
++          KEY_3                        0x0000000000001003
++          KEY_4                        0x0000000000001004
++          KEY_5                        0x0000000000001005
++          KEY_6                        0x0000000000001006
++          KEY_7                        0x0000000000001007
++          KEY_8                        0x0000000000001008
++          KEY_9                        0x0000000000001009
++          KEY_0                        0x0000000000001000
+           RESERVED                 0x000000000000101E
+           MINIMIZE                 0x0000000000001026
+       end codes
+diff -upr lirc-0.8.3.orig/remotes/hercules/lircd.conf.smarttv_stereo lirc-0.8.3/remotes/hercules/lircd.conf.smarttv_stereo
+--- lirc-0.8.3.orig/remotes/hercules/lircd.conf.smarttv_stereo	2008-08-12 16:13:39.000000000 +0100
++++ lirc-0.8.3/remotes/hercules/lircd.conf.smarttv_stereo	2008-08-12 16:14:39.000000000 +0100
+@@ -26,36 +26,36 @@ begin remote
+ 
+ 
+       begin codes
+-          POWER                    0x00000000000048B7
+-          MUTE                     0x000000000000C837
+-          PREVIEW                  0x000000000000F00F
++          KEY_POWER                    0x00000000000048B7
++          KEY_MUTE                     0x000000000000C837
++          KEY_PREVIOUS                  0x000000000000F00F
+           FULLSCREEN               0x00000000000038C7
+           AV/TV                    0x0000000000008877
+           TELETEXT                 0x00000000000008F7
+-          1                        0x000000000000807F
+-          2                        0x00000000000040BF
+-          3                        0x000000000000C03F
+-          4                        0x00000000000020DF
+-          5                        0x000000000000A05F
+-          6                        0x000000000000609F
+-          7                        0x000000000000E01F
+-          8                        0x00000000000010EF
+-          9                        0x000000000000906F
+-          0                        0x00000000000000FF
++          KEY_1                        0x000000000000807F
++          KEY_2                        0x00000000000040BF
++          KEY_3                        0x000000000000C03F
++          KEY_4                        0x00000000000020DF
++          KEY_5                        0x000000000000A05F
++          KEY_6                        0x000000000000609F
++          KEY_7                        0x000000000000E01F
++          KEY_8                        0x00000000000010EF
++          KEY_9                        0x000000000000906F
++          KEY_0                        0x00000000000000FF
+           SNAPSHOT                 0x00000000000050AF
+           100+                     0x000000000000E817
+-          CH+                      0x00000000000058A7
+-          CH-                      0x0000000000007887
+-          VOL+                     0x000000000000D827
+-          VOL-                     0x000000000000F807
+-          PAUSE                    0x000000000000B04F
+-          RECORD                   0x000000000000708F
+-          STOP                     0x000000000000B847
+-          PLAY                     0x0000000000009867
++          KEY_CHANNELUP                      0x00000000000058A7
++          KEY_CHANNELDOWN                      0x0000000000007887
++          KEY_VOLUMEUP                     0x000000000000D827
++          KEY_VOLUMEDOWN                     0x000000000000F807
++          KEY_PAUSE                    0x000000000000B04F
++          KEY_RECORD                   0x000000000000708F
++          KEY_STOP                     0x000000000000B847
++          KEY_PLAY                     0x0000000000009867
+           TV_REPLAY                0x0000000000006897
+           TIME_SHIFT               0x00000000000028D7
+-          SEEK_BACK                0x00000000000018E7
+-          SEEK_FWD                 0x00000000000030CF
++          KEY_BACK                0x00000000000018E7
++          KEY_FORWARD                 0x00000000000030CF
+       end codes
+ 
+ end remote
+diff -upr lirc-0.8.3.orig/remotes/imon/lircd.conf.imon lirc-0.8.3/remotes/imon/lircd.conf.imon
+--- lirc-0.8.3.orig/remotes/imon/lircd.conf.imon	2005-04-16 18:05:49.000000000 +0100
++++ lirc-0.8.3/remotes/imon/lircd.conf.imon	2008-08-12 16:14:39.000000000 +0100
+@@ -29,48 +29,48 @@ begin remote
+   duty_cycle   33
+ 
+       begin codes
+-          App.Exit                 0x00000000000000FF
+-          Power                    0x000000000000807F
+-          1                        0x00000000000040BF
+-          2                        0x000000000000C03F
+-          3                        0x00000000000020DF
+-          4                        0x000000000000A05F
+-          5                        0x000000000000609F
+-          6                        0x000000000000E01F
+-          7                        0x00000000000010EF
+-          8                        0x000000000000906F
+-          9                        0x00000000000050AF
+-          0                        0x000000000000D02F
++          KEY_EXIT                 0x00000000000000FF
++          KEY_POWER                    0x000000000000807F
++          KEY_1                        0x00000000000040BF
++          KEY_2                        0x000000000000C03F
++          KEY_3                        0x00000000000020DF
++          KEY_4                        0x000000000000A05F
++          KEY_5                        0x000000000000609F
++          KEY_6                        0x000000000000E01F
++          KEY_7                        0x00000000000010EF
++          KEY_8                        0x000000000000906F
++          KEY_9                        0x00000000000050AF
++          KEY_0                        0x000000000000D02F
+           Windows                  0x00000000000030CF
+-          Menu                     0x000000000000B04F
++          KEY_MENU                     0x000000000000B04F
+           App.Launcher             0x000000000000708F
+           Function                 0x000000000000F00F
+           Task.Switcher            0x00000000000008F7
+-          Back                     0x0000000000008877
+-          Select                   0x00000000000048B7
+-          Eject                    0x0000000000009867
+-          Delete                   0x00000000000018E7
+-          Up                       0x000000000000C837
+-          Right                    0x0000000000006897
+-          Down                     0x000000000000E817
+-          Left                     0x00000000000028D7
+-          Enter                    0x000000000000A857
+-          Vol-                     0x00000000000058A7
+-          Vol+                     0x000000000000D827
+-          Mute                     0x00000000000038C7
+-          Play                     0x000000000000B847
+-          Pause                    0x0000000000007887
+-          Prev                     0x000000000000F807
+-          Next                     0x00000000000002FD
+-          Rew                      0x000000000000827D
+-          Fwd                      0x00000000000042BD
+-          Stop                     0x000000000000C23D
+-          Open                     0x00000000000022DD
+-          Rec                      0x000000000000A25D
+-          Bookmark                 0x000000000000629D
++          KEY_BACK                     0x0000000000008877
++          KEY_SELECT                   0x00000000000048B7
++          KEY_EJECTCD                    0x0000000000009867
++          KEY_DELETE                   0x00000000000018E7
++          KEY_UP                       0x000000000000C837
++          KEY_RIGHT                    0x0000000000006897
++          KEY_DOWN                     0x000000000000E817
++          KEY_LEFT                     0x00000000000028D7
++          KEY_ENTER                    0x000000000000A857
++          KEY_VOLUMEDOWN                     0x00000000000058A7
++          KEY_VOLUMEUP                     0x000000000000D827
++          KEY_MUTE                     0x00000000000038C7
++          KEY_PLAY                     0x000000000000B847
++          KEY_PAUSE                    0x0000000000007887
++          KEY_PREVIOUS                     0x000000000000F807
++          KEY_NEXT                     0x00000000000002FD
++          KEY_REWIND                      0x000000000000827D
++          KEY_FORWARD                      0x00000000000042BD
++          KEY_STOP                     0x000000000000C23D
++          KEY_OPEN                     0x00000000000022DD
++          KEY_RECORD                      0x000000000000A25D
++          KEY_BOOKMARKS                 0x000000000000629D
+           Thumbnail                0x000000000000E21D
+           Aspect                   0x00000000000012ED
+-          DVD.Menu                 0x000000000000926D
++          KEY_DVD                 0x000000000000926D
+           DVD.Caption              0x00000000000052AD
+           DVD.Language             0x000000000000D22D
+           Full.Screen              0x00000000000032CD
+diff -upr lirc-0.8.3.orig/remotes/imon/lircd.conf.imon-2.4g lirc-0.8.3/remotes/imon/lircd.conf.imon-2.4g
+--- lirc-0.8.3.orig/remotes/imon/lircd.conf.imon-2.4g	2007-03-18 10:23:34.000000000 +0000
++++ lirc-0.8.3/remotes/imon/lircd.conf.imon-2.4g	2008-08-12 16:14:39.000000000 +0100
+@@ -20,69 +20,69 @@ begin remote
+ 
+ 
+       begin codes
+-          Power                    0xBB4403FC
++          KEY_POWER                    0xBB4403FC
+ 
+-          RAppExit                 0xBB4431CE
+-          REject                   0xBB4432CD
+-          RAppLauncher             0xBB4437C8
+-          RTaskSwitcher            0xBB4439C6
+-          RBack                    0xBB443DC2
+-          RSelect                  0xBB443FC0
+-          RChannelUp               0xBB443EC1
+-          RChannelDown             0xBB4443BC
+-          RVolumeUp                0xBB4445BA
+-          RVolumeDown              0xBB4444BB
+-          RNext                    0xBB444CB3
+-          RPrev                    0xBB444DB2
+-          RFf                      0xBB444FB0
+-          RRew                     0xBB444EB1
+-          RI                       0xBB4450AF
+-          RMute                    0xBB4449B6
+-          RTv                      0xBB444AB5
+-          RMenu                    0xBB444BB4
+-          R1                       0xBB4434CB
+-          R2                       0xBB4435CA
+-          R3                       0xBB4436C9
+-          R4                       0xBB443AC5
+-          R5                       0xBB443BC4
+-          R6                       0xBB443CC3
+-          R7                       0xBB4440BF
+-          R8                       0xBB4441BE
+-          R9                       0xBB4442BD
+-          RSkipBack                0xBB4446B9
+-          R0                       0xBB4447B8
+-          RSkipFwd                 0xBB4448B7
++                           0xBB4431CE
++                             0xBB4432CD
++                       0xBB4437C8
++                      0xBB4439C6
++                              0xBB443DC2
++                            0xBB443FC0
++                         0xBB443EC1
++                       0xBB4443BC
++                          0xBB4445BA
++                        0xBB4444BB
++                              0xBB444CB3
++                              0xBB444DB2
++                                0xBB444FB0
++                               0xBB444EB1
++                                 0xBB4450AF
++                              0xBB4449B6
++                                0xBB444AB5
++                              0xBB444BB4
++                                 0xBB4434CB
++                                 0xBB4435CA
++                                 0xBB4436C9
++                                 0xBB443AC5
++                                 0xBB443BC4
++                                 0xBB443CC3
++                                 0xBB4440BF
++                                 0xBB4441BE
++                                 0xBB4442BD
++                          0xBB4446B9
++                                 0xBB4447B8
++                           0xBB4448B7
+ 
+-          GAppExit                 0xBB4401FE
+-          GEject                   0xBB4402FD
+-          GAppLauncher             0xBB4407F8
+-          GTaskSwitcher            0xBB4409F6
+-          GBack                    0xBB440DF2
+-          GSelect                  0xBB440FF0
+-          GChannelUp               0xBB440EF1
+-          GChannelDown             0xBB4413EC
+-          GVolumeUp                0xBB4415EA
+-          GVolumeDown              0xBB4414EB
+-          GNext                    0xBB441CE3
+-          GPrev                    0xBB441DE2
+-          GFf                      0xBB441FE0
+-          GRew                     0xBB441EE1
+-          GI                       0xBB4420DF
+-          GMute                    0xBB4419E6
+-          GTv                      0xBB441AE5
+-          GMenu                    0xBB441BE4
+-          G1                       0xBB4404FB
+-          G2                       0xBB4405FA
+-          G3                       0xBB4406F9
+-          G4                       0xBB440AF5
+-          G5                       0xBB440BF4
+-          G6                       0xBB440CF3
+-          G7                       0xBB4410EF
+-          G8                       0xBB4411EE
+-          G9                       0xBB4412ED
+-          GSkipBack                0xBB4416E9
+-          G0                       0xBB4417E8
+-          GSkipFwd                 0xBB4418E7
++                           0xBB4401FE
++                             0xBB4402FD
++                       0xBB4407F8
++                      0xBB4409F6
++                              0xBB440DF2
++                            0xBB440FF0
++                         0xBB440EF1
++                       0xBB4413EC
++                          0xBB4415EA
++                        0xBB4414EB
++                              0xBB441CE3
++                              0xBB441DE2
++                                0xBB441FE0
++                               0xBB441EE1
++                                 0xBB4420DF
++                              0xBB4419E6
++                                0xBB441AE5
++                              0xBB441BE4
++                                 0xBB4404FB
++                                 0xBB4405FA
++                                 0xBB4406F9
++                                 0xBB440AF5
++                                 0xBB440BF4
++                                 0xBB440CF3
++                                 0xBB4410EF
++                                 0xBB4411EE
++                                 0xBB4412ED
++                          0xBB4416E9
++                                 0xBB4417E8
++                           0xBB4418E7
+       end codes
+ 
+ end remote
+diff -upr lirc-0.8.3.orig/remotes/imon/lircd.conf.imon-knob lirc-0.8.3/remotes/imon/lircd.conf.imon-knob
+--- lirc-0.8.3.orig/remotes/imon/lircd.conf.imon-knob	2006-12-29 13:03:50.000000000 +0000
++++ lirc-0.8.3/remotes/imon/lircd.conf.imon-knob	2008-08-12 16:14:39.000000000 +0100
+@@ -23,67 +23,67 @@ begin remote
+ 
+ 
+       begin codes
+-          AppExit                  0x288195B7
+-          Power                    0x289115B7
+-          Record                   0x298115B7
+-          Play                     0x2A8115B7
+-          Open                     0x29B195B7
+-          KnobVolUp                0x000100FF
+-          KnobVolDown              0x010000FF
+-          KnobMute                 0x000008FF
+-          Rewind                   0x2A8195B7
+-          Pause                    0x2A9115B7
+-          FastForward              0x2B8115B7
+-          PrevChapter              0x2B9115B7
+-          Stop                     0x2B9715B7
+-          NextChapter              0x298195BF
++          KEY_EXIT                  0x288195B7
++          KEY_POWER                    0x289115B7
++          KEY_RECORD                   0x298115B7
++          KEY_PLAY                     0x2A8115B7
++          KEY_OPEN                     0x29B195B7
++          KEY_VOLUMEUP                0x000100FF
++          KEY_VOLUMEDOWN              0x010000FF
++          KEY_MUTE                 0x000008FF
++          KEY_REWIND                   0x2A8195B7
++          KEY_PAUSE                    0x2A9115B7
++          KEY_FASTFORWARD              0x2B8115B7
++          KEY_PREVIOUS              0x2B9115B7
++          KEY_STOP                     0x2B9715B7
++          KEY_NEXT              0x298195BF
+           WindowsKey               0x2B8195B7
+-          Backspace                0x28A115B7
++          KEY_BACKSPACE                0x28A115B7
+           MouseKeyboard            0x299115B7
+           SelectSpace              0x2A9315B7
+           MouseMenu                0x28B715B7
+-          MouseRightClick          0x688481B7
+-          Enter                    0x28A195B7
+-          MouseLeftClick           0x688301B7
+-          CursorLeft               0x6ABA81B7
+-          CursorUp                 0x6902F9B7
+-          CursorRight              0x68A281B7
+-          CursorDown               0x6882A1B7
+-          Esc                      0x2BB715B7
+-          Eject                    0x299395B7
++          BTN_RIGHT          0x688481B7
++          KEY_ENTER                    0x28A195B7
++          BTN_LEFT           0x688301B7
++          KEY_LEFT               0x6ABA81B7
++          KEY_UP                 0x6902F9B7
++          KEY_RIGHT              0x68A281B7
++          KEY_DOWN               0x6882A1B7
++          KEY_ESC                      0x2BB715B7
++          KEY_EJECTCD                    0x299395B7
+           AppLauncher              0x29B715B7
+           MultiMon                 0x2AB195B7
+           TaskSwitcher             0x2A9395B7
+-          Mute                     0x2B9595B7
+-          VolUp                    0x28A395B7
+-          VolDown                  0x28A595B7
+-          ChUp                     0x289395B7
+-          ChDown                   0x288795B7
++          KEY_MUTE                     0x2B9595B7
++          KEY_VOLUMEUP                    0x28A395B7
++          KEY_VOLUMEDOWN                  0x28A595B7
++          KEY_CHANNELUP                     0x289395B7
++          KEY_CHANNELDOWN                   0x288795B7
+           Timer                    0x2B8395B7
+-          1                        0x28B595B7
+-          2                        0x2BB195B7
+-          3                        0x28B195B7
+-          4                        0x2A8595B7
+-          5                        0x299595B7
+-          6                        0x2AA595B7
+-          7                        0x2B9395B7
+-          8                        0x2A8515B7
+-          9                        0x2AA115B7
++          KEY_1                        0x28B595B7
++          KEY_2                        0x2BB195B7
++          KEY_3                        0x28B195B7
++          KEY_4                        0x2A8595B7
++          KEY_5                        0x299595B7
++          KEY_6                        0x2AA595B7
++          KEY_7                        0x2B9395B7
++          KEY_8                        0x2A8515B7
++          KEY_9                        0x2AA115B7
+           ShiftTab                 0x28B515B7
+-          0                        0x2BA595BF
+-          Tab                      0x29A115B7
+-          MyMovie                  0x2B8515B7
+-          MyMusic                  0x299195B7
++          KEY_0                        0x2BA595BF
++          KEY_TAB                      0x29A115B7
++          KEY_VIDEO                  0x2B8515B7
++          KEY_AUDIO                  0x299195B7
+           MyPhoto                  0x2BA115B7
+-          MyTV                     0x28A515B7
+-          Bookmark                 0x288515B7
++          KEY_TV                     0x28A515B7
++          KEY_BOOKMARKS                 0x288515B7
+           Thumbnail                0x2AB715BF
+           AspectRatio              0x29A595B7
+           FullScreen               0x2AA395BF
+-          MyDVD                    0x29A295B7
+-          Menu                     0x2BA385B7
++          KEY_DVD                    0x29A295B7
++          KEY_MENU                     0x2BA385B7
+           Caption                  0x298595B7
+-          Language                 0x2B8595B7
++          KEY_LANGUAGE                 0x2B8595B7
+       end codes
+ 
+ end remote
+diff -upr lirc-0.8.3.orig/remotes/imon/lircd.conf.imon-pad lirc-0.8.3/remotes/imon/lircd.conf.imon-pad
+--- lirc-0.8.3.orig/remotes/imon/lircd.conf.imon-pad	2006-11-28 03:18:23.000000000 +0000
++++ lirc-0.8.3/remotes/imon/lircd.conf.imon-pad	2008-08-12 16:14:39.000000000 +0100
+@@ -24,65 +24,65 @@ begin remote
+ 
+ 
+       begin codes
+-          AppExit                  0x288195B7
+-          Record                   0x298115B7
+-          Play                     0x2A8115B7
++          KEY_EXIT                  0x288195B7
++          KEY_RECORD                   0x298115B7
++          KEY_PLAY                     0x2A8115B7
+           SlowMotion               0x29B195B7
+-          Rewind                   0x2A8195B7
+-          Pause                    0x2A9115B7
+-          FastForward              0x2B8115B7
+-          PrevChapter              0x2B9115B7
+-          Stop                     0x2B9715B7
+-          NextChapter              0x298195B7
+-          Esc                      0x2BB715B7
+-          Eject                    0x299395B7
++          KEY_REWIND                   0x2A8195B7
++          KEY_PAUSE                    0x2A9115B7
++          KEY_FASTFORWARD              0x2B8115B7
++          KEY_PREVIOUS              0x2B9115B7
++          KEY_STOP                     0x2B9715B7
++          KEY_NEXT              0x298195B7
++          KEY_ESC                      0x2BB715B7
++          KEY_EJECTCD                    0x299395B7
+           AppLauncher              0x29B715B7
+           MultiMon                 0x2AB195B7
+           TaskSwitcher             0x2A9395B7
+-          Mute                     0x2B9595B7
+-          Vol+                     0x28A395B7
+-          Vol-                     0x28A595B7
+-          Ch+                      0x289395B7
+-          Ch-                      0x288795B7
++          KEY_MUTE                     0x2B9595B7
++          KEY_VOLUMEUP                     0x28A395B7
++          KEY_VOLUMEDOWN                     0x28A595B7
++          KEY_CHANNELUP                      0x289395B7
++          KEY_CHANNELDOWN                      0x288795B7
+           Timer                    0x2B8395B7
+-          1                        0x28B595B7
+-          2                        0x2BB195B7
+-          3                        0x28B195B7
+-          4                        0x2A8595B7
+-          5                        0x299595B7
+-          6                        0x2AA595B7
+-          7                        0x2B9395B7
+-          8                        0x2A8515B7
+-          9                        0x2AA115B7
+-          0                        0x2BA595B7
++          KEY_1                        0x28B595B7
++          KEY_2                        0x2BB195B7
++          KEY_3                        0x28B195B7
++          KEY_4                        0x2A8595B7
++          KEY_5                        0x299595B7
++          KEY_6                        0x2AA595B7
++          KEY_7                        0x2B9395B7
++          KEY_8                        0x2A8515B7
++          KEY_9                        0x2AA115B7
++          KEY_0                        0x2BA595B7
+           ShiftTab                 0x28B515B7
+-          Tab                      0x29A115B7
+-          MyMovie                  0x2B8515B7
+-          MyMusic                  0x299195B7
++          KEY_TAB                      0x29A115B7
++          KEY_VIDEO                  0x2B8515B7
++          KEY_AUDIO                  0x299195B7
+           MyPhoto                  0x2BA115B7
+-          MyTV                     0x28A515B7
+-          Bookmark                 0x288515B7
++          KEY_TV                     0x28A515B7
++          KEY_BOOKMARKS                 0x288515B7
+           Thumbnail                0x2AB715B7
+           AspectRatio              0x29A595B7
+           FullScreen               0x2AA395B7
+-          MyDVD                    0x29A295B7
+-          Menu                     0x2BA385B7
++          KEY_DVD                    0x29A295B7
++          KEY_MENU                     0x2BA385B7
+           Caption                  0x298595B7
+-          Language                 0x2B8595B7
++          KEY_LANGUAGE                 0x2B8595B7
+           MouseKeyboard            0x299115B7
+           SelectSpace              0x2A9315B7
+           MouseMenu                0x28B715B7
+-          MouseRightClick          0x688481B7
+-          Enter                    0x28A195B7
+-          MouseLeftClick           0x688301B7
++          BTN_RIGHT          0x688481B7
++          KEY_ENTER                    0x28A195B7
++          BTN_LEFT           0x688301B7
+           WindowsKey               0x2B8195B7
+-          Backspace                0x28A115B7
++          KEY_BACKSPACE                0x28A115B7
+ # Corrin added
+-	  Space                    0x2B9B15F7
+-          Up                       0xEB53F9B7
+-          Left                     0x6ABAFFBF
+-          Down                     0x6F9ECBB7
+-          Right                    0x69A281B7
++	  KEY_SPACE                    0x2B9B15F7
++          KEY_UP                       0xEB53F9B7
++          KEY_LEFT                     0x6ABAFFBF
++          KEY_DOWN                     0x6F9ECBB7
++          KEY_RIGHT                    0x69A281B7
+ 
+       end codes
+ 
+diff -upr lirc-0.8.3.orig/remotes/imon/lircd.conf.imon-rsc lirc-0.8.3/remotes/imon/lircd.conf.imon-rsc
+--- lirc-0.8.3.orig/remotes/imon/lircd.conf.imon-rsc	2007-02-18 08:36:27.000000000 +0000
++++ lirc-0.8.3/remotes/imon/lircd.conf.imon-rsc	2008-08-12 16:14:39.000000000 +0100
+@@ -27,48 +27,48 @@ begin remote
+   gap          100000
+ 
+       begin codes
+-          App.Exit           0x00000000000008F7
+-          Power              0x000000000000F40B
++          KEY_EXIT           0x00000000000008F7
++          KEY_POWER              0x000000000000F40B
+           ScreenSaver        0x00000000000052AD
+           Timer              0x000000000000926D
+-          1                  0x0000000000002AD5
+-          2                  0x000000000000AA55
+-          3                  0x0000000000006A95
+-          4                  0x000000000000EA15
+-          5                  0x0000000000001AE5
+-          6                  0x0000000000009A65
+-          7                  0x0000000000005AA5
+-          8                  0x000000000000DA25
+-          9                  0x0000000000003AC5
+-          0                  0x000000000000BA45
++          KEY_1                  0x0000000000002AD5
++          KEY_2                  0x000000000000AA55
++          KEY_3                  0x0000000000006A95
++          KEY_4                  0x000000000000EA15
++          KEY_5                  0x0000000000001AE5
++          KEY_6                  0x0000000000009A65
++          KEY_7                  0x0000000000005AA5
++          KEY_8                  0x000000000000DA25
++          KEY_9                  0x0000000000003AC5
++          KEY_0                  0x000000000000BA45
+           Desktop            0x000000000000817E
+-          Max/Res            0x00000000000041BE
+-          Esc                0x00000000000012ED
++          KEY_MAX            0x00000000000041BE
++          KEY_ESC                0x00000000000012ED
+           Windows            0x000000000000D22D
+-          Menu               0x000000000000C13E
++          KEY_MENU               0x000000000000C13E
+           App.Launcher       0x000000000000A25D
+           Function           0x00000000000021DE
+           Task.Switcher      0x000000000000629D
+-          Backspace          0x000000000000A15E
++          KEY_BACKSPACE          0x000000000000A15E
+           Mouse/Keyboard     0x000000000000619E
+-          Space              0x000000000000E11E
++          KEY_SPACE              0x000000000000E11E
+           Shift.Tab          0x0000000000007887
+-          Enter              0x00000000000019E6
+-          Tab                0x000000000000F807
+-          L.Click            0x000000000000d827
++          KEY_ENTER              0x00000000000019E6
++          KEY_TAB                0x000000000000F807
++          BTN_LEFT            0x000000000000d827
+           DragNDrop          0x0000000000006897
+-          R.Click            0x000000000000b847
+-          Mute               0x00000000000011ee
+-          Vol-               0x0000000000007a85
+-          Vol+               0x000000000000fa05
+-          Play               0x00000000000032cd
+-          Pause              0x000000000000b24d
+-          Open               0x000000000000f20d
+-          Prev               0x0000000000000af5
+-          Next               0x0000000000008a75
+-          Stop               0x000000000000728d
+-          Rew                0x0000000000004ab5
+-          F.Fwd              0x000000000000ca35
++          BTN_RIGHT            0x000000000000b847
++          KEY_MUTE               0x00000000000011ee
++          KEY_VOLUMEDOWN               0x0000000000007a85
++          KEY_VOLUMEUP               0x000000000000fa05
++          KEY_PLAY               0x00000000000032cd
++          KEY_PAUSE              0x000000000000b24d
++          KEY_OPEN               0x000000000000f20d
++          KEY_PREVIOUS               0x0000000000000af5
++          KEY_NEXT               0x0000000000008a75
++          KEY_STOP               0x000000000000728d
++          KEY_REWIND                0x0000000000004ab5
++          KEY_FORWARD              0x000000000000ca35
+           Full.Screen        0x000000000000916e
+       end codes
+ 
+diff -upr lirc-0.8.3.orig/remotes/iodata/lircd.conf.gvbctv5pci lirc-0.8.3/remotes/iodata/lircd.conf.gvbctv5pci
+--- lirc-0.8.3.orig/remotes/iodata/lircd.conf.gvbctv5pci	2003-06-07 23:00:12.000000000 +0100
++++ lirc-0.8.3/remotes/iodata/lircd.conf.gvbctv5pci	2008-08-12 16:14:40.000000000 +0100
+@@ -26,41 +26,41 @@ begin remote
+ 
+ 
+       begin codes
+-          TV                       0x0000000000000042
+-          FM                       0x0000000000000022
+-          EPG                      0x0000000000000062
+-          POWER                    0x0000000000000002
+-          1                        0x0000000000000052
+-          2                        0x0000000000000032
+-          3                        0x0000000000000072
+-          4                        0x000000000000004A
+-          5                        0x000000000000002A
+-          6                        0x000000000000006A
+-          7                        0x000000000000005A
+-          8                        0x000000000000003A
+-          9                        0x000000000000007A
++          KEY_TV                       0x0000000000000042
++          KEY_RADIO                       0x0000000000000022
++          KEY_EPG                      0x0000000000000062
++          KEY_POWER                    0x0000000000000002
++          KEY_1                        0x0000000000000052
++          KEY_2                        0x0000000000000032
++          KEY_3                        0x0000000000000072
++          KEY_4                        0x000000000000004A
++          KEY_5                        0x000000000000002A
++          KEY_6                        0x000000000000006A
++          KEY_7                        0x000000000000005A
++          KEY_8                        0x000000000000003A
++          KEY_9                        0x000000000000007A
+           10                       0x0000000000000046
+           11                       0x0000000000000026
+           12                       0x0000000000000066
+           LIVE                     0x0000000000000012
+           TIME_SHIFT               0x000000000000000A
+-          PLAY                     0x000000000000001A
++          KEY_PLAY                     0x000000000000001A
+           MULTI                    0x0000000000000006
+-          VIDEO                    0x0000000000000056
+-          SVIDEO                   0x000000000000004E
+-          CHANNEL_PLUS             0x0000000000000036
+-          CHANNEL_MINUS            0x000000000000002E
+-          VOLUME_PLUS              0x0000000000000076
+-          VOLUME_MINUS             0x000000000000006E
+-          MUTE                     0x0000000000000016
++          KEY_VIDEO                    0x0000000000000056
++          KEY_VIDEO                   0x000000000000004E
++          KEY_CHANNELUP             0x0000000000000036
++          KEY_CHANNELDOWN            0x000000000000002E
++          KEY_VOLUMEUP              0x0000000000000076
++          KEY_VOLUMEDOWN             0x000000000000006E
++          KEY_MUTE                     0x0000000000000016
+           PICTURE_SIZE             0x000000000000000E
+-          PAUSE                    0x000000000000005E
+-          HALT                     0x000000000000003E
+-          RECORD                   0x000000000000007E
+-          STOP                     0x000000000000001E
+-          REWIND                   0x0000000000000043
++          KEY_PAUSE                    0x000000000000005E
++          KEY_POWER                     0x000000000000003E
++          KEY_RECORD                   0x000000000000007E
++          KEY_STOP                     0x000000000000001E
++          KEY_REWIND                   0x0000000000000043
+           START                    0x0000000000000023
+-          FORWARD                  0x0000000000000063
++          KEY_FORWARD                  0x0000000000000063
+           SYNC                     0x0000000000000003
+       end codes
+ 
+diff -upr lirc-0.8.3.orig/remotes/kanam_accent/lircd.conf.IR-100 lirc-0.8.3/remotes/kanam_accent/lircd.conf.IR-100
+--- lirc-0.8.3.orig/remotes/kanam_accent/lircd.conf.IR-100	2007-02-13 04:18:53.000000000 +0000
++++ lirc-0.8.3/remotes/kanam_accent/lircd.conf.IR-100	2008-08-12 16:14:40.000000000 +0100
+@@ -29,47 +29,47 @@ begin remote
+ 
+ 
+       begin codes
+-          power                    0x62260942
+-          eject                    0x62662409
+-          1                        0x62662209
+-          2                        0x22642209
+-          3                        0x62641142
+-          4                        0x62644209
+-          5                        0x22624209
+-          6                        0x62629142
+-          7                        0x62628942
+-          8                        0x22646409
+-          9                        0x62646609
+-          0                        0x22464226
+-          win_key                  0x62664226
+-          menu_key                 0x62660942
+-          vol-                     0x22896642
+-          vol+                     0x62622609
+-          esc                      0x22662609
+-          up                       0x22916642
+-          close                    0x22994642
+-          left                     0x22994242
++          KEY_POWER                    0x62260942
++          KEY_EJECTCD                    0x62662409
++          KEY_1                        0x62662209
++          KEY_2                        0x22642209
++          KEY_3                        0x62641142
++          KEY_4                        0x62644209
++          KEY_5                        0x22624209
++          KEY_6                        0x62629142
++          KEY_7                        0x62628942
++          KEY_8                        0x22646409
++          KEY_9                        0x62646609
++          KEY_0                        0x22464226
++                            0x62664226
++                           0x62660942
++          KEY_VOLUMEDOWN                     0x22896642
++          KEY_VOLUMEUP                     0x62622609
++          KEY_ESC                      0x22662609
++          KEY_UP                       0x22916642
++          KEY_CLOSE                    0x22994642
++          KEY_LEFT                     0x22994242
+           ent                      0x22892642
+-          right                    0x22914642
+-          prev                     0x62996242
+-          down                     0x22192699
+-          next                     0x22660942
+-          mute                     0x22622409
++          KEY_RIGHT                    0x22914642
++          KEY_PREVIOUS                     0x62996242
++          KEY_DOWN                     0x22192699
++          KEY_NEXT                     0x22660942
++          KEY_MUTE                     0x22622409
+           step                     0x62994C42
+-          play                     0x22246426
+-          stop                     0x6246894C
++          KEY_PLAY                     0x22246426
++          KEY_STOP                     0x6246894C
+           winamp                   0x62426409
+-          mediaplayer              0x22664409
++                        0x22664409
+           hdtv                     0x22992642
+-          cdplayer                 0x62664609
+-          windvd                   0x62992299
+-          powerdvd                 0x62912242
+-          internet                 0x62264626
++                           0x62664609
++                             0x62992299
++                           0x62912242
++          KEY_WWW                 0x62264626
+           email                    0x22998C99
+-          b1                       0x22264426
+-          b2                       0x22426209
+-          b3                       0x62896442
+-          b4                       0x22096642
++                                 0x22264426
++                                 0x22426209
++                                 0x62896442
++                                 0x22096642
+       end codes
+ 
+ end remote
+diff -upr lirc-0.8.3.orig/remotes/knc_one/lircd.conf.knc_one lirc-0.8.3/remotes/knc_one/lircd.conf.knc_one
+--- lirc-0.8.3.orig/remotes/knc_one/lircd.conf.knc_one	2001-04-24 22:20:41.000000000 +0100
++++ lirc-0.8.3/remotes/knc_one/lircd.conf.knc_one	2008-08-12 16:14:40.000000000 +0100
+@@ -26,37 +26,37 @@ begin remote
+ 
+       begin codes
+           TV/FM                    0x000000000000001C
+-          OK                       0x0000000000000015
+-          F1                       0x000000000000000B
+-          POWER                    0x0000000000000012
++          KEY_OK                       0x0000000000000015
++          KEY_F1                       0x000000000000000B
++          KEY_POWER                    0x0000000000000012
+           AV/TV                    0x0000000000000011
+           TELETEXT                 0x000000000000000F
+           FULLSCREEN               0x0000000000000013
+-          MUTE                     0x0000000000000010
+-          1                        0x0000000000000001
+-          2                        0x0000000000000002
+-          3                        0x0000000000000003
+-          4                        0x0000000000000004
+-          5                        0x0000000000000005
+-          6                        0x0000000000000006
+-          7                        0x0000000000000007
+-          8                        0x0000000000000008
+-          9                        0x0000000000000009
+-          0                        0x0000000000000000
+-          CH+                      0x000000000000001A
+-          CH-                      0x000000000000001E
+-          VOL+                     0x000000000000001B
+-          VOL-                     0x000000000000001F
++          KEY_MUTE                     0x0000000000000010
++          KEY_1                        0x0000000000000001
++          KEY_2                        0x0000000000000002
++          KEY_3                        0x0000000000000003
++          KEY_4                        0x0000000000000004
++          KEY_5                        0x0000000000000005
++          KEY_6                        0x0000000000000006
++          KEY_7                        0x0000000000000007
++          KEY_8                        0x0000000000000008
++          KEY_9                        0x0000000000000009
++          KEY_0                        0x0000000000000000
++          KEY_CHANNELUP                      0x000000000000001A
++          KEY_CHANNELDOWN                      0x000000000000001E
++          KEY_VOLUMEUP                     0x000000000000001B
++          KEY_VOLUMEDOWN                     0x000000000000001F
+           SNAPSHOT                 0x000000000000000A
+           100+                     0x0000000000000017
+-          RECORD                   0x000000000000000D
+-          PAUSE                    0x000000000000000E
+-          PLAY                     0x000000000000001D
+-          STOP                     0x0000000000000019
+-          MENU                     0x0000000000000016
+-          ESC                      0x0000000000000014
+-          -                        0x0000000000000018
+-          +                        0x000000000000000C
++          KEY_RECORD                   0x000000000000000D
++          KEY_PAUSE                    0x000000000000000E
++          KEY_PLAY                     0x000000000000001D
++          KEY_STOP                     0x0000000000000019
++          KEY_MENU                     0x0000000000000016
++          KEY_ESC                      0x0000000000000014
++          KEY_KPMINUS                        0x0000000000000018
++          KEY_KPPLUS                        0x000000000000000C
+       end codes
+ 
+ end remote
+diff -upr lirc-0.8.3.orig/remotes/kworld/lircd.conf.kworld lirc-0.8.3/remotes/kworld/lircd.conf.kworld
+--- lirc-0.8.3.orig/remotes/kworld/lircd.conf.kworld	2005-04-01 21:28:05.000000000 +0100
++++ lirc-0.8.3/remotes/kworld/lircd.conf.kworld	2008-08-12 16:14:40.000000000 +0100
+@@ -29,36 +29,36 @@ begin remote
+ 
+ 
+       begin codes
+-          power                    0x0000000000007887
++          KEY_POWER                    0x0000000000007887
+           source                   0x000000000000E01F
+           scan                     0x00000000000038C7
+-          mute                     0x00000000000018E7
++          KEY_MUTE                     0x00000000000018E7
+           tv/fm                    0x000000000000C03F
+-          1                        0x000000000000807F
+-          2                        0x000000000000D02F
+-          3                        0x000000000000D827
++          KEY_1                        0x000000000000807F
++          KEY_2                        0x000000000000D02F
++          KEY_3                        0x000000000000D827
+           fm_scan+                 0x000000000000F807
+-          4                        0x000000000000A05F
+-          5                        0x000000000000906F
+-          6                        0x000000000000A857
++          KEY_4                        0x000000000000A05F
++          KEY_5                        0x000000000000906F
++          KEY_6                        0x000000000000A857
+           fm_scan-                 0x000000000000E817
+-          7                        0x000000000000609F
+-          8                        0x00000000000050AF
+-          9                        0x00000000000048B7
++          KEY_7                        0x000000000000609F
++          KEY_8                        0x00000000000050AF
++          KEY_9                        0x00000000000048B7
+           fm_freq+                 0x00000000000030CF
+-          0                        0x00000000000040BF
+-          +                        0x00000000000008F7
++          KEY_0                        0x00000000000040BF
++          KEY_KPPLUS                        0x00000000000008F7
+           recall                   0x000000000000C837
+           fm-freq-                 0x00000000000020DF
+-          record                   0x00000000000000FF
+-          stop                     0x00000000000010EF
+-          play                     0x0000000000008877
++          KEY_RECORD                   0x00000000000000FF
++          KEY_STOP                     0x00000000000010EF
++          KEY_PLAY                     0x0000000000008877
+           minimze                  0x000000000000F00F
+-          ch+                      0x000000000000F807
+-          zoom                     0x0000000000009867
+-          vol-                     0x00000000000028D7
+-          ch-                      0x000000000000E817
+-          vol+                     0x0000000000006897
++          KEY_CHANNELUP                      0x000000000000F807
++          KEY_ZOOM                     0x0000000000009867
++          KEY_VOLUMEDOWN                     0x00000000000028D7
++          KEY_CHANNELDOWN                      0x000000000000E817
++          KEY_VOLUMEUP                     0x0000000000006897
+           snapshot                 0x00000000000058A7
+           mts                      0x000000000000B04F
+           function-                0x00000000000020DF
+diff -upr lirc-0.8.3.orig/remotes/leadtek/lircd.conf.PVR2000 lirc-0.8.3/remotes/leadtek/lircd.conf.PVR2000
+--- lirc-0.8.3.orig/remotes/leadtek/lircd.conf.PVR2000	2006-12-19 06:02:58.000000000 +0000
++++ lirc-0.8.3/remotes/leadtek/lircd.conf.PVR2000	2008-08-12 16:14:39.000000000 +0100
+@@ -18,54 +18,54 @@ begin remote
+   gap       120000
+ 
+       begin codes
+-          POWER                    0x0000000000000070
+-          TV                       0x0000000000000026
+-          FM                       0x0000000000000027
+-          DVD                      0x0000000000000028
+-          RED                      0x000000000000003B
+-          GREEN                    0x000000000000003C
+-          YELLOW                   0x000000000000003D
+-          BLUE                     0x000000000000003E
++          KEY_POWER                    0x0000000000000070
++          KEY_TV                       0x0000000000000026
++          KEY_RADIO                       0x0000000000000027
++          KEY_DVD                      0x0000000000000028
++          KEY_RED                      0x000000000000003B
++          KEY_GREEN                    0x000000000000003C
++          KEY_YELLOW                   0x000000000000003D
++          KEY_BLUE                     0x000000000000003E
+           TELETEXT                 0x000000000000006F
+-          SLEEP                    0x0000000000000030
+-          MUTE                     0x0000000000000064
++          KEY_SLEEP                    0x0000000000000030
++          KEY_MUTE                     0x0000000000000064
+           BOSS_KEY                 0x0000000000000039
+-          CH_UP                    0x000000000000007C
+-          CH_DOWN                  0x0000000000000060
+-          VOL_DOWN                 0x0000000000000078
+-          VOL_UP                   0x0000000000000074
+-          ENTER                    0x0000000000000063
++          KEY_CHANNELUP                    0x000000000000007C
++          KEY_CHANNELDOWN                  0x0000000000000060
++          KEY_VOLUMEDOWN                 0x0000000000000078
++          KEY_VOLUMEUP                   0x0000000000000074
++          KEY_ENTER                    0x0000000000000063
+           CC                       0x0000000000000020
+           FULLSCREEN               0x0000000000000073
+-          MENU                     0x000000000000003F
++          KEY_MENU                     0x000000000000003F
+           SCAN                     0x0000000000000021
+-          REPLAY                   0x0000000000000032
+-          PLAY                     0x0000000000000033
+-          SKIP                     0x0000000000000034
++          KEY_AGAIN                   0x0000000000000032
++          KEY_PLAY                     0x0000000000000033
++          KEY_NEXT                     0x0000000000000034
+           OSD                      0x0000000000000022
+-          BACK                     0x0000000000000024
+-          STOP                     0x0000000000000036
+-          FORWARD                  0x0000000000000025
+-          LANGUAGE                 0x0000000000000023
+-          1                        0x0000000000000075
+-          2                        0x0000000000000076
+-          3                        0x0000000000000077
+-          4                        0x0000000000000079
+-          5                        0x000000000000007A
+-          6                        0x000000000000007B
+-          7                        0x000000000000007D
+-          8                        0x000000000000007E
+-          9                        0x000000000000007F
+-          0                        0x0000000000000062
+-          .                        0x0000000000000031
++          KEY_BACK                     0x0000000000000024
++          KEY_STOP                     0x0000000000000036
++          KEY_FORWARD                  0x0000000000000025
++          KEY_LANGUAGE                 0x0000000000000023
++          KEY_1                        0x0000000000000075
++          KEY_2                        0x0000000000000076
++          KEY_3                        0x0000000000000077
++          KEY_4                        0x0000000000000079
++          KEY_5                        0x000000000000007A
++          KEY_6                        0x000000000000007B
++          KEY_7                        0x000000000000007D
++          KEY_8                        0x000000000000007E
++          KEY_9                        0x000000000000007F
++          KEY_0                        0x0000000000000062
++          KEY_DOT                        0x0000000000000031
+           RECALL                   0x0000000000000061
+-          VIDEO                    0x000000000000006E
+-          AUDIO                    0x000000000000006B
++          KEY_VIDEO                    0x000000000000006E
++          KEY_AUDIO                    0x000000000000006B
+           DISPLAY                  0x0000000000000066
+           SNAPSHOT                 0x0000000000000038
+           PIP                      0x000000000000003A
+           RECSTOP                  0x0000000000000036
+-          REC                      0x0000000000000037
++          KEY_RECORD                      0x0000000000000037
+           TIMESHIFT                0x0000000000000035
+ 
+       end codes
+diff -upr lirc-0.8.3.orig/remotes/leadtek/lircd.conf.RM-0007 lirc-0.8.3/remotes/leadtek/lircd.conf.RM-0007
+--- lirc-0.8.3.orig/remotes/leadtek/lircd.conf.RM-0007	2002-11-09 22:34:23.000000000 +0000
++++ lirc-0.8.3/remotes/leadtek/lircd.conf.RM-0007	2008-08-12 16:14:39.000000000 +0100
+@@ -44,43 +44,43 @@ begin remote
+ 
+       begin codes
+ # 1st row of buttons
+-          POWER                    0x00000000000000FF
+-          MENU                     0x000000000000807F
+-          FM                       0x00000000000040BF
++          KEY_POWER                    0x00000000000000FF
++          KEY_MENU                     0x000000000000807F
++          KEY_RADIO                       0x00000000000040BF
+           PC/TV                    0x000000000000C03F
+ # volume/channel
+-          VOL_UP                   0x00000000000020DF
+-          VOL_DOWN                 0x00000000000010EF
+-          CH_UP                    0x00000000000030CF
+-          CH_DOWN                  0x00000000000008F7
++          KEY_VOLUMEUP                   0x00000000000020DF
++          KEY_VOLUMEDOWN                 0x00000000000010EF
++          KEY_CHANNELUP                    0x00000000000030CF
++          KEY_CHANNELDOWN                  0x00000000000008F7
+ # numbers pad
+-          1                        0x000000000000A05F
+-          2                        0x000000000000609F
+-          3                        0x000000000000E01F
+-          4                        0x000000000000906F
+-          5                        0x00000000000050AF
+-          6                        0x000000000000D02F
+-          7                        0x000000000000B04F
+-          8                        0x000000000000708F
+-          9                        0x000000000000F00F
++          KEY_1                        0x000000000000A05F
++          KEY_2                        0x000000000000609F
++          KEY_3                        0x000000000000E01F
++          KEY_4                        0x000000000000906F
++          KEY_5                        0x00000000000050AF
++          KEY_6                        0x000000000000D02F
++          KEY_7                        0x000000000000B04F
++          KEY_8                        0x000000000000708F
++          KEY_9                        0x000000000000F00F
+           RETURN                   0x0000000000008877
+-          0                        0x00000000000048B7
++          KEY_0                        0x00000000000048B7
+           DISPLAY                  0x000000000000C837
+ # unknown icon buttons
+-          HELP                     0x00000000000038C7
++          KEY_HELP                     0x00000000000038C7
+           SCAN                     0x000000000000A857
+           OSD                      0x0000000000006897
+-          OPTIONS                  0x000000000000E817
++          KEY_OPTION                  0x000000000000E817
+ # labeled buttons
+-          MUTE                     0x00000000000028D7
++          KEY_MUTE                     0x00000000000028D7
+           MTS                      0x000000000000D827
+-          VIDEO                    0x0000000000007887
++          KEY_VIDEO                    0x0000000000007887
+           CC                       0x000000000000F807
+ # color dots buttons
+-          RED                      0x00000000000018E7
+-          GREEN                    0x0000000000009867
+-          YELLOW                   0x00000000000058A7
+-          BLUE                     0x000000000000B847
++          KEY_RED                      0x00000000000018E7
++          KEY_GREEN                    0x0000000000009867
++          KEY_YELLOW                   0x00000000000058A7
++          KEY_BLUE                     0x000000000000B847
+       end codes
+ 
+ end remote
+diff -upr lirc-0.8.3.orig/remotes/leadtek/lircd.conf.RM-0010 lirc-0.8.3/remotes/leadtek/lircd.conf.RM-0010
+--- lirc-0.8.3.orig/remotes/leadtek/lircd.conf.RM-0010	2006-03-21 07:11:14.000000000 +0000
++++ lirc-0.8.3/remotes/leadtek/lircd.conf.RM-0010	2008-08-12 16:14:39.000000000 +0100
+@@ -43,69 +43,69 @@ begin remote
+   duty_cycle   33
+ 
+       begin codes
+-          POWER                    0x00000000000000FF
++          KEY_POWER                    0x00000000000000FF
+           TV/FM                    0x00000000000040BF
+           SCAN                     0x000000000000A857
+           DISPLAY                  0x0000000000006897
+-          1                        0x000000000000A05F
+-          2                        0x000000000000609F
+-          3                        0x000000000000E01F
+-          4                        0x000000000000906F
+-          5                        0x00000000000050AF
+-          6                        0x000000000000D02F
+-          7                        0x000000000000B04F
+-          8                        0x000000000000708F
+-          9                        0x000000000000F00F
+-          0                        0x00000000000048B7
++          KEY_1                        0x000000000000A05F
++          KEY_2                        0x000000000000609F
++          KEY_3                        0x000000000000E01F
++          KEY_4                        0x000000000000906F
++          KEY_5                        0x00000000000050AF
++          KEY_6                        0x000000000000D02F
++          KEY_7                        0x000000000000B04F
++          KEY_8                        0x000000000000708F
++          KEY_9                        0x000000000000F00F
++          KEY_0                        0x00000000000048B7
+           RECALL                   0x0000000000008877
+-          ENTER                    0x000000000000C837
++          KEY_ENTER                    0x000000000000C837
+           CC                       0x000000000000F807
+           MTS                      0x000000000000D827
+           FINE_DOWN                0x0000000000009867
+           FINE_UP                  0x00000000000018E7
+-          VIDEO                    0x0000000000007887
+-          MUTE                     0x00000000000028D7
+-          CH_UP                    0x00000000000030CF
+-          CH_DOWN                  0x00000000000008F7
+-          VOL_DOWN                 0x00000000000010EF
+-          VOL_UP                   0x00000000000020DF
++          KEY_VIDEO                    0x0000000000007887
++          KEY_MUTE                     0x00000000000028D7
++          KEY_CHANNELUP                    0x00000000000030CF
++          KEY_CHANNELDOWN                  0x00000000000008F7
++          KEY_VOLUMEDOWN                 0x00000000000010EF
++          KEY_VOLUMEUP                   0x00000000000020DF
+           FULLSCREEN               0x000000000000C03F
+ 
+ # The following are only supported by the remote control bundled with
+ # the WinFast TV 2000 XP Deluxe card.
+ 
+-          SLEEP                    0x00000000000002FD
++          KEY_SLEEP                    0x00000000000002FD
+           BOSS_KEY                 0x000000000000926D
+-          RED                      0x000000000000D22D
+-          GREEN                    0x00000000000032CD
+-          YELLOW                   0x000000000000B24D
+-          BLUE                     0x000000000000728D
++          KEY_RED                      0x000000000000D22D
++          KEY_GREEN                    0x00000000000032CD
++          KEY_YELLOW                   0x000000000000B24D
++          KEY_BLUE                     0x000000000000728D
+           PIP                      0x00000000000052AD
+-          .                        0x000000000000827D
+-          BACK                     0x00000000000042BD
+-          PLAY                     0x000000000000C23D
+-          NEXT                     0x00000000000022DD
++          KEY_DOT                        0x000000000000827D
++          KEY_BACK                     0x00000000000042BD
++          KEY_PLAY                     0x000000000000C23D
++          KEY_NEXT                     0x00000000000022DD
+           TIMESHIFT                0x000000000000A25D
+-          STOP                     0x000000000000629D
+-          REC                      0x000000000000E21D
++          KEY_STOP                     0x000000000000629D
++          KEY_RECORD                      0x000000000000E21D
+           SNAPSHOT                 0x00000000000012ED
+ 
+ # Only found on CoolCommand remote
+ 
+-          REPEAT                   0x000000000000884B
++          KEY_AGAIN                   0x000000000000884B
+           TELETEXT                 0x000000000000F807
+-          TV                       0x0000000000006A95
+-          FM                       0x000000000000EA15
+-          DVD                      0x0000000000001AE5
++          KEY_TV                       0x0000000000006A95
++          KEY_RADIO                       0x000000000000EA15
++          KEY_DVD                      0x0000000000001AE5
+           CLEAR(C)                 0x0000000000000AF5
+-          MENU                     0x000000000000F20D
++          KEY_MENU                     0x000000000000F20D
+           CH_SURF                  0x0000000000008A75
+-          ENTER                    0x000000000000C837
+-          AUDIO                    0x000000000000D827
++          KEY_ENTER                    0x000000000000C837
++          KEY_AUDIO                    0x000000000000D827
+           CC                       0x0000000000004AB5
+-          REW                      0x0000000000002AD5
+-          STOP                     0x000000000000629D
+-          FFW                      0x000000000000AA55
++          KEY_REWIND                      0x0000000000002AD5
++          KEY_STOP                     0x000000000000629D
++          KEY_FASTFORWARD                      0x000000000000AA55
+       end codes
+ 
+ end remote
+diff -upr lirc-0.8.3.orig/remotes/life-view/lircd.conf.flyvideo lirc-0.8.3/remotes/life-view/lircd.conf.flyvideo
+--- lirc-0.8.3.orig/remotes/life-view/lircd.conf.flyvideo	2002-11-09 22:31:38.000000000 +0000
++++ lirc-0.8.3/remotes/life-view/lircd.conf.flyvideo	2008-08-12 16:14:40.000000000 +0100
+@@ -35,50 +35,50 @@ begin remote
+   duty_cycle   33
+ 
+       begin codes
+-          0                        0x000000000000F00F
+-          1                        0x000000000000C03F
+-          2                        0x00000000000020DF
+-          3                        0x000000000000A05F
+-          4                        0x000000000000E01F
+-          5                        0x00000000000010EF
+-          6                        0x000000000000906F
+-          7                        0x000000000000D02F
+-          8                        0x00000000000030CF
+-          9                        0x000000000000B04F
+-          POWER                    0x00000000000000FF
+-          MOUSE_MODE               0x000000000000807F
++          KEY_0                        0x000000000000F00F
++          KEY_1                        0x000000000000C03F
++          KEY_2                        0x00000000000020DF
++          KEY_3                        0x000000000000A05F
++          KEY_4                        0x000000000000E01F
++          KEY_5                        0x00000000000010EF
++          KEY_6                        0x000000000000906F
++          KEY_7                        0x000000000000D02F
++          KEY_8                        0x00000000000030CF
++          KEY_9                        0x000000000000B04F
++          KEY_POWER                    0x00000000000000FF
++          BTN_MODE               0x000000000000807F
+           FULL_SCREEN              0x00000000000040BF
+-          CHAN_PLUS                0x00000000000048B7
+-          CHAN_MINUS               0x000000000000C837
+-          CANCEL                   0x000000000000F807
+-          ENTER                    0x00000000000008F7
+-          VOL_PLUS                 0x00000000000028D7
+-          VOL_MINUS                0x000000000000E817
+-          MENU                     0x000000000000609F
+-          UP                       0x000000000000708F
+-          DOWN                     0x0000000000009867
+-          LEFT                     0x000000000000609F
+-          RIGHT                    0x000000000000A857
++          KEY_CHANNELUP                0x00000000000048B7
++          KEY_CHANNELDOWN               0x000000000000C837
++          KEY_CANCEL                   0x000000000000F807
++          KEY_ENTER                    0x00000000000008F7
++          KEY_VOLUMEUP                 0x00000000000028D7
++          KEY_VOLUMEDOWN                0x000000000000E817
++          KEY_MENU                     0x000000000000609F
++          KEY_UP                       0x000000000000708F
++          KEY_DOWN                     0x0000000000009867
++          KEY_LEFT                     0x000000000000609F
++          KEY_RIGHT                    0x000000000000A857
+           INC                      0x00000000000050AF
+           DEC                      0x0000000000006897
+-          ESC                      0x00000000000058A7
+-          MUTE                     0x000000000000D827
++          KEY_ESC                      0x00000000000058A7
++          KEY_MUTE                     0x000000000000D827
+           RETURN                   0x00000000000018E7
+           CENTER                   0x000000000000C837
+ 
+           CHANELS	           0x00000000000047B8
+           REV                      0x0000000000008778
+-          FWD                      0x000000000000C738
+-          VIDEO                    0x0000000000008877
++          KEY_FORWARD                      0x000000000000C738
++          KEY_VIDEO                    0x0000000000008877
+ 
+ # from FlyVideo II config file
+-          Audio                    0x000000000000A857
++          KEY_AUDIO                    0x000000000000A857
+ # newly added by Jarek Zuk
+           SQUARE                   0x000000000000B847
+           TAB_LEFT                 0x0000000000007887
+           TAB_RIGHT                0x00000000000038C7
+           CENTER                   0x000000000000C837
+-          LEFT                     0x00000000000048B7
++          KEY_LEFT                     0x00000000000048B7
+  
+       end codes
+ 
+diff -upr lirc-0.8.3.orig/remotes/logitech/lircd.conf.logitech lirc-0.8.3/remotes/logitech/lircd.conf.logitech
+--- lirc-0.8.3.orig/remotes/logitech/lircd.conf.logitech	2000-01-18 19:10:08.000000000 +0000
++++ lirc-0.8.3/remotes/logitech/lircd.conf.logitech	2008-08-12 16:14:40.000000000 +0100
+@@ -23,41 +23,41 @@ begin remote
+   repeat_bit      0
+ 
+       begin codes
+-          POWER                    0x0000000000000002
+-          1                        0x0000000000000015
+-          2                        0x0000000000000016
+-          3                        0x0000000000000014
+-          4                        0x0000000000000018
+-          5                        0x0000000000000019
+-          6                        0x0000000000000017
+-          7                        0x000000000000001C
+-          8                        0x000000000000001B
+-          9                        0x000000000000001A
+-          0                        0x000000000000001D
+-          PAUSE                    0x0000000000000013
+-          EJECT                    0x0000000000000011
++          KEY_POWER                    0x0000000000000002
++          KEY_1                        0x0000000000000015
++          KEY_2                        0x0000000000000016
++          KEY_3                        0x0000000000000014
++          KEY_4                        0x0000000000000018
++          KEY_5                        0x0000000000000019
++          KEY_6                        0x0000000000000017
++          KEY_7                        0x000000000000001C
++          KEY_8                        0x000000000000001B
++          KEY_9                        0x000000000000001A
++          KEY_0                        0x000000000000001D
++          KEY_PAUSE                    0x0000000000000013
++          KEY_EJECTCD                    0x0000000000000011
+           SEEK-                    0x000000000000000E
+-          PLAY                     0x000000000000000F
++          KEY_PLAY                     0x000000000000000F
+           SEEK+                    0x0000000000000010
+-          STOP                     0x0000000000000012
+-          HELP                     0x0000000000000001
+-          CH-                      0x000000000000000D
+-          CH+                      0x000000000000000A
+-          VOL-                     0x000000000000000C
+-          VOL+                     0x0000000000000009
++          KEY_STOP                     0x0000000000000012
++          KEY_HELP                     0x0000000000000001
++          KEY_CHANNELDOWN                      0x000000000000000D
++          KEY_CHANNELUP                      0x000000000000000A
++          KEY_VOLUMEDOWN                     0x000000000000000C
++          KEY_VOLUMEUP                     0x0000000000000009
+           *			   0x000000000000001F
+           #			   0x000000000000001E
+-          MUTE			   0x000000000000000B
++          KEY_MUTE			   0x000000000000000B
+           BUTTONL_DOWN		   0x0000000000000039
+ 	  BUTTONR_DOWN		   0x000000000000003A
+-          BUTTON_UP		   0x0000000000000038
+-          ENTER			   0x0000000000000008
+-          CLOSE			   0x0000000000000023
+-          TV			   0x0000000000000004
++          KEY_UP		   0x0000000000000038
++          KEY_ENTER			   0x0000000000000008
++          KEY_CLOSE			   0x0000000000000023
++          KEY_TV			   0x0000000000000004
+           GDE			   0x0000000000000005
+-          CD			   0x0000000000000006
++          KEY_CD			   0x0000000000000006
+           MSG			   0x0000000000000007
+-          PHONE			   0x0000000000000003
++          KEY_PHONE			   0x0000000000000003
+           MOUSE_N		   0x0000000000000040
+           MOUSE_NNE		   0x0000000000000041
+           MOUSE_NE		   0x0000000000000042
+diff -upr lirc-0.8.3.orig/remotes/mceusb/lircd.conf.mceusb lirc-0.8.3/remotes/mceusb/lircd.conf.mceusb
+--- lirc-0.8.3.orig/remotes/mceusb/lircd.conf.mceusb	2007-11-01 13:08:33.000000000 +0000
++++ lirc-0.8.3/remotes/mceusb/lircd.conf.mceusb	2008-08-12 16:14:39.000000000 +0100
+@@ -58,10 +58,10 @@ begin remote
+       begin codes
+ 
+ #unused by HP remote
+-	Blue	      0x00007ba1
+-	Yellow	      0x00007ba2
+-	Green	      0x00007ba3
+-	Red	      0x00007ba4
++	KEY_BLUE	      0x00007ba1
++	KEY_YELLOW	      0x00007ba2
++	KEY_GREEN	      0x00007ba3
++	KEY_RED	      0x00007ba4
+ 	Teletext      0x00007ba5
+ 
+ #ba6 - bae unused 
+@@ -75,7 +75,7 @@ begin remote
+         BAD           0x00007bad
+         BAE           0x00007bae
+ 
+-        Radio         0x00007baf
++        KEY_RADIO         0x00007baf
+         Print         0x00007bb1
+ 
+ #bb2 - bb4 unused  
+@@ -83,18 +83,18 @@ begin remote
+         BB3           0x00007bb3
+         BB4           0x00007bb4
+ 
+-        Videos        0x00007bb5
++        KEY_VIDEO        0x00007bb5
+         Pictures      0x00007bb6
+         RecTV         0x00007bb7
+-        Music         0x00007bb8
+-        TV            0x00007bb9
++        KEY_AUDIO         0x00007bb8
++        KEY_TV            0x00007bb9
+ 
+ #bba - bbf unused 
+         BBA           0x00007bba
+         BBB           0x00007bbb
+         BBC           0x00007bbc
+         BBD           0x00007bbd
+-        BBE           0x00007bbe
++                   0x00007bbe
+         BBF           0x00007bbf
+ #bc1 - bca unused 
+         BC1           0x00007bc1
+@@ -108,7 +108,7 @@ begin remote
+         BC9           0x00007bc9
+         BCA           0x00007bca
+ 
+-        Eject         0x00007bcb
++        KEY_EJECTCD         0x00007bcb
+         SlideShow     0x00007bcc
+         Visualization 0x00007bcd
+ 
+@@ -127,50 +127,50 @@ begin remote
+         Aspect        0x00007bd8
+         Guide         0x00007bd9
+         LiveTV        0x00007bda
+-        DVD           0x00007bdb
++        KEY_DVD           0x00007bdb
+ #NoGap
+-        Back          0x00007bdc
+-        OK            0x00007bdd
+-        Right         0x00007bde
+-        Left          0x00007bdf
+-        Down          0x00007be0
+-        Up            0x00007be1
++        KEY_BACK          0x00007bdc
++        KEY_OK            0x00007bdd
++        KEY_RIGHT         0x00007bde
++        KEY_LEFT          0x00007bdf
++        KEY_DOWN          0x00007be0
++        KEY_UP            0x00007be1
+ #NoGap
+         Star          0x00007be2
+         Hash          0x00007be3
+ #NoGap
+-        Replay        0x00007be4
+-        Skip          0x00007be5
+-        Stop          0x00007be6
+-        Pause         0x00007be7
+-        Record        0x00007be8
+-        Play          0x00007be9
+-        Rewind        0x00007bea
+-        Forward       0x00007beb
+-#NoGap
+-        ChanDown      0x00007bec
+-        ChanUp        0x00007bed
+-        VolDown       0x00007bee
+-        VolUp         0x00007bef
++        KEY_AGAIN        0x00007be4
++        KEY_NEXT          0x00007be5
++        KEY_STOP          0x00007be6
++        KEY_PAUSE         0x00007be7
++        KEY_RECORD        0x00007be8
++        KEY_PLAY          0x00007be9
++        KEY_REWIND        0x00007bea
++        KEY_FORWARD       0x00007beb
++#NoGap
++        KEY_CHANNELDOWN      0x00007bec
++        KEY_CHANNELUP        0x00007bed
++        KEY_VOLUMEDOWN       0x00007bee
++        KEY_VOLUMEUP         0x00007bef
+ #NoGap
+         More          0x00007bf0
+-        Mute          0x00007bf1
+-        Home          0x00007bf2
+-        Power         0x00007bf3
+-#NoGap
+-        Enter         0x00007bf4
+-        Clear         0x00007bf5
+-#NoGap
+-        Nine          0x00007bf6
+-        Eight         0x00007bf7
+-        Seven         0x00007bf8
+-        Six           0x00007bf9
+-        Five          0x00007bfa
+-        Four          0x00007bfb
+-        Three         0x00007bfc
+-        Two           0x00007bfd
+-        One           0x00007bfe
+-        Zero          0x00007bff
++        KEY_MUTE          0x00007bf1
++        KEY_HOME          0x00007bf2
++        KEY_POWER         0x00007bf3
++#NoGap
++        KEY_ENTER         0x00007bf4
++        KEY_CLEAR         0x00007bf5
++#NoGap
++        KEY_9          0x00007bf6
++        KEY_8         0x00007bf7
++        KEY_7         0x00007bf8
++        KEY_6           0x00007bf9
++        KEY_5          0x00007bfa
++        KEY_4          0x00007bfb
++        KEY_3         0x00007bfc
++        KEY_2           0x00007bfd
++        KEY_1           0x00007bfe
++        KEY_0          0x00007bff
+       end codes
+ 
+ end remote
+diff -upr lirc-0.8.3.orig/remotes/packard_bell/lircd.conf.packard_bell lirc-0.8.3/remotes/packard_bell/lircd.conf.packard_bell
+--- lirc-0.8.3.orig/remotes/packard_bell/lircd.conf.packard_bell	2001-04-24 20:26:56.000000000 +0100
++++ lirc-0.8.3/remotes/packard_bell/lircd.conf.packard_bell	2008-08-12 16:14:40.000000000 +0100
+@@ -53,38 +53,38 @@ begin remote
+   repeat          9050 2250
+  
+       begin codes
+-          Help                     0x0000000000006F90
+-          Phone                    0x0000000000004FB0
++          KEY_HELP                     0x0000000000006F90
++          KEY_PHONE                    0x0000000000004FB0
+           Message                  0x0000000000006E91
+           SRS                      0x0000000000004EB1
+-          CD                       0x0000000000002FD0
+-          Aux1                     0x0000000000000FF0
++          KEY_CD                       0x0000000000002FD0
++          KEY_AUX                     0x0000000000000FF0
+           Aux2                     0x0000000000002ED1
+           Aux3                     0x0000000000000EF1
+           LMB                      0x00000000000023DC
+           RMB                      0x000000000000639C
+-          Up                       0x00000000000037C8
+-          Down                     0x00000000000057A8
+-          Left                     0x0000000000007788
+-          Right                    0x00000000000017E8
+-          Menu                     0x0000000000007B84
+-          Mute                     0x0000000000003BC4
+-          Enter                    0x00000000000047B8
+-          CHUp                     0x00000000000027D8
+-          CHDown                   0x0000000000006798
+-          VolUp                    0x0000000000005BA4
+-          VolDown                  0x0000000000001BE4
++          KEY_UP                       0x00000000000037C8
++          KEY_DOWN                     0x00000000000057A8
++          KEY_LEFT                     0x0000000000007788
++          KEY_RIGHT                    0x00000000000017E8
++          KEY_MENU                     0x0000000000007B84
++          KEY_MUTE                     0x0000000000003BC4
++          KEY_ENTER                    0x00000000000047B8
++          KEY_CHANNELUP                     0x00000000000027D8
++          KEY_CHANNELDOWN                   0x0000000000006798
++          KEY_VOLUMEUP                    0x0000000000005BA4
++          KEY_VOLUMEDOWN                  0x0000000000001BE4
+           Display                  0x00000000000007F8
+-          One                      0x0000000000005EA1
+-          Two                      0x0000000000001EE1
+-          Three                    0x0000000000000BF4
+-          Four                     0x0000000000007E81
+-          Five                     0x0000000000003EC1
+-          Six                      0x0000000000004BB4
+-          Seven                    0x0000000000005FA0
+-          Eight                    0x0000000000001FE0
+-          Nine                     0x0000000000002BD4
+-          Zero                     0x0000000000003FC0
++          KEY_1                      0x0000000000005EA1
++          KEY_2                      0x0000000000001EE1
++          KEY_3                    0x0000000000000BF4
++          KEY_4                     0x0000000000007E81
++          KEY_5                     0x0000000000003EC1
++          KEY_6                      0x0000000000004BB4
++          KEY_7                    0x0000000000005FA0
++          KEY_8                    0x0000000000001FE0
++          KEY_9                     0x0000000000002BD4
++          KEY_0                     0x0000000000003FC0
+           Star                     0x0000000000007F80
+           Hash                     0x0000000000006B94
+       end codes
+diff -upr lirc-0.8.3.orig/remotes/pcmak/lircd.conf.pcmak lirc-0.8.3/remotes/pcmak/lircd.conf.pcmak
+--- lirc-0.8.3.orig/remotes/pcmak/lircd.conf.pcmak	2004-07-24 16:36:15.000000000 +0100
++++ lirc-0.8.3/remotes/pcmak/lircd.conf.pcmak	2008-08-12 16:14:40.000000000 +0100
+@@ -23,18 +23,18 @@ begin remote
+   repeat_bit      0
+ 
+       begin codes
+-          HOME                     0x0000000000000001
+-          ARROW_UP                 0x0000000000000002
++          KEY_HOME                     0x0000000000000001
++          KEY_UP                 0x0000000000000002
+           PG_UP                    0x0000000000000003
+-          ARROW_LEFT               0x0000000000000004
+-          ENTER                    0x0000000000000005
+-          ARROW_RIGHT              0x0000000000000006
+-          END                      0x0000000000000007
+-          ARROW_DOWN               0x0000000000000008
++          KEY_LEFT               0x0000000000000004
++          KEY_ENTER                    0x0000000000000005
++          KEY_RIGHT              0x0000000000000006
++          KEY_END                      0x0000000000000007
++          KEY_DOWN               0x0000000000000008
+           PG_DN                    0x0000000000000009
+-          SPACE                    0x000000000000000A
+-          TAB                      0x000000000000000B
+-          ESC                      0x000000000000000C
++          KEY_SPACE                    0x000000000000000A
++          KEY_TAB                      0x000000000000000B
++          KEY_ESC                      0x000000000000000C
+           ALT                      0x000000000000000D
+           PLAYLIST                 0x000000000000000E
+           LOAD                     0x000000000000000F
+@@ -49,36 +49,36 @@ begin remote
+           FULLSCREEN               0x0000000000000018
+           BUTTONL_DOWN             0x0000000000000019
+           BUTTONR_DOWN             0x000000000000001A
+-          POWER                    0x000000000000001B
+-          A                        0x000000000000001C
+-          B                        0x000000000000001D
+-          C                        0x000000000000001E
+-          D                        0x000000000000001F
+-          VOL_DOWN                 0x0000000000000020
+-          MUTE                     0x0000000000000021
+-          VOL_UP                   0x0000000000000022
+-          PLAY                     0x0000000000000024
+-    	  PREV                     0x0000000000000026
+-          PAUSE                    0x0000000000000027
+-          NEXT                     0x0000000000000028
++          KEY_POWER                    0x000000000000001B
++          KEY_A                        0x000000000000001C
++          KEY_B                        0x000000000000001D
++          KEY_C                        0x000000000000001E
++          KEY_D                        0x000000000000001F
++          KEY_VOLUMEDOWN                 0x0000000000000020
++          KEY_MUTE                     0x0000000000000021
++          KEY_VOLUMEUP                   0x0000000000000022
++          KEY_PLAY                     0x0000000000000024
++    	  KEY_PREVIOUS                     0x0000000000000026
++          KEY_PAUSE                    0x0000000000000027
++          KEY_NEXT                     0x0000000000000028
+           SKIP_BACK                0x0000000000000029
+-          STOP                     0x000000000000002A
++          KEY_STOP                     0x000000000000002A
+           SKIP_FORW                0x000000000000002B
+-          1                        0x0000000000000041
+-          2                        0x0000000000000042
+-          3                        0x0000000000000043
+-          4                        0x0000000000000044
+-          5                        0x0000000000000045
+-          6                        0x0000000000000046
+-          7                        0x0000000000000047
+-          8                        0x0000000000000048
+-          9                        0x0000000000000049
+-          0                        0x000000000000004A
+-          sTAB                     0x000000000000004B
+-          sESC                     0x000000000000004C
++          KEY_1                        0x0000000000000041
++          KEY_2                        0x0000000000000042
++          KEY_3                        0x0000000000000043
++          KEY_4                        0x0000000000000044
++          KEY_5                        0x0000000000000045
++          KEY_6                        0x0000000000000046
++          KEY_7                        0x0000000000000047
++          KEY_8                        0x0000000000000048
++          KEY_9                        0x0000000000000049
++          KEY_0                        0x000000000000004A
++          KEY_TAB                     0x000000000000004B
++          KEY_ESC                     0x000000000000004C
+           sALT                     0x000000000000004D
+           sPLAYLIST                0x000000000000004E
+-          TXT                      0x000000000000004F
++          KEY_TEXT                      0x000000000000004F
+           sMOUSE_N                 0x0000000000000050
+           sMOUSE_NE                0x0000000000000051
+           sMOUSE_E                 0x0000000000000052
+@@ -87,30 +87,30 @@ begin remote
+           sMOUSE_SW                0x0000000000000055
+           sMOUSE_W                 0x0000000000000056
+           sMOUSE_NW                0x0000000000000057
+-          sOK                      0x0000000000000058
++          KEY_OK                      0x0000000000000058
+           BUTTONL_UP               0x0000000000000059
+           BUTTONR_UP               0x000000000000005A
+-          EXIT                     0x000000000000005B
+-          E                        0x000000000000005C
+-          F                        0x000000000000005D
+-          G                        0x000000000000005E
+-          H                        0x000000000000005F
+-          sVOL_DOWN                0x0000000000000060
+-          sMUTE                    0x0000000000000061
+-          sVOL_UP                  0x0000000000000062
+-          sPLAY                    0x0000000000000064
+-          sPREV                    0x0000000000000066
+-          sPAUSE                   0x0000000000000067
+-          sNEXT                    0x0000000000000068
++          KEY_EXIT                     0x000000000000005B
++          KEY_E                        0x000000000000005C
++          KEY_F                        0x000000000000005D
++          KEY_G                        0x000000000000005E
++          KEY_H                        0x000000000000005F
++          KEY_VOLUMEDOWN                0x0000000000000060
++          KEY_MUTE                    0x0000000000000061
++          KEY_VOLUMEUP                  0x0000000000000062
++          KEY_PLAY                    0x0000000000000064
++          KEY_PREVIOUS                    0x0000000000000066
++          KEY_PAUSE                   0x0000000000000067
++          KEY_NEXT                    0x0000000000000068
+           ZOOM-                    0x0000000000000069
+-          HELP                     0x000000000000006A
++          KEY_HELP                     0x000000000000006A
+           ZOOM+                    0x000000000000006B
+-          MM_PLAY                  0x000000000000002F
+-          MM_PREV                  0x0000000000000030
+-          MM_NEXT                  0x0000000000000031
+-          MM_PAUSE                 0x000000000000005F
+-          MM_BACK                  0x0000000000000075
+-	  MM_FORW                  0x0000000000000079
++          KEY_PLAY                  0x000000000000002F
++          KEY_PREVIOUS                  0x0000000000000030
++          KEY_NEXT                  0x0000000000000031
++          KEY_PAUSE                 0x000000000000005F
++          KEY_BACK                  0x0000000000000075
++	  KEY_FORWARD                  0x0000000000000079
+       end codes
+ 
+ end remote
+diff -upr lirc-0.8.3.orig/remotes/pinnacle_systems/lircd.conf.pctv lirc-0.8.3/remotes/pinnacle_systems/lircd.conf.pctv
+--- lirc-0.8.3.orig/remotes/pinnacle_systems/lircd.conf.pctv	2007-10-06 16:40:53.000000000 +0100
++++ lirc-0.8.3/remotes/pinnacle_systems/lircd.conf.pctv	2008-08-12 16:14:40.000000000 +0100
+@@ -24,30 +24,30 @@ begin remote
+   toggle_bit         0
+ 
+   begin codes
+-          Mute                     0xB53C                     #Mute                     0x000000000000003C
+-          Power                    0x2D2F                     #Power                    0x000000000000002F
++          KEY_MUTE                     0xB53C                     #Mute                     0x000000000000003C
++          KEY_POWER                    0x2D2F                     #Power                    0x000000000000002F
+           Chan+Play                0x173F                     #Chan+Play                0x000000000000003F
+           Chan-Stop                0xC63E                     #Chan-Stop                0x000000000000003E
+           Vol+FF                   0xF13B                     #Vol+FF                   0x000000000000003B
+           Vol-Rew                  0x643D                     #Vol-Rew                  0x000000000000003D
+-          1                        0x9F31                     #1                        0x0000000000000031
+-          2                        0x3D32                     #2                        0x0000000000000032
+-          3                        0xEC33                     #3                        0x0000000000000033
+-          4                        0xA834                     #4                        0x0000000000000034
+-          5                        0x7935                     #5                        0x0000000000000035
+-          6                        0xDB36                     #6                        0x0000000000000036
+-          7                        0x0A37                     #7                        0x0000000000000037
+-          8                        0x5338                     #8                        0x0000000000000038
+-          9                        0x8239                     #9                        0x0000000000000039
++          KEY_1                        0x9F31                     #1                        0x0000000000000031
++          KEY_2                        0x3D32                     #2                        0x0000000000000032
++          KEY_3                        0xEC33                     #3                        0x0000000000000033
++          KEY_4                        0xA834                     #4                        0x0000000000000034
++          KEY_5                        0x7935                     #5                        0x0000000000000035
++          KEY_6                        0xDB36                     #6                        0x0000000000000036
++          KEY_7                        0x0A37                     #7                        0x0000000000000037
++          KEY_8                        0x5338                     #8                        0x0000000000000038
++          KEY_9                        0x8239                     #9                        0x0000000000000039
+           Fullscreen               0x5E2D                     #Fullscreen               0x000000000000002D
+-          0/AV                     0x203A                     #0/AV                     0x000000000000003A
+-          Info                     0xCB2B                     #Info                     0x000000000000002B
+-          Preview                  0xFC2E                     #Preview                  0x000000000000002E
+-          Record                   0x3027                     #Record                   0x0000000000000027
+-          Chan_Last                0x4325                     #Chan_Last                0x0000000000000025
+-          F_TV                     0xE126                     #F_TV                     0x0000000000000026
++          KEY_0                     0x203A                     #0/AV                     0x000000000000003A
++          KEY_INFO                     0xCB2B                     #Info                     0x000000000000002B
++          KEY_PREVIOUS                  0xFC2E                     #Preview                  0x000000000000002E
++          KEY_RECORD                   0x3027                     #Record                   0x0000000000000027
++          KEY_CHANNELDOWN                0x4325                     #Chan_Last                0x0000000000000025
++          KEY_TV                     0xE126                     #F_TV                     0x0000000000000026
+           F_TELETEXT               0xB829                     #F_TELETEXT               0x0000000000000029
+-          F_RADIO                  0x1A2A                     #F_RADIO                  0x000000000000002A
++          KEY_RADIO                  0x1A2A                     #F_RADIO                  0x000000000000002A
+ 
+ #
+ # here are some extra buttons a new version of the remote seems to have
+@@ -58,23 +58,23 @@ begin remote
+ # model:             PCTV Remote (newest version?)
+ # supported devices: dongle on serial port (from TV-Card)
+ #
+-          L                        0x631F                     #L                        0x000000000000001F
+-          Zoom                     0xB21E                     #Zoom                     0x000000000000001E
+-          vol+                     0x851B                     #vol+                     0x000000000000001B
+-          vol-                     0x590F                     #vol-                     0x000000000000000F
+-          channel+                 0x7E17                     #channel+                 0x0000000000000017
+-          channel-                 0xC11C                     #channel-                 0x000000000000001C
++          KEY_L                        0x631F                     #L                        0x000000000000001F
++          KEY_ZOOM                     0xB21E                     #Zoom                     0x000000000000001E
++          KEY_VOLUMEUP                     0x851B                     #vol+                     0x000000000000001B
++          KEY_VOLUMEDOWN                     0x590F                     #vol-                     0x000000000000000F
++          KEY_CHANNELUP                 0x7E17                     #channel+                 0x0000000000000017
++          KEY_CHANNELDOWN                 0xC11C                     #channel-                 0x000000000000001C
+           middle                   0x541A                     #middle                   0x000000000000001A
+-          Menu                     0x101D                     #Menu                     0x000000000000001D
+-          next                     0xF619                     #next                     0x0000000000000019
+-          undo                     0xAF16                     #undo                     0x0000000000000016
+-          pause                    0x0D15                     #pause                    0x0000000000000015
++          KEY_MENU                     0x101D                     #Menu                     0x000000000000001D
++          KEY_NEXT                     0xF619                     #next                     0x0000000000000019
++          KEY_UNDO                     0xAF16                     #undo                     0x0000000000000016
++          KEY_PAUSE                    0x0D15                     #pause                    0x0000000000000015
+           redo                     0x9813                     #redo                     0x0000000000000013
+-          Rewind                   0x880E                     #Rewind                   0x000000000000000E
+-          Play                     0x2A0D                     #Play                     0x000000000000000D
+-          Stop                     0xBF0B                     #Stop                     0x000000000000000B
+-          FForward                 0x4407                     #FForward                 0x0000000000000007
+-          EPG                      0x2718                     #EPG                      0x0000000000000018
++          KEY_REWIND                   0x880E                     #Rewind                   0x000000000000000E
++          KEY_PLAY                     0x2A0D                     #Play                     0x000000000000000D
++          KEY_STOP                     0xBF0B                     #Stop                     0x000000000000000B
++          KEY_FASTFORWARD                 0x4407                     #FForward                 0x0000000000000007
++          KEY_EPG                      0x2718                     #EPG                      0x0000000000000018
+  
+ # here are some more buttons that seem to be mapped differently from
+ # the ones above 
+@@ -86,8 +86,8 @@ begin remote
+ # supported devices: serial
+ #
+ 
+-          9                        0x0000000000000082
+-          Zoom                     0x00000000000000B2
++          KEY_9                        0x0000000000000082
++          KEY_ZOOM                     0x00000000000000B2
+           middle                   0x0000000000000014
+ 
+ 
+diff -upr lirc-0.8.3.orig/remotes/pixelview/lircd.conf.playtv lirc-0.8.3/remotes/pixelview/lircd.conf.playtv
+--- lirc-0.8.3.orig/remotes/pixelview/lircd.conf.playtv	1999-08-04 20:18:27.000000000 +0100
++++ lirc-0.8.3/remotes/pixelview/lircd.conf.playtv	2008-08-12 16:14:40.000000000 +0100
+@@ -13,22 +13,22 @@ begin remote
+   begin codes
+     TV/FM                    0x00000000000000e7
+     FULL_SCREEN              0x00000000000000bf
+-    CH+                      0x0000000000000049
+-    CH-                      0x00000000000000c1
+-    VOL-                     0x000000000000006a
+-    VOL+                     0x000000000000004a
+-    MUTE                     0x0000000000000047
++    KEY_CHANNELUP                      0x0000000000000049
++    KEY_CHANNELDOWN                      0x00000000000000c1
++    KEY_VOLUMEDOWN                     0x000000000000006a
++    KEY_VOLUMEUP                     0x000000000000004a
++    KEY_MUTE                     0x0000000000000047
+     SOURCE                   0x00000000000000e1
+-    1                        0x00000000000000e0
+-    2                        0x00000000000000c8
+-    3                        0x00000000000000e8
+-    4                        0x0000000000000060
+-    5                        0x0000000000000062
+-    6                        0x00000000000000c9
+-    7                        0x00000000000000c0
+-    8                        0x00000000000000c2
+-    9                        0x0000000000000061
+-    0                        0x0000000000000040
++    KEY_1                        0x00000000000000e0
++    KEY_2                        0x00000000000000c8
++    KEY_3                        0x00000000000000e8
++    KEY_4                        0x0000000000000060
++    KEY_5                        0x0000000000000062
++    KEY_6                        0x00000000000000c9
++    KEY_7                        0x00000000000000c0
++    KEY_8                        0x00000000000000c2
++    KEY_9                        0x0000000000000061
++    KEY_0                        0x0000000000000040
+   end codes
+ end remote
+ 
+diff -upr lirc-0.8.3.orig/remotes/pixelview/lircd.conf.playtv_bt878 lirc-0.8.3/remotes/pixelview/lircd.conf.playtv_bt878
+--- lirc-0.8.3.orig/remotes/pixelview/lircd.conf.playtv_bt878	2000-09-30 20:32:40.000000000 +0100
++++ lirc-0.8.3/remotes/pixelview/lircd.conf.playtv_bt878	2008-08-12 16:14:40.000000000 +0100
+@@ -16,39 +16,39 @@ begin remote
+   repeat_bit 0
+ 
+   begin codes
+-    POWER                    0x00000000000000aa
++    KEY_POWER                    0x00000000000000aa
+     TV/FM                    0x00000000000000e7
+     TELETEXT                 0x000000000000003f
+     SCAN                     0x0000000000000041
+     +/-                      0x0000000000000069
+-    EJECT                    0x000000000000002a
+-    STOP                     0x000000000000008a
++    KEY_EJECTCD                    0x000000000000002a
++    KEY_STOP                     0x000000000000008a
+     SOURCE                   0x00000000000000e1
+     STEREO                   0x00000000000000df
+-    ENTER                    0x000000000000005f
+-    SEEK_NEXT                0x0000000000000067
+-    SEEK_FWD                 0x00000000000000c7
+-    CH_UP                    0x0000000000000049
+-    VOL_UP                   0x000000000000004a
++    KEY_ENTER                    0x000000000000005f
++    KEY_NEXT                0x0000000000000067
++    KEY_FORWARD                 0x00000000000000c7
++    KEY_CHANNELUP                    0x0000000000000049
++    KEY_VOLUMEUP                   0x000000000000004a
+     RECALL                   0x0000000000000048
+-    PAUSE                    0x0000000000000068
+-    PLAY                     0x00000000000000ca
+-    CH_DOWN                  0x00000000000000c1
+-    VOL_DOWN                 0x000000000000006a
+-    SEEK_PREV                0x000000000000000a
+-    SEEK_BACK                0x0000000000000042
+-    ZOOM                     0x00000000000000bf
+-    MUTE                     0x0000000000000047
+-    1                        0x00000000000000e0
+-    2                        0x00000000000000c8
+-    3                        0x00000000000000e8
+-    4                        0x0000000000000060
+-    5                        0x0000000000000062
+-    6                        0x00000000000000c9
+-    7                        0x00000000000000c0
+-    8                        0x00000000000000c2
+-    9                        0x0000000000000061
+-    0                        0x0000000000000040
++    KEY_PAUSE                    0x0000000000000068
++    KEY_PLAY                     0x00000000000000ca
++    KEY_CHANNELDOWN                  0x00000000000000c1
++    KEY_VOLUMEDOWN                 0x000000000000006a
++    KEY_PREVIOUS                0x000000000000000a
++    KEY_BACK                0x0000000000000042
++    KEY_ZOOM                     0x00000000000000bf
++    KEY_MUTE                     0x0000000000000047
++    KEY_1                        0x00000000000000e0
++    KEY_2                        0x00000000000000c8
++    KEY_3                        0x00000000000000e8
++    KEY_4                        0x0000000000000060
++    KEY_5                        0x0000000000000062
++    KEY_6                        0x00000000000000c9
++    KEY_7                        0x00000000000000c0
++    KEY_8                        0x00000000000000c2
++    KEY_9                        0x0000000000000061
++    KEY_0                        0x0000000000000040
+   end codes
+ end remote
+ 
+diff -upr lirc-0.8.3.orig/remotes/pixelview/lircd.conf.playtv_pro lirc-0.8.3/remotes/pixelview/lircd.conf.playtv_pro
+--- lirc-0.8.3.orig/remotes/pixelview/lircd.conf.playtv_pro	2005-12-10 13:09:13.000000000 +0000
++++ lirc-0.8.3/remotes/pixelview/lircd.conf.playtv_pro	2008-08-12 16:14:40.000000000 +0100
+@@ -31,15 +31,15 @@ begin remote
+ 
+       begin codes
+ 
+-          power                    0x0000000000007887
+-          zoom                     0x00000000000038C7
++          KEY_POWER                    0x0000000000007887
++          KEY_ZOOM                     0x00000000000038C7
+           scan                     0x000000000000E01F
+           tv/fm                    0x000000000000C03F
+-          vol+                     0x000000000000F807
+-          vol-                     0x000000000000E817
+-          chan+                    0x0000000000006897
+-          chan-                    0x00000000000028D7
+-          mute                     0x00000000000018E7
++          KEY_VOLUMEUP                     0x000000000000F807
++          KEY_VOLUMEDOWN                     0x000000000000E817
++          KEY_CHANNELUP                    0x0000000000006897
++          KEY_CHANNELDOWN                    0x00000000000028D7
++          KEY_MUTE                     0x00000000000018E7
+           source                   0x00000000000000FF
+           loop                     0x000000000000C837
+           +100                     0x00000000000008F7
+@@ -48,16 +48,16 @@ begin remote
+           reset                    0x000000000000B04F
+           freeze                   0x000000000000F00F
+           function                 0x000000000000708F
+-          0                        0x00000000000040BF
+-          1                        0x000000000000807F
+-          2                        0x000000000000D02F
+-          3                        0x000000000000D827
+-          4                        0x000000000000A05F
+-          5                        0x000000000000906F
+-          6                        0x000000000000A857
+-          7                        0x000000000000609F
+-          8                        0x00000000000050AF
+-          9                        0x00000000000048B7
++          KEY_0                        0x00000000000040BF
++          KEY_1                        0x000000000000807F
++          KEY_2                        0x000000000000D02F
++          KEY_3                        0x000000000000D827
++          KEY_4                        0x000000000000A05F
++          KEY_5                        0x000000000000906F
++          KEY_6                        0x000000000000A857
++          KEY_7                        0x000000000000609F
++          KEY_8                        0x00000000000050AF
++          KEY_9                        0x00000000000048B7
+ 
+       end codes
+ 
+diff -upr lirc-0.8.3.orig/remotes/pixelview/lircd.conf.remotemaster lirc-0.8.3/remotes/pixelview/lircd.conf.remotemaster
+--- lirc-0.8.3.orig/remotes/pixelview/lircd.conf.remotemaster	2000-02-07 11:03:20.000000000 +0000
++++ lirc-0.8.3/remotes/pixelview/lircd.conf.remotemaster	2008-08-12 16:14:40.000000000 +0100
+@@ -25,39 +25,39 @@ begin remote
+   gap          189264
+ 
+       begin codes
+-          1                        0x0000000000052D2F
+-          2                        0x0000000000052CCF
+-          3                        0x0000000000052CAF
+-          4                        0x0000000000052D37
+-          5                        0x0000000000052CDF
+-          6                        0x000000000005359F
+-          7                        0x0000000000052D4F
+-          8                        0x0000000000052D3F
+-          9                        0x00000000000534DF
+-          0                        0x0000000000052D57
+-          ENTER                    0x0000000000052CD7
++          KEY_1                        0x0000000000052D2F
++          KEY_2                        0x0000000000052CCF
++          KEY_3                        0x0000000000052CAF
++          KEY_4                        0x0000000000052D37
++          KEY_5                        0x0000000000052CDF
++          KEY_6                        0x000000000005359F
++          KEY_7                        0x0000000000052D4F
++          KEY_8                        0x0000000000052D3F
++          KEY_9                        0x00000000000534DF
++          KEY_0                        0x0000000000052D57
++          KEY_ENTER                    0x0000000000052CD7
+           +10                      0x0000000000053537
+-          POWER                    0x0000000000054D5F
+-          MODE                     0x00000000000534AF
+-          TAB                      0x0000000000053557
+-          ZOOM                     0x000000000005355F
++          KEY_POWER                    0x0000000000054D5F
++          KEY_MODE                     0x00000000000534AF
++          KEY_TAB                      0x0000000000053557
++          KEY_ZOOM                     0x000000000005355F
+           FREEZE                   0x000000000005356F
+           SEEK--                   0x0000000000054DAF
+-          PAUSE                    0x0000000000052CB7
++          KEY_PAUSE                    0x0000000000052CB7
+           SEEK++                   0x00000000000534B7
+           SEEK-                    0x0000000000052D5F
+-          PLAY                     0x0000000000052D9F
++          KEY_PLAY                     0x0000000000052D9F
+           SEEK+                    0x00000000000534CF
+-          STOP                     0x0000000000054D9F
+-          EJECT                    0x0000000000054D6F
+-          F1                       0x000000000005354F
+-          F2                       0x00000000000534D7
+-          F3                       0x00000000000534BF
+-          F4                       0x000000000005352F
+-          CH-                      0x000000000005353F
+-          CH+                      0x00000000000535AF
+-          VOL-                     0x0000000000052D6F
+-          VOL+                     0x0000000000052DAF
++          KEY_STOP                     0x0000000000054D9F
++          KEY_EJECTCD                    0x0000000000054D6F
++          KEY_F1                       0x000000000005354F
++          KEY_F2                       0x00000000000534D7
++          KEY_F3                       0x00000000000534BF
++          KEY_F4                       0x000000000005352F
++          KEY_CHANNELDOWN                      0x000000000005353F
++          KEY_CHANNELUP                      0x00000000000535AF
++          KEY_VOLUMEDOWN                     0x0000000000052D6F
++          KEY_VOLUMEUP                     0x0000000000052DAF
+       end codes
+ 
+ end remote
+diff -upr lirc-0.8.3.orig/remotes/provideo/lircd.conf.pv951 lirc-0.8.3/remotes/provideo/lircd.conf.pv951
+--- lirc-0.8.3.orig/remotes/provideo/lircd.conf.pv951	2001-01-20 13:32:00.000000000 +0000
++++ lirc-0.8.3/remotes/provideo/lircd.conf.pv951	2008-08-12 16:14:40.000000000 +0100
+@@ -31,28 +31,28 @@ begin remote
+   repeat_bit      0
+ 
+       begin codes
+-          power                    0x00000000000048B7
++          KEY_POWER                    0x00000000000048B7
+           air/cbl                  0x000000000000D02F
+           pc/tv                    0x0000000000008877
+           source                   0x000000000000F00F
+           mts                      0x000000000000C837
+-          mute                     0x00000000000008F7
+-          1                        0x000000000000807F
+-          2                        0x00000000000040BF
+-          3                        0x000000000000C03F
+-          4                        0x00000000000020DF
+-          5                        0x000000000000A05F
+-          6                        0x000000000000609F
+-          7                        0x000000000000E01F
+-          8                        0x00000000000010EF
+-          9                        0x000000000000906F
+-          0                        0x00000000000000FF
++          KEY_MUTE                     0x00000000000008F7
++          KEY_1                        0x000000000000807F
++          KEY_2                        0x00000000000040BF
++          KEY_3                        0x000000000000C03F
++          KEY_4                        0x00000000000020DF
++          KEY_5                        0x000000000000A05F
++          KEY_6                        0x000000000000609F
++          KEY_7                        0x000000000000E01F
++          KEY_8                        0x00000000000010EF
++          KEY_9                        0x000000000000906F
++          KEY_0                        0x00000000000000FF
+           +100                     0x00000000000050AF
+           ch_rtn                   0x000000000000E817
+-          ch+                      0x00000000000058A7
+-          ch-                      0x0000000000007887
+-          vol+                     0x000000000000D827
+-          vol-                     0x000000000000F807
++          KEY_CHANNELUP                      0x00000000000058A7
++          KEY_CHANNELDOWN                      0x0000000000007887
++          KEY_VOLUMEUP                     0x000000000000D827
++          KEY_VOLUMEDOWN                     0x000000000000F807
+           func                     0x0000000000009867
+           ttx                      0x000000000000B04F
+           pg+                      0x000000000000708F
+diff -upr lirc-0.8.3.orig/remotes/remotec/lircd.conf.BW6130 lirc-0.8.3/remotes/remotec/lircd.conf.BW6130
+--- lirc-0.8.3.orig/remotes/remotec/lircd.conf.BW6130	2005-05-28 15:29:27.000000000 +0100
++++ lirc-0.8.3/remotes/remotec/lircd.conf.BW6130	2008-08-12 16:14:39.000000000 +0100
+@@ -20,20 +20,20 @@ begin remote
+   toggle_bit     0
+ 
+       begin codes
+-	PRE	0x23
+-        NEXT	0x24
+-	1	0X10
+-	2	0x11
+-	3	0x12
+-	POWER	0x50
+-	VOL+	0x30
+-	VOL-	0x31
+-	L	0x42
+-	R	0x44
+-	PAUSE	0x22
+-	PLAY	0x20
+-	STOP	0x21
+-	MUTE	0x32
++	KEY_PREVIOUS	0x23
++        KEY_NEXT	0x24
++	KEY_1	0X10
++	KEY_2	0x11
++	KEY_3	0x12
++	KEY_POWER	0x50
++	KEY_VOLUMEUP	0x30
++	KEY_VOLUMEDOWN	0x31
++	KEY_L	0x42
++	KEY_R	0x44
++	KEY_PAUSE	0x22
++	KEY_PLAY	0x20
++	KEY_STOP	0x21
++	KEY_MUTE	0x32
+ 	MOUSE_SLOW_N		0x95
+ 	MOUSE_SLOW_NNE		0xd1
+ 	MOUSE_SLOW_NE		0xcd
+diff -upr lirc-0.8.3.orig/remotes/samsung/lircd.conf.samsung lirc-0.8.3/remotes/samsung/lircd.conf.samsung
+--- lirc-0.8.3.orig/remotes/samsung/lircd.conf.samsung	2008-03-02 19:18:40.000000000 +0000
++++ lirc-0.8.3/remotes/samsung/lircd.conf.samsung	2008-08-12 16:14:39.000000000 +0100
+@@ -28,60 +28,60 @@ begin remote
+ 
+       begin codes
+ ### Standard keyboard report, type 1
+-          OK                       0x70028
+-          Right                    0x7004f
+-          Left                     0x70050
+-          Up                       0x70052
+-          Down                     0x70051
++          KEY_OK                       0x70028
++          KEY_RIGHT                    0x7004f
++          KEY_LEFT                     0x70050
++          KEY_UP                       0x70052
++          KEY_DOWN                     0x70051
+ 
+ ### Standard generic desktop report, type 3
+-          Power                    0x10001
++          KEY_POWER                    0x10001
+ 
+ ### Propietary Samsung report, type 4
+-          Mute                     0xffcc0001
++          KEY_MUTE                     0xffcc0001
+           Video_Archive            0xffcc0002
+-          1                        0xffcc0003
+-          2                        0xffcc0004
+-          3                        0xffcc0005
+-          Sleep                    0xffcc0006
+-          4                        0xffcc0007
+-          5                        0xffcc0008
+-          6                        0xffcc0009
+-          Last                     0xffcc000a
+-          7                        0xffcc000b
+-          8                        0xffcc000c
+-          9                        0xffcc000d
+-          Subtitle                 0xffcc000e
++          KEY_1                        0xffcc0003
++          KEY_2                        0xffcc0004
++          KEY_3                        0xffcc0005
++                              0xffcc0006
++          KEY_4                        0xffcc0007
++          KEY_5                        0xffcc0008
++          KEY_6                        0xffcc0009
++                               0xffcc000a
++          KEY_7                        0xffcc000b
++          KEY_8                        0xffcc000c
++          KEY_9                        0xffcc000d
++                           0xffcc000e
+           Full                     0xffcc000f
+-          0                        0xffcc0010
++          KEY_0                        0xffcc0010
+           PIP                      0xffcc0011
+           Timer                    0xffcc0012
+-          Source                   0xffcc0013
++                             0xffcc0013
+           TV_Menu                  0xffcc0014
+-          EPG                      0xffcc0015
+-          Text                     0xffcc0016
++          KEY_EPG                      0xffcc0015
++          KEY_TEXT                     0xffcc0016
+ # gap 17..1b: probably cursor keys were previously planned here
+-          TV                       0xffcc001c
+-          Radio                    0xffcc001d
+-          DVD                      0xffcc001e
+-          Ch+                      0xffcc001f
+-          Menu                     0xffcc0020
+-          Vol+                     0xffcc0021
+-          Ch-                      0xffcc0022
+-          Back                     0xffcc0023
+-          Vol-                     0xffcc0024
+-          Play                     0xffcc0025
+-          Pause                    0xffcc0026
+-          Stop                     0xffcc0027
+-          Record                   0xffcc0028
+-          Prev                     0xffcc0029
+-          Rewind                   0xffcc002a
+-          Forward                  0xffcc002b
+-          Next                     0xffcc002c
+-          Red                      0xffcc002d
+-          Green                    0xffcc002e
+-          Yellow                   0xffcc002f
+-          Blue                     0xffcc0030
++          KEY_TV                       0xffcc001c
++          KEY_RADIO                    0xffcc001d
++          KEY_DVD                      0xffcc001e
++          KEY_CHANNELUP                      0xffcc001f
++          KEY_MENU                     0xffcc0020
++          KEY_VOLUMEUP                     0xffcc0021
++          KEY_CHANNELDOWN                      0xffcc0022
++          KEY_BACK                     0xffcc0023
++          KEY_VOLUMEDOWN                     0xffcc0024
++          KEY_PLAY                     0xffcc0025
++          KEY_PAUSE                    0xffcc0026
++          KEY_STOP                     0xffcc0027
++          KEY_RECORD                   0xffcc0028
++          KEY_PREVIOUS                     0xffcc0029
++          KEY_REWIND                   0xffcc002a
++          KEY_FORWARD                  0xffcc002b
++          KEY_NEXT                     0xffcc002c
++          KEY_RED                      0xffcc002d
++          KEY_GREEN                    0xffcc002e
++          KEY_YELLOW                   0xffcc002f
++          KEY_BLUE                     0xffcc0030
+       end codes
+ 
+ end remote
+diff -upr lirc-0.8.3.orig/remotes/sasem/lircd.conf.sasem lirc-0.8.3/remotes/sasem/lircd.conf.sasem
+--- lirc-0.8.3.orig/remotes/sasem/lircd.conf.sasem	2005-07-15 12:24:55.000000000 +0100
++++ lirc-0.8.3/remotes/sasem/lircd.conf.sasem	2008-08-12 16:14:40.000000000 +0100
+@@ -33,47 +33,47 @@ begin remote
+ 
+ 
+       begin codes
+-          1                        0x08F7
+-          2                        0x09F6
+-          3                        0x0AF5
+-          4                        0x10EF
+-          5                        0x11EE
+-          6                        0x12ED
+-          7                        0x18E7
+-          8                        0x19E6
+-          9                        0x1AE5
++          KEY_1                        0x08F7
++          KEY_2                        0x09F6
++          KEY_3                        0x0AF5
++          KEY_4                        0x10EF
++          KEY_5                        0x11EE
++          KEY_6                        0x12ED
++          KEY_7                        0x18E7
++          KEY_8                        0x19E6
++          KEY_9                        0x1AE5
+           start                    0x40BF
+-          0                        0x41BE
++          KEY_0                        0x41BE
+           full_down                0x06F9
+-          vol-                     0x0FF0
+-          vol+                     0x0EF1
+-          esc                      0x05FA
+-          up                       0x0BF4
+-          close                    0x07F8
+-          left                     0x03FC
+-          enter                    0x13EC
+-          right                    0x1BE4
+-          prev                     0x0CF3
+-          down                     0x43BC
+-          next                     0x01FE
+-          mute                     0x0DF2
++          KEY_VOLUMEDOWN                     0x0FF0
++          KEY_VOLUMEUP                     0x0EF1
++          KEY_ESC                      0x05FA
++          KEY_UP                       0x0BF4
++          KEY_CLOSE                    0x07F8
++          KEY_LEFT                     0x03FC
++          KEY_ENTER                    0x13EC
++          KEY_RIGHT                    0x1BE4
++          KEY_PREVIOUS                     0x0CF3
++          KEY_DOWN                     0x43BC
++          KEY_NEXT                     0x01FE
++          KEY_MUTE                     0x0DF2
+           step                     0x04FB
+-          play_pause               0x49B6
+-          stop                     0x48B7
++          KEY_PLAYPAUSE               0x49B6
++          KEY_STOP                     0x48B7
+           winamp                   0x1EE1
+           media_player             0x15EA
+           hdtv                     0x17E8
+-          cd_player                0x16E9
++          KEY_CD                0x16E9
+           win_dvd                  0x44BB
+           power_dvd                0x14EB
+-          internet                 0x46B9
++          KEY_WWW                 0x46B9
+           email                    0x47B8
+-          a                        0x45BA
+-          b                        0x1DE2
+-          c                        0x1CE3
+-          d                        0x1FE0
+-          eject                    0x02FD
+-          power                    0x00FF
++          KEY_A                        0x45BA
++          KEY_B                        0x1DE2
++          KEY_C                        0x1CE3
++          KEY_D                        0x1FE0
++          KEY_EJECTCD                    0x02FD
++          KEY_POWER                    0x00FF
+       end codes
+ 
+ end remote
+diff -upr lirc-0.8.3.orig/remotes/sigma_designs/lircd.conf.realmagic lirc-0.8.3/remotes/sigma_designs/lircd.conf.realmagic
+--- lirc-0.8.3.orig/remotes/sigma_designs/lircd.conf.realmagic	2006-04-29 12:01:50.000000000 +0100
++++ lirc-0.8.3/remotes/sigma_designs/lircd.conf.realmagic	2008-08-12 16:14:39.000000000 +0100
+@@ -30,43 +30,43 @@ begin remote
+ 
+       begin codes
+ 
+-          1                        0x0000000000006897
+-          2                        0x000000000000E817
+-          3                        0x000000000000F807
+-          4                        0x00000000000058A7
+-          5                        0x000000000000D827
+-          6                        0x00000000000018E7
+-          7                        0x00000000000002FD
+-          8                        0x00000000000022DD
+-          9                        0x00000000000038C7
+-          0                        0x00000000000032CD
+-          VOL+                     0x000000000000A857
+-          VOL-                     0x0000000000009867
+-          MUTE                     0x0000000000007887
++          KEY_1                        0x0000000000006897
++          KEY_2                        0x000000000000E817
++          KEY_3                        0x000000000000F807
++          KEY_4                        0x00000000000058A7
++          KEY_5                        0x000000000000D827
++          KEY_6                        0x00000000000018E7
++          KEY_7                        0x00000000000002FD
++          KEY_8                        0x00000000000022DD
++          KEY_9                        0x00000000000038C7
++          KEY_0                        0x00000000000032CD
++          KEY_VOLUMEUP                     0x000000000000A857
++          KEY_VOLUMEDOWN                     0x0000000000009867
++          KEY_MUTE                     0x0000000000007887
+           L-R                      0x0000000000001AE5
+           VGA                      0x00000000000012ED
+-          ENTER                    0x0000000000002AD5
+-          QUIT                     0x00000000000000FF
++          KEY_ENTER                    0x0000000000002AD5
++          KEY_EXIT                     0x00000000000000FF
+           PRG                      0x000000000000807F
+-          UP                       0x00000000000040BF
+-          DOWN                     0x000000000000609F
+-          LEFT                     0x00000000000020DF
+-          RIGHT                    0x000000000000C03F
+-          SELECT                   0x000000000000A05F
+-          MENU                     0x000000000000E01F
+-          TITLE                    0x00000000000010EF
++          KEY_UP                       0x00000000000040BF
++          KEY_DOWN                     0x000000000000609F
++          KEY_LEFT                     0x00000000000020DF
++          KEY_RIGHT                    0x000000000000C03F
++          KEY_SELECT                   0x000000000000A05F
++          KEY_MENU                     0x000000000000E01F
++          KEY_TITLE                    0x00000000000010EF
+           OSD                      0x000000000000906F
+-          LANG                     0x00000000000050AF
+-          ANGLE                    0x000000000000D02F
+-          SUB                      0x00000000000030CF
+-          PAUSE                    0x000000000000B04F
+-          STOP                     0x000000000000708F
+-          PLAY                     0x000000000000F00F
+-          EJECT                    0x00000000000008F7
++          KEY_LANGUAGE                     0x00000000000050AF
++          KEY_ANGLE                    0x000000000000D02F
++          KEY_SUBTITLE                      0x00000000000030CF
++          KEY_PAUSE                    0x000000000000B04F
++          KEY_STOP                     0x000000000000708F
++          KEY_PLAY                     0x000000000000F00F
++          KEY_EJECTCD                    0x00000000000008F7
+           REV                      0x0000000000008877
+-          FF                       0x00000000000048B7
+-          PREV                     0x000000000000C837
+-          NEXT                     0x00000000000028D7
++          KEY_FASTFORWARD                       0x00000000000048B7
++          KEY_PREVIOUS                     0x000000000000C837
++          KEY_NEXT                     0x00000000000028D7
+       end codes
+ 
+ end remote
+diff -upr lirc-0.8.3.orig/remotes/silitek/lircd.conf.silitek lirc-0.8.3/remotes/silitek/lircd.conf.silitek
+--- lirc-0.8.3.orig/remotes/silitek/lircd.conf.silitek	2001-04-24 20:36:10.000000000 +0100
++++ lirc-0.8.3/remotes/silitek/lircd.conf.silitek	2008-08-12 16:14:39.000000000 +0100
+@@ -30,68 +30,68 @@ begin remote
+     MOUSE_SSE                0x0000000000aa0004
+     MOUSE_SE                 0x0000000000aa0003
+     MOUSE_SEE                0x0000000000aa0002
+-    MOUSE_R_BUTTON           0x0000000000aaa0bb
+-    MOUSE_L_BUTTON           0x0000000000aa0abb
++    BTN_RIGHT           0x0000000000aaa0bb
++    BTN_LEFT           0x0000000000aa0abb
+     MOUSE_L+R_BUTTON         0x0000000000aaaabb
+ 
+-    0                        0x0000000000bb4a75
+-    1                        0x0000000000bbc1fe
+-    2                        0x0000000000bbc2fd
+-    3                        0x0000000000bb437c
+-    4                        0x0000000000bbc4fb
+-    5                        0x0000000000bb457a
+-    6                        0x0000000000bb4679
+-    7                        0x0000000000bbc7f8
+-    8                        0x0000000000bbc8f7
+-    9                        0x0000000000bb4976
++    KEY_0                        0x0000000000bb4a75
++    KEY_1                        0x0000000000bbc1fe
++    KEY_2                        0x0000000000bbc2fd
++    KEY_3                        0x0000000000bb437c
++    KEY_4                        0x0000000000bbc4fb
++    KEY_5                        0x0000000000bb457a
++    KEY_6                        0x0000000000bb4679
++    KEY_7                        0x0000000000bbc7f8
++    KEY_8                        0x0000000000bbc8f7
++    KEY_9                        0x0000000000bb4976
+     *                        0x0000000000bbcbf4
+     #                        0x0000000000bb4c73
+-    REW                      0x0000000000bb516e
+-    FWD                      0x0000000000bbd0ef
+-    PAUSE                    0x0000000000bbcef1
+-    PLAY                     0x0000000000bbcdf2
+-    STOP                     0x0000000000bb4f70
+-    VOLUME_UP                0x0000000000bbd3ec
+-    VOLUME_DOWN              0x0000000000bb546b
+-    MUTE                     0x0000000000bb526d
++    KEY_REWIND                      0x0000000000bb516e
++    KEY_FORWARD                      0x0000000000bbd0ef
++    KEY_PAUSE                    0x0000000000bbcef1
++    KEY_PLAY                     0x0000000000bbcdf2
++    KEY_STOP                     0x0000000000bb4f70
++    KEY_VOLUMEUP                0x0000000000bbd3ec
++    KEY_VOLUMEDOWN              0x0000000000bb546b
++    KEY_MUTE                     0x0000000000bb526d
+     DISPLAY                  0x0000000000bbd5ea
+-    CD                       0x0000000000bbdae5
++    KEY_CD                       0x0000000000bbdae5
+     SHOW_WIZ                 0x0000000000bb5b64
+     PG_UP                    0x0000000000bbd6e9
+     PG_DN                    0x0000000000bb5768
+-    BACK                     0x0000000000bb5867
+-    FORWARD                  0x0000000000bbd9e6
+-    WWW                      0x0000000000bbdce3
+-    CLOSE                    0x0000000000bb5d62
++    KEY_BACK                     0x0000000000bb5867
++    KEY_FORWARD                  0x0000000000bbd9e6
++    KEY_WWW                      0x0000000000bbdce3
++    KEY_CLOSE                    0x0000000000bb5d62
+ 
+-    0_UP                     0x0000000000cc4a75
+-    1_UP                     0x0000000000ccc1fe
+-    2_UP                     0x0000000000ccc2fd
+-    3_UP                     0x0000000000cc437c
+-    4_UP                     0x0000000000ccc4fb
+-    5_UP                     0x0000000000cc457a
+-    6_UP                     0x0000000000cc4679
+-    7_UP                     0x0000000000ccc7f8
+-    8_UP                     0x0000000000ccc8f7
+-    9_UP                     0x0000000000cc4976
++    KEY_0                     0x0000000000cc4a75
++    KEY_1                     0x0000000000ccc1fe
++    KEY_2                     0x0000000000ccc2fd
++    KEY_3                     0x0000000000cc437c
++    KEY_4                     0x0000000000ccc4fb
++    KEY_5                     0x0000000000cc457a
++    KEY_6                     0x0000000000cc4679
++    KEY_7                     0x0000000000ccc7f8
++    KEY_8                     0x0000000000ccc8f7
++    KEY_9                     0x0000000000cc4976
+     *_UP                     0x0000000000cccbf4
+     #_UP                     0x0000000000cc4c73
+-    REW_UP                   0x0000000000cc516e
+-    FWD_UP                   0x0000000000ccd0ef
+-    PAUSE_UP                 0x0000000000cccef1
+-    PLAY_UP                  0x0000000000cccdf2
+-    STOP_UP                  0x0000000000cc4f70
+-    VOLUME_UP_UP             0x0000000000ccd3ec
+-    VOLUME_DOWN_UP           0x0000000000cc546b
+-    MUTE_UP                  0x0000000000cc526d
++    KEY_REWIND                   0x0000000000cc516e
++    KEY_FORWARD                   0x0000000000ccd0ef
++    KEY_PAUSE                 0x0000000000cccef1
++    KEY_PLAY                  0x0000000000cccdf2
++    KEY_STOP                  0x0000000000cc4f70
++    KEY_VOLUMEUP             0x0000000000ccd3ec
++    KEY_VOLUMEDOWN           0x0000000000cc546b
++    KEY_MUTE                  0x0000000000cc526d
+     DISPLAY_UP               0x0000000000ccd5ea
+-    CD_UP                    0x0000000000ccdae5
++    KEY_CD                    0x0000000000ccdae5
+     SHOW_WIZ_UP              0x0000000000cc5b64
+     PG_UP_UP                 0x0000000000ccd6e9
+     PG_DN_UP                 0x0000000000cc5768
+-    BACK_UP                  0x0000000000cc5867
+-    FORWARD_UP               0x0000000000ccd9e6
+-    WWW_UP                   0x0000000000ccdce3
+-    CLOSE_UP                 0x0000000000cc5d62
++    KEY_REWIND                  0x0000000000cc5867
++    KEY_FORWARD               0x0000000000ccd9e6
++    KEY_WWW                   0x0000000000ccdce3
++    KEY_CLOSE                 0x0000000000cc5d62
+   end codes
+ end remote
+diff -upr lirc-0.8.3.orig/remotes/streamzap/lircd.conf.streamzap lirc-0.8.3/remotes/streamzap/lircd.conf.streamzap
+--- lirc-0.8.3.orig/remotes/streamzap/lircd.conf.streamzap	2005-02-12 14:20:23.000000000 +0000
++++ lirc-0.8.3/remotes/streamzap/lircd.conf.streamzap	2008-08-12 16:14:40.000000000 +0100
+@@ -27,41 +27,41 @@ begin remote
+ 
+ 
+       begin codes
+-          0                        0x00
+-          1                        0x01
+-          2                        0x02
+-          3                        0x03
+-          4                        0x04
+-          5                        0x05
+-          6                        0x06
+-          7                        0x07
+-          8                        0x08
+-          9                        0x09
+-          POWER                    0x0A
+-          MUTE                     0x0B
+-          CH_UP                    0x0C
+-          VOL_UP                   0x0D
+-          CH_DOWN                  0x0E
+-          VOL_DOWN                 0x0F
+-          UP                       0x10
+-          LEFT                     0x11
+-          OK                       0x12
+-          RIGHT                    0x13
+-          DOWN                     0x14
+-          MENU                     0x15
+-          EXIT                     0x16
+-          PLAY                     0x17
+-          PAUSE                    0x18
+-          STOP                     0x19
++          KEY_0                        0x00
++          KEY_1                        0x01
++          KEY_2                        0x02
++          KEY_3                        0x03
++          KEY_4                        0x04
++          KEY_5                        0x05
++          KEY_6                        0x06
++          KEY_7                        0x07
++          KEY_8                        0x08
++          KEY_9                        0x09
++          KEY_POWER                    0x0A
++          KEY_MUTE                     0x0B
++          KEY_CHANNELUP                    0x0C
++          KEY_VOLUMEUP                   0x0D
++          KEY_CHANNELDOWN                  0x0E
++          KEY_VOLUMEDOWN                 0x0F
++          KEY_UP                       0x10
++          KEY_LEFT                     0x11
++          KEY_OK                       0x12
++          KEY_RIGHT                    0x13
++          KEY_DOWN                     0x14
++          KEY_MENU                     0x15
++          KEY_EXIT                     0x16
++          KEY_PLAY                     0x17
++          KEY_PAUSE                    0x18
++          KEY_STOP                     0x19
+           |<<                      0x1A
+           >>|                      0x1B
+-          RECORD                   0x1C
+-          <<                       0x1D
+-          >>                       0x1E
+-          RED                      0x20
+-          GREEN                    0x21
+-          YELLOW                   0x22
+-          BLUE                     0x23
++          KEY_RECORD                   0x1C
++          KEY_REWIND                       0x1D
++          KEY_FORWARD                       0x1E
++          KEY_RED                      0x20
++          KEY_GREEN                    0x21
++          KEY_YELLOW                   0x22
++          KEY_BLUE                     0x23
+       end codes
+ 
+ end remote
+diff -upr lirc-0.8.3.orig/remotes/technisat/lircd.conf.mediafocusI lirc-0.8.3/remotes/technisat/lircd.conf.mediafocusI
+--- lirc-0.8.3.orig/remotes/technisat/lircd.conf.mediafocusI	2001-02-04 13:38:09.000000000 +0000
++++ lirc-0.8.3/remotes/technisat/lircd.conf.mediafocusI	2008-08-12 16:14:39.000000000 +0100
+@@ -30,11 +30,11 @@ begin remote
+   duty_cycle   33
+ 
+       begin codes
+-          MUTE                     0x0000000000000046
+-          VOL+                     0x000000000000006E
+-          VOL-                     0x000000000000006F
+-          CH+                      0x0000000000000047
+-          CH-                      0x0000000000000048
++          KEY_MUTE                     0x0000000000000046
++          KEY_VOLUMEUP                     0x000000000000006E
++          KEY_VOLUMEDOWN                     0x000000000000006F
++          KEY_CHANNELUP                      0x0000000000000047
++          KEY_CHANNELDOWN                      0x0000000000000048
+       end codes
+ 
+ end remote
+diff -upr lirc-0.8.3.orig/remotes/tekram/lircd.conf.m230 lirc-0.8.3/remotes/tekram/lircd.conf.m230
+--- lirc-0.8.3.orig/remotes/tekram/lircd.conf.m230	2002-03-28 21:26:54.000000000 +0000
++++ lirc-0.8.3/remotes/tekram/lircd.conf.m230	2008-08-12 16:14:39.000000000 +0100
+@@ -13,36 +13,36 @@ begin remote
+   name  M230
+   bits  8
+       begin codes
+-	0		0x00
+-	1		0x01
+-	2		0x02
+-	3		0x03
+-	4		0x04
+-	5		0x05
+-	6		0x06
+-	7		0x07
+-	8		0x08
+-	9		0x09
++	KEY_0		0x00
++	KEY_1		0x01
++	KEY_2		0x02
++	KEY_3		0x03
++	KEY_4		0x04
++	KEY_5		0x05
++	KEY_6		0x06
++	KEY_7		0x07
++	KEY_8		0x08
++	KEY_9		0x09
+ 	RECALL		0x0A
+-	ENTER		0x17
+-	POWER		0x1C
++	KEY_ENTER		0x17
++	KEY_POWER		0x1C
+ 	SOURCE		0x15
+ 	PC_VID		0x12
+ 	STILL		0x11
+ 	TTX		0x0F
+ 	FAV		0x13
+-	MUTE		0x10
+-	VOL_UP		0x1A
+-	VOL_DN		0x1E
+-	CH_UP		0x1B
+-	CH_DN		0x1F
+-	PLAY		0x0D
+-	STOP		0x0E
+-	REW		0x1D
+-	FFW		0x19
++	KEY_MUTE		0x10
++	KEY_VOLUMEUP		0x1A
++	KEY_VOLUMEDOWN		0x1E
++	KEY_CHANNELUP		0x1B
++	KEY_CHANNELDOWN		0x1F
++	KEY_PLAY		0x0D
++	KEY_STOP		0x0E
++	KEY_REWIND		0x1D
++	KEY_FASTFORWARD		0x19
+ 	ADD_ER		0x16
+ 	FUNC		0x14
+- 	F_PLUS		0x18
+-	F_MINUS		0x0C
++ 	KEY_KPPLUS		0x18
++	KEY_KPMINUS		0x0C
+      end codes
+ end remote
+diff -upr lirc-0.8.3.orig/remotes/vlsystem/lircd.conf.mplay lirc-0.8.3/remotes/vlsystem/lircd.conf.mplay
+--- lirc-0.8.3.orig/remotes/vlsystem/lircd.conf.mplay	2007-12-22 12:33:17.000000000 +0000
++++ lirc-0.8.3/remotes/vlsystem/lircd.conf.mplay	2008-08-12 16:14:40.000000000 +0100
+@@ -27,42 +27,42 @@ begin remote
+           Movies                   0x40
+           Television               0x46
+           Photos                   0x45
+-          Music                    0x56
+-          1                        0x4d
+-          2                        0x4e
+-          3                        0x4f
+-          4                        0x50
+-          5                        0x51
+-          6                        0x52
+-          7                        0x53
+-          8                        0x03
+-          9                        0x07
+-          0                        0x4c
+-          Vol+                     0x0a
+-          Vol-                     0x0e
++          KEY_AUDIO                    0x56
++          KEY_1                        0x4d
++          KEY_2                        0x4e
++          KEY_3                        0x4f
++          KEY_4                        0x50
++          KEY_5                        0x51
++          KEY_6                        0x52
++          KEY_7                        0x53
++          KEY_8                        0x03
++          KEY_9                        0x07
++          KEY_0                        0x4c
++          KEY_VOLUMEUP                     0x0a
++          KEY_VOLUMEDOWN                     0x0e
+           Ch+_Lang                 0x12
+           Ch-_Page                 0x16
+           Guide                    0x0f
+-          Back                     0x0b
+-          Tv                       0x13
+-          Ok                       0x42
+-          Up                       0x19
+-          Left                     0x54
+-          Right                    0x43
+-          Down                     0x1d
++          KEY_BACK                     0x0b
++                                 0x13
++          KEY_OK                       0x42
++          KEY_UP                       0x19
++          KEY_LEFT                     0x54
++          KEY_RIGHT                    0x43
++          KEY_DOWN                     0x1d
+           Exit_Click               0x1f
+           Task_Quick               0x17
+           Run_DClick               0x1b
+-          Rew                      0x0d
+-          Play                     0x09
+-          Ffwd                     0x15
+-          Prev                     0x1a
+-          Stop                     0x01
+-          Next                     0x1e
+-          Pause                    0x05
+-          Mute                     0x4a
++          KEY_REWIND                      0x0d
++          KEY_PLAY                     0x09
++                               0x15
++          KEY_PREVIOUS                     0x1a
++          KEY_STOP                     0x01
++          KEY_NEXT                     0x1e
++          KEY_PAUSE                    0x05
++          KEY_MUTE                     0x4a
+           Warp_Mouse               0x47
+-          Rec                      0x11
++          KEY_RECORD                      0x11
+           DVD_Zoom                 0x14
+           Detail                   0x4b
+       end codes
+diff -upr lirc-0.8.3.orig/remotes/x10/lircd.conf.mouseremote lirc-0.8.3/remotes/x10/lircd.conf.mouseremote
+--- lirc-0.8.3.orig/remotes/x10/lircd.conf.mouseremote	2005-01-22 10:40:43.000000000 +0000
++++ lirc-0.8.3/remotes/x10/lircd.conf.mouseremote	2008-08-12 16:14:40.000000000 +0100
+@@ -24,42 +24,42 @@ begin remote
+   gap		140000
+ 
+       begin codes
+-        POWER			0x000000000000000F
+-	PC			0x000000000000002B
++        KEY_POWER			0x000000000000000F
++	KEY_PC			0x000000000000002B
+ 	LAST			0x000000000000004F
+-	CHANUP			0x0000000000000002
+-	CHANDOWN		0x0000000000000003
+-	VOLUP			0x0000000000000006
+-	VOLDOWN			0x0000000000000007
+-	MUTE			0x0000000000000005
+-	1			0x0000000000000041
+-	2			0x0000000000000042
+-	3			0x0000000000000043
+-	4			0x0000000000000044
+-	5			0x0000000000000045
+-	6			0x0000000000000046
+-	7			0x0000000000000047
+-	8			0x0000000000000048
+-	9			0x0000000000000049
+-	0			0x0000000000000040
+-	ENTER			0x000000000000004a
++	KEY_CHANNELUP			0x0000000000000002
++	KEY_CHANNELDOWN		0x0000000000000003
++	KEY_VOLUMEUP			0x0000000000000006
++	KEY_VOLUMEDOWN			0x0000000000000007
++	KEY_MUTE			0x0000000000000005
++	KEY_1			0x0000000000000041
++	KEY_2			0x0000000000000042
++	KEY_3			0x0000000000000043
++	KEY_4			0x0000000000000044
++	KEY_5			0x0000000000000045
++	KEY_6			0x0000000000000046
++	KEY_7			0x0000000000000047
++	KEY_8			0x0000000000000048
++	KEY_9			0x0000000000000049
++	KEY_0			0x0000000000000040
++	KEY_ENTER			0x000000000000004a
+ 	ADOTB			0x000000000000005D
+-	REWIND			0x000000000000001C
+-	PLAY			0x000000000000000D
+-	FFWD			0x000000000000001D
+-	STOP			0x000000000000000E
+-	PAUSE			0x000000000000004E
+-	RECORD			0x00000000000000FF
+-	ENTER			0x000000000000004A
++	KEY_REWIND			0x000000000000001C
++	KEY_PLAY			0x000000000000000D
++	KEY_FASTFORWARD			0x000000000000001D
++	KEY_STOP			0x000000000000000E
++	KEY_PAUSE			0x000000000000004E
++	KEY_RECORD			0x00000000000000FF
++	KEY_ENTER			0x000000000000004A
+ 	LAST			0x000000000000004F
+ 	DISP			0x000000000000005C
+ 	SHIFT			0x000000000000006B
+ 	GUIDE			0x000000000000006D
+-	SELECT			0x0000000000000093
+-	PHONE			0x000000000000004B
+-	WEB			0x000000000000008B
+-	CD			0x00000000000000AB
+-	DVD			0x00000000000000CB
++	KEY_SELECT			0x0000000000000093
++	KEY_PHONE			0x000000000000004B
++	KEY_WWW			0x000000000000008B
++	KEY_CD			0x00000000000000AB
++	KEY_DVD			0x00000000000000CB
+ 	MOUSE_SLOW_N		0x0000000000000110
+ 	MOUSE_SLOW_NNE		0x0000000000000131
+ 	MOUSE_SLOW_NE		0x0000000000000111
+@@ -110,7 +110,7 @@ begin remote
+ 	MOUSE_FAST_NNW		0x0000000000000539
+ 	BUTTONR_DOWN		0x0000000000000801
+ 	BUTTONL_DOWN		0x0000000000000804
+-	BUTTON_UP		0x0000000000000800
++	KEY_UP		0x0000000000000800
+ 	end codes	
+ 
+ end remote
+diff -upr lirc-0.8.3.orig/remotes/x10/lircd.conf.mp3anywhere lirc-0.8.3/remotes/x10/lircd.conf.mp3anywhere
+--- lirc-0.8.3.orig/remotes/x10/lircd.conf.mp3anywhere	2007-07-01 08:09:11.000000000 +0100
++++ lirc-0.8.3/remotes/x10/lircd.conf.mp3anywhere	2008-08-12 16:14:40.000000000 +0100
+@@ -22,43 +22,43 @@ begin remote
+   gap		140000
+ 
+       begin codes
+-        POWER			0x00000000000000F0
+-	PC			0x00000000000000D4
++        KEY_POWER			0x00000000000000F0
++	KEY_PC			0x00000000000000D4
+ 	LAST			0x00000000000000F2
+-	CHANUP			0x0000000000000040
+-	CHANDOWN		0x00000000000000C0
+-	VOLUP			0x0000000000000060
+-	VOLDOWN			0x00000000000000E0
+-	MUTE			0x00000000000000A0
+-	ONE			0x0000000000000082
+-	TWO			0x0000000000000042
+-	THREE			0x00000000000000C2
+-	FOUR			0x0000000000000022
+-	FIVE			0x00000000000000A2
+-	SIX			0x0000000000000062
+-	SEVEN			0x00000000000000E2
+-	EIGHT			0x0000000000000012
+-	NINE			0x0000000000000092
+-	ZERO			0x0000000000000002
+-	ENTER			0x0000000000000052
++	KEY_CHANNELUP			0x0000000000000040
++	KEY_CHANNELDOWN		0x00000000000000C0
++	KEY_VOLUMEUP			0x0000000000000060
++	KEY_VOLUMEDOWN			0x00000000000000E0
++	KEY_MUTE			0x00000000000000A0
++	KEY_1			0x0000000000000082
++	KEY_2			0x0000000000000042
++	KEY_3			0x00000000000000C2
++	KEY_4			0x0000000000000022
++	KEY_5			0x00000000000000A2
++	KEY_6			0x0000000000000062
++	KEY_7			0x00000000000000E2
++	KEY_8			0x0000000000000012
++	KEY_9			0x0000000000000092
++	KEY_0			0x0000000000000002
++	KEY_ENTER			0x0000000000000052
+ 	ADOTB			0x00000000000000BA
+-	A			0x000000000000003A
+-	B			0x00000000000000D8
+-	C			0x00000000000000D6
+-	D			0x00000000000000D4
+-	MENU			0x00000000000000B6
+-	EXIT			0x00000000000000C9
+-	UP			0x00000000000000D5
+-	DOWN			0x00000000000000D3
+-	LEFT			0x00000000000000D2
+-	RIGHT			0x00000000000000D1
+-	OK			0x0000000000000052
+-	REWIND			0x0000000000000038
+-	PLAY			0x00000000000000B0
+-	FFWD			0x00000000000000B8
+-	RECORD			0x00000000000000FF
+-	STOP			0x0000000000000070
+-	PAUSE			0x0000000000000072
++	KEY_A			0x000000000000003A
++	KEY_B			0x00000000000000D8
++	KEY_C			0x00000000000000D6
++	KEY_D			0x00000000000000D4
++	KEY_MENU			0x00000000000000B6
++	KEY_EXIT			0x00000000000000C9
++	KEY_UP			0x00000000000000D5
++	KEY_DOWN			0x00000000000000D3
++	KEY_LEFT			0x00000000000000D2
++	KEY_RIGHT			0x00000000000000D1
++	KEY_OK			0x0000000000000052
++	KEY_REWIND			0x0000000000000038
++	KEY_PLAY			0x00000000000000B0
++	KEY_FASTFORWARD			0x00000000000000B8
++	KEY_RECORD			0x00000000000000FF
++	KEY_STOP			0x0000000000000070
++	KEY_PAUSE			0x0000000000000072
+       end codes	
+ 
+ end remote
diff --git a/lirc.spec b/lirc.spec
index 3802885..a912787 100644
--- a/lirc.spec
+++ b/lirc.spec
@@ -118,7 +118,6 @@ of remote control configuration files.
 %patch0 -p1 -b .incl
 %patch1 -p1 -b .xbuf
 %patch2 -p1 -b .suf
-%patch3 -p1 -b .keycode
 
 chmod 644 contrib/*
 
@@ -150,6 +149,8 @@ sed -i -e 's/vga.h/SVGALIB_DISABLED/g' configure*
 
 touch -r aclocal.m4 configure.ac # avoid autofoo re-run
 
+# Do this after, as we're touching the remote definitions earlier
+%patch3 -p1 -b .keycode
 
 %build
 %configure \

From 7208a572af974e8811f8b527e969e2a583bfcc5b Mon Sep 17 00:00:00 2001
From: Bastien Nocera <hadess@fedoraproject.org>
Date: Thu, 14 Aug 2008 15:41:38 +0000
Subject: [PATCH 042/204] - Make lircd not exit when there's no device
 available, so that the daemon     is running as expected when the hardware is
 plugged back in (#440231)

---
 lirc-dont-exit.patch | 20 ++++++++++++++++++++
 lirc.spec            | 11 ++++++++++-
 2 files changed, 30 insertions(+), 1 deletion(-)
 create mode 100644 lirc-dont-exit.patch

diff --git a/lirc-dont-exit.patch b/lirc-dont-exit.patch
new file mode 100644
index 0000000..2e71411
--- /dev/null
+++ b/lirc-dont-exit.patch
@@ -0,0 +1,20 @@
+Index: daemons/lircd.c
+===================================================================
+RCS file: /cvsroot/lirc/lirc/daemons/lircd.c,v
+retrieving revision 5.77
+diff -u -p -u -p -r5.77 lircd.c
+--- daemons/lircd.c	9 May 2008 18:40:59 -0000	5.77
++++ daemons/lircd.c	14 Aug 2008 08:56:50 -0000
+@@ -518,7 +518,11 @@ void add_client(int sock)
+ 				shutdown(clis[0],2);
+ 				close(clis[0]);
+ 				clin=0;
+-				dosigterm(SIGTERM);
++				/* Don't exit here, otherwise lirc bails out,
++				 * and lircd exits, making it impossible to
++				 * connect to when we have a device actually
++				 * plugged in.
++				dosigterm(SIGTERM); */
+ 			}
+ 		}
+ 	}
diff --git a/lirc.spec b/lirc.spec
index a912787..8544e6e 100644
--- a/lirc.spec
+++ b/lirc.spec
@@ -18,7 +18,7 @@
 
 Name:           lirc
 Version:        0.8.3
-Release:        5%{?pre:.%{pre}}%{?dist}
+Release:        6%{?pre:.%{pre}}%{?dist}
 Summary:        The Linux Infrared Remote Control package
 
 Group:          System Environment/Daemons
@@ -34,6 +34,9 @@ Patch2:         lirc-use-new-instead-of-conf-as-filename-suffix.patch
 # https://bugzilla.redhat.com/show_bug.cgi?id=457273
 # http://thread.gmane.org/gmane.comp.hardware.lirc/6884
 Patch3:		lirc-0.8.3-fix-remote-keycodes.patch
+# https://bugzilla.redhat.com/show_bug.cgi?id=440231
+# http://thread.gmane.org/gmane.comp.hardware.lirc/6889
+Patch4:		lirc-dont-exit.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  %{__perl}
@@ -118,6 +121,7 @@ of remote control configuration files.
 %patch0 -p1 -b .incl
 %patch1 -p1 -b .xbuf
 %patch2 -p1 -b .suf
+%patch4 -p0 -b .exit
 
 chmod 644 contrib/*
 
@@ -262,6 +266,11 @@ fi
 
 
 %changelog
+* Thu Aug 14 2008 - Bastien Nocera <bnocera@redhat.com> - 0.8.3-6
+- Make lircd not exit when there's no device available, so that the
+  daemon is running as expected when the hardware is plugged back in
+  (#440231)
+
 * Thu Aug 14 2008 - Bastien Nocera <bnocera@redhat.com> - 0.8.3-5
 - Add huge patch to fix the majority of remotes to have sensible keycodes,
   so they work out-of-the-box (#457273)

From 382ec19477c609228fa2d22dd43245ac9a62101c Mon Sep 17 00:00:00 2001
From: Bastien Nocera <hadess@fedoraproject.org>
Date: Fri, 22 Aug 2008 23:30:44 +0000
Subject: [PATCH 043/204] Update patch to match upstream

---
 lirc-dont-exit.patch | 32 ++++++++++++++++----------------
 1 file changed, 16 insertions(+), 16 deletions(-)

diff --git a/lirc-dont-exit.patch b/lirc-dont-exit.patch
index 2e71411..9485dba 100644
--- a/lirc-dont-exit.patch
+++ b/lirc-dont-exit.patch
@@ -1,20 +1,20 @@
-Index: daemons/lircd.c
-===================================================================
-RCS file: /cvsroot/lirc/lirc/daemons/lircd.c,v
-retrieving revision 5.77
-diff -u -p -u -p -r5.77 lircd.c
---- daemons/lircd.c	9 May 2008 18:40:59 -0000	5.77
-+++ daemons/lircd.c	14 Aug 2008 08:56:50 -0000
-@@ -518,7 +518,11 @@ void add_client(int sock)
- 				shutdown(clis[0],2);
- 				close(clis[0]);
- 				clin=0;
+--- daemons/lircd.c	2008/05/09 18:40:59	5.77
++++ daemons/lircd.c	2008/08/21 18:39:25	5.78
+@@ -515,10 +515,13 @@
+ 		{
+ 			if(!hw.init_func())
+ 			{
+-				shutdown(clis[0],2);
+-				close(clis[0]);
+-				clin=0;
 -				dosigterm(SIGTERM);
-+				/* Don't exit here, otherwise lirc bails out,
-+				 * and lircd exits, making it impossible to
-+				 * connect to when we have a device actually
-+				 * plugged in.
-+				dosigterm(SIGTERM); */
++				logprintf(LOG_WARNING,
++					  "Failed to initialize hardware");
++				/* Don't exit here, otherwise lirc
++				 * bails out, and lircd exits, making
++				 * it impossible to connect to when we
++				 * have a device actually plugged
++				 * in. */
  			}
  		}
  	}

From 46db3b83c3ddb6e84ba44fce1eac1b865f0e36fb Mon Sep 17 00:00:00 2001
From: Jarod Wilson <jwilson@fedoraproject.org>
Date: Tue, 16 Sep 2008 13:36:23 +0000
Subject: [PATCH 044/204] - Fix multilib upgrade path from F8 (Nicolas Chauvet,
 #462435)

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

diff --git a/lirc.spec b/lirc.spec
index 8544e6e..56c25ca 100644
--- a/lirc.spec
+++ b/lirc.spec
@@ -18,7 +18,7 @@
 
 Name:           lirc
 Version:        0.8.3
-Release:        6%{?pre:.%{pre}}%{?dist}
+Release:        7%{?pre:.%{pre}}%{?dist}
 Summary:        The Linux Infrared Remote Control package
 
 Group:          System Environment/Daemons
@@ -69,6 +69,8 @@ computer with a remote control.
 %package        libs
 Summary:        LIRC libraries
 Group:          System Environment/Libraries
+# Fix old F8 multilib upgrade path issue
+Obsoletes:      %{name} < 0.8.3
 
 %description    libs
 LIRC is a package that allows you to decode and send infra-red and
@@ -266,6 +268,9 @@ fi
 
 
 %changelog
+* Tue Sep 16 2008 - Jarod Wilson <jarod@redhat.com> - 0.8.3-7
+- Fix multilib upgrade path from F8 (Nicolas Chauvet, #462435)
+
 * Thu Aug 14 2008 - Bastien Nocera <bnocera@redhat.com> - 0.8.3-6
 - Make lircd not exit when there's no device available, so that the
   daemon is running as expected when the hardware is plugged back in

From 17c5bcd5c9e46c8d4d1dd1b3b739a21e22dbaf91 Mon Sep 17 00:00:00 2001
From: Jarod Wilson <jwilson@fedoraproject.org>
Date: Wed, 24 Sep 2008 22:15:49 +0000
Subject: [PATCH 045/204] - Update to 0.8.4pre1 - Drop upstream patches - Adds
 support for the CommandIR II userspace driver

---
 .cvsignore                                    |   1 +
 hw_commandir.h                                | 175 +++++
 lirc-0.8.3-remote-includes-directive.patch    | 341 ----------
 lirc-0.8.3-validate-transmit-buffer.patch     |  58 --
 ...rc-0.8.4-standardize-remote-keycodes.patch | 637 +++++++-----------
 ...w-instead-of-conf-as-filename-suffix.patch |  22 +-
 lirc.spec                                     |  34 +-
 sources                                       |   2 +-
 8 files changed, 457 insertions(+), 813 deletions(-)
 create mode 100644 hw_commandir.h
 delete mode 100644 lirc-0.8.3-remote-includes-directive.patch
 delete mode 100644 lirc-0.8.3-validate-transmit-buffer.patch
 rename lirc-0.8.3-fix-remote-keycodes.patch => lirc-0.8.4-standardize-remote-keycodes.patch (88%)

diff --git a/.cvsignore b/.cvsignore
index b567347..ea39d26 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1 +1,2 @@
 lirc-0.8.3.tar.bz2
+lirc-0.8.4pre1.tar.bz2
diff --git a/hw_commandir.h b/hw_commandir.h
new file mode 100644
index 0000000..2280f6c
--- /dev/null
+++ b/hw_commandir.h
@@ -0,0 +1,175 @@
+ 
+/****************************************************************************
+ ** hw_commandir.h **********************************************************
+ ****************************************************************************
+ * 
+ * Copyright (C) 1999 Christoph Bartelmus <lirc@bartelmus.de>
+ * -- Original hw_default.h
+ * Modified for CommandIR Transceivers, April-June 2008, Matthew Bodkin 
+ *
+ */
+
+#ifndef HW_COMMANDIR_H
+#define HW_COMMANDIR_H
+
+#define RX_BUFFER_SIZE 1024
+#define TX_BUFFER_SIZE 1024
+#define TX_QUEUE 1
+#define RX_QUEUE 0
+#define MAX_COMMANDIRS 4
+#define MAX_COMMAND 8192
+
+/* transmitter channel control */
+#define MAX_DEVICES		4
+#define MAX_CHANNELS    16
+#define DEVICE_CHANNELS	4
+#define MAX_MASK 		0xffff
+#define MAX_SIGNALQ		100
+
+/* CommandIR control codes */
+#define CHANNEL_EN_MASK	1
+#define FREQ_HEADER     2
+#define MCU_CTRL_SIZE   3
+#define TX_HEADER       7
+#define TX_HEADER_NEW	8
+/* New for CommandIR II  */
+
+#define READ_INPUTS		10
+#define PROC_SET		11
+#define INIT_FUNCTION	12
+#define RX_SELECT		13
+#define TX_COMMANDIR_II 14
+/* Internal to driver */
+#define TX_LIRC_T	    15
+#define FREQ_HEADER_LIRC 16
+#define RXDECODE_HEADER_LIRC 17
+#define INIT_HEADER_LIRC 18
+#define DEINIT_HEADER_LIRC 19
+#define GET_VERSION 	20
+
+#define COMMANDIR_2_PULSE_MASK 0x8000
+#define COMMANDIR_2_OVERFLOW_MASK 0x4000
+
+#define DEFAULT_PULSE_WIDTH 13
+
+#define USB_CMDIR_VENDOR_ID		0x10c4
+#define USB_CMDIR_PRODUCT_ID	0x0003
+#define USB_CMDIR_MINOR_BASE	192
+
+#define HW_COMMANDIR_MINI 	1
+#define HW_COMMANDIR_2		2
+#define HW_COMMANDIR_UNKNOWN 127
+
+#define MAX_HW_MINI_PACKET 64
+
+// CommandIR has lots of buffer room, we don't need to poll constantly
+#define USB_TIMEOUT_MS 5000
+#define USB_TIMEOUT_US 1000
+#define WAIT_BETWEEN_READS_US 10000
+#define MAX_WAIT_BETWEEN_READS_US 5000000
+#define MIN_WAIT_BETWEEN_READS_US 5000
+
+#define USB_MAX_BUSES	8
+#define USB_MAX_BUSDEV	127
+
+#define RX_HEADER_DATA 		0x01
+#define RX_HEADER_EVENTS 	0x02
+#define RX_HEADER_TXAVAIL 	0x03
+
+
+// We keep CommandIR's OPEN even on -deinit for speed and to monitor 
+// Other non-LIRC events (plugin, suspend, etc)
+#define USB_KEEP_WARM 1
+
+// CommandIR lircd.conf event driven code definitions
+#define LIRCCODE_GAP  125000
+#define JACK_PLUG_1		0x01
+#define JACK_PLUG_2		0x02
+#define JACK_PLUG_3		0x03
+#define JACK_PLUG_4		0x04
+#define JACK_PLUG_5		0x11
+#define JACK_PLUG_6		0x12
+#define JACK_PLUG_7		0x13
+#define JACK_PLUG_8		0x14
+#define JACK_PLUG_9		0x21
+#define JACK_PLUG_10	0x22
+#define JACK_PLUG_11	0x23
+#define JACK_PLUG_12	0x24
+#define JACK_PLUG_13	0x31
+#define JACK_PLUG_14	0x32
+#define JACK_PLUG_15	0x33
+#define JACK_PLUG_16	0x34
+
+#define JACK_UNPLUG_1	0x05
+#define JACK_UNPLUG_2	0x06
+#define JACK_UNPLUG_3	0x07
+#define JACK_UNPLUG_4	0x08
+#define JACK_UNPLUG_5	0x15
+#define JACK_UNPLUG_6	0x16
+#define JACK_UNPLUG_7	0x17
+#define JACK_UNPLUG_8	0x18
+#define JACK_UNPLUG_9	0x25
+#define JACK_UNPLUG_10	0x26
+#define JACK_UNPLUG_11	0x27
+#define JACK_UNPLUG_12	0x28
+#define JACK_UNPLUG_13	0x35
+#define JACK_UNPLUG_14	0x36
+#define JACK_UNPLUG_15	0x37
+#define JACK_UNPLUG_16	0x38
+
+#define SELECT_TX_INTERNAL	0x09
+#define SELECT_TX_ExTERNAL	0x0A
+
+#define SELECT_TX_ON_1		0x0D
+#define SELECT_TX_ON_2		0x1D
+#define SELECT_TX_ON_3		0x2D
+#define SELECT_TX_ON_4		0x3D
+
+#define JACK_PLUG_RX_1		0x0B
+#define JACK_UNPLUG_RX_1	0x0C
+#define JACK_PLUG_RX_2		0x1B
+#define JACK_UNPLUG_RX_2	0x1C
+#define JACK_PLUG_RX_3		0x2B
+#define JACK_UNPLUG_RX_3	0x2C
+#define JACK_PLUG_RX_4		0x3B
+#define JACK_UNPLUG_RX_4	0x3C
+
+#define COMMANDIR_PLUG_1	0x41
+#define COMMANDIR_PLUG_2	0x42
+#define COMMANDIR_PLUG_3	0x43
+#define COMMANDIR_PLUG_4	0x44
+
+#define COMMANDIR_UNPLUG_1	0x45
+#define COMMANDIR_UNPLUG_2	0x46
+#define COMMANDIR_UNPLUG_3	0x47
+#define COMMANDIR_UNPLUG_4	0x48
+
+#define COMMANDIR_REORDERED	0x50
+#define COMMANDIR_READY		0x51
+#define COMMANDIR_STOPPED	0x52
+#define COMMANDIR_POLL_FASTER	0x53
+#define COMMANDIR_POLL_SLOWER	0x54
+
+#define SETTRANSMITTERS_1	0xf0
+#define SETTRANSMITTERS_2	0xf1
+#define SETTRANSMITTERS_3	0xf2
+#define SETTRANSMITTERS_4	0xf3
+#define SETTRANSMITTERS_5	0xf4
+#define SETTRANSMITTERS_6	0xf5
+#define SETTRANSMITTERS_7	0xf6
+#define SETTRANSMITTERS_8	0xf7
+#define SETTRANSMITTERS_9	0xf8
+#define SETTRANSMITTERS_10	0xf9
+#define SETTRANSMITTERS_11	0xfa
+#define SETTRANSMITTERS_12	0xfb
+#define SETTRANSMITTERS_13	0xfc
+#define SETTRANSMITTERS_14	0xfd
+#define SETTRANSMITTERS_15	0xfe
+#define SETTRANSMITTERS_16	0xff
+
+// What's in a returning data packet
+#define COMMANDIR_RX_EVENTS 		0x02
+#define COMMANDIR_RX_DATA			0x01
+
+
+#endif
diff --git a/lirc-0.8.3-remote-includes-directive.patch b/lirc-0.8.3-remote-includes-directive.patch
deleted file mode 100644
index 988ecec..0000000
--- a/lirc-0.8.3-remote-includes-directive.patch
+++ /dev/null
@@ -1,341 +0,0 @@
-diff -Naurp lirc-0.8.3.orig/daemons/config_file.c lirc-0.8.3/daemons/config_file.c
---- lirc-0.8.3.orig/daemons/config_file.c	2007-07-29 14:20:06.000000000 -0400
-+++ lirc-0.8.3/daemons/config_file.c	2008-05-12 18:02:32.000000000 -0400
-@@ -1,4 +1,4 @@
--/*      $Id: config_file.c,v 5.27 2007/07/29 18:20:06 lirc Exp $      */
-+/*      $Id: config_file.c,v 5.28 2008/05/09 18:40:59 lirc Exp $      */
- 
- /****************************************************************************
-  ** config_file.c ***********************************************************
-@@ -20,6 +20,7 @@
- #include <stdio.h>
- #include <stdlib.h>
- #include <string.h>
-+#include <libgen.h>
- #include <sys/socket.h>
- #include <sys/un.h>
- #include <sys/stat.h>
-@@ -32,9 +33,14 @@
- #include "config_file.h"
- 
- #define LINE_LEN 1024
-+#define MAX_INCLUDES 10
- 
--int line;
--int parse_error;
-+const char *whitespace = " \t";
-+
-+static int line;
-+static int parse_error;
-+
-+static struct ir_remote * read_config_recursive(FILE *f, const char *name, int depth);
- 
- void **init_void_array(struct void_array *ar,size_t chunk_size, size_t item_size)
- {
-@@ -643,7 +649,84 @@ struct ir_remote *sort_by_bit_count(stru
- 	return top;
- }
- 
--struct ir_remote * read_config(FILE *f)
-+static const char *lirc_parse_include(char *s)
-+{
-+	char *last;
-+	size_t len;
-+	
-+	len=strlen(s);
-+	if(len<2)
-+	{
-+		return NULL;
-+	}
-+	last = s+len-1;
-+	while(last >  s && strchr(whitespace, *last) != NULL)
-+	{
-+		last--;
-+	}
-+	if(last <= s)
-+	{
-+		return NULL;
-+	}
-+	if(*s!='"' && *s!='<')
-+	{
-+		return NULL;
-+	}
-+	if(*s=='"' && *last!='"')
-+	{
-+		return NULL;
-+	}
-+	else if(*s=='<' && *last!='>')
-+	{
-+		return NULL;
-+	}
-+	*last = 0;
-+	memmove(s, s+1, len-2+1); /* terminating 0 is copied, and
-+				     maybe more, but we don't care */
-+	return s;
-+}
-+
-+static const char *lirc_parse_relative(char *dst, size_t dst_size,
-+				 const char *child, const char *current)
-+{
-+	char *dir;
-+	size_t dirlen;
-+
-+	if (!current)
-+		return child;
-+
-+	/* Not a relative path */
-+	if (*child == '/')
-+		return child;
-+
-+	if(strlen(current) >= dst_size)
-+	{
-+		return NULL;
-+	}
-+	strcpy(dst, current);
-+	dir = dirname(dst);
-+	dirlen = strlen(dir);
-+	if(dir != dst)
-+	{
-+		memmove(dst, dir, dirlen + 1);
-+	}
-+
-+	if(dirlen + 1 + strlen(child) + 1 > dst_size)
-+	{
-+		return NULL;
-+	}
-+	strcat(dst, "/");
-+	strcat(dst, child);
-+	
-+	return dst;
-+}
-+
-+struct ir_remote * read_config(FILE *f, const char *name)
-+{
-+	return read_config_recursive(f, name, 0);
-+}
-+
-+static struct ir_remote * read_config_recursive(FILE *f, const char *name, int depth)
- {
- 	char buf[LINE_LEN+1], *key, *val, *val2;
-         int len,argc;
-@@ -656,6 +739,7 @@ struct ir_remote * read_config(FILE *f)
- 
- 	line=0;
- 	parse_error=0;
-+	LOGPRINTF(2, "parsing '%s'", name);
- 
- 	while(fgets(buf,LINE_LEN,f)!=NULL)
- 	{
-@@ -683,14 +767,74 @@ struct ir_remote * read_config(FILE *f)
-                 if(buf[0]=='#'){
- 			continue;
-                 }
--		key=strtok(buf," \t");
-+		key=strtok(buf, whitespace);
- 		/* ignore empty lines */
- 		if(key==NULL) continue;
--		val=strtok(NULL, " \t");
-+		val=strtok(NULL, whitespace);
- 		if(val!=NULL){
--			val2=strtok(NULL, " \t");
-+			val2=strtok(NULL, whitespace);
- 			LOGPRINTF(3,"\"%s\" \"%s\"",key,val);
--                        if (strcasecmp("begin",key)==0){
-+			if (strcasecmp("include",key)==0){
-+                                FILE* childFile;
-+				const char *childName;
-+				const char *fullPath;
-+				char result[FILENAME_MAX+1];
-+
-+
-+				if (depth > MAX_INCLUDES) {
-+					logprintf(LOG_ERR,"error opening child file defined at %s:%d",name,line);
-+					logprintf(LOG_ERR,"too many files included");
-+					parse_error=-1;
-+					break;
-+				}
-+
-+				childName = lirc_parse_include(val);
-+				if (!childName){
-+					logprintf(LOG_ERR,"error parsing child file value defined at line %d:",line);
-+					logprintf(LOG_ERR,"invalid quoting");
-+					parse_error=-1;
-+					break;
-+				}
-+
-+				fullPath = lirc_parse_relative(result, sizeof(result), childName, name);
-+				if (!fullPath) {
-+					logprintf(LOG_ERR,"error composing relative file path defined at line %d:",line);
-+					logprintf(LOG_ERR,"resulting path too long");
-+					parse_error=-1;
-+					break;
-+				}
-+
-+				childFile = fopen(fullPath, "r");
-+				if (childFile == NULL){
-+					logprintf(LOG_ERR,"error opening child file '%s' defined at line %d:",fullPath, line);
-+					logprintf(LOG_ERR,"ignoring this child file for now.");
-+				}
-+				else{
-+					int save_line = line;
-+					
-+					if (!top_rem){
-+						/* create first remote */
-+						LOGPRINTF(2,"creating first remote");
-+						rem = read_config_recursive(childFile, fullPath, depth + 1);
-+						if(rem != (void *) -1 && rem != NULL) {
-+							top_rem = rem;
-+						} else {
-+							rem = NULL;
-+						}
-+					}else{
-+						/* create new remote */
-+						LOGPRINTF(2,"creating next remote");
-+						rem->next=read_config_recursive(childFile, fullPath, depth + 1);
-+						if(rem->next != (void *) -1 && rem->next != NULL) {
-+							rem=rem->next;
-+						} else {
-+							rem->next = NULL;
-+						}
-+					}
-+					fclose(childFile);
-+					line = save_line;
-+				}
-+			}else if (strcasecmp("begin",key)==0){
- 				if (strcasecmp("codes", val)==0){
-                                         /* init codes mode */
- 					LOGPRINTF(2,"    begin codes");
-@@ -744,7 +888,7 @@ struct ir_remote * read_config(FILE *f)
- 						
- 						if(val2[0]=='#') break; /* comment */
- 						node=defineNode(code, val2);
--						val2=strtok(NULL, " \t");
-+						val2=strtok(NULL, whitespace);
- 					}
- 					code->current=NULL;
- 					add_void_array(&codes_list, code);
-@@ -822,7 +966,7 @@ struct ir_remote * read_config(FILE *f)
- 						
- 						if(val2[0]=='#') break; /* comment */
- 						node=defineNode(code, val2);
--						val2=strtok(NULL, " \t");
-+						val2=strtok(NULL, whitespace);
- 					}
- 					code->current=NULL;
- 					add_void_array(&codes_list, code);
-@@ -842,7 +986,7 @@ struct ir_remote * read_config(FILE *f)
- 				case ID_remote:
- 					argc=defineRemote(key, val, val2, rem);
- 					if(!parse_error && ((argc==1 && val2!=NULL) || 
--					   (argc==2 && val2!=NULL && strtok(NULL," \t")!=NULL)))
-+					   (argc==2 && val2!=NULL && strtok(NULL, whitespace)!=NULL)))
- 					{
- 						logprintf(LOG_WARNING,"garbage after '%s'"
- 							  " token in line %d ignored",
-@@ -857,7 +1001,7 @@ struct ir_remote * read_config(FILE *f)
- 						
- 						if(val2[0]=='#') break; /* comment */
- 						node=defineNode(code, val2);
--						val2=strtok(NULL, " \t");
-+						val2=strtok(NULL, whitespace);
- 					}
- 					code->current=NULL;
- 					add_void_array(&codes_list, code);
-@@ -905,7 +1049,7 @@ struct ir_remote * read_config(FILE *f)
- 								break;
- 							}
- 						}
--						while ((val=strtok(NULL," \t"))){
-+						while ((val=strtok(NULL, whitespace))){
- 							if (!addSignal(&signals, val)) break;
- 						}
- 					}
-@@ -950,7 +1094,15 @@ struct ir_remote * read_config(FILE *f)
- 		}
- 	}
-         if (parse_error){
-+		static int print_error = 1;
-+		
-+		if(print_error) {
-+			logprintf(LOG_ERR, "reading of file '%s' failed",
-+				  name);
-+			print_error = 0;
-+		}
- 		free_config(top_rem);
-+		if(depth == 0) print_error = 1;
-                 return((void *) -1);
-         }
- 	/* kick reverse flag */
-diff -Naurp lirc-0.8.3.orig/daemons/config_file.h lirc-0.8.3/daemons/config_file.h
---- lirc-0.8.3.orig/daemons/config_file.h	2006-01-28 13:36:44.000000000 -0500
-+++ lirc-0.8.3/daemons/config_file.h	2008-05-12 18:02:22.000000000 -0400
-@@ -1,4 +1,4 @@
--/*      $Id: config_file.h,v 5.10 2006/01/28 18:36:44 lirc Exp $      */
-+/*      $Id: config_file.h,v 5.11 2008/05/09 18:40:59 lirc Exp $      */
- 
- /****************************************************************************
-  ** config_file.h ***********************************************************
-@@ -86,7 +86,7 @@ int addSignal(struct void_array *signals
- struct ir_ncode * defineCode(char *key, char *val, struct ir_ncode *code);
- struct ir_code_node *defineNode(struct ir_ncode *code, const char *val);
- int defineRemote(char * key, char * val, char *val2, struct ir_remote *rem);
--struct ir_remote *read_config(FILE *f);
-+struct ir_remote *read_config(FILE *f, const char *name);
- void free_config(struct ir_remote *remotes);
- 
- #endif
-diff -Naurp lirc-0.8.3.orig/daemons/irrecord.c lirc-0.8.3/daemons/irrecord.c
---- lirc-0.8.3.orig/daemons/irrecord.c	2008-02-14 15:42:56.000000000 -0500
-+++ lirc-0.8.3/daemons/irrecord.c	2008-05-12 18:03:51.000000000 -0400
-@@ -1,4 +1,4 @@
--/*      $Id: irrecord.c,v 5.69 2008/02/14 20:42:56 lirc Exp $      */
-+/*      $Id: irrecord.c,v 5.71 2008/05/09 18:40:59 lirc Exp $      */
- 
- /****************************************************************************
-  ** irrecord.c **************************************************************
-@@ -311,7 +311,7 @@ int main(int argc,char **argv)
- 				progname, filename, progname);
- 			exit(EXIT_FAILURE);
- 		}
--		remotes=read_config(fin);
-+		remotes=read_config(fin, filename);
- 		fclose(fin);
- 		if(remotes==(void *) -1 || remotes==NULL)
- 		{
-@@ -748,7 +748,7 @@ int main(int argc,char **argv)
- 		if(hw.deinit_func) hw.deinit_func();
- 		exit(EXIT_FAILURE);
- 	}
--	remotes=read_config(fin);
-+	remotes=read_config(fin,filename);
- 	fclose(fin);
- 	if(remotes==NULL)
- 	{
-diff -Naurp lirc-0.8.3.orig/daemons/lircd.c lirc-0.8.3/daemons/lircd.c
---- lirc-0.8.3.orig/daemons/lircd.c	2008-03-30 10:53:06.000000000 -0400
-+++ lirc-0.8.3/daemons/lircd.c	2008-05-12 18:02:12.000000000 -0400
-@@ -1,4 +1,4 @@
--/*      $Id: lircd.c,v 5.76 2008/03/30 14:53:06 lirc Exp $      */
-+/*      $Id: lircd.c,v 5.77 2008/05/09 18:40:59 lirc Exp $      */
- 
- /****************************************************************************
-  ** lircd.c *****************************************************************
-@@ -406,7 +406,7 @@ void config(void)
- 		logperror(LOG_ERR,NULL);
- 		return;
- 	}
--	config_remotes=read_config(fd);
-+	config_remotes=read_config(fd, configfile);
- 	fclose(fd);
- 	if(config_remotes==(void *) -1)
- 	{
-diff -Naurp lirc-0.8.3.orig/NEWS lirc-0.8.3/NEWS
---- lirc-0.8.3.orig/NEWS	2008-05-12 17:59:40.000000000 -0400
-+++ lirc-0.8.3/NEWS	2008-05-12 18:05:04.000000000 -0400
-@@ -1,3 +1,6 @@
-+0.8.4-CVS: future
-+  * support for include directive in lircd.conf
-+
- 0.8.3: 05/04/08
-   * added support for Samsung USB IR Receiver (Robert Schedel)
-   * added support for Soundgraph iMON IR/LCD (Dean Harding)
diff --git a/lirc-0.8.3-validate-transmit-buffer.patch b/lirc-0.8.3-validate-transmit-buffer.patch
deleted file mode 100644
index 6db6c1d..0000000
--- a/lirc-0.8.3-validate-transmit-buffer.patch
+++ /dev/null
@@ -1,58 +0,0 @@
---- lirc/daemons/transmit.c	2007/07/29 18:20:13	5.27
-+++ lirc/daemons/transmit.c	2008/05/11 13:29:47	5.28
-@@ -1,4 +1,4 @@
--/*      $Id: transmit.c,v 5.27 2007/07/29 18:20:13 lirc Exp $      */
-+/*      $Id: transmit.c,v 5.28 2008/05/11 13:29:47 lirc Exp $      */
- 
- /****************************************************************************
-  ** transmit.c **************************************************************
-@@ -116,6 +116,34 @@
- 	return(0);
- }
- 
-+static int check_send_buffer(void)
-+{
-+	int i;
-+
-+	if (send_buffer.wptr == 0) 
-+	{
-+		LOGPRINTF(1, "nothing to send");
-+		return(0);
-+	}
-+	for (i = 0; i < send_buffer.wptr; i++)
-+	{
-+		if(send_buffer.data[i] == 0)
-+		{
-+			if(i%2)
-+			{
-+				LOGPRINTF(1, "invalid space: %d", i);
-+			}
-+			else
-+			{
-+				LOGPRINTF(1, "invalid pulse: %d", i);
-+			}
-+			return 0;
-+		}
-+	}
-+	
-+	return 1;
-+}
-+
- static inline void flush_send_buffer(void)
- {
- 	if(send_buffer.pendingp>0)
-@@ -500,5 +528,13 @@
- 		goto init_send_loop;
- 	}
- 	LOGPRINTF(3, "transmit buffer ready");
--	return(1);
-+	if(!check_send_buffer())
-+	{
-+		logprintf(LOG_ERR, "invalid send buffer");
-+		logprintf(LOG_ERR,
-+			  "this remote configuration cannot be used "
-+			  "to transmit");
-+		return 0;
-+	}
-+	return 1;
- }
diff --git a/lirc-0.8.3-fix-remote-keycodes.patch b/lirc-0.8.4-standardize-remote-keycodes.patch
similarity index 88%
rename from lirc-0.8.3-fix-remote-keycodes.patch
rename to lirc-0.8.4-standardize-remote-keycodes.patch
index 26024b8..acef796 100644
--- a/lirc-0.8.3-fix-remote-keycodes.patch
+++ b/lirc-0.8.4-standardize-remote-keycodes.patch
@@ -1,6 +1,6 @@
-diff -upr lirc-0.8.3.orig/remotes/adaptec/lircd.conf.AVC-2410 lirc-0.8.3/remotes/adaptec/lircd.conf.AVC-2410
---- lirc-0.8.3.orig/remotes/adaptec/lircd.conf.AVC-2410	2005-03-28 10:25:36.000000000 +0100
-+++ lirc-0.8.3/remotes/adaptec/lircd.conf.AVC-2410	2008-08-12 16:14:40.000000000 +0100
+diff -Naurp lirc-0.8.4pre1.orig/remotes/adaptec/lircd.conf.AVC-2410 lirc-0.8.4pre1/remotes/adaptec/lircd.conf.AVC-2410
+--- lirc-0.8.4pre1.orig/remotes/adaptec/lircd.conf.AVC-2410	2005-03-28 04:25:36.000000000 -0500
++++ lirc-0.8.4pre1/remotes/adaptec/lircd.conf.AVC-2410	2008-09-24 17:06:37.000000000 -0400
 @@ -29,30 +29,30 @@ begin remote
            Live                     0x00000000000025DA
            Timeshift                0x00000000000017E8
@@ -55,9 +55,9 @@ diff -upr lirc-0.8.3.orig/remotes/adaptec/lircd.conf.AVC-2410 lirc-0.8.3/remotes
            OSD                      0x00000000000032CD
            cc                       0x00000000000016E9
        end codes
-diff -upr lirc-0.8.3.orig/remotes/adstech/lircd.conf.usbx-707 lirc-0.8.3/remotes/adstech/lircd.conf.usbx-707
---- lirc-0.8.3.orig/remotes/adstech/lircd.conf.usbx-707	2008-08-12 16:13:39.000000000 +0100
-+++ lirc-0.8.3/remotes/adstech/lircd.conf.usbx-707	2008-08-12 16:14:39.000000000 +0100
+diff -Naurp lirc-0.8.4pre1.orig/remotes/adstech/lircd.conf.usbx-707 lirc-0.8.4pre1/remotes/adstech/lircd.conf.usbx-707
+--- lirc-0.8.4pre1.orig/remotes/adstech/lircd.conf.usbx-707	2008-09-24 17:05:54.000000000 -0400
++++ lirc-0.8.4pre1/remotes/adstech/lircd.conf.usbx-707	2008-09-24 17:06:37.000000000 -0400
 @@ -26,50 +26,50 @@ begin remote
    toggle_bit_mask 0x0
  
@@ -147,9 +147,9 @@ diff -upr lirc-0.8.3.orig/remotes/adstech/lircd.conf.usbx-707 lirc-0.8.3/remotes
        end codes
  
  end remote
-diff -upr lirc-0.8.3.orig/remotes/animax/lircd.conf.animax lirc-0.8.3/remotes/animax/lircd.conf.animax
---- lirc-0.8.3.orig/remotes/animax/lircd.conf.animax	1999-04-29 22:30:59.000000000 +0100
-+++ lirc-0.8.3/remotes/animax/lircd.conf.animax	2008-08-12 16:14:40.000000000 +0100
+diff -Naurp lirc-0.8.4pre1.orig/remotes/animax/lircd.conf.animax lirc-0.8.4pre1/remotes/animax/lircd.conf.animax
+--- lirc-0.8.4pre1.orig/remotes/animax/lircd.conf.animax	1999-04-29 17:30:59.000000000 -0400
++++ lirc-0.8.4pre1/remotes/animax/lircd.conf.animax	2008-09-24 17:06:37.000000000 -0400
 @@ -38,79 +38,79 @@ begin remote
  
        begin codes
@@ -263,31 +263,31 @@ diff -upr lirc-0.8.3.orig/remotes/animax/lircd.conf.animax lirc-0.8.3/remotes/an
        end codes
  
  end remote
-diff -upr lirc-0.8.3.orig/remotes/apple/lircd.conf.macmini lirc-0.8.3/remotes/apple/lircd.conf.macmini
---- lirc-0.8.3.orig/remotes/apple/lircd.conf.macmini	2007-12-13 12:30:38.000000000 +0000
-+++ lirc-0.8.3/remotes/apple/lircd.conf.macmini	2008-08-12 16:14:39.000000000 +0100
-@@ -23,12 +23,12 @@ begin remote
-   gap          211995
+diff -Naurp lirc-0.8.4pre1.orig/remotes/apple/lircd.conf.macmini lirc-0.8.4pre1/remotes/apple/lircd.conf.macmini
+--- lirc-0.8.4pre1.orig/remotes/apple/lircd.conf.macmini	2008-05-31 17:29:12.000000000 -0400
++++ lirc-0.8.4pre1/remotes/apple/lircd.conf.macmini	2008-09-24 17:10:31.000000000 -0400
+@@ -26,12 +26,12 @@ begin remote
+   ignore_mask 0x0000ff01
  
        begin codes
--          1                        0x09
--          2                        0x06
--          3                        0x0A
--          4                        0x0C
--          5                        0x05
--          6                        0x03
-+          KEY_1                        0x09
-+          KEY_2                        0x06
-+          KEY_3                        0x0A
-+          KEY_4                        0x0C
-+          KEY_5                        0x05
-+          KEY_6                        0x03
+-          VOLUP                    0x0B
+-          VOLDOWN                  0x0D
+-          BACKWARD                 0x08
+-          FORWARD                  0x07
+-          PLAY                     0x04
+-          MENU                     0x02
++          KEY_VOLUMEUP		0x0B
++          KEY_VOLUMEDOWN	0x0D
++          KEY_REWIND		0x08
++          KEY_FORWARD		0x07
++          KEY_PLAY		0x04
++          KEY_MENU		0x02
        end codes
  
  end remote
-diff -upr lirc-0.8.3.orig/remotes/asus/lircd.conf.asus lirc-0.8.3/remotes/asus/lircd.conf.asus
---- lirc-0.8.3.orig/remotes/asus/lircd.conf.asus	2007-02-20 04:09:47.000000000 +0000
-+++ lirc-0.8.3/remotes/asus/lircd.conf.asus	2008-08-12 16:14:39.000000000 +0100
+diff -Naurp lirc-0.8.4pre1.orig/remotes/asus/lircd.conf.asus lirc-0.8.4pre1/remotes/asus/lircd.conf.asus
+--- lirc-0.8.4pre1.orig/remotes/asus/lircd.conf.asus	2007-02-19 23:09:47.000000000 -0500
++++ lirc-0.8.4pre1/remotes/asus/lircd.conf.asus	2008-09-24 17:06:37.000000000 -0400
 @@ -19,38 +19,38 @@ begin remote
    toggle_bit	0
  
@@ -355,9 +355,9 @@ diff -upr lirc-0.8.3.orig/remotes/asus/lircd.conf.asus lirc-0.8.3/remotes/asus/l
          end codes
  
  end remote
-diff -upr lirc-0.8.3.orig/remotes/asus/lircd.conf.asusdh lirc-0.8.3/remotes/asus/lircd.conf.asusdh
---- lirc-0.8.3.orig/remotes/asus/lircd.conf.asusdh	2007-07-08 15:01:27.000000000 +0100
-+++ lirc-0.8.3/remotes/asus/lircd.conf.asusdh	2008-08-12 16:14:39.000000000 +0100
+diff -Naurp lirc-0.8.4pre1.orig/remotes/asus/lircd.conf.asusdh lirc-0.8.4pre1/remotes/asus/lircd.conf.asusdh
+--- lirc-0.8.4pre1.orig/remotes/asus/lircd.conf.asusdh	2007-07-08 10:01:27.000000000 -0400
++++ lirc-0.8.4pre1/remotes/asus/lircd.conf.asusdh	2008-09-24 17:06:37.000000000 -0400
 @@ -14,17 +14,17 @@ begin remote
    post_data_bits  0
  
@@ -382,9 +382,9 @@ diff -upr lirc-0.8.3.orig/remotes/asus/lircd.conf.asusdh lirc-0.8.3/remotes/asus
          end codes
  
  end remote
-diff -upr lirc-0.8.3.orig/remotes/asus/lircd.conf.digimatrix lirc-0.8.3/remotes/asus/lircd.conf.digimatrix
---- lirc-0.8.3.orig/remotes/asus/lircd.conf.digimatrix	2005-09-06 18:12:17.000000000 +0100
-+++ lirc-0.8.3/remotes/asus/lircd.conf.digimatrix	2008-08-12 16:14:39.000000000 +0100
+diff -Naurp lirc-0.8.4pre1.orig/remotes/asus/lircd.conf.digimatrix lirc-0.8.4pre1/remotes/asus/lircd.conf.digimatrix
+--- lirc-0.8.4pre1.orig/remotes/asus/lircd.conf.digimatrix	2005-09-06 13:12:17.000000000 -0400
++++ lirc-0.8.4pre1/remotes/asus/lircd.conf.digimatrix	2008-09-24 17:06:37.000000000 -0400
 @@ -28,43 +28,43 @@ begin remote
  
  
@@ -461,9 +461,9 @@ diff -upr lirc-0.8.3.orig/remotes/asus/lircd.conf.digimatrix lirc-0.8.3/remotes/
            dvd_audio                0x00000000000050AF
            ui_size                  0x0000000000008877
            ui_on_off                0x00000000000028D7
-diff -upr lirc-0.8.3.orig/remotes/atiusb/lircd.conf.atilibusb lirc-0.8.3/remotes/atiusb/lircd.conf.atilibusb
---- lirc-0.8.3.orig/remotes/atiusb/lircd.conf.atilibusb	2007-09-14 20:45:18.000000000 +0100
-+++ lirc-0.8.3/remotes/atiusb/lircd.conf.atilibusb	2008-08-12 16:14:39.000000000 +0100
+diff -Naurp lirc-0.8.4pre1.orig/remotes/atiusb/lircd.conf.atilibusb lirc-0.8.4pre1/remotes/atiusb/lircd.conf.atilibusb
+--- lirc-0.8.4pre1.orig/remotes/atiusb/lircd.conf.atilibusb	2008-06-17 02:47:55.000000000 -0400
++++ lirc-0.8.4pre1/remotes/atiusb/lircd.conf.atilibusb	2008-09-24 17:06:37.000000000 -0400
 @@ -30,58 +30,58 @@ begin remote
  
  
@@ -564,9 +564,9 @@ diff -upr lirc-0.8.3.orig/remotes/atiusb/lircd.conf.atilibusb lirc-0.8.3/remotes
        end codes
  
  end remote
-diff -upr lirc-0.8.3.orig/remotes/atiusb/lircd.conf.atiusb lirc-0.8.3/remotes/atiusb/lircd.conf.atiusb
---- lirc-0.8.3.orig/remotes/atiusb/lircd.conf.atiusb	2008-08-12 16:13:39.000000000 +0100
-+++ lirc-0.8.3/remotes/atiusb/lircd.conf.atiusb	2008-08-12 16:14:39.000000000 +0100
+diff -Naurp lirc-0.8.4pre1.orig/remotes/atiusb/lircd.conf.atiusb lirc-0.8.4pre1/remotes/atiusb/lircd.conf.atiusb
+--- lirc-0.8.4pre1.orig/remotes/atiusb/lircd.conf.atiusb	2008-09-24 17:05:54.000000000 -0400
++++ lirc-0.8.4pre1/remotes/atiusb/lircd.conf.atiusb	2008-09-24 17:06:37.000000000 -0400
 @@ -37,54 +37,54 @@ begin remote
  
  
@@ -664,9 +664,9 @@ diff -upr lirc-0.8.3.orig/remotes/atiusb/lircd.conf.atiusb lirc-0.8.3/remotes/at
        end codes
  
  end remote
-diff -upr lirc-0.8.3.orig/remotes/avermedia/lircd.conf.avermedia lirc-0.8.3/remotes/avermedia/lircd.conf.avermedia
---- lirc-0.8.3.orig/remotes/avermedia/lircd.conf.avermedia	2001-01-11 07:54:25.000000000 +0000
-+++ lirc-0.8.3/remotes/avermedia/lircd.conf.avermedia	2008-08-12 16:14:40.000000000 +0100
+diff -Naurp lirc-0.8.4pre1.orig/remotes/avermedia/lircd.conf.avermedia lirc-0.8.4pre1/remotes/avermedia/lircd.conf.avermedia
+--- lirc-0.8.4pre1.orig/remotes/avermedia/lircd.conf.avermedia	2001-01-11 02:54:25.000000000 -0500
++++ lirc-0.8.4pre1/remotes/avermedia/lircd.conf.avermedia	2008-09-24 17:06:37.000000000 -0400
 @@ -34,37 +34,37 @@ begin remote
  
  
@@ -729,9 +729,9 @@ diff -upr lirc-0.8.3.orig/remotes/avermedia/lircd.conf.avermedia lirc-0.8.3/remo
        end codes
  
  end remote
-diff -upr lirc-0.8.3.orig/remotes/avermedia/lircd.conf.avermedia98 lirc-0.8.3/remotes/avermedia/lircd.conf.avermedia98
---- lirc-0.8.3.orig/remotes/avermedia/lircd.conf.avermedia98	2001-01-10 22:08:00.000000000 +0000
-+++ lirc-0.8.3/remotes/avermedia/lircd.conf.avermedia98	2008-08-12 16:14:40.000000000 +0100
+diff -Naurp lirc-0.8.4pre1.orig/remotes/avermedia/lircd.conf.avermedia98 lirc-0.8.4pre1/remotes/avermedia/lircd.conf.avermedia98
+--- lirc-0.8.4pre1.orig/remotes/avermedia/lircd.conf.avermedia98	2001-01-10 17:08:00.000000000 -0500
++++ lirc-0.8.4pre1/remotes/avermedia/lircd.conf.avermedia98	2008-09-24 17:06:37.000000000 -0400
 @@ -29,49 +29,49 @@ begin remote
  
        begin codes
@@ -811,9 +811,9 @@ diff -upr lirc-0.8.3.orig/remotes/avermedia/lircd.conf.avermedia98 lirc-0.8.3/re
        end codes
  
  end remote
-diff -upr lirc-0.8.3.orig/remotes/avermedia/lircd.conf.vdomate lirc-0.8.3/remotes/avermedia/lircd.conf.vdomate
---- lirc-0.8.3.orig/remotes/avermedia/lircd.conf.vdomate	2002-10-25 21:42:55.000000000 +0100
-+++ lirc-0.8.3/remotes/avermedia/lircd.conf.vdomate	2008-08-12 16:14:40.000000000 +0100
+diff -Naurp lirc-0.8.4pre1.orig/remotes/avermedia/lircd.conf.vdomate lirc-0.8.4pre1/remotes/avermedia/lircd.conf.vdomate
+--- lirc-0.8.4pre1.orig/remotes/avermedia/lircd.conf.vdomate	2002-10-25 16:42:55.000000000 -0400
++++ lirc-0.8.4pre1/remotes/avermedia/lircd.conf.vdomate	2008-09-24 17:06:37.000000000 -0400
 @@ -27,33 +27,33 @@ begin remote
  
  
@@ -866,9 +866,9 @@ diff -upr lirc-0.8.3.orig/remotes/avermedia/lircd.conf.vdomate lirc-0.8.3/remote
        end codes
  
  end remote
-diff -upr lirc-0.8.3.orig/remotes/bestbuy/lircd.conf.bestbuy lirc-0.8.3/remotes/bestbuy/lircd.conf.bestbuy
---- lirc-0.8.3.orig/remotes/bestbuy/lircd.conf.bestbuy	2001-04-25 21:07:50.000000000 +0100
-+++ lirc-0.8.3/remotes/bestbuy/lircd.conf.bestbuy	2008-08-12 16:14:39.000000000 +0100
+diff -Naurp lirc-0.8.4pre1.orig/remotes/bestbuy/lircd.conf.bestbuy lirc-0.8.4pre1/remotes/bestbuy/lircd.conf.bestbuy
+--- lirc-0.8.4pre1.orig/remotes/bestbuy/lircd.conf.bestbuy	2001-04-25 16:07:50.000000000 -0400
++++ lirc-0.8.4pre1/remotes/bestbuy/lircd.conf.bestbuy	2008-09-24 17:06:37.000000000 -0400
 @@ -26,36 +26,36 @@ begin remote
  
  
@@ -931,9 +931,9 @@ diff -upr lirc-0.8.3.orig/remotes/bestbuy/lircd.conf.bestbuy lirc-0.8.3/remotes/
        end codes
  
  end remote
-diff -upr lirc-0.8.3.orig/remotes/bestbuy/lircd.conf.bestbuy2 lirc-0.8.3/remotes/bestbuy/lircd.conf.bestbuy2
---- lirc-0.8.3.orig/remotes/bestbuy/lircd.conf.bestbuy2	2005-10-29 21:10:15.000000000 +0100
-+++ lirc-0.8.3/remotes/bestbuy/lircd.conf.bestbuy2	2008-08-12 16:14:39.000000000 +0100
+diff -Naurp lirc-0.8.4pre1.orig/remotes/bestbuy/lircd.conf.bestbuy2 lirc-0.8.4pre1/remotes/bestbuy/lircd.conf.bestbuy2
+--- lirc-0.8.4pre1.orig/remotes/bestbuy/lircd.conf.bestbuy2	2005-10-29 16:10:15.000000000 -0400
++++ lirc-0.8.4pre1/remotes/bestbuy/lircd.conf.bestbuy2	2008-09-24 17:06:37.000000000 -0400
 @@ -27,29 +27,29 @@ begin remote
        begin codes
            TV/FM                    0x0000000000000043
@@ -983,9 +983,9 @@ diff -upr lirc-0.8.3.orig/remotes/bestbuy/lircd.conf.bestbuy2 lirc-0.8.3/remotes
            RESET                    0x000000000000004D
            FREEZE                   0x000000000000004F
        end codes
-diff -upr lirc-0.8.3.orig/remotes/caraca/lircd.conf.caraca lirc-0.8.3/remotes/caraca/lircd.conf.caraca
---- lirc-0.8.3.orig/remotes/caraca/lircd.conf.caraca	2000-08-25 20:21:17.000000000 +0100
-+++ lirc-0.8.3/remotes/caraca/lircd.conf.caraca	2008-08-12 16:14:40.000000000 +0100
+diff -Naurp lirc-0.8.4pre1.orig/remotes/caraca/lircd.conf.caraca lirc-0.8.4pre1/remotes/caraca/lircd.conf.caraca
+--- lirc-0.8.4pre1.orig/remotes/caraca/lircd.conf.caraca	2000-08-25 15:21:17.000000000 -0400
++++ lirc-0.8.4pre1/remotes/caraca/lircd.conf.caraca	2008-09-24 17:06:37.000000000 -0400
 @@ -17,29 +17,29 @@ begin remote
    bits           16
  
@@ -1037,9 +1037,9 @@ diff -upr lirc-0.8.3.orig/remotes/caraca/lircd.conf.caraca lirc-0.8.3/remotes/ca
            TV/FM                    0x3fe3
        end codes
  
-diff -upr lirc-0.8.3.orig/remotes/chronos/lircd.conf.chronos lirc-0.8.3/remotes/chronos/lircd.conf.chronos
---- lirc-0.8.3.orig/remotes/chronos/lircd.conf.chronos	2008-08-12 16:13:39.000000000 +0100
-+++ lirc-0.8.3/remotes/chronos/lircd.conf.chronos	2008-08-12 16:14:39.000000000 +0100
+diff -Naurp lirc-0.8.4pre1.orig/remotes/chronos/lircd.conf.chronos lirc-0.8.4pre1/remotes/chronos/lircd.conf.chronos
+--- lirc-0.8.4pre1.orig/remotes/chronos/lircd.conf.chronos	2008-09-24 17:05:54.000000000 -0400
++++ lirc-0.8.4pre1/remotes/chronos/lircd.conf.chronos	2008-09-24 17:06:37.000000000 -0400
 @@ -20,37 +20,37 @@ begin remote
    toggle_bit      0
  
@@ -1103,9 +1103,9 @@ diff -upr lirc-0.8.3.orig/remotes/chronos/lircd.conf.chronos lirc-0.8.3/remotes/
 +          KEY_RIGHT         0x0000000000000007
        end codes
  end remote
-diff -upr lirc-0.8.3.orig/remotes/cph03x/lircd.conf.cph03x lirc-0.8.3/remotes/cph03x/lircd.conf.cph03x
---- lirc-0.8.3.orig/remotes/cph03x/lircd.conf.cph03x	2001-06-14 16:49:16.000000000 +0100
-+++ lirc-0.8.3/remotes/cph03x/lircd.conf.cph03x	2008-08-12 16:14:40.000000000 +0100
+diff -Naurp lirc-0.8.4pre1.orig/remotes/cph03x/lircd.conf.cph03x lirc-0.8.4pre1/remotes/cph03x/lircd.conf.cph03x
+--- lirc-0.8.4pre1.orig/remotes/cph03x/lircd.conf.cph03x	2001-06-14 11:49:16.000000000 -0400
++++ lirc-0.8.4pre1/remotes/cph03x/lircd.conf.cph03x	2008-09-24 17:06:37.000000000 -0400
 @@ -32,39 +32,39 @@ begin remote
    repeat_bit      0
  
@@ -1169,9 +1169,9 @@ diff -upr lirc-0.8.3.orig/remotes/cph03x/lircd.conf.cph03x lirc-0.8.3/remotes/cp
        end codes
  
  end remote
-diff -upr lirc-0.8.3.orig/remotes/creative/lircd.conf.alsa_usb lirc-0.8.3/remotes/creative/lircd.conf.alsa_usb
---- lirc-0.8.3.orig/remotes/creative/lircd.conf.alsa_usb	2008-01-26 09:01:16.000000000 +0000
-+++ lirc-0.8.3/remotes/creative/lircd.conf.alsa_usb	2008-08-12 16:14:40.000000000 +0100
+diff -Naurp lirc-0.8.4pre1.orig/remotes/creative/lircd.conf.alsa_usb lirc-0.8.4pre1/remotes/creative/lircd.conf.alsa_usb
+--- lirc-0.8.4pre1.orig/remotes/creative/lircd.conf.alsa_usb	2008-01-26 04:01:16.000000000 -0500
++++ lirc-0.8.4pre1/remotes/creative/lircd.conf.alsa_usb	2008-09-24 17:06:37.000000000 -0400
 @@ -34,38 +34,38 @@ begin remote
  
  
@@ -1238,9 +1238,9 @@ diff -upr lirc-0.8.3.orig/remotes/creative/lircd.conf.alsa_usb lirc-0.8.3/remote
            Step                     0x0000000000007E81
        end codes
  
-diff -upr lirc-0.8.3.orig/remotes/creative/lircd.conf.breakoutbox lirc-0.8.3/remotes/creative/lircd.conf.breakoutbox
---- lirc-0.8.3.orig/remotes/creative/lircd.conf.breakoutbox	2007-02-20 04:08:04.000000000 +0000
-+++ lirc-0.8.3/remotes/creative/lircd.conf.breakoutbox	2008-08-12 16:14:40.000000000 +0100
+diff -Naurp lirc-0.8.4pre1.orig/remotes/creative/lircd.conf.breakoutbox lirc-0.8.4pre1/remotes/creative/lircd.conf.breakoutbox
+--- lirc-0.8.4pre1.orig/remotes/creative/lircd.conf.breakoutbox	2007-02-19 23:08:04.000000000 -0500
++++ lirc-0.8.4pre1/remotes/creative/lircd.conf.breakoutbox	2008-09-24 17:06:37.000000000 -0400
 @@ -19,37 +19,37 @@ begin remote
        begin codes
            DVD/CD                   0x0000000000000001
@@ -1305,9 +1305,9 @@ diff -upr lirc-0.8.3.orig/remotes/creative/lircd.conf.breakoutbox lirc-0.8.3/rem
        end codes
  
  end remote
-diff -upr lirc-0.8.3.orig/remotes/creative/lircd.conf.creative lirc-0.8.3/remotes/creative/lircd.conf.creative
---- lirc-0.8.3.orig/remotes/creative/lircd.conf.creative	2007-03-10 20:15:49.000000000 +0000
-+++ lirc-0.8.3/remotes/creative/lircd.conf.creative	2008-08-12 16:14:40.000000000 +0100
+diff -Naurp lirc-0.8.4pre1.orig/remotes/creative/lircd.conf.creative lirc-0.8.4pre1/remotes/creative/lircd.conf.creative
+--- lirc-0.8.4pre1.orig/remotes/creative/lircd.conf.creative	2007-03-10 15:15:49.000000000 -0500
++++ lirc-0.8.4pre1/remotes/creative/lircd.conf.creative	2008-09-24 17:06:37.000000000 -0400
 @@ -23,30 +23,30 @@ begin remote
    toggle_bit      0
  
@@ -1358,9 +1358,9 @@ diff -upr lirc-0.8.3.orig/remotes/creative/lircd.conf.creative lirc-0.8.3/remote
        end codes
  
  end remote
-diff -upr lirc-0.8.3.orig/remotes/creative/lircd.conf.infracd lirc-0.8.3/remotes/creative/lircd.conf.infracd
---- lirc-0.8.3.orig/remotes/creative/lircd.conf.infracd	2003-05-07 18:30:41.000000000 +0100
-+++ lirc-0.8.3/remotes/creative/lircd.conf.infracd	2008-08-12 16:14:40.000000000 +0100
+diff -Naurp lirc-0.8.4pre1.orig/remotes/creative/lircd.conf.infracd lirc-0.8.4pre1/remotes/creative/lircd.conf.infracd
+--- lirc-0.8.4pre1.orig/remotes/creative/lircd.conf.infracd	2003-05-07 13:30:41.000000000 -0400
++++ lirc-0.8.4pre1/remotes/creative/lircd.conf.infracd	2008-09-24 17:06:37.000000000 -0400
 @@ -30,30 +30,30 @@ begin remote
  
  
@@ -1414,9 +1414,9 @@ diff -upr lirc-0.8.3.orig/remotes/creative/lircd.conf.infracd lirc-0.8.3/remotes
        end codes
  
  end remote
-diff -upr lirc-0.8.3.orig/remotes/creative/lircd.conf.livedrive lirc-0.8.3/remotes/creative/lircd.conf.livedrive
---- lirc-0.8.3.orig/remotes/creative/lircd.conf.livedrive	2008-08-12 16:13:39.000000000 +0100
-+++ lirc-0.8.3/remotes/creative/lircd.conf.livedrive	2008-08-12 16:14:40.000000000 +0100
+diff -Naurp lirc-0.8.4pre1.orig/remotes/creative/lircd.conf.livedrive lirc-0.8.4pre1/remotes/creative/lircd.conf.livedrive
+--- lirc-0.8.4pre1.orig/remotes/creative/lircd.conf.livedrive	2008-09-24 17:05:54.000000000 -0400
++++ lirc-0.8.4pre1/remotes/creative/lircd.conf.livedrive	2008-09-24 17:06:37.000000000 -0400
 @@ -29,40 +29,40 @@ begin remote
  
  
@@ -1486,9 +1486,9 @@ diff -upr lirc-0.8.3.orig/remotes/creative/lircd.conf.livedrive lirc-0.8.3/remot
  	  
        end codes
  
-diff -upr lirc-0.8.3.orig/remotes/dvico/lircd.conf.fusionHDTV lirc-0.8.3/remotes/dvico/lircd.conf.fusionHDTV
---- lirc-0.8.3.orig/remotes/dvico/lircd.conf.fusionHDTV	2006-05-06 05:38:39.000000000 +0100
-+++ lirc-0.8.3/remotes/dvico/lircd.conf.fusionHDTV	2008-08-12 16:14:39.000000000 +0100
+diff -Naurp lirc-0.8.4pre1.orig/remotes/dvico/lircd.conf.fusionHDTV lirc-0.8.4pre1/remotes/dvico/lircd.conf.fusionHDTV
+--- lirc-0.8.4pre1.orig/remotes/dvico/lircd.conf.fusionHDTV	2006-05-06 00:38:39.000000000 -0400
++++ lirc-0.8.4pre1/remotes/dvico/lircd.conf.fusionHDTV	2008-09-24 17:06:37.000000000 -0400
 @@ -22,42 +22,42 @@ begin remote
    toggle_bit     0
  
@@ -1563,9 +1563,9 @@ diff -upr lirc-0.8.3.orig/remotes/dvico/lircd.conf.fusionHDTV lirc-0.8.3/remotes
        end codes
  
  end remote
-diff -upr lirc-0.8.3.orig/remotes/ea65/lircd.conf.ea65 lirc-0.8.3/remotes/ea65/lircd.conf.ea65
---- lirc-0.8.3.orig/remotes/ea65/lircd.conf.ea65	2004-11-20 13:43:48.000000000 +0000
-+++ lirc-0.8.3/remotes/ea65/lircd.conf.ea65	2008-08-12 16:14:39.000000000 +0100
+diff -Naurp lirc-0.8.4pre1.orig/remotes/ea65/lircd.conf.ea65 lirc-0.8.4pre1/remotes/ea65/lircd.conf.ea65
+--- lirc-0.8.4pre1.orig/remotes/ea65/lircd.conf.ea65	2004-11-20 08:43:48.000000000 -0500
++++ lirc-0.8.4pre1/remotes/ea65/lircd.conf.ea65	2008-09-24 17:06:37.000000000 -0400
 @@ -18,53 +18,53 @@ begin remote
          htpc        0x0011811b
          dvd/vcd     0x00128100
@@ -1654,9 +1654,9 @@ diff -upr lirc-0.8.3.orig/remotes/ea65/lircd.conf.ea65 lirc-0.8.3/remotes/ea65/l
          stop-eject  0x00238107
          mode-       0x00ff1080
          mode+       0x00ff1180
-diff -upr lirc-0.8.3.orig/remotes/ericsson/lircd.conf.bte lirc-0.8.3/remotes/ericsson/lircd.conf.bte
---- lirc-0.8.3.orig/remotes/ericsson/lircd.conf.bte	2005-03-25 20:40:25.000000000 +0000
-+++ lirc-0.8.3/remotes/ericsson/lircd.conf.bte	2008-08-12 16:14:39.000000000 +0100
+diff -Naurp lirc-0.8.4pre1.orig/remotes/ericsson/lircd.conf.bte lirc-0.8.4pre1/remotes/ericsson/lircd.conf.bte
+--- lirc-0.8.4pre1.orig/remotes/ericsson/lircd.conf.bte	2005-03-25 15:40:25.000000000 -0500
++++ lirc-0.8.4pre1/remotes/ericsson/lircd.conf.bte	2008-09-24 17:06:37.000000000 -0400
 @@ -15,38 +15,38 @@ begin remote
      bits    16
  
@@ -1719,9 +1719,9 @@ diff -upr lirc-0.8.3.orig/remotes/ericsson/lircd.conf.bte lirc-0.8.3/remotes/eri
          WAP             0x3a4f  # ':O'
  
        end codes
-diff -upr lirc-0.8.3.orig/remotes/hauppauge/lircd.conf.hauppauge lirc-0.8.3/remotes/hauppauge/lircd.conf.hauppauge
---- lirc-0.8.3.orig/remotes/hauppauge/lircd.conf.hauppauge	2005-10-05 21:28:15.000000000 +0100
-+++ lirc-0.8.3/remotes/hauppauge/lircd.conf.hauppauge	2008-08-12 16:14:39.000000000 +0100
+diff -Naurp lirc-0.8.4pre1.orig/remotes/hauppauge/lircd.conf.hauppauge lirc-0.8.4pre1/remotes/hauppauge/lircd.conf.hauppauge
+--- lirc-0.8.4pre1.orig/remotes/hauppauge/lircd.conf.hauppauge	2008-06-24 13:01:10.000000000 -0400
++++ lirc-0.8.4pre1/remotes/hauppauge/lircd.conf.hauppauge	2008-09-24 17:06:37.000000000 -0400
 @@ -27,25 +27,25 @@ begin remote
    repeat_bit      2
  
@@ -1765,9 +1765,9 @@ diff -upr lirc-0.8.3.orig/remotes/hauppauge/lircd.conf.hauppauge lirc-0.8.3/remo
            RESERVED                 0x000000000000101E
            MINIMIZE                 0x0000000000001026
        end codes
-diff -upr lirc-0.8.3.orig/remotes/hercules/lircd.conf.smarttv_stereo lirc-0.8.3/remotes/hercules/lircd.conf.smarttv_stereo
---- lirc-0.8.3.orig/remotes/hercules/lircd.conf.smarttv_stereo	2008-08-12 16:13:39.000000000 +0100
-+++ lirc-0.8.3/remotes/hercules/lircd.conf.smarttv_stereo	2008-08-12 16:14:39.000000000 +0100
+diff -Naurp lirc-0.8.4pre1.orig/remotes/hercules/lircd.conf.smarttv_stereo lirc-0.8.4pre1/remotes/hercules/lircd.conf.smarttv_stereo
+--- lirc-0.8.4pre1.orig/remotes/hercules/lircd.conf.smarttv_stereo	2008-09-24 17:05:54.000000000 -0400
++++ lirc-0.8.4pre1/remotes/hercules/lircd.conf.smarttv_stereo	2008-09-24 17:06:37.000000000 -0400
 @@ -26,36 +26,36 @@ begin remote
  
  
@@ -1828,9 +1828,9 @@ diff -upr lirc-0.8.3.orig/remotes/hercules/lircd.conf.smarttv_stereo lirc-0.8.3/
        end codes
  
  end remote
-diff -upr lirc-0.8.3.orig/remotes/imon/lircd.conf.imon lirc-0.8.3/remotes/imon/lircd.conf.imon
---- lirc-0.8.3.orig/remotes/imon/lircd.conf.imon	2005-04-16 18:05:49.000000000 +0100
-+++ lirc-0.8.3/remotes/imon/lircd.conf.imon	2008-08-12 16:14:39.000000000 +0100
+diff -Naurp lirc-0.8.4pre1.orig/remotes/imon/lircd.conf.imon lirc-0.8.4pre1/remotes/imon/lircd.conf.imon
+--- lirc-0.8.4pre1.orig/remotes/imon/lircd.conf.imon	2005-04-16 13:05:49.000000000 -0400
++++ lirc-0.8.4pre1/remotes/imon/lircd.conf.imon	2008-09-24 17:06:37.000000000 -0400
 @@ -29,48 +29,48 @@ begin remote
    duty_cycle   33
  
@@ -1916,144 +1916,10 @@ diff -upr lirc-0.8.3.orig/remotes/imon/lircd.conf.imon lirc-0.8.3/remotes/imon/l
            DVD.Caption              0x00000000000052AD
            DVD.Language             0x000000000000D22D
            Full.Screen              0x00000000000032CD
-diff -upr lirc-0.8.3.orig/remotes/imon/lircd.conf.imon-2.4g lirc-0.8.3/remotes/imon/lircd.conf.imon-2.4g
---- lirc-0.8.3.orig/remotes/imon/lircd.conf.imon-2.4g	2007-03-18 10:23:34.000000000 +0000
-+++ lirc-0.8.3/remotes/imon/lircd.conf.imon-2.4g	2008-08-12 16:14:39.000000000 +0100
-@@ -20,69 +20,69 @@ begin remote
- 
- 
-       begin codes
--          Power                    0xBB4403FC
-+          KEY_POWER                    0xBB4403FC
- 
--          RAppExit                 0xBB4431CE
--          REject                   0xBB4432CD
--          RAppLauncher             0xBB4437C8
--          RTaskSwitcher            0xBB4439C6
--          RBack                    0xBB443DC2
--          RSelect                  0xBB443FC0
--          RChannelUp               0xBB443EC1
--          RChannelDown             0xBB4443BC
--          RVolumeUp                0xBB4445BA
--          RVolumeDown              0xBB4444BB
--          RNext                    0xBB444CB3
--          RPrev                    0xBB444DB2
--          RFf                      0xBB444FB0
--          RRew                     0xBB444EB1
--          RI                       0xBB4450AF
--          RMute                    0xBB4449B6
--          RTv                      0xBB444AB5
--          RMenu                    0xBB444BB4
--          R1                       0xBB4434CB
--          R2                       0xBB4435CA
--          R3                       0xBB4436C9
--          R4                       0xBB443AC5
--          R5                       0xBB443BC4
--          R6                       0xBB443CC3
--          R7                       0xBB4440BF
--          R8                       0xBB4441BE
--          R9                       0xBB4442BD
--          RSkipBack                0xBB4446B9
--          R0                       0xBB4447B8
--          RSkipFwd                 0xBB4448B7
-+                           0xBB4431CE
-+                             0xBB4432CD
-+                       0xBB4437C8
-+                      0xBB4439C6
-+                              0xBB443DC2
-+                            0xBB443FC0
-+                         0xBB443EC1
-+                       0xBB4443BC
-+                          0xBB4445BA
-+                        0xBB4444BB
-+                              0xBB444CB3
-+                              0xBB444DB2
-+                                0xBB444FB0
-+                               0xBB444EB1
-+                                 0xBB4450AF
-+                              0xBB4449B6
-+                                0xBB444AB5
-+                              0xBB444BB4
-+                                 0xBB4434CB
-+                                 0xBB4435CA
-+                                 0xBB4436C9
-+                                 0xBB443AC5
-+                                 0xBB443BC4
-+                                 0xBB443CC3
-+                                 0xBB4440BF
-+                                 0xBB4441BE
-+                                 0xBB4442BD
-+                          0xBB4446B9
-+                                 0xBB4447B8
-+                           0xBB4448B7
- 
--          GAppExit                 0xBB4401FE
--          GEject                   0xBB4402FD
--          GAppLauncher             0xBB4407F8
--          GTaskSwitcher            0xBB4409F6
--          GBack                    0xBB440DF2
--          GSelect                  0xBB440FF0
--          GChannelUp               0xBB440EF1
--          GChannelDown             0xBB4413EC
--          GVolumeUp                0xBB4415EA
--          GVolumeDown              0xBB4414EB
--          GNext                    0xBB441CE3
--          GPrev                    0xBB441DE2
--          GFf                      0xBB441FE0
--          GRew                     0xBB441EE1
--          GI                       0xBB4420DF
--          GMute                    0xBB4419E6
--          GTv                      0xBB441AE5
--          GMenu                    0xBB441BE4
--          G1                       0xBB4404FB
--          G2                       0xBB4405FA
--          G3                       0xBB4406F9
--          G4                       0xBB440AF5
--          G5                       0xBB440BF4
--          G6                       0xBB440CF3
--          G7                       0xBB4410EF
--          G8                       0xBB4411EE
--          G9                       0xBB4412ED
--          GSkipBack                0xBB4416E9
--          G0                       0xBB4417E8
--          GSkipFwd                 0xBB4418E7
-+                           0xBB4401FE
-+                             0xBB4402FD
-+                       0xBB4407F8
-+                      0xBB4409F6
-+                              0xBB440DF2
-+                            0xBB440FF0
-+                         0xBB440EF1
-+                       0xBB4413EC
-+                          0xBB4415EA
-+                        0xBB4414EB
-+                              0xBB441CE3
-+                              0xBB441DE2
-+                                0xBB441FE0
-+                               0xBB441EE1
-+                                 0xBB4420DF
-+                              0xBB4419E6
-+                                0xBB441AE5
-+                              0xBB441BE4
-+                                 0xBB4404FB
-+                                 0xBB4405FA
-+                                 0xBB4406F9
-+                                 0xBB440AF5
-+                                 0xBB440BF4
-+                                 0xBB440CF3
-+                                 0xBB4410EF
-+                                 0xBB4411EE
-+                                 0xBB4412ED
-+                          0xBB4416E9
-+                                 0xBB4417E8
-+                           0xBB4418E7
-       end codes
- 
- end remote
-diff -upr lirc-0.8.3.orig/remotes/imon/lircd.conf.imon-knob lirc-0.8.3/remotes/imon/lircd.conf.imon-knob
---- lirc-0.8.3.orig/remotes/imon/lircd.conf.imon-knob	2006-12-29 13:03:50.000000000 +0000
-+++ lirc-0.8.3/remotes/imon/lircd.conf.imon-knob	2008-08-12 16:14:39.000000000 +0100
-@@ -23,67 +23,67 @@ begin remote
+diff -Naurp lirc-0.8.4pre1.orig/remotes/imon/lircd.conf.imon-knob lirc-0.8.4pre1/remotes/imon/lircd.conf.imon-knob
+--- lirc-0.8.4pre1.orig/remotes/imon/lircd.conf.imon-knob	2008-06-12 15:32:33.000000000 -0400
++++ lirc-0.8.4pre1/remotes/imon/lircd.conf.imon-knob	2008-09-24 17:41:09.000000000 -0400
+@@ -23,74 +23,67 @@ begin remote
  
  
        begin codes
@@ -2070,26 +1936,27 @@ diff -upr lirc-0.8.3.orig/remotes/imon/lircd.conf.imon-knob lirc-0.8.3/remotes/i
 -          FastForward              0x2B8115B7
 -          PrevChapter              0x2B9115B7
 -          Stop                     0x2B9715B7
--          NextChapter              0x298195BF
-+          KEY_EXIT                  0x288195B7
-+          KEY_POWER                    0x289115B7
-+          KEY_RECORD                   0x298115B7
-+          KEY_PLAY                     0x2A8115B7
-+          KEY_OPEN                     0x29B195B7
-+          KEY_VOLUMEUP                0x000100FF
-+          KEY_VOLUMEDOWN              0x010000FF
+-          NextChapter              0x298195B7
++          KEY_EXIT                 0x288195B7
++          KEY_POWER                0x289115B7
++          KEY_RECORD               0x298115B7
++          KEY_PLAY                 0x2A8115B7
++          KEY_OPEN                 0x29B195B7
++          KEY_VOLUMEUP             0x000100FF
++          KEY_VOLUMEDOWN           0x010000FF
 +          KEY_MUTE                 0x000008FF
-+          KEY_REWIND                   0x2A8195B7
-+          KEY_PAUSE                    0x2A9115B7
-+          KEY_FASTFORWARD              0x2B8115B7
-+          KEY_PREVIOUS              0x2B9115B7
-+          KEY_STOP                     0x2B9715B7
-+          KEY_NEXT              0x298195BF
++          KEY_REWIND               0x2A8195B7
++          KEY_PAUSE                0x2A9115B7
++          KEY_FASTFORWARD          0x2B8115B7
++          KEY_PREVIOUS             0x2B9115B7
++          KEY_STOP                 0x2B9715B7
++          KEY_NEXT                 0x298195B7
            WindowsKey               0x2B8195B7
 -          Backspace                0x28A115B7
-+          KEY_BACKSPACE                0x28A115B7
++          KEY_BACKSPACE            0x28A115B7
            MouseKeyboard            0x299115B7
-           SelectSpace              0x2A9315B7
+-          SelectSpace              0x2A9315B7
++          KEY_SELECT               0x2A9315B7
            MouseMenu                0x28B715B7
 -          MouseRightClick          0x688481B7
 -          Enter                    0x28A195B7
@@ -2100,15 +1967,15 @@ diff -upr lirc-0.8.3.orig/remotes/imon/lircd.conf.imon-knob lirc-0.8.3/remotes/i
 -          CursorDown               0x6882A1B7
 -          Esc                      0x2BB715B7
 -          Eject                    0x299395B7
-+          BTN_RIGHT          0x688481B7
-+          KEY_ENTER                    0x28A195B7
-+          BTN_LEFT           0x688301B7
-+          KEY_LEFT               0x6ABA81B7
-+          KEY_UP                 0x6902F9B7
-+          KEY_RIGHT              0x68A281B7
-+          KEY_DOWN               0x6882A1B7
-+          KEY_ESC                      0x2BB715B7
-+          KEY_EJECTCD                    0x299395B7
++          BTN_RIGHT                0x688481B7
++          KEY_ENTER                0x28A195B7
++          BTN_LEFT                 0x688301B7
++          KEY_LEFT                 0x6ABA81B7
++          KEY_UP                   0x6902F9B7
++          KEY_RIGHT                0x68A281B7
++          KEY_DOWN                 0x6882A1B7
++          KEY_ESC                  0x2BB715B7
++          KEY_EJECTCD              0x299395B7
            AppLauncher              0x29B715B7
            MultiMon                 0x2AB195B7
            TaskSwitcher             0x2A9395B7
@@ -2117,11 +1984,11 @@ diff -upr lirc-0.8.3.orig/remotes/imon/lircd.conf.imon-knob lirc-0.8.3/remotes/i
 -          VolDown                  0x28A595B7
 -          ChUp                     0x289395B7
 -          ChDown                   0x288795B7
-+          KEY_MUTE                     0x2B9595B7
-+          KEY_VOLUMEUP                    0x28A395B7
-+          KEY_VOLUMEDOWN                  0x28A595B7
-+          KEY_CHANNELUP                     0x289395B7
-+          KEY_CHANNELDOWN                   0x288795B7
++          KEY_MUTE                 0x2B9595B7
++          KEY_VOLUMEUP             0x28A395B7
++          KEY_VOLUMEDOWN           0x28A595B7
++          KEY_CHANNELUP            0x289395B7
++          KEY_CHANNELDOWN          0x288795B7
            Timer                    0x2B8395B7
 -          1                        0x28B595B7
 -          2                        0x2BB195B7
@@ -2132,45 +1999,53 @@ diff -upr lirc-0.8.3.orig/remotes/imon/lircd.conf.imon-knob lirc-0.8.3/remotes/i
 -          7                        0x2B9395B7
 -          8                        0x2A8515B7
 -          9                        0x2AA115B7
-+          KEY_1                        0x28B595B7
-+          KEY_2                        0x2BB195B7
-+          KEY_3                        0x28B195B7
-+          KEY_4                        0x2A8595B7
-+          KEY_5                        0x299595B7
-+          KEY_6                        0x2AA595B7
-+          KEY_7                        0x2B9395B7
-+          KEY_8                        0x2A8515B7
-+          KEY_9                        0x2AA115B7
++          KEY_1                    0x28B595B7
++          KEY_2                    0x2BB195B7
++          KEY_3                    0x28B195B7
++          KEY_4                    0x2A8595B7
++          KEY_5                    0x299595B7
++          KEY_6                    0x2AA595B7
++          KEY_7                    0x2B9395B7
++          KEY_8                    0x2A8515B7
++          KEY_9                    0x2AA115B7
            ShiftTab                 0x28B515B7
--          0                        0x2BA595BF
+-          0                        0x2BA595B7
 -          Tab                      0x29A115B7
 -          MyMovie                  0x2B8515B7
 -          MyMusic                  0x299195B7
-+          KEY_0                        0x2BA595BF
-+          KEY_TAB                      0x29A115B7
-+          KEY_VIDEO                  0x2B8515B7
-+          KEY_AUDIO                  0x299195B7
-           MyPhoto                  0x2BA115B7
+-          MyPhoto                  0x2BA115B7
 -          MyTV                     0x28A515B7
 -          Bookmark                 0x288515B7
-+          KEY_TV                     0x28A515B7
-+          KEY_BOOKMARKS                 0x288515B7
-           Thumbnail                0x2AB715BF
++          KEY_0                    0x2BA595B7
++          KEY_TAB                  0x29A115B7
++          KEY_VIDEO                0x2B8515B7
++          KEY_AUDIO                0x299195B7
++          KEY_PHOTO                0x2BA115B7
++          KEY_TV                   0x28A515B7
++          KEY_BOOKMARKS            0x288515B7
+           Thumbnail                0x2AB715B7
            AspectRatio              0x29A595B7
-           FullScreen               0x2AA395BF
+           FullScreen               0x2AA395B7
 -          MyDVD                    0x29A295B7
 -          Menu                     0x2BA385B7
-+          KEY_DVD                    0x29A295B7
-+          KEY_MENU                     0x2BA385B7
++          KEY_DVD                  0x29A295B7
++          KEY_MENU                 0x2BA385B7
            Caption                  0x298595B7
 -          Language                 0x2B8595B7
-+          KEY_LANGUAGE                 0x2B8595B7
+-# these codes may be wrong, but they were included in the first version of
+-# this config file
+-          0                        0x2BA595BF
+-          NextChapter              0x298195BF
+-          Thumbnail                0x2AB715BF
+-          FullScreen               0x2AA395BF
+-
++          KEY_LANGUAGE             0x2B8595B7
        end codes
  
  end remote
-diff -upr lirc-0.8.3.orig/remotes/imon/lircd.conf.imon-pad lirc-0.8.3/remotes/imon/lircd.conf.imon-pad
---- lirc-0.8.3.orig/remotes/imon/lircd.conf.imon-pad	2006-11-28 03:18:23.000000000 +0000
-+++ lirc-0.8.3/remotes/imon/lircd.conf.imon-pad	2008-08-12 16:14:39.000000000 +0100
+diff -Naurp lirc-0.8.4pre1.orig/remotes/imon/lircd.conf.imon-pad lirc-0.8.4pre1/remotes/imon/lircd.conf.imon-pad
+--- lirc-0.8.4pre1.orig/remotes/imon/lircd.conf.imon-pad	2006-11-27 22:18:23.000000000 -0500
++++ lirc-0.8.4pre1/remotes/imon/lircd.conf.imon-pad	2008-09-24 17:06:37.000000000 -0400
 @@ -24,65 +24,65 @@ begin remote
  
  
@@ -2280,9 +2155,9 @@ diff -upr lirc-0.8.3.orig/remotes/imon/lircd.conf.imon-pad lirc-0.8.3/remotes/im
  
        end codes
  
-diff -upr lirc-0.8.3.orig/remotes/imon/lircd.conf.imon-rsc lirc-0.8.3/remotes/imon/lircd.conf.imon-rsc
---- lirc-0.8.3.orig/remotes/imon/lircd.conf.imon-rsc	2007-02-18 08:36:27.000000000 +0000
-+++ lirc-0.8.3/remotes/imon/lircd.conf.imon-rsc	2008-08-12 16:14:39.000000000 +0100
+diff -Naurp lirc-0.8.4pre1.orig/remotes/imon/lircd.conf.imon-rsc lirc-0.8.4pre1/remotes/imon/lircd.conf.imon-rsc
+--- lirc-0.8.4pre1.orig/remotes/imon/lircd.conf.imon-rsc	2007-02-18 03:36:27.000000000 -0500
++++ lirc-0.8.4pre1/remotes/imon/lircd.conf.imon-rsc	2008-09-24 17:06:37.000000000 -0400
 @@ -27,48 +27,48 @@ begin remote
    gap          100000
  
@@ -2364,9 +2239,9 @@ diff -upr lirc-0.8.3.orig/remotes/imon/lircd.conf.imon-rsc lirc-0.8.3/remotes/im
            Full.Screen        0x000000000000916e
        end codes
  
-diff -upr lirc-0.8.3.orig/remotes/iodata/lircd.conf.gvbctv5pci lirc-0.8.3/remotes/iodata/lircd.conf.gvbctv5pci
---- lirc-0.8.3.orig/remotes/iodata/lircd.conf.gvbctv5pci	2003-06-07 23:00:12.000000000 +0100
-+++ lirc-0.8.3/remotes/iodata/lircd.conf.gvbctv5pci	2008-08-12 16:14:40.000000000 +0100
+diff -Naurp lirc-0.8.4pre1.orig/remotes/iodata/lircd.conf.gvbctv5pci lirc-0.8.4pre1/remotes/iodata/lircd.conf.gvbctv5pci
+--- lirc-0.8.4pre1.orig/remotes/iodata/lircd.conf.gvbctv5pci	2003-06-07 18:00:12.000000000 -0400
++++ lirc-0.8.4pre1/remotes/iodata/lircd.conf.gvbctv5pci	2008-09-24 17:06:37.000000000 -0400
 @@ -26,41 +26,41 @@ begin remote
  
  
@@ -2436,9 +2311,9 @@ diff -upr lirc-0.8.3.orig/remotes/iodata/lircd.conf.gvbctv5pci lirc-0.8.3/remote
            SYNC                     0x0000000000000003
        end codes
  
-diff -upr lirc-0.8.3.orig/remotes/kanam_accent/lircd.conf.IR-100 lirc-0.8.3/remotes/kanam_accent/lircd.conf.IR-100
---- lirc-0.8.3.orig/remotes/kanam_accent/lircd.conf.IR-100	2007-02-13 04:18:53.000000000 +0000
-+++ lirc-0.8.3/remotes/kanam_accent/lircd.conf.IR-100	2008-08-12 16:14:40.000000000 +0100
+diff -Naurp lirc-0.8.4pre1.orig/remotes/kanam_accent/lircd.conf.IR-100 lirc-0.8.4pre1/remotes/kanam_accent/lircd.conf.IR-100
+--- lirc-0.8.4pre1.orig/remotes/kanam_accent/lircd.conf.IR-100	2007-02-12 23:18:53.000000000 -0500
++++ lirc-0.8.4pre1/remotes/kanam_accent/lircd.conf.IR-100	2008-09-24 17:06:37.000000000 -0400
 @@ -29,47 +29,47 @@ begin remote
  
  
@@ -2523,9 +2398,9 @@ diff -upr lirc-0.8.3.orig/remotes/kanam_accent/lircd.conf.IR-100 lirc-0.8.3/remo
        end codes
  
  end remote
-diff -upr lirc-0.8.3.orig/remotes/knc_one/lircd.conf.knc_one lirc-0.8.3/remotes/knc_one/lircd.conf.knc_one
---- lirc-0.8.3.orig/remotes/knc_one/lircd.conf.knc_one	2001-04-24 22:20:41.000000000 +0100
-+++ lirc-0.8.3/remotes/knc_one/lircd.conf.knc_one	2008-08-12 16:14:40.000000000 +0100
+diff -Naurp lirc-0.8.4pre1.orig/remotes/knc_one/lircd.conf.knc_one lirc-0.8.4pre1/remotes/knc_one/lircd.conf.knc_one
+--- lirc-0.8.4pre1.orig/remotes/knc_one/lircd.conf.knc_one	2001-04-24 17:20:41.000000000 -0400
++++ lirc-0.8.4pre1/remotes/knc_one/lircd.conf.knc_one	2008-09-24 17:06:37.000000000 -0400
 @@ -26,37 +26,37 @@ begin remote
  
        begin codes
@@ -2590,9 +2465,9 @@ diff -upr lirc-0.8.3.orig/remotes/knc_one/lircd.conf.knc_one lirc-0.8.3/remotes/
        end codes
  
  end remote
-diff -upr lirc-0.8.3.orig/remotes/kworld/lircd.conf.kworld lirc-0.8.3/remotes/kworld/lircd.conf.kworld
---- lirc-0.8.3.orig/remotes/kworld/lircd.conf.kworld	2005-04-01 21:28:05.000000000 +0100
-+++ lirc-0.8.3/remotes/kworld/lircd.conf.kworld	2008-08-12 16:14:40.000000000 +0100
+diff -Naurp lirc-0.8.4pre1.orig/remotes/kworld/lircd.conf.kworld lirc-0.8.4pre1/remotes/kworld/lircd.conf.kworld
+--- lirc-0.8.4pre1.orig/remotes/kworld/lircd.conf.kworld	2005-04-01 15:28:05.000000000 -0500
++++ lirc-0.8.4pre1/remotes/kworld/lircd.conf.kworld	2008-09-24 17:06:37.000000000 -0400
 @@ -29,36 +29,36 @@ begin remote
  
  
@@ -2651,9 +2526,9 @@ diff -upr lirc-0.8.3.orig/remotes/kworld/lircd.conf.kworld lirc-0.8.3/remotes/kw
            snapshot                 0x00000000000058A7
            mts                      0x000000000000B04F
            function-                0x00000000000020DF
-diff -upr lirc-0.8.3.orig/remotes/leadtek/lircd.conf.PVR2000 lirc-0.8.3/remotes/leadtek/lircd.conf.PVR2000
---- lirc-0.8.3.orig/remotes/leadtek/lircd.conf.PVR2000	2006-12-19 06:02:58.000000000 +0000
-+++ lirc-0.8.3/remotes/leadtek/lircd.conf.PVR2000	2008-08-12 16:14:39.000000000 +0100
+diff -Naurp lirc-0.8.4pre1.orig/remotes/leadtek/lircd.conf.PVR2000 lirc-0.8.4pre1/remotes/leadtek/lircd.conf.PVR2000
+--- lirc-0.8.4pre1.orig/remotes/leadtek/lircd.conf.PVR2000	2006-12-19 01:02:58.000000000 -0500
++++ lirc-0.8.4pre1/remotes/leadtek/lircd.conf.PVR2000	2008-09-24 17:06:37.000000000 -0400
 @@ -18,54 +18,54 @@ begin remote
    gap       120000
  
@@ -2746,9 +2621,9 @@ diff -upr lirc-0.8.3.orig/remotes/leadtek/lircd.conf.PVR2000 lirc-0.8.3/remotes/
            TIMESHIFT                0x0000000000000035
  
        end codes
-diff -upr lirc-0.8.3.orig/remotes/leadtek/lircd.conf.RM-0007 lirc-0.8.3/remotes/leadtek/lircd.conf.RM-0007
---- lirc-0.8.3.orig/remotes/leadtek/lircd.conf.RM-0007	2002-11-09 22:34:23.000000000 +0000
-+++ lirc-0.8.3/remotes/leadtek/lircd.conf.RM-0007	2008-08-12 16:14:39.000000000 +0100
+diff -Naurp lirc-0.8.4pre1.orig/remotes/leadtek/lircd.conf.RM-0007 lirc-0.8.4pre1/remotes/leadtek/lircd.conf.RM-0007
+--- lirc-0.8.4pre1.orig/remotes/leadtek/lircd.conf.RM-0007	2002-11-09 17:34:23.000000000 -0500
++++ lirc-0.8.4pre1/remotes/leadtek/lircd.conf.RM-0007	2008-09-24 17:06:37.000000000 -0400
 @@ -44,43 +44,43 @@ begin remote
  
        begin codes
@@ -2818,9 +2693,9 @@ diff -upr lirc-0.8.3.orig/remotes/leadtek/lircd.conf.RM-0007 lirc-0.8.3/remotes/
        end codes
  
  end remote
-diff -upr lirc-0.8.3.orig/remotes/leadtek/lircd.conf.RM-0010 lirc-0.8.3/remotes/leadtek/lircd.conf.RM-0010
---- lirc-0.8.3.orig/remotes/leadtek/lircd.conf.RM-0010	2006-03-21 07:11:14.000000000 +0000
-+++ lirc-0.8.3/remotes/leadtek/lircd.conf.RM-0010	2008-08-12 16:14:39.000000000 +0100
+diff -Naurp lirc-0.8.4pre1.orig/remotes/leadtek/lircd.conf.RM-0010 lirc-0.8.4pre1/remotes/leadtek/lircd.conf.RM-0010
+--- lirc-0.8.4pre1.orig/remotes/leadtek/lircd.conf.RM-0010	2006-03-21 02:11:14.000000000 -0500
++++ lirc-0.8.4pre1/remotes/leadtek/lircd.conf.RM-0010	2008-09-24 17:06:37.000000000 -0400
 @@ -43,69 +43,69 @@ begin remote
    duty_cycle   33
  
@@ -2930,9 +2805,9 @@ diff -upr lirc-0.8.3.orig/remotes/leadtek/lircd.conf.RM-0010 lirc-0.8.3/remotes/
        end codes
  
  end remote
-diff -upr lirc-0.8.3.orig/remotes/life-view/lircd.conf.flyvideo lirc-0.8.3/remotes/life-view/lircd.conf.flyvideo
---- lirc-0.8.3.orig/remotes/life-view/lircd.conf.flyvideo	2002-11-09 22:31:38.000000000 +0000
-+++ lirc-0.8.3/remotes/life-view/lircd.conf.flyvideo	2008-08-12 16:14:40.000000000 +0100
+diff -Naurp lirc-0.8.4pre1.orig/remotes/life-view/lircd.conf.flyvideo lirc-0.8.4pre1/remotes/life-view/lircd.conf.flyvideo
+--- lirc-0.8.4pre1.orig/remotes/life-view/lircd.conf.flyvideo	2002-11-09 17:31:38.000000000 -0500
++++ lirc-0.8.4pre1/remotes/life-view/lircd.conf.flyvideo	2008-09-24 17:06:37.000000000 -0400
 @@ -35,50 +35,50 @@ begin remote
    duty_cycle   33
  
@@ -3013,9 +2888,9 @@ diff -upr lirc-0.8.3.orig/remotes/life-view/lircd.conf.flyvideo lirc-0.8.3/remot
   
        end codes
  
-diff -upr lirc-0.8.3.orig/remotes/logitech/lircd.conf.logitech lirc-0.8.3/remotes/logitech/lircd.conf.logitech
---- lirc-0.8.3.orig/remotes/logitech/lircd.conf.logitech	2000-01-18 19:10:08.000000000 +0000
-+++ lirc-0.8.3/remotes/logitech/lircd.conf.logitech	2008-08-12 16:14:40.000000000 +0100
+diff -Naurp lirc-0.8.4pre1.orig/remotes/logitech/lircd.conf.logitech lirc-0.8.4pre1/remotes/logitech/lircd.conf.logitech
+--- lirc-0.8.4pre1.orig/remotes/logitech/lircd.conf.logitech	2000-01-18 14:10:08.000000000 -0500
++++ lirc-0.8.4pre1/remotes/logitech/lircd.conf.logitech	2008-09-24 17:06:37.000000000 -0400
 @@ -23,41 +23,41 @@ begin remote
    repeat_bit      0
  
@@ -3085,9 +2960,9 @@ diff -upr lirc-0.8.3.orig/remotes/logitech/lircd.conf.logitech lirc-0.8.3/remote
            MOUSE_N		   0x0000000000000040
            MOUSE_NNE		   0x0000000000000041
            MOUSE_NE		   0x0000000000000042
-diff -upr lirc-0.8.3.orig/remotes/mceusb/lircd.conf.mceusb lirc-0.8.3/remotes/mceusb/lircd.conf.mceusb
---- lirc-0.8.3.orig/remotes/mceusb/lircd.conf.mceusb	2007-11-01 13:08:33.000000000 +0000
-+++ lirc-0.8.3/remotes/mceusb/lircd.conf.mceusb	2008-08-12 16:14:39.000000000 +0100
+diff -Naurp lirc-0.8.4pre1.orig/remotes/mceusb/lircd.conf.mceusb lirc-0.8.4pre1/remotes/mceusb/lircd.conf.mceusb
+--- lirc-0.8.4pre1.orig/remotes/mceusb/lircd.conf.mceusb	2007-11-01 09:08:33.000000000 -0400
++++ lirc-0.8.4pre1/remotes/mceusb/lircd.conf.mceusb	2008-09-24 17:06:37.000000000 -0400
 @@ -58,10 +58,10 @@ begin remote
        begin codes
  
@@ -3232,9 +3107,9 @@ diff -upr lirc-0.8.3.orig/remotes/mceusb/lircd.conf.mceusb lirc-0.8.3/remotes/mc
        end codes
  
  end remote
-diff -upr lirc-0.8.3.orig/remotes/packard_bell/lircd.conf.packard_bell lirc-0.8.3/remotes/packard_bell/lircd.conf.packard_bell
---- lirc-0.8.3.orig/remotes/packard_bell/lircd.conf.packard_bell	2001-04-24 20:26:56.000000000 +0100
-+++ lirc-0.8.3/remotes/packard_bell/lircd.conf.packard_bell	2008-08-12 16:14:40.000000000 +0100
+diff -Naurp lirc-0.8.4pre1.orig/remotes/packard_bell/lircd.conf.packard_bell lirc-0.8.4pre1/remotes/packard_bell/lircd.conf.packard_bell
+--- lirc-0.8.4pre1.orig/remotes/packard_bell/lircd.conf.packard_bell	2001-04-24 15:26:56.000000000 -0400
++++ lirc-0.8.4pre1/remotes/packard_bell/lircd.conf.packard_bell	2008-09-24 17:06:37.000000000 -0400
 @@ -53,38 +53,38 @@ begin remote
    repeat          9050 2250
   
@@ -3299,9 +3174,9 @@ diff -upr lirc-0.8.3.orig/remotes/packard_bell/lircd.conf.packard_bell lirc-0.8.
            Star                     0x0000000000007F80
            Hash                     0x0000000000006B94
        end codes
-diff -upr lirc-0.8.3.orig/remotes/pcmak/lircd.conf.pcmak lirc-0.8.3/remotes/pcmak/lircd.conf.pcmak
---- lirc-0.8.3.orig/remotes/pcmak/lircd.conf.pcmak	2004-07-24 16:36:15.000000000 +0100
-+++ lirc-0.8.3/remotes/pcmak/lircd.conf.pcmak	2008-08-12 16:14:40.000000000 +0100
+diff -Naurp lirc-0.8.4pre1.orig/remotes/pcmak/lircd.conf.pcmak lirc-0.8.4pre1/remotes/pcmak/lircd.conf.pcmak
+--- lirc-0.8.4pre1.orig/remotes/pcmak/lircd.conf.pcmak	2004-07-24 11:36:15.000000000 -0400
++++ lirc-0.8.4pre1/remotes/pcmak/lircd.conf.pcmak	2008-09-24 17:06:37.000000000 -0400
 @@ -23,18 +23,18 @@ begin remote
    repeat_bit      0
  
@@ -3445,9 +3320,9 @@ diff -upr lirc-0.8.3.orig/remotes/pcmak/lircd.conf.pcmak lirc-0.8.3/remotes/pcma
        end codes
  
  end remote
-diff -upr lirc-0.8.3.orig/remotes/pinnacle_systems/lircd.conf.pctv lirc-0.8.3/remotes/pinnacle_systems/lircd.conf.pctv
---- lirc-0.8.3.orig/remotes/pinnacle_systems/lircd.conf.pctv	2007-10-06 16:40:53.000000000 +0100
-+++ lirc-0.8.3/remotes/pinnacle_systems/lircd.conf.pctv	2008-08-12 16:14:40.000000000 +0100
+diff -Naurp lirc-0.8.4pre1.orig/remotes/pinnacle_systems/lircd.conf.pctv lirc-0.8.4pre1/remotes/pinnacle_systems/lircd.conf.pctv
+--- lirc-0.8.4pre1.orig/remotes/pinnacle_systems/lircd.conf.pctv	2007-10-06 11:40:53.000000000 -0400
++++ lirc-0.8.4pre1/remotes/pinnacle_systems/lircd.conf.pctv	2008-09-24 17:06:37.000000000 -0400
 @@ -24,30 +24,30 @@ begin remote
    toggle_bit         0
  
@@ -3547,9 +3422,9 @@ diff -upr lirc-0.8.3.orig/remotes/pinnacle_systems/lircd.conf.pctv lirc-0.8.3/re
            middle                   0x0000000000000014
  
  
-diff -upr lirc-0.8.3.orig/remotes/pixelview/lircd.conf.playtv lirc-0.8.3/remotes/pixelview/lircd.conf.playtv
---- lirc-0.8.3.orig/remotes/pixelview/lircd.conf.playtv	1999-08-04 20:18:27.000000000 +0100
-+++ lirc-0.8.3/remotes/pixelview/lircd.conf.playtv	2008-08-12 16:14:40.000000000 +0100
+diff -Naurp lirc-0.8.4pre1.orig/remotes/pixelview/lircd.conf.playtv lirc-0.8.4pre1/remotes/pixelview/lircd.conf.playtv
+--- lirc-0.8.4pre1.orig/remotes/pixelview/lircd.conf.playtv	1999-08-04 15:18:27.000000000 -0400
++++ lirc-0.8.4pre1/remotes/pixelview/lircd.conf.playtv	2008-09-24 17:06:37.000000000 -0400
 @@ -13,22 +13,22 @@ begin remote
    begin codes
      TV/FM                    0x00000000000000e7
@@ -3588,9 +3463,9 @@ diff -upr lirc-0.8.3.orig/remotes/pixelview/lircd.conf.playtv lirc-0.8.3/remotes
    end codes
  end remote
  
-diff -upr lirc-0.8.3.orig/remotes/pixelview/lircd.conf.playtv_bt878 lirc-0.8.3/remotes/pixelview/lircd.conf.playtv_bt878
---- lirc-0.8.3.orig/remotes/pixelview/lircd.conf.playtv_bt878	2000-09-30 20:32:40.000000000 +0100
-+++ lirc-0.8.3/remotes/pixelview/lircd.conf.playtv_bt878	2008-08-12 16:14:40.000000000 +0100
+diff -Naurp lirc-0.8.4pre1.orig/remotes/pixelview/lircd.conf.playtv_bt878 lirc-0.8.4pre1/remotes/pixelview/lircd.conf.playtv_bt878
+--- lirc-0.8.4pre1.orig/remotes/pixelview/lircd.conf.playtv_bt878	2000-09-30 15:32:40.000000000 -0400
++++ lirc-0.8.4pre1/remotes/pixelview/lircd.conf.playtv_bt878	2008-09-24 17:06:37.000000000 -0400
 @@ -16,39 +16,39 @@ begin remote
    repeat_bit 0
  
@@ -3657,9 +3532,9 @@ diff -upr lirc-0.8.3.orig/remotes/pixelview/lircd.conf.playtv_bt878 lirc-0.8.3/r
    end codes
  end remote
  
-diff -upr lirc-0.8.3.orig/remotes/pixelview/lircd.conf.playtv_pro lirc-0.8.3/remotes/pixelview/lircd.conf.playtv_pro
---- lirc-0.8.3.orig/remotes/pixelview/lircd.conf.playtv_pro	2005-12-10 13:09:13.000000000 +0000
-+++ lirc-0.8.3/remotes/pixelview/lircd.conf.playtv_pro	2008-08-12 16:14:40.000000000 +0100
+diff -Naurp lirc-0.8.4pre1.orig/remotes/pixelview/lircd.conf.playtv_pro lirc-0.8.4pre1/remotes/pixelview/lircd.conf.playtv_pro
+--- lirc-0.8.4pre1.orig/remotes/pixelview/lircd.conf.playtv_pro	2005-12-10 08:09:13.000000000 -0500
++++ lirc-0.8.4pre1/remotes/pixelview/lircd.conf.playtv_pro	2008-09-24 17:06:37.000000000 -0400
 @@ -31,15 +31,15 @@ begin remote
  
        begin codes
@@ -3710,9 +3585,9 @@ diff -upr lirc-0.8.3.orig/remotes/pixelview/lircd.conf.playtv_pro lirc-0.8.3/rem
  
        end codes
  
-diff -upr lirc-0.8.3.orig/remotes/pixelview/lircd.conf.remotemaster lirc-0.8.3/remotes/pixelview/lircd.conf.remotemaster
---- lirc-0.8.3.orig/remotes/pixelview/lircd.conf.remotemaster	2000-02-07 11:03:20.000000000 +0000
-+++ lirc-0.8.3/remotes/pixelview/lircd.conf.remotemaster	2008-08-12 16:14:40.000000000 +0100
+diff -Naurp lirc-0.8.4pre1.orig/remotes/pixelview/lircd.conf.remotemaster lirc-0.8.4pre1/remotes/pixelview/lircd.conf.remotemaster
+--- lirc-0.8.4pre1.orig/remotes/pixelview/lircd.conf.remotemaster	2000-02-07 06:03:20.000000000 -0500
++++ lirc-0.8.4pre1/remotes/pixelview/lircd.conf.remotemaster	2008-09-24 17:06:37.000000000 -0400
 @@ -25,39 +25,39 @@ begin remote
    gap          189264
  
@@ -3780,9 +3655,9 @@ diff -upr lirc-0.8.3.orig/remotes/pixelview/lircd.conf.remotemaster lirc-0.8.3/r
        end codes
  
  end remote
-diff -upr lirc-0.8.3.orig/remotes/provideo/lircd.conf.pv951 lirc-0.8.3/remotes/provideo/lircd.conf.pv951
---- lirc-0.8.3.orig/remotes/provideo/lircd.conf.pv951	2001-01-20 13:32:00.000000000 +0000
-+++ lirc-0.8.3/remotes/provideo/lircd.conf.pv951	2008-08-12 16:14:40.000000000 +0100
+diff -Naurp lirc-0.8.4pre1.orig/remotes/provideo/lircd.conf.pv951 lirc-0.8.4pre1/remotes/provideo/lircd.conf.pv951
+--- lirc-0.8.4pre1.orig/remotes/provideo/lircd.conf.pv951	2001-01-20 08:32:00.000000000 -0500
++++ lirc-0.8.4pre1/remotes/provideo/lircd.conf.pv951	2008-09-24 17:06:37.000000000 -0400
 @@ -31,28 +31,28 @@ begin remote
    repeat_bit      0
  
@@ -3828,9 +3703,9 @@ diff -upr lirc-0.8.3.orig/remotes/provideo/lircd.conf.pv951 lirc-0.8.3/remotes/p
            func                     0x0000000000009867
            ttx                      0x000000000000B04F
            pg+                      0x000000000000708F
-diff -upr lirc-0.8.3.orig/remotes/remotec/lircd.conf.BW6130 lirc-0.8.3/remotes/remotec/lircd.conf.BW6130
---- lirc-0.8.3.orig/remotes/remotec/lircd.conf.BW6130	2005-05-28 15:29:27.000000000 +0100
-+++ lirc-0.8.3/remotes/remotec/lircd.conf.BW6130	2008-08-12 16:14:39.000000000 +0100
+diff -Naurp lirc-0.8.4pre1.orig/remotes/remotec/lircd.conf.BW6130 lirc-0.8.4pre1/remotes/remotec/lircd.conf.BW6130
+--- lirc-0.8.4pre1.orig/remotes/remotec/lircd.conf.BW6130	2005-05-28 10:29:27.000000000 -0400
++++ lirc-0.8.4pre1/remotes/remotec/lircd.conf.BW6130	2008-09-24 17:06:37.000000000 -0400
 @@ -20,20 +20,20 @@ begin remote
    toggle_bit     0
  
@@ -3866,9 +3741,9 @@ diff -upr lirc-0.8.3.orig/remotes/remotec/lircd.conf.BW6130 lirc-0.8.3/remotes/r
  	MOUSE_SLOW_N		0x95
  	MOUSE_SLOW_NNE		0xd1
  	MOUSE_SLOW_NE		0xcd
-diff -upr lirc-0.8.3.orig/remotes/samsung/lircd.conf.samsung lirc-0.8.3/remotes/samsung/lircd.conf.samsung
---- lirc-0.8.3.orig/remotes/samsung/lircd.conf.samsung	2008-03-02 19:18:40.000000000 +0000
-+++ lirc-0.8.3/remotes/samsung/lircd.conf.samsung	2008-08-12 16:14:39.000000000 +0100
+diff -Naurp lirc-0.8.4pre1.orig/remotes/samsung/lircd.conf.samsung lirc-0.8.4pre1/remotes/samsung/lircd.conf.samsung
+--- lirc-0.8.4pre1.orig/remotes/samsung/lircd.conf.samsung	2008-03-02 14:18:40.000000000 -0500
++++ lirc-0.8.4pre1/remotes/samsung/lircd.conf.samsung	2008-09-24 17:06:37.000000000 -0400
 @@ -28,60 +28,60 @@ begin remote
  
        begin codes
@@ -3974,9 +3849,9 @@ diff -upr lirc-0.8.3.orig/remotes/samsung/lircd.conf.samsung lirc-0.8.3/remotes/
        end codes
  
  end remote
-diff -upr lirc-0.8.3.orig/remotes/sasem/lircd.conf.sasem lirc-0.8.3/remotes/sasem/lircd.conf.sasem
---- lirc-0.8.3.orig/remotes/sasem/lircd.conf.sasem	2005-07-15 12:24:55.000000000 +0100
-+++ lirc-0.8.3/remotes/sasem/lircd.conf.sasem	2008-08-12 16:14:40.000000000 +0100
+diff -Naurp lirc-0.8.4pre1.orig/remotes/sasem/lircd.conf.sasem lirc-0.8.4pre1/remotes/sasem/lircd.conf.sasem
+--- lirc-0.8.4pre1.orig/remotes/sasem/lircd.conf.sasem	2005-07-15 07:24:55.000000000 -0400
++++ lirc-0.8.4pre1/remotes/sasem/lircd.conf.sasem	2008-09-24 17:06:37.000000000 -0400
 @@ -33,47 +33,47 @@ begin remote
  
  
@@ -4057,9 +3932,9 @@ diff -upr lirc-0.8.3.orig/remotes/sasem/lircd.conf.sasem lirc-0.8.3/remotes/sase
        end codes
  
  end remote
-diff -upr lirc-0.8.3.orig/remotes/sigma_designs/lircd.conf.realmagic lirc-0.8.3/remotes/sigma_designs/lircd.conf.realmagic
---- lirc-0.8.3.orig/remotes/sigma_designs/lircd.conf.realmagic	2006-04-29 12:01:50.000000000 +0100
-+++ lirc-0.8.3/remotes/sigma_designs/lircd.conf.realmagic	2008-08-12 16:14:39.000000000 +0100
+diff -Naurp lirc-0.8.4pre1.orig/remotes/sigma_designs/lircd.conf.realmagic lirc-0.8.4pre1/remotes/sigma_designs/lircd.conf.realmagic
+--- lirc-0.8.4pre1.orig/remotes/sigma_designs/lircd.conf.realmagic	2006-04-29 07:01:50.000000000 -0400
++++ lirc-0.8.4pre1/remotes/sigma_designs/lircd.conf.realmagic	2008-09-24 17:06:37.000000000 -0400
 @@ -30,43 +30,43 @@ begin remote
  
        begin codes
@@ -4136,9 +4011,9 @@ diff -upr lirc-0.8.3.orig/remotes/sigma_designs/lircd.conf.realmagic lirc-0.8.3/
        end codes
  
  end remote
-diff -upr lirc-0.8.3.orig/remotes/silitek/lircd.conf.silitek lirc-0.8.3/remotes/silitek/lircd.conf.silitek
---- lirc-0.8.3.orig/remotes/silitek/lircd.conf.silitek	2001-04-24 20:36:10.000000000 +0100
-+++ lirc-0.8.3/remotes/silitek/lircd.conf.silitek	2008-08-12 16:14:39.000000000 +0100
+diff -Naurp lirc-0.8.4pre1.orig/remotes/silitek/lircd.conf.silitek lirc-0.8.4pre1/remotes/silitek/lircd.conf.silitek
+--- lirc-0.8.4pre1.orig/remotes/silitek/lircd.conf.silitek	2001-04-24 15:36:10.000000000 -0400
++++ lirc-0.8.4pre1/remotes/silitek/lircd.conf.silitek	2008-09-24 17:06:37.000000000 -0400
 @@ -30,68 +30,68 @@ begin remote
      MOUSE_SSE                0x0000000000aa0004
      MOUSE_SE                 0x0000000000aa0003
@@ -4256,9 +4131,9 @@ diff -upr lirc-0.8.3.orig/remotes/silitek/lircd.conf.silitek lirc-0.8.3/remotes/
 +    KEY_CLOSE                 0x0000000000cc5d62
    end codes
  end remote
-diff -upr lirc-0.8.3.orig/remotes/streamzap/lircd.conf.streamzap lirc-0.8.3/remotes/streamzap/lircd.conf.streamzap
---- lirc-0.8.3.orig/remotes/streamzap/lircd.conf.streamzap	2005-02-12 14:20:23.000000000 +0000
-+++ lirc-0.8.3/remotes/streamzap/lircd.conf.streamzap	2008-08-12 16:14:40.000000000 +0100
+diff -Naurp lirc-0.8.4pre1.orig/remotes/streamzap/lircd.conf.streamzap lirc-0.8.4pre1/remotes/streamzap/lircd.conf.streamzap
+--- lirc-0.8.4pre1.orig/remotes/streamzap/lircd.conf.streamzap	2005-02-12 09:20:23.000000000 -0500
++++ lirc-0.8.4pre1/remotes/streamzap/lircd.conf.streamzap	2008-09-24 17:06:37.000000000 -0400
 @@ -27,41 +27,41 @@ begin remote
  
  
@@ -4334,9 +4209,9 @@ diff -upr lirc-0.8.3.orig/remotes/streamzap/lircd.conf.streamzap lirc-0.8.3/remo
        end codes
  
  end remote
-diff -upr lirc-0.8.3.orig/remotes/technisat/lircd.conf.mediafocusI lirc-0.8.3/remotes/technisat/lircd.conf.mediafocusI
---- lirc-0.8.3.orig/remotes/technisat/lircd.conf.mediafocusI	2001-02-04 13:38:09.000000000 +0000
-+++ lirc-0.8.3/remotes/technisat/lircd.conf.mediafocusI	2008-08-12 16:14:39.000000000 +0100
+diff -Naurp lirc-0.8.4pre1.orig/remotes/technisat/lircd.conf.mediafocusI lirc-0.8.4pre1/remotes/technisat/lircd.conf.mediafocusI
+--- lirc-0.8.4pre1.orig/remotes/technisat/lircd.conf.mediafocusI	2001-02-04 08:38:09.000000000 -0500
++++ lirc-0.8.4pre1/remotes/technisat/lircd.conf.mediafocusI	2008-09-24 17:06:37.000000000 -0400
 @@ -30,11 +30,11 @@ begin remote
    duty_cycle   33
  
@@ -4354,9 +4229,9 @@ diff -upr lirc-0.8.3.orig/remotes/technisat/lircd.conf.mediafocusI lirc-0.8.3/re
        end codes
  
  end remote
-diff -upr lirc-0.8.3.orig/remotes/tekram/lircd.conf.m230 lirc-0.8.3/remotes/tekram/lircd.conf.m230
---- lirc-0.8.3.orig/remotes/tekram/lircd.conf.m230	2002-03-28 21:26:54.000000000 +0000
-+++ lirc-0.8.3/remotes/tekram/lircd.conf.m230	2008-08-12 16:14:39.000000000 +0100
+diff -Naurp lirc-0.8.4pre1.orig/remotes/tekram/lircd.conf.m230 lirc-0.8.4pre1/remotes/tekram/lircd.conf.m230
+--- lirc-0.8.4pre1.orig/remotes/tekram/lircd.conf.m230	2002-03-28 16:26:54.000000000 -0500
++++ lirc-0.8.4pre1/remotes/tekram/lircd.conf.m230	2008-09-24 17:06:37.000000000 -0400
 @@ -13,36 +13,36 @@ begin remote
    name  M230
    bits  8
@@ -4417,9 +4292,9 @@ diff -upr lirc-0.8.3.orig/remotes/tekram/lircd.conf.m230 lirc-0.8.3/remotes/tekr
 +	KEY_KPMINUS		0x0C
       end codes
  end remote
-diff -upr lirc-0.8.3.orig/remotes/vlsystem/lircd.conf.mplay lirc-0.8.3/remotes/vlsystem/lircd.conf.mplay
---- lirc-0.8.3.orig/remotes/vlsystem/lircd.conf.mplay	2007-12-22 12:33:17.000000000 +0000
-+++ lirc-0.8.3/remotes/vlsystem/lircd.conf.mplay	2008-08-12 16:14:40.000000000 +0100
+diff -Naurp lirc-0.8.4pre1.orig/remotes/vlsystem/lircd.conf.mplay lirc-0.8.4pre1/remotes/vlsystem/lircd.conf.mplay
+--- lirc-0.8.4pre1.orig/remotes/vlsystem/lircd.conf.mplay	2007-12-22 07:33:17.000000000 -0500
++++ lirc-0.8.4pre1/remotes/vlsystem/lircd.conf.mplay	2008-09-24 17:06:37.000000000 -0400
 @@ -27,42 +27,42 @@ begin remote
            Movies                   0x40
            Television               0x46
@@ -4492,9 +4367,9 @@ diff -upr lirc-0.8.3.orig/remotes/vlsystem/lircd.conf.mplay lirc-0.8.3/remotes/v
            DVD_Zoom                 0x14
            Detail                   0x4b
        end codes
-diff -upr lirc-0.8.3.orig/remotes/x10/lircd.conf.mouseremote lirc-0.8.3/remotes/x10/lircd.conf.mouseremote
---- lirc-0.8.3.orig/remotes/x10/lircd.conf.mouseremote	2005-01-22 10:40:43.000000000 +0000
-+++ lirc-0.8.3/remotes/x10/lircd.conf.mouseremote	2008-08-12 16:14:40.000000000 +0100
+diff -Naurp lirc-0.8.4pre1.orig/remotes/x10/lircd.conf.mouseremote lirc-0.8.4pre1/remotes/x10/lircd.conf.mouseremote
+--- lirc-0.8.4pre1.orig/remotes/x10/lircd.conf.mouseremote	2005-01-22 05:40:43.000000000 -0500
++++ lirc-0.8.4pre1/remotes/x10/lircd.conf.mouseremote	2008-09-24 17:06:37.000000000 -0400
 @@ -24,42 +24,42 @@ begin remote
    gap		140000
  
@@ -4577,9 +4452,9 @@ diff -upr lirc-0.8.3.orig/remotes/x10/lircd.conf.mouseremote lirc-0.8.3/remotes/
  	end codes	
  
  end remote
-diff -upr lirc-0.8.3.orig/remotes/x10/lircd.conf.mp3anywhere lirc-0.8.3/remotes/x10/lircd.conf.mp3anywhere
---- lirc-0.8.3.orig/remotes/x10/lircd.conf.mp3anywhere	2007-07-01 08:09:11.000000000 +0100
-+++ lirc-0.8.3/remotes/x10/lircd.conf.mp3anywhere	2008-08-12 16:14:40.000000000 +0100
+diff -Naurp lirc-0.8.4pre1.orig/remotes/x10/lircd.conf.mp3anywhere lirc-0.8.4pre1/remotes/x10/lircd.conf.mp3anywhere
+--- lirc-0.8.4pre1.orig/remotes/x10/lircd.conf.mp3anywhere	2007-07-01 03:09:11.000000000 -0400
++++ lirc-0.8.4pre1/remotes/x10/lircd.conf.mp3anywhere	2008-09-24 17:06:37.000000000 -0400
 @@ -22,43 +22,43 @@ begin remote
    gap		140000
  
diff --git a/lirc-use-new-instead-of-conf-as-filename-suffix.patch b/lirc-use-new-instead-of-conf-as-filename-suffix.patch
index 54d9ba9..2731eb6 100644
--- a/lirc-use-new-instead-of-conf-as-filename-suffix.patch
+++ b/lirc-use-new-instead-of-conf-as-filename-suffix.patch
@@ -6,23 +6,15 @@ Subject: Use '.new' instead of '.conf' as filename suffix in template mode,
  to prevent a buffer overrun for 'argv[optind]'.
 
 ---
- daemons/irrecord.c |    3 ++-
- 1 files changed, 2 insertions(+), 1 deletions(-)
-
-diff --git a/daemons/irrecord.c b/daemons/irrecord.c
-index ea298e3..df03c7b 100644
---- a/daemons/irrecord.c
-+++ b/daemons/irrecord.c
-@@ -364,7 +364,7 @@ int main(int argc,char **argv)
+diff -Naurp lirc.orig/daemons/irrecord.c lirc/daemons/irrecord.c
+--- lirc.orig/daemons/irrecord.c	2008-08-27 13:04:46.000000000 -0400
++++ lirc/daemons/irrecord.c		2008-09-24 17:01:37.000000000 -0400
+@@ -493,7 +493,7 @@ int main(int argc,char **argv)
  			exit(EXIT_FAILURE);
  		}
  		strcpy(filename_new, filename);
 -		strcat(filename_new, ".conf");
-+		strcat(filename_new,".new");
-		filename = filename_new;
++		strcat(filename_new, ".new");
+ 		filename = filename_new;
  	}
- 	fout=fopen(filename,"w");
- 	if(fout==NULL)
--- 
-1.5.3.7
-
+ 	else
diff --git a/lirc.spec b/lirc.spec
index 56c25ca..f049f92 100644
--- a/lirc.spec
+++ b/lirc.spec
@@ -14,29 +14,26 @@
 %bcond_with     portaudio
 %bcond_with     svgalib
 %bcond_without  x
-#define pre     pre3
+%define pre     pre1
 
 Name:           lirc
-Version:        0.8.3
-Release:        7%{?pre:.%{pre}}%{?dist}
+Version:        0.8.4
+Release:        0.1%{?pre:.%{pre}}%{?dist}
 Summary:        The Linux Infrared Remote Control package
 
 Group:          System Environment/Daemons
 License:        GPLv2+
 URL:            http://www.lirc.org/
-Source0:        http://downloads.sourceforge.net/lirc/%{name}-%{version}.tar.bz2
-#Source0:        http://lirc.sourceforge.net/software/snapshots/%{name}-%{version}%{pre}.tar.bz2
+#Source0:        http://downloads.sourceforge.net/lirc/%{name}-%{version}.tar.bz2
+Source0:        http://lirc.sourceforge.net/software/snapshots/%{name}-%{version}%{pre}.tar.bz2
 Source1:        %{name}.init
 Source2:        %{name}.sysconfig
-Patch0:         lirc-0.8.3-remote-includes-directive.patch
-Patch1:         lirc-0.8.3-validate-transmit-buffer.patch
-Patch2:         lirc-use-new-instead-of-conf-as-filename-suffix.patch
+# temporary, was accidentally left out of 0.8.4pre1 tarball
+Source3:        hw_commandir.h
+Patch0:         lirc-use-new-instead-of-conf-as-filename-suffix.patch
 # https://bugzilla.redhat.com/show_bug.cgi?id=457273
 # http://thread.gmane.org/gmane.comp.hardware.lirc/6884
-Patch3:		lirc-0.8.3-fix-remote-keycodes.patch
-# https://bugzilla.redhat.com/show_bug.cgi?id=440231
-# http://thread.gmane.org/gmane.comp.hardware.lirc/6889
-Patch4:		lirc-dont-exit.patch
+Patch1:		lirc-0.8.4-standardize-remote-keycodes.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  %{__perl}
@@ -120,10 +117,8 @@ of remote control configuration files.
 
 %prep
 %setup -q -n %{name}-%{version}%{?pre}
-%patch0 -p1 -b .incl
-%patch1 -p1 -b .xbuf
-%patch2 -p1 -b .suf
-%patch4 -p0 -b .exit
+%patch0 -p1 -b .suf
+cp %{SOURCE3} daemons/
 
 chmod 644 contrib/*
 
@@ -156,7 +151,7 @@ sed -i -e 's/vga.h/SVGALIB_DISABLED/g' configure*
 touch -r aclocal.m4 configure.ac # avoid autofoo re-run
 
 # Do this after, as we're touching the remote definitions earlier
-%patch3 -p1 -b .keycode
+%patch1 -p1 -b .keycode
 
 %build
 %configure \
@@ -268,6 +263,11 @@ fi
 
 
 %changelog
+* Wed Sep 24 2008 - Jarod Wilson <jarod@redhat.com> - 0.8.4-0.1.pre1
+- Update to 0.8.4pre1
+- Drop upstream patches
+- Adds support for the CommandIR II userspace driver
+
 * Tue Sep 16 2008 - Jarod Wilson <jarod@redhat.com> - 0.8.3-7
 - Fix multilib upgrade path from F8 (Nicolas Chauvet, #462435)
 
diff --git a/sources b/sources
index d3ad5e4..d5df52c 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-8e78eeded7b31e5ad02e328970437c0f  lirc-0.8.3.tar.bz2
+b79601ea90fa552653dfc69e29fd5c4d  lirc-0.8.4pre1.tar.bz2

From a685ff5cb5828b73188610f88e3506089bf87fb2 Mon Sep 17 00:00:00 2001
From: Bastien Nocera <hadess@fedoraproject.org>
Date: Wed, 1 Oct 2008 11:07:03 +0000
Subject: [PATCH 046/204] - Don't create a backup for the keycodes patch, or
 all the original files     will also get installed, and get used in
 gnome-lirc-properties

---
 lirc.spec | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/lirc.spec b/lirc.spec
index f049f92..f4d436a 100644
--- a/lirc.spec
+++ b/lirc.spec
@@ -18,7 +18,7 @@
 
 Name:           lirc
 Version:        0.8.4
-Release:        0.1%{?pre:.%{pre}}%{?dist}
+Release:        0.2%{?pre:.%{pre}}%{?dist}
 Summary:        The Linux Infrared Remote Control package
 
 Group:          System Environment/Daemons
@@ -151,7 +151,8 @@ sed -i -e 's/vga.h/SVGALIB_DISABLED/g' configure*
 touch -r aclocal.m4 configure.ac # avoid autofoo re-run
 
 # Do this after, as we're touching the remote definitions earlier
-%patch1 -p1 -b .keycode
+# Don't create a backup, or the original definitions will get installed
+%patch1 -p1
 
 %build
 %configure \
@@ -263,6 +264,10 @@ fi
 
 
 %changelog
+* Wed Oct 01 2008 - Bastien Nocera <bnocera@redhat.com> - 0.8.4-0.2.pre1
+- Don't create a backup for the keycodes patch, or all the original files
+  will also get installed, and get used in gnome-lirc-properties
+
 * Wed Sep 24 2008 - Jarod Wilson <jarod@redhat.com> - 0.8.4-0.1.pre1
 - Update to 0.8.4pre1
 - Drop upstream patches

From 25e2b6261bc1f4338c9510d1a4ed64d8df0c7f7e Mon Sep 17 00:00:00 2001
From: Bastien Nocera <hadess@fedoraproject.org>
Date: Mon, 6 Oct 2008 08:24:02 +0000
Subject: [PATCH 047/204] - Fix more keycodes for the streamzap remote

---
 lirc-streamzap-prev-next.patch | 13 +++++++++++++
 lirc.spec                      |  7 ++++++-
 2 files changed, 19 insertions(+), 1 deletion(-)
 create mode 100644 lirc-streamzap-prev-next.patch

diff --git a/lirc-streamzap-prev-next.patch b/lirc-streamzap-prev-next.patch
new file mode 100644
index 0000000..daef5f4
--- /dev/null
+++ b/lirc-streamzap-prev-next.patch
@@ -0,0 +1,13 @@
+--- lirc-0.8.4pre1.orig/remotes/streamzap/lircd.conf.streamzap	2008-10-01 12:09:37.000000000 +0100
++++ lirc-0.8.4pre1/remotes/streamzap/lircd.conf.streamzap	2008-10-06 09:08:57.000000000 +0100
+@@ -53,8 +53,8 @@ begin remote
+           KEY_PLAY                     0x17
+           KEY_PAUSE                    0x18
+           KEY_STOP                     0x19
+-          |<<                      0x1A
+-          >>|                      0x1B
++          KEY_PREVIOUS                      0x1A
++          KEY_NEXT                      0x1B
+           KEY_RECORD                   0x1C
+           KEY_REWIND                       0x1D
+           KEY_FORWARD                       0x1E
diff --git a/lirc.spec b/lirc.spec
index f4d436a..03bb9f8 100644
--- a/lirc.spec
+++ b/lirc.spec
@@ -18,7 +18,7 @@
 
 Name:           lirc
 Version:        0.8.4
-Release:        0.2%{?pre:.%{pre}}%{?dist}
+Release:        0.3%{?pre:.%{pre}}%{?dist}
 Summary:        The Linux Infrared Remote Control package
 
 Group:          System Environment/Daemons
@@ -34,6 +34,7 @@ Patch0:         lirc-use-new-instead-of-conf-as-filename-suffix.patch
 # https://bugzilla.redhat.com/show_bug.cgi?id=457273
 # http://thread.gmane.org/gmane.comp.hardware.lirc/6884
 Patch1:		lirc-0.8.4-standardize-remote-keycodes.patch
+Patch2:		lirc-streamzap-prev-next.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  %{__perl}
@@ -153,6 +154,7 @@ touch -r aclocal.m4 configure.ac # avoid autofoo re-run
 # Do this after, as we're touching the remote definitions earlier
 # Don't create a backup, or the original definitions will get installed
 %patch1 -p1
+%patch2 -p1
 
 %build
 %configure \
@@ -264,6 +266,9 @@ fi
 
 
 %changelog
+* Mon Oct 06 2008 - Bastien Nocera <bnocera@redhat.com> - 0.8.4-0.3.pre1
+- Fix more keycodes for the streamzap remote
+
 * Wed Oct 01 2008 - Bastien Nocera <bnocera@redhat.com> - 0.8.4-0.2.pre1
 - Don't create a backup for the keycodes patch, or all the original files
   will also get installed, and get used in gnome-lirc-properties

From 6cab3895aaf927e34c2c2d12e3fcc5f2f7b88f04 Mon Sep 17 00:00:00 2001
From: Jarod Wilson <jwilson@fedoraproject.org>
Date: Mon, 6 Oct 2008 13:08:40 +0000
Subject: [PATCH 048/204] - Update to 0.8.4pre2

---
 .cvsignore     |   1 +
 hw_commandir.h | 175 -------------------------------------------------
 lirc.spec      |  10 +--
 sources        |   2 +-
 4 files changed, 7 insertions(+), 181 deletions(-)
 delete mode 100644 hw_commandir.h

diff --git a/.cvsignore b/.cvsignore
index ea39d26..327d8c2 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1,2 +1,3 @@
 lirc-0.8.3.tar.bz2
 lirc-0.8.4pre1.tar.bz2
+lirc-0.8.4pre2.tar.bz2
diff --git a/hw_commandir.h b/hw_commandir.h
deleted file mode 100644
index 2280f6c..0000000
--- a/hw_commandir.h
+++ /dev/null
@@ -1,175 +0,0 @@
- 
-/****************************************************************************
- ** hw_commandir.h **********************************************************
- ****************************************************************************
- * 
- * Copyright (C) 1999 Christoph Bartelmus <lirc@bartelmus.de>
- * -- Original hw_default.h
- * Modified for CommandIR Transceivers, April-June 2008, Matthew Bodkin 
- *
- */
-
-#ifndef HW_COMMANDIR_H
-#define HW_COMMANDIR_H
-
-#define RX_BUFFER_SIZE 1024
-#define TX_BUFFER_SIZE 1024
-#define TX_QUEUE 1
-#define RX_QUEUE 0
-#define MAX_COMMANDIRS 4
-#define MAX_COMMAND 8192
-
-/* transmitter channel control */
-#define MAX_DEVICES		4
-#define MAX_CHANNELS    16
-#define DEVICE_CHANNELS	4
-#define MAX_MASK 		0xffff
-#define MAX_SIGNALQ		100
-
-/* CommandIR control codes */
-#define CHANNEL_EN_MASK	1
-#define FREQ_HEADER     2
-#define MCU_CTRL_SIZE   3
-#define TX_HEADER       7
-#define TX_HEADER_NEW	8
-/* New for CommandIR II  */
-
-#define READ_INPUTS		10
-#define PROC_SET		11
-#define INIT_FUNCTION	12
-#define RX_SELECT		13
-#define TX_COMMANDIR_II 14
-/* Internal to driver */
-#define TX_LIRC_T	    15
-#define FREQ_HEADER_LIRC 16
-#define RXDECODE_HEADER_LIRC 17
-#define INIT_HEADER_LIRC 18
-#define DEINIT_HEADER_LIRC 19
-#define GET_VERSION 	20
-
-#define COMMANDIR_2_PULSE_MASK 0x8000
-#define COMMANDIR_2_OVERFLOW_MASK 0x4000
-
-#define DEFAULT_PULSE_WIDTH 13
-
-#define USB_CMDIR_VENDOR_ID		0x10c4
-#define USB_CMDIR_PRODUCT_ID	0x0003
-#define USB_CMDIR_MINOR_BASE	192
-
-#define HW_COMMANDIR_MINI 	1
-#define HW_COMMANDIR_2		2
-#define HW_COMMANDIR_UNKNOWN 127
-
-#define MAX_HW_MINI_PACKET 64
-
-// CommandIR has lots of buffer room, we don't need to poll constantly
-#define USB_TIMEOUT_MS 5000
-#define USB_TIMEOUT_US 1000
-#define WAIT_BETWEEN_READS_US 10000
-#define MAX_WAIT_BETWEEN_READS_US 5000000
-#define MIN_WAIT_BETWEEN_READS_US 5000
-
-#define USB_MAX_BUSES	8
-#define USB_MAX_BUSDEV	127
-
-#define RX_HEADER_DATA 		0x01
-#define RX_HEADER_EVENTS 	0x02
-#define RX_HEADER_TXAVAIL 	0x03
-
-
-// We keep CommandIR's OPEN even on -deinit for speed and to monitor 
-// Other non-LIRC events (plugin, suspend, etc)
-#define USB_KEEP_WARM 1
-
-// CommandIR lircd.conf event driven code definitions
-#define LIRCCODE_GAP  125000
-#define JACK_PLUG_1		0x01
-#define JACK_PLUG_2		0x02
-#define JACK_PLUG_3		0x03
-#define JACK_PLUG_4		0x04
-#define JACK_PLUG_5		0x11
-#define JACK_PLUG_6		0x12
-#define JACK_PLUG_7		0x13
-#define JACK_PLUG_8		0x14
-#define JACK_PLUG_9		0x21
-#define JACK_PLUG_10	0x22
-#define JACK_PLUG_11	0x23
-#define JACK_PLUG_12	0x24
-#define JACK_PLUG_13	0x31
-#define JACK_PLUG_14	0x32
-#define JACK_PLUG_15	0x33
-#define JACK_PLUG_16	0x34
-
-#define JACK_UNPLUG_1	0x05
-#define JACK_UNPLUG_2	0x06
-#define JACK_UNPLUG_3	0x07
-#define JACK_UNPLUG_4	0x08
-#define JACK_UNPLUG_5	0x15
-#define JACK_UNPLUG_6	0x16
-#define JACK_UNPLUG_7	0x17
-#define JACK_UNPLUG_8	0x18
-#define JACK_UNPLUG_9	0x25
-#define JACK_UNPLUG_10	0x26
-#define JACK_UNPLUG_11	0x27
-#define JACK_UNPLUG_12	0x28
-#define JACK_UNPLUG_13	0x35
-#define JACK_UNPLUG_14	0x36
-#define JACK_UNPLUG_15	0x37
-#define JACK_UNPLUG_16	0x38
-
-#define SELECT_TX_INTERNAL	0x09
-#define SELECT_TX_ExTERNAL	0x0A
-
-#define SELECT_TX_ON_1		0x0D
-#define SELECT_TX_ON_2		0x1D
-#define SELECT_TX_ON_3		0x2D
-#define SELECT_TX_ON_4		0x3D
-
-#define JACK_PLUG_RX_1		0x0B
-#define JACK_UNPLUG_RX_1	0x0C
-#define JACK_PLUG_RX_2		0x1B
-#define JACK_UNPLUG_RX_2	0x1C
-#define JACK_PLUG_RX_3		0x2B
-#define JACK_UNPLUG_RX_3	0x2C
-#define JACK_PLUG_RX_4		0x3B
-#define JACK_UNPLUG_RX_4	0x3C
-
-#define COMMANDIR_PLUG_1	0x41
-#define COMMANDIR_PLUG_2	0x42
-#define COMMANDIR_PLUG_3	0x43
-#define COMMANDIR_PLUG_4	0x44
-
-#define COMMANDIR_UNPLUG_1	0x45
-#define COMMANDIR_UNPLUG_2	0x46
-#define COMMANDIR_UNPLUG_3	0x47
-#define COMMANDIR_UNPLUG_4	0x48
-
-#define COMMANDIR_REORDERED	0x50
-#define COMMANDIR_READY		0x51
-#define COMMANDIR_STOPPED	0x52
-#define COMMANDIR_POLL_FASTER	0x53
-#define COMMANDIR_POLL_SLOWER	0x54
-
-#define SETTRANSMITTERS_1	0xf0
-#define SETTRANSMITTERS_2	0xf1
-#define SETTRANSMITTERS_3	0xf2
-#define SETTRANSMITTERS_4	0xf3
-#define SETTRANSMITTERS_5	0xf4
-#define SETTRANSMITTERS_6	0xf5
-#define SETTRANSMITTERS_7	0xf6
-#define SETTRANSMITTERS_8	0xf7
-#define SETTRANSMITTERS_9	0xf8
-#define SETTRANSMITTERS_10	0xf9
-#define SETTRANSMITTERS_11	0xfa
-#define SETTRANSMITTERS_12	0xfb
-#define SETTRANSMITTERS_13	0xfc
-#define SETTRANSMITTERS_14	0xfd
-#define SETTRANSMITTERS_15	0xfe
-#define SETTRANSMITTERS_16	0xff
-
-// What's in a returning data packet
-#define COMMANDIR_RX_EVENTS 		0x02
-#define COMMANDIR_RX_DATA			0x01
-
-
-#endif
diff --git a/lirc.spec b/lirc.spec
index 03bb9f8..2c965cd 100644
--- a/lirc.spec
+++ b/lirc.spec
@@ -14,11 +14,11 @@
 %bcond_with     portaudio
 %bcond_with     svgalib
 %bcond_without  x
-%define pre     pre1
+%define pre     pre2
 
 Name:           lirc
 Version:        0.8.4
-Release:        0.3%{?pre:.%{pre}}%{?dist}
+Release:        0.4%{?pre:.%{pre}}%{?dist}
 Summary:        The Linux Infrared Remote Control package
 
 Group:          System Environment/Daemons
@@ -28,8 +28,6 @@ URL:            http://www.lirc.org/
 Source0:        http://lirc.sourceforge.net/software/snapshots/%{name}-%{version}%{pre}.tar.bz2
 Source1:        %{name}.init
 Source2:        %{name}.sysconfig
-# temporary, was accidentally left out of 0.8.4pre1 tarball
-Source3:        hw_commandir.h
 Patch0:         lirc-use-new-instead-of-conf-as-filename-suffix.patch
 # https://bugzilla.redhat.com/show_bug.cgi?id=457273
 # http://thread.gmane.org/gmane.comp.hardware.lirc/6884
@@ -119,7 +117,6 @@ of remote control configuration files.
 %prep
 %setup -q -n %{name}-%{version}%{?pre}
 %patch0 -p1 -b .suf
-cp %{SOURCE3} daemons/
 
 chmod 644 contrib/*
 
@@ -266,6 +263,9 @@ fi
 
 
 %changelog
+* Mon Oct 06 2008 - Jarod Wilson <jarod@redhat.com> - 0.8.4-0.4.pre2
+- Update to 0.8.4pre2
+
 * Mon Oct 06 2008 - Bastien Nocera <bnocera@redhat.com> - 0.8.4-0.3.pre1
 - Fix more keycodes for the streamzap remote
 
diff --git a/sources b/sources
index d5df52c..aa992ba 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-b79601ea90fa552653dfc69e29fd5c4d  lirc-0.8.4pre1.tar.bz2
+ced411ab8d8cf7918163a1c6514231e4  lirc-0.8.4pre2.tar.bz2

From 46c9e00f7cd07b803440aae178554f44b0708e89 Mon Sep 17 00:00:00 2001
From: Jarod Wilson <jwilson@fedoraproject.org>
Date: Fri, 10 Oct 2008 21:21:40 +0000
Subject: [PATCH 049/204] - Re-enable portaudio driver by default, require v19
 or later

---
 lirc.spec | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

diff --git a/lirc.spec b/lirc.spec
index 2c965cd..938ed2d 100644
--- a/lirc.spec
+++ b/lirc.spec
@@ -11,14 +11,14 @@
 # - Fixup /etc/lirc(m)d.conf %%ghost'ification, existence after erase etc.
 
 %bcond_without  alsa
-%bcond_with     portaudio
-%bcond_with     svgalib
+%bcond_without  portaudio
 %bcond_without  x
+%bcond_with     svgalib
 %define pre     pre2
 
 Name:           lirc
 Version:        0.8.4
-Release:        0.4%{?pre:.%{pre}}%{?dist}
+Release:        0.5%{?pre:.%{pre}}%{?dist}
 Summary:        The Linux Infrared Remote Control package
 
 Group:          System Environment/Daemons
@@ -41,7 +41,7 @@ BuildRequires:  libusb-devel
 BuildRequires:  alsa-lib-devel
 %endif
 %if %{with portaudio}
-BuildRequires:  portaudio-devel >= 18
+BuildRequires:  portaudio-devel >= 19
 %endif
 %if %{with svgalib}
 BuildRequires:  svgalib-devel
@@ -263,6 +263,9 @@ fi
 
 
 %changelog
+* Fri Oct 10 2008 - Jarod Wilson <jarod@redhat.com> - 0.8.4-0.5.pre2
+- Re-enable portaudio driver by default, require v19 or later
+
 * Mon Oct 06 2008 - Jarod Wilson <jarod@redhat.com> - 0.8.4-0.4.pre2
 - Update to 0.8.4pre2
 

From 9888c92dc15782f8a1499fcea95bcdf5a822aef5 Mon Sep 17 00:00:00 2001
From: Jarod Wilson <jwilson@fedoraproject.org>
Date: Mon, 13 Oct 2008 03:21:42 +0000
Subject: [PATCH 050/204] - Update to 0.8.4 release

---
 .cvsignore | 1 +
 lirc.spec  | 9 ++++++---
 sources    | 2 +-
 3 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/.cvsignore b/.cvsignore
index 327d8c2..9593178 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1,3 +1,4 @@
 lirc-0.8.3.tar.bz2
 lirc-0.8.4pre1.tar.bz2
 lirc-0.8.4pre2.tar.bz2
+lirc-0.8.4.tar.bz2
diff --git a/lirc.spec b/lirc.spec
index 938ed2d..78d5d16 100644
--- a/lirc.spec
+++ b/lirc.spec
@@ -14,7 +14,7 @@
 %bcond_without  portaudio
 %bcond_without  x
 %bcond_with     svgalib
-%define pre     pre2
+#define pre     pre2
 
 Name:           lirc
 Version:        0.8.4
@@ -24,8 +24,8 @@ Summary:        The Linux Infrared Remote Control package
 Group:          System Environment/Daemons
 License:        GPLv2+
 URL:            http://www.lirc.org/
-#Source0:        http://downloads.sourceforge.net/lirc/%{name}-%{version}.tar.bz2
-Source0:        http://lirc.sourceforge.net/software/snapshots/%{name}-%{version}%{pre}.tar.bz2
+Source0:        http://downloads.sourceforge.net/lirc/%{name}-%{version}.tar.bz2
+#Source0:        http://lirc.sourceforge.net/software/snapshots/%{name}-%{version}%{pre}.tar.bz2
 Source1:        %{name}.init
 Source2:        %{name}.sysconfig
 Patch0:         lirc-use-new-instead-of-conf-as-filename-suffix.patch
@@ -263,6 +263,9 @@ fi
 
 
 %changelog
+* Sun Oct 12 2008 - Jarod Wilson <jarod@redhat.com> - 0.8.4-1
+- Update to 0.8.4 release
+
 * Fri Oct 10 2008 - Jarod Wilson <jarod@redhat.com> - 0.8.4-0.5.pre2
 - Re-enable portaudio driver by default, require v19 or later
 
diff --git a/sources b/sources
index aa992ba..6b75a45 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-ced411ab8d8cf7918163a1c6514231e4  lirc-0.8.4pre2.tar.bz2
+8f3ba7eb57529992f3991d6981a3feb6  lirc-0.8.4.tar.bz2

From f66169a8b35e7ff35f9bc74462fa3929aeeb621a Mon Sep 17 00:00:00 2001
From: Jarod Wilson <jwilson@fedoraproject.org>
Date: Thu, 16 Oct 2008 20:51:59 +0000
Subject: [PATCH 051/204] - Make all remote configs have unique names (#467303)
 - Fix up some key names that got screwed up by standardization script

---
 lirc-0.8.4-make-remote-names-all-unique.patch | 125 +++++
 lirc-0.8.4-standardize-remote-keycodes.patch  |  57 ---
 lirc-0.8.4-standardized-name-fixups.patch     | 464 ++++++++++++++++++
 lirc-streamzap-prev-next.patch                |  13 -
 lirc.spec                                     |  10 +-
 5 files changed, 597 insertions(+), 72 deletions(-)
 create mode 100644 lirc-0.8.4-make-remote-names-all-unique.patch
 create mode 100644 lirc-0.8.4-standardized-name-fixups.patch
 delete mode 100644 lirc-streamzap-prev-next.patch

diff --git a/lirc-0.8.4-make-remote-names-all-unique.patch b/lirc-0.8.4-make-remote-names-all-unique.patch
new file mode 100644
index 0000000..5519b1f
--- /dev/null
+++ b/lirc-0.8.4-make-remote-names-all-unique.patch
@@ -0,0 +1,125 @@
+diff -Naurp lirc-0.8.4/remotes/atiusb/lircd.conf.atiusb lirc-0.8.4.new/remotes/atiusb/lircd.conf.atiusb
+--- lirc-0.8.4/remotes/atiusb/lircd.conf.atiusb	2008-10-16 15:13:22.000000000 -0400
++++ lirc-0.8.4.new/remotes/atiusb/lircd.conf.atiusb	2008-10-16 15:24:46.000000000 -0400
+@@ -1794,7 +1794,7 @@ end remote
+ 
+ begin remote
+ 
+-  name  Medion_X10
++  name  Medion_X10_V2
+   bits           16
+   eps            30
+   aeps          100
+@@ -1872,7 +1872,7 @@ end remote
+ 
+ begin remote
+ 
+-  name  Medion_X10
++  name  Medion_X10_V3
+   bits           16
+   eps            30
+   aeps          100
+diff -Naurp lirc-0.8.4/remotes/bestbuy/lircd.conf.bestbuy2 lirc-0.8.4.new/remotes/bestbuy/lircd.conf.bestbuy2
+--- lirc-0.8.4/remotes/bestbuy/lircd.conf.bestbuy2	2008-10-16 15:13:22.000000000 -0400
++++ lirc-0.8.4.new/remotes/bestbuy/lircd.conf.bestbuy2	2008-10-16 15:16:45.000000000 -0400
+@@ -11,7 +11,7 @@
+ 
+ begin remote
+ 
+-  name  BESTBUY
++  name  BESTBUY2
+   bits            7
+   eps            30
+   aeps          100
+diff -Naurp lirc-0.8.4/remotes/dvico/lircd.conf.fusionHDTV lirc-0.8.4.new/remotes/dvico/lircd.conf.fusionHDTV
+--- lirc-0.8.4/remotes/dvico/lircd.conf.fusionHDTV	2008-10-16 15:13:22.000000000 -0400
++++ lirc-0.8.4.new/remotes/dvico/lircd.conf.fusionHDTV	2008-10-16 15:23:52.000000000 -0400
+@@ -153,7 +153,7 @@ end remote
+ 
+ begin remote
+ 
+-  name  DVICO_MCE
++  name  DVICO_MCE2
+   bits            8
+   eps            30
+   aeps          100
+diff -Naurp lirc-0.8.4/remotes/generic/NEC-pulse.conf lirc-0.8.4.new/remotes/generic/NEC-pulse.conf
+--- lirc-0.8.4/remotes/generic/NEC-pulse.conf	2000-12-03 09:21:31.000000000 -0500
++++ lirc-0.8.4.new/remotes/generic/NEC-pulse.conf	2008-10-16 15:19:20.000000000 -0400
+@@ -7,7 +7,7 @@
+ 
+ begin remote
+ 
+-  name  NEC
++  name  NEC_PULSE
+   bits           16
+   flags SPACE_ENC|CONST_LENGTH
+   eps            30
+diff -Naurp lirc-0.8.4/remotes/generic/NEC-short-pulse.conf lirc-0.8.4.new/remotes/generic/NEC-short-pulse.conf
+--- lirc-0.8.4/remotes/generic/NEC-short-pulse.conf	2000-12-03 09:21:31.000000000 -0500
++++ lirc-0.8.4.new/remotes/generic/NEC-short-pulse.conf	2008-10-16 15:19:10.000000000 -0400
+@@ -9,7 +9,7 @@
+ 
+ begin remote
+ 
+-  name  NEC
++  name  NEC_SHORT_PULSE
+   bits           16
+   flags SPACE_ENC|CONST_LENGTH
+   eps            30
+diff -Naurp lirc-0.8.4/remotes/generic/SONY12.conf lirc-0.8.4.new/remotes/generic/SONY12.conf
+--- lirc-0.8.4/remotes/generic/SONY12.conf	2001-08-04 06:20:11.000000000 -0400
++++ lirc-0.8.4.new/remotes/generic/SONY12.conf	2008-10-16 15:18:02.000000000 -0400
+@@ -6,7 +6,7 @@
+ 
+ begin remote
+ 
+-  name  SONY
++  name  SONY_12
+   bits            7
+   flags SPACE_ENC|CONST_LENGTH
+   eps            30
+diff -Naurp lirc-0.8.4/remotes/generic/SONY20.conf lirc-0.8.4.new/remotes/generic/SONY20.conf
+--- lirc-0.8.4/remotes/generic/SONY20.conf	2000-12-03 09:21:31.000000000 -0500
++++ lirc-0.8.4.new/remotes/generic/SONY20.conf	2008-10-16 15:18:12.000000000 -0400
+@@ -6,7 +6,7 @@
+ 
+ begin remote
+ 
+-  name  SONY
++  name  SONY_20
+   bits            7
+   flags SPACE_ENC|CONST_LENGTH
+   eps            30
+diff -Naurp lirc-0.8.4/remotes/hauppauge/lircd.conf.hauppauge lirc-0.8.4.new/remotes/hauppauge/lircd.conf.hauppauge
+--- lirc-0.8.4/remotes/hauppauge/lircd.conf.hauppauge	2008-10-16 15:13:22.000000000 -0400
++++ lirc-0.8.4.new/remotes/hauppauge/lircd.conf.hauppauge	2008-10-16 15:16:14.000000000 -0400
+@@ -278,14 +278,14 @@ end remote
+ #
+ # contributed by Matthew Wright
+ #
+-# brand:  Hauppauge (HRV-1600 RT Remote)
++# brand:  Hauppauge (HVR-1600 RT Remote)
+ # model no. of remote control: A415-HPG-A
+ # devices being controlled by this remote:
+ #
+ 
+ begin remote
+ 
+-  name  Hauppauge
++  name  Hauppauge_HVR_1600
+   bits           13
+   flags RC5|CONST_LENGTH
+   eps            30
+diff -Naurp lirc-0.8.4/remotes/leadtek/lircd.conf.PVR2000 lirc-0.8.4.new/remotes/leadtek/lircd.conf.PVR2000
+--- lirc-0.8.4/remotes/leadtek/lircd.conf.PVR2000	2008-10-16 15:13:22.000000000 -0400
++++ lirc-0.8.4.new/remotes/leadtek/lircd.conf.PVR2000	2008-10-16 15:17:46.000000000 -0400
+@@ -74,7 +74,7 @@ end remote
+ 
+ begin remote
+ 
+-  name  PVR2000
++  name  PVR2000_V2
+   bits           8
+   flags  SHIFT_ENC
+   gap       120000
diff --git a/lirc-0.8.4-standardize-remote-keycodes.patch b/lirc-0.8.4-standardize-remote-keycodes.patch
index acef796..bdb4ee5 100644
--- a/lirc-0.8.4-standardize-remote-keycodes.patch
+++ b/lirc-0.8.4-standardize-remote-keycodes.patch
@@ -1,60 +1,3 @@
-diff -Naurp lirc-0.8.4pre1.orig/remotes/adaptec/lircd.conf.AVC-2410 lirc-0.8.4pre1/remotes/adaptec/lircd.conf.AVC-2410
---- lirc-0.8.4pre1.orig/remotes/adaptec/lircd.conf.AVC-2410	2005-03-28 04:25:36.000000000 -0500
-+++ lirc-0.8.4pre1/remotes/adaptec/lircd.conf.AVC-2410	2008-09-24 17:06:37.000000000 -0400
-@@ -29,30 +29,30 @@ begin remote
-           Live                     0x00000000000025DA
-           Timeshift                0x00000000000017E8
-           Scan                     0x00000000000018e7
--          Power                    0x00000000000009f6
--          1                        0x00000000000026D9
--          2                        0x00000000000019E6
--          3                        0x00000000000010EF
--          4                        0x00000000000027D8
--          5                        0x00000000000020DF
--          6                        0x00000000000011EE
--          7                        0x00000000000028D7
--          8                        0x00000000000021DE
--          9                        0x00000000000012ED
--          0                        0x00000000000022DD
--          Mute                     0x00000000000013EC
-+          KEY_POWER                    0x00000000000009f6
-+          KEY_1                        0x00000000000026D9
-+          KEY_2                        0x00000000000019E6
-+          KEY_3                        0x00000000000010EF
-+          KEY_4                        0x00000000000027D8
-+          KEY_5                        0x00000000000020DF
-+          KEY_6                        0x00000000000011EE
-+          KEY_7                        0x00000000000028D7
-+          KEY_8                        0x00000000000021DE
-+          KEY_9                        0x00000000000012ED
-+          KEY_0                        0x00000000000022DD
-+          KEY_MUTE                     0x00000000000013EC
-           Full                     0x00000000000029D6
--          Play                     0x00000000000030CF
--          Stop                     0x00000000000023DC
--          Skip                     0x00000000000024DB
--          Replay                   0x00000000000014EB
--          Rewind                   0x00000000000031CE
--          Forward                  0x00000000000015EA
--          Ch+                      0x00000000000001FE
--          Ch-                      0x00000000000005FA
--          Vol+                     0x00000000000004FB
--          Vol-                     0x00000000000002FD
--          Enter                    0x00000000000003FC
-+          KEY_PLAY                     0x00000000000030CF
-+          KEY_STOP                     0x00000000000023DC
-+          KEY_NEXT                     0x00000000000024DB
-+          KEY_AGAIN                   0x00000000000014EB
-+          KEY_REWIND                   0x00000000000031CE
-+          KEY_FORWARD                  0x00000000000015EA
-+          KEY_CHANNELUP                      0x00000000000001FE
-+          KEY_CHANNELDOWN                      0x00000000000005FA
-+          KEY_VOLUMEUP                     0x00000000000004FB
-+          KEY_VOLUMEDOWN                     0x00000000000002FD
-+          KEY_ENTER                    0x00000000000003FC
-           OSD                      0x00000000000032CD
-           cc                       0x00000000000016E9
-       end codes
 diff -Naurp lirc-0.8.4pre1.orig/remotes/adstech/lircd.conf.usbx-707 lirc-0.8.4pre1/remotes/adstech/lircd.conf.usbx-707
 --- lirc-0.8.4pre1.orig/remotes/adstech/lircd.conf.usbx-707	2008-09-24 17:05:54.000000000 -0400
 +++ lirc-0.8.4pre1/remotes/adstech/lircd.conf.usbx-707	2008-09-24 17:06:37.000000000 -0400
diff --git a/lirc-0.8.4-standardized-name-fixups.patch b/lirc-0.8.4-standardized-name-fixups.patch
new file mode 100644
index 0000000..46e9e3f
--- /dev/null
+++ b/lirc-0.8.4-standardized-name-fixups.patch
@@ -0,0 +1,464 @@
+diff -Naurp lirc-0.8.4.orig/remotes/adaptec/lircd.conf.AVC-2410 lirc-0.8.4/remotes/adaptec/lircd.conf.AVC-2410
+--- lirc-0.8.4.orig/remotes/adaptec/lircd.conf.AVC-2410	2008-10-16 16:03:39.000000000 -0400
++++ lirc-0.8.4/remotes/adaptec/lircd.conf.AVC-2410	2005-03-28 04:25:36.000000000 -0500
+@@ -29,30 +29,30 @@ begin remote
+           Live                     0x00000000000025DA
+           Timeshift                0x00000000000017E8
+           Scan                     0x00000000000018e7
+-          KEY_POWER                    0x00000000000009f6
+-          KEY_1                        0x00000000000026D9
+-          KEY_2                        0x00000000000019E6
+-          KEY_3                        0x00000000000010EF
+-          KEY_4                        0x00000000000027D8
+-          KEY_5                        0x00000000000020DF
+-          KEY_6                        0x00000000000011EE
+-          KEY_7                        0x00000000000028D7
+-          KEY_8                        0x00000000000021DE
+-          KEY_9                        0x00000000000012ED
+-          KEY_0                        0x00000000000022DD
+-          KEY_MUTE                     0x00000000000013EC
++          Power                    0x00000000000009f6
++          1                        0x00000000000026D9
++          2                        0x00000000000019E6
++          3                        0x00000000000010EF
++          4                        0x00000000000027D8
++          5                        0x00000000000020DF
++          6                        0x00000000000011EE
++          7                        0x00000000000028D7
++          8                        0x00000000000021DE
++          9                        0x00000000000012ED
++          0                        0x00000000000022DD
++          Mute                     0x00000000000013EC
+           Full                     0x00000000000029D6
+-          KEY_PLAY                     0x00000000000030CF
+-          KEY_STOP                     0x00000000000023DC
+-          KEY_NEXT                     0x00000000000024DB
+-          KEY_AGAIN                   0x00000000000014EB
+-          KEY_REWIND                   0x00000000000031CE
+-          KEY_FORWARD                  0x00000000000015EA
+-          KEY_CHANNELUP                      0x00000000000001FE
+-          KEY_CHANNELDOWN                      0x00000000000005FA
+-          KEY_VOLUMEUP                     0x00000000000004FB
+-          KEY_VOLUMEDOWN                     0x00000000000002FD
+-          KEY_ENTER                    0x00000000000003FC
++          Play                     0x00000000000030CF
++          Stop                     0x00000000000023DC
++          Skip                     0x00000000000024DB
++          Replay                   0x00000000000014EB
++          Rewind                   0x00000000000031CE
++          Forward                  0x00000000000015EA
++          Ch+                      0x00000000000001FE
++          Ch-                      0x00000000000005FA
++          Vol+                     0x00000000000004FB
++          Vol-                     0x00000000000002FD
++          Enter                    0x00000000000003FC
+           OSD                      0x00000000000032CD
+           cc                       0x00000000000016E9
+       end codes
+diff -Naurp lirc-0.8.4.orig/remotes/adstech/lircd.conf.usbx-707 lirc-0.8.4/remotes/adstech/lircd.conf.usbx-707
+--- lirc-0.8.4.orig/remotes/adstech/lircd.conf.usbx-707	2008-10-16 16:03:39.000000000 -0400
++++ lirc-0.8.4/remotes/adstech/lircd.conf.usbx-707	2008-10-16 16:30:37.000000000 -0400
+@@ -37,10 +37,10 @@ begin remote
+           KEY_7                        0x02FD54AB00
+           KEY_8                        0x02FD4CB300
+           KEY_9                        0x02FD5CA300
+-                               0x02FD55AA00
++          Jump                         0x02FD55AA00
+           KEY_0                        0x02FD4DB200
+-                             0x02FD5DA200
+-          Guide                    0x02FD17E800
++          Search                   0x02FD5DA200
++          GUIDE                    0x02FD17E800
+           KEY_UP                       0x02FD0FF000
+           KEY_MENU                     0x02FD1FE000
+           KEY_LEFT                     0x02FD16E900
+@@ -48,7 +48,7 @@ begin remote
+           KEY_RIGHT                    0x02FD1EE100
+           KEY_INFO                     0x02FD5AA500
+           KEY_DOWN                     0x02FD46B900
+-                               0x02FD52AD00
++          KEY_EXIT                     0x02FD52AD00
+           KEY_AGAIN                   0x02FD59A600
+           KEY_NEXT                     0x02FD51AE00
+           KEY_REWIND                   0x02FD58A700
+diff -Naurp lirc-0.8.4.orig/remotes/apple/lircd.conf.macmini lirc-0.8.4/remotes/apple/lircd.conf.macmini
+--- lirc-0.8.4.orig/remotes/apple/lircd.conf.macmini	2008-10-16 16:03:39.000000000 -0400
++++ lirc-0.8.4/remotes/apple/lircd.conf.macmini	2008-10-16 16:30:37.000000000 -0400
+@@ -30,7 +30,7 @@ begin remote
+           KEY_VOLUMEDOWN	0x0D
+           KEY_REWIND		0x08
+           KEY_FORWARD		0x07
+-          KEY_PLAY		0x04
++          KEY_PLAYPAUSE		0x04
+           KEY_MENU		0x02
+       end codes
+ 
+diff -Naurp lirc-0.8.4.orig/remotes/asus/lircd.conf.asusdh lirc-0.8.4/remotes/asus/lircd.conf.asusdh
+--- lirc-0.8.4.orig/remotes/asus/lircd.conf.asusdh	2008-10-16 16:03:39.000000000 -0400
++++ lirc-0.8.4/remotes/asus/lircd.conf.asusdh	2008-10-16 16:30:37.000000000 -0400
+@@ -14,17 +14,17 @@ begin remote
+   post_data_bits  0
+ 
+ 	begin codes
+-	  KEY_POWER			0x01
++	  KEY_POWER		0x01
+ 	  QUICK_POWER		0x02
+ 	  NOISE_OFF		0x03
+ 	  WIFI			0x04
+ 	  AP_LAUNCH		0x05
+ 	  KEY_MAX		0x06
+-	  			0x07
++	  KEY_KPPLUS		0x07
+ 	  REV			0x08
+-	  		0x09
+-	  KEY_FORWARD			0x0A
+-	  			0x0B
++	  KEY_PLAYPAUSE		0x09
++	  KEY_FORWARD		0x0A
++	  KEY_KPMINUS		0x0B
+         end codes
+ 
+ end remote
+diff -Naurp lirc-0.8.4.orig/remotes/atiusb/lircd.conf.atilibusb lirc-0.8.4/remotes/atiusb/lircd.conf.atilibusb
+--- lirc-0.8.4.orig/remotes/atiusb/lircd.conf.atilibusb	2008-10-16 16:03:39.000000000 -0400
++++ lirc-0.8.4/remotes/atiusb/lircd.conf.atilibusb	2008-10-16 16:30:37.000000000 -0400
+@@ -32,8 +32,8 @@ begin remote
+       begin codes
+           KEY_STOP                     0x000231
+           KEY_PAUSE                    0x000230
+-                           0x000228
+-          KEY_RECORD                      0x000237
++          KEY_FASTFORWARD              0x000228
++          KEY_RECORD                   0x000237
+           KEY_REWIND                   0x000229
+           KEY_PLAY                     0x00022C
+           KEY_D                        0x00027B
+@@ -46,9 +46,9 @@ begin remote
+           KEY_DOWN                     0x000259
+           KEY_OK                       0x00025C
+           KEY_INFO                     0x0002F9
+-          timer                    0x000296
++          timer                        0x000296
+           KEY_MENU                     0x000254
+-          check                    0x000282
++          check                        0x000282
+           KEY_0                        0x000200
+           KEY_1                        0x000201
+           KEY_2                        0x000202
+@@ -59,24 +59,24 @@ begin remote
+           KEY_7                        0x000207
+           KEY_8                        0x000208
+           KEY_9                        0x000209
+-          KEY_VOLUMEUP                    0x000210
+-          KEY_VOLUMEDOWN                  0x000211
++          KEY_VOLUMEUP                 0x000210
++          KEY_VOLUMEDOWN               0x000211
+           KEY_MUTE                     0x00020D
+-          KEY_CHANNELUP                     0x000220
+-          KEY_CHANNELDOWN                   0x000221
+-          mouse_up                 0x0001FF
+-          mouse_down               0x0002FF
+-          BTN_LEFT               0x0020FF
+-          BTN_RIGHT              0x0010FF
+-          BTN_RIGHT           0x0011FF
+-          mouse_down_right         0x0012FF
+-          BTN_LEFT            0x0021FF
+-          mouse_down_left          0x0022FF
+-          right_click              0x0002AA
+-          left_click               0x0002A9
+-          hand                     0x0002D0
+-          shrink_resize            0x0002D5
+-          ?                        0x0002BE
++          KEY_CHANNELUP                0x000220
++          KEY_CHANNELDOWN              0x000221
++          mouse_up                     0x0001FF
++          mouse_down                   0x0002FF
++          BTN_LEFT                     0x0020FF
++          BTN_RIGHT                    0x0010FF
++          BTN_RIGHT                    0x0011FF
++          mouse_down_right             0x0012FF
++          BTN_LEFT                     0x0021FF
++          mouse_down_left              0x0022FF
++          right_click                  0x0002AA
++          left_click                   0x0002A9
++          hand                         0x0002D0
++          shrink_resize                0x0002D5
++          ?                            0x0002BE
+           KEY_DVD                      0x000238
+           KEY_TV                       0x000239
+           KEY_A                        0x000278
+diff -Naurp lirc-0.8.4.orig/remotes/ericsson/lircd.conf.bte lirc-0.8.4/remotes/ericsson/lircd.conf.bte
+--- lirc-0.8.4.orig/remotes/ericsson/lircd.conf.bte	2008-10-16 16:03:39.000000000 -0400
++++ lirc-0.8.4/remotes/ericsson/lircd.conf.bte	2008-10-16 16:30:37.000000000 -0400
+@@ -11,7 +11,7 @@
+ 
+ begin remote
+ 
+-    name    bte 
++    name    bte
+     bits    16
+ 
+     begin codes
+@@ -25,28 +25,28 @@ begin remote
+         KEY_7               0x0037
+         KEY_8               0x0038
+         KEY_9               0x0039
+-                    0x002a  # '*'
+-                    0x0023  # '#'
++        STAR                0x002a  # '*'
++        HASH                0x0023  # '#'
+         KEY_UP              0x005e  # '^'
+         KEY_DOWN            0x0076  # 'v'
+         KEY_LEFT            0x003c  # '<'
+         KEY_RIGHT           0x003e  # '>'
+         KEY_CANCEL          0x0063  # 'c'
+-        KEY_VOLUMEUP          0x0075  # 'u'
+-        KEY_VOLUMEDOWN        0x0064  # 'd'
++        KEY_VOLUMEUP        0x0075  # 'u'
++        KEY_VOLUMEDOWN      0x0064  # 'd'
+ 
+ # t520m
+         NO              0x0065  # 'e'
+-                     0x0073  # 's'
+-                  0x004c  # 'L'
+-                    0x0047  # 'G' - hides dialog widget!
++        YES             0x0073  # 's'
++        OPTION          0x004c  # 'L'
++        MEMO            0x0047  # 'G' - hides dialog widget!
+ 
+ # t630
+         F_LEFT          0x005b  # '['
+         F_RIGHT         0x005d  # ']'  - triggers 'e'
+         J_CLICK         0x3a4a  # ':J' - triggers 'e'
+-        RETURN          0x3a52  # ':R' - triggers 'e'
+-                  0x3a43  # ':C'
++        KEY_ENTER       0x3a52  # ':R' - triggers 'e'
++        KEY_CAMERA      0x3a43  # ':C'
+         WAP             0x3a4f  # ':O'
+ 
+       end codes
+diff -Naurp lirc-0.8.4.orig/remotes/kanam_accent/lircd.conf.IR-100 lirc-0.8.4/remotes/kanam_accent/lircd.conf.IR-100
+--- lirc-0.8.4.orig/remotes/kanam_accent/lircd.conf.IR-100	2008-10-16 16:03:39.000000000 -0400
++++ lirc-0.8.4/remotes/kanam_accent/lircd.conf.IR-100	2008-10-16 16:30:37.000000000 -0400
+@@ -30,7 +30,7 @@ begin remote
+ 
+       begin codes
+           KEY_POWER                    0x62260942
+-          KEY_EJECTCD                    0x62662409
++          KEY_EJECTCD                  0x62662409
+           KEY_1                        0x62662209
+           KEY_2                        0x22642209
+           KEY_3                        0x62641142
+@@ -41,35 +41,35 @@ begin remote
+           KEY_8                        0x22646409
+           KEY_9                        0x62646609
+           KEY_0                        0x22464226
+-                            0x62664226
+-                           0x62660942
+-          KEY_VOLUMEDOWN                     0x22896642
+-          KEY_VOLUMEUP                     0x62622609
++          KEY_WINDOWS                  0x62664226
++          KEY_MENU                     0x62660942
++          KEY_VOLUMEDOWN               0x22896642
++          KEY_VOLUMEUP                 0x62622609
+           KEY_ESC                      0x22662609
+           KEY_UP                       0x22916642
+           KEY_CLOSE                    0x22994642
+           KEY_LEFT                     0x22994242
+-          ent                      0x22892642
++          ent                          0x22892642
+           KEY_RIGHT                    0x22914642
+-          KEY_PREVIOUS                     0x62996242
++          KEY_PREVIOUS                 0x62996242
+           KEY_DOWN                     0x22192699
+           KEY_NEXT                     0x22660942
+           KEY_MUTE                     0x22622409
+-          step                     0x62994C42
++          step                         0x62994C42
+           KEY_PLAY                     0x22246426
+           KEY_STOP                     0x6246894C
+-          winamp                   0x62426409
+-                        0x22664409
+-          hdtv                     0x22992642
+-                           0x62664609
+-                             0x62992299
+-                           0x62912242
+-          KEY_WWW                 0x62264626
+-          email                    0x22998C99
+-                                 0x22264426
+-                                 0x22426209
+-                                 0x62896442
+-                                 0x22096642
++          winamp                       0x62426409
++          mediaplayer                  0x22664409
++          KEY_TV                       0x22992642
++          KEY_DVD                      0x62664609
++          windvd                       0x62992299
++          powerdvd                     0x62912242
++          KEY_WWW                      0x62264626
++          KEY_MAIL                     0x22998C99
++          b1                           0x22264426
++          b2                           0x22426209
++          b3                           0x62896442
++          b4                           0x22096642
+       end codes
+ 
+ end remote
+diff -Naurp lirc-0.8.4.orig/remotes/mceusb/lircd.conf.mceusb lirc-0.8.4/remotes/mceusb/lircd.conf.mceusb
+--- lirc-0.8.4.orig/remotes/mceusb/lircd.conf.mceusb	2008-10-16 16:03:39.000000000 -0400
++++ lirc-0.8.4/remotes/mceusb/lircd.conf.mceusb	2008-10-16 16:49:17.000000000 -0400
+@@ -1,7 +1,8 @@
+ #
+-# brand:                        HP 
+-# model no. of remote control:  TSGH-IR01
+-# devices being controlled by this remote: HP Slimline S3100y
++# brand:                        HP/Philips/Microsoft/Other
++# model no. of remote control:  Media Center Edition remote
++# devices being controlled by this remote: HP Slimline S3100y and a
++# myriad of devices with Media Center Edition receivers
+ #
+ # Derived from MCEUSB2 lircd.conf file (lircd.conf.mceusb) found at:
+ # https://help.ubuntu.com/community/Install_Lirc_Feisty
+diff -Naurp lirc-0.8.4.orig/remotes/samsung/lircd.conf.samsung lirc-0.8.4/remotes/samsung/lircd.conf.samsung
+--- lirc-0.8.4.orig/remotes/samsung/lircd.conf.samsung	2008-10-16 16:03:39.000000000 -0400
++++ lirc-0.8.4/remotes/samsung/lircd.conf.samsung	2008-10-16 16:30:37.000000000 -0400
+@@ -39,42 +39,42 @@ begin remote
+ 
+ ### Propietary Samsung report, type 4
+           KEY_MUTE                     0xffcc0001
+-          Video_Archive            0xffcc0002
++          Video_Archive                0xffcc0002
+           KEY_1                        0xffcc0003
+           KEY_2                        0xffcc0004
+           KEY_3                        0xffcc0005
+-                              0xffcc0006
++          Sleep                        0xffcc0006
+           KEY_4                        0xffcc0007
+           KEY_5                        0xffcc0008
+           KEY_6                        0xffcc0009
+-                               0xffcc000a
++          Last                         0xffcc000a
+           KEY_7                        0xffcc000b
+           KEY_8                        0xffcc000c
+           KEY_9                        0xffcc000d
+-                           0xffcc000e
+-          Full                     0xffcc000f
++          KEY_SUBTITLE                 0xffcc000e
++          Full                         0xffcc000f
+           KEY_0                        0xffcc0010
+-          PIP                      0xffcc0011
+-          Timer                    0xffcc0012
+-                             0xffcc0013
+-          TV_Menu                  0xffcc0014
++          PIP                          0xffcc0011
++          Timer                        0xffcc0012
++          Source                       0xffcc0013
++          TV_Menu                      0xffcc0014
+           KEY_EPG                      0xffcc0015
+           KEY_TEXT                     0xffcc0016
+ # gap 17..1b: probably cursor keys were previously planned here
+           KEY_TV                       0xffcc001c
+           KEY_RADIO                    0xffcc001d
+           KEY_DVD                      0xffcc001e
+-          KEY_CHANNELUP                      0xffcc001f
++          KEY_CHANNELUP                0xffcc001f
+           KEY_MENU                     0xffcc0020
+-          KEY_VOLUMEUP                     0xffcc0021
+-          KEY_CHANNELDOWN                      0xffcc0022
++          KEY_VOLUMEUP                 0xffcc0021
++          KEY_CHANNELDOWN              0xffcc0022
+           KEY_BACK                     0xffcc0023
+-          KEY_VOLUMEDOWN                     0xffcc0024
++          KEY_VOLUMEDOWN               0xffcc0024
+           KEY_PLAY                     0xffcc0025
+           KEY_PAUSE                    0xffcc0026
+           KEY_STOP                     0xffcc0027
+           KEY_RECORD                   0xffcc0028
+-          KEY_PREVIOUS                     0xffcc0029
++          KEY_PREVIOUS                 0xffcc0029
+           KEY_REWIND                   0xffcc002a
+           KEY_FORWARD                  0xffcc002b
+           KEY_NEXT                     0xffcc002c
+diff -Naurp lirc-0.8.4.orig/remotes/vlsystem/lircd.conf.mplay lirc-0.8.4/remotes/vlsystem/lircd.conf.mplay
+--- lirc-0.8.4.orig/remotes/vlsystem/lircd.conf.mplay	2008-10-16 16:03:39.000000000 -0400
++++ lirc-0.8.4/remotes/vlsystem/lircd.conf.mplay	2008-10-16 16:30:37.000000000 -0400
+@@ -22,11 +22,11 @@ begin remote
+   toggle_bit_mask 0x0
+ 
+       begin codes
+-          PwrOff                   0x41
+-          PwrOn                    0x55
+-          Movies                   0x40
+-          Television               0x46
+-          Photos                   0x45
++          PwrOff                       0x41
++          KEY_POWER                    0x55
++          KEY_VIDEO                    0x40
++          KEY_TV                       0x46
++          KEY_PHOTO                    0x45
+           KEY_AUDIO                    0x56
+           KEY_1                        0x4d
+           KEY_2                        0x4e
+@@ -38,33 +38,33 @@ begin remote
+           KEY_8                        0x03
+           KEY_9                        0x07
+           KEY_0                        0x4c
+-          KEY_VOLUMEUP                     0x0a
+-          KEY_VOLUMEDOWN                     0x0e
+-          Ch+_Lang                 0x12
+-          Ch-_Page                 0x16
+-          Guide                    0x0f
++          KEY_VOLUMEUP                 0x0a
++          KEY_VOLUMEDOWN               0x0e
++          KEY_CHANNELUP                0x12
++          KEY_CHANNELDOWN              0x16
++          Guide                        0x0f
+           KEY_BACK                     0x0b
+-                                 0x13
++          KEY_TV                       0x13
+           KEY_OK                       0x42
+           KEY_UP                       0x19
+           KEY_LEFT                     0x54
+           KEY_RIGHT                    0x43
+           KEY_DOWN                     0x1d
+-          Exit_Click               0x1f
+-          Task_Quick               0x17
+-          Run_DClick               0x1b
+-          KEY_REWIND                      0x0d
++          Exit_Click                   0x1f
++          Task_Quick                   0x17
++          Run_DClick                   0x1b
++          KEY_REWIND                   0x0d
+           KEY_PLAY                     0x09
+-                               0x15
+-          KEY_PREVIOUS                     0x1a
++          KEY_FASTFORWARD              0x15
++          KEY_PREVIOUS                 0x1a
+           KEY_STOP                     0x01
+           KEY_NEXT                     0x1e
+           KEY_PAUSE                    0x05
+           KEY_MUTE                     0x4a
+-          Warp_Mouse               0x47
+-          KEY_RECORD                      0x11
+-          DVD_Zoom                 0x14
+-          Detail                   0x4b
++          Warp_Mouse                   0x47
++          KEY_RECORD                   0x11
++          KEY_ZOOM                     0x14
++          Detail                       0x4b
+       end codes
+ 
+ end remote
+--- lirc-0.8.4pre1.orig/remotes/streamzap/lircd.conf.streamzap	2008-10-01 12:09:37.000000000 +0100
++++ lirc-0.8.4pre1/remotes/streamzap/lircd.conf.streamzap	2008-10-06 09:08:57.000000000 +0100
+@@ -53,8 +53,8 @@ begin remote
+           KEY_PLAY                     0x17
+           KEY_PAUSE                    0x18
+           KEY_STOP                     0x19
+-          |<<                      0x1A
+-          >>|                      0x1B
++          KEY_PREVIOUS                      0x1A
++          KEY_NEXT                      0x1B
+           KEY_RECORD                   0x1C
+           KEY_REWIND                       0x1D
+           KEY_FORWARD                       0x1E
diff --git a/lirc-streamzap-prev-next.patch b/lirc-streamzap-prev-next.patch
deleted file mode 100644
index daef5f4..0000000
--- a/lirc-streamzap-prev-next.patch
+++ /dev/null
@@ -1,13 +0,0 @@
---- lirc-0.8.4pre1.orig/remotes/streamzap/lircd.conf.streamzap	2008-10-01 12:09:37.000000000 +0100
-+++ lirc-0.8.4pre1/remotes/streamzap/lircd.conf.streamzap	2008-10-06 09:08:57.000000000 +0100
-@@ -53,8 +53,8 @@ begin remote
-           KEY_PLAY                     0x17
-           KEY_PAUSE                    0x18
-           KEY_STOP                     0x19
--          |<<                      0x1A
--          >>|                      0x1B
-+          KEY_PREVIOUS                      0x1A
-+          KEY_NEXT                      0x1B
-           KEY_RECORD                   0x1C
-           KEY_REWIND                       0x1D
-           KEY_FORWARD                       0x1E
diff --git a/lirc.spec b/lirc.spec
index 78d5d16..25e710e 100644
--- a/lirc.spec
+++ b/lirc.spec
@@ -18,7 +18,7 @@
 
 Name:           lirc
 Version:        0.8.4
-Release:        0.5%{?pre:.%{pre}}%{?dist}
+Release:        2%{?pre:.%{pre}}%{?dist}
 Summary:        The Linux Infrared Remote Control package
 
 Group:          System Environment/Daemons
@@ -32,7 +32,8 @@ Patch0:         lirc-use-new-instead-of-conf-as-filename-suffix.patch
 # https://bugzilla.redhat.com/show_bug.cgi?id=457273
 # http://thread.gmane.org/gmane.comp.hardware.lirc/6884
 Patch1:		lirc-0.8.4-standardize-remote-keycodes.patch
-Patch2:		lirc-streamzap-prev-next.patch
+Patch2:         lirc-0.8.4-make-remote-names-all-unique.patch
+Patch3:         lirc-0.8.4-standardized-name-fixups.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  %{__perl}
@@ -152,6 +153,7 @@ touch -r aclocal.m4 configure.ac # avoid autofoo re-run
 # Don't create a backup, or the original definitions will get installed
 %patch1 -p1
 %patch2 -p1
+%patch3 -p1
 
 %build
 %configure \
@@ -263,6 +265,10 @@ fi
 
 
 %changelog
+* Thu Oct 16 2008 - Jarod Wilson <jarod@redhat.com> - 0.8.4-2
+- Make all remote configs have unique names (#467303)
+- Fix up some key names that got screwed up by standardization script
+
 * Sun Oct 12 2008 - Jarod Wilson <jarod@redhat.com> - 0.8.4-1
 - Update to 0.8.4 release
 

From f02d727e11199bafcb78c2dc681f42582f3ec38e Mon Sep 17 00:00:00 2001
From: Jarod Wilson <jwilson@fedoraproject.org>
Date: Thu, 16 Oct 2008 21:02:22 +0000
Subject: [PATCH 052/204] no clue how the hell that chunk got in there...

---
 lirc-0.8.4-standardized-name-fixups.patch | 57 -----------------------
 1 file changed, 57 deletions(-)

diff --git a/lirc-0.8.4-standardized-name-fixups.patch b/lirc-0.8.4-standardized-name-fixups.patch
index 46e9e3f..8830332 100644
--- a/lirc-0.8.4-standardized-name-fixups.patch
+++ b/lirc-0.8.4-standardized-name-fixups.patch
@@ -1,60 +1,3 @@
-diff -Naurp lirc-0.8.4.orig/remotes/adaptec/lircd.conf.AVC-2410 lirc-0.8.4/remotes/adaptec/lircd.conf.AVC-2410
---- lirc-0.8.4.orig/remotes/adaptec/lircd.conf.AVC-2410	2008-10-16 16:03:39.000000000 -0400
-+++ lirc-0.8.4/remotes/adaptec/lircd.conf.AVC-2410	2005-03-28 04:25:36.000000000 -0500
-@@ -29,30 +29,30 @@ begin remote
-           Live                     0x00000000000025DA
-           Timeshift                0x00000000000017E8
-           Scan                     0x00000000000018e7
--          KEY_POWER                    0x00000000000009f6
--          KEY_1                        0x00000000000026D9
--          KEY_2                        0x00000000000019E6
--          KEY_3                        0x00000000000010EF
--          KEY_4                        0x00000000000027D8
--          KEY_5                        0x00000000000020DF
--          KEY_6                        0x00000000000011EE
--          KEY_7                        0x00000000000028D7
--          KEY_8                        0x00000000000021DE
--          KEY_9                        0x00000000000012ED
--          KEY_0                        0x00000000000022DD
--          KEY_MUTE                     0x00000000000013EC
-+          Power                    0x00000000000009f6
-+          1                        0x00000000000026D9
-+          2                        0x00000000000019E6
-+          3                        0x00000000000010EF
-+          4                        0x00000000000027D8
-+          5                        0x00000000000020DF
-+          6                        0x00000000000011EE
-+          7                        0x00000000000028D7
-+          8                        0x00000000000021DE
-+          9                        0x00000000000012ED
-+          0                        0x00000000000022DD
-+          Mute                     0x00000000000013EC
-           Full                     0x00000000000029D6
--          KEY_PLAY                     0x00000000000030CF
--          KEY_STOP                     0x00000000000023DC
--          KEY_NEXT                     0x00000000000024DB
--          KEY_AGAIN                   0x00000000000014EB
--          KEY_REWIND                   0x00000000000031CE
--          KEY_FORWARD                  0x00000000000015EA
--          KEY_CHANNELUP                      0x00000000000001FE
--          KEY_CHANNELDOWN                      0x00000000000005FA
--          KEY_VOLUMEUP                     0x00000000000004FB
--          KEY_VOLUMEDOWN                     0x00000000000002FD
--          KEY_ENTER                    0x00000000000003FC
-+          Play                     0x00000000000030CF
-+          Stop                     0x00000000000023DC
-+          Skip                     0x00000000000024DB
-+          Replay                   0x00000000000014EB
-+          Rewind                   0x00000000000031CE
-+          Forward                  0x00000000000015EA
-+          Ch+                      0x00000000000001FE
-+          Ch-                      0x00000000000005FA
-+          Vol+                     0x00000000000004FB
-+          Vol-                     0x00000000000002FD
-+          Enter                    0x00000000000003FC
-           OSD                      0x00000000000032CD
-           cc                       0x00000000000016E9
-       end codes
 diff -Naurp lirc-0.8.4.orig/remotes/adstech/lircd.conf.usbx-707 lirc-0.8.4/remotes/adstech/lircd.conf.usbx-707
 --- lirc-0.8.4.orig/remotes/adstech/lircd.conf.usbx-707	2008-10-16 16:03:39.000000000 -0400
 +++ lirc-0.8.4/remotes/adstech/lircd.conf.usbx-707	2008-10-16 16:30:37.000000000 -0400

From fb27741c0498bd9aef48509acd068ef2703108dc Mon Sep 17 00:00:00 2001
From: Jarod Wilson <jwilson@fedoraproject.org>
Date: Sun, 26 Oct 2008 20:06:09 +0000
Subject: [PATCH 053/204] - Update to lirc 0.8.4a release (fixes mode2 irrecord
 failures) - Really fix the mceusb remote config file this time

---
 .cvsignore                                |  1 +
 lirc-0.8.4-standardized-name-fixups.patch | 31 +++++++++++++++--------
 lirc.spec                                 |  8 ++++--
 sources                                   |  2 +-
 4 files changed, 28 insertions(+), 14 deletions(-)

diff --git a/.cvsignore b/.cvsignore
index 9593178..ba6ea46 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -2,3 +2,4 @@ lirc-0.8.3.tar.bz2
 lirc-0.8.4pre1.tar.bz2
 lirc-0.8.4pre2.tar.bz2
 lirc-0.8.4.tar.bz2
+lirc-0.8.4a.tar.bz2
diff --git a/lirc-0.8.4-standardized-name-fixups.patch b/lirc-0.8.4-standardized-name-fixups.patch
index 8830332..fe7b57c 100644
--- a/lirc-0.8.4-standardized-name-fixups.patch
+++ b/lirc-0.8.4-standardized-name-fixups.patch
@@ -1,6 +1,6 @@
 diff -Naurp lirc-0.8.4.orig/remotes/adstech/lircd.conf.usbx-707 lirc-0.8.4/remotes/adstech/lircd.conf.usbx-707
 --- lirc-0.8.4.orig/remotes/adstech/lircd.conf.usbx-707	2008-10-16 16:03:39.000000000 -0400
-+++ lirc-0.8.4/remotes/adstech/lircd.conf.usbx-707	2008-10-16 16:30:37.000000000 -0400
++++ lirc-0.8.4/remotes/adstech/lircd.conf.usbx-707	2008-10-16 17:01:59.000000000 -0400
 @@ -37,10 +37,10 @@ begin remote
            KEY_7                        0x02FD54AB00
            KEY_8                        0x02FD4CB300
@@ -26,7 +26,7 @@ diff -Naurp lirc-0.8.4.orig/remotes/adstech/lircd.conf.usbx-707 lirc-0.8.4/remot
            KEY_REWIND                   0x02FD58A700
 diff -Naurp lirc-0.8.4.orig/remotes/apple/lircd.conf.macmini lirc-0.8.4/remotes/apple/lircd.conf.macmini
 --- lirc-0.8.4.orig/remotes/apple/lircd.conf.macmini	2008-10-16 16:03:39.000000000 -0400
-+++ lirc-0.8.4/remotes/apple/lircd.conf.macmini	2008-10-16 16:30:37.000000000 -0400
++++ lirc-0.8.4/remotes/apple/lircd.conf.macmini	2008-10-16 17:01:59.000000000 -0400
 @@ -30,7 +30,7 @@ begin remote
            KEY_VOLUMEDOWN	0x0D
            KEY_REWIND		0x08
@@ -38,7 +38,7 @@ diff -Naurp lirc-0.8.4.orig/remotes/apple/lircd.conf.macmini lirc-0.8.4/remotes/
  
 diff -Naurp lirc-0.8.4.orig/remotes/asus/lircd.conf.asusdh lirc-0.8.4/remotes/asus/lircd.conf.asusdh
 --- lirc-0.8.4.orig/remotes/asus/lircd.conf.asusdh	2008-10-16 16:03:39.000000000 -0400
-+++ lirc-0.8.4/remotes/asus/lircd.conf.asusdh	2008-10-16 16:30:37.000000000 -0400
++++ lirc-0.8.4/remotes/asus/lircd.conf.asusdh	2008-10-16 17:01:59.000000000 -0400
 @@ -14,17 +14,17 @@ begin remote
    post_data_bits  0
  
@@ -64,7 +64,7 @@ diff -Naurp lirc-0.8.4.orig/remotes/asus/lircd.conf.asusdh lirc-0.8.4/remotes/as
  end remote
 diff -Naurp lirc-0.8.4.orig/remotes/atiusb/lircd.conf.atilibusb lirc-0.8.4/remotes/atiusb/lircd.conf.atilibusb
 --- lirc-0.8.4.orig/remotes/atiusb/lircd.conf.atilibusb	2008-10-16 16:03:39.000000000 -0400
-+++ lirc-0.8.4/remotes/atiusb/lircd.conf.atilibusb	2008-10-16 16:30:37.000000000 -0400
++++ lirc-0.8.4/remotes/atiusb/lircd.conf.atilibusb	2008-10-16 17:01:59.000000000 -0400
 @@ -32,8 +32,8 @@ begin remote
        begin codes
            KEY_STOP                     0x000231
@@ -132,7 +132,7 @@ diff -Naurp lirc-0.8.4.orig/remotes/atiusb/lircd.conf.atilibusb lirc-0.8.4/remot
            KEY_A                        0x000278
 diff -Naurp lirc-0.8.4.orig/remotes/ericsson/lircd.conf.bte lirc-0.8.4/remotes/ericsson/lircd.conf.bte
 --- lirc-0.8.4.orig/remotes/ericsson/lircd.conf.bte	2008-10-16 16:03:39.000000000 -0400
-+++ lirc-0.8.4/remotes/ericsson/lircd.conf.bte	2008-10-16 16:30:37.000000000 -0400
++++ lirc-0.8.4/remotes/ericsson/lircd.conf.bte	2008-10-16 17:01:59.000000000 -0400
 @@ -11,7 +11,7 @@
  
  begin remote
@@ -182,7 +182,7 @@ diff -Naurp lirc-0.8.4.orig/remotes/ericsson/lircd.conf.bte lirc-0.8.4/remotes/e
        end codes
 diff -Naurp lirc-0.8.4.orig/remotes/kanam_accent/lircd.conf.IR-100 lirc-0.8.4/remotes/kanam_accent/lircd.conf.IR-100
 --- lirc-0.8.4.orig/remotes/kanam_accent/lircd.conf.IR-100	2008-10-16 16:03:39.000000000 -0400
-+++ lirc-0.8.4/remotes/kanam_accent/lircd.conf.IR-100	2008-10-16 16:30:37.000000000 -0400
++++ lirc-0.8.4/remotes/kanam_accent/lircd.conf.IR-100	2008-10-16 17:01:59.000000000 -0400
 @@ -30,7 +30,7 @@ begin remote
  
        begin codes
@@ -249,7 +249,7 @@ diff -Naurp lirc-0.8.4.orig/remotes/kanam_accent/lircd.conf.IR-100 lirc-0.8.4/re
  end remote
 diff -Naurp lirc-0.8.4.orig/remotes/mceusb/lircd.conf.mceusb lirc-0.8.4/remotes/mceusb/lircd.conf.mceusb
 --- lirc-0.8.4.orig/remotes/mceusb/lircd.conf.mceusb	2008-10-16 16:03:39.000000000 -0400
-+++ lirc-0.8.4/remotes/mceusb/lircd.conf.mceusb	2008-10-16 16:49:17.000000000 -0400
++++ lirc-0.8.4/remotes/mceusb/lircd.conf.mceusb	2008-10-16 17:18:58.000000000 -0400
 @@ -1,7 +1,8 @@
  #
 -# brand:                        HP 
@@ -262,9 +262,18 @@ diff -Naurp lirc-0.8.4.orig/remotes/mceusb/lircd.conf.mceusb lirc-0.8.4/remotes/
  #
  # Derived from MCEUSB2 lircd.conf file (lircd.conf.mceusb) found at:
  # https://help.ubuntu.com/community/Install_Lirc_Feisty
+@@ -94,7 +95,7 @@ begin remote
+         BBB           0x00007bbb
+         BBC           0x00007bbc
+         BBD           0x00007bbd
+-                   0x00007bbe
++        BBE           0x00007bbe
+         BBF           0x00007bbf
+ #bc1 - bca unused 
+         BC1           0x00007bc1
 diff -Naurp lirc-0.8.4.orig/remotes/samsung/lircd.conf.samsung lirc-0.8.4/remotes/samsung/lircd.conf.samsung
 --- lirc-0.8.4.orig/remotes/samsung/lircd.conf.samsung	2008-10-16 16:03:39.000000000 -0400
-+++ lirc-0.8.4/remotes/samsung/lircd.conf.samsung	2008-10-16 16:30:37.000000000 -0400
++++ lirc-0.8.4/remotes/samsung/lircd.conf.samsung	2008-10-16 17:01:59.000000000 -0400
 @@ -39,42 +39,42 @@ begin remote
  
  ### Propietary Samsung report, type 4
@@ -324,7 +333,7 @@ diff -Naurp lirc-0.8.4.orig/remotes/samsung/lircd.conf.samsung lirc-0.8.4/remote
            KEY_NEXT                     0xffcc002c
 diff -Naurp lirc-0.8.4.orig/remotes/vlsystem/lircd.conf.mplay lirc-0.8.4/remotes/vlsystem/lircd.conf.mplay
 --- lirc-0.8.4.orig/remotes/vlsystem/lircd.conf.mplay	2008-10-16 16:03:39.000000000 -0400
-+++ lirc-0.8.4/remotes/vlsystem/lircd.conf.mplay	2008-10-16 16:30:37.000000000 -0400
++++ lirc-0.8.4/remotes/vlsystem/lircd.conf.mplay	2008-10-16 17:01:59.000000000 -0400
 @@ -22,11 +22,11 @@ begin remote
    toggle_bit_mask 0x0
  
@@ -400,8 +409,8 @@ diff -Naurp lirc-0.8.4.orig/remotes/vlsystem/lircd.conf.mplay lirc-0.8.4/remotes
            KEY_STOP                     0x19
 -          |<<                      0x1A
 -          >>|                      0x1B
-+          KEY_PREVIOUS                      0x1A
-+          KEY_NEXT                      0x1B
++          KEY_PREVIOUS                 0x1A
++          KEY_NEXT                     0x1B
            KEY_RECORD                   0x1C
            KEY_REWIND                       0x1D
            KEY_FORWARD                       0x1E
diff --git a/lirc.spec b/lirc.spec
index 25e710e..e0fe821 100644
--- a/lirc.spec
+++ b/lirc.spec
@@ -17,8 +17,8 @@
 #define pre     pre2
 
 Name:           lirc
-Version:        0.8.4
-Release:        2%{?pre:.%{pre}}%{?dist}
+Version:        0.8.4a
+Release:        1%{?pre:.%{pre}}%{?dist}
 Summary:        The Linux Infrared Remote Control package
 
 Group:          System Environment/Daemons
@@ -265,6 +265,10 @@ fi
 
 
 %changelog
+* Sun Oct 26 2008 - Jarod Wilson <jarod@redhat.com> - 0.8.4a-1
+- Update to lirc 0.8.4a release (fixes mode2 irrecord failures)
+- Really fix the mceusb remote config file this time
+
 * Thu Oct 16 2008 - Jarod Wilson <jarod@redhat.com> - 0.8.4-2
 - Make all remote configs have unique names (#467303)
 - Fix up some key names that got screwed up by standardization script
diff --git a/sources b/sources
index 6b75a45..4342ac4 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-8f3ba7eb57529992f3991d6981a3feb6  lirc-0.8.4.tar.bz2
+606b714ed843d28060163ffc571fc1f7  lirc-0.8.4a.tar.bz2

From 7d79c43527e34f6dd6f48227200f7280481aaffd Mon Sep 17 00:00:00 2001
From: Jarod Wilson <jwilson@fedoraproject.org>
Date: Mon, 8 Dec 2008 22:40:31 +0000
Subject: [PATCH 054/204] - Nuke bogus and harmful %postun --try-restart
 (#474960) - Assorted updates from lirc cvs: Add uinput injection support Add
 support for binding lircd listener to a specific ip

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

diff --git a/lirc.spec b/lirc.spec
index e0fe821..24c4c81 100644
--- a/lirc.spec
+++ b/lirc.spec
@@ -18,7 +18,7 @@
 
 Name:           lirc
 Version:        0.8.4a
-Release:        1%{?pre:.%{pre}}%{?dist}
+Release:        2%{?pre:.%{pre}}%{?dist}
 Summary:        The Linux Infrared Remote Control package
 
 Group:          System Environment/Daemons
@@ -34,6 +34,7 @@ Patch0:         lirc-use-new-instead-of-conf-as-filename-suffix.patch
 Patch1:		lirc-0.8.4-standardize-remote-keycodes.patch
 Patch2:         lirc-0.8.4-make-remote-names-all-unique.patch
 Patch3:         lirc-0.8.4-standardized-name-fixups.patch
+Patch4:         lirc-0.8.4-cvs-update.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  %{__perl}
@@ -154,6 +155,7 @@ touch -r aclocal.m4 configure.ac # avoid autofoo re-run
 %patch1 -p1
 %patch2 -p1
 %patch3 -p1
+%patch4 -p1
 
 %build
 %configure \
@@ -222,11 +224,6 @@ if [ $1 -eq 0 ] ; then
   /sbin/chkconfig --del lirc || :
 fi
 
-%postun
-if [ $1 -gt 0 ] ; then
-  %{_initrddir}/lirc try-restart >/dev/null || :
-fi
-
 %postun libs -p /sbin/ldconfig
 
 
@@ -265,6 +262,12 @@ fi
 
 
 %changelog
+* Mon Dec 08 2008 - Jarod Wilson <jarod@redhat.com> - 0.8.4a-2
+- Nuke bogus and harmful %%postun --try-restart (#474960)
+- Assorted updates from lirc cvs:
+  * Add uinput injection support
+  * Add support for binding lircd listener to a specific ip
+
 * Sun Oct 26 2008 - Jarod Wilson <jarod@redhat.com> - 0.8.4a-1
 - Update to lirc 0.8.4a release (fixes mode2 irrecord failures)
 - Really fix the mceusb remote config file this time

From 5566f87afee61efa0c23aa6b873c6f6a482b3c68 Mon Sep 17 00:00:00 2001
From: Jarod Wilson <jwilson@fedoraproject.org>
Date: Mon, 8 Dec 2008 22:43:17 +0000
Subject: [PATCH 055/204] dammit. I hate cvs.

---
 lirc-0.8.4-cvs-update.patch | 763 ++++++++++++++++++++++++++++++++++++
 1 file changed, 763 insertions(+)
 create mode 100644 lirc-0.8.4-cvs-update.patch

diff --git a/lirc-0.8.4-cvs-update.patch b/lirc-0.8.4-cvs-update.patch
new file mode 100644
index 0000000..80e29e9
--- /dev/null
+++ b/lirc-0.8.4-cvs-update.patch
@@ -0,0 +1,763 @@
+diff -Naurp lirc-0.8.4a.orig/daemons/hw_devinput.c lirc-0.8.4a.upd/daemons/hw_devinput.c
+--- lirc-0.8.4a.orig/daemons/hw_devinput.c	2008-03-02 14:16:30.000000000 -0500
++++ lirc-0.8.4a.upd/daemons/hw_devinput.c	2008-12-08 17:10:05.072745094 -0500
+@@ -220,7 +220,7 @@ int devinput_init()
+ 	if (ioctl(hw.fd, EVIOCGRAB, 1) == -1)
+ 	{
+ 		logprintf(LOG_WARNING, "can't get exclusive access to events "
+-			  "comming from `%s' interface",
++			  "coming from `%s' interface",
+ 			  hw.device);
+ 	}
+ #endif
+diff -Naurp lirc-0.8.4a.orig/daemons/irrecord.c lirc-0.8.4a.upd/daemons/irrecord.c
+--- lirc-0.8.4a.orig/daemons/irrecord.c	2008-12-08 16:47:25.358745194 -0500
++++ lirc-0.8.4a.upd/daemons/irrecord.c	2008-12-08 16:55:26.208557409 -0500
+@@ -1395,6 +1395,7 @@ void analyse_remote(struct ir_remote *ra
+ 	next_code = NULL;
+ 	current_code = NULL;
+ 	current_index = 0;
++	memset(&remote, 0, sizeof(remote));
+ 	get_lengths(&remote, 0, 0 /* not interactive */ );
+ 
+ 	if(is_rc6(&remote))
+diff -Naurp lirc-0.8.4a.orig/daemons/lircd.c lirc-0.8.4a.upd/daemons/lircd.c
+--- lirc-0.8.4a.orig/daemons/lircd.c	2008-10-04 17:48:43.000000000 -0400
++++ lirc-0.8.4a.upd/daemons/lircd.c	2008-12-08 17:06:32.108557638 -0500
+@@ -1,4 +1,4 @@
+-/*      $Id: lircd.c,v 5.80 2008/10/04 21:48:43 lirc Exp $      */
++/*       $Id: lircd.c,v 5.82 2008/12/06 20:00:03 lirc Exp $      */
+ 
+ /****************************************************************************
+  ** lircd.c *****************************************************************
+@@ -57,6 +57,12 @@
+ #include <fcntl.h>
+ #include <sys/file.h>
+ 
++#if defined(__linux__)
++#include <linux/input.h>
++#include <linux/uinput.h>
++#include "input_map.h"
++#endif
++
+ #if defined __APPLE__
+ #include <sys/ioccom.h>
+ #endif
+@@ -151,31 +157,40 @@ FILE *lf=NULL;
+ 
+ /* quite arbitrary limits */
+ #define MAX_PEERS	100
+-/* substract one for lirc, sockfd, sockinet, logfile, pidfile */
+-#define MAX_CLIENTS     (FD_SETSIZE-5-MAX_PEERS)
++/* substract one for lirc, sockfd, sockinet, logfile, pidfile, uinput */
++#define MAX_CLIENTS     (FD_SETSIZE-6-MAX_PEERS)
+ 
+ int sockfd, sockinet;
++static int uinputfd = -1;
+ int clis[MAX_CLIENTS];
+ 
+ #define CT_LOCAL  1
+ #define CT_REMOTE 2
+ 
+-int cli_type[MAX_CLIENTS];
+-int clin=0;
++static int cli_type[MAX_CLIENTS];
++static int clin=0;
+ 
+ int listen_tcpip=0;
+ unsigned short int port=LIRC_INET_PORT;
++struct in_addr address;
+ 
+ struct	peer_connection *peers[MAX_PEERS];
+ int	peern = 0;
+ 
+ int debug=0;
+-int daemonized=0;
+-int allow_simulate=0;
++static int daemonized=0;
++static int allow_simulate=0;
++static int userelease=0;
++static int useuinput=0;
+ 
+ static sig_atomic_t term=0,hup=0,alrm=0;
+ static int termsig;
+ 
++inline int use_hw()
++{
++	return (clin>0 || (useuinput && uinputfd != -1) || repeat_remote != NULL);
++}
++
+ /* set_transmitters only supports 32 bit int */
+ #define MAX_TX (CHAR_BIT*sizeof(unsigned long))
+ 
+@@ -303,6 +318,7 @@ void dosigterm(int sig)
+ 		free_config(free_remotes);
+ 	}
+ 	free_config(remotes);
++	repeat_remote = NULL;
+ 	logprintf(LOG_NOTICE,"caught signal");
+ 	for (i=0; i<clin; i++)
+ 	{
+@@ -311,6 +327,13 @@ void dosigterm(int sig)
+ 	};
+ 	shutdown(sockfd,2);
+ 	close(sockfd);
++
++	if(uinputfd != -1)
++	{
++		ioctl(uinputfd, UI_DEV_DESTROY);
++		close(uinputfd);
++		uinputfd = -1;
++	}
+ 	if(listen_tcpip)
+ 	{
+ 		shutdown(sockinet,2);
+@@ -318,7 +341,7 @@ void dosigterm(int sig)
+ 	}
+ 	fclose(pidf);
+ 	(void) unlink(pidfile);
+-	if(clin>0 && hw.deinit_func) hw.deinit_func();
++	if(use_hw() && hw.deinit_func) hw.deinit_func();
+ #ifdef USE_SYSLOG
+ 	closelog();
+ #else
+@@ -387,6 +410,52 @@ void dosighup(int sig)
+       }
+ }
+ 
++int setup_uinputfd(const char *name)
++{
++#if defined(__linux__)
++	int fd;
++	int key;
++	struct uinput_user_dev dev;
++	
++	fd = open("/dev/input/uinput", O_RDWR);
++	if(fd == -1)
++	{
++		fprintf(stderr, "could not open %s\n", "uinput");
++		perror(NULL);
++		return -1;
++	}
++	memset(&dev, 0, sizeof(dev));
++	strncpy(dev.name, name, sizeof(dev.name));
++	dev.name[sizeof(dev.name)-1] = 0;
++	if(write(fd, &dev, sizeof(dev)) != sizeof(dev) ||
++	   ioctl(fd, UI_SET_EVBIT, EV_KEY) != 0 ||
++	   ioctl(fd, UI_SET_EVBIT, EV_REP) != 0)
++	{
++		goto setup_error;
++	}
++
++        for(key = KEY_RESERVED; key <= KEY_UNKNOWN; key++)
++	{
++                if(ioctl(fd, UI_SET_KEYBIT, key) != 0)
++		{
++			goto setup_error;
++                }
++	}
++
++	if(ioctl(fd, UI_DEV_CREATE) != 0)
++	{
++		goto setup_error;
++	}
++	return fd;
++	
++ setup_error:
++	fprintf(stderr, "could not setup %s\n", "uinput");
++	perror(NULL);
++	close(fd);
++#endif
++	return -1;
++}
++
+ void config(void)
+ {
+ 	FILE *fd;
+@@ -448,9 +517,7 @@ void remove_client(int fd)
+ 			logprintf(LOG_INFO,"removed client");
+ 			
+ 			clin--;
+-			if(clin==0 &&
+-			   repeat_remote==NULL &&
+-			   hw.deinit_func)
++			if(!use_hw() && hw.deinit_func)
+ 			{
+ 				hw.deinit_func();
+ 			}
+@@ -508,8 +575,8 @@ void add_client(int sock)
+ 	{
+ 		cli_type[clin]=0; /* what? */
+ 	}
+-	clis[clin++]=fd;
+-	if(clin==1 && repeat_remote==NULL)
++	clis[clin]=fd;
++	if(!use_hw())
+ 	{
+ 		if(hw.init_func)
+ 		{
+@@ -525,6 +592,7 @@ void add_client(int sock)
+ 			}
+ 		}
+ 	}
++	clin++;
+ }
+ 
+ int add_peer_connection(char *server)
+@@ -799,6 +867,10 @@ void start_server(mode_t permission,int 
+ 	listen(sockfd,3);
+ 	nolinger(sockfd);
+ 
++	if(useuinput)
++	{
++		uinputfd = setup_uinputfd(progname);
++	}
+ 	if(listen_tcpip)
+ 	{
+ 		int enable=1;
+@@ -815,7 +887,7 @@ void start_server(mode_t permission,int 
+ 		(void) setsockopt(sockinet,SOL_SOCKET,SO_REUSEADDR,
+ 				  &enable,sizeof(enable));
+ 		serv_addr_in.sin_family=AF_INET;
+-		serv_addr_in.sin_addr.s_addr=htonl(INADDR_ANY);
++		serv_addr_in.sin_addr=address;
+ 		serv_addr_in.sin_port=htons(port);
+ 		
+ 		if(bind(sockinet,(struct sockaddr *) &serv_addr_in,
+@@ -995,7 +1067,7 @@ void dosigalrm(int sig)
+ 			free(repeat_message);
+ 			repeat_message=NULL;
+ 		}
+-		if(clin==0 && repeat_remote==NULL && hw.deinit_func)
++		if(!use_hw() && hw.deinit_func)
+ 		{
+ 			hw.deinit_func();
+ 		}
+@@ -1025,7 +1097,7 @@ void dosigalrm(int sig)
+ 		repeat_message=NULL;
+ 		repeat_fd=-1;
+ 	}
+-	if(clin==0 && repeat_remote==NULL && hw.deinit_func)
++	if(!use_hw() && hw.deinit_func)
+ 	{
+ 		hw.deinit_func();
+ 	}
+@@ -1645,13 +1717,21 @@ void free_old_remotes()
+ 	struct ir_remote *scan_remotes,*found;
+ 	struct ir_ncode *code;
+ 	const char *release_event;
++	const char *release_remote_name;
++	const char *release_button_name;
+ 	
+ 	if(decoding ==free_remotes) return;
+ 	
+-	release_event = release_map_remotes(free_remotes, remotes);
++	release_event = release_map_remotes(free_remotes, remotes,
++					    &release_remote_name,
++					    &release_button_name);
+ 	if(release_event != NULL)
+ 	{
+-		broadcast_message(release_event);
++		input_message(release_event,
++			      release_remote_name,
++			      release_button_name,
++			      0,
++			      1);
+ 	}
+ 	if(last_remote!=NULL)
+ 	{
+@@ -1741,19 +1821,56 @@ void free_old_remotes()
+ 	}
+ }
+ 
+-void broadcast_message(const char *message)
++void input_message(const char *message, const char *remote_name,
++		   const char *button_name, int reps, int release)
+ {
+-	int len,i;
+ 	const char *release_message;
++	const char *release_remote_name;
++	const char *release_button_name;
+ 
+-	release_message = check_release_event();
++	release_message = check_release_event(&release_remote_name,
++					      &release_button_name);
+ 	if(release_message)
+ 	{
+-		broadcast_message(release_message);
++		input_message(release_message, release_remote_name,
++			      release_button_name, 0, 1);
++	}
++	
++	if(!release || userelease)
++	{
++		broadcast_message(message);
+ 	}
++	
++#ifdef __linux__
++	if(uinputfd != -1)
++	{
++		linux_input_code input_code;
++		
++		if(reps < 2 &&
++		   get_input_code(button_name, &input_code) != -1)
++		{
++			struct input_event event;
++			
++			memset(&event, 0, sizeof(event));
++			event.type = EV_KEY;
++			event.code = input_code;
++			event.value = release ? 0 : (reps>0 ? 2:1);
++			if(write(uinputfd, &event, sizeof(event)) != sizeof(event))
++			{
++				logprintf(LOG_ERR, "writing to uinput failed");
++				logperror(LOG_ERR, NULL);
++			}
++		}
++	}
++#endif
++}
+ 
++void broadcast_message(const char *message)
++{
++	int len,i;
++	
+ 	len=strlen(message);
+-			
++	
+ 	for (i=0; i<clin; i++)
+ 	{
+ 		LOGPRINTF(1,"writing to client %d",i);
+@@ -1799,7 +1916,7 @@ int waitfordata(long maxusec)
+ 				FD_SET(sockinet,&fds);
+ 				maxfd=max(maxfd,sockinet);
+ 			}
+-			if(clin>0 && hw.rec_mode!=0 && hw.fd!=-1)
++			if(use_hw() && hw.rec_mode!=0 && hw.fd!=-1)
+ 			{
+ 				FD_SET(hw.fd,&fds);
+ 				maxfd=max(maxfd,hw.fd);
+@@ -1915,10 +2032,19 @@ int waitfordata(long maxusec)
+ 			   timercmp(&now, &release_time, >))
+ 			{
+ 				const char *release_message;
+-				release_message = trigger_release_event();
++				const char *release_remote_name;
++				const char *release_button_name;
++				
++				release_message = trigger_release_event
++					(&release_remote_name,
++					 &release_button_name);
+ 				if(release_message)
+ 				{
+-					broadcast_message(release_message);
++					input_message(release_message,
++						      release_remote_name,
++						      release_button_name,
++						      0,
++						      1);
+ 				}
+ 			}
+ 			if(free_remotes!=NULL)
+@@ -1948,7 +2074,9 @@ int waitfordata(long maxusec)
+ 		}
+ 		while(ret==-1 && errno==EINTR);
+ 		
+-		if(hw.fd == -1 && clin > 0 && hw.init_func)
++		if(hw.fd == -1 &&
++		   use_hw() &&
++		   hw.init_func)
+ 		{
+ 			log_enable(0);
+ 			hw.init_func();
+@@ -1993,7 +2121,7 @@ int waitfordata(long maxusec)
+ 			LOGPRINTF(1,"registering inet client");
+ 			add_client(sockinet);
+ 		}
+-                if(clin>0 && hw.rec_mode!=0 && hw.fd!=-1 &&
++                if(use_hw() && hw.rec_mode!=0 && hw.fd!=-1 &&
+ 		   FD_ISSET(hw.fd,&fds))
+                 {
+ 			register_input();
+@@ -2016,13 +2144,20 @@ void loop()
+ 		
+ 		if(message!=NULL)
+ 		{
++			const char *remote_name;
++			const char *button_name;
++			int reps;
++			
+ 			if(hw.ioctl_func &&
+ 			   (hw.features&LIRC_CAN_NOTIFY_DECODE))
+ 			{
+ 				hw.ioctl_func(LIRC_NOTIFY_DECODE, NULL);
+ 			}
+ 			
+-			broadcast_message(message);
++			get_release_data(&remote_name, &button_name, &reps);
++
++			input_message(message, remote_name, button_name,
++				      reps, 0);
+ 		}
+ 	}
+ }
+@@ -2034,6 +2169,7 @@ int main(int argc,char **argv)
+ 	mode_t permission=S_IRUSR|S_IWUSR|S_IRGRP|S_IWGRP|S_IROTH|S_IWOTH;
+ 	char *device=NULL;
+ 
++	address.s_addr = htonl(INADDR_ANY);
+ 	hw_choose_driver(NULL);
+ 	while(1)
+ 	{
+@@ -2058,9 +2194,15 @@ int main(int argc,char **argv)
+ #                       endif
+ 			{"release",optional_argument,NULL,'r'},
+ 			{"allow-simulate",no_argument,NULL,'a'},
++#                       if defined(__linux__)
++			{"uinput",no_argument,NULL,'u'},
++#                       endif
+ 			{0, 0, 0, 0}
+ 		};
+ 		c = getopt_long(argc,argv,"hvnp:H:d:o:P:l::c:r::a"
++#                               if defined(__linux__)
++				"u"
++#                               endif
+ #                               ifndef USE_SYSLOG
+ 				"L:"
+ #                               endif
+@@ -2080,7 +2222,7 @@ int main(int argc,char **argv)
+ 			printf("\t -p --permission=mode\t\tfile permissions for " LIRCD "\n");
+ 			printf("\t -H --driver=driver\t\tuse given driver\n");
+ 			printf("\t -d --device=device\t\tread from given device\n");
+-			printf("\t -l --listen[=port]\t\tlisten for network connections on port\n");
++			printf("\t -l --listen[=[addresss:]port]\t\tlisten for network connections\n");
+ 			printf("\t -c --connect=host[:port]\tconnect to remote lircd server\n");
+                         printf("\t -o --output=socket\t\toutput socket filename\n");
+                         printf("\t -P --pidfile=file\t\tdaemon pid file\n");
+@@ -2092,6 +2234,9 @@ int main(int argc,char **argv)
+ #                       endif
+ 			printf("\t -r --release[=suffix]\t\tauto-generate release events\n");
+ 			printf("\t -a --allow-simulate\t\taccept SIMULATE command\n");
++#                       if defined(__linux__)
++			printf("\t -u --uinput\t\tgenerate Linux input events\n");
++#                       endif
+ 			return(EXIT_SUCCESS);
+ 		case 'v':
+ 			printf("%s %s\n",progname,VERSION);
+@@ -2135,16 +2280,28 @@ int main(int argc,char **argv)
+ 			{
+ 				long p;
+ 				char *endptr;
+-				
+-				p=strtol(optarg,&endptr,10);
++				char *sep = strchr(optarg, ':');
++				char *port_str = sep ? sep + 1 : optarg;
++				p=strtol(port_str,&endptr,10);
+ 				if(!*optarg || *endptr || p<1 || p>USHRT_MAX)
+ 				{
+ 					fprintf(stderr,
+ 						"%s: bad port number \"%s\"\n",
+-						progname,optarg);
++						progname,port_str);
+ 					return(EXIT_FAILURE);
+ 				}
+ 				port=(unsigned short int) p;
++				if (sep)
++				{
++					*sep = 0;
++					if(!inet_aton(optarg, &address))
++					{
++						fprintf(stderr,
++							"%s: bad address \"%s\"\n",
++							progname,optarg);
++						return(EXIT_FAILURE);
++					}
++				}
+ 			}
+ 			else
+ 			{
+@@ -2174,10 +2331,16 @@ int main(int argc,char **argv)
+ 			{
+ 				set_release_suffix(LIRC_RELEASE_SUFFIX);
+ 			}
++			userelease=1;
+ 			break;
+ 		case 'a':
+ 			allow_simulate=1;
+ 			break;
++#               if defined(__linux__)
++		case 'u':
++			useuinput=1;
++			break;
++#               endif
+ 		default:
+ 			printf("Usage: %s [options] [config-file]\n",progname);
+ 			return(EXIT_FAILURE);
+diff -Naurp lirc-0.8.4a.orig/daemons/lircd.h lirc-0.8.4a.upd/daemons/lircd.h
+--- lirc-0.8.4a.orig/daemons/lircd.h	2007-09-29 13:13:14.000000000 -0400
++++ lirc-0.8.4a.upd/daemons/lircd.h	2008-12-08 16:54:04.374682209 -0500
+@@ -32,6 +32,7 @@ void sigterm(int sig);
+ void dosigterm(int sig);
+ void sighup(int sig);
+ void dosighup(int sig);
++int setup_uinput(const char *name);
+ void config(void);
+ void nolinger(int sock);
+ void remove_client(int fd);
+@@ -76,6 +77,8 @@ int send_core(int fd,char *message,char 
+ int version(int fd,char *message,char *arguments);
+ int get_pid(int fd,char *message,char *arguments);
+ int get_command(int fd);
++void input_message(const char *message, const char *remote_name,
++		   const char *button_name, int reps, int release);
+ void broadcast_message(const char *message);
+ int waitfordata(long maxusec);
+ void loop(void);
+diff -Naurp lirc-0.8.4a.orig/daemons/Makefile.am lirc-0.8.4a.upd/daemons/Makefile.am
+--- lirc-0.8.4a.orig/daemons/Makefile.am	2008-09-21 14:33:19.000000000 -0400
++++ lirc-0.8.4a.upd/daemons/Makefile.am	2008-12-08 16:50:31.050433540 -0500
+@@ -59,7 +59,8 @@ libhw_module_a_DEPENDENCIES = @hw_module
+ sbin_PROGRAMS = lircd lircmd
+ 
+ lircd_SOURCES = lircd.c lircd.h \
+-		config_file.c config_file.h
++		config_file.c config_file.h \
++		input_map.c input_map.h
+ lircd_LDADD = @daemon@ libhw_module.a @hw_module_libs@
+ 
+ lircmd_SOURCES = lircmd.c
+@@ -79,6 +80,7 @@ EXTRA_PROGRAMS = lircd.simsend lircd.sim
+ noinst_PROGRAMS = @maintmode_daemons_extra@
+ lircd_simsend_SOURCES = lircd.c ir_remote.c config_file.c \
+ 		lircd.h ir_remote.h ir_remote_types.h config_file.h \
++		input_map.c input_map.h \
+ 		hw-types.c hw-types.h hardware.h \
+ 		hw_default.c hw_default.h \
+ 		receive.c receive.h \
+@@ -87,6 +89,7 @@ lircd_simsend_SOURCES = lircd.c ir_remot
+ lircd_simsend_CFLAGS = -DSIM_SEND
+ lircd_simrec_SOURCES = lircd.c ir_remote.c config_file.c \
+ 		lircd.h ir_remote.h ir_remote_types.h config_file.h \
++		input_map.c input_map.h \
+ 		hw-types.c hw-types.h hardware.h \
+ 		hw_default.c hw_default.h \
+ 		receive.c receive.h \
+diff -Naurp lirc-0.8.4a.orig/daemons/release.c lirc-0.8.4a.upd/daemons/release.c
+--- lirc-0.8.4a.orig/daemons/release.c	2008-02-06 08:43:07.000000000 -0500
++++ lirc-0.8.4a.upd/daemons/release.c	2008-12-08 16:59:03.799472804 -0500
+@@ -1,4 +1,4 @@
+-/*      $Id: release.c,v 1.3 2008/02/06 13:43:07 lirc Exp $      */
++/*      $Id: release.c,v 1.4 2008/12/06 20:00:03 lirc Exp $      */
+ 
+ /****************************************************************************
+  ** release.c ***************************************************************
+@@ -25,24 +25,23 @@ static struct timeval release_time;
+ static struct ir_remote *release_remote;
+ static struct ir_ncode *release_ncode;
+ static ir_code release_code;
++static int release_reps;
+ static lirc_t release_gap;
+ 
+ static struct ir_remote *release_remote2;
+ static struct ir_ncode *release_ncode2;
+ static ir_code release_code2;
+-static const char *release_suffix = NULL;
++static const char *release_suffix = LIRC_RELEASE_SUFFIX;
+ static char message[PACKET_SIZE+1];
+ 
+ void register_input(void)
+ {
+ 	struct timeval gap;
+ 	
+-	if(release_suffix == NULL) return;
+-	
+ 	if(release_remote == NULL) return;
+ 	
+ 	timerclear(&gap);
+-	gap.tv_usec = 2*release_gap;
++	gap.tv_usec = 3*release_gap;
+ 	
+ 	gettimeofday(&release_time,NULL);
+ 	timeradd(&release_time, &gap, &release_time);
+@@ -51,8 +50,6 @@ void register_input(void)
+ void register_button_press(struct ir_remote *remote, struct ir_ncode *ncode,
+ 			   ir_code code, int reps)
+ {
+-	if(release_suffix == NULL) return;
+-	
+ 	if(reps == 0 && release_remote != NULL)
+ 	{
+ 		release_remote2 = release_remote;
+@@ -63,11 +60,21 @@ void register_button_press(struct ir_rem
+ 	release_remote = remote;
+ 	release_ncode = ncode;
+ 	release_code = code;
++	release_reps = reps;
+ 	release_gap = remote->max_remaining_gap;
+ 	
+ 	register_input();
+ }
+ 
++void get_release_data(const char **remote_name,
++		      const char **button_name,
++		      int *reps)
++{
++	*remote_name = release_remote->name;
++	*button_name = release_ncode->name;
++	*reps = release_reps;
++}
++
+ void set_release_suffix(const char *s)
+ {
+ 	release_suffix = s;
+@@ -78,12 +85,15 @@ void get_release_time(struct timeval *tv
+ 	*tv = release_time;
+ }
+ 
+-const char *check_release_event(void)
++const char *check_release_event(const char **remote_name,
++				const char **button_name)
+ {
+ 	int len = 0;
+ 	
+ 	if(release_remote2 != NULL)
+ 	{
++		*remote_name = release_remote2->name;
++		*button_name = release_ncode2->name;
+ 		len = write_message(message, PACKET_SIZE+1,
+ 				    release_remote2->name,
+ 				    release_ncode2->name, release_suffix,
+@@ -98,18 +108,21 @@ const char *check_release_event(void)
+ 			return(NULL);
+ 		}
+ 
+-		logprintf(LOG_INFO, "check");
++		LOGPRINTF(3, "check");
+ 		return message;
+ 	}
+ 	return NULL;
+ }
+ 
+-const char *trigger_release_event(void)
++const char *trigger_release_event(const char **remote_name,
++				  const char **button_name)
+ {
+ 	int len = 0;
+ 	
+ 	if(release_remote != NULL)
+ 	{
++		*remote_name = release_remote->name;
++		*button_name = release_ncode->name;
+ 		len = write_message(message, PACKET_SIZE+1,
+ 				    release_remote->name, release_ncode->name,
+ 				    release_suffix, release_code, 0);
+@@ -123,13 +136,15 @@ const char *trigger_release_event(void)
+ 			logprintf(LOG_ERR,"message buffer overflow");
+ 			return(NULL);
+ 		}
+-		logprintf(LOG_INFO, "trigger");
++		LOGPRINTF(3, "trigger");
+ 		return message;
+ 	}
+ 	return NULL;
+ }
+ 
+-const char *release_map_remotes(struct ir_remote *old, struct ir_remote *new)
++const char *release_map_remotes(struct ir_remote *old, struct ir_remote *new,
++				const char **remote_name,
++				const char **button_name)
+ {
+ 	struct ir_remote *remote;
+ 	struct ir_ncode *ncode;
+@@ -150,7 +165,7 @@ const char *release_map_remotes(struct i
+ 		}
+ 		else
+ 		{
+-			return trigger_release_event();
++			return trigger_release_event(remote_name, button_name);
+ 		}
+ 	}
+ 	return NULL;
+diff -Naurp lirc-0.8.4a.orig/daemons/release.h lirc-0.8.4a.upd/daemons/release.h
+--- lirc-0.8.4a.orig/daemons/release.h	2007-05-06 07:54:02.000000000 -0400
++++ lirc-0.8.4a.upd/daemons/release.h	2008-12-08 16:58:00.938502877 -0500
+@@ -1,4 +1,4 @@
+-/*      $Id: release.h,v 1.1 2007/05/06 11:54:02 lirc Exp $      */
++/*      $Id: release.h,v 1.2 2008/12/06 20:00:03 lirc Exp $      */
+ 
+ /****************************************************************************
+  ** release.h ***************************************************************
+@@ -18,10 +18,17 @@
+ void register_input(void);
+ void register_button_press(struct ir_remote *remote, struct ir_ncode *ncode,
+ 			   ir_code code, int reps);
++void get_release_data(const char **remote_name,
++		      const char **button_name,
++		      int *reps);
+ void set_release_suffix(const char *s);
+ void get_release_time(struct timeval *tv);
+-const char *check_release_event(void);
+-const char *trigger_release_event(void);
+-const char *release_map_remotes(struct ir_remote *old, struct ir_remote *new);
++const char *check_release_event(const char **remote_name,
++				const char **button_name);
++const char *trigger_release_event(const char **remote_name,
++				  const char **button_name);
++const char *release_map_remotes(struct ir_remote *old, struct ir_remote *new
++				const char **remote_name,
++				const char **button_name);
+ 
+ #endif /* RELEASE_H */
+diff -Naurp lirc-0.8.4a.orig/doc/man/lircd.8 lirc-0.8.4a.upd/doc/man/lircd.8
+--- lirc-0.8.4a.orig/doc/man/lircd.8	2008-10-26 10:15:37.000000000 -0400
++++ lirc-0.8.4a.upd/doc/man/lircd.8	2008-12-08 17:14:44.574433177 -0500
+@@ -70,8 +70,9 @@ the device name isn't fixed. \fISTRING\f
+ wildcards and '\\' to mark them as literal.
+ 
+ With the --listen option you can let lircd listen for network
+-connections on the given port. The default port is 8765. No security
+-checks are currently implemented.
++connections on the given address/port. The default address is 0.0.0.0,
++which means that connections on all network interfaces will be accepted.
++The default port is 8765. No security checks are currently implemented.
+ 
+ The --connect option allows you to connect to other lircd servers that
+ provide a network socket at the given host and port number. The number
+@@ -99,6 +100,14 @@ users with access to the lircd socket wi
+ E.g. if you have configured your system to shut down by a button press
+ on your remote control, everybody will be able to shut down
+ your system from the command line.
++
++On Linux systems the --uinput option will enable automatic generation
++of Linux input events. lircd will open /dev/input/uinput and inject
++key events to the Linux kernel. The key code depends on the name that
++was given a button in the lircd config file, e.g. if the button is
++named KEY_1, the '1' key code will be generated. You will find a
++complete list of possible button names in /usr/include/linux/input.h.
++
+ .SH FILES
+ 
+ The config file for lircd is located in /etc/lircd.conf. lircd
+diff -Naurp lirc-0.8.4a.orig/NEWS lirc-0.8.4a.upd/NEWS
+--- lirc-0.8.4a.orig/NEWS	2008-12-08 16:47:25.391622403 -0500
++++ lirc-0.8.4a.upd/NEWS	2008-12-08 17:40:05.345432825 -0500
+@@ -1,3 +1,7 @@
++0.8.5-CVS: future
++  * Linux input event generation using uinput
++  * standardised namespace following Linux input conventions
++
+ 0.8.4a: 10/26/08
+   * fixed show-stopper bug in irrecord for drivers using MODE2
+ 
+diff -Naurp lirc-0.8.4a.orig/TODO lirc-0.8.4a.upd/TODO
+--- lirc-0.8.4a.orig/TODO	2008-07-31 07:17:53.000000000 -0400
++++ lirc-0.8.4a.upd/TODO	2008-12-08 17:40:51.546432812 -0500
+@@ -2,8 +2,6 @@
+ 
+ * __init, __exit
+ 
+-* uinput
+-
+ * namespace
+ 
+ * GUI for irrecord

From 46618705b52466a7b3b2186c855e1fe6e079d4a4 Mon Sep 17 00:00:00 2001
From: Jarod Wilson <jwilson@fedoraproject.org>
Date: Mon, 8 Dec 2008 23:14:04 +0000
Subject: [PATCH 056/204] ...and it helps to make sure the patch is complete,
 and that everything     builds...

---
 lirc-0.8.4-cvs-update.patch | 455 +++++++++++++++++++++++++++++++++++-
 lirc.spec                   |   6 +-
 2 files changed, 451 insertions(+), 10 deletions(-)

diff --git a/lirc-0.8.4-cvs-update.patch b/lirc-0.8.4-cvs-update.patch
index 80e29e9..4c6ddb6 100644
--- a/lirc-0.8.4-cvs-update.patch
+++ b/lirc-0.8.4-cvs-update.patch
@@ -10,17 +10,424 @@ diff -Naurp lirc-0.8.4a.orig/daemons/hw_devinput.c lirc-0.8.4a.upd/daemons/hw_de
  			  hw.device);
  	}
  #endif
+diff -Naurp lirc-0.8.4a.orig/daemons/input_map.c lirc-0.8.4a.upd/daemons/input_map.c
+--- lirc-0.8.4a.orig/daemons/input_map.c	1969-12-31 19:00:00.000000000 -0500
++++ lirc-0.8.4a.upd/daemons/input_map.c	2008-12-08 17:51:33.087443731 -0500
+@@ -0,0 +1,58 @@
++/*      $Id: input_map.c,v 5.1 2008/10/26 15:10:17 lirc Exp $      */
++
++/****************************************************************************
++ ** input_map.c *************************************************************
++ ****************************************************************************
++ *
++ * input_map.c - button namespace derived from Linux input layer
++ *
++ * Copyright (C) 2008 Christoph Bartelmus <lirc@bartelmus.de>
++ *
++ */
++
++#include <stdlib.h>
++#include <string.h>
++
++#include "input_map.h"
++
++struct
++{
++	char *name;
++	linux_input_code code;
++
++} input_map[] = {
++#include "input_map.inc"
++	{NULL, 0}
++};
++
++int get_input_code(const char *name, linux_input_code *code)
++{
++	int i;
++	
++	for(i=0; input_map[i].name != NULL; i++)
++	{
++		if(strcasecmp(name, input_map[i].name) == 0)
++		{
++			*code = input_map[i].code;
++			return i;
++		}
++	}
++	return -1;
++}
++
++void fprint_namespace(FILE *f)
++{
++	int i;
++	
++	for(i=0; input_map[i].name != NULL; i++)
++	{
++		fprintf(stdout, "%s\n", input_map[i].name);
++	}
++}
++
++int is_in_namespace(const char *name)
++{
++	linux_input_code dummy;
++	
++	return get_input_code(name, &dummy) == -1 ? 0 : 1;
++}
+diff -Naurp lirc-0.8.4a.orig/daemons/input_map.h lirc-0.8.4a.upd/daemons/input_map.h
+--- lirc-0.8.4a.orig/daemons/input_map.h	1969-12-31 19:00:00.000000000 -0500
++++ lirc-0.8.4a.upd/daemons/input_map.h	2008-12-08 17:51:33.106519735 -0500
+@@ -0,0 +1,35 @@
++/*      $Id: input_map.h,v 5.1 2008/10/26 15:10:17 lirc Exp $      */
++
++/****************************************************************************
++ ** input_map.h *************************************************************
++ ****************************************************************************
++ *
++ * input_map.h - button namespace derived from Linux input layer
++ *
++ * Copyright (C) 2008 Christoph Bartelmus <lirc@bartelmus.de>
++ *
++ */
++
++#ifndef INPUT_MAP_H
++#define INPUT_MAP_H
++
++#include <stdio.h>
++#include <sys/types.h>
++#include <unistd.h>
++
++#if defined __linux__
++#include <linux/input.h>
++#include <linux/uinput.h>
++#endif
++
++#if defined __linux__
++typedef __u16 linux_input_code;
++#else
++typedef unsigned short linux_input_code;
++#endif
++
++int get_input_code(const char *name, linux_input_code *code);
++void fprint_namespace(FILE *f);
++int is_in_namespace(const char *name);
++
++#endif /* INPUT_MAP_H */
+diff -Naurp lirc-0.8.4a.orig/daemons/input_map.sh lirc-0.8.4a.upd/daemons/input_map.sh
+--- lirc-0.8.4a.orig/daemons/input_map.sh	1969-12-31 19:00:00.000000000 -0500
++++ lirc-0.8.4a.upd/daemons/input_map.sh	2008-12-08 17:51:33.106519735 -0500
+@@ -0,0 +1,11 @@
++#! /bin/sh
++
++TYPES="KEY BTN"
++file=${1:-/usr/include/linux/input.h}
++
++for type in $TYPES; do
++	grep "^#define ${type}_" < $file|sort|while read; do
++		sed --expression="s/^#define \([^ 	]*\)\(.*\)/{\"\1\", \2},/"|grep -v "KEY_HANGUEL\|KEY_MIN_INTERESTING"
++	done
++done
++
 diff -Naurp lirc-0.8.4a.orig/daemons/irrecord.c lirc-0.8.4a.upd/daemons/irrecord.c
 --- lirc-0.8.4a.orig/daemons/irrecord.c	2008-12-08 16:47:25.358745194 -0500
-+++ lirc-0.8.4a.upd/daemons/irrecord.c	2008-12-08 16:55:26.208557409 -0500
-@@ -1395,6 +1395,7 @@ void analyse_remote(struct ir_remote *ra
++++ lirc-0.8.4a.upd/daemons/irrecord.c	2008-12-08 18:10:06.096432179 -0500
+@@ -52,6 +52,7 @@
+ #include "ir_remote.h"
+ #include "config_file.h"
+ #include "receive.h"
++#include "input_map.h"
+ 
+ void flushhw(void);
+ int resethw(void);
+@@ -80,7 +81,7 @@ void get_scheme(struct ir_remote *remote
+ struct lengths *get_max_length(struct lengths *first,unsigned int *sump);
+ void unlink_length(struct lengths **first,struct lengths *remove);
+ int get_trail_length(struct ir_remote *remote, int interactive);
+-int get_lead_length(struct ir_remote *remote);
++int get_lead_length(struct ir_remote *remote, int interactive);
+ int get_repeat_length(struct ir_remote *remote, int interactive);
+ int get_header_length(struct ir_remote *remote, int interactive);
+ int get_data_length(struct ir_remote *remote, int interactive);
+@@ -96,7 +97,7 @@ const char *usage="Usage: %s [options] f
+ struct ir_remote remote;
+ struct ir_ncode ncode;
+ 
+-#define IRRECORD_VERSION "0.5"
++#define IRRECORD_VERSION "5.84"
+ #define BUTTON 80+1
+ #define RETRIES 10
+ 
+@@ -120,7 +121,7 @@ lirc_t aeps = 100;
+ #define TH_REPEAT      90
+ #define TH_TRAIL       90
+ #define TH_LEAD        90
+-#define TH_IS_BIT      15
++#define TH_IS_BIT      10
+ #define TH_RC6_SIGNAL 550
+ 
+ #define MIN_GAP  20000
+@@ -314,6 +315,7 @@ int main(int argc,char **argv)
+ 	int repeat_flag;
+ 	lirc_t min_remaining_gap, max_remaining_gap;
+ 	int force;
++	int disable_namespace = 0;
+ 	int retries;
+ 	int no_data = 0;
+ 	struct ir_remote *remotes=NULL;
+@@ -338,6 +340,8 @@ int main(int argc,char **argv)
+ 			{"device",required_argument,NULL,'d'},
+ 			{"driver",required_argument,NULL,'H'},
+ 			{"force",no_argument,NULL,'f'},
++			{"disable-namespace",no_argument,NULL,'n'},
++			{"list-namespace",no_argument,NULL,'l'},
+ #ifdef DEBUG
+ 			{"pre",no_argument,NULL,'p'},
+ 			{"post",no_argument,NULL,'P'},
+@@ -348,9 +352,9 @@ int main(int argc,char **argv)
+ 			{0, 0, 0, 0}
+ 		};
+ #ifdef DEBUG
+-		c = getopt_long(argc,argv,"hvad:H:fpPtiT",long_options,NULL);
++		c = getopt_long(argc,argv,"hvad:H:fnlpPtiT",long_options,NULL);
+ #else
+-		c = getopt_long(argc,argv,"hvad:H:f",long_options,NULL);
++		c = getopt_long(argc,argv,"hvad:H:fnl",long_options,NULL);
+ #endif
+ 		if(c==-1)
+ 			break;
+@@ -362,6 +366,8 @@ int main(int argc,char **argv)
+ 			printf("\t -v --version\t\tdisplay version\n");
+ 			printf("\t -a --analyse\t\tanalyse raw_codes config files\n");
+ 			printf("\t -f --force\t\tforce raw mode\n");
++			printf("\t -n --disable-namespace\t\tdisables namespace checks\n");
++			printf("\t -l --list-namespace\t\tlist valid button names\n");
+ 			printf("\t -H --driver=driver\tuse given driver\n");
+ 			printf("\t -d --device=device\tread from given device\n");
+ 			exit(EXIT_SUCCESS);
+@@ -385,6 +391,13 @@ int main(int argc,char **argv)
+ 		case 'f':
+ 			force=1;
+ 			break;
++		case 'n':
++			disable_namespace = 1;
++			break;
++		case 'l':
++			fprint_namespace(stdout);
++			exit(EXIT_SUCCESS);
++			break;
+ #ifdef DEBUG
+ 		case 'p':
+ 			get_pre=1;
+@@ -502,7 +515,7 @@ int main(int argc,char **argv)
+ 			exit(EXIT_FAILURE);
+ 		}
+ 		strcpy(filename_new, filename);
+-		strcat(filename_new, ".new");
++		strcat(filename_new, ".conf");
+ 		filename = filename_new;
+ 	}
+ 	else
+@@ -717,6 +730,17 @@ int main(int argc,char **argv)
+ 		{
+ 			break;
+ 		}
++		if(!disable_namespace && !is_in_namespace(buffer))
++		{
++			printf("'%s' is not in name space (use "
++			       "--disable-namespace to disable checks)\n",
++			       buffer);
++			printf("Use '%s --list-namespace' to see a full list "
++			       "of valid button names\n",
++			       progname);
++			printf("Please try again.\n");
++			continue;
++		}
+ 		
+ 		if(is_raw(&remote))
+ 		{
+@@ -1379,7 +1403,8 @@ void analyse_remote(struct ir_remote *ra
+ 	ir_code pre, code, post;
+ 	int repeat_flag;
+ 	lirc_t min_remaining_gap, max_remaining_gap;
+-	struct ir_ncode new_codes[100];
++	struct ir_ncode *new_codes;
++	size_t new_codes_count = 100;
+ 	int new_index = 0;
+ 	int ret;
+ 
+@@ -1395,18 +1420,27 @@ void analyse_remote(struct ir_remote *ra
  	next_code = NULL;
  	current_code = NULL;
  	current_index = 0;
 +	memset(&remote, 0, sizeof(remote));
  	get_lengths(&remote, 0, 0 /* not interactive */ );
  
- 	if(is_rc6(&remote))
+-	if(is_rc6(&remote))
++	if(is_rc6(&remote) && remote.bits >= 5)
+ 	{
+ 		/* have to assume something as it's very difficult to
+ 		   extract the rc6_mask from the data that we have */
+-		remote.rc6_mask = (ir_code) 0x100000000ll;
++		remote.rc6_mask = ((ir_code) 0x1ll) << (remote.bits-5);
+ 	}
+ 
+ 	remote.name = raw_data->name;
++	remote.freq = raw_data->freq;
+ 	
+-	memset(new_codes, 0, sizeof(new_codes));
++	new_codes = malloc(new_codes_count * sizeof(*new_codes));
++	if(new_codes == NULL)
++	{
++		fprintf(stderr, "%s: out of memory\n",
++			progname);
++		return;
++	}
++	memset(new_codes, 0 , new_codes_count * sizeof(*new_codes));
+ 	codes = raw_data->codes;
+ 	while(codes->name!=NULL)
+ 	{
+@@ -1429,6 +1463,25 @@ void analyse_remote(struct ir_remote *ra
+ 		}
+ 		else
+ 		{
++			if(new_index+1 >= new_codes_count)
++			{
++				struct ir_ncode *renew_codes;
++				
++				new_codes_count *= 2;
++				renew_codes = realloc
++					(new_codes,
++					 new_codes_count * sizeof(*new_codes));
++				if(renew_codes == NULL)
++				{
++					fprintf(stderr, "%s: out of memory\n",
++						progname);
++					free(new_codes);
++					return;
++				}
++				memset(&new_codes[new_codes_count/2], 0 , new_codes_count/2 * sizeof(*new_codes));
++				new_codes = renew_codes;
++			}
++			
+ 			new_codes[new_index].name = codes->name;
+ 			new_codes[new_index].code = code;
+ 			new_index++;
+@@ -1438,6 +1491,8 @@ void analyse_remote(struct ir_remote *ra
+ 	new_codes[new_index].name = NULL;
+ 	remote.codes = new_codes;
+ 	fprint_remotes(stdout, &remote);
++	remote.codes = NULL;
++	free(new_codes);
+ }
+ 
+ #ifdef DEBUG
+@@ -1610,7 +1665,7 @@ inline lirc_t calc_signal(struct lengths
+ int get_lengths(struct ir_remote *remote, int force, int interactive)
+ {
+ 	int retval;
+-	lirc_t data,average,sum,remaining_gap,header;
++	lirc_t data,average,maxspace,sum,remaining_gap,header;
+ 	enum analyse_mode mode=MODE_GAP;
+ 	int first_signal;
+ 
+@@ -1628,7 +1683,7 @@ int get_lengths(struct ir_remote *remote
+ 		flushhw();
+ 	}
+ 	retval=1;
+-	average=0;sum=0;count=0;count_spaces=0;
++	average=0;maxspace=0;sum=0;count=0;count_spaces=0;
+ 	count_3repeats=0;count_5repeats=0;count_signals=0;
+ 	first_signal=-1;header=0;
+ 	first_length=0;
+@@ -1657,12 +1712,15 @@ int get_lengths(struct ir_remote *remote
+ 					continue;
+ 				}
+ 				average=data;
++				maxspace=data;
+ 			}
+ 			else if(is_space(data))
+ 			{
+ 				if(data>MIN_GAP || data>100*average ||
+ 				   /* this MUST be a gap */
+-				   (count_spaces>10 && data>5*average))  
++				   (count_spaces>10 && data>5*average)
++				   /* || Echostar
++				      (count_spaces>20 && data>9*maxspace/10)*/)
+ 					/* this should be a gap */
+ 				{
+ 					struct lengths *scan;
+@@ -1674,7 +1732,7 @@ int get_lengths(struct ir_remote *remote
+ 					merge_lengths(first_sum);
+ 					add_length(&first_gap,data);
+ 					merge_lengths(first_gap);
+-					sum=0;count_spaces=0;average=0;
++					sum=0;count_spaces=0;average=0;maxspace=0;
+ 					
+ 					maxcount=0;
+ 					scan=first_sum;
+@@ -1740,6 +1798,10 @@ int get_lengths(struct ir_remote *remote
+ 				average=(average*count_spaces+data)
+ 				/(count_spaces+1);
+ 				count_spaces++;
++				if(data>maxspace)
++				{
++					maxspace=data;
++				}
+ 			}
+ 			if(count>SAMPLES*MAX_SIGNALS*2)
+ 			{
+@@ -1773,8 +1835,9 @@ int get_lengths(struct ir_remote *remote
+ 			}
+ 			sum+=data&PULSE_MASK;
+ 
+-			if((data&PULSE_MASK)>=remaining_gap*(100-eps)/100
+-			   || (data&PULSE_MASK)>=remaining_gap-aeps)
++			if(count>2 &&
++			   ((data&PULSE_MASK)>=remaining_gap*(100-eps)/100
++			    || (data&PULSE_MASK)>=remaining_gap-aeps))
+ 			{
+ 				if(is_space(data))
+ 				{
+@@ -1882,7 +1945,7 @@ int get_lengths(struct ir_remote *remote
+ 					get_scheme(remote, interactive);
+ 					if(!get_header_length(remote, interactive) ||
+ 					   !get_trail_length(remote, interactive) ||
+-					   !get_lead_length(remote) ||
++					   !get_lead_length(remote, interactive) ||
+ 					   !get_repeat_length(remote, interactive) ||
+ 					   !get_data_length(remote, interactive))
+ 					{
+@@ -2173,7 +2236,7 @@ int get_trail_length(struct ir_remote *r
+ 	return(1);
+ }
+ 
+-int get_lead_length(struct ir_remote *remote)
++int get_lead_length(struct ir_remote *remote, int interactive)
+ {
+ 	unsigned int sum,max_count;
+ 	struct lengths *first_lead,*max_length,*max2_length;
+@@ -2190,7 +2253,7 @@ int get_lead_length(struct ir_remote *re
+ #       endif
+ 	if(max_count>=sum*TH_LEAD/100)
+ 	{
+-		printf("Found lead pulse: %lu\n",
++		iprintf(interactive, "Found lead pulse: %lu\n",
+ 		       (unsigned long) calc_signal(max_length));
+ 		remote->plead=calc_signal(max_length);
+ 		return(1);
+@@ -2207,12 +2270,12 @@ int get_lead_length(struct ir_remote *re
+ 	}
+ 	if(abs(2*a-b)<b*eps/100 || abs(2*a-b)<aeps)
+ 	{
+-		printf("Found hidden lead pulse: %lu\n",
++		iprintf(interactive, "Found hidden lead pulse: %lu\n",
+ 		       (unsigned long) a);
+ 		remote->plead=a;
+ 		return(1);
+ 	}
+-	printf("No lead pulse found.\n");
++	iprintf(interactive, "No lead pulse found.\n");
+ 	return(1);
+ }
+ 
 diff -Naurp lirc-0.8.4a.orig/daemons/lircd.c lirc-0.8.4a.upd/daemons/lircd.c
 --- lirc-0.8.4a.orig/daemons/lircd.c	2008-10-04 17:48:43.000000000 -0400
 +++ lirc-0.8.4a.upd/daemons/lircd.c	2008-12-08 17:06:32.108557638 -0500
@@ -515,8 +922,17 @@ diff -Naurp lirc-0.8.4a.orig/daemons/lircd.h lirc-0.8.4a.upd/daemons/lircd.h
  void loop(void);
 diff -Naurp lirc-0.8.4a.orig/daemons/Makefile.am lirc-0.8.4a.upd/daemons/Makefile.am
 --- lirc-0.8.4a.orig/daemons/Makefile.am	2008-09-21 14:33:19.000000000 -0400
-+++ lirc-0.8.4a.upd/daemons/Makefile.am	2008-12-08 16:50:31.050433540 -0500
-@@ -59,7 +59,8 @@ libhw_module_a_DEPENDENCIES = @hw_module
++++ lirc-0.8.4a.upd/daemons/Makefile.am	2008-12-08 17:58:11.557500930 -0500
+@@ -7,6 +7,8 @@
+ 
+ INCLUDES = -I$(top_srcdir)
+ 
++BUILT_SOURCES = input_map.inc
++
+ noinst_LIBRARIES = libhw_module.a
+ libhw_module_a_SOURCES = \
+ 			hw-types.c hw-types.h hardware.h \
+@@ -59,7 +61,8 @@ libhw_module_a_DEPENDENCIES = @hw_module
  sbin_PROGRAMS = lircd lircmd
  
  lircd_SOURCES = lircd.c lircd.h \
@@ -526,7 +942,17 @@ diff -Naurp lirc-0.8.4a.orig/daemons/Makefile.am lirc-0.8.4a.upd/daemons/Makefil
  lircd_LDADD = @daemon@ libhw_module.a @hw_module_libs@
  
  lircmd_SOURCES = lircmd.c
-@@ -79,6 +80,7 @@ EXTRA_PROGRAMS = lircd.simsend lircd.sim
+@@ -69,7 +72,8 @@ bin_PROGRAMS = irrecord
+ 
+ irrecord_SOURCES = irrecord.c \
+ 		config_file.c config_file.h \
+-		dump_config.c dump_config.h
++		dump_config.c dump_config.h \
++		input_map.c input_map.h
+ 
+ irrecord_LDADD = libhw_module.a @hw_module_libs@ @receive@
+ irrecord_DEPENDENCIES = @receive@
+@@ -79,6 +83,7 @@ EXTRA_PROGRAMS = lircd.simsend lircd.sim
  noinst_PROGRAMS = @maintmode_daemons_extra@
  lircd_simsend_SOURCES = lircd.c ir_remote.c config_file.c \
  		lircd.h ir_remote.h ir_remote_types.h config_file.h \
@@ -534,7 +960,7 @@ diff -Naurp lirc-0.8.4a.orig/daemons/Makefile.am lirc-0.8.4a.upd/daemons/Makefil
  		hw-types.c hw-types.h hardware.h \
  		hw_default.c hw_default.h \
  		receive.c receive.h \
-@@ -87,6 +89,7 @@ lircd_simsend_SOURCES = lircd.c ir_remot
+@@ -87,6 +92,7 @@ lircd_simsend_SOURCES = lircd.c ir_remot
  lircd_simsend_CFLAGS = -DSIM_SEND
  lircd_simrec_SOURCES = lircd.c ir_remote.c config_file.c \
  		lircd.h ir_remote.h ir_remote_types.h config_file.h \
@@ -542,6 +968,17 @@ diff -Naurp lirc-0.8.4a.orig/daemons/Makefile.am lirc-0.8.4a.upd/daemons/Makefil
  		hw-types.c hw-types.h hardware.h \
  		hw_default.c hw_default.h \
  		receive.c receive.h \
+@@ -125,4 +131,10 @@ rmfifo:
+ 	-$(RM) $(DESTDIR)$(devdir)/lircd
+ 	-$(RM) $(DESTDIR)$(devdir)/lircm
+ 
++input_map.inc:
++	$(srcdir)/input_map.sh >$@
++
++DISTCLEANFILES = input_map.inc
++EXTRA_DIST = input_map.inc input_map.sh
++
+ CLEANFILES = *~
 diff -Naurp lirc-0.8.4a.orig/daemons/release.c lirc-0.8.4a.upd/daemons/release.c
 --- lirc-0.8.4a.orig/daemons/release.c	2008-02-06 08:43:07.000000000 -0500
 +++ lirc-0.8.4a.upd/daemons/release.c	2008-12-08 16:59:03.799472804 -0500
@@ -680,7 +1117,7 @@ diff -Naurp lirc-0.8.4a.orig/daemons/release.c lirc-0.8.4a.upd/daemons/release.c
  	return NULL;
 diff -Naurp lirc-0.8.4a.orig/daemons/release.h lirc-0.8.4a.upd/daemons/release.h
 --- lirc-0.8.4a.orig/daemons/release.h	2007-05-06 07:54:02.000000000 -0400
-+++ lirc-0.8.4a.upd/daemons/release.h	2008-12-08 16:58:00.938502877 -0500
++++ lirc-0.8.4a.upd/daemons/release.h	2008-12-08 17:48:55.251581644 -0500
 @@ -1,4 +1,4 @@
 -/*      $Id: release.h,v 1.1 2007/05/06 11:54:02 lirc Exp $      */
 +/*      $Id: release.h,v 1.2 2008/12/06 20:00:03 lirc Exp $      */
@@ -703,7 +1140,7 @@ diff -Naurp lirc-0.8.4a.orig/daemons/release.h lirc-0.8.4a.upd/daemons/release.h
 +				const char **button_name);
 +const char *trigger_release_event(const char **remote_name,
 +				  const char **button_name);
-+const char *release_map_remotes(struct ir_remote *old, struct ir_remote *new
++const char *release_map_remotes(struct ir_remote *old, struct ir_remote *new,
 +				const char **remote_name,
 +				const char **button_name);
  
diff --git a/lirc.spec b/lirc.spec
index 24c4c81..54f8d4d 100644
--- a/lirc.spec
+++ b/lirc.spec
@@ -118,7 +118,7 @@ of remote control configuration files.
 
 %prep
 %setup -q -n %{name}-%{version}%{?pre}
-%patch0 -p1 -b .suf
+%patch0 -p1
 
 chmod 644 contrib/*
 
@@ -156,6 +156,10 @@ touch -r aclocal.m4 configure.ac # avoid autofoo re-run
 %patch2 -p1
 %patch3 -p1
 %patch4 -p1
+# Re-run autofoo for new cvs features
+autoreconf -i -f
+automake
+chmod +x daemons/input_map.sh
 
 %build
 %configure \

From 68427817805247153d91075b5be7726f89907aba Mon Sep 17 00:00:00 2001
From: Jarod Wilson <jwilson@fedoraproject.org>
Date: Tue, 9 Dec 2008 15:02:50 +0000
Subject: [PATCH 057/204] one more time, with feeling. (forgot to add an
 automake BR)

---
 lirc.spec | 94 +++++++++++++++++++++++++++++--------------------------
 1 file changed, 49 insertions(+), 45 deletions(-)

diff --git a/lirc.spec b/lirc.spec
index 54f8d4d..6319638 100644
--- a/lirc.spec
+++ b/lirc.spec
@@ -18,7 +18,7 @@
 
 Name:           lirc
 Version:        0.8.4a
-Release:        2%{?pre:.%{pre}}%{?dist}
+Release:        3%{?pre:.%{pre}}%{?dist}
 Summary:        The Linux Infrared Remote Control package
 
 Group:          System Environment/Daemons
@@ -39,6 +39,7 @@ BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  %{__perl}
 BuildRequires:  libusb-devel
+BuildRequires:  automake
 %if %{with alsa}
 BuildRequires:  alsa-lib-devel
 %endif
@@ -266,158 +267,161 @@ fi
 
 
 %changelog
-* Mon Dec 08 2008 - Jarod Wilson <jarod@redhat.com> - 0.8.4a-2
+* Tue Dec 09 2008 Jarod Wilson <jarod@redhat.com> 0.8.4a-3
+- BR: automake
+
+* Mon Dec 08 2008 Jarod Wilson <jarod@redhat.com> 0.8.4a-2
 - Nuke bogus and harmful %%postun --try-restart (#474960)
 - Assorted updates from lirc cvs:
   * Add uinput injection support
   * Add support for binding lircd listener to a specific ip
 
-* Sun Oct 26 2008 - Jarod Wilson <jarod@redhat.com> - 0.8.4a-1
+* Sun Oct 26 2008 Jarod Wilson <jarod@redhat.com> 0.8.4a-1
 - Update to lirc 0.8.4a release (fixes mode2 irrecord failures)
 - Really fix the mceusb remote config file this time
 
-* Thu Oct 16 2008 - Jarod Wilson <jarod@redhat.com> - 0.8.4-2
+* Thu Oct 16 2008 Jarod Wilson <jarod@redhat.com> 0.8.4-2
 - Make all remote configs have unique names (#467303)
 - Fix up some key names that got screwed up by standardization script
 
-* Sun Oct 12 2008 - Jarod Wilson <jarod@redhat.com> - 0.8.4-1
+* Sun Oct 12 2008 Jarod Wilson <jarod@redhat.com> 0.8.4-1
 - Update to 0.8.4 release
 
-* Fri Oct 10 2008 - Jarod Wilson <jarod@redhat.com> - 0.8.4-0.5.pre2
+* Fri Oct 10 2008 Jarod Wilson <jarod@redhat.com> 0.8.4-0.5.pre2
 - Re-enable portaudio driver by default, require v19 or later
 
-* Mon Oct 06 2008 - Jarod Wilson <jarod@redhat.com> - 0.8.4-0.4.pre2
+* Mon Oct 06 2008 Jarod Wilson <jarod@redhat.com> 0.8.4-0.4.pre2
 - Update to 0.8.4pre2
 
-* Mon Oct 06 2008 - Bastien Nocera <bnocera@redhat.com> - 0.8.4-0.3.pre1
+* Mon Oct 06 2008 Bastien Nocera <bnocera@redhat.com> 0.8.4-0.3.pre1
 - Fix more keycodes for the streamzap remote
 
-* Wed Oct 01 2008 - Bastien Nocera <bnocera@redhat.com> - 0.8.4-0.2.pre1
+* Wed Oct 01 2008 Bastien Nocera <bnocera@redhat.com> 0.8.4-0.2.pre1
 - Don't create a backup for the keycodes patch, or all the original files
   will also get installed, and get used in gnome-lirc-properties
 
-* Wed Sep 24 2008 - Jarod Wilson <jarod@redhat.com> - 0.8.4-0.1.pre1
+* Wed Sep 24 2008 Jarod Wilson <jarod@redhat.com> 0.8.4-0.1.pre1
 - Update to 0.8.4pre1
 - Drop upstream patches
 - Adds support for the CommandIR II userspace driver
 
-* Tue Sep 16 2008 - Jarod Wilson <jarod@redhat.com> - 0.8.3-7
+* Tue Sep 16 2008 Jarod Wilson <jarod@redhat.com> 0.8.3-7
 - Fix multilib upgrade path from F8 (Nicolas Chauvet, #462435)
 
-* Thu Aug 14 2008 - Bastien Nocera <bnocera@redhat.com> - 0.8.3-6
+* Thu Aug 14 2008 Bastien Nocera <bnocera@redhat.com> 0.8.3-6
 - Make lircd not exit when there's no device available, so that the
   daemon is running as expected when the hardware is plugged back in
   (#440231)
 
-* Thu Aug 14 2008 - Bastien Nocera <bnocera@redhat.com> - 0.8.3-5
+* Thu Aug 14 2008 Bastien Nocera <bnocera@redhat.com> 0.8.3-5
 - Add huge patch to fix the majority of remotes to have sensible keycodes,
   so they work out-of-the-box (#457273)
 
-* Mon Jun 23 2008 Jarod Wilson <jwilson@redhat.com> - 0.8.3-4
+* Mon Jun 23 2008 Jarod Wilson <jwilson@redhat.com> 0.8.3-4
 - Drop resume switch patch, no longer required
 - Add support for config option style used by gnome-lirc-properties (#442341)
 
-* Mon Jun 02 2008 Jarod Wilson <jwilson@redhat.com> - 0.8.3-3
+* Mon Jun 02 2008 Jarod Wilson <jwilson@redhat.com> 0.8.3-3
 - Add additional required patches for gnome-lirc-properties (#442248)
 - Put remote definitions in their own sub-package (#442328)
 
-* Mon May 12 2008 Jarod Wilson <jwilson@redhat.com> - 0.8.3-2
+* Mon May 12 2008 Jarod Wilson <jwilson@redhat.com> 0.8.3-2
 - Include upstream patch for lircd.conf remote include directives (#442248)
 - Include upstream patch to validate transmit buffers
 
-* Sun May 04 2008 Jarod Wilson <jwilson@redhat.com> - 0.8.3-1
+* Sun May 04 2008 Jarod Wilson <jwilson@redhat.com> 0.8.3-1
 - Update to 0.8.3 release
 
-* Sun Apr 27 2008 Jarod Wilson <jwilson@redhat.com> - 0.8.3-0.4.pre3
+* Sun Apr 27 2008 Jarod Wilson <jwilson@redhat.com> 0.8.3-0.4.pre3
 - Update to 0.8.3pre3
 
-* Sun Apr 06 2008 Jarod Wilson <jwilson@redhat.com> - 0.8.3-0.3.pre2
+* Sun Apr 06 2008 Jarod Wilson <jwilson@redhat.com> 0.8.3-0.3.pre2
 - Update to 0.8.3pre2
 
-* Tue Feb 12 2008 Ville Skyttä <ville.skytta at iki.fi> - 0.8.3-0.2.pre1
+* Tue Feb 12 2008 Ville Skyttä <ville.skytta at iki.fi> 0.8.3-0.2.pre1
 - Split libraries into -libs subpackage.
 - Refresh autotools re-run avoidance hack.
 
-* Thu Oct 18 2007 Jarod Wilson <jwilson@redhat.com> - 0.8.3-0.1.pre1
+* Thu Oct 18 2007 Jarod Wilson <jwilson@redhat.com> 0.8.3-0.1.pre1
 - 0.8.3pre1
 - adds Mac IR support, resolves bz #284291
 
-* Wed Aug 15 2007 Ville Skyttä <ville.skytta at iki.fi> - 0.8.2-2
+* Wed Aug 15 2007 Ville Skyttä <ville.skytta at iki.fi> 0.8.2-2
 - License: GPLv2+
 
-* Sun Jun 10 2007 Ville Skyttä <ville.skytta at iki.fi> - 0.8.2-1
+* Sun Jun 10 2007 Ville Skyttä <ville.skytta at iki.fi> 0.8.2-1
 - 0.8.2.
 
-* Wed Jun  6 2007 Ville Skyttä <ville.skytta at iki.fi> - 0.8.2-0.1.pre3
+* Wed Jun  6 2007 Ville Skyttä <ville.skytta at iki.fi> 0.8.2-0.1.pre3
 - 0.8.2pre3.
 - Fix up linefeeds and char encodings of more docs.
 
-* Fri May 18 2007 Ville Skyttä <ville.skytta at iki.fi> - 0.8.2-0.1.pre2
+* Fri May 18 2007 Ville Skyttä <ville.skytta at iki.fi> 0.8.2-0.1.pre2
 - 0.8.2pre2.
 
-* Sun Jan  7 2007 Ville Skyttä <ville.skytta at iki.fi> - 0.8.1-1
+* Sun Jan  7 2007 Ville Skyttä <ville.skytta at iki.fi> 0.8.1-1
 - 0.8.1.
 
-* Sat Dec 30 2006 Ville Skyttä <ville.skytta at iki.fi> - 0.8.1-0.2.pre5
+* Sat Dec 30 2006 Ville Skyttä <ville.skytta at iki.fi> 0.8.1-0.2.pre5
 - 0.8.1pre5.
 
-* Tue Dec 12 2006 Ville Skyttä <ville.skytta at iki.fi> - 0.8.1-0.2.pre4
+* Tue Dec 12 2006 Ville Skyttä <ville.skytta at iki.fi> 0.8.1-0.2.pre4
 - 0.8.1pre4.
 
-* Thu Nov 30 2006 Ville Skyttä <ville.skytta at iki.fi> - 0.8.1-0.2.pre3
+* Thu Nov 30 2006 Ville Skyttä <ville.skytta at iki.fi> 0.8.1-0.2.pre3
 - 0.8.1pre3.
 
-* Sun Oct 15 2006 Ville Skyttä <ville.skytta at iki.fi> - 0.8.1-0.2.pre2
+* Sun Oct 15 2006 Ville Skyttä <ville.skytta at iki.fi> 0.8.1-0.2.pre2
 - 0.8.1pre2, optflags patch no longer needed.
 
-* Mon Aug 28 2006 Ville Skyttä <ville.skytta at iki.fi> - 0.8.1-0.2.pre1
+* Mon Aug 28 2006 Ville Skyttä <ville.skytta at iki.fi> 0.8.1-0.2.pre1
 - Rebuild.
 
-* Sat Jul  1 2006 Ville Skyttä <ville.skytta at iki.fi> - 0.8.1-0.1.pre1
+* Sat Jul  1 2006 Ville Skyttä <ville.skytta at iki.fi> 0.8.1-0.1.pre1
 - 0.8.1pre1.
 - Add rpmbuild options for enabling/disabling ALSA, portaudio and/or X
   support, ALSA and X enabled by default, portaudio not.
 - Split most of the documentation to -doc subpackage.
 - Install irman2lirc as non-doc.
 
-* Tue Feb 14 2006 Ville Skyttä <ville.skytta at iki.fi> - 0.8.0-3
+* Tue Feb 14 2006 Ville Skyttä <ville.skytta at iki.fi> 0.8.0-3
 - Avoid standard rpaths on lib64 archs.
 
-* Sat Jan 21 2006 Ville Skyttä <ville.skytta at iki.fi> - 0.8.0-2
+* Sat Jan 21 2006 Ville Skyttä <ville.skytta at iki.fi> 0.8.0-2
 - 0.8.0.
 
-* Sat Jan 14 2006 Ville Skyttä <ville.skytta at iki.fi> - 0.8.0-0.2.pre4
+* Sat Jan 14 2006 Ville Skyttä <ville.skytta at iki.fi> 0.8.0-0.2.pre4
 - 0.8.0pre4.
 
-* Sun Jan  1 2006 Ville Skyttä <ville.skytta at iki.fi> - 0.8.0-0.2.pre3
+* Sun Jan  1 2006 Ville Skyttä <ville.skytta at iki.fi> 0.8.0-0.2.pre3
 - 0.8.0pre3.
 
 * Tue Dec 27 2005 Ville Skyttä <ville.skytta at iki.fi>
 - Split kernel modules into separate package.
 - Disable debugging features.
 
-* Wed Dec 14 2005 Ville Skyttä <ville.skytta at iki.fi> - 0.8.0-0.2.pre2
+* Wed Dec 14 2005 Ville Skyttä <ville.skytta at iki.fi> 0.8.0-0.2.pre2
 - 0.8.0pre2, kernel >= 2.6.15 USB patch applied upstream.
 - lirc_clientd renamed to lircrcd.
 
-* Tue Nov 29 2005 Ville Skyttä <ville.skytta at iki.fi> - 0.8.0-0.2.pre1
+* Tue Nov 29 2005 Ville Skyttä <ville.skytta at iki.fi> 0.8.0-0.2.pre1
 - Pull security fix for the new lirc_clientd from upstream CVS, and
   while at it, some other useful post-0.8.0pre1 changes.
 - Kernel >= 2.6.15 patchwork based on initial patch from Andy Burns (#172404).
 - Disable lirc_cmdir kernel module (unknown symbols).
 - Adapt to modular X.Org packaging.
 
-* Wed Nov  9 2005 Ville Skyttä <ville.skytta at iki.fi> - 0.8.0-0.1.pre1
+* Wed Nov  9 2005 Ville Skyttä <ville.skytta at iki.fi> 0.8.0-0.1.pre1
 - 0.8.0pre1, usage message patch applied upstream.
 
-* Sun Oct 30 2005 Ville Skyttä <ville.skytta at iki.fi> - 0.7.3-0.1.pre1
+* Sun Oct 30 2005 Ville Skyttä <ville.skytta at iki.fi> 0.7.3-0.1.pre1
 - 0.7.3pre1, "no device" crash fix applied upstream.
 - Fix lircd and lircmd usage messages.
 
-* Wed Aug 31 2005 Ville Skyttä <ville.skytta at iki.fi> - 0.7.2-3
+* Wed Aug 31 2005 Ville Skyttä <ville.skytta at iki.fi> 0.7.2-3
 - Make the init script startup earlier and shutdown later by default.
 
-* Sun Aug 14 2005 Ville Skyttä <ville.skytta at iki.fi> - 0.7.2-2
+* Sun Aug 14 2005 Ville Skyttä <ville.skytta at iki.fi> 0.7.2-2
 - 0.7.2, patch to fix crash at startup when no device is specified.
 - Enable audio input driver support (portaudio).
 - Improve package description.
@@ -427,18 +431,18 @@ fi
 - Simplify module package build (still work in progress, disabled by default).
 - Other minor specfile cleanups and maintainability improvements.
 
-* Thu May 26 2005 Ville Skyttä <ville.skytta at iki.fi> - 0.7.1-3
+* Thu May 26 2005 Ville Skyttä <ville.skytta at iki.fi> 0.7.1-3
 - Adjust kernel module build for FC4 and add hauppauge, igorplugusb, imon,
   sasem, and streamzap to the list of modules to build.  This stuff is still
   disabled by default, rebuild with "--with modules --target $arch" to enable.
 
-* Sun Apr 17 2005 Ville Skyttä <ville.skytta at iki.fi> - 0.7.1-2
+* Sun Apr 17 2005 Ville Skyttä <ville.skytta at iki.fi> 0.7.1-2
 - 0.7.1.
 
 * Fri Apr  7 2005 Michael Schwendt <mschwendt[AT]users.sf.net>
 - rebuilt
 
-* Sun Dec  5 2004 Ville Skyttä <ville.skytta at iki.fi> - 0.7.0-1
+* Sun Dec  5 2004 Ville Skyttä <ville.skytta at iki.fi> 0.7.0-1
 - Update to 0.7.0; major rework of the package:
 - Change default driver to "any".
 - Add -devel subpackage.

From e83ecddfd4e31c58dfa0617eec88147ead9369ec Mon Sep 17 00:00:00 2001
From: Jarod Wilson <jwilson@fedoraproject.org>
Date: Tue, 9 Dec 2008 15:15:49 +0000
Subject: [PATCH 058/204] ugh. I suck. need libtool too.

---
 lirc.spec | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/lirc.spec b/lirc.spec
index 6319638..c2a2c95 100644
--- a/lirc.spec
+++ b/lirc.spec
@@ -39,7 +39,7 @@ BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  %{__perl}
 BuildRequires:  libusb-devel
-BuildRequires:  automake
+BuildRequires:  automake libtool
 %if %{with alsa}
 BuildRequires:  alsa-lib-devel
 %endif
@@ -268,7 +268,7 @@ fi
 
 %changelog
 * Tue Dec 09 2008 Jarod Wilson <jarod@redhat.com> 0.8.4a-3
-- BR: automake
+- BR: automake and libtool to get cvs additions building
 
 * Mon Dec 08 2008 Jarod Wilson <jarod@redhat.com> 0.8.4a-2
 - Nuke bogus and harmful %%postun --try-restart (#474960)

From 170eddea0489f7a689e0a538887d59e5c6d83863 Mon Sep 17 00:00:00 2001
From: Jesse Keating <jkeating@fedoraproject.org>
Date: Wed, 25 Feb 2009 20:37:53 +0000
Subject: [PATCH 059/204] - Rebuilt for
 https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild

---
 lirc.spec | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/lirc.spec b/lirc.spec
index c2a2c95..927649f 100644
--- a/lirc.spec
+++ b/lirc.spec
@@ -18,7 +18,7 @@
 
 Name:           lirc
 Version:        0.8.4a
-Release:        3%{?pre:.%{pre}}%{?dist}
+Release:        4%{?pre:.%{pre}}%{?dist}
 Summary:        The Linux Infrared Remote Control package
 
 Group:          System Environment/Daemons
@@ -267,6 +267,9 @@ fi
 
 
 %changelog
+* Wed Feb 25 2009 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0.8.4a-4
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
+
 * Tue Dec 09 2008 Jarod Wilson <jarod@redhat.com> 0.8.4a-3
 - BR: automake and libtool to get cvs additions building
 

From e9c525441cf354b2cca646ec4b10bbb30c5aa2a0 Mon Sep 17 00:00:00 2001
From: Jarod Wilson <jwilson@fedoraproject.org>
Date: Thu, 26 Feb 2009 15:14:11 +0000
Subject: [PATCH 060/204] - Update to lirc 0.8.5pre1 cvs snapshot - Adds
 support for usb-connected ftdi-based homebrew transceivers - Rebuilt for
 https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild

---
 .cvsignore                                    |   1 +
 lirc-0.8.4-standardized-name-fixups.patch     | 416 --------
 ...c-0.8.5-standardized-remote-keycodes.patch | 909 ++++++++++--------
 lirc.spec                                     |  28 +-
 sources                                       |   1 +
 5 files changed, 520 insertions(+), 835 deletions(-)
 delete mode 100644 lirc-0.8.4-standardized-name-fixups.patch
 rename lirc-0.8.4-standardize-remote-keycodes.patch => lirc-0.8.5-standardized-remote-keycodes.patch (87%)

diff --git a/.cvsignore b/.cvsignore
index ba6ea46..9757f39 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -3,3 +3,4 @@ lirc-0.8.4pre1.tar.bz2
 lirc-0.8.4pre2.tar.bz2
 lirc-0.8.4.tar.bz2
 lirc-0.8.4a.tar.bz2
+lirc-0.8.5pre1.tar.bz2
diff --git a/lirc-0.8.4-standardized-name-fixups.patch b/lirc-0.8.4-standardized-name-fixups.patch
deleted file mode 100644
index fe7b57c..0000000
--- a/lirc-0.8.4-standardized-name-fixups.patch
+++ /dev/null
@@ -1,416 +0,0 @@
-diff -Naurp lirc-0.8.4.orig/remotes/adstech/lircd.conf.usbx-707 lirc-0.8.4/remotes/adstech/lircd.conf.usbx-707
---- lirc-0.8.4.orig/remotes/adstech/lircd.conf.usbx-707	2008-10-16 16:03:39.000000000 -0400
-+++ lirc-0.8.4/remotes/adstech/lircd.conf.usbx-707	2008-10-16 17:01:59.000000000 -0400
-@@ -37,10 +37,10 @@ begin remote
-           KEY_7                        0x02FD54AB00
-           KEY_8                        0x02FD4CB300
-           KEY_9                        0x02FD5CA300
--                               0x02FD55AA00
-+          Jump                         0x02FD55AA00
-           KEY_0                        0x02FD4DB200
--                             0x02FD5DA200
--          Guide                    0x02FD17E800
-+          Search                   0x02FD5DA200
-+          GUIDE                    0x02FD17E800
-           KEY_UP                       0x02FD0FF000
-           KEY_MENU                     0x02FD1FE000
-           KEY_LEFT                     0x02FD16E900
-@@ -48,7 +48,7 @@ begin remote
-           KEY_RIGHT                    0x02FD1EE100
-           KEY_INFO                     0x02FD5AA500
-           KEY_DOWN                     0x02FD46B900
--                               0x02FD52AD00
-+          KEY_EXIT                     0x02FD52AD00
-           KEY_AGAIN                   0x02FD59A600
-           KEY_NEXT                     0x02FD51AE00
-           KEY_REWIND                   0x02FD58A700
-diff -Naurp lirc-0.8.4.orig/remotes/apple/lircd.conf.macmini lirc-0.8.4/remotes/apple/lircd.conf.macmini
---- lirc-0.8.4.orig/remotes/apple/lircd.conf.macmini	2008-10-16 16:03:39.000000000 -0400
-+++ lirc-0.8.4/remotes/apple/lircd.conf.macmini	2008-10-16 17:01:59.000000000 -0400
-@@ -30,7 +30,7 @@ begin remote
-           KEY_VOLUMEDOWN	0x0D
-           KEY_REWIND		0x08
-           KEY_FORWARD		0x07
--          KEY_PLAY		0x04
-+          KEY_PLAYPAUSE		0x04
-           KEY_MENU		0x02
-       end codes
- 
-diff -Naurp lirc-0.8.4.orig/remotes/asus/lircd.conf.asusdh lirc-0.8.4/remotes/asus/lircd.conf.asusdh
---- lirc-0.8.4.orig/remotes/asus/lircd.conf.asusdh	2008-10-16 16:03:39.000000000 -0400
-+++ lirc-0.8.4/remotes/asus/lircd.conf.asusdh	2008-10-16 17:01:59.000000000 -0400
-@@ -14,17 +14,17 @@ begin remote
-   post_data_bits  0
- 
- 	begin codes
--	  KEY_POWER			0x01
-+	  KEY_POWER		0x01
- 	  QUICK_POWER		0x02
- 	  NOISE_OFF		0x03
- 	  WIFI			0x04
- 	  AP_LAUNCH		0x05
- 	  KEY_MAX		0x06
--	  			0x07
-+	  KEY_KPPLUS		0x07
- 	  REV			0x08
--	  		0x09
--	  KEY_FORWARD			0x0A
--	  			0x0B
-+	  KEY_PLAYPAUSE		0x09
-+	  KEY_FORWARD		0x0A
-+	  KEY_KPMINUS		0x0B
-         end codes
- 
- end remote
-diff -Naurp lirc-0.8.4.orig/remotes/atiusb/lircd.conf.atilibusb lirc-0.8.4/remotes/atiusb/lircd.conf.atilibusb
---- lirc-0.8.4.orig/remotes/atiusb/lircd.conf.atilibusb	2008-10-16 16:03:39.000000000 -0400
-+++ lirc-0.8.4/remotes/atiusb/lircd.conf.atilibusb	2008-10-16 17:01:59.000000000 -0400
-@@ -32,8 +32,8 @@ begin remote
-       begin codes
-           KEY_STOP                     0x000231
-           KEY_PAUSE                    0x000230
--                           0x000228
--          KEY_RECORD                      0x000237
-+          KEY_FASTFORWARD              0x000228
-+          KEY_RECORD                   0x000237
-           KEY_REWIND                   0x000229
-           KEY_PLAY                     0x00022C
-           KEY_D                        0x00027B
-@@ -46,9 +46,9 @@ begin remote
-           KEY_DOWN                     0x000259
-           KEY_OK                       0x00025C
-           KEY_INFO                     0x0002F9
--          timer                    0x000296
-+          timer                        0x000296
-           KEY_MENU                     0x000254
--          check                    0x000282
-+          check                        0x000282
-           KEY_0                        0x000200
-           KEY_1                        0x000201
-           KEY_2                        0x000202
-@@ -59,24 +59,24 @@ begin remote
-           KEY_7                        0x000207
-           KEY_8                        0x000208
-           KEY_9                        0x000209
--          KEY_VOLUMEUP                    0x000210
--          KEY_VOLUMEDOWN                  0x000211
-+          KEY_VOLUMEUP                 0x000210
-+          KEY_VOLUMEDOWN               0x000211
-           KEY_MUTE                     0x00020D
--          KEY_CHANNELUP                     0x000220
--          KEY_CHANNELDOWN                   0x000221
--          mouse_up                 0x0001FF
--          mouse_down               0x0002FF
--          BTN_LEFT               0x0020FF
--          BTN_RIGHT              0x0010FF
--          BTN_RIGHT           0x0011FF
--          mouse_down_right         0x0012FF
--          BTN_LEFT            0x0021FF
--          mouse_down_left          0x0022FF
--          right_click              0x0002AA
--          left_click               0x0002A9
--          hand                     0x0002D0
--          shrink_resize            0x0002D5
--          ?                        0x0002BE
-+          KEY_CHANNELUP                0x000220
-+          KEY_CHANNELDOWN              0x000221
-+          mouse_up                     0x0001FF
-+          mouse_down                   0x0002FF
-+          BTN_LEFT                     0x0020FF
-+          BTN_RIGHT                    0x0010FF
-+          BTN_RIGHT                    0x0011FF
-+          mouse_down_right             0x0012FF
-+          BTN_LEFT                     0x0021FF
-+          mouse_down_left              0x0022FF
-+          right_click                  0x0002AA
-+          left_click                   0x0002A9
-+          hand                         0x0002D0
-+          shrink_resize                0x0002D5
-+          ?                            0x0002BE
-           KEY_DVD                      0x000238
-           KEY_TV                       0x000239
-           KEY_A                        0x000278
-diff -Naurp lirc-0.8.4.orig/remotes/ericsson/lircd.conf.bte lirc-0.8.4/remotes/ericsson/lircd.conf.bte
---- lirc-0.8.4.orig/remotes/ericsson/lircd.conf.bte	2008-10-16 16:03:39.000000000 -0400
-+++ lirc-0.8.4/remotes/ericsson/lircd.conf.bte	2008-10-16 17:01:59.000000000 -0400
-@@ -11,7 +11,7 @@
- 
- begin remote
- 
--    name    bte 
-+    name    bte
-     bits    16
- 
-     begin codes
-@@ -25,28 +25,28 @@ begin remote
-         KEY_7               0x0037
-         KEY_8               0x0038
-         KEY_9               0x0039
--                    0x002a  # '*'
--                    0x0023  # '#'
-+        STAR                0x002a  # '*'
-+        HASH                0x0023  # '#'
-         KEY_UP              0x005e  # '^'
-         KEY_DOWN            0x0076  # 'v'
-         KEY_LEFT            0x003c  # '<'
-         KEY_RIGHT           0x003e  # '>'
-         KEY_CANCEL          0x0063  # 'c'
--        KEY_VOLUMEUP          0x0075  # 'u'
--        KEY_VOLUMEDOWN        0x0064  # 'd'
-+        KEY_VOLUMEUP        0x0075  # 'u'
-+        KEY_VOLUMEDOWN      0x0064  # 'd'
- 
- # t520m
-         NO              0x0065  # 'e'
--                     0x0073  # 's'
--                  0x004c  # 'L'
--                    0x0047  # 'G' - hides dialog widget!
-+        YES             0x0073  # 's'
-+        OPTION          0x004c  # 'L'
-+        MEMO            0x0047  # 'G' - hides dialog widget!
- 
- # t630
-         F_LEFT          0x005b  # '['
-         F_RIGHT         0x005d  # ']'  - triggers 'e'
-         J_CLICK         0x3a4a  # ':J' - triggers 'e'
--        RETURN          0x3a52  # ':R' - triggers 'e'
--                  0x3a43  # ':C'
-+        KEY_ENTER       0x3a52  # ':R' - triggers 'e'
-+        KEY_CAMERA      0x3a43  # ':C'
-         WAP             0x3a4f  # ':O'
- 
-       end codes
-diff -Naurp lirc-0.8.4.orig/remotes/kanam_accent/lircd.conf.IR-100 lirc-0.8.4/remotes/kanam_accent/lircd.conf.IR-100
---- lirc-0.8.4.orig/remotes/kanam_accent/lircd.conf.IR-100	2008-10-16 16:03:39.000000000 -0400
-+++ lirc-0.8.4/remotes/kanam_accent/lircd.conf.IR-100	2008-10-16 17:01:59.000000000 -0400
-@@ -30,7 +30,7 @@ begin remote
- 
-       begin codes
-           KEY_POWER                    0x62260942
--          KEY_EJECTCD                    0x62662409
-+          KEY_EJECTCD                  0x62662409
-           KEY_1                        0x62662209
-           KEY_2                        0x22642209
-           KEY_3                        0x62641142
-@@ -41,35 +41,35 @@ begin remote
-           KEY_8                        0x22646409
-           KEY_9                        0x62646609
-           KEY_0                        0x22464226
--                            0x62664226
--                           0x62660942
--          KEY_VOLUMEDOWN                     0x22896642
--          KEY_VOLUMEUP                     0x62622609
-+          KEY_WINDOWS                  0x62664226
-+          KEY_MENU                     0x62660942
-+          KEY_VOLUMEDOWN               0x22896642
-+          KEY_VOLUMEUP                 0x62622609
-           KEY_ESC                      0x22662609
-           KEY_UP                       0x22916642
-           KEY_CLOSE                    0x22994642
-           KEY_LEFT                     0x22994242
--          ent                      0x22892642
-+          ent                          0x22892642
-           KEY_RIGHT                    0x22914642
--          KEY_PREVIOUS                     0x62996242
-+          KEY_PREVIOUS                 0x62996242
-           KEY_DOWN                     0x22192699
-           KEY_NEXT                     0x22660942
-           KEY_MUTE                     0x22622409
--          step                     0x62994C42
-+          step                         0x62994C42
-           KEY_PLAY                     0x22246426
-           KEY_STOP                     0x6246894C
--          winamp                   0x62426409
--                        0x22664409
--          hdtv                     0x22992642
--                           0x62664609
--                             0x62992299
--                           0x62912242
--          KEY_WWW                 0x62264626
--          email                    0x22998C99
--                                 0x22264426
--                                 0x22426209
--                                 0x62896442
--                                 0x22096642
-+          winamp                       0x62426409
-+          mediaplayer                  0x22664409
-+          KEY_TV                       0x22992642
-+          KEY_DVD                      0x62664609
-+          windvd                       0x62992299
-+          powerdvd                     0x62912242
-+          KEY_WWW                      0x62264626
-+          KEY_MAIL                     0x22998C99
-+          b1                           0x22264426
-+          b2                           0x22426209
-+          b3                           0x62896442
-+          b4                           0x22096642
-       end codes
- 
- end remote
-diff -Naurp lirc-0.8.4.orig/remotes/mceusb/lircd.conf.mceusb lirc-0.8.4/remotes/mceusb/lircd.conf.mceusb
---- lirc-0.8.4.orig/remotes/mceusb/lircd.conf.mceusb	2008-10-16 16:03:39.000000000 -0400
-+++ lirc-0.8.4/remotes/mceusb/lircd.conf.mceusb	2008-10-16 17:18:58.000000000 -0400
-@@ -1,7 +1,8 @@
- #
--# brand:                        HP 
--# model no. of remote control:  TSGH-IR01
--# devices being controlled by this remote: HP Slimline S3100y
-+# brand:                        HP/Philips/Microsoft/Other
-+# model no. of remote control:  Media Center Edition remote
-+# devices being controlled by this remote: HP Slimline S3100y and a
-+# myriad of devices with Media Center Edition receivers
- #
- # Derived from MCEUSB2 lircd.conf file (lircd.conf.mceusb) found at:
- # https://help.ubuntu.com/community/Install_Lirc_Feisty
-@@ -94,7 +95,7 @@ begin remote
-         BBB           0x00007bbb
-         BBC           0x00007bbc
-         BBD           0x00007bbd
--                   0x00007bbe
-+        BBE           0x00007bbe
-         BBF           0x00007bbf
- #bc1 - bca unused 
-         BC1           0x00007bc1
-diff -Naurp lirc-0.8.4.orig/remotes/samsung/lircd.conf.samsung lirc-0.8.4/remotes/samsung/lircd.conf.samsung
---- lirc-0.8.4.orig/remotes/samsung/lircd.conf.samsung	2008-10-16 16:03:39.000000000 -0400
-+++ lirc-0.8.4/remotes/samsung/lircd.conf.samsung	2008-10-16 17:01:59.000000000 -0400
-@@ -39,42 +39,42 @@ begin remote
- 
- ### Propietary Samsung report, type 4
-           KEY_MUTE                     0xffcc0001
--          Video_Archive            0xffcc0002
-+          Video_Archive                0xffcc0002
-           KEY_1                        0xffcc0003
-           KEY_2                        0xffcc0004
-           KEY_3                        0xffcc0005
--                              0xffcc0006
-+          Sleep                        0xffcc0006
-           KEY_4                        0xffcc0007
-           KEY_5                        0xffcc0008
-           KEY_6                        0xffcc0009
--                               0xffcc000a
-+          Last                         0xffcc000a
-           KEY_7                        0xffcc000b
-           KEY_8                        0xffcc000c
-           KEY_9                        0xffcc000d
--                           0xffcc000e
--          Full                     0xffcc000f
-+          KEY_SUBTITLE                 0xffcc000e
-+          Full                         0xffcc000f
-           KEY_0                        0xffcc0010
--          PIP                      0xffcc0011
--          Timer                    0xffcc0012
--                             0xffcc0013
--          TV_Menu                  0xffcc0014
-+          PIP                          0xffcc0011
-+          Timer                        0xffcc0012
-+          Source                       0xffcc0013
-+          TV_Menu                      0xffcc0014
-           KEY_EPG                      0xffcc0015
-           KEY_TEXT                     0xffcc0016
- # gap 17..1b: probably cursor keys were previously planned here
-           KEY_TV                       0xffcc001c
-           KEY_RADIO                    0xffcc001d
-           KEY_DVD                      0xffcc001e
--          KEY_CHANNELUP                      0xffcc001f
-+          KEY_CHANNELUP                0xffcc001f
-           KEY_MENU                     0xffcc0020
--          KEY_VOLUMEUP                     0xffcc0021
--          KEY_CHANNELDOWN                      0xffcc0022
-+          KEY_VOLUMEUP                 0xffcc0021
-+          KEY_CHANNELDOWN              0xffcc0022
-           KEY_BACK                     0xffcc0023
--          KEY_VOLUMEDOWN                     0xffcc0024
-+          KEY_VOLUMEDOWN               0xffcc0024
-           KEY_PLAY                     0xffcc0025
-           KEY_PAUSE                    0xffcc0026
-           KEY_STOP                     0xffcc0027
-           KEY_RECORD                   0xffcc0028
--          KEY_PREVIOUS                     0xffcc0029
-+          KEY_PREVIOUS                 0xffcc0029
-           KEY_REWIND                   0xffcc002a
-           KEY_FORWARD                  0xffcc002b
-           KEY_NEXT                     0xffcc002c
-diff -Naurp lirc-0.8.4.orig/remotes/vlsystem/lircd.conf.mplay lirc-0.8.4/remotes/vlsystem/lircd.conf.mplay
---- lirc-0.8.4.orig/remotes/vlsystem/lircd.conf.mplay	2008-10-16 16:03:39.000000000 -0400
-+++ lirc-0.8.4/remotes/vlsystem/lircd.conf.mplay	2008-10-16 17:01:59.000000000 -0400
-@@ -22,11 +22,11 @@ begin remote
-   toggle_bit_mask 0x0
- 
-       begin codes
--          PwrOff                   0x41
--          PwrOn                    0x55
--          Movies                   0x40
--          Television               0x46
--          Photos                   0x45
-+          PwrOff                       0x41
-+          KEY_POWER                    0x55
-+          KEY_VIDEO                    0x40
-+          KEY_TV                       0x46
-+          KEY_PHOTO                    0x45
-           KEY_AUDIO                    0x56
-           KEY_1                        0x4d
-           KEY_2                        0x4e
-@@ -38,33 +38,33 @@ begin remote
-           KEY_8                        0x03
-           KEY_9                        0x07
-           KEY_0                        0x4c
--          KEY_VOLUMEUP                     0x0a
--          KEY_VOLUMEDOWN                     0x0e
--          Ch+_Lang                 0x12
--          Ch-_Page                 0x16
--          Guide                    0x0f
-+          KEY_VOLUMEUP                 0x0a
-+          KEY_VOLUMEDOWN               0x0e
-+          KEY_CHANNELUP                0x12
-+          KEY_CHANNELDOWN              0x16
-+          Guide                        0x0f
-           KEY_BACK                     0x0b
--                                 0x13
-+          KEY_TV                       0x13
-           KEY_OK                       0x42
-           KEY_UP                       0x19
-           KEY_LEFT                     0x54
-           KEY_RIGHT                    0x43
-           KEY_DOWN                     0x1d
--          Exit_Click               0x1f
--          Task_Quick               0x17
--          Run_DClick               0x1b
--          KEY_REWIND                      0x0d
-+          Exit_Click                   0x1f
-+          Task_Quick                   0x17
-+          Run_DClick                   0x1b
-+          KEY_REWIND                   0x0d
-           KEY_PLAY                     0x09
--                               0x15
--          KEY_PREVIOUS                     0x1a
-+          KEY_FASTFORWARD              0x15
-+          KEY_PREVIOUS                 0x1a
-           KEY_STOP                     0x01
-           KEY_NEXT                     0x1e
-           KEY_PAUSE                    0x05
-           KEY_MUTE                     0x4a
--          Warp_Mouse               0x47
--          KEY_RECORD                      0x11
--          DVD_Zoom                 0x14
--          Detail                   0x4b
-+          Warp_Mouse                   0x47
-+          KEY_RECORD                   0x11
-+          KEY_ZOOM                     0x14
-+          Detail                       0x4b
-       end codes
- 
- end remote
---- lirc-0.8.4pre1.orig/remotes/streamzap/lircd.conf.streamzap	2008-10-01 12:09:37.000000000 +0100
-+++ lirc-0.8.4pre1/remotes/streamzap/lircd.conf.streamzap	2008-10-06 09:08:57.000000000 +0100
-@@ -53,8 +53,8 @@ begin remote
-           KEY_PLAY                     0x17
-           KEY_PAUSE                    0x18
-           KEY_STOP                     0x19
--          |<<                      0x1A
--          >>|                      0x1B
-+          KEY_PREVIOUS                 0x1A
-+          KEY_NEXT                     0x1B
-           KEY_RECORD                   0x1C
-           KEY_REWIND                       0x1D
-           KEY_FORWARD                       0x1E
diff --git a/lirc-0.8.4-standardize-remote-keycodes.patch b/lirc-0.8.5-standardized-remote-keycodes.patch
similarity index 87%
rename from lirc-0.8.4-standardize-remote-keycodes.patch
rename to lirc-0.8.5-standardized-remote-keycodes.patch
index bdb4ee5..bbde924 100644
--- a/lirc-0.8.4-standardize-remote-keycodes.patch
+++ b/lirc-0.8.5-standardized-remote-keycodes.patch
@@ -1,6 +1,6 @@
-diff -Naurp lirc-0.8.4pre1.orig/remotes/adstech/lircd.conf.usbx-707 lirc-0.8.4pre1/remotes/adstech/lircd.conf.usbx-707
---- lirc-0.8.4pre1.orig/remotes/adstech/lircd.conf.usbx-707	2008-09-24 17:05:54.000000000 -0400
-+++ lirc-0.8.4pre1/remotes/adstech/lircd.conf.usbx-707	2008-09-24 17:06:37.000000000 -0400
+diff -Naurp lirc-0.8.5pre1.orig/remotes/adstech/lircd.conf.usbx-707 lirc-0.8.5pre1/remotes/adstech/lircd.conf.usbx-707
+--- lirc-0.8.5pre1.orig/remotes/adstech/lircd.conf.usbx-707	2009-02-26 09:16:49.248659658 -0500
++++ lirc-0.8.5pre1/remotes/adstech/lircd.conf.usbx-707	2009-02-26 09:19:05.211666497 -0500
 @@ -26,50 +26,50 @@ begin remote
    toggle_bit_mask 0x0
  
@@ -18,7 +18,6 @@ diff -Naurp lirc-0.8.4pre1.orig/remotes/adstech/lircd.conf.usbx-707 lirc-0.8.4pr
 -          9                        0x02FD5CA300
 -          Jump                     0x02FD55AA00
 -          0                        0x02FD4DB200
--          Search                   0x02FD5DA200
 +          KEY_POWER                    0x02FD5BA400
 +          KEY_MUTE                     0x02FD5FA000
 +          KEY_1                        0x02FD57A800
@@ -30,10 +29,10 @@ diff -Naurp lirc-0.8.4pre1.orig/remotes/adstech/lircd.conf.usbx-707 lirc-0.8.4pr
 +          KEY_7                        0x02FD54AB00
 +          KEY_8                        0x02FD4CB300
 +          KEY_9                        0x02FD5CA300
-+                               0x02FD55AA00
++          Jump                         0x02FD55AA00
 +          KEY_0                        0x02FD4DB200
-+                             0x02FD5DA200
-           Guide                    0x02FD17E800
+           Search                   0x02FD5DA200
+-          Guide                    0x02FD17E800
 -          Up                       0x02FD0FF000
 -          Menu                     0x02FD1FE000
 -          Left                     0x02FD16E900
@@ -49,6 +48,7 @@ diff -Naurp lirc-0.8.4pre1.orig/remotes/adstech/lircd.conf.usbx-707 lirc-0.8.4pr
 -          Forward                  0x02FD50AF00
 -          Stop                     0x02FD07F800
 -          Record                   0x02FD1BE400
++          GUIDE                    0x02FD17E800
 +          KEY_UP                       0x02FD0FF000
 +          KEY_MENU                     0x02FD1FE000
 +          KEY_LEFT                     0x02FD16E900
@@ -56,7 +56,7 @@ diff -Naurp lirc-0.8.4pre1.orig/remotes/adstech/lircd.conf.usbx-707 lirc-0.8.4pr
 +          KEY_RIGHT                    0x02FD1EE100
 +          KEY_INFO                     0x02FD5AA500
 +          KEY_DOWN                     0x02FD46B900
-+                               0x02FD52AD00
++          KEY_EXIT                     0x02FD52AD00
 +          KEY_AGAIN                   0x02FD59A600
 +          KEY_NEXT                     0x02FD51AE00
 +          KEY_REWIND                   0x02FD58A700
@@ -90,9 +90,9 @@ diff -Naurp lirc-0.8.4pre1.orig/remotes/adstech/lircd.conf.usbx-707 lirc-0.8.4pr
        end codes
  
  end remote
-diff -Naurp lirc-0.8.4pre1.orig/remotes/animax/lircd.conf.animax lirc-0.8.4pre1/remotes/animax/lircd.conf.animax
---- lirc-0.8.4pre1.orig/remotes/animax/lircd.conf.animax	1999-04-29 17:30:59.000000000 -0400
-+++ lirc-0.8.4pre1/remotes/animax/lircd.conf.animax	2008-09-24 17:06:37.000000000 -0400
+diff -Naurp lirc-0.8.5pre1.orig/remotes/animax/lircd.conf.animax lirc-0.8.5pre1/remotes/animax/lircd.conf.animax
+--- lirc-0.8.5pre1.orig/remotes/animax/lircd.conf.animax	1999-04-29 17:30:59.000000000 -0400
++++ lirc-0.8.5pre1/remotes/animax/lircd.conf.animax	2009-02-26 09:18:45.387673492 -0500
 @@ -38,79 +38,79 @@ begin remote
  
        begin codes
@@ -206,9 +206,9 @@ diff -Naurp lirc-0.8.4pre1.orig/remotes/animax/lircd.conf.animax lirc-0.8.4pre1/
        end codes
  
  end remote
-diff -Naurp lirc-0.8.4pre1.orig/remotes/apple/lircd.conf.macmini lirc-0.8.4pre1/remotes/apple/lircd.conf.macmini
---- lirc-0.8.4pre1.orig/remotes/apple/lircd.conf.macmini	2008-05-31 17:29:12.000000000 -0400
-+++ lirc-0.8.4pre1/remotes/apple/lircd.conf.macmini	2008-09-24 17:10:31.000000000 -0400
+diff -Naurp lirc-0.8.5pre1.orig/remotes/apple/lircd.conf.macmini lirc-0.8.5pre1/remotes/apple/lircd.conf.macmini
+--- lirc-0.8.5pre1.orig/remotes/apple/lircd.conf.macmini	2008-05-31 17:29:12.000000000 -0400
++++ lirc-0.8.5pre1/remotes/apple/lircd.conf.macmini	2009-02-26 09:19:05.212664695 -0500
 @@ -26,12 +26,12 @@ begin remote
    ignore_mask 0x0000ff01
  
@@ -223,14 +223,14 @@ diff -Naurp lirc-0.8.4pre1.orig/remotes/apple/lircd.conf.macmini lirc-0.8.4pre1/
 +          KEY_VOLUMEDOWN	0x0D
 +          KEY_REWIND		0x08
 +          KEY_FORWARD		0x07
-+          KEY_PLAY		0x04
++          KEY_PLAYPAUSE		0x04
 +          KEY_MENU		0x02
        end codes
  
  end remote
-diff -Naurp lirc-0.8.4pre1.orig/remotes/asus/lircd.conf.asus lirc-0.8.4pre1/remotes/asus/lircd.conf.asus
---- lirc-0.8.4pre1.orig/remotes/asus/lircd.conf.asus	2007-02-19 23:09:47.000000000 -0500
-+++ lirc-0.8.4pre1/remotes/asus/lircd.conf.asus	2008-09-24 17:06:37.000000000 -0400
+diff -Naurp lirc-0.8.5pre1.orig/remotes/asus/lircd.conf.asus lirc-0.8.5pre1/remotes/asus/lircd.conf.asus
+--- lirc-0.8.5pre1.orig/remotes/asus/lircd.conf.asus	2007-02-19 23:09:47.000000000 -0500
++++ lirc-0.8.5pre1/remotes/asus/lircd.conf.asus	2009-02-26 09:18:45.389659539 -0500
 @@ -19,38 +19,38 @@ begin remote
    toggle_bit	0
  
@@ -298,15 +298,15 @@ diff -Naurp lirc-0.8.4pre1.orig/remotes/asus/lircd.conf.asus lirc-0.8.4pre1/remo
          end codes
  
  end remote
-diff -Naurp lirc-0.8.4pre1.orig/remotes/asus/lircd.conf.asusdh lirc-0.8.4pre1/remotes/asus/lircd.conf.asusdh
---- lirc-0.8.4pre1.orig/remotes/asus/lircd.conf.asusdh	2007-07-08 10:01:27.000000000 -0400
-+++ lirc-0.8.4pre1/remotes/asus/lircd.conf.asusdh	2008-09-24 17:06:37.000000000 -0400
+diff -Naurp lirc-0.8.5pre1.orig/remotes/asus/lircd.conf.asusdh lirc-0.8.5pre1/remotes/asus/lircd.conf.asusdh
+--- lirc-0.8.5pre1.orig/remotes/asus/lircd.conf.asusdh	2007-07-08 10:01:27.000000000 -0400
++++ lirc-0.8.5pre1/remotes/asus/lircd.conf.asusdh	2009-02-26 09:19:05.212664695 -0500
 @@ -14,17 +14,17 @@ begin remote
    post_data_bits  0
  
  	begin codes
 -	  POWER			0x01
-+	  KEY_POWER			0x01
++	  KEY_POWER		0x01
  	  QUICK_POWER		0x02
  	  NOISE_OFF		0x03
  	  WIFI			0x04
@@ -314,20 +314,20 @@ diff -Naurp lirc-0.8.4pre1.orig/remotes/asus/lircd.conf.asusdh lirc-0.8.4pre1/re
 -	  MAXIMIZE		0x06
 -	  PLUS			0x07
 +	  KEY_MAX		0x06
-+	  			0x07
++	  KEY_KPPLUS		0x07
  	  REV			0x08
 -	  PLAY/PAUSE		0x09
 -	  FWD			0x0A
 -	  MINUS			0x0B
-+	  		0x09
-+	  KEY_FORWARD			0x0A
-+	  			0x0B
++	  KEY_PLAYPAUSE		0x09
++	  KEY_FORWARD		0x0A
++	  KEY_KPMINUS		0x0B
          end codes
  
  end remote
-diff -Naurp lirc-0.8.4pre1.orig/remotes/asus/lircd.conf.digimatrix lirc-0.8.4pre1/remotes/asus/lircd.conf.digimatrix
---- lirc-0.8.4pre1.orig/remotes/asus/lircd.conf.digimatrix	2005-09-06 13:12:17.000000000 -0400
-+++ lirc-0.8.4pre1/remotes/asus/lircd.conf.digimatrix	2008-09-24 17:06:37.000000000 -0400
+diff -Naurp lirc-0.8.5pre1.orig/remotes/asus/lircd.conf.digimatrix lirc-0.8.5pre1/remotes/asus/lircd.conf.digimatrix
+--- lirc-0.8.5pre1.orig/remotes/asus/lircd.conf.digimatrix	2005-09-06 13:12:17.000000000 -0400
++++ lirc-0.8.5pre1/remotes/asus/lircd.conf.digimatrix	2009-02-26 09:18:45.390666641 -0500
 @@ -28,43 +28,43 @@ begin remote
  
  
@@ -404,9 +404,9 @@ diff -Naurp lirc-0.8.4pre1.orig/remotes/asus/lircd.conf.digimatrix lirc-0.8.4pre
            dvd_audio                0x00000000000050AF
            ui_size                  0x0000000000008877
            ui_on_off                0x00000000000028D7
-diff -Naurp lirc-0.8.4pre1.orig/remotes/atiusb/lircd.conf.atilibusb lirc-0.8.4pre1/remotes/atiusb/lircd.conf.atilibusb
---- lirc-0.8.4pre1.orig/remotes/atiusb/lircd.conf.atilibusb	2008-06-17 02:47:55.000000000 -0400
-+++ lirc-0.8.4pre1/remotes/atiusb/lircd.conf.atilibusb	2008-09-24 17:06:37.000000000 -0400
+diff -Naurp lirc-0.8.5pre1.orig/remotes/atiusb/lircd.conf.atilibusb lirc-0.8.5pre1/remotes/atiusb/lircd.conf.atilibusb
+--- lirc-0.8.5pre1.orig/remotes/atiusb/lircd.conf.atilibusb	2009-01-18 13:30:14.000000000 -0500
++++ lirc-0.8.5pre1/remotes/atiusb/lircd.conf.atilibusb	2009-02-26 09:19:05.213664473 -0500
 @@ -30,58 +30,58 @@ begin remote
  
  
@@ -427,26 +427,9 @@ diff -Naurp lirc-0.8.4pre1.orig/remotes/atiusb/lircd.conf.atilibusb lirc-0.8.4pr
 -          down                     0x000259
 -          ok                       0x00025C
 -          info                     0x0002F9
-+          KEY_STOP                     0x000231
-+          KEY_PAUSE                    0x000230
-+                           0x000228
-+          KEY_RECORD                      0x000237
-+          KEY_REWIND                   0x000229
-+          KEY_PLAY                     0x00022C
-+          KEY_D                        0x00027B
-+          KEY_C                        0x00027A
-+          KEY_E                        0x00027C
-+          KEY_F                        0x00027D
-+          KEY_RIGHT                    0x00025B
-+          KEY_LEFT                     0x00025A
-+          KEY_UP                       0x000258
-+          KEY_DOWN                     0x000259
-+          KEY_OK                       0x00025C
-+          KEY_INFO                     0x0002F9
-           timer                    0x000296
+-          timer                    0x000296
 -          menu                     0x000254
-+          KEY_MENU                     0x000254
-           check                    0x000282
+-          check                    0x000282
 -          0                        0x000200
 -          1                        0x000201
 -          2                        0x000202
@@ -462,6 +445,43 @@ diff -Naurp lirc-0.8.4pre1.orig/remotes/atiusb/lircd.conf.atilibusb lirc-0.8.4pr
 -          mute                     0x00020D
 -          chup                     0x000220
 -          chdown                   0x000221
+-          mouse_up                 0x0001FF
+-          mouse_down               0x0002FF
+-          mouse_left               0x0020FF
+-          mouse_right              0x0010FF
+-          mouse_up_right           0x0011FF
+-          mouse_down_right         0x0012FF
+-          mouse_up_left            0x0021FF
+-          mouse_down_left          0x0022FF
+-          right_click              0x0002AA
+-          left_click               0x0002A9
+-          hand                     0x0002D0
+-          shrink_resize            0x0002D5
+-          ?                        0x0002BE
+-          dvd                      0x000238
+-          tv                       0x000239
+-          a                        0x000278
+-          b                        0x000279
+-          power                    0x00020C
++          KEY_STOP                     0x000231
++          KEY_PAUSE                    0x000230
++          KEY_FASTFORWARD              0x000228
++          KEY_RECORD                   0x000237
++          KEY_REWIND                   0x000229
++          KEY_PLAY                     0x00022C
++          KEY_D                        0x00027B
++          KEY_C                        0x00027A
++          KEY_E                        0x00027C
++          KEY_F                        0x00027D
++          KEY_RIGHT                    0x00025B
++          KEY_LEFT                     0x00025A
++          KEY_UP                       0x000258
++          KEY_DOWN                     0x000259
++          KEY_OK                       0x00025C
++          KEY_INFO                     0x0002F9
++          timer                        0x000296
++          KEY_MENU                     0x000254
++          check                        0x000282
 +          KEY_0                        0x000200
 +          KEY_1                        0x000201
 +          KEY_2                        0x000202
@@ -472,33 +492,24 @@ diff -Naurp lirc-0.8.4pre1.orig/remotes/atiusb/lircd.conf.atilibusb lirc-0.8.4pr
 +          KEY_7                        0x000207
 +          KEY_8                        0x000208
 +          KEY_9                        0x000209
-+          KEY_VOLUMEUP                    0x000210
-+          KEY_VOLUMEDOWN                  0x000211
++          KEY_VOLUMEUP                 0x000210
++          KEY_VOLUMEDOWN               0x000211
 +          KEY_MUTE                     0x00020D
-+          KEY_CHANNELUP                     0x000220
-+          KEY_CHANNELDOWN                   0x000221
-           mouse_up                 0x0001FF
-           mouse_down               0x0002FF
--          mouse_left               0x0020FF
--          mouse_right              0x0010FF
--          mouse_up_right           0x0011FF
-+          BTN_LEFT               0x0020FF
-+          BTN_RIGHT              0x0010FF
-+          BTN_RIGHT           0x0011FF
-           mouse_down_right         0x0012FF
--          mouse_up_left            0x0021FF
-+          BTN_LEFT            0x0021FF
-           mouse_down_left          0x0022FF
-           right_click              0x0002AA
-           left_click               0x0002A9
-           hand                     0x0002D0
-           shrink_resize            0x0002D5
-           ?                        0x0002BE
--          dvd                      0x000238
--          tv                       0x000239
--          a                        0x000278
--          b                        0x000279
--          power                    0x00020C
++          KEY_CHANNELUP                0x000220
++          KEY_CHANNELDOWN              0x000221
++          mouse_up                     0x0001FF
++          mouse_down                   0x0002FF
++          BTN_LEFT                     0x0020FF
++          BTN_RIGHT                    0x0010FF
++          BTN_RIGHT                    0x0011FF
++          mouse_down_right             0x0012FF
++          BTN_LEFT                     0x0021FF
++          mouse_down_left              0x0022FF
++          right_click                  0x0002AA
++          left_click                   0x0002A9
++          hand                         0x0002D0
++          shrink_resize                0x0002D5
++          ?                            0x0002BE
 +          KEY_DVD                      0x000238
 +          KEY_TV                       0x000239
 +          KEY_A                        0x000278
@@ -507,9 +518,9 @@ diff -Naurp lirc-0.8.4pre1.orig/remotes/atiusb/lircd.conf.atilibusb lirc-0.8.4pr
        end codes
  
  end remote
-diff -Naurp lirc-0.8.4pre1.orig/remotes/atiusb/lircd.conf.atiusb lirc-0.8.4pre1/remotes/atiusb/lircd.conf.atiusb
---- lirc-0.8.4pre1.orig/remotes/atiusb/lircd.conf.atiusb	2008-09-24 17:05:54.000000000 -0400
-+++ lirc-0.8.4pre1/remotes/atiusb/lircd.conf.atiusb	2008-09-24 17:06:37.000000000 -0400
+diff -Naurp lirc-0.8.5pre1.orig/remotes/atiusb/lircd.conf.atiusb lirc-0.8.5pre1/remotes/atiusb/lircd.conf.atiusb
+--- lirc-0.8.5pre1.orig/remotes/atiusb/lircd.conf.atiusb	2009-02-26 09:16:49.268661874 -0500
++++ lirc-0.8.5pre1/remotes/atiusb/lircd.conf.atiusb	2009-02-26 09:18:45.393659913 -0500
 @@ -37,54 +37,54 @@ begin remote
  
  
@@ -607,9 +618,9 @@ diff -Naurp lirc-0.8.4pre1.orig/remotes/atiusb/lircd.conf.atiusb lirc-0.8.4pre1/
        end codes
  
  end remote
-diff -Naurp lirc-0.8.4pre1.orig/remotes/avermedia/lircd.conf.avermedia lirc-0.8.4pre1/remotes/avermedia/lircd.conf.avermedia
---- lirc-0.8.4pre1.orig/remotes/avermedia/lircd.conf.avermedia	2001-01-11 02:54:25.000000000 -0500
-+++ lirc-0.8.4pre1/remotes/avermedia/lircd.conf.avermedia	2008-09-24 17:06:37.000000000 -0400
+diff -Naurp lirc-0.8.5pre1.orig/remotes/avermedia/lircd.conf.avermedia lirc-0.8.5pre1/remotes/avermedia/lircd.conf.avermedia
+--- lirc-0.8.5pre1.orig/remotes/avermedia/lircd.conf.avermedia	2001-01-11 02:54:25.000000000 -0500
++++ lirc-0.8.5pre1/remotes/avermedia/lircd.conf.avermedia	2009-02-26 09:18:45.394723700 -0500
 @@ -34,37 +34,37 @@ begin remote
  
  
@@ -672,9 +683,9 @@ diff -Naurp lirc-0.8.4pre1.orig/remotes/avermedia/lircd.conf.avermedia lirc-0.8.
        end codes
  
  end remote
-diff -Naurp lirc-0.8.4pre1.orig/remotes/avermedia/lircd.conf.avermedia98 lirc-0.8.4pre1/remotes/avermedia/lircd.conf.avermedia98
---- lirc-0.8.4pre1.orig/remotes/avermedia/lircd.conf.avermedia98	2001-01-10 17:08:00.000000000 -0500
-+++ lirc-0.8.4pre1/remotes/avermedia/lircd.conf.avermedia98	2008-09-24 17:06:37.000000000 -0400
+diff -Naurp lirc-0.8.5pre1.orig/remotes/avermedia/lircd.conf.avermedia98 lirc-0.8.5pre1/remotes/avermedia/lircd.conf.avermedia98
+--- lirc-0.8.5pre1.orig/remotes/avermedia/lircd.conf.avermedia98	2001-01-10 17:08:00.000000000 -0500
++++ lirc-0.8.5pre1/remotes/avermedia/lircd.conf.avermedia98	2009-02-26 09:18:45.394723700 -0500
 @@ -29,49 +29,49 @@ begin remote
  
        begin codes
@@ -754,9 +765,9 @@ diff -Naurp lirc-0.8.4pre1.orig/remotes/avermedia/lircd.conf.avermedia98 lirc-0.
        end codes
  
  end remote
-diff -Naurp lirc-0.8.4pre1.orig/remotes/avermedia/lircd.conf.vdomate lirc-0.8.4pre1/remotes/avermedia/lircd.conf.vdomate
---- lirc-0.8.4pre1.orig/remotes/avermedia/lircd.conf.vdomate	2002-10-25 16:42:55.000000000 -0400
-+++ lirc-0.8.4pre1/remotes/avermedia/lircd.conf.vdomate	2008-09-24 17:06:37.000000000 -0400
+diff -Naurp lirc-0.8.5pre1.orig/remotes/avermedia/lircd.conf.vdomate lirc-0.8.5pre1/remotes/avermedia/lircd.conf.vdomate
+--- lirc-0.8.5pre1.orig/remotes/avermedia/lircd.conf.vdomate	2002-10-25 16:42:55.000000000 -0400
++++ lirc-0.8.5pre1/remotes/avermedia/lircd.conf.vdomate	2009-02-26 09:18:45.395703904 -0500
 @@ -27,33 +27,33 @@ begin remote
  
  
@@ -809,9 +820,9 @@ diff -Naurp lirc-0.8.4pre1.orig/remotes/avermedia/lircd.conf.vdomate lirc-0.8.4p
        end codes
  
  end remote
-diff -Naurp lirc-0.8.4pre1.orig/remotes/bestbuy/lircd.conf.bestbuy lirc-0.8.4pre1/remotes/bestbuy/lircd.conf.bestbuy
---- lirc-0.8.4pre1.orig/remotes/bestbuy/lircd.conf.bestbuy	2001-04-25 16:07:50.000000000 -0400
-+++ lirc-0.8.4pre1/remotes/bestbuy/lircd.conf.bestbuy	2008-09-24 17:06:37.000000000 -0400
+diff -Naurp lirc-0.8.5pre1.orig/remotes/bestbuy/lircd.conf.bestbuy lirc-0.8.5pre1/remotes/bestbuy/lircd.conf.bestbuy
+--- lirc-0.8.5pre1.orig/remotes/bestbuy/lircd.conf.bestbuy	2001-04-25 16:07:50.000000000 -0400
++++ lirc-0.8.5pre1/remotes/bestbuy/lircd.conf.bestbuy	2009-02-26 09:18:45.395703904 -0500
 @@ -26,36 +26,36 @@ begin remote
  
  
@@ -874,9 +885,9 @@ diff -Naurp lirc-0.8.4pre1.orig/remotes/bestbuy/lircd.conf.bestbuy lirc-0.8.4pre
        end codes
  
  end remote
-diff -Naurp lirc-0.8.4pre1.orig/remotes/bestbuy/lircd.conf.bestbuy2 lirc-0.8.4pre1/remotes/bestbuy/lircd.conf.bestbuy2
---- lirc-0.8.4pre1.orig/remotes/bestbuy/lircd.conf.bestbuy2	2005-10-29 16:10:15.000000000 -0400
-+++ lirc-0.8.4pre1/remotes/bestbuy/lircd.conf.bestbuy2	2008-09-24 17:06:37.000000000 -0400
+diff -Naurp lirc-0.8.5pre1.orig/remotes/bestbuy/lircd.conf.bestbuy2 lirc-0.8.5pre1/remotes/bestbuy/lircd.conf.bestbuy2
+--- lirc-0.8.5pre1.orig/remotes/bestbuy/lircd.conf.bestbuy2	2005-10-29 16:10:15.000000000 -0400
++++ lirc-0.8.5pre1/remotes/bestbuy/lircd.conf.bestbuy2	2009-02-26 09:18:45.397726143 -0500
 @@ -27,29 +27,29 @@ begin remote
        begin codes
            TV/FM                    0x0000000000000043
@@ -926,9 +937,9 @@ diff -Naurp lirc-0.8.4pre1.orig/remotes/bestbuy/lircd.conf.bestbuy2 lirc-0.8.4pr
            RESET                    0x000000000000004D
            FREEZE                   0x000000000000004F
        end codes
-diff -Naurp lirc-0.8.4pre1.orig/remotes/caraca/lircd.conf.caraca lirc-0.8.4pre1/remotes/caraca/lircd.conf.caraca
---- lirc-0.8.4pre1.orig/remotes/caraca/lircd.conf.caraca	2000-08-25 15:21:17.000000000 -0400
-+++ lirc-0.8.4pre1/remotes/caraca/lircd.conf.caraca	2008-09-24 17:06:37.000000000 -0400
+diff -Naurp lirc-0.8.5pre1.orig/remotes/caraca/lircd.conf.caraca lirc-0.8.5pre1/remotes/caraca/lircd.conf.caraca
+--- lirc-0.8.5pre1.orig/remotes/caraca/lircd.conf.caraca	2000-08-25 15:21:17.000000000 -0400
++++ lirc-0.8.5pre1/remotes/caraca/lircd.conf.caraca	2009-02-26 09:18:45.397726143 -0500
 @@ -17,29 +17,29 @@ begin remote
    bits           16
  
@@ -980,9 +991,9 @@ diff -Naurp lirc-0.8.4pre1.orig/remotes/caraca/lircd.conf.caraca lirc-0.8.4pre1/
            TV/FM                    0x3fe3
        end codes
  
-diff -Naurp lirc-0.8.4pre1.orig/remotes/chronos/lircd.conf.chronos lirc-0.8.4pre1/remotes/chronos/lircd.conf.chronos
---- lirc-0.8.4pre1.orig/remotes/chronos/lircd.conf.chronos	2008-09-24 17:05:54.000000000 -0400
-+++ lirc-0.8.4pre1/remotes/chronos/lircd.conf.chronos	2008-09-24 17:06:37.000000000 -0400
+diff -Naurp lirc-0.8.5pre1.orig/remotes/chronos/lircd.conf.chronos lirc-0.8.5pre1/remotes/chronos/lircd.conf.chronos
+--- lirc-0.8.5pre1.orig/remotes/chronos/lircd.conf.chronos	2009-02-26 09:16:49.254660025 -0500
++++ lirc-0.8.5pre1/remotes/chronos/lircd.conf.chronos	2009-02-26 09:18:45.398725143 -0500
 @@ -20,37 +20,37 @@ begin remote
    toggle_bit      0
  
@@ -1046,9 +1057,9 @@ diff -Naurp lirc-0.8.4pre1.orig/remotes/chronos/lircd.conf.chronos lirc-0.8.4pre
 +          KEY_RIGHT         0x0000000000000007
        end codes
  end remote
-diff -Naurp lirc-0.8.4pre1.orig/remotes/cph03x/lircd.conf.cph03x lirc-0.8.4pre1/remotes/cph03x/lircd.conf.cph03x
---- lirc-0.8.4pre1.orig/remotes/cph03x/lircd.conf.cph03x	2001-06-14 11:49:16.000000000 -0400
-+++ lirc-0.8.4pre1/remotes/cph03x/lircd.conf.cph03x	2008-09-24 17:06:37.000000000 -0400
+diff -Naurp lirc-0.8.5pre1.orig/remotes/cph03x/lircd.conf.cph03x lirc-0.8.5pre1/remotes/cph03x/lircd.conf.cph03x
+--- lirc-0.8.5pre1.orig/remotes/cph03x/lircd.conf.cph03x	2001-06-14 11:49:16.000000000 -0400
++++ lirc-0.8.5pre1/remotes/cph03x/lircd.conf.cph03x	2009-02-26 09:18:45.398725143 -0500
 @@ -32,39 +32,39 @@ begin remote
    repeat_bit      0
  
@@ -1112,9 +1123,9 @@ diff -Naurp lirc-0.8.4pre1.orig/remotes/cph03x/lircd.conf.cph03x lirc-0.8.4pre1/
        end codes
  
  end remote
-diff -Naurp lirc-0.8.4pre1.orig/remotes/creative/lircd.conf.alsa_usb lirc-0.8.4pre1/remotes/creative/lircd.conf.alsa_usb
---- lirc-0.8.4pre1.orig/remotes/creative/lircd.conf.alsa_usb	2008-01-26 04:01:16.000000000 -0500
-+++ lirc-0.8.4pre1/remotes/creative/lircd.conf.alsa_usb	2008-09-24 17:06:37.000000000 -0400
+diff -Naurp lirc-0.8.5pre1.orig/remotes/creative/lircd.conf.alsa_usb lirc-0.8.5pre1/remotes/creative/lircd.conf.alsa_usb
+--- lirc-0.8.5pre1.orig/remotes/creative/lircd.conf.alsa_usb	2008-01-26 04:01:16.000000000 -0500
++++ lirc-0.8.5pre1/remotes/creative/lircd.conf.alsa_usb	2009-02-26 09:18:45.399664458 -0500
 @@ -34,38 +34,38 @@ begin remote
  
  
@@ -1181,9 +1192,9 @@ diff -Naurp lirc-0.8.4pre1.orig/remotes/creative/lircd.conf.alsa_usb lirc-0.8.4p
            Step                     0x0000000000007E81
        end codes
  
-diff -Naurp lirc-0.8.4pre1.orig/remotes/creative/lircd.conf.breakoutbox lirc-0.8.4pre1/remotes/creative/lircd.conf.breakoutbox
---- lirc-0.8.4pre1.orig/remotes/creative/lircd.conf.breakoutbox	2007-02-19 23:08:04.000000000 -0500
-+++ lirc-0.8.4pre1/remotes/creative/lircd.conf.breakoutbox	2008-09-24 17:06:37.000000000 -0400
+diff -Naurp lirc-0.8.5pre1.orig/remotes/creative/lircd.conf.breakoutbox lirc-0.8.5pre1/remotes/creative/lircd.conf.breakoutbox
+--- lirc-0.8.5pre1.orig/remotes/creative/lircd.conf.breakoutbox	2007-02-19 23:08:04.000000000 -0500
++++ lirc-0.8.5pre1/remotes/creative/lircd.conf.breakoutbox	2009-02-26 09:18:45.400730201 -0500
 @@ -19,37 +19,37 @@ begin remote
        begin codes
            DVD/CD                   0x0000000000000001
@@ -1248,9 +1259,9 @@ diff -Naurp lirc-0.8.4pre1.orig/remotes/creative/lircd.conf.breakoutbox lirc-0.8
        end codes
  
  end remote
-diff -Naurp lirc-0.8.4pre1.orig/remotes/creative/lircd.conf.creative lirc-0.8.4pre1/remotes/creative/lircd.conf.creative
---- lirc-0.8.4pre1.orig/remotes/creative/lircd.conf.creative	2007-03-10 15:15:49.000000000 -0500
-+++ lirc-0.8.4pre1/remotes/creative/lircd.conf.creative	2008-09-24 17:06:37.000000000 -0400
+diff -Naurp lirc-0.8.5pre1.orig/remotes/creative/lircd.conf.creative lirc-0.8.5pre1/remotes/creative/lircd.conf.creative
+--- lirc-0.8.5pre1.orig/remotes/creative/lircd.conf.creative	2007-03-10 15:15:49.000000000 -0500
++++ lirc-0.8.5pre1/remotes/creative/lircd.conf.creative	2009-02-26 09:18:45.400730201 -0500
 @@ -23,30 +23,30 @@ begin remote
    toggle_bit      0
  
@@ -1301,9 +1312,9 @@ diff -Naurp lirc-0.8.4pre1.orig/remotes/creative/lircd.conf.creative lirc-0.8.4p
        end codes
  
  end remote
-diff -Naurp lirc-0.8.4pre1.orig/remotes/creative/lircd.conf.infracd lirc-0.8.4pre1/remotes/creative/lircd.conf.infracd
---- lirc-0.8.4pre1.orig/remotes/creative/lircd.conf.infracd	2003-05-07 13:30:41.000000000 -0400
-+++ lirc-0.8.4pre1/remotes/creative/lircd.conf.infracd	2008-09-24 17:06:37.000000000 -0400
+diff -Naurp lirc-0.8.5pre1.orig/remotes/creative/lircd.conf.infracd lirc-0.8.5pre1/remotes/creative/lircd.conf.infracd
+--- lirc-0.8.5pre1.orig/remotes/creative/lircd.conf.infracd	2003-05-07 13:30:41.000000000 -0400
++++ lirc-0.8.5pre1/remotes/creative/lircd.conf.infracd	2009-02-26 09:18:45.401665716 -0500
 @@ -30,30 +30,30 @@ begin remote
  
  
@@ -1357,9 +1368,9 @@ diff -Naurp lirc-0.8.4pre1.orig/remotes/creative/lircd.conf.infracd lirc-0.8.4pr
        end codes
  
  end remote
-diff -Naurp lirc-0.8.4pre1.orig/remotes/creative/lircd.conf.livedrive lirc-0.8.4pre1/remotes/creative/lircd.conf.livedrive
---- lirc-0.8.4pre1.orig/remotes/creative/lircd.conf.livedrive	2008-09-24 17:05:54.000000000 -0400
-+++ lirc-0.8.4pre1/remotes/creative/lircd.conf.livedrive	2008-09-24 17:06:37.000000000 -0400
+diff -Naurp lirc-0.8.5pre1.orig/remotes/creative/lircd.conf.livedrive lirc-0.8.5pre1/remotes/creative/lircd.conf.livedrive
+--- lirc-0.8.5pre1.orig/remotes/creative/lircd.conf.livedrive	2009-02-26 09:16:49.262661298 -0500
++++ lirc-0.8.5pre1/remotes/creative/lircd.conf.livedrive	2009-02-26 09:18:45.401665716 -0500
 @@ -29,40 +29,40 @@ begin remote
  
  
@@ -1429,9 +1440,9 @@ diff -Naurp lirc-0.8.4pre1.orig/remotes/creative/lircd.conf.livedrive lirc-0.8.4
  	  
        end codes
  
-diff -Naurp lirc-0.8.4pre1.orig/remotes/dvico/lircd.conf.fusionHDTV lirc-0.8.4pre1/remotes/dvico/lircd.conf.fusionHDTV
---- lirc-0.8.4pre1.orig/remotes/dvico/lircd.conf.fusionHDTV	2006-05-06 00:38:39.000000000 -0400
-+++ lirc-0.8.4pre1/remotes/dvico/lircd.conf.fusionHDTV	2008-09-24 17:06:37.000000000 -0400
+diff -Naurp lirc-0.8.5pre1.orig/remotes/dvico/lircd.conf.fusionHDTV lirc-0.8.5pre1/remotes/dvico/lircd.conf.fusionHDTV
+--- lirc-0.8.5pre1.orig/remotes/dvico/lircd.conf.fusionHDTV	2006-05-06 00:38:39.000000000 -0400
++++ lirc-0.8.5pre1/remotes/dvico/lircd.conf.fusionHDTV	2009-02-26 09:18:45.402663084 -0500
 @@ -22,42 +22,42 @@ begin remote
    toggle_bit     0
  
@@ -1506,9 +1517,9 @@ diff -Naurp lirc-0.8.4pre1.orig/remotes/dvico/lircd.conf.fusionHDTV lirc-0.8.4pr
        end codes
  
  end remote
-diff -Naurp lirc-0.8.4pre1.orig/remotes/ea65/lircd.conf.ea65 lirc-0.8.4pre1/remotes/ea65/lircd.conf.ea65
---- lirc-0.8.4pre1.orig/remotes/ea65/lircd.conf.ea65	2004-11-20 08:43:48.000000000 -0500
-+++ lirc-0.8.4pre1/remotes/ea65/lircd.conf.ea65	2008-09-24 17:06:37.000000000 -0400
+diff -Naurp lirc-0.8.5pre1.orig/remotes/ea65/lircd.conf.ea65 lirc-0.8.5pre1/remotes/ea65/lircd.conf.ea65
+--- lirc-0.8.5pre1.orig/remotes/ea65/lircd.conf.ea65	2004-11-20 08:43:48.000000000 -0500
++++ lirc-0.8.5pre1/remotes/ea65/lircd.conf.ea65	2009-02-26 09:18:45.403726860 -0500
 @@ -18,53 +18,53 @@ begin remote
          htpc        0x0011811b
          dvd/vcd     0x00128100
@@ -1597,10 +1608,15 @@ diff -Naurp lirc-0.8.4pre1.orig/remotes/ea65/lircd.conf.ea65 lirc-0.8.4pre1/remo
          stop-eject  0x00238107
          mode-       0x00ff1080
          mode+       0x00ff1180
-diff -Naurp lirc-0.8.4pre1.orig/remotes/ericsson/lircd.conf.bte lirc-0.8.4pre1/remotes/ericsson/lircd.conf.bte
---- lirc-0.8.4pre1.orig/remotes/ericsson/lircd.conf.bte	2005-03-25 15:40:25.000000000 -0500
-+++ lirc-0.8.4pre1/remotes/ericsson/lircd.conf.bte	2008-09-24 17:06:37.000000000 -0400
-@@ -15,38 +15,38 @@ begin remote
+diff -Naurp lirc-0.8.5pre1.orig/remotes/ericsson/lircd.conf.bte lirc-0.8.5pre1/remotes/ericsson/lircd.conf.bte
+--- lirc-0.8.5pre1.orig/remotes/ericsson/lircd.conf.bte	2005-03-25 15:40:25.000000000 -0500
++++ lirc-0.8.5pre1/remotes/ericsson/lircd.conf.bte	2009-02-26 09:19:05.214660138 -0500
+@@ -11,29 +11,29 @@
+ 
+ begin remote
+ 
+-    name    bte 
++    name    bte
      bits    16
  
      begin codes
@@ -1633,38 +1649,32 @@ diff -Naurp lirc-0.8.4pre1.orig/remotes/ericsson/lircd.conf.bte lirc-0.8.4pre1/r
 +        KEY_7               0x0037
 +        KEY_8               0x0038
 +        KEY_9               0x0039
-+                    0x002a  # '*'
-+                    0x0023  # '#'
++        STAR                0x002a  # '*'
++        HASH                0x0023  # '#'
 +        KEY_UP              0x005e  # '^'
 +        KEY_DOWN            0x0076  # 'v'
 +        KEY_LEFT            0x003c  # '<'
 +        KEY_RIGHT           0x003e  # '>'
 +        KEY_CANCEL          0x0063  # 'c'
-+        KEY_VOLUMEUP          0x0075  # 'u'
-+        KEY_VOLUMEDOWN        0x0064  # 'd'
++        KEY_VOLUMEUP        0x0075  # 'u'
++        KEY_VOLUMEDOWN      0x0064  # 'd'
  
  # t520m
          NO              0x0065  # 'e'
--        YES             0x0073  # 's'
--        OPTION          0x004c  # 'L'
--        MEMO            0x0047  # 'G' - hides dialog widget!
-+                     0x0073  # 's'
-+                  0x004c  # 'L'
-+                    0x0047  # 'G' - hides dialog widget!
- 
- # t630
+@@ -45,8 +45,8 @@ begin remote
          F_LEFT          0x005b  # '['
          F_RIGHT         0x005d  # ']'  - triggers 'e'
          J_CLICK         0x3a4a  # ':J' - triggers 'e'
-         RETURN          0x3a52  # ':R' - triggers 'e'
+-        RETURN          0x3a52  # ':R' - triggers 'e'
 -        CAMERA          0x3a43  # ':C'
-+                  0x3a43  # ':C'
++        KEY_ENTER       0x3a52  # ':R' - triggers 'e'
++        KEY_CAMERA      0x3a43  # ':C'
          WAP             0x3a4f  # ':O'
  
        end codes
-diff -Naurp lirc-0.8.4pre1.orig/remotes/hauppauge/lircd.conf.hauppauge lirc-0.8.4pre1/remotes/hauppauge/lircd.conf.hauppauge
---- lirc-0.8.4pre1.orig/remotes/hauppauge/lircd.conf.hauppauge	2008-06-24 13:01:10.000000000 -0400
-+++ lirc-0.8.4pre1/remotes/hauppauge/lircd.conf.hauppauge	2008-09-24 17:06:37.000000000 -0400
+diff -Naurp lirc-0.8.5pre1.orig/remotes/hauppauge/lircd.conf.hauppauge lirc-0.8.5pre1/remotes/hauppauge/lircd.conf.hauppauge
+--- lirc-0.8.5pre1.orig/remotes/hauppauge/lircd.conf.hauppauge	2008-06-24 13:01:10.000000000 -0400
++++ lirc-0.8.5pre1/remotes/hauppauge/lircd.conf.hauppauge	2009-02-26 09:18:45.404660569 -0500
 @@ -27,25 +27,25 @@ begin remote
    repeat_bit      2
  
@@ -1708,9 +1718,9 @@ diff -Naurp lirc-0.8.4pre1.orig/remotes/hauppauge/lircd.conf.hauppauge lirc-0.8.
            RESERVED                 0x000000000000101E
            MINIMIZE                 0x0000000000001026
        end codes
-diff -Naurp lirc-0.8.4pre1.orig/remotes/hercules/lircd.conf.smarttv_stereo lirc-0.8.4pre1/remotes/hercules/lircd.conf.smarttv_stereo
---- lirc-0.8.4pre1.orig/remotes/hercules/lircd.conf.smarttv_stereo	2008-09-24 17:05:54.000000000 -0400
-+++ lirc-0.8.4pre1/remotes/hercules/lircd.conf.smarttv_stereo	2008-09-24 17:06:37.000000000 -0400
+diff -Naurp lirc-0.8.5pre1.orig/remotes/hercules/lircd.conf.smarttv_stereo lirc-0.8.5pre1/remotes/hercules/lircd.conf.smarttv_stereo
+--- lirc-0.8.5pre1.orig/remotes/hercules/lircd.conf.smarttv_stereo	2009-02-26 09:16:49.247660098 -0500
++++ lirc-0.8.5pre1/remotes/hercules/lircd.conf.smarttv_stereo	2009-02-26 09:18:45.405723158 -0500
 @@ -26,36 +26,36 @@ begin remote
  
  
@@ -1771,9 +1781,9 @@ diff -Naurp lirc-0.8.4pre1.orig/remotes/hercules/lircd.conf.smarttv_stereo lirc-
        end codes
  
  end remote
-diff -Naurp lirc-0.8.4pre1.orig/remotes/imon/lircd.conf.imon lirc-0.8.4pre1/remotes/imon/lircd.conf.imon
---- lirc-0.8.4pre1.orig/remotes/imon/lircd.conf.imon	2005-04-16 13:05:49.000000000 -0400
-+++ lirc-0.8.4pre1/remotes/imon/lircd.conf.imon	2008-09-24 17:06:37.000000000 -0400
+diff -Naurp lirc-0.8.5pre1.orig/remotes/imon/lircd.conf.imon lirc-0.8.5pre1/remotes/imon/lircd.conf.imon
+--- lirc-0.8.5pre1.orig/remotes/imon/lircd.conf.imon	2005-04-16 13:05:49.000000000 -0400
++++ lirc-0.8.5pre1/remotes/imon/lircd.conf.imon	2009-02-26 09:18:45.405723158 -0500
 @@ -29,48 +29,48 @@ begin remote
    duty_cycle   33
  
@@ -1859,9 +1869,9 @@ diff -Naurp lirc-0.8.4pre1.orig/remotes/imon/lircd.conf.imon lirc-0.8.4pre1/remo
            DVD.Caption              0x00000000000052AD
            DVD.Language             0x000000000000D22D
            Full.Screen              0x00000000000032CD
-diff -Naurp lirc-0.8.4pre1.orig/remotes/imon/lircd.conf.imon-knob lirc-0.8.4pre1/remotes/imon/lircd.conf.imon-knob
---- lirc-0.8.4pre1.orig/remotes/imon/lircd.conf.imon-knob	2008-06-12 15:32:33.000000000 -0400
-+++ lirc-0.8.4pre1/remotes/imon/lircd.conf.imon-knob	2008-09-24 17:41:09.000000000 -0400
+diff -Naurp lirc-0.8.5pre1.orig/remotes/imon/lircd.conf.imon-knob lirc-0.8.5pre1/remotes/imon/lircd.conf.imon-knob
+--- lirc-0.8.5pre1.orig/remotes/imon/lircd.conf.imon-knob	2008-06-12 15:32:33.000000000 -0400
++++ lirc-0.8.5pre1/remotes/imon/lircd.conf.imon-knob	2009-02-26 09:18:45.406732241 -0500
 @@ -23,74 +23,67 @@ begin remote
  
  
@@ -1986,19 +1996,20 @@ diff -Naurp lirc-0.8.4pre1.orig/remotes/imon/lircd.conf.imon-knob lirc-0.8.4pre1
        end codes
  
  end remote
-diff -Naurp lirc-0.8.4pre1.orig/remotes/imon/lircd.conf.imon-pad lirc-0.8.4pre1/remotes/imon/lircd.conf.imon-pad
---- lirc-0.8.4pre1.orig/remotes/imon/lircd.conf.imon-pad	2006-11-27 22:18:23.000000000 -0500
-+++ lirc-0.8.4pre1/remotes/imon/lircd.conf.imon-pad	2008-09-24 17:06:37.000000000 -0400
-@@ -24,65 +24,65 @@ begin remote
+diff -Naurp lirc-0.8.5pre1.orig/remotes/imon/lircd.conf.imon-pad lirc-0.8.5pre1/remotes/imon/lircd.conf.imon-pad
+--- lirc-0.8.5pre1.orig/remotes/imon/lircd.conf.imon-pad	2009-02-07 15:25:47.000000000 -0500
++++ lirc-0.8.5pre1/remotes/imon/lircd.conf.imon-pad	2009-02-26 09:27:57.169660371 -0500
+@@ -24,96 +24,96 @@ begin remote
  
  
        begin codes
 -          AppExit                  0x288195B7
++          KEY_EXIT                 0x288195B7
+           Power                    0x289115B7
 -          Record                   0x298115B7
 -          Play                     0x2A8115B7
-+          KEY_EXIT                  0x288195B7
-+          KEY_RECORD                   0x298115B7
-+          KEY_PLAY                     0x2A8115B7
++          KEY_RECORD               0x298115B7
++          KEY_PLAY                 0x2A8115B7
            SlowMotion               0x29B195B7
 -          Rewind                   0x2A8195B7
 -          Pause                    0x2A9115B7
@@ -2008,14 +2019,14 @@ diff -Naurp lirc-0.8.4pre1.orig/remotes/imon/lircd.conf.imon-pad lirc-0.8.4pre1/
 -          NextChapter              0x298195B7
 -          Esc                      0x2BB715B7
 -          Eject                    0x299395B7
-+          KEY_REWIND                   0x2A8195B7
-+          KEY_PAUSE                    0x2A9115B7
-+          KEY_FASTFORWARD              0x2B8115B7
-+          KEY_PREVIOUS              0x2B9115B7
-+          KEY_STOP                     0x2B9715B7
-+          KEY_NEXT              0x298195B7
-+          KEY_ESC                      0x2BB715B7
-+          KEY_EJECTCD                    0x299395B7
++          KEY_REWIND               0x2A8195B7
++          KEY_PAUSE                0x2A9115B7
++          KEY_FASTFORWARD          0x2B8115B7
++          KEY_PREVIOUS             0x2B9115B7
++          KEY_STOP                 0x2B9715B7
++          KEY_NEXT                 0x298195B7
++          KEY_ESC                  0x2BB715B7
++          KEY_EJECTCD              0x299395B7
            AppLauncher              0x29B715B7
            MultiMon                 0x2AB195B7
            TaskSwitcher             0x2A9395B7
@@ -2024,11 +2035,11 @@ diff -Naurp lirc-0.8.4pre1.orig/remotes/imon/lircd.conf.imon-pad lirc-0.8.4pre1/
 -          Vol-                     0x28A595B7
 -          Ch+                      0x289395B7
 -          Ch-                      0x288795B7
-+          KEY_MUTE                     0x2B9595B7
-+          KEY_VOLUMEUP                     0x28A395B7
-+          KEY_VOLUMEDOWN                     0x28A595B7
-+          KEY_CHANNELUP                      0x289395B7
-+          KEY_CHANNELDOWN                      0x288795B7
++          KEY_MUTE                 0x2B9595B7
++          KEY_VOLUMEUP             0x28A395B7
++          KEY_VOLUMEDOWN           0x28A595B7
++          KEY_CHANNELUP            0x289395B7
++          KEY_CHANNELDOWN          0x288795B7
            Timer                    0x2B8395B7
 -          1                        0x28B595B7
 -          2                        0x2BB195B7
@@ -2040,67 +2051,118 @@ diff -Naurp lirc-0.8.4pre1.orig/remotes/imon/lircd.conf.imon-pad lirc-0.8.4pre1/
 -          8                        0x2A8515B7
 -          9                        0x2AA115B7
 -          0                        0x2BA595B7
-+          KEY_1                        0x28B595B7
-+          KEY_2                        0x2BB195B7
-+          KEY_3                        0x28B195B7
-+          KEY_4                        0x2A8595B7
-+          KEY_5                        0x299595B7
-+          KEY_6                        0x2AA595B7
-+          KEY_7                        0x2B9395B7
-+          KEY_8                        0x2A8515B7
-+          KEY_9                        0x2AA115B7
-+          KEY_0                        0x2BA595B7
++          KEY_1                    0x28B595B7
++          KEY_2                    0x2BB195B7
++          KEY_3                    0x28B195B7
++          KEY_4                    0x2A8595B7
++          KEY_5                    0x299595B7
++          KEY_6                    0x2AA595B7
++          KEY_7                    0x2B9395B7
++          KEY_8                    0x2A8515B7
++          KEY_9                    0x2AA115B7
++          KEY_0                    0x2BA595B7
            ShiftTab                 0x28B515B7
 -          Tab                      0x29A115B7
 -          MyMovie                  0x2B8515B7
 -          MyMusic                  0x299195B7
-+          KEY_TAB                      0x29A115B7
-+          KEY_VIDEO                  0x2B8515B7
-+          KEY_AUDIO                  0x299195B7
++          KEY_TAB                  0x29A115B7
++          KEY_VIDEO                0x2B8515B7
++          KEY_AUDIO                0x299195B7
            MyPhoto                  0x2BA115B7
 -          MyTV                     0x28A515B7
 -          Bookmark                 0x288515B7
-+          KEY_TV                     0x28A515B7
-+          KEY_BOOKMARKS                 0x288515B7
++          KEY_TV                   0x28A515B7
++          KEY_BOOKMARKS            0x288515B7
            Thumbnail                0x2AB715B7
            AspectRatio              0x29A595B7
            FullScreen               0x2AA395B7
+ 
 -          MyDVD                    0x29A295B7
 -          Menu                     0x2BA385B7
-+          KEY_DVD                    0x29A295B7
-+          KEY_MENU                     0x2BA385B7
++          KEY_DVD                  0x29A295B7
++          KEY_MENU                 0x2BA385B7
+ # different codes
+-          MyDVD                    0x29A3D5B7
+-          Menu                     0x2BA3D5B7
++          KEY_DVD                  0x29A3D5B7
++          KEY_MENU                 0x2BA3D5B7
+ 
            Caption                  0x298595B7
 -          Language                 0x2B8595B7
-+          KEY_LANGUAGE                 0x2B8595B7
++          KEY_LANGUAGE             0x2B8595B7
            MouseKeyboard            0x299115B7
            SelectSpace              0x2A9315B7
            MouseMenu                0x28B715B7
 -          MouseRightClick          0x688481B7
 -          Enter                    0x28A195B7
 -          MouseLeftClick           0x688301B7
-+          BTN_RIGHT          0x688481B7
-+          KEY_ENTER                    0x28A195B7
-+          BTN_LEFT           0x688301B7
++          BTN_RIGHT                0x688481B7
++          KEY_ENTER                0x28A195B7
++          BTN_LEFT                 0x688301B7
            WindowsKey               0x2B8195B7
 -          Backspace                0x28A115B7
-+          KEY_BACKSPACE                0x28A115B7
++          KEY_BACKSPACE            0x28A115B7
  # Corrin added
 -	  Space                    0x2B9B15F7
 -          Up                       0xEB53F9B7
 -          Left                     0x6ABAFFBF
 -          Down                     0x6F9ECBB7
 -          Right                    0x69A281B7
-+	  KEY_SPACE                    0x2B9B15F7
-+          KEY_UP                       0xEB53F9B7
-+          KEY_LEFT                     0x6ABAFFBF
-+          KEY_DOWN                     0x6F9ECBB7
-+          KEY_RIGHT                    0x69A281B7
++	  KEY_SPACE                0x2B9B15F7
++          KEY_UP                   0xEB53F9B7
++          KEY_LEFT                 0x6ABAFFBF
++          KEY_DOWN                 0x6F9ECBB7
++          KEY_RIGHT                0x69A281B7
+ # Variants and additions of keys reported by Ryan Gardner
+-          1                        0x0200001E
+-          2                        0x0200001F
+-          3                        0x02000020
+-          4                        0x02000021
+-          5                        0x02000022
+-          6                        0x02000023
+-          7                        0x02000024
+-          8                        0x02000025
+-          9                        0x02000026
++          KEY_1                    0x0200001E
++          KEY_2                    0x0200001F
++          KEY_3                    0x02000020
++          KEY_4                    0x02000021
++          KEY_5                    0x02000022
++          KEY_6                    0x02000023
++          KEY_7                    0x02000024
++          KEY_8                    0x02000025
++          KEY_9                    0x02000026
+           Star                     0x02200025
+-          0                        0x02000027
++          KEY_0                    0x02000027
+           Hash                     0x02200020
+-          Backspace                0x0200002A
++          KEY_BACKSPACE            0x0200002A
+           Select                   0x0200002C
+           LeftMenu                 0x02800000
+           RightMenu                0x02000065
+-          Enter                    0x02000028
+-          Escape                   0x02000029
+-          LeftClick                0x01010000
+-          RightClick               0x01020000
+-          Up                       0x01008000
+-          Down                     0x01007F00
+-          Left                     0x01000080
+-          Right                    0x0100007F
++          KEY_ENTER                0x02000028
++          KEY_ESC                  0x02000029
++          BTN_LEFT                 0x01010000
++          BTN_RIGHT                0x01020000
++          KEY_UP                   0x01008000
++          KEY_DOWN                 0x01007F00
++          KEY_LEFT                 0x01000080
++          KEY_RIGHT                0x0100007F
  
        end codes
  
-diff -Naurp lirc-0.8.4pre1.orig/remotes/imon/lircd.conf.imon-rsc lirc-0.8.4pre1/remotes/imon/lircd.conf.imon-rsc
---- lirc-0.8.4pre1.orig/remotes/imon/lircd.conf.imon-rsc	2007-02-18 03:36:27.000000000 -0500
-+++ lirc-0.8.4pre1/remotes/imon/lircd.conf.imon-rsc	2008-09-24 17:06:37.000000000 -0400
+diff -Naurp lirc-0.8.5pre1.orig/remotes/imon/lircd.conf.imon-rsc lirc-0.8.5pre1/remotes/imon/lircd.conf.imon-rsc
+--- lirc-0.8.5pre1.orig/remotes/imon/lircd.conf.imon-rsc	2007-02-18 03:36:27.000000000 -0500
++++ lirc-0.8.5pre1/remotes/imon/lircd.conf.imon-rsc	2009-02-26 09:18:45.407723093 -0500
 @@ -27,48 +27,48 @@ begin remote
    gap          100000
  
@@ -2182,9 +2244,9 @@ diff -Naurp lirc-0.8.4pre1.orig/remotes/imon/lircd.conf.imon-rsc lirc-0.8.4pre1/
            Full.Screen        0x000000000000916e
        end codes
  
-diff -Naurp lirc-0.8.4pre1.orig/remotes/iodata/lircd.conf.gvbctv5pci lirc-0.8.4pre1/remotes/iodata/lircd.conf.gvbctv5pci
---- lirc-0.8.4pre1.orig/remotes/iodata/lircd.conf.gvbctv5pci	2003-06-07 18:00:12.000000000 -0400
-+++ lirc-0.8.4pre1/remotes/iodata/lircd.conf.gvbctv5pci	2008-09-24 17:06:37.000000000 -0400
+diff -Naurp lirc-0.8.5pre1.orig/remotes/iodata/lircd.conf.gvbctv5pci lirc-0.8.5pre1/remotes/iodata/lircd.conf.gvbctv5pci
+--- lirc-0.8.5pre1.orig/remotes/iodata/lircd.conf.gvbctv5pci	2003-06-07 18:00:12.000000000 -0400
++++ lirc-0.8.5pre1/remotes/iodata/lircd.conf.gvbctv5pci	2009-02-26 09:18:45.408659730 -0500
 @@ -26,41 +26,41 @@ begin remote
  
  
@@ -2254,9 +2316,9 @@ diff -Naurp lirc-0.8.4pre1.orig/remotes/iodata/lircd.conf.gvbctv5pci lirc-0.8.4p
            SYNC                     0x0000000000000003
        end codes
  
-diff -Naurp lirc-0.8.4pre1.orig/remotes/kanam_accent/lircd.conf.IR-100 lirc-0.8.4pre1/remotes/kanam_accent/lircd.conf.IR-100
---- lirc-0.8.4pre1.orig/remotes/kanam_accent/lircd.conf.IR-100	2007-02-12 23:18:53.000000000 -0500
-+++ lirc-0.8.4pre1/remotes/kanam_accent/lircd.conf.IR-100	2008-09-24 17:06:37.000000000 -0400
+diff -Naurp lirc-0.8.5pre1.orig/remotes/kanam_accent/lircd.conf.IR-100 lirc-0.8.5pre1/remotes/kanam_accent/lircd.conf.IR-100
+--- lirc-0.8.5pre1.orig/remotes/kanam_accent/lircd.conf.IR-100	2007-02-12 23:18:53.000000000 -0500
++++ lirc-0.8.5pre1/remotes/kanam_accent/lircd.conf.IR-100	2009-02-26 09:19:05.214660138 -0500
 @@ -29,47 +29,47 @@ begin remote
  
  
@@ -2281,8 +2343,29 @@ diff -Naurp lirc-0.8.4pre1.orig/remotes/kanam_accent/lircd.conf.IR-100 lirc-0.8.
 -          up                       0x22916642
 -          close                    0x22994642
 -          left                     0x22994242
+-          ent                      0x22892642
+-          right                    0x22914642
+-          prev                     0x62996242
+-          down                     0x22192699
+-          next                     0x22660942
+-          mute                     0x22622409
+-          step                     0x62994C42
+-          play                     0x22246426
+-          stop                     0x6246894C
+-          winamp                   0x62426409
+-          mediaplayer              0x22664409
+-          hdtv                     0x22992642
+-          cdplayer                 0x62664609
+-          windvd                   0x62992299
+-          powerdvd                 0x62912242
+-          internet                 0x62264626
+-          email                    0x22998C99
+-          b1                       0x22264426
+-          b2                       0x22426209
+-          b3                       0x62896442
+-          b4                       0x22096642
 +          KEY_POWER                    0x62260942
-+          KEY_EJECTCD                    0x62662409
++          KEY_EJECTCD                  0x62662409
 +          KEY_1                        0x62662209
 +          KEY_2                        0x22642209
 +          KEY_3                        0x62641142
@@ -2293,57 +2376,41 @@ diff -Naurp lirc-0.8.4pre1.orig/remotes/kanam_accent/lircd.conf.IR-100 lirc-0.8.
 +          KEY_8                        0x22646409
 +          KEY_9                        0x62646609
 +          KEY_0                        0x22464226
-+                            0x62664226
-+                           0x62660942
-+          KEY_VOLUMEDOWN                     0x22896642
-+          KEY_VOLUMEUP                     0x62622609
++          KEY_WINDOWS                  0x62664226
++          KEY_MENU                     0x62660942
++          KEY_VOLUMEDOWN               0x22896642
++          KEY_VOLUMEUP                 0x62622609
 +          KEY_ESC                      0x22662609
 +          KEY_UP                       0x22916642
 +          KEY_CLOSE                    0x22994642
 +          KEY_LEFT                     0x22994242
-           ent                      0x22892642
--          right                    0x22914642
--          prev                     0x62996242
--          down                     0x22192699
--          next                     0x22660942
--          mute                     0x22622409
++          ent                          0x22892642
 +          KEY_RIGHT                    0x22914642
-+          KEY_PREVIOUS                     0x62996242
++          KEY_PREVIOUS                 0x62996242
 +          KEY_DOWN                     0x22192699
 +          KEY_NEXT                     0x22660942
 +          KEY_MUTE                     0x22622409
-           step                     0x62994C42
--          play                     0x22246426
--          stop                     0x6246894C
++          step                         0x62994C42
 +          KEY_PLAY                     0x22246426
 +          KEY_STOP                     0x6246894C
-           winamp                   0x62426409
--          mediaplayer              0x22664409
-+                        0x22664409
-           hdtv                     0x22992642
--          cdplayer                 0x62664609
--          windvd                   0x62992299
--          powerdvd                 0x62912242
--          internet                 0x62264626
-+                           0x62664609
-+                             0x62992299
-+                           0x62912242
-+          KEY_WWW                 0x62264626
-           email                    0x22998C99
--          b1                       0x22264426
--          b2                       0x22426209
--          b3                       0x62896442
--          b4                       0x22096642
-+                                 0x22264426
-+                                 0x22426209
-+                                 0x62896442
-+                                 0x22096642
++          winamp                       0x62426409
++          mediaplayer                  0x22664409
++          KEY_TV                       0x22992642
++          KEY_DVD                      0x62664609
++          windvd                       0x62992299
++          powerdvd                     0x62912242
++          KEY_WWW                      0x62264626
++          KEY_MAIL                     0x22998C99
++          b1                           0x22264426
++          b2                           0x22426209
++          b3                           0x62896442
++          b4                           0x22096642
        end codes
  
  end remote
-diff -Naurp lirc-0.8.4pre1.orig/remotes/knc_one/lircd.conf.knc_one lirc-0.8.4pre1/remotes/knc_one/lircd.conf.knc_one
---- lirc-0.8.4pre1.orig/remotes/knc_one/lircd.conf.knc_one	2001-04-24 17:20:41.000000000 -0400
-+++ lirc-0.8.4pre1/remotes/knc_one/lircd.conf.knc_one	2008-09-24 17:06:37.000000000 -0400
+diff -Naurp lirc-0.8.5pre1.orig/remotes/knc_one/lircd.conf.knc_one lirc-0.8.5pre1/remotes/knc_one/lircd.conf.knc_one
+--- lirc-0.8.5pre1.orig/remotes/knc_one/lircd.conf.knc_one	2001-04-24 17:20:41.000000000 -0400
++++ lirc-0.8.5pre1/remotes/knc_one/lircd.conf.knc_one	2009-02-26 09:18:45.408659730 -0500
 @@ -26,37 +26,37 @@ begin remote
  
        begin codes
@@ -2408,9 +2475,9 @@ diff -Naurp lirc-0.8.4pre1.orig/remotes/knc_one/lircd.conf.knc_one lirc-0.8.4pre
        end codes
  
  end remote
-diff -Naurp lirc-0.8.4pre1.orig/remotes/kworld/lircd.conf.kworld lirc-0.8.4pre1/remotes/kworld/lircd.conf.kworld
---- lirc-0.8.4pre1.orig/remotes/kworld/lircd.conf.kworld	2005-04-01 15:28:05.000000000 -0500
-+++ lirc-0.8.4pre1/remotes/kworld/lircd.conf.kworld	2008-09-24 17:06:37.000000000 -0400
+diff -Naurp lirc-0.8.5pre1.orig/remotes/kworld/lircd.conf.kworld lirc-0.8.5pre1/remotes/kworld/lircd.conf.kworld
+--- lirc-0.8.5pre1.orig/remotes/kworld/lircd.conf.kworld	2005-04-01 15:28:05.000000000 -0500
++++ lirc-0.8.5pre1/remotes/kworld/lircd.conf.kworld	2009-02-26 09:18:45.408659730 -0500
 @@ -29,36 +29,36 @@ begin remote
  
  
@@ -2469,9 +2536,9 @@ diff -Naurp lirc-0.8.4pre1.orig/remotes/kworld/lircd.conf.kworld lirc-0.8.4pre1/
            snapshot                 0x00000000000058A7
            mts                      0x000000000000B04F
            function-                0x00000000000020DF
-diff -Naurp lirc-0.8.4pre1.orig/remotes/leadtek/lircd.conf.PVR2000 lirc-0.8.4pre1/remotes/leadtek/lircd.conf.PVR2000
---- lirc-0.8.4pre1.orig/remotes/leadtek/lircd.conf.PVR2000	2006-12-19 01:02:58.000000000 -0500
-+++ lirc-0.8.4pre1/remotes/leadtek/lircd.conf.PVR2000	2008-09-24 17:06:37.000000000 -0400
+diff -Naurp lirc-0.8.5pre1.orig/remotes/leadtek/lircd.conf.PVR2000 lirc-0.8.5pre1/remotes/leadtek/lircd.conf.PVR2000
+--- lirc-0.8.5pre1.orig/remotes/leadtek/lircd.conf.PVR2000	2006-12-19 01:02:58.000000000 -0500
++++ lirc-0.8.5pre1/remotes/leadtek/lircd.conf.PVR2000	2009-02-26 09:18:45.409722124 -0500
 @@ -18,54 +18,54 @@ begin remote
    gap       120000
  
@@ -2564,9 +2631,9 @@ diff -Naurp lirc-0.8.4pre1.orig/remotes/leadtek/lircd.conf.PVR2000 lirc-0.8.4pre
            TIMESHIFT                0x0000000000000035
  
        end codes
-diff -Naurp lirc-0.8.4pre1.orig/remotes/leadtek/lircd.conf.RM-0007 lirc-0.8.4pre1/remotes/leadtek/lircd.conf.RM-0007
---- lirc-0.8.4pre1.orig/remotes/leadtek/lircd.conf.RM-0007	2002-11-09 17:34:23.000000000 -0500
-+++ lirc-0.8.4pre1/remotes/leadtek/lircd.conf.RM-0007	2008-09-24 17:06:37.000000000 -0400
+diff -Naurp lirc-0.8.5pre1.orig/remotes/leadtek/lircd.conf.RM-0007 lirc-0.8.5pre1/remotes/leadtek/lircd.conf.RM-0007
+--- lirc-0.8.5pre1.orig/remotes/leadtek/lircd.conf.RM-0007	2002-11-09 17:34:23.000000000 -0500
++++ lirc-0.8.5pre1/remotes/leadtek/lircd.conf.RM-0007	2009-02-26 09:18:45.409722124 -0500
 @@ -44,43 +44,43 @@ begin remote
  
        begin codes
@@ -2636,9 +2703,9 @@ diff -Naurp lirc-0.8.4pre1.orig/remotes/leadtek/lircd.conf.RM-0007 lirc-0.8.4pre
        end codes
  
  end remote
-diff -Naurp lirc-0.8.4pre1.orig/remotes/leadtek/lircd.conf.RM-0010 lirc-0.8.4pre1/remotes/leadtek/lircd.conf.RM-0010
---- lirc-0.8.4pre1.orig/remotes/leadtek/lircd.conf.RM-0010	2006-03-21 02:11:14.000000000 -0500
-+++ lirc-0.8.4pre1/remotes/leadtek/lircd.conf.RM-0010	2008-09-24 17:06:37.000000000 -0400
+diff -Naurp lirc-0.8.5pre1.orig/remotes/leadtek/lircd.conf.RM-0010 lirc-0.8.5pre1/remotes/leadtek/lircd.conf.RM-0010
+--- lirc-0.8.5pre1.orig/remotes/leadtek/lircd.conf.RM-0010	2006-03-21 02:11:14.000000000 -0500
++++ lirc-0.8.5pre1/remotes/leadtek/lircd.conf.RM-0010	2009-02-26 09:18:45.409722124 -0500
 @@ -43,69 +43,69 @@ begin remote
    duty_cycle   33
  
@@ -2748,9 +2815,9 @@ diff -Naurp lirc-0.8.4pre1.orig/remotes/leadtek/lircd.conf.RM-0010 lirc-0.8.4pre
        end codes
  
  end remote
-diff -Naurp lirc-0.8.4pre1.orig/remotes/life-view/lircd.conf.flyvideo lirc-0.8.4pre1/remotes/life-view/lircd.conf.flyvideo
---- lirc-0.8.4pre1.orig/remotes/life-view/lircd.conf.flyvideo	2002-11-09 17:31:38.000000000 -0500
-+++ lirc-0.8.4pre1/remotes/life-view/lircd.conf.flyvideo	2008-09-24 17:06:37.000000000 -0400
+diff -Naurp lirc-0.8.5pre1.orig/remotes/life-view/lircd.conf.flyvideo lirc-0.8.5pre1/remotes/life-view/lircd.conf.flyvideo
+--- lirc-0.8.5pre1.orig/remotes/life-view/lircd.conf.flyvideo	2002-11-09 17:31:38.000000000 -0500
++++ lirc-0.8.5pre1/remotes/life-view/lircd.conf.flyvideo	2009-02-26 09:18:45.410725873 -0500
 @@ -35,50 +35,50 @@ begin remote
    duty_cycle   33
  
@@ -2831,9 +2898,9 @@ diff -Naurp lirc-0.8.4pre1.orig/remotes/life-view/lircd.conf.flyvideo lirc-0.8.4
   
        end codes
  
-diff -Naurp lirc-0.8.4pre1.orig/remotes/logitech/lircd.conf.logitech lirc-0.8.4pre1/remotes/logitech/lircd.conf.logitech
---- lirc-0.8.4pre1.orig/remotes/logitech/lircd.conf.logitech	2000-01-18 14:10:08.000000000 -0500
-+++ lirc-0.8.4pre1/remotes/logitech/lircd.conf.logitech	2008-09-24 17:06:37.000000000 -0400
+diff -Naurp lirc-0.8.5pre1.orig/remotes/logitech/lircd.conf.logitech lirc-0.8.5pre1/remotes/logitech/lircd.conf.logitech
+--- lirc-0.8.5pre1.orig/remotes/logitech/lircd.conf.logitech	2000-01-18 14:10:08.000000000 -0500
++++ lirc-0.8.5pre1/remotes/logitech/lircd.conf.logitech	2009-02-26 09:18:45.410725873 -0500
 @@ -23,41 +23,41 @@ begin remote
    repeat_bit      0
  
@@ -2903,10 +2970,22 @@ diff -Naurp lirc-0.8.4pre1.orig/remotes/logitech/lircd.conf.logitech lirc-0.8.4p
            MOUSE_N		   0x0000000000000040
            MOUSE_NNE		   0x0000000000000041
            MOUSE_NE		   0x0000000000000042
-diff -Naurp lirc-0.8.4pre1.orig/remotes/mceusb/lircd.conf.mceusb lirc-0.8.4pre1/remotes/mceusb/lircd.conf.mceusb
---- lirc-0.8.4pre1.orig/remotes/mceusb/lircd.conf.mceusb	2007-11-01 09:08:33.000000000 -0400
-+++ lirc-0.8.4pre1/remotes/mceusb/lircd.conf.mceusb	2008-09-24 17:06:37.000000000 -0400
-@@ -58,10 +58,10 @@ begin remote
+diff -Naurp lirc-0.8.5pre1.orig/remotes/mceusb/lircd.conf.mceusb lirc-0.8.5pre1/remotes/mceusb/lircd.conf.mceusb
+--- lirc-0.8.5pre1.orig/remotes/mceusb/lircd.conf.mceusb	2007-11-01 09:08:33.000000000 -0400
++++ lirc-0.8.5pre1/remotes/mceusb/lircd.conf.mceusb	2009-02-26 09:19:05.215660078 -0500
+@@ -1,7 +1,8 @@
+ #
+-# brand:                        HP 
+-# model no. of remote control:  TSGH-IR01
+-# devices being controlled by this remote: HP Slimline S3100y
++# brand:                        HP/Philips/Microsoft/Other
++# model no. of remote control:  Media Center Edition remote
++# devices being controlled by this remote: HP Slimline S3100y and a
++# myriad of devices with Media Center Edition receivers
+ #
+ # Derived from MCEUSB2 lircd.conf file (lircd.conf.mceusb) found at:
+ # https://help.ubuntu.com/community/Install_Lirc_Feisty
+@@ -58,10 +59,10 @@ begin remote
        begin codes
  
  #unused by HP remote
@@ -2921,7 +3000,7 @@ diff -Naurp lirc-0.8.4pre1.orig/remotes/mceusb/lircd.conf.mceusb lirc-0.8.4pre1/
  	Teletext      0x00007ba5
  
  #ba6 - bae unused 
-@@ -75,7 +75,7 @@ begin remote
+@@ -75,7 +76,7 @@ begin remote
          BAD           0x00007bad
          BAE           0x00007bae
  
@@ -2930,7 +3009,7 @@ diff -Naurp lirc-0.8.4pre1.orig/remotes/mceusb/lircd.conf.mceusb lirc-0.8.4pre1/
          Print         0x00007bb1
  
  #bb2 - bb4 unused  
-@@ -83,18 +83,18 @@ begin remote
+@@ -83,11 +84,11 @@ begin remote
          BB3           0x00007bb3
          BB4           0x00007bb4
  
@@ -2945,15 +3024,7 @@ diff -Naurp lirc-0.8.4pre1.orig/remotes/mceusb/lircd.conf.mceusb lirc-0.8.4pre1/
  
  #bba - bbf unused 
          BBA           0x00007bba
-         BBB           0x00007bbb
-         BBC           0x00007bbc
-         BBD           0x00007bbd
--        BBE           0x00007bbe
-+                   0x00007bbe
-         BBF           0x00007bbf
- #bc1 - bca unused 
-         BC1           0x00007bc1
-@@ -108,7 +108,7 @@ begin remote
+@@ -108,7 +109,7 @@ begin remote
          BC9           0x00007bc9
          BCA           0x00007bca
  
@@ -2962,7 +3033,7 @@ diff -Naurp lirc-0.8.4pre1.orig/remotes/mceusb/lircd.conf.mceusb lirc-0.8.4pre1/
          SlideShow     0x00007bcc
          Visualization 0x00007bcd
  
-@@ -127,50 +127,50 @@ begin remote
+@@ -127,50 +128,50 @@ begin remote
          Aspect        0x00007bd8
          Guide         0x00007bd9
          LiveTV        0x00007bda
@@ -3050,9 +3121,9 @@ diff -Naurp lirc-0.8.4pre1.orig/remotes/mceusb/lircd.conf.mceusb lirc-0.8.4pre1/
        end codes
  
  end remote
-diff -Naurp lirc-0.8.4pre1.orig/remotes/packard_bell/lircd.conf.packard_bell lirc-0.8.4pre1/remotes/packard_bell/lircd.conf.packard_bell
---- lirc-0.8.4pre1.orig/remotes/packard_bell/lircd.conf.packard_bell	2001-04-24 15:26:56.000000000 -0400
-+++ lirc-0.8.4pre1/remotes/packard_bell/lircd.conf.packard_bell	2008-09-24 17:06:37.000000000 -0400
+diff -Naurp lirc-0.8.5pre1.orig/remotes/packard_bell/lircd.conf.packard_bell lirc-0.8.5pre1/remotes/packard_bell/lircd.conf.packard_bell
+--- lirc-0.8.5pre1.orig/remotes/packard_bell/lircd.conf.packard_bell	2001-04-24 15:26:56.000000000 -0400
++++ lirc-0.8.5pre1/remotes/packard_bell/lircd.conf.packard_bell	2009-02-26 09:18:45.411659928 -0500
 @@ -53,38 +53,38 @@ begin remote
    repeat          9050 2250
   
@@ -3117,9 +3188,9 @@ diff -Naurp lirc-0.8.4pre1.orig/remotes/packard_bell/lircd.conf.packard_bell lir
            Star                     0x0000000000007F80
            Hash                     0x0000000000006B94
        end codes
-diff -Naurp lirc-0.8.4pre1.orig/remotes/pcmak/lircd.conf.pcmak lirc-0.8.4pre1/remotes/pcmak/lircd.conf.pcmak
---- lirc-0.8.4pre1.orig/remotes/pcmak/lircd.conf.pcmak	2004-07-24 11:36:15.000000000 -0400
-+++ lirc-0.8.4pre1/remotes/pcmak/lircd.conf.pcmak	2008-09-24 17:06:37.000000000 -0400
+diff -Naurp lirc-0.8.5pre1.orig/remotes/pcmak/lircd.conf.pcmak lirc-0.8.5pre1/remotes/pcmak/lircd.conf.pcmak
+--- lirc-0.8.5pre1.orig/remotes/pcmak/lircd.conf.pcmak	2004-07-24 11:36:15.000000000 -0400
++++ lirc-0.8.5pre1/remotes/pcmak/lircd.conf.pcmak	2009-02-26 09:18:45.411659928 -0500
 @@ -23,18 +23,18 @@ begin remote
    repeat_bit      0
  
@@ -3263,9 +3334,9 @@ diff -Naurp lirc-0.8.4pre1.orig/remotes/pcmak/lircd.conf.pcmak lirc-0.8.4pre1/re
        end codes
  
  end remote
-diff -Naurp lirc-0.8.4pre1.orig/remotes/pinnacle_systems/lircd.conf.pctv lirc-0.8.4pre1/remotes/pinnacle_systems/lircd.conf.pctv
---- lirc-0.8.4pre1.orig/remotes/pinnacle_systems/lircd.conf.pctv	2007-10-06 11:40:53.000000000 -0400
-+++ lirc-0.8.4pre1/remotes/pinnacle_systems/lircd.conf.pctv	2008-09-24 17:06:37.000000000 -0400
+diff -Naurp lirc-0.8.5pre1.orig/remotes/pinnacle_systems/lircd.conf.pctv lirc-0.8.5pre1/remotes/pinnacle_systems/lircd.conf.pctv
+--- lirc-0.8.5pre1.orig/remotes/pinnacle_systems/lircd.conf.pctv	2007-10-06 11:40:53.000000000 -0400
++++ lirc-0.8.5pre1/remotes/pinnacle_systems/lircd.conf.pctv	2009-02-26 09:18:45.412722130 -0500
 @@ -24,30 +24,30 @@ begin remote
    toggle_bit         0
  
@@ -3365,9 +3436,9 @@ diff -Naurp lirc-0.8.4pre1.orig/remotes/pinnacle_systems/lircd.conf.pctv lirc-0.
            middle                   0x0000000000000014
  
  
-diff -Naurp lirc-0.8.4pre1.orig/remotes/pixelview/lircd.conf.playtv lirc-0.8.4pre1/remotes/pixelview/lircd.conf.playtv
---- lirc-0.8.4pre1.orig/remotes/pixelview/lircd.conf.playtv	1999-08-04 15:18:27.000000000 -0400
-+++ lirc-0.8.4pre1/remotes/pixelview/lircd.conf.playtv	2008-09-24 17:06:37.000000000 -0400
+diff -Naurp lirc-0.8.5pre1.orig/remotes/pixelview/lircd.conf.playtv lirc-0.8.5pre1/remotes/pixelview/lircd.conf.playtv
+--- lirc-0.8.5pre1.orig/remotes/pixelview/lircd.conf.playtv	1999-08-04 15:18:27.000000000 -0400
++++ lirc-0.8.5pre1/remotes/pixelview/lircd.conf.playtv	2009-02-26 09:18:45.412722130 -0500
 @@ -13,22 +13,22 @@ begin remote
    begin codes
      TV/FM                    0x00000000000000e7
@@ -3406,9 +3477,9 @@ diff -Naurp lirc-0.8.4pre1.orig/remotes/pixelview/lircd.conf.playtv lirc-0.8.4pr
    end codes
  end remote
  
-diff -Naurp lirc-0.8.4pre1.orig/remotes/pixelview/lircd.conf.playtv_bt878 lirc-0.8.4pre1/remotes/pixelview/lircd.conf.playtv_bt878
---- lirc-0.8.4pre1.orig/remotes/pixelview/lircd.conf.playtv_bt878	2000-09-30 15:32:40.000000000 -0400
-+++ lirc-0.8.4pre1/remotes/pixelview/lircd.conf.playtv_bt878	2008-09-24 17:06:37.000000000 -0400
+diff -Naurp lirc-0.8.5pre1.orig/remotes/pixelview/lircd.conf.playtv_bt878 lirc-0.8.5pre1/remotes/pixelview/lircd.conf.playtv_bt878
+--- lirc-0.8.5pre1.orig/remotes/pixelview/lircd.conf.playtv_bt878	2000-09-30 15:32:40.000000000 -0400
++++ lirc-0.8.5pre1/remotes/pixelview/lircd.conf.playtv_bt878	2009-02-26 09:18:45.412722130 -0500
 @@ -16,39 +16,39 @@ begin remote
    repeat_bit 0
  
@@ -3475,9 +3546,9 @@ diff -Naurp lirc-0.8.4pre1.orig/remotes/pixelview/lircd.conf.playtv_bt878 lirc-0
    end codes
  end remote
  
-diff -Naurp lirc-0.8.4pre1.orig/remotes/pixelview/lircd.conf.playtv_pro lirc-0.8.4pre1/remotes/pixelview/lircd.conf.playtv_pro
---- lirc-0.8.4pre1.orig/remotes/pixelview/lircd.conf.playtv_pro	2005-12-10 08:09:13.000000000 -0500
-+++ lirc-0.8.4pre1/remotes/pixelview/lircd.conf.playtv_pro	2008-09-24 17:06:37.000000000 -0400
+diff -Naurp lirc-0.8.5pre1.orig/remotes/pixelview/lircd.conf.playtv_pro lirc-0.8.5pre1/remotes/pixelview/lircd.conf.playtv_pro
+--- lirc-0.8.5pre1.orig/remotes/pixelview/lircd.conf.playtv_pro	2005-12-10 08:09:13.000000000 -0500
++++ lirc-0.8.5pre1/remotes/pixelview/lircd.conf.playtv_pro	2009-02-26 09:18:45.413667488 -0500
 @@ -31,15 +31,15 @@ begin remote
  
        begin codes
@@ -3528,9 +3599,9 @@ diff -Naurp lirc-0.8.4pre1.orig/remotes/pixelview/lircd.conf.playtv_pro lirc-0.8
  
        end codes
  
-diff -Naurp lirc-0.8.4pre1.orig/remotes/pixelview/lircd.conf.remotemaster lirc-0.8.4pre1/remotes/pixelview/lircd.conf.remotemaster
---- lirc-0.8.4pre1.orig/remotes/pixelview/lircd.conf.remotemaster	2000-02-07 06:03:20.000000000 -0500
-+++ lirc-0.8.4pre1/remotes/pixelview/lircd.conf.remotemaster	2008-09-24 17:06:37.000000000 -0400
+diff -Naurp lirc-0.8.5pre1.orig/remotes/pixelview/lircd.conf.remotemaster lirc-0.8.5pre1/remotes/pixelview/lircd.conf.remotemaster
+--- lirc-0.8.5pre1.orig/remotes/pixelview/lircd.conf.remotemaster	2000-02-07 06:03:20.000000000 -0500
++++ lirc-0.8.5pre1/remotes/pixelview/lircd.conf.remotemaster	2009-02-26 09:18:45.413667488 -0500
 @@ -25,39 +25,39 @@ begin remote
    gap          189264
  
@@ -3598,9 +3669,9 @@ diff -Naurp lirc-0.8.4pre1.orig/remotes/pixelview/lircd.conf.remotemaster lirc-0
        end codes
  
  end remote
-diff -Naurp lirc-0.8.4pre1.orig/remotes/provideo/lircd.conf.pv951 lirc-0.8.4pre1/remotes/provideo/lircd.conf.pv951
---- lirc-0.8.4pre1.orig/remotes/provideo/lircd.conf.pv951	2001-01-20 08:32:00.000000000 -0500
-+++ lirc-0.8.4pre1/remotes/provideo/lircd.conf.pv951	2008-09-24 17:06:37.000000000 -0400
+diff -Naurp lirc-0.8.5pre1.orig/remotes/provideo/lircd.conf.pv951 lirc-0.8.5pre1/remotes/provideo/lircd.conf.pv951
+--- lirc-0.8.5pre1.orig/remotes/provideo/lircd.conf.pv951	2001-01-20 08:32:00.000000000 -0500
++++ lirc-0.8.5pre1/remotes/provideo/lircd.conf.pv951	2009-02-26 09:18:45.413667488 -0500
 @@ -31,28 +31,28 @@ begin remote
    repeat_bit      0
  
@@ -3646,9 +3717,9 @@ diff -Naurp lirc-0.8.4pre1.orig/remotes/provideo/lircd.conf.pv951 lirc-0.8.4pre1
            func                     0x0000000000009867
            ttx                      0x000000000000B04F
            pg+                      0x000000000000708F
-diff -Naurp lirc-0.8.4pre1.orig/remotes/remotec/lircd.conf.BW6130 lirc-0.8.4pre1/remotes/remotec/lircd.conf.BW6130
---- lirc-0.8.4pre1.orig/remotes/remotec/lircd.conf.BW6130	2005-05-28 10:29:27.000000000 -0400
-+++ lirc-0.8.4pre1/remotes/remotec/lircd.conf.BW6130	2008-09-24 17:06:37.000000000 -0400
+diff -Naurp lirc-0.8.5pre1.orig/remotes/remotec/lircd.conf.BW6130 lirc-0.8.5pre1/remotes/remotec/lircd.conf.BW6130
+--- lirc-0.8.5pre1.orig/remotes/remotec/lircd.conf.BW6130	2005-05-28 10:29:27.000000000 -0400
++++ lirc-0.8.5pre1/remotes/remotec/lircd.conf.BW6130	2009-02-26 09:18:45.414659744 -0500
 @@ -20,20 +20,20 @@ begin remote
    toggle_bit     0
  
@@ -3684,9 +3755,9 @@ diff -Naurp lirc-0.8.4pre1.orig/remotes/remotec/lircd.conf.BW6130 lirc-0.8.4pre1
  	MOUSE_SLOW_N		0x95
  	MOUSE_SLOW_NNE		0xd1
  	MOUSE_SLOW_NE		0xcd
-diff -Naurp lirc-0.8.4pre1.orig/remotes/samsung/lircd.conf.samsung lirc-0.8.4pre1/remotes/samsung/lircd.conf.samsung
---- lirc-0.8.4pre1.orig/remotes/samsung/lircd.conf.samsung	2008-03-02 14:18:40.000000000 -0500
-+++ lirc-0.8.4pre1/remotes/samsung/lircd.conf.samsung	2008-09-24 17:06:37.000000000 -0400
+diff -Naurp lirc-0.8.5pre1.orig/remotes/samsung/lircd.conf.samsung lirc-0.8.5pre1/remotes/samsung/lircd.conf.samsung
+--- lirc-0.8.5pre1.orig/remotes/samsung/lircd.conf.samsung	2008-10-05 04:42:36.000000000 -0400
++++ lirc-0.8.5pre1/remotes/samsung/lircd.conf.samsung	2009-02-26 09:19:05.215660078 -0500
 @@ -28,60 +28,60 @@ begin remote
  
        begin codes
@@ -3708,8 +3779,7 @@ diff -Naurp lirc-0.8.4pre1.orig/remotes/samsung/lircd.conf.samsung lirc-0.8.4pre
  
  ### Propietary Samsung report, type 4
 -          Mute                     0xffcc0001
-+          KEY_MUTE                     0xffcc0001
-           Video_Archive            0xffcc0002
+-          Video_Archive            0xffcc0002
 -          1                        0xffcc0003
 -          2                        0xffcc0004
 -          3                        0xffcc0005
@@ -3722,28 +3792,34 @@ diff -Naurp lirc-0.8.4pre1.orig/remotes/samsung/lircd.conf.samsung lirc-0.8.4pre
 -          8                        0xffcc000c
 -          9                        0xffcc000d
 -          Subtitle                 0xffcc000e
+-          Full                     0xffcc000f
+-          0                        0xffcc0010
+-          PIP                      0xffcc0011
+-          Timer                    0xffcc0012
+-          Source                   0xffcc0013
+-          TV_Menu                  0xffcc0014
+-          EPG                      0xffcc0015
+-          Text                     0xffcc0016
++          KEY_MUTE                     0xffcc0001
++          Video_Archive                0xffcc0002
 +          KEY_1                        0xffcc0003
 +          KEY_2                        0xffcc0004
 +          KEY_3                        0xffcc0005
-+                              0xffcc0006
++          Sleep                        0xffcc0006
 +          KEY_4                        0xffcc0007
 +          KEY_5                        0xffcc0008
 +          KEY_6                        0xffcc0009
-+                               0xffcc000a
++          Last                         0xffcc000a
 +          KEY_7                        0xffcc000b
 +          KEY_8                        0xffcc000c
 +          KEY_9                        0xffcc000d
-+                           0xffcc000e
-           Full                     0xffcc000f
--          0                        0xffcc0010
++          KEY_SUBTITLE                 0xffcc000e
++          Full                         0xffcc000f
 +          KEY_0                        0xffcc0010
-           PIP                      0xffcc0011
-           Timer                    0xffcc0012
--          Source                   0xffcc0013
-+                             0xffcc0013
-           TV_Menu                  0xffcc0014
--          EPG                      0xffcc0015
--          Text                     0xffcc0016
++          PIP                          0xffcc0011
++          Timer                        0xffcc0012
++          Source                       0xffcc0013
++          TV_Menu                      0xffcc0014
 +          KEY_EPG                      0xffcc0015
 +          KEY_TEXT                     0xffcc0016
  # gap 17..1b: probably cursor keys were previously planned here
@@ -3771,17 +3847,17 @@ diff -Naurp lirc-0.8.4pre1.orig/remotes/samsung/lircd.conf.samsung lirc-0.8.4pre
 +          KEY_TV                       0xffcc001c
 +          KEY_RADIO                    0xffcc001d
 +          KEY_DVD                      0xffcc001e
-+          KEY_CHANNELUP                      0xffcc001f
++          KEY_CHANNELUP                0xffcc001f
 +          KEY_MENU                     0xffcc0020
-+          KEY_VOLUMEUP                     0xffcc0021
-+          KEY_CHANNELDOWN                      0xffcc0022
++          KEY_VOLUMEUP                 0xffcc0021
++          KEY_CHANNELDOWN              0xffcc0022
 +          KEY_BACK                     0xffcc0023
-+          KEY_VOLUMEDOWN                     0xffcc0024
++          KEY_VOLUMEDOWN               0xffcc0024
 +          KEY_PLAY                     0xffcc0025
 +          KEY_PAUSE                    0xffcc0026
 +          KEY_STOP                     0xffcc0027
 +          KEY_RECORD                   0xffcc0028
-+          KEY_PREVIOUS                     0xffcc0029
++          KEY_PREVIOUS                 0xffcc0029
 +          KEY_REWIND                   0xffcc002a
 +          KEY_FORWARD                  0xffcc002b
 +          KEY_NEXT                     0xffcc002c
@@ -3792,9 +3868,9 @@ diff -Naurp lirc-0.8.4pre1.orig/remotes/samsung/lircd.conf.samsung lirc-0.8.4pre
        end codes
  
  end remote
-diff -Naurp lirc-0.8.4pre1.orig/remotes/sasem/lircd.conf.sasem lirc-0.8.4pre1/remotes/sasem/lircd.conf.sasem
---- lirc-0.8.4pre1.orig/remotes/sasem/lircd.conf.sasem	2005-07-15 07:24:55.000000000 -0400
-+++ lirc-0.8.4pre1/remotes/sasem/lircd.conf.sasem	2008-09-24 17:06:37.000000000 -0400
+diff -Naurp lirc-0.8.5pre1.orig/remotes/sasem/lircd.conf.sasem lirc-0.8.5pre1/remotes/sasem/lircd.conf.sasem
+--- lirc-0.8.5pre1.orig/remotes/sasem/lircd.conf.sasem	2005-07-15 07:24:55.000000000 -0400
++++ lirc-0.8.5pre1/remotes/sasem/lircd.conf.sasem	2009-02-26 09:18:45.414659744 -0500
 @@ -33,47 +33,47 @@ begin remote
  
  
@@ -3875,9 +3951,9 @@ diff -Naurp lirc-0.8.4pre1.orig/remotes/sasem/lircd.conf.sasem lirc-0.8.4pre1/re
        end codes
  
  end remote
-diff -Naurp lirc-0.8.4pre1.orig/remotes/sigma_designs/lircd.conf.realmagic lirc-0.8.4pre1/remotes/sigma_designs/lircd.conf.realmagic
---- lirc-0.8.4pre1.orig/remotes/sigma_designs/lircd.conf.realmagic	2006-04-29 07:01:50.000000000 -0400
-+++ lirc-0.8.4pre1/remotes/sigma_designs/lircd.conf.realmagic	2008-09-24 17:06:37.000000000 -0400
+diff -Naurp lirc-0.8.5pre1.orig/remotes/sigma_designs/lircd.conf.realmagic lirc-0.8.5pre1/remotes/sigma_designs/lircd.conf.realmagic
+--- lirc-0.8.5pre1.orig/remotes/sigma_designs/lircd.conf.realmagic	2006-04-29 07:01:50.000000000 -0400
++++ lirc-0.8.5pre1/remotes/sigma_designs/lircd.conf.realmagic	2009-02-26 09:18:45.415660059 -0500
 @@ -30,43 +30,43 @@ begin remote
  
        begin codes
@@ -3954,9 +4030,9 @@ diff -Naurp lirc-0.8.4pre1.orig/remotes/sigma_designs/lircd.conf.realmagic lirc-
        end codes
  
  end remote
-diff -Naurp lirc-0.8.4pre1.orig/remotes/silitek/lircd.conf.silitek lirc-0.8.4pre1/remotes/silitek/lircd.conf.silitek
---- lirc-0.8.4pre1.orig/remotes/silitek/lircd.conf.silitek	2001-04-24 15:36:10.000000000 -0400
-+++ lirc-0.8.4pre1/remotes/silitek/lircd.conf.silitek	2008-09-24 17:06:37.000000000 -0400
+diff -Naurp lirc-0.8.5pre1.orig/remotes/silitek/lircd.conf.silitek lirc-0.8.5pre1/remotes/silitek/lircd.conf.silitek
+--- lirc-0.8.5pre1.orig/remotes/silitek/lircd.conf.silitek	2001-04-24 15:36:10.000000000 -0400
++++ lirc-0.8.5pre1/remotes/silitek/lircd.conf.silitek	2009-02-26 09:18:45.415660059 -0500
 @@ -30,68 +30,68 @@ begin remote
      MOUSE_SSE                0x0000000000aa0004
      MOUSE_SE                 0x0000000000aa0003
@@ -4074,9 +4150,9 @@ diff -Naurp lirc-0.8.4pre1.orig/remotes/silitek/lircd.conf.silitek lirc-0.8.4pre
 +    KEY_CLOSE                 0x0000000000cc5d62
    end codes
  end remote
-diff -Naurp lirc-0.8.4pre1.orig/remotes/streamzap/lircd.conf.streamzap lirc-0.8.4pre1/remotes/streamzap/lircd.conf.streamzap
---- lirc-0.8.4pre1.orig/remotes/streamzap/lircd.conf.streamzap	2005-02-12 09:20:23.000000000 -0500
-+++ lirc-0.8.4pre1/remotes/streamzap/lircd.conf.streamzap	2008-09-24 17:06:37.000000000 -0400
+diff -Naurp lirc-0.8.5pre1.orig/remotes/streamzap/lircd.conf.streamzap lirc-0.8.5pre1/remotes/streamzap/lircd.conf.streamzap
+--- lirc-0.8.5pre1.orig/remotes/streamzap/lircd.conf.streamzap	2005-02-12 09:20:23.000000000 -0500
++++ lirc-0.8.5pre1/remotes/streamzap/lircd.conf.streamzap	2009-02-26 09:19:05.237856913 -0500
 @@ -27,41 +27,41 @@ begin remote
  
  
@@ -4107,6 +4183,15 @@ diff -Naurp lirc-0.8.4pre1.orig/remotes/streamzap/lircd.conf.streamzap lirc-0.8.
 -          PLAY                     0x17
 -          PAUSE                    0x18
 -          STOP                     0x19
+-          |<<                      0x1A
+-          >>|                      0x1B
+-          RECORD                   0x1C
+-          <<                       0x1D
+-          >>                       0x1E
+-          RED                      0x20
+-          GREEN                    0x21
+-          YELLOW                   0x22
+-          BLUE                     0x23
 +          KEY_0                        0x00
 +          KEY_1                        0x01
 +          KEY_2                        0x02
@@ -4133,15 +4218,8 @@ diff -Naurp lirc-0.8.4pre1.orig/remotes/streamzap/lircd.conf.streamzap lirc-0.8.
 +          KEY_PLAY                     0x17
 +          KEY_PAUSE                    0x18
 +          KEY_STOP                     0x19
-           |<<                      0x1A
-           >>|                      0x1B
--          RECORD                   0x1C
--          <<                       0x1D
--          >>                       0x1E
--          RED                      0x20
--          GREEN                    0x21
--          YELLOW                   0x22
--          BLUE                     0x23
++          KEY_PREVIOUS                 0x1A
++          KEY_NEXT                     0x1B
 +          KEY_RECORD                   0x1C
 +          KEY_REWIND                       0x1D
 +          KEY_FORWARD                       0x1E
@@ -4152,9 +4230,9 @@ diff -Naurp lirc-0.8.4pre1.orig/remotes/streamzap/lircd.conf.streamzap lirc-0.8.
        end codes
  
  end remote
-diff -Naurp lirc-0.8.4pre1.orig/remotes/technisat/lircd.conf.mediafocusI lirc-0.8.4pre1/remotes/technisat/lircd.conf.mediafocusI
---- lirc-0.8.4pre1.orig/remotes/technisat/lircd.conf.mediafocusI	2001-02-04 08:38:09.000000000 -0500
-+++ lirc-0.8.4pre1/remotes/technisat/lircd.conf.mediafocusI	2008-09-24 17:06:37.000000000 -0400
+diff -Naurp lirc-0.8.5pre1.orig/remotes/technisat/lircd.conf.mediafocusI lirc-0.8.5pre1/remotes/technisat/lircd.conf.mediafocusI
+--- lirc-0.8.5pre1.orig/remotes/technisat/lircd.conf.mediafocusI	2001-02-04 08:38:09.000000000 -0500
++++ lirc-0.8.5pre1/remotes/technisat/lircd.conf.mediafocusI	2009-02-26 09:18:45.415660059 -0500
 @@ -30,11 +30,11 @@ begin remote
    duty_cycle   33
  
@@ -4172,9 +4250,9 @@ diff -Naurp lirc-0.8.4pre1.orig/remotes/technisat/lircd.conf.mediafocusI lirc-0.
        end codes
  
  end remote
-diff -Naurp lirc-0.8.4pre1.orig/remotes/tekram/lircd.conf.m230 lirc-0.8.4pre1/remotes/tekram/lircd.conf.m230
---- lirc-0.8.4pre1.orig/remotes/tekram/lircd.conf.m230	2002-03-28 16:26:54.000000000 -0500
-+++ lirc-0.8.4pre1/remotes/tekram/lircd.conf.m230	2008-09-24 17:06:37.000000000 -0400
+diff -Naurp lirc-0.8.5pre1.orig/remotes/tekram/lircd.conf.m230 lirc-0.8.5pre1/remotes/tekram/lircd.conf.m230
+--- lirc-0.8.5pre1.orig/remotes/tekram/lircd.conf.m230	2002-03-28 16:26:54.000000000 -0500
++++ lirc-0.8.5pre1/remotes/tekram/lircd.conf.m230	2009-02-26 09:18:45.416659738 -0500
 @@ -13,36 +13,36 @@ begin remote
    name  M230
    bits  8
@@ -4235,13 +4313,18 @@ diff -Naurp lirc-0.8.4pre1.orig/remotes/tekram/lircd.conf.m230 lirc-0.8.4pre1/re
 +	KEY_KPMINUS		0x0C
       end codes
  end remote
-diff -Naurp lirc-0.8.4pre1.orig/remotes/vlsystem/lircd.conf.mplay lirc-0.8.4pre1/remotes/vlsystem/lircd.conf.mplay
---- lirc-0.8.4pre1.orig/remotes/vlsystem/lircd.conf.mplay	2007-12-22 07:33:17.000000000 -0500
-+++ lirc-0.8.4pre1/remotes/vlsystem/lircd.conf.mplay	2008-09-24 17:06:37.000000000 -0400
-@@ -27,42 +27,42 @@ begin remote
-           Movies                   0x40
-           Television               0x46
-           Photos                   0x45
+diff -Naurp lirc-0.8.5pre1.orig/remotes/vlsystem/lircd.conf.mplay lirc-0.8.5pre1/remotes/vlsystem/lircd.conf.mplay
+--- lirc-0.8.5pre1.orig/remotes/vlsystem/lircd.conf.mplay	2007-12-22 07:33:17.000000000 -0500
++++ lirc-0.8.5pre1/remotes/vlsystem/lircd.conf.mplay	2009-02-26 09:19:05.217660199 -0500
+@@ -22,49 +22,49 @@ begin remote
+   toggle_bit_mask 0x0
+ 
+       begin codes
+-          PwrOff                   0x41
+-          PwrOn                    0x55
+-          Movies                   0x40
+-          Television               0x46
+-          Photos                   0x45
 -          Music                    0x56
 -          1                        0x4d
 -          2                        0x4e
@@ -4255,6 +4338,36 @@ diff -Naurp lirc-0.8.4pre1.orig/remotes/vlsystem/lircd.conf.mplay lirc-0.8.4pre1
 -          0                        0x4c
 -          Vol+                     0x0a
 -          Vol-                     0x0e
+-          Ch+_Lang                 0x12
+-          Ch-_Page                 0x16
+-          Guide                    0x0f
+-          Back                     0x0b
+-          Tv                       0x13
+-          Ok                       0x42
+-          Up                       0x19
+-          Left                     0x54
+-          Right                    0x43
+-          Down                     0x1d
+-          Exit_Click               0x1f
+-          Task_Quick               0x17
+-          Run_DClick               0x1b
+-          Rew                      0x0d
+-          Play                     0x09
+-          Ffwd                     0x15
+-          Prev                     0x1a
+-          Stop                     0x01
+-          Next                     0x1e
+-          Pause                    0x05
+-          Mute                     0x4a
+-          Warp_Mouse               0x47
+-          Rec                      0x11
+-          DVD_Zoom                 0x14
+-          Detail                   0x4b
++          PwrOff                       0x41
++          KEY_POWER                    0x55
++          KEY_VIDEO                    0x40
++          KEY_TV                       0x46
++          KEY_PHOTO                    0x45
 +          KEY_AUDIO                    0x56
 +          KEY_1                        0x4d
 +          KEY_2                        0x4e
@@ -4266,53 +4379,39 @@ diff -Naurp lirc-0.8.4pre1.orig/remotes/vlsystem/lircd.conf.mplay lirc-0.8.4pre1
 +          KEY_8                        0x03
 +          KEY_9                        0x07
 +          KEY_0                        0x4c
-+          KEY_VOLUMEUP                     0x0a
-+          KEY_VOLUMEDOWN                     0x0e
-           Ch+_Lang                 0x12
-           Ch-_Page                 0x16
-           Guide                    0x0f
--          Back                     0x0b
--          Tv                       0x13
--          Ok                       0x42
--          Up                       0x19
--          Left                     0x54
--          Right                    0x43
--          Down                     0x1d
++          KEY_VOLUMEUP                 0x0a
++          KEY_VOLUMEDOWN               0x0e
++          KEY_CHANNELUP                0x12
++          KEY_CHANNELDOWN              0x16
++          Guide                        0x0f
 +          KEY_BACK                     0x0b
-+                                 0x13
++          KEY_TV                       0x13
 +          KEY_OK                       0x42
 +          KEY_UP                       0x19
 +          KEY_LEFT                     0x54
 +          KEY_RIGHT                    0x43
 +          KEY_DOWN                     0x1d
-           Exit_Click               0x1f
-           Task_Quick               0x17
-           Run_DClick               0x1b
--          Rew                      0x0d
--          Play                     0x09
--          Ffwd                     0x15
--          Prev                     0x1a
--          Stop                     0x01
--          Next                     0x1e
--          Pause                    0x05
--          Mute                     0x4a
-+          KEY_REWIND                      0x0d
++          Exit_Click                   0x1f
++          Task_Quick                   0x17
++          Run_DClick                   0x1b
++          KEY_REWIND                   0x0d
 +          KEY_PLAY                     0x09
-+                               0x15
-+          KEY_PREVIOUS                     0x1a
++          KEY_FASTFORWARD              0x15
++          KEY_PREVIOUS                 0x1a
 +          KEY_STOP                     0x01
 +          KEY_NEXT                     0x1e
 +          KEY_PAUSE                    0x05
 +          KEY_MUTE                     0x4a
-           Warp_Mouse               0x47
--          Rec                      0x11
-+          KEY_RECORD                      0x11
-           DVD_Zoom                 0x14
-           Detail                   0x4b
++          Warp_Mouse                   0x47
++          KEY_RECORD                   0x11
++          KEY_ZOOM                     0x14
++          Detail                       0x4b
        end codes
-diff -Naurp lirc-0.8.4pre1.orig/remotes/x10/lircd.conf.mouseremote lirc-0.8.4pre1/remotes/x10/lircd.conf.mouseremote
---- lirc-0.8.4pre1.orig/remotes/x10/lircd.conf.mouseremote	2005-01-22 05:40:43.000000000 -0500
-+++ lirc-0.8.4pre1/remotes/x10/lircd.conf.mouseremote	2008-09-24 17:06:37.000000000 -0400
+ 
+ end remote
+diff -Naurp lirc-0.8.5pre1.orig/remotes/x10/lircd.conf.mouseremote lirc-0.8.5pre1/remotes/x10/lircd.conf.mouseremote
+--- lirc-0.8.5pre1.orig/remotes/x10/lircd.conf.mouseremote	2005-01-22 05:40:43.000000000 -0500
++++ lirc-0.8.5pre1/remotes/x10/lircd.conf.mouseremote	2009-02-26 09:18:45.419659649 -0500
 @@ -24,42 +24,42 @@ begin remote
    gap		140000
  
@@ -4395,9 +4494,9 @@ diff -Naurp lirc-0.8.4pre1.orig/remotes/x10/lircd.conf.mouseremote lirc-0.8.4pre
  	end codes	
  
  end remote
-diff -Naurp lirc-0.8.4pre1.orig/remotes/x10/lircd.conf.mp3anywhere lirc-0.8.4pre1/remotes/x10/lircd.conf.mp3anywhere
---- lirc-0.8.4pre1.orig/remotes/x10/lircd.conf.mp3anywhere	2007-07-01 03:09:11.000000000 -0400
-+++ lirc-0.8.4pre1/remotes/x10/lircd.conf.mp3anywhere	2008-09-24 17:06:37.000000000 -0400
+diff -Naurp lirc-0.8.5pre1.orig/remotes/x10/lircd.conf.mp3anywhere lirc-0.8.5pre1/remotes/x10/lircd.conf.mp3anywhere
+--- lirc-0.8.5pre1.orig/remotes/x10/lircd.conf.mp3anywhere	2007-07-01 03:09:11.000000000 -0400
++++ lirc-0.8.5pre1/remotes/x10/lircd.conf.mp3anywhere	2009-02-26 09:18:45.419659649 -0500
 @@ -22,43 +22,43 @@ begin remote
    gap		140000
  
diff --git a/lirc.spec b/lirc.spec
index 927649f..dce54a9 100644
--- a/lirc.spec
+++ b/lirc.spec
@@ -14,31 +14,30 @@
 %bcond_without  portaudio
 %bcond_without  x
 %bcond_with     svgalib
-#define pre     pre2
+%define pre     pre1
 
 Name:           lirc
-Version:        0.8.4a
-Release:        4%{?pre:.%{pre}}%{?dist}
+Version:        0.8.5
+Release:        1%{?pre:.%{pre}}%{?dist}
 Summary:        The Linux Infrared Remote Control package
 
 Group:          System Environment/Daemons
 License:        GPLv2+
 URL:            http://www.lirc.org/
-Source0:        http://downloads.sourceforge.net/lirc/%{name}-%{version}.tar.bz2
-#Source0:        http://lirc.sourceforge.net/software/snapshots/%{name}-%{version}%{pre}.tar.bz2
+#Source0:        http://downloads.sourceforge.net/lirc/%{name}-%{version}.tar.bz2
+Source0:        http://lirc.sourceforge.net/software/snapshots/%{name}-%{version}%{pre}.tar.bz2
 Source1:        %{name}.init
 Source2:        %{name}.sysconfig
 Patch0:         lirc-use-new-instead-of-conf-as-filename-suffix.patch
 # https://bugzilla.redhat.com/show_bug.cgi?id=457273
 # http://thread.gmane.org/gmane.comp.hardware.lirc/6884
-Patch1:		lirc-0.8.4-standardize-remote-keycodes.patch
+Patch1:		lirc-0.8.5-standardized-remote-keycodes.patch
 Patch2:         lirc-0.8.4-make-remote-names-all-unique.patch
-Patch3:         lirc-0.8.4-standardized-name-fixups.patch
-Patch4:         lirc-0.8.4-cvs-update.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  %{__perl}
-BuildRequires:  libusb-devel
+BuildRequires:  libusb-devel, python-devel
+BuildRequires:  libftdi-devel
 BuildRequires:  automake libtool
 %if %{with alsa}
 BuildRequires:  alsa-lib-devel
@@ -122,6 +121,7 @@ of remote control configuration files.
 %patch0 -p1
 
 chmod 644 contrib/*
+chmod +x contrib/hal
 
 sed -i -e 's|/usr/local/etc/|/etc/|' contrib/irman2lirc
 
@@ -155,11 +155,9 @@ touch -r aclocal.m4 configure.ac # avoid autofoo re-run
 # Don't create a backup, or the original definitions will get installed
 %patch1 -p1
 %patch2 -p1
-%patch3 -p1
-%patch4 -p1
 # Re-run autofoo for new cvs features
-autoreconf -i -f
-automake
+#autoreconf -i -f
+#automake
 chmod +x daemons/input_map.sh
 
 %build
@@ -267,7 +265,9 @@ fi
 
 
 %changelog
-* Wed Feb 25 2009 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0.8.4a-4
+* Thu Feb 26 2009 Jarod Wilson <jarod@redhat.com> 0.8.5-0.1.pre1
+- Update to lirc 0.8.5pre1 cvs snapshot
+- Adds support for usb-connected ftdi-based homebrew transceivers
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
 
 * Tue Dec 09 2008 Jarod Wilson <jarod@redhat.com> 0.8.4a-3
diff --git a/sources b/sources
index 4342ac4..65959a9 100644
--- a/sources
+++ b/sources
@@ -1 +1,2 @@
 606b714ed843d28060163ffc571fc1f7  lirc-0.8.4a.tar.bz2
+ea1fc984be29cede02b3731bebe4e738  lirc-0.8.5pre1.tar.bz2

From c6dd22cc1bc6efffae5fe7e451d734a45553b903 Mon Sep 17 00:00:00 2001
From: Jarod Wilson <jwilson@fedoraproject.org>
Date: Fri, 10 Apr 2009 19:20:18 +0000
Subject: [PATCH 061/204] - Update to lirc 0.8.5pre2 cvs snapshot

---
 .cvsignore | 1 +
 lirc.spec  | 5 ++++-
 sources    | 3 +--
 3 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/.cvsignore b/.cvsignore
index 9757f39..3d0734b 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -4,3 +4,4 @@ lirc-0.8.4pre2.tar.bz2
 lirc-0.8.4.tar.bz2
 lirc-0.8.4a.tar.bz2
 lirc-0.8.5pre1.tar.bz2
+lirc-0.8.5pre2.tar.bz2
diff --git a/lirc.spec b/lirc.spec
index dce54a9..c8b1879 100644
--- a/lirc.spec
+++ b/lirc.spec
@@ -14,7 +14,7 @@
 %bcond_without  portaudio
 %bcond_without  x
 %bcond_with     svgalib
-%define pre     pre1
+%define pre     pre2
 
 Name:           lirc
 Version:        0.8.5
@@ -265,6 +265,9 @@ fi
 
 
 %changelog
+* Fri Apr 10 2009 Jarod Wilson <jarod@redhat.com> 0.8.5-0.1.pre2
+- Update to lirc 0.8.5pre2 cvs snapshot
+
 * Thu Feb 26 2009 Jarod Wilson <jarod@redhat.com> 0.8.5-0.1.pre1
 - Update to lirc 0.8.5pre1 cvs snapshot
 - Adds support for usb-connected ftdi-based homebrew transceivers
diff --git a/sources b/sources
index 65959a9..0a8a1d9 100644
--- a/sources
+++ b/sources
@@ -1,2 +1 @@
-606b714ed843d28060163ffc571fc1f7  lirc-0.8.4a.tar.bz2
-ea1fc984be29cede02b3731bebe4e738  lirc-0.8.5pre1.tar.bz2
+0cd8119e54806be2a7245933f0d51b54  lirc-0.8.5pre2.tar.bz2

From bb36f305d9f2d30488bc183330bac7d0b7324ed1 Mon Sep 17 00:00:00 2001
From: Jarod Wilson <jwilson@fedoraproject.org>
Date: Mon, 18 May 2009 03:33:28 +0000
Subject: [PATCH 062/204] - Update to lirc 0.8.5pre3 cvs snapshot

---
 .cvsignore | 1 +
 lirc.spec  | 5 ++++-
 sources    | 2 +-
 3 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/.cvsignore b/.cvsignore
index 3d0734b..4a43c40 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -5,3 +5,4 @@ lirc-0.8.4.tar.bz2
 lirc-0.8.4a.tar.bz2
 lirc-0.8.5pre1.tar.bz2
 lirc-0.8.5pre2.tar.bz2
+lirc-0.8.5pre3.tar.bz2
diff --git a/lirc.spec b/lirc.spec
index c8b1879..7657b76 100644
--- a/lirc.spec
+++ b/lirc.spec
@@ -14,7 +14,7 @@
 %bcond_without  portaudio
 %bcond_without  x
 %bcond_with     svgalib
-%define pre     pre2
+%define pre     pre3
 
 Name:           lirc
 Version:        0.8.5
@@ -265,6 +265,9 @@ fi
 
 
 %changelog
+* Sun May 17 2009 Jarod Wilson <jarod@redhat.com> 0.8.5-0.1.pre3
+- Update to lirc 0.8.5pre3 cvs snapshot
+
 * Fri Apr 10 2009 Jarod Wilson <jarod@redhat.com> 0.8.5-0.1.pre2
 - Update to lirc 0.8.5pre2 cvs snapshot
 
diff --git a/sources b/sources
index 0a8a1d9..2b7913d 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-0cd8119e54806be2a7245933f0d51b54  lirc-0.8.5pre2.tar.bz2
+10fc09101a2f914e0c65a3980e9ab46c  lirc-0.8.5pre3.tar.bz2

From 9699c0a8cd7cb69e4793927d06e7659898242e87 Mon Sep 17 00:00:00 2001
From: Jarod Wilson <jwilson@fedoraproject.org>
Date: Thu, 28 May 2009 16:53:42 +0000
Subject: [PATCH 063/204] - Update to lirc 0.8.5 - Add irman support, now that
 libirman is in Fedora (#474992)

---
 .cvsignore |  1 +
 lirc.spec  | 20 ++++++++++++--------
 sources    |  2 +-
 3 files changed, 14 insertions(+), 9 deletions(-)

diff --git a/.cvsignore b/.cvsignore
index 4a43c40..9ad23df 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -6,3 +6,4 @@ lirc-0.8.4a.tar.bz2
 lirc-0.8.5pre1.tar.bz2
 lirc-0.8.5pre2.tar.bz2
 lirc-0.8.5pre3.tar.bz2
+lirc-0.8.5.tar.bz2
diff --git a/lirc.spec b/lirc.spec
index 7657b76..b82d064 100644
--- a/lirc.spec
+++ b/lirc.spec
@@ -14,18 +14,18 @@
 %bcond_without  portaudio
 %bcond_without  x
 %bcond_with     svgalib
-%define pre     pre3
+#define pre     pre3
 
 Name:           lirc
 Version:        0.8.5
-Release:        1%{?pre:.%{pre}}%{?dist}
+Release:        2%{?pre:.%{pre}}%{?dist}
 Summary:        The Linux Infrared Remote Control package
 
 Group:          System Environment/Daemons
 License:        GPLv2+
 URL:            http://www.lirc.org/
-#Source0:        http://downloads.sourceforge.net/lirc/%{name}-%{version}.tar.bz2
-Source0:        http://lirc.sourceforge.net/software/snapshots/%{name}-%{version}%{pre}.tar.bz2
+Source0:        http://downloads.sourceforge.net/lirc/%{name}-%{version}.tar.bz2
+#Source0:        http://lirc.sourceforge.net/software/snapshots/%{name}-%{version}%{pre}.tar.bz2
 Source1:        %{name}.init
 Source2:        %{name}.sysconfig
 Patch0:         lirc-use-new-instead-of-conf-as-filename-suffix.patch
@@ -37,7 +37,7 @@ BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  %{__perl}
 BuildRequires:  libusb-devel, python-devel
-BuildRequires:  libftdi-devel
+BuildRequires:  libftdi-devel, libirman-devel
 BuildRequires:  automake libtool
 %if %{with alsa}
 BuildRequires:  alsa-lib-devel
@@ -265,13 +265,17 @@ fi
 
 
 %changelog
-* Sun May 17 2009 Jarod Wilson <jarod@redhat.com> 0.8.5-0.1.pre3
+* Thu May 28 2009 Jarod Wilson <jarod@redhat.com> 0.8.5-2
+- Update to lirc 0.8.5
+- Add irman support, now that libirman is in Fedora (#474992)
+
+* Sun May 17 2009 Jarod Wilson <jarod@redhat.com> 0.8.5-1.pre3
 - Update to lirc 0.8.5pre3 cvs snapshot
 
-* Fri Apr 10 2009 Jarod Wilson <jarod@redhat.com> 0.8.5-0.1.pre2
+* Fri Apr 10 2009 Jarod Wilson <jarod@redhat.com> 0.8.5-1.pre2
 - Update to lirc 0.8.5pre2 cvs snapshot
 
-* Thu Feb 26 2009 Jarod Wilson <jarod@redhat.com> 0.8.5-0.1.pre1
+* Thu Feb 26 2009 Jarod Wilson <jarod@redhat.com> 0.8.5-1.pre1
 - Update to lirc 0.8.5pre1 cvs snapshot
 - Adds support for usb-connected ftdi-based homebrew transceivers
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
diff --git a/sources b/sources
index 2b7913d..ffa8696 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-10fc09101a2f914e0c65a3980e9ab46c  lirc-0.8.5pre3.tar.bz2
+5a274e4eaff8156b17903c22ea01f506  lirc-0.8.5.tar.bz2

From 75102cbe757a854092514f938d76ad110b946e6e Mon Sep 17 00:00:00 2001
From: Jarod Wilson <jwilson@fedoraproject.org>
Date: Tue, 23 Jun 2009 20:06:52 +0000
Subject: [PATCH 064/204] - Update to lirc 0.8.6pre1 - Adds Linux input layer
 support to lircmd - Adds XMP protocol support - Moves lircd socket from /dev/
 to /var/run/lirc/ and pid file from     /var/run/ to /var/run/lirc/

---
 .cvsignore |  1 +
 lirc.spec  | 17 ++++++++++++-----
 sources    |  2 +-
 3 files changed, 14 insertions(+), 6 deletions(-)

diff --git a/.cvsignore b/.cvsignore
index 9ad23df..86cffdc 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -7,3 +7,4 @@ lirc-0.8.5pre1.tar.bz2
 lirc-0.8.5pre2.tar.bz2
 lirc-0.8.5pre3.tar.bz2
 lirc-0.8.5.tar.bz2
+lirc-0.8.6pre1.tar.bz2
diff --git a/lirc.spec b/lirc.spec
index b82d064..293bb10 100644
--- a/lirc.spec
+++ b/lirc.spec
@@ -14,18 +14,18 @@
 %bcond_without  portaudio
 %bcond_without  x
 %bcond_with     svgalib
-#define pre     pre3
+%define pre     pre1
 
 Name:           lirc
-Version:        0.8.5
-Release:        2%{?pre:.%{pre}}%{?dist}
+Version:        0.8.6
+Release:        0.1%{?pre:.%{pre}}%{?dist}
 Summary:        The Linux Infrared Remote Control package
 
 Group:          System Environment/Daemons
 License:        GPLv2+
 URL:            http://www.lirc.org/
-Source0:        http://downloads.sourceforge.net/lirc/%{name}-%{version}.tar.bz2
-#Source0:        http://lirc.sourceforge.net/software/snapshots/%{name}-%{version}%{pre}.tar.bz2
+#Source0:        http://downloads.sourceforge.net/lirc/%{name}-%{version}.tar.bz2
+Source0:        http://www.lirc.org/software/snapshots/%{name}-%{version}%{pre}.tar.bz2
 Source1:        %{name}.init
 Source2:        %{name}.sysconfig
 Patch0:         lirc-use-new-instead-of-conf-as-filename-suffix.patch
@@ -265,6 +265,13 @@ fi
 
 
 %changelog
+* Tue Jun 23 2009 Jarod Wilson <jarod@redhat.com> 0.8.6-0.1.pre1
+- Update to lirc 0.8.6pre1
+- Adds Linux input layer support to lircmd
+- Adds XMP protocol support
+- Moves lircd socket from /dev/ to /var/run/lirc/ and pid file from
+  /var/run/ to /var/run/lirc/
+
 * Thu May 28 2009 Jarod Wilson <jarod@redhat.com> 0.8.5-2
 - Update to lirc 0.8.5
 - Add irman support, now that libirman is in Fedora (#474992)
diff --git a/sources b/sources
index ffa8696..0039efb 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-5a274e4eaff8156b17903c22ea01f506  lirc-0.8.5.tar.bz2
+0d42127b1e58c42e276349a0da545584  lirc-0.8.6pre1.tar.bz2

From aaf95ca122d38a54daa22f3f43bba14ea8fcf104 Mon Sep 17 00:00:00 2001
From: Jarod Wilson <jwilson@fedoraproject.org>
Date: Wed, 24 Jun 2009 23:39:51 +0000
Subject: [PATCH 065/204] - Fix things up so the relocated socket actually
 works out of the box

---
 lirc.spec | 13 +++++++++----
 1 file changed, 9 insertions(+), 4 deletions(-)

diff --git a/lirc.spec b/lirc.spec
index 293bb10..542dd28 100644
--- a/lirc.spec
+++ b/lirc.spec
@@ -18,7 +18,7 @@
 
 Name:           lirc
 Version:        0.8.6
-Release:        0.1%{?pre:.%{pre}}%{?dist}
+Release:        0.2%{?pre:.%{pre}}%{?dist}
 Summary:        The Linux Infrared Remote Control package
 
 Group:          System Environment/Daemons
@@ -204,8 +204,8 @@ cd ..
 
 touch $RPM_BUILD_ROOT%{_sysconfdir}/lirc{d,md}.conf
 
-install -dm 755 $RPM_BUILD_ROOT/dev
-touch $RPM_BUILD_ROOT/dev/lirc{d,m}
+install -dm 755 $RPM_BUILD_ROOT%{_localstatedir}/run/lirc/
+touch $RPM_BUILD_ROOT%{_localstatedir}/run/lirc/lirc{d,m}
 
 rm $RPM_BUILD_ROOT%{_libdir}/liblirc_client.la
 
@@ -239,11 +239,13 @@ fi
 %{_bindir}/*ir*
 %{_bindir}/*mode2
 %{_sbindir}/lirc*d
+%dir %{_datadir}/lirc/
 %{_datadir}/lirc/
+%dir %{_localstatedir}/run/lirc/
 %{_mandir}/man1/*ir*.1*
 %{_mandir}/man1/*mode2*.1*
 %{_mandir}/man8/lirc*d.8*
-%ghost /dev/lirc*
+%ghost %{_localstatedir}/run/lirc/lirc*
 
 %files libs
 %defattr(-,root,root,-)
@@ -265,6 +267,9 @@ fi
 
 
 %changelog
+* Wed Jun 24 2009 Jarod Wilson <jarod@redhat.com> 0.8.6-0.2.pre1
+- Fix things up so the relocated socket actually works out of the box
+
 * Tue Jun 23 2009 Jarod Wilson <jarod@redhat.com> 0.8.6-0.1.pre1
 - Update to lirc 0.8.6pre1
 - Adds Linux input layer support to lircmd

From eb63a0bfd28274932efa9d123a9e30d65393fa3d Mon Sep 17 00:00:00 2001
From: Jarod Wilson <jwilson@fedoraproject.org>
Date: Wed, 22 Jul 2009 02:41:45 +0000
Subject: [PATCH 066/204] - Set up tools to use /dev/lirc0 instead of /dev/lirc
 by default - Set a default font for xmode2 most people actually have
 (#467339)

---
 lirc.spec | 12 +++++++++++-
 1 file changed, 11 insertions(+), 1 deletion(-)

diff --git a/lirc.spec b/lirc.spec
index 542dd28..63ef8d2 100644
--- a/lirc.spec
+++ b/lirc.spec
@@ -18,7 +18,7 @@
 
 Name:           lirc
 Version:        0.8.6
-Release:        0.2%{?pre:.%{pre}}%{?dist}
+Release:        0.3%{?pre:.%{pre}}%{?dist}
 Summary:        The Linux Infrared Remote Control package
 
 Group:          System Environment/Daemons
@@ -136,6 +136,12 @@ for f in remotes/chronos/lircd.conf.chronos \
     iconv -f iso-8859-1 -t utf-8 $f > $f.utf8 ; mv $f.utf8 $f
 done
 
+# use /dev/lirc0 by default instead of /dev/lirc
+sed -i -e 's|#define DEV_LIRC	"lirc"|#define DEV_LIRC	"lirc0"|' config.h.in
+
+# use fixed instead of Courier w/xmode2, should be more prevalent on linux boxen
+sed -i -e 's|char.*font1_name.*Courier.*$|char		font1_name[]="-misc-fixed-*-r-*-*-12-*-*-*-*-*-iso8859-1";|g' tools/xmode2.c
+
 sed -i -e 's|"/lib /usr/lib |"/%{_lib} %{_libdir} |' configure # lib64 rpath
 
 # *cough* I wish there was a good way to disable alsa/portaudio/svgalib...
@@ -267,6 +273,10 @@ fi
 
 
 %changelog
+* Tue Jul 21 2009 Jarod Wilson <jarod@redhat.com> 0.8.6-0.3.pre1
+- Set up tools to use /dev/lirc0 instead of /dev/lirc by default
+- Set a default font for xmode2 most people actually have (#467339)
+
 * Wed Jun 24 2009 Jarod Wilson <jarod@redhat.com> 0.8.6-0.2.pre1
 - Fix things up so the relocated socket actually works out of the box
 

From d1457197bedea067b6f1e5fd31a1eb3a08b11e73 Mon Sep 17 00:00:00 2001
From: Jesse Keating <jkeating@fedoraproject.org>
Date: Sat, 25 Jul 2009 11:09:26 +0000
Subject: [PATCH 067/204] - Rebuilt for
 https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild

---
 lirc.spec | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/lirc.spec b/lirc.spec
index 63ef8d2..96f842a 100644
--- a/lirc.spec
+++ b/lirc.spec
@@ -18,7 +18,7 @@
 
 Name:           lirc
 Version:        0.8.6
-Release:        0.3%{?pre:.%{pre}}%{?dist}
+Release:        0.4%{?pre:.%{pre}}%{?dist}
 Summary:        The Linux Infrared Remote Control package
 
 Group:          System Environment/Daemons
@@ -273,6 +273,9 @@ fi
 
 
 %changelog
+* Sat Jul 25 2009 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0.8.6-0.4.pre1
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
+
 * Tue Jul 21 2009 Jarod Wilson <jarod@redhat.com> 0.8.6-0.3.pre1
 - Set up tools to use /dev/lirc0 instead of /dev/lirc by default
 - Set a default font for xmode2 most people actually have (#467339)

From b5ac57defc9afddab6d3246186e777fa54ea0542 Mon Sep 17 00:00:00 2001
From: Jarod Wilson <jwilson@fedoraproject.org>
Date: Sat, 29 Aug 2009 17:13:54 +0000
Subject: [PATCH 068/204] - Update to lirc 0.8.6pre2

---
 .cvsignore | 1 +
 lirc.spec  | 7 +++++--
 sources    | 2 +-
 3 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/.cvsignore b/.cvsignore
index 86cffdc..f1f14b2 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -8,3 +8,4 @@ lirc-0.8.5pre2.tar.bz2
 lirc-0.8.5pre3.tar.bz2
 lirc-0.8.5.tar.bz2
 lirc-0.8.6pre1.tar.bz2
+lirc-0.8.6pre2.tar.bz2
diff --git a/lirc.spec b/lirc.spec
index 96f842a..2fdd7de 100644
--- a/lirc.spec
+++ b/lirc.spec
@@ -14,11 +14,11 @@
 %bcond_without  portaudio
 %bcond_without  x
 %bcond_with     svgalib
-%define pre     pre1
+%define pre     pre2
 
 Name:           lirc
 Version:        0.8.6
-Release:        0.4%{?pre:.%{pre}}%{?dist}
+Release:        0.5%{?pre:.%{pre}}%{?dist}
 Summary:        The Linux Infrared Remote Control package
 
 Group:          System Environment/Daemons
@@ -273,6 +273,9 @@ fi
 
 
 %changelog
+* Sat Aug 29 2009 Jarod Wilson <jarod@redhat.com> 0.8.6-0.5.pre2
+- Update to lirc 0.8.6pre2
+
 * Sat Jul 25 2009 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0.8.6-0.4.pre1
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 
diff --git a/sources b/sources
index 0039efb..3ba02d2 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-0d42127b1e58c42e276349a0da545584  lirc-0.8.6pre1.tar.bz2
+cebc6e5aaa6bffc22c48e3b237ab0f2f  lirc-0.8.6pre2.tar.bz2

From 07748b460951f1082ff390321696e54f24209048 Mon Sep 17 00:00:00 2001
From: Jarod Wilson <jwilson@fedoraproject.org>
Date: Sat, 29 Aug 2009 17:30:25 +0000
Subject: [PATCH 069/204] - Rediff patches so they actually apply still

---
 lirc-0.8.4-cvs-update.patch                   | 1200 -----------------
 ...c-0.8.6-standardized-remote-keycodes.patch |  445 +++---
 lirc.spec                                     |    7 +-
 3 files changed, 198 insertions(+), 1454 deletions(-)
 delete mode 100644 lirc-0.8.4-cvs-update.patch
 rename lirc-0.8.5-standardized-remote-keycodes.patch => lirc-0.8.6-standardized-remote-keycodes.patch (91%)

diff --git a/lirc-0.8.4-cvs-update.patch b/lirc-0.8.4-cvs-update.patch
deleted file mode 100644
index 4c6ddb6..0000000
--- a/lirc-0.8.4-cvs-update.patch
+++ /dev/null
@@ -1,1200 +0,0 @@
-diff -Naurp lirc-0.8.4a.orig/daemons/hw_devinput.c lirc-0.8.4a.upd/daemons/hw_devinput.c
---- lirc-0.8.4a.orig/daemons/hw_devinput.c	2008-03-02 14:16:30.000000000 -0500
-+++ lirc-0.8.4a.upd/daemons/hw_devinput.c	2008-12-08 17:10:05.072745094 -0500
-@@ -220,7 +220,7 @@ int devinput_init()
- 	if (ioctl(hw.fd, EVIOCGRAB, 1) == -1)
- 	{
- 		logprintf(LOG_WARNING, "can't get exclusive access to events "
--			  "comming from `%s' interface",
-+			  "coming from `%s' interface",
- 			  hw.device);
- 	}
- #endif
-diff -Naurp lirc-0.8.4a.orig/daemons/input_map.c lirc-0.8.4a.upd/daemons/input_map.c
---- lirc-0.8.4a.orig/daemons/input_map.c	1969-12-31 19:00:00.000000000 -0500
-+++ lirc-0.8.4a.upd/daemons/input_map.c	2008-12-08 17:51:33.087443731 -0500
-@@ -0,0 +1,58 @@
-+/*      $Id: input_map.c,v 5.1 2008/10/26 15:10:17 lirc Exp $      */
-+
-+/****************************************************************************
-+ ** input_map.c *************************************************************
-+ ****************************************************************************
-+ *
-+ * input_map.c - button namespace derived from Linux input layer
-+ *
-+ * Copyright (C) 2008 Christoph Bartelmus <lirc@bartelmus.de>
-+ *
-+ */
-+
-+#include <stdlib.h>
-+#include <string.h>
-+
-+#include "input_map.h"
-+
-+struct
-+{
-+	char *name;
-+	linux_input_code code;
-+
-+} input_map[] = {
-+#include "input_map.inc"
-+	{NULL, 0}
-+};
-+
-+int get_input_code(const char *name, linux_input_code *code)
-+{
-+	int i;
-+	
-+	for(i=0; input_map[i].name != NULL; i++)
-+	{
-+		if(strcasecmp(name, input_map[i].name) == 0)
-+		{
-+			*code = input_map[i].code;
-+			return i;
-+		}
-+	}
-+	return -1;
-+}
-+
-+void fprint_namespace(FILE *f)
-+{
-+	int i;
-+	
-+	for(i=0; input_map[i].name != NULL; i++)
-+	{
-+		fprintf(stdout, "%s\n", input_map[i].name);
-+	}
-+}
-+
-+int is_in_namespace(const char *name)
-+{
-+	linux_input_code dummy;
-+	
-+	return get_input_code(name, &dummy) == -1 ? 0 : 1;
-+}
-diff -Naurp lirc-0.8.4a.orig/daemons/input_map.h lirc-0.8.4a.upd/daemons/input_map.h
---- lirc-0.8.4a.orig/daemons/input_map.h	1969-12-31 19:00:00.000000000 -0500
-+++ lirc-0.8.4a.upd/daemons/input_map.h	2008-12-08 17:51:33.106519735 -0500
-@@ -0,0 +1,35 @@
-+/*      $Id: input_map.h,v 5.1 2008/10/26 15:10:17 lirc Exp $      */
-+
-+/****************************************************************************
-+ ** input_map.h *************************************************************
-+ ****************************************************************************
-+ *
-+ * input_map.h - button namespace derived from Linux input layer
-+ *
-+ * Copyright (C) 2008 Christoph Bartelmus <lirc@bartelmus.de>
-+ *
-+ */
-+
-+#ifndef INPUT_MAP_H
-+#define INPUT_MAP_H
-+
-+#include <stdio.h>
-+#include <sys/types.h>
-+#include <unistd.h>
-+
-+#if defined __linux__
-+#include <linux/input.h>
-+#include <linux/uinput.h>
-+#endif
-+
-+#if defined __linux__
-+typedef __u16 linux_input_code;
-+#else
-+typedef unsigned short linux_input_code;
-+#endif
-+
-+int get_input_code(const char *name, linux_input_code *code);
-+void fprint_namespace(FILE *f);
-+int is_in_namespace(const char *name);
-+
-+#endif /* INPUT_MAP_H */
-diff -Naurp lirc-0.8.4a.orig/daemons/input_map.sh lirc-0.8.4a.upd/daemons/input_map.sh
---- lirc-0.8.4a.orig/daemons/input_map.sh	1969-12-31 19:00:00.000000000 -0500
-+++ lirc-0.8.4a.upd/daemons/input_map.sh	2008-12-08 17:51:33.106519735 -0500
-@@ -0,0 +1,11 @@
-+#! /bin/sh
-+
-+TYPES="KEY BTN"
-+file=${1:-/usr/include/linux/input.h}
-+
-+for type in $TYPES; do
-+	grep "^#define ${type}_" < $file|sort|while read; do
-+		sed --expression="s/^#define \([^ 	]*\)\(.*\)/{\"\1\", \2},/"|grep -v "KEY_HANGUEL\|KEY_MIN_INTERESTING"
-+	done
-+done
-+
-diff -Naurp lirc-0.8.4a.orig/daemons/irrecord.c lirc-0.8.4a.upd/daemons/irrecord.c
---- lirc-0.8.4a.orig/daemons/irrecord.c	2008-12-08 16:47:25.358745194 -0500
-+++ lirc-0.8.4a.upd/daemons/irrecord.c	2008-12-08 18:10:06.096432179 -0500
-@@ -52,6 +52,7 @@
- #include "ir_remote.h"
- #include "config_file.h"
- #include "receive.h"
-+#include "input_map.h"
- 
- void flushhw(void);
- int resethw(void);
-@@ -80,7 +81,7 @@ void get_scheme(struct ir_remote *remote
- struct lengths *get_max_length(struct lengths *first,unsigned int *sump);
- void unlink_length(struct lengths **first,struct lengths *remove);
- int get_trail_length(struct ir_remote *remote, int interactive);
--int get_lead_length(struct ir_remote *remote);
-+int get_lead_length(struct ir_remote *remote, int interactive);
- int get_repeat_length(struct ir_remote *remote, int interactive);
- int get_header_length(struct ir_remote *remote, int interactive);
- int get_data_length(struct ir_remote *remote, int interactive);
-@@ -96,7 +97,7 @@ const char *usage="Usage: %s [options] f
- struct ir_remote remote;
- struct ir_ncode ncode;
- 
--#define IRRECORD_VERSION "0.5"
-+#define IRRECORD_VERSION "5.84"
- #define BUTTON 80+1
- #define RETRIES 10
- 
-@@ -120,7 +121,7 @@ lirc_t aeps = 100;
- #define TH_REPEAT      90
- #define TH_TRAIL       90
- #define TH_LEAD        90
--#define TH_IS_BIT      15
-+#define TH_IS_BIT      10
- #define TH_RC6_SIGNAL 550
- 
- #define MIN_GAP  20000
-@@ -314,6 +315,7 @@ int main(int argc,char **argv)
- 	int repeat_flag;
- 	lirc_t min_remaining_gap, max_remaining_gap;
- 	int force;
-+	int disable_namespace = 0;
- 	int retries;
- 	int no_data = 0;
- 	struct ir_remote *remotes=NULL;
-@@ -338,6 +340,8 @@ int main(int argc,char **argv)
- 			{"device",required_argument,NULL,'d'},
- 			{"driver",required_argument,NULL,'H'},
- 			{"force",no_argument,NULL,'f'},
-+			{"disable-namespace",no_argument,NULL,'n'},
-+			{"list-namespace",no_argument,NULL,'l'},
- #ifdef DEBUG
- 			{"pre",no_argument,NULL,'p'},
- 			{"post",no_argument,NULL,'P'},
-@@ -348,9 +352,9 @@ int main(int argc,char **argv)
- 			{0, 0, 0, 0}
- 		};
- #ifdef DEBUG
--		c = getopt_long(argc,argv,"hvad:H:fpPtiT",long_options,NULL);
-+		c = getopt_long(argc,argv,"hvad:H:fnlpPtiT",long_options,NULL);
- #else
--		c = getopt_long(argc,argv,"hvad:H:f",long_options,NULL);
-+		c = getopt_long(argc,argv,"hvad:H:fnl",long_options,NULL);
- #endif
- 		if(c==-1)
- 			break;
-@@ -362,6 +366,8 @@ int main(int argc,char **argv)
- 			printf("\t -v --version\t\tdisplay version\n");
- 			printf("\t -a --analyse\t\tanalyse raw_codes config files\n");
- 			printf("\t -f --force\t\tforce raw mode\n");
-+			printf("\t -n --disable-namespace\t\tdisables namespace checks\n");
-+			printf("\t -l --list-namespace\t\tlist valid button names\n");
- 			printf("\t -H --driver=driver\tuse given driver\n");
- 			printf("\t -d --device=device\tread from given device\n");
- 			exit(EXIT_SUCCESS);
-@@ -385,6 +391,13 @@ int main(int argc,char **argv)
- 		case 'f':
- 			force=1;
- 			break;
-+		case 'n':
-+			disable_namespace = 1;
-+			break;
-+		case 'l':
-+			fprint_namespace(stdout);
-+			exit(EXIT_SUCCESS);
-+			break;
- #ifdef DEBUG
- 		case 'p':
- 			get_pre=1;
-@@ -502,7 +515,7 @@ int main(int argc,char **argv)
- 			exit(EXIT_FAILURE);
- 		}
- 		strcpy(filename_new, filename);
--		strcat(filename_new, ".new");
-+		strcat(filename_new, ".conf");
- 		filename = filename_new;
- 	}
- 	else
-@@ -717,6 +730,17 @@ int main(int argc,char **argv)
- 		{
- 			break;
- 		}
-+		if(!disable_namespace && !is_in_namespace(buffer))
-+		{
-+			printf("'%s' is not in name space (use "
-+			       "--disable-namespace to disable checks)\n",
-+			       buffer);
-+			printf("Use '%s --list-namespace' to see a full list "
-+			       "of valid button names\n",
-+			       progname);
-+			printf("Please try again.\n");
-+			continue;
-+		}
- 		
- 		if(is_raw(&remote))
- 		{
-@@ -1379,7 +1403,8 @@ void analyse_remote(struct ir_remote *ra
- 	ir_code pre, code, post;
- 	int repeat_flag;
- 	lirc_t min_remaining_gap, max_remaining_gap;
--	struct ir_ncode new_codes[100];
-+	struct ir_ncode *new_codes;
-+	size_t new_codes_count = 100;
- 	int new_index = 0;
- 	int ret;
- 
-@@ -1395,18 +1420,27 @@ void analyse_remote(struct ir_remote *ra
- 	next_code = NULL;
- 	current_code = NULL;
- 	current_index = 0;
-+	memset(&remote, 0, sizeof(remote));
- 	get_lengths(&remote, 0, 0 /* not interactive */ );
- 
--	if(is_rc6(&remote))
-+	if(is_rc6(&remote) && remote.bits >= 5)
- 	{
- 		/* have to assume something as it's very difficult to
- 		   extract the rc6_mask from the data that we have */
--		remote.rc6_mask = (ir_code) 0x100000000ll;
-+		remote.rc6_mask = ((ir_code) 0x1ll) << (remote.bits-5);
- 	}
- 
- 	remote.name = raw_data->name;
-+	remote.freq = raw_data->freq;
- 	
--	memset(new_codes, 0, sizeof(new_codes));
-+	new_codes = malloc(new_codes_count * sizeof(*new_codes));
-+	if(new_codes == NULL)
-+	{
-+		fprintf(stderr, "%s: out of memory\n",
-+			progname);
-+		return;
-+	}
-+	memset(new_codes, 0 , new_codes_count * sizeof(*new_codes));
- 	codes = raw_data->codes;
- 	while(codes->name!=NULL)
- 	{
-@@ -1429,6 +1463,25 @@ void analyse_remote(struct ir_remote *ra
- 		}
- 		else
- 		{
-+			if(new_index+1 >= new_codes_count)
-+			{
-+				struct ir_ncode *renew_codes;
-+				
-+				new_codes_count *= 2;
-+				renew_codes = realloc
-+					(new_codes,
-+					 new_codes_count * sizeof(*new_codes));
-+				if(renew_codes == NULL)
-+				{
-+					fprintf(stderr, "%s: out of memory\n",
-+						progname);
-+					free(new_codes);
-+					return;
-+				}
-+				memset(&new_codes[new_codes_count/2], 0 , new_codes_count/2 * sizeof(*new_codes));
-+				new_codes = renew_codes;
-+			}
-+			
- 			new_codes[new_index].name = codes->name;
- 			new_codes[new_index].code = code;
- 			new_index++;
-@@ -1438,6 +1491,8 @@ void analyse_remote(struct ir_remote *ra
- 	new_codes[new_index].name = NULL;
- 	remote.codes = new_codes;
- 	fprint_remotes(stdout, &remote);
-+	remote.codes = NULL;
-+	free(new_codes);
- }
- 
- #ifdef DEBUG
-@@ -1610,7 +1665,7 @@ inline lirc_t calc_signal(struct lengths
- int get_lengths(struct ir_remote *remote, int force, int interactive)
- {
- 	int retval;
--	lirc_t data,average,sum,remaining_gap,header;
-+	lirc_t data,average,maxspace,sum,remaining_gap,header;
- 	enum analyse_mode mode=MODE_GAP;
- 	int first_signal;
- 
-@@ -1628,7 +1683,7 @@ int get_lengths(struct ir_remote *remote
- 		flushhw();
- 	}
- 	retval=1;
--	average=0;sum=0;count=0;count_spaces=0;
-+	average=0;maxspace=0;sum=0;count=0;count_spaces=0;
- 	count_3repeats=0;count_5repeats=0;count_signals=0;
- 	first_signal=-1;header=0;
- 	first_length=0;
-@@ -1657,12 +1712,15 @@ int get_lengths(struct ir_remote *remote
- 					continue;
- 				}
- 				average=data;
-+				maxspace=data;
- 			}
- 			else if(is_space(data))
- 			{
- 				if(data>MIN_GAP || data>100*average ||
- 				   /* this MUST be a gap */
--				   (count_spaces>10 && data>5*average))  
-+				   (count_spaces>10 && data>5*average)
-+				   /* || Echostar
-+				      (count_spaces>20 && data>9*maxspace/10)*/)
- 					/* this should be a gap */
- 				{
- 					struct lengths *scan;
-@@ -1674,7 +1732,7 @@ int get_lengths(struct ir_remote *remote
- 					merge_lengths(first_sum);
- 					add_length(&first_gap,data);
- 					merge_lengths(first_gap);
--					sum=0;count_spaces=0;average=0;
-+					sum=0;count_spaces=0;average=0;maxspace=0;
- 					
- 					maxcount=0;
- 					scan=first_sum;
-@@ -1740,6 +1798,10 @@ int get_lengths(struct ir_remote *remote
- 				average=(average*count_spaces+data)
- 				/(count_spaces+1);
- 				count_spaces++;
-+				if(data>maxspace)
-+				{
-+					maxspace=data;
-+				}
- 			}
- 			if(count>SAMPLES*MAX_SIGNALS*2)
- 			{
-@@ -1773,8 +1835,9 @@ int get_lengths(struct ir_remote *remote
- 			}
- 			sum+=data&PULSE_MASK;
- 
--			if((data&PULSE_MASK)>=remaining_gap*(100-eps)/100
--			   || (data&PULSE_MASK)>=remaining_gap-aeps)
-+			if(count>2 &&
-+			   ((data&PULSE_MASK)>=remaining_gap*(100-eps)/100
-+			    || (data&PULSE_MASK)>=remaining_gap-aeps))
- 			{
- 				if(is_space(data))
- 				{
-@@ -1882,7 +1945,7 @@ int get_lengths(struct ir_remote *remote
- 					get_scheme(remote, interactive);
- 					if(!get_header_length(remote, interactive) ||
- 					   !get_trail_length(remote, interactive) ||
--					   !get_lead_length(remote) ||
-+					   !get_lead_length(remote, interactive) ||
- 					   !get_repeat_length(remote, interactive) ||
- 					   !get_data_length(remote, interactive))
- 					{
-@@ -2173,7 +2236,7 @@ int get_trail_length(struct ir_remote *r
- 	return(1);
- }
- 
--int get_lead_length(struct ir_remote *remote)
-+int get_lead_length(struct ir_remote *remote, int interactive)
- {
- 	unsigned int sum,max_count;
- 	struct lengths *first_lead,*max_length,*max2_length;
-@@ -2190,7 +2253,7 @@ int get_lead_length(struct ir_remote *re
- #       endif
- 	if(max_count>=sum*TH_LEAD/100)
- 	{
--		printf("Found lead pulse: %lu\n",
-+		iprintf(interactive, "Found lead pulse: %lu\n",
- 		       (unsigned long) calc_signal(max_length));
- 		remote->plead=calc_signal(max_length);
- 		return(1);
-@@ -2207,12 +2270,12 @@ int get_lead_length(struct ir_remote *re
- 	}
- 	if(abs(2*a-b)<b*eps/100 || abs(2*a-b)<aeps)
- 	{
--		printf("Found hidden lead pulse: %lu\n",
-+		iprintf(interactive, "Found hidden lead pulse: %lu\n",
- 		       (unsigned long) a);
- 		remote->plead=a;
- 		return(1);
- 	}
--	printf("No lead pulse found.\n");
-+	iprintf(interactive, "No lead pulse found.\n");
- 	return(1);
- }
- 
-diff -Naurp lirc-0.8.4a.orig/daemons/lircd.c lirc-0.8.4a.upd/daemons/lircd.c
---- lirc-0.8.4a.orig/daemons/lircd.c	2008-10-04 17:48:43.000000000 -0400
-+++ lirc-0.8.4a.upd/daemons/lircd.c	2008-12-08 17:06:32.108557638 -0500
-@@ -1,4 +1,4 @@
--/*      $Id: lircd.c,v 5.80 2008/10/04 21:48:43 lirc Exp $      */
-+/*       $Id: lircd.c,v 5.82 2008/12/06 20:00:03 lirc Exp $      */
- 
- /****************************************************************************
-  ** lircd.c *****************************************************************
-@@ -57,6 +57,12 @@
- #include <fcntl.h>
- #include <sys/file.h>
- 
-+#if defined(__linux__)
-+#include <linux/input.h>
-+#include <linux/uinput.h>
-+#include "input_map.h"
-+#endif
-+
- #if defined __APPLE__
- #include <sys/ioccom.h>
- #endif
-@@ -151,31 +157,40 @@ FILE *lf=NULL;
- 
- /* quite arbitrary limits */
- #define MAX_PEERS	100
--/* substract one for lirc, sockfd, sockinet, logfile, pidfile */
--#define MAX_CLIENTS     (FD_SETSIZE-5-MAX_PEERS)
-+/* substract one for lirc, sockfd, sockinet, logfile, pidfile, uinput */
-+#define MAX_CLIENTS     (FD_SETSIZE-6-MAX_PEERS)
- 
- int sockfd, sockinet;
-+static int uinputfd = -1;
- int clis[MAX_CLIENTS];
- 
- #define CT_LOCAL  1
- #define CT_REMOTE 2
- 
--int cli_type[MAX_CLIENTS];
--int clin=0;
-+static int cli_type[MAX_CLIENTS];
-+static int clin=0;
- 
- int listen_tcpip=0;
- unsigned short int port=LIRC_INET_PORT;
-+struct in_addr address;
- 
- struct	peer_connection *peers[MAX_PEERS];
- int	peern = 0;
- 
- int debug=0;
--int daemonized=0;
--int allow_simulate=0;
-+static int daemonized=0;
-+static int allow_simulate=0;
-+static int userelease=0;
-+static int useuinput=0;
- 
- static sig_atomic_t term=0,hup=0,alrm=0;
- static int termsig;
- 
-+inline int use_hw()
-+{
-+	return (clin>0 || (useuinput && uinputfd != -1) || repeat_remote != NULL);
-+}
-+
- /* set_transmitters only supports 32 bit int */
- #define MAX_TX (CHAR_BIT*sizeof(unsigned long))
- 
-@@ -303,6 +318,7 @@ void dosigterm(int sig)
- 		free_config(free_remotes);
- 	}
- 	free_config(remotes);
-+	repeat_remote = NULL;
- 	logprintf(LOG_NOTICE,"caught signal");
- 	for (i=0; i<clin; i++)
- 	{
-@@ -311,6 +327,13 @@ void dosigterm(int sig)
- 	};
- 	shutdown(sockfd,2);
- 	close(sockfd);
-+
-+	if(uinputfd != -1)
-+	{
-+		ioctl(uinputfd, UI_DEV_DESTROY);
-+		close(uinputfd);
-+		uinputfd = -1;
-+	}
- 	if(listen_tcpip)
- 	{
- 		shutdown(sockinet,2);
-@@ -318,7 +341,7 @@ void dosigterm(int sig)
- 	}
- 	fclose(pidf);
- 	(void) unlink(pidfile);
--	if(clin>0 && hw.deinit_func) hw.deinit_func();
-+	if(use_hw() && hw.deinit_func) hw.deinit_func();
- #ifdef USE_SYSLOG
- 	closelog();
- #else
-@@ -387,6 +410,52 @@ void dosighup(int sig)
-       }
- }
- 
-+int setup_uinputfd(const char *name)
-+{
-+#if defined(__linux__)
-+	int fd;
-+	int key;
-+	struct uinput_user_dev dev;
-+	
-+	fd = open("/dev/input/uinput", O_RDWR);
-+	if(fd == -1)
-+	{
-+		fprintf(stderr, "could not open %s\n", "uinput");
-+		perror(NULL);
-+		return -1;
-+	}
-+	memset(&dev, 0, sizeof(dev));
-+	strncpy(dev.name, name, sizeof(dev.name));
-+	dev.name[sizeof(dev.name)-1] = 0;
-+	if(write(fd, &dev, sizeof(dev)) != sizeof(dev) ||
-+	   ioctl(fd, UI_SET_EVBIT, EV_KEY) != 0 ||
-+	   ioctl(fd, UI_SET_EVBIT, EV_REP) != 0)
-+	{
-+		goto setup_error;
-+	}
-+
-+        for(key = KEY_RESERVED; key <= KEY_UNKNOWN; key++)
-+	{
-+                if(ioctl(fd, UI_SET_KEYBIT, key) != 0)
-+		{
-+			goto setup_error;
-+                }
-+	}
-+
-+	if(ioctl(fd, UI_DEV_CREATE) != 0)
-+	{
-+		goto setup_error;
-+	}
-+	return fd;
-+	
-+ setup_error:
-+	fprintf(stderr, "could not setup %s\n", "uinput");
-+	perror(NULL);
-+	close(fd);
-+#endif
-+	return -1;
-+}
-+
- void config(void)
- {
- 	FILE *fd;
-@@ -448,9 +517,7 @@ void remove_client(int fd)
- 			logprintf(LOG_INFO,"removed client");
- 			
- 			clin--;
--			if(clin==0 &&
--			   repeat_remote==NULL &&
--			   hw.deinit_func)
-+			if(!use_hw() && hw.deinit_func)
- 			{
- 				hw.deinit_func();
- 			}
-@@ -508,8 +575,8 @@ void add_client(int sock)
- 	{
- 		cli_type[clin]=0; /* what? */
- 	}
--	clis[clin++]=fd;
--	if(clin==1 && repeat_remote==NULL)
-+	clis[clin]=fd;
-+	if(!use_hw())
- 	{
- 		if(hw.init_func)
- 		{
-@@ -525,6 +592,7 @@ void add_client(int sock)
- 			}
- 		}
- 	}
-+	clin++;
- }
- 
- int add_peer_connection(char *server)
-@@ -799,6 +867,10 @@ void start_server(mode_t permission,int 
- 	listen(sockfd,3);
- 	nolinger(sockfd);
- 
-+	if(useuinput)
-+	{
-+		uinputfd = setup_uinputfd(progname);
-+	}
- 	if(listen_tcpip)
- 	{
- 		int enable=1;
-@@ -815,7 +887,7 @@ void start_server(mode_t permission,int 
- 		(void) setsockopt(sockinet,SOL_SOCKET,SO_REUSEADDR,
- 				  &enable,sizeof(enable));
- 		serv_addr_in.sin_family=AF_INET;
--		serv_addr_in.sin_addr.s_addr=htonl(INADDR_ANY);
-+		serv_addr_in.sin_addr=address;
- 		serv_addr_in.sin_port=htons(port);
- 		
- 		if(bind(sockinet,(struct sockaddr *) &serv_addr_in,
-@@ -995,7 +1067,7 @@ void dosigalrm(int sig)
- 			free(repeat_message);
- 			repeat_message=NULL;
- 		}
--		if(clin==0 && repeat_remote==NULL && hw.deinit_func)
-+		if(!use_hw() && hw.deinit_func)
- 		{
- 			hw.deinit_func();
- 		}
-@@ -1025,7 +1097,7 @@ void dosigalrm(int sig)
- 		repeat_message=NULL;
- 		repeat_fd=-1;
- 	}
--	if(clin==0 && repeat_remote==NULL && hw.deinit_func)
-+	if(!use_hw() && hw.deinit_func)
- 	{
- 		hw.deinit_func();
- 	}
-@@ -1645,13 +1717,21 @@ void free_old_remotes()
- 	struct ir_remote *scan_remotes,*found;
- 	struct ir_ncode *code;
- 	const char *release_event;
-+	const char *release_remote_name;
-+	const char *release_button_name;
- 	
- 	if(decoding ==free_remotes) return;
- 	
--	release_event = release_map_remotes(free_remotes, remotes);
-+	release_event = release_map_remotes(free_remotes, remotes,
-+					    &release_remote_name,
-+					    &release_button_name);
- 	if(release_event != NULL)
- 	{
--		broadcast_message(release_event);
-+		input_message(release_event,
-+			      release_remote_name,
-+			      release_button_name,
-+			      0,
-+			      1);
- 	}
- 	if(last_remote!=NULL)
- 	{
-@@ -1741,19 +1821,56 @@ void free_old_remotes()
- 	}
- }
- 
--void broadcast_message(const char *message)
-+void input_message(const char *message, const char *remote_name,
-+		   const char *button_name, int reps, int release)
- {
--	int len,i;
- 	const char *release_message;
-+	const char *release_remote_name;
-+	const char *release_button_name;
- 
--	release_message = check_release_event();
-+	release_message = check_release_event(&release_remote_name,
-+					      &release_button_name);
- 	if(release_message)
- 	{
--		broadcast_message(release_message);
-+		input_message(release_message, release_remote_name,
-+			      release_button_name, 0, 1);
-+	}
-+	
-+	if(!release || userelease)
-+	{
-+		broadcast_message(message);
- 	}
-+	
-+#ifdef __linux__
-+	if(uinputfd != -1)
-+	{
-+		linux_input_code input_code;
-+		
-+		if(reps < 2 &&
-+		   get_input_code(button_name, &input_code) != -1)
-+		{
-+			struct input_event event;
-+			
-+			memset(&event, 0, sizeof(event));
-+			event.type = EV_KEY;
-+			event.code = input_code;
-+			event.value = release ? 0 : (reps>0 ? 2:1);
-+			if(write(uinputfd, &event, sizeof(event)) != sizeof(event))
-+			{
-+				logprintf(LOG_ERR, "writing to uinput failed");
-+				logperror(LOG_ERR, NULL);
-+			}
-+		}
-+	}
-+#endif
-+}
- 
-+void broadcast_message(const char *message)
-+{
-+	int len,i;
-+	
- 	len=strlen(message);
--			
-+	
- 	for (i=0; i<clin; i++)
- 	{
- 		LOGPRINTF(1,"writing to client %d",i);
-@@ -1799,7 +1916,7 @@ int waitfordata(long maxusec)
- 				FD_SET(sockinet,&fds);
- 				maxfd=max(maxfd,sockinet);
- 			}
--			if(clin>0 && hw.rec_mode!=0 && hw.fd!=-1)
-+			if(use_hw() && hw.rec_mode!=0 && hw.fd!=-1)
- 			{
- 				FD_SET(hw.fd,&fds);
- 				maxfd=max(maxfd,hw.fd);
-@@ -1915,10 +2032,19 @@ int waitfordata(long maxusec)
- 			   timercmp(&now, &release_time, >))
- 			{
- 				const char *release_message;
--				release_message = trigger_release_event();
-+				const char *release_remote_name;
-+				const char *release_button_name;
-+				
-+				release_message = trigger_release_event
-+					(&release_remote_name,
-+					 &release_button_name);
- 				if(release_message)
- 				{
--					broadcast_message(release_message);
-+					input_message(release_message,
-+						      release_remote_name,
-+						      release_button_name,
-+						      0,
-+						      1);
- 				}
- 			}
- 			if(free_remotes!=NULL)
-@@ -1948,7 +2074,9 @@ int waitfordata(long maxusec)
- 		}
- 		while(ret==-1 && errno==EINTR);
- 		
--		if(hw.fd == -1 && clin > 0 && hw.init_func)
-+		if(hw.fd == -1 &&
-+		   use_hw() &&
-+		   hw.init_func)
- 		{
- 			log_enable(0);
- 			hw.init_func();
-@@ -1993,7 +2121,7 @@ int waitfordata(long maxusec)
- 			LOGPRINTF(1,"registering inet client");
- 			add_client(sockinet);
- 		}
--                if(clin>0 && hw.rec_mode!=0 && hw.fd!=-1 &&
-+                if(use_hw() && hw.rec_mode!=0 && hw.fd!=-1 &&
- 		   FD_ISSET(hw.fd,&fds))
-                 {
- 			register_input();
-@@ -2016,13 +2144,20 @@ void loop()
- 		
- 		if(message!=NULL)
- 		{
-+			const char *remote_name;
-+			const char *button_name;
-+			int reps;
-+			
- 			if(hw.ioctl_func &&
- 			   (hw.features&LIRC_CAN_NOTIFY_DECODE))
- 			{
- 				hw.ioctl_func(LIRC_NOTIFY_DECODE, NULL);
- 			}
- 			
--			broadcast_message(message);
-+			get_release_data(&remote_name, &button_name, &reps);
-+
-+			input_message(message, remote_name, button_name,
-+				      reps, 0);
- 		}
- 	}
- }
-@@ -2034,6 +2169,7 @@ int main(int argc,char **argv)
- 	mode_t permission=S_IRUSR|S_IWUSR|S_IRGRP|S_IWGRP|S_IROTH|S_IWOTH;
- 	char *device=NULL;
- 
-+	address.s_addr = htonl(INADDR_ANY);
- 	hw_choose_driver(NULL);
- 	while(1)
- 	{
-@@ -2058,9 +2194,15 @@ int main(int argc,char **argv)
- #                       endif
- 			{"release",optional_argument,NULL,'r'},
- 			{"allow-simulate",no_argument,NULL,'a'},
-+#                       if defined(__linux__)
-+			{"uinput",no_argument,NULL,'u'},
-+#                       endif
- 			{0, 0, 0, 0}
- 		};
- 		c = getopt_long(argc,argv,"hvnp:H:d:o:P:l::c:r::a"
-+#                               if defined(__linux__)
-+				"u"
-+#                               endif
- #                               ifndef USE_SYSLOG
- 				"L:"
- #                               endif
-@@ -2080,7 +2222,7 @@ int main(int argc,char **argv)
- 			printf("\t -p --permission=mode\t\tfile permissions for " LIRCD "\n");
- 			printf("\t -H --driver=driver\t\tuse given driver\n");
- 			printf("\t -d --device=device\t\tread from given device\n");
--			printf("\t -l --listen[=port]\t\tlisten for network connections on port\n");
-+			printf("\t -l --listen[=[addresss:]port]\t\tlisten for network connections\n");
- 			printf("\t -c --connect=host[:port]\tconnect to remote lircd server\n");
-                         printf("\t -o --output=socket\t\toutput socket filename\n");
-                         printf("\t -P --pidfile=file\t\tdaemon pid file\n");
-@@ -2092,6 +2234,9 @@ int main(int argc,char **argv)
- #                       endif
- 			printf("\t -r --release[=suffix]\t\tauto-generate release events\n");
- 			printf("\t -a --allow-simulate\t\taccept SIMULATE command\n");
-+#                       if defined(__linux__)
-+			printf("\t -u --uinput\t\tgenerate Linux input events\n");
-+#                       endif
- 			return(EXIT_SUCCESS);
- 		case 'v':
- 			printf("%s %s\n",progname,VERSION);
-@@ -2135,16 +2280,28 @@ int main(int argc,char **argv)
- 			{
- 				long p;
- 				char *endptr;
--				
--				p=strtol(optarg,&endptr,10);
-+				char *sep = strchr(optarg, ':');
-+				char *port_str = sep ? sep + 1 : optarg;
-+				p=strtol(port_str,&endptr,10);
- 				if(!*optarg || *endptr || p<1 || p>USHRT_MAX)
- 				{
- 					fprintf(stderr,
- 						"%s: bad port number \"%s\"\n",
--						progname,optarg);
-+						progname,port_str);
- 					return(EXIT_FAILURE);
- 				}
- 				port=(unsigned short int) p;
-+				if (sep)
-+				{
-+					*sep = 0;
-+					if(!inet_aton(optarg, &address))
-+					{
-+						fprintf(stderr,
-+							"%s: bad address \"%s\"\n",
-+							progname,optarg);
-+						return(EXIT_FAILURE);
-+					}
-+				}
- 			}
- 			else
- 			{
-@@ -2174,10 +2331,16 @@ int main(int argc,char **argv)
- 			{
- 				set_release_suffix(LIRC_RELEASE_SUFFIX);
- 			}
-+			userelease=1;
- 			break;
- 		case 'a':
- 			allow_simulate=1;
- 			break;
-+#               if defined(__linux__)
-+		case 'u':
-+			useuinput=1;
-+			break;
-+#               endif
- 		default:
- 			printf("Usage: %s [options] [config-file]\n",progname);
- 			return(EXIT_FAILURE);
-diff -Naurp lirc-0.8.4a.orig/daemons/lircd.h lirc-0.8.4a.upd/daemons/lircd.h
---- lirc-0.8.4a.orig/daemons/lircd.h	2007-09-29 13:13:14.000000000 -0400
-+++ lirc-0.8.4a.upd/daemons/lircd.h	2008-12-08 16:54:04.374682209 -0500
-@@ -32,6 +32,7 @@ void sigterm(int sig);
- void dosigterm(int sig);
- void sighup(int sig);
- void dosighup(int sig);
-+int setup_uinput(const char *name);
- void config(void);
- void nolinger(int sock);
- void remove_client(int fd);
-@@ -76,6 +77,8 @@ int send_core(int fd,char *message,char 
- int version(int fd,char *message,char *arguments);
- int get_pid(int fd,char *message,char *arguments);
- int get_command(int fd);
-+void input_message(const char *message, const char *remote_name,
-+		   const char *button_name, int reps, int release);
- void broadcast_message(const char *message);
- int waitfordata(long maxusec);
- void loop(void);
-diff -Naurp lirc-0.8.4a.orig/daemons/Makefile.am lirc-0.8.4a.upd/daemons/Makefile.am
---- lirc-0.8.4a.orig/daemons/Makefile.am	2008-09-21 14:33:19.000000000 -0400
-+++ lirc-0.8.4a.upd/daemons/Makefile.am	2008-12-08 17:58:11.557500930 -0500
-@@ -7,6 +7,8 @@
- 
- INCLUDES = -I$(top_srcdir)
- 
-+BUILT_SOURCES = input_map.inc
-+
- noinst_LIBRARIES = libhw_module.a
- libhw_module_a_SOURCES = \
- 			hw-types.c hw-types.h hardware.h \
-@@ -59,7 +61,8 @@ libhw_module_a_DEPENDENCIES = @hw_module
- sbin_PROGRAMS = lircd lircmd
- 
- lircd_SOURCES = lircd.c lircd.h \
--		config_file.c config_file.h
-+		config_file.c config_file.h \
-+		input_map.c input_map.h
- lircd_LDADD = @daemon@ libhw_module.a @hw_module_libs@
- 
- lircmd_SOURCES = lircmd.c
-@@ -69,7 +72,8 @@ bin_PROGRAMS = irrecord
- 
- irrecord_SOURCES = irrecord.c \
- 		config_file.c config_file.h \
--		dump_config.c dump_config.h
-+		dump_config.c dump_config.h \
-+		input_map.c input_map.h
- 
- irrecord_LDADD = libhw_module.a @hw_module_libs@ @receive@
- irrecord_DEPENDENCIES = @receive@
-@@ -79,6 +83,7 @@ EXTRA_PROGRAMS = lircd.simsend lircd.sim
- noinst_PROGRAMS = @maintmode_daemons_extra@
- lircd_simsend_SOURCES = lircd.c ir_remote.c config_file.c \
- 		lircd.h ir_remote.h ir_remote_types.h config_file.h \
-+		input_map.c input_map.h \
- 		hw-types.c hw-types.h hardware.h \
- 		hw_default.c hw_default.h \
- 		receive.c receive.h \
-@@ -87,6 +92,7 @@ lircd_simsend_SOURCES = lircd.c ir_remot
- lircd_simsend_CFLAGS = -DSIM_SEND
- lircd_simrec_SOURCES = lircd.c ir_remote.c config_file.c \
- 		lircd.h ir_remote.h ir_remote_types.h config_file.h \
-+		input_map.c input_map.h \
- 		hw-types.c hw-types.h hardware.h \
- 		hw_default.c hw_default.h \
- 		receive.c receive.h \
-@@ -125,4 +131,10 @@ rmfifo:
- 	-$(RM) $(DESTDIR)$(devdir)/lircd
- 	-$(RM) $(DESTDIR)$(devdir)/lircm
- 
-+input_map.inc:
-+	$(srcdir)/input_map.sh >$@
-+
-+DISTCLEANFILES = input_map.inc
-+EXTRA_DIST = input_map.inc input_map.sh
-+
- CLEANFILES = *~
-diff -Naurp lirc-0.8.4a.orig/daemons/release.c lirc-0.8.4a.upd/daemons/release.c
---- lirc-0.8.4a.orig/daemons/release.c	2008-02-06 08:43:07.000000000 -0500
-+++ lirc-0.8.4a.upd/daemons/release.c	2008-12-08 16:59:03.799472804 -0500
-@@ -1,4 +1,4 @@
--/*      $Id: release.c,v 1.3 2008/02/06 13:43:07 lirc Exp $      */
-+/*      $Id: release.c,v 1.4 2008/12/06 20:00:03 lirc Exp $      */
- 
- /****************************************************************************
-  ** release.c ***************************************************************
-@@ -25,24 +25,23 @@ static struct timeval release_time;
- static struct ir_remote *release_remote;
- static struct ir_ncode *release_ncode;
- static ir_code release_code;
-+static int release_reps;
- static lirc_t release_gap;
- 
- static struct ir_remote *release_remote2;
- static struct ir_ncode *release_ncode2;
- static ir_code release_code2;
--static const char *release_suffix = NULL;
-+static const char *release_suffix = LIRC_RELEASE_SUFFIX;
- static char message[PACKET_SIZE+1];
- 
- void register_input(void)
- {
- 	struct timeval gap;
- 	
--	if(release_suffix == NULL) return;
--	
- 	if(release_remote == NULL) return;
- 	
- 	timerclear(&gap);
--	gap.tv_usec = 2*release_gap;
-+	gap.tv_usec = 3*release_gap;
- 	
- 	gettimeofday(&release_time,NULL);
- 	timeradd(&release_time, &gap, &release_time);
-@@ -51,8 +50,6 @@ void register_input(void)
- void register_button_press(struct ir_remote *remote, struct ir_ncode *ncode,
- 			   ir_code code, int reps)
- {
--	if(release_suffix == NULL) return;
--	
- 	if(reps == 0 && release_remote != NULL)
- 	{
- 		release_remote2 = release_remote;
-@@ -63,11 +60,21 @@ void register_button_press(struct ir_rem
- 	release_remote = remote;
- 	release_ncode = ncode;
- 	release_code = code;
-+	release_reps = reps;
- 	release_gap = remote->max_remaining_gap;
- 	
- 	register_input();
- }
- 
-+void get_release_data(const char **remote_name,
-+		      const char **button_name,
-+		      int *reps)
-+{
-+	*remote_name = release_remote->name;
-+	*button_name = release_ncode->name;
-+	*reps = release_reps;
-+}
-+
- void set_release_suffix(const char *s)
- {
- 	release_suffix = s;
-@@ -78,12 +85,15 @@ void get_release_time(struct timeval *tv
- 	*tv = release_time;
- }
- 
--const char *check_release_event(void)
-+const char *check_release_event(const char **remote_name,
-+				const char **button_name)
- {
- 	int len = 0;
- 	
- 	if(release_remote2 != NULL)
- 	{
-+		*remote_name = release_remote2->name;
-+		*button_name = release_ncode2->name;
- 		len = write_message(message, PACKET_SIZE+1,
- 				    release_remote2->name,
- 				    release_ncode2->name, release_suffix,
-@@ -98,18 +108,21 @@ const char *check_release_event(void)
- 			return(NULL);
- 		}
- 
--		logprintf(LOG_INFO, "check");
-+		LOGPRINTF(3, "check");
- 		return message;
- 	}
- 	return NULL;
- }
- 
--const char *trigger_release_event(void)
-+const char *trigger_release_event(const char **remote_name,
-+				  const char **button_name)
- {
- 	int len = 0;
- 	
- 	if(release_remote != NULL)
- 	{
-+		*remote_name = release_remote->name;
-+		*button_name = release_ncode->name;
- 		len = write_message(message, PACKET_SIZE+1,
- 				    release_remote->name, release_ncode->name,
- 				    release_suffix, release_code, 0);
-@@ -123,13 +136,15 @@ const char *trigger_release_event(void)
- 			logprintf(LOG_ERR,"message buffer overflow");
- 			return(NULL);
- 		}
--		logprintf(LOG_INFO, "trigger");
-+		LOGPRINTF(3, "trigger");
- 		return message;
- 	}
- 	return NULL;
- }
- 
--const char *release_map_remotes(struct ir_remote *old, struct ir_remote *new)
-+const char *release_map_remotes(struct ir_remote *old, struct ir_remote *new,
-+				const char **remote_name,
-+				const char **button_name)
- {
- 	struct ir_remote *remote;
- 	struct ir_ncode *ncode;
-@@ -150,7 +165,7 @@ const char *release_map_remotes(struct i
- 		}
- 		else
- 		{
--			return trigger_release_event();
-+			return trigger_release_event(remote_name, button_name);
- 		}
- 	}
- 	return NULL;
-diff -Naurp lirc-0.8.4a.orig/daemons/release.h lirc-0.8.4a.upd/daemons/release.h
---- lirc-0.8.4a.orig/daemons/release.h	2007-05-06 07:54:02.000000000 -0400
-+++ lirc-0.8.4a.upd/daemons/release.h	2008-12-08 17:48:55.251581644 -0500
-@@ -1,4 +1,4 @@
--/*      $Id: release.h,v 1.1 2007/05/06 11:54:02 lirc Exp $      */
-+/*      $Id: release.h,v 1.2 2008/12/06 20:00:03 lirc Exp $      */
- 
- /****************************************************************************
-  ** release.h ***************************************************************
-@@ -18,10 +18,17 @@
- void register_input(void);
- void register_button_press(struct ir_remote *remote, struct ir_ncode *ncode,
- 			   ir_code code, int reps);
-+void get_release_data(const char **remote_name,
-+		      const char **button_name,
-+		      int *reps);
- void set_release_suffix(const char *s);
- void get_release_time(struct timeval *tv);
--const char *check_release_event(void);
--const char *trigger_release_event(void);
--const char *release_map_remotes(struct ir_remote *old, struct ir_remote *new);
-+const char *check_release_event(const char **remote_name,
-+				const char **button_name);
-+const char *trigger_release_event(const char **remote_name,
-+				  const char **button_name);
-+const char *release_map_remotes(struct ir_remote *old, struct ir_remote *new,
-+				const char **remote_name,
-+				const char **button_name);
- 
- #endif /* RELEASE_H */
-diff -Naurp lirc-0.8.4a.orig/doc/man/lircd.8 lirc-0.8.4a.upd/doc/man/lircd.8
---- lirc-0.8.4a.orig/doc/man/lircd.8	2008-10-26 10:15:37.000000000 -0400
-+++ lirc-0.8.4a.upd/doc/man/lircd.8	2008-12-08 17:14:44.574433177 -0500
-@@ -70,8 +70,9 @@ the device name isn't fixed. \fISTRING\f
- wildcards and '\\' to mark them as literal.
- 
- With the --listen option you can let lircd listen for network
--connections on the given port. The default port is 8765. No security
--checks are currently implemented.
-+connections on the given address/port. The default address is 0.0.0.0,
-+which means that connections on all network interfaces will be accepted.
-+The default port is 8765. No security checks are currently implemented.
- 
- The --connect option allows you to connect to other lircd servers that
- provide a network socket at the given host and port number. The number
-@@ -99,6 +100,14 @@ users with access to the lircd socket wi
- E.g. if you have configured your system to shut down by a button press
- on your remote control, everybody will be able to shut down
- your system from the command line.
-+
-+On Linux systems the --uinput option will enable automatic generation
-+of Linux input events. lircd will open /dev/input/uinput and inject
-+key events to the Linux kernel. The key code depends on the name that
-+was given a button in the lircd config file, e.g. if the button is
-+named KEY_1, the '1' key code will be generated. You will find a
-+complete list of possible button names in /usr/include/linux/input.h.
-+
- .SH FILES
- 
- The config file for lircd is located in /etc/lircd.conf. lircd
-diff -Naurp lirc-0.8.4a.orig/NEWS lirc-0.8.4a.upd/NEWS
---- lirc-0.8.4a.orig/NEWS	2008-12-08 16:47:25.391622403 -0500
-+++ lirc-0.8.4a.upd/NEWS	2008-12-08 17:40:05.345432825 -0500
-@@ -1,3 +1,7 @@
-+0.8.5-CVS: future
-+  * Linux input event generation using uinput
-+  * standardised namespace following Linux input conventions
-+
- 0.8.4a: 10/26/08
-   * fixed show-stopper bug in irrecord for drivers using MODE2
- 
-diff -Naurp lirc-0.8.4a.orig/TODO lirc-0.8.4a.upd/TODO
---- lirc-0.8.4a.orig/TODO	2008-07-31 07:17:53.000000000 -0400
-+++ lirc-0.8.4a.upd/TODO	2008-12-08 17:40:51.546432812 -0500
-@@ -2,8 +2,6 @@
- 
- * __init, __exit
- 
--* uinput
--
- * namespace
- 
- * GUI for irrecord
diff --git a/lirc-0.8.5-standardized-remote-keycodes.patch b/lirc-0.8.6-standardized-remote-keycodes.patch
similarity index 91%
rename from lirc-0.8.5-standardized-remote-keycodes.patch
rename to lirc-0.8.6-standardized-remote-keycodes.patch
index bbde924..9b00e5a 100644
--- a/lirc-0.8.5-standardized-remote-keycodes.patch
+++ b/lirc-0.8.6-standardized-remote-keycodes.patch
@@ -1,6 +1,6 @@
-diff -Naurp lirc-0.8.5pre1.orig/remotes/adstech/lircd.conf.usbx-707 lirc-0.8.5pre1/remotes/adstech/lircd.conf.usbx-707
---- lirc-0.8.5pre1.orig/remotes/adstech/lircd.conf.usbx-707	2009-02-26 09:16:49.248659658 -0500
-+++ lirc-0.8.5pre1/remotes/adstech/lircd.conf.usbx-707	2009-02-26 09:19:05.211666497 -0500
+diff -Naurp lirc-0.8.6pre2.orig/remotes/adstech/lircd.conf.usbx-707 lirc-0.8.6pre2/remotes/adstech/lircd.conf.usbx-707
+--- lirc-0.8.6pre2.orig/remotes/adstech/lircd.conf.usbx-707	2009-08-29 13:23:01.000000000 -0400
++++ lirc-0.8.6pre2/remotes/adstech/lircd.conf.usbx-707	2009-08-29 13:23:31.000000000 -0400
 @@ -26,50 +26,50 @@ begin remote
    toggle_bit_mask 0x0
  
@@ -90,9 +90,9 @@ diff -Naurp lirc-0.8.5pre1.orig/remotes/adstech/lircd.conf.usbx-707 lirc-0.8.5pr
        end codes
  
  end remote
-diff -Naurp lirc-0.8.5pre1.orig/remotes/animax/lircd.conf.animax lirc-0.8.5pre1/remotes/animax/lircd.conf.animax
---- lirc-0.8.5pre1.orig/remotes/animax/lircd.conf.animax	1999-04-29 17:30:59.000000000 -0400
-+++ lirc-0.8.5pre1/remotes/animax/lircd.conf.animax	2009-02-26 09:18:45.387673492 -0500
+diff -Naurp lirc-0.8.6pre2.orig/remotes/animax/lircd.conf.animax lirc-0.8.6pre2/remotes/animax/lircd.conf.animax
+--- lirc-0.8.6pre2.orig/remotes/animax/lircd.conf.animax	1999-04-29 17:30:59.000000000 -0400
++++ lirc-0.8.6pre2/remotes/animax/lircd.conf.animax	2009-08-29 13:23:31.000000000 -0400
 @@ -38,79 +38,79 @@ begin remote
  
        begin codes
@@ -206,9 +206,9 @@ diff -Naurp lirc-0.8.5pre1.orig/remotes/animax/lircd.conf.animax lirc-0.8.5pre1/
        end codes
  
  end remote
-diff -Naurp lirc-0.8.5pre1.orig/remotes/apple/lircd.conf.macmini lirc-0.8.5pre1/remotes/apple/lircd.conf.macmini
---- lirc-0.8.5pre1.orig/remotes/apple/lircd.conf.macmini	2008-05-31 17:29:12.000000000 -0400
-+++ lirc-0.8.5pre1/remotes/apple/lircd.conf.macmini	2009-02-26 09:19:05.212664695 -0500
+diff -Naurp lirc-0.8.6pre2.orig/remotes/apple/lircd.conf.macmini lirc-0.8.6pre2/remotes/apple/lircd.conf.macmini
+--- lirc-0.8.6pre2.orig/remotes/apple/lircd.conf.macmini	2008-05-31 17:29:12.000000000 -0400
++++ lirc-0.8.6pre2/remotes/apple/lircd.conf.macmini	2009-08-29 13:23:31.000000000 -0400
 @@ -26,12 +26,12 @@ begin remote
    ignore_mask 0x0000ff01
  
@@ -228,9 +228,9 @@ diff -Naurp lirc-0.8.5pre1.orig/remotes/apple/lircd.conf.macmini lirc-0.8.5pre1/
        end codes
  
  end remote
-diff -Naurp lirc-0.8.5pre1.orig/remotes/asus/lircd.conf.asus lirc-0.8.5pre1/remotes/asus/lircd.conf.asus
---- lirc-0.8.5pre1.orig/remotes/asus/lircd.conf.asus	2007-02-19 23:09:47.000000000 -0500
-+++ lirc-0.8.5pre1/remotes/asus/lircd.conf.asus	2009-02-26 09:18:45.389659539 -0500
+diff -Naurp lirc-0.8.6pre2.orig/remotes/asus/lircd.conf.asus lirc-0.8.6pre2/remotes/asus/lircd.conf.asus
+--- lirc-0.8.6pre2.orig/remotes/asus/lircd.conf.asus	2007-02-19 23:09:47.000000000 -0500
++++ lirc-0.8.6pre2/remotes/asus/lircd.conf.asus	2009-08-29 13:23:31.000000000 -0400
 @@ -19,38 +19,38 @@ begin remote
    toggle_bit	0
  
@@ -298,9 +298,9 @@ diff -Naurp lirc-0.8.5pre1.orig/remotes/asus/lircd.conf.asus lirc-0.8.5pre1/remo
          end codes
  
  end remote
-diff -Naurp lirc-0.8.5pre1.orig/remotes/asus/lircd.conf.asusdh lirc-0.8.5pre1/remotes/asus/lircd.conf.asusdh
---- lirc-0.8.5pre1.orig/remotes/asus/lircd.conf.asusdh	2007-07-08 10:01:27.000000000 -0400
-+++ lirc-0.8.5pre1/remotes/asus/lircd.conf.asusdh	2009-02-26 09:19:05.212664695 -0500
+diff -Naurp lirc-0.8.6pre2.orig/remotes/asus/lircd.conf.asusdh lirc-0.8.6pre2/remotes/asus/lircd.conf.asusdh
+--- lirc-0.8.6pre2.orig/remotes/asus/lircd.conf.asusdh	2007-07-08 10:01:27.000000000 -0400
++++ lirc-0.8.6pre2/remotes/asus/lircd.conf.asusdh	2009-08-29 13:23:31.000000000 -0400
 @@ -14,17 +14,17 @@ begin remote
    post_data_bits  0
  
@@ -325,9 +325,9 @@ diff -Naurp lirc-0.8.5pre1.orig/remotes/asus/lircd.conf.asusdh lirc-0.8.5pre1/re
          end codes
  
  end remote
-diff -Naurp lirc-0.8.5pre1.orig/remotes/asus/lircd.conf.digimatrix lirc-0.8.5pre1/remotes/asus/lircd.conf.digimatrix
---- lirc-0.8.5pre1.orig/remotes/asus/lircd.conf.digimatrix	2005-09-06 13:12:17.000000000 -0400
-+++ lirc-0.8.5pre1/remotes/asus/lircd.conf.digimatrix	2009-02-26 09:18:45.390666641 -0500
+diff -Naurp lirc-0.8.6pre2.orig/remotes/asus/lircd.conf.digimatrix lirc-0.8.6pre2/remotes/asus/lircd.conf.digimatrix
+--- lirc-0.8.6pre2.orig/remotes/asus/lircd.conf.digimatrix	2005-09-06 13:12:17.000000000 -0400
++++ lirc-0.8.6pre2/remotes/asus/lircd.conf.digimatrix	2009-08-29 13:23:31.000000000 -0400
 @@ -28,43 +28,43 @@ begin remote
  
  
@@ -404,9 +404,9 @@ diff -Naurp lirc-0.8.5pre1.orig/remotes/asus/lircd.conf.digimatrix lirc-0.8.5pre
            dvd_audio                0x00000000000050AF
            ui_size                  0x0000000000008877
            ui_on_off                0x00000000000028D7
-diff -Naurp lirc-0.8.5pre1.orig/remotes/atiusb/lircd.conf.atilibusb lirc-0.8.5pre1/remotes/atiusb/lircd.conf.atilibusb
---- lirc-0.8.5pre1.orig/remotes/atiusb/lircd.conf.atilibusb	2009-01-18 13:30:14.000000000 -0500
-+++ lirc-0.8.5pre1/remotes/atiusb/lircd.conf.atilibusb	2009-02-26 09:19:05.213664473 -0500
+diff -Naurp lirc-0.8.6pre2.orig/remotes/atiusb/lircd.conf.atilibusb lirc-0.8.6pre2/remotes/atiusb/lircd.conf.atilibusb
+--- lirc-0.8.6pre2.orig/remotes/atiusb/lircd.conf.atilibusb	2009-01-18 13:30:14.000000000 -0500
++++ lirc-0.8.6pre2/remotes/atiusb/lircd.conf.atilibusb	2009-08-29 13:23:31.000000000 -0400
 @@ -30,58 +30,58 @@ begin remote
  
  
@@ -518,9 +518,9 @@ diff -Naurp lirc-0.8.5pre1.orig/remotes/atiusb/lircd.conf.atilibusb lirc-0.8.5pr
        end codes
  
  end remote
-diff -Naurp lirc-0.8.5pre1.orig/remotes/atiusb/lircd.conf.atiusb lirc-0.8.5pre1/remotes/atiusb/lircd.conf.atiusb
---- lirc-0.8.5pre1.orig/remotes/atiusb/lircd.conf.atiusb	2009-02-26 09:16:49.268661874 -0500
-+++ lirc-0.8.5pre1/remotes/atiusb/lircd.conf.atiusb	2009-02-26 09:18:45.393659913 -0500
+diff -Naurp lirc-0.8.6pre2.orig/remotes/atiusb/lircd.conf.atiusb lirc-0.8.6pre2/remotes/atiusb/lircd.conf.atiusb
+--- lirc-0.8.6pre2.orig/remotes/atiusb/lircd.conf.atiusb	2009-08-29 13:23:01.000000000 -0400
++++ lirc-0.8.6pre2/remotes/atiusb/lircd.conf.atiusb	2009-08-29 13:23:31.000000000 -0400
 @@ -37,54 +37,54 @@ begin remote
  
  
@@ -618,9 +618,9 @@ diff -Naurp lirc-0.8.5pre1.orig/remotes/atiusb/lircd.conf.atiusb lirc-0.8.5pre1/
        end codes
  
  end remote
-diff -Naurp lirc-0.8.5pre1.orig/remotes/avermedia/lircd.conf.avermedia lirc-0.8.5pre1/remotes/avermedia/lircd.conf.avermedia
---- lirc-0.8.5pre1.orig/remotes/avermedia/lircd.conf.avermedia	2001-01-11 02:54:25.000000000 -0500
-+++ lirc-0.8.5pre1/remotes/avermedia/lircd.conf.avermedia	2009-02-26 09:18:45.394723700 -0500
+diff -Naurp lirc-0.8.6pre2.orig/remotes/avermedia/lircd.conf.avermedia lirc-0.8.6pre2/remotes/avermedia/lircd.conf.avermedia
+--- lirc-0.8.6pre2.orig/remotes/avermedia/lircd.conf.avermedia	2001-01-11 02:54:25.000000000 -0500
++++ lirc-0.8.6pre2/remotes/avermedia/lircd.conf.avermedia	2009-08-29 13:23:31.000000000 -0400
 @@ -34,37 +34,37 @@ begin remote
  
  
@@ -683,9 +683,9 @@ diff -Naurp lirc-0.8.5pre1.orig/remotes/avermedia/lircd.conf.avermedia lirc-0.8.
        end codes
  
  end remote
-diff -Naurp lirc-0.8.5pre1.orig/remotes/avermedia/lircd.conf.avermedia98 lirc-0.8.5pre1/remotes/avermedia/lircd.conf.avermedia98
---- lirc-0.8.5pre1.orig/remotes/avermedia/lircd.conf.avermedia98	2001-01-10 17:08:00.000000000 -0500
-+++ lirc-0.8.5pre1/remotes/avermedia/lircd.conf.avermedia98	2009-02-26 09:18:45.394723700 -0500
+diff -Naurp lirc-0.8.6pre2.orig/remotes/avermedia/lircd.conf.avermedia98 lirc-0.8.6pre2/remotes/avermedia/lircd.conf.avermedia98
+--- lirc-0.8.6pre2.orig/remotes/avermedia/lircd.conf.avermedia98	2001-01-10 17:08:00.000000000 -0500
++++ lirc-0.8.6pre2/remotes/avermedia/lircd.conf.avermedia98	2009-08-29 13:23:31.000000000 -0400
 @@ -29,49 +29,49 @@ begin remote
  
        begin codes
@@ -765,9 +765,9 @@ diff -Naurp lirc-0.8.5pre1.orig/remotes/avermedia/lircd.conf.avermedia98 lirc-0.
        end codes
  
  end remote
-diff -Naurp lirc-0.8.5pre1.orig/remotes/avermedia/lircd.conf.vdomate lirc-0.8.5pre1/remotes/avermedia/lircd.conf.vdomate
---- lirc-0.8.5pre1.orig/remotes/avermedia/lircd.conf.vdomate	2002-10-25 16:42:55.000000000 -0400
-+++ lirc-0.8.5pre1/remotes/avermedia/lircd.conf.vdomate	2009-02-26 09:18:45.395703904 -0500
+diff -Naurp lirc-0.8.6pre2.orig/remotes/avermedia/lircd.conf.vdomate lirc-0.8.6pre2/remotes/avermedia/lircd.conf.vdomate
+--- lirc-0.8.6pre2.orig/remotes/avermedia/lircd.conf.vdomate	2002-10-25 16:42:55.000000000 -0400
++++ lirc-0.8.6pre2/remotes/avermedia/lircd.conf.vdomate	2009-08-29 13:23:31.000000000 -0400
 @@ -27,33 +27,33 @@ begin remote
  
  
@@ -820,9 +820,9 @@ diff -Naurp lirc-0.8.5pre1.orig/remotes/avermedia/lircd.conf.vdomate lirc-0.8.5p
        end codes
  
  end remote
-diff -Naurp lirc-0.8.5pre1.orig/remotes/bestbuy/lircd.conf.bestbuy lirc-0.8.5pre1/remotes/bestbuy/lircd.conf.bestbuy
---- lirc-0.8.5pre1.orig/remotes/bestbuy/lircd.conf.bestbuy	2001-04-25 16:07:50.000000000 -0400
-+++ lirc-0.8.5pre1/remotes/bestbuy/lircd.conf.bestbuy	2009-02-26 09:18:45.395703904 -0500
+diff -Naurp lirc-0.8.6pre2.orig/remotes/bestbuy/lircd.conf.bestbuy lirc-0.8.6pre2/remotes/bestbuy/lircd.conf.bestbuy
+--- lirc-0.8.6pre2.orig/remotes/bestbuy/lircd.conf.bestbuy	2001-04-25 16:07:50.000000000 -0400
++++ lirc-0.8.6pre2/remotes/bestbuy/lircd.conf.bestbuy	2009-08-29 13:23:31.000000000 -0400
 @@ -26,36 +26,36 @@ begin remote
  
  
@@ -885,9 +885,9 @@ diff -Naurp lirc-0.8.5pre1.orig/remotes/bestbuy/lircd.conf.bestbuy lirc-0.8.5pre
        end codes
  
  end remote
-diff -Naurp lirc-0.8.5pre1.orig/remotes/bestbuy/lircd.conf.bestbuy2 lirc-0.8.5pre1/remotes/bestbuy/lircd.conf.bestbuy2
---- lirc-0.8.5pre1.orig/remotes/bestbuy/lircd.conf.bestbuy2	2005-10-29 16:10:15.000000000 -0400
-+++ lirc-0.8.5pre1/remotes/bestbuy/lircd.conf.bestbuy2	2009-02-26 09:18:45.397726143 -0500
+diff -Naurp lirc-0.8.6pre2.orig/remotes/bestbuy/lircd.conf.bestbuy2 lirc-0.8.6pre2/remotes/bestbuy/lircd.conf.bestbuy2
+--- lirc-0.8.6pre2.orig/remotes/bestbuy/lircd.conf.bestbuy2	2005-10-29 16:10:15.000000000 -0400
++++ lirc-0.8.6pre2/remotes/bestbuy/lircd.conf.bestbuy2	2009-08-29 13:23:31.000000000 -0400
 @@ -27,29 +27,29 @@ begin remote
        begin codes
            TV/FM                    0x0000000000000043
@@ -937,9 +937,9 @@ diff -Naurp lirc-0.8.5pre1.orig/remotes/bestbuy/lircd.conf.bestbuy2 lirc-0.8.5pr
            RESET                    0x000000000000004D
            FREEZE                   0x000000000000004F
        end codes
-diff -Naurp lirc-0.8.5pre1.orig/remotes/caraca/lircd.conf.caraca lirc-0.8.5pre1/remotes/caraca/lircd.conf.caraca
---- lirc-0.8.5pre1.orig/remotes/caraca/lircd.conf.caraca	2000-08-25 15:21:17.000000000 -0400
-+++ lirc-0.8.5pre1/remotes/caraca/lircd.conf.caraca	2009-02-26 09:18:45.397726143 -0500
+diff -Naurp lirc-0.8.6pre2.orig/remotes/caraca/lircd.conf.caraca lirc-0.8.6pre2/remotes/caraca/lircd.conf.caraca
+--- lirc-0.8.6pre2.orig/remotes/caraca/lircd.conf.caraca	2000-08-25 15:21:17.000000000 -0400
++++ lirc-0.8.6pre2/remotes/caraca/lircd.conf.caraca	2009-08-29 13:23:31.000000000 -0400
 @@ -17,29 +17,29 @@ begin remote
    bits           16
  
@@ -991,9 +991,9 @@ diff -Naurp lirc-0.8.5pre1.orig/remotes/caraca/lircd.conf.caraca lirc-0.8.5pre1/
            TV/FM                    0x3fe3
        end codes
  
-diff -Naurp lirc-0.8.5pre1.orig/remotes/chronos/lircd.conf.chronos lirc-0.8.5pre1/remotes/chronos/lircd.conf.chronos
---- lirc-0.8.5pre1.orig/remotes/chronos/lircd.conf.chronos	2009-02-26 09:16:49.254660025 -0500
-+++ lirc-0.8.5pre1/remotes/chronos/lircd.conf.chronos	2009-02-26 09:18:45.398725143 -0500
+diff -Naurp lirc-0.8.6pre2.orig/remotes/chronos/lircd.conf.chronos lirc-0.8.6pre2/remotes/chronos/lircd.conf.chronos
+--- lirc-0.8.6pre2.orig/remotes/chronos/lircd.conf.chronos	2009-08-29 13:23:01.000000000 -0400
++++ lirc-0.8.6pre2/remotes/chronos/lircd.conf.chronos	2009-08-29 13:23:31.000000000 -0400
 @@ -20,37 +20,37 @@ begin remote
    toggle_bit      0
  
@@ -1057,9 +1057,9 @@ diff -Naurp lirc-0.8.5pre1.orig/remotes/chronos/lircd.conf.chronos lirc-0.8.5pre
 +          KEY_RIGHT         0x0000000000000007
        end codes
  end remote
-diff -Naurp lirc-0.8.5pre1.orig/remotes/cph03x/lircd.conf.cph03x lirc-0.8.5pre1/remotes/cph03x/lircd.conf.cph03x
---- lirc-0.8.5pre1.orig/remotes/cph03x/lircd.conf.cph03x	2001-06-14 11:49:16.000000000 -0400
-+++ lirc-0.8.5pre1/remotes/cph03x/lircd.conf.cph03x	2009-02-26 09:18:45.398725143 -0500
+diff -Naurp lirc-0.8.6pre2.orig/remotes/cph03x/lircd.conf.cph03x lirc-0.8.6pre2/remotes/cph03x/lircd.conf.cph03x
+--- lirc-0.8.6pre2.orig/remotes/cph03x/lircd.conf.cph03x	2001-06-14 11:49:16.000000000 -0400
++++ lirc-0.8.6pre2/remotes/cph03x/lircd.conf.cph03x	2009-08-29 13:23:31.000000000 -0400
 @@ -32,39 +32,39 @@ begin remote
    repeat_bit      0
  
@@ -1123,9 +1123,9 @@ diff -Naurp lirc-0.8.5pre1.orig/remotes/cph03x/lircd.conf.cph03x lirc-0.8.5pre1/
        end codes
  
  end remote
-diff -Naurp lirc-0.8.5pre1.orig/remotes/creative/lircd.conf.alsa_usb lirc-0.8.5pre1/remotes/creative/lircd.conf.alsa_usb
---- lirc-0.8.5pre1.orig/remotes/creative/lircd.conf.alsa_usb	2008-01-26 04:01:16.000000000 -0500
-+++ lirc-0.8.5pre1/remotes/creative/lircd.conf.alsa_usb	2009-02-26 09:18:45.399664458 -0500
+diff -Naurp lirc-0.8.6pre2.orig/remotes/creative/lircd.conf.alsa_usb lirc-0.8.6pre2/remotes/creative/lircd.conf.alsa_usb
+--- lirc-0.8.6pre2.orig/remotes/creative/lircd.conf.alsa_usb	2008-01-26 04:01:16.000000000 -0500
++++ lirc-0.8.6pre2/remotes/creative/lircd.conf.alsa_usb	2009-08-29 13:23:31.000000000 -0400
 @@ -34,38 +34,38 @@ begin remote
  
  
@@ -1192,9 +1192,9 @@ diff -Naurp lirc-0.8.5pre1.orig/remotes/creative/lircd.conf.alsa_usb lirc-0.8.5p
            Step                     0x0000000000007E81
        end codes
  
-diff -Naurp lirc-0.8.5pre1.orig/remotes/creative/lircd.conf.breakoutbox lirc-0.8.5pre1/remotes/creative/lircd.conf.breakoutbox
---- lirc-0.8.5pre1.orig/remotes/creative/lircd.conf.breakoutbox	2007-02-19 23:08:04.000000000 -0500
-+++ lirc-0.8.5pre1/remotes/creative/lircd.conf.breakoutbox	2009-02-26 09:18:45.400730201 -0500
+diff -Naurp lirc-0.8.6pre2.orig/remotes/creative/lircd.conf.breakoutbox lirc-0.8.6pre2/remotes/creative/lircd.conf.breakoutbox
+--- lirc-0.8.6pre2.orig/remotes/creative/lircd.conf.breakoutbox	2007-02-19 23:08:04.000000000 -0500
++++ lirc-0.8.6pre2/remotes/creative/lircd.conf.breakoutbox	2009-08-29 13:23:31.000000000 -0400
 @@ -19,37 +19,37 @@ begin remote
        begin codes
            DVD/CD                   0x0000000000000001
@@ -1259,9 +1259,9 @@ diff -Naurp lirc-0.8.5pre1.orig/remotes/creative/lircd.conf.breakoutbox lirc-0.8
        end codes
  
  end remote
-diff -Naurp lirc-0.8.5pre1.orig/remotes/creative/lircd.conf.creative lirc-0.8.5pre1/remotes/creative/lircd.conf.creative
---- lirc-0.8.5pre1.orig/remotes/creative/lircd.conf.creative	2007-03-10 15:15:49.000000000 -0500
-+++ lirc-0.8.5pre1/remotes/creative/lircd.conf.creative	2009-02-26 09:18:45.400730201 -0500
+diff -Naurp lirc-0.8.6pre2.orig/remotes/creative/lircd.conf.creative lirc-0.8.6pre2/remotes/creative/lircd.conf.creative
+--- lirc-0.8.6pre2.orig/remotes/creative/lircd.conf.creative	2007-03-10 15:15:49.000000000 -0500
++++ lirc-0.8.6pre2/remotes/creative/lircd.conf.creative	2009-08-29 13:23:31.000000000 -0400
 @@ -23,30 +23,30 @@ begin remote
    toggle_bit      0
  
@@ -1312,65 +1312,9 @@ diff -Naurp lirc-0.8.5pre1.orig/remotes/creative/lircd.conf.creative lirc-0.8.5p
        end codes
  
  end remote
-diff -Naurp lirc-0.8.5pre1.orig/remotes/creative/lircd.conf.infracd lirc-0.8.5pre1/remotes/creative/lircd.conf.infracd
---- lirc-0.8.5pre1.orig/remotes/creative/lircd.conf.infracd	2003-05-07 13:30:41.000000000 -0400
-+++ lirc-0.8.5pre1/remotes/creative/lircd.conf.infracd	2009-02-26 09:18:45.401665716 -0500
-@@ -30,30 +30,30 @@ begin remote
- 
- 
-       begin codes
--          PAUSE                    0x00000000000001FE
--          PLAY                     0x00000000000002FD
--          STOP                     0x00000000000003FC
--          REW                      0x00000000000005FA
--          PREV                     0x00000000000006F9
--          FF                       0x00000000000007F8
--          MENU                     0x00000000000004FB
-+          KEY_PAUSE                    0x00000000000001FE
-+          KEY_PLAY                     0x00000000000002FD
-+          KEY_STOP                     0x00000000000003FC
-+          KEY_REWIND                      0x00000000000005FA
-+          KEY_PREVIOUS                     0x00000000000006F9
-+          KEY_FASTFORWARD                       0x00000000000007F8
-+          KEY_MENU                     0x00000000000004FB
-           MOUSE                    0x00000000000008F7
--          1                        0x00000000000009F6
--          2                        0x0000000000000AF5
--          3                        0x0000000000000BF4
--          4                        0x0000000000000DF2
--          5                        0x0000000000000EF1
--          6                        0x0000000000000FF0
--          7                        0x00000000000011EE
--          8                        0x00000000000012ED
--          9                        0x00000000000013EC
--          0                        0x00000000000016E9
--          MUTE                     0x0000000000000CF3
--          VOL_UP                   0x00000000000010EF
--          VOL_DOWN                 0x00000000000014EB
-+          KEY_1                        0x00000000000009F6
-+          KEY_2                        0x0000000000000AF5
-+          KEY_3                        0x0000000000000BF4
-+          KEY_4                        0x0000000000000DF2
-+          KEY_5                        0x0000000000000EF1
-+          KEY_6                        0x0000000000000FF0
-+          KEY_7                        0x00000000000011EE
-+          KEY_8                        0x00000000000012ED
-+          KEY_9                        0x00000000000013EC
-+          KEY_0                        0x00000000000016E9
-+          KEY_MUTE                     0x0000000000000CF3
-+          KEY_VOLUMEUP                   0x00000000000010EF
-+          KEY_VOLUMEDOWN                 0x00000000000014EB
-           SHIFT                    0x00000000000015EA
--          ENTER                    0x00000000000017E8
--          ZOOM                     0x00000000000018E7
-+          KEY_ENTER                    0x00000000000017E8
-+          KEY_ZOOM                     0x00000000000018E7
-       end codes
- 
- end remote
-diff -Naurp lirc-0.8.5pre1.orig/remotes/creative/lircd.conf.livedrive lirc-0.8.5pre1/remotes/creative/lircd.conf.livedrive
---- lirc-0.8.5pre1.orig/remotes/creative/lircd.conf.livedrive	2009-02-26 09:16:49.262661298 -0500
-+++ lirc-0.8.5pre1/remotes/creative/lircd.conf.livedrive	2009-02-26 09:18:45.401665716 -0500
+diff -Naurp lirc-0.8.6pre2.orig/remotes/creative/lircd.conf.livedrive lirc-0.8.6pre2/remotes/creative/lircd.conf.livedrive
+--- lirc-0.8.6pre2.orig/remotes/creative/lircd.conf.livedrive	2009-08-29 13:23:01.000000000 -0400
++++ lirc-0.8.6pre2/remotes/creative/lircd.conf.livedrive	2009-08-29 13:23:31.000000000 -0400
 @@ -29,40 +29,40 @@ begin remote
  
  
@@ -1440,9 +1384,9 @@ diff -Naurp lirc-0.8.5pre1.orig/remotes/creative/lircd.conf.livedrive lirc-0.8.5
  	  
        end codes
  
-diff -Naurp lirc-0.8.5pre1.orig/remotes/dvico/lircd.conf.fusionHDTV lirc-0.8.5pre1/remotes/dvico/lircd.conf.fusionHDTV
---- lirc-0.8.5pre1.orig/remotes/dvico/lircd.conf.fusionHDTV	2006-05-06 00:38:39.000000000 -0400
-+++ lirc-0.8.5pre1/remotes/dvico/lircd.conf.fusionHDTV	2009-02-26 09:18:45.402663084 -0500
+diff -Naurp lirc-0.8.6pre2.orig/remotes/dvico/lircd.conf.fusionHDTV lirc-0.8.6pre2/remotes/dvico/lircd.conf.fusionHDTV
+--- lirc-0.8.6pre2.orig/remotes/dvico/lircd.conf.fusionHDTV	2006-05-06 00:38:39.000000000 -0400
++++ lirc-0.8.6pre2/remotes/dvico/lircd.conf.fusionHDTV	2009-08-29 13:23:31.000000000 -0400
 @@ -22,42 +22,42 @@ begin remote
    toggle_bit     0
  
@@ -1517,9 +1461,9 @@ diff -Naurp lirc-0.8.5pre1.orig/remotes/dvico/lircd.conf.fusionHDTV lirc-0.8.5pr
        end codes
  
  end remote
-diff -Naurp lirc-0.8.5pre1.orig/remotes/ea65/lircd.conf.ea65 lirc-0.8.5pre1/remotes/ea65/lircd.conf.ea65
---- lirc-0.8.5pre1.orig/remotes/ea65/lircd.conf.ea65	2004-11-20 08:43:48.000000000 -0500
-+++ lirc-0.8.5pre1/remotes/ea65/lircd.conf.ea65	2009-02-26 09:18:45.403726860 -0500
+diff -Naurp lirc-0.8.6pre2.orig/remotes/ea65/lircd.conf.ea65 lirc-0.8.6pre2/remotes/ea65/lircd.conf.ea65
+--- lirc-0.8.6pre2.orig/remotes/ea65/lircd.conf.ea65	2004-11-20 08:43:48.000000000 -0500
++++ lirc-0.8.6pre2/remotes/ea65/lircd.conf.ea65	2009-08-29 13:23:31.000000000 -0400
 @@ -18,53 +18,53 @@ begin remote
          htpc        0x0011811b
          dvd/vcd     0x00128100
@@ -1608,9 +1552,9 @@ diff -Naurp lirc-0.8.5pre1.orig/remotes/ea65/lircd.conf.ea65 lirc-0.8.5pre1/remo
          stop-eject  0x00238107
          mode-       0x00ff1080
          mode+       0x00ff1180
-diff -Naurp lirc-0.8.5pre1.orig/remotes/ericsson/lircd.conf.bte lirc-0.8.5pre1/remotes/ericsson/lircd.conf.bte
---- lirc-0.8.5pre1.orig/remotes/ericsson/lircd.conf.bte	2005-03-25 15:40:25.000000000 -0500
-+++ lirc-0.8.5pre1/remotes/ericsson/lircd.conf.bte	2009-02-26 09:19:05.214660138 -0500
+diff -Naurp lirc-0.8.6pre2.orig/remotes/ericsson/lircd.conf.bte lirc-0.8.6pre2/remotes/ericsson/lircd.conf.bte
+--- lirc-0.8.6pre2.orig/remotes/ericsson/lircd.conf.bte	2005-03-25 15:40:25.000000000 -0500
++++ lirc-0.8.6pre2/remotes/ericsson/lircd.conf.bte	2009-08-29 13:23:31.000000000 -0400
 @@ -11,29 +11,29 @@
  
  begin remote
@@ -1672,9 +1616,9 @@ diff -Naurp lirc-0.8.5pre1.orig/remotes/ericsson/lircd.conf.bte lirc-0.8.5pre1/r
          WAP             0x3a4f  # ':O'
  
        end codes
-diff -Naurp lirc-0.8.5pre1.orig/remotes/hauppauge/lircd.conf.hauppauge lirc-0.8.5pre1/remotes/hauppauge/lircd.conf.hauppauge
---- lirc-0.8.5pre1.orig/remotes/hauppauge/lircd.conf.hauppauge	2008-06-24 13:01:10.000000000 -0400
-+++ lirc-0.8.5pre1/remotes/hauppauge/lircd.conf.hauppauge	2009-02-26 09:18:45.404660569 -0500
+diff -Naurp lirc-0.8.6pre2.orig/remotes/hauppauge/lircd.conf.hauppauge lirc-0.8.6pre2/remotes/hauppauge/lircd.conf.hauppauge
+--- lirc-0.8.6pre2.orig/remotes/hauppauge/lircd.conf.hauppauge	2008-06-24 13:01:10.000000000 -0400
++++ lirc-0.8.6pre2/remotes/hauppauge/lircd.conf.hauppauge	2009-08-29 13:23:31.000000000 -0400
 @@ -27,25 +27,25 @@ begin remote
    repeat_bit      2
  
@@ -1718,9 +1662,9 @@ diff -Naurp lirc-0.8.5pre1.orig/remotes/hauppauge/lircd.conf.hauppauge lirc-0.8.
            RESERVED                 0x000000000000101E
            MINIMIZE                 0x0000000000001026
        end codes
-diff -Naurp lirc-0.8.5pre1.orig/remotes/hercules/lircd.conf.smarttv_stereo lirc-0.8.5pre1/remotes/hercules/lircd.conf.smarttv_stereo
---- lirc-0.8.5pre1.orig/remotes/hercules/lircd.conf.smarttv_stereo	2009-02-26 09:16:49.247660098 -0500
-+++ lirc-0.8.5pre1/remotes/hercules/lircd.conf.smarttv_stereo	2009-02-26 09:18:45.405723158 -0500
+diff -Naurp lirc-0.8.6pre2.orig/remotes/hercules/lircd.conf.smarttv_stereo lirc-0.8.6pre2/remotes/hercules/lircd.conf.smarttv_stereo
+--- lirc-0.8.6pre2.orig/remotes/hercules/lircd.conf.smarttv_stereo	2009-08-29 13:23:01.000000000 -0400
++++ lirc-0.8.6pre2/remotes/hercules/lircd.conf.smarttv_stereo	2009-08-29 13:23:31.000000000 -0400
 @@ -26,36 +26,36 @@ begin remote
  
  
@@ -1781,9 +1725,9 @@ diff -Naurp lirc-0.8.5pre1.orig/remotes/hercules/lircd.conf.smarttv_stereo lirc-
        end codes
  
  end remote
-diff -Naurp lirc-0.8.5pre1.orig/remotes/imon/lircd.conf.imon lirc-0.8.5pre1/remotes/imon/lircd.conf.imon
---- lirc-0.8.5pre1.orig/remotes/imon/lircd.conf.imon	2005-04-16 13:05:49.000000000 -0400
-+++ lirc-0.8.5pre1/remotes/imon/lircd.conf.imon	2009-02-26 09:18:45.405723158 -0500
+diff -Naurp lirc-0.8.6pre2.orig/remotes/imon/lircd.conf.imon lirc-0.8.6pre2/remotes/imon/lircd.conf.imon
+--- lirc-0.8.6pre2.orig/remotes/imon/lircd.conf.imon	2005-04-16 13:05:49.000000000 -0400
++++ lirc-0.8.6pre2/remotes/imon/lircd.conf.imon	2009-08-29 13:23:31.000000000 -0400
 @@ -29,48 +29,48 @@ begin remote
    duty_cycle   33
  
@@ -1869,9 +1813,9 @@ diff -Naurp lirc-0.8.5pre1.orig/remotes/imon/lircd.conf.imon lirc-0.8.5pre1/remo
            DVD.Caption              0x00000000000052AD
            DVD.Language             0x000000000000D22D
            Full.Screen              0x00000000000032CD
-diff -Naurp lirc-0.8.5pre1.orig/remotes/imon/lircd.conf.imon-knob lirc-0.8.5pre1/remotes/imon/lircd.conf.imon-knob
---- lirc-0.8.5pre1.orig/remotes/imon/lircd.conf.imon-knob	2008-06-12 15:32:33.000000000 -0400
-+++ lirc-0.8.5pre1/remotes/imon/lircd.conf.imon-knob	2009-02-26 09:18:45.406732241 -0500
+diff -Naurp lirc-0.8.6pre2.orig/remotes/imon/lircd.conf.imon-knob lirc-0.8.6pre2/remotes/imon/lircd.conf.imon-knob
+--- lirc-0.8.6pre2.orig/remotes/imon/lircd.conf.imon-knob	2008-06-12 15:32:33.000000000 -0400
++++ lirc-0.8.6pre2/remotes/imon/lircd.conf.imon-knob	2009-08-29 13:23:31.000000000 -0400
 @@ -23,74 +23,67 @@ begin remote
  
  
@@ -1996,9 +1940,9 @@ diff -Naurp lirc-0.8.5pre1.orig/remotes/imon/lircd.conf.imon-knob lirc-0.8.5pre1
        end codes
  
  end remote
-diff -Naurp lirc-0.8.5pre1.orig/remotes/imon/lircd.conf.imon-pad lirc-0.8.5pre1/remotes/imon/lircd.conf.imon-pad
---- lirc-0.8.5pre1.orig/remotes/imon/lircd.conf.imon-pad	2009-02-07 15:25:47.000000000 -0500
-+++ lirc-0.8.5pre1/remotes/imon/lircd.conf.imon-pad	2009-02-26 09:27:57.169660371 -0500
+diff -Naurp lirc-0.8.6pre2.orig/remotes/imon/lircd.conf.imon-pad lirc-0.8.6pre2/remotes/imon/lircd.conf.imon-pad
+--- lirc-0.8.6pre2.orig/remotes/imon/lircd.conf.imon-pad	2009-06-03 15:13:42.000000000 -0400
++++ lirc-0.8.6pre2/remotes/imon/lircd.conf.imon-pad	2009-08-29 13:23:31.000000000 -0400
 @@ -24,96 +24,96 @@ begin remote
  
  
@@ -2160,9 +2104,9 @@ diff -Naurp lirc-0.8.5pre1.orig/remotes/imon/lircd.conf.imon-pad lirc-0.8.5pre1/
  
        end codes
  
-diff -Naurp lirc-0.8.5pre1.orig/remotes/imon/lircd.conf.imon-rsc lirc-0.8.5pre1/remotes/imon/lircd.conf.imon-rsc
---- lirc-0.8.5pre1.orig/remotes/imon/lircd.conf.imon-rsc	2007-02-18 03:36:27.000000000 -0500
-+++ lirc-0.8.5pre1/remotes/imon/lircd.conf.imon-rsc	2009-02-26 09:18:45.407723093 -0500
+diff -Naurp lirc-0.8.6pre2.orig/remotes/imon/lircd.conf.imon-rsc lirc-0.8.6pre2/remotes/imon/lircd.conf.imon-rsc
+--- lirc-0.8.6pre2.orig/remotes/imon/lircd.conf.imon-rsc	2007-02-18 03:36:27.000000000 -0500
++++ lirc-0.8.6pre2/remotes/imon/lircd.conf.imon-rsc	2009-08-29 13:23:31.000000000 -0400
 @@ -27,48 +27,48 @@ begin remote
    gap          100000
  
@@ -2244,9 +2188,9 @@ diff -Naurp lirc-0.8.5pre1.orig/remotes/imon/lircd.conf.imon-rsc lirc-0.8.5pre1/
            Full.Screen        0x000000000000916e
        end codes
  
-diff -Naurp lirc-0.8.5pre1.orig/remotes/iodata/lircd.conf.gvbctv5pci lirc-0.8.5pre1/remotes/iodata/lircd.conf.gvbctv5pci
---- lirc-0.8.5pre1.orig/remotes/iodata/lircd.conf.gvbctv5pci	2003-06-07 18:00:12.000000000 -0400
-+++ lirc-0.8.5pre1/remotes/iodata/lircd.conf.gvbctv5pci	2009-02-26 09:18:45.408659730 -0500
+diff -Naurp lirc-0.8.6pre2.orig/remotes/iodata/lircd.conf.gvbctv5pci lirc-0.8.6pre2/remotes/iodata/lircd.conf.gvbctv5pci
+--- lirc-0.8.6pre2.orig/remotes/iodata/lircd.conf.gvbctv5pci	2003-06-07 18:00:12.000000000 -0400
++++ lirc-0.8.6pre2/remotes/iodata/lircd.conf.gvbctv5pci	2009-08-29 13:23:31.000000000 -0400
 @@ -26,41 +26,41 @@ begin remote
  
  
@@ -2316,9 +2260,9 @@ diff -Naurp lirc-0.8.5pre1.orig/remotes/iodata/lircd.conf.gvbctv5pci lirc-0.8.5p
            SYNC                     0x0000000000000003
        end codes
  
-diff -Naurp lirc-0.8.5pre1.orig/remotes/kanam_accent/lircd.conf.IR-100 lirc-0.8.5pre1/remotes/kanam_accent/lircd.conf.IR-100
---- lirc-0.8.5pre1.orig/remotes/kanam_accent/lircd.conf.IR-100	2007-02-12 23:18:53.000000000 -0500
-+++ lirc-0.8.5pre1/remotes/kanam_accent/lircd.conf.IR-100	2009-02-26 09:19:05.214660138 -0500
+diff -Naurp lirc-0.8.6pre2.orig/remotes/kanam_accent/lircd.conf.IR-100 lirc-0.8.6pre2/remotes/kanam_accent/lircd.conf.IR-100
+--- lirc-0.8.6pre2.orig/remotes/kanam_accent/lircd.conf.IR-100	2007-02-12 23:18:53.000000000 -0500
++++ lirc-0.8.6pre2/remotes/kanam_accent/lircd.conf.IR-100	2009-08-29 13:23:31.000000000 -0400
 @@ -29,47 +29,47 @@ begin remote
  
  
@@ -2408,9 +2352,9 @@ diff -Naurp lirc-0.8.5pre1.orig/remotes/kanam_accent/lircd.conf.IR-100 lirc-0.8.
        end codes
  
  end remote
-diff -Naurp lirc-0.8.5pre1.orig/remotes/knc_one/lircd.conf.knc_one lirc-0.8.5pre1/remotes/knc_one/lircd.conf.knc_one
---- lirc-0.8.5pre1.orig/remotes/knc_one/lircd.conf.knc_one	2001-04-24 17:20:41.000000000 -0400
-+++ lirc-0.8.5pre1/remotes/knc_one/lircd.conf.knc_one	2009-02-26 09:18:45.408659730 -0500
+diff -Naurp lirc-0.8.6pre2.orig/remotes/knc_one/lircd.conf.knc_one lirc-0.8.6pre2/remotes/knc_one/lircd.conf.knc_one
+--- lirc-0.8.6pre2.orig/remotes/knc_one/lircd.conf.knc_one	2001-04-24 17:20:41.000000000 -0400
++++ lirc-0.8.6pre2/remotes/knc_one/lircd.conf.knc_one	2009-08-29 13:23:31.000000000 -0400
 @@ -26,37 +26,37 @@ begin remote
  
        begin codes
@@ -2475,9 +2419,9 @@ diff -Naurp lirc-0.8.5pre1.orig/remotes/knc_one/lircd.conf.knc_one lirc-0.8.5pre
        end codes
  
  end remote
-diff -Naurp lirc-0.8.5pre1.orig/remotes/kworld/lircd.conf.kworld lirc-0.8.5pre1/remotes/kworld/lircd.conf.kworld
---- lirc-0.8.5pre1.orig/remotes/kworld/lircd.conf.kworld	2005-04-01 15:28:05.000000000 -0500
-+++ lirc-0.8.5pre1/remotes/kworld/lircd.conf.kworld	2009-02-26 09:18:45.408659730 -0500
+diff -Naurp lirc-0.8.6pre2.orig/remotes/kworld/lircd.conf.kworld lirc-0.8.6pre2/remotes/kworld/lircd.conf.kworld
+--- lirc-0.8.6pre2.orig/remotes/kworld/lircd.conf.kworld	2005-04-01 15:28:05.000000000 -0500
++++ lirc-0.8.6pre2/remotes/kworld/lircd.conf.kworld	2009-08-29 13:23:31.000000000 -0400
 @@ -29,36 +29,36 @@ begin remote
  
  
@@ -2536,9 +2480,9 @@ diff -Naurp lirc-0.8.5pre1.orig/remotes/kworld/lircd.conf.kworld lirc-0.8.5pre1/
            snapshot                 0x00000000000058A7
            mts                      0x000000000000B04F
            function-                0x00000000000020DF
-diff -Naurp lirc-0.8.5pre1.orig/remotes/leadtek/lircd.conf.PVR2000 lirc-0.8.5pre1/remotes/leadtek/lircd.conf.PVR2000
---- lirc-0.8.5pre1.orig/remotes/leadtek/lircd.conf.PVR2000	2006-12-19 01:02:58.000000000 -0500
-+++ lirc-0.8.5pre1/remotes/leadtek/lircd.conf.PVR2000	2009-02-26 09:18:45.409722124 -0500
+diff -Naurp lirc-0.8.6pre2.orig/remotes/leadtek/lircd.conf.PVR2000 lirc-0.8.6pre2/remotes/leadtek/lircd.conf.PVR2000
+--- lirc-0.8.6pre2.orig/remotes/leadtek/lircd.conf.PVR2000	2006-12-19 01:02:58.000000000 -0500
++++ lirc-0.8.6pre2/remotes/leadtek/lircd.conf.PVR2000	2009-08-29 13:23:31.000000000 -0400
 @@ -18,54 +18,54 @@ begin remote
    gap       120000
  
@@ -2631,9 +2575,9 @@ diff -Naurp lirc-0.8.5pre1.orig/remotes/leadtek/lircd.conf.PVR2000 lirc-0.8.5pre
            TIMESHIFT                0x0000000000000035
  
        end codes
-diff -Naurp lirc-0.8.5pre1.orig/remotes/leadtek/lircd.conf.RM-0007 lirc-0.8.5pre1/remotes/leadtek/lircd.conf.RM-0007
---- lirc-0.8.5pre1.orig/remotes/leadtek/lircd.conf.RM-0007	2002-11-09 17:34:23.000000000 -0500
-+++ lirc-0.8.5pre1/remotes/leadtek/lircd.conf.RM-0007	2009-02-26 09:18:45.409722124 -0500
+diff -Naurp lirc-0.8.6pre2.orig/remotes/leadtek/lircd.conf.RM-0007 lirc-0.8.6pre2/remotes/leadtek/lircd.conf.RM-0007
+--- lirc-0.8.6pre2.orig/remotes/leadtek/lircd.conf.RM-0007	2002-11-09 17:34:23.000000000 -0500
++++ lirc-0.8.6pre2/remotes/leadtek/lircd.conf.RM-0007	2009-08-29 13:23:31.000000000 -0400
 @@ -44,43 +44,43 @@ begin remote
  
        begin codes
@@ -2703,9 +2647,9 @@ diff -Naurp lirc-0.8.5pre1.orig/remotes/leadtek/lircd.conf.RM-0007 lirc-0.8.5pre
        end codes
  
  end remote
-diff -Naurp lirc-0.8.5pre1.orig/remotes/leadtek/lircd.conf.RM-0010 lirc-0.8.5pre1/remotes/leadtek/lircd.conf.RM-0010
---- lirc-0.8.5pre1.orig/remotes/leadtek/lircd.conf.RM-0010	2006-03-21 02:11:14.000000000 -0500
-+++ lirc-0.8.5pre1/remotes/leadtek/lircd.conf.RM-0010	2009-02-26 09:18:45.409722124 -0500
+diff -Naurp lirc-0.8.6pre2.orig/remotes/leadtek/lircd.conf.RM-0010 lirc-0.8.6pre2/remotes/leadtek/lircd.conf.RM-0010
+--- lirc-0.8.6pre2.orig/remotes/leadtek/lircd.conf.RM-0010	2006-03-21 02:11:14.000000000 -0500
++++ lirc-0.8.6pre2/remotes/leadtek/lircd.conf.RM-0010	2009-08-29 13:23:31.000000000 -0400
 @@ -43,69 +43,69 @@ begin remote
    duty_cycle   33
  
@@ -2815,9 +2759,9 @@ diff -Naurp lirc-0.8.5pre1.orig/remotes/leadtek/lircd.conf.RM-0010 lirc-0.8.5pre
        end codes
  
  end remote
-diff -Naurp lirc-0.8.5pre1.orig/remotes/life-view/lircd.conf.flyvideo lirc-0.8.5pre1/remotes/life-view/lircd.conf.flyvideo
---- lirc-0.8.5pre1.orig/remotes/life-view/lircd.conf.flyvideo	2002-11-09 17:31:38.000000000 -0500
-+++ lirc-0.8.5pre1/remotes/life-view/lircd.conf.flyvideo	2009-02-26 09:18:45.410725873 -0500
+diff -Naurp lirc-0.8.6pre2.orig/remotes/life-view/lircd.conf.flyvideo lirc-0.8.6pre2/remotes/life-view/lircd.conf.flyvideo
+--- lirc-0.8.6pre2.orig/remotes/life-view/lircd.conf.flyvideo	2002-11-09 17:31:38.000000000 -0500
++++ lirc-0.8.6pre2/remotes/life-view/lircd.conf.flyvideo	2009-08-29 13:23:31.000000000 -0400
 @@ -35,50 +35,50 @@ begin remote
    duty_cycle   33
  
@@ -2898,9 +2842,9 @@ diff -Naurp lirc-0.8.5pre1.orig/remotes/life-view/lircd.conf.flyvideo lirc-0.8.5
   
        end codes
  
-diff -Naurp lirc-0.8.5pre1.orig/remotes/logitech/lircd.conf.logitech lirc-0.8.5pre1/remotes/logitech/lircd.conf.logitech
---- lirc-0.8.5pre1.orig/remotes/logitech/lircd.conf.logitech	2000-01-18 14:10:08.000000000 -0500
-+++ lirc-0.8.5pre1/remotes/logitech/lircd.conf.logitech	2009-02-26 09:18:45.410725873 -0500
+diff -Naurp lirc-0.8.6pre2.orig/remotes/logitech/lircd.conf.logitech lirc-0.8.6pre2/remotes/logitech/lircd.conf.logitech
+--- lirc-0.8.6pre2.orig/remotes/logitech/lircd.conf.logitech	2000-01-18 14:10:08.000000000 -0500
++++ lirc-0.8.6pre2/remotes/logitech/lircd.conf.logitech	2009-08-29 13:23:31.000000000 -0400
 @@ -23,41 +23,41 @@ begin remote
    repeat_bit      0
  
@@ -2970,9 +2914,9 @@ diff -Naurp lirc-0.8.5pre1.orig/remotes/logitech/lircd.conf.logitech lirc-0.8.5p
            MOUSE_N		   0x0000000000000040
            MOUSE_NNE		   0x0000000000000041
            MOUSE_NE		   0x0000000000000042
-diff -Naurp lirc-0.8.5pre1.orig/remotes/mceusb/lircd.conf.mceusb lirc-0.8.5pre1/remotes/mceusb/lircd.conf.mceusb
---- lirc-0.8.5pre1.orig/remotes/mceusb/lircd.conf.mceusb	2007-11-01 09:08:33.000000000 -0400
-+++ lirc-0.8.5pre1/remotes/mceusb/lircd.conf.mceusb	2009-02-26 09:19:05.215660078 -0500
+diff -Naurp lirc-0.8.6pre2.orig/remotes/mceusb/lircd.conf.mceusb lirc-0.8.6pre2/remotes/mceusb/lircd.conf.mceusb
+--- lirc-0.8.6pre2.orig/remotes/mceusb/lircd.conf.mceusb	2009-07-16 16:44:45.000000000 -0400
++++ lirc-0.8.6pre2/remotes/mceusb/lircd.conf.mceusb	2009-08-29 13:23:31.000000000 -0400
 @@ -1,7 +1,8 @@
  #
 -# brand:                        HP 
@@ -2983,9 +2927,9 @@ diff -Naurp lirc-0.8.5pre1.orig/remotes/mceusb/lircd.conf.mceusb lirc-0.8.5pre1/
 +# devices being controlled by this remote: HP Slimline S3100y and a
 +# myriad of devices with Media Center Edition receivers
  #
- # Derived from MCEUSB2 lircd.conf file (lircd.conf.mceusb) found at:
- # https://help.ubuntu.com/community/Install_Lirc_Feisty
-@@ -58,10 +59,10 @@ begin remote
+ # RC-6 config file
+ #
+@@ -54,10 +55,10 @@ begin remote
        begin codes
  
  #unused by HP remote
@@ -3000,7 +2944,7 @@ diff -Naurp lirc-0.8.5pre1.orig/remotes/mceusb/lircd.conf.mceusb lirc-0.8.5pre1/
  	Teletext      0x00007ba5
  
  #ba6 - bae unused 
-@@ -75,7 +76,7 @@ begin remote
+@@ -71,7 +72,7 @@ begin remote
          BAD           0x00007bad
          BAE           0x00007bae
  
@@ -3009,7 +2953,7 @@ diff -Naurp lirc-0.8.5pre1.orig/remotes/mceusb/lircd.conf.mceusb lirc-0.8.5pre1/
          Print         0x00007bb1
  
  #bb2 - bb4 unused  
-@@ -83,11 +84,11 @@ begin remote
+@@ -79,11 +80,11 @@ begin remote
          BB3           0x00007bb3
          BB4           0x00007bb4
  
@@ -3024,7 +2968,7 @@ diff -Naurp lirc-0.8.5pre1.orig/remotes/mceusb/lircd.conf.mceusb lirc-0.8.5pre1/
  
  #bba - bbf unused 
          BBA           0x00007bba
-@@ -108,7 +109,7 @@ begin remote
+@@ -104,7 +105,7 @@ begin remote
          BC9           0x00007bc9
          BCA           0x00007bca
  
@@ -3033,7 +2977,7 @@ diff -Naurp lirc-0.8.5pre1.orig/remotes/mceusb/lircd.conf.mceusb lirc-0.8.5pre1/
          SlideShow     0x00007bcc
          Visualization 0x00007bcd
  
-@@ -127,50 +128,50 @@ begin remote
+@@ -123,50 +124,50 @@ begin remote
          Aspect        0x00007bd8
          Guide         0x00007bd9
          LiveTV        0x00007bda
@@ -3064,11 +3008,6 @@ diff -Naurp lirc-0.8.5pre1.orig/remotes/mceusb/lircd.conf.mceusb lirc-0.8.5pre1/
 -        Play          0x00007be9
 -        Rewind        0x00007bea
 -        Forward       0x00007beb
--#NoGap
--        ChanDown      0x00007bec
--        ChanUp        0x00007bed
--        VolDown       0x00007bee
--        VolUp         0x00007bef
 +        KEY_AGAIN        0x00007be4
 +        KEY_NEXT          0x00007be5
 +        KEY_STOP          0x00007be6
@@ -3077,7 +3016,11 @@ diff -Naurp lirc-0.8.5pre1.orig/remotes/mceusb/lircd.conf.mceusb lirc-0.8.5pre1/
 +        KEY_PLAY          0x00007be9
 +        KEY_REWIND        0x00007bea
 +        KEY_FORWARD       0x00007beb
-+#NoGap
+ #NoGap
+-        ChanDown      0x00007bec
+-        ChanUp        0x00007bed
+-        VolDown       0x00007bee
+-        VolUp         0x00007bef
 +        KEY_CHANNELDOWN      0x00007bec
 +        KEY_CHANNELUP        0x00007bed
 +        KEY_VOLUMEDOWN       0x00007bee
@@ -3087,10 +3030,15 @@ diff -Naurp lirc-0.8.5pre1.orig/remotes/mceusb/lircd.conf.mceusb lirc-0.8.5pre1/
 -        Mute          0x00007bf1
 -        Home          0x00007bf2
 -        Power         0x00007bf3
--#NoGap
++        KEY_MUTE          0x00007bf1
++        KEY_HOME          0x00007bf2
++        KEY_POWER         0x00007bf3
+ #NoGap
 -        Enter         0x00007bf4
 -        Clear         0x00007bf5
--#NoGap
++        KEY_ENTER         0x00007bf4
++        KEY_CLEAR         0x00007bf5
+ #NoGap
 -        Nine          0x00007bf6
 -        Eight         0x00007bf7
 -        Seven         0x00007bf8
@@ -3101,13 +3049,6 @@ diff -Naurp lirc-0.8.5pre1.orig/remotes/mceusb/lircd.conf.mceusb lirc-0.8.5pre1/
 -        Two           0x00007bfd
 -        One           0x00007bfe
 -        Zero          0x00007bff
-+        KEY_MUTE          0x00007bf1
-+        KEY_HOME          0x00007bf2
-+        KEY_POWER         0x00007bf3
-+#NoGap
-+        KEY_ENTER         0x00007bf4
-+        KEY_CLEAR         0x00007bf5
-+#NoGap
 +        KEY_9          0x00007bf6
 +        KEY_8         0x00007bf7
 +        KEY_7         0x00007bf8
@@ -3121,9 +3062,9 @@ diff -Naurp lirc-0.8.5pre1.orig/remotes/mceusb/lircd.conf.mceusb lirc-0.8.5pre1/
        end codes
  
  end remote
-diff -Naurp lirc-0.8.5pre1.orig/remotes/packard_bell/lircd.conf.packard_bell lirc-0.8.5pre1/remotes/packard_bell/lircd.conf.packard_bell
---- lirc-0.8.5pre1.orig/remotes/packard_bell/lircd.conf.packard_bell	2001-04-24 15:26:56.000000000 -0400
-+++ lirc-0.8.5pre1/remotes/packard_bell/lircd.conf.packard_bell	2009-02-26 09:18:45.411659928 -0500
+diff -Naurp lirc-0.8.6pre2.orig/remotes/packard_bell/lircd.conf.packard_bell lirc-0.8.6pre2/remotes/packard_bell/lircd.conf.packard_bell
+--- lirc-0.8.6pre2.orig/remotes/packard_bell/lircd.conf.packard_bell	2001-04-24 15:26:56.000000000 -0400
++++ lirc-0.8.6pre2/remotes/packard_bell/lircd.conf.packard_bell	2009-08-29 13:23:31.000000000 -0400
 @@ -53,38 +53,38 @@ begin remote
    repeat          9050 2250
   
@@ -3188,9 +3129,9 @@ diff -Naurp lirc-0.8.5pre1.orig/remotes/packard_bell/lircd.conf.packard_bell lir
            Star                     0x0000000000007F80
            Hash                     0x0000000000006B94
        end codes
-diff -Naurp lirc-0.8.5pre1.orig/remotes/pcmak/lircd.conf.pcmak lirc-0.8.5pre1/remotes/pcmak/lircd.conf.pcmak
---- lirc-0.8.5pre1.orig/remotes/pcmak/lircd.conf.pcmak	2004-07-24 11:36:15.000000000 -0400
-+++ lirc-0.8.5pre1/remotes/pcmak/lircd.conf.pcmak	2009-02-26 09:18:45.411659928 -0500
+diff -Naurp lirc-0.8.6pre2.orig/remotes/pcmak/lircd.conf.pcmak lirc-0.8.6pre2/remotes/pcmak/lircd.conf.pcmak
+--- lirc-0.8.6pre2.orig/remotes/pcmak/lircd.conf.pcmak	2004-07-24 11:36:15.000000000 -0400
++++ lirc-0.8.6pre2/remotes/pcmak/lircd.conf.pcmak	2009-08-29 13:23:31.000000000 -0400
 @@ -23,18 +23,18 @@ begin remote
    repeat_bit      0
  
@@ -3334,9 +3275,9 @@ diff -Naurp lirc-0.8.5pre1.orig/remotes/pcmak/lircd.conf.pcmak lirc-0.8.5pre1/re
        end codes
  
  end remote
-diff -Naurp lirc-0.8.5pre1.orig/remotes/pinnacle_systems/lircd.conf.pctv lirc-0.8.5pre1/remotes/pinnacle_systems/lircd.conf.pctv
---- lirc-0.8.5pre1.orig/remotes/pinnacle_systems/lircd.conf.pctv	2007-10-06 11:40:53.000000000 -0400
-+++ lirc-0.8.5pre1/remotes/pinnacle_systems/lircd.conf.pctv	2009-02-26 09:18:45.412722130 -0500
+diff -Naurp lirc-0.8.6pre2.orig/remotes/pinnacle_systems/lircd.conf.pctv lirc-0.8.6pre2/remotes/pinnacle_systems/lircd.conf.pctv
+--- lirc-0.8.6pre2.orig/remotes/pinnacle_systems/lircd.conf.pctv	2007-10-06 11:40:53.000000000 -0400
++++ lirc-0.8.6pre2/remotes/pinnacle_systems/lircd.conf.pctv	2009-08-29 13:23:31.000000000 -0400
 @@ -24,30 +24,30 @@ begin remote
    toggle_bit         0
  
@@ -3436,9 +3377,9 @@ diff -Naurp lirc-0.8.5pre1.orig/remotes/pinnacle_systems/lircd.conf.pctv lirc-0.
            middle                   0x0000000000000014
  
  
-diff -Naurp lirc-0.8.5pre1.orig/remotes/pixelview/lircd.conf.playtv lirc-0.8.5pre1/remotes/pixelview/lircd.conf.playtv
---- lirc-0.8.5pre1.orig/remotes/pixelview/lircd.conf.playtv	1999-08-04 15:18:27.000000000 -0400
-+++ lirc-0.8.5pre1/remotes/pixelview/lircd.conf.playtv	2009-02-26 09:18:45.412722130 -0500
+diff -Naurp lirc-0.8.6pre2.orig/remotes/pixelview/lircd.conf.playtv lirc-0.8.6pre2/remotes/pixelview/lircd.conf.playtv
+--- lirc-0.8.6pre2.orig/remotes/pixelview/lircd.conf.playtv	1999-08-04 15:18:27.000000000 -0400
++++ lirc-0.8.6pre2/remotes/pixelview/lircd.conf.playtv	2009-08-29 13:23:31.000000000 -0400
 @@ -13,22 +13,22 @@ begin remote
    begin codes
      TV/FM                    0x00000000000000e7
@@ -3477,9 +3418,9 @@ diff -Naurp lirc-0.8.5pre1.orig/remotes/pixelview/lircd.conf.playtv lirc-0.8.5pr
    end codes
  end remote
  
-diff -Naurp lirc-0.8.5pre1.orig/remotes/pixelview/lircd.conf.playtv_bt878 lirc-0.8.5pre1/remotes/pixelview/lircd.conf.playtv_bt878
---- lirc-0.8.5pre1.orig/remotes/pixelview/lircd.conf.playtv_bt878	2000-09-30 15:32:40.000000000 -0400
-+++ lirc-0.8.5pre1/remotes/pixelview/lircd.conf.playtv_bt878	2009-02-26 09:18:45.412722130 -0500
+diff -Naurp lirc-0.8.6pre2.orig/remotes/pixelview/lircd.conf.playtv_bt878 lirc-0.8.6pre2/remotes/pixelview/lircd.conf.playtv_bt878
+--- lirc-0.8.6pre2.orig/remotes/pixelview/lircd.conf.playtv_bt878	2000-09-30 15:32:40.000000000 -0400
++++ lirc-0.8.6pre2/remotes/pixelview/lircd.conf.playtv_bt878	2009-08-29 13:23:31.000000000 -0400
 @@ -16,39 +16,39 @@ begin remote
    repeat_bit 0
  
@@ -3546,9 +3487,9 @@ diff -Naurp lirc-0.8.5pre1.orig/remotes/pixelview/lircd.conf.playtv_bt878 lirc-0
    end codes
  end remote
  
-diff -Naurp lirc-0.8.5pre1.orig/remotes/pixelview/lircd.conf.playtv_pro lirc-0.8.5pre1/remotes/pixelview/lircd.conf.playtv_pro
---- lirc-0.8.5pre1.orig/remotes/pixelview/lircd.conf.playtv_pro	2005-12-10 08:09:13.000000000 -0500
-+++ lirc-0.8.5pre1/remotes/pixelview/lircd.conf.playtv_pro	2009-02-26 09:18:45.413667488 -0500
+diff -Naurp lirc-0.8.6pre2.orig/remotes/pixelview/lircd.conf.playtv_pro lirc-0.8.6pre2/remotes/pixelview/lircd.conf.playtv_pro
+--- lirc-0.8.6pre2.orig/remotes/pixelview/lircd.conf.playtv_pro	2005-12-10 08:09:13.000000000 -0500
++++ lirc-0.8.6pre2/remotes/pixelview/lircd.conf.playtv_pro	2009-08-29 13:23:31.000000000 -0400
 @@ -31,15 +31,15 @@ begin remote
  
        begin codes
@@ -3599,9 +3540,9 @@ diff -Naurp lirc-0.8.5pre1.orig/remotes/pixelview/lircd.conf.playtv_pro lirc-0.8
  
        end codes
  
-diff -Naurp lirc-0.8.5pre1.orig/remotes/pixelview/lircd.conf.remotemaster lirc-0.8.5pre1/remotes/pixelview/lircd.conf.remotemaster
---- lirc-0.8.5pre1.orig/remotes/pixelview/lircd.conf.remotemaster	2000-02-07 06:03:20.000000000 -0500
-+++ lirc-0.8.5pre1/remotes/pixelview/lircd.conf.remotemaster	2009-02-26 09:18:45.413667488 -0500
+diff -Naurp lirc-0.8.6pre2.orig/remotes/pixelview/lircd.conf.remotemaster lirc-0.8.6pre2/remotes/pixelview/lircd.conf.remotemaster
+--- lirc-0.8.6pre2.orig/remotes/pixelview/lircd.conf.remotemaster	2000-02-07 06:03:20.000000000 -0500
++++ lirc-0.8.6pre2/remotes/pixelview/lircd.conf.remotemaster	2009-08-29 13:23:31.000000000 -0400
 @@ -25,39 +25,39 @@ begin remote
    gap          189264
  
@@ -3669,9 +3610,9 @@ diff -Naurp lirc-0.8.5pre1.orig/remotes/pixelview/lircd.conf.remotemaster lirc-0
        end codes
  
  end remote
-diff -Naurp lirc-0.8.5pre1.orig/remotes/provideo/lircd.conf.pv951 lirc-0.8.5pre1/remotes/provideo/lircd.conf.pv951
---- lirc-0.8.5pre1.orig/remotes/provideo/lircd.conf.pv951	2001-01-20 08:32:00.000000000 -0500
-+++ lirc-0.8.5pre1/remotes/provideo/lircd.conf.pv951	2009-02-26 09:18:45.413667488 -0500
+diff -Naurp lirc-0.8.6pre2.orig/remotes/provideo/lircd.conf.pv951 lirc-0.8.6pre2/remotes/provideo/lircd.conf.pv951
+--- lirc-0.8.6pre2.orig/remotes/provideo/lircd.conf.pv951	2001-01-20 08:32:00.000000000 -0500
++++ lirc-0.8.6pre2/remotes/provideo/lircd.conf.pv951	2009-08-29 13:23:31.000000000 -0400
 @@ -31,28 +31,28 @@ begin remote
    repeat_bit      0
  
@@ -3717,9 +3658,9 @@ diff -Naurp lirc-0.8.5pre1.orig/remotes/provideo/lircd.conf.pv951 lirc-0.8.5pre1
            func                     0x0000000000009867
            ttx                      0x000000000000B04F
            pg+                      0x000000000000708F
-diff -Naurp lirc-0.8.5pre1.orig/remotes/remotec/lircd.conf.BW6130 lirc-0.8.5pre1/remotes/remotec/lircd.conf.BW6130
---- lirc-0.8.5pre1.orig/remotes/remotec/lircd.conf.BW6130	2005-05-28 10:29:27.000000000 -0400
-+++ lirc-0.8.5pre1/remotes/remotec/lircd.conf.BW6130	2009-02-26 09:18:45.414659744 -0500
+diff -Naurp lirc-0.8.6pre2.orig/remotes/remotec/lircd.conf.BW6130 lirc-0.8.6pre2/remotes/remotec/lircd.conf.BW6130
+--- lirc-0.8.6pre2.orig/remotes/remotec/lircd.conf.BW6130	2005-05-28 10:29:27.000000000 -0400
++++ lirc-0.8.6pre2/remotes/remotec/lircd.conf.BW6130	2009-08-29 13:23:31.000000000 -0400
 @@ -20,20 +20,20 @@ begin remote
    toggle_bit     0
  
@@ -3755,9 +3696,9 @@ diff -Naurp lirc-0.8.5pre1.orig/remotes/remotec/lircd.conf.BW6130 lirc-0.8.5pre1
  	MOUSE_SLOW_N		0x95
  	MOUSE_SLOW_NNE		0xd1
  	MOUSE_SLOW_NE		0xcd
-diff -Naurp lirc-0.8.5pre1.orig/remotes/samsung/lircd.conf.samsung lirc-0.8.5pre1/remotes/samsung/lircd.conf.samsung
---- lirc-0.8.5pre1.orig/remotes/samsung/lircd.conf.samsung	2008-10-05 04:42:36.000000000 -0400
-+++ lirc-0.8.5pre1/remotes/samsung/lircd.conf.samsung	2009-02-26 09:19:05.215660078 -0500
+diff -Naurp lirc-0.8.6pre2.orig/remotes/samsung/lircd.conf.samsung lirc-0.8.6pre2/remotes/samsung/lircd.conf.samsung
+--- lirc-0.8.6pre2.orig/remotes/samsung/lircd.conf.samsung	2008-10-05 04:42:36.000000000 -0400
++++ lirc-0.8.6pre2/remotes/samsung/lircd.conf.samsung	2009-08-29 13:23:31.000000000 -0400
 @@ -28,60 +28,60 @@ begin remote
  
        begin codes
@@ -3868,9 +3809,9 @@ diff -Naurp lirc-0.8.5pre1.orig/remotes/samsung/lircd.conf.samsung lirc-0.8.5pre
        end codes
  
  end remote
-diff -Naurp lirc-0.8.5pre1.orig/remotes/sasem/lircd.conf.sasem lirc-0.8.5pre1/remotes/sasem/lircd.conf.sasem
---- lirc-0.8.5pre1.orig/remotes/sasem/lircd.conf.sasem	2005-07-15 07:24:55.000000000 -0400
-+++ lirc-0.8.5pre1/remotes/sasem/lircd.conf.sasem	2009-02-26 09:18:45.414659744 -0500
+diff -Naurp lirc-0.8.6pre2.orig/remotes/sasem/lircd.conf.sasem lirc-0.8.6pre2/remotes/sasem/lircd.conf.sasem
+--- lirc-0.8.6pre2.orig/remotes/sasem/lircd.conf.sasem	2005-07-15 07:24:55.000000000 -0400
++++ lirc-0.8.6pre2/remotes/sasem/lircd.conf.sasem	2009-08-29 13:23:31.000000000 -0400
 @@ -33,47 +33,47 @@ begin remote
  
  
@@ -3951,9 +3892,9 @@ diff -Naurp lirc-0.8.5pre1.orig/remotes/sasem/lircd.conf.sasem lirc-0.8.5pre1/re
        end codes
  
  end remote
-diff -Naurp lirc-0.8.5pre1.orig/remotes/sigma_designs/lircd.conf.realmagic lirc-0.8.5pre1/remotes/sigma_designs/lircd.conf.realmagic
---- lirc-0.8.5pre1.orig/remotes/sigma_designs/lircd.conf.realmagic	2006-04-29 07:01:50.000000000 -0400
-+++ lirc-0.8.5pre1/remotes/sigma_designs/lircd.conf.realmagic	2009-02-26 09:18:45.415660059 -0500
+diff -Naurp lirc-0.8.6pre2.orig/remotes/sigma_designs/lircd.conf.realmagic lirc-0.8.6pre2/remotes/sigma_designs/lircd.conf.realmagic
+--- lirc-0.8.6pre2.orig/remotes/sigma_designs/lircd.conf.realmagic	2006-04-29 07:01:50.000000000 -0400
++++ lirc-0.8.6pre2/remotes/sigma_designs/lircd.conf.realmagic	2009-08-29 13:23:31.000000000 -0400
 @@ -30,43 +30,43 @@ begin remote
  
        begin codes
@@ -4030,9 +3971,9 @@ diff -Naurp lirc-0.8.5pre1.orig/remotes/sigma_designs/lircd.conf.realmagic lirc-
        end codes
  
  end remote
-diff -Naurp lirc-0.8.5pre1.orig/remotes/silitek/lircd.conf.silitek lirc-0.8.5pre1/remotes/silitek/lircd.conf.silitek
---- lirc-0.8.5pre1.orig/remotes/silitek/lircd.conf.silitek	2001-04-24 15:36:10.000000000 -0400
-+++ lirc-0.8.5pre1/remotes/silitek/lircd.conf.silitek	2009-02-26 09:18:45.415660059 -0500
+diff -Naurp lirc-0.8.6pre2.orig/remotes/silitek/lircd.conf.silitek lirc-0.8.6pre2/remotes/silitek/lircd.conf.silitek
+--- lirc-0.8.6pre2.orig/remotes/silitek/lircd.conf.silitek	2001-04-24 15:36:10.000000000 -0400
++++ lirc-0.8.6pre2/remotes/silitek/lircd.conf.silitek	2009-08-29 13:23:31.000000000 -0400
 @@ -30,68 +30,68 @@ begin remote
      MOUSE_SSE                0x0000000000aa0004
      MOUSE_SE                 0x0000000000aa0003
@@ -4150,9 +4091,9 @@ diff -Naurp lirc-0.8.5pre1.orig/remotes/silitek/lircd.conf.silitek lirc-0.8.5pre
 +    KEY_CLOSE                 0x0000000000cc5d62
    end codes
  end remote
-diff -Naurp lirc-0.8.5pre1.orig/remotes/streamzap/lircd.conf.streamzap lirc-0.8.5pre1/remotes/streamzap/lircd.conf.streamzap
---- lirc-0.8.5pre1.orig/remotes/streamzap/lircd.conf.streamzap	2005-02-12 09:20:23.000000000 -0500
-+++ lirc-0.8.5pre1/remotes/streamzap/lircd.conf.streamzap	2009-02-26 09:19:05.237856913 -0500
+diff -Naurp lirc-0.8.6pre2.orig/remotes/streamzap/lircd.conf.streamzap lirc-0.8.6pre2/remotes/streamzap/lircd.conf.streamzap
+--- lirc-0.8.6pre2.orig/remotes/streamzap/lircd.conf.streamzap	2005-02-12 09:20:23.000000000 -0500
++++ lirc-0.8.6pre2/remotes/streamzap/lircd.conf.streamzap	2009-08-29 13:23:31.000000000 -0400
 @@ -27,41 +27,41 @@ begin remote
  
  
@@ -4230,9 +4171,9 @@ diff -Naurp lirc-0.8.5pre1.orig/remotes/streamzap/lircd.conf.streamzap lirc-0.8.
        end codes
  
  end remote
-diff -Naurp lirc-0.8.5pre1.orig/remotes/technisat/lircd.conf.mediafocusI lirc-0.8.5pre1/remotes/technisat/lircd.conf.mediafocusI
---- lirc-0.8.5pre1.orig/remotes/technisat/lircd.conf.mediafocusI	2001-02-04 08:38:09.000000000 -0500
-+++ lirc-0.8.5pre1/remotes/technisat/lircd.conf.mediafocusI	2009-02-26 09:18:45.415660059 -0500
+diff -Naurp lirc-0.8.6pre2.orig/remotes/technisat/lircd.conf.mediafocusI lirc-0.8.6pre2/remotes/technisat/lircd.conf.mediafocusI
+--- lirc-0.8.6pre2.orig/remotes/technisat/lircd.conf.mediafocusI	2001-02-04 08:38:09.000000000 -0500
++++ lirc-0.8.6pre2/remotes/technisat/lircd.conf.mediafocusI	2009-08-29 13:23:31.000000000 -0400
 @@ -30,11 +30,11 @@ begin remote
    duty_cycle   33
  
@@ -4250,9 +4191,9 @@ diff -Naurp lirc-0.8.5pre1.orig/remotes/technisat/lircd.conf.mediafocusI lirc-0.
        end codes
  
  end remote
-diff -Naurp lirc-0.8.5pre1.orig/remotes/tekram/lircd.conf.m230 lirc-0.8.5pre1/remotes/tekram/lircd.conf.m230
---- lirc-0.8.5pre1.orig/remotes/tekram/lircd.conf.m230	2002-03-28 16:26:54.000000000 -0500
-+++ lirc-0.8.5pre1/remotes/tekram/lircd.conf.m230	2009-02-26 09:18:45.416659738 -0500
+diff -Naurp lirc-0.8.6pre2.orig/remotes/tekram/lircd.conf.m230 lirc-0.8.6pre2/remotes/tekram/lircd.conf.m230
+--- lirc-0.8.6pre2.orig/remotes/tekram/lircd.conf.m230	2002-03-28 16:26:54.000000000 -0500
++++ lirc-0.8.6pre2/remotes/tekram/lircd.conf.m230	2009-08-29 13:23:31.000000000 -0400
 @@ -13,36 +13,36 @@ begin remote
    name  M230
    bits  8
@@ -4313,9 +4254,9 @@ diff -Naurp lirc-0.8.5pre1.orig/remotes/tekram/lircd.conf.m230 lirc-0.8.5pre1/re
 +	KEY_KPMINUS		0x0C
       end codes
  end remote
-diff -Naurp lirc-0.8.5pre1.orig/remotes/vlsystem/lircd.conf.mplay lirc-0.8.5pre1/remotes/vlsystem/lircd.conf.mplay
---- lirc-0.8.5pre1.orig/remotes/vlsystem/lircd.conf.mplay	2007-12-22 07:33:17.000000000 -0500
-+++ lirc-0.8.5pre1/remotes/vlsystem/lircd.conf.mplay	2009-02-26 09:19:05.217660199 -0500
+diff -Naurp lirc-0.8.6pre2.orig/remotes/vlsystem/lircd.conf.mplay lirc-0.8.6pre2/remotes/vlsystem/lircd.conf.mplay
+--- lirc-0.8.6pre2.orig/remotes/vlsystem/lircd.conf.mplay	2007-12-22 07:33:17.000000000 -0500
++++ lirc-0.8.6pre2/remotes/vlsystem/lircd.conf.mplay	2009-08-29 13:23:31.000000000 -0400
 @@ -22,49 +22,49 @@ begin remote
    toggle_bit_mask 0x0
  
@@ -4409,9 +4350,9 @@ diff -Naurp lirc-0.8.5pre1.orig/remotes/vlsystem/lircd.conf.mplay lirc-0.8.5pre1
        end codes
  
  end remote
-diff -Naurp lirc-0.8.5pre1.orig/remotes/x10/lircd.conf.mouseremote lirc-0.8.5pre1/remotes/x10/lircd.conf.mouseremote
---- lirc-0.8.5pre1.orig/remotes/x10/lircd.conf.mouseremote	2005-01-22 05:40:43.000000000 -0500
-+++ lirc-0.8.5pre1/remotes/x10/lircd.conf.mouseremote	2009-02-26 09:18:45.419659649 -0500
+diff -Naurp lirc-0.8.6pre2.orig/remotes/x10/lircd.conf.mouseremote lirc-0.8.6pre2/remotes/x10/lircd.conf.mouseremote
+--- lirc-0.8.6pre2.orig/remotes/x10/lircd.conf.mouseremote	2005-01-22 05:40:43.000000000 -0500
++++ lirc-0.8.6pre2/remotes/x10/lircd.conf.mouseremote	2009-08-29 13:23:31.000000000 -0400
 @@ -24,42 +24,42 @@ begin remote
    gap		140000
  
@@ -4494,9 +4435,9 @@ diff -Naurp lirc-0.8.5pre1.orig/remotes/x10/lircd.conf.mouseremote lirc-0.8.5pre
  	end codes	
  
  end remote
-diff -Naurp lirc-0.8.5pre1.orig/remotes/x10/lircd.conf.mp3anywhere lirc-0.8.5pre1/remotes/x10/lircd.conf.mp3anywhere
---- lirc-0.8.5pre1.orig/remotes/x10/lircd.conf.mp3anywhere	2007-07-01 03:09:11.000000000 -0400
-+++ lirc-0.8.5pre1/remotes/x10/lircd.conf.mp3anywhere	2009-02-26 09:18:45.419659649 -0500
+diff -Naurp lirc-0.8.6pre2.orig/remotes/x10/lircd.conf.mp3anywhere lirc-0.8.6pre2/remotes/x10/lircd.conf.mp3anywhere
+--- lirc-0.8.6pre2.orig/remotes/x10/lircd.conf.mp3anywhere	2007-07-01 03:09:11.000000000 -0400
++++ lirc-0.8.6pre2/remotes/x10/lircd.conf.mp3anywhere	2009-08-29 13:23:31.000000000 -0400
 @@ -22,43 +22,43 @@ begin remote
    gap		140000
  
diff --git a/lirc.spec b/lirc.spec
index 2fdd7de..b44b08b 100644
--- a/lirc.spec
+++ b/lirc.spec
@@ -18,7 +18,7 @@
 
 Name:           lirc
 Version:        0.8.6
-Release:        0.5%{?pre:.%{pre}}%{?dist}
+Release:        0.6%{?pre:.%{pre}}%{?dist}
 Summary:        The Linux Infrared Remote Control package
 
 Group:          System Environment/Daemons
@@ -31,7 +31,7 @@ Source2:        %{name}.sysconfig
 Patch0:         lirc-use-new-instead-of-conf-as-filename-suffix.patch
 # https://bugzilla.redhat.com/show_bug.cgi?id=457273
 # http://thread.gmane.org/gmane.comp.hardware.lirc/6884
-Patch1:		lirc-0.8.5-standardized-remote-keycodes.patch
+Patch1:		lirc-0.8.6-standardized-remote-keycodes.patch
 Patch2:         lirc-0.8.4-make-remote-names-all-unique.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -273,6 +273,9 @@ fi
 
 
 %changelog
+* Sat Aug 29 2009 Jarod Wilson <jarod@redhat.com> 0.8.6-0.6.pre2
+- Rediff patches so they actually apply still
+
 * Sat Aug 29 2009 Jarod Wilson <jarod@redhat.com> 0.8.6-0.5.pre2
 - Update to lirc 0.8.6pre2
 

From 6402ffbb15d3fc78d7b78f31f420fcdc0db0965a Mon Sep 17 00:00:00 2001
From: Jarod Wilson <jwilson@fedoraproject.org>
Date: Mon, 14 Sep 2009 03:30:46 +0000
Subject: [PATCH 070/204] - Update to lirc 0.8.6 release

---
 .cvsignore                                    |   1 +
 lirc-0.8.6-standardized-remote-keycodes.patch | 548 ++++++++++++------
 lirc.init                                     |   6 +-
 lirc.spec                                     |  25 +-
 lirc.sysconfig                                |   2 +-
 sources                                       |   2 +-
 6 files changed, 390 insertions(+), 194 deletions(-)

diff --git a/.cvsignore b/.cvsignore
index f1f14b2..7fad6b9 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -9,3 +9,4 @@ lirc-0.8.5pre3.tar.bz2
 lirc-0.8.5.tar.bz2
 lirc-0.8.6pre1.tar.bz2
 lirc-0.8.6pre2.tar.bz2
+lirc-0.8.6.tar.bz2
diff --git a/lirc-0.8.6-standardized-remote-keycodes.patch b/lirc-0.8.6-standardized-remote-keycodes.patch
index 9b00e5a..b0cf63d 100644
--- a/lirc-0.8.6-standardized-remote-keycodes.patch
+++ b/lirc-0.8.6-standardized-remote-keycodes.patch
@@ -1,6 +1,6 @@
-diff -Naurp lirc-0.8.6pre2.orig/remotes/adstech/lircd.conf.usbx-707 lirc-0.8.6pre2/remotes/adstech/lircd.conf.usbx-707
---- lirc-0.8.6pre2.orig/remotes/adstech/lircd.conf.usbx-707	2009-08-29 13:23:01.000000000 -0400
-+++ lirc-0.8.6pre2/remotes/adstech/lircd.conf.usbx-707	2009-08-29 13:23:31.000000000 -0400
+diff -Naurp lirc-0.8.6/remotes/adstech/lircd.conf.usbx-707 lirc-0.8.6.new/remotes/adstech/lircd.conf.usbx-707
+--- lirc-0.8.6/remotes/adstech/lircd.conf.usbx-707	2009-09-13 22:12:44.000000000 -0400
++++ lirc-0.8.6.new/remotes/adstech/lircd.conf.usbx-707	2009-09-13 21:37:03.000000000 -0400
 @@ -26,50 +26,50 @@ begin remote
    toggle_bit_mask 0x0
  
@@ -90,9 +90,9 @@ diff -Naurp lirc-0.8.6pre2.orig/remotes/adstech/lircd.conf.usbx-707 lirc-0.8.6pr
        end codes
  
  end remote
-diff -Naurp lirc-0.8.6pre2.orig/remotes/animax/lircd.conf.animax lirc-0.8.6pre2/remotes/animax/lircd.conf.animax
---- lirc-0.8.6pre2.orig/remotes/animax/lircd.conf.animax	1999-04-29 17:30:59.000000000 -0400
-+++ lirc-0.8.6pre2/remotes/animax/lircd.conf.animax	2009-08-29 13:23:31.000000000 -0400
+diff -Naurp lirc-0.8.6/remotes/animax/lircd.conf.animax lirc-0.8.6.new/remotes/animax/lircd.conf.animax
+--- lirc-0.8.6/remotes/animax/lircd.conf.animax	1999-04-29 17:30:59.000000000 -0400
++++ lirc-0.8.6.new/remotes/animax/lircd.conf.animax	2009-09-13 21:37:03.000000000 -0400
 @@ -38,79 +38,79 @@ begin remote
  
        begin codes
@@ -206,9 +206,9 @@ diff -Naurp lirc-0.8.6pre2.orig/remotes/animax/lircd.conf.animax lirc-0.8.6pre2/
        end codes
  
  end remote
-diff -Naurp lirc-0.8.6pre2.orig/remotes/apple/lircd.conf.macmini lirc-0.8.6pre2/remotes/apple/lircd.conf.macmini
---- lirc-0.8.6pre2.orig/remotes/apple/lircd.conf.macmini	2008-05-31 17:29:12.000000000 -0400
-+++ lirc-0.8.6pre2/remotes/apple/lircd.conf.macmini	2009-08-29 13:23:31.000000000 -0400
+diff -Naurp lirc-0.8.6/remotes/apple/lircd.conf.macmini lirc-0.8.6.new/remotes/apple/lircd.conf.macmini
+--- lirc-0.8.6/remotes/apple/lircd.conf.macmini	2008-05-31 17:29:12.000000000 -0400
++++ lirc-0.8.6.new/remotes/apple/lircd.conf.macmini	2009-09-13 21:37:03.000000000 -0400
 @@ -26,12 +26,12 @@ begin remote
    ignore_mask 0x0000ff01
  
@@ -228,9 +228,9 @@ diff -Naurp lirc-0.8.6pre2.orig/remotes/apple/lircd.conf.macmini lirc-0.8.6pre2/
        end codes
  
  end remote
-diff -Naurp lirc-0.8.6pre2.orig/remotes/asus/lircd.conf.asus lirc-0.8.6pre2/remotes/asus/lircd.conf.asus
---- lirc-0.8.6pre2.orig/remotes/asus/lircd.conf.asus	2007-02-19 23:09:47.000000000 -0500
-+++ lirc-0.8.6pre2/remotes/asus/lircd.conf.asus	2009-08-29 13:23:31.000000000 -0400
+diff -Naurp lirc-0.8.6/remotes/asus/lircd.conf.asus lirc-0.8.6.new/remotes/asus/lircd.conf.asus
+--- lirc-0.8.6/remotes/asus/lircd.conf.asus	2007-02-19 23:09:47.000000000 -0500
++++ lirc-0.8.6.new/remotes/asus/lircd.conf.asus	2009-09-13 21:37:03.000000000 -0400
 @@ -19,38 +19,38 @@ begin remote
    toggle_bit	0
  
@@ -298,9 +298,9 @@ diff -Naurp lirc-0.8.6pre2.orig/remotes/asus/lircd.conf.asus lirc-0.8.6pre2/remo
          end codes
  
  end remote
-diff -Naurp lirc-0.8.6pre2.orig/remotes/asus/lircd.conf.asusdh lirc-0.8.6pre2/remotes/asus/lircd.conf.asusdh
---- lirc-0.8.6pre2.orig/remotes/asus/lircd.conf.asusdh	2007-07-08 10:01:27.000000000 -0400
-+++ lirc-0.8.6pre2/remotes/asus/lircd.conf.asusdh	2009-08-29 13:23:31.000000000 -0400
+diff -Naurp lirc-0.8.6/remotes/asus/lircd.conf.asusdh lirc-0.8.6.new/remotes/asus/lircd.conf.asusdh
+--- lirc-0.8.6/remotes/asus/lircd.conf.asusdh	2007-07-08 10:01:27.000000000 -0400
++++ lirc-0.8.6.new/remotes/asus/lircd.conf.asusdh	2009-09-13 21:37:03.000000000 -0400
 @@ -14,17 +14,17 @@ begin remote
    post_data_bits  0
  
@@ -325,9 +325,9 @@ diff -Naurp lirc-0.8.6pre2.orig/remotes/asus/lircd.conf.asusdh lirc-0.8.6pre2/re
          end codes
  
  end remote
-diff -Naurp lirc-0.8.6pre2.orig/remotes/asus/lircd.conf.digimatrix lirc-0.8.6pre2/remotes/asus/lircd.conf.digimatrix
---- lirc-0.8.6pre2.orig/remotes/asus/lircd.conf.digimatrix	2005-09-06 13:12:17.000000000 -0400
-+++ lirc-0.8.6pre2/remotes/asus/lircd.conf.digimatrix	2009-08-29 13:23:31.000000000 -0400
+diff -Naurp lirc-0.8.6/remotes/asus/lircd.conf.digimatrix lirc-0.8.6.new/remotes/asus/lircd.conf.digimatrix
+--- lirc-0.8.6/remotes/asus/lircd.conf.digimatrix	2005-09-06 13:12:17.000000000 -0400
++++ lirc-0.8.6.new/remotes/asus/lircd.conf.digimatrix	2009-09-13 21:37:03.000000000 -0400
 @@ -28,43 +28,43 @@ begin remote
  
  
@@ -404,9 +404,9 @@ diff -Naurp lirc-0.8.6pre2.orig/remotes/asus/lircd.conf.digimatrix lirc-0.8.6pre
            dvd_audio                0x00000000000050AF
            ui_size                  0x0000000000008877
            ui_on_off                0x00000000000028D7
-diff -Naurp lirc-0.8.6pre2.orig/remotes/atiusb/lircd.conf.atilibusb lirc-0.8.6pre2/remotes/atiusb/lircd.conf.atilibusb
---- lirc-0.8.6pre2.orig/remotes/atiusb/lircd.conf.atilibusb	2009-01-18 13:30:14.000000000 -0500
-+++ lirc-0.8.6pre2/remotes/atiusb/lircd.conf.atilibusb	2009-08-29 13:23:31.000000000 -0400
+diff -Naurp lirc-0.8.6/remotes/atiusb/lircd.conf.atilibusb lirc-0.8.6.new/remotes/atiusb/lircd.conf.atilibusb
+--- lirc-0.8.6/remotes/atiusb/lircd.conf.atilibusb	2009-01-18 13:30:14.000000000 -0500
++++ lirc-0.8.6.new/remotes/atiusb/lircd.conf.atilibusb	2009-09-13 21:37:03.000000000 -0400
 @@ -30,58 +30,58 @@ begin remote
  
  
@@ -518,9 +518,9 @@ diff -Naurp lirc-0.8.6pre2.orig/remotes/atiusb/lircd.conf.atilibusb lirc-0.8.6pr
        end codes
  
  end remote
-diff -Naurp lirc-0.8.6pre2.orig/remotes/atiusb/lircd.conf.atiusb lirc-0.8.6pre2/remotes/atiusb/lircd.conf.atiusb
---- lirc-0.8.6pre2.orig/remotes/atiusb/lircd.conf.atiusb	2009-08-29 13:23:01.000000000 -0400
-+++ lirc-0.8.6pre2/remotes/atiusb/lircd.conf.atiusb	2009-08-29 13:23:31.000000000 -0400
+diff -Naurp lirc-0.8.6/remotes/atiusb/lircd.conf.atiusb lirc-0.8.6.new/remotes/atiusb/lircd.conf.atiusb
+--- lirc-0.8.6/remotes/atiusb/lircd.conf.atiusb	2009-09-13 22:12:44.000000000 -0400
++++ lirc-0.8.6.new/remotes/atiusb/lircd.conf.atiusb	2009-09-13 21:37:03.000000000 -0400
 @@ -37,54 +37,54 @@ begin remote
  
  
@@ -618,9 +618,9 @@ diff -Naurp lirc-0.8.6pre2.orig/remotes/atiusb/lircd.conf.atiusb lirc-0.8.6pre2/
        end codes
  
  end remote
-diff -Naurp lirc-0.8.6pre2.orig/remotes/avermedia/lircd.conf.avermedia lirc-0.8.6pre2/remotes/avermedia/lircd.conf.avermedia
---- lirc-0.8.6pre2.orig/remotes/avermedia/lircd.conf.avermedia	2001-01-11 02:54:25.000000000 -0500
-+++ lirc-0.8.6pre2/remotes/avermedia/lircd.conf.avermedia	2009-08-29 13:23:31.000000000 -0400
+diff -Naurp lirc-0.8.6/remotes/avermedia/lircd.conf.avermedia lirc-0.8.6.new/remotes/avermedia/lircd.conf.avermedia
+--- lirc-0.8.6/remotes/avermedia/lircd.conf.avermedia	2001-01-11 02:54:25.000000000 -0500
++++ lirc-0.8.6.new/remotes/avermedia/lircd.conf.avermedia	2009-09-13 21:37:03.000000000 -0400
 @@ -34,37 +34,37 @@ begin remote
  
  
@@ -683,9 +683,9 @@ diff -Naurp lirc-0.8.6pre2.orig/remotes/avermedia/lircd.conf.avermedia lirc-0.8.
        end codes
  
  end remote
-diff -Naurp lirc-0.8.6pre2.orig/remotes/avermedia/lircd.conf.avermedia98 lirc-0.8.6pre2/remotes/avermedia/lircd.conf.avermedia98
---- lirc-0.8.6pre2.orig/remotes/avermedia/lircd.conf.avermedia98	2001-01-10 17:08:00.000000000 -0500
-+++ lirc-0.8.6pre2/remotes/avermedia/lircd.conf.avermedia98	2009-08-29 13:23:31.000000000 -0400
+diff -Naurp lirc-0.8.6/remotes/avermedia/lircd.conf.avermedia98 lirc-0.8.6.new/remotes/avermedia/lircd.conf.avermedia98
+--- lirc-0.8.6/remotes/avermedia/lircd.conf.avermedia98	2001-01-10 17:08:00.000000000 -0500
++++ lirc-0.8.6.new/remotes/avermedia/lircd.conf.avermedia98	2009-09-13 21:37:03.000000000 -0400
 @@ -29,49 +29,49 @@ begin remote
  
        begin codes
@@ -765,9 +765,9 @@ diff -Naurp lirc-0.8.6pre2.orig/remotes/avermedia/lircd.conf.avermedia98 lirc-0.
        end codes
  
  end remote
-diff -Naurp lirc-0.8.6pre2.orig/remotes/avermedia/lircd.conf.vdomate lirc-0.8.6pre2/remotes/avermedia/lircd.conf.vdomate
---- lirc-0.8.6pre2.orig/remotes/avermedia/lircd.conf.vdomate	2002-10-25 16:42:55.000000000 -0400
-+++ lirc-0.8.6pre2/remotes/avermedia/lircd.conf.vdomate	2009-08-29 13:23:31.000000000 -0400
+diff -Naurp lirc-0.8.6/remotes/avermedia/lircd.conf.vdomate lirc-0.8.6.new/remotes/avermedia/lircd.conf.vdomate
+--- lirc-0.8.6/remotes/avermedia/lircd.conf.vdomate	2002-10-25 16:42:55.000000000 -0400
++++ lirc-0.8.6.new/remotes/avermedia/lircd.conf.vdomate	2009-09-13 21:37:03.000000000 -0400
 @@ -27,33 +27,33 @@ begin remote
  
  
@@ -820,9 +820,9 @@ diff -Naurp lirc-0.8.6pre2.orig/remotes/avermedia/lircd.conf.vdomate lirc-0.8.6p
        end codes
  
  end remote
-diff -Naurp lirc-0.8.6pre2.orig/remotes/bestbuy/lircd.conf.bestbuy lirc-0.8.6pre2/remotes/bestbuy/lircd.conf.bestbuy
---- lirc-0.8.6pre2.orig/remotes/bestbuy/lircd.conf.bestbuy	2001-04-25 16:07:50.000000000 -0400
-+++ lirc-0.8.6pre2/remotes/bestbuy/lircd.conf.bestbuy	2009-08-29 13:23:31.000000000 -0400
+diff -Naurp lirc-0.8.6/remotes/bestbuy/lircd.conf.bestbuy lirc-0.8.6.new/remotes/bestbuy/lircd.conf.bestbuy
+--- lirc-0.8.6/remotes/bestbuy/lircd.conf.bestbuy	2001-04-25 16:07:50.000000000 -0400
++++ lirc-0.8.6.new/remotes/bestbuy/lircd.conf.bestbuy	2009-09-13 21:37:03.000000000 -0400
 @@ -26,36 +26,36 @@ begin remote
  
  
@@ -885,9 +885,9 @@ diff -Naurp lirc-0.8.6pre2.orig/remotes/bestbuy/lircd.conf.bestbuy lirc-0.8.6pre
        end codes
  
  end remote
-diff -Naurp lirc-0.8.6pre2.orig/remotes/bestbuy/lircd.conf.bestbuy2 lirc-0.8.6pre2/remotes/bestbuy/lircd.conf.bestbuy2
---- lirc-0.8.6pre2.orig/remotes/bestbuy/lircd.conf.bestbuy2	2005-10-29 16:10:15.000000000 -0400
-+++ lirc-0.8.6pre2/remotes/bestbuy/lircd.conf.bestbuy2	2009-08-29 13:23:31.000000000 -0400
+diff -Naurp lirc-0.8.6/remotes/bestbuy/lircd.conf.bestbuy2 lirc-0.8.6.new/remotes/bestbuy/lircd.conf.bestbuy2
+--- lirc-0.8.6/remotes/bestbuy/lircd.conf.bestbuy2	2005-10-29 16:10:15.000000000 -0400
++++ lirc-0.8.6.new/remotes/bestbuy/lircd.conf.bestbuy2	2009-09-13 21:37:03.000000000 -0400
 @@ -27,29 +27,29 @@ begin remote
        begin codes
            TV/FM                    0x0000000000000043
@@ -937,9 +937,9 @@ diff -Naurp lirc-0.8.6pre2.orig/remotes/bestbuy/lircd.conf.bestbuy2 lirc-0.8.6pr
            RESET                    0x000000000000004D
            FREEZE                   0x000000000000004F
        end codes
-diff -Naurp lirc-0.8.6pre2.orig/remotes/caraca/lircd.conf.caraca lirc-0.8.6pre2/remotes/caraca/lircd.conf.caraca
---- lirc-0.8.6pre2.orig/remotes/caraca/lircd.conf.caraca	2000-08-25 15:21:17.000000000 -0400
-+++ lirc-0.8.6pre2/remotes/caraca/lircd.conf.caraca	2009-08-29 13:23:31.000000000 -0400
+diff -Naurp lirc-0.8.6/remotes/caraca/lircd.conf.caraca lirc-0.8.6.new/remotes/caraca/lircd.conf.caraca
+--- lirc-0.8.6/remotes/caraca/lircd.conf.caraca	2000-08-25 15:21:17.000000000 -0400
++++ lirc-0.8.6.new/remotes/caraca/lircd.conf.caraca	2009-09-13 21:37:03.000000000 -0400
 @@ -17,29 +17,29 @@ begin remote
    bits           16
  
@@ -991,9 +991,9 @@ diff -Naurp lirc-0.8.6pre2.orig/remotes/caraca/lircd.conf.caraca lirc-0.8.6pre2/
            TV/FM                    0x3fe3
        end codes
  
-diff -Naurp lirc-0.8.6pre2.orig/remotes/chronos/lircd.conf.chronos lirc-0.8.6pre2/remotes/chronos/lircd.conf.chronos
---- lirc-0.8.6pre2.orig/remotes/chronos/lircd.conf.chronos	2009-08-29 13:23:01.000000000 -0400
-+++ lirc-0.8.6pre2/remotes/chronos/lircd.conf.chronos	2009-08-29 13:23:31.000000000 -0400
+diff -Naurp lirc-0.8.6/remotes/chronos/lircd.conf.chronos lirc-0.8.6.new/remotes/chronos/lircd.conf.chronos
+--- lirc-0.8.6/remotes/chronos/lircd.conf.chronos	2009-09-13 22:12:44.000000000 -0400
++++ lirc-0.8.6.new/remotes/chronos/lircd.conf.chronos	2009-09-13 21:37:03.000000000 -0400
 @@ -20,37 +20,37 @@ begin remote
    toggle_bit      0
  
@@ -1057,9 +1057,9 @@ diff -Naurp lirc-0.8.6pre2.orig/remotes/chronos/lircd.conf.chronos lirc-0.8.6pre
 +          KEY_RIGHT         0x0000000000000007
        end codes
  end remote
-diff -Naurp lirc-0.8.6pre2.orig/remotes/cph03x/lircd.conf.cph03x lirc-0.8.6pre2/remotes/cph03x/lircd.conf.cph03x
---- lirc-0.8.6pre2.orig/remotes/cph03x/lircd.conf.cph03x	2001-06-14 11:49:16.000000000 -0400
-+++ lirc-0.8.6pre2/remotes/cph03x/lircd.conf.cph03x	2009-08-29 13:23:31.000000000 -0400
+diff -Naurp lirc-0.8.6/remotes/cph03x/lircd.conf.cph03x lirc-0.8.6.new/remotes/cph03x/lircd.conf.cph03x
+--- lirc-0.8.6/remotes/cph03x/lircd.conf.cph03x	2001-06-14 11:49:16.000000000 -0400
++++ lirc-0.8.6.new/remotes/cph03x/lircd.conf.cph03x	2009-09-13 21:37:03.000000000 -0400
 @@ -32,39 +32,39 @@ begin remote
    repeat_bit      0
  
@@ -1123,9 +1123,9 @@ diff -Naurp lirc-0.8.6pre2.orig/remotes/cph03x/lircd.conf.cph03x lirc-0.8.6pre2/
        end codes
  
  end remote
-diff -Naurp lirc-0.8.6pre2.orig/remotes/creative/lircd.conf.alsa_usb lirc-0.8.6pre2/remotes/creative/lircd.conf.alsa_usb
---- lirc-0.8.6pre2.orig/remotes/creative/lircd.conf.alsa_usb	2008-01-26 04:01:16.000000000 -0500
-+++ lirc-0.8.6pre2/remotes/creative/lircd.conf.alsa_usb	2009-08-29 13:23:31.000000000 -0400
+diff -Naurp lirc-0.8.6/remotes/creative/lircd.conf.alsa_usb lirc-0.8.6.new/remotes/creative/lircd.conf.alsa_usb
+--- lirc-0.8.6/remotes/creative/lircd.conf.alsa_usb	2008-01-26 04:01:16.000000000 -0500
++++ lirc-0.8.6.new/remotes/creative/lircd.conf.alsa_usb	2009-09-13 21:37:03.000000000 -0400
 @@ -34,38 +34,38 @@ begin remote
  
  
@@ -1192,9 +1192,9 @@ diff -Naurp lirc-0.8.6pre2.orig/remotes/creative/lircd.conf.alsa_usb lirc-0.8.6p
            Step                     0x0000000000007E81
        end codes
  
-diff -Naurp lirc-0.8.6pre2.orig/remotes/creative/lircd.conf.breakoutbox lirc-0.8.6pre2/remotes/creative/lircd.conf.breakoutbox
---- lirc-0.8.6pre2.orig/remotes/creative/lircd.conf.breakoutbox	2007-02-19 23:08:04.000000000 -0500
-+++ lirc-0.8.6pre2/remotes/creative/lircd.conf.breakoutbox	2009-08-29 13:23:31.000000000 -0400
+diff -Naurp lirc-0.8.6/remotes/creative/lircd.conf.breakoutbox lirc-0.8.6.new/remotes/creative/lircd.conf.breakoutbox
+--- lirc-0.8.6/remotes/creative/lircd.conf.breakoutbox	2007-02-19 23:08:04.000000000 -0500
++++ lirc-0.8.6.new/remotes/creative/lircd.conf.breakoutbox	2009-09-13 21:37:03.000000000 -0400
 @@ -19,37 +19,37 @@ begin remote
        begin codes
            DVD/CD                   0x0000000000000001
@@ -1259,9 +1259,9 @@ diff -Naurp lirc-0.8.6pre2.orig/remotes/creative/lircd.conf.breakoutbox lirc-0.8
        end codes
  
  end remote
-diff -Naurp lirc-0.8.6pre2.orig/remotes/creative/lircd.conf.creative lirc-0.8.6pre2/remotes/creative/lircd.conf.creative
---- lirc-0.8.6pre2.orig/remotes/creative/lircd.conf.creative	2007-03-10 15:15:49.000000000 -0500
-+++ lirc-0.8.6pre2/remotes/creative/lircd.conf.creative	2009-08-29 13:23:31.000000000 -0400
+diff -Naurp lirc-0.8.6/remotes/creative/lircd.conf.creative lirc-0.8.6.new/remotes/creative/lircd.conf.creative
+--- lirc-0.8.6/remotes/creative/lircd.conf.creative	2007-03-10 15:15:49.000000000 -0500
++++ lirc-0.8.6.new/remotes/creative/lircd.conf.creative	2009-09-13 21:37:03.000000000 -0400
 @@ -23,30 +23,30 @@ begin remote
    toggle_bit      0
  
@@ -1312,9 +1312,9 @@ diff -Naurp lirc-0.8.6pre2.orig/remotes/creative/lircd.conf.creative lirc-0.8.6p
        end codes
  
  end remote
-diff -Naurp lirc-0.8.6pre2.orig/remotes/creative/lircd.conf.livedrive lirc-0.8.6pre2/remotes/creative/lircd.conf.livedrive
---- lirc-0.8.6pre2.orig/remotes/creative/lircd.conf.livedrive	2009-08-29 13:23:01.000000000 -0400
-+++ lirc-0.8.6pre2/remotes/creative/lircd.conf.livedrive	2009-08-29 13:23:31.000000000 -0400
+diff -Naurp lirc-0.8.6/remotes/creative/lircd.conf.livedrive lirc-0.8.6.new/remotes/creative/lircd.conf.livedrive
+--- lirc-0.8.6/remotes/creative/lircd.conf.livedrive	2009-09-13 22:12:44.000000000 -0400
++++ lirc-0.8.6.new/remotes/creative/lircd.conf.livedrive	2009-09-13 21:37:03.000000000 -0400
 @@ -29,40 +29,40 @@ begin remote
  
  
@@ -1384,9 +1384,9 @@ diff -Naurp lirc-0.8.6pre2.orig/remotes/creative/lircd.conf.livedrive lirc-0.8.6
  	  
        end codes
  
-diff -Naurp lirc-0.8.6pre2.orig/remotes/dvico/lircd.conf.fusionHDTV lirc-0.8.6pre2/remotes/dvico/lircd.conf.fusionHDTV
---- lirc-0.8.6pre2.orig/remotes/dvico/lircd.conf.fusionHDTV	2006-05-06 00:38:39.000000000 -0400
-+++ lirc-0.8.6pre2/remotes/dvico/lircd.conf.fusionHDTV	2009-08-29 13:23:31.000000000 -0400
+diff -Naurp lirc-0.8.6/remotes/dvico/lircd.conf.fusionHDTV lirc-0.8.6.new/remotes/dvico/lircd.conf.fusionHDTV
+--- lirc-0.8.6/remotes/dvico/lircd.conf.fusionHDTV	2006-05-06 00:38:39.000000000 -0400
++++ lirc-0.8.6.new/remotes/dvico/lircd.conf.fusionHDTV	2009-09-13 21:37:03.000000000 -0400
 @@ -22,42 +22,42 @@ begin remote
    toggle_bit     0
  
@@ -1461,9 +1461,9 @@ diff -Naurp lirc-0.8.6pre2.orig/remotes/dvico/lircd.conf.fusionHDTV lirc-0.8.6pr
        end codes
  
  end remote
-diff -Naurp lirc-0.8.6pre2.orig/remotes/ea65/lircd.conf.ea65 lirc-0.8.6pre2/remotes/ea65/lircd.conf.ea65
---- lirc-0.8.6pre2.orig/remotes/ea65/lircd.conf.ea65	2004-11-20 08:43:48.000000000 -0500
-+++ lirc-0.8.6pre2/remotes/ea65/lircd.conf.ea65	2009-08-29 13:23:31.000000000 -0400
+diff -Naurp lirc-0.8.6/remotes/ea65/lircd.conf.ea65 lirc-0.8.6.new/remotes/ea65/lircd.conf.ea65
+--- lirc-0.8.6/remotes/ea65/lircd.conf.ea65	2004-11-20 08:43:48.000000000 -0500
++++ lirc-0.8.6.new/remotes/ea65/lircd.conf.ea65	2009-09-13 21:37:03.000000000 -0400
 @@ -18,53 +18,53 @@ begin remote
          htpc        0x0011811b
          dvd/vcd     0x00128100
@@ -1552,9 +1552,9 @@ diff -Naurp lirc-0.8.6pre2.orig/remotes/ea65/lircd.conf.ea65 lirc-0.8.6pre2/remo
          stop-eject  0x00238107
          mode-       0x00ff1080
          mode+       0x00ff1180
-diff -Naurp lirc-0.8.6pre2.orig/remotes/ericsson/lircd.conf.bte lirc-0.8.6pre2/remotes/ericsson/lircd.conf.bte
---- lirc-0.8.6pre2.orig/remotes/ericsson/lircd.conf.bte	2005-03-25 15:40:25.000000000 -0500
-+++ lirc-0.8.6pre2/remotes/ericsson/lircd.conf.bte	2009-08-29 13:23:31.000000000 -0400
+diff -Naurp lirc-0.8.6/remotes/ericsson/lircd.conf.bte lirc-0.8.6.new/remotes/ericsson/lircd.conf.bte
+--- lirc-0.8.6/remotes/ericsson/lircd.conf.bte	2005-03-25 15:40:25.000000000 -0500
++++ lirc-0.8.6.new/remotes/ericsson/lircd.conf.bte	2009-09-13 21:37:03.000000000 -0400
 @@ -11,29 +11,29 @@
  
  begin remote
@@ -1616,9 +1616,9 @@ diff -Naurp lirc-0.8.6pre2.orig/remotes/ericsson/lircd.conf.bte lirc-0.8.6pre2/r
          WAP             0x3a4f  # ':O'
  
        end codes
-diff -Naurp lirc-0.8.6pre2.orig/remotes/hauppauge/lircd.conf.hauppauge lirc-0.8.6pre2/remotes/hauppauge/lircd.conf.hauppauge
---- lirc-0.8.6pre2.orig/remotes/hauppauge/lircd.conf.hauppauge	2008-06-24 13:01:10.000000000 -0400
-+++ lirc-0.8.6pre2/remotes/hauppauge/lircd.conf.hauppauge	2009-08-29 13:23:31.000000000 -0400
+diff -Naurp lirc-0.8.6/remotes/hauppauge/lircd.conf.hauppauge lirc-0.8.6.new/remotes/hauppauge/lircd.conf.hauppauge
+--- lirc-0.8.6/remotes/hauppauge/lircd.conf.hauppauge	2008-06-24 13:01:10.000000000 -0400
++++ lirc-0.8.6.new/remotes/hauppauge/lircd.conf.hauppauge	2009-09-13 21:37:03.000000000 -0400
 @@ -27,25 +27,25 @@ begin remote
    repeat_bit      2
  
@@ -1662,9 +1662,9 @@ diff -Naurp lirc-0.8.6pre2.orig/remotes/hauppauge/lircd.conf.hauppauge lirc-0.8.
            RESERVED                 0x000000000000101E
            MINIMIZE                 0x0000000000001026
        end codes
-diff -Naurp lirc-0.8.6pre2.orig/remotes/hercules/lircd.conf.smarttv_stereo lirc-0.8.6pre2/remotes/hercules/lircd.conf.smarttv_stereo
---- lirc-0.8.6pre2.orig/remotes/hercules/lircd.conf.smarttv_stereo	2009-08-29 13:23:01.000000000 -0400
-+++ lirc-0.8.6pre2/remotes/hercules/lircd.conf.smarttv_stereo	2009-08-29 13:23:31.000000000 -0400
+diff -Naurp lirc-0.8.6/remotes/hercules/lircd.conf.smarttv_stereo lirc-0.8.6.new/remotes/hercules/lircd.conf.smarttv_stereo
+--- lirc-0.8.6/remotes/hercules/lircd.conf.smarttv_stereo	2009-09-13 22:12:44.000000000 -0400
++++ lirc-0.8.6.new/remotes/hercules/lircd.conf.smarttv_stereo	2009-09-13 21:37:03.000000000 -0400
 @@ -26,36 +26,36 @@ begin remote
  
  
@@ -1725,9 +1725,9 @@ diff -Naurp lirc-0.8.6pre2.orig/remotes/hercules/lircd.conf.smarttv_stereo lirc-
        end codes
  
  end remote
-diff -Naurp lirc-0.8.6pre2.orig/remotes/imon/lircd.conf.imon lirc-0.8.6pre2/remotes/imon/lircd.conf.imon
---- lirc-0.8.6pre2.orig/remotes/imon/lircd.conf.imon	2005-04-16 13:05:49.000000000 -0400
-+++ lirc-0.8.6pre2/remotes/imon/lircd.conf.imon	2009-08-29 13:23:31.000000000 -0400
+diff -Naurp lirc-0.8.6/remotes/imon/lircd.conf.imon lirc-0.8.6.new/remotes/imon/lircd.conf.imon
+--- lirc-0.8.6/remotes/imon/lircd.conf.imon	2005-04-16 13:05:49.000000000 -0400
++++ lirc-0.8.6.new/remotes/imon/lircd.conf.imon	2009-09-13 21:37:03.000000000 -0400
 @@ -29,48 +29,48 @@ begin remote
    duty_cycle   33
  
@@ -1813,9 +1813,9 @@ diff -Naurp lirc-0.8.6pre2.orig/remotes/imon/lircd.conf.imon lirc-0.8.6pre2/remo
            DVD.Caption              0x00000000000052AD
            DVD.Language             0x000000000000D22D
            Full.Screen              0x00000000000032CD
-diff -Naurp lirc-0.8.6pre2.orig/remotes/imon/lircd.conf.imon-knob lirc-0.8.6pre2/remotes/imon/lircd.conf.imon-knob
---- lirc-0.8.6pre2.orig/remotes/imon/lircd.conf.imon-knob	2008-06-12 15:32:33.000000000 -0400
-+++ lirc-0.8.6pre2/remotes/imon/lircd.conf.imon-knob	2009-08-29 13:23:31.000000000 -0400
+diff -Naurp lirc-0.8.6/remotes/imon/lircd.conf.imon-knob lirc-0.8.6.new/remotes/imon/lircd.conf.imon-knob
+--- lirc-0.8.6/remotes/imon/lircd.conf.imon-knob	2008-06-12 15:32:33.000000000 -0400
++++ lirc-0.8.6.new/remotes/imon/lircd.conf.imon-knob	2009-09-13 21:37:03.000000000 -0400
 @@ -23,74 +23,67 @@ begin remote
  
  
@@ -1940,18 +1940,19 @@ diff -Naurp lirc-0.8.6pre2.orig/remotes/imon/lircd.conf.imon-knob lirc-0.8.6pre2
        end codes
  
  end remote
-diff -Naurp lirc-0.8.6pre2.orig/remotes/imon/lircd.conf.imon-pad lirc-0.8.6pre2/remotes/imon/lircd.conf.imon-pad
---- lirc-0.8.6pre2.orig/remotes/imon/lircd.conf.imon-pad	2009-06-03 15:13:42.000000000 -0400
-+++ lirc-0.8.6pre2/remotes/imon/lircd.conf.imon-pad	2009-08-29 13:23:31.000000000 -0400
-@@ -24,96 +24,96 @@ begin remote
+diff -Naurp lirc-0.8.6/remotes/imon/lircd.conf.imon-pad lirc-0.8.6.new/remotes/imon/lircd.conf.imon-pad
+--- lirc-0.8.6/remotes/imon/lircd.conf.imon-pad	2009-09-03 10:33:19.000000000 -0400
++++ lirc-0.8.6.new/remotes/imon/lircd.conf.imon-pad	2009-09-13 22:12:32.000000000 -0400
+@@ -24,99 +24,99 @@ begin remote
  
  
        begin codes
 -          AppExit                  0x288195B7
-+          KEY_EXIT                 0x288195B7
-           Power                    0x289115B7
+-          Power                    0x289115B7
 -          Record                   0x298115B7
 -          Play                     0x2A8115B7
++          KEY_EXIT                 0x288195B7
++          KEY_POWER                0x289115B7
 +          KEY_RECORD               0x298115B7
 +          KEY_PLAY                 0x2A8115B7
            SlowMotion               0x29B195B7
@@ -1962,7 +1963,6 @@ diff -Naurp lirc-0.8.6pre2.orig/remotes/imon/lircd.conf.imon-pad lirc-0.8.6pre2/
 -          Stop                     0x2B9715B7
 -          NextChapter              0x298195B7
 -          Esc                      0x2BB715B7
--          Eject                    0x299395B7
 +          KEY_REWIND               0x2A8195B7
 +          KEY_PAUSE                0x2A9115B7
 +          KEY_FASTFORWARD          0x2B8115B7
@@ -1970,7 +1970,7 @@ diff -Naurp lirc-0.8.6pre2.orig/remotes/imon/lircd.conf.imon-pad lirc-0.8.6pre2/
 +          KEY_STOP                 0x2B9715B7
 +          KEY_NEXT                 0x298195B7
 +          KEY_ESC                  0x2BB715B7
-+          KEY_EJECTCD              0x299395B7
+           Eject                    0x299395B7
            AppLauncher              0x29B715B7
            MultiMon                 0x2AB195B7
            TaskSwitcher             0x2A9395B7
@@ -2009,12 +2009,13 @@ diff -Naurp lirc-0.8.6pre2.orig/remotes/imon/lircd.conf.imon-pad lirc-0.8.6pre2/
 -          Tab                      0x29A115B7
 -          MyMovie                  0x2B8515B7
 -          MyMusic                  0x299195B7
+-          MyPhoto                  0x2BA115B7
+-          MyTV                     0x28A515B7
+-          Bookmark                 0x288515B7
 +          KEY_TAB                  0x29A115B7
 +          KEY_VIDEO                0x2B8515B7
 +          KEY_AUDIO                0x299195B7
-           MyPhoto                  0x2BA115B7
--          MyTV                     0x28A515B7
--          Bookmark                 0x288515B7
++          KEY_PHOTO                0x2BA115B7
 +          KEY_TV                   0x28A515B7
 +          KEY_BOOKMARKS            0x288515B7
            Thumbnail                0x2AB715B7
@@ -2081,8 +2082,9 @@ diff -Naurp lirc-0.8.6pre2.orig/remotes/imon/lircd.conf.imon-pad lirc-0.8.6pre2/
 +          KEY_0                    0x02000027
            Hash                     0x02200020
 -          Backspace                0x0200002A
+-          Select                   0x0200002C
 +          KEY_BACKSPACE            0x0200002A
-           Select                   0x0200002C
++          KEY_SELECT               0x0200002C
            LeftMenu                 0x02800000
            RightMenu                0x02000065
 -          Enter                    0x02000028
@@ -2101,12 +2103,192 @@ diff -Naurp lirc-0.8.6pre2.orig/remotes/imon/lircd.conf.imon-pad lirc-0.8.6pre2/
 +          KEY_DOWN                 0x01007F00
 +          KEY_LEFT                 0x01000080
 +          KEY_RIGHT                0x0100007F
+ # Variations on the mouse buttons from Jan Schneider
+-          LeftClick                0x01010080
+-          RightClick               0x01020080
++          BTN_LEFT                 0x01010080
++          BTN_RIGHT                0x01020080
  
        end codes
  
-diff -Naurp lirc-0.8.6pre2.orig/remotes/imon/lircd.conf.imon-rsc lirc-0.8.6pre2/remotes/imon/lircd.conf.imon-rsc
---- lirc-0.8.6pre2.orig/remotes/imon/lircd.conf.imon-rsc	2007-02-18 03:36:27.000000000 -0500
-+++ lirc-0.8.6pre2/remotes/imon/lircd.conf.imon-rsc	2009-08-29 13:23:31.000000000 -0400
+@@ -170,7 +170,7 @@ end remote
+ 
+ begin remote
+ 
+-  name     iMON-PAD
++  name   iMON-PAD64
+   bits           64
+   eps            30
+   aeps          100
+@@ -182,98 +182,98 @@ begin remote
+   ignore_mask 0x00000000FFFFFFFF
+ 
+       begin codes
+-          AppExit                  0x288195B700002401
+-          Power                    0x289115B700002401
+-          Record                   0x298115B700002401
+-          Play                     0x2A8115B700002401
++          KEY_EXIT                 0x288195B700002401
++          KEY_POWER                0x289115B700002401
++          KEY_RECORD               0x298115B700002401
++          KEY_PLAY                 0x2A8115B700002401
+           SlowMotion               0x29B195B700002401
+-          Rewind                   0x2A8195B700002401
+-          Pause                    0x2A9115B700002401
+-          FastForward              0x2B8115B700002401
+-          PrevChapter              0x2B9115B700002401
+-          Stop                     0x2B9715B700002401
+-          NextChapter              0x298195B700002401
+-          Esc                      0x2BB715B700002401
+-          Eject                    0x299395B700002401
++          KEY_REWIND               0x2A8195B700002401
++          KEY_PAUSE                0x2A9115B700002401
++          KEY_FASTFORWARD          0x2B8115B700002401
++          KEY_PREVIOUS             0x2B9115B700002401
++          KEY_STOP                 0x2B9715B700002401
++          KEY_NEXT                 0x298195B700002401
++          KEY_ESC                  0x2BB715B700002401
++          KEY_EJECT                0x299395B700002401
+           AppLauncher              0x29B715B700002401
+           MultiMon                 0x2AB195B700002401
+           TaskSwitcher             0x2A9395B700002401
+-          Mute                     0x2B9595B700002401
+-          Vol+                     0x28A395B700002401
+-          Vol-                     0x28A595B700002401
+-          Ch+                      0x289395B700002401
+-          Ch-                      0x288795B700002401
++          KEY_MUTE                 0x2B9595B700002401
++          KEY_VOLUMEUP             0x28A395B700002401
++          KEY_VOLUMEDOWN           0x28A595B700002401
++          KEY_CHANNELUP            0x289395B700002401
++          KEY_CHANNELDOWN          0x288795B700002401
+           Timer                    0x2B8395B700002401
+-          1                        0x28B595B700002401
+-          2                        0x2BB195B700002401
+-          3                        0x28B195B700002401
+-          4                        0x2A8595B700002401
+-          5                        0x299595B700002401
+-          6                        0x2AA595B700002401
+-          7                        0x2B9395B700002401
+-          8                        0x2A8515B700002401
+-          9                        0x2AA115B700002401
+-          0                        0x2BA595B700002401
++          KEY_1                    0x28B595B700002401
++          KEY_2                    0x2BB195B700002401
++          KEY_3                    0x28B195B700002401
++          KEY_4                    0x2A8595B700002401
++          KEY_5                    0x299595B700002401
++          KEY_6                    0x2AA595B700002401
++          KEY_7                    0x2B9395B700002401
++          KEY_8                    0x2A8515B700002401
++          KEY_9                    0x2AA115B700002401
++          KEY_0                    0x2BA595B700002401
+           ShiftTab                 0x28B515B700002401
+-          Tab                      0x29A115B700002401
+-          MyMovie                  0x2B8515B700002401
+-          MyMusic                  0x299195B700002401
+-          MyPhoto                  0x2BA115B700002401
+-          MyTV                     0x28A515B700002401
+-          Bookmark                 0x288515B700002401
++          KEY_TAB                  0x29A115B700002401
++          KEY_VIDEO                0x2B8515B700002401
++          KEY_AUDIO                0x299195B700002401
++          KEY_PHOTO                0x2BA115B700002401
++          KEY_TV                   0x28A515B700002401
++          KEY_BOOKMARKS            0x288515B700002401
+           Thumbnail                0x2AB715B700002401
+           AspectRatio              0x29A595B700002401
+           FullScreen               0x2AA395B700002401
+ 
+-          MyDVD                    0x29A295B700002401
+-          Menu                     0x2BA385B700002401
++          KEY_DVD                  0x29A295B700002401
++          KEY_MENU                 0x2BA385B700002401
+ # different codes
+ # These codes are the button release codes, which will cause duplicate
+ # events, so they are commented out here.
+-#          MyDVD                    0x29A3D5B700002401
+-#          Menu                     0x2BA3D5B700002401
++#          KEY_DVD                  0x29A3D5B700002401
++#          KEY_MENU                 0x2BA3D5B700002401
+ 
+           Caption                  0x298595B700002401
+-          Language                 0x2B8595B700002401
++          KEY_LANGUAGE             0x2B8595B700002401
+           MouseKeyboard            0x299115B700002401
+           SelectSpace              0x2A9315B700002401
+           MouseMenu                0x28B715B700002401
+-          MouseRightClick          0x688481B700002401
+-          Enter                    0x28A195B700002401
+-          MouseLeftClick           0x688301B700002401
++          BTN_RIGHT                0x688481B700002401
++          KEY_ENTER                0x28A195B700002401
++          BTN_LEFT                 0x688301B700002401
+           WindowsKey               0x2B8195B700002401
+-          Backspace                0x28A115B700002401
++          KEY_BACKSPACE            0x28A115B700002401
+ # Corrin added
+-          Space                    0x2B9B15F700002401
+-          Up                       0xEB53F9B700002401
+-          Left                     0x6ABAFFBF00002401
+-          Down                     0x6F9ECBB700002401
+-          Right                    0x69A281B700002401
++          KEY_SPACE                0x2B9B15F700002401
++          KEY_UP                   0xEB53F9B700002401
++          KEY_LEFT                 0x6ABAFFBF00002401
++          KEY_DOWN                 0x6F9ECBB700002401
++          KEY_RIGHT                0x69A281B700002401
+ # Variants and additions of keys reported by Ryan Gardner
+-          1                        0x0200001E00000000
+-          2                        0x0200001F00000000
+-          3                        0x0200002000000000
+-          4                        0x0200002100000000
+-          5                        0x0200002200000000
+-          6                        0x0200002300000000
+-          7                        0x0200002400000000
+-          8                        0x0200002500000000
+-          9                        0x0200002600000000
++          KEY_1                    0x0200001E00000000
++          KEY_2                    0x0200001F00000000
++          KEY_3                    0x0200002000000000
++          KEY_4                    0x0200002100000000
++          KEY_5                    0x0200002200000000
++          KEY_6                    0x0200002300000000
++          KEY_7                    0x0200002400000000
++          KEY_8                    0x0200002500000000
++          KEY_9                    0x0200002600000000
+           Star                     0x0220002500000000
+-          0                        0x0200002700000000
++          KEY_0                    0x0200002700000000
+           Hash                     0x0220002000000000
+-          Backspace                0x0200002A00000000
+-          Select                   0x0200002C00000000
++          KEY_BACKSPACE            0x0200002A00000000
++          KEY_SELECT               0x0200002C00000000
+           LeftMenu                 0x0280000000000000
+           RightMenu                0x0200006500000000
+-          Enter                    0x0200002800000000
+-          Escape                   0x0200002900000000
+-          LeftClick                0x0101000000000000
+-          RightClick               0x0102000000000000
+-          Up                       0x0100800000000000
+-          Down                     0x01007F0000000000
+-          Left                     0x0100008000000000
+-          Right                    0x0100007F00000000
++          KEY_ENTER                0x0200002800000000
++          KEY_ESC                  0x0200002900000000
++          BTN_LEFT                 0x0101000000000000
++          BTN_RIGHT                0x0102000000000000
++          KEY_UP                   0x0100800000000000
++          KEY_DOWN                 0x01007F0000000000
++          KEY_LEFT                 0x0100008000000000
++          KEY_RIGHT                0x0100007F00000000
+       end codes
+ 
+ end remote
+diff -Naurp lirc-0.8.6/remotes/imon/lircd.conf.imon-rsc lirc-0.8.6.new/remotes/imon/lircd.conf.imon-rsc
+--- lirc-0.8.6/remotes/imon/lircd.conf.imon-rsc	2007-02-18 03:36:27.000000000 -0500
++++ lirc-0.8.6.new/remotes/imon/lircd.conf.imon-rsc	2009-09-13 21:37:03.000000000 -0400
 @@ -27,48 +27,48 @@ begin remote
    gap          100000
  
@@ -2188,9 +2370,9 @@ diff -Naurp lirc-0.8.6pre2.orig/remotes/imon/lircd.conf.imon-rsc lirc-0.8.6pre2/
            Full.Screen        0x000000000000916e
        end codes
  
-diff -Naurp lirc-0.8.6pre2.orig/remotes/iodata/lircd.conf.gvbctv5pci lirc-0.8.6pre2/remotes/iodata/lircd.conf.gvbctv5pci
---- lirc-0.8.6pre2.orig/remotes/iodata/lircd.conf.gvbctv5pci	2003-06-07 18:00:12.000000000 -0400
-+++ lirc-0.8.6pre2/remotes/iodata/lircd.conf.gvbctv5pci	2009-08-29 13:23:31.000000000 -0400
+diff -Naurp lirc-0.8.6/remotes/iodata/lircd.conf.gvbctv5pci lirc-0.8.6.new/remotes/iodata/lircd.conf.gvbctv5pci
+--- lirc-0.8.6/remotes/iodata/lircd.conf.gvbctv5pci	2003-06-07 18:00:12.000000000 -0400
++++ lirc-0.8.6.new/remotes/iodata/lircd.conf.gvbctv5pci	2009-09-13 21:37:03.000000000 -0400
 @@ -26,41 +26,41 @@ begin remote
  
  
@@ -2260,9 +2442,9 @@ diff -Naurp lirc-0.8.6pre2.orig/remotes/iodata/lircd.conf.gvbctv5pci lirc-0.8.6p
            SYNC                     0x0000000000000003
        end codes
  
-diff -Naurp lirc-0.8.6pre2.orig/remotes/kanam_accent/lircd.conf.IR-100 lirc-0.8.6pre2/remotes/kanam_accent/lircd.conf.IR-100
---- lirc-0.8.6pre2.orig/remotes/kanam_accent/lircd.conf.IR-100	2007-02-12 23:18:53.000000000 -0500
-+++ lirc-0.8.6pre2/remotes/kanam_accent/lircd.conf.IR-100	2009-08-29 13:23:31.000000000 -0400
+diff -Naurp lirc-0.8.6/remotes/kanam_accent/lircd.conf.IR-100 lirc-0.8.6.new/remotes/kanam_accent/lircd.conf.IR-100
+--- lirc-0.8.6/remotes/kanam_accent/lircd.conf.IR-100	2007-02-12 23:18:53.000000000 -0500
++++ lirc-0.8.6.new/remotes/kanam_accent/lircd.conf.IR-100	2009-09-13 21:37:03.000000000 -0400
 @@ -29,47 +29,47 @@ begin remote
  
  
@@ -2352,9 +2534,9 @@ diff -Naurp lirc-0.8.6pre2.orig/remotes/kanam_accent/lircd.conf.IR-100 lirc-0.8.
        end codes
  
  end remote
-diff -Naurp lirc-0.8.6pre2.orig/remotes/knc_one/lircd.conf.knc_one lirc-0.8.6pre2/remotes/knc_one/lircd.conf.knc_one
---- lirc-0.8.6pre2.orig/remotes/knc_one/lircd.conf.knc_one	2001-04-24 17:20:41.000000000 -0400
-+++ lirc-0.8.6pre2/remotes/knc_one/lircd.conf.knc_one	2009-08-29 13:23:31.000000000 -0400
+diff -Naurp lirc-0.8.6/remotes/knc_one/lircd.conf.knc_one lirc-0.8.6.new/remotes/knc_one/lircd.conf.knc_one
+--- lirc-0.8.6/remotes/knc_one/lircd.conf.knc_one	2001-04-24 17:20:41.000000000 -0400
++++ lirc-0.8.6.new/remotes/knc_one/lircd.conf.knc_one	2009-09-13 21:37:03.000000000 -0400
 @@ -26,37 +26,37 @@ begin remote
  
        begin codes
@@ -2419,9 +2601,9 @@ diff -Naurp lirc-0.8.6pre2.orig/remotes/knc_one/lircd.conf.knc_one lirc-0.8.6pre
        end codes
  
  end remote
-diff -Naurp lirc-0.8.6pre2.orig/remotes/kworld/lircd.conf.kworld lirc-0.8.6pre2/remotes/kworld/lircd.conf.kworld
---- lirc-0.8.6pre2.orig/remotes/kworld/lircd.conf.kworld	2005-04-01 15:28:05.000000000 -0500
-+++ lirc-0.8.6pre2/remotes/kworld/lircd.conf.kworld	2009-08-29 13:23:31.000000000 -0400
+diff -Naurp lirc-0.8.6/remotes/kworld/lircd.conf.kworld lirc-0.8.6.new/remotes/kworld/lircd.conf.kworld
+--- lirc-0.8.6/remotes/kworld/lircd.conf.kworld	2005-04-01 15:28:05.000000000 -0500
++++ lirc-0.8.6.new/remotes/kworld/lircd.conf.kworld	2009-09-13 21:37:03.000000000 -0400
 @@ -29,36 +29,36 @@ begin remote
  
  
@@ -2480,9 +2662,9 @@ diff -Naurp lirc-0.8.6pre2.orig/remotes/kworld/lircd.conf.kworld lirc-0.8.6pre2/
            snapshot                 0x00000000000058A7
            mts                      0x000000000000B04F
            function-                0x00000000000020DF
-diff -Naurp lirc-0.8.6pre2.orig/remotes/leadtek/lircd.conf.PVR2000 lirc-0.8.6pre2/remotes/leadtek/lircd.conf.PVR2000
---- lirc-0.8.6pre2.orig/remotes/leadtek/lircd.conf.PVR2000	2006-12-19 01:02:58.000000000 -0500
-+++ lirc-0.8.6pre2/remotes/leadtek/lircd.conf.PVR2000	2009-08-29 13:23:31.000000000 -0400
+diff -Naurp lirc-0.8.6/remotes/leadtek/lircd.conf.PVR2000 lirc-0.8.6.new/remotes/leadtek/lircd.conf.PVR2000
+--- lirc-0.8.6/remotes/leadtek/lircd.conf.PVR2000	2006-12-19 01:02:58.000000000 -0500
++++ lirc-0.8.6.new/remotes/leadtek/lircd.conf.PVR2000	2009-09-13 21:37:03.000000000 -0400
 @@ -18,54 +18,54 @@ begin remote
    gap       120000
  
@@ -2575,9 +2757,9 @@ diff -Naurp lirc-0.8.6pre2.orig/remotes/leadtek/lircd.conf.PVR2000 lirc-0.8.6pre
            TIMESHIFT                0x0000000000000035
  
        end codes
-diff -Naurp lirc-0.8.6pre2.orig/remotes/leadtek/lircd.conf.RM-0007 lirc-0.8.6pre2/remotes/leadtek/lircd.conf.RM-0007
---- lirc-0.8.6pre2.orig/remotes/leadtek/lircd.conf.RM-0007	2002-11-09 17:34:23.000000000 -0500
-+++ lirc-0.8.6pre2/remotes/leadtek/lircd.conf.RM-0007	2009-08-29 13:23:31.000000000 -0400
+diff -Naurp lirc-0.8.6/remotes/leadtek/lircd.conf.RM-0007 lirc-0.8.6.new/remotes/leadtek/lircd.conf.RM-0007
+--- lirc-0.8.6/remotes/leadtek/lircd.conf.RM-0007	2002-11-09 17:34:23.000000000 -0500
++++ lirc-0.8.6.new/remotes/leadtek/lircd.conf.RM-0007	2009-09-13 21:37:03.000000000 -0400
 @@ -44,43 +44,43 @@ begin remote
  
        begin codes
@@ -2647,9 +2829,9 @@ diff -Naurp lirc-0.8.6pre2.orig/remotes/leadtek/lircd.conf.RM-0007 lirc-0.8.6pre
        end codes
  
  end remote
-diff -Naurp lirc-0.8.6pre2.orig/remotes/leadtek/lircd.conf.RM-0010 lirc-0.8.6pre2/remotes/leadtek/lircd.conf.RM-0010
---- lirc-0.8.6pre2.orig/remotes/leadtek/lircd.conf.RM-0010	2006-03-21 02:11:14.000000000 -0500
-+++ lirc-0.8.6pre2/remotes/leadtek/lircd.conf.RM-0010	2009-08-29 13:23:31.000000000 -0400
+diff -Naurp lirc-0.8.6/remotes/leadtek/lircd.conf.RM-0010 lirc-0.8.6.new/remotes/leadtek/lircd.conf.RM-0010
+--- lirc-0.8.6/remotes/leadtek/lircd.conf.RM-0010	2006-03-21 02:11:14.000000000 -0500
++++ lirc-0.8.6.new/remotes/leadtek/lircd.conf.RM-0010	2009-09-13 21:37:03.000000000 -0400
 @@ -43,69 +43,69 @@ begin remote
    duty_cycle   33
  
@@ -2759,9 +2941,9 @@ diff -Naurp lirc-0.8.6pre2.orig/remotes/leadtek/lircd.conf.RM-0010 lirc-0.8.6pre
        end codes
  
  end remote
-diff -Naurp lirc-0.8.6pre2.orig/remotes/life-view/lircd.conf.flyvideo lirc-0.8.6pre2/remotes/life-view/lircd.conf.flyvideo
---- lirc-0.8.6pre2.orig/remotes/life-view/lircd.conf.flyvideo	2002-11-09 17:31:38.000000000 -0500
-+++ lirc-0.8.6pre2/remotes/life-view/lircd.conf.flyvideo	2009-08-29 13:23:31.000000000 -0400
+diff -Naurp lirc-0.8.6/remotes/life-view/lircd.conf.flyvideo lirc-0.8.6.new/remotes/life-view/lircd.conf.flyvideo
+--- lirc-0.8.6/remotes/life-view/lircd.conf.flyvideo	2002-11-09 17:31:38.000000000 -0500
++++ lirc-0.8.6.new/remotes/life-view/lircd.conf.flyvideo	2009-09-13 21:37:03.000000000 -0400
 @@ -35,50 +35,50 @@ begin remote
    duty_cycle   33
  
@@ -2842,9 +3024,9 @@ diff -Naurp lirc-0.8.6pre2.orig/remotes/life-view/lircd.conf.flyvideo lirc-0.8.6
   
        end codes
  
-diff -Naurp lirc-0.8.6pre2.orig/remotes/logitech/lircd.conf.logitech lirc-0.8.6pre2/remotes/logitech/lircd.conf.logitech
---- lirc-0.8.6pre2.orig/remotes/logitech/lircd.conf.logitech	2000-01-18 14:10:08.000000000 -0500
-+++ lirc-0.8.6pre2/remotes/logitech/lircd.conf.logitech	2009-08-29 13:23:31.000000000 -0400
+diff -Naurp lirc-0.8.6/remotes/logitech/lircd.conf.logitech lirc-0.8.6.new/remotes/logitech/lircd.conf.logitech
+--- lirc-0.8.6/remotes/logitech/lircd.conf.logitech	2000-01-18 14:10:08.000000000 -0500
++++ lirc-0.8.6.new/remotes/logitech/lircd.conf.logitech	2009-09-13 21:37:03.000000000 -0400
 @@ -23,41 +23,41 @@ begin remote
    repeat_bit      0
  
@@ -2914,9 +3096,9 @@ diff -Naurp lirc-0.8.6pre2.orig/remotes/logitech/lircd.conf.logitech lirc-0.8.6p
            MOUSE_N		   0x0000000000000040
            MOUSE_NNE		   0x0000000000000041
            MOUSE_NE		   0x0000000000000042
-diff -Naurp lirc-0.8.6pre2.orig/remotes/mceusb/lircd.conf.mceusb lirc-0.8.6pre2/remotes/mceusb/lircd.conf.mceusb
---- lirc-0.8.6pre2.orig/remotes/mceusb/lircd.conf.mceusb	2009-07-16 16:44:45.000000000 -0400
-+++ lirc-0.8.6pre2/remotes/mceusb/lircd.conf.mceusb	2009-08-29 13:23:31.000000000 -0400
+diff -Naurp lirc-0.8.6/remotes/mceusb/lircd.conf.mceusb lirc-0.8.6.new/remotes/mceusb/lircd.conf.mceusb
+--- lirc-0.8.6/remotes/mceusb/lircd.conf.mceusb	2009-07-16 16:44:45.000000000 -0400
++++ lirc-0.8.6.new/remotes/mceusb/lircd.conf.mceusb	2009-09-13 21:37:03.000000000 -0400
 @@ -1,7 +1,8 @@
  #
 -# brand:                        HP 
@@ -3062,9 +3244,9 @@ diff -Naurp lirc-0.8.6pre2.orig/remotes/mceusb/lircd.conf.mceusb lirc-0.8.6pre2/
        end codes
  
  end remote
-diff -Naurp lirc-0.8.6pre2.orig/remotes/packard_bell/lircd.conf.packard_bell lirc-0.8.6pre2/remotes/packard_bell/lircd.conf.packard_bell
---- lirc-0.8.6pre2.orig/remotes/packard_bell/lircd.conf.packard_bell	2001-04-24 15:26:56.000000000 -0400
-+++ lirc-0.8.6pre2/remotes/packard_bell/lircd.conf.packard_bell	2009-08-29 13:23:31.000000000 -0400
+diff -Naurp lirc-0.8.6/remotes/packard_bell/lircd.conf.packard_bell lirc-0.8.6.new/remotes/packard_bell/lircd.conf.packard_bell
+--- lirc-0.8.6/remotes/packard_bell/lircd.conf.packard_bell	2001-04-24 15:26:56.000000000 -0400
++++ lirc-0.8.6.new/remotes/packard_bell/lircd.conf.packard_bell	2009-09-13 21:37:03.000000000 -0400
 @@ -53,38 +53,38 @@ begin remote
    repeat          9050 2250
   
@@ -3129,9 +3311,9 @@ diff -Naurp lirc-0.8.6pre2.orig/remotes/packard_bell/lircd.conf.packard_bell lir
            Star                     0x0000000000007F80
            Hash                     0x0000000000006B94
        end codes
-diff -Naurp lirc-0.8.6pre2.orig/remotes/pcmak/lircd.conf.pcmak lirc-0.8.6pre2/remotes/pcmak/lircd.conf.pcmak
---- lirc-0.8.6pre2.orig/remotes/pcmak/lircd.conf.pcmak	2004-07-24 11:36:15.000000000 -0400
-+++ lirc-0.8.6pre2/remotes/pcmak/lircd.conf.pcmak	2009-08-29 13:23:31.000000000 -0400
+diff -Naurp lirc-0.8.6/remotes/pcmak/lircd.conf.pcmak lirc-0.8.6.new/remotes/pcmak/lircd.conf.pcmak
+--- lirc-0.8.6/remotes/pcmak/lircd.conf.pcmak	2004-07-24 11:36:15.000000000 -0400
++++ lirc-0.8.6.new/remotes/pcmak/lircd.conf.pcmak	2009-09-13 21:37:03.000000000 -0400
 @@ -23,18 +23,18 @@ begin remote
    repeat_bit      0
  
@@ -3275,9 +3457,9 @@ diff -Naurp lirc-0.8.6pre2.orig/remotes/pcmak/lircd.conf.pcmak lirc-0.8.6pre2/re
        end codes
  
  end remote
-diff -Naurp lirc-0.8.6pre2.orig/remotes/pinnacle_systems/lircd.conf.pctv lirc-0.8.6pre2/remotes/pinnacle_systems/lircd.conf.pctv
---- lirc-0.8.6pre2.orig/remotes/pinnacle_systems/lircd.conf.pctv	2007-10-06 11:40:53.000000000 -0400
-+++ lirc-0.8.6pre2/remotes/pinnacle_systems/lircd.conf.pctv	2009-08-29 13:23:31.000000000 -0400
+diff -Naurp lirc-0.8.6/remotes/pinnacle_systems/lircd.conf.pctv lirc-0.8.6.new/remotes/pinnacle_systems/lircd.conf.pctv
+--- lirc-0.8.6/remotes/pinnacle_systems/lircd.conf.pctv	2007-10-06 11:40:53.000000000 -0400
++++ lirc-0.8.6.new/remotes/pinnacle_systems/lircd.conf.pctv	2009-09-13 21:37:03.000000000 -0400
 @@ -24,30 +24,30 @@ begin remote
    toggle_bit         0
  
@@ -3377,9 +3559,9 @@ diff -Naurp lirc-0.8.6pre2.orig/remotes/pinnacle_systems/lircd.conf.pctv lirc-0.
            middle                   0x0000000000000014
  
  
-diff -Naurp lirc-0.8.6pre2.orig/remotes/pixelview/lircd.conf.playtv lirc-0.8.6pre2/remotes/pixelview/lircd.conf.playtv
---- lirc-0.8.6pre2.orig/remotes/pixelview/lircd.conf.playtv	1999-08-04 15:18:27.000000000 -0400
-+++ lirc-0.8.6pre2/remotes/pixelview/lircd.conf.playtv	2009-08-29 13:23:31.000000000 -0400
+diff -Naurp lirc-0.8.6/remotes/pixelview/lircd.conf.playtv lirc-0.8.6.new/remotes/pixelview/lircd.conf.playtv
+--- lirc-0.8.6/remotes/pixelview/lircd.conf.playtv	1999-08-04 15:18:27.000000000 -0400
++++ lirc-0.8.6.new/remotes/pixelview/lircd.conf.playtv	2009-09-13 21:37:03.000000000 -0400
 @@ -13,22 +13,22 @@ begin remote
    begin codes
      TV/FM                    0x00000000000000e7
@@ -3418,9 +3600,9 @@ diff -Naurp lirc-0.8.6pre2.orig/remotes/pixelview/lircd.conf.playtv lirc-0.8.6pr
    end codes
  end remote
  
-diff -Naurp lirc-0.8.6pre2.orig/remotes/pixelview/lircd.conf.playtv_bt878 lirc-0.8.6pre2/remotes/pixelview/lircd.conf.playtv_bt878
---- lirc-0.8.6pre2.orig/remotes/pixelview/lircd.conf.playtv_bt878	2000-09-30 15:32:40.000000000 -0400
-+++ lirc-0.8.6pre2/remotes/pixelview/lircd.conf.playtv_bt878	2009-08-29 13:23:31.000000000 -0400
+diff -Naurp lirc-0.8.6/remotes/pixelview/lircd.conf.playtv_bt878 lirc-0.8.6.new/remotes/pixelview/lircd.conf.playtv_bt878
+--- lirc-0.8.6/remotes/pixelview/lircd.conf.playtv_bt878	2000-09-30 15:32:40.000000000 -0400
++++ lirc-0.8.6.new/remotes/pixelview/lircd.conf.playtv_bt878	2009-09-13 21:37:03.000000000 -0400
 @@ -16,39 +16,39 @@ begin remote
    repeat_bit 0
  
@@ -3487,9 +3669,9 @@ diff -Naurp lirc-0.8.6pre2.orig/remotes/pixelview/lircd.conf.playtv_bt878 lirc-0
    end codes
  end remote
  
-diff -Naurp lirc-0.8.6pre2.orig/remotes/pixelview/lircd.conf.playtv_pro lirc-0.8.6pre2/remotes/pixelview/lircd.conf.playtv_pro
---- lirc-0.8.6pre2.orig/remotes/pixelview/lircd.conf.playtv_pro	2005-12-10 08:09:13.000000000 -0500
-+++ lirc-0.8.6pre2/remotes/pixelview/lircd.conf.playtv_pro	2009-08-29 13:23:31.000000000 -0400
+diff -Naurp lirc-0.8.6/remotes/pixelview/lircd.conf.playtv_pro lirc-0.8.6.new/remotes/pixelview/lircd.conf.playtv_pro
+--- lirc-0.8.6/remotes/pixelview/lircd.conf.playtv_pro	2005-12-10 08:09:13.000000000 -0500
++++ lirc-0.8.6.new/remotes/pixelview/lircd.conf.playtv_pro	2009-09-13 21:37:03.000000000 -0400
 @@ -31,15 +31,15 @@ begin remote
  
        begin codes
@@ -3540,9 +3722,9 @@ diff -Naurp lirc-0.8.6pre2.orig/remotes/pixelview/lircd.conf.playtv_pro lirc-0.8
  
        end codes
  
-diff -Naurp lirc-0.8.6pre2.orig/remotes/pixelview/lircd.conf.remotemaster lirc-0.8.6pre2/remotes/pixelview/lircd.conf.remotemaster
---- lirc-0.8.6pre2.orig/remotes/pixelview/lircd.conf.remotemaster	2000-02-07 06:03:20.000000000 -0500
-+++ lirc-0.8.6pre2/remotes/pixelview/lircd.conf.remotemaster	2009-08-29 13:23:31.000000000 -0400
+diff -Naurp lirc-0.8.6/remotes/pixelview/lircd.conf.remotemaster lirc-0.8.6.new/remotes/pixelview/lircd.conf.remotemaster
+--- lirc-0.8.6/remotes/pixelview/lircd.conf.remotemaster	2000-02-07 06:03:20.000000000 -0500
++++ lirc-0.8.6.new/remotes/pixelview/lircd.conf.remotemaster	2009-09-13 21:37:03.000000000 -0400
 @@ -25,39 +25,39 @@ begin remote
    gap          189264
  
@@ -3610,9 +3792,9 @@ diff -Naurp lirc-0.8.6pre2.orig/remotes/pixelview/lircd.conf.remotemaster lirc-0
        end codes
  
  end remote
-diff -Naurp lirc-0.8.6pre2.orig/remotes/provideo/lircd.conf.pv951 lirc-0.8.6pre2/remotes/provideo/lircd.conf.pv951
---- lirc-0.8.6pre2.orig/remotes/provideo/lircd.conf.pv951	2001-01-20 08:32:00.000000000 -0500
-+++ lirc-0.8.6pre2/remotes/provideo/lircd.conf.pv951	2009-08-29 13:23:31.000000000 -0400
+diff -Naurp lirc-0.8.6/remotes/provideo/lircd.conf.pv951 lirc-0.8.6.new/remotes/provideo/lircd.conf.pv951
+--- lirc-0.8.6/remotes/provideo/lircd.conf.pv951	2001-01-20 08:32:00.000000000 -0500
++++ lirc-0.8.6.new/remotes/provideo/lircd.conf.pv951	2009-09-13 21:37:03.000000000 -0400
 @@ -31,28 +31,28 @@ begin remote
    repeat_bit      0
  
@@ -3658,9 +3840,9 @@ diff -Naurp lirc-0.8.6pre2.orig/remotes/provideo/lircd.conf.pv951 lirc-0.8.6pre2
            func                     0x0000000000009867
            ttx                      0x000000000000B04F
            pg+                      0x000000000000708F
-diff -Naurp lirc-0.8.6pre2.orig/remotes/remotec/lircd.conf.BW6130 lirc-0.8.6pre2/remotes/remotec/lircd.conf.BW6130
---- lirc-0.8.6pre2.orig/remotes/remotec/lircd.conf.BW6130	2005-05-28 10:29:27.000000000 -0400
-+++ lirc-0.8.6pre2/remotes/remotec/lircd.conf.BW6130	2009-08-29 13:23:31.000000000 -0400
+diff -Naurp lirc-0.8.6/remotes/remotec/lircd.conf.BW6130 lirc-0.8.6.new/remotes/remotec/lircd.conf.BW6130
+--- lirc-0.8.6/remotes/remotec/lircd.conf.BW6130	2005-05-28 10:29:27.000000000 -0400
++++ lirc-0.8.6.new/remotes/remotec/lircd.conf.BW6130	2009-09-13 21:37:03.000000000 -0400
 @@ -20,20 +20,20 @@ begin remote
    toggle_bit     0
  
@@ -3696,9 +3878,9 @@ diff -Naurp lirc-0.8.6pre2.orig/remotes/remotec/lircd.conf.BW6130 lirc-0.8.6pre2
  	MOUSE_SLOW_N		0x95
  	MOUSE_SLOW_NNE		0xd1
  	MOUSE_SLOW_NE		0xcd
-diff -Naurp lirc-0.8.6pre2.orig/remotes/samsung/lircd.conf.samsung lirc-0.8.6pre2/remotes/samsung/lircd.conf.samsung
---- lirc-0.8.6pre2.orig/remotes/samsung/lircd.conf.samsung	2008-10-05 04:42:36.000000000 -0400
-+++ lirc-0.8.6pre2/remotes/samsung/lircd.conf.samsung	2009-08-29 13:23:31.000000000 -0400
+diff -Naurp lirc-0.8.6/remotes/samsung/lircd.conf.samsung lirc-0.8.6.new/remotes/samsung/lircd.conf.samsung
+--- lirc-0.8.6/remotes/samsung/lircd.conf.samsung	2008-10-05 04:42:36.000000000 -0400
++++ lirc-0.8.6.new/remotes/samsung/lircd.conf.samsung	2009-09-13 21:37:03.000000000 -0400
 @@ -28,60 +28,60 @@ begin remote
  
        begin codes
@@ -3809,9 +3991,9 @@ diff -Naurp lirc-0.8.6pre2.orig/remotes/samsung/lircd.conf.samsung lirc-0.8.6pre
        end codes
  
  end remote
-diff -Naurp lirc-0.8.6pre2.orig/remotes/sasem/lircd.conf.sasem lirc-0.8.6pre2/remotes/sasem/lircd.conf.sasem
---- lirc-0.8.6pre2.orig/remotes/sasem/lircd.conf.sasem	2005-07-15 07:24:55.000000000 -0400
-+++ lirc-0.8.6pre2/remotes/sasem/lircd.conf.sasem	2009-08-29 13:23:31.000000000 -0400
+diff -Naurp lirc-0.8.6/remotes/sasem/lircd.conf.sasem lirc-0.8.6.new/remotes/sasem/lircd.conf.sasem
+--- lirc-0.8.6/remotes/sasem/lircd.conf.sasem	2005-07-15 07:24:55.000000000 -0400
++++ lirc-0.8.6.new/remotes/sasem/lircd.conf.sasem	2009-09-13 21:37:03.000000000 -0400
 @@ -33,47 +33,47 @@ begin remote
  
  
@@ -3892,9 +4074,9 @@ diff -Naurp lirc-0.8.6pre2.orig/remotes/sasem/lircd.conf.sasem lirc-0.8.6pre2/re
        end codes
  
  end remote
-diff -Naurp lirc-0.8.6pre2.orig/remotes/sigma_designs/lircd.conf.realmagic lirc-0.8.6pre2/remotes/sigma_designs/lircd.conf.realmagic
---- lirc-0.8.6pre2.orig/remotes/sigma_designs/lircd.conf.realmagic	2006-04-29 07:01:50.000000000 -0400
-+++ lirc-0.8.6pre2/remotes/sigma_designs/lircd.conf.realmagic	2009-08-29 13:23:31.000000000 -0400
+diff -Naurp lirc-0.8.6/remotes/sigma_designs/lircd.conf.realmagic lirc-0.8.6.new/remotes/sigma_designs/lircd.conf.realmagic
+--- lirc-0.8.6/remotes/sigma_designs/lircd.conf.realmagic	2006-04-29 07:01:50.000000000 -0400
++++ lirc-0.8.6.new/remotes/sigma_designs/lircd.conf.realmagic	2009-09-13 21:37:03.000000000 -0400
 @@ -30,43 +30,43 @@ begin remote
  
        begin codes
@@ -3971,9 +4153,9 @@ diff -Naurp lirc-0.8.6pre2.orig/remotes/sigma_designs/lircd.conf.realmagic lirc-
        end codes
  
  end remote
-diff -Naurp lirc-0.8.6pre2.orig/remotes/silitek/lircd.conf.silitek lirc-0.8.6pre2/remotes/silitek/lircd.conf.silitek
---- lirc-0.8.6pre2.orig/remotes/silitek/lircd.conf.silitek	2001-04-24 15:36:10.000000000 -0400
-+++ lirc-0.8.6pre2/remotes/silitek/lircd.conf.silitek	2009-08-29 13:23:31.000000000 -0400
+diff -Naurp lirc-0.8.6/remotes/silitek/lircd.conf.silitek lirc-0.8.6.new/remotes/silitek/lircd.conf.silitek
+--- lirc-0.8.6/remotes/silitek/lircd.conf.silitek	2001-04-24 15:36:10.000000000 -0400
++++ lirc-0.8.6.new/remotes/silitek/lircd.conf.silitek	2009-09-13 21:37:03.000000000 -0400
 @@ -30,68 +30,68 @@ begin remote
      MOUSE_SSE                0x0000000000aa0004
      MOUSE_SE                 0x0000000000aa0003
@@ -4091,9 +4273,9 @@ diff -Naurp lirc-0.8.6pre2.orig/remotes/silitek/lircd.conf.silitek lirc-0.8.6pre
 +    KEY_CLOSE                 0x0000000000cc5d62
    end codes
  end remote
-diff -Naurp lirc-0.8.6pre2.orig/remotes/streamzap/lircd.conf.streamzap lirc-0.8.6pre2/remotes/streamzap/lircd.conf.streamzap
---- lirc-0.8.6pre2.orig/remotes/streamzap/lircd.conf.streamzap	2005-02-12 09:20:23.000000000 -0500
-+++ lirc-0.8.6pre2/remotes/streamzap/lircd.conf.streamzap	2009-08-29 13:23:31.000000000 -0400
+diff -Naurp lirc-0.8.6/remotes/streamzap/lircd.conf.streamzap lirc-0.8.6.new/remotes/streamzap/lircd.conf.streamzap
+--- lirc-0.8.6/remotes/streamzap/lircd.conf.streamzap	2005-02-12 09:20:23.000000000 -0500
++++ lirc-0.8.6.new/remotes/streamzap/lircd.conf.streamzap	2009-09-13 21:37:03.000000000 -0400
 @@ -27,41 +27,41 @@ begin remote
  
  
@@ -4171,9 +4353,9 @@ diff -Naurp lirc-0.8.6pre2.orig/remotes/streamzap/lircd.conf.streamzap lirc-0.8.
        end codes
  
  end remote
-diff -Naurp lirc-0.8.6pre2.orig/remotes/technisat/lircd.conf.mediafocusI lirc-0.8.6pre2/remotes/technisat/lircd.conf.mediafocusI
---- lirc-0.8.6pre2.orig/remotes/technisat/lircd.conf.mediafocusI	2001-02-04 08:38:09.000000000 -0500
-+++ lirc-0.8.6pre2/remotes/technisat/lircd.conf.mediafocusI	2009-08-29 13:23:31.000000000 -0400
+diff -Naurp lirc-0.8.6/remotes/technisat/lircd.conf.mediafocusI lirc-0.8.6.new/remotes/technisat/lircd.conf.mediafocusI
+--- lirc-0.8.6/remotes/technisat/lircd.conf.mediafocusI	2001-02-04 08:38:09.000000000 -0500
++++ lirc-0.8.6.new/remotes/technisat/lircd.conf.mediafocusI	2009-09-13 21:37:03.000000000 -0400
 @@ -30,11 +30,11 @@ begin remote
    duty_cycle   33
  
@@ -4191,9 +4373,9 @@ diff -Naurp lirc-0.8.6pre2.orig/remotes/technisat/lircd.conf.mediafocusI lirc-0.
        end codes
  
  end remote
-diff -Naurp lirc-0.8.6pre2.orig/remotes/tekram/lircd.conf.m230 lirc-0.8.6pre2/remotes/tekram/lircd.conf.m230
---- lirc-0.8.6pre2.orig/remotes/tekram/lircd.conf.m230	2002-03-28 16:26:54.000000000 -0500
-+++ lirc-0.8.6pre2/remotes/tekram/lircd.conf.m230	2009-08-29 13:23:31.000000000 -0400
+diff -Naurp lirc-0.8.6/remotes/tekram/lircd.conf.m230 lirc-0.8.6.new/remotes/tekram/lircd.conf.m230
+--- lirc-0.8.6/remotes/tekram/lircd.conf.m230	2002-03-28 16:26:54.000000000 -0500
++++ lirc-0.8.6.new/remotes/tekram/lircd.conf.m230	2009-09-13 21:37:03.000000000 -0400
 @@ -13,36 +13,36 @@ begin remote
    name  M230
    bits  8
@@ -4254,9 +4436,9 @@ diff -Naurp lirc-0.8.6pre2.orig/remotes/tekram/lircd.conf.m230 lirc-0.8.6pre2/re
 +	KEY_KPMINUS		0x0C
       end codes
  end remote
-diff -Naurp lirc-0.8.6pre2.orig/remotes/vlsystem/lircd.conf.mplay lirc-0.8.6pre2/remotes/vlsystem/lircd.conf.mplay
---- lirc-0.8.6pre2.orig/remotes/vlsystem/lircd.conf.mplay	2007-12-22 07:33:17.000000000 -0500
-+++ lirc-0.8.6pre2/remotes/vlsystem/lircd.conf.mplay	2009-08-29 13:23:31.000000000 -0400
+diff -Naurp lirc-0.8.6/remotes/vlsystem/lircd.conf.mplay lirc-0.8.6.new/remotes/vlsystem/lircd.conf.mplay
+--- lirc-0.8.6/remotes/vlsystem/lircd.conf.mplay	2007-12-22 07:33:17.000000000 -0500
++++ lirc-0.8.6.new/remotes/vlsystem/lircd.conf.mplay	2009-09-13 21:37:03.000000000 -0400
 @@ -22,49 +22,49 @@ begin remote
    toggle_bit_mask 0x0
  
@@ -4350,9 +4532,9 @@ diff -Naurp lirc-0.8.6pre2.orig/remotes/vlsystem/lircd.conf.mplay lirc-0.8.6pre2
        end codes
  
  end remote
-diff -Naurp lirc-0.8.6pre2.orig/remotes/x10/lircd.conf.mouseremote lirc-0.8.6pre2/remotes/x10/lircd.conf.mouseremote
---- lirc-0.8.6pre2.orig/remotes/x10/lircd.conf.mouseremote	2005-01-22 05:40:43.000000000 -0500
-+++ lirc-0.8.6pre2/remotes/x10/lircd.conf.mouseremote	2009-08-29 13:23:31.000000000 -0400
+diff -Naurp lirc-0.8.6/remotes/x10/lircd.conf.mouseremote lirc-0.8.6.new/remotes/x10/lircd.conf.mouseremote
+--- lirc-0.8.6/remotes/x10/lircd.conf.mouseremote	2005-01-22 05:40:43.000000000 -0500
++++ lirc-0.8.6.new/remotes/x10/lircd.conf.mouseremote	2009-09-13 21:37:03.000000000 -0400
 @@ -24,42 +24,42 @@ begin remote
    gap		140000
  
@@ -4435,9 +4617,9 @@ diff -Naurp lirc-0.8.6pre2.orig/remotes/x10/lircd.conf.mouseremote lirc-0.8.6pre
  	end codes	
  
  end remote
-diff -Naurp lirc-0.8.6pre2.orig/remotes/x10/lircd.conf.mp3anywhere lirc-0.8.6pre2/remotes/x10/lircd.conf.mp3anywhere
---- lirc-0.8.6pre2.orig/remotes/x10/lircd.conf.mp3anywhere	2007-07-01 03:09:11.000000000 -0400
-+++ lirc-0.8.6pre2/remotes/x10/lircd.conf.mp3anywhere	2009-08-29 13:23:31.000000000 -0400
+diff -Naurp lirc-0.8.6/remotes/x10/lircd.conf.mp3anywhere lirc-0.8.6.new/remotes/x10/lircd.conf.mp3anywhere
+--- lirc-0.8.6/remotes/x10/lircd.conf.mp3anywhere	2007-07-01 03:09:11.000000000 -0400
++++ lirc-0.8.6.new/remotes/x10/lircd.conf.mp3anywhere	2009-09-13 21:37:03.000000000 -0400
 @@ -22,43 +22,43 @@ begin remote
    gap		140000
  
diff --git a/lirc.init b/lirc.init
index b68b6ad..1a32831 100644
--- a/lirc.init
+++ b/lirc.init
@@ -6,9 +6,9 @@
 # description: Enables infrared controls through LIRC.
 # processname: lircd
 # processname: lircmd
-# config:      /etc/lircd.conf
-# config:      /etc/lircmd.conf
-# pidfile:     /var/run/lircd.pid
+# config:      /etc/lirc/lircd.conf
+# config:      /etc/lirc/lircmd.conf
+# pidfile:     /var/run/lirc/lircd.pid
 
 ### BEGIN INIT INFO
 # Provides: lirc
diff --git a/lirc.spec b/lirc.spec
index b44b08b..4162985 100644
--- a/lirc.spec
+++ b/lirc.spec
@@ -14,18 +14,18 @@
 %bcond_without  portaudio
 %bcond_without  x
 %bcond_with     svgalib
-%define pre     pre2
+#define pre     pre2
 
 Name:           lirc
 Version:        0.8.6
-Release:        0.6%{?pre:.%{pre}}%{?dist}
+Release:        1%{?pre:.%{pre}}%{?dist}
 Summary:        The Linux Infrared Remote Control package
 
 Group:          System Environment/Daemons
 License:        GPLv2+
 URL:            http://www.lirc.org/
-#Source0:        http://downloads.sourceforge.net/lirc/%{name}-%{version}.tar.bz2
-Source0:        http://www.lirc.org/software/snapshots/%{name}-%{version}%{pre}.tar.bz2
+Source0:        http://downloads.sourceforge.net/lirc/%{name}-%{version}.tar.bz2
+#Source0:        http://www.lirc.org/software/snapshots/%{name}-%{version}%{pre}.tar.bz2
 Source1:        %{name}.init
 Source2:        %{name}.sysconfig
 Patch0:         lirc-use-new-instead-of-conf-as-filename-suffix.patch
@@ -208,7 +208,8 @@ rm -rf doc/Makefile* doc/.libs doc/man* doc/lirc.hwdb
 rm -rf contrib/irman2lirc contrib/lirc.* contrib/sendxevent.c
 cd ..
 
-touch $RPM_BUILD_ROOT%{_sysconfdir}/lirc{d,md}.conf
+install -dm 755 $RPM_BUILD_ROOT%{_sysconfdir}/lirc
+touch $RPM_BUILD_ROOT%{_sysconfdir}/lirc/lirc{d,md}.conf
 
 install -dm 755 $RPM_BUILD_ROOT%{_localstatedir}/run/lirc/
 touch $RPM_BUILD_ROOT%{_localstatedir}/run/lirc/lirc{d,m}
@@ -224,6 +225,15 @@ rm -rf $RPM_BUILD_ROOT
 
 %post
 /sbin/chkconfig --add lirc
+# If we're upgrading, move config files into their new location, if need be
+if [ $1 -ge 2 ] ; then
+  if [ -e %{_sysconfdir}/lircd.conf -a ! -e %{_sysconfdir}/lirc/lircd.conf ]; then
+    mv %{_sysconfdir}/lircd.conf %{_sysconfdir}/lirc/lircd.conf
+  fi
+  if [ -e %{_sysconfdir}/lircmd.conf -a ! -e %{_sysconfdir}/lirc/lircmd.conf ]; then
+    mv %{_sysconfdir}/lircmd.conf %{_sysconfdir}/lirc/lircmd.conf
+  fi
+fi
 
 %post libs -p /sbin/ldconfig
 
@@ -239,7 +249,7 @@ fi
 %files
 %defattr(-,root,root,-)
 %doc ANNOUNCE AUTHORS ChangeLog COPYING NEWS README TODO
-%ghost %config(noreplace) %{_sysconfdir}/lirc*d.conf
+%ghost %config(noreplace) %{_sysconfdir}/lirc/lirc*d.conf
 %config(noreplace) %{_sysconfdir}/sysconfig/lirc
 %{_initrddir}/lirc
 %{_bindir}/*ir*
@@ -273,6 +283,9 @@ fi
 
 
 %changelog
+* Sun Sep 13 2009 Jarod Wilson <jarod@redhat.com> 0.8.6-1
+- Update to lirc 0.8.6 release
+
 * Sat Aug 29 2009 Jarod Wilson <jarod@redhat.com> 0.8.6-0.6.pre2
 - Rediff patches so they actually apply still
 
diff --git a/lirc.sysconfig b/lirc.sysconfig
index a9ce795..70cb5f8 100644
--- a/lirc.sysconfig
+++ b/lirc.sysconfig
@@ -12,7 +12,7 @@ LIRC_DRIVER=""
 
 # Which lirc device will be used by lircd(8).
 # This is the same as passing "-d device" to lircd.
-# An empty value will use the default /dev/lirc device.
+# An empty value will use the default /dev/lirc0 device.
 LIRC_DEVICE=""
 
 # If "yes", the init script will try to start lircmd(8) too.
diff --git a/sources b/sources
index 3ba02d2..ca8889f 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-cebc6e5aaa6bffc22c48e3b237ab0f2f  lirc-0.8.6pre2.tar.bz2
+4ca24da6f5e7c2dcea74878c27a4a3f7  lirc-0.8.6.tar.bz2

From 1540eb40663a7bc58f14d26e70bdf5445d9108e1 Mon Sep 17 00:00:00 2001
From: Jarod Wilson <jwilson@fedoraproject.org>
Date: Thu, 12 Nov 2009 04:09:48 +0000
Subject: [PATCH 071/204] - Add devinput mouse event passthru to uinput support
 from lirc cvs

---
 lirc-0.8.6-devinput-pass-mouse-events.patch | 262 ++++++++++++++++++++
 lirc.spec                                   |  13 +-
 2 files changed, 271 insertions(+), 4 deletions(-)
 create mode 100644 lirc-0.8.6-devinput-pass-mouse-events.patch

diff --git a/lirc-0.8.6-devinput-pass-mouse-events.patch b/lirc-0.8.6-devinput-pass-mouse-events.patch
new file mode 100644
index 0000000..f6bcb5f
--- /dev/null
+++ b/lirc-0.8.6-devinput-pass-mouse-events.patch
@@ -0,0 +1,262 @@
+diff -Naurp lirc-0.8.6/daemons/hw_devinput.c~ lirc-0.8.6/daemons/hw_devinput.c
+--- lirc-0.8.6/daemons/hw_devinput.c~	2009/09/07 18:08:00	5.20
++++ lirc-0.8.6/daemons/hw_devinput.c	2009/10/31 09:37:30	5.21
+@@ -31,8 +31,10 @@
+ #include <sys/types.h>
+ #include <dirent.h>
+ #include <fnmatch.h>
++#include <limits.h>
+ 
+ #include <linux/input.h>
++#include <linux/uinput.h>
+ 
+ #ifndef EV_SYN
+ /* previous name */
+@@ -44,8 +46,18 @@
+ #include "lircd.h"
+ #include "receive.h"
+ 
++/* from evtest.c - Copyright (c) 1999-2000 Vojtech Pavlik */
++#define BITS_PER_LONG (sizeof(long) * CHAR_BIT)
++/* NBITS was defined in linux/uinput.h */
++#undef NBITS
++#define NBITS(x) ((((x)-1)/BITS_PER_LONG)+1)
++#define OFF(x)  ((x)%BITS_PER_LONG)
++#define BIT(x)  (1UL<<OFF(x))
++#define LONG(x) ((x)/BITS_PER_LONG)
++#define test_bit(bit, array)	((array[LONG(bit)] >> OFF(bit)) & 1)
+ 
+ static int devinput_init();
++static int devinput_init_fwd();
+ static int devinput_deinit(void);
+ static int devinput_decode(struct ir_remote *remote,
+ 			   ir_code *prep, ir_code *codep, ir_code *postp,
+@@ -67,7 +76,7 @@
+ 	0,			/* send_mode */
+ 	LIRC_MODE_LIRCCODE,	/* rec_mode */
+ 	32,			/* code_length */
+-	devinput_init,		/* init_func */
++	devinput_init_fwd,	/* init_func */
+ 	NULL,			/* config_func */
+ 	devinput_deinit,	/* deinit_func */
+ 	NULL,			/* send_func */
+@@ -80,6 +89,141 @@
+ 
+ static ir_code code;
+ static int repeat_flag=0;
++static int exclusive = 0;
++static int uinputfd = -1;
++
++static int setup_uinputfd(const char *name, int source)
++{
++	int fd;
++	int key;
++	struct uinput_user_dev dev;
++	long events[NBITS(EV_MAX)];
++	long bits[NBITS(KEY_MAX)];
++	
++	if(ioctl(source, EVIOCGBIT(0, EV_MAX), events) == -1)
++	{
++		return -1;
++	}
++	if(!test_bit(EV_REL, events) && !test_bit(EV_ABS, events))
++	{
++		/* no move events, don't forward anything */
++		return -1;
++	}
++	fd = open("/dev/input/uinput", O_RDWR);
++	if(fd == -1)
++	{
++		fd = open("/dev/uinput", O_RDWR);
++		if(fd == -1)
++		{
++			fd = open("/dev/misc/uinput", O_RDWR);
++			if(fd == -1)
++			{
++				logprintf(LOG_WARNING, "could not open %s\n",
++					  "uinput");
++				logperror(LOG_WARNING, NULL);
++				return -1;
++			}
++		}
++	}
++	memset(&dev, 0, sizeof(dev));
++	if(ioctl(source, EVIOCGNAME(sizeof(dev.name)), dev.name) >= 0)
++	{
++		dev.name[sizeof(dev.name)-1] = 0;
++		if(strlen(dev.name) > 0)
++		{
++			strncat(dev.name, " ", sizeof(dev.name) -
++				strlen(dev.name));
++			dev.name[sizeof(dev.name)-1] = 0;
++		}
++	}
++	strncat(dev.name, name, sizeof(dev.name) - strlen(dev.name));
++	dev.name[sizeof(dev.name)-1] = 0;
++
++	if(write(fd, &dev, sizeof(dev)) != sizeof(dev))
++	{
++		goto setup_error;
++	}
++	
++	if(test_bit(EV_KEY, events))
++	{
++		if(ioctl(source, EVIOCGBIT(EV_KEY, KEY_MAX), bits) == -1)
++		{
++			goto setup_error;
++		}
++		
++		if(ioctl(fd, UI_SET_EVBIT, EV_KEY) == -1)
++		{
++			goto setup_error;
++		}
++		
++		/* only forward mouse button events */
++		for(key = BTN_MISC; key <= BTN_GEAR_UP; key++)
++		{
++			if(test_bit(key, bits))
++			{
++				if(ioctl(fd, UI_SET_KEYBIT, key) == -1)
++				{
++					goto setup_error;
++				}
++			}
++		}
++	}
++	if(test_bit(EV_REL, events))
++	{
++		if(ioctl(source, EVIOCGBIT(EV_REL, REL_MAX), bits) == -1)
++		{
++			goto setup_error;
++		}
++		if(ioctl(fd, UI_SET_EVBIT, EV_REL) == -1)
++		{
++			goto setup_error;
++		}
++		for(key = 0; key <= REL_MAX; key++)
++		{
++			if(test_bit(key, bits))
++			{
++				if(ioctl(fd, UI_SET_RELBIT, key) == -1)
++				{
++					goto setup_error;
++				}
++			}
++		}
++	}
++	if(test_bit(EV_ABS, events))
++	{
++		if(ioctl(source, EVIOCGBIT(EV_ABS, ABS_MAX), bits) == -1)
++		{
++			goto setup_error;
++		}
++		if(ioctl(fd, UI_SET_EVBIT, EV_ABS) == -1)
++		{
++			goto setup_error;
++		}
++		for(key = 0; key <= ABS_MAX; key++)
++		{
++			if(test_bit(key, bits))
++			{
++				if(ioctl(fd, UI_SET_ABSBIT, key) == -1)
++				{
++					goto setup_error;
++				}
++			}
++		}
++	}
++	
++
++	if(ioctl(fd, UI_DEV_CREATE) == -1)
++	{
++		goto setup_error;
++	}
++	return fd;
++	
++ setup_error:
++	logprintf(LOG_ERR, "could not setup %s\n", "uinput");
++	logperror(LOG_ERR, NULL);
++	close(fd);
++	return -1;
++}
+ 
+ #if 0
+ /* using fnmatch */
+@@ -217,13 +361,26 @@
+ 	}
+ 	
+ #ifdef EVIOCGRAB
++	exclusive = 1;
+ 	if (ioctl(hw.fd, EVIOCGRAB, 1) == -1)
+ 	{
++		exclusive = 0;
+ 		logprintf(LOG_WARNING, "can't get exclusive access to events "
+ 			  "coming from `%s' interface",
+ 			  hw.device);
+ 	}
+ #endif
++	return 1;
++}
++
++int devinput_init_fwd()
++{
++	if(!devinput_init()) return 0;
++	
++	if(exclusive)
++	{
++		uinputfd = setup_uinputfd("(lircd bypass)", hw.fd);
++	}
+ 	
+ 	return 1;
+ }
+@@ -232,6 +389,12 @@
+ int devinput_deinit(void)
+ {
+ 	logprintf(LOG_INFO, "closing '%s'", hw.device);
++	if(uinputfd != -1)
++	{
++		ioctl(uinputfd, UI_DEV_DESTROY);
++		close(uinputfd);
++		uinputfd = -1;
++	}
+ 	close(hw.fd);
+ 	hw.fd=-1;
+ 	return 1;
+@@ -271,7 +434,10 @@
+ 	rd = read(hw.fd, &event, sizeof event);
+ 	if (rd != sizeof event) {
+ 		logprintf(LOG_ERR, "error reading '%s'", hw.device);
+-		if(rd <= 0 && errno != EINTR) raise(SIGTERM);
++		if(rd <= 0 && errno != EINTR)
++		{
++			devinput_deinit();
++		}
+ 		return 0;
+ 	}
+ 
+@@ -292,6 +458,25 @@
+ 
+ 	LOGPRINTF(1, "code %.8llx", code);
+ 
++	if(uinputfd != -1)
++	{
++		if(event.type == EV_REL ||
++		   event.type == EV_ABS ||
++		   (event.type == EV_KEY &&
++		    event.code >= BTN_MISC &&
++		    event.code <= BTN_GEAR_UP) ||
++		   event.type == EV_SYN)
++		{
++			LOGPRINTF(1, "forwarding: %04x %04x", event.type, event.code);
++			if(write(uinputfd, &event, sizeof(event)) != sizeof(event))
++			{
++				logprintf(LOG_ERR, "writing to uinput failed");
++				logperror(LOG_ERR, NULL);
++			}
++			return NULL;
++		}
++	}
++	
+ 	/* ignore EV_SYN */
+ 	if(event.type == EV_SYN) return NULL;
+ 
diff --git a/lirc.spec b/lirc.spec
index 4162985..4d793f0 100644
--- a/lirc.spec
+++ b/lirc.spec
@@ -18,7 +18,7 @@
 
 Name:           lirc
 Version:        0.8.6
-Release:        1%{?pre:.%{pre}}%{?dist}
+Release:        2%{?pre:.%{pre}}%{?dist}
 Summary:        The Linux Infrared Remote Control package
 
 Group:          System Environment/Daemons
@@ -29,10 +29,11 @@ Source0:        http://downloads.sourceforge.net/lirc/%{name}-%{version}.tar.bz2
 Source1:        %{name}.init
 Source2:        %{name}.sysconfig
 Patch0:         lirc-use-new-instead-of-conf-as-filename-suffix.patch
+Patch1:         lirc-0.8.6-devinput-pass-mouse-events.patch
 # https://bugzilla.redhat.com/show_bug.cgi?id=457273
 # http://thread.gmane.org/gmane.comp.hardware.lirc/6884
-Patch1:		lirc-0.8.6-standardized-remote-keycodes.patch
-Patch2:         lirc-0.8.4-make-remote-names-all-unique.patch
+Patch2:		lirc-0.8.6-standardized-remote-keycodes.patch
+Patch3:         lirc-0.8.4-make-remote-names-all-unique.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  %{__perl}
@@ -119,6 +120,7 @@ of remote control configuration files.
 %prep
 %setup -q -n %{name}-%{version}%{?pre}
 %patch0 -p1
+%patch1 -p1
 
 chmod 644 contrib/*
 chmod +x contrib/hal
@@ -159,8 +161,8 @@ touch -r aclocal.m4 configure.ac # avoid autofoo re-run
 
 # Do this after, as we're touching the remote definitions earlier
 # Don't create a backup, or the original definitions will get installed
-%patch1 -p1
 %patch2 -p1
+%patch3 -p1
 # Re-run autofoo for new cvs features
 #autoreconf -i -f
 #automake
@@ -283,6 +285,9 @@ fi
 
 
 %changelog
+* Thu Nov 12 2009 Jarod Wilson <jarod@redhat.com> 0.8.6-2
+- Add devinput mouse event passthru to uinput support from lirc cvs
+
 * Sun Sep 13 2009 Jarod Wilson <jarod@redhat.com> 0.8.6-1
 - Update to lirc 0.8.6 release
 

From 9a2cd919bdc11b9b54d90e069cae93b2e2e3434d Mon Sep 17 00:00:00 2001
From: Bill Nottingham <notting@fedoraproject.org>
Date: Wed, 25 Nov 2009 23:51:32 +0000
Subject: [PATCH 072/204] Fix typo that causes a failure to update the common
 directory. (releng     #2781)

---
 Makefile | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/Makefile b/Makefile
index 3df5896..8840ad6 100644
--- a/Makefile
+++ b/Makefile
@@ -1,10 +1,10 @@
 # Makefile for source rpm: lirc
-# $Id: Makefile,v 1.1 2004/11/08 04:49:35 cvsextras Exp $
+# $Id: Makefile,v 1.2 2004/11/24 04:29:00 gafton Exp $
 NAME := lirc
 SPECFILE = $(firstword $(wildcard *.spec))
 
 define find-makefile-common
-for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done
+for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$d/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done
 endef
 
 MAKEFILE_COMMON	:= $(shell $(find-makefile-common))

From 385260b0925fea65ba2f0d6edcc7e1f380794850 Mon Sep 17 00:00:00 2001
From: Jarod Wilson <jwilson@fedoraproject.org>
Date: Mon, 15 Feb 2010 16:17:06 +0000
Subject: [PATCH 073/204] - Fix up ioctl portability between 32-bit and 64-bit

---
 lirc-0.8.6-ioctl-portability.patch     | 59 ++++++++++++++++++++++++++
 lirc-0.8.6-remove-obsolete-modes.patch | 32 ++++++++++++++
 lirc.spec                              |  9 +++-
 3 files changed, 99 insertions(+), 1 deletion(-)
 create mode 100644 lirc-0.8.6-ioctl-portability.patch
 create mode 100644 lirc-0.8.6-remove-obsolete-modes.patch

diff --git a/lirc-0.8.6-ioctl-portability.patch b/lirc-0.8.6-ioctl-portability.patch
new file mode 100644
index 0000000..abca510
--- /dev/null
+++ b/lirc-0.8.6-ioctl-portability.patch
@@ -0,0 +1,59 @@
+Index: lirc-0.8.6/drivers/lirc.h
+===================================================================
+--- lirc-0.8.6.orig/drivers/lirc.h
++++ lirc-0.8.6/drivers/lirc.h
+@@ -68,27 +68,27 @@ typedef int lirc_t;
+ 
+ /*** IOCTL commands for lirc driver ***/
+ 
+-#define LIRC_GET_FEATURES              _IOR('i', 0x00000000, unsigned long)
++#define LIRC_GET_FEATURES              _IOR('i', 0x00000000, uint64_t)
+ 
+-#define LIRC_GET_SEND_MODE             _IOR('i', 0x00000001, unsigned long)
+-#define LIRC_GET_REC_MODE              _IOR('i', 0x00000002, unsigned long)
+-#define LIRC_GET_SEND_CARRIER          _IOR('i', 0x00000003, unsigned int)
+-#define LIRC_GET_REC_CARRIER           _IOR('i', 0x00000004, unsigned int)
+-#define LIRC_GET_SEND_DUTY_CYCLE       _IOR('i', 0x00000005, unsigned int)
+-#define LIRC_GET_REC_DUTY_CYCLE        _IOR('i', 0x00000006, unsigned int)
+-#define LIRC_GET_REC_RESOLUTION        _IOR('i', 0x00000007, unsigned int)
++#define LIRC_GET_SEND_MODE             _IOR('i', 0x00000001, uint64_t)
++#define LIRC_GET_REC_MODE              _IOR('i', 0x00000002, uint64_t)
++#define LIRC_GET_SEND_CARRIER          _IOR('i', 0x00000003, uint32_t)
++#define LIRC_GET_REC_CARRIER           _IOR('i', 0x00000004, uint32_t)
++#define LIRC_GET_SEND_DUTY_CYCLE       _IOR('i', 0x00000005, uint32_t)
++#define LIRC_GET_REC_DUTY_CYCLE        _IOR('i', 0x00000006, uint32_t)
++#define LIRC_GET_REC_RESOLUTION        _IOR('i', 0x00000007, uint32_t)
+ 
+ /* code length in bits, currently only for LIRC_MODE_LIRCCODE */
+-#define LIRC_GET_LENGTH                _IOR('i', 0x0000000f, unsigned long)
++#define LIRC_GET_LENGTH                _IOR('i', 0x0000000f, uint64_t)
+ 
+-#define LIRC_SET_SEND_MODE             _IOW('i', 0x00000011, unsigned long)
+-#define LIRC_SET_REC_MODE              _IOW('i', 0x00000012, unsigned long)
++#define LIRC_SET_SEND_MODE             _IOW('i', 0x00000011, uint64_t)
++#define LIRC_SET_REC_MODE              _IOW('i', 0x00000012, uint64_t)
+ /* Note: these can reset the according pulse_width */
+-#define LIRC_SET_SEND_CARRIER          _IOW('i', 0x00000013, unsigned int)
+-#define LIRC_SET_REC_CARRIER           _IOW('i', 0x00000014, unsigned int)
+-#define LIRC_SET_SEND_DUTY_CYCLE       _IOW('i', 0x00000015, unsigned int)
+-#define LIRC_SET_REC_DUTY_CYCLE        _IOW('i', 0x00000016, unsigned int)
+-#define LIRC_SET_TRANSMITTER_MASK      _IOW('i', 0x00000017, unsigned int)
++#define LIRC_SET_SEND_CARRIER          _IOW('i', 0x00000013, uint32_t)
++#define LIRC_SET_REC_CARRIER           _IOW('i', 0x00000014, uint32_t)
++#define LIRC_SET_SEND_DUTY_CYCLE       _IOW('i', 0x00000015, uint32_t)
++#define LIRC_SET_REC_DUTY_CYCLE        _IOW('i', 0x00000016, uint32_t)
++#define LIRC_SET_TRANSMITTER_MASK      _IOW('i', 0x00000017, uint32_t)
+ 
+ /*
+  * to set a range use
+@@ -97,8 +97,8 @@ typedef int lirc_t;
+  * LIRC_SET_REC_DUTY_CYCLE/LIRC_SET_REC_CARRIER with the upper bound
+  */
+ 
+-#define LIRC_SET_REC_DUTY_CYCLE_RANGE  _IOW('i', 0x0000001e, unsigned int)
+-#define LIRC_SET_REC_CARRIER_RANGE     _IOW('i', 0x0000001f, unsigned int)
++#define LIRC_SET_REC_DUTY_CYCLE_RANGE  _IOW('i', 0x0000001e, uint32_t)
++#define LIRC_SET_REC_CARRIER_RANGE     _IOW('i', 0x0000001f, uint32_t)
+ 
+ #define LIRC_NOTIFY_DECODE             _IO('i', 0x00000020)
+ 
diff --git a/lirc-0.8.6-remove-obsolete-modes.patch b/lirc-0.8.6-remove-obsolete-modes.patch
new file mode 100644
index 0000000..ca25341
--- /dev/null
+++ b/lirc-0.8.6-remove-obsolete-modes.patch
@@ -0,0 +1,32 @@
+Index: lirc-0.8.6/drivers/lirc.h
+===================================================================
+--- lirc-0.8.6.orig/drivers/lirc.h
++++ lirc-0.8.6/drivers/lirc.h
+@@ -27,17 +27,13 @@ typedef int lirc_t;
+ #define LIRC_MODE_RAW                  0x00000001
+ #define LIRC_MODE_PULSE                0x00000002
+ #define LIRC_MODE_MODE2                0x00000004
+-#define LIRC_MODE_CODE                 0x00000008
+ #define LIRC_MODE_LIRCCODE             0x00000010
+-#define LIRC_MODE_STRING               0x00000020
+ 
+ 
+ #define LIRC_CAN_SEND_RAW              LIRC_MODE2SEND(LIRC_MODE_RAW)
+ #define LIRC_CAN_SEND_PULSE            LIRC_MODE2SEND(LIRC_MODE_PULSE)
+ #define LIRC_CAN_SEND_MODE2            LIRC_MODE2SEND(LIRC_MODE_MODE2)
+-#define LIRC_CAN_SEND_CODE             LIRC_MODE2SEND(LIRC_MODE_CODE)
+ #define LIRC_CAN_SEND_LIRCCODE         LIRC_MODE2SEND(LIRC_MODE_LIRCCODE)
+-#define LIRC_CAN_SEND_STRING           LIRC_MODE2SEND(LIRC_MODE_STRING)
+ 
+ #define LIRC_CAN_SEND_MASK             0x0000003f
+ 
+@@ -48,9 +44,7 @@ typedef int lirc_t;
+ #define LIRC_CAN_REC_RAW               LIRC_MODE2REC(LIRC_MODE_RAW)
+ #define LIRC_CAN_REC_PULSE             LIRC_MODE2REC(LIRC_MODE_PULSE)
+ #define LIRC_CAN_REC_MODE2             LIRC_MODE2REC(LIRC_MODE_MODE2)
+-#define LIRC_CAN_REC_CODE              LIRC_MODE2REC(LIRC_MODE_CODE)
+ #define LIRC_CAN_REC_LIRCCODE          LIRC_MODE2REC(LIRC_MODE_LIRCCODE)
+-#define LIRC_CAN_REC_STRING            LIRC_MODE2REC(LIRC_MODE_STRING)
+ 
+ #define LIRC_CAN_REC_MASK              LIRC_MODE2REC(LIRC_CAN_SEND_MASK)
+ 
diff --git a/lirc.spec b/lirc.spec
index 4d793f0..14bb277 100644
--- a/lirc.spec
+++ b/lirc.spec
@@ -18,7 +18,7 @@
 
 Name:           lirc
 Version:        0.8.6
-Release:        2%{?pre:.%{pre}}%{?dist}
+Release:        3%{?pre:.%{pre}}%{?dist}
 Summary:        The Linux Infrared Remote Control package
 
 Group:          System Environment/Daemons
@@ -34,6 +34,8 @@ Patch1:         lirc-0.8.6-devinput-pass-mouse-events.patch
 # http://thread.gmane.org/gmane.comp.hardware.lirc/6884
 Patch2:		lirc-0.8.6-standardized-remote-keycodes.patch
 Patch3:         lirc-0.8.4-make-remote-names-all-unique.patch
+Patch4:         lirc-0.8.6-ioctl-portability.patch
+Patch5:         lirc-0.8.6-remove-obsolete-modes.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  %{__perl}
@@ -163,6 +165,8 @@ touch -r aclocal.m4 configure.ac # avoid autofoo re-run
 # Don't create a backup, or the original definitions will get installed
 %patch2 -p1
 %patch3 -p1
+%patch4 -p1
+%patch5 -p1
 # Re-run autofoo for new cvs features
 #autoreconf -i -f
 #automake
@@ -285,6 +289,9 @@ fi
 
 
 %changelog
+* Mon Feb 15 2010 Jarod Wilson <jarod@redhat.com> 0.8.6-3
+- Fix up ioctl portability between 32-bit and 64-bit
+
 * Thu Nov 12 2009 Jarod Wilson <jarod@redhat.com> 0.8.6-2
 - Add devinput mouse event passthru to uinput support from lirc cvs
 

From fe2da98147fd72ecf8b19984e15e508c2a741d85 Mon Sep 17 00:00:00 2001
From: Jarod Wilson <jwilson@fedoraproject.org>
Date: Mon, 15 Feb 2010 17:09:34 +0000
Subject: [PATCH 074/204] Helps to patch the files using the patched header too

---
 lirc-0.8.6-remove-obsolete-modes.patch | 405 ++++++++++++++++++++++++-
 1 file changed, 403 insertions(+), 2 deletions(-)

diff --git a/lirc-0.8.6-remove-obsolete-modes.patch b/lirc-0.8.6-remove-obsolete-modes.patch
index ca25341..906db17 100644
--- a/lirc-0.8.6-remove-obsolete-modes.patch
+++ b/lirc-0.8.6-remove-obsolete-modes.patch
@@ -2,7 +2,15 @@ Index: lirc-0.8.6/drivers/lirc.h
 ===================================================================
 --- lirc-0.8.6.orig/drivers/lirc.h
 +++ lirc-0.8.6/drivers/lirc.h
-@@ -27,17 +27,13 @@ typedef int lirc_t;
+@@ -11,6 +11,7 @@
+ #define __USE_LINUX_IOCTL_DEFS
+ #include <sys/ioctl.h>
+ #endif
++#include <stdint.h>
+ 
+ #define PULSE_BIT  0x01000000
+ #define PULSE_MASK 0x00FFFFFF
+@@ -27,17 +28,13 @@ typedef int lirc_t;
  #define LIRC_MODE_RAW                  0x00000001
  #define LIRC_MODE_PULSE                0x00000002
  #define LIRC_MODE_MODE2                0x00000004
@@ -20,7 +28,7 @@ Index: lirc-0.8.6/drivers/lirc.h
  
  #define LIRC_CAN_SEND_MASK             0x0000003f
  
-@@ -48,9 +44,7 @@ typedef int lirc_t;
+@@ -48,9 +45,7 @@ typedef int lirc_t;
  #define LIRC_CAN_REC_RAW               LIRC_MODE2REC(LIRC_MODE_RAW)
  #define LIRC_CAN_REC_PULSE             LIRC_MODE2REC(LIRC_MODE_PULSE)
  #define LIRC_CAN_REC_MODE2             LIRC_MODE2REC(LIRC_MODE_MODE2)
@@ -30,3 +38,396 @@ Index: lirc-0.8.6/drivers/lirc.h
  
  #define LIRC_CAN_REC_MASK              LIRC_MODE2REC(LIRC_CAN_SEND_MASK)
  
+Index: lirc-0.8.6/daemons/hw_alsa_usb.c
+===================================================================
+--- lirc-0.8.6.orig/daemons/hw_alsa_usb.c
++++ lirc-0.8.6/daemons/hw_alsa_usb.c
+@@ -37,9 +37,9 @@ static int repeat_flag;
+ struct hardware hw_alsa_usb = {
+ 	"",			/* default device */
+ 	-1,			/* fd */
+-	LIRC_CAN_REC_CODE,	/* features */
++	LIRC_CAN_REC_LIRCCODE,	/* features */
+ 	0,			/* send_mode */
+-	LIRC_MODE_CODE,		/* rec_mode */
++	LIRC_MODE_LIRCCODE,	/* rec_mode */
+ 	8,			/* code_length */
+ 	init,			/* init_func */
+ 	NULL,			/* config_func */
+Index: lirc-0.8.6/daemons/hw_awlibusb.c
+===================================================================
+--- lirc-0.8.6.orig/daemons/hw_awlibusb.c
++++ lirc-0.8.6/daemons/hw_awlibusb.c
+@@ -48,8 +48,6 @@
+ #include "lircd.h"
+ #include "receive.h"
+ 
+-#define AW_MODE_LIRCCODE 1
+-
+ #define AWUSB_RECEIVE_BYTES 5
+ #define USB_TIMEOUT (1000*60)
+ #define AW_VENDOR_THOMSON 0x069b
+@@ -57,14 +55,6 @@
+ 
+ #define AW_KEY_GAP 0 /* Original value=200000. Made it 0 to handle it in userspace */
+ 
+-#if !defined(AW_MODE_LIRCCODE)
+-static ir_code code;
+-static ir_code code_last;
+-static struct timeval time_current = {0};
+-static struct timeval time_last = {0};
+-#endif
+-
+-
+ static int awlibusb_init();
+ static int awlibusb_deinit();
+ static char *awlibusb_rec(struct ir_remote *remotes);
+@@ -72,7 +62,6 @@ static void usb_read_loop(int fd);
+ static struct usb_device *find_usb_device(void);
+ static int find_device_endpoints(struct usb_device *dev);
+ 
+-#ifdef AW_MODE_LIRCCODE
+ struct hardware hw_awlibusb =
+ {
+ 	NULL,                       /* default device */
+@@ -91,26 +80,7 @@ struct hardware hw_awlibusb =
+ 	NULL,                       /* readdata */
+ 	"awlibusb"
+ };
+-#else
+-struct hardware hw_awlibusb =
+-{
+-	NULL,                       /* default device */
+-	-1,                         /* fd */
+-	LIRC_CAN_REC_CODE,          /* features */
+-	0,                          /* send_mode */
+-	LIRC_MODE_CODE,             /* rec_mode */
+-	CHAR_BIT,                   /* code_length */
+-	awlibusb_init,              /* init_func */
+-	NULL,                       /* config_func */
+-	awlibusb_deinit,            /* deinit_func */
+-	NULL,                       /* send_func */
+-	awlibusb_rec,               /* rec_func */
+-	receive_decode,             /* decode_func */
+-	NULL,                       /* ioctl_func */
+-	NULL,                       /* readdata */
+-	"awlibusb"
+-};
+-#endif
++
+ typedef struct {
+ 	u_int16_t vendor;
+ 	u_int16_t product;
+@@ -310,11 +280,6 @@ static void usb_read_loop(int fd)
+ {
+ 	int inited = 0;
+ 	int err = 0;
+-#if !defined(AW_MODE_LIRCCODE)
+-	long elapsed_seconds = 0;  /* diff between seconds counter */
+-	long elapsed_useconds = 0; /* diff between microseconds counter */
+-	long time_diff = 0;
+-#endif
+ 	
+ 	alarm(0);
+ 	signal(SIGTERM, SIG_DFL);
+@@ -348,7 +313,6 @@ static void usb_read_loop(int fd)
+ 			if (bytes_r == 1) continue;
+ 		}
+ 		
+-#ifdef AW_MODE_LIRCCODE
+ 		bytes_w = write(fd, &(buf[1]), (AWUSB_RECEIVE_BYTES-1));
+ 		/* ignore first byte */
+ 		if (bytes_w < 0)
+@@ -358,30 +322,6 @@ static void usb_read_loop(int fd)
+ 			err = 1;
+ 			goto done;
+ 		}
+-#else
+-		code = buf[AWUSB_RECEIVE_BYTES-2];
+-
+-		/* calculate time diff */
+-		gettimeofday(&time_current, NULL);
+-		elapsed_seconds  = time_current.tv_sec  - time_last.tv_sec;
+-		elapsed_useconds = time_current.tv_usec - time_last.tv_usec;
+-		time_diff = (elapsed_seconds) * 1000000 + elapsed_useconds;
+-		//printf("time_diff = %d usec\n", time_diff);
+-
+-		if ( !((code == code_last) && (time_diff < AW_KEY_GAP)) )
+-		{ 
+-			bytes_w = write(fd, &code, 1);
+-			if (bytes_w < 0)
+-			{
+-				logprintf(LOG_ERR, "can't write to pipe: %s",
+-					  strerror(errno));
+-				err = 1;
+-				goto done;
+-			}
+-			code_last = code;
+-			memcpy(&time_last, &time_current, sizeof(struct timeval));
+-		}
+-#endif
+ 		
+ 	}
+ 	
+Index: lirc-0.8.6/daemons/hw_default.c
+===================================================================
+--- lirc-0.8.6.orig/daemons/hw_default.c
++++ lirc-0.8.6/daemons/hw_default.c
+@@ -42,10 +42,7 @@ extern struct ir_remote *repeat_remote;
+ 
+ static unsigned long supported_send_modes[]=
+ {
+-	/* LIRC_CAN_SEND_STRING, I don't think there ever will be a driver 
+-	   that supports that */
+ 	/* LIRC_CAN_SEND_LIRCCODE, */
+-        /* LIRC_CAN_SEND_CODE, */
+ 	/* LIRC_CAN_SEND_MODE2, this one would be very easy */
+ 	LIRC_CAN_SEND_PULSE,
+ 	/* LIRC_CAN_SEND_RAW, */
+@@ -53,9 +50,7 @@ static unsigned long supported_send_mode
+ };
+ static unsigned long supported_rec_modes[]=
+ {
+-	LIRC_CAN_REC_STRING,
+ 	LIRC_CAN_REC_LIRCCODE,
+-        LIRC_CAN_REC_CODE,
+ 	LIRC_CAN_REC_MODE2,
+ 	/* LIRC_CAN_REC_PULSE, shouldn't be too hard */
+ 	/* LIRC_CAN_REC_RAW, */
+@@ -365,10 +360,6 @@ int default_init()
+ 		}
+ 		
+ 	}
+-	else if(hw.rec_mode==LIRC_MODE_CODE)
+-	{
+-		hw.code_length=8;
+-	}
+ 	else if(hw.rec_mode==LIRC_MODE_LIRCCODE)
+ 	{
+ 		if(default_ioctl(LIRC_GET_LENGTH, &hw.code_length)==-1)
+@@ -524,47 +515,12 @@ int default_send(struct ir_remote *remot
+ 
+ char *default_rec(struct ir_remote *remotes)
+ {
+-	char c;
+-	int n;
+-	static char message[PACKET_SIZE+1];
+-
+-
+-	if(hw.rec_mode==LIRC_MODE_STRING)
+-	{
+-		int failed=0;
+-
+-		/* inefficient but simple, fix this if you want */
+-		n=0;
+-		do
+-		{
+-			if(read(hw.fd,&c,1)!=1)
+-			{
+-				logprintf(LOG_ERR,"reading in mode "
+-					  "LIRC_MODE_STRING failed");
+-				default_deinit();
+-				return NULL;
+-			}
+-			if(n>=PACKET_SIZE-1)
+-			{
+-				failed=1;
+-				n=0;
+-			}
+-			message[n++]=c;
+-		}
+-		while(c!='\n');
+-		message[n]=0;
+-		if(failed) return(NULL);
+-		return(message);
+-	}
+-	else
++	if(!clear_rec_buffer())
+ 	{
+-		if(!clear_rec_buffer())
+-		{
+-			default_deinit();
+-		       	return NULL;
+-		}
+-		return(decode_all(remotes));
++		default_deinit();
++	       	return NULL;
+ 	}
++	return(decode_all(remotes));
+ }
+ 
+ static int default_config_frequency()
+Index: lirc-0.8.6/daemons/hw_mplay.c
+===================================================================
+--- lirc-0.8.6.orig/daemons/hw_mplay.c
++++ lirc-0.8.6/daemons/hw_mplay.c
+@@ -114,9 +114,9 @@ static struct {
+ struct hardware hw_mplay = {
+         LIRC_DRIVER_DEVICE,     /* default device */
+         -1,                     /* fd */
+-        LIRC_CAN_REC_CODE,      /* features */
++        LIRC_CAN_REC_LIRCCODE,  /* features */
+         0,                      /* send_mode */
+-        LIRC_MODE_CODE,         /* rec_mode */
++        LIRC_MODE_LIRCCODE,     /* rec_mode */
+         MPLAY_CODE_LENGTH,      /* code_length */
+         mplay_init,             /* init_func */
+         NULL,                   /* config_func */
+Index: lirc-0.8.6/daemons/irrecord.c
+===================================================================
+--- lirc-0.8.6.orig/daemons/irrecord.c
++++ lirc-0.8.6/daemons/irrecord.c
+@@ -556,16 +556,7 @@ int main(int argc,char **argv)
+ 	}
+ 	aeps = (hw.resolution>aeps ? hw.resolution:aeps);
+ 	
+-	if(hw.rec_mode==LIRC_MODE_STRING)
+-	{
+-		fprintf(stderr,"%s: no config file necessary\n",progname);
+-		fclose(fout);
+-		unlink(filename);
+-		if(hw.deinit_func) hw.deinit_func();
+-		exit(EXIT_SUCCESS);
+-	}
+ 	if(hw.rec_mode!=LIRC_MODE_MODE2 &&
+-	   hw.rec_mode!=LIRC_MODE_CODE &&
+ 	   hw.rec_mode!=LIRC_MODE_LIRCCODE)
+ 	{
+ 		fprintf(stderr,"%s: mode not supported\n",progname);
+@@ -661,10 +652,8 @@ int main(int argc,char **argv)
+ 		       (unsigned long) remote.gap);
+ #               endif
+ 		break;
+-	case LIRC_MODE_CODE:
+ 	case LIRC_MODE_LIRCCODE:
+-		if(hw.rec_mode==LIRC_MODE_CODE) remote.bits=CHAR_BIT;
+-		else remote.bits=hw.code_length;
++		remote.bits=hw.code_length;
+ 		if(!using_template && !get_gap_length(&remote))
+ 		{
+ 			fprintf(stderr,"%s: gap not found,"
+@@ -995,9 +984,6 @@ void flushhw(void)
+ 	case LIRC_MODE_MODE2:
+ 		while(availabledata()) hw.readdata(0);
+ 		return;
+-	case LIRC_MODE_CODE:
+-		size=sizeof(unsigned char);
+-		break;
+ 	case LIRC_MODE_LIRCCODE:
+ 		size=hw.code_length/CHAR_BIT;
+ 		if(hw.code_length%CHAR_BIT) size++;
+Index: lirc-0.8.6/daemons/receive.c
+===================================================================
+--- lirc-0.8.6.orig/daemons/receive.c
++++ lirc-0.8.6/daemons/receive.c
+@@ -126,18 +126,6 @@ int clear_rec_buffer(void)
+ 			((ir_code) buffer[i]);
+ 		}
+ 	}
+-	else if(hw.rec_mode==LIRC_MODE_CODE)
+-	{
+-		unsigned char c;
+-		
+-		if(read(hw.fd,&c,1)!=1)
+-		{
+-			logprintf(LOG_ERR,"reading in mode LIRC_MODE_CODE "
+-				  "failed");
+-			return(0);
+-		}
+-		rec_buffer.decoded=(ir_code) c;
+-	}
+ 	else
+ 	{
+ 		lirc_t data;
+@@ -1191,8 +1179,7 @@ int receive_decode(struct ir_remote *rem
+ 		struct ir_ncode *codes,*found;
+ 		int i;
+ 
+-		if(hw.rec_mode==LIRC_MODE_CODE ||
+-		   hw.rec_mode==LIRC_MODE_LIRCCODE)
++		if(hw.rec_mode==LIRC_MODE_LIRCCODE)
+ 			return(0);
+ 
+ 		codes=remote->codes;
+@@ -1233,8 +1220,7 @@ int receive_decode(struct ir_remote *rem
+ 	}
+ 	else
+ 	{
+-		if(hw.rec_mode==LIRC_MODE_CODE ||
+-		   hw.rec_mode==LIRC_MODE_LIRCCODE)
++		if(hw.rec_mode==LIRC_MODE_LIRCCODE)
+ 		{
+  			lirc_t sum;
+ 			ir_code decoded = rec_buffer.decoded;
+@@ -1244,11 +1230,7 @@ int receive_decode(struct ir_remote *rem
+ #                       else
+ 			LOGPRINTF(1,"decoded: %lx", decoded);
+ #                       endif
+-			if((hw.rec_mode==LIRC_MODE_CODE &&
+-			    hw.code_length<bit_count(remote))
+-			   ||
+-			   (hw.rec_mode==LIRC_MODE_LIRCCODE && 
+-			    hw.code_length!=bit_count(remote)))
++			if(hw.code_length!=bit_count(remote))
+ 			{
+ 				return(0);
+ 			}
+@@ -1366,8 +1348,7 @@ int receive_decode(struct ir_remote *rem
+ 		*repeat_flagp=1;
+ 	else
+ 		*repeat_flagp=0;
+-	if(hw.rec_mode==LIRC_MODE_CODE ||
+-	   hw.rec_mode==LIRC_MODE_LIRCCODE)
++	if(hw.rec_mode==LIRC_MODE_LIRCCODE)
+ 	{
+ 		/* Most TV cards don't pass each signal to the
+                    driver. This heuristic should fix repeat in such
+Index: lirc-0.8.6/tools/mode2.c
+===================================================================
+--- lirc-0.8.6.orig/tools/mode2.c
++++ lirc-0.8.6/tools/mode2.c
+@@ -273,11 +273,7 @@ int main(int argc,char **argv)
+ 
+ 	}
+ 	
+-	if(mode==LIRC_MODE_CODE)
+-	{
+-		count = 1;
+-	}
+-	else if(mode==LIRC_MODE_LIRCCODE)
++	if(mode==LIRC_MODE_LIRCCODE)
+ 	{
+ 		if(use_raw_access)
+ 		{
+Index: lirc-0.8.6/daemons/hw_bte.c
+===================================================================
+--- lirc-0.8.6.orig/daemons/hw_bte.c
++++ lirc-0.8.6/daemons/hw_bte.c
+@@ -66,14 +66,10 @@ struct hardware hw_bte=
+ 	LIRC_DRIVER_DEVICE,       /* default device */
+ 	-1,                       /* fd */
+ #if BTE_CAN_SEND
+-	LIRC_CAN_REC_STRING|LIRC_CAN_SEND_STRING,    /* features */
+-	LIRC_MODE_STRING,         /* send_mode */
+ #else
+-	LIRC_CAN_REC_STRING,      /* features */
+ 	0,                        /* send_mode */
+ #endif
+ 
+-	LIRC_MODE_STRING,         /* rec_mode */
+ 	16,                       /* code_length */
+ 	bte_init,	          /* init_func */
+ 	NULL,                     /* config_func */
+Index: lirc-0.8.6/daemons/hw_creative_infracd.c
+===================================================================
+--- lirc-0.8.6.orig/daemons/hw_creative_infracd.c
++++ lirc-0.8.6/daemons/hw_creative_infracd.c
+@@ -46,7 +46,7 @@
+ struct hardware hw_creative_infracd = {
+ 	0,	        	/* determine device by probing */
+ 	-1,			/* fd */
+-	LIRC_CAN_REC_CODE,	/* features */
++	LIRC_CAN_REC_LIRCCODE,	/* features */
+ 	0,			/* send_mode */
+ 	LIRC_MODE_LIRCCODE,	/* rec_mode */
+ 	8,			/* code_length */

From dfabd31953b6a9cf216bfb67e5a79a08615324e0 Mon Sep 17 00:00:00 2001
From: Jarod Wilson <jwilson@fedoraproject.org>
Date: Tue, 16 Feb 2010 02:50:24 +0000
Subject: [PATCH 075/204] - Un-bungle newly introduced segfault in prior build

---
 lirc-0.8.6-ioctl-portability.patch     |  8 ++++++++
 lirc-0.8.6-remove-obsolete-modes.patch | 18 +++++++-----------
 lirc.spec                              |  5 ++++-
 3 files changed, 19 insertions(+), 12 deletions(-)

diff --git a/lirc-0.8.6-ioctl-portability.patch b/lirc-0.8.6-ioctl-portability.patch
index abca510..52378d1 100644
--- a/lirc-0.8.6-ioctl-portability.patch
+++ b/lirc-0.8.6-ioctl-portability.patch
@@ -2,6 +2,14 @@ Index: lirc-0.8.6/drivers/lirc.h
 ===================================================================
 --- lirc-0.8.6.orig/drivers/lirc.h
 +++ lirc-0.8.6/drivers/lirc.h
+@@ -11,6 +11,7 @@
+ #define __USE_LINUX_IOCTL_DEFS
+ #include <sys/ioctl.h>
+ #endif
++#include <stdint.h>
+
+ #define PULSE_BIT  0x01000000
+ #define PULSE_MASK 0x00FFFFFF
 @@ -68,27 +68,27 @@ typedef int lirc_t;
  
  /*** IOCTL commands for lirc driver ***/
diff --git a/lirc-0.8.6-remove-obsolete-modes.patch b/lirc-0.8.6-remove-obsolete-modes.patch
index 906db17..02feec3 100644
--- a/lirc-0.8.6-remove-obsolete-modes.patch
+++ b/lirc-0.8.6-remove-obsolete-modes.patch
@@ -2,15 +2,7 @@ Index: lirc-0.8.6/drivers/lirc.h
 ===================================================================
 --- lirc-0.8.6.orig/drivers/lirc.h
 +++ lirc-0.8.6/drivers/lirc.h
-@@ -11,6 +11,7 @@
- #define __USE_LINUX_IOCTL_DEFS
- #include <sys/ioctl.h>
- #endif
-+#include <stdint.h>
- 
- #define PULSE_BIT  0x01000000
- #define PULSE_MASK 0x00FFFFFF
-@@ -27,17 +28,13 @@ typedef int lirc_t;
+@@ -28,17 +28,13 @@ typedef int lirc_t;
  #define LIRC_MODE_RAW                  0x00000001
  #define LIRC_MODE_PULSE                0x00000002
  #define LIRC_MODE_MODE2                0x00000004
@@ -28,7 +20,7 @@ Index: lirc-0.8.6/drivers/lirc.h
  
  #define LIRC_CAN_SEND_MASK             0x0000003f
  
-@@ -48,9 +45,7 @@ typedef int lirc_t;
+@@ -49,9 +45,7 @@ typedef int lirc_t;
  #define LIRC_CAN_REC_RAW               LIRC_MODE2REC(LIRC_MODE_RAW)
  #define LIRC_CAN_REC_PULSE             LIRC_MODE2REC(LIRC_MODE_PULSE)
  #define LIRC_CAN_REC_MODE2             LIRC_MODE2REC(LIRC_MODE_MODE2)
@@ -403,18 +395,22 @@ Index: lirc-0.8.6/daemons/hw_bte.c
 ===================================================================
 --- lirc-0.8.6.orig/daemons/hw_bte.c
 +++ lirc-0.8.6/daemons/hw_bte.c
-@@ -66,14 +66,10 @@ struct hardware hw_bte=
+@@ -66,14 +66,14 @@ struct hardware hw_bte=
  	LIRC_DRIVER_DEVICE,       /* default device */
  	-1,                       /* fd */
  #if BTE_CAN_SEND
 -	LIRC_CAN_REC_STRING|LIRC_CAN_SEND_STRING,    /* features */
 -	LIRC_MODE_STRING,         /* send_mode */
++	LIRC_CAN_REC_LIRCCODE|LIRC_CAN_SEND_LIRCCODE,    /* features */
++	LIRC_MODE_LIRCCODE,       /* send_mode */
  #else
 -	LIRC_CAN_REC_STRING,      /* features */
++	LIRC_CAN_REC_LIRCCODE,    /* features */
  	0,                        /* send_mode */
  #endif
  
 -	LIRC_MODE_STRING,         /* rec_mode */
++	LIRC_MODE_LIRCCODE,       /* rec_mode */
  	16,                       /* code_length */
  	bte_init,	          /* init_func */
  	NULL,                     /* config_func */
diff --git a/lirc.spec b/lirc.spec
index 14bb277..3b2d34e 100644
--- a/lirc.spec
+++ b/lirc.spec
@@ -18,7 +18,7 @@
 
 Name:           lirc
 Version:        0.8.6
-Release:        3%{?pre:.%{pre}}%{?dist}
+Release:        4%{?pre:.%{pre}}%{?dist}
 Summary:        The Linux Infrared Remote Control package
 
 Group:          System Environment/Daemons
@@ -289,6 +289,9 @@ fi
 
 
 %changelog
+* Mon Feb 15 2010 Jarod Wilson <jarod@redhat.com> 0.8.6-4
+- Un-bungle newly introduced segfault in prior build
+
 * Mon Feb 15 2010 Jarod Wilson <jarod@redhat.com> 0.8.6-3
 - Fix up ioctl portability between 32-bit and 64-bit
 

From 913acbd653e8b22e3aafd4ded9a620c18e21bb6e Mon Sep 17 00:00:00 2001
From: Jesse Keating <jkeating@fedoraproject.org>
Date: Wed, 17 Feb 2010 01:57:35 +0000
Subject: [PATCH 076/204] Initialize branch F-13 for lirc

---
 branch | 1 +
 1 file changed, 1 insertion(+)
 create mode 100644 branch

diff --git a/branch b/branch
new file mode 100644
index 0000000..baa94ef
--- /dev/null
+++ b/branch
@@ -0,0 +1 @@
+F-13

From 1ba0d40ca648c34d823701e3d675d73e5a0692c6 Mon Sep 17 00:00:00 2001
From: Jarod Wilson <jwilson@fedoraproject.org>
Date: Wed, 17 Mar 2010 19:53:29 +0000
Subject: [PATCH 077/204] - Update devinput lircd.conf with additional keys
 from input.h

---
 lirc-0.8.6-devinput-conf-update.patch | 1340 +++++++++++++++++++++++++
 lirc.spec                             |    7 +-
 2 files changed, 1346 insertions(+), 1 deletion(-)
 create mode 100644 lirc-0.8.6-devinput-conf-update.patch

diff --git a/lirc-0.8.6-devinput-conf-update.patch b/lirc-0.8.6-devinput-conf-update.patch
new file mode 100644
index 0000000..6b8537e
--- /dev/null
+++ b/lirc-0.8.6-devinput-conf-update.patch
@@ -0,0 +1,1340 @@
+Index: lirc-0.8.6/remotes/devinput/lircd.conf.devinput
+===================================================================
+--- lirc-0.8.6.orig/remotes/devinput/lircd.conf.devinput
++++ lirc-0.8.6/remotes/devinput/lircd.conf.devinput
+@@ -1,416 +1,926 @@
+ # generated by devinput.sh
+ begin remote
++        name            devinput
++        bits            16
++        eps             30
++        aeps            100
++        pre_data_bits   16
++        pre_data        0x0001
++        post_data_bits  32
++        post_data       0x00000001
++        gap             132799
++        toggle_bit      0
+ 
+-  name  devinput
+-  bits           16
+-  eps            30
+-  aeps          100
+-
+-  one             0     0
+-  zero            0     0
+-  pre_data_bits   16
+-  pre_data       0x8001
+-  gap          132799
+-  toggle_bit_mask 0x0
++	begin codes
++		KEY_0			11
++		KEY_102ND		86
++		KEY_1			2
++		KEY_2			3
++		KEY_3			4
++		KEY_4			5
++		KEY_5			6
++		KEY_6			7
++		KEY_7			8
++		KEY_8			9
++		KEY_9			10
++		KEY_A			30
++		KEY_AB			0x196
++		KEY_ADDRESSBOOK		0x1ad
++		KEY_AGAIN		129
++		KEY_ALTERASE		222
++		KEY_ANGLE		0x173
++		KEY_APOSTROPHE		40
++		KEY_ARCHIVE		0x169
++		KEY_AUDIO		0x188
++		KEY_AUX			0x186
++		KEY_B			48
++		KEY_BACK		158
++		KEY_BACKSLASH		43
++		KEY_BACKSPACE		14
++		KEY_BASSBOOST		209
++		KEY_BATTERY		236
++		KEY_BLUE		0x191
++		KEY_BLUETOOTH		237
++		KEY_BOOKMARKS		156
++		KEY_BREAK		0x19b
++		KEY_BRIGHTNESS_CYCLE	243
++		KEY_BRIGHTNESSDOWN	224
++		KEY_BRIGHTNESSUP	225
++		KEY_BRIGHTNESS_ZERO	244
++		KEY_BRL_DOT10		0x1fa
++		KEY_BRL_DOT1		0x1f1
++		KEY_BRL_DOT2		0x1f2
++		KEY_BRL_DOT3		0x1f3
++		KEY_BRL_DOT4		0x1f4
++		KEY_BRL_DOT5		0x1f5
++		KEY_BRL_DOT6		0x1f6
++		KEY_BRL_DOT7		0x1f7
++		KEY_BRL_DOT8		0x1f8
++		KEY_BRL_DOT9		0x1f9
++		KEY_C			46
++		KEY_CALC		140
++		KEY_CALENDAR		0x18d
++		KEY_CAMERA		212
++		KEY_CAMERA_FOCUS	0x210
++		KEY_CANCEL		223
++		KEY_CAPSLOCK		58
++		KEY_CD			0x17f
++		KEY_CHANNEL		0x16b
++		KEY_CHANNELDOWN		0x193
++		KEY_CHANNELUP		0x192
++		KEY_CHAT		216
++		KEY_CLEAR		0x163
++		KEY_CLOSE		206
++		KEY_CLOSECD		160
++		KEY_COFFEE		152
++		KEY_COMMA		51
++		KEY_COMPOSE		127
++		KEY_COMPUTER		157
++		KEY_CONFIG		171
++		KEY_CONNECT		218
++		KEY_CONTEXT_MENU	0x1b6
++		KEY_COPY		133
++		KEY_CUT			137
++		KEY_CYCLEWINDOWS	154
++		KEY_D			32
++		KEY_DASHBOARD		204
++		KEY_DATABASE		0x1aa
++		KEY_DEL_EOL		0x1c0
++		KEY_DEL_EOS		0x1c1
++		KEY_DELETE		111
++		KEY_DELETEFILE		146
++		KEY_DEL_LINE		0x1c3
++		KEY_DIGITS		0x19d
++		KEY_DIRECTION		153
++		KEY_DIRECTORY		0x18a
++		KEY_DISPLAY_OFF		245
++		KEY_DISPLAYTOGGLE	0x1af
++		KEY_DOCUMENTS		235
++		KEY_DOLLAR		0x1b2
++		KEY_DOT			52
++		KEY_DOWN		108
++		KEY_DVD			0x185
++		KEY_E			18
++		KEY_EDIT		176
++		KEY_EDITOR		0x1a6
++		KEY_EJECTCD		161
++		KEY_EJECTCLOSECD	162
++		KEY_EMAIL		215
++		KEY_END			107
++		KEY_ENTER		28
++		KEY_EPG			0x16d
++		KEY_EQUAL		13
++		KEY_ESC			1
++		KEY_EURO		0x1b3
++		KEY_EXIT		174
++		KEY_F10			68
++		KEY_F11			87
++		KEY_F12			88
++		KEY_F13			183
++		KEY_F14			184
++		KEY_F15			185
++		KEY_F1			59
++		KEY_F16			186
++		KEY_F17			187
++		KEY_F18			188
++		KEY_F19			189
++		KEY_F20			190
++		KEY_F21			191
++		KEY_F22			192
++		KEY_F23			193
++		KEY_F24			194
++		KEY_F2			60
++		KEY_F			33
++		KEY_F3			61
++		KEY_F4			62
++		KEY_F5			63
++		KEY_F6			64
++		KEY_F7			65
++		KEY_F8			66
++		KEY_F9			67
++		KEY_FASTFORWARD		208
++		KEY_FAVORITES		0x16c
++		KEY_FILE		144
++		KEY_FINANCE		219
++		KEY_FIND		136
++		KEY_FIRST		0x194
++		KEY_FN			0x1d0
++		KEY_FN_1		0x1de
++		KEY_FN_2		0x1df
++		KEY_FN_B		0x1e4
++		KEY_FN_D		0x1e0
++		KEY_FN_E		0x1e1
++		KEY_FN_ESC		0x1d1
++		KEY_FN_F		0x1e2
++		KEY_FN_F10		0x1db
++		KEY_FN_F1		0x1d2
++		KEY_FN_F11		0x1dc
++		KEY_FN_F12		0x1dd
++		KEY_FN_F2		0x1d3
++		KEY_FN_F3		0x1d4
++		KEY_FN_F4		0x1d5
++		KEY_FN_F5		0x1d6
++		KEY_FN_F6		0x1d7
++		KEY_FN_F7		0x1d8
++		KEY_FN_F8		0x1d9
++		KEY_FN_F9		0x1da
++		KEY_FN_S		0x1e3
++		KEY_FORWARD		159
++		KEY_FORWARDMAIL		233
++		KEY_FRAMEBACK		0x1b4
++		KEY_FRAMEFORWARD	0x1b5
++		KEY_FRONT		132
++		KEY_G			34
++		KEY_GAMES		0x1a1
++		KEY_GOTO		0x162
++		KEY_GRAPHICSEDITOR	0x1a8
++		KEY_GRAVE		41
++		KEY_GREEN		0x18f
++		KEY_H			35
++		KEY_HANGEUL		122
++		KEY_HANJA		123
++		KEY_HELP		138
++		KEY_HENKAN		92
++		KEY_HIRAGANA		91
++		KEY_HOME		102
++		KEY_HOMEPAGE		172
++		KEY_HP			211
++		KEY_I			23
++		KEY_INFO		0x166
++		KEY_INSERT		110
++		KEY_INS_LINE		0x1c2
++		KEY_ISO			170
++		KEY_J			36
++		KEY_K			37
++		KEY_KATAKANA		90
++		KEY_KATAKANAHIRAGANA	93
++		KEY_KBDILLUMDOWN	229
++		KEY_KBDILLUMTOGGLE	228
++		KEY_KBDILLUMUP		230
++		KEY_KEYBOARD		0x176
++		KEY_KP0			82
++		KEY_KP1			79
++		KEY_KP2			80
++		KEY_KP3			81
++		KEY_KP4			75
++		KEY_KP5			76
++		KEY_KP6			77
++		KEY_KP7			71
++		KEY_KP8			72
++		KEY_KP9			73
++		KEY_KPASTERISK		55
++		KEY_KPCOMMA		121
++		KEY_KPDOT		83
++		KEY_KPENTER		96
++		KEY_KPEQUAL		117
++		KEY_KPJPCOMMA		95
++		KEY_KPLEFTPAREN		179
++		KEY_KPMINUS		74
++		KEY_KPPLUS		78
++		KEY_KPPLUSMINUS		118
++		KEY_KPRIGHTPAREN	180
++		KEY_KPSLASH		98
++		KEY_L			38
++		KEY_LANGUAGE		0x170
++		KEY_LAST		0x195
++		KEY_LEFT		105
++		KEY_LEFTALT		56
++		KEY_LEFTBRACE		26
++		KEY_LEFTCTRL		29
++		KEY_LEFTMETA		125
++		KEY_LEFTSHIFT		42
++		KEY_LINEFEED		101
++		KEY_LIST		0x18b
++		KEY_LOGOFF		0x1b1
++		KEY_M			50
++		KEY_MACRO		112
++		KEY_MAIL		155
++		KEY_MAX			0x2ff
++		KEY_MEDIA		226
++		KEY_MEDIA_REPEAT	0x1b7
++		KEY_MEMO		0x18c
++		KEY_MENU		139
++		KEY_MESSENGER		0x1ae
++		KEY_MHP			0x16f
++		KEY_MINUS		12
++		KEY_MODE		0x175
++		KEY_MOVE		175
++		KEY_MP3			0x187
++		KEY_MSDOS		151
++		KEY_MUHENKAN		94
++		KEY_MUTE		113
++		KEY_N			49
++		KEY_NEW			181
++		KEY_NEWS		0x1ab
++		KEY_NEXT		0x197
++		KEY_NEXTSONG		163
++		KEY_NUMERIC_0		0x200
++		KEY_NUMERIC_1		0x201
++		KEY_NUMERIC_2		0x202
++		KEY_NUMERIC_3		0x203
++		KEY_NUMERIC_4		0x204
++		KEY_NUMERIC_5		0x205
++		KEY_NUMERIC_6		0x206
++		KEY_NUMERIC_7		0x207
++		KEY_NUMERIC_8		0x208
++		KEY_NUMERIC_9		0x209
++		KEY_NUMERIC_POUND	0x20b
++		KEY_NUMERIC_STAR	0x20a
++		KEY_NUMLOCK		69
++		KEY_O			24
++		KEY_OK			0x160
++		KEY_OPEN		134
++		KEY_OPTION		0x165
++		KEY_P			25
++		KEY_PAGEDOWN		109
++		KEY_PAGEUP		104
++		KEY_PASTE		135
++		KEY_PAUSE		119
++		KEY_PAUSECD		201
++		KEY_PC			0x178
++		KEY_PHONE		169
++		KEY_PLAY		207
++		KEY_PLAYCD		200
++		KEY_PLAYER		0x183
++		KEY_PLAYPAUSE		164
++		KEY_POWER		116
++		KEY_POWER2		0x164
++		KEY_PRESENTATION	0x1a9
++		KEY_PREVIOUS		0x19c
++		KEY_PREVIOUSSONG	165
++		KEY_PRINT		210
++		KEY_PROG1		148
++		KEY_PROG2		149
++		KEY_PROG3		202
++		KEY_PROG4		203
++		KEY_PROGRAM		0x16a
++		KEY_PROPS		130
++		KEY_PVR			0x16e
++		KEY_Q			16
++		KEY_QUESTION		214
++		KEY_R			19
++		KEY_RADIO		0x181
++		KEY_RECORD		167
++		KEY_RED			0x18e
++		KEY_REDO		182
++		KEY_REFRESH		173
++		KEY_REPLY		232
++		KEY_RESERVED		0
++		KEY_RESTART		0x198
++		KEY_REWIND		168
++		KEY_RFKILL		247
++		KEY_RIGHT		106
++		KEY_RIGHTALT		100
++		KEY_RIGHTBRACE		27
++		KEY_RIGHTCTRL		97
++		KEY_RIGHTMETA		126
++		KEY_RIGHTSHIFT		54
++		KEY_RO			89
++		KEY_S			31
++		KEY_SAT			0x17d
++		KEY_SAT2		0x17e
++		KEY_SAVE		234
++		KEY_SCALE		120
++		KEY_SCREEN		0x177
++		KEY_SCROLLDOWN		178
++		KEY_SCROLLLOCK		70
++		KEY_SCROLLUP		177
++		KEY_SEARCH		217
++		KEY_SELECT		0x161
++		KEY_SEMICOLON		39
++		KEY_SEND		231
++		KEY_SENDFILE		145
++		KEY_SETUP		141
++		KEY_SHOP		221
++		KEY_SHUFFLE		0x19a
++		KEY_SLASH		53
++		KEY_SLEEP		142
++		KEY_SLOW		0x199
++		KEY_SOUND		213
++		KEY_SPACE		57
++		KEY_SPELLCHECK		0x1b0
++		KEY_SPORT		220
++		KEY_SPREADSHEET		0x1a7
++		KEY_STOP		128
++		KEY_STOPCD		166
++		KEY_SUBTITLE		0x172
++		KEY_SUSPEND		205
++		KEY_SWITCHVIDEOMODE	227
++		KEY_SYSRQ		99
++		KEY_T			20
++		KEY_TAB			15
++		KEY_TAPE		0x180
++		KEY_TEEN		0x19e
++		KEY_TEXT		0x184
++		KEY_TIME		0x167
++		KEY_TITLE		0x171
++		KEY_TUNER		0x182
++		KEY_TV			0x179
++		KEY_TV2			0x17a
++		KEY_TWEN		0x19f
++		KEY_U			22
++		KEY_UNDO		131
++		KEY_UNKNOWN		240
++		KEY_UP			103
++		KEY_UWB			239
++		KEY_V			47
++		KEY_VCR			0x17b
++		KEY_VCR2		0x17c
++		KEY_VENDOR		0x168
++		KEY_VIDEO		0x189
++		KEY_VIDEO_NEXT		241
++		KEY_VIDEOPHONE		0x1a0
++		KEY_VIDEO_PREV		242
++		KEY_VOICEMAIL		0x1ac
++		KEY_VOLUMEDOWN		114
++		KEY_VOLUMEUP		115
++		KEY_W			17
++		KEY_WAKEUP		143
++		KEY_WIMAX		246
++		KEY_WLAN		238
++		KEY_WORDPROCESSOR	0x1a5
++		KEY_WWW			150
++		KEY_X			45
++		KEY_XFER		147
++		KEY_Y			21
++		KEY_YELLOW		0x190
++		KEY_YEN			124
++		KEY_Z			44
++		KEY_ZENKAKUHANKAKU	85
++		KEY_ZOOM		0x174
++		KEY_ZOOMIN		0x1a2
++		KEY_ZOOMOUT		0x1a3
++		KEY_ZOOMRESET		0x1a4
++		BTN_0			0x100
++		BTN_1			0x101
++		BTN_2			0x102
++		BTN_3			0x103
++		BTN_4			0x104
++		BTN_5			0x105
++		BTN_6			0x106
++		BTN_7			0x107
++		BTN_8			0x108
++		BTN_9			0x109
++		BTN_A			0x130
++		BTN_B			0x131
++		BTN_BACK		0x116
++		BTN_BASE		0x126
++		BTN_BASE2		0x127
++		BTN_BASE3		0x128
++		BTN_BASE4		0x129
++		BTN_BASE5		0x12a
++		BTN_BASE6		0x12b
++		BTN_C			0x132
++		BTN_DEAD		0x12f
++		BTN_DIGI		0x140
++		BTN_EXTRA		0x114
++		BTN_FORWARD		0x115
++		BTN_GAMEPAD		0x130
++		BTN_GEAR_DOWN		0x150
++		BTN_GEAR_UP		0x151
++		BTN_JOYSTICK		0x120
++		BTN_LEFT		0x110
++		BTN_MIDDLE		0x112
++		BTN_MISC		0x100
++		BTN_MODE		0x13c
++		BTN_MOUSE		0x110
++		BTN_PINKIE		0x125
++		BTN_RIGHT		0x111
++		BTN_SELECT		0x13a
++		BTN_SIDE		0x113
++		BTN_START		0x13b
++		BTN_STYLUS		0x14b
++		BTN_STYLUS2		0x14c
++		BTN_TASK		0x117
++		BTN_THUMB		0x121
++		BTN_THUMB2		0x122
++		BTN_THUMBL		0x13d
++		BTN_THUMBR		0x13e
++		BTN_TL			0x136
++		BTN_TL2			0x138
++		BTN_TOOL_AIRBRUSH	0x144
++		BTN_TOOL_BRUSH		0x142
++		BTN_TOOL_DOUBLETAP	0x14d
++		BTN_TOOL_FINGER		0x145
++		BTN_TOOL_LENS		0x147
++		BTN_TOOL_MOUSE		0x146
++		BTN_TOOL_PEN		0x140
++		BTN_TOOL_PENCIL		0x143
++		BTN_TOOL_QUADTAP	0x14f
++		BTN_TOOL_RUBBER		0x141
++		BTN_TOOL_TRIPLETAP	0x14e
++		BTN_TOP			0x123
++		BTN_TOP2		0x124
++		BTN_TOUCH		0x14a
++		BTN_TR			0x137
++		BTN_TR2			0x139
++		BTN_TRIGGER		0x120
++		BTN_WHEEL		0x150
++		BTN_X			0x133
++		BTN_Y			0x134
++		BTN_Z			0x135
++	end codes
++end remote
+ 
+-      begin codes
+-          KEY_0                    0x000B
+-          KEY_102ND                0x0056
+-          KEY_1                    0x0002
+-          KEY_2                    0x0003
+-          KEY_3                    0x0004
+-          KEY_4                    0x0005
+-          KEY_5                    0x0006
+-          KEY_6                    0x0007
+-          KEY_7                    0x0008
+-          KEY_8                    0x0009
+-          KEY_9                    0x000A
+-          KEY_A                    0x001E
+-          KEY_AB                   0x0196
+-          KEY_AGAIN                0x0081
+-          KEY_ALTERASE             0x00DE
+-          KEY_ANGLE                0x0173
+-          KEY_APOSTROPHE           0x0028
+-          KEY_ARCHIVE              0x0169
+-          KEY_AUDIO                0x0188
+-          KEY_AUX                  0x0186
+-          KEY_B                    0x0030
+-          KEY_BACK                 0x009E
+-          KEY_BACKSLASH            0x002B
+-          KEY_BACKSPACE            0x000E
+-          KEY_BASSBOOST            0x00D1
+-          KEY_BATTERY              0x00EC
+-          KEY_BLUE                 0x0191
+-          KEY_BOOKMARKS            0x009C
+-          KEY_BREAK                0x019B
+-          KEY_BRIGHTNESSDOWN       0x00E0
+-          KEY_BRIGHTNESSUP         0x00E1
+-          KEY_BRL_DOT1             0x01F1
+-          KEY_BRL_DOT2             0x01F2
+-          KEY_BRL_DOT3             0x01F3
+-          KEY_BRL_DOT4             0x01F4
+-          KEY_BRL_DOT5             0x01F5
+-          KEY_BRL_DOT6             0x01F6
+-          KEY_BRL_DOT7             0x01F7
+-          KEY_BRL_DOT8             0x01F8
+-          KEY_C                    0x002E
+-          KEY_CALC                 0x008C
+-          KEY_CALENDAR             0x018D
+-          KEY_CAMERA               0x00D4
+-          KEY_CANCEL               0x00DF
+-          KEY_CAPSLOCK             0x003A
+-          KEY_CD                   0x017F
+-          KEY_CHANNEL              0x016B
+-          KEY_CHANNELDOWN          0x0193
+-          KEY_CHANNELUP            0x0192
+-          KEY_CHAT                 0x00D8
+-          KEY_CLEAR                0x0163
+-          KEY_CLOSE                0x00CE
+-          KEY_CLOSECD              0x00A0
+-          KEY_COFFEE               0x0098
+-          KEY_COMMA                0x0033
+-          KEY_COMPOSE              0x007F
+-          KEY_COMPUTER             0x009D
+-          KEY_CONFIG               0x00AB
+-          KEY_CONNECT              0x00DA
+-          KEY_COPY                 0x0085
+-          KEY_CUT                  0x0089
+-          KEY_CYCLEWINDOWS         0x009A
+-          KEY_D                    0x0020
+-          KEY_DEL_EOL              0x01C0
+-          KEY_DEL_EOS              0x01C1
+-          KEY_DELETE               0x006F
+-          KEY_DELETEFILE           0x0092
+-          KEY_DEL_LINE             0x01C3
+-          KEY_DIGITS               0x019D
+-          KEY_DIRECTION            0x0099
+-          KEY_DIRECTORY            0x018A
+-          KEY_DOCUMENTS            0x00EB
+-          KEY_DOT                  0x0034
+-          KEY_DOWN                 0x006C
+-          KEY_DVD                  0x0185
+-          KEY_E                    0x0012
+-          KEY_EDIT                 0x00B0
+-          KEY_EJECTCD              0x00A1
+-          KEY_EJECTCLOSECD         0x00A2
+-          KEY_EMAIL                0x00D7
+-          KEY_END                  0x006B
+-          KEY_ENTER                0x001C
+-          KEY_EPG                  0x016D
+-          KEY_EQUAL                0x000D
+-          KEY_ESC                  0x0001
+-          KEY_EXIT                 0x00AE
+-          KEY_F10                  0x0044
+-          KEY_F11                  0x0057
+-          KEY_F12                  0x0058
+-          KEY_F13                  0x00B7
+-          KEY_F14                  0x00B8
+-          KEY_F15                  0x00B9
+-          KEY_F1                   0x003B
+-          KEY_F16                  0x00BA
+-          KEY_F17                  0x00BB
+-          KEY_F18                  0x00BC
+-          KEY_F19                  0x00BD
+-          KEY_F20                  0x00BE
+-          KEY_F21                  0x00BF
+-          KEY_F22                  0x00C0
+-          KEY_F23                  0x00C1
+-          KEY_F24                  0x00C2
+-          KEY_F2                   0x003C
+-          KEY_F                    0x0021
+-          KEY_F3                   0x003D
+-          KEY_F4                   0x003E
+-          KEY_F5                   0x003F
+-          KEY_F6                   0x0040
+-          KEY_F7                   0x0041
+-          KEY_F8                   0x0042
+-          KEY_F9                   0x0043
+-          KEY_FASTFORWARD          0x00D0
+-          KEY_FAVORITES            0x016C
+-          KEY_FILE                 0x0090
+-          KEY_FINANCE              0x00DB
+-          KEY_FIND                 0x0088
+-          KEY_FIRST                0x0194
+-          KEY_FN                   0x01D0
+-          KEY_FN_1                 0x01DE
+-          KEY_FN_2                 0x01DF
+-          KEY_FN_B                 0x01E4
+-          KEY_FN_D                 0x01E0
+-          KEY_FN_E                 0x01E1
+-          KEY_FN_ESC               0x01D1
+-          KEY_FN_F                 0x01E2
+-          KEY_FN_F10               0x01DB
+-          KEY_FN_F1                0x01D2
+-          KEY_FN_F11               0x01DC
+-          KEY_FN_F12               0x01DD
+-          KEY_FN_F2                0x01D3
+-          KEY_FN_F3                0x01D4
+-          KEY_FN_F4                0x01D5
+-          KEY_FN_F5                0x01D6
+-          KEY_FN_F6                0x01D7
+-          KEY_FN_F7                0x01D8
+-          KEY_FN_F8                0x01D9
+-          KEY_FN_F9                0x01DA
+-          KEY_FN_S                 0x01E3
+-          KEY_FORWARD              0x009F
+-          KEY_FORWARDMAIL          0x00E9
+-          KEY_FRONT                0x0084
+-          KEY_G                    0x0022
+-          KEY_GOTO                 0x0162
+-          KEY_GRAVE                0x0029
+-          KEY_GREEN                0x018F
+-          KEY_H                    0x0023
+-          KEY_HANGEUL              0x007A
+-          KEY_HANJA                0x007B
+-          KEY_HELP                 0x008A
+-          KEY_HENKAN               0x005C
+-          KEY_HIRAGANA             0x005B
+-          KEY_HOME                 0x0066
+-          KEY_HOMEPAGE             0x00AC
+-          KEY_HP                   0x00D3
+-          KEY_I                    0x0017
+-          KEY_INFO                 0x0166
+-          KEY_INSERT               0x006E
+-          KEY_INS_LINE             0x01C2
+-          KEY_ISO                  0x00AA
+-          KEY_J                    0x0024
+-          KEY_K                    0x0025
+-          KEY_KATAKANA             0x005A
+-          KEY_KATAKANAHIRAGANA     0x005D
+-          KEY_KBDILLUMDOWN         0x00E5
+-          KEY_KBDILLUMTOGGLE       0x00E4
+-          KEY_KBDILLUMUP           0x00E6
+-          KEY_KEYBOARD             0x0176
+-          KEY_KP0                  0x0052
+-          KEY_KP1                  0x004F
+-          KEY_KP2                  0x0050
+-          KEY_KP3                  0x0051
+-          KEY_KP4                  0x004B
+-          KEY_KP5                  0x004C
+-          KEY_KP6                  0x004D
+-          KEY_KP7                  0x0047
+-          KEY_KP8                  0x0048
+-          KEY_KP9                  0x0049
+-          KEY_KPASTERISK           0x0037
+-          KEY_KPCOMMA              0x0079
+-          KEY_KPDOT                0x0053
+-          KEY_KPENTER              0x0060
+-          KEY_KPEQUAL              0x0075
+-          KEY_KPJPCOMMA            0x005F
+-          KEY_KPLEFTPAREN          0x00B3
+-          KEY_KPMINUS              0x004A
+-          KEY_KPPLUS               0x004E
+-          KEY_KPPLUSMINUS          0x0076
+-          KEY_KPRIGHTPAREN         0x00B4
+-          KEY_KPSLASH              0x0062
+-          KEY_L                    0x0026
+-          KEY_LANGUAGE             0x0170
+-          KEY_LAST                 0x0195
+-          KEY_LEFT                 0x0069
+-          KEY_LEFTALT              0x0038
+-          KEY_LEFTBRACE            0x001A
+-          KEY_LEFTCTRL             0x001D
+-          KEY_LEFTMETA             0x007D
+-          KEY_LEFTSHIFT            0x002A
+-          KEY_LINEFEED             0x0065
+-          KEY_LIST                 0x018B
+-          KEY_M                    0x0032
+-          KEY_MACRO                0x0070
+-          KEY_MAIL                 0x009B
+-          KEY_MAX                  0x01FF
+-          KEY_MEDIA                0x00E2
+-          KEY_MEMO                 0x018C
+-          KEY_MENU                 0x008B
+-          KEY_MHP                  0x016F
+-          KEY_MINUS                0x000C
+-          KEY_MODE                 0x0175
+-          KEY_MOVE                 0x00AF
+-          KEY_MP3                  0x0187
+-          KEY_MSDOS                0x0097
+-          KEY_MUHENKAN             0x005E
+-          KEY_MUTE                 0x0071
+-          KEY_N                    0x0031
+-          KEY_NEW                  0x00B5
+-          KEY_NEXT                 0x0197
+-          KEY_NEXTSONG             0x00A3
+-          KEY_NUMLOCK              0x0045
+-          KEY_O                    0x0018
+-          KEY_OK                   0x0160
+-          KEY_OPEN                 0x0086
+-          KEY_OPTION               0x0165
+-          KEY_P                    0x0019
+-          KEY_PAGEDOWN             0x006D
+-          KEY_PAGEUP               0x0068
+-          KEY_PASTE                0x0087
+-          KEY_PAUSE                0x0077
+-          KEY_PAUSECD              0x00C9
+-          KEY_PC                   0x0178
+-          KEY_PHONE                0x00A9
+-          KEY_PLAY                 0x00CF
+-          KEY_PLAYCD               0x00C8
+-          KEY_PLAYER               0x0183
+-          KEY_PLAYPAUSE            0x00A4
+-          KEY_POWER                0x0074
+-          KEY_POWER2               0x0164
+-          KEY_PREVIOUS             0x019C
+-          KEY_PREVIOUSSONG         0x00A5
+-          KEY_PRINT                0x00D2
+-          KEY_PROG1                0x0094
+-          KEY_PROG2                0x0095
+-          KEY_PROG3                0x00CA
+-          KEY_PROG4                0x00CB
+-          KEY_PROGRAM              0x016A
+-          KEY_PROPS                0x0082
+-          KEY_PVR                  0x016E
+-          KEY_Q                    0x0010
+-          KEY_QUESTION             0x00D6
+-          KEY_R                    0x0013
+-          KEY_RADIO                0x0181
+-          KEY_RECORD               0x00A7
+-          KEY_RED                  0x018E
+-          KEY_REDO                 0x00B6
+-          KEY_REFRESH              0x00AD
+-          KEY_REPLY                0x00E8
+-          KEY_RESERVED             0x0000
+-          KEY_RESTART              0x0198
+-          KEY_REWIND               0x00A8
+-          KEY_RIGHT                0x006A
+-          KEY_RIGHTALT             0x0064
+-          KEY_RIGHTBRACE           0x001B
+-          KEY_RIGHTCTRL            0x0061
+-          KEY_RIGHTMETA            0x007E
+-          KEY_RIGHTSHIFT           0x0036
+-          KEY_RO                   0x0059
+-          KEY_S                    0x001F
+-          KEY_SAT                  0x017D
+-          KEY_SAT2                 0x017E
+-          KEY_SAVE                 0x00EA
+-          KEY_SCREEN               0x0177
+-          KEY_SCROLLDOWN           0x00B2
+-          KEY_SCROLLLOCK           0x0046
+-          KEY_SCROLLUP             0x00B1
+-          KEY_SEARCH               0x00D9
+-          KEY_SELECT               0x0161
+-          KEY_SEMICOLON            0x0027
+-          KEY_SEND                 0x00E7
+-          KEY_SENDFILE             0x0091
+-          KEY_SETUP                0x008D
+-          KEY_SHOP                 0x00DD
+-          KEY_SHUFFLE              0x019A
+-          KEY_SLASH                0x0035
+-          KEY_SLEEP                0x008E
+-          KEY_SLOW                 0x0199
+-          KEY_SOUND                0x00D5
+-          KEY_SPACE                0x0039
+-          KEY_SPORT                0x00DC
+-          KEY_STOP                 0x0080
+-          KEY_STOPCD               0x00A6
+-          KEY_SUBTITLE             0x0172
+-          KEY_SUSPEND              0x00CD
+-          KEY_SWITCHVIDEOMODE      0x00E3
+-          KEY_SYSRQ                0x0063
+-          KEY_T                    0x0014
+-          KEY_TAB                  0x000F
+-          KEY_TAPE                 0x0180
+-          KEY_TEEN                 0x019E
+-          KEY_TEXT                 0x0184
+-          KEY_TIME                 0x0167
+-          KEY_TITLE                0x0171
+-          KEY_TUNER                0x0182
+-          KEY_TV                   0x0179
+-          KEY_TV2                  0x017A
+-          KEY_TWEN                 0x019F
+-          KEY_U                    0x0016
+-          KEY_UNDO                 0x0083
+-          KEY_UNKNOWN              0x00F0
+-          KEY_UP                   0x0067
+-          KEY_V                    0x002F
+-          KEY_VCR                  0x017B
+-          KEY_VCR2                 0x017C
+-          KEY_VENDOR               0x0168
+-          KEY_VIDEO                0x0189
+-          KEY_VOLUMEDOWN           0x0072
+-          KEY_VOLUMEUP             0x0073
+-          KEY_W                    0x0011
+-          KEY_WAKEUP               0x008F
+-          KEY_WWW                  0x0096
+-          KEY_X                    0x002D
+-          KEY_XFER                 0x0093
+-          KEY_Y                    0x0015
+-          KEY_YELLOW               0x0190
+-          KEY_YEN                  0x007C
+-          KEY_Z                    0x002C
+-          KEY_ZENKAKUHANKAKU       0x0055
+-          KEY_ZOOM                 0x0174
+-          BTN_0                    0x0100
+-          BTN_1                    0x0101
+-          BTN_2                    0x0102
+-          BTN_3                    0x0103
+-          BTN_4                    0x0104
+-          BTN_5                    0x0105
+-          BTN_6                    0x0106
+-          BTN_7                    0x0107
+-          BTN_8                    0x0108
+-          BTN_9                    0x0109
+-          BTN_A                    0x0130
+-          BTN_B                    0x0131
+-          BTN_BACK                 0x0116
+-          BTN_BASE                 0x0126
+-          BTN_BASE2                0x0127
+-          BTN_BASE3                0x0128
+-          BTN_BASE4                0x0129
+-          BTN_BASE5                0x012A
+-          BTN_BASE6                0x012B
+-          BTN_C                    0x0132
+-          BTN_DEAD                 0x012F
+-          BTN_DIGI                 0x0140
+-          BTN_EXTRA                0x0114
+-          BTN_FORWARD              0x0115
+-          BTN_GAMEPAD              0x0130
+-          BTN_GEAR_DOWN            0x0150
+-          BTN_GEAR_UP              0x0151
+-          BTN_JOYSTICK             0x0120
+-          BTN_LEFT                 0x0110
+-          BTN_MIDDLE               0x0112
+-          BTN_MISC                 0x0100
+-          BTN_MODE                 0x013C
+-          BTN_MOUSE                0x0110
+-          BTN_PINKIE               0x0125
+-          BTN_RIGHT                0x0111
+-          BTN_SELECT               0x013A
+-          BTN_SIDE                 0x0113
+-          BTN_START                0x013B
+-          BTN_STYLUS               0x014B
+-          BTN_STYLUS2              0x014C
+-          BTN_TASK                 0x0117
+-          BTN_THUMB                0x0121
+-          BTN_THUMB2               0x0122
+-          BTN_THUMBL               0x013D
+-          BTN_THUMBR               0x013E
+-          BTN_TL                   0x0136
+-          BTN_TL2                  0x0138
+-          BTN_TOOL_AIRBRUSH        0x0144
+-          BTN_TOOL_BRUSH           0x0142
+-          BTN_TOOL_DOUBLETAP       0x014D
+-          BTN_TOOL_FINGER          0x0145
+-          BTN_TOOL_LENS            0x0147
+-          BTN_TOOL_MOUSE           0x0146
+-          BTN_TOOL_PEN             0x0140
+-          BTN_TOOL_PENCIL          0x0143
+-          BTN_TOOL_RUBBER          0x0141
+-          BTN_TOOL_TRIPLETAP       0x014E
+-          BTN_TOP                  0x0123
+-          BTN_TOP2                 0x0124
+-          BTN_TOUCH                0x014A
+-          BTN_TR                   0x0137
+-          BTN_TR2                  0x0139
+-          BTN_TRIGGER              0x0120
+-          BTN_WHEEL                0x0150
+-          BTN_X                    0x0133
+-          BTN_Y                    0x0134
+-          BTN_Z                    0x0135
+-      end codes
++# generated by devinput.sh (obsolete 32 bit version)
++begin remote
++        name            devinput32
++        bits            16
++        eps             30
++        aeps            100
++        pre_data_bits   16
++        pre_data        0x8001
++        gap             132799
++        toggle_bit      0
+ 
++	begin codes
++		KEY_0			11
++		KEY_102ND		86
++		KEY_1			2
++		KEY_2			3
++		KEY_3			4
++		KEY_4			5
++		KEY_5			6
++		KEY_6			7
++		KEY_7			8
++		KEY_8			9
++		KEY_9			10
++		KEY_A			30
++		KEY_AB			0x196
++		KEY_ADDRESSBOOK		0x1ad
++		KEY_AGAIN		129
++		KEY_ALTERASE		222
++		KEY_ANGLE		0x173
++		KEY_APOSTROPHE		40
++		KEY_ARCHIVE		0x169
++		KEY_AUDIO		0x188
++		KEY_AUX			0x186
++		KEY_B			48
++		KEY_BACK		158
++		KEY_BACKSLASH		43
++		KEY_BACKSPACE		14
++		KEY_BASSBOOST		209
++		KEY_BATTERY		236
++		KEY_BLUE		0x191
++		KEY_BLUETOOTH		237
++		KEY_BOOKMARKS		156
++		KEY_BREAK		0x19b
++		KEY_BRIGHTNESS_CYCLE	243
++		KEY_BRIGHTNESSDOWN	224
++		KEY_BRIGHTNESSUP	225
++		KEY_BRIGHTNESS_ZERO	244
++		KEY_BRL_DOT10		0x1fa
++		KEY_BRL_DOT1		0x1f1
++		KEY_BRL_DOT2		0x1f2
++		KEY_BRL_DOT3		0x1f3
++		KEY_BRL_DOT4		0x1f4
++		KEY_BRL_DOT5		0x1f5
++		KEY_BRL_DOT6		0x1f6
++		KEY_BRL_DOT7		0x1f7
++		KEY_BRL_DOT8		0x1f8
++		KEY_BRL_DOT9		0x1f9
++		KEY_C			46
++		KEY_CALC		140
++		KEY_CALENDAR		0x18d
++		KEY_CAMERA		212
++		KEY_CAMERA_FOCUS	0x210
++		KEY_CANCEL		223
++		KEY_CAPSLOCK		58
++		KEY_CD			0x17f
++		KEY_CHANNEL		0x16b
++		KEY_CHANNELDOWN		0x193
++		KEY_CHANNELUP		0x192
++		KEY_CHAT		216
++		KEY_CLEAR		0x163
++		KEY_CLOSE		206
++		KEY_CLOSECD		160
++		KEY_COFFEE		152
++		KEY_COMMA		51
++		KEY_COMPOSE		127
++		KEY_COMPUTER		157
++		KEY_CONFIG		171
++		KEY_CONNECT		218
++		KEY_CONTEXT_MENU	0x1b6
++		KEY_COPY		133
++		KEY_CUT			137
++		KEY_CYCLEWINDOWS	154
++		KEY_D			32
++		KEY_DASHBOARD		204
++		KEY_DATABASE		0x1aa
++		KEY_DEL_EOL		0x1c0
++		KEY_DEL_EOS		0x1c1
++		KEY_DELETE		111
++		KEY_DELETEFILE		146
++		KEY_DEL_LINE		0x1c3
++		KEY_DIGITS		0x19d
++		KEY_DIRECTION		153
++		KEY_DIRECTORY		0x18a
++		KEY_DISPLAY_OFF		245
++		KEY_DISPLAYTOGGLE	0x1af
++		KEY_DOCUMENTS		235
++		KEY_DOLLAR		0x1b2
++		KEY_DOT			52
++		KEY_DOWN		108
++		KEY_DVD			0x185
++		KEY_E			18
++		KEY_EDIT		176
++		KEY_EDITOR		0x1a6
++		KEY_EJECTCD		161
++		KEY_EJECTCLOSECD	162
++		KEY_EMAIL		215
++		KEY_END			107
++		KEY_ENTER		28
++		KEY_EPG			0x16d
++		KEY_EQUAL		13
++		KEY_ESC			1
++		KEY_EURO		0x1b3
++		KEY_EXIT		174
++		KEY_F10			68
++		KEY_F11			87
++		KEY_F12			88
++		KEY_F13			183
++		KEY_F14			184
++		KEY_F15			185
++		KEY_F1			59
++		KEY_F16			186
++		KEY_F17			187
++		KEY_F18			188
++		KEY_F19			189
++		KEY_F20			190
++		KEY_F21			191
++		KEY_F22			192
++		KEY_F23			193
++		KEY_F24			194
++		KEY_F2			60
++		KEY_F			33
++		KEY_F3			61
++		KEY_F4			62
++		KEY_F5			63
++		KEY_F6			64
++		KEY_F7			65
++		KEY_F8			66
++		KEY_F9			67
++		KEY_FASTFORWARD		208
++		KEY_FAVORITES		0x16c
++		KEY_FILE		144
++		KEY_FINANCE		219
++		KEY_FIND		136
++		KEY_FIRST		0x194
++		KEY_FN			0x1d0
++		KEY_FN_1		0x1de
++		KEY_FN_2		0x1df
++		KEY_FN_B		0x1e4
++		KEY_FN_D		0x1e0
++		KEY_FN_E		0x1e1
++		KEY_FN_ESC		0x1d1
++		KEY_FN_F		0x1e2
++		KEY_FN_F10		0x1db
++		KEY_FN_F1		0x1d2
++		KEY_FN_F11		0x1dc
++		KEY_FN_F12		0x1dd
++		KEY_FN_F2		0x1d3
++		KEY_FN_F3		0x1d4
++		KEY_FN_F4		0x1d5
++		KEY_FN_F5		0x1d6
++		KEY_FN_F6		0x1d7
++		KEY_FN_F7		0x1d8
++		KEY_FN_F8		0x1d9
++		KEY_FN_F9		0x1da
++		KEY_FN_S		0x1e3
++		KEY_FORWARD		159
++		KEY_FORWARDMAIL		233
++		KEY_FRAMEBACK		0x1b4
++		KEY_FRAMEFORWARD	0x1b5
++		KEY_FRONT		132
++		KEY_G			34
++		KEY_GAMES		0x1a1
++		KEY_GOTO		0x162
++		KEY_GRAPHICSEDITOR	0x1a8
++		KEY_GRAVE		41
++		KEY_GREEN		0x18f
++		KEY_H			35
++		KEY_HANGEUL		122
++		KEY_HANJA		123
++		KEY_HELP		138
++		KEY_HENKAN		92
++		KEY_HIRAGANA		91
++		KEY_HOME		102
++		KEY_HOMEPAGE		172
++		KEY_HP			211
++		KEY_I			23
++		KEY_INFO		0x166
++		KEY_INSERT		110
++		KEY_INS_LINE		0x1c2
++		KEY_ISO			170
++		KEY_J			36
++		KEY_K			37
++		KEY_KATAKANA		90
++		KEY_KATAKANAHIRAGANA	93
++		KEY_KBDILLUMDOWN	229
++		KEY_KBDILLUMTOGGLE	228
++		KEY_KBDILLUMUP		230
++		KEY_KEYBOARD		0x176
++		KEY_KP0			82
++		KEY_KP1			79
++		KEY_KP2			80
++		KEY_KP3			81
++		KEY_KP4			75
++		KEY_KP5			76
++		KEY_KP6			77
++		KEY_KP7			71
++		KEY_KP8			72
++		KEY_KP9			73
++		KEY_KPASTERISK		55
++		KEY_KPCOMMA		121
++		KEY_KPDOT		83
++		KEY_KPENTER		96
++		KEY_KPEQUAL		117
++		KEY_KPJPCOMMA		95
++		KEY_KPLEFTPAREN		179
++		KEY_KPMINUS		74
++		KEY_KPPLUS		78
++		KEY_KPPLUSMINUS		118
++		KEY_KPRIGHTPAREN	180
++		KEY_KPSLASH		98
++		KEY_L			38
++		KEY_LANGUAGE		0x170
++		KEY_LAST		0x195
++		KEY_LEFT		105
++		KEY_LEFTALT		56
++		KEY_LEFTBRACE		26
++		KEY_LEFTCTRL		29
++		KEY_LEFTMETA		125
++		KEY_LEFTSHIFT		42
++		KEY_LINEFEED		101
++		KEY_LIST		0x18b
++		KEY_LOGOFF		0x1b1
++		KEY_M			50
++		KEY_MACRO		112
++		KEY_MAIL		155
++		KEY_MAX			0x2ff
++		KEY_MEDIA		226
++		KEY_MEDIA_REPEAT	0x1b7
++		KEY_MEMO		0x18c
++		KEY_MENU		139
++		KEY_MESSENGER		0x1ae
++		KEY_MHP			0x16f
++		KEY_MINUS		12
++		KEY_MODE		0x175
++		KEY_MOVE		175
++		KEY_MP3			0x187
++		KEY_MSDOS		151
++		KEY_MUHENKAN		94
++		KEY_MUTE		113
++		KEY_N			49
++		KEY_NEW			181
++		KEY_NEWS		0x1ab
++		KEY_NEXT		0x197
++		KEY_NEXTSONG		163
++		KEY_NUMERIC_0		0x200
++		KEY_NUMERIC_1		0x201
++		KEY_NUMERIC_2		0x202
++		KEY_NUMERIC_3		0x203
++		KEY_NUMERIC_4		0x204
++		KEY_NUMERIC_5		0x205
++		KEY_NUMERIC_6		0x206
++		KEY_NUMERIC_7		0x207
++		KEY_NUMERIC_8		0x208
++		KEY_NUMERIC_9		0x209
++		KEY_NUMERIC_POUND	0x20b
++		KEY_NUMERIC_STAR	0x20a
++		KEY_NUMLOCK		69
++		KEY_O			24
++		KEY_OK			0x160
++		KEY_OPEN		134
++		KEY_OPTION		0x165
++		KEY_P			25
++		KEY_PAGEDOWN		109
++		KEY_PAGEUP		104
++		KEY_PASTE		135
++		KEY_PAUSE		119
++		KEY_PAUSECD		201
++		KEY_PC			0x178
++		KEY_PHONE		169
++		KEY_PLAY		207
++		KEY_PLAYCD		200
++		KEY_PLAYER		0x183
++		KEY_PLAYPAUSE		164
++		KEY_POWER		116
++		KEY_POWER2		0x164
++		KEY_PRESENTATION	0x1a9
++		KEY_PREVIOUS		0x19c
++		KEY_PREVIOUSSONG	165
++		KEY_PRINT		210
++		KEY_PROG1		148
++		KEY_PROG2		149
++		KEY_PROG3		202
++		KEY_PROG4		203
++		KEY_PROGRAM		0x16a
++		KEY_PROPS		130
++		KEY_PVR			0x16e
++		KEY_Q			16
++		KEY_QUESTION		214
++		KEY_R			19
++		KEY_RADIO		0x181
++		KEY_RECORD		167
++		KEY_RED			0x18e
++		KEY_REDO		182
++		KEY_REFRESH		173
++		KEY_REPLY		232
++		KEY_RESERVED		0
++		KEY_RESTART		0x198
++		KEY_REWIND		168
++		KEY_RFKILL		247
++		KEY_RIGHT		106
++		KEY_RIGHTALT		100
++		KEY_RIGHTBRACE		27
++		KEY_RIGHTCTRL		97
++		KEY_RIGHTMETA		126
++		KEY_RIGHTSHIFT		54
++		KEY_RO			89
++		KEY_S			31
++		KEY_SAT			0x17d
++		KEY_SAT2		0x17e
++		KEY_SAVE		234
++		KEY_SCALE		120
++		KEY_SCREEN		0x177
++		KEY_SCROLLDOWN		178
++		KEY_SCROLLLOCK		70
++		KEY_SCROLLUP		177
++		KEY_SEARCH		217
++		KEY_SELECT		0x161
++		KEY_SEMICOLON		39
++		KEY_SEND		231
++		KEY_SENDFILE		145
++		KEY_SETUP		141
++		KEY_SHOP		221
++		KEY_SHUFFLE		0x19a
++		KEY_SLASH		53
++		KEY_SLEEP		142
++		KEY_SLOW		0x199
++		KEY_SOUND		213
++		KEY_SPACE		57
++		KEY_SPELLCHECK		0x1b0
++		KEY_SPORT		220
++		KEY_SPREADSHEET		0x1a7
++		KEY_STOP		128
++		KEY_STOPCD		166
++		KEY_SUBTITLE		0x172
++		KEY_SUSPEND		205
++		KEY_SWITCHVIDEOMODE	227
++		KEY_SYSRQ		99
++		KEY_T			20
++		KEY_TAB			15
++		KEY_TAPE		0x180
++		KEY_TEEN		0x19e
++		KEY_TEXT		0x184
++		KEY_TIME		0x167
++		KEY_TITLE		0x171
++		KEY_TUNER		0x182
++		KEY_TV			0x179
++		KEY_TV2			0x17a
++		KEY_TWEN		0x19f
++		KEY_U			22
++		KEY_UNDO		131
++		KEY_UNKNOWN		240
++		KEY_UP			103
++		KEY_UWB			239
++		KEY_V			47
++		KEY_VCR			0x17b
++		KEY_VCR2		0x17c
++		KEY_VENDOR		0x168
++		KEY_VIDEO		0x189
++		KEY_VIDEO_NEXT		241
++		KEY_VIDEOPHONE		0x1a0
++		KEY_VIDEO_PREV		242
++		KEY_VOICEMAIL		0x1ac
++		KEY_VOLUMEDOWN		114
++		KEY_VOLUMEUP		115
++		KEY_W			17
++		KEY_WAKEUP		143
++		KEY_WIMAX		246
++		KEY_WLAN		238
++		KEY_WORDPROCESSOR	0x1a5
++		KEY_WWW			150
++		KEY_X			45
++		KEY_XFER		147
++		KEY_Y			21
++		KEY_YELLOW		0x190
++		KEY_YEN			124
++		KEY_Z			44
++		KEY_ZENKAKUHANKAKU	85
++		KEY_ZOOM		0x174
++		KEY_ZOOMIN		0x1a2
++		KEY_ZOOMOUT		0x1a3
++		KEY_ZOOMRESET		0x1a4
++		BTN_0			0x100
++		BTN_1			0x101
++		BTN_2			0x102
++		BTN_3			0x103
++		BTN_4			0x104
++		BTN_5			0x105
++		BTN_6			0x106
++		BTN_7			0x107
++		BTN_8			0x108
++		BTN_9			0x109
++		BTN_A			0x130
++		BTN_B			0x131
++		BTN_BACK		0x116
++		BTN_BASE		0x126
++		BTN_BASE2		0x127
++		BTN_BASE3		0x128
++		BTN_BASE4		0x129
++		BTN_BASE5		0x12a
++		BTN_BASE6		0x12b
++		BTN_C			0x132
++		BTN_DEAD		0x12f
++		BTN_DIGI		0x140
++		BTN_EXTRA		0x114
++		BTN_FORWARD		0x115
++		BTN_GAMEPAD		0x130
++		BTN_GEAR_DOWN		0x150
++		BTN_GEAR_UP		0x151
++		BTN_JOYSTICK		0x120
++		BTN_LEFT		0x110
++		BTN_MIDDLE		0x112
++		BTN_MISC		0x100
++		BTN_MODE		0x13c
++		BTN_MOUSE		0x110
++		BTN_PINKIE		0x125
++		BTN_RIGHT		0x111
++		BTN_SELECT		0x13a
++		BTN_SIDE		0x113
++		BTN_START		0x13b
++		BTN_STYLUS		0x14b
++		BTN_STYLUS2		0x14c
++		BTN_TASK		0x117
++		BTN_THUMB		0x121
++		BTN_THUMB2		0x122
++		BTN_THUMBL		0x13d
++		BTN_THUMBR		0x13e
++		BTN_TL			0x136
++		BTN_TL2			0x138
++		BTN_TOOL_AIRBRUSH	0x144
++		BTN_TOOL_BRUSH		0x142
++		BTN_TOOL_DOUBLETAP	0x14d
++		BTN_TOOL_FINGER		0x145
++		BTN_TOOL_LENS		0x147
++		BTN_TOOL_MOUSE		0x146
++		BTN_TOOL_PEN		0x140
++		BTN_TOOL_PENCIL		0x143
++		BTN_TOOL_QUADTAP	0x14f
++		BTN_TOOL_RUBBER		0x141
++		BTN_TOOL_TRIPLETAP	0x14e
++		BTN_TOP			0x123
++		BTN_TOP2		0x124
++		BTN_TOUCH		0x14a
++		BTN_TR			0x137
++		BTN_TR2			0x139
++		BTN_TRIGGER		0x120
++		BTN_WHEEL		0x150
++		BTN_X			0x133
++		BTN_Y			0x134
++		BTN_Z			0x135
++	end codes
+ end remote
+ 
+-
diff --git a/lirc.spec b/lirc.spec
index 3b2d34e..990c902 100644
--- a/lirc.spec
+++ b/lirc.spec
@@ -18,7 +18,7 @@
 
 Name:           lirc
 Version:        0.8.6
-Release:        4%{?pre:.%{pre}}%{?dist}
+Release:        5%{?pre:.%{pre}}%{?dist}
 Summary:        The Linux Infrared Remote Control package
 
 Group:          System Environment/Daemons
@@ -36,6 +36,7 @@ Patch2:		lirc-0.8.6-standardized-remote-keycodes.patch
 Patch3:         lirc-0.8.4-make-remote-names-all-unique.patch
 Patch4:         lirc-0.8.6-ioctl-portability.patch
 Patch5:         lirc-0.8.6-remove-obsolete-modes.patch
+Patch6:         lirc-0.8.6-devinput-conf-update.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  %{__perl}
@@ -167,6 +168,7 @@ touch -r aclocal.m4 configure.ac # avoid autofoo re-run
 %patch3 -p1
 %patch4 -p1
 %patch5 -p1
+%patch6 -p1
 # Re-run autofoo for new cvs features
 #autoreconf -i -f
 #automake
@@ -289,6 +291,9 @@ fi
 
 
 %changelog
+* Wed Mar 17 2010 Jarod Wilson <jarod@redhat.com> 0.8.6-5
+- Update devinput lircd.conf with additional keys from input.h
+
 * Mon Feb 15 2010 Jarod Wilson <jarod@redhat.com> 0.8.6-4
 - Un-bungle newly introduced segfault in prior build
 

From 67816b54a268f9dcec1d8ba7f23c541c6fa1b868 Mon Sep 17 00:00:00 2001
From: Jarod Wilson <jwilson@fedoraproject.org>
Date: Fri, 23 Apr 2010 19:42:58 +0000
Subject: [PATCH 078/204] - Revert to compat-ioctls per upstream discussion
 (#581326)

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

diff --git a/lirc.spec b/lirc.spec
index 990c902..78f781f 100644
--- a/lirc.spec
+++ b/lirc.spec
@@ -18,7 +18,7 @@
 
 Name:           lirc
 Version:        0.8.6
-Release:        5%{?pre:.%{pre}}%{?dist}
+Release:        6%{?pre:.%{pre}}%{?dist}
 Summary:        The Linux Infrared Remote Control package
 
 Group:          System Environment/Daemons
@@ -34,9 +34,8 @@ Patch1:         lirc-0.8.6-devinput-pass-mouse-events.patch
 # http://thread.gmane.org/gmane.comp.hardware.lirc/6884
 Patch2:		lirc-0.8.6-standardized-remote-keycodes.patch
 Patch3:         lirc-0.8.4-make-remote-names-all-unique.patch
-Patch4:         lirc-0.8.6-ioctl-portability.patch
-Patch5:         lirc-0.8.6-remove-obsolete-modes.patch
-Patch6:         lirc-0.8.6-devinput-conf-update.patch
+Patch4:         lirc-0.8.6-remove-obsolete-modes.patch
+Patch5:         lirc-0.8.6-devinput-conf-update.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  %{__perl}
@@ -168,7 +167,6 @@ touch -r aclocal.m4 configure.ac # avoid autofoo re-run
 %patch3 -p1
 %patch4 -p1
 %patch5 -p1
-%patch6 -p1
 # Re-run autofoo for new cvs features
 #autoreconf -i -f
 #automake
@@ -291,6 +289,9 @@ fi
 
 
 %changelog
+* Sun Apr 11 2010 Jarod Wilson <jarod@redhat.com> 0.8.6-6
+- Revert to compat-ioctls per upstream discussion (#581326)
+
 * Wed Mar 17 2010 Jarod Wilson <jarod@redhat.com> 0.8.6-5
 - Update devinput lircd.conf with additional keys from input.h
 

From 519b865786d86ba0ac336010fbfab576545f812c Mon Sep 17 00:00:00 2001
From: Bastien Nocera <hadess@fedoraproject.org>
Date: Fri, 21 May 2010 11:08:23 +0000
Subject: [PATCH 079/204] - Fix Firefly remote definition keycodes

---
 lirc-0.8.6-firefly-def.patch | 174 +++++++++++++++++++++++++++++++++++
 lirc.spec                    |   7 +-
 2 files changed, 180 insertions(+), 1 deletion(-)
 create mode 100644 lirc-0.8.6-firefly-def.patch

diff --git a/lirc-0.8.6-firefly-def.patch b/lirc-0.8.6-firefly-def.patch
new file mode 100644
index 0000000..ed88177
--- /dev/null
+++ b/lirc-0.8.6-firefly-def.patch
@@ -0,0 +1,174 @@
+diff -upr lirc-0.8.6/remotes/atiusb/lircd.conf.atiusb lirc-0.8.6.new/remotes/atiusb/lircd.conf.atiusb
+--- lirc-0.8.6/remotes/atiusb/lircd.conf.atiusb	2010-05-18 14:56:58.000000000 +0100
++++ lirc-0.8.6.new/remotes/atiusb/lircd.conf.atiusb	2010-05-18 15:01:33.000000000 +0100
+@@ -2124,7 +2124,7 @@ end remote
+ # this config file was automatically generated
+ # using lirc-0.8.2(default) on Wed Feb  6 01:32:32 2008
+ #
+-# contributed by 
++# contributed by http://www.mythtv.org/wiki/Snapstream_Firefly
+ #
+ # brand:                       Snapstream Firefly
+ # model no. of remote control: R1000
+@@ -2144,63 +2144,111 @@ begin remote
+   pre_data       0x14
+   post_data_bits  16
+   post_data      0x0
+-  gap          235978
++  gap          147992
++  min_repeat      5
+   toggle_bit_mask 0x80800000
+ 
+       begin codes
+-          maximize                 0x81AC
+-          close                    0xD702
+-          1                        0x628D
+-          2                        0xE30E
+-          3                        0x648F
+-          4                        0xE510
+-          5                        0x6691
+-          6                        0xE712
+-          7                        0x6893
+-          8                        0xE914
+-          9                        0x6A95
+-          0                        0xEC17
+-          back                     0x6B96
+-          ent                      0xED18
+-          volup                    0x5E89
+-          voldown                  0xDD08
+-          mute                     0x5F8A
+-          chup                     0xE00B
+-          chdown                   0x618C
+-          firefly                  0xD500
+-          info                     0x83AE
+-          option                   0x042F
+-          up                       0x6F9A
+-          down                     0xF722
+-          left                     0x729D
+-          right                    0xF41F
+-          ok                       0x739E
+-          menu                     0xF11C
+-          exit                     0x75A0
+-          rec                      0xFC27
+-          play                     0x7AA5
+-          stop                     0xFD28
+-          rew                      0x79A4
+-          prev                     0x002B
+-          pause                    0x7EA9
+-          ffwd                     0xFB26
+-          next                     0x7FAA
+-          music                    0xDB06
+-          photo                    0x5A85
+-          dvd                      0xD904
+-          tv                       0x5883
+-          video                    0xDC07
+-          help                     0x5681
+-          mouse                    0x022D
+-          a                        0x6E99
+-          b                        0xF01B
+-          c                        0x76A1
+-          d                        0xF823
++	  KEY_MAX                  0x812C
++	  KEY_MAX                  0x01AC
++	  KEY_CLOSE                0x5702
++	  KEY_CLOSE                0xD782
++	  KEY_1                    0x620D
++	  KEY_1                    0xE28D
++	  KEY_2                    0x630E
++	  KEY_2                    0xE38E
++	  KEY_3                    0x640F
++	  KEY_3                    0xE48F
++	  KEY_4                    0x6510
++	  KEY_4                    0xE590
++	  KEY_5                    0x6611
++	  KEY_5                    0xE691
++	  KEY_6                    0x6712
++	  KEY_6                    0xE792
++	  KEY_7                    0x6813
++	  KEY_7                    0xE893
++	  KEY_8                    0x6914
++	  KEY_8                    0xE994
++	  KEY_9                    0x6A15
++	  KEY_9                    0xEA95
++	  KEY_0                    0x6C17
++	  KEY_0                    0xEC97
++	  KEY_BACK                 0x6B16
++	  KEY_BACK                 0xEB96
++	  KEY_ENTER                0x6D18
++	  KEY_ENTER                0xED98
++	  KEY_VOLUMEUP             0x5E09
++	  KEY_VOLUMEUP             0xDE89
++	  KEY_VOLUMEDOWN           0x5D08
++	  KEY_VOLUMEDOWN           0xDD88
++	  KEY_MUTE                 0x5F0A
++	  KEY_MUTE                 0xDF8A
++	  KEY_VENDOR               0x5500
++	  KEY_VENDOR               0xD580
++	  KEY_CHANNELUP            0x600B
++	  KEY_CHANNELUP            0xE08B
++	  KEY_CHANNELDOWN          0x610C
++	  KEY_CHANNELDOWN          0xE18C
++	  KEY_INFO                 0x832E
++	  KEY_INFO                 0x03AE
++	  KEY_OPTION               0x842F
++	  KEY_OPTION               0x04AF
++	  KEY_UP                   0x6F1A
++	  KEY_UP                   0xEF9A
++	  KEY_LEFT                 0x721D
++	  KEY_LEFT                 0xF29D
++	  KEY_DOWN                 0x7722
++	  KEY_DOWN                 0xF7A2
++	  KEY_RIGHT                0x741F
++	  KEY_RIGHT                0xF49F
++	  KEY_OK                   0x731E
++	  KEY_OK                   0xF39E
++	  KEY_MENU                 0x711C
++	  KEY_MENU                 0xF19C
++	  KEY_EXIT                 0x7520
++	  KEY_EXIT                 0xF5A0
++	  KEY_RECORD               0x7C27
++	  KEY_RECORD               0xFCA7
++	  KEY_PLAY                 0x7A25
++	  KEY_PLAY                 0xFAA5
++	  KEY_STOP                 0x7D28
++	  KEY_STOP                 0xFDA8
++	  KEY_REWIND               0x7924
++	  KEY_REWIND               0xF9A4
++	  KEY_FORWARD              0x7B26
++	  KEY_FORWARD              0xFBA6
++	  KEY_PREVIOUS             0x802B
++	  KEY_PREVIOUS             0x00AB
++	  KEY_PAUSE                0x7E29
++	  KEY_PAUSE                0xFEA9
++	  KEY_NEXT                 0x7F2A
++	  KEY_NEXT                 0xFFAA
++	  KEY_AUDIO                0x5B06
++	  KEY_AUDIO                0xDB86
++	  PHOTOS                   0x5A05
++	  PHOTOS                   0xDA85
++	  KEY_DVD                  0x5904
++	  KEY_DVD                  0xD984
++	  KEY_TV                   0x5803
++	  KEY_TV                   0xD883
++	  KEY_VIDEO                0x5C07
++	  KEY_VIDEO                0xDC87
++	  KEY_HELP                 0x5601
++	  KEY_HELP                 0xD681
++	  MOUSE                    0x822D
++	  MOUSE                    0x02AD
++	  KEY_A                    0x6E19
++	  KEY_A                    0xEE99
++	  KEY_B                    0x701B
++	  KEY_B                    0xF09B
++	  KEY_C                    0x7621
++	  KEY_C                    0xF6A1
++	  KEY_D                    0x7823
++	  KEY_D                    0xF8A3
+       end codes
+ 
+ end remote
+ 
+-
+ #
+ # this config file was automatically generated
+ # using lirc-0.8.2(default) on Thu Oct  4 17:42:33 2007
diff --git a/lirc.spec b/lirc.spec
index 3b2d34e..0762cd9 100644
--- a/lirc.spec
+++ b/lirc.spec
@@ -18,7 +18,7 @@
 
 Name:           lirc
 Version:        0.8.6
-Release:        4%{?pre:.%{pre}}%{?dist}
+Release:        5%{?pre:.%{pre}}%{?dist}
 Summary:        The Linux Infrared Remote Control package
 
 Group:          System Environment/Daemons
@@ -36,6 +36,7 @@ Patch2:		lirc-0.8.6-standardized-remote-keycodes.patch
 Patch3:         lirc-0.8.4-make-remote-names-all-unique.patch
 Patch4:         lirc-0.8.6-ioctl-portability.patch
 Patch5:         lirc-0.8.6-remove-obsolete-modes.patch
+Patch6:         lirc-0.8.6-firefly-def.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  %{__perl}
@@ -167,6 +168,7 @@ touch -r aclocal.m4 configure.ac # avoid autofoo re-run
 %patch3 -p1
 %patch4 -p1
 %patch5 -p1
+%patch6 -p1
 # Re-run autofoo for new cvs features
 #autoreconf -i -f
 #automake
@@ -289,6 +291,9 @@ fi
 
 
 %changelog
+* Fri May 21 2010 Bastien Nocera <bnocera@redhat.com> 0.8.6-5}
+- Fix Firefly remote definition keycodes
+
 * Mon Feb 15 2010 Jarod Wilson <jarod@redhat.com> 0.8.6-4
 - Un-bungle newly introduced segfault in prior build
 

From f3af4fe721efab781b9e5461967a0ea230c4c449 Mon Sep 17 00:00:00 2001
From: Bastien Nocera <hadess@fedoraproject.org>
Date: Fri, 21 May 2010 11:51:54 +0000
Subject: [PATCH 080/204] - Fix Firefly remote definition keycodes

---
 lirc-0.8.6-firefly-def.patch | 174 +++++++++++++++++++++++++++++++++++
 lirc.spec                    |   7 +-
 2 files changed, 180 insertions(+), 1 deletion(-)
 create mode 100644 lirc-0.8.6-firefly-def.patch

diff --git a/lirc-0.8.6-firefly-def.patch b/lirc-0.8.6-firefly-def.patch
new file mode 100644
index 0000000..ed88177
--- /dev/null
+++ b/lirc-0.8.6-firefly-def.patch
@@ -0,0 +1,174 @@
+diff -upr lirc-0.8.6/remotes/atiusb/lircd.conf.atiusb lirc-0.8.6.new/remotes/atiusb/lircd.conf.atiusb
+--- lirc-0.8.6/remotes/atiusb/lircd.conf.atiusb	2010-05-18 14:56:58.000000000 +0100
++++ lirc-0.8.6.new/remotes/atiusb/lircd.conf.atiusb	2010-05-18 15:01:33.000000000 +0100
+@@ -2124,7 +2124,7 @@ end remote
+ # this config file was automatically generated
+ # using lirc-0.8.2(default) on Wed Feb  6 01:32:32 2008
+ #
+-# contributed by 
++# contributed by http://www.mythtv.org/wiki/Snapstream_Firefly
+ #
+ # brand:                       Snapstream Firefly
+ # model no. of remote control: R1000
+@@ -2144,63 +2144,111 @@ begin remote
+   pre_data       0x14
+   post_data_bits  16
+   post_data      0x0
+-  gap          235978
++  gap          147992
++  min_repeat      5
+   toggle_bit_mask 0x80800000
+ 
+       begin codes
+-          maximize                 0x81AC
+-          close                    0xD702
+-          1                        0x628D
+-          2                        0xE30E
+-          3                        0x648F
+-          4                        0xE510
+-          5                        0x6691
+-          6                        0xE712
+-          7                        0x6893
+-          8                        0xE914
+-          9                        0x6A95
+-          0                        0xEC17
+-          back                     0x6B96
+-          ent                      0xED18
+-          volup                    0x5E89
+-          voldown                  0xDD08
+-          mute                     0x5F8A
+-          chup                     0xE00B
+-          chdown                   0x618C
+-          firefly                  0xD500
+-          info                     0x83AE
+-          option                   0x042F
+-          up                       0x6F9A
+-          down                     0xF722
+-          left                     0x729D
+-          right                    0xF41F
+-          ok                       0x739E
+-          menu                     0xF11C
+-          exit                     0x75A0
+-          rec                      0xFC27
+-          play                     0x7AA5
+-          stop                     0xFD28
+-          rew                      0x79A4
+-          prev                     0x002B
+-          pause                    0x7EA9
+-          ffwd                     0xFB26
+-          next                     0x7FAA
+-          music                    0xDB06
+-          photo                    0x5A85
+-          dvd                      0xD904
+-          tv                       0x5883
+-          video                    0xDC07
+-          help                     0x5681
+-          mouse                    0x022D
+-          a                        0x6E99
+-          b                        0xF01B
+-          c                        0x76A1
+-          d                        0xF823
++	  KEY_MAX                  0x812C
++	  KEY_MAX                  0x01AC
++	  KEY_CLOSE                0x5702
++	  KEY_CLOSE                0xD782
++	  KEY_1                    0x620D
++	  KEY_1                    0xE28D
++	  KEY_2                    0x630E
++	  KEY_2                    0xE38E
++	  KEY_3                    0x640F
++	  KEY_3                    0xE48F
++	  KEY_4                    0x6510
++	  KEY_4                    0xE590
++	  KEY_5                    0x6611
++	  KEY_5                    0xE691
++	  KEY_6                    0x6712
++	  KEY_6                    0xE792
++	  KEY_7                    0x6813
++	  KEY_7                    0xE893
++	  KEY_8                    0x6914
++	  KEY_8                    0xE994
++	  KEY_9                    0x6A15
++	  KEY_9                    0xEA95
++	  KEY_0                    0x6C17
++	  KEY_0                    0xEC97
++	  KEY_BACK                 0x6B16
++	  KEY_BACK                 0xEB96
++	  KEY_ENTER                0x6D18
++	  KEY_ENTER                0xED98
++	  KEY_VOLUMEUP             0x5E09
++	  KEY_VOLUMEUP             0xDE89
++	  KEY_VOLUMEDOWN           0x5D08
++	  KEY_VOLUMEDOWN           0xDD88
++	  KEY_MUTE                 0x5F0A
++	  KEY_MUTE                 0xDF8A
++	  KEY_VENDOR               0x5500
++	  KEY_VENDOR               0xD580
++	  KEY_CHANNELUP            0x600B
++	  KEY_CHANNELUP            0xE08B
++	  KEY_CHANNELDOWN          0x610C
++	  KEY_CHANNELDOWN          0xE18C
++	  KEY_INFO                 0x832E
++	  KEY_INFO                 0x03AE
++	  KEY_OPTION               0x842F
++	  KEY_OPTION               0x04AF
++	  KEY_UP                   0x6F1A
++	  KEY_UP                   0xEF9A
++	  KEY_LEFT                 0x721D
++	  KEY_LEFT                 0xF29D
++	  KEY_DOWN                 0x7722
++	  KEY_DOWN                 0xF7A2
++	  KEY_RIGHT                0x741F
++	  KEY_RIGHT                0xF49F
++	  KEY_OK                   0x731E
++	  KEY_OK                   0xF39E
++	  KEY_MENU                 0x711C
++	  KEY_MENU                 0xF19C
++	  KEY_EXIT                 0x7520
++	  KEY_EXIT                 0xF5A0
++	  KEY_RECORD               0x7C27
++	  KEY_RECORD               0xFCA7
++	  KEY_PLAY                 0x7A25
++	  KEY_PLAY                 0xFAA5
++	  KEY_STOP                 0x7D28
++	  KEY_STOP                 0xFDA8
++	  KEY_REWIND               0x7924
++	  KEY_REWIND               0xF9A4
++	  KEY_FORWARD              0x7B26
++	  KEY_FORWARD              0xFBA6
++	  KEY_PREVIOUS             0x802B
++	  KEY_PREVIOUS             0x00AB
++	  KEY_PAUSE                0x7E29
++	  KEY_PAUSE                0xFEA9
++	  KEY_NEXT                 0x7F2A
++	  KEY_NEXT                 0xFFAA
++	  KEY_AUDIO                0x5B06
++	  KEY_AUDIO                0xDB86
++	  PHOTOS                   0x5A05
++	  PHOTOS                   0xDA85
++	  KEY_DVD                  0x5904
++	  KEY_DVD                  0xD984
++	  KEY_TV                   0x5803
++	  KEY_TV                   0xD883
++	  KEY_VIDEO                0x5C07
++	  KEY_VIDEO                0xDC87
++	  KEY_HELP                 0x5601
++	  KEY_HELP                 0xD681
++	  MOUSE                    0x822D
++	  MOUSE                    0x02AD
++	  KEY_A                    0x6E19
++	  KEY_A                    0xEE99
++	  KEY_B                    0x701B
++	  KEY_B                    0xF09B
++	  KEY_C                    0x7621
++	  KEY_C                    0xF6A1
++	  KEY_D                    0x7823
++	  KEY_D                    0xF8A3
+       end codes
+ 
+ end remote
+ 
+-
+ #
+ # this config file was automatically generated
+ # using lirc-0.8.2(default) on Thu Oct  4 17:42:33 2007
diff --git a/lirc.spec b/lirc.spec
index 78f781f..6e5fe4d 100644
--- a/lirc.spec
+++ b/lirc.spec
@@ -18,7 +18,7 @@
 
 Name:           lirc
 Version:        0.8.6
-Release:        6%{?pre:.%{pre}}%{?dist}
+Release:        7%{?pre:.%{pre}}%{?dist}
 Summary:        The Linux Infrared Remote Control package
 
 Group:          System Environment/Daemons
@@ -36,6 +36,7 @@ Patch2:		lirc-0.8.6-standardized-remote-keycodes.patch
 Patch3:         lirc-0.8.4-make-remote-names-all-unique.patch
 Patch4:         lirc-0.8.6-remove-obsolete-modes.patch
 Patch5:         lirc-0.8.6-devinput-conf-update.patch
+Patch6:         lirc-0.8.6-firefly-def.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  %{__perl}
@@ -167,6 +168,7 @@ touch -r aclocal.m4 configure.ac # avoid autofoo re-run
 %patch3 -p1
 %patch4 -p1
 %patch5 -p1
+%patch6 -p1
 # Re-run autofoo for new cvs features
 #autoreconf -i -f
 #automake
@@ -289,6 +291,9 @@ fi
 
 
 %changelog
+* Fri May 21 2010 Bastien Nocera <bnocera@redhat.com> 0.8.6-7
+- Fix Firefly remote definition keycodes
+
 * Sun Apr 11 2010 Jarod Wilson <jarod@redhat.com> 0.8.6-6
 - Revert to compat-ioctls per upstream discussion (#581326)
 

From 8c2e0b59da521578d27ec9b0c12fd22fe3c6e32d Mon Sep 17 00:00:00 2001
From: Jarod Wilson <jwilson@fedoraproject.org>
Date: Thu, 8 Jul 2010 04:04:23 +0000
Subject: [PATCH 081/204] - Fix up sub-package license file inclusion per new
 fedora licensing     guidelines

---
 lirc.spec | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

diff --git a/lirc.spec b/lirc.spec
index 0762cd9..333d2a7 100644
--- a/lirc.spec
+++ b/lirc.spec
@@ -18,7 +18,7 @@
 
 Name:           lirc
 Version:        0.8.6
-Release:        5%{?pre:.%{pre}}%{?dist}
+Release:        6%{?pre:.%{pre}}%{?dist}
 Summary:        The Linux Infrared Remote Control package
 
 Group:          System Environment/Daemons
@@ -273,6 +273,7 @@ fi
 
 %files libs
 %defattr(-,root,root,-)
+%doc COPYING
 %{_libdir}/liblirc_client.so.*
 
 %files devel
@@ -282,7 +283,7 @@ fi
 
 %files doc
 %defattr(-,root,root,-)
-%doc __docs/*
+%doc __docs/* COPYING
 
 %files remotes
 %defattr(-,root,root,-)
@@ -291,7 +292,11 @@ fi
 
 
 %changelog
-* Fri May 21 2010 Bastien Nocera <bnocera@redhat.com> 0.8.6-5}
+* Thu Jul 08 2010 Jarod Wilson <jarod@redhat.com> 0.8.6-6
+- Fix up sub-package license file inclusion per new fedora
+  licensing guidelines
+
+* Fri May 21 2010 Bastien Nocera <bnocera@redhat.com> 0.8.6-5
 - Fix Firefly remote definition keycodes
 
 * Mon Feb 15 2010 Jarod Wilson <jarod@redhat.com> 0.8.6-4

From f2a0eb6f8359d3fc545235d47f558f34393bc8e9 Mon Sep 17 00:00:00 2001
From: Fedora Release Engineering <rel-eng@lists.fedoraproject.org>
Date: Thu, 29 Jul 2010 02:28:08 +0000
Subject: [PATCH 082/204] dist-git conversion

---
 .cvsignore => .gitignore |  0
 Makefile                 | 21 ---------------------
 2 files changed, 21 deletions(-)
 rename .cvsignore => .gitignore (100%)
 delete mode 100644 Makefile

diff --git a/.cvsignore b/.gitignore
similarity index 100%
rename from .cvsignore
rename to .gitignore
diff --git a/Makefile b/Makefile
deleted file mode 100644
index 8840ad6..0000000
--- a/Makefile
+++ /dev/null
@@ -1,21 +0,0 @@
-# Makefile for source rpm: lirc
-# $Id: Makefile,v 1.2 2004/11/24 04:29:00 gafton Exp $
-NAME := lirc
-SPECFILE = $(firstword $(wildcard *.spec))
-
-define find-makefile-common
-for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$d/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done
-endef
-
-MAKEFILE_COMMON	:= $(shell $(find-makefile-common))
-
-ifeq ($(MAKEFILE_COMMON),)
-# attept a checkout
-define checkout-makefile-common
-test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2
-endef
-
-MAKEFILE_COMMON := $(shell $(checkout-makefile-common))
-endif
-
-include $(MAKEFILE_COMMON)

From 906c47e5c3d747eec88ebc39d5eb3efbd568859a Mon Sep 17 00:00:00 2001
From: Jarod Wilson <jarod@redhat.com>
Date: Mon, 2 Aug 2010 16:08:08 -0400
Subject: [PATCH 083/204] improved gitignore

Signed-off-by: Jarod Wilson <jarod@redhat.com>
---
 .gitignore | 13 +------------
 1 file changed, 1 insertion(+), 12 deletions(-)

diff --git a/.gitignore b/.gitignore
index 7fad6b9..91d5474 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,12 +1 @@
-lirc-0.8.3.tar.bz2
-lirc-0.8.4pre1.tar.bz2
-lirc-0.8.4pre2.tar.bz2
-lirc-0.8.4.tar.bz2
-lirc-0.8.4a.tar.bz2
-lirc-0.8.5pre1.tar.bz2
-lirc-0.8.5pre2.tar.bz2
-lirc-0.8.5pre3.tar.bz2
-lirc-0.8.5.tar.bz2
-lirc-0.8.6pre1.tar.bz2
-lirc-0.8.6pre2.tar.bz2
-lirc-0.8.6.tar.bz2
+lirc-*.tar.bz2

From 2b9bd2117fdf9d2f4a549e40b323791ce2dd1a6f Mon Sep 17 00:00:00 2001
From: Jarod Wilson <jarod@redhat.com>
Date: Mon, 2 Aug 2010 17:23:31 -0400
Subject: [PATCH 084/204] update to 0.8.7pre2 snap and patch for use with new
 in-kernel lirc

Signed-off-by: Jarod Wilson <jarod@redhat.com>
---
 .gitignore                                    |    4 +
 lirc-0.8.4-make-remote-names-all-unique.patch |   67 +-
 lirc-0.8.6-devinput-conf-update.patch         | 1340 -----------------
 lirc-0.8.6-devinput-pass-mouse-events.patch   |  262 ----
 lirc-0.8.6-firefly-def.patch                  |   11 +-
 lirc-0.8.6-remove-obsolete-modes.patch        |  429 ------
 lirc-0.8.6-standardized-remote-keycodes.patch |  586 ++++---
 lirc-in-kernel-ioctls.patch                   |  116 ++
 ...w-instead-of-conf-as-filename-suffix.patch |    9 +-
 lirc.spec                                     |   27 +-
 sources                                       |    1 +
 11 files changed, 587 insertions(+), 2265 deletions(-)
 delete mode 100644 lirc-0.8.6-devinput-conf-update.patch
 delete mode 100644 lirc-0.8.6-devinput-pass-mouse-events.patch
 delete mode 100644 lirc-0.8.6-remove-obsolete-modes.patch
 create mode 100644 lirc-in-kernel-ioctls.patch

diff --git a/.gitignore b/.gitignore
index 91d5474..5af7df2 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,5 @@
 lirc-*.tar.bz2
+.build-*.log
+*.rpm
+lirc-*/
+lirc-0.8.7pre2.tar.bz2
diff --git a/lirc-0.8.4-make-remote-names-all-unique.patch b/lirc-0.8.4-make-remote-names-all-unique.patch
index 5519b1f..4f8f434 100644
--- a/lirc-0.8.4-make-remote-names-all-unique.patch
+++ b/lirc-0.8.4-make-remote-names-all-unique.patch
@@ -1,7 +1,8 @@
-diff -Naurp lirc-0.8.4/remotes/atiusb/lircd.conf.atiusb lirc-0.8.4.new/remotes/atiusb/lircd.conf.atiusb
---- lirc-0.8.4/remotes/atiusb/lircd.conf.atiusb	2008-10-16 15:13:22.000000000 -0400
-+++ lirc-0.8.4.new/remotes/atiusb/lircd.conf.atiusb	2008-10-16 15:24:46.000000000 -0400
-@@ -1794,7 +1794,7 @@ end remote
+Index: lirc-0.8.7pre2/remotes/atiusb/lircd.conf.atiusb
+===================================================================
+--- lirc-0.8.7pre2.orig/remotes/atiusb/lircd.conf.atiusb
++++ lirc-0.8.7pre2/remotes/atiusb/lircd.conf.atiusb
+@@ -1865,7 +1865,7 @@ end remote
  
  begin remote
  
@@ -10,7 +11,7 @@ diff -Naurp lirc-0.8.4/remotes/atiusb/lircd.conf.atiusb lirc-0.8.4.new/remotes/a
    bits           16
    eps            30
    aeps          100
-@@ -1872,7 +1872,7 @@ end remote
+@@ -1943,7 +1943,7 @@ end remote
  
  begin remote
  
@@ -19,9 +20,10 @@ diff -Naurp lirc-0.8.4/remotes/atiusb/lircd.conf.atiusb lirc-0.8.4.new/remotes/a
    bits           16
    eps            30
    aeps          100
-diff -Naurp lirc-0.8.4/remotes/bestbuy/lircd.conf.bestbuy2 lirc-0.8.4.new/remotes/bestbuy/lircd.conf.bestbuy2
---- lirc-0.8.4/remotes/bestbuy/lircd.conf.bestbuy2	2008-10-16 15:13:22.000000000 -0400
-+++ lirc-0.8.4.new/remotes/bestbuy/lircd.conf.bestbuy2	2008-10-16 15:16:45.000000000 -0400
+Index: lirc-0.8.7pre2/remotes/bestbuy/lircd.conf.bestbuy2
+===================================================================
+--- lirc-0.8.7pre2.orig/remotes/bestbuy/lircd.conf.bestbuy2
++++ lirc-0.8.7pre2/remotes/bestbuy/lircd.conf.bestbuy2
 @@ -11,7 +11,7 @@
  
  begin remote
@@ -31,9 +33,10 @@ diff -Naurp lirc-0.8.4/remotes/bestbuy/lircd.conf.bestbuy2 lirc-0.8.4.new/remote
    bits            7
    eps            30
    aeps          100
-diff -Naurp lirc-0.8.4/remotes/dvico/lircd.conf.fusionHDTV lirc-0.8.4.new/remotes/dvico/lircd.conf.fusionHDTV
---- lirc-0.8.4/remotes/dvico/lircd.conf.fusionHDTV	2008-10-16 15:13:22.000000000 -0400
-+++ lirc-0.8.4.new/remotes/dvico/lircd.conf.fusionHDTV	2008-10-16 15:23:52.000000000 -0400
+Index: lirc-0.8.7pre2/remotes/dvico/lircd.conf.fusionHDTV
+===================================================================
+--- lirc-0.8.7pre2.orig/remotes/dvico/lircd.conf.fusionHDTV
++++ lirc-0.8.7pre2/remotes/dvico/lircd.conf.fusionHDTV
 @@ -153,7 +153,7 @@ end remote
  
  begin remote
@@ -43,9 +46,10 @@ diff -Naurp lirc-0.8.4/remotes/dvico/lircd.conf.fusionHDTV lirc-0.8.4.new/remote
    bits            8
    eps            30
    aeps          100
-diff -Naurp lirc-0.8.4/remotes/generic/NEC-pulse.conf lirc-0.8.4.new/remotes/generic/NEC-pulse.conf
---- lirc-0.8.4/remotes/generic/NEC-pulse.conf	2000-12-03 09:21:31.000000000 -0500
-+++ lirc-0.8.4.new/remotes/generic/NEC-pulse.conf	2008-10-16 15:19:20.000000000 -0400
+Index: lirc-0.8.7pre2/remotes/generic/NEC-pulse.conf
+===================================================================
+--- lirc-0.8.7pre2.orig/remotes/generic/NEC-pulse.conf
++++ lirc-0.8.7pre2/remotes/generic/NEC-pulse.conf
 @@ -7,7 +7,7 @@
  
  begin remote
@@ -55,9 +59,10 @@ diff -Naurp lirc-0.8.4/remotes/generic/NEC-pulse.conf lirc-0.8.4.new/remotes/gen
    bits           16
    flags SPACE_ENC|CONST_LENGTH
    eps            30
-diff -Naurp lirc-0.8.4/remotes/generic/NEC-short-pulse.conf lirc-0.8.4.new/remotes/generic/NEC-short-pulse.conf
---- lirc-0.8.4/remotes/generic/NEC-short-pulse.conf	2000-12-03 09:21:31.000000000 -0500
-+++ lirc-0.8.4.new/remotes/generic/NEC-short-pulse.conf	2008-10-16 15:19:10.000000000 -0400
+Index: lirc-0.8.7pre2/remotes/generic/NEC-short-pulse.conf
+===================================================================
+--- lirc-0.8.7pre2.orig/remotes/generic/NEC-short-pulse.conf
++++ lirc-0.8.7pre2/remotes/generic/NEC-short-pulse.conf
 @@ -9,7 +9,7 @@
  
  begin remote
@@ -67,9 +72,10 @@ diff -Naurp lirc-0.8.4/remotes/generic/NEC-short-pulse.conf lirc-0.8.4.new/remot
    bits           16
    flags SPACE_ENC|CONST_LENGTH
    eps            30
-diff -Naurp lirc-0.8.4/remotes/generic/SONY12.conf lirc-0.8.4.new/remotes/generic/SONY12.conf
---- lirc-0.8.4/remotes/generic/SONY12.conf	2001-08-04 06:20:11.000000000 -0400
-+++ lirc-0.8.4.new/remotes/generic/SONY12.conf	2008-10-16 15:18:02.000000000 -0400
+Index: lirc-0.8.7pre2/remotes/generic/SONY12.conf
+===================================================================
+--- lirc-0.8.7pre2.orig/remotes/generic/SONY12.conf
++++ lirc-0.8.7pre2/remotes/generic/SONY12.conf
 @@ -6,7 +6,7 @@
  
  begin remote
@@ -79,9 +85,10 @@ diff -Naurp lirc-0.8.4/remotes/generic/SONY12.conf lirc-0.8.4.new/remotes/generi
    bits            7
    flags SPACE_ENC|CONST_LENGTH
    eps            30
-diff -Naurp lirc-0.8.4/remotes/generic/SONY20.conf lirc-0.8.4.new/remotes/generic/SONY20.conf
---- lirc-0.8.4/remotes/generic/SONY20.conf	2000-12-03 09:21:31.000000000 -0500
-+++ lirc-0.8.4.new/remotes/generic/SONY20.conf	2008-10-16 15:18:12.000000000 -0400
+Index: lirc-0.8.7pre2/remotes/generic/SONY20.conf
+===================================================================
+--- lirc-0.8.7pre2.orig/remotes/generic/SONY20.conf
++++ lirc-0.8.7pre2/remotes/generic/SONY20.conf
 @@ -6,7 +6,7 @@
  
  begin remote
@@ -91,9 +98,10 @@ diff -Naurp lirc-0.8.4/remotes/generic/SONY20.conf lirc-0.8.4.new/remotes/generi
    bits            7
    flags SPACE_ENC|CONST_LENGTH
    eps            30
-diff -Naurp lirc-0.8.4/remotes/hauppauge/lircd.conf.hauppauge lirc-0.8.4.new/remotes/hauppauge/lircd.conf.hauppauge
---- lirc-0.8.4/remotes/hauppauge/lircd.conf.hauppauge	2008-10-16 15:13:22.000000000 -0400
-+++ lirc-0.8.4.new/remotes/hauppauge/lircd.conf.hauppauge	2008-10-16 15:16:14.000000000 -0400
+Index: lirc-0.8.7pre2/remotes/hauppauge/lircd.conf.hauppauge
+===================================================================
+--- lirc-0.8.7pre2.orig/remotes/hauppauge/lircd.conf.hauppauge
++++ lirc-0.8.7pre2/remotes/hauppauge/lircd.conf.hauppauge
 @@ -278,14 +278,14 @@ end remote
  #
  # contributed by Matthew Wright
@@ -111,9 +119,10 @@ diff -Naurp lirc-0.8.4/remotes/hauppauge/lircd.conf.hauppauge lirc-0.8.4.new/rem
    bits           13
    flags RC5|CONST_LENGTH
    eps            30
-diff -Naurp lirc-0.8.4/remotes/leadtek/lircd.conf.PVR2000 lirc-0.8.4.new/remotes/leadtek/lircd.conf.PVR2000
---- lirc-0.8.4/remotes/leadtek/lircd.conf.PVR2000	2008-10-16 15:13:22.000000000 -0400
-+++ lirc-0.8.4.new/remotes/leadtek/lircd.conf.PVR2000	2008-10-16 15:17:46.000000000 -0400
+Index: lirc-0.8.7pre2/remotes/leadtek/lircd.conf.PVR2000
+===================================================================
+--- lirc-0.8.7pre2.orig/remotes/leadtek/lircd.conf.PVR2000
++++ lirc-0.8.7pre2/remotes/leadtek/lircd.conf.PVR2000
 @@ -74,7 +74,7 @@ end remote
  
  begin remote
diff --git a/lirc-0.8.6-devinput-conf-update.patch b/lirc-0.8.6-devinput-conf-update.patch
deleted file mode 100644
index 6b8537e..0000000
--- a/lirc-0.8.6-devinput-conf-update.patch
+++ /dev/null
@@ -1,1340 +0,0 @@
-Index: lirc-0.8.6/remotes/devinput/lircd.conf.devinput
-===================================================================
---- lirc-0.8.6.orig/remotes/devinput/lircd.conf.devinput
-+++ lirc-0.8.6/remotes/devinput/lircd.conf.devinput
-@@ -1,416 +1,926 @@
- # generated by devinput.sh
- begin remote
-+        name            devinput
-+        bits            16
-+        eps             30
-+        aeps            100
-+        pre_data_bits   16
-+        pre_data        0x0001
-+        post_data_bits  32
-+        post_data       0x00000001
-+        gap             132799
-+        toggle_bit      0
- 
--  name  devinput
--  bits           16
--  eps            30
--  aeps          100
--
--  one             0     0
--  zero            0     0
--  pre_data_bits   16
--  pre_data       0x8001
--  gap          132799
--  toggle_bit_mask 0x0
-+	begin codes
-+		KEY_0			11
-+		KEY_102ND		86
-+		KEY_1			2
-+		KEY_2			3
-+		KEY_3			4
-+		KEY_4			5
-+		KEY_5			6
-+		KEY_6			7
-+		KEY_7			8
-+		KEY_8			9
-+		KEY_9			10
-+		KEY_A			30
-+		KEY_AB			0x196
-+		KEY_ADDRESSBOOK		0x1ad
-+		KEY_AGAIN		129
-+		KEY_ALTERASE		222
-+		KEY_ANGLE		0x173
-+		KEY_APOSTROPHE		40
-+		KEY_ARCHIVE		0x169
-+		KEY_AUDIO		0x188
-+		KEY_AUX			0x186
-+		KEY_B			48
-+		KEY_BACK		158
-+		KEY_BACKSLASH		43
-+		KEY_BACKSPACE		14
-+		KEY_BASSBOOST		209
-+		KEY_BATTERY		236
-+		KEY_BLUE		0x191
-+		KEY_BLUETOOTH		237
-+		KEY_BOOKMARKS		156
-+		KEY_BREAK		0x19b
-+		KEY_BRIGHTNESS_CYCLE	243
-+		KEY_BRIGHTNESSDOWN	224
-+		KEY_BRIGHTNESSUP	225
-+		KEY_BRIGHTNESS_ZERO	244
-+		KEY_BRL_DOT10		0x1fa
-+		KEY_BRL_DOT1		0x1f1
-+		KEY_BRL_DOT2		0x1f2
-+		KEY_BRL_DOT3		0x1f3
-+		KEY_BRL_DOT4		0x1f4
-+		KEY_BRL_DOT5		0x1f5
-+		KEY_BRL_DOT6		0x1f6
-+		KEY_BRL_DOT7		0x1f7
-+		KEY_BRL_DOT8		0x1f8
-+		KEY_BRL_DOT9		0x1f9
-+		KEY_C			46
-+		KEY_CALC		140
-+		KEY_CALENDAR		0x18d
-+		KEY_CAMERA		212
-+		KEY_CAMERA_FOCUS	0x210
-+		KEY_CANCEL		223
-+		KEY_CAPSLOCK		58
-+		KEY_CD			0x17f
-+		KEY_CHANNEL		0x16b
-+		KEY_CHANNELDOWN		0x193
-+		KEY_CHANNELUP		0x192
-+		KEY_CHAT		216
-+		KEY_CLEAR		0x163
-+		KEY_CLOSE		206
-+		KEY_CLOSECD		160
-+		KEY_COFFEE		152
-+		KEY_COMMA		51
-+		KEY_COMPOSE		127
-+		KEY_COMPUTER		157
-+		KEY_CONFIG		171
-+		KEY_CONNECT		218
-+		KEY_CONTEXT_MENU	0x1b6
-+		KEY_COPY		133
-+		KEY_CUT			137
-+		KEY_CYCLEWINDOWS	154
-+		KEY_D			32
-+		KEY_DASHBOARD		204
-+		KEY_DATABASE		0x1aa
-+		KEY_DEL_EOL		0x1c0
-+		KEY_DEL_EOS		0x1c1
-+		KEY_DELETE		111
-+		KEY_DELETEFILE		146
-+		KEY_DEL_LINE		0x1c3
-+		KEY_DIGITS		0x19d
-+		KEY_DIRECTION		153
-+		KEY_DIRECTORY		0x18a
-+		KEY_DISPLAY_OFF		245
-+		KEY_DISPLAYTOGGLE	0x1af
-+		KEY_DOCUMENTS		235
-+		KEY_DOLLAR		0x1b2
-+		KEY_DOT			52
-+		KEY_DOWN		108
-+		KEY_DVD			0x185
-+		KEY_E			18
-+		KEY_EDIT		176
-+		KEY_EDITOR		0x1a6
-+		KEY_EJECTCD		161
-+		KEY_EJECTCLOSECD	162
-+		KEY_EMAIL		215
-+		KEY_END			107
-+		KEY_ENTER		28
-+		KEY_EPG			0x16d
-+		KEY_EQUAL		13
-+		KEY_ESC			1
-+		KEY_EURO		0x1b3
-+		KEY_EXIT		174
-+		KEY_F10			68
-+		KEY_F11			87
-+		KEY_F12			88
-+		KEY_F13			183
-+		KEY_F14			184
-+		KEY_F15			185
-+		KEY_F1			59
-+		KEY_F16			186
-+		KEY_F17			187
-+		KEY_F18			188
-+		KEY_F19			189
-+		KEY_F20			190
-+		KEY_F21			191
-+		KEY_F22			192
-+		KEY_F23			193
-+		KEY_F24			194
-+		KEY_F2			60
-+		KEY_F			33
-+		KEY_F3			61
-+		KEY_F4			62
-+		KEY_F5			63
-+		KEY_F6			64
-+		KEY_F7			65
-+		KEY_F8			66
-+		KEY_F9			67
-+		KEY_FASTFORWARD		208
-+		KEY_FAVORITES		0x16c
-+		KEY_FILE		144
-+		KEY_FINANCE		219
-+		KEY_FIND		136
-+		KEY_FIRST		0x194
-+		KEY_FN			0x1d0
-+		KEY_FN_1		0x1de
-+		KEY_FN_2		0x1df
-+		KEY_FN_B		0x1e4
-+		KEY_FN_D		0x1e0
-+		KEY_FN_E		0x1e1
-+		KEY_FN_ESC		0x1d1
-+		KEY_FN_F		0x1e2
-+		KEY_FN_F10		0x1db
-+		KEY_FN_F1		0x1d2
-+		KEY_FN_F11		0x1dc
-+		KEY_FN_F12		0x1dd
-+		KEY_FN_F2		0x1d3
-+		KEY_FN_F3		0x1d4
-+		KEY_FN_F4		0x1d5
-+		KEY_FN_F5		0x1d6
-+		KEY_FN_F6		0x1d7
-+		KEY_FN_F7		0x1d8
-+		KEY_FN_F8		0x1d9
-+		KEY_FN_F9		0x1da
-+		KEY_FN_S		0x1e3
-+		KEY_FORWARD		159
-+		KEY_FORWARDMAIL		233
-+		KEY_FRAMEBACK		0x1b4
-+		KEY_FRAMEFORWARD	0x1b5
-+		KEY_FRONT		132
-+		KEY_G			34
-+		KEY_GAMES		0x1a1
-+		KEY_GOTO		0x162
-+		KEY_GRAPHICSEDITOR	0x1a8
-+		KEY_GRAVE		41
-+		KEY_GREEN		0x18f
-+		KEY_H			35
-+		KEY_HANGEUL		122
-+		KEY_HANJA		123
-+		KEY_HELP		138
-+		KEY_HENKAN		92
-+		KEY_HIRAGANA		91
-+		KEY_HOME		102
-+		KEY_HOMEPAGE		172
-+		KEY_HP			211
-+		KEY_I			23
-+		KEY_INFO		0x166
-+		KEY_INSERT		110
-+		KEY_INS_LINE		0x1c2
-+		KEY_ISO			170
-+		KEY_J			36
-+		KEY_K			37
-+		KEY_KATAKANA		90
-+		KEY_KATAKANAHIRAGANA	93
-+		KEY_KBDILLUMDOWN	229
-+		KEY_KBDILLUMTOGGLE	228
-+		KEY_KBDILLUMUP		230
-+		KEY_KEYBOARD		0x176
-+		KEY_KP0			82
-+		KEY_KP1			79
-+		KEY_KP2			80
-+		KEY_KP3			81
-+		KEY_KP4			75
-+		KEY_KP5			76
-+		KEY_KP6			77
-+		KEY_KP7			71
-+		KEY_KP8			72
-+		KEY_KP9			73
-+		KEY_KPASTERISK		55
-+		KEY_KPCOMMA		121
-+		KEY_KPDOT		83
-+		KEY_KPENTER		96
-+		KEY_KPEQUAL		117
-+		KEY_KPJPCOMMA		95
-+		KEY_KPLEFTPAREN		179
-+		KEY_KPMINUS		74
-+		KEY_KPPLUS		78
-+		KEY_KPPLUSMINUS		118
-+		KEY_KPRIGHTPAREN	180
-+		KEY_KPSLASH		98
-+		KEY_L			38
-+		KEY_LANGUAGE		0x170
-+		KEY_LAST		0x195
-+		KEY_LEFT		105
-+		KEY_LEFTALT		56
-+		KEY_LEFTBRACE		26
-+		KEY_LEFTCTRL		29
-+		KEY_LEFTMETA		125
-+		KEY_LEFTSHIFT		42
-+		KEY_LINEFEED		101
-+		KEY_LIST		0x18b
-+		KEY_LOGOFF		0x1b1
-+		KEY_M			50
-+		KEY_MACRO		112
-+		KEY_MAIL		155
-+		KEY_MAX			0x2ff
-+		KEY_MEDIA		226
-+		KEY_MEDIA_REPEAT	0x1b7
-+		KEY_MEMO		0x18c
-+		KEY_MENU		139
-+		KEY_MESSENGER		0x1ae
-+		KEY_MHP			0x16f
-+		KEY_MINUS		12
-+		KEY_MODE		0x175
-+		KEY_MOVE		175
-+		KEY_MP3			0x187
-+		KEY_MSDOS		151
-+		KEY_MUHENKAN		94
-+		KEY_MUTE		113
-+		KEY_N			49
-+		KEY_NEW			181
-+		KEY_NEWS		0x1ab
-+		KEY_NEXT		0x197
-+		KEY_NEXTSONG		163
-+		KEY_NUMERIC_0		0x200
-+		KEY_NUMERIC_1		0x201
-+		KEY_NUMERIC_2		0x202
-+		KEY_NUMERIC_3		0x203
-+		KEY_NUMERIC_4		0x204
-+		KEY_NUMERIC_5		0x205
-+		KEY_NUMERIC_6		0x206
-+		KEY_NUMERIC_7		0x207
-+		KEY_NUMERIC_8		0x208
-+		KEY_NUMERIC_9		0x209
-+		KEY_NUMERIC_POUND	0x20b
-+		KEY_NUMERIC_STAR	0x20a
-+		KEY_NUMLOCK		69
-+		KEY_O			24
-+		KEY_OK			0x160
-+		KEY_OPEN		134
-+		KEY_OPTION		0x165
-+		KEY_P			25
-+		KEY_PAGEDOWN		109
-+		KEY_PAGEUP		104
-+		KEY_PASTE		135
-+		KEY_PAUSE		119
-+		KEY_PAUSECD		201
-+		KEY_PC			0x178
-+		KEY_PHONE		169
-+		KEY_PLAY		207
-+		KEY_PLAYCD		200
-+		KEY_PLAYER		0x183
-+		KEY_PLAYPAUSE		164
-+		KEY_POWER		116
-+		KEY_POWER2		0x164
-+		KEY_PRESENTATION	0x1a9
-+		KEY_PREVIOUS		0x19c
-+		KEY_PREVIOUSSONG	165
-+		KEY_PRINT		210
-+		KEY_PROG1		148
-+		KEY_PROG2		149
-+		KEY_PROG3		202
-+		KEY_PROG4		203
-+		KEY_PROGRAM		0x16a
-+		KEY_PROPS		130
-+		KEY_PVR			0x16e
-+		KEY_Q			16
-+		KEY_QUESTION		214
-+		KEY_R			19
-+		KEY_RADIO		0x181
-+		KEY_RECORD		167
-+		KEY_RED			0x18e
-+		KEY_REDO		182
-+		KEY_REFRESH		173
-+		KEY_REPLY		232
-+		KEY_RESERVED		0
-+		KEY_RESTART		0x198
-+		KEY_REWIND		168
-+		KEY_RFKILL		247
-+		KEY_RIGHT		106
-+		KEY_RIGHTALT		100
-+		KEY_RIGHTBRACE		27
-+		KEY_RIGHTCTRL		97
-+		KEY_RIGHTMETA		126
-+		KEY_RIGHTSHIFT		54
-+		KEY_RO			89
-+		KEY_S			31
-+		KEY_SAT			0x17d
-+		KEY_SAT2		0x17e
-+		KEY_SAVE		234
-+		KEY_SCALE		120
-+		KEY_SCREEN		0x177
-+		KEY_SCROLLDOWN		178
-+		KEY_SCROLLLOCK		70
-+		KEY_SCROLLUP		177
-+		KEY_SEARCH		217
-+		KEY_SELECT		0x161
-+		KEY_SEMICOLON		39
-+		KEY_SEND		231
-+		KEY_SENDFILE		145
-+		KEY_SETUP		141
-+		KEY_SHOP		221
-+		KEY_SHUFFLE		0x19a
-+		KEY_SLASH		53
-+		KEY_SLEEP		142
-+		KEY_SLOW		0x199
-+		KEY_SOUND		213
-+		KEY_SPACE		57
-+		KEY_SPELLCHECK		0x1b0
-+		KEY_SPORT		220
-+		KEY_SPREADSHEET		0x1a7
-+		KEY_STOP		128
-+		KEY_STOPCD		166
-+		KEY_SUBTITLE		0x172
-+		KEY_SUSPEND		205
-+		KEY_SWITCHVIDEOMODE	227
-+		KEY_SYSRQ		99
-+		KEY_T			20
-+		KEY_TAB			15
-+		KEY_TAPE		0x180
-+		KEY_TEEN		0x19e
-+		KEY_TEXT		0x184
-+		KEY_TIME		0x167
-+		KEY_TITLE		0x171
-+		KEY_TUNER		0x182
-+		KEY_TV			0x179
-+		KEY_TV2			0x17a
-+		KEY_TWEN		0x19f
-+		KEY_U			22
-+		KEY_UNDO		131
-+		KEY_UNKNOWN		240
-+		KEY_UP			103
-+		KEY_UWB			239
-+		KEY_V			47
-+		KEY_VCR			0x17b
-+		KEY_VCR2		0x17c
-+		KEY_VENDOR		0x168
-+		KEY_VIDEO		0x189
-+		KEY_VIDEO_NEXT		241
-+		KEY_VIDEOPHONE		0x1a0
-+		KEY_VIDEO_PREV		242
-+		KEY_VOICEMAIL		0x1ac
-+		KEY_VOLUMEDOWN		114
-+		KEY_VOLUMEUP		115
-+		KEY_W			17
-+		KEY_WAKEUP		143
-+		KEY_WIMAX		246
-+		KEY_WLAN		238
-+		KEY_WORDPROCESSOR	0x1a5
-+		KEY_WWW			150
-+		KEY_X			45
-+		KEY_XFER		147
-+		KEY_Y			21
-+		KEY_YELLOW		0x190
-+		KEY_YEN			124
-+		KEY_Z			44
-+		KEY_ZENKAKUHANKAKU	85
-+		KEY_ZOOM		0x174
-+		KEY_ZOOMIN		0x1a2
-+		KEY_ZOOMOUT		0x1a3
-+		KEY_ZOOMRESET		0x1a4
-+		BTN_0			0x100
-+		BTN_1			0x101
-+		BTN_2			0x102
-+		BTN_3			0x103
-+		BTN_4			0x104
-+		BTN_5			0x105
-+		BTN_6			0x106
-+		BTN_7			0x107
-+		BTN_8			0x108
-+		BTN_9			0x109
-+		BTN_A			0x130
-+		BTN_B			0x131
-+		BTN_BACK		0x116
-+		BTN_BASE		0x126
-+		BTN_BASE2		0x127
-+		BTN_BASE3		0x128
-+		BTN_BASE4		0x129
-+		BTN_BASE5		0x12a
-+		BTN_BASE6		0x12b
-+		BTN_C			0x132
-+		BTN_DEAD		0x12f
-+		BTN_DIGI		0x140
-+		BTN_EXTRA		0x114
-+		BTN_FORWARD		0x115
-+		BTN_GAMEPAD		0x130
-+		BTN_GEAR_DOWN		0x150
-+		BTN_GEAR_UP		0x151
-+		BTN_JOYSTICK		0x120
-+		BTN_LEFT		0x110
-+		BTN_MIDDLE		0x112
-+		BTN_MISC		0x100
-+		BTN_MODE		0x13c
-+		BTN_MOUSE		0x110
-+		BTN_PINKIE		0x125
-+		BTN_RIGHT		0x111
-+		BTN_SELECT		0x13a
-+		BTN_SIDE		0x113
-+		BTN_START		0x13b
-+		BTN_STYLUS		0x14b
-+		BTN_STYLUS2		0x14c
-+		BTN_TASK		0x117
-+		BTN_THUMB		0x121
-+		BTN_THUMB2		0x122
-+		BTN_THUMBL		0x13d
-+		BTN_THUMBR		0x13e
-+		BTN_TL			0x136
-+		BTN_TL2			0x138
-+		BTN_TOOL_AIRBRUSH	0x144
-+		BTN_TOOL_BRUSH		0x142
-+		BTN_TOOL_DOUBLETAP	0x14d
-+		BTN_TOOL_FINGER		0x145
-+		BTN_TOOL_LENS		0x147
-+		BTN_TOOL_MOUSE		0x146
-+		BTN_TOOL_PEN		0x140
-+		BTN_TOOL_PENCIL		0x143
-+		BTN_TOOL_QUADTAP	0x14f
-+		BTN_TOOL_RUBBER		0x141
-+		BTN_TOOL_TRIPLETAP	0x14e
-+		BTN_TOP			0x123
-+		BTN_TOP2		0x124
-+		BTN_TOUCH		0x14a
-+		BTN_TR			0x137
-+		BTN_TR2			0x139
-+		BTN_TRIGGER		0x120
-+		BTN_WHEEL		0x150
-+		BTN_X			0x133
-+		BTN_Y			0x134
-+		BTN_Z			0x135
-+	end codes
-+end remote
- 
--      begin codes
--          KEY_0                    0x000B
--          KEY_102ND                0x0056
--          KEY_1                    0x0002
--          KEY_2                    0x0003
--          KEY_3                    0x0004
--          KEY_4                    0x0005
--          KEY_5                    0x0006
--          KEY_6                    0x0007
--          KEY_7                    0x0008
--          KEY_8                    0x0009
--          KEY_9                    0x000A
--          KEY_A                    0x001E
--          KEY_AB                   0x0196
--          KEY_AGAIN                0x0081
--          KEY_ALTERASE             0x00DE
--          KEY_ANGLE                0x0173
--          KEY_APOSTROPHE           0x0028
--          KEY_ARCHIVE              0x0169
--          KEY_AUDIO                0x0188
--          KEY_AUX                  0x0186
--          KEY_B                    0x0030
--          KEY_BACK                 0x009E
--          KEY_BACKSLASH            0x002B
--          KEY_BACKSPACE            0x000E
--          KEY_BASSBOOST            0x00D1
--          KEY_BATTERY              0x00EC
--          KEY_BLUE                 0x0191
--          KEY_BOOKMARKS            0x009C
--          KEY_BREAK                0x019B
--          KEY_BRIGHTNESSDOWN       0x00E0
--          KEY_BRIGHTNESSUP         0x00E1
--          KEY_BRL_DOT1             0x01F1
--          KEY_BRL_DOT2             0x01F2
--          KEY_BRL_DOT3             0x01F3
--          KEY_BRL_DOT4             0x01F4
--          KEY_BRL_DOT5             0x01F5
--          KEY_BRL_DOT6             0x01F6
--          KEY_BRL_DOT7             0x01F7
--          KEY_BRL_DOT8             0x01F8
--          KEY_C                    0x002E
--          KEY_CALC                 0x008C
--          KEY_CALENDAR             0x018D
--          KEY_CAMERA               0x00D4
--          KEY_CANCEL               0x00DF
--          KEY_CAPSLOCK             0x003A
--          KEY_CD                   0x017F
--          KEY_CHANNEL              0x016B
--          KEY_CHANNELDOWN          0x0193
--          KEY_CHANNELUP            0x0192
--          KEY_CHAT                 0x00D8
--          KEY_CLEAR                0x0163
--          KEY_CLOSE                0x00CE
--          KEY_CLOSECD              0x00A0
--          KEY_COFFEE               0x0098
--          KEY_COMMA                0x0033
--          KEY_COMPOSE              0x007F
--          KEY_COMPUTER             0x009D
--          KEY_CONFIG               0x00AB
--          KEY_CONNECT              0x00DA
--          KEY_COPY                 0x0085
--          KEY_CUT                  0x0089
--          KEY_CYCLEWINDOWS         0x009A
--          KEY_D                    0x0020
--          KEY_DEL_EOL              0x01C0
--          KEY_DEL_EOS              0x01C1
--          KEY_DELETE               0x006F
--          KEY_DELETEFILE           0x0092
--          KEY_DEL_LINE             0x01C3
--          KEY_DIGITS               0x019D
--          KEY_DIRECTION            0x0099
--          KEY_DIRECTORY            0x018A
--          KEY_DOCUMENTS            0x00EB
--          KEY_DOT                  0x0034
--          KEY_DOWN                 0x006C
--          KEY_DVD                  0x0185
--          KEY_E                    0x0012
--          KEY_EDIT                 0x00B0
--          KEY_EJECTCD              0x00A1
--          KEY_EJECTCLOSECD         0x00A2
--          KEY_EMAIL                0x00D7
--          KEY_END                  0x006B
--          KEY_ENTER                0x001C
--          KEY_EPG                  0x016D
--          KEY_EQUAL                0x000D
--          KEY_ESC                  0x0001
--          KEY_EXIT                 0x00AE
--          KEY_F10                  0x0044
--          KEY_F11                  0x0057
--          KEY_F12                  0x0058
--          KEY_F13                  0x00B7
--          KEY_F14                  0x00B8
--          KEY_F15                  0x00B9
--          KEY_F1                   0x003B
--          KEY_F16                  0x00BA
--          KEY_F17                  0x00BB
--          KEY_F18                  0x00BC
--          KEY_F19                  0x00BD
--          KEY_F20                  0x00BE
--          KEY_F21                  0x00BF
--          KEY_F22                  0x00C0
--          KEY_F23                  0x00C1
--          KEY_F24                  0x00C2
--          KEY_F2                   0x003C
--          KEY_F                    0x0021
--          KEY_F3                   0x003D
--          KEY_F4                   0x003E
--          KEY_F5                   0x003F
--          KEY_F6                   0x0040
--          KEY_F7                   0x0041
--          KEY_F8                   0x0042
--          KEY_F9                   0x0043
--          KEY_FASTFORWARD          0x00D0
--          KEY_FAVORITES            0x016C
--          KEY_FILE                 0x0090
--          KEY_FINANCE              0x00DB
--          KEY_FIND                 0x0088
--          KEY_FIRST                0x0194
--          KEY_FN                   0x01D0
--          KEY_FN_1                 0x01DE
--          KEY_FN_2                 0x01DF
--          KEY_FN_B                 0x01E4
--          KEY_FN_D                 0x01E0
--          KEY_FN_E                 0x01E1
--          KEY_FN_ESC               0x01D1
--          KEY_FN_F                 0x01E2
--          KEY_FN_F10               0x01DB
--          KEY_FN_F1                0x01D2
--          KEY_FN_F11               0x01DC
--          KEY_FN_F12               0x01DD
--          KEY_FN_F2                0x01D3
--          KEY_FN_F3                0x01D4
--          KEY_FN_F4                0x01D5
--          KEY_FN_F5                0x01D6
--          KEY_FN_F6                0x01D7
--          KEY_FN_F7                0x01D8
--          KEY_FN_F8                0x01D9
--          KEY_FN_F9                0x01DA
--          KEY_FN_S                 0x01E3
--          KEY_FORWARD              0x009F
--          KEY_FORWARDMAIL          0x00E9
--          KEY_FRONT                0x0084
--          KEY_G                    0x0022
--          KEY_GOTO                 0x0162
--          KEY_GRAVE                0x0029
--          KEY_GREEN                0x018F
--          KEY_H                    0x0023
--          KEY_HANGEUL              0x007A
--          KEY_HANJA                0x007B
--          KEY_HELP                 0x008A
--          KEY_HENKAN               0x005C
--          KEY_HIRAGANA             0x005B
--          KEY_HOME                 0x0066
--          KEY_HOMEPAGE             0x00AC
--          KEY_HP                   0x00D3
--          KEY_I                    0x0017
--          KEY_INFO                 0x0166
--          KEY_INSERT               0x006E
--          KEY_INS_LINE             0x01C2
--          KEY_ISO                  0x00AA
--          KEY_J                    0x0024
--          KEY_K                    0x0025
--          KEY_KATAKANA             0x005A
--          KEY_KATAKANAHIRAGANA     0x005D
--          KEY_KBDILLUMDOWN         0x00E5
--          KEY_KBDILLUMTOGGLE       0x00E4
--          KEY_KBDILLUMUP           0x00E6
--          KEY_KEYBOARD             0x0176
--          KEY_KP0                  0x0052
--          KEY_KP1                  0x004F
--          KEY_KP2                  0x0050
--          KEY_KP3                  0x0051
--          KEY_KP4                  0x004B
--          KEY_KP5                  0x004C
--          KEY_KP6                  0x004D
--          KEY_KP7                  0x0047
--          KEY_KP8                  0x0048
--          KEY_KP9                  0x0049
--          KEY_KPASTERISK           0x0037
--          KEY_KPCOMMA              0x0079
--          KEY_KPDOT                0x0053
--          KEY_KPENTER              0x0060
--          KEY_KPEQUAL              0x0075
--          KEY_KPJPCOMMA            0x005F
--          KEY_KPLEFTPAREN          0x00B3
--          KEY_KPMINUS              0x004A
--          KEY_KPPLUS               0x004E
--          KEY_KPPLUSMINUS          0x0076
--          KEY_KPRIGHTPAREN         0x00B4
--          KEY_KPSLASH              0x0062
--          KEY_L                    0x0026
--          KEY_LANGUAGE             0x0170
--          KEY_LAST                 0x0195
--          KEY_LEFT                 0x0069
--          KEY_LEFTALT              0x0038
--          KEY_LEFTBRACE            0x001A
--          KEY_LEFTCTRL             0x001D
--          KEY_LEFTMETA             0x007D
--          KEY_LEFTSHIFT            0x002A
--          KEY_LINEFEED             0x0065
--          KEY_LIST                 0x018B
--          KEY_M                    0x0032
--          KEY_MACRO                0x0070
--          KEY_MAIL                 0x009B
--          KEY_MAX                  0x01FF
--          KEY_MEDIA                0x00E2
--          KEY_MEMO                 0x018C
--          KEY_MENU                 0x008B
--          KEY_MHP                  0x016F
--          KEY_MINUS                0x000C
--          KEY_MODE                 0x0175
--          KEY_MOVE                 0x00AF
--          KEY_MP3                  0x0187
--          KEY_MSDOS                0x0097
--          KEY_MUHENKAN             0x005E
--          KEY_MUTE                 0x0071
--          KEY_N                    0x0031
--          KEY_NEW                  0x00B5
--          KEY_NEXT                 0x0197
--          KEY_NEXTSONG             0x00A3
--          KEY_NUMLOCK              0x0045
--          KEY_O                    0x0018
--          KEY_OK                   0x0160
--          KEY_OPEN                 0x0086
--          KEY_OPTION               0x0165
--          KEY_P                    0x0019
--          KEY_PAGEDOWN             0x006D
--          KEY_PAGEUP               0x0068
--          KEY_PASTE                0x0087
--          KEY_PAUSE                0x0077
--          KEY_PAUSECD              0x00C9
--          KEY_PC                   0x0178
--          KEY_PHONE                0x00A9
--          KEY_PLAY                 0x00CF
--          KEY_PLAYCD               0x00C8
--          KEY_PLAYER               0x0183
--          KEY_PLAYPAUSE            0x00A4
--          KEY_POWER                0x0074
--          KEY_POWER2               0x0164
--          KEY_PREVIOUS             0x019C
--          KEY_PREVIOUSSONG         0x00A5
--          KEY_PRINT                0x00D2
--          KEY_PROG1                0x0094
--          KEY_PROG2                0x0095
--          KEY_PROG3                0x00CA
--          KEY_PROG4                0x00CB
--          KEY_PROGRAM              0x016A
--          KEY_PROPS                0x0082
--          KEY_PVR                  0x016E
--          KEY_Q                    0x0010
--          KEY_QUESTION             0x00D6
--          KEY_R                    0x0013
--          KEY_RADIO                0x0181
--          KEY_RECORD               0x00A7
--          KEY_RED                  0x018E
--          KEY_REDO                 0x00B6
--          KEY_REFRESH              0x00AD
--          KEY_REPLY                0x00E8
--          KEY_RESERVED             0x0000
--          KEY_RESTART              0x0198
--          KEY_REWIND               0x00A8
--          KEY_RIGHT                0x006A
--          KEY_RIGHTALT             0x0064
--          KEY_RIGHTBRACE           0x001B
--          KEY_RIGHTCTRL            0x0061
--          KEY_RIGHTMETA            0x007E
--          KEY_RIGHTSHIFT           0x0036
--          KEY_RO                   0x0059
--          KEY_S                    0x001F
--          KEY_SAT                  0x017D
--          KEY_SAT2                 0x017E
--          KEY_SAVE                 0x00EA
--          KEY_SCREEN               0x0177
--          KEY_SCROLLDOWN           0x00B2
--          KEY_SCROLLLOCK           0x0046
--          KEY_SCROLLUP             0x00B1
--          KEY_SEARCH               0x00D9
--          KEY_SELECT               0x0161
--          KEY_SEMICOLON            0x0027
--          KEY_SEND                 0x00E7
--          KEY_SENDFILE             0x0091
--          KEY_SETUP                0x008D
--          KEY_SHOP                 0x00DD
--          KEY_SHUFFLE              0x019A
--          KEY_SLASH                0x0035
--          KEY_SLEEP                0x008E
--          KEY_SLOW                 0x0199
--          KEY_SOUND                0x00D5
--          KEY_SPACE                0x0039
--          KEY_SPORT                0x00DC
--          KEY_STOP                 0x0080
--          KEY_STOPCD               0x00A6
--          KEY_SUBTITLE             0x0172
--          KEY_SUSPEND              0x00CD
--          KEY_SWITCHVIDEOMODE      0x00E3
--          KEY_SYSRQ                0x0063
--          KEY_T                    0x0014
--          KEY_TAB                  0x000F
--          KEY_TAPE                 0x0180
--          KEY_TEEN                 0x019E
--          KEY_TEXT                 0x0184
--          KEY_TIME                 0x0167
--          KEY_TITLE                0x0171
--          KEY_TUNER                0x0182
--          KEY_TV                   0x0179
--          KEY_TV2                  0x017A
--          KEY_TWEN                 0x019F
--          KEY_U                    0x0016
--          KEY_UNDO                 0x0083
--          KEY_UNKNOWN              0x00F0
--          KEY_UP                   0x0067
--          KEY_V                    0x002F
--          KEY_VCR                  0x017B
--          KEY_VCR2                 0x017C
--          KEY_VENDOR               0x0168
--          KEY_VIDEO                0x0189
--          KEY_VOLUMEDOWN           0x0072
--          KEY_VOLUMEUP             0x0073
--          KEY_W                    0x0011
--          KEY_WAKEUP               0x008F
--          KEY_WWW                  0x0096
--          KEY_X                    0x002D
--          KEY_XFER                 0x0093
--          KEY_Y                    0x0015
--          KEY_YELLOW               0x0190
--          KEY_YEN                  0x007C
--          KEY_Z                    0x002C
--          KEY_ZENKAKUHANKAKU       0x0055
--          KEY_ZOOM                 0x0174
--          BTN_0                    0x0100
--          BTN_1                    0x0101
--          BTN_2                    0x0102
--          BTN_3                    0x0103
--          BTN_4                    0x0104
--          BTN_5                    0x0105
--          BTN_6                    0x0106
--          BTN_7                    0x0107
--          BTN_8                    0x0108
--          BTN_9                    0x0109
--          BTN_A                    0x0130
--          BTN_B                    0x0131
--          BTN_BACK                 0x0116
--          BTN_BASE                 0x0126
--          BTN_BASE2                0x0127
--          BTN_BASE3                0x0128
--          BTN_BASE4                0x0129
--          BTN_BASE5                0x012A
--          BTN_BASE6                0x012B
--          BTN_C                    0x0132
--          BTN_DEAD                 0x012F
--          BTN_DIGI                 0x0140
--          BTN_EXTRA                0x0114
--          BTN_FORWARD              0x0115
--          BTN_GAMEPAD              0x0130
--          BTN_GEAR_DOWN            0x0150
--          BTN_GEAR_UP              0x0151
--          BTN_JOYSTICK             0x0120
--          BTN_LEFT                 0x0110
--          BTN_MIDDLE               0x0112
--          BTN_MISC                 0x0100
--          BTN_MODE                 0x013C
--          BTN_MOUSE                0x0110
--          BTN_PINKIE               0x0125
--          BTN_RIGHT                0x0111
--          BTN_SELECT               0x013A
--          BTN_SIDE                 0x0113
--          BTN_START                0x013B
--          BTN_STYLUS               0x014B
--          BTN_STYLUS2              0x014C
--          BTN_TASK                 0x0117
--          BTN_THUMB                0x0121
--          BTN_THUMB2               0x0122
--          BTN_THUMBL               0x013D
--          BTN_THUMBR               0x013E
--          BTN_TL                   0x0136
--          BTN_TL2                  0x0138
--          BTN_TOOL_AIRBRUSH        0x0144
--          BTN_TOOL_BRUSH           0x0142
--          BTN_TOOL_DOUBLETAP       0x014D
--          BTN_TOOL_FINGER          0x0145
--          BTN_TOOL_LENS            0x0147
--          BTN_TOOL_MOUSE           0x0146
--          BTN_TOOL_PEN             0x0140
--          BTN_TOOL_PENCIL          0x0143
--          BTN_TOOL_RUBBER          0x0141
--          BTN_TOOL_TRIPLETAP       0x014E
--          BTN_TOP                  0x0123
--          BTN_TOP2                 0x0124
--          BTN_TOUCH                0x014A
--          BTN_TR                   0x0137
--          BTN_TR2                  0x0139
--          BTN_TRIGGER              0x0120
--          BTN_WHEEL                0x0150
--          BTN_X                    0x0133
--          BTN_Y                    0x0134
--          BTN_Z                    0x0135
--      end codes
-+# generated by devinput.sh (obsolete 32 bit version)
-+begin remote
-+        name            devinput32
-+        bits            16
-+        eps             30
-+        aeps            100
-+        pre_data_bits   16
-+        pre_data        0x8001
-+        gap             132799
-+        toggle_bit      0
- 
-+	begin codes
-+		KEY_0			11
-+		KEY_102ND		86
-+		KEY_1			2
-+		KEY_2			3
-+		KEY_3			4
-+		KEY_4			5
-+		KEY_5			6
-+		KEY_6			7
-+		KEY_7			8
-+		KEY_8			9
-+		KEY_9			10
-+		KEY_A			30
-+		KEY_AB			0x196
-+		KEY_ADDRESSBOOK		0x1ad
-+		KEY_AGAIN		129
-+		KEY_ALTERASE		222
-+		KEY_ANGLE		0x173
-+		KEY_APOSTROPHE		40
-+		KEY_ARCHIVE		0x169
-+		KEY_AUDIO		0x188
-+		KEY_AUX			0x186
-+		KEY_B			48
-+		KEY_BACK		158
-+		KEY_BACKSLASH		43
-+		KEY_BACKSPACE		14
-+		KEY_BASSBOOST		209
-+		KEY_BATTERY		236
-+		KEY_BLUE		0x191
-+		KEY_BLUETOOTH		237
-+		KEY_BOOKMARKS		156
-+		KEY_BREAK		0x19b
-+		KEY_BRIGHTNESS_CYCLE	243
-+		KEY_BRIGHTNESSDOWN	224
-+		KEY_BRIGHTNESSUP	225
-+		KEY_BRIGHTNESS_ZERO	244
-+		KEY_BRL_DOT10		0x1fa
-+		KEY_BRL_DOT1		0x1f1
-+		KEY_BRL_DOT2		0x1f2
-+		KEY_BRL_DOT3		0x1f3
-+		KEY_BRL_DOT4		0x1f4
-+		KEY_BRL_DOT5		0x1f5
-+		KEY_BRL_DOT6		0x1f6
-+		KEY_BRL_DOT7		0x1f7
-+		KEY_BRL_DOT8		0x1f8
-+		KEY_BRL_DOT9		0x1f9
-+		KEY_C			46
-+		KEY_CALC		140
-+		KEY_CALENDAR		0x18d
-+		KEY_CAMERA		212
-+		KEY_CAMERA_FOCUS	0x210
-+		KEY_CANCEL		223
-+		KEY_CAPSLOCK		58
-+		KEY_CD			0x17f
-+		KEY_CHANNEL		0x16b
-+		KEY_CHANNELDOWN		0x193
-+		KEY_CHANNELUP		0x192
-+		KEY_CHAT		216
-+		KEY_CLEAR		0x163
-+		KEY_CLOSE		206
-+		KEY_CLOSECD		160
-+		KEY_COFFEE		152
-+		KEY_COMMA		51
-+		KEY_COMPOSE		127
-+		KEY_COMPUTER		157
-+		KEY_CONFIG		171
-+		KEY_CONNECT		218
-+		KEY_CONTEXT_MENU	0x1b6
-+		KEY_COPY		133
-+		KEY_CUT			137
-+		KEY_CYCLEWINDOWS	154
-+		KEY_D			32
-+		KEY_DASHBOARD		204
-+		KEY_DATABASE		0x1aa
-+		KEY_DEL_EOL		0x1c0
-+		KEY_DEL_EOS		0x1c1
-+		KEY_DELETE		111
-+		KEY_DELETEFILE		146
-+		KEY_DEL_LINE		0x1c3
-+		KEY_DIGITS		0x19d
-+		KEY_DIRECTION		153
-+		KEY_DIRECTORY		0x18a
-+		KEY_DISPLAY_OFF		245
-+		KEY_DISPLAYTOGGLE	0x1af
-+		KEY_DOCUMENTS		235
-+		KEY_DOLLAR		0x1b2
-+		KEY_DOT			52
-+		KEY_DOWN		108
-+		KEY_DVD			0x185
-+		KEY_E			18
-+		KEY_EDIT		176
-+		KEY_EDITOR		0x1a6
-+		KEY_EJECTCD		161
-+		KEY_EJECTCLOSECD	162
-+		KEY_EMAIL		215
-+		KEY_END			107
-+		KEY_ENTER		28
-+		KEY_EPG			0x16d
-+		KEY_EQUAL		13
-+		KEY_ESC			1
-+		KEY_EURO		0x1b3
-+		KEY_EXIT		174
-+		KEY_F10			68
-+		KEY_F11			87
-+		KEY_F12			88
-+		KEY_F13			183
-+		KEY_F14			184
-+		KEY_F15			185
-+		KEY_F1			59
-+		KEY_F16			186
-+		KEY_F17			187
-+		KEY_F18			188
-+		KEY_F19			189
-+		KEY_F20			190
-+		KEY_F21			191
-+		KEY_F22			192
-+		KEY_F23			193
-+		KEY_F24			194
-+		KEY_F2			60
-+		KEY_F			33
-+		KEY_F3			61
-+		KEY_F4			62
-+		KEY_F5			63
-+		KEY_F6			64
-+		KEY_F7			65
-+		KEY_F8			66
-+		KEY_F9			67
-+		KEY_FASTFORWARD		208
-+		KEY_FAVORITES		0x16c
-+		KEY_FILE		144
-+		KEY_FINANCE		219
-+		KEY_FIND		136
-+		KEY_FIRST		0x194
-+		KEY_FN			0x1d0
-+		KEY_FN_1		0x1de
-+		KEY_FN_2		0x1df
-+		KEY_FN_B		0x1e4
-+		KEY_FN_D		0x1e0
-+		KEY_FN_E		0x1e1
-+		KEY_FN_ESC		0x1d1
-+		KEY_FN_F		0x1e2
-+		KEY_FN_F10		0x1db
-+		KEY_FN_F1		0x1d2
-+		KEY_FN_F11		0x1dc
-+		KEY_FN_F12		0x1dd
-+		KEY_FN_F2		0x1d3
-+		KEY_FN_F3		0x1d4
-+		KEY_FN_F4		0x1d5
-+		KEY_FN_F5		0x1d6
-+		KEY_FN_F6		0x1d7
-+		KEY_FN_F7		0x1d8
-+		KEY_FN_F8		0x1d9
-+		KEY_FN_F9		0x1da
-+		KEY_FN_S		0x1e3
-+		KEY_FORWARD		159
-+		KEY_FORWARDMAIL		233
-+		KEY_FRAMEBACK		0x1b4
-+		KEY_FRAMEFORWARD	0x1b5
-+		KEY_FRONT		132
-+		KEY_G			34
-+		KEY_GAMES		0x1a1
-+		KEY_GOTO		0x162
-+		KEY_GRAPHICSEDITOR	0x1a8
-+		KEY_GRAVE		41
-+		KEY_GREEN		0x18f
-+		KEY_H			35
-+		KEY_HANGEUL		122
-+		KEY_HANJA		123
-+		KEY_HELP		138
-+		KEY_HENKAN		92
-+		KEY_HIRAGANA		91
-+		KEY_HOME		102
-+		KEY_HOMEPAGE		172
-+		KEY_HP			211
-+		KEY_I			23
-+		KEY_INFO		0x166
-+		KEY_INSERT		110
-+		KEY_INS_LINE		0x1c2
-+		KEY_ISO			170
-+		KEY_J			36
-+		KEY_K			37
-+		KEY_KATAKANA		90
-+		KEY_KATAKANAHIRAGANA	93
-+		KEY_KBDILLUMDOWN	229
-+		KEY_KBDILLUMTOGGLE	228
-+		KEY_KBDILLUMUP		230
-+		KEY_KEYBOARD		0x176
-+		KEY_KP0			82
-+		KEY_KP1			79
-+		KEY_KP2			80
-+		KEY_KP3			81
-+		KEY_KP4			75
-+		KEY_KP5			76
-+		KEY_KP6			77
-+		KEY_KP7			71
-+		KEY_KP8			72
-+		KEY_KP9			73
-+		KEY_KPASTERISK		55
-+		KEY_KPCOMMA		121
-+		KEY_KPDOT		83
-+		KEY_KPENTER		96
-+		KEY_KPEQUAL		117
-+		KEY_KPJPCOMMA		95
-+		KEY_KPLEFTPAREN		179
-+		KEY_KPMINUS		74
-+		KEY_KPPLUS		78
-+		KEY_KPPLUSMINUS		118
-+		KEY_KPRIGHTPAREN	180
-+		KEY_KPSLASH		98
-+		KEY_L			38
-+		KEY_LANGUAGE		0x170
-+		KEY_LAST		0x195
-+		KEY_LEFT		105
-+		KEY_LEFTALT		56
-+		KEY_LEFTBRACE		26
-+		KEY_LEFTCTRL		29
-+		KEY_LEFTMETA		125
-+		KEY_LEFTSHIFT		42
-+		KEY_LINEFEED		101
-+		KEY_LIST		0x18b
-+		KEY_LOGOFF		0x1b1
-+		KEY_M			50
-+		KEY_MACRO		112
-+		KEY_MAIL		155
-+		KEY_MAX			0x2ff
-+		KEY_MEDIA		226
-+		KEY_MEDIA_REPEAT	0x1b7
-+		KEY_MEMO		0x18c
-+		KEY_MENU		139
-+		KEY_MESSENGER		0x1ae
-+		KEY_MHP			0x16f
-+		KEY_MINUS		12
-+		KEY_MODE		0x175
-+		KEY_MOVE		175
-+		KEY_MP3			0x187
-+		KEY_MSDOS		151
-+		KEY_MUHENKAN		94
-+		KEY_MUTE		113
-+		KEY_N			49
-+		KEY_NEW			181
-+		KEY_NEWS		0x1ab
-+		KEY_NEXT		0x197
-+		KEY_NEXTSONG		163
-+		KEY_NUMERIC_0		0x200
-+		KEY_NUMERIC_1		0x201
-+		KEY_NUMERIC_2		0x202
-+		KEY_NUMERIC_3		0x203
-+		KEY_NUMERIC_4		0x204
-+		KEY_NUMERIC_5		0x205
-+		KEY_NUMERIC_6		0x206
-+		KEY_NUMERIC_7		0x207
-+		KEY_NUMERIC_8		0x208
-+		KEY_NUMERIC_9		0x209
-+		KEY_NUMERIC_POUND	0x20b
-+		KEY_NUMERIC_STAR	0x20a
-+		KEY_NUMLOCK		69
-+		KEY_O			24
-+		KEY_OK			0x160
-+		KEY_OPEN		134
-+		KEY_OPTION		0x165
-+		KEY_P			25
-+		KEY_PAGEDOWN		109
-+		KEY_PAGEUP		104
-+		KEY_PASTE		135
-+		KEY_PAUSE		119
-+		KEY_PAUSECD		201
-+		KEY_PC			0x178
-+		KEY_PHONE		169
-+		KEY_PLAY		207
-+		KEY_PLAYCD		200
-+		KEY_PLAYER		0x183
-+		KEY_PLAYPAUSE		164
-+		KEY_POWER		116
-+		KEY_POWER2		0x164
-+		KEY_PRESENTATION	0x1a9
-+		KEY_PREVIOUS		0x19c
-+		KEY_PREVIOUSSONG	165
-+		KEY_PRINT		210
-+		KEY_PROG1		148
-+		KEY_PROG2		149
-+		KEY_PROG3		202
-+		KEY_PROG4		203
-+		KEY_PROGRAM		0x16a
-+		KEY_PROPS		130
-+		KEY_PVR			0x16e
-+		KEY_Q			16
-+		KEY_QUESTION		214
-+		KEY_R			19
-+		KEY_RADIO		0x181
-+		KEY_RECORD		167
-+		KEY_RED			0x18e
-+		KEY_REDO		182
-+		KEY_REFRESH		173
-+		KEY_REPLY		232
-+		KEY_RESERVED		0
-+		KEY_RESTART		0x198
-+		KEY_REWIND		168
-+		KEY_RFKILL		247
-+		KEY_RIGHT		106
-+		KEY_RIGHTALT		100
-+		KEY_RIGHTBRACE		27
-+		KEY_RIGHTCTRL		97
-+		KEY_RIGHTMETA		126
-+		KEY_RIGHTSHIFT		54
-+		KEY_RO			89
-+		KEY_S			31
-+		KEY_SAT			0x17d
-+		KEY_SAT2		0x17e
-+		KEY_SAVE		234
-+		KEY_SCALE		120
-+		KEY_SCREEN		0x177
-+		KEY_SCROLLDOWN		178
-+		KEY_SCROLLLOCK		70
-+		KEY_SCROLLUP		177
-+		KEY_SEARCH		217
-+		KEY_SELECT		0x161
-+		KEY_SEMICOLON		39
-+		KEY_SEND		231
-+		KEY_SENDFILE		145
-+		KEY_SETUP		141
-+		KEY_SHOP		221
-+		KEY_SHUFFLE		0x19a
-+		KEY_SLASH		53
-+		KEY_SLEEP		142
-+		KEY_SLOW		0x199
-+		KEY_SOUND		213
-+		KEY_SPACE		57
-+		KEY_SPELLCHECK		0x1b0
-+		KEY_SPORT		220
-+		KEY_SPREADSHEET		0x1a7
-+		KEY_STOP		128
-+		KEY_STOPCD		166
-+		KEY_SUBTITLE		0x172
-+		KEY_SUSPEND		205
-+		KEY_SWITCHVIDEOMODE	227
-+		KEY_SYSRQ		99
-+		KEY_T			20
-+		KEY_TAB			15
-+		KEY_TAPE		0x180
-+		KEY_TEEN		0x19e
-+		KEY_TEXT		0x184
-+		KEY_TIME		0x167
-+		KEY_TITLE		0x171
-+		KEY_TUNER		0x182
-+		KEY_TV			0x179
-+		KEY_TV2			0x17a
-+		KEY_TWEN		0x19f
-+		KEY_U			22
-+		KEY_UNDO		131
-+		KEY_UNKNOWN		240
-+		KEY_UP			103
-+		KEY_UWB			239
-+		KEY_V			47
-+		KEY_VCR			0x17b
-+		KEY_VCR2		0x17c
-+		KEY_VENDOR		0x168
-+		KEY_VIDEO		0x189
-+		KEY_VIDEO_NEXT		241
-+		KEY_VIDEOPHONE		0x1a0
-+		KEY_VIDEO_PREV		242
-+		KEY_VOICEMAIL		0x1ac
-+		KEY_VOLUMEDOWN		114
-+		KEY_VOLUMEUP		115
-+		KEY_W			17
-+		KEY_WAKEUP		143
-+		KEY_WIMAX		246
-+		KEY_WLAN		238
-+		KEY_WORDPROCESSOR	0x1a5
-+		KEY_WWW			150
-+		KEY_X			45
-+		KEY_XFER		147
-+		KEY_Y			21
-+		KEY_YELLOW		0x190
-+		KEY_YEN			124
-+		KEY_Z			44
-+		KEY_ZENKAKUHANKAKU	85
-+		KEY_ZOOM		0x174
-+		KEY_ZOOMIN		0x1a2
-+		KEY_ZOOMOUT		0x1a3
-+		KEY_ZOOMRESET		0x1a4
-+		BTN_0			0x100
-+		BTN_1			0x101
-+		BTN_2			0x102
-+		BTN_3			0x103
-+		BTN_4			0x104
-+		BTN_5			0x105
-+		BTN_6			0x106
-+		BTN_7			0x107
-+		BTN_8			0x108
-+		BTN_9			0x109
-+		BTN_A			0x130
-+		BTN_B			0x131
-+		BTN_BACK		0x116
-+		BTN_BASE		0x126
-+		BTN_BASE2		0x127
-+		BTN_BASE3		0x128
-+		BTN_BASE4		0x129
-+		BTN_BASE5		0x12a
-+		BTN_BASE6		0x12b
-+		BTN_C			0x132
-+		BTN_DEAD		0x12f
-+		BTN_DIGI		0x140
-+		BTN_EXTRA		0x114
-+		BTN_FORWARD		0x115
-+		BTN_GAMEPAD		0x130
-+		BTN_GEAR_DOWN		0x150
-+		BTN_GEAR_UP		0x151
-+		BTN_JOYSTICK		0x120
-+		BTN_LEFT		0x110
-+		BTN_MIDDLE		0x112
-+		BTN_MISC		0x100
-+		BTN_MODE		0x13c
-+		BTN_MOUSE		0x110
-+		BTN_PINKIE		0x125
-+		BTN_RIGHT		0x111
-+		BTN_SELECT		0x13a
-+		BTN_SIDE		0x113
-+		BTN_START		0x13b
-+		BTN_STYLUS		0x14b
-+		BTN_STYLUS2		0x14c
-+		BTN_TASK		0x117
-+		BTN_THUMB		0x121
-+		BTN_THUMB2		0x122
-+		BTN_THUMBL		0x13d
-+		BTN_THUMBR		0x13e
-+		BTN_TL			0x136
-+		BTN_TL2			0x138
-+		BTN_TOOL_AIRBRUSH	0x144
-+		BTN_TOOL_BRUSH		0x142
-+		BTN_TOOL_DOUBLETAP	0x14d
-+		BTN_TOOL_FINGER		0x145
-+		BTN_TOOL_LENS		0x147
-+		BTN_TOOL_MOUSE		0x146
-+		BTN_TOOL_PEN		0x140
-+		BTN_TOOL_PENCIL		0x143
-+		BTN_TOOL_QUADTAP	0x14f
-+		BTN_TOOL_RUBBER		0x141
-+		BTN_TOOL_TRIPLETAP	0x14e
-+		BTN_TOP			0x123
-+		BTN_TOP2		0x124
-+		BTN_TOUCH		0x14a
-+		BTN_TR			0x137
-+		BTN_TR2			0x139
-+		BTN_TRIGGER		0x120
-+		BTN_WHEEL		0x150
-+		BTN_X			0x133
-+		BTN_Y			0x134
-+		BTN_Z			0x135
-+	end codes
- end remote
- 
--
diff --git a/lirc-0.8.6-devinput-pass-mouse-events.patch b/lirc-0.8.6-devinput-pass-mouse-events.patch
deleted file mode 100644
index f6bcb5f..0000000
--- a/lirc-0.8.6-devinput-pass-mouse-events.patch
+++ /dev/null
@@ -1,262 +0,0 @@
-diff -Naurp lirc-0.8.6/daemons/hw_devinput.c~ lirc-0.8.6/daemons/hw_devinput.c
---- lirc-0.8.6/daemons/hw_devinput.c~	2009/09/07 18:08:00	5.20
-+++ lirc-0.8.6/daemons/hw_devinput.c	2009/10/31 09:37:30	5.21
-@@ -31,8 +31,10 @@
- #include <sys/types.h>
- #include <dirent.h>
- #include <fnmatch.h>
-+#include <limits.h>
- 
- #include <linux/input.h>
-+#include <linux/uinput.h>
- 
- #ifndef EV_SYN
- /* previous name */
-@@ -44,8 +46,18 @@
- #include "lircd.h"
- #include "receive.h"
- 
-+/* from evtest.c - Copyright (c) 1999-2000 Vojtech Pavlik */
-+#define BITS_PER_LONG (sizeof(long) * CHAR_BIT)
-+/* NBITS was defined in linux/uinput.h */
-+#undef NBITS
-+#define NBITS(x) ((((x)-1)/BITS_PER_LONG)+1)
-+#define OFF(x)  ((x)%BITS_PER_LONG)
-+#define BIT(x)  (1UL<<OFF(x))
-+#define LONG(x) ((x)/BITS_PER_LONG)
-+#define test_bit(bit, array)	((array[LONG(bit)] >> OFF(bit)) & 1)
- 
- static int devinput_init();
-+static int devinput_init_fwd();
- static int devinput_deinit(void);
- static int devinput_decode(struct ir_remote *remote,
- 			   ir_code *prep, ir_code *codep, ir_code *postp,
-@@ -67,7 +76,7 @@
- 	0,			/* send_mode */
- 	LIRC_MODE_LIRCCODE,	/* rec_mode */
- 	32,			/* code_length */
--	devinput_init,		/* init_func */
-+	devinput_init_fwd,	/* init_func */
- 	NULL,			/* config_func */
- 	devinput_deinit,	/* deinit_func */
- 	NULL,			/* send_func */
-@@ -80,6 +89,141 @@
- 
- static ir_code code;
- static int repeat_flag=0;
-+static int exclusive = 0;
-+static int uinputfd = -1;
-+
-+static int setup_uinputfd(const char *name, int source)
-+{
-+	int fd;
-+	int key;
-+	struct uinput_user_dev dev;
-+	long events[NBITS(EV_MAX)];
-+	long bits[NBITS(KEY_MAX)];
-+	
-+	if(ioctl(source, EVIOCGBIT(0, EV_MAX), events) == -1)
-+	{
-+		return -1;
-+	}
-+	if(!test_bit(EV_REL, events) && !test_bit(EV_ABS, events))
-+	{
-+		/* no move events, don't forward anything */
-+		return -1;
-+	}
-+	fd = open("/dev/input/uinput", O_RDWR);
-+	if(fd == -1)
-+	{
-+		fd = open("/dev/uinput", O_RDWR);
-+		if(fd == -1)
-+		{
-+			fd = open("/dev/misc/uinput", O_RDWR);
-+			if(fd == -1)
-+			{
-+				logprintf(LOG_WARNING, "could not open %s\n",
-+					  "uinput");
-+				logperror(LOG_WARNING, NULL);
-+				return -1;
-+			}
-+		}
-+	}
-+	memset(&dev, 0, sizeof(dev));
-+	if(ioctl(source, EVIOCGNAME(sizeof(dev.name)), dev.name) >= 0)
-+	{
-+		dev.name[sizeof(dev.name)-1] = 0;
-+		if(strlen(dev.name) > 0)
-+		{
-+			strncat(dev.name, " ", sizeof(dev.name) -
-+				strlen(dev.name));
-+			dev.name[sizeof(dev.name)-1] = 0;
-+		}
-+	}
-+	strncat(dev.name, name, sizeof(dev.name) - strlen(dev.name));
-+	dev.name[sizeof(dev.name)-1] = 0;
-+
-+	if(write(fd, &dev, sizeof(dev)) != sizeof(dev))
-+	{
-+		goto setup_error;
-+	}
-+	
-+	if(test_bit(EV_KEY, events))
-+	{
-+		if(ioctl(source, EVIOCGBIT(EV_KEY, KEY_MAX), bits) == -1)
-+		{
-+			goto setup_error;
-+		}
-+		
-+		if(ioctl(fd, UI_SET_EVBIT, EV_KEY) == -1)
-+		{
-+			goto setup_error;
-+		}
-+		
-+		/* only forward mouse button events */
-+		for(key = BTN_MISC; key <= BTN_GEAR_UP; key++)
-+		{
-+			if(test_bit(key, bits))
-+			{
-+				if(ioctl(fd, UI_SET_KEYBIT, key) == -1)
-+				{
-+					goto setup_error;
-+				}
-+			}
-+		}
-+	}
-+	if(test_bit(EV_REL, events))
-+	{
-+		if(ioctl(source, EVIOCGBIT(EV_REL, REL_MAX), bits) == -1)
-+		{
-+			goto setup_error;
-+		}
-+		if(ioctl(fd, UI_SET_EVBIT, EV_REL) == -1)
-+		{
-+			goto setup_error;
-+		}
-+		for(key = 0; key <= REL_MAX; key++)
-+		{
-+			if(test_bit(key, bits))
-+			{
-+				if(ioctl(fd, UI_SET_RELBIT, key) == -1)
-+				{
-+					goto setup_error;
-+				}
-+			}
-+		}
-+	}
-+	if(test_bit(EV_ABS, events))
-+	{
-+		if(ioctl(source, EVIOCGBIT(EV_ABS, ABS_MAX), bits) == -1)
-+		{
-+			goto setup_error;
-+		}
-+		if(ioctl(fd, UI_SET_EVBIT, EV_ABS) == -1)
-+		{
-+			goto setup_error;
-+		}
-+		for(key = 0; key <= ABS_MAX; key++)
-+		{
-+			if(test_bit(key, bits))
-+			{
-+				if(ioctl(fd, UI_SET_ABSBIT, key) == -1)
-+				{
-+					goto setup_error;
-+				}
-+			}
-+		}
-+	}
-+	
-+
-+	if(ioctl(fd, UI_DEV_CREATE) == -1)
-+	{
-+		goto setup_error;
-+	}
-+	return fd;
-+	
-+ setup_error:
-+	logprintf(LOG_ERR, "could not setup %s\n", "uinput");
-+	logperror(LOG_ERR, NULL);
-+	close(fd);
-+	return -1;
-+}
- 
- #if 0
- /* using fnmatch */
-@@ -217,13 +361,26 @@
- 	}
- 	
- #ifdef EVIOCGRAB
-+	exclusive = 1;
- 	if (ioctl(hw.fd, EVIOCGRAB, 1) == -1)
- 	{
-+		exclusive = 0;
- 		logprintf(LOG_WARNING, "can't get exclusive access to events "
- 			  "coming from `%s' interface",
- 			  hw.device);
- 	}
- #endif
-+	return 1;
-+}
-+
-+int devinput_init_fwd()
-+{
-+	if(!devinput_init()) return 0;
-+	
-+	if(exclusive)
-+	{
-+		uinputfd = setup_uinputfd("(lircd bypass)", hw.fd);
-+	}
- 	
- 	return 1;
- }
-@@ -232,6 +389,12 @@
- int devinput_deinit(void)
- {
- 	logprintf(LOG_INFO, "closing '%s'", hw.device);
-+	if(uinputfd != -1)
-+	{
-+		ioctl(uinputfd, UI_DEV_DESTROY);
-+		close(uinputfd);
-+		uinputfd = -1;
-+	}
- 	close(hw.fd);
- 	hw.fd=-1;
- 	return 1;
-@@ -271,7 +434,10 @@
- 	rd = read(hw.fd, &event, sizeof event);
- 	if (rd != sizeof event) {
- 		logprintf(LOG_ERR, "error reading '%s'", hw.device);
--		if(rd <= 0 && errno != EINTR) raise(SIGTERM);
-+		if(rd <= 0 && errno != EINTR)
-+		{
-+			devinput_deinit();
-+		}
- 		return 0;
- 	}
- 
-@@ -292,6 +458,25 @@
- 
- 	LOGPRINTF(1, "code %.8llx", code);
- 
-+	if(uinputfd != -1)
-+	{
-+		if(event.type == EV_REL ||
-+		   event.type == EV_ABS ||
-+		   (event.type == EV_KEY &&
-+		    event.code >= BTN_MISC &&
-+		    event.code <= BTN_GEAR_UP) ||
-+		   event.type == EV_SYN)
-+		{
-+			LOGPRINTF(1, "forwarding: %04x %04x", event.type, event.code);
-+			if(write(uinputfd, &event, sizeof(event)) != sizeof(event))
-+			{
-+				logprintf(LOG_ERR, "writing to uinput failed");
-+				logperror(LOG_ERR, NULL);
-+			}
-+			return NULL;
-+		}
-+	}
-+	
- 	/* ignore EV_SYN */
- 	if(event.type == EV_SYN) return NULL;
- 
diff --git a/lirc-0.8.6-firefly-def.patch b/lirc-0.8.6-firefly-def.patch
index ed88177..cd86ddd 100644
--- a/lirc-0.8.6-firefly-def.patch
+++ b/lirc-0.8.6-firefly-def.patch
@@ -1,7 +1,8 @@
-diff -upr lirc-0.8.6/remotes/atiusb/lircd.conf.atiusb lirc-0.8.6.new/remotes/atiusb/lircd.conf.atiusb
---- lirc-0.8.6/remotes/atiusb/lircd.conf.atiusb	2010-05-18 14:56:58.000000000 +0100
-+++ lirc-0.8.6.new/remotes/atiusb/lircd.conf.atiusb	2010-05-18 15:01:33.000000000 +0100
-@@ -2124,7 +2124,7 @@ end remote
+Index: lirc-0.8.7pre2/remotes/atiusb/lircd.conf.atiusb
+===================================================================
+--- lirc-0.8.7pre2.orig/remotes/atiusb/lircd.conf.atiusb
++++ lirc-0.8.7pre2/remotes/atiusb/lircd.conf.atiusb
+@@ -2195,7 +2195,7 @@ end remote
  # this config file was automatically generated
  # using lirc-0.8.2(default) on Wed Feb  6 01:32:32 2008
  #
@@ -10,7 +11,7 @@ diff -upr lirc-0.8.6/remotes/atiusb/lircd.conf.atiusb lirc-0.8.6.new/remotes/ati
  #
  # brand:                       Snapstream Firefly
  # model no. of remote control: R1000
-@@ -2144,63 +2144,111 @@ begin remote
+@@ -2215,63 +2215,111 @@ begin remote
    pre_data       0x14
    post_data_bits  16
    post_data      0x0
diff --git a/lirc-0.8.6-remove-obsolete-modes.patch b/lirc-0.8.6-remove-obsolete-modes.patch
deleted file mode 100644
index 02feec3..0000000
--- a/lirc-0.8.6-remove-obsolete-modes.patch
+++ /dev/null
@@ -1,429 +0,0 @@
-Index: lirc-0.8.6/drivers/lirc.h
-===================================================================
---- lirc-0.8.6.orig/drivers/lirc.h
-+++ lirc-0.8.6/drivers/lirc.h
-@@ -28,17 +28,13 @@ typedef int lirc_t;
- #define LIRC_MODE_RAW                  0x00000001
- #define LIRC_MODE_PULSE                0x00000002
- #define LIRC_MODE_MODE2                0x00000004
--#define LIRC_MODE_CODE                 0x00000008
- #define LIRC_MODE_LIRCCODE             0x00000010
--#define LIRC_MODE_STRING               0x00000020
- 
- 
- #define LIRC_CAN_SEND_RAW              LIRC_MODE2SEND(LIRC_MODE_RAW)
- #define LIRC_CAN_SEND_PULSE            LIRC_MODE2SEND(LIRC_MODE_PULSE)
- #define LIRC_CAN_SEND_MODE2            LIRC_MODE2SEND(LIRC_MODE_MODE2)
--#define LIRC_CAN_SEND_CODE             LIRC_MODE2SEND(LIRC_MODE_CODE)
- #define LIRC_CAN_SEND_LIRCCODE         LIRC_MODE2SEND(LIRC_MODE_LIRCCODE)
--#define LIRC_CAN_SEND_STRING           LIRC_MODE2SEND(LIRC_MODE_STRING)
- 
- #define LIRC_CAN_SEND_MASK             0x0000003f
- 
-@@ -49,9 +45,7 @@ typedef int lirc_t;
- #define LIRC_CAN_REC_RAW               LIRC_MODE2REC(LIRC_MODE_RAW)
- #define LIRC_CAN_REC_PULSE             LIRC_MODE2REC(LIRC_MODE_PULSE)
- #define LIRC_CAN_REC_MODE2             LIRC_MODE2REC(LIRC_MODE_MODE2)
--#define LIRC_CAN_REC_CODE              LIRC_MODE2REC(LIRC_MODE_CODE)
- #define LIRC_CAN_REC_LIRCCODE          LIRC_MODE2REC(LIRC_MODE_LIRCCODE)
--#define LIRC_CAN_REC_STRING            LIRC_MODE2REC(LIRC_MODE_STRING)
- 
- #define LIRC_CAN_REC_MASK              LIRC_MODE2REC(LIRC_CAN_SEND_MASK)
- 
-Index: lirc-0.8.6/daemons/hw_alsa_usb.c
-===================================================================
---- lirc-0.8.6.orig/daemons/hw_alsa_usb.c
-+++ lirc-0.8.6/daemons/hw_alsa_usb.c
-@@ -37,9 +37,9 @@ static int repeat_flag;
- struct hardware hw_alsa_usb = {
- 	"",			/* default device */
- 	-1,			/* fd */
--	LIRC_CAN_REC_CODE,	/* features */
-+	LIRC_CAN_REC_LIRCCODE,	/* features */
- 	0,			/* send_mode */
--	LIRC_MODE_CODE,		/* rec_mode */
-+	LIRC_MODE_LIRCCODE,	/* rec_mode */
- 	8,			/* code_length */
- 	init,			/* init_func */
- 	NULL,			/* config_func */
-Index: lirc-0.8.6/daemons/hw_awlibusb.c
-===================================================================
---- lirc-0.8.6.orig/daemons/hw_awlibusb.c
-+++ lirc-0.8.6/daemons/hw_awlibusb.c
-@@ -48,8 +48,6 @@
- #include "lircd.h"
- #include "receive.h"
- 
--#define AW_MODE_LIRCCODE 1
--
- #define AWUSB_RECEIVE_BYTES 5
- #define USB_TIMEOUT (1000*60)
- #define AW_VENDOR_THOMSON 0x069b
-@@ -57,14 +55,6 @@
- 
- #define AW_KEY_GAP 0 /* Original value=200000. Made it 0 to handle it in userspace */
- 
--#if !defined(AW_MODE_LIRCCODE)
--static ir_code code;
--static ir_code code_last;
--static struct timeval time_current = {0};
--static struct timeval time_last = {0};
--#endif
--
--
- static int awlibusb_init();
- static int awlibusb_deinit();
- static char *awlibusb_rec(struct ir_remote *remotes);
-@@ -72,7 +62,6 @@ static void usb_read_loop(int fd);
- static struct usb_device *find_usb_device(void);
- static int find_device_endpoints(struct usb_device *dev);
- 
--#ifdef AW_MODE_LIRCCODE
- struct hardware hw_awlibusb =
- {
- 	NULL,                       /* default device */
-@@ -91,26 +80,7 @@ struct hardware hw_awlibusb =
- 	NULL,                       /* readdata */
- 	"awlibusb"
- };
--#else
--struct hardware hw_awlibusb =
--{
--	NULL,                       /* default device */
--	-1,                         /* fd */
--	LIRC_CAN_REC_CODE,          /* features */
--	0,                          /* send_mode */
--	LIRC_MODE_CODE,             /* rec_mode */
--	CHAR_BIT,                   /* code_length */
--	awlibusb_init,              /* init_func */
--	NULL,                       /* config_func */
--	awlibusb_deinit,            /* deinit_func */
--	NULL,                       /* send_func */
--	awlibusb_rec,               /* rec_func */
--	receive_decode,             /* decode_func */
--	NULL,                       /* ioctl_func */
--	NULL,                       /* readdata */
--	"awlibusb"
--};
--#endif
-+
- typedef struct {
- 	u_int16_t vendor;
- 	u_int16_t product;
-@@ -310,11 +280,6 @@ static void usb_read_loop(int fd)
- {
- 	int inited = 0;
- 	int err = 0;
--#if !defined(AW_MODE_LIRCCODE)
--	long elapsed_seconds = 0;  /* diff between seconds counter */
--	long elapsed_useconds = 0; /* diff between microseconds counter */
--	long time_diff = 0;
--#endif
- 	
- 	alarm(0);
- 	signal(SIGTERM, SIG_DFL);
-@@ -348,7 +313,6 @@ static void usb_read_loop(int fd)
- 			if (bytes_r == 1) continue;
- 		}
- 		
--#ifdef AW_MODE_LIRCCODE
- 		bytes_w = write(fd, &(buf[1]), (AWUSB_RECEIVE_BYTES-1));
- 		/* ignore first byte */
- 		if (bytes_w < 0)
-@@ -358,30 +322,6 @@ static void usb_read_loop(int fd)
- 			err = 1;
- 			goto done;
- 		}
--#else
--		code = buf[AWUSB_RECEIVE_BYTES-2];
--
--		/* calculate time diff */
--		gettimeofday(&time_current, NULL);
--		elapsed_seconds  = time_current.tv_sec  - time_last.tv_sec;
--		elapsed_useconds = time_current.tv_usec - time_last.tv_usec;
--		time_diff = (elapsed_seconds) * 1000000 + elapsed_useconds;
--		//printf("time_diff = %d usec\n", time_diff);
--
--		if ( !((code == code_last) && (time_diff < AW_KEY_GAP)) )
--		{ 
--			bytes_w = write(fd, &code, 1);
--			if (bytes_w < 0)
--			{
--				logprintf(LOG_ERR, "can't write to pipe: %s",
--					  strerror(errno));
--				err = 1;
--				goto done;
--			}
--			code_last = code;
--			memcpy(&time_last, &time_current, sizeof(struct timeval));
--		}
--#endif
- 		
- 	}
- 	
-Index: lirc-0.8.6/daemons/hw_default.c
-===================================================================
---- lirc-0.8.6.orig/daemons/hw_default.c
-+++ lirc-0.8.6/daemons/hw_default.c
-@@ -42,10 +42,7 @@ extern struct ir_remote *repeat_remote;
- 
- static unsigned long supported_send_modes[]=
- {
--	/* LIRC_CAN_SEND_STRING, I don't think there ever will be a driver 
--	   that supports that */
- 	/* LIRC_CAN_SEND_LIRCCODE, */
--        /* LIRC_CAN_SEND_CODE, */
- 	/* LIRC_CAN_SEND_MODE2, this one would be very easy */
- 	LIRC_CAN_SEND_PULSE,
- 	/* LIRC_CAN_SEND_RAW, */
-@@ -53,9 +50,7 @@ static unsigned long supported_send_mode
- };
- static unsigned long supported_rec_modes[]=
- {
--	LIRC_CAN_REC_STRING,
- 	LIRC_CAN_REC_LIRCCODE,
--        LIRC_CAN_REC_CODE,
- 	LIRC_CAN_REC_MODE2,
- 	/* LIRC_CAN_REC_PULSE, shouldn't be too hard */
- 	/* LIRC_CAN_REC_RAW, */
-@@ -365,10 +360,6 @@ int default_init()
- 		}
- 		
- 	}
--	else if(hw.rec_mode==LIRC_MODE_CODE)
--	{
--		hw.code_length=8;
--	}
- 	else if(hw.rec_mode==LIRC_MODE_LIRCCODE)
- 	{
- 		if(default_ioctl(LIRC_GET_LENGTH, &hw.code_length)==-1)
-@@ -524,47 +515,12 @@ int default_send(struct ir_remote *remot
- 
- char *default_rec(struct ir_remote *remotes)
- {
--	char c;
--	int n;
--	static char message[PACKET_SIZE+1];
--
--
--	if(hw.rec_mode==LIRC_MODE_STRING)
--	{
--		int failed=0;
--
--		/* inefficient but simple, fix this if you want */
--		n=0;
--		do
--		{
--			if(read(hw.fd,&c,1)!=1)
--			{
--				logprintf(LOG_ERR,"reading in mode "
--					  "LIRC_MODE_STRING failed");
--				default_deinit();
--				return NULL;
--			}
--			if(n>=PACKET_SIZE-1)
--			{
--				failed=1;
--				n=0;
--			}
--			message[n++]=c;
--		}
--		while(c!='\n');
--		message[n]=0;
--		if(failed) return(NULL);
--		return(message);
--	}
--	else
-+	if(!clear_rec_buffer())
- 	{
--		if(!clear_rec_buffer())
--		{
--			default_deinit();
--		       	return NULL;
--		}
--		return(decode_all(remotes));
-+		default_deinit();
-+	       	return NULL;
- 	}
-+	return(decode_all(remotes));
- }
- 
- static int default_config_frequency()
-Index: lirc-0.8.6/daemons/hw_mplay.c
-===================================================================
---- lirc-0.8.6.orig/daemons/hw_mplay.c
-+++ lirc-0.8.6/daemons/hw_mplay.c
-@@ -114,9 +114,9 @@ static struct {
- struct hardware hw_mplay = {
-         LIRC_DRIVER_DEVICE,     /* default device */
-         -1,                     /* fd */
--        LIRC_CAN_REC_CODE,      /* features */
-+        LIRC_CAN_REC_LIRCCODE,  /* features */
-         0,                      /* send_mode */
--        LIRC_MODE_CODE,         /* rec_mode */
-+        LIRC_MODE_LIRCCODE,     /* rec_mode */
-         MPLAY_CODE_LENGTH,      /* code_length */
-         mplay_init,             /* init_func */
-         NULL,                   /* config_func */
-Index: lirc-0.8.6/daemons/irrecord.c
-===================================================================
---- lirc-0.8.6.orig/daemons/irrecord.c
-+++ lirc-0.8.6/daemons/irrecord.c
-@@ -556,16 +556,7 @@ int main(int argc,char **argv)
- 	}
- 	aeps = (hw.resolution>aeps ? hw.resolution:aeps);
- 	
--	if(hw.rec_mode==LIRC_MODE_STRING)
--	{
--		fprintf(stderr,"%s: no config file necessary\n",progname);
--		fclose(fout);
--		unlink(filename);
--		if(hw.deinit_func) hw.deinit_func();
--		exit(EXIT_SUCCESS);
--	}
- 	if(hw.rec_mode!=LIRC_MODE_MODE2 &&
--	   hw.rec_mode!=LIRC_MODE_CODE &&
- 	   hw.rec_mode!=LIRC_MODE_LIRCCODE)
- 	{
- 		fprintf(stderr,"%s: mode not supported\n",progname);
-@@ -661,10 +652,8 @@ int main(int argc,char **argv)
- 		       (unsigned long) remote.gap);
- #               endif
- 		break;
--	case LIRC_MODE_CODE:
- 	case LIRC_MODE_LIRCCODE:
--		if(hw.rec_mode==LIRC_MODE_CODE) remote.bits=CHAR_BIT;
--		else remote.bits=hw.code_length;
-+		remote.bits=hw.code_length;
- 		if(!using_template && !get_gap_length(&remote))
- 		{
- 			fprintf(stderr,"%s: gap not found,"
-@@ -995,9 +984,6 @@ void flushhw(void)
- 	case LIRC_MODE_MODE2:
- 		while(availabledata()) hw.readdata(0);
- 		return;
--	case LIRC_MODE_CODE:
--		size=sizeof(unsigned char);
--		break;
- 	case LIRC_MODE_LIRCCODE:
- 		size=hw.code_length/CHAR_BIT;
- 		if(hw.code_length%CHAR_BIT) size++;
-Index: lirc-0.8.6/daemons/receive.c
-===================================================================
---- lirc-0.8.6.orig/daemons/receive.c
-+++ lirc-0.8.6/daemons/receive.c
-@@ -126,18 +126,6 @@ int clear_rec_buffer(void)
- 			((ir_code) buffer[i]);
- 		}
- 	}
--	else if(hw.rec_mode==LIRC_MODE_CODE)
--	{
--		unsigned char c;
--		
--		if(read(hw.fd,&c,1)!=1)
--		{
--			logprintf(LOG_ERR,"reading in mode LIRC_MODE_CODE "
--				  "failed");
--			return(0);
--		}
--		rec_buffer.decoded=(ir_code) c;
--	}
- 	else
- 	{
- 		lirc_t data;
-@@ -1191,8 +1179,7 @@ int receive_decode(struct ir_remote *rem
- 		struct ir_ncode *codes,*found;
- 		int i;
- 
--		if(hw.rec_mode==LIRC_MODE_CODE ||
--		   hw.rec_mode==LIRC_MODE_LIRCCODE)
-+		if(hw.rec_mode==LIRC_MODE_LIRCCODE)
- 			return(0);
- 
- 		codes=remote->codes;
-@@ -1233,8 +1220,7 @@ int receive_decode(struct ir_remote *rem
- 	}
- 	else
- 	{
--		if(hw.rec_mode==LIRC_MODE_CODE ||
--		   hw.rec_mode==LIRC_MODE_LIRCCODE)
-+		if(hw.rec_mode==LIRC_MODE_LIRCCODE)
- 		{
-  			lirc_t sum;
- 			ir_code decoded = rec_buffer.decoded;
-@@ -1244,11 +1230,7 @@ int receive_decode(struct ir_remote *rem
- #                       else
- 			LOGPRINTF(1,"decoded: %lx", decoded);
- #                       endif
--			if((hw.rec_mode==LIRC_MODE_CODE &&
--			    hw.code_length<bit_count(remote))
--			   ||
--			   (hw.rec_mode==LIRC_MODE_LIRCCODE && 
--			    hw.code_length!=bit_count(remote)))
-+			if(hw.code_length!=bit_count(remote))
- 			{
- 				return(0);
- 			}
-@@ -1366,8 +1348,7 @@ int receive_decode(struct ir_remote *rem
- 		*repeat_flagp=1;
- 	else
- 		*repeat_flagp=0;
--	if(hw.rec_mode==LIRC_MODE_CODE ||
--	   hw.rec_mode==LIRC_MODE_LIRCCODE)
-+	if(hw.rec_mode==LIRC_MODE_LIRCCODE)
- 	{
- 		/* Most TV cards don't pass each signal to the
-                    driver. This heuristic should fix repeat in such
-Index: lirc-0.8.6/tools/mode2.c
-===================================================================
---- lirc-0.8.6.orig/tools/mode2.c
-+++ lirc-0.8.6/tools/mode2.c
-@@ -273,11 +273,7 @@ int main(int argc,char **argv)
- 
- 	}
- 	
--	if(mode==LIRC_MODE_CODE)
--	{
--		count = 1;
--	}
--	else if(mode==LIRC_MODE_LIRCCODE)
-+	if(mode==LIRC_MODE_LIRCCODE)
- 	{
- 		if(use_raw_access)
- 		{
-Index: lirc-0.8.6/daemons/hw_bte.c
-===================================================================
---- lirc-0.8.6.orig/daemons/hw_bte.c
-+++ lirc-0.8.6/daemons/hw_bte.c
-@@ -66,14 +66,14 @@ struct hardware hw_bte=
- 	LIRC_DRIVER_DEVICE,       /* default device */
- 	-1,                       /* fd */
- #if BTE_CAN_SEND
--	LIRC_CAN_REC_STRING|LIRC_CAN_SEND_STRING,    /* features */
--	LIRC_MODE_STRING,         /* send_mode */
-+	LIRC_CAN_REC_LIRCCODE|LIRC_CAN_SEND_LIRCCODE,    /* features */
-+	LIRC_MODE_LIRCCODE,       /* send_mode */
- #else
--	LIRC_CAN_REC_STRING,      /* features */
-+	LIRC_CAN_REC_LIRCCODE,    /* features */
- 	0,                        /* send_mode */
- #endif
- 
--	LIRC_MODE_STRING,         /* rec_mode */
-+	LIRC_MODE_LIRCCODE,       /* rec_mode */
- 	16,                       /* code_length */
- 	bte_init,	          /* init_func */
- 	NULL,                     /* config_func */
-Index: lirc-0.8.6/daemons/hw_creative_infracd.c
-===================================================================
---- lirc-0.8.6.orig/daemons/hw_creative_infracd.c
-+++ lirc-0.8.6/daemons/hw_creative_infracd.c
-@@ -46,7 +46,7 @@
- struct hardware hw_creative_infracd = {
- 	0,	        	/* determine device by probing */
- 	-1,			/* fd */
--	LIRC_CAN_REC_CODE,	/* features */
-+	LIRC_CAN_REC_LIRCCODE,	/* features */
- 	0,			/* send_mode */
- 	LIRC_MODE_LIRCCODE,	/* rec_mode */
- 	8,			/* code_length */
diff --git a/lirc-0.8.6-standardized-remote-keycodes.patch b/lirc-0.8.6-standardized-remote-keycodes.patch
index b0cf63d..b061416 100644
--- a/lirc-0.8.6-standardized-remote-keycodes.patch
+++ b/lirc-0.8.6-standardized-remote-keycodes.patch
@@ -1,6 +1,7 @@
-diff -Naurp lirc-0.8.6/remotes/adstech/lircd.conf.usbx-707 lirc-0.8.6.new/remotes/adstech/lircd.conf.usbx-707
---- lirc-0.8.6/remotes/adstech/lircd.conf.usbx-707	2009-09-13 22:12:44.000000000 -0400
-+++ lirc-0.8.6.new/remotes/adstech/lircd.conf.usbx-707	2009-09-13 21:37:03.000000000 -0400
+Index: lirc-0.8.7pre2/remotes/adstech/lircd.conf.usbx-707
+===================================================================
+--- lirc-0.8.7pre2.orig/remotes/adstech/lircd.conf.usbx-707
++++ lirc-0.8.7pre2/remotes/adstech/lircd.conf.usbx-707
 @@ -26,50 +26,50 @@ begin remote
    toggle_bit_mask 0x0
  
@@ -90,9 +91,10 @@ diff -Naurp lirc-0.8.6/remotes/adstech/lircd.conf.usbx-707 lirc-0.8.6.new/remote
        end codes
  
  end remote
-diff -Naurp lirc-0.8.6/remotes/animax/lircd.conf.animax lirc-0.8.6.new/remotes/animax/lircd.conf.animax
---- lirc-0.8.6/remotes/animax/lircd.conf.animax	1999-04-29 17:30:59.000000000 -0400
-+++ lirc-0.8.6.new/remotes/animax/lircd.conf.animax	2009-09-13 21:37:03.000000000 -0400
+Index: lirc-0.8.7pre2/remotes/animax/lircd.conf.animax
+===================================================================
+--- lirc-0.8.7pre2.orig/remotes/animax/lircd.conf.animax
++++ lirc-0.8.7pre2/remotes/animax/lircd.conf.animax
 @@ -38,79 +38,79 @@ begin remote
  
        begin codes
@@ -206,9 +208,10 @@ diff -Naurp lirc-0.8.6/remotes/animax/lircd.conf.animax lirc-0.8.6.new/remotes/a
        end codes
  
  end remote
-diff -Naurp lirc-0.8.6/remotes/apple/lircd.conf.macmini lirc-0.8.6.new/remotes/apple/lircd.conf.macmini
---- lirc-0.8.6/remotes/apple/lircd.conf.macmini	2008-05-31 17:29:12.000000000 -0400
-+++ lirc-0.8.6.new/remotes/apple/lircd.conf.macmini	2009-09-13 21:37:03.000000000 -0400
+Index: lirc-0.8.7pre2/remotes/apple/lircd.conf.macmini
+===================================================================
+--- lirc-0.8.7pre2.orig/remotes/apple/lircd.conf.macmini
++++ lirc-0.8.7pre2/remotes/apple/lircd.conf.macmini
 @@ -26,12 +26,12 @@ begin remote
    ignore_mask 0x0000ff01
  
@@ -228,9 +231,10 @@ diff -Naurp lirc-0.8.6/remotes/apple/lircd.conf.macmini lirc-0.8.6.new/remotes/a
        end codes
  
  end remote
-diff -Naurp lirc-0.8.6/remotes/asus/lircd.conf.asus lirc-0.8.6.new/remotes/asus/lircd.conf.asus
---- lirc-0.8.6/remotes/asus/lircd.conf.asus	2007-02-19 23:09:47.000000000 -0500
-+++ lirc-0.8.6.new/remotes/asus/lircd.conf.asus	2009-09-13 21:37:03.000000000 -0400
+Index: lirc-0.8.7pre2/remotes/asus/lircd.conf.asus
+===================================================================
+--- lirc-0.8.7pre2.orig/remotes/asus/lircd.conf.asus
++++ lirc-0.8.7pre2/remotes/asus/lircd.conf.asus
 @@ -19,38 +19,38 @@ begin remote
    toggle_bit	0
  
@@ -298,9 +302,10 @@ diff -Naurp lirc-0.8.6/remotes/asus/lircd.conf.asus lirc-0.8.6.new/remotes/asus/
          end codes
  
  end remote
-diff -Naurp lirc-0.8.6/remotes/asus/lircd.conf.asusdh lirc-0.8.6.new/remotes/asus/lircd.conf.asusdh
---- lirc-0.8.6/remotes/asus/lircd.conf.asusdh	2007-07-08 10:01:27.000000000 -0400
-+++ lirc-0.8.6.new/remotes/asus/lircd.conf.asusdh	2009-09-13 21:37:03.000000000 -0400
+Index: lirc-0.8.7pre2/remotes/asus/lircd.conf.asusdh
+===================================================================
+--- lirc-0.8.7pre2.orig/remotes/asus/lircd.conf.asusdh
++++ lirc-0.8.7pre2/remotes/asus/lircd.conf.asusdh
 @@ -14,17 +14,17 @@ begin remote
    post_data_bits  0
  
@@ -325,9 +330,10 @@ diff -Naurp lirc-0.8.6/remotes/asus/lircd.conf.asusdh lirc-0.8.6.new/remotes/asu
          end codes
  
  end remote
-diff -Naurp lirc-0.8.6/remotes/asus/lircd.conf.digimatrix lirc-0.8.6.new/remotes/asus/lircd.conf.digimatrix
---- lirc-0.8.6/remotes/asus/lircd.conf.digimatrix	2005-09-06 13:12:17.000000000 -0400
-+++ lirc-0.8.6.new/remotes/asus/lircd.conf.digimatrix	2009-09-13 21:37:03.000000000 -0400
+Index: lirc-0.8.7pre2/remotes/asus/lircd.conf.digimatrix
+===================================================================
+--- lirc-0.8.7pre2.orig/remotes/asus/lircd.conf.digimatrix
++++ lirc-0.8.7pre2/remotes/asus/lircd.conf.digimatrix
 @@ -28,43 +28,43 @@ begin remote
  
  
@@ -404,9 +410,10 @@ diff -Naurp lirc-0.8.6/remotes/asus/lircd.conf.digimatrix lirc-0.8.6.new/remotes
            dvd_audio                0x00000000000050AF
            ui_size                  0x0000000000008877
            ui_on_off                0x00000000000028D7
-diff -Naurp lirc-0.8.6/remotes/atiusb/lircd.conf.atilibusb lirc-0.8.6.new/remotes/atiusb/lircd.conf.atilibusb
---- lirc-0.8.6/remotes/atiusb/lircd.conf.atilibusb	2009-01-18 13:30:14.000000000 -0500
-+++ lirc-0.8.6.new/remotes/atiusb/lircd.conf.atilibusb	2009-09-13 21:37:03.000000000 -0400
+Index: lirc-0.8.7pre2/remotes/atiusb/lircd.conf.atilibusb
+===================================================================
+--- lirc-0.8.7pre2.orig/remotes/atiusb/lircd.conf.atilibusb
++++ lirc-0.8.7pre2/remotes/atiusb/lircd.conf.atilibusb
 @@ -30,58 +30,58 @@ begin remote
  
  
@@ -518,9 +525,10 @@ diff -Naurp lirc-0.8.6/remotes/atiusb/lircd.conf.atilibusb lirc-0.8.6.new/remote
        end codes
  
  end remote
-diff -Naurp lirc-0.8.6/remotes/atiusb/lircd.conf.atiusb lirc-0.8.6.new/remotes/atiusb/lircd.conf.atiusb
---- lirc-0.8.6/remotes/atiusb/lircd.conf.atiusb	2009-09-13 22:12:44.000000000 -0400
-+++ lirc-0.8.6.new/remotes/atiusb/lircd.conf.atiusb	2009-09-13 21:37:03.000000000 -0400
+Index: lirc-0.8.7pre2/remotes/atiusb/lircd.conf.atiusb
+===================================================================
+--- lirc-0.8.7pre2.orig/remotes/atiusb/lircd.conf.atiusb
++++ lirc-0.8.7pre2/remotes/atiusb/lircd.conf.atiusb
 @@ -37,54 +37,54 @@ begin remote
  
  
@@ -618,9 +626,10 @@ diff -Naurp lirc-0.8.6/remotes/atiusb/lircd.conf.atiusb lirc-0.8.6.new/remotes/a
        end codes
  
  end remote
-diff -Naurp lirc-0.8.6/remotes/avermedia/lircd.conf.avermedia lirc-0.8.6.new/remotes/avermedia/lircd.conf.avermedia
---- lirc-0.8.6/remotes/avermedia/lircd.conf.avermedia	2001-01-11 02:54:25.000000000 -0500
-+++ lirc-0.8.6.new/remotes/avermedia/lircd.conf.avermedia	2009-09-13 21:37:03.000000000 -0400
+Index: lirc-0.8.7pre2/remotes/avermedia/lircd.conf.avermedia
+===================================================================
+--- lirc-0.8.7pre2.orig/remotes/avermedia/lircd.conf.avermedia
++++ lirc-0.8.7pre2/remotes/avermedia/lircd.conf.avermedia
 @@ -34,37 +34,37 @@ begin remote
  
  
@@ -683,9 +692,10 @@ diff -Naurp lirc-0.8.6/remotes/avermedia/lircd.conf.avermedia lirc-0.8.6.new/rem
        end codes
  
  end remote
-diff -Naurp lirc-0.8.6/remotes/avermedia/lircd.conf.avermedia98 lirc-0.8.6.new/remotes/avermedia/lircd.conf.avermedia98
---- lirc-0.8.6/remotes/avermedia/lircd.conf.avermedia98	2001-01-10 17:08:00.000000000 -0500
-+++ lirc-0.8.6.new/remotes/avermedia/lircd.conf.avermedia98	2009-09-13 21:37:03.000000000 -0400
+Index: lirc-0.8.7pre2/remotes/avermedia/lircd.conf.avermedia98
+===================================================================
+--- lirc-0.8.7pre2.orig/remotes/avermedia/lircd.conf.avermedia98
++++ lirc-0.8.7pre2/remotes/avermedia/lircd.conf.avermedia98
 @@ -29,49 +29,49 @@ begin remote
  
        begin codes
@@ -765,9 +775,10 @@ diff -Naurp lirc-0.8.6/remotes/avermedia/lircd.conf.avermedia98 lirc-0.8.6.new/r
        end codes
  
  end remote
-diff -Naurp lirc-0.8.6/remotes/avermedia/lircd.conf.vdomate lirc-0.8.6.new/remotes/avermedia/lircd.conf.vdomate
---- lirc-0.8.6/remotes/avermedia/lircd.conf.vdomate	2002-10-25 16:42:55.000000000 -0400
-+++ lirc-0.8.6.new/remotes/avermedia/lircd.conf.vdomate	2009-09-13 21:37:03.000000000 -0400
+Index: lirc-0.8.7pre2/remotes/avermedia/lircd.conf.vdomate
+===================================================================
+--- lirc-0.8.7pre2.orig/remotes/avermedia/lircd.conf.vdomate
++++ lirc-0.8.7pre2/remotes/avermedia/lircd.conf.vdomate
 @@ -27,33 +27,33 @@ begin remote
  
  
@@ -820,9 +831,10 @@ diff -Naurp lirc-0.8.6/remotes/avermedia/lircd.conf.vdomate lirc-0.8.6.new/remot
        end codes
  
  end remote
-diff -Naurp lirc-0.8.6/remotes/bestbuy/lircd.conf.bestbuy lirc-0.8.6.new/remotes/bestbuy/lircd.conf.bestbuy
---- lirc-0.8.6/remotes/bestbuy/lircd.conf.bestbuy	2001-04-25 16:07:50.000000000 -0400
-+++ lirc-0.8.6.new/remotes/bestbuy/lircd.conf.bestbuy	2009-09-13 21:37:03.000000000 -0400
+Index: lirc-0.8.7pre2/remotes/bestbuy/lircd.conf.bestbuy
+===================================================================
+--- lirc-0.8.7pre2.orig/remotes/bestbuy/lircd.conf.bestbuy
++++ lirc-0.8.7pre2/remotes/bestbuy/lircd.conf.bestbuy
 @@ -26,36 +26,36 @@ begin remote
  
  
@@ -885,9 +897,10 @@ diff -Naurp lirc-0.8.6/remotes/bestbuy/lircd.conf.bestbuy lirc-0.8.6.new/remotes
        end codes
  
  end remote
-diff -Naurp lirc-0.8.6/remotes/bestbuy/lircd.conf.bestbuy2 lirc-0.8.6.new/remotes/bestbuy/lircd.conf.bestbuy2
---- lirc-0.8.6/remotes/bestbuy/lircd.conf.bestbuy2	2005-10-29 16:10:15.000000000 -0400
-+++ lirc-0.8.6.new/remotes/bestbuy/lircd.conf.bestbuy2	2009-09-13 21:37:03.000000000 -0400
+Index: lirc-0.8.7pre2/remotes/bestbuy/lircd.conf.bestbuy2
+===================================================================
+--- lirc-0.8.7pre2.orig/remotes/bestbuy/lircd.conf.bestbuy2
++++ lirc-0.8.7pre2/remotes/bestbuy/lircd.conf.bestbuy2
 @@ -27,29 +27,29 @@ begin remote
        begin codes
            TV/FM                    0x0000000000000043
@@ -937,9 +950,10 @@ diff -Naurp lirc-0.8.6/remotes/bestbuy/lircd.conf.bestbuy2 lirc-0.8.6.new/remote
            RESET                    0x000000000000004D
            FREEZE                   0x000000000000004F
        end codes
-diff -Naurp lirc-0.8.6/remotes/caraca/lircd.conf.caraca lirc-0.8.6.new/remotes/caraca/lircd.conf.caraca
---- lirc-0.8.6/remotes/caraca/lircd.conf.caraca	2000-08-25 15:21:17.000000000 -0400
-+++ lirc-0.8.6.new/remotes/caraca/lircd.conf.caraca	2009-09-13 21:37:03.000000000 -0400
+Index: lirc-0.8.7pre2/remotes/caraca/lircd.conf.caraca
+===================================================================
+--- lirc-0.8.7pre2.orig/remotes/caraca/lircd.conf.caraca
++++ lirc-0.8.7pre2/remotes/caraca/lircd.conf.caraca
 @@ -17,29 +17,29 @@ begin remote
    bits           16
  
@@ -991,9 +1005,10 @@ diff -Naurp lirc-0.8.6/remotes/caraca/lircd.conf.caraca lirc-0.8.6.new/remotes/c
            TV/FM                    0x3fe3
        end codes
  
-diff -Naurp lirc-0.8.6/remotes/chronos/lircd.conf.chronos lirc-0.8.6.new/remotes/chronos/lircd.conf.chronos
---- lirc-0.8.6/remotes/chronos/lircd.conf.chronos	2009-09-13 22:12:44.000000000 -0400
-+++ lirc-0.8.6.new/remotes/chronos/lircd.conf.chronos	2009-09-13 21:37:03.000000000 -0400
+Index: lirc-0.8.7pre2/remotes/chronos/lircd.conf.chronos
+===================================================================
+--- lirc-0.8.7pre2.orig/remotes/chronos/lircd.conf.chronos
++++ lirc-0.8.7pre2/remotes/chronos/lircd.conf.chronos
 @@ -20,37 +20,37 @@ begin remote
    toggle_bit      0
  
@@ -1057,9 +1072,10 @@ diff -Naurp lirc-0.8.6/remotes/chronos/lircd.conf.chronos lirc-0.8.6.new/remotes
 +          KEY_RIGHT         0x0000000000000007
        end codes
  end remote
-diff -Naurp lirc-0.8.6/remotes/cph03x/lircd.conf.cph03x lirc-0.8.6.new/remotes/cph03x/lircd.conf.cph03x
---- lirc-0.8.6/remotes/cph03x/lircd.conf.cph03x	2001-06-14 11:49:16.000000000 -0400
-+++ lirc-0.8.6.new/remotes/cph03x/lircd.conf.cph03x	2009-09-13 21:37:03.000000000 -0400
+Index: lirc-0.8.7pre2/remotes/cph03x/lircd.conf.cph03x
+===================================================================
+--- lirc-0.8.7pre2.orig/remotes/cph03x/lircd.conf.cph03x
++++ lirc-0.8.7pre2/remotes/cph03x/lircd.conf.cph03x
 @@ -32,39 +32,39 @@ begin remote
    repeat_bit      0
  
@@ -1123,9 +1139,10 @@ diff -Naurp lirc-0.8.6/remotes/cph03x/lircd.conf.cph03x lirc-0.8.6.new/remotes/c
        end codes
  
  end remote
-diff -Naurp lirc-0.8.6/remotes/creative/lircd.conf.alsa_usb lirc-0.8.6.new/remotes/creative/lircd.conf.alsa_usb
---- lirc-0.8.6/remotes/creative/lircd.conf.alsa_usb	2008-01-26 04:01:16.000000000 -0500
-+++ lirc-0.8.6.new/remotes/creative/lircd.conf.alsa_usb	2009-09-13 21:37:03.000000000 -0400
+Index: lirc-0.8.7pre2/remotes/creative/lircd.conf.alsa_usb
+===================================================================
+--- lirc-0.8.7pre2.orig/remotes/creative/lircd.conf.alsa_usb
++++ lirc-0.8.7pre2/remotes/creative/lircd.conf.alsa_usb
 @@ -34,38 +34,38 @@ begin remote
  
  
@@ -1192,9 +1209,10 @@ diff -Naurp lirc-0.8.6/remotes/creative/lircd.conf.alsa_usb lirc-0.8.6.new/remot
            Step                     0x0000000000007E81
        end codes
  
-diff -Naurp lirc-0.8.6/remotes/creative/lircd.conf.breakoutbox lirc-0.8.6.new/remotes/creative/lircd.conf.breakoutbox
---- lirc-0.8.6/remotes/creative/lircd.conf.breakoutbox	2007-02-19 23:08:04.000000000 -0500
-+++ lirc-0.8.6.new/remotes/creative/lircd.conf.breakoutbox	2009-09-13 21:37:03.000000000 -0400
+Index: lirc-0.8.7pre2/remotes/creative/lircd.conf.breakoutbox
+===================================================================
+--- lirc-0.8.7pre2.orig/remotes/creative/lircd.conf.breakoutbox
++++ lirc-0.8.7pre2/remotes/creative/lircd.conf.breakoutbox
 @@ -19,37 +19,37 @@ begin remote
        begin codes
            DVD/CD                   0x0000000000000001
@@ -1259,9 +1277,10 @@ diff -Naurp lirc-0.8.6/remotes/creative/lircd.conf.breakoutbox lirc-0.8.6.new/re
        end codes
  
  end remote
-diff -Naurp lirc-0.8.6/remotes/creative/lircd.conf.creative lirc-0.8.6.new/remotes/creative/lircd.conf.creative
---- lirc-0.8.6/remotes/creative/lircd.conf.creative	2007-03-10 15:15:49.000000000 -0500
-+++ lirc-0.8.6.new/remotes/creative/lircd.conf.creative	2009-09-13 21:37:03.000000000 -0400
+Index: lirc-0.8.7pre2/remotes/creative/lircd.conf.creative
+===================================================================
+--- lirc-0.8.7pre2.orig/remotes/creative/lircd.conf.creative
++++ lirc-0.8.7pre2/remotes/creative/lircd.conf.creative
 @@ -23,30 +23,30 @@ begin remote
    toggle_bit      0
  
@@ -1312,9 +1331,10 @@ diff -Naurp lirc-0.8.6/remotes/creative/lircd.conf.creative lirc-0.8.6.new/remot
        end codes
  
  end remote
-diff -Naurp lirc-0.8.6/remotes/creative/lircd.conf.livedrive lirc-0.8.6.new/remotes/creative/lircd.conf.livedrive
---- lirc-0.8.6/remotes/creative/lircd.conf.livedrive	2009-09-13 22:12:44.000000000 -0400
-+++ lirc-0.8.6.new/remotes/creative/lircd.conf.livedrive	2009-09-13 21:37:03.000000000 -0400
+Index: lirc-0.8.7pre2/remotes/creative/lircd.conf.livedrive
+===================================================================
+--- lirc-0.8.7pre2.orig/remotes/creative/lircd.conf.livedrive
++++ lirc-0.8.7pre2/remotes/creative/lircd.conf.livedrive
 @@ -29,40 +29,40 @@ begin remote
  
  
@@ -1384,9 +1404,10 @@ diff -Naurp lirc-0.8.6/remotes/creative/lircd.conf.livedrive lirc-0.8.6.new/remo
  	  
        end codes
  
-diff -Naurp lirc-0.8.6/remotes/dvico/lircd.conf.fusionHDTV lirc-0.8.6.new/remotes/dvico/lircd.conf.fusionHDTV
---- lirc-0.8.6/remotes/dvico/lircd.conf.fusionHDTV	2006-05-06 00:38:39.000000000 -0400
-+++ lirc-0.8.6.new/remotes/dvico/lircd.conf.fusionHDTV	2009-09-13 21:37:03.000000000 -0400
+Index: lirc-0.8.7pre2/remotes/dvico/lircd.conf.fusionHDTV
+===================================================================
+--- lirc-0.8.7pre2.orig/remotes/dvico/lircd.conf.fusionHDTV
++++ lirc-0.8.7pre2/remotes/dvico/lircd.conf.fusionHDTV
 @@ -22,42 +22,42 @@ begin remote
    toggle_bit     0
  
@@ -1461,9 +1482,10 @@ diff -Naurp lirc-0.8.6/remotes/dvico/lircd.conf.fusionHDTV lirc-0.8.6.new/remote
        end codes
  
  end remote
-diff -Naurp lirc-0.8.6/remotes/ea65/lircd.conf.ea65 lirc-0.8.6.new/remotes/ea65/lircd.conf.ea65
---- lirc-0.8.6/remotes/ea65/lircd.conf.ea65	2004-11-20 08:43:48.000000000 -0500
-+++ lirc-0.8.6.new/remotes/ea65/lircd.conf.ea65	2009-09-13 21:37:03.000000000 -0400
+Index: lirc-0.8.7pre2/remotes/ea65/lircd.conf.ea65
+===================================================================
+--- lirc-0.8.7pre2.orig/remotes/ea65/lircd.conf.ea65
++++ lirc-0.8.7pre2/remotes/ea65/lircd.conf.ea65
 @@ -18,53 +18,53 @@ begin remote
          htpc        0x0011811b
          dvd/vcd     0x00128100
@@ -1552,9 +1574,10 @@ diff -Naurp lirc-0.8.6/remotes/ea65/lircd.conf.ea65 lirc-0.8.6.new/remotes/ea65/
          stop-eject  0x00238107
          mode-       0x00ff1080
          mode+       0x00ff1180
-diff -Naurp lirc-0.8.6/remotes/ericsson/lircd.conf.bte lirc-0.8.6.new/remotes/ericsson/lircd.conf.bte
---- lirc-0.8.6/remotes/ericsson/lircd.conf.bte	2005-03-25 15:40:25.000000000 -0500
-+++ lirc-0.8.6.new/remotes/ericsson/lircd.conf.bte	2009-09-13 21:37:03.000000000 -0400
+Index: lirc-0.8.7pre2/remotes/ericsson/lircd.conf.bte
+===================================================================
+--- lirc-0.8.7pre2.orig/remotes/ericsson/lircd.conf.bte
++++ lirc-0.8.7pre2/remotes/ericsson/lircd.conf.bte
 @@ -11,29 +11,29 @@
  
  begin remote
@@ -1616,9 +1639,10 @@ diff -Naurp lirc-0.8.6/remotes/ericsson/lircd.conf.bte lirc-0.8.6.new/remotes/er
          WAP             0x3a4f  # ':O'
  
        end codes
-diff -Naurp lirc-0.8.6/remotes/hauppauge/lircd.conf.hauppauge lirc-0.8.6.new/remotes/hauppauge/lircd.conf.hauppauge
---- lirc-0.8.6/remotes/hauppauge/lircd.conf.hauppauge	2008-06-24 13:01:10.000000000 -0400
-+++ lirc-0.8.6.new/remotes/hauppauge/lircd.conf.hauppauge	2009-09-13 21:37:03.000000000 -0400
+Index: lirc-0.8.7pre2/remotes/hauppauge/lircd.conf.hauppauge
+===================================================================
+--- lirc-0.8.7pre2.orig/remotes/hauppauge/lircd.conf.hauppauge
++++ lirc-0.8.7pre2/remotes/hauppauge/lircd.conf.hauppauge
 @@ -27,25 +27,25 @@ begin remote
    repeat_bit      2
  
@@ -1662,9 +1686,10 @@ diff -Naurp lirc-0.8.6/remotes/hauppauge/lircd.conf.hauppauge lirc-0.8.6.new/rem
            RESERVED                 0x000000000000101E
            MINIMIZE                 0x0000000000001026
        end codes
-diff -Naurp lirc-0.8.6/remotes/hercules/lircd.conf.smarttv_stereo lirc-0.8.6.new/remotes/hercules/lircd.conf.smarttv_stereo
---- lirc-0.8.6/remotes/hercules/lircd.conf.smarttv_stereo	2009-09-13 22:12:44.000000000 -0400
-+++ lirc-0.8.6.new/remotes/hercules/lircd.conf.smarttv_stereo	2009-09-13 21:37:03.000000000 -0400
+Index: lirc-0.8.7pre2/remotes/hercules/lircd.conf.smarttv_stereo
+===================================================================
+--- lirc-0.8.7pre2.orig/remotes/hercules/lircd.conf.smarttv_stereo
++++ lirc-0.8.7pre2/remotes/hercules/lircd.conf.smarttv_stereo
 @@ -26,36 +26,36 @@ begin remote
  
  
@@ -1725,9 +1750,10 @@ diff -Naurp lirc-0.8.6/remotes/hercules/lircd.conf.smarttv_stereo lirc-0.8.6.new
        end codes
  
  end remote
-diff -Naurp lirc-0.8.6/remotes/imon/lircd.conf.imon lirc-0.8.6.new/remotes/imon/lircd.conf.imon
---- lirc-0.8.6/remotes/imon/lircd.conf.imon	2005-04-16 13:05:49.000000000 -0400
-+++ lirc-0.8.6.new/remotes/imon/lircd.conf.imon	2009-09-13 21:37:03.000000000 -0400
+Index: lirc-0.8.7pre2/remotes/imon/lircd.conf.imon
+===================================================================
+--- lirc-0.8.7pre2.orig/remotes/imon/lircd.conf.imon
++++ lirc-0.8.7pre2/remotes/imon/lircd.conf.imon
 @@ -29,48 +29,48 @@ begin remote
    duty_cycle   33
  
@@ -1813,10 +1839,11 @@ diff -Naurp lirc-0.8.6/remotes/imon/lircd.conf.imon lirc-0.8.6.new/remotes/imon/
            DVD.Caption              0x00000000000052AD
            DVD.Language             0x000000000000D22D
            Full.Screen              0x00000000000032CD
-diff -Naurp lirc-0.8.6/remotes/imon/lircd.conf.imon-knob lirc-0.8.6.new/remotes/imon/lircd.conf.imon-knob
---- lirc-0.8.6/remotes/imon/lircd.conf.imon-knob	2008-06-12 15:32:33.000000000 -0400
-+++ lirc-0.8.6.new/remotes/imon/lircd.conf.imon-knob	2009-09-13 21:37:03.000000000 -0400
-@@ -23,74 +23,67 @@ begin remote
+Index: lirc-0.8.7pre2/remotes/imon/lircd.conf.imon-knob
+===================================================================
+--- lirc-0.8.7pre2.orig/remotes/imon/lircd.conf.imon-knob
++++ lirc-0.8.7pre2/remotes/imon/lircd.conf.imon-knob
+@@ -23,83 +23,77 @@ begin remote
  
  
        begin codes
@@ -1840,7 +1867,7 @@ diff -Naurp lirc-0.8.6/remotes/imon/lircd.conf.imon-knob lirc-0.8.6.new/remotes/
 +          KEY_PLAY                 0x2A8115B7
 +          KEY_OPEN                 0x29B195B7
 +          KEY_VOLUMEUP             0x000100FF
-+          KEY_VOLUMEDOWN           0x010000FF
++          KEYVOLUMEDOWN            0x010000FF
 +          KEY_MUTE                 0x000008FF
 +          KEY_REWIND               0x2A8195B7
 +          KEY_PAUSE                0x2A9115B7
@@ -1862,8 +1889,147 @@ diff -Naurp lirc-0.8.6/remotes/imon/lircd.conf.imon-knob lirc-0.8.6.new/remotes/
 -          CursorUp                 0x6902F9B7
 -          CursorRight              0x68A281B7
 -          CursorDown               0x6882A1B7
++          BTN_RIGHT                0x688481B7
++          KEY_ENTER                0x28A195B7
++          BTN_LEFT                 0x688301B7
++          KEY_LEFT                 0x6ABA81B7
++          KEY_UP                   0x6902F9B7
++          KEY_RIGHT                0x68A281B7
++          KEY_DOWN                 0x6882A1B7
+ # version 2 of keypad
+-          CursorUp                 0x2aa515b7
+-          CursorDown               0x289515b7
+-          CursorLeft               0x29a515b7
+-          CursorRight              0x2ba515b7
++          KEY_UP                   0x2aa515b7
++          KEY_DOWN                 0x289515b7
++          KEY_LEFT                 0x29a515b7
++          KEY_RIGHT                0x2ba515b7
+ # version 3 of keypad
+-          CursorUp                 0x01008000
+-          CursorDown               0x01007f00
+-          CursorLeft               0x01000080
+-          CursorRight              0x0100007f
 -          Esc                      0x2BB715B7
 -          Eject                    0x299395B7
++          KEY_UP                   0x01008000
++          KEY_DOWN                 0x01007f00
++          KEY_LEFT                 0x01000080
++          KEY_RIGHT                0x0100007f
++          KEY_ESC                  0x2BB715B7
++          KEY_EJECT                0x299395B7
+           AppLauncher              0x29B715B7
+           MultiMon                 0x2AB195B7
+           TaskSwitcher             0x2A9395B7
+-          Mute                     0x2B9595B7
+-          VolUp                    0x28A395B7
+-          VolDown                  0x28A595B7
+-          ChUp                     0x289395B7
+-          ChDown                   0x288795B7
++          KEY_MUTE                 0x2B9595B7
++          KEY_VOLUMEUP             0x28A395B7
++          KEY_VOLUMEDOWN           0x28A595B7
++          KEY_CHANNELUP            0x289395B7
++          KEY_CHANNELDOWN          0x288795B7
+           Timer                    0x2B8395B7
+-          1                        0x28B595B7
+-          2                        0x2BB195B7
+-          3                        0x28B195B7
+-          4                        0x2A8595B7
+-          5                        0x299595B7
+-          6                        0x2AA595B7
+-          7                        0x2B9395B7
+-          8                        0x2A8515B7
+-          9                        0x2AA115B7
++          KEY_1                    0x28B595B7
++          KEY_2                    0x2BB195B7
++          KEY_3                    0x28B195B7
++          KEY_4                    0x2A8595B7
++          KEY_5                    0x299595B7
++          KEY_6                    0x2AA595B7
++          KEY_7                    0x2B9395B7
++          KEY_8                    0x2A8515B7
++          KEY_9                    0x2AA115B7
+           ShiftTab                 0x28B515B7
+-          0                        0x2BA595B7
+-          Tab                      0x29A115B7
+-          MyMovie                  0x2B8515B7
+-          MyMusic                  0x299195B7
+-          MyPhoto                  0x2BA115B7
+-          MyTV                     0x28A515B7
+-          Bookmark                 0x288515B7
++          KEY_0                    0x2BA595B7
++          KEY_TAB                  0x29A115B7
++          KEY_VIDEO                0x2B8515B7
++          KEY_AUDIO                0x299195B7
++          KEY_PHOTO                0x2BA115B7
++          KEY_TV                   0x28A515B7
++          KEY_BOOKMARKS            0x288515B7
+           Thumbnail                0x2AB715B7
+           AspectRatio              0x29A595B7
+           FullScreen               0x2AA395B7
+-          MyDVD                    0x29A295B7
+-          Menu                     0x2BA385B7
++          KEY_DVD                  0x29A295B7
++          KEY_MENU                 0x2BA385B7
+           Caption                  0x298595B7
+-          Language                 0x2B8595B7
+-# these codes may be wrong, but they were included in the first version of
+-# this config file
+-          0                        0x2BA595BF
+-          NextChapter              0x298195BF
+-          Thumbnail                0x2AB715BF
+-          FullScreen               0x2AA395BF
++          KEY_LANGUAGE             0x2B8595B7
+ 
+       end codes
+ 
+@@ -124,83 +118,77 @@ begin remote
+ 
+ 
+       begin codes
+-          AppExit                  0x288195B7
+-          Power                    0x289115B7
+-          Record                   0x298115B7
+-          Play                     0x2A8115B7
+-          Open                     0x29B195B7
+-          KnobVolUp                0x000100FF
+-          KnobVolDown              0x010000FF
+-          KnobMute                 0x000008FF
+-          Rewind                   0x2A8195B7
+-          Pause                    0x2A9115B7
+-          FastForward              0x2B8115B7
+-          PrevChapter              0x2B9115B7
+-          Stop                     0x2B9715B7
+-          NextChapter              0x298195B7
++          KEY_EXIT                 0x288195B7
++          KEY_POWER                0x289115B7
++          KEY_RECORD               0x298115B7
++          KEY_PLAY                 0x2A8115B7
++          KEY_OPEN                 0x29B195B7
++          KEY_VOLUMEUP             0x000100FF
++          KEYVOLUMEDOWN            0x010000FF
++          KEY_MUTE                 0x000008FF
++          KEY_REWIND               0x2A8195B7
++          KEY_PAUSE                0x2A9115B7
++          KEY_FASTFORWARD          0x2B8115B7
++          KEY_PREVIOUS             0x2B9115B7
++          KEY_STOP                 0x2B9715B7
++          KEY_NEXT                 0x298195B7
+           WindowsKey               0x2B8195B7
+-          Backspace                0x28A115B7
++          KEY_BACKSPACE            0x28A115B7
+           MouseKeyboard            0x299115B7
+-          SelectSpace              0x2A9315B7
++          KEY_SELECT               0x2A9315B7
+           MouseMenu                0x28B715B7
+-          MouseRightClick          0x688481B7
+-          Enter                    0x28A195B7
+-          MouseLeftClick           0x688301B7
+-          CursorLeft               0x6ABA81B7
+-          CursorUp                 0x6902F9B7
+-          CursorRight              0x68A281B7
+-          CursorDown               0x6882A1B7
 +          BTN_RIGHT                0x688481B7
 +          KEY_ENTER                0x28A195B7
 +          BTN_LEFT                 0x688301B7
@@ -1871,8 +2037,28 @@ diff -Naurp lirc-0.8.6/remotes/imon/lircd.conf.imon-knob lirc-0.8.6.new/remotes/
 +          KEY_UP                   0x6902F9B7
 +          KEY_RIGHT                0x68A281B7
 +          KEY_DOWN                 0x6882A1B7
+ # version 2 of keypad
+-          CursorUp                 0x2aa515b7
+-          CursorDown               0x289515b7
+-          CursorLeft               0x29a515b7
+-          CursorRight              0x2ba515b7
++          KEY_UP                   0x2aa515b7
++          KEY_DOWN                 0x289515b7
++          KEY_LEFT                 0x29a515b7
++          KEY_RIGHT                0x2ba515b7
+ # version 3 of keypad
+-          CursorUp                 0x01008000
+-          CursorDown               0x01007f00
+-          CursorLeft               0x01000080
+-          CursorRight              0x0100007f
+-          Esc                      0x2BB715B7
+-          Eject                    0x299395B7
++          KEY_UP                   0x01008000
++          KEY_DOWN                 0x01007f00
++          KEY_LEFT                 0x01000080
++          KEY_RIGHT                0x0100007f
 +          KEY_ESC                  0x2BB715B7
-+          KEY_EJECTCD              0x299395B7
++          KEY_EJECT                0x299395B7
            AppLauncher              0x29B715B7
            MultiMon                 0x2AB195B7
            TaskSwitcher             0x2A9395B7
@@ -1935,14 +2121,14 @@ diff -Naurp lirc-0.8.6/remotes/imon/lircd.conf.imon-knob lirc-0.8.6.new/remotes/
 -          NextChapter              0x298195BF
 -          Thumbnail                0x2AB715BF
 -          FullScreen               0x2AA395BF
--
 +          KEY_LANGUAGE             0x2B8595B7
+ 
        end codes
  
- end remote
-diff -Naurp lirc-0.8.6/remotes/imon/lircd.conf.imon-pad lirc-0.8.6.new/remotes/imon/lircd.conf.imon-pad
---- lirc-0.8.6/remotes/imon/lircd.conf.imon-pad	2009-09-03 10:33:19.000000000 -0400
-+++ lirc-0.8.6.new/remotes/imon/lircd.conf.imon-pad	2009-09-13 22:12:32.000000000 -0400
+Index: lirc-0.8.7pre2/remotes/imon/lircd.conf.imon-pad
+===================================================================
+--- lirc-0.8.7pre2.orig/remotes/imon/lircd.conf.imon-pad
++++ lirc-0.8.7pre2/remotes/imon/lircd.conf.imon-pad
 @@ -24,99 +24,99 @@ begin remote
  
  
@@ -2286,9 +2472,10 @@ diff -Naurp lirc-0.8.6/remotes/imon/lircd.conf.imon-pad lirc-0.8.6.new/remotes/i
        end codes
  
  end remote
-diff -Naurp lirc-0.8.6/remotes/imon/lircd.conf.imon-rsc lirc-0.8.6.new/remotes/imon/lircd.conf.imon-rsc
---- lirc-0.8.6/remotes/imon/lircd.conf.imon-rsc	2007-02-18 03:36:27.000000000 -0500
-+++ lirc-0.8.6.new/remotes/imon/lircd.conf.imon-rsc	2009-09-13 21:37:03.000000000 -0400
+Index: lirc-0.8.7pre2/remotes/imon/lircd.conf.imon-rsc
+===================================================================
+--- lirc-0.8.7pre2.orig/remotes/imon/lircd.conf.imon-rsc
++++ lirc-0.8.7pre2/remotes/imon/lircd.conf.imon-rsc
 @@ -27,48 +27,48 @@ begin remote
    gap          100000
  
@@ -2370,9 +2557,10 @@ diff -Naurp lirc-0.8.6/remotes/imon/lircd.conf.imon-rsc lirc-0.8.6.new/remotes/i
            Full.Screen        0x000000000000916e
        end codes
  
-diff -Naurp lirc-0.8.6/remotes/iodata/lircd.conf.gvbctv5pci lirc-0.8.6.new/remotes/iodata/lircd.conf.gvbctv5pci
---- lirc-0.8.6/remotes/iodata/lircd.conf.gvbctv5pci	2003-06-07 18:00:12.000000000 -0400
-+++ lirc-0.8.6.new/remotes/iodata/lircd.conf.gvbctv5pci	2009-09-13 21:37:03.000000000 -0400
+Index: lirc-0.8.7pre2/remotes/iodata/lircd.conf.gvbctv5pci
+===================================================================
+--- lirc-0.8.7pre2.orig/remotes/iodata/lircd.conf.gvbctv5pci
++++ lirc-0.8.7pre2/remotes/iodata/lircd.conf.gvbctv5pci
 @@ -26,41 +26,41 @@ begin remote
  
  
@@ -2442,9 +2630,10 @@ diff -Naurp lirc-0.8.6/remotes/iodata/lircd.conf.gvbctv5pci lirc-0.8.6.new/remot
            SYNC                     0x0000000000000003
        end codes
  
-diff -Naurp lirc-0.8.6/remotes/kanam_accent/lircd.conf.IR-100 lirc-0.8.6.new/remotes/kanam_accent/lircd.conf.IR-100
---- lirc-0.8.6/remotes/kanam_accent/lircd.conf.IR-100	2007-02-12 23:18:53.000000000 -0500
-+++ lirc-0.8.6.new/remotes/kanam_accent/lircd.conf.IR-100	2009-09-13 21:37:03.000000000 -0400
+Index: lirc-0.8.7pre2/remotes/kanam_accent/lircd.conf.IR-100
+===================================================================
+--- lirc-0.8.7pre2.orig/remotes/kanam_accent/lircd.conf.IR-100
++++ lirc-0.8.7pre2/remotes/kanam_accent/lircd.conf.IR-100
 @@ -29,47 +29,47 @@ begin remote
  
  
@@ -2534,9 +2723,10 @@ diff -Naurp lirc-0.8.6/remotes/kanam_accent/lircd.conf.IR-100 lirc-0.8.6.new/rem
        end codes
  
  end remote
-diff -Naurp lirc-0.8.6/remotes/knc_one/lircd.conf.knc_one lirc-0.8.6.new/remotes/knc_one/lircd.conf.knc_one
---- lirc-0.8.6/remotes/knc_one/lircd.conf.knc_one	2001-04-24 17:20:41.000000000 -0400
-+++ lirc-0.8.6.new/remotes/knc_one/lircd.conf.knc_one	2009-09-13 21:37:03.000000000 -0400
+Index: lirc-0.8.7pre2/remotes/knc_one/lircd.conf.knc_one
+===================================================================
+--- lirc-0.8.7pre2.orig/remotes/knc_one/lircd.conf.knc_one
++++ lirc-0.8.7pre2/remotes/knc_one/lircd.conf.knc_one
 @@ -26,37 +26,37 @@ begin remote
  
        begin codes
@@ -2601,9 +2791,10 @@ diff -Naurp lirc-0.8.6/remotes/knc_one/lircd.conf.knc_one lirc-0.8.6.new/remotes
        end codes
  
  end remote
-diff -Naurp lirc-0.8.6/remotes/kworld/lircd.conf.kworld lirc-0.8.6.new/remotes/kworld/lircd.conf.kworld
---- lirc-0.8.6/remotes/kworld/lircd.conf.kworld	2005-04-01 15:28:05.000000000 -0500
-+++ lirc-0.8.6.new/remotes/kworld/lircd.conf.kworld	2009-09-13 21:37:03.000000000 -0400
+Index: lirc-0.8.7pre2/remotes/kworld/lircd.conf.kworld
+===================================================================
+--- lirc-0.8.7pre2.orig/remotes/kworld/lircd.conf.kworld
++++ lirc-0.8.7pre2/remotes/kworld/lircd.conf.kworld
 @@ -29,36 +29,36 @@ begin remote
  
  
@@ -2662,9 +2853,10 @@ diff -Naurp lirc-0.8.6/remotes/kworld/lircd.conf.kworld lirc-0.8.6.new/remotes/k
            snapshot                 0x00000000000058A7
            mts                      0x000000000000B04F
            function-                0x00000000000020DF
-diff -Naurp lirc-0.8.6/remotes/leadtek/lircd.conf.PVR2000 lirc-0.8.6.new/remotes/leadtek/lircd.conf.PVR2000
---- lirc-0.8.6/remotes/leadtek/lircd.conf.PVR2000	2006-12-19 01:02:58.000000000 -0500
-+++ lirc-0.8.6.new/remotes/leadtek/lircd.conf.PVR2000	2009-09-13 21:37:03.000000000 -0400
+Index: lirc-0.8.7pre2/remotes/leadtek/lircd.conf.PVR2000
+===================================================================
+--- lirc-0.8.7pre2.orig/remotes/leadtek/lircd.conf.PVR2000
++++ lirc-0.8.7pre2/remotes/leadtek/lircd.conf.PVR2000
 @@ -18,54 +18,54 @@ begin remote
    gap       120000
  
@@ -2757,9 +2949,10 @@ diff -Naurp lirc-0.8.6/remotes/leadtek/lircd.conf.PVR2000 lirc-0.8.6.new/remotes
            TIMESHIFT                0x0000000000000035
  
        end codes
-diff -Naurp lirc-0.8.6/remotes/leadtek/lircd.conf.RM-0007 lirc-0.8.6.new/remotes/leadtek/lircd.conf.RM-0007
---- lirc-0.8.6/remotes/leadtek/lircd.conf.RM-0007	2002-11-09 17:34:23.000000000 -0500
-+++ lirc-0.8.6.new/remotes/leadtek/lircd.conf.RM-0007	2009-09-13 21:37:03.000000000 -0400
+Index: lirc-0.8.7pre2/remotes/leadtek/lircd.conf.RM-0007
+===================================================================
+--- lirc-0.8.7pre2.orig/remotes/leadtek/lircd.conf.RM-0007
++++ lirc-0.8.7pre2/remotes/leadtek/lircd.conf.RM-0007
 @@ -44,43 +44,43 @@ begin remote
  
        begin codes
@@ -2829,9 +3022,10 @@ diff -Naurp lirc-0.8.6/remotes/leadtek/lircd.conf.RM-0007 lirc-0.8.6.new/remotes
        end codes
  
  end remote
-diff -Naurp lirc-0.8.6/remotes/leadtek/lircd.conf.RM-0010 lirc-0.8.6.new/remotes/leadtek/lircd.conf.RM-0010
---- lirc-0.8.6/remotes/leadtek/lircd.conf.RM-0010	2006-03-21 02:11:14.000000000 -0500
-+++ lirc-0.8.6.new/remotes/leadtek/lircd.conf.RM-0010	2009-09-13 21:37:03.000000000 -0400
+Index: lirc-0.8.7pre2/remotes/leadtek/lircd.conf.RM-0010
+===================================================================
+--- lirc-0.8.7pre2.orig/remotes/leadtek/lircd.conf.RM-0010
++++ lirc-0.8.7pre2/remotes/leadtek/lircd.conf.RM-0010
 @@ -43,69 +43,69 @@ begin remote
    duty_cycle   33
  
@@ -2941,9 +3135,10 @@ diff -Naurp lirc-0.8.6/remotes/leadtek/lircd.conf.RM-0010 lirc-0.8.6.new/remotes
        end codes
  
  end remote
-diff -Naurp lirc-0.8.6/remotes/life-view/lircd.conf.flyvideo lirc-0.8.6.new/remotes/life-view/lircd.conf.flyvideo
---- lirc-0.8.6/remotes/life-view/lircd.conf.flyvideo	2002-11-09 17:31:38.000000000 -0500
-+++ lirc-0.8.6.new/remotes/life-view/lircd.conf.flyvideo	2009-09-13 21:37:03.000000000 -0400
+Index: lirc-0.8.7pre2/remotes/life-view/lircd.conf.flyvideo
+===================================================================
+--- lirc-0.8.7pre2.orig/remotes/life-view/lircd.conf.flyvideo
++++ lirc-0.8.7pre2/remotes/life-view/lircd.conf.flyvideo
 @@ -35,50 +35,50 @@ begin remote
    duty_cycle   33
  
@@ -3024,9 +3219,10 @@ diff -Naurp lirc-0.8.6/remotes/life-view/lircd.conf.flyvideo lirc-0.8.6.new/remo
   
        end codes
  
-diff -Naurp lirc-0.8.6/remotes/logitech/lircd.conf.logitech lirc-0.8.6.new/remotes/logitech/lircd.conf.logitech
---- lirc-0.8.6/remotes/logitech/lircd.conf.logitech	2000-01-18 14:10:08.000000000 -0500
-+++ lirc-0.8.6.new/remotes/logitech/lircd.conf.logitech	2009-09-13 21:37:03.000000000 -0400
+Index: lirc-0.8.7pre2/remotes/logitech/lircd.conf.logitech
+===================================================================
+--- lirc-0.8.7pre2.orig/remotes/logitech/lircd.conf.logitech
++++ lirc-0.8.7pre2/remotes/logitech/lircd.conf.logitech
 @@ -23,41 +23,41 @@ begin remote
    repeat_bit      0
  
@@ -3096,9 +3292,10 @@ diff -Naurp lirc-0.8.6/remotes/logitech/lircd.conf.logitech lirc-0.8.6.new/remot
            MOUSE_N		   0x0000000000000040
            MOUSE_NNE		   0x0000000000000041
            MOUSE_NE		   0x0000000000000042
-diff -Naurp lirc-0.8.6/remotes/mceusb/lircd.conf.mceusb lirc-0.8.6.new/remotes/mceusb/lircd.conf.mceusb
---- lirc-0.8.6/remotes/mceusb/lircd.conf.mceusb	2009-07-16 16:44:45.000000000 -0400
-+++ lirc-0.8.6.new/remotes/mceusb/lircd.conf.mceusb	2009-09-13 21:37:03.000000000 -0400
+Index: lirc-0.8.7pre2/remotes/mceusb/lircd.conf.mceusb
+===================================================================
+--- lirc-0.8.7pre2.orig/remotes/mceusb/lircd.conf.mceusb
++++ lirc-0.8.7pre2/remotes/mceusb/lircd.conf.mceusb
 @@ -1,7 +1,8 @@
  #
 -# brand:                        HP 
@@ -3111,8 +3308,8 @@ diff -Naurp lirc-0.8.6/remotes/mceusb/lircd.conf.mceusb lirc-0.8.6.new/remotes/m
  #
  # RC-6 config file
  #
-@@ -54,10 +55,10 @@ begin remote
-       begin codes
+@@ -59,10 +60,10 @@ begin remote
+ 
  
  #unused by HP remote
 -	Blue	      0x00007ba1
@@ -3126,7 +3323,7 @@ diff -Naurp lirc-0.8.6/remotes/mceusb/lircd.conf.mceusb lirc-0.8.6.new/remotes/m
  	Teletext      0x00007ba5
  
  #ba6 - bae unused 
-@@ -71,7 +72,7 @@ begin remote
+@@ -76,7 +77,7 @@ begin remote
          BAD           0x00007bad
          BAE           0x00007bae
  
@@ -3135,7 +3332,7 @@ diff -Naurp lirc-0.8.6/remotes/mceusb/lircd.conf.mceusb lirc-0.8.6.new/remotes/m
          Print         0x00007bb1
  
  #bb2 - bb4 unused  
-@@ -79,11 +80,11 @@ begin remote
+@@ -84,11 +85,11 @@ begin remote
          BB3           0x00007bb3
          BB4           0x00007bb4
  
@@ -3150,7 +3347,7 @@ diff -Naurp lirc-0.8.6/remotes/mceusb/lircd.conf.mceusb lirc-0.8.6.new/remotes/m
  
  #bba - bbf unused 
          BBA           0x00007bba
-@@ -104,7 +105,7 @@ begin remote
+@@ -109,7 +110,7 @@ begin remote
          BC9           0x00007bc9
          BCA           0x00007bca
  
@@ -3159,7 +3356,7 @@ diff -Naurp lirc-0.8.6/remotes/mceusb/lircd.conf.mceusb lirc-0.8.6.new/remotes/m
          SlideShow     0x00007bcc
          Visualization 0x00007bcd
  
-@@ -123,50 +124,50 @@ begin remote
+@@ -128,50 +129,50 @@ begin remote
          Aspect        0x00007bd8
          Guide         0x00007bd9
          LiveTV        0x00007bda
@@ -3244,9 +3441,10 @@ diff -Naurp lirc-0.8.6/remotes/mceusb/lircd.conf.mceusb lirc-0.8.6.new/remotes/m
        end codes
  
  end remote
-diff -Naurp lirc-0.8.6/remotes/packard_bell/lircd.conf.packard_bell lirc-0.8.6.new/remotes/packard_bell/lircd.conf.packard_bell
---- lirc-0.8.6/remotes/packard_bell/lircd.conf.packard_bell	2001-04-24 15:26:56.000000000 -0400
-+++ lirc-0.8.6.new/remotes/packard_bell/lircd.conf.packard_bell	2009-09-13 21:37:03.000000000 -0400
+Index: lirc-0.8.7pre2/remotes/packard_bell/lircd.conf.packard_bell
+===================================================================
+--- lirc-0.8.7pre2.orig/remotes/packard_bell/lircd.conf.packard_bell
++++ lirc-0.8.7pre2/remotes/packard_bell/lircd.conf.packard_bell
 @@ -53,38 +53,38 @@ begin remote
    repeat          9050 2250
   
@@ -3311,9 +3509,10 @@ diff -Naurp lirc-0.8.6/remotes/packard_bell/lircd.conf.packard_bell lirc-0.8.6.n
            Star                     0x0000000000007F80
            Hash                     0x0000000000006B94
        end codes
-diff -Naurp lirc-0.8.6/remotes/pcmak/lircd.conf.pcmak lirc-0.8.6.new/remotes/pcmak/lircd.conf.pcmak
---- lirc-0.8.6/remotes/pcmak/lircd.conf.pcmak	2004-07-24 11:36:15.000000000 -0400
-+++ lirc-0.8.6.new/remotes/pcmak/lircd.conf.pcmak	2009-09-13 21:37:03.000000000 -0400
+Index: lirc-0.8.7pre2/remotes/pcmak/lircd.conf.pcmak
+===================================================================
+--- lirc-0.8.7pre2.orig/remotes/pcmak/lircd.conf.pcmak
++++ lirc-0.8.7pre2/remotes/pcmak/lircd.conf.pcmak
 @@ -23,18 +23,18 @@ begin remote
    repeat_bit      0
  
@@ -3457,9 +3656,10 @@ diff -Naurp lirc-0.8.6/remotes/pcmak/lircd.conf.pcmak lirc-0.8.6.new/remotes/pcm
        end codes
  
  end remote
-diff -Naurp lirc-0.8.6/remotes/pinnacle_systems/lircd.conf.pctv lirc-0.8.6.new/remotes/pinnacle_systems/lircd.conf.pctv
---- lirc-0.8.6/remotes/pinnacle_systems/lircd.conf.pctv	2007-10-06 11:40:53.000000000 -0400
-+++ lirc-0.8.6.new/remotes/pinnacle_systems/lircd.conf.pctv	2009-09-13 21:37:03.000000000 -0400
+Index: lirc-0.8.7pre2/remotes/pinnacle_systems/lircd.conf.pctv
+===================================================================
+--- lirc-0.8.7pre2.orig/remotes/pinnacle_systems/lircd.conf.pctv
++++ lirc-0.8.7pre2/remotes/pinnacle_systems/lircd.conf.pctv
 @@ -24,30 +24,30 @@ begin remote
    toggle_bit         0
  
@@ -3559,9 +3759,10 @@ diff -Naurp lirc-0.8.6/remotes/pinnacle_systems/lircd.conf.pctv lirc-0.8.6.new/r
            middle                   0x0000000000000014
  
  
-diff -Naurp lirc-0.8.6/remotes/pixelview/lircd.conf.playtv lirc-0.8.6.new/remotes/pixelview/lircd.conf.playtv
---- lirc-0.8.6/remotes/pixelview/lircd.conf.playtv	1999-08-04 15:18:27.000000000 -0400
-+++ lirc-0.8.6.new/remotes/pixelview/lircd.conf.playtv	2009-09-13 21:37:03.000000000 -0400
+Index: lirc-0.8.7pre2/remotes/pixelview/lircd.conf.playtv
+===================================================================
+--- lirc-0.8.7pre2.orig/remotes/pixelview/lircd.conf.playtv
++++ lirc-0.8.7pre2/remotes/pixelview/lircd.conf.playtv
 @@ -13,22 +13,22 @@ begin remote
    begin codes
      TV/FM                    0x00000000000000e7
@@ -3600,9 +3801,10 @@ diff -Naurp lirc-0.8.6/remotes/pixelview/lircd.conf.playtv lirc-0.8.6.new/remote
    end codes
  end remote
  
-diff -Naurp lirc-0.8.6/remotes/pixelview/lircd.conf.playtv_bt878 lirc-0.8.6.new/remotes/pixelview/lircd.conf.playtv_bt878
---- lirc-0.8.6/remotes/pixelview/lircd.conf.playtv_bt878	2000-09-30 15:32:40.000000000 -0400
-+++ lirc-0.8.6.new/remotes/pixelview/lircd.conf.playtv_bt878	2009-09-13 21:37:03.000000000 -0400
+Index: lirc-0.8.7pre2/remotes/pixelview/lircd.conf.playtv_bt878
+===================================================================
+--- lirc-0.8.7pre2.orig/remotes/pixelview/lircd.conf.playtv_bt878
++++ lirc-0.8.7pre2/remotes/pixelview/lircd.conf.playtv_bt878
 @@ -16,39 +16,39 @@ begin remote
    repeat_bit 0
  
@@ -3669,9 +3871,10 @@ diff -Naurp lirc-0.8.6/remotes/pixelview/lircd.conf.playtv_bt878 lirc-0.8.6.new/
    end codes
  end remote
  
-diff -Naurp lirc-0.8.6/remotes/pixelview/lircd.conf.playtv_pro lirc-0.8.6.new/remotes/pixelview/lircd.conf.playtv_pro
---- lirc-0.8.6/remotes/pixelview/lircd.conf.playtv_pro	2005-12-10 08:09:13.000000000 -0500
-+++ lirc-0.8.6.new/remotes/pixelview/lircd.conf.playtv_pro	2009-09-13 21:37:03.000000000 -0400
+Index: lirc-0.8.7pre2/remotes/pixelview/lircd.conf.playtv_pro
+===================================================================
+--- lirc-0.8.7pre2.orig/remotes/pixelview/lircd.conf.playtv_pro
++++ lirc-0.8.7pre2/remotes/pixelview/lircd.conf.playtv_pro
 @@ -31,15 +31,15 @@ begin remote
  
        begin codes
@@ -3722,9 +3925,10 @@ diff -Naurp lirc-0.8.6/remotes/pixelview/lircd.conf.playtv_pro lirc-0.8.6.new/re
  
        end codes
  
-diff -Naurp lirc-0.8.6/remotes/pixelview/lircd.conf.remotemaster lirc-0.8.6.new/remotes/pixelview/lircd.conf.remotemaster
---- lirc-0.8.6/remotes/pixelview/lircd.conf.remotemaster	2000-02-07 06:03:20.000000000 -0500
-+++ lirc-0.8.6.new/remotes/pixelview/lircd.conf.remotemaster	2009-09-13 21:37:03.000000000 -0400
+Index: lirc-0.8.7pre2/remotes/pixelview/lircd.conf.remotemaster
+===================================================================
+--- lirc-0.8.7pre2.orig/remotes/pixelview/lircd.conf.remotemaster
++++ lirc-0.8.7pre2/remotes/pixelview/lircd.conf.remotemaster
 @@ -25,39 +25,39 @@ begin remote
    gap          189264
  
@@ -3792,9 +3996,10 @@ diff -Naurp lirc-0.8.6/remotes/pixelview/lircd.conf.remotemaster lirc-0.8.6.new/
        end codes
  
  end remote
-diff -Naurp lirc-0.8.6/remotes/provideo/lircd.conf.pv951 lirc-0.8.6.new/remotes/provideo/lircd.conf.pv951
---- lirc-0.8.6/remotes/provideo/lircd.conf.pv951	2001-01-20 08:32:00.000000000 -0500
-+++ lirc-0.8.6.new/remotes/provideo/lircd.conf.pv951	2009-09-13 21:37:03.000000000 -0400
+Index: lirc-0.8.7pre2/remotes/provideo/lircd.conf.pv951
+===================================================================
+--- lirc-0.8.7pre2.orig/remotes/provideo/lircd.conf.pv951
++++ lirc-0.8.7pre2/remotes/provideo/lircd.conf.pv951
 @@ -31,28 +31,28 @@ begin remote
    repeat_bit      0
  
@@ -3840,9 +4045,10 @@ diff -Naurp lirc-0.8.6/remotes/provideo/lircd.conf.pv951 lirc-0.8.6.new/remotes/
            func                     0x0000000000009867
            ttx                      0x000000000000B04F
            pg+                      0x000000000000708F
-diff -Naurp lirc-0.8.6/remotes/remotec/lircd.conf.BW6130 lirc-0.8.6.new/remotes/remotec/lircd.conf.BW6130
---- lirc-0.8.6/remotes/remotec/lircd.conf.BW6130	2005-05-28 10:29:27.000000000 -0400
-+++ lirc-0.8.6.new/remotes/remotec/lircd.conf.BW6130	2009-09-13 21:37:03.000000000 -0400
+Index: lirc-0.8.7pre2/remotes/remotec/lircd.conf.BW6130
+===================================================================
+--- lirc-0.8.7pre2.orig/remotes/remotec/lircd.conf.BW6130
++++ lirc-0.8.7pre2/remotes/remotec/lircd.conf.BW6130
 @@ -20,20 +20,20 @@ begin remote
    toggle_bit     0
  
@@ -3878,9 +4084,10 @@ diff -Naurp lirc-0.8.6/remotes/remotec/lircd.conf.BW6130 lirc-0.8.6.new/remotes/
  	MOUSE_SLOW_N		0x95
  	MOUSE_SLOW_NNE		0xd1
  	MOUSE_SLOW_NE		0xcd
-diff -Naurp lirc-0.8.6/remotes/samsung/lircd.conf.samsung lirc-0.8.6.new/remotes/samsung/lircd.conf.samsung
---- lirc-0.8.6/remotes/samsung/lircd.conf.samsung	2008-10-05 04:42:36.000000000 -0400
-+++ lirc-0.8.6.new/remotes/samsung/lircd.conf.samsung	2009-09-13 21:37:03.000000000 -0400
+Index: lirc-0.8.7pre2/remotes/samsung/lircd.conf.samsung
+===================================================================
+--- lirc-0.8.7pre2.orig/remotes/samsung/lircd.conf.samsung
++++ lirc-0.8.7pre2/remotes/samsung/lircd.conf.samsung
 @@ -28,60 +28,60 @@ begin remote
  
        begin codes
@@ -3991,9 +4198,10 @@ diff -Naurp lirc-0.8.6/remotes/samsung/lircd.conf.samsung lirc-0.8.6.new/remotes
        end codes
  
  end remote
-diff -Naurp lirc-0.8.6/remotes/sasem/lircd.conf.sasem lirc-0.8.6.new/remotes/sasem/lircd.conf.sasem
---- lirc-0.8.6/remotes/sasem/lircd.conf.sasem	2005-07-15 07:24:55.000000000 -0400
-+++ lirc-0.8.6.new/remotes/sasem/lircd.conf.sasem	2009-09-13 21:37:03.000000000 -0400
+Index: lirc-0.8.7pre2/remotes/sasem/lircd.conf.sasem
+===================================================================
+--- lirc-0.8.7pre2.orig/remotes/sasem/lircd.conf.sasem
++++ lirc-0.8.7pre2/remotes/sasem/lircd.conf.sasem
 @@ -33,47 +33,47 @@ begin remote
  
  
@@ -4074,9 +4282,10 @@ diff -Naurp lirc-0.8.6/remotes/sasem/lircd.conf.sasem lirc-0.8.6.new/remotes/sas
        end codes
  
  end remote
-diff -Naurp lirc-0.8.6/remotes/sigma_designs/lircd.conf.realmagic lirc-0.8.6.new/remotes/sigma_designs/lircd.conf.realmagic
---- lirc-0.8.6/remotes/sigma_designs/lircd.conf.realmagic	2006-04-29 07:01:50.000000000 -0400
-+++ lirc-0.8.6.new/remotes/sigma_designs/lircd.conf.realmagic	2009-09-13 21:37:03.000000000 -0400
+Index: lirc-0.8.7pre2/remotes/sigma_designs/lircd.conf.realmagic
+===================================================================
+--- lirc-0.8.7pre2.orig/remotes/sigma_designs/lircd.conf.realmagic
++++ lirc-0.8.7pre2/remotes/sigma_designs/lircd.conf.realmagic
 @@ -30,43 +30,43 @@ begin remote
  
        begin codes
@@ -4153,9 +4362,10 @@ diff -Naurp lirc-0.8.6/remotes/sigma_designs/lircd.conf.realmagic lirc-0.8.6.new
        end codes
  
  end remote
-diff -Naurp lirc-0.8.6/remotes/silitek/lircd.conf.silitek lirc-0.8.6.new/remotes/silitek/lircd.conf.silitek
---- lirc-0.8.6/remotes/silitek/lircd.conf.silitek	2001-04-24 15:36:10.000000000 -0400
-+++ lirc-0.8.6.new/remotes/silitek/lircd.conf.silitek	2009-09-13 21:37:03.000000000 -0400
+Index: lirc-0.8.7pre2/remotes/silitek/lircd.conf.silitek
+===================================================================
+--- lirc-0.8.7pre2.orig/remotes/silitek/lircd.conf.silitek
++++ lirc-0.8.7pre2/remotes/silitek/lircd.conf.silitek
 @@ -30,68 +30,68 @@ begin remote
      MOUSE_SSE                0x0000000000aa0004
      MOUSE_SE                 0x0000000000aa0003
@@ -4273,9 +4483,10 @@ diff -Naurp lirc-0.8.6/remotes/silitek/lircd.conf.silitek lirc-0.8.6.new/remotes
 +    KEY_CLOSE                 0x0000000000cc5d62
    end codes
  end remote
-diff -Naurp lirc-0.8.6/remotes/streamzap/lircd.conf.streamzap lirc-0.8.6.new/remotes/streamzap/lircd.conf.streamzap
---- lirc-0.8.6/remotes/streamzap/lircd.conf.streamzap	2005-02-12 09:20:23.000000000 -0500
-+++ lirc-0.8.6.new/remotes/streamzap/lircd.conf.streamzap	2009-09-13 21:37:03.000000000 -0400
+Index: lirc-0.8.7pre2/remotes/streamzap/lircd.conf.streamzap
+===================================================================
+--- lirc-0.8.7pre2.orig/remotes/streamzap/lircd.conf.streamzap
++++ lirc-0.8.7pre2/remotes/streamzap/lircd.conf.streamzap
 @@ -27,41 +27,41 @@ begin remote
  
  
@@ -4353,9 +4564,10 @@ diff -Naurp lirc-0.8.6/remotes/streamzap/lircd.conf.streamzap lirc-0.8.6.new/rem
        end codes
  
  end remote
-diff -Naurp lirc-0.8.6/remotes/technisat/lircd.conf.mediafocusI lirc-0.8.6.new/remotes/technisat/lircd.conf.mediafocusI
---- lirc-0.8.6/remotes/technisat/lircd.conf.mediafocusI	2001-02-04 08:38:09.000000000 -0500
-+++ lirc-0.8.6.new/remotes/technisat/lircd.conf.mediafocusI	2009-09-13 21:37:03.000000000 -0400
+Index: lirc-0.8.7pre2/remotes/technisat/lircd.conf.mediafocusI
+===================================================================
+--- lirc-0.8.7pre2.orig/remotes/technisat/lircd.conf.mediafocusI
++++ lirc-0.8.7pre2/remotes/technisat/lircd.conf.mediafocusI
 @@ -30,11 +30,11 @@ begin remote
    duty_cycle   33
  
@@ -4373,9 +4585,10 @@ diff -Naurp lirc-0.8.6/remotes/technisat/lircd.conf.mediafocusI lirc-0.8.6.new/r
        end codes
  
  end remote
-diff -Naurp lirc-0.8.6/remotes/tekram/lircd.conf.m230 lirc-0.8.6.new/remotes/tekram/lircd.conf.m230
---- lirc-0.8.6/remotes/tekram/lircd.conf.m230	2002-03-28 16:26:54.000000000 -0500
-+++ lirc-0.8.6.new/remotes/tekram/lircd.conf.m230	2009-09-13 21:37:03.000000000 -0400
+Index: lirc-0.8.7pre2/remotes/tekram/lircd.conf.m230
+===================================================================
+--- lirc-0.8.7pre2.orig/remotes/tekram/lircd.conf.m230
++++ lirc-0.8.7pre2/remotes/tekram/lircd.conf.m230
 @@ -13,36 +13,36 @@ begin remote
    name  M230
    bits  8
@@ -4436,9 +4649,10 @@ diff -Naurp lirc-0.8.6/remotes/tekram/lircd.conf.m230 lirc-0.8.6.new/remotes/tek
 +	KEY_KPMINUS		0x0C
       end codes
  end remote
-diff -Naurp lirc-0.8.6/remotes/vlsystem/lircd.conf.mplay lirc-0.8.6.new/remotes/vlsystem/lircd.conf.mplay
---- lirc-0.8.6/remotes/vlsystem/lircd.conf.mplay	2007-12-22 07:33:17.000000000 -0500
-+++ lirc-0.8.6.new/remotes/vlsystem/lircd.conf.mplay	2009-09-13 21:37:03.000000000 -0400
+Index: lirc-0.8.7pre2/remotes/vlsystem/lircd.conf.mplay
+===================================================================
+--- lirc-0.8.7pre2.orig/remotes/vlsystem/lircd.conf.mplay
++++ lirc-0.8.7pre2/remotes/vlsystem/lircd.conf.mplay
 @@ -22,49 +22,49 @@ begin remote
    toggle_bit_mask 0x0
  
@@ -4532,9 +4746,10 @@ diff -Naurp lirc-0.8.6/remotes/vlsystem/lircd.conf.mplay lirc-0.8.6.new/remotes/
        end codes
  
  end remote
-diff -Naurp lirc-0.8.6/remotes/x10/lircd.conf.mouseremote lirc-0.8.6.new/remotes/x10/lircd.conf.mouseremote
---- lirc-0.8.6/remotes/x10/lircd.conf.mouseremote	2005-01-22 05:40:43.000000000 -0500
-+++ lirc-0.8.6.new/remotes/x10/lircd.conf.mouseremote	2009-09-13 21:37:03.000000000 -0400
+Index: lirc-0.8.7pre2/remotes/x10/lircd.conf.mouseremote
+===================================================================
+--- lirc-0.8.7pre2.orig/remotes/x10/lircd.conf.mouseremote
++++ lirc-0.8.7pre2/remotes/x10/lircd.conf.mouseremote
 @@ -24,42 +24,42 @@ begin remote
    gap		140000
  
@@ -4617,9 +4832,10 @@ diff -Naurp lirc-0.8.6/remotes/x10/lircd.conf.mouseremote lirc-0.8.6.new/remotes
  	end codes	
  
  end remote
-diff -Naurp lirc-0.8.6/remotes/x10/lircd.conf.mp3anywhere lirc-0.8.6.new/remotes/x10/lircd.conf.mp3anywhere
---- lirc-0.8.6/remotes/x10/lircd.conf.mp3anywhere	2007-07-01 03:09:11.000000000 -0400
-+++ lirc-0.8.6.new/remotes/x10/lircd.conf.mp3anywhere	2009-09-13 21:37:03.000000000 -0400
+Index: lirc-0.8.7pre2/remotes/x10/lircd.conf.mp3anywhere
+===================================================================
+--- lirc-0.8.7pre2.orig/remotes/x10/lircd.conf.mp3anywhere
++++ lirc-0.8.7pre2/remotes/x10/lircd.conf.mp3anywhere
 @@ -22,43 +22,43 @@ begin remote
    gap		140000
  
diff --git a/lirc-in-kernel-ioctls.patch b/lirc-in-kernel-ioctls.patch
new file mode 100644
index 0000000..7e0d0b5
--- /dev/null
+++ b/lirc-in-kernel-ioctls.patch
@@ -0,0 +1,116 @@
+Index: lirc-0.8.7pre2/drivers/lirc.h
+===================================================================
+--- lirc-0.8.7pre2.orig/drivers/lirc.h
++++ lirc-0.8.7pre2/drivers/lirc.h
+@@ -11,6 +11,9 @@
+ #define __USE_LINUX_IOCTL_DEFS
+ #include <sys/ioctl.h>
+ #endif
++#include <stdint.h>
++
++typedef uint32_t __u32;
+ 
+ /* <obsolete> */
+ #define PULSE_BIT       0x01000000
+@@ -95,60 +96,60 @@ typedef int lirc_t;
+ 
+ /*** IOCTL commands for lirc driver ***/
+ 
+-#define LIRC_GET_FEATURES              _IOR('i', 0x00000000, unsigned long)
++#define LIRC_GET_FEATURES              _IOR('i', 0x00000000, __u32)
+ 
+-#define LIRC_GET_SEND_MODE             _IOR('i', 0x00000001, unsigned long)
+-#define LIRC_GET_REC_MODE              _IOR('i', 0x00000002, unsigned long)
+-#define LIRC_GET_SEND_CARRIER          _IOR('i', 0x00000003, unsigned int)
+-#define LIRC_GET_REC_CARRIER           _IOR('i', 0x00000004, unsigned int)
+-#define LIRC_GET_SEND_DUTY_CYCLE       _IOR('i', 0x00000005, unsigned int)
+-#define LIRC_GET_REC_DUTY_CYCLE        _IOR('i', 0x00000006, unsigned int)
+-#define LIRC_GET_REC_RESOLUTION        _IOR('i', 0x00000007, unsigned int)
+-
+-#define LIRC_GET_MIN_TIMEOUT           _IOR('i', 0x00000008, lirc_t)
+-#define LIRC_GET_MAX_TIMEOUT           _IOR('i', 0x00000009, lirc_t)
+-
+-#define LIRC_GET_MIN_FILTER_PULSE      _IOR('i', 0x0000000a, lirc_t)
+-#define LIRC_GET_MAX_FILTER_PULSE      _IOR('i', 0x0000000b, lirc_t)
+-#define LIRC_GET_MIN_FILTER_SPACE      _IOR('i', 0x0000000c, lirc_t)
+-#define LIRC_GET_MAX_FILTER_SPACE      _IOR('i', 0x0000000d, lirc_t)
++#define LIRC_GET_SEND_MODE             _IOR('i', 0x00000001, __u32)
++#define LIRC_GET_REC_MODE              _IOR('i', 0x00000002, __u32)
++#define LIRC_GET_SEND_CARRIER          _IOR('i', 0x00000003, __u32)
++#define LIRC_GET_REC_CARRIER           _IOR('i', 0x00000004, __u32)
++#define LIRC_GET_SEND_DUTY_CYCLE       _IOR('i', 0x00000005, __u32)
++#define LIRC_GET_REC_DUTY_CYCLE        _IOR('i', 0x00000006, __u32)
++#define LIRC_GET_REC_RESOLUTION        _IOR('i', 0x00000007, __u32)
++
++#define LIRC_GET_MIN_TIMEOUT           _IOR('i', 0x00000008, __u32)
++#define LIRC_GET_MAX_TIMEOUT           _IOR('i', 0x00000009, __u32)
++
++#define LIRC_GET_MIN_FILTER_PULSE      _IOR('i', 0x0000000a, __u32)
++#define LIRC_GET_MAX_FILTER_PULSE      _IOR('i', 0x0000000b, __u32)
++#define LIRC_GET_MIN_FILTER_SPACE      _IOR('i', 0x0000000c, __u32)
++#define LIRC_GET_MAX_FILTER_SPACE      _IOR('i', 0x0000000d, __u32)
+ 
+ /* code length in bits, currently only for LIRC_MODE_LIRCCODE */
+-#define LIRC_GET_LENGTH                _IOR('i', 0x0000000f, unsigned long)
++#define LIRC_GET_LENGTH                _IOR('i', 0x0000000f, __u32)
+ 
+ /* all values set should be reset by the driver when the device is
+    reopened */
+ 
+ /* obsolete: drivers only support one mode */
+-#define LIRC_SET_SEND_MODE             _IOW('i', 0x00000011, unsigned long)
++#define LIRC_SET_SEND_MODE             _IOW('i', 0x00000011, __u32)
+ /* obsolete: drivers only support one mode */
+-#define LIRC_SET_REC_MODE              _IOW('i', 0x00000012, unsigned long)
++#define LIRC_SET_REC_MODE              _IOW('i', 0x00000012, __u32)
+ /* Note: these can reset the according pulse_width */
+-#define LIRC_SET_SEND_CARRIER          _IOW('i', 0x00000013, unsigned int)
+-#define LIRC_SET_REC_CARRIER           _IOW('i', 0x00000014, unsigned int)
+-#define LIRC_SET_SEND_DUTY_CYCLE       _IOW('i', 0x00000015, unsigned int)
+-#define LIRC_SET_REC_DUTY_CYCLE        _IOW('i', 0x00000016, unsigned int)
+-#define LIRC_SET_TRANSMITTER_MASK      _IOW('i', 0x00000017, unsigned int)
++#define LIRC_SET_SEND_CARRIER          _IOW('i', 0x00000013, __u32)
++#define LIRC_SET_REC_CARRIER           _IOW('i', 0x00000014, __u32)
++#define LIRC_SET_SEND_DUTY_CYCLE       _IOW('i', 0x00000015, __u32)
++#define LIRC_SET_REC_DUTY_CYCLE        _IOW('i', 0x00000016, __u32)
++#define LIRC_SET_TRANSMITTER_MASK      _IOW('i', 0x00000017, __u32)
+ 
+ /* a value of 0 disables all hardware timeouts and data should be
+    reported as soon as possible */
+-#define LIRC_SET_REC_TIMEOUT           _IOW('i', 0x00000018, lirc_t)
++#define LIRC_SET_REC_TIMEOUT           _IOW('i', 0x00000018, __u32)
+ /* 1 enables, 0 disables timeout reports in MODE2 */
+-#define LIRC_SET_REC_TIMEOUT_REPORTS   _IOW('i', 0x00000019, unsigned int)
++#define LIRC_SET_REC_TIMEOUT_REPORTS   _IOW('i', 0x00000019, __u32)
+ 
+ /* pulses shorter than this are filtered out by hardware (software
+    emulation in lirc_dev/lircd?) */
+-#define LIRC_SET_REC_FILTER_PULSE      _IOW('i', 0x0000001a, lirc_t)
++#define LIRC_SET_REC_FILTER_PULSE      _IOW('i', 0x0000001a, __u32)
+ /* spaces shorter than this are filtered out by hardware (software
+    emulation in lirc_dev/lircd?) */
+-#define LIRC_SET_REC_FILTER_SPACE      _IOW('i', 0x0000001b, lirc_t)
++#define LIRC_SET_REC_FILTER_SPACE      _IOW('i', 0x0000001b, __u32)
+ /* if filter cannot be set independently for pulse/space, this should
+    be used */
+-#define LIRC_SET_REC_FILTER            _IOW('i', 0x0000001c, lirc_t)
++#define LIRC_SET_REC_FILTER            _IOW('i', 0x0000001c, __u32)
+ 
+ /* if enabled from the next key press on the driver will send
+    LIRC_MODE2_FREQUENCY packets */
+-#define LIRC_SET_MEASURE_CARRIER_MODE  _IOW('i', 0x0000001d, unsigned int)
++#define LIRC_SET_MEASURE_CARRIER_MODE  _IOW('i', 0x0000001d, __u32)
+ 
+ /*
+  * to set a range use
+@@ -157,8 +158,8 @@ typedef int lirc_t;
+  * LIRC_SET_REC_DUTY_CYCLE/LIRC_SET_REC_CARRIER with the upper bound
+  */
+ 
+-#define LIRC_SET_REC_DUTY_CYCLE_RANGE  _IOW('i', 0x0000001e, unsigned int)
+-#define LIRC_SET_REC_CARRIER_RANGE     _IOW('i', 0x0000001f, unsigned int)
++#define LIRC_SET_REC_DUTY_CYCLE_RANGE  _IOW('i', 0x0000001e, __u32)
++#define LIRC_SET_REC_CARRIER_RANGE     _IOW('i', 0x0000001f, __u32)
+ 
+ #define LIRC_NOTIFY_DECODE             _IO('i', 0x00000020)
+ 
diff --git a/lirc-use-new-instead-of-conf-as-filename-suffix.patch b/lirc-use-new-instead-of-conf-as-filename-suffix.patch
index 2731eb6..1ca167a 100644
--- a/lirc-use-new-instead-of-conf-as-filename-suffix.patch
+++ b/lirc-use-new-instead-of-conf-as-filename-suffix.patch
@@ -6,10 +6,11 @@ Subject: Use '.new' instead of '.conf' as filename suffix in template mode,
  to prevent a buffer overrun for 'argv[optind]'.
 
 ---
-diff -Naurp lirc.orig/daemons/irrecord.c lirc/daemons/irrecord.c
---- lirc.orig/daemons/irrecord.c	2008-08-27 13:04:46.000000000 -0400
-+++ lirc/daemons/irrecord.c		2008-09-24 17:01:37.000000000 -0400
-@@ -493,7 +493,7 @@ int main(int argc,char **argv)
+Index: lirc-0.8.7pre2/daemons/irrecord.c
+===================================================================
+--- lirc-0.8.7pre2.orig/daemons/irrecord.c
++++ lirc-0.8.7pre2/daemons/irrecord.c
+@@ -514,7 +514,7 @@ int main(int argc,char **argv)
  			exit(EXIT_FAILURE);
  		}
  		strcpy(filename_new, filename);
diff --git a/lirc.spec b/lirc.spec
index 400d2d5..dc3c5bb 100644
--- a/lirc.spec
+++ b/lirc.spec
@@ -14,29 +14,36 @@
 %bcond_without  portaudio
 %bcond_without  x
 %bcond_with     svgalib
-#define pre     pre2
+
+%global released 0
+%define pre     pre2
 
 Name:           lirc
-Version:        0.8.6
-Release:        8%{?pre:.%{pre}}%{?dist}
+Version:        0.8.7
+%if 0%{?released}
+Release:        1%{?dist}
+%else
+Release:        0.1.%{pre}%{?dist}
+%endif
 Summary:        The Linux Infrared Remote Control package
 
 Group:          System Environment/Daemons
 License:        GPLv2+
 URL:            http://www.lirc.org/
+%if 0%{?released}
 Source0:        http://downloads.sourceforge.net/lirc/%{name}-%{version}.tar.bz2
-#Source0:        http://www.lirc.org/software/snapshots/%{name}-%{version}%{pre}.tar.bz2
+%else
+Source0:        http://www.lirc.org/software/snapshots/%{name}-%{version}%{pre}.tar.bz2
+%endif
 Source1:        %{name}.init
 Source2:        %{name}.sysconfig
 Patch0:         lirc-use-new-instead-of-conf-as-filename-suffix.patch
-Patch1:         lirc-0.8.6-devinput-pass-mouse-events.patch
+Patch1:         lirc-in-kernel-ioctls.patch
 # https://bugzilla.redhat.com/show_bug.cgi?id=457273
 # http://thread.gmane.org/gmane.comp.hardware.lirc/6884
 Patch2:		lirc-0.8.6-standardized-remote-keycodes.patch
 Patch3:         lirc-0.8.4-make-remote-names-all-unique.patch
-Patch4:         lirc-0.8.6-remove-obsolete-modes.patch
-Patch5:         lirc-0.8.6-devinput-conf-update.patch
-Patch6:         lirc-0.8.6-firefly-def.patch
+Patch4:         lirc-0.8.6-firefly-def.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  %{__perl}
@@ -167,8 +174,6 @@ touch -r aclocal.m4 configure.ac # avoid autofoo re-run
 %patch2 -p1
 %patch3 -p1
 %patch4 -p1
-%patch5 -p1
-%patch6 -p1
 # Re-run autofoo for new cvs features
 #autoreconf -i -f
 #automake
@@ -292,7 +297,7 @@ fi
 
 
 %changelog
-* Thu Jul 08 2010 Jarod Wilson <jarod@redhat.com> 0.8.6-8
+* Mon Aug 02 2010 Jarod Wilson <jarod@redhat.com> 0.8.7-0.1.pre2
 - Fix up sub-package license file inclusion per new fedora
   licensing guidelines
 - Update to lirc 0.8.7pre2 snapshot
diff --git a/sources b/sources
index ca8889f..df4a541 100644
--- a/sources
+++ b/sources
@@ -1 +1,2 @@
 4ca24da6f5e7c2dcea74878c27a4a3f7  lirc-0.8.6.tar.bz2
+2da1dad0b3de588f316a5e11562fdd8d  lirc-0.8.7pre2.tar.bz2

From 70c5fd9d5b18c1afd41aa5897aaee1365f14c753 Mon Sep 17 00:00:00 2001
From: Jarod Wilson <jarod@redhat.com>
Date: Wed, 4 Aug 2010 19:35:36 -0400
Subject: [PATCH 085/204] add more conditional flags to make building on el6
 easier

Signed-off-by: Jarod Wilson <jarod@redhat.com>
---
 lirc.spec | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/lirc.spec b/lirc.spec
index dc3c5bb..8c0a708 100644
--- a/lirc.spec
+++ b/lirc.spec
@@ -14,6 +14,8 @@
 %bcond_without  portaudio
 %bcond_without  x
 %bcond_with     svgalib
+%bcond_without  irman
+%bcond_without  ftdi
 
 %global released 0
 %define pre     pre2
@@ -48,8 +50,13 @@ BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  %{__perl}
 BuildRequires:  libusb-devel, python-devel
-BuildRequires:  libftdi-devel, libirman-devel
 BuildRequires:  automake libtool
+%if %{with_irman}
+BuildRequires:  libirman-devel
+%endif
+%if %{with_ftdi}
+BuildRequires:  libftdi-devel
+%endif
 %if %{with alsa}
 BuildRequires:  alsa-lib-devel
 %endif

From a971cba2fccc8550b3388976ecd04fb08d9da4c2 Mon Sep 17 00:00:00 2001
From: Jarod Wilson <jarod@redhat.com>
Date: Wed, 4 Aug 2010 19:45:30 -0400
Subject: [PATCH 086/204] fix up prior fix

Signed-off-by: Jarod Wilson <jarod@redhat.com>
---
 lirc.spec | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/lirc.spec b/lirc.spec
index 8c0a708..d2e4a4a 100644
--- a/lirc.spec
+++ b/lirc.spec
@@ -51,10 +51,10 @@ BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:  %{__perl}
 BuildRequires:  libusb-devel, python-devel
 BuildRequires:  automake libtool
-%if %{with_irman}
+%if %{with irman}
 BuildRequires:  libirman-devel
 %endif
-%if %{with_ftdi}
+%if %{with ftdi}
 BuildRequires:  libftdi-devel
 %endif
 %if %{with alsa}

From b2d8095dea68e88efafbc4b1f136bda3f28f0f79 Mon Sep 17 00:00:00 2001
From: Jarod Wilson <jarod@redhat.com>
Date: Wed, 18 Aug 2010 15:32:12 -0400
Subject: [PATCH 087/204] disable parallel make for now, there's a race...

Signed-off-by: Jarod Wilson <jarod@redhat.com>
---
 lirc.spec | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/lirc.spec b/lirc.spec
index dc3c5bb..f4c4eb2 100644
--- a/lirc.spec
+++ b/lirc.spec
@@ -189,7 +189,9 @@ chmod +x daemons/input_map.sh
 %endif
   --with-syslog=LOG_DAEMON \
   --with-driver=userspace
-make %{?_smp_mflags}
+#make %{?_smp_mflags}
+# There's a parallel make race failure here somewhere that needs to be sorted.
+make
 
 %install
 rm -rf $RPM_BUILD_ROOT __docs

From 9108bef90d08ebd2196b32190b74122320561f57 Mon Sep 17 00:00:00 2001
From: Jarod Wilson <jarod@redhat.com>
Date: Sat, 4 Sep 2010 15:41:15 -0400
Subject: [PATCH 088/204] Update to lirc 0.8.7-pre3 snapshot

Signed-off-by: Jarod Wilson <jarod@redhat.com>
---
 .gitignore | 1 +
 lirc.spec  | 9 ++++++---
 sources    | 3 +--
 3 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/.gitignore b/.gitignore
index 5af7df2..c84099b 100644
--- a/.gitignore
+++ b/.gitignore
@@ -3,3 +3,4 @@ lirc-*.tar.bz2
 *.rpm
 lirc-*/
 lirc-0.8.7pre2.tar.bz2
+/lirc-0.8.7-pre3.tar.bz2
diff --git a/lirc.spec b/lirc.spec
index d2e4a4a..83ef35f 100644
--- a/lirc.spec
+++ b/lirc.spec
@@ -18,7 +18,7 @@
 %bcond_without  ftdi
 
 %global released 0
-%define pre     pre2
+%define pre     pre3
 
 Name:           lirc
 Version:        0.8.7
@@ -35,7 +35,7 @@ URL:            http://www.lirc.org/
 %if 0%{?released}
 Source0:        http://downloads.sourceforge.net/lirc/%{name}-%{version}.tar.bz2
 %else
-Source0:        http://www.lirc.org/software/snapshots/%{name}-%{version}%{pre}.tar.bz2
+Source0:        http://www.lirc.org/software/snapshots/%{name}-%{version}-%{pre}.tar.bz2
 %endif
 Source1:        %{name}.init
 Source2:        %{name}.sysconfig
@@ -135,7 +135,7 @@ of remote control configuration files.
 
 
 %prep
-%setup -q -n %{name}-%{version}%{?pre}
+%setup -q -n %{name}-%{version}-%{?pre}
 %patch0 -p1
 %patch1 -p1
 
@@ -304,6 +304,9 @@ fi
 
 
 %changelog
+* Sat Sep 04 2010 Jarod Wilson <jarod@redhat.com> 0.8.7-0.1.pre3
+- Update to lirc 0.8.7-pre3 snapshot
+
 * Mon Aug 02 2010 Jarod Wilson <jarod@redhat.com> 0.8.7-0.1.pre2
 - Fix up sub-package license file inclusion per new fedora
   licensing guidelines
diff --git a/sources b/sources
index df4a541..548c25c 100644
--- a/sources
+++ b/sources
@@ -1,2 +1 @@
-4ca24da6f5e7c2dcea74878c27a4a3f7  lirc-0.8.6.tar.bz2
-2da1dad0b3de588f316a5e11562fdd8d  lirc-0.8.7pre2.tar.bz2
+49c6df887326aee40b6c7ff69c380af1  lirc-0.8.7-pre3.tar.bz2

From 7aaddef92a3c0960237eca68b0149ad3a7b296b7 Mon Sep 17 00:00:00 2001
From: Jarod Wilson <jarod@redhat.com>
Date: Sat, 4 Sep 2010 16:04:49 -0400
Subject: [PATCH 089/204] parallel make is busted atm

Signed-off-by: Jarod Wilson <jarod@redhat.com>
---
 lirc.spec | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/lirc.spec b/lirc.spec
index 83ef35f..3166a72 100644
--- a/lirc.spec
+++ b/lirc.spec
@@ -196,7 +196,9 @@ chmod +x daemons/input_map.sh
 %endif
   --with-syslog=LOG_DAEMON \
   --with-driver=userspace
-make %{?_smp_mflags}
+# make %{?_smp_mflags}
+# parallel makes are currently busted, do single-threaded for now
+make
 
 %install
 rm -rf $RPM_BUILD_ROOT __docs

From c67594ee29398244559fa816aba97312c7b23c15 Mon Sep 17 00:00:00 2001
From: Jarod Wilson <jarod@redhat.com>
Date: Mon, 6 Sep 2010 13:59:06 -0400
Subject: [PATCH 090/204] lirc 0.8.7 release

Signed-off-by: Jarod Wilson <jarod@redhat.com>
---
 .gitignore |  1 +
 lirc.spec  | 11 +++++++++--
 sources    |  2 +-
 3 files changed, 11 insertions(+), 3 deletions(-)

diff --git a/.gitignore b/.gitignore
index c84099b..2338501 100644
--- a/.gitignore
+++ b/.gitignore
@@ -4,3 +4,4 @@ lirc-*.tar.bz2
 lirc-*/
 lirc-0.8.7pre2.tar.bz2
 /lirc-0.8.7-pre3.tar.bz2
+/lirc-0.8.7.tar.bz2
diff --git a/lirc.spec b/lirc.spec
index 83ef35f..2abfe59 100644
--- a/lirc.spec
+++ b/lirc.spec
@@ -17,7 +17,7 @@
 %bcond_without  irman
 %bcond_without  ftdi
 
-%global released 0
+%global released 1
 %define pre     pre3
 
 Name:           lirc
@@ -135,7 +135,11 @@ of remote control configuration files.
 
 
 %prep
-%setup -q -n %{name}-%{version}-%{?pre}
+%if 0%{?released}
+%setup -q
+%else
+%setup -q -n %{name}-%{version}-%{pre}
+%endif
 %patch0 -p1
 %patch1 -p1
 
@@ -304,6 +308,9 @@ fi
 
 
 %changelog
+* Mon Sep 06 2010 Jarod Wilson <jarod@redhat.com> 0.8.7-1
+- Update to lirc 0.8.7 release
+
 * Sat Sep 04 2010 Jarod Wilson <jarod@redhat.com> 0.8.7-0.1.pre3
 - Update to lirc 0.8.7-pre3 snapshot
 
diff --git a/sources b/sources
index 548c25c..88059bc 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-49c6df887326aee40b6c7ff69c380af1  lirc-0.8.7-pre3.tar.bz2
+fb1dcddbc8ca3d03c7f3a2d40cf28b71  lirc-0.8.7.tar.bz2

From 71e0fe193c554e3eebb3669ecd653ed30031c997 Mon Sep 17 00:00:00 2001
From: Jarod Wilson <jarod@redhat.com>
Date: Tue, 26 Oct 2010 17:57:43 -0400
Subject: [PATCH 091/204] lirc 0.9.0-pre1

Signed-off-by: Jarod Wilson <jarod@redhat.com>
---
 .gitignore                                    |   1 +
 lirc-0.8.6-ioctl-portability.patch            |  67 ----------
 lirc-dont-exit.patch                          |  20 ---
 lirc-in-kernel-ioctls.patch                   | 116 ------------------
 ...w-instead-of-conf-as-filename-suffix.patch |  21 ----
 lirc.spec                                     |  29 +++--
 sources                                       |   2 +-
 7 files changed, 19 insertions(+), 237 deletions(-)
 delete mode 100644 lirc-0.8.6-ioctl-portability.patch
 delete mode 100644 lirc-dont-exit.patch
 delete mode 100644 lirc-in-kernel-ioctls.patch
 delete mode 100644 lirc-use-new-instead-of-conf-as-filename-suffix.patch

diff --git a/.gitignore b/.gitignore
index 2338501..5189218 100644
--- a/.gitignore
+++ b/.gitignore
@@ -5,3 +5,4 @@ lirc-*/
 lirc-0.8.7pre2.tar.bz2
 /lirc-0.8.7-pre3.tar.bz2
 /lirc-0.8.7.tar.bz2
+/lirc-0.9.0-pre1.tar.bz2
diff --git a/lirc-0.8.6-ioctl-portability.patch b/lirc-0.8.6-ioctl-portability.patch
deleted file mode 100644
index 52378d1..0000000
--- a/lirc-0.8.6-ioctl-portability.patch
+++ /dev/null
@@ -1,67 +0,0 @@
-Index: lirc-0.8.6/drivers/lirc.h
-===================================================================
---- lirc-0.8.6.orig/drivers/lirc.h
-+++ lirc-0.8.6/drivers/lirc.h
-@@ -11,6 +11,7 @@
- #define __USE_LINUX_IOCTL_DEFS
- #include <sys/ioctl.h>
- #endif
-+#include <stdint.h>
-
- #define PULSE_BIT  0x01000000
- #define PULSE_MASK 0x00FFFFFF
-@@ -68,27 +68,27 @@ typedef int lirc_t;
- 
- /*** IOCTL commands for lirc driver ***/
- 
--#define LIRC_GET_FEATURES              _IOR('i', 0x00000000, unsigned long)
-+#define LIRC_GET_FEATURES              _IOR('i', 0x00000000, uint64_t)
- 
--#define LIRC_GET_SEND_MODE             _IOR('i', 0x00000001, unsigned long)
--#define LIRC_GET_REC_MODE              _IOR('i', 0x00000002, unsigned long)
--#define LIRC_GET_SEND_CARRIER          _IOR('i', 0x00000003, unsigned int)
--#define LIRC_GET_REC_CARRIER           _IOR('i', 0x00000004, unsigned int)
--#define LIRC_GET_SEND_DUTY_CYCLE       _IOR('i', 0x00000005, unsigned int)
--#define LIRC_GET_REC_DUTY_CYCLE        _IOR('i', 0x00000006, unsigned int)
--#define LIRC_GET_REC_RESOLUTION        _IOR('i', 0x00000007, unsigned int)
-+#define LIRC_GET_SEND_MODE             _IOR('i', 0x00000001, uint64_t)
-+#define LIRC_GET_REC_MODE              _IOR('i', 0x00000002, uint64_t)
-+#define LIRC_GET_SEND_CARRIER          _IOR('i', 0x00000003, uint32_t)
-+#define LIRC_GET_REC_CARRIER           _IOR('i', 0x00000004, uint32_t)
-+#define LIRC_GET_SEND_DUTY_CYCLE       _IOR('i', 0x00000005, uint32_t)
-+#define LIRC_GET_REC_DUTY_CYCLE        _IOR('i', 0x00000006, uint32_t)
-+#define LIRC_GET_REC_RESOLUTION        _IOR('i', 0x00000007, uint32_t)
- 
- /* code length in bits, currently only for LIRC_MODE_LIRCCODE */
--#define LIRC_GET_LENGTH                _IOR('i', 0x0000000f, unsigned long)
-+#define LIRC_GET_LENGTH                _IOR('i', 0x0000000f, uint64_t)
- 
--#define LIRC_SET_SEND_MODE             _IOW('i', 0x00000011, unsigned long)
--#define LIRC_SET_REC_MODE              _IOW('i', 0x00000012, unsigned long)
-+#define LIRC_SET_SEND_MODE             _IOW('i', 0x00000011, uint64_t)
-+#define LIRC_SET_REC_MODE              _IOW('i', 0x00000012, uint64_t)
- /* Note: these can reset the according pulse_width */
--#define LIRC_SET_SEND_CARRIER          _IOW('i', 0x00000013, unsigned int)
--#define LIRC_SET_REC_CARRIER           _IOW('i', 0x00000014, unsigned int)
--#define LIRC_SET_SEND_DUTY_CYCLE       _IOW('i', 0x00000015, unsigned int)
--#define LIRC_SET_REC_DUTY_CYCLE        _IOW('i', 0x00000016, unsigned int)
--#define LIRC_SET_TRANSMITTER_MASK      _IOW('i', 0x00000017, unsigned int)
-+#define LIRC_SET_SEND_CARRIER          _IOW('i', 0x00000013, uint32_t)
-+#define LIRC_SET_REC_CARRIER           _IOW('i', 0x00000014, uint32_t)
-+#define LIRC_SET_SEND_DUTY_CYCLE       _IOW('i', 0x00000015, uint32_t)
-+#define LIRC_SET_REC_DUTY_CYCLE        _IOW('i', 0x00000016, uint32_t)
-+#define LIRC_SET_TRANSMITTER_MASK      _IOW('i', 0x00000017, uint32_t)
- 
- /*
-  * to set a range use
-@@ -97,8 +97,8 @@ typedef int lirc_t;
-  * LIRC_SET_REC_DUTY_CYCLE/LIRC_SET_REC_CARRIER with the upper bound
-  */
- 
--#define LIRC_SET_REC_DUTY_CYCLE_RANGE  _IOW('i', 0x0000001e, unsigned int)
--#define LIRC_SET_REC_CARRIER_RANGE     _IOW('i', 0x0000001f, unsigned int)
-+#define LIRC_SET_REC_DUTY_CYCLE_RANGE  _IOW('i', 0x0000001e, uint32_t)
-+#define LIRC_SET_REC_CARRIER_RANGE     _IOW('i', 0x0000001f, uint32_t)
- 
- #define LIRC_NOTIFY_DECODE             _IO('i', 0x00000020)
- 
diff --git a/lirc-dont-exit.patch b/lirc-dont-exit.patch
deleted file mode 100644
index 9485dba..0000000
--- a/lirc-dont-exit.patch
+++ /dev/null
@@ -1,20 +0,0 @@
---- daemons/lircd.c	2008/05/09 18:40:59	5.77
-+++ daemons/lircd.c	2008/08/21 18:39:25	5.78
-@@ -515,10 +515,13 @@
- 		{
- 			if(!hw.init_func())
- 			{
--				shutdown(clis[0],2);
--				close(clis[0]);
--				clin=0;
--				dosigterm(SIGTERM);
-+				logprintf(LOG_WARNING,
-+					  "Failed to initialize hardware");
-+				/* Don't exit here, otherwise lirc
-+				 * bails out, and lircd exits, making
-+				 * it impossible to connect to when we
-+				 * have a device actually plugged
-+				 * in. */
- 			}
- 		}
- 	}
diff --git a/lirc-in-kernel-ioctls.patch b/lirc-in-kernel-ioctls.patch
deleted file mode 100644
index 7e0d0b5..0000000
--- a/lirc-in-kernel-ioctls.patch
+++ /dev/null
@@ -1,116 +0,0 @@
-Index: lirc-0.8.7pre2/drivers/lirc.h
-===================================================================
---- lirc-0.8.7pre2.orig/drivers/lirc.h
-+++ lirc-0.8.7pre2/drivers/lirc.h
-@@ -11,6 +11,9 @@
- #define __USE_LINUX_IOCTL_DEFS
- #include <sys/ioctl.h>
- #endif
-+#include <stdint.h>
-+
-+typedef uint32_t __u32;
- 
- /* <obsolete> */
- #define PULSE_BIT       0x01000000
-@@ -95,60 +96,60 @@ typedef int lirc_t;
- 
- /*** IOCTL commands for lirc driver ***/
- 
--#define LIRC_GET_FEATURES              _IOR('i', 0x00000000, unsigned long)
-+#define LIRC_GET_FEATURES              _IOR('i', 0x00000000, __u32)
- 
--#define LIRC_GET_SEND_MODE             _IOR('i', 0x00000001, unsigned long)
--#define LIRC_GET_REC_MODE              _IOR('i', 0x00000002, unsigned long)
--#define LIRC_GET_SEND_CARRIER          _IOR('i', 0x00000003, unsigned int)
--#define LIRC_GET_REC_CARRIER           _IOR('i', 0x00000004, unsigned int)
--#define LIRC_GET_SEND_DUTY_CYCLE       _IOR('i', 0x00000005, unsigned int)
--#define LIRC_GET_REC_DUTY_CYCLE        _IOR('i', 0x00000006, unsigned int)
--#define LIRC_GET_REC_RESOLUTION        _IOR('i', 0x00000007, unsigned int)
--
--#define LIRC_GET_MIN_TIMEOUT           _IOR('i', 0x00000008, lirc_t)
--#define LIRC_GET_MAX_TIMEOUT           _IOR('i', 0x00000009, lirc_t)
--
--#define LIRC_GET_MIN_FILTER_PULSE      _IOR('i', 0x0000000a, lirc_t)
--#define LIRC_GET_MAX_FILTER_PULSE      _IOR('i', 0x0000000b, lirc_t)
--#define LIRC_GET_MIN_FILTER_SPACE      _IOR('i', 0x0000000c, lirc_t)
--#define LIRC_GET_MAX_FILTER_SPACE      _IOR('i', 0x0000000d, lirc_t)
-+#define LIRC_GET_SEND_MODE             _IOR('i', 0x00000001, __u32)
-+#define LIRC_GET_REC_MODE              _IOR('i', 0x00000002, __u32)
-+#define LIRC_GET_SEND_CARRIER          _IOR('i', 0x00000003, __u32)
-+#define LIRC_GET_REC_CARRIER           _IOR('i', 0x00000004, __u32)
-+#define LIRC_GET_SEND_DUTY_CYCLE       _IOR('i', 0x00000005, __u32)
-+#define LIRC_GET_REC_DUTY_CYCLE        _IOR('i', 0x00000006, __u32)
-+#define LIRC_GET_REC_RESOLUTION        _IOR('i', 0x00000007, __u32)
-+
-+#define LIRC_GET_MIN_TIMEOUT           _IOR('i', 0x00000008, __u32)
-+#define LIRC_GET_MAX_TIMEOUT           _IOR('i', 0x00000009, __u32)
-+
-+#define LIRC_GET_MIN_FILTER_PULSE      _IOR('i', 0x0000000a, __u32)
-+#define LIRC_GET_MAX_FILTER_PULSE      _IOR('i', 0x0000000b, __u32)
-+#define LIRC_GET_MIN_FILTER_SPACE      _IOR('i', 0x0000000c, __u32)
-+#define LIRC_GET_MAX_FILTER_SPACE      _IOR('i', 0x0000000d, __u32)
- 
- /* code length in bits, currently only for LIRC_MODE_LIRCCODE */
--#define LIRC_GET_LENGTH                _IOR('i', 0x0000000f, unsigned long)
-+#define LIRC_GET_LENGTH                _IOR('i', 0x0000000f, __u32)
- 
- /* all values set should be reset by the driver when the device is
-    reopened */
- 
- /* obsolete: drivers only support one mode */
--#define LIRC_SET_SEND_MODE             _IOW('i', 0x00000011, unsigned long)
-+#define LIRC_SET_SEND_MODE             _IOW('i', 0x00000011, __u32)
- /* obsolete: drivers only support one mode */
--#define LIRC_SET_REC_MODE              _IOW('i', 0x00000012, unsigned long)
-+#define LIRC_SET_REC_MODE              _IOW('i', 0x00000012, __u32)
- /* Note: these can reset the according pulse_width */
--#define LIRC_SET_SEND_CARRIER          _IOW('i', 0x00000013, unsigned int)
--#define LIRC_SET_REC_CARRIER           _IOW('i', 0x00000014, unsigned int)
--#define LIRC_SET_SEND_DUTY_CYCLE       _IOW('i', 0x00000015, unsigned int)
--#define LIRC_SET_REC_DUTY_CYCLE        _IOW('i', 0x00000016, unsigned int)
--#define LIRC_SET_TRANSMITTER_MASK      _IOW('i', 0x00000017, unsigned int)
-+#define LIRC_SET_SEND_CARRIER          _IOW('i', 0x00000013, __u32)
-+#define LIRC_SET_REC_CARRIER           _IOW('i', 0x00000014, __u32)
-+#define LIRC_SET_SEND_DUTY_CYCLE       _IOW('i', 0x00000015, __u32)
-+#define LIRC_SET_REC_DUTY_CYCLE        _IOW('i', 0x00000016, __u32)
-+#define LIRC_SET_TRANSMITTER_MASK      _IOW('i', 0x00000017, __u32)
- 
- /* a value of 0 disables all hardware timeouts and data should be
-    reported as soon as possible */
--#define LIRC_SET_REC_TIMEOUT           _IOW('i', 0x00000018, lirc_t)
-+#define LIRC_SET_REC_TIMEOUT           _IOW('i', 0x00000018, __u32)
- /* 1 enables, 0 disables timeout reports in MODE2 */
--#define LIRC_SET_REC_TIMEOUT_REPORTS   _IOW('i', 0x00000019, unsigned int)
-+#define LIRC_SET_REC_TIMEOUT_REPORTS   _IOW('i', 0x00000019, __u32)
- 
- /* pulses shorter than this are filtered out by hardware (software
-    emulation in lirc_dev/lircd?) */
--#define LIRC_SET_REC_FILTER_PULSE      _IOW('i', 0x0000001a, lirc_t)
-+#define LIRC_SET_REC_FILTER_PULSE      _IOW('i', 0x0000001a, __u32)
- /* spaces shorter than this are filtered out by hardware (software
-    emulation in lirc_dev/lircd?) */
--#define LIRC_SET_REC_FILTER_SPACE      _IOW('i', 0x0000001b, lirc_t)
-+#define LIRC_SET_REC_FILTER_SPACE      _IOW('i', 0x0000001b, __u32)
- /* if filter cannot be set independently for pulse/space, this should
-    be used */
--#define LIRC_SET_REC_FILTER            _IOW('i', 0x0000001c, lirc_t)
-+#define LIRC_SET_REC_FILTER            _IOW('i', 0x0000001c, __u32)
- 
- /* if enabled from the next key press on the driver will send
-    LIRC_MODE2_FREQUENCY packets */
--#define LIRC_SET_MEASURE_CARRIER_MODE  _IOW('i', 0x0000001d, unsigned int)
-+#define LIRC_SET_MEASURE_CARRIER_MODE  _IOW('i', 0x0000001d, __u32)
- 
- /*
-  * to set a range use
-@@ -157,8 +158,8 @@ typedef int lirc_t;
-  * LIRC_SET_REC_DUTY_CYCLE/LIRC_SET_REC_CARRIER with the upper bound
-  */
- 
--#define LIRC_SET_REC_DUTY_CYCLE_RANGE  _IOW('i', 0x0000001e, unsigned int)
--#define LIRC_SET_REC_CARRIER_RANGE     _IOW('i', 0x0000001f, unsigned int)
-+#define LIRC_SET_REC_DUTY_CYCLE_RANGE  _IOW('i', 0x0000001e, __u32)
-+#define LIRC_SET_REC_CARRIER_RANGE     _IOW('i', 0x0000001f, __u32)
- 
- #define LIRC_NOTIFY_DECODE             _IO('i', 0x00000020)
- 
diff --git a/lirc-use-new-instead-of-conf-as-filename-suffix.patch b/lirc-use-new-instead-of-conf-as-filename-suffix.patch
deleted file mode 100644
index 1ca167a..0000000
--- a/lirc-use-new-instead-of-conf-as-filename-suffix.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-From 3e45e512719feccaa16edfd208273bade4f724e4 Mon Sep 17 00:00:00 2001
-From: Mathias Hasselmann <mathias@openismus.com>
-Date: Wed, 13 Feb 2008 21:16:09 +0100
-Subject: Use '.new' instead of '.conf' as filename suffix in template mode,
- and append that the suffix to 'filename_new' instead of 'filename',
- to prevent a buffer overrun for 'argv[optind]'.
-
----
-Index: lirc-0.8.7pre2/daemons/irrecord.c
-===================================================================
---- lirc-0.8.7pre2.orig/daemons/irrecord.c
-+++ lirc-0.8.7pre2/daemons/irrecord.c
-@@ -514,7 +514,7 @@ int main(int argc,char **argv)
- 			exit(EXIT_FAILURE);
- 		}
- 		strcpy(filename_new, filename);
--		strcat(filename_new, ".conf");
-+		strcat(filename_new, ".new");
- 		filename = filename_new;
- 	}
- 	else
diff --git a/lirc.spec b/lirc.spec
index b026528..1dd8038 100644
--- a/lirc.spec
+++ b/lirc.spec
@@ -16,12 +16,13 @@
 %bcond_with     svgalib
 %bcond_without  irman
 %bcond_without  ftdi
+%bcond_with     iguanaIR
 
-%global released 1
-%define pre     pre3
+%global released 0
+%define pre     pre1
 
 Name:           lirc
-Version:        0.8.7
+Version:        0.9.0
 %if 0%{?released}
 Release:        1%{?dist}
 %else
@@ -39,13 +40,11 @@ Source0:        http://www.lirc.org/software/snapshots/%{name}-%{version}-%{pre}
 %endif
 Source1:        %{name}.init
 Source2:        %{name}.sysconfig
-Patch0:         lirc-use-new-instead-of-conf-as-filename-suffix.patch
-Patch1:         lirc-in-kernel-ioctls.patch
 # https://bugzilla.redhat.com/show_bug.cgi?id=457273
 # http://thread.gmane.org/gmane.comp.hardware.lirc/6884
-Patch2:		lirc-0.8.6-standardized-remote-keycodes.patch
-Patch3:         lirc-0.8.4-make-remote-names-all-unique.patch
-Patch4:         lirc-0.8.6-firefly-def.patch
+Patch0:		lirc-0.8.6-standardized-remote-keycodes.patch
+Patch1:         lirc-0.8.4-make-remote-names-all-unique.patch
+Patch2:         lirc-0.8.6-firefly-def.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  %{__perl}
@@ -69,6 +68,9 @@ BuildRequires:  svgalib-devel
 %if %{with x}
 BuildRequires:  libXt-devel
 %endif
+%if %{with iguanaIR}
+BuildRequires:  iguanaIR-devel
+%endif
 Requires:       %{name}-libs = %{version}-%{release}
 Requires(post): /sbin/chkconfig
 Requires(post): /sbin/ldconfig
@@ -140,8 +142,6 @@ of remote control configuration files.
 %else
 %setup -q -n %{name}-%{version}-%{pre}
 %endif
-%patch0 -p1
-%patch1 -p1
 
 chmod 644 contrib/*
 chmod +x contrib/hal
@@ -182,9 +182,9 @@ touch -r aclocal.m4 configure.ac # avoid autofoo re-run
 
 # Do this after, as we're touching the remote definitions earlier
 # Don't create a backup, or the original definitions will get installed
+%patch0 -p1
+%patch1 -p1
 %patch2 -p1
-%patch3 -p1
-%patch4 -p1
 # Re-run autofoo for new cvs features
 #autoreconf -i -f
 #automake
@@ -310,6 +310,11 @@ fi
 
 
 %changelog
+* Tue Oct 26 2010 Jarod Wilson <jarod@redhat.com> 0.9.0-0.1.pre1
+- Update to lirc 0.9.0-pre1 snapshot
+- Add conditional flag for building with iguanaIR support (there's an
+  iguanaIR package awaiting review right now)
+
 * Mon Sep 06 2010 Jarod Wilson <jarod@redhat.com> 0.8.7-1
 - Update to lirc 0.8.7 release
 
diff --git a/sources b/sources
index 88059bc..a435725 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-fb1dcddbc8ca3d03c7f3a2d40cf28b71  lirc-0.8.7.tar.bz2
+13ba59178adee4e6be8a9a1966ab3133  lirc-0.9.0-pre1.tar.bz2

From 1420485bc159925f0a726271b30dceaab46a6224 Mon Sep 17 00:00:00 2001
From: Jarod Wilson <jarod@redhat.com>
Date: Tue, 26 Oct 2010 18:38:54 -0400
Subject: [PATCH 092/204] patches merged upstream, so pre2 won't need all this

Signed-off-by: Jarod Wilson <jarod@redhat.com>
---
 lirc.spec | 13 -------------
 1 file changed, 13 deletions(-)

diff --git a/lirc.spec b/lirc.spec
index 1dd8038..a58e83f 100644
--- a/lirc.spec
+++ b/lirc.spec
@@ -40,11 +40,6 @@ Source0:        http://www.lirc.org/software/snapshots/%{name}-%{version}-%{pre}
 %endif
 Source1:        %{name}.init
 Source2:        %{name}.sysconfig
-# https://bugzilla.redhat.com/show_bug.cgi?id=457273
-# http://thread.gmane.org/gmane.comp.hardware.lirc/6884
-Patch0:		lirc-0.8.6-standardized-remote-keycodes.patch
-Patch1:         lirc-0.8.4-make-remote-names-all-unique.patch
-Patch2:         lirc-0.8.6-firefly-def.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  %{__perl}
@@ -148,9 +143,6 @@ chmod +x contrib/hal
 
 sed -i -e 's|/usr/local/etc/|/etc/|' contrib/irman2lirc
 
-sed -i -e 's/\r//' remotes/hercules/lircd.conf.smarttv_stereo \
-    remotes/adstech/lircd.conf.usbx-707
-
 sed -i -e 's|/sbin/init.d/lircd|%{_initrddir}/lirc|' contrib/lircs
 
 for f in remotes/chronos/lircd.conf.chronos \
@@ -180,11 +172,6 @@ sed -i -e 's/vga.h/SVGALIB_DISABLED/g' configure*
 
 touch -r aclocal.m4 configure.ac # avoid autofoo re-run
 
-# Do this after, as we're touching the remote definitions earlier
-# Don't create a backup, or the original definitions will get installed
-%patch0 -p1
-%patch1 -p1
-%patch2 -p1
 # Re-run autofoo for new cvs features
 #autoreconf -i -f
 #automake

From 80c551dda61d4bfce9ec0a74db50e7769f9feadb Mon Sep 17 00:00:00 2001
From: Dennis Gilmore <dennis@ausil.us>
Date: Tue, 8 Feb 2011 07:22:17 -0600
Subject: [PATCH 093/204] - Rebuilt for
 https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild

---
 lirc.spec | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/lirc.spec b/lirc.spec
index a58e83f..86d27fb 100644
--- a/lirc.spec
+++ b/lirc.spec
@@ -24,7 +24,7 @@
 Name:           lirc
 Version:        0.9.0
 %if 0%{?released}
-Release:        1%{?dist}
+Release:        2%{?dist}
 %else
 Release:        0.1.%{pre}%{?dist}
 %endif
@@ -297,6 +297,9 @@ fi
 
 
 %changelog
+* Tue Feb 08 2011 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0.9.0-0.1.pre1
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild
+
 * Tue Oct 26 2010 Jarod Wilson <jarod@redhat.com> 0.9.0-0.1.pre1
 - Update to lirc 0.9.0-pre1 snapshot
 - Add conditional flag for building with iguanaIR support (there's an

From aee4852786282b0c38517da6315e041468bd3271 Mon Sep 17 00:00:00 2001
From: Jarod Wilson <jarod@redhat.com>
Date: Sat, 26 Mar 2011 23:55:42 -0400
Subject: [PATCH 094/204] Update to lirc 0.9.0 release

Signed-off-by: Jarod Wilson <jarod@redhat.com>
---
 lirc.spec | 9 ++++++---
 sources   | 2 +-
 2 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/lirc.spec b/lirc.spec
index 86d27fb..ae952d6 100644
--- a/lirc.spec
+++ b/lirc.spec
@@ -18,13 +18,13 @@
 %bcond_without  ftdi
 %bcond_with     iguanaIR
 
-%global released 0
+%global released 1
 %define pre     pre1
 
 Name:           lirc
 Version:        0.9.0
 %if 0%{?released}
-Release:        2%{?dist}
+Release:        1%{?dist}
 %else
 Release:        0.1.%{pre}%{?dist}
 %endif
@@ -297,7 +297,10 @@ fi
 
 
 %changelog
-* Tue Feb 08 2011 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0.9.0-0.1.pre1
+* Sat Mar 26 2011 Jarod Wilson <jarod@redhat.com> 0.9.0-1
+- Update to lirc 0.9.0 release
+
+* Tue Feb 08 2011 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0.9.0-0.2.pre1
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild
 
 * Tue Oct 26 2010 Jarod Wilson <jarod@redhat.com> 0.9.0-0.1.pre1
diff --git a/sources b/sources
index a435725..b87e81e 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-13ba59178adee4e6be8a9a1966ab3133  lirc-0.9.0-pre1.tar.bz2
+b232aef26f23fe33ea8305d276637086  lirc-0.9.0.tar.bz2

From 005a2fd12bacb1c7edf5886c73e1500aff4990f6 Mon Sep 17 00:00:00 2001
From: Jarod Wilson <jarod@redhat.com>
Date: Sun, 27 Mar 2011 00:08:52 -0400
Subject: [PATCH 095/204] Merge in-kernel decode disable support

Signed-off-by: Jarod Wilson <jarod@redhat.com>
---
 lirc.init | 25 +++++++++++++++++++++++++
 lirc.spec |  1 +
 2 files changed, 26 insertions(+)
 mode change 100644 => 100755 lirc.init

diff --git a/lirc.init b/lirc.init
old mode 100644
new mode 100755
index 1a32831..a397f8b
--- a/lirc.init
+++ b/lirc.init
@@ -74,6 +74,18 @@ start() {
         echo
     fi
     [ $retval -eq 0 ] && touch $lockfile
+
+    # To prevent double key events w/both in-kernel and lirc decode,
+    # we disable the in-kernel decoding when lircd is started up
+    # successfully
+    if [ $retval -eq 0 ]; then
+        rcs=$(find -L /sys/class/rc/ -maxdepth 2 -name protocols 2> /dev/null)
+        for rc in $rcs
+        do
+            echo lirc > ${rc}
+        done
+    fi
+
     return $retval
 }
 
@@ -92,6 +104,19 @@ stop() {
         echo
     fi
     [ $retval -eq 0 ] && rm -f $lockfile
+
+    # On lircd shutdown, turn all the in-kernel IR decoders back on
+    rcs=$(find -L /sys/class/rc/ -maxdepth 2 -name protocols 2> /dev/null)
+    for rc in $rcs
+    do
+        echo none > ${rc}
+        protos=$(cat ${rc})
+        for p in $protos
+        do
+            echo "+${p}" > ${rc}
+        done
+    done
+
     return $retval
 }
 
diff --git a/lirc.spec b/lirc.spec
index ae952d6..d490423 100644
--- a/lirc.spec
+++ b/lirc.spec
@@ -299,6 +299,7 @@ fi
 %changelog
 * Sat Mar 26 2011 Jarod Wilson <jarod@redhat.com> 0.9.0-1
 - Update to lirc 0.9.0 release
+- Disable in-kernel IR decoding when starting up lircd, reenable on shutdown
 
 * Tue Feb 08 2011 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0.9.0-0.2.pre1
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild

From 3b104949ebc43354d265240bdc9e56b1e05aa414 Mon Sep 17 00:00:00 2001
From: Jarod Wilson <jarod@redhat.com>
Date: Sun, 27 Mar 2011 00:08:52 -0400
Subject: [PATCH 096/204] Merge in-kernel decode disable support

Signed-off-by: Jarod Wilson <jarod@redhat.com>
---
 lirc.init | 25 +++++++++++++++++++++++++
 lirc.spec |  1 +
 2 files changed, 26 insertions(+)
 mode change 100644 => 100755 lirc.init

diff --git a/lirc.init b/lirc.init
old mode 100644
new mode 100755
index 1a32831..a397f8b
--- a/lirc.init
+++ b/lirc.init
@@ -74,6 +74,18 @@ start() {
         echo
     fi
     [ $retval -eq 0 ] && touch $lockfile
+
+    # To prevent double key events w/both in-kernel and lirc decode,
+    # we disable the in-kernel decoding when lircd is started up
+    # successfully
+    if [ $retval -eq 0 ]; then
+        rcs=$(find -L /sys/class/rc/ -maxdepth 2 -name protocols 2> /dev/null)
+        for rc in $rcs
+        do
+            echo lirc > ${rc}
+        done
+    fi
+
     return $retval
 }
 
@@ -92,6 +104,19 @@ stop() {
         echo
     fi
     [ $retval -eq 0 ] && rm -f $lockfile
+
+    # On lircd shutdown, turn all the in-kernel IR decoders back on
+    rcs=$(find -L /sys/class/rc/ -maxdepth 2 -name protocols 2> /dev/null)
+    for rc in $rcs
+    do
+        echo none > ${rc}
+        protos=$(cat ${rc})
+        for p in $protos
+        do
+            echo "+${p}" > ${rc}
+        done
+    done
+
     return $retval
 }
 
diff --git a/lirc.spec b/lirc.spec
index ae952d6..d490423 100644
--- a/lirc.spec
+++ b/lirc.spec
@@ -299,6 +299,7 @@ fi
 %changelog
 * Sat Mar 26 2011 Jarod Wilson <jarod@redhat.com> 0.9.0-1
 - Update to lirc 0.9.0 release
+- Disable in-kernel IR decoding when starting up lircd, reenable on shutdown
 
 * Tue Feb 08 2011 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0.9.0-0.2.pre1
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild

From f13c64e2db03dd7b4f6c33f4d7270854505be179 Mon Sep 17 00:00:00 2001
From: Jarod Wilson <jarod@redhat.com>
Date: Sun, 27 Mar 2011 00:15:28 -0400
Subject: [PATCH 097/204] Only disable in-kernel decode when using lirc
 interface

Signed-off-by: Jarod Wilson <jarod@redhat.com>
---
 lirc.init | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

diff --git a/lirc.init b/lirc.init
index a397f8b..c50842b 100755
--- a/lirc.init
+++ b/lirc.init
@@ -79,11 +79,13 @@ start() {
     # we disable the in-kernel decoding when lircd is started up
     # successfully
     if [ $retval -eq 0 ]; then
-        rcs=$(find -L /sys/class/rc/ -maxdepth 2 -name protocols 2> /dev/null)
-        for rc in $rcs
-        do
-            echo lirc > ${rc}
-        done
+        if [ $(echo "$LIRC_DEVICE" | grep -c /dev/lirc) -ge 1 ]; then
+            rcs=$(find -L /sys/class/rc/ -maxdepth 2 -name protocols 2> /dev/null)
+            for rc in $rcs
+            do
+                echo lirc > ${rc}
+            done
+        fi
     fi
 
     return $retval

From f44b189dbfbad1663f246b6e955876a91e935b23 Mon Sep 17 00:00:00 2001
From: Jarod Wilson <jarod@redhat.com>
Date: Tue, 3 May 2011 05:56:23 -0400
Subject: [PATCH 098/204] lirc: don't disable in-kernel decoders in devinput
 mode

Signed-off-by: Jarod Wilson <jarod@redhat.com>
---
 lirc.init | 2 +-
 lirc.spec | 6 +++++-
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/lirc.init b/lirc.init
index c50842b..ab5c833 100755
--- a/lirc.init
+++ b/lirc.init
@@ -79,7 +79,7 @@ start() {
     # we disable the in-kernel decoding when lircd is started up
     # successfully
     if [ $retval -eq 0 ]; then
-        if [ $(echo "$LIRC_DEVICE" | grep -c /dev/lirc) -ge 1 ]; then
+        if [ $(echo "$LIRC_DRIVER" | grep -c "dev.*input") -lt 1 ]; then
             rcs=$(find -L /sys/class/rc/ -maxdepth 2 -name protocols 2> /dev/null)
             for rc in $rcs
             do
diff --git a/lirc.spec b/lirc.spec
index d490423..ba067a9 100644
--- a/lirc.spec
+++ b/lirc.spec
@@ -24,7 +24,7 @@
 Name:           lirc
 Version:        0.9.0
 %if 0%{?released}
-Release:        1%{?dist}
+Release:        2%{?dist}
 %else
 Release:        0.1.%{pre}%{?dist}
 %endif
@@ -297,6 +297,10 @@ fi
 
 
 %changelog
+* Tue May 03 2011 Jarod Wilson <jarod@redhat.com> 0.9.0-2
+- Only disable in-kernel IR decoders if we're not using devinput mode,
+  as they're actually required for devinput mode to work right.
+
 * Sat Mar 26 2011 Jarod Wilson <jarod@redhat.com> 0.9.0-1
 - Update to lirc 0.9.0 release
 - Disable in-kernel IR decoding when starting up lircd, reenable on shutdown

From 40e4af6d768d370e2e7b8099db012b57dfbcb3f6 Mon Sep 17 00:00:00 2001
From: Jarod Wilson <jarod@redhat.com>
Date: Tue, 3 May 2011 10:59:07 -0400
Subject: [PATCH 099/204] Make things work mo betta with systemd

Signed-off-by: Jarod Wilson <jarod@redhat.com>
---
 lirc.spec | 20 ++++++++++++++++----
 1 file changed, 16 insertions(+), 4 deletions(-)

diff --git a/lirc.spec b/lirc.spec
index ba067a9..523fd3a 100644
--- a/lirc.spec
+++ b/lirc.spec
@@ -24,7 +24,7 @@
 Name:           lirc
 Version:        0.9.0
 %if 0%{?released}
-Release:        2%{?dist}
+Release:        3%{?dist}
 %else
 Release:        0.1.%{pre}%{?dist}
 %endif
@@ -222,11 +222,18 @@ rm -rf contrib/irman2lirc contrib/lirc.* contrib/sendxevent.c
 cd ..
 
 install -dm 755 $RPM_BUILD_ROOT%{_sysconfdir}/lirc
-touch $RPM_BUILD_ROOT%{_sysconfdir}/lirc/lirc{d,md}.conf
+for f in lircd.conf lircmd.conf
+do
+  echo "# Populated config files can be found in the lirc-remotes sub-package
+# or at http://lirc.sourceforge.net/remotes/" > $RPM_BUILD_ROOT%{_sysconfdir}/lirc/$f
+done
 
 install -dm 755 $RPM_BUILD_ROOT%{_localstatedir}/run/lirc/
 touch $RPM_BUILD_ROOT%{_localstatedir}/run/lirc/lirc{d,m}
 
+mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/tmpfiles.d
+echo "d	%{_localstatedir}/run/lirc	0755	root	root	10d" > $RPM_BUILD_ROOT%{_sysconfdir}/tmpfiles.d/lirc.conf
+
 rm $RPM_BUILD_ROOT%{_libdir}/liblirc_client.la
 
 # Put remote definitions in place
@@ -262,18 +269,19 @@ fi
 %files
 %defattr(-,root,root,-)
 %doc ANNOUNCE AUTHORS ChangeLog COPYING NEWS README TODO
-%ghost %config(noreplace) %{_sysconfdir}/lirc/lirc*d.conf
+%config(noreplace) %{_sysconfdir}/lirc/lirc*d.conf
 %config(noreplace) %{_sysconfdir}/sysconfig/lirc
+%config(noreplace) %{_sysconfdir}/tmpfiles.d/lirc.conf
 %{_initrddir}/lirc
 %{_bindir}/*ir*
 %{_bindir}/*mode2
 %{_sbindir}/lirc*d
 %dir %{_datadir}/lirc/
 %{_datadir}/lirc/
-%dir %{_localstatedir}/run/lirc/
 %{_mandir}/man1/*ir*.1*
 %{_mandir}/man1/*mode2*.1*
 %{_mandir}/man8/lirc*d.8*
+%ghost %dir %{_localstatedir}/run/lirc/
 %ghost %{_localstatedir}/run/lirc/lirc*
 
 %files libs
@@ -297,6 +305,10 @@ fi
 
 
 %changelog
+* Tue May 03 2011 Jarod Wilson <jarod@redhat.com> 0.9.0-3
+- Properly support tmpfs /var/run/lirc in new systemd world (#656613)
+- Don't ghost config files, lay 'em down with pointers in them
+
 * Tue May 03 2011 Jarod Wilson <jarod@redhat.com> 0.9.0-2
 - Only disable in-kernel IR decoders if we're not using devinput mode,
   as they're actually required for devinput mode to work right.

From 97fa5d888f906eb3bd94821f8fca7e28b6d0842b Mon Sep 17 00:00:00 2001
From: Jarod Wilson <jarod@redhat.com>
Date: Sat, 28 May 2011 16:52:36 -0400
Subject: [PATCH 100/204] Bug 656613 told me to use ghost. It was wrong.

Signed-off-by: Jarod Wilson <jarod@redhat.com>
---
 lirc.spec | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/lirc.spec b/lirc.spec
index 523fd3a..fe6f4f2 100644
--- a/lirc.spec
+++ b/lirc.spec
@@ -24,7 +24,7 @@
 Name:           lirc
 Version:        0.9.0
 %if 0%{?released}
-Release:        3%{?dist}
+Release:        4%{?dist}
 %else
 Release:        0.1.%{pre}%{?dist}
 %endif
@@ -281,7 +281,7 @@ fi
 %{_mandir}/man1/*ir*.1*
 %{_mandir}/man1/*mode2*.1*
 %{_mandir}/man8/lirc*d.8*
-%ghost %dir %{_localstatedir}/run/lirc/
+%dir %{_localstatedir}/run/lirc/
 %ghost %{_localstatedir}/run/lirc/lirc*
 
 %files libs
@@ -305,6 +305,10 @@ fi
 
 
 %changelog
+* Sat May 28 2011 Jarod Wilson <jarod@redhat.com> 0.9.0-4
+- Apparently, the title of bz656613 wasn't quite correct, some stuff
+  in /var/run does need to be installed, not ghosted...
+
 * Tue May 03 2011 Jarod Wilson <jarod@redhat.com> 0.9.0-3
 - Properly support tmpfs /var/run/lirc in new systemd world (#656613)
 - Don't ghost config files, lay 'em down with pointers in them

From ff294dd1977ea58585b1f0f6eb4d37ca57fa598b Mon Sep 17 00:00:00 2001
From: Jarod Wilson <jarod@redhat.com>
Date: Tue, 31 May 2011 11:35:15 -0400
Subject: [PATCH 101/204] Add explicit BR: libusb1-devel

Signed-off-by: Jarod Wilson <jarod@redhat.com>
---
 lirc.spec | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/lirc.spec b/lirc.spec
index fe6f4f2..bc3170e 100644
--- a/lirc.spec
+++ b/lirc.spec
@@ -24,7 +24,7 @@
 Name:           lirc
 Version:        0.9.0
 %if 0%{?released}
-Release:        4%{?dist}
+Release:        5%{?dist}
 %else
 Release:        0.1.%{pre}%{?dist}
 %endif
@@ -43,7 +43,7 @@ Source2:        %{name}.sysconfig
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  %{__perl}
-BuildRequires:  libusb-devel, python-devel
+BuildRequires:  libusb-devel, libusb1-devel, python-devel
 BuildRequires:  automake libtool
 %if %{with irman}
 BuildRequires:  libirman-devel
@@ -305,6 +305,10 @@ fi
 
 
 %changelog
+* Tue May 31 2011 Jarod Wilson <jarod@redhat.com> 0.9.0-5
+- Add explict BR: libusb1-devel, as some userspace drivers require it, and
+  its apparently not getting into the build root any longer
+
 * Sat May 28 2011 Jarod Wilson <jarod@redhat.com> 0.9.0-4
 - Apparently, the title of bz656613 wasn't quite correct, some stuff
   in /var/run does need to be installed, not ghosted...

From dda9eb6207c6510b3d048a7caf6f94789622a004 Mon Sep 17 00:00:00 2001
From: Jarod Wilson <jarod@redhat.com>
Date: Tue, 7 Jun 2011 00:18:50 -0400
Subject: [PATCH 102/204] Really fix libusb-based driver support this time

Signed-off-by: Jarod Wilson <jarod@redhat.com>
---
 lirc-0.9.0-libusb-config-is-no-more.patch | 95 +++++++++++++++++++++++
 lirc.spec                                 |  9 ++-
 2 files changed, 103 insertions(+), 1 deletion(-)
 create mode 100644 lirc-0.9.0-libusb-config-is-no-more.patch

diff --git a/lirc-0.9.0-libusb-config-is-no-more.patch b/lirc-0.9.0-libusb-config-is-no-more.patch
new file mode 100644
index 0000000..28b1e01
--- /dev/null
+++ b/lirc-0.9.0-libusb-config-is-no-more.patch
@@ -0,0 +1,95 @@
+diff --git a/configure.ac b/configure.ac
+index 6c07e0d..1a3347e 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -20,11 +20,11 @@ AC_PROG_MAKE_SET
+ AC_PATH_PROG(mknod, mknod, /bin/mknod)
+ AC_PATH_PROG(mkfifo, mkfifo, /usr/bin/mkfifo)
+ AC_PATH_PROG(depmod, depmod, /sbin/depmod, $PATH:/sbin)
+-AC_PATH_PROG(LIBUSB_CONFIG, libusb-config)
+ AC_PROG_LN_S
+ AC_PROG_LIBTOOL
+ AM_PATH_PYTHON(,, [:])
+ AM_CONDITIONAL([HAVE_PYTHON], [test "$PYTHON" != ""])
++LIBUSB_CONFIG="pkg-config libusb"
+ 
+ dnl Checks for header files.
+ AC_HEADER_STDC
+@@ -310,15 +310,14 @@ AH_TEMPLATE([SYSCONFDIR],
+ AH_TEMPLATE([USE_SYSLOG],
+ 	[define if you want to log to syslog instead of logfile])
+ 
+-if test -n "${LIBUSB_CONFIG}"; then
+-  AC_DEFINE(HAVE_LIBUSB)
+-  possible_drivers="${possible_drivers} (atilibusb) (awlibusb) (dfclibusb) (commandir) (srm7500libusb)" 
+-fi
+-
+ AC_CHECK_LIB(caraca_client, caraca_init,
+   AC_DEFINE(HAVE_LIBCARACA)
+   possible_drivers="${possible_drivers} (caraca)"
+ )
++AC_CHECK_HEADER(usb.h,
++  AC_DEFINE(HAVE_LIBUSB)
++  possible_drivers="${possible_drivers} (atilibusb) (awlibusb) (dfclibusb) (commandir) (srm7500libusb)" 
++)
+ AC_CHECK_HEADER(ftdi.h,
+   AC_DEFINE(HAVE_FTDI)
+   possible_drivers="${possible_drivers} (ftdi)"
+@@ -1449,7 +1448,7 @@ Get it at:
+ Or install these packages from your distro:
+ 
+    libusb
+-   libusb-dev
++   libusb-devel
+ 
+ ])
+     ;;
+--- lirc-0.9.0/configure.orig	2011-06-07 00:08:14.850212313 -0400
++++ lirc-0.9.0/configure	2011-06-07 00:11:07.140109458 -0400
+@@ -865,7 +865,6 @@ build_cpu
+ build
+ LIBTOOL
+ LN_S
+-LIBUSB_CONFIG
+ depmod
+ mkfifo
+ mknod
+@@ -4160,37 +4159,7 @@ $as_echo "no" >&6; }
+ fi
+ 
+ 
+-# Extract the first word of "libusb-config", so it can be a program name with args.
+-set dummy libusb-config; ac_word=$2
+-{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
+-$as_echo_n "checking for $ac_word... " >&6; }
+-if test "${ac_cv_path_LIBUSB_CONFIG+set}" = set; then
+-  $as_echo_n "(cached) " >&6
+-else
+-  case $LIBUSB_CONFIG in
+-  [\\/]* | ?:[\\/]*)
+-  ac_cv_path_LIBUSB_CONFIG="$LIBUSB_CONFIG" # Let the user override the test with a path.
+-  ;;
+-  *)
+-  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+-for as_dir in $PATH
+-do
+-  IFS=$as_save_IFS
+-  test -z "$as_dir" && as_dir=.
+-  for ac_exec_ext in '' $ac_executable_extensions; do
+-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+-    ac_cv_path_LIBUSB_CONFIG="$as_dir/$ac_word$ac_exec_ext"
+-    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+-    break 2
+-  fi
+-done
+-done
+-IFS=$as_save_IFS
+-
+-  ;;
+-esac
+-fi
+-LIBUSB_CONFIG=$ac_cv_path_LIBUSB_CONFIG
++LIBUSB_CONFIG="pkg-config libusb"
+ if test -n "$LIBUSB_CONFIG"; then
+   { $as_echo "$as_me:$LINENO: result: $LIBUSB_CONFIG" >&5
+ $as_echo "$LIBUSB_CONFIG" >&6; }
diff --git a/lirc.spec b/lirc.spec
index bc3170e..16a0b93 100644
--- a/lirc.spec
+++ b/lirc.spec
@@ -24,7 +24,7 @@
 Name:           lirc
 Version:        0.9.0
 %if 0%{?released}
-Release:        5%{?dist}
+Release:        6%{?dist}
 %else
 Release:        0.1.%{pre}%{?dist}
 %endif
@@ -40,6 +40,7 @@ Source0:        http://www.lirc.org/software/snapshots/%{name}-%{version}-%{pre}
 %endif
 Source1:        %{name}.init
 Source2:        %{name}.sysconfig
+Patch0:         lirc-0.9.0-libusb-config-is-no-more.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  %{__perl}
@@ -137,6 +138,7 @@ of remote control configuration files.
 %else
 %setup -q -n %{name}-%{version}-%{pre}
 %endif
+%patch0 -p1
 
 chmod 644 contrib/*
 chmod +x contrib/hal
@@ -305,6 +307,11 @@ fi
 
 
 %changelog
+* Mon Jun 06 2011 Jarod Wilson <jarod@redhat.com> 0.9.0-6
+- And now take out the libusb1-devel bit, its actually the removal of
+  libusb-config from libusb-devel that broke things, so we need some
+  fixage upstream, backported here.
+
 * Tue May 31 2011 Jarod Wilson <jarod@redhat.com> 0.9.0-5
 - Add explict BR: libusb1-devel, as some userspace drivers require it, and
   its apparently not getting into the build root any longer

From 09fb74e0027d8b3fbd438b35620b763139e26c9a Mon Sep 17 00:00:00 2001
From: Jarod Wilson <jarod@redhat.com>
Date: Thu, 16 Jun 2011 14:17:59 -0400
Subject: [PATCH 103/204] Redirect errors to null when disabling protocols,
 some RC devs don't support lirc

Signed-off-by: Jarod Wilson <jarod@redhat.com>
---
 lirc.init | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/lirc.init b/lirc.init
index ab5c833..f5ebb92 100755
--- a/lirc.init
+++ b/lirc.init
@@ -83,7 +83,7 @@ start() {
             rcs=$(find -L /sys/class/rc/ -maxdepth 2 -name protocols 2> /dev/null)
             for rc in $rcs
             do
-                echo lirc > ${rc}
+                (echo lirc > ${rc}) 2> /dev/null
             done
         fi
     fi
@@ -115,7 +115,7 @@ stop() {
         protos=$(cat ${rc})
         for p in $protos
         do
-            echo "+${p}" > ${rc}
+            (echo "+${p}" > ${rc}) 2> /dev/null
         done
     done
 

From 05139c3fc0854d732af0f9a089aaffab4c210586 Mon Sep 17 00:00:00 2001
From: Jarod Wilson <jarod@redhat.com>
Date: Tue, 21 Jun 2011 13:57:11 -0400
Subject: [PATCH 104/204] Improve in-kernel decoder disabling logic

Signed-off-by: Jarod Wilson <jarod@redhat.com>
---
 lirc.init | 64 +++++++++++++++++--------------------------------------
 lirc.spec |  6 +++++-
 2 files changed, 24 insertions(+), 46 deletions(-)

diff --git a/lirc.init b/lirc.init
index f5ebb92..6c918c9 100755
--- a/lirc.init
+++ b/lirc.init
@@ -30,40 +30,13 @@ prog2=$(basename $exec2)
 
 lockfile=/var/lock/subsys/lirc
 
-build_lirc_args ()
-{
-	local LIRC_ARGS="$*"
-
-	# For remote only detection support, we need
-	# LIRC_DEVICE undefined
-	if [ -z "$LIRC_DEVICE" ] ; then
-		for dev in /dev/lirc0; do
-			if [ -c $dev ]; then
-				LIRC_DEVICE="$dev"
-				break
-			fi
-		done
-	fi
-
-	# If we have a LIRC_DEVICE or LIRC_DRIVER defined (either because
-	# no devices were defined, OR if we explicitly did), then
-	# populate LIRC_ARGS
-	if [ ! -z "$LIRC_DEVICE" ] || [ ! -z "$LIRC_DRIVER" ]; then
-		if [ -n "$LIRC_DEVICE" ] && [ "$LIRC_DEVICE" != "none" ]; then
-			LIRC_ARGS="--device=$LIRC_DEVICE $LIRC_ARGS"
-		fi
-		if [ -n "$LIRC_DRIVER" ] && [ "$LIRC_DRIVER" != "none" ]; then
-			LIRC_ARGS="--driver=$LIRC_DRIVER $LIRC_ARGS"
-		fi
-	fi
-	echo $LIRC_ARGS
-}
+# Default to first lirc character device and the lirc chardev driver
+LIRC_DEVICE=${LIRC_DEVICE:-/dev/lirc0}
+LIRC_DRIVER=${LIRC_DRIVER:-default}
 
 start() {
-    LIRC_ARGS=`build_lirc_args $LIRC_ARGS`
-
     echo -n $"Starting infrared remote control daemon ($prog): "
-    daemon $exec $LIRC_ARGS $LIRCD_OPTIONS
+    daemon $exec --driver=$LIRC_DRIVER --device=$LIRC_DEVICE $LIRCD_OPTIONS
     retval=$?
     echo
     status $prog >/dev/null 2>&1
@@ -77,14 +50,14 @@ start() {
 
     # To prevent double key events w/both in-kernel and lirc decode,
     # we disable the in-kernel decoding when lircd is started up
-    # successfully
+    # successfully with a raw IR rc-core receiver
     if [ $retval -eq 0 ]; then
-        if [ $(echo "$LIRC_DRIVER" | grep -c "dev.*input") -lt 1 ]; then
-            rcs=$(find -L /sys/class/rc/ -maxdepth 2 -name protocols 2> /dev/null)
-            for rc in $rcs
-            do
-                (echo lirc > ${rc}) 2> /dev/null
-            done
+        if [ $(echo "$LIRC_DRIVER" | grep -c "default") -ge 1 ]; then
+            lircdev=$(basename $LIRC_DEVICE)
+            rcdev=$(find -L /sys/class/rc/ -maxdepth 2 -name $lircdev 2> /dev/null)
+            if [ ! -z ${rcdev} ]; then
+	        (echo lirc > ${rcdev}/../protocols) 2> /dev/null
+            fi
         fi
     fi
 
@@ -108,16 +81,17 @@ stop() {
     [ $retval -eq 0 ] && rm -f $lockfile
 
     # On lircd shutdown, turn all the in-kernel IR decoders back on
-    rcs=$(find -L /sys/class/rc/ -maxdepth 2 -name protocols 2> /dev/null)
-    for rc in $rcs
-    do
-        echo none > ${rc}
-        protos=$(cat ${rc})
+    lircdev=$(basename $LIRC_DEVICE)
+    rcdev=$(find -L /sys/class/rc/ -maxdepth 2 -name $lircdev 2> /dev/null)
+    if [ ! -z ${rcdev} ]; then
+        protonode=${rcdev}/../protocols
+        echo none > ${protonode}
+        protos=$(cat ${protonode})
         for p in $protos
         do
-            (echo "+${p}" > ${rc}) 2> /dev/null
+            (echo "+${p}" > ${protonode}) 2> /dev/null
         done
-    done
+    fi
 
     return $retval
 }
diff --git a/lirc.spec b/lirc.spec
index 16a0b93..9fcf289 100644
--- a/lirc.spec
+++ b/lirc.spec
@@ -24,7 +24,7 @@
 Name:           lirc
 Version:        0.9.0
 %if 0%{?released}
-Release:        6%{?dist}
+Release:        7%{?dist}
 %else
 Release:        0.1.%{pre}%{?dist}
 %endif
@@ -307,6 +307,10 @@ fi
 
 
 %changelog
+* Tue Jun 21 2011 Jarod Wilson <jarod@redhat.com> 0.9.0-7
+- Only alter protocols for the device lirc is configured to talk to
+  and don't try to poke protocols on non-rc-core lirc devices
+
 * Mon Jun 06 2011 Jarod Wilson <jarod@redhat.com> 0.9.0-6
 - And now take out the libusb1-devel bit, its actually the removal of
   libusb-config from libusb-devel that broke things, so we need some

From 57b8e9b2928b3ef28be006e8e914ffa6c1afdc9c Mon Sep 17 00:00:00 2001
From: Dennis Gilmore <dennis@ausil.us>
Date: Fri, 13 Jan 2012 02:48:23 -0600
Subject: [PATCH 105/204] - Rebuilt for
 https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild

---
 lirc.spec | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/lirc.spec b/lirc.spec
index 9fcf289..b0afe44 100644
--- a/lirc.spec
+++ b/lirc.spec
@@ -24,7 +24,7 @@
 Name:           lirc
 Version:        0.9.0
 %if 0%{?released}
-Release:        7%{?dist}
+Release:        8%{?dist}
 %else
 Release:        0.1.%{pre}%{?dist}
 %endif
@@ -307,6 +307,9 @@ fi
 
 
 %changelog
+* Fri Jan 13 2012 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0.9.0-8
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild
+
 * Tue Jun 21 2011 Jarod Wilson <jarod@redhat.com> 0.9.0-7
 - Only alter protocols for the device lirc is configured to talk to
   and don't try to poke protocols on non-rc-core lirc devices

From f7b41175b5f712fc5b2bc97a60ee29ae3b3ddbfb Mon Sep 17 00:00:00 2001
From: Jon Ciesla <limburgher@gmail.com>
Date: Thu, 19 Apr 2012 12:54:25 -0500
Subject: [PATCH 106/204] Migrate to systemd.

---
 lirc.service   | 11 ++++++++++
 lirc.spec      | 58 ++++++++++++++++++++++++++++++++++++++------------
 lircmd.service | 11 ++++++++++
 3 files changed, 66 insertions(+), 14 deletions(-)
 create mode 100644 lirc.service
 create mode 100644 lircmd.service

diff --git a/lirc.service b/lirc.service
new file mode 100644
index 0000000..a0b925d
--- /dev/null
+++ b/lirc.service
@@ -0,0 +1,11 @@
+[Unit]
+Description=LIRC Infrared Signal Decoder
+After=network.target
+
+[Service]
+Type=forking
+PIDFile=/run/lirc/lircd.pid
+ExecStart=/usr/sbin/lircd --driver=default --device=/dev/lirc0 
+
+[Install]
+WantedBy=multi-user.target
diff --git a/lirc.spec b/lirc.spec
index b0afe44..4eb683d 100644
--- a/lirc.spec
+++ b/lirc.spec
@@ -24,7 +24,7 @@
 Name:           lirc
 Version:        0.9.0
 %if 0%{?released}
-Release:        8%{?dist}
+Release:        9%{?dist}
 %else
 Release:        0.1.%{pre}%{?dist}
 %endif
@@ -38,8 +38,9 @@ Source0:        http://downloads.sourceforge.net/lirc/%{name}-%{version}.tar.bz2
 %else
 Source0:        http://www.lirc.org/software/snapshots/%{name}-%{version}-%{pre}.tar.bz2
 %endif
-Source1:        %{name}.init
+Source1:        %{name}.service
 Source2:        %{name}.sysconfig
+Source3:	%{name}md.service
 Patch0:         lirc-0.9.0-libusb-config-is-no-more.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -68,10 +69,13 @@ BuildRequires:  libXt-devel
 BuildRequires:  iguanaIR-devel
 %endif
 Requires:       %{name}-libs = %{version}-%{release}
-Requires(post): /sbin/chkconfig
 Requires(post): /sbin/ldconfig
-Requires(preun): /sbin/chkconfig
 Requires(postun): /sbin/ldconfig
+Requires(post): systemd-units
+Requires(preun): systemd-units
+Requires(postun): systemd-units
+#for triggerun
+Requires(post): systemd-sysv
 
 %description
 LIRC is a package that allows you to decode and send infra-red and
@@ -208,12 +212,8 @@ rm -f $RPM_BUILD_ROOT%{_mandir}/man1/xmode2.1*
 
 install -Dpm 644 doc/lirc.hwdb $RPM_BUILD_ROOT%{_datadir}/lirc/lirc.hwdb
 
-install -Dpm 755 %{SOURCE1} $RPM_BUILD_ROOT%{_initrddir}/lirc
-%{__perl} -pi -e \
-  's|/etc/|%{_sysconfdir}/|g ;
-   s|/var/|%{_localstatedir}/|g ;
-   s|/usr/sbin/|%{_sbindir}/|g' \
-  $RPM_BUILD_ROOT%{_initrddir}/lirc
+install -Dpm 644 %{SOURCE1} $RPM_BUILD_ROOT%{_unitdir}/lirc.service
+install -Dpm 644 %{SOURCE3} $RPM_BUILD_ROOT%{_unitdir}/lircmd.service
 install -Dpm 644 %{SOURCE2} $RPM_BUILD_ROOT%{_sysconfdir}/sysconfig/lirc
 
 mkdir __docs
@@ -246,7 +246,10 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %post
-/sbin/chkconfig --add lirc
+if [ $1 -eq 1 ] ; then 
+    # Initial installation 
+    /bin/systemctl daemon-reload >/dev/null 2>&1 || :
+fi
 # If we're upgrading, move config files into their new location, if need be
 if [ $1 -ge 2 ] ; then
   if [ -e %{_sysconfdir}/lircd.conf -a ! -e %{_sysconfdir}/lirc/lircd.conf ]; then
@@ -261,20 +264,44 @@ fi
 
 %preun
 if [ $1 -eq 0 ] ; then
-  %{_initrddir}/lirc stop >/dev/null || :
-  /sbin/chkconfig --del lirc || :
+    # Package removal, not upgrade
+    /bin/systemctl --no-reload disable lirc.service > /dev/null 2>&1 || :
+    /bin/systemctl stop lirc.service > /dev/null 2>&1 || :
+    /bin/systemctl --no-reload disable lircmd.service > /dev/null 2>&1 || :
+    /bin/systemctl stop lircmd.service > /dev/null 2>&1 || :
+fi
+
+%postun
+/bin/systemctl daemon-reload >/dev/null 2>&1 || :
+if [ $1 -ge 1 ] ; then
+    # Package upgrade, not uninstall
+    /bin/systemctl try-restart lirc.service >/dev/null 2>&1 || :
+    /bin/systemctl try-restart lircmd.service >/dev/null 2>&1 || :
 fi
 
+
 %postun libs -p /sbin/ldconfig
 
 
+%triggerun -- lirc < 0.9.0-9
+# Save the current service runlevel info
+# User must manually run systemd-sysv-convert --apply lirc
+# to migrate them to systemd targets
+/usr/bin/systemd-sysv-convert --save lirc >/dev/null 2>&1 ||:
+
+# Run these because the SysV package being removed won't do them
+/sbin/chkconfig --del lirc >/dev/null 2>&1 || :
+/bin/systemctl try-restart lirc.service >/dev/null 2>&1 || :
+
+
+
 %files
 %defattr(-,root,root,-)
 %doc ANNOUNCE AUTHORS ChangeLog COPYING NEWS README TODO
 %config(noreplace) %{_sysconfdir}/lirc/lirc*d.conf
 %config(noreplace) %{_sysconfdir}/sysconfig/lirc
 %config(noreplace) %{_sysconfdir}/tmpfiles.d/lirc.conf
-%{_initrddir}/lirc
+%{_unitdir}/lirc*
 %{_bindir}/*ir*
 %{_bindir}/*mode2
 %{_sbindir}/lirc*d
@@ -307,6 +334,9 @@ fi
 
 
 %changelog
+* Thu Apr 19 2012 Jon Ciesla <limburgher@gmail.com> - 0.9.0-9
+- Migrate to systemd, BZ 789760.
+
 * Fri Jan 13 2012 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0.9.0-8
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild
 
diff --git a/lircmd.service b/lircmd.service
new file mode 100644
index 0000000..8059702
--- /dev/null
+++ b/lircmd.service
@@ -0,0 +1,11 @@
+[Unit]
+Description=LIRC Infrared Mouse Event Signal Decoder
+Requires=lirc.service
+After=network.target lirc.service
+
+[Service]
+Type=forking
+ExecStart=/usr/sbin/lircmd 
+
+[Install]
+WantedBy=multi-user.target

From 2c9fc67210668c0b846d019c35d0b58bb1481aa1 Mon Sep 17 00:00:00 2001
From: Dennis Gilmore <dennis@ausil.us>
Date: Thu, 19 Jul 2012 16:58:02 -0500
Subject: [PATCH 107/204] - Rebuilt for
 https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild

---
 lirc.spec | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/lirc.spec b/lirc.spec
index 4eb683d..ff69211 100644
--- a/lirc.spec
+++ b/lirc.spec
@@ -24,7 +24,7 @@
 Name:           lirc
 Version:        0.9.0
 %if 0%{?released}
-Release:        9%{?dist}
+Release:        10%{?dist}
 %else
 Release:        0.1.%{pre}%{?dist}
 %endif
@@ -334,6 +334,9 @@ fi
 
 
 %changelog
+* Thu Jul 19 2012 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0.9.0-10
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild
+
 * Thu Apr 19 2012 Jon Ciesla <limburgher@gmail.com> - 0.9.0-9
 - Migrate to systemd, BZ 789760.
 

From 5e113c1ced3caa8b42eca6324017f33ff1570ca1 Mon Sep 17 00:00:00 2001
From: Dennis Gilmore <dennis@ausil.us>
Date: Wed, 13 Feb 2013 23:42:52 -0600
Subject: [PATCH 108/204] - Rebuilt for
 https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild

---
 lirc.spec | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/lirc.spec b/lirc.spec
index ff69211..f697c82 100644
--- a/lirc.spec
+++ b/lirc.spec
@@ -24,9 +24,9 @@
 Name:           lirc
 Version:        0.9.0
 %if 0%{?released}
-Release:        10%{?dist}
+Release:        11%{?dist}
 %else
-Release:        0.1.%{pre}%{?dist}
+Release:        0.2.%{pre}%{?dist}
 %endif
 Summary:        The Linux Infrared Remote Control package
 
@@ -334,6 +334,9 @@ fi
 
 
 %changelog
+* Thu Feb 14 2013 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0.9.0-11
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild
+
 * Thu Jul 19 2012 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0.9.0-10
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild
 

From fb1d3b341db98c73de7562789fd7c55512198d01 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Petr=20P=C3=ADsa=C5=99?= <ppisar@redhat.com>
Date: Wed, 17 Jul 2013 22:42:59 +0200
Subject: [PATCH 109/204] Perl 5.18 rebuild

---
 lirc.spec | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/lirc.spec b/lirc.spec
index f697c82..78a4d66 100644
--- a/lirc.spec
+++ b/lirc.spec
@@ -24,9 +24,9 @@
 Name:           lirc
 Version:        0.9.0
 %if 0%{?released}
-Release:        11%{?dist}
+Release:        12%{?dist}
 %else
-Release:        0.2.%{pre}%{?dist}
+Release:        0.3.%{pre}%{?dist}
 %endif
 Summary:        The Linux Infrared Remote Control package
 
@@ -334,6 +334,9 @@ fi
 
 
 %changelog
+* Wed Jul 17 2013 Petr Pisar <ppisar@redhat.com> - 0.9.0-12
+- Perl 5.18 rebuild
+
 * Thu Feb 14 2013 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0.9.0-11
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild
 

From 04b95fae5a9137ad5c2cf58c2bbf6437740672d3 Mon Sep 17 00:00:00 2001
From: Dennis Gilmore <dennis@ausil.us>
Date: Sat, 3 Aug 2013 02:52:52 -0500
Subject: [PATCH 110/204] - Rebuilt for
 https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild

---
 lirc.spec | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/lirc.spec b/lirc.spec
index 78a4d66..73786a2 100644
--- a/lirc.spec
+++ b/lirc.spec
@@ -24,9 +24,9 @@
 Name:           lirc
 Version:        0.9.0
 %if 0%{?released}
-Release:        12%{?dist}
+Release:        13%{?dist}
 %else
-Release:        0.3.%{pre}%{?dist}
+Release:        0.4.%{pre}%{?dist}
 %endif
 Summary:        The Linux Infrared Remote Control package
 
@@ -334,6 +334,9 @@ fi
 
 
 %changelog
+* Sat Aug 03 2013 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0.9.0-13
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild
+
 * Wed Jul 17 2013 Petr Pisar <ppisar@redhat.com> - 0.9.0-12
 - Perl 5.18 rebuild
 

From 3462c826c9ec9afbb8bbe982d90f0c17ceb708eb Mon Sep 17 00:00:00 2001
From: Alec Leamas <leamas@nowhere.net>
Date: Sat, 12 Oct 2013 11:23:58 +0200
Subject: [PATCH 111/204] Updating to release 15

- Actually use sysconfig files (881976)
- Modify lirc.service to not fork.
- Add support for iguanaIR driver (#954146).
- Add hardened build flag (955144).
- Use actual systemd macros (850191).
- Clean up some nowadays not used directives.
- Run autoreconf by default (926082).
- Cleanup some obsoleted autotools usage, two new patches.
- Deactivate other decoders on start (923978).
- Filter away docdir dependencies.
- Remove obsolete F8 upgrade Obsoletes: (sic!).
- Fix inconsistent/duplicate /usr/share/lirc in %%files.
- Add %%doc (notably COPYING) to remotes subpackage.
- Claim /etc/lirc.
- Update to latest upstream (10 patches).
- Use /var and /etc instead of %%{_sysconfdir} and %%{localstatedir}.
- Removed obsolete code to move config files to /etc/lirc in %%post.
- Renamed main systemd service: lirc.service -> lircd.service.
- Added socket activation support.
- Don't claim temporary files in /run/lirc, they are just transient.
- Initiate lircd.conf, lircmd.conf from external template.
- Bumping release, 14 is published.
---
 0001-configure-ac-revert-to-git-branch.patch  |  26 ++
 ...-lirc-0.9.0-libusb-config-is-no-more.patch |  58 ++++
 0004-Set-device-to-lirc0.patch                |  12 +
 ...-Make-lirc_wpc8769l-functional-again.patch |  89 ++++++
 ...ource-busy-error-from-bunk-lirc_open.patch |  60 ++++
 ...ger-config-files-in-write_socket-bet.patch |  40 +++
 ...-buffer-alloc-to-work-with-new-kfifo.patch |  31 ++
 ...busb-config-any-longer-use-pkg-confi.patch |  60 ++++
 ...-some-clang-warnings-courtesy-of-nox.patch |  89 ++++++
 ...pace-use-dev-lirc0-as-default-device.patch |  34 ++
 0014-lirc-make-chardev-nonseekable.patch      |  41 +++
 ...-lirc_dev-fixes-in-lirc_dev_fop_read.patch |  99 ++++++
 ...lirc_dev-add-some-__user-annotations.patch |  76 +++++
 ...irc_dev-check-kobject_set_name-resul.patch |  43 +++
 0018-Start-lirc-0.9.1-git.patch               |  91 ++++++
 0100-configure-ac-revert-to-git-branch.patch  |  26 ++
 0101-Stripping-some-eol-whitespace.patch      | 182 +++++++++++
 0102-Update-autotools-config-files.patch      | 114 +++++++
 ...eneric-fixed-font-instead-of-Courier.patch |  28 ++
 ...dd-systemd-socket-activation-support.patch | 180 +++++++++++
 0105-Update-COPYING-to-latest-version.patch   | 115 +++++++
 0105-configure-ac-back-to-0.9.0.patch         |  27 ++
 README.fedora                                 |  18 ++
 TODO                                          |   7 +
 lirc.conf                                     |   2 +
 lirc.spec                                     | 296 +++++++++---------
 lirc.sysconfig                                |  13 +-
 lircd.service                                 |  13 +
 lircd.socket                                  |   6 +
 lircmd.service                                |   5 +-
 30 files changed, 1725 insertions(+), 156 deletions(-)
 create mode 100644 0001-configure-ac-revert-to-git-branch.patch
 create mode 100644 0001-lirc-0.9.0-libusb-config-is-no-more.patch
 create mode 100644 0004-Set-device-to-lirc0.patch
 create mode 100644 0007-Make-lirc_wpc8769l-functional-again.patch
 create mode 100644 0008-lirc_sir-fix-resource-busy-error-from-bunk-lirc_open.patch
 create mode 100644 0009-lircd-handle-larger-config-files-in-write_socket-bet.patch
 create mode 100644 0010-lirc_atiusb-fix-buffer-alloc-to-work-with-new-kfifo.patch
 create mode 100644 0011-libusb-has-no-libusb-config-any-longer-use-pkg-confi.patch
 create mode 100644 0012-Silence-some-clang-warnings-courtesy-of-nox.patch
 create mode 100644 0013-userspace-use-dev-lirc0-as-default-device.patch
 create mode 100644 0014-lirc-make-chardev-nonseekable.patch
 create mode 100644 0015-media-lirc_dev-fixes-in-lirc_dev_fop_read.patch
 create mode 100644 0016-media-lirc_dev-add-some-__user-annotations.patch
 create mode 100644 0017-media-media-rc-lirc_dev-check-kobject_set_name-resul.patch
 create mode 100644 0018-Start-lirc-0.9.1-git.patch
 create mode 100644 0100-configure-ac-revert-to-git-branch.patch
 create mode 100644 0101-Stripping-some-eol-whitespace.patch
 create mode 100644 0102-Update-autotools-config-files.patch
 create mode 100644 0103-xmode2.c-Use-generic-fixed-font-instead-of-Courier.patch
 create mode 100644 0104-Add-systemd-socket-activation-support.patch
 create mode 100644 0105-Update-COPYING-to-latest-version.patch
 create mode 100644 0105-configure-ac-back-to-0.9.0.patch
 create mode 100644 README.fedora
 create mode 100644 TODO
 create mode 100644 lirc.conf
 create mode 100644 lircd.service
 create mode 100644 lircd.socket

diff --git a/0001-configure-ac-revert-to-git-branch.patch b/0001-configure-ac-revert-to-git-branch.patch
new file mode 100644
index 0000000..d3ffd98
--- /dev/null
+++ b/0001-configure-ac-revert-to-git-branch.patch
@@ -0,0 +1,26 @@
+From 7635b1e321bf2f98468ae4f2233e28e3d78505cb Mon Sep 17 00:00:00 2001
+From: Alec Leamas <leamas@nowhere.net>
+Date: Fri, 11 Oct 2013 05:50:12 +0200
+Subject: [PATCH] configure-ac: revert to git branch
+
+rebasing for further changes to match upstream merge request.
+---
+ configure.ac | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/configure.ac b/configure.ac
+index 5a9b31d..9efe2f9 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -7,7 +7,7 @@ AC_INIT
+ AC_CONFIG_SRCDIR([daemons/lircd.c])
+ AC_CONFIG_MACRO_DIR([m4])
+ 
+-AM_INIT_AUTOMAKE(lirc, 0.9.0)
++AM_INIT_AUTOMAKE(lirc, 0.9.0-git)
+ AM_CONFIG_HEADER(config.h)
+ 
+ CFLAGS="${CFLAGS--O2 -g -Wall}"
+-- 
+1.8.3.1
+
diff --git a/0001-lirc-0.9.0-libusb-config-is-no-more.patch b/0001-lirc-0.9.0-libusb-config-is-no-more.patch
new file mode 100644
index 0000000..6fa8bd7
--- /dev/null
+++ b/0001-lirc-0.9.0-libusb-config-is-no-more.patch
@@ -0,0 +1,58 @@
+From 7e07ae592ef6bfdc7c4a200809a0c9c9a0b41646 Mon Sep 17 00:00:00 2001
+From: Alec Leamas <alec@tests.notat.diaspora.com>
+Date: Tue, 8 Oct 2013 14:57:08 +0200
+Subject: [PATCH 1/3] lirc-0.9.0: libusb config is no more
+
+---
+ lirc-0.9.0/configure.ac | 13 ++++++-------
+ 1 file changed, 6 insertions(+), 7 deletions(-)
+
+diff --git a/lirc-0.9.0/configure.ac b/lirc-0.9.0/configure.ac
+index 052908b..20e37a4 100644
+--- a/lirc-0.9.0/configure.ac
++++ b/lirc-0.9.0/configure.ac
+@@ -20,11 +20,11 @@ AC_PROG_MAKE_SET
+ AC_PATH_PROG(mknod, mknod, /bin/mknod)
+ AC_PATH_PROG(mkfifo, mkfifo, /usr/bin/mkfifo)
+ AC_PATH_PROG(depmod, depmod, /sbin/depmod, $PATH:/sbin)
+-AC_PATH_PROG(LIBUSB_CONFIG, libusb-config)
+ AC_PROG_LN_S
+ AC_PROG_LIBTOOL
+ AM_PATH_PYTHON(,, [:])
+ AM_CONDITIONAL([HAVE_PYTHON], [test "$PYTHON" != ""])
++LIBUSB_CONFIG="pkg-config libusb"
+ 
+ dnl Checks for header files.
+ AC_HEADER_STDC
+@@ -310,15 +310,14 @@ AH_TEMPLATE([SYSCONFDIR],
+ AH_TEMPLATE([USE_SYSLOG],
+ 	[define if you want to log to syslog instead of logfile])
+ 
+-if test -n "${LIBUSB_CONFIG}"; then
+-  AC_DEFINE(HAVE_LIBUSB)
+-  possible_drivers="${possible_drivers} (atilibusb) (awlibusb) (dfclibusb) (commandir) (srm7500libusb)" 
+-fi
+-
+ AC_CHECK_LIB(caraca_client, caraca_init,
+   AC_DEFINE(HAVE_LIBCARACA)
+   possible_drivers="${possible_drivers} (caraca)"
+ )
++AC_CHECK_HEADER(usb.h,
++  AC_DEFINE(HAVE_LIBUSB)
++  possible_drivers="${possible_drivers} (atilibusb) (awlibusb) (dfclibusb) (commandir) (srm7500libusb)" 
++)
+ AC_CHECK_HEADER(ftdi.h,
+   AC_DEFINE(HAVE_FTDI)
+   possible_drivers="${possible_drivers} (ftdi)"
+@@ -1449,7 +1448,7 @@ Get it at:
+ Or install these packages from your distro:
+ 
+    libusb
+-   libusb-dev
++   libusb-devel
+ 
+ ])
+     ;;
+-- 
+1.8.3.1
+
diff --git a/0004-Set-device-to-lirc0.patch b/0004-Set-device-to-lirc0.patch
new file mode 100644
index 0000000..2038bcd
--- /dev/null
+++ b/0004-Set-device-to-lirc0.patch
@@ -0,0 +1,12 @@
+--- a/configure.ac
++++ b/configure.ac
+@@ -1708,7 +1708,9 @@
+
+ AH_TOP([
+ /* device file names - beneath DEVDIR (default /dev) */
+-#define DEV_LIRC	"lirc"
++#define DEV_LIRC	"lirc0"
++
++/* daemon socket file names - beneath $varrundir (default /var/run/lirc) */
+ #define DEV_LIRCD	"lircd"
+ #define DEV_LIRCM	"lircm"
diff --git a/0007-Make-lirc_wpc8769l-functional-again.patch b/0007-Make-lirc_wpc8769l-functional-again.patch
new file mode 100644
index 0000000..ea1876e
--- /dev/null
+++ b/0007-Make-lirc_wpc8769l-functional-again.patch
@@ -0,0 +1,89 @@
+From 413e83bf504fe9a9a177f27742220cfcb184b034 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Juan=20Jes=C3=BAs=20Garc=C3=ADa=20de=20Soria=20Lucena?=
+ <skandalfo@gmail.com>
+Date: Wed, 30 Mar 2011 16:46:35 -0400
+Subject: [PATCH 07/17] Make lirc_wpc8769l functional again
+
+Signed-off-by: Jarod Wilson <jarod@redhat.com>
+---
+ drivers/lirc_wpc8769l/lirc_wpc8769l.c | 28 +++++++++++++++++-----------
+ 1 file changed, 17 insertions(+), 11 deletions(-)
+
+diff --git a/drivers/lirc_wpc8769l/lirc_wpc8769l.c b/drivers/lirc_wpc8769l/lirc_wpc8769l.c
+index f820d11..4d04063 100644
+--- a/drivers/lirc_wpc8769l/lirc_wpc8769l.c
++++ b/drivers/lirc_wpc8769l/lirc_wpc8769l.c
+@@ -816,10 +816,6 @@ static int set_use_inc(void *data)
+ 	/* Reset last timeout value. */
+ 	lastus = 0;
+ 
+-	/* Init the read buffer. */
+-	if (lirc_buffer_init(&rbuf, sizeof(lirc_t), RBUF_LEN) < 0)
+-		return -ENOMEM;
+-
+ 	/* Acquire the IRQ. */
+ 	result = request_irq(irq, irq_handler,
+ 			   IRQF_DISABLED | IRQF_SHARED,
+@@ -863,9 +859,6 @@ static void set_use_dec(void *data)
+ 	/* Free the IRQ. */
+ 	free_irq(irq, THIS_MODULE);
+ 	dprintk("Freed IRQ %d\n", irq);
+-
+-	/* Free the RX buffer. */
+-	lirc_buffer_free(&rbuf);
+ }
+ 
+ static struct lirc_driver driver = {
+@@ -1065,19 +1058,29 @@ static int __init lirc_wpc8769l_module_init(void)
+ 	/* Do load-time checks. */
+ 	wpc8769l_power_up_and_check_if_we_woke_us_up();
+ 
++	/* Init the read buffer. */
++	if (lirc_buffer_init(&rbuf, sizeof(lirc_t), RBUF_LEN) < 0) {
++		rc = -ENOMEM;
++		goto exit_platform_exit;
++	}
++
+ 	/* Configure the driver hooks. */
+ 	driver.features = LIRC_CAN_REC_MODE2;
++	driver.dev = &lirc_wpc8769l_platform_dev->dev;
+ 	driver.minor = lirc_register_driver(&driver);
+ 	if (driver.minor < 0) {
+ 		eprintk("lirc_register_driver failed!\n");
+ 		rc = -EIO;
+-		goto exit_platform_exit;
++		goto exit_release_buffer;
+ 	}
+ 
+ 	iprintk("Driver loaded.\n");
+ 
+ 	return 0; /* Everything OK. */
+ 
++exit_release_buffer:
++	lirc_buffer_free(&rbuf);
++
+ exit_platform_exit:
+ 	lirc_wpc8769l_platform_exit();
+ 
+@@ -1095,12 +1098,15 @@ module_init(lirc_wpc8769l_module_init);
+ 
+ static void __exit lirc_wpc8769l_module_exit(void)
+ {
+-	/* Unregister the platform driver and device. */
+-	lirc_wpc8769l_platform_exit();
+-
+ 	/* Unregister the LIRC driver. */
+ 	lirc_unregister_driver(driver.minor);
+ 
++	/* Free the buffer. */
++	lirc_buffer_free(&rbuf);
++
++	/* Unregister the platform driver and device. */
++	lirc_wpc8769l_platform_exit();
++
+ 	/* Release the second range. */
+ 	if (baseport2)
+ 		release_region(baseport2, WPC8769L_IO_REGION_2_SIZE);
+-- 
+1.8.3.1
+
diff --git a/0008-lirc_sir-fix-resource-busy-error-from-bunk-lirc_open.patch b/0008-lirc_sir-fix-resource-busy-error-from-bunk-lirc_open.patch
new file mode 100644
index 0000000..571bb0b
--- /dev/null
+++ b/0008-lirc_sir-fix-resource-busy-error-from-bunk-lirc_open.patch
@@ -0,0 +1,60 @@
+From be3ec6c75e33b4a175799218b2921be47ad4c842 Mon Sep 17 00:00:00 2001
+From: Jarod Wilson <jarod@redhat.com>
+Date: Thu, 31 Mar 2011 17:44:15 -0400
+Subject: [PATCH 08/17] lirc_sir: fix resource busy error from bunk lirc_open
+
+Signed-off-by: Jarod Wilson <jarod@redhat.com>
+---
+ drivers/lirc_sir/lirc_sir.c | 22 ++--------------------
+ 1 file changed, 2 insertions(+), 20 deletions(-)
+
+diff --git a/drivers/lirc_sir/lirc_sir.c b/drivers/lirc_sir/lirc_sir.c
+index eefe0c9..c397ce0 100644
+--- a/drivers/lirc_sir/lirc_sir.c
++++ b/drivers/lirc_sir/lirc_sir.c
+@@ -203,8 +203,6 @@ static int debug;
+ /* SECTION: Prototypes */
+ 
+ /* Communication with user-space */
+-static int lirc_open(struct inode *inode, struct file *file);
+-static int lirc_close(struct inode *inode, struct file *file);
+ static unsigned int lirc_poll(struct file *file, poll_table *wait);
+ static ssize_t lirc_read(struct file *file, char *buf, size_t count,
+ 		loff_t *ppos);
+@@ -275,22 +273,6 @@ static void safe_udelay(unsigned long usecs)
+ 
+ /* SECTION: Communication with user-space */
+ 
+-static int lirc_open(struct inode *inode, struct file *file)
+-{
+-	spin_lock(&dev_lock);
+-	if (MOD_IN_USE) {
+-		spin_unlock(&dev_lock);
+-		return -EBUSY;
+-	}
+-	spin_unlock(&dev_lock);
+-	return 0;
+-}
+-
+-static int lirc_close(struct inode *inode, struct file *file)
+-{
+-	return 0;
+-}
+-
+ static unsigned int lirc_poll(struct file *file, poll_table *wait)
+ {
+ 	poll_wait(file, &lirc_read_queue, wait);
+@@ -519,8 +501,8 @@ static struct file_operations lirc_fops = {
+ 	.compat_ioctl	= lirc_ioctl,
+ #endif
+ #endif
+-	.open		= lirc_open,
+-	.release	= lirc_close,
++	.open		= lirc_dev_fop_open,
++	.release	= lirc_dev_fop_close,
+ };
+ 
+ static int set_use_inc(void *data)
+-- 
+1.8.3.1
+
diff --git a/0009-lircd-handle-larger-config-files-in-write_socket-bet.patch b/0009-lircd-handle-larger-config-files-in-write_socket-bet.patch
new file mode 100644
index 0000000..8968ac2
--- /dev/null
+++ b/0009-lircd-handle-larger-config-files-in-write_socket-bet.patch
@@ -0,0 +1,40 @@
+From 5efb56bf22a5077db564c766ba7cc37bc269231d Mon Sep 17 00:00:00 2001
+From: Jarod Wilson <jarod@redhat.com>
+Date: Wed, 6 Apr 2011 11:04:12 -0400
+Subject: [PATCH 09/17] lircd: handle larger config files in write_socket
+ better
+
+Pointed out by Michael Zanetti on list, irsend LIST has issues with long
+config files, which didn't exist in maintainer mode, as we were using a
+do while loop to make sure we spit out everything. Just use that loop
+all the time.
+
+Signed-off-by: Jarod Wilson <jarod@redhat.com>
+---
+ daemons/lircd.c | 8 ++------
+ 1 file changed, 2 insertions(+), 6 deletions(-)
+
+diff --git a/daemons/lircd.c b/daemons/lircd.c
+index 6c21a3a..ddcca05 100644
+--- a/daemons/lircd.c
++++ b/daemons/lircd.c
+@@ -231,14 +231,10 @@ inline int write_socket(int fd, const char *buf, int len)
+ 	int done, todo = len;
+ 
+ 	while (todo) {
+-#ifdef SIM_REC
+ 		do {
+ 			done = write(fd, buf, todo);
+-		}
+-		while (done < 0 && errno == EAGAIN);
+-#else
+-		done = write(fd, buf, todo);
+-#endif
++		} while (done < 0 && errno == EAGAIN);
++
+ 		if (done <= 0)
+ 			return (done);
+ 		buf += done;
+-- 
+1.8.3.1
+
diff --git a/0010-lirc_atiusb-fix-buffer-alloc-to-work-with-new-kfifo.patch b/0010-lirc_atiusb-fix-buffer-alloc-to-work-with-new-kfifo.patch
new file mode 100644
index 0000000..cca76bf
--- /dev/null
+++ b/0010-lirc_atiusb-fix-buffer-alloc-to-work-with-new-kfifo.patch
@@ -0,0 +1,31 @@
+From ec3c5660e67c122e2d5eb9cfa838c9709fccf8e0 Mon Sep 17 00:00:00 2001
+From: Jason Martin <publicmsu@gmail.com>
+Date: Fri, 3 Jun 2011 00:12:51 -0400
+Subject: [PATCH 10/17] lirc_atiusb: fix buffer alloc to work with new kfifo
+
+I came across posts with regards to lirc_atiusb and its compatibility
+with newer kernels, and their use of kfifo.I spent a little bit of time
+this evening, and was able to correct the issues with the driver, and
+now have a functioning lirc_atiusb device under the 2.6.38 kernel.
+
+Signed-off-by: Jarod Wilson <jarod@redhat.com>
+---
+ drivers/lirc_atiusb/lirc_atiusb.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/drivers/lirc_atiusb/lirc_atiusb.c b/drivers/lirc_atiusb/lirc_atiusb.c
+index 52080de..bf2b631 100644
+--- a/drivers/lirc_atiusb/lirc_atiusb.c
++++ b/drivers/lirc_atiusb/lirc_atiusb.c
+@@ -1048,7 +1048,7 @@ static struct atirf_dev *new_irctl(struct usb_interface *intf)
+ 		goto new_irctl_failure_check;
+ 	}
+ 
+-	if (lirc_buffer_init(driver->rbuf, dclen, 1)) {
++	if (lirc_buffer_init(driver->rbuf, dclen, 2)) {
+ 		mem_failure = 4;
+ 		goto new_irctl_failure_check;
+ 	}
+-- 
+1.8.3.1
+
diff --git a/0011-libusb-has-no-libusb-config-any-longer-use-pkg-confi.patch b/0011-libusb-has-no-libusb-config-any-longer-use-pkg-confi.patch
new file mode 100644
index 0000000..7e07831
--- /dev/null
+++ b/0011-libusb-has-no-libusb-config-any-longer-use-pkg-confi.patch
@@ -0,0 +1,60 @@
+From 02c5c3f2181381a44e03cdfb8962bcbf67a8139a Mon Sep 17 00:00:00 2001
+From: Jarod Wilson <jarod@redhat.com>
+Date: Tue, 7 Jun 2011 00:14:20 -0400
+Subject: [PATCH 11/17] libusb has no libusb-config any longer, use pkg-config
+ by default
+
+Signed-off-by: Jarod Wilson <jarod@redhat.com>
+---
+ configure.ac | 13 ++++++-------
+ 1 file changed, 6 insertions(+), 7 deletions(-)
+
+diff --git a/configure.ac b/configure.ac
+index 6c07e0d..1a3347e 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -20,11 +20,11 @@ AC_PROG_MAKE_SET
+ AC_PATH_PROG(mknod, mknod, /bin/mknod)
+ AC_PATH_PROG(mkfifo, mkfifo, /usr/bin/mkfifo)
+ AC_PATH_PROG(depmod, depmod, /sbin/depmod, $PATH:/sbin)
+-AC_PATH_PROG(LIBUSB_CONFIG, libusb-config)
+ AC_PROG_LN_S
+ AC_PROG_LIBTOOL
+ AM_PATH_PYTHON(,, [:])
+ AM_CONDITIONAL([HAVE_PYTHON], [test "$PYTHON" != ""])
++LIBUSB_CONFIG="pkg-config libusb"
+ 
+ dnl Checks for header files.
+ AC_HEADER_STDC
+@@ -310,15 +310,14 @@ AH_TEMPLATE([SYSCONFDIR],
+ AH_TEMPLATE([USE_SYSLOG],
+ 	[define if you want to log to syslog instead of logfile])
+ 
+-if test -n "${LIBUSB_CONFIG}"; then
+-  AC_DEFINE(HAVE_LIBUSB)
+-  possible_drivers="${possible_drivers} (atilibusb) (awlibusb) (dfclibusb) (commandir) (srm7500libusb)" 
+-fi
+-
+ AC_CHECK_LIB(caraca_client, caraca_init,
+   AC_DEFINE(HAVE_LIBCARACA)
+   possible_drivers="${possible_drivers} (caraca)"
+ )
++AC_CHECK_HEADER(usb.h,
++  AC_DEFINE(HAVE_LIBUSB)
++  possible_drivers="${possible_drivers} (atilibusb) (awlibusb) (dfclibusb) (commandir) (srm7500libusb)" 
++)
+ AC_CHECK_HEADER(ftdi.h,
+   AC_DEFINE(HAVE_FTDI)
+   possible_drivers="${possible_drivers} (ftdi)"
+@@ -1449,7 +1448,7 @@ Get it at:
+ Or install these packages from your distro:
+ 
+    libusb
+-   libusb-dev
++   libusb-devel
+ 
+ ])
+     ;;
+-- 
+1.8.3.1
+
diff --git a/0012-Silence-some-clang-warnings-courtesy-of-nox.patch b/0012-Silence-some-clang-warnings-courtesy-of-nox.patch
new file mode 100644
index 0000000..a8d910b
--- /dev/null
+++ b/0012-Silence-some-clang-warnings-courtesy-of-nox.patch
@@ -0,0 +1,89 @@
+From 9592bb4a2bccedf5ef205cf93c4d17f5b27edf5c Mon Sep 17 00:00:00 2001
+From: Jarod Wilson <jarod@redhat.com>
+Date: Wed, 29 Jun 2011 17:31:28 -0400
+Subject: [PATCH 12/17] Silence some clang warnings, courtesy of nox
+
+Signed-off-by: Jarod Wilson <jarod@redhat.com>
+---
+ daemons/dump_config.c | 12 ++++++------
+ daemons/ir_remote.c   |  3 ++-
+ daemons/lircd.c       |  4 ++--
+ 3 files changed, 10 insertions(+), 9 deletions(-)
+
+diff --git a/daemons/dump_config.c b/daemons/dump_config.c
+index a83c27e..56fb183 100644
+--- a/daemons/dump_config.c
++++ b/daemons/dump_config.c
+@@ -120,11 +120,11 @@ void fprint_remote_head(FILE * f, struct ir_remote *rem)
+ 	if (!is_raw(rem)) {
+ 		if (rem->pre_data_bits > 0) {
+ 			fprintf(f, "  pre_data_bits   %d\n", rem->pre_data_bits);
+-			fprintf(f, "  pre_data       0x%llX\n", rem->pre_data);
++			fprintf(f, "  pre_data       0x%llX\n", (unsigned long long)rem->pre_data);
+ 		}
+ 		if (rem->post_data_bits > 0) {
+ 			fprintf(f, "  post_data_bits  %d\n", rem->post_data_bits);
+-			fprintf(f, "  post_data      0x%llX\n", rem->post_data);
++			fprintf(f, "  post_data      0x%llX\n", (unsigned long long)rem->post_data);
+ 		}
+ 		if (rem->pre_p != 0 && rem->pre_s != 0) {
+ 			fprintf(f, "  pre         %5u %5u\n", (__u32) rem->pre_p, (__u32) rem->pre_s);
+@@ -151,15 +151,15 @@ void fprint_remote_head(FILE * f, struct ir_remote *rem)
+ 		if (rem->min_code_repeat > 0) {
+ 			fprintf(f, "  min_code_repeat %d\n", rem->min_code_repeat);
+ 		}
+-		fprintf(f, "  toggle_bit_mask 0x%llX\n", rem->toggle_bit_mask);
++		fprintf(f, "  toggle_bit_mask 0x%llX\n", (unsigned long long)rem->toggle_bit_mask);
+ 		if (has_toggle_mask(rem)) {
+-			fprintf(f, "  toggle_mask    0x%llX\n", rem->toggle_mask);
++			fprintf(f, "  toggle_mask    0x%llX\n", (unsigned long long)rem->toggle_mask);
+ 		}
+ 		if (rem->rc6_mask != 0) {
+-			fprintf(f, "  rc6_mask    0x%llX\n", rem->rc6_mask);
++			fprintf(f, "  rc6_mask    0x%llX\n", (unsigned long long)rem->rc6_mask);
+ 		}
+ 		if (has_ignore_mask(rem)) {
+-			fprintf(f, "  ignore_mask 0x%llX\n", rem->ignore_mask);
++			fprintf(f, "  ignore_mask 0x%llX\n", (unsigned long long)rem->ignore_mask);
+ 		}
+ 		if (is_serial(rem)) {
+ 			fprintf(f, "  baud            %d\n", rem->baud);
+diff --git a/daemons/ir_remote.c b/daemons/ir_remote.c
+index 3e9e0f6..e5f60f9 100644
+--- a/daemons/ir_remote.c
++++ b/daemons/ir_remote.c
+@@ -490,7 +490,8 @@ int write_message(char *buffer, size_t size, const char *remote_name, const char
+ {
+ 	int len;
+ 
+-	len = snprintf(buffer, size, "%016llx %02x %s%s %s\n", code, reps, button_name, button_suffix, remote_name);
++	len = snprintf(buffer, size, "%016llx %02x %s%s %s\n",
++		(unsigned long long)code, reps, button_name, button_suffix, remote_name);
+ 
+ 	return len;
+ }
+diff --git a/daemons/lircd.c b/daemons/lircd.c
+index ddcca05..8ace7af 100644
+--- a/daemons/lircd.c
++++ b/daemons/lircd.c
+@@ -1314,7 +1314,7 @@ int send_remote(int fd, char *message, struct ir_remote *remote)
+ 
+ 	codes = remote->codes;
+ 	while (codes->name != NULL) {
+-		len = snprintf(buffer, PACKET_SIZE, "%016llx %s\n", codes->code, codes->name);
++		len = snprintf(buffer, PACKET_SIZE, "%016llx %s\n", (unsigned long long)codes->code, codes->name);
+ 		if (len >= PACKET_SIZE + 1) {
+ 			len = sprintf(buffer, "code_too_long\n");
+ 		}
+@@ -1334,7 +1334,7 @@ int send_name(int fd, char *message, struct ir_ncode *code)
+ 	    (write_socket_len(fd, protocol_string[P_BEGIN]) && write_socket_len(fd, message)
+ 	     && write_socket_len(fd, protocol_string[P_SUCCESS]) && write_socket_len(fd, protocol_string[P_DATA])))
+ 		return (0);
+-	len = snprintf(buffer, PACKET_SIZE, "1\n%016llx %s\n", code->code, code->name);
++	len = snprintf(buffer, PACKET_SIZE, "1\n%016llx %s\n", (unsigned long long)code->code, code->name);
+ 	if (len >= PACKET_SIZE + 1) {
+ 		len = sprintf(buffer, "1\ncode_too_long\n");
+ 	}
+-- 
+1.8.3.1
+
diff --git a/0013-userspace-use-dev-lirc0-as-default-device.patch b/0013-userspace-use-dev-lirc0-as-default-device.patch
new file mode 100644
index 0000000..beed5a0
--- /dev/null
+++ b/0013-userspace-use-dev-lirc0-as-default-device.patch
@@ -0,0 +1,34 @@
+From d0175df5cd2ac4a261332ea21a67179f2c85072c Mon Sep 17 00:00:00 2001
+From: Jarod Wilson <jarod@redhat.com>
+Date: Fri, 2 Dec 2011 14:10:21 -0500
+Subject: [PATCH 13/17] userspace: use /dev/lirc0 as default device
+
+The lirc_dev kernel driver results in a first lirc chardev of
+/dev/lirc0, not /dev/lirc, so lets default to that now. The old way is
+from pre-udev days or something, I think... While we're at it, update
+the adjacent comment about the daemon socket locations to reflect
+current reality too.
+
+Signed-off-by: Jarod Wilson <jarod@redhat.com>
+---
+ configure.ac | 4 +++-
+ 1 file changed, 3 insertions(+), 1 deletion(-)
+
+diff --git a/configure.ac b/configure.ac
+index 1a3347e..ff4780f 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -1708,7 +1708,9 @@ AC_DEFINE_UNQUOTED(LIRC_SYSLOG, $facility)
+ 
+ AH_TOP([
+ /* device file names - beneath DEVDIR (default /dev) */
+-#define DEV_LIRC	"lirc"
++#define DEV_LIRC	"lirc0"
++
++/* daemon socket file names - beneath $varrundir (default /var/run/lirc) */
+ #define DEV_LIRCD	"lircd"
+ #define DEV_LIRCM	"lircm"
+ 
+-- 
+1.8.3.1
+
diff --git a/0014-lirc-make-chardev-nonseekable.patch b/0014-lirc-make-chardev-nonseekable.patch
new file mode 100644
index 0000000..316d61f
--- /dev/null
+++ b/0014-lirc-make-chardev-nonseekable.patch
@@ -0,0 +1,41 @@
+From 441e4879e694b18ca10a7c107e81362790c7bd25 Mon Sep 17 00:00:00 2001
+From: Jarod Wilson <jarod@redhat.com>
+Date: Tue, 7 Feb 2012 10:29:58 -0500
+Subject: [PATCH 14/17] lirc: make chardev nonseekable
+
+Merge change from upstream kernel
+
+commit d9d2e9d5c9eead1f73f92f5fc03424dab90b6c95
+Author: Arnd Bergmann <arnd@arndb.de>
+Date:   Sun Aug 15 18:51:56 2010 +0200
+
+    lirc: make chardev nonseekable
+
+    There does not seem to be a need for lirc to
+    allow seeking on the file descriptor, so let's
+    just disallow this before users start relying
+    on it.
+
+    Signed-off-by: Arnd Bergmann <arnd@arndb.de>
+
+Signed-off-by: Jarod Wilson <jarod@redhat.com>
+---
+ drivers/lirc_dev/lirc_dev.c | 2 ++
+ 1 file changed, 2 insertions(+)
+
+diff --git a/drivers/lirc_dev/lirc_dev.c b/drivers/lirc_dev/lirc_dev.c
+index d4a5114..95ba25e 100644
+--- a/drivers/lirc_dev/lirc_dev.c
++++ b/drivers/lirc_dev/lirc_dev.c
+@@ -583,6 +583,8 @@ error:
+ 
+ 	mutex_unlock(&lirc_dev_lock);
+ 
++	nonseekable_open(inode, file);
++
+ 	return retval;
+ }
+ EXPORT_SYMBOL(lirc_dev_fop_open);
+-- 
+1.8.3.1
+
diff --git a/0015-media-lirc_dev-fixes-in-lirc_dev_fop_read.patch b/0015-media-lirc_dev-fixes-in-lirc_dev_fop_read.patch
new file mode 100644
index 0000000..bed64bb
--- /dev/null
+++ b/0015-media-lirc_dev-fixes-in-lirc_dev_fop_read.patch
@@ -0,0 +1,99 @@
+From 887e6314eff34eb9a2e518bb96b65b82cd2f5e68 Mon Sep 17 00:00:00 2001
+From: Jarod Wilson <jarod@redhat.com>
+Date: Tue, 7 Feb 2012 10:48:50 -0500
+Subject: [PATCH 15/17] [media] lirc_dev: fixes in lirc_dev_fop_read()
+
+Backport from upstream kernel:
+
+commit 250f7a5f62a08985af5cf7728ae7ba9edbfdc0a9
+Author: Dan Carpenter <error27@gmail.com>
+Date:   Wed Nov 17 02:20:15 2010 -0300
+
+    [media] lirc_dev: fixes in lirc_dev_fop_read()
+
+    This makes several changes but they're in one function and sort of
+    related:
+
+    "buf" was leaked on error.  The leak if we try to read an invalid
+    length is the main concern because it could be triggered over and
+    over.
+
+    If the copy_to_user() failed, then the original code returned the
+    number of bytes remaining.  read() is supposed to be the opposite way,
+    where we return the number of bytes copied.  I changed it to just return
+    -EFAULT on errors.
+
+    Also I changed the debug output from "-EFAULT" to just "<fail>" because
+    it isn't -EFAULT necessarily.  And since we go though that path if the
+    length is invalid now, there was another debug print that I removed.
+
+    Signed-off-by: Dan Carpenter <error27@gmail.com>
+    Reviewed-by: Jarod Wilson <jarod@redhat.com>
+    Acked-by: Jarod Wilson <jarod@redhat.com>
+    Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
+
+Signed-off-by: Jarod Wilson <jarod@redhat.com>
+---
+ drivers/lirc_dev/lirc_dev.c | 24 ++++++++++++++----------
+ 1 file changed, 14 insertions(+), 10 deletions(-)
+
+diff --git a/drivers/lirc_dev/lirc_dev.c b/drivers/lirc_dev/lirc_dev.c
+index 95ba25e..96c9148 100644
+--- a/drivers/lirc_dev/lirc_dev.c
++++ b/drivers/lirc_dev/lirc_dev.c
+@@ -769,18 +769,18 @@ ssize_t lirc_dev_fop_read(struct file *file,
+ 	if (!buf)
+ 		return -ENOMEM;
+ 
+-	if (mutex_lock_interruptible(&ir->irctl_lock))
+-		return -ERESTARTSYS;
++	if (mutex_lock_interruptible(&ir->irctl_lock)) {
++		ret = -ERESTARTSYS;
++		goto out_unlocked;
++	}
+ 	if (!ir->attached) {
+-		mutex_unlock(&ir->irctl_lock);
+-		return -ENODEV;
++		ret = -ENODEV;
++		goto out_locked;
+ 	}
+ 
+ 	if (length % ir->chunk_size) {
+-		dprintk(LOGHEAD "read result = -EINVAL\n",
+-			ir->d.name, ir->d.minor);
+-		mutex_unlock(&ir->irctl_lock);
+-		return -EINVAL;
++		ret = -EINVAL;
++		goto out_locked;
+ 	}
+ 
+ 	/*
+@@ -831,19 +831,23 @@ ssize_t lirc_dev_fop_read(struct file *file,
+ 			lirc_buffer_read(ir->buf, buf);
+ 			ret = copy_to_user((void *)buffer+written, buf,
+ 					   ir->buf->chunk_size);
+-			written += ir->buf->chunk_size;
++			if (!ret)
++				written += ir->buf->chunk_size;
++			else
++				ret = -EFAULT;
+ 		}
+ 	}
+ 
+ 	remove_wait_queue(&ir->buf->wait_poll, &wait);
+ 	set_current_state(TASK_RUNNING);
+ 
++out_locked:
+ 	mutex_unlock(&ir->irctl_lock);
+ 
+ out_unlocked:
+ 	kfree(buf);
+ 	dprintk(LOGHEAD "read result = %s (%d)\n",
+-		ir->d.name, ir->d.minor, ret ? "-EFAULT" : "OK", ret);
++		ir->d.name, ir->d.minor, ret ? "<fail>" : "OK", ret);
+ 
+ 	return ret ? ret : written;
+ }
+-- 
+1.8.3.1
+
diff --git a/0016-media-lirc_dev-add-some-__user-annotations.patch b/0016-media-lirc_dev-add-some-__user-annotations.patch
new file mode 100644
index 0000000..08206ea
--- /dev/null
+++ b/0016-media-lirc_dev-add-some-__user-annotations.patch
@@ -0,0 +1,76 @@
+From 6a17924477f64028cc5ff5b51047f3a9fd962a5f Mon Sep 17 00:00:00 2001
+From: Jarod Wilson <jarod@redhat.com>
+Date: Tue, 7 Feb 2012 11:46:37 -0500
+Subject: [PATCH 16/17] [media] lirc_dev: add some __user annotations
+
+Backport from upstream kernel:
+
+commit 0e835087dfe7db19f1f072046f5e116d4ec6662b
+Author: Dan Carpenter <error27@gmail.com>
+Date:   Wed Nov 17 02:13:39 2010 -0300
+
+    [media] lirc_dev: add some __user annotations
+
+    Sparse complains because there are no __user annotations.
+
+    drivers/media/rc/lirc_dev.c:156:27: warning:
+        incorrect type in initializer (incompatible argument 2 (different address spaces))
+    drivers/media/rc/lirc_dev.c:156:27:    expected int ( *read )( ... )
+    drivers/media/rc/lirc_dev.c:156:27:    got int ( extern [toplevel] *<noident> )( ... )
+
+    Signed-off-by: Dan Carpenter <error27@gmail.com>
+    Acked-by: Jarod Wilson <jarod@redhat.com>
+    Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
+
+Signed-off-by: Jarod Wilson <jarod@redhat.com>
+---
+ drivers/lirc_dev/lirc_dev.c | 8 +++-----
+ drivers/lirc_dev/lirc_dev.h | 6 +++---
+ 2 files changed, 6 insertions(+), 8 deletions(-)
+
+diff --git a/drivers/lirc_dev/lirc_dev.c b/drivers/lirc_dev/lirc_dev.c
+index 96c9148..5b25c5f 100644
+--- a/drivers/lirc_dev/lirc_dev.c
++++ b/drivers/lirc_dev/lirc_dev.c
+@@ -748,10 +748,8 @@ long lirc_dev_fop_ioctl(struct file *file, unsigned int cmd, unsigned long arg)
+ }
+ EXPORT_SYMBOL(lirc_dev_fop_ioctl);
+ 
+-ssize_t lirc_dev_fop_read(struct file *file,
+-			  char *buffer,
+-			  size_t length,
+-			  loff_t *ppos)
++ssize_t lirc_dev_fop_read(struct file *file, char __user *buffer,
++			  size_t length, loff_t *ppos)
+ {
+ 	struct irctl *ir = irctls[iminor(file->f_dentry->d_inode)];
+ 	unsigned char *buf;
+@@ -870,7 +868,7 @@ void *lirc_get_pdata(struct file *file)
+ EXPORT_SYMBOL(lirc_get_pdata);
+ 
+ 
+-ssize_t lirc_dev_fop_write(struct file *file, const char *buffer,
++ssize_t lirc_dev_fop_write(struct file *file, const char __user *buffer,
+ 			   size_t length, loff_t *ppos)
+ {
+ 	struct irctl *ir = irctls[iminor(file->f_dentry->d_inode)];
+diff --git a/drivers/lirc_dev/lirc_dev.h b/drivers/lirc_dev/lirc_dev.h
+index ca641f8..34056aa 100644
+--- a/drivers/lirc_dev/lirc_dev.h
++++ b/drivers/lirc_dev/lirc_dev.h
+@@ -257,9 +257,9 @@ int lirc_dev_fop_ioctl(struct inode *inode, struct file *file,
+ #else
+ long lirc_dev_fop_ioctl(struct file *file, unsigned int cmd, unsigned long arg);
+ #endif
+-ssize_t lirc_dev_fop_read(struct file *file, char *buffer, size_t length,
++ssize_t lirc_dev_fop_read(struct file *file, char __user *buffer, size_t length,
+ 			  loff_t *ppos);
+-ssize_t lirc_dev_fop_write(struct file *file, const char *buffer, size_t length,
+-			   loff_t *ppos);
++ssize_t lirc_dev_fop_write(struct file *file, const char __user *buffer,
++			   size_t length, loff_t *ppos);
+ 
+ #endif
+-- 
+1.8.3.1
+
diff --git a/0017-media-media-rc-lirc_dev-check-kobject_set_name-resul.patch b/0017-media-media-rc-lirc_dev-check-kobject_set_name-resul.patch
new file mode 100644
index 0000000..af5f4a1
--- /dev/null
+++ b/0017-media-media-rc-lirc_dev-check-kobject_set_name-resul.patch
@@ -0,0 +1,43 @@
+From e0ab92be1fa293b8593a77636b3d025fa2aefb82 Mon Sep 17 00:00:00 2001
+From: Jarod Wilson <jarod@redhat.com>
+Date: Tue, 7 Feb 2012 11:47:31 -0500
+Subject: [PATCH 17/17] [media] media: rc: lirc_dev: check kobject_set_name()
+ result
+
+Backport from upstream kernel:
+
+commit b395cbac36e58a55729fe7e6262a3f0b1691bced
+Author: Vasiliy Kulikov <segoon@openwall.com>
+Date:   Fri Nov 26 14:06:41 2010 -0300
+
+    [media] media: rc: lirc_dev: check kobject_set_name() result
+
+    kobject_set_name() may fail with -ENOMEM, check for it.
+
+    Signed-off-by: Vasiliy Kulikov <segoon@openwall.com>
+    Acked-by: Jarod Wilson <jarod@redhat.com>
+    Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
+
+Signed-off-by: Jarod Wilson <jarod@redhat.com>
+---
+ drivers/lirc_dev/lirc_dev.c | 4 +++-
+ 1 file changed, 3 insertions(+), 1 deletion(-)
+
+diff --git a/drivers/lirc_dev/lirc_dev.c b/drivers/lirc_dev/lirc_dev.c
+index 5b25c5f..9d52188 100644
+--- a/drivers/lirc_dev/lirc_dev.c
++++ b/drivers/lirc_dev/lirc_dev.c
+@@ -236,7 +236,9 @@ static int lirc_cdev_add(struct irctl *ir)
+ 		cdev_init(cdev, &lirc_dev_fops);
+ 		cdev->owner = THIS_MODULE;
+ 	}
+-	kobject_set_name(&cdev->kobj, "lirc%d", d->minor);
++	retval = kobject_set_name(&cdev->kobj, "lirc%d", d->minor);
++	if (retval)
++		return retval;
+ 
+ 	retval = cdev_add(cdev, MKDEV(MAJOR(lirc_base_dev), d->minor), 1);
+ 	if (retval)
+-- 
+1.8.3.1
+
diff --git a/0018-Start-lirc-0.9.1-git.patch b/0018-Start-lirc-0.9.1-git.patch
new file mode 100644
index 0000000..b5f1c7d
--- /dev/null
+++ b/0018-Start-lirc-0.9.1-git.patch
@@ -0,0 +1,91 @@
+From 7c8034be8a79dce219b60cce3afcf39f1b85d004 Mon Sep 17 00:00:00 2001
+From: Jarod Wilson <jarod@redhat.com>
+Date: Fri, 25 Mar 2011 18:27:31 -0400
+Subject: [PATCH] Start lirc 0.9.1-git
+
+Signed-off-by: Jarod Wilson <jarod@redhat.com>
+---
+ ANNOUNCE                   | 4 ++--
+ NEWS                       | 8 ++++++--
+ configure.ac               | 2 +-
+ doc/html-source/index.html | 2 +-
+ setup.sh                   | 2 +-
+ 5 files changed, 11 insertions(+), 7 deletions(-)
+
+diff --git a/ANNOUNCE b/ANNOUNCE
+index 4db8756..da33538 100644
+--- a/ANNOUNCE
++++ b/ANNOUNCE
+@@ -1,8 +1,8 @@
+-LIRC - Linux Infrared Remote Control, Version: 0.9.0-git
++LIRC - Linux Infrared Remote Control, Version: 0.9.1-git
+ 
+ Copyright (C) 1996 Ralph Metzler <rjkm@thp.uni-koeln.de>
+ Copyright (C) 1998-2010 Christoph Bartelmus <lirc@bartelmus.de>
+-Copyright (C) 2010 Jarod Wilson <jarod@redhat.com>
++Copyright (C) 2010-2011 Jarod Wilson <jarod@redhat.com>
+ (according to GNU General Public Licence 2.0 or later)
+ 
+ LIRC is a package that allows you to decode and send infra-red signals
+diff --git a/NEWS b/NEWS
+index 08d1abf..c097f0d 100644
+--- a/NEWS
++++ b/NEWS
+@@ -1,4 +1,9 @@
+-0.9.0-git: UNDER DEVELOPMENT
++0.9.1-git: UNDER DEVELOPMENT
++  * TBD
++
++0.9.0: 03/25/11
++  * Remove mceusb, streamzap, it8x, ene0100 drivers, as they're
++    now redundant with upstream kernel drivers
+   * fix oops unplugging igorplugusb receiver while in use (special
+     thanks to Timo Boettcher for providing hardware)
+   * more error-checking for NULL irctl in various lirc_dev paths
+@@ -13,7 +18,6 @@
+   * use portable type definitions all over the place
+   * drop an old GLIBC work-around for printing 64-bit values
+   * fix timing-specific repeat-after-release issue (Christoph Bartelmus)
+-  * renamed lirc_ite8709 to lirc_it85 and updated (Yan-Min Lin, ITE)
+ 
+ 0.8.7: 09/06/10
+   * improved usb-uirt support for FreeBSD (John Wehle)
+diff --git a/configure.ac b/configure.ac
+index 485b8f3..4fedee1 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -7,7 +7,7 @@ AC_INIT
+ AC_CONFIG_SRCDIR([daemons/lircd.c])
+ AC_CONFIG_MACRO_DIR([m4])
+ 
+-AM_INIT_AUTOMAKE(lirc, 0.9.0-git)
++AM_INIT_AUTOMAKE(lirc, 0.9.1-git)
+ AM_CONFIG_HEADER(config.h)
+ 
+ CFLAGS="${CFLAGS--O2 -g -Wall}"
+diff --git a/doc/html-source/index.html b/doc/html-source/index.html
+index 77bf381..0e44f83 100644
+--- a/doc/html-source/index.html
++++ b/doc/html-source/index.html
+@@ -1,5 +1,5 @@
+     <A NAME="welcome"></A><HR>
+-    <H1 ALIGN="CENTER">Welcome to the LIRC 0.9.0-git Manual</H1>
++    <H1 ALIGN="CENTER">Welcome to the LIRC 0.9.1-git Manual</H1>
+     <HR WIDTH="70%">
+     
+     <P>
+diff --git a/setup.sh b/setup.sh
+index 6220cda..9a3bdec 100755
+--- a/setup.sh
++++ b/setup.sh
+@@ -1,6 +1,6 @@
+ #! /bin/sh
+ 
+-LIRC_VERSION="0.9.0-git"
++LIRC_VERSION="0.9.1-git"
+ 
+ #############################################################################
+ ## Default Values
+-- 
+1.8.3.1
+
diff --git a/0100-configure-ac-revert-to-git-branch.patch b/0100-configure-ac-revert-to-git-branch.patch
new file mode 100644
index 0000000..2ae5e34
--- /dev/null
+++ b/0100-configure-ac-revert-to-git-branch.patch
@@ -0,0 +1,26 @@
+From 7635b1e321bf2f98468ae4f2233e28e3d78505cb Mon Sep 17 00:00:00 2001
+From: Alec Leamas <leamas@nowhere.net>
+Date: Fri, 11 Oct 2013 05:50:12 +0200
+Subject: [PATCH] configure-ac: revert to git branch
+
+rebasing for further changes to match upstream merge request.
+---
+ configure.ac | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/configure.ac b/configure.ac
+index 5a9b31d..9efe2f9 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -7,7 +7,7 @@ AC_INIT
+ AC_CONFIG_SRCDIR([daemons/lircd.c])
+ AC_CONFIG_MACRO_DIR([m4])
+
+-AM_INIT_AUTOMAKE(lirc, 0.9.0)
++AM_INIT_AUTOMAKE(lirc, 0.9.1-git)
+ AM_CONFIG_HEADER(config.h)
+
+ CFLAGS="${CFLAGS--O2 -g -Wall}"
+--
+1.8.3.1
+
diff --git a/0101-Stripping-some-eol-whitespace.patch b/0101-Stripping-some-eol-whitespace.patch
new file mode 100644
index 0000000..a275705
--- /dev/null
+++ b/0101-Stripping-some-eol-whitespace.patch
@@ -0,0 +1,182 @@
+From 7b05725dd224e79a3c6023d8cd3e609aa95ac693 Mon Sep 17 00:00:00 2001
+From: Alec Leamas <alec@tests.notat.diaspora.com>
+Date: Thu, 10 Oct 2013 09:22:39 +0200
+Subject: [PATCH] Stripping some eol whitespace.
+
+---
+ Makefile.am         |  2 +-
+ configure.ac        | 26 +++++++++++++-------------
+ daemons/Makefile.am |  2 +-
+ doc/Makefile.am     |  2 +-
+ tools/Makefile.am   |  2 +-
+ 5 files changed, 17 insertions(+), 17 deletions(-)
+
+diff --git a/Makefile.am b/Makefile.am
+index 409a4df..f026548 100644
+--- a/Makefile.am
++++ b/Makefile.am
+@@ -1,6 +1,6 @@
+ ## $Id: Makefile.am,v 5.12 2009/07/07 20:44:44 lirc Exp $
+ 
+-## Process this file with automake to produce Makefile.in 
++## Process this file with automake to produce Makefile.in
+ ## Makefile.am, (c)1999 Tom Wheeley <tw104@york.ac.uk>
+ 
+ ## we need version 1.5 of automake for DIST_SUBDIRS to work and dist-bzip2.
+diff --git a/configure.ac b/configure.ac
+index ff4780f..e130f1e 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -83,7 +83,7 @@ in its directory.
+ ])]
+   )]
+ )
+-	
++
+ 
+ dnl Determine default configuration based on OS
+ case "${host_os}" in
+@@ -187,7 +187,7 @@ AH_TEMPLATE([DEVDIR],
+ AH_TEMPLATE([DYNCODES],
+ 	[Define to use dynamic IR codes])
+ 
+-AH_TEMPLATE([HAVE_ALSA_SB_RC],	
++AH_TEMPLATE([HAVE_ALSA_SB_RC],
+ 	[Define if the ALSA library with SB RC support is installed])
+ 
+ AH_TEMPLATE([HAVE_FORKPTY],
+@@ -198,7 +198,7 @@ AH_TEMPLATE([HAVE_IGUANAIR],
+ 
+ AH_TEMPLATE([HAVE_FTDI],
+ 	[Define if the libftdi library is installed])
+-	
++
+ AH_TEMPLATE([HAVE_LIBALSA],
+ 	[Define if the ALSA library is installed])
+ 
+@@ -479,7 +479,7 @@ fi
+ if test "$driver" = "userspace" -o "$driver" = "all"; then
+   AC_DEFINE(LIRC_DRIVER_ANY)
+   lirc_driver=$driver
+-  
++
+   any_possible_drivers=`echo ${possible_drivers} | sed -e's/ /-/g' \
+ 			  -e's/)-(/ /g'  -e's/(//g' -e's/)//g' \
+ 			  -e's/-$//g'`
+@@ -696,7 +696,7 @@ if test "$driver" = "userspace" -o "$driver" = "all"; then
+   { for token in $*; do echo $token; done; }
+   newline_to_space()
+   { echo $*; }
+-  
++
+   hw_module=$(newline_to_space $(space_to_newline ${hw_module}| sort -u))
+ 
+ fi
+@@ -717,7 +717,7 @@ if test "$driver" = "act220l"; then
+   lirc_driver="lirc_dev lirc_sir"
+   AC_DEFINE(LIRC_SIR_ACTISYS_ACT220L)
+ fi
+-    
++
+ if test "$driver" = "adaptec"; then
+   lirc_driver="lirc_dev lirc_i2c"
+   lircd_conf="adaptec/lircd.conf.AVC-2410"
+@@ -1016,7 +1016,7 @@ fi
+ 
+ if test "$driver" = "imon"; then
+   lirc_driver="lirc_dev lirc_imon"
+-  lircd_conf="imon/lircd.conf.imon"  
++  lircd_conf="imon/lircd.conf.imon"
+ fi
+ 
+ if test "$driver" = "imon_24g"; then
+@@ -1037,12 +1037,12 @@ fi
+ 
+ if test "$driver" = "imon_pad"; then
+   lirc_driver="lirc_dev lirc_imon"
+-  lircd_conf="imon/lircd.conf.imon-pad"  
++  lircd_conf="imon/lircd.conf.imon-pad"
+ fi
+ 
+ if test "$driver" = "imon_rsc"; then
+   lirc_driver="lirc_dev lirc_imon"
+-  lircd_conf="imon/lircd.conf.imon-rsc"  
++  lircd_conf="imon/lircd.conf.imon-rsc"
+ fi
+ 
+ if test "$driver" = "irdeo"; then
+@@ -1444,7 +1444,7 @@ else
+ Get it at:
+ 
+   http://libusb.sourceforge.net/
+-  
++
+ Or install these packages from your distro:
+ 
+    libusb
+@@ -1550,7 +1550,7 @@ devdir=${devdir_default})
+ 
+ default_moduledir=/lib/modules/`uname -r`/misc
+ AC_ARG_WITH(moduledir,
+-[  --with-moduledir=DIR    kernel modules in DIR (/lib/modules/`uname -r`/misc)], 
++[  --with-moduledir=DIR    kernel modules in DIR (/lib/modules/`uname -r`/misc)],
+ moduledir=${withval},
+ moduledir=${default_moduledir})
+ 
+@@ -1649,7 +1649,7 @@ fi
+ dnl if --prefix is not specified, then $prefix is still set to NONE by
+ dnl configure.  That's bad here where we want to expand it!
+ cur_prefix=$prefix
+-test "x${prefix}" = "xNONE" && prefix=$ac_default_prefix 
++test "x${prefix}" = "xNONE" && prefix=$ac_default_prefix
+ test "${sysconfdir}" = "\${prefix}/etc" && sysconfdir=/etc
+ test "${localstatedir}" = "\${prefix}/var" && localstatedir=/var
+ varrundir="${localstatedir}/run"
+@@ -1675,7 +1675,7 @@ AC_SUBST(moduledir)
+ AC_SUBST(driver)
+ AC_SUBST(lirc_driver)
+ AC_SUBST(hw_module_libs)
+-AC_SUBST(vga_progs) 
++AC_SUBST(vga_progs)
+ AC_SUBST(x_progs)
+ AC_SUBST(hw_module)
+ AC_SUBST(receive)
+diff --git a/daemons/Makefile.am b/daemons/Makefile.am
+index 0b58a8e..42873af 100644
+--- a/daemons/Makefile.am
++++ b/daemons/Makefile.am
+@@ -1,6 +1,6 @@
+ ## $Id: Makefile.am,v 5.73 2010/05/13 16:23:23 lirc Exp $
+ 
+-## Process this file with automake to produce Makefile.in 
++## Process this file with automake to produce Makefile.in
+ 
+ ## these are used by programs in the tools directory, but not by
+ ## programs in this directory.  So we must make sure they get distributed
+diff --git a/doc/Makefile.am b/doc/Makefile.am
+index c970876..3dd3e09 100644
+--- a/doc/Makefile.am
++++ b/doc/Makefile.am
+@@ -1,6 +1,6 @@
+ ## $Id: Makefile.am,v 1.12 2007/11/08 20:58:56 lirc Exp $
+ 
+-## Process this file with automake to produce Makefile.in 
++## Process this file with automake to produce Makefile.in
+ 
+ EXTRA_DIST=lirc.css irxevent.keys lirc.hwdb
+ 
+diff --git a/tools/Makefile.am b/tools/Makefile.am
+index 93235f3..3326707 100644
+--- a/tools/Makefile.am
++++ b/tools/Makefile.am
+@@ -1,6 +1,6 @@
+ ## $Id: Makefile.am,v 5.20 2009/12/27 19:04:10 lirc Exp $
+ 
+-## Process this file with automake to produce Makefile.in 
++## Process this file with automake to produce Makefile.in
+ 
+ INCLUDES = -I$(top_srcdir)
+ 
+-- 
+1.8.3.1
+
diff --git a/0102-Update-autotools-config-files.patch b/0102-Update-autotools-config-files.patch
new file mode 100644
index 0000000..8b81a09
--- /dev/null
+++ b/0102-Update-autotools-config-files.patch
@@ -0,0 +1,114 @@
+From cc6bb81503e7ad71de97c49d9b6adfaca8aeef4b Mon Sep 17 00:00:00 2001
+From: Alec Leamas <alec@tests.notat.diaspora.com>
+Date: Thu, 10 Oct 2013 09:28:34 +0200
+Subject: [PATCH 102/105] Update autotools config files.
+
+Kills some warnings while running autoconf and also
+replaces some other macros which are deprecated. Add the
+standard aclocal include path m4 - without it there is
+warnings or worse.
+---
+ Makefile.am         | 1 +
+ configure.ac        | 8 ++++----
+ daemons/Makefile.am | 3 ++-
+ doc/Makefile.am     | 1 +
+ tools/Makefile.am   | 5 ++---
+ 5 files changed, 10 insertions(+), 8 deletions(-)
+
+diff --git a/Makefile.am b/Makefile.am
+index 409a4df..e237945 100644
+--- a/Makefile.am
++++ b/Makefile.am
+@@ -2,6 +2,7 @@
+ 
+ ## Process this file with automake to produce Makefile.in
+ ## Makefile.am, (c)1999 Tom Wheeley <tw104@york.ac.uk>
++ACLOCAL_AMFLAGS             = -I m4
+ 
+ ## we need version 1.5 of automake for DIST_SUBDIRS to work and dist-bzip2.
+ AUTOMAKE_OPTIONS = 1.5 check-news dist-bzip2
+diff --git a/configure.ac b/configure.ac
+index e130f1e..af28e4f 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -3,12 +3,12 @@ dnl $Id: configure.ac,v 1.44 2010/07/12 03:25:55 jarodwilson Exp $
+ dnl Process this file with autoconf to produce a configure script.
+ dnl configure.ac, (c)1999 Tom Wheeley <tw104@york.ac.uk>
+ 
+-AC_INIT
++AC_INIT([lirc], [0.9.1-git])
+ AC_CONFIG_SRCDIR([daemons/lircd.c])
+ AC_CONFIG_MACRO_DIR([m4])
+ 
+-AM_INIT_AUTOMAKE(lirc, 0.9.1-git)
+-AM_CONFIG_HEADER(config.h)
++AM_INIT_AUTOMAKE
++AC_CONFIG_HEADERS(config.h)
+ 
+ CFLAGS="${CFLAGS--O2 -g -Wall}"
+ 
+@@ -21,7 +21,7 @@ AC_PATH_PROG(mknod, mknod, /bin/mknod)
+ AC_PATH_PROG(mkfifo, mkfifo, /usr/bin/mkfifo)
+ AC_PATH_PROG(depmod, depmod, /sbin/depmod, $PATH:/sbin)
+ AC_PROG_LN_S
+-AC_PROG_LIBTOOL
++LT_INIT([disable-static])
+ AM_PATH_PYTHON(,, [:])
+ AM_CONDITIONAL([HAVE_PYTHON], [test "$PYTHON" != ""])
+ LIBUSB_CONFIG="pkg-config libusb"
+diff --git a/daemons/Makefile.am b/daemons/Makefile.am
+index 42873af..314048f 100644
+--- a/daemons/Makefile.am
++++ b/daemons/Makefile.am
+@@ -1,11 +1,12 @@
+ ## $Id: Makefile.am,v 5.73 2010/05/13 16:23:23 lirc Exp $
+ 
+ ## Process this file with automake to produce Makefile.in
++ACLOCAL_AMFLAGS             = -I m4
+ 
+ ## these are used by programs in the tools directory, but not by
+ ## programs in this directory.  So we must make sure they get distributed
+ 
+-INCLUDES = -I$(top_srcdir)
++AM_CPPFLAGS = -I$(top_srcdir)
+ 
+ BUILT_SOURCES = input_map.inc
+ 
+diff --git a/doc/Makefile.am b/doc/Makefile.am
+index c970876..cb02678 100644
+--- a/doc/Makefile.am
++++ b/doc/Makefile.am
+@@ -1,6 +1,7 @@
+ ## $Id: Makefile.am,v 1.12 2007/11/08 20:58:56 lirc Exp $
+ 
+ ## Process this file with automake to produce Makefile.in
++ACLOCAL_AMFLAGS             = -I m4
+ 
+ EXTRA_DIST=lirc.css irxevent.keys lirc.hwdb
+ 
+diff --git a/tools/Makefile.am b/tools/Makefile.am
+index 3326707..978c388 100644
+--- a/tools/Makefile.am
++++ b/tools/Makefile.am
+@@ -1,16 +1,15 @@
+ ## $Id: Makefile.am,v 5.20 2009/12/27 19:04:10 lirc Exp $
+ 
+ ## Process this file with automake to produce Makefile.in
++ACLOCAL_AMFLAGS             = -I m4
+ 
+-INCLUDES = -I$(top_srcdir)
++AM_CPPFLAGS = -I$(top_srcdir) @X_CFLAGS@
+ 
+ EXTRA_PROGRAMS = smode2 xmode2 irxevent
+ bin_PROGRAMS = irw irpty irexec ircat mode2 irsend \
+ 	lircrcd \
+ 	@vga_progs@ @x_progs@
+ 
+-AM_CPPFLAGS = @X_CFLAGS@
+-
+ ## simple programs
+ irw_SOURCES = irw.c
+ irpty_SOURCES = irpty.c
+-- 
+1.8.3.1
+
diff --git a/0103-xmode2.c-Use-generic-fixed-font-instead-of-Courier.patch b/0103-xmode2.c-Use-generic-fixed-font-instead-of-Courier.patch
new file mode 100644
index 0000000..61a0708
--- /dev/null
+++ b/0103-xmode2.c-Use-generic-fixed-font-instead-of-Courier.patch
@@ -0,0 +1,28 @@
+From c913583f3d7d166a1cf8505dcb695b88b980a1fc Mon Sep 17 00:00:00 2001
+From: Alec Leamas <alec@tests.notat.diaspora.com>
+Date: Tue, 8 Oct 2013 21:59:01 +0200
+Subject: [PATCH 103/105] xmode2.c: Use generic fixed font instead of Courier.
+
+This used to be a sed command in the Fedora spec file. Using
+the generic fixed font is simply a better default more
+generally available.
+---
+ tools/xmode2.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/tools/xmode2.c b/tools/xmode2.c
+index b7d858e..27ae7fc 100644
+--- a/tools/xmode2.c
++++ b/tools/xmode2.c
+@@ -69,7 +69,7 @@ Display *d1;
+ Window w0, w1;			/*w0 = root */
+ char w1_wname[] = "xmode2";
+ char w1_iname[] = "xmode2";
+-char font1_name[] = "-*-Courier-medium-r-*-*-8-*-*-m-*-iso8859-1";
++char font1_name[]= "-misc-fixed-*-r-*-*-12-*-*-*-*-*-iso8859-1";
+ 
+ int w1_x = 0, w1_y = 0;
+ unsigned int w1_w = 640, w1_h = 480, w1_border = 0;
+-- 
+1.8.3.1
+
diff --git a/0104-Add-systemd-socket-activation-support.patch b/0104-Add-systemd-socket-activation-support.patch
new file mode 100644
index 0000000..0481231
--- /dev/null
+++ b/0104-Add-systemd-socket-activation-support.patch
@@ -0,0 +1,180 @@
+From 171ac321f1e97a60fbda3858c4c84d60d0b7dacb Mon Sep 17 00:00:00 2001
+From: Alec Leamas <alec@tests.notat.diaspora.com>
+Date: Wed, 9 Oct 2013 20:57:12 +0200
+Subject: [PATCH 104/105] Add systemd socket activation support.
+
+Since systemd was introduced lirc clients have had problems at
+startup when trying to connect to the lircd socket before it's
+created. The root cause is the aggressive parallell boot performed
+by systemd.
+
+The solution is to add socket activation. In this mode, the socket
+is created by systemd and handed over to lircd at startup. The patch
+implements this. It should be reasonably transparent.
+
+At configure time it enables systemd support if it's available,
+otherwise it's silently ignored.
+
+In runtime lircd looks for and uses a socket handed over by systemd.
+If there is no such socket it proceeds as normal.
+
+Adds a dependency on pkg-config for the PKG_CHECK_MODULES macro.
+---
+ configure.ac    |  7 +++++
+ daemons/lircd.c | 94 ++++++++++++++++++++++++++++++++++-----------------------
+ 2 files changed, 63 insertions(+), 38 deletions(-)
+
+diff --git a/configure.ac b/configure.ac
+index af28e4f..7df186a 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -232,6 +232,9 @@ AH_TEMPLATE([HAVE_SCSI],
+ AH_TEMPLATE([HAVE_SOUNDCARD],
+ 	[defined if soundcard API is available])
+ 
++AH_TEMPLATE([HAVE_SYSTEMD],
++	[defined if systemd API is available])
++
+ AH_TEMPLATE([HAVE_VSYSLOG],
+ 	[define if you have vsyslog( prio, fmt, va_arg )])
+ 
+@@ -414,6 +417,10 @@ AC_CHECK_HEADERS(linux/i2c-dev.h,[
+   ]
+ )
+ 
++PKG_CHECK_MODULES([SYSTEMD],[libsystemd-daemon],[AC_DEFINE(HAVE_SYSTEMD)],[true])
++CFLAGS="$CFLAGS $SYSTEMD_CFLAGS"
++LIBS="$LIBS $SYSTEMD_LIBS"
++
+ dnl here we see what driver the user wants.
+ 
+ AC_ARG_WITH(driver,
+diff --git a/daemons/lircd.c b/daemons/lircd.c
+index 8ace7af..9cde69b 100644
+--- a/daemons/lircd.c
++++ b/daemons/lircd.c
+@@ -63,6 +63,10 @@
+ #include "input_map.h"
+ #endif
+ 
++#ifdef HAVE_SYSTEMD
++#include "systemd/sd-daemon.h"
++#endif
++
+ #if defined __APPLE__  || defined __FreeBSD__
+ #include <sys/ioctl.h>
+ #endif
+@@ -855,6 +859,7 @@ void start_server(mode_t permission, int nodaemon)
+ 	int ret;
+ 	int new = 1;
+ 	int fd;
++	int n;
+ 
+ 	/* create pid lockfile in /var/run */
+ 	if ((fd = open(pidfile, O_RDWR | O_CREAT, 0644)) == -1 || (pidf = fdopen(fd, "r+")) == NULL) {
+@@ -881,51 +886,64 @@ void start_server(mode_t permission, int nodaemon)
+ 	(void)ftruncate(fileno(pidf), ftell(pidf));
+ 
+ 	/* create socket */
+-	sockfd = socket(AF_UNIX, SOCK_STREAM, 0);
+-	if (sockfd == -1) {
+-		fprintf(stderr, "%s: could not create socket\n", progname);
+-		perror(progname);
++	sockfd = -1;
++#ifdef HAVE_SYSTEMD
++        n = sd_listen_fds(0);
++        if (n > 1) {
++                fprintf(stderr, "Too many file descriptors received.\n");
+ 		goto start_server_failed0;
+-	}
++                exit(1);
++        }
++        else if (n == 1)
++                sockfd  = SD_LISTEN_FDS_START + 0;
++#endif
++        if (sockfd == -1) {
++		sockfd = socket(AF_UNIX, SOCK_STREAM, 0);
++		if (sockfd == -1) {
++			fprintf(stderr, "%s: could not create socket\n", progname);
++			perror(progname);
++			goto start_server_failed0;
++		}
+ 
+-	/* 
+-	   get owner, permissions, etc.
+-	   so new socket can be the same since we
+-	   have to delete the old socket.  
+-	 */
+-	ret = stat(lircdfile, &s);
+-	if (ret == -1 && errno != ENOENT) {
+-		fprintf(stderr, "%s: could not get file information for %s\n", progname, lircdfile);
+-		perror(progname);
+-		goto start_server_failed1;
+-	}
+-	if (ret != -1) {
+-		new = 0;
+-		ret = unlink(lircdfile);
+-		if (ret == -1) {
+-			fprintf(stderr, "%s: could not delete %s\n", progname, lircdfile);
+-			perror(NULL);
++		/*
++		   get owner, permissions, etc.
++		   so new socket can be the same since we
++		   have to delete the old socket.
++		 */
++		ret = stat(lircdfile, &s);
++		if (ret == -1 && errno != ENOENT) {
++			fprintf(stderr, "%s: could not get file information for %s\n", progname, lircdfile);
++			perror(progname);
+ 			goto start_server_failed1;
+ 		}
+-	}
++		if (ret != -1) {
++			new = 0;
++			ret = unlink(lircdfile);
++			if (ret == -1) {
++				fprintf(stderr, "%s: could not delete %s\n", progname, lircdfile);
++				perror(NULL);
++				goto start_server_failed1;
++			}
++		}
+ 
+-	serv_addr.sun_family = AF_UNIX;
+-	strcpy(serv_addr.sun_path, lircdfile);
+-	if (bind(sockfd, (struct sockaddr *)&serv_addr, sizeof(serv_addr)) == -1) {
+-		fprintf(stderr, "%s: could not assign address to socket\n", progname);
+-		perror(progname);
+-		goto start_server_failed1;
+-	}
++		serv_addr.sun_family = AF_UNIX;
++		strcpy(serv_addr.sun_path, lircdfile);
++		if (bind(sockfd, (struct sockaddr *)&serv_addr, sizeof(serv_addr)) == -1) {
++			fprintf(stderr, "%s: could not assign address to socket\n", progname);
++			perror(progname);
++			goto start_server_failed1;
++		}
+ 
+-	if (new ? chmod(lircdfile, permission)
+-	    : (chmod(lircdfile, s.st_mode) == -1 || chown(lircdfile, s.st_uid, s.st_gid) == -1)
+-	    ) {
+-		fprintf(stderr, "%s: could not set file permissions\n", progname);
+-		perror(progname);
+-		goto start_server_failed1;
+-	}
++		if (new ? chmod(lircdfile, permission)
++		    : (chmod(lircdfile, s.st_mode) == -1 || chown(lircdfile, s.st_uid, s.st_gid) == -1)
++		    ) {
++			fprintf(stderr, "%s: could not set file permissions\n", progname);
++			perror(progname);
++			goto start_server_failed1;
++		}
+ 
+-	listen(sockfd, 3);
++		listen(sockfd, 3);
++        }
+ 	nolinger(sockfd);
+ 
+ 	if (useuinput) {
+-- 
+1.8.3.1
+
diff --git a/0105-Update-COPYING-to-latest-version.patch b/0105-Update-COPYING-to-latest-version.patch
new file mode 100644
index 0000000..f632542
--- /dev/null
+++ b/0105-Update-COPYING-to-latest-version.patch
@@ -0,0 +1,115 @@
+From 9c384a1a84faea2d17af360a7f227d611f847160 Mon Sep 17 00:00:00 2001
+From: Alec Leamas <alec@tests.notat.diaspora.com>
+Date: Thu, 10 Oct 2013 09:42:12 +0200
+Subject: [PATCH 105/105] Update COPYING to latest version.
+
+As stated on the mailing list, current COPYING has wrong address to the
+Free Software Foundation (they have moved) which causes some packaging
+noise. Updated from latest version available at
+http://www.gnu.org/licenses/old-licenses/gpl-2.0.txt
+---
+ COPYING | 33 ++++++++++++++++-----------------
+ 1 file changed, 16 insertions(+), 17 deletions(-)
+
+diff --git a/COPYING b/COPYING
+index 60549be..d159169 100644
+--- a/COPYING
++++ b/COPYING
+@@ -1,12 +1,12 @@
+-		    GNU GENERAL PUBLIC LICENSE
+-		       Version 2, June 1991
++                    GNU GENERAL PUBLIC LICENSE
++                       Version 2, June 1991
+ 
+- Copyright (C) 1989, 1991 Free Software Foundation, Inc.
+-                       59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
++ Copyright (C) 1989, 1991 Free Software Foundation, Inc.,
++ 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+  Everyone is permitted to copy and distribute verbatim copies
+  of this license document, but changing it is not allowed.
+ 
+-			    Preamble
++                            Preamble
+ 
+   The licenses for most software are designed to take away your
+ freedom to share and change it.  By contrast, the GNU General Public
+@@ -15,7 +15,7 @@ software--to make sure the software is free for all its users.  This
+ General Public License applies to most of the Free Software
+ Foundation's software and to any other program whose authors commit to
+ using it.  (Some other Free Software Foundation software is covered by
+-the GNU Library General Public License instead.)  You can apply it to
++the GNU Lesser General Public License instead.)  You can apply it to
+ your programs, too.
+ 
+   When we speak of free software, we are referring to freedom, not
+@@ -56,7 +56,7 @@ patent must be licensed for everyone's free use or not licensed at all.
+   The precise terms and conditions for copying, distribution and
+ modification follow.
+ 
+-		    GNU GENERAL PUBLIC LICENSE
++                    GNU GENERAL PUBLIC LICENSE
+    TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
+ 
+   0. This License applies to any program or other work which contains
+@@ -255,7 +255,7 @@ make exceptions for this.  Our decision will be guided by the two goals
+ of preserving the free status of all derivatives of our free software and
+ of promoting the sharing and reuse of software generally.
+ 
+-			    NO WARRANTY
++                            NO WARRANTY
+ 
+   11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY
+ FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW.  EXCEPT WHEN
+@@ -277,9 +277,9 @@ YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER
+ PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE
+ POSSIBILITY OF SUCH DAMAGES.
+ 
+-		     END OF TERMS AND CONDITIONS
++                     END OF TERMS AND CONDITIONS
+ 
+-	    How to Apply These Terms to Your New Programs
++            How to Apply These Terms to Your New Programs
+ 
+   If you develop a new program, and you want it to be of the greatest
+ possible use to the public, the best way to achieve this is to make it
+@@ -291,7 +291,7 @@ convey the exclusion of warranty; and each file should have at least
+ the "copyright" line and a pointer to where the full notice is found.
+ 
+     <one line to give the program's name and a brief idea of what it does.>
+-    Copyright (C) 19yy  <name of author>
++    Copyright (C) <year>  <name of author>
+ 
+     This program is free software; you can redistribute it and/or modify
+     it under the terms of the GNU General Public License as published by
+@@ -303,17 +303,16 @@ the "copyright" line and a pointer to where the full notice is found.
+     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+     GNU General Public License for more details.
+ 
+-    You should have received a copy of the GNU General Public License
+-    along with this program; if not, write to the Free Software
+-    Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+-
++    You should have received a copy of the GNU General Public License along
++    with this program; if not, write to the Free Software Foundation, Inc.,
++    51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ 
+ Also add information on how to contact you by electronic and paper mail.
+ 
+ If the program is interactive, make it output a short notice like this
+ when it starts in an interactive mode:
+ 
+-    Gnomovision version 69, Copyright (C) 19yy name of author
++    Gnomovision version 69, Copyright (C) year name of author
+     Gnomovision comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
+     This is free software, and you are welcome to redistribute it
+     under certain conditions; type `show c' for details.
+@@ -336,5 +335,5 @@ necessary.  Here is a sample; alter the names:
+ This General Public License does not permit incorporating your program into
+ proprietary programs.  If your program is a subroutine library, you may
+ consider it more useful to permit linking proprietary applications with the
+-library.  If this is what you want to do, use the GNU Library General
++library.  If this is what you want to do, use the GNU Lesser General
+ Public License instead of this License.
+-- 
+1.8.3.1
+
diff --git a/0105-configure-ac-back-to-0.9.0.patch b/0105-configure-ac-back-to-0.9.0.patch
new file mode 100644
index 0000000..19a4d78
--- /dev/null
+++ b/0105-configure-ac-back-to-0.9.0.patch
@@ -0,0 +1,27 @@
+From 6470e34d1be9e8be5c275a1e10929cd0f973478b Mon Sep 17 00:00:00 2001
+From: Alec Leamas <leamas@nowhere.net>
+Date: Fri, 11 Oct 2013 06:00:28 +0200
+Subject: [PATCH] Revert to 0.9.0
+
+Technically, current release is 0.9.0 + some patches rather than
+a 0.9.1 pre-release.
+---
+ configure.ac | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/configure.ac b/configure.ac
+index 7df186a..46380a3 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -3,7 +3,7 @@ dnl $Id: configure.ac,v 1.44 2010/07/12 03:25:55 jarodwilson Exp $
+ dnl Process this file with autoconf to produce a configure script.
+ dnl configure.ac, (c)1999 Tom Wheeley <tw104@york.ac.uk>
+ 
+-AC_INIT([lirc], [0.9.1-git])
++AC_INIT([lirc], [0.9.0])
+ AC_CONFIG_SRCDIR([daemons/lircd.c])
+ AC_CONFIG_MACRO_DIR([m4])
+ 
+-- 
+1.8.3.1
+
diff --git a/README.fedora b/README.fedora
new file mode 100644
index 0000000..43458c4
--- /dev/null
+++ b/README.fedora
@@ -0,0 +1,18 @@
+## Fedora README
+
+As of current releases, the Fedora lirc package sports systemd socket
+activation. This should fix the problems at startup when clients can't
+connect to /var/run/lircd because the lircd service is yet not started.
+
+To start the lircd service using socket activation:
+
+    # systemctl enable lircd.socket
+    # systemctl start lircd.socket
+
+The lircmd is started the usual way:
+
+    # systemctl enable lircmd.service
+    # systemctl start lircmd.service
+
+
+http://stackoverflow.com/questions/11939255/writing-to-dev-uinput-on-ubuntu-12-04
diff --git a/TODO b/TODO
new file mode 100644
index 0000000..0afd93f
--- /dev/null
+++ b/TODO
@@ -0,0 +1,7 @@
+ - Move to -devel (?): irw, *mode2, others?
+   note: xmode2 inflicts a dependency on X, and smode2 on svgalib
+   - does someone actually need xmode2/smode2 for something?
+ - Split utils into subpackage (keep daemons in main package), perhaps also
+   having the irw, *mode2 etc.
+ - Don't run as root and/or create dedicated group, reduce fifo permissions?
+      http://stackoverflow.com/questions/11939255/writing-to-dev-uinput-on-ubuntu-12-04
diff --git a/lirc.conf b/lirc.conf
new file mode 100644
index 0000000..7ccf921
--- /dev/null
+++ b/lirc.conf
@@ -0,0 +1,2 @@
+# Populated config files can be found in the lirc-remotes sub-package
+# or at http://lirc.sourceforge.net/remotes/".
diff --git a/lirc.spec b/lirc.spec
index 73786a2..48630e2 100644
--- a/lirc.spec
+++ b/lirc.spec
@@ -1,14 +1,11 @@
-# TODO:
-# - caraca driver (req: caraca, http://caraca.sf.net/)
-# - irman driver (req: libirman, http://lirc.sf.net/software/snapshots/)
-# - iguanaIR driver (req: http://iguanaworks.net/ir/usb/installation.shtml)
-#   -> would cause license change to "GPLv2"
-# - move to -devel (?): irw, *mode2, others?
-#   note: xmode2 inflicts a dependency on X, and smode2 on svgalib
-#   - does someone actually need xmode2/smode2 for something?
-# - split utils into subpackage (keep daemons in main package)
-# - don't run as root and/or create dedicated group, reduce fifo permissions?
-# - Fixup /etc/lirc(m)d.conf %%ghost'ification, existence after erase etc.
+#
+# rpmlint warnings:
+#     only-non-binary-in-usr-lib:
+#         https://bugzilla.redhat.com/show_bug.cgi?id=794777
+#     incorrect-fsf-address :
+#         https://sf.net/mailarchive/forum.php?forum_name=lirc-list&viewmonth=201310
+#
+
 
 %bcond_without  alsa
 %bcond_without  portaudio
@@ -16,7 +13,9 @@
 %bcond_with     svgalib
 %bcond_without  irman
 %bcond_without  ftdi
-%bcond_with     iguanaIR
+%bcond_without  iguanaIR
+
+%global _hardened_build 1
 
 %global released 1
 %define pre     pre1
@@ -24,58 +23,87 @@
 Name:           lirc
 Version:        0.9.0
 %if 0%{?released}
-Release:        13%{?dist}
+Release:        15%{?dist}
 %else
-Release:        0.4.%{pre}%{?dist}
+Release:        0.2.%{pre}%{?dist}
 %endif
 Summary:        The Linux Infrared Remote Control package
 
 Group:          System Environment/Daemons
-License:        GPLv2+
+                # Some LGPLv2 files in iguanaIR promoted to GPLv2
+License:        GPLv2
 URL:            http://www.lirc.org/
 %if 0%{?released}
 Source0:        http://downloads.sourceforge.net/lirc/%{name}-%{version}.tar.bz2
 %else
 Source0:        http://www.lirc.org/software/snapshots/%{name}-%{version}-%{pre}.tar.bz2
 %endif
-Source1:        %{name}.service
-Source2:        %{name}.sysconfig
-Source3:	%{name}md.service
-Patch0:         lirc-0.9.0-libusb-config-is-no-more.patch
-BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+Source1:        lircd.service
+Source2:        lirc.sysconfig
+Source3:        lircmd.service
+Source4:        lircd.socket
+Source5:        lirc.conf
+Source6:        README.fedora
+                # Patches 7..17 are from upstream.
+Patch7:         0007-Make-lirc_wpc8769l-functional-again.patch
+Patch8:         0008-lirc_sir-fix-resource-busy-error-from-bunk-lirc_open.patch
+Patch9:         0009-lircd-handle-larger-config-files-in-write_socket-bet.patch
+Patch10:        0010-lirc_atiusb-fix-buffer-alloc-to-work-with-new-kfifo.patch
+Patch11:        0011-libusb-has-no-libusb-config-any-longer-use-pkg-confi.patch
+Patch12:        0012-Silence-some-clang-warnings-courtesy-of-nox.patch
+Patch13:        0013-userspace-use-dev-lirc0-as-default-device.patch
+Patch14:        0014-lirc-make-chardev-nonseekable.patch
+Patch15:        0015-media-lirc_dev-fixes-in-lirc_dev_fop_read.patch
+Patch16:        0016-media-lirc_dev-add-some-__user-annotations.patch
+Patch17:        0017-media-media-rc-lirc_dev-check-kobject_set_name-resul.patch
+Patch18:        0018-Start-lirc-0.9.1-git.patch
+                # 101-104 is upstream merge request, 101+105
+                # local support which should no upstream.
+Patch100:       0100-configure-ac-revert-to-git-branch.patch
+Patch101:       0101-Stripping-some-eol-whitespace.patch
+Patch102:       0102-Update-autotools-config-files.patch
+Patch103:       0103-xmode2.c-Use-generic-fixed-font-instead-of-Courier.patch
+Patch104:       0104-Add-systemd-socket-activation-support.patch
+Patch105:       0105-configure-ac-back-to-0.9.0.patch
 
 BuildRequires:  %{__perl}
-BuildRequires:  libusb-devel, libusb1-devel, python-devel
-BuildRequires:  automake libtool
-%if %{with irman}
-BuildRequires:  libirman-devel
+Buildrequires:  autoconf
+BuildRequires:  automake
+
+%if %{with alsa}
+BuildRequires:  alsa-lib-devel
+%endif
+%if %{with iguanaIR}
+BuildRequires:  iguanaIR-devel
 %endif
 %if %{with ftdi}
 BuildRequires:  libftdi-devel
 %endif
-%if %{with alsa}
-BuildRequires:  alsa-lib-devel
+%if %{with irman}
+BuildRequires:  libirman-devel
+%endif
+BuildRequires:  libtool
+BuildRequires:  libusb-devel
+BuildRequires:  libusb1-devel
+%if %{with x}
+BuildRequires:  libXt-devel
 %endif
 %if %{with portaudio}
 BuildRequires:  portaudio-devel >= 19
 %endif
+BuildRequires:  python2-devel
 %if %{with svgalib}
 BuildRequires:  svgalib-devel
 %endif
-%if %{with x}
-BuildRequires:  libXt-devel
-%endif
-%if %{with iguanaIR}
-BuildRequires:  iguanaIR-devel
-%endif
+BuildRequires:  systemd-devel
+
 Requires:       %{name}-libs = %{version}-%{release}
-Requires(post): /sbin/ldconfig
-Requires(postun): /sbin/ldconfig
-Requires(post): systemd-units
-Requires(preun): systemd-units
-Requires(postun): systemd-units
-#for triggerun
-Requires(post): systemd-sysv
+
+Requires(post):    systemd
+                   #for triggerun
+Requires(post):    systemd-sysv
+Requires(postun):  systemd
+Requires(preun):   systemd
 
 %description
 LIRC is a package that allows you to decode and send infra-red and
@@ -87,8 +115,6 @@ computer with a remote control.
 %package        libs
 Summary:        LIRC libraries
 Group:          System Environment/Libraries
-# Fix old F8 multilib upgrade path issue
-Obsoletes:      %{name} < 0.8.3
 
 %description    libs
 LIRC is a package that allows you to decode and send infra-red and
@@ -136,19 +162,42 @@ computer with a remote control.  This package contains a collection
 of remote control configuration files.
 
 
+# Don't provide or require anything from _docdir, per policy.
+%global __provides_exclude_from ^%{_docdir}/.*$
+%global __requires_exclude_from ^%{_docdir}/.*$
+
+
 %prep
 %if 0%{?released}
 %setup -q
 %else
 %setup -q -n %{name}-%{version}-%{pre}
 %endif
-%patch0 -p1
+
+%patch7 -p1
+%patch8 -p1
+%patch9 -p1
+%patch10 -p1
+%patch11 -p1
+%patch12 -p1
+%patch13 -p1
+%patch14 -p1
+%patch15 -p1
+%patch16 -p1
+%patch17 -p1
+
+%patch100 -p1
+%patch101 -p1
+%patch102 -p1
+%patch103 -p1
+%patch104 -p1
+%patch105 -p1
 
 chmod 644 contrib/*
 chmod +x contrib/hal
+chmod +x daemons/input_map.sh
 
 sed -i -e 's|/usr/local/etc/|/etc/|' contrib/irman2lirc
-
 sed -i -e 's|/sbin/init.d/lircd|%{_initrddir}/lirc|' contrib/lircs
 
 for f in remotes/chronos/lircd.conf.chronos \
@@ -157,34 +206,12 @@ for f in remotes/chronos/lircd.conf.chronos \
     iconv -f iso-8859-1 -t utf-8 $f > $f.utf8 ; mv $f.utf8 $f
 done
 
-# use /dev/lirc0 by default instead of /dev/lirc
-sed -i -e 's|#define DEV_LIRC	"lirc"|#define DEV_LIRC	"lirc0"|' config.h.in
-
-# use fixed instead of Courier w/xmode2, should be more prevalent on linux boxen
-sed -i -e 's|char.*font1_name.*Courier.*$|char		font1_name[]="-misc-fixed-*-r-*-*-12-*-*-*-*-*-iso8859-1";|g' tools/xmode2.c
-
-sed -i -e 's|"/lib /usr/lib |"/%{_lib} %{_libdir} |' configure # lib64 rpath
-
-# *cough* I wish there was a good way to disable alsa/portaudio/svgalib...
-%if ! %{with alsa}
-sed -i -e 's/asoundlib.h/ALSA_DISABLED/g' configure*
-%endif
-%if ! %{with portaudio}
-sed -i -e 's/portaudio.h/PORTAUDIO_DISABLED/g' configure*
-%endif
-%if ! %{with svgalib}
-sed -i -e 's/vga.h/SVGALIB_DISABLED/g' configure*
-%endif
-
-touch -r aclocal.m4 configure.ac # avoid autofoo re-run
-
-# Re-run autofoo for new cvs features
-#autoreconf -i -f
-#automake
-chmod +x daemons/input_map.sh
 
 %build
+autoreconf -fi
+
 %configure \
+  --libdir=%{_libdir} \
   --disable-static \
   --disable-dependency-tracking \
   --enable-sandboxed \
@@ -193,15 +220,27 @@ chmod +x daemons/input_map.sh
 %endif
   --with-syslog=LOG_DAEMON \
   --with-driver=userspace
-# make %{?_smp_mflags}
+# make %%{?_smp_mflags}
 # parallel makes are currently busted, do single-threaded for now
 make
 
-%install
-rm -rf $RPM_BUILD_ROOT __docs
 
+%install
 make install DESTDIR=$RPM_BUILD_ROOT
 install -pm 755 contrib/irman2lirc $RPM_BUILD_ROOT%{_bindir}
+install -Dpm 644 doc/lirc.hwdb $RPM_BUILD_ROOT%{_datadir}/lirc/lirc.hwdb
+install -Dpm 644 %{SOURCE1} $RPM_BUILD_ROOT%{_unitdir}/lircd.service
+install -Dpm 644 %{SOURCE3} $RPM_BUILD_ROOT%{_unitdir}/lircmd.service
+install -Dpm 644 %{SOURCE4} $RPM_BUILD_ROOT%{_unitdir}/lircd.socket
+install -Dpm 644 %{SOURCE2} $RPM_BUILD_ROOT/etc/sysconfig/lirc
+install -Dpm 644 %{SOURCE5} $RPM_BUILD_ROOT/etc/lirc/lircd.conf
+install -Dpm 644 %{SOURCE5} $RPM_BUILD_ROOT/etc/lirc/lircmd.conf
+cp -a %{SOURCE6} README.fedora
+
+# Put remote definitions in place
+cp -ar remotes $RPM_BUILD_ROOT%{_datadir}/lirc-remotes
+
+rm $RPM_BUILD_ROOT%{_libdir}/liblirc_client.la
 %if ! %{with svgalib}
 rm -f $RPM_BUILD_ROOT%{_mandir}/man1/smode2.1*
 %endif
@@ -210,75 +249,28 @@ rm -f $RPM_BUILD_ROOT%{_mandir}/man1/irxevent.1*
 rm -f $RPM_BUILD_ROOT%{_mandir}/man1/xmode2.1*
 %endif
 
-install -Dpm 644 doc/lirc.hwdb $RPM_BUILD_ROOT%{_datadir}/lirc/lirc.hwdb
-
-install -Dpm 644 %{SOURCE1} $RPM_BUILD_ROOT%{_unitdir}/lirc.service
-install -Dpm 644 %{SOURCE3} $RPM_BUILD_ROOT%{_unitdir}/lircmd.service
-install -Dpm 644 %{SOURCE2} $RPM_BUILD_ROOT%{_sysconfdir}/sysconfig/lirc
-
-mkdir __docs
+rm -rf __docs; mkdir __docs
 cp -pR doc contrib __docs
 cd __docs
 rm -rf doc/Makefile* doc/.libs doc/man* doc/lirc.hwdb
 rm -rf contrib/irman2lirc contrib/lirc.* contrib/sendxevent.c
 cd ..
 
-install -dm 755 $RPM_BUILD_ROOT%{_sysconfdir}/lirc
-for f in lircd.conf lircmd.conf
-do
-  echo "# Populated config files can be found in the lirc-remotes sub-package
-# or at http://lirc.sourceforge.net/remotes/" > $RPM_BUILD_ROOT%{_sysconfdir}/lirc/$f
-done
-
-install -dm 755 $RPM_BUILD_ROOT%{_localstatedir}/run/lirc/
-touch $RPM_BUILD_ROOT%{_localstatedir}/run/lirc/lirc{d,m}
-
-mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/tmpfiles.d
-echo "d	%{_localstatedir}/run/lirc	0755	root	root	10d" > $RPM_BUILD_ROOT%{_sysconfdir}/tmpfiles.d/lirc.conf
-
-rm $RPM_BUILD_ROOT%{_libdir}/liblirc_client.la
-
-# Put remote definitions in place
-cp -ar remotes $RPM_BUILD_ROOT%{_datadir}/lirc-remotes
-
-%clean
-rm -rf $RPM_BUILD_ROOT
+mkdir -p $RPM_BUILD_ROOT/etc/tmpfiles.d
+echo "d /var/run/lirc  0755  root  root  10d" \
+    > $RPM_BUILD_ROOT/etc/tmpfiles.d/lirc.conf
 
 
 %post
-if [ $1 -eq 1 ] ; then 
-    # Initial installation 
-    /bin/systemctl daemon-reload >/dev/null 2>&1 || :
-fi
-# If we're upgrading, move config files into their new location, if need be
-if [ $1 -ge 2 ] ; then
-  if [ -e %{_sysconfdir}/lircd.conf -a ! -e %{_sysconfdir}/lirc/lircd.conf ]; then
-    mv %{_sysconfdir}/lircd.conf %{_sysconfdir}/lirc/lircd.conf
-  fi
-  if [ -e %{_sysconfdir}/lircmd.conf -a ! -e %{_sysconfdir}/lirc/lircmd.conf ]; then
-    mv %{_sysconfdir}/lircmd.conf %{_sysconfdir}/lirc/lircmd.conf
-  fi
-fi
+%systemd_post lircd.service lircmd.service
 
 %post libs -p /sbin/ldconfig
 
 %preun
-if [ $1 -eq 0 ] ; then
-    # Package removal, not upgrade
-    /bin/systemctl --no-reload disable lirc.service > /dev/null 2>&1 || :
-    /bin/systemctl stop lirc.service > /dev/null 2>&1 || :
-    /bin/systemctl --no-reload disable lircmd.service > /dev/null 2>&1 || :
-    /bin/systemctl stop lircmd.service > /dev/null 2>&1 || :
-fi
+%systemd_preun lircd.service lircmd.service
 
 %postun
-/bin/systemctl daemon-reload >/dev/null 2>&1 || :
-if [ $1 -ge 1 ] ; then
-    # Package upgrade, not uninstall
-    /bin/systemctl try-restart lirc.service >/dev/null 2>&1 || :
-    /bin/systemctl try-restart lircmd.service >/dev/null 2>&1 || :
-fi
-
+%systemd_postun_with_restart lircd.service lircmd.servic
 
 %postun libs -p /sbin/ldconfig
 
@@ -291,54 +283,64 @@ fi
 
 # Run these because the SysV package being removed won't do them
 /sbin/chkconfig --del lirc >/dev/null 2>&1 || :
-/bin/systemctl try-restart lirc.service >/dev/null 2>&1 || :
-
+/bin/systemctl try-restart lircd.service >/dev/null 2>&1 || :
 
 
 %files
-%defattr(-,root,root,-)
-%doc ANNOUNCE AUTHORS ChangeLog COPYING NEWS README TODO
-%config(noreplace) %{_sysconfdir}/lirc/lirc*d.conf
-%config(noreplace) %{_sysconfdir}/sysconfig/lirc
-%config(noreplace) %{_sysconfdir}/tmpfiles.d/lirc.conf
+%doc ANNOUNCE AUTHORS ChangeLog COPYING NEWS README TODO README.fedora
+%dir  /etc/lirc
+%config(noreplace) /etc/lirc/lirc*d.conf
+%config(noreplace) /etc/sysconfig/lirc
+%config(noreplace) /etc/tmpfiles.d/lirc.conf
 %{_unitdir}/lirc*
 %{_bindir}/*ir*
 %{_bindir}/*mode2
 %{_sbindir}/lirc*d
-%dir %{_datadir}/lirc/
 %{_datadir}/lirc/
 %{_mandir}/man1/*ir*.1*
 %{_mandir}/man1/*mode2*.1*
 %{_mandir}/man8/lirc*d.8*
-%dir %{_localstatedir}/run/lirc/
-%ghost %{_localstatedir}/run/lirc/lirc*
 
 %files libs
-%defattr(-,root,root,-)
 %doc COPYING
 %{_libdir}/liblirc_client.so.*
 
 %files devel
-%defattr(-,root,root,-)
 %{_includedir}/lirc/
 %{_libdir}/liblirc_client.so
 
 %files doc
-%defattr(-,root,root,-)
 %doc __docs/* COPYING
 
 %files remotes
-%defattr(-,root,root,-)
-%dir %{_datadir}/lirc-remotes
-%{_datadir}/lirc-remotes/*
+%doc AUTHORS ChangeLog COPYING README
+%{_datadir}/lirc-remotes
 
 
 %changelog
-* Sat Aug 03 2013 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0.9.0-13
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild
-
-* Wed Jul 17 2013 Petr Pisar <ppisar@redhat.com> - 0.9.0-12
-- Perl 5.18 rebuild
+* Thu Oct 10 2013 Alec Leamas <leamas.alec@nowhere.net> - 0.9.0-15
+- Actually use sysconfig files (881976)
+- Modify lirc.service to not fork.
+- Add support for iguanaIR driver (#954146).
+- Add hardened build flag (955144).
+- Use actual systemd macros (850191).
+- Clean up some nowadays not used directives.
+- Run autoreconf by default (926082).
+- Cleanup some obsoleted autotools usage, two new patches.
+- Deactivate other decoders on start (923978).
+- Filter away docdir dependencies.
+- Remove obsolete F8 upgrade Obsoletes: (sic!).
+- Fix inconsistent/duplicate /usr/share/lirc in %%files.
+- Add %%doc (notably COPYING) to remotes subpackage.
+- Claim /etc/lirc.
+- Update to latest upstream (10 patches).
+- Use /var and /etc instead of %%{_sysconfdir} and %%{localstatedir}.
+- Removed obsolete code to move config files to /etc/lirc in %%post.
+- Renamed main systemd service: lirc.service -> lircd.service.
+- Added socket activation support.
+- Don't claim temporary files in /run/lirc, they are just transient.
+- Initiate lircd.conf, lircmd.conf from external template.
+- Bumping release, 14 is published.
 
 * Thu Feb 14 2013 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0.9.0-11
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild
@@ -638,7 +640,7 @@ fi
 - Update to 0.7.0; major rework of the package:
 - Change default driver to "any".
 - Add -devel subpackage.
-- Improve init script, add %%{_sysconfdir}/sysconfig/lirc for options.
+- Improve init script, add /etc/sysconfig/lirc for options.
 - Rename init script to "lirc" to follow upstream; the script is not only
   for lircd, but lircmd as well.
 - Log to syslog instead of separate log file.
diff --git a/lirc.sysconfig b/lirc.sysconfig
index 70cb5f8..1bca325 100644
--- a/lirc.sysconfig
+++ b/lirc.sysconfig
@@ -8,16 +8,15 @@ LIRCD_OPTIONS=""
 # The infrared receiver (and/or transmitter) driver to be used by lircd(8),
 # similar to passing "-H driver" to lircd(8).
 # Run "/usr/sbin/lircd -H help" to get a listing of supported drivers.
-LIRC_DRIVER=""
+LIRC_DRIVER="default"
 
 # Which lirc device will be used by lircd(8).
 # This is the same as passing "-d device" to lircd.
 # An empty value will use the default /dev/lirc0 device.
-LIRC_DEVICE=""
+LIRC_DEVICE="/dev/lirc0"
 
-# If "yes", the init script will try to start lircmd(8) too.
-ENABLE_LIRCMD="no"
-
-# Options to lircmd(8).
-LIRCMD_OPTIONS=""
+# Options to lircmd(8). The default --version effectively disables
+# lircmd, setting it to "" enables it with default options. lircmd
+# always runs with --nodaemon added to LIRCMD_OPTIONS.
+LIRCMD_OPTIONS="--version"
 
diff --git a/lircd.service b/lircd.service
new file mode 100644
index 0000000..fd184cb
--- /dev/null
+++ b/lircd.service
@@ -0,0 +1,13 @@
+[Unit]
+Description=LIRC Infrared Signal Decoder
+After=network.target
+
+[Service]
+Type=simple
+EnvironmentFile=-/etc/sysconfig/lirc
+ExecStartPre=/bin/sh -c 'echo lirc > /sys/class/rc/rc0/protocols'
+ExecStart=/usr/sbin/lircd $LIRCD_OPTIONS \
+    --driver $LIRC_DRIVER --device $LIRC_DEVICE  --nodaemon
+
+[Install]
+WantedBy=multi-user.target
diff --git a/lircd.socket b/lircd.socket
new file mode 100644
index 0000000..ef9752f
--- /dev/null
+++ b/lircd.socket
@@ -0,0 +1,6 @@
+[Socket]
+ListenStream=/run/lirc/lircd
+
+[Install]
+WantedBy=sockets.target
+
diff --git a/lircmd.service b/lircmd.service
index 8059702..dfac1ca 100644
--- a/lircmd.service
+++ b/lircmd.service
@@ -4,8 +4,9 @@ Requires=lirc.service
 After=network.target lirc.service
 
 [Service]
-Type=forking
-ExecStart=/usr/sbin/lircmd 
+Type=simple
+EnvironmentFile=-/etc/sysconfig/lirc
+ExecStart=/usr/sbin/lircmd  $LIRCMD_OPTIONS --nodaemon
 
 [Install]
 WantedBy=multi-user.target

From 34cdc2ea64e4eddaf4ba972e0bb0d1bfa7fd2e0d Mon Sep 17 00:00:00 2001
From: Alec Leamas <leamas.alec@gmail.com>
Date: Fri, 18 Oct 2013 10:32:10 +0200
Subject: [PATCH 112/204] Updating after review and test of not-released -15

---
 0018-Start-lirc-0.9.1-git.patch               | 82 ++-----------------
 ...s-use-systemctl-instead-of-sysV-init.patch | 43 ++++++++++
 0100-configure-ac-revert-to-git-branch.patch  | 15 ++--
 ...dd-systemd-socket-activation-support.patch | 44 ++++------
 99-remote-control-lirc.rules                  |  1 +
 README.fedora                                 | 65 ++++++++++++++-
 lirc.spec                                     | 58 +++++++++----
 lirc.sysconfig                                | 21 +++--
 lircd.service                                 |  5 +-
 lircd.socket                                  |  1 +
 10 files changed, 205 insertions(+), 130 deletions(-)
 create mode 100644 0019-lircs-use-systemctl-instead-of-sysV-init.patch
 create mode 100644 99-remote-control-lirc.rules

diff --git a/0018-Start-lirc-0.9.1-git.patch b/0018-Start-lirc-0.9.1-git.patch
index b5f1c7d..83af27e 100644
--- a/0018-Start-lirc-0.9.1-git.patch
+++ b/0018-Start-lirc-0.9.1-git.patch
@@ -1,91 +1,25 @@
-From 7c8034be8a79dce219b60cce3afcf39f1b85d004 Mon Sep 17 00:00:00 2001
-From: Jarod Wilson <jarod@redhat.com>
-Date: Fri, 25 Mar 2011 18:27:31 -0400
-Subject: [PATCH] Start lirc 0.9.1-git
+From 08fc775629662fbdeae05b020e0c6ff9a5d45ccf Mon Sep 17 00:00:00 2001
+From: Alec Leamas <leamas@nowhere.net>
+Date: Tue, 15 Oct 2013 11:19:15 +0200
+Subject: [PATCH] patch18
 
-Signed-off-by: Jarod Wilson <jarod@redhat.com>
 ---
- ANNOUNCE                   | 4 ++--
- NEWS                       | 8 ++++++--
- configure.ac               | 2 +-
- doc/html-source/index.html | 2 +-
- setup.sh                   | 2 +-
- 5 files changed, 11 insertions(+), 7 deletions(-)
+ configure.ac | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
 
-diff --git a/ANNOUNCE b/ANNOUNCE
-index 4db8756..da33538 100644
---- a/ANNOUNCE
-+++ b/ANNOUNCE
-@@ -1,8 +1,8 @@
--LIRC - Linux Infrared Remote Control, Version: 0.9.0-git
-+LIRC - Linux Infrared Remote Control, Version: 0.9.1-git
- 
- Copyright (C) 1996 Ralph Metzler <rjkm@thp.uni-koeln.de>
- Copyright (C) 1998-2010 Christoph Bartelmus <lirc@bartelmus.de>
--Copyright (C) 2010 Jarod Wilson <jarod@redhat.com>
-+Copyright (C) 2010-2011 Jarod Wilson <jarod@redhat.com>
- (according to GNU General Public Licence 2.0 or later)
- 
- LIRC is a package that allows you to decode and send infra-red signals
-diff --git a/NEWS b/NEWS
-index 08d1abf..c097f0d 100644
---- a/NEWS
-+++ b/NEWS
-@@ -1,4 +1,9 @@
--0.9.0-git: UNDER DEVELOPMENT
-+0.9.1-git: UNDER DEVELOPMENT
-+  * TBD
-+
-+0.9.0: 03/25/11
-+  * Remove mceusb, streamzap, it8x, ene0100 drivers, as they're
-+    now redundant with upstream kernel drivers
-   * fix oops unplugging igorplugusb receiver while in use (special
-     thanks to Timo Boettcher for providing hardware)
-   * more error-checking for NULL irctl in various lirc_dev paths
-@@ -13,7 +18,6 @@
-   * use portable type definitions all over the place
-   * drop an old GLIBC work-around for printing 64-bit values
-   * fix timing-specific repeat-after-release issue (Christoph Bartelmus)
--  * renamed lirc_ite8709 to lirc_it85 and updated (Yan-Min Lin, ITE)
- 
- 0.8.7: 09/06/10
-   * improved usb-uirt support for FreeBSD (John Wehle)
 diff --git a/configure.ac b/configure.ac
-index 485b8f3..4fedee1 100644
+index e47eff0..750264f 100644
 --- a/configure.ac
 +++ b/configure.ac
 @@ -7,7 +7,7 @@ AC_INIT
  AC_CONFIG_SRCDIR([daemons/lircd.c])
  AC_CONFIG_MACRO_DIR([m4])
  
--AM_INIT_AUTOMAKE(lirc, 0.9.0-git)
+-AM_INIT_AUTOMAKE(lirc, 0.9.0)
 +AM_INIT_AUTOMAKE(lirc, 0.9.1-git)
  AM_CONFIG_HEADER(config.h)
  
  CFLAGS="${CFLAGS--O2 -g -Wall}"
-diff --git a/doc/html-source/index.html b/doc/html-source/index.html
-index 77bf381..0e44f83 100644
---- a/doc/html-source/index.html
-+++ b/doc/html-source/index.html
-@@ -1,5 +1,5 @@
-     <A NAME="welcome"></A><HR>
--    <H1 ALIGN="CENTER">Welcome to the LIRC 0.9.0-git Manual</H1>
-+    <H1 ALIGN="CENTER">Welcome to the LIRC 0.9.1-git Manual</H1>
-     <HR WIDTH="70%">
-     
-     <P>
-diff --git a/setup.sh b/setup.sh
-index 6220cda..9a3bdec 100755
---- a/setup.sh
-+++ b/setup.sh
-@@ -1,6 +1,6 @@
- #! /bin/sh
- 
--LIRC_VERSION="0.9.0-git"
-+LIRC_VERSION="0.9.1-git"
- 
- #############################################################################
- ## Default Values
 -- 
 1.8.3.1
 
diff --git a/0019-lircs-use-systemctl-instead-of-sysV-init.patch b/0019-lircs-use-systemctl-instead-of-sysV-init.patch
new file mode 100644
index 0000000..ff2452a
--- /dev/null
+++ b/0019-lircs-use-systemctl-instead-of-sysV-init.patch
@@ -0,0 +1,43 @@
+From 55870fd91d8e36927f6807931ecd1cfa49ce4ed1 Mon Sep 17 00:00:00 2001
+From: Alec Leamas <leamas.alec@gmail.com>
+Date: Fri, 18 Oct 2013 00:21:44 +0200
+Subject: [PATCH] lircs: use systemctl instead of sysV init.
+
+---
+ lirc-0.9.0/contrib/lircs | 6 +++---
+ 1 file changed, 3 insertions(+), 3 deletions(-)
+
+diff --git a/contrib/lircs b/contrib/lircs
+index 1db2f2a..47350f9 100755
+--- a/contrib/lircs
++++ b/contrib/lircs
+@@ -24,7 +24,7 @@
+ CONFIG_FILE=${HOME}/.lircrc
+
+ # any editor to edit LIRC config file
+-FILE_EDITOR=vim
++FILE_EDITOR=${EDITOR:-vim}
+
+
+
+@@ -48,7 +48,7 @@ start_clients () {
+ restart_lircd () {
+ 	if [ "${USER}" = "root" ]; then
+ 		# change this if your Linux system keeps the init scripts elsewhere
+-		/sbin/init.d/lircd restart
++		systemctl restart lircd.service
+ 	else
+ 		echo "`basename ${0}`: you must be 'root' to restart the LIRC daemon (lircd)."
+ 		exit 1
+@@ -58,7 +58,7 @@ restart_lircd () {
+ stop_lircd () {
+ 	if [ "${USER}" = "root" ]; then
+ 		# change this if your Linux system keeps the init scripts elsewhere
+-		/sbin/init.d/lircd stop
++		systemctl stop lircd.service
+ 	else
+ 		echo "`basename ${0}`: you must be 'root' to stop the LIRC daemon (lircd)."
+ 		exit 1
+--
+1.8.3.1
+
diff --git a/0100-configure-ac-revert-to-git-branch.patch b/0100-configure-ac-revert-to-git-branch.patch
index 2ae5e34..96ec399 100644
--- a/0100-configure-ac-revert-to-git-branch.patch
+++ b/0100-configure-ac-revert-to-git-branch.patch
@@ -1,26 +1,25 @@
-From 7635b1e321bf2f98468ae4f2233e28e3d78505cb Mon Sep 17 00:00:00 2001
+From f23dfe414e95def3c094a344f7b27eedd06b062e Mon Sep 17 00:00:00 2001
 From: Alec Leamas <leamas@nowhere.net>
-Date: Fri, 11 Oct 2013 05:50:12 +0200
-Subject: [PATCH] configure-ac: revert to git branch
+Date: Tue, 15 Oct 2013 11:07:25 +0200
+Subject: [PATCH] Reverting to 0.9.1-git (base for upstream patches)
 
-rebasing for further changes to match upstream merge request.
 ---
  configure.ac | 2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 diff --git a/configure.ac b/configure.ac
-index 5a9b31d..9efe2f9 100644
+index 052908b..51ee9a5 100644
 --- a/configure.ac
 +++ b/configure.ac
 @@ -7,7 +7,7 @@ AC_INIT
  AC_CONFIG_SRCDIR([daemons/lircd.c])
  AC_CONFIG_MACRO_DIR([m4])
-
+ 
 -AM_INIT_AUTOMAKE(lirc, 0.9.0)
 +AM_INIT_AUTOMAKE(lirc, 0.9.1-git)
  AM_CONFIG_HEADER(config.h)
-
+ 
  CFLAGS="${CFLAGS--O2 -g -Wall}"
---
+-- 
 1.8.3.1
 
diff --git a/0104-Add-systemd-socket-activation-support.patch b/0104-Add-systemd-socket-activation-support.patch
index 0481231..e2f0ab6 100644
--- a/0104-Add-systemd-socket-activation-support.patch
+++ b/0104-Add-systemd-socket-activation-support.patch
@@ -1,31 +1,15 @@
-From 171ac321f1e97a60fbda3858c4c84d60d0b7dacb Mon Sep 17 00:00:00 2001
-From: Alec Leamas <alec@tests.notat.diaspora.com>
-Date: Wed, 9 Oct 2013 20:57:12 +0200
-Subject: [PATCH 104/105] Add systemd socket activation support.
+From b5fec91d4b91e6798e9c92b389b96f7f44639a9a Mon Sep 17 00:00:00 2001
+From: Alec Leamas <leamas@nowhere.net>
+Date: Tue, 15 Oct 2013 07:34:51 +0200
+Subject: [PATCH] fixing 104
 
-Since systemd was introduced lirc clients have had problems at
-startup when trying to connect to the lircd socket before it's
-created. The root cause is the aggressive parallell boot performed
-by systemd.
-
-The solution is to add socket activation. In this mode, the socket
-is created by systemd and handed over to lircd at startup. The patch
-implements this. It should be reasonably transparent.
-
-At configure time it enables systemd support if it's available,
-otherwise it's silently ignored.
-
-In runtime lircd looks for and uses a socket handed over by systemd.
-If there is no such socket it proceeds as normal.
-
-Adds a dependency on pkg-config for the PKG_CHECK_MODULES macro.
 ---
  configure.ac    |  7 +++++
- daemons/lircd.c | 94 ++++++++++++++++++++++++++++++++++-----------------------
- 2 files changed, 63 insertions(+), 38 deletions(-)
+ daemons/lircd.c | 95 ++++++++++++++++++++++++++++++++++-----------------------
+ 2 files changed, 63 insertions(+), 39 deletions(-)
 
 diff --git a/configure.ac b/configure.ac
-index af28e4f..7df186a 100644
+index 0ee99e4..e49dc8d 100644
 --- a/configure.ac
 +++ b/configure.ac
 @@ -232,6 +232,9 @@ AH_TEMPLATE([HAVE_SCSI],
@@ -50,9 +34,18 @@ index af28e4f..7df186a 100644
  
  AC_ARG_WITH(driver,
 diff --git a/daemons/lircd.c b/daemons/lircd.c
-index 8ace7af..9cde69b 100644
+index 8ace7af..5b8f361 100644
 --- a/daemons/lircd.c
 +++ b/daemons/lircd.c
+@@ -5,7 +5,7 @@
+  ****************************************************************************
+  *
+  * lircd - LIRC Decoder Daemon
+- * 
++ *
+  * Copyright (C) 1996,97 Ralph Metzler <rjkm@thp.uni-koeln.de>
+  * Copyright (C) 1998,99 Christoph Bartelmus <lirc@bartelmus.de>
+  *
 @@ -63,6 +63,10 @@
  #include "input_map.h"
  #endif
@@ -72,7 +65,7 @@ index 8ace7af..9cde69b 100644
  
  	/* create pid lockfile in /var/run */
  	if ((fd = open(pidfile, O_RDWR | O_CREAT, 0644)) == -1 || (pidf = fdopen(fd, "r+")) == NULL) {
-@@ -881,51 +886,64 @@ void start_server(mode_t permission, int nodaemon)
+@@ -881,51 +886,63 @@ void start_server(mode_t permission, int nodaemon)
  	(void)ftruncate(fileno(pidf), ftell(pidf));
  
  	/* create socket */
@@ -87,7 +80,6 @@ index 8ace7af..9cde69b 100644
 +                fprintf(stderr, "Too many file descriptors received.\n");
  		goto start_server_failed0;
 -	}
-+                exit(1);
 +        }
 +        else if (n == 1)
 +                sockfd  = SD_LISTEN_FDS_START + 0;
diff --git a/99-remote-control-lirc.rules b/99-remote-control-lirc.rules
new file mode 100644
index 0000000..c6d6bed
--- /dev/null
+++ b/99-remote-control-lirc.rules
@@ -0,0 +1 @@
+SUBSYSTEM=="rc", ATTR{protocols}="lirc"
diff --git a/README.fedora b/README.fedora
index 43458c4..090003a 100644
--- a/README.fedora
+++ b/README.fedora
@@ -1,6 +1,33 @@
 ## Fedora README
 
-As of current releases, the Fedora lirc package sports systemd socket
+#### New service name: lirc -> lircd.
+
+For reasons of consistency we have renamed the lirc service to
+lircd. Basically, this means that to start the service one need
+to use systemctl start lircd.service instead of lirc.service etc.
+Sorry for the inconvenience.
+
+#### Enable lirc protocol
+
+For lirc to work with ir devices, the lirc protocol must be enabled
+for the actual device used. This only applies to ir devices which
+are visible as /sys/class/rc/rc? devices. E. g., I have an RF remote
+which is just an usb device (driver atilibusb) and this one does
+*not* require the the lirc protocol to be enabled in this way.
+
+If you have a "classic" ir device needing lirc to be enabled one option
+is to install the lirc-disable-kernel-rc subpackage. This is an udev
+rule which disables the kernel built-in ir device handling and makes
+lirc the only protocol used. This might or might not be what you want.
+
+Another option is to set the LIRCD_IR_DEVICE in /etc/sysconfig/lirc. This
+will enable the lirc protocol for that device when lirc is running. The
+kernel built-in protocols are still in place, but not used. Again, this
+might or might not be what you want.
+
+#### Socket activation
+
+As of 0.9.4-15+, the Fedora lirc package sports systemd socket
 activation. This should fix the problems at startup when clients can't
 connect to /var/run/lircd because the lircd service is yet not started.
 
@@ -14,5 +41,41 @@ The lircmd is started the usual way:
     # systemctl enable lircmd.service
     # systemctl start lircmd.service
 
+#### Running another instance.
+
+Sometimes another lircd instance is required to handle some other input
+device. This could be done by creating a new service definition in
+/etc/systemd/system.
+
+In my case I have an extra instance handling ir output to the transciever.
+This is accomplished with  a file /etc/systemd/system/lirc-tx:
+----------------
+[Unit]
+Description=LIRC Infrared Signal Decoder
+After=network.target
+
+[Service]
+Type=simple
+ExecStart=/usr/sbin/lircd --driver=iguanaIR \
+                          --device=/var/run/iguanaIR/0 \
+                          --output=/var/run/lirc/lircd-tx \
+                          --pidfile=/run/lirc/dont-use-lircd-tx.pid \
+                          --nodaemon \
+                          --allow-simulate
+
+[Install]
+WantedBy=multi-user.target
+
+-----------------------
+
+This defines a new service which can be started using
+'systemctl start lirc-tx' etc. It's essential that each service has an
+unique output socket. You should probably also think twice before running
+two instances with the same input device.
+
+
+
+
+
 
 http://stackoverflow.com/questions/11939255/writing-to-dev-uinput-on-ubuntu-12-04
diff --git a/lirc.spec b/lirc.spec
index 48630e2..239c2da 100644
--- a/lirc.spec
+++ b/lirc.spec
@@ -6,7 +6,6 @@
 #         https://sf.net/mailarchive/forum.php?forum_name=lirc-list&viewmonth=201310
 #
 
-
 %bcond_without  alsa
 %bcond_without  portaudio
 %bcond_without  x
@@ -23,7 +22,7 @@
 Name:           lirc
 Version:        0.9.0
 %if 0%{?released}
-Release:        15%{?dist}
+Release:        17%{?dist}
 %else
 Release:        0.2.%{pre}%{?dist}
 %endif
@@ -44,6 +43,7 @@ Source3:        lircmd.service
 Source4:        lircd.socket
 Source5:        lirc.conf
 Source6:        README.fedora
+Source7:        99-remote-control-lirc.rules
                 # Patches 7..17 are from upstream.
 Patch7:         0007-Make-lirc_wpc8769l-functional-again.patch
 Patch8:         0008-lirc_sir-fix-resource-busy-error-from-bunk-lirc_open.patch
@@ -57,16 +57,16 @@ Patch15:        0015-media-lirc_dev-fixes-in-lirc_dev_fop_read.patch
 Patch16:        0016-media-lirc_dev-add-some-__user-annotations.patch
 Patch17:        0017-media-media-rc-lirc_dev-check-kobject_set_name-resul.patch
 Patch18:        0018-Start-lirc-0.9.1-git.patch
-                # 101-104 is upstream merge request, 101+105
-                # local support which should no upstream.
-Patch100:       0100-configure-ac-revert-to-git-branch.patch
+Patch19:        0019-lircs-use-systemctl-instead-of-sysV-init.patch
+                # 101-104: upstream merge request:
+                #    https://sourceforge.net/p/lirc/git/merge-requests/3/
 Patch101:       0101-Stripping-some-eol-whitespace.patch
 Patch102:       0102-Update-autotools-config-files.patch
 Patch103:       0103-xmode2.c-Use-generic-fixed-font-instead-of-Courier.patch
 Patch104:       0104-Add-systemd-socket-activation-support.patch
+                # local glue which should not go upstream.
 Patch105:       0105-configure-ac-back-to-0.9.0.patch
 
-BuildRequires:  %{__perl}
 Buildrequires:  autoconf
 BuildRequires:  automake
 
@@ -161,6 +161,15 @@ signals as well as user space applications which allow controlling a
 computer with a remote control.  This package contains a collection
 of remote control configuration files.
 
+%package        disable-kernel-rc
+Summary:        Disable kernel ir device handling in favor of lirc
+Requires:       %{name} = %{version}-%{release}
+
+%description  disable-kernel-rc
+Udev rule which disables the kernel built-in handling of infrared devices
+(i. e., rc* ones) by making lirc the only used protocol. An alternative is
+to use the LIRCD_IR_DEVICE option in /etc/sysconfig/lirc
+
 
 # Don't provide or require anything from _docdir, per policy.
 %global __provides_exclude_from ^%{_docdir}/.*$
@@ -185,8 +194,9 @@ of remote control configuration files.
 %patch15 -p1
 %patch16 -p1
 %patch17 -p1
+%patch18 -p1
+%patch19 -p1
 
-%patch100 -p1
 %patch101 -p1
 %patch102 -p1
 %patch103 -p1
@@ -198,16 +208,17 @@ chmod +x contrib/hal
 chmod +x daemons/input_map.sh
 
 sed -i -e 's|/usr/local/etc/|/etc/|' contrib/irman2lirc
-sed -i -e 's|/sbin/init.d/lircd|%{_initrddir}/lirc|' contrib/lircs
 
 for f in remotes/chronos/lircd.conf.chronos \
     remotes/creative/lircd.conf.livedrive remotes/atiusb/lircd.conf.atiusb \
-    NEWS ChangeLog AUTHORS contrib/lircrc ; do
+    NEWS ChangeLog AUTHORS contrib/lircrc
+do
     iconv -f iso-8859-1 -t utf-8 $f > $f.utf8 ; mv $f.utf8 $f
 done
 
 
 %build
+mkdir m4 || :
 autoreconf -fi
 
 %configure \
@@ -235,6 +246,8 @@ install -Dpm 644 %{SOURCE4} $RPM_BUILD_ROOT%{_unitdir}/lircd.socket
 install -Dpm 644 %{SOURCE2} $RPM_BUILD_ROOT/etc/sysconfig/lirc
 install -Dpm 644 %{SOURCE5} $RPM_BUILD_ROOT/etc/lirc/lircd.conf
 install -Dpm 644 %{SOURCE5} $RPM_BUILD_ROOT/etc/lirc/lircmd.conf
+install -Dpm 644 %{SOURCE7} \
+    $RPM_BUILD_ROOT%{_udevrulesdir}/99-remote-control-lirc.rules
 cp -a %{SOURCE6} README.fedora
 
 # Put remote definitions in place
@@ -256,13 +269,14 @@ rm -rf doc/Makefile* doc/.libs doc/man* doc/lirc.hwdb
 rm -rf contrib/irman2lirc contrib/lirc.* contrib/sendxevent.c
 cd ..
 
-mkdir -p $RPM_BUILD_ROOT/etc/tmpfiles.d
+mkdir -p $RPM_BUILD_ROOT/%{_tmpfilesdir}
 echo "d /var/run/lirc  0755  root  root  10d" \
-    > $RPM_BUILD_ROOT/etc/tmpfiles.d/lirc.conf
+    > $RPM_BUILD_ROOT/%{_tmpfilesdir}/lirc.conf
 
 
 %post
 %systemd_post lircd.service lircmd.service
+systemd-tmpfiles --create %{_tmpfilesdir}/lirc.conf
 
 %post libs -p /sbin/ldconfig
 
@@ -291,7 +305,7 @@ echo "d /var/run/lirc  0755  root  root  10d" \
 %dir  /etc/lirc
 %config(noreplace) /etc/lirc/lirc*d.conf
 %config(noreplace) /etc/sysconfig/lirc
-%config(noreplace) /etc/tmpfiles.d/lirc.conf
+%{_tmpfilesdir}/lirc.conf
 %{_unitdir}/lirc*
 %{_bindir}/*ir*
 %{_bindir}/*mode2
@@ -316,10 +330,26 @@ echo "d /var/run/lirc  0755  root  root  10d" \
 %doc AUTHORS ChangeLog COPYING README
 %{_datadir}/lirc-remotes
 
+%files disable-kernel-rc
+%{_udevrulesdir}/99-remote-control-lirc.rules
+
 
 %changelog
+* Thu Oct 17 2013 Alec Leamas <leamas.alec@nowhere.net> - 0.9.0-17
+- Add a udev "Only use lirc" subpackage.
+- Revise enabling of lirc protocol.
+- Documenting upstream merge request.
+- Resurrect contrib/lircs, use systemctl.
+- Force creation of /run/lirc after installation.
+- Use /lib/tmpfiles.d, not /etc/tmpfiles.d with _tmpfilesdir macro.
+
+* Tue Oct 15 2013 Wolfgang Ulbrich <chat-to-me@raveit.de> - 0.9.0-16
+- fix build for f18
+- remove BR perl, already called in build system
+- fix bogus in changelog date
+
 * Thu Oct 10 2013 Alec Leamas <leamas.alec@nowhere.net> - 0.9.0-15
-- Actually use sysconfig files (881976)
+- Actually use sysconfig files (881976).
 - Modify lirc.service to not fork.
 - Add support for iguanaIR driver (#954146).
 - Add hardened build flag (955144).
@@ -633,7 +663,7 @@ echo "d /var/run/lirc  0755  root  root  10d" \
 * Sun Apr 17 2005 Ville Skyttä <ville.skytta at iki.fi> 0.7.1-2
 - 0.7.1.
 
-* Fri Apr  7 2005 Michael Schwendt <mschwendt[AT]users.sf.net>
+* Thu Apr 7 2005 Michael Schwendt <mschwendt[AT]users.sf.net>
 - rebuilt
 
 * Sun Dec  5 2004 Ville Skyttä <ville.skytta at iki.fi> 0.7.0-1
diff --git a/lirc.sysconfig b/lirc.sysconfig
index 1bca325..4e32a76 100644
--- a/lirc.sysconfig
+++ b/lirc.sysconfig
@@ -11,12 +11,21 @@ LIRCD_OPTIONS=""
 LIRC_DRIVER="default"
 
 # Which lirc device will be used by lircd(8).
-# This is the same as passing "-d device" to lircd.
-# An empty value will use the default /dev/lirc0 device.
+# This is the same as passing "-d device" to lircd. It must be set.
 LIRC_DEVICE="/dev/lirc0"
 
-# Options to lircmd(8). The default --version effectively disables
-# lircmd, setting it to "" enables it with default options. lircmd
-# always runs with --nodaemon added to LIRCMD_OPTIONS.
-LIRCMD_OPTIONS="--version"
+# Options to lircmd(8). lircmd always runs with --nodaemon added
+# to LIRCMD_OPTIONS.
+LIRCMD_OPTIONS=""
+
+# The infrared device used by lirc, if any. If this is set, lircd will
+# enable the lirc protocol and disable kernel built-in handling using
+# "echo lirc > /sys/class/rc/$LIRCD_IR_DEVICE/protocols" at startup.
+# If unset, this is ignored.
+# - The common case when there is just one ir device: LIRCD_IR_DEVICE="rc0".
+# - Non-IR devices e. g., RF ones typically don't need this set.
+# - If not set when required, the typical symptom is duobled key-presses.
+# - If installing the lirc-disable-kernel-rc subpackage this setting is not
+#   needed.
+LIRCD_IR_DEVICE=""
 
diff --git a/lircd.service b/lircd.service
index fd184cb..f8e92e8 100644
--- a/lircd.service
+++ b/lircd.service
@@ -5,9 +5,12 @@ After=network.target
 [Service]
 Type=simple
 EnvironmentFile=-/etc/sysconfig/lirc
-ExecStartPre=/bin/sh -c 'echo lirc > /sys/class/rc/rc0/protocols'
+ExecStartPre=/bin/sh -c 'test -n "$LIRCD_IR_DEVICE" && \
+    echo lirc > /sys/class/rc/$LIRCD_IR_DEVICE/protocols || :'
 ExecStart=/usr/sbin/lircd $LIRCD_OPTIONS \
     --driver $LIRC_DRIVER --device $LIRC_DEVICE  --nodaemon
+ExecStopPost=/bin/sh -c 'test -n "$LIRCD_IR_DEVICE" && \
+    echo -lirc > /sys/class/rc/$LIRCD_IR_DEVICE/protocols || :'
 
 [Install]
 WantedBy=multi-user.target
diff --git a/lircd.socket b/lircd.socket
index ef9752f..0ee7d0d 100644
--- a/lircd.socket
+++ b/lircd.socket
@@ -3,4 +3,5 @@ ListenStream=/run/lirc/lircd
 
 [Install]
 WantedBy=sockets.target
+Also=lircd.service
 

From b750a68f17eab54db07945af068c47dddb323773 Mon Sep 17 00:00:00 2001
From: Alec Leamas <alec@tests.notat.diaspora.com>
Date: Wed, 6 Nov 2013 21:40:01 +0100
Subject: [PATCH 113/204] READNE.fedora: add Troubleshooting

---
 README.fedora | 46 +++++++++++++++++++++++++++++++++++++++++-----
 1 file changed, 41 insertions(+), 5 deletions(-)

diff --git a/README.fedora b/README.fedora
index 090003a..8c26af7 100644
--- a/README.fedora
+++ b/README.fedora
@@ -32,15 +32,15 @@ activation. This should fix the problems at startup when clients can't
 connect to /var/run/lircd because the lircd service is yet not started.
 
 To start the lircd service using socket activation:
-
+```
     # systemctl enable lircd.socket
     # systemctl start lircd.socket
-
+```
 The lircmd is started the usual way:
-
+```
     # systemctl enable lircmd.service
     # systemctl start lircmd.service
-
+```
 #### Running another instance.
 
 Sometimes another lircd instance is required to handle some other input
@@ -73,9 +73,45 @@ This defines a new service which can be started using
 unique output socket. You should probably also think twice before running
 two instances with the same input device.
 
+## Troubleshooting
+
+Getting lircd logs from last boot cycle:
+```
+    # journalctl -b /usr/sbin/lircd
+```
+
+If lircd fails to start or dies after restart, first check logs for errors:
+```
+    # journalctl -f &
+    # systemctl restart lircd.service
+```
+
+You could also run lircd in foreground after stopping service:
+```
+    # systemctl stop lircd.service
+    # bash
+    # source /etc/systconfig/lirc
+    # /usr/sbin/lircd $LIRCD_OPTIONS --driver $LIRC_DRIVER \
+    > --device $LIRC_DEVICE  --nodaemon
+```
+
+Sometimes kernel complains about multiple clients trying to access the
+same device. In this case you need to blacklist some kernel module
+to make the kernel device available for lircd. One example is my RF
+remote using the atilibusb driver. This needs to blacklist the built_in
+ati_remote module. This is is done by creating the file
+/etc/modprobe.conf.d/blacklist-ati-remote.conf as:
+```
+# Block built-in handling of ati-remote (use lircd instead).
+blacklist ati_remote
+```
+
+
+
+
+
 
 
 
 
 
-http://stackoverflow.com/questions/11939255/writing-to-dev-uinput-on-ubuntu-12-04

From 403ead103dcc096ddbcd32c9c866eb44b42d8433 Mon Sep 17 00:00:00 2001
From: Alec Leamas <leamas@nowhere.net>
Date: Sun, 10 Nov 2013 16:50:48 +0100
Subject: [PATCH 114/204] lircmd.service: bugfix

lircmd referred to lirc.service instead of lircd.service.
See: https://admin.fedoraproject.org/updates/FEDORA-2013-19479/
---
 lircmd.service | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lircmd.service b/lircmd.service
index dfac1ca..5aac869 100644
--- a/lircmd.service
+++ b/lircmd.service
@@ -1,7 +1,7 @@
 [Unit]
 Description=LIRC Infrared Mouse Event Signal Decoder
 Requires=lirc.service
-After=network.target lirc.service
+After=network.target lircd.service
 
 [Service]
 Type=simple

From ecfca275d3e061f62b213cac044a3ee20c560f3c Mon Sep 17 00:00:00 2001
From: Alec Leamas <leamas@nowhere.net>
Date: Mon, 11 Nov 2013 09:53:31 +0100
Subject: [PATCH 115/204] spec: remove stale lirc.service links. Changelog
 update

---
 lirc.spec | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/lirc.spec b/lirc.spec
index 239c2da..af4f82a 100644
--- a/lirc.spec
+++ b/lirc.spec
@@ -22,7 +22,7 @@
 Name:           lirc
 Version:        0.9.0
 %if 0%{?released}
-Release:        17%{?dist}
+Release:        18%{?dist}
 %else
 Release:        0.2.%{pre}%{?dist}
 %endif
@@ -277,6 +277,8 @@ echo "d /var/run/lirc  0755  root  root  10d" \
 %post
 %systemd_post lircd.service lircmd.service
 systemd-tmpfiles --create %{_tmpfilesdir}/lirc.conf
+# Remove stale links after service name change lirc -> lircd:
+find /etc -name lirc.service -xtype l -delete
 
 %post libs -p /sbin/ldconfig
 
@@ -335,6 +337,11 @@ systemd-tmpfiles --create %{_tmpfilesdir}/lirc.conf
 
 
 %changelog
+* Tue Nov 12 2013 Alec Leamas <leamas.alec@nowhere.net> - 0.9.0-18
+- Remove old nowadays stale links to lirc.service.
+- Fix broken reference to lirc.service in lircmd.service
+- Update README
+
 * Thu Oct 17 2013 Alec Leamas <leamas.alec@nowhere.net> - 0.9.0-17
 - Add a udev "Only use lirc" subpackage.
 - Revise enabling of lirc protocol.

From 8053f59d0d642e1e5d17a2d26d7e06a82fce148e Mon Sep 17 00:00:00 2001
From: Alec Leamas <leamas@nowhere.net>
Date: Mon, 11 Nov 2013 11:24:20 +0100
Subject: [PATCH 116/204] lircmd.service: really fix lircd reference.

---
 lircmd.service | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lircmd.service b/lircmd.service
index 5aac869..246d3f8 100644
--- a/lircmd.service
+++ b/lircmd.service
@@ -1,6 +1,6 @@
 [Unit]
 Description=LIRC Infrared Mouse Event Signal Decoder
-Requires=lirc.service
+Requires=lircd.service
 After=network.target lircd.service
 
 [Service]

From eab16d19ccc3eb510f424ae63207f495f3c72492 Mon Sep 17 00:00:00 2001
From: Alec Leamas <leamas.alec@gmail.com>
Date: Tue, 12 Nov 2013 10:33:07 +0100
Subject: [PATCH 117/204] spec: enhance removal of lirc.service stale links

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

diff --git a/lirc.spec b/lirc.spec
index af4f82a..8294657 100644
--- a/lirc.spec
+++ b/lirc.spec
@@ -278,7 +278,7 @@ echo "d /var/run/lirc  0755  root  root  10d" \
 %systemd_post lircd.service lircmd.service
 systemd-tmpfiles --create %{_tmpfilesdir}/lirc.conf
 # Remove stale links after service name change lirc -> lircd:
-find /etc -name lirc.service -xtype l -delete
+find /etc/systemd -name lirc.service -xtype l -delete || :
 
 %post libs -p /sbin/ldconfig
 

From 49e24f101242c0eb8bb5b82affcc24f3c8d1a688 Mon Sep 17 00:00:00 2001
From: Alec Leamas <leamas@nowhere.net>
Date: Sat, 16 Nov 2013 06:16:25 +0100
Subject: [PATCH 118/204] Fixing missing {} in service files (1025030 comment
 24)

---
 lirc.spec      |  7 +++++--
 lircd.service  | 12 ++++++------
 lircmd.service |  2 +-
 3 files changed, 12 insertions(+), 9 deletions(-)

diff --git a/lirc.spec b/lirc.spec
index 8294657..b6d05e2 100644
--- a/lirc.spec
+++ b/lirc.spec
@@ -22,9 +22,9 @@
 Name:           lirc
 Version:        0.9.0
 %if 0%{?released}
-Release:        18%{?dist}
+Release:        19%{?dist}
 %else
-Release:        0.2.%{pre}%{?dist}
+Release:        0.3.%{pre}%{?dist}
 %endif
 Summary:        The Linux Infrared Remote Control package
 
@@ -337,6 +337,9 @@ find /etc/systemd -name lirc.service -xtype l -delete || :
 
 
 %changelog
+* Sat Nov 16 2013 Alec Leamas <leamas.alec@gmail.com> - 0.9.0-19
+- Fix missing {} in lircd.service (bz 1025030, comment 24)
+
 * Tue Nov 12 2013 Alec Leamas <leamas.alec@nowhere.net> - 0.9.0-18
 - Remove old nowadays stale links to lirc.service.
 - Fix broken reference to lirc.service in lircmd.service
diff --git a/lircd.service b/lircd.service
index f8e92e8..c765deb 100644
--- a/lircd.service
+++ b/lircd.service
@@ -5,12 +5,12 @@ After=network.target
 [Service]
 Type=simple
 EnvironmentFile=-/etc/sysconfig/lirc
-ExecStartPre=/bin/sh -c 'test -n "$LIRCD_IR_DEVICE" && \
-    echo lirc > /sys/class/rc/$LIRCD_IR_DEVICE/protocols || :'
-ExecStart=/usr/sbin/lircd $LIRCD_OPTIONS \
-    --driver $LIRC_DRIVER --device $LIRC_DEVICE  --nodaemon
-ExecStopPost=/bin/sh -c 'test -n "$LIRCD_IR_DEVICE" && \
-    echo -lirc > /sys/class/rc/$LIRCD_IR_DEVICE/protocols || :'
+ExecStartPre=/bin/sh -c 'test -n "${LIRCD_IR_DEVICE}" && \
+    echo lirc > /sys/class/rc/${LIRCD_IR_DEVICE}/protocols || :'
+ExecStart=/usr/sbin/lircd ${LIRCD_OPTIONS} \
+    --driver $LIRC_DRIVER --device ${LIRC_DEVICE}  --nodaemon
+ExecStopPost=/bin/sh -c 'test -n "${LIRCD_IR_DEVICE}" && \
+    echo -lirc > /sys/class/rc/${LIRCD_IR_DEVICE}/protocols || :'
 
 [Install]
 WantedBy=multi-user.target
diff --git a/lircmd.service b/lircmd.service
index 246d3f8..0e8af8b 100644
--- a/lircmd.service
+++ b/lircmd.service
@@ -6,7 +6,7 @@ After=network.target lircd.service
 [Service]
 Type=simple
 EnvironmentFile=-/etc/sysconfig/lirc
-ExecStart=/usr/sbin/lircmd  $LIRCMD_OPTIONS --nodaemon
+ExecStart=/usr/sbin/lircmd  ${LIRCMD_OPTIONS} --nodaemon
 
 [Install]
 WantedBy=multi-user.target

From 122e60c2c0a27d56a2e93728a20e097fb80bdd6c Mon Sep 17 00:00:00 2001
From: Alec Leamas <leamas@nowhere.net>
Date: Sun, 17 Nov 2013 04:44:16 +0100
Subject: [PATCH 119/204] lircd.service: typo, ignore errors when setting
 up/tearing down.

---
 lircd.service | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/lircd.service b/lircd.service
index c765deb..231df21 100644
--- a/lircd.service
+++ b/lircd.service
@@ -5,11 +5,11 @@ After=network.target
 [Service]
 Type=simple
 EnvironmentFile=-/etc/sysconfig/lirc
-ExecStartPre=/bin/sh -c 'test -n "${LIRCD_IR_DEVICE}" && \
+ExecStartPre=-/bin/sh -c 'test -n "${LIRCD_IR_DEVICE}" && \
     echo lirc > /sys/class/rc/${LIRCD_IR_DEVICE}/protocols || :'
 ExecStart=/usr/sbin/lircd ${LIRCD_OPTIONS} \
-    --driver $LIRC_DRIVER --device ${LIRC_DEVICE}  --nodaemon
-ExecStopPost=/bin/sh -c 'test -n "${LIRCD_IR_DEVICE}" && \
+    --driver ${LIRC_DRIVER} --device ${LIRC_DEVICE}  --nodaemon
+ExecStopPost=-/bin/sh -c 'test -n "${LIRCD_IR_DEVICE}" && \
     echo -lirc > /sys/class/rc/${LIRCD_IR_DEVICE}/protocols || :'
 
 [Install]

From eeaef3997e3e99abbee9da4b6fd16e3aa9ed4862 Mon Sep 17 00:00:00 2001
From: Alec Leamas <leamas@nowhere.net>
Date: Sun, 17 Nov 2013 04:47:06 +0100
Subject: [PATCH 120/204] Bumping specfile

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

diff --git a/lirc.spec b/lirc.spec
index b6d05e2..d34b098 100644
--- a/lirc.spec
+++ b/lirc.spec
@@ -22,9 +22,9 @@
 Name:           lirc
 Version:        0.9.0
 %if 0%{?released}
-Release:        19%{?dist}
+Release:        20%{?dist}
 %else
-Release:        0.3.%{pre}%{?dist}
+Release:        0.4.%{pre}%{?dist}
 %endif
 Summary:        The Linux Infrared Remote Control package
 
@@ -337,6 +337,10 @@ find /etc/systemd -name lirc.service -xtype l -delete || :
 
 
 %changelog
+* Sun Nov 17 2013 leamas.alec@gmail.com - 0.9.0-20
+- Fixing typo in -20.
+- Ignore errors in PreExec/PostExec.
+
 * Sat Nov 16 2013 Alec Leamas <leamas.alec@gmail.com> - 0.9.0-19
 - Fix missing {} in lircd.service (bz 1025030, comment 24)
 

From bc430f8092dd3c93dbd534d6d6c89ca2dee4f1e4 Mon Sep 17 00:00:00 2001
From: Alec Leamas <leamas@nowhere.net>
Date: Sun, 17 Nov 2013 05:39:24 +0100
Subject: [PATCH 121/204] lircd.service: add sh wrapper, bump spec.

---
 lirc.spec     | 7 +++++--
 lircd.service | 4 ++--
 2 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/lirc.spec b/lirc.spec
index d34b098..25f9eb5 100644
--- a/lirc.spec
+++ b/lirc.spec
@@ -22,9 +22,9 @@
 Name:           lirc
 Version:        0.9.0
 %if 0%{?released}
-Release:        20%{?dist}
+Release:        21%{?dist}
 %else
-Release:        0.4.%{pre}%{?dist}
+Release:        0.5.%{pre}%{?dist}
 %endif
 Summary:        The Linux Infrared Remote Control package
 
@@ -337,6 +337,9 @@ find /etc/systemd -name lirc.service -xtype l -delete || :
 
 
 %changelog
+* Sun Nov 17 2013 leamas.alec@gmail.com - 0.9.0-21
+- lircd.service: add sh wrapper to handle empty argumentes.
+
 * Sun Nov 17 2013 leamas.alec@gmail.com - 0.9.0-20
 - Fixing typo in -20.
 - Ignore errors in PreExec/PostExec.
diff --git a/lircd.service b/lircd.service
index 231df21..3506df7 100644
--- a/lircd.service
+++ b/lircd.service
@@ -7,8 +7,8 @@ Type=simple
 EnvironmentFile=-/etc/sysconfig/lirc
 ExecStartPre=-/bin/sh -c 'test -n "${LIRCD_IR_DEVICE}" && \
     echo lirc > /sys/class/rc/${LIRCD_IR_DEVICE}/protocols || :'
-ExecStart=/usr/sbin/lircd ${LIRCD_OPTIONS} \
-    --driver ${LIRC_DRIVER} --device ${LIRC_DEVICE}  --nodaemon
+ExecStart=/bin/sh -c '/usr/sbin/lircd ${LIRCD_OPTIONS} \
+    --driver ${LIRC_DRIVER} --device ${LIRC_DEVICE}  --nodaemon'
 ExecStopPost=-/bin/sh -c 'test -n "${LIRCD_IR_DEVICE}" && \
     echo -lirc > /sys/class/rc/${LIRCD_IR_DEVICE}/protocols || :'
 

From a21833d1aec0fae0089d1ee65c47a23f6b805d70 Mon Sep 17 00:00:00 2001
From: Alec Leamas <alec@tests.notat.diaspora.com>
Date: Tue, 3 Dec 2013 17:19:44 +0100
Subject: [PATCH 122/204] Fix -Werror=format-security build error (#1037178).

---
 ...BS-when-using-Werror-format-security.patch | 72 +++++++++++++++++++
 lirc.spec                                     | 13 +++-
 2 files changed, 83 insertions(+), 2 deletions(-)
 create mode 100644 0200-Fixing-FTBS-when-using-Werror-format-security.patch

diff --git a/0200-Fixing-FTBS-when-using-Werror-format-security.patch b/0200-Fixing-FTBS-when-using-Werror-format-security.patch
new file mode 100644
index 0000000..31e9598
--- /dev/null
+++ b/0200-Fixing-FTBS-when-using-Werror-format-security.patch
@@ -0,0 +1,72 @@
+From ca8ef3bb75fb5759e13702f456680fc30fdc7df7 Mon Sep 17 00:00:00 2001
+From: Alec Leamas <alec@tests.notat.diaspora.com>
+Date: Tue, 3 Dec 2013 16:56:09 +0100
+Subject: [PATCH] Fixing FTBS when using -Werror=format-security
+
+Fedora moves to using above flag for security reasons. Simple
+fix to get rid of compilation error.
+---
+ doc/man2html.c | 12 ++++++------
+ 1 file changed, 6 insertions(+), 6 deletions(-)
+
+diff --git a/doc/man2html.c b/doc/man2html.c
+index e1cce31..6898f64 100644
+--- a/doc/man2html.c
++++ b/doc/man2html.c
+@@ -29,7 +29,7 @@
+ ** found, that page will be displayed.
+ **
+ ** man2html will add links to the converted manpages. The function add_links
+-** is used for that. At the moment it will add links as follows, where   
++** is used for that. At the moment it will add links as follows, where
+ **     indicates what should match to start with:
+ ** ^^^
+ ** Recognition           Item            Link
+@@ -748,7 +748,7 @@ char *scan_escape(char *c)
+ 	h = expand_string(i);
+ 	break;
+     case 'f':
+-	c++;	
++	c++;
+ 	if (*c=='\\') {
+ 	    c++;
+ 	    c=scan_escape(c);
+@@ -1579,7 +1579,7 @@ char *section_list[] = {
+     "8S", "Maintenance Commands",
+     "8V", "Maintenance Commands",
+     "L", "Local Commands",
+-/* for Solaris: 
++/* for Solaris:
+     "1", "User Commands",
+     "1B", "SunOS/BSD Compatibility Package Commands",
+     "1b", "SunOS/BSD Compatibility Package Commands",
+@@ -1924,7 +1924,7 @@ char *scan_request(char *c)
+ 		c=skip_till_newline(c+j);
+ 	    break;
+ 	case V('i','e'):
+-	    /* .ie c anything : then part of if else */	
++	    /* .ie c anything : then part of if else */
+ 	case V('i','f'):
+ 	    /* .if c anything
+ 	     * .if !c anything
+@@ -2031,7 +2031,7 @@ char *scan_request(char *c)
+ 		    f=fopen(h,"r");
+ 		    if (!f || !buf || !l)
+ 			fprintf(stderr, "Unable to open or read file %s.\n",
+-				h); 
++				h);
+ 		    else {
+ 			i=fread(buf+1,1,l,f);
+ 			fclose(f);
+@@ -3027,7 +3027,7 @@ int main(int argc, char **argv)
+ 	/* &nbsp; for mosaic users */
+ 	printf("<HR>\n<A NAME=\"index\">&nbsp;</A><H2>Index</H2>\n<DL>\n");
+ 	manidx[mip]=0;
+-	printf(manidx);
++	printf("%s", manidx);
+ 	if (subs) printf("</DL>\n");
+ 	printf("</DL>\n");
+ 	print_sig();
+-- 
+1.8.3.1
+
diff --git a/lirc.spec b/lirc.spec
index 25f9eb5..5d6e776 100644
--- a/lirc.spec
+++ b/lirc.spec
@@ -22,7 +22,7 @@
 Name:           lirc
 Version:        0.9.0
 %if 0%{?released}
-Release:        21%{?dist}
+Release:        22%{?dist}
 %else
 Release:        0.5.%{pre}%{?dist}
 %endif
@@ -66,6 +66,8 @@ Patch103:       0103-xmode2.c-Use-generic-fixed-font-instead-of-Courier.patch
 Patch104:       0104-Add-systemd-socket-activation-support.patch
                 # local glue which should not go upstream.
 Patch105:       0105-configure-ac-back-to-0.9.0.patch
+# https://sourceforge.net/p/lirc/mailman/lirc-list/?viewmonth=201312
+Patch200:       0200-Fixing-FTBS-when-using-Werror-format-security.patch
 
 Buildrequires:  autoconf
 BuildRequires:  automake
@@ -203,6 +205,8 @@ to use the LIRCD_IR_DEVICE option in /etc/sysconfig/lirc
 %patch104 -p1
 %patch105 -p1
 
+%patch200 -p1
+
 chmod 644 contrib/*
 chmod +x contrib/hal
 chmod +x daemons/input_map.sh
@@ -220,7 +224,7 @@ done
 %build
 mkdir m4 || :
 autoreconf -fi
-
+export CFLAGS="%{optflags} -Werror=format-security"
 %configure \
   --libdir=%{_libdir} \
   --disable-static \
@@ -337,6 +341,11 @@ find /etc/systemd -name lirc.service -xtype l -delete || :
 
 
 %changelog
+
+* Sun Nov 17 2013 leamas.alec@gmail.com - 0.9.0-22
+- Fix -Werror=format-security build error (#1037178).
+- Not yet built.
+
 * Sun Nov 17 2013 leamas.alec@gmail.com - 0.9.0-21
 - lircd.service: add sh wrapper to handle empty argumentes.
 

From dc8a6b39c0d8b472c0fba3446f54eb67978468ad Mon Sep 17 00:00:00 2001
From: Alec Leamas <alec@tests.notat.diaspora.com>
Date: Tue, 3 Dec 2013 17:43:28 +0100
Subject: [PATCH 123/204] Fix -Werror=format-security build error (#1037178)

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

diff --git a/lirc.spec b/lirc.spec
index 5d6e776..238f569 100644
--- a/lirc.spec
+++ b/lirc.spec
@@ -66,7 +66,7 @@ Patch103:       0103-xmode2.c-Use-generic-fixed-font-instead-of-Courier.patch
 Patch104:       0104-Add-systemd-socket-activation-support.patch
                 # local glue which should not go upstream.
 Patch105:       0105-configure-ac-back-to-0.9.0.patch
-# https://sourceforge.net/p/lirc/mailman/lirc-list/?viewmonth=201312
+                #https://sourceforge.net/p/lirc/mailman/message/31710217/
 Patch200:       0200-Fixing-FTBS-when-using-Werror-format-security.patch
 
 Buildrequires:  autoconf

From 8d098b765b76eaaf23e66778e9da607e13be8552 Mon Sep 17 00:00:00 2001
From: Alec Leamas <leamas.alec@gmail.com>
Date: Wed, 8 Jan 2014 13:49:58 +0100
Subject: [PATCH 124/204] Removing f16 systemd upgrade snippets.

---
 lirc.spec | 18 +++++-------------
 1 file changed, 5 insertions(+), 13 deletions(-)

diff --git a/lirc.spec b/lirc.spec
index 238f569..5f5d28d 100644
--- a/lirc.spec
+++ b/lirc.spec
@@ -22,9 +22,9 @@
 Name:           lirc
 Version:        0.9.0
 %if 0%{?released}
-Release:        22%{?dist}
+Release:        23%{?dist}
 %else
-Release:        0.5.%{pre}%{?dist}
+Release:        0.6.%{pre}%{?dist}
 %endif
 Summary:        The Linux Infrared Remote Control package
 
@@ -295,17 +295,6 @@ find /etc/systemd -name lirc.service -xtype l -delete || :
 %postun libs -p /sbin/ldconfig
 
 
-%triggerun -- lirc < 0.9.0-9
-# Save the current service runlevel info
-# User must manually run systemd-sysv-convert --apply lirc
-# to migrate them to systemd targets
-/usr/bin/systemd-sysv-convert --save lirc >/dev/null 2>&1 ||:
-
-# Run these because the SysV package being removed won't do them
-/sbin/chkconfig --del lirc >/dev/null 2>&1 || :
-/bin/systemctl try-restart lircd.service >/dev/null 2>&1 || :
-
-
 %files
 %doc ANNOUNCE AUTHORS ChangeLog COPYING NEWS README TODO README.fedora
 %dir  /etc/lirc
@@ -341,6 +330,9 @@ find /etc/systemd -name lirc.service -xtype l -delete || :
 
 
 %changelog
+* Wed Jan 08 2014 Alec Leamas <leamas.alec@nowhere.net> - 0.9.0-23
+- Remove f16 systemd upgrade snippets.
+- Still not built.
 
 * Sun Nov 17 2013 leamas.alec@gmail.com - 0.9.0-22
 - Fix -Werror=format-security build error (#1037178).

From f727306c8be2bc87085ebe64d6b531bd7cc88e88 Mon Sep 17 00:00:00 2001
From: Alec Leamas <leamas.alec@gmail.com>
Date: Wed, 14 May 2014 21:01:56 +0200
Subject: [PATCH 125/204] Wed Jan 08 2014 Alec Leamas <leamas.alec@nowhere.net>
 - 0.9.0-23 - Remove f16 systemd upgrade snippets.

Sun Nov 17 2013 leamas.alec@gmail.com - 0.9.0-22
- Fix -Werror=format-security build error (#1037178).
- Not built.
---
 lirc.spec | 1 -
 1 file changed, 1 deletion(-)

diff --git a/lirc.spec b/lirc.spec
index 5f5d28d..df0e9ec 100644
--- a/lirc.spec
+++ b/lirc.spec
@@ -332,7 +332,6 @@ find /etc/systemd -name lirc.service -xtype l -delete || :
 %changelog
 * Wed Jan 08 2014 Alec Leamas <leamas.alec@nowhere.net> - 0.9.0-23
 - Remove f16 systemd upgrade snippets.
-- Still not built.
 
 * Sun Nov 17 2013 leamas.alec@gmail.com - 0.9.0-22
 - Fix -Werror=format-security build error (#1037178).

From ac4e3692823ff73cc035dd98350258dc5a722158 Mon Sep 17 00:00:00 2001
From: raveit65 <chat-to-me@raveit.de>
Date: Thu, 29 May 2014 14:06:46 +0200
Subject: [PATCH 126/204] rebuild for libftdi soname bump

---
 lirc.spec | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

diff --git a/lirc.spec b/lirc.spec
index df0e9ec..9c0c7a0 100644
--- a/lirc.spec
+++ b/lirc.spec
@@ -22,7 +22,7 @@
 Name:           lirc
 Version:        0.9.0
 %if 0%{?released}
-Release:        23%{?dist}
+Release:        24%{?dist}
 %else
 Release:        0.6.%{pre}%{?dist}
 %endif
@@ -75,9 +75,9 @@ BuildRequires:  automake
 %if %{with alsa}
 BuildRequires:  alsa-lib-devel
 %endif
-%if %{with iguanaIR}
-BuildRequires:  iguanaIR-devel
-%endif
+#%if %{with iguanaIR}
+#BuildRequires:  iguanaIR-devel
+#%endif
 %if %{with ftdi}
 BuildRequires:  libftdi-devel
 %endif
@@ -330,6 +330,10 @@ find /etc/systemd -name lirc.service -xtype l -delete || :
 
 
 %changelog
+* Thu May 29 2014 Wolfgang Ulbrich <chat-to-me@raveit.de> - 0.9.0-24
+- rebuild for libftdi soname bump
+- disable BR iguanaIR temporary, it pulls in lirc-0.9.0-23 and build fails
+
 * Wed Jan 08 2014 Alec Leamas <leamas.alec@nowhere.net> - 0.9.0-23
 - Remove f16 systemd upgrade snippets.
 

From 952829370539cbc9d965d34132cb877d1cb120a8 Mon Sep 17 00:00:00 2001
From: raveit65 <chat-to-me@raveit.de>
Date: Thu, 29 May 2014 14:21:44 +0200
Subject: [PATCH 127/204] enable BR iguanaIR again

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

diff --git a/lirc.spec b/lirc.spec
index 9c0c7a0..5a9e38e 100644
--- a/lirc.spec
+++ b/lirc.spec
@@ -75,9 +75,9 @@ BuildRequires:  automake
 %if %{with alsa}
 BuildRequires:  alsa-lib-devel
 %endif
-#%if %{with iguanaIR}
-#BuildRequires:  iguanaIR-devel
-#%endif
+%if %{with iguanaIR}
+BuildRequires:  iguanaIR-devel
+%endif
 %if %{with ftdi}
 BuildRequires:  libftdi-devel
 %endif
@@ -330,6 +330,9 @@ find /etc/systemd -name lirc.service -xtype l -delete || :
 
 
 %changelog
+* Thu May 29 2014 Wolfgang Ulbrich <chat-to-me@raveit.de> - 0.9.0-25
+- enable BR iguanaIR again
+
 * Thu May 29 2014 Wolfgang Ulbrich <chat-to-me@raveit.de> - 0.9.0-24
 - rebuild for libftdi soname bump
 - disable BR iguanaIR temporary, it pulls in lirc-0.9.0-23 and build fails

From eb96c1a076bd2dc23a3f379a80d803b1e1138cb1 Mon Sep 17 00:00:00 2001
From: raveit65 <chat-to-me@raveit.de>
Date: Thu, 29 May 2014 14:23:34 +0200
Subject: [PATCH 128/204] add missing isa tags

---
 lirc.spec | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/lirc.spec b/lirc.spec
index 5a9e38e..7714434 100644
--- a/lirc.spec
+++ b/lirc.spec
@@ -99,7 +99,7 @@ BuildRequires:  svgalib-devel
 %endif
 BuildRequires:  systemd-devel
 
-Requires:       %{name}-libs = %{version}-%{release}
+Requires:       %{name}-libs%{?_isa} = %{version}-%{release}
 
 Requires(post):    systemd
                    #for triggerun
@@ -129,7 +129,7 @@ that applications use to interface with LIRC.
 %package        devel
 Summary:        Development files for LIRC
 Group:          Development/Libraries
-Requires:       %{name}-libs = %{version}-%{release}
+Requires:       %{name}-libs%{?_isa} = %{version}-%{release}
 
 %description    devel
 LIRC is a package that allows you to decode and send infra-red and
@@ -165,7 +165,7 @@ of remote control configuration files.
 
 %package        disable-kernel-rc
 Summary:        Disable kernel ir device handling in favor of lirc
-Requires:       %{name} = %{version}-%{release}
+Requires:       %{name}%{?_isa} = %{version}-%{release}
 
 %description  disable-kernel-rc
 Udev rule which disables the kernel built-in handling of infrared devices
@@ -332,6 +332,7 @@ find /etc/systemd -name lirc.service -xtype l -delete || :
 %changelog
 * Thu May 29 2014 Wolfgang Ulbrich <chat-to-me@raveit.de> - 0.9.0-25
 - enable BR iguanaIR again
+- add missing isa tags
 
 * Thu May 29 2014 Wolfgang Ulbrich <chat-to-me@raveit.de> - 0.9.0-24
 - rebuild for libftdi soname bump

From e4a13a1847d4250b11a2fc0b3c9d4263a6f863f6 Mon Sep 17 00:00:00 2001
From: raveit65 <chat-to-me@raveit.de>
Date: Thu, 29 May 2014 14:24:35 +0200
Subject: [PATCH 129/204] bump version

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

diff --git a/lirc.spec b/lirc.spec
index 7714434..d0a9aa1 100644
--- a/lirc.spec
+++ b/lirc.spec
@@ -22,7 +22,7 @@
 Name:           lirc
 Version:        0.9.0
 %if 0%{?released}
-Release:        24%{?dist}
+Release:        25%{?dist}
 %else
 Release:        0.6.%{pre}%{?dist}
 %endif

From cc6c85eeead74e5f8be654d4a6ecc361b5089a46 Mon Sep 17 00:00:00 2001
From: Dennis Gilmore <dennis@ausil.us>
Date: Sat, 7 Jun 2014 01:33:15 -0500
Subject: [PATCH 130/204] - Rebuilt for
 https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild

---
 lirc.spec | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/lirc.spec b/lirc.spec
index d0a9aa1..e1c9c9e 100644
--- a/lirc.spec
+++ b/lirc.spec
@@ -22,9 +22,9 @@
 Name:           lirc
 Version:        0.9.0
 %if 0%{?released}
-Release:        25%{?dist}
+Release:        26%{?dist}
 %else
-Release:        0.6.%{pre}%{?dist}
+Release:        0.7.%{pre}%{?dist}
 %endif
 Summary:        The Linux Infrared Remote Control package
 
@@ -330,6 +330,9 @@ find /etc/systemd -name lirc.service -xtype l -delete || :
 
 
 %changelog
+* Sat Jun 07 2014 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0.9.0-26
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild
+
 * Thu May 29 2014 Wolfgang Ulbrich <chat-to-me@raveit.de> - 0.9.0-25
 - enable BR iguanaIR again
 - add missing isa tags

From 0ff86a6657aa4b011a206524526fffb1a9e6f165 Mon Sep 17 00:00:00 2001
From: Peter Robinson <pbrobinson@fedoraproject.org>
Date: Sun, 17 Aug 2014 07:23:48 +0000
Subject: [PATCH 131/204] - Rebuilt for
 https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild

---
 lirc.spec | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/lirc.spec b/lirc.spec
index e1c9c9e..0a0ac61 100644
--- a/lirc.spec
+++ b/lirc.spec
@@ -22,7 +22,7 @@
 Name:           lirc
 Version:        0.9.0
 %if 0%{?released}
-Release:        26%{?dist}
+Release:        27%{?dist}
 %else
 Release:        0.7.%{pre}%{?dist}
 %endif
@@ -330,6 +330,9 @@ find /etc/systemd -name lirc.service -xtype l -delete || :
 
 
 %changelog
+* Sun Aug 17 2014 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0.9.0-27
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild
+
 * Sat Jun 07 2014 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0.9.0-26
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild
 

From 9cdb8d99d6f705f47ea6c19d5e4a8f4b10f00185 Mon Sep 17 00:00:00 2001
From: Alec Leamas <leamas@nowhere.net>
Date: Mon, 18 Aug 2014 14:05:02 +0200
Subject: [PATCH 132/204] Rebuilt due to iguanaIR so-bump.

---
 lirc.spec | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/lirc.spec b/lirc.spec
index 0a0ac61..90f6009 100644
--- a/lirc.spec
+++ b/lirc.spec
@@ -22,7 +22,7 @@
 Name:           lirc
 Version:        0.9.0
 %if 0%{?released}
-Release:        27%{?dist}
+Release:        28%{?dist}
 %else
 Release:        0.7.%{pre}%{?dist}
 %endif
@@ -330,6 +330,9 @@ find /etc/systemd -name lirc.service -xtype l -delete || :
 
 
 %changelog
+* Mon Aug 18 2014 Alec Leamas <leamas@nowhere.net> - 0.9.0-28
+- Rebuilt due to iguanaIR so-bump.
+
 * Sun Aug 17 2014 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0.9.0-27
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild
 

From bace27a55f767cd805720a12356a0c0cf27bcfee Mon Sep 17 00:00:00 2001
From: Alec Leamas <leamas.alec@gmail.com>
Date: Tue, 19 Aug 2014 21:51:12 +0200
Subject: [PATCH 133/204] Updating to latest release.

- Removing tons of patches now upstreamed.
- Using built manpages as-is (no need to remove not-built tools)
---
 ...gfault-when-starting-lircd-AUR-41581.patch |   26 +
 0001-configure-ac-revert-to-git-branch.patch  |   26 -
 ...-lirc-0.9.0-libusb-config-is-no-more.patch |   58 -
 ...-lircd-Fix-bad-default-for-lircdfile.patch |   25 +
 ...gfault-when-parsing-connect-in-confi.patch |   26 +
 0004-Set-device-to-lirc0.patch                |   12 -
 ...compiler-error-format-security-error.patch |   25 +
 ...-Make-lirc_wpc8769l-functional-again.patch |   89 -
 ...ource-busy-error-from-bunk-lirc_open.patch |   60 -
 ...ger-config-files-in-write_socket-bet.patch |   40 -
 ...-buffer-alloc-to-work-with-new-kfifo.patch |   31 -
 ...busb-config-any-longer-use-pkg-confi.patch |   60 -
 ...-some-clang-warnings-courtesy-of-nox.patch |   89 -
 ...pace-use-dev-lirc0-as-default-device.patch |   34 -
 0014-lirc-make-chardev-nonseekable.patch      |   41 -
 ...-lirc_dev-fixes-in-lirc_dev_fop_read.patch |   99 -
 ...lirc_dev-add-some-__user-annotations.patch |   76 -
 ...irc_dev-check-kobject_set_name-resul.patch |   43 -
 0018-Start-lirc-0.9.1-git.patch               |   25 -
 ...s-use-systemctl-instead-of-sysV-init.patch |   43 -
 0100-configure-ac-revert-to-git-branch.patch  |   25 -
 0101-Stripping-some-eol-whitespace.patch      |  182 -
 0102-Update-autotools-config-files.patch      |  114 -
 ...eneric-fixed-font-instead-of-Courier.patch |   28 -
 ...dd-systemd-socket-activation-support.patch |  172 -
 0105-Update-COPYING-to-latest-version.patch   |  115 -
 0105-configure-ac-back-to-0.9.0.patch         |   27 -
 ...BS-when-using-Werror-format-security.patch |   72 -
 README.fedora                                 |   52 +-
 branch                                        |    1 -
 lirc-0.8.4-make-remote-names-all-unique.patch |  134 -
 lirc-0.8.6-firefly-def.patch                  |  175 -
 lirc-0.8.6-standardized-remote-keycodes.patch | 4917 -----------------
 lirc-0.9.0-libusb-config-is-no-more.patch     |   95 -
 lirc.conf                                     |    2 -
 lirc.service                                  |   11 -
 lirc.spec                                     |  118 +-
 lirc.sysconfig                                |   31 -
 lircd.service                                 |   16 -
 lircd.socket                                  |    7 -
 lircmd.service                                |   12 -
 sources                                       |    2 +-
 42 files changed, 143 insertions(+), 7093 deletions(-)
 create mode 100644 0001-Fix-segfault-when-starting-lircd-AUR-41581.patch
 delete mode 100644 0001-configure-ac-revert-to-git-branch.patch
 delete mode 100644 0001-lirc-0.9.0-libusb-config-is-no-more.patch
 create mode 100644 0002-lircd-Fix-bad-default-for-lircdfile.patch
 create mode 100644 0003-0.9.1a-Bugfix-segfault-when-parsing-connect-in-confi.patch
 delete mode 100644 0004-Set-device-to-lirc0.patch
 create mode 100644 0004-lircd-fix-compiler-error-format-security-error.patch
 delete mode 100644 0007-Make-lirc_wpc8769l-functional-again.patch
 delete mode 100644 0008-lirc_sir-fix-resource-busy-error-from-bunk-lirc_open.patch
 delete mode 100644 0009-lircd-handle-larger-config-files-in-write_socket-bet.patch
 delete mode 100644 0010-lirc_atiusb-fix-buffer-alloc-to-work-with-new-kfifo.patch
 delete mode 100644 0011-libusb-has-no-libusb-config-any-longer-use-pkg-confi.patch
 delete mode 100644 0012-Silence-some-clang-warnings-courtesy-of-nox.patch
 delete mode 100644 0013-userspace-use-dev-lirc0-as-default-device.patch
 delete mode 100644 0014-lirc-make-chardev-nonseekable.patch
 delete mode 100644 0015-media-lirc_dev-fixes-in-lirc_dev_fop_read.patch
 delete mode 100644 0016-media-lirc_dev-add-some-__user-annotations.patch
 delete mode 100644 0017-media-media-rc-lirc_dev-check-kobject_set_name-resul.patch
 delete mode 100644 0018-Start-lirc-0.9.1-git.patch
 delete mode 100644 0019-lircs-use-systemctl-instead-of-sysV-init.patch
 delete mode 100644 0100-configure-ac-revert-to-git-branch.patch
 delete mode 100644 0101-Stripping-some-eol-whitespace.patch
 delete mode 100644 0102-Update-autotools-config-files.patch
 delete mode 100644 0103-xmode2.c-Use-generic-fixed-font-instead-of-Courier.patch
 delete mode 100644 0104-Add-systemd-socket-activation-support.patch
 delete mode 100644 0105-Update-COPYING-to-latest-version.patch
 delete mode 100644 0105-configure-ac-back-to-0.9.0.patch
 delete mode 100644 0200-Fixing-FTBS-when-using-Werror-format-security.patch
 delete mode 100644 branch
 delete mode 100644 lirc-0.8.4-make-remote-names-all-unique.patch
 delete mode 100644 lirc-0.8.6-firefly-def.patch
 delete mode 100644 lirc-0.8.6-standardized-remote-keycodes.patch
 delete mode 100644 lirc-0.9.0-libusb-config-is-no-more.patch
 delete mode 100644 lirc.conf
 delete mode 100644 lirc.service
 delete mode 100644 lirc.sysconfig
 delete mode 100644 lircd.service
 delete mode 100644 lircd.socket
 delete mode 100644 lircmd.service

diff --git a/0001-Fix-segfault-when-starting-lircd-AUR-41581.patch b/0001-Fix-segfault-when-starting-lircd-AUR-41581.patch
new file mode 100644
index 0000000..57c88aa
--- /dev/null
+++ b/0001-Fix-segfault-when-starting-lircd-AUR-41581.patch
@@ -0,0 +1,26 @@
+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
+@@ -7,7 +7,7 @@ nodaemon        = False
+ permission      = 666
+ driver          = default
+ device          = /dev/lirc0
+-output          = /var/run/lirc/lircd
++lircdfile       = /var/run/lirc/lircd
+ pidfile         = /var/run/lirc/lircd.pid
+ plugindir       = /usr/lib/lirc/plugins
+ allow-simulate  = No
+-- 
+1.8.4.2
+
diff --git a/0001-configure-ac-revert-to-git-branch.patch b/0001-configure-ac-revert-to-git-branch.patch
deleted file mode 100644
index d3ffd98..0000000
--- a/0001-configure-ac-revert-to-git-branch.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-From 7635b1e321bf2f98468ae4f2233e28e3d78505cb Mon Sep 17 00:00:00 2001
-From: Alec Leamas <leamas@nowhere.net>
-Date: Fri, 11 Oct 2013 05:50:12 +0200
-Subject: [PATCH] configure-ac: revert to git branch
-
-rebasing for further changes to match upstream merge request.
----
- configure.ac | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/configure.ac b/configure.ac
-index 5a9b31d..9efe2f9 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -7,7 +7,7 @@ AC_INIT
- AC_CONFIG_SRCDIR([daemons/lircd.c])
- AC_CONFIG_MACRO_DIR([m4])
- 
--AM_INIT_AUTOMAKE(lirc, 0.9.0)
-+AM_INIT_AUTOMAKE(lirc, 0.9.0-git)
- AM_CONFIG_HEADER(config.h)
- 
- CFLAGS="${CFLAGS--O2 -g -Wall}"
--- 
-1.8.3.1
-
diff --git a/0001-lirc-0.9.0-libusb-config-is-no-more.patch b/0001-lirc-0.9.0-libusb-config-is-no-more.patch
deleted file mode 100644
index 6fa8bd7..0000000
--- a/0001-lirc-0.9.0-libusb-config-is-no-more.patch
+++ /dev/null
@@ -1,58 +0,0 @@
-From 7e07ae592ef6bfdc7c4a200809a0c9c9a0b41646 Mon Sep 17 00:00:00 2001
-From: Alec Leamas <alec@tests.notat.diaspora.com>
-Date: Tue, 8 Oct 2013 14:57:08 +0200
-Subject: [PATCH 1/3] lirc-0.9.0: libusb config is no more
-
----
- lirc-0.9.0/configure.ac | 13 ++++++-------
- 1 file changed, 6 insertions(+), 7 deletions(-)
-
-diff --git a/lirc-0.9.0/configure.ac b/lirc-0.9.0/configure.ac
-index 052908b..20e37a4 100644
---- a/lirc-0.9.0/configure.ac
-+++ b/lirc-0.9.0/configure.ac
-@@ -20,11 +20,11 @@ AC_PROG_MAKE_SET
- AC_PATH_PROG(mknod, mknod, /bin/mknod)
- AC_PATH_PROG(mkfifo, mkfifo, /usr/bin/mkfifo)
- AC_PATH_PROG(depmod, depmod, /sbin/depmod, $PATH:/sbin)
--AC_PATH_PROG(LIBUSB_CONFIG, libusb-config)
- AC_PROG_LN_S
- AC_PROG_LIBTOOL
- AM_PATH_PYTHON(,, [:])
- AM_CONDITIONAL([HAVE_PYTHON], [test "$PYTHON" != ""])
-+LIBUSB_CONFIG="pkg-config libusb"
- 
- dnl Checks for header files.
- AC_HEADER_STDC
-@@ -310,15 +310,14 @@ AH_TEMPLATE([SYSCONFDIR],
- AH_TEMPLATE([USE_SYSLOG],
- 	[define if you want to log to syslog instead of logfile])
- 
--if test -n "${LIBUSB_CONFIG}"; then
--  AC_DEFINE(HAVE_LIBUSB)
--  possible_drivers="${possible_drivers} (atilibusb) (awlibusb) (dfclibusb) (commandir) (srm7500libusb)" 
--fi
--
- AC_CHECK_LIB(caraca_client, caraca_init,
-   AC_DEFINE(HAVE_LIBCARACA)
-   possible_drivers="${possible_drivers} (caraca)"
- )
-+AC_CHECK_HEADER(usb.h,
-+  AC_DEFINE(HAVE_LIBUSB)
-+  possible_drivers="${possible_drivers} (atilibusb) (awlibusb) (dfclibusb) (commandir) (srm7500libusb)" 
-+)
- AC_CHECK_HEADER(ftdi.h,
-   AC_DEFINE(HAVE_FTDI)
-   possible_drivers="${possible_drivers} (ftdi)"
-@@ -1449,7 +1448,7 @@ Get it at:
- Or install these packages from your distro:
- 
-    libusb
--   libusb-dev
-+   libusb-devel
- 
- ])
-     ;;
--- 
-1.8.3.1
-
diff --git a/0002-lircd-Fix-bad-default-for-lircdfile.patch b/0002-lircd-Fix-bad-default-for-lircdfile.patch
new file mode 100644
index 0000000..946fa21
--- /dev/null
+++ b/0002-lircd-Fix-bad-default-for-lircdfile.patch
@@ -0,0 +1,25 @@
+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.c b/daemons/lircd.c
+index db8ea13..fa8cf17 100644
+--- a/daemons/lircd.c
++++ b/daemons/lircd.c
+@@ -2147,7 +2147,7 @@ static void lircd_add_defaults(void)
+ 		"lircd:device", 	LIRC_DRIVER_DEVICE,
+ 		"lircd:listen", 	NULL ,
+ 		"lircd:connect", 	NULL,
+-		"lircd:output", 	LIRCD,
++		"lircd:lircdfile", 	LIRCD,
+ 		"lircd:pidfile", 	PIDFILE,
+ 		"lircd:logfile", 	LOGFILE,
+ 		"lircd:debug", 		"False",
+-- 
+1.8.4.2
+
diff --git a/0003-0.9.1a-Bugfix-segfault-when-parsing-connect-in-confi.patch b/0003-0.9.1a-Bugfix-segfault-when-parsing-connect-in-confi.patch
new file mode 100644
index 0000000..5b6dca7
--- /dev/null
+++ b/0003-0.9.1a-Bugfix-segfault-when-parsing-connect-in-confi.patch
@@ -0,0 +1,26 @@
+From 3ebd89ac194279fb56d781d03a5368f4b0e76caa Mon Sep 17 00:00:00 2001
+From: Andreas Bader <andreasbader at badersystems.de>
+Date: Tue, 19 Aug 2014 16:58:21 +0200
+Subject: [PATCH 3/3] 0.9.1a: Bugfix: segfault when parsing --connect in config
+ file.
+
+---
+ daemons/lircd.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/daemons/lircd.c b/daemons/lircd.c
+index fa8cf17..7af4265 100644
+--- a/daemons/lircd.c
++++ b/daemons/lircd.c
+@@ -2311,7 +2311,7 @@ int main(int argc, char **argv)
+ 	}
+ 	opt = options_getstring("lircd:connect");
+ 	if (opt != NULL) {
+-		if (!add_peer_connection(optarg))
++		if (!add_peer_connection(opt))
+ 			return(EXIT_FAILURE);
+ 	}
+ #       ifdef DEBUG
+-- 
+1.8.4.2
+
diff --git a/0004-Set-device-to-lirc0.patch b/0004-Set-device-to-lirc0.patch
deleted file mode 100644
index 2038bcd..0000000
--- a/0004-Set-device-to-lirc0.patch
+++ /dev/null
@@ -1,12 +0,0 @@
---- a/configure.ac
-+++ b/configure.ac
-@@ -1708,7 +1708,9 @@
-
- AH_TOP([
- /* device file names - beneath DEVDIR (default /dev) */
--#define DEV_LIRC	"lirc"
-+#define DEV_LIRC	"lirc0"
-+
-+/* daemon socket file names - beneath $varrundir (default /var/run/lirc) */
- #define DEV_LIRCD	"lircd"
- #define DEV_LIRCM	"lircm"
diff --git a/0004-lircd-fix-compiler-error-format-security-error.patch b/0004-lircd-fix-compiler-error-format-security-error.patch
new file mode 100644
index 0000000..ebb36d1
--- /dev/null
+++ b/0004-lircd-fix-compiler-error-format-security-error.patch
@@ -0,0 +1,25 @@
+From d80c94ead949e16053449ddf215a88a5e5e159e3 Mon Sep 17 00:00:00 2001
+From: Alec Leamas <leamas.alec@gmail.com>
+Date: Tue, 19 Aug 2014 19:21:25 +0200
+Subject: [PATCH 4/4] lircd: fix compiler error=format-security error.
+
+---
+ daemons/lircd.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/daemons/lircd.c b/daemons/lircd.c
+index 7af4265..50fd9c6 100644
+--- a/daemons/lircd.c
++++ b/daemons/lircd.c
+@@ -2303,7 +2303,7 @@ int main(int argc, char **argv)
+ 		opt = options_getstring("lircd:listen_hostport");
+ 		if (opt){
+ 			if (opt2host_port(opt, &address, &port, errmsg) != 0){
+-				fprintf(stderr, errmsg);
++				printf(stderr, errmsg);
+ 				return(EXIT_FAILURE);
+ 			}
+ 		} else
+-- 
+1.8.4.2
+
diff --git a/0007-Make-lirc_wpc8769l-functional-again.patch b/0007-Make-lirc_wpc8769l-functional-again.patch
deleted file mode 100644
index ea1876e..0000000
--- a/0007-Make-lirc_wpc8769l-functional-again.patch
+++ /dev/null
@@ -1,89 +0,0 @@
-From 413e83bf504fe9a9a177f27742220cfcb184b034 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Juan=20Jes=C3=BAs=20Garc=C3=ADa=20de=20Soria=20Lucena?=
- <skandalfo@gmail.com>
-Date: Wed, 30 Mar 2011 16:46:35 -0400
-Subject: [PATCH 07/17] Make lirc_wpc8769l functional again
-
-Signed-off-by: Jarod Wilson <jarod@redhat.com>
----
- drivers/lirc_wpc8769l/lirc_wpc8769l.c | 28 +++++++++++++++++-----------
- 1 file changed, 17 insertions(+), 11 deletions(-)
-
-diff --git a/drivers/lirc_wpc8769l/lirc_wpc8769l.c b/drivers/lirc_wpc8769l/lirc_wpc8769l.c
-index f820d11..4d04063 100644
---- a/drivers/lirc_wpc8769l/lirc_wpc8769l.c
-+++ b/drivers/lirc_wpc8769l/lirc_wpc8769l.c
-@@ -816,10 +816,6 @@ static int set_use_inc(void *data)
- 	/* Reset last timeout value. */
- 	lastus = 0;
- 
--	/* Init the read buffer. */
--	if (lirc_buffer_init(&rbuf, sizeof(lirc_t), RBUF_LEN) < 0)
--		return -ENOMEM;
--
- 	/* Acquire the IRQ. */
- 	result = request_irq(irq, irq_handler,
- 			   IRQF_DISABLED | IRQF_SHARED,
-@@ -863,9 +859,6 @@ static void set_use_dec(void *data)
- 	/* Free the IRQ. */
- 	free_irq(irq, THIS_MODULE);
- 	dprintk("Freed IRQ %d\n", irq);
--
--	/* Free the RX buffer. */
--	lirc_buffer_free(&rbuf);
- }
- 
- static struct lirc_driver driver = {
-@@ -1065,19 +1058,29 @@ static int __init lirc_wpc8769l_module_init(void)
- 	/* Do load-time checks. */
- 	wpc8769l_power_up_and_check_if_we_woke_us_up();
- 
-+	/* Init the read buffer. */
-+	if (lirc_buffer_init(&rbuf, sizeof(lirc_t), RBUF_LEN) < 0) {
-+		rc = -ENOMEM;
-+		goto exit_platform_exit;
-+	}
-+
- 	/* Configure the driver hooks. */
- 	driver.features = LIRC_CAN_REC_MODE2;
-+	driver.dev = &lirc_wpc8769l_platform_dev->dev;
- 	driver.minor = lirc_register_driver(&driver);
- 	if (driver.minor < 0) {
- 		eprintk("lirc_register_driver failed!\n");
- 		rc = -EIO;
--		goto exit_platform_exit;
-+		goto exit_release_buffer;
- 	}
- 
- 	iprintk("Driver loaded.\n");
- 
- 	return 0; /* Everything OK. */
- 
-+exit_release_buffer:
-+	lirc_buffer_free(&rbuf);
-+
- exit_platform_exit:
- 	lirc_wpc8769l_platform_exit();
- 
-@@ -1095,12 +1098,15 @@ module_init(lirc_wpc8769l_module_init);
- 
- static void __exit lirc_wpc8769l_module_exit(void)
- {
--	/* Unregister the platform driver and device. */
--	lirc_wpc8769l_platform_exit();
--
- 	/* Unregister the LIRC driver. */
- 	lirc_unregister_driver(driver.minor);
- 
-+	/* Free the buffer. */
-+	lirc_buffer_free(&rbuf);
-+
-+	/* Unregister the platform driver and device. */
-+	lirc_wpc8769l_platform_exit();
-+
- 	/* Release the second range. */
- 	if (baseport2)
- 		release_region(baseport2, WPC8769L_IO_REGION_2_SIZE);
--- 
-1.8.3.1
-
diff --git a/0008-lirc_sir-fix-resource-busy-error-from-bunk-lirc_open.patch b/0008-lirc_sir-fix-resource-busy-error-from-bunk-lirc_open.patch
deleted file mode 100644
index 571bb0b..0000000
--- a/0008-lirc_sir-fix-resource-busy-error-from-bunk-lirc_open.patch
+++ /dev/null
@@ -1,60 +0,0 @@
-From be3ec6c75e33b4a175799218b2921be47ad4c842 Mon Sep 17 00:00:00 2001
-From: Jarod Wilson <jarod@redhat.com>
-Date: Thu, 31 Mar 2011 17:44:15 -0400
-Subject: [PATCH 08/17] lirc_sir: fix resource busy error from bunk lirc_open
-
-Signed-off-by: Jarod Wilson <jarod@redhat.com>
----
- drivers/lirc_sir/lirc_sir.c | 22 ++--------------------
- 1 file changed, 2 insertions(+), 20 deletions(-)
-
-diff --git a/drivers/lirc_sir/lirc_sir.c b/drivers/lirc_sir/lirc_sir.c
-index eefe0c9..c397ce0 100644
---- a/drivers/lirc_sir/lirc_sir.c
-+++ b/drivers/lirc_sir/lirc_sir.c
-@@ -203,8 +203,6 @@ static int debug;
- /* SECTION: Prototypes */
- 
- /* Communication with user-space */
--static int lirc_open(struct inode *inode, struct file *file);
--static int lirc_close(struct inode *inode, struct file *file);
- static unsigned int lirc_poll(struct file *file, poll_table *wait);
- static ssize_t lirc_read(struct file *file, char *buf, size_t count,
- 		loff_t *ppos);
-@@ -275,22 +273,6 @@ static void safe_udelay(unsigned long usecs)
- 
- /* SECTION: Communication with user-space */
- 
--static int lirc_open(struct inode *inode, struct file *file)
--{
--	spin_lock(&dev_lock);
--	if (MOD_IN_USE) {
--		spin_unlock(&dev_lock);
--		return -EBUSY;
--	}
--	spin_unlock(&dev_lock);
--	return 0;
--}
--
--static int lirc_close(struct inode *inode, struct file *file)
--{
--	return 0;
--}
--
- static unsigned int lirc_poll(struct file *file, poll_table *wait)
- {
- 	poll_wait(file, &lirc_read_queue, wait);
-@@ -519,8 +501,8 @@ static struct file_operations lirc_fops = {
- 	.compat_ioctl	= lirc_ioctl,
- #endif
- #endif
--	.open		= lirc_open,
--	.release	= lirc_close,
-+	.open		= lirc_dev_fop_open,
-+	.release	= lirc_dev_fop_close,
- };
- 
- static int set_use_inc(void *data)
--- 
-1.8.3.1
-
diff --git a/0009-lircd-handle-larger-config-files-in-write_socket-bet.patch b/0009-lircd-handle-larger-config-files-in-write_socket-bet.patch
deleted file mode 100644
index 8968ac2..0000000
--- a/0009-lircd-handle-larger-config-files-in-write_socket-bet.patch
+++ /dev/null
@@ -1,40 +0,0 @@
-From 5efb56bf22a5077db564c766ba7cc37bc269231d Mon Sep 17 00:00:00 2001
-From: Jarod Wilson <jarod@redhat.com>
-Date: Wed, 6 Apr 2011 11:04:12 -0400
-Subject: [PATCH 09/17] lircd: handle larger config files in write_socket
- better
-
-Pointed out by Michael Zanetti on list, irsend LIST has issues with long
-config files, which didn't exist in maintainer mode, as we were using a
-do while loop to make sure we spit out everything. Just use that loop
-all the time.
-
-Signed-off-by: Jarod Wilson <jarod@redhat.com>
----
- daemons/lircd.c | 8 ++------
- 1 file changed, 2 insertions(+), 6 deletions(-)
-
-diff --git a/daemons/lircd.c b/daemons/lircd.c
-index 6c21a3a..ddcca05 100644
---- a/daemons/lircd.c
-+++ b/daemons/lircd.c
-@@ -231,14 +231,10 @@ inline int write_socket(int fd, const char *buf, int len)
- 	int done, todo = len;
- 
- 	while (todo) {
--#ifdef SIM_REC
- 		do {
- 			done = write(fd, buf, todo);
--		}
--		while (done < 0 && errno == EAGAIN);
--#else
--		done = write(fd, buf, todo);
--#endif
-+		} while (done < 0 && errno == EAGAIN);
-+
- 		if (done <= 0)
- 			return (done);
- 		buf += done;
--- 
-1.8.3.1
-
diff --git a/0010-lirc_atiusb-fix-buffer-alloc-to-work-with-new-kfifo.patch b/0010-lirc_atiusb-fix-buffer-alloc-to-work-with-new-kfifo.patch
deleted file mode 100644
index cca76bf..0000000
--- a/0010-lirc_atiusb-fix-buffer-alloc-to-work-with-new-kfifo.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-From ec3c5660e67c122e2d5eb9cfa838c9709fccf8e0 Mon Sep 17 00:00:00 2001
-From: Jason Martin <publicmsu@gmail.com>
-Date: Fri, 3 Jun 2011 00:12:51 -0400
-Subject: [PATCH 10/17] lirc_atiusb: fix buffer alloc to work with new kfifo
-
-I came across posts with regards to lirc_atiusb and its compatibility
-with newer kernels, and their use of kfifo.I spent a little bit of time
-this evening, and was able to correct the issues with the driver, and
-now have a functioning lirc_atiusb device under the 2.6.38 kernel.
-
-Signed-off-by: Jarod Wilson <jarod@redhat.com>
----
- drivers/lirc_atiusb/lirc_atiusb.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/drivers/lirc_atiusb/lirc_atiusb.c b/drivers/lirc_atiusb/lirc_atiusb.c
-index 52080de..bf2b631 100644
---- a/drivers/lirc_atiusb/lirc_atiusb.c
-+++ b/drivers/lirc_atiusb/lirc_atiusb.c
-@@ -1048,7 +1048,7 @@ static struct atirf_dev *new_irctl(struct usb_interface *intf)
- 		goto new_irctl_failure_check;
- 	}
- 
--	if (lirc_buffer_init(driver->rbuf, dclen, 1)) {
-+	if (lirc_buffer_init(driver->rbuf, dclen, 2)) {
- 		mem_failure = 4;
- 		goto new_irctl_failure_check;
- 	}
--- 
-1.8.3.1
-
diff --git a/0011-libusb-has-no-libusb-config-any-longer-use-pkg-confi.patch b/0011-libusb-has-no-libusb-config-any-longer-use-pkg-confi.patch
deleted file mode 100644
index 7e07831..0000000
--- a/0011-libusb-has-no-libusb-config-any-longer-use-pkg-confi.patch
+++ /dev/null
@@ -1,60 +0,0 @@
-From 02c5c3f2181381a44e03cdfb8962bcbf67a8139a Mon Sep 17 00:00:00 2001
-From: Jarod Wilson <jarod@redhat.com>
-Date: Tue, 7 Jun 2011 00:14:20 -0400
-Subject: [PATCH 11/17] libusb has no libusb-config any longer, use pkg-config
- by default
-
-Signed-off-by: Jarod Wilson <jarod@redhat.com>
----
- configure.ac | 13 ++++++-------
- 1 file changed, 6 insertions(+), 7 deletions(-)
-
-diff --git a/configure.ac b/configure.ac
-index 6c07e0d..1a3347e 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -20,11 +20,11 @@ AC_PROG_MAKE_SET
- AC_PATH_PROG(mknod, mknod, /bin/mknod)
- AC_PATH_PROG(mkfifo, mkfifo, /usr/bin/mkfifo)
- AC_PATH_PROG(depmod, depmod, /sbin/depmod, $PATH:/sbin)
--AC_PATH_PROG(LIBUSB_CONFIG, libusb-config)
- AC_PROG_LN_S
- AC_PROG_LIBTOOL
- AM_PATH_PYTHON(,, [:])
- AM_CONDITIONAL([HAVE_PYTHON], [test "$PYTHON" != ""])
-+LIBUSB_CONFIG="pkg-config libusb"
- 
- dnl Checks for header files.
- AC_HEADER_STDC
-@@ -310,15 +310,14 @@ AH_TEMPLATE([SYSCONFDIR],
- AH_TEMPLATE([USE_SYSLOG],
- 	[define if you want to log to syslog instead of logfile])
- 
--if test -n "${LIBUSB_CONFIG}"; then
--  AC_DEFINE(HAVE_LIBUSB)
--  possible_drivers="${possible_drivers} (atilibusb) (awlibusb) (dfclibusb) (commandir) (srm7500libusb)" 
--fi
--
- AC_CHECK_LIB(caraca_client, caraca_init,
-   AC_DEFINE(HAVE_LIBCARACA)
-   possible_drivers="${possible_drivers} (caraca)"
- )
-+AC_CHECK_HEADER(usb.h,
-+  AC_DEFINE(HAVE_LIBUSB)
-+  possible_drivers="${possible_drivers} (atilibusb) (awlibusb) (dfclibusb) (commandir) (srm7500libusb)" 
-+)
- AC_CHECK_HEADER(ftdi.h,
-   AC_DEFINE(HAVE_FTDI)
-   possible_drivers="${possible_drivers} (ftdi)"
-@@ -1449,7 +1448,7 @@ Get it at:
- Or install these packages from your distro:
- 
-    libusb
--   libusb-dev
-+   libusb-devel
- 
- ])
-     ;;
--- 
-1.8.3.1
-
diff --git a/0012-Silence-some-clang-warnings-courtesy-of-nox.patch b/0012-Silence-some-clang-warnings-courtesy-of-nox.patch
deleted file mode 100644
index a8d910b..0000000
--- a/0012-Silence-some-clang-warnings-courtesy-of-nox.patch
+++ /dev/null
@@ -1,89 +0,0 @@
-From 9592bb4a2bccedf5ef205cf93c4d17f5b27edf5c Mon Sep 17 00:00:00 2001
-From: Jarod Wilson <jarod@redhat.com>
-Date: Wed, 29 Jun 2011 17:31:28 -0400
-Subject: [PATCH 12/17] Silence some clang warnings, courtesy of nox
-
-Signed-off-by: Jarod Wilson <jarod@redhat.com>
----
- daemons/dump_config.c | 12 ++++++------
- daemons/ir_remote.c   |  3 ++-
- daemons/lircd.c       |  4 ++--
- 3 files changed, 10 insertions(+), 9 deletions(-)
-
-diff --git a/daemons/dump_config.c b/daemons/dump_config.c
-index a83c27e..56fb183 100644
---- a/daemons/dump_config.c
-+++ b/daemons/dump_config.c
-@@ -120,11 +120,11 @@ void fprint_remote_head(FILE * f, struct ir_remote *rem)
- 	if (!is_raw(rem)) {
- 		if (rem->pre_data_bits > 0) {
- 			fprintf(f, "  pre_data_bits   %d\n", rem->pre_data_bits);
--			fprintf(f, "  pre_data       0x%llX\n", rem->pre_data);
-+			fprintf(f, "  pre_data       0x%llX\n", (unsigned long long)rem->pre_data);
- 		}
- 		if (rem->post_data_bits > 0) {
- 			fprintf(f, "  post_data_bits  %d\n", rem->post_data_bits);
--			fprintf(f, "  post_data      0x%llX\n", rem->post_data);
-+			fprintf(f, "  post_data      0x%llX\n", (unsigned long long)rem->post_data);
- 		}
- 		if (rem->pre_p != 0 && rem->pre_s != 0) {
- 			fprintf(f, "  pre         %5u %5u\n", (__u32) rem->pre_p, (__u32) rem->pre_s);
-@@ -151,15 +151,15 @@ void fprint_remote_head(FILE * f, struct ir_remote *rem)
- 		if (rem->min_code_repeat > 0) {
- 			fprintf(f, "  min_code_repeat %d\n", rem->min_code_repeat);
- 		}
--		fprintf(f, "  toggle_bit_mask 0x%llX\n", rem->toggle_bit_mask);
-+		fprintf(f, "  toggle_bit_mask 0x%llX\n", (unsigned long long)rem->toggle_bit_mask);
- 		if (has_toggle_mask(rem)) {
--			fprintf(f, "  toggle_mask    0x%llX\n", rem->toggle_mask);
-+			fprintf(f, "  toggle_mask    0x%llX\n", (unsigned long long)rem->toggle_mask);
- 		}
- 		if (rem->rc6_mask != 0) {
--			fprintf(f, "  rc6_mask    0x%llX\n", rem->rc6_mask);
-+			fprintf(f, "  rc6_mask    0x%llX\n", (unsigned long long)rem->rc6_mask);
- 		}
- 		if (has_ignore_mask(rem)) {
--			fprintf(f, "  ignore_mask 0x%llX\n", rem->ignore_mask);
-+			fprintf(f, "  ignore_mask 0x%llX\n", (unsigned long long)rem->ignore_mask);
- 		}
- 		if (is_serial(rem)) {
- 			fprintf(f, "  baud            %d\n", rem->baud);
-diff --git a/daemons/ir_remote.c b/daemons/ir_remote.c
-index 3e9e0f6..e5f60f9 100644
---- a/daemons/ir_remote.c
-+++ b/daemons/ir_remote.c
-@@ -490,7 +490,8 @@ int write_message(char *buffer, size_t size, const char *remote_name, const char
- {
- 	int len;
- 
--	len = snprintf(buffer, size, "%016llx %02x %s%s %s\n", code, reps, button_name, button_suffix, remote_name);
-+	len = snprintf(buffer, size, "%016llx %02x %s%s %s\n",
-+		(unsigned long long)code, reps, button_name, button_suffix, remote_name);
- 
- 	return len;
- }
-diff --git a/daemons/lircd.c b/daemons/lircd.c
-index ddcca05..8ace7af 100644
---- a/daemons/lircd.c
-+++ b/daemons/lircd.c
-@@ -1314,7 +1314,7 @@ int send_remote(int fd, char *message, struct ir_remote *remote)
- 
- 	codes = remote->codes;
- 	while (codes->name != NULL) {
--		len = snprintf(buffer, PACKET_SIZE, "%016llx %s\n", codes->code, codes->name);
-+		len = snprintf(buffer, PACKET_SIZE, "%016llx %s\n", (unsigned long long)codes->code, codes->name);
- 		if (len >= PACKET_SIZE + 1) {
- 			len = sprintf(buffer, "code_too_long\n");
- 		}
-@@ -1334,7 +1334,7 @@ int send_name(int fd, char *message, struct ir_ncode *code)
- 	    (write_socket_len(fd, protocol_string[P_BEGIN]) && write_socket_len(fd, message)
- 	     && write_socket_len(fd, protocol_string[P_SUCCESS]) && write_socket_len(fd, protocol_string[P_DATA])))
- 		return (0);
--	len = snprintf(buffer, PACKET_SIZE, "1\n%016llx %s\n", code->code, code->name);
-+	len = snprintf(buffer, PACKET_SIZE, "1\n%016llx %s\n", (unsigned long long)code->code, code->name);
- 	if (len >= PACKET_SIZE + 1) {
- 		len = sprintf(buffer, "1\ncode_too_long\n");
- 	}
--- 
-1.8.3.1
-
diff --git a/0013-userspace-use-dev-lirc0-as-default-device.patch b/0013-userspace-use-dev-lirc0-as-default-device.patch
deleted file mode 100644
index beed5a0..0000000
--- a/0013-userspace-use-dev-lirc0-as-default-device.patch
+++ /dev/null
@@ -1,34 +0,0 @@
-From d0175df5cd2ac4a261332ea21a67179f2c85072c Mon Sep 17 00:00:00 2001
-From: Jarod Wilson <jarod@redhat.com>
-Date: Fri, 2 Dec 2011 14:10:21 -0500
-Subject: [PATCH 13/17] userspace: use /dev/lirc0 as default device
-
-The lirc_dev kernel driver results in a first lirc chardev of
-/dev/lirc0, not /dev/lirc, so lets default to that now. The old way is
-from pre-udev days or something, I think... While we're at it, update
-the adjacent comment about the daemon socket locations to reflect
-current reality too.
-
-Signed-off-by: Jarod Wilson <jarod@redhat.com>
----
- configure.ac | 4 +++-
- 1 file changed, 3 insertions(+), 1 deletion(-)
-
-diff --git a/configure.ac b/configure.ac
-index 1a3347e..ff4780f 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -1708,7 +1708,9 @@ AC_DEFINE_UNQUOTED(LIRC_SYSLOG, $facility)
- 
- AH_TOP([
- /* device file names - beneath DEVDIR (default /dev) */
--#define DEV_LIRC	"lirc"
-+#define DEV_LIRC	"lirc0"
-+
-+/* daemon socket file names - beneath $varrundir (default /var/run/lirc) */
- #define DEV_LIRCD	"lircd"
- #define DEV_LIRCM	"lircm"
- 
--- 
-1.8.3.1
-
diff --git a/0014-lirc-make-chardev-nonseekable.patch b/0014-lirc-make-chardev-nonseekable.patch
deleted file mode 100644
index 316d61f..0000000
--- a/0014-lirc-make-chardev-nonseekable.patch
+++ /dev/null
@@ -1,41 +0,0 @@
-From 441e4879e694b18ca10a7c107e81362790c7bd25 Mon Sep 17 00:00:00 2001
-From: Jarod Wilson <jarod@redhat.com>
-Date: Tue, 7 Feb 2012 10:29:58 -0500
-Subject: [PATCH 14/17] lirc: make chardev nonseekable
-
-Merge change from upstream kernel
-
-commit d9d2e9d5c9eead1f73f92f5fc03424dab90b6c95
-Author: Arnd Bergmann <arnd@arndb.de>
-Date:   Sun Aug 15 18:51:56 2010 +0200
-
-    lirc: make chardev nonseekable
-
-    There does not seem to be a need for lirc to
-    allow seeking on the file descriptor, so let's
-    just disallow this before users start relying
-    on it.
-
-    Signed-off-by: Arnd Bergmann <arnd@arndb.de>
-
-Signed-off-by: Jarod Wilson <jarod@redhat.com>
----
- drivers/lirc_dev/lirc_dev.c | 2 ++
- 1 file changed, 2 insertions(+)
-
-diff --git a/drivers/lirc_dev/lirc_dev.c b/drivers/lirc_dev/lirc_dev.c
-index d4a5114..95ba25e 100644
---- a/drivers/lirc_dev/lirc_dev.c
-+++ b/drivers/lirc_dev/lirc_dev.c
-@@ -583,6 +583,8 @@ error:
- 
- 	mutex_unlock(&lirc_dev_lock);
- 
-+	nonseekable_open(inode, file);
-+
- 	return retval;
- }
- EXPORT_SYMBOL(lirc_dev_fop_open);
--- 
-1.8.3.1
-
diff --git a/0015-media-lirc_dev-fixes-in-lirc_dev_fop_read.patch b/0015-media-lirc_dev-fixes-in-lirc_dev_fop_read.patch
deleted file mode 100644
index bed64bb..0000000
--- a/0015-media-lirc_dev-fixes-in-lirc_dev_fop_read.patch
+++ /dev/null
@@ -1,99 +0,0 @@
-From 887e6314eff34eb9a2e518bb96b65b82cd2f5e68 Mon Sep 17 00:00:00 2001
-From: Jarod Wilson <jarod@redhat.com>
-Date: Tue, 7 Feb 2012 10:48:50 -0500
-Subject: [PATCH 15/17] [media] lirc_dev: fixes in lirc_dev_fop_read()
-
-Backport from upstream kernel:
-
-commit 250f7a5f62a08985af5cf7728ae7ba9edbfdc0a9
-Author: Dan Carpenter <error27@gmail.com>
-Date:   Wed Nov 17 02:20:15 2010 -0300
-
-    [media] lirc_dev: fixes in lirc_dev_fop_read()
-
-    This makes several changes but they're in one function and sort of
-    related:
-
-    "buf" was leaked on error.  The leak if we try to read an invalid
-    length is the main concern because it could be triggered over and
-    over.
-
-    If the copy_to_user() failed, then the original code returned the
-    number of bytes remaining.  read() is supposed to be the opposite way,
-    where we return the number of bytes copied.  I changed it to just return
-    -EFAULT on errors.
-
-    Also I changed the debug output from "-EFAULT" to just "<fail>" because
-    it isn't -EFAULT necessarily.  And since we go though that path if the
-    length is invalid now, there was another debug print that I removed.
-
-    Signed-off-by: Dan Carpenter <error27@gmail.com>
-    Reviewed-by: Jarod Wilson <jarod@redhat.com>
-    Acked-by: Jarod Wilson <jarod@redhat.com>
-    Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
-
-Signed-off-by: Jarod Wilson <jarod@redhat.com>
----
- drivers/lirc_dev/lirc_dev.c | 24 ++++++++++++++----------
- 1 file changed, 14 insertions(+), 10 deletions(-)
-
-diff --git a/drivers/lirc_dev/lirc_dev.c b/drivers/lirc_dev/lirc_dev.c
-index 95ba25e..96c9148 100644
---- a/drivers/lirc_dev/lirc_dev.c
-+++ b/drivers/lirc_dev/lirc_dev.c
-@@ -769,18 +769,18 @@ ssize_t lirc_dev_fop_read(struct file *file,
- 	if (!buf)
- 		return -ENOMEM;
- 
--	if (mutex_lock_interruptible(&ir->irctl_lock))
--		return -ERESTARTSYS;
-+	if (mutex_lock_interruptible(&ir->irctl_lock)) {
-+		ret = -ERESTARTSYS;
-+		goto out_unlocked;
-+	}
- 	if (!ir->attached) {
--		mutex_unlock(&ir->irctl_lock);
--		return -ENODEV;
-+		ret = -ENODEV;
-+		goto out_locked;
- 	}
- 
- 	if (length % ir->chunk_size) {
--		dprintk(LOGHEAD "read result = -EINVAL\n",
--			ir->d.name, ir->d.minor);
--		mutex_unlock(&ir->irctl_lock);
--		return -EINVAL;
-+		ret = -EINVAL;
-+		goto out_locked;
- 	}
- 
- 	/*
-@@ -831,19 +831,23 @@ ssize_t lirc_dev_fop_read(struct file *file,
- 			lirc_buffer_read(ir->buf, buf);
- 			ret = copy_to_user((void *)buffer+written, buf,
- 					   ir->buf->chunk_size);
--			written += ir->buf->chunk_size;
-+			if (!ret)
-+				written += ir->buf->chunk_size;
-+			else
-+				ret = -EFAULT;
- 		}
- 	}
- 
- 	remove_wait_queue(&ir->buf->wait_poll, &wait);
- 	set_current_state(TASK_RUNNING);
- 
-+out_locked:
- 	mutex_unlock(&ir->irctl_lock);
- 
- out_unlocked:
- 	kfree(buf);
- 	dprintk(LOGHEAD "read result = %s (%d)\n",
--		ir->d.name, ir->d.minor, ret ? "-EFAULT" : "OK", ret);
-+		ir->d.name, ir->d.minor, ret ? "<fail>" : "OK", ret);
- 
- 	return ret ? ret : written;
- }
--- 
-1.8.3.1
-
diff --git a/0016-media-lirc_dev-add-some-__user-annotations.patch b/0016-media-lirc_dev-add-some-__user-annotations.patch
deleted file mode 100644
index 08206ea..0000000
--- a/0016-media-lirc_dev-add-some-__user-annotations.patch
+++ /dev/null
@@ -1,76 +0,0 @@
-From 6a17924477f64028cc5ff5b51047f3a9fd962a5f Mon Sep 17 00:00:00 2001
-From: Jarod Wilson <jarod@redhat.com>
-Date: Tue, 7 Feb 2012 11:46:37 -0500
-Subject: [PATCH 16/17] [media] lirc_dev: add some __user annotations
-
-Backport from upstream kernel:
-
-commit 0e835087dfe7db19f1f072046f5e116d4ec6662b
-Author: Dan Carpenter <error27@gmail.com>
-Date:   Wed Nov 17 02:13:39 2010 -0300
-
-    [media] lirc_dev: add some __user annotations
-
-    Sparse complains because there are no __user annotations.
-
-    drivers/media/rc/lirc_dev.c:156:27: warning:
-        incorrect type in initializer (incompatible argument 2 (different address spaces))
-    drivers/media/rc/lirc_dev.c:156:27:    expected int ( *read )( ... )
-    drivers/media/rc/lirc_dev.c:156:27:    got int ( extern [toplevel] *<noident> )( ... )
-
-    Signed-off-by: Dan Carpenter <error27@gmail.com>
-    Acked-by: Jarod Wilson <jarod@redhat.com>
-    Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
-
-Signed-off-by: Jarod Wilson <jarod@redhat.com>
----
- drivers/lirc_dev/lirc_dev.c | 8 +++-----
- drivers/lirc_dev/lirc_dev.h | 6 +++---
- 2 files changed, 6 insertions(+), 8 deletions(-)
-
-diff --git a/drivers/lirc_dev/lirc_dev.c b/drivers/lirc_dev/lirc_dev.c
-index 96c9148..5b25c5f 100644
---- a/drivers/lirc_dev/lirc_dev.c
-+++ b/drivers/lirc_dev/lirc_dev.c
-@@ -748,10 +748,8 @@ long lirc_dev_fop_ioctl(struct file *file, unsigned int cmd, unsigned long arg)
- }
- EXPORT_SYMBOL(lirc_dev_fop_ioctl);
- 
--ssize_t lirc_dev_fop_read(struct file *file,
--			  char *buffer,
--			  size_t length,
--			  loff_t *ppos)
-+ssize_t lirc_dev_fop_read(struct file *file, char __user *buffer,
-+			  size_t length, loff_t *ppos)
- {
- 	struct irctl *ir = irctls[iminor(file->f_dentry->d_inode)];
- 	unsigned char *buf;
-@@ -870,7 +868,7 @@ void *lirc_get_pdata(struct file *file)
- EXPORT_SYMBOL(lirc_get_pdata);
- 
- 
--ssize_t lirc_dev_fop_write(struct file *file, const char *buffer,
-+ssize_t lirc_dev_fop_write(struct file *file, const char __user *buffer,
- 			   size_t length, loff_t *ppos)
- {
- 	struct irctl *ir = irctls[iminor(file->f_dentry->d_inode)];
-diff --git a/drivers/lirc_dev/lirc_dev.h b/drivers/lirc_dev/lirc_dev.h
-index ca641f8..34056aa 100644
---- a/drivers/lirc_dev/lirc_dev.h
-+++ b/drivers/lirc_dev/lirc_dev.h
-@@ -257,9 +257,9 @@ int lirc_dev_fop_ioctl(struct inode *inode, struct file *file,
- #else
- long lirc_dev_fop_ioctl(struct file *file, unsigned int cmd, unsigned long arg);
- #endif
--ssize_t lirc_dev_fop_read(struct file *file, char *buffer, size_t length,
-+ssize_t lirc_dev_fop_read(struct file *file, char __user *buffer, size_t length,
- 			  loff_t *ppos);
--ssize_t lirc_dev_fop_write(struct file *file, const char *buffer, size_t length,
--			   loff_t *ppos);
-+ssize_t lirc_dev_fop_write(struct file *file, const char __user *buffer,
-+			   size_t length, loff_t *ppos);
- 
- #endif
--- 
-1.8.3.1
-
diff --git a/0017-media-media-rc-lirc_dev-check-kobject_set_name-resul.patch b/0017-media-media-rc-lirc_dev-check-kobject_set_name-resul.patch
deleted file mode 100644
index af5f4a1..0000000
--- a/0017-media-media-rc-lirc_dev-check-kobject_set_name-resul.patch
+++ /dev/null
@@ -1,43 +0,0 @@
-From e0ab92be1fa293b8593a77636b3d025fa2aefb82 Mon Sep 17 00:00:00 2001
-From: Jarod Wilson <jarod@redhat.com>
-Date: Tue, 7 Feb 2012 11:47:31 -0500
-Subject: [PATCH 17/17] [media] media: rc: lirc_dev: check kobject_set_name()
- result
-
-Backport from upstream kernel:
-
-commit b395cbac36e58a55729fe7e6262a3f0b1691bced
-Author: Vasiliy Kulikov <segoon@openwall.com>
-Date:   Fri Nov 26 14:06:41 2010 -0300
-
-    [media] media: rc: lirc_dev: check kobject_set_name() result
-
-    kobject_set_name() may fail with -ENOMEM, check for it.
-
-    Signed-off-by: Vasiliy Kulikov <segoon@openwall.com>
-    Acked-by: Jarod Wilson <jarod@redhat.com>
-    Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
-
-Signed-off-by: Jarod Wilson <jarod@redhat.com>
----
- drivers/lirc_dev/lirc_dev.c | 4 +++-
- 1 file changed, 3 insertions(+), 1 deletion(-)
-
-diff --git a/drivers/lirc_dev/lirc_dev.c b/drivers/lirc_dev/lirc_dev.c
-index 5b25c5f..9d52188 100644
---- a/drivers/lirc_dev/lirc_dev.c
-+++ b/drivers/lirc_dev/lirc_dev.c
-@@ -236,7 +236,9 @@ static int lirc_cdev_add(struct irctl *ir)
- 		cdev_init(cdev, &lirc_dev_fops);
- 		cdev->owner = THIS_MODULE;
- 	}
--	kobject_set_name(&cdev->kobj, "lirc%d", d->minor);
-+	retval = kobject_set_name(&cdev->kobj, "lirc%d", d->minor);
-+	if (retval)
-+		return retval;
- 
- 	retval = cdev_add(cdev, MKDEV(MAJOR(lirc_base_dev), d->minor), 1);
- 	if (retval)
--- 
-1.8.3.1
-
diff --git a/0018-Start-lirc-0.9.1-git.patch b/0018-Start-lirc-0.9.1-git.patch
deleted file mode 100644
index 83af27e..0000000
--- a/0018-Start-lirc-0.9.1-git.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-From 08fc775629662fbdeae05b020e0c6ff9a5d45ccf Mon Sep 17 00:00:00 2001
-From: Alec Leamas <leamas@nowhere.net>
-Date: Tue, 15 Oct 2013 11:19:15 +0200
-Subject: [PATCH] patch18
-
----
- configure.ac | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/configure.ac b/configure.ac
-index e47eff0..750264f 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -7,7 +7,7 @@ AC_INIT
- AC_CONFIG_SRCDIR([daemons/lircd.c])
- AC_CONFIG_MACRO_DIR([m4])
- 
--AM_INIT_AUTOMAKE(lirc, 0.9.0)
-+AM_INIT_AUTOMAKE(lirc, 0.9.1-git)
- AM_CONFIG_HEADER(config.h)
- 
- CFLAGS="${CFLAGS--O2 -g -Wall}"
--- 
-1.8.3.1
-
diff --git a/0019-lircs-use-systemctl-instead-of-sysV-init.patch b/0019-lircs-use-systemctl-instead-of-sysV-init.patch
deleted file mode 100644
index ff2452a..0000000
--- a/0019-lircs-use-systemctl-instead-of-sysV-init.patch
+++ /dev/null
@@ -1,43 +0,0 @@
-From 55870fd91d8e36927f6807931ecd1cfa49ce4ed1 Mon Sep 17 00:00:00 2001
-From: Alec Leamas <leamas.alec@gmail.com>
-Date: Fri, 18 Oct 2013 00:21:44 +0200
-Subject: [PATCH] lircs: use systemctl instead of sysV init.
-
----
- lirc-0.9.0/contrib/lircs | 6 +++---
- 1 file changed, 3 insertions(+), 3 deletions(-)
-
-diff --git a/contrib/lircs b/contrib/lircs
-index 1db2f2a..47350f9 100755
---- a/contrib/lircs
-+++ b/contrib/lircs
-@@ -24,7 +24,7 @@
- CONFIG_FILE=${HOME}/.lircrc
-
- # any editor to edit LIRC config file
--FILE_EDITOR=vim
-+FILE_EDITOR=${EDITOR:-vim}
-
-
-
-@@ -48,7 +48,7 @@ start_clients () {
- restart_lircd () {
- 	if [ "${USER}" = "root" ]; then
- 		# change this if your Linux system keeps the init scripts elsewhere
--		/sbin/init.d/lircd restart
-+		systemctl restart lircd.service
- 	else
- 		echo "`basename ${0}`: you must be 'root' to restart the LIRC daemon (lircd)."
- 		exit 1
-@@ -58,7 +58,7 @@ restart_lircd () {
- stop_lircd () {
- 	if [ "${USER}" = "root" ]; then
- 		# change this if your Linux system keeps the init scripts elsewhere
--		/sbin/init.d/lircd stop
-+		systemctl stop lircd.service
- 	else
- 		echo "`basename ${0}`: you must be 'root' to stop the LIRC daemon (lircd)."
- 		exit 1
---
-1.8.3.1
-
diff --git a/0100-configure-ac-revert-to-git-branch.patch b/0100-configure-ac-revert-to-git-branch.patch
deleted file mode 100644
index 96ec399..0000000
--- a/0100-configure-ac-revert-to-git-branch.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-From f23dfe414e95def3c094a344f7b27eedd06b062e Mon Sep 17 00:00:00 2001
-From: Alec Leamas <leamas@nowhere.net>
-Date: Tue, 15 Oct 2013 11:07:25 +0200
-Subject: [PATCH] Reverting to 0.9.1-git (base for upstream patches)
-
----
- configure.ac | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/configure.ac b/configure.ac
-index 052908b..51ee9a5 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -7,7 +7,7 @@ AC_INIT
- AC_CONFIG_SRCDIR([daemons/lircd.c])
- AC_CONFIG_MACRO_DIR([m4])
- 
--AM_INIT_AUTOMAKE(lirc, 0.9.0)
-+AM_INIT_AUTOMAKE(lirc, 0.9.1-git)
- AM_CONFIG_HEADER(config.h)
- 
- CFLAGS="${CFLAGS--O2 -g -Wall}"
--- 
-1.8.3.1
-
diff --git a/0101-Stripping-some-eol-whitespace.patch b/0101-Stripping-some-eol-whitespace.patch
deleted file mode 100644
index a275705..0000000
--- a/0101-Stripping-some-eol-whitespace.patch
+++ /dev/null
@@ -1,182 +0,0 @@
-From 7b05725dd224e79a3c6023d8cd3e609aa95ac693 Mon Sep 17 00:00:00 2001
-From: Alec Leamas <alec@tests.notat.diaspora.com>
-Date: Thu, 10 Oct 2013 09:22:39 +0200
-Subject: [PATCH] Stripping some eol whitespace.
-
----
- Makefile.am         |  2 +-
- configure.ac        | 26 +++++++++++++-------------
- daemons/Makefile.am |  2 +-
- doc/Makefile.am     |  2 +-
- tools/Makefile.am   |  2 +-
- 5 files changed, 17 insertions(+), 17 deletions(-)
-
-diff --git a/Makefile.am b/Makefile.am
-index 409a4df..f026548 100644
---- a/Makefile.am
-+++ b/Makefile.am
-@@ -1,6 +1,6 @@
- ## $Id: Makefile.am,v 5.12 2009/07/07 20:44:44 lirc Exp $
- 
--## Process this file with automake to produce Makefile.in 
-+## Process this file with automake to produce Makefile.in
- ## Makefile.am, (c)1999 Tom Wheeley <tw104@york.ac.uk>
- 
- ## we need version 1.5 of automake for DIST_SUBDIRS to work and dist-bzip2.
-diff --git a/configure.ac b/configure.ac
-index ff4780f..e130f1e 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -83,7 +83,7 @@ in its directory.
- ])]
-   )]
- )
--	
-+
- 
- dnl Determine default configuration based on OS
- case "${host_os}" in
-@@ -187,7 +187,7 @@ AH_TEMPLATE([DEVDIR],
- AH_TEMPLATE([DYNCODES],
- 	[Define to use dynamic IR codes])
- 
--AH_TEMPLATE([HAVE_ALSA_SB_RC],	
-+AH_TEMPLATE([HAVE_ALSA_SB_RC],
- 	[Define if the ALSA library with SB RC support is installed])
- 
- AH_TEMPLATE([HAVE_FORKPTY],
-@@ -198,7 +198,7 @@ AH_TEMPLATE([HAVE_IGUANAIR],
- 
- AH_TEMPLATE([HAVE_FTDI],
- 	[Define if the libftdi library is installed])
--	
-+
- AH_TEMPLATE([HAVE_LIBALSA],
- 	[Define if the ALSA library is installed])
- 
-@@ -479,7 +479,7 @@ fi
- if test "$driver" = "userspace" -o "$driver" = "all"; then
-   AC_DEFINE(LIRC_DRIVER_ANY)
-   lirc_driver=$driver
--  
-+
-   any_possible_drivers=`echo ${possible_drivers} | sed -e's/ /-/g' \
- 			  -e's/)-(/ /g'  -e's/(//g' -e's/)//g' \
- 			  -e's/-$//g'`
-@@ -696,7 +696,7 @@ if test "$driver" = "userspace" -o "$driver" = "all"; then
-   { for token in $*; do echo $token; done; }
-   newline_to_space()
-   { echo $*; }
--  
-+
-   hw_module=$(newline_to_space $(space_to_newline ${hw_module}| sort -u))
- 
- fi
-@@ -717,7 +717,7 @@ if test "$driver" = "act220l"; then
-   lirc_driver="lirc_dev lirc_sir"
-   AC_DEFINE(LIRC_SIR_ACTISYS_ACT220L)
- fi
--    
-+
- if test "$driver" = "adaptec"; then
-   lirc_driver="lirc_dev lirc_i2c"
-   lircd_conf="adaptec/lircd.conf.AVC-2410"
-@@ -1016,7 +1016,7 @@ fi
- 
- if test "$driver" = "imon"; then
-   lirc_driver="lirc_dev lirc_imon"
--  lircd_conf="imon/lircd.conf.imon"  
-+  lircd_conf="imon/lircd.conf.imon"
- fi
- 
- if test "$driver" = "imon_24g"; then
-@@ -1037,12 +1037,12 @@ fi
- 
- if test "$driver" = "imon_pad"; then
-   lirc_driver="lirc_dev lirc_imon"
--  lircd_conf="imon/lircd.conf.imon-pad"  
-+  lircd_conf="imon/lircd.conf.imon-pad"
- fi
- 
- if test "$driver" = "imon_rsc"; then
-   lirc_driver="lirc_dev lirc_imon"
--  lircd_conf="imon/lircd.conf.imon-rsc"  
-+  lircd_conf="imon/lircd.conf.imon-rsc"
- fi
- 
- if test "$driver" = "irdeo"; then
-@@ -1444,7 +1444,7 @@ else
- Get it at:
- 
-   http://libusb.sourceforge.net/
--  
-+
- Or install these packages from your distro:
- 
-    libusb
-@@ -1550,7 +1550,7 @@ devdir=${devdir_default})
- 
- default_moduledir=/lib/modules/`uname -r`/misc
- AC_ARG_WITH(moduledir,
--[  --with-moduledir=DIR    kernel modules in DIR (/lib/modules/`uname -r`/misc)], 
-+[  --with-moduledir=DIR    kernel modules in DIR (/lib/modules/`uname -r`/misc)],
- moduledir=${withval},
- moduledir=${default_moduledir})
- 
-@@ -1649,7 +1649,7 @@ fi
- dnl if --prefix is not specified, then $prefix is still set to NONE by
- dnl configure.  That's bad here where we want to expand it!
- cur_prefix=$prefix
--test "x${prefix}" = "xNONE" && prefix=$ac_default_prefix 
-+test "x${prefix}" = "xNONE" && prefix=$ac_default_prefix
- test "${sysconfdir}" = "\${prefix}/etc" && sysconfdir=/etc
- test "${localstatedir}" = "\${prefix}/var" && localstatedir=/var
- varrundir="${localstatedir}/run"
-@@ -1675,7 +1675,7 @@ AC_SUBST(moduledir)
- AC_SUBST(driver)
- AC_SUBST(lirc_driver)
- AC_SUBST(hw_module_libs)
--AC_SUBST(vga_progs) 
-+AC_SUBST(vga_progs)
- AC_SUBST(x_progs)
- AC_SUBST(hw_module)
- AC_SUBST(receive)
-diff --git a/daemons/Makefile.am b/daemons/Makefile.am
-index 0b58a8e..42873af 100644
---- a/daemons/Makefile.am
-+++ b/daemons/Makefile.am
-@@ -1,6 +1,6 @@
- ## $Id: Makefile.am,v 5.73 2010/05/13 16:23:23 lirc Exp $
- 
--## Process this file with automake to produce Makefile.in 
-+## Process this file with automake to produce Makefile.in
- 
- ## these are used by programs in the tools directory, but not by
- ## programs in this directory.  So we must make sure they get distributed
-diff --git a/doc/Makefile.am b/doc/Makefile.am
-index c970876..3dd3e09 100644
---- a/doc/Makefile.am
-+++ b/doc/Makefile.am
-@@ -1,6 +1,6 @@
- ## $Id: Makefile.am,v 1.12 2007/11/08 20:58:56 lirc Exp $
- 
--## Process this file with automake to produce Makefile.in 
-+## Process this file with automake to produce Makefile.in
- 
- EXTRA_DIST=lirc.css irxevent.keys lirc.hwdb
- 
-diff --git a/tools/Makefile.am b/tools/Makefile.am
-index 93235f3..3326707 100644
---- a/tools/Makefile.am
-+++ b/tools/Makefile.am
-@@ -1,6 +1,6 @@
- ## $Id: Makefile.am,v 5.20 2009/12/27 19:04:10 lirc Exp $
- 
--## Process this file with automake to produce Makefile.in 
-+## Process this file with automake to produce Makefile.in
- 
- INCLUDES = -I$(top_srcdir)
- 
--- 
-1.8.3.1
-
diff --git a/0102-Update-autotools-config-files.patch b/0102-Update-autotools-config-files.patch
deleted file mode 100644
index 8b81a09..0000000
--- a/0102-Update-autotools-config-files.patch
+++ /dev/null
@@ -1,114 +0,0 @@
-From cc6bb81503e7ad71de97c49d9b6adfaca8aeef4b Mon Sep 17 00:00:00 2001
-From: Alec Leamas <alec@tests.notat.diaspora.com>
-Date: Thu, 10 Oct 2013 09:28:34 +0200
-Subject: [PATCH 102/105] Update autotools config files.
-
-Kills some warnings while running autoconf and also
-replaces some other macros which are deprecated. Add the
-standard aclocal include path m4 - without it there is
-warnings or worse.
----
- Makefile.am         | 1 +
- configure.ac        | 8 ++++----
- daemons/Makefile.am | 3 ++-
- doc/Makefile.am     | 1 +
- tools/Makefile.am   | 5 ++---
- 5 files changed, 10 insertions(+), 8 deletions(-)
-
-diff --git a/Makefile.am b/Makefile.am
-index 409a4df..e237945 100644
---- a/Makefile.am
-+++ b/Makefile.am
-@@ -2,6 +2,7 @@
- 
- ## Process this file with automake to produce Makefile.in
- ## Makefile.am, (c)1999 Tom Wheeley <tw104@york.ac.uk>
-+ACLOCAL_AMFLAGS             = -I m4
- 
- ## we need version 1.5 of automake for DIST_SUBDIRS to work and dist-bzip2.
- AUTOMAKE_OPTIONS = 1.5 check-news dist-bzip2
-diff --git a/configure.ac b/configure.ac
-index e130f1e..af28e4f 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -3,12 +3,12 @@ dnl $Id: configure.ac,v 1.44 2010/07/12 03:25:55 jarodwilson Exp $
- dnl Process this file with autoconf to produce a configure script.
- dnl configure.ac, (c)1999 Tom Wheeley <tw104@york.ac.uk>
- 
--AC_INIT
-+AC_INIT([lirc], [0.9.1-git])
- AC_CONFIG_SRCDIR([daemons/lircd.c])
- AC_CONFIG_MACRO_DIR([m4])
- 
--AM_INIT_AUTOMAKE(lirc, 0.9.1-git)
--AM_CONFIG_HEADER(config.h)
-+AM_INIT_AUTOMAKE
-+AC_CONFIG_HEADERS(config.h)
- 
- CFLAGS="${CFLAGS--O2 -g -Wall}"
- 
-@@ -21,7 +21,7 @@ AC_PATH_PROG(mknod, mknod, /bin/mknod)
- AC_PATH_PROG(mkfifo, mkfifo, /usr/bin/mkfifo)
- AC_PATH_PROG(depmod, depmod, /sbin/depmod, $PATH:/sbin)
- AC_PROG_LN_S
--AC_PROG_LIBTOOL
-+LT_INIT([disable-static])
- AM_PATH_PYTHON(,, [:])
- AM_CONDITIONAL([HAVE_PYTHON], [test "$PYTHON" != ""])
- LIBUSB_CONFIG="pkg-config libusb"
-diff --git a/daemons/Makefile.am b/daemons/Makefile.am
-index 42873af..314048f 100644
---- a/daemons/Makefile.am
-+++ b/daemons/Makefile.am
-@@ -1,11 +1,12 @@
- ## $Id: Makefile.am,v 5.73 2010/05/13 16:23:23 lirc Exp $
- 
- ## Process this file with automake to produce Makefile.in
-+ACLOCAL_AMFLAGS             = -I m4
- 
- ## these are used by programs in the tools directory, but not by
- ## programs in this directory.  So we must make sure they get distributed
- 
--INCLUDES = -I$(top_srcdir)
-+AM_CPPFLAGS = -I$(top_srcdir)
- 
- BUILT_SOURCES = input_map.inc
- 
-diff --git a/doc/Makefile.am b/doc/Makefile.am
-index c970876..cb02678 100644
---- a/doc/Makefile.am
-+++ b/doc/Makefile.am
-@@ -1,6 +1,7 @@
- ## $Id: Makefile.am,v 1.12 2007/11/08 20:58:56 lirc Exp $
- 
- ## Process this file with automake to produce Makefile.in
-+ACLOCAL_AMFLAGS             = -I m4
- 
- EXTRA_DIST=lirc.css irxevent.keys lirc.hwdb
- 
-diff --git a/tools/Makefile.am b/tools/Makefile.am
-index 3326707..978c388 100644
---- a/tools/Makefile.am
-+++ b/tools/Makefile.am
-@@ -1,16 +1,15 @@
- ## $Id: Makefile.am,v 5.20 2009/12/27 19:04:10 lirc Exp $
- 
- ## Process this file with automake to produce Makefile.in
-+ACLOCAL_AMFLAGS             = -I m4
- 
--INCLUDES = -I$(top_srcdir)
-+AM_CPPFLAGS = -I$(top_srcdir) @X_CFLAGS@
- 
- EXTRA_PROGRAMS = smode2 xmode2 irxevent
- bin_PROGRAMS = irw irpty irexec ircat mode2 irsend \
- 	lircrcd \
- 	@vga_progs@ @x_progs@
- 
--AM_CPPFLAGS = @X_CFLAGS@
--
- ## simple programs
- irw_SOURCES = irw.c
- irpty_SOURCES = irpty.c
--- 
-1.8.3.1
-
diff --git a/0103-xmode2.c-Use-generic-fixed-font-instead-of-Courier.patch b/0103-xmode2.c-Use-generic-fixed-font-instead-of-Courier.patch
deleted file mode 100644
index 61a0708..0000000
--- a/0103-xmode2.c-Use-generic-fixed-font-instead-of-Courier.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-From c913583f3d7d166a1cf8505dcb695b88b980a1fc Mon Sep 17 00:00:00 2001
-From: Alec Leamas <alec@tests.notat.diaspora.com>
-Date: Tue, 8 Oct 2013 21:59:01 +0200
-Subject: [PATCH 103/105] xmode2.c: Use generic fixed font instead of Courier.
-
-This used to be a sed command in the Fedora spec file. Using
-the generic fixed font is simply a better default more
-generally available.
----
- tools/xmode2.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/tools/xmode2.c b/tools/xmode2.c
-index b7d858e..27ae7fc 100644
---- a/tools/xmode2.c
-+++ b/tools/xmode2.c
-@@ -69,7 +69,7 @@ Display *d1;
- Window w0, w1;			/*w0 = root */
- char w1_wname[] = "xmode2";
- char w1_iname[] = "xmode2";
--char font1_name[] = "-*-Courier-medium-r-*-*-8-*-*-m-*-iso8859-1";
-+char font1_name[]= "-misc-fixed-*-r-*-*-12-*-*-*-*-*-iso8859-1";
- 
- int w1_x = 0, w1_y = 0;
- unsigned int w1_w = 640, w1_h = 480, w1_border = 0;
--- 
-1.8.3.1
-
diff --git a/0104-Add-systemd-socket-activation-support.patch b/0104-Add-systemd-socket-activation-support.patch
deleted file mode 100644
index e2f0ab6..0000000
--- a/0104-Add-systemd-socket-activation-support.patch
+++ /dev/null
@@ -1,172 +0,0 @@
-From b5fec91d4b91e6798e9c92b389b96f7f44639a9a Mon Sep 17 00:00:00 2001
-From: Alec Leamas <leamas@nowhere.net>
-Date: Tue, 15 Oct 2013 07:34:51 +0200
-Subject: [PATCH] fixing 104
-
----
- configure.ac    |  7 +++++
- daemons/lircd.c | 95 ++++++++++++++++++++++++++++++++++-----------------------
- 2 files changed, 63 insertions(+), 39 deletions(-)
-
-diff --git a/configure.ac b/configure.ac
-index 0ee99e4..e49dc8d 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -232,6 +232,9 @@ AH_TEMPLATE([HAVE_SCSI],
- AH_TEMPLATE([HAVE_SOUNDCARD],
- 	[defined if soundcard API is available])
- 
-+AH_TEMPLATE([HAVE_SYSTEMD],
-+	[defined if systemd API is available])
-+
- AH_TEMPLATE([HAVE_VSYSLOG],
- 	[define if you have vsyslog( prio, fmt, va_arg )])
- 
-@@ -414,6 +417,10 @@ AC_CHECK_HEADERS(linux/i2c-dev.h,[
-   ]
- )
- 
-+PKG_CHECK_MODULES([SYSTEMD],[libsystemd-daemon],[AC_DEFINE(HAVE_SYSTEMD)],[true])
-+CFLAGS="$CFLAGS $SYSTEMD_CFLAGS"
-+LIBS="$LIBS $SYSTEMD_LIBS"
-+
- dnl here we see what driver the user wants.
- 
- AC_ARG_WITH(driver,
-diff --git a/daemons/lircd.c b/daemons/lircd.c
-index 8ace7af..5b8f361 100644
---- a/daemons/lircd.c
-+++ b/daemons/lircd.c
-@@ -5,7 +5,7 @@
-  ****************************************************************************
-  *
-  * lircd - LIRC Decoder Daemon
-- * 
-+ *
-  * Copyright (C) 1996,97 Ralph Metzler <rjkm@thp.uni-koeln.de>
-  * Copyright (C) 1998,99 Christoph Bartelmus <lirc@bartelmus.de>
-  *
-@@ -63,6 +63,10 @@
- #include "input_map.h"
- #endif
- 
-+#ifdef HAVE_SYSTEMD
-+#include "systemd/sd-daemon.h"
-+#endif
-+
- #if defined __APPLE__  || defined __FreeBSD__
- #include <sys/ioctl.h>
- #endif
-@@ -855,6 +859,7 @@ void start_server(mode_t permission, int nodaemon)
- 	int ret;
- 	int new = 1;
- 	int fd;
-+	int n;
- 
- 	/* create pid lockfile in /var/run */
- 	if ((fd = open(pidfile, O_RDWR | O_CREAT, 0644)) == -1 || (pidf = fdopen(fd, "r+")) == NULL) {
-@@ -881,51 +886,63 @@ void start_server(mode_t permission, int nodaemon)
- 	(void)ftruncate(fileno(pidf), ftell(pidf));
- 
- 	/* create socket */
--	sockfd = socket(AF_UNIX, SOCK_STREAM, 0);
--	if (sockfd == -1) {
--		fprintf(stderr, "%s: could not create socket\n", progname);
--		perror(progname);
-+	sockfd = -1;
-+#ifdef HAVE_SYSTEMD
-+        n = sd_listen_fds(0);
-+        if (n > 1) {
-+                fprintf(stderr, "Too many file descriptors received.\n");
- 		goto start_server_failed0;
--	}
-+        }
-+        else if (n == 1)
-+                sockfd  = SD_LISTEN_FDS_START + 0;
-+#endif
-+        if (sockfd == -1) {
-+		sockfd = socket(AF_UNIX, SOCK_STREAM, 0);
-+		if (sockfd == -1) {
-+			fprintf(stderr, "%s: could not create socket\n", progname);
-+			perror(progname);
-+			goto start_server_failed0;
-+		}
- 
--	/* 
--	   get owner, permissions, etc.
--	   so new socket can be the same since we
--	   have to delete the old socket.  
--	 */
--	ret = stat(lircdfile, &s);
--	if (ret == -1 && errno != ENOENT) {
--		fprintf(stderr, "%s: could not get file information for %s\n", progname, lircdfile);
--		perror(progname);
--		goto start_server_failed1;
--	}
--	if (ret != -1) {
--		new = 0;
--		ret = unlink(lircdfile);
--		if (ret == -1) {
--			fprintf(stderr, "%s: could not delete %s\n", progname, lircdfile);
--			perror(NULL);
-+		/*
-+		   get owner, permissions, etc.
-+		   so new socket can be the same since we
-+		   have to delete the old socket.
-+		 */
-+		ret = stat(lircdfile, &s);
-+		if (ret == -1 && errno != ENOENT) {
-+			fprintf(stderr, "%s: could not get file information for %s\n", progname, lircdfile);
-+			perror(progname);
- 			goto start_server_failed1;
- 		}
--	}
-+		if (ret != -1) {
-+			new = 0;
-+			ret = unlink(lircdfile);
-+			if (ret == -1) {
-+				fprintf(stderr, "%s: could not delete %s\n", progname, lircdfile);
-+				perror(NULL);
-+				goto start_server_failed1;
-+			}
-+		}
- 
--	serv_addr.sun_family = AF_UNIX;
--	strcpy(serv_addr.sun_path, lircdfile);
--	if (bind(sockfd, (struct sockaddr *)&serv_addr, sizeof(serv_addr)) == -1) {
--		fprintf(stderr, "%s: could not assign address to socket\n", progname);
--		perror(progname);
--		goto start_server_failed1;
--	}
-+		serv_addr.sun_family = AF_UNIX;
-+		strcpy(serv_addr.sun_path, lircdfile);
-+		if (bind(sockfd, (struct sockaddr *)&serv_addr, sizeof(serv_addr)) == -1) {
-+			fprintf(stderr, "%s: could not assign address to socket\n", progname);
-+			perror(progname);
-+			goto start_server_failed1;
-+		}
- 
--	if (new ? chmod(lircdfile, permission)
--	    : (chmod(lircdfile, s.st_mode) == -1 || chown(lircdfile, s.st_uid, s.st_gid) == -1)
--	    ) {
--		fprintf(stderr, "%s: could not set file permissions\n", progname);
--		perror(progname);
--		goto start_server_failed1;
--	}
-+		if (new ? chmod(lircdfile, permission)
-+		    : (chmod(lircdfile, s.st_mode) == -1 || chown(lircdfile, s.st_uid, s.st_gid) == -1)
-+		    ) {
-+			fprintf(stderr, "%s: could not set file permissions\n", progname);
-+			perror(progname);
-+			goto start_server_failed1;
-+		}
- 
--	listen(sockfd, 3);
-+		listen(sockfd, 3);
-+        }
- 	nolinger(sockfd);
- 
- 	if (useuinput) {
--- 
-1.8.3.1
-
diff --git a/0105-Update-COPYING-to-latest-version.patch b/0105-Update-COPYING-to-latest-version.patch
deleted file mode 100644
index f632542..0000000
--- a/0105-Update-COPYING-to-latest-version.patch
+++ /dev/null
@@ -1,115 +0,0 @@
-From 9c384a1a84faea2d17af360a7f227d611f847160 Mon Sep 17 00:00:00 2001
-From: Alec Leamas <alec@tests.notat.diaspora.com>
-Date: Thu, 10 Oct 2013 09:42:12 +0200
-Subject: [PATCH 105/105] Update COPYING to latest version.
-
-As stated on the mailing list, current COPYING has wrong address to the
-Free Software Foundation (they have moved) which causes some packaging
-noise. Updated from latest version available at
-http://www.gnu.org/licenses/old-licenses/gpl-2.0.txt
----
- COPYING | 33 ++++++++++++++++-----------------
- 1 file changed, 16 insertions(+), 17 deletions(-)
-
-diff --git a/COPYING b/COPYING
-index 60549be..d159169 100644
---- a/COPYING
-+++ b/COPYING
-@@ -1,12 +1,12 @@
--		    GNU GENERAL PUBLIC LICENSE
--		       Version 2, June 1991
-+                    GNU GENERAL PUBLIC LICENSE
-+                       Version 2, June 1991
- 
-- Copyright (C) 1989, 1991 Free Software Foundation, Inc.
--                       59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
-+ Copyright (C) 1989, 1991 Free Software Foundation, Inc.,
-+ 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
-  Everyone is permitted to copy and distribute verbatim copies
-  of this license document, but changing it is not allowed.
- 
--			    Preamble
-+                            Preamble
- 
-   The licenses for most software are designed to take away your
- freedom to share and change it.  By contrast, the GNU General Public
-@@ -15,7 +15,7 @@ software--to make sure the software is free for all its users.  This
- General Public License applies to most of the Free Software
- Foundation's software and to any other program whose authors commit to
- using it.  (Some other Free Software Foundation software is covered by
--the GNU Library General Public License instead.)  You can apply it to
-+the GNU Lesser General Public License instead.)  You can apply it to
- your programs, too.
- 
-   When we speak of free software, we are referring to freedom, not
-@@ -56,7 +56,7 @@ patent must be licensed for everyone's free use or not licensed at all.
-   The precise terms and conditions for copying, distribution and
- modification follow.
- 
--		    GNU GENERAL PUBLIC LICENSE
-+                    GNU GENERAL PUBLIC LICENSE
-    TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
- 
-   0. This License applies to any program or other work which contains
-@@ -255,7 +255,7 @@ make exceptions for this.  Our decision will be guided by the two goals
- of preserving the free status of all derivatives of our free software and
- of promoting the sharing and reuse of software generally.
- 
--			    NO WARRANTY
-+                            NO WARRANTY
- 
-   11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY
- FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW.  EXCEPT WHEN
-@@ -277,9 +277,9 @@ YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER
- PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE
- POSSIBILITY OF SUCH DAMAGES.
- 
--		     END OF TERMS AND CONDITIONS
-+                     END OF TERMS AND CONDITIONS
- 
--	    How to Apply These Terms to Your New Programs
-+            How to Apply These Terms to Your New Programs
- 
-   If you develop a new program, and you want it to be of the greatest
- possible use to the public, the best way to achieve this is to make it
-@@ -291,7 +291,7 @@ convey the exclusion of warranty; and each file should have at least
- the "copyright" line and a pointer to where the full notice is found.
- 
-     <one line to give the program's name and a brief idea of what it does.>
--    Copyright (C) 19yy  <name of author>
-+    Copyright (C) <year>  <name of author>
- 
-     This program is free software; you can redistribute it and/or modify
-     it under the terms of the GNU General Public License as published by
-@@ -303,17 +303,16 @@ the "copyright" line and a pointer to where the full notice is found.
-     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-     GNU General Public License for more details.
- 
--    You should have received a copy of the GNU General Public License
--    along with this program; if not, write to the Free Software
--    Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
--
-+    You should have received a copy of the GNU General Public License along
-+    with this program; if not, write to the Free Software Foundation, Inc.,
-+    51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
- 
- Also add information on how to contact you by electronic and paper mail.
- 
- If the program is interactive, make it output a short notice like this
- when it starts in an interactive mode:
- 
--    Gnomovision version 69, Copyright (C) 19yy name of author
-+    Gnomovision version 69, Copyright (C) year name of author
-     Gnomovision comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
-     This is free software, and you are welcome to redistribute it
-     under certain conditions; type `show c' for details.
-@@ -336,5 +335,5 @@ necessary.  Here is a sample; alter the names:
- This General Public License does not permit incorporating your program into
- proprietary programs.  If your program is a subroutine library, you may
- consider it more useful to permit linking proprietary applications with the
--library.  If this is what you want to do, use the GNU Library General
-+library.  If this is what you want to do, use the GNU Lesser General
- Public License instead of this License.
--- 
-1.8.3.1
-
diff --git a/0105-configure-ac-back-to-0.9.0.patch b/0105-configure-ac-back-to-0.9.0.patch
deleted file mode 100644
index 19a4d78..0000000
--- a/0105-configure-ac-back-to-0.9.0.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-From 6470e34d1be9e8be5c275a1e10929cd0f973478b Mon Sep 17 00:00:00 2001
-From: Alec Leamas <leamas@nowhere.net>
-Date: Fri, 11 Oct 2013 06:00:28 +0200
-Subject: [PATCH] Revert to 0.9.0
-
-Technically, current release is 0.9.0 + some patches rather than
-a 0.9.1 pre-release.
----
- configure.ac | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/configure.ac b/configure.ac
-index 7df186a..46380a3 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -3,7 +3,7 @@ dnl $Id: configure.ac,v 1.44 2010/07/12 03:25:55 jarodwilson Exp $
- dnl Process this file with autoconf to produce a configure script.
- dnl configure.ac, (c)1999 Tom Wheeley <tw104@york.ac.uk>
- 
--AC_INIT([lirc], [0.9.1-git])
-+AC_INIT([lirc], [0.9.0])
- AC_CONFIG_SRCDIR([daemons/lircd.c])
- AC_CONFIG_MACRO_DIR([m4])
- 
--- 
-1.8.3.1
-
diff --git a/0200-Fixing-FTBS-when-using-Werror-format-security.patch b/0200-Fixing-FTBS-when-using-Werror-format-security.patch
deleted file mode 100644
index 31e9598..0000000
--- a/0200-Fixing-FTBS-when-using-Werror-format-security.patch
+++ /dev/null
@@ -1,72 +0,0 @@
-From ca8ef3bb75fb5759e13702f456680fc30fdc7df7 Mon Sep 17 00:00:00 2001
-From: Alec Leamas <alec@tests.notat.diaspora.com>
-Date: Tue, 3 Dec 2013 16:56:09 +0100
-Subject: [PATCH] Fixing FTBS when using -Werror=format-security
-
-Fedora moves to using above flag for security reasons. Simple
-fix to get rid of compilation error.
----
- doc/man2html.c | 12 ++++++------
- 1 file changed, 6 insertions(+), 6 deletions(-)
-
-diff --git a/doc/man2html.c b/doc/man2html.c
-index e1cce31..6898f64 100644
---- a/doc/man2html.c
-+++ b/doc/man2html.c
-@@ -29,7 +29,7 @@
- ** found, that page will be displayed.
- **
- ** man2html will add links to the converted manpages. The function add_links
--** is used for that. At the moment it will add links as follows, where   
-+** is used for that. At the moment it will add links as follows, where
- **     indicates what should match to start with:
- ** ^^^
- ** Recognition           Item            Link
-@@ -748,7 +748,7 @@ char *scan_escape(char *c)
- 	h = expand_string(i);
- 	break;
-     case 'f':
--	c++;	
-+	c++;
- 	if (*c=='\\') {
- 	    c++;
- 	    c=scan_escape(c);
-@@ -1579,7 +1579,7 @@ char *section_list[] = {
-     "8S", "Maintenance Commands",
-     "8V", "Maintenance Commands",
-     "L", "Local Commands",
--/* for Solaris: 
-+/* for Solaris:
-     "1", "User Commands",
-     "1B", "SunOS/BSD Compatibility Package Commands",
-     "1b", "SunOS/BSD Compatibility Package Commands",
-@@ -1924,7 +1924,7 @@ char *scan_request(char *c)
- 		c=skip_till_newline(c+j);
- 	    break;
- 	case V('i','e'):
--	    /* .ie c anything : then part of if else */	
-+	    /* .ie c anything : then part of if else */
- 	case V('i','f'):
- 	    /* .if c anything
- 	     * .if !c anything
-@@ -2031,7 +2031,7 @@ char *scan_request(char *c)
- 		    f=fopen(h,"r");
- 		    if (!f || !buf || !l)
- 			fprintf(stderr, "Unable to open or read file %s.\n",
--				h); 
-+				h);
- 		    else {
- 			i=fread(buf+1,1,l,f);
- 			fclose(f);
-@@ -3027,7 +3027,7 @@ int main(int argc, char **argv)
- 	/* &nbsp; for mosaic users */
- 	printf("<HR>\n<A NAME=\"index\">&nbsp;</A><H2>Index</H2>\n<DL>\n");
- 	manidx[mip]=0;
--	printf(manidx);
-+	printf("%s", manidx);
- 	if (subs) printf("</DL>\n");
- 	printf("</DL>\n");
- 	print_sig();
--- 
-1.8.3.1
-
diff --git a/README.fedora b/README.fedora
index 8c26af7..2cda73a 100644
--- a/README.fedora
+++ b/README.fedora
@@ -1,46 +1,12 @@
 ## Fedora README
 
-#### New service name: lirc -> lircd.
+### Upstream release 0.9.1a
 
-For reasons of consistency we have renamed the lirc service to
-lircd. Basically, this means that to start the service one need
-to use systemctl start lircd.service instead of lirc.service etc.
-Sorry for the inconvenience.
+The changes that broke the update for 0.9.0 are now in upstream. There
+are no functional fedora-specific patches in this release, just some
+bugfixes.
 
-#### Enable lirc protocol
 
-For lirc to work with ir devices, the lirc protocol must be enabled
-for the actual device used. This only applies to ir devices which
-are visible as /sys/class/rc/rc? devices. E. g., I have an RF remote
-which is just an usb device (driver atilibusb) and this one does
-*not* require the the lirc protocol to be enabled in this way.
-
-If you have a "classic" ir device needing lirc to be enabled one option
-is to install the lirc-disable-kernel-rc subpackage. This is an udev
-rule which disables the kernel built-in ir device handling and makes
-lirc the only protocol used. This might or might not be what you want.
-
-Another option is to set the LIRCD_IR_DEVICE in /etc/sysconfig/lirc. This
-will enable the lirc protocol for that device when lirc is running. The
-kernel built-in protocols are still in place, but not used. Again, this
-might or might not be what you want.
-
-#### Socket activation
-
-As of 0.9.4-15+, the Fedora lirc package sports systemd socket
-activation. This should fix the problems at startup when clients can't
-connect to /var/run/lircd because the lircd service is yet not started.
-
-To start the lircd service using socket activation:
-```
-    # systemctl enable lircd.socket
-    # systemctl start lircd.socket
-```
-The lircmd is started the usual way:
-```
-    # systemctl enable lircmd.service
-    # systemctl start lircmd.service
-```
 #### Running another instance.
 
 Sometimes another lircd instance is required to handle some other input
@@ -86,13 +52,11 @@ If lircd fails to start or dies after restart, first check logs for errors:
     # systemctl restart lircd.service
 ```
 
-You could also run lircd in foreground after stopping service:
+You could also run lircd in foreground after stopping service, using the
+driver  and device defined in lirc_options.conf:
 ```
     # systemctl stop lircd.service
-    # bash
-    # source /etc/systconfig/lirc
-    # /usr/sbin/lircd $LIRCD_OPTIONS --driver $LIRC_DRIVER \
-    > --device $LIRC_DEVICE  --nodaemon
+    # /usr/sbin/lircd  --nodaemon
 ```
 
 Sometimes kernel complains about multiple clients trying to access the
@@ -102,7 +66,7 @@ remote using the atilibusb driver. This needs to blacklist the built_in
 ati_remote module. This is is done by creating the file
 /etc/modprobe.conf.d/blacklist-ati-remote.conf as:
 ```
-# Block built-in handling of ati-remote (use lircd instead).
+## Block built-in handling of ati-remote (use lircd instead).
 blacklist ati_remote
 ```
 
diff --git a/branch b/branch
deleted file mode 100644
index baa94ef..0000000
--- a/branch
+++ /dev/null
@@ -1 +0,0 @@
-F-13
diff --git a/lirc-0.8.4-make-remote-names-all-unique.patch b/lirc-0.8.4-make-remote-names-all-unique.patch
deleted file mode 100644
index 4f8f434..0000000
--- a/lirc-0.8.4-make-remote-names-all-unique.patch
+++ /dev/null
@@ -1,134 +0,0 @@
-Index: lirc-0.8.7pre2/remotes/atiusb/lircd.conf.atiusb
-===================================================================
---- lirc-0.8.7pre2.orig/remotes/atiusb/lircd.conf.atiusb
-+++ lirc-0.8.7pre2/remotes/atiusb/lircd.conf.atiusb
-@@ -1865,7 +1865,7 @@ end remote
- 
- begin remote
- 
--  name  Medion_X10
-+  name  Medion_X10_V2
-   bits           16
-   eps            30
-   aeps          100
-@@ -1943,7 +1943,7 @@ end remote
- 
- begin remote
- 
--  name  Medion_X10
-+  name  Medion_X10_V3
-   bits           16
-   eps            30
-   aeps          100
-Index: lirc-0.8.7pre2/remotes/bestbuy/lircd.conf.bestbuy2
-===================================================================
---- lirc-0.8.7pre2.orig/remotes/bestbuy/lircd.conf.bestbuy2
-+++ lirc-0.8.7pre2/remotes/bestbuy/lircd.conf.bestbuy2
-@@ -11,7 +11,7 @@
- 
- begin remote
- 
--  name  BESTBUY
-+  name  BESTBUY2
-   bits            7
-   eps            30
-   aeps          100
-Index: lirc-0.8.7pre2/remotes/dvico/lircd.conf.fusionHDTV
-===================================================================
---- lirc-0.8.7pre2.orig/remotes/dvico/lircd.conf.fusionHDTV
-+++ lirc-0.8.7pre2/remotes/dvico/lircd.conf.fusionHDTV
-@@ -153,7 +153,7 @@ end remote
- 
- begin remote
- 
--  name  DVICO_MCE
-+  name  DVICO_MCE2
-   bits            8
-   eps            30
-   aeps          100
-Index: lirc-0.8.7pre2/remotes/generic/NEC-pulse.conf
-===================================================================
---- lirc-0.8.7pre2.orig/remotes/generic/NEC-pulse.conf
-+++ lirc-0.8.7pre2/remotes/generic/NEC-pulse.conf
-@@ -7,7 +7,7 @@
- 
- begin remote
- 
--  name  NEC
-+  name  NEC_PULSE
-   bits           16
-   flags SPACE_ENC|CONST_LENGTH
-   eps            30
-Index: lirc-0.8.7pre2/remotes/generic/NEC-short-pulse.conf
-===================================================================
---- lirc-0.8.7pre2.orig/remotes/generic/NEC-short-pulse.conf
-+++ lirc-0.8.7pre2/remotes/generic/NEC-short-pulse.conf
-@@ -9,7 +9,7 @@
- 
- begin remote
- 
--  name  NEC
-+  name  NEC_SHORT_PULSE
-   bits           16
-   flags SPACE_ENC|CONST_LENGTH
-   eps            30
-Index: lirc-0.8.7pre2/remotes/generic/SONY12.conf
-===================================================================
---- lirc-0.8.7pre2.orig/remotes/generic/SONY12.conf
-+++ lirc-0.8.7pre2/remotes/generic/SONY12.conf
-@@ -6,7 +6,7 @@
- 
- begin remote
- 
--  name  SONY
-+  name  SONY_12
-   bits            7
-   flags SPACE_ENC|CONST_LENGTH
-   eps            30
-Index: lirc-0.8.7pre2/remotes/generic/SONY20.conf
-===================================================================
---- lirc-0.8.7pre2.orig/remotes/generic/SONY20.conf
-+++ lirc-0.8.7pre2/remotes/generic/SONY20.conf
-@@ -6,7 +6,7 @@
- 
- begin remote
- 
--  name  SONY
-+  name  SONY_20
-   bits            7
-   flags SPACE_ENC|CONST_LENGTH
-   eps            30
-Index: lirc-0.8.7pre2/remotes/hauppauge/lircd.conf.hauppauge
-===================================================================
---- lirc-0.8.7pre2.orig/remotes/hauppauge/lircd.conf.hauppauge
-+++ lirc-0.8.7pre2/remotes/hauppauge/lircd.conf.hauppauge
-@@ -278,14 +278,14 @@ end remote
- #
- # contributed by Matthew Wright
- #
--# brand:  Hauppauge (HRV-1600 RT Remote)
-+# brand:  Hauppauge (HVR-1600 RT Remote)
- # model no. of remote control: A415-HPG-A
- # devices being controlled by this remote:
- #
- 
- begin remote
- 
--  name  Hauppauge
-+  name  Hauppauge_HVR_1600
-   bits           13
-   flags RC5|CONST_LENGTH
-   eps            30
-Index: lirc-0.8.7pre2/remotes/leadtek/lircd.conf.PVR2000
-===================================================================
---- lirc-0.8.7pre2.orig/remotes/leadtek/lircd.conf.PVR2000
-+++ lirc-0.8.7pre2/remotes/leadtek/lircd.conf.PVR2000
-@@ -74,7 +74,7 @@ end remote
- 
- begin remote
- 
--  name  PVR2000
-+  name  PVR2000_V2
-   bits           8
-   flags  SHIFT_ENC
-   gap       120000
diff --git a/lirc-0.8.6-firefly-def.patch b/lirc-0.8.6-firefly-def.patch
deleted file mode 100644
index cd86ddd..0000000
--- a/lirc-0.8.6-firefly-def.patch
+++ /dev/null
@@ -1,175 +0,0 @@
-Index: lirc-0.8.7pre2/remotes/atiusb/lircd.conf.atiusb
-===================================================================
---- lirc-0.8.7pre2.orig/remotes/atiusb/lircd.conf.atiusb
-+++ lirc-0.8.7pre2/remotes/atiusb/lircd.conf.atiusb
-@@ -2195,7 +2195,7 @@ end remote
- # this config file was automatically generated
- # using lirc-0.8.2(default) on Wed Feb  6 01:32:32 2008
- #
--# contributed by 
-+# contributed by http://www.mythtv.org/wiki/Snapstream_Firefly
- #
- # brand:                       Snapstream Firefly
- # model no. of remote control: R1000
-@@ -2215,63 +2215,111 @@ begin remote
-   pre_data       0x14
-   post_data_bits  16
-   post_data      0x0
--  gap          235978
-+  gap          147992
-+  min_repeat      5
-   toggle_bit_mask 0x80800000
- 
-       begin codes
--          maximize                 0x81AC
--          close                    0xD702
--          1                        0x628D
--          2                        0xE30E
--          3                        0x648F
--          4                        0xE510
--          5                        0x6691
--          6                        0xE712
--          7                        0x6893
--          8                        0xE914
--          9                        0x6A95
--          0                        0xEC17
--          back                     0x6B96
--          ent                      0xED18
--          volup                    0x5E89
--          voldown                  0xDD08
--          mute                     0x5F8A
--          chup                     0xE00B
--          chdown                   0x618C
--          firefly                  0xD500
--          info                     0x83AE
--          option                   0x042F
--          up                       0x6F9A
--          down                     0xF722
--          left                     0x729D
--          right                    0xF41F
--          ok                       0x739E
--          menu                     0xF11C
--          exit                     0x75A0
--          rec                      0xFC27
--          play                     0x7AA5
--          stop                     0xFD28
--          rew                      0x79A4
--          prev                     0x002B
--          pause                    0x7EA9
--          ffwd                     0xFB26
--          next                     0x7FAA
--          music                    0xDB06
--          photo                    0x5A85
--          dvd                      0xD904
--          tv                       0x5883
--          video                    0xDC07
--          help                     0x5681
--          mouse                    0x022D
--          a                        0x6E99
--          b                        0xF01B
--          c                        0x76A1
--          d                        0xF823
-+	  KEY_MAX                  0x812C
-+	  KEY_MAX                  0x01AC
-+	  KEY_CLOSE                0x5702
-+	  KEY_CLOSE                0xD782
-+	  KEY_1                    0x620D
-+	  KEY_1                    0xE28D
-+	  KEY_2                    0x630E
-+	  KEY_2                    0xE38E
-+	  KEY_3                    0x640F
-+	  KEY_3                    0xE48F
-+	  KEY_4                    0x6510
-+	  KEY_4                    0xE590
-+	  KEY_5                    0x6611
-+	  KEY_5                    0xE691
-+	  KEY_6                    0x6712
-+	  KEY_6                    0xE792
-+	  KEY_7                    0x6813
-+	  KEY_7                    0xE893
-+	  KEY_8                    0x6914
-+	  KEY_8                    0xE994
-+	  KEY_9                    0x6A15
-+	  KEY_9                    0xEA95
-+	  KEY_0                    0x6C17
-+	  KEY_0                    0xEC97
-+	  KEY_BACK                 0x6B16
-+	  KEY_BACK                 0xEB96
-+	  KEY_ENTER                0x6D18
-+	  KEY_ENTER                0xED98
-+	  KEY_VOLUMEUP             0x5E09
-+	  KEY_VOLUMEUP             0xDE89
-+	  KEY_VOLUMEDOWN           0x5D08
-+	  KEY_VOLUMEDOWN           0xDD88
-+	  KEY_MUTE                 0x5F0A
-+	  KEY_MUTE                 0xDF8A
-+	  KEY_VENDOR               0x5500
-+	  KEY_VENDOR               0xD580
-+	  KEY_CHANNELUP            0x600B
-+	  KEY_CHANNELUP            0xE08B
-+	  KEY_CHANNELDOWN          0x610C
-+	  KEY_CHANNELDOWN          0xE18C
-+	  KEY_INFO                 0x832E
-+	  KEY_INFO                 0x03AE
-+	  KEY_OPTION               0x842F
-+	  KEY_OPTION               0x04AF
-+	  KEY_UP                   0x6F1A
-+	  KEY_UP                   0xEF9A
-+	  KEY_LEFT                 0x721D
-+	  KEY_LEFT                 0xF29D
-+	  KEY_DOWN                 0x7722
-+	  KEY_DOWN                 0xF7A2
-+	  KEY_RIGHT                0x741F
-+	  KEY_RIGHT                0xF49F
-+	  KEY_OK                   0x731E
-+	  KEY_OK                   0xF39E
-+	  KEY_MENU                 0x711C
-+	  KEY_MENU                 0xF19C
-+	  KEY_EXIT                 0x7520
-+	  KEY_EXIT                 0xF5A0
-+	  KEY_RECORD               0x7C27
-+	  KEY_RECORD               0xFCA7
-+	  KEY_PLAY                 0x7A25
-+	  KEY_PLAY                 0xFAA5
-+	  KEY_STOP                 0x7D28
-+	  KEY_STOP                 0xFDA8
-+	  KEY_REWIND               0x7924
-+	  KEY_REWIND               0xF9A4
-+	  KEY_FORWARD              0x7B26
-+	  KEY_FORWARD              0xFBA6
-+	  KEY_PREVIOUS             0x802B
-+	  KEY_PREVIOUS             0x00AB
-+	  KEY_PAUSE                0x7E29
-+	  KEY_PAUSE                0xFEA9
-+	  KEY_NEXT                 0x7F2A
-+	  KEY_NEXT                 0xFFAA
-+	  KEY_AUDIO                0x5B06
-+	  KEY_AUDIO                0xDB86
-+	  PHOTOS                   0x5A05
-+	  PHOTOS                   0xDA85
-+	  KEY_DVD                  0x5904
-+	  KEY_DVD                  0xD984
-+	  KEY_TV                   0x5803
-+	  KEY_TV                   0xD883
-+	  KEY_VIDEO                0x5C07
-+	  KEY_VIDEO                0xDC87
-+	  KEY_HELP                 0x5601
-+	  KEY_HELP                 0xD681
-+	  MOUSE                    0x822D
-+	  MOUSE                    0x02AD
-+	  KEY_A                    0x6E19
-+	  KEY_A                    0xEE99
-+	  KEY_B                    0x701B
-+	  KEY_B                    0xF09B
-+	  KEY_C                    0x7621
-+	  KEY_C                    0xF6A1
-+	  KEY_D                    0x7823
-+	  KEY_D                    0xF8A3
-       end codes
- 
- end remote
- 
--
- #
- # this config file was automatically generated
- # using lirc-0.8.2(default) on Thu Oct  4 17:42:33 2007
diff --git a/lirc-0.8.6-standardized-remote-keycodes.patch b/lirc-0.8.6-standardized-remote-keycodes.patch
deleted file mode 100644
index b061416..0000000
--- a/lirc-0.8.6-standardized-remote-keycodes.patch
+++ /dev/null
@@ -1,4917 +0,0 @@
-Index: lirc-0.8.7pre2/remotes/adstech/lircd.conf.usbx-707
-===================================================================
---- lirc-0.8.7pre2.orig/remotes/adstech/lircd.conf.usbx-707
-+++ lirc-0.8.7pre2/remotes/adstech/lircd.conf.usbx-707
-@@ -26,50 +26,50 @@ begin remote
-   toggle_bit_mask 0x0
- 
-       begin codes
--          Power                    0x02FD5BA400
--          Mute                     0x02FD5FA000
--          1                        0x02FD57A800
--          2                        0x02FD4FB000
--          3                        0x02FD53AC00
--          4                        0x02FD56A900
--          5                        0x02FD4EB100
--          6                        0x02FD5EA100
--          7                        0x02FD54AB00
--          8                        0x02FD4CB300
--          9                        0x02FD5CA300
--          Jump                     0x02FD55AA00
--          0                        0x02FD4DB200
-+          KEY_POWER                    0x02FD5BA400
-+          KEY_MUTE                     0x02FD5FA000
-+          KEY_1                        0x02FD57A800
-+          KEY_2                        0x02FD4FB000
-+          KEY_3                        0x02FD53AC00
-+          KEY_4                        0x02FD56A900
-+          KEY_5                        0x02FD4EB100
-+          KEY_6                        0x02FD5EA100
-+          KEY_7                        0x02FD54AB00
-+          KEY_8                        0x02FD4CB300
-+          KEY_9                        0x02FD5CA300
-+          Jump                         0x02FD55AA00
-+          KEY_0                        0x02FD4DB200
-           Search                   0x02FD5DA200
--          Guide                    0x02FD17E800
--          Up                       0x02FD0FF000
--          Menu                     0x02FD1FE000
--          Left                     0x02FD16E900
--          Enter                    0x02FD0EF100
--          Right                    0x02FD1EE100
--          Info                     0x02FD5AA500
--          Down                     0x02FD46B900
--          Exit                     0x02FD52AD00
--          Replay                   0x02FD59A600
--          Skip                     0x02FD51AE00
--          Rewind                   0x02FD58A700
--          Play                     0x02FD44BB00
--          Forward                  0x02FD50AF00
--          Stop                     0x02FD07F800
--          Record                   0x02FD1BE400
-+          GUIDE                    0x02FD17E800
-+          KEY_UP                       0x02FD0FF000
-+          KEY_MENU                     0x02FD1FE000
-+          KEY_LEFT                     0x02FD16E900
-+          KEY_ENTER                    0x02FD0EF100
-+          KEY_RIGHT                    0x02FD1EE100
-+          KEY_INFO                     0x02FD5AA500
-+          KEY_DOWN                     0x02FD46B900
-+          KEY_EXIT                     0x02FD52AD00
-+          KEY_AGAIN                   0x02FD59A600
-+          KEY_NEXT                     0x02FD51AE00
-+          KEY_REWIND                   0x02FD58A700
-+          KEY_PLAY                     0x02FD44BB00
-+          KEY_FORWARD                  0x02FD50AF00
-+          KEY_STOP                     0x02FD07F800
-+          KEY_RECORD                   0x02FD1BE400
-           Live                     0x02FD13EC00
--          A                        0x02FD0AF500
--          DVD                      0x02FD06F900
--          B                        0x02FD12ED00
-+          KEY_A                        0x02FD0AF500
-+          KEY_DVD                      0x02FD06F900
-+          KEY_B                        0x02FD12ED00
-           Photo                    0x02FD48B700
--          Video                    0x02FD40BF00
--          Music                    0x02FD19E600
--          Ch+                      0x02FD0BF400
--          Ch-                      0x02FD08F700
-+          KEY_VIDEO                    0x02FD40BF00
-+          KEY_AUDIO                    0x02FD19E600
-+          KEY_CHANNELUP                      0x02FD0BF400
-+          KEY_CHANNELDOWN                      0x02FD08F700
-           S1                       0x02FD03FC00
-           S2                       0x02FD01FE00
-           S3                       0x02FD00FF00
--          Vol+                     0x02FD15EA00
--          Vol-                     0x02FD1CE300
-+          KEY_VOLUMEUP                     0x02FD15EA00
-+          KEY_VOLUMEDOWN                     0x02FD1CE300
-       end codes
- 
- end remote
-Index: lirc-0.8.7pre2/remotes/animax/lircd.conf.animax
-===================================================================
---- lirc-0.8.7pre2.orig/remotes/animax/lircd.conf.animax
-+++ lirc-0.8.7pre2/remotes/animax/lircd.conf.animax
-@@ -38,79 +38,79 @@ begin remote
- 
-       begin codes
-           CD_DOWN                  0x000000000000DB24
--          CD_UP                    0x0000000000005BA4
-+          KEY_CD                    0x0000000000005BA4
-           TV_DOWN                  0x000000000000DC23
--          TV_UP                    0x0000000000005CA3
-+          KEY_TV                    0x0000000000005CA3
-           PHONE_DOWN               0x000000000000DD22
--          PHONE_UP                 0x0000000000005DA2
-+          KEY_PHONE                 0x0000000000005DA2
-           RADIO_DOWN               0x000000000000DE21
--          RADIO_UP                 0x0000000000005EA1
-+          KEY_RADIO                 0x0000000000005EA1
-           VIDEO_DOWN               0x000000000000DF20
--          VIDEO_UP                 0x0000000000005FA0
-+          KEY_VIDEO                 0x0000000000005FA0
-           AUX1_DOWN                0x000000000000E01F
--          AUX1_UP                  0x000000000000609F
-+          KEY_AUX                  0x000000000000609F
-           MAIL_DOWN                0x000000000000E11E
--          MAIL_UP                  0x000000000000619E
-+          KEY_MAIL                  0x000000000000619E
-           AUX2_DOWN                0x000000000000E21D
-           AUX2_UP                  0x000000000000629D
-           POWER_DOWN               0x000000000000E31C
--          POWER_UP                 0x000000000000639C
-+          KEY_POWER                 0x000000000000639C
-           LEFT_MOUSE_BUTTON_TOUCH_DOWN 0x000000000000E41B
-           LEFT_MOUSE_BUTTON_TOUCH_UP 0x000000000000649B
-           REWIND_DOWN              0x000000000000E51A
--          REWIND_UP                0x000000000000659A
-+          KEY_REWIND                0x000000000000659A
-           PLAY_DOWN                0x000000000000E619
--          PLAY_UP                  0x0000000000006699
-+          KEY_PLAY                  0x0000000000006699
-           FORWARD_DOWN             0x000000000000E718
--          FORWARD_UP               0x0000000000006798
-+          KEY_FORWARD               0x0000000000006798
-           SKIP_BACKWARD_DOWN       0x000000000000E817
-           SKIP_BACKWARD            0x0000000000006897
-           STOP_DOWN                0x000000000000E916
--          STOP_UP                  0x0000000000006996
-+          KEY_STOP                  0x0000000000006996
-           SKIP_FORWARD_DOWN        0x000000000000EA15
-           SKIP_FORWARD_UP          0x0000000000006A95
-           CHANNEL_UP_DOWN          0x000000000000EB14
--          CHANNEL_UP_UP            0x0000000000006B94
-+          KEY_CHANNELUP            0x0000000000006B94
-           MENU_DOWN                0x000000000000EC13
--          MENU_UP                  0x0000000000006C93
-+          KEY_MENU                  0x0000000000006C93
-           VOLUME_UP_DOWN           0x000000000000ED12
--          VOLUME_UP_UP             0x0000000000006D92
-+          KEY_VOLUMEUP             0x0000000000006D92
-           BLUE_BUTTON_DOWN         0x000000000000EE11
--          BLUE_BUTTON_UP           0x0000000000006E91
-+          KEY_BLUE           0x0000000000006E91
-           MUTE_DOWN                0x000000000000EF10
--          MUTE_UP                  0x0000000000006F90
-+          KEY_MUTE                  0x0000000000006F90
-           VOLUME_DOWN_DOWN         0x000000000000F00F
--          VOLUME_DOWN_UP           0x000000000000708F
-+          KEY_VOLUMEDOWN           0x000000000000708F
-           RED_BUTTON_DOWN          0x000000000000F10E
--          RED_BUTTON_UP            0x000000000000718E
-+          KEY_RED            0x000000000000718E
-           GREEN_BUTTON_DOWN        0x000000000000F20D
--          GREEN_BUTTON_UP          0x000000000000728D
-+          KEY_GREEN          0x000000000000728D
-           CHANNEL_DOWN_DOWN        0x000000000000F30C
--          CHANNEL_DOWN_UP          0x000000000000738C
-+          KEY_CHANNELDOWN          0x000000000000738C
-           1_DOWN                   0x000000000000F40B
--          1_UP                     0x000000000000748B
-+          KEY_1                     0x000000000000748B
-           2_DOWN                   0x000000000000F50A
--          2_UP                     0x000000000000758A
-+          KEY_2                     0x000000000000758A
-           3_DOWN                   0x000000000000F609
--          3_UP                     0x0000000000007689
-+          KEY_3                     0x0000000000007689
-           4_DOWN                   0x000000000000F708
--          4_UP                     0x0000000000007788
-+          KEY_4                     0x0000000000007788
-           5_DOWN                   0x000000000000F807
--          5_UP                     0x0000000000007887
-+          KEY_5                     0x0000000000007887
-           6_DOWN                   0x000000000000F906
--          6_UP                     0x0000000000007986
-+          KEY_6                     0x0000000000007986
-           7_DOWN                   0x000000000000FA05
--          7_UP                     0x0000000000007A85
-+          KEY_7                     0x0000000000007A85
-           8_DOWN                   0x000000000000FB04
--          8_UP                     0x0000000000007B84
-+          KEY_8                     0x0000000000007B84
-           9_DOWN                   0x000000000000FC03
--          9_UP                     0x0000000000007C83
-+          KEY_9                     0x0000000000007C83
-           SLASH_DOWN               0x000000000000FD02
--          SLASH_UP                 0x0000000000007D82
-+          KEY_SLASH                 0x0000000000007D82
-           0_DOWN                   0x000000000000FE01
--          0_UP                     0x0000000000007E81
-+          KEY_0                     0x0000000000007E81
-           MINUS_DOWN               0x000000000000FF00
--          MINUS_UP                 0x0000000000007F80
-+          KEY_KPMINUS                 0x0000000000007F80
-       end codes
- 
- end remote
-Index: lirc-0.8.7pre2/remotes/apple/lircd.conf.macmini
-===================================================================
---- lirc-0.8.7pre2.orig/remotes/apple/lircd.conf.macmini
-+++ lirc-0.8.7pre2/remotes/apple/lircd.conf.macmini
-@@ -26,12 +26,12 @@ begin remote
-   ignore_mask 0x0000ff01
- 
-       begin codes
--          VOLUP                    0x0B
--          VOLDOWN                  0x0D
--          BACKWARD                 0x08
--          FORWARD                  0x07
--          PLAY                     0x04
--          MENU                     0x02
-+          KEY_VOLUMEUP		0x0B
-+          KEY_VOLUMEDOWN	0x0D
-+          KEY_REWIND		0x08
-+          KEY_FORWARD		0x07
-+          KEY_PLAYPAUSE		0x04
-+          KEY_MENU		0x02
-       end codes
- 
- end remote
-Index: lirc-0.8.7pre2/remotes/asus/lircd.conf.asus
-===================================================================
---- lirc-0.8.7pre2.orig/remotes/asus/lircd.conf.asus
-+++ lirc-0.8.7pre2/remotes/asus/lircd.conf.asus
-@@ -19,38 +19,38 @@ begin remote
-   toggle_bit	0
- 
- 	begin codes
--	  0			0x0000000000000000
--	  1			0x0000000000000008
--	  2			0x0000000000000010
--	  3			0x0000000000000018
--	  4			0x0000000000000020
--	  5			0x0000000000000028
--	  6			0x0000000000000030
--	  7			0x0000000000000038
--	  8			0x0000000000000040
--	  9			0x0000000000000048
--	  PREV			0x0000000000000050
--	  ENTER			0x0000000000000058
--	  CH+			0x0000000000000060
--	  CH-			0x0000000000000068
--	  VOL+			0x0000000000000070
--	  VOL-			0x0000000000000078
--	  MAXIMIZE		0x0000000000000080
--	  MUTE			0x0000000000000088
--	  POWER			0x0000000000000090
--	  MENU			0x0000000000000098
--	  UP			0x00000000000000A0
--	  DOWN			0x00000000000000A8
--	  LEFT			0x00000000000000B0
--	  RIGHT			0x00000000000000B8
-+	  KEY_0			0x0000000000000000
-+	  KEY_1			0x0000000000000008
-+	  KEY_2			0x0000000000000010
-+	  KEY_3			0x0000000000000018
-+	  KEY_4			0x0000000000000020
-+	  KEY_5			0x0000000000000028
-+	  KEY_6			0x0000000000000030
-+	  KEY_7			0x0000000000000038
-+	  KEY_8			0x0000000000000040
-+	  KEY_9			0x0000000000000048
-+	  KEY_PREVIOUS			0x0000000000000050
-+	  KEY_ENTER			0x0000000000000058
-+	  KEY_CHANNELUP			0x0000000000000060
-+	  KEY_CHANNELDOWN			0x0000000000000068
-+	  KEY_VOLUMEUP			0x0000000000000070
-+	  KEY_VOLUMEDOWN			0x0000000000000078
-+	  KEY_MAX		0x0000000000000080
-+	  KEY_MUTE			0x0000000000000088
-+	  KEY_POWER			0x0000000000000090
-+	  KEY_MENU			0x0000000000000098
-+	  KEY_UP			0x00000000000000A0
-+	  KEY_DOWN			0x00000000000000A8
-+	  KEY_LEFT			0x00000000000000B0
-+	  KEY_RIGHT			0x00000000000000B8
- 	  CAPTION		0x00000000000000C0
- 	  MTS/SAP		0x00000000000000C8
- 	  DISPLAY		0x00000000000000D0
- 	  SCAN			0x00000000000000D8
--	  RED			0x00000000000000E0
--	  GREEN			0x00000000000000E8
--	  YELLOW		0x00000000000000F0
--	  BLUE			0x00000000000000F8
-+	  KEY_RED			0x00000000000000E0
-+	  KEY_GREEN			0x00000000000000E8
-+	  KEY_YELLOW		0x00000000000000F0
-+	  KEY_BLUE			0x00000000000000F8
-         end codes
- 
- end remote
-Index: lirc-0.8.7pre2/remotes/asus/lircd.conf.asusdh
-===================================================================
---- lirc-0.8.7pre2.orig/remotes/asus/lircd.conf.asusdh
-+++ lirc-0.8.7pre2/remotes/asus/lircd.conf.asusdh
-@@ -14,17 +14,17 @@ begin remote
-   post_data_bits  0
- 
- 	begin codes
--	  POWER			0x01
-+	  KEY_POWER		0x01
- 	  QUICK_POWER		0x02
- 	  NOISE_OFF		0x03
- 	  WIFI			0x04
- 	  AP_LAUNCH		0x05
--	  MAXIMIZE		0x06
--	  PLUS			0x07
-+	  KEY_MAX		0x06
-+	  KEY_KPPLUS		0x07
- 	  REV			0x08
--	  PLAY/PAUSE		0x09
--	  FWD			0x0A
--	  MINUS			0x0B
-+	  KEY_PLAYPAUSE		0x09
-+	  KEY_FORWARD		0x0A
-+	  KEY_KPMINUS		0x0B
-         end codes
- 
- end remote
-Index: lirc-0.8.7pre2/remotes/asus/lircd.conf.digimatrix
-===================================================================
---- lirc-0.8.7pre2.orig/remotes/asus/lircd.conf.digimatrix
-+++ lirc-0.8.7pre2/remotes/asus/lircd.conf.digimatrix
-@@ -28,43 +28,43 @@ begin remote
- 
- 
-       begin codes
--          up                       0x000000000000E817
--          down                     0x00000000000018E7
--          enter                    0x000000000000D02F
--          left                     0x0000000000009867
--          right                    0x00000000000058A7
--          1                        0x00000000000000FF
--          2                        0x000000000000807F
--          3                        0x00000000000040BF
--          4                        0x000000000000C03F
--          5                        0x00000000000020DF
--          6                        0x000000000000A05F
--          7                        0x000000000000609F
--          8                        0x000000000000E01F
--          9                        0x00000000000010EF
--          0                        0x000000000000906F
--          on_off                   0x000000000000B04F
-+          KEY_UP                       0x000000000000E817
-+          KEY_DOWN                     0x00000000000018E7
-+          KEY_ENTER                    0x000000000000D02F
-+          KEY_LEFT                     0x0000000000009867
-+          KEY_RIGHT                    0x00000000000058A7
-+          KEY_1                        0x00000000000000FF
-+          KEY_2                        0x000000000000807F
-+          KEY_3                        0x00000000000040BF
-+          KEY_4                        0x000000000000C03F
-+          KEY_5                        0x00000000000020DF
-+          KEY_6                        0x000000000000A05F
-+          KEY_7                        0x000000000000609F
-+          KEY_8                        0x000000000000E01F
-+          KEY_9                        0x00000000000010EF
-+          KEY_0                        0x000000000000906F
-+          KEY_POWER                   0x000000000000B04F
-           dvd_vcd                  0x000000000000F00F
--          tv                       0x00000000000008F7
-+          KEY_TV                       0x00000000000008F7
-           os_start                 0x00000000000030CF
-           photo                    0x00000000000048B7
--          home                     0x00000000000044BB
--          back                     0x000000000000A857
--          ch+                      0x000000000000B847
--          stop                     0x000000000000946B
--          play                     0x000000000000C43B
--          vol+                     0x000000000000F807
--          ch-                      0x0000000000007887
-+          KEY_HOME                     0x00000000000044BB
-+          KEY_BACK                     0x000000000000A857
-+          KEY_CHANNELUP                      0x000000000000B847
-+          KEY_STOP                     0x000000000000946B
-+          KEY_PLAY                     0x000000000000C43B
-+          KEY_VOLUMEUP                     0x000000000000F807
-+          KEY_CHANNELDOWN                      0x0000000000007887
-           step-                    0x000000000000E41B
-           step+                    0x000000000000649B
--          vol-                     0x00000000000004FB
--          pause                    0x00000000000024DB
--          pre                      0x00000000000014EB
--          next                     0x000000000000A45B
--          mute                     0x000000000000847B
--          rec                      0x000000000000D42B
--          subtitle                 0x000000000000C837
--          menu                     0x00000000000038C7
-+          KEY_VOLUMEDOWN                     0x00000000000004FB
-+          KEY_PAUSE                    0x00000000000024DB
-+          KEY_PREVIOUS                      0x00000000000014EB
-+          KEY_NEXT                     0x000000000000A45B
-+          KEY_MUTE                     0x000000000000847B
-+          KEY_RECORD                      0x000000000000D42B
-+          KEY_SUBTITLE                 0x000000000000C837
-+          KEY_MENU                     0x00000000000038C7
-           dvd_audio                0x00000000000050AF
-           ui_size                  0x0000000000008877
-           ui_on_off                0x00000000000028D7
-Index: lirc-0.8.7pre2/remotes/atiusb/lircd.conf.atilibusb
-===================================================================
---- lirc-0.8.7pre2.orig/remotes/atiusb/lircd.conf.atilibusb
-+++ lirc-0.8.7pre2/remotes/atiusb/lircd.conf.atilibusb
-@@ -30,58 +30,58 @@ begin remote
- 
- 
-       begin codes
--          stop                     0x000231
--          pause                    0x000230
--          fforward                 0x000228
--          rec                      0x000237
--          rewind                   0x000229
--          play                     0x00022C
--          d                        0x00027B
--          c                        0x00027A
--          e                        0x00027C
--          f                        0x00027D
--          right                    0x00025B
--          left                     0x00025A
--          up                       0x000258
--          down                     0x000259
--          ok                       0x00025C
--          info                     0x0002F9
--          timer                    0x000296
--          menu                     0x000254
--          check                    0x000282
--          0                        0x000200
--          1                        0x000201
--          2                        0x000202
--          3                        0x000203
--          4                        0x000204
--          5                        0x000205
--          6                        0x000206
--          7                        0x000207
--          8                        0x000208
--          9                        0x000209
--          volup                    0x000210
--          voldown                  0x000211
--          mute                     0x00020D
--          chup                     0x000220
--          chdown                   0x000221
--          mouse_up                 0x0001FF
--          mouse_down               0x0002FF
--          mouse_left               0x0020FF
--          mouse_right              0x0010FF
--          mouse_up_right           0x0011FF
--          mouse_down_right         0x0012FF
--          mouse_up_left            0x0021FF
--          mouse_down_left          0x0022FF
--          right_click              0x0002AA
--          left_click               0x0002A9
--          hand                     0x0002D0
--          shrink_resize            0x0002D5
--          ?                        0x0002BE
--          dvd                      0x000238
--          tv                       0x000239
--          a                        0x000278
--          b                        0x000279
--          power                    0x00020C
-+          KEY_STOP                     0x000231
-+          KEY_PAUSE                    0x000230
-+          KEY_FASTFORWARD              0x000228
-+          KEY_RECORD                   0x000237
-+          KEY_REWIND                   0x000229
-+          KEY_PLAY                     0x00022C
-+          KEY_D                        0x00027B
-+          KEY_C                        0x00027A
-+          KEY_E                        0x00027C
-+          KEY_F                        0x00027D
-+          KEY_RIGHT                    0x00025B
-+          KEY_LEFT                     0x00025A
-+          KEY_UP                       0x000258
-+          KEY_DOWN                     0x000259
-+          KEY_OK                       0x00025C
-+          KEY_INFO                     0x0002F9
-+          timer                        0x000296
-+          KEY_MENU                     0x000254
-+          check                        0x000282
-+          KEY_0                        0x000200
-+          KEY_1                        0x000201
-+          KEY_2                        0x000202
-+          KEY_3                        0x000203
-+          KEY_4                        0x000204
-+          KEY_5                        0x000205
-+          KEY_6                        0x000206
-+          KEY_7                        0x000207
-+          KEY_8                        0x000208
-+          KEY_9                        0x000209
-+          KEY_VOLUMEUP                 0x000210
-+          KEY_VOLUMEDOWN               0x000211
-+          KEY_MUTE                     0x00020D
-+          KEY_CHANNELUP                0x000220
-+          KEY_CHANNELDOWN              0x000221
-+          mouse_up                     0x0001FF
-+          mouse_down                   0x0002FF
-+          BTN_LEFT                     0x0020FF
-+          BTN_RIGHT                    0x0010FF
-+          BTN_RIGHT                    0x0011FF
-+          mouse_down_right             0x0012FF
-+          BTN_LEFT                     0x0021FF
-+          mouse_down_left              0x0022FF
-+          right_click                  0x0002AA
-+          left_click                   0x0002A9
-+          hand                         0x0002D0
-+          shrink_resize                0x0002D5
-+          ?                            0x0002BE
-+          KEY_DVD                      0x000238
-+          KEY_TV                       0x000239
-+          KEY_A                        0x000278
-+          KEY_B                        0x000279
-+          KEY_POWER                    0x00020C
-       end codes
- 
- end remote
-Index: lirc-0.8.7pre2/remotes/atiusb/lircd.conf.atiusb
-===================================================================
---- lirc-0.8.7pre2.orig/remotes/atiusb/lircd.conf.atiusb
-+++ lirc-0.8.7pre2/remotes/atiusb/lircd.conf.atiusb
-@@ -37,54 +37,54 @@ begin remote
- 
- 
-       begin codes
--          A                        0x000000000000F500
--          B                        0x000000000000F601
--          C                        0x0000000000000E19
--          D                        0x000000000000101B
--          E                        0x0000000000001621
--          F                        0x0000000000001823
--          TV                       0x000000000000F803
--          DVD                      0x000000000000F904
--          WEB                      0x000000000000FA05
-+          KEY_A                        0x000000000000F500
-+          KEY_B                        0x000000000000F601
-+          KEY_C                        0x0000000000000E19
-+          KEY_D                        0x000000000000101B
-+          KEY_E                        0x0000000000001621
-+          KEY_F                        0x0000000000001823
-+          KEY_TV                       0x000000000000F803
-+          KEY_DVD                      0x000000000000F904
-+          KEY_WWW                      0x000000000000FA05
-           BOOK                     0x000000000000FB06
-           HAND                     0x000000000000FC07
--          POWER                    0x000000000000F702
--          MOUSE_LEFT_BTN           0x0000000000006D78
--          MOUSE_RIGHT_BTN          0x000000000000717C
-+          KEY_POWER                    0x000000000000F702
-+          BTN_LEFT           0x0000000000006D78
-+          BTN_RIGHT          0x000000000000717C
-           MOUSE_UP                 0x0000000000006772
-           MOUSE_DOWN               0x0000000000006B76
--          MOUSE_LEFT               0x0000000000006C77
--          MOUSE_RIGHT              0x0000000000006B76
--          VOL_UP                   0x000000000000FD08
--          VOL_DOWN                 0x000000000000FE09
--          MUTE                     0x000000000000FF0A
--          CH_UP                    0x000000000000000B
--          CH_DOWN                  0x000000000000010C
--          1                        0x000000000000020D
--          2                        0x000000000000030E
--          3                        0x000000000000040F
--          4                        0x0000000000000510
--          5                        0x0000000000000611
--          6                        0x0000000000000712
--          7                        0x0000000000000813
--          8                        0x0000000000000914
--          9                        0x0000000000000A15
--          0                        0x0000000000000C17
--          LIST                     0x0000000000000B16
-+          BTN_LEFT               0x0000000000006C77
-+          BTN_RIGHT              0x0000000000006B76
-+          KEY_VOLUMEUP                   0x000000000000FD08
-+          KEY_VOLUMEDOWN                 0x000000000000FE09
-+          KEY_MUTE                     0x000000000000FF0A
-+          KEY_CHANNELUP                    0x000000000000000B
-+          KEY_CHANNELDOWN                  0x000000000000010C
-+          KEY_1                        0x000000000000020D
-+          KEY_2                        0x000000000000030E
-+          KEY_3                        0x000000000000040F
-+          KEY_4                        0x0000000000000510
-+          KEY_5                        0x0000000000000611
-+          KEY_6                        0x0000000000000712
-+          KEY_7                        0x0000000000000813
-+          KEY_8                        0x0000000000000914
-+          KEY_9                        0x0000000000000A15
-+          KEY_0                        0x0000000000000C17
-+          KEY_LIST                     0x0000000000000B16
-           CHECK                    0x0000000000000D18
--          UP                       0x0000000000000F1A
--          DOWN                     0x0000000000001722
--          LEFT                     0x000000000000121D
--          RIGHT                    0x000000000000141F
--          OK                       0x000000000000131E
-+          KEY_UP                       0x0000000000000F1A
-+          KEY_DOWN                     0x0000000000001722
-+          KEY_LEFT                     0x000000000000121D
-+          KEY_RIGHT                    0x000000000000141F
-+          KEY_OK                       0x000000000000131E
-           TIMER                    0x000000000000111C
--          MAX                      0x0000000000001520
--          REWIND                   0x0000000000001924
--          PLAY                     0x0000000000001A25
--          FFWD                     0x0000000000001B26
--          REC                      0x0000000000001C27
--          STOP                     0x0000000000001D28
--          PAUSE                    0x0000000000001E29
-+          KEY_MAX                      0x0000000000001520
-+          KEY_REWIND                   0x0000000000001924
-+          KEY_PLAY                     0x0000000000001A25
-+          KEY_FASTFORWARD                     0x0000000000001B26
-+          KEY_RECORD                      0x0000000000001C27
-+          KEY_STOP                     0x0000000000001D28
-+          KEY_PAUSE                    0x0000000000001E29
-       end codes
- 
- end remote
-Index: lirc-0.8.7pre2/remotes/avermedia/lircd.conf.avermedia
-===================================================================
---- lirc-0.8.7pre2.orig/remotes/avermedia/lircd.conf.avermedia
-+++ lirc-0.8.7pre2/remotes/avermedia/lircd.conf.avermedia
-@@ -34,37 +34,37 @@ begin remote
- 
- 
-       begin codes
--          TV                       0x0000000000006897
--          FM                       0x000000000000A857
--          EXIT                     0x00000000000048B7
-+          KEY_TV                       0x0000000000006897
-+          KEY_RADIO                       0x000000000000A857
-+          KEY_EXIT                     0x00000000000048B7
-           DISPLAY                  0x00000000000030CF
-           FREEZE                   0x00000000000028D7
-           CAPTURE                  0x0000000000008877
--          VIDEO                    0x00000000000038C7
--          1                        0x000000000000807F
--          2                        0x00000000000040BF
--          3                        0x000000000000C03F
--          AUDIO                    0x00000000000018E7
--          4                        0x00000000000020DF
--          5                        0x000000000000A05F
--          6                        0x000000000000609F
-+          KEY_VIDEO                    0x00000000000038C7
-+          KEY_1                        0x000000000000807F
-+          KEY_2                        0x00000000000040BF
-+          KEY_3                        0x000000000000C03F
-+          KEY_AUDIO                    0x00000000000018E7
-+          KEY_4                        0x00000000000020DF
-+          KEY_5                        0x000000000000A05F
-+          KEY_6                        0x000000000000609F
-           FULLSCREEN               0x000000000000F00F
--          7                        0x000000000000E01F
--          8                        0x00000000000010EF
--          9                        0x000000000000906F
-+          KEY_7                        0x000000000000E01F
-+          KEY_8                        0x00000000000010EF
-+          KEY_9                        0x000000000000906F
-           LOOP                     0x000000000000C837
--          0                        0x00000000000050AF
--          LEFTARROW                0x00000000000000FF
--          RIGHTARROW               0x000000000000E817
--          MUTE                     0x00000000000008F7
-+          KEY_0                        0x00000000000050AF
-+          KEY_LEFT                0x00000000000000FF
-+          KEY_RIGHT               0x000000000000E817
-+          KEY_MUTE                     0x00000000000008F7
-           COLOR                    0x000000000000B04F
--          PREVIEW                  0x000000000000708F
--          CHANNELUP                0x000000000000D827
--          VOL_UP                   0x00000000000058A7
-+          KEY_PREVIOUS                  0x000000000000708F
-+          KEY_CHANNELUP                0x000000000000D827
-+          KEY_VOLUMEUP                   0x00000000000058A7
-           AUTOSCAN                 0x000000000000B847
--          ENTER                    0x0000000000009867
--          CHANNELDOWN              0x000000000000F807
--          VOL_DOWN                 0x0000000000007887
-+          KEY_ENTER                    0x0000000000009867
-+          KEY_CHANNELDOWN              0x000000000000F807
-+          KEY_VOLUMEDOWN                 0x0000000000007887
-       end codes
- 
- end remote
-Index: lirc-0.8.7pre2/remotes/avermedia/lircd.conf.avermedia98
-===================================================================
---- lirc-0.8.7pre2.orig/remotes/avermedia/lircd.conf.avermedia98
-+++ lirc-0.8.7pre2/remotes/avermedia/lircd.conf.avermedia98
-@@ -29,49 +29,49 @@ begin remote
- 
-       begin codes
-           TV/FM                    0x0000000000000023
--          CD                       0x0000000000000022
-+          KEY_CD                       0x0000000000000022
- #          TELETEXT                 0x000000000000C03F
--          POWER                    0x0000000000000027
-+          KEY_POWER                    0x0000000000000027
- 
--          1                        0x0000000000000018
--          2                        0x0000000000000010
--          3                        0x0000000000000008
--          VIDEO                    0x0000000000000000
--
--          4                        0x0000000000000019
--          5                        0x0000000000000011
--          6                        0x0000000000000009
--          AUDIO                    0x0000000000000001
--
--          7                        0x000000000000001A
--          8                        0x0000000000000012
--          9                        0x000000000000000A
-+          KEY_1                        0x0000000000000018
-+          KEY_2                        0x0000000000000010
-+          KEY_3                        0x0000000000000008
-+          KEY_VIDEO                    0x0000000000000000
-+
-+          KEY_4                        0x0000000000000019
-+          KEY_5                        0x0000000000000011
-+          KEY_6                        0x0000000000000009
-+          KEY_AUDIO                    0x0000000000000001
-+
-+          KEY_7                        0x000000000000001A
-+          KEY_8                        0x0000000000000012
-+          KEY_9                        0x000000000000000A
-           FULLSCREEN               0x0000000000000002
- 
--          0                        0x000000000000001B
-+          KEY_0                        0x000000000000001B
-           DISPLAY                  0x0000000000000013
-           COLOR                    0x000000000000000B
-           LOOP                     0x0000000000000003
- 
-           UNLABELED                0x000000000000001C
--          LEFT                     0x0000000000000014
--          RIGHT                    0x000000000000000C
--          PREVIEW                  0x0000000000000004
-+          KEY_LEFT                     0x0000000000000014
-+          KEY_RIGHT                    0x000000000000000C
-+          KEY_PREVIOUS                  0x0000000000000004
- 
-           AUTOSCAN                 0x000000000000001D
-           FREEZE                   0x0000000000000015
-           CAPTURE                  0x000000000000000D
--          MUTE                     0x0000000000000005
-+          KEY_MUTE                     0x0000000000000005
- 
--          RED                      0x000000000000001E
--          VOL_DOWN                 0x0000000000000016
--          VOL_UP                   0x000000000000000E
--          YELLOW                   0x0000000000000006
--
--          GREEN                    0x000000000000001F
--          CH_DOWN                  0x0000000000000017
--          CH_UP                    0x000000000000000F
--          BLUE                     0x0000000000000007
-+          KEY_RED                      0x000000000000001E
-+          KEY_VOLUMEDOWN                 0x0000000000000016
-+          KEY_VOLUMEUP                   0x000000000000000E
-+          KEY_YELLOW                   0x0000000000000006
-+
-+          KEY_GREEN                    0x000000000000001F
-+          KEY_CHANNELDOWN                  0x0000000000000017
-+          KEY_CHANNELUP                    0x000000000000000F
-+          KEY_BLUE                     0x0000000000000007
-       end codes
- 
- end remote
-Index: lirc-0.8.7pre2/remotes/avermedia/lircd.conf.vdomate
-===================================================================
---- lirc-0.8.7pre2.orig/remotes/avermedia/lircd.conf.vdomate
-+++ lirc-0.8.7pre2/remotes/avermedia/lircd.conf.vdomate
-@@ -27,33 +27,33 @@ begin remote
- 
- 
-       begin codes
--          power                    0x0000000040BF00FF
--          one                      0x0000000040BFA05F
--          two                      0x0000000040BF609F
--          three                    0x0000000040BFE01F
--          four                     0x0000000040BF906F
--          five                     0x0000000040BF50AF
--          six                      0x0000000040BFD02F
--          seven                    0x0000000040BFB04F
--          eight                    0x0000000040BF708F
--          nine                     0x0000000040BFF00F
--          zero                     0x0000000040BF8877
--          video                    0x0000000040BF20DF
-+          KEY_POWER                    0x0000000040BF00FF
-+          KEY_1                      0x0000000040BFA05F
-+          KEY_2                      0x0000000040BF609F
-+          KEY_3                    0x0000000040BFE01F
-+          KEY_4                     0x0000000040BF906F
-+          KEY_5                     0x0000000040BF50AF
-+          KEY_6                      0x0000000040BFD02F
-+          KEY_7                    0x0000000040BFB04F
-+          KEY_8                    0x0000000040BF708F
-+          KEY_9                     0x0000000040BFF00F
-+          KEY_0                     0x0000000040BF8877
-+          KEY_VIDEO                    0x0000000040BF20DF
-           fullscreen               0x0000000040BF30CF
-           display                  0x0000000040BF48B7
-           color                    0x0000000040BFC837
-           loop                     0x0000000040BF08F7
-           coloup                   0x0000000040BF6897
-           colordn                  0x0000000040BFE817
--          preview                  0x0000000040BF28D7
-+          KEY_PREVIOUS                  0x0000000040BF28D7
-           autoscan                 0x0000000040BF9867
-           freeze                   0x0000000040BF58A7
-           capture                  0x0000000040BFD827
--          mute                     0x0000000040BF18E7
--          volumeup                 0x0000000040BF7887
--          volumedown               0x0000000040BFF807
--          chnldown                 0x00000000C03F40BF
--          chnlup                   0x00000000C03FC03F
-+          KEY_MUTE                     0x0000000040BF18E7
-+          KEY_VOLUMEUP                 0x0000000040BF7887
-+          KEY_VOLUMEDOWN               0x0000000040BFF807
-+          KEY_CHANNELDOWN                 0x00000000C03F40BF
-+          KEY_CHANNELUP                   0x00000000C03FC03F
-       end codes
- 
- end remote
-Index: lirc-0.8.7pre2/remotes/bestbuy/lircd.conf.bestbuy
-===================================================================
---- lirc-0.8.7pre2.orig/remotes/bestbuy/lircd.conf.bestbuy
-+++ lirc-0.8.7pre2/remotes/bestbuy/lircd.conf.bestbuy
-@@ -26,36 +26,36 @@ begin remote
- 
- 
-       begin codes
--          0                        0x0000000000000000
--          1                        0x0000000000000001
--          2                        0x0000000000000002
--          3                        0x0000000000000003
--          4                        0x0000000000000004
--          5                        0x0000000000000005
--          6                        0x0000000000000006
--          7                        0x0000000000000007
--          8                        0x0000000000000008
--          9                        0x0000000000000009
--          TV                       0x000000000000001C
--          POWER                    0x0000000000000012
--          VIDEO                    0x0000000000000011
--          PREVIEW                  0x000000000000000F
--          MUTE                     0x0000000000000013
-+          KEY_0                        0x0000000000000000
-+          KEY_1                        0x0000000000000001
-+          KEY_2                        0x0000000000000002
-+          KEY_3                        0x0000000000000003
-+          KEY_4                        0x0000000000000004
-+          KEY_5                        0x0000000000000005
-+          KEY_6                        0x0000000000000006
-+          KEY_7                        0x0000000000000007
-+          KEY_8                        0x0000000000000008
-+          KEY_9                        0x0000000000000009
-+          KEY_TV                       0x000000000000001C
-+          KEY_POWER                    0x0000000000000012
-+          KEY_VIDEO                    0x0000000000000011
-+          KEY_PREVIOUS                  0x000000000000000F
-+          KEY_MUTE                     0x0000000000000013
-           SCAN                     0x0000000000000010
--          CHANNEL_UP               0x000000000000001A
--          CHANNEL_DOWN             0x000000000000001E
--          VOL_UP                   0x000000000000001B
--          VOL_DOWN                 0x000000000000001F
-+          KEY_CHANNELUP               0x000000000000001A
-+          KEY_CHANNELDOWN             0x000000000000001E
-+          KEY_VOLUMEUP                   0x000000000000001B
-+          KEY_VOLUMEDOWN                 0x000000000000001F
-           LOOP                     0x000000000000000A
-           100                      0x0000000000000017
--          ZOOM                     0x000000000000000D
--          RECORD                   0x000000000000000E
--          STOP                     0x000000000000001D
--          PLAY                     0x0000000000000019
-+          KEY_ZOOM                     0x000000000000000D
-+          KEY_RECORD                   0x000000000000000E
-+          KEY_STOP                     0x000000000000001D
-+          KEY_PLAY                     0x0000000000000019
-           FREEZE                   0x0000000000000016
-           COLOR                    0x0000000000000014
--          LEFT                     0x0000000000000018
--          RIGHT                    0x000000000000000C
-+          KEY_LEFT                     0x0000000000000018
-+          KEY_RIGHT                    0x000000000000000C
-       end codes
- 
- end remote
-Index: lirc-0.8.7pre2/remotes/bestbuy/lircd.conf.bestbuy2
-===================================================================
---- lirc-0.8.7pre2.orig/remotes/bestbuy/lircd.conf.bestbuy2
-+++ lirc-0.8.7pre2/remotes/bestbuy/lircd.conf.bestbuy2
-@@ -27,29 +27,29 @@ begin remote
-       begin codes
-           TV/FM                    0x0000000000000043
-           SCAN                     0x0000000000000047
--          ZOOM                     0x000000000000005C
--          POWER                    0x000000000000005E
--          1                        0x0000000000000041
--          2                        0x000000000000004B
--          3                        0x000000000000005B
--          VOL+                     0x000000000000005F
--          4                        0x0000000000000045
--          5                        0x0000000000000049
--          6                        0x0000000000000055
--          VOL-                     0x0000000000000057
--          7                        0x0000000000000046
--          8                        0x000000000000004A
--          9                        0x0000000000000052
--          CH+                      0x0000000000000056
--          0                        0x0000000000000042
-+          KEY_ZOOM                     0x000000000000005C
-+          KEY_POWER                    0x000000000000005E
-+          KEY_1                        0x0000000000000041
-+          KEY_2                        0x000000000000004B
-+          KEY_3                        0x000000000000005B
-+          KEY_VOLUMEUP                     0x000000000000005F
-+          KEY_4                        0x0000000000000045
-+          KEY_5                        0x0000000000000049
-+          KEY_6                        0x0000000000000055
-+          KEY_VOLUMEDOWN                     0x0000000000000057
-+          KEY_7                        0x0000000000000046
-+          KEY_8                        0x000000000000004A
-+          KEY_9                        0x0000000000000052
-+          KEY_CHANNELUP                      0x0000000000000056
-+          KEY_0                        0x0000000000000042
-           LOOP                     0x0000000000000053
-           +100                     0x0000000000000050
--          CH-                      0x0000000000000054
-+          KEY_CHANNELDOWN                      0x0000000000000054
-           SOURCE                   0x0000000000000040
--          MUTE                     0x0000000000000058
--          -                        0x0000000000000044
-+          KEY_MUTE                     0x0000000000000058
-+          KEY_KPMINUS                        0x0000000000000044
-           FUNCTION                 0x000000000000004E
--          +                        0x000000000000004C
-+          KEY_KPPLUS                        0x000000000000004C
-           RESET                    0x000000000000004D
-           FREEZE                   0x000000000000004F
-       end codes
-Index: lirc-0.8.7pre2/remotes/caraca/lircd.conf.caraca
-===================================================================
---- lirc-0.8.7pre2.orig/remotes/caraca/lircd.conf.caraca
-+++ lirc-0.8.7pre2/remotes/caraca/lircd.conf.caraca
-@@ -17,29 +17,29 @@ begin remote
-   bits           16
- 
-       begin codes
--          POWER                    0x3ff3
--          1                        0x3ffe
--          2                        0x3ffd
--          3                        0x3ffc
--          4                        0x3ffb
--          5                        0x3ffa
--          6                        0x3ff9
--          7                        0x3ff8
--          8                        0x3ff7
--          9                        0x3ff6
--          0                        0x3ff5
--          PAUSE                    0x3fcf
--          EJECT                    0x3fe2
-+          KEY_POWER                    0x3ff3
-+          KEY_1                        0x3ffe
-+          KEY_2                        0x3ffd
-+          KEY_3                        0x3ffc
-+          KEY_4                        0x3ffb
-+          KEY_5                        0x3ffa
-+          KEY_6                        0x3ff9
-+          KEY_7                        0x3ff8
-+          KEY_8                        0x3ff7
-+          KEY_9                        0x3ff6
-+          KEY_0                        0x3ff5
-+          KEY_PAUSE                    0x3fcf
-+          KEY_EJECTCD                    0x3fe2
-           SEEK-                    0x3fcd
--          PLAY                     0x3fca
-+          KEY_PLAY                     0x3fca
-           SEEK+                    0x3fcb
--          RECORD                   0x3fd2
--          STOP                     0x3fc9
--          CH-                      0x3fde
--          CH+                      0x3fdf
--          VOL-                     0x3fee
--          VOL+                     0x3fef
--          MUTE                     0x3ff2
-+          KEY_RECORD                   0x3fd2
-+          KEY_STOP                     0x3fc9
-+          KEY_CHANNELDOWN                      0x3fde
-+          KEY_CHANNELUP                      0x3fdf
-+          KEY_VOLUMEDOWN                     0x3fee
-+          KEY_VOLUMEUP                     0x3fef
-+          KEY_MUTE                     0x3ff2
-           TV/FM                    0x3fe3
-       end codes
- 
-Index: lirc-0.8.7pre2/remotes/chronos/lircd.conf.chronos
-===================================================================
---- lirc-0.8.7pre2.orig/remotes/chronos/lircd.conf.chronos
-+++ lirc-0.8.7pre2/remotes/chronos/lircd.conf.chronos
-@@ -20,37 +20,37 @@ begin remote
-   toggle_bit      0
- 
-       begin codes
--          POWER                    0x0000000000000000
--          MOUSE_MODE               0x0000000000000010
-+          KEY_POWER                    0x0000000000000000
-+          BTN_MODE               0x0000000000000010
-           FULL_SCREEN              0x0000000000000008
--          CH+                      0x0000000000000009
--          CH-                      0x0000000000000019
--          1                        0x0000000000000018
--          2                        0x0000000000000004
--          3                        0x0000000000000014
--          4                        0x000000000000001C
--          5                        0x0000000000000002
--          6                        0x0000000000000012
--          7                        0x000000000000001A
--          8                        0x0000000000000006
--          9                        0x0000000000000016
--          0                        0x000000000000001E
--          VOL+                     0x0000000000000005
--          VOL-                     0x000000000000001D
-+          KEY_CHANNELUP                      0x0000000000000009
-+          KEY_CHANNELDOWN                      0x0000000000000019
-+          KEY_1                        0x0000000000000018
-+          KEY_2                        0x0000000000000004
-+          KEY_3                        0x0000000000000014
-+          KEY_4                        0x000000000000001C
-+          KEY_5                        0x0000000000000002
-+          KEY_6                        0x0000000000000012
-+          KEY_7                        0x000000000000001A
-+          KEY_8                        0x0000000000000006
-+          KEY_9                        0x0000000000000016
-+          KEY_0                        0x000000000000001E
-+          KEY_VOLUMEUP                     0x0000000000000005
-+          KEY_VOLUMEDOWN                     0x000000000000001D
-           SOURCE                   0x0000000000000003
--          MUTE                     0x000000000000001B
--          AUDIO                    0x0000000000000015
--          VIDEO                    0x0000000000000011
--          CANCEL                   0x000000000000001F
--          ENTER                    0x0000000000000001
--          ESC                      0x000000000000000B
-+          KEY_MUTE                     0x000000000000001B
-+          KEY_AUDIO                    0x0000000000000015
-+          KEY_VIDEO                    0x0000000000000011
-+          KEY_CANCEL                   0x000000000000001F
-+          KEY_ENTER                    0x0000000000000001
-+          KEY_ESC                      0x000000000000000B
-           RECALL                   0x000000000000000C
-           AIR_CATV                 0x000000000000000E
-           INC                      0x000000000000000A
-           DEC                      0x000000000000000D
-           BOX                      0x0000000000000017
--          DOWN_ARROW               0x0000000000000013
--          LEFT_ARROW_TERM          0x000000000000000F
--          RIGHT_ARROW_TERM         0x0000000000000007
-+          KEY_DOWN               0x0000000000000013
-+          KEY_LEFT          0x000000000000000F
-+          KEY_RIGHT         0x0000000000000007
-       end codes
- end remote
-Index: lirc-0.8.7pre2/remotes/cph03x/lircd.conf.cph03x
-===================================================================
---- lirc-0.8.7pre2.orig/remotes/cph03x/lircd.conf.cph03x
-+++ lirc-0.8.7pre2/remotes/cph03x/lircd.conf.cph03x
-@@ -32,39 +32,39 @@ begin remote
-   repeat_bit      0
- 
-       begin codes
--          0                        0x00000000000000FF
--          1                        0x000000000000807F
--          2                        0x00000000000040BF
--          3                        0x000000000000C03F
--          4                        0x00000000000020DF
--          5                        0x000000000000A05F
--          6                        0x000000000000609F
--          7                        0x000000000000E01F
--          8                        0x00000000000010EF
--          9                        0x000000000000906F
-+          KEY_0                        0x00000000000000FF
-+          KEY_1                        0x000000000000807F
-+          KEY_2                        0x00000000000040BF
-+          KEY_3                        0x000000000000C03F
-+          KEY_4                        0x00000000000020DF
-+          KEY_5                        0x000000000000A05F
-+          KEY_6                        0x000000000000609F
-+          KEY_7                        0x000000000000E01F
-+          KEY_8                        0x00000000000010EF
-+          KEY_9                        0x000000000000906F
-           LOOP                     0x00000000000050AF
- # unused
-           FINE_UP(PLUS)            0x00000000000030CF
--          ZOOM                     0x000000000000B04F
--          RECORD                   0x000000000000708F
--          PREVIEW                  0x000000000000F00F
-+          KEY_ZOOM                     0x000000000000B04F
-+          KEY_RECORD                   0x000000000000708F
-+          KEY_PREVIOUS                  0x000000000000F00F
- 
-           SCAN                     0x00000000000008F7
--          VIDEO                    0x0000000000008877
--          POWER                    0x00000000000048B7
--          MUTE                     0x000000000000C837
-+          KEY_VIDEO                    0x0000000000008877
-+          KEY_POWER                    0x00000000000048B7
-+          KEY_MUTE                     0x000000000000C837
-           COLOR                    0x00000000000028D7
- #unused
-           FREEZE                   0x0000000000006897
-           100                      0x000000000000E817
-           FINE_DOWN(MINUS)         0x00000000000018E7
--          PLAY                     0x0000000000009867
--          CH_UP                    0x00000000000058A7
--          VOL_UP                   0x000000000000D827
--          TV                       0x00000000000038C7
--          STOP                     0x000000000000B847
--          CH_DOWN                  0x0000000000007887
--          VOL_DOWN                 0x000000000000F807
-+          KEY_PLAY                     0x0000000000009867
-+          KEY_CHANNELUP                    0x00000000000058A7
-+          KEY_VOLUMEUP                   0x000000000000D827
-+          KEY_TV                       0x00000000000038C7
-+          KEY_STOP                     0x000000000000B847
-+          KEY_CHANNELDOWN                  0x0000000000007887
-+          KEY_VOLUMEDOWN                 0x000000000000F807
-       end codes
- 
- end remote
-Index: lirc-0.8.7pre2/remotes/creative/lircd.conf.alsa_usb
-===================================================================
---- lirc-0.8.7pre2.orig/remotes/creative/lircd.conf.alsa_usb
-+++ lirc-0.8.7pre2/remotes/creative/lircd.conf.alsa_usb
-@@ -34,38 +34,38 @@ begin remote
- 
- 
-       begin codes
--          Power                    0x000000000000619E
--          1                        0x0000000000008B74
--          2                        0x0000000000008F70
--          3                        0x000000000000906F
--          4                        0x0000000000008A75
--          5                        0x000000000000847B
--          6                        0x0000000000007887
--          7                        0x0000000000008976
--          8                        0x000000000000837C
--          9                        0x0000000000007788
--          0                        0x000000000000807F
-+          KEY_POWER                    0x000000000000619E
-+          KEY_1                        0x0000000000008B74
-+          KEY_2                        0x0000000000008F70
-+          KEY_3                        0x000000000000906F
-+          KEY_4                        0x0000000000008A75
-+          KEY_5                        0x000000000000847B
-+          KEY_6                        0x0000000000007887
-+          KEY_7                        0x0000000000008976
-+          KEY_8                        0x000000000000837C
-+          KEY_9                        0x0000000000007788
-+          KEY_0                        0x000000000000807F
-           CMSS                     0x000000000000718E
-           EAX                      0x0000000000008C73
--          Mute                     0x0000000000006E91
--          Vol_Down                 0x000000000000639C
--          Vol_Up                   0x000000000000629D
--          Up                       0x0000000000007B84
--          Left                     0x0000000000008778
--          Ok                       0x000000000000817E
--          Right                    0x000000000000758A
--          Down                     0x0000000000008D72
-+          KEY_MUTE                     0x0000000000006E91
-+          KEY_VOLUMEDOWN                 0x000000000000639C
-+          KEY_VOLUMEUP                   0x000000000000629D
-+          KEY_UP                       0x0000000000007B84
-+          KEY_LEFT                     0x0000000000008778
-+          KEY_OK                       0x000000000000817E
-+          KEY_RIGHT                    0x000000000000758A
-+          KEY_DOWN                     0x0000000000008D72
-           Return                   0x0000000000008E71
-           Start                    0x0000000000008877
--          Cancel                   0x0000000000007C83
--          Rec                      0x000000000000738C
--          Options                  0x000000000000827D
-+          KEY_CANCEL                   0x0000000000007C83
-+          KEY_RECORD                      0x000000000000738C
-+          KEY_OPTION                  0x000000000000827D
-           Display                  0x0000000000007689
--          Previous                 0x0000000000007F80
--          Play                     0x0000000000007986
--          Next                     0x0000000000007A85
--          Slow                     0x0000000000007D82
--          Stop                     0x000000000000857A
-+          KEY_PREVIOUS                 0x0000000000007F80
-+          KEY_PLAY                     0x0000000000007986
-+          KEY_NEXT                     0x0000000000007A85
-+          KEY_SLOW                     0x0000000000007D82
-+          KEY_STOP                     0x000000000000857A
-           Step                     0x0000000000007E81
-       end codes
- 
-Index: lirc-0.8.7pre2/remotes/creative/lircd.conf.breakoutbox
-===================================================================
---- lirc-0.8.7pre2.orig/remotes/creative/lircd.conf.breakoutbox
-+++ lirc-0.8.7pre2/remotes/creative/lircd.conf.breakoutbox
-@@ -19,37 +19,37 @@ begin remote
-       begin codes
-           DVD/CD                   0x0000000000000001
-           DVR/TV                   0x0000000000000000
--          MENU                     0x0000000000000003
--          LANG                     0x0000000000000005
-+          KEY_MENU                     0x0000000000000003
-+          KEY_LANGUAGE                     0x0000000000000005
-           PLAYLIST                 0x0000000000000011
--          BACKWARD                 0x000000000000000A
--          PLAY                     0x0000000000000008
--          FORWARD                  0x000000000000000F
-+          KEY_REWIND                 0x000000000000000A
-+          KEY_PLAY                     0x0000000000000008
-+          KEY_FORWARD                  0x000000000000000F
-           LAST                     0x0000000000000002
--          STOP                     0x0000000000000007
--          NEXT                     0x0000000000000006
--          MUTE                     0x0000000000000014
-+          KEY_STOP                     0x0000000000000007
-+          KEY_NEXT                     0x0000000000000006
-+          KEY_MUTE                     0x0000000000000014
-           STEP                     0x0000000000000009
--          UP                       0x000000000000000C
--          LEFT                     0x000000000000000B
--          RIGHT                    0x000000000000000D
--          DOWN                     0x000000000000000E
--          VOL+                     0x0000000000000012
--          VOL-                     0x0000000000000015
--          OK                       0x0000000000000011
-+          KEY_UP                       0x000000000000000C
-+          KEY_LEFT                     0x000000000000000B
-+          KEY_RIGHT                    0x000000000000000D
-+          KEY_DOWN                     0x000000000000000E
-+          KEY_VOLUMEUP                     0x0000000000000012
-+          KEY_VOLUMEDOWN                     0x0000000000000015
-+          KEY_OK                       0x0000000000000011
-           ANGLE+                   0x0000000000000010
-           ANGLE-                   0x0000000000000013
--          REC                      0x0000000000000004
--          1                        0x0000000000000016
--          2                        0x0000000000000017
--          3                        0x0000000000000018
--          4                        0x0000000000000019
--          5                        0x000000000000001A
--          6                        0x000000000000001B
--          7                        0x000000000000001C
--          8                        0x000000000000001D
--          9                        0x000000000000001E
--          0                        0x000000000000001F
-+          KEY_RECORD                      0x0000000000000004
-+          KEY_1                        0x0000000000000016
-+          KEY_2                        0x0000000000000017
-+          KEY_3                        0x0000000000000018
-+          KEY_4                        0x0000000000000019
-+          KEY_5                        0x000000000000001A
-+          KEY_6                        0x000000000000001B
-+          KEY_7                        0x000000000000001C
-+          KEY_8                        0x000000000000001D
-+          KEY_9                        0x000000000000001E
-+          KEY_0                        0x000000000000001F
-       end codes
- 
- end remote
-Index: lirc-0.8.7pre2/remotes/creative/lircd.conf.creative
-===================================================================
---- lirc-0.8.7pre2.orig/remotes/creative/lircd.conf.creative
-+++ lirc-0.8.7pre2/remotes/creative/lircd.conf.creative
-@@ -23,30 +23,30 @@ begin remote
-   toggle_bit      0
- 
-       begin codes
--          play                     0x19e6
--          stop                     0x1ae5
--          pause                    0x1be4
--          eject                    0x1ce3
-+          KEY_PLAY                     0x19e6
-+          KEY_STOP                     0x1ae5
-+          KEY_PAUSE                    0x1be4
-+          KEY_EJECTCD                    0x1ce3
-           last                     0x1de2
-           rrev                     0x1ee1
--          ffwd                     0x1fe0
--          next                     0x20df
--          1                        0x21de
--          2                        0x22dd
--          3                        0x23dc
-+          KEY_FASTFORWARD                     0x1fe0
-+          KEY_NEXT                     0x20df
-+          KEY_1                        0x21de
-+          KEY_2                        0x22dd
-+          KEY_3                        0x23dc
-           shift                    0x24db
--          4                        0x25da
--          5                        0x26d9
--          6                        0x27d8
-+          KEY_4                        0x25da
-+          KEY_5                        0x26d9
-+          KEY_6                        0x27d8
-           mouse                    0x28d7
--          7                        0x29d6
--          8                        0x2ad5
--          9                        0x2bd4
--          vol+                     0x2cd3
-+          KEY_7                        0x29d6
-+          KEY_8                        0x2ad5
-+          KEY_9                        0x2bd4
-+          KEY_VOLUMEUP                     0x2cd3
-           start                    0x2dd2
--          0                        0x2ed1
--          mute                     0x2fd0
--          vol-                     0x30cf
-+          KEY_0                        0x2ed1
-+          KEY_MUTE                     0x2fd0
-+          KEY_VOLUMEDOWN                     0x30cf
-       end codes
- 
- end remote
-Index: lirc-0.8.7pre2/remotes/creative/lircd.conf.livedrive
-===================================================================
---- lirc-0.8.7pre2.orig/remotes/creative/lircd.conf.livedrive
-+++ lirc-0.8.7pre2/remotes/creative/lircd.conf.livedrive
-@@ -29,40 +29,40 @@ begin remote
- 
- 
-       begin codes
--          1                        0x0000000000008B74
--          2                        0x0000000000008F70
--          3                        0x000000000000906F
--          4                        0x0000000000008A75
--          5                        0x000000000000847B
--          6                        0x0000000000007887
--          7                        0x0000000000008976
--          8                        0x000000000000837C
--          9                        0x0000000000007788
--          0                        0x000000000000807F
--          stop                     0x000000000000857A
--          play                     0x0000000000007986
--          pause                    0x0000000000007986
--          slow                     0x0000000000007D82
-+          KEY_1                        0x0000000000008B74
-+          KEY_2                        0x0000000000008F70
-+          KEY_3                        0x000000000000906F
-+          KEY_4                        0x0000000000008A75
-+          KEY_5                        0x000000000000847B
-+          KEY_6                        0x0000000000007887
-+          KEY_7                        0x0000000000008976
-+          KEY_8                        0x000000000000837C
-+          KEY_9                        0x0000000000007788
-+          KEY_0                        0x000000000000807F
-+          KEY_STOP                     0x000000000000857A
-+          KEY_PLAY                     0x0000000000007986
-+          KEY_PAUSE                    0x0000000000007986
-+          KEY_SLOW                     0x0000000000007D82
-           step                     0x0000000000007E81
--          prev                     0x0000000000007F80
--          next                     0x0000000000007A85
--          mute                     0x0000000000006E91
--          vol-                     0x000000000000639C
--          vol+                     0x000000000000629D
-+          KEY_PREVIOUS                     0x0000000000007F80
-+          KEY_NEXT                     0x0000000000007A85
-+          KEY_MUTE                     0x0000000000006E91
-+          KEY_VOLUMEDOWN                     0x000000000000639C
-+          KEY_VOLUMEUP                     0x000000000000629D
-           eax                      0x0000000000008C73
--          options                  0x000000000000827D
-+          KEY_OPTION                  0x000000000000827D
-           display                  0x0000000000007689
-           return                   0x0000000000008E71
-           start                    0x0000000000008877
--          close                    0x0000000000007C83
--          up                       0x0000000000007B84
--          down                     0x0000000000008D72
--          left                     0x0000000000008778
--          right                    0x000000000000758A
--          ok                       0x000000000000817E
--	  power                    0x000000000000619e
-+          KEY_CLOSE                    0x0000000000007C83
-+          KEY_UP                       0x0000000000007B84
-+          KEY_DOWN                     0x0000000000008D72
-+          KEY_LEFT                     0x0000000000008778
-+          KEY_RIGHT                    0x000000000000758A
-+          KEY_OK                       0x000000000000817E
-+	  KEY_POWER                    0x000000000000619e
- 	  cmss                     0x000000000000718e
--	  record                   0x000000000000738c
-+	  KEY_RECORD                   0x000000000000738c
- 	  
-       end codes
- 
-Index: lirc-0.8.7pre2/remotes/dvico/lircd.conf.fusionHDTV
-===================================================================
---- lirc-0.8.7pre2.orig/remotes/dvico/lircd.conf.fusionHDTV
-+++ lirc-0.8.7pre2/remotes/dvico/lircd.conf.fusionHDTV
-@@ -22,42 +22,42 @@ begin remote
-   toggle_bit     0
- 
-       begin codes
--          1                        0x00000000000011F9
--          2                        0x00000000000012F9
--          3                        0x00000000000013F9
--          4                        0x00000000000014F9
--          5                        0x00000000000015F9
--          6                        0x00000000000016F9
--          7                        0x00000000000017F9
--          8                        0x00000000000018F9
--          9                        0x00000000000019F9
--          0                        0x00000000000010F9
--          power                    0x0000000000000AF9
-+          KEY_1                        0x00000000000011F9
-+          KEY_2                        0x00000000000012F9
-+          KEY_3                        0x00000000000013F9
-+          KEY_4                        0x00000000000014F9
-+          KEY_5                        0x00000000000015F9
-+          KEY_6                        0x00000000000016F9
-+          KEY_7                        0x00000000000017F9
-+          KEY_8                        0x00000000000018F9
-+          KEY_9                        0x00000000000019F9
-+          KEY_0                        0x00000000000010F9
-+          KEY_POWER                    0x0000000000000AF9
-           pcoff                    0x0000000000000CF9
--          camera                   0x0000000000001AF9
--          record                   0x0000000000001BF9
--          chup                     0x00000000000000F9
--          chdown                   0x00000000000001F9
--          volup                    0x00000000000002F9
--          voldown                  0x00000000000003F9
--          playpause                0x0000000000001FF9
--          rew                      0x0000000000001CF9
--          stop                     0x0000000000001EF9
--          ff                       0x0000000000001DF9
--          folder                   0x00000000000040F9
-+          KEY_CAMERA                   0x0000000000001AF9
-+          KEY_RECORD                   0x0000000000001BF9
-+          KEY_CHANNELUP                     0x00000000000000F9
-+          KEY_CHANNELDOWN                   0x00000000000001F9
-+          KEY_VOLUMEUP                    0x00000000000002F9
-+          KEY_VOLUMEDOWN                  0x00000000000003F9
-+          KEY_PLAYPAUSE                0x0000000000001FF9
-+          KEY_REWIND                      0x0000000000001CF9
-+          KEY_STOP                     0x0000000000001EF9
-+          KEY_FASTFORWARD                       0x0000000000001DF9
-+          KEY_DIRECTORY                   0x00000000000040F9
-           atvdtv                   0x00000000000006F9
-           dvhs                     0x00000000000041F9
--          menu                     0x00000000000008F9
-+          KEY_MENU                     0x00000000000008F9
-           aspect                   0x00000000000007F9
--          zoom                     0x00000000000004F9
--          epg                      0x0000000000000BF9
--          mute                     0x0000000000000DF9
--          back                     0x0000000000000EF9
-+          KEY_ZOOM                     0x00000000000004F9
-+          KEY_EPG                      0x0000000000000BF9
-+          KEY_MUTE                     0x0000000000000DF9
-+          KEY_BACK                     0x0000000000000EF9
-           hd                       0x0000000000000FF9
--          red                      0x00000000000005F9
--          green                    0x00000000000009F9
--          yellow                   0x00000000000042F9
--          blue                     0x00000000000043F9
-+          KEY_RED                      0x00000000000005F9
-+          KEY_GREEN                    0x00000000000009F9
-+          KEY_YELLOW                   0x00000000000042F9
-+          KEY_BLUE                     0x00000000000043F9
-       end codes
- 
- end remote
-Index: lirc-0.8.7pre2/remotes/ea65/lircd.conf.ea65
-===================================================================
---- lirc-0.8.7pre2.orig/remotes/ea65/lircd.conf.ea65
-+++ lirc-0.8.7pre2/remotes/ea65/lircd.conf.ea65
-@@ -18,53 +18,53 @@ begin remote
-         htpc        0x0011811b
-         dvd/vcd     0x00128100
-         cd/mp3      0x00138152
--        fm          0x00158111
--        video       0x0016810f
-+        KEY_RADIO          0x00158111
-+        KEY_VIDEO       0x0016810f
- 
--        1           0x0041810b
--        2           0x00428115
--        3           0x00438112
--        4           0x00448141
--        5           0x00458119
--        6           0x00468116
--        7           0x00478150
--        8           0x0048811a
--        9           0x00498155
-+        KEY_1           0x0041810b
-+        KEY_2           0x00428115
-+        KEY_3           0x00438112
-+        KEY_4           0x00448141
-+        KEY_5           0x00458119
-+        KEY_6           0x00468116
-+        KEY_7           0x00478150
-+        KEY_8           0x0048811a
-+        KEY_9           0x00498155
-         *           0x00328156
--        0           0x00408158
-+        KEY_0           0x00408158
-         #           0x0030814d
-         
--        menu        0x00188104
--        exit        0x001d8154
--        enter       0x001e8101
--        up          0x00198159
--        down        0x001a811c
--        left        0x001c8102
--        right       0x001b815d
-+        KEY_MENU        0x00188104
-+        KEY_EXIT        0x001d8154
-+        KEY_ENTER       0x001e8101
-+        KEY_UP          0x00198159
-+        KEY_DOWN        0x001a811c
-+        KEY_LEFT        0x001c8102
-+        KEY_RIGHT       0x001b815d
- 
-- 	vol+        0x00298103
-- 	vol-        0x002a814e
-- 	ch+         0x002c8113
-- 	ch-         0x002d8117
-- 	mute        0x00288105
-+ 	KEY_VOLUMEUP        0x00298103
-+ 	KEY_VOLUMEDOWN        0x002a814e
-+ 	KEY_CHANNELUP         0x002c8113
-+ 	KEY_CHANNELDOWN         0x002d8117
-+ 	KEY_MUTE        0x00288105
-  	tune+       0x002e8144
-  	tune-       0x002f8148
-  	mem         0x00318145
-  	scan        0x00278151
- 
-  	display     0x0034811f
-- 	eject       0x0035815c
-- 	rwnd        0x00228118
-- 	ffwd        0x00218110
-- 	rec         0x002b810a
-- 	repeate     0x0038815a
-- 	prev        0x00238107
-- 	next        0x00248114
-+ 	KEY_EJECTCD       0x0035815c
-+ 	KEY_REWIND        0x00228118
-+ 	KEY_FASTFORWARD        0x00218110
-+ 	KEY_RECORD         0x002b810a
-+ 	KEY_AGAIN     0x0038815a
-+ 	KEY_PREVIOUS        0x00238107
-+ 	KEY_NEXT        0x00248114
-  	time/shift  0x00338108
-- 	stop        0x0020811d
-- 	play/pause  0x001f8109
-+ 	KEY_STOP        0x0020811d
-+ 	KEY_PLAYPAUSE  0x001f8109
- 
--        play-pause  0x0080811d
-+        KEY_PLAYPAUSE  0x0080811d
-         stop-eject  0x00238107
-         mode-       0x00ff1080
-         mode+       0x00ff1180
-Index: lirc-0.8.7pre2/remotes/ericsson/lircd.conf.bte
-===================================================================
---- lirc-0.8.7pre2.orig/remotes/ericsson/lircd.conf.bte
-+++ lirc-0.8.7pre2/remotes/ericsson/lircd.conf.bte
-@@ -11,29 +11,29 @@
- 
- begin remote
- 
--    name    bte 
-+    name    bte
-     bits    16
- 
-     begin codes
--        0               0x0030
--        1               0x0031
--        2               0x0032
--        3               0x0033
--        4               0x0034
--        5               0x0035
--        6               0x0036
--        7               0x0037
--        8               0x0038
--        9               0x0039
--        STAR            0x002a  # '*'
--        HASH            0x0023  # '#'
--        UP              0x005e  # '^'
--        DOWN            0x0076  # 'v'
--        LEFT            0x003c  # '<'
--        RIGHT           0x003e  # '>'
--        CANCEL          0x0063  # 'c'
--        VOL_UP          0x0075  # 'u'
--        VOL_DOWN        0x0064  # 'd'
-+        KEY_0               0x0030
-+        KEY_1               0x0031
-+        KEY_2               0x0032
-+        KEY_3               0x0033
-+        KEY_4               0x0034
-+        KEY_5               0x0035
-+        KEY_6               0x0036
-+        KEY_7               0x0037
-+        KEY_8               0x0038
-+        KEY_9               0x0039
-+        STAR                0x002a  # '*'
-+        HASH                0x0023  # '#'
-+        KEY_UP              0x005e  # '^'
-+        KEY_DOWN            0x0076  # 'v'
-+        KEY_LEFT            0x003c  # '<'
-+        KEY_RIGHT           0x003e  # '>'
-+        KEY_CANCEL          0x0063  # 'c'
-+        KEY_VOLUMEUP        0x0075  # 'u'
-+        KEY_VOLUMEDOWN      0x0064  # 'd'
- 
- # t520m
-         NO              0x0065  # 'e'
-@@ -45,8 +45,8 @@ begin remote
-         F_LEFT          0x005b  # '['
-         F_RIGHT         0x005d  # ']'  - triggers 'e'
-         J_CLICK         0x3a4a  # ':J' - triggers 'e'
--        RETURN          0x3a52  # ':R' - triggers 'e'
--        CAMERA          0x3a43  # ':C'
-+        KEY_ENTER       0x3a52  # ':R' - triggers 'e'
-+        KEY_CAMERA      0x3a43  # ':C'
-         WAP             0x3a4f  # ':O'
- 
-       end codes
-Index: lirc-0.8.7pre2/remotes/hauppauge/lircd.conf.hauppauge
-===================================================================
---- lirc-0.8.7pre2.orig/remotes/hauppauge/lircd.conf.hauppauge
-+++ lirc-0.8.7pre2/remotes/hauppauge/lircd.conf.hauppauge
-@@ -27,25 +27,25 @@ begin remote
-   repeat_bit      2
- 
-       begin codes
--          TV                       0x000000000000100F
--          RADIO                    0x000000000000100C
-+          KEY_TV                       0x000000000000100F
-+          KEY_RADIO                    0x000000000000100C
-           FULL_SCREEN              0x000000000000102E
--          CH+                      0x0000000000001020
--          CH-                      0x0000000000001021
--          VOL-                     0x0000000000001011
--          VOL+                     0x0000000000001010
--          MUTE                     0x000000000000100D
-+          KEY_CHANNELUP                      0x0000000000001020
-+          KEY_CHANNELDOWN                      0x0000000000001021
-+          KEY_VOLUMEDOWN                     0x0000000000001011
-+          KEY_VOLUMEUP                     0x0000000000001010
-+          KEY_MUTE                     0x000000000000100D
-           SOURCE                   0x0000000000001022
--          1                        0x0000000000001001
--          2                        0x0000000000001002
--          3                        0x0000000000001003
--          4                        0x0000000000001004
--          5                        0x0000000000001005
--          6                        0x0000000000001006
--          7                        0x0000000000001007
--          8                        0x0000000000001008
--          9                        0x0000000000001009
--          0                        0x0000000000001000
-+          KEY_1                        0x0000000000001001
-+          KEY_2                        0x0000000000001002
-+          KEY_3                        0x0000000000001003
-+          KEY_4                        0x0000000000001004
-+          KEY_5                        0x0000000000001005
-+          KEY_6                        0x0000000000001006
-+          KEY_7                        0x0000000000001007
-+          KEY_8                        0x0000000000001008
-+          KEY_9                        0x0000000000001009
-+          KEY_0                        0x0000000000001000
-           RESERVED                 0x000000000000101E
-           MINIMIZE                 0x0000000000001026
-       end codes
-Index: lirc-0.8.7pre2/remotes/hercules/lircd.conf.smarttv_stereo
-===================================================================
---- lirc-0.8.7pre2.orig/remotes/hercules/lircd.conf.smarttv_stereo
-+++ lirc-0.8.7pre2/remotes/hercules/lircd.conf.smarttv_stereo
-@@ -26,36 +26,36 @@ begin remote
- 
- 
-       begin codes
--          POWER                    0x00000000000048B7
--          MUTE                     0x000000000000C837
--          PREVIEW                  0x000000000000F00F
-+          KEY_POWER                    0x00000000000048B7
-+          KEY_MUTE                     0x000000000000C837
-+          KEY_PREVIOUS                  0x000000000000F00F
-           FULLSCREEN               0x00000000000038C7
-           AV/TV                    0x0000000000008877
-           TELETEXT                 0x00000000000008F7
--          1                        0x000000000000807F
--          2                        0x00000000000040BF
--          3                        0x000000000000C03F
--          4                        0x00000000000020DF
--          5                        0x000000000000A05F
--          6                        0x000000000000609F
--          7                        0x000000000000E01F
--          8                        0x00000000000010EF
--          9                        0x000000000000906F
--          0                        0x00000000000000FF
-+          KEY_1                        0x000000000000807F
-+          KEY_2                        0x00000000000040BF
-+          KEY_3                        0x000000000000C03F
-+          KEY_4                        0x00000000000020DF
-+          KEY_5                        0x000000000000A05F
-+          KEY_6                        0x000000000000609F
-+          KEY_7                        0x000000000000E01F
-+          KEY_8                        0x00000000000010EF
-+          KEY_9                        0x000000000000906F
-+          KEY_0                        0x00000000000000FF
-           SNAPSHOT                 0x00000000000050AF
-           100+                     0x000000000000E817
--          CH+                      0x00000000000058A7
--          CH-                      0x0000000000007887
--          VOL+                     0x000000000000D827
--          VOL-                     0x000000000000F807
--          PAUSE                    0x000000000000B04F
--          RECORD                   0x000000000000708F
--          STOP                     0x000000000000B847
--          PLAY                     0x0000000000009867
-+          KEY_CHANNELUP                      0x00000000000058A7
-+          KEY_CHANNELDOWN                      0x0000000000007887
-+          KEY_VOLUMEUP                     0x000000000000D827
-+          KEY_VOLUMEDOWN                     0x000000000000F807
-+          KEY_PAUSE                    0x000000000000B04F
-+          KEY_RECORD                   0x000000000000708F
-+          KEY_STOP                     0x000000000000B847
-+          KEY_PLAY                     0x0000000000009867
-           TV_REPLAY                0x0000000000006897
-           TIME_SHIFT               0x00000000000028D7
--          SEEK_BACK                0x00000000000018E7
--          SEEK_FWD                 0x00000000000030CF
-+          KEY_BACK                0x00000000000018E7
-+          KEY_FORWARD                 0x00000000000030CF
-       end codes
- 
- end remote
-Index: lirc-0.8.7pre2/remotes/imon/lircd.conf.imon
-===================================================================
---- lirc-0.8.7pre2.orig/remotes/imon/lircd.conf.imon
-+++ lirc-0.8.7pre2/remotes/imon/lircd.conf.imon
-@@ -29,48 +29,48 @@ begin remote
-   duty_cycle   33
- 
-       begin codes
--          App.Exit                 0x00000000000000FF
--          Power                    0x000000000000807F
--          1                        0x00000000000040BF
--          2                        0x000000000000C03F
--          3                        0x00000000000020DF
--          4                        0x000000000000A05F
--          5                        0x000000000000609F
--          6                        0x000000000000E01F
--          7                        0x00000000000010EF
--          8                        0x000000000000906F
--          9                        0x00000000000050AF
--          0                        0x000000000000D02F
-+          KEY_EXIT                 0x00000000000000FF
-+          KEY_POWER                    0x000000000000807F
-+          KEY_1                        0x00000000000040BF
-+          KEY_2                        0x000000000000C03F
-+          KEY_3                        0x00000000000020DF
-+          KEY_4                        0x000000000000A05F
-+          KEY_5                        0x000000000000609F
-+          KEY_6                        0x000000000000E01F
-+          KEY_7                        0x00000000000010EF
-+          KEY_8                        0x000000000000906F
-+          KEY_9                        0x00000000000050AF
-+          KEY_0                        0x000000000000D02F
-           Windows                  0x00000000000030CF
--          Menu                     0x000000000000B04F
-+          KEY_MENU                     0x000000000000B04F
-           App.Launcher             0x000000000000708F
-           Function                 0x000000000000F00F
-           Task.Switcher            0x00000000000008F7
--          Back                     0x0000000000008877
--          Select                   0x00000000000048B7
--          Eject                    0x0000000000009867
--          Delete                   0x00000000000018E7
--          Up                       0x000000000000C837
--          Right                    0x0000000000006897
--          Down                     0x000000000000E817
--          Left                     0x00000000000028D7
--          Enter                    0x000000000000A857
--          Vol-                     0x00000000000058A7
--          Vol+                     0x000000000000D827
--          Mute                     0x00000000000038C7
--          Play                     0x000000000000B847
--          Pause                    0x0000000000007887
--          Prev                     0x000000000000F807
--          Next                     0x00000000000002FD
--          Rew                      0x000000000000827D
--          Fwd                      0x00000000000042BD
--          Stop                     0x000000000000C23D
--          Open                     0x00000000000022DD
--          Rec                      0x000000000000A25D
--          Bookmark                 0x000000000000629D
-+          KEY_BACK                     0x0000000000008877
-+          KEY_SELECT                   0x00000000000048B7
-+          KEY_EJECTCD                    0x0000000000009867
-+          KEY_DELETE                   0x00000000000018E7
-+          KEY_UP                       0x000000000000C837
-+          KEY_RIGHT                    0x0000000000006897
-+          KEY_DOWN                     0x000000000000E817
-+          KEY_LEFT                     0x00000000000028D7
-+          KEY_ENTER                    0x000000000000A857
-+          KEY_VOLUMEDOWN                     0x00000000000058A7
-+          KEY_VOLUMEUP                     0x000000000000D827
-+          KEY_MUTE                     0x00000000000038C7
-+          KEY_PLAY                     0x000000000000B847
-+          KEY_PAUSE                    0x0000000000007887
-+          KEY_PREVIOUS                     0x000000000000F807
-+          KEY_NEXT                     0x00000000000002FD
-+          KEY_REWIND                      0x000000000000827D
-+          KEY_FORWARD                      0x00000000000042BD
-+          KEY_STOP                     0x000000000000C23D
-+          KEY_OPEN                     0x00000000000022DD
-+          KEY_RECORD                      0x000000000000A25D
-+          KEY_BOOKMARKS                 0x000000000000629D
-           Thumbnail                0x000000000000E21D
-           Aspect                   0x00000000000012ED
--          DVD.Menu                 0x000000000000926D
-+          KEY_DVD                 0x000000000000926D
-           DVD.Caption              0x00000000000052AD
-           DVD.Language             0x000000000000D22D
-           Full.Screen              0x00000000000032CD
-Index: lirc-0.8.7pre2/remotes/imon/lircd.conf.imon-knob
-===================================================================
---- lirc-0.8.7pre2.orig/remotes/imon/lircd.conf.imon-knob
-+++ lirc-0.8.7pre2/remotes/imon/lircd.conf.imon-knob
-@@ -23,83 +23,77 @@ begin remote
- 
- 
-       begin codes
--          AppExit                  0x288195B7
--          Power                    0x289115B7
--          Record                   0x298115B7
--          Play                     0x2A8115B7
--          Open                     0x29B195B7
--          KnobVolUp                0x000100FF
--          KnobVolDown              0x010000FF
--          KnobMute                 0x000008FF
--          Rewind                   0x2A8195B7
--          Pause                    0x2A9115B7
--          FastForward              0x2B8115B7
--          PrevChapter              0x2B9115B7
--          Stop                     0x2B9715B7
--          NextChapter              0x298195B7
-+          KEY_EXIT                 0x288195B7
-+          KEY_POWER                0x289115B7
-+          KEY_RECORD               0x298115B7
-+          KEY_PLAY                 0x2A8115B7
-+          KEY_OPEN                 0x29B195B7
-+          KEY_VOLUMEUP             0x000100FF
-+          KEYVOLUMEDOWN            0x010000FF
-+          KEY_MUTE                 0x000008FF
-+          KEY_REWIND               0x2A8195B7
-+          KEY_PAUSE                0x2A9115B7
-+          KEY_FASTFORWARD          0x2B8115B7
-+          KEY_PREVIOUS             0x2B9115B7
-+          KEY_STOP                 0x2B9715B7
-+          KEY_NEXT                 0x298195B7
-           WindowsKey               0x2B8195B7
--          Backspace                0x28A115B7
-+          KEY_BACKSPACE            0x28A115B7
-           MouseKeyboard            0x299115B7
--          SelectSpace              0x2A9315B7
-+          KEY_SELECT               0x2A9315B7
-           MouseMenu                0x28B715B7
--          MouseRightClick          0x688481B7
--          Enter                    0x28A195B7
--          MouseLeftClick           0x688301B7
--          CursorLeft               0x6ABA81B7
--          CursorUp                 0x6902F9B7
--          CursorRight              0x68A281B7
--          CursorDown               0x6882A1B7
-+          BTN_RIGHT                0x688481B7
-+          KEY_ENTER                0x28A195B7
-+          BTN_LEFT                 0x688301B7
-+          KEY_LEFT                 0x6ABA81B7
-+          KEY_UP                   0x6902F9B7
-+          KEY_RIGHT                0x68A281B7
-+          KEY_DOWN                 0x6882A1B7
- # version 2 of keypad
--          CursorUp                 0x2aa515b7
--          CursorDown               0x289515b7
--          CursorLeft               0x29a515b7
--          CursorRight              0x2ba515b7
-+          KEY_UP                   0x2aa515b7
-+          KEY_DOWN                 0x289515b7
-+          KEY_LEFT                 0x29a515b7
-+          KEY_RIGHT                0x2ba515b7
- # version 3 of keypad
--          CursorUp                 0x01008000
--          CursorDown               0x01007f00
--          CursorLeft               0x01000080
--          CursorRight              0x0100007f
--          Esc                      0x2BB715B7
--          Eject                    0x299395B7
-+          KEY_UP                   0x01008000
-+          KEY_DOWN                 0x01007f00
-+          KEY_LEFT                 0x01000080
-+          KEY_RIGHT                0x0100007f
-+          KEY_ESC                  0x2BB715B7
-+          KEY_EJECT                0x299395B7
-           AppLauncher              0x29B715B7
-           MultiMon                 0x2AB195B7
-           TaskSwitcher             0x2A9395B7
--          Mute                     0x2B9595B7
--          VolUp                    0x28A395B7
--          VolDown                  0x28A595B7
--          ChUp                     0x289395B7
--          ChDown                   0x288795B7
-+          KEY_MUTE                 0x2B9595B7
-+          KEY_VOLUMEUP             0x28A395B7
-+          KEY_VOLUMEDOWN           0x28A595B7
-+          KEY_CHANNELUP            0x289395B7
-+          KEY_CHANNELDOWN          0x288795B7
-           Timer                    0x2B8395B7
--          1                        0x28B595B7
--          2                        0x2BB195B7
--          3                        0x28B195B7
--          4                        0x2A8595B7
--          5                        0x299595B7
--          6                        0x2AA595B7
--          7                        0x2B9395B7
--          8                        0x2A8515B7
--          9                        0x2AA115B7
-+          KEY_1                    0x28B595B7
-+          KEY_2                    0x2BB195B7
-+          KEY_3                    0x28B195B7
-+          KEY_4                    0x2A8595B7
-+          KEY_5                    0x299595B7
-+          KEY_6                    0x2AA595B7
-+          KEY_7                    0x2B9395B7
-+          KEY_8                    0x2A8515B7
-+          KEY_9                    0x2AA115B7
-           ShiftTab                 0x28B515B7
--          0                        0x2BA595B7
--          Tab                      0x29A115B7
--          MyMovie                  0x2B8515B7
--          MyMusic                  0x299195B7
--          MyPhoto                  0x2BA115B7
--          MyTV                     0x28A515B7
--          Bookmark                 0x288515B7
-+          KEY_0                    0x2BA595B7
-+          KEY_TAB                  0x29A115B7
-+          KEY_VIDEO                0x2B8515B7
-+          KEY_AUDIO                0x299195B7
-+          KEY_PHOTO                0x2BA115B7
-+          KEY_TV                   0x28A515B7
-+          KEY_BOOKMARKS            0x288515B7
-           Thumbnail                0x2AB715B7
-           AspectRatio              0x29A595B7
-           FullScreen               0x2AA395B7
--          MyDVD                    0x29A295B7
--          Menu                     0x2BA385B7
-+          KEY_DVD                  0x29A295B7
-+          KEY_MENU                 0x2BA385B7
-           Caption                  0x298595B7
--          Language                 0x2B8595B7
--# these codes may be wrong, but they were included in the first version of
--# this config file
--          0                        0x2BA595BF
--          NextChapter              0x298195BF
--          Thumbnail                0x2AB715BF
--          FullScreen               0x2AA395BF
-+          KEY_LANGUAGE             0x2B8595B7
- 
-       end codes
- 
-@@ -124,83 +118,77 @@ begin remote
- 
- 
-       begin codes
--          AppExit                  0x288195B7
--          Power                    0x289115B7
--          Record                   0x298115B7
--          Play                     0x2A8115B7
--          Open                     0x29B195B7
--          KnobVolUp                0x000100FF
--          KnobVolDown              0x010000FF
--          KnobMute                 0x000008FF
--          Rewind                   0x2A8195B7
--          Pause                    0x2A9115B7
--          FastForward              0x2B8115B7
--          PrevChapter              0x2B9115B7
--          Stop                     0x2B9715B7
--          NextChapter              0x298195B7
-+          KEY_EXIT                 0x288195B7
-+          KEY_POWER                0x289115B7
-+          KEY_RECORD               0x298115B7
-+          KEY_PLAY                 0x2A8115B7
-+          KEY_OPEN                 0x29B195B7
-+          KEY_VOLUMEUP             0x000100FF
-+          KEYVOLUMEDOWN            0x010000FF
-+          KEY_MUTE                 0x000008FF
-+          KEY_REWIND               0x2A8195B7
-+          KEY_PAUSE                0x2A9115B7
-+          KEY_FASTFORWARD          0x2B8115B7
-+          KEY_PREVIOUS             0x2B9115B7
-+          KEY_STOP                 0x2B9715B7
-+          KEY_NEXT                 0x298195B7
-           WindowsKey               0x2B8195B7
--          Backspace                0x28A115B7
-+          KEY_BACKSPACE            0x28A115B7
-           MouseKeyboard            0x299115B7
--          SelectSpace              0x2A9315B7
-+          KEY_SELECT               0x2A9315B7
-           MouseMenu                0x28B715B7
--          MouseRightClick          0x688481B7
--          Enter                    0x28A195B7
--          MouseLeftClick           0x688301B7
--          CursorLeft               0x6ABA81B7
--          CursorUp                 0x6902F9B7
--          CursorRight              0x68A281B7
--          CursorDown               0x6882A1B7
-+          BTN_RIGHT                0x688481B7
-+          KEY_ENTER                0x28A195B7
-+          BTN_LEFT                 0x688301B7
-+          KEY_LEFT                 0x6ABA81B7
-+          KEY_UP                   0x6902F9B7
-+          KEY_RIGHT                0x68A281B7
-+          KEY_DOWN                 0x6882A1B7
- # version 2 of keypad
--          CursorUp                 0x2aa515b7
--          CursorDown               0x289515b7
--          CursorLeft               0x29a515b7
--          CursorRight              0x2ba515b7
-+          KEY_UP                   0x2aa515b7
-+          KEY_DOWN                 0x289515b7
-+          KEY_LEFT                 0x29a515b7
-+          KEY_RIGHT                0x2ba515b7
- # version 3 of keypad
--          CursorUp                 0x01008000
--          CursorDown               0x01007f00
--          CursorLeft               0x01000080
--          CursorRight              0x0100007f
--          Esc                      0x2BB715B7
--          Eject                    0x299395B7
-+          KEY_UP                   0x01008000
-+          KEY_DOWN                 0x01007f00
-+          KEY_LEFT                 0x01000080
-+          KEY_RIGHT                0x0100007f
-+          KEY_ESC                  0x2BB715B7
-+          KEY_EJECT                0x299395B7
-           AppLauncher              0x29B715B7
-           MultiMon                 0x2AB195B7
-           TaskSwitcher             0x2A9395B7
--          Mute                     0x2B9595B7
--          VolUp                    0x28A395B7
--          VolDown                  0x28A595B7
--          ChUp                     0x289395B7
--          ChDown                   0x288795B7
-+          KEY_MUTE                 0x2B9595B7
-+          KEY_VOLUMEUP             0x28A395B7
-+          KEY_VOLUMEDOWN           0x28A595B7
-+          KEY_CHANNELUP            0x289395B7
-+          KEY_CHANNELDOWN          0x288795B7
-           Timer                    0x2B8395B7
--          1                        0x28B595B7
--          2                        0x2BB195B7
--          3                        0x28B195B7
--          4                        0x2A8595B7
--          5                        0x299595B7
--          6                        0x2AA595B7
--          7                        0x2B9395B7
--          8                        0x2A8515B7
--          9                        0x2AA115B7
-+          KEY_1                    0x28B595B7
-+          KEY_2                    0x2BB195B7
-+          KEY_3                    0x28B195B7
-+          KEY_4                    0x2A8595B7
-+          KEY_5                    0x299595B7
-+          KEY_6                    0x2AA595B7
-+          KEY_7                    0x2B9395B7
-+          KEY_8                    0x2A8515B7
-+          KEY_9                    0x2AA115B7
-           ShiftTab                 0x28B515B7
--          0                        0x2BA595B7
--          Tab                      0x29A115B7
--          MyMovie                  0x2B8515B7
--          MyMusic                  0x299195B7
--          MyPhoto                  0x2BA115B7
--          MyTV                     0x28A515B7
--          Bookmark                 0x288515B7
-+          KEY_0                    0x2BA595B7
-+          KEY_TAB                  0x29A115B7
-+          KEY_VIDEO                0x2B8515B7
-+          KEY_AUDIO                0x299195B7
-+          KEY_PHOTO                0x2BA115B7
-+          KEY_TV                   0x28A515B7
-+          KEY_BOOKMARKS            0x288515B7
-           Thumbnail                0x2AB715B7
-           AspectRatio              0x29A595B7
-           FullScreen               0x2AA395B7
--          MyDVD                    0x29A295B7
--          Menu                     0x2BA385B7
-+          KEY_DVD                  0x29A295B7
-+          KEY_MENU                 0x2BA385B7
-           Caption                  0x298595B7
--          Language                 0x2B8595B7
--# these codes may be wrong, but they were included in the first version of
--# this config file
--          0                        0x2BA595BF
--          NextChapter              0x298195BF
--          Thumbnail                0x2AB715BF
--          FullScreen               0x2AA395BF
-+          KEY_LANGUAGE             0x2B8595B7
- 
-       end codes
- 
-Index: lirc-0.8.7pre2/remotes/imon/lircd.conf.imon-pad
-===================================================================
---- lirc-0.8.7pre2.orig/remotes/imon/lircd.conf.imon-pad
-+++ lirc-0.8.7pre2/remotes/imon/lircd.conf.imon-pad
-@@ -24,99 +24,99 @@ begin remote
- 
- 
-       begin codes
--          AppExit                  0x288195B7
--          Power                    0x289115B7
--          Record                   0x298115B7
--          Play                     0x2A8115B7
-+          KEY_EXIT                 0x288195B7
-+          KEY_POWER                0x289115B7
-+          KEY_RECORD               0x298115B7
-+          KEY_PLAY                 0x2A8115B7
-           SlowMotion               0x29B195B7
--          Rewind                   0x2A8195B7
--          Pause                    0x2A9115B7
--          FastForward              0x2B8115B7
--          PrevChapter              0x2B9115B7
--          Stop                     0x2B9715B7
--          NextChapter              0x298195B7
--          Esc                      0x2BB715B7
-+          KEY_REWIND               0x2A8195B7
-+          KEY_PAUSE                0x2A9115B7
-+          KEY_FASTFORWARD          0x2B8115B7
-+          KEY_PREVIOUS             0x2B9115B7
-+          KEY_STOP                 0x2B9715B7
-+          KEY_NEXT                 0x298195B7
-+          KEY_ESC                  0x2BB715B7
-           Eject                    0x299395B7
-           AppLauncher              0x29B715B7
-           MultiMon                 0x2AB195B7
-           TaskSwitcher             0x2A9395B7
--          Mute                     0x2B9595B7
--          Vol+                     0x28A395B7
--          Vol-                     0x28A595B7
--          Ch+                      0x289395B7
--          Ch-                      0x288795B7
-+          KEY_MUTE                 0x2B9595B7
-+          KEY_VOLUMEUP             0x28A395B7
-+          KEY_VOLUMEDOWN           0x28A595B7
-+          KEY_CHANNELUP            0x289395B7
-+          KEY_CHANNELDOWN          0x288795B7
-           Timer                    0x2B8395B7
--          1                        0x28B595B7
--          2                        0x2BB195B7
--          3                        0x28B195B7
--          4                        0x2A8595B7
--          5                        0x299595B7
--          6                        0x2AA595B7
--          7                        0x2B9395B7
--          8                        0x2A8515B7
--          9                        0x2AA115B7
--          0                        0x2BA595B7
-+          KEY_1                    0x28B595B7
-+          KEY_2                    0x2BB195B7
-+          KEY_3                    0x28B195B7
-+          KEY_4                    0x2A8595B7
-+          KEY_5                    0x299595B7
-+          KEY_6                    0x2AA595B7
-+          KEY_7                    0x2B9395B7
-+          KEY_8                    0x2A8515B7
-+          KEY_9                    0x2AA115B7
-+          KEY_0                    0x2BA595B7
-           ShiftTab                 0x28B515B7
--          Tab                      0x29A115B7
--          MyMovie                  0x2B8515B7
--          MyMusic                  0x299195B7
--          MyPhoto                  0x2BA115B7
--          MyTV                     0x28A515B7
--          Bookmark                 0x288515B7
-+          KEY_TAB                  0x29A115B7
-+          KEY_VIDEO                0x2B8515B7
-+          KEY_AUDIO                0x299195B7
-+          KEY_PHOTO                0x2BA115B7
-+          KEY_TV                   0x28A515B7
-+          KEY_BOOKMARKS            0x288515B7
-           Thumbnail                0x2AB715B7
-           AspectRatio              0x29A595B7
-           FullScreen               0x2AA395B7
- 
--          MyDVD                    0x29A295B7
--          Menu                     0x2BA385B7
-+          KEY_DVD                  0x29A295B7
-+          KEY_MENU                 0x2BA385B7
- # different codes
--          MyDVD                    0x29A3D5B7
--          Menu                     0x2BA3D5B7
-+          KEY_DVD                  0x29A3D5B7
-+          KEY_MENU                 0x2BA3D5B7
- 
-           Caption                  0x298595B7
--          Language                 0x2B8595B7
-+          KEY_LANGUAGE             0x2B8595B7
-           MouseKeyboard            0x299115B7
-           SelectSpace              0x2A9315B7
-           MouseMenu                0x28B715B7
--          MouseRightClick          0x688481B7
--          Enter                    0x28A195B7
--          MouseLeftClick           0x688301B7
-+          BTN_RIGHT                0x688481B7
-+          KEY_ENTER                0x28A195B7
-+          BTN_LEFT                 0x688301B7
-           WindowsKey               0x2B8195B7
--          Backspace                0x28A115B7
-+          KEY_BACKSPACE            0x28A115B7
- # Corrin added
--	  Space                    0x2B9B15F7
--          Up                       0xEB53F9B7
--          Left                     0x6ABAFFBF
--          Down                     0x6F9ECBB7
--          Right                    0x69A281B7
-+	  KEY_SPACE                0x2B9B15F7
-+          KEY_UP                   0xEB53F9B7
-+          KEY_LEFT                 0x6ABAFFBF
-+          KEY_DOWN                 0x6F9ECBB7
-+          KEY_RIGHT                0x69A281B7
- # Variants and additions of keys reported by Ryan Gardner
--          1                        0x0200001E
--          2                        0x0200001F
--          3                        0x02000020
--          4                        0x02000021
--          5                        0x02000022
--          6                        0x02000023
--          7                        0x02000024
--          8                        0x02000025
--          9                        0x02000026
-+          KEY_1                    0x0200001E
-+          KEY_2                    0x0200001F
-+          KEY_3                    0x02000020
-+          KEY_4                    0x02000021
-+          KEY_5                    0x02000022
-+          KEY_6                    0x02000023
-+          KEY_7                    0x02000024
-+          KEY_8                    0x02000025
-+          KEY_9                    0x02000026
-           Star                     0x02200025
--          0                        0x02000027
-+          KEY_0                    0x02000027
-           Hash                     0x02200020
--          Backspace                0x0200002A
--          Select                   0x0200002C
-+          KEY_BACKSPACE            0x0200002A
-+          KEY_SELECT               0x0200002C
-           LeftMenu                 0x02800000
-           RightMenu                0x02000065
--          Enter                    0x02000028
--          Escape                   0x02000029
--          LeftClick                0x01010000
--          RightClick               0x01020000
--          Up                       0x01008000
--          Down                     0x01007F00
--          Left                     0x01000080
--          Right                    0x0100007F
-+          KEY_ENTER                0x02000028
-+          KEY_ESC                  0x02000029
-+          BTN_LEFT                 0x01010000
-+          BTN_RIGHT                0x01020000
-+          KEY_UP                   0x01008000
-+          KEY_DOWN                 0x01007F00
-+          KEY_LEFT                 0x01000080
-+          KEY_RIGHT                0x0100007F
- # Variations on the mouse buttons from Jan Schneider
--          LeftClick                0x01010080
--          RightClick               0x01020080
-+          BTN_LEFT                 0x01010080
-+          BTN_RIGHT                0x01020080
- 
-       end codes
- 
-@@ -170,7 +170,7 @@ end remote
- 
- begin remote
- 
--  name     iMON-PAD
-+  name   iMON-PAD64
-   bits           64
-   eps            30
-   aeps          100
-@@ -182,98 +182,98 @@ begin remote
-   ignore_mask 0x00000000FFFFFFFF
- 
-       begin codes
--          AppExit                  0x288195B700002401
--          Power                    0x289115B700002401
--          Record                   0x298115B700002401
--          Play                     0x2A8115B700002401
-+          KEY_EXIT                 0x288195B700002401
-+          KEY_POWER                0x289115B700002401
-+          KEY_RECORD               0x298115B700002401
-+          KEY_PLAY                 0x2A8115B700002401
-           SlowMotion               0x29B195B700002401
--          Rewind                   0x2A8195B700002401
--          Pause                    0x2A9115B700002401
--          FastForward              0x2B8115B700002401
--          PrevChapter              0x2B9115B700002401
--          Stop                     0x2B9715B700002401
--          NextChapter              0x298195B700002401
--          Esc                      0x2BB715B700002401
--          Eject                    0x299395B700002401
-+          KEY_REWIND               0x2A8195B700002401
-+          KEY_PAUSE                0x2A9115B700002401
-+          KEY_FASTFORWARD          0x2B8115B700002401
-+          KEY_PREVIOUS             0x2B9115B700002401
-+          KEY_STOP                 0x2B9715B700002401
-+          KEY_NEXT                 0x298195B700002401
-+          KEY_ESC                  0x2BB715B700002401
-+          KEY_EJECT                0x299395B700002401
-           AppLauncher              0x29B715B700002401
-           MultiMon                 0x2AB195B700002401
-           TaskSwitcher             0x2A9395B700002401
--          Mute                     0x2B9595B700002401
--          Vol+                     0x28A395B700002401
--          Vol-                     0x28A595B700002401
--          Ch+                      0x289395B700002401
--          Ch-                      0x288795B700002401
-+          KEY_MUTE                 0x2B9595B700002401
-+          KEY_VOLUMEUP             0x28A395B700002401
-+          KEY_VOLUMEDOWN           0x28A595B700002401
-+          KEY_CHANNELUP            0x289395B700002401
-+          KEY_CHANNELDOWN          0x288795B700002401
-           Timer                    0x2B8395B700002401
--          1                        0x28B595B700002401
--          2                        0x2BB195B700002401
--          3                        0x28B195B700002401
--          4                        0x2A8595B700002401
--          5                        0x299595B700002401
--          6                        0x2AA595B700002401
--          7                        0x2B9395B700002401
--          8                        0x2A8515B700002401
--          9                        0x2AA115B700002401
--          0                        0x2BA595B700002401
-+          KEY_1                    0x28B595B700002401
-+          KEY_2                    0x2BB195B700002401
-+          KEY_3                    0x28B195B700002401
-+          KEY_4                    0x2A8595B700002401
-+          KEY_5                    0x299595B700002401
-+          KEY_6                    0x2AA595B700002401
-+          KEY_7                    0x2B9395B700002401
-+          KEY_8                    0x2A8515B700002401
-+          KEY_9                    0x2AA115B700002401
-+          KEY_0                    0x2BA595B700002401
-           ShiftTab                 0x28B515B700002401
--          Tab                      0x29A115B700002401
--          MyMovie                  0x2B8515B700002401
--          MyMusic                  0x299195B700002401
--          MyPhoto                  0x2BA115B700002401
--          MyTV                     0x28A515B700002401
--          Bookmark                 0x288515B700002401
-+          KEY_TAB                  0x29A115B700002401
-+          KEY_VIDEO                0x2B8515B700002401
-+          KEY_AUDIO                0x299195B700002401
-+          KEY_PHOTO                0x2BA115B700002401
-+          KEY_TV                   0x28A515B700002401
-+          KEY_BOOKMARKS            0x288515B700002401
-           Thumbnail                0x2AB715B700002401
-           AspectRatio              0x29A595B700002401
-           FullScreen               0x2AA395B700002401
- 
--          MyDVD                    0x29A295B700002401
--          Menu                     0x2BA385B700002401
-+          KEY_DVD                  0x29A295B700002401
-+          KEY_MENU                 0x2BA385B700002401
- # different codes
- # These codes are the button release codes, which will cause duplicate
- # events, so they are commented out here.
--#          MyDVD                    0x29A3D5B700002401
--#          Menu                     0x2BA3D5B700002401
-+#          KEY_DVD                  0x29A3D5B700002401
-+#          KEY_MENU                 0x2BA3D5B700002401
- 
-           Caption                  0x298595B700002401
--          Language                 0x2B8595B700002401
-+          KEY_LANGUAGE             0x2B8595B700002401
-           MouseKeyboard            0x299115B700002401
-           SelectSpace              0x2A9315B700002401
-           MouseMenu                0x28B715B700002401
--          MouseRightClick          0x688481B700002401
--          Enter                    0x28A195B700002401
--          MouseLeftClick           0x688301B700002401
-+          BTN_RIGHT                0x688481B700002401
-+          KEY_ENTER                0x28A195B700002401
-+          BTN_LEFT                 0x688301B700002401
-           WindowsKey               0x2B8195B700002401
--          Backspace                0x28A115B700002401
-+          KEY_BACKSPACE            0x28A115B700002401
- # Corrin added
--          Space                    0x2B9B15F700002401
--          Up                       0xEB53F9B700002401
--          Left                     0x6ABAFFBF00002401
--          Down                     0x6F9ECBB700002401
--          Right                    0x69A281B700002401
-+          KEY_SPACE                0x2B9B15F700002401
-+          KEY_UP                   0xEB53F9B700002401
-+          KEY_LEFT                 0x6ABAFFBF00002401
-+          KEY_DOWN                 0x6F9ECBB700002401
-+          KEY_RIGHT                0x69A281B700002401
- # Variants and additions of keys reported by Ryan Gardner
--          1                        0x0200001E00000000
--          2                        0x0200001F00000000
--          3                        0x0200002000000000
--          4                        0x0200002100000000
--          5                        0x0200002200000000
--          6                        0x0200002300000000
--          7                        0x0200002400000000
--          8                        0x0200002500000000
--          9                        0x0200002600000000
-+          KEY_1                    0x0200001E00000000
-+          KEY_2                    0x0200001F00000000
-+          KEY_3                    0x0200002000000000
-+          KEY_4                    0x0200002100000000
-+          KEY_5                    0x0200002200000000
-+          KEY_6                    0x0200002300000000
-+          KEY_7                    0x0200002400000000
-+          KEY_8                    0x0200002500000000
-+          KEY_9                    0x0200002600000000
-           Star                     0x0220002500000000
--          0                        0x0200002700000000
-+          KEY_0                    0x0200002700000000
-           Hash                     0x0220002000000000
--          Backspace                0x0200002A00000000
--          Select                   0x0200002C00000000
-+          KEY_BACKSPACE            0x0200002A00000000
-+          KEY_SELECT               0x0200002C00000000
-           LeftMenu                 0x0280000000000000
-           RightMenu                0x0200006500000000
--          Enter                    0x0200002800000000
--          Escape                   0x0200002900000000
--          LeftClick                0x0101000000000000
--          RightClick               0x0102000000000000
--          Up                       0x0100800000000000
--          Down                     0x01007F0000000000
--          Left                     0x0100008000000000
--          Right                    0x0100007F00000000
-+          KEY_ENTER                0x0200002800000000
-+          KEY_ESC                  0x0200002900000000
-+          BTN_LEFT                 0x0101000000000000
-+          BTN_RIGHT                0x0102000000000000
-+          KEY_UP                   0x0100800000000000
-+          KEY_DOWN                 0x01007F0000000000
-+          KEY_LEFT                 0x0100008000000000
-+          KEY_RIGHT                0x0100007F00000000
-       end codes
- 
- end remote
-Index: lirc-0.8.7pre2/remotes/imon/lircd.conf.imon-rsc
-===================================================================
---- lirc-0.8.7pre2.orig/remotes/imon/lircd.conf.imon-rsc
-+++ lirc-0.8.7pre2/remotes/imon/lircd.conf.imon-rsc
-@@ -27,48 +27,48 @@ begin remote
-   gap          100000
- 
-       begin codes
--          App.Exit           0x00000000000008F7
--          Power              0x000000000000F40B
-+          KEY_EXIT           0x00000000000008F7
-+          KEY_POWER              0x000000000000F40B
-           ScreenSaver        0x00000000000052AD
-           Timer              0x000000000000926D
--          1                  0x0000000000002AD5
--          2                  0x000000000000AA55
--          3                  0x0000000000006A95
--          4                  0x000000000000EA15
--          5                  0x0000000000001AE5
--          6                  0x0000000000009A65
--          7                  0x0000000000005AA5
--          8                  0x000000000000DA25
--          9                  0x0000000000003AC5
--          0                  0x000000000000BA45
-+          KEY_1                  0x0000000000002AD5
-+          KEY_2                  0x000000000000AA55
-+          KEY_3                  0x0000000000006A95
-+          KEY_4                  0x000000000000EA15
-+          KEY_5                  0x0000000000001AE5
-+          KEY_6                  0x0000000000009A65
-+          KEY_7                  0x0000000000005AA5
-+          KEY_8                  0x000000000000DA25
-+          KEY_9                  0x0000000000003AC5
-+          KEY_0                  0x000000000000BA45
-           Desktop            0x000000000000817E
--          Max/Res            0x00000000000041BE
--          Esc                0x00000000000012ED
-+          KEY_MAX            0x00000000000041BE
-+          KEY_ESC                0x00000000000012ED
-           Windows            0x000000000000D22D
--          Menu               0x000000000000C13E
-+          KEY_MENU               0x000000000000C13E
-           App.Launcher       0x000000000000A25D
-           Function           0x00000000000021DE
-           Task.Switcher      0x000000000000629D
--          Backspace          0x000000000000A15E
-+          KEY_BACKSPACE          0x000000000000A15E
-           Mouse/Keyboard     0x000000000000619E
--          Space              0x000000000000E11E
-+          KEY_SPACE              0x000000000000E11E
-           Shift.Tab          0x0000000000007887
--          Enter              0x00000000000019E6
--          Tab                0x000000000000F807
--          L.Click            0x000000000000d827
-+          KEY_ENTER              0x00000000000019E6
-+          KEY_TAB                0x000000000000F807
-+          BTN_LEFT            0x000000000000d827
-           DragNDrop          0x0000000000006897
--          R.Click            0x000000000000b847
--          Mute               0x00000000000011ee
--          Vol-               0x0000000000007a85
--          Vol+               0x000000000000fa05
--          Play               0x00000000000032cd
--          Pause              0x000000000000b24d
--          Open               0x000000000000f20d
--          Prev               0x0000000000000af5
--          Next               0x0000000000008a75
--          Stop               0x000000000000728d
--          Rew                0x0000000000004ab5
--          F.Fwd              0x000000000000ca35
-+          BTN_RIGHT            0x000000000000b847
-+          KEY_MUTE               0x00000000000011ee
-+          KEY_VOLUMEDOWN               0x0000000000007a85
-+          KEY_VOLUMEUP               0x000000000000fa05
-+          KEY_PLAY               0x00000000000032cd
-+          KEY_PAUSE              0x000000000000b24d
-+          KEY_OPEN               0x000000000000f20d
-+          KEY_PREVIOUS               0x0000000000000af5
-+          KEY_NEXT               0x0000000000008a75
-+          KEY_STOP               0x000000000000728d
-+          KEY_REWIND                0x0000000000004ab5
-+          KEY_FORWARD              0x000000000000ca35
-           Full.Screen        0x000000000000916e
-       end codes
- 
-Index: lirc-0.8.7pre2/remotes/iodata/lircd.conf.gvbctv5pci
-===================================================================
---- lirc-0.8.7pre2.orig/remotes/iodata/lircd.conf.gvbctv5pci
-+++ lirc-0.8.7pre2/remotes/iodata/lircd.conf.gvbctv5pci
-@@ -26,41 +26,41 @@ begin remote
- 
- 
-       begin codes
--          TV                       0x0000000000000042
--          FM                       0x0000000000000022
--          EPG                      0x0000000000000062
--          POWER                    0x0000000000000002
--          1                        0x0000000000000052
--          2                        0x0000000000000032
--          3                        0x0000000000000072
--          4                        0x000000000000004A
--          5                        0x000000000000002A
--          6                        0x000000000000006A
--          7                        0x000000000000005A
--          8                        0x000000000000003A
--          9                        0x000000000000007A
-+          KEY_TV                       0x0000000000000042
-+          KEY_RADIO                       0x0000000000000022
-+          KEY_EPG                      0x0000000000000062
-+          KEY_POWER                    0x0000000000000002
-+          KEY_1                        0x0000000000000052
-+          KEY_2                        0x0000000000000032
-+          KEY_3                        0x0000000000000072
-+          KEY_4                        0x000000000000004A
-+          KEY_5                        0x000000000000002A
-+          KEY_6                        0x000000000000006A
-+          KEY_7                        0x000000000000005A
-+          KEY_8                        0x000000000000003A
-+          KEY_9                        0x000000000000007A
-           10                       0x0000000000000046
-           11                       0x0000000000000026
-           12                       0x0000000000000066
-           LIVE                     0x0000000000000012
-           TIME_SHIFT               0x000000000000000A
--          PLAY                     0x000000000000001A
-+          KEY_PLAY                     0x000000000000001A
-           MULTI                    0x0000000000000006
--          VIDEO                    0x0000000000000056
--          SVIDEO                   0x000000000000004E
--          CHANNEL_PLUS             0x0000000000000036
--          CHANNEL_MINUS            0x000000000000002E
--          VOLUME_PLUS              0x0000000000000076
--          VOLUME_MINUS             0x000000000000006E
--          MUTE                     0x0000000000000016
-+          KEY_VIDEO                    0x0000000000000056
-+          KEY_VIDEO                   0x000000000000004E
-+          KEY_CHANNELUP             0x0000000000000036
-+          KEY_CHANNELDOWN            0x000000000000002E
-+          KEY_VOLUMEUP              0x0000000000000076
-+          KEY_VOLUMEDOWN             0x000000000000006E
-+          KEY_MUTE                     0x0000000000000016
-           PICTURE_SIZE             0x000000000000000E
--          PAUSE                    0x000000000000005E
--          HALT                     0x000000000000003E
--          RECORD                   0x000000000000007E
--          STOP                     0x000000000000001E
--          REWIND                   0x0000000000000043
-+          KEY_PAUSE                    0x000000000000005E
-+          KEY_POWER                     0x000000000000003E
-+          KEY_RECORD                   0x000000000000007E
-+          KEY_STOP                     0x000000000000001E
-+          KEY_REWIND                   0x0000000000000043
-           START                    0x0000000000000023
--          FORWARD                  0x0000000000000063
-+          KEY_FORWARD                  0x0000000000000063
-           SYNC                     0x0000000000000003
-       end codes
- 
-Index: lirc-0.8.7pre2/remotes/kanam_accent/lircd.conf.IR-100
-===================================================================
---- lirc-0.8.7pre2.orig/remotes/kanam_accent/lircd.conf.IR-100
-+++ lirc-0.8.7pre2/remotes/kanam_accent/lircd.conf.IR-100
-@@ -29,47 +29,47 @@ begin remote
- 
- 
-       begin codes
--          power                    0x62260942
--          eject                    0x62662409
--          1                        0x62662209
--          2                        0x22642209
--          3                        0x62641142
--          4                        0x62644209
--          5                        0x22624209
--          6                        0x62629142
--          7                        0x62628942
--          8                        0x22646409
--          9                        0x62646609
--          0                        0x22464226
--          win_key                  0x62664226
--          menu_key                 0x62660942
--          vol-                     0x22896642
--          vol+                     0x62622609
--          esc                      0x22662609
--          up                       0x22916642
--          close                    0x22994642
--          left                     0x22994242
--          ent                      0x22892642
--          right                    0x22914642
--          prev                     0x62996242
--          down                     0x22192699
--          next                     0x22660942
--          mute                     0x22622409
--          step                     0x62994C42
--          play                     0x22246426
--          stop                     0x6246894C
--          winamp                   0x62426409
--          mediaplayer              0x22664409
--          hdtv                     0x22992642
--          cdplayer                 0x62664609
--          windvd                   0x62992299
--          powerdvd                 0x62912242
--          internet                 0x62264626
--          email                    0x22998C99
--          b1                       0x22264426
--          b2                       0x22426209
--          b3                       0x62896442
--          b4                       0x22096642
-+          KEY_POWER                    0x62260942
-+          KEY_EJECTCD                  0x62662409
-+          KEY_1                        0x62662209
-+          KEY_2                        0x22642209
-+          KEY_3                        0x62641142
-+          KEY_4                        0x62644209
-+          KEY_5                        0x22624209
-+          KEY_6                        0x62629142
-+          KEY_7                        0x62628942
-+          KEY_8                        0x22646409
-+          KEY_9                        0x62646609
-+          KEY_0                        0x22464226
-+          KEY_WINDOWS                  0x62664226
-+          KEY_MENU                     0x62660942
-+          KEY_VOLUMEDOWN               0x22896642
-+          KEY_VOLUMEUP                 0x62622609
-+          KEY_ESC                      0x22662609
-+          KEY_UP                       0x22916642
-+          KEY_CLOSE                    0x22994642
-+          KEY_LEFT                     0x22994242
-+          ent                          0x22892642
-+          KEY_RIGHT                    0x22914642
-+          KEY_PREVIOUS                 0x62996242
-+          KEY_DOWN                     0x22192699
-+          KEY_NEXT                     0x22660942
-+          KEY_MUTE                     0x22622409
-+          step                         0x62994C42
-+          KEY_PLAY                     0x22246426
-+          KEY_STOP                     0x6246894C
-+          winamp                       0x62426409
-+          mediaplayer                  0x22664409
-+          KEY_TV                       0x22992642
-+          KEY_DVD                      0x62664609
-+          windvd                       0x62992299
-+          powerdvd                     0x62912242
-+          KEY_WWW                      0x62264626
-+          KEY_MAIL                     0x22998C99
-+          b1                           0x22264426
-+          b2                           0x22426209
-+          b3                           0x62896442
-+          b4                           0x22096642
-       end codes
- 
- end remote
-Index: lirc-0.8.7pre2/remotes/knc_one/lircd.conf.knc_one
-===================================================================
---- lirc-0.8.7pre2.orig/remotes/knc_one/lircd.conf.knc_one
-+++ lirc-0.8.7pre2/remotes/knc_one/lircd.conf.knc_one
-@@ -26,37 +26,37 @@ begin remote
- 
-       begin codes
-           TV/FM                    0x000000000000001C
--          OK                       0x0000000000000015
--          F1                       0x000000000000000B
--          POWER                    0x0000000000000012
-+          KEY_OK                       0x0000000000000015
-+          KEY_F1                       0x000000000000000B
-+          KEY_POWER                    0x0000000000000012
-           AV/TV                    0x0000000000000011
-           TELETEXT                 0x000000000000000F
-           FULLSCREEN               0x0000000000000013
--          MUTE                     0x0000000000000010
--          1                        0x0000000000000001
--          2                        0x0000000000000002
--          3                        0x0000000000000003
--          4                        0x0000000000000004
--          5                        0x0000000000000005
--          6                        0x0000000000000006
--          7                        0x0000000000000007
--          8                        0x0000000000000008
--          9                        0x0000000000000009
--          0                        0x0000000000000000
--          CH+                      0x000000000000001A
--          CH-                      0x000000000000001E
--          VOL+                     0x000000000000001B
--          VOL-                     0x000000000000001F
-+          KEY_MUTE                     0x0000000000000010
-+          KEY_1                        0x0000000000000001
-+          KEY_2                        0x0000000000000002
-+          KEY_3                        0x0000000000000003
-+          KEY_4                        0x0000000000000004
-+          KEY_5                        0x0000000000000005
-+          KEY_6                        0x0000000000000006
-+          KEY_7                        0x0000000000000007
-+          KEY_8                        0x0000000000000008
-+          KEY_9                        0x0000000000000009
-+          KEY_0                        0x0000000000000000
-+          KEY_CHANNELUP                      0x000000000000001A
-+          KEY_CHANNELDOWN                      0x000000000000001E
-+          KEY_VOLUMEUP                     0x000000000000001B
-+          KEY_VOLUMEDOWN                     0x000000000000001F
-           SNAPSHOT                 0x000000000000000A
-           100+                     0x0000000000000017
--          RECORD                   0x000000000000000D
--          PAUSE                    0x000000000000000E
--          PLAY                     0x000000000000001D
--          STOP                     0x0000000000000019
--          MENU                     0x0000000000000016
--          ESC                      0x0000000000000014
--          -                        0x0000000000000018
--          +                        0x000000000000000C
-+          KEY_RECORD                   0x000000000000000D
-+          KEY_PAUSE                    0x000000000000000E
-+          KEY_PLAY                     0x000000000000001D
-+          KEY_STOP                     0x0000000000000019
-+          KEY_MENU                     0x0000000000000016
-+          KEY_ESC                      0x0000000000000014
-+          KEY_KPMINUS                        0x0000000000000018
-+          KEY_KPPLUS                        0x000000000000000C
-       end codes
- 
- end remote
-Index: lirc-0.8.7pre2/remotes/kworld/lircd.conf.kworld
-===================================================================
---- lirc-0.8.7pre2.orig/remotes/kworld/lircd.conf.kworld
-+++ lirc-0.8.7pre2/remotes/kworld/lircd.conf.kworld
-@@ -29,36 +29,36 @@ begin remote
- 
- 
-       begin codes
--          power                    0x0000000000007887
-+          KEY_POWER                    0x0000000000007887
-           source                   0x000000000000E01F
-           scan                     0x00000000000038C7
--          mute                     0x00000000000018E7
-+          KEY_MUTE                     0x00000000000018E7
-           tv/fm                    0x000000000000C03F
--          1                        0x000000000000807F
--          2                        0x000000000000D02F
--          3                        0x000000000000D827
-+          KEY_1                        0x000000000000807F
-+          KEY_2                        0x000000000000D02F
-+          KEY_3                        0x000000000000D827
-           fm_scan+                 0x000000000000F807
--          4                        0x000000000000A05F
--          5                        0x000000000000906F
--          6                        0x000000000000A857
-+          KEY_4                        0x000000000000A05F
-+          KEY_5                        0x000000000000906F
-+          KEY_6                        0x000000000000A857
-           fm_scan-                 0x000000000000E817
--          7                        0x000000000000609F
--          8                        0x00000000000050AF
--          9                        0x00000000000048B7
-+          KEY_7                        0x000000000000609F
-+          KEY_8                        0x00000000000050AF
-+          KEY_9                        0x00000000000048B7
-           fm_freq+                 0x00000000000030CF
--          0                        0x00000000000040BF
--          +                        0x00000000000008F7
-+          KEY_0                        0x00000000000040BF
-+          KEY_KPPLUS                        0x00000000000008F7
-           recall                   0x000000000000C837
-           fm-freq-                 0x00000000000020DF
--          record                   0x00000000000000FF
--          stop                     0x00000000000010EF
--          play                     0x0000000000008877
-+          KEY_RECORD                   0x00000000000000FF
-+          KEY_STOP                     0x00000000000010EF
-+          KEY_PLAY                     0x0000000000008877
-           minimze                  0x000000000000F00F
--          ch+                      0x000000000000F807
--          zoom                     0x0000000000009867
--          vol-                     0x00000000000028D7
--          ch-                      0x000000000000E817
--          vol+                     0x0000000000006897
-+          KEY_CHANNELUP                      0x000000000000F807
-+          KEY_ZOOM                     0x0000000000009867
-+          KEY_VOLUMEDOWN                     0x00000000000028D7
-+          KEY_CHANNELDOWN                      0x000000000000E817
-+          KEY_VOLUMEUP                     0x0000000000006897
-           snapshot                 0x00000000000058A7
-           mts                      0x000000000000B04F
-           function-                0x00000000000020DF
-Index: lirc-0.8.7pre2/remotes/leadtek/lircd.conf.PVR2000
-===================================================================
---- lirc-0.8.7pre2.orig/remotes/leadtek/lircd.conf.PVR2000
-+++ lirc-0.8.7pre2/remotes/leadtek/lircd.conf.PVR2000
-@@ -18,54 +18,54 @@ begin remote
-   gap       120000
- 
-       begin codes
--          POWER                    0x0000000000000070
--          TV                       0x0000000000000026
--          FM                       0x0000000000000027
--          DVD                      0x0000000000000028
--          RED                      0x000000000000003B
--          GREEN                    0x000000000000003C
--          YELLOW                   0x000000000000003D
--          BLUE                     0x000000000000003E
-+          KEY_POWER                    0x0000000000000070
-+          KEY_TV                       0x0000000000000026
-+          KEY_RADIO                       0x0000000000000027
-+          KEY_DVD                      0x0000000000000028
-+          KEY_RED                      0x000000000000003B
-+          KEY_GREEN                    0x000000000000003C
-+          KEY_YELLOW                   0x000000000000003D
-+          KEY_BLUE                     0x000000000000003E
-           TELETEXT                 0x000000000000006F
--          SLEEP                    0x0000000000000030
--          MUTE                     0x0000000000000064
-+          KEY_SLEEP                    0x0000000000000030
-+          KEY_MUTE                     0x0000000000000064
-           BOSS_KEY                 0x0000000000000039
--          CH_UP                    0x000000000000007C
--          CH_DOWN                  0x0000000000000060
--          VOL_DOWN                 0x0000000000000078
--          VOL_UP                   0x0000000000000074
--          ENTER                    0x0000000000000063
-+          KEY_CHANNELUP                    0x000000000000007C
-+          KEY_CHANNELDOWN                  0x0000000000000060
-+          KEY_VOLUMEDOWN                 0x0000000000000078
-+          KEY_VOLUMEUP                   0x0000000000000074
-+          KEY_ENTER                    0x0000000000000063
-           CC                       0x0000000000000020
-           FULLSCREEN               0x0000000000000073
--          MENU                     0x000000000000003F
-+          KEY_MENU                     0x000000000000003F
-           SCAN                     0x0000000000000021
--          REPLAY                   0x0000000000000032
--          PLAY                     0x0000000000000033
--          SKIP                     0x0000000000000034
-+          KEY_AGAIN                   0x0000000000000032
-+          KEY_PLAY                     0x0000000000000033
-+          KEY_NEXT                     0x0000000000000034
-           OSD                      0x0000000000000022
--          BACK                     0x0000000000000024
--          STOP                     0x0000000000000036
--          FORWARD                  0x0000000000000025
--          LANGUAGE                 0x0000000000000023
--          1                        0x0000000000000075
--          2                        0x0000000000000076
--          3                        0x0000000000000077
--          4                        0x0000000000000079
--          5                        0x000000000000007A
--          6                        0x000000000000007B
--          7                        0x000000000000007D
--          8                        0x000000000000007E
--          9                        0x000000000000007F
--          0                        0x0000000000000062
--          .                        0x0000000000000031
-+          KEY_BACK                     0x0000000000000024
-+          KEY_STOP                     0x0000000000000036
-+          KEY_FORWARD                  0x0000000000000025
-+          KEY_LANGUAGE                 0x0000000000000023
-+          KEY_1                        0x0000000000000075
-+          KEY_2                        0x0000000000000076
-+          KEY_3                        0x0000000000000077
-+          KEY_4                        0x0000000000000079
-+          KEY_5                        0x000000000000007A
-+          KEY_6                        0x000000000000007B
-+          KEY_7                        0x000000000000007D
-+          KEY_8                        0x000000000000007E
-+          KEY_9                        0x000000000000007F
-+          KEY_0                        0x0000000000000062
-+          KEY_DOT                        0x0000000000000031
-           RECALL                   0x0000000000000061
--          VIDEO                    0x000000000000006E
--          AUDIO                    0x000000000000006B
-+          KEY_VIDEO                    0x000000000000006E
-+          KEY_AUDIO                    0x000000000000006B
-           DISPLAY                  0x0000000000000066
-           SNAPSHOT                 0x0000000000000038
-           PIP                      0x000000000000003A
-           RECSTOP                  0x0000000000000036
--          REC                      0x0000000000000037
-+          KEY_RECORD                      0x0000000000000037
-           TIMESHIFT                0x0000000000000035
- 
-       end codes
-Index: lirc-0.8.7pre2/remotes/leadtek/lircd.conf.RM-0007
-===================================================================
---- lirc-0.8.7pre2.orig/remotes/leadtek/lircd.conf.RM-0007
-+++ lirc-0.8.7pre2/remotes/leadtek/lircd.conf.RM-0007
-@@ -44,43 +44,43 @@ begin remote
- 
-       begin codes
- # 1st row of buttons
--          POWER                    0x00000000000000FF
--          MENU                     0x000000000000807F
--          FM                       0x00000000000040BF
-+          KEY_POWER                    0x00000000000000FF
-+          KEY_MENU                     0x000000000000807F
-+          KEY_RADIO                       0x00000000000040BF
-           PC/TV                    0x000000000000C03F
- # volume/channel
--          VOL_UP                   0x00000000000020DF
--          VOL_DOWN                 0x00000000000010EF
--          CH_UP                    0x00000000000030CF
--          CH_DOWN                  0x00000000000008F7
-+          KEY_VOLUMEUP                   0x00000000000020DF
-+          KEY_VOLUMEDOWN                 0x00000000000010EF
-+          KEY_CHANNELUP                    0x00000000000030CF
-+          KEY_CHANNELDOWN                  0x00000000000008F7
- # numbers pad
--          1                        0x000000000000A05F
--          2                        0x000000000000609F
--          3                        0x000000000000E01F
--          4                        0x000000000000906F
--          5                        0x00000000000050AF
--          6                        0x000000000000D02F
--          7                        0x000000000000B04F
--          8                        0x000000000000708F
--          9                        0x000000000000F00F
-+          KEY_1                        0x000000000000A05F
-+          KEY_2                        0x000000000000609F
-+          KEY_3                        0x000000000000E01F
-+          KEY_4                        0x000000000000906F
-+          KEY_5                        0x00000000000050AF
-+          KEY_6                        0x000000000000D02F
-+          KEY_7                        0x000000000000B04F
-+          KEY_8                        0x000000000000708F
-+          KEY_9                        0x000000000000F00F
-           RETURN                   0x0000000000008877
--          0                        0x00000000000048B7
-+          KEY_0                        0x00000000000048B7
-           DISPLAY                  0x000000000000C837
- # unknown icon buttons
--          HELP                     0x00000000000038C7
-+          KEY_HELP                     0x00000000000038C7
-           SCAN                     0x000000000000A857
-           OSD                      0x0000000000006897
--          OPTIONS                  0x000000000000E817
-+          KEY_OPTION                  0x000000000000E817
- # labeled buttons
--          MUTE                     0x00000000000028D7
-+          KEY_MUTE                     0x00000000000028D7
-           MTS                      0x000000000000D827
--          VIDEO                    0x0000000000007887
-+          KEY_VIDEO                    0x0000000000007887
-           CC                       0x000000000000F807
- # color dots buttons
--          RED                      0x00000000000018E7
--          GREEN                    0x0000000000009867
--          YELLOW                   0x00000000000058A7
--          BLUE                     0x000000000000B847
-+          KEY_RED                      0x00000000000018E7
-+          KEY_GREEN                    0x0000000000009867
-+          KEY_YELLOW                   0x00000000000058A7
-+          KEY_BLUE                     0x000000000000B847
-       end codes
- 
- end remote
-Index: lirc-0.8.7pre2/remotes/leadtek/lircd.conf.RM-0010
-===================================================================
---- lirc-0.8.7pre2.orig/remotes/leadtek/lircd.conf.RM-0010
-+++ lirc-0.8.7pre2/remotes/leadtek/lircd.conf.RM-0010
-@@ -43,69 +43,69 @@ begin remote
-   duty_cycle   33
- 
-       begin codes
--          POWER                    0x00000000000000FF
-+          KEY_POWER                    0x00000000000000FF
-           TV/FM                    0x00000000000040BF
-           SCAN                     0x000000000000A857
-           DISPLAY                  0x0000000000006897
--          1                        0x000000000000A05F
--          2                        0x000000000000609F
--          3                        0x000000000000E01F
--          4                        0x000000000000906F
--          5                        0x00000000000050AF
--          6                        0x000000000000D02F
--          7                        0x000000000000B04F
--          8                        0x000000000000708F
--          9                        0x000000000000F00F
--          0                        0x00000000000048B7
-+          KEY_1                        0x000000000000A05F
-+          KEY_2                        0x000000000000609F
-+          KEY_3                        0x000000000000E01F
-+          KEY_4                        0x000000000000906F
-+          KEY_5                        0x00000000000050AF
-+          KEY_6                        0x000000000000D02F
-+          KEY_7                        0x000000000000B04F
-+          KEY_8                        0x000000000000708F
-+          KEY_9                        0x000000000000F00F
-+          KEY_0                        0x00000000000048B7
-           RECALL                   0x0000000000008877
--          ENTER                    0x000000000000C837
-+          KEY_ENTER                    0x000000000000C837
-           CC                       0x000000000000F807
-           MTS                      0x000000000000D827
-           FINE_DOWN                0x0000000000009867
-           FINE_UP                  0x00000000000018E7
--          VIDEO                    0x0000000000007887
--          MUTE                     0x00000000000028D7
--          CH_UP                    0x00000000000030CF
--          CH_DOWN                  0x00000000000008F7
--          VOL_DOWN                 0x00000000000010EF
--          VOL_UP                   0x00000000000020DF
-+          KEY_VIDEO                    0x0000000000007887
-+          KEY_MUTE                     0x00000000000028D7
-+          KEY_CHANNELUP                    0x00000000000030CF
-+          KEY_CHANNELDOWN                  0x00000000000008F7
-+          KEY_VOLUMEDOWN                 0x00000000000010EF
-+          KEY_VOLUMEUP                   0x00000000000020DF
-           FULLSCREEN               0x000000000000C03F
- 
- # The following are only supported by the remote control bundled with
- # the WinFast TV 2000 XP Deluxe card.
- 
--          SLEEP                    0x00000000000002FD
-+          KEY_SLEEP                    0x00000000000002FD
-           BOSS_KEY                 0x000000000000926D
--          RED                      0x000000000000D22D
--          GREEN                    0x00000000000032CD
--          YELLOW                   0x000000000000B24D
--          BLUE                     0x000000000000728D
-+          KEY_RED                      0x000000000000D22D
-+          KEY_GREEN                    0x00000000000032CD
-+          KEY_YELLOW                   0x000000000000B24D
-+          KEY_BLUE                     0x000000000000728D
-           PIP                      0x00000000000052AD
--          .                        0x000000000000827D
--          BACK                     0x00000000000042BD
--          PLAY                     0x000000000000C23D
--          NEXT                     0x00000000000022DD
-+          KEY_DOT                        0x000000000000827D
-+          KEY_BACK                     0x00000000000042BD
-+          KEY_PLAY                     0x000000000000C23D
-+          KEY_NEXT                     0x00000000000022DD
-           TIMESHIFT                0x000000000000A25D
--          STOP                     0x000000000000629D
--          REC                      0x000000000000E21D
-+          KEY_STOP                     0x000000000000629D
-+          KEY_RECORD                      0x000000000000E21D
-           SNAPSHOT                 0x00000000000012ED
- 
- # Only found on CoolCommand remote
- 
--          REPEAT                   0x000000000000884B
-+          KEY_AGAIN                   0x000000000000884B
-           TELETEXT                 0x000000000000F807
--          TV                       0x0000000000006A95
--          FM                       0x000000000000EA15
--          DVD                      0x0000000000001AE5
-+          KEY_TV                       0x0000000000006A95
-+          KEY_RADIO                       0x000000000000EA15
-+          KEY_DVD                      0x0000000000001AE5
-           CLEAR(C)                 0x0000000000000AF5
--          MENU                     0x000000000000F20D
-+          KEY_MENU                     0x000000000000F20D
-           CH_SURF                  0x0000000000008A75
--          ENTER                    0x000000000000C837
--          AUDIO                    0x000000000000D827
-+          KEY_ENTER                    0x000000000000C837
-+          KEY_AUDIO                    0x000000000000D827
-           CC                       0x0000000000004AB5
--          REW                      0x0000000000002AD5
--          STOP                     0x000000000000629D
--          FFW                      0x000000000000AA55
-+          KEY_REWIND                      0x0000000000002AD5
-+          KEY_STOP                     0x000000000000629D
-+          KEY_FASTFORWARD                      0x000000000000AA55
-       end codes
- 
- end remote
-Index: lirc-0.8.7pre2/remotes/life-view/lircd.conf.flyvideo
-===================================================================
---- lirc-0.8.7pre2.orig/remotes/life-view/lircd.conf.flyvideo
-+++ lirc-0.8.7pre2/remotes/life-view/lircd.conf.flyvideo
-@@ -35,50 +35,50 @@ begin remote
-   duty_cycle   33
- 
-       begin codes
--          0                        0x000000000000F00F
--          1                        0x000000000000C03F
--          2                        0x00000000000020DF
--          3                        0x000000000000A05F
--          4                        0x000000000000E01F
--          5                        0x00000000000010EF
--          6                        0x000000000000906F
--          7                        0x000000000000D02F
--          8                        0x00000000000030CF
--          9                        0x000000000000B04F
--          POWER                    0x00000000000000FF
--          MOUSE_MODE               0x000000000000807F
-+          KEY_0                        0x000000000000F00F
-+          KEY_1                        0x000000000000C03F
-+          KEY_2                        0x00000000000020DF
-+          KEY_3                        0x000000000000A05F
-+          KEY_4                        0x000000000000E01F
-+          KEY_5                        0x00000000000010EF
-+          KEY_6                        0x000000000000906F
-+          KEY_7                        0x000000000000D02F
-+          KEY_8                        0x00000000000030CF
-+          KEY_9                        0x000000000000B04F
-+          KEY_POWER                    0x00000000000000FF
-+          BTN_MODE               0x000000000000807F
-           FULL_SCREEN              0x00000000000040BF
--          CHAN_PLUS                0x00000000000048B7
--          CHAN_MINUS               0x000000000000C837
--          CANCEL                   0x000000000000F807
--          ENTER                    0x00000000000008F7
--          VOL_PLUS                 0x00000000000028D7
--          VOL_MINUS                0x000000000000E817
--          MENU                     0x000000000000609F
--          UP                       0x000000000000708F
--          DOWN                     0x0000000000009867
--          LEFT                     0x000000000000609F
--          RIGHT                    0x000000000000A857
-+          KEY_CHANNELUP                0x00000000000048B7
-+          KEY_CHANNELDOWN               0x000000000000C837
-+          KEY_CANCEL                   0x000000000000F807
-+          KEY_ENTER                    0x00000000000008F7
-+          KEY_VOLUMEUP                 0x00000000000028D7
-+          KEY_VOLUMEDOWN                0x000000000000E817
-+          KEY_MENU                     0x000000000000609F
-+          KEY_UP                       0x000000000000708F
-+          KEY_DOWN                     0x0000000000009867
-+          KEY_LEFT                     0x000000000000609F
-+          KEY_RIGHT                    0x000000000000A857
-           INC                      0x00000000000050AF
-           DEC                      0x0000000000006897
--          ESC                      0x00000000000058A7
--          MUTE                     0x000000000000D827
-+          KEY_ESC                      0x00000000000058A7
-+          KEY_MUTE                     0x000000000000D827
-           RETURN                   0x00000000000018E7
-           CENTER                   0x000000000000C837
- 
-           CHANELS	           0x00000000000047B8
-           REV                      0x0000000000008778
--          FWD                      0x000000000000C738
--          VIDEO                    0x0000000000008877
-+          KEY_FORWARD                      0x000000000000C738
-+          KEY_VIDEO                    0x0000000000008877
- 
- # from FlyVideo II config file
--          Audio                    0x000000000000A857
-+          KEY_AUDIO                    0x000000000000A857
- # newly added by Jarek Zuk
-           SQUARE                   0x000000000000B847
-           TAB_LEFT                 0x0000000000007887
-           TAB_RIGHT                0x00000000000038C7
-           CENTER                   0x000000000000C837
--          LEFT                     0x00000000000048B7
-+          KEY_LEFT                     0x00000000000048B7
-  
-       end codes
- 
-Index: lirc-0.8.7pre2/remotes/logitech/lircd.conf.logitech
-===================================================================
---- lirc-0.8.7pre2.orig/remotes/logitech/lircd.conf.logitech
-+++ lirc-0.8.7pre2/remotes/logitech/lircd.conf.logitech
-@@ -23,41 +23,41 @@ begin remote
-   repeat_bit      0
- 
-       begin codes
--          POWER                    0x0000000000000002
--          1                        0x0000000000000015
--          2                        0x0000000000000016
--          3                        0x0000000000000014
--          4                        0x0000000000000018
--          5                        0x0000000000000019
--          6                        0x0000000000000017
--          7                        0x000000000000001C
--          8                        0x000000000000001B
--          9                        0x000000000000001A
--          0                        0x000000000000001D
--          PAUSE                    0x0000000000000013
--          EJECT                    0x0000000000000011
-+          KEY_POWER                    0x0000000000000002
-+          KEY_1                        0x0000000000000015
-+          KEY_2                        0x0000000000000016
-+          KEY_3                        0x0000000000000014
-+          KEY_4                        0x0000000000000018
-+          KEY_5                        0x0000000000000019
-+          KEY_6                        0x0000000000000017
-+          KEY_7                        0x000000000000001C
-+          KEY_8                        0x000000000000001B
-+          KEY_9                        0x000000000000001A
-+          KEY_0                        0x000000000000001D
-+          KEY_PAUSE                    0x0000000000000013
-+          KEY_EJECTCD                    0x0000000000000011
-           SEEK-                    0x000000000000000E
--          PLAY                     0x000000000000000F
-+          KEY_PLAY                     0x000000000000000F
-           SEEK+                    0x0000000000000010
--          STOP                     0x0000000000000012
--          HELP                     0x0000000000000001
--          CH-                      0x000000000000000D
--          CH+                      0x000000000000000A
--          VOL-                     0x000000000000000C
--          VOL+                     0x0000000000000009
-+          KEY_STOP                     0x0000000000000012
-+          KEY_HELP                     0x0000000000000001
-+          KEY_CHANNELDOWN                      0x000000000000000D
-+          KEY_CHANNELUP                      0x000000000000000A
-+          KEY_VOLUMEDOWN                     0x000000000000000C
-+          KEY_VOLUMEUP                     0x0000000000000009
-           *			   0x000000000000001F
-           #			   0x000000000000001E
--          MUTE			   0x000000000000000B
-+          KEY_MUTE			   0x000000000000000B
-           BUTTONL_DOWN		   0x0000000000000039
- 	  BUTTONR_DOWN		   0x000000000000003A
--          BUTTON_UP		   0x0000000000000038
--          ENTER			   0x0000000000000008
--          CLOSE			   0x0000000000000023
--          TV			   0x0000000000000004
-+          KEY_UP		   0x0000000000000038
-+          KEY_ENTER			   0x0000000000000008
-+          KEY_CLOSE			   0x0000000000000023
-+          KEY_TV			   0x0000000000000004
-           GDE			   0x0000000000000005
--          CD			   0x0000000000000006
-+          KEY_CD			   0x0000000000000006
-           MSG			   0x0000000000000007
--          PHONE			   0x0000000000000003
-+          KEY_PHONE			   0x0000000000000003
-           MOUSE_N		   0x0000000000000040
-           MOUSE_NNE		   0x0000000000000041
-           MOUSE_NE		   0x0000000000000042
-Index: lirc-0.8.7pre2/remotes/mceusb/lircd.conf.mceusb
-===================================================================
---- lirc-0.8.7pre2.orig/remotes/mceusb/lircd.conf.mceusb
-+++ lirc-0.8.7pre2/remotes/mceusb/lircd.conf.mceusb
-@@ -1,7 +1,8 @@
- #
--# brand:                        HP 
--# model no. of remote control:  TSGH-IR01
--# devices being controlled by this remote: HP Slimline S3100y
-+# brand:                        HP/Philips/Microsoft/Other
-+# model no. of remote control:  Media Center Edition remote
-+# devices being controlled by this remote: HP Slimline S3100y and a
-+# myriad of devices with Media Center Edition receivers
- #
- # RC-6 config file
- #
-@@ -59,10 +60,10 @@ begin remote
- 
- 
- #unused by HP remote
--	Blue	      0x00007ba1
--	Yellow	      0x00007ba2
--	Green	      0x00007ba3
--	Red	      0x00007ba4
-+	KEY_BLUE	      0x00007ba1
-+	KEY_YELLOW	      0x00007ba2
-+	KEY_GREEN	      0x00007ba3
-+	KEY_RED	      0x00007ba4
- 	Teletext      0x00007ba5
- 
- #ba6 - bae unused 
-@@ -76,7 +77,7 @@ begin remote
-         BAD           0x00007bad
-         BAE           0x00007bae
- 
--        Radio         0x00007baf
-+        KEY_RADIO         0x00007baf
-         Print         0x00007bb1
- 
- #bb2 - bb4 unused  
-@@ -84,11 +85,11 @@ begin remote
-         BB3           0x00007bb3
-         BB4           0x00007bb4
- 
--        Videos        0x00007bb5
-+        KEY_VIDEO        0x00007bb5
-         Pictures      0x00007bb6
-         RecTV         0x00007bb7
--        Music         0x00007bb8
--        TV            0x00007bb9
-+        KEY_AUDIO         0x00007bb8
-+        KEY_TV            0x00007bb9
- 
- #bba - bbf unused 
-         BBA           0x00007bba
-@@ -109,7 +110,7 @@ begin remote
-         BC9           0x00007bc9
-         BCA           0x00007bca
- 
--        Eject         0x00007bcb
-+        KEY_EJECTCD         0x00007bcb
-         SlideShow     0x00007bcc
-         Visualization 0x00007bcd
- 
-@@ -128,50 +129,50 @@ begin remote
-         Aspect        0x00007bd8
-         Guide         0x00007bd9
-         LiveTV        0x00007bda
--        DVD           0x00007bdb
-+        KEY_DVD           0x00007bdb
- #NoGap
--        Back          0x00007bdc
--        OK            0x00007bdd
--        Right         0x00007bde
--        Left          0x00007bdf
--        Down          0x00007be0
--        Up            0x00007be1
-+        KEY_BACK          0x00007bdc
-+        KEY_OK            0x00007bdd
-+        KEY_RIGHT         0x00007bde
-+        KEY_LEFT          0x00007bdf
-+        KEY_DOWN          0x00007be0
-+        KEY_UP            0x00007be1
- #NoGap
-         Star          0x00007be2
-         Hash          0x00007be3
- #NoGap
--        Replay        0x00007be4
--        Skip          0x00007be5
--        Stop          0x00007be6
--        Pause         0x00007be7
--        Record        0x00007be8
--        Play          0x00007be9
--        Rewind        0x00007bea
--        Forward       0x00007beb
-+        KEY_AGAIN        0x00007be4
-+        KEY_NEXT          0x00007be5
-+        KEY_STOP          0x00007be6
-+        KEY_PAUSE         0x00007be7
-+        KEY_RECORD        0x00007be8
-+        KEY_PLAY          0x00007be9
-+        KEY_REWIND        0x00007bea
-+        KEY_FORWARD       0x00007beb
- #NoGap
--        ChanDown      0x00007bec
--        ChanUp        0x00007bed
--        VolDown       0x00007bee
--        VolUp         0x00007bef
-+        KEY_CHANNELDOWN      0x00007bec
-+        KEY_CHANNELUP        0x00007bed
-+        KEY_VOLUMEDOWN       0x00007bee
-+        KEY_VOLUMEUP         0x00007bef
- #NoGap
-         More          0x00007bf0
--        Mute          0x00007bf1
--        Home          0x00007bf2
--        Power         0x00007bf3
-+        KEY_MUTE          0x00007bf1
-+        KEY_HOME          0x00007bf2
-+        KEY_POWER         0x00007bf3
- #NoGap
--        Enter         0x00007bf4
--        Clear         0x00007bf5
-+        KEY_ENTER         0x00007bf4
-+        KEY_CLEAR         0x00007bf5
- #NoGap
--        Nine          0x00007bf6
--        Eight         0x00007bf7
--        Seven         0x00007bf8
--        Six           0x00007bf9
--        Five          0x00007bfa
--        Four          0x00007bfb
--        Three         0x00007bfc
--        Two           0x00007bfd
--        One           0x00007bfe
--        Zero          0x00007bff
-+        KEY_9          0x00007bf6
-+        KEY_8         0x00007bf7
-+        KEY_7         0x00007bf8
-+        KEY_6           0x00007bf9
-+        KEY_5          0x00007bfa
-+        KEY_4          0x00007bfb
-+        KEY_3         0x00007bfc
-+        KEY_2           0x00007bfd
-+        KEY_1           0x00007bfe
-+        KEY_0          0x00007bff
-       end codes
- 
- end remote
-Index: lirc-0.8.7pre2/remotes/packard_bell/lircd.conf.packard_bell
-===================================================================
---- lirc-0.8.7pre2.orig/remotes/packard_bell/lircd.conf.packard_bell
-+++ lirc-0.8.7pre2/remotes/packard_bell/lircd.conf.packard_bell
-@@ -53,38 +53,38 @@ begin remote
-   repeat          9050 2250
-  
-       begin codes
--          Help                     0x0000000000006F90
--          Phone                    0x0000000000004FB0
-+          KEY_HELP                     0x0000000000006F90
-+          KEY_PHONE                    0x0000000000004FB0
-           Message                  0x0000000000006E91
-           SRS                      0x0000000000004EB1
--          CD                       0x0000000000002FD0
--          Aux1                     0x0000000000000FF0
-+          KEY_CD                       0x0000000000002FD0
-+          KEY_AUX                     0x0000000000000FF0
-           Aux2                     0x0000000000002ED1
-           Aux3                     0x0000000000000EF1
-           LMB                      0x00000000000023DC
-           RMB                      0x000000000000639C
--          Up                       0x00000000000037C8
--          Down                     0x00000000000057A8
--          Left                     0x0000000000007788
--          Right                    0x00000000000017E8
--          Menu                     0x0000000000007B84
--          Mute                     0x0000000000003BC4
--          Enter                    0x00000000000047B8
--          CHUp                     0x00000000000027D8
--          CHDown                   0x0000000000006798
--          VolUp                    0x0000000000005BA4
--          VolDown                  0x0000000000001BE4
-+          KEY_UP                       0x00000000000037C8
-+          KEY_DOWN                     0x00000000000057A8
-+          KEY_LEFT                     0x0000000000007788
-+          KEY_RIGHT                    0x00000000000017E8
-+          KEY_MENU                     0x0000000000007B84
-+          KEY_MUTE                     0x0000000000003BC4
-+          KEY_ENTER                    0x00000000000047B8
-+          KEY_CHANNELUP                     0x00000000000027D8
-+          KEY_CHANNELDOWN                   0x0000000000006798
-+          KEY_VOLUMEUP                    0x0000000000005BA4
-+          KEY_VOLUMEDOWN                  0x0000000000001BE4
-           Display                  0x00000000000007F8
--          One                      0x0000000000005EA1
--          Two                      0x0000000000001EE1
--          Three                    0x0000000000000BF4
--          Four                     0x0000000000007E81
--          Five                     0x0000000000003EC1
--          Six                      0x0000000000004BB4
--          Seven                    0x0000000000005FA0
--          Eight                    0x0000000000001FE0
--          Nine                     0x0000000000002BD4
--          Zero                     0x0000000000003FC0
-+          KEY_1                      0x0000000000005EA1
-+          KEY_2                      0x0000000000001EE1
-+          KEY_3                    0x0000000000000BF4
-+          KEY_4                     0x0000000000007E81
-+          KEY_5                     0x0000000000003EC1
-+          KEY_6                      0x0000000000004BB4
-+          KEY_7                    0x0000000000005FA0
-+          KEY_8                    0x0000000000001FE0
-+          KEY_9                     0x0000000000002BD4
-+          KEY_0                     0x0000000000003FC0
-           Star                     0x0000000000007F80
-           Hash                     0x0000000000006B94
-       end codes
-Index: lirc-0.8.7pre2/remotes/pcmak/lircd.conf.pcmak
-===================================================================
---- lirc-0.8.7pre2.orig/remotes/pcmak/lircd.conf.pcmak
-+++ lirc-0.8.7pre2/remotes/pcmak/lircd.conf.pcmak
-@@ -23,18 +23,18 @@ begin remote
-   repeat_bit      0
- 
-       begin codes
--          HOME                     0x0000000000000001
--          ARROW_UP                 0x0000000000000002
-+          KEY_HOME                     0x0000000000000001
-+          KEY_UP                 0x0000000000000002
-           PG_UP                    0x0000000000000003
--          ARROW_LEFT               0x0000000000000004
--          ENTER                    0x0000000000000005
--          ARROW_RIGHT              0x0000000000000006
--          END                      0x0000000000000007
--          ARROW_DOWN               0x0000000000000008
-+          KEY_LEFT               0x0000000000000004
-+          KEY_ENTER                    0x0000000000000005
-+          KEY_RIGHT              0x0000000000000006
-+          KEY_END                      0x0000000000000007
-+          KEY_DOWN               0x0000000000000008
-           PG_DN                    0x0000000000000009
--          SPACE                    0x000000000000000A
--          TAB                      0x000000000000000B
--          ESC                      0x000000000000000C
-+          KEY_SPACE                    0x000000000000000A
-+          KEY_TAB                      0x000000000000000B
-+          KEY_ESC                      0x000000000000000C
-           ALT                      0x000000000000000D
-           PLAYLIST                 0x000000000000000E
-           LOAD                     0x000000000000000F
-@@ -49,36 +49,36 @@ begin remote
-           FULLSCREEN               0x0000000000000018
-           BUTTONL_DOWN             0x0000000000000019
-           BUTTONR_DOWN             0x000000000000001A
--          POWER                    0x000000000000001B
--          A                        0x000000000000001C
--          B                        0x000000000000001D
--          C                        0x000000000000001E
--          D                        0x000000000000001F
--          VOL_DOWN                 0x0000000000000020
--          MUTE                     0x0000000000000021
--          VOL_UP                   0x0000000000000022
--          PLAY                     0x0000000000000024
--    	  PREV                     0x0000000000000026
--          PAUSE                    0x0000000000000027
--          NEXT                     0x0000000000000028
-+          KEY_POWER                    0x000000000000001B
-+          KEY_A                        0x000000000000001C
-+          KEY_B                        0x000000000000001D
-+          KEY_C                        0x000000000000001E
-+          KEY_D                        0x000000000000001F
-+          KEY_VOLUMEDOWN                 0x0000000000000020
-+          KEY_MUTE                     0x0000000000000021
-+          KEY_VOLUMEUP                   0x0000000000000022
-+          KEY_PLAY                     0x0000000000000024
-+    	  KEY_PREVIOUS                     0x0000000000000026
-+          KEY_PAUSE                    0x0000000000000027
-+          KEY_NEXT                     0x0000000000000028
-           SKIP_BACK                0x0000000000000029
--          STOP                     0x000000000000002A
-+          KEY_STOP                     0x000000000000002A
-           SKIP_FORW                0x000000000000002B
--          1                        0x0000000000000041
--          2                        0x0000000000000042
--          3                        0x0000000000000043
--          4                        0x0000000000000044
--          5                        0x0000000000000045
--          6                        0x0000000000000046
--          7                        0x0000000000000047
--          8                        0x0000000000000048
--          9                        0x0000000000000049
--          0                        0x000000000000004A
--          sTAB                     0x000000000000004B
--          sESC                     0x000000000000004C
-+          KEY_1                        0x0000000000000041
-+          KEY_2                        0x0000000000000042
-+          KEY_3                        0x0000000000000043
-+          KEY_4                        0x0000000000000044
-+          KEY_5                        0x0000000000000045
-+          KEY_6                        0x0000000000000046
-+          KEY_7                        0x0000000000000047
-+          KEY_8                        0x0000000000000048
-+          KEY_9                        0x0000000000000049
-+          KEY_0                        0x000000000000004A
-+          KEY_TAB                     0x000000000000004B
-+          KEY_ESC                     0x000000000000004C
-           sALT                     0x000000000000004D
-           sPLAYLIST                0x000000000000004E
--          TXT                      0x000000000000004F
-+          KEY_TEXT                      0x000000000000004F
-           sMOUSE_N                 0x0000000000000050
-           sMOUSE_NE                0x0000000000000051
-           sMOUSE_E                 0x0000000000000052
-@@ -87,30 +87,30 @@ begin remote
-           sMOUSE_SW                0x0000000000000055
-           sMOUSE_W                 0x0000000000000056
-           sMOUSE_NW                0x0000000000000057
--          sOK                      0x0000000000000058
-+          KEY_OK                      0x0000000000000058
-           BUTTONL_UP               0x0000000000000059
-           BUTTONR_UP               0x000000000000005A
--          EXIT                     0x000000000000005B
--          E                        0x000000000000005C
--          F                        0x000000000000005D
--          G                        0x000000000000005E
--          H                        0x000000000000005F
--          sVOL_DOWN                0x0000000000000060
--          sMUTE                    0x0000000000000061
--          sVOL_UP                  0x0000000000000062
--          sPLAY                    0x0000000000000064
--          sPREV                    0x0000000000000066
--          sPAUSE                   0x0000000000000067
--          sNEXT                    0x0000000000000068
-+          KEY_EXIT                     0x000000000000005B
-+          KEY_E                        0x000000000000005C
-+          KEY_F                        0x000000000000005D
-+          KEY_G                        0x000000000000005E
-+          KEY_H                        0x000000000000005F
-+          KEY_VOLUMEDOWN                0x0000000000000060
-+          KEY_MUTE                    0x0000000000000061
-+          KEY_VOLUMEUP                  0x0000000000000062
-+          KEY_PLAY                    0x0000000000000064
-+          KEY_PREVIOUS                    0x0000000000000066
-+          KEY_PAUSE                   0x0000000000000067
-+          KEY_NEXT                    0x0000000000000068
-           ZOOM-                    0x0000000000000069
--          HELP                     0x000000000000006A
-+          KEY_HELP                     0x000000000000006A
-           ZOOM+                    0x000000000000006B
--          MM_PLAY                  0x000000000000002F
--          MM_PREV                  0x0000000000000030
--          MM_NEXT                  0x0000000000000031
--          MM_PAUSE                 0x000000000000005F
--          MM_BACK                  0x0000000000000075
--	  MM_FORW                  0x0000000000000079
-+          KEY_PLAY                  0x000000000000002F
-+          KEY_PREVIOUS                  0x0000000000000030
-+          KEY_NEXT                  0x0000000000000031
-+          KEY_PAUSE                 0x000000000000005F
-+          KEY_BACK                  0x0000000000000075
-+	  KEY_FORWARD                  0x0000000000000079
-       end codes
- 
- end remote
-Index: lirc-0.8.7pre2/remotes/pinnacle_systems/lircd.conf.pctv
-===================================================================
---- lirc-0.8.7pre2.orig/remotes/pinnacle_systems/lircd.conf.pctv
-+++ lirc-0.8.7pre2/remotes/pinnacle_systems/lircd.conf.pctv
-@@ -24,30 +24,30 @@ begin remote
-   toggle_bit         0
- 
-   begin codes
--          Mute                     0xB53C                     #Mute                     0x000000000000003C
--          Power                    0x2D2F                     #Power                    0x000000000000002F
-+          KEY_MUTE                     0xB53C                     #Mute                     0x000000000000003C
-+          KEY_POWER                    0x2D2F                     #Power                    0x000000000000002F
-           Chan+Play                0x173F                     #Chan+Play                0x000000000000003F
-           Chan-Stop                0xC63E                     #Chan-Stop                0x000000000000003E
-           Vol+FF                   0xF13B                     #Vol+FF                   0x000000000000003B
-           Vol-Rew                  0x643D                     #Vol-Rew                  0x000000000000003D
--          1                        0x9F31                     #1                        0x0000000000000031
--          2                        0x3D32                     #2                        0x0000000000000032
--          3                        0xEC33                     #3                        0x0000000000000033
--          4                        0xA834                     #4                        0x0000000000000034
--          5                        0x7935                     #5                        0x0000000000000035
--          6                        0xDB36                     #6                        0x0000000000000036
--          7                        0x0A37                     #7                        0x0000000000000037
--          8                        0x5338                     #8                        0x0000000000000038
--          9                        0x8239                     #9                        0x0000000000000039
-+          KEY_1                        0x9F31                     #1                        0x0000000000000031
-+          KEY_2                        0x3D32                     #2                        0x0000000000000032
-+          KEY_3                        0xEC33                     #3                        0x0000000000000033
-+          KEY_4                        0xA834                     #4                        0x0000000000000034
-+          KEY_5                        0x7935                     #5                        0x0000000000000035
-+          KEY_6                        0xDB36                     #6                        0x0000000000000036
-+          KEY_7                        0x0A37                     #7                        0x0000000000000037
-+          KEY_8                        0x5338                     #8                        0x0000000000000038
-+          KEY_9                        0x8239                     #9                        0x0000000000000039
-           Fullscreen               0x5E2D                     #Fullscreen               0x000000000000002D
--          0/AV                     0x203A                     #0/AV                     0x000000000000003A
--          Info                     0xCB2B                     #Info                     0x000000000000002B
--          Preview                  0xFC2E                     #Preview                  0x000000000000002E
--          Record                   0x3027                     #Record                   0x0000000000000027
--          Chan_Last                0x4325                     #Chan_Last                0x0000000000000025
--          F_TV                     0xE126                     #F_TV                     0x0000000000000026
-+          KEY_0                     0x203A                     #0/AV                     0x000000000000003A
-+          KEY_INFO                     0xCB2B                     #Info                     0x000000000000002B
-+          KEY_PREVIOUS                  0xFC2E                     #Preview                  0x000000000000002E
-+          KEY_RECORD                   0x3027                     #Record                   0x0000000000000027
-+          KEY_CHANNELDOWN                0x4325                     #Chan_Last                0x0000000000000025
-+          KEY_TV                     0xE126                     #F_TV                     0x0000000000000026
-           F_TELETEXT               0xB829                     #F_TELETEXT               0x0000000000000029
--          F_RADIO                  0x1A2A                     #F_RADIO                  0x000000000000002A
-+          KEY_RADIO                  0x1A2A                     #F_RADIO                  0x000000000000002A
- 
- #
- # here are some extra buttons a new version of the remote seems to have
-@@ -58,23 +58,23 @@ begin remote
- # model:             PCTV Remote (newest version?)
- # supported devices: dongle on serial port (from TV-Card)
- #
--          L                        0x631F                     #L                        0x000000000000001F
--          Zoom                     0xB21E                     #Zoom                     0x000000000000001E
--          vol+                     0x851B                     #vol+                     0x000000000000001B
--          vol-                     0x590F                     #vol-                     0x000000000000000F
--          channel+                 0x7E17                     #channel+                 0x0000000000000017
--          channel-                 0xC11C                     #channel-                 0x000000000000001C
-+          KEY_L                        0x631F                     #L                        0x000000000000001F
-+          KEY_ZOOM                     0xB21E                     #Zoom                     0x000000000000001E
-+          KEY_VOLUMEUP                     0x851B                     #vol+                     0x000000000000001B
-+          KEY_VOLUMEDOWN                     0x590F                     #vol-                     0x000000000000000F
-+          KEY_CHANNELUP                 0x7E17                     #channel+                 0x0000000000000017
-+          KEY_CHANNELDOWN                 0xC11C                     #channel-                 0x000000000000001C
-           middle                   0x541A                     #middle                   0x000000000000001A
--          Menu                     0x101D                     #Menu                     0x000000000000001D
--          next                     0xF619                     #next                     0x0000000000000019
--          undo                     0xAF16                     #undo                     0x0000000000000016
--          pause                    0x0D15                     #pause                    0x0000000000000015
-+          KEY_MENU                     0x101D                     #Menu                     0x000000000000001D
-+          KEY_NEXT                     0xF619                     #next                     0x0000000000000019
-+          KEY_UNDO                     0xAF16                     #undo                     0x0000000000000016
-+          KEY_PAUSE                    0x0D15                     #pause                    0x0000000000000015
-           redo                     0x9813                     #redo                     0x0000000000000013
--          Rewind                   0x880E                     #Rewind                   0x000000000000000E
--          Play                     0x2A0D                     #Play                     0x000000000000000D
--          Stop                     0xBF0B                     #Stop                     0x000000000000000B
--          FForward                 0x4407                     #FForward                 0x0000000000000007
--          EPG                      0x2718                     #EPG                      0x0000000000000018
-+          KEY_REWIND                   0x880E                     #Rewind                   0x000000000000000E
-+          KEY_PLAY                     0x2A0D                     #Play                     0x000000000000000D
-+          KEY_STOP                     0xBF0B                     #Stop                     0x000000000000000B
-+          KEY_FASTFORWARD                 0x4407                     #FForward                 0x0000000000000007
-+          KEY_EPG                      0x2718                     #EPG                      0x0000000000000018
-  
- # here are some more buttons that seem to be mapped differently from
- # the ones above 
-@@ -86,8 +86,8 @@ begin remote
- # supported devices: serial
- #
- 
--          9                        0x0000000000000082
--          Zoom                     0x00000000000000B2
-+          KEY_9                        0x0000000000000082
-+          KEY_ZOOM                     0x00000000000000B2
-           middle                   0x0000000000000014
- 
- 
-Index: lirc-0.8.7pre2/remotes/pixelview/lircd.conf.playtv
-===================================================================
---- lirc-0.8.7pre2.orig/remotes/pixelview/lircd.conf.playtv
-+++ lirc-0.8.7pre2/remotes/pixelview/lircd.conf.playtv
-@@ -13,22 +13,22 @@ begin remote
-   begin codes
-     TV/FM                    0x00000000000000e7
-     FULL_SCREEN              0x00000000000000bf
--    CH+                      0x0000000000000049
--    CH-                      0x00000000000000c1
--    VOL-                     0x000000000000006a
--    VOL+                     0x000000000000004a
--    MUTE                     0x0000000000000047
-+    KEY_CHANNELUP                      0x0000000000000049
-+    KEY_CHANNELDOWN                      0x00000000000000c1
-+    KEY_VOLUMEDOWN                     0x000000000000006a
-+    KEY_VOLUMEUP                     0x000000000000004a
-+    KEY_MUTE                     0x0000000000000047
-     SOURCE                   0x00000000000000e1
--    1                        0x00000000000000e0
--    2                        0x00000000000000c8
--    3                        0x00000000000000e8
--    4                        0x0000000000000060
--    5                        0x0000000000000062
--    6                        0x00000000000000c9
--    7                        0x00000000000000c0
--    8                        0x00000000000000c2
--    9                        0x0000000000000061
--    0                        0x0000000000000040
-+    KEY_1                        0x00000000000000e0
-+    KEY_2                        0x00000000000000c8
-+    KEY_3                        0x00000000000000e8
-+    KEY_4                        0x0000000000000060
-+    KEY_5                        0x0000000000000062
-+    KEY_6                        0x00000000000000c9
-+    KEY_7                        0x00000000000000c0
-+    KEY_8                        0x00000000000000c2
-+    KEY_9                        0x0000000000000061
-+    KEY_0                        0x0000000000000040
-   end codes
- end remote
- 
-Index: lirc-0.8.7pre2/remotes/pixelview/lircd.conf.playtv_bt878
-===================================================================
---- lirc-0.8.7pre2.orig/remotes/pixelview/lircd.conf.playtv_bt878
-+++ lirc-0.8.7pre2/remotes/pixelview/lircd.conf.playtv_bt878
-@@ -16,39 +16,39 @@ begin remote
-   repeat_bit 0
- 
-   begin codes
--    POWER                    0x00000000000000aa
-+    KEY_POWER                    0x00000000000000aa
-     TV/FM                    0x00000000000000e7
-     TELETEXT                 0x000000000000003f
-     SCAN                     0x0000000000000041
-     +/-                      0x0000000000000069
--    EJECT                    0x000000000000002a
--    STOP                     0x000000000000008a
-+    KEY_EJECTCD                    0x000000000000002a
-+    KEY_STOP                     0x000000000000008a
-     SOURCE                   0x00000000000000e1
-     STEREO                   0x00000000000000df
--    ENTER                    0x000000000000005f
--    SEEK_NEXT                0x0000000000000067
--    SEEK_FWD                 0x00000000000000c7
--    CH_UP                    0x0000000000000049
--    VOL_UP                   0x000000000000004a
-+    KEY_ENTER                    0x000000000000005f
-+    KEY_NEXT                0x0000000000000067
-+    KEY_FORWARD                 0x00000000000000c7
-+    KEY_CHANNELUP                    0x0000000000000049
-+    KEY_VOLUMEUP                   0x000000000000004a
-     RECALL                   0x0000000000000048
--    PAUSE                    0x0000000000000068
--    PLAY                     0x00000000000000ca
--    CH_DOWN                  0x00000000000000c1
--    VOL_DOWN                 0x000000000000006a
--    SEEK_PREV                0x000000000000000a
--    SEEK_BACK                0x0000000000000042
--    ZOOM                     0x00000000000000bf
--    MUTE                     0x0000000000000047
--    1                        0x00000000000000e0
--    2                        0x00000000000000c8
--    3                        0x00000000000000e8
--    4                        0x0000000000000060
--    5                        0x0000000000000062
--    6                        0x00000000000000c9
--    7                        0x00000000000000c0
--    8                        0x00000000000000c2
--    9                        0x0000000000000061
--    0                        0x0000000000000040
-+    KEY_PAUSE                    0x0000000000000068
-+    KEY_PLAY                     0x00000000000000ca
-+    KEY_CHANNELDOWN                  0x00000000000000c1
-+    KEY_VOLUMEDOWN                 0x000000000000006a
-+    KEY_PREVIOUS                0x000000000000000a
-+    KEY_BACK                0x0000000000000042
-+    KEY_ZOOM                     0x00000000000000bf
-+    KEY_MUTE                     0x0000000000000047
-+    KEY_1                        0x00000000000000e0
-+    KEY_2                        0x00000000000000c8
-+    KEY_3                        0x00000000000000e8
-+    KEY_4                        0x0000000000000060
-+    KEY_5                        0x0000000000000062
-+    KEY_6                        0x00000000000000c9
-+    KEY_7                        0x00000000000000c0
-+    KEY_8                        0x00000000000000c2
-+    KEY_9                        0x0000000000000061
-+    KEY_0                        0x0000000000000040
-   end codes
- end remote
- 
-Index: lirc-0.8.7pre2/remotes/pixelview/lircd.conf.playtv_pro
-===================================================================
---- lirc-0.8.7pre2.orig/remotes/pixelview/lircd.conf.playtv_pro
-+++ lirc-0.8.7pre2/remotes/pixelview/lircd.conf.playtv_pro
-@@ -31,15 +31,15 @@ begin remote
- 
-       begin codes
- 
--          power                    0x0000000000007887
--          zoom                     0x00000000000038C7
-+          KEY_POWER                    0x0000000000007887
-+          KEY_ZOOM                     0x00000000000038C7
-           scan                     0x000000000000E01F
-           tv/fm                    0x000000000000C03F
--          vol+                     0x000000000000F807
--          vol-                     0x000000000000E817
--          chan+                    0x0000000000006897
--          chan-                    0x00000000000028D7
--          mute                     0x00000000000018E7
-+          KEY_VOLUMEUP                     0x000000000000F807
-+          KEY_VOLUMEDOWN                     0x000000000000E817
-+          KEY_CHANNELUP                    0x0000000000006897
-+          KEY_CHANNELDOWN                    0x00000000000028D7
-+          KEY_MUTE                     0x00000000000018E7
-           source                   0x00000000000000FF
-           loop                     0x000000000000C837
-           +100                     0x00000000000008F7
-@@ -48,16 +48,16 @@ begin remote
-           reset                    0x000000000000B04F
-           freeze                   0x000000000000F00F
-           function                 0x000000000000708F
--          0                        0x00000000000040BF
--          1                        0x000000000000807F
--          2                        0x000000000000D02F
--          3                        0x000000000000D827
--          4                        0x000000000000A05F
--          5                        0x000000000000906F
--          6                        0x000000000000A857
--          7                        0x000000000000609F
--          8                        0x00000000000050AF
--          9                        0x00000000000048B7
-+          KEY_0                        0x00000000000040BF
-+          KEY_1                        0x000000000000807F
-+          KEY_2                        0x000000000000D02F
-+          KEY_3                        0x000000000000D827
-+          KEY_4                        0x000000000000A05F
-+          KEY_5                        0x000000000000906F
-+          KEY_6                        0x000000000000A857
-+          KEY_7                        0x000000000000609F
-+          KEY_8                        0x00000000000050AF
-+          KEY_9                        0x00000000000048B7
- 
-       end codes
- 
-Index: lirc-0.8.7pre2/remotes/pixelview/lircd.conf.remotemaster
-===================================================================
---- lirc-0.8.7pre2.orig/remotes/pixelview/lircd.conf.remotemaster
-+++ lirc-0.8.7pre2/remotes/pixelview/lircd.conf.remotemaster
-@@ -25,39 +25,39 @@ begin remote
-   gap          189264
- 
-       begin codes
--          1                        0x0000000000052D2F
--          2                        0x0000000000052CCF
--          3                        0x0000000000052CAF
--          4                        0x0000000000052D37
--          5                        0x0000000000052CDF
--          6                        0x000000000005359F
--          7                        0x0000000000052D4F
--          8                        0x0000000000052D3F
--          9                        0x00000000000534DF
--          0                        0x0000000000052D57
--          ENTER                    0x0000000000052CD7
-+          KEY_1                        0x0000000000052D2F
-+          KEY_2                        0x0000000000052CCF
-+          KEY_3                        0x0000000000052CAF
-+          KEY_4                        0x0000000000052D37
-+          KEY_5                        0x0000000000052CDF
-+          KEY_6                        0x000000000005359F
-+          KEY_7                        0x0000000000052D4F
-+          KEY_8                        0x0000000000052D3F
-+          KEY_9                        0x00000000000534DF
-+          KEY_0                        0x0000000000052D57
-+          KEY_ENTER                    0x0000000000052CD7
-           +10                      0x0000000000053537
--          POWER                    0x0000000000054D5F
--          MODE                     0x00000000000534AF
--          TAB                      0x0000000000053557
--          ZOOM                     0x000000000005355F
-+          KEY_POWER                    0x0000000000054D5F
-+          KEY_MODE                     0x00000000000534AF
-+          KEY_TAB                      0x0000000000053557
-+          KEY_ZOOM                     0x000000000005355F
-           FREEZE                   0x000000000005356F
-           SEEK--                   0x0000000000054DAF
--          PAUSE                    0x0000000000052CB7
-+          KEY_PAUSE                    0x0000000000052CB7
-           SEEK++                   0x00000000000534B7
-           SEEK-                    0x0000000000052D5F
--          PLAY                     0x0000000000052D9F
-+          KEY_PLAY                     0x0000000000052D9F
-           SEEK+                    0x00000000000534CF
--          STOP                     0x0000000000054D9F
--          EJECT                    0x0000000000054D6F
--          F1                       0x000000000005354F
--          F2                       0x00000000000534D7
--          F3                       0x00000000000534BF
--          F4                       0x000000000005352F
--          CH-                      0x000000000005353F
--          CH+                      0x00000000000535AF
--          VOL-                     0x0000000000052D6F
--          VOL+                     0x0000000000052DAF
-+          KEY_STOP                     0x0000000000054D9F
-+          KEY_EJECTCD                    0x0000000000054D6F
-+          KEY_F1                       0x000000000005354F
-+          KEY_F2                       0x00000000000534D7
-+          KEY_F3                       0x00000000000534BF
-+          KEY_F4                       0x000000000005352F
-+          KEY_CHANNELDOWN                      0x000000000005353F
-+          KEY_CHANNELUP                      0x00000000000535AF
-+          KEY_VOLUMEDOWN                     0x0000000000052D6F
-+          KEY_VOLUMEUP                     0x0000000000052DAF
-       end codes
- 
- end remote
-Index: lirc-0.8.7pre2/remotes/provideo/lircd.conf.pv951
-===================================================================
---- lirc-0.8.7pre2.orig/remotes/provideo/lircd.conf.pv951
-+++ lirc-0.8.7pre2/remotes/provideo/lircd.conf.pv951
-@@ -31,28 +31,28 @@ begin remote
-   repeat_bit      0
- 
-       begin codes
--          power                    0x00000000000048B7
-+          KEY_POWER                    0x00000000000048B7
-           air/cbl                  0x000000000000D02F
-           pc/tv                    0x0000000000008877
-           source                   0x000000000000F00F
-           mts                      0x000000000000C837
--          mute                     0x00000000000008F7
--          1                        0x000000000000807F
--          2                        0x00000000000040BF
--          3                        0x000000000000C03F
--          4                        0x00000000000020DF
--          5                        0x000000000000A05F
--          6                        0x000000000000609F
--          7                        0x000000000000E01F
--          8                        0x00000000000010EF
--          9                        0x000000000000906F
--          0                        0x00000000000000FF
-+          KEY_MUTE                     0x00000000000008F7
-+          KEY_1                        0x000000000000807F
-+          KEY_2                        0x00000000000040BF
-+          KEY_3                        0x000000000000C03F
-+          KEY_4                        0x00000000000020DF
-+          KEY_5                        0x000000000000A05F
-+          KEY_6                        0x000000000000609F
-+          KEY_7                        0x000000000000E01F
-+          KEY_8                        0x00000000000010EF
-+          KEY_9                        0x000000000000906F
-+          KEY_0                        0x00000000000000FF
-           +100                     0x00000000000050AF
-           ch_rtn                   0x000000000000E817
--          ch+                      0x00000000000058A7
--          ch-                      0x0000000000007887
--          vol+                     0x000000000000D827
--          vol-                     0x000000000000F807
-+          KEY_CHANNELUP                      0x00000000000058A7
-+          KEY_CHANNELDOWN                      0x0000000000007887
-+          KEY_VOLUMEUP                     0x000000000000D827
-+          KEY_VOLUMEDOWN                     0x000000000000F807
-           func                     0x0000000000009867
-           ttx                      0x000000000000B04F
-           pg+                      0x000000000000708F
-Index: lirc-0.8.7pre2/remotes/remotec/lircd.conf.BW6130
-===================================================================
---- lirc-0.8.7pre2.orig/remotes/remotec/lircd.conf.BW6130
-+++ lirc-0.8.7pre2/remotes/remotec/lircd.conf.BW6130
-@@ -20,20 +20,20 @@ begin remote
-   toggle_bit     0
- 
-       begin codes
--	PRE	0x23
--        NEXT	0x24
--	1	0X10
--	2	0x11
--	3	0x12
--	POWER	0x50
--	VOL+	0x30
--	VOL-	0x31
--	L	0x42
--	R	0x44
--	PAUSE	0x22
--	PLAY	0x20
--	STOP	0x21
--	MUTE	0x32
-+	KEY_PREVIOUS	0x23
-+        KEY_NEXT	0x24
-+	KEY_1	0X10
-+	KEY_2	0x11
-+	KEY_3	0x12
-+	KEY_POWER	0x50
-+	KEY_VOLUMEUP	0x30
-+	KEY_VOLUMEDOWN	0x31
-+	KEY_L	0x42
-+	KEY_R	0x44
-+	KEY_PAUSE	0x22
-+	KEY_PLAY	0x20
-+	KEY_STOP	0x21
-+	KEY_MUTE	0x32
- 	MOUSE_SLOW_N		0x95
- 	MOUSE_SLOW_NNE		0xd1
- 	MOUSE_SLOW_NE		0xcd
-Index: lirc-0.8.7pre2/remotes/samsung/lircd.conf.samsung
-===================================================================
---- lirc-0.8.7pre2.orig/remotes/samsung/lircd.conf.samsung
-+++ lirc-0.8.7pre2/remotes/samsung/lircd.conf.samsung
-@@ -28,60 +28,60 @@ begin remote
- 
-       begin codes
- ### Standard keyboard report, type 1
--          OK                       0x70028
--          Right                    0x7004f
--          Left                     0x70050
--          Up                       0x70052
--          Down                     0x70051
-+          KEY_OK                       0x70028
-+          KEY_RIGHT                    0x7004f
-+          KEY_LEFT                     0x70050
-+          KEY_UP                       0x70052
-+          KEY_DOWN                     0x70051
- 
- ### Standard generic desktop report, type 3
--          Power                    0x10001
-+          KEY_POWER                    0x10001
- 
- ### Propietary Samsung report, type 4
--          Mute                     0xffcc0001
--          Video_Archive            0xffcc0002
--          1                        0xffcc0003
--          2                        0xffcc0004
--          3                        0xffcc0005
--          Sleep                    0xffcc0006
--          4                        0xffcc0007
--          5                        0xffcc0008
--          6                        0xffcc0009
--          Last                     0xffcc000a
--          7                        0xffcc000b
--          8                        0xffcc000c
--          9                        0xffcc000d
--          Subtitle                 0xffcc000e
--          Full                     0xffcc000f
--          0                        0xffcc0010
--          PIP                      0xffcc0011
--          Timer                    0xffcc0012
--          Source                   0xffcc0013
--          TV_Menu                  0xffcc0014
--          EPG                      0xffcc0015
--          Text                     0xffcc0016
-+          KEY_MUTE                     0xffcc0001
-+          Video_Archive                0xffcc0002
-+          KEY_1                        0xffcc0003
-+          KEY_2                        0xffcc0004
-+          KEY_3                        0xffcc0005
-+          Sleep                        0xffcc0006
-+          KEY_4                        0xffcc0007
-+          KEY_5                        0xffcc0008
-+          KEY_6                        0xffcc0009
-+          Last                         0xffcc000a
-+          KEY_7                        0xffcc000b
-+          KEY_8                        0xffcc000c
-+          KEY_9                        0xffcc000d
-+          KEY_SUBTITLE                 0xffcc000e
-+          Full                         0xffcc000f
-+          KEY_0                        0xffcc0010
-+          PIP                          0xffcc0011
-+          Timer                        0xffcc0012
-+          Source                       0xffcc0013
-+          TV_Menu                      0xffcc0014
-+          KEY_EPG                      0xffcc0015
-+          KEY_TEXT                     0xffcc0016
- # gap 17..1b: probably cursor keys were previously planned here
--          TV                       0xffcc001c
--          Radio                    0xffcc001d
--          DVD                      0xffcc001e
--          Ch+                      0xffcc001f
--          Menu                     0xffcc0020
--          Vol+                     0xffcc0021
--          Ch-                      0xffcc0022
--          Back                     0xffcc0023
--          Vol-                     0xffcc0024
--          Play                     0xffcc0025
--          Pause                    0xffcc0026
--          Stop                     0xffcc0027
--          Record                   0xffcc0028
--          Prev                     0xffcc0029
--          Rewind                   0xffcc002a
--          Forward                  0xffcc002b
--          Next                     0xffcc002c
--          Red                      0xffcc002d
--          Green                    0xffcc002e
--          Yellow                   0xffcc002f
--          Blue                     0xffcc0030
-+          KEY_TV                       0xffcc001c
-+          KEY_RADIO                    0xffcc001d
-+          KEY_DVD                      0xffcc001e
-+          KEY_CHANNELUP                0xffcc001f
-+          KEY_MENU                     0xffcc0020
-+          KEY_VOLUMEUP                 0xffcc0021
-+          KEY_CHANNELDOWN              0xffcc0022
-+          KEY_BACK                     0xffcc0023
-+          KEY_VOLUMEDOWN               0xffcc0024
-+          KEY_PLAY                     0xffcc0025
-+          KEY_PAUSE                    0xffcc0026
-+          KEY_STOP                     0xffcc0027
-+          KEY_RECORD                   0xffcc0028
-+          KEY_PREVIOUS                 0xffcc0029
-+          KEY_REWIND                   0xffcc002a
-+          KEY_FORWARD                  0xffcc002b
-+          KEY_NEXT                     0xffcc002c
-+          KEY_RED                      0xffcc002d
-+          KEY_GREEN                    0xffcc002e
-+          KEY_YELLOW                   0xffcc002f
-+          KEY_BLUE                     0xffcc0030
-       end codes
- 
- end remote
-Index: lirc-0.8.7pre2/remotes/sasem/lircd.conf.sasem
-===================================================================
---- lirc-0.8.7pre2.orig/remotes/sasem/lircd.conf.sasem
-+++ lirc-0.8.7pre2/remotes/sasem/lircd.conf.sasem
-@@ -33,47 +33,47 @@ begin remote
- 
- 
-       begin codes
--          1                        0x08F7
--          2                        0x09F6
--          3                        0x0AF5
--          4                        0x10EF
--          5                        0x11EE
--          6                        0x12ED
--          7                        0x18E7
--          8                        0x19E6
--          9                        0x1AE5
-+          KEY_1                        0x08F7
-+          KEY_2                        0x09F6
-+          KEY_3                        0x0AF5
-+          KEY_4                        0x10EF
-+          KEY_5                        0x11EE
-+          KEY_6                        0x12ED
-+          KEY_7                        0x18E7
-+          KEY_8                        0x19E6
-+          KEY_9                        0x1AE5
-           start                    0x40BF
--          0                        0x41BE
-+          KEY_0                        0x41BE
-           full_down                0x06F9
--          vol-                     0x0FF0
--          vol+                     0x0EF1
--          esc                      0x05FA
--          up                       0x0BF4
--          close                    0x07F8
--          left                     0x03FC
--          enter                    0x13EC
--          right                    0x1BE4
--          prev                     0x0CF3
--          down                     0x43BC
--          next                     0x01FE
--          mute                     0x0DF2
-+          KEY_VOLUMEDOWN                     0x0FF0
-+          KEY_VOLUMEUP                     0x0EF1
-+          KEY_ESC                      0x05FA
-+          KEY_UP                       0x0BF4
-+          KEY_CLOSE                    0x07F8
-+          KEY_LEFT                     0x03FC
-+          KEY_ENTER                    0x13EC
-+          KEY_RIGHT                    0x1BE4
-+          KEY_PREVIOUS                     0x0CF3
-+          KEY_DOWN                     0x43BC
-+          KEY_NEXT                     0x01FE
-+          KEY_MUTE                     0x0DF2
-           step                     0x04FB
--          play_pause               0x49B6
--          stop                     0x48B7
-+          KEY_PLAYPAUSE               0x49B6
-+          KEY_STOP                     0x48B7
-           winamp                   0x1EE1
-           media_player             0x15EA
-           hdtv                     0x17E8
--          cd_player                0x16E9
-+          KEY_CD                0x16E9
-           win_dvd                  0x44BB
-           power_dvd                0x14EB
--          internet                 0x46B9
-+          KEY_WWW                 0x46B9
-           email                    0x47B8
--          a                        0x45BA
--          b                        0x1DE2
--          c                        0x1CE3
--          d                        0x1FE0
--          eject                    0x02FD
--          power                    0x00FF
-+          KEY_A                        0x45BA
-+          KEY_B                        0x1DE2
-+          KEY_C                        0x1CE3
-+          KEY_D                        0x1FE0
-+          KEY_EJECTCD                    0x02FD
-+          KEY_POWER                    0x00FF
-       end codes
- 
- end remote
-Index: lirc-0.8.7pre2/remotes/sigma_designs/lircd.conf.realmagic
-===================================================================
---- lirc-0.8.7pre2.orig/remotes/sigma_designs/lircd.conf.realmagic
-+++ lirc-0.8.7pre2/remotes/sigma_designs/lircd.conf.realmagic
-@@ -30,43 +30,43 @@ begin remote
- 
-       begin codes
- 
--          1                        0x0000000000006897
--          2                        0x000000000000E817
--          3                        0x000000000000F807
--          4                        0x00000000000058A7
--          5                        0x000000000000D827
--          6                        0x00000000000018E7
--          7                        0x00000000000002FD
--          8                        0x00000000000022DD
--          9                        0x00000000000038C7
--          0                        0x00000000000032CD
--          VOL+                     0x000000000000A857
--          VOL-                     0x0000000000009867
--          MUTE                     0x0000000000007887
-+          KEY_1                        0x0000000000006897
-+          KEY_2                        0x000000000000E817
-+          KEY_3                        0x000000000000F807
-+          KEY_4                        0x00000000000058A7
-+          KEY_5                        0x000000000000D827
-+          KEY_6                        0x00000000000018E7
-+          KEY_7                        0x00000000000002FD
-+          KEY_8                        0x00000000000022DD
-+          KEY_9                        0x00000000000038C7
-+          KEY_0                        0x00000000000032CD
-+          KEY_VOLUMEUP                     0x000000000000A857
-+          KEY_VOLUMEDOWN                     0x0000000000009867
-+          KEY_MUTE                     0x0000000000007887
-           L-R                      0x0000000000001AE5
-           VGA                      0x00000000000012ED
--          ENTER                    0x0000000000002AD5
--          QUIT                     0x00000000000000FF
-+          KEY_ENTER                    0x0000000000002AD5
-+          KEY_EXIT                     0x00000000000000FF
-           PRG                      0x000000000000807F
--          UP                       0x00000000000040BF
--          DOWN                     0x000000000000609F
--          LEFT                     0x00000000000020DF
--          RIGHT                    0x000000000000C03F
--          SELECT                   0x000000000000A05F
--          MENU                     0x000000000000E01F
--          TITLE                    0x00000000000010EF
-+          KEY_UP                       0x00000000000040BF
-+          KEY_DOWN                     0x000000000000609F
-+          KEY_LEFT                     0x00000000000020DF
-+          KEY_RIGHT                    0x000000000000C03F
-+          KEY_SELECT                   0x000000000000A05F
-+          KEY_MENU                     0x000000000000E01F
-+          KEY_TITLE                    0x00000000000010EF
-           OSD                      0x000000000000906F
--          LANG                     0x00000000000050AF
--          ANGLE                    0x000000000000D02F
--          SUB                      0x00000000000030CF
--          PAUSE                    0x000000000000B04F
--          STOP                     0x000000000000708F
--          PLAY                     0x000000000000F00F
--          EJECT                    0x00000000000008F7
-+          KEY_LANGUAGE                     0x00000000000050AF
-+          KEY_ANGLE                    0x000000000000D02F
-+          KEY_SUBTITLE                      0x00000000000030CF
-+          KEY_PAUSE                    0x000000000000B04F
-+          KEY_STOP                     0x000000000000708F
-+          KEY_PLAY                     0x000000000000F00F
-+          KEY_EJECTCD                    0x00000000000008F7
-           REV                      0x0000000000008877
--          FF                       0x00000000000048B7
--          PREV                     0x000000000000C837
--          NEXT                     0x00000000000028D7
-+          KEY_FASTFORWARD                       0x00000000000048B7
-+          KEY_PREVIOUS                     0x000000000000C837
-+          KEY_NEXT                     0x00000000000028D7
-       end codes
- 
- end remote
-Index: lirc-0.8.7pre2/remotes/silitek/lircd.conf.silitek
-===================================================================
---- lirc-0.8.7pre2.orig/remotes/silitek/lircd.conf.silitek
-+++ lirc-0.8.7pre2/remotes/silitek/lircd.conf.silitek
-@@ -30,68 +30,68 @@ begin remote
-     MOUSE_SSE                0x0000000000aa0004
-     MOUSE_SE                 0x0000000000aa0003
-     MOUSE_SEE                0x0000000000aa0002
--    MOUSE_R_BUTTON           0x0000000000aaa0bb
--    MOUSE_L_BUTTON           0x0000000000aa0abb
-+    BTN_RIGHT           0x0000000000aaa0bb
-+    BTN_LEFT           0x0000000000aa0abb
-     MOUSE_L+R_BUTTON         0x0000000000aaaabb
- 
--    0                        0x0000000000bb4a75
--    1                        0x0000000000bbc1fe
--    2                        0x0000000000bbc2fd
--    3                        0x0000000000bb437c
--    4                        0x0000000000bbc4fb
--    5                        0x0000000000bb457a
--    6                        0x0000000000bb4679
--    7                        0x0000000000bbc7f8
--    8                        0x0000000000bbc8f7
--    9                        0x0000000000bb4976
-+    KEY_0                        0x0000000000bb4a75
-+    KEY_1                        0x0000000000bbc1fe
-+    KEY_2                        0x0000000000bbc2fd
-+    KEY_3                        0x0000000000bb437c
-+    KEY_4                        0x0000000000bbc4fb
-+    KEY_5                        0x0000000000bb457a
-+    KEY_6                        0x0000000000bb4679
-+    KEY_7                        0x0000000000bbc7f8
-+    KEY_8                        0x0000000000bbc8f7
-+    KEY_9                        0x0000000000bb4976
-     *                        0x0000000000bbcbf4
-     #                        0x0000000000bb4c73
--    REW                      0x0000000000bb516e
--    FWD                      0x0000000000bbd0ef
--    PAUSE                    0x0000000000bbcef1
--    PLAY                     0x0000000000bbcdf2
--    STOP                     0x0000000000bb4f70
--    VOLUME_UP                0x0000000000bbd3ec
--    VOLUME_DOWN              0x0000000000bb546b
--    MUTE                     0x0000000000bb526d
-+    KEY_REWIND                      0x0000000000bb516e
-+    KEY_FORWARD                      0x0000000000bbd0ef
-+    KEY_PAUSE                    0x0000000000bbcef1
-+    KEY_PLAY                     0x0000000000bbcdf2
-+    KEY_STOP                     0x0000000000bb4f70
-+    KEY_VOLUMEUP                0x0000000000bbd3ec
-+    KEY_VOLUMEDOWN              0x0000000000bb546b
-+    KEY_MUTE                     0x0000000000bb526d
-     DISPLAY                  0x0000000000bbd5ea
--    CD                       0x0000000000bbdae5
-+    KEY_CD                       0x0000000000bbdae5
-     SHOW_WIZ                 0x0000000000bb5b64
-     PG_UP                    0x0000000000bbd6e9
-     PG_DN                    0x0000000000bb5768
--    BACK                     0x0000000000bb5867
--    FORWARD                  0x0000000000bbd9e6
--    WWW                      0x0000000000bbdce3
--    CLOSE                    0x0000000000bb5d62
-+    KEY_BACK                     0x0000000000bb5867
-+    KEY_FORWARD                  0x0000000000bbd9e6
-+    KEY_WWW                      0x0000000000bbdce3
-+    KEY_CLOSE                    0x0000000000bb5d62
- 
--    0_UP                     0x0000000000cc4a75
--    1_UP                     0x0000000000ccc1fe
--    2_UP                     0x0000000000ccc2fd
--    3_UP                     0x0000000000cc437c
--    4_UP                     0x0000000000ccc4fb
--    5_UP                     0x0000000000cc457a
--    6_UP                     0x0000000000cc4679
--    7_UP                     0x0000000000ccc7f8
--    8_UP                     0x0000000000ccc8f7
--    9_UP                     0x0000000000cc4976
-+    KEY_0                     0x0000000000cc4a75
-+    KEY_1                     0x0000000000ccc1fe
-+    KEY_2                     0x0000000000ccc2fd
-+    KEY_3                     0x0000000000cc437c
-+    KEY_4                     0x0000000000ccc4fb
-+    KEY_5                     0x0000000000cc457a
-+    KEY_6                     0x0000000000cc4679
-+    KEY_7                     0x0000000000ccc7f8
-+    KEY_8                     0x0000000000ccc8f7
-+    KEY_9                     0x0000000000cc4976
-     *_UP                     0x0000000000cccbf4
-     #_UP                     0x0000000000cc4c73
--    REW_UP                   0x0000000000cc516e
--    FWD_UP                   0x0000000000ccd0ef
--    PAUSE_UP                 0x0000000000cccef1
--    PLAY_UP                  0x0000000000cccdf2
--    STOP_UP                  0x0000000000cc4f70
--    VOLUME_UP_UP             0x0000000000ccd3ec
--    VOLUME_DOWN_UP           0x0000000000cc546b
--    MUTE_UP                  0x0000000000cc526d
-+    KEY_REWIND                   0x0000000000cc516e
-+    KEY_FORWARD                   0x0000000000ccd0ef
-+    KEY_PAUSE                 0x0000000000cccef1
-+    KEY_PLAY                  0x0000000000cccdf2
-+    KEY_STOP                  0x0000000000cc4f70
-+    KEY_VOLUMEUP             0x0000000000ccd3ec
-+    KEY_VOLUMEDOWN           0x0000000000cc546b
-+    KEY_MUTE                  0x0000000000cc526d
-     DISPLAY_UP               0x0000000000ccd5ea
--    CD_UP                    0x0000000000ccdae5
-+    KEY_CD                    0x0000000000ccdae5
-     SHOW_WIZ_UP              0x0000000000cc5b64
-     PG_UP_UP                 0x0000000000ccd6e9
-     PG_DN_UP                 0x0000000000cc5768
--    BACK_UP                  0x0000000000cc5867
--    FORWARD_UP               0x0000000000ccd9e6
--    WWW_UP                   0x0000000000ccdce3
--    CLOSE_UP                 0x0000000000cc5d62
-+    KEY_REWIND                  0x0000000000cc5867
-+    KEY_FORWARD               0x0000000000ccd9e6
-+    KEY_WWW                   0x0000000000ccdce3
-+    KEY_CLOSE                 0x0000000000cc5d62
-   end codes
- end remote
-Index: lirc-0.8.7pre2/remotes/streamzap/lircd.conf.streamzap
-===================================================================
---- lirc-0.8.7pre2.orig/remotes/streamzap/lircd.conf.streamzap
-+++ lirc-0.8.7pre2/remotes/streamzap/lircd.conf.streamzap
-@@ -27,41 +27,41 @@ begin remote
- 
- 
-       begin codes
--          0                        0x00
--          1                        0x01
--          2                        0x02
--          3                        0x03
--          4                        0x04
--          5                        0x05
--          6                        0x06
--          7                        0x07
--          8                        0x08
--          9                        0x09
--          POWER                    0x0A
--          MUTE                     0x0B
--          CH_UP                    0x0C
--          VOL_UP                   0x0D
--          CH_DOWN                  0x0E
--          VOL_DOWN                 0x0F
--          UP                       0x10
--          LEFT                     0x11
--          OK                       0x12
--          RIGHT                    0x13
--          DOWN                     0x14
--          MENU                     0x15
--          EXIT                     0x16
--          PLAY                     0x17
--          PAUSE                    0x18
--          STOP                     0x19
--          |<<                      0x1A
--          >>|                      0x1B
--          RECORD                   0x1C
--          <<                       0x1D
--          >>                       0x1E
--          RED                      0x20
--          GREEN                    0x21
--          YELLOW                   0x22
--          BLUE                     0x23
-+          KEY_0                        0x00
-+          KEY_1                        0x01
-+          KEY_2                        0x02
-+          KEY_3                        0x03
-+          KEY_4                        0x04
-+          KEY_5                        0x05
-+          KEY_6                        0x06
-+          KEY_7                        0x07
-+          KEY_8                        0x08
-+          KEY_9                        0x09
-+          KEY_POWER                    0x0A
-+          KEY_MUTE                     0x0B
-+          KEY_CHANNELUP                    0x0C
-+          KEY_VOLUMEUP                   0x0D
-+          KEY_CHANNELDOWN                  0x0E
-+          KEY_VOLUMEDOWN                 0x0F
-+          KEY_UP                       0x10
-+          KEY_LEFT                     0x11
-+          KEY_OK                       0x12
-+          KEY_RIGHT                    0x13
-+          KEY_DOWN                     0x14
-+          KEY_MENU                     0x15
-+          KEY_EXIT                     0x16
-+          KEY_PLAY                     0x17
-+          KEY_PAUSE                    0x18
-+          KEY_STOP                     0x19
-+          KEY_PREVIOUS                 0x1A
-+          KEY_NEXT                     0x1B
-+          KEY_RECORD                   0x1C
-+          KEY_REWIND                       0x1D
-+          KEY_FORWARD                       0x1E
-+          KEY_RED                      0x20
-+          KEY_GREEN                    0x21
-+          KEY_YELLOW                   0x22
-+          KEY_BLUE                     0x23
-       end codes
- 
- end remote
-Index: lirc-0.8.7pre2/remotes/technisat/lircd.conf.mediafocusI
-===================================================================
---- lirc-0.8.7pre2.orig/remotes/technisat/lircd.conf.mediafocusI
-+++ lirc-0.8.7pre2/remotes/technisat/lircd.conf.mediafocusI
-@@ -30,11 +30,11 @@ begin remote
-   duty_cycle   33
- 
-       begin codes
--          MUTE                     0x0000000000000046
--          VOL+                     0x000000000000006E
--          VOL-                     0x000000000000006F
--          CH+                      0x0000000000000047
--          CH-                      0x0000000000000048
-+          KEY_MUTE                     0x0000000000000046
-+          KEY_VOLUMEUP                     0x000000000000006E
-+          KEY_VOLUMEDOWN                     0x000000000000006F
-+          KEY_CHANNELUP                      0x0000000000000047
-+          KEY_CHANNELDOWN                      0x0000000000000048
-       end codes
- 
- end remote
-Index: lirc-0.8.7pre2/remotes/tekram/lircd.conf.m230
-===================================================================
---- lirc-0.8.7pre2.orig/remotes/tekram/lircd.conf.m230
-+++ lirc-0.8.7pre2/remotes/tekram/lircd.conf.m230
-@@ -13,36 +13,36 @@ begin remote
-   name  M230
-   bits  8
-       begin codes
--	0		0x00
--	1		0x01
--	2		0x02
--	3		0x03
--	4		0x04
--	5		0x05
--	6		0x06
--	7		0x07
--	8		0x08
--	9		0x09
-+	KEY_0		0x00
-+	KEY_1		0x01
-+	KEY_2		0x02
-+	KEY_3		0x03
-+	KEY_4		0x04
-+	KEY_5		0x05
-+	KEY_6		0x06
-+	KEY_7		0x07
-+	KEY_8		0x08
-+	KEY_9		0x09
- 	RECALL		0x0A
--	ENTER		0x17
--	POWER		0x1C
-+	KEY_ENTER		0x17
-+	KEY_POWER		0x1C
- 	SOURCE		0x15
- 	PC_VID		0x12
- 	STILL		0x11
- 	TTX		0x0F
- 	FAV		0x13
--	MUTE		0x10
--	VOL_UP		0x1A
--	VOL_DN		0x1E
--	CH_UP		0x1B
--	CH_DN		0x1F
--	PLAY		0x0D
--	STOP		0x0E
--	REW		0x1D
--	FFW		0x19
-+	KEY_MUTE		0x10
-+	KEY_VOLUMEUP		0x1A
-+	KEY_VOLUMEDOWN		0x1E
-+	KEY_CHANNELUP		0x1B
-+	KEY_CHANNELDOWN		0x1F
-+	KEY_PLAY		0x0D
-+	KEY_STOP		0x0E
-+	KEY_REWIND		0x1D
-+	KEY_FASTFORWARD		0x19
- 	ADD_ER		0x16
- 	FUNC		0x14
-- 	F_PLUS		0x18
--	F_MINUS		0x0C
-+ 	KEY_KPPLUS		0x18
-+	KEY_KPMINUS		0x0C
-      end codes
- end remote
-Index: lirc-0.8.7pre2/remotes/vlsystem/lircd.conf.mplay
-===================================================================
---- lirc-0.8.7pre2.orig/remotes/vlsystem/lircd.conf.mplay
-+++ lirc-0.8.7pre2/remotes/vlsystem/lircd.conf.mplay
-@@ -22,49 +22,49 @@ begin remote
-   toggle_bit_mask 0x0
- 
-       begin codes
--          PwrOff                   0x41
--          PwrOn                    0x55
--          Movies                   0x40
--          Television               0x46
--          Photos                   0x45
--          Music                    0x56
--          1                        0x4d
--          2                        0x4e
--          3                        0x4f
--          4                        0x50
--          5                        0x51
--          6                        0x52
--          7                        0x53
--          8                        0x03
--          9                        0x07
--          0                        0x4c
--          Vol+                     0x0a
--          Vol-                     0x0e
--          Ch+_Lang                 0x12
--          Ch-_Page                 0x16
--          Guide                    0x0f
--          Back                     0x0b
--          Tv                       0x13
--          Ok                       0x42
--          Up                       0x19
--          Left                     0x54
--          Right                    0x43
--          Down                     0x1d
--          Exit_Click               0x1f
--          Task_Quick               0x17
--          Run_DClick               0x1b
--          Rew                      0x0d
--          Play                     0x09
--          Ffwd                     0x15
--          Prev                     0x1a
--          Stop                     0x01
--          Next                     0x1e
--          Pause                    0x05
--          Mute                     0x4a
--          Warp_Mouse               0x47
--          Rec                      0x11
--          DVD_Zoom                 0x14
--          Detail                   0x4b
-+          PwrOff                       0x41
-+          KEY_POWER                    0x55
-+          KEY_VIDEO                    0x40
-+          KEY_TV                       0x46
-+          KEY_PHOTO                    0x45
-+          KEY_AUDIO                    0x56
-+          KEY_1                        0x4d
-+          KEY_2                        0x4e
-+          KEY_3                        0x4f
-+          KEY_4                        0x50
-+          KEY_5                        0x51
-+          KEY_6                        0x52
-+          KEY_7                        0x53
-+          KEY_8                        0x03
-+          KEY_9                        0x07
-+          KEY_0                        0x4c
-+          KEY_VOLUMEUP                 0x0a
-+          KEY_VOLUMEDOWN               0x0e
-+          KEY_CHANNELUP                0x12
-+          KEY_CHANNELDOWN              0x16
-+          Guide                        0x0f
-+          KEY_BACK                     0x0b
-+          KEY_TV                       0x13
-+          KEY_OK                       0x42
-+          KEY_UP                       0x19
-+          KEY_LEFT                     0x54
-+          KEY_RIGHT                    0x43
-+          KEY_DOWN                     0x1d
-+          Exit_Click                   0x1f
-+          Task_Quick                   0x17
-+          Run_DClick                   0x1b
-+          KEY_REWIND                   0x0d
-+          KEY_PLAY                     0x09
-+          KEY_FASTFORWARD              0x15
-+          KEY_PREVIOUS                 0x1a
-+          KEY_STOP                     0x01
-+          KEY_NEXT                     0x1e
-+          KEY_PAUSE                    0x05
-+          KEY_MUTE                     0x4a
-+          Warp_Mouse                   0x47
-+          KEY_RECORD                   0x11
-+          KEY_ZOOM                     0x14
-+          Detail                       0x4b
-       end codes
- 
- end remote
-Index: lirc-0.8.7pre2/remotes/x10/lircd.conf.mouseremote
-===================================================================
---- lirc-0.8.7pre2.orig/remotes/x10/lircd.conf.mouseremote
-+++ lirc-0.8.7pre2/remotes/x10/lircd.conf.mouseremote
-@@ -24,42 +24,42 @@ begin remote
-   gap		140000
- 
-       begin codes
--        POWER			0x000000000000000F
--	PC			0x000000000000002B
-+        KEY_POWER			0x000000000000000F
-+	KEY_PC			0x000000000000002B
- 	LAST			0x000000000000004F
--	CHANUP			0x0000000000000002
--	CHANDOWN		0x0000000000000003
--	VOLUP			0x0000000000000006
--	VOLDOWN			0x0000000000000007
--	MUTE			0x0000000000000005
--	1			0x0000000000000041
--	2			0x0000000000000042
--	3			0x0000000000000043
--	4			0x0000000000000044
--	5			0x0000000000000045
--	6			0x0000000000000046
--	7			0x0000000000000047
--	8			0x0000000000000048
--	9			0x0000000000000049
--	0			0x0000000000000040
--	ENTER			0x000000000000004a
-+	KEY_CHANNELUP			0x0000000000000002
-+	KEY_CHANNELDOWN		0x0000000000000003
-+	KEY_VOLUMEUP			0x0000000000000006
-+	KEY_VOLUMEDOWN			0x0000000000000007
-+	KEY_MUTE			0x0000000000000005
-+	KEY_1			0x0000000000000041
-+	KEY_2			0x0000000000000042
-+	KEY_3			0x0000000000000043
-+	KEY_4			0x0000000000000044
-+	KEY_5			0x0000000000000045
-+	KEY_6			0x0000000000000046
-+	KEY_7			0x0000000000000047
-+	KEY_8			0x0000000000000048
-+	KEY_9			0x0000000000000049
-+	KEY_0			0x0000000000000040
-+	KEY_ENTER			0x000000000000004a
- 	ADOTB			0x000000000000005D
--	REWIND			0x000000000000001C
--	PLAY			0x000000000000000D
--	FFWD			0x000000000000001D
--	STOP			0x000000000000000E
--	PAUSE			0x000000000000004E
--	RECORD			0x00000000000000FF
--	ENTER			0x000000000000004A
-+	KEY_REWIND			0x000000000000001C
-+	KEY_PLAY			0x000000000000000D
-+	KEY_FASTFORWARD			0x000000000000001D
-+	KEY_STOP			0x000000000000000E
-+	KEY_PAUSE			0x000000000000004E
-+	KEY_RECORD			0x00000000000000FF
-+	KEY_ENTER			0x000000000000004A
- 	LAST			0x000000000000004F
- 	DISP			0x000000000000005C
- 	SHIFT			0x000000000000006B
- 	GUIDE			0x000000000000006D
--	SELECT			0x0000000000000093
--	PHONE			0x000000000000004B
--	WEB			0x000000000000008B
--	CD			0x00000000000000AB
--	DVD			0x00000000000000CB
-+	KEY_SELECT			0x0000000000000093
-+	KEY_PHONE			0x000000000000004B
-+	KEY_WWW			0x000000000000008B
-+	KEY_CD			0x00000000000000AB
-+	KEY_DVD			0x00000000000000CB
- 	MOUSE_SLOW_N		0x0000000000000110
- 	MOUSE_SLOW_NNE		0x0000000000000131
- 	MOUSE_SLOW_NE		0x0000000000000111
-@@ -110,7 +110,7 @@ begin remote
- 	MOUSE_FAST_NNW		0x0000000000000539
- 	BUTTONR_DOWN		0x0000000000000801
- 	BUTTONL_DOWN		0x0000000000000804
--	BUTTON_UP		0x0000000000000800
-+	KEY_UP		0x0000000000000800
- 	end codes	
- 
- end remote
-Index: lirc-0.8.7pre2/remotes/x10/lircd.conf.mp3anywhere
-===================================================================
---- lirc-0.8.7pre2.orig/remotes/x10/lircd.conf.mp3anywhere
-+++ lirc-0.8.7pre2/remotes/x10/lircd.conf.mp3anywhere
-@@ -22,43 +22,43 @@ begin remote
-   gap		140000
- 
-       begin codes
--        POWER			0x00000000000000F0
--	PC			0x00000000000000D4
-+        KEY_POWER			0x00000000000000F0
-+	KEY_PC			0x00000000000000D4
- 	LAST			0x00000000000000F2
--	CHANUP			0x0000000000000040
--	CHANDOWN		0x00000000000000C0
--	VOLUP			0x0000000000000060
--	VOLDOWN			0x00000000000000E0
--	MUTE			0x00000000000000A0
--	ONE			0x0000000000000082
--	TWO			0x0000000000000042
--	THREE			0x00000000000000C2
--	FOUR			0x0000000000000022
--	FIVE			0x00000000000000A2
--	SIX			0x0000000000000062
--	SEVEN			0x00000000000000E2
--	EIGHT			0x0000000000000012
--	NINE			0x0000000000000092
--	ZERO			0x0000000000000002
--	ENTER			0x0000000000000052
-+	KEY_CHANNELUP			0x0000000000000040
-+	KEY_CHANNELDOWN		0x00000000000000C0
-+	KEY_VOLUMEUP			0x0000000000000060
-+	KEY_VOLUMEDOWN			0x00000000000000E0
-+	KEY_MUTE			0x00000000000000A0
-+	KEY_1			0x0000000000000082
-+	KEY_2			0x0000000000000042
-+	KEY_3			0x00000000000000C2
-+	KEY_4			0x0000000000000022
-+	KEY_5			0x00000000000000A2
-+	KEY_6			0x0000000000000062
-+	KEY_7			0x00000000000000E2
-+	KEY_8			0x0000000000000012
-+	KEY_9			0x0000000000000092
-+	KEY_0			0x0000000000000002
-+	KEY_ENTER			0x0000000000000052
- 	ADOTB			0x00000000000000BA
--	A			0x000000000000003A
--	B			0x00000000000000D8
--	C			0x00000000000000D6
--	D			0x00000000000000D4
--	MENU			0x00000000000000B6
--	EXIT			0x00000000000000C9
--	UP			0x00000000000000D5
--	DOWN			0x00000000000000D3
--	LEFT			0x00000000000000D2
--	RIGHT			0x00000000000000D1
--	OK			0x0000000000000052
--	REWIND			0x0000000000000038
--	PLAY			0x00000000000000B0
--	FFWD			0x00000000000000B8
--	RECORD			0x00000000000000FF
--	STOP			0x0000000000000070
--	PAUSE			0x0000000000000072
-+	KEY_A			0x000000000000003A
-+	KEY_B			0x00000000000000D8
-+	KEY_C			0x00000000000000D6
-+	KEY_D			0x00000000000000D4
-+	KEY_MENU			0x00000000000000B6
-+	KEY_EXIT			0x00000000000000C9
-+	KEY_UP			0x00000000000000D5
-+	KEY_DOWN			0x00000000000000D3
-+	KEY_LEFT			0x00000000000000D2
-+	KEY_RIGHT			0x00000000000000D1
-+	KEY_OK			0x0000000000000052
-+	KEY_REWIND			0x0000000000000038
-+	KEY_PLAY			0x00000000000000B0
-+	KEY_FASTFORWARD			0x00000000000000B8
-+	KEY_RECORD			0x00000000000000FF
-+	KEY_STOP			0x0000000000000070
-+	KEY_PAUSE			0x0000000000000072
-       end codes	
- 
- end remote
diff --git a/lirc-0.9.0-libusb-config-is-no-more.patch b/lirc-0.9.0-libusb-config-is-no-more.patch
deleted file mode 100644
index 28b1e01..0000000
--- a/lirc-0.9.0-libusb-config-is-no-more.patch
+++ /dev/null
@@ -1,95 +0,0 @@
-diff --git a/configure.ac b/configure.ac
-index 6c07e0d..1a3347e 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -20,11 +20,11 @@ AC_PROG_MAKE_SET
- AC_PATH_PROG(mknod, mknod, /bin/mknod)
- AC_PATH_PROG(mkfifo, mkfifo, /usr/bin/mkfifo)
- AC_PATH_PROG(depmod, depmod, /sbin/depmod, $PATH:/sbin)
--AC_PATH_PROG(LIBUSB_CONFIG, libusb-config)
- AC_PROG_LN_S
- AC_PROG_LIBTOOL
- AM_PATH_PYTHON(,, [:])
- AM_CONDITIONAL([HAVE_PYTHON], [test "$PYTHON" != ""])
-+LIBUSB_CONFIG="pkg-config libusb"
- 
- dnl Checks for header files.
- AC_HEADER_STDC
-@@ -310,15 +310,14 @@ AH_TEMPLATE([SYSCONFDIR],
- AH_TEMPLATE([USE_SYSLOG],
- 	[define if you want to log to syslog instead of logfile])
- 
--if test -n "${LIBUSB_CONFIG}"; then
--  AC_DEFINE(HAVE_LIBUSB)
--  possible_drivers="${possible_drivers} (atilibusb) (awlibusb) (dfclibusb) (commandir) (srm7500libusb)" 
--fi
--
- AC_CHECK_LIB(caraca_client, caraca_init,
-   AC_DEFINE(HAVE_LIBCARACA)
-   possible_drivers="${possible_drivers} (caraca)"
- )
-+AC_CHECK_HEADER(usb.h,
-+  AC_DEFINE(HAVE_LIBUSB)
-+  possible_drivers="${possible_drivers} (atilibusb) (awlibusb) (dfclibusb) (commandir) (srm7500libusb)" 
-+)
- AC_CHECK_HEADER(ftdi.h,
-   AC_DEFINE(HAVE_FTDI)
-   possible_drivers="${possible_drivers} (ftdi)"
-@@ -1449,7 +1448,7 @@ Get it at:
- Or install these packages from your distro:
- 
-    libusb
--   libusb-dev
-+   libusb-devel
- 
- ])
-     ;;
---- lirc-0.9.0/configure.orig	2011-06-07 00:08:14.850212313 -0400
-+++ lirc-0.9.0/configure	2011-06-07 00:11:07.140109458 -0400
-@@ -865,7 +865,6 @@ build_cpu
- build
- LIBTOOL
- LN_S
--LIBUSB_CONFIG
- depmod
- mkfifo
- mknod
-@@ -4160,37 +4159,7 @@ $as_echo "no" >&6; }
- fi
- 
- 
--# Extract the first word of "libusb-config", so it can be a program name with args.
--set dummy libusb-config; ac_word=$2
--{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
--$as_echo_n "checking for $ac_word... " >&6; }
--if test "${ac_cv_path_LIBUSB_CONFIG+set}" = set; then
--  $as_echo_n "(cached) " >&6
--else
--  case $LIBUSB_CONFIG in
--  [\\/]* | ?:[\\/]*)
--  ac_cv_path_LIBUSB_CONFIG="$LIBUSB_CONFIG" # Let the user override the test with a path.
--  ;;
--  *)
--  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
--for as_dir in $PATH
--do
--  IFS=$as_save_IFS
--  test -z "$as_dir" && as_dir=.
--  for ac_exec_ext in '' $ac_executable_extensions; do
--  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
--    ac_cv_path_LIBUSB_CONFIG="$as_dir/$ac_word$ac_exec_ext"
--    $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
--    break 2
--  fi
--done
--done
--IFS=$as_save_IFS
--
--  ;;
--esac
--fi
--LIBUSB_CONFIG=$ac_cv_path_LIBUSB_CONFIG
-+LIBUSB_CONFIG="pkg-config libusb"
- if test -n "$LIBUSB_CONFIG"; then
-   { $as_echo "$as_me:$LINENO: result: $LIBUSB_CONFIG" >&5
- $as_echo "$LIBUSB_CONFIG" >&6; }
diff --git a/lirc.conf b/lirc.conf
deleted file mode 100644
index 7ccf921..0000000
--- a/lirc.conf
+++ /dev/null
@@ -1,2 +0,0 @@
-# Populated config files can be found in the lirc-remotes sub-package
-# or at http://lirc.sourceforge.net/remotes/".
diff --git a/lirc.service b/lirc.service
deleted file mode 100644
index a0b925d..0000000
--- a/lirc.service
+++ /dev/null
@@ -1,11 +0,0 @@
-[Unit]
-Description=LIRC Infrared Signal Decoder
-After=network.target
-
-[Service]
-Type=forking
-PIDFile=/run/lirc/lircd.pid
-ExecStart=/usr/sbin/lircd --driver=default --device=/dev/lirc0 
-
-[Install]
-WantedBy=multi-user.target
diff --git a/lirc.spec b/lirc.spec
index 90f6009..7c55db1 100644
--- a/lirc.spec
+++ b/lirc.spec
@@ -20,9 +20,9 @@
 %define pre     pre1
 
 Name:           lirc
-Version:        0.9.0
+Version:        0.9.1a
 %if 0%{?released}
-Release:        28%{?dist}
+Release:        1%{?dist}
 %else
 Release:        0.7.%{pre}%{?dist}
 %endif
@@ -37,37 +37,16 @@ Source0:        http://downloads.sourceforge.net/lirc/%{name}-%{version}.tar.bz2
 %else
 Source0:        http://www.lirc.org/software/snapshots/%{name}-%{version}-%{pre}.tar.bz2
 %endif
-Source1:        lircd.service
-Source2:        lirc.sysconfig
-Source3:        lircmd.service
-Source4:        lircd.socket
-Source5:        lirc.conf
-Source6:        README.fedora
-Source7:        99-remote-control-lirc.rules
-                # Patches 7..17 are from upstream.
-Patch7:         0007-Make-lirc_wpc8769l-functional-again.patch
-Patch8:         0008-lirc_sir-fix-resource-busy-error-from-bunk-lirc_open.patch
-Patch9:         0009-lircd-handle-larger-config-files-in-write_socket-bet.patch
-Patch10:        0010-lirc_atiusb-fix-buffer-alloc-to-work-with-new-kfifo.patch
-Patch11:        0011-libusb-has-no-libusb-config-any-longer-use-pkg-confi.patch
-Patch12:        0012-Silence-some-clang-warnings-courtesy-of-nox.patch
-Patch13:        0013-userspace-use-dev-lirc0-as-default-device.patch
-Patch14:        0014-lirc-make-chardev-nonseekable.patch
-Patch15:        0015-media-lirc_dev-fixes-in-lirc_dev_fop_read.patch
-Patch16:        0016-media-lirc_dev-add-some-__user-annotations.patch
-Patch17:        0017-media-media-rc-lirc_dev-check-kobject_set_name-resul.patch
-Patch18:        0018-Start-lirc-0.9.1-git.patch
-Patch19:        0019-lircs-use-systemctl-instead-of-sysV-init.patch
-                # 101-104: upstream merge request:
-                #    https://sourceforge.net/p/lirc/git/merge-requests/3/
-Patch101:       0101-Stripping-some-eol-whitespace.patch
-Patch102:       0102-Update-autotools-config-files.patch
-Patch103:       0103-xmode2.c-Use-generic-fixed-font-instead-of-Courier.patch
-Patch104:       0104-Add-systemd-socket-activation-support.patch
-                # local glue which should not go upstream.
-Patch105:       0105-configure-ac-back-to-0.9.0.patch
-                #https://sourceforge.net/p/lirc/mailman/message/31710217/
-Patch200:       0200-Fixing-FTBS-when-using-Werror-format-security.patch
+
+Source1:        README.fedora
+Source2:        99-remote-control-lirc.rules
+
+                # Patches 1-3 are from upstream
+Patch1:         0001-Fix-segfault-when-starting-lircd-AUR-41581.patch
+Patch2:         0002-lircd-Fix-bad-default-for-lircdfile.patch
+Patch3:         0003-0.9.1a-Bugfix-segfault-when-parsing-connect-in-confi.patch
+Patch4:         0004-lircd-fix-compiler-error-format-security-error.patch
+
 
 Buildrequires:  autoconf
 BuildRequires:  automake
@@ -78,6 +57,7 @@ BuildRequires:  alsa-lib-devel
 %if %{with iguanaIR}
 BuildRequires:  iguanaIR-devel
 %endif
+BuildRequires:  help2man
 %if %{with ftdi}
 BuildRequires:  libftdi-devel
 %endif
@@ -185,41 +165,17 @@ to use the LIRCD_IR_DEVICE option in /etc/sysconfig/lirc
 %setup -q -n %{name}-%{version}-%{pre}
 %endif
 
-%patch7 -p1
-%patch8 -p1
-%patch9 -p1
-%patch10 -p1
-%patch11 -p1
-%patch12 -p1
-%patch13 -p1
-%patch14 -p1
-%patch15 -p1
-%patch16 -p1
-%patch17 -p1
-%patch18 -p1
-%patch19 -p1
-
-%patch101 -p1
-%patch102 -p1
-%patch103 -p1
-%patch104 -p1
-%patch105 -p1
-
-%patch200 -p1
-
-chmod 644 contrib/*
+%patch1 -p1
+%patch2 -p1
+%patch3 -p1
+%patch4 -p1
+
+chmod  644 contrib/*
 chmod +x contrib/hal
 chmod +x daemons/input_map.sh
 
 sed -i -e 's|/usr/local/etc/|/etc/|' contrib/irman2lirc
 
-for f in remotes/chronos/lircd.conf.chronos \
-    remotes/creative/lircd.conf.livedrive remotes/atiusb/lircd.conf.atiusb \
-    NEWS ChangeLog AUTHORS contrib/lircrc
-do
-    iconv -f iso-8859-1 -t utf-8 $f > $f.utf8 ; mv $f.utf8 $f
-done
-
 
 %build
 mkdir m4 || :
@@ -244,34 +200,18 @@ make
 make install DESTDIR=$RPM_BUILD_ROOT
 install -pm 755 contrib/irman2lirc $RPM_BUILD_ROOT%{_bindir}
 install -Dpm 644 doc/lirc.hwdb $RPM_BUILD_ROOT%{_datadir}/lirc/lirc.hwdb
-install -Dpm 644 %{SOURCE1} $RPM_BUILD_ROOT%{_unitdir}/lircd.service
-install -Dpm 644 %{SOURCE3} $RPM_BUILD_ROOT%{_unitdir}/lircmd.service
-install -Dpm 644 %{SOURCE4} $RPM_BUILD_ROOT%{_unitdir}/lircd.socket
-install -Dpm 644 %{SOURCE2} $RPM_BUILD_ROOT/etc/sysconfig/lirc
-install -Dpm 644 %{SOURCE5} $RPM_BUILD_ROOT/etc/lirc/lircd.conf
-install -Dpm 644 %{SOURCE5} $RPM_BUILD_ROOT/etc/lirc/lircmd.conf
-install -Dpm 644 %{SOURCE7} \
+cp -a %{SOURCE1} README.fedora
+install -Dpm 644 %{SOURCE2} \
     $RPM_BUILD_ROOT%{_udevrulesdir}/99-remote-control-lirc.rules
-cp -a %{SOURCE6} README.fedora
 
 # Put remote definitions in place
 cp -ar remotes $RPM_BUILD_ROOT%{_datadir}/lirc-remotes
 
 rm $RPM_BUILD_ROOT%{_libdir}/liblirc_client.la
-%if ! %{with svgalib}
-rm -f $RPM_BUILD_ROOT%{_mandir}/man1/smode2.1*
-%endif
-%if ! %{with x}
-rm -f $RPM_BUILD_ROOT%{_mandir}/man1/irxevent.1*
-rm -f $RPM_BUILD_ROOT%{_mandir}/man1/xmode2.1*
-%endif
 
 rm -rf __docs; mkdir __docs
-cp -pR doc contrib __docs
-cd __docs
-rm -rf doc/Makefile* doc/.libs doc/man* doc/lirc.hwdb
-rm -rf contrib/irman2lirc contrib/lirc.* contrib/sendxevent.c
-cd ..
+mv $RPM_BUILD_ROOT/usr/share/doc/lirc/* __docs
+cp -pR  contrib  __docs
 
 mkdir -p $RPM_BUILD_ROOT/%{_tmpfilesdir}
 echo "d /var/run/lirc  0755  root  root  10d" \
@@ -296,10 +236,10 @@ find /etc/systemd -name lirc.service -xtype l -delete || :
 
 
 %files
-%doc ANNOUNCE AUTHORS ChangeLog COPYING NEWS README TODO README.fedora
+%doc AUTHORS ChangeLog COPYING NEWS README TODO README.fedora
 %dir  /etc/lirc
 %config(noreplace) /etc/lirc/lirc*d.conf
-%config(noreplace) /etc/sysconfig/lirc
+%config(noreplace) /etc/lirc/lirc_options.conf
 %{_tmpfilesdir}/lirc.conf
 %{_unitdir}/lirc*
 %{_bindir}/*ir*
@@ -319,7 +259,8 @@ find /etc/systemd -name lirc.service -xtype l -delete || :
 %{_libdir}/liblirc_client.so
 
 %files doc
-%doc __docs/* COPYING
+%doc COPYING __docs/*
+
 
 %files remotes
 %doc AUTHORS ChangeLog COPYING README
@@ -330,6 +271,11 @@ find /etc/systemd -name lirc.service -xtype l -delete || :
 
 
 %changelog
+* Tue Aug 19 2014 Alec Leamas <leamas@nowhere.net> - 0.9.1-1
+- Updating to latest release.
+- Removing tons of patches now upstreamed.
+- Using built manpages as-is (no need to remove not-built tools)
+
 * Mon Aug 18 2014 Alec Leamas <leamas@nowhere.net> - 0.9.0-28
 - Rebuilt due to iguanaIR so-bump.
 
diff --git a/lirc.sysconfig b/lirc.sysconfig
deleted file mode 100644
index 4e32a76..0000000
--- a/lirc.sysconfig
+++ /dev/null
@@ -1,31 +0,0 @@
-# Note: in addition to these parameters, you need to have working    -*- sh -*-
-# configuration file for lircd (and lircmd if enabled).
-
-# Options to lircd(8).  Typically, this will be empty, as which driver to use
-# should be specified using the LIRC_DRIVER variable below.
-LIRCD_OPTIONS=""
-
-# The infrared receiver (and/or transmitter) driver to be used by lircd(8),
-# similar to passing "-H driver" to lircd(8).
-# Run "/usr/sbin/lircd -H help" to get a listing of supported drivers.
-LIRC_DRIVER="default"
-
-# Which lirc device will be used by lircd(8).
-# This is the same as passing "-d device" to lircd. It must be set.
-LIRC_DEVICE="/dev/lirc0"
-
-# Options to lircmd(8). lircmd always runs with --nodaemon added
-# to LIRCMD_OPTIONS.
-LIRCMD_OPTIONS=""
-
-# The infrared device used by lirc, if any. If this is set, lircd will
-# enable the lirc protocol and disable kernel built-in handling using
-# "echo lirc > /sys/class/rc/$LIRCD_IR_DEVICE/protocols" at startup.
-# If unset, this is ignored.
-# - The common case when there is just one ir device: LIRCD_IR_DEVICE="rc0".
-# - Non-IR devices e. g., RF ones typically don't need this set.
-# - If not set when required, the typical symptom is duobled key-presses.
-# - If installing the lirc-disable-kernel-rc subpackage this setting is not
-#   needed.
-LIRCD_IR_DEVICE=""
-
diff --git a/lircd.service b/lircd.service
deleted file mode 100644
index 3506df7..0000000
--- a/lircd.service
+++ /dev/null
@@ -1,16 +0,0 @@
-[Unit]
-Description=LIRC Infrared Signal Decoder
-After=network.target
-
-[Service]
-Type=simple
-EnvironmentFile=-/etc/sysconfig/lirc
-ExecStartPre=-/bin/sh -c 'test -n "${LIRCD_IR_DEVICE}" && \
-    echo lirc > /sys/class/rc/${LIRCD_IR_DEVICE}/protocols || :'
-ExecStart=/bin/sh -c '/usr/sbin/lircd ${LIRCD_OPTIONS} \
-    --driver ${LIRC_DRIVER} --device ${LIRC_DEVICE}  --nodaemon'
-ExecStopPost=-/bin/sh -c 'test -n "${LIRCD_IR_DEVICE}" && \
-    echo -lirc > /sys/class/rc/${LIRCD_IR_DEVICE}/protocols || :'
-
-[Install]
-WantedBy=multi-user.target
diff --git a/lircd.socket b/lircd.socket
deleted file mode 100644
index 0ee7d0d..0000000
--- a/lircd.socket
+++ /dev/null
@@ -1,7 +0,0 @@
-[Socket]
-ListenStream=/run/lirc/lircd
-
-[Install]
-WantedBy=sockets.target
-Also=lircd.service
-
diff --git a/lircmd.service b/lircmd.service
deleted file mode 100644
index 0e8af8b..0000000
--- a/lircmd.service
+++ /dev/null
@@ -1,12 +0,0 @@
-[Unit]
-Description=LIRC Infrared Mouse Event Signal Decoder
-Requires=lircd.service
-After=network.target lircd.service
-
-[Service]
-Type=simple
-EnvironmentFile=-/etc/sysconfig/lirc
-ExecStart=/usr/sbin/lircmd  ${LIRCMD_OPTIONS} --nodaemon
-
-[Install]
-WantedBy=multi-user.target
diff --git a/sources b/sources
index b87e81e..4236ac8 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-b232aef26f23fe33ea8305d276637086  lirc-0.9.0.tar.bz2
+1f1fac162ed309dd50f307e96a292957  lirc-0.9.1a.tar.bz2

From 727739ff6ecd036a4268890730745ddb789e24c9 Mon Sep 17 00:00:00 2001
From: Alec Leamas <leamas.alec@gmail.com>
Date: Thu, 21 Aug 2014 02:22:27 +0200
Subject: [PATCH 134/204] Rebuilt for new iguanaIR ABI version.

---
 lirc.spec | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/lirc.spec b/lirc.spec
index 7c55db1..2c9e9e5 100644
--- a/lirc.spec
+++ b/lirc.spec
@@ -22,9 +22,9 @@
 Name:           lirc
 Version:        0.9.1a
 %if 0%{?released}
-Release:        1%{?dist}
+Release:        2%{?dist}
 %else
-Release:        0.7.%{pre}%{?dist}
+Release:        0.8.%{pre}%{?dist}
 %endif
 Summary:        The Linux Infrared Remote Control package
 
@@ -271,6 +271,9 @@ find /etc/systemd -name lirc.service -xtype l -delete || :
 
 
 %changelog
+* Thu Aug 21 2014 Aölec Leamas <leamas.alec@nowhere.net> - 0.9.1a-2
+- Rebuilt for new iguanaIR ABI version.
+
 * Tue Aug 19 2014 Alec Leamas <leamas@nowhere.net> - 0.9.1-1
 - Updating to latest release.
 - Removing tons of patches now upstreamed.

From 0fca824caf10c3e4bce077495e5f5a2873444823 Mon Sep 17 00:00:00 2001
From: Alec Leamas <leamas.alec@gmail.com>
Date: Thu, 21 Aug 2014 14:40:38 +0200
Subject: [PATCH 135/204] rebuilt to pick up new iguanaIR.

---
 lirc.spec | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/lirc.spec b/lirc.spec
index 2c9e9e5..fc7a01d 100644
--- a/lirc.spec
+++ b/lirc.spec
@@ -22,9 +22,9 @@
 Name:           lirc
 Version:        0.9.1a
 %if 0%{?released}
-Release:        2%{?dist}
+Release:        3%{?dist}
 %else
-Release:        0.8.%{pre}%{?dist}
+Release:        0.9.%{pre}%{?dist}
 %endif
 Summary:        The Linux Infrared Remote Control package
 
@@ -271,6 +271,9 @@ find /etc/systemd -name lirc.service -xtype l -delete || :
 
 
 %changelog
+* Thu Aug 21 2014 Alec Leamas <leamas.alec@nowhere.net> - 0.9.1a-3
+- rebuilt to pick up new iguanaIR.
+
 * Thu Aug 21 2014 Aölec Leamas <leamas.alec@nowhere.net> - 0.9.1a-2
 - Rebuilt for new iguanaIR ABI version.
 

From a8ac73c715939c474aff9f4c536dddeca462af50 Mon Sep 17 00:00:00 2001
From: "user.email" <leamas@nowhere.net>
Date: Wed, 3 Sep 2014 14:02:28 +0200
Subject: [PATCH 136/204] rebuilt

---
 lirc.spec | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/lirc.spec b/lirc.spec
index fc7a01d..314dcd9 100644
--- a/lirc.spec
+++ b/lirc.spec
@@ -22,9 +22,9 @@
 Name:           lirc
 Version:        0.9.1a
 %if 0%{?released}
-Release:        3%{?dist}
+Release:        4%{?dist}
 %else
-Release:        0.9.%{pre}%{?dist}
+Release:        0.10.%{pre}%{?dist}
 %endif
 Summary:        The Linux Infrared Remote Control package
 
@@ -271,6 +271,9 @@ find /etc/systemd -name lirc.service -xtype l -delete || :
 
 
 %changelog
+* Wed Sep 03 2014 Alec Leamas <leamas@nowhere.net> - 0.9.1a-4
+- rebuilt
+
 * Thu Aug 21 2014 Alec Leamas <leamas.alec@nowhere.net> - 0.9.1a-3
 - rebuilt to pick up new iguanaIR.
 

From 2e793985c5fb422350a8ef8c8e1cc528fbc1eb20 Mon Sep 17 00:00:00 2001
From: Alec Leamas <leamas.alec@gmail.com>
Date: Thu, 11 Dec 2014 05:31:22 +0100
Subject: [PATCH 137/204] First shot on 0.9.2.

---
 0001-Changing-effective-user-default.patch    |   24 +
 ...gfault-when-starting-lircd-AUR-41581.patch |   26 -
 ...-lircd-Fix-bad-default-for-lircdfile.patch |   25 -
 ...Make-make_rel_symlink.py-use-python3.patch |   42 +
 ...gfault-when-parsing-connect-in-confi.patch |   26 -
 ...ts-instead-of-printf-when-applicable.patch | 1031 +++++++++++++++++
 0004-all-Sanitize-feature-tests-macros.patch  |   87 ++
 ...compiler-error-format-security-error.patch |   25 -
 ...ure.ac-Use-pkg-config-to-locate-ftdi.patch |   53 +
 README.fedora                                 |   81 +-
 TODO                                          |    7 -
 lirc.init                                     |  134 ---
 lirc.spec                                     |  347 ++++--
 13 files changed, 1541 insertions(+), 367 deletions(-)
 create mode 100644 0001-Changing-effective-user-default.patch
 delete mode 100644 0001-Fix-segfault-when-starting-lircd-AUR-41581.patch
 delete mode 100644 0002-lircd-Fix-bad-default-for-lircdfile.patch
 create mode 100644 0002-tools-Make-make_rel_symlink.py-use-python3.patch
 delete mode 100644 0003-0.9.1a-Bugfix-segfault-when-parsing-connect-in-confi.patch
 create mode 100644 0003-all-Use-puts-instead-of-printf-when-applicable.patch
 create mode 100644 0004-all-Sanitize-feature-tests-macros.patch
 delete mode 100644 0004-lircd-fix-compiler-error-format-security-error.patch
 create mode 100644 0005-configure.ac-Use-pkg-config-to-locate-ftdi.patch
 delete mode 100644 TODO
 delete mode 100755 lirc.init

diff --git a/0001-Changing-effective-user-default.patch b/0001-Changing-effective-user-default.patch
new file mode 100644
index 0000000..c562239
--- /dev/null
+++ b/0001-Changing-effective-user-default.patch
@@ -0,0 +1,24 @@
+From 184366b6200c80fae167853bab0038a54538ad16 Mon Sep 17 00:00:00 2001
+From: Alec Leamas <leamas.alec@gmail.com>
+Date: Thu, 11 Dec 2014 00:30:23 +0100
+Subject: [PATCH] Changing effective-user default
+
+---
+ lirc_options.conf | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/lirc_options.conf b/lirc_options.conf
+index 9dc672a..bf342c1 100644
+--- a/lirc_options.conf
++++ b/lirc_options.conf
+@@ -12,6 +12,7 @@ plugindir       = /usr/lib/lirc/plugins
+ permission      = 666
+ allow-simulate  = No
+ repeat-max      = 600
++effective-user  = lirc
+ #listen         = [address:]port
+ #connect        = host[:port]
+ #debug          = 6
+-- 
+1.9.3
+
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 57c88aa..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
-@@ -7,7 +7,7 @@ nodaemon        = False
- permission      = 666
- driver          = default
- device          = /dev/lirc0
--output          = /var/run/lirc/lircd
-+lircdfile       = /var/run/lirc/lircd
- pidfile         = /var/run/lirc/lircd.pid
- plugindir       = /usr/lib/lirc/plugins
- allow-simulate  = No
--- 
-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 946fa21..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.c b/daemons/lircd.c
-index db8ea13..fa8cf17 100644
---- a/daemons/lircd.c
-+++ b/daemons/lircd.c
-@@ -2147,7 +2147,7 @@ static void lircd_add_defaults(void)
- 		"lircd:device", 	LIRC_DRIVER_DEVICE,
- 		"lircd:listen", 	NULL ,
- 		"lircd:connect", 	NULL,
--		"lircd:output", 	LIRCD,
-+		"lircd:lircdfile", 	LIRCD,
- 		"lircd:pidfile", 	PIDFILE,
- 		"lircd:logfile", 	LOGFILE,
- 		"lircd:debug", 		"False",
--- 
-1.8.4.2
-
diff --git a/0002-tools-Make-make_rel_symlink.py-use-python3.patch b/0002-tools-Make-make_rel_symlink.py-use-python3.patch
new file mode 100644
index 0000000..506baa9
--- /dev/null
+++ b/0002-tools-Make-make_rel_symlink.py-use-python3.patch
@@ -0,0 +1,42 @@
+From 1b347e9e7909afd08fce12992da67340144aeb70 Mon Sep 17 00:00:00 2001
+From: Alec Leamas <leamas.alec@gmail.com>
+Date: Thu, 11 Dec 2014 04:44:49 +0100
+Subject: [PATCH 1/5] tools: Make make_rel_symlink.py use python3.
+
+---
+ tools/make_rel_symlink.py | 8 ++++----
+ 1 file changed, 4 insertions(+), 4 deletions(-)
+
+diff --git a/tools/make_rel_symlink.py b/tools/make_rel_symlink.py
+index 5c89305..896637f 100755
+--- a/tools/make_rel_symlink.py
++++ b/tools/make_rel_symlink.py
+@@ -1,4 +1,4 @@
+-#!/usr/bin/env python
++#!/usr/bin/env python3
+ 
+ import os
+ import os.path
+@@ -32,16 +32,16 @@ if sys.argv[1] == "-p":
+     sys.argv = sys.argv[ 1:]
+ 
+ if len( sys.argv ) != 3:
+-    print USAGE
++    print(USAGE)
+     sys.exit( 1 )
+ 
+ if  os.path.isdir(  sys.argv[2] ):
+-    print "Removing link target dir:" +  sys.argv[2]
++    print("Removing link target dir:" +  sys.argv[2])
+     shutil.rmtree( sys.argv[2])
+ 
+ link_path = relative_ln_s( sys.argv[1], sys.argv[2] )
+ if just_print:
+-    print link_path
++    print(link_path)
+ else:
+     os.chdir( os.path.dirname( sys.argv[2]))
+     target = os.path.basename( sys.argv[2])
+-- 
+1.9.3
+
diff --git a/0003-0.9.1a-Bugfix-segfault-when-parsing-connect-in-confi.patch b/0003-0.9.1a-Bugfix-segfault-when-parsing-connect-in-confi.patch
deleted file mode 100644
index 5b6dca7..0000000
--- a/0003-0.9.1a-Bugfix-segfault-when-parsing-connect-in-confi.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-From 3ebd89ac194279fb56d781d03a5368f4b0e76caa Mon Sep 17 00:00:00 2001
-From: Andreas Bader <andreasbader at badersystems.de>
-Date: Tue, 19 Aug 2014 16:58:21 +0200
-Subject: [PATCH 3/3] 0.9.1a: Bugfix: segfault when parsing --connect in config
- file.
-
----
- daemons/lircd.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/daemons/lircd.c b/daemons/lircd.c
-index fa8cf17..7af4265 100644
---- a/daemons/lircd.c
-+++ b/daemons/lircd.c
-@@ -2311,7 +2311,7 @@ int main(int argc, char **argv)
- 	}
- 	opt = options_getstring("lircd:connect");
- 	if (opt != NULL) {
--		if (!add_peer_connection(optarg))
-+		if (!add_peer_connection(opt))
- 			return(EXIT_FAILURE);
- 	}
- #       ifdef DEBUG
--- 
-1.8.4.2
-
diff --git a/0003-all-Use-puts-instead-of-printf-when-applicable.patch b/0003-all-Use-puts-instead-of-printf-when-applicable.patch
new file mode 100644
index 0000000..d3a04ae
--- /dev/null
+++ b/0003-all-Use-puts-instead-of-printf-when-applicable.patch
@@ -0,0 +1,1031 @@
+From 25523fe4bfb383ae1d34843292544fef7145eb2a Mon Sep 17 00:00:00 2001
+From: Alec Leamas <leamas.alec@gmail.com>
+Date: Thu, 11 Dec 2014 10:38:38 +0100
+Subject: [PATCH 3/5] all: Use puts() instead of printf() when applicable.
+
+Recent gcc compilers emits warnings when using printf() on
+constant data where puts()/fputs() is a better choice.
+---
+ daemons/lircd.c        |   4 +-
+ daemons/lircmd.c       |   2 +-
+ lib/lirc_client.c      |   2 +
+ tools/irrecord.c       | 105 +++++++++++++++++++++++++------------------------
+ tools/irsend.c         |   2 +-
+ tools/irsimreceive.c   |  26 ++++++------
+ tools/irsimsend.c      |  14 +++----
+ tools/irtestcase.c     |  27 ++++++-------
+ tools/lirc-lsplugins.c |  34 ++++++++--------
+ tools/lirc-lsremotes.c |  14 +++----
+ tools/mode2.c          |  38 +++++++++---------
+ tools/xmode2.c         |  23 +++++------
+ 12 files changed, 148 insertions(+), 143 deletions(-)
+
+diff --git a/daemons/lircd.c b/daemons/lircd.c
+index 3a7f744..ab44e80 100644
+--- a/daemons/lircd.c
++++ b/daemons/lircd.c
+@@ -2266,7 +2266,7 @@ static void lircd_parse_options(int argc, char** const argv)
+ 	{
+ 		switch (c) {
+ 		case 'h':
+-			printf(help);
++			puts(help);
+ 			exit(EXIT_SUCCESS);
+ 		case 'v':
+ 			printf("lircd %s\n", VERSION);
+@@ -2414,7 +2414,7 @@ int main(int argc, char **argv)
+ 		opt = options_getstring("lircd:listen_hostport");
+ 		if (opt){
+ 			if (opt2host_port(opt, &address, &port, errmsg) != 0){
+-				fprintf(stderr, errmsg);
++				fputs(errmsg, stderr);
+ 				return(EXIT_FAILURE);
+ 			}
+ 		} else
+diff --git a/daemons/lircmd.c b/daemons/lircmd.c
+index 023777c..869b3a9 100644
+--- a/daemons/lircmd.c
++++ b/daemons/lircmd.c
+@@ -784,7 +784,7 @@ static void lircmd_parse_options(int argc,  char** const argv)
+ 	{
+ 		switch (c) {
+ 		case 'h':
+-			printf(help);
++			puts(help);
+ 			exit(EXIT_SUCCESS);
+ 		case 'v':
+ 			printf("lircmd %s\n",  VERSION);
+diff --git a/lib/lirc_client.c b/lib/lirc_client.c
+index c441803..4720f3f 100644
+--- a/lib/lirc_client.c
++++ b/lib/lirc_client.c
+@@ -105,6 +105,8 @@ chk_write(int fd, const void *buf, size_t count, const char* msg)
+ 		perror(msg);
+ 	}
+ }
++
++
+ int lirc_command_init(lirc_cmd_ctx* ctx, const char* fmt, ...)
+ {
+ 	va_list ap;
+diff --git a/tools/irrecord.c b/tools/irrecord.c
+index f52328c..788e425 100644
+--- a/tools/irrecord.c
++++ b/tools/irrecord.c
+@@ -339,7 +339,7 @@ static void parse_options(int argc, char** const argv)
+ 			options_set_opt("irrecord:driver", optarg);
+ 			break;
+ 		case 'h':
+-			printf(help);
++			puts(help);
+ 			exit(EXIT_SUCCESS);
+ 		case 'i':
+ 			options_set_opt("irrecord:invert", "True");
+@@ -374,14 +374,14 @@ static void parse_options(int argc, char** const argv)
+ 			printf("irrecord %s\n",  VERSION);
+ 			exit(EXIT_SUCCESS);
+ 		default:
+-			fprintf(stderr, USAGE);
++			fputs(USAGE, stderr);
+ 			exit(EXIT_FAILURE);
+ 		}
+ 	}
+ 	if (optind == argc - 1) {
+ 		options_set_opt("configfile", argv[optind]);
+ 	} else if (optind != argc) {
+-		fprintf(stderr, "irrecord: invalid argument count\n");
++		fputs("irrecord: invalid argument count\n", stderr);
+ 		exit(EXIT_FAILURE);
+ 	}
+ }
+@@ -416,7 +416,7 @@ int main(int argc, char **argv)
+ 	analyse = options_getboolean("irrecord:analyse");
+ 	if (hw_choose_driver(opt) != 0 && ! analyse) {
+ 		fprintf(stderr, "Driver `%s' not found", opt);
+-		fprintf(stderr, " (wrong or missing -U/--plugindir?).\n");
++		fputs(" (wrong or missing -U/--plugindir?).\n", stderr);
+ 		hw_print_drivers(stderr);
+ 		exit(EXIT_FAILURE);
+ 	}
+@@ -526,9 +526,9 @@ int main(int argc, char **argv)
+ 		perror(progname);
+ 		exit(EXIT_FAILURE);
+ 	}
+-	printf("\nirrecord -  application for recording IR-codes" " for usage with lirc\n" "\n"
++	puts("\nirrecord -  application for recording IR-codes" " for usage with lirc\n" "\n"
+ 	       "Copyright (C) 1998,1999 Christoph Bartelmus" "(lirc@bartelmus.de)\n");
+-	printf("\n");
++	puts("\n");
+ 
+ 	if (curr_driver->init_func) {
+ 		if (!curr_driver->init_func()) {
+@@ -561,16 +561,16 @@ int main(int argc, char **argv)
+ 		exit(EXIT_FAILURE);
+ 	}
+ 
+-	printf("This program will record the signals from your remote control\n"
++	puts("This program will record the signals from your remote control\n"
+ 	       "and create a config file for lircd.\n\n" "\n");
+ 	if (curr_driver->name && strcmp(curr_driver->name, "devinput") == 0) {
+-		printf("Usually it's not necessary to create a new config file for devinput\n"
++		puts("Usually it's not necessary to create a new config file for devinput\n"
+ 		       "devices. A generic config file can be found at:\n"
+ 		       "https://sourceforge.net/p/lirc-remotes/code/ci/master/tree/remotes/devinput/devinput.lircd.conf"
+ 		       "It can be downloaded using irdb-get(1)\n"
+ 		       "Please try this config file before creating your own.\n" "\n");
+ 	}
+-	printf("A proper config file for lircd is maybe the most vital part of this\n"
++	puts("A proper config file for lircd is maybe the most vital part of this\n"
+ 	       "package, so you should invest some time to create a working config\n"
+ 	       "file. Although I put a good deal of effort in this program it is often\n"
+ 	       "not possible to automatically recognize all features of a remote\n"
+@@ -610,7 +610,7 @@ int main(int argc, char **argv)
+ 					curr_driver->deinit_func();
+ 				exit(EXIT_FAILURE);
+ 			}
+-			printf("Creating config file in raw mode.\n");
++			puts("Creating config file in raw mode.\n");
+ 			set_protocol(&remote, RAW_CODES);
+ 			remote.eps = eps;
+ 			remote.aeps = aeps;
+@@ -643,7 +643,7 @@ int main(int argc, char **argv)
+ 			curr_driver->rec_func(NULL);
+ 		}
+ 		if (!get_toggle_bit_mask(&remote)) {
+-			printf("But I know for sure that RC6 has a toggle bit!\n");
++			puts("But I know for sure that RC6 has a toggle bit!\n");
+ 			fclose(fout);
+ 			unlink(filename);
+ 			if (curr_driver->deinit_func)
+@@ -651,7 +651,7 @@ int main(int argc, char **argv)
+ 			exit(EXIT_FAILURE);
+ 		}
+ 	}
+-	printf("Now enter the names for the buttons.\n");
++	puts("Now enter the names for the buttons.\n");
+ 
+ 	fprint_copyright(fout);
+ 	fprint_comment(fout, &remote, commandline);
+@@ -663,8 +663,8 @@ int main(int argc, char **argv)
+ 
+ 		if (no_data) {
+ 			fprintf(stderr, "%s: no data for 10 secs," " aborting\n", progname);
+-			printf("The last button did not seem to generate any signal.\n");
+-			printf("Press RETURN to continue.\n\n");
++			puts("The last button did not seem to generate any signal.\n");
++			puts("Press RETURN to continue.\n\n");
+ 			getchar();
+ 			no_data = 0;
+ 		}
+@@ -678,13 +678,13 @@ int main(int argc, char **argv)
+ 		}
+ 		buffer[strlen(buffer) - 1] = 0;
+ 		if (strchr(buffer, ' ') || strchr(buffer, '\t')) {
+-			printf("The name must not contain any whitespace.\n");
+-			printf("Please try again.\n");
++			puts("The name must not contain any whitespace.\n");
++			puts("Please try again.\n");
+ 			continue;
+ 		}
+ 		if (strcasecmp(buffer, "begin") == 0 || strcasecmp(buffer, "end") == 0) {
+ 			printf("'%s' is not allowed as button name\n", buffer);
+-			printf("Please try again.\n");
++			puts("Please try again.\n");
+ 			continue;
+ 		}
+ 		if (strlen(buffer) == 0) {
+@@ -693,7 +693,7 @@ int main(int argc, char **argv)
+ 		if (!disable_namespace && !is_in_namespace(buffer)) {
+ 			printf("'%s' is not in name space (use --disable-namespace to disable checks)\n", buffer);
+ 			printf("Use '%s --list-namespace' to see a full list of valid button names\n", progname);
+-			printf("Please try again.\n");
++			puts("Please try again.\n");
+ 			continue;
+ 		}
+ 
+@@ -730,9 +730,9 @@ int main(int argc, char **argv)
+ 				}
+ 				if (count == 0) {
+ 					if (!is_space(data) || data < remote.gap - remote.gap * remote.eps / 100) {
+-						printf("Sorry, something went wrong.\n");
++						puts("Sorry, something went wrong.\n");
+ 						sleep(3);
+-						printf("Try again.\n");
++						puts("Try again.\n");
+ 						flushhw();
+ 						count = 0;
+ 						continue;
+@@ -742,13 +742,13 @@ int main(int argc, char **argv)
+ 					    && (is_const(&remote) ? data >
+ 						(remote.gap > sum ? (remote.gap - sum) * (100 - remote.eps) / 100 : 0)
+ 						: data > remote.gap * (100 - remote.eps) / 100)) {
+-						printf("Got it.\n");
++						puts("Got it.\n");
+ 						printf("Signal length is %d\n", count - 1);
+ 						if (count % 2) {
+-							printf("That's weird because the signal length "
++							puts("That's weird because the signal length "
+ 							       "must be odd!\n");
+ 							sleep(3);
+-							printf("Try again.\n");
++							puts("Try again.\n");
+ 							flushhw();
+ 							count = 0;
+ 							continue;
+@@ -766,7 +766,7 @@ int main(int argc, char **argv)
+ 				count++;
+ 			}
+ 			if (count == MAX_SIGNALS) {
+-				printf("Signal is too long.\n");
++				puts("Signal is too long.\n");
+ 			}
+ 			if (retval == EXIT_FAILURE)
+ 				break;
+@@ -814,7 +814,7 @@ int main(int argc, char **argv)
+ 				}
+ 				break;
+ 			} else {
+-				printf("Something went wrong. ");
++				puts("Something went wrong. ");
+ 				if (retries > 1) {
+ 					fflush(stdout);
+ 					sleep(3);
+@@ -826,8 +826,8 @@ int main(int argc, char **argv)
+ 					flushhw();
+ 					printf("Please try again. (%d retries left)\n", retries - 1);
+ 				} else {
+-					printf("\n");
+-					printf("Try using the -f option.\n");
++					puts("\n");
++					puts("Try using the -f option.\n");
+ 				}
+ 				retries--;
+ 				continue;
+@@ -1033,8 +1033,8 @@ int get_toggle_bit_mask(struct ir_remote *remote)
+ 		}
+ 	}
+ 
+-	printf("Checking for toggle bit mask.\n");
+-	printf("Please press an arbitrary button repeatedly as fast as possible.\n"
++	puts("Checking for toggle bit mask.\n");
++	puts("Please press an arbitrary button repeatedly as fast as possible.\n"
+ 	       "Make sure you keep pressing the SAME button and that you DON'T HOLD\n" "the button down!.\n"
+ 	       "If you can't see any dots appear, then wait a bit between button presses.\n" "\n"
+ 	       "Press RETURN to continue.");
+@@ -1089,7 +1089,7 @@ int get_toggle_bit_mask(struct ir_remote *remote)
+ 					set_toggle_bit_mask(remote, first ^ decode_ctx.code);
+ 					found = 1;
+ 				}
+-				printf(".");
++				puts(".");
+ 				fflush(stdout);
+ 				retries--;
+ 			} else {
+@@ -1101,12 +1101,12 @@ int get_toggle_bit_mask(struct ir_remote *remote)
+ 		}
+ 	}
+ 	if (!found) {
+-		printf("\nNo toggle bit mask found.\n");
++		puts("\nNo toggle bit mask found.\n");
+ 	} else {
+ 		if (remote->toggle_bit_mask > 0) {
+ 			printf("\nToggle bit mask is 0x%llx.\n", (__u64) remote->toggle_bit_mask);
+ 		} else if (remote->toggle_mask != 0) {
+-			printf("\nToggle mask found.\n");
++			puts("\nToggle mask found.\n");
+ 		}
+ 	}
+ 	if (seq > 0)
+@@ -1533,12 +1533,12 @@ int get_lengths(struct ir_remote *remote, int force, int interactive)
+ 	int first_signal;
+ 
+ 	if (interactive) {
+-		printf("Now start pressing buttons on your remote control.\n\n");
+-		printf("It is very important that you press many different buttons and hold them\n"
++		puts("Now start pressing buttons on your remote control.\n\n");
++		puts("It is very important that you press many different buttons and hold them\n"
+ 		       "down for approximately one second. Each button should generate at least one\n"
+ 		       "dot but in no case more than ten dots of output.\n"
+ 		       "Don't stop pressing buttons until two lines of dots (2x80) have been\n" "generated.\n\n");
+-		printf("Press RETURN now to start recording.");
++		puts("Press RETURN now to start recording.");
+ 		fflush(stdout);
+ 		getchar();
+ 		flushhw();
+@@ -1647,7 +1647,7 @@ int get_lengths(struct ir_remote *remote, int force, int interactive)
+ 
+ 					if (interactive) {
+ 						for (i = maxcount - lastmaxcount; i > 0; i--) {
+-							printf(".");
++							puts(".");
+ 							fflush(stdout);
+ 						}
+ 					}
+@@ -1715,7 +1715,7 @@ int get_lengths(struct ir_remote *remote, int force, int interactive)
+ 						int i;
+ 
+ 						if (interactive) {
+-							printf(".");
++							puts(".");
+ 							fflush(stdout);
+ 						}
+ 						count_signals++;
+@@ -2130,7 +2130,7 @@ int get_repeat_length(struct ir_remote *remote, int interactive)
+ 
+ 	if (!((count_3repeats > SAMPLES / 2 ? 1 : 0) ^ (count_5repeats > SAMPLES / 2 ? 1 : 0))) {
+ 		if (count_3repeats > SAMPLES / 2 || count_5repeats > SAMPLES / 2) {
+-			printf("Repeat inconsitentcy.\n");
++			puts("Repeat inconsitentcy.\n");
+ 			return (0);
+ 		}
+ 		i_printf(interactive, "No repeat code found.\n");
+@@ -2151,7 +2151,7 @@ int get_repeat_length(struct ir_remote *remote, int interactive)
+ 		}
+ 		if (max_count >= sum * TH_REPEAT / 100) {
+ 			if (count_5repeats > count_3repeats && !has_header(remote)) {
+-				printf("Repeat code has header," " but no header found!\n");
++				puts("Repeat code has header," " but no header found!\n");
+ 				return (0);
+ 			}
+ 			if (count_5repeats > count_3repeats && has_header(remote)) {
+@@ -2199,7 +2199,7 @@ void unlink_length(struct lengths **first, struct lengths *remove)
+ 			scan = scan->next;
+ 		}
+ 	}
+-	printf("unlink_length(): report this bug!\n");
++	puts("unlink_length(): report this bug!\n");
+ }
+ 
+ int get_data_length(struct ir_remote *remote, int interactive)
+@@ -2224,12 +2224,12 @@ int get_data_length(struct ir_remote *remote, int interactive)
+ 				max2_plength = NULL;
+ 		}
+ 		if (lirc_log_is_enabled_for(LIRC_DEBUG)) {
+-			printf("Pulse canditates: ");
++			puts("Pulse canditates: ");
+ 			printf("%u x %u", max_plength->count, (__u32) calc_signal(max_plength));
+ 			if (max2_plength)
+ 				printf(", %u x %u", max2_plength->count, (__u32)
+ 				       calc_signal(max2_plength));
+-			printf("\n");
++			puts("\n");
+ 		}
+ 
+ 		max_slength = get_max_length(first_space, &sum);
+@@ -2247,21 +2247,21 @@ int get_data_length(struct ir_remote *remote, int interactive)
+ 			}
+ 			if (lirc_log_is_enabled_for(LIRC_DEBUG)) {
+ 				if (max_count >= sum * TH_IS_BIT / 100) {
+-					printf("Space candidates: ");
++					puts("Space candidates: ");
+ 					printf("%u x %u", max_slength->count,
+ 					       (__u32) calc_signal(max_slength));
+ 					if (max2_slength)
+ 						printf(", %u x %u",
+ 						       max2_slength->count,
+ 						       (__u32) calc_signal(max2_slength));
+-					printf("\n");
++					puts("\n");
+ 				}
+ 			}
+ 			remote->eps = eps;
+ 			remote->aeps = aeps;
+ 			if (is_biphase(remote)) {
+ 				if (max2_plength == NULL || max2_slength == NULL) {
+-					printf("Unknown encoding found.\n");
++					puts("Unknown encoding found.\n");
+ 					return (0);
+ 				}
+ 				i_printf(interactive, "Signals are biphase encoded.\n");
+@@ -2276,11 +2276,11 @@ int get_data_length(struct ir_remote *remote, int interactive)
+ 				remote->szero = remote->sone;
+ 			} else {
+ 				if (max2_plength == NULL && max2_slength == NULL) {
+-					printf("No encoding found.\n");
++					puts("No encoding found.\n");
+ 					return (0);
+ 				}
+ 				if (max2_plength && max2_slength) {
+-					printf("Unknown encoding found.\n");
++					puts("Unknown encoding found.\n");
+ 					return (0);
+ 				}
+ 				p1 = calc_signal(max_plength);
+@@ -2348,7 +2348,7 @@ int get_data_length(struct ir_remote *remote, int interactive)
+ 		}
+ 		free_lengths(&max_plength);
+ 	}
+-	printf("Could not find data lengths.\n");
++	puts("Could not find data lengths.\n");
+ 	return (0);
+ }
+ 
+@@ -2366,7 +2366,7 @@ int get_gap_length(struct ir_remote *remote)
+ 
+ 	flag = 0;
+ 	lastmaxcount = 0;
+-	printf("Hold down an arbitrary button.\n");
++	puts("Hold down an arbitrary button.\n");
+ 	while (1) {
+ 		while (availabledata()) {
+ 			curr_driver->rec_func(NULL);
+@@ -2398,7 +2398,7 @@ int get_gap_length(struct ir_remote *remote)
+ 			}
+ 			if (maxcount > lastmaxcount) {
+ 				lastmaxcount = maxcount;
+-				printf(".");
++				puts(".");
+ 				fflush(stdout);
+ 			}
+ 		} else {
+@@ -2411,9 +2411,10 @@ int get_gap_length(struct ir_remote *remote)
+ 
+ void fprint_copyright(FILE * fout)
+ {
+-	fprintf(fout, "\n"
++	fputs("\n"
+ 		"# Please take the time to finish this file as described in\n"
+ 		"# https://sourceforge.net/p/lirc-remotes/wiki/Checklist/\n"
+ 		"# and make it available to others by sending it to \n"
+-		"# <lirc@bartelmus.de>\n");
++		"# <lirc@bartelmus.de>\n",
++                fout);
+ }
+diff --git a/tools/irsend.c b/tools/irsend.c
+index 71cc95f..cfde7b9 100644
+--- a/tools/irsend.c
++++ b/tools/irsend.c
+@@ -117,7 +117,7 @@ int main(int argc, char **argv)
+ 			break;
+ 		switch (c) {
+ 		case 'h':
+-			printf(help);
++			fputs(help, stdout);
+ 			return (EXIT_SUCCESS);
+ 		case 'v':
+ 			printf("%s %s\n", prog, VERSION);
+diff --git a/tools/irsimreceive.c b/tools/irsimreceive.c
+index 4a5a3b8..3c3d0bb 100644
+--- a/tools/irsimreceive.c
++++ b/tools/irsimreceive.c
+@@ -43,25 +43,25 @@ static void setup(const char* path)
+ 		exit(EXIT_FAILURE);
+ 	}
+ 	if (hw_choose_driver("file") == -1) {
+-		fprintf(stderr,
+-			"Cannot load file driver (bad plugin path?)\n");
++		fputs("Cannot load file driver (bad plugin path?)\n",
++                      stderr);
+ 		exit(EXIT_FAILURE);
+ 	}
+ 	r = curr_driver->open_func("dummy.out");
+ 	if (r == 0) {
+-		fprintf(stderr, "Cannot open driver\n");
++		fputs("Cannot open driver\n", stderr);
+ 		exit(EXIT_FAILURE);
+ 	}
+ 	r = curr_driver->init_func();
+ 	if (r == 0) {
+-		fprintf(stderr, "Cannot init driver\n");
++		fputs("Cannot init driver\n", stderr);
+ 		exit(EXIT_FAILURE);
+ 	}
+ 	strcpy(option.key, "set-infile");
+ 	strncpy(option.value, path, sizeof(option.value));
+ 	r = curr_driver->drvctl_func(DRVCTL_SET_OPTION, (void*) &option);
+ 	if (r != 0) {
+-		fprintf(stderr, "Cannot set driver infile.\n");
++		fputs("Cannot set driver infile.\n", stderr);
+ 		exit(EXIT_FAILURE);
+ 	}
+ }
+@@ -102,7 +102,7 @@ void printcode(char* s)
+ 	int len;
+ 
+ 	if (s == NULL) {
+-		printf( "None\n");
++		puts("None\n");
+ 	} else {
+ 		len = strlen(s);
+                 if (strlen(s) > 2 && s[len -1] == '\n') {
+@@ -140,23 +140,23 @@ int main(int argc, char *argv[])
+ 	       != EOF) {
+ 		switch (c) {
+ 		case 'h':
+-			printf(USAGE);
+-			return (EXIT_SUCCESS);
++			puts(USAGE);
++			return EXIT_SUCCESS;
+ 		case 'v':
+ 			printf("%s\n", "irw " VERSION);
+-			return (EXIT_SUCCESS);
++			return EXIT_SUCCESS;
+ 		case 'U':
+ 			options_set_opt("lircd:pluginpath", optarg);
+ 			break;
+ 		case '?':
+ 			fprintf(stderr, "unrecognized option: -%c\n", optopt);
+-			fprintf(stderr,
+-                                "Try `irsimsend -h' for more information.\n");
+-			return (EXIT_FAILURE);
++			fputs("Try `irsimsend -h' for more information.\n",
++                              stderr);
++			return EXIT_FAILURE;
+ 		}
+ 	}
+ 	if (argc != optind + 2) {
+-		fprintf(stderr, USAGE);
++		fputs(USAGE, stderr);
+ 		return EXIT_FAILURE;
+ 	}
+ 	lirc_log_get_clientlog("irsimreceive", path, sizeof(path));
+diff --git a/tools/irsimsend.c b/tools/irsimsend.c
+index b72831a..7572d84 100644
+--- a/tools/irsimsend.c
++++ b/tools/irsimsend.c
+@@ -65,8 +65,8 @@ static struct ir_remote* setup(const char* path)
+ 	FILE* f;
+ 
+ 	if (hw_choose_driver("file") == -1) {
+-		fprintf(stderr,
+-			"Cannot load file driver (bad plugin path?)\n");
++		fputs("Cannot load file driver (bad plugin path?)\n",
++                       stderr);
+ 		exit(EXIT_FAILURE);
+ 	}
+ 	unlink(OUTFILE);
+@@ -196,7 +196,7 @@ int parse_uint_arg(const char* optind, const char* errmsg)
+ 
+ 	c = strtol(optarg, NULL, 10);
+ 	if (c > INT_MAX || c < 0 || errno == EINVAL || errno == ERANGE) {
+-		fprintf(stderr, errmsg);
++		fputs(errmsg, stderr);
+ 		exit(EXIT_FAILURE);
+ 	}
+ 	return (int) c;
+@@ -213,7 +213,7 @@ int main(int argc, char *argv[])
+ 	       != EOF) {
+ 		switch (c) {
+ 		case 'h':
+-			printf(USAGE);
++			puts(USAGE);
+ 			return (EXIT_SUCCESS);
+ 		case 'c':
+ 			opt_count = parse_uint_arg(optarg,
+@@ -237,13 +237,13 @@ int main(int argc, char *argv[])
+ 			break;
+ 		case '?':
+ 			fprintf(stderr, "unrecognized option: -%c\n", optopt);
+-			fprintf(stderr,
+-                                "Try `irsimsend -h' for more information.\n");
++			fputs("Try `irsimsend -h' for more information.\n",
++                               stderr);
+ 			return (EXIT_FAILURE);
+ 		}
+ 	}
+ 	if (argc != optind + 1) {
+-		fprintf(stderr, USAGE);
++		fputs(USAGE, stderr);
+ 		return EXIT_FAILURE;
+ 	}
+ 	lirc_log_get_clientlog("irsimsend", path, sizeof(path));
+diff --git a/tools/irtestcase.c b/tools/irtestcase.c
+index 95d59b7..149c1ad 100644
+--- a/tools/irtestcase.c
++++ b/tools/irtestcase.c
+@@ -92,7 +92,7 @@ static void set_testinput(int fd, const char* path)
+ 	lirc_command_init(&command, "DRV_OPTION set-infile %s\n", path);
+ 	r = lirc_command_run(&command, fd);
+ 	if (r != 0) {
+-		fprintf(stderr, "Cannot set test input file\n");
++		fputs("Cannot set test input file\n", stderr);
+ 		exit(2);
+ 	}
+ }
+@@ -137,7 +137,7 @@ static int nextcode(int fd, char* buff, ssize_t size)
+ 		exit(errno);
+ 	};
+ 	if (strstr(buff, "__EOF") != NULL) {
+-		printf("Exit on EOF\n");
++		puts("Exit on EOF\n");
+ 		exit(0);
+ 	}
+ 	if (i >= 0) {
+@@ -176,16 +176,16 @@ static int irtestcase(int fd_io, int fd_cmd)
+ 
+ 	if (opt_lircrc != NULL) {
+ 		if (lirc_readconfig_only(opt_lircrc, &config, NULL) != 0) {
+-			fprintf(stderr, "Cannot initiate lircrc decoding\n");
++			fputs("Cannot initiate lircrc decoding\n", stderr);
+ 			exit(2);
+ 		}
+ 	}
+ 	while (nextcode(fd_io, code, sizeof(code)) == 1) {
+-		printf(code);
++		puts(code);
+ 		if (strstr(code, "__EOF") != NULL) {
+ 			exit(0);
+ 		}
+-		fprintf(code_log, code);
++		fputs(code, code_log);
+ 		if (opt_lircrc != NULL){
+ 			r = lirc_code2char(config, code, &c);
+ 			while (r == 0 && c != NULL) {
+@@ -222,36 +222,35 @@ int main(int argc, char *argv[])
+ 			opt_testdata = optarg;
+ 			break;
+ 		case 'h':
+-			printf(USAGE);
++			puts(USAGE);
+ 			return (EXIT_SUCCESS);
+ 		case 'v':
+ 			printf("%s\n", "irtestcase " VERSION);
+ 			return (EXIT_SUCCESS);
+ 		case '?':
+ 			fprintf(stderr, "unrecognized option: -%c\n", optopt);
+-			fprintf(stderr, "Try `irtestcase --help'.\n");
++			fputs("Try `irtestcase --help'.\n", stderr);
+ 			return (EXIT_FAILURE);
+ 		}
+ 	}
+ 	if (argc > optind + 1) {
+-		fprintf(stderr,
+-			"irtestcase: Too many arguments (max one).\n");
+-		fprintf(stderr, "Try `irtestcase --help'.\n");
++		fputs("irtestcase: Too many arguments (max one).\n", stderr);
++		fputs("Try `irtestcase --help'.\n", stderr);
+ 		return (EXIT_FAILURE);
+ 	}
+ 	if (strcmp(opt_prog, DEFAULT_PROG) != 0 && opt_lircrc == NULL) {
+-		fprintf(stderr, "--prog requires --lircrc/-l. Giving up.\n");
++		fputs("--prog requires --lircrc/-l. Giving up.\n", stderr);
+ 		return (EXIT_FAILURE);
+ 	}
+ 	if (opt_lircrc != NULL && strcmp(opt_prog, DEFAULT_PROG) == 0) {
+-		fprintf(stderr, "--lircrc requires --prog/-p. Giving up.\n");
++		fputs("--lircrc requires --prog/-p. Giving up.\n", stderr);
+ 		return (EXIT_FAILURE);
+ 	}
+ 
+ 	init_testdir();
+ 	fd_cmd = lirc_get_local_socket(NULL, 1);
+ 	if (fd_cmd < 0) {
+-		fprintf(stderr, "Cannot open lircd socket.\n");
++		fputs("Cannot open lircd socket.\n", stderr);
+ 		exit(3);
+ 	}
+ 	set_devicelog(fd_cmd, DEVICE_LOG);
+@@ -267,7 +266,7 @@ int main(int argc, char *argv[])
+ 	setenv("LIRC_SOCKET_PATH", socketpath, 0);
+ 	fd_io = lirc_init(opt_prog, 1);
+ 	if (fd_io < 0) {
+-		fprintf(stderr, "Cannot run lirc_init.\n");
++		fputs("Cannot run lirc_init.\n", stderr);
+ 		exit(3);
+ 	}
+ 
+diff --git a/tools/lirc-lsplugins.c b/tools/lirc-lsplugins.c
+index 10403a7..4b723c9 100644
+--- a/tools/lirc-lsplugins.c
++++ b/tools/lirc-lsplugins.c
+@@ -111,7 +111,7 @@ static void  lines_next(line_t* line)
+ {
+ 	lines[line_ix++] = line;
+ 	if (line_ix >= MAX_PLUGINS -1){
+-		fprintf(stderr, "Too many plugins, giving up. Sorry.");
++		fputs("Too many plugins, giving up. Sorry.", stderr);
+ 		exit(2);
+ 	}
+ }
+@@ -152,7 +152,7 @@ static void line_print(const line_t* line)
+ 	printf("%-20s%-6s%s\n",
+                line->name,  line->flags, line->path);
+ 	if (line->errors)
+-		printf(line->errors);
++		puts(line->errors);
+ }
+ 
+ static void print_folded_item(const char* arg)
+@@ -163,7 +163,7 @@ static void print_folded_item(const char* arg)
+ 	char* token;
+ 
+ 	if (arg == NULL) {
+-		printf("None\n");
++		puts("None\n");
+ 		return;
+ 	}
+ 	buff = alloca(strlen(arg) + 1);
+@@ -171,18 +171,18 @@ static void print_folded_item(const char* arg)
+ 	token = strtok(buff, " \t");
+ 	while (token != NULL) {
+ 		if (strlen(token) + pos > 80) {
+-			printf("\n\t\t");
++			puts("\n\t\t");
+ 			pos = 0;
+ 		}
+ 		if (pos != START_POS && pos != 0){
+-			printf(" ");
++			puts(" ");
+ 			pos += 1;
+ 		}
+-		printf(token);
++		puts(token);
+ 		pos += strlen(token);
+ 		token = strtok(NULL, " \t");
+ 	}
+-	printf("\n");
++	puts("\n");
+ }
+ 
+ 
+@@ -220,7 +220,7 @@ static void line_print_long(const line_t* line)
+ 	printf("Version:\t%s\n", line->version ? line->version : "(None)");
+ 	printf("Driver info:\t");
+ 	print_folded_item(line->info);
+-	printf("\n");
++	puts("\n");
+ }
+ 
+ 
+@@ -356,13 +356,13 @@ void lsplugins(const char* pluginpath, const char* which)
+ 		}
+ 	}
+ 	if (!opt_quiet) {
+-		printf("#\n#\n");
++		puts("#\n#\n");
+ 		if (!opt_long) {
+-			printf(LEGEND);
+-			printf("#\n");
++			puts(LEGEND);
++			puts("#\n");
+ 		}
+ 		if (opt_long)
+-			printf(LONG_LEGEND);
++			puts(LONG_LEGEND);
+ 		}
+ }
+ 
+@@ -383,10 +383,10 @@ int main(int argc, char** argv)
+ 				pluginpath = optarg;
+ 				break;
+ 			case 'h':
+-				printf(USAGE);
++				puts(USAGE);
+ 				exit(0);
+ 			case 'v':
+-				printf("Version: " VERSION "\n");
++				puts("Version: " VERSION "\n");
+ 				exit(0);
+ 			case 'p':
+ 				printf("Default path: %s\n", pluginpath);
+@@ -404,13 +404,13 @@ int main(int argc, char** argv)
+ 				opt_long = 1;
+ 				break;
+ 			default:
+-				fprintf(stderr, USAGE);
++				fputs(USAGE, stderr);
+ 				exit(1);
+ 		}
+ 	}
+         if (argc - optind  >  1) {
+-		fprintf(stderr, "Too many arguments.\n");
+-                fprintf(stderr, USAGE);
++		fputs("Too many arguments.\n", stderr);
++                fputs(USAGE, stderr);
+                 exit(2);
+         }
+ 	which = (argc - optind == 1 ?  argv[argc - 1] : "*");
+diff --git a/tools/lirc-lsremotes.c b/tools/lirc-lsremotes.c
+index 2ac7dad..11e806a 100644
+--- a/tools/lirc-lsremotes.c
++++ b/tools/lirc-lsremotes.c
+@@ -258,16 +258,16 @@ int main(int argc, char** argv)
+ 			opt_silent = 1;
+ 			break;
+ 		case 'h':
+-			printf(USAGE);
+-			return (EXIT_SUCCESS);
++			puts(USAGE);
++			return EXIT_SUCCESS;
+ 		case 'v':
+ 			printf("%s\n", "lirc-lsremotes " VERSION);
+-			return (EXIT_SUCCESS);
++			return EXIT_SUCCESS;
+ 		case '?':
+ 			fprintf(stderr, "unrecognized option: -%c\n", optopt);
+-			fprintf(stderr,
+-                                "Try `lirc-lsremotes -h' for more information.\n");
+-			return (EXIT_FAILURE);
++			fputs("Try `lirc-lsremotes -h' for more information.\n",
++                               stderr);
++			return EXIT_FAILURE;
+ 		}
+ 	}
+ 	if (argc == optind + 2) {
+@@ -277,7 +277,7 @@ int main(int argc, char** argv)
+ 		dirpath = argv[optind];
+ 		configs = "*";
+ 	} else {
+-		fprintf(stderr, USAGE);
++		fputs(USAGE, stderr);
+ 		return EXIT_FAILURE;
+ 	}
+ 	lirc_log_get_clientlog("lirc-lsremotes", path, sizeof(path));
+diff --git a/tools/mode2.c b/tools/mode2.c
+index c055a5e..7ed80c9 100644
+--- a/tools/mode2.c
++++ b/tools/mode2.c
+@@ -95,12 +95,14 @@ static void parse_options(int argc, char** argv)
+ 	{
+ 		switch (c) {
+ 		case 'h':
+-			printf(help);
++			puts(help);
+ 			exit(EXIT_SUCCESS);
+ 		case 'H':
+ 			if (hw_choose_driver(optarg) != 0) {
+-				fprintf(stderr, "Driver `%s' not found.\n", optarg);
+-				fprintf(stderr, "Available drivers:\n");
++				fprintf(stderr,
++                                        "Driver `%s' not found.\n",
++					optarg);
++				fputs("Available drivers:\n", stderr);
+ 				hw_print_drivers(stderr);
+ 				exit(EXIT_FAILURE);
+ 			}
+@@ -189,11 +191,11 @@ int main(int argc, char **argv)
+ 			close(fd);
+ 			exit(EXIT_FAILURE);
+ 		} else if (ioctl(fd, LIRC_GET_REC_MODE, &mode) == -1) {
+-			printf("This program is only intended for receivers"
++			puts("This program is only intended for receivers"
+ 			       " supporting the pulse/space layer.\n");
+-			printf("Note that this is no error, but this program "
++			puts("Note that this is no error, but this program "
+ 			       "simply makes no sense for your\n" "receiver.\n");
+-			printf("In order to test your setup run lircd with "
++			puts("In order to test your setup run lircd with "
+ 			       "the --nodaemon option and \n then check if the"
+ 			       " remote works with the irw tool.\n");
+ 			close(fd);
+@@ -208,11 +210,11 @@ int main(int argc, char **argv)
+ 		mode = curr_driver->rec_mode;
+ 		if (mode != LIRC_MODE_MODE2) {
+ 			if (strcmp(curr_driver->name, "default") == 0) {
+-				printf("Please use the --raw option to access "
++				puts("Please use the --raw option to access "
+ 				       "the device directly instead through\n"
+ 				       "the abstraction layer.\n");
+ 			} else {
+-				printf("This program does not work for this"
++				puts("This program does not work for this"
+  				       " hardware yet\n");
+ 			}
+ 			exit(EXIT_FAILURE);
+@@ -251,15 +253,15 @@ int main(int argc, char **argv)
+ 						(void *)&data : buffer),
+ 				      count);
+ 			if (result != count) {
+-				fprintf(stderr, "read() failed\n");
++				fputs("read() failed\n", stderr);
+ 				break;
+ 			}
+ 		} else {
+ 			if (mode == LIRC_MODE_MODE2) {
+ 				data = curr_driver->readdata(0);
+ 				if (data == 0) {
+-					fprintf(stderr,
+-					        "readdata() failed\n");
++					fputs("readdata() failed\n",
++                                              stderr);
+ 					break;
+ 				}
+ 			} else {
+@@ -268,11 +270,11 @@ int main(int argc, char **argv)
+ 		}
+ 
+ 		if (mode != LIRC_MODE_MODE2) {
+-			printf("code: 0x");
++			puts("code: 0x");
+ 			for (i = 0; i < count; i++) {
+ 				printf("%02x", (unsigned char)buffer[i]);
+ 			}
+-			printf("\n");
++			puts("\n");
+ 			fflush(stdout);
+ 			continue;
+ 		}
+@@ -292,19 +294,19 @@ int main(int argc, char **argv)
+ 			if (data & PULSE_BIT) {
+ 				if ((bitno & 1) == 0) {
+ 					/* not in expected order */
+-					printf("-pulse");
++					puts("-pulse");
+ 				}
+ 			} else {
+ 				if (bitno & 1) {
+ 					/* not in expected order */
+-					printf("-space");
++					puts("-space");
+ 				}
+ 				if (((data & PULSE_MASK) > gap) || (bitno >= 6)) {
+ 					/* real long space or more
+ 					   than 6 codes, start new line */
+-					printf("\n");
++					puts("\n");
+ 					if ((data & PULSE_MASK) > gap)
+-						printf("\n");
++						puts("\n");
+ 					bitno = 0;
+ 				}
+ 			}
+@@ -312,7 +314,7 @@ int main(int argc, char **argv)
+ 		}
+ 		case 2:
+ 			if ((data & PULSE_MASK) > gap)
+-				printf("_\n\n_");
++				puts("_\n\n_");
+ 			else
+ 				printf("%.*s",
+ 				       ((data & PULSE_MASK) + t_div/2) / t_div,
+diff --git a/tools/xmode2.c b/tools/xmode2.c
+index 6a45d4c..9a4e0a1 100644
+--- a/tools/xmode2.c
++++ b/tools/xmode2.c
+@@ -139,12 +139,13 @@ static void parse_options(int argc, char** const argv)
+ 	add_defaults();
+ 	while ((c = getopt_long(argc, argv, "U:hvd:H:g:t:mr", options, NULL)) != -1) {
+ 		switch (c) {
+-		case 'h':printf(help);
++		case 'h':puts(help);
+ 			exit (EXIT_SUCCESS);
+ 		case 'H':
+ 			if (hw_choose_driver(optarg) != 0) {
+ 				fprintf(stderr, "Driver `%s' not found", optarg);
+-				fprintf(stderr, " (wrong or missing -U/--plugindir?)\n");
++				fputs(" (wrong or missing -U/--plugindir?)\n",
++                                       stderr);
+ 				hw_print_drivers(stderr);
+ 				exit(EXIT_FAILURE);
+ 			}
+@@ -186,7 +187,7 @@ void initscreen(char *geometry)
+ {
+ 	d1 = XOpenDisplay(0);
+ 	if (d1 == NULL) {
+-		printf("Can't open display.\n");
++		puts("Can't open display.\n");
+ 		exit(0);
+ 	}
+ 
+@@ -208,10 +209,10 @@ void initscreen(char *geometry)
+ 
+ 	cm1 = DefaultColormap(d1, 0);
+ 	if (!XAllocNamedColor(d1, cm1, "blue", &xc1, &xc2))
+-		printf("coudn't allocate blue color\n");
++		puts("couldn't allocate blue color\n");
+ 	f1_str = XLoadQueryFont(d1, font1_name);
+ 	if (f1_str == NULL) {
+-		printf("could't load font\n");
++		puts("could't load font\n");
+ 		exit(EXIT_FAILURE);
+ 	}
+ 
+@@ -266,10 +267,10 @@ int main(int argc, char **argv)
+ 			close(fd);
+ 			exit(EXIT_FAILURE);
+ 		} else if (ioctl(fd, LIRC_GET_REC_MODE, &mode) == -1) {
+-			printf("This program is only intended for receivers supporting the pulse/space layer.\n");
+-			printf("Note that this is no error, but this program "
++			puts("This program is only intended for receivers supporting the pulse/space layer.\n");
++			puts("Note that this is no error, but this program "
+ 			       "simply makes no sense for your\n" "receiver.\n");
+-			printf("In order to test your setup run lircd with "
++			puts("In order to test your setup run lircd with "
+ 			       "the --nodaemon option and \n" "then check if the remote works with the irw tool.\n");
+ 			close(fd);
+ 			exit(EXIT_FAILURE);
+@@ -277,7 +278,7 @@ int main(int argc, char **argv)
+ 	} else {
+ 		curr_driver->open_func(device);
+ 		if (curr_driver->init_func  && !curr_driver->init_func()) {
+-			fprintf(stderr, "Cannot initialize hardware");
++			fputs("Cannot initialize hardware", stderr);
+ 			exit(EXIT_FAILURE);
+ 		}
+ 
+@@ -285,10 +286,10 @@ int main(int argc, char **argv)
+ 		mode = curr_driver->rec_mode;
+ 		if (mode != LIRC_MODE_MODE2) {
+ 			if (strcmp(curr_driver->name, "default") == 0) {
+-				printf("Please use the --raw option to access "
++				puts("Please use the --raw option to access "
+ 				       "the device directly instead through\n" "the abstraction layer.\n");
+ 			} else {
+-				printf("This program does not work for this hardware yet\n");
++				puts("This program does not work for this hardware yet\n");
+ 			}
+ 			exit(EXIT_FAILURE);
+ 		}
+-- 
+1.9.3
+
diff --git a/0004-all-Sanitize-feature-tests-macros.patch b/0004-all-Sanitize-feature-tests-macros.patch
new file mode 100644
index 0000000..5e1376d
--- /dev/null
+++ b/0004-all-Sanitize-feature-tests-macros.patch
@@ -0,0 +1,87 @@
+From 18933e88521431abea8f0bf720cf35cc37d2def4 Mon Sep 17 00:00:00 2001
+From: Alec Leamas <leamas.alec@gmail.com>
+Date: Thu, 11 Dec 2014 11:03:12 +0100
+Subject: [PATCH 4/5] all: Sanitize feature tests macros.
+
+---
+ daemons/lircd.c         | 3 ---
+ lib/lirc_client.c       | 6 +-----
+ plugins/srm7500libusb.c | 1 +
+ tools/lirc-lsplugins.c  | 0
+ tools/lirc-lsremotes.c  | 4 ----
+ 5 files changed, 2 insertions(+), 12 deletions(-)
+
+diff --git a/daemons/lircd.c b/daemons/lircd.c
+index ab44e80..d1bdc7c 100644
+--- a/daemons/lircd.c
++++ b/daemons/lircd.c
+@@ -31,9 +31,6 @@
+ # include <config.h>
+ #endif
+ 
+-#define _GNU_SOURCE
+-#define _BSD_SOURCE
+-
+ #include <stdio.h>
+ #include <stdlib.h>
+ #include <stdarg.h>
+diff --git a/lib/lirc_client.c b/lib/lirc_client.c
+index 4720f3f..b161f0e 100644
+--- a/lib/lirc_client.c
++++ b/lib/lirc_client.c
+@@ -17,11 +17,6 @@
+  * @author  Christoph Bartelmus, Trent Piepho,  Michal Svec
+  */
+ 
+-// define _XOPEN_SOURCE for WEXITSTATUS
+-#define _XOPEN_SOURCE
+-// define _BSD_SOURCE for strdup()
+-#define _BSD_SOURCE
+-
+ #ifdef HAVE_CONFIG_H
+ # include <config.h>
+ #endif
+@@ -34,6 +29,7 @@
+ #include <stdlib.h>
+ #include <stdarg.h>
+ #include <string.h>
++#include <strings.h>
+ #include <sys/param.h>
+ #include <sys/socket.h>
+ #include <sys/stat.h>
+diff --git a/plugins/srm7500libusb.c b/plugins/srm7500libusb.c
+index f598f4d..06206bc 100644
+--- a/plugins/srm7500libusb.c
++++ b/plugins/srm7500libusb.c
+@@ -33,6 +33,7 @@
+ #endif
+ 
+ #define _GNU_SOURCE
++
+ #include <errno.h>
+ #include <signal.h>
+ #include <string.h>
+diff --git a/tools/lirc-lsremotes.c b/tools/lirc-lsremotes.c
+index 11e806a..7c6ab06 100644
+--- a/tools/lirc-lsremotes.c
++++ b/tools/lirc-lsremotes.c
+@@ -7,16 +7,12 @@
+  *
+  */
+ 
+-#define _GNU_SOURCE
+-
+ #include <config.h>
+ 
+ #include <dirent.h>
+ #include <getopt.h>
+ #include <errno.h>
+ #include <fnmatch.h>
+-
+-
+ #include <glob.h>
+ #include <libgen.h>
+ #include <limits.h>
+-- 
+1.9.3
+
diff --git a/0004-lircd-fix-compiler-error-format-security-error.patch b/0004-lircd-fix-compiler-error-format-security-error.patch
deleted file mode 100644
index ebb36d1..0000000
--- a/0004-lircd-fix-compiler-error-format-security-error.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-From d80c94ead949e16053449ddf215a88a5e5e159e3 Mon Sep 17 00:00:00 2001
-From: Alec Leamas <leamas.alec@gmail.com>
-Date: Tue, 19 Aug 2014 19:21:25 +0200
-Subject: [PATCH 4/4] lircd: fix compiler error=format-security error.
-
----
- daemons/lircd.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/daemons/lircd.c b/daemons/lircd.c
-index 7af4265..50fd9c6 100644
---- a/daemons/lircd.c
-+++ b/daemons/lircd.c
-@@ -2303,7 +2303,7 @@ int main(int argc, char **argv)
- 		opt = options_getstring("lircd:listen_hostport");
- 		if (opt){
- 			if (opt2host_port(opt, &address, &port, errmsg) != 0){
--				fprintf(stderr, errmsg);
-+				printf(stderr, errmsg);
- 				return(EXIT_FAILURE);
- 			}
- 		} else
--- 
-1.8.4.2
-
diff --git a/0005-configure.ac-Use-pkg-config-to-locate-ftdi.patch b/0005-configure.ac-Use-pkg-config-to-locate-ftdi.patch
new file mode 100644
index 0000000..f94dc91
--- /dev/null
+++ b/0005-configure.ac-Use-pkg-config-to-locate-ftdi.patch
@@ -0,0 +1,53 @@
+From 192e627fa81c3e8df086801dea228cb2fdcbb8bb Mon Sep 17 00:00:00 2001
+From: Alec Leamas <leamas.alec@gmail.com>
+Date: Thu, 11 Dec 2014 11:24:27 +0100
+Subject: [PATCH] configure.ac: Use pkg-config to locate ftdi.
+
+This picks up changed locations e. g., in fedora-22.
+---
+ configure.ac        | 13 ++++++++++---
+ plugins/Makefile.am |  2 +-
+ 2 files changed, 11 insertions(+), 4 deletions(-)
+
+diff --git a/configure.ac b/configure.ac
+index aaba636..b32b1e0 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -183,11 +183,18 @@ AC_CHECK_HEADER(usb.h,[
+   ],[
+   AM_CONDITIONAL([BUILD_USB],[false])]
+ )
+-AC_CHECK_HEADER(ftdi.h,[
++PKG_CHECK_MODULES([FTDI],[libftdi],,[true])
++test -z "$FTDI_LIBS" && PKG_CHECK_MODULES([FTDI], [libftdi1],,[true])
++
++if test -n "$FTDI_LIBS"; then
++  CFLAGS="$CFLAGS $SYSTEMD_CFLAGS"
++  LDFLAGS="$LDFLAGS $FTDI_LIBS"
++  AC_DEFINE(HAVE_FTDI)
+   AM_CONDITIONAL([BUILD_FTDI],[true])
+-  ],[
++  AC_SUBST(FTDI_LIBS)
++else
+   AM_CONDITIONAL([BUILD_FTDI],[false])]
+-)
++fi
+ AC_CHECK_HEADER(iguanaIR.h,[
+   AM_CONDITIONAL([BUILD_IGUANAIR],[true])
+   ],[
+diff --git a/plugins/Makefile.am b/plugins/Makefile.am
+index 175b025..07cf187 100644
+--- a/plugins/Makefile.am
++++ b/plugins/Makefile.am
+@@ -47,7 +47,7 @@ endif
+ if BUILD_FTDI
+ plugin_LTLIBRARIES          += ftdi.la
+ ftdi_la_SOURCES             = ftdi.c
+-ftdi_la_LDFLAGS             = $(AM_LDFLAGS) -lftdi
++ftdi_la_LDFLAGS             = $(AM_LDFLAGS) @FTDI_LIBS@
+ endif
+ 
+ if BUILD_IGUANAIR
+-- 
+1.9.3
+
diff --git a/README.fedora b/README.fedora
index 2cda73a..b1a629f 100644
--- a/README.fedora
+++ b/README.fedora
@@ -1,12 +1,75 @@
 ## Fedora README
 
-### Upstream release 0.9.1a
+0.9.2
 
-The changes that broke the update for 0.9.0 are now in upstream. There
-are no functional fedora-specific patches in this release, just some
-bugfixes.
+This a major upstream update. Don't expect things to be the same, read
+the NEWS file in the documentation (/usr/share/doc/lirc/NEWS).
 
+Packaging-wise, the package has been split into smaller packages. Installing
+the 'lirc' package will bring all of them. You might be interested in
+not installing or removing e. g., unused drivers, the gui and/or the
+config package.
 
+The lircd daemon now runs as user lirc. This is using the new
+--effective-user option, so it's still started as root and runs as root
+until all devices and files are opened. Should this become a problem, just
+change the effective-user option in lirc_options.conf.
+
+
+
+0.9.1
+
+#### Systemd
+
+The fedora lirc package supports two systemd services lircd.socket
+and lircmd.service. See below for enabling and starting these
+services.
+
+Since systemd quite aggressively runs things in parallel during startup,
+clients like irexec sometimes runs into troubles because the socket
+they want to connect to isn't available. This can cause hard to debug
+problems. From this version, lircd supports a --wait-for-socket option.
+Using this, the calling party is blocked until the socket is available.
+
+#### New configuration file(s)
+
+From this version lirc supports a new configuration file
+/etc/lirc/lirc_options.conf. This holds default values for all
+command line options, and does in fact replace those in most
+installations. When updating, you need to use your old
+/etc/sysconfig/lirc config file to update lirc_options.conf.
+
+The old file /etc/sysconfig/lirc is no longer used.
+
+The need to define a device that should be reserved (the old
+LIRC_IR_DEVICE option) is no longer needed - lircd is clever enough
+to do this by itself.
+
+#### Enable lirc protocol (obsolete)
+
+In previous version the lirc protocol had to be  be enabled
+for the actual device used.  This was done using either by installing the
+lirc-disable-kernel-rc subpackage or by setting the LIRCD_IR_DEVICE in
+/etc/sysconfig/lirc. This is no longer needed, lircd does this
+automatically. The lirc-disable-kernel-rc subpackage is still available
+"just in case" but should normally not be needed.
+
+#### Socket activation
+
+As of 0.9.4-15+, the Fedora lirc package sports systemd socket
+activation. This should fix the problems at startup when clients can't
+connect to /var/run/lircd because the lircd service is yet not started.
+
+To start the lircd service using socket activation:
+```
+    # systemctl enable lircd.socket
+    # systemctl start lircd.socket
+```
+The lircmd is started the usual way:
+```
+    # systemctl enable lircmd.service
+    # systemctl start lircmd.service
+```
 #### Running another instance.
 
 Sometimes another lircd instance is required to handle some other input
@@ -52,11 +115,13 @@ If lircd fails to start or dies after restart, first check logs for errors:
     # systemctl restart lircd.service
 ```
 
-You could also run lircd in foreground after stopping service, using the
-driver  and device defined in lirc_options.conf:
+You could also run lircd in foreground after stopping service:
 ```
     # systemctl stop lircd.service
-    # /usr/sbin/lircd  --nodaemon
+    # bash
+    # source /etc/systconfig/lirc
+    # /usr/sbin/lircd $LIRCD_OPTIONS --driver $LIRC_DRIVER \
+    > --device $LIRC_DEVICE  --nodaemon
 ```
 
 Sometimes kernel complains about multiple clients trying to access the
@@ -66,7 +131,7 @@ remote using the atilibusb driver. This needs to blacklist the built_in
 ati_remote module. This is is done by creating the file
 /etc/modprobe.conf.d/blacklist-ati-remote.conf as:
 ```
-## Block built-in handling of ati-remote (use lircd instead).
+# Block built-in handling of ati-remote (use lircd instead).
 blacklist ati_remote
 ```
 
diff --git a/TODO b/TODO
deleted file mode 100644
index 0afd93f..0000000
--- a/TODO
+++ /dev/null
@@ -1,7 +0,0 @@
- - Move to -devel (?): irw, *mode2, others?
-   note: xmode2 inflicts a dependency on X, and smode2 on svgalib
-   - does someone actually need xmode2/smode2 for something?
- - Split utils into subpackage (keep daemons in main package), perhaps also
-   having the irw, *mode2 etc.
- - Don't run as root and/or create dedicated group, reduce fifo permissions?
-      http://stackoverflow.com/questions/11939255/writing-to-dev-uinput-on-ubuntu-12-04
diff --git a/lirc.init b/lirc.init
deleted file mode 100755
index 6c918c9..0000000
--- a/lirc.init
+++ /dev/null
@@ -1,134 +0,0 @@
-#!/bin/sh
-#
-# lirc         Startup script for the Linux Infrared Remote Control daemons
-#
-# chkconfig:   - 29 71
-# description: Enables infrared controls through LIRC.
-# processname: lircd
-# processname: lircmd
-# config:      /etc/lirc/lircd.conf
-# config:      /etc/lirc/lircmd.conf
-# pidfile:     /var/run/lirc/lircd.pid
-
-### BEGIN INIT INFO
-# Provides: lirc
-# Should-Start: $syslog $network
-# Should-Stop: $syslog $network
-# Short-Description: Linux Infrared Remote Control daemon
-# Description: Enables remote control devices through LIRC.
-### END INIT INFO
-
-# Source function library.
-. /etc/init.d/functions
-
-exec="/usr/sbin/lircd"
-exec2="/usr/sbin/lircmd"
-prog=$(basename $exec)
-prog2=$(basename $exec2)
-
-[ -e /etc/sysconfig/lirc ] && . /etc/sysconfig/lirc
-
-lockfile=/var/lock/subsys/lirc
-
-# Default to first lirc character device and the lirc chardev driver
-LIRC_DEVICE=${LIRC_DEVICE:-/dev/lirc0}
-LIRC_DRIVER=${LIRC_DRIVER:-default}
-
-start() {
-    echo -n $"Starting infrared remote control daemon ($prog): "
-    daemon $exec --driver=$LIRC_DRIVER --device=$LIRC_DEVICE $LIRCD_OPTIONS
-    retval=$?
-    echo
-    status $prog >/dev/null 2>&1
-    if [ $? -eq 0 -a "$ENABLE_LIRCMD" = "yes" ] ; then
-        echo -n $"Starting infrared remote control mouse daemon ($prog2): "
-        daemon $exec2 $LIRCMD_OPTIONS
-        retval=$?
-        echo
-    fi
-    [ $retval -eq 0 ] && touch $lockfile
-
-    # To prevent double key events w/both in-kernel and lirc decode,
-    # we disable the in-kernel decoding when lircd is started up
-    # successfully with a raw IR rc-core receiver
-    if [ $retval -eq 0 ]; then
-        if [ $(echo "$LIRC_DRIVER" | grep -c "default") -ge 1 ]; then
-            lircdev=$(basename $LIRC_DEVICE)
-            rcdev=$(find -L /sys/class/rc/ -maxdepth 2 -name $lircdev 2> /dev/null)
-            if [ ! -z ${rcdev} ]; then
-	        (echo lirc > ${rcdev}/../protocols) 2> /dev/null
-            fi
-        fi
-    fi
-
-    return $retval
-}
-
-stop() {
-    retval=0
-    if status $prog2 >/dev/null 2>&1 ; then
-        echo -n $"Stopping infrared remote control mouse daemon ($prog2): "
-        killproc $prog2
-        retval=$?
-        echo
-    fi
-    if [ $retval -eq 0 ] ; then
-        echo -n $"Stopping infrared remote control daemon ($prog): "
-        killproc $prog
-        retval=$?
-        echo
-    fi
-    [ $retval -eq 0 ] && rm -f $lockfile
-
-    # On lircd shutdown, turn all the in-kernel IR decoders back on
-    lircdev=$(basename $LIRC_DEVICE)
-    rcdev=$(find -L /sys/class/rc/ -maxdepth 2 -name $lircdev 2> /dev/null)
-    if [ ! -z ${rcdev} ]; then
-        protonode=${rcdev}/../protocols
-        echo none > ${protonode}
-        protos=$(cat ${protonode})
-        for p in $protos
-        do
-            (echo "+${p}" > ${protonode}) 2> /dev/null
-        done
-    fi
-
-    return $retval
-}
-
-restart() {
-    stop
-    start
-}
-
-reload() {
-    # lircmd doesn't apparently respond to HUP, so if it's running, restart.
-    if status $prog2 >/dev/null 2>&1 ; then
-        restart
-    else
-        echo -n $"Reloading infrared remote control daemon ($prog): "
-        killproc $prog -HUP
-        retval=$?
-        echo
-        return $retval
-    fi
-}
-
-case "$1" in
-    start|stop|restart|reload)
-        $1
-        ;;
-    force-reload)
-        reload || restart
-        ;;
-    status)
-        status $prog2
-        status $prog
-        ;;
-    try-restart|condrestart)
-  	[ ! -f $lockfile ] || restart
-	;;
-    *)
-        echo $"Usage: $0 {start|stop|status|restart|try-restart|reload|force-reload}"
-        exit 2
-esac
diff --git a/lirc.spec b/lirc.spec
index 314dcd9..a1c2042 100644
--- a/lirc.spec
+++ b/lirc.spec
@@ -1,86 +1,64 @@
-#
-# rpmlint warnings:
-#     only-non-binary-in-usr-lib:
-#         https://bugzilla.redhat.com/show_bug.cgi?id=794777
-#     incorrect-fsf-address :
-#         https://sf.net/mailarchive/forum.php?forum_name=lirc-list&viewmonth=201310
-#
-
-%bcond_without  alsa
-%bcond_without  portaudio
-%bcond_without  x
-%bcond_with     svgalib
-%bcond_without  irman
-%bcond_without  ftdi
-%bcond_without  iguanaIR
+%global commit 228db97ccb454932a69deb6685b15e9fca9c6967
+%global shortcommit %(c=%{commit}; echo ${c:0:7})
 
 %global _hardened_build 1
 
 %global released 1
-%define pre     pre1
+#define pre     pre3
 
 Name:           lirc
-Version:        0.9.1a
+Version:        0.9.2
+%global         src_vers  %(echo %{version} | sed 's/_/-/g' )
 %if 0%{?released}
-Release:        4%{?dist}
+Release:        1%{?dist}
 %else
-Release:        0.10.%{pre}%{?dist}
+Release:        1
 %endif
+
 Summary:        The Linux Infrared Remote Control package
 
 Group:          System Environment/Daemons
-                # Some LGPLv2 files in iguanaIR promoted to GPLv2
-License:        GPLv2
+                # lib/ciniparser* and lib/dictionary* are BSD, others GPLv2
+License:        GPLv2 and BSD
 URL:            http://www.lirc.org/
 %if 0%{?released}
-Source0:        http://downloads.sourceforge.net/lirc/%{name}-%{version}.tar.bz2
+Source0:        http://downloads.sourceforge.net/lirc/%{name}-%{src_vers}.tar.gz
 %else
-Source0:        http://www.lirc.org/software/snapshots/%{name}-%{version}-%{pre}.tar.bz2
+Source0:        http://leamas.fedorapeople.org/lirc/lirc-%{src_vers}.tar.gz
 %endif
+Source6:        README.fedora
+Source7:        99-remote-control-lirc.rules
+		# Config only, cannot be upstreamed.
+Patch1:         0001-Changing-effective-user-default.patch
+		# Already upstream (0002..0006).
+Patch2:         0002-tools-Make-make_rel_symlink.py-use-python3.patch
+Patch3:         0003-all-Use-puts-instead-of-printf-when-applicable.patch
+Patch4:         0004-all-Sanitize-feature-tests-macros.patch
+Patch5:         0005-configure.ac-Use-pkg-config-to-locate-ftdi.patch
+Patch6:         0006-Add-Doxyfile-not-part-of-dist-tarball.patch
 
-Source1:        README.fedora
-Source2:        99-remote-control-lirc.rules
-
-                # Patches 1-3 are from upstream
-Patch1:         0001-Fix-segfault-when-starting-lircd-AUR-41581.patch
-Patch2:         0002-lircd-Fix-bad-default-for-lircdfile.patch
-Patch3:         0003-0.9.1a-Bugfix-segfault-when-parsing-connect-in-confi.patch
-Patch4:         0004-lircd-fix-compiler-error-format-security-error.patch
-
-
+BuildRequires:  alsa-lib-devel
 Buildrequires:  autoconf
 BuildRequires:  automake
-
-%if %{with alsa}
-BuildRequires:  alsa-lib-devel
-%endif
-%if %{with iguanaIR}
+BuildRequires:  doxygen
 BuildRequires:  iguanaIR-devel
-%endif
-BuildRequires:  help2man
-%if %{with ftdi}
+BuildRequires:  kernel-headers
+BuildRequires:  man2html
 BuildRequires:  libftdi-devel
-%endif
-%if %{with irman}
 BuildRequires:  libirman-devel
-%endif
 BuildRequires:  libtool
 BuildRequires:  libusb-devel
 BuildRequires:  libusb1-devel
-%if %{with x}
 BuildRequires:  libXt-devel
-%endif
-%if %{with portaudio}
-BuildRequires:  portaudio-devel >= 19
-%endif
-BuildRequires:  python2-devel
-%if %{with svgalib}
-BuildRequires:  svgalib-devel
-%endif
+BuildRequires:  portaudio-devel
+BuildRequires:  python3-devel
+BuildRequires:  python3-PyYAML
 BuildRequires:  systemd-devel
 
-Requires:       %{name}-libs%{?_isa} = %{version}-%{release}
+Requires:       %{name}-libs = %{version}-%{release}
+Requires:       python3-PyYAML
 
+Requires(pre):     shadow-utils
 Requires(post):    systemd
                    #for triggerun
 Requires(post):    systemd-sysv
@@ -94,9 +72,39 @@ Included applications include daemons which decode the received
 signals as well as user space applications which allow controlling a
 computer with a remote control.
 
+Installing this package will install most of the LIRC sub-packages.
+You might want to install lirc-core, possibly adding some other
+packages to get a smaller installation.
+
+
+%package        core
+Summary:        LIRC core, always needed to run LIRC
+
+%description    core
+The LIRC core contains the lircd daemons, the devinput and
+default driver and most of the applications.
+
+
+%package        compat
+Summary:        Compatibility package installing all lirc packages
+Obsoletes:      lirc <=  0.9.1
+Provides:       lirc = %{version}-%{release}
+Requires:       lirc-core%{?_isa} = %{version}-%{release}
+Requires:       lirc-config = %{version}-%{release}
+Requires:       lirc-tools-gui%{?_isa} = %{version}-%{release}
+Requires:       lirc-drv-iguanaIR%{?_isa} = %{version}-%{release}
+Requires:       lirc-drv-portaudio%{?_isa} = %{version}-%{release}
+Requires:       lirc-drv-irman%{?_isa} = %{version}-%{release}
+Requires:       lirc-drv-ftdi%{?_isa} = %{version}-%{release}
+
+%description    compat
+Installing this package will install most lirc sub-packages, roughly
+the same as installing previous versions of the lirc package.
+
 %package        libs
 Summary:        LIRC libraries
 Group:          System Environment/Libraries
+Requires:       lirc-core%{?_isa} = %{version}-%{release}
 
 %description    libs
 LIRC is a package that allows you to decode and send infra-red and
@@ -106,10 +114,21 @@ signals as well as user space applications which allow controlling a
 computer with a remote control.  This package includes shared libraries
 that applications use to interface with LIRC.
 
+
+%package        config
+Summary:        LIRC Configuration Tools and Data
+Requires:       lirc-core = %{version}-%{release}
+BuildArch:      noarch
+
+%description    config
+The LIRC config package contains tools and data  to ease the
+LIRC configuration process.
+
+
 %package        devel
 Summary:        Development files for LIRC
 Group:          Development/Libraries
-Requires:       %{name}-libs%{?_isa} = %{version}-%{release}
+Requires:       lirc-libs%{?_isa} = %{version}-%{release}
 
 %description    devel
 LIRC is a package that allows you to decode and send infra-red and
@@ -119,9 +138,11 @@ signals as well as user space applications which allow controlling a
 computer with a remote control.  This package includes files for
 developing applications that use LIRC.
 
+
 %package        doc
 Summary:        LIRC documentation
 Group:          Documentation
+BuildArch:      noarch
 
 %description    doc
 LIRC is a package that allows you to decode and send infra-red and
@@ -131,26 +152,61 @@ signals as well as user space applications which allow controlling a
 computer with a remote control.  This package contains LIRC
 documentation.
 
-%package        remotes
-Summary:        LIRC remote definitions
-Group:          System Environment/Daemons
-
-%description    remotes
-LIRC is a package that allows you to decode and send infra-red and
-other signals of many (but not all) commonly used remote controls.
-Included applications include daemons which decode the received
-signals as well as user space applications which allow controlling a
-computer with a remote control.  This package contains a collection
-of remote control configuration files.
 
 %package        disable-kernel-rc
 Summary:        Disable kernel ir device handling in favor of lirc
-Requires:       %{name}%{?_isa} = %{version}-%{release}
+Requires:       %{name} = %{version}-%{release}
+BuildArch:      noarch
 
 %description  disable-kernel-rc
 Udev rule which disables the kernel built-in handling of infrared devices
-(i. e., rc* ones) by making lirc the only used protocol. An alternative is
-to use the LIRCD_IR_DEVICE option in /etc/sysconfig/lirc
+(i. e., rc* ones) by making lirc the only used protocol.
+
+
+%package        tools-gui
+Summary:        LIRC GUI tools
+Requires:       lirc-core%{?_isa} = %{version}-%{release}
+
+%description   tools-gui
+Some seldom used X11-based tools for debugging lirc configurations.
+
+
+%package        drv-iguanaIR
+Summary:        IguanaIR LIRC User-Space Driver
+Requires:       lirc-core%{?_isa} = %{version}-%{release}
+License:        LGPLv2
+
+%description    drv-iguanaIR
+LIRC user-space driver which works together with the low-level  iguanaIR
+package, providing full-fledged support for the iguanaIR devices.
+
+
+%package        drv-portaudio
+Summary:        Portaudio LIRC User-Space Driver
+Requires:       lirc-core%{?_isa} = %{version}-%{release}
+License:        LGPLv2
+
+%description    drv-portaudio
+LIRC user space driver which supports  a IR receiver in microphone input
+using the portaudio library.
+
+
+%package        drv-irman
+Summary:        Irman LIRC User-Space Driver
+Requires:       lirc-core%{?_isa} = %{version}-%{release}
+
+%description   drv-irman
+LIRC user-space driver which works together with the kernel, providing
+full support for the irman device.
+
+
+%package        drv-ftdi
+Summary:        Ftdi LIRC User-Space Driver
+Requires:       lirc-core%{?_isa} = %{version}-%{release}
+
+%description    drv-ftdi
+LIRC user-space driver which works together with the kernel, providing
+full support for the ftdi device.
 
 
 # Don't provide or require anything from _docdir, per policy.
@@ -162,61 +218,52 @@ to use the LIRCD_IR_DEVICE option in /etc/sysconfig/lirc
 %if 0%{?released}
 %setup -q
 %else
-%setup -q -n %{name}-%{version}-%{pre}
+%setup -qn %{name}-%{src_vers}
 %endif
-
 %patch1 -p1
 %patch2 -p1
 %patch3 -p1
 %patch4 -p1
-
-chmod  644 contrib/*
-chmod +x contrib/hal
-chmod +x daemons/input_map.sh
-
+%patch5 -p1
+%patch6 -p1
 sed -i -e 's|/usr/local/etc/|/etc/|' contrib/irman2lirc
 
 
 %build
-mkdir m4 || :
 autoreconf -fi
-export CFLAGS="%{optflags} -Werror=format-security"
-%configure \
-  --libdir=%{_libdir} \
-  --disable-static \
-  --disable-dependency-tracking \
-  --enable-sandboxed \
-%if ! %{with x}
-  --without-x \
-%endif
-  --with-syslog=LOG_DAEMON \
-  --with-driver=userspace
-# make %%{?_smp_mflags}
-# parallel makes are currently busted, do single-threaded for now
-make
+
+CFLAGS="-I/usr/include/libftdi1 %{optflags}" %configure --libdir=%{_libdir}
+make %{?_smp_mflags}
 
 
 %install
 make install DESTDIR=$RPM_BUILD_ROOT
+tar -C $RPM_BUILD_ROOT/%{_pkgdocdir} \
+    -xzf $RPM_BUILD_ROOT/%{_pkgdocdir}/api-docs.tar.gz
+rm $RPM_BUILD_ROOT/%{_pkgdocdir}/api-docs.tar.gz
+cd $RPM_BUILD_ROOT%{_datadir}/lirc/contrib
+chmod 755 irman2lirc devinput.sh
+chmod 755 lirc.debian lirc.redhat lircs lirc.suse*
+cd $OLDPWD
+rm $RPM_BUILD_ROOT%{_libdir}/*.la
+rm $RPM_BUILD_ROOT%{_libdir}/lirc/plugins/*.la
+
 install -pm 755 contrib/irman2lirc $RPM_BUILD_ROOT%{_bindir}
 install -Dpm 644 doc/lirc.hwdb $RPM_BUILD_ROOT%{_datadir}/lirc/lirc.hwdb
-cp -a %{SOURCE1} README.fedora
-install -Dpm 644 %{SOURCE2} \
+install -Dpm 644 %{SOURCE7} \
     $RPM_BUILD_ROOT%{_udevrulesdir}/99-remote-control-lirc.rules
-
-# Put remote definitions in place
-cp -ar remotes $RPM_BUILD_ROOT%{_datadir}/lirc-remotes
-
-rm $RPM_BUILD_ROOT%{_libdir}/liblirc_client.la
-
-rm -rf __docs; mkdir __docs
-mv $RPM_BUILD_ROOT/usr/share/doc/lirc/* __docs
-cp -pR  contrib  __docs
+cp -a %{SOURCE6} README.fedora
 
 mkdir -p $RPM_BUILD_ROOT/%{_tmpfilesdir}
 echo "d /var/run/lirc  0755  root  root  10d" \
-    > $RPM_BUILD_ROOT/%{_tmpfilesdir}/lirc.conf
+    > $RPM_BUILD_ROOT%{_tmpfilesdir}/lirc.conf
 
+%pre
+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
+exit 0
 
 %post
 %systemd_post lircd.service lircmd.service
@@ -232,45 +279,113 @@ find /etc/systemd -name lirc.service -xtype l -delete || :
 %postun
 %systemd_postun_with_restart lircd.service lircmd.servic
 
-%postun libs -p /sbin/ldconfig
+%files
 
+%postun libs -p /sbin/ldconfig
 
-%files
-%doc AUTHORS ChangeLog COPYING NEWS README TODO README.fedora
+%files compat
+
+%files drv-iguanaIR
+%{_libdir}/lirc/plugins/iguanaIR.so
+%{_datadir}/lirc/configs/iguanaIR.conf
+
+%files drv-irman
+%{_libdir}/lirc/plugins/irman.so
+%{_datadir}/lirc/configs/irman.conf
+
+%files drv-portaudio
+%{_libdir}/lirc/plugins/audio.so
+%{_datadir}/lirc/configs/audio.conf
+
+%files drv-ftdi
+%{_libdir}/lirc/plugins/ftdi.so
+%{_datadir}/lirc/configs/ftdi.conf
+
+%files tools-gui
+%{_bindir}/xmode2
+%{_bindir}/irxevent
+%{_mandir}/man1/irxevent*
+%{_mandir}/man1/xmode2*
+
+%files config
+%{_bindir}/irdb-get
+%{_bindir}/lirc-config-tool
+%{_bindir}/lirc-setup
+%{_mandir}/man1/irdb-get*
+%{_mandir}/man1/lirc-config-tool*
+%{_mandir}/man1/lirc-setup*
+%{_datadir}/lirc/configs/*
+%{python3_sitelib}/lirc
+%exclude %{_datadir}/lirc/configs/iguanaIR.conf
+%exclude %{_datadir}/lirc/configs/irman.conf
+%exclude %{_datadir}/lirc/configs/ftdi.conf
+%exclude %{_datadir}/lirc/configs/audio.conf
+
+
+%files core
+%license COPYING
+%doc README AUTHORS NEWS README.fedora
 %dir  /etc/lirc
-%config(noreplace) /etc/lirc/lirc*d.conf
-%config(noreplace) /etc/lirc/lirc_options.conf
+/etc/lirc/lircd.conf.d
+%config(noreplace) /etc/lirc/lirc*.conf
 %{_tmpfilesdir}/lirc.conf
 %{_unitdir}/lirc*
 %{_bindir}/*ir*
 %{_bindir}/*mode2
-%{_sbindir}/lirc*d
+%exclude %{_bindir}/irdb-get
+%exclude %{_bindir}/xmode2
+%exclude %{_bindir}/irxevent
+%exclude %{_bindir}/lirc-setup
+%exclude %{_bindir}/lirc-config-tool
+%{_sbindir}/lirc*
+%{_libdir}/lirc/plugins
+%exclude %{_libdir}/lirc/plugins/iguanaIR.so
+%exclude %{_libdir}/lirc/plugins/irman.so
+%exclude %{_libdir}/lirc/plugins/ftdi.so
+%exclude %{_libdir}/lirc/plugins/audio.so
 %{_datadir}/lirc/
+%exclude %{_datadir}/lirc/configs/*
 %{_mandir}/man1/*ir*.1*
 %{_mandir}/man1/*mode2*.1*
 %{_mandir}/man8/lirc*d.8*
+%{_mandir}/man5/lircd.conf.*
+%exclude %{_mandir}/man1/lirc-config-tool*
+%exclude %{_mandir}/man1/irdb-get*
+%exclude %{_mandir}/man1/lirc-setup*
+%exclude %{_mandir}/man1/irxevent*
+%exclude %{_mandir}/man1/xmode2*
+
 
 %files libs
-%doc COPYING
+#doc COPYING
 %{_libdir}/liblirc_client.so.*
+%{_libdir}/liblirc_driver.so.*
+%{_libdir}/liblirc.so.*
 
 %files devel
 %{_includedir}/lirc/
+%{_includedir}/lirc_private.h
+%{_includedir}/lirc_driver.h
+%{_includedir}/lirc_client.h
 %{_libdir}/liblirc_client.so
+%{_libdir}/liblirc_driver.so
+%{_libdir}/liblirc.so
+%{_libdir}/pkgconfig/lirc-driver.pc
+%{_libdir}/pkgconfig/lirc.pc
 
 %files doc
-%doc COPYING __docs/*
-
-
-%files remotes
-%doc AUTHORS ChangeLog COPYING README
-%{_datadir}/lirc-remotes
+%doc COPYING ChangeLog
+%{_pkgdocdir}
 
 %files disable-kernel-rc
 %{_udevrulesdir}/99-remote-control-lirc.rules
 
 
 %changelog
+* Wed Dec 10 2014 Alec Leamas <leamas.alec@nowhere.net> - 0.9.2-1
+- Major upstream update.
+- New package structure with more, smaller packages.
+
 * Wed Sep 03 2014 Alec Leamas <leamas@nowhere.net> - 0.9.1a-4
 - rebuilt
 

From 71ffea8f9026c8a282427c8b6d67d38e1565aea5 Mon Sep 17 00:00:00 2001
From: Alec Leamas <leamas.alec@gmail.com>
Date: Thu, 11 Dec 2014 13:20:29 +0100
Subject: [PATCH 138/204] Add missing 0006 patc.

---
 ...dd-Doxyfile-not-part-of-dist-tarball.patch | 1872 +++++++++++++++++
 1 file changed, 1872 insertions(+)
 create mode 100644 0006-Add-Doxyfile-not-part-of-dist-tarball.patch

diff --git a/0006-Add-Doxyfile-not-part-of-dist-tarball.patch b/0006-Add-Doxyfile-not-part-of-dist-tarball.patch
new file mode 100644
index 0000000..70ea4e7
--- /dev/null
+++ b/0006-Add-Doxyfile-not-part-of-dist-tarball.patch
@@ -0,0 +1,1872 @@
+From d887e05be6de2b1c625a67781ac4b298eca23169 Mon Sep 17 00:00:00 2001
+From: Alec Leamas <leamas.alec@gmail.com>
+Date: Thu, 11 Dec 2014 12:25:04 +0100
+Subject: [PATCH] Add Doxyfile, not part of dit tarball.
+
+---
+ doc/Doxyfile | 1853 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
+ 1 file changed, 1853 insertions(+)
+ create mode 100644 doc/Doxyfile
+
+diff --git a/doc/Doxyfile b/doc/Doxyfile
+new file mode 100644
+index 0000000..50b109a
+--- /dev/null
++++ b/doc/Doxyfile
+@@ -0,0 +1,1853 @@
++# Doxyfile 1.8.3.1
++
++# This file describes the settings to be used by the documentation system
++# doxygen (www.doxygen.org) for a project.
++#
++# All text after a hash (#) is considered a comment and will be ignored.
++# The format is:
++#       TAG = value [value, ...]
++# For lists items can also be appended using:
++#       TAG += value [value, ...]
++# Values that contain spaces should be placed between quotes (" ").
++
++#---------------------------------------------------------------------------
++# Project related configuration options
++#---------------------------------------------------------------------------
++
++# This tag specifies the encoding used for all characters in the config file
++# that follow. The default is UTF-8 which is also the encoding used for all
++# text before the first occurrence of this tag. Doxygen uses libiconv (or the
++# iconv built into libc) for the transcoding. See
++# http://www.gnu.org/software/libiconv for the list of possible encodings.
++
++DOXYFILE_ENCODING      = UTF-8
++
++# The PROJECT_NAME tag is a single word (or sequence of words) that should
++# identify the project. Note that if you do not use Doxywizard you need
++# to put quotes around the project name if it contains spaces.
++
++PROJECT_NAME           = "LIRC libraries"
++
++# The PROJECT_NUMBER tag can be used to enter a project or revision number.
++# This could be handy for archiving the generated documentation or
++# if some version control system is used.
++
++PROJECT_NUMBER         =
++
++# Using the PROJECT_BRIEF tag one can provide an optional one line description
++# for a project that appears at the top of each page and should give viewer
++# a quick idea about the purpose of the project. Keep the description short.
++
++PROJECT_BRIEF          = Linux Infrared Remote Control
++
++# With the PROJECT_LOGO tag one can specify an logo or icon that is
++# included in the documentation. The maximum height of the logo should not
++# exceed 55 pixels and the maximum width should not exceed 200 pixels.
++# Doxygen will copy the logo to the output directory.
++
++PROJECT_LOGO           =  ../doc/images/diode-2.gif
++
++# The OUTPUT_DIRECTORY tag is used to specify the (relative or absolute)
++# base path where the generated documentation will be put.
++# If a relative path is entered, it will be relative to the location
++# where doxygen was started. If left blank the current directory will be used.
++
++OUTPUT_DIRECTORY       = api-docs
++
++# If the CREATE_SUBDIRS tag is set to YES, then doxygen will create
++# 4096 sub-directories (in 2 levels) under the output directory of each output
++# format and will distribute the generated files over these directories.
++# Enabling this option can be useful when feeding doxygen a huge amount of
++# source files, where putting all generated files in the same directory would
++# otherwise cause performance problems for the file system.
++
++CREATE_SUBDIRS         = NO
++
++# The OUTPUT_LANGUAGE tag is used to specify the language in which all
++# documentation generated by doxygen is written. Doxygen will use this
++# information to generate all constant output in the proper language.
++# The default language is English, other supported languages are:
++# Afrikaans, Arabic, Brazilian, Catalan, Chinese, Chinese-Traditional,
++# Croatian, Czech, Danish, Dutch, Esperanto, Farsi, Finnish, French, German,
++# Greek, Hungarian, Italian, Japanese, Japanese-en (Japanese with English
++# messages), Korean, Korean-en, Lithuanian, Norwegian, Macedonian, Persian,
++# Polish, Portuguese, Romanian, Russian, Serbian, Serbian-Cyrillic, Slovak,
++# Slovene, Spanish, Swedish, Ukrainian, and Vietnamese.
++
++OUTPUT_LANGUAGE        = English
++
++# If the BRIEF_MEMBER_DESC tag is set to YES (the default) Doxygen will
++# include brief member descriptions after the members that are listed in
++# the file and class documentation (similar to JavaDoc).
++# Set to NO to disable this.
++
++BRIEF_MEMBER_DESC      = YES
++
++# If the REPEAT_BRIEF tag is set to YES (the default) Doxygen will prepend
++# the brief description of a member or function before the detailed description.
++# Note: if both HIDE_UNDOC_MEMBERS and BRIEF_MEMBER_DESC are set to NO, the
++# brief descriptions will be completely suppressed.
++
++REPEAT_BRIEF           = YES
++
++# This tag implements a quasi-intelligent brief description abbreviator
++# that is used to form the text in various listings. Each string
++# in this list, if found as the leading text of the brief description, will be
++# stripped from the text and the result after processing the whole list, is
++# used as the annotated text. Otherwise, the brief description is used as-is.
++# If left blank, the following values are used ("$name" is automatically
++# replaced with the name of the entity): "The $name class" "The $name widget"
++# "The $name file" "is" "provides" "specifies" "contains"
++# "represents" "a" "an" "the"
++
++ABBREVIATE_BRIEF       =
++
++# If the ALWAYS_DETAILED_SEC and REPEAT_BRIEF tags are both set to YES then
++# Doxygen will generate a detailed section even if there is only a brief
++# description.
++
++ALWAYS_DETAILED_SEC    = NO
++
++# If the INLINE_INHERITED_MEMB tag is set to YES, doxygen will show all
++# inherited members of a class in the documentation of that class as if those
++# members were ordinary class members. Constructors, destructors and assignment
++# operators of the base classes will not be shown.
++
++INLINE_INHERITED_MEMB  = NO
++
++# If the FULL_PATH_NAMES tag is set to YES then Doxygen will prepend the full
++# path before files name in the file list and in the header files. If set
++# to NO the shortest path that makes the file name unique will be used.
++
++FULL_PATH_NAMES        = YES
++
++# If the FULL_PATH_NAMES tag is set to YES then the STRIP_FROM_PATH tag
++# can be used to strip a user-defined part of the path. Stripping is
++# only done if one of the specified strings matches the left-hand part of
++# the path. The tag can be used to show relative paths in the file list.
++# If left blank the directory from which doxygen is run is used as the
++# path to strip. Note that you specify absolute paths here, but also
++# relative paths, which will be relative from the directory where doxygen is
++# started.
++
++STRIP_FROM_PATH        =
++
++# The STRIP_FROM_INC_PATH tag can be used to strip a user-defined part of
++# the path mentioned in the documentation of a class, which tells
++# the reader which header file to include in order to use a class.
++# If left blank only the name of the header file containing the class
++# definition is used. Otherwise one should specify the include paths that
++# are normally passed to the compiler using the -I flag.
++
++STRIP_FROM_INC_PATH    =
++
++# If the SHORT_NAMES tag is set to YES, doxygen will generate much shorter
++# (but less readable) file names. This can be useful if your file system
++# doesn't support long names like on DOS, Mac, or CD-ROM.
++
++SHORT_NAMES            = NO
++
++# If the JAVADOC_AUTOBRIEF tag is set to YES then Doxygen
++# will interpret the first line (until the first dot) of a JavaDoc-style
++# comment as the brief description. If set to NO, the JavaDoc
++# comments will behave just like regular Qt-style comments
++# (thus requiring an explicit @brief command for a brief description.)
++
++JAVADOC_AUTOBRIEF      = NO
++
++# If the QT_AUTOBRIEF tag is set to YES then Doxygen will
++# interpret the first line (until the first dot) of a Qt-style
++# comment as the brief description. If set to NO, the comments
++# will behave just like regular Qt-style comments (thus requiring
++# an explicit \brief command for a brief description.)
++
++QT_AUTOBRIEF           = NO
++
++# The MULTILINE_CPP_IS_BRIEF tag can be set to YES to make Doxygen
++# treat a multi-line C++ special comment block (i.e. a block of //! or ///
++# comments) as a brief description. This used to be the default behaviour.
++# The new default is to treat a multi-line C++ comment block as a detailed
++# description. Set this tag to YES if you prefer the old behaviour instead.
++
++MULTILINE_CPP_IS_BRIEF = NO
++
++# If the INHERIT_DOCS tag is set to YES (the default) then an undocumented
++# member inherits the documentation from any documented member that it
++# re-implements.
++
++INHERIT_DOCS           = YES
++
++# If the SEPARATE_MEMBER_PAGES tag is set to YES, then doxygen will produce
++# a new page for each member. If set to NO, the documentation of a member will
++# be part of the file/class/namespace that contains it.
++
++SEPARATE_MEMBER_PAGES  = NO
++
++# The TAB_SIZE tag can be used to set the number of spaces in a tab.
++# Doxygen uses this value to replace tabs by spaces in code fragments.
++
++TAB_SIZE               = 8
++
++# This tag can be used to specify a number of aliases that acts
++# as commands in the documentation. An alias has the form "name=value".
++# For example adding "sideeffect=\par Side Effects:\n" will allow you to
++# put the command \sideeffect (or @sideeffect) in the documentation, which
++# will result in a user-defined paragraph with heading "Side Effects:".
++# You can put \n's in the value part of an alias to insert newlines.
++
++ALIASES                =
++
++# This tag can be used to specify a number of word-keyword mappings (TCL only).
++# A mapping has the form "name=value". For example adding
++# "class=itcl::class" will allow you to use the command class in the
++# itcl::class meaning.
++
++TCL_SUBST              =
++
++# Set the OPTIMIZE_OUTPUT_FOR_C tag to YES if your project consists of C
++# sources only. Doxygen will then generate output that is more tailored for C.
++# For instance, some of the names that are used will be different. The list
++# of all members will be omitted, etc.
++
++OPTIMIZE_OUTPUT_FOR_C  = YES
++
++# Set the OPTIMIZE_OUTPUT_JAVA tag to YES if your project consists of Java
++# sources only. Doxygen will then generate output that is more tailored for
++# Java. For instance, namespaces will be presented as packages, qualified
++# scopes will look different, etc.
++
++OPTIMIZE_OUTPUT_JAVA   = NO
++
++# Set the OPTIMIZE_FOR_FORTRAN tag to YES if your project consists of Fortran
++# sources only. Doxygen will then generate output that is more tailored for
++# Fortran.
++
++OPTIMIZE_FOR_FORTRAN   = NO
++
++# Set the OPTIMIZE_OUTPUT_VHDL tag to YES if your project consists of VHDL
++# sources. Doxygen will then generate output that is tailored for
++# VHDL.
++
++OPTIMIZE_OUTPUT_VHDL   = NO
++
++# Doxygen selects the parser to use depending on the extension of the files it
++# parses. With this tag you can assign which parser to use for a given
++# extension. Doxygen has a built-in mapping, but you can override or extend it
++# using this tag. The format is ext=language, where ext is a file extension,
++# and language is one of the parsers supported by doxygen: IDL, Java,
++# Javascript, CSharp, C, C++, D, PHP, Objective-C, Python, Fortran, VHDL, C,
++# C++. For instance to make doxygen treat .inc files as Fortran files (default
++# is PHP), and .f files as C (default is Fortran), use: inc=Fortran f=C. Note
++# that for custom extensions you also need to set FILE_PATTERNS otherwise the
++# files are not read by doxygen.
++
++EXTENSION_MAPPING      =
++
++# If MARKDOWN_SUPPORT is enabled (the default) then doxygen pre-processes all
++# comments according to the Markdown format, which allows for more readable
++# documentation. See http://daringfireball.net/projects/markdown/ for details.
++# The output of markdown processing is further processed by doxygen, so you
++# can mix doxygen, HTML, and XML commands with Markdown formatting.
++# Disable only in case of backward compatibilities issues.
++
++MARKDOWN_SUPPORT       = YES
++
++# When enabled doxygen tries to link words that correspond to documented classes,
++# or namespaces to their corresponding documentation. Such a link can be
++# prevented in individual cases by by putting a % sign in front of the word or
++# globally by setting AUTOLINK_SUPPORT to NO.
++
++AUTOLINK_SUPPORT       = YES
++
++# If you use STL classes (i.e. std::string, std::vector, etc.) but do not want
++# to include (a tag file for) the STL sources as input, then you should
++# set this tag to YES in order to let doxygen match functions declarations and
++# definitions whose arguments contain STL classes (e.g. func(std::string); v.s.
++# func(std::string) {}). This also makes the inheritance and collaboration
++# diagrams that involve STL classes more complete and accurate.
++
++BUILTIN_STL_SUPPORT    = NO
++
++# If you use Microsoft's C++/CLI language, you should set this option to YES to
++# enable parsing support.
++
++CPP_CLI_SUPPORT        = NO
++
++# Set the SIP_SUPPORT tag to YES if your project consists of sip sources only.
++# Doxygen will parse them like normal C++ but will assume all classes use public
++# instead of private inheritance when no explicit protection keyword is present.
++
++SIP_SUPPORT            = NO
++
++# For Microsoft's IDL there are propget and propput attributes to indicate
++# getter and setter methods for a property. Setting this option to YES (the
++# default) will make doxygen replace the get and set methods by a property in
++# the documentation. This will only work if the methods are indeed getting or
++# setting a simple type. If this is not the case, or you want to show the
++# methods anyway, you should set this option to NO.
++
++IDL_PROPERTY_SUPPORT   = NO
++
++# If member grouping is used in the documentation and the DISTRIBUTE_GROUP_DOC
++# tag is set to YES, then doxygen will reuse the documentation of the first
++# member in the group (if any) for the other members of the group. By default
++# all members of a group must be documented explicitly.
++
++DISTRIBUTE_GROUP_DOC   = NO
++
++# Set the SUBGROUPING tag to YES (the default) to allow class member groups of
++# the same type (for instance a group of public functions) to be put as a
++# subgroup of that type (e.g. under the Public Functions section). Set it to
++# NO to prevent subgrouping. Alternatively, this can be done per class using
++# the \nosubgrouping command.
++
++SUBGROUPING            = YES
++
++# When the INLINE_GROUPED_CLASSES tag is set to YES, classes, structs and
++# unions are shown inside the group in which they are included (e.g. using
++# @ingroup) instead of on a separate page (for HTML and Man pages) or
++# section (for LaTeX and RTF).
++
++INLINE_GROUPED_CLASSES = NO
++
++# When the INLINE_SIMPLE_STRUCTS tag is set to YES, structs, classes, and
++# unions with only public data fields will be shown inline in the documentation
++# of the scope in which they are defined (i.e. file, namespace, or group
++# documentation), provided this scope is documented. If set to NO (the default),
++# structs, classes, and unions are shown on a separate page (for HTML and Man
++# pages) or section (for LaTeX and RTF).
++
++INLINE_SIMPLE_STRUCTS  = NO
++
++# When TYPEDEF_HIDES_STRUCT is enabled, a typedef of a struct, union, or enum
++# is documented as struct, union, or enum with the name of the typedef. So
++# typedef struct TypeS {} TypeT, will appear in the documentation as a struct
++# with name TypeT. When disabled the typedef will appear as a member of a file,
++# namespace, or class. And the struct will be named TypeS. This can typically
++# be useful for C code in case the coding convention dictates that all compound
++# types are typedef'ed and only the typedef is referenced, never the tag name.
++
++TYPEDEF_HIDES_STRUCT   = NO
++
++# Similar to the SYMBOL_CACHE_SIZE the size of the symbol lookup cache can be
++# set using LOOKUP_CACHE_SIZE. This cache is used to resolve symbols given
++# their name and scope. Since this can be an expensive process and often the
++# same symbol appear multiple times in the code, doxygen keeps a cache of
++# pre-resolved symbols. If the cache is too small doxygen will become slower.
++# If the cache is too large, memory is wasted. The cache size is given by this
++# formula: 2^(16+LOOKUP_CACHE_SIZE). The valid range is 0..9, the default is 0,
++# corresponding to a cache size of 2^16 = 65536 symbols.
++
++LOOKUP_CACHE_SIZE      = 0
++
++#---------------------------------------------------------------------------
++# Build related configuration options
++#---------------------------------------------------------------------------
++
++# If the EXTRACT_ALL tag is set to YES doxygen will assume all entities in
++# documentation are documented, even if no documentation was available.
++# Private class members and static file members will be hidden unless
++# the EXTRACT_PRIVATE and EXTRACT_STATIC tags are set to YES
++
++EXTRACT_ALL            = NO
++
++# If the EXTRACT_PRIVATE tag is set to YES all private members of a class
++# will be included in the documentation.
++
++EXTRACT_PRIVATE        = NO
++
++# If the EXTRACT_PACKAGE tag is set to YES all members with package or internal
++# scope will be included in the documentation.
++
++EXTRACT_PACKAGE        = NO
++
++# If the EXTRACT_STATIC tag is set to YES all static members of a file
++# will be included in the documentation.
++
++EXTRACT_STATIC         = NO
++
++# If the EXTRACT_LOCAL_CLASSES tag is set to YES classes (and structs)
++# defined locally in source files will be included in the documentation.
++# If set to NO only classes defined in header files are included.
++
++EXTRACT_LOCAL_CLASSES  = NO
++
++# This flag is only useful for Objective-C code. When set to YES local
++# methods, which are defined in the implementation section but not in
++# the interface are included in the documentation.
++# If set to NO (the default) only methods in the interface are included.
++
++EXTRACT_LOCAL_METHODS  = NO
++
++# If this flag is set to YES, the members of anonymous namespaces will be
++# extracted and appear in the documentation as a namespace called
++# 'anonymous_namespace{file}', where file will be replaced with the base
++# name of the file that contains the anonymous namespace. By default
++# anonymous namespaces are hidden.
++
++EXTRACT_ANON_NSPACES   = NO
++
++# If the HIDE_UNDOC_MEMBERS tag is set to YES, Doxygen will hide all
++# undocumented members of documented classes, files or namespaces.
++# If set to NO (the default) these members will be included in the
++# various overviews, but no documentation section is generated.
++# This option has no effect if EXTRACT_ALL is enabled.
++
++HIDE_UNDOC_MEMBERS     = NO
++
++# If the HIDE_UNDOC_CLASSES tag is set to YES, Doxygen will hide all
++# undocumented classes that are normally visible in the class hierarchy.
++# If set to NO (the default) these classes will be included in the various
++# overviews. This option has no effect if EXTRACT_ALL is enabled.
++
++HIDE_UNDOC_CLASSES     = NO
++
++# If the HIDE_FRIEND_COMPOUNDS tag is set to YES, Doxygen will hide all
++# friend (class|struct|union) declarations.
++# If set to NO (the default) these declarations will be included in the
++# documentation.
++
++HIDE_FRIEND_COMPOUNDS  = NO
++
++# If the HIDE_IN_BODY_DOCS tag is set to YES, Doxygen will hide any
++# documentation blocks found inside the body of a function.
++# If set to NO (the default) these blocks will be appended to the
++# function's detailed documentation block.
++
++HIDE_IN_BODY_DOCS      = NO
++
++# The INTERNAL_DOCS tag determines if documentation
++# that is typed after a \internal command is included. If the tag is set
++# to NO (the default) then the documentation will be excluded.
++# Set it to YES to include the internal documentation.
++
++INTERNAL_DOCS          = NO
++
++# If the CASE_SENSE_NAMES tag is set to NO then Doxygen will only generate
++# file names in lower-case letters. If set to YES upper-case letters are also
++# allowed. This is useful if you have classes or files whose names only differ
++# in case and if your file system supports case sensitive file names. Windows
++# and Mac users are advised to set this option to NO.
++
++CASE_SENSE_NAMES       = YES
++
++# If the HIDE_SCOPE_NAMES tag is set to NO (the default) then Doxygen
++# will show members with their full class and namespace scopes in the
++# documentation. If set to YES the scope will be hidden.
++
++HIDE_SCOPE_NAMES       = NO
++
++# If the SHOW_INCLUDE_FILES tag is set to YES (the default) then Doxygen
++# will put a list of the files that are included by a file in the documentation
++# of that file.
++
++SHOW_INCLUDE_FILES     = YES
++
++# If the FORCE_LOCAL_INCLUDES tag is set to YES then Doxygen
++# will list include files with double quotes in the documentation
++# rather than with sharp brackets.
++
++FORCE_LOCAL_INCLUDES   = NO
++
++# If the INLINE_INFO tag is set to YES (the default) then a tag [inline]
++# is inserted in the documentation for inline members.
++
++INLINE_INFO            = YES
++
++# If the SORT_MEMBER_DOCS tag is set to YES (the default) then doxygen
++# will sort the (detailed) documentation of file and class members
++# alphabetically by member name. If set to NO the members will appear in
++# declaration order.
++
++SORT_MEMBER_DOCS       = YES
++
++# If the SORT_BRIEF_DOCS tag is set to YES then doxygen will sort the
++# brief documentation of file, namespace and class members alphabetically
++# by member name. If set to NO (the default) the members will appear in
++# declaration order.
++
++SORT_BRIEF_DOCS        = NO
++
++# If the SORT_MEMBERS_CTORS_1ST tag is set to YES then doxygen
++# will sort the (brief and detailed) documentation of class members so that
++# constructors and destructors are listed first. If set to NO (the default)
++# the constructors will appear in the respective orders defined by
++# SORT_MEMBER_DOCS and SORT_BRIEF_DOCS.
++# This tag will be ignored for brief docs if SORT_BRIEF_DOCS is set to NO
++# and ignored for detailed docs if SORT_MEMBER_DOCS is set to NO.
++
++SORT_MEMBERS_CTORS_1ST = NO
++
++# If the SORT_GROUP_NAMES tag is set to YES then doxygen will sort the
++# hierarchy of group names into alphabetical order. If set to NO (the default)
++# the group names will appear in their defined order.
++
++SORT_GROUP_NAMES       = NO
++
++# If the SORT_BY_SCOPE_NAME tag is set to YES, the class list will be
++# sorted by fully-qualified names, including namespaces. If set to
++# NO (the default), the class list will be sorted only by class name,
++# not including the namespace part.
++# Note: This option is not very useful if HIDE_SCOPE_NAMES is set to YES.
++# Note: This option applies only to the class list, not to the
++# alphabetical list.
++
++SORT_BY_SCOPE_NAME     = NO
++
++# If the STRICT_PROTO_MATCHING option is enabled and doxygen fails to
++# do proper type resolution of all parameters of a function it will reject a
++# match between the prototype and the implementation of a member function even
++# if there is only one candidate or it is obvious which candidate to choose
++# by doing a simple string match. By disabling STRICT_PROTO_MATCHING doxygen
++# will still accept a match between prototype and implementation in such cases.
++
++STRICT_PROTO_MATCHING  = NO
++
++# The GENERATE_TODOLIST tag can be used to enable (YES) or
++# disable (NO) the todo list. This list is created by putting \todo
++# commands in the documentation.
++
++GENERATE_TODOLIST      = YES
++
++# The GENERATE_TESTLIST tag can be used to enable (YES) or
++# disable (NO) the test list. This list is created by putting \test
++# commands in the documentation.
++
++GENERATE_TESTLIST      = YES
++
++# The GENERATE_BUGLIST tag can be used to enable (YES) or
++# disable (NO) the bug list. This list is created by putting \bug
++# commands in the documentation.
++
++GENERATE_BUGLIST       = YES
++
++# The GENERATE_DEPRECATEDLIST tag can be used to enable (YES) or
++# disable (NO) the deprecated list. This list is created by putting
++# \deprecated commands in the documentation.
++
++GENERATE_DEPRECATEDLIST= YES
++
++# The ENABLED_SECTIONS tag can be used to enable conditional
++# documentation sections, marked by \if section-label ... \endif
++# and \cond section-label ... \endcond blocks.
++
++ENABLED_SECTIONS       =
++
++# The MAX_INITIALIZER_LINES tag determines the maximum number of lines
++# the initial value of a variable or macro consists of for it to appear in
++# the documentation. If the initializer consists of more lines than specified
++# here it will be hidden. Use a value of 0 to hide initializers completely.
++# The appearance of the initializer of individual variables and macros in the
++# documentation can be controlled using \showinitializer or \hideinitializer
++# command in the documentation regardless of this setting.
++
++MAX_INITIALIZER_LINES  = 30
++
++# Set the SHOW_USED_FILES tag to NO to disable the list of files generated
++# at the bottom of the documentation of classes and structs. If set to YES the
++# list will mention the files that were used to generate the documentation.
++
++SHOW_USED_FILES        = YES
++
++# Set the SHOW_FILES tag to NO to disable the generation of the Files page.
++# This will remove the Files entry from the Quick Index and from the
++# Folder Tree View (if specified). The default is YES.
++
++SHOW_FILES             = YES
++
++# Set the SHOW_NAMESPACES tag to NO to disable the generation of the
++# Namespaces page.
++# This will remove the Namespaces entry from the Quick Index
++# and from the Folder Tree View (if specified). The default is YES.
++
++SHOW_NAMESPACES        = YES
++
++# The FILE_VERSION_FILTER tag can be used to specify a program or script that
++# doxygen should invoke to get the current version for each file (typically from
++# the version control system). Doxygen will invoke the program by executing (via
++# popen()) the command <command> <input-file>, where <command> is the value of
++# the FILE_VERSION_FILTER tag, and <input-file> is the name of an input file
++# provided by doxygen. Whatever the program writes to standard output
++# is used as the file version. See the manual for examples.
++
++FILE_VERSION_FILTER    = "git log -1 --pretty=format:'%h %ci'"
++
++# The LAYOUT_FILE tag can be used to specify a layout file which will be parsed
++# by doxygen. The layout file controls the global structure of the generated
++# output files in an output format independent way. To create the layout file
++# that represents doxygen's defaults, run doxygen with the -l option.
++# You can optionally specify a file name after the option, if omitted
++# DoxygenLayout.xml will be used as the name of the layout file.
++
++LAYOUT_FILE            =
++
++# The CITE_BIB_FILES tag can be used to specify one or more bib files
++# containing the references data. This must be a list of .bib files. The
++# .bib extension is automatically appended if omitted. Using this command
++# requires the bibtex tool to be installed. See also
++# http://en.wikipedia.org/wiki/BibTeX for more info. For LaTeX the style
++# of the bibliography can be controlled using LATEX_BIB_STYLE. To use this
++# feature you need bibtex and perl available in the search path. Do not use
++# file names with spaces, bibtex cannot handle them.
++
++CITE_BIB_FILES         =
++
++#---------------------------------------------------------------------------
++# configuration options related to warning and progress messages
++#---------------------------------------------------------------------------
++
++# The QUIET tag can be used to turn on/off the messages that are generated
++# by doxygen. Possible values are YES and NO. If left blank NO is used.
++
++QUIET                  = NO
++
++# The WARNINGS tag can be used to turn on/off the warning messages that are
++# generated by doxygen. Possible values are YES and NO. If left blank
++# NO is used.
++
++WARNINGS               = YES
++
++# If WARN_IF_UNDOCUMENTED is set to YES, then doxygen will generate warnings
++# for undocumented members. If EXTRACT_ALL is set to YES then this flag will
++# automatically be disabled.
++
++WARN_IF_UNDOCUMENTED   = YES
++
++# If WARN_IF_DOC_ERROR is set to YES, doxygen will generate warnings for
++# potential errors in the documentation, such as not documenting some
++# parameters in a documented function, or documenting parameters that
++# don't exist or using markup commands wrongly.
++
++WARN_IF_DOC_ERROR      = YES
++
++# The WARN_NO_PARAMDOC option can be enabled to get warnings for
++# functions that are documented, but have no documentation for their parameters
++# or return value. If set to NO (the default) doxygen will only warn about
++# wrong or incomplete parameter documentation, but not about the absence of
++# documentation.
++
++WARN_NO_PARAMDOC       = NO
++
++# The WARN_FORMAT tag determines the format of the warning messages that
++# doxygen can produce. The string should contain the $file, $line, and $text
++# tags, which will be replaced by the file and line number from which the
++# warning originated and the warning text. Optionally the format may contain
++# $version, which will be replaced by the version of the file (if it could
++# be obtained via FILE_VERSION_FILTER)
++
++WARN_FORMAT            = "$file:$line: $text"
++
++# The WARN_LOGFILE tag can be used to specify a file to which warning
++# and error messages should be written. If left blank the output is written
++# to stderr.
++
++WARN_LOGFILE           = doxygen.warnings
++
++#---------------------------------------------------------------------------
++# configuration options related to the input files
++#---------------------------------------------------------------------------
++
++# The INPUT tag can be used to specify the files and/or directories that contain
++# documented source files. You may enter file names like "myfile.cpp" or
++# directories like "/usr/src/myproject". Separate the files or directories
++# with spaces.
++
++INPUT                  = ../lib
++
++# This tag can be used to specify the character encoding of the source files
++# that doxygen parses. Internally doxygen uses the UTF-8 encoding, which is
++# also the default input encoding. Doxygen uses libiconv (or the iconv built
++# into libc) for the transcoding. See http://www.gnu.org/software/libiconv for
++# the list of possible encodings.
++
++INPUT_ENCODING         = UTF-8
++
++# If the value of the INPUT tag contains directories, you can use the
++# FILE_PATTERNS tag to specify one or more wildcard pattern (like *.cpp
++# and *.h) to filter out the source-files in the directories. If left
++# blank the following patterns are tested:
++# *.c *.cc *.cxx *.cpp *.c++ *.d *.java *.ii *.ixx *.ipp *.i++ *.inl *.h *.hh
++# *.hxx *.hpp *.h++ *.idl *.odl *.cs *.php *.php3 *.inc *.m *.mm *.dox *.py
++# *.f90 *.f *.for *.vhd *.vhdl
++
++FILE_PATTERNS          =
++
++# The RECURSIVE tag can be used to turn specify whether or not subdirectories
++# should be searched for input files as well. Possible values are YES and NO.
++# If left blank NO is used.
++
++RECURSIVE              = NO
++
++# The EXCLUDE tag can be used to specify files and/or directories that should be
++# excluded from the INPUT source files. This way you can easily exclude a
++# subdirectory from a directory tree whose root is specified with the INPUT tag.
++# Note that relative paths are relative to the directory from which doxygen is
++# run.
++
++EXCLUDE                =  ciniparser.h dictionary.h ciniparser.c dictionary.c
++
++# The EXCLUDE_SYMLINKS tag can be used to select whether or not files or
++# directories that are symbolic links (a Unix file system feature) are excluded
++# from the input.
++
++EXCLUDE_SYMLINKS       = NO
++
++# If the value of the INPUT tag contains directories, you can use the
++# EXCLUDE_PATTERNS tag to specify one or more wildcard patterns to exclude
++# certain files from those directories. Note that the wildcards are matched
++# against the file with absolute path, so to exclude all test directories
++# for example use the pattern */test/*
++
++EXCLUDE_PATTERNS       =
++
++# The EXCLUDE_SYMBOLS tag can be used to specify one or more symbol names
++# (namespaces, classes, functions, etc.) that should be excluded from the
++# output. The symbol name can be a fully qualified name, a word, or if the
++# wildcard * is used, a substring. Examples: ANamespace, AClass,
++# AClass::ANamespace, ANamespace::*Test
++
++EXCLUDE_SYMBOLS        =
++
++# The EXAMPLE_PATH tag can be used to specify one or more files or
++# directories that contain example code fragments that are included (see
++# the \include command).
++
++EXAMPLE_PATH           = ../tools ../drivers/default
++
++# If the value of the EXAMPLE_PATH tag contains directories, you can use the
++# EXAMPLE_PATTERNS tag to specify one or more wildcard pattern (like *.cpp
++# and *.h) to filter out the source-files in the directories. If left
++# blank all files are included.
++
++EXAMPLE_PATTERNS       =
++
++# If the EXAMPLE_RECURSIVE tag is set to YES then subdirectories will be
++# searched for input files to be used with the \include or \dontinclude
++# commands irrespective of the value of the RECURSIVE tag.
++# Possible values are YES and NO. If left blank NO is used.
++
++EXAMPLE_RECURSIVE      = NO
++
++# The IMAGE_PATH tag can be used to specify one or more files or
++# directories that contain image that are included in the documentation (see
++# the \image command).
++
++IMAGE_PATH             =
++
++# The INPUT_FILTER tag can be used to specify a program that doxygen should
++# invoke to filter for each input file. Doxygen will invoke the filter program
++# by executing (via popen()) the command <filter> <input-file>, where <filter>
++# is the value of the INPUT_FILTER tag, and <input-file> is the name of an
++# input file. Doxygen will then use the output that the filter program writes
++# to standard output.
++# If FILTER_PATTERNS is specified, this tag will be
++# ignored.
++
++INPUT_FILTER           =
++
++# The FILTER_PATTERNS tag can be used to specify filters on a per file pattern
++# basis.
++# Doxygen will compare the file name with each pattern and apply the
++# filter if there is a match.
++# The filters are a list of the form:
++# pattern=filter (like *.cpp=my_cpp_filter). See INPUT_FILTER for further
++# info on how filters are used. If FILTER_PATTERNS is empty or if
++# non of the patterns match the file name, INPUT_FILTER is applied.
++
++FILTER_PATTERNS        =
++
++# If the FILTER_SOURCE_FILES tag is set to YES, the input filter (if set using
++# INPUT_FILTER) will be used to filter the input files when producing source
++# files to browse (i.e. when SOURCE_BROWSER is set to YES).
++
++FILTER_SOURCE_FILES    = NO
++
++# The FILTER_SOURCE_PATTERNS tag can be used to specify source filters per file
++# pattern. A pattern will override the setting for FILTER_PATTERN (if any)
++# and it is also possible to disable source filtering for a specific pattern
++# using *.ext= (so without naming a filter). This option only has effect when
++# FILTER_SOURCE_FILES is enabled.
++
++FILTER_SOURCE_PATTERNS =
++
++# If the USE_MD_FILE_AS_MAINPAGE tag refers to the name of a markdown file that
++# is part of the input, its contents will be placed on the main page (index.html).
++# This can be useful if you have a project on for instance GitHub and want reuse
++# the introduction page also for the doxygen output.
++
++USE_MDFILE_AS_MAINPAGE =
++
++#---------------------------------------------------------------------------
++# configuration options related to source browsing
++#---------------------------------------------------------------------------
++
++# If the SOURCE_BROWSER tag is set to YES then a list of source files will
++# be generated. Documented entities will be cross-referenced with these sources.
++# Note: To get rid of all source code in the generated output, make sure also
++# VERBATIM_HEADERS is set to NO.
++
++SOURCE_BROWSER         = YES
++
++# Setting the INLINE_SOURCES tag to YES will include the body
++# of functions and classes directly in the documentation.
++
++INLINE_SOURCES         = NO
++
++# Setting the STRIP_CODE_COMMENTS tag to YES (the default) will instruct
++# doxygen to hide any special comment blocks from generated source code
++# fragments. Normal C, C++ and Fortran comments will always remain visible.
++
++STRIP_CODE_COMMENTS    = YES
++
++# If the REFERENCED_BY_RELATION tag is set to YES
++# then for each documented function all documented
++# functions referencing it will be listed.
++
++REFERENCED_BY_RELATION = NO
++
++# If the REFERENCES_RELATION tag is set to YES
++# then for each documented function all documented entities
++# called/used by that function will be listed.
++
++REFERENCES_RELATION    = NO
++
++# If the REFERENCES_LINK_SOURCE tag is set to YES (the default)
++# and SOURCE_BROWSER tag is set to YES, then the hyperlinks from
++# functions in REFERENCES_RELATION and REFERENCED_BY_RELATION lists will
++# link to the source code.
++# Otherwise they will link to the documentation.
++
++REFERENCES_LINK_SOURCE = YES
++
++# If the USE_HTAGS tag is set to YES then the references to source code
++# will point to the HTML generated by the htags(1) tool instead of doxygen
++# built-in source browser. The htags tool is part of GNU's global source
++# tagging system (see http://www.gnu.org/software/global/global.html). You
++# will need version 4.8.6 or higher.
++
++USE_HTAGS              = NO
++
++# If the VERBATIM_HEADERS tag is set to YES (the default) then Doxygen
++# will generate a verbatim copy of the header file for each class for
++# which an include is specified. Set to NO to disable this.
++
++VERBATIM_HEADERS       = YES
++
++#---------------------------------------------------------------------------
++# configuration options related to the alphabetical class index
++#---------------------------------------------------------------------------
++
++# If the ALPHABETICAL_INDEX tag is set to YES, an alphabetical index
++# of all compounds will be generated. Enable this if the project
++# contains a lot of classes, structs, unions or interfaces.
++
++ALPHABETICAL_INDEX     = YES
++
++# If the alphabetical index is enabled (see ALPHABETICAL_INDEX) then
++# the COLS_IN_ALPHA_INDEX tag can be used to specify the number of columns
++# in which this list will be split (can be a number in the range [1..20])
++
++COLS_IN_ALPHA_INDEX    = 5
++
++# In case all classes in a project start with a common prefix, all
++# classes will be put under the same header in the alphabetical index.
++# The IGNORE_PREFIX tag can be used to specify one or more prefixes that
++# should be ignored while generating the index headers.
++
++IGNORE_PREFIX          =
++
++#---------------------------------------------------------------------------
++# configuration options related to the HTML output
++#---------------------------------------------------------------------------
++
++# If the GENERATE_HTML tag is set to YES (the default) Doxygen will
++# generate HTML output.
++
++GENERATE_HTML          = YES
++
++# The HTML_OUTPUT tag is used to specify where the HTML docs will be put.
++# If a relative path is entered the value of OUTPUT_DIRECTORY will be
++# put in front of it. If left blank `html' will be used as the default path.
++
++HTML_OUTPUT            = html
++
++# The HTML_FILE_EXTENSION tag can be used to specify the file extension for
++# each generated HTML page (for example: .htm,.php,.asp). If it is left blank
++# doxygen will generate files with .html extension.
++
++HTML_FILE_EXTENSION    = .html
++
++# The HTML_HEADER tag can be used to specify a personal HTML header for
++# each generated HTML page. If it is left blank doxygen will generate a
++# standard header. Note that when using a custom header you are responsible
++#  for the proper inclusion of any scripts and style sheets that doxygen
++# needs, which is dependent on the configuration options used.
++# It is advised to generate a default header using "doxygen -w html
++# header.html footer.html stylesheet.css YourConfigFile" and then modify
++# that header. Note that the header is subject to change so you typically
++# have to redo this when upgrading to a newer version of doxygen or when
++# changing the value of configuration settings such as GENERATE_TREEVIEW!
++
++HTML_HEADER            =
++
++# The HTML_FOOTER tag can be used to specify a personal HTML footer for
++# each generated HTML page. If it is left blank doxygen will generate a
++# standard footer.
++
++HTML_FOOTER            =
++
++# The HTML_STYLESHEET tag can be used to specify a user-defined cascading
++# style sheet that is used by each HTML page. It can be used to
++# fine-tune the look of the HTML output. If left blank doxygen will
++# generate a default style sheet. Note that it is recommended to use
++# HTML_EXTRA_STYLESHEET instead of this one, as it is more robust and this
++# tag will in the future become obsolete.
++
++HTML_STYLESHEET        =
++
++# The HTML_EXTRA_STYLESHEET tag can be used to specify an additional
++# user-defined cascading style sheet that is included after the standard
++# style sheets created by doxygen. Using this option one can overrule
++# certain style aspects. This is preferred over using HTML_STYLESHEET
++# since it does not replace the standard style sheet and is therefor more
++# robust against future updates. Doxygen will copy the style sheet file to
++# the output directory.
++
++HTML_EXTRA_STYLESHEET  =
++
++# The HTML_EXTRA_FILES tag can be used to specify one or more extra images or
++# other source files which should be copied to the HTML output directory. Note
++# that these files will be copied to the base HTML output directory. Use the
++# $relpath$ marker in the HTML_HEADER and/or HTML_FOOTER files to load these
++# files. In the HTML_STYLESHEET file, use the file name only. Also note that
++# the files will be copied as-is; there are no commands or markers available.
++
++HTML_EXTRA_FILES       =
++
++# The HTML_COLORSTYLE_HUE tag controls the color of the HTML output.
++# Doxygen will adjust the colors in the style sheet and background images
++# according to this color. Hue is specified as an angle on a colorwheel,
++# see http://en.wikipedia.org/wiki/Hue for more information.
++# For instance the value 0 represents red, 60 is yellow, 120 is green,
++# 180 is cyan, 240 is blue, 300 purple, and 360 is red again.
++# The allowed range is 0 to 359.
++
++HTML_COLORSTYLE_HUE    = 220
++
++# The HTML_COLORSTYLE_SAT tag controls the purity (or saturation) of
++# the colors in the HTML output. For a value of 0 the output will use
++# grayscales only. A value of 255 will produce the most vivid colors.
++
++HTML_COLORSTYLE_SAT    = 100
++
++# The HTML_COLORSTYLE_GAMMA tag controls the gamma correction applied to
++# the luminance component of the colors in the HTML output. Values below
++# 100 gradually make the output lighter, whereas values above 100 make
++# the output darker. The value divided by 100 is the actual gamma applied,
++# so 80 represents a gamma of 0.8, The value 220 represents a gamma of 2.2,
++# and 100 does not change the gamma.
++
++HTML_COLORSTYLE_GAMMA  = 80
++
++# If the HTML_TIMESTAMP tag is set to YES then the footer of each generated HTML
++# page will contain the date and time when the page was generated. Setting
++# this to NO can help when comparing the output of multiple runs.
++
++HTML_TIMESTAMP         = NO
++
++# If the HTML_DYNAMIC_SECTIONS tag is set to YES then the generated HTML
++# documentation will contain sections that can be hidden and shown after the
++# page has loaded.
++
++HTML_DYNAMIC_SECTIONS  = NO
++
++# With HTML_INDEX_NUM_ENTRIES one can control the preferred number of
++# entries shown in the various tree structured indices initially; the user
++# can expand and collapse entries dynamically later on. Doxygen will expand
++# the tree to such a level that at most the specified number of entries are
++# visible (unless a fully collapsed tree already exceeds this amount).
++# So setting the number of entries 1 will produce a full collapsed tree by
++# default. 0 is a special value representing an infinite number of entries
++# and will result in a full expanded tree by default.
++
++HTML_INDEX_NUM_ENTRIES = 100
++
++# If the GENERATE_DOCSET tag is set to YES, additional index files
++# will be generated that can be used as input for Apple's Xcode 3
++# integrated development environment, introduced with OSX 10.5 (Leopard).
++# To create a documentation set, doxygen will generate a Makefile in the
++# HTML output directory. Running make will produce the docset in that
++# directory and running "make install" will install the docset in
++# ~/Library/Developer/Shared/Documentation/DocSets so that Xcode will find
++# it at startup.
++# See http://developer.apple.com/tools/creatingdocsetswithdoxygen.html
++# for more information.
++
++GENERATE_DOCSET        = NO
++
++# When GENERATE_DOCSET tag is set to YES, this tag determines the name of the
++# feed. A documentation feed provides an umbrella under which multiple
++# documentation sets from a single provider (such as a company or product suite)
++# can be grouped.
++
++DOCSET_FEEDNAME        = "Doxygen generated docs"
++
++# When GENERATE_DOCSET tag is set to YES, this tag specifies a string that
++# should uniquely identify the documentation set bundle. This should be a
++# reverse domain-name style string, e.g. com.mycompany.MyDocSet. Doxygen
++# will append .docset to the name.
++
++DOCSET_BUNDLE_ID       = org.doxygen.Project
++
++# When GENERATE_PUBLISHER_ID tag specifies a string that should uniquely
++# identify the documentation publisher. This should be a reverse domain-name
++# style string, e.g. com.mycompany.MyDocSet.documentation.
++
++DOCSET_PUBLISHER_ID    = org.doxygen.Publisher
++
++# The GENERATE_PUBLISHER_NAME tag identifies the documentation publisher.
++
++DOCSET_PUBLISHER_NAME  = Publisher
++
++# If the GENERATE_HTMLHELP tag is set to YES, additional index files
++# will be generated that can be used as input for tools like the
++# Microsoft HTML help workshop to generate a compiled HTML help file (.chm)
++# of the generated HTML documentation.
++
++GENERATE_HTMLHELP      = NO
++
++# If the GENERATE_HTMLHELP tag is set to YES, the CHM_FILE tag can
++# be used to specify the file name of the resulting .chm file. You
++# can add a path in front of the file if the result should not be
++# written to the html output directory.
++
++CHM_FILE               =
++
++# If the GENERATE_HTMLHELP tag is set to YES, the HHC_LOCATION tag can
++# be used to specify the location (absolute path including file name) of
++# the HTML help compiler (hhc.exe). If non-empty doxygen will try to run
++# the HTML help compiler on the generated index.hhp.
++
++HHC_LOCATION           =
++
++# If the GENERATE_HTMLHELP tag is set to YES, the GENERATE_CHI flag
++# controls if a separate .chi index file is generated (YES) or that
++# it should be included in the master .chm file (NO).
++
++GENERATE_CHI           = NO
++
++# If the GENERATE_HTMLHELP tag is set to YES, the CHM_INDEX_ENCODING
++# is used to encode HtmlHelp index (hhk), content (hhc) and project file
++# content.
++
++CHM_INDEX_ENCODING     =
++
++# If the GENERATE_HTMLHELP tag is set to YES, the BINARY_TOC flag
++# controls whether a binary table of contents is generated (YES) or a
++# normal table of contents (NO) in the .chm file.
++
++BINARY_TOC             = NO
++
++# The TOC_EXPAND flag can be set to YES to add extra items for group members
++# to the contents of the HTML help documentation and to the tree view.
++
++TOC_EXPAND             = NO
++
++# If the GENERATE_QHP tag is set to YES and both QHP_NAMESPACE and
++# QHP_VIRTUAL_FOLDER are set, an additional index file will be generated
++# that can be used as input for Qt's qhelpgenerator to generate a
++# Qt Compressed Help (.qch) of the generated HTML documentation.
++
++GENERATE_QHP           = NO
++
++# If the QHG_LOCATION tag is specified, the QCH_FILE tag can
++# be used to specify the file name of the resulting .qch file.
++# The path specified is relative to the HTML output folder.
++
++QCH_FILE               =
++
++# The QHP_NAMESPACE tag specifies the namespace to use when generating
++# Qt Help Project output. For more information please see
++# http://doc.trolltech.com/qthelpproject.html#namespace
++
++QHP_NAMESPACE          = org.doxygen.Project
++
++# The QHP_VIRTUAL_FOLDER tag specifies the namespace to use when generating
++# Qt Help Project output. For more information please see
++# http://doc.trolltech.com/qthelpproject.html#virtual-folders
++
++QHP_VIRTUAL_FOLDER     = doc
++
++# If QHP_CUST_FILTER_NAME is set, it specifies the name of a custom filter to
++# add. For more information please see
++# http://doc.trolltech.com/qthelpproject.html#custom-filters
++
++QHP_CUST_FILTER_NAME   =
++
++# The QHP_CUST_FILT_ATTRS tag specifies the list of the attributes of the
++# custom filter to add. For more information please see
++# <a href="http://doc.trolltech.com/qthelpproject.html#custom-filters">
++# Qt Help Project / Custom Filters</a>.
++
++QHP_CUST_FILTER_ATTRS  =
++
++# The QHP_SECT_FILTER_ATTRS tag specifies the list of the attributes this
++# project's
++# filter section matches.
++# <a href="http://doc.trolltech.com/qthelpproject.html#filter-attributes">
++# Qt Help Project / Filter Attributes</a>.
++
++QHP_SECT_FILTER_ATTRS  =
++
++# If the GENERATE_QHP tag is set to YES, the QHG_LOCATION tag can
++# be used to specify the location of Qt's qhelpgenerator.
++# If non-empty doxygen will try to run qhelpgenerator on the generated
++# .qhp file.
++
++QHG_LOCATION           =
++
++# If the GENERATE_ECLIPSEHELP tag is set to YES, additional index files
++#  will be generated, which together with the HTML files, form an Eclipse help
++# plugin. To install this plugin and make it available under the help contents
++# menu in Eclipse, the contents of the directory containing the HTML and XML
++# files needs to be copied into the plugins directory of eclipse. The name of
++# the directory within the plugins directory should be the same as
++# the ECLIPSE_DOC_ID value. After copying Eclipse needs to be restarted before
++# the help appears.
++
++GENERATE_ECLIPSEHELP   = NO
++
++# A unique identifier for the eclipse help plugin. When installing the plugin
++# the directory name containing the HTML and XML files should also have
++# this name.
++
++ECLIPSE_DOC_ID         = org.doxygen.Project
++
++# The DISABLE_INDEX tag can be used to turn on/off the condensed index (tabs)
++# at top of each HTML page. The value NO (the default) enables the index and
++# the value YES disables it. Since the tabs have the same information as the
++# navigation tree you can set this option to NO if you already set
++# GENERATE_TREEVIEW to YES.
++
++DISABLE_INDEX          = NO
++
++# The GENERATE_TREEVIEW tag is used to specify whether a tree-like index
++# structure should be generated to display hierarchical information.
++# If the tag value is set to YES, a side panel will be generated
++# containing a tree-like index structure (just like the one that
++# is generated for HTML Help). For this to work a browser that supports
++# JavaScript, DHTML, CSS and frames is required (i.e. any modern browser).
++# Windows users are probably better off using the HTML help feature.
++# Since the tree basically has the same information as the tab index you
++# could consider to set DISABLE_INDEX to NO when enabling this option.
++
++GENERATE_TREEVIEW      = YES
++
++# The ENUM_VALUES_PER_LINE tag can be used to set the number of enum values
++# (range [0,1..20]) that doxygen will group on one line in the generated HTML
++# documentation. Note that a value of 0 will completely suppress the enum
++# values from appearing in the overview section.
++
++ENUM_VALUES_PER_LINE   = 4
++
++# If the treeview is enabled (see GENERATE_TREEVIEW) then this tag can be
++# used to set the initial width (in pixels) of the frame in which the tree
++# is shown.
++
++TREEVIEW_WIDTH         = 250
++
++# When the EXT_LINKS_IN_WINDOW option is set to YES doxygen will open
++# links to external symbols imported via tag files in a separate window.
++
++EXT_LINKS_IN_WINDOW    = NO
++
++# Use this tag to change the font size of Latex formulas included
++# as images in the HTML documentation. The default is 10. Note that
++# when you change the font size after a successful doxygen run you need
++# to manually remove any form_*.png images from the HTML output directory
++# to force them to be regenerated.
++
++FORMULA_FONTSIZE       = 10
++
++# Use the FORMULA_TRANPARENT tag to determine whether or not the images
++# generated for formulas are transparent PNGs. Transparent PNGs are
++# not supported properly for IE 6.0, but are supported on all modern browsers.
++# Note that when changing this option you need to delete any form_*.png files
++# in the HTML output before the changes have effect.
++
++FORMULA_TRANSPARENT    = YES
++
++# Enable the USE_MATHJAX option to render LaTeX formulas using MathJax
++# (see http://www.mathjax.org) which uses client side Javascript for the
++# rendering instead of using prerendered bitmaps. Use this if you do not
++# have LaTeX installed or if you want to formulas look prettier in the HTML
++# output. When enabled you may also need to install MathJax separately and
++# configure the path to it using the MATHJAX_RELPATH option.
++
++USE_MATHJAX            = NO
++
++# When MathJax is enabled you can set the default output format to be used for
++# thA MathJax output. Supported types are HTML-CSS, NativeMML (i.e. MathML) and
++# SVG. The default value is HTML-CSS, which is slower, but has the best
++# compatibility.
++
++MATHJAX_FORMAT         = HTML-CSS
++
++# When MathJax is enabled you need to specify the location relative to the
++# HTML output directory using the MATHJAX_RELPATH option. The destination
++# directory should contain the MathJax.js script. For instance, if the mathjax
++# directory is located at the same level as the HTML output directory, then
++# MATHJAX_RELPATH should be ../mathjax. The default value points to
++# the MathJax Content Delivery Network so you can quickly see the result without
++# installing MathJax.
++# However, it is strongly recommended to install a local
++# copy of MathJax from http://www.mathjax.org before deployment.
++
++MATHJAX_RELPATH        = http://cdn.mathjax.org/mathjax/latest
++
++# The MATHJAX_EXTENSIONS tag can be used to specify one or MathJax extension
++# names that should be enabled during MathJax rendering.
++
++MATHJAX_EXTENSIONS     =
++
++# When the SEARCHENGINE tag is enabled doxygen will generate a search box
++# for the HTML output. The underlying search engine uses javascript
++# and DHTML and should work on any modern browser. Note that when using
++# HTML help (GENERATE_HTMLHELP), Qt help (GENERATE_QHP), or docsets
++# (GENERATE_DOCSET) there is already a search function so this one should
++# typically be disabled. For large projects the javascript based search engine
++# can be slow, then enabling SERVER_BASED_SEARCH may provide a better solution.
++
++SEARCHENGINE           = YES
++
++# When the SERVER_BASED_SEARCH tag is enabled the search engine will be
++# implemented using a web server instead of a web client using Javascript.
++# There are two flavours of web server based search depending on the
++# EXTERNAL_SEARCH setting. When disabled, doxygen will generate a PHP script for
++# searching and an index file used by the script. When EXTERNAL_SEARCH is
++# enabled the indexing and searching needs to be provided by external tools.
++# See the manual for details.
++
++SERVER_BASED_SEARCH    = NO
++
++# When EXTERNAL_SEARCH is enabled doxygen will no longer generate the PHP
++# script for searching. Instead the search results are written to an XML file
++# which needs to be processed by an external indexer. Doxygen will invoke an
++# external search engine pointed to by the SEARCHENGINE_URL option to obtain
++# the search results. Doxygen ships with an example indexer (doxyindexer) and
++# search engine (doxysearch.cgi) which are based on the open source search engine
++# library Xapian. See the manual for configuration details.
++
++EXTERNAL_SEARCH        = NO
++
++# The SEARCHENGINE_URL should point to a search engine hosted by a web server
++# which will returned the search results when EXTERNAL_SEARCH is enabled.
++# Doxygen ships with an example search engine (doxysearch) which is based on
++# the open source search engine library Xapian. See the manual for configuration
++# details.
++
++SEARCHENGINE_URL       =
++
++# When SERVER_BASED_SEARCH and EXTERNAL_SEARCH are both enabled the unindexed
++# search data is written to a file for indexing by an external tool. With the
++# SEARCHDATA_FILE tag the name of this file can be specified.
++
++SEARCHDATA_FILE        = searchdata.xml
++
++# When SERVER_BASED_SEARCH AND EXTERNAL_SEARCH are both enabled the
++# EXTERNAL_SEARCH_ID tag can be used as an identifier for the project. This is
++# useful in combination with EXTRA_SEARCH_MAPPINGS to search through multiple
++# projects and redirect the results back to the right project.
++
++EXTERNAL_SEARCH_ID     =
++
++# The EXTRA_SEARCH_MAPPINGS tag can be used to enable searching through doxygen
++# projects other than the one defined by this configuration file, but that are
++# all added to the same external search index. Each project needs to have a
++# unique id set via EXTERNAL_SEARCH_ID. The search mapping then maps the id
++# of to a relative location where the documentation can be found.
++# The format is: EXTRA_SEARCH_MAPPINGS = id1=loc1 id2=loc2 ...
++
++EXTRA_SEARCH_MAPPINGS  =
++
++#---------------------------------------------------------------------------
++# configuration options related to the LaTeX output
++#---------------------------------------------------------------------------
++
++# If the GENERATE_LATEX tag is set to YES (the default) Doxygen will
++# generate Latex output.
++
++GENERATE_LATEX         = YES
++
++# The LATEX_OUTPUT tag is used to specify where the LaTeX docs will be put.
++# If a relative path is entered the value of OUTPUT_DIRECTORY will be
++# put in front of it. If left blank `latex' will be used as the default path.
++
++LATEX_OUTPUT           = latex
++
++# The LATEX_CMD_NAME tag can be used to specify the LaTeX command name to be
++# invoked. If left blank `latex' will be used as the default command name.
++# Note that when enabling USE_PDFLATEX this option is only used for
++# generating bitmaps for formulas in the HTML output, but not in the
++# Makefile that is written to the output directory.
++
++LATEX_CMD_NAME         = latex
++
++# The MAKEINDEX_CMD_NAME tag can be used to specify the command name to
++# generate index for LaTeX. If left blank `makeindex' will be used as the
++# default command name.
++
++MAKEINDEX_CMD_NAME     = makeindex
++
++# If the COMPACT_LATEX tag is set to YES Doxygen generates more compact
++# LaTeX documents. This may be useful for small projects and may help to
++# save some trees in general.
++
++COMPACT_LATEX          = NO
++
++# The PAPER_TYPE tag can be used to set the paper type that is used
++# by the printer. Possible values are: a4, letter, legal and
++# executive. If left blank a4wide will be used.
++
++PAPER_TYPE             = a4
++
++# The EXTRA_PACKAGES tag can be to specify one or more names of LaTeX
++# packages that should be included in the LaTeX output.
++
++EXTRA_PACKAGES         =
++
++# The LATEX_HEADER tag can be used to specify a personal LaTeX header for
++# the generated latex document. The header should contain everything until
++# the first chapter. If it is left blank doxygen will generate a
++# standard header. Notice: only use this tag if you know what you are doing!
++
++LATEX_HEADER           =
++
++# The LATEX_FOOTER tag can be used to specify a personal LaTeX footer for
++# the generated latex document. The footer should contain everything after
++# the last chapter. If it is left blank doxygen will generate a
++# standard footer. Notice: only use this tag if you know what you are doing!
++
++LATEX_FOOTER           =
++
++# If the PDF_HYPERLINKS tag is set to YES, the LaTeX that is generated
++# is prepared for conversion to pdf (using ps2pdf). The pdf file will
++# contain links (just like the HTML output) instead of page references
++# This makes the output suitable for online browsing using a pdf viewer.
++
++PDF_HYPERLINKS         = YES
++
++# If the USE_PDFLATEX tag is set to YES, pdflatex will be used instead of
++# plain latex in the generated Makefile. Set this option to YES to get a
++# higher quality PDF documentation.
++
++USE_PDFLATEX           = YES
++
++# If the LATEX_BATCHMODE tag is set to YES, doxygen will add the \\batchmode.
++# command to the generated LaTeX files. This will instruct LaTeX to keep
++# running if errors occur, instead of asking the user for help.
++# This option is also used when generating formulas in HTML.
++
++LATEX_BATCHMODE        = NO
++
++# If LATEX_HIDE_INDICES is set to YES then doxygen will not
++# include the index chapters (such as File Index, Compound Index, etc.)
++# in the output.
++
++LATEX_HIDE_INDICES     = NO
++
++# If LATEX_SOURCE_CODE is set to YES then doxygen will include
++# source code with syntax highlighting in the LaTeX output.
++# Note that which sources are shown also depends on other settings
++# such as SOURCE_BROWSER.
++
++LATEX_SOURCE_CODE      = NO
++
++# The LATEX_BIB_STYLE tag can be used to specify the style to use for the
++# bibliography, e.g. plainnat, or ieeetr. The default style is "plain". See
++# http://en.wikipedia.org/wiki/BibTeX for more info.
++
++LATEX_BIB_STYLE        = plain
++
++#---------------------------------------------------------------------------
++# configuration options related to the RTF output
++#---------------------------------------------------------------------------
++
++# If the GENERATE_RTF tag is set to YES Doxygen will generate RTF output
++# The RTF output is optimized for Word 97 and may not look very pretty with
++# other RTF readers or editors.
++
++GENERATE_RTF           = NO
++
++# The RTF_OUTPUT tag is used to specify where the RTF docs will be put.
++# If a relative path is entered the value of OUTPUT_DIRECTORY will be
++# put in front of it. If left blank `rtf' will be used as the default path.
++
++RTF_OUTPUT             = rtf
++
++# If the COMPACT_RTF tag is set to YES Doxygen generates more compact
++# RTF documents. This may be useful for small projects and may help to
++# save some trees in general.
++
++COMPACT_RTF            = NO
++
++# If the RTF_HYPERLINKS tag is set to YES, the RTF that is generated
++# will contain hyperlink fields. The RTF file will
++# contain links (just like the HTML output) instead of page references.
++# This makes the output suitable for online browsing using WORD or other
++# programs which support those fields.
++# Note: wordpad (write) and others do not support links.
++
++RTF_HYPERLINKS         = NO
++
++# Load style sheet definitions from file. Syntax is similar to doxygen's
++# config file, i.e. a series of assignments. You only have to provide
++# replacements, missing definitions are set to their default value.
++
++RTF_STYLESHEET_FILE    =
++
++# Set optional variables used in the generation of an rtf document.
++# Syntax is similar to doxygen's config file.
++
++RTF_EXTENSIONS_FILE    =
++
++#---------------------------------------------------------------------------
++# configuration options related to the man page output
++#---------------------------------------------------------------------------
++
++# If the GENERATE_MAN tag is set to YES (the default) Doxygen will
++# generate man pages
++
++GENERATE_MAN           = NO
++
++# The MAN_OUTPUT tag is used to specify where the man pages will be put.
++# If a relative path is entered the value of OUTPUT_DIRECTORY will be
++# put in front of it. If left blank `man' will be used as the default path.
++
++MAN_OUTPUT             = man
++
++# The MAN_EXTENSION tag determines the extension that is added to
++# the generated man pages (default is the subroutine's section .3)
++
++MAN_EXTENSION          = .3
++
++# If the MAN_LINKS tag is set to YES and Doxygen generates man output,
++# then it will generate one additional man file for each entity
++# documented in the real man page(s). These additional files
++# only source the real man page, but without them the man command
++# would be unable to find the correct page. The default is NO.
++
++MAN_LINKS              = NO
++
++#---------------------------------------------------------------------------
++# configuration options related to the XML output
++#---------------------------------------------------------------------------
++
++# If the GENERATE_XML tag is set to YES Doxygen will
++# generate an XML file that captures the structure of
++# the code including all documentation.
++
++GENERATE_XML           = NO
++
++# The XML_OUTPUT tag is used to specify where the XML pages will be put.
++# If a relative path is entered the value of OUTPUT_DIRECTORY will be
++# put in front of it. If left blank `xml' will be used as the default path.
++
++XML_OUTPUT             = xml
++
++# The XML_SCHEMA tag can be used to specify an XML schema,
++# which can be used by a validating XML parser to check the
++# syntax of the XML files.
++
++XML_SCHEMA             =
++
++# The XML_DTD tag can be used to specify an XML DTD,
++# which can be used by a validating XML parser to check the
++# syntax of the XML files.
++
++XML_DTD                =
++
++# If the XML_PROGRAMLISTING tag is set to YES Doxygen will
++# dump the program listings (including syntax highlighting
++# and cross-referencing information) to the XML output. Note that
++# enabling this will significantly increase the size of the XML output.
++
++XML_PROGRAMLISTING     = YES
++
++#---------------------------------------------------------------------------
++# configuration options for the AutoGen Definitions output
++#---------------------------------------------------------------------------
++
++# If the GENERATE_AUTOGEN_DEF tag is set to YES Doxygen will
++# generate an AutoGen Definitions (see autogen.sf.net) file
++# that captures the structure of the code including all
++# documentation. Note that this feature is still experimental
++# and incomplete at the moment.
++
++GENERATE_AUTOGEN_DEF   = NO
++
++#---------------------------------------------------------------------------
++# configuration options related to the Perl module output
++#---------------------------------------------------------------------------
++
++# If the GENERATE_PERLMOD tag is set to YES Doxygen will
++# generate a Perl module file that captures the structure of
++# the code including all documentation. Note that this
++# feature is still experimental and incomplete at the
++# moment.
++
++GENERATE_PERLMOD       = NO
++
++# If the PERLMOD_LATEX tag is set to YES Doxygen will generate
++# the necessary Makefile rules, Perl scripts and LaTeX code to be able
++# to generate PDF and DVI output from the Perl module output.
++
++PERLMOD_LATEX          = NO
++
++# If the PERLMOD_PRETTY tag is set to YES the Perl module output will be
++# nicely formatted so it can be parsed by a human reader.
++# This is useful
++# if you want to understand what is going on.
++# On the other hand, if this
++# tag is set to NO the size of the Perl module output will be much smaller
++# and Perl will parse it just the same.
++
++PERLMOD_PRETTY         = YES
++
++# The names of the make variables in the generated doxyrules.make file
++# are prefixed with the string contained in PERLMOD_MAKEVAR_PREFIX.
++# This is useful so different doxyrules.make files included by the same
++# Makefile don't overwrite each other's variables.
++
++PERLMOD_MAKEVAR_PREFIX =
++
++#---------------------------------------------------------------------------
++# Configuration options related to the preprocessor
++#---------------------------------------------------------------------------
++
++# If the ENABLE_PREPROCESSING tag is set to YES (the default) Doxygen will
++# evaluate all C-preprocessor directives found in the sources and include
++# files.
++
++ENABLE_PREPROCESSING   = YES
++
++# If the MACRO_EXPANSION tag is set to YES Doxygen will expand all macro
++# names in the source code. If set to NO (the default) only conditional
++# compilation will be performed. Macro expansion can be done in a controlled
++# way by setting EXPAND_ONLY_PREDEF to YES.
++
++MACRO_EXPANSION        = NO
++
++# If the EXPAND_ONLY_PREDEF and MACRO_EXPANSION tags are both set to YES
++# then the macro expansion is limited to the macros specified with the
++# PREDEFINED and EXPAND_AS_DEFINED tags.
++
++EXPAND_ONLY_PREDEF     = NO
++
++# If the SEARCH_INCLUDES tag is set to YES (the default) the includes files
++# pointed to by INCLUDE_PATH will be searched when a #include is found.
++
++SEARCH_INCLUDES        = YES
++
++# The INCLUDE_PATH tag can be used to specify one or more directories that
++# contain include files that are not input files but should be processed by
++# the preprocessor.
++
++INCLUDE_PATH           =
++
++# You can use the INCLUDE_FILE_PATTERNS tag to specify one or more wildcard
++# patterns (like *.h and *.hpp) to filter out the header-files in the
++# directories. If left blank, the patterns specified with FILE_PATTERNS will
++# be used.
++
++INCLUDE_FILE_PATTERNS  =
++
++# The PREDEFINED tag can be used to specify one or more macro names that
++# are defined before the preprocessor is started (similar to the -D option of
++# gcc). The argument of the tag is a list of macros of the form: name
++# or name=definition (no spaces). If the definition and the = are
++# omitted =1 is assumed. To prevent a macro definition from being
++# undefined via #undef or recursively expanded use the := operator
++# instead of the = operator.
++
++PREDEFINED             =
++
++# If the MACRO_EXPANSION and EXPAND_ONLY_PREDEF tags are set to YES then
++# this tag can be used to specify a list of macro names that should be expanded.
++# The macro definition that is found in the sources will be used.
++# Use the PREDEFINED tag if you want to use a different macro definition that
++# overrules the definition found in the source code.
++
++EXPAND_AS_DEFINED      =
++
++# If the SKIP_FUNCTION_MACROS tag is set to YES (the default) then
++# doxygen's preprocessor will remove all references to function-like macros
++# that are alone on a line, have an all uppercase name, and do not end with a
++# semicolon, because these will confuse the parser if not removed.
++
++SKIP_FUNCTION_MACROS   = YES
++
++#---------------------------------------------------------------------------
++# Configuration::additions related to external references
++#---------------------------------------------------------------------------
++
++# The TAGFILES option can be used to specify one or more tagfiles. For each
++# tag file the location of the external documentation should be added. The
++# format of a tag file without this location is as follows:
++#
++# TAGFILES = file1 file2 ...
++# Adding location for the tag files is done as follows:
++#
++# TAGFILES = file1=loc1 "file2 = loc2" ...
++# where "loc1" and "loc2" can be relative or absolute paths
++# or URLs. Note that each tag file must have a unique name (where the name does
++# NOT include the path). If a tag file is not located in the directory in which
++# doxygen is run, you must also specify the path to the tagfile here.
++
++TAGFILES               =
++
++# When a file name is specified after GENERATE_TAGFILE, doxygen will create
++# a tag file that is based on the input files it reads.
++
++GENERATE_TAGFILE       =
++
++# If the ALLEXTERNALS tag is set to YES all external classes will be listed
++# in the class index. If set to NO only the inherited external classes
++# will be listed.
++
++ALLEXTERNALS           = NO
++
++# If the EXTERNAL_GROUPS tag is set to YES all external groups will be listed
++# in the modules index. If set to NO, only the current project's groups will
++# be listed.
++
++EXTERNAL_GROUPS        = YES
++
++# The PERL_PATH should be the absolute path and name of the perl script
++# interpreter (i.e. the result of `which perl').
++
++PERL_PATH              = /usr/bin/perl
++
++#---------------------------------------------------------------------------
++# Configuration options related to the dot tool
++#---------------------------------------------------------------------------
++
++# If the CLASS_DIAGRAMS tag is set to YES (the default) Doxygen will
++# generate a inheritance diagram (in HTML, RTF and LaTeX) for classes with base
++# or super classes. Setting the tag to NO turns the diagrams off. Note that
++# this option also works with HAVE_DOT disabled, but it is recommended to
++# install and use dot, since it yields more powerful graphs.
++
++CLASS_DIAGRAMS         = YES
++
++# You can define message sequence charts within doxygen comments using the \msc
++# command. Doxygen will then run the mscgen tool (see
++# http://www.mcternan.me.uk/mscgen/) to produce the chart and insert it in the
++# documentation. The MSCGEN_PATH tag allows you to specify the directory where
++# the mscgen tool resides. If left empty the tool is assumed to be found in the
++# default search path.
++
++MSCGEN_PATH            =
++
++# If set to YES, the inheritance and collaboration graphs will hide
++# inheritance and usage relations if the target is undocumented
++# or is not a class.
++
++HIDE_UNDOC_RELATIONS   = YES
++
++# If you set the HAVE_DOT tag to YES then doxygen will assume the dot tool is
++# available from the path. This tool is part of Graphviz, a graph visualization
++# toolkit from AT&T and Lucent Bell Labs. The other options in this section
++# have no effect if this option is set to NO (the default)
++
++HAVE_DOT               = NO
++
++# The DOT_NUM_THREADS specifies the number of dot invocations doxygen is
++# allowed to run in parallel. When set to 0 (the default) doxygen will
++# base this on the number of processors available in the system. You can set it
++# explicitly to a value larger than 0 to get control over the balance
++# between CPU load and processing speed.
++
++DOT_NUM_THREADS        = 0
++
++# By default doxygen will use the Helvetica font for all dot files that
++# doxygen generates. When you want a differently looking font you can specify
++# the font name using DOT_FONTNAME. You need to make sure dot is able to find
++# the font, which can be done by putting it in a standard location or by setting
++# the DOTFONTPATH environment variable or by setting DOT_FONTPATH to the
++# directory containing the font.
++
++DOT_FONTNAME           = Helvetica
++
++# The DOT_FONTSIZE tag can be used to set the size of the font of dot graphs.
++# The default size is 10pt.
++
++DOT_FONTSIZE           = 10
++
++# By default doxygen will tell dot to use the Helvetica font.
++# If you specify a different font using DOT_FONTNAME you can use DOT_FONTPATH to
++# set the path where dot can find it.
++
++DOT_FONTPATH           =
++
++# If the CLASS_GRAPH and HAVE_DOT tags are set to YES then doxygen
++# will generate a graph for each documented class showing the direct and
++# indirect inheritance relations. Setting this tag to YES will force the
++# CLASS_DIAGRAMS tag to NO.
++
++CLASS_GRAPH            = YES
++
++# If the COLLABORATION_GRAPH and HAVE_DOT tags are set to YES then doxygen
++# will generate a graph for each documented class showing the direct and
++# indirect implementation dependencies (inheritance, containment, and
++# class references variables) of the class with other documented classes.
++
++COLLABORATION_GRAPH    = YES
++
++# If the GROUP_GRAPHS and HAVE_DOT tags are set to YES then doxygen
++# will generate a graph for groups, showing the direct groups dependencies
++
++GROUP_GRAPHS           = YES
++
++# If the UML_LOOK tag is set to YES doxygen will generate inheritance and
++# collaboration diagrams in a style similar to the OMG's Unified Modeling
++# Language.
++
++UML_LOOK               = NO
++
++# If the UML_LOOK tag is enabled, the fields and methods are shown inside
++# the class node. If there are many fields or methods and many nodes the
++# graph may become too big to be useful. The UML_LIMIT_NUM_FIELDS
++# threshold limits the number of items for each type to make the size more
++# managable. Set this to 0 for no limit. Note that the threshold may be
++# exceeded by 50% before the limit is enforced.
++
++UML_LIMIT_NUM_FIELDS   = 10
++
++# If set to YES, the inheritance and collaboration graphs will show the
++# relations between templates and their instances.
++
++TEMPLATE_RELATIONS     = NO
++
++# If the ENABLE_PREPROCESSING, SEARCH_INCLUDES, INCLUDE_GRAPH, and HAVE_DOT
++# tags are set to YES then doxygen will generate a graph for each documented
++# file showing the direct and indirect include dependencies of the file with
++# other documented files.
++
++INCLUDE_GRAPH          = YES
++
++# If the ENABLE_PREPROCESSING, SEARCH_INCLUDES, INCLUDED_BY_GRAPH, and
++# HAVE_DOT tags are set to YES then doxygen will generate a graph for each
++# documented header file showing the documented files that directly or
++# indirectly include this file.
++
++INCLUDED_BY_GRAPH      = YES
++
++# If the CALL_GRAPH and HAVE_DOT options are set to YES then
++# doxygen will generate a call dependency graph for every global function
++# or class method. Note that enabling this option will significantly increase
++# the time of a run. So in most cases it will be better to enable call graphs
++# for selected functions only using the \callgraph command.
++
++CALL_GRAPH             = NO
++
++# If the CALLER_GRAPH and HAVE_DOT tags are set to YES then
++# doxygen will generate a caller dependency graph for every global function
++# or class method. Note that enabling this option will significantly increase
++# the time of a run. So in most cases it will be better to enable caller
++# graphs for selected functions only using the \callergraph command.
++
++CALLER_GRAPH           = NO
++
++# If the GRAPHICAL_HIERARCHY and HAVE_DOT tags are set to YES then doxygen
++# will generate a graphical hierarchy of all classes instead of a textual one.
++
++GRAPHICAL_HIERARCHY    = YES
++
++# If the DIRECTORY_GRAPH and HAVE_DOT tags are set to YES
++# then doxygen will show the dependencies a directory has on other directories
++# in a graphical way. The dependency relations are determined by the #include
++# relations between the files in the directories.
++
++DIRECTORY_GRAPH        = YES
++
++# The DOT_IMAGE_FORMAT tag can be used to set the image format of the images
++# generated by dot. Possible values are svg, png, jpg, or gif.
++# If left blank png will be used. If you choose svg you need to set
++# HTML_FILE_EXTENSION to xhtml in order to make the SVG files
++# visible in IE 9+ (other browsers do not have this requirement).
++
++DOT_IMAGE_FORMAT       = png
++
++# If DOT_IMAGE_FORMAT is set to svg, then this option can be set to YES to
++# enable generation of interactive SVG images that allow zooming and panning.
++# Note that this requires a modern browser other than Internet Explorer.
++# Tested and working are Firefox, Chrome, Safari, and Opera. For IE 9+ you
++# need to set HTML_FILE_EXTENSION to xhtml in order to make the SVG files
++# visible. Older versions of IE do not have SVG support.
++
++INTERACTIVE_SVG        = NO
++
++# The tag DOT_PATH can be used to specify the path where the dot tool can be
++# found. If left blank, it is assumed the dot tool can be found in the path.
++
++DOT_PATH               =
++
++# The DOTFILE_DIRS tag can be used to specify one or more directories that
++# contain dot files that are included in the documentation (see the
++# \dotfile command).
++
++DOTFILE_DIRS           =
++
++# The MSCFILE_DIRS tag can be used to specify one or more directories that
++# contain msc files that are included in the documentation (see the
++# \mscfile command).
++
++MSCFILE_DIRS           =
++
++# The DOT_GRAPH_MAX_NODES tag can be used to set the maximum number of
++# nodes that will be shown in the graph. If the number of nodes in a graph
++# becomes larger than this value, doxygen will truncate the graph, which is
++# visualized by representing a node as a red box. Note that doxygen if the
++# number of direct children of the root node in a graph is already larger than
++# DOT_GRAPH_MAX_NODES then the graph will not be shown at all. Also note
++# that the size of a graph can be further restricted by MAX_DOT_GRAPH_DEPTH.
++
++DOT_GRAPH_MAX_NODES    = 50
++
++# The MAX_DOT_GRAPH_DEPTH tag can be used to set the maximum depth of the
++# graphs generated by dot. A depth value of 3 means that only nodes reachable
++# from the root by following a path via at most 3 edges will be shown. Nodes
++# that lay further from the root node will be omitted. Note that setting this
++# option to 1 or 2 may greatly reduce the computation time needed for large
++# code bases. Also note that the size of a graph can be further restricted by
++# DOT_GRAPH_MAX_NODES. Using a depth of 0 means no depth restriction.
++
++MAX_DOT_GRAPH_DEPTH    = 0
++
++# Set the DOT_TRANSPARENT tag to YES to generate images with a transparent
++# background. This is disabled by default, because dot on Windows does not
++# seem to support this out of the box. Warning: Depending on the platform used,
++# enabling this option may lead to badly anti-aliased labels on the edges of
++# a graph (i.e. they become hard to read).
++
++DOT_TRANSPARENT        = NO
++
++# Set the DOT_MULTI_TARGETS tag to YES allow dot to generate multiple output
++# files in one run (i.e. multiple -o and -T options on the command line). This
++# makes dot run faster, but since only newer versions of dot (>1.8.10)
++# support this, this feature is disabled by default.
++
++DOT_MULTI_TARGETS      = NO
++
++# If the GENERATE_LEGEND tag is set to YES (the default) Doxygen will
++# generate a legend page explaining the meaning of the various boxes and
++# arrows in the dot generated graphs.
++
++GENERATE_LEGEND        = YES
++
++# If the DOT_CLEANUP tag is set to YES (the default) Doxygen will
++# remove the intermediate dot files that are used to generate
++# the various graphs.
++
++DOT_CLEANUP            = YES
+-- 
+1.9.3
+

From 82dc44c36931fd13719d56f56a6f0927f217bb43 Mon Sep 17 00:00:00 2001
From: Alec Leamas <leamas.alec@gmail.com>
Date: Thu, 11 Dec 2014 13:26:53 +0100
Subject: [PATCH 139/204] Adding missing source.

---
 .gitignore | 1 +
 sources    | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/.gitignore b/.gitignore
index 5189218..810e6a7 100644
--- a/.gitignore
+++ b/.gitignore
@@ -6,3 +6,4 @@ lirc-0.8.7pre2.tar.bz2
 /lirc-0.8.7-pre3.tar.bz2
 /lirc-0.8.7.tar.bz2
 /lirc-0.9.0-pre1.tar.bz2
+/lirc-0.9.2.tar.gz
diff --git a/sources b/sources
index 4236ac8..ee62b22 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-1f1fac162ed309dd50f307e96a292957  lirc-0.9.1a.tar.bz2
+c9154bf61947dde0ba1b91f7dd54c2e5  lirc-0.9.2.tar.gz

From b0cd3ef064cfd578b4667a53ae8f3a5bdf73c219 Mon Sep 17 00:00:00 2001
From: Alec Leamas <leamas.alec@gmail.com>
Date: Thu, 15 Jan 2015 14:15:56 +0100
Subject: [PATCH 140/204] Adding missing R: misc-fixed fonts to GUI subpackage.

---
 lirc.spec | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/lirc.spec b/lirc.spec
index a1c2042..d79629e 100644
--- a/lirc.spec
+++ b/lirc.spec
@@ -28,9 +28,9 @@ Source0:        http://leamas.fedorapeople.org/lirc/lirc-%{src_vers}.tar.gz
 %endif
 Source6:        README.fedora
 Source7:        99-remote-control-lirc.rules
-		# Config only, cannot be upstreamed.
+                # Config only, cannot be upstreamed.
 Patch1:         0001-Changing-effective-user-default.patch
-		# Already upstream (0002..0006).
+                # Already upstream (0002..0006).
 Patch2:         0002-tools-Make-make_rel_symlink.py-use-python3.patch
 Patch3:         0003-all-Use-puts-instead-of-printf-when-applicable.patch
 Patch4:         0004-all-Sanitize-feature-tests-macros.patch
@@ -166,6 +166,7 @@ Udev rule which disables the kernel built-in handling of infrared devices
 %package        tools-gui
 Summary:        LIRC GUI tools
 Requires:       lirc-core%{?_isa} = %{version}-%{release}
+Requires:       xorg-x11-fonts-misc
 
 %description   tools-gui
 Some seldom used X11-based tools for debugging lirc configurations.

From 703278441909a30a8ce984d5032f8d3a5f21e32c Mon Sep 17 00:00:00 2001
From: Alec Leamas <leamas.alec@gmail.com>
Date: Mon, 9 Feb 2015 13:15:09 +0100
Subject: [PATCH 141/204] Updating for new upstream release 0.9.2a

---
 .gitignore                                    |    1 +
 0001-Changing-effective-user-default.patch    |   17 +-
 ...s-instead-of-printf-when-applicalble.patch | 1022 +++++++++
 ...Make-make_rel_symlink.py-use-python3.patch |   42 -
 0004-all-Sanitize-feature-tests-macros.patch  |   87 -
 ...ure.ac-Use-pkg-config-to-locate-ftdi.patch |   53 -
 ...dd-Doxyfile-not-part-of-dist-tarball.patch | 1872 -----------------
 lirc.spec                                     |   18 +-
 sources                                       |    2 +-
 9 files changed, 1039 insertions(+), 2075 deletions(-)
 create mode 100644 0002-Use-puts-instead-of-printf-when-applicalble.patch
 delete mode 100644 0002-tools-Make-make_rel_symlink.py-use-python3.patch
 delete mode 100644 0004-all-Sanitize-feature-tests-macros.patch
 delete mode 100644 0005-configure.ac-Use-pkg-config-to-locate-ftdi.patch
 delete mode 100644 0006-Add-Doxyfile-not-part-of-dist-tarball.patch

diff --git a/.gitignore b/.gitignore
index 810e6a7..e0a2f70 100644
--- a/.gitignore
+++ b/.gitignore
@@ -7,3 +7,4 @@ lirc-0.8.7pre2.tar.bz2
 /lirc-0.8.7.tar.bz2
 /lirc-0.9.0-pre1.tar.bz2
 /lirc-0.9.2.tar.gz
+/lirc-0.9.2a.tar.gz
diff --git a/0001-Changing-effective-user-default.patch b/0001-Changing-effective-user-default.patch
index c562239..c19b4ef 100644
--- a/0001-Changing-effective-user-default.patch
+++ b/0001-Changing-effective-user-default.patch
@@ -1,24 +1,25 @@
-From 184366b6200c80fae167853bab0038a54538ad16 Mon Sep 17 00:00:00 2001
+From bd400dc047567d230d194c2be8c911a300c0f723 Mon Sep 17 00:00:00 2001
 From: Alec Leamas <leamas.alec@gmail.com>
-Date: Thu, 11 Dec 2014 00:30:23 +0100
-Subject: [PATCH] Changing effective-user default
+Date: Mon, 9 Feb 2015 12:46:17 +0100
+Subject: [PATCH] lirc_options: Set effective user to lirc.
 
 ---
- lirc_options.conf | 1 +
- 1 file changed, 1 insertion(+)
+ lirc_options.conf | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
 
 diff --git a/lirc_options.conf b/lirc_options.conf
-index 9dc672a..bf342c1 100644
+index 9346de8..bf342c1 100644
 --- a/lirc_options.conf
 +++ b/lirc_options.conf
-@@ -12,6 +12,7 @@ plugindir       = /usr/lib/lirc/plugins
+@@ -12,7 +12,7 @@ plugindir       = /usr/lib/lirc/plugins
  permission      = 666
  allow-simulate  = No
  repeat-max      = 600
+-#effective-user =
 +effective-user  = lirc
  #listen         = [address:]port
  #connect        = host[:port]
  #debug          = 6
 -- 
-1.9.3
+2.1.0
 
diff --git a/0002-Use-puts-instead-of-printf-when-applicalble.patch b/0002-Use-puts-instead-of-printf-when-applicalble.patch
new file mode 100644
index 0000000..c0437e5
--- /dev/null
+++ b/0002-Use-puts-instead-of-printf-when-applicalble.patch
@@ -0,0 +1,1022 @@
+From 0be5fe98430ce738d0c176245cc4ee564bbc3fd2 Mon Sep 17 00:00:00 2001
+From: Alec Leamas <leamas.alec@gmail.com>
+Date: Mon, 9 Feb 2015 13:00:06 +0100
+Subject: [PATCH] Use puts instead of printf when applicalble
+
+Recent gcc generates warnings when using printf instead
+of puts()/fputs() when applicable.
+---
+ daemons/lircd.c        |   4 +-
+ daemons/lircmd.c       |   2 +-
+ lib/lirc_client.c      |   2 +
+ tools/irrecord.c       | 105 +++++++++++++++++++++++++------------------------
+ tools/irsend.c         |   2 +-
+ tools/irsimreceive.c   |  26 ++++++------
+ tools/irsimsend.c      |  14 +++----
+ tools/irtestcase.c     |  27 ++++++-------
+ tools/lirc-lsplugins.c |  34 ++++++++--------
+ tools/lirc-lsremotes.c |  14 +++----
+ tools/mode2.c          |  32 +++++++--------
+ tools/xmode2.c         |  23 +++++------
+ 12 files changed, 144 insertions(+), 141 deletions(-)
+
+diff --git a/daemons/lircd.c b/daemons/lircd.c
+index 4c8e37b..3af27d9 100644
+--- a/daemons/lircd.c
++++ b/daemons/lircd.c
+@@ -2285,7 +2285,7 @@ static void lircd_parse_options(int argc, char** const argv)
+ 	{
+ 		switch (c) {
+ 		case 'h':
+-			printf(help);
++			puts(help);
+ 			exit(EXIT_SUCCESS);
+ 		case 'v':
+ 			printf("lircd %s\n", VERSION);
+@@ -2433,7 +2433,7 @@ int main(int argc, char **argv)
+ 		opt = options_getstring("lircd:listen_hostport");
+ 		if (opt){
+ 			if (opt2host_port(opt, &address, &port, errmsg) != 0){
+-				fprintf(stderr, errmsg);
++				fputs(errmsg, stderr);
+ 				return(EXIT_FAILURE);
+ 			}
+ 		} else
+diff --git a/daemons/lircmd.c b/daemons/lircmd.c
+index 023777c..869b3a9 100644
+--- a/daemons/lircmd.c
++++ b/daemons/lircmd.c
+@@ -784,7 +784,7 @@ static void lircmd_parse_options(int argc,  char** const argv)
+ 	{
+ 		switch (c) {
+ 		case 'h':
+-			printf(help);
++			puts(help);
+ 			exit(EXIT_SUCCESS);
+ 		case 'v':
+ 			printf("lircmd %s\n",  VERSION);
+diff --git a/lib/lirc_client.c b/lib/lirc_client.c
+index df2eaef..a0e3333 100644
+--- a/lib/lirc_client.c
++++ b/lib/lirc_client.c
+@@ -105,6 +105,8 @@ chk_write(int fd, const void *buf, size_t count, const char* msg)
+ 		perror(msg);
+ 	}
+ }
++
++
+ int lirc_command_init(lirc_cmd_ctx* ctx, const char* fmt, ...)
+ {
+ 	va_list ap;
+diff --git a/tools/irrecord.c b/tools/irrecord.c
+index f52328c..788e425 100644
+--- a/tools/irrecord.c
++++ b/tools/irrecord.c
+@@ -339,7 +339,7 @@ static void parse_options(int argc, char** const argv)
+ 			options_set_opt("irrecord:driver", optarg);
+ 			break;
+ 		case 'h':
+-			printf(help);
++			puts(help);
+ 			exit(EXIT_SUCCESS);
+ 		case 'i':
+ 			options_set_opt("irrecord:invert", "True");
+@@ -374,14 +374,14 @@ static void parse_options(int argc, char** const argv)
+ 			printf("irrecord %s\n",  VERSION);
+ 			exit(EXIT_SUCCESS);
+ 		default:
+-			fprintf(stderr, USAGE);
++			fputs(USAGE, stderr);
+ 			exit(EXIT_FAILURE);
+ 		}
+ 	}
+ 	if (optind == argc - 1) {
+ 		options_set_opt("configfile", argv[optind]);
+ 	} else if (optind != argc) {
+-		fprintf(stderr, "irrecord: invalid argument count\n");
++		fputs("irrecord: invalid argument count\n", stderr);
+ 		exit(EXIT_FAILURE);
+ 	}
+ }
+@@ -416,7 +416,7 @@ int main(int argc, char **argv)
+ 	analyse = options_getboolean("irrecord:analyse");
+ 	if (hw_choose_driver(opt) != 0 && ! analyse) {
+ 		fprintf(stderr, "Driver `%s' not found", opt);
+-		fprintf(stderr, " (wrong or missing -U/--plugindir?).\n");
++		fputs(" (wrong or missing -U/--plugindir?).\n", stderr);
+ 		hw_print_drivers(stderr);
+ 		exit(EXIT_FAILURE);
+ 	}
+@@ -526,9 +526,9 @@ int main(int argc, char **argv)
+ 		perror(progname);
+ 		exit(EXIT_FAILURE);
+ 	}
+-	printf("\nirrecord -  application for recording IR-codes" " for usage with lirc\n" "\n"
++	puts("\nirrecord -  application for recording IR-codes" " for usage with lirc\n" "\n"
+ 	       "Copyright (C) 1998,1999 Christoph Bartelmus" "(lirc@bartelmus.de)\n");
+-	printf("\n");
++	puts("\n");
+ 
+ 	if (curr_driver->init_func) {
+ 		if (!curr_driver->init_func()) {
+@@ -561,16 +561,16 @@ int main(int argc, char **argv)
+ 		exit(EXIT_FAILURE);
+ 	}
+ 
+-	printf("This program will record the signals from your remote control\n"
++	puts("This program will record the signals from your remote control\n"
+ 	       "and create a config file for lircd.\n\n" "\n");
+ 	if (curr_driver->name && strcmp(curr_driver->name, "devinput") == 0) {
+-		printf("Usually it's not necessary to create a new config file for devinput\n"
++		puts("Usually it's not necessary to create a new config file for devinput\n"
+ 		       "devices. A generic config file can be found at:\n"
+ 		       "https://sourceforge.net/p/lirc-remotes/code/ci/master/tree/remotes/devinput/devinput.lircd.conf"
+ 		       "It can be downloaded using irdb-get(1)\n"
+ 		       "Please try this config file before creating your own.\n" "\n");
+ 	}
+-	printf("A proper config file for lircd is maybe the most vital part of this\n"
++	puts("A proper config file for lircd is maybe the most vital part of this\n"
+ 	       "package, so you should invest some time to create a working config\n"
+ 	       "file. Although I put a good deal of effort in this program it is often\n"
+ 	       "not possible to automatically recognize all features of a remote\n"
+@@ -610,7 +610,7 @@ int main(int argc, char **argv)
+ 					curr_driver->deinit_func();
+ 				exit(EXIT_FAILURE);
+ 			}
+-			printf("Creating config file in raw mode.\n");
++			puts("Creating config file in raw mode.\n");
+ 			set_protocol(&remote, RAW_CODES);
+ 			remote.eps = eps;
+ 			remote.aeps = aeps;
+@@ -643,7 +643,7 @@ int main(int argc, char **argv)
+ 			curr_driver->rec_func(NULL);
+ 		}
+ 		if (!get_toggle_bit_mask(&remote)) {
+-			printf("But I know for sure that RC6 has a toggle bit!\n");
++			puts("But I know for sure that RC6 has a toggle bit!\n");
+ 			fclose(fout);
+ 			unlink(filename);
+ 			if (curr_driver->deinit_func)
+@@ -651,7 +651,7 @@ int main(int argc, char **argv)
+ 			exit(EXIT_FAILURE);
+ 		}
+ 	}
+-	printf("Now enter the names for the buttons.\n");
++	puts("Now enter the names for the buttons.\n");
+ 
+ 	fprint_copyright(fout);
+ 	fprint_comment(fout, &remote, commandline);
+@@ -663,8 +663,8 @@ int main(int argc, char **argv)
+ 
+ 		if (no_data) {
+ 			fprintf(stderr, "%s: no data for 10 secs," " aborting\n", progname);
+-			printf("The last button did not seem to generate any signal.\n");
+-			printf("Press RETURN to continue.\n\n");
++			puts("The last button did not seem to generate any signal.\n");
++			puts("Press RETURN to continue.\n\n");
+ 			getchar();
+ 			no_data = 0;
+ 		}
+@@ -678,13 +678,13 @@ int main(int argc, char **argv)
+ 		}
+ 		buffer[strlen(buffer) - 1] = 0;
+ 		if (strchr(buffer, ' ') || strchr(buffer, '\t')) {
+-			printf("The name must not contain any whitespace.\n");
+-			printf("Please try again.\n");
++			puts("The name must not contain any whitespace.\n");
++			puts("Please try again.\n");
+ 			continue;
+ 		}
+ 		if (strcasecmp(buffer, "begin") == 0 || strcasecmp(buffer, "end") == 0) {
+ 			printf("'%s' is not allowed as button name\n", buffer);
+-			printf("Please try again.\n");
++			puts("Please try again.\n");
+ 			continue;
+ 		}
+ 		if (strlen(buffer) == 0) {
+@@ -693,7 +693,7 @@ int main(int argc, char **argv)
+ 		if (!disable_namespace && !is_in_namespace(buffer)) {
+ 			printf("'%s' is not in name space (use --disable-namespace to disable checks)\n", buffer);
+ 			printf("Use '%s --list-namespace' to see a full list of valid button names\n", progname);
+-			printf("Please try again.\n");
++			puts("Please try again.\n");
+ 			continue;
+ 		}
+ 
+@@ -730,9 +730,9 @@ int main(int argc, char **argv)
+ 				}
+ 				if (count == 0) {
+ 					if (!is_space(data) || data < remote.gap - remote.gap * remote.eps / 100) {
+-						printf("Sorry, something went wrong.\n");
++						puts("Sorry, something went wrong.\n");
+ 						sleep(3);
+-						printf("Try again.\n");
++						puts("Try again.\n");
+ 						flushhw();
+ 						count = 0;
+ 						continue;
+@@ -742,13 +742,13 @@ int main(int argc, char **argv)
+ 					    && (is_const(&remote) ? data >
+ 						(remote.gap > sum ? (remote.gap - sum) * (100 - remote.eps) / 100 : 0)
+ 						: data > remote.gap * (100 - remote.eps) / 100)) {
+-						printf("Got it.\n");
++						puts("Got it.\n");
+ 						printf("Signal length is %d\n", count - 1);
+ 						if (count % 2) {
+-							printf("That's weird because the signal length "
++							puts("That's weird because the signal length "
+ 							       "must be odd!\n");
+ 							sleep(3);
+-							printf("Try again.\n");
++							puts("Try again.\n");
+ 							flushhw();
+ 							count = 0;
+ 							continue;
+@@ -766,7 +766,7 @@ int main(int argc, char **argv)
+ 				count++;
+ 			}
+ 			if (count == MAX_SIGNALS) {
+-				printf("Signal is too long.\n");
++				puts("Signal is too long.\n");
+ 			}
+ 			if (retval == EXIT_FAILURE)
+ 				break;
+@@ -814,7 +814,7 @@ int main(int argc, char **argv)
+ 				}
+ 				break;
+ 			} else {
+-				printf("Something went wrong. ");
++				puts("Something went wrong. ");
+ 				if (retries > 1) {
+ 					fflush(stdout);
+ 					sleep(3);
+@@ -826,8 +826,8 @@ int main(int argc, char **argv)
+ 					flushhw();
+ 					printf("Please try again. (%d retries left)\n", retries - 1);
+ 				} else {
+-					printf("\n");
+-					printf("Try using the -f option.\n");
++					puts("\n");
++					puts("Try using the -f option.\n");
+ 				}
+ 				retries--;
+ 				continue;
+@@ -1033,8 +1033,8 @@ int get_toggle_bit_mask(struct ir_remote *remote)
+ 		}
+ 	}
+ 
+-	printf("Checking for toggle bit mask.\n");
+-	printf("Please press an arbitrary button repeatedly as fast as possible.\n"
++	puts("Checking for toggle bit mask.\n");
++	puts("Please press an arbitrary button repeatedly as fast as possible.\n"
+ 	       "Make sure you keep pressing the SAME button and that you DON'T HOLD\n" "the button down!.\n"
+ 	       "If you can't see any dots appear, then wait a bit between button presses.\n" "\n"
+ 	       "Press RETURN to continue.");
+@@ -1089,7 +1089,7 @@ int get_toggle_bit_mask(struct ir_remote *remote)
+ 					set_toggle_bit_mask(remote, first ^ decode_ctx.code);
+ 					found = 1;
+ 				}
+-				printf(".");
++				puts(".");
+ 				fflush(stdout);
+ 				retries--;
+ 			} else {
+@@ -1101,12 +1101,12 @@ int get_toggle_bit_mask(struct ir_remote *remote)
+ 		}
+ 	}
+ 	if (!found) {
+-		printf("\nNo toggle bit mask found.\n");
++		puts("\nNo toggle bit mask found.\n");
+ 	} else {
+ 		if (remote->toggle_bit_mask > 0) {
+ 			printf("\nToggle bit mask is 0x%llx.\n", (__u64) remote->toggle_bit_mask);
+ 		} else if (remote->toggle_mask != 0) {
+-			printf("\nToggle mask found.\n");
++			puts("\nToggle mask found.\n");
+ 		}
+ 	}
+ 	if (seq > 0)
+@@ -1533,12 +1533,12 @@ int get_lengths(struct ir_remote *remote, int force, int interactive)
+ 	int first_signal;
+ 
+ 	if (interactive) {
+-		printf("Now start pressing buttons on your remote control.\n\n");
+-		printf("It is very important that you press many different buttons and hold them\n"
++		puts("Now start pressing buttons on your remote control.\n\n");
++		puts("It is very important that you press many different buttons and hold them\n"
+ 		       "down for approximately one second. Each button should generate at least one\n"
+ 		       "dot but in no case more than ten dots of output.\n"
+ 		       "Don't stop pressing buttons until two lines of dots (2x80) have been\n" "generated.\n\n");
+-		printf("Press RETURN now to start recording.");
++		puts("Press RETURN now to start recording.");
+ 		fflush(stdout);
+ 		getchar();
+ 		flushhw();
+@@ -1647,7 +1647,7 @@ int get_lengths(struct ir_remote *remote, int force, int interactive)
+ 
+ 					if (interactive) {
+ 						for (i = maxcount - lastmaxcount; i > 0; i--) {
+-							printf(".");
++							puts(".");
+ 							fflush(stdout);
+ 						}
+ 					}
+@@ -1715,7 +1715,7 @@ int get_lengths(struct ir_remote *remote, int force, int interactive)
+ 						int i;
+ 
+ 						if (interactive) {
+-							printf(".");
++							puts(".");
+ 							fflush(stdout);
+ 						}
+ 						count_signals++;
+@@ -2130,7 +2130,7 @@ int get_repeat_length(struct ir_remote *remote, int interactive)
+ 
+ 	if (!((count_3repeats > SAMPLES / 2 ? 1 : 0) ^ (count_5repeats > SAMPLES / 2 ? 1 : 0))) {
+ 		if (count_3repeats > SAMPLES / 2 || count_5repeats > SAMPLES / 2) {
+-			printf("Repeat inconsitentcy.\n");
++			puts("Repeat inconsitentcy.\n");
+ 			return (0);
+ 		}
+ 		i_printf(interactive, "No repeat code found.\n");
+@@ -2151,7 +2151,7 @@ int get_repeat_length(struct ir_remote *remote, int interactive)
+ 		}
+ 		if (max_count >= sum * TH_REPEAT / 100) {
+ 			if (count_5repeats > count_3repeats && !has_header(remote)) {
+-				printf("Repeat code has header," " but no header found!\n");
++				puts("Repeat code has header," " but no header found!\n");
+ 				return (0);
+ 			}
+ 			if (count_5repeats > count_3repeats && has_header(remote)) {
+@@ -2199,7 +2199,7 @@ void unlink_length(struct lengths **first, struct lengths *remove)
+ 			scan = scan->next;
+ 		}
+ 	}
+-	printf("unlink_length(): report this bug!\n");
++	puts("unlink_length(): report this bug!\n");
+ }
+ 
+ int get_data_length(struct ir_remote *remote, int interactive)
+@@ -2224,12 +2224,12 @@ int get_data_length(struct ir_remote *remote, int interactive)
+ 				max2_plength = NULL;
+ 		}
+ 		if (lirc_log_is_enabled_for(LIRC_DEBUG)) {
+-			printf("Pulse canditates: ");
++			puts("Pulse canditates: ");
+ 			printf("%u x %u", max_plength->count, (__u32) calc_signal(max_plength));
+ 			if (max2_plength)
+ 				printf(", %u x %u", max2_plength->count, (__u32)
+ 				       calc_signal(max2_plength));
+-			printf("\n");
++			puts("\n");
+ 		}
+ 
+ 		max_slength = get_max_length(first_space, &sum);
+@@ -2247,21 +2247,21 @@ int get_data_length(struct ir_remote *remote, int interactive)
+ 			}
+ 			if (lirc_log_is_enabled_for(LIRC_DEBUG)) {
+ 				if (max_count >= sum * TH_IS_BIT / 100) {
+-					printf("Space candidates: ");
++					puts("Space candidates: ");
+ 					printf("%u x %u", max_slength->count,
+ 					       (__u32) calc_signal(max_slength));
+ 					if (max2_slength)
+ 						printf(", %u x %u",
+ 						       max2_slength->count,
+ 						       (__u32) calc_signal(max2_slength));
+-					printf("\n");
++					puts("\n");
+ 				}
+ 			}
+ 			remote->eps = eps;
+ 			remote->aeps = aeps;
+ 			if (is_biphase(remote)) {
+ 				if (max2_plength == NULL || max2_slength == NULL) {
+-					printf("Unknown encoding found.\n");
++					puts("Unknown encoding found.\n");
+ 					return (0);
+ 				}
+ 				i_printf(interactive, "Signals are biphase encoded.\n");
+@@ -2276,11 +2276,11 @@ int get_data_length(struct ir_remote *remote, int interactive)
+ 				remote->szero = remote->sone;
+ 			} else {
+ 				if (max2_plength == NULL && max2_slength == NULL) {
+-					printf("No encoding found.\n");
++					puts("No encoding found.\n");
+ 					return (0);
+ 				}
+ 				if (max2_plength && max2_slength) {
+-					printf("Unknown encoding found.\n");
++					puts("Unknown encoding found.\n");
+ 					return (0);
+ 				}
+ 				p1 = calc_signal(max_plength);
+@@ -2348,7 +2348,7 @@ int get_data_length(struct ir_remote *remote, int interactive)
+ 		}
+ 		free_lengths(&max_plength);
+ 	}
+-	printf("Could not find data lengths.\n");
++	puts("Could not find data lengths.\n");
+ 	return (0);
+ }
+ 
+@@ -2366,7 +2366,7 @@ int get_gap_length(struct ir_remote *remote)
+ 
+ 	flag = 0;
+ 	lastmaxcount = 0;
+-	printf("Hold down an arbitrary button.\n");
++	puts("Hold down an arbitrary button.\n");
+ 	while (1) {
+ 		while (availabledata()) {
+ 			curr_driver->rec_func(NULL);
+@@ -2398,7 +2398,7 @@ int get_gap_length(struct ir_remote *remote)
+ 			}
+ 			if (maxcount > lastmaxcount) {
+ 				lastmaxcount = maxcount;
+-				printf(".");
++				puts(".");
+ 				fflush(stdout);
+ 			}
+ 		} else {
+@@ -2411,9 +2411,10 @@ int get_gap_length(struct ir_remote *remote)
+ 
+ void fprint_copyright(FILE * fout)
+ {
+-	fprintf(fout, "\n"
++	fputs("\n"
+ 		"# Please take the time to finish this file as described in\n"
+ 		"# https://sourceforge.net/p/lirc-remotes/wiki/Checklist/\n"
+ 		"# and make it available to others by sending it to \n"
+-		"# <lirc@bartelmus.de>\n");
++		"# <lirc@bartelmus.de>\n",
++                fout);
+ }
+diff --git a/tools/irsend.c b/tools/irsend.c
+index 9a3fabc..16ee8d4 100644
+--- a/tools/irsend.c
++++ b/tools/irsend.c
+@@ -117,7 +117,7 @@ int main(int argc, char **argv)
+ 			break;
+ 		switch (c) {
+ 		case 'h':
+-			printf(help);
++			fputs(help, stdout);
+ 			return (EXIT_SUCCESS);
+ 		case 'v':
+ 			printf("%s %s\n", prog, VERSION);
+diff --git a/tools/irsimreceive.c b/tools/irsimreceive.c
+index 4a5a3b8..3c3d0bb 100644
+--- a/tools/irsimreceive.c
++++ b/tools/irsimreceive.c
+@@ -43,25 +43,25 @@ static void setup(const char* path)
+ 		exit(EXIT_FAILURE);
+ 	}
+ 	if (hw_choose_driver("file") == -1) {
+-		fprintf(stderr,
+-			"Cannot load file driver (bad plugin path?)\n");
++		fputs("Cannot load file driver (bad plugin path?)\n",
++                      stderr);
+ 		exit(EXIT_FAILURE);
+ 	}
+ 	r = curr_driver->open_func("dummy.out");
+ 	if (r == 0) {
+-		fprintf(stderr, "Cannot open driver\n");
++		fputs("Cannot open driver\n", stderr);
+ 		exit(EXIT_FAILURE);
+ 	}
+ 	r = curr_driver->init_func();
+ 	if (r == 0) {
+-		fprintf(stderr, "Cannot init driver\n");
++		fputs("Cannot init driver\n", stderr);
+ 		exit(EXIT_FAILURE);
+ 	}
+ 	strcpy(option.key, "set-infile");
+ 	strncpy(option.value, path, sizeof(option.value));
+ 	r = curr_driver->drvctl_func(DRVCTL_SET_OPTION, (void*) &option);
+ 	if (r != 0) {
+-		fprintf(stderr, "Cannot set driver infile.\n");
++		fputs("Cannot set driver infile.\n", stderr);
+ 		exit(EXIT_FAILURE);
+ 	}
+ }
+@@ -102,7 +102,7 @@ void printcode(char* s)
+ 	int len;
+ 
+ 	if (s == NULL) {
+-		printf( "None\n");
++		puts("None\n");
+ 	} else {
+ 		len = strlen(s);
+                 if (strlen(s) > 2 && s[len -1] == '\n') {
+@@ -140,23 +140,23 @@ int main(int argc, char *argv[])
+ 	       != EOF) {
+ 		switch (c) {
+ 		case 'h':
+-			printf(USAGE);
+-			return (EXIT_SUCCESS);
++			puts(USAGE);
++			return EXIT_SUCCESS;
+ 		case 'v':
+ 			printf("%s\n", "irw " VERSION);
+-			return (EXIT_SUCCESS);
++			return EXIT_SUCCESS;
+ 		case 'U':
+ 			options_set_opt("lircd:pluginpath", optarg);
+ 			break;
+ 		case '?':
+ 			fprintf(stderr, "unrecognized option: -%c\n", optopt);
+-			fprintf(stderr,
+-                                "Try `irsimsend -h' for more information.\n");
+-			return (EXIT_FAILURE);
++			fputs("Try `irsimsend -h' for more information.\n",
++                              stderr);
++			return EXIT_FAILURE;
+ 		}
+ 	}
+ 	if (argc != optind + 2) {
+-		fprintf(stderr, USAGE);
++		fputs(USAGE, stderr);
+ 		return EXIT_FAILURE;
+ 	}
+ 	lirc_log_get_clientlog("irsimreceive", path, sizeof(path));
+diff --git a/tools/irsimsend.c b/tools/irsimsend.c
+index b72831a..7572d84 100644
+--- a/tools/irsimsend.c
++++ b/tools/irsimsend.c
+@@ -65,8 +65,8 @@ static struct ir_remote* setup(const char* path)
+ 	FILE* f;
+ 
+ 	if (hw_choose_driver("file") == -1) {
+-		fprintf(stderr,
+-			"Cannot load file driver (bad plugin path?)\n");
++		fputs("Cannot load file driver (bad plugin path?)\n",
++                       stderr);
+ 		exit(EXIT_FAILURE);
+ 	}
+ 	unlink(OUTFILE);
+@@ -196,7 +196,7 @@ int parse_uint_arg(const char* optind, const char* errmsg)
+ 
+ 	c = strtol(optarg, NULL, 10);
+ 	if (c > INT_MAX || c < 0 || errno == EINVAL || errno == ERANGE) {
+-		fprintf(stderr, errmsg);
++		fputs(errmsg, stderr);
+ 		exit(EXIT_FAILURE);
+ 	}
+ 	return (int) c;
+@@ -213,7 +213,7 @@ int main(int argc, char *argv[])
+ 	       != EOF) {
+ 		switch (c) {
+ 		case 'h':
+-			printf(USAGE);
++			puts(USAGE);
+ 			return (EXIT_SUCCESS);
+ 		case 'c':
+ 			opt_count = parse_uint_arg(optarg,
+@@ -237,13 +237,13 @@ int main(int argc, char *argv[])
+ 			break;
+ 		case '?':
+ 			fprintf(stderr, "unrecognized option: -%c\n", optopt);
+-			fprintf(stderr,
+-                                "Try `irsimsend -h' for more information.\n");
++			fputs("Try `irsimsend -h' for more information.\n",
++                               stderr);
+ 			return (EXIT_FAILURE);
+ 		}
+ 	}
+ 	if (argc != optind + 1) {
+-		fprintf(stderr, USAGE);
++		fputs(USAGE, stderr);
+ 		return EXIT_FAILURE;
+ 	}
+ 	lirc_log_get_clientlog("irsimsend", path, sizeof(path));
+diff --git a/tools/irtestcase.c b/tools/irtestcase.c
+index 95d59b7..149c1ad 100644
+--- a/tools/irtestcase.c
++++ b/tools/irtestcase.c
+@@ -92,7 +92,7 @@ static void set_testinput(int fd, const char* path)
+ 	lirc_command_init(&command, "DRV_OPTION set-infile %s\n", path);
+ 	r = lirc_command_run(&command, fd);
+ 	if (r != 0) {
+-		fprintf(stderr, "Cannot set test input file\n");
++		fputs("Cannot set test input file\n", stderr);
+ 		exit(2);
+ 	}
+ }
+@@ -137,7 +137,7 @@ static int nextcode(int fd, char* buff, ssize_t size)
+ 		exit(errno);
+ 	};
+ 	if (strstr(buff, "__EOF") != NULL) {
+-		printf("Exit on EOF\n");
++		puts("Exit on EOF\n");
+ 		exit(0);
+ 	}
+ 	if (i >= 0) {
+@@ -176,16 +176,16 @@ static int irtestcase(int fd_io, int fd_cmd)
+ 
+ 	if (opt_lircrc != NULL) {
+ 		if (lirc_readconfig_only(opt_lircrc, &config, NULL) != 0) {
+-			fprintf(stderr, "Cannot initiate lircrc decoding\n");
++			fputs("Cannot initiate lircrc decoding\n", stderr);
+ 			exit(2);
+ 		}
+ 	}
+ 	while (nextcode(fd_io, code, sizeof(code)) == 1) {
+-		printf(code);
++		puts(code);
+ 		if (strstr(code, "__EOF") != NULL) {
+ 			exit(0);
+ 		}
+-		fprintf(code_log, code);
++		fputs(code, code_log);
+ 		if (opt_lircrc != NULL){
+ 			r = lirc_code2char(config, code, &c);
+ 			while (r == 0 && c != NULL) {
+@@ -222,36 +222,35 @@ int main(int argc, char *argv[])
+ 			opt_testdata = optarg;
+ 			break;
+ 		case 'h':
+-			printf(USAGE);
++			puts(USAGE);
+ 			return (EXIT_SUCCESS);
+ 		case 'v':
+ 			printf("%s\n", "irtestcase " VERSION);
+ 			return (EXIT_SUCCESS);
+ 		case '?':
+ 			fprintf(stderr, "unrecognized option: -%c\n", optopt);
+-			fprintf(stderr, "Try `irtestcase --help'.\n");
++			fputs("Try `irtestcase --help'.\n", stderr);
+ 			return (EXIT_FAILURE);
+ 		}
+ 	}
+ 	if (argc > optind + 1) {
+-		fprintf(stderr,
+-			"irtestcase: Too many arguments (max one).\n");
+-		fprintf(stderr, "Try `irtestcase --help'.\n");
++		fputs("irtestcase: Too many arguments (max one).\n", stderr);
++		fputs("Try `irtestcase --help'.\n", stderr);
+ 		return (EXIT_FAILURE);
+ 	}
+ 	if (strcmp(opt_prog, DEFAULT_PROG) != 0 && opt_lircrc == NULL) {
+-		fprintf(stderr, "--prog requires --lircrc/-l. Giving up.\n");
++		fputs("--prog requires --lircrc/-l. Giving up.\n", stderr);
+ 		return (EXIT_FAILURE);
+ 	}
+ 	if (opt_lircrc != NULL && strcmp(opt_prog, DEFAULT_PROG) == 0) {
+-		fprintf(stderr, "--lircrc requires --prog/-p. Giving up.\n");
++		fputs("--lircrc requires --prog/-p. Giving up.\n", stderr);
+ 		return (EXIT_FAILURE);
+ 	}
+ 
+ 	init_testdir();
+ 	fd_cmd = lirc_get_local_socket(NULL, 1);
+ 	if (fd_cmd < 0) {
+-		fprintf(stderr, "Cannot open lircd socket.\n");
++		fputs("Cannot open lircd socket.\n", stderr);
+ 		exit(3);
+ 	}
+ 	set_devicelog(fd_cmd, DEVICE_LOG);
+@@ -267,7 +266,7 @@ int main(int argc, char *argv[])
+ 	setenv("LIRC_SOCKET_PATH", socketpath, 0);
+ 	fd_io = lirc_init(opt_prog, 1);
+ 	if (fd_io < 0) {
+-		fprintf(stderr, "Cannot run lirc_init.\n");
++		fputs("Cannot run lirc_init.\n", stderr);
+ 		exit(3);
+ 	}
+ 
+diff --git a/tools/lirc-lsplugins.c b/tools/lirc-lsplugins.c
+index 9eceb3b..677cbb3 100644
+--- a/tools/lirc-lsplugins.c
++++ b/tools/lirc-lsplugins.c
+@@ -111,7 +111,7 @@ static void  lines_next(line_t* line)
+ {
+ 	lines[line_ix++] = line;
+ 	if (line_ix >= MAX_PLUGINS -1){
+-		fprintf(stderr, "Too many plugins, giving up. Sorry.");
++		fputs("Too many plugins, giving up. Sorry.", stderr);
+ 		exit(2);
+ 	}
+ }
+@@ -152,7 +152,7 @@ static void line_print(const line_t* line)
+ 	printf("%-20s%-6s%s\n",
+                line->name,  line->flags, line->path);
+ 	if (line->errors)
+-		printf(line->errors);
++		puts(line->errors);
+ }
+ 
+ static void print_folded_item(const char* arg)
+@@ -163,7 +163,7 @@ static void print_folded_item(const char* arg)
+ 	char* token;
+ 
+ 	if (arg == NULL) {
+-		printf("None\n");
++		puts("None\n");
+ 		return;
+ 	}
+ 	buff = alloca(strlen(arg) + 1);
+@@ -171,18 +171,18 @@ static void print_folded_item(const char* arg)
+ 	token = strtok(buff, " \t");
+ 	while (token != NULL) {
+ 		if (strlen(token) + pos > 80) {
+-			printf("\n\t\t");
++			puts("\n\t\t");
+ 			pos = 0;
+ 		}
+ 		if (pos != START_POS && pos != 0){
+-			printf(" ");
++			puts(" ");
+ 			pos += 1;
+ 		}
+-		printf(token);
++		puts(token);
+ 		pos += strlen(token);
+ 		token = strtok(NULL, " \t");
+ 	}
+-	printf("\n");
++	puts("\n");
+ }
+ 
+ 
+@@ -220,7 +220,7 @@ static void line_print_long(const line_t* line)
+ 	printf("Version:\t%s\n", line->version ? line->version : "(None)");
+ 	printf("Driver info:\t");
+ 	print_folded_item(line->info);
+-	printf("\n");
++	puts("\n");
+ }
+ 
+ 
+@@ -356,13 +356,13 @@ void lsplugins(const char* pluginpath, const char* which)
+ 		}
+ 	}
+ 	if (!opt_quiet) {
+-		printf("#\n#\n");
++		puts("#\n#\n");
+ 		if (!opt_long) {
+-			printf(LEGEND);
+-			printf("#\n");
++			puts(LEGEND);
++			puts("#\n");
+ 		}
+ 		if (opt_long)
+-			printf(LONG_LEGEND);
++			puts(LONG_LEGEND);
+ 		}
+ }
+ 
+@@ -383,10 +383,10 @@ int main(int argc, char** argv)
+ 				pluginpath = optarg;
+ 				break;
+ 			case 'h':
+-				printf(USAGE);
++				puts(USAGE);
+ 				exit(0);
+ 			case 'v':
+-				printf("Version: " VERSION "\n");
++				puts("Version: " VERSION "\n");
+ 				exit(0);
+ 			case 'p':
+ 				printf("Default path: %s\n", pluginpath);
+@@ -404,13 +404,13 @@ int main(int argc, char** argv)
+ 				opt_long = 1;
+ 				break;
+ 			default:
+-				fprintf(stderr, USAGE);
++				fputs(USAGE, stderr);
+ 				exit(1);
+ 		}
+ 	}
+         if (argc - optind  >  1) {
+-		fprintf(stderr, "Too many arguments.\n");
+-                fprintf(stderr, USAGE);
++		fputs("Too many arguments.\n", stderr);
++                fputs(USAGE, stderr);
+                 exit(2);
+         }
+ 	which = (argc - optind == 1 ?  argv[argc - 1] : "*");
+diff --git a/tools/lirc-lsremotes.c b/tools/lirc-lsremotes.c
+index 2ac7dad..11e806a 100644
+--- a/tools/lirc-lsremotes.c
++++ b/tools/lirc-lsremotes.c
+@@ -258,16 +258,16 @@ int main(int argc, char** argv)
+ 			opt_silent = 1;
+ 			break;
+ 		case 'h':
+-			printf(USAGE);
+-			return (EXIT_SUCCESS);
++			puts(USAGE);
++			return EXIT_SUCCESS;
+ 		case 'v':
+ 			printf("%s\n", "lirc-lsremotes " VERSION);
+-			return (EXIT_SUCCESS);
++			return EXIT_SUCCESS;
+ 		case '?':
+ 			fprintf(stderr, "unrecognized option: -%c\n", optopt);
+-			fprintf(stderr,
+-                                "Try `lirc-lsremotes -h' for more information.\n");
+-			return (EXIT_FAILURE);
++			fputs("Try `lirc-lsremotes -h' for more information.\n",
++                               stderr);
++			return EXIT_FAILURE;
+ 		}
+ 	}
+ 	if (argc == optind + 2) {
+@@ -277,7 +277,7 @@ int main(int argc, char** argv)
+ 		dirpath = argv[optind];
+ 		configs = "*";
+ 	} else {
+-		fprintf(stderr, USAGE);
++		fputs(USAGE, stderr);
+ 		return EXIT_FAILURE;
+ 	}
+ 	lirc_log_get_clientlog("lirc-lsremotes", path, sizeof(path));
+diff --git a/tools/mode2.c b/tools/mode2.c
+index 70c83f8..565cc2d 100644
+--- a/tools/mode2.c
++++ b/tools/mode2.c
+@@ -98,7 +98,7 @@ static void parse_options(int argc, char** argv)
+ 	{
+ 		switch (c) {
+ 		case 'h':
+-			printf(help);
++			puts(help);
+ 			exit(EXIT_SUCCESS);
+ 		case 'H':
+ 			strncpy(driver, optarg, sizeof(driver) - 1);
+@@ -194,11 +194,11 @@ int main(int argc, char **argv)
+ 			close(fd);
+ 			exit(EXIT_FAILURE);
+ 		} else if (ioctl(fd, LIRC_GET_REC_MODE, &mode) == -1) {
+-			printf("This program is only intended for receivers"
++			puts("This program is only intended for receivers"
+ 			       " supporting the pulse/space layer.\n");
+-			printf("Note that this is no error, but this program "
++			puts("Note that this is no error, but this program "
+ 			       "simply makes no sense for your\n" "receiver.\n");
+-			printf("In order to test your setup run lircd with "
++			puts("In order to test your setup run lircd with "
+ 			       "the --nodaemon option and \n then check if the"
+ 			       " remote works with the irw tool.\n");
+ 			close(fd);
+@@ -213,11 +213,11 @@ int main(int argc, char **argv)
+ 		mode = curr_driver->rec_mode;
+ 		if (mode != LIRC_MODE_MODE2) {
+ 			if (strcmp(curr_driver->name, "default") == 0) {
+-				printf("Please use the --raw option to access "
++				puts("Please use the --raw option to access "
+ 				       "the device directly instead through\n"
+ 				       "the abstraction layer.\n");
+ 			} else {
+-				printf("This program does not work for this"
++				puts("This program does not work for this"
+  				       " hardware yet\n");
+ 			}
+ 			exit(EXIT_FAILURE);
+@@ -256,15 +256,15 @@ int main(int argc, char **argv)
+ 						(void *)&data : buffer),
+ 				      count);
+ 			if (result != count) {
+-				fprintf(stderr, "read() failed\n");
++				fputs("read() failed\n", stderr);
+ 				break;
+ 			}
+ 		} else {
+ 			if (mode == LIRC_MODE_MODE2) {
+ 				data = curr_driver->readdata(0);
+ 				if (data == 0) {
+-					fprintf(stderr,
+-					        "readdata() failed\n");
++					fputs("readdata() failed\n",
++                                              stderr);
+ 					break;
+ 				}
+ 			} else {
+@@ -273,11 +273,11 @@ int main(int argc, char **argv)
+ 		}
+ 
+ 		if (mode != LIRC_MODE_MODE2) {
+-			printf("code: 0x");
++			puts("code: 0x");
+ 			for (i = 0; i < count; i++) {
+ 				printf("%02x", (unsigned char)buffer[i]);
+ 			}
+-			printf("\n");
++			puts("\n");
+ 			fflush(stdout);
+ 			continue;
+ 		}
+@@ -297,19 +297,19 @@ int main(int argc, char **argv)
+ 			if (data & PULSE_BIT) {
+ 				if ((bitno & 1) == 0) {
+ 					/* not in expected order */
+-					printf("-pulse");
++					puts("-pulse");
+ 				}
+ 			} else {
+ 				if (bitno & 1) {
+ 					/* not in expected order */
+-					printf("-space");
++					puts("-space");
+ 				}
+ 				if (((data & PULSE_MASK) > gap) || (bitno >= 6)) {
+ 					/* real long space or more
+ 					   than 6 codes, start new line */
+-					printf("\n");
++					puts("\n");
+ 					if ((data & PULSE_MASK) > gap)
+-						printf("\n");
++						puts("\n");
+ 					bitno = 0;
+ 				}
+ 			}
+@@ -317,7 +317,7 @@ int main(int argc, char **argv)
+ 		}
+ 		case 2:
+ 			if ((data & PULSE_MASK) > gap)
+-				printf("_\n\n_");
++				puts("_\n\n_");
+ 			else
+ 				printf("%.*s",
+ 				       ((data & PULSE_MASK) + t_div/2) / t_div,
+diff --git a/tools/xmode2.c b/tools/xmode2.c
+index 6a45d4c..9a4e0a1 100644
+--- a/tools/xmode2.c
++++ b/tools/xmode2.c
+@@ -139,12 +139,13 @@ static void parse_options(int argc, char** const argv)
+ 	add_defaults();
+ 	while ((c = getopt_long(argc, argv, "U:hvd:H:g:t:mr", options, NULL)) != -1) {
+ 		switch (c) {
+-		case 'h':printf(help);
++		case 'h':puts(help);
+ 			exit (EXIT_SUCCESS);
+ 		case 'H':
+ 			if (hw_choose_driver(optarg) != 0) {
+ 				fprintf(stderr, "Driver `%s' not found", optarg);
+-				fprintf(stderr, " (wrong or missing -U/--plugindir?)\n");
++				fputs(" (wrong or missing -U/--plugindir?)\n",
++                                       stderr);
+ 				hw_print_drivers(stderr);
+ 				exit(EXIT_FAILURE);
+ 			}
+@@ -186,7 +187,7 @@ void initscreen(char *geometry)
+ {
+ 	d1 = XOpenDisplay(0);
+ 	if (d1 == NULL) {
+-		printf("Can't open display.\n");
++		puts("Can't open display.\n");
+ 		exit(0);
+ 	}
+ 
+@@ -208,10 +209,10 @@ void initscreen(char *geometry)
+ 
+ 	cm1 = DefaultColormap(d1, 0);
+ 	if (!XAllocNamedColor(d1, cm1, "blue", &xc1, &xc2))
+-		printf("coudn't allocate blue color\n");
++		puts("couldn't allocate blue color\n");
+ 	f1_str = XLoadQueryFont(d1, font1_name);
+ 	if (f1_str == NULL) {
+-		printf("could't load font\n");
++		puts("could't load font\n");
+ 		exit(EXIT_FAILURE);
+ 	}
+ 
+@@ -266,10 +267,10 @@ int main(int argc, char **argv)
+ 			close(fd);
+ 			exit(EXIT_FAILURE);
+ 		} else if (ioctl(fd, LIRC_GET_REC_MODE, &mode) == -1) {
+-			printf("This program is only intended for receivers supporting the pulse/space layer.\n");
+-			printf("Note that this is no error, but this program "
++			puts("This program is only intended for receivers supporting the pulse/space layer.\n");
++			puts("Note that this is no error, but this program "
+ 			       "simply makes no sense for your\n" "receiver.\n");
+-			printf("In order to test your setup run lircd with "
++			puts("In order to test your setup run lircd with "
+ 			       "the --nodaemon option and \n" "then check if the remote works with the irw tool.\n");
+ 			close(fd);
+ 			exit(EXIT_FAILURE);
+@@ -277,7 +278,7 @@ int main(int argc, char **argv)
+ 	} else {
+ 		curr_driver->open_func(device);
+ 		if (curr_driver->init_func  && !curr_driver->init_func()) {
+-			fprintf(stderr, "Cannot initialize hardware");
++			fputs("Cannot initialize hardware", stderr);
+ 			exit(EXIT_FAILURE);
+ 		}
+ 
+@@ -285,10 +286,10 @@ int main(int argc, char **argv)
+ 		mode = curr_driver->rec_mode;
+ 		if (mode != LIRC_MODE_MODE2) {
+ 			if (strcmp(curr_driver->name, "default") == 0) {
+-				printf("Please use the --raw option to access "
++				puts("Please use the --raw option to access "
+ 				       "the device directly instead through\n" "the abstraction layer.\n");
+ 			} else {
+-				printf("This program does not work for this hardware yet\n");
++				puts("This program does not work for this hardware yet\n");
+ 			}
+ 			exit(EXIT_FAILURE);
+ 		}
+-- 
+2.1.0
+
diff --git a/0002-tools-Make-make_rel_symlink.py-use-python3.patch b/0002-tools-Make-make_rel_symlink.py-use-python3.patch
deleted file mode 100644
index 506baa9..0000000
--- a/0002-tools-Make-make_rel_symlink.py-use-python3.patch
+++ /dev/null
@@ -1,42 +0,0 @@
-From 1b347e9e7909afd08fce12992da67340144aeb70 Mon Sep 17 00:00:00 2001
-From: Alec Leamas <leamas.alec@gmail.com>
-Date: Thu, 11 Dec 2014 04:44:49 +0100
-Subject: [PATCH 1/5] tools: Make make_rel_symlink.py use python3.
-
----
- tools/make_rel_symlink.py | 8 ++++----
- 1 file changed, 4 insertions(+), 4 deletions(-)
-
-diff --git a/tools/make_rel_symlink.py b/tools/make_rel_symlink.py
-index 5c89305..896637f 100755
---- a/tools/make_rel_symlink.py
-+++ b/tools/make_rel_symlink.py
-@@ -1,4 +1,4 @@
--#!/usr/bin/env python
-+#!/usr/bin/env python3
- 
- import os
- import os.path
-@@ -32,16 +32,16 @@ if sys.argv[1] == "-p":
-     sys.argv = sys.argv[ 1:]
- 
- if len( sys.argv ) != 3:
--    print USAGE
-+    print(USAGE)
-     sys.exit( 1 )
- 
- if  os.path.isdir(  sys.argv[2] ):
--    print "Removing link target dir:" +  sys.argv[2]
-+    print("Removing link target dir:" +  sys.argv[2])
-     shutil.rmtree( sys.argv[2])
- 
- link_path = relative_ln_s( sys.argv[1], sys.argv[2] )
- if just_print:
--    print link_path
-+    print(link_path)
- else:
-     os.chdir( os.path.dirname( sys.argv[2]))
-     target = os.path.basename( sys.argv[2])
--- 
-1.9.3
-
diff --git a/0004-all-Sanitize-feature-tests-macros.patch b/0004-all-Sanitize-feature-tests-macros.patch
deleted file mode 100644
index 5e1376d..0000000
--- a/0004-all-Sanitize-feature-tests-macros.patch
+++ /dev/null
@@ -1,87 +0,0 @@
-From 18933e88521431abea8f0bf720cf35cc37d2def4 Mon Sep 17 00:00:00 2001
-From: Alec Leamas <leamas.alec@gmail.com>
-Date: Thu, 11 Dec 2014 11:03:12 +0100
-Subject: [PATCH 4/5] all: Sanitize feature tests macros.
-
----
- daemons/lircd.c         | 3 ---
- lib/lirc_client.c       | 6 +-----
- plugins/srm7500libusb.c | 1 +
- tools/lirc-lsplugins.c  | 0
- tools/lirc-lsremotes.c  | 4 ----
- 5 files changed, 2 insertions(+), 12 deletions(-)
-
-diff --git a/daemons/lircd.c b/daemons/lircd.c
-index ab44e80..d1bdc7c 100644
---- a/daemons/lircd.c
-+++ b/daemons/lircd.c
-@@ -31,9 +31,6 @@
- # include <config.h>
- #endif
- 
--#define _GNU_SOURCE
--#define _BSD_SOURCE
--
- #include <stdio.h>
- #include <stdlib.h>
- #include <stdarg.h>
-diff --git a/lib/lirc_client.c b/lib/lirc_client.c
-index 4720f3f..b161f0e 100644
---- a/lib/lirc_client.c
-+++ b/lib/lirc_client.c
-@@ -17,11 +17,6 @@
-  * @author  Christoph Bartelmus, Trent Piepho,  Michal Svec
-  */
- 
--// define _XOPEN_SOURCE for WEXITSTATUS
--#define _XOPEN_SOURCE
--// define _BSD_SOURCE for strdup()
--#define _BSD_SOURCE
--
- #ifdef HAVE_CONFIG_H
- # include <config.h>
- #endif
-@@ -34,6 +29,7 @@
- #include <stdlib.h>
- #include <stdarg.h>
- #include <string.h>
-+#include <strings.h>
- #include <sys/param.h>
- #include <sys/socket.h>
- #include <sys/stat.h>
-diff --git a/plugins/srm7500libusb.c b/plugins/srm7500libusb.c
-index f598f4d..06206bc 100644
---- a/plugins/srm7500libusb.c
-+++ b/plugins/srm7500libusb.c
-@@ -33,6 +33,7 @@
- #endif
- 
- #define _GNU_SOURCE
-+
- #include <errno.h>
- #include <signal.h>
- #include <string.h>
-diff --git a/tools/lirc-lsremotes.c b/tools/lirc-lsremotes.c
-index 11e806a..7c6ab06 100644
---- a/tools/lirc-lsremotes.c
-+++ b/tools/lirc-lsremotes.c
-@@ -7,16 +7,12 @@
-  *
-  */
- 
--#define _GNU_SOURCE
--
- #include <config.h>
- 
- #include <dirent.h>
- #include <getopt.h>
- #include <errno.h>
- #include <fnmatch.h>
--
--
- #include <glob.h>
- #include <libgen.h>
- #include <limits.h>
--- 
-1.9.3
-
diff --git a/0005-configure.ac-Use-pkg-config-to-locate-ftdi.patch b/0005-configure.ac-Use-pkg-config-to-locate-ftdi.patch
deleted file mode 100644
index f94dc91..0000000
--- a/0005-configure.ac-Use-pkg-config-to-locate-ftdi.patch
+++ /dev/null
@@ -1,53 +0,0 @@
-From 192e627fa81c3e8df086801dea228cb2fdcbb8bb Mon Sep 17 00:00:00 2001
-From: Alec Leamas <leamas.alec@gmail.com>
-Date: Thu, 11 Dec 2014 11:24:27 +0100
-Subject: [PATCH] configure.ac: Use pkg-config to locate ftdi.
-
-This picks up changed locations e. g., in fedora-22.
----
- configure.ac        | 13 ++++++++++---
- plugins/Makefile.am |  2 +-
- 2 files changed, 11 insertions(+), 4 deletions(-)
-
-diff --git a/configure.ac b/configure.ac
-index aaba636..b32b1e0 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -183,11 +183,18 @@ AC_CHECK_HEADER(usb.h,[
-   ],[
-   AM_CONDITIONAL([BUILD_USB],[false])]
- )
--AC_CHECK_HEADER(ftdi.h,[
-+PKG_CHECK_MODULES([FTDI],[libftdi],,[true])
-+test -z "$FTDI_LIBS" && PKG_CHECK_MODULES([FTDI], [libftdi1],,[true])
-+
-+if test -n "$FTDI_LIBS"; then
-+  CFLAGS="$CFLAGS $SYSTEMD_CFLAGS"
-+  LDFLAGS="$LDFLAGS $FTDI_LIBS"
-+  AC_DEFINE(HAVE_FTDI)
-   AM_CONDITIONAL([BUILD_FTDI],[true])
--  ],[
-+  AC_SUBST(FTDI_LIBS)
-+else
-   AM_CONDITIONAL([BUILD_FTDI],[false])]
--)
-+fi
- AC_CHECK_HEADER(iguanaIR.h,[
-   AM_CONDITIONAL([BUILD_IGUANAIR],[true])
-   ],[
-diff --git a/plugins/Makefile.am b/plugins/Makefile.am
-index 175b025..07cf187 100644
---- a/plugins/Makefile.am
-+++ b/plugins/Makefile.am
-@@ -47,7 +47,7 @@ endif
- if BUILD_FTDI
- plugin_LTLIBRARIES          += ftdi.la
- ftdi_la_SOURCES             = ftdi.c
--ftdi_la_LDFLAGS             = $(AM_LDFLAGS) -lftdi
-+ftdi_la_LDFLAGS             = $(AM_LDFLAGS) @FTDI_LIBS@
- endif
- 
- if BUILD_IGUANAIR
--- 
-1.9.3
-
diff --git a/0006-Add-Doxyfile-not-part-of-dist-tarball.patch b/0006-Add-Doxyfile-not-part-of-dist-tarball.patch
deleted file mode 100644
index 70ea4e7..0000000
--- a/0006-Add-Doxyfile-not-part-of-dist-tarball.patch
+++ /dev/null
@@ -1,1872 +0,0 @@
-From d887e05be6de2b1c625a67781ac4b298eca23169 Mon Sep 17 00:00:00 2001
-From: Alec Leamas <leamas.alec@gmail.com>
-Date: Thu, 11 Dec 2014 12:25:04 +0100
-Subject: [PATCH] Add Doxyfile, not part of dit tarball.
-
----
- doc/Doxyfile | 1853 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
- 1 file changed, 1853 insertions(+)
- create mode 100644 doc/Doxyfile
-
-diff --git a/doc/Doxyfile b/doc/Doxyfile
-new file mode 100644
-index 0000000..50b109a
---- /dev/null
-+++ b/doc/Doxyfile
-@@ -0,0 +1,1853 @@
-+# Doxyfile 1.8.3.1
-+
-+# This file describes the settings to be used by the documentation system
-+# doxygen (www.doxygen.org) for a project.
-+#
-+# All text after a hash (#) is considered a comment and will be ignored.
-+# The format is:
-+#       TAG = value [value, ...]
-+# For lists items can also be appended using:
-+#       TAG += value [value, ...]
-+# Values that contain spaces should be placed between quotes (" ").
-+
-+#---------------------------------------------------------------------------
-+# Project related configuration options
-+#---------------------------------------------------------------------------
-+
-+# This tag specifies the encoding used for all characters in the config file
-+# that follow. The default is UTF-8 which is also the encoding used for all
-+# text before the first occurrence of this tag. Doxygen uses libiconv (or the
-+# iconv built into libc) for the transcoding. See
-+# http://www.gnu.org/software/libiconv for the list of possible encodings.
-+
-+DOXYFILE_ENCODING      = UTF-8
-+
-+# The PROJECT_NAME tag is a single word (or sequence of words) that should
-+# identify the project. Note that if you do not use Doxywizard you need
-+# to put quotes around the project name if it contains spaces.
-+
-+PROJECT_NAME           = "LIRC libraries"
-+
-+# The PROJECT_NUMBER tag can be used to enter a project or revision number.
-+# This could be handy for archiving the generated documentation or
-+# if some version control system is used.
-+
-+PROJECT_NUMBER         =
-+
-+# Using the PROJECT_BRIEF tag one can provide an optional one line description
-+# for a project that appears at the top of each page and should give viewer
-+# a quick idea about the purpose of the project. Keep the description short.
-+
-+PROJECT_BRIEF          = Linux Infrared Remote Control
-+
-+# With the PROJECT_LOGO tag one can specify an logo or icon that is
-+# included in the documentation. The maximum height of the logo should not
-+# exceed 55 pixels and the maximum width should not exceed 200 pixels.
-+# Doxygen will copy the logo to the output directory.
-+
-+PROJECT_LOGO           =  ../doc/images/diode-2.gif
-+
-+# The OUTPUT_DIRECTORY tag is used to specify the (relative or absolute)
-+# base path where the generated documentation will be put.
-+# If a relative path is entered, it will be relative to the location
-+# where doxygen was started. If left blank the current directory will be used.
-+
-+OUTPUT_DIRECTORY       = api-docs
-+
-+# If the CREATE_SUBDIRS tag is set to YES, then doxygen will create
-+# 4096 sub-directories (in 2 levels) under the output directory of each output
-+# format and will distribute the generated files over these directories.
-+# Enabling this option can be useful when feeding doxygen a huge amount of
-+# source files, where putting all generated files in the same directory would
-+# otherwise cause performance problems for the file system.
-+
-+CREATE_SUBDIRS         = NO
-+
-+# The OUTPUT_LANGUAGE tag is used to specify the language in which all
-+# documentation generated by doxygen is written. Doxygen will use this
-+# information to generate all constant output in the proper language.
-+# The default language is English, other supported languages are:
-+# Afrikaans, Arabic, Brazilian, Catalan, Chinese, Chinese-Traditional,
-+# Croatian, Czech, Danish, Dutch, Esperanto, Farsi, Finnish, French, German,
-+# Greek, Hungarian, Italian, Japanese, Japanese-en (Japanese with English
-+# messages), Korean, Korean-en, Lithuanian, Norwegian, Macedonian, Persian,
-+# Polish, Portuguese, Romanian, Russian, Serbian, Serbian-Cyrillic, Slovak,
-+# Slovene, Spanish, Swedish, Ukrainian, and Vietnamese.
-+
-+OUTPUT_LANGUAGE        = English
-+
-+# If the BRIEF_MEMBER_DESC tag is set to YES (the default) Doxygen will
-+# include brief member descriptions after the members that are listed in
-+# the file and class documentation (similar to JavaDoc).
-+# Set to NO to disable this.
-+
-+BRIEF_MEMBER_DESC      = YES
-+
-+# If the REPEAT_BRIEF tag is set to YES (the default) Doxygen will prepend
-+# the brief description of a member or function before the detailed description.
-+# Note: if both HIDE_UNDOC_MEMBERS and BRIEF_MEMBER_DESC are set to NO, the
-+# brief descriptions will be completely suppressed.
-+
-+REPEAT_BRIEF           = YES
-+
-+# This tag implements a quasi-intelligent brief description abbreviator
-+# that is used to form the text in various listings. Each string
-+# in this list, if found as the leading text of the brief description, will be
-+# stripped from the text and the result after processing the whole list, is
-+# used as the annotated text. Otherwise, the brief description is used as-is.
-+# If left blank, the following values are used ("$name" is automatically
-+# replaced with the name of the entity): "The $name class" "The $name widget"
-+# "The $name file" "is" "provides" "specifies" "contains"
-+# "represents" "a" "an" "the"
-+
-+ABBREVIATE_BRIEF       =
-+
-+# If the ALWAYS_DETAILED_SEC and REPEAT_BRIEF tags are both set to YES then
-+# Doxygen will generate a detailed section even if there is only a brief
-+# description.
-+
-+ALWAYS_DETAILED_SEC    = NO
-+
-+# If the INLINE_INHERITED_MEMB tag is set to YES, doxygen will show all
-+# inherited members of a class in the documentation of that class as if those
-+# members were ordinary class members. Constructors, destructors and assignment
-+# operators of the base classes will not be shown.
-+
-+INLINE_INHERITED_MEMB  = NO
-+
-+# If the FULL_PATH_NAMES tag is set to YES then Doxygen will prepend the full
-+# path before files name in the file list and in the header files. If set
-+# to NO the shortest path that makes the file name unique will be used.
-+
-+FULL_PATH_NAMES        = YES
-+
-+# If the FULL_PATH_NAMES tag is set to YES then the STRIP_FROM_PATH tag
-+# can be used to strip a user-defined part of the path. Stripping is
-+# only done if one of the specified strings matches the left-hand part of
-+# the path. The tag can be used to show relative paths in the file list.
-+# If left blank the directory from which doxygen is run is used as the
-+# path to strip. Note that you specify absolute paths here, but also
-+# relative paths, which will be relative from the directory where doxygen is
-+# started.
-+
-+STRIP_FROM_PATH        =
-+
-+# The STRIP_FROM_INC_PATH tag can be used to strip a user-defined part of
-+# the path mentioned in the documentation of a class, which tells
-+# the reader which header file to include in order to use a class.
-+# If left blank only the name of the header file containing the class
-+# definition is used. Otherwise one should specify the include paths that
-+# are normally passed to the compiler using the -I flag.
-+
-+STRIP_FROM_INC_PATH    =
-+
-+# If the SHORT_NAMES tag is set to YES, doxygen will generate much shorter
-+# (but less readable) file names. This can be useful if your file system
-+# doesn't support long names like on DOS, Mac, or CD-ROM.
-+
-+SHORT_NAMES            = NO
-+
-+# If the JAVADOC_AUTOBRIEF tag is set to YES then Doxygen
-+# will interpret the first line (until the first dot) of a JavaDoc-style
-+# comment as the brief description. If set to NO, the JavaDoc
-+# comments will behave just like regular Qt-style comments
-+# (thus requiring an explicit @brief command for a brief description.)
-+
-+JAVADOC_AUTOBRIEF      = NO
-+
-+# If the QT_AUTOBRIEF tag is set to YES then Doxygen will
-+# interpret the first line (until the first dot) of a Qt-style
-+# comment as the brief description. If set to NO, the comments
-+# will behave just like regular Qt-style comments (thus requiring
-+# an explicit \brief command for a brief description.)
-+
-+QT_AUTOBRIEF           = NO
-+
-+# The MULTILINE_CPP_IS_BRIEF tag can be set to YES to make Doxygen
-+# treat a multi-line C++ special comment block (i.e. a block of //! or ///
-+# comments) as a brief description. This used to be the default behaviour.
-+# The new default is to treat a multi-line C++ comment block as a detailed
-+# description. Set this tag to YES if you prefer the old behaviour instead.
-+
-+MULTILINE_CPP_IS_BRIEF = NO
-+
-+# If the INHERIT_DOCS tag is set to YES (the default) then an undocumented
-+# member inherits the documentation from any documented member that it
-+# re-implements.
-+
-+INHERIT_DOCS           = YES
-+
-+# If the SEPARATE_MEMBER_PAGES tag is set to YES, then doxygen will produce
-+# a new page for each member. If set to NO, the documentation of a member will
-+# be part of the file/class/namespace that contains it.
-+
-+SEPARATE_MEMBER_PAGES  = NO
-+
-+# The TAB_SIZE tag can be used to set the number of spaces in a tab.
-+# Doxygen uses this value to replace tabs by spaces in code fragments.
-+
-+TAB_SIZE               = 8
-+
-+# This tag can be used to specify a number of aliases that acts
-+# as commands in the documentation. An alias has the form "name=value".
-+# For example adding "sideeffect=\par Side Effects:\n" will allow you to
-+# put the command \sideeffect (or @sideeffect) in the documentation, which
-+# will result in a user-defined paragraph with heading "Side Effects:".
-+# You can put \n's in the value part of an alias to insert newlines.
-+
-+ALIASES                =
-+
-+# This tag can be used to specify a number of word-keyword mappings (TCL only).
-+# A mapping has the form "name=value". For example adding
-+# "class=itcl::class" will allow you to use the command class in the
-+# itcl::class meaning.
-+
-+TCL_SUBST              =
-+
-+# Set the OPTIMIZE_OUTPUT_FOR_C tag to YES if your project consists of C
-+# sources only. Doxygen will then generate output that is more tailored for C.
-+# For instance, some of the names that are used will be different. The list
-+# of all members will be omitted, etc.
-+
-+OPTIMIZE_OUTPUT_FOR_C  = YES
-+
-+# Set the OPTIMIZE_OUTPUT_JAVA tag to YES if your project consists of Java
-+# sources only. Doxygen will then generate output that is more tailored for
-+# Java. For instance, namespaces will be presented as packages, qualified
-+# scopes will look different, etc.
-+
-+OPTIMIZE_OUTPUT_JAVA   = NO
-+
-+# Set the OPTIMIZE_FOR_FORTRAN tag to YES if your project consists of Fortran
-+# sources only. Doxygen will then generate output that is more tailored for
-+# Fortran.
-+
-+OPTIMIZE_FOR_FORTRAN   = NO
-+
-+# Set the OPTIMIZE_OUTPUT_VHDL tag to YES if your project consists of VHDL
-+# sources. Doxygen will then generate output that is tailored for
-+# VHDL.
-+
-+OPTIMIZE_OUTPUT_VHDL   = NO
-+
-+# Doxygen selects the parser to use depending on the extension of the files it
-+# parses. With this tag you can assign which parser to use for a given
-+# extension. Doxygen has a built-in mapping, but you can override or extend it
-+# using this tag. The format is ext=language, where ext is a file extension,
-+# and language is one of the parsers supported by doxygen: IDL, Java,
-+# Javascript, CSharp, C, C++, D, PHP, Objective-C, Python, Fortran, VHDL, C,
-+# C++. For instance to make doxygen treat .inc files as Fortran files (default
-+# is PHP), and .f files as C (default is Fortran), use: inc=Fortran f=C. Note
-+# that for custom extensions you also need to set FILE_PATTERNS otherwise the
-+# files are not read by doxygen.
-+
-+EXTENSION_MAPPING      =
-+
-+# If MARKDOWN_SUPPORT is enabled (the default) then doxygen pre-processes all
-+# comments according to the Markdown format, which allows for more readable
-+# documentation. See http://daringfireball.net/projects/markdown/ for details.
-+# The output of markdown processing is further processed by doxygen, so you
-+# can mix doxygen, HTML, and XML commands with Markdown formatting.
-+# Disable only in case of backward compatibilities issues.
-+
-+MARKDOWN_SUPPORT       = YES
-+
-+# When enabled doxygen tries to link words that correspond to documented classes,
-+# or namespaces to their corresponding documentation. Such a link can be
-+# prevented in individual cases by by putting a % sign in front of the word or
-+# globally by setting AUTOLINK_SUPPORT to NO.
-+
-+AUTOLINK_SUPPORT       = YES
-+
-+# If you use STL classes (i.e. std::string, std::vector, etc.) but do not want
-+# to include (a tag file for) the STL sources as input, then you should
-+# set this tag to YES in order to let doxygen match functions declarations and
-+# definitions whose arguments contain STL classes (e.g. func(std::string); v.s.
-+# func(std::string) {}). This also makes the inheritance and collaboration
-+# diagrams that involve STL classes more complete and accurate.
-+
-+BUILTIN_STL_SUPPORT    = NO
-+
-+# If you use Microsoft's C++/CLI language, you should set this option to YES to
-+# enable parsing support.
-+
-+CPP_CLI_SUPPORT        = NO
-+
-+# Set the SIP_SUPPORT tag to YES if your project consists of sip sources only.
-+# Doxygen will parse them like normal C++ but will assume all classes use public
-+# instead of private inheritance when no explicit protection keyword is present.
-+
-+SIP_SUPPORT            = NO
-+
-+# For Microsoft's IDL there are propget and propput attributes to indicate
-+# getter and setter methods for a property. Setting this option to YES (the
-+# default) will make doxygen replace the get and set methods by a property in
-+# the documentation. This will only work if the methods are indeed getting or
-+# setting a simple type. If this is not the case, or you want to show the
-+# methods anyway, you should set this option to NO.
-+
-+IDL_PROPERTY_SUPPORT   = NO
-+
-+# If member grouping is used in the documentation and the DISTRIBUTE_GROUP_DOC
-+# tag is set to YES, then doxygen will reuse the documentation of the first
-+# member in the group (if any) for the other members of the group. By default
-+# all members of a group must be documented explicitly.
-+
-+DISTRIBUTE_GROUP_DOC   = NO
-+
-+# Set the SUBGROUPING tag to YES (the default) to allow class member groups of
-+# the same type (for instance a group of public functions) to be put as a
-+# subgroup of that type (e.g. under the Public Functions section). Set it to
-+# NO to prevent subgrouping. Alternatively, this can be done per class using
-+# the \nosubgrouping command.
-+
-+SUBGROUPING            = YES
-+
-+# When the INLINE_GROUPED_CLASSES tag is set to YES, classes, structs and
-+# unions are shown inside the group in which they are included (e.g. using
-+# @ingroup) instead of on a separate page (for HTML and Man pages) or
-+# section (for LaTeX and RTF).
-+
-+INLINE_GROUPED_CLASSES = NO
-+
-+# When the INLINE_SIMPLE_STRUCTS tag is set to YES, structs, classes, and
-+# unions with only public data fields will be shown inline in the documentation
-+# of the scope in which they are defined (i.e. file, namespace, or group
-+# documentation), provided this scope is documented. If set to NO (the default),
-+# structs, classes, and unions are shown on a separate page (for HTML and Man
-+# pages) or section (for LaTeX and RTF).
-+
-+INLINE_SIMPLE_STRUCTS  = NO
-+
-+# When TYPEDEF_HIDES_STRUCT is enabled, a typedef of a struct, union, or enum
-+# is documented as struct, union, or enum with the name of the typedef. So
-+# typedef struct TypeS {} TypeT, will appear in the documentation as a struct
-+# with name TypeT. When disabled the typedef will appear as a member of a file,
-+# namespace, or class. And the struct will be named TypeS. This can typically
-+# be useful for C code in case the coding convention dictates that all compound
-+# types are typedef'ed and only the typedef is referenced, never the tag name.
-+
-+TYPEDEF_HIDES_STRUCT   = NO
-+
-+# Similar to the SYMBOL_CACHE_SIZE the size of the symbol lookup cache can be
-+# set using LOOKUP_CACHE_SIZE. This cache is used to resolve symbols given
-+# their name and scope. Since this can be an expensive process and often the
-+# same symbol appear multiple times in the code, doxygen keeps a cache of
-+# pre-resolved symbols. If the cache is too small doxygen will become slower.
-+# If the cache is too large, memory is wasted. The cache size is given by this
-+# formula: 2^(16+LOOKUP_CACHE_SIZE). The valid range is 0..9, the default is 0,
-+# corresponding to a cache size of 2^16 = 65536 symbols.
-+
-+LOOKUP_CACHE_SIZE      = 0
-+
-+#---------------------------------------------------------------------------
-+# Build related configuration options
-+#---------------------------------------------------------------------------
-+
-+# If the EXTRACT_ALL tag is set to YES doxygen will assume all entities in
-+# documentation are documented, even if no documentation was available.
-+# Private class members and static file members will be hidden unless
-+# the EXTRACT_PRIVATE and EXTRACT_STATIC tags are set to YES
-+
-+EXTRACT_ALL            = NO
-+
-+# If the EXTRACT_PRIVATE tag is set to YES all private members of a class
-+# will be included in the documentation.
-+
-+EXTRACT_PRIVATE        = NO
-+
-+# If the EXTRACT_PACKAGE tag is set to YES all members with package or internal
-+# scope will be included in the documentation.
-+
-+EXTRACT_PACKAGE        = NO
-+
-+# If the EXTRACT_STATIC tag is set to YES all static members of a file
-+# will be included in the documentation.
-+
-+EXTRACT_STATIC         = NO
-+
-+# If the EXTRACT_LOCAL_CLASSES tag is set to YES classes (and structs)
-+# defined locally in source files will be included in the documentation.
-+# If set to NO only classes defined in header files are included.
-+
-+EXTRACT_LOCAL_CLASSES  = NO
-+
-+# This flag is only useful for Objective-C code. When set to YES local
-+# methods, which are defined in the implementation section but not in
-+# the interface are included in the documentation.
-+# If set to NO (the default) only methods in the interface are included.
-+
-+EXTRACT_LOCAL_METHODS  = NO
-+
-+# If this flag is set to YES, the members of anonymous namespaces will be
-+# extracted and appear in the documentation as a namespace called
-+# 'anonymous_namespace{file}', where file will be replaced with the base
-+# name of the file that contains the anonymous namespace. By default
-+# anonymous namespaces are hidden.
-+
-+EXTRACT_ANON_NSPACES   = NO
-+
-+# If the HIDE_UNDOC_MEMBERS tag is set to YES, Doxygen will hide all
-+# undocumented members of documented classes, files or namespaces.
-+# If set to NO (the default) these members will be included in the
-+# various overviews, but no documentation section is generated.
-+# This option has no effect if EXTRACT_ALL is enabled.
-+
-+HIDE_UNDOC_MEMBERS     = NO
-+
-+# If the HIDE_UNDOC_CLASSES tag is set to YES, Doxygen will hide all
-+# undocumented classes that are normally visible in the class hierarchy.
-+# If set to NO (the default) these classes will be included in the various
-+# overviews. This option has no effect if EXTRACT_ALL is enabled.
-+
-+HIDE_UNDOC_CLASSES     = NO
-+
-+# If the HIDE_FRIEND_COMPOUNDS tag is set to YES, Doxygen will hide all
-+# friend (class|struct|union) declarations.
-+# If set to NO (the default) these declarations will be included in the
-+# documentation.
-+
-+HIDE_FRIEND_COMPOUNDS  = NO
-+
-+# If the HIDE_IN_BODY_DOCS tag is set to YES, Doxygen will hide any
-+# documentation blocks found inside the body of a function.
-+# If set to NO (the default) these blocks will be appended to the
-+# function's detailed documentation block.
-+
-+HIDE_IN_BODY_DOCS      = NO
-+
-+# The INTERNAL_DOCS tag determines if documentation
-+# that is typed after a \internal command is included. If the tag is set
-+# to NO (the default) then the documentation will be excluded.
-+# Set it to YES to include the internal documentation.
-+
-+INTERNAL_DOCS          = NO
-+
-+# If the CASE_SENSE_NAMES tag is set to NO then Doxygen will only generate
-+# file names in lower-case letters. If set to YES upper-case letters are also
-+# allowed. This is useful if you have classes or files whose names only differ
-+# in case and if your file system supports case sensitive file names. Windows
-+# and Mac users are advised to set this option to NO.
-+
-+CASE_SENSE_NAMES       = YES
-+
-+# If the HIDE_SCOPE_NAMES tag is set to NO (the default) then Doxygen
-+# will show members with their full class and namespace scopes in the
-+# documentation. If set to YES the scope will be hidden.
-+
-+HIDE_SCOPE_NAMES       = NO
-+
-+# If the SHOW_INCLUDE_FILES tag is set to YES (the default) then Doxygen
-+# will put a list of the files that are included by a file in the documentation
-+# of that file.
-+
-+SHOW_INCLUDE_FILES     = YES
-+
-+# If the FORCE_LOCAL_INCLUDES tag is set to YES then Doxygen
-+# will list include files with double quotes in the documentation
-+# rather than with sharp brackets.
-+
-+FORCE_LOCAL_INCLUDES   = NO
-+
-+# If the INLINE_INFO tag is set to YES (the default) then a tag [inline]
-+# is inserted in the documentation for inline members.
-+
-+INLINE_INFO            = YES
-+
-+# If the SORT_MEMBER_DOCS tag is set to YES (the default) then doxygen
-+# will sort the (detailed) documentation of file and class members
-+# alphabetically by member name. If set to NO the members will appear in
-+# declaration order.
-+
-+SORT_MEMBER_DOCS       = YES
-+
-+# If the SORT_BRIEF_DOCS tag is set to YES then doxygen will sort the
-+# brief documentation of file, namespace and class members alphabetically
-+# by member name. If set to NO (the default) the members will appear in
-+# declaration order.
-+
-+SORT_BRIEF_DOCS        = NO
-+
-+# If the SORT_MEMBERS_CTORS_1ST tag is set to YES then doxygen
-+# will sort the (brief and detailed) documentation of class members so that
-+# constructors and destructors are listed first. If set to NO (the default)
-+# the constructors will appear in the respective orders defined by
-+# SORT_MEMBER_DOCS and SORT_BRIEF_DOCS.
-+# This tag will be ignored for brief docs if SORT_BRIEF_DOCS is set to NO
-+# and ignored for detailed docs if SORT_MEMBER_DOCS is set to NO.
-+
-+SORT_MEMBERS_CTORS_1ST = NO
-+
-+# If the SORT_GROUP_NAMES tag is set to YES then doxygen will sort the
-+# hierarchy of group names into alphabetical order. If set to NO (the default)
-+# the group names will appear in their defined order.
-+
-+SORT_GROUP_NAMES       = NO
-+
-+# If the SORT_BY_SCOPE_NAME tag is set to YES, the class list will be
-+# sorted by fully-qualified names, including namespaces. If set to
-+# NO (the default), the class list will be sorted only by class name,
-+# not including the namespace part.
-+# Note: This option is not very useful if HIDE_SCOPE_NAMES is set to YES.
-+# Note: This option applies only to the class list, not to the
-+# alphabetical list.
-+
-+SORT_BY_SCOPE_NAME     = NO
-+
-+# If the STRICT_PROTO_MATCHING option is enabled and doxygen fails to
-+# do proper type resolution of all parameters of a function it will reject a
-+# match between the prototype and the implementation of a member function even
-+# if there is only one candidate or it is obvious which candidate to choose
-+# by doing a simple string match. By disabling STRICT_PROTO_MATCHING doxygen
-+# will still accept a match between prototype and implementation in such cases.
-+
-+STRICT_PROTO_MATCHING  = NO
-+
-+# The GENERATE_TODOLIST tag can be used to enable (YES) or
-+# disable (NO) the todo list. This list is created by putting \todo
-+# commands in the documentation.
-+
-+GENERATE_TODOLIST      = YES
-+
-+# The GENERATE_TESTLIST tag can be used to enable (YES) or
-+# disable (NO) the test list. This list is created by putting \test
-+# commands in the documentation.
-+
-+GENERATE_TESTLIST      = YES
-+
-+# The GENERATE_BUGLIST tag can be used to enable (YES) or
-+# disable (NO) the bug list. This list is created by putting \bug
-+# commands in the documentation.
-+
-+GENERATE_BUGLIST       = YES
-+
-+# The GENERATE_DEPRECATEDLIST tag can be used to enable (YES) or
-+# disable (NO) the deprecated list. This list is created by putting
-+# \deprecated commands in the documentation.
-+
-+GENERATE_DEPRECATEDLIST= YES
-+
-+# The ENABLED_SECTIONS tag can be used to enable conditional
-+# documentation sections, marked by \if section-label ... \endif
-+# and \cond section-label ... \endcond blocks.
-+
-+ENABLED_SECTIONS       =
-+
-+# The MAX_INITIALIZER_LINES tag determines the maximum number of lines
-+# the initial value of a variable or macro consists of for it to appear in
-+# the documentation. If the initializer consists of more lines than specified
-+# here it will be hidden. Use a value of 0 to hide initializers completely.
-+# The appearance of the initializer of individual variables and macros in the
-+# documentation can be controlled using \showinitializer or \hideinitializer
-+# command in the documentation regardless of this setting.
-+
-+MAX_INITIALIZER_LINES  = 30
-+
-+# Set the SHOW_USED_FILES tag to NO to disable the list of files generated
-+# at the bottom of the documentation of classes and structs. If set to YES the
-+# list will mention the files that were used to generate the documentation.
-+
-+SHOW_USED_FILES        = YES
-+
-+# Set the SHOW_FILES tag to NO to disable the generation of the Files page.
-+# This will remove the Files entry from the Quick Index and from the
-+# Folder Tree View (if specified). The default is YES.
-+
-+SHOW_FILES             = YES
-+
-+# Set the SHOW_NAMESPACES tag to NO to disable the generation of the
-+# Namespaces page.
-+# This will remove the Namespaces entry from the Quick Index
-+# and from the Folder Tree View (if specified). The default is YES.
-+
-+SHOW_NAMESPACES        = YES
-+
-+# The FILE_VERSION_FILTER tag can be used to specify a program or script that
-+# doxygen should invoke to get the current version for each file (typically from
-+# the version control system). Doxygen will invoke the program by executing (via
-+# popen()) the command <command> <input-file>, where <command> is the value of
-+# the FILE_VERSION_FILTER tag, and <input-file> is the name of an input file
-+# provided by doxygen. Whatever the program writes to standard output
-+# is used as the file version. See the manual for examples.
-+
-+FILE_VERSION_FILTER    = "git log -1 --pretty=format:'%h %ci'"
-+
-+# The LAYOUT_FILE tag can be used to specify a layout file which will be parsed
-+# by doxygen. The layout file controls the global structure of the generated
-+# output files in an output format independent way. To create the layout file
-+# that represents doxygen's defaults, run doxygen with the -l option.
-+# You can optionally specify a file name after the option, if omitted
-+# DoxygenLayout.xml will be used as the name of the layout file.
-+
-+LAYOUT_FILE            =
-+
-+# The CITE_BIB_FILES tag can be used to specify one or more bib files
-+# containing the references data. This must be a list of .bib files. The
-+# .bib extension is automatically appended if omitted. Using this command
-+# requires the bibtex tool to be installed. See also
-+# http://en.wikipedia.org/wiki/BibTeX for more info. For LaTeX the style
-+# of the bibliography can be controlled using LATEX_BIB_STYLE. To use this
-+# feature you need bibtex and perl available in the search path. Do not use
-+# file names with spaces, bibtex cannot handle them.
-+
-+CITE_BIB_FILES         =
-+
-+#---------------------------------------------------------------------------
-+# configuration options related to warning and progress messages
-+#---------------------------------------------------------------------------
-+
-+# The QUIET tag can be used to turn on/off the messages that are generated
-+# by doxygen. Possible values are YES and NO. If left blank NO is used.
-+
-+QUIET                  = NO
-+
-+# The WARNINGS tag can be used to turn on/off the warning messages that are
-+# generated by doxygen. Possible values are YES and NO. If left blank
-+# NO is used.
-+
-+WARNINGS               = YES
-+
-+# If WARN_IF_UNDOCUMENTED is set to YES, then doxygen will generate warnings
-+# for undocumented members. If EXTRACT_ALL is set to YES then this flag will
-+# automatically be disabled.
-+
-+WARN_IF_UNDOCUMENTED   = YES
-+
-+# If WARN_IF_DOC_ERROR is set to YES, doxygen will generate warnings for
-+# potential errors in the documentation, such as not documenting some
-+# parameters in a documented function, or documenting parameters that
-+# don't exist or using markup commands wrongly.
-+
-+WARN_IF_DOC_ERROR      = YES
-+
-+# The WARN_NO_PARAMDOC option can be enabled to get warnings for
-+# functions that are documented, but have no documentation for their parameters
-+# or return value. If set to NO (the default) doxygen will only warn about
-+# wrong or incomplete parameter documentation, but not about the absence of
-+# documentation.
-+
-+WARN_NO_PARAMDOC       = NO
-+
-+# The WARN_FORMAT tag determines the format of the warning messages that
-+# doxygen can produce. The string should contain the $file, $line, and $text
-+# tags, which will be replaced by the file and line number from which the
-+# warning originated and the warning text. Optionally the format may contain
-+# $version, which will be replaced by the version of the file (if it could
-+# be obtained via FILE_VERSION_FILTER)
-+
-+WARN_FORMAT            = "$file:$line: $text"
-+
-+# The WARN_LOGFILE tag can be used to specify a file to which warning
-+# and error messages should be written. If left blank the output is written
-+# to stderr.
-+
-+WARN_LOGFILE           = doxygen.warnings
-+
-+#---------------------------------------------------------------------------
-+# configuration options related to the input files
-+#---------------------------------------------------------------------------
-+
-+# The INPUT tag can be used to specify the files and/or directories that contain
-+# documented source files. You may enter file names like "myfile.cpp" or
-+# directories like "/usr/src/myproject". Separate the files or directories
-+# with spaces.
-+
-+INPUT                  = ../lib
-+
-+# This tag can be used to specify the character encoding of the source files
-+# that doxygen parses. Internally doxygen uses the UTF-8 encoding, which is
-+# also the default input encoding. Doxygen uses libiconv (or the iconv built
-+# into libc) for the transcoding. See http://www.gnu.org/software/libiconv for
-+# the list of possible encodings.
-+
-+INPUT_ENCODING         = UTF-8
-+
-+# If the value of the INPUT tag contains directories, you can use the
-+# FILE_PATTERNS tag to specify one or more wildcard pattern (like *.cpp
-+# and *.h) to filter out the source-files in the directories. If left
-+# blank the following patterns are tested:
-+# *.c *.cc *.cxx *.cpp *.c++ *.d *.java *.ii *.ixx *.ipp *.i++ *.inl *.h *.hh
-+# *.hxx *.hpp *.h++ *.idl *.odl *.cs *.php *.php3 *.inc *.m *.mm *.dox *.py
-+# *.f90 *.f *.for *.vhd *.vhdl
-+
-+FILE_PATTERNS          =
-+
-+# The RECURSIVE tag can be used to turn specify whether or not subdirectories
-+# should be searched for input files as well. Possible values are YES and NO.
-+# If left blank NO is used.
-+
-+RECURSIVE              = NO
-+
-+# The EXCLUDE tag can be used to specify files and/or directories that should be
-+# excluded from the INPUT source files. This way you can easily exclude a
-+# subdirectory from a directory tree whose root is specified with the INPUT tag.
-+# Note that relative paths are relative to the directory from which doxygen is
-+# run.
-+
-+EXCLUDE                =  ciniparser.h dictionary.h ciniparser.c dictionary.c
-+
-+# The EXCLUDE_SYMLINKS tag can be used to select whether or not files or
-+# directories that are symbolic links (a Unix file system feature) are excluded
-+# from the input.
-+
-+EXCLUDE_SYMLINKS       = NO
-+
-+# If the value of the INPUT tag contains directories, you can use the
-+# EXCLUDE_PATTERNS tag to specify one or more wildcard patterns to exclude
-+# certain files from those directories. Note that the wildcards are matched
-+# against the file with absolute path, so to exclude all test directories
-+# for example use the pattern */test/*
-+
-+EXCLUDE_PATTERNS       =
-+
-+# The EXCLUDE_SYMBOLS tag can be used to specify one or more symbol names
-+# (namespaces, classes, functions, etc.) that should be excluded from the
-+# output. The symbol name can be a fully qualified name, a word, or if the
-+# wildcard * is used, a substring. Examples: ANamespace, AClass,
-+# AClass::ANamespace, ANamespace::*Test
-+
-+EXCLUDE_SYMBOLS        =
-+
-+# The EXAMPLE_PATH tag can be used to specify one or more files or
-+# directories that contain example code fragments that are included (see
-+# the \include command).
-+
-+EXAMPLE_PATH           = ../tools ../drivers/default
-+
-+# If the value of the EXAMPLE_PATH tag contains directories, you can use the
-+# EXAMPLE_PATTERNS tag to specify one or more wildcard pattern (like *.cpp
-+# and *.h) to filter out the source-files in the directories. If left
-+# blank all files are included.
-+
-+EXAMPLE_PATTERNS       =
-+
-+# If the EXAMPLE_RECURSIVE tag is set to YES then subdirectories will be
-+# searched for input files to be used with the \include or \dontinclude
-+# commands irrespective of the value of the RECURSIVE tag.
-+# Possible values are YES and NO. If left blank NO is used.
-+
-+EXAMPLE_RECURSIVE      = NO
-+
-+# The IMAGE_PATH tag can be used to specify one or more files or
-+# directories that contain image that are included in the documentation (see
-+# the \image command).
-+
-+IMAGE_PATH             =
-+
-+# The INPUT_FILTER tag can be used to specify a program that doxygen should
-+# invoke to filter for each input file. Doxygen will invoke the filter program
-+# by executing (via popen()) the command <filter> <input-file>, where <filter>
-+# is the value of the INPUT_FILTER tag, and <input-file> is the name of an
-+# input file. Doxygen will then use the output that the filter program writes
-+# to standard output.
-+# If FILTER_PATTERNS is specified, this tag will be
-+# ignored.
-+
-+INPUT_FILTER           =
-+
-+# The FILTER_PATTERNS tag can be used to specify filters on a per file pattern
-+# basis.
-+# Doxygen will compare the file name with each pattern and apply the
-+# filter if there is a match.
-+# The filters are a list of the form:
-+# pattern=filter (like *.cpp=my_cpp_filter). See INPUT_FILTER for further
-+# info on how filters are used. If FILTER_PATTERNS is empty or if
-+# non of the patterns match the file name, INPUT_FILTER is applied.
-+
-+FILTER_PATTERNS        =
-+
-+# If the FILTER_SOURCE_FILES tag is set to YES, the input filter (if set using
-+# INPUT_FILTER) will be used to filter the input files when producing source
-+# files to browse (i.e. when SOURCE_BROWSER is set to YES).
-+
-+FILTER_SOURCE_FILES    = NO
-+
-+# The FILTER_SOURCE_PATTERNS tag can be used to specify source filters per file
-+# pattern. A pattern will override the setting for FILTER_PATTERN (if any)
-+# and it is also possible to disable source filtering for a specific pattern
-+# using *.ext= (so without naming a filter). This option only has effect when
-+# FILTER_SOURCE_FILES is enabled.
-+
-+FILTER_SOURCE_PATTERNS =
-+
-+# If the USE_MD_FILE_AS_MAINPAGE tag refers to the name of a markdown file that
-+# is part of the input, its contents will be placed on the main page (index.html).
-+# This can be useful if you have a project on for instance GitHub and want reuse
-+# the introduction page also for the doxygen output.
-+
-+USE_MDFILE_AS_MAINPAGE =
-+
-+#---------------------------------------------------------------------------
-+# configuration options related to source browsing
-+#---------------------------------------------------------------------------
-+
-+# If the SOURCE_BROWSER tag is set to YES then a list of source files will
-+# be generated. Documented entities will be cross-referenced with these sources.
-+# Note: To get rid of all source code in the generated output, make sure also
-+# VERBATIM_HEADERS is set to NO.
-+
-+SOURCE_BROWSER         = YES
-+
-+# Setting the INLINE_SOURCES tag to YES will include the body
-+# of functions and classes directly in the documentation.
-+
-+INLINE_SOURCES         = NO
-+
-+# Setting the STRIP_CODE_COMMENTS tag to YES (the default) will instruct
-+# doxygen to hide any special comment blocks from generated source code
-+# fragments. Normal C, C++ and Fortran comments will always remain visible.
-+
-+STRIP_CODE_COMMENTS    = YES
-+
-+# If the REFERENCED_BY_RELATION tag is set to YES
-+# then for each documented function all documented
-+# functions referencing it will be listed.
-+
-+REFERENCED_BY_RELATION = NO
-+
-+# If the REFERENCES_RELATION tag is set to YES
-+# then for each documented function all documented entities
-+# called/used by that function will be listed.
-+
-+REFERENCES_RELATION    = NO
-+
-+# If the REFERENCES_LINK_SOURCE tag is set to YES (the default)
-+# and SOURCE_BROWSER tag is set to YES, then the hyperlinks from
-+# functions in REFERENCES_RELATION and REFERENCED_BY_RELATION lists will
-+# link to the source code.
-+# Otherwise they will link to the documentation.
-+
-+REFERENCES_LINK_SOURCE = YES
-+
-+# If the USE_HTAGS tag is set to YES then the references to source code
-+# will point to the HTML generated by the htags(1) tool instead of doxygen
-+# built-in source browser. The htags tool is part of GNU's global source
-+# tagging system (see http://www.gnu.org/software/global/global.html). You
-+# will need version 4.8.6 or higher.
-+
-+USE_HTAGS              = NO
-+
-+# If the VERBATIM_HEADERS tag is set to YES (the default) then Doxygen
-+# will generate a verbatim copy of the header file for each class for
-+# which an include is specified. Set to NO to disable this.
-+
-+VERBATIM_HEADERS       = YES
-+
-+#---------------------------------------------------------------------------
-+# configuration options related to the alphabetical class index
-+#---------------------------------------------------------------------------
-+
-+# If the ALPHABETICAL_INDEX tag is set to YES, an alphabetical index
-+# of all compounds will be generated. Enable this if the project
-+# contains a lot of classes, structs, unions or interfaces.
-+
-+ALPHABETICAL_INDEX     = YES
-+
-+# If the alphabetical index is enabled (see ALPHABETICAL_INDEX) then
-+# the COLS_IN_ALPHA_INDEX tag can be used to specify the number of columns
-+# in which this list will be split (can be a number in the range [1..20])
-+
-+COLS_IN_ALPHA_INDEX    = 5
-+
-+# In case all classes in a project start with a common prefix, all
-+# classes will be put under the same header in the alphabetical index.
-+# The IGNORE_PREFIX tag can be used to specify one or more prefixes that
-+# should be ignored while generating the index headers.
-+
-+IGNORE_PREFIX          =
-+
-+#---------------------------------------------------------------------------
-+# configuration options related to the HTML output
-+#---------------------------------------------------------------------------
-+
-+# If the GENERATE_HTML tag is set to YES (the default) Doxygen will
-+# generate HTML output.
-+
-+GENERATE_HTML          = YES
-+
-+# The HTML_OUTPUT tag is used to specify where the HTML docs will be put.
-+# If a relative path is entered the value of OUTPUT_DIRECTORY will be
-+# put in front of it. If left blank `html' will be used as the default path.
-+
-+HTML_OUTPUT            = html
-+
-+# The HTML_FILE_EXTENSION tag can be used to specify the file extension for
-+# each generated HTML page (for example: .htm,.php,.asp). If it is left blank
-+# doxygen will generate files with .html extension.
-+
-+HTML_FILE_EXTENSION    = .html
-+
-+# The HTML_HEADER tag can be used to specify a personal HTML header for
-+# each generated HTML page. If it is left blank doxygen will generate a
-+# standard header. Note that when using a custom header you are responsible
-+#  for the proper inclusion of any scripts and style sheets that doxygen
-+# needs, which is dependent on the configuration options used.
-+# It is advised to generate a default header using "doxygen -w html
-+# header.html footer.html stylesheet.css YourConfigFile" and then modify
-+# that header. Note that the header is subject to change so you typically
-+# have to redo this when upgrading to a newer version of doxygen or when
-+# changing the value of configuration settings such as GENERATE_TREEVIEW!
-+
-+HTML_HEADER            =
-+
-+# The HTML_FOOTER tag can be used to specify a personal HTML footer for
-+# each generated HTML page. If it is left blank doxygen will generate a
-+# standard footer.
-+
-+HTML_FOOTER            =
-+
-+# The HTML_STYLESHEET tag can be used to specify a user-defined cascading
-+# style sheet that is used by each HTML page. It can be used to
-+# fine-tune the look of the HTML output. If left blank doxygen will
-+# generate a default style sheet. Note that it is recommended to use
-+# HTML_EXTRA_STYLESHEET instead of this one, as it is more robust and this
-+# tag will in the future become obsolete.
-+
-+HTML_STYLESHEET        =
-+
-+# The HTML_EXTRA_STYLESHEET tag can be used to specify an additional
-+# user-defined cascading style sheet that is included after the standard
-+# style sheets created by doxygen. Using this option one can overrule
-+# certain style aspects. This is preferred over using HTML_STYLESHEET
-+# since it does not replace the standard style sheet and is therefor more
-+# robust against future updates. Doxygen will copy the style sheet file to
-+# the output directory.
-+
-+HTML_EXTRA_STYLESHEET  =
-+
-+# The HTML_EXTRA_FILES tag can be used to specify one or more extra images or
-+# other source files which should be copied to the HTML output directory. Note
-+# that these files will be copied to the base HTML output directory. Use the
-+# $relpath$ marker in the HTML_HEADER and/or HTML_FOOTER files to load these
-+# files. In the HTML_STYLESHEET file, use the file name only. Also note that
-+# the files will be copied as-is; there are no commands or markers available.
-+
-+HTML_EXTRA_FILES       =
-+
-+# The HTML_COLORSTYLE_HUE tag controls the color of the HTML output.
-+# Doxygen will adjust the colors in the style sheet and background images
-+# according to this color. Hue is specified as an angle on a colorwheel,
-+# see http://en.wikipedia.org/wiki/Hue for more information.
-+# For instance the value 0 represents red, 60 is yellow, 120 is green,
-+# 180 is cyan, 240 is blue, 300 purple, and 360 is red again.
-+# The allowed range is 0 to 359.
-+
-+HTML_COLORSTYLE_HUE    = 220
-+
-+# The HTML_COLORSTYLE_SAT tag controls the purity (or saturation) of
-+# the colors in the HTML output. For a value of 0 the output will use
-+# grayscales only. A value of 255 will produce the most vivid colors.
-+
-+HTML_COLORSTYLE_SAT    = 100
-+
-+# The HTML_COLORSTYLE_GAMMA tag controls the gamma correction applied to
-+# the luminance component of the colors in the HTML output. Values below
-+# 100 gradually make the output lighter, whereas values above 100 make
-+# the output darker. The value divided by 100 is the actual gamma applied,
-+# so 80 represents a gamma of 0.8, The value 220 represents a gamma of 2.2,
-+# and 100 does not change the gamma.
-+
-+HTML_COLORSTYLE_GAMMA  = 80
-+
-+# If the HTML_TIMESTAMP tag is set to YES then the footer of each generated HTML
-+# page will contain the date and time when the page was generated. Setting
-+# this to NO can help when comparing the output of multiple runs.
-+
-+HTML_TIMESTAMP         = NO
-+
-+# If the HTML_DYNAMIC_SECTIONS tag is set to YES then the generated HTML
-+# documentation will contain sections that can be hidden and shown after the
-+# page has loaded.
-+
-+HTML_DYNAMIC_SECTIONS  = NO
-+
-+# With HTML_INDEX_NUM_ENTRIES one can control the preferred number of
-+# entries shown in the various tree structured indices initially; the user
-+# can expand and collapse entries dynamically later on. Doxygen will expand
-+# the tree to such a level that at most the specified number of entries are
-+# visible (unless a fully collapsed tree already exceeds this amount).
-+# So setting the number of entries 1 will produce a full collapsed tree by
-+# default. 0 is a special value representing an infinite number of entries
-+# and will result in a full expanded tree by default.
-+
-+HTML_INDEX_NUM_ENTRIES = 100
-+
-+# If the GENERATE_DOCSET tag is set to YES, additional index files
-+# will be generated that can be used as input for Apple's Xcode 3
-+# integrated development environment, introduced with OSX 10.5 (Leopard).
-+# To create a documentation set, doxygen will generate a Makefile in the
-+# HTML output directory. Running make will produce the docset in that
-+# directory and running "make install" will install the docset in
-+# ~/Library/Developer/Shared/Documentation/DocSets so that Xcode will find
-+# it at startup.
-+# See http://developer.apple.com/tools/creatingdocsetswithdoxygen.html
-+# for more information.
-+
-+GENERATE_DOCSET        = NO
-+
-+# When GENERATE_DOCSET tag is set to YES, this tag determines the name of the
-+# feed. A documentation feed provides an umbrella under which multiple
-+# documentation sets from a single provider (such as a company or product suite)
-+# can be grouped.
-+
-+DOCSET_FEEDNAME        = "Doxygen generated docs"
-+
-+# When GENERATE_DOCSET tag is set to YES, this tag specifies a string that
-+# should uniquely identify the documentation set bundle. This should be a
-+# reverse domain-name style string, e.g. com.mycompany.MyDocSet. Doxygen
-+# will append .docset to the name.
-+
-+DOCSET_BUNDLE_ID       = org.doxygen.Project
-+
-+# When GENERATE_PUBLISHER_ID tag specifies a string that should uniquely
-+# identify the documentation publisher. This should be a reverse domain-name
-+# style string, e.g. com.mycompany.MyDocSet.documentation.
-+
-+DOCSET_PUBLISHER_ID    = org.doxygen.Publisher
-+
-+# The GENERATE_PUBLISHER_NAME tag identifies the documentation publisher.
-+
-+DOCSET_PUBLISHER_NAME  = Publisher
-+
-+# If the GENERATE_HTMLHELP tag is set to YES, additional index files
-+# will be generated that can be used as input for tools like the
-+# Microsoft HTML help workshop to generate a compiled HTML help file (.chm)
-+# of the generated HTML documentation.
-+
-+GENERATE_HTMLHELP      = NO
-+
-+# If the GENERATE_HTMLHELP tag is set to YES, the CHM_FILE tag can
-+# be used to specify the file name of the resulting .chm file. You
-+# can add a path in front of the file if the result should not be
-+# written to the html output directory.
-+
-+CHM_FILE               =
-+
-+# If the GENERATE_HTMLHELP tag is set to YES, the HHC_LOCATION tag can
-+# be used to specify the location (absolute path including file name) of
-+# the HTML help compiler (hhc.exe). If non-empty doxygen will try to run
-+# the HTML help compiler on the generated index.hhp.
-+
-+HHC_LOCATION           =
-+
-+# If the GENERATE_HTMLHELP tag is set to YES, the GENERATE_CHI flag
-+# controls if a separate .chi index file is generated (YES) or that
-+# it should be included in the master .chm file (NO).
-+
-+GENERATE_CHI           = NO
-+
-+# If the GENERATE_HTMLHELP tag is set to YES, the CHM_INDEX_ENCODING
-+# is used to encode HtmlHelp index (hhk), content (hhc) and project file
-+# content.
-+
-+CHM_INDEX_ENCODING     =
-+
-+# If the GENERATE_HTMLHELP tag is set to YES, the BINARY_TOC flag
-+# controls whether a binary table of contents is generated (YES) or a
-+# normal table of contents (NO) in the .chm file.
-+
-+BINARY_TOC             = NO
-+
-+# The TOC_EXPAND flag can be set to YES to add extra items for group members
-+# to the contents of the HTML help documentation and to the tree view.
-+
-+TOC_EXPAND             = NO
-+
-+# If the GENERATE_QHP tag is set to YES and both QHP_NAMESPACE and
-+# QHP_VIRTUAL_FOLDER are set, an additional index file will be generated
-+# that can be used as input for Qt's qhelpgenerator to generate a
-+# Qt Compressed Help (.qch) of the generated HTML documentation.
-+
-+GENERATE_QHP           = NO
-+
-+# If the QHG_LOCATION tag is specified, the QCH_FILE tag can
-+# be used to specify the file name of the resulting .qch file.
-+# The path specified is relative to the HTML output folder.
-+
-+QCH_FILE               =
-+
-+# The QHP_NAMESPACE tag specifies the namespace to use when generating
-+# Qt Help Project output. For more information please see
-+# http://doc.trolltech.com/qthelpproject.html#namespace
-+
-+QHP_NAMESPACE          = org.doxygen.Project
-+
-+# The QHP_VIRTUAL_FOLDER tag specifies the namespace to use when generating
-+# Qt Help Project output. For more information please see
-+# http://doc.trolltech.com/qthelpproject.html#virtual-folders
-+
-+QHP_VIRTUAL_FOLDER     = doc
-+
-+# If QHP_CUST_FILTER_NAME is set, it specifies the name of a custom filter to
-+# add. For more information please see
-+# http://doc.trolltech.com/qthelpproject.html#custom-filters
-+
-+QHP_CUST_FILTER_NAME   =
-+
-+# The QHP_CUST_FILT_ATTRS tag specifies the list of the attributes of the
-+# custom filter to add. For more information please see
-+# <a href="http://doc.trolltech.com/qthelpproject.html#custom-filters">
-+# Qt Help Project / Custom Filters</a>.
-+
-+QHP_CUST_FILTER_ATTRS  =
-+
-+# The QHP_SECT_FILTER_ATTRS tag specifies the list of the attributes this
-+# project's
-+# filter section matches.
-+# <a href="http://doc.trolltech.com/qthelpproject.html#filter-attributes">
-+# Qt Help Project / Filter Attributes</a>.
-+
-+QHP_SECT_FILTER_ATTRS  =
-+
-+# If the GENERATE_QHP tag is set to YES, the QHG_LOCATION tag can
-+# be used to specify the location of Qt's qhelpgenerator.
-+# If non-empty doxygen will try to run qhelpgenerator on the generated
-+# .qhp file.
-+
-+QHG_LOCATION           =
-+
-+# If the GENERATE_ECLIPSEHELP tag is set to YES, additional index files
-+#  will be generated, which together with the HTML files, form an Eclipse help
-+# plugin. To install this plugin and make it available under the help contents
-+# menu in Eclipse, the contents of the directory containing the HTML and XML
-+# files needs to be copied into the plugins directory of eclipse. The name of
-+# the directory within the plugins directory should be the same as
-+# the ECLIPSE_DOC_ID value. After copying Eclipse needs to be restarted before
-+# the help appears.
-+
-+GENERATE_ECLIPSEHELP   = NO
-+
-+# A unique identifier for the eclipse help plugin. When installing the plugin
-+# the directory name containing the HTML and XML files should also have
-+# this name.
-+
-+ECLIPSE_DOC_ID         = org.doxygen.Project
-+
-+# The DISABLE_INDEX tag can be used to turn on/off the condensed index (tabs)
-+# at top of each HTML page. The value NO (the default) enables the index and
-+# the value YES disables it. Since the tabs have the same information as the
-+# navigation tree you can set this option to NO if you already set
-+# GENERATE_TREEVIEW to YES.
-+
-+DISABLE_INDEX          = NO
-+
-+# The GENERATE_TREEVIEW tag is used to specify whether a tree-like index
-+# structure should be generated to display hierarchical information.
-+# If the tag value is set to YES, a side panel will be generated
-+# containing a tree-like index structure (just like the one that
-+# is generated for HTML Help). For this to work a browser that supports
-+# JavaScript, DHTML, CSS and frames is required (i.e. any modern browser).
-+# Windows users are probably better off using the HTML help feature.
-+# Since the tree basically has the same information as the tab index you
-+# could consider to set DISABLE_INDEX to NO when enabling this option.
-+
-+GENERATE_TREEVIEW      = YES
-+
-+# The ENUM_VALUES_PER_LINE tag can be used to set the number of enum values
-+# (range [0,1..20]) that doxygen will group on one line in the generated HTML
-+# documentation. Note that a value of 0 will completely suppress the enum
-+# values from appearing in the overview section.
-+
-+ENUM_VALUES_PER_LINE   = 4
-+
-+# If the treeview is enabled (see GENERATE_TREEVIEW) then this tag can be
-+# used to set the initial width (in pixels) of the frame in which the tree
-+# is shown.
-+
-+TREEVIEW_WIDTH         = 250
-+
-+# When the EXT_LINKS_IN_WINDOW option is set to YES doxygen will open
-+# links to external symbols imported via tag files in a separate window.
-+
-+EXT_LINKS_IN_WINDOW    = NO
-+
-+# Use this tag to change the font size of Latex formulas included
-+# as images in the HTML documentation. The default is 10. Note that
-+# when you change the font size after a successful doxygen run you need
-+# to manually remove any form_*.png images from the HTML output directory
-+# to force them to be regenerated.
-+
-+FORMULA_FONTSIZE       = 10
-+
-+# Use the FORMULA_TRANPARENT tag to determine whether or not the images
-+# generated for formulas are transparent PNGs. Transparent PNGs are
-+# not supported properly for IE 6.0, but are supported on all modern browsers.
-+# Note that when changing this option you need to delete any form_*.png files
-+# in the HTML output before the changes have effect.
-+
-+FORMULA_TRANSPARENT    = YES
-+
-+# Enable the USE_MATHJAX option to render LaTeX formulas using MathJax
-+# (see http://www.mathjax.org) which uses client side Javascript for the
-+# rendering instead of using prerendered bitmaps. Use this if you do not
-+# have LaTeX installed or if you want to formulas look prettier in the HTML
-+# output. When enabled you may also need to install MathJax separately and
-+# configure the path to it using the MATHJAX_RELPATH option.
-+
-+USE_MATHJAX            = NO
-+
-+# When MathJax is enabled you can set the default output format to be used for
-+# thA MathJax output. Supported types are HTML-CSS, NativeMML (i.e. MathML) and
-+# SVG. The default value is HTML-CSS, which is slower, but has the best
-+# compatibility.
-+
-+MATHJAX_FORMAT         = HTML-CSS
-+
-+# When MathJax is enabled you need to specify the location relative to the
-+# HTML output directory using the MATHJAX_RELPATH option. The destination
-+# directory should contain the MathJax.js script. For instance, if the mathjax
-+# directory is located at the same level as the HTML output directory, then
-+# MATHJAX_RELPATH should be ../mathjax. The default value points to
-+# the MathJax Content Delivery Network so you can quickly see the result without
-+# installing MathJax.
-+# However, it is strongly recommended to install a local
-+# copy of MathJax from http://www.mathjax.org before deployment.
-+
-+MATHJAX_RELPATH        = http://cdn.mathjax.org/mathjax/latest
-+
-+# The MATHJAX_EXTENSIONS tag can be used to specify one or MathJax extension
-+# names that should be enabled during MathJax rendering.
-+
-+MATHJAX_EXTENSIONS     =
-+
-+# When the SEARCHENGINE tag is enabled doxygen will generate a search box
-+# for the HTML output. The underlying search engine uses javascript
-+# and DHTML and should work on any modern browser. Note that when using
-+# HTML help (GENERATE_HTMLHELP), Qt help (GENERATE_QHP), or docsets
-+# (GENERATE_DOCSET) there is already a search function so this one should
-+# typically be disabled. For large projects the javascript based search engine
-+# can be slow, then enabling SERVER_BASED_SEARCH may provide a better solution.
-+
-+SEARCHENGINE           = YES
-+
-+# When the SERVER_BASED_SEARCH tag is enabled the search engine will be
-+# implemented using a web server instead of a web client using Javascript.
-+# There are two flavours of web server based search depending on the
-+# EXTERNAL_SEARCH setting. When disabled, doxygen will generate a PHP script for
-+# searching and an index file used by the script. When EXTERNAL_SEARCH is
-+# enabled the indexing and searching needs to be provided by external tools.
-+# See the manual for details.
-+
-+SERVER_BASED_SEARCH    = NO
-+
-+# When EXTERNAL_SEARCH is enabled doxygen will no longer generate the PHP
-+# script for searching. Instead the search results are written to an XML file
-+# which needs to be processed by an external indexer. Doxygen will invoke an
-+# external search engine pointed to by the SEARCHENGINE_URL option to obtain
-+# the search results. Doxygen ships with an example indexer (doxyindexer) and
-+# search engine (doxysearch.cgi) which are based on the open source search engine
-+# library Xapian. See the manual for configuration details.
-+
-+EXTERNAL_SEARCH        = NO
-+
-+# The SEARCHENGINE_URL should point to a search engine hosted by a web server
-+# which will returned the search results when EXTERNAL_SEARCH is enabled.
-+# Doxygen ships with an example search engine (doxysearch) which is based on
-+# the open source search engine library Xapian. See the manual for configuration
-+# details.
-+
-+SEARCHENGINE_URL       =
-+
-+# When SERVER_BASED_SEARCH and EXTERNAL_SEARCH are both enabled the unindexed
-+# search data is written to a file for indexing by an external tool. With the
-+# SEARCHDATA_FILE tag the name of this file can be specified.
-+
-+SEARCHDATA_FILE        = searchdata.xml
-+
-+# When SERVER_BASED_SEARCH AND EXTERNAL_SEARCH are both enabled the
-+# EXTERNAL_SEARCH_ID tag can be used as an identifier for the project. This is
-+# useful in combination with EXTRA_SEARCH_MAPPINGS to search through multiple
-+# projects and redirect the results back to the right project.
-+
-+EXTERNAL_SEARCH_ID     =
-+
-+# The EXTRA_SEARCH_MAPPINGS tag can be used to enable searching through doxygen
-+# projects other than the one defined by this configuration file, but that are
-+# all added to the same external search index. Each project needs to have a
-+# unique id set via EXTERNAL_SEARCH_ID. The search mapping then maps the id
-+# of to a relative location where the documentation can be found.
-+# The format is: EXTRA_SEARCH_MAPPINGS = id1=loc1 id2=loc2 ...
-+
-+EXTRA_SEARCH_MAPPINGS  =
-+
-+#---------------------------------------------------------------------------
-+# configuration options related to the LaTeX output
-+#---------------------------------------------------------------------------
-+
-+# If the GENERATE_LATEX tag is set to YES (the default) Doxygen will
-+# generate Latex output.
-+
-+GENERATE_LATEX         = YES
-+
-+# The LATEX_OUTPUT tag is used to specify where the LaTeX docs will be put.
-+# If a relative path is entered the value of OUTPUT_DIRECTORY will be
-+# put in front of it. If left blank `latex' will be used as the default path.
-+
-+LATEX_OUTPUT           = latex
-+
-+# The LATEX_CMD_NAME tag can be used to specify the LaTeX command name to be
-+# invoked. If left blank `latex' will be used as the default command name.
-+# Note that when enabling USE_PDFLATEX this option is only used for
-+# generating bitmaps for formulas in the HTML output, but not in the
-+# Makefile that is written to the output directory.
-+
-+LATEX_CMD_NAME         = latex
-+
-+# The MAKEINDEX_CMD_NAME tag can be used to specify the command name to
-+# generate index for LaTeX. If left blank `makeindex' will be used as the
-+# default command name.
-+
-+MAKEINDEX_CMD_NAME     = makeindex
-+
-+# If the COMPACT_LATEX tag is set to YES Doxygen generates more compact
-+# LaTeX documents. This may be useful for small projects and may help to
-+# save some trees in general.
-+
-+COMPACT_LATEX          = NO
-+
-+# The PAPER_TYPE tag can be used to set the paper type that is used
-+# by the printer. Possible values are: a4, letter, legal and
-+# executive. If left blank a4wide will be used.
-+
-+PAPER_TYPE             = a4
-+
-+# The EXTRA_PACKAGES tag can be to specify one or more names of LaTeX
-+# packages that should be included in the LaTeX output.
-+
-+EXTRA_PACKAGES         =
-+
-+# The LATEX_HEADER tag can be used to specify a personal LaTeX header for
-+# the generated latex document. The header should contain everything until
-+# the first chapter. If it is left blank doxygen will generate a
-+# standard header. Notice: only use this tag if you know what you are doing!
-+
-+LATEX_HEADER           =
-+
-+# The LATEX_FOOTER tag can be used to specify a personal LaTeX footer for
-+# the generated latex document. The footer should contain everything after
-+# the last chapter. If it is left blank doxygen will generate a
-+# standard footer. Notice: only use this tag if you know what you are doing!
-+
-+LATEX_FOOTER           =
-+
-+# If the PDF_HYPERLINKS tag is set to YES, the LaTeX that is generated
-+# is prepared for conversion to pdf (using ps2pdf). The pdf file will
-+# contain links (just like the HTML output) instead of page references
-+# This makes the output suitable for online browsing using a pdf viewer.
-+
-+PDF_HYPERLINKS         = YES
-+
-+# If the USE_PDFLATEX tag is set to YES, pdflatex will be used instead of
-+# plain latex in the generated Makefile. Set this option to YES to get a
-+# higher quality PDF documentation.
-+
-+USE_PDFLATEX           = YES
-+
-+# If the LATEX_BATCHMODE tag is set to YES, doxygen will add the \\batchmode.
-+# command to the generated LaTeX files. This will instruct LaTeX to keep
-+# running if errors occur, instead of asking the user for help.
-+# This option is also used when generating formulas in HTML.
-+
-+LATEX_BATCHMODE        = NO
-+
-+# If LATEX_HIDE_INDICES is set to YES then doxygen will not
-+# include the index chapters (such as File Index, Compound Index, etc.)
-+# in the output.
-+
-+LATEX_HIDE_INDICES     = NO
-+
-+# If LATEX_SOURCE_CODE is set to YES then doxygen will include
-+# source code with syntax highlighting in the LaTeX output.
-+# Note that which sources are shown also depends on other settings
-+# such as SOURCE_BROWSER.
-+
-+LATEX_SOURCE_CODE      = NO
-+
-+# The LATEX_BIB_STYLE tag can be used to specify the style to use for the
-+# bibliography, e.g. plainnat, or ieeetr. The default style is "plain". See
-+# http://en.wikipedia.org/wiki/BibTeX for more info.
-+
-+LATEX_BIB_STYLE        = plain
-+
-+#---------------------------------------------------------------------------
-+# configuration options related to the RTF output
-+#---------------------------------------------------------------------------
-+
-+# If the GENERATE_RTF tag is set to YES Doxygen will generate RTF output
-+# The RTF output is optimized for Word 97 and may not look very pretty with
-+# other RTF readers or editors.
-+
-+GENERATE_RTF           = NO
-+
-+# The RTF_OUTPUT tag is used to specify where the RTF docs will be put.
-+# If a relative path is entered the value of OUTPUT_DIRECTORY will be
-+# put in front of it. If left blank `rtf' will be used as the default path.
-+
-+RTF_OUTPUT             = rtf
-+
-+# If the COMPACT_RTF tag is set to YES Doxygen generates more compact
-+# RTF documents. This may be useful for small projects and may help to
-+# save some trees in general.
-+
-+COMPACT_RTF            = NO
-+
-+# If the RTF_HYPERLINKS tag is set to YES, the RTF that is generated
-+# will contain hyperlink fields. The RTF file will
-+# contain links (just like the HTML output) instead of page references.
-+# This makes the output suitable for online browsing using WORD or other
-+# programs which support those fields.
-+# Note: wordpad (write) and others do not support links.
-+
-+RTF_HYPERLINKS         = NO
-+
-+# Load style sheet definitions from file. Syntax is similar to doxygen's
-+# config file, i.e. a series of assignments. You only have to provide
-+# replacements, missing definitions are set to their default value.
-+
-+RTF_STYLESHEET_FILE    =
-+
-+# Set optional variables used in the generation of an rtf document.
-+# Syntax is similar to doxygen's config file.
-+
-+RTF_EXTENSIONS_FILE    =
-+
-+#---------------------------------------------------------------------------
-+# configuration options related to the man page output
-+#---------------------------------------------------------------------------
-+
-+# If the GENERATE_MAN tag is set to YES (the default) Doxygen will
-+# generate man pages
-+
-+GENERATE_MAN           = NO
-+
-+# The MAN_OUTPUT tag is used to specify where the man pages will be put.
-+# If a relative path is entered the value of OUTPUT_DIRECTORY will be
-+# put in front of it. If left blank `man' will be used as the default path.
-+
-+MAN_OUTPUT             = man
-+
-+# The MAN_EXTENSION tag determines the extension that is added to
-+# the generated man pages (default is the subroutine's section .3)
-+
-+MAN_EXTENSION          = .3
-+
-+# If the MAN_LINKS tag is set to YES and Doxygen generates man output,
-+# then it will generate one additional man file for each entity
-+# documented in the real man page(s). These additional files
-+# only source the real man page, but without them the man command
-+# would be unable to find the correct page. The default is NO.
-+
-+MAN_LINKS              = NO
-+
-+#---------------------------------------------------------------------------
-+# configuration options related to the XML output
-+#---------------------------------------------------------------------------
-+
-+# If the GENERATE_XML tag is set to YES Doxygen will
-+# generate an XML file that captures the structure of
-+# the code including all documentation.
-+
-+GENERATE_XML           = NO
-+
-+# The XML_OUTPUT tag is used to specify where the XML pages will be put.
-+# If a relative path is entered the value of OUTPUT_DIRECTORY will be
-+# put in front of it. If left blank `xml' will be used as the default path.
-+
-+XML_OUTPUT             = xml
-+
-+# The XML_SCHEMA tag can be used to specify an XML schema,
-+# which can be used by a validating XML parser to check the
-+# syntax of the XML files.
-+
-+XML_SCHEMA             =
-+
-+# The XML_DTD tag can be used to specify an XML DTD,
-+# which can be used by a validating XML parser to check the
-+# syntax of the XML files.
-+
-+XML_DTD                =
-+
-+# If the XML_PROGRAMLISTING tag is set to YES Doxygen will
-+# dump the program listings (including syntax highlighting
-+# and cross-referencing information) to the XML output. Note that
-+# enabling this will significantly increase the size of the XML output.
-+
-+XML_PROGRAMLISTING     = YES
-+
-+#---------------------------------------------------------------------------
-+# configuration options for the AutoGen Definitions output
-+#---------------------------------------------------------------------------
-+
-+# If the GENERATE_AUTOGEN_DEF tag is set to YES Doxygen will
-+# generate an AutoGen Definitions (see autogen.sf.net) file
-+# that captures the structure of the code including all
-+# documentation. Note that this feature is still experimental
-+# and incomplete at the moment.
-+
-+GENERATE_AUTOGEN_DEF   = NO
-+
-+#---------------------------------------------------------------------------
-+# configuration options related to the Perl module output
-+#---------------------------------------------------------------------------
-+
-+# If the GENERATE_PERLMOD tag is set to YES Doxygen will
-+# generate a Perl module file that captures the structure of
-+# the code including all documentation. Note that this
-+# feature is still experimental and incomplete at the
-+# moment.
-+
-+GENERATE_PERLMOD       = NO
-+
-+# If the PERLMOD_LATEX tag is set to YES Doxygen will generate
-+# the necessary Makefile rules, Perl scripts and LaTeX code to be able
-+# to generate PDF and DVI output from the Perl module output.
-+
-+PERLMOD_LATEX          = NO
-+
-+# If the PERLMOD_PRETTY tag is set to YES the Perl module output will be
-+# nicely formatted so it can be parsed by a human reader.
-+# This is useful
-+# if you want to understand what is going on.
-+# On the other hand, if this
-+# tag is set to NO the size of the Perl module output will be much smaller
-+# and Perl will parse it just the same.
-+
-+PERLMOD_PRETTY         = YES
-+
-+# The names of the make variables in the generated doxyrules.make file
-+# are prefixed with the string contained in PERLMOD_MAKEVAR_PREFIX.
-+# This is useful so different doxyrules.make files included by the same
-+# Makefile don't overwrite each other's variables.
-+
-+PERLMOD_MAKEVAR_PREFIX =
-+
-+#---------------------------------------------------------------------------
-+# Configuration options related to the preprocessor
-+#---------------------------------------------------------------------------
-+
-+# If the ENABLE_PREPROCESSING tag is set to YES (the default) Doxygen will
-+# evaluate all C-preprocessor directives found in the sources and include
-+# files.
-+
-+ENABLE_PREPROCESSING   = YES
-+
-+# If the MACRO_EXPANSION tag is set to YES Doxygen will expand all macro
-+# names in the source code. If set to NO (the default) only conditional
-+# compilation will be performed. Macro expansion can be done in a controlled
-+# way by setting EXPAND_ONLY_PREDEF to YES.
-+
-+MACRO_EXPANSION        = NO
-+
-+# If the EXPAND_ONLY_PREDEF and MACRO_EXPANSION tags are both set to YES
-+# then the macro expansion is limited to the macros specified with the
-+# PREDEFINED and EXPAND_AS_DEFINED tags.
-+
-+EXPAND_ONLY_PREDEF     = NO
-+
-+# If the SEARCH_INCLUDES tag is set to YES (the default) the includes files
-+# pointed to by INCLUDE_PATH will be searched when a #include is found.
-+
-+SEARCH_INCLUDES        = YES
-+
-+# The INCLUDE_PATH tag can be used to specify one or more directories that
-+# contain include files that are not input files but should be processed by
-+# the preprocessor.
-+
-+INCLUDE_PATH           =
-+
-+# You can use the INCLUDE_FILE_PATTERNS tag to specify one or more wildcard
-+# patterns (like *.h and *.hpp) to filter out the header-files in the
-+# directories. If left blank, the patterns specified with FILE_PATTERNS will
-+# be used.
-+
-+INCLUDE_FILE_PATTERNS  =
-+
-+# The PREDEFINED tag can be used to specify one or more macro names that
-+# are defined before the preprocessor is started (similar to the -D option of
-+# gcc). The argument of the tag is a list of macros of the form: name
-+# or name=definition (no spaces). If the definition and the = are
-+# omitted =1 is assumed. To prevent a macro definition from being
-+# undefined via #undef or recursively expanded use the := operator
-+# instead of the = operator.
-+
-+PREDEFINED             =
-+
-+# If the MACRO_EXPANSION and EXPAND_ONLY_PREDEF tags are set to YES then
-+# this tag can be used to specify a list of macro names that should be expanded.
-+# The macro definition that is found in the sources will be used.
-+# Use the PREDEFINED tag if you want to use a different macro definition that
-+# overrules the definition found in the source code.
-+
-+EXPAND_AS_DEFINED      =
-+
-+# If the SKIP_FUNCTION_MACROS tag is set to YES (the default) then
-+# doxygen's preprocessor will remove all references to function-like macros
-+# that are alone on a line, have an all uppercase name, and do not end with a
-+# semicolon, because these will confuse the parser if not removed.
-+
-+SKIP_FUNCTION_MACROS   = YES
-+
-+#---------------------------------------------------------------------------
-+# Configuration::additions related to external references
-+#---------------------------------------------------------------------------
-+
-+# The TAGFILES option can be used to specify one or more tagfiles. For each
-+# tag file the location of the external documentation should be added. The
-+# format of a tag file without this location is as follows:
-+#
-+# TAGFILES = file1 file2 ...
-+# Adding location for the tag files is done as follows:
-+#
-+# TAGFILES = file1=loc1 "file2 = loc2" ...
-+# where "loc1" and "loc2" can be relative or absolute paths
-+# or URLs. Note that each tag file must have a unique name (where the name does
-+# NOT include the path). If a tag file is not located in the directory in which
-+# doxygen is run, you must also specify the path to the tagfile here.
-+
-+TAGFILES               =
-+
-+# When a file name is specified after GENERATE_TAGFILE, doxygen will create
-+# a tag file that is based on the input files it reads.
-+
-+GENERATE_TAGFILE       =
-+
-+# If the ALLEXTERNALS tag is set to YES all external classes will be listed
-+# in the class index. If set to NO only the inherited external classes
-+# will be listed.
-+
-+ALLEXTERNALS           = NO
-+
-+# If the EXTERNAL_GROUPS tag is set to YES all external groups will be listed
-+# in the modules index. If set to NO, only the current project's groups will
-+# be listed.
-+
-+EXTERNAL_GROUPS        = YES
-+
-+# The PERL_PATH should be the absolute path and name of the perl script
-+# interpreter (i.e. the result of `which perl').
-+
-+PERL_PATH              = /usr/bin/perl
-+
-+#---------------------------------------------------------------------------
-+# Configuration options related to the dot tool
-+#---------------------------------------------------------------------------
-+
-+# If the CLASS_DIAGRAMS tag is set to YES (the default) Doxygen will
-+# generate a inheritance diagram (in HTML, RTF and LaTeX) for classes with base
-+# or super classes. Setting the tag to NO turns the diagrams off. Note that
-+# this option also works with HAVE_DOT disabled, but it is recommended to
-+# install and use dot, since it yields more powerful graphs.
-+
-+CLASS_DIAGRAMS         = YES
-+
-+# You can define message sequence charts within doxygen comments using the \msc
-+# command. Doxygen will then run the mscgen tool (see
-+# http://www.mcternan.me.uk/mscgen/) to produce the chart and insert it in the
-+# documentation. The MSCGEN_PATH tag allows you to specify the directory where
-+# the mscgen tool resides. If left empty the tool is assumed to be found in the
-+# default search path.
-+
-+MSCGEN_PATH            =
-+
-+# If set to YES, the inheritance and collaboration graphs will hide
-+# inheritance and usage relations if the target is undocumented
-+# or is not a class.
-+
-+HIDE_UNDOC_RELATIONS   = YES
-+
-+# If you set the HAVE_DOT tag to YES then doxygen will assume the dot tool is
-+# available from the path. This tool is part of Graphviz, a graph visualization
-+# toolkit from AT&T and Lucent Bell Labs. The other options in this section
-+# have no effect if this option is set to NO (the default)
-+
-+HAVE_DOT               = NO
-+
-+# The DOT_NUM_THREADS specifies the number of dot invocations doxygen is
-+# allowed to run in parallel. When set to 0 (the default) doxygen will
-+# base this on the number of processors available in the system. You can set it
-+# explicitly to a value larger than 0 to get control over the balance
-+# between CPU load and processing speed.
-+
-+DOT_NUM_THREADS        = 0
-+
-+# By default doxygen will use the Helvetica font for all dot files that
-+# doxygen generates. When you want a differently looking font you can specify
-+# the font name using DOT_FONTNAME. You need to make sure dot is able to find
-+# the font, which can be done by putting it in a standard location or by setting
-+# the DOTFONTPATH environment variable or by setting DOT_FONTPATH to the
-+# directory containing the font.
-+
-+DOT_FONTNAME           = Helvetica
-+
-+# The DOT_FONTSIZE tag can be used to set the size of the font of dot graphs.
-+# The default size is 10pt.
-+
-+DOT_FONTSIZE           = 10
-+
-+# By default doxygen will tell dot to use the Helvetica font.
-+# If you specify a different font using DOT_FONTNAME you can use DOT_FONTPATH to
-+# set the path where dot can find it.
-+
-+DOT_FONTPATH           =
-+
-+# If the CLASS_GRAPH and HAVE_DOT tags are set to YES then doxygen
-+# will generate a graph for each documented class showing the direct and
-+# indirect inheritance relations. Setting this tag to YES will force the
-+# CLASS_DIAGRAMS tag to NO.
-+
-+CLASS_GRAPH            = YES
-+
-+# If the COLLABORATION_GRAPH and HAVE_DOT tags are set to YES then doxygen
-+# will generate a graph for each documented class showing the direct and
-+# indirect implementation dependencies (inheritance, containment, and
-+# class references variables) of the class with other documented classes.
-+
-+COLLABORATION_GRAPH    = YES
-+
-+# If the GROUP_GRAPHS and HAVE_DOT tags are set to YES then doxygen
-+# will generate a graph for groups, showing the direct groups dependencies
-+
-+GROUP_GRAPHS           = YES
-+
-+# If the UML_LOOK tag is set to YES doxygen will generate inheritance and
-+# collaboration diagrams in a style similar to the OMG's Unified Modeling
-+# Language.
-+
-+UML_LOOK               = NO
-+
-+# If the UML_LOOK tag is enabled, the fields and methods are shown inside
-+# the class node. If there are many fields or methods and many nodes the
-+# graph may become too big to be useful. The UML_LIMIT_NUM_FIELDS
-+# threshold limits the number of items for each type to make the size more
-+# managable. Set this to 0 for no limit. Note that the threshold may be
-+# exceeded by 50% before the limit is enforced.
-+
-+UML_LIMIT_NUM_FIELDS   = 10
-+
-+# If set to YES, the inheritance and collaboration graphs will show the
-+# relations between templates and their instances.
-+
-+TEMPLATE_RELATIONS     = NO
-+
-+# If the ENABLE_PREPROCESSING, SEARCH_INCLUDES, INCLUDE_GRAPH, and HAVE_DOT
-+# tags are set to YES then doxygen will generate a graph for each documented
-+# file showing the direct and indirect include dependencies of the file with
-+# other documented files.
-+
-+INCLUDE_GRAPH          = YES
-+
-+# If the ENABLE_PREPROCESSING, SEARCH_INCLUDES, INCLUDED_BY_GRAPH, and
-+# HAVE_DOT tags are set to YES then doxygen will generate a graph for each
-+# documented header file showing the documented files that directly or
-+# indirectly include this file.
-+
-+INCLUDED_BY_GRAPH      = YES
-+
-+# If the CALL_GRAPH and HAVE_DOT options are set to YES then
-+# doxygen will generate a call dependency graph for every global function
-+# or class method. Note that enabling this option will significantly increase
-+# the time of a run. So in most cases it will be better to enable call graphs
-+# for selected functions only using the \callgraph command.
-+
-+CALL_GRAPH             = NO
-+
-+# If the CALLER_GRAPH and HAVE_DOT tags are set to YES then
-+# doxygen will generate a caller dependency graph for every global function
-+# or class method. Note that enabling this option will significantly increase
-+# the time of a run. So in most cases it will be better to enable caller
-+# graphs for selected functions only using the \callergraph command.
-+
-+CALLER_GRAPH           = NO
-+
-+# If the GRAPHICAL_HIERARCHY and HAVE_DOT tags are set to YES then doxygen
-+# will generate a graphical hierarchy of all classes instead of a textual one.
-+
-+GRAPHICAL_HIERARCHY    = YES
-+
-+# If the DIRECTORY_GRAPH and HAVE_DOT tags are set to YES
-+# then doxygen will show the dependencies a directory has on other directories
-+# in a graphical way. The dependency relations are determined by the #include
-+# relations between the files in the directories.
-+
-+DIRECTORY_GRAPH        = YES
-+
-+# The DOT_IMAGE_FORMAT tag can be used to set the image format of the images
-+# generated by dot. Possible values are svg, png, jpg, or gif.
-+# If left blank png will be used. If you choose svg you need to set
-+# HTML_FILE_EXTENSION to xhtml in order to make the SVG files
-+# visible in IE 9+ (other browsers do not have this requirement).
-+
-+DOT_IMAGE_FORMAT       = png
-+
-+# If DOT_IMAGE_FORMAT is set to svg, then this option can be set to YES to
-+# enable generation of interactive SVG images that allow zooming and panning.
-+# Note that this requires a modern browser other than Internet Explorer.
-+# Tested and working are Firefox, Chrome, Safari, and Opera. For IE 9+ you
-+# need to set HTML_FILE_EXTENSION to xhtml in order to make the SVG files
-+# visible. Older versions of IE do not have SVG support.
-+
-+INTERACTIVE_SVG        = NO
-+
-+# The tag DOT_PATH can be used to specify the path where the dot tool can be
-+# found. If left blank, it is assumed the dot tool can be found in the path.
-+
-+DOT_PATH               =
-+
-+# The DOTFILE_DIRS tag can be used to specify one or more directories that
-+# contain dot files that are included in the documentation (see the
-+# \dotfile command).
-+
-+DOTFILE_DIRS           =
-+
-+# The MSCFILE_DIRS tag can be used to specify one or more directories that
-+# contain msc files that are included in the documentation (see the
-+# \mscfile command).
-+
-+MSCFILE_DIRS           =
-+
-+# The DOT_GRAPH_MAX_NODES tag can be used to set the maximum number of
-+# nodes that will be shown in the graph. If the number of nodes in a graph
-+# becomes larger than this value, doxygen will truncate the graph, which is
-+# visualized by representing a node as a red box. Note that doxygen if the
-+# number of direct children of the root node in a graph is already larger than
-+# DOT_GRAPH_MAX_NODES then the graph will not be shown at all. Also note
-+# that the size of a graph can be further restricted by MAX_DOT_GRAPH_DEPTH.
-+
-+DOT_GRAPH_MAX_NODES    = 50
-+
-+# The MAX_DOT_GRAPH_DEPTH tag can be used to set the maximum depth of the
-+# graphs generated by dot. A depth value of 3 means that only nodes reachable
-+# from the root by following a path via at most 3 edges will be shown. Nodes
-+# that lay further from the root node will be omitted. Note that setting this
-+# option to 1 or 2 may greatly reduce the computation time needed for large
-+# code bases. Also note that the size of a graph can be further restricted by
-+# DOT_GRAPH_MAX_NODES. Using a depth of 0 means no depth restriction.
-+
-+MAX_DOT_GRAPH_DEPTH    = 0
-+
-+# Set the DOT_TRANSPARENT tag to YES to generate images with a transparent
-+# background. This is disabled by default, because dot on Windows does not
-+# seem to support this out of the box. Warning: Depending on the platform used,
-+# enabling this option may lead to badly anti-aliased labels on the edges of
-+# a graph (i.e. they become hard to read).
-+
-+DOT_TRANSPARENT        = NO
-+
-+# Set the DOT_MULTI_TARGETS tag to YES allow dot to generate multiple output
-+# files in one run (i.e. multiple -o and -T options on the command line). This
-+# makes dot run faster, but since only newer versions of dot (>1.8.10)
-+# support this, this feature is disabled by default.
-+
-+DOT_MULTI_TARGETS      = NO
-+
-+# If the GENERATE_LEGEND tag is set to YES (the default) Doxygen will
-+# generate a legend page explaining the meaning of the various boxes and
-+# arrows in the dot generated graphs.
-+
-+GENERATE_LEGEND        = YES
-+
-+# If the DOT_CLEANUP tag is set to YES (the default) Doxygen will
-+# remove the intermediate dot files that are used to generate
-+# the various graphs.
-+
-+DOT_CLEANUP            = YES
--- 
-1.9.3
-
diff --git a/lirc.spec b/lirc.spec
index d79629e..c668024 100644
--- a/lirc.spec
+++ b/lirc.spec
@@ -7,7 +7,7 @@
 #define pre     pre3
 
 Name:           lirc
-Version:        0.9.2
+Version:        0.9.2a
 %global         src_vers  %(echo %{version} | sed 's/_/-/g' )
 %if 0%{?released}
 Release:        1%{?dist}
@@ -30,12 +30,7 @@ Source6:        README.fedora
 Source7:        99-remote-control-lirc.rules
                 # Config only, cannot be upstreamed.
 Patch1:         0001-Changing-effective-user-default.patch
-                # Already upstream (0002..0006).
-Patch2:         0002-tools-Make-make_rel_symlink.py-use-python3.patch
-Patch3:         0003-all-Use-puts-instead-of-printf-when-applicable.patch
-Patch4:         0004-all-Sanitize-feature-tests-macros.patch
-Patch5:         0005-configure.ac-Use-pkg-config-to-locate-ftdi.patch
-Patch6:         0006-Add-Doxyfile-not-part-of-dist-tarball.patch
+Patch2:         0002-Use-puts-instead-of-printf-when-applicalble.patch
 
 BuildRequires:  alsa-lib-devel
 Buildrequires:  autoconf
@@ -223,17 +218,13 @@ full support for the ftdi device.
 %endif
 %patch1 -p1
 %patch2 -p1
-%patch3 -p1
-%patch4 -p1
-%patch5 -p1
-%patch6 -p1
 sed -i -e 's|/usr/local/etc/|/etc/|' contrib/irman2lirc
 
 
 %build
 autoreconf -fi
 
-CFLAGS="-I/usr/include/libftdi1 %{optflags}" %configure --libdir=%{_libdir}
+CFLAGS="%{optflags}" %configure --libdir=%{_libdir}
 make %{?_smp_mflags}
 
 
@@ -383,6 +374,9 @@ find /etc/systemd -name lirc.service -xtype l -delete || :
 
 
 %changelog
+* Mon Feb 09 2015 Alec Leamas <leamas.alec@gmail.com> - 0.9.2a-1
+- Updating for new release 0.9.2a, most patches upstreamed.
+
 * Wed Dec 10 2014 Alec Leamas <leamas.alec@nowhere.net> - 0.9.2-1
 - Major upstream update.
 - New package structure with more, smaller packages.
diff --git a/sources b/sources
index ee62b22..42ff06b 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-c9154bf61947dde0ba1b91f7dd54c2e5  lirc-0.9.2.tar.gz
+c39d6bc901157c308163e6fd58727346  lirc-0.9.2a.tar.gz

From 0313c27dba9e237382780b7df09ffe31edba9245 Mon Sep 17 00:00:00 2001
From: Dennis Gilmore <dennis@ausil.us>
Date: Wed, 17 Jun 2015 18:22:16 +0000
Subject: [PATCH 142/204] - Rebuilt for
 https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild

---
 lirc.spec | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/lirc.spec b/lirc.spec
index c668024..7820efd 100644
--- a/lirc.spec
+++ b/lirc.spec
@@ -10,9 +10,9 @@ Name:           lirc
 Version:        0.9.2a
 %global         src_vers  %(echo %{version} | sed 's/_/-/g' )
 %if 0%{?released}
-Release:        1%{?dist}
+Release:        2%{?dist}
 %else
-Release:        1
+Release:        2
 %endif
 
 Summary:        The Linux Infrared Remote Control package
@@ -374,6 +374,9 @@ find /etc/systemd -name lirc.service -xtype l -delete || :
 
 
 %changelog
+* Wed Jun 17 2015 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0.9.2a-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild
+
 * Mon Feb 09 2015 Alec Leamas <leamas.alec@gmail.com> - 0.9.2a-1
 - Updating for new release 0.9.2a, most patches upstreamed.
 

From 7722049e5eff21fcc6965d13c87d0fc23aaa2d47 Mon Sep 17 00:00:00 2001
From: Alec Leamas <leamas.alec@gmail.com>
Date: Sun, 6 Sep 2015 04:44:39 +0200
Subject: [PATCH 143/204] New upstream release 0.9.3.

---
 lirc.spec | 57 +++++++++++++++++++++++++++++++++++--------------------
 1 file changed, 36 insertions(+), 21 deletions(-)

diff --git a/lirc.spec b/lirc.spec
index 7820efd..0fda52f 100644
--- a/lirc.spec
+++ b/lirc.spec
@@ -4,15 +4,15 @@
 %global _hardened_build 1
 
 %global released 1
-#define pre     pre3
+%define tag     devel
 
 Name:           lirc
-Version:        0.9.2a
+Version:        0.9.3
 %global         src_vers  %(echo %{version} | sed 's/_/-/g' )
 %if 0%{?released}
-Release:        2%{?dist}
+Release:        1%{?dist}
 %else
-Release:        2
+Release:        0.4.pre3%{tag}
 %endif
 
 Summary:        The Linux Infrared Remote Control package
@@ -22,15 +22,15 @@ Group:          System Environment/Daemons
 License:        GPLv2 and BSD
 URL:            http://www.lirc.org/
 %if 0%{?released}
-Source0:        http://downloads.sourceforge.net/lirc/%{name}-%{src_vers}.tar.gz
+Source0:        http://downloads.sourceforge.net/lirc/%{version}/%{name}-%{src_vers}.tar.gz
 %else
-Source0:        http://leamas.fedorapeople.org/lirc/lirc-%{src_vers}.tar.gz
+Source0:        ./lirc-%{src_vers}-%{tag}.tar.gz
+#Source0:        http://leamas.fedorapeople.org/lirc/lirc-%%{src_vers}.tar.gz
 %endif
 Source6:        README.fedora
 Source7:        99-remote-control-lirc.rules
                 # Config only, cannot be upstreamed.
 Patch1:         0001-Changing-effective-user-default.patch
-Patch2:         0002-Use-puts-instead-of-printf-when-applicalble.patch
 
 BuildRequires:  alsa-lib-devel
 Buildrequires:  autoconf
@@ -44,6 +44,7 @@ BuildRequires:  libirman-devel
 BuildRequires:  libtool
 BuildRequires:  libusb-devel
 BuildRequires:  libusb1-devel
+BuildRequires:  libxslt
 BuildRequires:  libXt-devel
 BuildRequires:  portaudio-devel
 BuildRequires:  python3-devel
@@ -161,7 +162,6 @@ Udev rule which disables the kernel built-in handling of infrared devices
 %package        tools-gui
 Summary:        LIRC GUI tools
 Requires:       lirc-core%{?_isa} = %{version}-%{release}
-Requires:       xorg-x11-fonts-misc
 
 %description   tools-gui
 Some seldom used X11-based tools for debugging lirc configurations.
@@ -212,12 +212,11 @@ full support for the ftdi device.
 
 %prep
 %if 0%{?released}
-%setup -q
-%else
 %setup -qn %{name}-%{src_vers}
+%else
+%setup -qn %{name}-%{src_vers}-%{tag}
 %endif
 %patch1 -p1
-%patch2 -p1
 sed -i -e 's|/usr/local/etc/|/etc/|' contrib/irman2lirc
 
 
@@ -230,9 +229,6 @@ make %{?_smp_mflags}
 
 %install
 make install DESTDIR=$RPM_BUILD_ROOT
-tar -C $RPM_BUILD_ROOT/%{_pkgdocdir} \
-    -xzf $RPM_BUILD_ROOT/%{_pkgdocdir}/api-docs.tar.gz
-rm $RPM_BUILD_ROOT/%{_pkgdocdir}/api-docs.tar.gz
 cd $RPM_BUILD_ROOT%{_datadir}/lirc/contrib
 chmod 755 irman2lirc devinput.sh
 chmod 755 lirc.debian lirc.redhat lircs lirc.suse*
@@ -242,6 +238,8 @@ rm $RPM_BUILD_ROOT%{_libdir}/lirc/plugins/*.la
 
 install -pm 755 contrib/irman2lirc $RPM_BUILD_ROOT%{_bindir}
 install -Dpm 644 doc/lirc.hwdb $RPM_BUILD_ROOT%{_datadir}/lirc/lirc.hwdb
+install -Dpm 644 contrib/60-lirc.rules \
+    $RPM_BUILD_ROOT%{_udevrulesdir}/60-lirc.rules
 install -Dpm 644 %{SOURCE7} \
     $RPM_BUILD_ROOT%{_udevrulesdir}/99-remote-control-lirc.rules
 cp -a %{SOURCE6} README.fedora
@@ -269,21 +267,23 @@ find /etc/systemd -name lirc.service -xtype l -delete || :
 %systemd_preun lircd.service lircmd.service
 
 %postun
-%systemd_postun_with_restart lircd.service lircmd.servic
-
-%files
+%systemd_postun_with_restart lircd.service lircmd.service
 
 %postun libs -p /sbin/ldconfig
 
+
 %files compat
 
 %files drv-iguanaIR
 %{_libdir}/lirc/plugins/iguanaIR.so
 %{_datadir}/lirc/configs/iguanaIR.conf
 
+
+%if 0
 %files drv-irman
 %{_libdir}/lirc/plugins/irman.so
 %{_datadir}/lirc/configs/irman.conf
+%endif
 
 %files drv-portaudio
 %{_libdir}/lirc/plugins/audio.so
@@ -322,6 +322,7 @@ find /etc/systemd -name lirc.service -xtype l -delete || :
 %config(noreplace) /etc/lirc/lirc*.conf
 %{_tmpfilesdir}/lirc.conf
 %{_unitdir}/lirc*
+%{_udevrulesdir}/60-lirc.rules
 %{_bindir}/*ir*
 %{_bindir}/*mode2
 %exclude %{_bindir}/irdb-get
@@ -339,6 +340,7 @@ find /etc/systemd -name lirc.service -xtype l -delete || :
 %exclude %{_datadir}/lirc/configs/*
 %{_mandir}/man1/*ir*.1*
 %{_mandir}/man1/*mode2*.1*
+%{_mandir}/man4/lirc.*
 %{_mandir}/man8/lirc*d.8*
 %{_mandir}/man5/lircd.conf.*
 %exclude %{_mandir}/man1/lirc-config-tool*
@@ -350,6 +352,7 @@ find /etc/systemd -name lirc.service -xtype l -delete || :
 
 %files libs
 #doc COPYING
+%{_libdir}/libirrecord.so.*
 %{_libdir}/liblirc_client.so.*
 %{_libdir}/liblirc_driver.so.*
 %{_libdir}/liblirc.so.*
@@ -359,6 +362,7 @@ find /etc/systemd -name lirc.service -xtype l -delete || :
 %{_includedir}/lirc_private.h
 %{_includedir}/lirc_driver.h
 %{_includedir}/lirc_client.h
+%{_libdir}/libirrecord.so
 %{_libdir}/liblirc_client.so
 %{_libdir}/liblirc_driver.so
 %{_libdir}/liblirc.so
@@ -372,14 +376,25 @@ find /etc/systemd -name lirc.service -xtype l -delete || :
 %files disable-kernel-rc
 %{_udevrulesdir}/99-remote-control-lirc.rules
 
-
 %changelog
+* Sat Sep 05 2015 Alec Leamas <leamas.alec@gmail.com> - 0.9.3-1
+- New upstream version.
+
+* Wed Aug 19 2015 Alec Leamas <leamas.alec@gmail.com> - 0.9.3-0.3.pre3
+- Added lirc-lsplugins left-over logfile patch (COPR only).
+
+* Tue Aug 18 2015 Alec Leamas <leamas.alec@nowhere.net> - 0.9.3-0.2pre3
+- Add new patch for external module compilation  (COPR only).
+
+* Thu Jul 30 2015 Alec Leamas <leamas.alec@nowhere.net> - 0.9.3-0.2pre1
+- Add udev rule to fix /dev/lirc0 permissions  (COPR only).
+
+* Wed Jul 1 2015 Alec Leamas <leamas.alec@nowhere.net> - 0.9.3-0.1pre1
+- Provisionary COPR 0.9.3 pre-release - major upstream update.
+
 * Wed Jun 17 2015 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0.9.2a-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild
 
-* Mon Feb 09 2015 Alec Leamas <leamas.alec@gmail.com> - 0.9.2a-1
-- Updating for new release 0.9.2a, most patches upstreamed.
-
 * Wed Dec 10 2014 Alec Leamas <leamas.alec@nowhere.net> - 0.9.2-1
 - Major upstream update.
 - New package structure with more, smaller packages.

From 61b5cca2ee4b26bb220780eea17bae6cd9df4737 Mon Sep 17 00:00:00 2001
From: Alec Leamas <leamas.alec@gmail.com>
Date: Sun, 6 Sep 2015 05:18:11 +0200
Subject: [PATCH 146/204] Rebuilding with proper sources commit.

---
 .gitignore | 1 +
 lirc.spec  | 7 +++++--
 sources    | 2 +-
 3 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/.gitignore b/.gitignore
index e0a2f70..c4d0070 100644
--- a/.gitignore
+++ b/.gitignore
@@ -8,3 +8,4 @@ lirc-0.8.7pre2.tar.bz2
 /lirc-0.9.0-pre1.tar.bz2
 /lirc-0.9.2.tar.gz
 /lirc-0.9.2a.tar.gz
+/lirc-0.9.3.tar.gz
diff --git a/lirc.spec b/lirc.spec
index 0fda52f..b267bbd 100644
--- a/lirc.spec
+++ b/lirc.spec
@@ -10,9 +10,9 @@ Name:           lirc
 Version:        0.9.3
 %global         src_vers  %(echo %{version} | sed 's/_/-/g' )
 %if 0%{?released}
-Release:        1%{?dist}
+Release:        2%{?dist}
 %else
-Release:        0.4.pre3%{tag}
+Release:        0.5.pre3%{tag}
 %endif
 
 Summary:        The Linux Infrared Remote Control package
@@ -377,6 +377,9 @@ find /etc/systemd -name lirc.service -xtype l -delete || :
 %{_udevrulesdir}/99-remote-control-lirc.rules
 
 %changelog
+* Sun Sep 06 2015 Alec Leamas <leamas.alec@gmail.com> - 0.9.3-2
+- Rebuilt
+
 * Sat Sep 05 2015 Alec Leamas <leamas.alec@gmail.com> - 0.9.3-1
 - New upstream version.
 
diff --git a/sources b/sources
index 42ff06b..262bceb 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-c39d6bc901157c308163e6fd58727346  lirc-0.9.2a.tar.gz
+1f7e13d664726ad2d685bc4bdebb8bba  lirc-0.9.3.tar.gz

From 719bed2c005e8005681d4b0e06e5b1c245902b8d Mon Sep 17 00:00:00 2001
From: Alec Leamas <leamas.alec@gmail.com>
Date: Sun, 6 Sep 2015 20:53:05 +0200
Subject: [PATCH 147/204] 0.9.3-3: Fix missing lirc-drv-irman

---
 lirc.spec | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/lirc.spec b/lirc.spec
index b267bbd..e088c7f 100644
--- a/lirc.spec
+++ b/lirc.spec
@@ -10,9 +10,9 @@ Name:           lirc
 Version:        0.9.3
 %global         src_vers  %(echo %{version} | sed 's/_/-/g' )
 %if 0%{?released}
-Release:        2%{?dist}
+Release:        3%{?dist}
 %else
-Release:        0.5.pre3%{tag}
+Release:        0.6.pre3%{tag}
 %endif
 
 Summary:        The Linux Infrared Remote Control package
@@ -279,11 +279,9 @@ find /etc/systemd -name lirc.service -xtype l -delete || :
 %{_datadir}/lirc/configs/iguanaIR.conf
 
 
-%if 0
 %files drv-irman
 %{_libdir}/lirc/plugins/irman.so
 %{_datadir}/lirc/configs/irman.conf
-%endif
 
 %files drv-portaudio
 %{_libdir}/lirc/plugins/audio.so
@@ -377,6 +375,9 @@ find /etc/systemd -name lirc.service -xtype l -delete || :
 %{_udevrulesdir}/99-remote-control-lirc.rules
 
 %changelog
+* Sun Sep 06 2015 Alec Leamas <leamas.alec@gmail.com> - 0.9.3-3
+- Fix missing lirc-drv-irman.
+
 * Sun Sep 06 2015 Alec Leamas <leamas.alec@gmail.com> - 0.9.3-2
 - Rebuilt
 

From a0e1f48424c026ab12455151d4a29cd130c2e9ca Mon Sep 17 00:00:00 2001
From: Alec Leamas <leamas.alec@gmail.com>
Date: Sun, 6 Sep 2015 20:53:05 +0200
Subject: [PATCH 148/204] 0.9.3-3: Fix missing lirc-drv-irman

---
 lirc.spec | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/lirc.spec b/lirc.spec
index b267bbd..e088c7f 100644
--- a/lirc.spec
+++ b/lirc.spec
@@ -10,9 +10,9 @@ Name:           lirc
 Version:        0.9.3
 %global         src_vers  %(echo %{version} | sed 's/_/-/g' )
 %if 0%{?released}
-Release:        2%{?dist}
+Release:        3%{?dist}
 %else
-Release:        0.5.pre3%{tag}
+Release:        0.6.pre3%{tag}
 %endif
 
 Summary:        The Linux Infrared Remote Control package
@@ -279,11 +279,9 @@ find /etc/systemd -name lirc.service -xtype l -delete || :
 %{_datadir}/lirc/configs/iguanaIR.conf
 
 
-%if 0
 %files drv-irman
 %{_libdir}/lirc/plugins/irman.so
 %{_datadir}/lirc/configs/irman.conf
-%endif
 
 %files drv-portaudio
 %{_libdir}/lirc/plugins/audio.so
@@ -377,6 +375,9 @@ find /etc/systemd -name lirc.service -xtype l -delete || :
 %{_udevrulesdir}/99-remote-control-lirc.rules
 
 %changelog
+* Sun Sep 06 2015 Alec Leamas <leamas.alec@gmail.com> - 0.9.3-3
+- Fix missing lirc-drv-irman.
+
 * Sun Sep 06 2015 Alec Leamas <leamas.alec@gmail.com> - 0.9.3-2
 - Rebuilt
 

From 59f2b49f648668efebcbf0c57d98815796687c15 Mon Sep 17 00:00:00 2001
From: Alec Leamas <leamas.alec@gmail.com>
Date: Mon, 7 Sep 2015 13:57:22 +0200
Subject: [PATCH 149/204] 0.9.4: Add missing file database.py patch.

---
 ...s-instead-of-printf-when-applicalble.patch | 1022 ----------------
 ...-missing-file-lirc-setup-database.py.patch |  185 +++
 ...ts-instead-of-printf-when-applicable.patch | 1031 -----------------
 lirc.spec                                     |    9 +-
 4 files changed, 192 insertions(+), 2055 deletions(-)
 delete mode 100644 0002-Use-puts-instead-of-printf-when-applicalble.patch
 create mode 100644 0002-tools-Add-missing-file-lirc-setup-database.py.patch
 delete mode 100644 0003-all-Use-puts-instead-of-printf-when-applicable.patch

diff --git a/0002-Use-puts-instead-of-printf-when-applicalble.patch b/0002-Use-puts-instead-of-printf-when-applicalble.patch
deleted file mode 100644
index c0437e5..0000000
--- a/0002-Use-puts-instead-of-printf-when-applicalble.patch
+++ /dev/null
@@ -1,1022 +0,0 @@
-From 0be5fe98430ce738d0c176245cc4ee564bbc3fd2 Mon Sep 17 00:00:00 2001
-From: Alec Leamas <leamas.alec@gmail.com>
-Date: Mon, 9 Feb 2015 13:00:06 +0100
-Subject: [PATCH] Use puts instead of printf when applicalble
-
-Recent gcc generates warnings when using printf instead
-of puts()/fputs() when applicable.
----
- daemons/lircd.c        |   4 +-
- daemons/lircmd.c       |   2 +-
- lib/lirc_client.c      |   2 +
- tools/irrecord.c       | 105 +++++++++++++++++++++++++------------------------
- tools/irsend.c         |   2 +-
- tools/irsimreceive.c   |  26 ++++++------
- tools/irsimsend.c      |  14 +++----
- tools/irtestcase.c     |  27 ++++++-------
- tools/lirc-lsplugins.c |  34 ++++++++--------
- tools/lirc-lsremotes.c |  14 +++----
- tools/mode2.c          |  32 +++++++--------
- tools/xmode2.c         |  23 +++++------
- 12 files changed, 144 insertions(+), 141 deletions(-)
-
-diff --git a/daemons/lircd.c b/daemons/lircd.c
-index 4c8e37b..3af27d9 100644
---- a/daemons/lircd.c
-+++ b/daemons/lircd.c
-@@ -2285,7 +2285,7 @@ static void lircd_parse_options(int argc, char** const argv)
- 	{
- 		switch (c) {
- 		case 'h':
--			printf(help);
-+			puts(help);
- 			exit(EXIT_SUCCESS);
- 		case 'v':
- 			printf("lircd %s\n", VERSION);
-@@ -2433,7 +2433,7 @@ int main(int argc, char **argv)
- 		opt = options_getstring("lircd:listen_hostport");
- 		if (opt){
- 			if (opt2host_port(opt, &address, &port, errmsg) != 0){
--				fprintf(stderr, errmsg);
-+				fputs(errmsg, stderr);
- 				return(EXIT_FAILURE);
- 			}
- 		} else
-diff --git a/daemons/lircmd.c b/daemons/lircmd.c
-index 023777c..869b3a9 100644
---- a/daemons/lircmd.c
-+++ b/daemons/lircmd.c
-@@ -784,7 +784,7 @@ static void lircmd_parse_options(int argc,  char** const argv)
- 	{
- 		switch (c) {
- 		case 'h':
--			printf(help);
-+			puts(help);
- 			exit(EXIT_SUCCESS);
- 		case 'v':
- 			printf("lircmd %s\n",  VERSION);
-diff --git a/lib/lirc_client.c b/lib/lirc_client.c
-index df2eaef..a0e3333 100644
---- a/lib/lirc_client.c
-+++ b/lib/lirc_client.c
-@@ -105,6 +105,8 @@ chk_write(int fd, const void *buf, size_t count, const char* msg)
- 		perror(msg);
- 	}
- }
-+
-+
- int lirc_command_init(lirc_cmd_ctx* ctx, const char* fmt, ...)
- {
- 	va_list ap;
-diff --git a/tools/irrecord.c b/tools/irrecord.c
-index f52328c..788e425 100644
---- a/tools/irrecord.c
-+++ b/tools/irrecord.c
-@@ -339,7 +339,7 @@ static void parse_options(int argc, char** const argv)
- 			options_set_opt("irrecord:driver", optarg);
- 			break;
- 		case 'h':
--			printf(help);
-+			puts(help);
- 			exit(EXIT_SUCCESS);
- 		case 'i':
- 			options_set_opt("irrecord:invert", "True");
-@@ -374,14 +374,14 @@ static void parse_options(int argc, char** const argv)
- 			printf("irrecord %s\n",  VERSION);
- 			exit(EXIT_SUCCESS);
- 		default:
--			fprintf(stderr, USAGE);
-+			fputs(USAGE, stderr);
- 			exit(EXIT_FAILURE);
- 		}
- 	}
- 	if (optind == argc - 1) {
- 		options_set_opt("configfile", argv[optind]);
- 	} else if (optind != argc) {
--		fprintf(stderr, "irrecord: invalid argument count\n");
-+		fputs("irrecord: invalid argument count\n", stderr);
- 		exit(EXIT_FAILURE);
- 	}
- }
-@@ -416,7 +416,7 @@ int main(int argc, char **argv)
- 	analyse = options_getboolean("irrecord:analyse");
- 	if (hw_choose_driver(opt) != 0 && ! analyse) {
- 		fprintf(stderr, "Driver `%s' not found", opt);
--		fprintf(stderr, " (wrong or missing -U/--plugindir?).\n");
-+		fputs(" (wrong or missing -U/--plugindir?).\n", stderr);
- 		hw_print_drivers(stderr);
- 		exit(EXIT_FAILURE);
- 	}
-@@ -526,9 +526,9 @@ int main(int argc, char **argv)
- 		perror(progname);
- 		exit(EXIT_FAILURE);
- 	}
--	printf("\nirrecord -  application for recording IR-codes" " for usage with lirc\n" "\n"
-+	puts("\nirrecord -  application for recording IR-codes" " for usage with lirc\n" "\n"
- 	       "Copyright (C) 1998,1999 Christoph Bartelmus" "(lirc@bartelmus.de)\n");
--	printf("\n");
-+	puts("\n");
- 
- 	if (curr_driver->init_func) {
- 		if (!curr_driver->init_func()) {
-@@ -561,16 +561,16 @@ int main(int argc, char **argv)
- 		exit(EXIT_FAILURE);
- 	}
- 
--	printf("This program will record the signals from your remote control\n"
-+	puts("This program will record the signals from your remote control\n"
- 	       "and create a config file for lircd.\n\n" "\n");
- 	if (curr_driver->name && strcmp(curr_driver->name, "devinput") == 0) {
--		printf("Usually it's not necessary to create a new config file for devinput\n"
-+		puts("Usually it's not necessary to create a new config file for devinput\n"
- 		       "devices. A generic config file can be found at:\n"
- 		       "https://sourceforge.net/p/lirc-remotes/code/ci/master/tree/remotes/devinput/devinput.lircd.conf"
- 		       "It can be downloaded using irdb-get(1)\n"
- 		       "Please try this config file before creating your own.\n" "\n");
- 	}
--	printf("A proper config file for lircd is maybe the most vital part of this\n"
-+	puts("A proper config file for lircd is maybe the most vital part of this\n"
- 	       "package, so you should invest some time to create a working config\n"
- 	       "file. Although I put a good deal of effort in this program it is often\n"
- 	       "not possible to automatically recognize all features of a remote\n"
-@@ -610,7 +610,7 @@ int main(int argc, char **argv)
- 					curr_driver->deinit_func();
- 				exit(EXIT_FAILURE);
- 			}
--			printf("Creating config file in raw mode.\n");
-+			puts("Creating config file in raw mode.\n");
- 			set_protocol(&remote, RAW_CODES);
- 			remote.eps = eps;
- 			remote.aeps = aeps;
-@@ -643,7 +643,7 @@ int main(int argc, char **argv)
- 			curr_driver->rec_func(NULL);
- 		}
- 		if (!get_toggle_bit_mask(&remote)) {
--			printf("But I know for sure that RC6 has a toggle bit!\n");
-+			puts("But I know for sure that RC6 has a toggle bit!\n");
- 			fclose(fout);
- 			unlink(filename);
- 			if (curr_driver->deinit_func)
-@@ -651,7 +651,7 @@ int main(int argc, char **argv)
- 			exit(EXIT_FAILURE);
- 		}
- 	}
--	printf("Now enter the names for the buttons.\n");
-+	puts("Now enter the names for the buttons.\n");
- 
- 	fprint_copyright(fout);
- 	fprint_comment(fout, &remote, commandline);
-@@ -663,8 +663,8 @@ int main(int argc, char **argv)
- 
- 		if (no_data) {
- 			fprintf(stderr, "%s: no data for 10 secs," " aborting\n", progname);
--			printf("The last button did not seem to generate any signal.\n");
--			printf("Press RETURN to continue.\n\n");
-+			puts("The last button did not seem to generate any signal.\n");
-+			puts("Press RETURN to continue.\n\n");
- 			getchar();
- 			no_data = 0;
- 		}
-@@ -678,13 +678,13 @@ int main(int argc, char **argv)
- 		}
- 		buffer[strlen(buffer) - 1] = 0;
- 		if (strchr(buffer, ' ') || strchr(buffer, '\t')) {
--			printf("The name must not contain any whitespace.\n");
--			printf("Please try again.\n");
-+			puts("The name must not contain any whitespace.\n");
-+			puts("Please try again.\n");
- 			continue;
- 		}
- 		if (strcasecmp(buffer, "begin") == 0 || strcasecmp(buffer, "end") == 0) {
- 			printf("'%s' is not allowed as button name\n", buffer);
--			printf("Please try again.\n");
-+			puts("Please try again.\n");
- 			continue;
- 		}
- 		if (strlen(buffer) == 0) {
-@@ -693,7 +693,7 @@ int main(int argc, char **argv)
- 		if (!disable_namespace && !is_in_namespace(buffer)) {
- 			printf("'%s' is not in name space (use --disable-namespace to disable checks)\n", buffer);
- 			printf("Use '%s --list-namespace' to see a full list of valid button names\n", progname);
--			printf("Please try again.\n");
-+			puts("Please try again.\n");
- 			continue;
- 		}
- 
-@@ -730,9 +730,9 @@ int main(int argc, char **argv)
- 				}
- 				if (count == 0) {
- 					if (!is_space(data) || data < remote.gap - remote.gap * remote.eps / 100) {
--						printf("Sorry, something went wrong.\n");
-+						puts("Sorry, something went wrong.\n");
- 						sleep(3);
--						printf("Try again.\n");
-+						puts("Try again.\n");
- 						flushhw();
- 						count = 0;
- 						continue;
-@@ -742,13 +742,13 @@ int main(int argc, char **argv)
- 					    && (is_const(&remote) ? data >
- 						(remote.gap > sum ? (remote.gap - sum) * (100 - remote.eps) / 100 : 0)
- 						: data > remote.gap * (100 - remote.eps) / 100)) {
--						printf("Got it.\n");
-+						puts("Got it.\n");
- 						printf("Signal length is %d\n", count - 1);
- 						if (count % 2) {
--							printf("That's weird because the signal length "
-+							puts("That's weird because the signal length "
- 							       "must be odd!\n");
- 							sleep(3);
--							printf("Try again.\n");
-+							puts("Try again.\n");
- 							flushhw();
- 							count = 0;
- 							continue;
-@@ -766,7 +766,7 @@ int main(int argc, char **argv)
- 				count++;
- 			}
- 			if (count == MAX_SIGNALS) {
--				printf("Signal is too long.\n");
-+				puts("Signal is too long.\n");
- 			}
- 			if (retval == EXIT_FAILURE)
- 				break;
-@@ -814,7 +814,7 @@ int main(int argc, char **argv)
- 				}
- 				break;
- 			} else {
--				printf("Something went wrong. ");
-+				puts("Something went wrong. ");
- 				if (retries > 1) {
- 					fflush(stdout);
- 					sleep(3);
-@@ -826,8 +826,8 @@ int main(int argc, char **argv)
- 					flushhw();
- 					printf("Please try again. (%d retries left)\n", retries - 1);
- 				} else {
--					printf("\n");
--					printf("Try using the -f option.\n");
-+					puts("\n");
-+					puts("Try using the -f option.\n");
- 				}
- 				retries--;
- 				continue;
-@@ -1033,8 +1033,8 @@ int get_toggle_bit_mask(struct ir_remote *remote)
- 		}
- 	}
- 
--	printf("Checking for toggle bit mask.\n");
--	printf("Please press an arbitrary button repeatedly as fast as possible.\n"
-+	puts("Checking for toggle bit mask.\n");
-+	puts("Please press an arbitrary button repeatedly as fast as possible.\n"
- 	       "Make sure you keep pressing the SAME button and that you DON'T HOLD\n" "the button down!.\n"
- 	       "If you can't see any dots appear, then wait a bit between button presses.\n" "\n"
- 	       "Press RETURN to continue.");
-@@ -1089,7 +1089,7 @@ int get_toggle_bit_mask(struct ir_remote *remote)
- 					set_toggle_bit_mask(remote, first ^ decode_ctx.code);
- 					found = 1;
- 				}
--				printf(".");
-+				puts(".");
- 				fflush(stdout);
- 				retries--;
- 			} else {
-@@ -1101,12 +1101,12 @@ int get_toggle_bit_mask(struct ir_remote *remote)
- 		}
- 	}
- 	if (!found) {
--		printf("\nNo toggle bit mask found.\n");
-+		puts("\nNo toggle bit mask found.\n");
- 	} else {
- 		if (remote->toggle_bit_mask > 0) {
- 			printf("\nToggle bit mask is 0x%llx.\n", (__u64) remote->toggle_bit_mask);
- 		} else if (remote->toggle_mask != 0) {
--			printf("\nToggle mask found.\n");
-+			puts("\nToggle mask found.\n");
- 		}
- 	}
- 	if (seq > 0)
-@@ -1533,12 +1533,12 @@ int get_lengths(struct ir_remote *remote, int force, int interactive)
- 	int first_signal;
- 
- 	if (interactive) {
--		printf("Now start pressing buttons on your remote control.\n\n");
--		printf("It is very important that you press many different buttons and hold them\n"
-+		puts("Now start pressing buttons on your remote control.\n\n");
-+		puts("It is very important that you press many different buttons and hold them\n"
- 		       "down for approximately one second. Each button should generate at least one\n"
- 		       "dot but in no case more than ten dots of output.\n"
- 		       "Don't stop pressing buttons until two lines of dots (2x80) have been\n" "generated.\n\n");
--		printf("Press RETURN now to start recording.");
-+		puts("Press RETURN now to start recording.");
- 		fflush(stdout);
- 		getchar();
- 		flushhw();
-@@ -1647,7 +1647,7 @@ int get_lengths(struct ir_remote *remote, int force, int interactive)
- 
- 					if (interactive) {
- 						for (i = maxcount - lastmaxcount; i > 0; i--) {
--							printf(".");
-+							puts(".");
- 							fflush(stdout);
- 						}
- 					}
-@@ -1715,7 +1715,7 @@ int get_lengths(struct ir_remote *remote, int force, int interactive)
- 						int i;
- 
- 						if (interactive) {
--							printf(".");
-+							puts(".");
- 							fflush(stdout);
- 						}
- 						count_signals++;
-@@ -2130,7 +2130,7 @@ int get_repeat_length(struct ir_remote *remote, int interactive)
- 
- 	if (!((count_3repeats > SAMPLES / 2 ? 1 : 0) ^ (count_5repeats > SAMPLES / 2 ? 1 : 0))) {
- 		if (count_3repeats > SAMPLES / 2 || count_5repeats > SAMPLES / 2) {
--			printf("Repeat inconsitentcy.\n");
-+			puts("Repeat inconsitentcy.\n");
- 			return (0);
- 		}
- 		i_printf(interactive, "No repeat code found.\n");
-@@ -2151,7 +2151,7 @@ int get_repeat_length(struct ir_remote *remote, int interactive)
- 		}
- 		if (max_count >= sum * TH_REPEAT / 100) {
- 			if (count_5repeats > count_3repeats && !has_header(remote)) {
--				printf("Repeat code has header," " but no header found!\n");
-+				puts("Repeat code has header," " but no header found!\n");
- 				return (0);
- 			}
- 			if (count_5repeats > count_3repeats && has_header(remote)) {
-@@ -2199,7 +2199,7 @@ void unlink_length(struct lengths **first, struct lengths *remove)
- 			scan = scan->next;
- 		}
- 	}
--	printf("unlink_length(): report this bug!\n");
-+	puts("unlink_length(): report this bug!\n");
- }
- 
- int get_data_length(struct ir_remote *remote, int interactive)
-@@ -2224,12 +2224,12 @@ int get_data_length(struct ir_remote *remote, int interactive)
- 				max2_plength = NULL;
- 		}
- 		if (lirc_log_is_enabled_for(LIRC_DEBUG)) {
--			printf("Pulse canditates: ");
-+			puts("Pulse canditates: ");
- 			printf("%u x %u", max_plength->count, (__u32) calc_signal(max_plength));
- 			if (max2_plength)
- 				printf(", %u x %u", max2_plength->count, (__u32)
- 				       calc_signal(max2_plength));
--			printf("\n");
-+			puts("\n");
- 		}
- 
- 		max_slength = get_max_length(first_space, &sum);
-@@ -2247,21 +2247,21 @@ int get_data_length(struct ir_remote *remote, int interactive)
- 			}
- 			if (lirc_log_is_enabled_for(LIRC_DEBUG)) {
- 				if (max_count >= sum * TH_IS_BIT / 100) {
--					printf("Space candidates: ");
-+					puts("Space candidates: ");
- 					printf("%u x %u", max_slength->count,
- 					       (__u32) calc_signal(max_slength));
- 					if (max2_slength)
- 						printf(", %u x %u",
- 						       max2_slength->count,
- 						       (__u32) calc_signal(max2_slength));
--					printf("\n");
-+					puts("\n");
- 				}
- 			}
- 			remote->eps = eps;
- 			remote->aeps = aeps;
- 			if (is_biphase(remote)) {
- 				if (max2_plength == NULL || max2_slength == NULL) {
--					printf("Unknown encoding found.\n");
-+					puts("Unknown encoding found.\n");
- 					return (0);
- 				}
- 				i_printf(interactive, "Signals are biphase encoded.\n");
-@@ -2276,11 +2276,11 @@ int get_data_length(struct ir_remote *remote, int interactive)
- 				remote->szero = remote->sone;
- 			} else {
- 				if (max2_plength == NULL && max2_slength == NULL) {
--					printf("No encoding found.\n");
-+					puts("No encoding found.\n");
- 					return (0);
- 				}
- 				if (max2_plength && max2_slength) {
--					printf("Unknown encoding found.\n");
-+					puts("Unknown encoding found.\n");
- 					return (0);
- 				}
- 				p1 = calc_signal(max_plength);
-@@ -2348,7 +2348,7 @@ int get_data_length(struct ir_remote *remote, int interactive)
- 		}
- 		free_lengths(&max_plength);
- 	}
--	printf("Could not find data lengths.\n");
-+	puts("Could not find data lengths.\n");
- 	return (0);
- }
- 
-@@ -2366,7 +2366,7 @@ int get_gap_length(struct ir_remote *remote)
- 
- 	flag = 0;
- 	lastmaxcount = 0;
--	printf("Hold down an arbitrary button.\n");
-+	puts("Hold down an arbitrary button.\n");
- 	while (1) {
- 		while (availabledata()) {
- 			curr_driver->rec_func(NULL);
-@@ -2398,7 +2398,7 @@ int get_gap_length(struct ir_remote *remote)
- 			}
- 			if (maxcount > lastmaxcount) {
- 				lastmaxcount = maxcount;
--				printf(".");
-+				puts(".");
- 				fflush(stdout);
- 			}
- 		} else {
-@@ -2411,9 +2411,10 @@ int get_gap_length(struct ir_remote *remote)
- 
- void fprint_copyright(FILE * fout)
- {
--	fprintf(fout, "\n"
-+	fputs("\n"
- 		"# Please take the time to finish this file as described in\n"
- 		"# https://sourceforge.net/p/lirc-remotes/wiki/Checklist/\n"
- 		"# and make it available to others by sending it to \n"
--		"# <lirc@bartelmus.de>\n");
-+		"# <lirc@bartelmus.de>\n",
-+                fout);
- }
-diff --git a/tools/irsend.c b/tools/irsend.c
-index 9a3fabc..16ee8d4 100644
---- a/tools/irsend.c
-+++ b/tools/irsend.c
-@@ -117,7 +117,7 @@ int main(int argc, char **argv)
- 			break;
- 		switch (c) {
- 		case 'h':
--			printf(help);
-+			fputs(help, stdout);
- 			return (EXIT_SUCCESS);
- 		case 'v':
- 			printf("%s %s\n", prog, VERSION);
-diff --git a/tools/irsimreceive.c b/tools/irsimreceive.c
-index 4a5a3b8..3c3d0bb 100644
---- a/tools/irsimreceive.c
-+++ b/tools/irsimreceive.c
-@@ -43,25 +43,25 @@ static void setup(const char* path)
- 		exit(EXIT_FAILURE);
- 	}
- 	if (hw_choose_driver("file") == -1) {
--		fprintf(stderr,
--			"Cannot load file driver (bad plugin path?)\n");
-+		fputs("Cannot load file driver (bad plugin path?)\n",
-+                      stderr);
- 		exit(EXIT_FAILURE);
- 	}
- 	r = curr_driver->open_func("dummy.out");
- 	if (r == 0) {
--		fprintf(stderr, "Cannot open driver\n");
-+		fputs("Cannot open driver\n", stderr);
- 		exit(EXIT_FAILURE);
- 	}
- 	r = curr_driver->init_func();
- 	if (r == 0) {
--		fprintf(stderr, "Cannot init driver\n");
-+		fputs("Cannot init driver\n", stderr);
- 		exit(EXIT_FAILURE);
- 	}
- 	strcpy(option.key, "set-infile");
- 	strncpy(option.value, path, sizeof(option.value));
- 	r = curr_driver->drvctl_func(DRVCTL_SET_OPTION, (void*) &option);
- 	if (r != 0) {
--		fprintf(stderr, "Cannot set driver infile.\n");
-+		fputs("Cannot set driver infile.\n", stderr);
- 		exit(EXIT_FAILURE);
- 	}
- }
-@@ -102,7 +102,7 @@ void printcode(char* s)
- 	int len;
- 
- 	if (s == NULL) {
--		printf( "None\n");
-+		puts("None\n");
- 	} else {
- 		len = strlen(s);
-                 if (strlen(s) > 2 && s[len -1] == '\n') {
-@@ -140,23 +140,23 @@ int main(int argc, char *argv[])
- 	       != EOF) {
- 		switch (c) {
- 		case 'h':
--			printf(USAGE);
--			return (EXIT_SUCCESS);
-+			puts(USAGE);
-+			return EXIT_SUCCESS;
- 		case 'v':
- 			printf("%s\n", "irw " VERSION);
--			return (EXIT_SUCCESS);
-+			return EXIT_SUCCESS;
- 		case 'U':
- 			options_set_opt("lircd:pluginpath", optarg);
- 			break;
- 		case '?':
- 			fprintf(stderr, "unrecognized option: -%c\n", optopt);
--			fprintf(stderr,
--                                "Try `irsimsend -h' for more information.\n");
--			return (EXIT_FAILURE);
-+			fputs("Try `irsimsend -h' for more information.\n",
-+                              stderr);
-+			return EXIT_FAILURE;
- 		}
- 	}
- 	if (argc != optind + 2) {
--		fprintf(stderr, USAGE);
-+		fputs(USAGE, stderr);
- 		return EXIT_FAILURE;
- 	}
- 	lirc_log_get_clientlog("irsimreceive", path, sizeof(path));
-diff --git a/tools/irsimsend.c b/tools/irsimsend.c
-index b72831a..7572d84 100644
---- a/tools/irsimsend.c
-+++ b/tools/irsimsend.c
-@@ -65,8 +65,8 @@ static struct ir_remote* setup(const char* path)
- 	FILE* f;
- 
- 	if (hw_choose_driver("file") == -1) {
--		fprintf(stderr,
--			"Cannot load file driver (bad plugin path?)\n");
-+		fputs("Cannot load file driver (bad plugin path?)\n",
-+                       stderr);
- 		exit(EXIT_FAILURE);
- 	}
- 	unlink(OUTFILE);
-@@ -196,7 +196,7 @@ int parse_uint_arg(const char* optind, const char* errmsg)
- 
- 	c = strtol(optarg, NULL, 10);
- 	if (c > INT_MAX || c < 0 || errno == EINVAL || errno == ERANGE) {
--		fprintf(stderr, errmsg);
-+		fputs(errmsg, stderr);
- 		exit(EXIT_FAILURE);
- 	}
- 	return (int) c;
-@@ -213,7 +213,7 @@ int main(int argc, char *argv[])
- 	       != EOF) {
- 		switch (c) {
- 		case 'h':
--			printf(USAGE);
-+			puts(USAGE);
- 			return (EXIT_SUCCESS);
- 		case 'c':
- 			opt_count = parse_uint_arg(optarg,
-@@ -237,13 +237,13 @@ int main(int argc, char *argv[])
- 			break;
- 		case '?':
- 			fprintf(stderr, "unrecognized option: -%c\n", optopt);
--			fprintf(stderr,
--                                "Try `irsimsend -h' for more information.\n");
-+			fputs("Try `irsimsend -h' for more information.\n",
-+                               stderr);
- 			return (EXIT_FAILURE);
- 		}
- 	}
- 	if (argc != optind + 1) {
--		fprintf(stderr, USAGE);
-+		fputs(USAGE, stderr);
- 		return EXIT_FAILURE;
- 	}
- 	lirc_log_get_clientlog("irsimsend", path, sizeof(path));
-diff --git a/tools/irtestcase.c b/tools/irtestcase.c
-index 95d59b7..149c1ad 100644
---- a/tools/irtestcase.c
-+++ b/tools/irtestcase.c
-@@ -92,7 +92,7 @@ static void set_testinput(int fd, const char* path)
- 	lirc_command_init(&command, "DRV_OPTION set-infile %s\n", path);
- 	r = lirc_command_run(&command, fd);
- 	if (r != 0) {
--		fprintf(stderr, "Cannot set test input file\n");
-+		fputs("Cannot set test input file\n", stderr);
- 		exit(2);
- 	}
- }
-@@ -137,7 +137,7 @@ static int nextcode(int fd, char* buff, ssize_t size)
- 		exit(errno);
- 	};
- 	if (strstr(buff, "__EOF") != NULL) {
--		printf("Exit on EOF\n");
-+		puts("Exit on EOF\n");
- 		exit(0);
- 	}
- 	if (i >= 0) {
-@@ -176,16 +176,16 @@ static int irtestcase(int fd_io, int fd_cmd)
- 
- 	if (opt_lircrc != NULL) {
- 		if (lirc_readconfig_only(opt_lircrc, &config, NULL) != 0) {
--			fprintf(stderr, "Cannot initiate lircrc decoding\n");
-+			fputs("Cannot initiate lircrc decoding\n", stderr);
- 			exit(2);
- 		}
- 	}
- 	while (nextcode(fd_io, code, sizeof(code)) == 1) {
--		printf(code);
-+		puts(code);
- 		if (strstr(code, "__EOF") != NULL) {
- 			exit(0);
- 		}
--		fprintf(code_log, code);
-+		fputs(code, code_log);
- 		if (opt_lircrc != NULL){
- 			r = lirc_code2char(config, code, &c);
- 			while (r == 0 && c != NULL) {
-@@ -222,36 +222,35 @@ int main(int argc, char *argv[])
- 			opt_testdata = optarg;
- 			break;
- 		case 'h':
--			printf(USAGE);
-+			puts(USAGE);
- 			return (EXIT_SUCCESS);
- 		case 'v':
- 			printf("%s\n", "irtestcase " VERSION);
- 			return (EXIT_SUCCESS);
- 		case '?':
- 			fprintf(stderr, "unrecognized option: -%c\n", optopt);
--			fprintf(stderr, "Try `irtestcase --help'.\n");
-+			fputs("Try `irtestcase --help'.\n", stderr);
- 			return (EXIT_FAILURE);
- 		}
- 	}
- 	if (argc > optind + 1) {
--		fprintf(stderr,
--			"irtestcase: Too many arguments (max one).\n");
--		fprintf(stderr, "Try `irtestcase --help'.\n");
-+		fputs("irtestcase: Too many arguments (max one).\n", stderr);
-+		fputs("Try `irtestcase --help'.\n", stderr);
- 		return (EXIT_FAILURE);
- 	}
- 	if (strcmp(opt_prog, DEFAULT_PROG) != 0 && opt_lircrc == NULL) {
--		fprintf(stderr, "--prog requires --lircrc/-l. Giving up.\n");
-+		fputs("--prog requires --lircrc/-l. Giving up.\n", stderr);
- 		return (EXIT_FAILURE);
- 	}
- 	if (opt_lircrc != NULL && strcmp(opt_prog, DEFAULT_PROG) == 0) {
--		fprintf(stderr, "--lircrc requires --prog/-p. Giving up.\n");
-+		fputs("--lircrc requires --prog/-p. Giving up.\n", stderr);
- 		return (EXIT_FAILURE);
- 	}
- 
- 	init_testdir();
- 	fd_cmd = lirc_get_local_socket(NULL, 1);
- 	if (fd_cmd < 0) {
--		fprintf(stderr, "Cannot open lircd socket.\n");
-+		fputs("Cannot open lircd socket.\n", stderr);
- 		exit(3);
- 	}
- 	set_devicelog(fd_cmd, DEVICE_LOG);
-@@ -267,7 +266,7 @@ int main(int argc, char *argv[])
- 	setenv("LIRC_SOCKET_PATH", socketpath, 0);
- 	fd_io = lirc_init(opt_prog, 1);
- 	if (fd_io < 0) {
--		fprintf(stderr, "Cannot run lirc_init.\n");
-+		fputs("Cannot run lirc_init.\n", stderr);
- 		exit(3);
- 	}
- 
-diff --git a/tools/lirc-lsplugins.c b/tools/lirc-lsplugins.c
-index 9eceb3b..677cbb3 100644
---- a/tools/lirc-lsplugins.c
-+++ b/tools/lirc-lsplugins.c
-@@ -111,7 +111,7 @@ static void  lines_next(line_t* line)
- {
- 	lines[line_ix++] = line;
- 	if (line_ix >= MAX_PLUGINS -1){
--		fprintf(stderr, "Too many plugins, giving up. Sorry.");
-+		fputs("Too many plugins, giving up. Sorry.", stderr);
- 		exit(2);
- 	}
- }
-@@ -152,7 +152,7 @@ static void line_print(const line_t* line)
- 	printf("%-20s%-6s%s\n",
-                line->name,  line->flags, line->path);
- 	if (line->errors)
--		printf(line->errors);
-+		puts(line->errors);
- }
- 
- static void print_folded_item(const char* arg)
-@@ -163,7 +163,7 @@ static void print_folded_item(const char* arg)
- 	char* token;
- 
- 	if (arg == NULL) {
--		printf("None\n");
-+		puts("None\n");
- 		return;
- 	}
- 	buff = alloca(strlen(arg) + 1);
-@@ -171,18 +171,18 @@ static void print_folded_item(const char* arg)
- 	token = strtok(buff, " \t");
- 	while (token != NULL) {
- 		if (strlen(token) + pos > 80) {
--			printf("\n\t\t");
-+			puts("\n\t\t");
- 			pos = 0;
- 		}
- 		if (pos != START_POS && pos != 0){
--			printf(" ");
-+			puts(" ");
- 			pos += 1;
- 		}
--		printf(token);
-+		puts(token);
- 		pos += strlen(token);
- 		token = strtok(NULL, " \t");
- 	}
--	printf("\n");
-+	puts("\n");
- }
- 
- 
-@@ -220,7 +220,7 @@ static void line_print_long(const line_t* line)
- 	printf("Version:\t%s\n", line->version ? line->version : "(None)");
- 	printf("Driver info:\t");
- 	print_folded_item(line->info);
--	printf("\n");
-+	puts("\n");
- }
- 
- 
-@@ -356,13 +356,13 @@ void lsplugins(const char* pluginpath, const char* which)
- 		}
- 	}
- 	if (!opt_quiet) {
--		printf("#\n#\n");
-+		puts("#\n#\n");
- 		if (!opt_long) {
--			printf(LEGEND);
--			printf("#\n");
-+			puts(LEGEND);
-+			puts("#\n");
- 		}
- 		if (opt_long)
--			printf(LONG_LEGEND);
-+			puts(LONG_LEGEND);
- 		}
- }
- 
-@@ -383,10 +383,10 @@ int main(int argc, char** argv)
- 				pluginpath = optarg;
- 				break;
- 			case 'h':
--				printf(USAGE);
-+				puts(USAGE);
- 				exit(0);
- 			case 'v':
--				printf("Version: " VERSION "\n");
-+				puts("Version: " VERSION "\n");
- 				exit(0);
- 			case 'p':
- 				printf("Default path: %s\n", pluginpath);
-@@ -404,13 +404,13 @@ int main(int argc, char** argv)
- 				opt_long = 1;
- 				break;
- 			default:
--				fprintf(stderr, USAGE);
-+				fputs(USAGE, stderr);
- 				exit(1);
- 		}
- 	}
-         if (argc - optind  >  1) {
--		fprintf(stderr, "Too many arguments.\n");
--                fprintf(stderr, USAGE);
-+		fputs("Too many arguments.\n", stderr);
-+                fputs(USAGE, stderr);
-                 exit(2);
-         }
- 	which = (argc - optind == 1 ?  argv[argc - 1] : "*");
-diff --git a/tools/lirc-lsremotes.c b/tools/lirc-lsremotes.c
-index 2ac7dad..11e806a 100644
---- a/tools/lirc-lsremotes.c
-+++ b/tools/lirc-lsremotes.c
-@@ -258,16 +258,16 @@ int main(int argc, char** argv)
- 			opt_silent = 1;
- 			break;
- 		case 'h':
--			printf(USAGE);
--			return (EXIT_SUCCESS);
-+			puts(USAGE);
-+			return EXIT_SUCCESS;
- 		case 'v':
- 			printf("%s\n", "lirc-lsremotes " VERSION);
--			return (EXIT_SUCCESS);
-+			return EXIT_SUCCESS;
- 		case '?':
- 			fprintf(stderr, "unrecognized option: -%c\n", optopt);
--			fprintf(stderr,
--                                "Try `lirc-lsremotes -h' for more information.\n");
--			return (EXIT_FAILURE);
-+			fputs("Try `lirc-lsremotes -h' for more information.\n",
-+                               stderr);
-+			return EXIT_FAILURE;
- 		}
- 	}
- 	if (argc == optind + 2) {
-@@ -277,7 +277,7 @@ int main(int argc, char** argv)
- 		dirpath = argv[optind];
- 		configs = "*";
- 	} else {
--		fprintf(stderr, USAGE);
-+		fputs(USAGE, stderr);
- 		return EXIT_FAILURE;
- 	}
- 	lirc_log_get_clientlog("lirc-lsremotes", path, sizeof(path));
-diff --git a/tools/mode2.c b/tools/mode2.c
-index 70c83f8..565cc2d 100644
---- a/tools/mode2.c
-+++ b/tools/mode2.c
-@@ -98,7 +98,7 @@ static void parse_options(int argc, char** argv)
- 	{
- 		switch (c) {
- 		case 'h':
--			printf(help);
-+			puts(help);
- 			exit(EXIT_SUCCESS);
- 		case 'H':
- 			strncpy(driver, optarg, sizeof(driver) - 1);
-@@ -194,11 +194,11 @@ int main(int argc, char **argv)
- 			close(fd);
- 			exit(EXIT_FAILURE);
- 		} else if (ioctl(fd, LIRC_GET_REC_MODE, &mode) == -1) {
--			printf("This program is only intended for receivers"
-+			puts("This program is only intended for receivers"
- 			       " supporting the pulse/space layer.\n");
--			printf("Note that this is no error, but this program "
-+			puts("Note that this is no error, but this program "
- 			       "simply makes no sense for your\n" "receiver.\n");
--			printf("In order to test your setup run lircd with "
-+			puts("In order to test your setup run lircd with "
- 			       "the --nodaemon option and \n then check if the"
- 			       " remote works with the irw tool.\n");
- 			close(fd);
-@@ -213,11 +213,11 @@ int main(int argc, char **argv)
- 		mode = curr_driver->rec_mode;
- 		if (mode != LIRC_MODE_MODE2) {
- 			if (strcmp(curr_driver->name, "default") == 0) {
--				printf("Please use the --raw option to access "
-+				puts("Please use the --raw option to access "
- 				       "the device directly instead through\n"
- 				       "the abstraction layer.\n");
- 			} else {
--				printf("This program does not work for this"
-+				puts("This program does not work for this"
-  				       " hardware yet\n");
- 			}
- 			exit(EXIT_FAILURE);
-@@ -256,15 +256,15 @@ int main(int argc, char **argv)
- 						(void *)&data : buffer),
- 				      count);
- 			if (result != count) {
--				fprintf(stderr, "read() failed\n");
-+				fputs("read() failed\n", stderr);
- 				break;
- 			}
- 		} else {
- 			if (mode == LIRC_MODE_MODE2) {
- 				data = curr_driver->readdata(0);
- 				if (data == 0) {
--					fprintf(stderr,
--					        "readdata() failed\n");
-+					fputs("readdata() failed\n",
-+                                              stderr);
- 					break;
- 				}
- 			} else {
-@@ -273,11 +273,11 @@ int main(int argc, char **argv)
- 		}
- 
- 		if (mode != LIRC_MODE_MODE2) {
--			printf("code: 0x");
-+			puts("code: 0x");
- 			for (i = 0; i < count; i++) {
- 				printf("%02x", (unsigned char)buffer[i]);
- 			}
--			printf("\n");
-+			puts("\n");
- 			fflush(stdout);
- 			continue;
- 		}
-@@ -297,19 +297,19 @@ int main(int argc, char **argv)
- 			if (data & PULSE_BIT) {
- 				if ((bitno & 1) == 0) {
- 					/* not in expected order */
--					printf("-pulse");
-+					puts("-pulse");
- 				}
- 			} else {
- 				if (bitno & 1) {
- 					/* not in expected order */
--					printf("-space");
-+					puts("-space");
- 				}
- 				if (((data & PULSE_MASK) > gap) || (bitno >= 6)) {
- 					/* real long space or more
- 					   than 6 codes, start new line */
--					printf("\n");
-+					puts("\n");
- 					if ((data & PULSE_MASK) > gap)
--						printf("\n");
-+						puts("\n");
- 					bitno = 0;
- 				}
- 			}
-@@ -317,7 +317,7 @@ int main(int argc, char **argv)
- 		}
- 		case 2:
- 			if ((data & PULSE_MASK) > gap)
--				printf("_\n\n_");
-+				puts("_\n\n_");
- 			else
- 				printf("%.*s",
- 				       ((data & PULSE_MASK) + t_div/2) / t_div,
-diff --git a/tools/xmode2.c b/tools/xmode2.c
-index 6a45d4c..9a4e0a1 100644
---- a/tools/xmode2.c
-+++ b/tools/xmode2.c
-@@ -139,12 +139,13 @@ static void parse_options(int argc, char** const argv)
- 	add_defaults();
- 	while ((c = getopt_long(argc, argv, "U:hvd:H:g:t:mr", options, NULL)) != -1) {
- 		switch (c) {
--		case 'h':printf(help);
-+		case 'h':puts(help);
- 			exit (EXIT_SUCCESS);
- 		case 'H':
- 			if (hw_choose_driver(optarg) != 0) {
- 				fprintf(stderr, "Driver `%s' not found", optarg);
--				fprintf(stderr, " (wrong or missing -U/--plugindir?)\n");
-+				fputs(" (wrong or missing -U/--plugindir?)\n",
-+                                       stderr);
- 				hw_print_drivers(stderr);
- 				exit(EXIT_FAILURE);
- 			}
-@@ -186,7 +187,7 @@ void initscreen(char *geometry)
- {
- 	d1 = XOpenDisplay(0);
- 	if (d1 == NULL) {
--		printf("Can't open display.\n");
-+		puts("Can't open display.\n");
- 		exit(0);
- 	}
- 
-@@ -208,10 +209,10 @@ void initscreen(char *geometry)
- 
- 	cm1 = DefaultColormap(d1, 0);
- 	if (!XAllocNamedColor(d1, cm1, "blue", &xc1, &xc2))
--		printf("coudn't allocate blue color\n");
-+		puts("couldn't allocate blue color\n");
- 	f1_str = XLoadQueryFont(d1, font1_name);
- 	if (f1_str == NULL) {
--		printf("could't load font\n");
-+		puts("could't load font\n");
- 		exit(EXIT_FAILURE);
- 	}
- 
-@@ -266,10 +267,10 @@ int main(int argc, char **argv)
- 			close(fd);
- 			exit(EXIT_FAILURE);
- 		} else if (ioctl(fd, LIRC_GET_REC_MODE, &mode) == -1) {
--			printf("This program is only intended for receivers supporting the pulse/space layer.\n");
--			printf("Note that this is no error, but this program "
-+			puts("This program is only intended for receivers supporting the pulse/space layer.\n");
-+			puts("Note that this is no error, but this program "
- 			       "simply makes no sense for your\n" "receiver.\n");
--			printf("In order to test your setup run lircd with "
-+			puts("In order to test your setup run lircd with "
- 			       "the --nodaemon option and \n" "then check if the remote works with the irw tool.\n");
- 			close(fd);
- 			exit(EXIT_FAILURE);
-@@ -277,7 +278,7 @@ int main(int argc, char **argv)
- 	} else {
- 		curr_driver->open_func(device);
- 		if (curr_driver->init_func  && !curr_driver->init_func()) {
--			fprintf(stderr, "Cannot initialize hardware");
-+			fputs("Cannot initialize hardware", stderr);
- 			exit(EXIT_FAILURE);
- 		}
- 
-@@ -285,10 +286,10 @@ int main(int argc, char **argv)
- 		mode = curr_driver->rec_mode;
- 		if (mode != LIRC_MODE_MODE2) {
- 			if (strcmp(curr_driver->name, "default") == 0) {
--				printf("Please use the --raw option to access "
-+				puts("Please use the --raw option to access "
- 				       "the device directly instead through\n" "the abstraction layer.\n");
- 			} else {
--				printf("This program does not work for this hardware yet\n");
-+				puts("This program does not work for this hardware yet\n");
- 			}
- 			exit(EXIT_FAILURE);
- 		}
--- 
-2.1.0
-
diff --git a/0002-tools-Add-missing-file-lirc-setup-database.py.patch b/0002-tools-Add-missing-file-lirc-setup-database.py.patch
new file mode 100644
index 0000000..5a30006
--- /dev/null
+++ b/0002-tools-Add-missing-file-lirc-setup-database.py.patch
@@ -0,0 +1,185 @@
+From afd89cd1a0f41bdfd0bf049e4245258abe7deffb Mon Sep 17 00:00:00 2001
+From: Alec Leamas <leamas.alec@gmail.com>
+Date: Mon, 7 Sep 2015 13:36:30 +0200
+Subject: [PATCH] tools: Add missing file lirc-setup/database.py.
+
+---
+ tools/Makefile.am            |   3 +-
+ tools/lirc-setup/database.py | 151 +++++++++++++++++++++++++++++++++++++++++++
+ 2 files changed, 153 insertions(+), 1 deletion(-)
+ create mode 100644 tools/lirc-setup/database.py
+
+diff --git a/tools/Makefile.am b/tools/Makefile.am
+index f3fd3c4..d0d820c 100644
+--- a/tools/Makefile.am
++++ b/tools/Makefile.am
+@@ -85,7 +85,8 @@ pkgpython_PYTHON        = lirc-setup/mvc_control.py \
+                           lirc-setup/mvc_view.py \
+                           lirc-setup/mvc_model.py \
+                           lirc-setup/choosers.py \
+-                          lirc-setup/baseview.py
++                          lirc-setup/baseview.py \
++                          lirc-setup/database.py
+ dist_pkgpython_SCRIPTS  = lirc-setup/lirc-setup
+ dist_pkgpython_DATA     = lirc-setup/lirc-setup.ui
+ endif
+diff --git a/tools/lirc-setup/database.py b/tools/lirc-setup/database.py
+new file mode 100644
+index 0000000..1c1e70b
+--- /dev/null
++++ b/tools/lirc-setup/database.py
+@@ -0,0 +1,151 @@
++''' Simple lirc setup tool - database part.
++
++The database is loaded from some YAML files:
++
++  - kernel-drivers.yaml: Info on the kernel drivers.
++  - drivers,yaml, Info on the uerspace drivers, collected from their
++    compiled information.
++  - confs_by_driver.yaml: Mapping of drivers -> suggested remote files,
++    created by irdb-get.
++
++The directory used to load these files is (first match used):
++  - Current directory
++  - The 'configs' dir.
++  - The ../../configs
++
++Although python cannot guarantee this, the database is designed to be a
++read-only structure.
++
++'''
++
++
++import glob
++import os
++import os.path
++import sys
++
++YAML_MSG = '''
++"Cannot import the yaml library. Please install the python3
++yaml package, on many distributions known as python3-PyYAML. It is also
++available as a pypi package at https://pypi.python.org/pypi/PyYAML.'''
++
++try:
++    import yaml
++except ImportError:
++    print(YAML_MSG)
++    sys.exit(1)
++
++
++def _here(path):
++    ''' Return path added to current dir for __file__. '''
++    return os.path.join(os.path.dirname(os.path.abspath(__file__)), path)
++
++
++class Config(object):
++    ''' The configuration selected, and it's sources. '''
++    # pylint: disable=too-many-instance-attributes
++
++    def __init__(self, config=None):
++        self.device = None        # << selected device.
++        self.driver = {}          # << Read-only driver dict in db
++        self.config = {}          # << Read-only config dict in db
++        self.modinit = ""         # << Substituted data from driver
++        self.modprobe = ""        # << Substituted data from driver
++        self.lircd_conf = ""      # << Name of lircd.conf file
++        self.lircmd_conf = ""     # << Name of lircmd.conf file
++        self.label = ""           # << Label for driver + device
++        if config:
++            for key, value in config.items():
++                setattr(self, key, value)
++
++
++class Database(object):
++    ''' Reflects the *.yaml files in the configs/ directory. '''
++
++    def __init__(self, path=None):
++
++        if path and os.path.exists(path):
++            configdir = path
++        elif path:
++            raise FileNotFoundError(path)
++        elif os.path.exists(_here('configs')):
++            configdir = _here('configs')
++        elif os.path.exists(_here('../configs')):
++            configdir = _here('../configs')
++        else:
++            raise FileNotFoundError(configdir)
++        db = {}
++        with open(os.path.join(configdir, "confs_by_driver.yaml")) as f:
++            cf = yaml.load(f.read())
++        db['lircd_by_driver'] = cf['lircd_by_driver'].copy()
++        db['lirmcd_by_driver'] = cf['lircmd_by_driver'].copy()
++
++        with open(os.path.join(configdir, "kernel-drivers.yaml")) as f:
++            cf = yaml.load(f.read())
++        db['kernel-drivers'] = cf['drivers'].copy()
++        db['drivers'] = cf['drivers'].copy()
++        with open(os.path.join(configdir, "drivers.yaml")) as f:
++            cf = yaml.load(f.read())
++        db['drivers'].update(cf['drivers'].copy())
++        for key, d in db['drivers'].items():
++            d['id'] = key
++
++        configs = {}
++        for path in glob.glob(configdir + '/*.conf'):
++            with open(path) as f:
++                cf = yaml.load(f.read())
++            configs[cf['config']['id']] = cf['config']
++        db['configs'] = configs
++        self.db = db
++
++    @property
++    def kernel_drivers(self):
++        ''' The kernel-drivers dictionary, drivers.yaml + kernel-drivers.yaml.
++        '''
++        return self.db['kernel-drivers']
++
++    @property
++    def drivers(self):
++        ''' The drivers dictionary, drivers.yaml + kernel-drivers.yaml. '''
++        return self.db['drivers']
++
++    @property
++    def configs(self):
++        ''' Return dict of parsed config/*.conf files, keyd by id. '''
++        return self.db['configs']
++
++    def remotes_by_driver(self, driver):
++        ''' Return the list of remotes suggested for a given driver. '''
++        if isinstance(driver, dict):
++            driver = driver['id']
++        try:
++            return self.db['lircd_by_driver'][driver]
++        except KeyError:
++            return []
++
++    def driver_by_remote(self, remote):
++        ''' Return the driver (possibly None) suggested for a remote. '''
++        for driver, files in self.db['lircd_by_driver'].items():
++            if remote in files:
++                return self.db['drivers'][driver]
++        return None
++
++    def find_config(self, key, value):
++        ''' Return item (a config) in configs where config[key] == value. '''
++        found = [c for c in self.db['configs'].values()
++                 if key in c and c[key] == value]
++        if len(found) > 1:
++            print("find_config: not properly found %s, %s): " % (key, value)
++                  + ', '.join([c['id'] for c in found]))
++            return None
++        elif not found:
++            print("find_config: Nothing  found for %s, %s): " % (key, value))
++            return None
++        found = dict(found[0])
++        if 'device_hint' not in found:
++            found['device_hint'] = \
++                self.db['drivers'][found['driver']]['device_hint']
++        return found
++
++
++# vim: set expandtab ts=4 sw=4:
+-- 
+2.4.2
+
diff --git a/0003-all-Use-puts-instead-of-printf-when-applicable.patch b/0003-all-Use-puts-instead-of-printf-when-applicable.patch
deleted file mode 100644
index d3a04ae..0000000
--- a/0003-all-Use-puts-instead-of-printf-when-applicable.patch
+++ /dev/null
@@ -1,1031 +0,0 @@
-From 25523fe4bfb383ae1d34843292544fef7145eb2a Mon Sep 17 00:00:00 2001
-From: Alec Leamas <leamas.alec@gmail.com>
-Date: Thu, 11 Dec 2014 10:38:38 +0100
-Subject: [PATCH 3/5] all: Use puts() instead of printf() when applicable.
-
-Recent gcc compilers emits warnings when using printf() on
-constant data where puts()/fputs() is a better choice.
----
- daemons/lircd.c        |   4 +-
- daemons/lircmd.c       |   2 +-
- lib/lirc_client.c      |   2 +
- tools/irrecord.c       | 105 +++++++++++++++++++++++++------------------------
- tools/irsend.c         |   2 +-
- tools/irsimreceive.c   |  26 ++++++------
- tools/irsimsend.c      |  14 +++----
- tools/irtestcase.c     |  27 ++++++-------
- tools/lirc-lsplugins.c |  34 ++++++++--------
- tools/lirc-lsremotes.c |  14 +++----
- tools/mode2.c          |  38 +++++++++---------
- tools/xmode2.c         |  23 +++++------
- 12 files changed, 148 insertions(+), 143 deletions(-)
-
-diff --git a/daemons/lircd.c b/daemons/lircd.c
-index 3a7f744..ab44e80 100644
---- a/daemons/lircd.c
-+++ b/daemons/lircd.c
-@@ -2266,7 +2266,7 @@ static void lircd_parse_options(int argc, char** const argv)
- 	{
- 		switch (c) {
- 		case 'h':
--			printf(help);
-+			puts(help);
- 			exit(EXIT_SUCCESS);
- 		case 'v':
- 			printf("lircd %s\n", VERSION);
-@@ -2414,7 +2414,7 @@ int main(int argc, char **argv)
- 		opt = options_getstring("lircd:listen_hostport");
- 		if (opt){
- 			if (opt2host_port(opt, &address, &port, errmsg) != 0){
--				fprintf(stderr, errmsg);
-+				fputs(errmsg, stderr);
- 				return(EXIT_FAILURE);
- 			}
- 		} else
-diff --git a/daemons/lircmd.c b/daemons/lircmd.c
-index 023777c..869b3a9 100644
---- a/daemons/lircmd.c
-+++ b/daemons/lircmd.c
-@@ -784,7 +784,7 @@ static void lircmd_parse_options(int argc,  char** const argv)
- 	{
- 		switch (c) {
- 		case 'h':
--			printf(help);
-+			puts(help);
- 			exit(EXIT_SUCCESS);
- 		case 'v':
- 			printf("lircmd %s\n",  VERSION);
-diff --git a/lib/lirc_client.c b/lib/lirc_client.c
-index c441803..4720f3f 100644
---- a/lib/lirc_client.c
-+++ b/lib/lirc_client.c
-@@ -105,6 +105,8 @@ chk_write(int fd, const void *buf, size_t count, const char* msg)
- 		perror(msg);
- 	}
- }
-+
-+
- int lirc_command_init(lirc_cmd_ctx* ctx, const char* fmt, ...)
- {
- 	va_list ap;
-diff --git a/tools/irrecord.c b/tools/irrecord.c
-index f52328c..788e425 100644
---- a/tools/irrecord.c
-+++ b/tools/irrecord.c
-@@ -339,7 +339,7 @@ static void parse_options(int argc, char** const argv)
- 			options_set_opt("irrecord:driver", optarg);
- 			break;
- 		case 'h':
--			printf(help);
-+			puts(help);
- 			exit(EXIT_SUCCESS);
- 		case 'i':
- 			options_set_opt("irrecord:invert", "True");
-@@ -374,14 +374,14 @@ static void parse_options(int argc, char** const argv)
- 			printf("irrecord %s\n",  VERSION);
- 			exit(EXIT_SUCCESS);
- 		default:
--			fprintf(stderr, USAGE);
-+			fputs(USAGE, stderr);
- 			exit(EXIT_FAILURE);
- 		}
- 	}
- 	if (optind == argc - 1) {
- 		options_set_opt("configfile", argv[optind]);
- 	} else if (optind != argc) {
--		fprintf(stderr, "irrecord: invalid argument count\n");
-+		fputs("irrecord: invalid argument count\n", stderr);
- 		exit(EXIT_FAILURE);
- 	}
- }
-@@ -416,7 +416,7 @@ int main(int argc, char **argv)
- 	analyse = options_getboolean("irrecord:analyse");
- 	if (hw_choose_driver(opt) != 0 && ! analyse) {
- 		fprintf(stderr, "Driver `%s' not found", opt);
--		fprintf(stderr, " (wrong or missing -U/--plugindir?).\n");
-+		fputs(" (wrong or missing -U/--plugindir?).\n", stderr);
- 		hw_print_drivers(stderr);
- 		exit(EXIT_FAILURE);
- 	}
-@@ -526,9 +526,9 @@ int main(int argc, char **argv)
- 		perror(progname);
- 		exit(EXIT_FAILURE);
- 	}
--	printf("\nirrecord -  application for recording IR-codes" " for usage with lirc\n" "\n"
-+	puts("\nirrecord -  application for recording IR-codes" " for usage with lirc\n" "\n"
- 	       "Copyright (C) 1998,1999 Christoph Bartelmus" "(lirc@bartelmus.de)\n");
--	printf("\n");
-+	puts("\n");
- 
- 	if (curr_driver->init_func) {
- 		if (!curr_driver->init_func()) {
-@@ -561,16 +561,16 @@ int main(int argc, char **argv)
- 		exit(EXIT_FAILURE);
- 	}
- 
--	printf("This program will record the signals from your remote control\n"
-+	puts("This program will record the signals from your remote control\n"
- 	       "and create a config file for lircd.\n\n" "\n");
- 	if (curr_driver->name && strcmp(curr_driver->name, "devinput") == 0) {
--		printf("Usually it's not necessary to create a new config file for devinput\n"
-+		puts("Usually it's not necessary to create a new config file for devinput\n"
- 		       "devices. A generic config file can be found at:\n"
- 		       "https://sourceforge.net/p/lirc-remotes/code/ci/master/tree/remotes/devinput/devinput.lircd.conf"
- 		       "It can be downloaded using irdb-get(1)\n"
- 		       "Please try this config file before creating your own.\n" "\n");
- 	}
--	printf("A proper config file for lircd is maybe the most vital part of this\n"
-+	puts("A proper config file for lircd is maybe the most vital part of this\n"
- 	       "package, so you should invest some time to create a working config\n"
- 	       "file. Although I put a good deal of effort in this program it is often\n"
- 	       "not possible to automatically recognize all features of a remote\n"
-@@ -610,7 +610,7 @@ int main(int argc, char **argv)
- 					curr_driver->deinit_func();
- 				exit(EXIT_FAILURE);
- 			}
--			printf("Creating config file in raw mode.\n");
-+			puts("Creating config file in raw mode.\n");
- 			set_protocol(&remote, RAW_CODES);
- 			remote.eps = eps;
- 			remote.aeps = aeps;
-@@ -643,7 +643,7 @@ int main(int argc, char **argv)
- 			curr_driver->rec_func(NULL);
- 		}
- 		if (!get_toggle_bit_mask(&remote)) {
--			printf("But I know for sure that RC6 has a toggle bit!\n");
-+			puts("But I know for sure that RC6 has a toggle bit!\n");
- 			fclose(fout);
- 			unlink(filename);
- 			if (curr_driver->deinit_func)
-@@ -651,7 +651,7 @@ int main(int argc, char **argv)
- 			exit(EXIT_FAILURE);
- 		}
- 	}
--	printf("Now enter the names for the buttons.\n");
-+	puts("Now enter the names for the buttons.\n");
- 
- 	fprint_copyright(fout);
- 	fprint_comment(fout, &remote, commandline);
-@@ -663,8 +663,8 @@ int main(int argc, char **argv)
- 
- 		if (no_data) {
- 			fprintf(stderr, "%s: no data for 10 secs," " aborting\n", progname);
--			printf("The last button did not seem to generate any signal.\n");
--			printf("Press RETURN to continue.\n\n");
-+			puts("The last button did not seem to generate any signal.\n");
-+			puts("Press RETURN to continue.\n\n");
- 			getchar();
- 			no_data = 0;
- 		}
-@@ -678,13 +678,13 @@ int main(int argc, char **argv)
- 		}
- 		buffer[strlen(buffer) - 1] = 0;
- 		if (strchr(buffer, ' ') || strchr(buffer, '\t')) {
--			printf("The name must not contain any whitespace.\n");
--			printf("Please try again.\n");
-+			puts("The name must not contain any whitespace.\n");
-+			puts("Please try again.\n");
- 			continue;
- 		}
- 		if (strcasecmp(buffer, "begin") == 0 || strcasecmp(buffer, "end") == 0) {
- 			printf("'%s' is not allowed as button name\n", buffer);
--			printf("Please try again.\n");
-+			puts("Please try again.\n");
- 			continue;
- 		}
- 		if (strlen(buffer) == 0) {
-@@ -693,7 +693,7 @@ int main(int argc, char **argv)
- 		if (!disable_namespace && !is_in_namespace(buffer)) {
- 			printf("'%s' is not in name space (use --disable-namespace to disable checks)\n", buffer);
- 			printf("Use '%s --list-namespace' to see a full list of valid button names\n", progname);
--			printf("Please try again.\n");
-+			puts("Please try again.\n");
- 			continue;
- 		}
- 
-@@ -730,9 +730,9 @@ int main(int argc, char **argv)
- 				}
- 				if (count == 0) {
- 					if (!is_space(data) || data < remote.gap - remote.gap * remote.eps / 100) {
--						printf("Sorry, something went wrong.\n");
-+						puts("Sorry, something went wrong.\n");
- 						sleep(3);
--						printf("Try again.\n");
-+						puts("Try again.\n");
- 						flushhw();
- 						count = 0;
- 						continue;
-@@ -742,13 +742,13 @@ int main(int argc, char **argv)
- 					    && (is_const(&remote) ? data >
- 						(remote.gap > sum ? (remote.gap - sum) * (100 - remote.eps) / 100 : 0)
- 						: data > remote.gap * (100 - remote.eps) / 100)) {
--						printf("Got it.\n");
-+						puts("Got it.\n");
- 						printf("Signal length is %d\n", count - 1);
- 						if (count % 2) {
--							printf("That's weird because the signal length "
-+							puts("That's weird because the signal length "
- 							       "must be odd!\n");
- 							sleep(3);
--							printf("Try again.\n");
-+							puts("Try again.\n");
- 							flushhw();
- 							count = 0;
- 							continue;
-@@ -766,7 +766,7 @@ int main(int argc, char **argv)
- 				count++;
- 			}
- 			if (count == MAX_SIGNALS) {
--				printf("Signal is too long.\n");
-+				puts("Signal is too long.\n");
- 			}
- 			if (retval == EXIT_FAILURE)
- 				break;
-@@ -814,7 +814,7 @@ int main(int argc, char **argv)
- 				}
- 				break;
- 			} else {
--				printf("Something went wrong. ");
-+				puts("Something went wrong. ");
- 				if (retries > 1) {
- 					fflush(stdout);
- 					sleep(3);
-@@ -826,8 +826,8 @@ int main(int argc, char **argv)
- 					flushhw();
- 					printf("Please try again. (%d retries left)\n", retries - 1);
- 				} else {
--					printf("\n");
--					printf("Try using the -f option.\n");
-+					puts("\n");
-+					puts("Try using the -f option.\n");
- 				}
- 				retries--;
- 				continue;
-@@ -1033,8 +1033,8 @@ int get_toggle_bit_mask(struct ir_remote *remote)
- 		}
- 	}
- 
--	printf("Checking for toggle bit mask.\n");
--	printf("Please press an arbitrary button repeatedly as fast as possible.\n"
-+	puts("Checking for toggle bit mask.\n");
-+	puts("Please press an arbitrary button repeatedly as fast as possible.\n"
- 	       "Make sure you keep pressing the SAME button and that you DON'T HOLD\n" "the button down!.\n"
- 	       "If you can't see any dots appear, then wait a bit between button presses.\n" "\n"
- 	       "Press RETURN to continue.");
-@@ -1089,7 +1089,7 @@ int get_toggle_bit_mask(struct ir_remote *remote)
- 					set_toggle_bit_mask(remote, first ^ decode_ctx.code);
- 					found = 1;
- 				}
--				printf(".");
-+				puts(".");
- 				fflush(stdout);
- 				retries--;
- 			} else {
-@@ -1101,12 +1101,12 @@ int get_toggle_bit_mask(struct ir_remote *remote)
- 		}
- 	}
- 	if (!found) {
--		printf("\nNo toggle bit mask found.\n");
-+		puts("\nNo toggle bit mask found.\n");
- 	} else {
- 		if (remote->toggle_bit_mask > 0) {
- 			printf("\nToggle bit mask is 0x%llx.\n", (__u64) remote->toggle_bit_mask);
- 		} else if (remote->toggle_mask != 0) {
--			printf("\nToggle mask found.\n");
-+			puts("\nToggle mask found.\n");
- 		}
- 	}
- 	if (seq > 0)
-@@ -1533,12 +1533,12 @@ int get_lengths(struct ir_remote *remote, int force, int interactive)
- 	int first_signal;
- 
- 	if (interactive) {
--		printf("Now start pressing buttons on your remote control.\n\n");
--		printf("It is very important that you press many different buttons and hold them\n"
-+		puts("Now start pressing buttons on your remote control.\n\n");
-+		puts("It is very important that you press many different buttons and hold them\n"
- 		       "down for approximately one second. Each button should generate at least one\n"
- 		       "dot but in no case more than ten dots of output.\n"
- 		       "Don't stop pressing buttons until two lines of dots (2x80) have been\n" "generated.\n\n");
--		printf("Press RETURN now to start recording.");
-+		puts("Press RETURN now to start recording.");
- 		fflush(stdout);
- 		getchar();
- 		flushhw();
-@@ -1647,7 +1647,7 @@ int get_lengths(struct ir_remote *remote, int force, int interactive)
- 
- 					if (interactive) {
- 						for (i = maxcount - lastmaxcount; i > 0; i--) {
--							printf(".");
-+							puts(".");
- 							fflush(stdout);
- 						}
- 					}
-@@ -1715,7 +1715,7 @@ int get_lengths(struct ir_remote *remote, int force, int interactive)
- 						int i;
- 
- 						if (interactive) {
--							printf(".");
-+							puts(".");
- 							fflush(stdout);
- 						}
- 						count_signals++;
-@@ -2130,7 +2130,7 @@ int get_repeat_length(struct ir_remote *remote, int interactive)
- 
- 	if (!((count_3repeats > SAMPLES / 2 ? 1 : 0) ^ (count_5repeats > SAMPLES / 2 ? 1 : 0))) {
- 		if (count_3repeats > SAMPLES / 2 || count_5repeats > SAMPLES / 2) {
--			printf("Repeat inconsitentcy.\n");
-+			puts("Repeat inconsitentcy.\n");
- 			return (0);
- 		}
- 		i_printf(interactive, "No repeat code found.\n");
-@@ -2151,7 +2151,7 @@ int get_repeat_length(struct ir_remote *remote, int interactive)
- 		}
- 		if (max_count >= sum * TH_REPEAT / 100) {
- 			if (count_5repeats > count_3repeats && !has_header(remote)) {
--				printf("Repeat code has header," " but no header found!\n");
-+				puts("Repeat code has header," " but no header found!\n");
- 				return (0);
- 			}
- 			if (count_5repeats > count_3repeats && has_header(remote)) {
-@@ -2199,7 +2199,7 @@ void unlink_length(struct lengths **first, struct lengths *remove)
- 			scan = scan->next;
- 		}
- 	}
--	printf("unlink_length(): report this bug!\n");
-+	puts("unlink_length(): report this bug!\n");
- }
- 
- int get_data_length(struct ir_remote *remote, int interactive)
-@@ -2224,12 +2224,12 @@ int get_data_length(struct ir_remote *remote, int interactive)
- 				max2_plength = NULL;
- 		}
- 		if (lirc_log_is_enabled_for(LIRC_DEBUG)) {
--			printf("Pulse canditates: ");
-+			puts("Pulse canditates: ");
- 			printf("%u x %u", max_plength->count, (__u32) calc_signal(max_plength));
- 			if (max2_plength)
- 				printf(", %u x %u", max2_plength->count, (__u32)
- 				       calc_signal(max2_plength));
--			printf("\n");
-+			puts("\n");
- 		}
- 
- 		max_slength = get_max_length(first_space, &sum);
-@@ -2247,21 +2247,21 @@ int get_data_length(struct ir_remote *remote, int interactive)
- 			}
- 			if (lirc_log_is_enabled_for(LIRC_DEBUG)) {
- 				if (max_count >= sum * TH_IS_BIT / 100) {
--					printf("Space candidates: ");
-+					puts("Space candidates: ");
- 					printf("%u x %u", max_slength->count,
- 					       (__u32) calc_signal(max_slength));
- 					if (max2_slength)
- 						printf(", %u x %u",
- 						       max2_slength->count,
- 						       (__u32) calc_signal(max2_slength));
--					printf("\n");
-+					puts("\n");
- 				}
- 			}
- 			remote->eps = eps;
- 			remote->aeps = aeps;
- 			if (is_biphase(remote)) {
- 				if (max2_plength == NULL || max2_slength == NULL) {
--					printf("Unknown encoding found.\n");
-+					puts("Unknown encoding found.\n");
- 					return (0);
- 				}
- 				i_printf(interactive, "Signals are biphase encoded.\n");
-@@ -2276,11 +2276,11 @@ int get_data_length(struct ir_remote *remote, int interactive)
- 				remote->szero = remote->sone;
- 			} else {
- 				if (max2_plength == NULL && max2_slength == NULL) {
--					printf("No encoding found.\n");
-+					puts("No encoding found.\n");
- 					return (0);
- 				}
- 				if (max2_plength && max2_slength) {
--					printf("Unknown encoding found.\n");
-+					puts("Unknown encoding found.\n");
- 					return (0);
- 				}
- 				p1 = calc_signal(max_plength);
-@@ -2348,7 +2348,7 @@ int get_data_length(struct ir_remote *remote, int interactive)
- 		}
- 		free_lengths(&max_plength);
- 	}
--	printf("Could not find data lengths.\n");
-+	puts("Could not find data lengths.\n");
- 	return (0);
- }
- 
-@@ -2366,7 +2366,7 @@ int get_gap_length(struct ir_remote *remote)
- 
- 	flag = 0;
- 	lastmaxcount = 0;
--	printf("Hold down an arbitrary button.\n");
-+	puts("Hold down an arbitrary button.\n");
- 	while (1) {
- 		while (availabledata()) {
- 			curr_driver->rec_func(NULL);
-@@ -2398,7 +2398,7 @@ int get_gap_length(struct ir_remote *remote)
- 			}
- 			if (maxcount > lastmaxcount) {
- 				lastmaxcount = maxcount;
--				printf(".");
-+				puts(".");
- 				fflush(stdout);
- 			}
- 		} else {
-@@ -2411,9 +2411,10 @@ int get_gap_length(struct ir_remote *remote)
- 
- void fprint_copyright(FILE * fout)
- {
--	fprintf(fout, "\n"
-+	fputs("\n"
- 		"# Please take the time to finish this file as described in\n"
- 		"# https://sourceforge.net/p/lirc-remotes/wiki/Checklist/\n"
- 		"# and make it available to others by sending it to \n"
--		"# <lirc@bartelmus.de>\n");
-+		"# <lirc@bartelmus.de>\n",
-+                fout);
- }
-diff --git a/tools/irsend.c b/tools/irsend.c
-index 71cc95f..cfde7b9 100644
---- a/tools/irsend.c
-+++ b/tools/irsend.c
-@@ -117,7 +117,7 @@ int main(int argc, char **argv)
- 			break;
- 		switch (c) {
- 		case 'h':
--			printf(help);
-+			fputs(help, stdout);
- 			return (EXIT_SUCCESS);
- 		case 'v':
- 			printf("%s %s\n", prog, VERSION);
-diff --git a/tools/irsimreceive.c b/tools/irsimreceive.c
-index 4a5a3b8..3c3d0bb 100644
---- a/tools/irsimreceive.c
-+++ b/tools/irsimreceive.c
-@@ -43,25 +43,25 @@ static void setup(const char* path)
- 		exit(EXIT_FAILURE);
- 	}
- 	if (hw_choose_driver("file") == -1) {
--		fprintf(stderr,
--			"Cannot load file driver (bad plugin path?)\n");
-+		fputs("Cannot load file driver (bad plugin path?)\n",
-+                      stderr);
- 		exit(EXIT_FAILURE);
- 	}
- 	r = curr_driver->open_func("dummy.out");
- 	if (r == 0) {
--		fprintf(stderr, "Cannot open driver\n");
-+		fputs("Cannot open driver\n", stderr);
- 		exit(EXIT_FAILURE);
- 	}
- 	r = curr_driver->init_func();
- 	if (r == 0) {
--		fprintf(stderr, "Cannot init driver\n");
-+		fputs("Cannot init driver\n", stderr);
- 		exit(EXIT_FAILURE);
- 	}
- 	strcpy(option.key, "set-infile");
- 	strncpy(option.value, path, sizeof(option.value));
- 	r = curr_driver->drvctl_func(DRVCTL_SET_OPTION, (void*) &option);
- 	if (r != 0) {
--		fprintf(stderr, "Cannot set driver infile.\n");
-+		fputs("Cannot set driver infile.\n", stderr);
- 		exit(EXIT_FAILURE);
- 	}
- }
-@@ -102,7 +102,7 @@ void printcode(char* s)
- 	int len;
- 
- 	if (s == NULL) {
--		printf( "None\n");
-+		puts("None\n");
- 	} else {
- 		len = strlen(s);
-                 if (strlen(s) > 2 && s[len -1] == '\n') {
-@@ -140,23 +140,23 @@ int main(int argc, char *argv[])
- 	       != EOF) {
- 		switch (c) {
- 		case 'h':
--			printf(USAGE);
--			return (EXIT_SUCCESS);
-+			puts(USAGE);
-+			return EXIT_SUCCESS;
- 		case 'v':
- 			printf("%s\n", "irw " VERSION);
--			return (EXIT_SUCCESS);
-+			return EXIT_SUCCESS;
- 		case 'U':
- 			options_set_opt("lircd:pluginpath", optarg);
- 			break;
- 		case '?':
- 			fprintf(stderr, "unrecognized option: -%c\n", optopt);
--			fprintf(stderr,
--                                "Try `irsimsend -h' for more information.\n");
--			return (EXIT_FAILURE);
-+			fputs("Try `irsimsend -h' for more information.\n",
-+                              stderr);
-+			return EXIT_FAILURE;
- 		}
- 	}
- 	if (argc != optind + 2) {
--		fprintf(stderr, USAGE);
-+		fputs(USAGE, stderr);
- 		return EXIT_FAILURE;
- 	}
- 	lirc_log_get_clientlog("irsimreceive", path, sizeof(path));
-diff --git a/tools/irsimsend.c b/tools/irsimsend.c
-index b72831a..7572d84 100644
---- a/tools/irsimsend.c
-+++ b/tools/irsimsend.c
-@@ -65,8 +65,8 @@ static struct ir_remote* setup(const char* path)
- 	FILE* f;
- 
- 	if (hw_choose_driver("file") == -1) {
--		fprintf(stderr,
--			"Cannot load file driver (bad plugin path?)\n");
-+		fputs("Cannot load file driver (bad plugin path?)\n",
-+                       stderr);
- 		exit(EXIT_FAILURE);
- 	}
- 	unlink(OUTFILE);
-@@ -196,7 +196,7 @@ int parse_uint_arg(const char* optind, const char* errmsg)
- 
- 	c = strtol(optarg, NULL, 10);
- 	if (c > INT_MAX || c < 0 || errno == EINVAL || errno == ERANGE) {
--		fprintf(stderr, errmsg);
-+		fputs(errmsg, stderr);
- 		exit(EXIT_FAILURE);
- 	}
- 	return (int) c;
-@@ -213,7 +213,7 @@ int main(int argc, char *argv[])
- 	       != EOF) {
- 		switch (c) {
- 		case 'h':
--			printf(USAGE);
-+			puts(USAGE);
- 			return (EXIT_SUCCESS);
- 		case 'c':
- 			opt_count = parse_uint_arg(optarg,
-@@ -237,13 +237,13 @@ int main(int argc, char *argv[])
- 			break;
- 		case '?':
- 			fprintf(stderr, "unrecognized option: -%c\n", optopt);
--			fprintf(stderr,
--                                "Try `irsimsend -h' for more information.\n");
-+			fputs("Try `irsimsend -h' for more information.\n",
-+                               stderr);
- 			return (EXIT_FAILURE);
- 		}
- 	}
- 	if (argc != optind + 1) {
--		fprintf(stderr, USAGE);
-+		fputs(USAGE, stderr);
- 		return EXIT_FAILURE;
- 	}
- 	lirc_log_get_clientlog("irsimsend", path, sizeof(path));
-diff --git a/tools/irtestcase.c b/tools/irtestcase.c
-index 95d59b7..149c1ad 100644
---- a/tools/irtestcase.c
-+++ b/tools/irtestcase.c
-@@ -92,7 +92,7 @@ static void set_testinput(int fd, const char* path)
- 	lirc_command_init(&command, "DRV_OPTION set-infile %s\n", path);
- 	r = lirc_command_run(&command, fd);
- 	if (r != 0) {
--		fprintf(stderr, "Cannot set test input file\n");
-+		fputs("Cannot set test input file\n", stderr);
- 		exit(2);
- 	}
- }
-@@ -137,7 +137,7 @@ static int nextcode(int fd, char* buff, ssize_t size)
- 		exit(errno);
- 	};
- 	if (strstr(buff, "__EOF") != NULL) {
--		printf("Exit on EOF\n");
-+		puts("Exit on EOF\n");
- 		exit(0);
- 	}
- 	if (i >= 0) {
-@@ -176,16 +176,16 @@ static int irtestcase(int fd_io, int fd_cmd)
- 
- 	if (opt_lircrc != NULL) {
- 		if (lirc_readconfig_only(opt_lircrc, &config, NULL) != 0) {
--			fprintf(stderr, "Cannot initiate lircrc decoding\n");
-+			fputs("Cannot initiate lircrc decoding\n", stderr);
- 			exit(2);
- 		}
- 	}
- 	while (nextcode(fd_io, code, sizeof(code)) == 1) {
--		printf(code);
-+		puts(code);
- 		if (strstr(code, "__EOF") != NULL) {
- 			exit(0);
- 		}
--		fprintf(code_log, code);
-+		fputs(code, code_log);
- 		if (opt_lircrc != NULL){
- 			r = lirc_code2char(config, code, &c);
- 			while (r == 0 && c != NULL) {
-@@ -222,36 +222,35 @@ int main(int argc, char *argv[])
- 			opt_testdata = optarg;
- 			break;
- 		case 'h':
--			printf(USAGE);
-+			puts(USAGE);
- 			return (EXIT_SUCCESS);
- 		case 'v':
- 			printf("%s\n", "irtestcase " VERSION);
- 			return (EXIT_SUCCESS);
- 		case '?':
- 			fprintf(stderr, "unrecognized option: -%c\n", optopt);
--			fprintf(stderr, "Try `irtestcase --help'.\n");
-+			fputs("Try `irtestcase --help'.\n", stderr);
- 			return (EXIT_FAILURE);
- 		}
- 	}
- 	if (argc > optind + 1) {
--		fprintf(stderr,
--			"irtestcase: Too many arguments (max one).\n");
--		fprintf(stderr, "Try `irtestcase --help'.\n");
-+		fputs("irtestcase: Too many arguments (max one).\n", stderr);
-+		fputs("Try `irtestcase --help'.\n", stderr);
- 		return (EXIT_FAILURE);
- 	}
- 	if (strcmp(opt_prog, DEFAULT_PROG) != 0 && opt_lircrc == NULL) {
--		fprintf(stderr, "--prog requires --lircrc/-l. Giving up.\n");
-+		fputs("--prog requires --lircrc/-l. Giving up.\n", stderr);
- 		return (EXIT_FAILURE);
- 	}
- 	if (opt_lircrc != NULL && strcmp(opt_prog, DEFAULT_PROG) == 0) {
--		fprintf(stderr, "--lircrc requires --prog/-p. Giving up.\n");
-+		fputs("--lircrc requires --prog/-p. Giving up.\n", stderr);
- 		return (EXIT_FAILURE);
- 	}
- 
- 	init_testdir();
- 	fd_cmd = lirc_get_local_socket(NULL, 1);
- 	if (fd_cmd < 0) {
--		fprintf(stderr, "Cannot open lircd socket.\n");
-+		fputs("Cannot open lircd socket.\n", stderr);
- 		exit(3);
- 	}
- 	set_devicelog(fd_cmd, DEVICE_LOG);
-@@ -267,7 +266,7 @@ int main(int argc, char *argv[])
- 	setenv("LIRC_SOCKET_PATH", socketpath, 0);
- 	fd_io = lirc_init(opt_prog, 1);
- 	if (fd_io < 0) {
--		fprintf(stderr, "Cannot run lirc_init.\n");
-+		fputs("Cannot run lirc_init.\n", stderr);
- 		exit(3);
- 	}
- 
-diff --git a/tools/lirc-lsplugins.c b/tools/lirc-lsplugins.c
-index 10403a7..4b723c9 100644
---- a/tools/lirc-lsplugins.c
-+++ b/tools/lirc-lsplugins.c
-@@ -111,7 +111,7 @@ static void  lines_next(line_t* line)
- {
- 	lines[line_ix++] = line;
- 	if (line_ix >= MAX_PLUGINS -1){
--		fprintf(stderr, "Too many plugins, giving up. Sorry.");
-+		fputs("Too many plugins, giving up. Sorry.", stderr);
- 		exit(2);
- 	}
- }
-@@ -152,7 +152,7 @@ static void line_print(const line_t* line)
- 	printf("%-20s%-6s%s\n",
-                line->name,  line->flags, line->path);
- 	if (line->errors)
--		printf(line->errors);
-+		puts(line->errors);
- }
- 
- static void print_folded_item(const char* arg)
-@@ -163,7 +163,7 @@ static void print_folded_item(const char* arg)
- 	char* token;
- 
- 	if (arg == NULL) {
--		printf("None\n");
-+		puts("None\n");
- 		return;
- 	}
- 	buff = alloca(strlen(arg) + 1);
-@@ -171,18 +171,18 @@ static void print_folded_item(const char* arg)
- 	token = strtok(buff, " \t");
- 	while (token != NULL) {
- 		if (strlen(token) + pos > 80) {
--			printf("\n\t\t");
-+			puts("\n\t\t");
- 			pos = 0;
- 		}
- 		if (pos != START_POS && pos != 0){
--			printf(" ");
-+			puts(" ");
- 			pos += 1;
- 		}
--		printf(token);
-+		puts(token);
- 		pos += strlen(token);
- 		token = strtok(NULL, " \t");
- 	}
--	printf("\n");
-+	puts("\n");
- }
- 
- 
-@@ -220,7 +220,7 @@ static void line_print_long(const line_t* line)
- 	printf("Version:\t%s\n", line->version ? line->version : "(None)");
- 	printf("Driver info:\t");
- 	print_folded_item(line->info);
--	printf("\n");
-+	puts("\n");
- }
- 
- 
-@@ -356,13 +356,13 @@ void lsplugins(const char* pluginpath, const char* which)
- 		}
- 	}
- 	if (!opt_quiet) {
--		printf("#\n#\n");
-+		puts("#\n#\n");
- 		if (!opt_long) {
--			printf(LEGEND);
--			printf("#\n");
-+			puts(LEGEND);
-+			puts("#\n");
- 		}
- 		if (opt_long)
--			printf(LONG_LEGEND);
-+			puts(LONG_LEGEND);
- 		}
- }
- 
-@@ -383,10 +383,10 @@ int main(int argc, char** argv)
- 				pluginpath = optarg;
- 				break;
- 			case 'h':
--				printf(USAGE);
-+				puts(USAGE);
- 				exit(0);
- 			case 'v':
--				printf("Version: " VERSION "\n");
-+				puts("Version: " VERSION "\n");
- 				exit(0);
- 			case 'p':
- 				printf("Default path: %s\n", pluginpath);
-@@ -404,13 +404,13 @@ int main(int argc, char** argv)
- 				opt_long = 1;
- 				break;
- 			default:
--				fprintf(stderr, USAGE);
-+				fputs(USAGE, stderr);
- 				exit(1);
- 		}
- 	}
-         if (argc - optind  >  1) {
--		fprintf(stderr, "Too many arguments.\n");
--                fprintf(stderr, USAGE);
-+		fputs("Too many arguments.\n", stderr);
-+                fputs(USAGE, stderr);
-                 exit(2);
-         }
- 	which = (argc - optind == 1 ?  argv[argc - 1] : "*");
-diff --git a/tools/lirc-lsremotes.c b/tools/lirc-lsremotes.c
-index 2ac7dad..11e806a 100644
---- a/tools/lirc-lsremotes.c
-+++ b/tools/lirc-lsremotes.c
-@@ -258,16 +258,16 @@ int main(int argc, char** argv)
- 			opt_silent = 1;
- 			break;
- 		case 'h':
--			printf(USAGE);
--			return (EXIT_SUCCESS);
-+			puts(USAGE);
-+			return EXIT_SUCCESS;
- 		case 'v':
- 			printf("%s\n", "lirc-lsremotes " VERSION);
--			return (EXIT_SUCCESS);
-+			return EXIT_SUCCESS;
- 		case '?':
- 			fprintf(stderr, "unrecognized option: -%c\n", optopt);
--			fprintf(stderr,
--                                "Try `lirc-lsremotes -h' for more information.\n");
--			return (EXIT_FAILURE);
-+			fputs("Try `lirc-lsremotes -h' for more information.\n",
-+                               stderr);
-+			return EXIT_FAILURE;
- 		}
- 	}
- 	if (argc == optind + 2) {
-@@ -277,7 +277,7 @@ int main(int argc, char** argv)
- 		dirpath = argv[optind];
- 		configs = "*";
- 	} else {
--		fprintf(stderr, USAGE);
-+		fputs(USAGE, stderr);
- 		return EXIT_FAILURE;
- 	}
- 	lirc_log_get_clientlog("lirc-lsremotes", path, sizeof(path));
-diff --git a/tools/mode2.c b/tools/mode2.c
-index c055a5e..7ed80c9 100644
---- a/tools/mode2.c
-+++ b/tools/mode2.c
-@@ -95,12 +95,14 @@ static void parse_options(int argc, char** argv)
- 	{
- 		switch (c) {
- 		case 'h':
--			printf(help);
-+			puts(help);
- 			exit(EXIT_SUCCESS);
- 		case 'H':
- 			if (hw_choose_driver(optarg) != 0) {
--				fprintf(stderr, "Driver `%s' not found.\n", optarg);
--				fprintf(stderr, "Available drivers:\n");
-+				fprintf(stderr,
-+                                        "Driver `%s' not found.\n",
-+					optarg);
-+				fputs("Available drivers:\n", stderr);
- 				hw_print_drivers(stderr);
- 				exit(EXIT_FAILURE);
- 			}
-@@ -189,11 +191,11 @@ int main(int argc, char **argv)
- 			close(fd);
- 			exit(EXIT_FAILURE);
- 		} else if (ioctl(fd, LIRC_GET_REC_MODE, &mode) == -1) {
--			printf("This program is only intended for receivers"
-+			puts("This program is only intended for receivers"
- 			       " supporting the pulse/space layer.\n");
--			printf("Note that this is no error, but this program "
-+			puts("Note that this is no error, but this program "
- 			       "simply makes no sense for your\n" "receiver.\n");
--			printf("In order to test your setup run lircd with "
-+			puts("In order to test your setup run lircd with "
- 			       "the --nodaemon option and \n then check if the"
- 			       " remote works with the irw tool.\n");
- 			close(fd);
-@@ -208,11 +210,11 @@ int main(int argc, char **argv)
- 		mode = curr_driver->rec_mode;
- 		if (mode != LIRC_MODE_MODE2) {
- 			if (strcmp(curr_driver->name, "default") == 0) {
--				printf("Please use the --raw option to access "
-+				puts("Please use the --raw option to access "
- 				       "the device directly instead through\n"
- 				       "the abstraction layer.\n");
- 			} else {
--				printf("This program does not work for this"
-+				puts("This program does not work for this"
-  				       " hardware yet\n");
- 			}
- 			exit(EXIT_FAILURE);
-@@ -251,15 +253,15 @@ int main(int argc, char **argv)
- 						(void *)&data : buffer),
- 				      count);
- 			if (result != count) {
--				fprintf(stderr, "read() failed\n");
-+				fputs("read() failed\n", stderr);
- 				break;
- 			}
- 		} else {
- 			if (mode == LIRC_MODE_MODE2) {
- 				data = curr_driver->readdata(0);
- 				if (data == 0) {
--					fprintf(stderr,
--					        "readdata() failed\n");
-+					fputs("readdata() failed\n",
-+                                              stderr);
- 					break;
- 				}
- 			} else {
-@@ -268,11 +270,11 @@ int main(int argc, char **argv)
- 		}
- 
- 		if (mode != LIRC_MODE_MODE2) {
--			printf("code: 0x");
-+			puts("code: 0x");
- 			for (i = 0; i < count; i++) {
- 				printf("%02x", (unsigned char)buffer[i]);
- 			}
--			printf("\n");
-+			puts("\n");
- 			fflush(stdout);
- 			continue;
- 		}
-@@ -292,19 +294,19 @@ int main(int argc, char **argv)
- 			if (data & PULSE_BIT) {
- 				if ((bitno & 1) == 0) {
- 					/* not in expected order */
--					printf("-pulse");
-+					puts("-pulse");
- 				}
- 			} else {
- 				if (bitno & 1) {
- 					/* not in expected order */
--					printf("-space");
-+					puts("-space");
- 				}
- 				if (((data & PULSE_MASK) > gap) || (bitno >= 6)) {
- 					/* real long space or more
- 					   than 6 codes, start new line */
--					printf("\n");
-+					puts("\n");
- 					if ((data & PULSE_MASK) > gap)
--						printf("\n");
-+						puts("\n");
- 					bitno = 0;
- 				}
- 			}
-@@ -312,7 +314,7 @@ int main(int argc, char **argv)
- 		}
- 		case 2:
- 			if ((data & PULSE_MASK) > gap)
--				printf("_\n\n_");
-+				puts("_\n\n_");
- 			else
- 				printf("%.*s",
- 				       ((data & PULSE_MASK) + t_div/2) / t_div,
-diff --git a/tools/xmode2.c b/tools/xmode2.c
-index 6a45d4c..9a4e0a1 100644
---- a/tools/xmode2.c
-+++ b/tools/xmode2.c
-@@ -139,12 +139,13 @@ static void parse_options(int argc, char** const argv)
- 	add_defaults();
- 	while ((c = getopt_long(argc, argv, "U:hvd:H:g:t:mr", options, NULL)) != -1) {
- 		switch (c) {
--		case 'h':printf(help);
-+		case 'h':puts(help);
- 			exit (EXIT_SUCCESS);
- 		case 'H':
- 			if (hw_choose_driver(optarg) != 0) {
- 				fprintf(stderr, "Driver `%s' not found", optarg);
--				fprintf(stderr, " (wrong or missing -U/--plugindir?)\n");
-+				fputs(" (wrong or missing -U/--plugindir?)\n",
-+                                       stderr);
- 				hw_print_drivers(stderr);
- 				exit(EXIT_FAILURE);
- 			}
-@@ -186,7 +187,7 @@ void initscreen(char *geometry)
- {
- 	d1 = XOpenDisplay(0);
- 	if (d1 == NULL) {
--		printf("Can't open display.\n");
-+		puts("Can't open display.\n");
- 		exit(0);
- 	}
- 
-@@ -208,10 +209,10 @@ void initscreen(char *geometry)
- 
- 	cm1 = DefaultColormap(d1, 0);
- 	if (!XAllocNamedColor(d1, cm1, "blue", &xc1, &xc2))
--		printf("coudn't allocate blue color\n");
-+		puts("couldn't allocate blue color\n");
- 	f1_str = XLoadQueryFont(d1, font1_name);
- 	if (f1_str == NULL) {
--		printf("could't load font\n");
-+		puts("could't load font\n");
- 		exit(EXIT_FAILURE);
- 	}
- 
-@@ -266,10 +267,10 @@ int main(int argc, char **argv)
- 			close(fd);
- 			exit(EXIT_FAILURE);
- 		} else if (ioctl(fd, LIRC_GET_REC_MODE, &mode) == -1) {
--			printf("This program is only intended for receivers supporting the pulse/space layer.\n");
--			printf("Note that this is no error, but this program "
-+			puts("This program is only intended for receivers supporting the pulse/space layer.\n");
-+			puts("Note that this is no error, but this program "
- 			       "simply makes no sense for your\n" "receiver.\n");
--			printf("In order to test your setup run lircd with "
-+			puts("In order to test your setup run lircd with "
- 			       "the --nodaemon option and \n" "then check if the remote works with the irw tool.\n");
- 			close(fd);
- 			exit(EXIT_FAILURE);
-@@ -277,7 +278,7 @@ int main(int argc, char **argv)
- 	} else {
- 		curr_driver->open_func(device);
- 		if (curr_driver->init_func  && !curr_driver->init_func()) {
--			fprintf(stderr, "Cannot initialize hardware");
-+			fputs("Cannot initialize hardware", stderr);
- 			exit(EXIT_FAILURE);
- 		}
- 
-@@ -285,10 +286,10 @@ int main(int argc, char **argv)
- 		mode = curr_driver->rec_mode;
- 		if (mode != LIRC_MODE_MODE2) {
- 			if (strcmp(curr_driver->name, "default") == 0) {
--				printf("Please use the --raw option to access "
-+				puts("Please use the --raw option to access "
- 				       "the device directly instead through\n" "the abstraction layer.\n");
- 			} else {
--				printf("This program does not work for this hardware yet\n");
-+				puts("This program does not work for this hardware yet\n");
- 			}
- 			exit(EXIT_FAILURE);
- 		}
--- 
-1.9.3
-
diff --git a/lirc.spec b/lirc.spec
index e088c7f..111862a 100644
--- a/lirc.spec
+++ b/lirc.spec
@@ -10,9 +10,9 @@ Name:           lirc
 Version:        0.9.3
 %global         src_vers  %(echo %{version} | sed 's/_/-/g' )
 %if 0%{?released}
-Release:        3%{?dist}
+Release:        4%{?dist}
 %else
-Release:        0.6.pre3%{tag}
+Release:        0.7.pre3%{tag}
 %endif
 
 Summary:        The Linux Infrared Remote Control package
@@ -31,6 +31,7 @@ Source6:        README.fedora
 Source7:        99-remote-control-lirc.rules
                 # Config only, cannot be upstreamed.
 Patch1:         0001-Changing-effective-user-default.patch
+Patch2:         0002-tools-Add-missing-file-lirc-setup-database.py.patch
 
 BuildRequires:  alsa-lib-devel
 Buildrequires:  autoconf
@@ -217,6 +218,7 @@ full support for the ftdi device.
 %setup -qn %{name}-%{src_vers}-%{tag}
 %endif
 %patch1 -p1
+%patch2 -p1
 sed -i -e 's|/usr/local/etc/|/etc/|' contrib/irman2lirc
 
 
@@ -375,6 +377,9 @@ find /etc/systemd -name lirc.service -xtype l -delete || :
 %{_udevrulesdir}/99-remote-control-lirc.rules
 
 %changelog
+* Mon Sep 07 2015 Alec Leamas <leamas.alec@gmail.com> - 0.9.3-4
+- Fix missing file database.py (lirc-setup cannot start).
+
 * Sun Sep 06 2015 Alec Leamas <leamas.alec@gmail.com> - 0.9.3-3
 - Fix missing lirc-drv-irman.
 

From 73d0d20447461b315121abe3d620862f4e10cf66 Mon Sep 17 00:00:00 2001
From: Alec Leamas <leamas.alec@gmail.com>
Date: Wed, 9 Sep 2015 15:45:09 +0200
Subject: [PATCH 150/204] 0.9.3-5: Various fixes.

---
 ...-missing-file-lirc-setup-database.py.patch | 185 ------------------
 0003-lib-Fix-missing-lirc-flag.patch          |  24 +++
 lirc.spec                                     |  37 ++--
 3 files changed, 48 insertions(+), 198 deletions(-)
 delete mode 100644 0002-tools-Add-missing-file-lirc-setup-database.py.patch
 create mode 100644 0003-lib-Fix-missing-lirc-flag.patch

diff --git a/0002-tools-Add-missing-file-lirc-setup-database.py.patch b/0002-tools-Add-missing-file-lirc-setup-database.py.patch
deleted file mode 100644
index 5a30006..0000000
--- a/0002-tools-Add-missing-file-lirc-setup-database.py.patch
+++ /dev/null
@@ -1,185 +0,0 @@
-From afd89cd1a0f41bdfd0bf049e4245258abe7deffb Mon Sep 17 00:00:00 2001
-From: Alec Leamas <leamas.alec@gmail.com>
-Date: Mon, 7 Sep 2015 13:36:30 +0200
-Subject: [PATCH] tools: Add missing file lirc-setup/database.py.
-
----
- tools/Makefile.am            |   3 +-
- tools/lirc-setup/database.py | 151 +++++++++++++++++++++++++++++++++++++++++++
- 2 files changed, 153 insertions(+), 1 deletion(-)
- create mode 100644 tools/lirc-setup/database.py
-
-diff --git a/tools/Makefile.am b/tools/Makefile.am
-index f3fd3c4..d0d820c 100644
---- a/tools/Makefile.am
-+++ b/tools/Makefile.am
-@@ -85,7 +85,8 @@ pkgpython_PYTHON        = lirc-setup/mvc_control.py \
-                           lirc-setup/mvc_view.py \
-                           lirc-setup/mvc_model.py \
-                           lirc-setup/choosers.py \
--                          lirc-setup/baseview.py
-+                          lirc-setup/baseview.py \
-+                          lirc-setup/database.py
- dist_pkgpython_SCRIPTS  = lirc-setup/lirc-setup
- dist_pkgpython_DATA     = lirc-setup/lirc-setup.ui
- endif
-diff --git a/tools/lirc-setup/database.py b/tools/lirc-setup/database.py
-new file mode 100644
-index 0000000..1c1e70b
---- /dev/null
-+++ b/tools/lirc-setup/database.py
-@@ -0,0 +1,151 @@
-+''' Simple lirc setup tool - database part.
-+
-+The database is loaded from some YAML files:
-+
-+  - kernel-drivers.yaml: Info on the kernel drivers.
-+  - drivers,yaml, Info on the uerspace drivers, collected from their
-+    compiled information.
-+  - confs_by_driver.yaml: Mapping of drivers -> suggested remote files,
-+    created by irdb-get.
-+
-+The directory used to load these files is (first match used):
-+  - Current directory
-+  - The 'configs' dir.
-+  - The ../../configs
-+
-+Although python cannot guarantee this, the database is designed to be a
-+read-only structure.
-+
-+'''
-+
-+
-+import glob
-+import os
-+import os.path
-+import sys
-+
-+YAML_MSG = '''
-+"Cannot import the yaml library. Please install the python3
-+yaml package, on many distributions known as python3-PyYAML. It is also
-+available as a pypi package at https://pypi.python.org/pypi/PyYAML.'''
-+
-+try:
-+    import yaml
-+except ImportError:
-+    print(YAML_MSG)
-+    sys.exit(1)
-+
-+
-+def _here(path):
-+    ''' Return path added to current dir for __file__. '''
-+    return os.path.join(os.path.dirname(os.path.abspath(__file__)), path)
-+
-+
-+class Config(object):
-+    ''' The configuration selected, and it's sources. '''
-+    # pylint: disable=too-many-instance-attributes
-+
-+    def __init__(self, config=None):
-+        self.device = None        # << selected device.
-+        self.driver = {}          # << Read-only driver dict in db
-+        self.config = {}          # << Read-only config dict in db
-+        self.modinit = ""         # << Substituted data from driver
-+        self.modprobe = ""        # << Substituted data from driver
-+        self.lircd_conf = ""      # << Name of lircd.conf file
-+        self.lircmd_conf = ""     # << Name of lircmd.conf file
-+        self.label = ""           # << Label for driver + device
-+        if config:
-+            for key, value in config.items():
-+                setattr(self, key, value)
-+
-+
-+class Database(object):
-+    ''' Reflects the *.yaml files in the configs/ directory. '''
-+
-+    def __init__(self, path=None):
-+
-+        if path and os.path.exists(path):
-+            configdir = path
-+        elif path:
-+            raise FileNotFoundError(path)
-+        elif os.path.exists(_here('configs')):
-+            configdir = _here('configs')
-+        elif os.path.exists(_here('../configs')):
-+            configdir = _here('../configs')
-+        else:
-+            raise FileNotFoundError(configdir)
-+        db = {}
-+        with open(os.path.join(configdir, "confs_by_driver.yaml")) as f:
-+            cf = yaml.load(f.read())
-+        db['lircd_by_driver'] = cf['lircd_by_driver'].copy()
-+        db['lirmcd_by_driver'] = cf['lircmd_by_driver'].copy()
-+
-+        with open(os.path.join(configdir, "kernel-drivers.yaml")) as f:
-+            cf = yaml.load(f.read())
-+        db['kernel-drivers'] = cf['drivers'].copy()
-+        db['drivers'] = cf['drivers'].copy()
-+        with open(os.path.join(configdir, "drivers.yaml")) as f:
-+            cf = yaml.load(f.read())
-+        db['drivers'].update(cf['drivers'].copy())
-+        for key, d in db['drivers'].items():
-+            d['id'] = key
-+
-+        configs = {}
-+        for path in glob.glob(configdir + '/*.conf'):
-+            with open(path) as f:
-+                cf = yaml.load(f.read())
-+            configs[cf['config']['id']] = cf['config']
-+        db['configs'] = configs
-+        self.db = db
-+
-+    @property
-+    def kernel_drivers(self):
-+        ''' The kernel-drivers dictionary, drivers.yaml + kernel-drivers.yaml.
-+        '''
-+        return self.db['kernel-drivers']
-+
-+    @property
-+    def drivers(self):
-+        ''' The drivers dictionary, drivers.yaml + kernel-drivers.yaml. '''
-+        return self.db['drivers']
-+
-+    @property
-+    def configs(self):
-+        ''' Return dict of parsed config/*.conf files, keyd by id. '''
-+        return self.db['configs']
-+
-+    def remotes_by_driver(self, driver):
-+        ''' Return the list of remotes suggested for a given driver. '''
-+        if isinstance(driver, dict):
-+            driver = driver['id']
-+        try:
-+            return self.db['lircd_by_driver'][driver]
-+        except KeyError:
-+            return []
-+
-+    def driver_by_remote(self, remote):
-+        ''' Return the driver (possibly None) suggested for a remote. '''
-+        for driver, files in self.db['lircd_by_driver'].items():
-+            if remote in files:
-+                return self.db['drivers'][driver]
-+        return None
-+
-+    def find_config(self, key, value):
-+        ''' Return item (a config) in configs where config[key] == value. '''
-+        found = [c for c in self.db['configs'].values()
-+                 if key in c and c[key] == value]
-+        if len(found) > 1:
-+            print("find_config: not properly found %s, %s): " % (key, value)
-+                  + ', '.join([c['id'] for c in found]))
-+            return None
-+        elif not found:
-+            print("find_config: Nothing  found for %s, %s): " % (key, value))
-+            return None
-+        found = dict(found[0])
-+        if 'device_hint' not in found:
-+            found['device_hint'] = \
-+                self.db['drivers'][found['driver']]['device_hint']
-+        return found
-+
-+
-+# vim: set expandtab ts=4 sw=4:
--- 
-2.4.2
-
diff --git a/0003-lib-Fix-missing-lirc-flag.patch b/0003-lib-Fix-missing-lirc-flag.patch
new file mode 100644
index 0000000..cf0544f
--- /dev/null
+++ b/0003-lib-Fix-missing-lirc-flag.patch
@@ -0,0 +1,24 @@
+From dffeb373e2116d3486169872116fd0b2dd39885a Mon Sep 17 00:00:00 2001
+From: Alec Leamas <leamas.alec@gmail.com>
+Date: Wed, 9 Sep 2015 14:24:30 +0200
+Subject: [PATCH] lib: Fix missing --lirc flag.
+
+---
+ lib/Makefile.am | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/lib/Makefile.am b/lib/Makefile.am
+index 9e14641..4f9435a 100644
+--- a/lib/Makefile.am
++++ b/lib/Makefile.am
+@@ -30,6 +30,7 @@ liblirc_la_SOURCES          = config_file.c \
+                               transmit.c \
+                               util.c
+
++libirrecord_la_LDFLAGS      = -llirc
+ libirrecord_la_SOURCES      = irrecord.c
+
+ liblirc_client_la_LDFLAGS   = -version-info 3:0:3
+--
+2.4.2
+
diff --git a/lirc.spec b/lirc.spec
index 81c5c2d..a29d64b 100644
--- a/lirc.spec
+++ b/lirc.spec
@@ -10,9 +10,9 @@ Name:           lirc
 Version:        0.9.3
 %global         src_vers  %(echo %{version} | sed 's/_/-/g' )
 %if 0%{?released}
-Release:        4%{?dist}
+Release:        5%{?dist}
 %else
-Release:        0.6.pre3%{tag}
+Release:        0.7.pre3%{tag}
 %endif
 
 Summary:        The Linux Infrared Remote Control package
@@ -31,7 +31,9 @@ Source6:        README.fedora
 Source7:        99-remote-control-lirc.rules
                 # Config only, cannot be upstreamed.
 Patch1:         0001-Changing-effective-user-default.patch
-Patch2:         0002-tools-Add-missing-file-lirc-setup-database.py.patch
+                # Already in upstream release branch.
+Patch2:         0002-irrecord-Fix-crash-when-invoked-without-arguments.patch
+Patch3:         0003-lib-Fix-missing-lirc-flag.patch
 
 BuildRequires:  alsa-lib-devel
 Buildrequires:  autoconf
@@ -76,6 +78,7 @@ packages to get a smaller installation.
 
 %package        core
 Summary:        LIRC core, always needed to run LIRC
+Requires:       lirc-libs%{?_isa} = %{version}-%{release}
 
 %description    core
 The LIRC core contains the lircd daemons, the devinput and
@@ -101,7 +104,6 @@ the same as installing previous versions of the lirc package.
 %package        libs
 Summary:        LIRC libraries
 Group:          System Environment/Libraries
-Requires:       lirc-core%{?_isa} = %{version}-%{release}
 
 %description    libs
 LIRC is a package that allows you to decode and send infra-red and
@@ -125,7 +127,7 @@ LIRC configuration process.
 %package        devel
 Summary:        Development files for LIRC
 Group:          Development/Libraries
-Requires:       lirc-libs%{?_isa} = %{version}-%{release}
+Requires:       lirc-core%{?_isa} = %{version}-%{release}
 
 %description    devel
 LIRC is a package that allows you to decode and send infra-red and
@@ -219,6 +221,7 @@ full support for the ftdi device.
 %endif
 %patch1 -p1
 %patch2 -p1
+%patch3 -p1
 sed -i -e 's|/usr/local/etc/|/etc/|' contrib/irman2lirc
 
 
@@ -233,7 +236,7 @@ make %{?_smp_mflags}
 make install DESTDIR=$RPM_BUILD_ROOT
 cd $RPM_BUILD_ROOT%{_datadir}/lirc/contrib
 chmod 755 irman2lirc devinput.sh
-chmod 755 lirc.debian lirc.redhat lircs lirc.suse*
+rm -f lirc.debian lirc.redhat lircs lirc.suse*
 cd $OLDPWD
 rm $RPM_BUILD_ROOT%{_libdir}/*.la
 rm $RPM_BUILD_ROOT%{_libdir}/lirc/plugins/*.la
@@ -247,30 +250,31 @@ install -Dpm 644 %{SOURCE7} \
 cp -a %{SOURCE6} README.fedora
 
 mkdir -p $RPM_BUILD_ROOT/%{_tmpfilesdir}
-echo "d /var/run/lirc  0755  root  root  10d" \
+echo "d /var/run/lirc  0755  lirc  lirc  10d" \
     > $RPM_BUILD_ROOT%{_tmpfilesdir}/lirc.conf
 
-%pre
+%pre core
 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
 exit 0
 
-%post
+%post core
 %systemd_post lircd.service lircmd.service
 systemd-tmpfiles --create %{_tmpfilesdir}/lirc.conf
 # Remove stale links after service name change lirc -> lircd:
 find /etc/systemd -name lirc.service -xtype l -delete || :
 
-%post libs -p /sbin/ldconfig
-
-%preun
+%preun core
 %systemd_preun lircd.service lircmd.service
 
-%postun
+%postun core
 %systemd_postun_with_restart lircd.service lircmd.service
 
+
+%post libs -p /sbin/ldconfig
+
 %postun libs -p /sbin/ldconfig
 
 
@@ -377,6 +381,13 @@ find /etc/systemd -name lirc.service -xtype l -delete || :
 %{_udevrulesdir}/99-remote-control-lirc.rules
 
 %changelog
+* Wed Sep 09 2015 Alec Leamas <leamas.alec@gmail.com> - 0.9.3-5
+- Move scriptles to lirc-core (#1261289).
+- Adjust deps between lib, core, and devel (also #1261289).
+- Make temporary files owned by lirc:lirc
+- Add missing library flag causing rpmlint noise.
+- Remove foreign distro stuff in contrib/.
+
 * Mon Sep 07 2015 Alec Leamas <leamas.alec@gmail.com> - 0.9.3-4
 - Fix missing file database.py (lirc-setup cannot start).
 

From a6c9c3529e5c47f1b56a1134334fa8c1479a34fe Mon Sep 17 00:00:00 2001
From: Alec Leamas <leamas.alec@gmail.com>
Date: Wed, 9 Sep 2015 15:56:09 +0200
Subject: [PATCH 151/204] 0.9.3-5: Add missing patch.

---
 ...crash-when-invoked-without-arguments.patch | 34 +++++++++++++++++++
 1 file changed, 34 insertions(+)
 create mode 100644 0002-irrecord-Fix-crash-when-invoked-without-arguments.patch

diff --git a/0002-irrecord-Fix-crash-when-invoked-without-arguments.patch b/0002-irrecord-Fix-crash-when-invoked-without-arguments.patch
new file mode 100644
index 0000000..be86091
--- /dev/null
+++ b/0002-irrecord-Fix-crash-when-invoked-without-arguments.patch
@@ -0,0 +1,34 @@
+From 26d12ba3dff355e5dbc8dbee0e3965a98ce0dc67 Mon Sep 17 00:00:00 2001
+From: Alec Leamas <leamas.alec@gmail.com>
+Date: Wed, 9 Sep 2015 14:06:21 +0200
+Subject: [PATCH] irrecord: Fix crash when invoked without arguments.
+
+---
+ tools/irrecord-ui.cpp | 4 +++-
+ 1 file changed, 3 insertions(+), 1 deletion(-)
+
+diff --git a/tools/irrecord-ui.cpp b/tools/irrecord-ui.cpp
+index bc58651..249ab87 100644
+--- a/tools/irrecord-ui.cpp
++++ b/tools/irrecord-ui.cpp
+@@ -287,6 +287,7 @@ static void get_commandline(int argc, char** argv, char* buff, size_t size)
+ 	int i;
+ 	int j;
+ 	unsigned int dest = 0;
++	buff[0] = '\0';
+ 
+ 	if (size == 0)
+ 		return;
+@@ -300,7 +301,8 @@ static void get_commandline(int argc, char** argv, char* buff, size_t size)
+ 			break;
+ 		buff[dest++] = ' ';
+ 	}
+-	buff[--dest] = '\0';
++	if (dest > 0)
++		buff[--dest] = '\0';
+ }
+ 
+ 
+-- 
+2.4.2
+

From dac4f2436b04d5f09693c9faa3ebda60ef7af7c2 Mon Sep 17 00:00:00 2001
From: Alec Leamas <leamas.alec@gmail.com>
Date: Wed, 14 Oct 2015 20:57:51 +0200
Subject: [PATCH 152/204] 0.9.3a: New upstream release.

---
 .gitignore |  1 +
 lirc.spec  | 68 +++++++++++++++++++++++++-----------------------------
 lircd.te   | 11 +++++++++
 sources    |  2 +-
 4 files changed, 45 insertions(+), 37 deletions(-)
 create mode 100644 lircd.te

diff --git a/.gitignore b/.gitignore
index c4d0070..5501dec 100644
--- a/.gitignore
+++ b/.gitignore
@@ -9,3 +9,4 @@ lirc-0.8.7pre2.tar.bz2
 /lirc-0.9.2.tar.gz
 /lirc-0.9.2a.tar.gz
 /lirc-0.9.3.tar.gz
+/lirc-0.9.3a.tar.gz
diff --git a/lirc.spec b/lirc.spec
index a29d64b..c9a168f 100644
--- a/lirc.spec
+++ b/lirc.spec
@@ -1,43 +1,29 @@
-%global commit 228db97ccb454932a69deb6685b15e9fca9c6967
-%global shortcommit %(c=%{commit}; echo ${c:0:7})
-
 %global _hardened_build 1
 
 %global released 1
-%define tag     devel
+#define tag     devel
 
 Name:           lirc
-Version:        0.9.3
-%global         src_vers  %(echo %{version} | sed 's/_/-/g' )
-%if 0%{?released}
-Release:        5%{?dist}
-%else
-Release:        0.7.pre3%{tag}
-%endif
-
+Version:        0.9.3a
+Release:        1%{?tag:.}%{?tag}%{?dist}
 Summary:        The Linux Infrared Remote Control package
 
+%global repo    http://downloads.sourceforge.net/lirc/LIRC/%{version}/
+
 Group:          System Environment/Daemons
                 # lib/ciniparser* and lib/dictionary* are BSD, others GPLv2
 License:        GPLv2 and BSD
 URL:            http://www.lirc.org/
-%if 0%{?released}
-Source0:        http://downloads.sourceforge.net/lirc/%{version}/%{name}-%{src_vers}.tar.gz
-%else
-Source0:        ./lirc-%{src_vers}-%{tag}.tar.gz
-#Source0:        http://leamas.fedorapeople.org/lirc/lirc-%%{src_vers}.tar.gz
-%endif
-Source6:        README.fedora
-Source7:        99-remote-control-lirc.rules
+Source0:        %{?released:%{repo}}%{name}-%{version}%{?tag:-}%{?tag}.tar.gz
+Source1:        README.fedora
+Source2:        99-remote-control-lirc.rules
                 # Config only, cannot be upstreamed.
 Patch1:         0001-Changing-effective-user-default.patch
-                # Already in upstream release branch.
-Patch2:         0002-irrecord-Fix-crash-when-invoked-without-arguments.patch
-Patch3:         0003-lib-Fix-missing-lirc-flag.patch
 
 BuildRequires:  alsa-lib-devel
 Buildrequires:  autoconf
 BuildRequires:  automake
+BuildRequires:  checkpolicy
 BuildRequires:  doxygen
 BuildRequires:  iguanaIR-devel
 BuildRequires:  kernel-headers
@@ -61,7 +47,9 @@ Requires(pre):     shadow-utils
 Requires(post):    systemd
                    #for triggerun
 Requires(post):    systemd-sysv
+Requires(post):    policycoreutils
 Requires(postun):  systemd
+Requires(postun):  policycoreutils
 Requires(preun):   systemd
 
 %description
@@ -117,6 +105,8 @@ that applications use to interface with LIRC.
 %package        config
 Summary:        LIRC Configuration Tools and Data
 Requires:       lirc-core = %{version}-%{release}
+Requires:       lirc-doc = %{version}-%{release}
+Requires:       gnome-icon-theme
 BuildArch:      noarch
 
 %description    config
@@ -214,14 +204,10 @@ full support for the ftdi device.
 
 
 %prep
-%if 0%{?released}
-%setup -qn %{name}-%{src_vers}
-%else
-%setup -qn %{name}-%{src_vers}-%{tag}
-%endif
+%setup -qn %{name}-%{version}%{?tag:-}%{?tag}
 %patch1 -p1
-%patch2 -p1
-%patch3 -p1
+sed -i -e 's|gtk-go-forward<|gtk-go-forward-ltr<|g' \
+    tools/lirc-setup/lirc-setup.ui
 sed -i -e 's|/usr/local/etc/|/etc/|' contrib/irman2lirc
 
 
@@ -232,39 +218,41 @@ CFLAGS="%{optflags}" %configure --libdir=%{_libdir}
 make %{?_smp_mflags}
 
 
+
 %install
 make install DESTDIR=$RPM_BUILD_ROOT
 cd $RPM_BUILD_ROOT%{_datadir}/lirc/contrib
 chmod 755 irman2lirc devinput.sh
 rm -f lirc.debian lirc.redhat lircs lirc.suse*
 cd $OLDPWD
-rm $RPM_BUILD_ROOT%{_libdir}/*.la
-rm $RPM_BUILD_ROOT%{_libdir}/lirc/plugins/*.la
+find $RPM_BUILD_ROOT%{_libdir} -name \*.la -delete
 
 install -pm 755 contrib/irman2lirc $RPM_BUILD_ROOT%{_bindir}
 install -Dpm 644 doc/lirc.hwdb $RPM_BUILD_ROOT%{_datadir}/lirc/lirc.hwdb
 install -Dpm 644 contrib/60-lirc.rules \
     $RPM_BUILD_ROOT%{_udevrulesdir}/60-lirc.rules
-install -Dpm 644 %{SOURCE7} \
+install -Dpm 644 %{SOURCE2} \
     $RPM_BUILD_ROOT%{_udevrulesdir}/99-remote-control-lirc.rules
-cp -a %{SOURCE6} README.fedora
+cp -a %{SOURCE1} README.fedora
 
 mkdir -p $RPM_BUILD_ROOT/%{_tmpfilesdir}
 echo "d /var/run/lirc  0755  lirc  lirc  10d" \
     > $RPM_BUILD_ROOT%{_tmpfilesdir}/lirc.conf
 
+
 %pre core
 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
 
 %post core
 %systemd_post lircd.service lircmd.service
 systemd-tmpfiles --create %{_tmpfilesdir}/lirc.conf
-# Remove stale links after service name change lirc -> lircd:
-find /etc/systemd -name lirc.service -xtype l -delete || :
 
 %preun core
 %systemd_preun lircd.service lircmd.service
@@ -381,6 +369,14 @@ find /etc/systemd -name lirc.service -xtype l -delete || :
 %{_udevrulesdir}/99-remote-control-lirc.rules
 
 %changelog
+* Wed Oct 14 2015 Alec Leamas <leamas.alec@gmail.com> - 0.9.3a-1
+  - Upstream update
+  - Added missing icons dependency.
+  - Some patches upstreamed.
+
+* Mon Sep 14 2015 Alec Leamas <leamas.alec@gmail.com> 0.9.3-6
+- Clean up some macros.
+
 * Wed Sep 09 2015 Alec Leamas <leamas.alec@gmail.com> - 0.9.3-5
 - Move scriptles to lirc-core (#1261289).
 - Adjust deps between lib, core, and devel (also #1261289).
diff --git a/lircd.te b/lircd.te
new file mode 100644
index 0000000..0f753c4
--- /dev/null
+++ b/lircd.te
@@ -0,0 +1,11 @@
+policy_module(lircd, 2)
+
+gen_require(`
+  type lircd_t;
+  type passwd_file_t;
+')
+
+
+#============= lircd_t ==============
+allow lircd_t passwd_file_t:file { read getattr open };
+allow lircd_t self:capability { setuid setgid dac_override };
diff --git a/sources b/sources
index 262bceb..f28e510 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-1f7e13d664726ad2d685bc4bdebb8bba  lirc-0.9.3.tar.gz
+05627803238dedcba1225506b7143f69  lirc-0.9.3a.tar.gz

From 11706a08a3f730d9ccba62dcf98324ca99ea4e77 Mon Sep 17 00:00:00 2001
From: Peter Robinson <pbrobinson@fedoraproject.org>
Date: Tue, 10 Nov 2015 14:44:18 +0000
Subject: [PATCH 153/204] - Rebuilt for
 https://fedoraproject.org/wiki/Changes/python3.5

---
 lirc.spec | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/lirc.spec b/lirc.spec
index c9a168f..48ec18d 100644
--- a/lirc.spec
+++ b/lirc.spec
@@ -5,7 +5,7 @@
 
 Name:           lirc
 Version:        0.9.3a
-Release:        1%{?tag:.}%{?tag}%{?dist}
+Release:        2%{?tag:.}%{?tag}%{?dist}
 Summary:        The Linux Infrared Remote Control package
 
 %global repo    http://downloads.sourceforge.net/lirc/LIRC/%{version}/
@@ -369,6 +369,9 @@ systemd-tmpfiles --create %{_tmpfilesdir}/lirc.conf
 %{_udevrulesdir}/99-remote-control-lirc.rules
 
 %changelog
+* Tue Nov 10 2015 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0.9.3a-2
+- Rebuilt for https://fedoraproject.org/wiki/Changes/python3.5
+
 * Wed Oct 14 2015 Alec Leamas <leamas.alec@gmail.com> - 0.9.3a-1
   - Upstream update
   - Added missing icons dependency.

From 6cb65957e2a3fe412f99c141b78791c8e69560ef Mon Sep 17 00:00:00 2001
From: Alec Leamas <leamas.alec@gmail.com>
Date: Wed, 25 Nov 2015 11:21:27 +0100
Subject: [PATCH 154/204] Fix bad Obsoletes: (#1284522).

---
 lirc.spec | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/lirc.spec b/lirc.spec
index 48ec18d..ab05cc9 100644
--- a/lirc.spec
+++ b/lirc.spec
@@ -5,7 +5,7 @@
 
 Name:           lirc
 Version:        0.9.3a
-Release:        2%{?tag:.}%{?tag}%{?dist}
+Release:        3%{?tag:.}%{?tag}%{?dist}
 Summary:        The Linux Infrared Remote Control package
 
 %global repo    http://downloads.sourceforge.net/lirc/LIRC/%{version}/
@@ -75,7 +75,7 @@ default driver and most of the applications.
 
 %package        compat
 Summary:        Compatibility package installing all lirc packages
-Obsoletes:      lirc <=  0.9.1
+Obsoletes:      lirc <=  0.9.1a
 Provides:       lirc = %{version}-%{release}
 Requires:       lirc-core%{?_isa} = %{version}-%{release}
 Requires:       lirc-config = %{version}-%{release}
@@ -369,6 +369,9 @@ systemd-tmpfiles --create %{_tmpfilesdir}/lirc.conf
 %{_udevrulesdir}/99-remote-control-lirc.rules
 
 %changelog
+* Wed Nov 25 2015 Alec Leamas <leamas.alec@gmail.com> - 0.9.3a-3
+- Fix bad Obsoletes (#1284522).
+
 * Tue Nov 10 2015 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0.9.3a-2
 - Rebuilt for https://fedoraproject.org/wiki/Changes/python3.5
 

From 8aaf0c971901716a296357b82c2c31c17bf6006e Mon Sep 17 00:00:00 2001
From: Dennis Gilmore <dennis@ausil.us>
Date: Thu, 4 Feb 2016 04:19:41 +0000
Subject: [PATCH 155/204] - Rebuilt for
 https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild

---
 lirc.spec | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/lirc.spec b/lirc.spec
index ab05cc9..505594a 100644
--- a/lirc.spec
+++ b/lirc.spec
@@ -5,7 +5,7 @@
 
 Name:           lirc
 Version:        0.9.3a
-Release:        3%{?tag:.}%{?tag}%{?dist}
+Release:        4%{?tag:.}%{?tag}%{?dist}
 Summary:        The Linux Infrared Remote Control package
 
 %global repo    http://downloads.sourceforge.net/lirc/LIRC/%{version}/
@@ -369,6 +369,9 @@ systemd-tmpfiles --create %{_tmpfilesdir}/lirc.conf
 %{_udevrulesdir}/99-remote-control-lirc.rules
 
 %changelog
+* Thu Feb 04 2016 Fedora Release Engineering <releng@fedoraproject.org> - 0.9.3a-4
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild
+
 * Wed Nov 25 2015 Alec Leamas <leamas.alec@gmail.com> - 0.9.3a-3
 - Fix bad Obsoletes (#1284522).
 

From 5a89a97eb40f8113116135efe4d32a5ba0f20864 Mon Sep 17 00:00:00 2001
From: Alec Leamas <leamas.alec@gmail.com>
Date: Thu, 12 May 2016 13:47:37 +0200
Subject: [PATCH 156/204] Bugfix: Fix upstreamed/duplicated lirc.4 manpage
 (#1319344).

---
 lirc.spec | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/lirc.spec b/lirc.spec
index 505594a..0b214cf 100644
--- a/lirc.spec
+++ b/lirc.spec
@@ -5,7 +5,7 @@
 
 Name:           lirc
 Version:        0.9.3a
-Release:        4%{?tag:.}%{?tag}%{?dist}
+Release:        5%{?tag:.}%{?tag}%{?dist}
 Summary:        The Linux Infrared Remote Control package
 
 %global repo    http://downloads.sourceforge.net/lirc/LIRC/%{version}/
@@ -226,6 +226,7 @@ chmod 755 irman2lirc devinput.sh
 rm -f lirc.debian lirc.redhat lircs lirc.suse*
 cd $OLDPWD
 find $RPM_BUILD_ROOT%{_libdir} -name \*.la -delete
+find $RPM_BUILD_ROOT%{_mandir}/man4/lirc.*
 
 install -pm 755 contrib/irman2lirc $RPM_BUILD_ROOT%{_bindir}
 install -Dpm 644 doc/lirc.hwdb $RPM_BUILD_ROOT%{_datadir}/lirc/lirc.hwdb
@@ -332,7 +333,6 @@ systemd-tmpfiles --create %{_tmpfilesdir}/lirc.conf
 %exclude %{_datadir}/lirc/configs/*
 %{_mandir}/man1/*ir*.1*
 %{_mandir}/man1/*mode2*.1*
-%{_mandir}/man4/lirc.*
 %{_mandir}/man8/lirc*d.8*
 %{_mandir}/man5/lircd.conf.*
 %exclude %{_mandir}/man1/lirc-config-tool*
@@ -369,6 +369,9 @@ systemd-tmpfiles --create %{_tmpfilesdir}/lirc.conf
 %{_udevrulesdir}/99-remote-control-lirc.rules
 
 %changelog
+* Thu May 12 2016 Alec Leamas <leamas.alec@gmail.com> - 0.9.3a-5
+- Fix upstreamed/duplicated lirc.4 manpage (#1319344).
+
 * Thu Feb 04 2016 Fedora Release Engineering <releng@fedoraproject.org> - 0.9.3a-4
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild
 

From 9f433d2ed11d3ef71fcb572ea0368cdbd5efb2fe Mon Sep 17 00:00:00 2001
From: Alec Leamas <leamas.alec@gmail.com>
Date: Thu, 12 May 2016 13:59:30 +0200
Subject: [PATCH 157/204] Bugfix: Fix upstreamed/duplicated lirc.4 manpage
 (#1319344), again.

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

diff --git a/lirc.spec b/lirc.spec
index 0b214cf..0d284a1 100644
--- a/lirc.spec
+++ b/lirc.spec
@@ -226,7 +226,7 @@ chmod 755 irman2lirc devinput.sh
 rm -f lirc.debian lirc.redhat lircs lirc.suse*
 cd $OLDPWD
 find $RPM_BUILD_ROOT%{_libdir} -name \*.la -delete
-find $RPM_BUILD_ROOT%{_mandir}/man4/lirc.*
+rm -f $RPM_BUILD_ROOT%{_mandir}/man4/lirc.*
 
 install -pm 755 contrib/irman2lirc $RPM_BUILD_ROOT%{_bindir}
 install -Dpm 644 doc/lirc.hwdb $RPM_BUILD_ROOT%{_datadir}/lirc/lirc.hwdb

From 81953037aec33a7efe7b1e3d867f2635db85dd38 Mon Sep 17 00:00:00 2001
From: Alec Leamas <leamas.alec@gmail.com>
Date: Thu, 26 May 2016 17:21:54 +0200
Subject: [PATCH 158/204] New usptream release 0.9.4.

---
 .gitignore                                    |  1 +
 ...crash-when-invoked-without-arguments.patch | 34 ---------
 0003-lib-Fix-missing-lirc-flag.patch          | 24 -------
 ...-Make-the-list-devices-support-avail.patch | 28 ++++++++
 lirc.spec                                     | 70 ++++++-------------
 sources                                       |  2 +-
 6 files changed, 51 insertions(+), 108 deletions(-)
 delete mode 100644 0002-irrecord-Fix-crash-when-invoked-without-arguments.patch
 delete mode 100644 0003-lib-Fix-missing-lirc-flag.patch
 create mode 100644 0008-plugins-devinput-Make-the-list-devices-support-avail.patch

diff --git a/.gitignore b/.gitignore
index 5501dec..c002699 100644
--- a/.gitignore
+++ b/.gitignore
@@ -10,3 +10,4 @@ lirc-0.8.7pre2.tar.bz2
 /lirc-0.9.2a.tar.gz
 /lirc-0.9.3.tar.gz
 /lirc-0.9.3a.tar.gz
+/lirc-0.9.4.tar.gz
diff --git a/0002-irrecord-Fix-crash-when-invoked-without-arguments.patch b/0002-irrecord-Fix-crash-when-invoked-without-arguments.patch
deleted file mode 100644
index be86091..0000000
--- a/0002-irrecord-Fix-crash-when-invoked-without-arguments.patch
+++ /dev/null
@@ -1,34 +0,0 @@
-From 26d12ba3dff355e5dbc8dbee0e3965a98ce0dc67 Mon Sep 17 00:00:00 2001
-From: Alec Leamas <leamas.alec@gmail.com>
-Date: Wed, 9 Sep 2015 14:06:21 +0200
-Subject: [PATCH] irrecord: Fix crash when invoked without arguments.
-
----
- tools/irrecord-ui.cpp | 4 +++-
- 1 file changed, 3 insertions(+), 1 deletion(-)
-
-diff --git a/tools/irrecord-ui.cpp b/tools/irrecord-ui.cpp
-index bc58651..249ab87 100644
---- a/tools/irrecord-ui.cpp
-+++ b/tools/irrecord-ui.cpp
-@@ -287,6 +287,7 @@ static void get_commandline(int argc, char** argv, char* buff, size_t size)
- 	int i;
- 	int j;
- 	unsigned int dest = 0;
-+	buff[0] = '\0';
- 
- 	if (size == 0)
- 		return;
-@@ -300,7 +301,8 @@ static void get_commandline(int argc, char** argv, char* buff, size_t size)
- 			break;
- 		buff[dest++] = ' ';
- 	}
--	buff[--dest] = '\0';
-+	if (dest > 0)
-+		buff[--dest] = '\0';
- }
- 
- 
--- 
-2.4.2
-
diff --git a/0003-lib-Fix-missing-lirc-flag.patch b/0003-lib-Fix-missing-lirc-flag.patch
deleted file mode 100644
index cf0544f..0000000
--- a/0003-lib-Fix-missing-lirc-flag.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-From dffeb373e2116d3486169872116fd0b2dd39885a Mon Sep 17 00:00:00 2001
-From: Alec Leamas <leamas.alec@gmail.com>
-Date: Wed, 9 Sep 2015 14:24:30 +0200
-Subject: [PATCH] lib: Fix missing --lirc flag.
-
----
- lib/Makefile.am | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/lib/Makefile.am b/lib/Makefile.am
-index 9e14641..4f9435a 100644
---- a/lib/Makefile.am
-+++ b/lib/Makefile.am
-@@ -30,6 +30,7 @@ liblirc_la_SOURCES          = config_file.c \
-                               transmit.c \
-                               util.c
-
-+libirrecord_la_LDFLAGS      = -llirc
- libirrecord_la_SOURCES      = irrecord.c
-
- liblirc_client_la_LDFLAGS   = -version-info 3:0:3
---
-2.4.2
-
diff --git a/0008-plugins-devinput-Make-the-list-devices-support-avail.patch b/0008-plugins-devinput-Make-the-list-devices-support-avail.patch
new file mode 100644
index 0000000..60854d4
--- /dev/null
+++ b/0008-plugins-devinput-Make-the-list-devices-support-avail.patch
@@ -0,0 +1,28 @@
+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
+
diff --git a/lirc.spec b/lirc.spec
index 0d284a1..79b8a41 100644
--- a/lirc.spec
+++ b/lirc.spec
@@ -4,8 +4,8 @@
 #define tag     devel
 
 Name:           lirc
-Version:        0.9.3a
-Release:        5%{?tag:.}%{?tag}%{?dist}
+Version:        0.9.4
+Release:        %{?tag:0.}2%{?tag:.}%{?tag}%{?dist}
 Summary:        The Linux Infrared Remote Control package
 
 %global repo    http://downloads.sourceforge.net/lirc/LIRC/%{version}/
@@ -19,17 +19,16 @@ Source1:        README.fedora
 Source2:        99-remote-control-lirc.rules
                 # Config only, cannot be upstreamed.
 Patch1:         0001-Changing-effective-user-default.patch
+Patch2:         0008-plugins-devinput-Make-the-list-devices-support-avail.patch
 
 BuildRequires:  alsa-lib-devel
 Buildrequires:  autoconf
 BuildRequires:  automake
 BuildRequires:  checkpolicy
 BuildRequires:  doxygen
-BuildRequires:  iguanaIR-devel
 BuildRequires:  kernel-headers
 BuildRequires:  man2html
 BuildRequires:  libftdi-devel
-BuildRequires:  libirman-devel
 BuildRequires:  libtool
 BuildRequires:  libusb-devel
 BuildRequires:  libusb1-devel
@@ -80,9 +79,7 @@ Provides:       lirc = %{version}-%{release}
 Requires:       lirc-core%{?_isa} = %{version}-%{release}
 Requires:       lirc-config = %{version}-%{release}
 Requires:       lirc-tools-gui%{?_isa} = %{version}-%{release}
-Requires:       lirc-drv-iguanaIR%{?_isa} = %{version}-%{release}
 Requires:       lirc-drv-portaudio%{?_isa} = %{version}-%{release}
-Requires:       lirc-drv-irman%{?_isa} = %{version}-%{release}
 Requires:       lirc-drv-ftdi%{?_isa} = %{version}-%{release}
 
 %description    compat
@@ -110,7 +107,7 @@ Requires:       gnome-icon-theme
 BuildArch:      noarch
 
 %description    config
-The LIRC config package contains tools and data  to ease the
+The LIRC config package contains tools and data to support the
 LIRC configuration process.
 
 
@@ -160,16 +157,6 @@ Requires:       lirc-core%{?_isa} = %{version}-%{release}
 Some seldom used X11-based tools for debugging lirc configurations.
 
 
-%package        drv-iguanaIR
-Summary:        IguanaIR LIRC User-Space Driver
-Requires:       lirc-core%{?_isa} = %{version}-%{release}
-License:        LGPLv2
-
-%description    drv-iguanaIR
-LIRC user-space driver which works together with the low-level  iguanaIR
-package, providing full-fledged support for the iguanaIR devices.
-
-
 %package        drv-portaudio
 Summary:        Portaudio LIRC User-Space Driver
 Requires:       lirc-core%{?_isa} = %{version}-%{release}
@@ -180,15 +167,6 @@ LIRC user space driver which supports  a IR receiver in microphone input
 using the portaudio library.
 
 
-%package        drv-irman
-Summary:        Irman LIRC User-Space Driver
-Requires:       lirc-core%{?_isa} = %{version}-%{release}
-
-%description   drv-irman
-LIRC user-space driver which works together with the kernel, providing
-full support for the irman device.
-
-
 %package        drv-ftdi
 Summary:        Ftdi LIRC User-Space Driver
 Requires:       lirc-core%{?_isa} = %{version}-%{release}
@@ -204,10 +182,9 @@ full support for the ftdi device.
 
 
 %prep
-%setup -qn %{name}-%{version}%{?tag:-}%{?tag}
+%setup -qn %{name}-%{version}%{?tag}
 %patch1 -p1
-sed -i -e 's|gtk-go-forward<|gtk-go-forward-ltr<|g' \
-    tools/lirc-setup/lirc-setup.ui
+%patch2 -p1
 sed -i -e 's|/usr/local/etc/|/etc/|' contrib/irman2lirc
 
 
@@ -217,16 +194,13 @@ autoreconf -fi
 CFLAGS="%{optflags}" %configure --libdir=%{_libdir}
 make %{?_smp_mflags}
 
-
-
 %install
 make install DESTDIR=$RPM_BUILD_ROOT
 cd $RPM_BUILD_ROOT%{_datadir}/lirc/contrib
-chmod 755 irman2lirc devinput.sh
-rm -f lirc.debian lirc.redhat lircs lirc.suse*
+chmod 755 irman2lirc
 cd $OLDPWD
-find $RPM_BUILD_ROOT%{_libdir} -name \*.la -delete
-rm -f $RPM_BUILD_ROOT%{_mandir}/man4/lirc.*
+rm $RPM_BUILD_ROOT%{_libdir}/*.la
+rm $RPM_BUILD_ROOT%{_libdir}/lirc/plugins/*.la
 
 install -pm 755 contrib/irman2lirc $RPM_BUILD_ROOT%{_bindir}
 install -Dpm 644 doc/lirc.hwdb $RPM_BUILD_ROOT%{_datadir}/lirc/lirc.hwdb
@@ -269,15 +243,6 @@ systemd-tmpfiles --create %{_tmpfilesdir}/lirc.conf
 
 %files compat
 
-%files drv-iguanaIR
-%{_libdir}/lirc/plugins/iguanaIR.so
-%{_datadir}/lirc/configs/iguanaIR.conf
-
-
-%files drv-irman
-%{_libdir}/lirc/plugins/irman.so
-%{_datadir}/lirc/configs/irman.conf
-
 %files drv-portaudio
 %{_libdir}/lirc/plugins/audio.so
 %{_datadir}/lirc/configs/audio.conf
@@ -301,8 +266,6 @@ systemd-tmpfiles --create %{_tmpfilesdir}/lirc.conf
 %{_mandir}/man1/lirc-setup*
 %{_datadir}/lirc/configs/*
 %{python3_sitelib}/lirc
-%exclude %{_datadir}/lirc/configs/iguanaIR.conf
-%exclude %{_datadir}/lirc/configs/irman.conf
 %exclude %{_datadir}/lirc/configs/ftdi.conf
 %exclude %{_datadir}/lirc/configs/audio.conf
 
@@ -313,8 +276,10 @@ systemd-tmpfiles --create %{_tmpfilesdir}/lirc.conf
 %dir  /etc/lirc
 /etc/lirc/lircd.conf.d
 %config(noreplace) /etc/lirc/lirc*.conf
+%config(noreplace) /etc/lirc/irexec.lircrc
 %{_tmpfilesdir}/lirc.conf
 %{_unitdir}/lirc*
+%{_unitdir}/irexec.service
 %{_udevrulesdir}/60-lirc.rules
 %{_bindir}/*ir*
 %{_bindir}/*mode2
@@ -325,16 +290,19 @@ systemd-tmpfiles --create %{_tmpfilesdir}/lirc.conf
 %exclude %{_bindir}/lirc-config-tool
 %{_sbindir}/lirc*
 %{_libdir}/lirc/plugins
-%exclude %{_libdir}/lirc/plugins/iguanaIR.so
-%exclude %{_libdir}/lirc/plugins/irman.so
 %exclude %{_libdir}/lirc/plugins/ftdi.so
 %exclude %{_libdir}/lirc/plugins/audio.so
 %{_datadir}/lirc/
+/var/lib/lirc/images
+/var/lib/lirc/plugins
 %exclude %{_datadir}/lirc/configs/*
 %{_mandir}/man1/*ir*.1*
 %{_mandir}/man1/*mode2*.1*
-%{_mandir}/man8/lirc*d.8*
 %{_mandir}/man5/lircd.conf.*
+%{_mandir}/man5/lircrc.*
+%{_mandir}/man8/lirc*d.8*
+%{_mandir}/man8/lircd-setup.8*
+%{_mandir}/man8/lircd-uinput.8*
 %exclude %{_mandir}/man1/lirc-config-tool*
 %exclude %{_mandir}/man1/irdb-get*
 %exclude %{_mandir}/man1/lirc-setup*
@@ -369,6 +337,9 @@ systemd-tmpfiles --create %{_tmpfilesdir}/lirc.conf
 %{_udevrulesdir}/99-remote-control-lirc.rules
 
 %changelog
+* Thu May 26 2016 Alec Leamas <leamas.alec@gmail.com> - 0.9.4-2
+- New upstream release.
+
 * Thu May 12 2016 Alec Leamas <leamas.alec@gmail.com> - 0.9.3a-5
 - Fix upstreamed/duplicated lirc.4 manpage (#1319344).
 
@@ -387,6 +358,7 @@ systemd-tmpfiles --create %{_tmpfilesdir}/lirc.conf
   - Some patches upstreamed.
 
 * Mon Sep 14 2015 Alec Leamas <leamas.alec@gmail.com> 0.9.3-6
+- Add a selinux policy.
 - Clean up some macros.
 
 * Wed Sep 09 2015 Alec Leamas <leamas.alec@gmail.com> - 0.9.3-5
diff --git a/sources b/sources
index f28e510..f50743a 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-05627803238dedcba1225506b7143f69  lirc-0.9.3a.tar.gz
+eb7d324ea9a7acce4892e32cedae1f2c  lirc-0.9.4.tar.gz

From 86484ce4331f053748d0bba153658eef614a3d2d Mon Sep 17 00:00:00 2001
From: Alec Leamas <leamas.alec@gmail.com>
Date: Thu, 26 May 2016 17:53:41 +0200
Subject: [PATCH 159/204] Fix parallel build deps error.

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

diff --git a/lirc.spec b/lirc.spec
index 79b8a41..0bcb3c0 100644
--- a/lirc.spec
+++ b/lirc.spec
@@ -20,6 +20,7 @@ Source2:        99-remote-control-lirc.rules
                 # Config only, cannot be upstreamed.
 Patch1:         0001-Changing-effective-user-default.patch
 Patch2:         0008-plugins-devinput-Make-the-list-devices-support-avail.patch
+Patch3:         0003-lib-use-proper-linking-method-to-avoid-parallel-buil.patch
 
 BuildRequires:  alsa-lib-devel
 Buildrequires:  autoconf
@@ -185,6 +186,7 @@ full support for the ftdi device.
 %setup -qn %{name}-%{version}%{?tag}
 %patch1 -p1
 %patch2 -p1
+%patch3 -p1
 sed -i -e 's|/usr/local/etc/|/etc/|' contrib/irman2lirc
 
 

From 895fbbdd46b10a8ffdcf7962b11ac9871adf45e9 Mon Sep 17 00:00:00 2001
From: Alec Leamas <leamas.alec@gmail.com>
Date: Thu, 26 May 2016 17:57:01 +0200
Subject: [PATCH 160/204] Fix parallel build deps error.

---
 lirc.spec | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/lirc.spec b/lirc.spec
index 0bcb3c0..27e89c8 100644
--- a/lirc.spec
+++ b/lirc.spec
@@ -5,7 +5,7 @@
 
 Name:           lirc
 Version:        0.9.4
-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}/
@@ -339,6 +339,9 @@ systemd-tmpfiles --create %{_tmpfilesdir}/lirc.conf
 %{_udevrulesdir}/99-remote-control-lirc.rules
 
 %changelog
+* Thu May 26 2016 Alec Leamas <leamas.alec@gmail.com> - 0.9.4-3
+- Add fix for FTBS parallel build deps error.
+
 * Thu May 26 2016 Alec Leamas <leamas.alec@gmail.com> - 0.9.4-2
 - New upstream release.
 

From ceeb78df3abff9c42e25f49e91546a56e5063445 Mon Sep 17 00:00:00 2001
From: Alec Leamas <leamas.alec@gmail.com>
Date: Thu, 26 May 2016 17:59:22 +0200
Subject: [PATCH 161/204] Really add the FTBS linker fix patch.

---
 ...inking-method-to-avoid-parallel-buil.patch | 63 +++++++++++++++++++
 1 file changed, 63 insertions(+)
 create mode 100644 0003-lib-use-proper-linking-method-to-avoid-parallel-buil.patch

diff --git a/0003-lib-use-proper-linking-method-to-avoid-parallel-buil.patch b/0003-lib-use-proper-linking-method-to-avoid-parallel-buil.patch
new file mode 100644
index 0000000..a3347b6
--- /dev/null
+++ b/0003-lib-use-proper-linking-method-to-avoid-parallel-buil.patch
@@ -0,0 +1,63 @@
+From 8e0e7b65dea3b9f71e8658f0e417fac6409b4c2c Mon Sep 17 00:00:00 2001
+From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
+Date: Wed, 25 May 2016 16:34:55 +0200
+Subject: [PATCH] lib: use proper linking method to avoid parallel build issue
+
+Using <foo>_LDFLAGS = -l<library> is correct when <library> is an
+external library. However, when it is built by the same package, and
+especially in the same directory, this is wrong and can cause parallel
+build issues. In lib/Makefile.am, there was:
+
+libirrecord_la_LDFLAGS      = -llirc
+
+But the liblirc library is built in the same directory. Or, due to the
+using of <foo>_LDFLAGS, make is not aware of the build dependency
+between libirrecord and liblirc.
+
+To solve this, <foo>_LIBADD should be used instead, as follows:
+
+libirrecord_la_LIBADD       = liblirc.la
+
+This fixes parallel build issues seen by automated build tests
+conducted by the Buildroot project, such as:
+
+  http://autobuild.buildroot.org/results/eb4/eb47d57de8182d25b1dacbf0ac3726ed20063d04/build-end.log
+
+Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
+---
+ lib/Makefile.am | 8 +++++++-
+ 1 file changed, 7 insertions(+), 1 deletion(-)
+
+diff --git a/lib/Makefile.am b/lib/Makefile.am
+index ce5c94c..fc77a60 100644
+--- a/lib/Makefile.am
++++ b/lib/Makefile.am
+@@ -29,7 +29,7 @@ liblirc_la_SOURCES          = config_file.c \
+                               transmit.c \
+                               util.c
+ 
+-libirrecord_la_LDFLAGS      = -llirc
++libirrecord_la_LIBADD       = -llirc
+ libirrecord_la_SOURCES      = irrecord.c
+ 
+ liblirc_client_la_LDFLAGS   = -version-info 4:0:4
+@@ -98,10 +98,16 @@ input_map.lo: lirc/input_map.inc
+ 
+ input_map.inc: lirc/input_map.inc
+ 
++if BSD
++lirc/input_map.inc:
++	touch $@
++	touch touch input_map.inc
++else
+ lirc/input_map.inc:
+ 	ln -s . lirc || :
+ 	$(top_srcdir)/tools/lirc-make-devinput -i > input_map.inc
+ 	$(top_srcdir)/tools/lirc-make-devinput -i > $@
++endif
+ 
+ checkfiles:
+ 	../git-tools/checkfiles $(SOURCES) $(HEADERS)
+-- 
+2.5.5
+

From c38d577c48cefdf1c7baf73ad512b57fafa047af Mon Sep 17 00:00:00 2001
From: Fedora Release Engineering <releng@fedoraproject.org>
Date: Tue, 19 Jul 2016 07:50:11 +0000
Subject: [PATCH 162/204] -
 https://fedoraproject.org/wiki/Changes/Automatic_Provides_for_Python_RPM_Packages

---
 lirc.spec | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/lirc.spec b/lirc.spec
index 27e89c8..9ab0886 100644
--- a/lirc.spec
+++ b/lirc.spec
@@ -5,7 +5,7 @@
 
 Name:           lirc
 Version:        0.9.4
-Release:        %{?tag:0.}3%{?tag:.}%{?tag}%{?dist}
+Release:        %{?tag:0.}3%{?tag:.}%{?tag}%{?dist}.1
 Summary:        The Linux Infrared Remote Control package
 
 %global repo    http://downloads.sourceforge.net/lirc/LIRC/%{version}/
@@ -339,6 +339,9 @@ systemd-tmpfiles --create %{_tmpfilesdir}/lirc.conf
 %{_udevrulesdir}/99-remote-control-lirc.rules
 
 %changelog
+* Tue Jul 19 2016 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0.9.4-3.1
+- https://fedoraproject.org/wiki/Changes/Automatic_Provides_for_Python_RPM_Packages
+
 * Thu May 26 2016 Alec Leamas <leamas.alec@gmail.com> - 0.9.4-3
 - Add fix for FTBS parallel build deps error.
 

From 0f418eec86cd336cbfafda8720ffd79dc9d7bcc3 Mon Sep 17 00:00:00 2001
From: Alec Leamas <leamas.alec@gmail.com>
Date: Fri, 19 Aug 2016 05:38:19 +0200
Subject: [PATCH 163/204] Update for 0.9.4b

---
 ...sa-Fix-byte-truncating-in-16-bit-dat.patch |  36 ++++
 ...devices-acl-permissions-rhbz-1364744.patch |  31 +++
 0006-include-Update-bundled-lirc.h.patch      | 182 ++++++++++++++++++
 ...-of-functions-killed-in-kernel-4.8.0.patch | 110 +++++++++++
 lirc.spec                                     |  34 +++-
 5 files changed, 387 insertions(+), 6 deletions(-)
 create mode 100644 0004-plugins-audio_alsa-Fix-byte-truncating-in-16-bit-dat.patch
 create mode 100644 0005-contrib-Fix-usb-devices-acl-permissions-rhbz-1364744.patch
 create mode 100644 0006-include-Update-bundled-lirc.h.patch
 create mode 100644 0007-lircd-Remove-use-of-functions-killed-in-kernel-4.8.0.patch

diff --git a/0004-plugins-audio_alsa-Fix-byte-truncating-in-16-bit-dat.patch b/0004-plugins-audio_alsa-Fix-byte-truncating-in-16-bit-dat.patch
new file mode 100644
index 0000000..ef63323
--- /dev/null
+++ b/0004-plugins-audio_alsa-Fix-byte-truncating-in-16-bit-dat.patch
@@ -0,0 +1,36 @@
+From 5d933bee5c100e119c26476e45b69e019b392323 Mon Sep 17 00:00:00 2001
+From: Alec Leamas <leamas.alec@gmail.com>
+Date: Wed, 17 Aug 2016 21:28:00 +0200
+Subject: [PATCH] plugins: audio_alsa: Fix byte truncating in 16-bit data
+ (#218):
+
+This fixes a bug introduced in 82305c72 which basically was
+about muting a "dereferencing type-punned pointer will break
+strict-aliasing rules" compiler warning.
+---
+ plugins/audio_alsa.c | 7 ++++---
+ 1 file changed, 4 insertions(+), 3 deletions(-)
+
+diff --git a/plugins/audio_alsa.c b/plugins/audio_alsa.c
+index 20022f3..ff0d8a9 100644
+--- a/plugins/audio_alsa.c
++++ b/plugins/audio_alsa.c
+@@ -436,11 +436,12 @@ var_reset:                      /* Reset variables */
+ 		for (i = 0; i < count; i++) {
+ 			/* cs == current sample */
+ 			unsigned char cs, as, sl, sz, xz;
+-			short stmp;
++			unsigned short stmp;
+ 
+ 			if (bytes_per_sample == 2) {
+-				stmp = buff[i * bytes_per_sample * alsa_hw.num_channels +
+-					    bytes_per_sample * alsa_hw.channel];
++				int ix = i * bytes_per_sample * alsa_hw.num_channels +
++					     bytes_per_sample * alsa_hw.channel;
++				memcpy(&stmp, &buff[ix], sizeof(stmp));
+ 				cs = stmp >> 8;
+ 				cs ^= 0x80;
+ 			} else {
+-- 
+2.5.5
+
diff --git a/0005-contrib-Fix-usb-devices-acl-permissions-rhbz-1364744.patch b/0005-contrib-Fix-usb-devices-acl-permissions-rhbz-1364744.patch
new file mode 100644
index 0000000..a9dadfc
--- /dev/null
+++ b/0005-contrib-Fix-usb-devices-acl-permissions-rhbz-1364744.patch
@@ -0,0 +1,31 @@
+From 6b8fad0fdfd026d437ab6b953e701f2ece307e45 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(-)
+
+diff --git a/contrib/60-lirc.rules b/contrib/60-lirc.rules
+index 8147546..687009b 100644
+--- a/contrib/60-lirc.rules
++++ b/contrib/60-lirc.rules
+@@ -1,8 +1,9 @@
+-# Installing this udev rule will make the /dev/lirc* devices accessible
+-# for users in the group "lirc" using regular group permissions. USB
+-# devices grants rw permission to the lirc group using ACL.
+-# To enable, copy to /etc/udev/rules.d.
++# Make the /dev/lirc* devices accessible for users in the group "lirc"
++# using regular group permissions.
+ 
+ KERNEL=="lirc[0-9]*", SUBSYSTEM=="lirc", GROUP="lirc", MODE="0660"
+-ACTION=="add", SUBSYSTEM=="usb", \
++
++# 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}"
+-- 
+2.5.5
+
diff --git a/0006-include-Update-bundled-lirc.h.patch b/0006-include-Update-bundled-lirc.h.patch
new file mode 100644
index 0000000..59f97bc
--- /dev/null
+++ b/0006-include-Update-bundled-lirc.h.patch
@@ -0,0 +1,182 @@
+From 5dd37205a06a44e6b9cdbae5a3901e39270f0975 Mon Sep 17 00:00:00 2001
+From: Alec Leamas <leamas.alec@gmail.com>
+Date: Thu, 18 Aug 2016 22:35:31 +0200
+Subject: [PATCH 6/7] include: Update bundled lirc.h.
+
+---
+ include/media/lirc.h | 95 ++++++----------------------------------------------
+ 1 file changed, 10 insertions(+), 85 deletions(-)
+
+diff --git a/include/media/lirc.h b/include/media/lirc.h
+index 601fccb..991ab45 100644
+--- a/include/media/lirc.h
++++ b/include/media/lirc.h
+@@ -1,39 +1,13 @@
+-/**
+- * @file lirc.c
+- * This file contains some general definitions, like feature flags.
+- * It's a bundled copy from the kernel sources. Being part of
+- * kernel sources is a bug, see
+- * https://bugzilla.kernel.org/show_bug.cgi?id=75751.
+- * The file is upstreamed to the kernel from 4.6.
+- */
+-
+-#ifndef LIRC_BASE_H
+-#define LIRC_BASE_H
+-
+-#ifdef	__cplusplus
+-extern "C" {
+-#endif
+-
+-/**
+- * This data type, with its extremely carefully selected name, is used as
+- * data type for the signal durations.
+- */
+-#define lirc_t int
+-
+ /*
+  * lirc.h - linux infrared remote control header file
+- * last modified 2010/06/03 by Jarod Wilson
++ * last modified 2010/07/13 by Jarod Wilson
+  */
+ 
+-#if defined(__linux__)
++#ifndef _LINUX_LIRC_H
++#define _LINUX_LIRC_H
++
+ #include <linux/types.h>
+ #include <linux/ioctl.h>
+-#elif defined(_NetBSD_)
+-#include <sys/ioctl.h>
+-#elif defined(_CYGWIN_)
+-#define __USE_LINUX_IOCTL_DEFS
+-#include <sys/ioctl.h>
+-#endif
+ 
+ #define PULSE_BIT       0x01000000
+ #define PULSE_MASK      0x00FFFFFF
+@@ -59,6 +33,9 @@ extern "C" {
+ #define LIRC_IS_FREQUENCY(val) (LIRC_MODE2(val) == LIRC_MODE2_FREQUENCY)
+ #define LIRC_IS_TIMEOUT(val) (LIRC_MODE2(val) == LIRC_MODE2_TIMEOUT)
+ 
++/* used heavily by lirc userspace */
++#define lirc_t int
++
+ /*** lirc compatible hardware features ***/
+ 
+ #define LIRC_MODE2SEND(x) (x)
+@@ -79,16 +56,8 @@ extern "C" {
+ 
+ #define LIRC_CAN_SEND_MASK             0x0000003f
+ 
+-/** This flag indicates that the transmitter is capable of setting the
+- * IR carrier frequency. */
+ #define LIRC_CAN_SET_SEND_CARRIER      0x00000100
+-
+-/** This flag indicates that the transmitter is capable of setting the
+- *  duty cycle of generated IR signals. */
+ #define LIRC_CAN_SET_SEND_DUTY_CYCLE   0x00000200
+-
+-/** This flag indicates that the transmitter is capable of setting a
+- *  transmitter mask, i.e., probably has several transmitters. */
+ #define LIRC_CAN_SET_TRANSMITTER_MASK  0x00000400
+ 
+ #define LIRC_CAN_REC_RAW               LIRC_MODE2REC(LIRC_MODE_RAW)
+@@ -107,16 +76,10 @@ extern "C" {
+ #define LIRC_CAN_SET_REC_TIMEOUT          0x10000000
+ #define LIRC_CAN_SET_REC_FILTER           0x08000000
+ 
+-
+-/** This flag indicates that the receiver is capable of estimating
+- *  the carrier frequency of received IR signals. */
+ #define LIRC_CAN_MEASURE_CARRIER          0x02000000
+ #define LIRC_CAN_USE_WIDEBAND_RECEIVER    0x04000000
+ 
+-/** Extract sending features from its argument. */
+ #define LIRC_CAN_SEND(x) ((x)&LIRC_CAN_SEND_MASK)
+-
+-/** Extract receiving features from its argument. */
+ #define LIRC_CAN_REC(x) ((x)&LIRC_CAN_REC_MASK)
+ 
+ #define LIRC_CAN_NOTIFY_DECODE            0x01000000
+@@ -127,20 +90,11 @@ extern "C" {
+ 
+ #define LIRC_GET_SEND_MODE             _IOR('i', 0x00000001, __u32)
+ #define LIRC_GET_REC_MODE              _IOR('i', 0x00000002, __u32)
+-#define LIRC_GET_SEND_CARRIER          _IOR('i', 0x00000003, __u32)
+-#define LIRC_GET_REC_CARRIER           _IOR('i', 0x00000004, __u32)
+-#define LIRC_GET_SEND_DUTY_CYCLE       _IOR('i', 0x00000005, __u32)
+-#define LIRC_GET_REC_DUTY_CYCLE        _IOR('i', 0x00000006, __u32)
+ #define LIRC_GET_REC_RESOLUTION        _IOR('i', 0x00000007, __u32)
+ 
+ #define LIRC_GET_MIN_TIMEOUT           _IOR('i', 0x00000008, __u32)
+ #define LIRC_GET_MAX_TIMEOUT           _IOR('i', 0x00000009, __u32)
+ 
+-#define LIRC_GET_MIN_FILTER_PULSE      _IOR('i', 0x0000000a, __u32)
+-#define LIRC_GET_MAX_FILTER_PULSE      _IOR('i', 0x0000000b, __u32)
+-#define LIRC_GET_MIN_FILTER_SPACE      _IOR('i', 0x0000000c, __u32)
+-#define LIRC_GET_MAX_FILTER_SPACE      _IOR('i', 0x0000000d, __u32)
+-
+ /* code length in bits, currently only for LIRC_MODE_LIRCCODE */
+ #define LIRC_GET_LENGTH                _IOR('i', 0x0000000f, __u32)
+ 
+@@ -150,7 +104,6 @@ extern "C" {
+ #define LIRC_SET_SEND_CARRIER          _IOW('i', 0x00000013, __u32)
+ #define LIRC_SET_REC_CARRIER           _IOW('i', 0x00000014, __u32)
+ #define LIRC_SET_SEND_DUTY_CYCLE       _IOW('i', 0x00000015, __u32)
+-#define LIRC_SET_REC_DUTY_CYCLE        _IOW('i', 0x00000016, __u32)
+ #define LIRC_SET_TRANSMITTER_MASK      _IOW('i', 0x00000017, __u32)
+ 
+ /*
+@@ -164,45 +117,17 @@ extern "C" {
+ #define LIRC_SET_REC_TIMEOUT_REPORTS   _IOW('i', 0x00000019, __u32)
+ 
+ /*
+- * pulses shorter than this are filtered out by hardware (software
+- * emulation in lirc_dev?)
+- */
+-#define LIRC_SET_REC_FILTER_PULSE      _IOW('i', 0x0000001a, __u32)
+-/*
+- * spaces shorter than this are filtered out by hardware (software
+- * emulation in lirc_dev?)
+- */
+-#define LIRC_SET_REC_FILTER_SPACE      _IOW('i', 0x0000001b, __u32)
+-/*
+- * if filter cannot be set independantly for pulse/space, this should
+- * be used
+- */
+-#define LIRC_SET_REC_FILTER            _IOW('i', 0x0000001c, __u32)
+-
+-/*
+  * if enabled from the next key press on the driver will send
+  * LIRC_MODE2_FREQUENCY packets
+  */
+-#define LIRC_SET_MEASURE_CARRIER_MODE  _IOW('i', 0x0000001d, __u32)
++#define LIRC_SET_MEASURE_CARRIER_MODE	_IOW('i', 0x0000001d, __u32)
+ 
+ /*
+- * to set a range use
+- * LIRC_SET_REC_DUTY_CYCLE_RANGE/LIRC_SET_REC_CARRIER_RANGE with the
+- * lower bound first and later
+- * LIRC_SET_REC_DUTY_CYCLE/LIRC_SET_REC_CARRIER with the upper bound
++ * to set a range use LIRC_SET_REC_CARRIER_RANGE with the
++ * lower bound first and later LIRC_SET_REC_CARRIER with the upper bound
+  */
+-
+-#define LIRC_SET_REC_DUTY_CYCLE_RANGE  _IOW('i', 0x0000001e, __u32)
+ #define LIRC_SET_REC_CARRIER_RANGE     _IOW('i', 0x0000001f, __u32)
+ 
+-#define LIRC_NOTIFY_DECODE             _IO('i', 0x00000020)
+-
+-#define LIRC_SETUP_START               _IO('i', 0x00000021)
+-#define LIRC_SETUP_END                 _IO('i', 0x00000022)
+ #define LIRC_SET_WIDEBAND_RECEIVER     _IOW('i', 0x00000023, __u32)
+ 
+-#ifdef	__cplusplus
+-}
+ #endif
+-
+-#endif //LIRC_BASE_H
+-- 
+2.5.5
+
diff --git a/0007-lircd-Remove-use-of-functions-killed-in-kernel-4.8.0.patch b/0007-lircd-Remove-use-of-functions-killed-in-kernel-4.8.0.patch
new file mode 100644
index 0000000..65a48e8
--- /dev/null
+++ b/0007-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
+
diff --git a/lirc.spec b/lirc.spec
index 9ab0886..7ad0925 100644
--- a/lirc.spec
+++ b/lirc.spec
@@ -4,8 +4,8 @@
 #define tag     devel
 
 Name:           lirc
-Version:        0.9.4
-Release:        %{?tag:0.}3%{?tag:.}%{?tag}%{?dist}.1
+Version:        0.9.4b
+Release:        %{?tag:0.}2%{?tag:.}%{?tag}%{?dist}
 Summary:        The Linux Infrared Remote Control package
 
 %global repo    http://downloads.sourceforge.net/lirc/LIRC/%{version}/
@@ -18,9 +18,10 @@ Source0:        %{?released:%{repo}}%{name}-%{version}%{?tag:-}%{?tag}.tar.gz
 Source1:        README.fedora
 Source2:        99-remote-control-lirc.rules
                 # Config only, cannot be upstreamed.
-Patch1:         0001-Changing-effective-user-default.patch
-Patch2:         0008-plugins-devinput-Make-the-list-devices-support-avail.patch
-Patch3:         0003-lib-use-proper-linking-method-to-avoid-parallel-buil.patch
+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
 
 BuildRequires:  alsa-lib-devel
 Buildrequires:  autoconf
@@ -41,7 +42,6 @@ BuildRequires:  python3-PyYAML
 BuildRequires:  systemd-devel
 
 Requires:       %{name}-libs = %{version}-%{release}
-Requires:       python3-PyYAML
 
 Requires(pre):     shadow-utils
 Requires(post):    systemd
@@ -105,6 +105,7 @@ Summary:        LIRC Configuration Tools and Data
 Requires:       lirc-core = %{version}-%{release}
 Requires:       lirc-doc = %{version}-%{release}
 Requires:       gnome-icon-theme
+Requires:       python3-PyYAML
 BuildArch:      noarch
 
 %description    config
@@ -186,8 +187,16 @@ full support for the ftdi device.
 %setup -qn %{name}-%{version}%{?tag}
 %patch1 -p1
 %patch2 -p1
+
+%if 0%fedora > 24
 %patch3 -p1
+%patch4 -p1
+cp lib/driver.h lib/lirc/driver.h
+%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
 
 
 %build
@@ -339,6 +348,19 @@ systemd-tmpfiles --create %{_tmpfilesdir}/lirc.conf
 %{_udevrulesdir}/99-remote-control-lirc.rules
 
 %changelog
+* 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
+  https://retrace.fedoraproject.org/faf/reports/1229333/
+- Modify usb devices acl(5) udev rule (#1364744).
+
+* Tue Aug 09 2016 Alec Leamas <leamas.alec@gmail.com> - 0.9.4b-1
+- Rebuilt for new upstream version 0.9.4b.
+
+* Wed Jun 29 2016 Alec Leamas <leamas.alec@gmail.com> - 0.9.4a-1
+- New upstream release.
+- Fixes #1350750, bad systemd files syntax.
+
 * Tue Jul 19 2016 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0.9.4-3.1
 - https://fedoraproject.org/wiki/Changes/Automatic_Provides_for_Python_RPM_Packages
 

From 77806be122ccadc7ffd878cdde6b70c28e7abf58 Mon Sep 17 00:00:00 2001
From: Alec Leamas <leamas.alec@gmail.com>
Date: Fri, 19 Aug 2016 05:47:36 +0200
Subject: [PATCH 164/204] Fix changelog ordering bug.

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

diff --git a/lirc.spec b/lirc.spec
index 7ad0925..8ff9395 100644
--- a/lirc.spec
+++ b/lirc.spec
@@ -357,13 +357,13 @@ systemd-tmpfiles --create %{_tmpfilesdir}/lirc.conf
 * Tue Aug 09 2016 Alec Leamas <leamas.alec@gmail.com> - 0.9.4b-1
 - Rebuilt for new upstream version 0.9.4b.
 
+* Tue Jul 19 2016 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0.9.4-3.1
+- https://fedoraproject.org/wiki/Changes/Automatic_Provides_for_Python_RPM_Packages
+
 * Wed Jun 29 2016 Alec Leamas <leamas.alec@gmail.com> - 0.9.4a-1
 - New upstream release.
 - Fixes #1350750, bad systemd files syntax.
 
-* Tue Jul 19 2016 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0.9.4-3.1
-- https://fedoraproject.org/wiki/Changes/Automatic_Provides_for_Python_RPM_Packages
-
 * Thu May 26 2016 Alec Leamas <leamas.alec@gmail.com> - 0.9.4-3
 - Add fix for FTBS parallel build deps error.
 

From fd32623abd4120cba1d9f5b4f2fd77c03dcd40de Mon Sep 17 00:00:00 2001
From: Alec Leamas <leamas.alec@gmail.com>
Date: Fri, 19 Aug 2016 05:51:13 +0200
Subject: [PATCH 165/204] 0.9.4b: Add missing sources.

---
 .gitignore | 1 +
 sources    | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/.gitignore b/.gitignore
index c002699..bc87b37 100644
--- a/.gitignore
+++ b/.gitignore
@@ -11,3 +11,4 @@ lirc-0.8.7pre2.tar.bz2
 /lirc-0.9.3.tar.gz
 /lirc-0.9.3a.tar.gz
 /lirc-0.9.4.tar.gz
+/lirc-0.9.4b.tar.gz
diff --git a/sources b/sources
index f50743a..ee2678d 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-eb7d324ea9a7acce4892e32cedae1f2c  lirc-0.9.4.tar.gz
+cde69a4d8020a217757f07e97dd4444e  lirc-0.9.4b.tar.gz

From 91111e79eb9d29bc1a7d94dbdd5e317604330c0e Mon Sep 17 00:00:00 2001
From: Alec Leamas <leamas.alec@gmail.com>
Date: Fri, 19 Aug 2016 06:39:35 +0200
Subject: [PATCH 166/204] Baseline sources/gitignore.

---
 .gitignore | 1 +
 sources    | 1 +
 2 files changed, 2 insertions(+)

diff --git a/.gitignore b/.gitignore
index bc87b37..5d325c0 100644
--- a/.gitignore
+++ b/.gitignore
@@ -11,4 +11,5 @@ lirc-0.8.7pre2.tar.bz2
 /lirc-0.9.3.tar.gz
 /lirc-0.9.3a.tar.gz
 /lirc-0.9.4.tar.gz
+/lirc-0.9.4a.tar.gz
 /lirc-0.9.4b.tar.gz
diff --git a/sources b/sources
index ee2678d..9802488 100644
--- a/sources
+++ b/sources
@@ -1 +1,2 @@
+f1e11512b543a74e4321ecf77f829518  lirc-0.9.4a.tar.gz
 cde69a4d8020a217757f07e97dd4444e  lirc-0.9.4b.tar.gz

From 8d58ace858ac185c3cfe3298c21451871a3a88b5 Mon Sep 17 00:00:00 2001
From: Alec Leamas <leamas.alec@gmail.com>
Date: Mon, 22 Aug 2016 10:44:50 +0200
Subject: [PATCH 167/204] 0.9.4b-3: Add ABRT fix, update rhbz #1364744 fix.

---
 ...devices-acl-permissions-rhbz-1364744.patch | 11 +++----
 0008-lirc-setup-Fix-crasher-bugfix.patch      | 30 +++++++++++++++++++
 ...-Make-the-list-devices-support-avail.patch | 28 -----------------
 lirc.spec                                     |  8 ++++-
 4 files changed, 43 insertions(+), 34 deletions(-)
 create mode 100644 0008-lirc-setup-Fix-crasher-bugfix.patch
 delete mode 100644 0008-plugins-devinput-Make-the-list-devices-support-avail.patch

diff --git a/0005-contrib-Fix-usb-devices-acl-permissions-rhbz-1364744.patch b/0005-contrib-Fix-usb-devices-acl-permissions-rhbz-1364744.patch
index a9dadfc..0a55960 100644
--- a/0005-contrib-Fix-usb-devices-acl-permissions-rhbz-1364744.patch
+++ b/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
 
diff --git a/0008-lirc-setup-Fix-crasher-bugfix.patch b/0008-lirc-setup-Fix-crasher-bugfix.patch
new file mode 100644
index 0000000..8eb91b3
--- /dev/null
+++ b/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
+
diff --git a/0008-plugins-devinput-Make-the-list-devices-support-avail.patch b/0008-plugins-devinput-Make-the-list-devices-support-avail.patch
deleted file mode 100644
index 60854d4..0000000
--- a/0008-plugins-devinput-Make-the-list-devices-support-avail.patch
+++ /dev/null
@@ -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
-
diff --git a/lirc.spec b/lirc.spec
index 8ff9395..9a97e62 100644
--- a/lirc.spec
+++ b/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

From 716f0e5218036e279a8dabef6bbb4ea49770e535 Mon Sep 17 00:00:00 2001
From: Alec Leamas <leamas.alec@gmail.com>
Date: Tue, 23 Aug 2016 15:26:12 +0200
Subject: [PATCH 168/204] 0.9.4b-4: Add patches for #221, #222, pach cleanup.

---
 0002-NEWS-lirc.org-index.html-Fixes.patch     | 49 ++++++++++
 0003-irtoy-improve-error-handling-220.patch   | 96 +++++++++++++++++++
 ...inking-method-to-avoid-parallel-buil.patch | 63 ------------
 ...sa-Fix-byte-truncating-in-16-bit-dat.patch |  4 +-
 ...contrib-disable-udev-dev-uinput-rule.patch | 22 +++++
 ...> 0006-lirc-setup-Fix-crasher-bugfix.patch |  2 +-
 ...devices-acl-permissions-rhbz-1364744.patch |  3 +-
 ...porary-unavailable-write-sockets-221.patch | 55 +++++++++++
 ...for-duplicate-remote-definitions-222.patch | 57 +++++++++++
 ...ut-Fix-that-two-remotes-has-the-same.patch | 35 +++++++
 ...> 0011-include-Update-bundled-lirc.h.patch |  0
 ...-of-functions-killed-in-kernel-4.8.0.patch |  0
 lirc.spec                                     | 42 +++++---
 13 files changed, 350 insertions(+), 78 deletions(-)
 create mode 100644 0002-NEWS-lirc.org-index.html-Fixes.patch
 create mode 100644 0003-irtoy-improve-error-handling-220.patch
 delete mode 100644 0003-lib-use-proper-linking-method-to-avoid-parallel-buil.patch
 create mode 100644 0005-contrib-disable-udev-dev-uinput-rule.patch
 rename 0008-lirc-setup-Fix-crasher-bugfix.patch => 0006-lirc-setup-Fix-crasher-bugfix.patch (95%)
 rename 0005-contrib-Fix-usb-devices-acl-permissions-rhbz-1364744.patch => 0007-contrib-Fix-usb-devices-acl-permissions-rhbz-1364744.patch (94%)
 create mode 100644 0008-lircd-Retry-temporary-unavailable-write-sockets-221.patch
 create mode 100644 0009-lircd-Warn-for-duplicate-remote-definitions-222.patch
 create mode 100644 0010-lirc-make-devinput-Fix-that-two-remotes-has-the-same.patch
 rename 0006-include-Update-bundled-lirc.h.patch => 0011-include-Update-bundled-lirc.h.patch (100%)
 rename 0007-lircd-Remove-use-of-functions-killed-in-kernel-4.8.0.patch => 0012-lircd-Remove-use-of-functions-killed-in-kernel-4.8.0.patch (100%)

diff --git a/0002-NEWS-lirc.org-index.html-Fixes.patch b/0002-NEWS-lirc.org-index.html-Fixes.patch
new file mode 100644
index 0000000..47afe0d
--- /dev/null
+++ b/0002-NEWS-lirc.org-index.html-Fixes.patch
@@ -0,0 +1,49 @@
+From 53cea64c606e3bb4622c74855d35fc57eeb2123e Mon Sep 17 00:00:00 2001
+From: Alec Leamas <leamas.alec@gmail.com>
+Date: Tue, 9 Aug 2016 16:29:17 +0200
+Subject: [PATCH 02/10] NEWS, lirc.org/index.html: Fixes.
+
+---
+ NEWS                    | 4 +++-
+ doc/lirc.org/index.html | 6 ++++++
+ 2 files changed, 9 insertions(+), 1 deletion(-)
+
+diff --git a/NEWS b/NEWS
+index a379785..0261bd2 100644
+--- a/NEWS
++++ b/NEWS
+@@ -1,4 +1,4 @@
+-0.9.4b 15/8/16
++0.9.4b 9/8/16
+   * lircd-uinput: A multitude of fixes (#213, #211, #177). Adds new options.
+   * lirc_client:  Fix "Can't redirect irsend output" (#207).
+   * lirc_client: read_string() not terminating buffer contents (#216)
+@@ -8,6 +8,8 @@
+   * lircmd: Options, udev examples and manpage update.A
+   * lib: Add missing Makefile.am dep (#210).
+   * doc: Manpages and configuration guide fixes.
++  * build: Don't define docdir - autoconf defines docdir (#215).
++  * build: support runstatedir configure option (#212).
+ 
+ 0.9.4a 22/6/16
+   * Fix syntax errors in systemd unit files (rhbz: 1350750).
+diff --git a/doc/lirc.org/index.html b/doc/lirc.org/index.html
+index 204d457..b0a1efa 100644
+--- a/doc/lirc.org/index.html
++++ b/doc/lirc.org/index.html
+@@ -432,6 +432,12 @@
+             <HR WIDTH="50%"><BR>
+             <UL TYPE="SQUARE">
+               <LI>
++                [9-Aug2016]
++                <P>
++                  lirc-0.9.4b released.
++                </P>
++              </LI>
++               <LI>
+                 [29-June2016]
+                 <P>
+                   lirc-0.9.4a released.
+-- 
+2.5.5
+
diff --git a/0003-irtoy-improve-error-handling-220.patch b/0003-irtoy-improve-error-handling-220.patch
new file mode 100644
index 0000000..359595e
--- /dev/null
+++ b/0003-irtoy-improve-error-handling-220.patch
@@ -0,0 +1,96 @@
+From 62b9172bf52584e0c621d0163052ccca9a240846 Mon Sep 17 00:00:00 2001
+From: Helen Foster <helen-foster@users.sourceforge.net>
+Date: Sun, 14 Aug 2016 14:00:30 +0100
+Subject: [PATCH 03/10] irtoy: improve error handling (#220).
+
+Avoid double init. Avoid calling setPin or trying to send if irtoy
+is not initialized (segfault).
+---
+ plugins/irtoy.c | 28 ++++++++++++++++++++--------
+ 1 file changed, 20 insertions(+), 8 deletions(-)
+
+diff --git a/plugins/irtoy.c b/plugins/irtoy.c
+index f6e81d7..f7a6feb 100644
+--- a/plugins/irtoy.c
++++ b/plugins/irtoy.c
+@@ -467,6 +467,9 @@ static int init_device(void)
+ 			  IRTOY_MINFWVERSION,
+ 			  dev->swVersion);
+ 		free(dev);
++		dev = NULL;
++		close(drv.fd);
++		tty_delete_lock();
+ 		return 0;
+ 	}
+ 	rec_buffer_init();
+@@ -490,10 +493,15 @@ static int init(void)
+ 		"Additional irtoy device found: %s (ignored)";
+ 	const char* const MSG_FOUND = "irtoy device found on %s";
+ 
++	log_trace("irtoy: init");
+ 	if (drv.device == NULL) {
+ 		log_error("irtoy: NULL device.");
+ 		return 0;
+ 	}
++	if (dev != NULL) {
++		log_debug("irtoy: init: irtoy already initialized");
++		return 1;
++	}
+ 	if (strcmp(drv.device, "auto") != 0)
+ 		return init_device();
+ 	for (found = 0, i = 0; i <= 9; i++) {
+@@ -516,6 +524,8 @@ static int init(void)
+ 
+ static int deinit(void)
+ {
++	log_trace("irtoy: deinit");
++
+ 	// IMPORTANT do not remove this reset. it is vital to return the
+ 	// irtoy to IRMAN mode.
+ 	// If we leave the irtoy in sample mode while no-one has the
+@@ -527,14 +537,14 @@ static int deinit(void)
+ 	// sending the next one, while sample mode will keep streaming
+ 	// (and under fluorescent light it WILL stream..)
+ 	// triggering the problem
+-	setPin(openPin, 0);
+-	setPin(sendingPin, 0);
+-	setPin(receivePin, 0);
+ 	if (dev != NULL) {
++		setPin(openPin, 0);
++		setPin(sendingPin, 0);
++		setPin(receivePin, 0);
+ 		irtoy_reset(dev);
+ 		free(dev);
++		dev = NULL;
+ 	}
+-	dev = NULL;
+ 
+ 	close(drv.fd);
+ 	drv.fd = -1;
+@@ -562,10 +572,6 @@ static int irtoy_send_double_buffered(unsigned char* signals, int length)
+ 	unsigned char reply[16];
+ 	int irtoyXmit;
+ 
+-	if (dev == NULL) {
+-		log_error("irtoy_send: irtoy not initialized");
+-		return 0;
+-	}
+ 	res = write(dev->fd, IRTOY_COMMAND_TXSTART, sizeof(IRTOY_COMMAND_TXSTART));
+ 
+ 	if (res != sizeof(IRTOY_COMMAND_TXSTART)) {
+@@ -647,6 +653,12 @@ static int send(struct ir_remote* remote, struct ir_ncode* code)
+ 	lirc_t val;
+ 	int res;
+ 
++	log_trace("irtoy: send");
++
++	if (dev == NULL) {
++		log_error("irtoy: send: irtoy not initialized");
++		return 0;
++	}
+ 
+ 	if (!send_buffer_put(remote, code))
+ 		return 0;
+-- 
+2.5.5
+
diff --git a/0003-lib-use-proper-linking-method-to-avoid-parallel-buil.patch b/0003-lib-use-proper-linking-method-to-avoid-parallel-buil.patch
deleted file mode 100644
index a3347b6..0000000
--- a/0003-lib-use-proper-linking-method-to-avoid-parallel-buil.patch
+++ /dev/null
@@ -1,63 +0,0 @@
-From 8e0e7b65dea3b9f71e8658f0e417fac6409b4c2c Mon Sep 17 00:00:00 2001
-From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
-Date: Wed, 25 May 2016 16:34:55 +0200
-Subject: [PATCH] lib: use proper linking method to avoid parallel build issue
-
-Using <foo>_LDFLAGS = -l<library> is correct when <library> is an
-external library. However, when it is built by the same package, and
-especially in the same directory, this is wrong and can cause parallel
-build issues. In lib/Makefile.am, there was:
-
-libirrecord_la_LDFLAGS      = -llirc
-
-But the liblirc library is built in the same directory. Or, due to the
-using of <foo>_LDFLAGS, make is not aware of the build dependency
-between libirrecord and liblirc.
-
-To solve this, <foo>_LIBADD should be used instead, as follows:
-
-libirrecord_la_LIBADD       = liblirc.la
-
-This fixes parallel build issues seen by automated build tests
-conducted by the Buildroot project, such as:
-
-  http://autobuild.buildroot.org/results/eb4/eb47d57de8182d25b1dacbf0ac3726ed20063d04/build-end.log
-
-Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
----
- lib/Makefile.am | 8 +++++++-
- 1 file changed, 7 insertions(+), 1 deletion(-)
-
-diff --git a/lib/Makefile.am b/lib/Makefile.am
-index ce5c94c..fc77a60 100644
---- a/lib/Makefile.am
-+++ b/lib/Makefile.am
-@@ -29,7 +29,7 @@ liblirc_la_SOURCES          = config_file.c \
-                               transmit.c \
-                               util.c
- 
--libirrecord_la_LDFLAGS      = -llirc
-+libirrecord_la_LIBADD       = -llirc
- libirrecord_la_SOURCES      = irrecord.c
- 
- liblirc_client_la_LDFLAGS   = -version-info 4:0:4
-@@ -98,10 +98,16 @@ input_map.lo: lirc/input_map.inc
- 
- input_map.inc: lirc/input_map.inc
- 
-+if BSD
-+lirc/input_map.inc:
-+	touch $@
-+	touch touch input_map.inc
-+else
- lirc/input_map.inc:
- 	ln -s . lirc || :
- 	$(top_srcdir)/tools/lirc-make-devinput -i > input_map.inc
- 	$(top_srcdir)/tools/lirc-make-devinput -i > $@
-+endif
- 
- checkfiles:
- 	../git-tools/checkfiles $(SOURCES) $(HEADERS)
--- 
-2.5.5
-
diff --git a/0004-plugins-audio_alsa-Fix-byte-truncating-in-16-bit-dat.patch b/0004-plugins-audio_alsa-Fix-byte-truncating-in-16-bit-dat.patch
index ef63323..b4a4e00 100644
--- a/0004-plugins-audio_alsa-Fix-byte-truncating-in-16-bit-dat.patch
+++ b/0004-plugins-audio_alsa-Fix-byte-truncating-in-16-bit-dat.patch
@@ -1,7 +1,7 @@
-From 5d933bee5c100e119c26476e45b69e019b392323 Mon Sep 17 00:00:00 2001
+From 4e931d11585e1baeddeea9a753007d835f8a3334 Mon Sep 17 00:00:00 2001
 From: Alec Leamas <leamas.alec@gmail.com>
 Date: Wed, 17 Aug 2016 21:28:00 +0200
-Subject: [PATCH] plugins: audio_alsa: Fix byte truncating in 16-bit data
+Subject: [PATCH 04/10] plugins: audio_alsa: Fix byte truncating in 16-bit data
  (#218):
 
 This fixes a bug introduced in 82305c72 which basically was
diff --git a/0005-contrib-disable-udev-dev-uinput-rule.patch b/0005-contrib-disable-udev-dev-uinput-rule.patch
new file mode 100644
index 0000000..338b956
--- /dev/null
+++ b/0005-contrib-disable-udev-dev-uinput-rule.patch
@@ -0,0 +1,22 @@
+From 8cb5fd91935603536dcb0377ff91eb0ae477d19a Mon Sep 17 00:00:00 2001
+From: Alec Leamas <leamas.alec@gmail.com>
+Date: Thu, 18 Aug 2016 16:19:17 +0200
+Subject: [PATCH 05/10] contrib: disable udev /dev/uinput rule.
+
+---
+ contrib/97-lircd-uinput.rules | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/contrib/97-lircd-uinput.rules b/contrib/97-lircd-uinput.rules
+index 12228a7..a554299 100644
+--- a/contrib/97-lircd-uinput.rules
++++ b/contrib/97-lircd-uinput.rules
+@@ -7,4 +7,4 @@ SUBSYSTEMS=="input",ATTRS{name}=="lircmd",SYMLINK+="lircmd"
+ # Make /dev/uinput accessible for the lirc group. A setfacl RUN would be
+ # better here, but seemingly does not work (?)
+ # An alternative is to use lircd-setup(8) to sun setfacl(1).
+-KERNEL=="uinput",GROUP:="lirc",MODE:="0660"
++## KERNEL=="uinput",GROUP:="lirc",MODE:="0660"
+-- 
+2.5.5
+
diff --git a/0008-lirc-setup-Fix-crasher-bugfix.patch b/0006-lirc-setup-Fix-crasher-bugfix.patch
similarity index 95%
rename from 0008-lirc-setup-Fix-crasher-bugfix.patch
rename to 0006-lirc-setup-Fix-crasher-bugfix.patch
index 8eb91b3..d0791a6 100644
--- a/0008-lirc-setup-Fix-crasher-bugfix.patch
+++ b/0006-lirc-setup-Fix-crasher-bugfix.patch
@@ -1,7 +1,7 @@
 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.
+Subject: [PATCH 06/10] lirc-setup: Fix crasher bugfix.
 
 Fixes https://retrace.fedoraproject.org/faf/reports/1166394/
 ---
diff --git a/0005-contrib-Fix-usb-devices-acl-permissions-rhbz-1364744.patch b/0007-contrib-Fix-usb-devices-acl-permissions-rhbz-1364744.patch
similarity index 94%
rename from 0005-contrib-Fix-usb-devices-acl-permissions-rhbz-1364744.patch
rename to 0007-contrib-Fix-usb-devices-acl-permissions-rhbz-1364744.patch
index 0a55960..338bd51 100644
--- a/0005-contrib-Fix-usb-devices-acl-permissions-rhbz-1364744.patch
+++ b/0007-contrib-Fix-usb-devices-acl-permissions-rhbz-1364744.patch
@@ -1,7 +1,8 @@
 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).
+Subject: [PATCH 07/10] contrib: Fix usb devices' acl permissions (rhbz
+ #1364744).
 
 ---
  contrib/60-lirc.rules | 13 +++++++------
diff --git a/0008-lircd-Retry-temporary-unavailable-write-sockets-221.patch b/0008-lircd-Retry-temporary-unavailable-write-sockets-221.patch
new file mode 100644
index 0000000..afa2b79
--- /dev/null
+++ b/0008-lircd-Retry-temporary-unavailable-write-sockets-221.patch
@@ -0,0 +1,55 @@
+From f561c4b9e1ea8a225ae4431348529cd5b6b477d9 Mon Sep 17 00:00:00 2001
+From: Alec Leamas <leamas.alec@gmail.com>
+Date: Tue, 23 Aug 2016 13:16:56 +0200
+Subject: [PATCH 08/10] lircd: Retry temporary unavailable write sockets
+ (#221).
+
+---
+ daemons/lircd.cpp | 21 +++++++++++++++++++--
+ 1 file changed, 19 insertions(+), 2 deletions(-)
+
+diff --git a/daemons/lircd.cpp b/daemons/lircd.cpp
+index de2c341..2dc9029 100644
+--- a/daemons/lircd.cpp
++++ b/daemons/lircd.cpp
+@@ -115,6 +115,12 @@ int clock_gettime(int clk_id, struct timespec *t){
+ 
+ static const logchannel_t logchannel = LOG_APP;
+ 
++/** How long we sleep while waiting for busy write sockets. */
++static const int WRITE_SLEEP_US = 20000;
++
++/** How many times we retry busy write sockets. */
++static const int WRITE_RETRIES = 50;
++
+ struct peer_connection {
+ 	char*		host;
+ 	unsigned short	port;
+@@ -338,11 +344,22 @@ static int oatoi(const char* s)
+ int write_socket(int fd, const char* buf, int len)
+ {
+ 	int done, todo = len;
++	int retries = WRITE_RETRIES;
+ 
+ 	while (todo) {
+ 		done = write(fd, buf, todo);
+-		if (done <= 0)
+-			return done;
++		if (done <= 0) {
++			log_perror_debug("Error in write_socket");
++			if (errno == EAGAIN || errno == EWOULDBLOCK) {
++				retries -= 1;
++				if (retries <= 0)
++					return done;
++				usleep(WRITE_SLEEP_US);
++				continue;
++			} else {
++				return done;
++			}
++		}
+ 		buf += done;
+ 		todo -= done;
+ 	}
+-- 
+2.5.5
+
diff --git a/0009-lircd-Warn-for-duplicate-remote-definitions-222.patch b/0009-lircd-Warn-for-duplicate-remote-definitions-222.patch
new file mode 100644
index 0000000..46ff2f1
--- /dev/null
+++ b/0009-lircd-Warn-for-duplicate-remote-definitions-222.patch
@@ -0,0 +1,57 @@
+From 9ad5f93a07be0bf4f645f16dbbf29e2e8cd3b871 Mon Sep 17 00:00:00 2001
+From: Alec Leamas <leamas.alec@gmail.com>
+Date: Tue, 23 Aug 2016 13:50:48 +0200
+Subject: [PATCH 09/10] lircd: Warn for duplicate remote definitions (#222).
+
+---
+ daemons/lircd.cpp | 20 ++++++++++++++++++++
+ 1 file changed, 20 insertions(+)
+
+diff --git a/daemons/lircd.cpp b/daemons/lircd.cpp
+index 2dc9029..8fd8336 100644
+--- a/daemons/lircd.cpp
++++ b/daemons/lircd.cpp
+@@ -70,6 +70,9 @@
+ #include <sys/ioctl.h>
+ #endif
+ 
++#include <string>
++#include <set>
++
+ #include "lirc_private.h"
+ 
+ #ifdef HAVE_INT_GETGROUPLIST_GROUPS
+@@ -540,6 +543,22 @@ static int setup_hardware(void)
+ 	return ret;
+ }
+ 
++static void check_config_duplicates(const struct ir_remote* head)
++{
++	std::set<std::string> names;
++	const struct ir_remote* ir;
++	const char* const errmsg =
++		"Duplicate remotes \"%s\" found, problems ahead";
++
++	for (ir = head; ir != NULL; ir = ir->next) {
++		std::string name(ir->name);
++		if (names.count(name) == 1)
++			log_warn(errmsg, name.c_str())
++		else
++			names.insert(name);
++	}
++}
++
+ 
+ void config(void)
+ {
+@@ -572,6 +591,7 @@ void config(void)
+ 	}
+ 	configfile = filename;
+ 	config_remotes = read_config(fd, configfile);
++	check_config_duplicates(config_remotes);
+ 	fclose(fd);
+ 	if (config_remotes == (void*)-1) {
+ 		log_error("reading of config file failed");
+-- 
+2.5.5
+
diff --git a/0010-lirc-make-devinput-Fix-that-two-remotes-has-the-same.patch b/0010-lirc-make-devinput-Fix-that-two-remotes-has-the-same.patch
new file mode 100644
index 0000000..7e90e9a
--- /dev/null
+++ b/0010-lirc-make-devinput-Fix-that-two-remotes-has-the-same.patch
@@ -0,0 +1,35 @@
+From b853e3d1bcc756206ffa1bc612996cd1597d53ea Mon Sep 17 00:00:00 2001
+From: Alec Leamas <leamas.alec@gmail.com>
+Date: Tue, 23 Aug 2016 13:24:32 +0200
+Subject: [PATCH 10/10] lirc-make-devinput: Fix that two remotes has the same
+ name (#222).
+
+---
+ tools/lirc-make-devinput | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/tools/lirc-make-devinput b/tools/lirc-make-devinput
+index 3ae63ea..0598970 100755
+--- a/tools/lirc-make-devinput
++++ b/tools/lirc-make-devinput
+@@ -63,7 +63,7 @@ echo "# Date: $(date)"
+ cat <<EOF
+ 
+ begin remote
+-        name            devinput
++        name            devinput-64
+         bits            16
+         eps             30
+         aeps            100
+@@ -89,7 +89,7 @@ echo "# generated by $(basename $0) (obsolete 32 bit version)"
+ cat <<EOF
+ 
+ begin remote
+-        name            devinput
++        name            devinput-32
+         bits            16
+         eps             30
+         aeps            100
+-- 
+2.5.5
+
diff --git a/0006-include-Update-bundled-lirc.h.patch b/0011-include-Update-bundled-lirc.h.patch
similarity index 100%
rename from 0006-include-Update-bundled-lirc.h.patch
rename to 0011-include-Update-bundled-lirc.h.patch
diff --git a/0007-lircd-Remove-use-of-functions-killed-in-kernel-4.8.0.patch b/0012-lircd-Remove-use-of-functions-killed-in-kernel-4.8.0.patch
similarity index 100%
rename from 0007-lircd-Remove-use-of-functions-killed-in-kernel-4.8.0.patch
rename to 0012-lircd-Remove-use-of-functions-killed-in-kernel-4.8.0.patch
diff --git a/lirc.spec b/lirc.spec
index 9a97e62..f149c62 100644
--- a/lirc.spec
+++ b/lirc.spec
@@ -5,7 +5,7 @@
 
 Name:           lirc
 Version:        0.9.4b
-Release:        %{?tag:0.}3%{?tag:.}%{?tag}%{?dist}
+Release:        %{?tag:0.}4%{?tag:.}%{?tag}%{?dist}
 Summary:        The Linux Infrared Remote Control package
 
 %global repo    http://downloads.sourceforge.net/lirc/LIRC/%{version}/
@@ -18,11 +18,18 @@ Source0:        %{?released:%{repo}}%{name}-%{version}%{?tag:-}%{?tag}.tar.gz
 Source1:        README.fedora
 Source2:        99-remote-control-lirc.rules
                 # Config only, cannot be upstreamed.
-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
+#Patch1:         0001-Changing-effective-user-default.patch
+Patch2:         0002-NEWS-lirc.org-index.html-Fixes.patch
+Patch3:         0003-irtoy-improve-error-handling-220.patch
+Patch4:         0004-plugins-audio_alsa-Fix-byte-truncating-in-16-bit-dat.patch
+Patch5:         0005-contrib-disable-udev-dev-uinput-rule.patch
+Patch6:         0006-lirc-setup-Fix-crasher-bugfix.patch
+Patch7:         0007-contrib-Fix-usb-devices-acl-permissions-rhbz-1364744.patch
+Patch8:         0008-lircd-Retry-temporary-unavailable-write-sockets-221.patch
+Patch9:         0009-lircd-Warn-for-duplicate-remote-definitions-222.patch
+Patch10:        0010-lirc-make-devinput-Fix-that-two-remotes-has-the-same.patch
+Patch11:        0011-include-Update-bundled-lirc.h.patch
+Patch12:        0012-lircd-Remove-use-of-functions-killed-in-kernel-4.8.0.patch
 
 BuildRequires:  alsa-lib-devel
 Buildrequires:  autoconf
@@ -186,19 +193,26 @@ full support for the ftdi device.
 
 %prep
 %setup -qn %{name}-%{version}%{?tag}
-%patch1 -p1
+#patch1 -p1
+sed -i -e 's/#effective-user/effective-user /' lirc_options.conf
+sed -i -e '/^effective-user/s/=$/= lirc/' lirc_options.conf
 %patch2 -p1
-
-%if 0%fedora > 24
 %patch3 -p1
 %patch4 -p1
 %patch5 -p1
+%patch6 -p1
+%patch7 -p1
+%patch8 -p1
+%patch9 -p1
+%patch10 -p1
+
+%if 0%fedora > 24
+%patch11 -p1
+%patch12 -p1
 cp lib/driver.h lib/lirc/driver.h
 %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
 
 
 %build
@@ -350,6 +364,12 @@ systemd-tmpfiles --create %{_tmpfilesdir}/lirc.conf
 %{_udevrulesdir}/99-remote-control-lirc.rules
 
 %changelog
+* Tue Aug 23 2016 Alec Leamas <leamas.alec@gmail.com> - 0.9.4b-4
+- Add fixes for #221 and #222
+- Update patches, include everything from upstream
+- Add some minor fixes for lircd.org
+- Obsoletes 0.9.4b-3 which is unpushed.
+
 * Mon Aug 22 2016 Alec Leamas <leamas.alec@gmail.com> - 0.9.4b-3
 - Add yet another ABRT crasher fix.
 - Update fix for #1364744.

From 1c610f9721f9edf6cd5206fcb35be6094d8d718e Mon Sep 17 00:00:00 2001
From: Alec Leamas <leamas.alec@gmail.com>
Date: Sun, 30 Oct 2016 04:42:16 +0100
Subject: [PATCH 169/204] New upstream release 0.9.4c-4

---
 .gitignore                                    |   2 +
 0001-Changing-effective-user-default.patch    |  25 ---
 ...ugins-girs.c-Default-device-typo-fix.patch |  25 +++
 0002-NEWS-lirc.org-index.html-Fixes.patch     |  49 -----
 ...gure-Fix-cross-compilation-error-233.patch |  46 +++++
 ...c.h-Configure-includes-in-lirc.h-234.patch |  55 ++++++
 0003-irtoy-improve-error-handling-220.patch   |  96 ---------
 ...Clean-up-distribution-links-bugfixes.patch | 104 ++++++++++
 ...sa-Fix-byte-truncating-in-16-bit-dat.patch |  36 ----
 ...contrib-disable-udev-dev-uinput-rule.patch |  22 ---
 ...-Ensure-build-on-unconfiguredclients.patch |  35 ++++
 0006-lirc-setup-Fix-crasher-bugfix.patch      |  30 ---
 ...pc-Fix-bad-library-specification-236.patch |  23 +++
 ...INPUT-1-to-force-building-uinput-cod.patch |  38 ++++
 ...devices-acl-permissions-rhbz-1364744.patch |  33 ----
 ...porary-unavailable-write-sockets-221.patch |  55 ------
 ...systemd-Fix-wrong-path-to-irexec-239.patch |  25 +++
 0009-.gitignore-doc-fixes.patch               |  32 +++
 ...for-duplicate-remote-definitions-222.patch |  57 ------
 ...-local-headers-in-lirc_private.h-237.patch |  59 ++++++
 ...ut-Fix-that-two-remotes-has-the-same.patch |  35 ----
 0011-include-Update-bundled-lirc.h.patch      | 182 ------------------
 ...-of-functions-killed-in-kernel-4.8.0.patch | 110 -----------
 lirc.spec                                     |  56 +++---
 sources                                       |   3 +-
 25 files changed, 469 insertions(+), 764 deletions(-)
 delete mode 100644 0001-Changing-effective-user-default.patch
 create mode 100644 0001-plugins-girs.c-Default-device-typo-fix.patch
 delete mode 100644 0002-NEWS-lirc.org-index.html-Fixes.patch
 create mode 100644 0002-configure-Fix-cross-compilation-error-233.patch
 create mode 100644 0003-build-lirc.h-Configure-includes-in-lirc.h-234.patch
 delete mode 100644 0003-irtoy-improve-error-handling-220.patch
 create mode 100644 0004-lirc.org-Clean-up-distribution-links-bugfixes.patch
 delete mode 100644 0004-plugins-audio_alsa-Fix-byte-truncating-in-16-bit-dat.patch
 delete mode 100644 0005-contrib-disable-udev-dev-uinput-rule.patch
 create mode 100644 0005-lib-curl_poll.h-Ensure-build-on-unconfiguredclients.patch
 delete mode 100644 0006-lirc-setup-Fix-crasher-bugfix.patch
 create mode 100644 0006-lirc.pc-Fix-bad-library-specification-236.patch
 create mode 100644 0007-Build-Use-HAVE_UINPUT-1-to-force-building-uinput-cod.patch
 delete mode 100644 0007-contrib-Fix-usb-devices-acl-permissions-rhbz-1364744.patch
 delete mode 100644 0008-lircd-Retry-temporary-unavailable-write-sockets-221.patch
 create mode 100644 0008-systemd-Fix-wrong-path-to-irexec-239.patch
 create mode 100644 0009-.gitignore-doc-fixes.patch
 delete mode 100644 0009-lircd-Warn-for-duplicate-remote-definitions-222.patch
 create mode 100644 0010-lib-Only-use-local-headers-in-lirc_private.h-237.patch
 delete mode 100644 0010-lirc-make-devinput-Fix-that-two-remotes-has-the-same.patch
 delete mode 100644 0011-include-Update-bundled-lirc.h.patch
 delete mode 100644 0012-lircd-Remove-use-of-functions-killed-in-kernel-4.8.0.patch

diff --git a/.gitignore b/.gitignore
index 5d325c0..1d81b9e 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,4 @@
+clog
 lirc-*.tar.bz2
 .build-*.log
 *.rpm
@@ -13,3 +14,4 @@ lirc-0.8.7pre2.tar.bz2
 /lirc-0.9.4.tar.gz
 /lirc-0.9.4a.tar.gz
 /lirc-0.9.4b.tar.gz
+/lirc-0.9.4c.tar.gz
diff --git a/0001-Changing-effective-user-default.patch b/0001-Changing-effective-user-default.patch
deleted file mode 100644
index c19b4ef..0000000
--- a/0001-Changing-effective-user-default.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-From bd400dc047567d230d194c2be8c911a300c0f723 Mon Sep 17 00:00:00 2001
-From: Alec Leamas <leamas.alec@gmail.com>
-Date: Mon, 9 Feb 2015 12:46:17 +0100
-Subject: [PATCH] lirc_options: Set effective user to lirc.
-
----
- lirc_options.conf | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/lirc_options.conf b/lirc_options.conf
-index 9346de8..bf342c1 100644
---- a/lirc_options.conf
-+++ b/lirc_options.conf
-@@ -12,7 +12,7 @@ plugindir       = /usr/lib/lirc/plugins
- permission      = 666
- allow-simulate  = No
- repeat-max      = 600
--#effective-user =
-+effective-user  = lirc
- #listen         = [address:]port
- #connect        = host[:port]
- #debug          = 6
--- 
-2.1.0
-
diff --git a/0001-plugins-girs.c-Default-device-typo-fix.patch b/0001-plugins-girs.c-Default-device-typo-fix.patch
new file mode 100644
index 0000000..07a172d
--- /dev/null
+++ b/0001-plugins-girs.c-Default-device-typo-fix.patch
@@ -0,0 +1,25 @@
+From 94a67d9d3debf63affaa679971fafa304a6929d1 Mon Sep 17 00:00:00 2001
+From: Alec Leamas <leamas.alec@gmail.com>
+Date: Sat, 22 Oct 2016 16:53:48 +0200
+Subject: [PATCH 01/10] plugins: girs.c: Default device typo fix.
+
+---
+ plugins/girs.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/plugins/girs.c b/plugins/girs.c
+index 4bc1461..f722348 100644
+--- a/plugins/girs.c
++++ b/plugins/girs.c
+@@ -55,7 +55,7 @@
+ 	"/bin/sh ls /dev/ttyACM* /dev/ttyUSB* /dev/arduino* 2>/dev/null"
+ 
+ #define DRIVER_NAME "girs"
+-#define DEFAULT_DEVICE "/dev/ttyAMC0"
++#define DEFAULT_DEVICE "/dev/ttyACM0"
+ #define DRIVER_RESOLUTION 50
+ #define DRIVER_VERSION "2016-08-19"
+ 
+-- 
+2.5.5
+
diff --git a/0002-NEWS-lirc.org-index.html-Fixes.patch b/0002-NEWS-lirc.org-index.html-Fixes.patch
deleted file mode 100644
index 47afe0d..0000000
--- a/0002-NEWS-lirc.org-index.html-Fixes.patch
+++ /dev/null
@@ -1,49 +0,0 @@
-From 53cea64c606e3bb4622c74855d35fc57eeb2123e Mon Sep 17 00:00:00 2001
-From: Alec Leamas <leamas.alec@gmail.com>
-Date: Tue, 9 Aug 2016 16:29:17 +0200
-Subject: [PATCH 02/10] NEWS, lirc.org/index.html: Fixes.
-
----
- NEWS                    | 4 +++-
- doc/lirc.org/index.html | 6 ++++++
- 2 files changed, 9 insertions(+), 1 deletion(-)
-
-diff --git a/NEWS b/NEWS
-index a379785..0261bd2 100644
---- a/NEWS
-+++ b/NEWS
-@@ -1,4 +1,4 @@
--0.9.4b 15/8/16
-+0.9.4b 9/8/16
-   * lircd-uinput: A multitude of fixes (#213, #211, #177). Adds new options.
-   * lirc_client:  Fix "Can't redirect irsend output" (#207).
-   * lirc_client: read_string() not terminating buffer contents (#216)
-@@ -8,6 +8,8 @@
-   * lircmd: Options, udev examples and manpage update.A
-   * lib: Add missing Makefile.am dep (#210).
-   * doc: Manpages and configuration guide fixes.
-+  * build: Don't define docdir - autoconf defines docdir (#215).
-+  * build: support runstatedir configure option (#212).
- 
- 0.9.4a 22/6/16
-   * Fix syntax errors in systemd unit files (rhbz: 1350750).
-diff --git a/doc/lirc.org/index.html b/doc/lirc.org/index.html
-index 204d457..b0a1efa 100644
---- a/doc/lirc.org/index.html
-+++ b/doc/lirc.org/index.html
-@@ -432,6 +432,12 @@
-             <HR WIDTH="50%"><BR>
-             <UL TYPE="SQUARE">
-               <LI>
-+                [9-Aug2016]
-+                <P>
-+                  lirc-0.9.4b released.
-+                </P>
-+              </LI>
-+               <LI>
-                 [29-June2016]
-                 <P>
-                   lirc-0.9.4a released.
--- 
-2.5.5
-
diff --git a/0002-configure-Fix-cross-compilation-error-233.patch b/0002-configure-Fix-cross-compilation-error-233.patch
new file mode 100644
index 0000000..5b1283f
--- /dev/null
+++ b/0002-configure-Fix-cross-compilation-error-233.patch
@@ -0,0 +1,46 @@
+From ff0d431cbed74a2495b78dedce8f74f2b5a436ea Mon Sep 17 00:00:00 2001
+From: Alec Leamas <leamas.alec@gmail.com>
+Date: Sun, 23 Oct 2016 15:07:21 +0200
+Subject: [PATCH 02/10] configure: Fix cross-compilation error (#233).
+
+---
+ configure.ac | 16 ++++++++++++++++
+ 1 file changed, 16 insertions(+)
+
+diff --git a/configure.ac b/configure.ac
+index a041571..20933a8 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -305,6 +305,19 @@ AC_RUN_IFELSE([AC_LANG_PROGRAM([[
+   AC_MSG_RESULT(yes)
+ ],[
+   AC_MSG_RESULT(no)
++],[
++  case x$HAVE_WORKING_POLL in
++    xyes)
++      AC_MSG_RESULT(yes)
++      AC_DEFINE(HAVE_POLL_FINE)
++      ;;
++    xno)
++      AC_MSG_RESULT(no)
++      ;;
++    *) AC_MSG_ERROR([
++         Define HAVE_WORKING_POLL to "yes" or "no" when cross-compiling])
++      ;;
++  esac
+ ])
+ 
+ 
+@@ -429,6 +442,9 @@ AC_ARG_ENABLE([python3_fix],
+   [enable_python3_fix="no"])
+ AM_CONDITIONAL(NEED_PYTHON3, [test "x$enable_python3_fix" = "xyes"])
+ 
++AC_ARG_VAR(HAVE_WORKING_POLL,[
++	   On cross-compile: Target has a working poll(2) implementation])
++
+ suffix=$(echo "$VERSION" | sed 's/.*-//')
+ AM_CONDITIONAL(DEVEL, [test x$suffix = xdevel])
+ 
+-- 
+2.5.5
+
diff --git a/0003-build-lirc.h-Configure-includes-in-lirc.h-234.patch b/0003-build-lirc.h-Configure-includes-in-lirc.h-234.patch
new file mode 100644
index 0000000..58c73ea
--- /dev/null
+++ b/0003-build-lirc.h-Configure-includes-in-lirc.h-234.patch
@@ -0,0 +1,55 @@
+From f86da92490ff32465a1aba8754c0c856191e6907 Mon Sep 17 00:00:00 2001
+From: Alec Leamas <leamas.alec@gmail.com>
+Date: Sun, 23 Oct 2016 15:45:52 +0200
+Subject: [PATCH 03/10] build: lirc.h: Configure includes in lirc.h (#234).
+
+Fall back to sys/ioctl.h instead of linux/ioctl.h etc. on
+non-linux platform i. e., MacOS.
+---
+ configure.ac         |  5 +++--
+ include/media/lirc.h | 11 +++++++++++
+ 2 files changed, 14 insertions(+), 2 deletions(-)
+
+diff --git a/configure.ac b/configure.ac
+index 20933a8..cde9813 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -48,8 +48,9 @@ LIBUSB_CONFIG="pkg-config libusb"
+ dnl Checks for header files.
+ AC_HEADER_STDC
+ AC_HEADER_TIME
+-AC_CHECK_HEADERS([fcntl.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])
++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])
+ 
+ dnl Checks for typedefs, structures, and compiler characteristics.
+ AC_C_CONST
+diff --git a/include/media/lirc.h b/include/media/lirc.h
+index 991ab45..84af7ed 100644
+--- a/include/media/lirc.h
++++ b/include/media/lirc.h
+@@ -6,8 +6,19 @@
+ #ifndef _LINUX_LIRC_H
+ #define _LINUX_LIRC_H
+ 
++#include <config.h>
++
++#ifdef HAVE_LINUX_TYPES_H
+ #include <linux/types.h>
++#else
++#include <sys/types.h>
++#endif
++
++#ifdef HAVE_LINUX_IOCTL_H
+ #include <linux/ioctl.h>
++#else
++#include <sys/ioctl.h>
++#endif
+ 
+ #define PULSE_BIT       0x01000000
+ #define PULSE_MASK      0x00FFFFFF
+-- 
+2.5.5
+
diff --git a/0003-irtoy-improve-error-handling-220.patch b/0003-irtoy-improve-error-handling-220.patch
deleted file mode 100644
index 359595e..0000000
--- a/0003-irtoy-improve-error-handling-220.patch
+++ /dev/null
@@ -1,96 +0,0 @@
-From 62b9172bf52584e0c621d0163052ccca9a240846 Mon Sep 17 00:00:00 2001
-From: Helen Foster <helen-foster@users.sourceforge.net>
-Date: Sun, 14 Aug 2016 14:00:30 +0100
-Subject: [PATCH 03/10] irtoy: improve error handling (#220).
-
-Avoid double init. Avoid calling setPin or trying to send if irtoy
-is not initialized (segfault).
----
- plugins/irtoy.c | 28 ++++++++++++++++++++--------
- 1 file changed, 20 insertions(+), 8 deletions(-)
-
-diff --git a/plugins/irtoy.c b/plugins/irtoy.c
-index f6e81d7..f7a6feb 100644
---- a/plugins/irtoy.c
-+++ b/plugins/irtoy.c
-@@ -467,6 +467,9 @@ static int init_device(void)
- 			  IRTOY_MINFWVERSION,
- 			  dev->swVersion);
- 		free(dev);
-+		dev = NULL;
-+		close(drv.fd);
-+		tty_delete_lock();
- 		return 0;
- 	}
- 	rec_buffer_init();
-@@ -490,10 +493,15 @@ static int init(void)
- 		"Additional irtoy device found: %s (ignored)";
- 	const char* const MSG_FOUND = "irtoy device found on %s";
- 
-+	log_trace("irtoy: init");
- 	if (drv.device == NULL) {
- 		log_error("irtoy: NULL device.");
- 		return 0;
- 	}
-+	if (dev != NULL) {
-+		log_debug("irtoy: init: irtoy already initialized");
-+		return 1;
-+	}
- 	if (strcmp(drv.device, "auto") != 0)
- 		return init_device();
- 	for (found = 0, i = 0; i <= 9; i++) {
-@@ -516,6 +524,8 @@ static int init(void)
- 
- static int deinit(void)
- {
-+	log_trace("irtoy: deinit");
-+
- 	// IMPORTANT do not remove this reset. it is vital to return the
- 	// irtoy to IRMAN mode.
- 	// If we leave the irtoy in sample mode while no-one has the
-@@ -527,14 +537,14 @@ static int deinit(void)
- 	// sending the next one, while sample mode will keep streaming
- 	// (and under fluorescent light it WILL stream..)
- 	// triggering the problem
--	setPin(openPin, 0);
--	setPin(sendingPin, 0);
--	setPin(receivePin, 0);
- 	if (dev != NULL) {
-+		setPin(openPin, 0);
-+		setPin(sendingPin, 0);
-+		setPin(receivePin, 0);
- 		irtoy_reset(dev);
- 		free(dev);
-+		dev = NULL;
- 	}
--	dev = NULL;
- 
- 	close(drv.fd);
- 	drv.fd = -1;
-@@ -562,10 +572,6 @@ static int irtoy_send_double_buffered(unsigned char* signals, int length)
- 	unsigned char reply[16];
- 	int irtoyXmit;
- 
--	if (dev == NULL) {
--		log_error("irtoy_send: irtoy not initialized");
--		return 0;
--	}
- 	res = write(dev->fd, IRTOY_COMMAND_TXSTART, sizeof(IRTOY_COMMAND_TXSTART));
- 
- 	if (res != sizeof(IRTOY_COMMAND_TXSTART)) {
-@@ -647,6 +653,12 @@ static int send(struct ir_remote* remote, struct ir_ncode* code)
- 	lirc_t val;
- 	int res;
- 
-+	log_trace("irtoy: send");
-+
-+	if (dev == NULL) {
-+		log_error("irtoy: send: irtoy not initialized");
-+		return 0;
-+	}
- 
- 	if (!send_buffer_put(remote, code))
- 		return 0;
--- 
-2.5.5
-
diff --git a/0004-lirc.org-Clean-up-distribution-links-bugfixes.patch b/0004-lirc.org-Clean-up-distribution-links-bugfixes.patch
new file mode 100644
index 0000000..5a03b30
--- /dev/null
+++ b/0004-lirc.org-Clean-up-distribution-links-bugfixes.patch
@@ -0,0 +1,104 @@
+From c3e65dd45ece8ac328332c63b8009cd1f77a2ca4 Mon Sep 17 00:00:00 2001
+From: Alec Leamas <leamas.alec@gmail.com>
+Date: Sun, 23 Oct 2016 17:10:26 +0200
+Subject: [PATCH 04/10] lirc.org: Clean up distribution links, bugfixes.
+
+---
+ doc/html-source/configure.html |  1 +
+ doc/lirc.org/index.html        | 54 +++++++++++++++++++++++++++---------------
+ 2 files changed, 36 insertions(+), 19 deletions(-)
+
+diff --git a/doc/html-source/configure.html b/doc/html-source/configure.html
+index 7c01b3d..feb7d41 100644
+--- a/doc/html-source/configure.html
++++ b/doc/html-source/configure.html
+@@ -60,6 +60,7 @@
+      <p>
+ 
+     <H3> uinput  and effective user </h3>
++    <p>
+     If your distribution does not have uinput enabled by default
+     (i. e., there is a /dev/uinput device) add to the file /etc/modules
+     the entry: </p>
+diff --git a/doc/lirc.org/index.html b/doc/lirc.org/index.html
+index 93cecf7..7b4ab21 100644
+--- a/doc/lirc.org/index.html
++++ b/doc/lirc.org/index.html
+@@ -96,7 +96,7 @@
+             </P>
+             <UL CLASS="menu">
+               <li>The latest version of LIRC can be downloaded from
+-                  <A HREF="http://sourceforge.net/projects/lirc/files/LIRC/0.9.4b">
++                  <A HREF="http://sourceforge.net/projects/lirc/files/LIRC/0.9.4c">
+                   SourceForge</a></li>
+               <li>Other, unmaintained programs such as xrc and xirw
+                    as well as older LIRC version can also be found on
+@@ -104,6 +104,39 @@
+                    SourceForge</A></li>
+             </UL>
+             <BR>
++            <!-- Linux distributions w LIRC -->
++            <TABLE WIDTH="100%" BORDER="0" CELLSPACING="0"
++                   CELLPADDING="0" SUMMARY="">
++                <TR>
++                  <TD CLASS="menuhead">
++                    Linux distributions packaging LIRC
++                  </TD>
++                </TR>
++            </TABLE>
++            <UL TYPE="SQUARE">
++                <LI><A HREF="https://www.archlinux.org/">Arch Linux</A></LI>
++                <LI><A HREF="http://www.debian.org/">Debian</A></LI>
++                <LI><A HREF="http://www.fedoraproject.org/">Fedora</A></LI>
++                <LI><A HREF="http://www.gentoo.org/">Gentoo</A></LI>
++                <LI><A HREF="http://www.mandrivalinux.com">Mandriva(Previously Mandrake)</A></LI>
++                <LI><A HREF="http://www.redhat.com/">RedHat</A></LI>
++                <LI><A HREF="http://www.slackware.com/">Slackware</A>
++                    - the mother of all Distributions
++                </LI>
++                <LI><A HREF="http://www.suse.de/">SUSE.</A></LI>
++                <LI><A HREF="http://www.ubuntu.com/">Ubuntu</A></LI>
++            </UL>
++            <TABLE WIDTH="100%" BORDER="0" CELLSPACING="0"
++                   CELLPADDING="0" SUMMARY="">
++                <TR>
++                  <TD CLASS="menuhead"> MacOS builds </TD>
++                </TR>
++            </TABLE>
++            <UL TYPE="SQUARE">
++              <LI><A HREF="https://www.macports.org/ports.php?by=name&substr=lirc">
++                       MacPorts
++              </A></LI>
++            </UL>
+ 
+             <!-- Hardware -->
+             <TABLE WIDTH="100%" BORDER="0" CELLSPACING="0"
+@@ -286,24 +319,7 @@
+                 <LI><A HREF="http://www.kernel.org/">www.kernel.org</A> - Linux Kernel Website</LI>
+                 <LI><A HREF="http://www.freshmeat.net/">www.freshmeat.net</A> - A great place for searching for Linux Applications</LI>
+               </UL>
+-              <FONT SIZE="+1" COLOR="#FFFFFF">
+-                Linux Distributions Packaging LIRC
+-              </FONT>
+-              <UL TYPE="SQUARE">
+-                <LI><A HREF="http://www.slackware.com/">Slackware</A> - the mother of all Distributions</LI>
+-                <LI><A HREF="http://www.redhat.com/">RedHat</A></LI>
+-                <LI><A HREF="http://www.debian.org/">Debian</A></LI>
+-                <LI><A HREF="http://www.ubuntu.com/">Ubuntu</A></LI>
+-                <LI><A HREF="http://www.fedoraproject.org/">Fedora</A></LI>
+-                <LI><A HREF="http://www.gentoo.org/">Gentoo</A></LI>
+-                <LI><A HREF="http://www.suse.de/">SUSE.</A></LI>
+-                <LI><A HREF="http://www.mandrivalinux.com">Mandriva(Previously Mandrake)</A></LI>
+-                <LI><A HREF="https://www.archlinux.org/">Arch Linux</A></LI>
+-                <LI><A HREF="https://www.macports.org/ports.php?by=name&substr=lirc">
+-                         MacOS - MacPorts
+-                </A></LI>
+-              </UL>
+-            </DIV>
++           </DIV>
+ 
+             <TABLE WIDTH="100%" BORDER="0" CELLSPACING="0"
+                    CELLPADDING="0" SUMMARY="">
+-- 
+2.5.5
+
diff --git a/0004-plugins-audio_alsa-Fix-byte-truncating-in-16-bit-dat.patch b/0004-plugins-audio_alsa-Fix-byte-truncating-in-16-bit-dat.patch
deleted file mode 100644
index b4a4e00..0000000
--- a/0004-plugins-audio_alsa-Fix-byte-truncating-in-16-bit-dat.patch
+++ /dev/null
@@ -1,36 +0,0 @@
-From 4e931d11585e1baeddeea9a753007d835f8a3334 Mon Sep 17 00:00:00 2001
-From: Alec Leamas <leamas.alec@gmail.com>
-Date: Wed, 17 Aug 2016 21:28:00 +0200
-Subject: [PATCH 04/10] plugins: audio_alsa: Fix byte truncating in 16-bit data
- (#218):
-
-This fixes a bug introduced in 82305c72 which basically was
-about muting a "dereferencing type-punned pointer will break
-strict-aliasing rules" compiler warning.
----
- plugins/audio_alsa.c | 7 ++++---
- 1 file changed, 4 insertions(+), 3 deletions(-)
-
-diff --git a/plugins/audio_alsa.c b/plugins/audio_alsa.c
-index 20022f3..ff0d8a9 100644
---- a/plugins/audio_alsa.c
-+++ b/plugins/audio_alsa.c
-@@ -436,11 +436,12 @@ var_reset:                      /* Reset variables */
- 		for (i = 0; i < count; i++) {
- 			/* cs == current sample */
- 			unsigned char cs, as, sl, sz, xz;
--			short stmp;
-+			unsigned short stmp;
- 
- 			if (bytes_per_sample == 2) {
--				stmp = buff[i * bytes_per_sample * alsa_hw.num_channels +
--					    bytes_per_sample * alsa_hw.channel];
-+				int ix = i * bytes_per_sample * alsa_hw.num_channels +
-+					     bytes_per_sample * alsa_hw.channel;
-+				memcpy(&stmp, &buff[ix], sizeof(stmp));
- 				cs = stmp >> 8;
- 				cs ^= 0x80;
- 			} else {
--- 
-2.5.5
-
diff --git a/0005-contrib-disable-udev-dev-uinput-rule.patch b/0005-contrib-disable-udev-dev-uinput-rule.patch
deleted file mode 100644
index 338b956..0000000
--- a/0005-contrib-disable-udev-dev-uinput-rule.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-From 8cb5fd91935603536dcb0377ff91eb0ae477d19a Mon Sep 17 00:00:00 2001
-From: Alec Leamas <leamas.alec@gmail.com>
-Date: Thu, 18 Aug 2016 16:19:17 +0200
-Subject: [PATCH 05/10] contrib: disable udev /dev/uinput rule.
-
----
- contrib/97-lircd-uinput.rules | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/contrib/97-lircd-uinput.rules b/contrib/97-lircd-uinput.rules
-index 12228a7..a554299 100644
---- a/contrib/97-lircd-uinput.rules
-+++ b/contrib/97-lircd-uinput.rules
-@@ -7,4 +7,4 @@ SUBSYSTEMS=="input",ATTRS{name}=="lircmd",SYMLINK+="lircmd"
- # Make /dev/uinput accessible for the lirc group. A setfacl RUN would be
- # better here, but seemingly does not work (?)
- # An alternative is to use lircd-setup(8) to sun setfacl(1).
--KERNEL=="uinput",GROUP:="lirc",MODE:="0660"
-+## KERNEL=="uinput",GROUP:="lirc",MODE:="0660"
--- 
-2.5.5
-
diff --git a/0005-lib-curl_poll.h-Ensure-build-on-unconfiguredclients.patch b/0005-lib-curl_poll.h-Ensure-build-on-unconfiguredclients.patch
new file mode 100644
index 0000000..caa2a46
--- /dev/null
+++ b/0005-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/0006-lirc-setup-Fix-crasher-bugfix.patch b/0006-lirc-setup-Fix-crasher-bugfix.patch
deleted file mode 100644
index d0791a6..0000000
--- a/0006-lirc-setup-Fix-crasher-bugfix.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-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 06/10] 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
-
diff --git a/0006-lirc.pc-Fix-bad-library-specification-236.patch b/0006-lirc.pc-Fix-bad-library-specification-236.patch
new file mode 100644
index 0000000..104cab0
--- /dev/null
+++ b/0006-lirc.pc-Fix-bad-library-specification-236.patch
@@ -0,0 +1,23 @@
+From 916a48ffcb9f1c259a0fc778a2de1be729423092 Mon Sep 17 00:00:00 2001
+From: Alec Leamas <leamas.alec@gmail.com>
+Date: Tue, 25 Oct 2016 21:29:27 +0200
+Subject: [PATCH 06/10] lirc.pc: Fix bad library specification (#236).
+
+---
+ lirc.pc.in | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/lirc.pc.in b/lirc.pc.in
+index 802f00e..5ed7c1c 100644
+--- a/lirc.pc.in
++++ b/lirc.pc.in
+@@ -10,5 +10,5 @@ includedir=@includedir@
+ pkgdatadir=@datadir@/lirc
+ plugindir=${libdir}/lirc/plugins
+ 
+-Libs: -L${libdir} -llirc
++Libs: -L${libdir} -llirc_client
+ Cflags: -I${includedir}
+-- 
+2.5.5
+
diff --git a/0007-Build-Use-HAVE_UINPUT-1-to-force-building-uinput-cod.patch b/0007-Build-Use-HAVE_UINPUT-1-to-force-building-uinput-cod.patch
new file mode 100644
index 0000000..226edc0
--- /dev/null
+++ b/0007-Build-Use-HAVE_UINPUT-1-to-force-building-uinput-cod.patch
@@ -0,0 +1,38 @@
+From 0463f56357d1dd223a4d2882dbc460a0a7a7e9ad Mon Sep 17 00:00:00 2001
+From: Alec Leamas <leamas.alec@gmail.com>
+Date: Sat, 29 Oct 2016 11:06:50 +0200
+Subject: [PATCH 07/10] Build: Use HAVE_UINPUT=1 to force building uinput code
+ (#238).
+
+---
+ configure.ac | 7 ++++++-
+ 1 file changed, 6 insertions(+), 1 deletion(-)
+
+diff --git a/configure.ac b/configure.ac
+index cde9813..08e2c8e 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -33,7 +33,7 @@ if test x$XSLTPROC != "xyes"; then
+     AC_MSG_ERROR([
+       xsltproc is required to build. It usually comes with libxml])
+ fi
+-AM_CONDITIONAL(HAVE_UINPUT, test -e /dev/uinput)
++AM_CONDITIONAL(HAVE_UINPUT, test -n "$HAVE_UINPUT" -o -e /dev/uinput)
+ AC_CHECK_PROG([MAN2HTML],[man2html],[yes],[no])
+ AM_CONDITIONAL(HAVE_MAN2HTML, test x$MAN2HTML = xyes)
+ AC_CHECK_PROG([DOXYGEN],[doxygen],[yes],[no])
+@@ -446,6 +446,11 @@ AM_CONDITIONAL(NEED_PYTHON3, [test "x$enable_python3_fix" = "xyes"])
+ AC_ARG_VAR(HAVE_WORKING_POLL,[
+ 	   On cross-compile: Target has a working poll(2) implementation])
+ 
++AC_ARG_VAR(HAVE_UINPUT,[
++  If not-empty, assume uinput is available despite missing /dev/uinput
++])
++
++
+ suffix=$(echo "$VERSION" | sed 's/.*-//')
+ AM_CONDITIONAL(DEVEL, [test x$suffix = xdevel])
+ 
+-- 
+2.5.5
+
diff --git a/0007-contrib-Fix-usb-devices-acl-permissions-rhbz-1364744.patch b/0007-contrib-Fix-usb-devices-acl-permissions-rhbz-1364744.patch
deleted file mode 100644
index 338bd51..0000000
--- a/0007-contrib-Fix-usb-devices-acl-permissions-rhbz-1364744.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-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 07/10] contrib: Fix usb devices' acl permissions (rhbz
- #1364744).
-
----
- 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..492aae9 100644
---- a/contrib/60-lirc.rules
-+++ b/contrib/60-lirc.rules
-@@ -1,8 +1,9 @@
--# Installing this udev rule will make the /dev/lirc* devices accessible
--# for users in the group "lirc" using regular group permissions. USB
--# devices grants rw permission to the lirc group using ACL.
--# To enable, copy to /etc/udev/rules.d.
-+# Make the /dev/lirc* devices accessible for users in the group "lirc"
-+# using regular group permissions.
- 
- 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/sh -c '/usr/bin/setfacl -m g:lirc:rw %E{DEVNAME} 2>/dev/null || :'"
--- 
-2.5.5
-
diff --git a/0008-lircd-Retry-temporary-unavailable-write-sockets-221.patch b/0008-lircd-Retry-temporary-unavailable-write-sockets-221.patch
deleted file mode 100644
index afa2b79..0000000
--- a/0008-lircd-Retry-temporary-unavailable-write-sockets-221.patch
+++ /dev/null
@@ -1,55 +0,0 @@
-From f561c4b9e1ea8a225ae4431348529cd5b6b477d9 Mon Sep 17 00:00:00 2001
-From: Alec Leamas <leamas.alec@gmail.com>
-Date: Tue, 23 Aug 2016 13:16:56 +0200
-Subject: [PATCH 08/10] lircd: Retry temporary unavailable write sockets
- (#221).
-
----
- daemons/lircd.cpp | 21 +++++++++++++++++++--
- 1 file changed, 19 insertions(+), 2 deletions(-)
-
-diff --git a/daemons/lircd.cpp b/daemons/lircd.cpp
-index de2c341..2dc9029 100644
---- a/daemons/lircd.cpp
-+++ b/daemons/lircd.cpp
-@@ -115,6 +115,12 @@ int clock_gettime(int clk_id, struct timespec *t){
- 
- static const logchannel_t logchannel = LOG_APP;
- 
-+/** How long we sleep while waiting for busy write sockets. */
-+static const int WRITE_SLEEP_US = 20000;
-+
-+/** How many times we retry busy write sockets. */
-+static const int WRITE_RETRIES = 50;
-+
- struct peer_connection {
- 	char*		host;
- 	unsigned short	port;
-@@ -338,11 +344,22 @@ static int oatoi(const char* s)
- int write_socket(int fd, const char* buf, int len)
- {
- 	int done, todo = len;
-+	int retries = WRITE_RETRIES;
- 
- 	while (todo) {
- 		done = write(fd, buf, todo);
--		if (done <= 0)
--			return done;
-+		if (done <= 0) {
-+			log_perror_debug("Error in write_socket");
-+			if (errno == EAGAIN || errno == EWOULDBLOCK) {
-+				retries -= 1;
-+				if (retries <= 0)
-+					return done;
-+				usleep(WRITE_SLEEP_US);
-+				continue;
-+			} else {
-+				return done;
-+			}
-+		}
- 		buf += done;
- 		todo -= done;
- 	}
--- 
-2.5.5
-
diff --git a/0008-systemd-Fix-wrong-path-to-irexec-239.patch b/0008-systemd-Fix-wrong-path-to-irexec-239.patch
new file mode 100644
index 0000000..55fc222
--- /dev/null
+++ b/0008-systemd-Fix-wrong-path-to-irexec-239.patch
@@ -0,0 +1,25 @@
+From eb06327fc1b4e8e9682cf471643ccbab35fed241 Mon Sep 17 00:00:00 2001
+From: Alec Leamas <leamas.alec@gmail.com>
+Date: Sat, 29 Oct 2016 11:50:23 +0200
+Subject: [PATCH 08/10] systemd: Fix wrong path to irexec (#239).
+
+---
+ systemd/irexec.service | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/systemd/irexec.service b/systemd/irexec.service
+index 6eb8e6f..25ac6fc 100644
+--- a/systemd/irexec.service
++++ b/systemd/irexec.service
+@@ -20,7 +20,7 @@ Description=Handle events from IR remotes decoded by lircd(8)
+ 
+ 
+ Type=simple
+-ExecStart=/usr/sbin/irexec /etc/lirc/irexec.lircrc
++ExecStart=/usr/bin/irexec /etc/lirc/irexec.lircrc
+ 
+ [Install]
+ WantedBy=multi-user.target
+-- 
+2.5.5
+
diff --git a/0009-.gitignore-doc-fixes.patch b/0009-.gitignore-doc-fixes.patch
new file mode 100644
index 0000000..b973dad
--- /dev/null
+++ b/0009-.gitignore-doc-fixes.patch
@@ -0,0 +1,32 @@
+From eb21328b2ecb59cb3215ef349e7de73d328eac2c Mon Sep 17 00:00:00 2001
+From: Alec Leamas <leamas.alec@gmail.com>
+Date: Sun, 30 Oct 2016 03:53:22 +0100
+Subject: [PATCH 09/10] .gitignore: doc/ fixes
+
+---
+ .gitignore | 2 ++
+ 1 file changed, 2 insertions(+)
+
+diff --git a/.gitignore b/.gitignore
+index 16bc688..40bed98 100644
+--- a/.gitignore
++++ b/.gitignore
+@@ -37,6 +37,7 @@ kernel-drivers.yaml
+ doc/api-docs
+ doc/man-html
+ doc/man/*.[1-9]
++doc/man
+ doc/html
+ doc/NEWS*
+ doc/lirc.hwdb
+@@ -44,6 +45,7 @@ doc/table.html
+ doc/driver-toc.xsl
+ doc/docpage.xsl
+ doc/lirc.org/html
++doc/lirc.org/api-docs/
+ doc/ext-driver-toc.xsl
+ 
+ doxygen-warnings.txt
+-- 
+2.5.5
+
diff --git a/0009-lircd-Warn-for-duplicate-remote-definitions-222.patch b/0009-lircd-Warn-for-duplicate-remote-definitions-222.patch
deleted file mode 100644
index 46ff2f1..0000000
--- a/0009-lircd-Warn-for-duplicate-remote-definitions-222.patch
+++ /dev/null
@@ -1,57 +0,0 @@
-From 9ad5f93a07be0bf4f645f16dbbf29e2e8cd3b871 Mon Sep 17 00:00:00 2001
-From: Alec Leamas <leamas.alec@gmail.com>
-Date: Tue, 23 Aug 2016 13:50:48 +0200
-Subject: [PATCH 09/10] lircd: Warn for duplicate remote definitions (#222).
-
----
- daemons/lircd.cpp | 20 ++++++++++++++++++++
- 1 file changed, 20 insertions(+)
-
-diff --git a/daemons/lircd.cpp b/daemons/lircd.cpp
-index 2dc9029..8fd8336 100644
---- a/daemons/lircd.cpp
-+++ b/daemons/lircd.cpp
-@@ -70,6 +70,9 @@
- #include <sys/ioctl.h>
- #endif
- 
-+#include <string>
-+#include <set>
-+
- #include "lirc_private.h"
- 
- #ifdef HAVE_INT_GETGROUPLIST_GROUPS
-@@ -540,6 +543,22 @@ static int setup_hardware(void)
- 	return ret;
- }
- 
-+static void check_config_duplicates(const struct ir_remote* head)
-+{
-+	std::set<std::string> names;
-+	const struct ir_remote* ir;
-+	const char* const errmsg =
-+		"Duplicate remotes \"%s\" found, problems ahead";
-+
-+	for (ir = head; ir != NULL; ir = ir->next) {
-+		std::string name(ir->name);
-+		if (names.count(name) == 1)
-+			log_warn(errmsg, name.c_str())
-+		else
-+			names.insert(name);
-+	}
-+}
-+
- 
- void config(void)
- {
-@@ -572,6 +591,7 @@ void config(void)
- 	}
- 	configfile = filename;
- 	config_remotes = read_config(fd, configfile);
-+	check_config_duplicates(config_remotes);
- 	fclose(fd);
- 	if (config_remotes == (void*)-1) {
- 		log_error("reading of config file failed");
--- 
-2.5.5
-
diff --git a/0010-lib-Only-use-local-headers-in-lirc_private.h-237.patch b/0010-lib-Only-use-local-headers-in-lirc_private.h-237.patch
new file mode 100644
index 0000000..4adb05c
--- /dev/null
+++ b/0010-lib-Only-use-local-headers-in-lirc_private.h-237.patch
@@ -0,0 +1,59 @@
+From e50858c64e21d7a7243cd047042107d782f7c918 Mon Sep 17 00:00:00 2001
+From: Alec Leamas <leamas.alec@gmail.com>
+Date: Sun, 30 Oct 2016 04:00:18 +0100
+Subject: [PATCH 10/10] lib: Only use local headers in lirc_private.h (#237).
+
+The lirc_private.h header should only be used internally
+when building lirc tools, and i this case we should not
+care about what's possibly installed in /usr/include/lirc.
+---
+ lib/lirc_private.h | 34 +++++++++++++++++-----------------
+ 1 file changed, 17 insertions(+), 17 deletions(-)
+
+diff --git a/lib/lirc_private.h b/lib/lirc_private.h
+index 741f86c..2336c0a 100644
+--- a/lib/lirc_private.h
++++ b/lib/lirc_private.h
+@@ -19,22 +19,22 @@
+ #include "include/media/lirc.h"
+ #endif
+ 
+-#include "lirc/ir_remote_types.h"
+-#include "lirc/lirc_log.h"
+-#include "lirc/lirc_options.h"
+-#include "lirc/lirc-utils.h"
+-#include "lirc/curl_poll.h"
+-#include "lirc/config_file.h"
+-#include "lirc/dump_config.h"
+-#include "lirc/input_map.h"
+-#include "lirc/driver.h"
+-#include "lirc/ir_remote_types.h"
+-#include "lirc/drv_admin.h"
+-#include "lirc/ir_remote.h"
+-#include "lirc/receive.h"
+-#include "lirc/release.h"
+-#include "lirc/serial.h"
+-#include "lirc/transmit.h"
+-#include "lirc/ciniparser.h"
++#include "ir_remote_types.h"
++#include "lirc_log.h"
++#include "lirc_options.h"
++#include "lirc-utils.h"
++#include "curl_poll.h"
++#include "config_file.h"
++#include "dump_config.h"
++#include "input_map.h"
++#include "driver.h"
++#include "ir_remote_types.h"
++#include "drv_admin.h"
++#include "ir_remote.h"
++#include "receive.h"
++#include "release.h"
++#include "serial.h"
++#include "transmit.h"
++#include "ciniparser.h"
+ 
+ #endif
+-- 
+2.5.5
+
diff --git a/0010-lirc-make-devinput-Fix-that-two-remotes-has-the-same.patch b/0010-lirc-make-devinput-Fix-that-two-remotes-has-the-same.patch
deleted file mode 100644
index 7e90e9a..0000000
--- a/0010-lirc-make-devinput-Fix-that-two-remotes-has-the-same.patch
+++ /dev/null
@@ -1,35 +0,0 @@
-From b853e3d1bcc756206ffa1bc612996cd1597d53ea Mon Sep 17 00:00:00 2001
-From: Alec Leamas <leamas.alec@gmail.com>
-Date: Tue, 23 Aug 2016 13:24:32 +0200
-Subject: [PATCH 10/10] lirc-make-devinput: Fix that two remotes has the same
- name (#222).
-
----
- tools/lirc-make-devinput | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/tools/lirc-make-devinput b/tools/lirc-make-devinput
-index 3ae63ea..0598970 100755
---- a/tools/lirc-make-devinput
-+++ b/tools/lirc-make-devinput
-@@ -63,7 +63,7 @@ echo "# Date: $(date)"
- cat <<EOF
- 
- begin remote
--        name            devinput
-+        name            devinput-64
-         bits            16
-         eps             30
-         aeps            100
-@@ -89,7 +89,7 @@ echo "# generated by $(basename $0) (obsolete 32 bit version)"
- cat <<EOF
- 
- begin remote
--        name            devinput
-+        name            devinput-32
-         bits            16
-         eps             30
-         aeps            100
--- 
-2.5.5
-
diff --git a/0011-include-Update-bundled-lirc.h.patch b/0011-include-Update-bundled-lirc.h.patch
deleted file mode 100644
index 59f97bc..0000000
--- a/0011-include-Update-bundled-lirc.h.patch
+++ /dev/null
@@ -1,182 +0,0 @@
-From 5dd37205a06a44e6b9cdbae5a3901e39270f0975 Mon Sep 17 00:00:00 2001
-From: Alec Leamas <leamas.alec@gmail.com>
-Date: Thu, 18 Aug 2016 22:35:31 +0200
-Subject: [PATCH 6/7] include: Update bundled lirc.h.
-
----
- include/media/lirc.h | 95 ++++++----------------------------------------------
- 1 file changed, 10 insertions(+), 85 deletions(-)
-
-diff --git a/include/media/lirc.h b/include/media/lirc.h
-index 601fccb..991ab45 100644
---- a/include/media/lirc.h
-+++ b/include/media/lirc.h
-@@ -1,39 +1,13 @@
--/**
-- * @file lirc.c
-- * This file contains some general definitions, like feature flags.
-- * It's a bundled copy from the kernel sources. Being part of
-- * kernel sources is a bug, see
-- * https://bugzilla.kernel.org/show_bug.cgi?id=75751.
-- * The file is upstreamed to the kernel from 4.6.
-- */
--
--#ifndef LIRC_BASE_H
--#define LIRC_BASE_H
--
--#ifdef	__cplusplus
--extern "C" {
--#endif
--
--/**
-- * This data type, with its extremely carefully selected name, is used as
-- * data type for the signal durations.
-- */
--#define lirc_t int
--
- /*
-  * lirc.h - linux infrared remote control header file
-- * last modified 2010/06/03 by Jarod Wilson
-+ * last modified 2010/07/13 by Jarod Wilson
-  */
- 
--#if defined(__linux__)
-+#ifndef _LINUX_LIRC_H
-+#define _LINUX_LIRC_H
-+
- #include <linux/types.h>
- #include <linux/ioctl.h>
--#elif defined(_NetBSD_)
--#include <sys/ioctl.h>
--#elif defined(_CYGWIN_)
--#define __USE_LINUX_IOCTL_DEFS
--#include <sys/ioctl.h>
--#endif
- 
- #define PULSE_BIT       0x01000000
- #define PULSE_MASK      0x00FFFFFF
-@@ -59,6 +33,9 @@ extern "C" {
- #define LIRC_IS_FREQUENCY(val) (LIRC_MODE2(val) == LIRC_MODE2_FREQUENCY)
- #define LIRC_IS_TIMEOUT(val) (LIRC_MODE2(val) == LIRC_MODE2_TIMEOUT)
- 
-+/* used heavily by lirc userspace */
-+#define lirc_t int
-+
- /*** lirc compatible hardware features ***/
- 
- #define LIRC_MODE2SEND(x) (x)
-@@ -79,16 +56,8 @@ extern "C" {
- 
- #define LIRC_CAN_SEND_MASK             0x0000003f
- 
--/** This flag indicates that the transmitter is capable of setting the
-- * IR carrier frequency. */
- #define LIRC_CAN_SET_SEND_CARRIER      0x00000100
--
--/** This flag indicates that the transmitter is capable of setting the
-- *  duty cycle of generated IR signals. */
- #define LIRC_CAN_SET_SEND_DUTY_CYCLE   0x00000200
--
--/** This flag indicates that the transmitter is capable of setting a
-- *  transmitter mask, i.e., probably has several transmitters. */
- #define LIRC_CAN_SET_TRANSMITTER_MASK  0x00000400
- 
- #define LIRC_CAN_REC_RAW               LIRC_MODE2REC(LIRC_MODE_RAW)
-@@ -107,16 +76,10 @@ extern "C" {
- #define LIRC_CAN_SET_REC_TIMEOUT          0x10000000
- #define LIRC_CAN_SET_REC_FILTER           0x08000000
- 
--
--/** This flag indicates that the receiver is capable of estimating
-- *  the carrier frequency of received IR signals. */
- #define LIRC_CAN_MEASURE_CARRIER          0x02000000
- #define LIRC_CAN_USE_WIDEBAND_RECEIVER    0x04000000
- 
--/** Extract sending features from its argument. */
- #define LIRC_CAN_SEND(x) ((x)&LIRC_CAN_SEND_MASK)
--
--/** Extract receiving features from its argument. */
- #define LIRC_CAN_REC(x) ((x)&LIRC_CAN_REC_MASK)
- 
- #define LIRC_CAN_NOTIFY_DECODE            0x01000000
-@@ -127,20 +90,11 @@ extern "C" {
- 
- #define LIRC_GET_SEND_MODE             _IOR('i', 0x00000001, __u32)
- #define LIRC_GET_REC_MODE              _IOR('i', 0x00000002, __u32)
--#define LIRC_GET_SEND_CARRIER          _IOR('i', 0x00000003, __u32)
--#define LIRC_GET_REC_CARRIER           _IOR('i', 0x00000004, __u32)
--#define LIRC_GET_SEND_DUTY_CYCLE       _IOR('i', 0x00000005, __u32)
--#define LIRC_GET_REC_DUTY_CYCLE        _IOR('i', 0x00000006, __u32)
- #define LIRC_GET_REC_RESOLUTION        _IOR('i', 0x00000007, __u32)
- 
- #define LIRC_GET_MIN_TIMEOUT           _IOR('i', 0x00000008, __u32)
- #define LIRC_GET_MAX_TIMEOUT           _IOR('i', 0x00000009, __u32)
- 
--#define LIRC_GET_MIN_FILTER_PULSE      _IOR('i', 0x0000000a, __u32)
--#define LIRC_GET_MAX_FILTER_PULSE      _IOR('i', 0x0000000b, __u32)
--#define LIRC_GET_MIN_FILTER_SPACE      _IOR('i', 0x0000000c, __u32)
--#define LIRC_GET_MAX_FILTER_SPACE      _IOR('i', 0x0000000d, __u32)
--
- /* code length in bits, currently only for LIRC_MODE_LIRCCODE */
- #define LIRC_GET_LENGTH                _IOR('i', 0x0000000f, __u32)
- 
-@@ -150,7 +104,6 @@ extern "C" {
- #define LIRC_SET_SEND_CARRIER          _IOW('i', 0x00000013, __u32)
- #define LIRC_SET_REC_CARRIER           _IOW('i', 0x00000014, __u32)
- #define LIRC_SET_SEND_DUTY_CYCLE       _IOW('i', 0x00000015, __u32)
--#define LIRC_SET_REC_DUTY_CYCLE        _IOW('i', 0x00000016, __u32)
- #define LIRC_SET_TRANSMITTER_MASK      _IOW('i', 0x00000017, __u32)
- 
- /*
-@@ -164,45 +117,17 @@ extern "C" {
- #define LIRC_SET_REC_TIMEOUT_REPORTS   _IOW('i', 0x00000019, __u32)
- 
- /*
-- * pulses shorter than this are filtered out by hardware (software
-- * emulation in lirc_dev?)
-- */
--#define LIRC_SET_REC_FILTER_PULSE      _IOW('i', 0x0000001a, __u32)
--/*
-- * spaces shorter than this are filtered out by hardware (software
-- * emulation in lirc_dev?)
-- */
--#define LIRC_SET_REC_FILTER_SPACE      _IOW('i', 0x0000001b, __u32)
--/*
-- * if filter cannot be set independantly for pulse/space, this should
-- * be used
-- */
--#define LIRC_SET_REC_FILTER            _IOW('i', 0x0000001c, __u32)
--
--/*
-  * if enabled from the next key press on the driver will send
-  * LIRC_MODE2_FREQUENCY packets
-  */
--#define LIRC_SET_MEASURE_CARRIER_MODE  _IOW('i', 0x0000001d, __u32)
-+#define LIRC_SET_MEASURE_CARRIER_MODE	_IOW('i', 0x0000001d, __u32)
- 
- /*
-- * to set a range use
-- * LIRC_SET_REC_DUTY_CYCLE_RANGE/LIRC_SET_REC_CARRIER_RANGE with the
-- * lower bound first and later
-- * LIRC_SET_REC_DUTY_CYCLE/LIRC_SET_REC_CARRIER with the upper bound
-+ * to set a range use LIRC_SET_REC_CARRIER_RANGE with the
-+ * lower bound first and later LIRC_SET_REC_CARRIER with the upper bound
-  */
--
--#define LIRC_SET_REC_DUTY_CYCLE_RANGE  _IOW('i', 0x0000001e, __u32)
- #define LIRC_SET_REC_CARRIER_RANGE     _IOW('i', 0x0000001f, __u32)
- 
--#define LIRC_NOTIFY_DECODE             _IO('i', 0x00000020)
--
--#define LIRC_SETUP_START               _IO('i', 0x00000021)
--#define LIRC_SETUP_END                 _IO('i', 0x00000022)
- #define LIRC_SET_WIDEBAND_RECEIVER     _IOW('i', 0x00000023, __u32)
- 
--#ifdef	__cplusplus
--}
- #endif
--
--#endif //LIRC_BASE_H
--- 
-2.5.5
-
diff --git a/0012-lircd-Remove-use-of-functions-killed-in-kernel-4.8.0.patch b/0012-lircd-Remove-use-of-functions-killed-in-kernel-4.8.0.patch
deleted file mode 100644
index 65a48e8..0000000
--- a/0012-lircd-Remove-use-of-functions-killed-in-kernel-4.8.0.patch
+++ /dev/null
@@ -1,110 +0,0 @@
-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
-
diff --git a/lirc.spec b/lirc.spec
index f149c62..a5bf0ad 100644
--- a/lirc.spec
+++ b/lirc.spec
@@ -4,7 +4,7 @@
 #define tag     devel
 
 Name:           lirc
-Version:        0.9.4b
+Version:        0.9.4c
 Release:        %{?tag:0.}4%{?tag:.}%{?tag}%{?dist}
 Summary:        The Linux Infrared Remote Control package
 
@@ -17,19 +17,15 @@ URL:            http://www.lirc.org/
 Source0:        %{?released:%{repo}}%{name}-%{version}%{?tag:-}%{?tag}.tar.gz
 Source1:        README.fedora
 Source2:        99-remote-control-lirc.rules
-                # Config only, cannot be upstreamed.
-#Patch1:         0001-Changing-effective-user-default.patch
-Patch2:         0002-NEWS-lirc.org-index.html-Fixes.patch
-Patch3:         0003-irtoy-improve-error-handling-220.patch
-Patch4:         0004-plugins-audio_alsa-Fix-byte-truncating-in-16-bit-dat.patch
-Patch5:         0005-contrib-disable-udev-dev-uinput-rule.patch
-Patch6:         0006-lirc-setup-Fix-crasher-bugfix.patch
-Patch7:         0007-contrib-Fix-usb-devices-acl-permissions-rhbz-1364744.patch
-Patch8:         0008-lircd-Retry-temporary-unavailable-write-sockets-221.patch
-Patch9:         0009-lircd-Warn-for-duplicate-remote-definitions-222.patch
-Patch10:        0010-lirc-make-devinput-Fix-that-two-remotes-has-the-same.patch
-Patch11:        0011-include-Update-bundled-lirc.h.patch
-Patch12:        0012-lircd-Remove-use-of-functions-killed-in-kernel-4.8.0.patch
+Patch1:         0001-plugins-girs.c-Default-device-typo-fix.patch
+Patch2:         0002-configure-Fix-cross-compilation-error-233.patch
+Patch3:         0003-build-lirc.h-Configure-includes-in-lirc.h-234.patch
+Patch4:         0004-lirc.org-Clean-up-distribution-links-bugfixes.patch
+Patch5:         0005-lib-curl_poll.h-Ensure-build-on-unconfiguredclients.patch
+Patch6:         0006-lirc.pc-Fix-bad-library-specification-236.patch
+Patch7:         0007-Build-Use-HAVE_UINPUT-1-to-force-building-uinput-cod.patch
+Patch8:         0008-systemd-Fix-wrong-path-to-irexec-239.patch
+Patch10:        0010-lib-Only-use-local-headers-in-lirc_private.h-237.patch
 
 BuildRequires:  alsa-lib-devel
 Buildrequires:  autoconf
@@ -192,25 +188,9 @@ full support for the ftdi device.
 
 
 %prep
-%setup -qn %{name}-%{version}%{?tag}
-#patch1 -p1
+%autosetup -p1 -n %{name}-%{version}%{?tag}
 sed -i -e 's/#effective-user/effective-user /' lirc_options.conf
 sed -i -e '/^effective-user/s/=$/= lirc/' lirc_options.conf
-%patch2 -p1
-%patch3 -p1
-%patch4 -p1
-%patch5 -p1
-%patch6 -p1
-%patch7 -p1
-%patch8 -p1
-%patch9 -p1
-%patch10 -p1
-
-%if 0%fedora > 24
-%patch11 -p1
-%patch12 -p1
-cp lib/driver.h lib/lirc/driver.h
-%endif
 
 sed -i -e 's|/usr/local/etc/|/etc/|' contrib/irman2lirc
 
@@ -218,7 +198,7 @@ sed -i -e 's|/usr/local/etc/|/etc/|' contrib/irman2lirc
 %build
 autoreconf -fi
 
-CFLAGS="%{optflags}" %configure --libdir=%{_libdir}
+CFLAGS="%{optflags}" HAVE_UINPUT=1 %configure --libdir=%{_libdir}
 make %{?_smp_mflags}
 
 %install
@@ -364,6 +344,18 @@ systemd-tmpfiles --create %{_tmpfilesdir}/lirc.conf
 %{_udevrulesdir}/99-remote-control-lirc.rules
 
 %changelog
+* Sun Oct 30 2016 Alec Leamas <leamas.alec@gmail.com> - 0.9.4c-4
+- Added upstream patches (10)
+
+* Sat Oct 22 2016 Alec Leamas <leamas.alec@gmail.com> - 0.9.4c-3
+- Add fix for header file curl_poll.h, fixing clients FTBS errors.
+
+* Fri Oct 21 2016 Alec Leamas <leamas.alec@gmail.com> - 0.9.4c-2
+- Rebuilt
+
+* Fri Oct 21 2016 Alec Leamas <leamas.alec@gmail.com> - 0.9.4c-1
+- New upstream version, patches upstreamed
+
 * Tue Aug 23 2016 Alec Leamas <leamas.alec@gmail.com> - 0.9.4b-4
 - Add fixes for #221 and #222
 - Update patches, include everything from upstream
diff --git a/sources b/sources
index 9802488..f9bb9de 100644
--- a/sources
+++ b/sources
@@ -1,2 +1 @@
-f1e11512b543a74e4321ecf77f829518  lirc-0.9.4a.tar.gz
-cde69a4d8020a217757f07e97dd4444e  lirc-0.9.4b.tar.gz
+a7c17a7ec11756e0278d31e8d965a384  lirc-0.9.4c.tar.gz

From fc90355112f67986561e42b3c89b8ece78ce93d3 Mon Sep 17 00:00:00 2001
From: Alec Leamas <leamas.alec@gmail.com>
Date: Wed, 7 Dec 2016 20:01:39 +0100
Subject: [PATCH 170/204] 0.9.4c-5

---
 ...ing-lircd-setup.service-to-distribut.patch | 25 ++++++++++++++++
 0017-Actually-add-lircd-setup.service.patch   | 29 +++++++++++++++++++
 lirc.spec                                     |  8 ++++-
 3 files changed, 61 insertions(+), 1 deletion(-)
 create mode 100644 0016-systemd-Add-missing-lircd-setup.service-to-distribut.patch
 create mode 100644 0017-Actually-add-lircd-setup.service.patch

diff --git a/0016-systemd-Add-missing-lircd-setup.service-to-distribut.patch b/0016-systemd-Add-missing-lircd-setup.service-to-distribut.patch
new file mode 100644
index 0000000..4dbc1c7
--- /dev/null
+++ b/0016-systemd-Add-missing-lircd-setup.service-to-distribut.patch
@@ -0,0 +1,25 @@
+From 761c3c3f035192610cd563747ed7e3c205fbf937 Mon Sep 17 00:00:00 2001
+From: Alec Leamas <leamas.alec@gmail.com>
+Date: Wed, 16 Nov 2016 08:03:13 +0100
+Subject: [PATCH] systemd: Add missing lircd-setup.service to distribution
+ (#243).
+
+---
+ systemd/Makefile.am | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/systemd/Makefile.am b/systemd/Makefile.am
+index bfa339d..1cd80b5 100644
+--- a/systemd/Makefile.am
++++ b/systemd/Makefile.am
+@@ -2,6 +2,7 @@
+ ACLOCAL_AMFLAGS             = -I m4
+ 
+ dist_systemdsystemunit_DATA = lircd.socket lircd.service \
++                              lircd-setup.service \
+                               lircd-uinput.service \
+                               lircmd.service \
+                               irexec.service
+-- 
+2.5.5
+
diff --git a/0017-Actually-add-lircd-setup.service.patch b/0017-Actually-add-lircd-setup.service.patch
new file mode 100644
index 0000000..48ea7dd
--- /dev/null
+++ b/0017-Actually-add-lircd-setup.service.patch
@@ -0,0 +1,29 @@
+From a6984f0249dbe5ec265af2df547526c2255bcf5c Mon Sep 17 00:00:00 2001
+From: Alec Leamas <leamas.alec@gmail.com>
+Date: Wed, 7 Dec 2016 18:21:25 +0100
+Subject: [PATCH] slusk
+
+---
+ systemd/lircd-setup.service | 10 ++++++++++
+ 1 file changed, 10 insertions(+)
+ create mode 100644 systemd/lircd-setup.service
+
+diff --git a/systemd/lircd-setup.service b/systemd/lircd-setup.service
+new file mode 100644
+index 0000000..d448229
+--- /dev/null
++++ b/systemd/lircd-setup.service
+@@ -0,0 +1,10 @@
++[Unit]
++Documentation=man:lircd-setup(8)
++Description=lircd(8) initialization helper tool
++
++[Service]
++Type=oneshot
++ExecStart=/usr/sbin/lircd-setup
++
++[Install]
++WantedBy=multi-user.target
+-- 
+2.5.5
+
diff --git a/lirc.spec b/lirc.spec
index a5bf0ad..76acb77 100644
--- a/lirc.spec
+++ b/lirc.spec
@@ -5,7 +5,7 @@
 
 Name:           lirc
 Version:        0.9.4c
-Release:        %{?tag:0.}4%{?tag:.}%{?tag}%{?dist}
+Release:        %{?tag:0.}5%{?tag:.}%{?tag}%{?dist}
 Summary:        The Linux Infrared Remote Control package
 
 %global repo    http://downloads.sourceforge.net/lirc/LIRC/%{version}/
@@ -17,6 +17,7 @@ URL:            http://www.lirc.org/
 Source0:        %{?released:%{repo}}%{name}-%{version}%{?tag:-}%{?tag}.tar.gz
 Source1:        README.fedora
 Source2:        99-remote-control-lirc.rules
+                # All patches  are from upstream
 Patch1:         0001-plugins-girs.c-Default-device-typo-fix.patch
 Patch2:         0002-configure-Fix-cross-compilation-error-233.patch
 Patch3:         0003-build-lirc.h-Configure-includes-in-lirc.h-234.patch
@@ -26,6 +27,8 @@ Patch6:         0006-lirc.pc-Fix-bad-library-specification-236.patch
 Patch7:         0007-Build-Use-HAVE_UINPUT-1-to-force-building-uinput-cod.patch
 Patch8:         0008-systemd-Fix-wrong-path-to-irexec-239.patch
 Patch10:        0010-lib-Only-use-local-headers-in-lirc_private.h-237.patch
+Patch16:        0016-systemd-Add-missing-lircd-setup.service-to-distribut.patch
+Patch17:        0017-Actually-add-lircd-setup.service.patch
 
 BuildRequires:  alsa-lib-devel
 Buildrequires:  autoconf
@@ -344,6 +347,9 @@ systemd-tmpfiles --create %{_tmpfilesdir}/lirc.conf
 %{_udevrulesdir}/99-remote-control-lirc.rules
 
 %changelog
+* Wed Dec 07 2016 Alec Leamas <leamas.alec@gmail.com> - 0.9.4c-5
+- Added missing lircd-setup.service file.
+
 * Sun Oct 30 2016 Alec Leamas <leamas.alec@gmail.com> - 0.9.4c-4
 - Added upstream patches (10)
 

From 9ad8e1b68c4a8f510ebcda47140e76205e5c0ad6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Miro=20Hron=C4=8Dok?= <miro@hroncok.cz>
Date: Mon, 19 Dec 2016 18:20:36 +0100
Subject: [PATCH 171/204] Rebuild for Python 3.6

---
 lirc.spec | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/lirc.spec b/lirc.spec
index 76acb77..c59d478 100644
--- a/lirc.spec
+++ b/lirc.spec
@@ -5,7 +5,7 @@
 
 Name:           lirc
 Version:        0.9.4c
-Release:        %{?tag:0.}5%{?tag:.}%{?tag}%{?dist}
+Release:        %{?tag:0.}5%{?tag:.}%{?tag}%{?dist}.1
 Summary:        The Linux Infrared Remote Control package
 
 %global repo    http://downloads.sourceforge.net/lirc/LIRC/%{version}/
@@ -347,6 +347,9 @@ systemd-tmpfiles --create %{_tmpfilesdir}/lirc.conf
 %{_udevrulesdir}/99-remote-control-lirc.rules
 
 %changelog
+* Mon Dec 19 2016 Miro Hrončok <mhroncok@redhat.com> - 0.9.4c-5.1
+- Rebuild for Python 3.6
+
 * Wed Dec 07 2016 Alec Leamas <leamas.alec@gmail.com> - 0.9.4c-5
 - Added missing lircd-setup.service file.
 

From 4f05a031afb96fffca5b83e2882398d449f07b65 Mon Sep 17 00:00:00 2001
From: Alec Leamas <leamas.alec@gmail.com>
Date: Fri, 23 Dec 2016 20:07:24 +0100
Subject: [PATCH 172/204] release 0.9.4c-6

---
 ...-lircd-Fix-listen-option-parsing-249.patch | 64 +++++++++++++++++++
 lirc.spec                                     |  6 +-
 2 files changed, 69 insertions(+), 1 deletion(-)
 create mode 100644 0018-lircd-Fix-listen-option-parsing-249.patch

diff --git a/0018-lircd-Fix-listen-option-parsing-249.patch b/0018-lircd-Fix-listen-option-parsing-249.patch
new file mode 100644
index 0000000..fe3607d
--- /dev/null
+++ b/0018-lircd-Fix-listen-option-parsing-249.patch
@@ -0,0 +1,64 @@
+From 1d307be4a95a32fe905793066e866bf64b49ee56 Mon Sep 17 00:00:00 2001
+From: Alec Leamas <leamas.alec@gmail.com>
+Date: Thu, 22 Dec 2016 16:04:15 +0100
+Subject: [PATCH] lircd: Fix --listen option parsing [#249].
+
+---
+ daemons/lircd.cpp      | 8 ++++----
+ doc/man-source/lircd.8 | 3 ++-
+ 2 files changed, 6 insertions(+), 5 deletions(-)
+
+diff --git a/daemons/lircd.cpp b/daemons/lircd.cpp
+index 9fe60c5..e491178 100644
+--- a/daemons/lircd.cpp
++++ b/daemons/lircd.cpp
+@@ -2169,7 +2169,7 @@ static int opt2host_port(const char*		optarg_arg,
+ {
+ 	char optarg[strlen(optarg_arg) + 1];
+ 
+-	strncpy(optarg, optarg_arg, strlen(optarg_arg));
++	strcpy(optarg, optarg_arg);
+ 	long p;
+ 	char* endptr;
+ 	char* sep = strchr(optarg, ':');
+@@ -2296,8 +2296,8 @@ static void lircd_parse_options(int argc, char** const argv)
+ 			options_set_opt("lircd:output", optarg);
+ 			break;
+ 		case 'l':
+-			options_set_opt("lircd:listen", "True");
+-			options_set_opt("lircd:listen_hostport", optarg);
++			options_set_opt("lircd:listen",
++					optarg ? optarg : "0.0.0.0:8765");
+ 			break;
+ 		case 'c':
+ 			options_set_opt("lircd:connect", optarg);
+@@ -2403,7 +2403,7 @@ int main(int argc, char** argv)
+ 		lirc_log_set_file(opt);
+ 	if (options_getstring("lircd:listen") != NULL) {
+ 		listen_tcpip = 1;
+-		opt = options_getstring("lircd:listen_hostport");
++		opt = options_getstring("lircd:listen");
+ 		if (opt) {
+ 			if (opt2host_port(opt, &address, &port, errmsg) != 0) {
+ 				fputs(errmsg, stderr);
+diff --git a/doc/man-source/lircd.8 b/doc/man-source/lircd.8
+index df0a5e4..1aa036f 100644
+--- a/doc/man-source/lircd.8
++++ b/doc/man-source/lircd.8
+@@ -1,4 +1,4 @@
+-.TH LIRCD "8" "Last change: Aug 2016" "lircd @version@" "System Administration Utilities"
++.TH LIRCD "8" "Last change: Dec 2016" "lircd @version@" "System Administration Utilities"
+ .SH NAME
+ .P
+ \fBlircd\fR - Decode infrared signals and provide them on a socket.
+@@ -94,6 +94,7 @@ to all sorts of changes. It has not ben tested thoroughly.
+ Let lircd listen for network
+ connections on the given address/port. The default address is 0.0.0.0,
+ which means that connections on all network interfaces will be accepted.
++The address must be given in dotted numerical form.
+ The default port is 8765. No security checks are currently implemented.
+ The listening lircd instance will send all IR events to the connecting
+ lircd instances.
+-- 
+2.7.4
+
diff --git a/lirc.spec b/lirc.spec
index c59d478..3241698 100644
--- a/lirc.spec
+++ b/lirc.spec
@@ -5,7 +5,7 @@
 
 Name:           lirc
 Version:        0.9.4c
-Release:        %{?tag:0.}5%{?tag:.}%{?tag}%{?dist}.1
+Release:        %{?tag:0.}6%{?tag:.}%{?tag}%{?dist}
 Summary:        The Linux Infrared Remote Control package
 
 %global repo    http://downloads.sourceforge.net/lirc/LIRC/%{version}/
@@ -29,6 +29,7 @@ Patch8:         0008-systemd-Fix-wrong-path-to-irexec-239.patch
 Patch10:        0010-lib-Only-use-local-headers-in-lirc_private.h-237.patch
 Patch16:        0016-systemd-Add-missing-lircd-setup.service-to-distribut.patch
 Patch17:        0017-Actually-add-lircd-setup.service.patch
+Patch18:        0018-lircd-Fix-listen-option-parsing-249.patch
 
 BuildRequires:  alsa-lib-devel
 Buildrequires:  autoconf
@@ -347,6 +348,9 @@ systemd-tmpfiles --create %{_tmpfilesdir}/lirc.conf
 %{_udevrulesdir}/99-remote-control-lirc.rules
 
 %changelog
+* Fri Dec 23 2016 Alec Leamas <leamas.alec@gmail.com> - 0.9.4c-6
+- Add patch for --listen parsing bug (upstream #249).
+
 * Mon Dec 19 2016 Miro Hrončok <mhroncok@redhat.com> - 0.9.4c-5.1
 - Rebuild for Python 3.6
 

From 6530b2085fc97aadbbc3db74f47c1051e197dba4 Mon Sep 17 00:00:00 2001
From: Alec Leamas <leamas.alec@gmail.com>
Date: Wed, 4 Jan 2017 13:53:47 +0100
Subject: [PATCH 173/204] 0.9.4c-7

---
 lirc.spec | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

diff --git a/lirc.spec b/lirc.spec
index 3241698..f8170b1 100644
--- a/lirc.spec
+++ b/lirc.spec
@@ -5,7 +5,7 @@
 
 Name:           lirc
 Version:        0.9.4c
-Release:        %{?tag:0.}6%{?tag:.}%{?tag}%{?dist}
+Release:        %{?tag:0.}7%{?tag:.}%{?tag}%{?dist}
 Summary:        The Linux Infrared Remote Control package
 
 %global repo    http://downloads.sourceforge.net/lirc/LIRC/%{version}/
@@ -30,6 +30,10 @@ Patch10:        0010-lib-Only-use-local-headers-in-lirc_private.h-237.patch
 Patch16:        0016-systemd-Add-missing-lircd-setup.service-to-distribut.patch
 Patch17:        0017-Actually-add-lircd-setup.service.patch
 Patch18:        0018-lircd-Fix-listen-option-parsing-249.patch
+Patch19:        0019-build-Include-config.h-in-installed-headers-250.patch
+Patch20:        0020-lircd-Fix-segfault-in-SET_INPUTLOG-without-arguments.patch
+Patch21:        0021-ircat-Fix-option-parsing-bug-empty-conditions-251.patch
+
 
 BuildRequires:  alsa-lib-devel
 Buildrequires:  autoconf
@@ -348,6 +352,11 @@ systemd-tmpfiles --create %{_tmpfilesdir}/lirc.conf
 %{_udevrulesdir}/99-remote-control-lirc.rules
 
 %changelog
+* Wed Jan 04 2017 Alec Leamas <leamas.alec@gmail.com> - 0.9.4c-7
+- Added upstream patch for bad ircat --config handling
+- Added upstream patch for lircd SET_INPUTLOG segfault
+- Added upstream patch for FTBS on clients building against lirc
+
 * Fri Dec 23 2016 Alec Leamas <leamas.alec@gmail.com> - 0.9.4c-6
 - Add patch for --listen parsing bug (upstream #249).
 

From 26514dbad2f2b826ee48286585c4fdfb47fde0e0 Mon Sep 17 00:00:00 2001
From: Alec Leamas <leamas.alec@gmail.com>
Date: Wed, 4 Jan 2017 13:53:47 +0100
Subject: [PATCH 174/204] 0.9.4c-7 - add missing patches

---
 ...de-config.h-in-installed-headers-250.patch | 25 +++++++
 ...lt-in-SET_INPUTLOG-without-arguments.patch | 41 ++++++++++++
 ...ion-parsing-bug-empty-conditions-251.patch | 66 +++++++++++++++++++
 3 files changed, 132 insertions(+)
 create mode 100644 0019-build-Include-config.h-in-installed-headers-250.patch
 create mode 100644 0020-lircd-Fix-segfault-in-SET_INPUTLOG-without-arguments.patch
 create mode 100644 0021-ircat-Fix-option-parsing-bug-empty-conditions-251.patch

diff --git a/0019-build-Include-config.h-in-installed-headers-250.patch b/0019-build-Include-config.h-in-installed-headers-250.patch
new file mode 100644
index 0000000..0f1ff7c
--- /dev/null
+++ b/0019-build-Include-config.h-in-installed-headers-250.patch
@@ -0,0 +1,25 @@
+From 614ea57ffc672359b0353ecdfd471dcd18e700d4 Mon Sep 17 00:00:00 2001
+From: Alec Leamas <leamas.alec@gmail.com>
+Date: Fri, 30 Dec 2016 20:05:50 +0100
+Subject: [PATCH] build: Include config.h in installed headers (#250).
+
+---
+ Makefile.am | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/Makefile.am b/Makefile.am
+index 1e41cab..868ad7f 100644
+--- a/Makefile.am
++++ b/Makefile.am
+@@ -51,7 +51,7 @@ dist_pkgconfig_DATA     = lirc.pc lirc-driver.pc
+ 
+ headerdir               = $(includedir)/lirc
+ nobase_header_HEADERS   = include/media/lirc.h
+-header_HEADERS          = paths.h drivers/irpipe/irpipe.h
++header_HEADERS          = paths.h config.h drivers/irpipe/irpipe.h
+ 
+ install-data-hook:
+ 	$(SED) -i -e '/^plugindir/s|/usr/lib|$(libdir)|' \
+-- 
+2.7.4
+
diff --git a/0020-lircd-Fix-segfault-in-SET_INPUTLOG-without-arguments.patch b/0020-lircd-Fix-segfault-in-SET_INPUTLOG-without-arguments.patch
new file mode 100644
index 0000000..5222227
--- /dev/null
+++ b/0020-lircd-Fix-segfault-in-SET_INPUTLOG-without-arguments.patch
@@ -0,0 +1,41 @@
+From f105ffaec389c7765549cac834aaed144cdebdc8 Mon Sep 17 00:00:00 2001
+From: Alec Leamas <leamas.alec@gmail.com>
+Date: Tue, 3 Jan 2017 17:26:31 +0100
+Subject: [PATCH 20/21] lircd: Fix segfault in SET_INPUTLOG without arguments
+ (#252).
+
+---
+ daemons/lircd.cpp | 16 ++++++++++------
+ 1 file changed, 10 insertions(+), 6 deletions(-)
+
+diff --git a/daemons/lircd.cpp b/daemons/lircd.cpp
+index 4e9162a..64cbc0c 100644
+--- a/daemons/lircd.cpp
++++ b/daemons/lircd.cpp
+@@ -1687,13 +1687,17 @@ static int set_inputlog(int fd, char* message, char* arguments)
+ 	FILE* f;
+ 	int r;
+ 
+-	r = sscanf(arguments, "%128s", buff);
+-	if (r != 1) {
+-		return send_error(fd, message,
+-				  "Illegal argument (protocol error): %s",
+-				  arguments);
++	if (arguments) {
++		r = sscanf(arguments, "%128s", buff);
++		if (r != 1) {
++			return send_error(
++				fd, message,
++				"Illegal argument (protocol error): %s",
++				arguments
++			);
++		}
+ 	}
+-	if (strcasecmp(buff, "null") == 0) {
++	if (!arguments || strcasecmp(buff, "null") == 0) {
+ 		rec_buffer_set_logfile(NULL);
+ 		return send_success(fd, message);
+ 	}
+-- 
+2.7.4
+
diff --git a/0021-ircat-Fix-option-parsing-bug-empty-conditions-251.patch b/0021-ircat-Fix-option-parsing-bug-empty-conditions-251.patch
new file mode 100644
index 0000000..0e9881b
--- /dev/null
+++ b/0021-ircat-Fix-option-parsing-bug-empty-conditions-251.patch
@@ -0,0 +1,66 @@
+From 7c3caa5b02e6907d44d9d04fe0dfc93974b5d32c Mon Sep 17 00:00:00 2001
+From: Alec Leamas <leamas.alec@gmail.com>
+Date: Mon, 2 Jan 2017 18:43:14 +0100
+Subject: [PATCH 21/21] ircat: Fix option parsing bug + empty conditions
+ (#251).
+
+The --command/-c option was not parsed correctly, despite that
+it seemed to work. lirc_code2char is not guarenteed to return
+NULL if there is no more data, it could just be empty.
+---
+ tools/ircat.cpp | 16 ++++++++++------
+ 1 file changed, 10 insertions(+), 6 deletions(-)
+
+diff --git a/tools/ircat.cpp b/tools/ircat.cpp
+index 8d93f9b..b41dece 100644
+--- a/tools/ircat.cpp
++++ b/tools/ircat.cpp
+@@ -58,6 +58,7 @@ int main(int argc, char* argv[])
+ {
+ 	struct lirc_config* config;
+ 	char* config_file = NULL;
++	int r;
+ 
+ 	while (1) {
+ 		int c;
+@@ -67,7 +68,7 @@ int main(int argc, char* argv[])
+ 			{ "version", no_argument,	NULL, 'v' },
+ 			{ 0,	     0,			0,    0	  }
+ 		};
+-		c = getopt_long(argc, argv, "chv", long_options, NULL);
++		c = getopt_long(argc, argv, "c:hv", long_options, NULL);
+ 		if (c == -1)
+ 			break;
+ 		switch (c) {
+@@ -94,20 +95,23 @@ int main(int argc, char* argv[])
+ 	if (lirc_init(argv[argc - 1], 1) == -1)
+ 		exit(EXIT_FAILURE);
+ 
+-	if (lirc_readconfig(config_file, &config, NULL) == 0) {
++	r = lirc_readconfig(config_file, &config, NULL);
++	if (r == 0) {
+ 		char* code;
+ 		char* c;
+-		int ret;
++		int r;
+ 
+ 		while (lirc_nextcode(&code) == 0) {
+-			if (code == NULL)
++			if (code == NULL || !*code)
+ 				continue;
+-			while ((ret = lirc_code2char(config, code, &c)) == 0 && c != NULL) {
++			while ((r = lirc_code2char(config, code, &c)) == 0) {
++				if (c == NULL || !*c)
++					break;
+ 				printf("%s\n", c);
+ 				fflush(stdout);
+ 			}
+ 			free(code);
+-			if (ret == -1)
++			if (r == -1)
+ 				break;
+ 		}
+ 		lirc_freeconfig(config);
+-- 
+2.7.4
+

From 7a32820c9bb6c8408ea979ad26ac9fb76ceded92 Mon Sep 17 00:00:00 2001
From: Fedora Release Engineering <releng@fedoraproject.org>
Date: Fri, 10 Feb 2017 19:53:20 +0000
Subject: [PATCH 175/204] - Rebuilt for
 https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild

---
 lirc.spec | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/lirc.spec b/lirc.spec
index f8170b1..7b9139e 100644
--- a/lirc.spec
+++ b/lirc.spec
@@ -5,7 +5,7 @@
 
 Name:           lirc
 Version:        0.9.4c
-Release:        %{?tag:0.}7%{?tag:.}%{?tag}%{?dist}
+Release:        %{?tag:0.}7%{?tag:.}%{?tag}%{?dist}.1
 Summary:        The Linux Infrared Remote Control package
 
 %global repo    http://downloads.sourceforge.net/lirc/LIRC/%{version}/
@@ -352,6 +352,9 @@ systemd-tmpfiles --create %{_tmpfilesdir}/lirc.conf
 %{_udevrulesdir}/99-remote-control-lirc.rules
 
 %changelog
+* Fri Feb 10 2017 Fedora Release Engineering <releng@fedoraproject.org> - 0.9.4c-7.1
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild
+
 * Wed Jan 04 2017 Alec Leamas <leamas.alec@gmail.com> - 0.9.4c-7
 - Added upstream patch for bad ircat --config handling
 - Added upstream patch for lircd SET_INPUTLOG segfault

From abd2ce2b9bc6fd7150c24269b7433aa0f825de21 Mon Sep 17 00:00:00 2001
From: Alec Leamas <leamas.alec@gmail.com>
Date: Tue, 4 Apr 2017 10:36:28 +0200
Subject: [PATCH 176/204] 0.9.4c-8

---
 ...build-lirc.h-Configure-includes-in-lirc.h-234.patch | 10 +++++-----
 lirc.spec                                              |  9 ++++++++-
 2 files changed, 13 insertions(+), 6 deletions(-)

diff --git a/0003-build-lirc.h-Configure-includes-in-lirc.h-234.patch b/0003-build-lirc.h-Configure-includes-in-lirc.h-234.patch
index 58c73ea..3b9b459 100644
--- a/0003-build-lirc.h-Configure-includes-in-lirc.h-234.patch
+++ b/0003-build-lirc.h-Configure-includes-in-lirc.h-234.patch
@@ -23,7 +23,7 @@ index 20933a8..cde9813 100644
 +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])
- 
+
  dnl Checks for typedefs, structures, and compiler characteristics.
  AC_C_CONST
 diff --git a/include/media/lirc.h b/include/media/lirc.h
@@ -33,8 +33,8 @@ index 991ab45..84af7ed 100644
 @@ -6,8 +6,19 @@
  #ifndef _LINUX_LIRC_H
  #define _LINUX_LIRC_H
- 
-+#include <config.h>
+
++#include <lirc/config.h>
 +
 +#ifdef HAVE_LINUX_TYPES_H
  #include <linux/types.h>
@@ -47,9 +47,9 @@ index 991ab45..84af7ed 100644
 +#else
 +#include <sys/ioctl.h>
 +#endif
- 
+
  #define PULSE_BIT       0x01000000
  #define PULSE_MASK      0x00FFFFFF
--- 
+--
 2.5.5
 
diff --git a/lirc.spec b/lirc.spec
index 7b9139e..8921096 100644
--- a/lirc.spec
+++ b/lirc.spec
@@ -5,7 +5,7 @@
 
 Name:           lirc
 Version:        0.9.4c
-Release:        %{?tag:0.}7%{?tag:.}%{?tag}%{?dist}.1
+Release:        %{?tag:0.}8%{?tag:.}%{?tag}%{?dist}
 Summary:        The Linux Infrared Remote Control package
 
 %global repo    http://downloads.sourceforge.net/lirc/LIRC/%{version}/
@@ -33,6 +33,8 @@ Patch18:        0018-lircd-Fix-listen-option-parsing-249.patch
 Patch19:        0019-build-Include-config.h-in-installed-headers-250.patch
 Patch20:        0020-lircd-Fix-segfault-in-SET_INPUTLOG-without-arguments.patch
 Patch21:        0021-ircat-Fix-option-parsing-bug-empty-conditions-251.patch
+Patch30:        0030-doc-Fix-python-import-paths.patch
+Patch31:        0031-Handle-systemd-new-pkg-config-filename-274.patch
 
 
 BuildRequires:  alsa-lib-devel
@@ -352,6 +354,11 @@ systemd-tmpfiles --create %{_tmpfilesdir}/lirc.conf
 %{_udevrulesdir}/99-remote-control-lirc.rules
 
 %changelog
+* Tue Apr 4 2017 Alec Leamas <leamas.alec@gmail.com> - 0.9.4c-8
+- Fix bad include paths causing FTBS in packages using -devel.
+- Fix bad python import path.
+- Fix missing socket activation (upstream #274).
+
 * Fri Feb 10 2017 Fedora Release Engineering <releng@fedoraproject.org> - 0.9.4c-7.1
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild
 

From 3a6a164fff0ac3066c33e1c56291039f3139dcd6 Mon Sep 17 00:00:00 2001
From: Alec Leamas <leamas.alec@gmail.com>
Date: Tue, 4 Apr 2017 10:51:31 +0200
Subject: [PATCH 177/204] 0.9.4c-8: Fix missing patches, tracking bug

---
 0030-doc-Fix-python-import-paths.patch | 60 ++++++++++++++++++++++++++
 lirc.spec                              |  2 +-
 2 files changed, 61 insertions(+), 1 deletion(-)
 create mode 100644 0030-doc-Fix-python-import-paths.patch

diff --git a/0030-doc-Fix-python-import-paths.patch b/0030-doc-Fix-python-import-paths.patch
new file mode 100644
index 0000000..7d8d4f7
--- /dev/null
+++ b/0030-doc-Fix-python-import-paths.patch
@@ -0,0 +1,60 @@
+From ec8704b21b722183af42982c3fa8edf92fee9209 Mon Sep 17 00:00:00 2001
+From: Alec Leamas <leamas.alec@gmail.com>
+Date: Wed, 25 Jan 2017 13:23:23 +0100
+Subject: [PATCH] doc: Fix python import paths.
+
+---
+ doc/Makefile.am | 4 ++--
+ doc/data2hwdb   | 2 +-
+ doc/data2table  | 2 +-
+ 3 files changed, 4 insertions(+), 4 deletions(-)
+
+diff --git a/doc/Makefile.am b/doc/Makefile.am
+index 658ea14..777482f 100644
+--- a/doc/Makefile.am
++++ b/doc/Makefile.am
+@@ -135,13 +135,13 @@ $(srcdir)/manpage.xsl: $(abs_builddir)/driver-toc.xsl
+
+ table.html: docpage.xsl
+ 	test -e lirc || ln -s $(top_srcdir)/tools/lirc-setup lirc || :
+-	PYTHONPATH=.:$(top_srcdir)/tools \
++	PYTHONPATH=.:$(top_srcdir)/tools/lirc-setup:$(top_srcdir)/tools \
+ 	$(PYTHON) $(srcdir)/data2table $(top_srcdir)/configs ../configs \
+ 	        | xsltproc --html docpage.xsl - > table.html
+
+ lirc.hwdb:
+ 	test -e lirc || ln -s $(top_srcdir)/tools/lirc-setup lirc || :
+-	PYTHONPATH=.:$(top_srcdir)/tools \
++	PYTHONPATH=.:$(top_srcdir)/tools/lirc-setup:$(top_srcdir)/tools \
+ 	$(PYTHON) $(srcdir)/data2hwdb $(top_srcdir)/configs ../configs \
+ 	    > lirc.hwdb
+
+diff --git a/doc/data2hwdb b/doc/data2hwdb
+index 2f0c1c9..8455f4a 100755
+--- a/doc/data2hwdb
++++ b/doc/data2hwdb
+@@ -7,7 +7,7 @@ import os
+ import sys
+ import yaml
+
+-from lirc import database
++import database
+
+ HEADER = '''
+ # LIRC - Hardware DataBase
+diff --git a/doc/data2table b/doc/data2table
+index 05fb1e2..62a1e86 100755
+--- a/doc/data2table
++++ b/doc/data2table
+@@ -7,7 +7,7 @@ import os
+ import sys
+ import yaml
+
+-from lirc import database
++import database
+
+
+ MENUS = {'home_brew': 'Home-brew serial and parallel devices',
+--
+2.9.3
+
diff --git a/lirc.spec b/lirc.spec
index 8921096..4d3f712 100644
--- a/lirc.spec
+++ b/lirc.spec
@@ -357,7 +357,7 @@ systemd-tmpfiles --create %{_tmpfilesdir}/lirc.conf
 * Tue Apr 4 2017 Alec Leamas <leamas.alec@gmail.com> - 0.9.4c-8
 - Fix bad include paths causing FTBS in packages using -devel.
 - Fix bad python import path.
-- Fix missing socket activation (upstream #274).
+- Fix missing socket activation - #1438702
 
 * Fri Feb 10 2017 Fedora Release Engineering <releng@fedoraproject.org> - 0.9.4c-7.1
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild

From fb142540b5df838e4c936e80dfaba9f3d3db6396 Mon Sep 17 00:00:00 2001
From: Alec Leamas <leamas.alec@gmail.com>
Date: Tue, 4 Apr 2017 11:08:06 +0200
Subject: [PATCH 178/204] 0.9.4c-8: more missing patches (!).

---
 ...-systemd-new-pkg-config-filename-274.patch | 50 +++++++++++++++++++
 1 file changed, 50 insertions(+)
 create mode 100644 0031-Handle-systemd-new-pkg-config-filename-274.patch

diff --git a/0031-Handle-systemd-new-pkg-config-filename-274.patch b/0031-Handle-systemd-new-pkg-config-filename-274.patch
new file mode 100644
index 0000000..3e86ad3
--- /dev/null
+++ b/0031-Handle-systemd-new-pkg-config-filename-274.patch
@@ -0,0 +1,50 @@
+From 46e2156480cd1a618079233bc0926dee2ae23e9a Mon Sep 17 00:00:00 2001
+From: Alec Leamas <leamas.alec@gmail.com>
+Date: Tue, 4 Apr 2017 10:31:26 +0200
+Subject: [PATCH] Fix missing socket activation
+
+---
+ configure.ac      | 2 ++
+ daemons/lircd.cpp | 2 ++
+ 2 files changed, 4 insertions(+)
+
+diff --git a/configure.ac b/configure.ac
+index 08e2c8e..d032365 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -385,6 +385,7 @@ AC_CHECK_HEADERS(linux/i2c-dev.h,[
+ 
+ 
+ PKG_CHECK_MODULES([SYSTEMD],[libsystemd-daemon],,[true])
++test -n "$SYSTEMD_LIBS" || PKG_CHECK_MODULES([SYSTEMD],[libsystemd],,[true])
+ if test -n "$SYSTEMD_LIBS"; then
+     CFLAGS="$CFLAGS $SYSTEMD_CFLAGS"
+     AC_DEFINE(HAVE_SYSTEMD)
+@@ -530,6 +531,7 @@ AC_REPORT_CONDITIONAL([NEED_PYTHON3])
+ AC_REPORT_CONDITIONAL([SYSTEMD_INSTALL])
+ AC_REPORT_CONDITIONAL([DEVEL])
+ AC_REPORT_CONDITIONAL([HAVE_UINPUT])
++AC_REPORT_CONDITIONAL([HAVE_SYSTEMD])
+ AC_REPORT_CONDITIONAL([DARWIN])
+ AC_REPORT_CONDITIONAL([BSD])
+ 
+diff --git a/daemons/lircd.cpp b/daemons/lircd.cpp
+index 69331b1..652afdc 100644
+--- a/daemons/lircd.cpp
++++ b/daemons/lircd.cpp
+@@ -1035,10 +1035,12 @@ void start_server(mode_t permission, int nodaemon, loglevel_t loglevel)
+ 		fprintf(stderr, "Too many file descriptors received.\n");
+ 		goto start_server_failed0;
+ 	} else if (n == 1) {
++	        log_notice("Using systemd fd");
+ 		sockfd = SD_LISTEN_FDS_START + 0;
+ 	}
+ #endif
+ 	if (sockfd == -1) {
++	        log_debug("No systemd fd found");
+ 		sockfd = socket(AF_UNIX, SOCK_STREAM, 0);
+ 		if (sockfd == -1) {
+ 			perror("Could not create socket");
+-- 
+2.9.3
+

From 7b3b5d0408303ad9938f1a36e190ba9e36b1fc11 Mon Sep 17 00:00:00 2001
From: Alec Leamas <leamas.alec@gmail.com>
Date: Tue, 4 Apr 2017 11:35:41 +0200
Subject: [PATCH 179/204] 0.9.4c-8: Restore busted patch 0003...

---
 0003-build-lirc.h-Configure-includes-in-lirc.h-234.patch | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/0003-build-lirc.h-Configure-includes-in-lirc.h-234.patch b/0003-build-lirc.h-Configure-includes-in-lirc.h-234.patch
index 3b9b459..59dbe37 100644
--- a/0003-build-lirc.h-Configure-includes-in-lirc.h-234.patch
+++ b/0003-build-lirc.h-Configure-includes-in-lirc.h-234.patch
@@ -34,7 +34,7 @@ index 991ab45..84af7ed 100644
  #ifndef _LINUX_LIRC_H
  #define _LINUX_LIRC_H
 
-+#include <lirc/config.h>
++#include <config.h>
 +
 +#ifdef HAVE_LINUX_TYPES_H
  #include <linux/types.h>

From 6834bb6d42b4fb26e95a14287b71e1a4aede5656 Mon Sep 17 00:00:00 2001
From: Fedora Release Engineering <releng@fedoraproject.org>
Date: Wed, 26 Jul 2017 20:11:54 +0000
Subject: [PATCH 180/204] - Rebuilt for
 https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild

---
 lirc.spec | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/lirc.spec b/lirc.spec
index 4d3f712..ccb189d 100644
--- a/lirc.spec
+++ b/lirc.spec
@@ -5,7 +5,7 @@
 
 Name:           lirc
 Version:        0.9.4c
-Release:        %{?tag:0.}8%{?tag:.}%{?tag}%{?dist}
+Release:        %{?tag:0.}8%{?tag:.}%{?tag}%{?dist}.1
 Summary:        The Linux Infrared Remote Control package
 
 %global repo    http://downloads.sourceforge.net/lirc/LIRC/%{version}/
@@ -354,6 +354,9 @@ systemd-tmpfiles --create %{_tmpfilesdir}/lirc.conf
 %{_udevrulesdir}/99-remote-control-lirc.rules
 
 %changelog
+* Wed Jul 26 2017 Fedora Release Engineering <releng@fedoraproject.org> - 0.9.4c-8.1
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild
+
 * Tue Apr 4 2017 Alec Leamas <leamas.alec@gmail.com> - 0.9.4c-8
 - Fix bad include paths causing FTBS in packages using -devel.
 - Fix bad python import path.

From baf33aa8072ce4569aea4cdb5d2aa02b79f6b0f7 Mon Sep 17 00:00:00 2001
From: Fedora Release Engineering <releng@fedoraproject.org>
Date: Thu, 3 Aug 2017 02:40:16 +0000
Subject: [PATCH 181/204] - Rebuilt for
 https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild

---
 lirc.spec | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/lirc.spec b/lirc.spec
index ccb189d..4e94d05 100644
--- a/lirc.spec
+++ b/lirc.spec
@@ -5,7 +5,7 @@
 
 Name:           lirc
 Version:        0.9.4c
-Release:        %{?tag:0.}8%{?tag:.}%{?tag}%{?dist}.1
+Release:        %{?tag:0.}8%{?tag:.}%{?tag}%{?dist}.2
 Summary:        The Linux Infrared Remote Control package
 
 %global repo    http://downloads.sourceforge.net/lirc/LIRC/%{version}/
@@ -354,6 +354,9 @@ systemd-tmpfiles --create %{_tmpfilesdir}/lirc.conf
 %{_udevrulesdir}/99-remote-control-lirc.rules
 
 %changelog
+* Thu Aug 03 2017 Fedora Release Engineering <releng@fedoraproject.org> - 0.9.4c-8.2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild
+
 * Wed Jul 26 2017 Fedora Release Engineering <releng@fedoraproject.org> - 0.9.4c-8.1
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild
 

From 6734307363bdb58b4bfa4e16ce900ce922aeeca3 Mon Sep 17 00:00:00 2001
From: Alec Leamas <leamas.alec@gmail.com>
Date: Sat, 12 Aug 2017 20:07:20 +0200
Subject: [PATCH 182/204] 0.10.0

---
 .gitignore                                    |   1 +
 ...ugins-girs.c-Default-device-typo-fix.patch |  25 ---
 ...gure-Fix-cross-compilation-error-233.patch |  46 -----
 ...c.h-Configure-includes-in-lirc.h-234.patch |  55 ------
 ...Clean-up-distribution-links-bugfixes.patch | 104 -----------
 ...-Ensure-build-on-unconfiguredclients.patch |  35 ----
 ...pc-Fix-bad-library-specification-236.patch |  23 ---
 ...INPUT-1-to-force-building-uinput-cod.patch |  38 ----
 ...systemd-Fix-wrong-path-to-irexec-239.patch |  25 ---
 0009-.gitignore-doc-fixes.patch               |  32 ----
 ...-local-headers-in-lirc_private.h-237.patch |  59 -------
 ...ing-lircd-setup.service-to-distribut.patch |  25 ---
 0017-Actually-add-lircd-setup.service.patch   |  29 ----
 ...-lircd-Fix-listen-option-parsing-249.patch |  64 -------
 ...de-config.h-in-installed-headers-250.patch |  25 ---
 ...lt-in-SET_INPUTLOG-without-arguments.patch |  41 -----
 ...ion-parsing-bug-empty-conditions-251.patch |  66 -------
 0030-doc-Fix-python-import-paths.patch        |  60 -------
 ...-systemd-new-pkg-config-filename-274.patch |  50 ------
 lirc.spec                                     | 163 ++++++++++--------
 sources                                       |   2 +-
 21 files changed, 97 insertions(+), 871 deletions(-)
 delete mode 100644 0001-plugins-girs.c-Default-device-typo-fix.patch
 delete mode 100644 0002-configure-Fix-cross-compilation-error-233.patch
 delete mode 100644 0003-build-lirc.h-Configure-includes-in-lirc.h-234.patch
 delete mode 100644 0004-lirc.org-Clean-up-distribution-links-bugfixes.patch
 delete mode 100644 0005-lib-curl_poll.h-Ensure-build-on-unconfiguredclients.patch
 delete mode 100644 0006-lirc.pc-Fix-bad-library-specification-236.patch
 delete mode 100644 0007-Build-Use-HAVE_UINPUT-1-to-force-building-uinput-cod.patch
 delete mode 100644 0008-systemd-Fix-wrong-path-to-irexec-239.patch
 delete mode 100644 0009-.gitignore-doc-fixes.patch
 delete mode 100644 0010-lib-Only-use-local-headers-in-lirc_private.h-237.patch
 delete mode 100644 0016-systemd-Add-missing-lircd-setup.service-to-distribut.patch
 delete mode 100644 0017-Actually-add-lircd-setup.service.patch
 delete mode 100644 0018-lircd-Fix-listen-option-parsing-249.patch
 delete mode 100644 0019-build-Include-config.h-in-installed-headers-250.patch
 delete mode 100644 0020-lircd-Fix-segfault-in-SET_INPUTLOG-without-arguments.patch
 delete mode 100644 0021-ircat-Fix-option-parsing-bug-empty-conditions-251.patch
 delete mode 100644 0030-doc-Fix-python-import-paths.patch
 delete mode 100644 0031-Handle-systemd-new-pkg-config-filename-274.patch

diff --git a/.gitignore b/.gitignore
index 1d81b9e..7042cbe 100644
--- a/.gitignore
+++ b/.gitignore
@@ -15,3 +15,4 @@ lirc-0.8.7pre2.tar.bz2
 /lirc-0.9.4a.tar.gz
 /lirc-0.9.4b.tar.gz
 /lirc-0.9.4c.tar.gz
+/lirc-0.10.0.tar.gz
diff --git a/0001-plugins-girs.c-Default-device-typo-fix.patch b/0001-plugins-girs.c-Default-device-typo-fix.patch
deleted file mode 100644
index 07a172d..0000000
--- a/0001-plugins-girs.c-Default-device-typo-fix.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-From 94a67d9d3debf63affaa679971fafa304a6929d1 Mon Sep 17 00:00:00 2001
-From: Alec Leamas <leamas.alec@gmail.com>
-Date: Sat, 22 Oct 2016 16:53:48 +0200
-Subject: [PATCH 01/10] plugins: girs.c: Default device typo fix.
-
----
- plugins/girs.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/plugins/girs.c b/plugins/girs.c
-index 4bc1461..f722348 100644
---- a/plugins/girs.c
-+++ b/plugins/girs.c
-@@ -55,7 +55,7 @@
- 	"/bin/sh ls /dev/ttyACM* /dev/ttyUSB* /dev/arduino* 2>/dev/null"
- 
- #define DRIVER_NAME "girs"
--#define DEFAULT_DEVICE "/dev/ttyAMC0"
-+#define DEFAULT_DEVICE "/dev/ttyACM0"
- #define DRIVER_RESOLUTION 50
- #define DRIVER_VERSION "2016-08-19"
- 
--- 
-2.5.5
-
diff --git a/0002-configure-Fix-cross-compilation-error-233.patch b/0002-configure-Fix-cross-compilation-error-233.patch
deleted file mode 100644
index 5b1283f..0000000
--- a/0002-configure-Fix-cross-compilation-error-233.patch
+++ /dev/null
@@ -1,46 +0,0 @@
-From ff0d431cbed74a2495b78dedce8f74f2b5a436ea Mon Sep 17 00:00:00 2001
-From: Alec Leamas <leamas.alec@gmail.com>
-Date: Sun, 23 Oct 2016 15:07:21 +0200
-Subject: [PATCH 02/10] configure: Fix cross-compilation error (#233).
-
----
- configure.ac | 16 ++++++++++++++++
- 1 file changed, 16 insertions(+)
-
-diff --git a/configure.ac b/configure.ac
-index a041571..20933a8 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -305,6 +305,19 @@ AC_RUN_IFELSE([AC_LANG_PROGRAM([[
-   AC_MSG_RESULT(yes)
- ],[
-   AC_MSG_RESULT(no)
-+],[
-+  case x$HAVE_WORKING_POLL in
-+    xyes)
-+      AC_MSG_RESULT(yes)
-+      AC_DEFINE(HAVE_POLL_FINE)
-+      ;;
-+    xno)
-+      AC_MSG_RESULT(no)
-+      ;;
-+    *) AC_MSG_ERROR([
-+         Define HAVE_WORKING_POLL to "yes" or "no" when cross-compiling])
-+      ;;
-+  esac
- ])
- 
- 
-@@ -429,6 +442,9 @@ AC_ARG_ENABLE([python3_fix],
-   [enable_python3_fix="no"])
- AM_CONDITIONAL(NEED_PYTHON3, [test "x$enable_python3_fix" = "xyes"])
- 
-+AC_ARG_VAR(HAVE_WORKING_POLL,[
-+	   On cross-compile: Target has a working poll(2) implementation])
-+
- suffix=$(echo "$VERSION" | sed 's/.*-//')
- AM_CONDITIONAL(DEVEL, [test x$suffix = xdevel])
- 
--- 
-2.5.5
-
diff --git a/0003-build-lirc.h-Configure-includes-in-lirc.h-234.patch b/0003-build-lirc.h-Configure-includes-in-lirc.h-234.patch
deleted file mode 100644
index 59dbe37..0000000
--- a/0003-build-lirc.h-Configure-includes-in-lirc.h-234.patch
+++ /dev/null
@@ -1,55 +0,0 @@
-From f86da92490ff32465a1aba8754c0c856191e6907 Mon Sep 17 00:00:00 2001
-From: Alec Leamas <leamas.alec@gmail.com>
-Date: Sun, 23 Oct 2016 15:45:52 +0200
-Subject: [PATCH 03/10] build: lirc.h: Configure includes in lirc.h (#234).
-
-Fall back to sys/ioctl.h instead of linux/ioctl.h etc. on
-non-linux platform i. e., MacOS.
----
- configure.ac         |  5 +++--
- include/media/lirc.h | 11 +++++++++++
- 2 files changed, 14 insertions(+), 2 deletions(-)
-
-diff --git a/configure.ac b/configure.ac
-index 20933a8..cde9813 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -48,8 +48,9 @@ LIBUSB_CONFIG="pkg-config libusb"
- dnl Checks for header files.
- AC_HEADER_STDC
- AC_HEADER_TIME
--AC_CHECK_HEADERS([fcntl.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])
-+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])
-
- dnl Checks for typedefs, structures, and compiler characteristics.
- AC_C_CONST
-diff --git a/include/media/lirc.h b/include/media/lirc.h
-index 991ab45..84af7ed 100644
---- a/include/media/lirc.h
-+++ b/include/media/lirc.h
-@@ -6,8 +6,19 @@
- #ifndef _LINUX_LIRC_H
- #define _LINUX_LIRC_H
-
-+#include <config.h>
-+
-+#ifdef HAVE_LINUX_TYPES_H
- #include <linux/types.h>
-+#else
-+#include <sys/types.h>
-+#endif
-+
-+#ifdef HAVE_LINUX_IOCTL_H
- #include <linux/ioctl.h>
-+#else
-+#include <sys/ioctl.h>
-+#endif
-
- #define PULSE_BIT       0x01000000
- #define PULSE_MASK      0x00FFFFFF
---
-2.5.5
-
diff --git a/0004-lirc.org-Clean-up-distribution-links-bugfixes.patch b/0004-lirc.org-Clean-up-distribution-links-bugfixes.patch
deleted file mode 100644
index 5a03b30..0000000
--- a/0004-lirc.org-Clean-up-distribution-links-bugfixes.patch
+++ /dev/null
@@ -1,104 +0,0 @@
-From c3e65dd45ece8ac328332c63b8009cd1f77a2ca4 Mon Sep 17 00:00:00 2001
-From: Alec Leamas <leamas.alec@gmail.com>
-Date: Sun, 23 Oct 2016 17:10:26 +0200
-Subject: [PATCH 04/10] lirc.org: Clean up distribution links, bugfixes.
-
----
- doc/html-source/configure.html |  1 +
- doc/lirc.org/index.html        | 54 +++++++++++++++++++++++++++---------------
- 2 files changed, 36 insertions(+), 19 deletions(-)
-
-diff --git a/doc/html-source/configure.html b/doc/html-source/configure.html
-index 7c01b3d..feb7d41 100644
---- a/doc/html-source/configure.html
-+++ b/doc/html-source/configure.html
-@@ -60,6 +60,7 @@
-      <p>
- 
-     <H3> uinput  and effective user </h3>
-+    <p>
-     If your distribution does not have uinput enabled by default
-     (i. e., there is a /dev/uinput device) add to the file /etc/modules
-     the entry: </p>
-diff --git a/doc/lirc.org/index.html b/doc/lirc.org/index.html
-index 93cecf7..7b4ab21 100644
---- a/doc/lirc.org/index.html
-+++ b/doc/lirc.org/index.html
-@@ -96,7 +96,7 @@
-             </P>
-             <UL CLASS="menu">
-               <li>The latest version of LIRC can be downloaded from
--                  <A HREF="http://sourceforge.net/projects/lirc/files/LIRC/0.9.4b">
-+                  <A HREF="http://sourceforge.net/projects/lirc/files/LIRC/0.9.4c">
-                   SourceForge</a></li>
-               <li>Other, unmaintained programs such as xrc and xirw
-                    as well as older LIRC version can also be found on
-@@ -104,6 +104,39 @@
-                    SourceForge</A></li>
-             </UL>
-             <BR>
-+            <!-- Linux distributions w LIRC -->
-+            <TABLE WIDTH="100%" BORDER="0" CELLSPACING="0"
-+                   CELLPADDING="0" SUMMARY="">
-+                <TR>
-+                  <TD CLASS="menuhead">
-+                    Linux distributions packaging LIRC
-+                  </TD>
-+                </TR>
-+            </TABLE>
-+            <UL TYPE="SQUARE">
-+                <LI><A HREF="https://www.archlinux.org/">Arch Linux</A></LI>
-+                <LI><A HREF="http://www.debian.org/">Debian</A></LI>
-+                <LI><A HREF="http://www.fedoraproject.org/">Fedora</A></LI>
-+                <LI><A HREF="http://www.gentoo.org/">Gentoo</A></LI>
-+                <LI><A HREF="http://www.mandrivalinux.com">Mandriva(Previously Mandrake)</A></LI>
-+                <LI><A HREF="http://www.redhat.com/">RedHat</A></LI>
-+                <LI><A HREF="http://www.slackware.com/">Slackware</A>
-+                    - the mother of all Distributions
-+                </LI>
-+                <LI><A HREF="http://www.suse.de/">SUSE.</A></LI>
-+                <LI><A HREF="http://www.ubuntu.com/">Ubuntu</A></LI>
-+            </UL>
-+            <TABLE WIDTH="100%" BORDER="0" CELLSPACING="0"
-+                   CELLPADDING="0" SUMMARY="">
-+                <TR>
-+                  <TD CLASS="menuhead"> MacOS builds </TD>
-+                </TR>
-+            </TABLE>
-+            <UL TYPE="SQUARE">
-+              <LI><A HREF="https://www.macports.org/ports.php?by=name&substr=lirc">
-+                       MacPorts
-+              </A></LI>
-+            </UL>
- 
-             <!-- Hardware -->
-             <TABLE WIDTH="100%" BORDER="0" CELLSPACING="0"
-@@ -286,24 +319,7 @@
-                 <LI><A HREF="http://www.kernel.org/">www.kernel.org</A> - Linux Kernel Website</LI>
-                 <LI><A HREF="http://www.freshmeat.net/">www.freshmeat.net</A> - A great place for searching for Linux Applications</LI>
-               </UL>
--              <FONT SIZE="+1" COLOR="#FFFFFF">
--                Linux Distributions Packaging LIRC
--              </FONT>
--              <UL TYPE="SQUARE">
--                <LI><A HREF="http://www.slackware.com/">Slackware</A> - the mother of all Distributions</LI>
--                <LI><A HREF="http://www.redhat.com/">RedHat</A></LI>
--                <LI><A HREF="http://www.debian.org/">Debian</A></LI>
--                <LI><A HREF="http://www.ubuntu.com/">Ubuntu</A></LI>
--                <LI><A HREF="http://www.fedoraproject.org/">Fedora</A></LI>
--                <LI><A HREF="http://www.gentoo.org/">Gentoo</A></LI>
--                <LI><A HREF="http://www.suse.de/">SUSE.</A></LI>
--                <LI><A HREF="http://www.mandrivalinux.com">Mandriva(Previously Mandrake)</A></LI>
--                <LI><A HREF="https://www.archlinux.org/">Arch Linux</A></LI>
--                <LI><A HREF="https://www.macports.org/ports.php?by=name&substr=lirc">
--                         MacOS - MacPorts
--                </A></LI>
--              </UL>
--            </DIV>
-+           </DIV>
- 
-             <TABLE WIDTH="100%" BORDER="0" CELLSPACING="0"
-                    CELLPADDING="0" SUMMARY="">
--- 
-2.5.5
-
diff --git a/0005-lib-curl_poll.h-Ensure-build-on-unconfiguredclients.patch b/0005-lib-curl_poll.h-Ensure-build-on-unconfiguredclients.patch
deleted file mode 100644
index caa2a46..0000000
--- a/0005-lib-curl_poll.h-Ensure-build-on-unconfiguredclients.patch
+++ /dev/null
@@ -1,35 +0,0 @@
-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/0006-lirc.pc-Fix-bad-library-specification-236.patch b/0006-lirc.pc-Fix-bad-library-specification-236.patch
deleted file mode 100644
index 104cab0..0000000
--- a/0006-lirc.pc-Fix-bad-library-specification-236.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-From 916a48ffcb9f1c259a0fc778a2de1be729423092 Mon Sep 17 00:00:00 2001
-From: Alec Leamas <leamas.alec@gmail.com>
-Date: Tue, 25 Oct 2016 21:29:27 +0200
-Subject: [PATCH 06/10] lirc.pc: Fix bad library specification (#236).
-
----
- lirc.pc.in | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/lirc.pc.in b/lirc.pc.in
-index 802f00e..5ed7c1c 100644
---- a/lirc.pc.in
-+++ b/lirc.pc.in
-@@ -10,5 +10,5 @@ includedir=@includedir@
- pkgdatadir=@datadir@/lirc
- plugindir=${libdir}/lirc/plugins
- 
--Libs: -L${libdir} -llirc
-+Libs: -L${libdir} -llirc_client
- Cflags: -I${includedir}
--- 
-2.5.5
-
diff --git a/0007-Build-Use-HAVE_UINPUT-1-to-force-building-uinput-cod.patch b/0007-Build-Use-HAVE_UINPUT-1-to-force-building-uinput-cod.patch
deleted file mode 100644
index 226edc0..0000000
--- a/0007-Build-Use-HAVE_UINPUT-1-to-force-building-uinput-cod.patch
+++ /dev/null
@@ -1,38 +0,0 @@
-From 0463f56357d1dd223a4d2882dbc460a0a7a7e9ad Mon Sep 17 00:00:00 2001
-From: Alec Leamas <leamas.alec@gmail.com>
-Date: Sat, 29 Oct 2016 11:06:50 +0200
-Subject: [PATCH 07/10] Build: Use HAVE_UINPUT=1 to force building uinput code
- (#238).
-
----
- configure.ac | 7 ++++++-
- 1 file changed, 6 insertions(+), 1 deletion(-)
-
-diff --git a/configure.ac b/configure.ac
-index cde9813..08e2c8e 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -33,7 +33,7 @@ if test x$XSLTPROC != "xyes"; then
-     AC_MSG_ERROR([
-       xsltproc is required to build. It usually comes with libxml])
- fi
--AM_CONDITIONAL(HAVE_UINPUT, test -e /dev/uinput)
-+AM_CONDITIONAL(HAVE_UINPUT, test -n "$HAVE_UINPUT" -o -e /dev/uinput)
- AC_CHECK_PROG([MAN2HTML],[man2html],[yes],[no])
- AM_CONDITIONAL(HAVE_MAN2HTML, test x$MAN2HTML = xyes)
- AC_CHECK_PROG([DOXYGEN],[doxygen],[yes],[no])
-@@ -446,6 +446,11 @@ AM_CONDITIONAL(NEED_PYTHON3, [test "x$enable_python3_fix" = "xyes"])
- AC_ARG_VAR(HAVE_WORKING_POLL,[
- 	   On cross-compile: Target has a working poll(2) implementation])
- 
-+AC_ARG_VAR(HAVE_UINPUT,[
-+  If not-empty, assume uinput is available despite missing /dev/uinput
-+])
-+
-+
- suffix=$(echo "$VERSION" | sed 's/.*-//')
- AM_CONDITIONAL(DEVEL, [test x$suffix = xdevel])
- 
--- 
-2.5.5
-
diff --git a/0008-systemd-Fix-wrong-path-to-irexec-239.patch b/0008-systemd-Fix-wrong-path-to-irexec-239.patch
deleted file mode 100644
index 55fc222..0000000
--- a/0008-systemd-Fix-wrong-path-to-irexec-239.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-From eb06327fc1b4e8e9682cf471643ccbab35fed241 Mon Sep 17 00:00:00 2001
-From: Alec Leamas <leamas.alec@gmail.com>
-Date: Sat, 29 Oct 2016 11:50:23 +0200
-Subject: [PATCH 08/10] systemd: Fix wrong path to irexec (#239).
-
----
- systemd/irexec.service | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/systemd/irexec.service b/systemd/irexec.service
-index 6eb8e6f..25ac6fc 100644
---- a/systemd/irexec.service
-+++ b/systemd/irexec.service
-@@ -20,7 +20,7 @@ Description=Handle events from IR remotes decoded by lircd(8)
- 
- 
- Type=simple
--ExecStart=/usr/sbin/irexec /etc/lirc/irexec.lircrc
-+ExecStart=/usr/bin/irexec /etc/lirc/irexec.lircrc
- 
- [Install]
- WantedBy=multi-user.target
--- 
-2.5.5
-
diff --git a/0009-.gitignore-doc-fixes.patch b/0009-.gitignore-doc-fixes.patch
deleted file mode 100644
index b973dad..0000000
--- a/0009-.gitignore-doc-fixes.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-From eb21328b2ecb59cb3215ef349e7de73d328eac2c Mon Sep 17 00:00:00 2001
-From: Alec Leamas <leamas.alec@gmail.com>
-Date: Sun, 30 Oct 2016 03:53:22 +0100
-Subject: [PATCH 09/10] .gitignore: doc/ fixes
-
----
- .gitignore | 2 ++
- 1 file changed, 2 insertions(+)
-
-diff --git a/.gitignore b/.gitignore
-index 16bc688..40bed98 100644
---- a/.gitignore
-+++ b/.gitignore
-@@ -37,6 +37,7 @@ kernel-drivers.yaml
- doc/api-docs
- doc/man-html
- doc/man/*.[1-9]
-+doc/man
- doc/html
- doc/NEWS*
- doc/lirc.hwdb
-@@ -44,6 +45,7 @@ doc/table.html
- doc/driver-toc.xsl
- doc/docpage.xsl
- doc/lirc.org/html
-+doc/lirc.org/api-docs/
- doc/ext-driver-toc.xsl
- 
- doxygen-warnings.txt
--- 
-2.5.5
-
diff --git a/0010-lib-Only-use-local-headers-in-lirc_private.h-237.patch b/0010-lib-Only-use-local-headers-in-lirc_private.h-237.patch
deleted file mode 100644
index 4adb05c..0000000
--- a/0010-lib-Only-use-local-headers-in-lirc_private.h-237.patch
+++ /dev/null
@@ -1,59 +0,0 @@
-From e50858c64e21d7a7243cd047042107d782f7c918 Mon Sep 17 00:00:00 2001
-From: Alec Leamas <leamas.alec@gmail.com>
-Date: Sun, 30 Oct 2016 04:00:18 +0100
-Subject: [PATCH 10/10] lib: Only use local headers in lirc_private.h (#237).
-
-The lirc_private.h header should only be used internally
-when building lirc tools, and i this case we should not
-care about what's possibly installed in /usr/include/lirc.
----
- lib/lirc_private.h | 34 +++++++++++++++++-----------------
- 1 file changed, 17 insertions(+), 17 deletions(-)
-
-diff --git a/lib/lirc_private.h b/lib/lirc_private.h
-index 741f86c..2336c0a 100644
---- a/lib/lirc_private.h
-+++ b/lib/lirc_private.h
-@@ -19,22 +19,22 @@
- #include "include/media/lirc.h"
- #endif
- 
--#include "lirc/ir_remote_types.h"
--#include "lirc/lirc_log.h"
--#include "lirc/lirc_options.h"
--#include "lirc/lirc-utils.h"
--#include "lirc/curl_poll.h"
--#include "lirc/config_file.h"
--#include "lirc/dump_config.h"
--#include "lirc/input_map.h"
--#include "lirc/driver.h"
--#include "lirc/ir_remote_types.h"
--#include "lirc/drv_admin.h"
--#include "lirc/ir_remote.h"
--#include "lirc/receive.h"
--#include "lirc/release.h"
--#include "lirc/serial.h"
--#include "lirc/transmit.h"
--#include "lirc/ciniparser.h"
-+#include "ir_remote_types.h"
-+#include "lirc_log.h"
-+#include "lirc_options.h"
-+#include "lirc-utils.h"
-+#include "curl_poll.h"
-+#include "config_file.h"
-+#include "dump_config.h"
-+#include "input_map.h"
-+#include "driver.h"
-+#include "ir_remote_types.h"
-+#include "drv_admin.h"
-+#include "ir_remote.h"
-+#include "receive.h"
-+#include "release.h"
-+#include "serial.h"
-+#include "transmit.h"
-+#include "ciniparser.h"
- 
- #endif
--- 
-2.5.5
-
diff --git a/0016-systemd-Add-missing-lircd-setup.service-to-distribut.patch b/0016-systemd-Add-missing-lircd-setup.service-to-distribut.patch
deleted file mode 100644
index 4dbc1c7..0000000
--- a/0016-systemd-Add-missing-lircd-setup.service-to-distribut.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-From 761c3c3f035192610cd563747ed7e3c205fbf937 Mon Sep 17 00:00:00 2001
-From: Alec Leamas <leamas.alec@gmail.com>
-Date: Wed, 16 Nov 2016 08:03:13 +0100
-Subject: [PATCH] systemd: Add missing lircd-setup.service to distribution
- (#243).
-
----
- systemd/Makefile.am | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/systemd/Makefile.am b/systemd/Makefile.am
-index bfa339d..1cd80b5 100644
---- a/systemd/Makefile.am
-+++ b/systemd/Makefile.am
-@@ -2,6 +2,7 @@
- ACLOCAL_AMFLAGS             = -I m4
- 
- dist_systemdsystemunit_DATA = lircd.socket lircd.service \
-+                              lircd-setup.service \
-                               lircd-uinput.service \
-                               lircmd.service \
-                               irexec.service
--- 
-2.5.5
-
diff --git a/0017-Actually-add-lircd-setup.service.patch b/0017-Actually-add-lircd-setup.service.patch
deleted file mode 100644
index 48ea7dd..0000000
--- a/0017-Actually-add-lircd-setup.service.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-From a6984f0249dbe5ec265af2df547526c2255bcf5c Mon Sep 17 00:00:00 2001
-From: Alec Leamas <leamas.alec@gmail.com>
-Date: Wed, 7 Dec 2016 18:21:25 +0100
-Subject: [PATCH] slusk
-
----
- systemd/lircd-setup.service | 10 ++++++++++
- 1 file changed, 10 insertions(+)
- create mode 100644 systemd/lircd-setup.service
-
-diff --git a/systemd/lircd-setup.service b/systemd/lircd-setup.service
-new file mode 100644
-index 0000000..d448229
---- /dev/null
-+++ b/systemd/lircd-setup.service
-@@ -0,0 +1,10 @@
-+[Unit]
-+Documentation=man:lircd-setup(8)
-+Description=lircd(8) initialization helper tool
-+
-+[Service]
-+Type=oneshot
-+ExecStart=/usr/sbin/lircd-setup
-+
-+[Install]
-+WantedBy=multi-user.target
--- 
-2.5.5
-
diff --git a/0018-lircd-Fix-listen-option-parsing-249.patch b/0018-lircd-Fix-listen-option-parsing-249.patch
deleted file mode 100644
index fe3607d..0000000
--- a/0018-lircd-Fix-listen-option-parsing-249.patch
+++ /dev/null
@@ -1,64 +0,0 @@
-From 1d307be4a95a32fe905793066e866bf64b49ee56 Mon Sep 17 00:00:00 2001
-From: Alec Leamas <leamas.alec@gmail.com>
-Date: Thu, 22 Dec 2016 16:04:15 +0100
-Subject: [PATCH] lircd: Fix --listen option parsing [#249].
-
----
- daemons/lircd.cpp      | 8 ++++----
- doc/man-source/lircd.8 | 3 ++-
- 2 files changed, 6 insertions(+), 5 deletions(-)
-
-diff --git a/daemons/lircd.cpp b/daemons/lircd.cpp
-index 9fe60c5..e491178 100644
---- a/daemons/lircd.cpp
-+++ b/daemons/lircd.cpp
-@@ -2169,7 +2169,7 @@ static int opt2host_port(const char*		optarg_arg,
- {
- 	char optarg[strlen(optarg_arg) + 1];
- 
--	strncpy(optarg, optarg_arg, strlen(optarg_arg));
-+	strcpy(optarg, optarg_arg);
- 	long p;
- 	char* endptr;
- 	char* sep = strchr(optarg, ':');
-@@ -2296,8 +2296,8 @@ static void lircd_parse_options(int argc, char** const argv)
- 			options_set_opt("lircd:output", optarg);
- 			break;
- 		case 'l':
--			options_set_opt("lircd:listen", "True");
--			options_set_opt("lircd:listen_hostport", optarg);
-+			options_set_opt("lircd:listen",
-+					optarg ? optarg : "0.0.0.0:8765");
- 			break;
- 		case 'c':
- 			options_set_opt("lircd:connect", optarg);
-@@ -2403,7 +2403,7 @@ int main(int argc, char** argv)
- 		lirc_log_set_file(opt);
- 	if (options_getstring("lircd:listen") != NULL) {
- 		listen_tcpip = 1;
--		opt = options_getstring("lircd:listen_hostport");
-+		opt = options_getstring("lircd:listen");
- 		if (opt) {
- 			if (opt2host_port(opt, &address, &port, errmsg) != 0) {
- 				fputs(errmsg, stderr);
-diff --git a/doc/man-source/lircd.8 b/doc/man-source/lircd.8
-index df0a5e4..1aa036f 100644
---- a/doc/man-source/lircd.8
-+++ b/doc/man-source/lircd.8
-@@ -1,4 +1,4 @@
--.TH LIRCD "8" "Last change: Aug 2016" "lircd @version@" "System Administration Utilities"
-+.TH LIRCD "8" "Last change: Dec 2016" "lircd @version@" "System Administration Utilities"
- .SH NAME
- .P
- \fBlircd\fR - Decode infrared signals and provide them on a socket.
-@@ -94,6 +94,7 @@ to all sorts of changes. It has not ben tested thoroughly.
- Let lircd listen for network
- connections on the given address/port. The default address is 0.0.0.0,
- which means that connections on all network interfaces will be accepted.
-+The address must be given in dotted numerical form.
- The default port is 8765. No security checks are currently implemented.
- The listening lircd instance will send all IR events to the connecting
- lircd instances.
--- 
-2.7.4
-
diff --git a/0019-build-Include-config.h-in-installed-headers-250.patch b/0019-build-Include-config.h-in-installed-headers-250.patch
deleted file mode 100644
index 0f1ff7c..0000000
--- a/0019-build-Include-config.h-in-installed-headers-250.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-From 614ea57ffc672359b0353ecdfd471dcd18e700d4 Mon Sep 17 00:00:00 2001
-From: Alec Leamas <leamas.alec@gmail.com>
-Date: Fri, 30 Dec 2016 20:05:50 +0100
-Subject: [PATCH] build: Include config.h in installed headers (#250).
-
----
- Makefile.am | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/Makefile.am b/Makefile.am
-index 1e41cab..868ad7f 100644
---- a/Makefile.am
-+++ b/Makefile.am
-@@ -51,7 +51,7 @@ dist_pkgconfig_DATA     = lirc.pc lirc-driver.pc
- 
- headerdir               = $(includedir)/lirc
- nobase_header_HEADERS   = include/media/lirc.h
--header_HEADERS          = paths.h drivers/irpipe/irpipe.h
-+header_HEADERS          = paths.h config.h drivers/irpipe/irpipe.h
- 
- install-data-hook:
- 	$(SED) -i -e '/^plugindir/s|/usr/lib|$(libdir)|' \
--- 
-2.7.4
-
diff --git a/0020-lircd-Fix-segfault-in-SET_INPUTLOG-without-arguments.patch b/0020-lircd-Fix-segfault-in-SET_INPUTLOG-without-arguments.patch
deleted file mode 100644
index 5222227..0000000
--- a/0020-lircd-Fix-segfault-in-SET_INPUTLOG-without-arguments.patch
+++ /dev/null
@@ -1,41 +0,0 @@
-From f105ffaec389c7765549cac834aaed144cdebdc8 Mon Sep 17 00:00:00 2001
-From: Alec Leamas <leamas.alec@gmail.com>
-Date: Tue, 3 Jan 2017 17:26:31 +0100
-Subject: [PATCH 20/21] lircd: Fix segfault in SET_INPUTLOG without arguments
- (#252).
-
----
- daemons/lircd.cpp | 16 ++++++++++------
- 1 file changed, 10 insertions(+), 6 deletions(-)
-
-diff --git a/daemons/lircd.cpp b/daemons/lircd.cpp
-index 4e9162a..64cbc0c 100644
---- a/daemons/lircd.cpp
-+++ b/daemons/lircd.cpp
-@@ -1687,13 +1687,17 @@ static int set_inputlog(int fd, char* message, char* arguments)
- 	FILE* f;
- 	int r;
- 
--	r = sscanf(arguments, "%128s", buff);
--	if (r != 1) {
--		return send_error(fd, message,
--				  "Illegal argument (protocol error): %s",
--				  arguments);
-+	if (arguments) {
-+		r = sscanf(arguments, "%128s", buff);
-+		if (r != 1) {
-+			return send_error(
-+				fd, message,
-+				"Illegal argument (protocol error): %s",
-+				arguments
-+			);
-+		}
- 	}
--	if (strcasecmp(buff, "null") == 0) {
-+	if (!arguments || strcasecmp(buff, "null") == 0) {
- 		rec_buffer_set_logfile(NULL);
- 		return send_success(fd, message);
- 	}
--- 
-2.7.4
-
diff --git a/0021-ircat-Fix-option-parsing-bug-empty-conditions-251.patch b/0021-ircat-Fix-option-parsing-bug-empty-conditions-251.patch
deleted file mode 100644
index 0e9881b..0000000
--- a/0021-ircat-Fix-option-parsing-bug-empty-conditions-251.patch
+++ /dev/null
@@ -1,66 +0,0 @@
-From 7c3caa5b02e6907d44d9d04fe0dfc93974b5d32c Mon Sep 17 00:00:00 2001
-From: Alec Leamas <leamas.alec@gmail.com>
-Date: Mon, 2 Jan 2017 18:43:14 +0100
-Subject: [PATCH 21/21] ircat: Fix option parsing bug + empty conditions
- (#251).
-
-The --command/-c option was not parsed correctly, despite that
-it seemed to work. lirc_code2char is not guarenteed to return
-NULL if there is no more data, it could just be empty.
----
- tools/ircat.cpp | 16 ++++++++++------
- 1 file changed, 10 insertions(+), 6 deletions(-)
-
-diff --git a/tools/ircat.cpp b/tools/ircat.cpp
-index 8d93f9b..b41dece 100644
---- a/tools/ircat.cpp
-+++ b/tools/ircat.cpp
-@@ -58,6 +58,7 @@ int main(int argc, char* argv[])
- {
- 	struct lirc_config* config;
- 	char* config_file = NULL;
-+	int r;
- 
- 	while (1) {
- 		int c;
-@@ -67,7 +68,7 @@ int main(int argc, char* argv[])
- 			{ "version", no_argument,	NULL, 'v' },
- 			{ 0,	     0,			0,    0	  }
- 		};
--		c = getopt_long(argc, argv, "chv", long_options, NULL);
-+		c = getopt_long(argc, argv, "c:hv", long_options, NULL);
- 		if (c == -1)
- 			break;
- 		switch (c) {
-@@ -94,20 +95,23 @@ int main(int argc, char* argv[])
- 	if (lirc_init(argv[argc - 1], 1) == -1)
- 		exit(EXIT_FAILURE);
- 
--	if (lirc_readconfig(config_file, &config, NULL) == 0) {
-+	r = lirc_readconfig(config_file, &config, NULL);
-+	if (r == 0) {
- 		char* code;
- 		char* c;
--		int ret;
-+		int r;
- 
- 		while (lirc_nextcode(&code) == 0) {
--			if (code == NULL)
-+			if (code == NULL || !*code)
- 				continue;
--			while ((ret = lirc_code2char(config, code, &c)) == 0 && c != NULL) {
-+			while ((r = lirc_code2char(config, code, &c)) == 0) {
-+				if (c == NULL || !*c)
-+					break;
- 				printf("%s\n", c);
- 				fflush(stdout);
- 			}
- 			free(code);
--			if (ret == -1)
-+			if (r == -1)
- 				break;
- 		}
- 		lirc_freeconfig(config);
--- 
-2.7.4
-
diff --git a/0030-doc-Fix-python-import-paths.patch b/0030-doc-Fix-python-import-paths.patch
deleted file mode 100644
index 7d8d4f7..0000000
--- a/0030-doc-Fix-python-import-paths.patch
+++ /dev/null
@@ -1,60 +0,0 @@
-From ec8704b21b722183af42982c3fa8edf92fee9209 Mon Sep 17 00:00:00 2001
-From: Alec Leamas <leamas.alec@gmail.com>
-Date: Wed, 25 Jan 2017 13:23:23 +0100
-Subject: [PATCH] doc: Fix python import paths.
-
----
- doc/Makefile.am | 4 ++--
- doc/data2hwdb   | 2 +-
- doc/data2table  | 2 +-
- 3 files changed, 4 insertions(+), 4 deletions(-)
-
-diff --git a/doc/Makefile.am b/doc/Makefile.am
-index 658ea14..777482f 100644
---- a/doc/Makefile.am
-+++ b/doc/Makefile.am
-@@ -135,13 +135,13 @@ $(srcdir)/manpage.xsl: $(abs_builddir)/driver-toc.xsl
-
- table.html: docpage.xsl
- 	test -e lirc || ln -s $(top_srcdir)/tools/lirc-setup lirc || :
--	PYTHONPATH=.:$(top_srcdir)/tools \
-+	PYTHONPATH=.:$(top_srcdir)/tools/lirc-setup:$(top_srcdir)/tools \
- 	$(PYTHON) $(srcdir)/data2table $(top_srcdir)/configs ../configs \
- 	        | xsltproc --html docpage.xsl - > table.html
-
- lirc.hwdb:
- 	test -e lirc || ln -s $(top_srcdir)/tools/lirc-setup lirc || :
--	PYTHONPATH=.:$(top_srcdir)/tools \
-+	PYTHONPATH=.:$(top_srcdir)/tools/lirc-setup:$(top_srcdir)/tools \
- 	$(PYTHON) $(srcdir)/data2hwdb $(top_srcdir)/configs ../configs \
- 	    > lirc.hwdb
-
-diff --git a/doc/data2hwdb b/doc/data2hwdb
-index 2f0c1c9..8455f4a 100755
---- a/doc/data2hwdb
-+++ b/doc/data2hwdb
-@@ -7,7 +7,7 @@ import os
- import sys
- import yaml
-
--from lirc import database
-+import database
-
- HEADER = '''
- # LIRC - Hardware DataBase
-diff --git a/doc/data2table b/doc/data2table
-index 05fb1e2..62a1e86 100755
---- a/doc/data2table
-+++ b/doc/data2table
-@@ -7,7 +7,7 @@ import os
- import sys
- import yaml
-
--from lirc import database
-+import database
-
-
- MENUS = {'home_brew': 'Home-brew serial and parallel devices',
---
-2.9.3
-
diff --git a/0031-Handle-systemd-new-pkg-config-filename-274.patch b/0031-Handle-systemd-new-pkg-config-filename-274.patch
deleted file mode 100644
index 3e86ad3..0000000
--- a/0031-Handle-systemd-new-pkg-config-filename-274.patch
+++ /dev/null
@@ -1,50 +0,0 @@
-From 46e2156480cd1a618079233bc0926dee2ae23e9a Mon Sep 17 00:00:00 2001
-From: Alec Leamas <leamas.alec@gmail.com>
-Date: Tue, 4 Apr 2017 10:31:26 +0200
-Subject: [PATCH] Fix missing socket activation
-
----
- configure.ac      | 2 ++
- daemons/lircd.cpp | 2 ++
- 2 files changed, 4 insertions(+)
-
-diff --git a/configure.ac b/configure.ac
-index 08e2c8e..d032365 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -385,6 +385,7 @@ AC_CHECK_HEADERS(linux/i2c-dev.h,[
- 
- 
- PKG_CHECK_MODULES([SYSTEMD],[libsystemd-daemon],,[true])
-+test -n "$SYSTEMD_LIBS" || PKG_CHECK_MODULES([SYSTEMD],[libsystemd],,[true])
- if test -n "$SYSTEMD_LIBS"; then
-     CFLAGS="$CFLAGS $SYSTEMD_CFLAGS"
-     AC_DEFINE(HAVE_SYSTEMD)
-@@ -530,6 +531,7 @@ AC_REPORT_CONDITIONAL([NEED_PYTHON3])
- AC_REPORT_CONDITIONAL([SYSTEMD_INSTALL])
- AC_REPORT_CONDITIONAL([DEVEL])
- AC_REPORT_CONDITIONAL([HAVE_UINPUT])
-+AC_REPORT_CONDITIONAL([HAVE_SYSTEMD])
- AC_REPORT_CONDITIONAL([DARWIN])
- AC_REPORT_CONDITIONAL([BSD])
- 
-diff --git a/daemons/lircd.cpp b/daemons/lircd.cpp
-index 69331b1..652afdc 100644
---- a/daemons/lircd.cpp
-+++ b/daemons/lircd.cpp
-@@ -1035,10 +1035,12 @@ void start_server(mode_t permission, int nodaemon, loglevel_t loglevel)
- 		fprintf(stderr, "Too many file descriptors received.\n");
- 		goto start_server_failed0;
- 	} else if (n == 1) {
-+	        log_notice("Using systemd fd");
- 		sockfd = SD_LISTEN_FDS_START + 0;
- 	}
- #endif
- 	if (sockfd == -1) {
-+	        log_debug("No systemd fd found");
- 		sockfd = socket(AF_UNIX, SOCK_STREAM, 0);
- 		if (sockfd == -1) {
- 			perror("Could not create socket");
--- 
-2.9.3
-
diff --git a/lirc.spec b/lirc.spec
index 4e94d05..f63267a 100644
--- a/lirc.spec
+++ b/lirc.spec
@@ -1,47 +1,32 @@
 %global _hardened_build 1
+%global __python %{__python3}
 
 %global released 1
 #define tag     devel
 
 Name:           lirc
-Version:        0.9.4c
-Release:        %{?tag:0.}8%{?tag:.}%{?tag}%{?dist}.2
+Version:        0.10.0
+Release:        1%{?tag:.}%{?tag}%{?dist}
 Summary:        The Linux Infrared Remote Control package
 
-%global repo    http://downloads.sourceforge.net/lirc/LIRC/%{version}/
+%global repo    http://downloads.sourceforge.net/lirc/LIRC/%{version}
+%global tarball %{name}-%{version}%{?tag:-}%{?tag}.tar.gz
 
 Group:          System Environment/Daemons
                 # lib/ciniparser* and lib/dictionary* are BSD, others GPLv2
 License:        GPLv2 and BSD
 URL:            http://www.lirc.org/
-Source0:        %{?released:%{repo}}%{name}-%{version}%{?tag:-}%{?tag}.tar.gz
+Source0:        %{?released:%{repo}%{?tag:-}%{?tag}/}%{tarball}
 Source1:        README.fedora
 Source2:        99-remote-control-lirc.rules
-                # All patches  are from upstream
-Patch1:         0001-plugins-girs.c-Default-device-typo-fix.patch
-Patch2:         0002-configure-Fix-cross-compilation-error-233.patch
-Patch3:         0003-build-lirc.h-Configure-includes-in-lirc.h-234.patch
-Patch4:         0004-lirc.org-Clean-up-distribution-links-bugfixes.patch
-Patch5:         0005-lib-curl_poll.h-Ensure-build-on-unconfiguredclients.patch
-Patch6:         0006-lirc.pc-Fix-bad-library-specification-236.patch
-Patch7:         0007-Build-Use-HAVE_UINPUT-1-to-force-building-uinput-cod.patch
-Patch8:         0008-systemd-Fix-wrong-path-to-irexec-239.patch
-Patch10:        0010-lib-Only-use-local-headers-in-lirc_private.h-237.patch
-Patch16:        0016-systemd-Add-missing-lircd-setup.service-to-distribut.patch
-Patch17:        0017-Actually-add-lircd-setup.service.patch
-Patch18:        0018-lircd-Fix-listen-option-parsing-249.patch
-Patch19:        0019-build-Include-config.h-in-installed-headers-250.patch
-Patch20:        0020-lircd-Fix-segfault-in-SET_INPUTLOG-without-arguments.patch
-Patch21:        0021-ircat-Fix-option-parsing-bug-empty-conditions-251.patch
-Patch30:        0030-doc-Fix-python-import-paths.patch
-Patch31:        0031-Handle-systemd-new-pkg-config-filename-274.patch
-
 
+BuildRequires:  /usr/bin/xsltproc
 BuildRequires:  alsa-lib-devel
 Buildrequires:  autoconf
 BuildRequires:  automake
 BuildRequires:  checkpolicy
 BuildRequires:  doxygen
+BuildRequires:  expect
 BuildRequires:  kernel-headers
 BuildRequires:  man2html
 BuildRequires:  libftdi-devel
@@ -51,8 +36,9 @@ BuildRequires:  libusb1-devel
 BuildRequires:  libxslt
 BuildRequires:  libXt-devel
 BuildRequires:  portaudio-devel
-BuildRequires:  python3-devel
-BuildRequires:  python3-PyYAML
+BuildRequires:  python%{python3_pkgversion}-devel
+BuildRequires:  python%{python3_pkgversion}-PyYAML
+BuildRequires:  socat
 BuildRequires:  systemd-devel
 
 Requires:       %{name}-libs = %{version}-%{release}
@@ -83,9 +69,11 @@ Summary:        LIRC core, always needed to run LIRC
 Requires:       lirc-libs%{?_isa} = %{version}-%{release}
 
 %description    core
-The LIRC core contains the lircd daemons, the devinput and
-default driver and most of the applications.
+Part of the LIRC package suite which handles IR remotes. See
+the package lirc for more.
 
+The lirc core contains the lircd daemons, the devinput and
+default driver and most of the applications.
 
 %package        compat
 Summary:        Compatibility package installing all lirc packages
@@ -98,6 +86,9 @@ Requires:       lirc-drv-portaudio%{?_isa} = %{version}-%{release}
 Requires:       lirc-drv-ftdi%{?_isa} = %{version}-%{release}
 
 %description    compat
+Part of the LIRC package suite which handles IR remotes. See
+the package lirc for more.
+
 Installing this package will install most lirc sub-packages, roughly
 the same as installing previous versions of the lirc package.
 
@@ -106,12 +97,11 @@ Summary:        LIRC libraries
 Group:          System Environment/Libraries
 
 %description    libs
-LIRC is a package that allows you to decode and send infra-red and
-other signals of many (but not all) commonly used remote controls.
-Included applications include daemons which decode the received
-signals as well as user space applications which allow controlling a
-computer with a remote control.  This package includes shared libraries
-that applications use to interface with LIRC.
+Part of the LIRC package suite which handles IR remotes. See
+the package lirc for more.
+
+This package includes shared libraries that applications use to
+interface with LIRC.
 
 
 %package        config
@@ -119,11 +109,14 @@ Summary:        LIRC Configuration Tools and Data
 Requires:       lirc-core = %{version}-%{release}
 Requires:       lirc-doc = %{version}-%{release}
 Requires:       gnome-icon-theme
-Requires:       python3-PyYAML
+Requires:       python%{python3_pkgversion}-PyYAML
 BuildArch:      noarch
 
 %description    config
-The LIRC config package contains tools and data to support the
+Part of the LIRC package suite which handles IR remotes. See
+the package lirc for more.
+
+The  config package contains tools and data to support the
 LIRC configuration process.
 
 
@@ -133,12 +126,11 @@ Group:          Development/Libraries
 Requires:       lirc-core%{?_isa} = %{version}-%{release}
 
 %description    devel
-LIRC is a package that allows you to decode and send infra-red and
-other signals of many (but not all) commonly used remote controls.
-Included applications include daemons which decode the received
-signals as well as user space applications which allow controlling a
-computer with a remote control.  This package includes files for
-developing applications that use LIRC.
+Part of the LIRC package suite which handles IR remotes. See
+the package lirc for more.
+
+This package includes files for developing applications that use lirc
+including headers and pkg-config files.
 
 
 %package        doc
@@ -147,12 +139,10 @@ Group:          Documentation
 BuildArch:      noarch
 
 %description    doc
-LIRC is a package that allows you to decode and send infra-red and
-other signals of many (but not all) commonly used remote controls.
-Included applications include daemons which decode the received
-signals as well as user space applications which allow controlling a
-computer with a remote control.  This package contains LIRC
-documentation.
+Part of the LIRC package suite which handles IR remotes. See
+the package lirc for more.
+
+This package contains lirc documentation.
 
 
 %package        disable-kernel-rc
@@ -161,8 +151,12 @@ Requires:       %{name} = %{version}-%{release}
 BuildArch:      noarch
 
 %description  disable-kernel-rc
-Udev rule which disables the kernel built-in handling of infrared devices
-(i. e., rc* ones) by making lirc the only used protocol.
+Part of the LIRC package suite which handles IR remotes. See
+the package lirc for more.
+
+This package contains an udev rule which disables the kernel built-in
+handling of infrared devices (i. e., rc* ones) by making lirc the only
+used protocol.
 
 
 %package        tools-gui
@@ -170,7 +164,11 @@ Summary:        LIRC GUI tools
 Requires:       lirc-core%{?_isa} = %{version}-%{release}
 
 %description   tools-gui
-Some seldom used X11-based tools for debugging lirc configurations.
+Part of the LIRC package suite which handles IR remotes. See
+the package lirc for more.
+
+This package contains some seldom used X11-based tools for debugging
+lirc configurations.
 
 
 %package        drv-portaudio
@@ -179,8 +177,11 @@ Requires:       lirc-core%{?_isa} = %{version}-%{release}
 License:        LGPLv2
 
 %description    drv-portaudio
-LIRC user space driver which supports  a IR receiver in microphone input
-using the portaudio library.
+Part of the LIRC package suite which handles IR remotes. See
+the package lirc for more.
+
+This package contains a lirc user space driver which supports
+an IR receiver in microphone input using the portaudio library.
 
 
 %package        drv-ftdi
@@ -188,8 +189,12 @@ Summary:        Ftdi LIRC User-Space Driver
 Requires:       lirc-core%{?_isa} = %{version}-%{release}
 
 %description    drv-ftdi
-LIRC user-space driver which works together with the kernel, providing
-full support for the ftdi device.
+Part of the LIRC package suite which handles IR remotes. See
+the package lirc for more.
+
+This package contains a user-space driver which works together
+with the kernel, providing full support for the ftdi device.
+See http://www.ftdichip.com.
 
 
 # Don't provide or require anything from _docdir, per policy.
@@ -198,26 +203,44 @@ full support for the ftdi device.
 
 
 %prep
-%autosetup -p1 -n %{name}-%{version}%{?tag}
+%autosetup -n %{name}-%{version}%{?tag:-}%{?tag}
 sed -i -e 's/#effective-user/effective-user /' lirc_options.conf
 sed -i -e '/^effective-user/s/=$/= lirc/' lirc_options.conf
 
 sed -i -e 's|/usr/local/etc/|/etc/|' contrib/irman2lirc
 
+%if 0%{?epel} > 0
+cd python-pkg/tests; rm dummy-server lircrc.conf test_client.py
+%endif
+
 
 %build
 autoreconf -fi
 
-CFLAGS="%{optflags}" HAVE_UINPUT=1 %configure --libdir=%{_libdir}
-make %{?_smp_mflags}
+%configure \
+        --docdir="%{_pkgdocdir}" \
+        --enable-uinput \
+        --enable-devinput
+make LANG=C.utf8 V=0 %{?_smp_mflags}
+
+%check
+if test -d python-pkg/tests; then
+    cd python-pkg/tests; python3 -m unittest discover || exit 1
+    cd $OLDPWD
+fi
+
+echo "Plugins: 40" > summary.ok
+echo "Drivers: 51" >> summary.ok
+echo "Errors: 0"   >> summary.ok
+tools/lirc-lsplugins -U plugins/.libs -s > summary
+diff -w summary summary.ok || exit 1
+
 
 %install
-make install DESTDIR=$RPM_BUILD_ROOT
-cd $RPM_BUILD_ROOT%{_datadir}/lirc/contrib
-chmod 755 irman2lirc
-cd $OLDPWD
-rm $RPM_BUILD_ROOT%{_libdir}/*.la
-rm $RPM_BUILD_ROOT%{_libdir}/lirc/plugins/*.la
+make -s V=0 LIBTOOLFLAGS="--silent %{?Wnone}" DESTDIR=$RPM_BUILD_ROOT install
+
+chmod 755 $RPM_BUILD_ROOT%{_datadir}/lirc/contrib/irman2lirc
+find $RPM_BUILD_ROOT%{_libdir}/ -name \*.la -delete
 
 install -pm 755 contrib/irman2lirc $RPM_BUILD_ROOT%{_bindir}
 install -Dpm 644 doc/lirc.hwdb $RPM_BUILD_ROOT%{_datadir}/lirc/lirc.hwdb
@@ -282,13 +305,11 @@ systemd-tmpfiles --create %{_tmpfilesdir}/lirc.conf
 %{_mandir}/man1/lirc-config-tool*
 %{_mandir}/man1/lirc-setup*
 %{_datadir}/lirc/configs/*
-%{python3_sitelib}/lirc
 %exclude %{_datadir}/lirc/configs/ftdi.conf
 %exclude %{_datadir}/lirc/configs/audio.conf
 
 
 %files core
-%license COPYING
 %doc README AUTHORS NEWS README.fedora
 %dir  /etc/lirc
 /etc/lirc/lircd.conf.d
@@ -309,6 +330,8 @@ systemd-tmpfiles --create %{_tmpfilesdir}/lirc.conf
 %{_libdir}/lirc/plugins
 %exclude %{_libdir}/lirc/plugins/ftdi.so
 %exclude %{_libdir}/lirc/plugins/audio.so
+%{_libdir}/python%{python3_version}/site-packages/lirc
+%{_libdir}/python%{python3_version}/site-packages/lirc-setup
 %{_datadir}/lirc/
 /var/lib/lirc/images
 /var/lib/lirc/plugins
@@ -326,9 +349,8 @@ systemd-tmpfiles --create %{_tmpfilesdir}/lirc.conf
 %exclude %{_mandir}/man1/irxevent*
 %exclude %{_mandir}/man1/xmode2*
 
-
 %files libs
-#doc COPYING
+%license COPYING COPYING.ciniparser COPYING.curl
 %{_libdir}/libirrecord.so.*
 %{_libdir}/liblirc_client.so.*
 %{_libdir}/liblirc_driver.so.*
@@ -347,13 +369,18 @@ systemd-tmpfiles --create %{_tmpfilesdir}/lirc.conf
 %{_libdir}/pkgconfig/lirc.pc
 
 %files doc
-%doc COPYING ChangeLog
+%license COPYING COPYING.ciniparser COPYING.curl
+%doc ChangeLog
 %{_pkgdocdir}
 
 %files disable-kernel-rc
 %{_udevrulesdir}/99-remote-control-lirc.rules
 
 %changelog
+* Sat Aug 12 2017 Alec Leamas <leamas.alec@gmail.com> - 0.10.0-1
+- New upstream release
+- All patches upstreamed.
+
 * Thu Aug 03 2017 Fedora Release Engineering <releng@fedoraproject.org> - 0.9.4c-8.2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild
 
diff --git a/sources b/sources
index f9bb9de..7bd03ad 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-a7c17a7ec11756e0278d31e8d965a384  lirc-0.9.4c.tar.gz
+SHA512 (lirc-0.10.0.tar.gz) = 65e7389e12d619f4c8728dc9f188dfd382567b297e3c65a116965e3ca9faa0010e3805fc96a863f3c0fe813bc7ba56dfa71588e29c1894e355b535fd57819a38

From 23476bbc8c54e11116d7321307a7672f27ab9b32 Mon Sep 17 00:00:00 2001
From: Alec Leamas <leamas.alec@gmail.com>
Date: Tue, 15 Aug 2017 20:39:25 +0200
Subject: [PATCH 183/204] 0.10.0-2

---
 ...uild-install-media-lirc.h-BTS-872074.patch | 60 +++++++++++++++++++
 lirc.spec                                     |  7 ++-
 2 files changed, 66 insertions(+), 1 deletion(-)
 create mode 100644 0001-build-install-media-lirc.h-BTS-872074.patch

diff --git a/0001-build-install-media-lirc.h-BTS-872074.patch b/0001-build-install-media-lirc.h-BTS-872074.patch
new file mode 100644
index 0000000..e442d8a
--- /dev/null
+++ b/0001-build-install-media-lirc.h-BTS-872074.patch
@@ -0,0 +1,60 @@
+From 11e1e9ee6b353c6e7c68f92f89c49d52f396cfc7 Mon Sep 17 00:00:00 2001
+From: Alec Leamas <leamas.alec@gmail.com>
+Date: Mon, 14 Aug 2017 10:31:55 +0200
+Subject: [PATCH] build: install media/lirc.h (BTS #872074).
+
+The plugin builds references this file. Basically, this should be
+resolved by lirc_driver.h, testing if the kernel header is
+available and using it if so, but without including config.h
+
+This fix adds an evil symlink to not remove anything. The proper
+fix includes actually moving the file and also streamlining the
+HAVE_KERNEL_LIRC_H to the generic HAVE_LINUX_LIRC_H.
+---
+ Makefile.am  | 5 ++++-
+ configure.ac | 3 +++
+ 2 files changed, 7 insertions(+), 1 deletion(-)
+
+diff --git a/Makefile.am b/Makefile.am
+index aafb4e8..9f3dd14 100644
+--- a/Makefile.am
++++ b/Makefile.am
+@@ -138,12 +138,15 @@ install-data-hook:
+ 	$(SED) -i -e '/^plugindir/s|/usr/lib|$(libdir)|' \
+ 	    $(DESTDIR)$(lirc_confdir)/lirc_options.conf
+ 	cp -pr $(srcdir)/contrib $(DESTDIR)$(pkgdatadir)
++	chmod u+w $(DESTDIR)$(includedir)
++	cd $(DESTDIR)$(includedir)/lirc; ln -s include/media .
+ 
+ uninstall-hook:
+ 	-chmod -R u+w $(DESTDIR)/$(pkgdatadir)/contrib
+ 	-rm -rf $(DESTDIR)/$(pkgdatadir) \
+ 	        $(DESTDIR)/$(pkgpythondir) \
+-	        $(DESTDIR)/$(pkgdatadir)/contrib
++	        $(DESTDIR)/$(pkgdatadir)/contrib \
++		$(DESTDIR)$(includedir)/lirc
+ 
+ dist-hook: ChangeLog fix-version
+ 	cp -pr $(srcdir)/contrib $(distdir)
+diff --git a/configure.ac b/configure.ac
+index 321a61f..4108688 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -511,11 +511,14 @@ AC_DEFINE(LIRC_OPTIONS_VAR, ["LIRC_OPTIONS_PATH"],[
+         Environment variable overriding options file path])
+ 
+ AH_TOP([
++#ifndef ROOT_CONFIG_H
++#define ROOT_CONFIG_H
+ #include     "paths.h"
+ ])
+ 
+ AH_BOTTOM([
+ #include     "lirc/lirc_config.h"
++#endif // ROOT_CONFIG_H
+ ])
+ 
+ dnl write these decisions out to the Makefiles
+-- 
+2.9.3
+
diff --git a/lirc.spec b/lirc.spec
index f63267a..d4247c6 100644
--- a/lirc.spec
+++ b/lirc.spec
@@ -6,7 +6,7 @@
 
 Name:           lirc
 Version:        0.10.0
-Release:        1%{?tag:.}%{?tag}%{?dist}
+Release:        2%{?tag:.}%{?tag}%{?dist}
 Summary:        The Linux Infrared Remote Control package
 
 %global repo    http://downloads.sourceforge.net/lirc/LIRC/%{version}
@@ -19,6 +19,8 @@ URL:            http://www.lirc.org/
 Source0:        %{?released:%{repo}%{?tag:-}%{?tag}/}%{tarball}
 Source1:        README.fedora
 Source2:        99-remote-control-lirc.rules
+Patch1:         0001-build-install-media-lirc.h-BTS-872074.patch
+
 
 BuildRequires:  /usr/bin/xsltproc
 BuildRequires:  alsa-lib-devel
@@ -377,6 +379,9 @@ systemd-tmpfiles --create %{_tmpfilesdir}/lirc.conf
 %{_udevrulesdir}/99-remote-control-lirc.rules
 
 %changelog
+* Tue Aug 15 2017 Alec Leamas <leamas.alec@gmail.com> - 0.10.0-2
+- Fix Debian BTS 872074, FTBS on external plugins e. g. libirman.
+
 * Sat Aug 12 2017 Alec Leamas <leamas.alec@gmail.com> - 0.10.0-1
 - New upstream release
 - All patches upstreamed.

From 224df8ce5ee3f9aafb816e4b19adceb6083ec75c Mon Sep 17 00:00:00 2001
From: Alec Leamas <leamas.alec@gmail.com>
Date: Sun, 20 Aug 2017 17:57:03 +0200
Subject: [PATCH 184/204] 0.10.0-3 Fix #1483330, bad lockdir.

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

diff --git a/lirc.spec b/lirc.spec
index d4247c6..2cde07f 100644
--- a/lirc.spec
+++ b/lirc.spec
@@ -6,7 +6,7 @@
 
 Name:           lirc
 Version:        0.10.0
-Release:        2%{?tag:.}%{?tag}%{?dist}
+Release:        3%{?tag:.}%{?tag}%{?dist}
 Summary:        The Linux Infrared Remote Control package
 
 %global repo    http://downloads.sourceforge.net/lirc/LIRC/%{version}
@@ -222,7 +222,8 @@ autoreconf -fi
 %configure \
         --docdir="%{_pkgdocdir}" \
         --enable-uinput \
-        --enable-devinput
+        --enable-devinput \
+        --with-lockdir=/var/lock/lockdev
 make LANG=C.utf8 V=0 %{?_smp_mflags}
 
 %check
@@ -379,6 +380,9 @@ systemd-tmpfiles --create %{_tmpfilesdir}/lirc.conf
 %{_udevrulesdir}/99-remote-control-lirc.rules
 
 %changelog
+* Sun Aug 20 2017 Alec Leamas <leamas.alec@gmail.com> - 0.10.0-3
+- Fix rhbz #1483330, use correct serial devices lock dir.
+
 * Tue Aug 15 2017 Alec Leamas <leamas.alec@gmail.com> - 0.10.0-2
 - Fix Debian BTS 872074, FTBS on external plugins e. g. libirman.
 

From 299836bdcc1275fb7fe88506884e9cd468757b12 Mon Sep 17 00:00:00 2001
From: Alec Leamas <leamas.alec@gmail.com>
Date: Thu, 24 Aug 2017 05:58:48 +0200
Subject: [PATCH 185/204] spec: BR:man2html -> man2html-core

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

diff --git a/lirc.spec b/lirc.spec
index 2cde07f..0ba1a4e 100644
--- a/lirc.spec
+++ b/lirc.spec
@@ -30,7 +30,7 @@ BuildRequires:  checkpolicy
 BuildRequires:  doxygen
 BuildRequires:  expect
 BuildRequires:  kernel-headers
-BuildRequires:  man2html
+BuildRequires:  man2html-core
 BuildRequires:  libftdi-devel
 BuildRequires:  libtool
 BuildRequires:  libusb-devel

From d20531c726a0394a55c7d70787937e966c9043ad Mon Sep 17 00:00:00 2001
From: Alec Leamas <leamas.alec@gmail.com>
Date: Sun, 10 Dec 2017 20:20:42 +0100
Subject: [PATCH 186/204] 0.10.0-4

---
 lirc.spec | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/lirc.spec b/lirc.spec
index 0ba1a4e..02f654e 100644
--- a/lirc.spec
+++ b/lirc.spec
@@ -6,7 +6,7 @@
 
 Name:           lirc
 Version:        0.10.0
-Release:        3%{?tag:.}%{?tag}%{?dist}
+Release:        4%{?tag:.}%{?tag}%{?dist}
 Summary:        The Linux Infrared Remote Control package
 
 %global repo    http://downloads.sourceforge.net/lirc/LIRC/%{version}
@@ -380,6 +380,9 @@ systemd-tmpfiles --create %{_tmpfilesdir}/lirc.conf
 %{_udevrulesdir}/99-remote-control-lirc.rules
 
 %changelog
+* Sun Dec 10 2017 Alec Leamas <leamas.alec@gmail.com> - 0.10.0-4
+- Fix rhbz #1514359, f27 version is less than f26.
+
 * Sun Aug 20 2017 Alec Leamas <leamas.alec@gmail.com> - 0.10.0-3
 - Fix rhbz #1483330, use correct serial devices lock dir.
 

From 550b36368c795e26263e0410dd47010c20108b88 Mon Sep 17 00:00:00 2001
From: Tom Hughes <tom@compton.nu>
Date: Thu, 28 Dec 2017 21:11:00 +0000
Subject: [PATCH 187/204] Don't expire files in runtime directory

Don't expire files in /var/run/lirc as this causes the lircd socket to be removed after ten days.
---
 lirc.spec | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/lirc.spec b/lirc.spec
index 02f654e..5bf630f 100644
--- a/lirc.spec
+++ b/lirc.spec
@@ -6,7 +6,7 @@
 
 Name:           lirc
 Version:        0.10.0
-Release:        4%{?tag:.}%{?tag}%{?dist}
+Release:        5%{?tag:.}%{?tag}%{?dist}
 Summary:        The Linux Infrared Remote Control package
 
 %global repo    http://downloads.sourceforge.net/lirc/LIRC/%{version}
@@ -254,7 +254,7 @@ install -Dpm 644 %{SOURCE2} \
 cp -a %{SOURCE1} README.fedora
 
 mkdir -p $RPM_BUILD_ROOT/%{_tmpfilesdir}
-echo "d /var/run/lirc  0755  lirc  lirc  10d" \
+echo "d /var/run/lirc  0755  lirc  lirc  -" \
     > $RPM_BUILD_ROOT%{_tmpfilesdir}/lirc.conf
 
 
@@ -380,6 +380,9 @@ systemd-tmpfiles --create %{_tmpfilesdir}/lirc.conf
 %{_udevrulesdir}/99-remote-control-lirc.rules
 
 %changelog
+* Thu Dec 28 2017 Tom Hughes <tom@compton.nu> - 0.10.0-5
+- Don't expire files in runtime directory.
+
 * Sun Dec 10 2017 Alec Leamas <leamas.alec@gmail.com> - 0.10.0-4
 - Fix rhbz #1514359, f27 version is less than f26.
 

From 42b8b23faf90bb2f509dd0a4438065449d017c34 Mon Sep 17 00:00:00 2001
From: Alec Leamas <leamas.alec@gmail.com>
Date: Mon, 22 Jan 2018 17:54:38 +0100
Subject: [PATCH 188/204] 0.10.0-5: Adding generic systemd deps to core package
 (#1536901).

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

diff --git a/lirc.spec b/lirc.spec
index 5bf630f..1975682 100644
--- a/lirc.spec
+++ b/lirc.spec
@@ -6,7 +6,7 @@
 
 Name:           lirc
 Version:        0.10.0
-Release:        5%{?tag:.}%{?tag}%{?dist}
+Release:        6%{?tag:.}%{?tag}%{?dist}
 Summary:        The Linux Infrared Remote Control package
 
 %global repo    http://downloads.sourceforge.net/lirc/LIRC/%{version}
@@ -69,6 +69,7 @@ packages to get a smaller installation.
 %package        core
 Summary:        LIRC core, always needed to run LIRC
 Requires:       lirc-libs%{?_isa} = %{version}-%{release}
+%{?systemd_requires}
 
 %description    core
 Part of the LIRC package suite which handles IR remotes. See
@@ -380,6 +381,9 @@ systemd-tmpfiles --create %{_tmpfilesdir}/lirc.conf
 %{_udevrulesdir}/99-remote-control-lirc.rules
 
 %changelog
+* Mon Jan 22 2018 Alec Leamas <leamas.alec@gmail.com> - 0.10.0-6
+- Fix for rhbz #1536901, missing R(post) in lirc-core.
+
 * Thu Dec 28 2017 Tom Hughes <tom@compton.nu> - 0.10.0-5
 - Don't expire files in runtime directory.
 

From 44c0b08c5860d6f3be8545a642f878141aef6c05 Mon Sep 17 00:00:00 2001
From: Fedora Release Engineering <releng@fedoraproject.org>
Date: Wed, 7 Feb 2018 23:59:43 +0000
Subject: [PATCH 189/204] - Rebuilt for
 https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild

Signed-off-by: Fedora Release Engineering <releng@fedoraproject.org>
---
 lirc.spec | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/lirc.spec b/lirc.spec
index 1975682..1b613ca 100644
--- a/lirc.spec
+++ b/lirc.spec
@@ -6,7 +6,7 @@
 
 Name:           lirc
 Version:        0.10.0
-Release:        6%{?tag:.}%{?tag}%{?dist}
+Release:        7%{?tag:.}%{?tag}%{?dist}
 Summary:        The Linux Infrared Remote Control package
 
 %global repo    http://downloads.sourceforge.net/lirc/LIRC/%{version}
@@ -381,6 +381,9 @@ systemd-tmpfiles --create %{_tmpfilesdir}/lirc.conf
 %{_udevrulesdir}/99-remote-control-lirc.rules
 
 %changelog
+* Wed Feb 07 2018 Fedora Release Engineering <releng@fedoraproject.org> - 0.10.0-7
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild
+
 * Mon Jan 22 2018 Alec Leamas <leamas.alec@gmail.com> - 0.10.0-6
 - Fix for rhbz #1536901, missing R(post) in lirc-core.
 

From 8710cba47e2eae336fda553f6aef7a9e59a3971d Mon Sep 17 00:00:00 2001
From: Richard Shaw <hobbes1069@gmail.com>
Date: Mon, 19 Feb 2018 09:29:40 -0600
Subject: [PATCH 190/204] Update build requirements for gcc/gcc-c++ per
 https://fedoraproject.org/wiki/Packaging:C_and_C%2B%2B#BuildRequires_and_Requires

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

diff --git a/lirc.spec b/lirc.spec
index 1b613ca..c0853fc 100644
--- a/lirc.spec
+++ b/lirc.spec
@@ -22,6 +22,7 @@ Source2:        99-remote-control-lirc.rules
 Patch1:         0001-build-install-media-lirc.h-BTS-872074.patch
 
 
+BuildRequires:  gcc-c++
 BuildRequires:  /usr/bin/xsltproc
 BuildRequires:  alsa-lib-devel
 Buildrequires:  autoconf

From 4d20db4ca3dfe53bed40191d1be18451eb4b5eb0 Mon Sep 17 00:00:00 2001
From: Alec Leamas <leamas.alec@gmail.com>
Date: Wed, 13 Jun 2018 12:11:58 +0200
Subject: [PATCH 191/204] 0.10.0-8

---
 lirc.spec | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/lirc.spec b/lirc.spec
index c0853fc..65f84c8 100644
--- a/lirc.spec
+++ b/lirc.spec
@@ -6,7 +6,7 @@
 
 Name:           lirc
 Version:        0.10.0
-Release:        7%{?tag:.}%{?tag}%{?dist}
+Release:        8%{?tag:.}%{?tag}%{?dist}
 Summary:        The Linux Infrared Remote Control package
 
 %global repo    http://downloads.sourceforge.net/lirc/LIRC/%{version}
@@ -210,6 +210,10 @@ See http://www.ftdichip.com.
 %autosetup -n %{name}-%{version}%{?tag:-}%{?tag}
 sed -i -e 's/#effective-user/effective-user /' lirc_options.conf
 sed -i -e '/^effective-user/s/=$/= lirc/' lirc_options.conf
+sed -i '/User=/s/; *//' systemd/lircd.service
+sed -i '/Group=/s/; *//' systemd/lircd.service
+sed -i 's/; *user=/User=/' systemd/irexec.service
+sed -i 's/; *group=/Group=/' systemd/irexec.service
 
 sed -i -e 's|/usr/local/etc/|/etc/|' contrib/irman2lirc
 
@@ -382,6 +386,9 @@ systemd-tmpfiles --create %{_tmpfilesdir}/lirc.conf
 %{_udevrulesdir}/99-remote-control-lirc.rules
 
 %changelog
+* Wed Jun 13 2018 Alec Leamas <leamas.alec@gmail.com> - 0.10.0-8
+- Patch systemd files to use correct user and group - #1590724.
+
 * Wed Feb 07 2018 Fedora Release Engineering <releng@fedoraproject.org> - 0.10.0-7
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild
 

From 85e52cf9471a4f7a3dbc81dcb1c0146ba1f9415c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Miro=20Hron=C4=8Dok?= <miro@hroncok.cz>
Date: Tue, 19 Jun 2018 10:47:01 +0200
Subject: [PATCH 192/204] Rebuilt for Python 3.7

---
 lirc.spec | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/lirc.spec b/lirc.spec
index 65f84c8..85c1abd 100644
--- a/lirc.spec
+++ b/lirc.spec
@@ -6,7 +6,7 @@
 
 Name:           lirc
 Version:        0.10.0
-Release:        8%{?tag:.}%{?tag}%{?dist}
+Release:        9%{?tag:.}%{?tag}%{?dist}
 Summary:        The Linux Infrared Remote Control package
 
 %global repo    http://downloads.sourceforge.net/lirc/LIRC/%{version}
@@ -386,6 +386,9 @@ systemd-tmpfiles --create %{_tmpfilesdir}/lirc.conf
 %{_udevrulesdir}/99-remote-control-lirc.rules
 
 %changelog
+* Tue Jun 19 2018 Miro Hrončok <mhroncok@redhat.com> - 0.10.0-9
+- Rebuilt for Python 3.7
+
 * Wed Jun 13 2018 Alec Leamas <leamas.alec@gmail.com> - 0.10.0-8
 - Patch systemd files to use correct user and group - #1590724.
 

From 6e047c10b0c2ae407850e6a814edd55555a1b7be Mon Sep 17 00:00:00 2001
From: Alec Leamas <leamas.alec@gmail.com>
Date: Fri, 29 Jun 2018 15:41:51 +0200
Subject: [PATCH 193/204] 0.10-0-10: Fix ldconfig scriptlets.

---
 lirc.spec | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/lirc.spec b/lirc.spec
index 85c1abd..e68ef6b 100644
--- a/lirc.spec
+++ b/lirc.spec
@@ -6,7 +6,7 @@
 
 Name:           lirc
 Version:        0.10.0
-Release:        9%{?tag:.}%{?tag}%{?dist}
+Release:        10%{?tag:.}%{?tag}%{?dist}
 Summary:        The Linux Infrared Remote Control package
 
 %global repo    http://downloads.sourceforge.net/lirc/LIRC/%{version}
@@ -284,10 +284,7 @@ systemd-tmpfiles --create %{_tmpfilesdir}/lirc.conf
 %postun core
 %systemd_postun_with_restart lircd.service lircmd.service
 
-
-%post libs -p /sbin/ldconfig
-
-%postun libs -p /sbin/ldconfig
+%ldconfig_scriptlets libs
 
 
 %files compat
@@ -386,6 +383,9 @@ systemd-tmpfiles --create %{_tmpfilesdir}/lirc.conf
 %{_udevrulesdir}/99-remote-control-lirc.rules
 
 %changelog
+* Fri Jun 29 2018 Alec Leamas <leamas.alec@gmail.com> - 0.10.0-10
+- Conditionalize ldconfig scriptlets.
+
 * Tue Jun 19 2018 Miro Hrončok <mhroncok@redhat.com> - 0.10.0-9
 - Rebuilt for Python 3.7
 

From a7d4fcebd67e81ea15a3223d874abf4b33bdaf25 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Miro=20Hron=C4=8Dok?= <miro@hroncok.cz>
Date: Mon, 2 Jul 2018 18:22:38 +0200
Subject: [PATCH 194/204] Rebuilt for Python 3.7

---
 lirc.spec | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/lirc.spec b/lirc.spec
index e68ef6b..29785ca 100644
--- a/lirc.spec
+++ b/lirc.spec
@@ -6,7 +6,7 @@
 
 Name:           lirc
 Version:        0.10.0
-Release:        10%{?tag:.}%{?tag}%{?dist}
+Release:        11%{?tag:.}%{?tag}%{?dist}
 Summary:        The Linux Infrared Remote Control package
 
 %global repo    http://downloads.sourceforge.net/lirc/LIRC/%{version}
@@ -383,6 +383,9 @@ systemd-tmpfiles --create %{_tmpfilesdir}/lirc.conf
 %{_udevrulesdir}/99-remote-control-lirc.rules
 
 %changelog
+* Mon Jul 02 2018 Miro Hrončok <mhroncok@redhat.com> - 0.10.0-11
+- Rebuilt for Python 3.7
+
 * Fri Jun 29 2018 Alec Leamas <leamas.alec@gmail.com> - 0.10.0-10
 - Conditionalize ldconfig scriptlets.
 

From a30af08bc0877e26198069ad545a987c68ba4037 Mon Sep 17 00:00:00 2001
From: Fedora Release Engineering <releng@fedoraproject.org>
Date: Fri, 13 Jul 2018 09:14:56 +0000
Subject: [PATCH 195/204] - Rebuilt for
 https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild

Signed-off-by: Fedora Release Engineering <releng@fedoraproject.org>
---
 lirc.spec | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/lirc.spec b/lirc.spec
index 29785ca..887fb03 100644
--- a/lirc.spec
+++ b/lirc.spec
@@ -6,7 +6,7 @@
 
 Name:           lirc
 Version:        0.10.0
-Release:        11%{?tag:.}%{?tag}%{?dist}
+Release:        12%{?tag:.}%{?tag}%{?dist}
 Summary:        The Linux Infrared Remote Control package
 
 %global repo    http://downloads.sourceforge.net/lirc/LIRC/%{version}
@@ -383,6 +383,9 @@ systemd-tmpfiles --create %{_tmpfilesdir}/lirc.conf
 %{_udevrulesdir}/99-remote-control-lirc.rules
 
 %changelog
+* Fri Jul 13 2018 Fedora Release Engineering <releng@fedoraproject.org> - 0.10.0-12
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild
+
 * Mon Jul 02 2018 Miro Hrončok <mhroncok@redhat.com> - 0.10.0-11
 - Rebuilt for Python 3.7
 

From 239d1a1d82750a5f9a53b8da69013a5886a5a9c1 Mon Sep 17 00:00:00 2001
From: Alec Leamas <leamas.alec@gmail.com>
Date: Fri, 12 Oct 2018 21:07:45 +0200
Subject: [PATCH 196/204] 0.10.0-13: Add fix for lirc-setup crash on start.

---
 ...rash-on-start-on-missing-lirc.config.patch | 25 +++++++++++++++++++
 lirc.spec                                     |  6 ++++-
 2 files changed, 30 insertions(+), 1 deletion(-)
 create mode 100644 0002-lirc-setup-Fix-crash-on-start-on-missing-lirc.config.patch

diff --git a/0002-lirc-setup-Fix-crash-on-start-on-missing-lirc.config.patch b/0002-lirc-setup-Fix-crash-on-start-on-missing-lirc.config.patch
new file mode 100644
index 0000000..b716d7a
--- /dev/null
+++ b/0002-lirc-setup-Fix-crash-on-start-on-missing-lirc.config.patch
@@ -0,0 +1,25 @@
+From d64c949fd95f5ce4c7dedaba98e07af2f0bc8c35 Mon Sep 17 00:00:00 2001
+From: Alec Leamas <leamas.alec@gmail.com>
+Date: Fri, 12 Oct 2018 20:49:58 +0200
+Subject: [PATCH] lirc-setup: Fix crash on start on missing lirc.config.
+
+---
+ Makefile.am | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/Makefile.am b/Makefile.am
+index aafb4e8ca..22106c496 100644
+--- a/Makefile.am
++++ b/Makefile.am
+@@ -80,7 +80,7 @@ py_PYTHON               = python-pkg/lirc/__init__.py \
+                           python-pkg/lirc/database.py \
+                           python-pkg/lirc/paths.py
+ 
+-nodist_py_pkg_PYTHON    = python-pkg/lirc/config.py
++nodist_py_PYTHON        = python-pkg/lirc/config.py
+ 
+ if HAVE_PYTHON35
+ py_PYTHON               += python-pkg/lirc/async_client.py \
+-- 
+2.14.4
+
diff --git a/lirc.spec b/lirc.spec
index 887fb03..7a8d2a6 100644
--- a/lirc.spec
+++ b/lirc.spec
@@ -6,7 +6,7 @@
 
 Name:           lirc
 Version:        0.10.0
-Release:        12%{?tag:.}%{?tag}%{?dist}
+Release:        13%{?tag:.}%{?tag}%{?dist}
 Summary:        The Linux Infrared Remote Control package
 
 %global repo    http://downloads.sourceforge.net/lirc/LIRC/%{version}
@@ -20,6 +20,7 @@ Source0:        %{?released:%{repo}%{?tag:-}%{?tag}/}%{tarball}
 Source1:        README.fedora
 Source2:        99-remote-control-lirc.rules
 Patch1:         0001-build-install-media-lirc.h-BTS-872074.patch
+Patch2:         0002-lirc-setup-Fix-crash-on-start-on-missing-lirc.config.patch
 
 
 BuildRequires:  gcc-c++
@@ -383,6 +384,9 @@ systemd-tmpfiles --create %{_tmpfilesdir}/lirc.conf
 %{_udevrulesdir}/99-remote-control-lirc.rules
 
 %changelog
+* Fri Oct 12 2018 Alec Leamas <leamas.alec@gmail.com> - 0.10.0-13
+- Added patch for lirc-setup crash on startup.
+
 * Fri Jul 13 2018 Fedora Release Engineering <releng@fedoraproject.org> - 0.10.0-12
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild
 

From 035dcad7366bbeba1a81ee9b8649b4a3f0f536a7 Mon Sep 17 00:00:00 2001
From: Alec Leamas <leamas.alec@gmail.com>
Date: Sat, 13 Oct 2018 00:10:16 +0200
Subject: [PATCH 197/204] 0.10.0-14: Rework patch for lirc-setup crash on
 startup.

---
 ...-Fix-crash-on-start-on-missing-lirc.config.patch | 13 ++++++-------
 lirc.spec                                           |  5 ++++-
 2 files changed, 10 insertions(+), 8 deletions(-)

diff --git a/0002-lirc-setup-Fix-crash-on-start-on-missing-lirc.config.patch b/0002-lirc-setup-Fix-crash-on-start-on-missing-lirc.config.patch
index b716d7a..7a88b96 100644
--- a/0002-lirc-setup-Fix-crash-on-start-on-missing-lirc.config.patch
+++ b/0002-lirc-setup-Fix-crash-on-start-on-missing-lirc.config.patch
@@ -1,25 +1,24 @@
-From d64c949fd95f5ce4c7dedaba98e07af2f0bc8c35 Mon Sep 17 00:00:00 2001
+From e2693b9022f390070ef0136020aafc8c1c18769c Mon Sep 17 00:00:00 2001
 From: Alec Leamas <leamas.alec@gmail.com>
 Date: Fri, 12 Oct 2018 20:49:58 +0200
 Subject: [PATCH] lirc-setup: Fix crash on start on missing lirc.config.
 
 ---
- Makefile.am | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
+ Makefile.am | 1 +
+ 1 file changed, 1 insertion(+)
 
 diff --git a/Makefile.am b/Makefile.am
-index aafb4e8ca..22106c496 100644
+index aafb4e8ca..d5dbfb621 100644
 --- a/Makefile.am
 +++ b/Makefile.am
-@@ -80,7 +80,7 @@ py_PYTHON               = python-pkg/lirc/__init__.py \
+@@ -80,6 +80,7 @@ py_PYTHON               = python-pkg/lirc/__init__.py \
                            python-pkg/lirc/database.py \
                            python-pkg/lirc/paths.py
  
--nodist_py_pkg_PYTHON    = python-pkg/lirc/config.py
 +nodist_py_PYTHON        = python-pkg/lirc/config.py
+ nodist_py_pkg_PYTHON    = python-pkg/lirc/config.py
  
  if HAVE_PYTHON35
- py_PYTHON               += python-pkg/lirc/async_client.py \
 -- 
 2.14.4
 
diff --git a/lirc.spec b/lirc.spec
index 7a8d2a6..dde6576 100644
--- a/lirc.spec
+++ b/lirc.spec
@@ -6,7 +6,7 @@
 
 Name:           lirc
 Version:        0.10.0
-Release:        13%{?tag:.}%{?tag}%{?dist}
+Release:        14%{?tag:.}%{?tag}%{?dist}
 Summary:        The Linux Infrared Remote Control package
 
 %global repo    http://downloads.sourceforge.net/lirc/LIRC/%{version}
@@ -384,6 +384,9 @@ systemd-tmpfiles --create %{_tmpfilesdir}/lirc.conf
 %{_udevrulesdir}/99-remote-control-lirc.rules
 
 %changelog
+* Fri Oct 12 2018 Alec Leamas <leamas.alec@gmail.com> - 0.10.0-14
+- Rework patch for lirc-setup crash on startup.
+
 * Fri Oct 12 2018 Alec Leamas <leamas.alec@gmail.com> - 0.10.0-13
 - Added patch for lirc-setup crash on startup.
 

From a74a20693e8e7ba87c1b6e044885cc57dc5f6fd1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Miro=20Hron=C4=8Dok?= <miro@hroncok.cz>
Date: Thu, 15 Nov 2018 12:53:55 +0100
Subject: [PATCH 198/204] 
 https://fedoraproject.org/wiki/Changes/No_more_automagic_Python_bytecompilation_phase_2

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

diff --git a/lirc.spec b/lirc.spec
index dde6576..4022876 100644
--- a/lirc.spec
+++ b/lirc.spec
@@ -1,3 +1,7 @@
+# This package depends on automagic byte compilation
+# https://fedoraproject.org/wiki/Changes/No_more_automagic_Python_bytecompilation_phase_2
+%global _python_bytecompile_extra 1
+
 %global _hardened_build 1
 %global __python %{__python3}
 

From d573cc79b43a79b7688a127b42b877e08ed4451d Mon Sep 17 00:00:00 2001
From: Igor Gnatenko <ignatenkobrain@fedoraproject.org>
Date: Mon, 28 Jan 2019 20:17:52 +0100
Subject: [PATCH 199/204] Remove obsolete Group tag

References: https://fedoraproject.org/wiki/Changes/Remove_Group_Tag
---
 lirc.spec | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/lirc.spec b/lirc.spec
index 4022876..23e5f29 100644
--- a/lirc.spec
+++ b/lirc.spec
@@ -16,7 +16,6 @@ Summary:        The Linux Infrared Remote Control package
 %global repo    http://downloads.sourceforge.net/lirc/LIRC/%{version}
 %global tarball %{name}-%{version}%{?tag:-}%{?tag}.tar.gz
 
-Group:          System Environment/Daemons
                 # lib/ciniparser* and lib/dictionary* are BSD, others GPLv2
 License:        GPLv2 and BSD
 URL:            http://www.lirc.org/
@@ -103,7 +102,6 @@ the same as installing previous versions of the lirc package.
 
 %package        libs
 Summary:        LIRC libraries
-Group:          System Environment/Libraries
 
 %description    libs
 Part of the LIRC package suite which handles IR remotes. See
@@ -131,7 +129,6 @@ LIRC configuration process.
 
 %package        devel
 Summary:        Development files for LIRC
-Group:          Development/Libraries
 Requires:       lirc-core%{?_isa} = %{version}-%{release}
 
 %description    devel
@@ -144,7 +141,6 @@ including headers and pkg-config files.
 
 %package        doc
 Summary:        LIRC documentation
-Group:          Documentation
 BuildArch:      noarch
 
 %description    doc

From 89915ebaa6a601eed5de1805962ab086b6be60e6 Mon Sep 17 00:00:00 2001
From: Fedora Release Engineering <releng@fedoraproject.org>
Date: Fri, 1 Feb 2019 08:50:32 +0000
Subject: [PATCH 200/204] - Rebuilt for
 https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild

Signed-off-by: Fedora Release Engineering <releng@fedoraproject.org>
---
 lirc.spec | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/lirc.spec b/lirc.spec
index 23e5f29..269340f 100644
--- a/lirc.spec
+++ b/lirc.spec
@@ -10,7 +10,7 @@
 
 Name:           lirc
 Version:        0.10.0
-Release:        14%{?tag:.}%{?tag}%{?dist}
+Release:        15%{?tag:.}%{?tag}%{?dist}
 Summary:        The Linux Infrared Remote Control package
 
 %global repo    http://downloads.sourceforge.net/lirc/LIRC/%{version}
@@ -384,6 +384,9 @@ systemd-tmpfiles --create %{_tmpfilesdir}/lirc.conf
 %{_udevrulesdir}/99-remote-control-lirc.rules
 
 %changelog
+* Fri Feb 01 2019 Fedora Release Engineering <releng@fedoraproject.org> - 0.10.0-15
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
+
 * Fri Oct 12 2018 Alec Leamas <leamas.alec@gmail.com> - 0.10.0-14
 - Rework patch for lirc-setup crash on startup.
 

From 6808ab32e35301773290523954fc12eb805e7104 Mon Sep 17 00:00:00 2001
From: "Jeroen van Meeuwen (Kolab Systems)" <vanmeeuwen@kolabsys.com>
Date: Sat, 9 Mar 2019 22:04:15 +0100
Subject: [PATCH 201/204] EPEL 7 Python 3.6 compatibility

---
 lirc.spec | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/lirc.spec b/lirc.spec
index 269340f..9e6d6f2 100644
--- a/lirc.spec
+++ b/lirc.spec
@@ -10,7 +10,7 @@
 
 Name:           lirc
 Version:        0.10.0
-Release:        15%{?tag:.}%{?tag}%{?dist}
+Release:        16%{?tag:.}%{?tag}%{?dist}
 Summary:        The Linux Infrared Remote Control package
 
 %global repo    http://downloads.sourceforge.net/lirc/LIRC/%{version}
@@ -45,6 +45,7 @@ BuildRequires:  libXt-devel
 BuildRequires:  portaudio-devel
 BuildRequires:  python%{python3_pkgversion}-devel
 BuildRequires:  python%{python3_pkgversion}-PyYAML
+BuildRequires:  python%{python3_pkgversion}-setuptools
 BuildRequires:  socat
 BuildRequires:  systemd-devel
 
@@ -218,10 +219,6 @@ sed -i 's/; *group=/Group=/' systemd/irexec.service
 
 sed -i -e 's|/usr/local/etc/|/etc/|' contrib/irman2lirc
 
-%if 0%{?epel} > 0
-cd python-pkg/tests; rm dummy-server lircrc.conf test_client.py
-%endif
-
 
 %build
 autoreconf -fi
@@ -384,6 +381,9 @@ systemd-tmpfiles --create %{_tmpfilesdir}/lirc.conf
 %{_udevrulesdir}/99-remote-control-lirc.rules
 
 %changelog
+* Sat Mar  9 2019 Stephen John Smoogen <smooge@gmail.com> - 0.10.0-16
+- EPEL 7 has moved forward to Python 3.6, no need for suppressing tests for < 3.5 any longer
+
 * Fri Feb 01 2019 Fedora Release Engineering <releng@fedoraproject.org> - 0.10.0-15
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
 

From 8c7968e964e5f82b54868cf5b41a3b93a0e05a20 Mon Sep 17 00:00:00 2001
From: Fedora Release Engineering <releng@fedoraproject.org>
Date: Thu, 25 Jul 2019 15:01:39 +0000
Subject: [PATCH 202/204] - Rebuilt for
 https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild

Signed-off-by: Fedora Release Engineering <releng@fedoraproject.org>
---
 lirc.spec | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/lirc.spec b/lirc.spec
index 9e6d6f2..591c076 100644
--- a/lirc.spec
+++ b/lirc.spec
@@ -10,7 +10,7 @@
 
 Name:           lirc
 Version:        0.10.0
-Release:        16%{?tag:.}%{?tag}%{?dist}
+Release:        17%{?tag:.}%{?tag}%{?dist}
 Summary:        The Linux Infrared Remote Control package
 
 %global repo    http://downloads.sourceforge.net/lirc/LIRC/%{version}
@@ -381,6 +381,9 @@ systemd-tmpfiles --create %{_tmpfilesdir}/lirc.conf
 %{_udevrulesdir}/99-remote-control-lirc.rules
 
 %changelog
+* Thu Jul 25 2019 Fedora Release Engineering <releng@fedoraproject.org> - 0.10.0-17
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
+
 * Sat Mar  9 2019 Stephen John Smoogen <smooge@gmail.com> - 0.10.0-16
 - EPEL 7 has moved forward to Python 3.6, no need for suppressing tests for < 3.5 any longer
 

From 187afb728b67de7c4dc859a428896cf438c552a1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Miro=20Hron=C4=8Dok?= <miro@hroncok.cz>
Date: Mon, 19 Aug 2019 10:19:13 +0200
Subject: [PATCH 203/204] Rebuilt for Python 3.8

---
 lirc.spec | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/lirc.spec b/lirc.spec
index 591c076..5db8c3e 100644
--- a/lirc.spec
+++ b/lirc.spec
@@ -10,7 +10,7 @@
 
 Name:           lirc
 Version:        0.10.0
-Release:        17%{?tag:.}%{?tag}%{?dist}
+Release:        18%{?tag:.}%{?tag}%{?dist}
 Summary:        The Linux Infrared Remote Control package
 
 %global repo    http://downloads.sourceforge.net/lirc/LIRC/%{version}
@@ -381,6 +381,9 @@ systemd-tmpfiles --create %{_tmpfilesdir}/lirc.conf
 %{_udevrulesdir}/99-remote-control-lirc.rules
 
 %changelog
+* Mon Aug 19 2019 Miro Hrončok <mhroncok@redhat.com> - 0.10.0-18
+- Rebuilt for Python 3.8
+
 * Thu Jul 25 2019 Fedora Release Engineering <releng@fedoraproject.org> - 0.10.0-17
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
 

From 9cf54adcb1d9973c0f567b129e24a854c92f6e9c Mon Sep 17 00:00:00 2001
From: Alec Leamas <leamas.alec@gmail.com>
Date: Wed, 21 Aug 2019 22:13:12 +0200
Subject: [PATCH 204/204] 0.10.0-19

---
 ...ins-devinput-fix-glob-no-match-error.patch | 38 +++++++++++++++++++
 ...consistent-loglevel-debug-option-307.patch | 25 ++++++++++++
 ...-use-deprecated-time.clock-RHBZ-1718.patch | 30 +++++++++++++++
 lirc.spec                                     | 12 +++++-
 4 files changed, 103 insertions(+), 2 deletions(-)
 create mode 100644 0003-plugins-devinput-fix-glob-no-match-error.patch
 create mode 100644 0005-mode2-Fix-inconsistent-loglevel-debug-option-307.patch
 create mode 100644 0006-python-pkg-Don-t-use-deprecated-time.clock-RHBZ-1718.patch

diff --git a/0003-plugins-devinput-fix-glob-no-match-error.patch b/0003-plugins-devinput-fix-glob-no-match-error.patch
new file mode 100644
index 0000000..ebcd758
--- /dev/null
+++ b/0003-plugins-devinput-fix-glob-no-match-error.patch
@@ -0,0 +1,38 @@
+From 14685b280fde85a6e801f7fb7d5e579b2ddb3581 Mon Sep 17 00:00:00 2001
+From: Ayke van Laethem <aykevanlaethem@gmail.com>
+Date: Fri, 28 Jul 2017 18:07:50 +0200
+Subject: [PATCH 3/6] plugins: devinput: fix glob "no match" error
+
+See 63e041cc5 and LIRC issue #285 (Debian: #860551)
+---
+ plugins/devinput.c | 10 +++++-----
+ 1 file changed, 5 insertions(+), 5 deletions(-)
+
+diff --git a/plugins/devinput.c b/plugins/devinput.c
+index 846a0b70..d4d733a0 100644
+--- a/plugins/devinput.c
++++ b/plugins/devinput.c
+@@ -247,15 +247,15 @@ static int locate_default_device(char* errmsg, size_t size)
+ 
+ 	r = glob("/sys/class/rc/rc0/input[0-9]*/event[0-9]*",
+ 		 0, NULL, &matches);
+-	if (r != 0) {
+-		log_perror_warn("Cannot run glob %s", DEV_PATTERN);
++	if (r == GLOB_NOMATCH) {
++		strncpy(errmsg, "No /sys/class/rc/ devices found", size - 1);
+ 		log_notice("No input device available for devinput driver."
+ 			   " Consider stopping lircd.socket or reconfigure lirc");
+-		snprintf(errmsg, size, "Cannot glob %s", DEV_PATTERN);
+ 		return 0;
+ 	}
+-	if (matches.gl_pathc == 0) {
+-		strncpy(errmsg, "No /sys/class/rc/ devices found", size - 1);
++	if (r != 0) {
++		log_perror_warn("Cannot run glob %s", DEV_PATTERN);
++		snprintf(errmsg, size, "Cannot glob %s", DEV_PATTERN);
+ 		return 0;
+ 	}
+ 	if (matches.gl_pathc > 1) {
+-- 
+2.20.1
+
diff --git a/0005-mode2-Fix-inconsistent-loglevel-debug-option-307.patch b/0005-mode2-Fix-inconsistent-loglevel-debug-option-307.patch
new file mode 100644
index 0000000..4f0f742
--- /dev/null
+++ b/0005-mode2-Fix-inconsistent-loglevel-debug-option-307.patch
@@ -0,0 +1,25 @@
+From aa2b06cff01b52666e44aae59ee56fc9092cad93 Mon Sep 17 00:00:00 2001
+From: Alec Leamas <leamas.alec@gmail.com>
+Date: Sun, 3 Sep 2017 04:21:57 +0200
+Subject: [PATCH 5/6] mode2: Fix inconsistent loglevel/debug option (#307).
+
+---
+ tools/mode2.cpp | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/tools/mode2.cpp b/tools/mode2.cpp
+index fe578f89..e962610d 100644
+--- a/tools/mode2.cpp
++++ b/tools/mode2.cpp
+@@ -74,7 +74,7 @@ static const char* const help =
+ 
+ static const struct option options[] = {
+ 	{"help",           no_argument,       NULL, 'h'},
+-	{"debug",          required_argument, NULL, 'D'},
++	{"loglevel",       required_argument, NULL, 'D'},
+ 	{"version",        no_argument,       NULL, 'v'},
+ 	{"device",         required_argument, NULL, 'd'},
+ 	{"driver",         required_argument, NULL, 'H'},
+-- 
+2.20.1
+
diff --git a/0006-python-pkg-Don-t-use-deprecated-time.clock-RHBZ-1718.patch b/0006-python-pkg-Don-t-use-deprecated-time.clock-RHBZ-1718.patch
new file mode 100644
index 0000000..87375f6
--- /dev/null
+++ b/0006-python-pkg-Don-t-use-deprecated-time.clock-RHBZ-1718.patch
@@ -0,0 +1,30 @@
+From 9d2e0a40294408764710657e78929c83f2fc0f31 Mon Sep 17 00:00:00 2001
+From: Alec Leamas <leamas.alec@gmail.com>
+Date: Wed, 21 Aug 2019 21:48:25 +0200
+Subject: [PATCH 6/6] python-pkg: Don't use deprecated time.clock() (RHBZ
+ #1718285)
+
+---
+ python-pkg/lirc/client.py | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/python-pkg/lirc/client.py b/python-pkg/lirc/client.py
+index 7e069a55..482913cf 100644
+--- a/python-pkg/lirc/client.py
++++ b/python-pkg/lirc/client.py
+@@ -219,10 +219,10 @@ class RawConnection(AbstractConnection):
+     def readline(self, timeout: float = None) -> str:
+         ''' Implements AbstractConnection.readline(). '''
+         if timeout:
+-            start = time.clock()
++            start = time.perf_counter()
+         while b'\n' not in self._buffer:
+             ready = self._select.select(
+-                start + timeout - time.clock() if timeout else timeout)
++                start + timeout - time.perf_counter() if timeout else timeout)
+             if ready == []:
+                 if timeout:
+                     raise TimeoutException(
+-- 
+2.20.1
+
diff --git a/lirc.spec b/lirc.spec
index 5db8c3e..9f87fb6 100644
--- a/lirc.spec
+++ b/lirc.spec
@@ -10,7 +10,7 @@
 
 Name:           lirc
 Version:        0.10.0
-Release:        18%{?tag:.}%{?tag}%{?dist}
+Release:        19%{?tag:.}%{?tag}%{?dist}
 Summary:        The Linux Infrared Remote Control package
 
 %global repo    http://downloads.sourceforge.net/lirc/LIRC/%{version}
@@ -24,6 +24,9 @@ Source1:        README.fedora
 Source2:        99-remote-control-lirc.rules
 Patch1:         0001-build-install-media-lirc.h-BTS-872074.patch
 Patch2:         0002-lirc-setup-Fix-crash-on-start-on-missing-lirc.config.patch
+Patch3:         0003-plugins-devinput-fix-glob-no-match-error.patch
+Patch5:         0005-mode2-Fix-inconsistent-loglevel-debug-option-307.patch
+Patch6:         0006-python-pkg-Don-t-use-deprecated-time.clock-RHBZ-1718.patch
 
 
 BuildRequires:  gcc-c++
@@ -209,7 +212,7 @@ See http://www.ftdichip.com.
 
 
 %prep
-%autosetup -n %{name}-%{version}%{?tag:-}%{?tag}
+%autosetup -p1 -n %{name}-%{version}%{?tag:-}%{?tag}
 sed -i -e 's/#effective-user/effective-user /' lirc_options.conf
 sed -i -e '/^effective-user/s/=$/= lirc/' lirc_options.conf
 sed -i '/User=/s/; *//' systemd/lircd.service
@@ -381,6 +384,11 @@ systemd-tmpfiles --create %{_tmpfilesdir}/lirc.conf
 %{_udevrulesdir}/99-remote-control-lirc.rules
 
 %changelog
+* Wed Aug 21 2019 Alec Leamas <leamas.alec@gmail.com> - 0.10.0-19
+- Fix FTBS on python 3.8. Closes: #1718285.
+- mode2: Fix inconsistent loglevel/debug option (upstream #307)
+- plugins: devinput: fix glob "no match" error (upstream #285, DBS 860551)
+
 * Mon Aug 19 2019 Miro Hrončok <mhroncok@redhat.com> - 0.10.0-18
 - Rebuilt for Python 3.8