Fixing overflow, Bug #123704. Allow building more than one driver (with big warning), Bug #144951. Added irexec-initscript, Bug #124295. Added support for remotewonderplus-device, Bug #149130.

(Portage version: 2.1.2_rc2-r3)

5 files changed, 87 insertions, 0 deletions

diff --git a/app-misc/lirc/files/digest-lirc-0.8.0-r7 b/app-misc/lirc/files/digest-lirc-0.8.0-r7
new file mode 100644
index 000000000000..403b24365ee4
--- /dev/null
+++ b/app-misc/lirc/files/digest-lirc-0.8.0-r7
@@ -0,0 +1,3 @@
+MD5 0bf28bf82c7766a462f90927b6bf3af1 lirc-0.8.0.tar.bz2 514359
+RMD160 045c95754820e77891bd0b3baa269ad3f04cba8c lirc-0.8.0.tar.bz2 514359
+SHA256 cc8d7fb41a045278680ea530cffaf05181977f41244b9f0ed64075cd7630b5d2 lirc-0.8.0.tar.bz2 514359
diff --git a/app-misc/lirc/files/irexec-confd b/app-misc/lirc/files/irexec-confd
new file mode 100644
index 000000000000..ab9eb3e77c26
--- /dev/null
+++ b/app-misc/lirc/files/irexec-confd
@@ -0,0 +1,2 @@
+# Options to pass to the irexec process
+IREXEC_OPTS=""
diff --git a/app-misc/lirc/files/irexec-initd b/app-misc/lirc/files/irexec-initd
new file mode 100755
index 000000000000..9e2bfb548f52
--- /dev/null
+++ b/app-misc/lirc/files/irexec-initd
@@ -0,0 +1,22 @@
+#!/sbin/runscript
+# Copyright 2003 Martin Hierling <mad@cc.fh-lippe.de>
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-misc/lirc/files/irexec-initd,v 1.1 2006/12/01 14:35:19 zzam Exp $
+
+
+depend() {
+	need lircd
+}
+
+start() {
+	ebegin "Starting irexec"
+	/usr/bin/irexec --daemon ${IREXEC_OPTS}
+	eend $? "Failed to start irexec."
+}
+
+stop() {
+	ebegin "Stopping irexec"
+	killall irexec
+	eend $? "Failed to stop irexec."
+}
+
diff --git a/app-misc/lirc/files/lirc-0.8.0-too-many-connections-overflow.diff b/app-misc/lirc/files/lirc-0.8.0-too-many-connections-overflow.diff
new file mode 100644
index 000000000000..67957c5edb31
--- /dev/null
+++ b/app-misc/lirc/files/lirc-0.8.0-too-many-connections-overflow.diff
@@ -0,0 +1,33 @@
+--- lirc-0.8.0/daemons/lircd.c	2006/01/22 12:34:38	5.62
++++ lirc-0.8.0/daemons/lircd.c	2006/02/28 21:24:18	5.63
+@@ -143,16 +143,18 @@
+ FILE *lf=NULL;
+ #endif
+ 
+-/* fixme: */
++/* quite arbitrary limits */
+ #define MAX_PEERS	100
++/* substract one for lirc, sockfd, sockinet, logfile, pidfile */
++#define MAX_CLIENTS     (FD_SETSIZE-5-MAX_PEERS)
+ 
+ int sockfd, sockinet;
+-int clis[FD_SETSIZE-5-MAX_PEERS]; /* substract one for lirc, sockfd, sockinet, logfile, pidfile */
++int clis[MAX_CLIENTS];
+ 
+ #define CT_LOCAL  1
+ #define CT_REMOTE 2
+ 
+-int cli_type[FD_SETSIZE-5-MAX_PEERS];
++int cli_type[MAX_CLIENTS];
+ int clin=0;
+ 
+ int listen_tcpip=0;
+@@ -471,7 +473,7 @@
+ 		dosigterm(SIGTERM);
+ 	};
+ 
+-	if(fd>=FD_SETSIZE)
++	if(fd>=FD_SETSIZE || clin>=MAX_CLIENTS)
+ 	{
+ 		logprintf(LOG_ERR,"connection rejected");
+ 		shutdown(fd,2);
diff --git a/app-misc/lirc/files/lirc-remotewonderplus.patch b/app-misc/lirc/files/lirc-remotewonderplus.patch
new file mode 100644
index 000000000000..385162cf290d
--- /dev/null
+++ b/app-misc/lirc/files/lirc-remotewonderplus.patch
@@ -0,0 +1,27 @@
+--- lirc-0.8.0/drivers/lirc_atiusb/lirc_atiusb.c.orig	2005-10-29 08:18:53.000000000 -0600
++++ lirc-0.8.0/drivers/lirc_atiusb/lirc_atiusb.c	2006-04-01 14:31:05.000000000 -0700
+@@ -147,9 +147,9 @@
+ /* init strings */
+ #define USB_OUTLEN		7
+ 
+-static char init1[] = {0x01, 0x00, 0x20, 0x14};
+-static char init2[] = {0x01, 0x00, 0x20, 0x14, 0x20, 0x20, 0x20};
+-
++static char init1[] = {0x80, 0x05, 0x1b, 0x15, 0x14, 0x20, 0x24, 0x15};
++static char init2[] = {0x83, 0x03};
++static char init3[] = {0x84, 0xd7, 0x020};
+ 
+ 
+ struct in_endpt {
+@@ -1034,8 +1034,9 @@
+ 			usb_sndintpipe(ir->usbdev, oep->ep->bEndpointAddress), oep->buf,
+ 			USB_OUTLEN, usb_remote_send, oep, oep->ep->bInterval);
+ 
+-		send_packet(oep, 0x8004, init1);
+-		send_packet(oep, 0x8007, init2);
++		send_packet(oep, 0x8007, init1);
++		send_packet(oep, 0x8002, init2);
++		send_packet(oep, 0x8003, init3);
+ 	}
+ }
+