apply patches

debian/control

@@ -3,27 +3,28 @@ Maintainer: OpenKylin Developers <packaging@lists.openkylin.top>
 Section: javascript
 Testsuite: autopkgtest-pkg-nodejs
 Priority: optional
-Build-Depends: debhelper-compat (= 13),
-               node-bluebird <!nocheck>,
-               node-chownr <!nocheck>,
-               node-flush-write-stream (>= 1.0.3),
-               node-glob (>= 7.1.2) <!nocheck>,
-               node-graceful-fs <!nocheck>,
-               node-lru-cache (>= 4.1.1) <!nocheck>,
-               node-mississippi <!nocheck>,
-               node-mkdirp (>= 1.0.3) <!nocheck>,
-               node-move-concurrently <!nocheck>,
-               node-p-map (>= 3.0.0) <!nocheck>,
-               node-promise-inflight <!nocheck>,
-               node-require-inject (>= 1.4.4) <!nocheck>,
-               node-rimraf (>= 2.6.1) <!nocheck>,
-               node-ssri <!nocheck>,
-               node-tacks <!nocheck>,
-               node-tap <!nocheck>,
-               node-unique-filename <!nocheck>,
-               node-y18n <!nocheck>,
-               dh-sequence-nodejs
-Standards-Version: 4.6.0
+Build-Depends: debhelper-compat (= 13)
+ , dh-sequence-nodejs
+ , node-bluebird <!nocheck>
+ , node-chownr <!nocheck>
+ , node-flush-write-stream (>= 1.0.3)
+ , node-glob <!nocheck>
+ , node-graceful-fs <!nocheck>
+ , node-lru-cache (>= 7) <!nocheck>
+ , node-minipass <!nocheck>
+ , node-mississippi <!nocheck>
+ , node-mkdirp (>= 1.0.3) <!nocheck>
+ , node-move-concurrently <!nocheck>
+ , node-p-map (>= 3.0.0) <!nocheck>
+ , node-promise-inflight <!nocheck>
+ , node-rimraf <!nocheck>
+ , node-semver <!nocheck>
+ , node-ssri (>= 9) <!nocheck>
+ , node-tacks <!nocheck>
+ , node-tap (>= 15) <!nocheck>
+ , node-unique-filename <!nocheck>
+ , node-y18n <!nocheck>
+Standards-Version: 4.6.1
 Vcs-Browser: https://gitee.com/openkylin/node-cacache
 Vcs-Git: https://gitee.com/openkylin/node-cacache.git
 Homepage: https://github.com/npm/cacache#readme
@@ -31,19 +32,21 @@ Rules-Requires-Root: no
 
 Package: node-cacache
 Architecture: all
-Depends: ${misc:Depends},
-         nodejs,
-         node-chownr,
-         node-glob (>= 7.1.2),
-         node-graceful-fs,
-         node-lru-cache (>= 4.1.1),
-         node-mkdirp (>= 1.0.3),
-         node-move-concurrently,
-         node-p-map (>= 3.0.0),
-         node-promise-inflight,
-         node-rimraf (>= 2.6.1),
-         node-ssri,
-         node-unique-filename
+Depends: ${misc:Depends}
+ , node-chownr
+ , node-glob
+ , node-graceful-fs
+ , node-lru-cache (>= 7)
+ , node-minipass
+ , node-mkdirp (>= 1.0.3)
+ , node-move-concurrently
+ , node-p-map (>= 3.0.0)
+ , node-promise-inflight
+ , node-rimraf
+ , node-semver
+ , node-ssri (>= 9)
+ , node-unique-filename
+Breaks: npm (<< 8.6~)
 Provides: ${nodejs:Provides}
 Description: fast, fault-tolerant, disk-based, data-agnostic, content-addressable cache
  This module is a Node.js library for managing local key and content address

debian/copyright

@@ -3,32 +3,35 @@ Upstream-Name: cacache
 Upstream-Contact: https://github.com/npm/cacache/issues
 Source: https://github.com/npm/cacache#readme
  https://github.com/npm/move-file/tags
+ https://github.com/npm/fs/tags
+ https://github.com/wraithgar/gar-promisify/tags
 
 Files: *
 Copyright: npm, Inc. and Contributors
 License: ISC
 
