Merge lp:~dobey/ubuntu/oneiric/couchdb/fix-780972 into lp:ubuntu/oneiric/couchdb

[dobey]

[Mathieu Trudel-Lapierre (cyphermox)]

It looks good, and builds fine. Uploading.

review: Approve

=== modified file 'debian/changelog'
--- debian/changelog	2011-06-14 17:47:09 +0000
+++ debian/changelog	2011-09-13 18:21:22 +0000
@@ -1,3 +1,9 @@
+couchdb (1.0.1-0ubuntu17) oneiric; urgency=high
+
+  * Backport svn r1039345 from 1.0.3 (LP: #780972)
+
+ -- John S Gruber <[e-mail]>  Fri, 02 Sep 2011 01:02:01 -0400
+
 couchdb (1.0.1-0ubuntu16) oneiric; urgency=low
 
   * Update Spidermonkey 1.8.5 patchset to the more palatable ones I'm
 
=== added file 'debian/patches/couchdb-svn1039345-backport.patch'
--- debian/patches/couchdb-svn1039345-backport.patch	1970-01-01 00:00:00 +0000
+++ debian/patches/couchdb-svn1039345-backport.patch	2011-09-13 18:21:22 +0000
@@ -0,0 +1,125 @@
+=== modified file 'src/erlang-oauth/oauth.app.in'
+--- old/src/erlang-oauth/oauth.app.in	2010-07-26 10:24:11 +0000
++++ new/src/erlang-oauth/oauth.app.in	2011-09-13 17:32:12 +0000
+@@ -1,6 +1,6 @@
+ {application, oauth, [
+   {description, "Erlang OAuth implementation"},
+-  {vsn, "dev"},
++  {vsn, "7d85d3ef"},
+   {modules, [
+     oauth,
+     oauth_hmac_sha1,
+
+=== modified file 'src/erlang-oauth/oauth_hmac_sha1.erl'
+--- old/src/erlang-oauth/oauth_hmac_sha1.erl	2010-07-26 10:24:11 +0000
++++ new/src/erlang-oauth/oauth_hmac_sha1.erl	2011-09-13 17:32:12 +0000
+@@ -8,4 +8,4 @@ signature(BaseString, CS, TS) ->
+   base64:encode_to_string(crypto:sha_mac(Key, BaseString)).
+ 
+ verify(Signature, BaseString, CS, TS) ->
+-  couch_util:verify(signature(BaseString, CS, TS), Signature).
++  Signature =:= signature(BaseString, CS, TS).
+
+=== modified file 'src/erlang-oauth/oauth_http.erl'
+--- old/src/erlang-oauth/oauth_http.erl	2009-08-24 15:44:14 +0000
++++ new/src/erlang-oauth/oauth_http.erl	2011-09-13 17:32:12 +0000
+@@ -10,7 +10,7 @@ post(URL, Data) ->
+   request(post, {URL, [], "application/x-www-form-urlencoded", Data}).
+ 
+ request(Method, Request) ->
+-  http:request(Method, Request, [{autoredirect, false}], []).
++  httpc:request(Method, Request, [{autoredirect, false}], []).
+ 
+ response_params(Response) ->
+   oauth_uri:params_from_string(response_body(Response)).
+
+=== modified file 'src/erlang-oauth/oauth_plaintext.erl'
+--- old/src/erlang-oauth/oauth_plaintext.erl	2010-07-26 10:24:11 +0000
++++ new/src/erlang-oauth/oauth_plaintext.erl	2011-09-13 17:32:12 +0000
+@@ -7,4 +7,4 @@ signature(CS, TS) ->
+   oauth_uri:calate("&", [CS, TS]).
+ 
+ verify(Signature, CS, TS) ->
+-  couch_util:verify(signature(CS, TS), Signature).
++  Signature =:= signature(CS, TS).
+
+=== modified file 'src/erlang-oauth/oauth_uri.erl'
+--- old/src/erlang-oauth/oauth_uri.erl	2009-08-24 15:44:14 +0000
++++ new/src/erlang-oauth/oauth_uri.erl	2011-09-13 17:32:12 +0000
+@@ -6,14 +6,6 @@
+ 
+ -import(lists, [concat/1]).
+ 
+--define(is_uppercase_alpha(C), C >= $A, C =< $Z).
+--define(is_lowercase_alpha(C), C >= $a, C =< $z).
+--define(is_alpha(C), ?is_uppercase_alpha(C); ?is_lowercase_alpha(C)).
+--define(is_digit(C), C >= $0, C =< $9).
+--define(is_alphanumeric(C), ?is_alpha(C); ?is_digit(C)).
+--define(is_unreserved(C), ?is_alphanumeric(C); C =:= $-; C =:= $_; C =:= $.; C =:= $~).
+--define(is_hex(C), ?is_digit(C); C >= $A, C =< $F).
+-
+ 
+ normalize(URI) ->
+   case http_uri:parse(URI) of
+@@ -66,23 +58,41 @@ intersperse(_, [X]) -> [X];
+ intersperse(Sep, [X|Xs]) ->
+   [X, Sep|intersperse(Sep, Xs)].
+ 
+-decode(Chars) ->
+-  decode(Chars, []).
++-define(is_alphanum(C), C >= $A, C =< $Z; C >= $a, C =< $z; C >= $0, C =< $9).
+ 
+-decode([], Decoded) ->
+-  lists:reverse(Decoded);
+-decode([$%,A,B|Etc], Decoded) when ?is_hex(A), ?is_hex(B) ->
+-  decode(Etc, [erlang:list_to_integer([A,B], 16)|Decoded]);
+-decode([C|Etc], Decoded) when ?is_unreserved(C) ->
+-  decode(Etc, [C|Decoded]).
+-
+-encode(Chars) ->
+-  encode(Chars, []).
+-
+-encode([], Encoded) ->
+-  lists:flatten(lists:reverse(Encoded));
+-encode([C|Etc], Encoded) when ?is_unreserved(C) ->
+-  encode(Etc, [C|Encoded]);
+-encode([C|Etc], Encoded) ->
+-  Value = io_lib:format("%~2.1.0s", [erlang:integer_to_list(C, 16)]),
+-  encode(Etc, [Value|Encoded]).
++encode(Term) when is_integer(Term) ->
++  integer_to_list(Term);
++encode(Term) when is_atom(Term) ->
++  encode(atom_to_list(Term));
++encode(Term) when is_list(Term) ->
++  encode(lists:reverse(Term, []), []).
++
++encode([X | T], Acc) when ?is_alphanum(X); X =:= $-; X =:= $_; X =:= $.; X =:= $~ ->
++  encode(T, [X | Acc]);
++encode([X | T], Acc) ->
++  NewAcc = [$%, dec2hex(X bsr 4), dec2hex(X band 16#0f) | Acc],
++  encode(T, NewAcc);
++encode([], Acc) ->
++  Acc.
++
++decode(Str) when is_list(Str) ->
++  decode(Str, []).
++
++decode([$%, A, B | T], Acc) ->
++  decode(T, [(hex2dec(A) bsl 4) + hex2dec(B) | Acc]);
++decode([X | T], Acc) ->
++  decode(T, [X | Acc]);
++decode([], Acc) ->
++  lists:reverse(Acc, []).
++
++-compile({inline, [{dec2hex, 1}, {hex2dec, 1}]}).
++
++dec2hex(N) when N >= 10 andalso N =< 15 ->
++  N + $A - 10;
++dec2hex(N) when N >= 0 andalso N =< 9 ->
++  N + $0.
++
++hex2dec(C) when C >= $A andalso C =< $F ->
++  C - $A + 10;
++hex2dec(C) when C >= $0 andalso C =< $9 ->
++  C - $0.
+