summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorHenrik Brix Andersen <brix@gentoo.org>2005-06-18 09:20:38 +0000
committerHenrik Brix Andersen <brix@gentoo.org>2005-06-18 09:20:38 +0000
commitbd0115ae0fdd6de9d3a6dd830078864a7d101aae (patch)
tree0678c19eecb11ac1b95ee0e422181ddfc2cf534f /net-wireless/ipw2100
parentstable on x86 (diff)
downloadhistorical-bd0115ae0fdd6de9d3a6dd830078864a7d101aae.tar.gz
historical-bd0115ae0fdd6de9d3a6dd830078864a7d101aae.tar.bz2
historical-bd0115ae0fdd6de9d3a6dd830078864a7d101aae.zip
Apply patch for allow compiling against linux-2.6.12, bug #96435.
Package-Manager: portage-2.0.51.22-r1
Diffstat (limited to 'net-wireless/ipw2100')
-rw-r--r--net-wireless/ipw2100/ChangeLog6
-rw-r--r--net-wireless/ipw2100/Manifest5
-rw-r--r--net-wireless/ipw2100/files/ipw2100-1.1.0-is_multicast_ether_addr.patch17
-rw-r--r--net-wireless/ipw2100/ipw2100-1.1.0.ebuild3
4 files changed, 27 insertions, 4 deletions
diff --git a/net-wireless/ipw2100/ChangeLog b/net-wireless/ipw2100/ChangeLog
index 45886ddab1b8..4ffaf0f2e769 100644
--- a/net-wireless/ipw2100/ChangeLog
+++ b/net-wireless/ipw2100/ChangeLog
@@ -1,6 +1,10 @@
# ChangeLog for net-wireless/ipw2100
# Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-wireless/ipw2100/ChangeLog,v 1.74 2005/05/15 09:20:51 brix Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-wireless/ipw2100/ChangeLog,v 1.75 2005/06/18 09:20:38 brix Exp $
+
+ 18 Jun 2005; <brix@gentoo.org>
+ +files/ipw2100-1.1.0-is_multicast_ether_addr.patch, ipw2100-1.1.0.ebuild:
+ Apply patch for allow compiling against linux-2.6.12, bug #96435.
15 May 2005; <brix@gentoo.org> -ipw2100-1.0.5.ebuild:
Pruned old ebuild.
diff --git a/net-wireless/ipw2100/Manifest b/net-wireless/ipw2100/Manifest
index 201b85200764..bb7d1a690975 100644
--- a/net-wireless/ipw2100/Manifest
+++ b/net-wireless/ipw2100/Manifest
@@ -1,5 +1,6 @@
-MD5 4baf97a4271820a2ca58815492285b05 ipw2100-1.1.0.ebuild 2203
-MD5 a4b8f5534fb07e7e95522281485a0522 ChangeLog 14239
+MD5 b498b43592d0c62f499e9f9b965ff9ce ipw2100-1.1.0.ebuild 2258
+MD5 5ddaba07700ef7b7f86a8e3613c29bff ChangeLog 14417
MD5 172db10566470c8f64b5911609a8e5f9 metadata.xml 318
MD5 5fb2369d48eb758371baed2ff166ce10 files/ipw2100-1.1.0-suspend2.patch 1173
MD5 8c080b5455def312dc8b8fb2da3ffa12 files/digest-ipw2100-1.1.0 62
+MD5 963a9937088ce7886c88a7553921d142 files/ipw2100-1.1.0-is_multicast_ether_addr.patch 695
diff --git a/net-wireless/ipw2100/files/ipw2100-1.1.0-is_multicast_ether_addr.patch b/net-wireless/ipw2100/files/ipw2100-1.1.0-is_multicast_ether_addr.patch
new file mode 100644
index 000000000000..00eaed5bc48f
--- /dev/null
+++ b/net-wireless/ipw2100/files/ipw2100-1.1.0-is_multicast_ether_addr.patch
@@ -0,0 +1,17 @@
+diff -urp ipw2100-1.1.0/ieee80211.h ipw2100-1.1.0-is_multicast_ether_addr/ieee80211.h
+--- ipw2100-1.1.0/ieee80211.h 2005-03-14 17:54:24.000000000 +0100
++++ ipw2100-1.1.0-is_multicast_ether_addr/ieee80211.h 2005-06-18 11:15:43.000000000 +0200
+@@ -643,10 +643,12 @@ enum ieee80211_state {
+ #define MAC_ARG(x) ((u8*)(x))[0],((u8*)(x))[1],((u8*)(x))[2],((u8*)(x))[3],((u8*)(x))[4],((u8*)(x))[5]
+
+
++#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,12)
+ extern inline int is_multicast_ether_addr(const u8 *addr)
+ {
+ return ((addr[0] != 0xff) && (0x01 & addr[0]));
+ }
++#endif
+
+ extern inline int is_broadcast_ether_addr(const u8 *addr)
+ {
+Only in ipw2100-1.1.0-is_multicast_ether_addr: ieee80211.h.orig
diff --git a/net-wireless/ipw2100/ipw2100-1.1.0.ebuild b/net-wireless/ipw2100/ipw2100-1.1.0.ebuild
index 646e810a6c70..7a1852ead607 100644
--- a/net-wireless/ipw2100/ipw2100-1.1.0.ebuild
+++ b/net-wireless/ipw2100/ipw2100-1.1.0.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/ipw2100/ipw2100-1.1.0.ebuild,v 1.3 2005/05/05 19:55:41 brix Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-wireless/ipw2100/ipw2100-1.1.0.ebuild,v 1.4 2005/06/18 09:20:38 brix Exp $
inherit eutils linux-mod
@@ -60,6 +60,7 @@ src_unpack() {
cd ${S}
epatch ${FILESDIR}/${P}-suspend2.patch
+ epatch ${FILESDIR}/${P}-is_multicast_ether_addr.patch
use debug && debug="y"
sed -i \