diff options
| author |   Christoph Mende <angelos@gentoo.org> | 2010-12-14 18:49:44 +0000 |
|---|---|---|
| committer | Christoph Mende <angelos@gentoo.org> | 2010-12-14 18:49:44 +0000 |
| commit | 74958949290522b389bc0dd894219561921d5015 (patch) | |
| tree | 14c1474465320fec9e89ce68e14fbb546bb16b16 /net-wireless/ndiswrapper | |
| parent | Version bump. (diff) | |
| download | gentoo-2-74958949290522b389bc0dd894219561921d5015.tar.gz gentoo-2-74958949290522b389bc0dd894219561921d5015.tar.bz2 gentoo-2-74958949290522b389bc0dd894219561921d5015.zip | |
Imported upstream patch for 2.6.36 (bug 342159)
(Portage version: 2.1.9.25/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.36.patch | 29 | ||||
| -rw-r--r-- | net-wireless/ndiswrapper/ndiswrapper-1.56.ebuild | 5 |
3 files changed, 38 insertions, 4 deletions
diff --git a/net-wireless/ndiswrapper/ChangeLog b/net-wireless/ndiswrapper/ChangeLog index 39b82d613349..0225d92d956e 100644 --- a/net-wireless/ndiswrapper/ChangeLog +++ b/net-wireless/ndiswrapper/ChangeLog @@ -1,8 +1,12 @@ # 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.113 2010/09/11 07:20:37 angelos Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-wireless/ndiswrapper/ChangeLog,v 1.114 2010/12/14 18:49:44 angelos Exp $ - 06 Sep 2010; <angelos@gentoo.org> ndiswrapper-1.56.ebuild, + 14 Dec 2010; Christoph Mende <angelos@gentoo.org> ndiswrapper-1.56.ebuild, + +files/ndiswrapper-1.56-2.6.36.patch: + Imported upstream patch for 2.6.36 (bug 342159) + + 06 Sep 2010; Christoph Mende <angelos@gentoo.org> ndiswrapper-1.56.ebuild, +files/ndiswrapper-1.56-2.6.35.patch, +files/ndiswrapper-1.56-cflags.patch: Fix compilation with 2.6.35 (bug #331961) and respect CFLAGS (bug #331963) diff --git a/net-wireless/ndiswrapper/files/ndiswrapper-1.56-2.6.36.patch b/net-wireless/ndiswrapper/files/ndiswrapper-1.56-2.6.36.patch new file mode 100644 index 000000000000..1c32151360cd --- /dev/null +++ b/net-wireless/ndiswrapper/files/ndiswrapper-1.56-2.6.36.patch @@ -0,0 +1,29 @@ +--- trunk/ndiswrapper/driver/loader.c 2010/09/13 08:35:26 2725 ++++ trunk/ndiswrapper/driver/loader.c 2010/09/13 08:43:15 2726 +@@ -750,8 +750,13 @@ + } + + /* called with loader_mutex is down */ ++#ifdef HAVE_UNLOCKED_IOCTL ++static long wrapper_ioctl(struct file *file, ++ unsigned int cmd, unsigned long arg) ++#else + static int wrapper_ioctl(struct inode *inode, struct file *file, + unsigned int cmd, unsigned long arg) ++#endif + { + struct load_driver *load_driver; + struct load_device load_device; +@@ -831,7 +836,12 @@ + + static struct file_operations wrapper_fops = { + .owner = THIS_MODULE, ++ ++#ifdef HAVE_UNLOCKED_IOCTL ++ .unlocked_ioctl = wrapper_ioctl, ++#else + .ioctl = wrapper_ioctl, ++#endif + .release = wrapper_ioctl_release, + }; + diff --git a/net-wireless/ndiswrapper/ndiswrapper-1.56.ebuild b/net-wireless/ndiswrapper/ndiswrapper-1.56.ebuild index 4cefa3ba7b44..fa91e7b0376b 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 # 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.5 2010/09/11 07:20:37 angelos Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-wireless/ndiswrapper/ndiswrapper-1.56.ebuild,v 1.6 2010/12/14 18:49:44 angelos Exp $ EAPI=2 inherit base linux-mod toolchain-funcs @@ -17,7 +17,8 @@ DEPEND="sys-apps/pciutils" RDEPEND="${DEPEND} net-wireless/wireless-tools" -PATCHES=( "${FILESDIR}"/${P}-cflags.patch "${FILESDIR}"/${P}-ldflags.patch "${FILESDIR}"/${P}-2.6.35.patch ) +PATCHES=( "${FILESDIR}"/${P}-cflags.patch "${FILESDIR}"/${P}-ldflags.patch + "${FILESDIR}"/${P}-2.6.35.patch "${FILESDIR}"/${P}-2.6.36.patch ) MODULE_NAMES="ndiswrapper(misc:${S}/driver)" BUILD_TARGETS="all" MODULESD_NDISWRAPPER_ALIASES=("wlan0 ndiswrapper") |