pool/ruby
SHA256
4
0
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

- update to 1.8.7.p352

Browse Source 
- support for openssl compiled without SSLv2
  - multilib support for tk build
  - some IPv6 related fixes
  - zlib fixes
  - reinitialize PRNG when forking children
  - uri route_to fixes
  - fix race condition with variables and autoload
- drop 1887f60a8540f64f5c7bb14d57c0be70506941b8.patch
  included upstream
- drop ruby-1.8.7.p22_tcltk-multilib.patch
  solved differently upstream

OBS-URL: https://build.opensuse.org/package/show/devel:languages:ruby/ruby?expand=0&rev=23
This commit is contained in:
Marcus Rückert 2011-07-07 13:22:26 +00:00 committed by Git OBS Bridge
parent ab36bbb8f6
commit ede0f5a2ef
6 changed files with 21 additions and 64 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
1887f60a8540f64f5c7bb14d57c0be70506941b8.patch
View File

@ -1,24 +0,0 @@
From 1887f60a8540f64f5c7bb14d57c0be70506941b8 Mon Sep 17 00:00:00 2001
From: mame <mame@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>
Date: Sat, 29 May 2010 17:22:46 +0000
Subject: [PATCH] * ext/zlib/zlib.c (zstream_append_input2): add RB_GC_GUARD.
This caused failure when test/csv is executed with GC.stress = true.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@28080 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
---
ChangeLog | 5 +++++
ext/zlib/zlib.c | 1 +
2 files changed, 6 insertions(+), 0 deletions(-)
Index: ext/zlib/zlib.c
===================================================================
--- ext/zlib/zlib.c.orig
+++ ext/zlib/zlib.c
@@ -610,6 +610,7 @@ zstream_append_input(z, src, len)
}
#define zstream_append_input2(z,v)\
+ RB_GC_GUARD(v),\
zstream_append_input((z), RSTRING(v)->ptr, RSTRING(v)->len)
static void

3
ruby-1.8.7-p334.tar.bz2
View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:3e7f1a15fb2c205ac9eb0da804983b83bf8c0ffeb2f146d1eb9e0579ea2507da
size 4190857

3
ruby-1.8.7-p352.tar.bz2 Normal file
View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:9df4e9108387f7d24a6ab8950984d0c0f8cdbc1dad63194e744f1a176d1c5576
size 4207576

31
ruby-1.8.7.p22_tcltk-multilib.patch
View File

@ -1,31 +0,0 @@
Index: ext/tk/extconf.rb
===================================================================
--- ext/tk/extconf.rb.orig 2008-04-09 16:15:24.000000000 +0200
+++ ext/tk/extconf.rb 2008-06-21 04:29:14.717425749 +0200
@@ -95,7 +95,7 @@ def check_tcltk_version(version)
end
def find_tcl(tcllib, stubs, version, *opt_paths)
- default_paths = ["/usr/local/lib", "/usr/pkg/lib", "/usr/lib"]
+ default_paths = ["/usr/local/lib64", "/usr/local/lib", "/usr/pkg/lib64", "/usr/pkg/lib", "/usr/lib64", "/usr/lib"]
default_paths << "/Tcl/lib" # default for ActiveTcl
if (paths = opt_paths.compact).empty?
@@ -138,7 +138,7 @@ def find_tcl(tcllib, stubs, version, *op
end
def find_tk(tklib, stubs, version, *opt_paths)
- default_paths = ["/usr/local/lib", "/usr/pkg/lib", "/usr/lib"]
+ default_paths = ["/usr/local/lib64", "/usr/local/lib", "/usr/pkg/lib64", "/usr/pkg/lib", "/usr/lib64", "/usr/lib"]
default_paths << "/Tcl/lib" # default for ActiveTcl
if (paths = opt_paths.compact).empty?
@@ -182,7 +182,7 @@ end
def find_X11(*opt_paths)
default_paths =
- [ "/usr/X11/lib", "/usr/lib/X11", "/usr/X11R6/lib", "/usr/openwin/lib" ]
+ [ "/usr/X11/lib64", "/usr/X11/lib", "/usr/lib64/X11", "/usr/lib/X11", "/usr/X11R6/lib64", "/usr/X11R6/lib", "/usr/openwin/lib64", "/usr/openwin/lib" ]
paths = opt_paths.compact.concat(default_paths)
st = find_library("X11", "XOpenDisplay", *paths)
unless st

16
ruby.changes
View File

@ -1,3 +1,19 @@
-------------------------------------------------------------------
Thu Jul 7 13:02:17 UTC 2011 - mrueckert@suse.com
- update to 1.8.7.p352
- support for openssl compiled without SSLv2
- multilib support for tk build
- some IPv6 related fixes
- zlib fixes
- reinitialize PRNG when forking children
- uri route_to fixes
- fix race condition with variables and autoload
- drop 1887f60a8540f64f5c7bb14d57c0be70506941b8.patch
included upstream
- drop ruby-1.8.7.p22_tcltk-multilib.patch
solved differently upstream
-------------------------------------------------------------------
Fri May 20 13:26:07 UTC 2011 - mrueckert@suse.de

8
ruby.spec
View File

@ -18,11 +18,11 @@
# norootforbuild
Name: ruby
Version: 1.8.7.p334
Version: 1.8.7.p352
Release: 0
#
%define pkg_version 1.8.7
%define patch_level p334
%define patch_level p352
%define rb_arch %(echo %{_target_cpu}-linux | sed -e "s/i686/i586/" -e "s/hppa2.0/hppa/" -e "s/ppc/powerpc/")
%define rb_ver %(echo %{pkg_version} | sed -e 's/\\\.[0-9]\\\+$//')
#
@ -58,7 +58,6 @@ Source: ftp://ftp.ruby-lang.org/pub/ruby/ruby-%{pkg_version}-%{patch_lev
Source1: irb.1
Source2: ruby-doc-bundle.tar.bz2
Patch1: ruby-1.8.7.p299_lib64.patch
Patch2: ruby-1.8.7.p22_tcltk-multilib.patch
Patch5: ruby-1.8.7.p299_date_remove_privat.patch
Patch6: ruby-1.8.7.p299_pedantic-headers.patch
Patch7: ruby-1.8.7.p72_vendor_specific.patch
@ -67,7 +66,6 @@ Patch9: ruby-1.8.x_digest_non_void_return.patch
# can be removed on next version update. pulled from svn
Patch10: ruby-1.8.x_openssl_branch_update.patch
Patch11: ruby-1.8.x_yaml2byte.patch
Patch12: 1887f60a8540f64f5c7bb14d57c0be70506941b8.patch
Patch13: ruby-1.8.7.p334_remove_zlib_test_params_test.patch
Patch14: ruby-1.8.x_rubylibdir.patch
# vendor ruby files taken from:
@ -240,7 +238,6 @@ Authors:
%prep
%setup -q -n ruby-%{pkg_version}-%{patch_level} -a2 %{?with_bleak_house:-a6}
%patch1
%patch2
%patch5
%patch6
%patch7
@ -248,7 +245,6 @@ Authors:
%patch9
%patch10
%patch11
%patch12
%patch13
%patch14
%if 0%{?with_bleak_house}