Bug#504671: firmware-nonfree: Please add ipw2100 firmware
Hello, On Sun, 2008-11-09 at 23:15 +0100, Bastian Blank wrote: On Thu, Nov 06, 2008 at 02:15:34AM +0100, Frank Lin PIAT wrote: I've attached a patch to add ipw2100 firmware. That license[1] issue was discussed on debian-kernel and debian-legal[1] and it is very similar to the bug 449235 for ipw2200. Please merge the ipw2100 and ipw2200 into one package. The licenses are similar enough. done. Regarding, the licenses, I've merged the common part, and kept the specific parts. In the license introduction, I've added the two lines with a + below: * If you are an End-User, only Exhibit A, the SOFTWARE LICENSE AGREEMENT, applies. * If you are an Original Equipment Manufacturer (OEM), Independent Hardware Vendor (IHV), or Independent Software Vendor (ISV), this complete Agreement applies + - A part of the license is for ipw 2100 firmware + - Another part of the license is for ipw 2200/2915 firmware In bug#504668, you told that gencontrol.py patch, to validate the license wasn't acceptable, so I don't use here. Let me know if I can help. Franklin diff -N -r -u firmware-nonfree/debian/changelog firmware-nonfree~4+ipw2x00/debian/changelog --- firmware-nonfree/debian/changelog 2008-11-10 01:01:08.0 +0100 +++ firmware-nonfree~4+ipw2x00/debian/changelog 2008-11-10 00:55:19.0 +0100 @@ -1,5 +1,7 @@ firmware-nonfree (0.14) unstable; urgency=low + * Added Intel Pro 2100 firwmare, version 1.3, + * Added Intel Pro 2200/2915 firwmare, version 3.0, -- Frank Lin PIAT [EMAIL PROTECTED] Mon, 27 Oct 2008 00:05:03 +0100 diff -N -r -u firmware-nonfree/debian/firmware-ipw2x00.links firmware-nonfree~4+ipw2x00/debian/firmware-ipw2x00.links --- firmware-nonfree/debian/firmware-ipw2x00.links 1970-01-01 01:00:00.0 +0100 +++ firmware-nonfree~4+ipw2x00/debian/firmware-ipw2x00.links 2008-11-10 00:55:19.0 +0100 @@ -0,0 +1,3 @@ +../../usr/share/doc/firmware-ipw2x00/copyright /lib/firmware/ipw2100.LICENSE +../../usr/share/doc/firmware-ipw2x00/copyright /lib/firmware/ipw2200.LICENSE + diff -N -r -u firmware-nonfree/defines firmware-nonfree~4+ipw2x00/defines --- firmware-nonfree/defines 2008-11-10 01:01:08.0 +0100 +++ firmware-nonfree~4+ipw2x00/defines 2008-11-10 00:55:19.0 +0100 @@ -4,3 +4,4 @@ iwlwifi qlogic ralink + ipw2x00 diff -N -r -u firmware-nonfree/ipw2x00/defines firmware-nonfree~4+ipw2x00/ipw2x00/defines --- firmware-nonfree/ipw2x00/defines 1970-01-01 01:00:00.0 +0100 +++ firmware-nonfree~4+ipw2x00/ipw2x00/defines 2008-11-10 00:55:19.0 +0100 @@ -0,0 +1,40 @@ +[base] +desc: Intel Pro Wireless 2100, 2200 and 2915 +files: + ipw2100-1.3.fw + ipw2100-1.3-i.fw + ipw2100-1.3-p.fw + ipw2200-bss.fw + ipw2200-ibss.fw + ipw2200-sniffer.fw +longdesc: Intel Pro Wireless 2100, 2200 and 2915 cards. + Those firmware are covered by the Intel license, which is available + at /usr/share/doc/firmware-ipw2x00/copyright. + . + By installing this package, you agree the terms of that license. +uri: http://ipw2100.sourceforge.net/firmware.php?fid=4 and http://ipw2200.sourceforge.net/firmware.php?fid=7 + +[ipw2100-1.3.fw_base] +desc: Intel Pro Wireless 2100 firmware (bootstrap) +version: 1.3 + +[ipw2100-1.3-i.fw_base] +desc: Intel Pro Wireless 2100 firmware (ibss mode) +version: 1.3 + +[ipw2100-1.3-p.fw_base] +desc: Intel Pro Wireless 2100 firmware (monitor mode) +version: 1.3 + +[ipw2200-bss.fw_base] +desc: Intel Pro Wireless 2200/2915 firmware (bss) +version: 3.0 + +[ipw2200-ibss.fw_base] +desc: Intel Pro Wireless 2200/2915 firmware (ibss) +version: 3.0 + +[ipw2200-sniffer.fw_base] +desc: Intel Pro Wireless 2200/2915 firmware (snf) +version: 3.0 + diff -N -r -u firmware-nonfree/ipw2x00/LICENSE firmware-nonfree~4+ipw2x00/ipw2x00/LICENSE --- firmware-nonfree/ipw2x00/LICENSE 1970-01-01 01:00:00.0 +0100 +++ firmware-nonfree~4+ipw2x00/ipw2x00/LICENSE 2008-11-10 00:55:19.0 +0100 @@ -0,0 +1,331 @@ + TERMS AND CONDITIONS +IMPORTANT - PLEASE READ BEFORE INSTALLING OR USING THIS INTEL(C) SOFTWARE + +Do not use or load this firmware (the Software) until you have carefully read +the following terms and conditions. By loading or using the Software, you agree +to the terms of this Agreement. If you do not wish to so agree, do not install +or use the Software. + +LICENSEES: + +Please note: + +* If you are an End-User, only Exhibit A, the SOFTWARE LICENSE AGREEMENT, + applies. +* If you are an Original Equipment Manufacturer (OEM), Independent Hardware + Vendor (IHV), or Independent Software Vendor (ISV), this complete Agreement + applies + - A part of the license is for ipw 2100 firmware + - Another part of the license is for ipw 2200/2915 firmware + + +ipw2100 firmware license For OEMs, IHVs, and ISVs: += + +LICENSE. This Software is licensed for use only in conjunction with Intel +component products. Use of the Software in conjunction with non-Intel
Bug#504671: firmware-nonfree: Please add ipw2100 firmware
On Thu, Nov 06, 2008 at 02:15:34AM +0100, Frank Lin PIAT wrote: I've attached a patch to add ipw2100 firmware. That license[1] issue was discussed on debian-kernel and debian-legal[1] and it is very similar to the bug 449235 for ipw2200. Please merge the ipw2100 and ipw2200 into one package. The licenses are similar enough. Bastian -- Dismissed. That's a Star Fleet expression for, Get out. -- Capt. Kathryn Janeway, Star Trek: Voyager, The Cloud -- To UNSUBSCRIBE, email to [EMAIL PROTECTED] with a subject of unsubscribe. Trouble? Contact [EMAIL PROTECTED]
Bug#504671: firmware-nonfree: Please add ipw2100 firmware
Package: firmware-nonfree Severity: normal Tags: patch Hello, I've attached a patch to add ipw2100 firmware. That license[1] issue was discussed on debian-kernel and debian-legal[1] and it is very similar to the bug 449235 for ipw2200. This patch depends on a feature that is added by a patch I've also submitted in bug #504668[2]. Franklin [1] http://ipw2100.sourceforge.net/firmware.php?fid=4 [2] http://bugs.debian.org/504668 diff --git a/debian/changelog b/debian/changelog index 35eece4..6b79cdf 100644 --- a/debian/changelog +++ b/debian/changelog @@ -4,6 +4,7 @@ firmware-nonfree (0.14) unstable; urgency=low * gencontrol can generate license acceptation prompt, based on sun-java5 preinst script and template. * Added ipw2200 firwmare, version 3.0, + * Added ipw2100 firwmare, version 1.3, -- Frank Lin PIAT [EMAIL PROTECTED] Mon, 27 Oct 2008 00:05:03 +0100 diff --git a/defines b/defines index 85ee5cd..23debbe 100644 --- a/defines +++ b/defines @@ -4,4 +4,5 @@ packages: iwlwifi qlogic ralink + ipw2100 ipw2200 diff --git a/ipw2100/LICENSE b/ipw2100/LICENSE new file mode 100644 index 000..a3e83f5 --- /dev/null +++ b/ipw2100/LICENSE @@ -0,0 +1,207 @@ + TERMS AND CONDITIONS +IMPORTANT - PLEASE READ BEFORE INSTALLING OR USING THIS INTEL(C) SOFTWARE + +Do not use or load this firmware (the Software) until you have carefully read +the following terms and conditions. By loading or using the Software, you agree +to the terms of this Agreement. If you do not wish to so agree, do not install +or use the Software. + +LICENSEES: + +Please note: + +* If you are an End-User, only Exhibit A, the SOFTWARE LICENSE AGREEMENT, + applies. +* If you are an Original Equipment Manufacturer (OEM), Independent Hardware + Vendor (IHV), or Independent Software Vendor (ISV), this complete Agreement + applies + + + +For OEMs, IHVs, and ISVs: + +LICENSE. This Software is licensed for use only in conjunction with Intel +component products. Use of the Software in conjunction with non-Intel component +products is not licensed hereunder. Subject to the terms of this Agreement, +Intel grants to you a nonexclusive, nontransferable, worldwide, fully paid-up +license under Intel's copyrights to: (i) copy the Software internally for your +own development and maintenance purposes; (ii) copy and distribute the Software +to your end-users, but only under a license agreement with terms at least as +restrictive as those contained in Intel's Final, Single User License Agreement, +attached as Exhibit A; and (iii) modify, copy and distribute the end-user +documentation which may accompany the Software, but only in association with +the Software. + +If you are not the final manufacturer or vendor of a computer system or software +program incorporating the Software, then you may transfer a copy of the +Software, including any related documentation (modified or unmodified) to your +recipient for use in accordance with the terms of this Agreement, provided such +recipient agrees to be fully bound by the terms hereof. You shall not otherwise +assign, sublicense, lease, or in any other way transfer or disclose Software to +any third party. You may not, nor may you assist any other person or entity to +modify, translate, convert to another programming language, decompile, reverse +engineer, or disassemble any portion of the Software or otherwise attempt to +derive source code from any object code modules of the Software or any internal +data files generated by the Software. Your rights to redistribute the Software +shall be contingent upon your installation of this Agreement in its entirety in +the same directory as the Software. + +CONFIDENTIALITY. If you wish to have a third party consultant or subcontractor +(Contractor) perform work on your behalf which involves access to or use of +Software, you shall obtain a written confidentiality agreement from the +Contractor which contains provisions with respect to access to or use of the +Software no less restrictive than those set forth in this Agreement and +excluding any distribution rights, and use for any other purpose. Except as +expressly provided herein, you shall not disclose the terms or existence of +this Agreement or use Intel's name in any publications, advertisements, or +other announcements without Intel's prior written consent. You do not have any +rights to use any Intel trademarks or logos. + +OWNERSHIP OF SOFTWARE AND COPYRIGHTS. Software and accompanying materials, if +any, are owned by Intel or its suppliers and licensors and may be protected by +copyright, trademark, patent and trade secret law and international treaties. +Any rights, express or implied, in the intellectual property embodied in the +foregoing, other than those specified in this Agreement, are reserved by Intel +and its suppliers and licensors or otherwise as set forth
