ruby-2.4.6-15

git-svn-id: http://trac.vinelinux.org/repos/projects/specs@12099 ec354946-7b23-47d6-9f5a-488ba84defc7

r/ruby/ruby-vl.spec

@@ -1,6 +1,6 @@
 %global major_version 2
 %global minor_version 4
-%global teeny_version 1
+%global teeny_version 6
 
 %global major_minor_version %{major_version}.%{minor_version}
 
@@ -41,9 +41,9 @@
 
 %global rake_version 12.0.0
 %global rdoc_version 5.0.0
-%global bigdecimal_version 1.3.0
+%global bigdecimal_version 1.3.2
 %global io_console_version 0.4.6
-%global json_version 2.0.2
+%global json_version 2.0.4
 %global minitest_version 5.10.1
 %global psych_version 2.2.2
 %global power_assert_version 0.4.1
@@ -56,7 +56,7 @@
 # is updated - because it may be that the versions of sub-components don't
 # change.
 # rubyのmainバージョンが更新されても1には戻さずに必ず+1してください。
-%global ruby_rel 14
+%global ruby_rel 15
 
 %bcond_without emacsen
 %define rbmode          ruby-mode
@@ -85,26 +85,47 @@ Source8: %{rbmode_el}-init.el
 Source10: Changelog.fedora
 
 ### Patch[0-99] from fedora package
+# Fix ruby_version abuse.
+# https://bugs.ruby-lang.org/issues/11002
+Patch0: ruby-2.3.0-ruby_version.patch
 # http://bugs.ruby-lang.org/issues/7807
-Patch0: ruby-2.1.0-Prevent-duplicated-paths-when-empty-version-string-i.patch
+Patch1: ruby-2.1.0-Prevent-duplicated-paths-when-empty-version-string-i.patch
 # Allows to override libruby.so placement. Hopefully we will be able to return
 # to plain --with-rubyarchprefix.
 # http://bugs.ruby-lang.org/issues/8973
-Patch1: ruby-2.1.0-Enable-configuration-of-archlibdir.patch
+Patch2: ruby-2.1.0-Enable-configuration-of-archlibdir.patch
 # Force multiarch directories for i.86 to be always named i386. This solves
 # some differencies in build between Fedora and RHEL.
 Patch3: ruby-2.1.0-always-use-i386.patch
 # Allows to install RubyGems into custom directory, outside of Ruby's tree.
-# http://redmine.ruby-lang.org/issues/5617
+# http://bugs.ruby-lang.org/issues/5617
-Patch8: ruby-2.1.0-custom-rubygems-location.patch
+Patch4: ruby-2.1.0-custom-rubygems-location.patch
 # Make mkmf verbose by default
-Patch12: ruby-1.9.3-mkmf-verbose.patch
+Patch5: ruby-1.9.3-mkmf-verbose.patch
 # Adds support for '--with-prelude' configuration option. This allows to built
 # in support for ABRT.
 # http://bugs.ruby-lang.org/issues/8566
-Patch17: ruby-2.1.0-Allow-to-specify-additional-preludes-by-configuratio.patch
+Patch6: ruby-2.1.0-Allow-to-specify-additional-preludes-by-configuratio.patch
-
+# Use miniruby to regenerate prelude.c.
-
+# https://bugs.ruby-lang.org/issues/10554
+Patch7: ruby-2.2.3-Generate-preludes-using-miniruby.patch
+# Workaround "an invalid stdio handle" error on PPC, due to recently introduced
+# hardening features of glibc (rhbz#1361037).
+# https://bugs.ruby-lang.org/issues/12666
+Patch9: ruby-2.3.1-Rely-on-ldd-to-detect-glibc.patch
+# Fix: Command injection in lib/resolv.rb:lazy_initialize()
+# https://bugzilla.redhat.com/show_bug.cgi?id=1528226
+# https://github.com/ruby/ruby/commit/e7464561b5151501beb356fc750d5dd1a88014f7
+Patch10: ruby-2.4.3-Fix-Command-injection-in-lib-resolv-lazy_initialize.patch
+# Fix ruby-test_io.rb#test_select_leak
+# https://bugs.ruby-lang.org/issues/14929
+Patch11: ruby-2.5.2-ruby-test_io-test_select_leak.patch
+
+
+# for OpenSSL-1.1.1
+Patch100: openssl111-1.patch
+Patch101: openssl111-2.patch
+Patch102: openssl111-3.patch
 
 Requires: %{name}-libs = %{version}-%{release}
 Requires: ruby(rubygems) >= %{rubygems_version}
