summaryrefslogtreecommitdiff
path: root/libre/lirc/lirc-0.9.1a-fix-segfaults.patch
diff options
context:
space:
mode:
Diffstat (limited to 'libre/lirc/lirc-0.9.1a-fix-segfaults.patch')
-rw-r--r--libre/lirc/lirc-0.9.1a-fix-segfaults.patch79
1 files changed, 79 insertions, 0 deletions
diff --git a/libre/lirc/lirc-0.9.1a-fix-segfaults.patch b/libre/lirc/lirc-0.9.1a-fix-segfaults.patch
new file mode 100644
index 000000000..a1f657551
--- /dev/null
+++ b/libre/lirc/lirc-0.9.1a-fix-segfaults.patch
@@ -0,0 +1,79 @@
+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
+--
+2.1.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",
+--
+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
+