Author: nvieville Update of /cvs/nonfree/rpms/broadcom-wl/devel In directory se02.es.rpmfusion.net:/tmp/cvs-serv7922 Modified Files: .cvsignore Added Files: 5_100_82_38.patch broadcom-wl-5.100.82.38-license.patch broadcom-wl.spec sources Removed Files: dead.package Log Message: * Fri Nov 04 2011 Nicolas Vieville <nicolas.vieville(a)univ-valenciennes.fr&gt; - 5.100.82.38-1 - Updated version to 5.100.82.38 5_100_82_38.patch: wl_linux.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) --- NEW FILE 5_100_82_38.patch --- # # Patch for Broadcom 80211 (STA) driver 5.100.82.38 # Fixes the 'init_MUTEX' compile problem seen on newer (> 2.6.37) kernels. # If you were able to compile, you don't need this patch. # To apply: # cd to the top level of the driver source. ('ls' should show at least src, lib, Makefile) # patch -p0 < this_file # make # --- src/wl/sys/wl_linux.c 2011-05-20 12:07:25.303356739 -0700 +++ src/wl/sys/wl_linux.c.new 2011-05-20 12:07:13.663356735 -0700 @@ -481,9 +481,9 @@ if (WL_ALL_PASSIVE_ENAB(wl)) { #ifdef WL_ALL_PASSIVE spin_lock_init(&wl->txq_lock); #endif - init_MUTEX(&wl->sem); + sema_init(&wl->sem, 1); } if (!(wl->wlc = wlc_attach((void *) wl, vendor, device, unit, wl->piomode, osh, wl->regsva, wl->bcm_bustype, btparam, &err))) { broadcom-wl-5.100.82.38-license.patch: wl_linux.c | 2 ++ 1 file changed, 2 insertions(+) --- NEW FILE broadcom-wl-5.100.82.38-license.patch --- diff -Naur --recursive hybrid-portsrc_x86_32-v5_100_82_38.orig/src/wl/sys/wl_linux.c hybrid-portsrc_x86_32-v5_100_82_38/src/wl/sys/wl_linux.c --- hybrid-portsrc_x86_32-v5_100_82_38.orig/src/wl/sys/wl_linux.c 2010-12-15 01:58:07.000000000 +0000 +++ hybrid-portsrc_x86_32-v5_100_82_38/src/wl/sys/wl_linux.c 2011-01-27 22:33:05.899146588 +0000 @@ -180,6 +180,8 @@ static void wl_report_radio_state(wl_info_t *wl); #endif +MODULE_LICENSE("MIXED/Proprietary"); + static struct pci_device_id wl_id_table[] = { { PCI_VENDOR_ID_BROADCOM, 0x4311, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0 }, { PCI_VENDOR_ID_BROADCOM, 0x4312, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0 }, Index: broadcom-wl.spec =================================================================== RCS file: broadcom-wl.spec diff -N broadcom-wl.spec --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ broadcom-wl.spec 4 Nov 2011 01:39:32 -0000 1.12 @@ -0,0 +1,94 @@ +Name: broadcom-wl +Version: 5.100.82.38 +Release: 1%{?dist} +Summary: Common files for Broadcom 802.11 STA driver +Group: System Environment/Kernel +License: Redistributable, no modification permitted +URL: http://www.broadcom.com/support/802.11/linux_sta.php +Source0: http://dl.dropbox.com/u/25699833/rpmfusion/sources/broadcom/5_100_82_38/h... +Source1: http://dl.dropbox.com/u/25699833/rpmfusion/sources/broadcom/5_100_82_38/h... +Source2: http://dl.dropbox.com/u/25699833/rpmfusion/sources/broadcom/5_100_82_38/R... +Source3: broadcom-wl-blacklist.conf +Source4: http://dl.dropbox.com/u/25699833/rpmfusion/sources/broadcom/5_100_82_38/b... +Patch0: broadcom-wl-5.100.82.38-license.patch +Patch1: http://dl.dropbox.com/u/25699833/rpmfusion/sources/broadcom/5_100_82_38/5... + +BuildArch: noarch +Provides: wl-kmod-common = %{version} +Requires: wl-kmod >= %{version} + +ExcludeArch: ppc ppc64 + +%description +This package contains the license, README.txt and configuration +files for the Broadcom 802.11 Linux STA Driver for WiFi, a Linux +device driver for use with Broadcom's BCM4311-, BCM4312-, BCM4313-, +BCM4321-, BCM4322-, BCM43224-, and BCM43225-, BCM43227- and +BCM43228-based hardware. + +%prep +%setup -q -c +iconv -f iso8859-1 -t UTF8 lib/LICENSE.txt -o lib/LICENSE.txt +sed -i 's/\r$//' lib/LICENSE.txt +cp -p %{SOURCE2} %{SOURCE4} . +chmod 644 lib/LICENSE.txt README.txt bcma.txt +%patch0 -p1 -b .license +%patch1 -p0 -b .init_MUTEX + +%build +echo "Nothing to build." + +%install +rm -rf $RPM_BUILD_ROOT +mkdir -p ${RPM_BUILD_ROOT}/%{_sysconfdir}/modprobe.d/ +install -p -m0644 %{SOURCE3} ${RPM_BUILD_ROOT}/%{_sysconfdir}/modprobe.d/ + +%clean +rm -rf $RPM_BUILD_ROOT + +%files +%defattr(-,root,root,-) +%doc lib/LICENSE.txt README.txt bcma.txt +%config(noreplace) %{_sysconfdir}/modprobe.d/broadcom-wl-blacklist.conf + +%changelog +* Fri Nov 04 2011 Nicolas Vieville <nicolas.vieville(a)univ-valenciennes.fr&gt; - 5.100.82.38-1 +- Updated version to 5.100.82.38 + +* Tue Feb 01 2011 Chris Nolan <chris(a)cenolan.com&gt; - 5.60.48.36 +- updated version to 5.100.82.38 + +* Mon Feb 22 2010 Chris Nolan <chris(a)cenolan.com&gt; - 5.60.48.36-1 +- updated version to 5.60.48.36 + +* Sat Sep 19 2009 Chris Nolan <chris(a)cenolan.com&gt; - 5.10.91.9.3 +- updated to 5.10.91.9.3 + +* Sun Mar 29 2009 Thorsten Leemhuis <fedora [AT] leemhuis [DOT] info> - 5.10.79.10-2 +- rebuild for new F11 features + +* Sun Mar 08 2009 Chris Nolan <chris(a)cenolan.com&gt; - 5.10.79.10-1 +- update version to 5.10.79.10 + +* Sun Feb 01 2009 Chris Nolan <chris(a)cenolan.com&gt; - 5.10.27.14-1 +- update version to 5.10.27.14 + +* Sun Jan 04 2009 Chris Nolan <chris(a)cenolan.com&gt; - 5.10.27.12-1 +- Update version to 5.10.27.12 + +* Wed Dec 31 2008 Chris Nolan <chris(a)cenolan.com&gt; 5.10.27.11-1 +- Update version to 5.10.27.11 + +* Sat Dec 20 2008 Thorsten Leemhuis <fedora [AT] leemhuis [DOT] info> - 5.10.27.6-4 +- ExcludeArch ppc, ppc64 + +* Fri Nov 07 2008 Chris Nolan <chris(a)cenolan.com&gt; 5.10.27.6-3 +- Updated README.txt file +- Cleaned up spec file + +* Sun Nov 02 2008 Chris Nolan <chris(a)cenolan.com&gt; 5.10.27.6-2 +- Added README.txt file +- Added /etc/modprobe.d/broadcom-wl-blacklist + +* Thu Oct 30 2008 Chris Nolan <chris(a)cenolan.com&gt; 5.10.27.6-1 +- Initial Build Index: sources =================================================================== RCS file: sources diff -N sources --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ sources 4 Nov 2011 01:39:34 -0000 1.11 @@ -0,0 +1,5 @@ +cac172f7422fa43264049c7065fe21d6 hybrid-portsrc_x86_64-v5_100_82_38.tar.gz +c0074a1622c75916442e26763ddf47d0 hybrid-portsrc_x86_32-v5_100_82_38.tar.gz +24976921c7b8854ed2cd56fbc5b1c13c README.txt +521622b664cdfe9a6e2b1aea1b2e5c7b bcma.txt +7b6a8f3ca263a3bb2e49124ade3cf010 broadcom-wl-blacklist.conf Index: .cvsignore =================================================================== RCS file: /cvs/nonfree/rpms/broadcom-wl/devel/.cvsignore,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- .cvsignore 1 Feb 2011 22:29:12 -0000 1.9 +++ .cvsignore 4 Nov 2011 01:39:31 -0000 1.10 @@ -1,3 +1,5 @@ +hybrid-portsrc_x86_64-v5_100_82_38.tar.gz hybrid-portsrc_x86_32-v5_100_82_38.tar.gz README.txt +bcma.txt broadcom-wl-blacklist.conf --- dead.package DELETED ---