Bug#782018: unblock: nodejs/0.10.29~dfsg-2

[Jérémy Lal <kapouer@melix.org>]

Package: release.debian.org
Followup-For: Bug #782018
User: release.debian.org@packages.debian.org
Usertags: unblock

Here the debdiff of the version i intend to upload.

Jérémy.

diff -Nru nodejs-0.10.29~dfsg/debian/changelog nodejs-0.10.29~dfsg/debian/changelog
--- nodejs-0.10.29~dfsg/debian/changelog	2014-12-28 13:53:34.000000000 +0100
+++ nodejs-0.10.29~dfsg/debian/changelog	2015-04-12 02:11:22.000000000 +0200
@@ -1,3 +1,11 @@
+nodejs (0.10.29~dfsg-2) unstable; urgency=medium
+
+  * Update 2015_fix_test_crypto_stream.patch with a less strict
+    check for that test - coming from upstream. Also use DEP-3 format.
+    Closes: #781710.
+
+ -- Jérémy Lal <kapouer@melix.org>  Sun, 12 Apr 2015 01:59:43 +0200
+
 nodejs (0.10.29~dfsg-1.1) unstable; urgency=medium
 
   * Non-maintainer upload.
diff -Nru nodejs-0.10.29~dfsg/debian/patches/2015_fix_test_crypto_stream.patch nodejs-0.10.29~dfsg/debian/patches/2015_fix_test_crypto_stream.patch
--- nodejs-0.10.29~dfsg/debian/patches/2015_fix_test_crypto_stream.patch	2014-12-28 13:53:34.000000000 +0100
+++ nodejs-0.10.29~dfsg/debian/patches/2015_fix_test_crypto_stream.patch	2015-04-12 02:10:44.000000000 +0200
@@ -1,27 +1,16 @@
-From 707cc25011d142fe4ade14ce2aa083a96ef15bcb Mon Sep 17 00:00:00 2001
-From: Fedor Indutny <fedor@indutny.com>
-Date: Wed, 15 Oct 2014 20:50:15 +0400
-Subject: [PATCH] test: fix test-crypto-stream
+Description: loosen error check in test-crypto-stream
+Origin: https://github.com/joyent/node/commit/9e387fb6
+Last-Update: 2015-04-12
 
-Because of constant-timeness change made in openssl-1.0.1j the error is
-no longer returned from EVP_DecryptFinal_ex. Now it just return 0, and
-thus the error message does not contain proper error code. Adapt to this
-change, there is not much that we could do about it.
----
- test/simple/test-crypto-stream.js | 3 +--
- 1 file changed, 1 insertion(+), 2 deletions(-)
-
-diff --git a/test/simple/test-crypto-stream.js b/test/simple/test-crypto-stream.js
-index 72c9776..402761e 100644
 --- a/test/simple/test-crypto-stream.js
 +++ b/test/simple/test-crypto-stream.js
-@@ -70,8 +70,7 @@ var key = new Buffer('48fb56eb10ffeb13fc0ef551bbca3b1b', 'hex'),
+@@ -70,8 +70,7 @@
  
  cipher.pipe(decipher)
    .on('error', common.mustCall(function end(err) {
 -    // TypeError: error:06065064:digital envelope routines:EVP_DecryptFinal_ex:bad decrypt
 -    assert(/:06065064:/.test(err));
-+    assert(/:00000000:/.test(err));
++    assert(/bad decrypt/.test(err));
    }));
  
  cipher.end('Papaya!');  // Should not cause an unhandled exception.