PKGBUILD: Upgrading to 1.7.5. Removing superfluous customization file ownership. Adding empty, symlinked credentials.json. Adding permissions for settings.json and credentials.json in /etc/etherpad-lite. Removing custom directory and using the new no-skin skin directory instead.

3 files changed, 23 insertions, 32 deletions

diff --git a/.SRCINFO b/.SRCINFO
index c05de2f9c22a..89914a564244 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
 pkgbase = etherpad-lite
 	pkgdesc = Lightweight fork of etherpad based on javascript
-	pkgver = 1.7.0
+	pkgver = 1.7.5
 	pkgrel = 1
 	epoch = 1
 	url = http://etherpad.org
@@ -17,15 +17,16 @@ pkgbase = etherpad-lite
 	optdepends = tidy: improve quality of exported pads
 	conflicts = etherpad-lite-git
 	backup = etc/etherpad-lite/settings.json
-	source = etherpad-lite-1.7.0.tar.gz::https://github.com/ether/etherpad-lite/archive/1.7.0.tar.gz
+	backup = etc/etherpad-lite/credentials.json
+	source = etherpad-lite-1.7.5.tar.gz::https://github.com/ether/etherpad-lite/archive/1.7.5.tar.gz
 	source = jquery-1.9.1.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 = 6acffc4f05efd0d64774ab1908a74878eec7456e74674cfa90efe1cf873290f35c45e070511ac85d06584ec747d81031e341942f7761df4ad3ee64e1f71a21b5
+	sha512sums = 06f36711648e33ce72db2c5906b6701c8f0e5315f5f65b4f8a0497956ddad376cab20e35bd61b447e6a0a87da6f1b53622ab2478909177afa73652b04867aa5d
 	sha512sums = d62700e7a1ff41f9d6326ca024ba2be1d391bc8fbb2aeae0f427d74837899b230940bf7c2df3d193f5300a68bb3686706d4c31328234b5cda026a1bf52ef9e70
 	sha512sums = 8c9093cc82acb814023b60eecffae7cb697abfa6193a68ca068f010baf3bf1e5f1678bdb862f4af370badbd71deb6a8499f61c8b6115d280477db1b3fd895dfd
-	sha512sums = 31a411f8a93ec2bbd854545cce80eaf435b75432f876ac81df0a6d4ba2bc8437a7b9196456cb04b0a5c9b29d013be7f35501f0af48de5c2fe261d12adb3a1895
+	sha512sums = f1be6d7094ea0dd267fba21c7c64017de6a63974e193720100d49eba07170a078d43f0b76c96e6453b8e9e94cdc24b36fb7ab14218598d65d1455418daf9e447
 	sha512sums = b0ee72e0ab370992bd0bf5cd980d53e9222950027a0bf4a41c8085aaec8b93442d0359ef684946f61e005026ad6de5da39ab78c4d54589ecef7d27f1d76410dd
 
 pkgname = etherpad-lite
diff --git a/PKGBUILD b/PKGBUILD
index aa230b2fc56d..11b24e12cb5a 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -5,7 +5,7 @@
 
 _jqueryver=1.9.1
 pkgname=etherpad-lite
-pkgver=1.7.0
+pkgver=1.7.5
 pkgrel=1
 epoch=1
 pkgdesc="Lightweight fork of etherpad based on javascript"
@@ -21,16 +21,17 @@ optdepends=('sqlite: to use sqlite as databse'
             'libreoffice: advanced import/export of pads'
             'tidy: improve quality of exported pads')
 conflicts=('etherpad-lite-git')
-backup=("etc/${pkgname}/settings.json")
+backup=("etc/${pkgname}/settings.json"
+        "etc/${pkgname}/credentials.json")
 source=("${pkgname}-${pkgver}.tar.gz::https://github.com/ether/${pkgname}/archive/${pkgver}.tar.gz"
         "jquery-${_jqueryver}.js::https://code.jquery.com/jquery-${_jqueryver}.js"
         "${pkgname}-sysusers.conf"
         "${pkgname}-tmpfiles.conf"
         "${pkgname}.service")
