From f3988a7faa202a7e0607f4bc132450cc4231dfee Mon Sep 17 00:00:00 2001
From: Mike Linksvayer <mlinksva@github.com>
Date: Sun, 31 Dec 2017 10:03:56 -0800
Subject: [PATCH 1/3] SPDX license list 3.0 uses -or-later and -only over + and
 no modifier

Reflect that in sidebar instructions for *GPL as seen e.g. at
https://choosealicense.com/licenses/agpl-3.0/
---
 _includes/sidebar.html | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/_includes/sidebar.html b/_includes/sidebar.html
index 9b4bacc..aef5124 100644
--- a/_includes/sidebar.html
+++ b/_includes/sidebar.html
@@ -1,7 +1,7 @@
 <div class="sidebar">
 
   <a href="#" data-clipboard-target="#license-text" data-proofer-ignore="true" class="js-clipboard-button button">Copy license text to clipboard</a>
-    
+
   <div class="how-to-apply">
     <h3>How to apply this license</h3>
     <p>
@@ -14,7 +14,7 @@
     {% endif %}
     {% assign xgpl = false %}
     {% if page.spdx-id contains 'GPL' %}{% assign xgpl = true %}{% endif %}
-    <p class="note"><strong>Optional: </strong> Add <strong><code>{{ page.spdx-id }}</code>{% if xgpl %}+{% endif %}</strong>{% if xgpl %} (or <strong><code>{{ page.spdx-id }}</code></strong> to disallow future versions){% endif %} to your project's package description, if applicable (e.g., <a href="https://docs.npmjs.com/files/package.json#license">Node.js</a>, <a href="http://guides.rubygems.org/specification-reference/#license=">Ruby</a>, and <a href="http://doc.crates.io/manifest.html#package-metadata">Rust</a>). This will ensure the license is displayed in package directories.</p>
+    <p class="note"><strong>Optional: </strong> Add <strong><code>{{ page.spdx-id }}{% if xgpl %}-or-later{% endif %}</code></strong>{% if xgpl %} (or <strong><code>{{ page.spdx-id }}-only</code></strong> to disallow future versions){% endif %} to your project's package description, if applicable (e.g., <a href="https://docs.npmjs.com/files/package.json#license">Node.js</a>, <a href="http://guides.rubygems.org/specification-reference/#license=">Ruby</a>, and <a href="http://doc.crates.io/manifest.html#package-metadata">Rust</a>). This will ensure the license is displayed in package directories.</p>
   </div>
 
   {% if page.source %}

From 5aa36a304d22fae0d400c40af7ac4d41d7478963 Mon Sep 17 00:00:00 2001
From: Mike Linksvayer <mlinksva@github.com>
Date: Tue, 24 Apr 2018 16:21:39 -0700
Subject: [PATCH 2/3] update apache-2.0 examples to pass tests

---
 _licenses/apache-2.0.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/_licenses/apache-2.0.txt b/_licenses/apache-2.0.txt
index bcd63fa..dbb2d06 100644
--- a/_licenses/apache-2.0.txt
+++ b/_licenses/apache-2.0.txt
@@ -13,8 +13,8 @@ how: Create a text file (typically named LICENSE or LICENSE.txt) in the root of
 note: The Apache Foundation recommends taking the additional step of adding a boilerplate notice to the header of each source file. You can find the notice at the very end of the license in the appendix.
 
 using:
-  - Elasticsearch: https://github.com/elastic/elasticsearch/blob/master/LICENSE.txt
   - Kubernetes: https://github.com/kubernetes/kubernetes/blob/master/LICENSE
+  - PDF.js: https://github.com/mozilla/pdf.js/blob/master/LICENSE
   - Swift: https://github.com/apple/swift/blob/master/LICENSE.txt
 
 permissions:

From 278bae2316a7a1ea68f76667cf201364f5546510 Mon Sep 17 00:00:00 2001
From: Mike Linksvayer <mlinksva@github.com>
Date: Tue, 24 Apr 2018 16:43:47 -0700
Subject: [PATCH 3/3] test handle repo name with . in it

---
 spec/license_meta_spec.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/spec/license_meta_spec.rb b/spec/license_meta_spec.rb
index e9067a5..664cbef 100644
--- a/spec/license_meta_spec.rb
+++ b/spec/license_meta_spec.rb
@@ -58,7 +58,7 @@ describe 'license meta' do
             let(:detected) { Licensee::ProjectFiles::LicenseFile.new(content, 'LICENSE').license }
 
             if example_url.start_with?('https://github.com/')
-              example_url.gsub!(%r{\Ahttps://github.com/([\w-]+/[\w-]+)/blob/([\w-]+/\S+)\z}, 'https://raw.githubusercontent.com/\1/\2')
+              example_url.gsub!(%r{\Ahttps://github.com/([\w-]+/[\w\.-]+)/blob/([\w-]+/\S+)\z}, 'https://raw.githubusercontent.com/\1/\2')
             elsif example_url.start_with?('https://git.savannah.gnu.org/', 'https://git.gnome.org/')
               example_url.gsub!(%r{/tree/}, '/plain/')
             elsif example_url.start_with?('https://bitbucket.org/')