From 8e5c4b1bb49a593fabbc572c4986750833d8e58f Mon Sep 17 00:00:00 2001 From: Mamoru Tasaka Date: Sat, 10 Nov 2012 14:29:23 +0900 Subject: [PATCH 01/10] fix changelog --- ruby.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ruby.spec b/ruby.spec index 027a5d0..de023b5 100644 --- a/ruby.spec +++ b/ruby.spec @@ -739,7 +739,7 @@ make check TESTS="-v $DISABLE_TESTS" %{ruby_libdir}/tkextlib %changelog -* Sat Nov 10 2012 Mamoru TASAKA - 1.9.3.327-1 +* Sat Nov 10 2012 Mamoru TASAKA - 1.9.3.327-20 - Update to 1.9.3.327 - Fix Hash-flooding DoS vulnerability on MurmurHash function (CVE-2012-5371) From 72dd69140798e9f5ea865b332759ad1841c542b5 Mon Sep 17 00:00:00 2001 From: Mamoru Tasaka Date: Sat, 10 Nov 2012 15:03:38 +0900 Subject: [PATCH 02/10] 20 is already used, use 21 --- ruby.spec | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/ruby.spec b/ruby.spec index de023b5..a971e30 100644 --- a/ruby.spec +++ b/ruby.spec @@ -56,7 +56,7 @@ Version: %{ruby_version_patch_level} # we cannot reset the release number to 1 even when the main (ruby) version # is updated - because it may be that the versions of sub-components don't # change. -Release: 20%{?dist} +Release: 21%{?dist} Group: Development/Languages # Public Domain for example for: include/ruby/st.h, strftime.c, ... License: (Ruby or BSD) and Public Domain @@ -739,7 +739,7 @@ make check TESTS="-v $DISABLE_TESTS" %{ruby_libdir}/tkextlib %changelog -* Sat Nov 10 2012 Mamoru TASAKA - 1.9.3.327-20 +* Sat Nov 10 2012 Mamoru TASAKA - 1.9.3.327-21 - Update to 1.9.3.327 - Fix Hash-flooding DoS vulnerability on MurmurHash function (CVE-2012-5371) From cd63825ab43bdfcc0a92179cb3b0920caf9b9ca1 Mon Sep 17 00:00:00 2001 From: Mamoru Tasaka Date: Sat, 10 Nov 2012 16:38:17 +0900 Subject: [PATCH 03/10] ignore some network related tests --- ...ignore-internal-server-error-on-test.patch | 49 +++++++++++++++++++ ruby.spec | 5 +- 2 files changed, 53 insertions(+), 1 deletion(-) create mode 100644 ruby-1.9.3-p327-ignore-internal-server-error-on-test.patch diff --git a/ruby-1.9.3-p327-ignore-internal-server-error-on-test.patch b/ruby-1.9.3-p327-ignore-internal-server-error-on-test.patch new file mode 100644 index 0000000..ab37119 --- /dev/null +++ b/ruby-1.9.3-p327-ignore-internal-server-error-on-test.patch @@ -0,0 +1,49 @@ +--- ruby-1.9.3-p327/test/webrick/test_cgi.rb.koji 2012-08-28 00:40:30.000000000 +0900 ++++ ruby-1.9.3-p327/test/webrick/test_cgi.rb 2012-11-10 16:33:36.000000000 +0900 +@@ -28,6 +28,15 @@ + end + + def test_cgi ++''' ++On koji: ++test_cgi(TestWEBrickCGI) [/builddir/build/BUILD/ruby-1.9.3-p327/test/webrick/test_cgi.rb:34]: ++.... ++.... ++<"/webrick.cgi"> expected but was ++<"\n\n Internal Server Error\n \n

Internal Server Error

\n Broken pipe\n
\n
\n WEBrick/1.3.1 (Ruby/1.9.3/2012-11-10) OpenSSL/1.0.1c at\n 127.0.0.1:58617\n
\n \n\n">. ++''' ++ return # Skip on koji + start_cgi_server{|server, addr, port, log| + http = Net::HTTP.new(addr, port) + req = Net::HTTP::Get.new("/webrick.cgi") +@@ -84,6 +93,13 @@ + end + + def test_bad_request ++''' ++On koji: ++test_bad_request(TestWEBrickCGI) [/builddir/build/BUILD/ruby-1.9.3-p327/test/webrick/test_cgi.rb:96]: ++.... ++Expected /\AHTTP\/\d.\d 400 Bad Request/ to match "HTTP/1.1 500 Internal Server Error \r\nContent-Type: text/html; charset=ISO-8859-1\r\nServer: WEBrick/1.3.1 (Ruby/1.9.3/2012-11-10) OpenSSL/1.0.1c\r\nDate: Sat, 10 Nov 2012 07:17:08 GMT\r\nContent-Length: 307\r\nConnection: close\r\n\r\n\n\n Internal Server Error\n \n

