[arch-commits] Commit in lirc/trunk (3 files)
Lukas Fleischer
lfleischer at archlinux.org
Wed Aug 20 09:20:55 UTC 2014
Date: Wednesday, August 20, 2014 @ 11:20:55
Author: lfleischer
Revision: 220265
upgpkg: lirc 1:0.9.1.a-3
Fix another segfault.
Added:
lirc/trunk/lirc-0.9.1a-fix-segfaults.patch
Modified:
lirc/trunk/PKGBUILD
Deleted:
lirc/trunk/lirc-0.9.1a-fix-segfault.patch
---------------------------------+
PKGBUILD | 8 +--
lirc-0.9.1a-fix-segfault.patch | 41 -------------------
lirc-0.9.1a-fix-segfaults.patch | 79 ++++++++++++++++++++++++++++++++++++++
3 files changed, 83 insertions(+), 45 deletions(-)
Modified: PKGBUILD
===================================================================
--- PKGBUILD 2014-08-20 08:32:35 UTC (rev 220264)
+++ PKGBUILD 2014-08-20 09:20:55 UTC (rev 220265)
@@ -5,7 +5,7 @@
pkgname=('lirc' 'lirc-utils')
_pkgver=0.9.1a
[[ $_pkgver =~ [a-z]$ ]] && pkgver="${_pkgver:0:-1}.${_pkgver: -1}" || pkgver="$_pkgver"
-pkgrel=2
+pkgrel=3
epoch=1
_extramodules=extramodules-3.16-ARCH
arch=('i686' 'x86_64')
@@ -16,13 +16,13 @@
options=('!makeflags' '!strip')
source=("http://prdownloads.sourceforge.net/${pkgbase}/${pkgbase}-${_pkgver}.tar.bz2"
wpc8769l-build-fix.patch
- lirc-0.9.1a-fix-segfault.patch
+ lirc-0.9.1a-fix-segfaults.patch
lirc.logrotate
irexec.service
lirc.tmpfiles)
md5sums=('1f1fac162ed309dd50f307e96a292957'
'9ec33169b3407f74264062d7679dd269'
- '13bfc8dbf1a9e30f8ed21ac6c099a676'
+ 'cd00acf480e82a0bf050032732d0d733'
'3deb02604b37811d41816e9b4385fcc3'
'32df3b9bc859565d6acf5f0e5b747083'
'febf25c154a7d36f01159e84f26c2d9a')
@@ -31,7 +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"
+ patch -Np1 -i "${srcdir}/lirc-0.9.1a-fix-segfaults.patch"
sed -i '/AC_PATH_XTRA/d' configure.ac
sed -e 's/@X_CFLAGS@//g' \
Deleted: lirc-0.9.1a-fix-segfault.patch
===================================================================
--- lirc-0.9.1a-fix-segfault.patch 2014-08-20 08:32:35 UTC (rev 220264)
+++ lirc-0.9.1a-fix-segfault.patch 2014-08-20 09:20:55 UTC (rev 220265)
@@ -1,41 +0,0 @@
-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
Added: lirc-0.9.1a-fix-segfaults.patch
===================================================================
--- lirc-0.9.1a-fix-segfaults.patch (rev 0)
+++ lirc-0.9.1a-fix-segfaults.patch 2014-08-20 09:20:55 UTC (rev 220265)
@@ -0,0 +1,79 @@
+From 8459a881fd53525a47ae2f9180fa3644be5df343 Mon Sep 17 00:00:00 2001
+From: Alec Leamas <leamas at 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
+--
+2.1.0
+
+
+From 4a9b45822890f50c5ed36660468e0a99cd4531e0 Mon Sep 17 00:00:00 2001
+From: Alec Leamas <leamas at 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",
+--
+2.1.0
+
+
+From 02252a9fe76c4a4fd809966971759c66af707f02 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
+--
+2.1.0
+
More information about the arch-commits
mailing list