diff options
author | Ramon Fernandez <ramon@mongodb.com> | 2018-06-20 12:30:42 -0400 |
---|---|---|
committer | Ramon Fernandez <ramon@mongodb.com> | 2018-06-20 12:33:04 -0400 |
commit | c6b10c46cce635574297577f75f57b792b508893 (patch) | |
tree | 0a38caf01b707d01ed233529ab3c4cbf9c79e90c | |
parent | 43f8fc8c45b854c192f39368f843352c479008f5 (diff) | |
download | mongo-c6b10c46cce635574297577f75f57b792b508893.tar.gz |
SERVER-35665 Update license on all artifacts
License for Community artifacts is in the LICENSE-Community.txt file.
License for Enterprise artifacts is in the LICENSE-Enterprise.txt file.
This change also updates deb/rpm/msi packages.
-rwxr-xr-x | buildscripts/packager.py | 2 | ||||
-rwxr-xr-x | buildscripts/packager_enterprise.py | 2 | ||||
-rw-r--r-- | buildscripts/packaging/msi/LICENSE-Community.rtf | 44 | ||||
-rw-r--r-- | debian/mongodb-org-server.docs | 1 | ||||
-rw-r--r-- | debian/mongodb-org-unstable-server.docs | 1 | ||||
-rw-r--r-- | rpm/mongodb-enterprise-init.spec | 2 | ||||
-rw-r--r-- | rpm/mongodb-enterprise-unstable-init.spec | 2 | ||||
-rw-r--r-- | rpm/mongodb-enterprise-unstable.spec | 2 | ||||
-rw-r--r-- | rpm/mongodb-enterprise.spec | 2 | ||||
-rw-r--r-- | rpm/mongodb-org-init.spec | 1 | ||||
-rw-r--r-- | rpm/mongodb-org-unstable-init.spec | 1 | ||||
-rw-r--r-- | rpm/mongodb-org-unstable.spec | 1 | ||||
-rw-r--r-- | rpm/mongodb-org.spec | 1 | ||||
-rw-r--r-- | src/mongo/SConscript | 8 | ||||
-rw-r--r-- | src/mongo/installer/msi/wxs/LicensingFragment.wxs | 6 |
15 files changed, 64 insertions, 12 deletions
diff --git a/buildscripts/packager.py b/buildscripts/packager.py index 1e6644690af..e109ae1dc0a 100755 --- a/buildscripts/packager.py +++ b/buildscripts/packager.py @@ -492,7 +492,7 @@ def unpack_binaries_into(build_os, arch, spec, where): try: sysassert(["tar", "xvzf", rootdir + "/" + tarfile(build_os, arch, spec)]) release_dir = glob('mongodb-linux-*')[0] - for releasefile in "bin", "GNU-AGPL-3.0", "README", "THIRD-PARTY-NOTICES", "MPL-2": + for releasefile in "bin", "LICENSE-Community.txt", "GNU-AGPL-3.0", "README", "THIRD-PARTY-NOTICES", "MPL-2": print "moving file: %s/%s" % (release_dir, releasefile) os.rename("%s/%s" % (release_dir, releasefile), releasefile) os.rmdir(release_dir) diff --git a/buildscripts/packager_enterprise.py b/buildscripts/packager_enterprise.py index 00861e21870..dafd2258ef3 100755 --- a/buildscripts/packager_enterprise.py +++ b/buildscripts/packager_enterprise.py @@ -218,7 +218,7 @@ def unpack_binaries_into(build_os, arch, spec, where): try: packager.sysassert(["tar", "xvzf", rootdir + "/" + tarfile(build_os, arch, spec)]) release_dir = glob('mongodb-linux-*')[0] - for releasefile in "bin", "snmp", "LICENSE.txt", "README", "THIRD-PARTY-NOTICES", "MPL-2": + for releasefile in "bin", "snmp", "LICENSE-Enterprise.txt", "README", "THIRD-PARTY-NOTICES", "MPL-2": os.rename("%s/%s" % (release_dir, releasefile), releasefile) os.rmdir(release_dir) except Exception: diff --git a/buildscripts/packaging/msi/LICENSE-Community.rtf b/buildscripts/packaging/msi/LICENSE-Community.rtf new file mode 100644 index 00000000000..d19265d7aa0 --- /dev/null +++ b/buildscripts/packaging/msi/LICENSE-Community.rtf @@ -0,0 +1,44 @@ +{\rtf1\ansi\ansicpg1252\cocoartf1504\cocoasubrtf830 +{\fonttbl\f0\fswiss\fcharset0 Helvetica-Light;} +{\colortbl;\red255\green255\blue255;} +{\*\expandedcolortbl;;} +\pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\pardirnatural\partightenfactor0 + +\f0\fs24 \cf0 Copyright (C) 2008-present MongoDB Inc.\ +\ +This program is free software: you can redistribute it and/or modify\ +it under the terms of the GNU Affero General Public License, version 3,\ +as published by the Free Software Foundation.\ +\ +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 Affero General Public License for more details.\ +\ +You should have received a copy of the GNU Affero General Public License\ +along with this program. If not, see <http://www.gnu.org/licenses/>.\ +\ +As a special exception, the copyright holders give permission to link the\ +code of portions of this program with the OpenSSL library under certain\ +conditions as described in each individual source file and distribute\ +linked combinations including the program with the OpenSSL library. You\ +must comply with the GNU Affero General Public License in all respects\ +for all of the code used other than as permitted herein. If you modify\ +file(s) with this exception, you may extend this exception to your\ +version of the file(s), but you are not obligated to do so. If you do not\ +wish to do so, delete this exception statement from your version. If you\ +delete this exception statement from all source files in the program,\ +then also delete it in the license file.\ +\ +The copyright holders provide the following statement as a clarification\ +of the conditions of this License. This statement is not a further\ +restriction. It will be deemed a legal notice allowed under Section 7b,\ +and must accordingly be preserved in any redistribution of the Program.\ +This clarification applies to the MongoDB Program licensed hereunder by\ +MongoDB, Inc. The Corresponding Source of the Program includes any\ +software that interacts with the Program and contains functionality to\ +provision or manage the Program for the purpose of enabling third-party\ +users to interact with the Program remotely through a computer network,\ +and any such software that is added to or combined with the Program\ +constitutes modification that produces a work based on the Program.\ +}
\ No newline at end of file diff --git a/debian/mongodb-org-server.docs b/debian/mongodb-org-server.docs index b1cea8cce6f..f78af6e8e19 100644 --- a/debian/mongodb-org-server.docs +++ b/debian/mongodb-org-server.docs @@ -1,3 +1,4 @@ +LICENSE-Community.txt GNU-AGPL-3.0 README THIRD-PARTY-NOTICES diff --git a/debian/mongodb-org-unstable-server.docs b/debian/mongodb-org-unstable-server.docs index b1cea8cce6f..f78af6e8e19 100644 --- a/debian/mongodb-org-unstable-server.docs +++ b/debian/mongodb-org-unstable-server.docs @@ -1,3 +1,4 @@ +LICENSE-Community.txt GNU-AGPL-3.0 README THIRD-PARTY-NOTICES diff --git a/rpm/mongodb-enterprise-init.spec b/rpm/mongodb-enterprise-init.spec index 3a9a7b6a9c6..9e01ab36f81 100644 --- a/rpm/mongodb-enterprise-init.spec +++ b/rpm/mongodb-enterprise-init.spec @@ -236,7 +236,7 @@ fi %doc snmp/mongod.conf.master %doc snmp/mongod.conf.subagent %doc snmp/README-snmp.txt -%doc LICENSE.txt +%doc LICENSE-Enterprise.txt %doc README %doc THIRD-PARTY-NOTICES %doc MPL-2 diff --git a/rpm/mongodb-enterprise-unstable-init.spec b/rpm/mongodb-enterprise-unstable-init.spec index 6c3801871d4..3401cc5a2a3 100644 --- a/rpm/mongodb-enterprise-unstable-init.spec +++ b/rpm/mongodb-enterprise-unstable-init.spec @@ -227,7 +227,7 @@ fi %doc snmp/mongod.conf.master %doc snmp/mongod.conf.subagent %doc snmp/README-snmp.txt -%doc LICENSE.txt +%doc LICENSE-Enterprise.txt %doc README %doc THIRD-PARTY-NOTICES %doc MPL-2 diff --git a/rpm/mongodb-enterprise-unstable.spec b/rpm/mongodb-enterprise-unstable.spec index b80def4444f..599c1e07be2 100644 --- a/rpm/mongodb-enterprise-unstable.spec +++ b/rpm/mongodb-enterprise-unstable.spec @@ -229,7 +229,7 @@ fi %doc snmp/mongod.conf.master %doc snmp/mongod.conf.subagent %doc snmp/README-snmp.txt -%doc LICENSE.txt +%doc LICENSE-Enterprise.txt %doc README %doc THIRD-PARTY-NOTICES %doc MPL-2 diff --git a/rpm/mongodb-enterprise.spec b/rpm/mongodb-enterprise.spec index 7dfa6a25068..299d143d27e 100644 --- a/rpm/mongodb-enterprise.spec +++ b/rpm/mongodb-enterprise.spec @@ -236,7 +236,7 @@ fi %doc snmp/mongod.conf.master %doc snmp/mongod.conf.subagent %doc snmp/README-snmp.txt -%doc LICENSE.txt +%doc LICENSE-Enterprise.txt %doc README %doc THIRD-PARTY-NOTICES %doc MPL-2 diff --git a/rpm/mongodb-org-init.spec b/rpm/mongodb-org-init.spec index 9991e9e10b8..6e06aa74d55 100644 --- a/rpm/mongodb-org-init.spec +++ b/rpm/mongodb-org-init.spec @@ -231,6 +231,7 @@ fi %attr(0755,mongod,mongod) %dir /var/log/mongodb %attr(0755,mongod,mongod) %dir /var/run/mongodb %attr(0640,mongod,mongod) %config(noreplace) %verify(not md5 size mtime) /var/log/mongodb/mongod.log +%doc LICENSE-Community.txt %doc GNU-AGPL-3.0 %doc README %doc THIRD-PARTY-NOTICES diff --git a/rpm/mongodb-org-unstable-init.spec b/rpm/mongodb-org-unstable-init.spec index a3deb2add95..bb1acb1966c 100644 --- a/rpm/mongodb-org-unstable-init.spec +++ b/rpm/mongodb-org-unstable-init.spec @@ -221,6 +221,7 @@ fi %attr(0755,mongod,mongod) %dir /var/log/mongodb %attr(0755,mongod,mongod) %dir /var/run/mongodb %attr(0640,mongod,mongod) %config(noreplace) %verify(not md5 size mtime) /var/log/mongodb/mongod.log +%doc LICENSE-Community.txt %doc GNU-AGPL-3.0 %doc README %doc THIRD-PARTY-NOTICES diff --git a/rpm/mongodb-org-unstable.spec b/rpm/mongodb-org-unstable.spec index 2e572641aa0..1d112650a1b 100644 --- a/rpm/mongodb-org-unstable.spec +++ b/rpm/mongodb-org-unstable.spec @@ -221,6 +221,7 @@ fi %attr(0755,mongod,mongod) %dir /var/log/mongodb %attr(0755,mongod,mongod) %dir /var/run/mongodb %attr(0640,mongod,mongod) %config(noreplace) %verify(not md5 size mtime) /var/log/mongodb/mongod.log +%doc LICENSE-Community.txt %doc GNU-AGPL-3.0 %doc README %doc THIRD-PARTY-NOTICES diff --git a/rpm/mongodb-org.spec b/rpm/mongodb-org.spec index ab5cbca1a22..1c2d5148f37 100644 --- a/rpm/mongodb-org.spec +++ b/rpm/mongodb-org.spec @@ -231,6 +231,7 @@ fi %attr(0755,mongod,mongod) %dir /var/log/mongodb %attr(0755,mongod,mongod) %dir /var/run/mongodb %attr(0640,mongod,mongod) %config(noreplace) %verify(not md5 size mtime) /var/log/mongodb/mongod.log +%doc LICENSE-Community.txt %doc GNU-AGPL-3.0 %doc README %doc THIRD-PARTY-NOTICES diff --git a/src/mongo/SConscript b/src/mongo/SConscript index 08fdf4b80a8..ec1dcf3165c 100644 --- a/src/mongo/SConscript +++ b/src/mongo/SConscript @@ -643,9 +643,11 @@ env.Append(MODULE_BANNERS = [distsrc.File('README'), distsrc.File('THIRD-PARTY-NOTICES'), distsrc.File('MPL-2')]) -# If no module has introduced a file named LICENSE.txt, then inject the AGPL. -if sum(itertools.imap(lambda x: x.name == "LICENSE.txt", env['MODULE_BANNERS'])) == 0: - env.Append(MODULE_BANNERS = [distsrc.File('GNU-AGPL-3.0')]) +# If no module has introduced a file named LICENSE-Enterprise.txt then this +# is a Community build, so inject the AGPL and the Community license +if sum(itertools.imap(lambda x: x.name == "LICENSE-Enterprise.txt", env['MODULE_BANNERS'])) == 0: + env.Append(MODULE_BANNERS = [distsrc.File('GNU-AGPL-3.0'), + distsrc.File('LICENSE-Community.txt')]) # All module banners get staged to the top level of the tarfile, so we # need to fail if we are going to have a name collision. diff --git a/src/mongo/installer/msi/wxs/LicensingFragment.wxs b/src/mongo/installer/msi/wxs/LicensingFragment.wxs index ab3ca60414d..66efb17ef43 100644 --- a/src/mongo/installer/msi/wxs/LicensingFragment.wxs +++ b/src/mongo/installer/msi/wxs/LicensingFragment.wxs @@ -5,7 +5,7 @@ <DirectoryRef Id="INSTALLLOCATION">
<?if $(var.Edition) = Enterprise ?>
<Component Id="c_License" Guid="C0EF85E2-95F8-468B-BA95-2F739C63D2D7">
- <File Id="f_License" Name="LICENSE.txt" Source="$(var.EnterpriseBase)\distsrc\LICENSE.txt"
+ <File Id="f_License" Name="LICENSE-Enterprise.txt" Source="$(var.EnterpriseBase)\distsrc\LICENSE-Enterprise.txt"
DiskId ="1" KeyPath="yes" />
</Component>
<Component Id="c_Thirdparty" Guid="C45662A7-5C18-4A53-8D14-7C92DB38F13E">
@@ -47,9 +47,9 @@ </ComponentGroup>
<?if $(var.Edition) = Enterprise ?>
- <WixVariable Id="WixUILicenseRtf" Value="$(var.EnterpriseBase)\distsrc\LICENSE.rtf" />
+ <WixVariable Id="WixUILicenseRtf" Value="$(var.EnterpriseBase)\distsrc\LICENSE-Enterprise.rtf" />
<?else ?>
- <WixVariable Id="WixUILicenseRtf" Value="$(var.ProjectDir)GNU-AGPL-3.0.rtf" />
+ <WixVariable Id="WixUILicenseRtf" Value="$(var.ProjectDir)LICENSE-Community.rtf" />
<?endif ?>
</Fragment>
|