OBS User unknown 2008-05-17 18:57:46 +00:00 committed by Git OBS Bridge
parent a13742c744
commit d5d4ef27be
9 changed files with 282 additions and 177 deletions

3
ruby-1.8.6-p114.tar.bz2 Normal file
View File

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

View File

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

View File

@ -1,8 +1,8 @@
Index: configure.in Index: configure.in
=================================================================== ===================================================================
--- configure.in.orig --- configure.in.orig 2007-12-06 18:22:54.000000000 +0100
+++ configure.in +++ configure.in 2007-12-06 18:22:56.666955357 +0100
@@ -1571,9 +1571,28 @@ AC_DEFINE_UNQUOTED(RUBY_LIB, "${RUBY_LIB @@ -1575,9 +1575,28 @@ AC_DEFINE_UNQUOTED(RUBY_LIB, "${RUBY_LIB
AC_DEFINE_UNQUOTED(RUBY_SITE_LIB, "${RUBY_SITE_LIB_PATH}") AC_DEFINE_UNQUOTED(RUBY_SITE_LIB, "${RUBY_SITE_LIB_PATH}")
AC_DEFINE_UNQUOTED(RUBY_SITE_LIB2, "${RUBY_SITE_LIB_PATH2}") AC_DEFINE_UNQUOTED(RUBY_SITE_LIB2, "${RUBY_SITE_LIB_PATH2}")
@ -31,7 +31,7 @@ Index: configure.in
configure_args=$ac_configure_args configure_args=$ac_configure_args
AC_SUBST(configure_args)dnl AC_SUBST(configure_args)dnl
@@ -1586,6 +1605,8 @@ if test "$fat_binary" != no ; then @@ -1590,6 +1609,8 @@ if test "$fat_binary" != no ; then
AC_DEFINE_UNQUOTED(RUBY_SITE_THIN_ARCHLIB, AC_DEFINE_UNQUOTED(RUBY_SITE_THIN_ARCHLIB,
"${RUBY_SITE_LIB_PATH}/" __ARCHITECTURE__ "-${target_os}") "${RUBY_SITE_LIB_PATH}/" __ARCHITECTURE__ "-${target_os}")
@ -40,7 +40,7 @@ Index: configure.in
AC_DEFINE_UNQUOTED(RUBY_PLATFORM, __ARCHITECTURE__ "-${target_os}") AC_DEFINE_UNQUOTED(RUBY_PLATFORM, __ARCHITECTURE__ "-${target_os}")
else else
arch="${target_cpu}-${target_os}" arch="${target_cpu}-${target_os}"
@@ -1593,12 +1614,15 @@ else @@ -1597,12 +1618,15 @@ else
fi fi
case "$target_os" in case "$target_os" in
@ -60,8 +60,8 @@ Index: configure.in
[ --with-search-path=DIR specify the additional search path], [ --with-search-path=DIR specify the additional search path],
Index: instruby.rb Index: instruby.rb
=================================================================== ===================================================================
--- instruby.rb.orig --- instruby.rb.orig 2007-02-13 00:01:19.000000000 +0100
+++ instruby.rb +++ instruby.rb 2007-12-06 18:22:56.670955599 +0100
@@ -162,6 +162,8 @@ rubylibdir = CONFIG["rubylibdir"] @@ -162,6 +162,8 @@ rubylibdir = CONFIG["rubylibdir"]
archlibdir = CONFIG["archdir"] archlibdir = CONFIG["archdir"]
sitelibdir = CONFIG["sitelibdir"] sitelibdir = CONFIG["sitelibdir"]
@ -91,8 +91,8 @@ Index: instruby.rb
end end
Index: Makefile.in Index: Makefile.in
=================================================================== ===================================================================
--- Makefile.in.orig --- Makefile.in.orig 2007-02-13 00:01:19.000000000 +0100
+++ Makefile.in +++ Makefile.in 2007-12-06 18:22:56.702957532 +0100
@@ -24,6 +24,8 @@ datadir = @datadir@ @@ -24,6 +24,8 @@ datadir = @datadir@
arch = @arch@ arch = @arch@
sitearch = @sitearch@ sitearch = @sitearch@
@ -104,8 +104,8 @@ Index: Makefile.in
TESTS = TESTS =
Index: mkconfig.rb Index: mkconfig.rb
=================================================================== ===================================================================
--- mkconfig.rb.orig --- mkconfig.rb.orig 2007-02-28 20:10:44.000000000 +0100
+++ mkconfig.rb +++ mkconfig.rb 2007-12-06 18:22:56.726958982 +0100
@@ -143,6 +143,14 @@ print <<EOS @@ -143,6 +143,14 @@ print <<EOS
CONFIG["archdir"] = "$(rubylibdir)/$(arch)" CONFIG["archdir"] = "$(rubylibdir)/$(arch)"
CONFIG["sitelibdir"] = "$(sitedir)/$(ruby_version)" CONFIG["sitelibdir"] = "$(sitedir)/$(ruby_version)"
@ -123,8 +123,8 @@ Index: mkconfig.rb
CONFIG.each{|k,v| MAKEFILE_CONFIG[k] = v.dup} CONFIG.each{|k,v| MAKEFILE_CONFIG[k] = v.dup}
Index: lib/mkmf.rb Index: lib/mkmf.rb
=================================================================== ===================================================================
--- lib/mkmf.rb.orig --- lib/mkmf.rb.orig 2007-08-22 04:24:49.000000000 +0200
+++ lib/mkmf.rb +++ lib/mkmf.rb 2007-12-06 18:22:56.758960916 +0100
@@ -51,6 +51,9 @@ $archdir = CONFIG["archdir"] @@ -51,6 +51,9 @@ $archdir = CONFIG["archdir"]
$sitedir = CONFIG["sitedir"] $sitedir = CONFIG["sitedir"]
$sitelibdir = CONFIG["sitelibdir"] $sitelibdir = CONFIG["sitelibdir"]
@ -135,7 +135,7 @@ Index: lib/mkmf.rb
$mswin = /mswin/ =~ RUBY_PLATFORM $mswin = /mswin/ =~ RUBY_PLATFORM
$bccwin = /bccwin/ =~ RUBY_PLATFORM $bccwin = /bccwin/ =~ RUBY_PLATFORM
@@ -1095,6 +1103,7 @@ RUBY_INSTALL_NAME = #{CONFIG['RUBY_INSTA @@ -1097,6 +1100,7 @@ RUBY_INSTALL_NAME = #{CONFIG['RUBY_INSTA
RUBY_SO_NAME = #{CONFIG['RUBY_SO_NAME']} RUBY_SO_NAME = #{CONFIG['RUBY_SO_NAME']}
arch = #{CONFIG['arch']} arch = #{CONFIG['arch']}
sitearch = #{CONFIG['sitearch']} sitearch = #{CONFIG['sitearch']}
@ -145,19 +145,19 @@ Index: lib/mkmf.rb
RUBY = $(ruby#{sep}) RUBY = $(ruby#{sep})
Index: ruby.c Index: ruby.c
=================================================================== ===================================================================
--- ruby.c.orig --- ruby.c.orig 2007-09-16 21:52:55.000000000 +0200
+++ ruby.c +++ ruby.c 2007-12-06 18:24:23.784218798 +0100
@@ -298,6 +298,13 @@ ruby_init_loadpath() @@ -322,6 +322,13 @@ ruby_init_loadpath()
ruby_incpush(RUBY_RELATIVE(RUBY_SITE_ARCHLIB)); incpush(RUBY_RELATIVE(RUBY_SITE_ARCHLIB));
ruby_incpush(RUBY_RELATIVE(RUBY_SITE_LIB)); incpush(RUBY_RELATIVE(RUBY_SITE_LIB));
+ ruby_incpush(RUBY_RELATIVE(RUBY_VENDOR_LIB2)); + incpush(RUBY_RELATIVE(RUBY_VENDOR_LIB2));
+#ifdef RUBY_VENDOR_THIN_ARCHLIB +#ifdef RUBY_VENDOR_THIN_ARCHLIB
+ ruby_incpush(RUBY_RELATIVE(RUBY_VENDOR_THIN_ARCHLIB)); + incpush(RUBY_RELATIVE(RUBY_VENDOR_THIN_ARCHLIB));
+#endif +#endif
+ ruby_incpush(RUBY_RELATIVE(RUBY_VENDOR_ARCHLIB)); + incpush(RUBY_RELATIVE(RUBY_VENDOR_ARCHLIB));
+ ruby_incpush(RUBY_RELATIVE(RUBY_VENDOR_LIB)); + incpush(RUBY_RELATIVE(RUBY_VENDOR_LIB));
+ +
ruby_incpush(RUBY_RELATIVE(RUBY_LIB)); incpush(RUBY_RELATIVE(RUBY_LIB));
#ifdef RUBY_THIN_ARCHLIB #ifdef RUBY_THIN_ARCHLIB
ruby_incpush(RUBY_RELATIVE(RUBY_THIN_ARCHLIB)); incpush(RUBY_RELATIVE(RUBY_THIN_ARCHLIB));

View File

@ -1,77 +0,0 @@
----------------------------------------------------------------------
r12540 (orig r12539): shyouhei | 2007-06-14 17:04:27 +0200
Changed paths:
M /upstream/branches/ruby_1_8_6/ChangeLog
M /upstream/branches/ruby_1_8_6/test/ruby/suicide.rb (from /upstream/branches/ruby_1_8/test/ruby/suicide.rb:12504)
M /upstream/branches/ruby_1_8_6/test/ruby/test_beginendblock.rb
M /upstream/branches/ruby_1_8_6/version.h
* test/ruby/test_beginendblock.rb (test_should_propagate_signaled):
get rid of invoking shell. [ruby-dev:30942]
----------------------------------------------------------------------
r12568 (orig r12567): nobu | 2007-06-18 04:28:11 +0200
Changed paths:
M /upstream/branches/ruby_1_8_6/ChangeLog
M /upstream/branches/ruby_1_8_6/ext/thread/thread.c
M /upstream/branches/ruby_1_8_6/intern.h
M /upstream/branches/ruby_1_8_6/version.h
* intern.h, ext/thread/thread.c: moved prototype of rb_thread_status()
to get rid of error in C++. [ruby-list:43615]
----------------------------------------------------------------------
=== intern.h
==================================================================
--- intern.h (revision 12539)
+++ intern.h (revision 12568)
@@ -204,7 +204,6 @@
void rb_thread_polling _((void));
void rb_thread_sleep _((int));
void rb_thread_sleep_forever _((void));
-enum rb_thread_status rb_thread_status _((VALUE));
VALUE rb_thread_stop _((void));
VALUE rb_thread_wakeup _((VALUE));
VALUE rb_thread_wakeup_alive _((VALUE));
=== ext/thread/thread.c
==================================================================
--- ext/thread/thread.c (revision 12539)
+++ ext/thread/thread.c (revision 12568)
@@ -14,6 +14,8 @@
#include <rubysig.h>
#include <node.h>
+enum rb_thread_status rb_thread_status _((VALUE));
+
static VALUE rb_cMutex;
static VALUE rb_cConditionVariable;
static VALUE rb_cQueue;
=== test/ruby/suicide.rb
==================================================================
--- test/ruby/suicide.rb (revision 12539)
+++ test/ruby/suicide.rb (revision 12568)
@@ -0,0 +1,2 @@
+STDERR.reopen(STDOUT)
+at_exit{Process.kill(:INT, $$)}
=== test/ruby/test_beginendblock.rb
==================================================================
--- test/ruby/test_beginendblock.rb (revision 12539)
+++ test/ruby/test_beginendblock.rb (revision 12568)
@@ -69,15 +69,14 @@
def test_should_propagate_exit_code
ruby = EnvUtil.rubybin
- assert_equal false, system("#{q(ruby)} -e 'at_exit{exit 2}'")
+ assert_equal false, system(ruby, '-e', 'at_exit{exit 2}')
assert_equal 2, $?.exitstatus
assert_nil $?.termsig
end
def test_should_propagate_signaled
ruby = EnvUtil.rubybin
- out = IO.popen("#{q(ruby)} -e 'STDERR.reopen(STDOUT);" \
- "at_exit{Process.kill(:INT, $$)}'"){|f|
+ out = IO.popen("#{ruby} #{File.dirname(__FILE__)}/suicide.rb"){|f|
f.read
}
assert_match /Interrupt$/, out

View File

@ -0,0 +1,54 @@
Index: ext/openssl/lib/net/telnets.rb
===================================================================
--- ext/openssl/lib/net/telnets.rb.orig 2007-02-13 00:01:19.000000000 +0100
+++ ext/openssl/lib/net/telnets.rb 2007-12-06 22:26:24.002456350 +0100
@@ -134,6 +134,9 @@ module Net
@sock.verify_callback = @options['VerifyCallback']
@sock.verify_depth = @options['VerifyDepth']
@sock.connect
+ if @options['VerifyMode'] != OpenSSL::SSL::VERIFY_NONE
+ @sock.post_connection_check(@options['Host'])
+ end
@ssl = true
end
''
Index: ext/openssl/lib/net/ftptls.rb
===================================================================
--- ext/openssl/lib/net/ftptls.rb.orig 2007-02-13 00:01:19.000000000 +0100
+++ ext/openssl/lib/net/ftptls.rb 2007-12-06 22:26:24.030458051 +0100
@@ -29,13 +29,23 @@ require 'net/ftp'
module Net
class FTPTLS < FTP
+ def connect(host, port=FTP_PORT)
+ @hostname = host
+ super
+ end
+
def login(user = "anonymous", passwd = nil, acct = nil)
+ store = OpenSSL::X509::Store.new
+ store.set_default_paths
ctx = OpenSSL::SSL::SSLContext.new('SSLv23')
+ ctx.cert_store = store
+ ctx.verify_mode = OpenSSL::SSL::VERIFY_PEER
ctx.key = nil
ctx.cert = nil
voidcmd("AUTH TLS")
@sock = OpenSSL::SSL::SSLSocket.new(@sock, ctx)
@sock.connect
+ @sock.post_connection_check(@hostname)
super(user, passwd, acct)
voidcmd("PBSZ 0")
end
Index: lib/net/imap.rb
===================================================================
--- lib/net/imap.rb.orig 2007-08-22 01:28:09.000000000 +0200
+++ lib/net/imap.rb 2007-12-06 22:26:24.110462912 +0100
@@ -900,6 +900,7 @@ module Net
end
@sock = SSLSocket.new(@sock, context)
@sock.connect # start ssl session.
+ @sock.post_connection_check(@host) if verify
else
@usessl = false
end

View File

@ -1,5 +1,7 @@
--- node.h Index: node.h
+++ node.h ===================================================================
--- node.h.orig 2007-05-22 17:01:22.000000000 +0200
+++ node.h 2007-12-06 22:26:07.621461094 +0100
@@ -394,7 +394,7 @@ enum rb_thread_status { @@ -394,7 +394,7 @@ enum rb_thread_status {
THREAD_TO_KILL, THREAD_TO_KILL,
THREAD_RUNNABLE, THREAD_RUNNABLE,

View File

@ -1,8 +1,51 @@
-------------------------------------------------------------------
Fri May 16 15:06:51 CEST 2008 - mrueckert@suse.de
- update to 1.8.6.p114
bugfix release
- Fixes File access vulnerability of WEBrick (CVE-2008-1145)
(bnc#368618)
- ensure that the rss module adds the xml namespace
-------------------------------------------------------------------
Thu Dec 6 22:14:44 CET 2007 - mrueckert@suse.de
- update to 1.8.6.p111
bugfix release. important changes:
- ssl fixes (see notes on the ssl patch below)
- fixes for the threads support
- various overflow checks
- safe_level improvements
- printf fixes
- imap fixes
for all the details see /usr/share/doc/packages/ruby/ChangeLog
- added ruby-1.8.6.p111_openssl_verify_host.patch: (#329706)
validate the hostname against the CN from the presented SSL
certificicate. This has been enabled for telnets, ftptls, imaps
and https. (CVE-2007-5162,CVE-2007-5770)
For telnets and https the verification is done if the verify mode
is set to anything else than OpenSSL::SSL::VERIFY_NONE.
For ftptls it is always enabled.
For imaps it is checked if you enable verification.
- added support to build with bleak_house to allow better memleak
debugging. (requires additional package ruby-bleakhouse)
- updated ruby-1.8.6.p36_vendor_ruby.patch
new name ruby-1.8.6.p111_vendor_ruby.patch
- dropped ruby-1.8.6.p36_thread_prototype_and_testsuite.patch:
included in update
------------------------------------------------------------------- -------------------------------------------------------------------
Thu Oct 11 11:56:16 CEST 2007 - dmueller@suse.de Thu Oct 11 11:56:16 CEST 2007 - dmueller@suse.de
- fix headers to be compileable with -pedantic - fix headers to be compileable with -pedantic
-------------------------------------------------------------------
Sun Aug 12 04:35:09 CEST 2007 - mrueckert@suse.de
- added ruby_1.8.6.p36_date_remove_privat.patch:
Time.to_date() and Time.to_datetime() shouldnt be private.
------------------------------------------------------------------- -------------------------------------------------------------------
Mon Aug 6 03:11:29 CEST 2007 - mrueckert@suse.de Mon Aug 6 03:11:29 CEST 2007 - mrueckert@suse.de

210
ruby.spec
View File

@ -1,7 +1,7 @@
# #
# spec file for package ruby (Version 1.8.6.p36) # spec file for package ruby (Version 1.8.6.p114)
# #
# Copyright (c) 2007 SUSE LINUX Products GmbH, Nuernberg, Germany. # Copyright (c) 2008 SUSE LINUX Products GmbH, Nuernberg, Germany.
# This file and all modifications and additions to the pristine # This file and all modifications and additions to the pristine
# package are under the same license as the package itself. # package are under the same license as the package itself.
# #
@ -10,11 +10,13 @@
# norootforbuild # norootforbuild
Name: ruby Name: ruby
Version: 1.8.6.p36 Version: 1.8.6.p114
Release: 24 Release: 1
#
%define pkg_version 1.8.6 %define pkg_version 1.8.6
%define patch_level p36 %define patch_level p114
%define rb_ver %(echo %{pkg_version} | sed -e 's/\\\.[0-9]\\\+$//') %define rb_ver %(echo %{pkg_version} | sed -e 's/\\\.[0-9]\\\+$//')
# #
License: GPL v2 or later License: GPL v2 or later
@ -22,6 +24,7 @@ Group: Development/Languages/Ruby
# #
BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRoot: %{_tmppath}/%{name}-%{version}-build
BuildRequires: bison gdbm-devel gperf graphviz libjpeg-devel openssl-devel readline-devel tk-devel BuildRequires: bison gdbm-devel gperf graphviz libjpeg-devel openssl-devel readline-devel tk-devel
#define with_bleak_house 1
%if 0%{suse_version} >= 1030 %if 0%{suse_version} >= 1030
%define use_fdupes 1 %define use_fdupes 1
%endif %endif
@ -33,7 +36,12 @@ BuildRequires: XFree86-devel XFree86-fonts-scalable
%else %else
BuildRequires: xorg-x11-devel xorg-x11-fonts-scalable BuildRequires: xorg-x11-devel xorg-x11-fonts-scalable
%endif %endif
#
Provides: /usr/bin/ruby Provides: /usr/bin/ruby
%if 0%{?with_bleak_house}
%define bleak_house_version 4.0
Provides: ruby_with_bleak_house = %{bleak_house_version}-%{release}
%endif
# #
Url: http://www.ruby-lang.org/ Url: http://www.ruby-lang.org/
Source: ftp://ftp.ruby-lang.org/pub/ruby/ruby-%{pkg_version}-%{patch_level}.tar.bz2 Source: ftp://ftp.ruby-lang.org/pub/ruby/ruby-%{pkg_version}-%{patch_level}.tar.bz2
@ -43,15 +51,19 @@ Patch0: ruby-1.8.6.p36_gc.patch
Patch1: ruby-1.8.6.p36_lib64.patch Patch1: ruby-1.8.6.p36_lib64.patch
Patch2: ruby-1.8.6.p36_tcltk-multilib.patch Patch2: ruby-1.8.6.p36_tcltk-multilib.patch
Patch3: ruby-1.8.6.p36_socket_ipv6.patch Patch3: ruby-1.8.6.p36_socket_ipv6.patch
Patch4: ruby-1.8.6.p36_thread_prototype_and_testsuite.patch Patch5: ruby_1.8.6.p36_date_remove_privat.patch
# vendor ruby files taken from: # vendor ruby files taken from:
# http://svn.macports.org/repository/macports/trunk/dports/lang/ruby/ # http://svn.macports.org/repository/macports/trunk/dports/lang/ruby/
Patch5: ruby-1.8.6.p36_vendor_ruby.patch
Patch6: ruby-pedantic-headers.diff Patch6: ruby-pedantic-headers.diff
Patch7: ruby-1.8.6_openssl_verify_host.patch
Patch100: ruby-1.8.6.p111_vendor_ruby.patch
Source3: site-specific.rb Source3: site-specific.rb
Source4: vendor-specific.rb Source4: vendor-specific.rb
# #
Source5: ruby-rpmlintrc Source5: ruby-rpmlintrc
%if 0%{?with_bleak_house}
#Source6: bleak_house-%{bleak_house_version}.tar.bz2
%endif
# #
Summary: An Interpreted Object-Oriented Scripting Language Summary: An Interpreted Object-Oriented Scripting Language
@ -91,9 +103,14 @@ Authors:
Yukihiro Matsumoto <matz@netlab.co.jp> Yukihiro Matsumoto <matz@netlab.co.jp>
%package devel %package devel
License: GPL v2 or later
Group: Development/Languages/Ruby Group: Development/Languages/Ruby
Summary: Development files to link against Ruby Summary: Development files to link against Ruby
Requires: %{name} = %{version} Requires: %{name} = %{version}
%if 0%{?with_bleak_house}
Requires: ruby_with_bleak_house = %{bleak_house_version}
Provides: ruby-devel_with_bleak_house = %{bleak_house_version}-%{release}
%endif
%description devel %description devel
Development files to link against Ruby. Development files to link against Ruby.
@ -105,6 +122,7 @@ Authors:
Yukihiro Matsumoto <matz@netlab.co.jp> Yukihiro Matsumoto <matz@netlab.co.jp>
%package tk %package tk
License: GPL v2 or later
Group: Development/Languages/Ruby Group: Development/Languages/Ruby
Summary: TCL/TK bindings for Ruby Summary: TCL/TK bindings for Ruby
Requires: %{name} = %{version} Requires: %{name} = %{version}
@ -119,6 +137,7 @@ Authors:
Yukihiro Matsumoto <matz@netlab.co.jp> Yukihiro Matsumoto <matz@netlab.co.jp>
%package doc-ri %package doc-ri
License: GPL v2 or later
Group: Development/Languages/Ruby Group: Development/Languages/Ruby
Summary: Ruby Interactive Documentation Summary: Ruby Interactive Documentation
Requires: %{name} = %{version} Requires: %{name} = %{version}
@ -133,6 +152,7 @@ Authors:
Yukihiro Matsumoto <matz@netlab.co.jp> Yukihiro Matsumoto <matz@netlab.co.jp>
%package doc-html %package doc-html
License: GPL v2 or later
Group: Development/Languages/Ruby Group: Development/Languages/Ruby
Summary: This package contains the HTML docs for ruby Summary: This package contains the HTML docs for ruby
@ -146,6 +166,7 @@ Authors:
Yukihiro Matsumoto <matz@netlab.co.jp> Yukihiro Matsumoto <matz@netlab.co.jp>
%package examples %package examples
License: GPL v2 or later
Group: Development/Languages/Ruby Group: Development/Languages/Ruby
Summary: Example scripts for ruby Summary: Example scripts for ruby
Requires: %{name} = %{version} Requires: %{name} = %{version}
@ -160,6 +181,7 @@ Authors:
Yukihiro Matsumoto <matz@netlab.co.jp> Yukihiro Matsumoto <matz@netlab.co.jp>
%package test-suite %package test-suite
License: GPL v2 or later
Group: Development/Languages/Ruby Group: Development/Languages/Ruby
Summary: An Interpreted Object-Oriented Scripting Language Summary: An Interpreted Object-Oriented Scripting Language
@ -199,16 +221,23 @@ Authors:
Yukihiro Matsumoto <matz@netlab.co.jp> Yukihiro Matsumoto <matz@netlab.co.jp>
%prep %prep
%setup -q -n ruby-%{pkg_version}-%{patch_level} -a2 %setup -q -n ruby-%{pkg_version}-%{patch_level} -a2 %{?with_bleak_house:-a6}
%patch0 %patch0
%patch1 %patch1
%patch2 %patch2
%patch3 %patch3
%patch4
%patch5 %patch5
%patch6 %patch6
%patch7
%patch100
%if 0%{?with_bleak_house}
for patch in valgrind configure gc ; do
patch -p0 < bleak_house-%{bleak_house_version}/ruby/${patch}.patch
done
%endif
find . -type f | xargs -n 1 sed -i "s@#!\s*/usr/local/bin/ruby@#!/usr/bin/ruby@" find . -type f | xargs -n 1 sed -i "s@#!\s*/usr/local/bin/ruby@#!/usr/bin/ruby@"
touch parse.y # make sure it _really_ rebuilds parse.c for us
old parse.c
%build %build
autoreconf -fi autoreconf -fi
@ -291,6 +320,10 @@ export RUBYLIB="$PWD:$PWD/lib:$(find $PWD/.ext $PWD/ext/ -type d |tr '\n' ':').
LGPL README README.EXT README.EXT.ja \ LGPL README README.EXT README.EXT.ja \
README.ja ToDo NEWS \ README.ja ToDo NEWS \
%{buildroot}%{_docdir}/%{name} %{buildroot}%{_docdir}/%{name}
%if 0%{?with_bleak_house}
%{__cp} -v bleak_house-%{bleak_house_version}/LICENSE %{buildroot}%{_docdir}/%{name}/LICENSE_AFL_for_bleak_house
%{__cp} -v bleak_house-%{bleak_house_version}/LICENSE_BSD %{buildroot}%{_docdir}/%{name}/LICENSE_BSD_for_bleak_house
%endif
%{__cp} -rv \ %{__cp} -rv \
ruby-doc-bundle %{buildroot}%{_docdir}/%{name} ruby-doc-bundle %{buildroot}%{_docdir}/%{name}
%{__cp} -rv \ %{__cp} -rv \
@ -441,6 +474,9 @@ sed -i "s@#!\s*\./miniruby@#!/usr/bin/ruby@" runruby.rb
%doc %{_docdir}/%{name}/NEWS %doc %{_docdir}/%{name}/NEWS
%doc %{_docdir}/%{name}/README* %doc %{_docdir}/%{name}/README*
%doc %{_docdir}/%{name}/ToDo %doc %{_docdir}/%{name}/ToDo
%if 0%{?with_bleak_house}
%doc %{_docdir}/%{name}/LICENSE_*_for_bleak_house
%endif
%files devel %files devel
%defattr(-,root,root) %defattr(-,root,root)
@ -473,16 +509,50 @@ sed -i "s@#!\s*\./miniruby@#!/usr/bin/ruby@" runruby.rb
%files examples %files examples
%defattr(-,root,root) %defattr(-,root,root)
%doc %{_docdir}/%{name}/examples %doc %{_docdir}/%{name}/examples
%changelog %changelog
* Thu Oct 11 2007 - dmueller@suse.de * Fri May 16 2008 mrueckert@suse.de
- update to 1.8.6.p114
bugfix release
- Fixes File access vulnerability of WEBrick (CVE-2008-1145)
(bnc#368618)
- ensure that the rss module adds the xml namespace
* Fri Dec 07 2007 mrueckert@suse.de
- update to 1.8.6.p111
bugfix release. important changes:
- ssl fixes (see notes on the ssl patch below)
- fixes for the threads support
- various overflow checks
- safe_level improvements
- printf fixes
- imap fixes
for all the details see /usr/share/doc/packages/ruby/ChangeLog
- added ruby-1.8.6.p111_openssl_verify_host.patch: (#329706)
validate the hostname against the CN from the presented SSL
certificicate. This has been enabled for telnets, ftptls, imaps
and https. (CVE-2007-5162,CVE-2007-5770)
For telnets and https the verification is done if the verify mode
is set to anything else than OpenSSL::SSL::VERIFY_NONE.
For ftptls it is always enabled.
For imaps it is checked if you enable verification.
- added support to build with bleak_house to allow better memleak
debugging. (requires additional package ruby-bleakhouse)
- updated ruby-1.8.6.p36_vendor_ruby.patch
new name ruby-1.8.6.p111_vendor_ruby.patch
- dropped ruby-1.8.6.p36_thread_prototype_and_testsuite.patch:
included in update
* Thu Oct 11 2007 dmueller@suse.de
- fix headers to be compileable with -pedantic - fix headers to be compileable with -pedantic
* Mon Aug 06 2007 - mrueckert@suse.de * Sun Aug 12 2007 mrueckert@suse.de
- added ruby_1.8.6.p36_date_remove_privat.patch:
Time.to_date() and Time.to_datetime() shouldnt be private.
* Mon Aug 06 2007 mrueckert@suse.de
- added ruby-1.8.6.p36_thread_prototype_and_testsuite.patch: - added ruby-1.8.6.p36_thread_prototype_and_testsuite.patch:
pulled two fixes from the 1.8.6 branch: pulled two fixes from the 1.8.6 branch:
* avoid executing shell in the testsuite * avoid executing shell in the testsuite
* moved definition of rb_thread_status() to avoid errors in C++ * moved definition of rb_thread_status() to avoid errors in C++
extensions. extensions.
* Sun Aug 05 2007 - mrueckert@suse.de * Mon Aug 06 2007 mrueckert@suse.de
- update to 1.8.6.p36: - update to 1.8.6.p36:
many bugfixes and library updates. hilights: many bugfixes and library updates. hilights:
=== Library updates (outstanding ones only) === Library updates (outstanding ones only)
@ -545,12 +615,12 @@ sed -i "s@#!\s*\./miniruby@#!/usr/bin/ruby@" runruby.rb
new name ruby-1.8.6.p36_vendor_ruby.patch new name ruby-1.8.6.p36_vendor_ruby.patch
- rediffed patch ruby-1.8.5.p12-lib64.diff - rediffed patch ruby-1.8.5.p12-lib64.diff
new name ruby-1.8.6.p36_lib64.patch new name ruby-1.8.6.p36_lib64.patch
* Fri Mar 30 2007 - rguenther@suse.de * Fri Mar 30 2007 rguenther@suse.de
- add bison BuildRequires - add bison BuildRequires
- add emacs site-lisp directories - add emacs site-lisp directories
* Fri Mar 23 2007 - rguenther@suse.de * Fri Mar 23 2007 rguenther@suse.de
- add gdbm-devel BuildRequires - add gdbm-devel BuildRequires
* Mon Feb 12 2007 - mrueckert@suse.de * Mon Feb 12 2007 mrueckert@suse.de
- update to 1.8.5-p12: - update to 1.8.5-p12:
* stable version 1.8.5-p12 released. * stable version 1.8.5-p12 released.
* ext/tk/tcltklib.c: shouldn't run the killed thread at callback. * ext/tk/tcltklib.c: shouldn't run the killed thread at callback.
@ -590,20 +660,20 @@ sed -i "s@#!\s*\./miniruby@#!/usr/bin/ruby@" runruby.rb
- added ruby-1.8.x-autoconf_2.61a.patch: - added ruby-1.8.x-autoconf_2.61a.patch:
config.status changed to awk in 2.61a. adapt mkconfig.rb to the config.status changed to awk in 2.61a. adapt mkconfig.rb to the
new syntax. new syntax.
* Mon Oct 30 2006 - mrueckert@suse.de * Mon Oct 30 2006 mrueckert@suse.de
- added cgi_multipart_eof_fix.patch: - added cgi_multipart_eof_fix.patch:
fix for a denial of service condition in cgi.rb CVE-2006-5467 fix for a denial of service condition in cgi.rb CVE-2006-5467
(#214916) (#214916)
* Fri Oct 20 2006 - mrueckert@suse.de * Fri Oct 20 2006 mrueckert@suse.de
- run ldconfig - run ldconfig
- add site_ruby and vendor_ruby arch directories to the filelist - add site_ruby and vendor_ruby arch directories to the filelist
* Wed Sep 27 2006 - mrueckert@suse.de * Wed Sep 27 2006 mrueckert@suse.de
- added ruby-1.8.5-vendor_ruby.patch, site-specific.rb, vendor-specific.rb: - added ruby-1.8.5-vendor_ruby.patch, site-specific.rb, vendor-specific.rb:
add vendor_ruby support. This is a small change for packager. add vendor_ruby support. This is a small change for packager.
you can now run 'ruby -rvendor-specific extconf.rb' (or setup.rb) you can now run 'ruby -rvendor-specific extconf.rb' (or setup.rb)
and it will be automatically installed in and it will be automatically installed in
%%{_libdir}/ruby/vendor_ruby. %%{_libdir}/ruby/vendor_ruby.
* Sat Aug 26 2006 - mrueckert@suse.de * Sat Aug 26 2006 mrueckert@suse.de
- Update to version 1.8.5: - Update to version 1.8.5:
o Non-blocking IO o Non-blocking IO
| - Several methods backported from HEAD have been added: | - Several methods backported from HEAD have been added:
@ -668,10 +738,10 @@ sed -i "s@#!\s*\./miniruby@#!/usr/bin/ruby@" runruby.rb
ruby-1.8.4-fix-alias-safe-level.patch ruby-1.8.4-fix-alias-safe-level.patch
- updated ruby-1.8.4_linkerflags.patch. - updated ruby-1.8.4_linkerflags.patch.
new name ruby-1.8.5_linkerflags.patch new name ruby-1.8.5_linkerflags.patch
* Mon Jul 31 2006 - mrueckert@suse.de * Mon Jul 31 2006 mrueckert@suse.de
- added ruby-fix-autoconf-magic-code.patch: - added ruby-fix-autoconf-magic-code.patch:
Fix for the latest changes in the autoconf code. Fix for the latest changes in the autoconf code.
* Mon Jul 31 2006 - mrueckert@suse.de * Mon Jul 31 2006 mrueckert@suse.de
- security fixes [CVE-2006-3694] [#193661] - security fixes [CVE-2006-3694] [#193661]
* added ruby-1.8.4-fix-insecure-dir-operation.patch & * added ruby-1.8.4-fix-insecure-dir-operation.patch &
ruby-1.8.4-fix-insecure-regexp-modification.patch: ruby-1.8.4-fix-insecure-regexp-modification.patch:
@ -679,49 +749,49 @@ sed -i "s@#!\s*\./miniruby@#!/usr/bin/ruby@" runruby.rb
restrictions. restrictions.
* ruby-1.8.4-fix-alias-safe-level.patch: preserve safe level * ruby-1.8.4-fix-alias-safe-level.patch: preserve safe level
restrictions when aliasing a function. restrictions when aliasing a function.
* Mon Apr 10 2006 - mrueckert@suse.de * Mon Apr 10 2006 mrueckert@suse.de
- build with -fno-strict-aliasing - build with -fno-strict-aliasing
- enable more tests on ppc - enable more tests on ppc
- disable drb tests - disable drb tests
* Mon Apr 03 2006 - mrueckert@suse.de * Mon Apr 03 2006 mrueckert@suse.de
- reworked the ruby-1.8.4-no-eaccess.diff patch - reworked the ruby-1.8.4-no-eaccess.diff patch
it broke when build on old distros it broke when build on old distros
* Thu Jan 26 2006 - mrueckert@suse.de * Thu Jan 26 2006 mrueckert@suse.de
- added upstream patch for eaccess - added upstream patch for eaccess
- disabled openssl tests on pcc - disabled openssl tests on pcc
* Wed Jan 25 2006 - mrueckert@suse.de * Wed Jan 25 2006 mrueckert@suse.de
- added ruby-1.8.4_linkerflags.patch - added ruby-1.8.4_linkerflags.patch
patch removes -L. from the linker flags. patch removes -L. from the linker flags.
it seems libtool otherwise expands it to -L$PWD. it seems libtool otherwise expands it to -L$PWD.
this leads to trouble with our build system. this leads to trouble with our build system.
* Wed Jan 25 2006 - mls@suse.de * Wed Jan 25 2006 mls@suse.de
- converted neededforbuild to BuildRequires - converted neededforbuild to BuildRequires
* Sun Jan 15 2006 - kukuk@suse.de * Mon Jan 16 2006 kukuk@suse.de
- Use eaccess() from glibc [#143291] - Use eaccess() from glibc [#143291]
* Sun Jan 15 2006 - mrueckert@suse.de * Sun Jan 15 2006 mrueckert@suse.de
- disabled the big test suite as we trigger - disabled the big test suite as we trigger
a weird bug in the openssl bindings on ppc64 a weird bug in the openssl bindings on ppc64
* Sat Dec 24 2005 - mrueckert@suse.de * Sat Dec 24 2005 mrueckert@suse.de
- Update to 1.8.4 - Update to 1.8.4
- dont run with --default-kcode=utf8 - dont run with --default-kcode=utf8
triggers a bug in the test suite triggers a bug in the test suite
* Fri Sep 23 2005 - mrueckert@suse.de * Fri Sep 23 2005 mrueckert@suse.de
- update to 1.8.3 - update to 1.8.3
- updated patches for 1.8.3 - updated patches for 1.8.3
- ruby-doc tarball now included as tar.bz2 - ruby-doc tarball now included as tar.bz2
* Mon Sep 12 2005 - mrueckert@suse.de * Mon Sep 12 2005 mrueckert@suse.de
- fix path of the RI documentation [Bug #116408] - fix path of the RI documentation [Bug #116408]
* Thu Sep 08 2005 - mrueckert@suse.de * Thu Sep 08 2005 mrueckert@suse.de
- dont make the irb man page executable. [Bug #114849] - dont make the irb man page executable. [Bug #114849]
* Tue Aug 23 2005 - mrueckert@suse.de * Tue Aug 23 2005 mrueckert@suse.de
- added directory entries for the site ruby dirs - added directory entries for the site ruby dirs
* Mon Aug 22 2005 - mrueckert@suse.de * Mon Aug 22 2005 mrueckert@suse.de
- disabled mkmf patch for now. it breaks building the socket - disabled mkmf patch for now. it breaks building the socket
extension. extension.
* Sun Aug 21 2005 - ro@suse.de * Sun Aug 21 2005 ro@suse.de
- added directories to filelist - added directories to filelist
- fix typo in filelist - fix typo in filelist
* Fri Aug 19 2005 - mrueckert@suse.de * Fri Aug 19 2005 mrueckert@suse.de
- Build RI and html documentation. Added subpackages for them. - Build RI and html documentation. Added subpackages for them.
- moved samples into a sub packages. - moved samples into a sub packages.
- build tcl/tk bindings and move them into their own package. - build tcl/tk bindings and move them into their own package.
@ -731,80 +801,80 @@ sed -i "s@#!\s*\./miniruby@#!/usr/bin/ruby@" runruby.rb
(ruby-1.8.2-strscan-memset.patch) (ruby-1.8.2-strscan-memset.patch)
- let mkmf create shared libraries (ruby-mkmf-shared.patch) - let mkmf create shared libraries (ruby-mkmf-shared.patch)
- splitted of devel files - splitted of devel files
* Tue Jul 19 2005 - mge@suse.de * Tue Jul 19 2005 mge@suse.de
- make "make test" run also on x86_64 by disabling - make "make test" run also on x86_64 by disabling
code optimization (-O0), as it is for ia64 code optimization (-O0), as it is for ia64
- enable "make test" for ppc64 again - enable "make test" for ppc64 again
* Tue Jul 19 2005 - mge@suse.de * Tue Jul 19 2005 mge@suse.de
- Fixes #95366, CAN-2005-1992: - Fixes #95366, CAN-2005-1992:
arbitrary command execution on XMLRPC server arbitrary command execution on XMLRPC server
* Wed Jun 01 2005 - ro@suse.de * Wed Jun 01 2005 ro@suse.de
- update to 1.8.2 - update to 1.8.2
* Mon Jan 03 2005 - mge@suse.de * Mon Jan 03 2005 mge@suse.de
- added fixes for lib/cgi.rb and lib/cgi/session.rb - added fixes for lib/cgi.rb and lib/cgi/session.rb
from ruby-1.8.2, fixes: #47886 (CAN-2004-0983) from ruby-1.8.2, fixes: #47886 (CAN-2004-0983)
* Thu Nov 18 2004 - ro@suse.de * Thu Nov 18 2004 ro@suse.de
- fixed file list - fixed file list
* Sat Sep 25 2004 - ro@suse.de * Sat Sep 25 2004 ro@suse.de
- added cgi_session.diff (from debian, CAN-2004-0755) - added cgi_session.diff (from debian, CAN-2004-0755)
* Mon Jul 26 2004 - ro@suse.de * Mon Jul 26 2004 ro@suse.de
- fix typo in specfile - fix typo in specfile
* Sun Jun 20 2004 - ro@suse.de * Sun Jun 20 2004 ro@suse.de
- fix find in specfile - fix find in specfile
* Thu Apr 29 2004 - ro@suse.de * Thu Apr 29 2004 ro@suse.de
- added missing return value (unreached code) - added missing return value (unreached code)
* Tue Mar 23 2004 - mge@suse.de * Tue Mar 23 2004 mge@suse.de
- make ruby build on ia64 and ppc64 - make ruby build on ia64 and ppc64
* Sat Feb 28 2004 - ro@suse.de * Sat Feb 28 2004 ro@suse.de
- fix makefile rule for regenerating lex.c - fix makefile rule for regenerating lex.c
* Sat Feb 28 2004 - ro@suse.de * Sat Feb 28 2004 ro@suse.de
- add gperf to neededforbuild - add gperf to neededforbuild
* Sat Feb 28 2004 - ro@suse.de * Sat Feb 28 2004 ro@suse.de
- fix requirement for /usr/local/bin - fix requirement for /usr/local/bin
- use no-strict-aliasing - use no-strict-aliasing
* Mon Feb 02 2004 - mge@suse.de * Mon Feb 02 2004 mge@suse.de
- update to 1.8.1 - update to 1.8.1
also fixes Bug #34226: Readline support missing from ruby also fixes Bug #34226: Readline support missing from ruby
* Sat Jan 10 2004 - adrian@suse.de * Sun Jan 11 2004 adrian@suse.de
- add %%defattr - add %%defattr
* Mon Aug 04 2003 - mge@suse.de * Mon Aug 04 2003 mge@suse.de
- update tp 1.8.0 - update tp 1.8.0
* Mon Jan 06 2003 - mge@suse.de * Mon Jan 06 2003 mge@suse.de
- update to 1.6.8 - update to 1.6.8
* Tue May 21 2002 - meissner@suse.de * Tue May 21 2002 meissner@suse.de
- More %%_lib fixes inside package. - More %%_lib fixes inside package.
* Tue May 21 2002 - meissner@suse.de * Tue May 21 2002 meissner@suse.de
- %%_lib fixes - %%_lib fixes
- Added prototype for rb_node_newnode. - Added prototype for rb_node_newnode.
* Fri May 17 2002 - mge@suse.de * Fri May 17 2002 mge@suse.de
- update to 1.6.7 - update to 1.6.7
* Mon Apr 15 2002 - bk@suse.de * Mon Apr 15 2002 bk@suse.de
- lib64 and new arch fixes: suse_update_config and use %%_libdir - lib64 and new arch fixes: suse_update_config and use %%_libdir
* Fri Apr 05 2002 - schwab@suse.de * Fri Apr 05 2002 schwab@suse.de
- Remove ia64 workaround. - Remove ia64 workaround.
* Tue Aug 21 2001 - mge@suse.de * Tue Aug 21 2001 mge@suse.de
- update to 1.6.4 - update to 1.6.4
* Sun May 20 2001 - mge@suse.de * Sun May 20 2001 mge@suse.de
- changes _only_ to spec-file: - changes _only_ to spec-file:
- make ruby shared libs built - make ruby shared libs built
- cleanup ruby directory structure (drop /usr/share/lib/ruby/) - cleanup ruby directory structure (drop /usr/share/lib/ruby/)
* Wed May 09 2001 - mfabian@suse.de * Wed May 09 2001 mfabian@suse.de
- bzip2 sources - bzip2 sources
* Thu Mar 22 2001 - mge@suse.de * Thu Mar 22 2001 mge@suse.de
- update to 1.6.3, merge of rread's SPEC patches - update to 1.6.3, merge of rread's SPEC patches
* Mon Mar 19 2001 - schwab@suse.de * Mon Mar 19 2001 schwab@suse.de
- Don't use __builtin_frame_address(2) on ia64. - Don't use __builtin_frame_address(2) on ia64.
- Compile with -O0 on ia64 to work around compiler bug. - Compile with -O0 on ia64 to work around compiler bug.
* Mon Mar 05 2001 - rread@mountainviewdata.com * Mon Mar 05 2001 rread@mountainviewdata.com
- introduced build-root - introduced build-root
* Fri Feb 23 2001 - ro@suse.de * Fri Feb 23 2001 ro@suse.de
- added readline/readline-devel to neededforbuild (split from bash) - added readline/readline-devel to neededforbuild (split from bash)
* Fri Jan 12 2001 - mge@suse.de * Fri Jan 12 2001 mge@suse.de
- update to 1.6.2 - update to 1.6.2
* Wed Dec 13 2000 - schwab@suse.de * Wed Dec 13 2000 schwab@suse.de
- Add %%suse_update_config. - Add %%suse_update_config.
- Fix computation of stack limit. - Fix computation of stack limit.
* Mon Dec 04 2000 - mge@suse.de * Tue Dec 05 2000 mge@suse.de
- update to 1.6.1, manual 1.4.6 - update to 1.6.1, manual 1.4.6
* Thu Jul 06 2000 - mge@suse.de * Thu Jul 06 2000 mge@suse.de
- initial SuSE RPM - initial SuSE RPM

View File

@ -0,0 +1,13 @@
=== lib/date.rb
==================================================================
--- lib/date.rb (revision 12921)
+++ lib/date.rb (local)
@@ -1604,8 +1604,6 @@
DateTime.new!(DateTime.jd_to_ajd(jd, fr, of), of, DateTime::ITALY)
end
- private :to_date, :to_datetime
-
end
class Date