2 files changed, 11 insertions, 12 deletions
diff --git a/network/etherpad-lite/etherpad-lite.SlackBuild b/network/etherpad-lite/etherpad-lite.SlackBuild
index 941d4216700e4..aeb308c9878cb 100644
--- a/network/etherpad-lite/etherpad-lite.SlackBuild
+++ b/network/etherpad-lite/etherpad-lite.SlackBuild
@@ -7,7 +7,7 @@
 #
 
 PRGNAM=etherpad-lite
-VERSION=${VERSION:-1.5.7}
+VERSION=${VERSION:-1.6.1}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
@@ -47,14 +47,14 @@ rm -rf $PKG
 mkdir -p $TMP $PKG $OUTPUT
 cd $TMP
 rm -rf $PRGNAM-$VERSION
-tar xvf $CWD/$VERSION.tar.gz || tar xvf $CWD/$PRGNAM-$VERSION.tar.gz
+tar xvf $CWD/$PRGNAM-$VERSION.tar.gz
 cd $PRGNAM-$VERSION
 chown -R root:root .
 find -L . \
- \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 -o -perm 511 \) \
- -exec chmod 755 {} \; -o \
- \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \
- -exec chmod 644 {} \;
+ \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
+  -o -perm 511 \) -exec chmod 755 {} \; -o \
+ \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
+  -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
 
 ./bin/installDeps.sh
 rm -f var/.gitignore
@@ -67,7 +67,7 @@ mkdir -p $PKG/var/log/$PRGNAM
 chown $ETHERPAD_USER:$ETHERPAD_GROUP $PKG/var/log/$PRGNAM
 
 mkdir -p $PKG/etc/rc.d $PKG/etc/$PRGNAM
-install -D -m 0755 $CWD/rc.etherpad-lite $PKG/etc/rc.d/rc.etherpad-lite.new
+install -D -m 0644 $CWD/rc.etherpad-lite $PKG/etc/rc.d/rc.etherpad-lite.new
 cat settings.json.template > $PKG/etc/$PRGNAM/settings.json.template
 cat settings.json.template > $PKG/etc/$PRGNAM/settings.json.new
 
@@ -75,8 +75,7 @@ mkdir -p $PKG/srv
 ln -sf /var/$PRGNAM $PKG/srv/$PRGNAM
 
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
-cp -a CHANGELOG.md CONTRIBUTING.md LICENSE README.md \
-  $PKG/usr/doc/$PRGNAM-$VERSION
+cp -a CHANGELOG.md CONTRIBUTING.md LICENSE README.md $PKG/usr/doc/$PRGNAM-$VERSION
 cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
 
 mkdir -p $PKG/install
diff --git a/network/etherpad-lite/etherpad-lite.info b/network/etherpad-lite/etherpad-lite.info
index 161282a04bad2..11327f7f55874 100644
--- a/network/etherpad-lite/etherpad-lite.info
+++ b/network/etherpad-lite/etherpad-lite.info
@@ -1,8 +1,8 @@
 PRGNAM="etherpad-lite"
-VERSION="1.5.7"
+VERSION="1.6.1"
 HOMEPAGE="http://etherpad.org/"
-DOWNLOAD="https://github.com/ether/etherpad-lite/archive/1.5.7.tar.gz"
-MD5SUM="13691d2abb449c0eb1fc93f9ffbcc6b7"
+DOWNLOAD="https://github.com/ether/etherpad-lite/archive/1.6.1/etherpad-lite-1.6.1.tar.gz"
+MD5SUM="2de5cf27933cf687dcca9ea2350e38d4"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES="nodejs"