-sha512sums=('6acffc4f05efd0d64774ab1908a74878eec7456e74674cfa90efe1cf873290f35c45e070511ac85d06584ec747d81031e341942f7761df4ad3ee64e1f71a21b5'
+sha512sums=('06f36711648e33ce72db2c5906b6701c8f0e5315f5f65b4f8a0497956ddad376cab20e35bd61b447e6a0a87da6f1b53622ab2478909177afa73652b04867aa5d'
             'd62700e7a1ff41f9d6326ca024ba2be1d391bc8fbb2aeae0f427d74837899b230940bf7c2df3d193f5300a68bb3686706d4c31328234b5cda026a1bf52ef9e70'
             '8c9093cc82acb814023b60eecffae7cb697abfa6193a68ca068f010baf3bf1e5f1678bdb862f4af370badbd71deb6a8499f61c8b6115d280477db1b3fd895dfd'
-            '31a411f8a93ec2bbd854545cce80eaf435b75432f876ac81df0a6d4ba2bc8437a7b9196456cb04b0a5c9b29d013be7f35501f0af48de5c2fe261d12adb3a1895'
+            'f1be6d7094ea0dd267fba21c7c64017de6a63974e193720100d49eba07170a078d43f0b76c96e6453b8e9e94cdc24b36fb7ab14218598d65d1455418daf9e447'
             'b0ee72e0ab370992bd0bf5cd980d53e9222950027a0bf4a41c8085aaec8b93442d0359ef684946f61e005026ad6de5da39ab78c4d54589ecef7d27f1d76410dd')
 
 prepare() {
@@ -38,14 +39,6 @@ prepare() {
   # 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
-  cp -v src/static/custom/js.template src/static/custom/timeslider.js
-  cp -v src/static/custom/css.template src/static/custom/index.css
-  cp -v src/static/custom/css.template src/static/custom/pad.css
-  cp -v src/static/custom/css.template src/static/custom/timeslider.css
-
   # write dirty.db to StateDirectory by default
   sed -i 's/var\/dirty.db/\/var\/lib\/etherpad-lite\/dirty.db/g' \
     settings.json.template
@@ -77,20 +70,20 @@ package() {
   mv -v node_modules "${pkgdir}/usr/share/${pkgname}/"
 
   # protect configuration directory with restrictive permission
-  install -vdm 750 "${pkgdir}/etc/${pkgname}"
-  install -vdm 750 "${pkgdir}/etc/${pkgname}/custom"
+  install -vdm 755 "${pkgdir}/etc/${pkgname}"
+  install -vdm 755 "${pkgdir}/etc/${pkgname}/no-skin"
 
   # custom js and css templates
-  install -t "${pkgdir}/etc/${pkgname}/custom" \
-    -vDm 644 "src/static/custom/"*.{css,js}
-  rm -rv src/static/custom
+  install -t "${pkgdir}/etc/${pkgname}/no-skin" \
+    -vDm 644 "src/static/skins/no-skin/"*.{css,js}
+  rm -rv src/static/skins/no-skin/
 
   # move sources
   mv -v src/* "${pkgdir}/usr/share/${pkgname}/src/"
 
   # symlink directory for custom css and js
-  ln -vs "/etc/${pkgname}/custom/" \
-    "${pkgdir}/usr/share/${pkgname}/src/static/"
+  ln -vs "/etc/${pkgname}/no-skin/" \
+    "${pkgdir}/usr/share/${pkgname}/src/static/skins/"
 
   # symlink needed files (not yet created)
   ln -vs "/etc/${pkgname}/SESSIONKEY.txt" \
@@ -105,6 +98,10 @@ package() {
   # configuration
   install -vDm 644 settings.json.template \
     "${pkgdir}/etc/${pkgname}/settings.json"
+  # create and symlink an empty credentials file
+  touch "${pkgdir}/etc/${pkgname}/credentials.json"
+  ln -vs "/etc/${pkgname}/credentials.json" \
+    "${pkgdir}/usr/share/${pkgname}/credentials.json"
 
   # systemd service
   install -vDm 644 "${srcdir}/${pkgname}.service" \
diff --git a/etherpad-lite-tmpfiles.conf b/etherpad-lite-tmpfiles.conf
index a589582e75ff..515ccc13c6c6 100644
--- a/etherpad-lite-tmpfiles.conf
+++ b/etherpad-lite-tmpfiles.conf
@@ -1,9 +1,2 @@
-d /etc/etherpad-lite 0750 etherpad-lite etherpad-lite -
-z /etc/etherpad-lite/settings.json 0640 etherpad-lite etherpad-lite -
-d /etc/etherpad-lite/custom 0750 etherpad-lite etherpad-lite -
-z /etc/etherpad-lite/custom/index.js 0644 etherpad-lite etherpad-lite -
-z /etc/etherpad-lite/custom/pad.js 0644 etherpad-lite etherpad-lite -
-z /etc/etherpad-lite/custom/timeslider.js 0644 etherpad-lite etherpad-lite -
-z /etc/etherpad-lite/custom/index.css 0644 etherpad-lite etherpad-lite -
-z /etc/etherpad-lite/custom/pad.css 0644 etherpad-lite etherpad-lite -
-z /etc/etherpad-lite/custom/timeslider.css 0644 etherpad-lite etherpad-lite -
+z /etc/etherpad-lite/*.json 0640 root etherpad-lite -
+z /etc/etherpad-lite/*.txt 0640 etherpad-lite etherpad-lite -