Changeset 2657


Ignore:
Timestamp:
08/03/2010 21:28:01 (2 years ago)
Author:
chris
Message:

Merge [2596] [2599] [2600] from trunk into 0.11rc7, implements license
change.

Location:
box/RELEASE/0.11rc7
Files:
2 deleted
4 edited
3 copied

Legend:

Unmodified
Added
Removed

  • box/RELEASE/0.11rc7/COPYING.txt

    r2596 r2657  
    1414Note that this project uses mixed licensing. Different parts of the project 
    1515may be used and distributed under different licenses, as described below. 
    16 The two licenses used are GPL and BSD. 
     16The two licenses used are "Box Backup GPL" and a BSD-style license. 
    1717 
    1818Unless stated otherwise in the file, all files in the following directories 
    19 fall under the GPL license (the GNU General Public License v2, or later 
    20 at your choice): 
     19fall under the "Box Backup GPL" license, described below: 
    2120 
    2221bin/bbackupctl 
    … …  
    4645distribution/boxbackup 
    4746 
    48 The GPL license follows: 
     47The "Box Backup GPL" license follows: 
    4948--------------------------------------------------------------------- 
     49The Box Backup GPL is based on the GPLv2 (GNU General Public License 
     50version 2 or later) as published by the Free Software Foundation. 
     51However, it includes optional exceptions which allow linking with 
     52OpenSSL and Microsoft VSS, listed below. This means that Box Backup 
     53is not under pure GPLv2 as published by the Free Software Foundation. 
     54These are the only differences between the Box Backup GPL license and 
     55the original GPL from the Free Software Foundation. 
     56 
     57Please note that while the Box Backup GPL is similar in spirit to the 
     58original GPL, it is not fully compatible. Because of these optional 
     59exceptions, you may not include or combine fully GPL source code  
     60(such as the GNU readline library) with Box Backup, or distribute the 
     61resulting binaries, under the Box Backup GPL license, without 
     62specific permission from the authors of such code. You may do so 
     63under the pure GPL license, by omitting the optional exclusion clauses 
     64below, however you may not legally link such code with OpenSSL or 
     65Microsoft VSS, which may limit the usefulness or functionality of the 
     66resulting code. 
     67 
     68The license exemption section below was based on the license of the 
     69Bacula project 
     70[http://bacula.git.sourceforge.net/git/gitweb.cgi?p=bacula/bacula;a=blob_plain;f=bacula/LICENSE;hb=HEAD]. 
     71 
     72For the most part, Box Backup is licensed under the GPL version 2 
     73[http://www.gnu.org/licenses/old-licenses/gpl-2.0.txt]. 
     74The sections that follow are optional exemptions to the GPL version 2 
     75license, that apply to code that is copyrighted by Ben Summers and 
     76Contributors. 
     77 
     78Linking:  
     79As a special exception to the GPLv2, the Box Backup Project gives 
     80permission to link any code falling under this license (the Box Backup 
     81GPL) with any software that can be downloaded from 
     82the OpenSSL website [http://www.openssl.org] under either the 
     83"OpenSSL License" or the "Original SSLeay License", and to distribute 
     84the linked executables under the terms of the "Box Backup GPL" license. 
     85 
     86As a special exception to the GPLv2, the Box Backup Project gives 
     87permission to link any code falling under this license (the Box Backup 
     88GPL) with any version of Microsoft's Volume Shadow Copy Service 7.2 SDK 
     89or Microsoft Windows Software Development Kit (SDK), including 
     90vssapi.lib, that can be downloaded from the Microsoft website 
     91[*.microsoft.com], and to distribute the linked executables under the 
     92terms of the "Box Backup GPL" license. 
     93 
     94The sections above are optional, and you may distribute the code that 
     95falls under this license under the original GPLv2 license by omitting 
     96them. The original GPLv2 license follows. 
     97 
    5098                    GNU GENERAL PUBLIC LICENSE 
    5199                       Version 2, June 1991 
    … …  
    388436Public License instead of this License. 
    389437--------------------------------------------------------------------- 
    390 [http://www.gnu.org/licenses/old-licenses/gpl-2.0.txt] 
    391438 
    392439Unless stated otherwise in the file or in the list of directories above, 

  • box/RELEASE/0.11rc7/LICENSE-GPL.txt

    r2596 r2657  
    66Note that this project uses mixed licensing. Any file with this license 
    77attached, or where the code LICENSE-GPL appears on the first line, falls 
    8 under this license. See the file COPYING.txt for more information. 
     8under the "Box Backup GPL" license. See the file COPYING.txt for more 
     9information about this license. 
    910 
     11--------------------------------------------------------------------- 
    1012This program is free software; you can redistribute it and/or 
    1113modify it under the terms of the GNU General Public License 
    … …  
    2426[http://www.gnu.org/licenses/old-licenses/gpl-2.0.html#SEC4] 
    2527 
    26 You may find a full copy of the GPLv2 license at: 
    27 [http://www.gnu.org/licenses/old-licenses/gpl-2.0.txt] 
     28As a special exception to the GPLv2, the Box Backup Project gives 
     29permission to link any code falling under this license (the Box Backup 
     30GPL) with any software that can be downloaded from 
     31the OpenSSL website [http://www.openssl.org] under either the 
     32"OpenSSL License" or the "Original SSLeay License", and to distribute 
     33the linked executables under the terms of the "Box Backup GPL" license. 
     34 
     35As a special exception to the GPLv2, the Box Backup Project gives 
     36permission to link any code falling under this license (the Box Backup 
     37GPL) with any version of Microsoft's Volume Shadow Copy Service 7.2 SDK 
     38or Microsoft Windows Software Development Kit (SDK), including 
     39vssapi.lib, that can be downloaded from the Microsoft website 
     40[*.microsoft.com], and to distribute the linked executables under the 
     41terms of the "Box Backup GPL" license. 

  • box/RELEASE/0.11rc7/distribution/COMMON-MANIFEST.txt

    r2573 r2657  
     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/RELEASE/0.11rc7/distribution/boxbackup/DISTRIBUTION-MANIFEST.txt

    r2580 r2657  
     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 
    2429test/httpserver/testfiles 
    2530test/httpserver/testfiles/photos 
    2631docs/Makefile 
    2732docs/tools 
     33 
     34LICENSE DUAL 
    2835docs/api-notes 
    29 docs/api-notes/backup 
    3036docs/api-notes/raidfile 
    3137docs/api-notes/raidfile/lib_raidfile.txt 
    32 docs/html 
    33 docs/html/images 
     38 
     39LICENSE GPL 
     40docs/api-notes/backup 
     41 
     42docs/images 
    3443docs/htmlguide 
    3544docs/htmlguide/adminguide 
    … …  
    6776BUGS.txt 
    6877contrib 
    69 NO-LICENSE-IN-DIR contrib/debian 
    70 NO-LICENSE-IN-DIR contrib/mac_osx 
    71 NO-LICENSE-IN-DIR contrib/redhat 
    72 NO-LICENSE-IN-DIR contrib/rpm 
     78 
     79contrib/debian 
     80contrib/mac_osx 
     81contrib/redhat 
     82contrib/rpm 
    7383REPLACE-VERSION-IN contrib/rpm/boxbackup.spec 
    74 NO-LICENSE-IN-DIR contrib/solaris 
    75 NO-LICENSE-IN-DIR contrib/suse 
    76 NO-LICENSE-IN-DIR contrib/bbreporter 
    77 NO-LICENSE-IN-DIR contrib/windows 
    78 NO-LICENSE-IN-DIR contrib/windows/installer 
    79 NO-LICENSE-IN-DIR contrib/windows/installer/tools 
     84contrib/solaris 
     85contrib/suse 
     86contrib/bbreporter 
     87contrib/windows 
     88contrib/windows/installer 
     89contrib/windows/installer/tools 
    8090infrastructure/msvc 
    81 NO-LICENSE-IN-DIR infrastructure/msvc/2003 
    82 NO-LICENSE-IN-DIR infrastructure/msvc/2005 
     91infrastructure/msvc/2003 
     92infrastructure/msvc/2005 

  • box/RELEASE/0.11rc7/infrastructure/makedistribution.pl.in

    r2573 r2657  
    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                 

  • box/RELEASE/0.11rc7/parcels.txt

    r2518 r2657  
    99        bin bbackupctl 
    1010        script bin/bbackupd/bbackupd-config 
    11         noinstall script LICENSE.txt 
     11        noinstall script COPYING.txt 
     12        noinstall script LICENSE-GPL.txt 
     13        noinstall script LICENSE-DUAL.txt 
    1214 
    1315        html bbackupd 
    … …  
    5153        script bin/bbstored/bbstored-config 
    5254        script lib/raidfile/raidfile-config 
    53         noinstall script LICENSE.txt 
     55        noinstall script COPYING.txt 
     56        noinstall script LICENSE-GPL.txt 
     57        noinstall script LICENSE-DUAL.txt 
    5458 
    5559        html bbstored 
Note: See TracChangeset for help on using the changeset viewer.