Commit 1b3da033 authored by Marin Jankovski's avatar Marin Jankovski

Merge branch '1518-checked-licenses-shipped' into 'master'

Check Licenses shipped with the package: fix broken or missing

As part of the first stage in resolving #1518, we need to get our licenses fixed.

* Address all external software, with their appropriate licenses.
* Pull the omnibus-gitlab LICENSE file into all self-contained parts, resolving complaints of no license for multiple gitlab-xx packages.
* There are some offenders coming from upstream, but looking at the [omnibus-software repo](https://github.com/chef/omnibus-software), they are being resolved in recent commits (rsync for example).

See merge request !1025
parents 1fc05fed 68c3cb29
......@@ -16,6 +16,9 @@
name "cacerts"
license "MPL-2.0"
license_file "https://www.mozilla.org/media/MPL/2.0/index.815ca599c9df.txt"
# Date of the file is in a comment at the start, or in the changelog
default_version "2016.09.14"
......
......@@ -18,6 +18,7 @@
name "gitlab-config-template"
license "Apache-2.0"
license_file File.expand_path("LICENSE", Omnibus::Config.project_root)
source :path => File.expand_path("files/gitlab-config-template", Omnibus::Config.project_root)
......
......@@ -19,6 +19,7 @@
name "gitlab-cookbooks"
license "Apache-2.0"
license_file File.expand_path("LICENSE", Omnibus::Config.project_root)
source :path => File.expand_path("files/gitlab-cookbooks", Omnibus::Config.project_root)
......
......@@ -19,6 +19,7 @@
name "gitlab-ctl"
license "Apache-2.0"
license_file File.expand_path("LICENSE", Omnibus::Config.project_root)
dependency "omnibus-ctl"
......
......@@ -20,6 +20,7 @@ require 'digest'
name "gitlab-psql"
license "Apache-2.0"
license_file File.expand_path("LICENSE", Omnibus::Config.project_root)
# This 'software' is self-contained in this file. Use the file contents
# to generate a version string.
default_version Digest::MD5.file(__FILE__).hexdigest
......
......@@ -18,7 +18,7 @@
name "gitlab-scripts"
license "Apache-2.0"
license_file File.expand_path("LICENSE", Omnibus::Config.project_root)
source :path => File.expand_path("files/gitlab-scripts", Omnibus::Config.project_root)
build do
......
......@@ -18,6 +18,7 @@
name "gitlab-selinux"
license "Apache-2.0"
license_file File.expand_path("LICENSE", Omnibus::Config.project_root)
source :path => File.expand_path("files/gitlab-selinux", Omnibus::Config.project_root)
......
......@@ -18,6 +18,9 @@
name "jemalloc"
default_version "4.2.1"
license "jemalloc"
license_file "COPYING"
source url: "https://github.com/jemalloc/jemalloc/releases/download/#{version}/jemalloc-#{version}.tar.bz2",
sha256: '5630650d5c1caab95d2f0898de4fe5ab8519dc680b04963b38bb425ef6a42d57'
......
......@@ -23,7 +23,7 @@ source url: "http://download.icu-project.org/files/icu4c/57.1/icu4c-57_1-src.tgz
sha256: "ff8c67cb65949b1e7808f2359f2b80f722697048e90e7cfc382ec1fe229e9581"
license "MIT"
license_file "license.html"
license_file "icu/LICENSE"
build do
env = with_standard_compiler_flags(with_embedded_path)
......
......@@ -19,6 +19,7 @@
name "package-scripts"
license "Apache-2.0"
license_file File.expand_path("LICENSE", Omnibus::Config.project_root)
# Help omnibus-ruby to cache the build product of this software. This is a
# workaround for the deprecation of `always_build true`. What happens now is
......
......@@ -20,7 +20,7 @@ name "python-docutils"
default_version "0.11"
license "Public Domain"
license "Public-Domain"
license_file "http://docutils.sourceforge.net/COPYING.txt"
dependency "python3"
......
......@@ -25,7 +25,7 @@ dependency "zlib"
dependency "openssl"
dependency "bzip2"
license "PSFL"
license "Python-2.0"
license_file "LICENSE"
source :url => "http://python.org/ftp/python/#{version}/Python-#{version}.tgz",
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment