bug 200508 fixed; thanks to A.Stirling M.Marte T.Kost

Package-Manager: portage-2.1.3.19

4 files changed, 120 insertions, 10 deletions

diff --git a/app-misc/lirc/ChangeLog b/app-misc/lirc/ChangeLog
index 269cc8819f51..0cb39d83dcf2 100644
--- a/app-misc/lirc/ChangeLog
+++ b/app-misc/lirc/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for app-misc/lirc
 # Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-misc/lirc/ChangeLog,v 1.165 2007/12/02 13:08:36 corsair Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-misc/lirc/ChangeLog,v 1.166 2007/12/26 19:29:28 hd_brummy Exp $
+
+  26 Dec 2007; Joerg Bornkessel <hd_brummy@gentoo.org>
+  +files/lirc-0.8.3_pre1-kernel-2.6.24.diff, lirc-0.8.3_pre1.ebuild:
+  bug 200508 fixed; thanks to A.Stirling M.Marte T.Kost
 
   02 Dec 2007; Markus Rothe <corsair@gentoo.org> lirc-0.8.2-r2.ebuild:
   Stable on ppc64; bug #197768
diff --git a/app-misc/lirc/Manifest b/app-misc/lirc/Manifest
index bde00a89ecab..eec76b7f04b7 100644
--- a/app-misc/lirc/Manifest
+++ b/app-misc/lirc/Manifest
@@ -1,3 +1,6 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX irexec-confd 280 RMD160 f669c7c98b9d7cac2010284ab6068d29d47ec811 SHA1 c6decc19a273d98d451de137a2ffbe16d5df28ae SHA256 c404ad3b624004cab25bd3a89593cdeb0abbc25771d6e52caf2f37cb4f7b2b79
 MD5 6abeb719007a883ff202cd75ffe922e8 files/irexec-confd 280
 RMD160 f669c7c98b9d7cac2010284ab6068d29d47ec811 files/irexec-confd 280
@@ -70,6 +73,10 @@ AUX lirc-0.8.3_pre1-imon-pad2keys.patch 10312 RMD160 6f61031cd3035289b2d52797dd0
 MD5 e0b6d2d19ba942d7702dd14cef641885 files/lirc-0.8.3_pre1-imon-pad2keys.patch 10312
 RMD160 6f61031cd3035289b2d52797dd02d027f593873d files/lirc-0.8.3_pre1-imon-pad2keys.patch 10312
 SHA256 2f79f223d5d2e998321284c50edea044ad26ab8607eae1e9e79e7c0ea6a8f2cd files/lirc-0.8.3_pre1-imon-pad2keys.patch 10312
+AUX lirc-0.8.3_pre1-kernel-2.6.24.diff 2095 RMD160 e503d9465b1f0b18d43b43c1baa43d56a312494c SHA1 8dd71859c1851486596b14ec8098041ee4be8775 SHA256 a58a74a515065310a892c44422e60352d23c9f30a922cda188e4d9a005c17d4c
+MD5 2abab0b9a71ff44a8a9bbbc87e92c3e5 files/lirc-0.8.3_pre1-kernel-2.6.24.diff 2095
+RMD160 e503d9465b1f0b18d43b43c1baa43d56a312494c files/lirc-0.8.3_pre1-kernel-2.6.24.diff 2095
+SHA256 a58a74a515065310a892c44422e60352d23c9f30a922cda188e4d9a005c17d4c files/lirc-0.8.3_pre1-kernel-2.6.24.diff 2095
 AUX lirc-0.8.3_pre1-remotewonderplus.patch 943 RMD160 05a0696d51ff01c7d9644ad3ff4d56fef20be439 SHA1 971ad8b27d57c31439a1f7fb87dac2dc39d6c1e8 SHA256 547efbfa30f282ba9100495044e3b720c8f74c44f9a4e34db934d2ac7976fe29
 MD5 b3dbfd336f080c2040325fb7fdbf280a files/lirc-0.8.3_pre1-remotewonderplus.patch 943
 RMD160 05a0696d51ff01c7d9644ad3ff4d56fef20be439 files/lirc-0.8.3_pre1-remotewonderplus.patch 943
@@ -135,14 +142,14 @@ EBUILD lirc-0.8.2_pre2.ebuild 7768 RMD160 2437273d778a5ba426026aaafab4e2528c4619
 MD5 4c7863d2f6891a08995b48c67e42f7c8 lirc-0.8.2_pre2.ebuild 7768
 RMD160 2437273d778a5ba426026aaafab4e2528c4619e6 lirc-0.8.2_pre2.ebuild 7768
 SHA256 b35bdae2c7011fb84d2279d12de811dbc128266d197f83e4bb70bb9e5c8ec67b lirc-0.8.2_pre2.ebuild 7768
