[DRE-commits] [ruby-rack] 08/10: add upstream patch to fix build against Ruby 2.0

[Antonio Terceiro]

This is an automated email from the git hooks/post-receive script.

terceiro pushed a commit to branch master-1.4
in repository ruby-rack.

commit d89006a8f26438183ac7cdcd61a2deba6f5d23a0
Author: Antonio Terceiro <terceiro at debian.org>
Date:   Sun Oct 20 13:08:23 2013 -0300

    add upstream patch to fix build against Ruby 2.0
---
 debian/changelog                             |    3 ++-
 debian/patches/0001-Fix-Ruby-2.0-build.patch |   25 +++++++++++++++++++++++++
 debian/patches/series                        |    1 +
 3 files changed, 28 insertions(+), 1 deletion(-)

diff --git a/debian/changelog b/debian/changelog
index 2c8d059..dded631 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -4,7 +4,8 @@ ruby-rack (1:1.4.5-1) UNRELEASED; urgency=low
     + Fixes session management breakage that affects rails3 and redmine.
       Closes: #711236
   * New upstream release in the 1.4.x series.
-    + debian/patches: all already applied upstream and removed
+    + debian/patches/*: all already applied upstream and removed
+    + debian/patches/0001-Fix-Ruby-2.0-build.patch added
 
  -- Antonio Terceiro <terceiro at debian.org>  Sun, 20 Oct 2013 12:52:06 -0300
 
diff --git a/debian/patches/0001-Fix-Ruby-2.0-build.patch b/debian/patches/0001-Fix-Ruby-2.0-build.patch
new file mode 100644
index 0000000..c25406a
--- /dev/null
+++ b/debian/patches/0001-Fix-Ruby-2.0-build.patch
@@ -0,0 +1,25 @@
+From 0a74380d2e5157d94c7e9141242af33e5c0bf951 Mon Sep 17 00:00:00 2001
+From: Santiago Pastorino <santiago at wyeworks.com>
+Date: Sat, 29 Dec 2012 17:36:08 -0200
+Subject: [PATCH] Fix Ruby 2.0 build
+
+---
+ test/spec_chunked.rb | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/test/spec_chunked.rb b/test/spec_chunked.rb
+index c81409f..12f2158 100644
+--- a/test/spec_chunked.rb
++++ b/test/spec_chunked.rb
+@@ -41,7 +41,7 @@ describe Rack::Chunked do
+     response.headers.should.not.include 'Content-Length'
+     response.headers['Transfer-Encoding'].should.equal 'chunked'
+     response.body.encoding.to_s.should.equal "ASCII-8BIT"
+-    response.body.should.equal "c\r\n\xFE\xFFH\x00e\x00l\x00l\x00o\x00\r\n2\r\n \x00\r\na\r\nW\x00o\x00r\x00l\x00d\x00\r\n0\r\n\r\n"
++    response.body.should.equal "c\r\n\xFE\xFFH\x00e\x00l\x00l\x00o\x00\r\n2\r\n \x00\r\na\r\nW\x00o\x00r\x00l\x00d\x00\r\n0\r\n\r\n".force_encoding("BINARY")
+   end if RUBY_VERSION >= "1.9"
+ 
+   should 'not modify response when Content-Length header present' do
+-- 
+1.8.4.rc3
+
diff --git a/debian/patches/series b/debian/patches/series
new file mode 100644
index 0000000..a5b2fed
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1 @@
+0001-Fix-Ruby-2.0-build.patch

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-ruby-extras/ruby-rack.git