rpms/ruby
3
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Upgrade to Ruby 2.7.0 (4a403e3f98).

Browse source
This commit is contained in:
Vít Ondruch 2019-09-16 14:24:00 +02:00
commit 55a4aeae8f
9 changed files with 23 additions and 16 deletions
Download patch file Download diff file Expand all files Collapse all files

2
ruby-2.1.0-Allow-to-specify-additional-preludes-by-configuratio.patch
View file

@ -26,7 +26,7 @@ diff --git a/configure.ac b/configure.ac
index 028ef7ca3e..cdeff87871 100644
--- a/configure.ac
+++ b/configure.ac
@@ -3846,6 +3846,13 @@ AC_SUBST(rubyarchhdrdir)dnl
@@ -3865,6 +3865,13 @@ AC_SUBST(rubyarchhdrdir)dnl
AC_SUBST(sitearchhdrdir)dnl
AC_SUBST(vendorarchhdrdir)dnl

2
ruby-2.1.0-Enable-configuration-of-archlibdir.patch
View file

@ -11,7 +11,7 @@ diff --git a/configure.ac b/configure.ac
index d261ea57b5..3c13076b82 100644
--- a/configure.ac
+++ b/configure.ac
@@ -3063,6 +3063,11 @@ AS_IF([test ${multiarch+set}], [
@@ -3082,6 +3082,11 @@ AS_IF([test ${multiarch+set}], [
])
archlibdir='${libdir}/${arch}'

2
ruby-2.1.0-Prevent-duplicated-paths-when-empty-version-string-i.patch
View file

@ -14,7 +14,7 @@ diff --git a/configure.ac b/configure.ac
index c42436c23d..d261ea57b5 100644
--- a/configure.ac
+++ b/configure.ac
@@ -3701,7 +3701,8 @@ AS_CASE(["$ruby_version_dir_name"],
@@ -3720,7 +3720,8 @@ AS_CASE(["$ruby_version_dir_name"],
ruby_version_dir=/'${ruby_version_dir_name}'
if test -z "${ruby_version_dir_name}"; then

2
ruby-2.1.0-always-use-i386.patch
View file

@ -11,7 +11,7 @@ diff --git a/configure.ac b/configure.ac
index 3c13076b82..93af30321d 100644
--- a/configure.ac
+++ b/configure.ac
@@ -3765,6 +3765,8 @@ AC_SUBST(vendorarchdir)dnl
@@ -3784,6 +3784,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

4
ruby-2.1.0-custom-rubygems-location.patch
View file

@ -15,7 +15,7 @@ diff --git a/configure.ac b/configure.ac
index 93af30321d..bc13397e0e 100644
--- a/configure.ac
+++ b/configure.ac
@@ -3737,6 +3737,10 @@ AC_ARG_WITH(vendorarchdir,
@@ -3756,6 +3756,10 @@ AC_ARG_WITH(vendorarchdir,
[vendorarchdir=$withval],
[vendorarchdir=${multiarch+'${rubysitearchprefix}/vendor_ruby'${ruby_version_dir}}${multiarch-'${vendorlibdir}/${sitearch}'}])
@ -26,7 +26,7 @@ index 93af30321d..bc13397e0e 100644
AS_IF([test "${LOAD_RELATIVE+set}"], [
AC_DEFINE_UNQUOTED(LOAD_RELATIVE, $LOAD_RELATIVE)
RUBY_EXEC_PREFIX=''
@@ -3761,6 +3765,7 @@ AC_SUBST(sitearchdir)dnl
@@ -3780,6 +3784,7 @@ AC_SUBST(sitearchdir)dnl
AC_SUBST(vendordir)dnl
AC_SUBST(vendorlibdir)dnl
AC_SUBST(vendorarchdir)dnl

6
ruby-2.3.0-ruby_version.patch
View file

@ -20,7 +20,7 @@ diff --git a/configure.ac b/configure.ac
index 80b137e380..63cd3b4f8b 100644
--- a/configure.ac
+++ b/configure.ac
@@ -3652,9 +3652,6 @@ AS_CASE(["$target_os"],
@@ -3671,9 +3671,6 @@ AS_CASE(["$target_os"],
rubyw_install_name='$(RUBYW_INSTALL_NAME)'
])
@ -30,7 +30,7 @@ index 80b137e380..63cd3b4f8b 100644
rubyarchprefix=${multiarch+'${archlibdir}/${RUBY_BASE_NAME}'}${multiarch-'${rubylibprefix}/${arch}'}
AC_ARG_WITH(rubyarchprefix,
AS_HELP_STRING([--with-rubyarchprefix=DIR],
@@ -3677,56 +3674,62 @@ AC_ARG_WITH(ridir,
@@ -3696,56 +3693,62 @@ AC_ARG_WITH(ridir,
AC_SUBST(ridir)
AC_SUBST(RI_BASE_NAME)
@ -120,7 +120,7 @@ index 80b137e380..63cd3b4f8b 100644
AS_IF([test "${LOAD_RELATIVE+set}"], [
AC_DEFINE_UNQUOTED(LOAD_RELATIVE, $LOAD_RELATIVE)
@@ -3743,6 +3746,7 @@ AC_SUBST(sitearchincludedir)dnl
@@ -3762,6 +3765,7 @@ AC_SUBST(sitearchincludedir)dnl
AC_SUBST(arch)dnl
AC_SUBST(sitearch)dnl
AC_SUBST(ruby_version)dnl

13
ruby-2.3.1-Rely-on-ldd-to-detect-glibc.patch
View file

@ -8,14 +8,14 @@ on Red Hat platforms.
This workaround rhbz#1361037
---
test/fiddle/helper.rb | 89 -------------------------------------------
1 file changed, 89 deletions(-)
test/fiddle/helper.rb | 96 -------------------------------------------
1 file changed, 96 deletions(-)
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,95 +6,6 @@
@@ -6,102 +6,6 @@
libc_so = libm_so = nil
@ -23,6 +23,13 @@ index 1da3d93..65148a1 100644
-when /cygwin/
- libc_so = "cygwin1.dll"
- libm_so = "cygwin1.dll"
-when /android/
- libdir = '/system/lib'
- if [0].pack('L!').size == 8
- libdir = '/system/lib64'
- end
- libc_so = File.join(libdir, "libc.so")
- libm_so = File.join(libdir, "libm.so")
-when /linux/
- libdir = '/lib'
- case [0].pack('L!').size

4
ruby-2.7.0-Remove-RubyGems-dependency.patch
View file

@ -6,14 +6,14 @@ Subject: [PATCH] Remove RubyGems dependency.
Since `Process::RLIMIT_NOFILE` is platform specific, better to use Ruby
introspection than detecting platform.
---
lib/net/http/persistent.rb | 6 +++---
.../vendor/net-http-persistent/lib/net/http/persistent.rb | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/lib/bundler/vendor/net-http-persistent/lib/net/http/persistent.rb b/lib/bundler/vendor/net-http-persistent/lib/net/http/persistent.rb
index a54be2a..06739f1 100644
--- a/lib/bundler/vendor/net-http-persistent/lib/net/http/persistent.rb
+++ b/lib/bundler/vendor/net-http-persistent/lib/net/http/persistent.rb
@@ -202,10 +202,10 @@ class Net::HTTP::Persistent
@@ -202,10 +202,10 @@ class Bundler::Persistent::Net::HTTP::Persistent
##
# The default connection pool size is 1/4 the allowed open files.

4
ruby.spec
View file

@ -10,7 +10,7 @@
#%%global milestone rc2
# Keep the revision enabled for pre-releases from SVN.
%global revision 36a0c668b6
%global revision 4a403e3f98
%global ruby_archive %{name}-%{ruby_version}
@ -1221,7 +1221,7 @@ make check TESTS="-v $DISABLE_TESTS" MSPECOPT="-fs $MSPECOPTS"
%changelog
* Mon Jul 01 2019 Vít Ondruch <vondruch@redhat.com> - 2.7.0-1
- Upgrade to Ruby 2.7.0 (36a0c668b6).
- Upgrade to Ruby 2.7.0 (4a403e3f98).
- Drop useless %%{rubygems_default_filter}.
- Fix checksec 2.0+ compatibility.