CLOUDSTACK-145 - Added licensing for ssh config
Project: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/commit/6cd878d8 Tree: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/tree/6cd878d8 Diff: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/diff/6cd878d8 Branch: refs/heads/4.0 Commit: 6cd878d8e0a435567723fa42a25205d82fec5feb Parents: d4261f8 Author: Chip Childers <[email protected]> Authored: Thu Sep 27 14:47:57 2012 -0400 Committer: Edison Su <[email protected]> Committed: Thu Sep 27 17:22:56 2012 -0700 ---------------------------------------------------------------------- LICENSE | 32 ++++++++++++++++++++++++++++++++ tools/whisker/descriptor.xml | 11 +++++++++++ 2 files changed, 43 insertions(+), 0 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/6cd878d8/LICENSE ---------------------------------------------------------------------- diff --git a/LICENSE b/LICENSE index d28673b..80464be 100644 --- a/LICENSE +++ b/LICENSE @@ -2366,6 +2366,38 @@ Within the patches/systemvm/debian/config/etc/apache2 directory vhostexample.conf +Within the patches/systemvm/debian/config/etc/ssh/ directory + licensed under the BSD (2-clause) http://www.opensource.org/licenses/BSD-2-Clause (as follows) + + + Redistribution and use in source and binary forms, with or without modification, + are permitted provided that the following conditions are met: + + Redistributions of source code must retain the above copyright notice, this list + of conditions and the following disclaimer. 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. + + Neither the name of the author nor the names of 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 OWNER OR CONTRIBUTORS 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. + + from OpenSSH Project http://www.openssh.org/ + sshd_config + + Within the scripts/storage/secondary directory licensed under the Apache License, Version 2 http://www.apache.org/licenses/LICENSE-2.0.txt (as above) Copyright (c) 2010-2011 OpenStack, LLC. http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/6cd878d8/tools/whisker/descriptor.xml ---------------------------------------------------------------------- diff --git a/tools/whisker/descriptor.xml b/tools/whisker/descriptor.xml index 1159824..173c773 100644 --- a/tools/whisker/descriptor.xml +++ b/tools/whisker/descriptor.xml @@ -2397,6 +2397,10 @@ this distribution. id='person:simon.kelley' name='Simon Kelley' url='' /> + <organisation + id='openssh.org' + name='OpenSSH Project' + url='http://www.openssh.org/' /> </organisations> <primary-license id='ApacheLicenseVersion2'> <copyright-notice>Copyright (c) 2012 The Apache Software Foundation</copyright-notice> @@ -2438,6 +2442,13 @@ Copyright (c) 2012 The Apache Software Foundation </by-organisation> </public-domain> </within> + <within dir='patches/systemvm/debian/config/etc/ssh/'> + <with-license id='BSD2ClauseGeneric'> + <by-organisation id='openssh.org'> + <resource name='sshd_config' /> + </by-organisation> + </with-license> + </within> <within dir='deps'> <with-license id='BSD2ClauseXenServerJava'> <copyright-notice>
