rpms/ndiswrapper-kmod/F-9 ndiswrapper-1.53-we_update.patch, NONE, 1.1 ndiswrapper-kmod.spec, NONE, 1.1 ndiswrapper-kmodtool-excludekernel-filterfile, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2

Author: thl Update of /cvs/free/rpms/ndiswrapper-kmod/F-9 In directory se02.es.rpmfusion.net:/tmp/cvs-serv11004 Modified Files: .cvsignore sources Added Files: ndiswrapper-1.53-we_update.patch ndiswrapper-kmod.spec ndiswrapper-kmodtool-excludekernel-filterfile Log Message: import from livna ndiswrapper-1.53-we_update.patch: --- NEW FILE ndiswrapper-1.53-we_update.patch --- --- 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); --- NEW FILE ndiswrapper-kmod.spec --- # buildforkernels macro hint: when you build a new version or a new release # that contains bugfixes or other improvements then you must disable the # "buildforkernels newest" macro for just that build; immediately after # queuing that build enable the macro again for subsequent builds; that way # a new akmod package will only get build when a new one is actually needed %define buildforkernels newest Summary: Ndiswrapper kernel module Name: ndiswrapper-kmod Version: 1.53 Release: 5%{?dist}.1 License: GPLv2 Group: System Environment/Kernel URL: http://ndiswrapper.sourceforge.net Source0: http://downloads.sf.net/ndiswrapper/ndiswrapper-%{version}.tar.gz Source11: ndiswrapper-kmodtool-excludekernel-filterfile Patch0: ndiswrapper-1.53-we_update.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) # needed for plague to make sure it builds for i586 and i686 ExclusiveArch: i586 i686 x86_64 # get the needed BuildRequires (in parts depending on what we build for) BuildRequires: %{_bindir}/kmodtool %{!?kernels:BuildRequires: buildsys-build-rpmfusion-kerneldevpkgs-%{?buildforkernels:%{buildforkernels}}%{!?buildforkernels:current}-%{_target_cpu} } # kmodtool does its magic here %{expand:%(kmodtool --target %{_target_cpu} --repo rpmfusion --kmodname %{name} --filterfile %{SOURCE11} %{?buildforkernels:--%{buildforkernels}} %{?kernels:--for-kernels "%{?kernels}"} 2>/dev/null) } %description The ndiswrapper project makes it possible to use WLAN-Hardware with Linux by means of a loadable kernel module that "wraps around" NDIS (Windows network driver API) drivers. These rpms contain just the kernel module and loader. You will also need the Windows driver for your card. WARNING: Fedora-Kernels use 4K size stack. Many Windows drivers will need at least 8K size stacks. For details read the wiki on: http:/ndiswrapper.sourceforge.net %prep # error out if there was something wrong with kmodtool %{?kmodtool_check} # print kmodtool output for debugging purposes: kmodtool --target %{_target_cpu} --repo rpmfusion --kmodname %{name} --filterfile %{SOURCE11} %{?buildforkernels:--%{buildforkernels}} %{?kernels:--for-kernels "%{?kernels}"} 2>/dev/null # go %setup -q -c -T -a 0 (cd ndiswrapper-%{version} ; %patch0 -p2 -b .we_update ) sed -i 's|/sbin/depmod -a|/bin/true|' ndiswrapper-%{version}/driver/Makefile for kernel_version in %{?kernel_versions} ; do cp -a ndiswrapper-%{version} _kmod_build_${kernel_version%%___*} done %build for kernel_version in %{?kernel_versions} ; do make V=1 %{?_smp_mflags} -C _kmod_build_${kernel_version%%___*} KVERS="${kernel_version%%___*}" KSRC="${kernel_version##*___}" KBUILD="${kernel_version##*___}" -C driver done %install rm -rf $RPM_BUILD_ROOT for kernel_version in %{?kernel_versions} ; do make -C _kmod_build_${kernel_version%%___*}/driver KVERS="${kernel_version%%___*}" KSRC="${kernel_version##*___}" KBUILD="${kernel_version##*___}" INST_DIR=$RPM_BUILD_ROOT%{kmodinstdir_prefix}/${kernel_version%%___*}/%{kmodinstdir_postfix} install chmod 0755 $RPM_BUILD_ROOT/%{kmodinstdir_prefix}/*/%{kmodinstdir_postfix}/* done %{?akmod_install} %clean rm -rf $RPM_BUILD_ROOT %changelog * Sat Oct 04 2008 Thorsten Leemhuis <fedora [AT] leemhuis [DOT] info - 1.53-5.1 - rebuild for rpm fusion * Wed Oct 01 2008 Thorsten Leemhuis <fedora [AT] leemhuis [DOT] info - 1.53-4.1 - rebuild for new kernels * Sun Sep 07 2008 Thorsten Leemhuis <fedora [AT] leemhuis [DOT] info - 1.53-3.1 - new release scheme with an additional number in release - build new akmod package * Sat Aug 16 2008 Thorsten Leemhuis <fedora [AT] leemhuis [DOT] info - 1.53-3 - rebuild for new kernels * Thu Jul 24 2008 Thorsten Leemhuis <fedora[AT]leemhuis[DOT]info> - 1.53-2 - rebuild for new Fedora kernels * Tue Jul 15 2008 kwizart < kwizart at gmail.com > - 1.53-1 - Update to 1.53 - Exclude xen (does it really works ?) - Update for WE * Tue Jul 15 2008 Thorsten Leemhuis <fedora[AT]leemhuis[DOT]info> - 1.52-35 - rebuild for new Fedora kernels * Wed Jul 02 2008 Thorsten Leemhuis <fedora[AT]leemhuis[DOT]info> - 1.52-34 - rebuild for new Fedora kernels * Fri Jun 13 2008 Thorsten Leemhuis <fedora[AT]leemhuis[DOT]info> - 1.52-33 - rebuild for new Fedora kernels * Fri Jun 06 2008 Thorsten Leemhuis <fedora[AT]leemhuis[DOT]info> - 1.52-32 - rebuild for new Fedora kernels * Thu May 15 2008 Thorsten Leemhuis <fedora[AT]leemhuis[DOT]info> - 1.52-31 - rebuild for new Fedora kernels * Sun May 04 2008 Thorsten Leemhuis <fedora[AT]leemhuis[DOT]info> - 1.52-30 - build for f9 * Sat Feb 16 2008 Thorsten Leemhuis <fedora[AT]leemhuis[DOT]info> - 1.52-1 - update to 1.52 * Sat Jan 26 2008 Thorsten Leemhuis <fedora[AT]leemhuis[DOT]info> - 1.51-2 - rebuild for new kmodtools, akmod adjustments * Sun Jan 20 2008 Thorsten Leemhuis <fedora[AT]leemhuis[DOT]info> - 1.51-1 - build akmods package - update to 1.51 * Thu Dec 20 2007 Thorsten Leemhuis <fedora[AT]leemhuis[DOT]info> - 1.48-18 - rebuilt for 2.6.21-2952.fc8xen 2.6.23.9-85.fc8 * Mon Dec 03 2007 Thorsten Leemhuis <fedora[AT]leemhuis[DOT]info> - 1.48-17 - rebuilt for 2.6.23.8-63.fc8 2.6.21-2952.fc8xen - enable debuginfo packages again * Sat Nov 10 2007 Thorsten Leemhuis <fedora[AT]leemhuis[DOT]info> - 1.48-16 - rebuilt for 2.6.23.1-49.fc8 * Mon Nov 05 2007 Thorsten Leemhuis <fedora[AT]leemhuis[DOT]info> - 1.48-15 - rebuilt for F8 kernels * Wed Oct 31 2007 Thorsten Leemhuis <fedora[AT]leemhuis[DOT]info> - 1.48-14 - rebuilt for latest kernels * Tue Oct 30 2007 Thorsten Leemhuis <fedora[AT]leemhuis[DOT]info> - 1.48-13 - rebuilt for latest kernels * Sun Oct 28 2007 Thorsten Leemhuis <fedora[AT]leemhuis[DOT]info> - 1.48-12 - rebuilt for latest kernels - adjust to rpmfusion and new kmodtool * Sat Oct 27 2007 Thorsten Leemhuis <fedora[AT]leemhuis[DOT]info> - 1.48-11 - rebuilt for latest kernels * Tue Oct 23 2007 Thorsten Leemhuis <fedora[AT]leemhuis[DOT]info> - 1.48-10 - rebuilt for latest kernels * Mon Oct 22 2007 Thorsten Leemhuis <fedora[AT]leemhuis[DOT]info> - 1.48-9 - rebuilt for latest kernels * Thu Oct 18 2007 Thorsten Leemhuis <fedora[AT]leemhuis[DOT]info> - 1.48-8 - rebuilt for latest kernels * Thu Oct 18 2007 Thorsten Leemhuis <fedora[AT]leemhuis[DOT]info> - 1.48-7 - rebuilt for latest kernels * Fri Oct 12 2007 Thorsten Leemhuis <fedora[AT]leemhuis[DOT]info> - 1.48-6 - rebuilt for latest kernels * Thu Oct 11 2007 Thorsten Leemhuis <fedora[AT]leemhuis[DOT]info> - 1.48-5 - rebuilt for latest kernels * Wed Oct 10 2007 Thorsten Leemhuis <fedora[AT]leemhuis[DOT]info> - 1.48-4 - rebuilt for latest kernels * Tue Oct 09 2007 Thorsten Leemhuis <fedora[AT]leemhuis[DOT]info> 1.48-3 - rebuilt for latest kernels * Sun Oct 07 2007 Thorsten Leemhuis <fedora AT leemhuis DOT info> - build for rawhide kernels as of today * Wed Oct 03 2007 Thorsten Leemhuis <fedora[AT]leemhuis.info> - 1.48-1 - Update to 1.48 - update for new kmod-helper stuff - build for newest kernels * Tue May 13 2007 Thorsten Leemhuis <fedora[AT]leemhuis.info> - 1.43-1 - Update to 1.43 * Tue Mar 13 2007 Thorsten Leemhuis <fedora[AT]leemhuis.info> - 1.38-1 - Update to 1.38 * Sat Oct 07 2006 Thorsten Leemhuis <fedora[AT]leemhuis.info> - 1.25-1 - Update to 1.25 - Enable xen * Mon Jun 26 2006 Thorsten Leemhuis <fedora[AT]leemhuis.info> - 1.18-2 - disable xen * Mon Jun 26 2006 Thorsten Leemhuis <fedora[AT]leemhuis.info> - 1.18-1 - Update to 1.18 * Sun Jun 11 2006 Ville Skyttä <ville.skytta at iki.fi> - 1.13-4 - Invoke kmodtool with bash instead of sh. * Sun May 14 2006 Ville Skyttä <ville.skytta at iki.fi> - 1.13-3 - Require version >= of ndiswrapper-kmod-common. - Provide *-kmod instead of kmod-* to fix upgrade woes (#970). * Thu Apr 27 2006 Ville Skyttä <ville.skytta at iki.fi> - 1.13-2 - Provide "kernel-modules" instead of "kernel-module" to match yum's config. * Sun Apr 09 2006 Thorsten Leemhuis <fedora[AT]leemhuis.info> - 1.13-1.1 - KBUILD-hack still needed for *some* kernels :-/ * Sun Apr 09 2006 Thorsten Leemhuis <fedora[AT]leemhuis.info> - 1.13-1 - Update to 1.13 - Remove KBUILD-hack again * Wed Apr 05 2006 Thorsten Leemhuis <fedora[AT]leemhuis.info> - 1.12-2 - Use KBUILD in addition to KSRC to fix build * Wed Apr 05 2006 Thorsten Leemhuis <fedora[AT]leemhuis.info> - 1.12-1 - Update to 1.12 * Tue Mar 27 2006 <fedora[AT]leemhuis.info> - 1.10-4 - small adjustments to kmod specific tasks - update kmodtool to 0.10.6 * Sat Mar 18 2006 <fedora[AT]leemhuis.info> - 1.10-3 - drop 0.lvn - use kmodtool from svn - hardcode kernel and variants * Mon Feb 13 2006 Ville Skyttä <ville.skytta at iki.fi> - 1.10-0.lvn.3 - Add URL to kmodtool. * Sun Feb 12 2006 <fedora[AT]leemhuis.info> - 1.10-0.lvn.2 - split into packages for userland and kmod - Drop epoch * Sun Feb 12 2006 <fedora[AT]leemhuis.info> - 0:1.9-0.lvn.1 - Update to 1.10 * Sat Feb 11 2006 Ville Skyttä <ville.skytta at iki.fi> - 0:1.9-0.lvn.2 - Fix doc dir modes. * Sat Feb 11 2006 <fedora[AT]leemhuis.info> - 0:1.9-0.lvn.1 - Update to 1.9 * Sun Feb 5 2006 Ville Skyttä <ville.skytta at iki.fi> - 0:1.8-0.lvn.2 - Temporary hack for 2.6.16/2.6.15 version skew in FC5test* kernels. - Fix doc file modes. * Tue Jan 17 2006 <fedora[AT]leemhuis.info> - 0:1.8-0.lvn.1 - Update to 1.8 * Sat Dec 10 2005 <fedora[AT]leemhuis.info> - 0:1.7-0.lvn.1 - Update to 1.7 * Sat Dec 03 2005 <fedora[AT]leemhuis.info> - 0:1.6-0.lvn.1 - Update to 1.6 - New BR: libusb-devel for new file load_fw_ar5523 * Sat Nov 05 2005 <fedora[AT]leemhuis.info> - 0:1.5-0.lvn.1 - Update to 1.5 * Sun Oct 16 2005 <fedora[AT]leemhuis.info> - 0:1.4-0.lvn.1 - Update to 1.4 - strip kernel-module * Fri Jun 17 2005 <fedora[AT]leemhuis.info> - 0:1.2-0.lvn.3 - Pass KSRC to make install call, too * Fri Jun 17 2005 Dams <anvil[AT]livna.org> - 0:1.2-0.lvn.2 - Fixed Source0 URL. * Mon Jun 13 2005 <fedora[AT]leemhuis.info> - 0:1.2-0.lvn.1 - Update to 1.2 - Rework installation - Rework kernel-devel usage * Tue Mar 22 2005 <aaron.bennett(a)olin.edu&gt; - 0:1.1-0.lvn.1 - Updated to version 1.1 * Mon Jan 31 2005 <aaron.bennett(a)olin.edu&gt; - 0:1.0-0.lvn.1 - updated to version 1.0 * Fri Nov 26 2004 Thorsten Leemhuis <fedora AT leemhuis DOT info> 0:0.12-0.lvn.1 - Update to 0.12 - Trim Doc in header - Trim description and add 4k-Warning - Depend on /boot/vmlinuz correctly - use --without driverp to skip utiliy/core-Package - Remove the included fedora-kmodhelper - Make modpath readable for normal users * Mon Nov 8 2004 <aaron.bennett(a)olin.edu&gt; 0:0.11-0.lvn.2 - changed make to use %{?_smp_mflags} * Sun Oct 24 2004 <fedora AT leemhuis DOT info> 0:0.11-0.lvn.1 - Use fedora-kmodhelper like in other rlo packages like ati-fglrx - Update to 0.11 * Sun Aug 29 2004 <fedora AT leemhuis DOT info> 0:0.10-0.lvn.1 - Integrate fedora-kmodhelper as long as fedora.us version is not ready - Use correct kernel-headers to build - Allow separate building of tools and kernel-module - show fedora-kmodhelper diag - some minor fixes * Mon Jun 14 2004 <aaron.bennett(a)olin.edu&gt; 0:0.8-0.fdr.2 - removed extra kmodhelper stuff - removed old depmod flag from 2.4 kernel * Thu Jun 10 2004 <aaron.bennett(a)olin.edu&gt; 0:0.8-0.fdr.1 - moved /usr/sbin/loadndisdriver to /sbin/loadndisdriver - revised new build with version 0.8 of ndiswrapper from upstream * Tue Jun 8 2004 <aaron.bennett(a)olin.edu&gt; - 0:0.7-0.fdr.2 - changed ndiswrapper.o to ndiswrapper.ko for 2.6 kernel - added Requires: ndiswrapper to kernel module ndiswrapper * Thu Jun 3 2004 <aaron.bennett(a)olin.edu&gt; - 0:0.7-0.fdr.1 - Initial build. --- NEW FILE ndiswrapper-kmodtool-excludekernel-filterfile --- xen$ Index: .cvsignore =================================================================== RCS file: /cvs/free/rpms/ndiswrapper-kmod/F-9/.cvsignore,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- .cvsignore 3 Oct 2008 12:00:18 -0000 1.1 +++ .cvsignore 4 Oct 2008 12:42:41 -0000 1.2 @@ -0,0 +1 @@ +ndiswrapper-1.53.tar.gz Index: sources =================================================================== RCS file: /cvs/free/rpms/ndiswrapper-kmod/F-9/sources,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- sources 3 Oct 2008 12:00:18 -0000 1.1 +++ sources 4 Oct 2008 12:42:41 -0000 1.2 @@ -0,0 +1 @@ +393c6e6ab0803963148e18538601cdec ndiswrapper-1.53.tar.gz