diff options
| -rw-r--r-- | net-wireless/ndiswrapper/ChangeLog | 6 | ||||
| -rw-r--r-- | net-wireless/ndiswrapper/Manifest | 5 | ||||
| -rw-r--r-- | net-wireless/ndiswrapper/files/ndiswrapper-2.6.27.patch | 116 | ||||
| -rw-r--r-- | net-wireless/ndiswrapper/ndiswrapper-1.53-r1.ebuild | 7 |
4 files changed, 130 insertions, 4 deletions
diff --git a/net-wireless/ndiswrapper/ChangeLog b/net-wireless/ndiswrapper/ChangeLog index c45f19ff509e..74a83bfe2f5c 100644 --- a/net-wireless/ndiswrapper/ChangeLog +++ b/net-wireless/ndiswrapper/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for net-wireless/ndiswrapper # Copyright 2000-2008 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/net-wireless/ndiswrapper/ChangeLog,v 1.103 2008/10/27 12:52:56 peper Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-wireless/ndiswrapper/ChangeLog,v 1.104 2008/11/20 15:40:08 peper Exp $ + + 20 Nov 2008; Piotr Jaroszyński <peper@gentoo.org> + +files/ndiswrapper-2.6.27.patch, ndiswrapper-1.53-r1.ebuild: + Add patch for kernel 2.6.27. *ndiswrapper-1.53-r1 (27 Oct 2008) diff --git a/net-wireless/ndiswrapper/Manifest b/net-wireless/ndiswrapper/Manifest index 6f4c1330e83f..6e430e775baf 100644 --- a/net-wireless/ndiswrapper/Manifest +++ b/net-wireless/ndiswrapper/Manifest @@ -1,6 +1,7 @@ AUX ndiswrapper-1.46-ksrc.patch 1635 RMD160 705a2ebc0198eb9c94e041e544128adb44824733 SHA1 fc44ca239c8a8ab067d88a8371fbafb85a1421e9 SHA256 6b46e194ec4418f6497c97d88679f2ecc02451516396cffda43e3945b02dcf52 AUX ndiswrapper-1.47-ksrc.patch 592 RMD160 ac2831b9f676ab4348875f4fae3e54b99b151790 SHA1 4ab7a69f56251f6055a1ec0e4153a6835792d2cf SHA256 38cc21054be40c047c8135d4eb009dd72573a4fa7edb8ee310769e5c54ee16c1 AUX ndiswrapper-1.50_rc1-makefile.patch 600 RMD160 f8b4f17ba938538303e6c895711933a9464f99cb SHA1 ab868623df14704eb4e09cda7cc7b03801afe09b SHA256 8188c4eb1d6ca8353e3c3de27803563c96db5607492e23ef71bcfbdad9336648 +AUX ndiswrapper-2.6.27.patch 4310 RMD160 5c0fd2da986f75fe11e89089396387f4dbab483b SHA1 c58da1413507be750224c07e6bb17c789b9f33e8 SHA256 ce413ecb234082df45ee5cda9717db26d5c3840c14e38c9bcc31778634adca1a AUX ndiswrapper-CVE-2008-4395.patch 3032 RMD160 ef09a1bed8d81adb62fe700c144a11e0a3ff9a90 SHA1 d333ef0fc877587a0947b3f4dba49f9586136f86 SHA256 62860197b6f9fa749a3c94c2577a8bd0fd101a518592625b3884ca30b97bf71e AUX ndiswrapper-new_suspend2.patch 891 RMD160 1dbb59e400ea8cac62bbc6cbb2c757b08b078c91 SHA1 6fdde32982d8c422838a3b5f9934245dd5869459 SHA256 dec61532d2c7eec07f387681616026e0472bc1d9024785a1bb5178769f6c2e5c DIST ndiswrapper-1.47.tar.gz 198265 RMD160 72082c5a825e77e444e2cf29f6e6e5fcc11b2e02 SHA1 2431c8f74cab37d3f4c39c6d1b625e0b8312282e SHA256 8ee24f7a4c625fa12deb69d6fa530618c6eca0909848de439f54ebda16e7d312 @@ -16,7 +17,7 @@ EBUILD ndiswrapper-1.49.ebuild 2946 RMD160 0fb36a76769e61aa900caa6e1e4b954ebb453 EBUILD ndiswrapper-1.50.ebuild 2945 RMD160 8230368ca8cbc01be87a4aa769b15da442987957 SHA1 107855fa2fc3d8c0c55377c0ca327767a71237f4 SHA256 f046f67f4994609f8cc648c1b555a09188b89bbe9747f65e582762a67fde4cf9 EBUILD ndiswrapper-1.51.ebuild 2946 RMD160 bb0235e729f18a4aa989b07844a884d7b9c52290 SHA1 b59a3407e701c7356dc27d7a1a9c5f900617f7b7 SHA256 9bd728fbb2230f11f59666a48caed8f6225fece6c9186554ff8f7e17d0f7fbbd EBUILD ndiswrapper-1.52.ebuild 2946 RMD160 b38da9817441a0eea032ba4ac0d020bc6e5dc7c0 SHA1 890ae187b4ce48b2f4546cf2341e0027586be228 SHA256 f819c3337caa94702a22c8d6e401f990cef384494f311b58724f7add646bae1a -EBUILD ndiswrapper-1.53-r1.ebuild 3021 RMD160 c056c9659c90d72cc7ca70c69ce915686beafc50 SHA1 438e760b37fc6f709f003cba630c03a1f8d42a05 SHA256 b9253ecd5850bd60b4d64107ef3c162d548b5985deefb2b1779e5ed3cb51b85c +EBUILD ndiswrapper-1.53-r1.ebuild 3115 RMD160 9d4b0549cefd7b99d442437c4fcab5b776e43676 SHA1 c94515526657bf4c96a5d1fa3ff7c2623e289603 SHA256 2058b393b9bbc87e9d269e95a5d70b8e499f84e5df17fb7865aa32663b841907 EBUILD ndiswrapper-1.53.ebuild 2946 RMD160 374bbb2e51718b38ab33d9ee07184390362bed20 SHA1 bc9d6a89299c6a99a912d64f09c5e9e9cb66e794 SHA256 a5ad6aedd1effd912e3f0496c6a317bc81c9b936b8a179854d98685ff2b271ac -MISC ChangeLog 18823 RMD160 5f16837ec4dcfca4d3fc2c06c61858f2a4782a09 SHA1 1d62426127157f456f3f2995d3ec77ec1f739e52 SHA256 1d141bd6c7ed93985eb6a9c27e2bbd9bb4f6b75b4d8f8774e8c24ab83c0a5f87 +MISC ChangeLog 18971 RMD160 eced70458141ed3550d014b20ba88724ee022e5e SHA1 fdc8bf27aff21595b8404b7a2d1f17d77591fad6 SHA256 1d68d5adc89cadd086c9b1d66299d8806dd6f228e6d95170c680dde6f046436b MISC metadata.xml 480 RMD160 bd309ddc508e0436d0b2bb4c6ac2915fb7d9cea7 SHA1 14a2b92b64b18b0b79653fe64a9c282ae16331f2 SHA256 7ca20f317d16e17be26b34401258fc10ceb6d5698e89fc853fae59aa74cb0e66 diff --git a/net-wireless/ndiswrapper/files/ndiswrapper-2.6.27.patch b/net-wireless/ndiswrapper/files/ndiswrapper-2.6.27.patch new file mode 100644 index 000000000000..522dfe9afba5 --- /dev/null +++ b/net-wireless/ndiswrapper/files/ndiswrapper-2.6.27.patch @@ -0,0 +1,116 @@ +diff -aur driver.old/iw_ndis.c driver/iw_ndis.c +--- driver.old/iw_ndis.c 2008-08-04 21:10:16.000000000 +0200 ++++ driver/iw_ndis.c 2008-08-04 21:30:12.000000000 +0200 +@@ -1015,7 +1015,7 @@ + return 0; + } + +-static char *ndis_translate_scan(struct net_device *dev, char *event, ++static char *ndis_translate_scan(struct net_device *dev, struct iw_request_info *info, char *event, + char *end_buf, void *item) + { + struct iw_event iwe; +@@ -1034,7 +1034,7 @@ + iwe.u.ap_addr.sa_family = ARPHRD_ETHER; + iwe.len = IW_EV_ADDR_LEN; + memcpy(iwe.u.ap_addr.sa_data, bssid->mac, ETH_ALEN); +- event = iwe_stream_add_event(event, end_buf, &iwe, IW_EV_ADDR_LEN); ++ event = iwe_stream_add_event(info, event, end_buf, &iwe, IW_EV_ADDR_LEN); + + /* add essid */ + memset(&iwe, 0, sizeof(iwe)); +@@ -1044,13 +1044,13 @@ + iwe.u.data.length = IW_ESSID_MAX_SIZE; + iwe.u.data.flags = 1; + iwe.len = IW_EV_POINT_LEN + iwe.u.data.length; +- event = iwe_stream_add_point(event, end_buf, &iwe, bssid->ssid.essid); ++ event = iwe_stream_add_point(info, event, end_buf, &iwe, bssid->ssid.essid); + + /* add protocol name */ + memset(&iwe, 0, sizeof(iwe)); + iwe.cmd = SIOCGIWNAME; + strncpy(iwe.u.name, network_type_to_name(bssid->net_type), IFNAMSIZ); +- event = iwe_stream_add_event(event, end_buf, &iwe, IW_EV_CHAR_LEN); ++ event = iwe_stream_add_event(info, event, end_buf, &iwe, IW_EV_CHAR_LEN); + + /* add mode */ + memset(&iwe, 0, sizeof(iwe)); +@@ -1061,7 +1061,7 @@ + iwe.u.mode = IW_MODE_INFRA; + else // if (bssid->mode == Ndis802_11AutoUnknown) + iwe.u.mode = IW_MODE_AUTO; +- event = iwe_stream_add_event(event, end_buf, &iwe, IW_EV_UINT_LEN); ++ event = iwe_stream_add_event(info, event, end_buf, &iwe, IW_EV_UINT_LEN); + + /* add freq */ + memset(&iwe, 0, sizeof(iwe)); +@@ -1076,7 +1076,7 @@ + /* convert from kHz to Hz */ + iwe.u.freq.e += 3; + iwe.len = IW_EV_FREQ_LEN; +- event = iwe_stream_add_event(event, end_buf, &iwe, IW_EV_FREQ_LEN); ++ event = iwe_stream_add_event(info, event, end_buf, &iwe, IW_EV_FREQ_LEN); + + /* add qual */ + memset(&iwe, 0, sizeof(iwe)); +@@ -1090,7 +1090,7 @@ + iwe.u.qual.noise = WL_NOISE; + iwe.u.qual.qual = i; + iwe.len = IW_EV_QUAL_LEN; +- event = iwe_stream_add_event(event, end_buf, &iwe, IW_EV_QUAL_LEN); ++ event = iwe_stream_add_event(info, event, end_buf, &iwe, IW_EV_QUAL_LEN); + + /* add key info */ + memset(&iwe, 0, sizeof(iwe)); +@@ -1101,7 +1101,7 @@ + iwe.u.data.flags = IW_ENCODE_ENABLED | IW_ENCODE_NOKEY; + iwe.u.data.length = 0; + iwe.len = IW_EV_POINT_LEN; +- event = iwe_stream_add_point(event, end_buf, &iwe, bssid->ssid.essid); ++ event = iwe_stream_add_point(info, event, end_buf, &iwe, bssid->ssid.essid); + + /* add rate */ + memset(&iwe, 0, sizeof(iwe)); +@@ -1115,7 +1115,7 @@ + if (bssid->rates[i] & 0x7f) { + iwe.u.bitrate.value = ((bssid->rates[i] & 0x7f) * + 500000); +- current_val = iwe_stream_add_value(event, current_val, ++ current_val = iwe_stream_add_value(info, event, current_val, + end_buf, &iwe, + IW_EV_PARAM_LEN); + } +@@ -1128,13 +1128,13 @@ + iwe.cmd = IWEVCUSTOM; + sprintf(buf, "bcn_int=%d", bssid->config.beacon_period); + iwe.u.data.length = strlen(buf); +- event = iwe_stream_add_point(event, end_buf, &iwe, buf); ++ event = iwe_stream_add_point(info, event, end_buf, &iwe, buf); + + memset(&iwe, 0, sizeof(iwe)); + iwe.cmd = IWEVCUSTOM; + sprintf(buf, "atim=%u", bssid->config.atim_window); + iwe.u.data.length = strlen(buf); +- event = iwe_stream_add_point(event, end_buf, &iwe, buf); ++ event = iwe_stream_add_point(info, event, end_buf, &iwe, buf); + + TRACE2("%d, %u", bssid->length, (unsigned int)sizeof(*bssid)); + if (bssid->length > sizeof(*bssid)) { +@@ -1155,7 +1155,7 @@ + memset(&iwe, 0, sizeof(iwe)); + iwe.cmd = IWEVGENIE; + iwe.u.data.length = ielen; +- event = iwe_stream_add_point(event, end_buf, ++ event = iwe_stream_add_point(info, event, end_buf, + &iwe, iep); + } + iep += ielen; +@@ -1236,7 +1236,7 @@ + TRACE2("%d", bssid_list->num_items); + cur_item = &bssid_list->bssid[0]; + for (i = 0; i < bssid_list->num_items; i++) { +- event = ndis_translate_scan(dev, event, ++ event = ndis_translate_scan(dev, info, event, + extra + IW_SCAN_MAX_DATA, cur_item); + cur_item = (struct ndis_wlan_bssid *)((char *)cur_item + + cur_item->length); diff --git a/net-wireless/ndiswrapper/ndiswrapper-1.53-r1.ebuild b/net-wireless/ndiswrapper/ndiswrapper-1.53-r1.ebuild index c19a45ba3da5..4c59cb2b2570 100644 --- a/net-wireless/ndiswrapper/ndiswrapper-1.53-r1.ebuild +++ b/net-wireless/ndiswrapper/ndiswrapper-1.53-r1.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2008 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/net-wireless/ndiswrapper/ndiswrapper-1.53-r1.ebuild,v 1.1 2008/10/27 12:52:56 peper Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-wireless/ndiswrapper/ndiswrapper-1.53-r1.ebuild,v 1.2 2008/11/20 15:40:08 peper Exp $ inherit linux-mod @@ -43,6 +43,11 @@ src_unpack() { unpack ${A} convert_to_m "${S}/driver/Makefile" + if kernel_is ge 2 6 27 ; then + cd "${S}" + epatch "$FILESDIR/ndiswrapper-2.6.27.patch" + fi + cd "${S}/driver" epatch "${FILESDIR}/ndiswrapper-CVE-2008-4395.patch" } |