From 017cd6ed0f61923b8b82903fbe94850d99a85f83 Mon Sep 17 00:00:00 2001
From: Stephen Klimaszewski <steev@gentoo.org>
Date: Sat, 31 Dec 2005 16:45:44 +0000
Subject: New patch, remove the old one, fixes bug 115176 Package-Manager:
portage-2.1_pre3
---
net-wireless/rt2570/ChangeLog | 6 +++++-
net-wireless/rt2570/Manifest | 7 +++----
net-wireless/rt2570/files/digest-rt2570-1.1.0_beta1 | 1 +
net-wireless/rt2570/files/verify-write-api-change.patch | 12 ------------
net-wireless/rt2570/rt2570-1.1.0_beta1.ebuild | 7 ++++---
5 files changed, 13 insertions(+), 20 deletions(-)
delete mode 100644 net-wireless/rt2570/files/verify-write-api-change.patch
diff --git a/net-wireless/rt2570/ChangeLog b/net-wireless/rt2570/ChangeLog
index b9022822706f..d2e0873541ca 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.3 2005/12/27 00:16:49 steev Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-wireless/rt2570/ChangeLog,v 1.4 2005/12/31 16:45:44 steev Exp $
+
+ 31 Dec 2005; Steev Klimaszewski <steev@gentoo.org>
+ -files/verify-write-api-change.patch, rt2570-1.1.0_beta1.ebuild:
+ New patch, based on current cvs. Fixes bug #115176
27 Dec 2005; Steev Klimaszewski <steev@gentoo.org> metadata.xml:
And take over as maintainer
diff --git a/net-wireless/rt2570/Manifest b/net-wireless/rt2570/Manifest
index e29776c8f875..bfe8079abde6 100644
--- a/net-wireless/rt2570/Manifest
+++ b/net-wireless/rt2570/Manifest
@@ -1,5 +1,4 @@
-MD5 3c6e59cd86e3b3976794f9e1753c4a2e ChangeLog 666
-MD5 b152f152c01f31ed075485060a35f7e6 files/digest-rt2570-1.1.0_beta1 67
-MD5 d895d6ec161e169ad6414b42550ea90b files/verify-write-api-change.patch 669
+MD5 35f96912be3c745eda8a9122cc1c63ac ChangeLog 840
+MD5 a67326d80ac5e8c2d083cb7ae0bbe88c files/digest-rt2570-1.1.0_beta1 137
MD5 a68fe0595dd4cb5bf30608f8aed94849 metadata.xml 254
-MD5 dd2ab1fa5695c4b80a400dcdb8f6608c rt2570-1.1.0_beta1.ebuild 1309
+MD5 58099717eb763ac2592d2117ec76db86 rt2570-1.1.0_beta1.ebuild 1369
diff --git a/net-wireless/rt2570/files/digest-rt2570-1.1.0_beta1 b/net-wireless/rt2570/files/digest-rt2570-1.1.0_beta1
index 537f515ae9a0..6a80850e546d 100644
--- a/net-wireless/rt2570/files/digest-rt2570-1.1.0_beta1
+++ b/net-wireless/rt2570/files/digest-rt2570-1.1.0_beta1
@@ -1 +1,2 @@
MD5 b0eb7f071acc80dbff685f69a1ffd6e3 rt2570-1.1.0-b1.tar.gz 377676
+MD5 f644868b3353b7e83baeefda55d69396 rt2570-cvs-update.patch.gz 19820
diff --git a/net-wireless/rt2570/files/verify-write-api-change.patch b/net-wireless/rt2570/files/verify-write-api-change.patch
deleted file mode 100644
index 2cfcd280e776..000000000000
--- a/net-wireless/rt2570/files/verify-write-api-change.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-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 b1efbbf2fbba..2e0d59b619ba 100644
--- a/net-wireless/rt2570/rt2570-1.1.0_beta1.ebuild
+++ b/net-wireless/rt2570/rt2570-1.1.0_beta1.ebuild
@@ -1,13 +1,14 @@
# 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.2 2005/12/27 00:13:45 steev Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-wireless/rt2570/rt2570-1.1.0_beta1.ebuild,v 1.3 2005/12/31 16:45:44 steev Exp $
inherit eutils linux-mod
MY_P="${P/_beta/-b}"
DESCRIPTION="Driver for the RaLink RT2570 USB wireless chipset"
HOMEPAGE="http://rt2x00.serialmonkey.com"
-SRC_URI="http://rt2x00.serialmonkey.com/${MY_P}.tar.gz"
+SRC_URI="http://rt2x00.serialmonkey.com/${MY_P}.tar.gz
+ http://dev.gentoo.org/~steev/distfiles/rt2570-cvs-update.patch.gz"
LICENSE="GPL-2"
KEYWORDS="~x86"
@@ -31,7 +32,7 @@ pkg_setup() {
src_compile() {
if kernel_is ge 2 6 14 ; then
- epatch "${FILESDIR}"/verify-write-api-change.patch
+ epatch "${WORKDIR}"/rt2570-cvs-update.patch
fi
linux-mod_src_compile
}
--
cgit v1.2.3-65-gdbad