Apply patch from Mateusz Dziadko <matidz.gentoo@gmail.com> to compile against new kernels. Bug #342161

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

4 files changed, 61 insertions, 7 deletions

diff --git a/app-laptop/thinkpad/ChangeLog b/app-laptop/thinkpad/ChangeLog
index 9f4ce098aa18..70c208117942 100644
--- a/app-laptop/thinkpad/ChangeLog
+++ b/app-laptop/thinkpad/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for app-laptop/thinkpad
-# Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-laptop/thinkpad/ChangeLog,v 1.21 2007/05/25 07:00:31 opfer Exp $
+# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/app-laptop/thinkpad/ChangeLog,v 1.22 2011/06/26 09:35:33 hwoarang Exp $
+
+  26 Jun 2011; Markos Chandras <hwoarang@gentoo.org> thinkpad-5.9-r1.ebuild,
+  +files/thinkpad-5.9-ioctl.patch:
+  Apply patch from Mateusz Dziadko <matidz.gentoo@gmail.com> to compile against
+  new kernels. Bug #342161
 
   25 May 2007; Christian Faulhammer <opfer@gentoo.org> ChangeLog:
   corrected ChangeLog, so it conforms to our standards
diff --git a/app-laptop/thinkpad/Manifest b/app-laptop/thinkpad/Manifest
index c7a362c06135..538b98d3bba0 100644
--- a/app-laptop/thinkpad/Manifest
+++ b/app-laptop/thinkpad/Manifest
@@ -1,8 +1,29 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA512
+
 AUX thinkpad 545 RMD160 6ac014699371fccc7387315fbaf09080e5368977 SHA1 aa90a5ae350609c3aa51ee9d94aa77aecfe89b71 SHA256 f33d6e2fd998bc4dad0f372c9f2ab139369b415ecff5489c41944fc35decb5ee
+AUX thinkpad-5.9-ioctl.patch 764 RMD160 4b1430e4ee35db3bb02162b517c9d25f71d8aa35 SHA1 10a60b87945cac8fe8363436595b2f1a787727c7 SHA256 59eb94c1225796fd2e3e958c0603b421373d789c95f1a67821f9915171acfec2
 AUX thinkpad-5.9-module-param.patch 992 RMD160 80bc42d8d92da4174e6e9d23f733f3658c9e1a7f SHA1 6cd5facfcb3d9745f769bc7422e917e8acd39014 SHA256 4bc08dae456cf96bcfcaf416967657c079982b38a1b89ec6d71b684f2a4688bf
 AUX thinkpad-5.9-remove-inter_module.patch 5974 RMD160 12ff7660f880fb2b731f5aa02d5a45861eb59e6f SHA1 f75ad677eb158c0b82fb005b530a94cc9b1b7dd5 SHA256 f75291cbc0aac1cbc5531be6788e343682684d80562d7a82ec6d4c6759925418
 AUX thinkpad-5.9-remove-thinkpadapm-argument.patch 1052 RMD160 e1c7831dea7ace73cb619005ade0652d6b0ab992 SHA1 527c9c690da0ab3ae5d42c0c0a0ec4a2534a589b SHA256 57fe17e7d1644f16815d8b052efd8a5cbd34564b5539247b57a23f27a05eb1c8
 DIST thinkpad-5.9.tar.gz 74779 RMD160 93d3d8ff6d64191ff07252654489a9bc5d878457 SHA1 c3f88d36ed39f83e6d888c9d174de9bc80724ea6 SHA256 49d2eab42e57d71cb0f175a645c703fce458a852552842ea56e0c81547d8f715