-EBUILD lirc-0.8.3_pre1.ebuild 8315 RMD160 297399bfc5ae29f6d00a392bb19ce81f88df53f6 SHA1 1867bf4a9cd6ae1045d9f9a6290ce62cb2d7cd15 SHA256 4371d617fa40aa51e14ed65b80d5bae825255348772e450b4acfb08f70164f3d
-MD5 54ca45e30d9068a358dec7e5696ebf6d lirc-0.8.3_pre1.ebuild 8315
-RMD160 297399bfc5ae29f6d00a392bb19ce81f88df53f6 lirc-0.8.3_pre1.ebuild 8315
-SHA256 4371d617fa40aa51e14ed65b80d5bae825255348772e450b4acfb08f70164f3d lirc-0.8.3_pre1.ebuild 8315
-MISC ChangeLog 25482 RMD160 b56ce7768d6be601342017a1b12b46aee96368e7 SHA1 a652c09998874243077df7139eb76a8fbf3aa9e0 SHA256 25228b0a3486ec7c6835a32ec8fb46c058d6f9cdf8a49e8b78d6857f854abd53
-MD5 aacbc169c79e3e0f5f1a98675a742320 ChangeLog 25482
-RMD160 b56ce7768d6be601342017a1b12b46aee96368e7 ChangeLog 25482
-SHA256 25228b0a3486ec7c6835a32ec8fb46c058d6f9cdf8a49e8b78d6857f854abd53 ChangeLog 25482
+EBUILD lirc-0.8.3_pre1.ebuild 8419 RMD160 2baa2144149ee5eb745229fc9a35439cf548851c SHA1 5694721ac8dd734683dfbd355086d22db81b5c6f SHA256 6852d1e970592ad7c85d7f9e9dcdccbf6200b2bf17fda56c57ab27abada06a14
+MD5 62c426f2ff3b90f4e3a03e1eab5850a2 lirc-0.8.3_pre1.ebuild 8419
+RMD160 2baa2144149ee5eb745229fc9a35439cf548851c lirc-0.8.3_pre1.ebuild 8419
+SHA256 6852d1e970592ad7c85d7f9e9dcdccbf6200b2bf17fda56c57ab27abada06a14 lirc-0.8.3_pre1.ebuild 8419
+MISC ChangeLog 25665 RMD160 09c67634456d06a60f98a26f691ff2ba9e56fc6c SHA1 057a3689ef0dd586fb21d591f616d0c63c7c5ead SHA256 1434189cd544f85946a3d5093b43db842304f38b0cd864900370f57c07747fe1
+MD5 3c69646700ea9147bdea379945d2f2fe ChangeLog 25665
+RMD160 09c67634456d06a60f98a26f691ff2ba9e56fc6c ChangeLog 25665
+SHA256 1434189cd544f85946a3d5093b43db842304f38b0cd864900370f57c07747fe1 ChangeLog 25665
 MISC metadata.xml 162 RMD160 8bd24f9f2805b005cef731c0cda868c72e6980af SHA1 7464d1657179a3f30c5ea2ad401590e4489ac945 SHA256 aaad144c69dd58781e1dc97b5fbad08a5b4db504bd3cbbb4ab27018a307d5d81
 MD5 dcc0143f6508e9fd068845f98b7bb403 metadata.xml 162
 RMD160 8bd24f9f2805b005cef731c0cda868c72e6980af metadata.xml 162
@@ -168,3 +175,11 @@ SHA256 85178d370b86564aebac9b79c8215c97625e85dc187208f93b64f3c9cea0552c files/di
 MD5 f10b4ad3629db03b5994e1ec47466dff files/digest-lirc-0.8.3_pre1 247
 RMD160 f24b17125eda2634a8b1d06a55b52e6f8fd4f2a5 files/digest-lirc-0.8.3_pre1 247
 SHA256 24e0ee567b857e06d93d64cbf7e9cbaee53a734e5c76862d9ff64dba06739dc3 files/digest-lirc-0.8.3_pre1 247
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.5 (GNU/Linux)
+Comment: added by hd_brummy@gentoo.org
+
+iD8DBQFHcqufdn07HTTCgIoRAk8VAJ494yun4oSUTEE2ddn55uBIkAcvBwCfSu1k
+uh9TSZFM9OYnz/f7O68gIeI=
+=vbIy
+-----END PGP SIGNATURE-----
diff --git a/app-misc/lirc/files/lirc-0.8.3_pre1-kernel-2.6.24.diff b/app-misc/lirc/files/lirc-0.8.3_pre1-kernel-2.6.24.diff
new file mode 100644
index 000000000000..5b9150bdeece
--- /dev/null
+++ b/app-misc/lirc/files/lirc-0.8.3_pre1-kernel-2.6.24.diff
@@ -0,0 +1,86 @@
+#bug 200508
+
+--- /var/tmp/portage/app-misc/lirc-0.8.3_pre1/work/lirc-0.8.3pre1/drivers/lirc_dev/lirc_dev.c	2007-09-27 15:47:20.000000000 -0400
++++ lirc-0.8.3pre1/drivers/lirc_dev/lirc_dev.c	2007-11-27 11:06:41.000000000 -0500
+@@ -41,6 +41,7 @@
+ #include <linux/fs.h>
+ #include <linux/poll.h>
+ #include <linux/smp_lock.h>
++#include <linux/completion.h>
+ #if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 18)
+ #include <linux/uaccess.h>
+ #include <linux/errno.h>
+@@ -86,8 +87,8 @@
+ 	struct lirc_buffer *buf;
+ 
+ 	int tpid;
+-	struct semaphore *t_notify;
+-	struct semaphore *t_notify2;
++	struct completion *t_notify;
++	struct completion *t_notify2;
+ 	int shutdown;
+ 	long jiffies_to_wait;
+ 
+@@ -193,7 +194,7 @@
+ 	daemonize("lirc_dev");
+ 
+ 	if (ir->t_notify != NULL)
+-		up(ir->t_notify);
++		complete(ir->t_notify);
+ 
+ 	dprintk(LOGHEAD "poll thread started\n", ir->p.name, ir->p.minor);
+ 
+@@ -218,11 +219,11 @@
+ 	} while (!ir->shutdown);
+ 
+ 	if (ir->t_notify2 != NULL)
+-		down(ir->t_notify2);
++		wait_for_completion(ir->t_notify2);
+ 
+ 	ir->tpid = -1;
+ 	if (ir->t_notify != NULL)
+-		up(ir->t_notify);
++		complete(ir->t_notify);
+ 
+ 	dprintk(LOGHEAD "poll thread ended\n", ir->p.name, ir->p.minor);
+ 
+@@ -238,7 +239,7 @@
+ #ifdef LIRC_HAVE_DEVFS_24
+ 	char name[16];
+ #endif
+-	DECLARE_MUTEX_LOCKED(tn);
++	DECLARE_COMPLETION(tn);
+ 
+ 	if (!p) {
+ 		printk(KERN_ERR "lirc_dev: lirc_register_plugin: "
+@@ -389,7 +390,7 @@
+ 			err = -ECHILD;
+ 			goto out_sysfs;
+ 		}
+-		down(&tn);
++		wait_for_completion(&tn);
+ 		ir->t_notify = NULL;
+ 	}
+ 	ir->attached = 1;
+@@ -425,8 +426,8 @@
+ int lirc_unregister_plugin(int minor)
+ {
+ 	struct irctl *ir;
+-	DECLARE_MUTEX_LOCKED(tn);
+-	DECLARE_MUTEX_LOCKED(tn2);
++	DECLARE_COMPLETION(tn);
++	DECLARE_COMPLETION(tn2);
+ 
+ 	if (minor < 0 || minor >= MAX_IRCTL_DEVICES) {
+ 		printk(KERN_ERR "lirc_dev: lirc_unregister_plugin: "
+@@ -462,8 +463,8 @@
+ 		/* 2.2.x does not export wake_up_process() */
+ 		wake_up_interruptible(ir->p.get_queue(ir->p.data));
+ #endif
+-		up(&tn2);
+-		down(&tn);
++		complete(&tn2);
++		wait_for_completion(&tn);
+ 		ir->t_notify = NULL;
+ 		ir->t_notify2 = NULL;
+ 	}
diff --git a/app-misc/lirc/lirc-0.8.3_pre1.ebuild b/app-misc/lirc/lirc-0.8.3_pre1.ebuild
index 1d3f172375da..b5a73f762e4c 100644
--- a/app-misc/lirc/lirc-0.8.3_pre1.ebuild
+++ b/app-misc/lirc/lirc-0.8.3_pre1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-misc/lirc/lirc-0.8.3_pre1.ebuild,v 1.7 2007/11/12 20:15:23 zzam Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-misc/lirc/lirc-0.8.3_pre1.ebuild,v 1.8 2007/12/26 19:29:28 hd_brummy Exp $
 
 inherit eutils linux-mod flag-o-matic autotools
 
@@ -252,6 +252,11 @@ src_unpack() {
 		sed -i -e "s:lirc_gpio\.o::" drivers/lirc_gpio/Makefile.am
 	fi
 
+	# Bug #200508
+	if kernel_is ge 2 6 24 ; then
+		epatch "${FILESDIR}"/${P}-kernel-2.6.24.patch
+	fi
+
 	# respect CFLAGS
 	sed -i -e 's:CFLAGS="-O2:CFLAGS=""\n#CFLAGS="-O2:' configure.ac