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