summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorStephen Klimaszewski <steev@gentoo.org>2005-12-27 00:13:45 +0000
committerStephen Klimaszewski <steev@gentoo.org>2005-12-27 00:13:45 +0000
commit74e60a3db5991c84621a26a0f64cbe42a1fde5f7 (patch)
treed017c2576978929f7a90ebe09dda89aa64fabdca /net-wireless/rt2570
parentNo longer exports CLASSPATH globally (bug #107777). (diff)
downloadgentoo-2-74e60a3db5991c84621a26a0f64cbe42a1fde5f7.tar.gz
gentoo-2-74e60a3db5991c84621a26a0f64cbe42a1fde5f7.tar.bz2
gentoo-2-74e60a3db5991c84621a26a0f64cbe42a1fde5f7.zip
patch for verify_write api change in kernels >=2.6.14
(Portage version: 2.1_pre2)
Diffstat (limited to 'net-wireless/rt2570')
-rw-r--r--net-wireless/rt2570/ChangeLog6
-rw-r--r--net-wireless/rt2570/Manifest3
-rw-r--r--net-wireless/rt2570/files/verify-write-api-change.patch12
-rw-r--r--net-wireless/rt2570/rt2570-1.1.0_beta1.ebuild5
4 files changed, 23 insertions, 3 deletions
diff --git a/net-wireless/rt2570/ChangeLog b/net-wireless/rt2570/ChangeLog
index f02dfa4f26df..7f2adc826650 100644
--- a/net-wireless/rt2570/ChangeLog
+++ b/net-wireless/rt2570/ChangeLog
@@ -1,6 +1,10 @@
# ChangeLog for net-wireless/rt2570
# Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-wireless/rt2570/ChangeLog,v 1.1 2005/11/04 21:47:07 genstef Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-wireless/rt2570/ChangeLog,v 1.2 2005/12/27 00:13:45 steev Exp $
+
+ 27 Dec 2005; Steev Klimaszewski <steev@gentoo.org>
+ +files/verify-write-api-change.patch, rt2570-1.1.0_beta1.ebuild:
+ verify_write() api changed, patch for ge 2.6.14 kernels.
*rt2570-1.1.0_beta1 (04 Nov 2005)
diff --git a/net-wireless/rt2570/Manifest b/net-wireless/rt2570/Manifest
index 741f4c95ba7d..9feb672b9731 100644
--- a/net-wireless/rt2570/Manifest
+++ b/net-wireless/rt2570/Manifest
@@ -1,4 +1,5 @@
MD5 ca9294ccb55924569441edc1f278a1b7 ChangeLog 390
MD5 b152f152c01f31ed075485060a35f7e6 files/digest-rt2570-1.1.0_beta1 67
+MD5 d895d6ec161e169ad6414b42550ea90b files/verify-write-api-change.patch 669
MD5 fefa3bcc4b2e74ffa5b06f8278086f2c metadata.xml 222
-MD5 db14da98e5c1ee3ce057b80d2fb9e17a rt2570-1.1.0_beta1.ebuild 1223
+MD5 a770f74b485887110c452ccd75f055ef rt2570-1.1.0_beta1.ebuild 1311
diff --git a/net-wireless/rt2570/files/verify-write-api-change.patch b/net-wireless/rt2570/files/verify-write-api-change.patch
new file mode 100644
index 000000000000..2cfcd280e776
--- /dev/null
+++ b/net-wireless/rt2570/files/verify-write-api-change.patch
@@ -0,0 +1,12 @@
+diff -Nru rt2570-1.1.0+cvs20050930.orig/Module/rtusb_info.c rt2570-1.1.0+cvs20050930.patched/Module/rtusb_info.c
+--- rt2570-1.1.0+cvs20050930.orig/Module/rtusb_info.c 2005-10-17 23:11:47.000000000 +1000
++++ rt2570-1.1.0+cvs20050930.patched/Module/rtusb_info.c 2005-10-18 00:52:54.000000000 +1000
+@@ -4150,7 +4150,7 @@
+
+ case SIOCGIWPRIV:
+ if (wrq->u.data.pointer) {
+- if ( verify_area(VERIFY_WRITE, wrq->u.data.pointer, sizeof(privtab)) )
++ if ( access_ok(VERIFY_WRITE, wrq->u.data.pointer, sizeof(privtab)) )
+ break;
+ wrq->u.data.length = sizeof(privtab) / sizeof(privtab[0]);
+ if (copy_to_user(wrq->u.data.pointer, privtab, sizeof(privtab)))
diff --git a/net-wireless/rt2570/rt2570-1.1.0_beta1.ebuild b/net-wireless/rt2570/rt2570-1.1.0_beta1.ebuild
index f35777f9709b..b1efbbf2fbba 100644
--- a/net-wireless/rt2570/rt2570-1.1.0_beta1.ebuild
+++ b/net-wireless/rt2570/rt2570-1.1.0_beta1.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2005 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-wireless/rt2570/rt2570-1.1.0_beta1.ebuild,v 1.1 2005/11/04 21:47:07 genstef Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-wireless/rt2570/rt2570-1.1.0_beta1.ebuild,v 1.2 2005/12/27 00:13:45 steev Exp $
inherit eutils linux-mod
@@ -30,6 +30,9 @@ pkg_setup() {
}
src_compile() {
+ if kernel_is ge 2 6 14 ; then
+ epatch "${FILESDIR}"/verify-write-api-change.patch
+ fi
linux-mod_src_compile
}