[Box Backup-commit] COMMIT r2657 - in box/RELEASE/0.11rc7: . distribution distribution/boxbackup infrastructure
subversion at boxbackup.org
subversion at boxbackup.org
Mon Mar 8 21:28:01 GMT 2010
Author: chris
Date: 2010-03-08 21:28:01 +0000 (Mon, 08 Mar 2010)
New Revision: 2657
Added:
box/RELEASE/0.11rc7/COPYING.txt
box/RELEASE/0.11rc7/LICENSE-DUAL.txt
box/RELEASE/0.11rc7/LICENSE-GPL.txt
Removed:
box/RELEASE/0.11rc7/LICENSE.txt
box/RELEASE/0.11rc7/distribution/boxbackup/LICENSE.txt
Modified:
box/RELEASE/0.11rc7/distribution/COMMON-MANIFEST.txt
box/RELEASE/0.11rc7/distribution/boxbackup/DISTRIBUTION-MANIFEST.txt
box/RELEASE/0.11rc7/infrastructure/makedistribution.pl.in
box/RELEASE/0.11rc7/parcels.txt
Log:
Merge [2596] [2599] [2600] from trunk into 0.11rc7, implements license
change.
Copied: box/RELEASE/0.11rc7/COPYING.txt (from rev 2596, box/trunk/COPYING.txt)
===================================================================
--- box/RELEASE/0.11rc7/COPYING.txt (rev 0)
+++ box/RELEASE/0.11rc7/COPYING.txt 2010-03-08 21:28:01 UTC (rev 2657)
@@ -0,0 +1,491 @@
+Box Backup, http://www.boxbackup.org/
+
+Copyright (c) 2003-2010, Ben Summers and contributors.
+All rights reserved.
+
+The license of the code was changed on 23-Jan-2010 in order to meet the
+Fedora Project's definition of Free Software, and therefore allow inclusion
+in Fedora, Red Hat Linux and CentOS. This also solves a long-standing
+incompatibility with the GNU Readline library that prevented us from
+distributing Box Backup binaries compiled against that library. You can
+review our discussions of the change in the mailing list archives at:
+http://lists.boxbackup.org/pipermail/boxbackup/2010-January/000005.html
+
+Note that this project uses mixed licensing. Different parts of the project
+may be used and distributed under different licenses, as described below.
+The two licenses used are "Box Backup GPL" and a BSD-style license.
+
+Unless stated otherwise in the file, all files in the following directories
+fall under the "Box Backup GPL" license, described below:
+
+bin/bbackupctl
+bin/bbackupd
+bin/bbackupobjdump
+bin/bbackupquery
+bin/bbstoreaccounts
+bin/bbstored
+bin/s3simulator
+lib/backupclient
+lib/backupstore
+test/backupdiff
+test/backupstore
+test/backupstorefix
+test/backupstorepatch
+test/bbackupd
+contrib/bbadmin
+contrib/bbreporter
+contrib/cygwin
+contrib/debian
+contrib/mac_osx
+contrib/redhat
+contrib/rpm
+contrib/solaris
+contrib/suse
+contrib/windows
+distribution/boxbackup
+
+The "Box Backup GPL" license follows:
+---------------------------------------------------------------------
+The Box Backup GPL is based on the GPLv2 (GNU General Public License
+version 2 or later) as published by the Free Software Foundation.
+However, it includes optional exceptions which allow linking with
+OpenSSL and Microsoft VSS, listed below. This means that Box Backup
+is not under pure GPLv2 as published by the Free Software Foundation.
+These are the only differences between the Box Backup GPL license and
+the original GPL from the Free Software Foundation.
+
+Please note that while the Box Backup GPL is similar in spirit to the
+original GPL, it is not fully compatible. Because of these optional
+exceptions, you may not include or combine fully GPL source code
+(such as the GNU readline library) with Box Backup, or distribute the
+resulting binaries, under the Box Backup GPL license, without
+specific permission from the authors of such code. You may do so
+under the pure GPL license, by omitting the optional exclusion clauses
+below, however you may not legally link such code with OpenSSL or
+Microsoft VSS, which may limit the usefulness or functionality of the
+resulting code.
+
+The license exemption section below was based on the license of the
+Bacula project
+[http://bacula.git.sourceforge.net/git/gitweb.cgi?p=bacula/bacula;a=blob_plain;f=bacula/LICENSE;hb=HEAD].
+
+For the most part, Box Backup is licensed under the GPL version 2
+[http://www.gnu.org/licenses/old-licenses/gpl-2.0.txt].
+The sections that follow are optional exemptions to the GPL version 2
+license, that apply to code that is copyrighted by Ben Summers and
+Contributors.
+
+Linking:
+As a special exception to the GPLv2, the Box Backup Project gives
+permission to link any code falling under this license (the Box Backup
+GPL) with any software that can be downloaded from
+the OpenSSL website [http://www.openssl.org] under either the
+"OpenSSL License" or the "Original SSLeay License", and to distribute
+the linked executables under the terms of the "Box Backup GPL" license.
+
+As a special exception to the GPLv2, the Box Backup Project gives
+permission to link any code falling under this license (the Box Backup
+GPL) with any version of Microsoft's Volume Shadow Copy Service 7.2 SDK
+or Microsoft Windows Software Development Kit (SDK), including
+vssapi.lib, that can be downloaded from the Microsoft website
+[*.microsoft.com], and to distribute the linked executables under the
+terms of the "Box Backup GPL" license.
+
+The sections above are optional, and you may distribute the code that
+falls under this license under the original GPLv2 license by omitting
+them. The original GPLv2 license follows.
+
+ GNU GENERAL PUBLIC LICENSE
+ Version 2, June 1991
+
+ Copyright (C) 1989, 1991 Free Software Foundation, Inc.,
+ 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ Everyone is permitted to copy and distribute verbatim copies
+ of this license document, but changing it is not allowed.
+
+ Preamble
+
+ The licenses for most software are designed to take away your
+freedom to share and change it. By contrast, the GNU General Public
+License is intended to guarantee your freedom to share and change free
+software--to make sure the software is free for all its users. This
+General Public License applies to most of the Free Software
+Foundation's software and to any other program whose authors commit to
+using it. (Some other Free Software Foundation software is covered by
+the GNU Lesser General Public License instead.) You can apply it to
+your programs, too.
+
+ When we speak of free software, we are referring to freedom, not
+price. Our General Public Licenses are designed to make sure that you
+have the freedom to distribute copies of free software (and charge for
+this service if you wish), that you receive source code or can get it
+if you want it, that you can change the software or use pieces of it
+in new free programs; and that you know you can do these things.
+
+ To protect your rights, we need to make restrictions that forbid
+anyone to deny you these rights or to ask you to surrender the rights.
+These restrictions translate to certain responsibilities for you if you
+distribute copies of the software, or if you modify it.
+
+ For example, if you distribute copies of such a program, whether
+gratis or for a fee, you must give the recipients all the rights that
+you have. You must make sure that they, too, receive or can get the
+source code. And you must show them these terms so they know their
+rights.
+
+ We protect your rights with two steps: (1) copyright the software, and
+(2) offer you this license which gives you legal permission to copy,
+distribute and/or modify the software.
+
+ Also, for each author's protection and ours, we want to make certain
+that everyone understands that there is no warranty for this free
+software. If the software is modified by someone else and passed on, we
+want its recipients to know that what they have is not the original, so
+that any problems introduced by others will not reflect on the original
+authors' reputations.
+
+ Finally, any free program is threatened constantly by software
+patents. We wish to avoid the danger that redistributors of a free
+program will individually obtain patent licenses, in effect making the
+program proprietary. To prevent this, we have made it clear that any
+patent must be licensed for everyone's free use or not licensed at all.
+
+ The precise terms and conditions for copying, distribution and
+modification follow.
+
+ GNU GENERAL PUBLIC LICENSE
+ TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
+
+ 0. This License applies to any program or other work which contains
+a notice placed by the copyright holder saying it may be distributed
+under the terms of this General Public License. The "Program", below,
+refers to any such program or work, and a "work based on the Program"
+means either the Program or any derivative work under copyright law:
+that is to say, a work containing the Program or a portion of it,
+either verbatim or with modifications and/or translated into another
+language. (Hereinafter, translation is included without limitation in
+the term "modification".) Each licensee is addressed as "you".
+
+Activities other than copying, distribution and modification are not
+covered by this License; they are outside its scope. The act of
+running the Program is not restricted, and the output from the Program
+is covered only if its contents constitute a work based on the
+Program (independent of having been made by running the Program).
+Whether that is true depends on what the Program does.
+
+ 1. You may copy and distribute verbatim copies of the Program's
+source code as you receive it, in any medium, provided that you
+conspicuously and appropriately publish on each copy an appropriate
+copyright notice and disclaimer of warranty; keep intact all the
+notices that refer to this License and to the absence of any warranty;
+and give any other recipients of the Program a copy of this License
+along with the Program.
+
+You may charge a fee for the physical act of transferring a copy, and
+you may at your option offer warranty protection in exchange for a fee.
+
+ 2. You may modify your copy or copies of the Program or any portion
+of it, thus forming a work based on the Program, and copy and
+distribute such modifications or work under the terms of Section 1
+above, provided that you also meet all of these conditions:
+
+ a) You must cause the modified files to carry prominent notices
+ stating that you changed the files and the date of any change.
+
+ b) You must cause any work that you distribute or publish, that in
+ whole or in part contains or is derived from the Program or any
+ part thereof, to be licensed as a whole at no charge to all third
+ parties under the terms of this License.
+
+ c) If the modified program normally reads commands interactively
+ when run, you must cause it, when started running for such
+ interactive use in the most ordinary way, to print or display an
+ announcement including an appropriate copyright notice and a
+ notice that there is no warranty (or else, saying that you provide
+ a warranty) and that users may redistribute the program under
+ these conditions, and telling the user how to view a copy of this
+ License. (Exception: if the Program itself is interactive but
+ does not normally print such an announcement, your work based on
+ the Program is not required to print an announcement.)
+
+These requirements apply to the modified work as a whole. If
+identifiable sections of that work are not derived from the Program,
+and can be reasonably considered independent and separate works in
+themselves, then this License, and its terms, do not apply to those
+sections when you distribute them as separate works. But when you
+distribute the same sections as part of a whole which is a work based
+on the Program, the distribution of the whole must be on the terms of
+this License, whose permissions for other licensees extend to the
+entire whole, and thus to each and every part regardless of who wrote it.
+
+Thus, it is not the intent of this section to claim rights or contest
+your rights to work written entirely by you; rather, the intent is to
+exercise the right to control the distribution of derivative or
+collective works based on the Program.
+
+In addition, mere aggregation of another work not based on the Program
+with the Program (or with a work based on the Program) on a volume of
+a storage or distribution medium does not bring the other work under
+the scope of this License.
+
+ 3. You may copy and distribute the Program (or a work based on it,
+under Section 2) in object code or executable form under the terms of
+Sections 1 and 2 above provided that you also do one of the following:
+
+ a) Accompany it with the complete corresponding machine-readable
+ source code, which must be distributed under the terms of Sections
+ 1 and 2 above on a medium customarily used for software interchange; or,
+
+ b) Accompany it with a written offer, valid for at least three
+ years, to give any third party, for a charge no more than your
+ cost of physically performing source distribution, a complete
+ machine-readable copy of the corresponding source code, to be
+ distributed under the terms of Sections 1 and 2 above on a medium
+ customarily used for software interchange; or,
+
+ c) Accompany it with the information you received as to the offer
+ to distribute corresponding source code. (This alternative is
+ allowed only for noncommercial distribution and only if you
+ received the program in object code or executable form with such
+ an offer, in accord with Subsection b above.)
+
+The source code for a work means the preferred form of the work for
+making modifications to it. For an executable work, complete source
+code means all the source code for all modules it contains, plus any
+associated interface definition files, plus the scripts used to
+control compilation and installation of the executable. However, as a
+special exception, the source code distributed need not include
+anything that is normally distributed (in either source or binary
+form) with the major components (compiler, kernel, and so on) of the
+operating system on which the executable runs, unless that component
+itself accompanies the executable.
+
+If distribution of executable or object code is made by offering
+access to copy from a designated place, then offering equivalent
+access to copy the source code from the same place counts as
+distribution of the source code, even though third parties are not
+compelled to copy the source along with the object code.
+
+ 4. You may not copy, modify, sublicense, or distribute the Program
+except as expressly provided under this License. Any attempt
+otherwise to copy, modify, sublicense or distribute the Program is
+void, and will automatically terminate your rights under this License.
+However, parties who have received copies, or rights, from you under
+this License will not have their licenses terminated so long as such
+parties remain in full compliance.
+
+ 5. You are not required to accept this License, since you have not
+signed it. However, nothing else grants you permission to modify or
+distribute the Program or its derivative works. These actions are
+prohibited by law if you do not accept this License. Therefore, by
+modifying or distributing the Program (or any work based on the
+Program), you indicate your acceptance of this License to do so, and
+all its terms and conditions for copying, distributing or modifying
+the Program or works based on it.
+
+ 6. Each time you redistribute the Program (or any work based on the
+Program), the recipient automatically receives a license from the
+original licensor to copy, distribute or modify the Program subject to
+these terms and conditions. You may not impose any further
+restrictions on the recipients' exercise of the rights granted herein.
+You are not responsible for enforcing compliance by third parties to
+this License.
+
+ 7. If, as a consequence of a court judgment or allegation of patent
+infringement or for any other reason (not limited to patent issues),
+conditions are imposed on you (whether by court order, agreement or
+otherwise) that contradict the conditions of this License, they do not
+excuse you from the conditions of this License. If you cannot
+distribute so as to satisfy simultaneously your obligations under this
+License and any other pertinent obligations, then as a consequence you
+may not distribute the Program at all. For example, if a patent
+license would not permit royalty-free redistribution of the Program by
+all those who receive copies directly or indirectly through you, then
+the only way you could satisfy both it and this License would be to
+refrain entirely from distribution of the Program.
+
+If any portion of this section is held invalid or unenforceable under
+any particular circumstance, the balance of the section is intended to
+apply and the section as a whole is intended to apply in other
+circumstances.
+
+It is not the purpose of this section to induce you to infringe any
+patents or other property right claims or to contest validity of any
+such claims; this section has the sole purpose of protecting the
+integrity of the free software distribution system, which is
+implemented by public license practices. Many people have made
+generous contributions to the wide range of software distributed
+through that system in reliance on consistent application of that
+system; it is up to the author/donor to decide if he or she is willing
+to distribute software through any other system and a licensee cannot
+impose that choice.
+
+This section is intended to make thoroughly clear what is believed to
+be a consequence of the rest of this License.
+
+ 8. If the distribution and/or use of the Program is restricted in
+certain countries either by patents or by copyrighted interfaces, the
+original copyright holder who places the Program under this License
+may add an explicit geographical distribution limitation excluding
+those countries, so that distribution is permitted only in or among
+countries not thus excluded. In such case, this License incorporates
+the limitation as if written in the body of this License.
+
+ 9. The Free Software Foundation may publish revised and/or new versions
+of the General Public License from time to time. Such new versions will
+be similar in spirit to the present version, but may differ in detail to
+address new problems or concerns.
+
+Each version is given a distinguishing version number. If the Program
+specifies a version number of this License which applies to it and "any
+later version", you have the option of following the terms and conditions
+either of that version or of any later version published by the Free
+Software Foundation. If the Program does not specify a version number of
+this License, you may choose any version ever published by the Free Software
+Foundation.
+
+ 10. If you wish to incorporate parts of the Program into other free
+programs whose distribution conditions are different, write to the author
+to ask for permission. For software which is copyrighted by the Free
+Software Foundation, write to the Free Software Foundation; we sometimes
+make exceptions for this. Our decision will be guided by the two goals
+of preserving the free status of all derivatives of our free software and
+of promoting the sharing and reuse of software generally.
+
+ NO WARRANTY
+
+ 11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY
+FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW. EXCEPT WHEN
+OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES
+PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED
+OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. THE ENTIRE RISK AS
+TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU. SHOULD THE
+PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING,
+REPAIR OR CORRECTION.
+
+ 12. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
+WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR
+REDISTRIBUTE THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES,
+INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING
+OUT OF THE USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED
+TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY
+YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER
+PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE
+POSSIBILITY OF SUCH DAMAGES.
+
+ END OF TERMS AND CONDITIONS
+
+ How to Apply These Terms to Your New Programs
+
+ If you develop a new program, and you want it to be of the greatest
+possible use to the public, the best way to achieve this is to make it
+free software which everyone can redistribute and change under these terms.
+
+ To do so, attach the following notices to the program. It is safest
+to attach them to the start of each source file to most effectively
+convey the exclusion of warranty; and each file should have at least
+the "copyright" line and a pointer to where the full notice is found.
+
+ <one line to give the program's name and a brief idea of what it does.>
+ Copyright (C) <year> <name of author>
+
+ This program is free software; you can redistribute it and/or modify
+ it under the terms of the GNU General Public License as published by
+ the Free Software Foundation; either version 2 of the License, or
+ (at your option) any later version.
+
+ This program is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ GNU General Public License for more details.
+
+ You should have received a copy of the GNU General Public License along
+ with this program; if not, write to the Free Software Foundation, Inc.,
+ 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+
+Also add information on how to contact you by electronic and paper mail.
+
+If the program is interactive, make it output a short notice like this
+when it starts in an interactive mode:
+
+ Gnomovision version 69, Copyright (C) year name of author
+ Gnomovision comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
+ This is free software, and you are welcome to redistribute it
+ under certain conditions; type `show c' for details.
+
+The hypothetical commands `show w' and `show c' should show the appropriate
+parts of the General Public License. Of course, the commands you use may
+be called something other than `show w' and `show c'; they could even be
+mouse-clicks or menu items--whatever suits your program.
+
+You should also get your employer (if you work as a programmer) or your
+school, if any, to sign a "copyright disclaimer" for the program, if
+necessary. Here is a sample; alter the names:
+
+ Yoyodyne, Inc., hereby disclaims all copyright interest in the program
+ `Gnomovision' (which makes passes at compilers) written by James Hacker.
+
+ <signature of Ty Coon>, 1 April 1989
+ Ty Coon, President of Vice
+
+This General Public License does not permit incorporating your program into
+proprietary programs. If your program is a subroutine library, you may
+consider it more useful to permit linking proprietary applications with the
+library. If this is what you want to do, use the GNU Lesser General
+Public License instead of this License.
+---------------------------------------------------------------------
+
+Unless stated otherwise in the file or in the list of directories above,
+all files in the following directories are dual licensed under the BSD and
+GPL licenses. You may use and distribute them providing that you comply
+EITHER with the terms of the BSD license, OR the GPL license. It is not
+necessary to comply with both licenses, only one.
+
+lib/common
+lib/compress
+lib/crypto
+lib/httpserver
+lib/intercept
+lib/raidfile
+lib/server
+lib/win32
+test/basicserver
+test/common
+test/compress
+test/crypto
+test/httpserver
+test/raidfile
+test/win32
+infrastructure
+distribution
+
+The BSD license follows:
+---------------------------------------------------------------------
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are met:
+
+1. Redistributions of source code must retain the above copyright
+ notice, this list of conditions and the following disclaimer.
+
+2. Redistributions in binary form must reproduce the above copyright
+ notice, this list of conditions and the following disclaimer in the
+ documentation and/or other materials provided with the distribution.
+
+3. Neither the name of the Box Backup nor the names of its contributors may
+ be used to endorse or promote products derived from this software without
+ specific prior written permission.
+
+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 HOLDER 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.
+---------------------------------------------------------------------
+[http://en.wikipedia.org/wiki/BSD_licenses#3-clause_license_.28.22New_BSD_License.22.29]
+
Copied: box/RELEASE/0.11rc7/LICENSE-DUAL.txt (from rev 2596, box/trunk/LICENSE-DUAL.txt)
===================================================================
--- box/RELEASE/0.11rc7/LICENSE-DUAL.txt (rev 0)
+++ box/RELEASE/0.11rc7/LICENSE-DUAL.txt 2010-03-08 21:28:01 UTC (rev 2657)
@@ -0,0 +1,59 @@
+Box Backup, http://www.boxbackup.org/
+
+Copyright (c) 2003-2010, Ben Summers and contributors.
+All rights reserved.
+
+Note that this project uses mixed licensing. Any file with this license
+attached, or where the code LICENSE-DUAL appears on the first line, falls
+under this license. See the file COPYING.txt for more information.
+
+This file is dual licensed. You may use and distribute it providing that you
+comply EITHER with the terms of the BSD license, OR the GPL license. It is
+not necessary to comply with both licenses, only one.
+
+The BSD license option follows:
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are met:
+
+1. Redistributions of source code must retain the above copyright
+ notice, this list of conditions and the following disclaimer.
+
+2. Redistributions in binary form must reproduce the above copyright
+ notice, this list of conditions and the following disclaimer in the
+ documentation and/or other materials provided with the distribution.
+
+3. Neither the name of the Box Backup nor the names of its contributors may
+ be used to endorse or promote products derived from this software without
+ specific prior written permission.
+
+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 HOLDER 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.
+
+[http://en.wikipedia.org/wiki/BSD_licenses#3-clause_license_.28.22New_BSD_License.22.29]
+
+The GPL license option follows:
+
+This program is free software; you can redistribute it and/or
+modify it under the terms of the GNU General Public License
+as published by the Free Software Foundation; either version 2
+of the License, or (at your option) any later version.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with this program; if not, write to the Free Software
+Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+
+[http://www.gnu.org/licenses/old-licenses/gpl-2.0.html#SEC4]
Copied: box/RELEASE/0.11rc7/LICENSE-GPL.txt (from rev 2596, box/trunk/LICENSE-GPL.txt)
===================================================================
--- box/RELEASE/0.11rc7/LICENSE-GPL.txt (rev 0)
+++ box/RELEASE/0.11rc7/LICENSE-GPL.txt 2010-03-08 21:28:01 UTC (rev 2657)
@@ -0,0 +1,41 @@
+Box Backup, http://www.boxbackup.org/
+
+Copyright (c) 2003-2010, Ben Summers and contributors.
+All rights reserved.
+
+Note that this project uses mixed licensing. Any file with this license
+attached, or where the code LICENSE-GPL appears on the first line, falls
+under the "Box Backup GPL" license. See the file COPYING.txt for more
+information about this license.
+
+---------------------------------------------------------------------
+This program is free software; you can redistribute it and/or
+modify it under the terms of the GNU General Public License
+as published by the Free Software Foundation; either version 2
+of the License, or (at your option) any later version.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with this program; if not, write to the Free Software
+Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+
+[http://www.gnu.org/licenses/old-licenses/gpl-2.0.html#SEC4]
+
+As a special exception to the GPLv2, the Box Backup Project gives
+permission to link any code falling under this license (the Box Backup
+GPL) with any software that can be downloaded from
+the OpenSSL website [http://www.openssl.org] under either the
+"OpenSSL License" or the "Original SSLeay License", and to distribute
+the linked executables under the terms of the "Box Backup GPL" license.
+
+As a special exception to the GPLv2, the Box Backup Project gives
+permission to link any code falling under this license (the Box Backup
+GPL) with any version of Microsoft's Volume Shadow Copy Service 7.2 SDK
+or Microsoft Windows Software Development Kit (SDK), including
+vssapi.lib, that can be downloaded from the Microsoft website
+[*.microsoft.com], and to distribute the linked executables under the
+terms of the "Box Backup GPL" license.
Deleted: box/RELEASE/0.11rc7/LICENSE.txt
===================================================================
--- box/RELEASE/0.11rc7/LICENSE.txt 2010-03-08 21:24:07 UTC (rev 2656)
+++ box/RELEASE/0.11rc7/LICENSE.txt 2010-03-08 21:28:01 UTC (rev 2657)
@@ -1,40 +0,0 @@
-Box Backup, http://www.boxbackup.org/
-
-Copyright (c) 2003-2008 Ben Summers and contributors. All rights reserved.
-
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions
-are met:
-
-1. Redistributions of source code must retain the above copyright
- notice, this list of conditions and the following disclaimer.
-
-2. Redistributions in binary form must reproduce the above copyright
- notice, this list of conditions and the following disclaimer in the
- documentation and/or other materials provided with the distribution.
-
-3. All use of this software and associated advertising materials must
- display the following acknowledgement:
-
- This product includes software developed by Ben Summers and
- contributors.
-
-4. The names of the Authors may not be used to endorse or promote
- products derived from this software without specific prior written
- permission.
-
-[Where legally impermissible the Authors do not disclaim liability for
-direct physical injury or death caused solely by defects in the software
-unless it is modified by a third party.]
-
-THIS SOFTWARE IS PROVIDED BY THE AUTHORS ``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 AUTHORS 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.
Modified: box/RELEASE/0.11rc7/distribution/COMMON-MANIFEST.txt
===================================================================
--- box/RELEASE/0.11rc7/distribution/COMMON-MANIFEST.txt 2010-03-08 21:24:07 UTC (rev 2656)
+++ box/RELEASE/0.11rc7/distribution/COMMON-MANIFEST.txt 2010-03-08 21:28:01 UTC (rev 2657)
@@ -1,5 +1,10 @@
+LICENSE-DUAL.txt
+
+LICENSE DUAL
+
RUN ./bootstrap
RUN cd docs; make
+
lib/common
lib/crypto
lib/server
@@ -27,11 +32,14 @@
infrastructure/BoxPlatform.pm.in
infrastructure/mingw
infrastructure/msvc
-NO-LICENSE config.sub
-NO-LICENSE config.guess
bootstrap
configure.ac
configure
parcels.txt
runtest.pl.in
-NO-LICENSE-IN-DIR infrastructure/m4
+COPYING.txt
+
+LICENSE none
+config.sub
+config.guess
+infrastructure/m4
Modified: box/RELEASE/0.11rc7/distribution/boxbackup/DISTRIBUTION-MANIFEST.txt
===================================================================
--- box/RELEASE/0.11rc7/distribution/boxbackup/DISTRIBUTION-MANIFEST.txt 2010-03-08 21:24:07 UTC (rev 2656)
+++ box/RELEASE/0.11rc7/distribution/boxbackup/DISTRIBUTION-MANIFEST.txt 2010-03-08 21:28:01 UTC (rev 2657)
@@ -1,10 +1,16 @@
+LICENSE-GPL.txt
+
+LICENSE DUAL
lib/intercept
lib/raidfile
+lib/httpserver
test/raidfile
test/raidfile/testfiles
+test/httpserver
+
+LICENSE GPL
lib/backupclient
lib/backupstore
-lib/httpserver
bin/bbstored
bin/bbstoreaccounts
bin/bbackupd
@@ -20,17 +26,20 @@
test/bbackupd
test/bbackupd/testfiles
test/backupdiff
-test/httpserver
test/httpserver/testfiles
test/httpserver/testfiles/photos
docs/Makefile
docs/tools
+
+LICENSE DUAL
docs/api-notes
-docs/api-notes/backup
docs/api-notes/raidfile
docs/api-notes/raidfile/lib_raidfile.txt
-docs/html
-docs/html/images
+
+LICENSE GPL
+docs/api-notes/backup
+
+docs/images
docs/htmlguide
docs/htmlguide/adminguide
docs/htmlguide/images
@@ -66,17 +75,18 @@
docs/xsl-generic/highlighting
BUGS.txt
contrib
-NO-LICENSE-IN-DIR contrib/debian
-NO-LICENSE-IN-DIR contrib/mac_osx
-NO-LICENSE-IN-DIR contrib/redhat
-NO-LICENSE-IN-DIR contrib/rpm
+
+contrib/debian
+contrib/mac_osx
+contrib/redhat
+contrib/rpm
REPLACE-VERSION-IN contrib/rpm/boxbackup.spec
-NO-LICENSE-IN-DIR contrib/solaris
-NO-LICENSE-IN-DIR contrib/suse
-NO-LICENSE-IN-DIR contrib/bbreporter
-NO-LICENSE-IN-DIR contrib/windows
-NO-LICENSE-IN-DIR contrib/windows/installer
-NO-LICENSE-IN-DIR contrib/windows/installer/tools
+contrib/solaris
+contrib/suse
+contrib/bbreporter
+contrib/windows
+contrib/windows/installer
+contrib/windows/installer/tools
infrastructure/msvc
-NO-LICENSE-IN-DIR infrastructure/msvc/2003
-NO-LICENSE-IN-DIR infrastructure/msvc/2005
+infrastructure/msvc/2003
+infrastructure/msvc/2005
Deleted: box/RELEASE/0.11rc7/distribution/boxbackup/LICENSE.txt
===================================================================
--- box/RELEASE/0.11rc7/distribution/boxbackup/LICENSE.txt 2010-03-08 21:24:07 UTC (rev 2656)
+++ box/RELEASE/0.11rc7/distribution/boxbackup/LICENSE.txt 2010-03-08 21:28:01 UTC (rev 2657)
@@ -1,38 +0,0 @@
-
-Copyright (c) 2003 - 2008
- Ben Summers and contributors. All rights reserved.
-
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions
-are met:
-
-1. Redistributions of source code must retain the above copyright
- notice, this list of conditions and the following disclaimer.
-2. Redistributions in binary form must reproduce the above copyright
- notice, this list of conditions and the following disclaimer in the
- documentation and/or other materials provided with the distribution.
-3. All use of this software and associated advertising materials must
- display the following acknowledgment:
- This product includes software developed by Ben Summers.
-4. The names of the Authors may not be used to endorse or promote
- products derived from this software without specific prior written
- permission.
-
-[Where legally impermissible the Authors do not disclaim liability for
-direct physical injury or death caused solely by defects in the software
-unless it is modified by a third party.]
-
-THIS SOFTWARE IS PROVIDED BY THE AUTHORS ``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 AUTHORS 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.
-
-
-
Modified: box/RELEASE/0.11rc7/infrastructure/makedistribution.pl.in
===================================================================
--- box/RELEASE/0.11rc7/infrastructure/makedistribution.pl.in 2010-03-08 21:24:07 UTC (rev 2656)
+++ box/RELEASE/0.11rc7/infrastructure/makedistribution.pl.in 2010-03-08 21:28:01 UTC (rev 2657)
@@ -12,12 +12,15 @@
my %text_files = ('txt' => 1, 'spec' => 1, 'in' => 1);
# files which don't get the license added
-my %no_license = (); # 'filename' => 1
+# my %file_license = (); # 'filename' => 'GPL', 'DUAL' or 'none'
# ----------------------------------------------
# filled in from the manifest file
-my %no_license_dir = ();
+# my %dir_license = (); # 'dir' => 'GPL', 'DUAL' or 'none'
+#
+# most recently specified LICENSE become default until overridden
+my $current_license; # 'GPL', 'DUAL' or 'none'
# distribution name
my $distribution = $ARGV[0];
@@ -68,12 +71,17 @@
system "rm $base_name.tgz";
mkdir $base_name,0755;
-# get license file
-open LICENSE,"$dist_root/LICENSE.txt" or die "Can't open $dist_root/LICENSE.txt";
-my $license_f;
-read LICENSE,$license_f,100000;
-close LICENSE;
-my @license = ('distribution '.$base_name.' (svn version: '.$svnversion.')',split(/\n/,$license_f));
+# get license files
+my %license_text; # name of license => array of lines of license text
+foreach my $license ("GPL", "DUAL")
+{
+ my $file = "./LICENSE-$license.txt";
+ open LICENSE, $file or die "Can't open $file: $!";
+ my @lines = <LICENSE>;
+ close LICENSE;
+ unshift @lines, "distribution $base_name (svn version: $svnversion)\n";
+ $license_text{$license} = \@lines;
+}
# copy files, make a note of all the modules included
my %modules_included;
@@ -88,41 +96,22 @@
{
next unless $line =~ m/\S/;
chomp $line;
- my ($src,$dst,$other) = split /\s+/, $line;
+ my @words = split /\s+/, $line;
+ my ($src,$dst,$other) = @words;
$dst = $src if $dst eq '';
if($src eq 'MKDIR')
{
# actually we just need to make a directory here
mkdir "$base_name/$dst",0755;
}
- elsif($src eq 'NO-LICENSE-IN-DIR')
+ elsif($src eq 'LICENSE')
{
- my ($junk,$spec) = split /\s+/, $line;
- # record that this directory shouldn't have the license added
- $no_license_dir{$dst} = 1;
-
- # actually copy it, to remove redundancy in manifests
- $src = $dst;
- $dst = $other;
- $dst = $src if $dst eq '';
- $modules_included{$spec} = 1;
- copy_dir($src,$dst);
+ $current_license = $dst;
}
elsif($src eq 'REPLACE-VERSION-IN')
{
replace_version_in($dst);
}
- elsif($src eq 'NO-LICENSE')
- {
- $no_license{$dst} = 1;
-
- # actually copy it, to remove redundancy in manifests
- $src = $dst;
- $dst = $other;
- $dst = $src if $dst eq '';
-
- copy_file($src,$dst);
- }
elsif($src eq 'RUN')
{
my ($junk,$cmd) = split /\s+/, $line, 2;
@@ -189,14 +178,10 @@
my $ext;
$ext = $1 if $fn =~ m/\.(\w+)\Z/;
-
- # licenses not used in this directory?
- my $license_in_dir = 1;
$dst_fn =~ m~\A(.+)/[^/]+?\Z~;
- $license_in_dir = 0 if exists $no_license_dir{$1};
# licensed or not?
- if(exists $comment_chars{$ext} && !exists $no_license{$fn} && $license_in_dir)
+ if(exists $comment_chars{$ext} && $current_license ne "none")
{
# copy as text, inserting license
# print "source copy $fn to $base_name/$dst_fn\n";
@@ -214,9 +199,10 @@
# write license
my $b = $comment_chars{$ext};
- for(@license)
+ my $this_license = $license_text{$current_license};
+ for (@$this_license)
{
- print OUT $b,$_,"\n"
+ print OUT $b, $_;
}
if($first ne '')
Modified: box/RELEASE/0.11rc7/parcels.txt
===================================================================
--- box/RELEASE/0.11rc7/parcels.txt 2010-03-08 21:24:07 UTC (rev 2656)
+++ box/RELEASE/0.11rc7/parcels.txt 2010-03-08 21:28:01 UTC (rev 2657)
@@ -8,7 +8,9 @@
bin bbackupquery
bin bbackupctl
script bin/bbackupd/bbackupd-config
- noinstall script LICENSE.txt
+ noinstall script COPYING.txt
+ noinstall script LICENSE-GPL.txt
+ noinstall script LICENSE-DUAL.txt
html bbackupd
html bbackupquery
@@ -50,7 +52,9 @@
script bin/bbstored/bbstored-certs
script bin/bbstored/bbstored-config
script lib/raidfile/raidfile-config
- noinstall script LICENSE.txt
+ noinstall script COPYING.txt
+ noinstall script LICENSE-GPL.txt
+ noinstall script LICENSE-DUAL.txt
html bbstored
html bbstoreaccounts
More information about the Boxbackup-commit
mailing list