Applied upstream patch to fix bug 377033

Package-Manager: portage-2.1.10.65/cvs/Linux x86_64

4 files changed, 29 insertions, 7 deletions

diff --git a/app-misc/lirc/ChangeLog b/app-misc/lirc/ChangeLog
index 79e9f5ee6460..da321e75c39f 100644
--- a/app-misc/lirc/ChangeLog
+++ b/app-misc/lirc/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for app-misc/lirc
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-misc/lirc/ChangeLog,v 1.227 2012/07/17 20:14:21 axs Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-misc/lirc/ChangeLog,v 1.228 2012/07/17 20:30:16 axs Exp $
+
+  17 Jul 2012; Ian Stakenvicius <axs@gentoo.org> lirc-0.9.0-r1.ebuild,
+  +files/lirc-0.9.0-atiusb_kfifo.patch:
+  Applied upstream patch to fix bug 377033
 
   17 Jul 2012; Ian Stakenvicius <axs@gentoo.org> lirc-0.9.0-r1.ebuild,
   +files/lirc-0.9.0-kernel-2.6.39-fixes.patch:
diff --git a/app-misc/lirc/Manifest b/app-misc/lirc/Manifest
index 3781bf0da266..0c4da0d387a1 100644
--- a/app-misc/lirc/Manifest
+++ b/app-misc/lirc/Manifest
@@ -7,6 +7,7 @@ AUX irexec-initd-0.8.6-r2 816 SHA256 5e5a31fbd93294a6e210499a880fcab371b23706824
 AUX lirc-0.8.3_pre1-remotewonderplus.patch 943 SHA256 547efbfa30f282ba9100495044e3b720c8f74c44f9a4e34db934d2ac7976fe29 SHA512 f1c5b03eafb8fb9d4190e438fb4ca734cac102c7f3a097f193a0a1ac7cdee33b01fb1d794959e00be16c78bb66e34d113f3ff8fb87678e99f82670ec0306e3ca WHIRLPOOL 999b01a1c2860457bf9ed68891cbb497595d58fe57627bc87d5f6401835ee5586ebcf124e1f563264ba64df22e38c7a6ccfbaf628123c5a2419bb0f57f74f19a
 AUX lirc-0.8.4-portaudio_check.patch 769 SHA256 01e2034aaa6a7eb039e5c0e6c3b4a6ed38860614d3d0b0005d99a4aac2b3827e SHA512 a4e63da5d03f1fbb072679c3a415ae55767d601512f158c5e2fc52a045b632a055b94dca4e9d0d236ceeeb367daf22d4cc71f542229edb4fb13410512a8e4f0b WHIRLPOOL 0717efa4d7934c9736b220ec4416d1827397267b34bc3343a16a5963729fcfaa4871bb4e47b1aebbb310ea5bcc2bfaa7c675a451f5db46d979f0e4438e84a37e
 AUX lirc-0.8.6-send-evsyn.diff 563 SHA256 26c442281253732b0fda80168893f2bef90c4684edeb902bf52faca680bde0c7 SHA512 737afde76134b18ed2c0ccbd7bf9bce3ce87efc9551d84f2a32bb60f056c08fe42301bf6822afe7af24f95da4bd1a0cf06f5f686b1368671f72108733ca24a0c WHIRLPOOL b7580846d0c6520f24ccd30b90db964ba6c67e5417debd11f54b9491f08e684f69a52a127947a808bdb2e75bdf38e5a1cecd4cae2e2cd3e3acf0c41bf376640f
+AUX lirc-0.9.0-atiusb_kfifo.patch 437 SHA256 b7950ee185588a3626b8024cb22c0e67c8514362f5c9cb74bfcead8018e11b02 SHA512 d072ecd94ed4b7f1662441106650b7eb329cbe62887819c1e607ae87375a17dedea02a3a5dcf6956a1151743fd652ec5884577c595771740eef509daab8dbd02 WHIRLPOOL f0013dd75d6cf3486cddbea4e97e7ca9962af882befc5e994f258d1eb5e77e09379c4ca246e407f4c7ad5438b860e0e3b0abb2cade6f04b101525f060188ed03
 AUX lirc-0.9.0-kernel-2.6.39-fixes.patch 2175 SHA256 f5f48c867716288835a73b8d29aa9b1fcc4905a723e1f99e35fe396b2c759957 SHA512 a502b815cec565a49382e9ad0e7237a9bc7da431f41e94db42d214655577212606500ea2651a298db8cd3a68ce706461e6a773b0d9e3316ac7d49b2038fda354 WHIRLPOOL f1968f51cc29ce4f630c59c964d106e024f4cb3e5938ea80b271800a65d130a42531db5fe6e220ae20577cd4f1998de09e5dbdf52ff1cf6f3839922dd9ece114
 AUX lircd-0.8.3 581 SHA256 9ba3c5a8c0ca5966729dc5e2c7a5960bbf12b443d91e9e319a0277f153df1b1f SHA512 d0f652df31fa1583232e3b29b5fc95d21fc76564df9f5e54881ee849c7a6fa0d697f15335c2e3f1b8ab0b29b7cddef605bd15073f394c29df9e5704854b0017a WHIRLPOOL 69c23cc6584ec435ce50689df223b27244a8deda351dbf048646f05021eba6893c22be24e167930cbb786f15e79cbfa97cf335de8b311ff9543c0e50a853a503
 AUX lircd-0.8.6 973 SHA256 473cf04b2f6addf7c86d23103b1eff68bf3758fda2bf25401ff0631c568c7805 SHA512 9992b629073d9d9c05388b6063d1a7eff6a47514ccc1af2739638c8375b284cd6252c1a825d172d160acee9983f7bd59fdde6dd282c62597e8d6d7a149f06f69 WHIRLPOOL ccb99a3df8e52f3b6abeddebd727aa734c547fafb3db19b4fd266fc7f69d0b0674f937a21bb11d8d338d59c019d870797715993eb781de1f15f4bef1cfe9927d
