[Pkg-javascript-commits] [node-asn1.js] 01/07: merge patched into master

[Bastien Roucariès]

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

rouca pushed a commit to branch master
in repository node-asn1.js.

commit 1ec51e5b8b98957a8c5fedfb705953bb2cd0ed5a
Merge: d047200 d1fd674
Author: Bastien ROUCARIÈS <roucaries.bastien at gmail.com>
Date:   Thu Nov 9 12:08:13 2017 +0100

    merge patched into master

 .eslintrc.js                                       |   27 +
 README.md                                          |    2 +-
 debian/.git-dpm                                    |    6 +-
 ...001-Replace-minimalistic-assert-by-assert.patch |   22 +-
 lib/asn1.js                                        |    4 +-
 lib/asn1/api.js                                    |   12 +-
 lib/asn1/base/buffer.js                            |   18 +-
 lib/asn1/base/index.js                             |    4 +-
 lib/asn1/base/node.js                              |  163 +--
 lib/asn1/base/reporter.js                          |   30 +-
 lib/asn1/constants/der.js                          |    4 +-
 lib/asn1/constants/index.js                        |    8 +-
 lib/asn1/decoders/der.js                           |  140 ++-
 lib/asn1/decoders/index.js                         |    4 +-
 lib/asn1/decoders/pem.js                           |   30 +-
 lib/asn1/encoders/der.js                           |   84 +-
 lib/asn1/encoders/index.js                         |    4 +-
 lib/asn1/encoders/pem.js                           |   16 +-
 package-lock.json                                  | 1325 ++++++++++++++++++++
 package.json                                       |    8 +-
 rfc/2560/index.js                                  |   59 +-
 rfc/2560/package-lock.json                         |  222 ++++
 rfc/2560/package.json                              |   10 +-
 rfc/2560/test/basic-test.js                        |   23 +-
 rfc/5280/index.js                                  |  323 ++---
 rfc/5280/package-lock.json                         |  214 ++++
 rfc/5280/package.json                              |    8 +-
 rfc/5280/test/basic-test.js                        |  119 +-
 rfc/5280/test/fixtures/cert1.crl                   |  Bin 0 -> 541 bytes
 rfc/5280/test/fixtures/cert4.crl                   |  Bin 0 -> 462 bytes
 test/der-decode-test.js                            |   49 +-
 test/der-encode-test.js                            |   41 +-
 test/error-test.js                                 |   35 +-
 test/fixtures.js                                   |    5 +-
 test/pem-test.js                                   |   23 +-
 test/ping-pong-test.js                             |   21 +-
 test/tracking-test.js                              |   23 +-
 test/use-test.js                                   |   65 +-
 38 files changed, 2529 insertions(+), 622 deletions(-)

diff --cc debian/.git-dpm
index 9c888ee,0000000..148ec74
mode 100644,000000..100644
--- a/debian/.git-dpm
+++ b/debian/.git-dpm
@@@ -1,8 -1,0 +1,8 @@@
 +# see git-dpm(1) from git-dpm package
- a0ae6fb596d2e5b1140db875bead7fa4763e656e
- a0ae6fb596d2e5b1140db875bead7fa4763e656e
- 33e8f17800306ed28150ef8b6db71efa812552e5
++d1fd67451d54586146480480023da1d0e2113b64
++d1fd67451d54586146480480023da1d0e2113b64
++3620bdf77502254a6e4cce7d515c97acbd7e09ad
 +3620bdf77502254a6e4cce7d515c97acbd7e09ad
 +node-asn1.js_5.0.0.orig.tar.gz
 +675fd79cca7cd6bf39ff3dad90575d3a8bdc4bc0
 +48245
diff --cc debian/patches/0001-Replace-minimalistic-assert-by-assert.patch
index 2477ebb,0000000..ebba8e3
mode 100644,000000..100644
--- a/debian/patches/0001-Replace-minimalistic-assert-by-assert.patch
+++ b/debian/patches/0001-Replace-minimalistic-assert-by-assert.patch
@@@ -1,36 -1,0 +1,36 @@@
- From a0ae6fb596d2e5b1140db875bead7fa4763e656e Mon Sep 17 00:00:00 2001
++From d1fd67451d54586146480480023da1d0e2113b64 Mon Sep 17 00:00:00 2001
 +From: =?UTF-8?q?Bastien=20ROUCARI=C3=88S?= <roucaries.bastien at gmail.com>
 +Date: Mon, 17 Apr 2017 21:42:00 +0200
 +Subject: Replace minimalistic-assert by assert
 +
 +Forwarded: no
 +---
 + lib/asn1/base/node.js | 2 +-
 + package.json          | 2 +-
 + 2 files changed, 2 insertions(+), 2 deletions(-)
 +
 +diff --git a/lib/asn1/base/node.js b/lib/asn1/base/node.js
- index 7b26bd8..1e65281 100644
++index ecea468..3c7b6a9 100644
 +--- a/lib/asn1/base/node.js
 ++++ b/lib/asn1/base/node.js
- @@ -1,7 +1,7 @@
-  var Reporter = require('../base').Reporter;
-  var EncoderBuffer = require('../base').EncoderBuffer;
-  var DecoderBuffer = require('../base').DecoderBuffer;
- -var assert = require('minimalistic-assert');
- +var assert = require('assert');
++@@ -3,7 +3,7 @@
++ const Reporter = require('../base').Reporter;
++ const EncoderBuffer = require('../base').EncoderBuffer;
++ const DecoderBuffer = require('../base').DecoderBuffer;
++-const assert = require('minimalistic-assert');
+++const assert = require('assert');
 + 
 + // Supported tags
-  var tags = [
++ const tags = [
 +diff --git a/package.json b/package.json
- index 0b987b8..7b04d6e 100644
++index b1e23bf..61fe6eb 100644
 +--- a/package.json
 ++++ b/package.json
- @@ -26,6 +26,6 @@
++@@ -30,6 +30,6 @@
 +   "dependencies": {
 +     "bn.js": "^4.0.0",
 +     "inherits": "^2.0.1",
 +-    "minimalistic-assert": "^1.0.0"
 ++    "assert": "^1.0.0"
 +   }
 + }

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-javascript/node-asn1.js.git