rpms
/
lirc
20
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Updating to latest release.

Browse Source 
- Removing tons of patches now upstreamed.
- Using built manpages as-is (no need to remove not-built tools)
epel8
Alec Leamas 11 years ago
parent 9cdb8d99d6
commit bace27a55f
42 changed files with 143 additions and 7093 deletions
Show Stats Download Patch File Download Diff File

26
0001-Fix-segfault-when-starting-lircd-AUR-41581.patch
Unescape View File

@ -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

26
0001-configure-ac-revert-to-git-branch.patch
Unescape View File

@ -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

58
0001-lirc-0.9.0-libusb-config-is-no-more.patch
Unescape View File

@ -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

25
0002-lircd-Fix-bad-default-for-lircdfile.patch
Unescape View File

@ -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

26
0003-0.9.1a-Bugfix-segfault-when-parsing-connect-in-confi.patch
Unescape View File

@ -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

12
0004-Set-device-to-lirc0.patch
Unescape View File

@ -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"

25
0004-lircd-fix-compiler-error-format-security-error.patch
Unescape View File

@ -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

89
0007-Make-lirc_wpc8769l-functional-again.patch
Unescape View File

@ -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

60
0008-lirc_sir-fix-resource-busy-error-from-bunk-lirc_open.patch
Unescape View File

@ -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

40
0009-lircd-handle-larger-config-files-in-write_socket-bet.patch
Unescape View File

@ -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

31
0010-lirc_atiusb-fix-buffer-alloc-to-work-with-new-kfifo.patch
Unescape View File

@ -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

60
0011-libusb-has-no-libusb-config-any-longer-use-pkg-confi.patch
Unescape View File

@ -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

89
0012-Silence-some-clang-warnings-courtesy-of-nox.patch
Unescape View File

@ -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

34
0013-userspace-use-dev-lirc0-as-default-device.patch
Unescape View File

@ -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

41
0014-lirc-make-chardev-nonseekable.patch
Unescape View File

@ -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

99
0015-media-lirc_dev-fixes-in-lirc_dev_fop_read.patch
Unescape View File

@ -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

76
0016-media-lirc_dev-add-some-__user-annotations.patch
Unescape View File

@ -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

43
0017-media-media-rc-lirc_dev-check-kobject_set_name-resul.patch
Unescape View File

@ -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

25
0018-Start-lirc-0.9.1-git.patch
Unescape View File

@ -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

43
0019-lircs-use-systemctl-instead-of-sysV-init.patch
Unescape View File

@ -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

25
0100-configure-ac-revert-to-git-branch.patch
Unescape View File

@ -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

182
0101-Stripping-some-eol-whitespace.patch
Unescape View File

@ -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

114
0102-Update-autotools-config-files.patch
Unescape View File

@ -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

28
0103-xmode2.c-Use-generic-fixed-font-instead-of-Courier.patch
Unescape View File

@ -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

172
0104-Add-systemd-socket-activation-support.patch
Unescape View File

@ -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

115
0105-Update-COPYING-to-latest-version.patch
Unescape View File

@ -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

27
0105-configure-ac-back-to-0.9.0.patch
Unescape View File

@ -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

72
0200-Fixing-FTBS-when-using-Werror-format-security.patch
Unescape View File

@ -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

52
README.fedora
Unescape View File

@ -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
```

1
branch
Unescape View File

@ -1 +0,0 @@
F-13

134
lirc-0.8.4-make-remote-names-all-unique.patch
Unescape View File

@ -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

175
lirc-0.8.6-firefly-def.patch
Unescape View File

@ -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

4917
lirc-0.8.6-standardized-remote-keycodes.patch
View File

File diff suppressed because it is too large Load Diff

95
lirc-0.9.0-libusb-config-is-no-more.patch
Unescape View File

@ -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; }

2
lirc.conf
Unescape View File

@ -1,2 +0,0 @@
# Populated config files can be found in the lirc-remotes sub-package
# or at http://lirc.sourceforge.net/remotes/".

11
lirc.service
Unescape View File

@ -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

118
lirc.spec
Unescape View File

@ -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.

31
lirc.sysconfig
Unescape View File

@ -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=""

16
lircd.service
Unescape View File

@ -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

7
lircd.socket
Unescape View File

@ -1,7 +0,0 @@
[Socket]
ListenStream=/run/lirc/lircd
[Install]
WantedBy=sockets.target
Also=lircd.service

12
lircmd.service
Unescape View File

@ -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

2
sources
Unescape View File

@ -1 +1 @@
b232aef26f23fe33ea8305d276637086 lirc-0.9.0.tar.bz2
1f1fac162ed309dd50f307e96a292957 lirc-0.9.1a.tar.bz2

Write Preview
Loading…
Cancel
Save