@@ -23,14 +24,14 @@ DIST lirc-0.9.0.tar.bz2 857286 SHA256 6323afae6ad498d4369675f77ec3dbb680fe661bea
 EBUILD lirc-0.8.5.ebuild 9419 SHA256 bd6ac677e6e820e414a5febb48fd7a15d93b461aef91f1badb6152c1b7916097 SHA512 a258461e028b8edac05de5acbf8c01b6aa727776232e321b79dabf1cb35911e2977c2e86199ff73f347cde703062118b1f4019e8e51134f1c66f921f3b1374ee WHIRLPOOL 1bf220960c9a48995f618571a9514040369589876e1d1cc3787da9f2f90443b5fa8adc9e87856bc2e611f43eea6b5f44094f2180f7683e98b918a2bed6a4ea64
 EBUILD lirc-0.8.7.ebuild 10100 SHA256 4a68073a5039a14358a63b65ef2b8981a178b9369d9bc9548420f8d97153bc8f SHA512 15508d9bdd99e94c5bf5520ceb8a57ca6bdc05ed8cdc3b79307acbb00a03553a21c625a502d242a05da6c9137abe9dd809ac27c905129351ca752c466d2b0bb3 WHIRLPOOL 404b9f37112328044bd4a578052cbf0352fb13e44e4c855260670f978a0d916fa03aa6f4c3a72f18a7569cc767e4ec470b88e030b18e934afe10a894230d8969
 EBUILD lirc-0.8.7_pre1.ebuild 10108 SHA256 a7f35ebeece34ba3199ab308e209299c8adfbf07e3cd325bb82b4def8d6f97c4 SHA512 c8a857549606e547bce798b61e5efe3f24c4b9447b6e8cd107dfba81c78254f99fd19af6e15a0280c959930d3355cc07e781fe379fbef45aa6ef5b5b08122c41 WHIRLPOOL 56155cd2042135599f6085f064b7000c559eca0057a8a5d2dbc517a9ea74d1bba6a6e533cd3887676d883f45c763a67da602b87b18065733d58044aa30ebef32
-EBUILD lirc-0.9.0-r1.ebuild 12504 SHA256 b1355a0f0d8d4b7065fe2838bf66636eccb0ffa2c55adfacbc2c8f2e762df6a8 SHA512 c57aa22851d8de4548ac90c13da5f92a0dd4920808d8b196e66341020fe4cb86b41a00e334414737292364dae29dbe709ddbcb63a84b432cde4eb6eb095ad39d WHIRLPOOL 6644dcc2422e3a614986cf11e5784636c2dabb7d4e8d9c0185b978f0b40672cdfc6a6949355d828212ef07ee88501edef4d5760b9b4c1cd6c82a8d44201d6b63
+EBUILD lirc-0.9.0-r1.ebuild 12633 SHA256 fa0e43271cea8835b1c072267c6a46b505e6f5b55c95ab3da644cb8153677ffd SHA512 ae8898dcdf2ee4224e9deb85896a6d50534ab8ad5cdf2edaf8931dd8caa5ee66c22f42882ed9dc3fd44f8b56e49d366d0f32713be694e501ea9ea36d495f32c9 WHIRLPOOL 9d113290dc06ca250dcee4aca4c6cb0d6379d6258e5482029d84b4040d3403ece918d8420c3b3ff069449cc9b8a2e3a85fe042f89cf724d956e5a3d81ec7200e
 EBUILD lirc-0.9.0.ebuild 10161 SHA256 570944822013fd494d91a915e763d74c27870d2488d09b2ace54f4cd4603e0d4 SHA512 ef91477c7840ee3848f6a3da063ba73f62f0017b17a290ca33354e8c7960ca167c5a45edf6a5b3c5d993b09bc14da7884dbe79279d653bcca7a0f923d1f54e7f WHIRLPOOL c03ea9947a658e24ef263de4c40c4b19f014326636d3ffae83eefc04361926d992250587f90f440015b2fb244a79437c8f19967a8fa6f70adf3d364eceafda4d
-MISC ChangeLog 37729 SHA256 f2994296cae4775d886457bf237ccb325ef3efe0cc1ab3a626230e614b7f283a SHA512 96a8e670e00c2d81a1022e614c6b2c69ba18f91d9a367ffc70943415cc1c8a9daa80e71e474e4509367d50f1996b0535ebbeb60e8048c0781fbe73eae6b8c9a7 WHIRLPOOL 08ea1c2467727ebf17bf7c24037a7eb4ba3bee2f7c0cc571cff6efd23b1e913ca64a299aeab7bef002854b17797dc0c9b067a52a7379f59e35bbe5422fd25719
+MISC ChangeLog 37884 SHA256 eb7f073e7da2f6870f89500c3e56449ea4f3257d934a56410776176bee383601 SHA512 5e2699909507e76b9df93a7af02ce3ef926dc51d595acf0abad45339951c116c51673bea2b9c14117f3dde3e186c637abb1c8ffea7590a0de1e74db85fba31e4 WHIRLPOOL a83fd734033a693f2bdc23fbf982b3bec8181ed67f10fb98455590790e2b273aab994738204d562aab143086bcd9b69af794f7dfedacd2ffb151015022c8069b
 MISC metadata.xml 376 SHA256 e3b4637a67a93eb4b9457fa5941e8a6a891adca11a1ebc80c21a59650eac93aa SHA512 17eca2da394c7ca359766b80a0bd743f57235e49f422a7c2b1108e7d2dcdd7ea38ba36d8b3e3bc58b3d3818d75af99c0220eefff9d73aea97b561278cc243ce7 WHIRLPOOL 39c1156d377164114fb8730153a9e5e9dd4753ed98aec00fdff779de354336c3f791dd4fde3a0eff2dff3a8e62279f6e1ab473cf5e6cf00902f3febce0e2ac4f
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iF4EAREIAAYFAlAFx6cACgkQ2ugaI38ACPDfXgD/VM71jM4zu1ZynUJOnAgmCxq5
-nuRg3W8CCJPmxYLgF4kA/2ZeYqJpZEDD5H8b5U2GTWSuZbss/9+k1osq3ibYKDjV
-=MhjX
+iF4EAREIAAYFAlAFy2IACgkQ2ugaI38ACPBcZwEAoshjiak7LKYB8GFZ/06eVj9U
+HPbrwNNOJcJtJKMeC6UA/RBPSr0FlL/+QJ1Pzurx0NM53mAOs4pvDCMc4cJ4/JuY
+=LH7F
 -----END PGP SIGNATURE-----
diff --git a/app-misc/lirc/files/lirc-0.9.0-atiusb_kfifo.patch b/app-misc/lirc/files/lirc-0.9.0-atiusb_kfifo.patch
new file mode 100644
index 000000000000..32edb244b412
--- /dev/null
+++ b/app-misc/lirc/files/lirc-0.9.0-atiusb_kfifo.patch
@@ -0,0 +1,14 @@
+--- a/drivers/lirc_atiusb/lirc_atiusb.c	2012-07-17 16:04:39.000000000 -0400
++++ b/drivers/lirc_atiusb/lirc_atiusb.c	2012-07-17 16:19:06.000000000 -0400
+@@ -1050,7 +1050,11 @@
+ 		goto new_irctl_failure_check;
+ 	}
+ 
++#if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 38)
+ 	if (lirc_buffer_init(driver->rbuf, dclen, 1)) {
++#else
++	if (lirc_buffer_init(driver->rbuf, dclen, 2)) {
++#endif
+ 		mem_failure = 4;
+ 		goto new_irctl_failure_check;
+ 	}
diff --git a/app-misc/lirc/lirc-0.9.0-r1.ebuild b/app-misc/lirc/lirc-0.9.0-r1.ebuild
index fdc604ae29e8..acbf1f3fe413 100644
--- a/app-misc/lirc/lirc-0.9.0-r1.ebuild
+++ b/app-misc/lirc/lirc-0.9.0-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-misc/lirc/lirc-0.9.0-r1.ebuild,v 1.2 2012/07/17 20:14:21 axs Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-misc/lirc/lirc-0.9.0-r1.ebuild,v 1.3 2012/07/17 20:30:16 axs Exp $
 
 EAPI=4
 
@@ -293,6 +293,9 @@ src_prepare() {
 
 	# Apply fixes for kernel-2.6.39 and above
 	epatch "${FILESDIR}"/${P}-kernel-2.6.39-fixes.patch
+	# Slightly massaged upstream patch to fix kfifo issues >=2.6.38
+	# for bug 377033
+	epatch "${FILESDIR}"/${P}-atiusb_kfifo.patch
 
 	# Do not build drivers from the top-level Makefile
 	sed -i -e 's:\(SUBDIRS =\) drivers\(.*\):\1\2:' Makefile.am