Accepting request 38548 from devel:languages:ruby
Copy from devel:languages:ruby/ruby based on submit request 38548 from user darix OBS-URL: https://build.opensuse.org/request/show/38548 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/ruby?expand=0&rev=15
This commit is contained in:
parent
6d4212444a
commit
0109ca3d5a
1465
ruby-1.8.x_openssl-1.0-tests.patch
Normal file
1465
ruby-1.8.x_openssl-1.0-tests.patch
Normal file
File diff suppressed because it is too large
Load Diff
3407
ruby-1.8.x_openssl-1.0.patch
Normal file
3407
ruby-1.8.x_openssl-1.0.patch
Normal file
File diff suppressed because it is too large
Load Diff
37
ruby-1.8.x_yaml2byte.patch
Normal file
37
ruby-1.8.x_yaml2byte.patch
Normal file
@ -0,0 +1,37 @@
|
||||
I: Program causes undefined operation
|
||||
(likely same variable used twiceand post/pre incremented in the same expression).
|
||||
e.g. x = x++; Split it in two operations.
|
||||
W: ruby sequence-point yaml2byte.c:67, 104
|
||||
|
||||
yaml2byte.c: In function 'bytestring_append':
|
||||
yaml2byte.c:67:21: warning: operation on 'str->buffer' may be undefined
|
||||
yaml2byte.c: In function 'bytestring_extend':
|
||||
yaml2byte.c:104:25: warning: operation on 'str->buffer' may be undefined
|
||||
|
||||
#define S_REALLOC_N(var,type,n) (var)=(type*)realloc((char*)(var),sizeof(type)*(n))
|
||||
|
||||
so the old code expanded to:
|
||||
str->buffer = str->buffer = (char*)realloc((char*)str->buffer, sizeof(char)*str->length + 1)
|
||||
|
||||
Index: ext/syck/yaml2byte.c
|
||||
===================================================================
|
||||
--- ext/syck/yaml2byte.c (revision 27446)
|
||||
+++ ext/syck/yaml2byte.c (working copy)
|
||||
@@ -64,7 +64,7 @@
|
||||
grow = (length - str->remaining) + CHUNKSIZE;
|
||||
str->remaining += grow;
|
||||
str->length += grow;
|
||||
- str->buffer = S_REALLOC_N( str->buffer, char, str->length + 1 );
|
||||
+ S_REALLOC_N( str->buffer, char, str->length + 1 );
|
||||
assert(str->buffer);
|
||||
}
|
||||
curr = str->buffer + (str->length - str->remaining);
|
||||
@@ -101,7 +101,7 @@
|
||||
grow = (length - str->remaining) + CHUNKSIZE;
|
||||
str->remaining += grow;
|
||||
str->length += grow;
|
||||
- str->buffer = S_REALLOC_N( str->buffer, char, str->length + 1 );
|
||||
+ S_REALLOC_N( str->buffer, char, str->length + 1 );
|
||||
}
|
||||
curr = str->buffer + (str->length - str->remaining);
|
||||
from = ext->buffer;
|
15
ruby.changes
15
ruby.changes
@ -1,3 +1,18 @@
|
||||
-------------------------------------------------------------------
|
||||
Thu Apr 22 22:06:56 UTC 2010 - mrueckert@suse.de
|
||||
|
||||
- added ruby-1.8.x_openssl-1.0.patch and
|
||||
ruby-1.8.x_openssl-1.0-tests.patch:
|
||||
fix building with openssl 1.0.0 (taken from svn)
|
||||
- added ruby-1.8.x_yaml2byte.patch:
|
||||
fix warning about sequence point
|
||||
- remove requires on glibc-devel again
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Sat Mar 13 21:25:30 UTC 2010 - crrodriguez@opensuse.org
|
||||
|
||||
- ruby-devel requires glibc-devel
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Tue Feb 23 12:02:11 UTC 2010 - mrueckert@suse.de
|
||||
|
||||
|
@ -20,7 +20,7 @@
|
||||
|
||||
Name: ruby
|
||||
Version: 1.8.7.p249
|
||||
Release: 1
|
||||
Release: 2
|
||||
#
|
||||
%define pkg_version 1.8.7
|
||||
%define patch_level p249
|
||||
@ -64,6 +64,9 @@ Patch7: ruby-1.8.7-p72_vendor_specific.patch
|
||||
Patch8: ruby-1.8.7-p72_topdir.patch
|
||||
# can be removed on next version update. pulled from svn
|
||||
Patch9: ruby-1.8.x_digest_non_void_return.patch
|
||||
Patch10: ruby-1.8.x_openssl-1.0.patch
|
||||
Patch11: ruby-1.8.x_openssl-1.0-tests.patch
|
||||
Patch12: ruby-1.8.x_yaml2byte.patch
|
||||
# vendor ruby files taken from:
|
||||
# http://svn.macports.org/repository/macports/trunk/dports/lang/ruby/
|
||||
Source3: site-specific.rb
|
||||
@ -246,6 +249,9 @@ Authors:
|
||||
%patch7
|
||||
%patch8
|
||||
%patch9
|
||||
%patch10
|
||||
%patch11
|
||||
%patch12
|
||||
%if 0%{?with_bleak_house}
|
||||
for patch in valgrind configure gc ; do
|
||||
patch -p0 < bleak_house-%{bleak_house_version}/ruby/${patch}.patch
|
||||
|
Loading…
x
Reference in New Issue
Block a user