Changeset 2596

Show
Ignore:
Timestamp:
23/01/2010 17:11:24 (8 months ago)
Author:
chris
Message:

Switch license to GPL for backup parts, and dual GPL/BSD for common
parts, as discussed and agreed in this thread:

 http://lists.boxbackup.org/pipermail/boxbackup/2010-January/000005.html

Location:
box/trunk
Files:
1 added
1 removed
3 modified
1 copied
1 moved

Legend:

Unmodified
Added
Removed

  • box/trunk/LICENSE-DUAL.txt

    r2290 r2596  
    11Box Backup, http://www.boxbackup.org/ 
    22 
    3 Copyright (c) 2003-2008 Ben Summers and contributors. All rights reserved. 
    4   
     3Copyright (c) 2003-2010, Ben Summers and contributors. 
     4All rights reserved. 
     5 
     6Note that this project uses mixed licensing. Any file with this license 
     7attached, or where the code LICENSE-DUAL appears on the first line, falls 
     8under this license. See the file COPYING.txt for more information. 
     9 
     10This file is dual licensed. You may use and distribute it providing that you 
     11comply EITHER with the terms of the BSD license, OR the GPL license. It is 
     12not necessary to comply with both licenses, only one. 
     13 
     14The BSD license option follows: 
     15 
    516Redistribution and use in source and binary forms, with or without 
    6 modification, are permitted provided that the following conditions 
    7 are met: 
     17modification, are permitted provided that the following conditions are met: 
    818 
    9191. Redistributions of source code must retain the above copyright 
    … …  
    1323   notice, this list of conditions and the following disclaimer in the 
    1424   documentation and/or other materials provided with the distribution. 
     25  
     263. Neither the name of the Box Backup nor the names of its contributors may 
     27   be used to endorse or promote products derived from this software without 
     28   specific prior written permission. 
    1529 
    16 3. All use of this software and associated advertising materials must  
    17    display the following acknowledgement: 
     30THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" 
     31AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE 
     32IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE 
     33ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER BE LIABLE FOR ANY 
     34DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES 
     35(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; 
     36LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND 
     37ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT 
     38(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF 
     39THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 
    1840 
    19         This product includes software developed by Ben Summers and 
    20         contributors. 
     41[http://en.wikipedia.org/wiki/BSD_licenses#3-clause_license_.28.22New_BSD_License.22.29] 
    2142 
    22 4. The names of the Authors may not be used to endorse or promote 
    23    products derived from this software without specific prior written 
    24    permission. 
     43The GPL license option follows: 
    2544 
    26 [Where legally impermissible the Authors do not disclaim liability for  
    27 direct physical injury or death caused solely by defects in the software  
    28 unless it is modified by a third party.] 
     45This program is free software; you can redistribute it and/or 
     46modify it under the terms of the GNU General Public License 
     47as published by the Free Software Foundation; either version 2 
     48of the License, or (at your option) any later version. 
    2949 
    30 THIS SOFTWARE IS PROVIDED BY THE AUTHORS ``AS IS'' AND ANY EXPRESS OR 
    31 IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED 
    32 WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE 
    33 DISCLAIMED.  IN NO EVENT SHALL THE AUTHORS BE LIABLE FOR ANY DIRECT, 
    34 INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES 
    35 (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR 
    36 SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) 
    37 HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, 
    38 STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN 
    39 ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE 
    40 POSSIBILITY OF SUCH DAMAGE. 
     50This program is distributed in the hope that it will be useful, 
     51but WITHOUT ANY WARRANTY; without even the implied warranty of 
     52MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the 
     53GNU General Public License for more details. 
     54 
     55You should have received a copy of the GNU General Public License 
     56along with this program; if not, write to the Free Software 
     57Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA. 
     58 
     59[http://www.gnu.org/licenses/old-licenses/gpl-2.0.html#SEC4] 

  • box/trunk/LICENSE-GPL.txt

    r2290 r2596  
    11Box Backup, http://www.boxbackup.org/ 
    22 
    3 Copyright (c) 2003-2008 Ben Summers and contributors. All rights reserved. 
    4   
    5 Redistribution and use in source and binary forms, with or without 
    6 modification, are permitted provided that the following conditions 
    7 are met: 
     3Copyright (c) 2003-2010, Ben Summers and contributors. 
     4All rights reserved. 
    85 
    9 1. Redistributions of source code must retain the above copyright 
    10    notice, this list of conditions and the following disclaimer. 
     6Note that this project uses mixed licensing. Any file with this license 
     7attached, or where the code LICENSE-GPL appears on the first line, falls 
     8under this license. See the file COPYING.txt for more information. 
    119 
    12 2. Redistributions in binary form must reproduce the above copyright 
    13    notice, this list of conditions and the following disclaimer in the 
    14    documentation and/or other materials provided with the distribution. 
     10This program is free software; you can redistribute it and/or 
     11modify it under the terms of the GNU General Public License 
     12as published by the Free Software Foundation; either version 2 
     13of the License, or (at your option) any later version. 
    1514 
    16 3. All use of this software and associated advertising materials must  
    17    display the following acknowledgement: 
     15This program is distributed in the hope that it will be useful, 
     16but WITHOUT ANY WARRANTY; without even the implied warranty of 
     17MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the 
     18GNU General Public License for more details. 
    1819 
    19         This product includes software developed by Ben Summers and 
    20         contributors. 
     20You should have received a copy of the GNU General Public License 
     21along with this program; if not, write to the Free Software 
     22Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA. 
    2123 
    22 4. The names of the Authors may not be used to endorse or promote 
    23    products derived from this software without specific prior written 
    24    permission. 
     24[http://www.gnu.org/licenses/old-licenses/gpl-2.0.html#SEC4] 
    2525 
    26 [Where legally impermissible the Authors do not disclaim liability for  
    27 direct physical injury or death caused solely by defects in the software  
    28 unless it is modified by a third party.] 
    29  
    30 THIS SOFTWARE IS PROVIDED BY THE AUTHORS ``AS IS'' AND ANY EXPRESS OR 
    31 IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED 
    32 WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE 
    33 DISCLAIMED.  IN NO EVENT SHALL THE AUTHORS BE LIABLE FOR ANY DIRECT, 
    34 INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES 
    35 (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR 
    36 SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) 
    37 HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, 
    38 STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN 
    39 ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE 
    40 POSSIBILITY OF SUCH DAMAGE. 
     26You may find a full copy of the GPLv2 license at: 
     27[http://www.gnu.org/licenses/old-licenses/gpl-2.0.txt] 

  • box/trunk/distribution/COMMON-MANIFEST.txt

    r2574 r2596  
     1LICENSE-DUAL.txt 
     2 
     3LICENSE DUAL 
     4 
    15RUN ./bootstrap 
    26RUN cd docs; make 
     7 
    38lib/common 
    49lib/crypto 
    … …  
    2833infrastructure/mingw 
    2934infrastructure/msvc 
    30 NO-LICENSE config.sub 
    31 NO-LICENSE config.guess 
    3235bootstrap 
    3336configure.ac 
    … …  
    3538parcels.txt 
    3639runtest.pl.in 
    37 NO-LICENSE-IN-DIR infrastructure/m4 
     40COPYING.txt 
     41 
     42LICENSE none 
     43config.sub 
     44config.guess 
     45infrastructure/m4 

  • box/trunk/distribution/boxbackup/DISTRIBUTION-MANIFEST.txt

    r2578 r2596  
     1LICENSE-GPL.txt 
     2 
     3LICENSE DUAL 
    14lib/intercept 
    25lib/raidfile 
     6lib/httpserver 
    37test/raidfile 
    48test/raidfile/testfiles 
     9test/httpserver 
     10 
     11LICENSE GPL 
    512lib/backupclient 
    613lib/backupstore 
    7 lib/httpserver 
    814bin/bbstored 
    915bin/bbstoreaccounts 
    … …  
    2127test/bbackupd/testfiles 
    2228test/backupdiff 
    23 test/httpserver 
    2429docs/Makefile 
    2530docs/tools 
     31 
     32LICENSE DUAL 
    2633docs/api-notes 
    27 docs/api-notes/backup 
    2834docs/api-notes/raidfile 
    2935docs/api-notes/raidfile/lib_raidfile.txt 
    30 docs/html 
    31 docs/html/images 
     36 
     37LICENSE GPL 
     38docs/api-notes/backup 
     39 
     40docs/images 
    3241docs/htmlguide 
    3342docs/htmlguide/adminguide 
    … …  
    6574BUGS.txt 
    6675contrib 
    67 NO-LICENSE-IN-DIR contrib/debian 
    68 NO-LICENSE-IN-DIR contrib/mac_osx 
    69 NO-LICENSE-IN-DIR contrib/redhat 
    70 NO-LICENSE-IN-DIR contrib/rpm 
     76 
     77contrib/debian 
     78contrib/mac_osx 
     79contrib/redhat 
     80contrib/rpm 
    7181REPLACE-VERSION-IN contrib/rpm/boxbackup.spec 
    72 NO-LICENSE-IN-DIR contrib/solaris 
    73 NO-LICENSE-IN-DIR contrib/suse 
    74 NO-LICENSE-IN-DIR contrib/bbreporter 
    75 NO-LICENSE-IN-DIR contrib/windows 
    76 NO-LICENSE-IN-DIR contrib/windows/installer 
    77 NO-LICENSE-IN-DIR contrib/windows/installer/tools 
     82contrib/solaris 
     83contrib/suse 
     84contrib/bbreporter 
     85contrib/windows 
     86contrib/windows/installer 
     87contrib/windows/installer/tools 
    7888infrastructure/msvc 
    79 NO-LICENSE-IN-DIR infrastructure/msvc/2003 
    80 NO-LICENSE-IN-DIR infrastructure/msvc/2005 
     89infrastructure/msvc/2003 
     90infrastructure/msvc/2005 

  • box/trunk/infrastructure/makedistribution.pl.in

    r2574 r2596  
    1313 
    1414# files which don't get the license added 
    15 my %no_license = (); # 'filename' => 1 
     15# my %file_license = (); # 'filename' => 'GPL', 'DUAL' or 'none' 
    1616 
    1717# ---------------------------------------------- 
    1818 
    1919# filled in from the manifest file 
    20 my %no_license_dir = (); 
     20# my %dir_license = (); # 'dir' => 'GPL', 'DUAL' or 'none' 
     21# 
     22# most recently specified LICENSE become default until overridden 
     23my $current_license; # 'GPL', 'DUAL' or 'none' 
    2124 
    2225# distribution name 
    … …  
    6972mkdir $base_name,0755; 
    7073 
    71 # get license file 
    72 open LICENSE,"$dist_root/LICENSE.txt" or die "Can't open $dist_root/LICENSE.txt"; 
    73 my $license_f; 
    74 read LICENSE,$license_f,100000; 
    75 close LICENSE; 
    76 my @license = ('distribution '.$base_name.' (svn version: '.$svnversion.')',split(/\n/,$license_f)); 
     74# get license files 
     75my %license_text; # name of license => array of lines of license text 
     76foreach my $license ("GPL", "DUAL") 
     77{ 
     78        my $file = "./LICENSE-$license.txt"; 
     79        open LICENSE, $file or die "Can't open $file: $!"; 
     80        my @lines = <LICENSE>; 
     81        close LICENSE; 
     82        unshift @lines, "distribution $base_name (svn version: $svnversion)\n"; 
     83        $license_text{$license} = \@lines; 
     84} 
    7785 
    7886# copy files, make a note of all the modules included 
    … …  
    8997                next unless $line =~ m/\S/; 
    9098                chomp $line; 
    91                 my ($src,$dst,$other) = split /\s+/, $line; 
     99                my @words = split /\s+/, $line; 
     100                my ($src,$dst,$other) = @words; 
    92101                $dst = $src if $dst eq ''; 
    93102                if($src eq 'MKDIR') 
    … …  
    96105                        mkdir "$base_name/$dst",0755; 
    97106                } 
    98                 elsif($src eq 'NO-LICENSE-IN-DIR') 
    99                 { 
    100                         my ($junk,$spec) = split /\s+/, $line; 
    101                         # record that this directory shouldn't have the license added 
    102                         $no_license_dir{$dst} = 1; 
    103  
    104                         # actually copy it, to remove redundancy in manifests 
    105                         $src = $dst; 
    106                         $dst = $other; 
    107                         $dst = $src if $dst eq ''; 
    108                         $modules_included{$spec} = 1; 
    109                         copy_dir($src,$dst); 
     107                elsif($src eq 'LICENSE') 
     108                { 
     109                        $current_license = $dst; 
    110110                } 
    111111                elsif($src eq 'REPLACE-VERSION-IN') 
    112112                { 
    113113                        replace_version_in($dst); 
    114                 } 
    115                 elsif($src eq 'NO-LICENSE') 
    116                 { 
    117                         $no_license{$dst} = 1; 
    118  
    119                         # actually copy it, to remove redundancy in manifests 
    120                         $src = $dst; 
    121                         $dst = $other; 
    122                         $dst = $src if $dst eq ''; 
    123  
    124                         copy_file($src,$dst); 
    125114                } 
    126115                elsif($src eq 'RUN') 
    … …  
    190179        my $ext; 
    191180        $ext = $1 if $fn =~ m/\.(\w+)\Z/; 
    192          
    193         # licenses not used in this directory? 
    194         my $license_in_dir = 1; 
    195181        $dst_fn =~ m~\A(.+)/[^/]+?\Z~; 
    196         $license_in_dir = 0 if exists $no_license_dir{$1}; 
    197182         
    198183        # licensed or not? 
    199         if(exists $comment_chars{$ext} && !exists $no_license{$fn} && $license_in_dir) 
     184        if(exists $comment_chars{$ext} && $current_license ne "none") 
    200185        { 
    201186                # copy as text, inserting license 
    … …  
    215200                # write license 
    216201                my $b = $comment_chars{$ext}; 
    217                 for(@license) 
    218                 { 
    219                         print OUT $b,$_,"\n" 
     202                my $this_license = $license_text{$current_license}; 
     203                for (@$this_license) 
     204                { 
     205                        print OUT $b, $_; 
    220206                } 
    221207