diff -Nru lirc-0.10.0/ChangeLog lirc-0.10.1/ChangeLog --- lirc-0.10.0/ChangeLog 2017-08-12 06:39:23.000000000 +0000 +++ lirc-0.10.1/ChangeLog 2017-09-10 08:52:57.000000000 +0000 @@ -1,3 +1,31 @@ +2017-09-10 Alec Leamas + + Update for 0.10.1 + +2017-09-03 Alec Leamas + + mode2: Fix inconsistent loglevel/debug option (#307). + +2017-08-31 Alec Leamas + + build: Fix make "always build all" error. + +2017-08-23 Ayke van Laethem + + plugins: devinput: fix glob "no match" error + See 63e041cc5 and LIRC issue #285 (Debian: #860551) + +2017-08-14 Alec Leamas + + 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. + 2017-08-12 Alec Leamas Update for lirc-0.10.0 diff -Nru lirc-0.10.0/config.h.in lirc-0.10.1/config.h.in --- lirc-0.10.0/config.h.in 2017-08-12 06:38:33.000000000 +0000 +++ lirc-0.10.1/config.h.in 2017-09-10 08:52:36.000000000 +0000 @@ -1,6 +1,8 @@ /* config.h.in. Generated from configure.ac by autoheader. */ +#ifndef ROOT_CONFIG_H +#define ROOT_CONFIG_H #include "paths.h" @@ -308,4 +310,5 @@ #include "lirc/lirc_config.h" +#endif // ROOT_CONFIG_H diff -Nru lirc-0.10.0/configure lirc-0.10.1/configure --- lirc-0.10.0/configure 2017-08-12 06:38:30.000000000 +0000 +++ lirc-0.10.1/configure 2017-09-10 08:52:36.000000000 +0000 @@ -1,6 +1,6 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.69 for lirc 0.10.0. +# Generated by GNU Autoconf 2.69 for lirc 0.10.1. # # # Copyright (C) 1992-1996, 1998-2012 Free Software Foundation, Inc. @@ -587,8 +587,8 @@ # Identity of this package. PACKAGE_NAME='lirc' PACKAGE_TARNAME='lirc' -PACKAGE_VERSION='0.10.0' -PACKAGE_STRING='lirc 0.10.0' +PACKAGE_VERSION='0.10.1' +PACKAGE_STRING='lirc 0.10.1' PACKAGE_BUGREPORT='' PACKAGE_URL='' @@ -1430,7 +1430,7 @@ # Omit some internal or obsolete options to make the list less imposing. # This message is too long to be a string in the A/UX 3.1 sh. cat <<_ACEOF -\`configure' configures lirc 0.10.0 to adapt to many kinds of systems. +\`configure' configures lirc 0.10.1 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1504,7 +1504,7 @@ if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of lirc 0.10.0:";; + short | recursive ) echo "Configuration of lirc 0.10.1:";; esac cat <<\_ACEOF @@ -1655,7 +1655,7 @@ test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -lirc configure 0.10.0 +lirc configure 0.10.1 generated by GNU Autoconf 2.69 Copyright (C) 2012 Free Software Foundation, Inc. @@ -2325,7 +2325,7 @@ This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. -It was created by lirc $as_me 0.10.0, which was +It was created by lirc $as_me 0.10.1, which was generated by GNU Autoconf 2.69. Invocation command line was $ $0 $@ @@ -3199,7 +3199,7 @@ # Define the identity of the package. PACKAGE='lirc' - VERSION='0.10.0' + VERSION='0.10.1' cat >>confdefs.h <<_ACEOF @@ -20504,7 +20504,7 @@ # report actual input values of CONFIG_FILES etc. instead of their # values after options handling. ac_log=" -This file was extended by lirc $as_me 0.10.0, which was +This file was extended by lirc $as_me 0.10.1, which was generated by GNU Autoconf 2.69. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -20570,7 +20570,7 @@ cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`" ac_cs_version="\\ -lirc config.status 0.10.0 +lirc config.status 0.10.1 configured by $0, generated by GNU Autoconf 2.69, with options \\"\$ac_cs_config\\" diff -Nru lirc-0.10.0/configure.ac lirc-0.10.1/configure.ac --- lirc-0.10.0/configure.ac 2017-08-12 06:37:11.000000000 +0000 +++ lirc-0.10.1/configure.ac 2017-09-10 08:52:19.000000000 +0000 @@ -1,7 +1,7 @@ dnl Process this file with autoconf to produce a configure script. dnl configure.ac, (c)1999 Tom Wheeley -AC_INIT([lirc], [0.10.0]) +AC_INIT([lirc], [0.10.1]) AC_CONFIG_SRCDIR([daemons/lircd.cpp]) AC_CONFIG_MACRO_DIR([m4]) @@ -511,11 +511,14 @@ 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 diff -Nru lirc-0.10.0/debian/changelog lirc-0.10.1/debian/changelog --- lirc-0.10.0/debian/changelog 2018-03-01 08:50:43.000000000 +0000 +++ lirc-0.10.1/debian/changelog 2019-11-22 15:02:53.000000000 +0000 @@ -1,22 +1,115 @@ -lirc (0.10.0-4yavdr1~bionic) bionic; urgency=medium +lirc (0.10.1-8yavdr0~bionic) bionic; urgency=medium - * automatic rebuild + * add experimental fix for mplay receiver control flow - -- Alexander Grothe Thu, 01 Mar 2018 08:50:43 +0000 + -- Alexander Grothe Fri, 22 Nov 2019 16:02:53 +0100 -lirc (0.10.0-4yavdr0~bionic) bionic; urgency=medium +lirc (0.10.1-7yavdr0~bionic) bionic; urgency=medium - * increase LIRCD_EXACT_GAP_THRESHOLD from 10000 to 200000 for ya_usbir - driver + * rebuild debian package for yavdr + * add patches for uinput key repitition and yausbir_send gap threshold values - -- Alexander Grothe Sun, 14 Jan 2018 09:52:02 +0000 + -- Alexander Grothe Fri, 15 Nov 2019 21:16:21 +0100 -lirc (0.10.0-3yavdr0~bionic) bionic; urgency=medium +lirc (0.10.1-6) unstable; urgency=medium - * add patch by jrie to fix lircd-uinput key repeat behaviour - https://www.vdr-portal.de/forum/index.php?thread/131458-yavdr-und-irmp-lircd-fernbedienungen-%E2%80%93-eine-grunds%C3%A4tzliche-frage/&postID=1300519#wcf73 + * Team upload + * debian/patches/lirc-gpio-ir-0.10.patch: + - fix for kernel 4.19 (Closes: #931078, 930485). - -- Alexander Grothe Sun, 14 Jan 2018 07:28:23 +0000 + -- Gianfranco Costamagna Thu, 04 Jul 2019 16:43:06 +0200 + +lirc (0.10.1-5.2) unstable; urgency=medium + + * Non-maintainer upload. + * Revert removal of liblircclient{0,-dev} (Closes: #925477) + * Revert "Do not install conffiles in a dummy location" (Closes: #925066) + + -- Tobias Frost Sat, 06 Apr 2019 15:12:52 +0200 + +lirc (0.10.1-5.1) unstable; urgency=medium + + * Non-maintainer upload + + * debian/rules + + Remove rdfind-based dedup (Closes: #919843) + Using dh_installdocs --link-docs was investigated, and rejected due to + - limited benefits; + - interactions between lirc-docs shipping files under /usr/share/doc/lirc, + but liblirc0 being the obvious candidate due to dependencies. + + + Do not install conffiles in a dummy location + dpkg will, by default, not overwrite users' conffiles, + so shipping them in a different location is superfluous. + + * Removed liblircclient{0,-dev} + They were obsolete transitional packages that predated the stretch release. + + * Rename debian/post{inst,rm} to lirc.post{inst,rm} + * debian/lirc.{postinst,prerm}: Recompile and remove Python bytecode as needed + Closes: #924158 + + * debian/control: Fix relationships on liblirc{,client}-dev. + This should be Breaks+Replaces, not Conflict+Replaces. + Using the former should ensure that upgrading from stretch works smoothly. + + * debian/changelog: Fix spelling in v0.10.1-4 + + -- Nicolas Braud-Santoni Tue, 12 Mar 2019 01:33:40 +0100 + +lirc (0.10.1-5) unstable; urgency=medium + + * Fix upstream #343, --connect parsing error. + * Add systemd-notify call -> lircd won't start with invalid config files. + * Move VCS repository (now separate from upstream). + * Fix lintian command-with-path-in-maintainer-script warning. + * Fix lintian warning for duplicate files; new rdfind(1) build dep. + + -- Alec Leamas Tue, 01 Jan 2019 09:19:01 -0500 + +lirc (0.10.1-4) unstable; urgency=medium + + [ Alec Leamas ] + * Don't use broken LOG_CONS syslog flag, closes: #872749. + + [ Pino Toscano ] + * Fix build on !linux OS, restrict systemd only to linux OS. closes: #912400 + + [ Gianfranco Costamagna ] + * Team upload + * Restrict postinst systemd calls only if systemd is installed + + [ Helmut Grohne ] + * Remove multiarch-annotation fom liblirc-dev (Closes: #874246) + + -- Alec Leamas Fri, 23 Nov 2018 23:41:01 -0500 + +lirc (0.10.1-3) unstable; urgency=medium + + * Remove links created in postinst, closes: #911548. + * Add missing Recommends: systemd. + * Fix insecure URIs in d/control vcs-git: and d/copyright Format:. + * Add rudimentary upstream/metadata. + + -- Alec Leamas Thu, 25 Oct 2018 13:05:49 -0400 + +lirc (0.10.1-2) unstable; urgency=medium + + * Team upload. + * Update maintainer email address (Closes: #899981) + + -- Gianfranco Costamagna Mon, 15 Oct 2018 18:01:50 +0200 + +lirc (0.10.1-1) unstable; urgency=medium + + * New minor upstream release. + * Add fix for lirc-setup(1) crash on startup. + * Services besides lircd.socket disabled after install. + * Bump standards-version to 4.2.1 without changes. + * Drop 0001-build... patch now upstreamed. + * Obsolete priority: extra => optional. + + -- Alec Leamas Fri, 12 Oct 2018 16:51:50 -0400 lirc (0.10.0-2) unstable; urgency=medium @@ -1631,6 +1724,3 @@ * Initial Release. -- Tom Lees Thu, 30 Mar 2000 19:30:57 +0100 - - - diff -Nru lirc-0.10.0/debian/compat lirc-0.10.1/debian/compat --- lirc-0.10.0/debian/compat 2017-08-13 07:45:34.000000000 +0000 +++ lirc-0.10.1/debian/compat 2019-03-12 00:33:40.000000000 +0000 @@ -1 +1 @@ -10 +11 diff -Nru lirc-0.10.0/debian/control lirc-0.10.1/debian/control --- lirc-0.10.0/debian/control 2017-08-13 07:45:34.000000000 +0000 +++ lirc-0.10.1/debian/control 2019-04-06 11:27:42.000000000 +0000 @@ -1,18 +1,17 @@ Source: lirc Section: utils -Priority: extra -Homepage: http://sf.net/p/lirc -Standards-Version: 4.0.1 -Maintainer: lirc Maintainer Team +Priority: optional +Homepage: https://sf.net/p/lirc +Standards-Version: 4.3.0 +Maintainer: Debian Lirc Team Uploaders: Stefan Lippers-Hollmann , Alec Leamas -Vcs-Git: git://git.code.sf.net/p/lirc/git -b debian-0.10 -Vcs-Browser: https://sourceforge.net/p/lirc/git/ci/debian-0.10/tree/ +Vcs-Git: https://gitlab.com/leamas/lirc.git +Vcs-Browser: https://gitlab.com/leamas/lirc Build-Depends: - debhelper (>= 10), + debhelper (>= 11), dh-exec, - dh-systemd, dh-python, doxygen, expect [!hurd-any], @@ -35,6 +34,7 @@ xsltproc # libjs-jquery + Package: lirc Architecture: any Depends: @@ -45,9 +45,10 @@ ${python3:Depends}, ${shlibs:Depends} Recommends: + gir1.2-vte, python3-yaml, python3-gi, - gir1.2-vte + systemd [linux-any] Suggests: lirc-compat-remotes, lirc-drv-irman, @@ -124,10 +125,10 @@ Package: liblirc-dev Architecture: any -Multi-Arch: same +#Multi-Arch: same Section: libdevel Provides: liblircclient-dev -Conflicts: liblircclient-dev (<< 0.9.1) +Breaks: liblircclient-dev (<< 0.9.1) Replaces: liblircclient-dev (<< 0.9.1) Depends: liblirc0 (= ${binary:Version}), diff -Nru lirc-0.10.0/debian/copyright lirc-0.10.1/debian/copyright --- lirc-0.10.0/debian/copyright 2017-08-13 07:45:34.000000000 +0000 +++ lirc-0.10.1/debian/copyright 2019-03-12 00:33:40.000000000 +0000 @@ -1,4 +1,4 @@ -Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/ +Format: https://www.debian.org/doc/packaging-manuals/copyright-format/1.0/ Upstream-Name: lirc Upstream-Contact: Alec Leamas Source: http://lirc.org/ diff -Nru lirc-0.10.0/debian/gbp.conf lirc-0.10.1/debian/gbp.conf --- lirc-0.10.0/debian/gbp.conf 1970-01-01 00:00:00.000000000 +0000 +++ lirc-0.10.1/debian/gbp.conf 2019-03-12 00:33:40.000000000 +0000 @@ -0,0 +1,6 @@ +[DEFAULT] + +upstream-branch = upstream +debian-branch = debian +upstream-tag = upstream/%(version)s +pristine-tar = True diff -Nru lirc-0.10.0/debian/lirc.postinst lirc-0.10.1/debian/lirc.postinst --- lirc-0.10.0/debian/lirc.postinst 1970-01-01 00:00:00.000000000 +0000 +++ lirc-0.10.1/debian/lirc.postinst 2019-03-12 00:33:40.000000000 +0000 @@ -0,0 +1,24 @@ +#!/bin/sh + +set -e + +rm -f /etc/init.d/lirc + +if which systemd-tmpfiles >/dev/null; then + systemd-tmpfiles --create /usr/lib/tmpfiles.d/lirc.conf || : +fi + +# distutils' sysconfig.get_python_lib is broken - #911038. Furthermore, the +# first iteration of this fix did not remove the links in postrm. So: +find /usr/lib/python3/dist-packages -maxdepth 1 -type l -name lirc -delete +find /usr/lib/python3/dist-packages -maxdepth 1 -type l -name lirc-setup -delete +ln -s /usr/lib/*/python*/site-packages/lirc \ + /usr/lib/python3/dist-packages +ln -s /usr/lib/*/python*/site-packages/lirc-setup \ + /usr/lib/python3/dist-packages + +# Recompile Python bytecode as needed +py3compile /usr/lib/*/python3.*/site-packages/lirc +py3compile /usr/lib/*/python3.*/site-packages/lirc-setup + +#DEBHELPER# diff -Nru lirc-0.10.0/debian/lirc.postrm lirc-0.10.1/debian/lirc.postrm --- lirc-0.10.0/debian/lirc.postrm 1970-01-01 00:00:00.000000000 +0000 +++ lirc-0.10.1/debian/lirc.postrm 2019-03-12 00:33:40.000000000 +0000 @@ -0,0 +1,16 @@ +#!/bin/sh + +set -e + +if test "$1" = 'purge'; then + for f in lircd.conf lircmd.conf irexec.lircrc lirc_options.conf; do + rm -f /etc/lirc/$f; + done || : + find /etc/lirc -type d -empty -delete || : + rm -f /usr/lib/python3/dist-packages/lirc + rm -f /usr/lib/python3/dist-packages/lirc-setup +fi + + +#DEBHELPER# + diff -Nru lirc-0.10.0/debian/lirc.prerm lirc-0.10.1/debian/lirc.prerm --- lirc-0.10.0/debian/lirc.prerm 1970-01-01 00:00:00.000000000 +0000 +++ lirc-0.10.1/debian/lirc.prerm 2019-03-12 00:33:40.000000000 +0000 @@ -0,0 +1,8 @@ +#!/bin/sh +set -e + +# Remove Python bytecode as needed +py3clean -p lirc + + +#DEBHELPER# diff -Nru lirc-0.10.0/debian/patches/0001-build-install-media-lirc.h-BTS-872074.patch lirc-0.10.1/debian/patches/0001-build-install-media-lirc.h-BTS-872074.patch --- lirc-0.10.0/debian/patches/0001-build-install-media-lirc.h-BTS-872074.patch 2017-08-13 07:45:34.000000000 +0000 +++ lirc-0.10.1/debian/patches/0001-build-install-media-lirc.h-BTS-872074.patch 1970-01-01 00:00:00.000000000 +0000 @@ -1,60 +0,0 @@ -From 11e1e9ee6b353c6e7c68f92f89c49d52f396cfc7 Mon Sep 17 00:00:00 2001 -From: Alec Leamas -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 -Nru lirc-0.10.0/debian/patches/0001-lirc.org-Remove-non-free-advertising.patch lirc-0.10.1/debian/patches/0001-lirc.org-Remove-non-free-advertising.patch --- lirc-0.10.0/debian/patches/0001-lirc.org-Remove-non-free-advertising.patch 2017-08-13 07:45:34.000000000 +0000 +++ lirc-0.10.1/debian/patches/0001-lirc.org-Remove-non-free-advertising.patch 2019-03-12 00:33:40.000000000 +0000 @@ -1,6 +1,6 @@ -Author: Alec Leamas +From: Alec Leamas Date: Tue, 6 Oct 2015 01:56:21 +0200 -Description: lirc.org: Remove non-free advertising. +Subject: lirc.org: Remove non-free advertising. --- doc/lirc.org/index.html | 14 -------------- @@ -9,9 +9,11 @@ doc/lirc.org/transmitters.html | 14 -------------- 4 files changed, 56 deletions(-) +diff --git a/doc/lirc.org/index.html b/doc/lirc.org/index.html +index caa8ae9..0dd9619 100644 --- a/doc/lirc.org/index.html +++ b/doc/lirc.org/index.html -@@ -395,20 +395,6 @@ +@@ -435,20 +435,6 @@ the complete list in the left pane.


@@ -32,6 +34,8 @@
+diff --git a/doc/lirc.org/parallel.html b/doc/lirc.org/parallel.html +index f4695f8..27a75fb 100644 --- a/doc/lirc.org/parallel.html +++ b/doc/lirc.org/parallel.html @@ -32,20 +32,6 @@ @@ -55,6 +59,8 @@

+diff --git a/doc/lirc.org/receivers.html b/doc/lirc.org/receivers.html +index 9dced54..c3a4134 100644 --- a/doc/lirc.org/receivers.html +++ b/doc/lirc.org/receivers.html @@ -34,20 +34,6 @@ @@ -78,6 +84,8 @@

+diff --git a/doc/lirc.org/transmitters.html b/doc/lirc.org/transmitters.html +index 4810f2c..60e886e 100644 --- a/doc/lirc.org/transmitters.html +++ b/doc/lirc.org/transmitters.html @@ -31,20 +31,6 @@ diff -Nru lirc-0.10.0/debian/patches/0002-lirc-setup-Fix-crash-on-start-on-missing-lirc.config.patch lirc-0.10.1/debian/patches/0002-lirc-setup-Fix-crash-on-start-on-missing-lirc.config.patch --- lirc-0.10.0/debian/patches/0002-lirc-setup-Fix-crash-on-start-on-missing-lirc.config.patch 1970-01-01 00:00:00.000000000 +0000 +++ lirc-0.10.1/debian/patches/0002-lirc-setup-Fix-crash-on-start-on-missing-lirc.config.patch 2019-03-12 00:33:40.000000000 +0000 @@ -0,0 +1,20 @@ +From: Alec Leamas +Date: Fri, 12 Oct 2018 20:49:58 +0200 +Subject: [PATCH] lirc-setup: Fix crash on start on missing lirc.config. + +--- + Makefile.am | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/Makefile.am b/Makefile.am +index 9f3dd14..7eeb1cf 100644 +--- a/Makefile.am ++++ b/Makefile.am +@@ -80,6 +80,7 @@ py_PYTHON = python-pkg/lirc/__init__.py \ + python-pkg/lirc/database.py \ + python-pkg/lirc/paths.py + ++nodist_py_PYTHON = python-pkg/lirc/config.py + nodist_py_pkg_PYTHON = python-pkg/lirc/config.py + + if HAVE_PYTHON35 diff -Nru lirc-0.10.0/debian/patches/0003-logging-Don-t-use-broken-LOG_CONS-syslog-flag.patch lirc-0.10.1/debian/patches/0003-logging-Don-t-use-broken-LOG_CONS-syslog-flag.patch --- lirc-0.10.0/debian/patches/0003-logging-Don-t-use-broken-LOG_CONS-syslog-flag.patch 1970-01-01 00:00:00.000000000 +0000 +++ lirc-0.10.1/debian/patches/0003-logging-Don-t-use-broken-LOG_CONS-syslog-flag.patch 2019-03-12 00:33:40.000000000 +0000 @@ -0,0 +1,24 @@ +From: Alec Leamas +Date: Fri, 23 Nov 2018 23:04:35 -0500 +Subject: [PATCH] logging: Don't use broken LOG_CONS syslog flag. + +--- + lib/lirc_log.c | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/lib/lirc_log.c b/lib/lirc_log.c +index bea357b..900beb3 100644 +--- a/lib/lirc_log.c ++++ b/lib/lirc_log.c +@@ -102,9 +102,9 @@ int lirc_log_open(const char* _progname, int _nodaemon, loglevel_t level) + + if (use_syslog) { + if (nodaemon) +- openlog(syslogident, LOG_CONS | LOG_PID | LOG_PERROR, LOG_LOCAL0); ++ openlog(syslogident, LOG_PID | LOG_PERROR, LOG_LOCAL0); + else +- openlog(syslogident, LOG_CONS | LOG_PID, LOG_LOCAL0); ++ openlog(syslogident, LOG_PID, LOG_LOCAL0); + } else { + lf = fopen(logfile, "a"); + if (lf == NULL) { diff -Nru lirc-0.10.0/debian/patches/0004-lircd-Fix-connect-option-parsing-error-343.patch lirc-0.10.1/debian/patches/0004-lircd-Fix-connect-option-parsing-error-343.patch --- lirc-0.10.0/debian/patches/0004-lircd-Fix-connect-option-parsing-error-343.patch 1970-01-01 00:00:00.000000000 +0000 +++ lirc-0.10.1/debian/patches/0004-lircd-Fix-connect-option-parsing-error-343.patch 2019-03-12 00:33:40.000000000 +0000 @@ -0,0 +1,22 @@ +From: Alec Leamas +Date: Sun, 30 Dec 2018 21:26:15 +0100 +Subject: [PATCH] lircd: Fix --connect option parsing error (#343). + +Bug: https://sourceforge.net/p/lirc/tickets/343/ +--- + daemons/lircd.cpp | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/daemons/lircd.cpp b/daemons/lircd.cpp +index d5be708..ad8dde9 100644 +--- a/daemons/lircd.cpp ++++ b/daemons/lircd.cpp +@@ -790,7 +790,7 @@ int add_peer_connection(const char* server_arg) + struct servent* service; + char server[strlen(server_arg) + 1]; + +- strncpy(server, server_arg, sizeof(server) - 1); ++ strncpy(server, server_arg, sizeof(server)); + + if (peern < MAX_PEERS) { + peers[peern] = (struct peer_connection*) malloc(sizeof( diff -Nru lirc-0.10.0/debian/patches/0005-systemd-support-Notify-systemd-on-successful-startup.patch lirc-0.10.1/debian/patches/0005-systemd-support-Notify-systemd-on-successful-startup.patch --- lirc-0.10.0/debian/patches/0005-systemd-support-Notify-systemd-on-successful-startup.patch 1970-01-01 00:00:00.000000000 +0000 +++ lirc-0.10.1/debian/patches/0005-systemd-support-Notify-systemd-on-successful-startup.patch 2019-03-12 00:33:40.000000000 +0000 @@ -0,0 +1,43 @@ +From: William Manley +Date: Thu, 9 Aug 2018 18:26:44 +0100 +Subject: [PATCH] systemd support: Notify systemd on successful startup + +This allows systemd to detect the case where we've failed to startup +due to a failure to parse our config files. + +Origin: upstream, https://sourceforge.net/p/lirc/git/ci/b78df9b2950cf4 +Applied-Upstream: 0.11.0 +--- + daemons/lircd.cpp | 5 +++++ + systemd/lircd.service | 2 +- + 2 files changed, 6 insertions(+), 1 deletion(-) + +diff --git a/daemons/lircd.cpp b/daemons/lircd.cpp +index ad8dde9..f559b62 100644 +--- a/daemons/lircd.cpp ++++ b/daemons/lircd.cpp +@@ -2469,6 +2469,11 @@ int main(int argc, char** argv) + if (!nodaemon) + daemonize(); + ++#ifdef HAVE_SYSTEMD ++ /* Tell systemd that we started up correctly */ ++ sd_notify(0, "READY=1"); ++#endif ++ + loop(); + + /* never reached */ +diff --git a/systemd/lircd.service b/systemd/lircd.service +index 7f75805..6af049b 100644 +--- a/systemd/lircd.service ++++ b/systemd/lircd.service +@@ -6,7 +6,7 @@ Wants=lircd-setup.service + After=network.target lircd-setup.service + + [Service] +-Type=simple ++Type=notify + ExecStart=/usr/sbin/lircd --nodaemon + ; User=lirc + ; Group=lirc diff -Nru lirc-0.10.0/debian/patches/fix_mplay.patch lirc-0.10.1/debian/patches/fix_mplay.patch --- lirc-0.10.0/debian/patches/fix_mplay.patch 1970-01-01 00:00:00.000000000 +0000 +++ lirc-0.10.1/debian/patches/fix_mplay.patch 2019-11-22 15:01:14.000000000 +0000 @@ -0,0 +1,83 @@ +--- a/plugins/mplay.c ++++ b/plugins/mplay.c +@@ -679,7 +679,6 @@ + char device[128]; + char* separator; + int nowheel = 0; +- int result = 1; + + log_trace("Entering mplayfamily_init()"); + +@@ -701,52 +700,50 @@ + /* Creation of pipe between this driver and LIRC framework */ + if (!nowheel && pipe(mplayfamily_local_data.pipefd) == -1) { + log_error("Could not create pipe"); +- result = 0; ++ goto error; + } + /* Creation of a lock file for serial port */ +- else if (!tty_create_lock(device)) { ++ if (!tty_create_lock(device)) { + log_error("Could not create lock file for '%s'", device); +- result = 0; ++ goto error; + } + /* Try to open serial port */ +- else if (result == 1) { +- mplayfamily_local_data.fd = +- open(device, O_RDWR | O_NONBLOCK | O_NOCTTY); +- if (mplayfamily_local_data.fd < 0) { +- log_error("Could not open serial port '%s'", device); +- result = 0; +- } ++ mplayfamily_local_data.fd = open(device, O_RDWR | O_NONBLOCK | O_NOCTTY); ++ if (mplayfamily_local_data.fd < 0) { ++ log_error("Could not open serial port '%s'", device); ++ goto error; + } + /* Serial port configuration */ +- else if (!tty_reset(mplayfamily_local_data.fd) || ++ if (!tty_reset(mplayfamily_local_data.fd) || + !tty_setbaud(mplayfamily_local_data.fd, baud)) { + log_error("Couldn't configure serial port '%s'", + device); +- result = 0; ++ goto error; + } + /* Initialise a receiver of the mplay family */ +- else if (!init_receiver()) { ++ if (!init_receiver()) { + log_error("Could not initialise device"); +- result = 0; ++ goto error; + } + /* Install serial port listener */ +- else if (!nowheel && pthread_create(&mplayfamily_local_data.tid, NULL, ++ if (!nowheel && pthread_create(&mplayfamily_local_data.tid, NULL, + mplayfamily_listen, NULL)) { + log_error("Could not create \"listener thread\""); +- return 0; ++ goto error; + } ++ goto success; + ++error: + /* Clean up if an error has occured */ +- if (result == 0) { +- log_perror_err("mplayfamily_init()"); +- mplayfamily_deinit(); +- } +- ++ log_perror_err("mplayfamily_init()"); ++ mplayfamily_deinit(); ++ return 0; ++success: + /* Redirect reads from serial port to pipe if wheel should be + * supported */ + drv.fd = nowheel ? mplayfamily_local_data.fd + : mplayfamily_local_data.pipefd[0]; +- return result; ++ return 1; + } + + /** diff -Nru lirc-0.10.0/debian/patches/lirc-gpio-ir-0.10.patch lirc-0.10.1/debian/patches/lirc-gpio-ir-0.10.patch --- lirc-0.10.0/debian/patches/lirc-gpio-ir-0.10.patch 1970-01-01 00:00:00.000000000 +0000 +++ lirc-0.10.1/debian/patches/lirc-gpio-ir-0.10.patch 2019-07-04 14:43:06.000000000 +0000 @@ -0,0 +1,178 @@ +Origin: https://github.com/neuralassembly/raspi/blob/master/lirc-gpio-ir-0.10.patch +Bug-Debian: bugs.debian.org/931078 + +diff -ruN lirc-0.10.1.orig/lib/config_file.c lirc-0.10.1/lib/config_file.c +--- lirc-0.10.1.orig/lib/config_file.c 2017-09-10 17:52:19.000000000 +0900 ++++ lirc-0.10.1/lib/config_file.c 2019-06-26 00:39:45.734320696 +0900 +@@ -71,7 +71,7 @@ + typedef void* (*array_guest_func)(void* item, void* arg); + + +-#define LINE_LEN 1024 ++#define LINE_LEN 4096 + #define MAX_INCLUDES 10 + + const char* whitespace = " \t"; +diff -ruN lirc-0.10.1.orig/lib/ir_remote.h lirc-0.10.1/lib/ir_remote.h +--- lirc-0.10.1.orig/lib/ir_remote.h 2017-09-10 17:52:19.000000000 +0900 ++++ lirc-0.10.1/lib/ir_remote.h 2019-06-26 00:39:45.714321224 +0900 +@@ -110,12 +110,17 @@ + + static inline int is_pulse(lirc_t data) + { +- return data & PULSE_BIT ? 1 : 0; ++ return ((data & LIRC_MODE2_MASK)==LIRC_MODE2_PULSE) ? 1 : 0; + } + + static inline int is_space(lirc_t data) + { +- return !is_pulse(data); ++ return ((data & LIRC_MODE2_MASK)==LIRC_MODE2_SPACE) ? 1 : 0; ++} ++ ++static inline int is_timeout(lirc_t data) ++{ ++ return ((data & LIRC_MODE2_MASK)==LIRC_MODE2_TIMEOUT) ? 1 : 0; + } + + static inline int has_repeat(const struct ir_remote* remote) +diff -ruN lirc-0.10.1.orig/lib/irrecord.c lirc-0.10.1/lib/irrecord.c +--- lirc-0.10.1.orig/lib/irrecord.c 2017-09-10 17:52:19.000000000 +0900 ++++ lirc-0.10.1/lib/irrecord.c 2019-06-26 00:39:45.724320960 +0900 +@@ -1398,9 +1398,16 @@ + state->retval = 0; + return STS_LEN_TIMEOUT; + } ++ if (is_timeout(state->data)) { ++ return STS_LEN_AGAIN; ++ } + state->count++; + if (state->mode == MODE_GET_GAP) { +- state->sum += state->data & PULSE_MASK; ++ if (state->sum != 0 || is_pulse(state->data)) { ++ state->sum += state->data & PULSE_MASK; ++ }else{ ++ return STS_LEN_AGAIN; ++ } + if (state->average == 0 && is_space(state->data)) { + if (state->data > 100000) { + state->sum = 0; +@@ -1472,6 +1479,10 @@ + state->keypresses = lastmaxcount; + return STS_LEN_AGAIN; + } else if (state->mode == MODE_HAVE_GAP) { ++ if (state->count==1 && is_space(state->data)) { ++ state->count = 0; ++ return STS_LEN_AGAIN; ++ } + if (state->count <= MAX_SIGNALS) { + signals[state->count - 1] = state->data & PULSE_MASK; + } else { +@@ -1510,7 +1521,7 @@ + /* such long pulses may appear with + * crappy hardware (receiver? / remote?) + */ +- else { ++ else if(is_pulse(state->data)) { + remote->gap = 0; + return STS_LEN_NO_GAP_FOUND; + } +@@ -1811,22 +1822,24 @@ + + static int raw_data_ok(struct button_state* btn_state) + { +- int r; ++ int r = 0; + int ref; + +- if (!is_space(btn_state->data)) { ++ if (is_pulse(btn_state->data)) { + r = 0; +- } else if (is_const(&remote)) { +- if (remote.gap > btn_state->sum) { +- ref = (remote.gap - btn_state->sum); +- ref *= (100 - remote.eps); +- ref /= 100; ++ } else if (is_space(btn_state->data)) { ++ if (is_const(&remote)) { ++ if (remote.gap > btn_state->sum) { ++ ref = (remote.gap - btn_state->sum); ++ ref *= (100 - remote.eps); ++ ref /= 100; ++ } else { ++ ref = 0; ++ } ++ r = btn_state->data > ref; + } else { +- ref = 0; ++ r = btn_state->data > (remote.gap * (100 - remote.eps)) / 100; + } +- r = btn_state->data > ref; +- } else { +- r = btn_state->data > (remote.gap * (100 - remote.eps)) / 100; + } + return r; + } +@@ -1970,7 +1983,7 @@ + btn_state->data = remote.gap; + } + if (btn_state->count == 0) { +- if (!is_space(btn_state->data) ++ if (is_pulse(btn_state->data) + || btn_state->data < + remote.gap - remote.gap * remote.eps / + 100) { +diff -ruN lirc-0.10.1.orig/lib/lirc/ir_remote.h lirc-0.10.1/lib/lirc/ir_remote.h +--- lirc-0.10.1.orig/lib/lirc/ir_remote.h 2017-09-10 17:52:58.000000000 +0900 ++++ lirc-0.10.1/lib/lirc/ir_remote.h 2019-06-26 00:39:45.724320960 +0900 +@@ -110,12 +110,17 @@ + + static inline int is_pulse(lirc_t data) + { +- return data & PULSE_BIT ? 1 : 0; ++ return ((data & LIRC_MODE2_MASK)==LIRC_MODE2_PULSE) ? 1 : 0; + } + + static inline int is_space(lirc_t data) + { +- return !is_pulse(data); ++ return ((data & LIRC_MODE2_MASK)==LIRC_MODE2_SPACE) ? 1 : 0; ++} ++ ++static inline int is_timeout(lirc_t data) ++{ ++ return ((data & LIRC_MODE2_MASK)==LIRC_MODE2_TIMEOUT) ? 1 : 0; + } + + static inline int has_repeat(const struct ir_remote* remote) +diff -ruN lirc-0.10.1.orig/tools/mode2.cpp lirc-0.10.1/tools/mode2.cpp +--- lirc-0.10.1.orig/tools/mode2.cpp 2017-09-10 17:52:19.000000000 +0900 ++++ lirc-0.10.1/tools/mode2.cpp 2019-06-26 00:45:38.840404976 +0900 +@@ -326,12 +326,24 @@ + void print_mode2_data(unsigned int data) + { + static int bitno = 1; ++ static bool leading_space = true; ++ unsigned int msg = data & LIRC_MODE2_MASK; + + switch (opt_dmode) { + case 0: +- printf("%s %u\n", ( +- data & PULSE_BIT) ? "pulse" : "space", +- (uint32_t)(data & PULSE_MASK)); ++ if (leading_space && msg == LIRC_MODE2_SPACE ) { ++ break; ++ } else { ++ leading_space = false; ++ } ++ if (msg == LIRC_MODE2_PULSE) { ++ printf("pulse %u\n", (__u32)(data & PULSE_MASK)); ++ } else if (msg == LIRC_MODE2_SPACE) { ++ printf("space %u\n", (__u32)(data & PULSE_MASK)); ++ } else if (msg == LIRC_MODE2_TIMEOUT) { ++ printf("timeout %u\n", (__u32)(data & PULSE_MASK)); ++ leading_space = true; ++ } + break; + case 1: { + /* print output like irrecord raw config file data */ diff -Nru lirc-0.10.0/debian/patches/series lirc-0.10.1/debian/patches/series --- lirc-0.10.0/debian/patches/series 2018-01-14 09:51:00.000000000 +0000 +++ lirc-0.10.1/debian/patches/series 2019-11-22 14:54:52.000000000 +0000 @@ -1,4 +1,9 @@ 0001-lirc.org-Remove-non-free-advertising.patch -0001-build-install-media-lirc.h-BTS-872074.patch -lircd-uinput.cpp.diff +0002-lirc-setup-Fix-crash-on-start-on-missing-lirc.config.patch +0003-logging-Don-t-use-broken-LOG_CONS-syslog-flag.patch +0004-lircd-Fix-connect-option-parsing-error-343.patch +0005-systemd-support-Notify-systemd-on-successful-startup.patch +lirc-gpio-ir-0.10.patch yausbir_gap_threshold.patch +lircd-uinput.cpp.diff +fix_mplay.patch diff -Nru lirc-0.10.0/debian/postinst lirc-0.10.1/debian/postinst --- lirc-0.10.0/debian/postinst 2017-08-13 07:45:34.000000000 +0000 +++ lirc-0.10.1/debian/postinst 1970-01-01 00:00:00.000000000 +0000 @@ -1,14 +0,0 @@ -#!/bin/sh - -set -e - -rm -f /etc/init.d/lirc - -systemd-tmpfiles --create /usr/lib/tmpfiles.d/lirc.conf || : - -for f in lircd.conf lircmd.conf irexec.lircrc lirc_options.conf; do - test -e /etc/lirc/$f || cp /etc/lirc/${f}.dist /etc/lirc/$f || : -done - - -#DEBHELPER# diff -Nru lirc-0.10.0/debian/postrm lirc-0.10.1/debian/postrm --- lirc-0.10.0/debian/postrm 2017-05-19 14:57:42.000000000 +0000 +++ lirc-0.10.1/debian/postrm 1970-01-01 00:00:00.000000000 +0000 @@ -1,14 +0,0 @@ -#!/bin/sh - -set -e - -if test "$1" = 'purge'; then - for f in lircd.conf lircmd.conf irexec.lircrc lirc_options.conf; do - rm -f /etc/lirc/$f; - done || : - find /etc/lirc -type d -empty -delete || : -fi - - -#DEBHELPER# - diff -Nru lirc-0.10.0/debian/rules lirc-0.10.1/debian/rules --- lirc-0.10.0/debian/rules 2017-08-13 07:45:34.000000000 +0000 +++ lirc-0.10.1/debian/rules 2019-04-06 12:56:02.000000000 +0000 @@ -6,11 +6,10 @@ export DEB_LDFLAGS_MAINT_APPEND = -Wl,--as-needed %: - dh $@ --with python3,systemd + dh $@ --with python3 override_dh_clean: dh_clean - touch python-pkg/lirc/config.py override_dh_autoreconf: dh_autoreconf $(CURDIR)/autogen.sh @@ -31,16 +30,14 @@ dh_shlibdeps -l $(CURDIR)/debian/tmp/usr/lib/*/lirc/plugins override_dh_auto_install: - $(MAKE) V=0 DESTDIR=$(CURDIR)/debian/tmp \ - pythondir='$$(libdir)/python3/dist-packages' \ - install + $(MAKE) V=0 DESTDIR=$(CURDIR)/debian/tmp install py3clean debian/tmp find debian/tmp -name *.la -delete rm -f debian/tmp/usr/share/doc/lirc/lirc.org/api-docs/api-docs chmod 755 debian/tmp/usr/share/lirc/python-pkg/lirc/lirctool ifeq ($(DEB_BUILD_ARCH_OS), linux) mkdir -p debian/tmp/usr/lib/tmpfiles.d - echo "d /var/run/lirc 0755 root root 10d" \ + echo "d /run/lirc 0755 root root 10d" \ > debian/tmp/usr/lib/tmpfiles.d/lirc.conf endif # Temporary postinstall 0.9.4 script. @@ -64,9 +61,14 @@ esac endif - -override_dh_systemd_enable: - dh_systemd_enable --name=lircd +override_dh_installsystemd: +ifeq ($(DEB_BUILD_ARCH_OS), linux) + dh_installsystemd -p lirc lircd.socket + dh_installsystemd -p lirc --no-enable --no-start lircd.service + dh_installsystemd -p lirc --no-enable --no-start irexec.service + dh_installsystemd -p lirc --no-enable --no-start lircmd.service + dh_installsystemd -p lirc --no-enable --no-start lircd-uinput.service +endif override_dh_install: dh_install --fail-missing diff -Nru lirc-0.10.0/debian/upstream/metadata lirc-0.10.1/debian/upstream/metadata --- lirc-0.10.0/debian/upstream/metadata 1970-01-01 00:00:00.000000000 +0000 +++ lirc-0.10.1/debian/upstream/metadata 2019-03-12 00:33:40.000000000 +0000 @@ -0,0 +1,7 @@ +--- +Bug-Database: https://sourceforge.net/p/lirc/tickets/ +Bug-Submit: hhttps://sourceforge.net/p/lirc/tickets/new/ +Documentation: http://lirc.org/html/index.html +Name: LIRC +Repository: https://git.code.sf.net/p/lirc/git +Repository-Browse: https://sourceforge.net/p/lirc/git/ci/master Binary files /tmp/tmpq5lHDj/c2oOqKDJHF/lirc-0.10.0/doc/api-docs.tar.gz and /tmp/tmpq5lHDj/9ikT3Ci2Lq/lirc-0.10.1/doc/api-docs.tar.gz differ diff -Nru lirc-0.10.0/doc/lirc.org/index.html lirc-0.10.1/doc/lirc.org/index.html --- lirc-0.10.0/doc/lirc.org/index.html 2017-08-12 06:37:11.000000000 +0000 +++ lirc-0.10.1/doc/lirc.org/index.html 2017-09-10 08:52:19.000000000 +0000 @@ -96,7 +96,7 @@

  • The latest version of LIRC can be downloaded from - + SourceForge
  • Other, unmaintained programs such as xrc and xirw as well as older LIRC version can also be found on @@ -456,6 +456,12 @@

    • + [10-Sep 2017] +

      + lirc-0.10.1 released. +

      +
      • +
    • [12-Aug 2017]

      lirc-0.10.0 released. diff -Nru lirc-0.10.0/lib/Makefile.am lirc-0.10.1/lib/Makefile.am --- lirc-0.10.0/lib/Makefile.am 2017-08-12 06:37:11.000000000 +0000 +++ lirc-0.10.1/lib/Makefile.am 2017-09-10 08:52:19.000000000 +0000 @@ -128,7 +128,7 @@ config.h: ../config.h -cp $? $@ -lirc/config.h: ../config.h lirc +lirc/config.h: ../config.h | lirc -cp ../config.h $@ ../paths.h: .phony @@ -137,7 +137,7 @@ paths.h: ../paths.h -cp $? $@ -lirc/paths.h: ../paths.h lirc +lirc/paths.h: ../paths.h | lirc -cp ../paths.h $@ @@ -145,7 +145,7 @@ input_map.inc: lirc/input_map.inc -lirc/input_map.inc: lirc +lirc/input_map.inc: | lirc PYTHON=$(PYTHON) $(top_srcdir)/tools/lirc-make-devinput \ -i $(DEVINPUT_HEADER) > input_map.inc PYTHON=$(PYTHON) $(top_srcdir)/tools/lirc-make-devinput \ diff -Nru lirc-0.10.0/lib/Makefile.in lirc-0.10.1/lib/Makefile.in --- lirc-0.10.0/lib/Makefile.in 2017-08-12 06:38:37.000000000 +0000 +++ lirc-0.10.1/lib/Makefile.in 2017-09-10 08:52:38.000000000 +0000 @@ -968,7 +968,7 @@ config.h: ../config.h -cp $? $@ -lirc/config.h: ../config.h lirc +lirc/config.h: ../config.h | lirc -cp ../config.h $@ ../paths.h: .phony @@ -977,14 +977,14 @@ paths.h: ../paths.h -cp $? $@ -lirc/paths.h: ../paths.h lirc +lirc/paths.h: ../paths.h | lirc -cp ../paths.h $@ input_map.lo: lirc/input_map.inc input_map.inc: lirc/input_map.inc -lirc/input_map.inc: lirc +lirc/input_map.inc: | lirc PYTHON=$(PYTHON) $(top_srcdir)/tools/lirc-make-devinput \ -i $(DEVINPUT_HEADER) > input_map.inc PYTHON=$(PYTHON) $(top_srcdir)/tools/lirc-make-devinput \ diff -Nru lirc-0.10.0/lirc-driver.pc lirc-0.10.1/lirc-driver.pc --- lirc-0.10.0/lirc-driver.pc 2017-08-12 06:39:08.000000000 +0000 +++ lirc-0.10.1/lirc-driver.pc 2017-09-10 08:52:56.000000000 +0000 @@ -1,6 +1,6 @@ Name: lirc Description: LIRC Linux Infrared Control userspace driver lib. -Version: 0.10.0 +Version: 0.10.1 PACKAGE_TARNAME=lirc prefix=/usr/local diff -Nru lirc-0.10.0/lirc.pc lirc-0.10.1/lirc.pc --- lirc-0.10.0/lirc.pc 2017-08-12 06:39:08.000000000 +0000 +++ lirc-0.10.1/lirc.pc 2017-09-10 08:52:56.000000000 +0000 @@ -1,6 +1,6 @@ Name: lirc Description: LIRC Linux Infrared Control client libs. -Version: 0.10.0 +Version: 0.10.1 prefix=/usr/local datarootdir=${prefix}/share diff -Nru lirc-0.10.0/Makefile.am lirc-0.10.1/Makefile.am --- lirc-0.10.0/Makefile.am 2017-08-12 06:37:11.000000000 +0000 +++ lirc-0.10.1/Makefile.am 2017-09-10 08:52:19.000000000 +0000 @@ -138,12 +138,15 @@ $(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 -Nru lirc-0.10.0/Makefile.in lirc-0.10.1/Makefile.in --- lirc-0.10.0/Makefile.in 2017-08-12 06:38:36.000000000 +0000 +++ lirc-0.10.1/Makefile.in 2017-09-10 08:52:38.000000000 +0000 @@ -1583,12 +1583,15 @@ $(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 -Nru lirc-0.10.0/NEWS lirc-0.10.1/NEWS --- lirc-0.10.0/NEWS 2017-08-12 06:37:11.000000000 +0000 +++ lirc-0.10.1/NEWS 2017-09-10 08:52:19.000000000 +0000 @@ -1,3 +1,9 @@ +0.10.1 10/9/17 + * mode2: Fix inconsistent loglevel/debug option (#307). + * build: install media/lirc.h (Debian BTS #872074). + * build: Fix make "always build all" error - c6eb8ec. + * plugins: devinput: Fix glob "no match" error - 14685b2. + 0.10.0 12/8/17 * lib/curl_poll.h: Fix header guard build error on müsl libc. * Build: Mute libtool when V=0, typo. diff -Nru lirc-0.10.0/plugins/devinput.c lirc-0.10.1/plugins/devinput.c --- lirc-0.10.0/plugins/devinput.c 2017-08-12 06:37:11.000000000 +0000 +++ lirc-0.10.1/plugins/devinput.c 2017-09-10 08:52:19.000000000 +0000 @@ -247,15 +247,15 @@ 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) { diff -Nru lirc-0.10.0/README lirc-0.10.1/README --- lirc-0.10.0/README 2017-08-12 06:37:11.000000000 +0000 +++ lirc-0.10.1/README 2017-09-10 08:52:19.000000000 +0000 @@ -14,7 +14,7 @@ Updated versions of lirc is available using the website http://lirc.org. -## Last version: 0.10.0 +## Last version: 0.10.1 ## Build and install. diff -Nru lirc-0.10.0/tools/mode2.cpp lirc-0.10.1/tools/mode2.cpp --- lirc-0.10.0/tools/mode2.cpp 2017-08-12 06:37:11.000000000 +0000 +++ lirc-0.10.1/tools/mode2.cpp 2017-09-10 08:52:19.000000000 +0000 @@ -74,7 +74,7 @@ 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'}, diff -Nru lirc-0.10.0/VERSION lirc-0.10.1/VERSION --- lirc-0.10.0/VERSION 2017-08-12 06:39:36.000000000 +0000 +++ lirc-0.10.1/VERSION 2017-09-10 08:53:08.000000000 +0000 @@ -1,4 +1,4 @@ -VERSION="0.10.0" -COMMIT="7efa739" -DATE="Sat Aug 12 08:35:20 2017 +0200" -REFS=" (HEAD -> release, tag: lirc-0.10.0, origin/release-0.10, origin/release, origin/HEAD)" +VERSION="0.10.1" +COMMIT="f180410" +DATE="Sun Sep 10 10:51:24 2017 +0200" +REFS=" (HEAD -> release-0.10, origin/release-0.10, origin/HEAD)"