From 085361caaf16c71e42336b3e1e0ce879f3ba0a11 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?V=C3=ADt=20Ondruch?= Date: Wed, 12 Apr 2017 17:41:56 +0200 Subject: [PATCH 01/23] Upgrade to Ruby 2.5.0 (r58319). --- ruby-1.9.3-mkmf-verbose.patch | 2 +- ...-additional-preludes-by-configuratio.patch | 4 +- ...0-Enable-configuration-of-archlibdir.patch | 2 +- ...ed-paths-when-empty-version-string-i.patch | 2 +- ruby-2.1.0-always-use-i386.patch | 2 +- ruby-2.1.0-custom-rubygems-location.patch | 11 +++-- ...2.3-Generate-preludes-using-miniruby.patch | 2 +- ruby-2.3.0-ruby_version.patch | 10 ++--- ruby-2.3.1-Rely-on-ldd-to-detect-glibc.patch | 5 +-- ruby.spec | 41 ++++++++++++++----- 10 files changed, 49 insertions(+), 32 deletions(-) diff --git a/ruby-1.9.3-mkmf-verbose.patch b/ruby-1.9.3-mkmf-verbose.patch index d94ef7f..b523657 100644 --- a/ruby-1.9.3-mkmf-verbose.patch +++ b/ruby-1.9.3-mkmf-verbose.patch @@ -11,7 +11,7 @@ diff --git a/lib/mkmf.rb b/lib/mkmf.rb index 682eb46..e6b1445 100644 --- a/lib/mkmf.rb +++ b/lib/mkmf.rb -@@ -1897,7 +1897,7 @@ def configuration(srcdir) +@@ -1900,7 +1900,7 @@ def configuration(srcdir) SHELL = /bin/sh # V=0 quiet, V=1 verbose. other values don't work. diff --git a/ruby-2.1.0-Allow-to-specify-additional-preludes-by-configuratio.patch b/ruby-2.1.0-Allow-to-specify-additional-preludes-by-configuratio.patch index af8b9a9..eaf1943 100644 --- a/ruby-2.1.0-Allow-to-specify-additional-preludes-by-configuratio.patch +++ b/ruby-2.1.0-Allow-to-specify-additional-preludes-by-configuratio.patch @@ -26,7 +26,7 @@ diff --git a/common.mk b/common.mk index 5cfbc3d..3f0a82e 100644 --- a/common.mk +++ b/common.mk -@@ -144,7 +144,7 @@ ALLOBJS = $(NORMALMAINOBJ) $(MINIOBJS) $(COMMONOBJS) $(INITOBJS) +@@ -148,7 +148,7 @@ ALLOBJS = $(NORMALMAINOBJ) $(MINIOBJS) $(COMMONOBJS) $(INITOBJS) GOLFOBJS = goruby.$(OBJEXT) golf_prelude.$(OBJEXT) DEFAULT_PRELUDES = $(GEM_PRELUDE) @@ -39,7 +39,7 @@ diff --git a/configure.in b/configure.in index 0e371e2..d4f1dcb 100644 --- a/configure.in +++ b/configure.in -@@ -4536,6 +4536,13 @@ AC_SUBST(rubyarchhdrdir)dnl +@@ -4595,6 +4595,13 @@ AC_SUBST(rubyarchhdrdir)dnl AC_SUBST(sitearchhdrdir)dnl AC_SUBST(vendorarchhdrdir)dnl diff --git a/ruby-2.1.0-Enable-configuration-of-archlibdir.patch b/ruby-2.1.0-Enable-configuration-of-archlibdir.patch index a4e6c28..fc0ffc0 100644 --- a/ruby-2.1.0-Enable-configuration-of-archlibdir.patch +++ b/ruby-2.1.0-Enable-configuration-of-archlibdir.patch @@ -11,7 +11,7 @@ diff --git a/configure.in b/configure.in index 37d9a62..553d4d0 100644 --- a/configure.in +++ b/configure.in -@@ -3790,6 +3790,11 @@ if test ${multiarch+set}; then +@@ -3845,6 +3845,11 @@ if test ${multiarch+set}; then fi archlibdir='${libdir}/${arch}' diff --git a/ruby-2.1.0-Prevent-duplicated-paths-when-empty-version-string-i.patch b/ruby-2.1.0-Prevent-duplicated-paths-when-empty-version-string-i.patch index e841569..fdd5d76 100644 --- a/ruby-2.1.0-Prevent-duplicated-paths-when-empty-version-string-i.patch +++ b/ruby-2.1.0-Prevent-duplicated-paths-when-empty-version-string-i.patch @@ -14,7 +14,7 @@ diff --git a/configure.in b/configure.in index db37cd6..ce8d149 100644 --- a/configure.in +++ b/configure.in -@@ -4390,7 +4390,8 @@ AS_CASE(["$ruby_version_dir_name"], +@@ -4449,7 +4449,8 @@ AS_CASE(["$ruby_version_dir_name"], ruby_version_dir=/'${ruby_version_dir_name}' if test -z "${ruby_version_dir_name}"; then diff --git a/ruby-2.1.0-always-use-i386.patch b/ruby-2.1.0-always-use-i386.patch index ba358f3..f7f75db 100644 --- a/ruby-2.1.0-always-use-i386.patch +++ b/ruby-2.1.0-always-use-i386.patch @@ -11,7 +11,7 @@ diff --git a/configure.in b/configure.in index 553d4d0..03a4152 100644 --- a/configure.in +++ b/configure.in -@@ -4454,6 +4454,8 @@ AC_SUBST(vendorarchdir)dnl +@@ -4513,6 +4513,8 @@ AC_SUBST(vendorarchdir)dnl AC_SUBST(CONFIGURE, "`echo $0 | sed 's|.*/||'`")dnl AC_SUBST(configure_args, "`echo "${ac_configure_args}" | sed 's/\\$/$$/g'`")dnl diff --git a/ruby-2.1.0-custom-rubygems-location.patch b/ruby-2.1.0-custom-rubygems-location.patch index 44fe4a7..14ef508 100644 --- a/ruby-2.1.0-custom-rubygems-location.patch +++ b/ruby-2.1.0-custom-rubygems-location.patch @@ -8,14 +8,14 @@ Subject: [PATCH] Allow to install RubyGems into custom location, outside of configure.in | 5 +++++ loadpath.c | 4 ++++ template/verconf.h.tmpl | 3 +++ - tool/rbinstall.rb | 9 +++++++++ - 4 files changed, 21 insertions(+) + tool/rbinstall.rb | 8 ++++++++ + 4 files changed, 20 insertions(+) diff --git a/configure.in b/configure.in index 03a4152..0e371e2 100644 --- a/configure.in +++ b/configure.in -@@ -4426,6 +4426,10 @@ AC_ARG_WITH(vendorarchdir, +@@ -4485,6 +4485,10 @@ AC_ARG_WITH(vendorarchdir, [vendorarchdir=$withval], [vendorarchdir=${multiarch+'${rubysitearchprefix}/vendor_ruby'${ruby_version_dir}}${multiarch-'${vendorlibdir}/${sitearch}'}]) @@ -26,7 +26,7 @@ index 03a4152..0e371e2 100644 if test "${LOAD_RELATIVE+set}"; then AC_DEFINE_UNQUOTED(LOAD_RELATIVE, $LOAD_RELATIVE) RUBY_EXEC_PREFIX='' -@@ -4450,6 +4454,7 @@ AC_SUBST(sitearchdir)dnl +@@ -4509,6 +4513,7 @@ AC_SUBST(sitearchdir)dnl AC_SUBST(vendordir)dnl AC_SUBST(vendorlibdir)dnl AC_SUBST(vendorarchdir)dnl @@ -75,7 +75,7 @@ index b47b6e1..0b99408 100755 mandir = CONFIG["mandir", true] docdir = CONFIG["docdir", true] configure_args = Shellwords.shellwords(CONFIG["configure_args"]) -@@ -517,7 +518,15 @@ def CONFIG.[](name, mandatory = false) +@@ -531,7 +532,14 @@ def install(src, cmd) install?(:local, :comm, :lib) do prepare "library scripts", rubylibdir noinst = %w[README* *.txt *.rdoc *.gemspec] @@ -84,7 +84,6 @@ index b47b6e1..0b99408 100755 + if rubygemsdir + noinst = %w[obsolete.rb] + install_recursive(File.join(srcdir, "lib", "rubygems"), File.join(rubygemsdir, "rubygems"), :mode => $data_mode) -+ install_recursive(File.join(srcdir, "lib", "rbconfig"), File.join(rubygemsdir, "rbconfig"), :no_install => noinst, :mode => $data_mode) + install(File.join(srcdir, "lib", "ubygems.rb"), File.join(rubygemsdir, "ubygems.rb"), :mode => $data_mode) + install(File.join(srcdir, "lib", "rubygems.rb"), File.join(rubygemsdir, "rubygems.rb"), :mode => $data_mode) + end diff --git a/ruby-2.2.3-Generate-preludes-using-miniruby.patch b/ruby-2.2.3-Generate-preludes-using-miniruby.patch index 6e8adc4..2cac856 100644 --- a/ruby-2.2.3-Generate-preludes-using-miniruby.patch +++ b/ruby-2.2.3-Generate-preludes-using-miniruby.patch @@ -11,7 +11,7 @@ diff --git a/common.mk b/common.mk index 168dc52..20c218a 100644 --- a/common.mk +++ b/common.mk -@@ -873,9 +873,9 @@ $(MINIPRELUDE_C): $(COMPILE_PRELUDE) +@@ -930,9 +930,9 @@ $(MINIPRELUDE_C): $(COMPILE_PRELUDE) $(srcdir)/template/prelude.c.tmpl $(PRELUDE_C): $(COMPILE_PRELUDE) \ diff --git a/ruby-2.3.0-ruby_version.patch b/ruby-2.3.0-ruby_version.patch index b4d6f76..f3bda28 100644 --- a/ruby-2.3.0-ruby_version.patch +++ b/ruby-2.3.0-ruby_version.patch @@ -20,7 +20,7 @@ diff --git a/configure.in b/configure.in index db37cd6..6e73fae 100644 --- a/configure.in +++ b/configure.in -@@ -4341,9 +4341,6 @@ AS_CASE(["$target_os"], +@@ -4400,9 +4400,6 @@ AS_CASE(["$target_os"], rubyw_install_name='$(RUBYW_INSTALL_NAME)' ]) @@ -30,7 +30,7 @@ index db37cd6..6e73fae 100644 rubyarchprefix=${multiarch+'${archlibdir}/${RUBY_BASE_NAME}'}${multiarch-'${rubylibprefix}/${arch}'} AC_ARG_WITH(rubyarchprefix, AS_HELP_STRING([--with-rubyarchprefix=DIR], -@@ -4366,56 +4363,62 @@ AC_ARG_WITH(ridir, +@@ -4425,56 +4422,62 @@ AC_ARG_WITH(ridir, AC_SUBST(ridir) AC_SUBST(RI_BASE_NAME) @@ -120,7 +120,7 @@ index db37cd6..6e73fae 100644 if test "${LOAD_RELATIVE+set}"; then AC_DEFINE_UNQUOTED(LOAD_RELATIVE, $LOAD_RELATIVE) -@@ -4432,6 +4435,7 @@ AC_SUBST(sitearchincludedir)dnl +@@ -4491,6 +4494,7 @@ AC_SUBST(sitearchincludedir)dnl AC_SUBST(arch)dnl AC_SUBST(sitearch)dnl AC_SUBST(ruby_version)dnl @@ -171,7 +171,7 @@ diff --git a/tool/rbinstall.rb b/tool/rbinstall.rb index d4c110e..d39c9a6 100755 --- a/tool/rbinstall.rb +++ b/tool/rbinstall.rb -@@ -417,7 +417,7 @@ def CONFIG.[](name, mandatory = false) +@@ -416,7 +416,7 @@ def CONFIG.[](name, mandatory = false) install?(:doc, :rdoc) do if $rdocdir @@ -282,7 +282,7 @@ diff --git a/configure.in b/configure.in index 6e73fae..c842725 100644 --- a/configure.in +++ b/configure.in -@@ -271,7 +271,7 @@ RUBY_BASE_NAME=`echo ruby | sed "$program_transform_name"` +@@ -285,7 +285,7 @@ RUBY_BASE_NAME=`echo ruby | sed "$program_transform_name"` RUBYW_BASE_NAME=`echo rubyw | sed "$program_transform_name"` AC_SUBST(RUBY_BASE_NAME) AC_SUBST(RUBYW_BASE_NAME) diff --git a/ruby-2.3.1-Rely-on-ldd-to-detect-glibc.patch b/ruby-2.3.1-Rely-on-ldd-to-detect-glibc.patch index 8765d2a..2dc17e3 100644 --- a/ruby-2.3.1-Rely-on-ldd-to-detect-glibc.patch +++ b/ruby-2.3.1-Rely-on-ldd-to-detect-glibc.patch @@ -15,7 +15,7 @@ diff --git a/test/fiddle/helper.rb b/test/fiddle/helper.rb index 1da3d93..65148a1 100644 --- a/test/fiddle/helper.rb +++ b/test/fiddle/helper.rb -@@ -6,98 +6,6 @@ +@@ -6,95 +6,6 @@ libc_so = libm_so = nil @@ -23,9 +23,6 @@ index 1da3d93..65148a1 100644 -when /cygwin/ - libc_so = "cygwin1.dll" - libm_so = "cygwin1.dll" --when /x86_64-linux/ -- libc_so = "/lib64/libc.so.6" -- libm_so = "/lib64/libm.so.6" -when /linux/ - libdir = '/lib' - case [0].pack('L!').size diff --git a/ruby.spec b/ruby.spec index 82d5781..a0c3cc7 100644 --- a/ruby.spec +++ b/ruby.spec @@ -1,6 +1,6 @@ %global major_version 2 -%global minor_version 4 -%global teeny_version 1 +%global minor_version 5 +%global teeny_version 0 %global major_minor_version %{major_version}.%{minor_version} %global ruby_version %{major_minor_version}.%{teeny_version} @@ -10,7 +10,7 @@ #%%global milestone rc1 # Keep the revision enabled for pre-releases from SVN. -#%%global revision 57159 +%global revision 58319 %global ruby_archive %{name}-%{ruby_version} @@ -21,7 +21,7 @@ %endif -%global release 79 +%global release 1 %{!?release_string:%global release_string %{?development_release:0.}%{release}%{?development_release:.%{development_release}}%{?dist}} # The RubyGems library has to stay out of Ruby directory three, since the @@ -36,17 +36,17 @@ # http://redmine.ruby-lang.org/issues/5313 %global irb_version %{ruby_version} -%global bigdecimal_version 1.3.0 +%global bigdecimal_version 1.3.2 %global did_you_mean_version 1.1.0 %global io_console_version 0.4.6 %global json_version 2.0.2 %global minitest_version 5.10.1 %global net_telnet_version 0.1.1 %global openssl_version 2.0.3 -%global power_assert_version 0.4.1 -%global psych_version 2.2.2 +%global power_assert_version 1.0.1 +%global psych_version 3.0.0.beta1 %global rake_version 12.0.0 -%global rdoc_version 5.0.0 +%global rdoc_version 5.1.0 %global test_unit_version 3.2.3 %global xmlrpc_version 0.2.1 @@ -775,7 +775,6 @@ make check TESTS="-v $DISABLE_TESTS" %{ruby_libdir}/net %{ruby_libdir}/optparse %{ruby_libdir}/racc -%{ruby_libdir}/rbconfig %{ruby_libdir}/rexml %{ruby_libdir}/rinda %{ruby_libdir}/ripper @@ -898,7 +897,6 @@ make check TESTS="-v $DISABLE_TESTS" %files -n rubygems %{_bindir}/gem %dir %{rubygems_dir} -%{rubygems_dir}/rbconfig %{rubygems_dir}/rubygems %{rubygems_dir}/rubygems.rb %{rubygems_dir}/ubygems.rb @@ -918,6 +916,24 @@ make check TESTS="-v $DISABLE_TESTS" %exclude %{gem_dir}/cache/* +# TODO: Gemify these libraries +%{gem_dir}/specifications/default/cmath-0.0.1.gemspec +%{gem_dir}/specifications/default/csv-0.0.1.gemspec +%{gem_dir}/specifications/default/date-0.0.1.gemspec +%{gem_dir}/specifications/default/dbm-0.5.1.gemspec +%{gem_dir}/specifications/default/etc-0.2.1.gemspec +%{gem_dir}/specifications/default/fcntl-0.0.1.gemspec +%{gem_dir}/specifications/default/fiddle-1.0.0.beta1.gemspec +%{gem_dir}/specifications/default/fileutils-0.0.1.gemspec +%{gem_dir}/specifications/default/gdbm-0.0.1.gemspec +%{gem_dir}/specifications/default/mathn-0.0.1.gemspec +%{gem_dir}/specifications/default/scanf-0.0.1.gemspec +%{gem_dir}/specifications/default/sdbm-0.0.1.gemspec +%{gem_dir}/specifications/default/stringio-0.0.1.gemspec +%{gem_dir}/specifications/default/strscan-0.0.1.gemspec +%{gem_dir}/specifications/default/webrick-0.0.1.gemspec +%{gem_dir}/specifications/default/zlib-0.0.1.gemspec + %files -n rubygems-devel %{_rpmconfigdir}/macros.d/macros.rubygems %{_rpmconfigdir}/fileattrs/rubygems.attr @@ -1013,14 +1029,19 @@ make check TESTS="-v $DISABLE_TESTS" %files -n rubygem-xmlrpc %license %{gem_dir}/gems/xmlrpc-%{xmlrpc_version}/LICENSE.txt %dir %{gem_dir}/gems/xmlrpc-%{xmlrpc_version} +%exclude %{gem_dir}/gems/xmlrpc-%{xmlrpc_version}/.* %{gem_dir}/gems/xmlrpc-%{xmlrpc_version}/Gemfile %{gem_dir}/gems/xmlrpc-%{xmlrpc_version}/Rakefile %doc %{gem_dir}/gems/xmlrpc-%{xmlrpc_version}/README.md %{gem_dir}/gems/xmlrpc-%{xmlrpc_version}/bin %{gem_dir}/gems/xmlrpc-%{xmlrpc_version}/lib +%{gem_dir}/gems/xmlrpc-%{xmlrpc_version}/xmlrpc.gemspec %{gem_dir}/specifications/xmlrpc-%{xmlrpc_version}.gemspec %changelog +* Tue Apr 11 2017 Vít Ondruch - 2.5.0-0.1.r58319 +- Upgrade to Ruby 2.5.0 (r58319). + * Mon Apr 03 2017 Vít Ondruch - 2.4.1-79 - Update to Ruby 2.4.1. From b4d36d99431d8c46ae340466d3da056825de8f0b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?V=C3=ADt=20Ondruch?= Date: Thu, 20 Jul 2017 16:08:49 +0200 Subject: [PATCH 02/23] Upgrade to Ruby 2.5.0 (r59376). --- ...-additional-preludes-by-configuratio.patch | 10 ++--- ...0-Enable-configuration-of-archlibdir.patch | 4 +- ...ed-paths-when-empty-version-string-i.patch | 4 +- ruby-2.1.0-always-use-i386.patch | 6 +-- ruby-2.1.0-custom-rubygems-location.patch | 4 +- ...2.3-Generate-preludes-using-miniruby.patch | 2 +- ruby-2.3.0-ruby_version.patch | 20 +++++----- ruby.spec | 39 ++++++++++--------- 8 files changed, 45 insertions(+), 44 deletions(-) diff --git a/ruby-2.1.0-Allow-to-specify-additional-preludes-by-configuratio.patch b/ruby-2.1.0-Allow-to-specify-additional-preludes-by-configuratio.patch index eaf1943..717a54b 100644 --- a/ruby-2.1.0-Allow-to-specify-additional-preludes-by-configuratio.patch +++ b/ruby-2.1.0-Allow-to-specify-additional-preludes-by-configuratio.patch @@ -13,7 +13,7 @@ diff --git a/Makefile.in b/Makefile.in index 7e8ed82..7916993 100644 --- a/Makefile.in +++ b/Makefile.in -@@ -116,6 +116,8 @@ XRUBY_RUBYLIBDIR = @XRUBY_RUBYLIBDIR@ +@@ -118,6 +118,8 @@ XRUBY_RUBYLIBDIR = @XRUBY_RUBYLIBDIR@ XRUBY_RUBYHDRDIR = @XRUBY_RUBYHDRDIR@ BOOTSTRAPRUBY = @BOOTSTRAPRUBY@ @@ -26,12 +26,12 @@ diff --git a/common.mk b/common.mk index 5cfbc3d..3f0a82e 100644 --- a/common.mk +++ b/common.mk -@@ -148,7 +148,7 @@ ALLOBJS = $(NORMALMAINOBJ) $(MINIOBJS) $(COMMONOBJS) $(INITOBJS) +@@ -149,7 +149,7 @@ ALLOBJS = $(NORMALMAINOBJ) $(MINIOBJS) $(COMMONOBJS) $(INITOBJS) GOLFOBJS = goruby.$(OBJEXT) golf_prelude.$(OBJEXT) DEFAULT_PRELUDES = $(GEM_PRELUDE) --PRELUDE_SCRIPTS = $(srcdir)/prelude.rb $(srcdir)/enc/prelude.rb $(DEFAULT_PRELUDES) -+PRELUDE_SCRIPTS = $(srcdir)/prelude.rb $(srcdir)/enc/prelude.rb $(DEFAULT_PRELUDES) $(OPTIONAL_PRELUDES) +-PRELUDE_SCRIPTS = $(srcdir)/prelude.rb $(DEFAULT_PRELUDES) ++PRELUDE_SCRIPTS = $(srcdir)/prelude.rb $(DEFAULT_PRELUDES) $(OPTIONAL_PRELUDES) GEM_PRELUDE = $(srcdir)/gem_prelude.rb PRELUDES = {$(srcdir)}prelude.c {$(srcdir)}miniprelude.c GOLFPRELUDES = {$(srcdir)}golf_prelude.c @@ -39,7 +39,7 @@ diff --git a/configure.in b/configure.in index 0e371e2..d4f1dcb 100644 --- a/configure.in +++ b/configure.in -@@ -4595,6 +4595,13 @@ AC_SUBST(rubyarchhdrdir)dnl +@@ -4572,6 +4572,13 @@ AC_SUBST(rubyarchhdrdir)dnl AC_SUBST(sitearchhdrdir)dnl AC_SUBST(vendorarchhdrdir)dnl diff --git a/ruby-2.1.0-Enable-configuration-of-archlibdir.patch b/ruby-2.1.0-Enable-configuration-of-archlibdir.patch index fc0ffc0..48e0fe3 100644 --- a/ruby-2.1.0-Enable-configuration-of-archlibdir.patch +++ b/ruby-2.1.0-Enable-configuration-of-archlibdir.patch @@ -11,8 +11,8 @@ diff --git a/configure.in b/configure.in index 37d9a62..553d4d0 100644 --- a/configure.in +++ b/configure.in -@@ -3845,6 +3845,11 @@ if test ${multiarch+set}; then - fi +@@ -3814,6 +3814,11 @@ AS_IF([test ${multiarch+set}], [ + ]) archlibdir='${libdir}/${arch}' +AC_ARG_WITH(archlibdir, diff --git a/ruby-2.1.0-Prevent-duplicated-paths-when-empty-version-string-i.patch b/ruby-2.1.0-Prevent-duplicated-paths-when-empty-version-string-i.patch index fdd5d76..13947df 100644 --- a/ruby-2.1.0-Prevent-duplicated-paths-when-empty-version-string-i.patch +++ b/ruby-2.1.0-Prevent-duplicated-paths-when-empty-version-string-i.patch @@ -14,7 +14,7 @@ diff --git a/configure.in b/configure.in index db37cd6..ce8d149 100644 --- a/configure.in +++ b/configure.in -@@ -4449,7 +4449,8 @@ AS_CASE(["$ruby_version_dir_name"], +@@ -4426,7 +4426,8 @@ AS_CASE(["$ruby_version_dir_name"], ruby_version_dir=/'${ruby_version_dir_name}' if test -z "${ruby_version_dir_name}"; then @@ -67,7 +67,7 @@ diff --git a/tool/mkconfig.rb b/tool/mkconfig.rb index 07076d4..35e6c3c 100755 --- a/tool/mkconfig.rb +++ b/tool/mkconfig.rb -@@ -113,7 +113,7 @@ +@@ -111,7 +111,7 @@ val = val.gsub(/\$(?:\$|\{?(\w+)\}?)/) {$1 ? "$(#{$1})" : $&}.dump case name when /^prefix$/ diff --git a/ruby-2.1.0-always-use-i386.patch b/ruby-2.1.0-always-use-i386.patch index f7f75db..97bf391 100644 --- a/ruby-2.1.0-always-use-i386.patch +++ b/ruby-2.1.0-always-use-i386.patch @@ -11,15 +11,15 @@ diff --git a/configure.in b/configure.in index 553d4d0..03a4152 100644 --- a/configure.in +++ b/configure.in -@@ -4513,6 +4513,8 @@ AC_SUBST(vendorarchdir)dnl +@@ -4490,6 +4490,8 @@ AC_SUBST(vendorarchdir)dnl AC_SUBST(CONFIGURE, "`echo $0 | sed 's|.*/||'`")dnl AC_SUBST(configure_args, "`echo "${ac_configure_args}" | sed 's/\\$/$$/g'`")dnl +target_cpu=`echo $target_cpu | sed s/i.86/i386/` + - if test "${universal_binary-no}" = yes ; then + AS_IF([test "${universal_binary-no}" = yes ], [ arch="universal-${target_os}" - if test "${rb_cv_architecture_available}" = yes; then + AS_IF([test "${rb_cv_architecture_available}" = yes], [ -- 1.8.3.1 diff --git a/ruby-2.1.0-custom-rubygems-location.patch b/ruby-2.1.0-custom-rubygems-location.patch index 14ef508..29b783a 100644 --- a/ruby-2.1.0-custom-rubygems-location.patch +++ b/ruby-2.1.0-custom-rubygems-location.patch @@ -15,7 +15,7 @@ diff --git a/configure.in b/configure.in index 03a4152..0e371e2 100644 --- a/configure.in +++ b/configure.in -@@ -4485,6 +4485,10 @@ AC_ARG_WITH(vendorarchdir, +@@ -4462,6 +4462,10 @@ AC_ARG_WITH(vendorarchdir, [vendorarchdir=$withval], [vendorarchdir=${multiarch+'${rubysitearchprefix}/vendor_ruby'${ruby_version_dir}}${multiarch-'${vendorlibdir}/${sitearch}'}]) @@ -23,7 +23,7 @@ index 03a4152..0e371e2 100644 + AS_HELP_STRING([--with-rubygemsdir=DIR], [custom rubygems directory]), + [rubygemsdir=$withval]) + - if test "${LOAD_RELATIVE+set}"; then + AS_IF([test "${LOAD_RELATIVE+set}"], [ AC_DEFINE_UNQUOTED(LOAD_RELATIVE, $LOAD_RELATIVE) RUBY_EXEC_PREFIX='' @@ -4509,6 +4513,7 @@ AC_SUBST(sitearchdir)dnl diff --git a/ruby-2.2.3-Generate-preludes-using-miniruby.patch b/ruby-2.2.3-Generate-preludes-using-miniruby.patch index 2cac856..1e2e9d0 100644 --- a/ruby-2.2.3-Generate-preludes-using-miniruby.patch +++ b/ruby-2.2.3-Generate-preludes-using-miniruby.patch @@ -11,7 +11,7 @@ diff --git a/common.mk b/common.mk index 168dc52..20c218a 100644 --- a/common.mk +++ b/common.mk -@@ -930,9 +930,9 @@ $(MINIPRELUDE_C): $(COMPILE_PRELUDE) +@@ -939,9 +939,9 @@ $(MINIPRELUDE_C): $(COMPILE_PRELUDE) $(srcdir)/template/prelude.c.tmpl $(PRELUDE_C): $(COMPILE_PRELUDE) \ diff --git a/ruby-2.3.0-ruby_version.patch b/ruby-2.3.0-ruby_version.patch index f3bda28..5d2b198 100644 --- a/ruby-2.3.0-ruby_version.patch +++ b/ruby-2.3.0-ruby_version.patch @@ -20,7 +20,7 @@ diff --git a/configure.in b/configure.in index db37cd6..6e73fae 100644 --- a/configure.in +++ b/configure.in -@@ -4400,9 +4400,6 @@ AS_CASE(["$target_os"], +@@ -4377,9 +4377,6 @@ AS_CASE(["$target_os"], rubyw_install_name='$(RUBYW_INSTALL_NAME)' ]) @@ -30,7 +30,7 @@ index db37cd6..6e73fae 100644 rubyarchprefix=${multiarch+'${archlibdir}/${RUBY_BASE_NAME}'}${multiarch-'${rubylibprefix}/${arch}'} AC_ARG_WITH(rubyarchprefix, AS_HELP_STRING([--with-rubyarchprefix=DIR], -@@ -4425,56 +4422,62 @@ AC_ARG_WITH(ridir, +@@ -4402,56 +4399,62 @@ AC_ARG_WITH(ridir, AC_SUBST(ridir) AC_SUBST(RI_BASE_NAME) @@ -43,7 +43,7 @@ index db37cd6..6e73fae 100644 -AS_CASE(["$ruby_version"], - [full], [RUBY_LIB_VERSION_STYLE='3 /* full */'], - [minor], [RUBY_LIB_VERSION_STYLE='2 /* minor */']) --if test ${RUBY_LIB_VERSION_STYLE+set}; then +-AS_IF([test ${RUBY_LIB_VERSION_STYLE+set}], [ - { - echo "#define RUBY_LIB_VERSION_STYLE $RUBY_LIB_VERSION_STYLE" - echo '#define STRINGIZE(x) x' @@ -53,11 +53,11 @@ index db37cd6..6e73fae 100644 - } > conftest.c - ruby_version="`$CPP -I. -I"${srcdir}" -I"${srcdir}/include" conftest.c | sed '/^ruby_version=/!d;s/ //g'`" - eval $ruby_version --elif test -z "${ruby_version}"; then +-], [test -z "${ruby_version}"], [ - AC_MSG_ERROR([No ruby version, No place for bundled libraries]) --else +-], [ - RUBY_LIB_VERSION="${ruby_version}" --fi +-]) +RUBY_LIB_VERSION_STYLE='3 /* full */' +{ +echo "#define RUBY_LIB_VERSION_STYLE $RUBY_LIB_VERSION_STYLE" @@ -118,7 +118,7 @@ index db37cd6..6e73fae 100644 - [vendorarchdir=${multiarch+'${rubysitearchprefix}/vendor_ruby/${ruby_version}'}${multiarch-'${vendorlibdir}/${sitearch}'}]) + [vendorarchdir=${multiarch+'${rubysitearchprefix}/vendor_ruby'${ruby_version_dir}}${multiarch-'${vendorlibdir}/${sitearch}'}]) - if test "${LOAD_RELATIVE+set}"; then + AS_IF([test "${LOAD_RELATIVE+set}"], [ AC_DEFINE_UNQUOTED(LOAD_RELATIVE, $LOAD_RELATIVE) @@ -4491,6 +4494,7 @@ AC_SUBST(sitearchincludedir)dnl AC_SUBST(arch)dnl @@ -245,7 +245,7 @@ diff --git a/test/rubygems/test_gem.rb b/test/rubygems/test_gem.rb index 0428bea..b6e090e 100644 --- a/test/rubygems/test_gem.rb +++ b/test/rubygems/test_gem.rb -@@ -1101,7 +1101,8 @@ def test_self_use_paths +@@ -1124,7 +1124,8 @@ def test_self_use_paths def test_self_user_dir parts = [@userhome, '.gem', Gem.ruby_engine] @@ -255,7 +255,7 @@ index 0428bea..b6e090e 100644 assert_equal File.join(parts), Gem.user_dir end -@@ -1228,7 +1229,7 @@ def test_self_user_home_user_drive_and_path +@@ -1251,7 +1252,7 @@ def test_self_user_home_user_drive_and_path def test_self_vendor_dir expected = File.join RbConfig::CONFIG['vendordir'], 'gems', @@ -282,7 +282,7 @@ diff --git a/configure.in b/configure.in index 6e73fae..c842725 100644 --- a/configure.in +++ b/configure.in -@@ -285,7 +285,7 @@ RUBY_BASE_NAME=`echo ruby | sed "$program_transform_name"` +@@ -283,7 +283,7 @@ RUBY_BASE_NAME=`echo ruby | sed "$program_transform_name"` RUBYW_BASE_NAME=`echo rubyw | sed "$program_transform_name"` AC_SUBST(RUBY_BASE_NAME) AC_SUBST(RUBYW_BASE_NAME) diff --git a/ruby.spec b/ruby.spec index a0c3cc7..af1f5db 100644 --- a/ruby.spec +++ b/ruby.spec @@ -10,7 +10,7 @@ #%%global milestone rc1 # Keep the revision enabled for pre-releases from SVN. -%global revision 58319 +%global revision 59376 %global ruby_archive %{name}-%{ruby_version} @@ -29,7 +29,7 @@ %global rubygems_dir %{_datadir}/rubygems # Bundled libraries versions -%global rubygems_version 2.6.11 +%global rubygems_version 2.6.12 %global molinillo_version 0.5.7 # TODO: The IRB has strange versioning. Keep the Ruby's versioning ATM. @@ -37,18 +37,18 @@ %global irb_version %{ruby_version} %global bigdecimal_version 1.3.2 -%global did_you_mean_version 1.1.0 +%global did_you_mean_version 1.1.2 %global io_console_version 0.4.6 -%global json_version 2.0.2 -%global minitest_version 5.10.1 +%global json_version 2.1.0 +%global minitest_version 5.10.2 %global net_telnet_version 0.1.1 -%global openssl_version 2.0.3 -%global power_assert_version 1.0.1 -%global psych_version 3.0.0.beta1 +%global openssl_version 2.0.4 +%global power_assert_version 1.0.2 +%global psych_version 3.0.0.beta3 %global rake_version 12.0.0 %global rdoc_version 5.1.0 -%global test_unit_version 3.2.3 -%global xmlrpc_version 0.2.1 +%global test_unit_version 3.2.4 +%global xmlrpc_version 0.3.0 # Might not be needed in the future, if we are lucky enough. # https://bugzilla.redhat.com/show_bug.cgi?id=888262 @@ -128,6 +128,10 @@ Patch7: ruby-2.2.3-Generate-preludes-using-miniruby.patch # 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 OpenSSL::TestSSL#test_sslctx_set_params failures due to recent changes in +# OpenSSL. +# https://github.com/ruby/openssl/issues/127 +Patch10: ruby-2.5.0-allow-3DES-cipher-suites-in-test_sslctx_set_params.patch Requires: %{name}-libs%{?_isa} = %{version}-%{release} Suggests: rubypick @@ -507,6 +511,7 @@ rm -rf ext/fiddle/libffi* %patch6 -p1 %patch7 -p1 %patch9 -p1 +%patch10 -p1 # Provide an example of usage of the tapset: cp -a %{SOURCE3} . @@ -871,9 +876,6 @@ make check TESTS="-v $DISABLE_TESTS" %dir %{ruby_libarchdir}/io %{ruby_libarchdir}/io/nonblock.so %{ruby_libarchdir}/io/wait.so -%dir %{ruby_libarchdir}/mathn -%{ruby_libarchdir}/mathn/complex.so -%{ruby_libarchdir}/mathn/rational.so %{ruby_libarchdir}/nkf.so %{ruby_libarchdir}/objspace.so %{ruby_libarchdir}/pathname.so @@ -924,14 +926,13 @@ make check TESTS="-v $DISABLE_TESTS" %{gem_dir}/specifications/default/etc-0.2.1.gemspec %{gem_dir}/specifications/default/fcntl-0.0.1.gemspec %{gem_dir}/specifications/default/fiddle-1.0.0.beta1.gemspec -%{gem_dir}/specifications/default/fileutils-0.0.1.gemspec -%{gem_dir}/specifications/default/gdbm-0.0.1.gemspec -%{gem_dir}/specifications/default/mathn-0.0.1.gemspec +%{gem_dir}/specifications/default/fileutils-0.7.2.gemspec +%{gem_dir}/specifications/default/gdbm-2.0.0.beta1.gemspec %{gem_dir}/specifications/default/scanf-0.0.1.gemspec %{gem_dir}/specifications/default/sdbm-0.0.1.gemspec %{gem_dir}/specifications/default/stringio-0.0.1.gemspec %{gem_dir}/specifications/default/strscan-0.0.1.gemspec -%{gem_dir}/specifications/default/webrick-0.0.1.gemspec +%{gem_dir}/specifications/default/webrick-1.4.0.beta1.gemspec %{gem_dir}/specifications/default/zlib-0.0.1.gemspec %files -n rubygems-devel @@ -1039,8 +1040,8 @@ make check TESTS="-v $DISABLE_TESTS" %{gem_dir}/specifications/xmlrpc-%{xmlrpc_version}.gemspec %changelog -* Tue Apr 11 2017 Vít Ondruch - 2.5.0-0.1.r58319 -- Upgrade to Ruby 2.5.0 (r58319). +* Tue Apr 11 2017 Vít Ondruch - 2.5.0-0.1.r59376 +- Upgrade to Ruby 2.5.0 (r59376). * Mon Apr 03 2017 Vít Ondruch - 2.4.1-79 - Update to Ruby 2.4.1. From 80cccfaaea68ed265acb557c3ef4d980c5a4b463 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?V=C3=ADt=20Ondruch?= Date: Wed, 26 Jul 2017 12:53:50 +0200 Subject: [PATCH 03/23] Upgrade to Ruby 2.5.0 (r59424). --- ...-additional-preludes-by-configuratio.patch | 2 +- ruby-2.1.0-custom-rubygems-location.patch | 2 +- ...2.3-Generate-preludes-using-miniruby.patch | 2 +- ruby-2.3.0-ruby_version.patch | 2 +- ...her-suites-in-test_sslctx_set_params.patch | 26 +++++++++++++++++++ ruby.spec | 6 ++--- 6 files changed, 33 insertions(+), 7 deletions(-) create mode 100644 ruby-2.5.0-allow-3DES-cipher-suites-in-test_sslctx_set_params.patch diff --git a/ruby-2.1.0-Allow-to-specify-additional-preludes-by-configuratio.patch b/ruby-2.1.0-Allow-to-specify-additional-preludes-by-configuratio.patch index 717a54b..e2e427c 100644 --- a/ruby-2.1.0-Allow-to-specify-additional-preludes-by-configuratio.patch +++ b/ruby-2.1.0-Allow-to-specify-additional-preludes-by-configuratio.patch @@ -26,7 +26,7 @@ diff --git a/common.mk b/common.mk index 5cfbc3d..3f0a82e 100644 --- a/common.mk +++ b/common.mk -@@ -149,7 +149,7 @@ ALLOBJS = $(NORMALMAINOBJ) $(MINIOBJS) $(COMMONOBJS) $(INITOBJS) +@@ -145,7 +145,7 @@ ALLOBJS = $(NORMALMAINOBJ) $(MINIOBJS) $(COMMONOBJS) $(INITOBJS) GOLFOBJS = goruby.$(OBJEXT) golf_prelude.$(OBJEXT) DEFAULT_PRELUDES = $(GEM_PRELUDE) diff --git a/ruby-2.1.0-custom-rubygems-location.patch b/ruby-2.1.0-custom-rubygems-location.patch index 29b783a..2e779de 100644 --- a/ruby-2.1.0-custom-rubygems-location.patch +++ b/ruby-2.1.0-custom-rubygems-location.patch @@ -26,7 +26,7 @@ index 03a4152..0e371e2 100644 AS_IF([test "${LOAD_RELATIVE+set}"], [ AC_DEFINE_UNQUOTED(LOAD_RELATIVE, $LOAD_RELATIVE) RUBY_EXEC_PREFIX='' -@@ -4509,6 +4513,7 @@ AC_SUBST(sitearchdir)dnl +@@ -4486,6 +4490,7 @@ AC_SUBST(sitearchdir)dnl AC_SUBST(vendordir)dnl AC_SUBST(vendorlibdir)dnl AC_SUBST(vendorarchdir)dnl diff --git a/ruby-2.2.3-Generate-preludes-using-miniruby.patch b/ruby-2.2.3-Generate-preludes-using-miniruby.patch index 1e2e9d0..9546060 100644 --- a/ruby-2.2.3-Generate-preludes-using-miniruby.patch +++ b/ruby-2.2.3-Generate-preludes-using-miniruby.patch @@ -11,7 +11,7 @@ diff --git a/common.mk b/common.mk index 168dc52..20c218a 100644 --- a/common.mk +++ b/common.mk -@@ -939,9 +939,9 @@ $(MINIPRELUDE_C): $(COMPILE_PRELUDE) +@@ -935,9 +935,9 @@ $(MINIPRELUDE_C): $(COMPILE_PRELUDE) $(srcdir)/template/prelude.c.tmpl $(PRELUDE_C): $(COMPILE_PRELUDE) \ diff --git a/ruby-2.3.0-ruby_version.patch b/ruby-2.3.0-ruby_version.patch index 5d2b198..95f4056 100644 --- a/ruby-2.3.0-ruby_version.patch +++ b/ruby-2.3.0-ruby_version.patch @@ -120,7 +120,7 @@ index db37cd6..6e73fae 100644 AS_IF([test "${LOAD_RELATIVE+set}"], [ AC_DEFINE_UNQUOTED(LOAD_RELATIVE, $LOAD_RELATIVE) -@@ -4491,6 +4494,7 @@ AC_SUBST(sitearchincludedir)dnl +@@ -4468,6 +4471,7 @@ AC_SUBST(sitearchincludedir)dnl AC_SUBST(arch)dnl AC_SUBST(sitearch)dnl AC_SUBST(ruby_version)dnl diff --git a/ruby-2.5.0-allow-3DES-cipher-suites-in-test_sslctx_set_params.patch b/ruby-2.5.0-allow-3DES-cipher-suites-in-test_sslctx_set_params.patch new file mode 100644 index 0000000..9c3e375 --- /dev/null +++ b/ruby-2.5.0-allow-3DES-cipher-suites-in-test_sslctx_set_params.patch @@ -0,0 +1,26 @@ +From 261353a42d0dc0e7bf73e5a8fb8ecffd04249d42 Mon Sep 17 00:00:00 2001 +From: Kazuki Yamaguchi +Date: Tue, 27 Jun 2017 14:31:09 +0900 +Subject: [PATCH] test/test_ssl: allow 3DES cipher suites in + test_sslctx_set_params + +Fedora's OpenSSL seems to enable 3DES cipher suites by DEFAULT. + +Fixes: https://github.com/ruby/openssl/issues/127 +--- + test/test_ssl.rb | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/test/openssl/test_ssl.rb b/test/openssl/test_ssl.rb +index 19066566..b3efe95a 100644 +--- a/test/openssl/test_ssl.rb ++++ b/test/openssl/test_ssl.rb +@@ -350,7 +350,7 @@ def test_sslctx_set_params + assert_equal OpenSSL::SSL::VERIFY_PEER, ctx.verify_mode + ciphers_names = ctx.ciphers.collect{|v, _, _, _| v } + assert ciphers_names.all?{|v| /A(EC)?DH/ !~ v }, "anon ciphers are disabled" +- assert ciphers_names.all?{|v| /(RC4|MD5|EXP|DES)/ !~ v }, "weak ciphers are disabled" ++ assert ciphers_names.all?{|v| /(RC4|MD5|EXP|DES(?!-EDE|-CBC3))/ !~ v }, "weak ciphers are disabled" + assert_equal 0, ctx.options & OpenSSL::SSL::OP_DONT_INSERT_EMPTY_FRAGMENTS + if defined?(OpenSSL::SSL::OP_NO_COMPRESSION) # >= 1.0.0 + assert_equal OpenSSL::SSL::OP_NO_COMPRESSION, diff --git a/ruby.spec b/ruby.spec index af1f5db..3ad93ae 100644 --- a/ruby.spec +++ b/ruby.spec @@ -10,7 +10,7 @@ #%%global milestone rc1 # Keep the revision enabled for pre-releases from SVN. -%global revision 59376 +%global revision 59424 %global ruby_archive %{name}-%{ruby_version} @@ -1040,8 +1040,8 @@ make check TESTS="-v $DISABLE_TESTS" %{gem_dir}/specifications/xmlrpc-%{xmlrpc_version}.gemspec %changelog -* Tue Apr 11 2017 Vít Ondruch - 2.5.0-0.1.r59376 -- Upgrade to Ruby 2.5.0 (r59376). +* Tue Apr 11 2017 Vít Ondruch - 2.5.0-0.1.r59424 +- Upgrade to Ruby 2.5.0 (r59424). * Mon Apr 03 2017 Vít Ondruch - 2.4.1-79 - Update to Ruby 2.4.1. From 2a184c72721a66e6839f905318ea80092ce09736 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?V=C3=ADt=20Ondruch?= Date: Tue, 22 Aug 2017 14:18:58 +0200 Subject: [PATCH 04/23] Upgrade to Ruby 2.5.0 (r59643). --- ...-additional-preludes-by-configuratio.patch | 2 +- ...0-Enable-configuration-of-archlibdir.patch | 2 +- ...ed-paths-when-empty-version-string-i.patch | 7 +++-- ruby-2.1.0-always-use-i386.patch | 2 +- ruby-2.1.0-custom-rubygems-location.patch | 4 +-- ruby-2.3.0-ruby_version.patch | 6 ++--- ...her-suites-in-test_sslctx_set_params.patch | 26 ------------------- ruby.spec | 17 +++++------- 8 files changed, 18 insertions(+), 48 deletions(-) delete mode 100644 ruby-2.5.0-allow-3DES-cipher-suites-in-test_sslctx_set_params.patch diff --git a/ruby-2.1.0-Allow-to-specify-additional-preludes-by-configuratio.patch b/ruby-2.1.0-Allow-to-specify-additional-preludes-by-configuratio.patch index e2e427c..f183029 100644 --- a/ruby-2.1.0-Allow-to-specify-additional-preludes-by-configuratio.patch +++ b/ruby-2.1.0-Allow-to-specify-additional-preludes-by-configuratio.patch @@ -39,7 +39,7 @@ diff --git a/configure.in b/configure.in index 0e371e2..d4f1dcb 100644 --- a/configure.in +++ b/configure.in -@@ -4572,6 +4572,13 @@ AC_SUBST(rubyarchhdrdir)dnl +@@ -4579,6 +4579,13 @@ AC_SUBST(rubyarchhdrdir)dnl AC_SUBST(sitearchhdrdir)dnl AC_SUBST(vendorarchhdrdir)dnl diff --git a/ruby-2.1.0-Enable-configuration-of-archlibdir.patch b/ruby-2.1.0-Enable-configuration-of-archlibdir.patch index 48e0fe3..6acd525 100644 --- a/ruby-2.1.0-Enable-configuration-of-archlibdir.patch +++ b/ruby-2.1.0-Enable-configuration-of-archlibdir.patch @@ -11,7 +11,7 @@ diff --git a/configure.in b/configure.in index 37d9a62..553d4d0 100644 --- a/configure.in +++ b/configure.in -@@ -3814,6 +3814,11 @@ AS_IF([test ${multiarch+set}], [ +@@ -3821,6 +3821,11 @@ AS_IF([test ${multiarch+set}], [ ]) archlibdir='${libdir}/${arch}' diff --git a/ruby-2.1.0-Prevent-duplicated-paths-when-empty-version-string-i.patch b/ruby-2.1.0-Prevent-duplicated-paths-when-empty-version-string-i.patch index 13947df..73dad98 100644 --- a/ruby-2.1.0-Prevent-duplicated-paths-when-empty-version-string-i.patch +++ b/ruby-2.1.0-Prevent-duplicated-paths-when-empty-version-string-i.patch @@ -14,7 +14,7 @@ diff --git a/configure.in b/configure.in index db37cd6..ce8d149 100644 --- a/configure.in +++ b/configure.in -@@ -4426,7 +4426,8 @@ AS_CASE(["$ruby_version_dir_name"], +@@ -4433,7 +4433,8 @@ AS_CASE(["$ruby_version_dir_name"], ruby_version_dir=/'${ruby_version_dir_name}' if test -z "${ruby_version_dir_name}"; then @@ -28,7 +28,7 @@ diff --git a/loadpath.c b/loadpath.c index 9160031..0d4d953 100644 --- a/loadpath.c +++ b/loadpath.c -@@ -65,22 +65,34 @@ const char ruby_initial_load_paths[] = +@@ -65,21 +65,33 @@ const char ruby_initial_load_paths[] = RUBY_SEARCH_PATH "\0" #endif #ifndef NO_RUBY_SITE_LIB @@ -58,11 +58,10 @@ index 9160031..0d4d953 100644 RUBY_VENDOR_ARCH_LIB_FOR(RUBY_SITEARCH) "\0" +#ifndef RUBY_LIB_VERSION_BLANK RUBY_VENDOR_LIB "\0" - #endif +#endif + #endif RUBY_LIB "\0" - #ifdef RUBY_THINARCH diff --git a/tool/mkconfig.rb b/tool/mkconfig.rb index 07076d4..35e6c3c 100755 --- a/tool/mkconfig.rb diff --git a/ruby-2.1.0-always-use-i386.patch b/ruby-2.1.0-always-use-i386.patch index 97bf391..b3bbce9 100644 --- a/ruby-2.1.0-always-use-i386.patch +++ b/ruby-2.1.0-always-use-i386.patch @@ -11,7 +11,7 @@ diff --git a/configure.in b/configure.in index 553d4d0..03a4152 100644 --- a/configure.in +++ b/configure.in -@@ -4490,6 +4490,8 @@ AC_SUBST(vendorarchdir)dnl +@@ -4497,6 +4497,8 @@ AC_SUBST(vendorarchdir)dnl AC_SUBST(CONFIGURE, "`echo $0 | sed 's|.*/||'`")dnl AC_SUBST(configure_args, "`echo "${ac_configure_args}" | sed 's/\\$/$$/g'`")dnl diff --git a/ruby-2.1.0-custom-rubygems-location.patch b/ruby-2.1.0-custom-rubygems-location.patch index 2e779de..6a9b384 100644 --- a/ruby-2.1.0-custom-rubygems-location.patch +++ b/ruby-2.1.0-custom-rubygems-location.patch @@ -15,7 +15,7 @@ diff --git a/configure.in b/configure.in index 03a4152..0e371e2 100644 --- a/configure.in +++ b/configure.in -@@ -4462,6 +4462,10 @@ AC_ARG_WITH(vendorarchdir, +@@ -4469,6 +4469,10 @@ AC_ARG_WITH(vendorarchdir, [vendorarchdir=$withval], [vendorarchdir=${multiarch+'${rubysitearchprefix}/vendor_ruby'${ruby_version_dir}}${multiarch-'${vendorlibdir}/${sitearch}'}]) @@ -26,7 +26,7 @@ index 03a4152..0e371e2 100644 AS_IF([test "${LOAD_RELATIVE+set}"], [ AC_DEFINE_UNQUOTED(LOAD_RELATIVE, $LOAD_RELATIVE) RUBY_EXEC_PREFIX='' -@@ -4486,6 +4490,7 @@ AC_SUBST(sitearchdir)dnl +@@ -4493,6 +4497,7 @@ AC_SUBST(sitearchdir)dnl AC_SUBST(vendordir)dnl AC_SUBST(vendorlibdir)dnl AC_SUBST(vendorarchdir)dnl diff --git a/ruby-2.3.0-ruby_version.patch b/ruby-2.3.0-ruby_version.patch index 95f4056..903803f 100644 --- a/ruby-2.3.0-ruby_version.patch +++ b/ruby-2.3.0-ruby_version.patch @@ -20,7 +20,7 @@ diff --git a/configure.in b/configure.in index db37cd6..6e73fae 100644 --- a/configure.in +++ b/configure.in -@@ -4377,9 +4377,6 @@ AS_CASE(["$target_os"], +@@ -4384,9 +4384,6 @@ AS_CASE(["$target_os"], rubyw_install_name='$(RUBYW_INSTALL_NAME)' ]) @@ -30,7 +30,7 @@ index db37cd6..6e73fae 100644 rubyarchprefix=${multiarch+'${archlibdir}/${RUBY_BASE_NAME}'}${multiarch-'${rubylibprefix}/${arch}'} AC_ARG_WITH(rubyarchprefix, AS_HELP_STRING([--with-rubyarchprefix=DIR], -@@ -4402,56 +4399,62 @@ AC_ARG_WITH(ridir, +@@ -4409,56 +4406,62 @@ AC_ARG_WITH(ridir, AC_SUBST(ridir) AC_SUBST(RI_BASE_NAME) @@ -120,7 +120,7 @@ index db37cd6..6e73fae 100644 AS_IF([test "${LOAD_RELATIVE+set}"], [ AC_DEFINE_UNQUOTED(LOAD_RELATIVE, $LOAD_RELATIVE) -@@ -4468,6 +4471,7 @@ AC_SUBST(sitearchincludedir)dnl +@@ -4475,6 +4478,7 @@ AC_SUBST(sitearchincludedir)dnl AC_SUBST(arch)dnl AC_SUBST(sitearch)dnl AC_SUBST(ruby_version)dnl diff --git a/ruby-2.5.0-allow-3DES-cipher-suites-in-test_sslctx_set_params.patch b/ruby-2.5.0-allow-3DES-cipher-suites-in-test_sslctx_set_params.patch deleted file mode 100644 index 9c3e375..0000000 --- a/ruby-2.5.0-allow-3DES-cipher-suites-in-test_sslctx_set_params.patch +++ /dev/null @@ -1,26 +0,0 @@ -From 261353a42d0dc0e7bf73e5a8fb8ecffd04249d42 Mon Sep 17 00:00:00 2001 -From: Kazuki Yamaguchi -Date: Tue, 27 Jun 2017 14:31:09 +0900 -Subject: [PATCH] test/test_ssl: allow 3DES cipher suites in - test_sslctx_set_params - -Fedora's OpenSSL seems to enable 3DES cipher suites by DEFAULT. - -Fixes: https://github.com/ruby/openssl/issues/127 ---- - test/test_ssl.rb | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/test/openssl/test_ssl.rb b/test/openssl/test_ssl.rb -index 19066566..b3efe95a 100644 ---- a/test/openssl/test_ssl.rb -+++ b/test/openssl/test_ssl.rb -@@ -350,7 +350,7 @@ def test_sslctx_set_params - assert_equal OpenSSL::SSL::VERIFY_PEER, ctx.verify_mode - ciphers_names = ctx.ciphers.collect{|v, _, _, _| v } - assert ciphers_names.all?{|v| /A(EC)?DH/ !~ v }, "anon ciphers are disabled" -- assert ciphers_names.all?{|v| /(RC4|MD5|EXP|DES)/ !~ v }, "weak ciphers are disabled" -+ assert ciphers_names.all?{|v| /(RC4|MD5|EXP|DES(?!-EDE|-CBC3))/ !~ v }, "weak ciphers are disabled" - assert_equal 0, ctx.options & OpenSSL::SSL::OP_DONT_INSERT_EMPTY_FRAGMENTS - if defined?(OpenSSL::SSL::OP_NO_COMPRESSION) # >= 1.0.0 - assert_equal OpenSSL::SSL::OP_NO_COMPRESSION, diff --git a/ruby.spec b/ruby.spec index 3ad93ae..9c23e69 100644 --- a/ruby.spec +++ b/ruby.spec @@ -10,7 +10,7 @@ #%%global milestone rc1 # Keep the revision enabled for pre-releases from SVN. -%global revision 59424 +%global revision 59643 %global ruby_archive %{name}-%{ruby_version} @@ -42,8 +42,8 @@ %global json_version 2.1.0 %global minitest_version 5.10.2 %global net_telnet_version 0.1.1 -%global openssl_version 2.0.4 -%global power_assert_version 1.0.2 +%global openssl_version 2.0.5 +%global power_assert_version 1.1.0 %global psych_version 3.0.0.beta3 %global rake_version 12.0.0 %global rdoc_version 5.1.0 @@ -128,10 +128,6 @@ Patch7: ruby-2.2.3-Generate-preludes-using-miniruby.patch # 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 OpenSSL::TestSSL#test_sslctx_set_params failures due to recent changes in -# OpenSSL. -# https://github.com/ruby/openssl/issues/127 -Patch10: ruby-2.5.0-allow-3DES-cipher-suites-in-test_sslctx_set_params.patch Requires: %{name}-libs%{?_isa} = %{version}-%{release} Suggests: rubypick @@ -511,7 +507,6 @@ rm -rf ext/fiddle/libffi* %patch6 -p1 %patch7 -p1 %patch9 -p1 -%patch10 -p1 # Provide an example of usage of the tapset: cp -a %{SOURCE3} . @@ -923,11 +918,13 @@ make check TESTS="-v $DISABLE_TESTS" %{gem_dir}/specifications/default/csv-0.0.1.gemspec %{gem_dir}/specifications/default/date-0.0.1.gemspec %{gem_dir}/specifications/default/dbm-0.5.1.gemspec +%{gem_dir}/specifications/default/digest-0.1.0.gemspec %{gem_dir}/specifications/default/etc-0.2.1.gemspec %{gem_dir}/specifications/default/fcntl-0.0.1.gemspec %{gem_dir}/specifications/default/fiddle-1.0.0.beta1.gemspec %{gem_dir}/specifications/default/fileutils-0.7.2.gemspec %{gem_dir}/specifications/default/gdbm-2.0.0.beta1.gemspec +%{gem_dir}/specifications/default/ipaddr-1.0.0.gemspec %{gem_dir}/specifications/default/scanf-0.0.1.gemspec %{gem_dir}/specifications/default/sdbm-0.0.1.gemspec %{gem_dir}/specifications/default/stringio-0.0.1.gemspec @@ -1040,8 +1037,8 @@ make check TESTS="-v $DISABLE_TESTS" %{gem_dir}/specifications/xmlrpc-%{xmlrpc_version}.gemspec %changelog -* Tue Apr 11 2017 Vít Ondruch - 2.5.0-0.1.r59424 -- Upgrade to Ruby 2.5.0 (r59424). +* Tue Apr 11 2017 Vít Ondruch - 2.5.0-0.1.r59643 +- Upgrade to Ruby 2.5.0 (r59643). * Mon Apr 03 2017 Vít Ondruch - 2.4.1-79 - Update to Ruby 2.4.1. From 4f1155f21009798039555e083df7e2f4065f1e54 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?V=C3=ADt=20Ondruch?= Date: Fri, 11 Aug 2017 12:42:38 +0200 Subject: [PATCH 05/23] Temporary disable checksec on PPC64LE (rhbz#1479302). --- ruby.spec | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/ruby.spec b/ruby.spec index 9c23e69..6b17bb5 100644 --- a/ruby.spec +++ b/ruby.spec @@ -685,9 +685,17 @@ sed -i 's/^/%doc /' .ruby-doc.* sed -i 's/^/%lang(ja) /' .ruby-doc.ja %check +# Temporary change the hardening check on PPC64LE as long as the checksec is +# is providing incorrect output. +# https://bugzilla.redhat.com/show_bug.cgi?id=1479302 +%ifnarch ppc64le # Check Ruby hardening. checksec -f libruby.so.%{ruby_version} | \ grep "Full RELRO.*Canary found.*NX enabled.*DSO.*No RPATH.*No RUNPATH.*Yes.*\d*.*\d*.*libruby.so.%{ruby_version}" +%else +checksec -f libruby.so.%{ruby_version} | \ + grep "Full RELRO.*Canary found.*NX enabled.*DSO.*No RPATH.*No RUNPATH.*No.*\d*.*\d*.*libruby.so.%{ruby_version}" +%endif # Check RubyGems version correctness. [ "`make runruby TESTRUN_SCRIPT='bin/gem -v' | tail -1`" == '%{rubygems_version}' ] From c00ecc350862873adaa17900f858191c4d071be7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?V=C3=ADt=20Ondruch?= Date: Fri, 25 Aug 2017 16:13:27 +0200 Subject: [PATCH 06/23] Upgrade to Ruby 2.5.0 (r59657). --- ...with-smallest-possible-machine-stack.patch | 32 +++++++++++++++++++ ruby.spec | 12 +++++-- 2 files changed, 41 insertions(+), 3 deletions(-) create mode 100644 ruby-2.5.0-Revert-runruby-test-with-smallest-possible-machine-stack.patch diff --git a/ruby-2.5.0-Revert-runruby-test-with-smallest-possible-machine-stack.patch b/ruby-2.5.0-Revert-runruby-test-with-smallest-possible-machine-stack.patch new file mode 100644 index 0000000..96da001 --- /dev/null +++ b/ruby-2.5.0-Revert-runruby-test-with-smallest-possible-machine-stack.patch @@ -0,0 +1,32 @@ +From 68b8e9b42f1baf67f8ef9535d213fd0bd7ae42f4 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?V=C3=ADt=20Ondruch?= +Date: Fri, 25 Aug 2017 13:21:56 +0200 +Subject: [PATCH] Revert "tool/runruby.rb: test with smallest possible machine + stack" + +This reverts commit c4e2cf466448f4283fd3f8a17a73f5fa9b745fe1. +--- + tool/runruby.rb | 7 +------ + 1 file changed, 1 insertion(+), 6 deletions(-) + +diff --git a/tool/runruby.rb b/tool/runruby.rb +index f6c46779e3..cade314748 100755 +--- a/tool/runruby.rb ++++ b/tool/runruby.rb +@@ -67,12 +67,7 @@ def File.realpath(*args) + libs << File.expand_path("lib", srcdir) + config["bindir"] = abs_archdir + +-env = { +- # Test with the smallest possible machine stack sizes. +- # These values are clamped to machine-dependent minimum values in vm_core.h +- 'RUBY_THREAD_MACHINE_STACK_SIZE' => '1', +- 'RUBY_FIBER_MACHINE_STACK_SIZE' => '1', +-} ++env = {} + + runner = File.join(abs_archdir, "ruby-runner#{config['EXEEXT']}") + runner = nil unless File.exist?(runner) +-- +2.14.1 + diff --git a/ruby.spec b/ruby.spec index 6b17bb5..b29941d 100644 --- a/ruby.spec +++ b/ruby.spec @@ -10,7 +10,7 @@ #%%global milestone rc1 # Keep the revision enabled for pre-releases from SVN. -%global revision 59643 +%global revision 59657 %global ruby_archive %{name}-%{ruby_version} @@ -129,6 +129,10 @@ Patch7: ruby-2.2.3-Generate-preludes-using-miniruby.patch # https://bugs.ruby-lang.org/issues/12666 Patch9: ruby-2.3.1-Rely-on-ldd-to-detect-glibc.patch +# Avoids SEGV in TestBacktrace#test_caller_lev segaults on PPC. +# https://bugs.ruby-lang.org/issues/13757 +Patch100: ruby-2.5.0-Revert-runruby-test-with-smallest-possible-machine-stack.patch + Requires: %{name}-libs%{?_isa} = %{version}-%{release} Suggests: rubypick Recommends: ruby(rubygems) >= %{rubygems_version} @@ -508,6 +512,8 @@ rm -rf ext/fiddle/libffi* %patch7 -p1 %patch9 -p1 +%patch100 -p1 + # Provide an example of usage of the tapset: cp -a %{SOURCE3} . @@ -1045,8 +1051,8 @@ make check TESTS="-v $DISABLE_TESTS" %{gem_dir}/specifications/xmlrpc-%{xmlrpc_version}.gemspec %changelog -* Tue Apr 11 2017 Vít Ondruch - 2.5.0-0.1.r59643 -- Upgrade to Ruby 2.5.0 (r59643). +* Tue Apr 11 2017 Vít Ondruch - 2.5.0-0.1.r59657 +- Upgrade to Ruby 2.5.0 (r59657). * Mon Apr 03 2017 Vít Ondruch - 2.4.1-79 - Update to Ruby 2.4.1. From 4a7bdd72155a6a8cec36d762988ced2476edbdb9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?V=C3=ADt=20Ondruch?= Date: Fri, 8 Sep 2017 14:10:33 +0200 Subject: [PATCH 07/23] Drop ruby-devel dependency on rubypick, which is pulled in transtitively. --- ruby.spec | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/ruby.spec b/ruby.spec index b29941d..7122436 100644 --- a/ruby.spec +++ b/ruby.spec @@ -171,7 +171,8 @@ straight-forward, and extensible. Summary: A Ruby development environment Group: Development/Languages Requires: %{name}%{?_isa} = %{version}-%{release} -Requires: rubypick +# This would not be needed if ~50 packages depending on -devel used +# --disable-gems Requires: rubygems %description devel @@ -1053,6 +1054,7 @@ make check TESTS="-v $DISABLE_TESTS" %changelog * Tue Apr 11 2017 Vít Ondruch - 2.5.0-0.1.r59657 - Upgrade to Ruby 2.5.0 (r59657). +- Drop ruby-devel dependency on rubypick, which is pulled in transtitively. * Mon Apr 03 2017 Vít Ondruch - 2.4.1-79 - Update to Ruby 2.4.1. From 726677aab3b9bfaa4991c5fec54bd5e82da5bc70 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?V=C3=ADt=20Ondruch?= Date: Tue, 3 Oct 2017 14:14:26 +0200 Subject: [PATCH 08/23] Upgrade to Ruby 2.5.0 (r60018). --- ...-additional-preludes-by-configuratio.patch | 2 +- ...0-Enable-configuration-of-archlibdir.patch | 2 +- ...ed-paths-when-empty-version-string-i.patch | 2 +- ruby-2.1.0-always-use-i386.patch | 2 +- ruby-2.1.0-custom-rubygems-location.patch | 9 +++-- ...2.3-Generate-preludes-using-miniruby.patch | 2 +- ruby-2.3.0-ruby_version.patch | 6 ++-- ...with-smallest-possible-machine-stack.patch | 2 +- ruby.spec | 34 +++++++++++-------- 9 files changed, 33 insertions(+), 28 deletions(-) diff --git a/ruby-2.1.0-Allow-to-specify-additional-preludes-by-configuratio.patch b/ruby-2.1.0-Allow-to-specify-additional-preludes-by-configuratio.patch index f183029..d1f3433 100644 --- a/ruby-2.1.0-Allow-to-specify-additional-preludes-by-configuratio.patch +++ b/ruby-2.1.0-Allow-to-specify-additional-preludes-by-configuratio.patch @@ -39,7 +39,7 @@ diff --git a/configure.in b/configure.in index 0e371e2..d4f1dcb 100644 --- a/configure.in +++ b/configure.in -@@ -4579,6 +4579,13 @@ AC_SUBST(rubyarchhdrdir)dnl +@@ -4540,6 +4540,13 @@ AC_SUBST(rubyarchhdrdir)dnl AC_SUBST(sitearchhdrdir)dnl AC_SUBST(vendorarchhdrdir)dnl diff --git a/ruby-2.1.0-Enable-configuration-of-archlibdir.patch b/ruby-2.1.0-Enable-configuration-of-archlibdir.patch index 6acd525..23630cb 100644 --- a/ruby-2.1.0-Enable-configuration-of-archlibdir.patch +++ b/ruby-2.1.0-Enable-configuration-of-archlibdir.patch @@ -11,7 +11,7 @@ diff --git a/configure.in b/configure.in index 37d9a62..553d4d0 100644 --- a/configure.in +++ b/configure.in -@@ -3821,6 +3821,11 @@ AS_IF([test ${multiarch+set}], [ +@@ -3782,6 +3782,11 @@ AS_IF([test ${multiarch+set}], [ ]) archlibdir='${libdir}/${arch}' diff --git a/ruby-2.1.0-Prevent-duplicated-paths-when-empty-version-string-i.patch b/ruby-2.1.0-Prevent-duplicated-paths-when-empty-version-string-i.patch index 73dad98..d9a9419 100644 --- a/ruby-2.1.0-Prevent-duplicated-paths-when-empty-version-string-i.patch +++ b/ruby-2.1.0-Prevent-duplicated-paths-when-empty-version-string-i.patch @@ -14,7 +14,7 @@ diff --git a/configure.in b/configure.in index db37cd6..ce8d149 100644 --- a/configure.in +++ b/configure.in -@@ -4433,7 +4433,8 @@ AS_CASE(["$ruby_version_dir_name"], +@@ -4394,7 +4394,8 @@ AS_CASE(["$ruby_version_dir_name"], ruby_version_dir=/'${ruby_version_dir_name}' if test -z "${ruby_version_dir_name}"; then diff --git a/ruby-2.1.0-always-use-i386.patch b/ruby-2.1.0-always-use-i386.patch index b3bbce9..8be7542 100644 --- a/ruby-2.1.0-always-use-i386.patch +++ b/ruby-2.1.0-always-use-i386.patch @@ -11,7 +11,7 @@ diff --git a/configure.in b/configure.in index 553d4d0..03a4152 100644 --- a/configure.in +++ b/configure.in -@@ -4497,6 +4497,8 @@ AC_SUBST(vendorarchdir)dnl +@@ -4458,6 +4458,8 @@ AC_SUBST(vendorarchdir)dnl AC_SUBST(CONFIGURE, "`echo $0 | sed 's|.*/||'`")dnl AC_SUBST(configure_args, "`echo "${ac_configure_args}" | sed 's/\\$/$$/g'`")dnl diff --git a/ruby-2.1.0-custom-rubygems-location.patch b/ruby-2.1.0-custom-rubygems-location.patch index 6a9b384..f298cc1 100644 --- a/ruby-2.1.0-custom-rubygems-location.patch +++ b/ruby-2.1.0-custom-rubygems-location.patch @@ -15,7 +15,7 @@ diff --git a/configure.in b/configure.in index 03a4152..0e371e2 100644 --- a/configure.in +++ b/configure.in -@@ -4469,6 +4469,10 @@ AC_ARG_WITH(vendorarchdir, +@@ -4430,6 +4430,10 @@ AC_ARG_WITH(vendorarchdir, [vendorarchdir=$withval], [vendorarchdir=${multiarch+'${rubysitearchprefix}/vendor_ruby'${ruby_version_dir}}${multiarch-'${vendorlibdir}/${sitearch}'}]) @@ -26,7 +26,7 @@ index 03a4152..0e371e2 100644 AS_IF([test "${LOAD_RELATIVE+set}"], [ AC_DEFINE_UNQUOTED(LOAD_RELATIVE, $LOAD_RELATIVE) RUBY_EXEC_PREFIX='' -@@ -4493,6 +4497,7 @@ AC_SUBST(sitearchdir)dnl +@@ -4454,6 +4458,7 @@ AC_SUBST(sitearchdir)dnl AC_SUBST(vendordir)dnl AC_SUBST(vendorlibdir)dnl AC_SUBST(vendorarchdir)dnl @@ -75,16 +75,15 @@ index b47b6e1..0b99408 100755 mandir = CONFIG["mandir", true] docdir = CONFIG["docdir", true] configure_args = Shellwords.shellwords(CONFIG["configure_args"]) -@@ -531,7 +532,14 @@ def install(src, cmd) +@@ -531,7 +532,13 @@ def install(src, cmd) install?(:local, :comm, :lib) do prepare "library scripts", rubylibdir noinst = %w[README* *.txt *.rdoc *.gemspec] -+ noinst += %w[*ubygems.rb rubygems/ datadir.rb] if rubygemsdir ++ noinst += %w[rubygems.rb rubygems/ datadir.rb] if rubygemsdir install_recursive(File.join(srcdir, "lib"), rubylibdir, :no_install => noinst, :mode => $data_mode) + if rubygemsdir + noinst = %w[obsolete.rb] + install_recursive(File.join(srcdir, "lib", "rubygems"), File.join(rubygemsdir, "rubygems"), :mode => $data_mode) -+ install(File.join(srcdir, "lib", "ubygems.rb"), File.join(rubygemsdir, "ubygems.rb"), :mode => $data_mode) + install(File.join(srcdir, "lib", "rubygems.rb"), File.join(rubygemsdir, "rubygems.rb"), :mode => $data_mode) + end end diff --git a/ruby-2.2.3-Generate-preludes-using-miniruby.patch b/ruby-2.2.3-Generate-preludes-using-miniruby.patch index 9546060..3c736e6 100644 --- a/ruby-2.2.3-Generate-preludes-using-miniruby.patch +++ b/ruby-2.2.3-Generate-preludes-using-miniruby.patch @@ -11,7 +11,7 @@ diff --git a/common.mk b/common.mk index 168dc52..20c218a 100644 --- a/common.mk +++ b/common.mk -@@ -935,9 +935,9 @@ $(MINIPRELUDE_C): $(COMPILE_PRELUDE) +@@ -946,9 +946,9 @@ $(MINIPRELUDE_C): $(COMPILE_PRELUDE) $(srcdir)/template/prelude.c.tmpl $(PRELUDE_C): $(COMPILE_PRELUDE) \ diff --git a/ruby-2.3.0-ruby_version.patch b/ruby-2.3.0-ruby_version.patch index 903803f..402c331 100644 --- a/ruby-2.3.0-ruby_version.patch +++ b/ruby-2.3.0-ruby_version.patch @@ -20,7 +20,7 @@ diff --git a/configure.in b/configure.in index db37cd6..6e73fae 100644 --- a/configure.in +++ b/configure.in -@@ -4384,9 +4384,6 @@ AS_CASE(["$target_os"], +@@ -4345,9 +4345,6 @@ AS_CASE(["$target_os"], rubyw_install_name='$(RUBYW_INSTALL_NAME)' ]) @@ -30,7 +30,7 @@ index db37cd6..6e73fae 100644 rubyarchprefix=${multiarch+'${archlibdir}/${RUBY_BASE_NAME}'}${multiarch-'${rubylibprefix}/${arch}'} AC_ARG_WITH(rubyarchprefix, AS_HELP_STRING([--with-rubyarchprefix=DIR], -@@ -4409,56 +4406,62 @@ AC_ARG_WITH(ridir, +@@ -4370,56 +4367,62 @@ AC_ARG_WITH(ridir, AC_SUBST(ridir) AC_SUBST(RI_BASE_NAME) @@ -120,7 +120,7 @@ index db37cd6..6e73fae 100644 AS_IF([test "${LOAD_RELATIVE+set}"], [ AC_DEFINE_UNQUOTED(LOAD_RELATIVE, $LOAD_RELATIVE) -@@ -4475,6 +4478,7 @@ AC_SUBST(sitearchincludedir)dnl +@@ -4436,6 +4439,7 @@ AC_SUBST(sitearchincludedir)dnl AC_SUBST(arch)dnl AC_SUBST(sitearch)dnl AC_SUBST(ruby_version)dnl diff --git a/ruby-2.5.0-Revert-runruby-test-with-smallest-possible-machine-stack.patch b/ruby-2.5.0-Revert-runruby-test-with-smallest-possible-machine-stack.patch index 96da001..cdaa333 100644 --- a/ruby-2.5.0-Revert-runruby-test-with-smallest-possible-machine-stack.patch +++ b/ruby-2.5.0-Revert-runruby-test-with-smallest-possible-machine-stack.patch @@ -25,7 +25,7 @@ index f6c46779e3..cade314748 100755 -} +env = {} - runner = File.join(abs_archdir, "ruby-runner#{config['EXEEXT']}") + runner = File.join(abs_archdir, "exe/ruby#{config['EXEEXT']}") runner = nil unless File.exist?(runner) -- 2.14.1 diff --git a/ruby.spec b/ruby.spec index 7122436..4daa018 100644 --- a/ruby.spec +++ b/ruby.spec @@ -10,7 +10,7 @@ #%%global milestone rc1 # Keep the revision enabled for pre-releases from SVN. -%global revision 59657 +%global revision 60018 %global ruby_archive %{name}-%{ruby_version} @@ -29,7 +29,7 @@ %global rubygems_dir %{_datadir}/rubygems # Bundled libraries versions -%global rubygems_version 2.6.12 +%global rubygems_version 2.6.13 %global molinillo_version 0.5.7 # TODO: The IRB has strange versioning. Keep the Ruby's versioning ATM. @@ -37,17 +37,18 @@ %global irb_version %{ruby_version} %global bigdecimal_version 1.3.2 +%global bundler_version 1.15.4 %global did_you_mean_version 1.1.2 %global io_console_version 0.4.6 %global json_version 2.1.0 -%global minitest_version 5.10.2 +%global minitest_version 5.10.3 %global net_telnet_version 0.1.1 -%global openssl_version 2.0.5 +%global openssl_version 2.1.0.beta1 %global power_assert_version 1.1.0 %global psych_version 3.0.0.beta3 -%global rake_version 12.0.0 -%global rdoc_version 5.1.0 -%global test_unit_version 3.2.4 +%global rake_version 12.1.0 +%global rdoc_version 6.0.0.beta2 +%global test_unit_version 3.2.5 %global xmlrpc_version 0.3.0 # Might not be needed in the future, if we are lucky enough. @@ -659,6 +660,12 @@ ln -s %{gem_dir}/gems/psych-%{psych_version}/lib/psych %{buildroot}%{ruby_libdir ln -s %{gem_dir}/gems/psych-%{psych_version}/lib/psych.rb %{buildroot}%{ruby_libdir}/psych.rb ln -s %{_libdir}/gems/%{name}/psych-%{psych_version}/psych.so %{buildroot}%{ruby_libarchdir}/psych.so +# Remove Bundler until it is really necessary. +rm -rf %{buildroot}%{ruby_libdir}/bundler +rm -rf %{buildroot}%{gem_dir}/gems/bundler-%{bundler_version} +rm -rf %{buildroot}%{gem_dir}/specifications/default/bundler-%{bundler_version}.gemspec +rm %{buildroot}%{_bindir}/bundle* + # Move the binary extensions into proper place (if no gem has binary extension, # the extensions directory might be empty). find %{buildroot}%{gem_dir}/extensions/*-%{_target_os}/%{ruby_version}/* -maxdepth 0 \ @@ -911,7 +918,6 @@ make check TESTS="-v $DISABLE_TESTS" %dir %{rubygems_dir} %{rubygems_dir}/rubygems %{rubygems_dir}/rubygems.rb -%{rubygems_dir}/ubygems.rb # Explicitly include only RubyGems directory strucure to avoid accidentally # packaged content. @@ -930,13 +936,13 @@ make check TESTS="-v $DISABLE_TESTS" # TODO: Gemify these libraries %{gem_dir}/specifications/default/cmath-0.0.1.gemspec -%{gem_dir}/specifications/default/csv-0.0.1.gemspec +%{gem_dir}/specifications/default/csv-0.1.0.gemspec %{gem_dir}/specifications/default/date-0.0.1.gemspec -%{gem_dir}/specifications/default/dbm-0.5.1.gemspec +%{gem_dir}/specifications/default/dbm-1.0.0.beta1.gemspec %{gem_dir}/specifications/default/digest-0.1.0.gemspec %{gem_dir}/specifications/default/etc-0.2.1.gemspec %{gem_dir}/specifications/default/fcntl-0.0.1.gemspec -%{gem_dir}/specifications/default/fiddle-1.0.0.beta1.gemspec +%{gem_dir}/specifications/default/fiddle-1.0.0.beta2.gemspec %{gem_dir}/specifications/default/fileutils-0.7.2.gemspec %{gem_dir}/specifications/default/gdbm-2.0.0.beta1.gemspec %{gem_dir}/specifications/default/ipaddr-1.0.0.gemspec @@ -945,7 +951,7 @@ make check TESTS="-v $DISABLE_TESTS" %{gem_dir}/specifications/default/stringio-0.0.1.gemspec %{gem_dir}/specifications/default/strscan-0.0.1.gemspec %{gem_dir}/specifications/default/webrick-1.4.0.beta1.gemspec -%{gem_dir}/specifications/default/zlib-0.0.1.gemspec +%{gem_dir}/specifications/default/zlib-0.1.0.gemspec %files -n rubygems-devel %{_rpmconfigdir}/macros.d/macros.rubygems @@ -1052,8 +1058,8 @@ make check TESTS="-v $DISABLE_TESTS" %{gem_dir}/specifications/xmlrpc-%{xmlrpc_version}.gemspec %changelog -* Tue Apr 11 2017 Vít Ondruch - 2.5.0-0.1.r59657 -- Upgrade to Ruby 2.5.0 (r59657). +* Tue Apr 11 2017 Vít Ondruch - 2.5.0-0.1.r60018 +- Upgrade to Ruby 2.5.0 (r60018). - Drop ruby-devel dependency on rubypick, which is pulled in transtitively. * Mon Apr 03 2017 Vít Ondruch - 2.4.1-79 From 4dea1f032e112f1a1fc8dd3d73b0c3a8aeaa0190 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?V=C3=ADt=20Ondruch?= Date: Tue, 3 Oct 2017 15:17:50 +0200 Subject: [PATCH 09/23] Upgrade to Ruby 2.5.0 (r60107). --- ...-additional-preludes-by-configuratio.patch | 14 +++++----- ...0-Enable-configuration-of-archlibdir.patch | 12 ++++---- ...ed-paths-when-empty-version-string-i.patch | 12 ++++---- ruby-2.1.0-always-use-i386.patch | 12 ++++---- ruby-2.1.0-custom-rubygems-location.patch | 18 ++++++------ ...2.3-Generate-preludes-using-miniruby.patch | 2 +- ruby-2.3.0-ruby_version.patch | 28 +++++++++---------- ruby.spec | 6 ++-- 8 files changed, 52 insertions(+), 52 deletions(-) diff --git a/ruby-2.1.0-Allow-to-specify-additional-preludes-by-configuratio.patch b/ruby-2.1.0-Allow-to-specify-additional-preludes-by-configuratio.patch index d1f3433..5007997 100644 --- a/ruby-2.1.0-Allow-to-specify-additional-preludes-by-configuratio.patch +++ b/ruby-2.1.0-Allow-to-specify-additional-preludes-by-configuratio.patch @@ -6,14 +6,14 @@ Subject: [PATCH] Allow to specify addition preludes by configuration option. --- Makefile.in | 2 ++ common.mk | 2 +- - configure.in | 7 +++++++ + configure.ac | 7 +++++++ 3 files changed, 10 insertions(+), 1 deletion(-) diff --git a/Makefile.in b/Makefile.in index 7e8ed82..7916993 100644 --- a/Makefile.in +++ b/Makefile.in -@@ -118,6 +118,8 @@ XRUBY_RUBYLIBDIR = @XRUBY_RUBYLIBDIR@ +@@ -119,6 +119,8 @@ XRUBY_RUBYLIBDIR = @XRUBY_RUBYLIBDIR@ XRUBY_RUBYHDRDIR = @XRUBY_RUBYHDRDIR@ BOOTSTRAPRUBY = @BOOTSTRAPRUBY@ @@ -35,11 +35,11 @@ index 5cfbc3d..3f0a82e 100644 GEM_PRELUDE = $(srcdir)/gem_prelude.rb PRELUDES = {$(srcdir)}prelude.c {$(srcdir)}miniprelude.c GOLFPRELUDES = {$(srcdir)}golf_prelude.c -diff --git a/configure.in b/configure.in -index 0e371e2..d4f1dcb 100644 ---- a/configure.in -+++ b/configure.in -@@ -4540,6 +4540,13 @@ AC_SUBST(rubyarchhdrdir)dnl +diff --git a/configure.ac b/configure.ac +index 028ef7ca3e..cdeff87871 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -4532,6 +4532,13 @@ AC_SUBST(rubyarchhdrdir)dnl AC_SUBST(sitearchhdrdir)dnl AC_SUBST(vendorarchhdrdir)dnl diff --git a/ruby-2.1.0-Enable-configuration-of-archlibdir.patch b/ruby-2.1.0-Enable-configuration-of-archlibdir.patch index 23630cb..31f0f91 100644 --- a/ruby-2.1.0-Enable-configuration-of-archlibdir.patch +++ b/ruby-2.1.0-Enable-configuration-of-archlibdir.patch @@ -4,14 +4,14 @@ Date: Tue, 1 Oct 2013 12:22:40 +0200 Subject: [PATCH] Allow to configure libruby.so placement. --- - configure.in | 5 +++++ + configure.ac | 5 +++++ 1 file changed, 5 insertions(+) -diff --git a/configure.in b/configure.in -index 37d9a62..553d4d0 100644 ---- a/configure.in -+++ b/configure.in -@@ -3782,6 +3782,11 @@ AS_IF([test ${multiarch+set}], [ +diff --git a/configure.ac b/configure.ac +index 11fc237552..b77e88fc37 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -3774,6 +3774,11 @@ AS_IF([test ${multiarch+set}], [ ]) archlibdir='${libdir}/${arch}' diff --git a/ruby-2.1.0-Prevent-duplicated-paths-when-empty-version-string-i.patch b/ruby-2.1.0-Prevent-duplicated-paths-when-empty-version-string-i.patch index d9a9419..9e684be 100644 --- a/ruby-2.1.0-Prevent-duplicated-paths-when-empty-version-string-i.patch +++ b/ruby-2.1.0-Prevent-duplicated-paths-when-empty-version-string-i.patch @@ -5,16 +5,16 @@ Subject: [PATCH] Prevent duplicated paths when empty version string is configured. --- - configure.in | 3 ++- + configure.ac | 3 ++- loadpath.c | 12 ++++++++++++ tool/mkconfig.rb | 2 +- 3 files changed, 15 insertions(+), 2 deletions(-) -diff --git a/configure.in b/configure.in -index db37cd6..ce8d149 100644 ---- a/configure.in -+++ b/configure.in -@@ -4394,7 +4394,8 @@ AS_CASE(["$ruby_version_dir_name"], +diff --git a/configure.ac b/configure.ac +index 999e2d6d5d..11fc237552 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -4386,7 +4386,8 @@ AS_CASE(["$ruby_version_dir_name"], ruby_version_dir=/'${ruby_version_dir_name}' if test -z "${ruby_version_dir_name}"; then diff --git a/ruby-2.1.0-always-use-i386.patch b/ruby-2.1.0-always-use-i386.patch index 8be7542..4deaa9b 100644 --- a/ruby-2.1.0-always-use-i386.patch +++ b/ruby-2.1.0-always-use-i386.patch @@ -4,14 +4,14 @@ Date: Mon, 19 Nov 2012 14:37:28 +0100 Subject: [PATCH] Always use i386. --- - configure.in | 2 ++ + configure.ac | 2 ++ 1 file changed, 2 insertions(+) -diff --git a/configure.in b/configure.in -index 553d4d0..03a4152 100644 ---- a/configure.in -+++ b/configure.in -@@ -4458,6 +4458,8 @@ AC_SUBST(vendorarchdir)dnl +diff --git a/configure.ac b/configure.ac +index b77e88fc37..6bba453e3c 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -4450,6 +4450,8 @@ AC_SUBST(vendorarchdir)dnl AC_SUBST(CONFIGURE, "`echo $0 | sed 's|.*/||'`")dnl AC_SUBST(configure_args, "`echo "${ac_configure_args}" | sed 's/\\$/$$/g'`")dnl diff --git a/ruby-2.1.0-custom-rubygems-location.patch b/ruby-2.1.0-custom-rubygems-location.patch index f298cc1..fb07651 100644 --- a/ruby-2.1.0-custom-rubygems-location.patch +++ b/ruby-2.1.0-custom-rubygems-location.patch @@ -5,17 +5,17 @@ Subject: [PATCH] Allow to install RubyGems into custom location, outside of Ruby tree. --- - configure.in | 5 +++++ + configure.ac | 5 +++++ loadpath.c | 4 ++++ template/verconf.h.tmpl | 3 +++ - tool/rbinstall.rb | 8 ++++++++ - 4 files changed, 20 insertions(+) + tool/rbinstall.rb | 7 +++++++ + 4 files changed, 19 insertions(+) -diff --git a/configure.in b/configure.in -index 03a4152..0e371e2 100644 ---- a/configure.in -+++ b/configure.in -@@ -4430,6 +4430,10 @@ AC_ARG_WITH(vendorarchdir, +diff --git a/configure.ac b/configure.ac +index 6bba453e3c..028ef7ca3e 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -4422,6 +4422,10 @@ AC_ARG_WITH(vendorarchdir, [vendorarchdir=$withval], [vendorarchdir=${multiarch+'${rubysitearchprefix}/vendor_ruby'${ruby_version_dir}}${multiarch-'${vendorlibdir}/${sitearch}'}]) @@ -26,7 +26,7 @@ index 03a4152..0e371e2 100644 AS_IF([test "${LOAD_RELATIVE+set}"], [ AC_DEFINE_UNQUOTED(LOAD_RELATIVE, $LOAD_RELATIVE) RUBY_EXEC_PREFIX='' -@@ -4454,6 +4458,7 @@ AC_SUBST(sitearchdir)dnl +@@ -4446,6 +4450,7 @@ AC_SUBST(sitearchdir)dnl AC_SUBST(vendordir)dnl AC_SUBST(vendorlibdir)dnl AC_SUBST(vendorarchdir)dnl diff --git a/ruby-2.2.3-Generate-preludes-using-miniruby.patch b/ruby-2.2.3-Generate-preludes-using-miniruby.patch index 3c736e6..ae65b4e 100644 --- a/ruby-2.2.3-Generate-preludes-using-miniruby.patch +++ b/ruby-2.2.3-Generate-preludes-using-miniruby.patch @@ -11,7 +11,7 @@ diff --git a/common.mk b/common.mk index 168dc52..20c218a 100644 --- a/common.mk +++ b/common.mk -@@ -946,9 +946,9 @@ $(MINIPRELUDE_C): $(COMPILE_PRELUDE) +@@ -953,9 +953,9 @@ $(MINIPRELUDE_C): $(COMPILE_PRELUDE) $(srcdir)/template/prelude.c.tmpl $(PRELUDE_C): $(COMPILE_PRELUDE) \ diff --git a/ruby-2.3.0-ruby_version.patch b/ruby-2.3.0-ruby_version.patch index 402c331..3d9593c 100644 --- a/ruby-2.3.0-ruby_version.patch +++ b/ruby-2.3.0-ruby_version.patch @@ -12,15 +12,15 @@ ruby_version_dir_name now specifies custom version string for versioned directories, e.g. instead of default X.Y.Z, you can specify whatever string. --- - configure.in | 64 ++++++++++++++++++++++++++++------------------------- + configure.ac | 64 ++++++++++++++++++++++++++++------------------------- template/ruby.pc.in | 1 + 2 files changed, 35 insertions(+), 30 deletions(-) -diff --git a/configure.in b/configure.in -index db37cd6..6e73fae 100644 ---- a/configure.in -+++ b/configure.in -@@ -4345,9 +4345,6 @@ AS_CASE(["$target_os"], +diff --git a/configure.ac b/configure.ac +index 8ea969412f..a00f2b6776 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -4337,9 +4337,6 @@ AS_CASE(["$target_os"], rubyw_install_name='$(RUBYW_INSTALL_NAME)' ]) @@ -30,7 +30,7 @@ index db37cd6..6e73fae 100644 rubyarchprefix=${multiarch+'${archlibdir}/${RUBY_BASE_NAME}'}${multiarch-'${rubylibprefix}/${arch}'} AC_ARG_WITH(rubyarchprefix, AS_HELP_STRING([--with-rubyarchprefix=DIR], -@@ -4370,56 +4367,62 @@ AC_ARG_WITH(ridir, +@@ -4362,56 +4359,62 @@ AC_ARG_WITH(ridir, AC_SUBST(ridir) AC_SUBST(RI_BASE_NAME) @@ -120,7 +120,7 @@ index db37cd6..6e73fae 100644 AS_IF([test "${LOAD_RELATIVE+set}"], [ AC_DEFINE_UNQUOTED(LOAD_RELATIVE, $LOAD_RELATIVE) -@@ -4436,6 +4439,7 @@ AC_SUBST(sitearchincludedir)dnl +@@ -4428,6 +4431,7 @@ AC_SUBST(sitearchincludedir)dnl AC_SUBST(arch)dnl AC_SUBST(sitearch)dnl AC_SUBST(ruby_version)dnl @@ -275,14 +275,14 @@ Subject: [PATCH 4/4] Let headers directories follow the configured version name. --- - configure.in | 2 +- + configure.ac | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -diff --git a/configure.in b/configure.in -index 6e73fae..c842725 100644 ---- a/configure.in -+++ b/configure.in -@@ -283,7 +283,7 @@ RUBY_BASE_NAME=`echo ruby | sed "$program_transform_name"` +diff --git a/configure.ac b/configure.ac +index a00f2b6776..999e2d6d5d 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -278,7 +278,7 @@ RUBY_BASE_NAME=`echo ruby | sed "$program_transform_name"` RUBYW_BASE_NAME=`echo rubyw | sed "$program_transform_name"` AC_SUBST(RUBY_BASE_NAME) AC_SUBST(RUBYW_BASE_NAME) diff --git a/ruby.spec b/ruby.spec index 4daa018..b12d8ee 100644 --- a/ruby.spec +++ b/ruby.spec @@ -10,7 +10,7 @@ #%%global milestone rc1 # Keep the revision enabled for pre-releases from SVN. -%global revision 60018 +%global revision 60107 %global ruby_archive %{name}-%{ruby_version} @@ -1058,8 +1058,8 @@ make check TESTS="-v $DISABLE_TESTS" %{gem_dir}/specifications/xmlrpc-%{xmlrpc_version}.gemspec %changelog -* Tue Apr 11 2017 Vít Ondruch - 2.5.0-0.1.r60018 -- Upgrade to Ruby 2.5.0 (r60018). +* Tue Apr 11 2017 Vít Ondruch - 2.5.0-0.1.r60107 +- Upgrade to Ruby 2.5.0 (r60107). - Drop ruby-devel dependency on rubypick, which is pulled in transtitively. * Mon Apr 03 2017 Vít Ondruch - 2.4.1-79 From a351df1212489b40f0c56208d45bb62b9273d408 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?V=C3=ADt=20Ondruch?= Date: Thu, 19 Oct 2017 09:57:08 +0200 Subject: [PATCH 10/23] Upgrade to Ruby 2.5.0 (r60213). --- ...specify-additional-preludes-by-configuratio.patch | 2 +- ruby-2.1.0-Enable-configuration-of-archlibdir.patch | 2 +- ...uplicated-paths-when-empty-version-string-i.patch | 2 +- ruby-2.1.0-always-use-i386.patch | 2 +- ruby-2.1.0-custom-rubygems-location.patch | 8 ++++---- ruby-2.3.0-ruby_version.patch | 12 ++++++------ ruby.spec | 10 +++++----- 7 files changed, 19 insertions(+), 19 deletions(-) diff --git a/ruby-2.1.0-Allow-to-specify-additional-preludes-by-configuratio.patch b/ruby-2.1.0-Allow-to-specify-additional-preludes-by-configuratio.patch index 5007997..8a15a4f 100644 --- a/ruby-2.1.0-Allow-to-specify-additional-preludes-by-configuratio.patch +++ b/ruby-2.1.0-Allow-to-specify-additional-preludes-by-configuratio.patch @@ -39,7 +39,7 @@ diff --git a/configure.ac b/configure.ac index 028ef7ca3e..cdeff87871 100644 --- a/configure.ac +++ b/configure.ac -@@ -4532,6 +4532,13 @@ AC_SUBST(rubyarchhdrdir)dnl +@@ -4543,6 +4543,13 @@ AC_SUBST(rubyarchhdrdir)dnl AC_SUBST(sitearchhdrdir)dnl AC_SUBST(vendorarchhdrdir)dnl diff --git a/ruby-2.1.0-Enable-configuration-of-archlibdir.patch b/ruby-2.1.0-Enable-configuration-of-archlibdir.patch index 31f0f91..8f6e24a 100644 --- a/ruby-2.1.0-Enable-configuration-of-archlibdir.patch +++ b/ruby-2.1.0-Enable-configuration-of-archlibdir.patch @@ -11,7 +11,7 @@ diff --git a/configure.ac b/configure.ac index 11fc237552..b77e88fc37 100644 --- a/configure.ac +++ b/configure.ac -@@ -3774,6 +3774,11 @@ AS_IF([test ${multiarch+set}], [ +@@ -3780,6 +3780,11 @@ AS_IF([test ${multiarch+set}], [ ]) archlibdir='${libdir}/${arch}' diff --git a/ruby-2.1.0-Prevent-duplicated-paths-when-empty-version-string-i.patch b/ruby-2.1.0-Prevent-duplicated-paths-when-empty-version-string-i.patch index 9e684be..dad8915 100644 --- a/ruby-2.1.0-Prevent-duplicated-paths-when-empty-version-string-i.patch +++ b/ruby-2.1.0-Prevent-duplicated-paths-when-empty-version-string-i.patch @@ -14,7 +14,7 @@ diff --git a/configure.ac b/configure.ac index 999e2d6d5d..11fc237552 100644 --- a/configure.ac +++ b/configure.ac -@@ -4386,7 +4386,8 @@ AS_CASE(["$ruby_version_dir_name"], +@@ -4397,7 +4397,8 @@ AS_CASE(["$ruby_version_dir_name"], ruby_version_dir=/'${ruby_version_dir_name}' if test -z "${ruby_version_dir_name}"; then diff --git a/ruby-2.1.0-always-use-i386.patch b/ruby-2.1.0-always-use-i386.patch index 4deaa9b..29c0e8b 100644 --- a/ruby-2.1.0-always-use-i386.patch +++ b/ruby-2.1.0-always-use-i386.patch @@ -11,7 +11,7 @@ diff --git a/configure.ac b/configure.ac index b77e88fc37..6bba453e3c 100644 --- a/configure.ac +++ b/configure.ac -@@ -4450,6 +4450,8 @@ AC_SUBST(vendorarchdir)dnl +@@ -4461,6 +4461,8 @@ AC_SUBST(vendorarchdir)dnl AC_SUBST(CONFIGURE, "`echo $0 | sed 's|.*/||'`")dnl AC_SUBST(configure_args, "`echo "${ac_configure_args}" | sed 's/\\$/$$/g'`")dnl diff --git a/ruby-2.1.0-custom-rubygems-location.patch b/ruby-2.1.0-custom-rubygems-location.patch index fb07651..ac02bfd 100644 --- a/ruby-2.1.0-custom-rubygems-location.patch +++ b/ruby-2.1.0-custom-rubygems-location.patch @@ -15,7 +15,7 @@ diff --git a/configure.ac b/configure.ac index 6bba453e3c..028ef7ca3e 100644 --- a/configure.ac +++ b/configure.ac -@@ -4422,6 +4422,10 @@ AC_ARG_WITH(vendorarchdir, +@@ -4433,6 +4433,10 @@ AC_ARG_WITH(vendorarchdir, [vendorarchdir=$withval], [vendorarchdir=${multiarch+'${rubysitearchprefix}/vendor_ruby'${ruby_version_dir}}${multiarch-'${vendorlibdir}/${sitearch}'}]) @@ -26,7 +26,7 @@ index 6bba453e3c..028ef7ca3e 100644 AS_IF([test "${LOAD_RELATIVE+set}"], [ AC_DEFINE_UNQUOTED(LOAD_RELATIVE, $LOAD_RELATIVE) RUBY_EXEC_PREFIX='' -@@ -4446,6 +4450,7 @@ AC_SUBST(sitearchdir)dnl +@@ -4457,6 +4461,7 @@ AC_SUBST(sitearchdir)dnl AC_SUBST(vendordir)dnl AC_SUBST(vendorlibdir)dnl AC_SUBST(vendorarchdir)dnl @@ -75,10 +75,10 @@ index b47b6e1..0b99408 100755 mandir = CONFIG["mandir", true] docdir = CONFIG["docdir", true] configure_args = Shellwords.shellwords(CONFIG["configure_args"]) -@@ -531,7 +532,13 @@ def install(src, cmd) +@@ -536,7 +537,13 @@ def install(src, cmd) install?(:local, :comm, :lib) do prepare "library scripts", rubylibdir - noinst = %w[README* *.txt *.rdoc *.gemspec] + noinst = %w[*.txt *.rdoc *.gemspec] + noinst += %w[rubygems.rb rubygems/ datadir.rb] if rubygemsdir install_recursive(File.join(srcdir, "lib"), rubylibdir, :no_install => noinst, :mode => $data_mode) + if rubygemsdir diff --git a/ruby-2.3.0-ruby_version.patch b/ruby-2.3.0-ruby_version.patch index 3d9593c..6bb69ff 100644 --- a/ruby-2.3.0-ruby_version.patch +++ b/ruby-2.3.0-ruby_version.patch @@ -20,7 +20,7 @@ diff --git a/configure.ac b/configure.ac index 8ea969412f..a00f2b6776 100644 --- a/configure.ac +++ b/configure.ac -@@ -4337,9 +4337,6 @@ AS_CASE(["$target_os"], +@@ -4348,9 +4348,6 @@ AS_CASE(["$target_os"], rubyw_install_name='$(RUBYW_INSTALL_NAME)' ]) @@ -30,7 +30,7 @@ index 8ea969412f..a00f2b6776 100644 rubyarchprefix=${multiarch+'${archlibdir}/${RUBY_BASE_NAME}'}${multiarch-'${rubylibprefix}/${arch}'} AC_ARG_WITH(rubyarchprefix, AS_HELP_STRING([--with-rubyarchprefix=DIR], -@@ -4362,56 +4359,62 @@ AC_ARG_WITH(ridir, +@@ -4373,56 +4370,62 @@ AC_ARG_WITH(ridir, AC_SUBST(ridir) AC_SUBST(RI_BASE_NAME) @@ -120,7 +120,7 @@ index 8ea969412f..a00f2b6776 100644 AS_IF([test "${LOAD_RELATIVE+set}"], [ AC_DEFINE_UNQUOTED(LOAD_RELATIVE, $LOAD_RELATIVE) -@@ -4428,6 +4431,7 @@ AC_SUBST(sitearchincludedir)dnl +@@ -4439,6 +4442,7 @@ AC_SUBST(sitearchincludedir)dnl AC_SUBST(arch)dnl AC_SUBST(sitearch)dnl AC_SUBST(ruby_version)dnl @@ -137,9 +137,9 @@ index 8a2c066..c81b211 100644 TEENY=@TEENY@ ruby_version=@ruby_version@ +ruby_version_dir_name=@ruby_version_dir_name@ + RUBY_API_VERSION=@RUBY_API_VERSION@ RUBY_PROGRAM_VERSION=@RUBY_PROGRAM_VERSION@ RUBY_BASE_NAME=@RUBY_BASE_NAME@ - RUBY_VERSION_NAME=@RUBY_VERSION_NAME@ -- 2.1.0 @@ -245,7 +245,7 @@ diff --git a/test/rubygems/test_gem.rb b/test/rubygems/test_gem.rb index 0428bea..b6e090e 100644 --- a/test/rubygems/test_gem.rb +++ b/test/rubygems/test_gem.rb -@@ -1124,7 +1124,8 @@ def test_self_use_paths +@@ -1156,7 +1156,8 @@ def test_self_use_paths def test_self_user_dir parts = [@userhome, '.gem', Gem.ruby_engine] @@ -255,7 +255,7 @@ index 0428bea..b6e090e 100644 assert_equal File.join(parts), Gem.user_dir end -@@ -1251,7 +1252,7 @@ def test_self_user_home_user_drive_and_path +@@ -1283,7 +1284,7 @@ def test_self_user_home_user_drive_and_path def test_self_vendor_dir expected = File.join RbConfig::CONFIG['vendordir'], 'gems', diff --git a/ruby.spec b/ruby.spec index b12d8ee..fea8ac8 100644 --- a/ruby.spec +++ b/ruby.spec @@ -10,7 +10,7 @@ #%%global milestone rc1 # Keep the revision enabled for pre-releases from SVN. -%global revision 60107 +%global revision 60213 %global ruby_archive %{name}-%{ruby_version} @@ -29,7 +29,7 @@ %global rubygems_dir %{_datadir}/rubygems # Bundled libraries versions -%global rubygems_version 2.6.13 +%global rubygems_version 2.6.14 %global molinillo_version 0.5.7 # TODO: The IRB has strange versioning. Keep the Ruby's versioning ATM. @@ -47,7 +47,7 @@ %global power_assert_version 1.1.0 %global psych_version 3.0.0.beta3 %global rake_version 12.1.0 -%global rdoc_version 6.0.0.beta2 +%global rdoc_version 6.0.0.beta3 %global test_unit_version 3.2.5 %global xmlrpc_version 0.3.0 @@ -1058,8 +1058,8 @@ make check TESTS="-v $DISABLE_TESTS" %{gem_dir}/specifications/xmlrpc-%{xmlrpc_version}.gemspec %changelog -* Tue Apr 11 2017 Vít Ondruch - 2.5.0-0.1.r60107 -- Upgrade to Ruby 2.5.0 (r60107). +* Tue Apr 11 2017 Vít Ondruch - 2.5.0-0.1.r60213 +- Upgrade to Ruby 2.5.0 (r60213). - Drop ruby-devel dependency on rubypick, which is pulled in transtitively. * Mon Apr 03 2017 Vít Ondruch - 2.4.1-79 From 0b11c91887ee32d2dc561650d830964c8fc5756c Mon Sep 17 00:00:00 2001 From: Jun Aruga Date: Thu, 19 Oct 2017 09:54:36 +0200 Subject: [PATCH 11/23] Add macros to remove systemtap, git and cmake dependencies. --- ruby.spec | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/ruby.spec b/ruby.spec index fea8ac8..dce7f21 100644 --- a/ruby.spec +++ b/ruby.spec @@ -63,6 +63,10 @@ %global with_rubypick 1 %endif +%bcond_without systemtap +%bcond_without git +%bcond_without cmake + Summary: An interpreter of object-oriented scripting language Name: ruby Version: %{ruby_version} @@ -149,10 +153,10 @@ BuildRequires: libyaml-devel BuildRequires: readline-devel # Needed to pass test_set_program_name(TestRubyOptions) BuildRequires: procps -BuildRequires: %{_bindir}/dtrace +%{?with_systemtap:BuildRequires: %{_bindir}/dtrace} # RubyGems test suite optional dependencies. -BuildRequires: git -BuildRequires: %{_bindir}/cmake +%{?with_git:BuildRequires: git} +%{?with_cmake:BuildRequires: %{_bindir}/cmake} # Required to test hardening. BuildRequires: %{_bindir}/checksec BuildRequires: multilib-rpm-config @@ -727,7 +731,7 @@ touch abrt.rb make runruby TESTRUN_SCRIPT="--enable-gems %{SOURCE12}" # Check if systemtap is supported. -make runruby TESTRUN_SCRIPT=%{SOURCE13} +%{?with_systemtap:make runruby TESTRUN_SCRIPT=%{SOURCE13}} DISABLE_TESTS="" From 667952b346d0ec3769b3ee0ab9edf4166ac25174 Mon Sep 17 00:00:00 2001 From: Jun Aruga Date: Sat, 21 Oct 2017 13:13:14 +0200 Subject: [PATCH 12/23] Add macro to remove rubypick dependency. Because Fedora Ruby modularity is needed to build without rubypick package. --- ruby.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ruby.spec b/ruby.spec index dce7f21..a2b7454 100644 --- a/ruby.spec +++ b/ruby.spec @@ -60,7 +60,7 @@ %global _normalized_cpu %(echo %{_target_cpu} | sed 's/^ppc/powerpc/;s/i.86/i386/;s/sparcv./sparc/') %if 0%{?fedora} >= 19 -%global with_rubypick 1 +%bcond_without rubypick %endif %bcond_without systemtap From 9c1116f54edac2cdc6197f65b3f2f41c5da6d1f7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?V=C3=ADt=20Ondruch?= Date: Mon, 30 Oct 2017 16:40:19 +0100 Subject: [PATCH 13/23] Drop 'config.h' source. This source is not needed since c467007d. --- config.h | 61 ------------------------------------------------------- ruby.spec | 5 ----- 2 files changed, 66 deletions(-) delete mode 100644 config.h diff --git a/config.h b/config.h deleted file mode 100644 index b44f715..0000000 --- a/config.h +++ /dev/null @@ -1,61 +0,0 @@ -/* - * This config.h is a wrapper include file for the original ruby/config.h, - * which has been renamed to ruby/config-.h. There are conflicts for the - * original ruby/config.h on multilib systems, which result from arch-specific - * configuration options. Please do not use the arch-specific file directly. - */ - -/* - * This wrapped is addpated from SDL's one: - * http://pkgs.fedoraproject.org/cgit/SDL.git/tree/SDL_config.h - */ - -#ifdef ruby_config_wrapper_h -#error "ruby_config_wrapper_h should not be defined!" -#endif -#define ruby_config_wrapper_h - -#if defined(__i386__) -#include "ruby/config-i386.h" -#elif defined(__ia64__) -#include "ruby/config-ia64.h" -#elif defined(__powerpc64__) -#include -#if __BYTE_ORDER__ == __ORDER_BIG_ENDIAN__ -#include "ruby/config-ppc64.h" -#else -#include "ruby/config-ppc64le.h" -#endif -#elif defined(__powerpc__) -#include "ruby/config-ppc.h" -#elif defined(__s390x__) -#include "ruby/config-s390x.h" -#elif defined(__s390__) -#include "ruby/config-s390.h" -#elif defined(__x86_64__) -#include "ruby/config-x86_64.h" -#elif defined(__arm__) -#include "ruby/config-arm.h" -#elif defined(__alpha__) -#include "ruby/config-alpha.h" -#elif defined(__sparc__) && defined (__arch64__) -#include "ruby/config-sparc64.h" -#elif defined(__sparc__) -#include "ruby/config-sparc.h" -#elif defined(__aarch64__) -#include "ruby/config-aarch64.h" -#elif defined(__mips64) && defined(__MIPSEL__) -#include "ruby/config-mips64el.h" -#elif defined(__mips64) -#include "ruby/config-mips64.h" -#elif defined(__mips) && defined(__MIPSEL__) -#include "ruby/config-mipsel.h" -#elif defined(__mips) -#include "ruby/config-mips.h" -#elif defined(__riscv64) -#include "ruby/config-riscv64.h" -#else -#error "The ruby-devel package is not usable with the architecture." -#endif - -#undef ruby_config_wrapper_h diff --git a/ruby.spec b/ruby.spec index a2b7454..3ed2276 100644 --- a/ruby.spec +++ b/ruby.spec @@ -86,11 +86,6 @@ Source3: ruby-exercise.stp Source4: macros.ruby Source5: macros.rubygems Source6: abrt_prelude.rb -# This wrapper fixes https://bugzilla.redhat.com/show_bug.cgi?id=977941 -# Hopefully, it will get removed soon: -# https://fedorahosted.org/fpc/ticket/312 -# https://bugzilla.redhat.com/show_bug.cgi?id=977941 -Source7: config.h # RPM dependency generators. Source8: rubygems.attr Source9: rubygems.req From a723452328933e417322f1bd0ba7bcb510d5756b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?V=C3=ADt=20Ondruch?= Date: Wed, 1 Nov 2017 16:22:02 +0100 Subject: [PATCH 14/23] Check hardening only on Fedora. --- ruby.spec | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/ruby.spec b/ruby.spec index 3ed2276..87440ac 100644 --- a/ruby.spec +++ b/ruby.spec @@ -67,6 +67,10 @@ %bcond_without git %bcond_without cmake +%if 0%{?fedora} +%bcond_without hardening_test +%endif + Summary: An interpreter of object-oriented scripting language Name: ruby Version: %{ruby_version} @@ -153,7 +157,7 @@ BuildRequires: procps %{?with_git:BuildRequires: git} %{?with_cmake:BuildRequires: %{_bindir}/cmake} # Required to test hardening. -BuildRequires: %{_bindir}/checksec +%{?with_hardening_test:BuildRequires: %{_bindir}/checksec} BuildRequires: multilib-rpm-config # This package provides %%{_bindir}/ruby-mri therefore it is marked by this @@ -698,6 +702,7 @@ sed -i 's/^/%doc /' .ruby-doc.* sed -i 's/^/%lang(ja) /' .ruby-doc.ja %check +%if 0%{?with_hardening_test} # Temporary change the hardening check on PPC64LE as long as the checksec is # is providing incorrect output. # https://bugzilla.redhat.com/show_bug.cgi?id=1479302 @@ -709,6 +714,7 @@ checksec -f libruby.so.%{ruby_version} | \ checksec -f libruby.so.%{ruby_version} | \ grep "Full RELRO.*Canary found.*NX enabled.*DSO.*No RPATH.*No RUNPATH.*No.*\d*.*\d*.*libruby.so.%{ruby_version}" %endif +%endif # Check RubyGems version correctness. [ "`make runruby TESTRUN_SCRIPT='bin/gem -v' | tail -1`" == '%{rubygems_version}' ] From f55c942dfba98d6ab380d9be30236d37c549b3ed Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?V=C3=ADt=20Ondruch?= Date: Wed, 13 Dec 2017 16:26:42 +0100 Subject: [PATCH 15/23] Upgrade to Ruby 2.5.0 (r60213). --- ruby-1.9.3-mkmf-verbose.patch | 2 +- ...-additional-preludes-by-configuratio.patch | 4 +- ...0-Enable-configuration-of-archlibdir.patch | 2 +- ...ed-paths-when-empty-version-string-i.patch | 2 +- ruby-2.1.0-always-use-i386.patch | 2 +- ruby-2.1.0-custom-rubygems-location.patch | 8 +-- ...2.3-Generate-preludes-using-miniruby.patch | 2 +- ruby-2.3.0-ruby_version.patch | 10 +-- ...with-smallest-possible-machine-stack.patch | 32 ---------- ruby.spec | 62 ++++++++----------- 10 files changed, 42 insertions(+), 84 deletions(-) delete mode 100644 ruby-2.5.0-Revert-runruby-test-with-smallest-possible-machine-stack.patch diff --git a/ruby-1.9.3-mkmf-verbose.patch b/ruby-1.9.3-mkmf-verbose.patch index b523657..f2a1408 100644 --- a/ruby-1.9.3-mkmf-verbose.patch +++ b/ruby-1.9.3-mkmf-verbose.patch @@ -11,7 +11,7 @@ diff --git a/lib/mkmf.rb b/lib/mkmf.rb index 682eb46..e6b1445 100644 --- a/lib/mkmf.rb +++ b/lib/mkmf.rb -@@ -1900,7 +1900,7 @@ def configuration(srcdir) +@@ -1899,7 +1899,7 @@ def configuration(srcdir) SHELL = /bin/sh # V=0 quiet, V=1 verbose. other values don't work. diff --git a/ruby-2.1.0-Allow-to-specify-additional-preludes-by-configuratio.patch b/ruby-2.1.0-Allow-to-specify-additional-preludes-by-configuratio.patch index 8a15a4f..da5eea6 100644 --- a/ruby-2.1.0-Allow-to-specify-additional-preludes-by-configuratio.patch +++ b/ruby-2.1.0-Allow-to-specify-additional-preludes-by-configuratio.patch @@ -26,7 +26,7 @@ diff --git a/common.mk b/common.mk index 5cfbc3d..3f0a82e 100644 --- a/common.mk +++ b/common.mk -@@ -145,7 +145,7 @@ ALLOBJS = $(NORMALMAINOBJ) $(MINIOBJS) $(COMMONOBJS) $(INITOBJS) +@@ -147,7 +147,7 @@ ALLOBJS = $(NORMALMAINOBJ) $(MINIOBJS) $(COMMONOBJS) $(INITOBJS) GOLFOBJS = goruby.$(OBJEXT) golf_prelude.$(OBJEXT) DEFAULT_PRELUDES = $(GEM_PRELUDE) @@ -39,7 +39,7 @@ diff --git a/configure.ac b/configure.ac index 028ef7ca3e..cdeff87871 100644 --- a/configure.ac +++ b/configure.ac -@@ -4543,6 +4543,13 @@ AC_SUBST(rubyarchhdrdir)dnl +@@ -4387,6 +4387,13 @@ AC_SUBST(rubyarchhdrdir)dnl AC_SUBST(sitearchhdrdir)dnl AC_SUBST(vendorarchhdrdir)dnl diff --git a/ruby-2.1.0-Enable-configuration-of-archlibdir.patch b/ruby-2.1.0-Enable-configuration-of-archlibdir.patch index 8f6e24a..09696d3 100644 --- a/ruby-2.1.0-Enable-configuration-of-archlibdir.patch +++ b/ruby-2.1.0-Enable-configuration-of-archlibdir.patch @@ -11,7 +11,7 @@ diff --git a/configure.ac b/configure.ac index 11fc237552..b77e88fc37 100644 --- a/configure.ac +++ b/configure.ac -@@ -3780,6 +3780,11 @@ AS_IF([test ${multiarch+set}], [ +@@ -3632,6 +3632,11 @@ AS_IF([test ${multiarch+set}], [ ]) archlibdir='${libdir}/${arch}' diff --git a/ruby-2.1.0-Prevent-duplicated-paths-when-empty-version-string-i.patch b/ruby-2.1.0-Prevent-duplicated-paths-when-empty-version-string-i.patch index dad8915..b306612 100644 --- a/ruby-2.1.0-Prevent-duplicated-paths-when-empty-version-string-i.patch +++ b/ruby-2.1.0-Prevent-duplicated-paths-when-empty-version-string-i.patch @@ -14,7 +14,7 @@ diff --git a/configure.ac b/configure.ac index 999e2d6d5d..11fc237552 100644 --- a/configure.ac +++ b/configure.ac -@@ -4397,7 +4397,8 @@ AS_CASE(["$ruby_version_dir_name"], +@@ -4242,7 +4242,8 @@ AS_CASE(["$ruby_version_dir_name"], ruby_version_dir=/'${ruby_version_dir_name}' if test -z "${ruby_version_dir_name}"; then diff --git a/ruby-2.1.0-always-use-i386.patch b/ruby-2.1.0-always-use-i386.patch index 29c0e8b..1e51168 100644 --- a/ruby-2.1.0-always-use-i386.patch +++ b/ruby-2.1.0-always-use-i386.patch @@ -11,7 +11,7 @@ diff --git a/configure.ac b/configure.ac index b77e88fc37..6bba453e3c 100644 --- a/configure.ac +++ b/configure.ac -@@ -4461,6 +4461,8 @@ AC_SUBST(vendorarchdir)dnl +@@ -4306,6 +4306,8 @@ AC_SUBST(vendorarchdir)dnl AC_SUBST(CONFIGURE, "`echo $0 | sed 's|.*/||'`")dnl AC_SUBST(configure_args, "`echo "${ac_configure_args}" | sed 's/\\$/$$/g'`")dnl diff --git a/ruby-2.1.0-custom-rubygems-location.patch b/ruby-2.1.0-custom-rubygems-location.patch index ac02bfd..4ed79e6 100644 --- a/ruby-2.1.0-custom-rubygems-location.patch +++ b/ruby-2.1.0-custom-rubygems-location.patch @@ -15,7 +15,7 @@ diff --git a/configure.ac b/configure.ac index 6bba453e3c..028ef7ca3e 100644 --- a/configure.ac +++ b/configure.ac -@@ -4433,6 +4433,10 @@ AC_ARG_WITH(vendorarchdir, +@@ -4278,6 +4278,10 @@ AC_ARG_WITH(vendorarchdir, [vendorarchdir=$withval], [vendorarchdir=${multiarch+'${rubysitearchprefix}/vendor_ruby'${ruby_version_dir}}${multiarch-'${vendorlibdir}/${sitearch}'}]) @@ -26,7 +26,7 @@ index 6bba453e3c..028ef7ca3e 100644 AS_IF([test "${LOAD_RELATIVE+set}"], [ AC_DEFINE_UNQUOTED(LOAD_RELATIVE, $LOAD_RELATIVE) RUBY_EXEC_PREFIX='' -@@ -4457,6 +4461,7 @@ AC_SUBST(sitearchdir)dnl +@@ -4302,6 +4306,7 @@ AC_SUBST(sitearchdir)dnl AC_SUBST(vendordir)dnl AC_SUBST(vendorlibdir)dnl AC_SUBST(vendorarchdir)dnl @@ -67,7 +67,7 @@ diff --git a/tool/rbinstall.rb b/tool/rbinstall.rb index b47b6e1..0b99408 100755 --- a/tool/rbinstall.rb +++ b/tool/rbinstall.rb -@@ -330,6 +330,7 @@ def CONFIG.[](name, mandatory = false) +@@ -331,6 +331,7 @@ def CONFIG.[](name, mandatory = false) sitearchlibdir = CONFIG["sitearchdir"] vendorlibdir = CONFIG["vendorlibdir"] vendorarchlibdir = CONFIG["vendorarchdir"] @@ -75,7 +75,7 @@ index b47b6e1..0b99408 100755 mandir = CONFIG["mandir", true] docdir = CONFIG["docdir", true] configure_args = Shellwords.shellwords(CONFIG["configure_args"]) -@@ -536,7 +537,13 @@ def install(src, cmd) +@@ -537,7 +538,13 @@ def install(src, cmd) install?(:local, :comm, :lib) do prepare "library scripts", rubylibdir noinst = %w[*.txt *.rdoc *.gemspec] diff --git a/ruby-2.2.3-Generate-preludes-using-miniruby.patch b/ruby-2.2.3-Generate-preludes-using-miniruby.patch index ae65b4e..05fbaa6 100644 --- a/ruby-2.2.3-Generate-preludes-using-miniruby.patch +++ b/ruby-2.2.3-Generate-preludes-using-miniruby.patch @@ -11,7 +11,7 @@ diff --git a/common.mk b/common.mk index 168dc52..20c218a 100644 --- a/common.mk +++ b/common.mk -@@ -953,9 +953,9 @@ $(MINIPRELUDE_C): $(COMPILE_PRELUDE) +@@ -956,9 +956,9 @@ $(MINIPRELUDE_C): $(COMPILE_PRELUDE) $(srcdir)/template/prelude.c.tmpl $(PRELUDE_C): $(COMPILE_PRELUDE) \ diff --git a/ruby-2.3.0-ruby_version.patch b/ruby-2.3.0-ruby_version.patch index 6bb69ff..ee00a35 100644 --- a/ruby-2.3.0-ruby_version.patch +++ b/ruby-2.3.0-ruby_version.patch @@ -20,7 +20,7 @@ diff --git a/configure.ac b/configure.ac index 8ea969412f..a00f2b6776 100644 --- a/configure.ac +++ b/configure.ac -@@ -4348,9 +4348,6 @@ AS_CASE(["$target_os"], +@@ -4193,9 +4193,6 @@ AS_CASE(["$target_os"], rubyw_install_name='$(RUBYW_INSTALL_NAME)' ]) @@ -30,7 +30,7 @@ index 8ea969412f..a00f2b6776 100644 rubyarchprefix=${multiarch+'${archlibdir}/${RUBY_BASE_NAME}'}${multiarch-'${rubylibprefix}/${arch}'} AC_ARG_WITH(rubyarchprefix, AS_HELP_STRING([--with-rubyarchprefix=DIR], -@@ -4373,56 +4370,62 @@ AC_ARG_WITH(ridir, +@@ -4218,56 +4215,62 @@ AC_ARG_WITH(ridir, AC_SUBST(ridir) AC_SUBST(RI_BASE_NAME) @@ -120,7 +120,7 @@ index 8ea969412f..a00f2b6776 100644 AS_IF([test "${LOAD_RELATIVE+set}"], [ AC_DEFINE_UNQUOTED(LOAD_RELATIVE, $LOAD_RELATIVE) -@@ -4439,6 +4442,7 @@ AC_SUBST(sitearchincludedir)dnl +@@ -4284,6 +4287,7 @@ AC_SUBST(sitearchincludedir)dnl AC_SUBST(arch)dnl AC_SUBST(sitearch)dnl AC_SUBST(ruby_version)dnl @@ -171,7 +171,7 @@ diff --git a/tool/rbinstall.rb b/tool/rbinstall.rb index d4c110e..d39c9a6 100755 --- a/tool/rbinstall.rb +++ b/tool/rbinstall.rb -@@ -416,7 +416,7 @@ def CONFIG.[](name, mandatory = false) +@@ -417,7 +417,7 @@ def CONFIG.[](name, mandatory = false) install?(:doc, :rdoc) do if $rdocdir @@ -282,7 +282,7 @@ diff --git a/configure.ac b/configure.ac index a00f2b6776..999e2d6d5d 100644 --- a/configure.ac +++ b/configure.ac -@@ -278,7 +278,7 @@ RUBY_BASE_NAME=`echo ruby | sed "$program_transform_name"` +@@ -164,7 +164,7 @@ RUBY_BASE_NAME=`echo ruby | sed "$program_transform_name"` RUBYW_BASE_NAME=`echo rubyw | sed "$program_transform_name"` AC_SUBST(RUBY_BASE_NAME) AC_SUBST(RUBYW_BASE_NAME) diff --git a/ruby-2.5.0-Revert-runruby-test-with-smallest-possible-machine-stack.patch b/ruby-2.5.0-Revert-runruby-test-with-smallest-possible-machine-stack.patch deleted file mode 100644 index cdaa333..0000000 --- a/ruby-2.5.0-Revert-runruby-test-with-smallest-possible-machine-stack.patch +++ /dev/null @@ -1,32 +0,0 @@ -From 68b8e9b42f1baf67f8ef9535d213fd0bd7ae42f4 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?V=C3=ADt=20Ondruch?= -Date: Fri, 25 Aug 2017 13:21:56 +0200 -Subject: [PATCH] Revert "tool/runruby.rb: test with smallest possible machine - stack" - -This reverts commit c4e2cf466448f4283fd3f8a17a73f5fa9b745fe1. ---- - tool/runruby.rb | 7 +------ - 1 file changed, 1 insertion(+), 6 deletions(-) - -diff --git a/tool/runruby.rb b/tool/runruby.rb -index f6c46779e3..cade314748 100755 ---- a/tool/runruby.rb -+++ b/tool/runruby.rb -@@ -67,12 +67,7 @@ def File.realpath(*args) - libs << File.expand_path("lib", srcdir) - config["bindir"] = abs_archdir - --env = { -- # Test with the smallest possible machine stack sizes. -- # These values are clamped to machine-dependent minimum values in vm_core.h -- 'RUBY_THREAD_MACHINE_STACK_SIZE' => '1', -- 'RUBY_FIBER_MACHINE_STACK_SIZE' => '1', --} -+env = {} - - runner = File.join(abs_archdir, "exe/ruby#{config['EXEEXT']}") - runner = nil unless File.exist?(runner) --- -2.14.1 - diff --git a/ruby.spec b/ruby.spec index 87440ac..1da0c01 100644 --- a/ruby.spec +++ b/ruby.spec @@ -10,7 +10,7 @@ #%%global milestone rc1 # Keep the revision enabled for pre-releases from SVN. -%global revision 60213 +%global revision 61169 %global ruby_archive %{name}-%{ruby_version} @@ -29,7 +29,7 @@ %global rubygems_dir %{_datadir}/rubygems # Bundled libraries versions -%global rubygems_version 2.6.14 +%global rubygems_version 2.7.3 %global molinillo_version 0.5.7 # TODO: The IRB has strange versioning. Keep the Ruby's versioning ATM. @@ -37,18 +37,18 @@ %global irb_version %{ruby_version} %global bigdecimal_version 1.3.2 -%global bundler_version 1.15.4 +%global bundler_version 1.16.1.pre1 %global did_you_mean_version 1.1.2 %global io_console_version 0.4.6 %global json_version 2.1.0 %global minitest_version 5.10.3 %global net_telnet_version 0.1.1 -%global openssl_version 2.1.0.beta1 -%global power_assert_version 1.1.0 -%global psych_version 3.0.0.beta3 -%global rake_version 12.1.0 -%global rdoc_version 6.0.0.beta3 -%global test_unit_version 3.2.5 +%global openssl_version 2.1.0.beta2 +%global power_assert_version 1.1.1 +%global psych_version 3.0.0 +%global rake_version 12.3.0 +%global rdoc_version 6.0.0 +%global test_unit_version 3.2.7 %global xmlrpc_version 0.3.0 # Might not be needed in the future, if we are lucky enough. @@ -133,10 +133,6 @@ Patch7: ruby-2.2.3-Generate-preludes-using-miniruby.patch # https://bugs.ruby-lang.org/issues/12666 Patch9: ruby-2.3.1-Rely-on-ldd-to-detect-glibc.patch -# Avoids SEGV in TestBacktrace#test_caller_lev segaults on PPC. -# https://bugs.ruby-lang.org/issues/13757 -Patch100: ruby-2.5.0-Revert-runruby-test-with-smallest-possible-machine-stack.patch - Requires: %{name}-libs%{?_isa} = %{version}-%{release} Suggests: rubypick Recommends: ruby(rubygems) >= %{rubygems_version} @@ -517,8 +513,6 @@ rm -rf ext/fiddle/libffi* %patch7 -p1 %patch9 -p1 -%patch100 -p1 - # Provide an example of usage of the tapset: cp -a %{SOURCE3} . @@ -703,17 +697,9 @@ sed -i 's/^/%lang(ja) /' .ruby-doc.ja %check %if 0%{?with_hardening_test} -# Temporary change the hardening check on PPC64LE as long as the checksec is -# is providing incorrect output. -# https://bugzilla.redhat.com/show_bug.cgi?id=1479302 -%ifnarch ppc64le # Check Ruby hardening. checksec -f libruby.so.%{ruby_version} | \ grep "Full RELRO.*Canary found.*NX enabled.*DSO.*No RPATH.*No RUNPATH.*Yes.*\d*.*\d*.*libruby.so.%{ruby_version}" -%else -checksec -f libruby.so.%{ruby_version} | \ - grep "Full RELRO.*Canary found.*NX enabled.*DSO.*No RPATH.*No RUNPATH.*No.*\d*.*\d*.*libruby.so.%{ruby_version}" -%endif %endif # Check RubyGems version correctness. @@ -740,6 +726,10 @@ DISABLE_TESTS="" # Once seen: http://koji.fedoraproject.org/koji/taskinfo?taskID=12556650 DISABLE_TESTS="$DISABLE_TESTS -x test_fork.rb" +# Disable failing TestProcess#test_maxgroups test. +# https://bugs.ruby-lang.org/issues/14174 +sed -i '/def test_maxgroups$/,/^ end$/ s/^/#/' test/ruby/test_process.rb + make check TESTS="-v $DISABLE_TESTS" %post libs -p /sbin/ldconfig @@ -940,23 +930,23 @@ make check TESTS="-v $DISABLE_TESTS" %exclude %{gem_dir}/cache/* # TODO: Gemify these libraries -%{gem_dir}/specifications/default/cmath-0.0.1.gemspec +%{gem_dir}/specifications/default/cmath-1.0.0.gemspec %{gem_dir}/specifications/default/csv-0.1.0.gemspec -%{gem_dir}/specifications/default/date-0.0.1.gemspec -%{gem_dir}/specifications/default/dbm-1.0.0.beta1.gemspec +%{gem_dir}/specifications/default/date-1.0.0.gemspec +%{gem_dir}/specifications/default/dbm-1.0.0.gemspec %{gem_dir}/specifications/default/digest-0.1.0.gemspec %{gem_dir}/specifications/default/etc-0.2.1.gemspec -%{gem_dir}/specifications/default/fcntl-0.0.1.gemspec -%{gem_dir}/specifications/default/fiddle-1.0.0.beta2.gemspec -%{gem_dir}/specifications/default/fileutils-0.7.2.gemspec -%{gem_dir}/specifications/default/gdbm-2.0.0.beta1.gemspec -%{gem_dir}/specifications/default/ipaddr-1.0.0.gemspec -%{gem_dir}/specifications/default/scanf-0.0.1.gemspec -%{gem_dir}/specifications/default/sdbm-0.0.1.gemspec +%{gem_dir}/specifications/default/fcntl-1.0.0.gemspec +%{gem_dir}/specifications/default/fiddle-1.0.0.gemspec +%{gem_dir}/specifications/default/fileutils-1.0.1.gemspec +%{gem_dir}/specifications/default/gdbm-2.0.0.gemspec +%{gem_dir}/specifications/default/ipaddr-1.2.0.gemspec +%{gem_dir}/specifications/default/scanf-1.0.0.gemspec +%{gem_dir}/specifications/default/sdbm-1.0.0.gemspec %{gem_dir}/specifications/default/stringio-0.0.1.gemspec %{gem_dir}/specifications/default/strscan-0.0.1.gemspec %{gem_dir}/specifications/default/webrick-1.4.0.beta1.gemspec -%{gem_dir}/specifications/default/zlib-0.1.0.gemspec +%{gem_dir}/specifications/default/zlib-1.0.0.gemspec %files -n rubygems-devel %{_rpmconfigdir}/macros.d/macros.rubygems @@ -1063,8 +1053,8 @@ make check TESTS="-v $DISABLE_TESTS" %{gem_dir}/specifications/xmlrpc-%{xmlrpc_version}.gemspec %changelog -* Tue Apr 11 2017 Vít Ondruch - 2.5.0-0.1.r60213 -- Upgrade to Ruby 2.5.0 (r60213). +* Tue Apr 11 2017 Vít Ondruch - 2.5.0-0.1.r61169 +- Upgrade to Ruby 2.5.0 (r61169). - Drop ruby-devel dependency on rubypick, which is pulled in transtitively. * Mon Apr 03 2017 Vít Ondruch - 2.4.1-79 From 87ddbf089e16006eec99fbf50d0b25ee8c1376fe Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?V=C3=ADt=20Ondruch?= Date: Thu, 14 Dec 2017 14:40:36 +0100 Subject: [PATCH 16/23] Upgrade to Ruby 2.5.0 (r61214). --- ruby.spec | 19 ++++++++++--------- 1 file changed, 10 insertions(+), 9 deletions(-) diff --git a/ruby.spec b/ruby.spec index 1da0c01..5339332 100644 --- a/ruby.spec +++ b/ruby.spec @@ -10,7 +10,7 @@ #%%global milestone rc1 # Keep the revision enabled for pre-releases from SVN. -%global revision 61169 +%global revision 61214 %global ruby_archive %{name}-%{ruby_version} @@ -36,7 +36,7 @@ # http://redmine.ruby-lang.org/issues/5313 %global irb_version %{ruby_version} -%global bigdecimal_version 1.3.2 +%global bigdecimal_version 1.3.3 %global bundler_version 1.16.1.pre1 %global did_you_mean_version 1.1.2 %global io_console_version 0.4.6 @@ -726,9 +726,10 @@ DISABLE_TESTS="" # Once seen: http://koji.fedoraproject.org/koji/taskinfo?taskID=12556650 DISABLE_TESTS="$DISABLE_TESTS -x test_fork.rb" -# Disable failing TestProcess#test_maxgroups test. -# https://bugs.ruby-lang.org/issues/14174 -sed -i '/def test_maxgroups$/,/^ end$/ s/^/#/' test/ruby/test_process.rb +## Disable failing TestResolvMDNS#test_mdns_each_address test, +## which fails on Koji. +## https://bugs.ruby-lang.org/issues/14175 +#sed -i '/def test_mdns_each_address$/,/^ end$/ s/^/#/' test/resolv/test_mdns.rb make check TESTS="-v $DISABLE_TESTS" @@ -931,11 +932,11 @@ make check TESTS="-v $DISABLE_TESTS" # TODO: Gemify these libraries %{gem_dir}/specifications/default/cmath-1.0.0.gemspec -%{gem_dir}/specifications/default/csv-0.1.0.gemspec +%{gem_dir}/specifications/default/csv-1.0.0.gemspec %{gem_dir}/specifications/default/date-1.0.0.gemspec %{gem_dir}/specifications/default/dbm-1.0.0.gemspec %{gem_dir}/specifications/default/digest-0.1.0.gemspec -%{gem_dir}/specifications/default/etc-0.2.1.gemspec +%{gem_dir}/specifications/default/etc-1.0.0.gemspec %{gem_dir}/specifications/default/fcntl-1.0.0.gemspec %{gem_dir}/specifications/default/fiddle-1.0.0.gemspec %{gem_dir}/specifications/default/fileutils-1.0.1.gemspec @@ -1053,8 +1054,8 @@ make check TESTS="-v $DISABLE_TESTS" %{gem_dir}/specifications/xmlrpc-%{xmlrpc_version}.gemspec %changelog -* Tue Apr 11 2017 Vít Ondruch - 2.5.0-0.1.r61169 -- Upgrade to Ruby 2.5.0 (r61169). +* Tue Apr 11 2017 Vít Ondruch - 2.5.0-0.1.r61214 +- Upgrade to Ruby 2.5.0 (r61214). - Drop ruby-devel dependency on rubypick, which is pulled in transtitively. * Mon Apr 03 2017 Vít Ondruch - 2.4.1-79 From 3b72cc1f0a1b6785f250f4c007c37f73e7dd76b1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?V=C3=ADt=20Ondruch?= Date: Thu, 14 Dec 2017 14:43:43 +0100 Subject: [PATCH 17/23] Really disable the TestResolvMDNS#test_mdns_each_address test. --- ruby.spec | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/ruby.spec b/ruby.spec index 5339332..bd86218 100644 --- a/ruby.spec +++ b/ruby.spec @@ -726,10 +726,10 @@ DISABLE_TESTS="" # Once seen: http://koji.fedoraproject.org/koji/taskinfo?taskID=12556650 DISABLE_TESTS="$DISABLE_TESTS -x test_fork.rb" -## Disable failing TestResolvMDNS#test_mdns_each_address test, -## which fails on Koji. -## https://bugs.ruby-lang.org/issues/14175 -#sed -i '/def test_mdns_each_address$/,/^ end$/ s/^/#/' test/resolv/test_mdns.rb +# Disable failing TestResolvMDNS#test_mdns_each_address test, +# which fails on Koji. +# https://bugs.ruby-lang.org/issues/14175 +sed -i '/def test_mdns_each_address$/,/^ end$/ s/^/#/' test/resolv/test_mdns.rb make check TESTS="-v $DISABLE_TESTS" From 5bd6a6753bdf406a2ce63cb6012a979ab4357ab5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?V=C3=ADt=20Ondruch?= Date: Tue, 19 Dec 2017 15:40:38 +0100 Subject: [PATCH 18/23] Don't change the default gem directory. Ruby expects default gem specifications to be stored in a subdirectory of default gem specifications directory. Change in default directory makes the default gems unloadable. Unfortunately, when '--install-dir' option is used, this might prevent generating of documentation [1]. [1] https://github.com/rubygems/rubygems/issues/1470 --- operating_system.rb | 37 ++++----- ....0-Add-Gem.operating_system_defaults.patch | 80 +++++++++++++++++++ ruby.spec | 4 + 3 files changed, 103 insertions(+), 18 deletions(-) create mode 100644 ruby-2.5.0-Add-Gem.operating_system_defaults.patch diff --git a/operating_system.rb b/operating_system.rb index 4b2903d..0d4b1f0 100644 --- a/operating_system.rb +++ b/operating_system.rb @@ -87,22 +87,33 @@ module Gem # Remove methods we are going to override. This avoids "method redefined;" # warnings otherwise issued by Ruby. + remove_method :operating_system_defaults if method_defined? :operating_system_defaults remove_method :default_dir if method_defined? :default_dir remove_method :default_path if method_defined? :default_path - remove_method :default_bindir if method_defined? :default_bindir remove_method :default_ext_dir_for if method_defined? :default_ext_dir_for + ## + # Regular user installs into user directory, root manages /usr/local. + + def operating_system_defaults + unless opt_build_root? + options = if Process.uid == 0 + "--install-dir=#{Gem.default_dirs[:local][:gem_dir]} --bindir #{Gem.default_dirs[:local][:bin_dir]}" + else + "--user-install --bindir #{File.join [Dir.home, 'bin']}" + end + + {"gem" => options} + else + {} + end + end + ## # RubyGems default overrides. def default_dir - if opt_build_root? - Gem.default_dirs[:system][:gem_dir] - elsif Process.uid == 0 - Gem.default_dirs[:local][:gem_dir] - else - Gem.user_dir - end + Gem.default_dirs[:system][:gem_dir] end def default_path @@ -110,16 +121,6 @@ module Gem path.unshift Gem.user_dir if File.exist? Gem.user_home end - def default_bindir - if opt_build_root? - Gem.default_dirs[:system][:bin_dir] - elsif Process.uid == 0 - Gem.default_dirs[:local][:bin_dir] - else - File.join [Dir.home, 'bin'] - end - end - def default_ext_dir_for base_dir dir = if rpmbuild? build_dir = base_dir.chomp Gem.default_dirs[:system][:gem_dir] diff --git a/ruby-2.5.0-Add-Gem.operating_system_defaults.patch b/ruby-2.5.0-Add-Gem.operating_system_defaults.patch new file mode 100644 index 0000000..fb648b9 --- /dev/null +++ b/ruby-2.5.0-Add-Gem.operating_system_defaults.patch @@ -0,0 +1,80 @@ +From 60eb961c25f801ee43ca1be9393ab2f0a0546677 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?V=C3=ADt=20Ondruch?= +Date: Tue, 19 Dec 2017 14:00:20 +0100 +Subject: [PATCH] Add Gem.operating_system_defaults to allow packagers to + override defaults. + +This change allows Ruby packagers to override defaults and lazily query +them. + +This is very much the same change as #1644 to treat the +operating_system defaults the same way as platform defaults. +--- + lib/rubygems/config_file.rb | 2 +- + lib/rubygems/defaults.rb | 21 ++++++++++++++++++++- + test/rubygems/test_gem.rb | 7 +++++++ + 3 files changed, 28 insertions(+), 2 deletions(-) + +diff --git a/lib/rubygems/config_file.rb b/lib/rubygems/config_file.rb +index a4efed0f5a..deee38e6d9 100644 +--- a/lib/rubygems/config_file.rb ++++ b/lib/rubygems/config_file.rb +@@ -48,7 +48,7 @@ class Gem::ConfigFile + # For Ruby packagers to set configuration defaults. Set in + # rubygems/defaults/operating_system.rb + +- OPERATING_SYSTEM_DEFAULTS = {} ++ OPERATING_SYSTEM_DEFAULTS = Gem.operating_system_defaults + + ## + # For Ruby implementers to set configuration defaults. Set in +diff --git a/lib/rubygems/defaults.rb b/lib/rubygems/defaults.rb +index 43d57fc808..b8222877ae 100644 +--- a/lib/rubygems/defaults.rb ++++ b/lib/rubygems/defaults.rb +@@ -177,7 +177,26 @@ def self.vendor_dir # :nodoc: + end + + ## +- # Default options for gem commands. ++ # Default options for gem commands for Ruby packagers. ++ # ++ # The options here should be structured as an array of string "gem" ++ # command names as keys and a string of the default options as values. ++ # ++ # Example: ++ # ++ # def self.operating_system_defaults ++ # { ++ # 'install' => '--no-rdoc --no-ri --env-shebang', ++ # 'update' => '--no-rdoc --no-ri --env-shebang' ++ # } ++ # end ++ ++ def self.operating_system_defaults ++ {} ++ end ++ ++ ## ++ # Default options for gem commands for Ruby implementers. + # + # The options here should be structured as an array of string "gem" + # command names as keys and a string of the default options as values. +diff --git a/test/rubygems/test_gem.rb b/test/rubygems/test_gem.rb +index 3225a05c6b..62b80c4945 100644 +--- a/test/rubygems/test_gem.rb ++++ b/test/rubygems/test_gem.rb +@@ -1799,6 +1799,13 @@ def test_use_gemdeps_specific + ENV['RUBYGEMS_GEMDEPS'] = rubygems_gemdeps + end + ++ def test_operating_system_defaults ++ operating_system_defaults = Gem.operating_system_defaults ++ ++ assert operating_system_defaults != nil ++ assert operating_system_defaults.is_a? Hash ++ end ++ + def test_platform_defaults + platform_defaults = Gem.platform_defaults + diff --git a/ruby.spec b/ruby.spec index bd86218..688879c 100644 --- a/ruby.spec +++ b/ruby.spec @@ -132,6 +132,9 @@ Patch7: ruby-2.2.3-Generate-preludes-using-miniruby.patch # 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 +# Add Gem.operating_system_defaults to allow packagers to override defaults. +# https://github.com/rubygems/rubygems/pull/2116 +Patch10: ruby-2.5.0-Add-Gem.operating_system_defaults.patch Requires: %{name}-libs%{?_isa} = %{version}-%{release} Suggests: rubypick @@ -512,6 +515,7 @@ rm -rf ext/fiddle/libffi* %patch6 -p1 %patch7 -p1 %patch9 -p1 +%patch10 -p1 # Provide an example of usage of the tapset: cp -a %{SOURCE3} . From 68b701514c37f75299fee732ac10ef06c1b4e07f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?V=C3=ADt=20Ondruch?= Date: Fri, 22 Dec 2017 15:06:13 +0100 Subject: [PATCH 19/23] Upgrade to Ruby 2.5.0 (r61414). --- ...-additional-preludes-by-configuratio.patch | 2 +- ...0-Enable-configuration-of-archlibdir.patch | 2 +- ...ed-paths-when-empty-version-string-i.patch | 2 +- ruby-2.1.0-always-use-i386.patch | 2 +- ruby-2.1.0-custom-rubygems-location.patch | 4 ++-- ...2.3-Generate-preludes-using-miniruby.patch | 2 +- ruby-2.3.0-ruby_version.patch | 6 +++--- ruby.spec | 21 +++++++++---------- 8 files changed, 20 insertions(+), 21 deletions(-) diff --git a/ruby-2.1.0-Allow-to-specify-additional-preludes-by-configuratio.patch b/ruby-2.1.0-Allow-to-specify-additional-preludes-by-configuratio.patch index da5eea6..66cb565 100644 --- a/ruby-2.1.0-Allow-to-specify-additional-preludes-by-configuratio.patch +++ b/ruby-2.1.0-Allow-to-specify-additional-preludes-by-configuratio.patch @@ -39,7 +39,7 @@ diff --git a/configure.ac b/configure.ac index 028ef7ca3e..cdeff87871 100644 --- a/configure.ac +++ b/configure.ac -@@ -4387,6 +4387,13 @@ AC_SUBST(rubyarchhdrdir)dnl +@@ -4395,6 +4395,13 @@ AC_SUBST(rubyarchhdrdir)dnl AC_SUBST(sitearchhdrdir)dnl AC_SUBST(vendorarchhdrdir)dnl diff --git a/ruby-2.1.0-Enable-configuration-of-archlibdir.patch b/ruby-2.1.0-Enable-configuration-of-archlibdir.patch index 09696d3..41444c5 100644 --- a/ruby-2.1.0-Enable-configuration-of-archlibdir.patch +++ b/ruby-2.1.0-Enable-configuration-of-archlibdir.patch @@ -11,7 +11,7 @@ diff --git a/configure.ac b/configure.ac index 11fc237552..b77e88fc37 100644 --- a/configure.ac +++ b/configure.ac -@@ -3632,6 +3632,11 @@ AS_IF([test ${multiarch+set}], [ +@@ -3640,6 +3640,11 @@ AS_IF([test ${multiarch+set}], [ ]) archlibdir='${libdir}/${arch}' diff --git a/ruby-2.1.0-Prevent-duplicated-paths-when-empty-version-string-i.patch b/ruby-2.1.0-Prevent-duplicated-paths-when-empty-version-string-i.patch index b306612..bdc074d 100644 --- a/ruby-2.1.0-Prevent-duplicated-paths-when-empty-version-string-i.patch +++ b/ruby-2.1.0-Prevent-duplicated-paths-when-empty-version-string-i.patch @@ -14,7 +14,7 @@ diff --git a/configure.ac b/configure.ac index 999e2d6d5d..11fc237552 100644 --- a/configure.ac +++ b/configure.ac -@@ -4242,7 +4242,8 @@ AS_CASE(["$ruby_version_dir_name"], +@@ -4250,7 +4250,8 @@ AS_CASE(["$ruby_version_dir_name"], ruby_version_dir=/'${ruby_version_dir_name}' if test -z "${ruby_version_dir_name}"; then diff --git a/ruby-2.1.0-always-use-i386.patch b/ruby-2.1.0-always-use-i386.patch index 1e51168..4864741 100644 --- a/ruby-2.1.0-always-use-i386.patch +++ b/ruby-2.1.0-always-use-i386.patch @@ -11,7 +11,7 @@ diff --git a/configure.ac b/configure.ac index b77e88fc37..6bba453e3c 100644 --- a/configure.ac +++ b/configure.ac -@@ -4306,6 +4306,8 @@ AC_SUBST(vendorarchdir)dnl +@@ -4314,6 +4314,8 @@ AC_SUBST(vendorarchdir)dnl AC_SUBST(CONFIGURE, "`echo $0 | sed 's|.*/||'`")dnl AC_SUBST(configure_args, "`echo "${ac_configure_args}" | sed 's/\\$/$$/g'`")dnl diff --git a/ruby-2.1.0-custom-rubygems-location.patch b/ruby-2.1.0-custom-rubygems-location.patch index 4ed79e6..cc55c4a 100644 --- a/ruby-2.1.0-custom-rubygems-location.patch +++ b/ruby-2.1.0-custom-rubygems-location.patch @@ -15,7 +15,7 @@ diff --git a/configure.ac b/configure.ac index 6bba453e3c..028ef7ca3e 100644 --- a/configure.ac +++ b/configure.ac -@@ -4278,6 +4278,10 @@ AC_ARG_WITH(vendorarchdir, +@@ -4286,6 +4286,10 @@ AC_ARG_WITH(vendorarchdir, [vendorarchdir=$withval], [vendorarchdir=${multiarch+'${rubysitearchprefix}/vendor_ruby'${ruby_version_dir}}${multiarch-'${vendorlibdir}/${sitearch}'}]) @@ -26,7 +26,7 @@ index 6bba453e3c..028ef7ca3e 100644 AS_IF([test "${LOAD_RELATIVE+set}"], [ AC_DEFINE_UNQUOTED(LOAD_RELATIVE, $LOAD_RELATIVE) RUBY_EXEC_PREFIX='' -@@ -4302,6 +4306,7 @@ AC_SUBST(sitearchdir)dnl +@@ -4310,6 +4314,7 @@ AC_SUBST(sitearchdir)dnl AC_SUBST(vendordir)dnl AC_SUBST(vendorlibdir)dnl AC_SUBST(vendorarchdir)dnl diff --git a/ruby-2.2.3-Generate-preludes-using-miniruby.patch b/ruby-2.2.3-Generate-preludes-using-miniruby.patch index 05fbaa6..ca66d28 100644 --- a/ruby-2.2.3-Generate-preludes-using-miniruby.patch +++ b/ruby-2.2.3-Generate-preludes-using-miniruby.patch @@ -11,7 +11,7 @@ diff --git a/common.mk b/common.mk index 168dc52..20c218a 100644 --- a/common.mk +++ b/common.mk -@@ -956,9 +956,9 @@ $(MINIPRELUDE_C): $(COMPILE_PRELUDE) +@@ -962,9 +962,9 @@ $(MINIPRELUDE_C): $(COMPILE_PRELUDE) $(srcdir)/template/prelude.c.tmpl $(PRELUDE_C): $(COMPILE_PRELUDE) \ diff --git a/ruby-2.3.0-ruby_version.patch b/ruby-2.3.0-ruby_version.patch index ee00a35..5e24003 100644 --- a/ruby-2.3.0-ruby_version.patch +++ b/ruby-2.3.0-ruby_version.patch @@ -20,7 +20,7 @@ diff --git a/configure.ac b/configure.ac index 8ea969412f..a00f2b6776 100644 --- a/configure.ac +++ b/configure.ac -@@ -4193,9 +4193,6 @@ AS_CASE(["$target_os"], +@@ -4201,9 +4201,6 @@ AS_CASE(["$target_os"], rubyw_install_name='$(RUBYW_INSTALL_NAME)' ]) @@ -30,7 +30,7 @@ index 8ea969412f..a00f2b6776 100644 rubyarchprefix=${multiarch+'${archlibdir}/${RUBY_BASE_NAME}'}${multiarch-'${rubylibprefix}/${arch}'} AC_ARG_WITH(rubyarchprefix, AS_HELP_STRING([--with-rubyarchprefix=DIR], -@@ -4218,56 +4215,62 @@ AC_ARG_WITH(ridir, +@@ -4226,56 +4223,62 @@ AC_ARG_WITH(ridir, AC_SUBST(ridir) AC_SUBST(RI_BASE_NAME) @@ -120,7 +120,7 @@ index 8ea969412f..a00f2b6776 100644 AS_IF([test "${LOAD_RELATIVE+set}"], [ AC_DEFINE_UNQUOTED(LOAD_RELATIVE, $LOAD_RELATIVE) -@@ -4284,6 +4287,7 @@ AC_SUBST(sitearchincludedir)dnl +@@ -4292,6 +4295,7 @@ AC_SUBST(sitearchincludedir)dnl AC_SUBST(arch)dnl AC_SUBST(sitearch)dnl AC_SUBST(ruby_version)dnl diff --git a/ruby.spec b/ruby.spec index 688879c..a4e0323 100644 --- a/ruby.spec +++ b/ruby.spec @@ -10,7 +10,7 @@ #%%global milestone rc1 # Keep the revision enabled for pre-releases from SVN. -%global revision 61214 +%global revision 61414 %global ruby_archive %{name}-%{ruby_version} @@ -37,15 +37,15 @@ %global irb_version %{ruby_version} %global bigdecimal_version 1.3.3 -%global bundler_version 1.16.1.pre1 -%global did_you_mean_version 1.1.2 +%global bundler_version 1.16.1 +%global did_you_mean_version 1.2.0 %global io_console_version 0.4.6 %global json_version 2.1.0 %global minitest_version 5.10.3 %global net_telnet_version 0.1.1 -%global openssl_version 2.1.0.beta2 +%global openssl_version 2.1.0 %global power_assert_version 1.1.1 -%global psych_version 3.0.0 +%global psych_version 3.0.2 %global rake_version 12.3.0 %global rdoc_version 6.0.0 %global test_unit_version 3.2.7 @@ -939,18 +939,17 @@ make check TESTS="-v $DISABLE_TESTS" %{gem_dir}/specifications/default/csv-1.0.0.gemspec %{gem_dir}/specifications/default/date-1.0.0.gemspec %{gem_dir}/specifications/default/dbm-1.0.0.gemspec -%{gem_dir}/specifications/default/digest-0.1.0.gemspec %{gem_dir}/specifications/default/etc-1.0.0.gemspec %{gem_dir}/specifications/default/fcntl-1.0.0.gemspec %{gem_dir}/specifications/default/fiddle-1.0.0.gemspec -%{gem_dir}/specifications/default/fileutils-1.0.1.gemspec +%{gem_dir}/specifications/default/fileutils-1.0.2.gemspec %{gem_dir}/specifications/default/gdbm-2.0.0.gemspec %{gem_dir}/specifications/default/ipaddr-1.2.0.gemspec %{gem_dir}/specifications/default/scanf-1.0.0.gemspec %{gem_dir}/specifications/default/sdbm-1.0.0.gemspec %{gem_dir}/specifications/default/stringio-0.0.1.gemspec -%{gem_dir}/specifications/default/strscan-0.0.1.gemspec -%{gem_dir}/specifications/default/webrick-1.4.0.beta1.gemspec +%{gem_dir}/specifications/default/strscan-1.0.0.gemspec +%{gem_dir}/specifications/default/webrick-1.4.1.gemspec %{gem_dir}/specifications/default/zlib-1.0.0.gemspec %files -n rubygems-devel @@ -1058,8 +1057,8 @@ make check TESTS="-v $DISABLE_TESTS" %{gem_dir}/specifications/xmlrpc-%{xmlrpc_version}.gemspec %changelog -* Tue Apr 11 2017 Vít Ondruch - 2.5.0-0.1.r61214 -- Upgrade to Ruby 2.5.0 (r61214). +* Tue Apr 11 2017 Vít Ondruch - 2.5.0-0.1.r61414 +- Upgrade to Ruby 2.5.0 (r61414). - Drop ruby-devel dependency on rubypick, which is pulled in transtitively. * Mon Apr 03 2017 Vít Ondruch - 2.4.1-79 From 4f43525d5d111ed2a394e8ff81354d8c648e36e1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?V=C3=ADt=20Ondruch?= Date: Tue, 2 Jan 2018 14:20:41 +0100 Subject: [PATCH 20/23] Make did_you_mean noarch. --- ruby.spec | 1 + 1 file changed, 1 insertion(+) diff --git a/ruby.spec b/ruby.spec index a4e0323..c629fd3 100644 --- a/ruby.spec +++ b/ruby.spec @@ -338,6 +338,7 @@ License: MIT Requires: ruby(release) Requires: ruby(rubygems) >= %{rubygems_version} Provides: rubygem(did_you_mean) = %{version}-%{release} +BuildArch: noarch %description -n rubygem-did_you_mean "did you mean?" experience in Ruby: the error message will tell you the right From fb9ff0c3294f1cf08d4842a936243f89e8affe66 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?V=C3=ADt=20Ondruch?= Date: Tue, 2 Jan 2018 14:21:15 +0100 Subject: [PATCH 21/23] Make net-telnet noarch. --- ruby.spec | 1 + 1 file changed, 1 insertion(+) diff --git a/ruby.spec b/ruby.spec index c629fd3..b8a6afb 100644 --- a/ruby.spec +++ b/ruby.spec @@ -453,6 +453,7 @@ Group: Development/Libraries Requires: ruby(release) Requires: ruby(rubygems) >= %{rubygems_version} Provides: rubygem(net-telnet) = %{version}-%{release} +BuildArch: noarch %description -n rubygem-net-telnet Provides telnet client functionality. From 7fb860c8916439ae64fd3455cee13664cee19efe Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?V=C3=ADt=20Ondruch?= Date: Tue, 2 Jan 2018 14:23:07 +0100 Subject: [PATCH 22/23] Restructure Molinillo version check a bit. --- ruby.spec | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) diff --git a/ruby.spec b/ruby.spec index b8a6afb..8919ddb 100644 --- a/ruby.spec +++ b/ruby.spec @@ -220,7 +220,6 @@ Requires: rubygem(psych) >= %{psych_version} Provides: gem = %{version}-%{release} Provides: ruby(rubygems) = %{version}-%{release} # https://github.com/rubygems/rubygems/pull/1189#issuecomment-121600910 -Provides: bundled(rubygem(molinillo)) = %{molinillo_version} Provides: bundled(rubygem-molinillo) = %{molinillo_version} BuildArch: noarch @@ -708,12 +707,19 @@ checksec -f libruby.so.%{ruby_version} | \ grep "Full RELRO.*Canary found.*NX enabled.*DSO.*No RPATH.*No RUNPATH.*Yes.*\d*.*\d*.*libruby.so.%{ruby_version}" %endif -# Check RubyGems version correctness. +# Check RubyGems version. [ "`make runruby TESTRUN_SCRIPT='bin/gem -v' | tail -1`" == '%{rubygems_version}' ] -# Check Molinillo version correctness. -[ "`make runruby TESTRUN_SCRIPT=\"-e \\\"module Gem; module Resolver; end; end; require 'rubygems/resolver/molinillo/lib/molinillo/gem_metadata'; puts Gem::Resolver::Molinillo::VERSION\\\"\" | tail -1`" \ + +# Check Rubygems bundled dependencies versions. + +# Molinillo. +[ "`make runruby TESTRUN_SCRIPT=\"-e \\\" \ + module Gem; module Resolver; end; end; \ + require 'rubygems/resolver/molinillo/lib/molinillo/gem_metadata'; \ + puts Gem::Resolver::Molinillo::VERSION\\\"\" | tail -1`" \ == '%{molinillo_version}' ] + # test_debug(TestRubyOptions) fails due to LoadError reported in debug mode, # when abrt.rb cannot be required (seems to be easier way then customizing # the test suite). From 9923c26003893c6bb414e261c3be1a8449eaa32d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?V=C3=ADt=20Ondruch?= Date: Tue, 2 Jan 2018 15:09:38 +0100 Subject: [PATCH 23/23] Upgrade to Ruby 2.5.0. --- ....0-Add-Gem.operating_system_defaults.patch | 2 +- ruby.spec | 21 +++++++------------ 2 files changed, 8 insertions(+), 15 deletions(-) diff --git a/ruby-2.5.0-Add-Gem.operating_system_defaults.patch b/ruby-2.5.0-Add-Gem.operating_system_defaults.patch index fb648b9..6838701 100644 --- a/ruby-2.5.0-Add-Gem.operating_system_defaults.patch +++ b/ruby-2.5.0-Add-Gem.operating_system_defaults.patch @@ -64,7 +64,7 @@ diff --git a/test/rubygems/test_gem.rb b/test/rubygems/test_gem.rb index 3225a05c6b..62b80c4945 100644 --- a/test/rubygems/test_gem.rb +++ b/test/rubygems/test_gem.rb -@@ -1799,6 +1799,13 @@ def test_use_gemdeps_specific +@@ -1802,6 +1802,13 @@ def test_use_gemdeps_specific ENV['RUBYGEMS_GEMDEPS'] = rubygems_gemdeps end diff --git a/ruby.spec b/ruby.spec index 8919ddb..ebc8173 100644 --- a/ruby.spec +++ b/ruby.spec @@ -10,7 +10,7 @@ #%%global milestone rc1 # Keep the revision enabled for pre-releases from SVN. -%global revision 61414 +#%%global revision 61414 %global ruby_archive %{name}-%{ruby_version} @@ -21,7 +21,7 @@ %endif -%global release 1 +%global release 86 %{!?release_string:%global release_string %{?development_release:0.}%{release}%{?development_release:.%{development_release}}%{?dist}} # The RubyGems library has to stay out of Ruby directory three, since the @@ -36,8 +36,7 @@ # http://redmine.ruby-lang.org/issues/5313 %global irb_version %{ruby_version} -%global bigdecimal_version 1.3.3 -%global bundler_version 1.16.1 +%global bigdecimal_version 1.3.4 %global did_you_mean_version 1.2.0 %global io_console_version 0.4.6 %global json_version 2.1.0 @@ -47,7 +46,7 @@ %global power_assert_version 1.1.1 %global psych_version 3.0.2 %global rake_version 12.3.0 -%global rdoc_version 6.0.0 +%global rdoc_version 6.0.1 %global test_unit_version 3.2.7 %global xmlrpc_version 0.3.0 @@ -662,12 +661,6 @@ ln -s %{gem_dir}/gems/psych-%{psych_version}/lib/psych %{buildroot}%{ruby_libdir ln -s %{gem_dir}/gems/psych-%{psych_version}/lib/psych.rb %{buildroot}%{ruby_libdir}/psych.rb ln -s %{_libdir}/gems/%{name}/psych-%{psych_version}/psych.so %{buildroot}%{ruby_libarchdir}/psych.so -# Remove Bundler until it is really necessary. -rm -rf %{buildroot}%{ruby_libdir}/bundler -rm -rf %{buildroot}%{gem_dir}/gems/bundler-%{bundler_version} -rm -rf %{buildroot}%{gem_dir}/specifications/default/bundler-%{bundler_version}.gemspec -rm %{buildroot}%{_bindir}/bundle* - # Move the binary extensions into proper place (if no gem has binary extension, # the extensions directory might be empty). find %{buildroot}%{gem_dir}/extensions/*-%{_target_os}/%{ruby_version}/* -maxdepth 0 \ @@ -957,7 +950,7 @@ make check TESTS="-v $DISABLE_TESTS" %{gem_dir}/specifications/default/sdbm-1.0.0.gemspec %{gem_dir}/specifications/default/stringio-0.0.1.gemspec %{gem_dir}/specifications/default/strscan-1.0.0.gemspec -%{gem_dir}/specifications/default/webrick-1.4.1.gemspec +%{gem_dir}/specifications/default/webrick-1.4.2.gemspec %{gem_dir}/specifications/default/zlib-1.0.0.gemspec %files -n rubygems-devel @@ -1065,8 +1058,8 @@ make check TESTS="-v $DISABLE_TESTS" %{gem_dir}/specifications/xmlrpc-%{xmlrpc_version}.gemspec %changelog -* Tue Apr 11 2017 Vít Ondruch - 2.5.0-0.1.r61414 -- Upgrade to Ruby 2.5.0 (r61414). +* Tue Jan 02 2018 Vít Ondruch - 2.5.0-1 +- Upgrade to Ruby 2.5.0. - Drop ruby-devel dependency on rubypick, which is pulled in transtitively. * Mon Apr 03 2017 Vít Ondruch - 2.4.1-79