From 484415b0640b69635ffb5764e06ce1b165f7905a Mon Sep 17 00:00:00 2001
From: DistroBaker <osci-list@redhat.com>
Date: Thu, 25 Mar 2021 01:20:27 +0000
Subject: [PATCH] Merged update from upstream sources

This is an automated DistroBaker update from upstream sources.
If you do not know what this is about or would like to opt out,
contact the OSCI team.

Source: https://src.fedoraproject.org/rpms/rubygem-kramdown.git#a2769f11b9e3edcee64f393718d4ae488adf9ba5
---
 .gitignore                                    |  1 +
 ...ramdown-2.2.1-rouge-3_26_0-testsuite.patch | 35 -------------------
 rubygem-kramdown.spec                         | 13 ++++---
 sources                                       |  2 +-
 4 files changed, 10 insertions(+), 41 deletions(-)
 delete mode 100644 rubygem-kramdown-2.2.1-rouge-3_26_0-testsuite.patch

diff --git a/.gitignore b/.gitignore
index 1614bcb..3973815 100644
--- a/.gitignore
+++ b/.gitignore
@@ -23,3 +23,4 @@
 /kramdown-2.1.0.gem
 /kramdown-2.2.1.gem
 /kramdown-2.3.0.gem
+/kramdown-2.3.1.gem
diff --git a/rubygem-kramdown-2.2.1-rouge-3_26_0-testsuite.patch b/rubygem-kramdown-2.2.1-rouge-3_26_0-testsuite.patch
deleted file mode 100644
index ebc8bf1..0000000
--- a/rubygem-kramdown-2.2.1-rouge-3_26_0-testsuite.patch
+++ /dev/null
@@ -1,35 +0,0 @@
-From e1beb51af7fe4ecb85dbab7328f47a23c86c7df2 Mon Sep 17 00:00:00 2001
-From: Thomas Leitner <t_leitner@gmx.at>
-Date: Wed, 6 Jan 2021 16:05:10 +0100
-Subject: [PATCH] Fix failing tests due to changes in rouge
-
----
- Rakefile                                              | 2 +-
- test/testcases/block/06_codeblock/rouge/multiple.html | 2 +-
- test/testcases/block/06_codeblock/rouge/simple.html   | 2 +-
- 3 files changed, 3 insertions(+), 3 deletions(-)
-
-diff --git a/test/testcases/block/06_codeblock/rouge/multiple.html b/test/testcases/block/06_codeblock/rouge/multiple.html
-index 03eddb47..6ece5432 100644
---- a/test/testcases/block/06_codeblock/rouge/multiple.html
-+++ b/test/testcases/block/06_codeblock/rouge/multiple.html
-@@ -6,6 +6,6 @@
- </code></pre>
- </div></div></div>
- 
--<div class="language-php highlighter-rouge"><div class="custom-class"><div class="highlight"><pre class="highlight"><code><span class="nv">$foo</span> <span class="o">=</span> <span class="k">new</span> <span class="nx">Bar</span><span class="p">;</span>
-+<div class="language-php highlighter-rouge"><div class="custom-class"><div class="highlight"><pre class="highlight"><code><span class="nv">$foo</span> <span class="o">=</span> <span class="k">new</span> <span class="nc">Bar</span><span class="p">;</span>
- </code></pre>
- </div></div></div>
-diff --git a/test/testcases/block/06_codeblock/rouge/simple.html b/test/testcases/block/06_codeblock/rouge/simple.html
-index 10f280a3..1c2259af 100644
---- a/test/testcases/block/06_codeblock/rouge/simple.html
-+++ b/test/testcases/block/06_codeblock/rouge/simple.html
-@@ -5,6 +5,6 @@
- </code></pre>
- </div></div>
- 
--<div class="language-php highlighter-rouge"><div class="highlight"><pre class="highlight"><code><span class="nv">$foo</span> <span class="o">=</span> <span class="k">new</span> <span class="nx">Bar</span><span class="p">;</span>
-+<div class="language-php highlighter-rouge"><div class="highlight"><pre class="highlight"><code><span class="nv">$foo</span> <span class="o">=</span> <span class="k">new</span> <span class="nc">Bar</span><span class="p">;</span>
- </code></pre>
- </div></div>
diff --git a/rubygem-kramdown.spec b/rubygem-kramdown.spec
index 7e55a08..a283a22 100644
--- a/rubygem-kramdown.spec
+++ b/rubygem-kramdown.spec
@@ -2,15 +2,13 @@
 %global gem_name kramdown
 
 Name: rubygem-%{gem_name}
-Version: 2.3.0
-Release: 2%{?dist}
+Version: 2.3.1
+Release: 1%{?dist}
 Summary: Fast, pure-Ruby Markdown-superset converter
 
 License:	MIT
 URL:		http://kramdown.rubyforge.org
 Source0:	https://rubygems.org/gems/%{gem_name}-%{version}.gem
-# https://github.com/gettalong/kramdown/commit/e1beb51af7fe4ecb85dbab7328f47a23c86c7df2
-Patch2:	rubygem-kramdown-2.2.1-rouge-3_26_0-testsuite.patch
 BuildRequires:	ruby(release)
 BuildRequires:	rubygems-devel
 BuildRequires:	rubygem(minitest) >= 5
@@ -49,7 +47,6 @@ Documentation for %{name}
 
 %prep
 %setup -q -n %{gem_name}-%{version}
-%patch2 -p1
 mv ../%{gem_name}-%{version}.gemspec .
 
 %build
@@ -109,6 +106,12 @@ popd
 %doc	%{gem_docdir}
 
 %changelog
+* Sun Mar 21 2021 Mamoru TASAKA <mtasaka@fedoraproject.org> - 2.3.0-1
+- 2.3.1
+
+* Sun Mar 21 2021 Mamoru TASAKA <mtasaka@fedoraproject.org> - 2.3.0-3
+- Apply upstream fix for CVE-2021-28834 (rouge formatter namespace restriction)
+
 * Tue Feb 16 2021 Mamoru TASAKA <mtasaka@fedoraproject.org> - 2.3.0-2
 - Use recent packaging style
 
diff --git a/sources b/sources
index 7e24ab4..15d73b4 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (kramdown-2.3.0.gem) = a3ed8360de9208d5ce658d198763737826db943d23dda7ca9cfd507a4656c39f2b19ece78af87981b1177fe01690d6647c854092b230cf3a8a7d2823dc83d276
+SHA512 (kramdown-2.3.1.gem) = d1955065e3c5d7a60e595b647d5e453cf07a08fe25d40c67cf6f32d30f704a2c653a52959f8c71b3290e6da74836a085fa6bf8201c878303ad572dee8cc64496