[arch-commits] Commit in lirc/trunk (PKGBUILD lirc-0.9.1a-fix-segfault.patch)

[Lukas Fleischer]

    Date: Monday, August 18, 2014 @ 12:52:32
  Author: lfleischer
Revision: 220204

upgpkg: lirc 1:0.9.1.a-2

Fix segfault (FS#41581).

Added:
  lirc/trunk/lirc-0.9.1a-fix-segfault.patch
Modified:
  lirc/trunk/PKGBUILD

--------------------------------+
 PKGBUILD                       |    7 ++++--
 lirc-0.9.1a-fix-segfault.patch |   41 +++++++++++++++++++++++++++++++++++++++
 2 files changed, 46 insertions(+), 2 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2014-08-18 09:02:43 UTC (rev 220203)
+++ PKGBUILD	2014-08-18 10:52:32 UTC (rev 220204)
@@ -5,7 +5,7 @@
 pkgname=('lirc' 'lirc-utils')
 _pkgver=0.9.1a
 [[ $_pkgver =~ [a-z]$ ]] && pkgver="${_pkgver:0:-1}.${_pkgver: -1}" || pkgver="$_pkgver"
-pkgrel=1
+pkgrel=2
 epoch=1
 _extramodules=extramodules-3.16-ARCH
 arch=('i686' 'x86_64')
@@ -15,12 +15,14 @@
 makedepends=('help2man' 'linux>=3.16' 'linux<3.17' 'linux-headers>=3.16' 'linux-headers<3.17' 'alsa-lib' 'libx11' 'libftdi-compat' 'libirman' 'python2')
 options=('!makeflags' '!strip')
 source=("http://prdownloads.sourceforge.net/${pkgbase}/${pkgbase}-${_pkgver}.tar.bz2"
-	"wpc8769l-build-fix.patch"
+        wpc8769l-build-fix.patch
+        lirc-0.9.1a-fix-segfault.patch
         lirc.logrotate
         irexec.service
         lirc.tmpfiles)
 md5sums=('1f1fac162ed309dd50f307e96a292957'
          '9ec33169b3407f74264062d7679dd269'
+         '13bfc8dbf1a9e30f8ed21ac6c099a676'
          '3deb02604b37811d41816e9b4385fcc3'
          '32df3b9bc859565d6acf5f0e5b747083'
          'febf25c154a7d36f01159e84f26c2d9a')
@@ -29,6 +31,7 @@
   cd "${srcdir}/lirc-${_pkgver}"
 
   patch -Np1 -i "${srcdir}/wpc8769l-build-fix.patch"
+  patch -Np1 -i "${srcdir}/lirc-0.9.1a-fix-segfault.patch"
 
   sed -i '/AC_PATH_XTRA/d' configure.ac
   sed -e 's/@X_CFLAGS@//g' \

Added: lirc-0.9.1a-fix-segfault.patch
===================================================================
--- lirc-0.9.1a-fix-segfault.patch	                        (rev 0)
+++ lirc-0.9.1a-fix-segfault.patch	2014-08-18 10:52:32 UTC (rev 220204)
@@ -0,0 +1,41 @@
+commit 4a9b45822890f50c5ed36660468e0a99cd4531e0
+Author: Alec Leamas <leamas at nowhere.net>
+Date:   Mon Aug 18 10:05:44 2014 +0200
+
+    lircd: Fix bad default for lircdfile.
+
+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",
+
+commit 8459a881fd53525a47ae2f9180fa3644be5df343
+Author: Alec Leamas <leamas at nowhere.net>
+Date:   Mon Aug 18 10:00:49 2014 +0200
+
+    Fix segfault when starting lircd (AUR 41581)
+    
+    See https://bugs.archlinux.org/task/41581
+
+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