diff options
author | Christoph Mende <angelos@gentoo.org> | 2011-02-19 16:53:04 +0000 |
---|---|---|
committer | Christoph Mende <angelos@gentoo.org> | 2011-02-19 16:53:04 +0000 |
commit | 682e72593d7d870614e4dc9c771e771918fd1188 (patch) | |
tree | bc982bd0aa26eb884f90cc5001225a1892bc12f4 /net-wireless/ndiswrapper | |
parent | Drop older. (diff) | |
download | gentoo-2-682e72593d7d870614e4dc9c771e771918fd1188.tar.gz gentoo-2-682e72593d7d870614e4dc9c771e771918fd1188.tar.bz2 gentoo-2-682e72593d7d870614e4dc9c771e771918fd1188.zip |
Fixed compilation against linux 2.6.38 (bug #355401)
(Portage version: 2.1.9.40/cvs/Linux x86_64)
Diffstat (limited to 'net-wireless/ndiswrapper')
-rw-r--r-- | net-wireless/ndiswrapper/ChangeLog | 8 | ||||
-rw-r--r-- | net-wireless/ndiswrapper/files/ndiswrapper-1.56-2.6.38.patch | 24 | ||||
-rw-r--r-- | net-wireless/ndiswrapper/ndiswrapper-1.56.ebuild | 7 |
3 files changed, 34 insertions, 5 deletions
diff --git a/net-wireless/ndiswrapper/ChangeLog b/net-wireless/ndiswrapper/ChangeLog index 0225d92d956e..5e3e4a3206a5 100644 --- a/net-wireless/ndiswrapper/ChangeLog +++ b/net-wireless/ndiswrapper/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for net-wireless/ndiswrapper -# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/net-wireless/ndiswrapper/ChangeLog,v 1.114 2010/12/14 18:49:44 angelos Exp $ +# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2 +# $Header: /var/cvsroot/gentoo-x86/net-wireless/ndiswrapper/ChangeLog,v 1.115 2011/02/19 16:53:04 angelos Exp $ + + 19 Feb 2011; <angelos@gentoo.org> ndiswrapper-1.56.ebuild, + +files/ndiswrapper-1.56-2.6.38.patch: + Fixed compilation against linux 2.6.38 (bug #355401) 14 Dec 2010; Christoph Mende <angelos@gentoo.org> ndiswrapper-1.56.ebuild, +files/ndiswrapper-1.56-2.6.36.patch: diff --git a/net-wireless/ndiswrapper/files/ndiswrapper-1.56-2.6.38.patch b/net-wireless/ndiswrapper/files/ndiswrapper-1.56-2.6.38.patch new file mode 100644 index 000000000000..6fdb1e8871bb --- /dev/null +++ b/net-wireless/ndiswrapper/files/ndiswrapper-1.56-2.6.38.patch @@ -0,0 +1,24 @@ +--- trunk/ndiswrapper/driver/wrapndis.c 2010/09/13 09:36:56 2728 ++++ trunk/ndiswrapper/driver/wrapndis.c 2011/02/14 17:00:00 2729 +@@ -13,16 +13,16 @@ + * + */ + +-#include "ndis.h" +-#include "iw_ndis.h" +-#include "pnp.h" +-#include "loader.h" +-#include "wrapndis.h" + #include <linux/inetdevice.h> + #include <linux/ip.h> + #include <linux/tcp.h> + #include <linux/udp.h> + #include <linux/in.h> ++#include "ndis.h" ++#include "iw_ndis.h" ++#include "pnp.h" ++#include "loader.h" ++#include "wrapndis.h" + #include "wrapper.h" + + /* Functions callable from the NDIS driver */ diff --git a/net-wireless/ndiswrapper/ndiswrapper-1.56.ebuild b/net-wireless/ndiswrapper/ndiswrapper-1.56.ebuild index fa91e7b0376b..5239c0a3cb31 100644 --- a/net-wireless/ndiswrapper/ndiswrapper-1.56.ebuild +++ b/net-wireless/ndiswrapper/ndiswrapper-1.56.ebuild @@ -1,6 +1,6 @@ -# Copyright 1999-2010 Gentoo Foundation +# Copyright 1999-2011 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/net-wireless/ndiswrapper/ndiswrapper-1.56.ebuild,v 1.6 2010/12/14 18:49:44 angelos Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-wireless/ndiswrapper/ndiswrapper-1.56.ebuild,v 1.7 2011/02/19 16:53:04 angelos Exp $ EAPI=2 inherit base linux-mod toolchain-funcs @@ -18,7 +18,8 @@ RDEPEND="${DEPEND} net-wireless/wireless-tools" PATCHES=( "${FILESDIR}"/${P}-cflags.patch "${FILESDIR}"/${P}-ldflags.patch - "${FILESDIR}"/${P}-2.6.35.patch "${FILESDIR}"/${P}-2.6.36.patch ) + "${FILESDIR}"/${P}-2.6.35.patch "${FILESDIR}"/${P}-2.6.36.patch + "${FILESDIR}"/${P}-2.6.38.patch ) MODULE_NAMES="ndiswrapper(misc:${S}/driver)" BUILD_TARGETS="all" MODULESD_NDISWRAPPER_ALIASES=("wlan0 ndiswrapper") |