From e546e8e8c85883378ca66352222958c8245c568c Mon Sep 17 00:00:00 2001
From: Mamoru Tasaka <tasaka1@localhost.localdomain>
Date: Sun, 11 Nov 2012 00:03:25 +0900
Subject: [PATCH] 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 <mtasaka@fedoraproject.org> - 1.9.3.327-23
+- Skip test_str_crypt (on rawhide) for now (upstream bug 7312)
+
 * Sat Nov 10 2012 Mamoru TASAKA <mtasaka@fedoraproject.org> - 1.9.3.327-22
 - Ignore some network related tests