summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorfordprefect2020-04-22 13:03:16 +0200
committerfordprefect2020-04-22 13:03:16 +0200
commit5bc6e75f846f5baa18e9fd0b0a1566412c4de6f4 (patch)
tree8cdca1ce7a3a0e0eaab175791abe0e4d5691d857
parent8f95832d5a8f3e7b6edc9686f789f12a01bff104 (diff)
downloadaur-5bc6e75f846f5baa18e9fd0b0a1566412c4de6f4.tar.gz
package improvements
-rw-r--r--.SRCINFO4
-rw-r--r--PKGBUILD29
2 files changed, 23 insertions, 10 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 589978b3a708..9b37098c8687 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
pkgbase = jitsi-meet
pkgdesc = WebRTC JavaScript video conferences
pkgver = 4039
- pkgrel = 1
+ pkgrel = 2
url = https://github.com/jitsi/jitsi-meet
arch = x86_64
license = Apache
@@ -15,7 +15,7 @@ pkgbase = jitsi-meet
backup = opt/jitsi-meet/config.js
backup = opt/jitsi-meet/interface_config.js
backup = opt/jitsi-meet/logging_config.js
- source = jitsi-meet-4039::https://github.com/jitsi/jitsi-meet/archive/4039.tar.gz
+ source = jitsi-meet-4039.tar.gz::https://github.com/jitsi/jitsi-meet/archive/4039.tar.gz
md5sums = 8c8e92686254a711122478b1bdad8fd3
pkgname = jitsi-meet
diff --git a/PKGBUILD b/PKGBUILD
index 7897b0ef528b..ee4b9d9f868b 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,6 +1,6 @@
pkgname=jitsi-meet
pkgver=4039
-pkgrel=1
+pkgrel=2
pkgdesc="WebRTC JavaScript video conferences"
arch=("x86_64")
url="https://github.com/jitsi/jitsi-meet"
@@ -14,17 +14,30 @@ backup=("opt/jitsi-meet/config.js"
"opt/jitsi-meet/interface_config.js"
"opt/jitsi-meet/logging_config.js")
options=("!strip")
-source=($pkgname-$pkgver::https://github.com/jitsi/jitsi-meet/archive/$pkgver.tar.gz)
+source=($pkgname-$pkgver.tar.gz::https://github.com/jitsi/jitsi-meet/archive/$pkgver.tar.gz)
md5sums=('8c8e92686254a711122478b1bdad8fd3')
build() {
- cd "${srcdir}/${pkgname}-${pkgver}"
- npm install
- # Make fails with more than one thread
- make -j1
+ cd "${srcdir}/${pkgname}-${pkgver}"
+ npm install -g --user root --prefix "$pkgdir/usr"
+ # fix as many vulns as possible
+ npm audit fix
+ # Make fails with more than one thread
+ make -j1
}
package() {
- install -d "${pkgdir}/opt"
- cp -R "${srcdir}/${pkgname}-${pkgver}/" "${pkgdir}/opt/jitsi-meet"
+ install -d "${pkgdir}/opt"
+ cp -R "${srcdir}/${pkgname}-${pkgver}/" "${pkgdir}/opt/jitsi-meet"
+
+ # get rid of all local references
+ find "${pkgdir}" -type f -execdir sed -i "s#$srcdir##g" "{}" \;
+
+ # Non-deterministic race in npm gives 777 permissions to random directories.
+ # See https://github.com/npm/npm/issues/9359 for details.
+ find "${pkgdir}" -type d -exec chmod 755 {} +
+
+ # npm gives ownership of ALL FILES to build user
+ # https://bugs.archlinux.org/task/63396
+ chown -R root:root "${pkgdir}"
}