[DRE-commits] [ruby-rack] 01/01: Rename patches

[Youhei SASAKI]

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

uwabami-guest pushed a commit to branch master
in repository ruby-rack.

commit 154b6cca475fcb78c8a7ef0cf9cbfa1172c53f7f
Author: Youhei SASAKI <uwabami at gfd-dennou.org>
Date:   Thu Jul 30 18:26:14 2015 +0900

    Rename patches
    
    Signed-off-by: Youhei SASAKI <uwabami at gfd-dennou.org>
---
 ...deep_params.patch => 0001-Fix-Params_Depth.patch} | 20 ++++++++------------
 ...d-FTBFS.patch => 0002-Fix-unreported-FTBFS.patch} |  0
 debian/patches/series                                |  5 +++--
 3 files changed, 11 insertions(+), 14 deletions(-)

diff --git a/debian/patches/1-5-deep_params.patch b/debian/patches/0001-Fix-Params_Depth.patch
similarity index 86%
rename from debian/patches/1-5-deep_params.patch
rename to debian/patches/0001-Fix-Params_Depth.patch
index deec66e..c6f68af 100644
--- a/debian/patches/1-5-deep_params.patch
+++ b/debian/patches/0001-Fix-Params_Depth.patch
@@ -1,7 +1,6 @@
-From fa15479e232663b2b5b048155b8e74228ab75d7e Mon Sep 17 00:00:00 2001
 From: Aaron Patterson <aaron.patterson () gmail com>
 Date: Tue, 20 Jan 2015 14:30:13 -0800
-Subject: [PATCH] raise an exception if the parameters are too deep
+Subject: raise an exception if the parameters are too deep
 
 CVE-2015-3225
 
@@ -14,10 +13,10 @@ Conflicts:
  2 files changed, 23 insertions(+), 4 deletions(-)
 
 diff --git a/lib/rack/utils.rb b/lib/rack/utils.rb
-index 561e46e..a163c49 100644
+index 6576dd2..4656f4a 100644
 --- a/lib/rack/utils.rb
 +++ b/lib/rack/utils.rb
-@@ -52,12 +52,17 @@ module Rack
+@@ -49,12 +49,17 @@ module Rack
  
      class << self
        attr_accessor :key_space_limit
@@ -35,7 +34,7 @@ index 561e46e..a163c49 100644
      # Stolen from Mongrel, with some small modifications:
      # Parses a query string by breaking it up at the '&'
      # and ';' characters.  You can also use this to parse
-@@ -100,7 +105,9 @@ module Rack
+@@ -94,7 +99,9 @@ module Rack
      end
      module_function :parse_nested_query
  
@@ -46,7 +45,7 @@ index 561e46e..a163c49 100644
        name =~ %r(\A[\[\]]*([^\[\]]+)\]*)
        k = $1 || ''
        after = $' || ''
-@@ -118,14 +125,14 @@ module Rack
+@@ -112,14 +119,14 @@ module Rack
          params[k] ||= []
          raise TypeError, "expected Array (got #{params[k].class.name}) for param `#{k}'" unless params[k].is_a?(Array)
          if params_hash_type?(params[k].last) && !params[k].last.key?(child_key)
@@ -65,11 +64,11 @@ index 561e46e..a163c49 100644
  
        return params
 diff --git a/test/spec_utils.rb b/test/spec_utils.rb
-index 622b8ff..c1a2207 100644
+index 69e3fbb..ac1e003 100644
 --- a/test/spec_utils.rb
 +++ b/test/spec_utils.rb
-@@ -123,6 +123,18 @@ describe Rack::Utils do
-     Rack::Utils.parse_query(",foo=bar;,", ";,").should.equal "foo" => "bar"
+@@ -114,6 +114,18 @@ describe Rack::Utils do
+     Rack::Utils.parse_query("foo%3Dbaz=bar").should.equal "foo=baz" => "bar"
    end
  
 +  should "raise an exception if the params are too deep" do
@@ -87,6 +86,3 @@ index 622b8ff..c1a2207 100644
    should "parse nested query strings correctly" do
      Rack::Utils.parse_nested_query("foo").
        should.equal "foo" => nil
--- 
-2.2.1
-
diff --git a/debian/patches/0001-Fix-unreported-FTBFS.patch b/debian/patches/0002-Fix-unreported-FTBFS.patch
similarity index 100%
rename from debian/patches/0001-Fix-unreported-FTBFS.patch
rename to debian/patches/0002-Fix-unreported-FTBFS.patch
diff --git a/debian/patches/series b/debian/patches/series
index 65335ad..7adbb2c 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1,3 @@
-0001-Fix-unreported-FTBFS.patch
-1-5-deep_params.patch
+0001-Fix-Params_Depth.patch
+0002-Fix-unreported-FTBFS.patch
+series

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