Skip to content
Snippets Groups Projects
Commit dd7d6083 authored by Marin Jankovski's avatar Marin Jankovski Committed by Jason Plum
Browse files

Merge branch '2568-license-generation-issues' into 'master'

Resolve "License generation issues"

Closes #2568

See merge request !1731
parent dbf5b372
No related branches found
No related tags found
1 merge request!1869Merge branch '2568-license-generation-issues' into '9-4-stable'
diff --git a/LICENSE b/LICENSE
new file mode 100644
index 0000000..9b862c1
--- /dev/null
+++ b/LICENSE
@@ -0,0 +1,25 @@
+Note: Below license information is extracted from the following files:
+ * /opt/gitlab/embedded/lib/config_guess/config.guess
+ * /opt/gitlab/embedded/lib/config_guess/config.sub
+
+Copyright 1992-2016 Free Software Foundation, Inc.
+
+This file 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 3 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, see <http://www.gnu.org/licenses/>.
+
+As a special exception to the GNU General Public License, if you
+distribute this file as part of a program that contains a
+configuration script generated by Autoconf, you may include it under
+the same distribution terms that you use for the rest of that
+program. This Exception is an additional permission under section 7
+of the GNU General Public License, version 3 ("GPLv3").
diff --git a/LICENSE b/LICENSE
new file mode 100644
index 0000000..3749516
--- /dev/null
+++ b/LICENSE
@@ -0,0 +1,23 @@
+Note: This license information is extracted from
+http://invisible-island.net/ncurses/ncurses.faq.html#who_owns_it
+
+Permission is hereby granted, free of charge, to any person obtaining a copy of
+this software and associated documentation files (the "Software"), to deal in
+the Software without restriction, including without limitation the rights to
+use, copy, modify, merge, publish, distribute, distribute with modifications,
+sublicense, and/or sell copies of the Software, and to permit persons to whom
+the Software is furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS
+FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE ABOVE
+COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER
+IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+
+Except as contained in this notice, the name(s) of the above copyright holders
+shall not be used in advertising or otherwise to promote the sale, use or other
+dealings in this Software without prior written authorization.
Loading
Loading
@@ -18,7 +18,7 @@ name 'chef-gem'
default_version '12.12.15'
 
license 'Apache-2.0'
license_file 'https://github.com/chef/chef/blob/master/LICENSE'
license_file 'https://github.com/chef/chef/raw/master/LICENSE'
 
dependency 'ruby'
dependency 'rubygems'
Loading
Loading
Loading
Loading
@@ -25,12 +25,12 @@ source git: version.remote
 
# http://savannah.gnu.org/projects/config
license 'GPL-3.0 (with exception)'
license_file 'config.guess'
license_file 'config.sub'
license_file 'LICENSE'
 
relative_path "config_guess-#{version.print}"
 
build do
patch source: 'add-license-file.patch'
mkdir "#{install_dir}/embedded/lib/config_guess"
 
copy "#{project_dir}/config.guess", "#{install_dir}/embedded/lib/config_guess/config.guess"
Loading
Loading
Loading
Loading
@@ -18,8 +18,7 @@ name 'ncurses'
default_version '5.9'
 
license 'MIT'
license_file 'http://invisible-island.net/ncurses/ncurses-license.html'
license_file 'http://invisible-island.net/ncurses/ncurses.faq.html'
license_file 'LICENSE'
 
dependency 'libtool' if aix?
dependency 'patch' if solaris2?
Loading
Loading
@@ -44,6 +43,7 @@ relative_path "ncurses-#{version}"
########################################################################
 
build do
patch source: 'add-license-file.patch'
env = with_standard_compiler_flags(with_embedded_path)
env.delete('CPPFLAGS')
 
Loading
Loading
Loading
Loading
@@ -18,7 +18,7 @@ name 'omnibus-ctl'
default_version 'v0.5.0'
 
license 'Apache-2.0'
license_file 'https://github.com/chef/omnibus-ctl/blob/master/LICENSE'
license_file 'https://github.com/chef/omnibus-ctl/raw/master/LICENSE'
 
dependency 'ruby'
dependency 'rubygems'
Loading
Loading
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment