From 9627f2b77d57734213d5c73574d68a481b0f8d42 Mon Sep 17 00:00:00 2001 From: Nish Sinha Date: Thu, 14 Oct 2021 11:28:21 -0400 Subject: [PATCH 1/4] Add license to image and gemspec The dependabot-* gems on rubygems currently have the license set as 'nonstandard' and do not include a license file. --- Dockerfile | 1 + common/dependabot-common.gemspec | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 84dee5e2cd7..2feedda3f2a 100644 --- a/Dockerfile +++ b/Dockerfile @@ -226,6 +226,7 @@ RUN apt-add-repository "deb [arch=amd64] https://apt.releases.hashicorp.com $(ls USER root +COPY --chown=dependabot:dependabot LICENSE /home/dependabot COPY --chown=dependabot:dependabot composer/helpers /opt/composer/helpers COPY --chown=dependabot:dependabot bundler/helpers /opt/bundler/helpers COPY --chown=dependabot:dependabot go_modules/helpers /opt/go_modules/helpers diff --git a/common/dependabot-common.gemspec b/common/dependabot-common.gemspec index 20ef393361a..0345ce7e850 100644 --- a/common/dependabot-common.gemspec +++ b/common/dependabot-common.gemspec @@ -13,7 +13,7 @@ Gem::Specification.new do |spec| spec.author = "Dependabot" spec.email = "support@dependabot.com" spec.homepage = "https://github.com/dependabot/dependabot-core" - spec.license = "Nonstandard" # License Zero Prosperity Public License + spec.license = "Prosperity Public License 2.0.0" spec.require_path = "lib" spec.files = [] From 05aa6ee50fd752f8d3c7c9fae1e2af86489c2f90 Mon Sep 17 00:00:00 2001 From: Nish Sinha Date: Thu, 14 Oct 2021 13:55:16 -0400 Subject: [PATCH 2/4] Add license to gem build directory --- Rakefile | 3 +++ 1 file changed, 3 insertions(+) diff --git a/Rakefile b/Rakefile index 7b14cb3741a..5bd3ef37660 100644 --- a/Rakefile +++ b/Rakefile @@ -43,6 +43,9 @@ namespace :gems do pkg_path = File.join(root_path, "pkg") Dir.mkdir(pkg_path) unless File.directory?(pkg_path) + license_path = File.join(root_path, "LICENSE") + FileUtils.cp(license_path, pkg_path) if File.file?(license_path) + GEMSPECS.each do |gemspec_path| puts "> Building #{gemspec_path}" Dir.chdir(File.dirname(gemspec_path)) do From c17b9dd9d14f6bccd53be6372a71b09ba9334a53 Mon Sep 17 00:00:00 2001 From: Nish Sinha Date: Thu, 14 Oct 2021 14:15:23 -0400 Subject: [PATCH 3/4] Set license back to Nonstandard Rubygems only recognizes licenses on the spdx license list, and the Prosperity Public License 2.0.0 is not one of them. --- common/dependabot-common.gemspec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/common/dependabot-common.gemspec b/common/dependabot-common.gemspec index 0345ce7e850..20ef393361a 100644 --- a/common/dependabot-common.gemspec +++ b/common/dependabot-common.gemspec @@ -13,7 +13,7 @@ Gem::Specification.new do |spec| spec.author = "Dependabot" spec.email = "support@dependabot.com" spec.homepage = "https://github.com/dependabot/dependabot-core" - spec.license = "Prosperity Public License 2.0.0" + spec.license = "Nonstandard" # License Zero Prosperity Public License spec.require_path = "lib" spec.files = [] From 6c703d0ed393e36e9435011b7f7dd8c337162f56 Mon Sep 17 00:00:00 2001 From: Nish Sinha Date: Fri, 15 Oct 2021 14:52:20 -0400 Subject: [PATCH 4/4] Revert "Add license to gem build directory" This reverts commit 05aa6ee50fd752f8d3c7c9fae1e2af86489c2f90. --- Rakefile | 3 --- 1 file changed, 3 deletions(-) diff --git a/Rakefile b/Rakefile index 5bd3ef37660..7b14cb3741a 100644 --- a/Rakefile +++ b/Rakefile @@ -43,9 +43,6 @@ namespace :gems do pkg_path = File.join(root_path, "pkg") Dir.mkdir(pkg_path) unless File.directory?(pkg_path) - license_path = File.join(root_path, "LICENSE") - FileUtils.cp(license_path, pkg_path) if File.file?(license_path) - GEMSPECS.each do |gemspec_path| puts "> Building #{gemspec_path}" Dir.chdir(File.dirname(gemspec_path)) do