-EBUILD thinkpad-5.9-r1.ebuild 1453 RMD160 57d5c44c90bf21b4b677a9b4c1c2a870fb9bf284 SHA1 bc646489af6bc2ae815db0dede4e9e99170a2fd0 SHA256 f8c955e7e5b5bdfa13f11ed37cb97e4449dd451aa96afe0584428839eb4d12b0
-MISC ChangeLog 5282 RMD160 655bc4be736492663b659b4e2de2542a67269ac2 SHA1 99ff193cd605f02f29ffe0465f206eef5cb09751 SHA256 68ec93b3f55c1c72d921946bc95e84b89dbc2ca645a18163595f57118976a6f7
+EBUILD thinkpad-5.9-r1.ebuild 1508 RMD160 1708e9a5cc8c4553afd8e76b8800ffb54f5b730c SHA1 ccfda9bd7108ef3d4dcb684522ebcc55eee9411c SHA256 8a675083e4732720bd79af3a18b180a3ddd26120deeabd865f26fa2b5619b6d7
+MISC ChangeLog 5505 RMD160 3e8f1195d76df8bd2d69927c8f71e029918eab57 SHA1 bc8cd0059c0c88df1f5818a05a8464298181ca14 SHA256 1560dbc2806b664ff8bacda414be49d857cc864024c913935f4193b993165c6f
 MISC metadata.xml 257 RMD160 7f24abacd3c499b06eb4314a0cbd618acc9b3b86 SHA1 5dcc7e2d25909c0340fcba06a149e0bc79162c2e SHA256 3870cf69413cacc58e43006c91b3e37453c57ee34f19a335eb40fb31fc6b4ffe
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.17 (GNU/Linux)
+
+iQIcBAEBCgAGBQJOBv30AAoJEPqDWhW0r/LCNRAP/3h7lNcpb3YCRbFFgbgTv3NQ
+7y5molQXm0Uh6gBkgJW3QYlHQSFqwNBc3AN0ZBlbMwItmEMGENZhha9NANS8iGn8
++JpMejWkKak/mJVjDqSxvYtgZo63PGvDRNPqOhfEChFb3s5CLyRPDwraGHLF50RR
+gFYTxAHhJyi9wdFJUT1JF0AeW8hP9FpkRoZ6nWjI08eP86VcucgzIU1lQo0liQK1
+oF84RKelng+Vw69g5eHIrw9gmwFRq1pWsirIbbadyNsgzpUwLp9iqFpsdgzr4ZWU
+Z1dtu0dmA2EIZD2KLOLBY0hZxS9BQXm7+6aez9aljfnDpgqlrEGGT2m3NJZGi40E
+kCDtP60ohsLAr3d5PjQBaC0tcuRuIH1CeG/24Qmx34dBRVcWVnV/FGB/BDl3D2Mh
+lP6CnDtMPkLQpHelfdviS444ddGUGPggdwDKkqFvSpoP7NO6ka7YuyXuwliGJxcR
+MAQx/TcdCWzY8Iua0zvmCRJzo5OIczpkeVFu3pwrymXoBRNKs0NghOEQ/TgVHStm
+23BWbiyQYyZ/ifUObtTQVochA20kwZ9p0RFok82m2y1p6QuEvf74FpZyb/JaUW7S
+IxIJMTm5jGTzgSLvDRpSgazHMSi2I1NfAaTSnMLUU9jzJtev2UvGkhTuYpd9jHUt
+3Rrn28BTuCOgv4VlCIPC
+=t4rf
+-----END PGP SIGNATURE-----
diff --git a/app-laptop/thinkpad/files/thinkpad-5.9-ioctl.patch b/app-laptop/thinkpad/files/thinkpad-5.9-ioctl.patch
new file mode 100644
index 000000000000..3f20744265b8
--- /dev/null
+++ b/app-laptop/thinkpad/files/thinkpad-5.9-ioctl.patch
@@ -0,0 +1,27 @@
+--- thinkpad-5.9.orig/2.6/drivers/thinkpad.c	2010-11-19 01:35:10.610000017 +0100
++++ thinkpad-5.9/2.6/drivers/thinkpad.c	2010-11-19 01:35:37.215000017 +0100
+@@ -66,7 +66,6 @@
+ 	struct file * pfileThe 
+ );
+ static int thinkpad_ioctl(
+-	struct inode * pinodeThe,
+ 	struct file * pfileThe,
+ 	unsigned int uintIoctlNum,
+ 	unsigned long ulongIoctlArg
+@@ -111,7 +110,7 @@
+ static flag_t _fInUse = 1;
+ 
+ static struct file_operations _fileopsThinkpad = {
+-	.ioctl   = thinkpad_ioctl,
++	.unlocked_ioctl   = thinkpad_ioctl,
+ 	.open    = thinkpad_open,
+ 	.release = thinkpad_release,
+ 	.owner   = THIS_MODULE
+@@ -169,7 +168,6 @@
+ 
+ 
+ static int thinkpad_ioctl(
+-	struct inode * pinodeThe,
+ 	struct file * pfileThe,
+ 	unsigned int uintIoctlNum,
+ 	unsigned long ulongIoctlArg
diff --git a/app-laptop/thinkpad/thinkpad-5.9-r1.ebuild b/app-laptop/thinkpad/thinkpad-5.9-r1.ebuild
index 6d84f6c9649c..108e26062cf7 100644
--- a/app-laptop/thinkpad/thinkpad-5.9-r1.ebuild
+++ b/app-laptop/thinkpad/thinkpad-5.9-r1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2007 Gentoo Foundation
+# Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-laptop/thinkpad/thinkpad-5.9-r1.ebuild,v 1.6 2007/03/21 01:05:02 steev Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-laptop/thinkpad/thinkpad-5.9-r1.ebuild,v 1.7 2011/06/26 09:35:33 hwoarang Exp $
 
 inherit eutils linux-mod
 
@@ -47,7 +47,8 @@ src_unpack() {
 
 	epatch "${FILESDIR}"/${PN}-5.9-remove-thinkpadapm-argument.patch
 	epatch "${FILESDIR}"/${PN}-5.9-remove-inter_module.patch
-
+	# bug 342161
+	epatch "${FILESDIR}"/${P}-ioctl.patch
 	kernel_is ge 2 6 0 && epatch "${FILESDIR}"/${P}-module-param.patch
 }