RHEL 9.0.0 Alpha bootstrap
The content of this branch was automatically imported from Fedora ELN with the following as its source: https://src.fedoraproject.org/rpms/rubygem-kramdown#024ac4fb1cb29c9fad7b60a34c0cb8b1cf36b256
This commit is contained in:
Troy Dawson
parent
f3c70a99a3
commit
50f4139d62
24
.gitignore
vendored
24
.gitignore
vendored
@ -0,0 +1,24 @@
|
||||
/kramdown-1.2.0.gem
|
||||
/kramdown-1.3.0.gem
|
||||
/kramdown-1.3.1.gem
|
||||
/kramdown-1.3.2.gem
|
||||
/kramdown-1.3.3.gem
|
||||
/kramdown-1.4.0.gem
|
||||
/kramdown-1.4.1.gem
|
||||
/kramdown-1.4.2.gem
|
||||
/kramdown-1.5.0.gem
|
||||
/kramdown-1.6.0.gem
|
||||
/kramdown-1.7.0.gem
|
||||
/kramdown-1.8.0.gem
|
||||
/kramdown-1.9.0.gem
|
||||
/kramdown-1.10.0.gem
|
||||
/kramdown-1.11.1.gem
|
||||
/kramdown-1.12.0.gem
|
||||
/kramdown-1.13.1.gem
|
||||
/kramdown-1.13.2.gem
|
||||
/kramdown-1.14.0.gem
|
||||
/kramdown-1.15.0.gem
|
||||
/kramdown-1.16.2.gem
|
||||
/kramdown-1.17.0.gem
|
||||
/kramdown-2.1.0.gem
|
||||
/kramdown-2.2.1.gem
|
||||
@ -0,0 +1,67 @@
|
||||
From 1b8fd33c3120bfc6e5164b449e2c2fc9c9306fde Mon Sep 17 00:00:00 2001
|
||||
From: Thomas Leitner <t_leitner@gmx.at>
|
||||
Date: Sat, 27 Jun 2020 14:47:21 +0200
|
||||
Subject: [PATCH 1/2] Add option forbidden_inline_options
|
||||
|
||||
It is sometimes necessary to restrict the options that can be set
|
||||
inline, ie. using the {::options ...} extensions.
|
||||
|
||||
By default, the template option is now forbidden to avoid possible
|
||||
security problems. This addresses CVE-2020-14001.
|
||||
---
|
||||
lib/kramdown/options.rb | 10 ++++++++++
|
||||
lib/kramdown/parser/kramdown/extensions.rb | 6 ++++++
|
||||
test/testcases/block/12_extension/options.text | 2 ++
|
||||
3 files changed, 18 insertions(+)
|
||||
|
||||
diff --git a/lib/kramdown/options.rb b/lib/kramdown/options.rb
|
||||
index ea67913..0214e28 100644
|
||||
--- a/lib/kramdown/options.rb
|
||||
+++ b/lib/kramdown/options.rb
|
||||
@@ -589,6 +589,16 @@ module Kramdown
|
||||
Used by: HTML converter
|
||||
EOF
|
||||
|
||||
+ define(:forbidden_inline_options, Object, %w[template], <<~EOF) do |val|
|
||||
+ Defines the options that may not be set using the {::options} extension
|
||||
+
|
||||
+ Default: template
|
||||
+ Used by: HTML converter
|
||||
+ EOF
|
||||
+ val.map! {|item| item.kind_of?(String) ? str_to_sym(item) : item }
|
||||
+ simple_array_validator(val, :forbidden_inline_options)
|
||||
+ end
|
||||
+
|
||||
end
|
||||
|
||||
end
|
||||
diff --git a/lib/kramdown/parser/kramdown/extensions.rb b/lib/kramdown/parser/kramdown/extensions.rb
|
||||
index 493dcf7..637d0fa 100644
|
||||
--- a/lib/kramdown/parser/kramdown/extensions.rb
|
||||
+++ b/lib/kramdown/parser/kramdown/extensions.rb
|
||||
@@ -110,6 +110,12 @@ module Kramdown
|
||||
opts.select do |k, v|
|
||||
k = k.to_sym
|
||||
if Kramdown::Options.defined?(k)
|
||||
+ if @options[:forbidden_inline_options].include?(k) ||
|
||||
+ k == :forbidden_inline_options
|
||||
+ warning("Option #{k} may not be set inline")
|
||||
+ next false
|
||||
+ end
|
||||
+
|
||||
begin
|
||||
val = Kramdown::Options.parse(k, v)
|
||||
@options[k] = val
|
||||
diff --git a/test/testcases/block/12_extension/options.text b/test/testcases/block/12_extension/options.text
|
||||
index 5991ab7..b63f34b 100644
|
||||
--- a/test/testcases/block/12_extension/options.text
|
||||
+++ b/test/testcases/block/12_extension/options.text
|
||||
@@ -19,3 +19,5 @@ some <span>*para*</span>
|
||||
Some text[^ab].
|
||||
|
||||
[^ab]: Some text.
|
||||
+
|
||||
+{::options template="/etc/passwd" /}
|
||||
--
|
||||
2.26.2
|
||||
|
||||
240
rubygem-kramdown.spec
Normal file
240
rubygem-kramdown.spec
Normal file
@ -0,0 +1,240 @@
|
||||
# Generated from kramdown-1.2.0.gem by gem2rpm -*- rpm-spec -*-
|
||||
%global gem_name kramdown
|
||||
|
||||
Name: rubygem-%{gem_name}
|
||||
Version: 2.2.1
|
||||
Release: 6%{?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://bugzilla.redhat.com/show_bug.cgi?id=1858395
|
||||
# https://github.com/gettalong/kramdown/commit/1b8fd33c3120bfc6e5164b449e2c2fc9c9306fde
|
||||
# CVE-2020-14001
|
||||
Patch1: rubygem-kramdown-2.2.1-0001-Add-option-forbidden_inline_options.patch
|
||||
BuildRequires: ruby(release)
|
||||
BuildRequires: rubygems-devel
|
||||
BuildRequires: rubygem(minitest) >= 5
|
||||
BuildRequires: rubygem(rouge)
|
||||
BuildRequires: rubygem(test-unit)
|
||||
BuildRequires: rubygem(stringex)
|
||||
# Recommends: rubygem(stringex)
|
||||
# Some additional dependency for check
|
||||
BuildRequires: tidy
|
||||
BuildRequires: tex
|
||||
BuildRequires: tex(acronym.sty)
|
||||
BuildRequires: tex(amssymb.sty)
|
||||
BuildRequires: tex(amsmath.sty)
|
||||
BuildRequires: tex(amsthm.sty)
|
||||
BuildRequires: tex(amsfonts.sty)
|
||||
BuildRequires: tex(utf8x.def)
|
||||
BuildRequires: tex-ec
|
||||
Requires: ruby(release)
|
||||
Requires: ruby(rubygems)
|
||||
BuildArch: noarch
|
||||
|
||||
Provides: rubygem(%{gem_name}) = %{version}-%{release}
|
||||
|
||||
%description
|
||||
kramdown is yet-another-markdown-parser but fast, pure Ruby,
|
||||
using a strict syntax definition and supporting several common extensions.
|
||||
|
||||
%package doc
|
||||
Summary: Documentation for %{name}
|
||||
Requires: %{name} = %{version}-%{release}
|
||||
BuildArch: noarch
|
||||
|
||||
%description doc
|
||||
Documentation for %{name}
|
||||
|
||||
%prep
|
||||
gem unpack %{SOURCE0}
|
||||
%setup -q -D -T -n %{gem_name}-%{version}
|
||||
%patch1 -p1
|
||||
gem spec %{SOURCE0} -l --ruby > %{gem_name}.gemspec
|
||||
# 2.2.1 explicily adds rexml runtime dependency, which is actually provided by system ruby.
|
||||
# So writing it to kramdown gemspec is not strictly needed, removing for now
|
||||
# (bug 1838185)
|
||||
sed -i %{gem_name}.gemspec -e '\@rexml@d'
|
||||
|
||||
%build
|
||||
gem build %{gem_name}.gemspec
|
||||
%gem_install
|
||||
|
||||
%install
|
||||
mkdir -p %{buildroot}%{gem_dir}
|
||||
cp -pa .%{gem_dir}/* \
|
||||
%{buildroot}%{gem_dir}/
|
||||
|
||||
mkdir -p %{buildroot}%{_bindir}
|
||||
cp -pa .%{_bindir}/* \
|
||||
%{buildroot}%{_bindir}/
|
||||
|
||||
find %{buildroot}%{gem_instdir}/bin -type f | xargs chmod a+x
|
||||
|
||||
# Move man pages
|
||||
mkdir -p %{buildroot}%{_mandir}/man1
|
||||
mv %{buildroot}%{gem_instdir}/man/man1/kramdown.1 \
|
||||
%{buildroot}%{_mandir}/man1
|
||||
|
||||
# Cleanup
|
||||
pushd %{buildroot}%{gem_instdir}
|
||||
rm -rf \
|
||||
test/
|
||||
|
||||
%check
|
||||
LANG=C.UTF-8
|
||||
|
||||
pushd .%{gem_instdir}
|
||||
|
||||
# Test suite is now failing, need investigating
|
||||
ruby -Ilib -e 'Dir.glob "./test/test_*.rb", &method(:require)' \
|
||||
|| echo "Needs investigating"
|
||||
popd
|
||||
|
||||
%files
|
||||
%dir %{gem_instdir}
|
||||
%license %{gem_instdir}/COPYING
|
||||
%doc %{gem_instdir}/AUTHORS
|
||||
%doc %{gem_instdir}/CONTRIBUTERS
|
||||
%doc %{gem_instdir}/README.md
|
||||
%doc %{gem_instdir}/VERSION
|
||||
|
||||
%{_bindir}/kramdown
|
||||
%{gem_instdir}/bin
|
||||
%{_mandir}/man1/kramdown.1*
|
||||
|
||||
%{gem_libdir}/
|
||||
%{gem_instdir}/data/
|
||||
|
||||
%exclude %{gem_cache}
|
||||
%{gem_spec}
|
||||
|
||||
%files doc
|
||||
%doc %{gem_docdir}
|
||||
|
||||
%changelog
|
||||
* Fri Oct 2 2020 Mamoru TASAKA <mtasaka@fedoraproject.org> - 2.2.1-6
|
||||
- Test suite now failing, rescuing now
|
||||
|
||||
* Tue Aug 10 2020 Mamoru TASAKA <mtasaka@fedoraproject.org> - 2.2.1-5
|
||||
- Release bump
|
||||
|
||||
* Mon Aug 10 2020 Mamoru TASAKA <mtasaka@fedoraproject.org> - 2.2.1-4
|
||||
- Backport upstream patch for CVE-2020-14001 (bug 1858395)
|
||||
|
||||
* Wed Jul 29 2020 Fedora Release Engineering <releng@fedoraproject.org> - 2.2.1-3
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
|
||||
|
||||
* Thu May 21 2020 Mamoru TASAKA <mtasaka@fedoraproject.org> - 2.2.1-2
|
||||
- Remove explicit rexml runtime dependency (bug 1838185)
|
||||
|
||||
* Fri May 8 2020 Mamoru TASAKA <mtasaka@fedoraproject.org> - 2.2.1-1
|
||||
- 2.2.1
|
||||
|
||||
* Thu Jan 30 2020 Fedora Release Engineering <releng@fedoraproject.org> - 2.1.0-2
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild
|
||||
|
||||
* Wed Sep 11 2019 Mamoru TASAKA <mtasaka@fedoraproject.org> - 2.1.0-1
|
||||
- Update to 2.1.0
|
||||
|
||||
* Wed Sep 11 2019 Mamoru TASAKA <mtasaka@fedoraproject.org> - 1.17.0-6
|
||||
- Enable more tests
|
||||
|
||||
* Fri Jul 26 2019 Fedora Release Engineering <releng@fedoraproject.org> - 1.17.0-5
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
|
||||
|
||||
* Sat Feb 02 2019 Fedora Release Engineering <releng@fedoraproject.org> - 1.17.0-4
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
|
||||
|
||||
* Sun Nov 18 2018 Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl> - 1.17.0-3
|
||||
- Use C.UTF-8 locale
|
||||
See https://fedoraproject.org/wiki/Changes/Remove_glibc-langpacks-all_from_buildroot
|
||||
|
||||
* Sat Jul 14 2018 Fedora Release Engineering <releng@fedoraproject.org> - 1.17.0-2
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild
|
||||
|
||||
* Mon Jun 4 2018 Mamoru TASAKA <mtasaka@fedoraproject.org> - 1.17.0-1
|
||||
- 1.17.0
|
||||
|
||||
* Fri Feb 09 2018 Fedora Release Engineering <releng@fedoraproject.org> - 1.16.2-2
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild
|
||||
|
||||
* Sun Dec 31 2017 Mamoru TASAKA <mtasaka@fedoraproject.org> - 1.16.2-1
|
||||
- 1.16.2
|
||||
|
||||
* Thu Sep 14 2017 Mamoru TASAKA <mtasaka@fedoraproject.org> - 1.15.0-1
|
||||
- 1.15.0
|
||||
|
||||
* Thu Jul 27 2017 Fedora Release Engineering <releng@fedoraproject.org> - 1.14.0-2
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild
|
||||
|
||||
* Thu Jun 29 2017 Mamoru TASAKA <mtasaka@fedoraproject.org> - 1.14.0-1
|
||||
- 1.14.0
|
||||
|
||||
* Sat Feb 11 2017 Fedora Release Engineering <releng@fedoraproject.org> - 1.13.2-2
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild
|
||||
|
||||
* Mon Jan 16 2017 Mamoru TASAKA <mtasaka@fedoraproject.org> - 1.13.2-1
|
||||
- 1.13.2
|
||||
|
||||
* Sat Dec 31 2016 Mamoru TASAKA <mtasaka@fedoraproject.org> - 1.13.1-1
|
||||
- 1.13.1
|
||||
|
||||
* Wed Aug 17 2016 Mamoru TASAKA <mtasaka@fedoraproject.org> - 1.12.0-1
|
||||
- 1.12.0
|
||||
|
||||
* Thu May 5 2016 Mamoru TASAKA <mtasaka@fedoraproject.org> - 1.11.1-1
|
||||
- 1.11.1
|
||||
|
||||
* Sun Mar 6 2016 Mamoru TASAKA <mtasaka@fedoraproject.org> - 1.10.0-1
|
||||
- 1.10.0
|
||||
|
||||
* Thu Feb 04 2016 Fedora Release Engineering <releng@fedoraproject.org> - 1.9.0-2
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild
|
||||
|
||||
* Sun Oct 4 2015 Mamoru TASAKA <mtasaka@fedoraproject.org> - 1.9.0-1
|
||||
- 1.9.0
|
||||
|
||||
* Mon Jul 6 2015 Mamoru TASAKA <mtasaka@fedoraproject.org> - 1.8.0-1
|
||||
- 1.8.0
|
||||
|
||||
* Thu Jun 18 2015 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.7.0-2
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild
|
||||
|
||||
* Wed Apr 29 2015 Mamoru TASAKA <mtasaka@fedoraproject.org> - 1.7.0-1
|
||||
- 1.7.0
|
||||
|
||||
* Sun Mar 1 2015 Mamoru TASAKA <mtasaka@fedoraproject.org> - 1.6.0-1
|
||||
- 1.6.0
|
||||
|
||||
* Fri Nov 7 2014 Mamoru TASAKA <mtasaka@fedoraproject.org> - 1.5.0-1
|
||||
- 1.5.0
|
||||
|
||||
* Mon Sep 22 2014 Mamoru TASAKA <mtasaka@fedoraproject.org> - 1.4.2-1
|
||||
- 1.4.2
|
||||
|
||||
* Wed Aug 13 2014 Mamoru TASAKA <mtasaka@fedoraproject.org> - 1.4.1-1
|
||||
- 1.4.1
|
||||
|
||||
* Fri Jun 27 2014 Mamoru TASAKA <mtasaka@fedoraproject.org> - 1.4.0-1
|
||||
- 1.4.0
|
||||
|
||||
* Sun Jun 08 2014 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.3.3-2
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild
|
||||
|
||||
* Wed Mar 19 2014 Mamoru TASAKA <mtasaka@fedoraproject.org> - 1.3.3-1
|
||||
- 1.3.3
|
||||
|
||||
* Sat Feb 22 2014 Mamoru TASAKA <mtasaka@fedoraproject.org> - 1.3.2-1
|
||||
- 1.3.2
|
||||
|
||||
* Thu Jan 09 2014 Mamoru TASAKA <mtasaka@fedoraproject.org> - 1.3.1-1
|
||||
- 1.3.1
|
||||
|
||||
* Thu Dec 12 2013 Mamoru TASAKA <mtasaka@fedoraproject.org> - 1.3.0-1
|
||||
- 1.3.0
|
||||
|
||||
* Fri Nov 15 2013 Mamoru TASAKA <mtasaka@fedoraproject.org> - 1.2.0-1
|
||||
- Initial package
|
||||
Loading…
Reference in New Issue
Block a user