summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorRubenKelevra2016-12-01 16:41:16 +0100
committerRubenKelevra2016-12-01 16:41:16 +0100
commitc75e8701a1278e29c570044effe5eb066724c066 (patch)
tree8d4b6c956779545e64f6d3df8c036d3e69c98d4e
parent0056488d7fa11cc33dd6304e7bd783ff7a1ce2d1 (diff)
downloadaur-c75e8701a1278e29c570044effe5eb066724c066.tar.gz
update npm libs
-rw-r--r--PKGBUILD25
-rw-r--r--update-packages.patch59
2 files changed, 72 insertions, 12 deletions
diff --git a/PKGBUILD b/PKGBUILD
index 47bef7421ff5..ad3507c99b0a 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -3,7 +3,7 @@
pkgname=etherpad-lite
pkgver=1.6.0
-pkgrel=0
+pkgrel=1
epoch=1
pkgdesc="Lightweight fork of etherpad based on javascript"
arch=(any)
@@ -19,22 +19,23 @@ backup=('usr/share/webapps/etherpad-lite/settings.json'
'etc/webapps/etherpad-lite/settings.json')
install='etherpad-lite.install'
source=("${pkgname}-${pkgver}.tar.gz::https://github.com/ether/${pkgname}/archive/${pkgver}.tar.gz"
- "etherpad-lite.service")
+ "etherpad-lite.service"
+ "update-packages.patch")
sha512sums=('7f850d4a2a0d57ed7f60545779261bdd6be5e47c9a616edd61a99b5f15046d68710458a5eb1f76bb7e08e7a34b752bbcb6fb6e419924d971137805e78fdaf512'
- '7b775171da97a3e7ad44a2b1b319970fd307a88e90a171c49bf70d2382767175e98bb21c7054e38ee6c066bd2dfadf94d28a9ff31d4f21145ec4441caa13c4d7')
+ '7b775171da97a3e7ad44a2b1b319970fd307a88e90a171c49bf70d2382767175e98bb21c7054e38ee6c066bd2dfadf94d28a9ff31d4f21145ec4441caa13c4d7'
+ '687c315ecbbd3a7b28061758d43010aa38c1b227b0d2296fc82144152e616259fcabf039c83b0ce2c0d5891127fd18454ec747860df42f144baec6bf6436f7e4')
prepare() {
cd "${srcdir}/${pkgname}-${pkgver}"
-#No patches included
-
-# for s in "${source[@]}"; do
-# case "$s" in (*.patch)
-# cp "../${s}" .
-# patch -p0 < "${s}"
-# rm -f "${s}"
-# esac
-# done
+ for s in "${source[@]}"; do
+ case "$s" in (*.patch)
+ s=`echo $s | awk '{split($0,a,":"); print a[1]}'`
+ cp "../${s}" .
+ patch --merge -l -p1 < "${s}"
+ rm -f "${s}"
+ esac
+ done
}
build() {
diff --git a/update-packages.patch b/update-packages.patch
new file mode 100644
index 000000000000..c91cf174d86a
--- /dev/null
+++ b/update-packages.patch
@@ -0,0 +1,59 @@
+Subject: [PATCH] Updated package.json
+
+---
+
+diff --git a/src/package.json b/src/package.json
+index bdbf35c..36f5c61 100644
+--- a/src/package.json
++++ b/src/package.json
+18,19c18,19
+< "resolve" : "1.1.6",
+< "socket.io" : "1.3.7",
+---
+> "resolve" : "1.1.7",
+> "socket.io" : "1.4.5",
+21,22c21,22
+< "express" : "4.12.3",
+< "express-session" : "1.11.1",
+---
+> "express" : "4.13.4",
+> "express-session" : "1.13.0",
+25,26c25,26
+< "clean-css" : "3.1.9",
+< "uglify-js" : "2.4.19",
+---
+> "clean-css" : "3.4.12",
+> "uglify-js" : "2.6.2",
+28,29c28,29
+< "log4js" : "0.6.22",
+< "cheerio" : "0.19.0",
+---
+> "log4js" : "0.6.35",
+> "cheerio" : "0.20.0",
+31,33c31,33
+< "npm" : "2.7.6",
+< "ejs" : "2.3.1",
+< "graceful-fs" : "3.0.6",
+---
+> "npm" : "4.0.2",
+> "ejs" : "2.4.1",
+> "graceful-fs" : "4.1.3",
+35c35
+< "semver" : "4.3.3",
+---
+> "semver" : "5.1.0",
+39c39
+< "unorm" : "1.3.3",
+---
+> "unorm" : "1.4.1",
+43,46c43,46
+< "jsonminify" : "0.2.3",
+< "measured" : "1.0.0",
+< "mocha" : "2.2.4",
+< "supertest" : "0.15.0"
+---
+> "jsonminify" : "0.4.1",
+> "measured" : "1.1.0",
+> "mocha" : "2.4.5",
+> "supertest" : "1.2.0"
+