diff -Nru node-bcrypt-pbkdf-1.0.1/CONTRIBUTING.md node-bcrypt-pbkdf-1.0.2/CONTRIBUTING.md --- node-bcrypt-pbkdf-1.0.1/CONTRIBUTING.md 1970-01-01 00:00:00.000000000 +0000 +++ node-bcrypt-pbkdf-1.0.2/CONTRIBUTING.md 2018-06-29 00:33:49.000000000 +0000 @@ -0,0 +1,13 @@ +# Contributing + +This repository uses [cr.joyent.us](https://cr.joyent.us) (Gerrit) for new +changes. Anyone can submit changes. To get started, see the [cr.joyent.us user +guide](https://github.com/joyent/joyent-gerrit/blob/master/docs/user/README.md). +This repo does not use GitHub pull requests. + +See the [Joyent Engineering +Guidelines](https://github.com/joyent/eng/blob/master/docs/index.md) for general +best practices expected in this repository. + +If you're changing something non-trivial or user-facing, you may want to submit +an issue first. diff -Nru node-bcrypt-pbkdf-1.0.1/debian/changelog node-bcrypt-pbkdf-1.0.2/debian/changelog --- node-bcrypt-pbkdf-1.0.1/debian/changelog 2017-05-07 15:57:57.000000000 +0000 +++ node-bcrypt-pbkdf-1.0.2/debian/changelog 2019-09-30 18:32:47.000000000 +0000 @@ -1,3 +1,23 @@ +node-bcrypt-pbkdf (1.0.2-1) unstable; urgency=medium + + * Team upload + + [ Pirate Praveen ] + * add homepage + * update copyright + + [ Ambady Anand S ] + * New upstream version 1.0.2 + * Bump Standards-Version to 4.4.0 + * Bump debhelper compatibility level to 12 + * Use salsa.debian.org in Vcs-* fields + * Change section to javascript + * Switch to pkg-js-tools auto install + * Remove tests + * Add node-tweetnacl as build dependency + + -- Ambady Anand S Mon, 30 Sep 2019 18:32:47 +0000 + node-bcrypt-pbkdf (1.0.1-1) unstable; urgency=low * Initial release (Closes: #862033) diff -Nru node-bcrypt-pbkdf-1.0.1/debian/compat node-bcrypt-pbkdf-1.0.2/debian/compat --- node-bcrypt-pbkdf-1.0.1/debian/compat 2017-05-07 15:57:57.000000000 +0000 +++ node-bcrypt-pbkdf-1.0.2/debian/compat 1970-01-01 00:00:00.000000000 +0000 @@ -1 +0,0 @@ -9 diff -Nru node-bcrypt-pbkdf-1.0.1/debian/control node-bcrypt-pbkdf-1.0.2/debian/control --- node-bcrypt-pbkdf-1.0.1/debian/control 2017-05-07 15:57:57.000000000 +0000 +++ node-bcrypt-pbkdf-1.0.2/debian/control 2019-09-30 18:32:47.000000000 +0000 @@ -1,16 +1,17 @@ Source: node-bcrypt-pbkdf -Section: web +Section: javascript Priority: optional Maintainer: Debian Javascript Maintainers Uploaders: Pirate Praveen Build-Depends: - debhelper (>= 9) - , dh-buildinfo + debhelper-compat (= 12) , nodejs -Standards-Version: 3.9.8 + , node-tweetnacl (>= 0.14.3) + , pkg-js-tools (>= 0.8.10) +Standards-Version: 4.4.0 Homepage: https://www.npmjs.com/package/bcrypt-pbkdf -Vcs-Git: https://anonscm.debian.org/git/pkg-javascript/node-bcrypt-pbkdf.git -Vcs-Browser: https://anonscm.debian.org/cgit/pkg-javascript/node-bcrypt-pbkdf.git +Vcs-Git: https://salsa.debian.org/js-team/node-bcrypt-pbkdf.git +Vcs-Browser: https://salsa.debian.org/js-team/node-bcrypt-pbkdf Package: node-bcrypt-pbkdf Architecture: all diff -Nru node-bcrypt-pbkdf-1.0.1/debian/install node-bcrypt-pbkdf-1.0.2/debian/install --- node-bcrypt-pbkdf-1.0.1/debian/install 2017-05-07 15:57:57.000000000 +0000 +++ node-bcrypt-pbkdf-1.0.2/debian/install 1970-01-01 00:00:00.000000000 +0000 @@ -1,2 +0,0 @@ -package.json usr/lib/nodejs/bcrypt-pbkdf/ -index.js usr/lib/nodejs/bcrypt-pbkdf/ diff -Nru node-bcrypt-pbkdf-1.0.1/debian/rules node-bcrypt-pbkdf-1.0.2/debian/rules --- node-bcrypt-pbkdf-1.0.1/debian/rules 2017-05-07 15:57:57.000000000 +0000 +++ node-bcrypt-pbkdf-1.0.2/debian/rules 2019-09-30 18:32:47.000000000 +0000 @@ -10,6 +10,4 @@ #override_dh_auto_build: #override_dh_auto_test: - - - + dh $@ --with nodejs diff -Nru node-bcrypt-pbkdf-1.0.1/debian/tests/control node-bcrypt-pbkdf-1.0.2/debian/tests/control --- node-bcrypt-pbkdf-1.0.1/debian/tests/control 2017-05-07 15:57:57.000000000 +0000 +++ node-bcrypt-pbkdf-1.0.2/debian/tests/control 1970-01-01 00:00:00.000000000 +0000 @@ -1,2 +0,0 @@ -Tests: require -Depends: node-bcrypt-pbkdf diff -Nru node-bcrypt-pbkdf-1.0.1/debian/tests/require node-bcrypt-pbkdf-1.0.2/debian/tests/require --- node-bcrypt-pbkdf-1.0.1/debian/tests/require 2017-05-07 15:57:57.000000000 +0000 +++ node-bcrypt-pbkdf-1.0.2/debian/tests/require 1970-01-01 00:00:00.000000000 +0000 @@ -1,3 +0,0 @@ -#!/bin/sh -set -e -nodejs -e "require('bcrypt-pbkdf');" diff -Nru node-bcrypt-pbkdf-1.0.1/LICENSE node-bcrypt-pbkdf-1.0.2/LICENSE --- node-bcrypt-pbkdf-1.0.1/LICENSE 1970-01-01 00:00:00.000000000 +0000 +++ node-bcrypt-pbkdf-1.0.2/LICENSE 2018-06-29 00:33:49.000000000 +0000 @@ -0,0 +1,66 @@ +The Blowfish portions are under the following license: + +Blowfish block cipher for OpenBSD +Copyright 1997 Niels Provos +All rights reserved. + +Implementation advice by David Mazieres . + +Redistribution and use in source and binary forms, with or without +modification, are permitted provided that the following conditions +are met: +1. Redistributions of source code must retain the above copyright + notice, this list of conditions and the following disclaimer. +2. Redistributions in binary form must reproduce the above copyright + notice, this list of conditions and the following disclaimer in the + documentation and/or other materials provided with the distribution. +3. The name of the author may not be used to endorse or promote products + derived from this software without specific prior written permission. + +THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR +IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES +OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. +IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, +INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT +NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, +DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY +THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT +(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF +THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + + + +The bcrypt_pbkdf portions are under the following license: + +Copyright (c) 2013 Ted Unangst + +Permission to use, copy, modify, and distribute this software for any +purpose with or without fee is hereby granted, provided that the above +copyright notice and this permission notice appear in all copies. + +THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES +WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF +MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR +ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES +WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN +ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF +OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. + + + +Performance improvements (Javascript-specific): + +Copyright 2016, Joyent Inc +Author: Alex Wilson + +Permission to use, copy, modify, and distribute this software for any +purpose with or without fee is hereby granted, provided that the above +copyright notice and this permission notice appear in all copies. + +THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES +WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF +MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR +ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES +WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN +ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF +OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. diff -Nru node-bcrypt-pbkdf-1.0.1/package.json node-bcrypt-pbkdf-1.0.2/package.json --- node-bcrypt-pbkdf-1.0.1/package.json 2017-02-02 03:54:27.000000000 +0000 +++ node-bcrypt-pbkdf-1.0.2/package.json 2018-06-29 00:33:49.000000000 +0000 @@ -1,7 +1,11 @@ { "name": "bcrypt-pbkdf", - "version": "1.0.1", + "version": "1.0.2", "description": "Port of the OpenBSD bcrypt_pbkdf function to pure JS", + "repository": { + "type": "git", + "url": "git://github.com/joyent/node-bcrypt-pbkdf.git" + }, "main": "index.js", "dependencies": { "tweetnacl": "^0.14.3" diff -Nru node-bcrypt-pbkdf-1.0.1/README.md node-bcrypt-pbkdf-1.0.2/README.md --- node-bcrypt-pbkdf-1.0.1/README.md 2017-02-02 03:51:32.000000000 +0000 +++ node-bcrypt-pbkdf-1.0.2/README.md 2018-06-29 00:33:49.000000000 +0000 @@ -1,6 +1,5 @@ Port of the OpenBSD `bcrypt_pbkdf` function to pure Javascript. `npm`-ified -version of [Devi Mandiri's port] -(https://github.com/devi/tmp/blob/master/js/bcrypt_pbkdf.js), +version of [Devi Mandiri's port](https://github.com/devi/tmp/blob/master/js/bcrypt_pbkdf.js), with some minor performance improvements. The code is copied verbatim (and un-styled) from Devi's work. @@ -37,3 +36,10 @@ * `sha2pass`, a Uint8Array of length 64 * `sha2salt`, a Uint8Array of length 64 * `out`, a Uint8Array of length 32, will be filled with output + +## License + +This source form is a 1:1 port from the OpenBSD `blowfish.c` and `bcrypt_pbkdf.c`. +As a result, it retains the original copyright and license. The two files are +under slightly different (but compatible) licenses, and are here combined in +one file. For each of the full license texts see `LICENSE`.