@@ -123,6 +144,7 @@ BuildRequires: autoconf
 BuildRequires: gdbm-devel
 BuildRequires: ncurses-devel
 BuildRequires: libdb-devel
+BuildRequires: libxcrypt-devel
 BuildRequires: libffi-devel
 BuildRequires: openssl-devel
 BuildRequires: libyaml-devel
@@ -471,10 +493,19 @@ Emacs上でRubyスクリプトを書くのに便利なモードです．
 
 %patch0 -p1
 %patch1 -p1
+%patch2 -p1
 %patch3 -p1
-%patch8 -p1
+%patch4 -p1
-%patch12 -p1
+%patch5 -p1
-%patch17 -p1
+%patch6 -p1
+%patch7 -p1
+%patch9 -p1
+%patch10 -p1
+%patch11 -p1
+
+%patch100 -p1
+%patch101 -p1
+%patch102 -p1
 
 cp -a %{SOURCE3} .
 
@@ -726,7 +757,7 @@ fi
 %doc GPL
 %doc LEGAL
 %doc README.md
-%lang(ja) %doc README.ja
+%lang(ja) %doc README.ja.md
 %doc NEWS
 %doc doc/NEWS-*
 %{ruby_sitelibdir}
@@ -813,6 +844,7 @@ fi
 %dir %{ruby_libarchdir}/%{ruby_release}/enc/trans
 %{ruby_libarchdir}/%{ruby_release}/enc/trans/big5.so
 %{ruby_libarchdir}/%{ruby_release}/enc/trans/chinese.so
+%{ruby_libarchdir}/%{ruby_release}/enc/trans/ebcdic.so
 %{ruby_libarchdir}/%{ruby_release}/enc/trans/emoji.so
 %{ruby_libarchdir}/%{ruby_release}/enc/trans/emoji_iso2022_kddi.so
 %{ruby_libarchdir}/%{ruby_release}/enc/trans/emoji_sjis_docomo.so
@@ -914,8 +946,8 @@ fi
 %{_mandir}/man1/ri*
 
 %files doc
-%doc README
+%doc README.md
-%lang(ja) %doc README.ja
+%lang(ja) %doc README.ja.md
 %doc ChangeLog
 %doc doc/ChangeLog-*
 %{_datadir}/ri
@@ -941,7 +973,6 @@ fi
 %{gem_extdir}/%{ruby_release}/exts/json-%{json_version}
 %{gem_dir}/%{ruby_release}/gems/json-%{json_version}
 %{gem_dir}/%{ruby_release}/specifications/json-%{json_version}.gemspec
-%{ruby_libarchdir}/%{ruby_release}/json
 
 %files -n rubygem-minitest
 #%{ruby_libdir}/%{ruby_release}/minitest
@@ -979,6 +1010,12 @@ fi
 %endif
 
 %changelog
+* Tue May 14 2019 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 2.4.6-15
+- updated to 2.4.6.
+- added BR:libxcrypt-devel.
+- imported all patches from fc27.
+- imported openssl-1.1.1 patches from upstream.
+
 * Mon Apr 03 2017 Daisuke SUZUKI <daisuke@vinelinux.org> 2.4.1-14
 - update to 2.4.1