Internal Server Error

\n Broken pipe\n
\n
\n WEBrick/1.3.1 (Ruby/1.9.3/2012-11-10) OpenSSL/1.0.1c at\n localhost:41188\n
\n \n\n". ++''' ++ return # Skip on koji + start_cgi_server{|server, addr, port, log| + sock = TCPSocket.new(addr, port) + begin +--- ruby-1.9.3-p327/test/webrick/test_filehandler.rb.koji 2012-08-28 00:40:30.000000000 +0900 ++++ ruby-1.9.3-p327/test/webrick/test_filehandler.rb 2012-11-10 16:33:02.000000000 +0900 +@@ -244,6 +244,14 @@ + end + + def test_script_disclosure ++''' ++On koji: ++test_script_disclosure(WEBrick::TestFileHandler) [/builddir/build/BUILD/ruby-1.9.3-p327/test/webrick/test_filehandler.rb:265]: ++.... ++<"200"> expected but was ++<"500">. ++''' ++ return # Skip on koji + config = { + :CGIInterpreter => TestWEBrick::RubyBin, + :DocumentRoot => File.dirname(__FILE__), diff --git a/ruby.spec b/ruby.spec index a971e30..8256651 100644 --- a/ruby.spec +++ b/ruby.spec @@ -91,6 +91,9 @@ Patch9: rubygems-1.8.11-binary-extensions.patch # Let's rescue this # Fixed in ruby 1.9.3 p327 #Patch10: ruby-1.9.3-p286-open-devtty-on-koji.patch +# On koji, network related tests sometimes cause internal server error, +# ignore these +Patch10: ruby-1.9.3-p327-ignore-internal-server-error-on-test.patch # Make mkmf verbose by default Patch12: ruby-1.9.3-mkmf-verbose.patch @@ -332,7 +335,7 @@ Tcl/Tk interface for the object-oriented scripting language Ruby. %patch7 -p1 %patch8 -p1 %patch9 -p1 -#%%patch10 -p1 +%patch10 -p1 %patch12 -p1 %build From 7eabfd2d544f6366582fd6b453728ee8f120dc91 Mon Sep 17 00:00:00 2001 From: Mamoru Tasaka Date: Sat, 10 Nov 2012 16:39:21 +0900 Subject: [PATCH 04/10] release++ --- ruby.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/ruby.spec b/ruby.spec index 8256651..d3d0638 100644 --- a/ruby.spec +++ b/ruby.spec @@ -56,7 +56,7 @@ Version: %{ruby_version_patch_level} # we cannot reset the release number to 1 even when the main (ruby) version # is updated - because it may be that the versions of sub-components don't # change. -Release: 21%{?dist} +Release: 22%{?dist} Group: Development/Languages # Public Domain for example for: include/ruby/st.h, strftime.c, ... License: (Ruby or BSD) and Public Domain @@ -742,6 +742,9 @@ make check TESTS="-v $DISABLE_TESTS" %{ruby_libdir}/tkextlib %changelog +* Sat Nov 10 2012 Mamoru TASAKA - 1.9.3.327-22 +- Ignore some network related tests + * Sat Nov 10 2012 Mamoru TASAKA - 1.9.3.327-21 - Update to 1.9.3.327 - Fix Hash-flooding DoS vulnerability on MurmurHash function From e546e8e8c85883378ca66352222958c8245c568c Mon Sep 17 00:00:00 2001 From: Mamoru Tasaka Date: Sun, 11 Nov 2012 00:03:25 +0900 Subject: [PATCH 05/10] Skip test_str_crypt (on rawhide) for now (upstream bug 7312) --- ruby-1.9.3-p327-crypt-argument-glibc217.patch | 14 ++++++++++++++ ruby.spec | 9 ++++++++- 2 files changed, 22 insertions(+), 1 deletion(-) create mode 100644 ruby-1.9.3-p327-crypt-argument-glibc217.patch diff --git a/ruby-1.9.3-p327-crypt-argument-glibc217.patch b/ruby-1.9.3-p327-crypt-argument-glibc217.patch new file mode 100644 index 0000000..df1e813 --- /dev/null +++ b/ruby-1.9.3-p327-crypt-argument-glibc217.patch @@ -0,0 +1,14 @@ +--- ruby-1.9.3-p327/test/ruby/test_m17n_comb.rb.save 2011-02-15 16:08:15.000000000 +0900 ++++ ruby-1.9.3-p327/test/ruby/test_m17n_comb.rb 2012-11-10 23:56:58.000000000 +0900 +@@ -777,6 +777,11 @@ + end + + def test_str_crypt ++ begin ++ a("").crypt(a("\xa1\xa1")) ++ rescue ArgumentError ++ skip 'http://bugs.ruby-lang.org/issues/show/7312' ++ end + combination(STRINGS, STRINGS) {|str, salt| + if a(salt).length < 2 + assert_raise(ArgumentError) { str.crypt(salt) } diff --git a/ruby.spec b/ruby.spec index d3d0638..7d4feab 100644 --- a/ruby.spec +++ b/ruby.spec @@ -56,7 +56,7 @@ Version: %{ruby_version_patch_level} # we cannot reset the release number to 1 even when the main (ruby) version # is updated - because it may be that the versions of sub-components don't # change. -Release: 22%{?dist} +Release: 23%{?dist} Group: Development/Languages # Public Domain for example for: include/ruby/st.h, strftime.c, ... License: (Ruby or BSD) and Public Domain @@ -94,6 +94,9 @@ Patch9: rubygems-1.8.11-binary-extensions.patch # On koji, network related tests sometimes cause internal server error, # ignore these Patch10: ruby-1.9.3-p327-ignore-internal-server-error-on-test.patch +# http://bugs.ruby-lang.org/issues/show/7312 +# test_str_crypt fails with glibc 2.17 +Patch11: ruby-1.9.3-p327-crypt-argument-glibc217.patch # Make mkmf verbose by default Patch12: ruby-1.9.3-mkmf-verbose.patch @@ -336,6 +339,7 @@ Tcl/Tk interface for the object-oriented scripting language Ruby. %patch8 -p1 %patch9 -p1 %patch10 -p1 +%patch11 -p1 %patch12 -p1 %build @@ -742,6 +746,9 @@ make check TESTS="-v $DISABLE_TESTS" %{ruby_libdir}/tkextlib %changelog +* Sun Nov 11 2012 Mamoru TASAKA - 1.9.3.327-23 +- Skip test_str_crypt (on rawhide) for now (upstream bug 7312) + * Sat Nov 10 2012 Mamoru TASAKA - 1.9.3.327-22 - Ignore some network related tests From 71a6c68957acfc2645c1fcf3f486a19cf2651b90 Mon Sep 17 00:00:00 2001 From: Bohuslav Kabrda Date: Mon, 3 Dec 2012 15:36:44 +0100 Subject: [PATCH 06/10] Disable one test on ARM until upstream confirms that the patch is ok --- ruby.spec | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/ruby.spec b/ruby.spec index d3d0638..e161b77 100644 --- a/ruby.spec +++ b/ruby.spec @@ -56,7 +56,7 @@ Version: %{ruby_version_patch_level} # we cannot reset the release number to 1 even when the main (ruby) version # is updated - because it may be that the versions of sub-components don't # change. -Release: 22%{?dist} +Release: 23%{?dist} Group: Development/Languages # Public Domain for example for: include/ruby/st.h, strftime.c, ... License: (Ruby or BSD) and Public Domain @@ -469,6 +469,12 @@ DISABLE_TESTS="-x test_drbssl.rb $DISABLE_TESTS" DISABLE_TESTS="-x test_dl2.rb $DISABLE_TESTS" %endif +%ifarch %{arm} +# test_parse.rb fails on ARM at line 787 +# http://bugs.ruby-lang.org/issues/6899 +DISABLE_TESTS="-x test_parse.rb $DISABLE_TESTS" +%endif + %ifnarch ppc ppc64 make check TESTS="-v $DISABLE_TESTS" %endif @@ -742,6 +748,10 @@ make check TESTS="-v $DISABLE_TESTS" %{ruby_libdir}/tkextlib %changelog +* Mon Dec 03 2012 Jaromir Capik - 1.9.3.327-23 +- Skipping test_parse.rb (fails on ARM at line 787) +- http://bugs.ruby-lang.org/issues/6899 + * Sat Nov 10 2012 Mamoru TASAKA - 1.9.3.327-22 - Ignore some network related tests From e7ad4decdbe8af1695a6ee4eee739b0dd99acfd0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?V=C3=ADt=20Ondruch?= Date: Thu, 6 Dec 2012 13:42:40 +0100 Subject: [PATCH 07/10] Fix bogus dates in %changelog reported by rpm-4.11. --- ruby.spec | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/ruby.spec b/ruby.spec index 7d4feab..634c6b6 100644 --- a/ruby.spec +++ b/ruby.spec @@ -818,18 +818,18 @@ make check TESTS="-v $DISABLE_TESTS" - Create and own RubyGems directories for binary extensions. - Fix build with GCC 4.7. -* Wed Jan 16 2012 Vít Ondruch - 1.9.3.0-3 +* Mon Jan 16 2012 Vít Ondruch - 1.9.3.0-3 - Fix RHEL build. - Fixed directory ownership. - Verose build output. -* Wed Jan 15 2012 Vít Ondruch - 1.9.3.0-2 +* Sun Jan 15 2012 Vít Ondruch - 1.9.3.0-2 - Install RubyGems outside of Ruby directory structure. - RubyGems has not its own -devel subpackage. - Enhanced macros.ruby and macros.rubygems. - All tests are green now (bkabrda). -* Tue Jan 14 2012 Vít Ondruch - 1.9.3.0-1 +* Sat Jan 14 2012 Vít Ondruch - 1.9.3.0-1 - Initial package * Sat Jan 14 2012 Fedora Release Engineering - 1.8.7.357-2 @@ -843,7 +843,7 @@ make check TESTS="-v $DISABLE_TESTS" - dont normalise arm cpus to arm - there is something weird about how ruby choses where to put bits -* Thu Nov 16 2011 Mamoru Tasaka - 1.8.7.352-3 +* Thu Nov 17 2011 Mamoru Tasaka - 1.8.7.352-3 - F-17: kill gdbm support for now due to licensing compatibility issue * Sat Oct 1 2011 Mamoru Tasaka - 1.8.7.352-2 @@ -1128,11 +1128,11 @@ make check TESTS="-v $DISABLE_TESTS" * Fri Aug 10 2007 Akira TAGOH - Update License tag. -* Mon Jul 25 2007 Akira TAGOH - 1.8.6.36-3 +* Mon Jun 25 2007 Akira TAGOH - 1.8.6.36-3 - ruby-r12567.patch: backport patch from upstream svn to get rid of the unnecessary declarations. (#245446) -* Wed Jul 20 2007 Akira TAGOH - 1.8.6.36-2 +* Wed Jun 20 2007 Akira TAGOH - 1.8.6.36-2 - New upstream release. - Fix Etc::getgrgid to get the correct gid as requested. (#236647) @@ -1596,7 +1596,7 @@ make check TESTS="-v $DISABLE_TESTS" - Removed ruby_cvs.2000092718.patch and added ruby_cvs.2000100218.patch (upgraded ruby to latest cvs version). -* Thu Sep 27 2000 akira yamada +* Wed Sep 27 2000 akira yamada - Updated to upstream version 1.6.1. - Removed ruby_cvs.2000082901.patch and added ruby_cvs.2000092718.patch (upgraded ruby to latest cvs version). @@ -1628,7 +1628,7 @@ make check TESTS="-v $DISABLE_TESTS" - Removed ruby-list.23190.patch(included into ruby_cvs.patch). - Added ruby-dev.10054.patch. -* Tue Jun 15 2000 akira yamada +* Thu Jun 15 2000 akira yamada - Updated to version 1.4.4(06/12/2000 CVS). - Added manuals and FAQs. - Split into ruby, ruby-devel, ruby-tcltk, ruby-docs, irb. @@ -1674,7 +1674,7 @@ make check TESTS="-v $DISABLE_TESTS" * Fri Nov 13 1998 Toru Hoshina - Version up. -* Mon Sep 22 1998 Toru Hoshina +* Tue Sep 22 1998 Toru Hoshina - To make a libruby.so. * Mon Sep 21 1998 Toru Hoshina From 58dbcf70fa43bd9578295521f736f7ef1c3a400e Mon Sep 17 00:00:00 2001 From: Mamoru Tasaka Date: Wed, 2 Jan 2013 16:06:59 +0900 Subject: [PATCH 08/10] Update to 1.9.3.362 From a8441ce179048e81ffc7b20dbd9d2487d27d9565 Mon Sep 17 00:00:00 2001 From: Mamoru Tasaka Date: Wed, 2 Jan 2013 16:07:42 +0900 Subject: [PATCH 09/10] Update to 1.9.3.362 --- .gitignore | 1 + ruby.spec | 7 +++++-- sources | 2 +- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index 214cb2e..e69175f 100644 --- a/.gitignore +++ b/.gitignore @@ -13,3 +13,4 @@ ruby-rev415a3ef9ab82c65a7abc-ext_tk.tar.gz /ruby-1.9.3-p194.tar.gz /ruby-1.9.3-p286.tar.gz /ruby-1.9.3-p327.tar.gz +/ruby-1.9.3-p362.tar.gz diff --git a/ruby.spec b/ruby.spec index cfdf48f..dac6472 100644 --- a/ruby.spec +++ b/ruby.spec @@ -1,7 +1,7 @@ %global major_version 1 %global minor_version 9 %global teeny_version 3 -%global patch_level 327 +%global patch_level 362 %global major_minor_version %{major_version}.%{minor_version} @@ -56,7 +56,7 @@ Version: %{ruby_version_patch_level} # we cannot reset the release number to 1 even when the main (ruby) version # is updated - because it may be that the versions of sub-components don't # change. -Release: 23%{?dist}.1 +Release: 24%{?dist} Group: Development/Languages # Public Domain for example for: include/ruby/st.h, strftime.c, ... License: (Ruby or BSD) and Public Domain @@ -752,6 +752,9 @@ make check TESTS="-v $DISABLE_TESTS" %{ruby_libdir}/tkextlib %changelog +* Wed Jan 2 2013 Mamoru TASAKA - 1.9.3.362-24 +- Update to 1.9.3.362 + * Mon Dec 03 2012 Jaromir Capik - 1.9.3.327-23 - Skipping test_parse.rb (fails on ARM at line 787) - http://bugs.ruby-lang.org/issues/6899 diff --git a/sources b/sources index a6d1e70..57ad81e 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -96118e856b502b5d7b3a4398e6c6e98c ruby-1.9.3-p327.tar.gz +1efc2316dc50e97591792d90647fade2 ruby-1.9.3-p362.tar.gz From 169a9110ad07e9472e9ef419bbab4d1abb11bd5f Mon Sep 17 00:00:00 2001 From: Mamoru Tasaka Date: Wed, 2 Jan 2013 16:18:38 +0900 Subject: [PATCH 10/10] Kill upstream-applied patch --- ruby-1.9.3-p327-crypt-argument-glibc217.patch | 14 -------------- ruby.spec | 5 +++-- 2 files changed, 3 insertions(+), 16 deletions(-) delete mode 100644 ruby-1.9.3-p327-crypt-argument-glibc217.patch diff --git a/ruby-1.9.3-p327-crypt-argument-glibc217.patch b/ruby-1.9.3-p327-crypt-argument-glibc217.patch deleted file mode 100644 index df1e813..0000000 --- a/ruby-1.9.3-p327-crypt-argument-glibc217.patch +++ /dev/null @@ -1,14 +0,0 @@ ---- ruby-1.9.3-p327/test/ruby/test_m17n_comb.rb.save 2011-02-15 16:08:15.000000000 +0900 -+++ ruby-1.9.3-p327/test/ruby/test_m17n_comb.rb 2012-11-10 23:56:58.000000000 +0900 -@@ -777,6 +777,11 @@ - end - - def test_str_crypt -+ begin -+ a("").crypt(a("\xa1\xa1")) -+ rescue ArgumentError -+ skip 'http://bugs.ruby-lang.org/issues/show/7312' -+ end - combination(STRINGS, STRINGS) {|str, salt| - if a(salt).length < 2 - assert_raise(ArgumentError) { str.crypt(salt) } diff --git a/ruby.spec b/ruby.spec index dac6472..83f659c 100644 --- a/ruby.spec +++ b/ruby.spec @@ -96,7 +96,8 @@ Patch9: rubygems-1.8.11-binary-extensions.patch Patch10: ruby-1.9.3-p327-ignore-internal-server-error-on-test.patch # http://bugs.ruby-lang.org/issues/show/7312 # test_str_crypt fails with glibc 2.17 -Patch11: ruby-1.9.3-p327-crypt-argument-glibc217.patch +# Fixed in 1.9.3 p 362 +#Patch11: ruby-1.9.3-p327-crypt-argument-glibc217.patch # Make mkmf verbose by default Patch12: ruby-1.9.3-mkmf-verbose.patch @@ -339,7 +340,7 @@ Tcl/Tk interface for the object-oriented scripting language Ruby. %patch8 -p1 %patch9 -p1 %patch10 -p1 -%patch11 -p1 +#%%patch11 -p1 %patch12 -p1 %build