<pre style='margin:0'>
Blair Zajac (blair) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/05e19aecce9312d6be0b0ef4a9e1a697d8ea3755">https://github.com/macports/macports-ports/commit/05e19aecce9312d6be0b0ef4a9e1a697d8ea3755</a></p>
<pre style="white-space: pre; background: #F8F8F8">The following commit(s) were added to refs/heads/master by this push:
<span style='display:block; white-space:pre;color:#404040;'> new 05e19aecce9 npm7: new upstream 7.6.1 release
</span>05e19aecce9 is described below
<span style='display:block; white-space:pre;color:#808000;'>commit 05e19aecce9312d6be0b0ef4a9e1a697d8ea3755
</span>Author: Blair Zajac <blair@macports.org>
AuthorDate: Fri Mar 5 10:22:13 2021 -0800
<span style='display:block; white-space:pre;color:#404040;'> npm7: new upstream 7.6.1 release
</span>---
devel/npm7/Portfile | 10 ++++----
devel/npm7/files/patch-lib-update.js.diff | 41 ++++++++++++++++---------------
2 files changed, 26 insertions(+), 25 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/devel/npm7/Portfile b/devel/npm7/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 1f9a4b32704..ab27ccba3c4 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/devel/npm7/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/devel/npm7/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -3,7 +3,7 @@
</span> PortSystem 1.0
name npm7
<span style='display:block; white-space:pre;background:#ffe0e0;'>-version 7.6.0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+version 7.6.1
</span> revision 0
categories devel
platforms darwin
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -26,10 +26,10 @@ distname npm-${version}
</span> extract.suffix .tgz
# Please keep the sha1 - users can use it to validate sha values published on npmjs.org for the package
<span style='display:block; white-space:pre;background:#ffe0e0;'>-checksums sha1 c366ffc31d4d85acc72fddf9ad33799183033812 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- rmd160 fbbe7744cb16392d0628fd928c84382cea33cae7 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 6fe261c6af4d4810c0cabf87da402980fe2f610b1a7b58f74449a5d603e011be \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- size 3811194
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+checksums sha1 6eb9569002685ee4fb8fb9c00c56146d3a8277f5 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ rmd160 461a65136db30f312e6b6f48ce4db36172b44085 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 d53f724d9da8de5e0d53853756a04dbd4eda2e380aca16bf78b2811a99e18981 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 3807514
</span>
worksrcdir "package"
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/devel/npm7/files/patch-lib-update.js.diff b/devel/npm7/files/patch-lib-update.js.diff
</span><span style='display:block; white-space:pre;color:#808080;'>index 4f3838c5e2e..8e61ec7c906 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/devel/npm7/files/patch-lib-update.js.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/devel/npm7/files/patch-lib-update.js.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,23 +1,24 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- lib/update.js.orig 2021-02-17 17:02:01.000000000 -0800
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ lib/update.js 2021-02-20 12:50:37.000000000 -0800
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -22,6 +22,20 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ? global
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- : npm.prefix
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- lib/update.js.orig 1985-10-26 01:15:00.000000000 -0700
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ lib/update.js 2021-03-05 10:21:30.000000000 -0800
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -36,6 +36,21 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ? global
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ : this.npm.prefix
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>-+ // Prevent npm package in global from updating. Prevent 'npm update -g'
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ // since it'll implicity upgrade npm and also prevent 'npm update -g npm'.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ if (npm.flatOptions.global) {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ if (!args.length || (args.length && args.find(e => e === "npm"))) {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ log.error('update', 'Ignoring attempt to update npm in ' + global);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ log.error('update', 'which is part of the MacPorts npm7 base');
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ log.error('update', 'installation. To update npm please run:');
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ log.error('update', 'sudo port selfupdate && sudo port upgrade npm7');
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ throw new Error('Ignoring attempt to update npm in ' + global +
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ ' which is part of the MacPorts npm7 base' +
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ ' installation.');
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ // Prevent the npm package in global from updating. Prevent
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ // 'npm update -g' since it'll implicity upgrade npm and also
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ // prevent 'npm update -g npm'.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ if (npm.flatOptions.global) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ if (!args.length || (args.length && args.find(e => e === 'npm'))) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ log.error('update', 'Ignoring attempt to update npm in ' + global);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ log.error('update', 'which is part of the MacPorts npm7 base');
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ log.error('update', 'installation. To update npm please run:');
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ log.error('update', 'sudo port selfupdate && sudo port upgrade npm7');
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ throw new Error('Ignoring attempt to update npm in ' + global +
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ ' which is part of the MacPorts npm7 base' +
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ ' installation.');
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ }
</span> + }
<span style='display:block; white-space:pre;background:#ffe0e0;'>-+ }
</span> +
<span style='display:block; white-space:pre;background:#ffe0e0;'>- if (npm.flatOptions.depth) {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- log.warn('update', 'The --depth option no longer has any effect. See RFC0019.\n' +
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 'https://github.com/npm/rfcs/blob/latest/implemented/0019-remove-update-depth-option.md')
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if (this.npm.flatOptions.depth) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ log.warn('update', 'The --depth option no longer has any effect. See RFC0019.\n' +
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 'https://github.com/npm/rfcs/blob/latest/implemented/0019-remove-update-depth-option.md')
</span></pre><pre style='margin:0'>
</pre>