PKGBUILD: Upgrading to 1.6.3. Moving APIKEY.txt and SESSIONKEY.txt to /etc/etherpad-lite.

Unsetting the specific HOME directory for the etherpad-lite user.

3 files changed, 17 insertions, 12 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 63cfa3f37701..899de1e8f62b 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
 pkgbase = etherpad-lite
 	pkgdesc = Lightweight fork of etherpad based on javascript
-	pkgver = 1.6.2
-	pkgrel = 3
+	pkgver = 1.6.3
+	pkgrel = 1
 	epoch = 1
 	url = http://etherpad.org
 	arch = any
@@ -17,14 +17,14 @@ pkgbase = etherpad-lite
 	optdepends = tidy: improve quality of exported pads
 	conflicts = etherpad-lite-git
 	backup = etc/etherpad-lite/settings.json
-	source = etherpad-lite-1.6.2.tar.gz::https://github.com/ether/etherpad-lite/archive/1.6.2.tar.gz
+	source = etherpad-lite-1.6.3.tar.gz::https://github.com/ether/etherpad-lite/archive/1.6.3.tar.gz
 	source = jquery.js::https://code.jquery.com/jquery-1.9.1.js
 	source = etherpad-lite-sysusers.conf
 	source = etherpad-lite-tmpfiles.conf
 	source = etherpad-lite.service
-	sha512sums = 58e996bde1992b9a05d27f2d56b15107c1eadf40164ed5e0645f245fe9040dcd40f6bd78feb842a9e1a8a44a232bbbeb80686e8d1564a8e67f74b44f942c0e55
+	sha512sums = 09aa42dc20860864fc554ef8b91cdc75666c8bd41acb73d754fbb7fe123af4b6ae9c90f6c42b3f3165d76d986668294bc07c81e414c25ab948b9e00dd8bb664e
 	sha512sums = d62700e7a1ff41f9d6326ca024ba2be1d391bc8fbb2aeae0f427d74837899b230940bf7c2df3d193f5300a68bb3686706d4c31328234b5cda026a1bf52ef9e70
-	sha512sums = ca3588610b2d8abc67ef1bd83a079f49e0b980768e1f968869be01721026506ed15cf280cac5a60c26b2bb7a248ffffb78883eced89581e982260efad1af68a3
+	sha512sums = 8c9093cc82acb814023b60eecffae7cb697abfa6193a68ca068f010baf3bf1e5f1678bdb862f4af370badbd71deb6a8499f61c8b6115d280477db1b3fd895dfd
 	sha512sums = 31a411f8a93ec2bbd854545cce80eaf435b75432f876ac81df0a6d4ba2bc8437a7b9196456cb04b0a5c9b29d013be7f35501f0af48de5c2fe261d12adb3a1895
 	sha512sums = b54ea26a6918c817b58d950fb9afa07e069b8d2e8c343017a9e52cd17221710fcf9c875e1f8089b773df0ed5de419e6db2c379259863fb6f15afe6ca14bec06b
 
diff --git a/PKGBUILD b/PKGBUILD
index acb8c970e207..ced846d4af7a 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -5,8 +5,8 @@
 
 _jqueryver=1.9.1
 pkgname=etherpad-lite
-pkgver=1.6.2
-pkgrel=3
+pkgver=1.6.3
+pkgrel=1
 epoch=1
 pkgdesc="Lightweight fork of etherpad based on javascript"
 arch=(any)
@@ -27,9 +27,9 @@ source=("${pkgname}-${pkgver}.tar.gz::https://github.com/ether/${pkgname}/archiv
         "${pkgname}-sysusers.conf"
         "${pkgname}-tmpfiles.conf"
         "${pkgname}.service")
-sha512sums=('58e996bde1992b9a05d27f2d56b15107c1eadf40164ed5e0645f245fe9040dcd40f6bd78feb842a9e1a8a44a232bbbeb80686e8d1564a8e67f74b44f942c0e55'
+sha512sums=('09aa42dc20860864fc554ef8b91cdc75666c8bd41acb73d754fbb7fe123af4b6ae9c90f6c42b3f3165d76d986668294bc07c81e414c25ab948b9e00dd8bb664e'
             'd62700e7a1ff41f9d6326ca024ba2be1d391bc8fbb2aeae0f427d74837899b230940bf7c2df3d193f5300a68bb3686706d4c31328234b5cda026a1bf52ef9e70'
-            'ca3588610b2d8abc67ef1bd83a079f49e0b980768e1f968869be01721026506ed15cf280cac5a60c26b2bb7a248ffffb78883eced89581e982260efad1af68a3'
+            '8c9093cc82acb814023b60eecffae7cb697abfa6193a68ca068f010baf3bf1e5f1678bdb862f4af370badbd71deb6a8499f61c8b6115d280477db1b3fd895dfd'
             '31a411f8a93ec2bbd854545cce80eaf435b75432f876ac81df0a6d4ba2bc8437a7b9196456cb04b0a5c9b29d013be7f35501f0af48de5c2fe261d12adb3a1895'
             'b54ea26a6918c817b58d950fb9afa07e069b8d2e8c343017a9e52cd17221710fcf9c875e1f8089b773df0ed5de419e6db2c379259863fb6f15afe6ca14bec06b')
 
@@ -37,6 +37,7 @@ prepare() {
   cd "${pkgname}-${pkgver}"
   # create needed initializing file
   touch src/.ep_initialized
+
   # create custom js and css from templates
   cp -v src/static/custom/js.template src/static/custom/index.js
   cp -v src/static/custom/js.template src/static/custom/pad.js
@@ -75,6 +76,10 @@ package() {
   # node modules
   mv -v node_modules "${pkgdir}/usr/share/${pkgname}/"
 
+  # protect configuration directory with restrictive permission
+  install -dm750 "${pkgdir}/etc/${pkgname}"
+  install -dm750 "${pkgdir}/etc/${pkgname}/custom"
+
   # custom js and css templates
   install -t "${pkgdir}/etc/${pkgname}/custom" \
     -vDm0644 "src/static/custom/"*.{css,js}
@@ -88,9 +93,9 @@ package() {
     "${pkgdir}/usr/share/${pkgname}/src/static/"
 
   # symlink needed files (not yet created)
-  ln -vs /var/lib/etherpad-lite/SESSIONKEY.txt \
+  ln -vs "/etc/${pkgname}/SESSIONKEY.txt" \
     "${pkgdir}/usr/share/${pkgname}/SESSIONKEY.txt"
-  ln -vs /var/lib/etherpad-lite/APIKEY.txt \
+  ln -vs "/etc/${pkgname}/APIKEY.txt" \
     "${pkgdir}/usr/share/${pkgname}/APIKEY.txt"
 
   #jquery
diff --git a/etherpad-lite-sysusers.conf b/etherpad-lite-sysusers.conf
index d31716d1a8b3..0803712f2818 100644
--- a/etherpad-lite-sysusers.conf
+++ b/etherpad-lite-sysusers.conf
@@ -1 +1 @@
-u etherpad-lite - "Etherpad-lite user" /usr/share/etherpad-lite
+u etherpad-lite - "Etherpad-lite user"