Merge remote-tracking branch 'upstream/master'

5 files changed, 89 insertions, 61 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 0cedcf596784..3388e1835465 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -22,18 +22,10 @@ pkgbase = etherpad-lite-systemd
 	source = etherpad-lite.service
 	source = etherpad-lite.socket
 	source = socket-activation.patch
-	md5sums = d218b5b2d6c1e9390e314df78a507165
-	md5sums = 6204c73a5d04019e09ef86e1d0a1a61a
-	md5sums = 987fe3ab72dc495c7e8101658ff673ea
-	md5sums = 50476ce9e5c1b9bd53063bb875972be7
-	sha1sums = 8e2e55f6e4c4237028e0a6e9f2b66b88455f415e
-	sha1sums = a6fdde2ccbe4044e7679d3d0d45f7c54e1d703d6
-	sha1sums = 8768c601d7920427c6906a5ac3eca8f725981a2c
-	sha1sums = 24f76b29a17ac9eba704913d136a54968d1152c0
-	sha256sums = 6bdfc3c22a36fd98e72e68e0be4a889d1611b7b1d10e7ebe6dffd1c09bf54bc2
-	sha256sums = 0eafab2c0385ac8b5b70c5a6e7db502304a0c9accc13a5155cb02f84fb241b0d
-	sha256sums = 0b6f0f45e4892649e442f6082150c3181352a356926be959a72c9e9dca7973b1
-	sha256sums = e1f7cda94688788f2c8a988312ba712f8467c66e702eef275faf03eda4410f36
+	sha512sums = 4aa331c2faa5f7cc0a2b467547f0c9028ae593be52c584b520147554f81bf88083f5d26925977e341c9450a51fc03fc4a45bff75cfc7b64e4de7993333ce0ed0
+	sha512sums = 7b775171da97a3e7ad44a2b1b319970fd307a88e90a171c49bf70d2382767175e98bb21c7054e38ee6c066bd2dfadf94d28a9ff31d4f21145ec4441caa13c4d7
+	sha512sums = e80935acc6f7739b2797fc922a503a2f7b5edda010adcd4be5714a21716545b4472229b6901f0af41cf12552ca71c7bba151667f2501ef9b2f7770cdf7f3d723
+	sha512sums = 381ea4608a256328a55029716d42e7ee78c817e967f43ccfc82f82d5c28f65d7f2106ee816bcbae8f3a71720a08ddab35f92b9c710b55d520cb0a9dc86e62201
 
 pkgname = etherpad-lite-systemd
 
diff --git a/PKGBUILD b/PKGBUILD
index 3727d44c7eed..2bdfc2e251f2 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,15 +1,12 @@
-# Contributions by: Timothée Ravier <tim@siosm.fr>, Jonas Heinrich <onny@project-insanity.org>
-# Maintainer: Ruben Kelevra <ruben@freifunk-nrw.de>
-
 pkgname=etherpad-lite-systemd
-pkgver=1.5.2
-pkgrel=2
+pkgver=1.5.7
+pkgrel=1
 pkgdesc="etherpad-lite with systemd socket-activation"
 arch=(any)
 url="http://etherpad.org"
 _watch=('http://etherpad.org','Documentation <small>v([\d.]*)</small>')
 license=('GPL2')
-depends=('curl' 'python2' 'openssl' 'nodejs<0.13.0' 'git' 'npm')
+depends=('curl' 'python2' 'openssl' 'nodejs' 'git' 'npm')
 optdepends=('sqlite: to use sqlite as databse'
             'mariadb: to use mariadb as database'
             'postgresql: to use postgresql as database')
@@ -22,6 +19,10 @@ source=("etherpad-lite-${pkgver}.tar.gz::https://github.com/ether/etherpad-lite/
         "etherpad-lite.socket"
         "socket-activation.patch"
         )
+sha512sums=('688205194347f0e4e6f78deb0b189ceaa4f2255efcbaa503d0b6459de8505dd475aa9151399dd818b6cac232bc0b71e5a0fbd6d43f56cb5ce1f9eafcccb3925b'
+            '7b775171da97a3e7ad44a2b1b319970fd307a88e90a171c49bf70d2382767175e98bb21c7054e38ee6c066bd2dfadf94d28a9ff31d4f21145ec4441caa13c4d7'
+            'e80935acc6f7739b2797fc922a503a2f7b5edda010adcd4be5714a21716545b4472229b6901f0af41cf12552ca71c7bba151667f2501ef9b2f7770cdf7f3d723'
+            '542067a2f287d30d6662205de95aba0fe85f0c04d055ee672c17255d4f99abd2e533a57ecd1920a7a3bdde9fceda76050eceaafadd8d64579a1d48fcd2271430')
 
 prepare() {
   cd "$srcdir/etherpad-lite-${pkgver}"
@@ -36,37 +37,25 @@ build() {
 }
 
 package() {
-  cd "$srcdir/etherpad-lite-${pkgver}"
-  echo 'cleaning up unneeded files...'
-  rm bin/installOnWindows.bat start.bat bin/buildDebian.sh bin/buildForWindows.sh  
-  rm -r var bin/deb-src doc 
-  echo 'move files...'
-  install -dm 755 "${pkgdir}"/usr/share/webapps/etherpad-lite
-  cp -a . "${pkgdir}"/usr/share/webapps/etherpad-lite
-  mkdir -p "${pkgdir}"/etc/webapps/etherpad-lite
-  mv "${pkgdir}"/usr/share/webapps/etherpad-lite/settings.json "${pkgdir}"/etc/webapps/etherpad-lite/settings.json
-  ln -s /etc/webapps/etherpad-lite/settings.json "${pkgdir}"/usr/share/webapps/etherpad-lite/settings.json
-  install -Dm644 "${srcdir}"/etherpad-lite.service "${pkgdir}"/usr/lib/systemd/system/etherpad-lite.service
-  install -Dm644 "${srcdir}"/etherpad-lite.socket "${pkgdir}"/usr/lib/systemd/system/etherpad-lite.socket
-  install -Dm644 "${srcdir}"/etherpad-lite.service "${pkgdir}"/usr/lib/systemd/system/etherpad-lite.service
-  install -D LICENSE 	"${pkgdir}"/usr/share/licenses/etherpad-lite/LICENSE
-  echo "setting rights..."
-  #touch "${pkgdir}"/usr/share/webapps/etherpad-lite/APIKEY.txt
-  find "${pkgdir}"/usr/share/webapps/etherpad-lite \
-      \( -type f -exec chmod ug+rw,o+r {} \; \) , \
-      \( -type d -exec chmod ug+rwxs,o+rx {} \; \)
-  chmod u+x "${pkgdir}"/usr/share/webapps/etherpad-lite/bin/run.sh
-  chmod u+x "${pkgdir}"/usr/share/webapps/etherpad-lite/bin/installDeps.sh
+    cd "etherpad-lite-${pkgver}"
+    echo 'cleaning up unneeded files...'
+    rm bin/installOnWindows.bat start.bat bin/buildDebian.sh bin/buildForWindows.sh
+    rm -r var bin/deb-src doc tests
+    echo 'move files...'
+    install -dm 755 "${pkgdir}"/usr/share/webapps/etherpad-lite
+    cp -a . "${pkgdir}"/usr/share/webapps/etherpad-lite
+    mkdir -p "${pkgdir}"/etc/webapps/etherpad-lite/
+    mv "${pkgdir}"/usr/share/webapps/etherpad-lite/settings.json "${pkgdir}"/etc/webapps/etherpad-lite/settings.json
+    ln -s /etc/webapps/etherpad-lite/settings.json "${pkgdir}"/usr/share/webapps/etherpad-lite/settings.json
+    install -Dm644 "${srcdir}"/etherpad-lite.service "${pkgdir}"/usr/lib/systemd/system/etherpad-lite.service
+    install -Dm644 "${srcdir}"/etherpad-lite.socket "${pkgdir}"/usr/lib/systemd/system/etherpad-lite.socket
+    install -Dm644 "${srcdir}"/etherpad-lite.service "${pkgdir}"/usr/lib/systemd/system/etherpad-lite.service
+    install -D LICENSE  "${pkgdir}"/usr/share/licenses/etherpad-lite/LICENSE
+    echo "setting rights..."
+    #touch "${pkgdir}"/usr/share/webapps/etherpad-lite/APIKEY.txt
+    find "${pkgdir}"/usr/share/webapps/etherpad-lite \
+        \( -type f -exec chmod ug+rw,o+r {} \; \) , \
+        \( -type d -exec chmod ug+rwxs,o+rx {} \; \)
+    chmod u+x "${pkgdir}"/usr/share/webapps/etherpad-lite/bin/run.sh
+    chmod u+x "${pkgdir}"/usr/share/webapps/etherpad-lite/bin/installDeps.sh
 }
-md5sums=('d218b5b2d6c1e9390e314df78a507165'
-         '6204c73a5d04019e09ef86e1d0a1a61a'
-         '987fe3ab72dc495c7e8101658ff673ea'
-         '50476ce9e5c1b9bd53063bb875972be7')
-sha1sums=('8e2e55f6e4c4237028e0a6e9f2b66b88455f415e'
-          'a6fdde2ccbe4044e7679d3d0d45f7c54e1d703d6'
-          '8768c601d7920427c6906a5ac3eca8f725981a2c'
-          '24f76b29a17ac9eba704913d136a54968d1152c0')
-sha256sums=('6bdfc3c22a36fd98e72e68e0be4a889d1611b7b1d10e7ebe6dffd1c09bf54bc2'
-            '0eafab2c0385ac8b5b70c5a6e7db502304a0c9accc13a5155cb02f84fb241b0d'
-            '0b6f0f45e4892649e442f6082150c3181352a356926be959a72c9e9dca7973b1'
-            'e1f7cda94688788f2c8a988312ba712f8467c66e702eef275faf03eda4410f36')
diff --git a/etherpad-lite.install b/etherpad-lite.install
index 5404ed47c17a..1c66362feacc 100644
--- a/etherpad-lite.install
+++ b/etherpad-lite.install
@@ -3,14 +3,60 @@ post_install(){
   getent passwd etherpad &>/dev/null || \
     useradd -r -s /usr/bin/bash -g etherpad -G etherpad,http -m \
     -d /var/lib/etherpad-lite etherpad >/dev/null
-    #useradd -r -s /usr/bin/false -g etherpad -G etherpad,http -m \
 
-  ln -s /var/lib/etherpad-lite /usr/share/webapps/etherpad-lite/var
-  touch etherpad /usr/share/webapps/etherpad-lite/APIKEY.txt
-  chmod 644 /usr/share/webapps/etherpad-lite/APIKEY.txt
-  chown etherpad:etherpad /usr/share/webapps/etherpad-lite/APIKEY.txt
+  if [ -h "/usr/share/webapps/etherpad-lite/var/etherpad-lite" ]; then #remove old invalid stuff
+    rm /usr/share/webapps/etherpad-lite/var/etherpad-lite
+  fi
+  if [ -d "/usr/share/webapps/etherpad-lite/var" ]; then
+    if [ ! -h "/usr/share/webapps/etherpad-lite/var" ]; then
+      mkdir -p /var/lib/etherpad-lite #to be sure this exists.
+      mv /usr/share/webapps/etherpad-lite/var/* /var/lib/etherpad-lite/
+      rmdir /usr/share/webapps/etherpad-lite/var
+      if [ $? -ne 0 ]; then
+        exit 1
+      fi
+    fi
+  fi
 
-  systemd-tmpfiles --create etherpad-lite.conf
+  ln -ds /var/lib/etherpad-lite /usr/share/webapps/etherpad-lite/var
+  if [ -f "/etherpad" ]; then #removing old invalid file
+    rm /etherpad
+  fi
+
+  find /usr/share/webapps/etherpad-lite \
+        \( -type f -exec chmod 655 {} \; \) , \
+        \( -type d -exec chmod 755 {} \; \)
+  find /var/lib/etherpad-lite \
+        \( -type f -exec chmod 655 {} \; \) , \
+        \( -type d -exec chmod 755 {} \; \)
+
+  chown -R etherpad:etherpad /usr/share/webapps/etherpad-lite
+  chown -R etherpad:etherpad /var/lib/etherpad-lite
+
+  chmod u+x /usr/share/webapps/etherpad-lite/bin/run.sh
+  chmod u+x /usr/share/webapps/etherpad-lite/bin/installDeps.sh
+
+  #FIXME do we need this really?
+  #systemd-tmpfiles --create etherpad-lite.conf
+
+  if [ -f "/usr/share/webapps/etherpad-lite/settings.json" ]; then
+    if [ ! -h "/usr/share/webapps/etherpad-lite/settings.json" ]; then
+      mkdir -p /etc/webapps/etherpad-lite/
+      mv /usr/share/webapps/etherpad-lite/settings.json /etc/webapps/etherpad-lite/settings.json
+      ln -s /etc/webapps/etherpad-lite/settings.json /usr/share/webapps/etherpad-lite/settings.json
+    fi
+  fi
+  #fix npm bug, using wrong python instance
+  npm config set python /usr/bin/python2 -g
+}
+
+post_upgrade(){
+  post_install
+}
+
+pre_remove() {
+  systemctl stop etherpad-lite || true
+  pkill -u etherpad || true
 }
 
 post_remove() {
diff --git a/etherpad-lite.service b/etherpad-lite.service
index 4dec83ce1e5f..4732e3086c3c 100644
--- a/etherpad-lite.service
+++ b/etherpad-lite.service
@@ -8,6 +8,7 @@ User=etherpad
 Group=etherpad
 WorkingDirectory=/var/lib/etherpad-lite
 ExecStart=/usr/share/webapps/etherpad-lite/bin/run.sh
+Restart=always
 
 [Install]
 WantedBy=multi-user.target
diff --git a/socket-activation.patch b/socket-activation.patch
index bbbd19332e73..ba6eadbc2d08 100644
--- a/socket-activation.patch
+++ b/socket-activation.patch
@@ -17,12 +17,12 @@
 +  server.autoQuit({ timeout: 300 });
 +  server.listen("systemd");
  }
---- src/package.json	2015-02-12 14:36:32.768439764 +0000
-+++ src/package.json	2015-02-12 14:39:52.845623440 +0000
+--- src/package.json	2015-09-28 22:50:34.110518342 +0000
++++ src/package.json	2015-09-28 22:55:46.771103708 +0000
 @@ -43,7 +43,9 @@
                        "jsonminify"              : "0.2.3",
-                       "measured"                : "0.1.6",
-                       "mocha"                   : "2.1.0",
+                       "measured"                : "1.0.0",
+                       "mocha"                   : "2.2.4",
 -                      "supertest"               : "0.15.0"
 +                      "supertest"               : "0.15.0",
 +                      "systemd"                 : "0.2.6",