-Files: figgy-pudding/*
-Copyright: npm, Inc.
+Files: debian/*
+Copyright: 2017 Pirate Praveen <praveen@debian.org>
+ 2019-2022 Yadd <yadd@debian.org>
 License: ISC
 
 Files: fs-minipass/*
- minipass-collect/*
- minipass-flush/*
- minipass-pipeline/*
 Copyright: Isaac Z. Schlueter and Contributors
 License: ISC
 
+Files: gar-promisify/*
+Copyright: 2020-2022 Michael Garvin
+License: Expat
+
+Files: npmcli-fs/lib/cp/*
+Copyright: 2011-2017 JP Richardson
+License: Expat
+
 Files: npmcli-move-file/*
 Copyright: Sindre Sorhus <sindresorhus@gmail.com>
  npm, Inc.
 License: Expat
 
-Files: debian/*
-Copyright: 2017 Pirate Praveen <praveen@debian.org>
- 2019-2020 Yadd <yadd@debian.org>
-License: ISC
-
 License: Expat
  Permission is hereby granted, free of charge, to any person obtaining a
  copy of this software and associated documentation files (the "Software"),

debian/docs

@@ -1 +1,3 @@
+CODE_OF_CONDUCT.md
 README.md
+SECURITY.md

debian/gbp.conf

@@ -1,5 +1,5 @@
 [DEFAULT]
-component=['figgy-pudding', 'fs-minipass', 'infer-owner', 'minipass', 'minipass-collect', 'minipass-flush', 'minipass-pipeline', 'npmcli-move-file']
+component=['fs-minipass', 'infer-owner', 'npmcli-move-file', 'npmcli-fs', 'gar-promisify']
 
 [import-orig]
 filter=.gitignore

debian/nodejs/root_modules

@@ -1 +1,3 @@
+gar-promisify
 npmcli-move-file
+npmcli-fs

debian/rules

@@ -6,3 +6,7 @@
 
 %:
 	dh $@
+
+override_dh_install:
+	dh_install
+	rm -f debian/node-cacache/usr/share/nodejs/@npmcli/fs/lib/cp/LICENSE

debian/tests/pkg-js/test

@@ -1 +1 @@
-NODE_PATH=`pwd`/node_modules tap -J --bail `ls test/*.js|grep -v test/content.write.js|grep -v test/strict|grep -v test/verify.js|grep -v test/util.tmp.js|grep -v test/entry-index.js|grep -v test/util.fix-owner.js|grep -v test/util.move-file.js`
+NODE_PATH=`pwd`/node_modules tap -R tap --no-cov -J --bail `ls test/*.js|grep -v test/content.write.js|grep -v test/strict|grep -v test/verify.js|grep -v test/util.tmp.js|grep -v test/entry-index.js|grep -v test/util.fix-owner.js|grep -v test/util.move-file.js`

debian/watch

@@ -4,9 +4,6 @@ dversionmangle=auto,\
 filenamemangle=s/.*?(\d[\d\.-]*@ARCHIVE_EXT@)/node-cacache-$1/ \
  https://github.com/npm/cacache/tags .*/archive/.*/v?([\d\.]+).tar.gz group
 
-opts="searchmode=plain,pgpmode=none,dversionmangle=auto,ctype=nodejs,component=figgy-pudding" \
- https://registry.npmjs.org/figgy-pudding https://registry.npmjs.org/figgy-pudding/-/figgy-pudding-(\d[\d\.]*)@ARCHIVE_EXT@ checksum
-
 opts=\
 ctype=nodejs,\
 component=fs-minipass,\
@@ -21,33 +18,23 @@ dversionmangle=auto,\
 filenamemangle=s/.*?(\d[\d\.-]*@ARCHIVE_EXT@)/node-infer-owner-$1/ \
  https://github.com/npm/infer-owner/tags .*/archive/.*/v?([\d\.]+).tar.gz checksum
 
-opts=\
-ctype=nodejs,\
-component=minipass,\
-dversionmangle=auto,\
-filenamemangle=s/.*?(\d[\d\.-]*@ARCHIVE_EXT@)/node-minipass-$1/ \
- https://github.com/isaacs/minipass/tags .*/archive/.*/v?([\d\.]+).tar.gz checksum
-
-# It is not recommended use npmregistry. Please investigate more.
-# Take a look at https://wiki.debian.org/debian/watch/
-opts="searchmode=plain,ctype=nodejs,component=minipass-collect,pgpmode=none" \
- https://registry.npmjs.org/minipass-collect https://registry.npmjs.org/minipass-collect/-/minipass-collect-([\d\.]+)@ARCHIVE_EXT@ checksum
-
-opts=\
-ctype=nodejs,\
-component=minipass-flush,\
-dversionmangle=auto,\
-filenamemangle=s/.*?(\d[\d\.-]*@ARCHIVE_EXT@)/node-minipass-flush-$1/ \
- https://github.com/isaacs/minipass-flush/tags .*/archive/.*/v?([\d\.]+).tar.gz checksum
-
-# It is not recommended use npmregistry. Please investigate more.
-# Take a look at https://wiki.debian.org/debian/watch/
-opts="searchmode=plain,ctype=nodejs,component=minipass-pipeline,pgpmode=none" \
- https://registry.npmjs.org/minipass-pipeline https://registry.npmjs.org/minipass-pipeline/-/minipass-pipeline-([\d\.]+)@ARCHIVE_EXT@ checksum
-
 opts=\
 ctype=nodejs,\
 component=npmcli-move-file,\
 dversionmangle=auto,\
-filenamemangle=s/.*?(\d[\d\.-]*@ARCHIVE_EXT@)/node-move-file-$1/ \
+filenamemangle=s/.*?(\d[\d\.-]*@ARCHIVE_EXT@)/node-npmcli-move-file-$1/ \
  https://github.com/npm/move-file/tags .*/archive/.*/v?([\d\.]+).tar.gz checksum
+
+opts=\
+component=npmcli-fs,\
+ctype=nodejs,\
+dversionmangle=auto,\
+filenamemangle=s/.*?(\d[\d\.-]*@ARCHIVE_EXT@)/node-npmcli-fs-$1/ \
+ https://github.com/npm/fs/tags .*/archive.*/v?([\d\.]+).tar.gz checksum
+
+opts=\
+component=gar-promisify,\
+ctype=nodejs,\
+dversionmangle=auto,\
+filenamemangle=s/.*?(\d[\d\.-]*@ARCHIVE_EXT@)/node-gar-promisify-$1/ \
+ https://github.com/wraithgar/gar-promisify/tags .*/archive.*/v?([\d\.]+).tar.gz checksum