[Libreoffice-commits] online.git: Branch 'distro/collabora/collabora-online-1-0' - 2 commits - loolwsd/debian loolwsd/loolwsd.spec.in

[Andras Timar]

 loolwsd/debian/control          |    2 +-
 loolwsd/debian/loolwsd.postinst |    1 +
 loolwsd/loolwsd.spec.in         |    1 +
 3 files changed, 3 insertions(+), 1 deletion(-)

New commits:
commit b7b30e0528e9dd0486892959fb6c9adf983e8f51
Author: Andras Timar <andras.timar at collabora.com>
Date:   Fri May 20 15:51:05 2016 +0200

    loolwsd: packaging, setcap cap_sys_admin=ep /usr/bin/loolmount
    
    (cherry picked from commit 625de77dd38c3f89a3520b6b0f3c71e06e615306)

diff --git a/loolwsd/debian/loolwsd.postinst b/loolwsd/debian/loolwsd.postinst
index 73c3985..0bc47a0 100755
--- a/loolwsd/debian/loolwsd.postinst
+++ b/loolwsd/debian/loolwsd.postinst
@@ -5,6 +5,7 @@ set -e
 case "$1" in
     configure)
 	setcap cap_fowner,cap_mknod,cap_sys_chroot=ep /usr/bin/loolforkit || true
+	setcap cap_sys_admin=ep /usr/bin/loolmount || true
 
 	adduser --quiet --system --group --home /opt/lool lool
 	mkdir -p /var/cache/loolwsd && chown lool: /var/cache/loolwsd
diff --git a/loolwsd/loolwsd.spec.in b/loolwsd/loolwsd.spec.in
index f07d695..3b44edc 100644
--- a/loolwsd/loolwsd.spec.in
+++ b/loolwsd/loolwsd.spec.in
@@ -122,6 +122,7 @@ getent passwd lool >/dev/null || useradd -g lool -r lool
 
 %post
 setcap cap_fowner,cap_mknod,cap_sys_chroot=ep /usr/bin/loolforkit
+setcap cap_sys_admin=ep /usr/bin/loolmount
 
 mkdir -p /var/cache/loolwsd && chown lool:lool /var/cache/loolwsd
 rm -rf /var/cache/loolwsd/*
commit 32a4304bdae31d9db75d2740709fbe4449b1eee9
Author: Andras Timar <andras.timar at collabora.com>
Date:   Fri May 20 15:46:56 2016 +0200

    loolwsd: fix deb dependency, will depend on collaboraoffice metapackage
    
    (cherry picked from commit 2c2073231e876b46ed2daf0d24f390d2959abcbc)

diff --git a/loolwsd/debian/control b/loolwsd/debian/control
index 479093e..08b784c 100644
--- a/loolwsd/debian/control
+++ b/loolwsd/debian/control
@@ -8,7 +8,7 @@ Standards-Version: 3.9.2
 Package: loolwsd
 Section: web
 Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}, libsm6, libssl1.0.0, libmysqlclient18, libodbc1, libxinerama1, libcairo2, libgl1-mesa-glx, libcups2, libdbus-glib-1-2, cpio, collaboraoffice5.0
+Depends: ${shlibs:Depends}, ${misc:Depends}, libsm6, libssl1.0.0, libmysqlclient18, libodbc1, libxinerama1, libcairo2, libgl1-mesa-glx, libcups2, libdbus-glib-1-2, cpio, collaboraoffice
 Description: LibreOffice On-Line WebSocket Daemon
  LOOLWSD is a daemon that talks to web browser clients and provides LibreOffice
  services.