AUX ndiswrapper-1.55-2.6.31.patch 549 RMD160 4f4a25b18de205116a79c5790b49c82316a22118 SHA1 ad48179ae62cb8e71a6a19d0ef0130a523245acc SHA256 8b13dc047acfa480022addfb38885079240f8addb6e259f535b82f446b4db480
-AUX ndiswrapper-2.6.27.patch 5115 RMD160 4587f44cc92ea1f5bca7703feff344a66ee4f68a SHA1 4e57a4998cd801bc3752f5bfc486bab65be9d14e SHA256 1ebf7e49f4324a20347ccd4d3f7b2bc4b449328a63bc3f08f734167620daf1ba
-AUX ndiswrapper-CVE-2008-4395.patch 3032 RMD160 ef09a1bed8d81adb62fe700c144a11e0a3ff9a90 SHA1 d333ef0fc877587a0947b3f4dba49f9586136f86 SHA256 62860197b6f9fa749a3c94c2577a8bd0fd101a518592625b3884ca30b97bf71e
-DIST ndiswrapper-1.53.tar.gz 198629 RMD160 48ab7712b54e4a1cc8b5fadcb4f3e9554532e117 SHA1 0d27b2f1d59d6d4bcb6b384cab946f99cb1889d7 SHA256 780045e3ac60da55f411b19fd3e90839fd6f412347fc86cf4636e1a1ba15c200
DIST ndiswrapper-1.55.tar.gz 199019 RMD160 121574be765da889cdb3446af3facab840aa2054 SHA1 84f7b08347f09df109722dccfdf18cf439fbc3be SHA256 dc9ca11c8ff6eaf8b10d4e6a04e982ad46055dfefe619b5f79914aa4fb52f0fe
-EBUILD ndiswrapper-1.53-r1.ebuild 3115 RMD160 9d4b0549cefd7b99d442437c4fcab5b776e43676 SHA1 c94515526657bf4c96a5d1fa3ff7c2623e289603 SHA256 2058b393b9bbc87e9d269e95a5d70b8e499f84e5df17fb7865aa32663b841907
EBUILD ndiswrapper-1.55-r1.ebuild 2999 RMD160 678779f46797fde5699a5f62b8480a8a056e9578 SHA1 93f6fcf25e4154848b816ffb718e1cdb85069465 SHA256 3fa951bf0c35c17f92f8cdf25f99ebe9073cbac4075d4a870fd51921cdb59b4c
-EBUILD ndiswrapper-1.55.ebuild 2950 RMD160 ca3769825ccfc77cfcd5f3e418999695e342f6db SHA1 5eb4c63be6963746750d40f7a1abba20f9f4ca7d SHA256 ad5952d3bbb9919014afd4f85c8a3d6e6d38290b770c63cf5f056294514becdf
MISC ChangeLog 19596 RMD160 733f79515771afa22bed31e4533c649907f3b374 SHA1 257ef1aa76817a0cce07bfff54ba72270daa0475 SHA256 df77a2a114c4e45b308210576a4b5962d03026d7d44f6bbbd06cbec62f242f35
MISC metadata.xml 383 RMD160 4a74c5be8395980c900671a72c5052acb7bd7fbc SHA1 65eb582d92385c395dc5a52e0afdb82bf28fb08a SHA256 87fa14555c841802272659ef90d1656c4b7adceec06f8137555aa707474b00d1
+++ /dev/null
---- trunk/ndiswrapper/driver/iw_ndis.c 2008/05/18 04:27:22 2663
-+++ trunk/ndiswrapper/driver/iw_ndis.c 2008/07/10 15:17:50 2668
-@@ -1015,7 +1015,16 @@
- return 0;
- }
-
--static char *ndis_translate_scan(struct net_device *dev, char *event,
-+#if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 27) && !defined(IW_REQUEST_FLAG_COMPAT)
-+#define iwe_stream_add_event(a, b, c, d, e) iwe_stream_add_event(b, c, d, e)
-+#define iwe_stream_add_point(a, b, c, d, e) iwe_stream_add_point(b, c, d, e)
-+#define iwe_stream_add_value(a, b, c, d, e, f) \
-+ iwe_stream_add_value(b, c, d, e, f)
-+#define iwe_stream_lcp_len(a) IW_EV_LCP_LEN
-+#endif
-+
-+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 +1043,8 @@
- 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 +1054,15 @@
- 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 +1073,8 @@
- 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 +1089,8 @@
- /* 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 +1104,8 @@
- 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,11 +1116,12 @@
- 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));
-- current_val = event + IW_EV_LCP_LEN;
-+ current_val = event + iwe_stream_lcp_len(info);
- iwe.cmd = SIOCGIWRATE;
- if (bssid->length > sizeof(*bssid))
- nrates = NDIS_MAX_RATES_EX;
-@@ -1115,26 +1131,27 @@
- 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);
- }
- }
-
-- if ((current_val - event) > IW_EV_LCP_LEN)
-+ if ((current_val - event) > iwe_stream_lcp_len(info))
- event = current_val;
-
- memset(&iwe, 0, sizeof(iwe));
- 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,8 +1172,9 @@
- memset(&iwe, 0, sizeof(iwe));
- iwe.cmd = IWEVGENIE;
- iwe.u.data.length = ielen;
-- event = iwe_stream_add_point(event, end_buf,
-- &iwe, iep);
-+ event = iwe_stream_add_point(info, event,
-+ end_buf, &iwe,
-+ iep);
- }
- iep += ielen;
- }
-@@ -1236,7 +1254,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);
+++ /dev/null
-diff --git a/ubuntu/ndiswrapper/iw_ndis.c b/ubuntu/ndiswrapper/iw_ndis.c
-index b114ef6..01d3751 100644
---- a/ubuntu/ndiswrapper/iw_ndis.c
-+++ b/ubuntu/ndiswrapper/iw_ndis.c
-@@ -47,12 +47,7 @@ int set_essid(struct ndis_device *wnd, const char *ssid, int ssid_len)
- req.length = ssid_len;
- if (ssid_len)
- memcpy(&req.essid, ssid, ssid_len);
-- DBG_BLOCK(2) {
-- char buf[NDIS_ESSID_MAX_SIZE+1];
-- memcpy(buf, ssid, ssid_len);
-- buf[ssid_len] = 0;
-- TRACE2("ssid = '%s'", buf);
-- }
-+ TRACE2("ssid = '%.*s'", ssid_len, ssid);
-
- res = mp_set(wnd, OID_802_11_SSID, &req, sizeof(req));
- if (res) {
-@@ -125,7 +120,6 @@ static int iw_get_essid(struct net_device *dev, struct iw_request_info *info,
- EXIT2(return -EOPNOTSUPP);
- }
- memcpy(extra, req.essid, req.length);
-- extra[req.length] = 0;
- if (req.length > 0)
- wrqu->essid.flags = 1;
- else
-@@ -1000,7 +994,7 @@ static int iw_set_nick(struct net_device *dev, struct iw_request_info *info,
-
- if (wrqu->data.length > IW_ESSID_MAX_SIZE || wrqu->data.length <= 0)
- return -EINVAL;
-- memset(wnd->nick, 0, sizeof(wnd->nick));
-+ wnd->nick_len = wrqu->data.length;
- memcpy(wnd->nick, extra, wrqu->data.length);
- return 0;
- }
-@@ -1010,7 +1004,7 @@ static int iw_get_nick(struct net_device *dev, struct iw_request_info *info,
- {
- struct ndis_device *wnd = netdev_priv(dev);
-
-- wrqu->data.length = strlen(wnd->nick);
-+ wrqu->data.length = wnd->nick_len;
- memcpy(extra, wnd->nick, wrqu->data.length);
- return 0;
- }
-diff --git a/ubuntu/ndiswrapper/ndis.h b/ubuntu/ndiswrapper/ndis.h
-index 27ba99e..65d6b0b 100644
---- a/ubuntu/ndiswrapper/ndis.h
-+++ b/ubuntu/ndiswrapper/ndis.h
-@@ -878,6 +878,7 @@ struct ndis_device {
- unsigned long scan_timestamp;
- struct encr_info encr_info;
- char nick[IW_ESSID_MAX_SIZE];
-+ size_t nick_len;
- struct ndis_essid essid;
- struct auth_encr_capa capa;
- enum ndis_infrastructure_mode infrastructure_mode;
-diff --git a/ubuntu/ndiswrapper/proc.c b/ubuntu/ndiswrapper/proc.c
-index fd5f433..6feff23 100644
---- a/ubuntu/ndiswrapper/proc.c
-+++ b/ubuntu/ndiswrapper/proc.c
-@@ -97,10 +97,8 @@ static int procfs_read_ndis_encr(char *page, char **start, off_t off,
- p += sprintf(p, "\n");
-
- res = mp_query(wnd, OID_802_11_SSID, &essid, sizeof(essid));
-- if (!res) {
-- essid.essid[essid.length] = '\0';
-- p += sprintf(p, "essid=%s\n", essid.essid);
-- }
-+ if (!res)
-+ p += sprintf(p, "essid=%.*s\n", essid.length, essid.essid);
- res = mp_query_int(wnd, OID_802_11_ENCRYPTION_STATUS, &encr_status);
- if (!res) {
- typeof(&wnd->encr_info.keys[0]) tx_key;
-diff --git a/ubuntu/ndiswrapper/wrapndis.c b/ubuntu/ndiswrapper/wrapndis.c
-index f6e5d46..35ef1cd 100644
---- a/ubuntu/ndiswrapper/wrapndis.c
-+++ b/ubuntu/ndiswrapper/wrapndis.c
-@@ -2028,7 +2028,7 @@ static wstdcall NTSTATUS NdisAddDevice(struct driver_object *drv_obj,
- wnd->attributes = 0;
- wnd->dma_map_count = 0;
- wnd->dma_map_addr = NULL;
-- wnd->nick[0] = 0;
-+ wnd->nick_len = 0;
- init_timer(&wnd->hangcheck_timer);
- wnd->scan_timestamp = 0;
- init_timer(&wnd->iw_stats_timer);
+++ /dev/null
-# 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.2 2008/11/20 15:40:08 peper Exp $
-
-inherit linux-mod
-
-MY_P=${PN}-${PV/_/}
-
-DESCRIPTION="Wrapper for using Windows drivers for some wireless cards"
-HOMEPAGE="http://ndiswrapper.sourceforge.net/"
-SRC_URI="mirror://sourceforge/${PN}/${MY_P}.tar.gz"
-
-LICENSE="GPL-2"
-KEYWORDS="~amd64 x86"
-IUSE="debug usb"
-
-DEPEND="sys-apps/pciutils"
-RDEPEND="${DEPEND}
- net-wireless/wireless-tools"
-
-CONFIG_CHECK="WIRELESS_EXT"
-
-S=${WORKDIR}/${MY_P}
-
-MODULE_NAMES="ndiswrapper(misc:${S}/driver)"
-BUILD_TARGETS="all"
-MODULESD_NDISWRAPPER_ALIASES=("wlan0 ndiswrapper")
-
-ERROR_USB="You need to enable USB support in your kernel
-to use usb support in ndiswrapper."
-
-pkg_setup() {
- echo
- einfo "See http://www.gentoo.org/doc/en/gentoo-kernel.xml"
- einfo "for a list of supported kernels."
- echo
-
- use usb && CONFIG_CHECK="${CONFIG_CHECK} USB"
- linux-mod_pkg_setup
-}
-
-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"
-}
-
-src_compile() {
- local params
-
- # Enable verbose debugging information
- if use debug; then
- params="DEBUG=3"
- use usb && params="${params} USB_DEBUG=1"
- fi
-
- cd utils
- emake || die "Compile of utils failed!"
-
- use usb || params="DISABLE_USB=1"
-
- # Does not like parallel builds
- # http://bugs.gentoo.org/show_bug.cgi?id=154213
- # KBUILD value can't be quoted
- # http://bugs.gentoo.org/show_bug.cgi?id=156319
- BUILD_PARAMS="KSRC=${KV_DIR} KVERS=${KV_FULL} KBUILD=${KV_OUT_DIR} ${params} -j1"
- linux-mod_src_compile
-}
-
-src_install() {
- dodoc AUTHORS ChangeLog INSTALL README
- doman ndiswrapper.8 || die
-
- keepdir /etc/ndiswrapper
-
- linux-mod_src_install
-
- cd utils
- emake DESTDIR="${D}" install || die "emake install failed"
-}
-
-pkg_postinst() {
- linux-mod_pkg_postinst
-
- echo
- elog "NDISwrapper requires .inf and .sys files from a Windows(tm) driver"
- elog "to function. Download these to /root for example, then"
- elog "run 'ndiswrapper -i /root/foo.inf'. After that you can delete them."
- elog "They will be copied to /etc/ndiswrapper/."
- elog "Once done, please run 'update-modules'."
- elog
-
- elog "Please look at ${HOMEPAGE}"
- elog "for the FAQ, HowTos, tips, configuration, and installation"
- elog "information."
- elog
-
- local i=$(lspci -n | egrep 'Class (0280|0200):' | cut -d' ' -f4)
- if [[ -n "${i}" ]] ; then
- elog "Possible hardware: ${i}"
- elog
- fi
-
- elog "NDISwrapper devs need support (_hardware_, cash)."
- elog "Don't hesitate if you can help."
- elog "See ${HOMEPAGE} for details."
- echo
-
- if [[ ${ROOT} == "/" ]]; then
-
- einfo "Attempting to automatically reinstall any Windows drivers"
- einfo "you might already have."
- echo
-
- local driver
- for driver in $(ls /etc/ndiswrapper) ; do
- einfo "Driver: ${driver}"
- mv "/etc/ndiswrapper/${driver}" "${T}"
- ndiswrapper -i "${T}/${driver}/${driver}.inf"
- done
- fi
-}
+++ /dev/null
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-wireless/ndiswrapper/ndiswrapper-1.55.ebuild,v 1.1 2009/08/01 12:46:51 ssuominen Exp $
-
-inherit linux-mod
-
-MY_P=${PN}-${PV/_/}
-
-DESCRIPTION="Wrapper for using Windows drivers for some wireless cards"
-HOMEPAGE="http://ndiswrapper.sourceforge.net/"
-SRC_URI="mirror://sourceforge/${PN}/${MY_P}.tar.gz"
-
-LICENSE="GPL-2"
-KEYWORDS="~amd64 ~x86"
-IUSE="debug usb"
-
-DEPEND="sys-apps/pciutils"
-RDEPEND="${DEPEND}
- net-wireless/wireless-tools"
-
-CONFIG_CHECK="WIRELESS_EXT"
-
-S=${WORKDIR}/${MY_P}
-
-MODULE_NAMES="ndiswrapper(misc:${S}/driver)"
-BUILD_TARGETS="all"
-MODULESD_NDISWRAPPER_ALIASES=("wlan0 ndiswrapper")
-
-ERROR_USB="You need to enable USB support in your kernel
-to use usb support in ndiswrapper."
-
-pkg_setup() {
- echo
- einfo "See http://www.gentoo.org/doc/en/gentoo-kernel.xml"
- einfo "for a list of supported kernels."
- echo
-
- use usb && CONFIG_CHECK="${CONFIG_CHECK} USB"
- linux-mod_pkg_setup
-}
-
-src_unpack() {
- unpack ${A}
- convert_to_m "${S}/driver/Makefile"
-}
-
-src_compile() {
- local params
-
- # Enable verbose debugging information
- if use debug; then
- params="DEBUG=3"
- use usb && params="${params} USB_DEBUG=1"
- fi
-
- cd utils
- emake || die "Compile of utils failed!"
-
- use usb || params="DISABLE_USB=1"
-
- # Does not like parallel builds
- # http://bugs.gentoo.org/show_bug.cgi?id=154213
- # KBUILD value can't be quoted
- # http://bugs.gentoo.org/show_bug.cgi?id=156319
- BUILD_PARAMS="KSRC=${KV_DIR} KVERS=${KV_FULL} KBUILD=${KV_OUT_DIR} ${params} -j1"
- linux-mod_src_compile
-}
-
-src_install() {
- dodoc AUTHORS ChangeLog INSTALL README
- doman ndiswrapper.8 || die
-
- keepdir /etc/ndiswrapper
-
- linux-mod_src_install
-
- cd utils
- emake DESTDIR="${D}" install || die "emake install failed"
-}
-
-pkg_postinst() {
- linux-mod_pkg_postinst
-
- echo
- elog "NDISwrapper requires .inf and .sys files from a Windows(tm) driver"
- elog "to function. Download these to /root for example, then"
- elog "run 'ndiswrapper -i /root/foo.inf'. After that you can delete them."
- elog "They will be copied to /etc/ndiswrapper/."
- elog "Once done, please run 'update-modules'."
- elog
-
- elog "Please look at ${HOMEPAGE}"
- elog "for the FAQ, HowTos, tips, configuration, and installation"
- elog "information."
- elog
-
- local i=$(lspci -n | egrep 'Class (0280|0200):' | cut -d' ' -f4)
- if [[ -n "${i}" ]] ; then
- elog "Possible hardware: ${i}"
- elog
- fi
-
- elog "NDISwrapper devs need support (_hardware_, cash)."
- elog "Don't hesitate if you can help."
- elog "See ${HOMEPAGE} for details."
- echo
-
- if [[ ${ROOT} == "/" ]]; then
-
- einfo "Attempting to automatically reinstall any Windows drivers"
- einfo "you might already have."
- echo
-
- local driver
- for driver in $(ls /etc/ndiswrapper) ; do
- einfo "Driver: ${driver}"
- mv "/etc/ndiswrapper/${driver}" "${T}"
- ndiswrapper -i "${T}/${driver}/${driver}.inf"
- done
- fi
-}
projects / gentoo.git / commitdiff