please unblock libertas-firmware 9.70.7.p0.0-1
Hi,
Can you please unblock libertas-firmware 9.70.7.p0.0-1? It doesn't
change any of the existing firmware blobs in the package; it merely
adds firmware blobs (necessary for the chips found in guruplug devices -
#596743).
Here's the diff.
diff -urN libertas-firmware-9.70.7.p0/LICENSE libertas-firmware-9.70.7.p0.0/LICENSE
--- libertas-firmware-9.70.7.p0/LICENSE 2008-07-06 18:24:05.000000000 +0000
+++ libertas-firmware-9.70.7.p0.0/LICENSE 1970-01-01 00:00:00.000000000 +0000
@@ -1,33 +0,0 @@
-Copyright (c) 2006, One Laptop per Child and Marvell Corporation.
-All rights reserved.
-
-Redistribution. Redistribution and use in binary form, without
-modification, are permitted provided that the following conditions are
-met:
-
-* Redistributions must reproduce the above copyright notice and the
- following disclaimer in the documentation and/or other materials
- provided with the distribution.
-* Neither the name of Marvell Corporation nor the names of its suppliers
- may be used to endorse or promote products derived from this software
- without specific prior written permission.
-* No reverse engineering, decompilation, or disassembly of this software
- is permitted.
-* You may not use or attempt to use this software in conjunction with
- any product that is offered by a third party as a replacement,
- substitute or alternative to a Marvell Product where a Marvell Product
- is defined as a proprietary wireless LAN embedded client solution of
- Marvell or a Marvell Affiliate.
-
-DISCLAIMER. THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND
-CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING,
-BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
-FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
-COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
-INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
-BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS
-OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
-ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR
-TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE
-USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH
-DAMAGE.
Binary files libertas-firmware-9.70.7.p0/cf8385.bin and libertas-firmware-9.70.7.p0.0/cf8385.bin differ
Binary files libertas-firmware-9.70.7.p0/cf8385_helper.bin and libertas-firmware-9.70.7.p0.0/cf8385_helper.bin differ
diff -urN libertas-firmware-9.70.7.p0/debian/changelog libertas-firmware-9.70.7.p0.0/debian/changelog
--- libertas-firmware-9.70.7.p0/debian/changelog 2010-09-28 17:23:22.000000000 +0000
+++ libertas-firmware-9.70.7.p0.0/debian/changelog 2010-09-28 17:20:43.000000000 +0000
@@ -1,3 +1,15 @@
+libertas-firmware (9.70.7.p0.0-1) unstable; urgency=low
+
+ * Add support for Marvell 8385, 8682, and 8688 chips (for a variety
+ of interfaces). Binary blobs have come from some mysterious Extranet (by
+ way of David Woodhouse), so there's no changelog/history/details on them.
+ Ain't non-free stuff fun? (closes: #596743).
+
+ * Update copyright file acccordingly, as the new firmware blobs have a
+ different upstream url and slightly different license.
+
+ -- Andres Salomon <dilinger@debian.org> Fri, 17 Sep 2010 23:47:00 +0000
+
libertas-firmware (9.70.7.p0-1) unstable; urgency=low
* Add sd8686-9.70.7.p0 firmware for libertas 8686 SD chips. The
diff -urN libertas-firmware-9.70.7.p0/debian/control libertas-firmware-9.70.7.p0.0/debian/control
--- libertas-firmware-9.70.7.p0/debian/control 2010-09-28 17:23:22.000000000 +0000
+++ libertas-firmware-9.70.7.p0.0/debian/control 2010-09-28 17:20:43.000000000 +0000
@@ -8,7 +8,7 @@
Package: libertas-firmware
Architecture: all
Depends: ${shlibs:Depends}, ${misc:Depends}
-Description: Firmware for Marvell's 8388 (libertas) wireless chips
- The Linux 2.6 libertas driver requires this firmware in order to properly
- drive Marvell 8388 and 8686 wireless chips. This includes firmware with
- mesh support, as well as the thinfirm driver (libertas_tf).
+Description: Firmware for Marvell's libertas wireless chip series
+ The Linux 2.6 libertas drivers requires these firmwares in order to properly
+ drive Marvell 8388, 8686, and other wireless chips. This includes firmware
+ with mesh support, as well as the thinfirm driver (libertas_tf).
diff -urN libertas-firmware-9.70.7.p0/debian/copyright libertas-firmware-9.70.7.p0.0/debian/copyright
--- libertas-firmware-9.70.7.p0/debian/copyright 2010-09-28 17:23:22.000000000 +0000
+++ libertas-firmware-9.70.7.p0.0/debian/copyright 2010-09-28 17:20:43.000000000 +0000
@@ -1,7 +1,10 @@
This package was debianized by Andres Salomon <dilinger@debian.org> on
Thu, 14 Feb 2008 21:45:25 +0000
-It was downloaded from http://dev.laptop.org/pub/firmware/libertas/
+
+The 8388 and 8686 firmware blobs were downloaded from
+<http://dev.laptop.org/pub/firmware/libertas/>, and have the following
+authors/copyright/license:
Authors: OLPC and Marvell Corporation
@@ -38,3 +41,50 @@
TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE
USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH
DAMAGE.
+
+
+The rest of the firmware blobs were downloaded from
+<http://git.infradead.org/users/dwmw2/linux-firmware.git>,
+and have the following authors/copyright/license:
+
+Authors: Marvell International Ltd.
+
+Copyright (c) Marvell International Ltd.
+
+All rights reserved.
+
+Redistribution. Redistribution and use in binary form, without modification,
+are permitted provided that the following conditions are met:
+
+* Redistributions must reproduce the above copyright notice and the
+ following disclaimer in the documentation and/or other materials
+ provided with the distribution.
+
+* Neither the name of Marvell International Ltd. nor the names of its
+ suppliers may be used to endorse or promote products derived from this
+ software without specific prior written permission.
+
+* No reverse engineering, decompilation, or disassembly of this software is
+ permitted.
+
+Limited patent license. Marvell International Ltd. grants a world-wide,
+royalty-free, non-exclusive license under patents it now or hereafter
+owns or controls to make, have made, use, import, offer to sell and
+sell ("Utilize") this software, but solely to the extent that any such patent
+is necessary to Utilize the software alone, or in combination with an
+operating system licensed under an approved Open Source license as listed
+by the Open Source Initiative at http://opensource.org/licenses. The patent
+license shall not apply to any other combinations which include this software.
+No hardware per se is licensed hereunder.
+
+DISCLAIMER. THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND
+CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT
+NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER
+OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
+EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
+OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
+OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
+ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
diff -urN libertas-firmware-9.70.7.p0/debian/install libertas-firmware-9.70.7.p0.0/debian/install
--- libertas-firmware-9.70.7.p0/debian/install 2010-09-28 17:23:22.000000000 +0000
+++ libertas-firmware-9.70.7.p0.0/debian/install 2010-09-28 17:20:43.000000000 +0000
@@ -2,3 +2,12 @@
lbtf_usb.bin /lib/firmware
sd8686.bin /lib/firmware
sd8686_helper.bin /lib/firmware
+cf8385.bin /lib/firmware
+cf8385_helper.bin /lib/firmware
+sd8385.bin /lib/firmware
+sd8385_helper.bin /lib/firmware
+usb8682.bin /lib/firmware
+sd8682.bin /lib/firmware
+sd8682_helper.bin /lib/firmware
+sd8688.bin /lib/firmware
+sd8688_helper.bin /lib/firmware
Binary files libertas-firmware-9.70.7.p0/sd8385.bin and libertas-firmware-9.70.7.p0.0/sd8385.bin differ
Binary files libertas-firmware-9.70.7.p0/sd8385_helper.bin and libertas-firmware-9.70.7.p0.0/sd8385_helper.bin differ
Binary files libertas-firmware-9.70.7.p0/sd8682.bin and libertas-firmware-9.70.7.p0.0/sd8682.bin differ
Binary files libertas-firmware-9.70.7.p0/sd8682_helper.bin and libertas-firmware-9.70.7.p0.0/sd8682_helper.bin differ
Binary files libertas-firmware-9.70.7.p0/sd8688.bin and libertas-firmware-9.70.7.p0.0/sd8688.bin differ
Binary files libertas-firmware-9.70.7.p0/sd8688_helper.bin and libertas-firmware-9.70.7.p0.0/sd8688_helper.bin differ
Binary files libertas-firmware-9.70.7.p0/usb8682.bin and libertas-firmware-9.70.7.p0.0/usb8682.bin differ
Reply to: