From 5f6715275e703ab49666a0440e6fcbb92a24c32f Mon Sep 17 00:00:00 2001
From: hsbt <hsbt@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>
Date: Thu, 19 Nov 2015 06:16:19 +0000
Subject: * lib/rubygems: Update to RubyGems 2.5.0+ HEAD(c6b4946).   this
 version includes #1114, #1314, #1322, #1375, #1383, #1387 * test/rubygems:
 ditto.

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@52666 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
---
 lib/rubygems/util/licenses.rb | 22 +++++++++++++++++++++-
 1 file changed, 21 insertions(+), 1 deletion(-)

(limited to 'lib/rubygems/util/licenses.rb')

diff --git a/lib/rubygems/util/licenses.rb b/lib/rubygems/util/licenses.rb
index 280d148625..a15b556c3e 100644
--- a/lib/rubygems/util/licenses.rb
+++ b/lib/rubygems/util/licenses.rb
@@ -4,7 +4,8 @@ class Gem::Licenses
   # Software Package Data Exchange (SPDX) standard open-source software
   # license identifiers
   IDENTIFIERS = %w(
-    AAL
+      0BSD
+      AAL
       ADSL
       AFL-1.1
       AFL-1.2
@@ -89,6 +90,7 @@ class Gem::Licenses
       CECILL-1.0
       CECILL-1.1
       CECILL-2.0
+      CECILL-2.1
       CECILL-B
       CECILL-C
       CNRI-Jython
@@ -102,6 +104,7 @@ class Gem::Licenses
       ClArtistic
       Condor-1.1
       Crossword
+      CrystalStacker
       Cube
       D-FSL-1.0
       DOC
@@ -146,6 +149,7 @@ class Gem::Licenses
       Imlib2
       Intel
       Intel-ACPI
+      Interbase-1.0
       JSON
       JasPer-2.0
       LGPL-2.0
@@ -254,6 +258,7 @@ class Gem::Licenses
       SPL-1.0
       SWL
       Saxpath
+      Sendmail
       SimPL-2.0
       Sleepycat
       Spencer-86
@@ -306,4 +311,19 @@ class Gem::Licenses
       xpp
       zlib-acknowledgement
   ).freeze
+
+  REGEXP = %r{
+    \A
+    (
+      #{Regexp.union(IDENTIFIERS)}
+      \+?
+      (\s WITH \s .+)?
+      | #{NONSTANDARD}
+    )
+    \Z
+  }ox.freeze
+
+  def self.match?(license)
+    !REGEXP.match(license).nil?
+  end
 end
-- 
cgit v1.2.3