upgpkg: nodejs-sword-interface 0.225.0-1

upstream release

2 files changed, 16 insertions, 10 deletions

diff --git a/.SRCINFO b/.SRCINFO
index f6381fcbb073..33e46869f05f 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
 pkgbase = nodejs-sword-interface
 	pkgdesc = Javascript (N-API) interface to SWORD library
-	pkgver = 0.222.0
-	pkgrel = 3
+	pkgver = 0.225.0
+	pkgrel = 1
 	url = https://github.com/tobias-klein/node-sword-interface
 	arch = x86_64
 	license = GPL3
@@ -12,8 +12,8 @@ pkgbase = nodejs-sword-interface
 	makedepends = sword
 	depends = nodejs
 	depends = nodejs-addon-api
-	source = nodejs-sword-interface-0.222.0.tar.gz::https://github.com/tobias-klein/node-sword-interface/archive/0.222.0.tar.gz
-	sha256sums = 119378d01ae62a647bd3b86e7883a4e4af0b289dac23ac1eb6358baee4720720
+	source = nodejs-sword-interface-0.225.0.tar.gz::https://github.com/tobias-klein/node-sword-interface/archive/0.225.0.tar.gz
+	sha256sums = 4f3c4a376abfe033d55a5e9852adc8c4623bcea287cf5618c29d31be8225efe4
 
 pkgname = nodejs-sword-interface
 
diff --git a/PKGBUILD b/PKGBUILD
index a5b3e8513744..0a4c61bbebfc 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -2,8 +2,8 @@
 
 pkgname=nodejs-sword-interface
 _npmname=${pkgname/js}
-pkgver=0.222.0
-pkgrel=3
+pkgver=0.225.0
+pkgrel=1
 pkgdesc='Javascript (N-API) interface to SWORD library'
 arch=('x86_64')
 url="https://github.com/tobias-klein/$_npmname"
@@ -11,7 +11,7 @@ license=('GPL3')
 depends=('nodejs' 'nodejs-addon-api')
 makedepends=('jq' 'node-gyp' 'moreutils' 'npm' 'sword')
 source=("$pkgname-$pkgver.tar.gz::$url/archive/$pkgver.tar.gz")
-sha256sums=('119378d01ae62a647bd3b86e7883a4e4af0b289dac23ac1eb6358baee4720720')
+sha256sums=('4f3c4a376abfe033d55a5e9852adc8c4623bcea287cf5618c29d31be8225efe4')
 
 prepare() {
     cd "$_npmname-$pkgver"
@@ -39,11 +39,17 @@ package() {
     rm -rf "$pkgdir/usr/lib/node_modules/$_npmname/"{node_modules,sword_build,*.tgz,build/{node_modules,sword_build}}
 
     # Use system provided deps
-    pushd "$pkgdir/usr/lib/node_modules/$_npmname/" && ls -sf /usr/lib/node_modules
-    pushd ../build && ls -sf /usr/lib/node_modules
+    pushd "$pkgdir/usr/lib/node_modules/$_npmname/" && ln -sf /usr/lib/node_modules
+    pushd ../build && ln -sf /usr/lib/node_modules
 
-    find "$pkgdir"/usr -type d -exec chmod 755 {} +
     find "$pkgdir" -type f -name package.json \
         -execdir sh -c "jq '. |= with_entries(select(.key | test(\"_.+\") | not))' {} | sponge {}" \;
+
+    # Non-deterministic race in npm gives 777 permissions to random directories.
+    # See https://github.com/npm/npm/issues/9359 for details.
+    chmod -R u=rwX,go=rX "$pkgdir"
+
+    # npm installs package.json owned by build user
+    # https://bugs.archlinux.org/task/63396
     chown -R root:root "$pkgdir"
 }