[Libreoffice-commits] online.git: loolwsd/debian loolwsd/loolwsd.spec.in

2016-09-26 Thread Andras Timar 
 loolwsd/debian/control  |2 +-
 loolwsd/loolwsd.spec.in |6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

New commits:
commit 89ee9fd94b4821d1b5e4beefab8af7f28db065fe
Author: Andras Timar 
Date:   Mon Sep 26 10:17:51 2016 +0200

loolwsd: poco 1.7.5 as dependency of binary packages

diff --git a/loolwsd/debian/control b/loolwsd/debian/control
index 6282775..80af0eb 100644
--- a/loolwsd/debian/control
+++ b/loolwsd/debian/control
@@ -2,7 +2,7 @@ Source: loolwsd
 Section: web
 Priority: optional
 Maintainer: Tor Lillqvist 
-Build-Depends: debhelper (>= 9), dh-systemd (>= 1.3), libcap-dev, libcap2-bin, 
libpcre3-dev, libpng-dev, libpoco-dev (>= 1.7.1)
+Build-Depends: debhelper (>= 9), dh-systemd (>= 1.3), libcap-dev, libcap2-bin, 
libpcre3-dev, libpng-dev, libpoco-dev (>= 1.7.5)
 Standards-Version: 3.9.7
 
 Package: loolwsd
diff --git a/loolwsd/loolwsd.spec.in b/loolwsd/loolwsd.spec.in
index 6cb7970..73c5651 100644
--- a/loolwsd/loolwsd.spec.in
+++ b/loolwsd/loolwsd.spec.in
@@ -18,7 +18,7 @@ Summary:LibreOffice On-Line WebSocket Daemon
 License:MPL
 Source0:loolwsd-@package_vers...@.tar.gz
 Source1:loleaflet-@package_vers...@.tar.gz
-BuildRequires:  libcap-devel libpng-devel poco-devel >= 1.7.1
+BuildRequires:  libcap-devel libpng-devel poco-devel >= 1.7.5
 %if 0%{?fedora} || 0%{?rhel} >= 7
 BuildRequires:  libpcap
 %else
@@ -33,7 +33,7 @@ Requires(post): coreutils grep sed
 %if 0%{?fedora} || 0%{?rhel} >= 7
 # loolwsd dependencies
 Requires:   expat keyutils-libs krb5-libs libattr libcap libcom_err libgcc 
libpng libselinux openssl-libs pcre xz-libs zlib
-Requires:   poco-crypto >= 1.7.1 poco-foundation >= 1.7.1 poco-json >= 
1.7.1 poco-net >= 1.7.1 poco-netssl >= 1.7.1 poco-util >= 1.7.1 poco-xml >= 
1.7.1
+Requires:   poco-crypto >= 1.7.5 poco-foundation >= 1.7.5 poco-json >= 
1.7.5 poco-net >= 1.7.5 poco-netssl >= 1.7.5 poco-util >= 1.7.5 poco-xml >= 
1.7.5
 # Collabora Office dependencies (unfortunately Collabora Office RPM packages 
does not have real dependencies)
 Requires:   atk avahi-glib avahi-libs bzip2-libs cairo cups-libs dbus-glib 
dbus-libs fontconfig freetype GConf2 gdk-pixbuf2 glib2 gnome-vfs2 graphite2 
gstreamer gstreamer-plugins-base gtk2 harfbuzz libdrm libffi libICE libSM 
libuuid libX11 libXau libxcb libXcomposite libXcursor libXdamage libXext 
libXfixes libXi libXinerama libXrandr libXrender libxshmfence libXt libXxf86vm 
mesa-libEGL mesa-libgbm mesa-libGL mesa-libglapi pango pixman
 %else
@@ -41,7 +41,7 @@ Requires:   atk avahi-glib avahi-libs bzip2-libs cairo 
cups-libs dbus-glib d
 # loolwsd dependencies
 Requires(post): libcap-progs
 Requires:   libcap2 libopenssl1_0_0 libpng12-0 libpcre1 libz1 
%{?systemd_requires} %{fillup_prereq}
-Requires:   libPocoCrypto42 >= 1.7.1 libPocoFoundation42 >= 1.7.1 
libPocoJSON42 >= 1.7.1 libPocoNet42 >= 1.7.1 libPocoNetSSL42 >= 1.7.1 
libPocoUtil42 >= 1.7.1 libPocoXML42 >= 1.7.1
+Requires:   libPocoCrypto45 >= 1.7.5 libPocoFoundation45 >= 1.7.5 
libPocoJSON45 >= 1.7.5 libPocoNet45 >= 1.7.5 libPocoNetSSL45 >= 1.7.5 
libPocoUtil45 >= 1.7.5 libPocoXML45 >= 1.7.5
 # Collabora Office dependencies (unfortunately Collabora Office RPM packages 
does not have real dependencies)
 Requires:   Mesa-libEGL1 Mesa-libGL1 Mesa-libglapi0 cups-libs dbus-1-glib 
fontconfig libatk-1_0-0 libavahi-client3 libavahi-common3 libavahi-glib1 
libbz2-1 libcairo2 libcom_err2 libdbus-1-3 libdrm2 libexpat1 libfreetype6 
libgbm1 libgio-2_0-0 libglib-2_0-0 libgmodule-2_0-0 libgobject-2_0-0 
libgraphite2-3 libgthread-2_0-0 libgtk-2_0-0 libharfbuzz0 libkeyutils1 liblzma5 
libpixman-1-0 libpng16-16 libuuid1 libxml2 libffi4 libgbm1 libICE6 libselinux1 
libSM6 libwayland-client0 libwayland-server0 libX11-6 libX11-xcb1 libXau6 
libxcb1 libxcb-dri2-0 libxcb-dri3-0 libxcb-glx0 libxcb-present0 libxcb-render0 
libxcb-shm0 libxcb-sync1 libxcb-xfixes0 libXdamage1 libXext6 libXfixes3 
libXrender1 libxshmfence1 libXxf86vm1
 %endif
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] online.git: loolwsd/debian

2016-09-25 Thread Andras Timar 
 loolwsd/debian/control  |4 ++--
 loolwsd/debian/loolwsd.postinst |8 +---
 loolwsd/debian/loolwsd.preinst  |2 +-
 loolwsd/debian/loolwsd.service  |   13 -
 loolwsd/debian/rules|2 +-
 5 files changed, 5 insertions(+), 24 deletions(-)

New commits:
commit 50bf2ce246a190d5f001f56454a7de4a4f218805
Author: Andras Timar 
Date:   Sun Sep 25 19:18:38 2016 +0200

Fix a few lintian errors and warnings

diff --git a/loolwsd/debian/control b/loolwsd/debian/control
index fcd503b..6282775 100644
--- a/loolwsd/debian/control
+++ b/loolwsd/debian/control
@@ -2,8 +2,8 @@ Source: loolwsd
 Section: web
 Priority: optional
 Maintainer: Tor Lillqvist 
-Build-Depends: debhelper (>= 8.0.0), libcap-dev, libcap2-bin, libpcre3-dev, 
libpng-dev, libpoco-dev (>= 1.7.1)
-Standards-Version: 3.9.2
+Build-Depends: debhelper (>= 9), dh-systemd (>= 1.3), libcap-dev, libcap2-bin, 
libpcre3-dev, libpng-dev, libpoco-dev (>= 1.7.1)
+Standards-Version: 3.9.7
 
 Package: loolwsd
 Section: web
diff --git a/loolwsd/debian/loolwsd.postinst b/loolwsd/debian/loolwsd.postinst
index 9606d4c..ad4f7ec 100755
--- a/loolwsd/debian/loolwsd.postinst
+++ b/loolwsd/debian/loolwsd.postinst
@@ -25,10 +25,4 @@ case "$1" in
 
 esac
 
-if [ -d /run/systemd/system ]; then
-systemctl --system daemon-reload >/dev/null || true
-systemctl enable loolwsd.service >/dev/null || true
-deb-systemd-invoke start loolwsd.service >/dev/null || true
-fi
-
-exit 0
+#DEBHELPER#
diff --git a/loolwsd/debian/loolwsd.preinst b/loolwsd/debian/loolwsd.preinst
index 78112a4..2778ec7 100755
--- a/loolwsd/debian/loolwsd.preinst
+++ b/loolwsd/debian/loolwsd.preinst
@@ -7,4 +7,4 @@ if [ -d /run/systemd/system ]; then
 deb-systemd-invoke stop loolwsd.service >/dev/null || true
 fi
 
-exit 0
+#DEBHELPER#
diff --git a/loolwsd/debian/loolwsd.service b/loolwsd/debian/loolwsd.service
deleted file mode 100644
index 34b1bb8..000
--- a/loolwsd/debian/loolwsd.service
+++ /dev/null
@@ -1,13 +0,0 @@
-[Unit]
-Description=LibreOffice On-Line WebSocket Daemon
-After=network.target
-
-[Service]
-EnvironmentFile=-/etc/sysconfig/loolwsd
-ExecStart=/usr/bin/loolwsd --version 
--o:sys_template_path=/opt/lool/systemplate 
--o:lo_template_path=/opt/collaboraoffice5.1 
--o:child_root_path=/opt/lool/child-roots 
--o:file_server_root_path=/usr/share/loolwsd
-User=lool
-KillMode=control-group
-Restart=always
-
-[Install]
-WantedBy=multi-user.target
diff --git a/loolwsd/debian/rules b/loolwsd/debian/rules
index 2d7a6d8..8a7224d 100755
--- a/loolwsd/debian/rules
+++ b/loolwsd/debian/rules
@@ -13,7 +13,7 @@ export BUILDING_FROM_RPMBUILD=yes
 
 # main packaging script based on dh7 syntax
 %:
-   dh $@
+   dh $@ --with=systemd
 
 override_dh_auto_configure:
./configure $(CONFFLAGS)
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] online.git: loolwsd/debian

2016-09-21 Thread Katarina Behrens 
 loolwsd/debian/rules |3 +++
 1 file changed, 3 insertions(+)

New commits:
commit 8dfa3a49c7c6413ccf9cbda49fd63f367c6ab77e
Author: Katarina Behrens 
Date:   Mon Sep 19 16:54:53 2016 +0200

Silence lintian: there are no init.d-style scripts here

Change-Id: Idae03c6ad015d5f09ce012117e6ffb88b7c7abb8
Reviewed-on: https://gerrit.libreoffice.org/29037
Reviewed-by: Andras Timar 
Tested-by: Andras Timar 

diff --git a/loolwsd/debian/rules b/loolwsd/debian/rules
index 622daf9..2d7a6d8 100755
--- a/loolwsd/debian/rules
+++ b/loolwsd/debian/rules
@@ -24,3 +24,6 @@ override_dh_auto_test:
 override_dh_auto_install:
make install DESTDIR=`pwd`/debian/loolwsd/
cp -ar `pwd`/loleaflet  `pwd`/debian/loolwsd/usr/share/loolwsd
+
+override_dh_installinit:
+   # no init.d scripts here, assume systemd
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] online.git: loolwsd/debian

2016-09-21 Thread Katarina Behrens 
 loolwsd/debian/control |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 7424bfd11e00ff261ed11556d7ced09a13abcd91
Author: Katarina Behrens 
Date:   Mon Sep 19 11:59:21 2016 +0200

Add dependency on 'adduser', postinst script needs it

Change-Id: I41c6b2d6ef9191db3a07bfaf55530659bc06a1d0
Reviewed-on: https://gerrit.libreoffice.org/29017
Reviewed-by: Tor Lillqvist 
Tested-by: Andras Timar 

diff --git a/loolwsd/debian/control b/loolwsd/debian/control
index 9bdbfa7..fcd503b 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, libodbc1, 
libxinerama1, libcairo2, libgl1-mesa-glx, libcups2, libdbus-glib-1-2, cpio, 
collaboraofficebasis5.1-base, collaboraofficebasis5.1-calc, 
collaboraofficebasis5.1-core, collaboraofficebasis5.1-draw, 
collaboraofficebasis5.1-extension-beanshell-script-provider, 
collaboraofficebasis5.1-extension-ct2n, 
collaboraofficebasis5.1-extension-javascript-script-provider, 
collaboraofficebasis5.1-extension-mediawiki-publisher, 
collaboraofficebasis5.1-extension-nlpsolver, 
collaboraofficebasis5.1-extension-numbertext, 
collaboraofficebasis5.1-extension-pdf-import, 
collaboraofficebasis5.1-extension-report-builder, 
collaboraofficebasis5.1-gnome-integration, 
collaboraofficebasis5.1-graphicfilter, collaboraofficebasis5.1-images, 
collaboraofficebasis5.1-impress, collaboraofficebasis5.1-librelogo, 
collaboraofficebasis5.1-math, collaboraofficebasis5.1-ogltrans, 
collaboraofficebasis5.1-ooofonts, collaboraofficebasis5.1-ooolinguistic, c
 ollaboraofficebasis5.1-postgresql-sdbc, 
collaboraofficebasis5.1-python-script-provider, collaboraofficebasis5.1-pyuno, 
collaboraofficebasis5.1-writer, collaboraofficebasis5.1-xsltfilter, 
collaboraoffice5.1, collaboraoffice5.1-base, collaboraoffice5.1-calc, 
collaboraoffice5.1-dict-en, collaboraoffice5.1-draw, 
collaboraoffice5.1-debian-menus, collaboraoffice5.1-impress, 
collaboraoffice5.1-math, collaboraoffice5.1-ure, collaboraoffice5.1-writer, 
collaboraofficebasis5.1-en-us, collaboraofficebasis5.1-en-us-base, 
collaboraofficebasis5.1-en-us-calc, collaboraofficebasis5.1-en-us-math, 
collaboraofficebasis5.1-en-us-res, collaboraofficebasis5.1-en-us-writer, 
collaboraoffice5.1-en-us
+Depends: ${shlibs:Depends}, ${misc:Depends}, adduser, libsm6, libssl1.0.0, 
libodbc1, libxinerama1, libcairo2, libgl1-mesa-glx, libcups2, libdbus-glib-1-2, 
cpio, collaboraofficebasis5.1-base, collaboraofficebasis5.1-calc, 
collaboraofficebasis5.1-core, collaboraofficebasis5.1-draw, 
collaboraofficebasis5.1-extension-beanshell-script-provider, 
collaboraofficebasis5.1-extension-ct2n, 
collaboraofficebasis5.1-extension-javascript-script-provider, 
collaboraofficebasis5.1-extension-mediawiki-publisher, 
collaboraofficebasis5.1-extension-nlpsolver, 
collaboraofficebasis5.1-extension-numbertext, 
collaboraofficebasis5.1-extension-pdf-import, 
collaboraofficebasis5.1-extension-report-builder, 
collaboraofficebasis5.1-gnome-integration, 
collaboraofficebasis5.1-graphicfilter, collaboraofficebasis5.1-images, 
collaboraofficebasis5.1-impress, collaboraofficebasis5.1-librelogo, 
collaboraofficebasis5.1-math, collaboraofficebasis5.1-ogltrans, 
collaboraofficebasis5.1-ooofonts, collaboraofficebasis5.1-oooling
 uistic, collaboraofficebasis5.1-postgresql-sdbc, 
collaboraofficebasis5.1-python-script-provider, collaboraofficebasis5.1-pyuno, 
collaboraofficebasis5.1-writer, collaboraofficebasis5.1-xsltfilter, 
collaboraoffice5.1, collaboraoffice5.1-base, collaboraoffice5.1-calc, 
collaboraoffice5.1-dict-en, collaboraoffice5.1-draw, 
collaboraoffice5.1-debian-menus, collaboraoffice5.1-impress, 
collaboraoffice5.1-math, collaboraoffice5.1-ure, collaboraoffice5.1-writer, 
collaboraofficebasis5.1-en-us, collaboraofficebasis5.1-en-us-base, 
collaboraofficebasis5.1-en-us-calc, collaboraofficebasis5.1-en-us-math, 
collaboraofficebasis5.1-en-us-res, collaboraofficebasis5.1-en-us-writer, 
collaboraoffice5.1-en-us
 Description: LibreOffice On-Line WebSocket Daemon
  LOOLWSD is a daemon that talks to web browser clients and provides LibreOffice
  services.
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] online.git: loolwsd/debian

2016-08-05 Thread Jan Holesovsky 
 loolwsd/debian/changelog |8 ++--
 loolwsd/debian/rules |2 +-
 2 files changed, 7 insertions(+), 3 deletions(-)

New commits:
commit 2100dc84897517f8ddc90136547e9547bc6ff381
Author: Jan Holesovsky 
Date:   Fri Aug 5 17:38:42 2016 +0100

Update the .deb changelog, and allow passing params.

diff --git a/loolwsd/debian/changelog b/loolwsd/debian/changelog
index bfb559a..7e18298 100644
--- a/loolwsd/debian/changelog
+++ b/loolwsd/debian/changelog
@@ -1,8 +1,12 @@
-loolwsd (1.0.34-1) UNRELEASED; urgency=medium
+loolwsd (1.8.0-1) unstable; urgency=medium
 
+  [ Tor Lillqvist ]
   * Back to packaging this for Debian.
 
- -- Tor Lillqvist   Wed, 03 Jun 2015 20:24:50 +0300
+  [ Jan Holesovsky ]
+  * Update to match Collabora Office 5.1
+
+ -- Jan Holesovsky   Fri, 05 Aug 2016 16:51:54 +0100
 
 loolwsd (1.0.0-1) unstable; urgency=low
 
diff --git a/loolwsd/debian/rules b/loolwsd/debian/rules
index 519ac1a..622daf9 100755
--- a/loolwsd/debian/rules
+++ b/loolwsd/debian/rules
@@ -5,7 +5,7 @@ DPKG_EXPORT_BUILDFLAGS = 1
 
 include /usr/share/dpkg/default.mk
 
-CONFFLAGS = --prefix=/usr --localstatedir=/var --sysconfdir=/etc 
--with-lokit-path=`pwd`/bundled/include
+CONFFLAGS = --prefix=/usr --localstatedir=/var --sysconfdir=/etc 
--with-lokit-path=`pwd`/bundled/include $(CONFIG_OPTIONS)
 
 # Avoid setcap when doing "make", when building for packaging
 # the setcap is done at installation time
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] online.git: loolwsd/debian

2016-07-22 Thread Andras Timar 
 loolwsd/debian/loolwsd.cron.d |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 0bd3e3e109fcd74ab0d4ce294569304eb6035ab8
Author: Andras Timar 
Date:   Fri Jul 22 14:09:53 2016 +0200

fix loolwsd cache cleanu cron job on Debian

diff --git a/loolwsd/debian/loolwsd.cron.d b/loolwsd/debian/loolwsd.cron.d
index 6e8d16b..85a3afc 100644
--- a/loolwsd/debian/loolwsd.cron.d
+++ b/loolwsd/debian/loolwsd.cron.d
@@ -1 +1 @@
-0 0 */1 * * root find /var/cache/loolwsd -name "*.png" -a -atime +10 -exec rm 
{} ;
+0 0 */1 * * root find /var/cache/loolwsd -name "*.png" -a -atime +10 -exec rm 
{} \;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] online.git: loolwsd/debian loolwsd/LOOLWSD.cpp loolwsd/loolwsd.service loolwsd/loolwsd.spec.in loolwsd/loolwsd.xml.in

2016-07-18 Thread Andras Timar 
 loolwsd/LOOLWSD.cpp |2 +-
 loolwsd/debian/loolwsd.postinst |4 ++--
 loolwsd/debian/loolwsd.service  |2 +-
 loolwsd/loolwsd.service |2 +-
 loolwsd/loolwsd.spec.in |6 +++---
 loolwsd/loolwsd.xml.in  |2 +-
 6 files changed, 9 insertions(+), 9 deletions(-)

New commits:
commit 5f77a1f611cd45bb26d5b05eb634634ec5ef9511
Author: Andras Timar 
Date:   Mon Jul 18 17:04:25 2016 +0200

new default: Collabora Office 5.1

diff --git a/loolwsd/LOOLWSD.cpp b/loolwsd/LOOLWSD.cpp
index 20f1756..97851ab 100644
--- a/loolwsd/LOOLWSD.cpp
+++ b/loolwsd/LOOLWSD.cpp
@@ -1269,7 +1269,7 @@ void LOOLWSD::initialize(Application& self)
 static const std::map DefAppConfig = {
 { "tile_cache_path", LOOLWSD_CACHEDIR },
 { "sys_template_path", "systemplate" },
-{ "lo_template_path", "/opt/collaboraoffice5.0" },
+{ "lo_template_path", "/opt/collaboraoffice5.1" },
 { "child_root_path", "jails" },
 { "lo_jail_subpath", "lo" },
 { "server_name", "" },
diff --git a/loolwsd/debian/loolwsd.postinst b/loolwsd/debian/loolwsd.postinst
index 0bc47a0..9606d4c 100755
--- a/loolwsd/debian/loolwsd.postinst
+++ b/loolwsd/debian/loolwsd.postinst
@@ -12,7 +12,7 @@ case "$1" in
rm -rf /var/cache/loolwsd/*
 
# We assume that the LibreOffice to be used is built TDF-style
-   # and installs in /opt/collaboraoffice5.0, and that /opt/lool is
+   # and installs in /opt/collaboraoffice5.1, and that /opt/lool is
# on the same file system
 
rm -rf /opt/lool
@@ -20,7 +20,7 @@ case "$1" in
chown lool: /opt/lool
chown lool: /opt/lool/child-roots
 
-   su lool --shell=/bin/sh -c "loolwsd-systemplate-setup 
/opt/lool/systemplate /opt/collaboraoffice5.0 >/dev/null 2>&1"
+   su lool --shell=/bin/sh -c "loolwsd-systemplate-setup 
/opt/lool/systemplate /opt/collaboraoffice5.1 >/dev/null 2>&1"
;;
 
 esac
diff --git a/loolwsd/debian/loolwsd.service b/loolwsd/debian/loolwsd.service
index 5124662..34b1bb8 100644
--- a/loolwsd/debian/loolwsd.service
+++ b/loolwsd/debian/loolwsd.service
@@ -4,7 +4,7 @@ After=network.target
 
 [Service]
 EnvironmentFile=-/etc/sysconfig/loolwsd
-ExecStart=/usr/bin/loolwsd --version 
--o:sys_template_path=/opt/lool/systemplate 
--o:lo_template_path=/opt/collaboraoffice5.0 
--o:child_root_path=/opt/lool/child-roots 
--o:file_server_root_path=/usr/share/loolwsd
+ExecStart=/usr/bin/loolwsd --version 
--o:sys_template_path=/opt/lool/systemplate 
--o:lo_template_path=/opt/collaboraoffice5.1 
--o:child_root_path=/opt/lool/child-roots 
--o:file_server_root_path=/usr/share/loolwsd
 User=lool
 KillMode=control-group
 Restart=always
diff --git a/loolwsd/loolwsd.service b/loolwsd/loolwsd.service
index 5124662..34b1bb8 100644
--- a/loolwsd/loolwsd.service
+++ b/loolwsd/loolwsd.service
@@ -4,7 +4,7 @@ After=network.target
 
 [Service]
 EnvironmentFile=-/etc/sysconfig/loolwsd
-ExecStart=/usr/bin/loolwsd --version 
--o:sys_template_path=/opt/lool/systemplate 
--o:lo_template_path=/opt/collaboraoffice5.0 
--o:child_root_path=/opt/lool/child-roots 
--o:file_server_root_path=/usr/share/loolwsd
+ExecStart=/usr/bin/loolwsd --version 
--o:sys_template_path=/opt/lool/systemplate 
--o:lo_template_path=/opt/collaboraoffice5.1 
--o:child_root_path=/opt/lool/child-roots 
--o:file_server_root_path=/usr/share/loolwsd
 User=lool
 KillMode=control-group
 Restart=always
diff --git a/loolwsd/loolwsd.spec.in b/loolwsd/loolwsd.spec.in
index 2b10a82..d298198 100644
--- a/loolwsd/loolwsd.spec.in
+++ b/loolwsd/loolwsd.spec.in
@@ -23,7 +23,7 @@ BuildRequires:  libcap-progs systemd-rpm-macros
 %endif
 %endif
 
-Requires:   collaboraoffice5.0 collaboraoffice5.0-en-US 
collaboraoffice5.0-ure collaboraofficebasis5.0-core 
collaboraofficebasis5.0-writer collaboraofficebasis5.0-impress 
collaboraofficebasis5.0-graphicfilter collaboraofficebasis5.0-en-US 
collaboraofficebasis5.0-calc collaboraofficebasis5.0-en-US-res 
collaboraofficebasis5.0-en-US-calc collaboraofficebasis5.0-ooofonts 
collaboraofficebasis5.0-images collaboraofficebasis5.0-filter-data 
collaboraofficebasis5.0-draw collaboraofficebasis5.0-base 
collaboraofficebasis5.0-en-US-writer collaboraofficebasis5.0-en-US-math 
collaboraofficebasis5.0-en-US-base
+Requires:   collaboraoffice5.1 collaboraoffice5.1-en-US 
collaboraoffice5.1-ure collaboraofficebasis5.1-core 
collaboraofficebasis5.1-writer collaboraofficebasis5.1-impress 
collaboraofficebasis5.1-graphicfilter collaboraofficebasis5.1-en-US 
collaboraofficebasis5.1-calc collaboraofficebasis5.1-en-US-res 
collaboraofficebasis5.1-en-US-calc collaboraofficebasis5.1-ooofonts 
collaboraofficebasis5.1-images collaboraofficebasis5.1-filter-data 
collaboraofficebasis5.1-draw collaboraofficebasis5.1-base 
collaboraofficebasis5.1-en-US-writer collaboraofficebasis5.1-en-US-math 
collaboraofficebasis5.1-en-US-base
 Requires:

[Libreoffice-commits] online.git: loolwsd/debian

2016-06-28 Thread Andras Timar 
 loolwsd/debian/control |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit cdf14cea3e3765cb94896ba3efa1678a4d0d4f6c
Author: Andras Timar 
Date:   Tue Jun 28 10:10:23 2016 +0200

loolwsd: remove libmysqlclient18 from deb package dependencies

diff --git a/loolwsd/debian/control b/loolwsd/debian/control
index 08b784c..ef91505 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, collaboraoffice
+Depends: ${shlibs:Depends}, ${misc:Depends}, libsm6, libssl1.0.0, 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.
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] online.git: loolwsd/debian loolwsd/loolwsd.service

2016-06-27 Thread Andras Timar 
 loolwsd/debian/loolwsd.service |   11 +--
 loolwsd/loolwsd.service|   11 +--
 2 files changed, 2 insertions(+), 20 deletions(-)

New commits:
commit e85179e0f8e16aec6cf2963c772c1069ed9ac924
Author: Andras Timar 
Date:   Mon Jun 27 09:15:40 2016 +0200

loolwsd: let loolwsd.service use the new command line options

diff --git a/loolwsd/debian/loolwsd.service b/loolwsd/debian/loolwsd.service
index 112ea8e..5124662 100644
--- a/loolwsd/debian/loolwsd.service
+++ b/loolwsd/debian/loolwsd.service
@@ -4,16 +4,7 @@ After=network.target
 
 [Service]
 EnvironmentFile=-/etc/sysconfig/loolwsd
-#
-# For admin console you have to give admin user name and password
-# with --admincreds=username/password
-#
-# Local Storage is disabled by default. Specify --allowlocalstorage
-# to enable it. Beware! If you specify --allowlocalstorage, all files
-# that can be read by lool user, will be passed to LibreOffice and
-# may be displayed in the browser. This option is only for debugging.
-#
-ExecStart=/usr/bin/loolwsd --version --systemplate=/opt/lool/systemplate 
--lotemplate=/opt/collaboraoffice5.0 --childroot=/opt/lool/child-roots 
--numprespawns=5 --fileserverroot=/usr/share/loolwsd
+ExecStart=/usr/bin/loolwsd --version 
--o:sys_template_path=/opt/lool/systemplate 
--o:lo_template_path=/opt/collaboraoffice5.0 
--o:child_root_path=/opt/lool/child-roots 
--o:file_server_root_path=/usr/share/loolwsd
 User=lool
 KillMode=control-group
 Restart=always
diff --git a/loolwsd/loolwsd.service b/loolwsd/loolwsd.service
index 112ea8e..5124662 100644
--- a/loolwsd/loolwsd.service
+++ b/loolwsd/loolwsd.service
@@ -4,16 +4,7 @@ After=network.target
 
 [Service]
 EnvironmentFile=-/etc/sysconfig/loolwsd
-#
-# For admin console you have to give admin user name and password
-# with --admincreds=username/password
-#
-# Local Storage is disabled by default. Specify --allowlocalstorage
-# to enable it. Beware! If you specify --allowlocalstorage, all files
-# that can be read by lool user, will be passed to LibreOffice and
-# may be displayed in the browser. This option is only for debugging.
-#
-ExecStart=/usr/bin/loolwsd --version --systemplate=/opt/lool/systemplate 
--lotemplate=/opt/collaboraoffice5.0 --childroot=/opt/lool/child-roots 
--numprespawns=5 --fileserverroot=/usr/share/loolwsd
+ExecStart=/usr/bin/loolwsd --version 
--o:sys_template_path=/opt/lool/systemplate 
--o:lo_template_path=/opt/collaboraoffice5.0 
--o:child_root_path=/opt/lool/child-roots 
--o:file_server_root_path=/usr/share/loolwsd
 User=lool
 KillMode=control-group
 Restart=always
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] online.git: loolwsd/debian loolwsd/loolwsd.spec.in

2016-05-20 Thread Andras Timar 
 loolwsd/debian/loolwsd.postinst |1 +
 loolwsd/loolwsd.spec.in |1 +
 2 files changed, 2 insertions(+)

New commits:
commit 625de77dd38c3f89a3520b6b0f3c71e06e615306
Author: Andras Timar 
Date:   Fri May 20 15:51:05 2016 +0200

loolwsd: packaging, setcap cap_sys_admin=ep /usr/bin/loolmount

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/*
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] online.git: loolwsd/debian

2016-05-20 Thread Andras Timar 
 loolwsd/debian/control |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 2c2073231e876b46ed2daf0d24f390d2959abcbc
Author: Andras Timar 
Date:   Fri May 20 15:46:56 2016 +0200

loolwsd: fix deb dependency, will depend on collaboraoffice metapackage

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.
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] online.git: loolwsd/debian

2016-05-10 Thread Andras Timar 
 loolwsd/debian/loolwsd.postinst |2 +-
 loolwsd/debian/loolwsd.service  |   11 ++-
 2 files changed, 11 insertions(+), 2 deletions(-)

New commits:
commit ff693c49b8bf49fbd55124f2dd12f08cf646190f
Author: Andras Timar 
Date:   Tue May 10 10:18:37 2016 +0200

Debian packaging

diff --git a/loolwsd/debian/loolwsd.postinst b/loolwsd/debian/loolwsd.postinst
index 7363fd6..73c3985 100755
--- a/loolwsd/debian/loolwsd.postinst
+++ b/loolwsd/debian/loolwsd.postinst
@@ -19,7 +19,7 @@ case "$1" in
chown lool: /opt/lool
chown lool: /opt/lool/child-roots
 
-   su lool --shell=/bin/sh -c "loolwsd-systemplate-setup 
/opt/lool/systemplate /opt/collaboraoffice5.0 >/dev/null"
+   su lool --shell=/bin/sh -c "loolwsd-systemplate-setup 
/opt/lool/systemplate /opt/collaboraoffice5.0 >/dev/null 2>&1"
;;
 
 esac
diff --git a/loolwsd/debian/loolwsd.service b/loolwsd/debian/loolwsd.service
index fdc32c5..112ea8e 100644
--- a/loolwsd/debian/loolwsd.service
+++ b/loolwsd/debian/loolwsd.service
@@ -4,7 +4,16 @@ After=network.target
 
 [Service]
 EnvironmentFile=-/etc/sysconfig/loolwsd
-ExecStart=/usr/bin/loolwsd --systemplate=/opt/lool/systemplate 
--lotemplate=/opt/collaboraoffice5.0 --childroot=/opt/lool/child-roots 
--numprespawns=5 --fileserverroot=/usr/share/loolwsd
+#
+# For admin console you have to give admin user name and password
+# with --admincreds=username/password
+#
+# Local Storage is disabled by default. Specify --allowlocalstorage
+# to enable it. Beware! If you specify --allowlocalstorage, all files
+# that can be read by lool user, will be passed to LibreOffice and
+# may be displayed in the browser. This option is only for debugging.
+#
+ExecStart=/usr/bin/loolwsd --version --systemplate=/opt/lool/systemplate 
--lotemplate=/opt/collaboraoffice5.0 --childroot=/opt/lool/child-roots 
--numprespawns=5 --fileserverroot=/usr/share/loolwsd
 User=lool
 KillMode=control-group
 Restart=always
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] online.git: loolwsd/debian loolwsd/LOOLWSD.cpp

2016-04-05 Thread Michael Meeks 
 loolwsd/LOOLWSD.cpp  |   27 ---
 loolwsd/debian/copyright |   40 +++-
 2 files changed, 19 insertions(+), 48 deletions(-)

New commits:
commit 1216243935931ba3efe27be2497790405271d102
Author: Michael Meeks 
Date:   Tue Apr 5 13:58:41 2016 +0100

License cleanup.

Boost sample code long gone; and include loleaflet license.

diff --git a/loolwsd/LOOLWSD.cpp b/loolwsd/LOOLWSD.cpp
index 194cad3..a2f8911 100644
--- a/loolwsd/LOOLWSD.cpp
+++ b/loolwsd/LOOLWSD.cpp
@@ -5,33 +5,6 @@
  * This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/.
- *
- * Parts of this file is covered by:
-
-Boost Software License - Version 1.0 - August 17th, 2003
-
-Permission is hereby granted, free of charge, to any person or organization
-obtaining a copy of the software and accompanying documentation covered by
-this license (the "Software") to use, reproduce, display, distribute,
-execute, and transmit the Software, and to prepare derivative works of the
-Software, and to permit third-parties to whom the Software is furnished to
-do so, all subject to the following:
-
-The copyright notices in the Software and this entire statement, including
-the above license grant, this restriction and the following disclaimer,
-must be included in all copies of the Software, in whole or in part, and
-all derivative works of the Software, unless such copies or derivative
-works are solely in the form of machine-executable object code generated by
-a source language processor.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE, TITLE AND NON-INFRINGEMENT. IN NO EVENT
-SHALL THE COPYRIGHT HOLDERS OR ANYONE DISTRIBUTING THE SOFTWARE BE LIABLE
-FOR ANY DAMAGES OR OTHER LIABILITY, WHETHER IN CONTRACT, TORT OR OTHERWISE,
-ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
-DEALINGS IN THE SOFTWARE.
-
  */
 
 #include "config.h"
diff --git a/loolwsd/debian/copyright b/loolwsd/debian/copyright
index d2a2a46..a75b302 100644
--- a/loolwsd/debian/copyright
+++ b/loolwsd/debian/copyright
@@ -6,28 +6,26 @@ Source: git://gerrit.libreoffice.org/online
 Copyright: 2015 Collabora Productivity 
 License: MPL-2
 
-Copyright: 2004-2006, Applied Informatics Software Engineering GmbH
+Copyright: Copyright (c) 2010-2015, Vladimir Agafonkin, Copyright (c) 
2010-2011, CloudMade
 License:
-   Boost Software License - Version 1.0 - August 17th, 2003
+All rights reserved.
 
-   Permission is hereby granted, free of charge, to any person or organization
-   obtaining a copy of the software and accompanying documentation covered by
-   this license (the "Software") to use, reproduce, display, distribute,
-   execute, and transmit the Software, and to prepare derivative works of the
-   Software, and to permit third-parties to whom the Software is furnished to
-   do so, all subject to the following:
+Redistribution and use in source and binary forms, with or without 
modification, are
+permitted provided that the following conditions are met:
 
-   The copyright notices in the Software and this entire statement, including
-   the above license grant, this restriction and the following disclaimer,
-   must be included in all copies of the Software, in whole or in part, and
-   all derivative works of the Software, unless such copies or derivative
-   works are solely in the form of machine-executable object code generated by
-   a source language processor.
+   1. Redistributions of source code must retain the above copyright notice, 
this list of
+  conditions and the following disclaimer.
 
-   THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-   IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-   FITNESS FOR A PARTICULAR PURPOSE, TITLE AND NON-INFRINGEMENT. IN NO EVENT
-   SHALL THE COPYRIGHT HOLDERS OR ANYONE DISTRIBUTING THE SOFTWARE BE LIABLE
-   FOR ANY DAMAGES OR OTHER LIABILITY, WHETHER IN CONTRACT, TORT OR OTHERWISE,
-   ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
-   DEALINGS IN THE SOFTWARE.
+   2. Redistributions in binary form must reproduce the above copyright 
notice, this list
+  of conditions and the following disclaimer in the documentation and/or 
other materials
+  provided with the distribution.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" 
AND ANY
+EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED 
WARRANTIES OF
+MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO 
EVENT SHALL THE
+COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,

[Libreoffice-commits] online.git: loolwsd/debian loolwsd/LOOLBroker.cpp loolwsd/LOOLKit.cpp loolwsd/loolwsd.spec.in loolwsd/Makefile.am loolwsd/README.vars

2016-04-04 Thread Tor Lillqvist 
 loolwsd/LOOLBroker.cpp  |  115 
 loolwsd/LOOLKit.cpp |   83 
 loolwsd/Makefile.am |   18 ++
 loolwsd/README.vars |   19 ++
 loolwsd/debian/loolwsd.postinst |1 
 loolwsd/loolwsd.spec.in |2 
 6 files changed, 50 insertions(+), 188 deletions(-)

New commits:
commit a132e06409353b374e754a9aecf6b55b06778118
Author: Tor Lillqvist 
Date:   Mon Apr 4 08:26:05 2016 +0300

Bin the non-preinit and non-fork code paths

Preiniting LibreOfficeKit and forking kit processes (instead of
spawning) has worked fine for a while, and has been the default way
this works.

No 'loolkit' program gets built any more.

diff --git a/loolwsd/LOOLBroker.cpp b/loolwsd/LOOLBroker.cpp
index c37116a..defcfae 100644
--- a/loolwsd/LOOLBroker.cpp
+++ b/loolwsd/LOOLBroker.cpp
@@ -21,7 +21,6 @@
 // we can avoid execve and share lots of memory here. We
 // can't link to a non-PIC translation unit though, so
 // include to share.
-#define LOOLKIT_NO_MAIN 1
 #include "LOOLKit.cpp"
 
 #define LIB_SOFFICEAPP  "lib" "sofficeapp" ".so"
@@ -34,7 +33,6 @@ const std::string BROKER_PREFIX = "lokit";
 
 static int ReaderBroker = -1;
 
-static std::string LoolkitPath;
 static std::atomic ForkCounter;
 static unsigned int ChildCounter = 0;
 static int NumPreSpawnedChildren = 1;
@@ -74,7 +72,7 @@ private:
 };
 
 /// Initializes LibreOfficeKit for cross-fork re-use.
-static bool globalPreinit(const std::string )
+static void globalPreinit(const std::string )
 {
 const std::string libSofficeapp = loTemplate + "/program/" LIB_SOFFICEAPP;
 
@@ -85,8 +83,8 @@ static bool globalPreinit(const std::string )
 handle = dlopen(libSofficeapp.c_str(), RTLD_GLOBAL|RTLD_NOW);
 if (!handle)
 {
-Log::warn("Failed to load " + libSofficeapp + ": " + 
std::string(dlerror()));
-return false;
+Log::error("Failed to load " + libSofficeapp + ": " + 
std::string(dlerror()));
+_exit(Application::EXIT_SOFTWARE);
 }
 loadedLibrary = libSofficeapp;
 }
@@ -98,30 +96,33 @@ static bool globalPreinit(const std::string )
 handle = dlopen(libMerged.c_str(), RTLD_GLOBAL|RTLD_NOW);
 if (!handle)
 {
-Log::warn("Failed to load " + libMerged + ": " + 
std::string(dlerror()));
-return false;
+Log::error("Failed to load " + libMerged + ": " + 
std::string(dlerror()));
+_exit(Application::EXIT_SOFTWARE);
 }
 loadedLibrary = libMerged;
 }
 else
 {
-Log::warn("Neither " + libSofficeapp + " or " + libMerged + " 
exist.");
-return false;
+Log::error("Neither " + libSofficeapp + " or " + libMerged + " 
exist.");
+_exit(Application::EXIT_SOFTWARE);
 }
 }
 
 LokHookPreInit* preInit = (LokHookPreInit *)dlsym(handle, "lok_preinit");
 if (!preInit)
 {
-Log::warn("Note: No lok_preinit hook in " + loadedLibrary);
-return false;
+Log::error("No lok_preinit symbol in " + loadedLibrary);
+_exit(Application::EXIT_SOFTWARE);
 }
 
-return preInit((loTemplate + "/program").c_str(), "file:///user") == 0;
+if (preInit((loTemplate + "/program").c_str(), "file:///user") != 0)
+{
+Log::error("lok_preinit() in " + loadedLibrary + " failed");
+_exit(Application::EXIT_SOFTWARE);
+}
 }
 
-static int createLibreOfficeKit(const bool sharePages,
-const std::string& childRoot,
+static int createLibreOfficeKit(const std::string& childRoot,
 const std::string& sysTemplate,
 const std::string& loTemplate,
 const std::string& loSubPath)
@@ -137,56 +138,28 @@ static int createLibreOfficeKit(const bool sharePages,
 return -1;
 }
 
-if (sharePages)
-{
-Log::debug("Forking LibreOfficeKit.");
+Log::debug("Forking LibreOfficeKit.");
 
-Process::PID pid;
-if (!(pid = fork()))
-{
-// child
-if (std::getenv("SLEEPKITFORDEBUGGER"))
-{
-std::cerr << "Sleeping " << std::getenv("SLEEPKITFORDEBUGGER")
-  << " seconds to give you time to attach debugger to 
process "
-  << Process::id() << std::endl;
-Thread::sleep(std::stoul(std::getenv("SLEEPKITFORDEBUGGER")) * 
1000);
-}
-
-lokit_main(childRoot, sysTemplate, loTemplate, loSubPath, pipeKit);
-_exit(Application::EXIT_OK);
-}
-else
+Process::PID pid;
+if (!(pid = fork()))
+{
+// child
+if (std::getenv("SLEEPKITFORDEBUGGER"))
 {
-// parent
-

[Libreoffice-commits] online.git: loolwsd/debian loolwsd/LOOLKit.cpp loolwsd/loolwsd.spec.in loolwsd/Makefile.am

2016-03-01 Thread Tor Lillqvist 
 loolwsd/LOOLKit.cpp |   19 ---
 loolwsd/Makefile.am |4 ++--
 loolwsd/debian/loolwsd.postinst |4 ++--
 loolwsd/loolwsd.spec.in |4 ++--
 4 files changed, 6 insertions(+), 25 deletions(-)

New commits:
commit d5292541bddfea8317d1996899f86bdab56b5eca
Author: Tor Lillqvist 
Date:   Tue Mar 1 18:22:55 2016 +0200

Revert "Also chown the random devices to root:root and chmod to 666"

Not needed after all. It was a red herring. The device files work fine
even if not owned by root:root and with mode 664. The actual problem
was that I used a file system mounted with nodev when testing loolwsd.

This reverts commit 509314d5598b68fa9a449a1a7348b10f25b7014a

diff --git a/loolwsd/LOOLKit.cpp b/loolwsd/LOOLKit.cpp
index 6ca626f..f89a324 100644
--- a/loolwsd/LOOLKit.cpp
+++ b/loolwsd/LOOLKit.cpp
@@ -864,30 +864,12 @@ void lokit_main(const std::string& childRoot,
 Log::error("Error: mknod(" + jailPath.toString() + "/dev/random) 
failed.");
 
 }
-if (chmod((jailPath.toString() + "/dev/random").c_str(), 0666) != 0)
-{
-Log::error("Error: chmod(" + jailPath.toString() + "/dev/random, 
0666) failed.");
-
-}
-if (chown((jailPath.toString() + "/dev/random").c_str(), 0, 0) != 0)
-{
-Log::error("Error: chown(" + jailPath.toString() + "/dev/random, 
0, 0) failed.");
-
-}
 if (mknod((jailPath.toString() + "/dev/urandom").c_str(),
   S_IFCHR | S_IRUSR | S_IWUSR | S_IRGRP | S_IWGRP | S_IROTH | 
S_IWOTH,
   makedev(1, 9)) != 0)
 {
 Log::error("Error: mknod(" + jailPath.toString() + "/dev/urandom) 
failed.");
 }
-if (chmod((jailPath.toString() + "/dev/urandom").c_str(), 0666) != 0)
-{
-Log::error("Error: chmod(" + jailPath.toString() + "/dev/urandom, 
0666) failed.");
-}
-if (chown((jailPath.toString() + "/dev/urandom").c_str(), 0, 0) != 0)
-{
-Log::error("Error: chown(" + jailPath.toString() + "/dev/urandom, 
0, 0) failed.");
-}
 
 Log::info("chroot(\"" + jailPath.toString() + "\")");
 if (chroot(jailPath.toString().c_str()) == -1)
@@ -904,7 +886,6 @@ void lokit_main(const std::string& childRoot,
 
 dropCapability(CAP_SYS_CHROOT);
 dropCapability(CAP_MKNOD);
-dropCapability(CAP_CHOWN);
 dropCapability(CAP_FOWNER);
 
 loKit = lok_init_2(instdir_path.c_str(), "file:///user");
diff --git a/loolwsd/Makefile.am b/loolwsd/Makefile.am
index 802876a..b14f1fd 100644
--- a/loolwsd/Makefile.am
+++ b/loolwsd/Makefile.am
@@ -45,8 +45,8 @@ clean-cache:
 all-local: loolwsd loolbroker
if test "$$BUILDING_FROM_RPMBUILD" != yes; then \
if test `uname -s` = Linux; then \
-   sudo @SETCAP@ cap_fowner,cap_mknod,cap_chown,cap_sys_chroot=ep 
loolbroker; \
-   sudo @SETCAP@ cap_fowner,cap_mknod,cap_chown,cap_sys_chroot=ep 
loolkit; \
+   sudo @SETCAP@ cap_fowner,cap_mknod,cap_sys_chroot=ep 
loolbroker; \
+   sudo @SETCAP@ cap_fowner,cap_mknod,cap_sys_chroot=ep loolkit; \
else \
sudo chown root loolbroker && sudo chmod u+s loolbroker; \
sudo chown root loolbroker && sudo chmod u+s loolkit; \
diff --git a/loolwsd/debian/loolwsd.postinst b/loolwsd/debian/loolwsd.postinst
index 909332a..bb4f6da 100755
--- a/loolwsd/debian/loolwsd.postinst
+++ b/loolwsd/debian/loolwsd.postinst
@@ -4,8 +4,8 @@ set -e
 
 case "$1" in
 configure)
-   setcap cap_fowner,cap_mknod,cap_chown,cap_sys_chroot=ep 
/usr/bin/loolkit || true
-   setcap cap_fowner,cap_mknod,cap_chown,cap_sys_chroot=ep 
/usr/bin/loolbroker || true
+   setcap cap_fowner,cap_mknod,cap_sys_chroot=ep /usr/bin/loolkit || true
+   setcap cap_fowner,cap_mknod,cap_sys_chroot=ep /usr/bin/loolbroker || 
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 54ddf17..c2d8f5d 100644
--- a/loolwsd/loolwsd.spec.in
+++ b/loolwsd/loolwsd.spec.in
@@ -69,8 +69,8 @@ echo "0 0 */1 * * root find /var/cache/loolwsd -name 
\"*.png\" -a -atime +10 -ex
 %service_add_pre loolwsd.service
 
 %post
-setcap cap_fowner,cap_mknod,cap_chown,cap_sys_chroot=ep /usr/bin/loolbroker
-setcap cap_fowner,cap_mknod,cap_chown,cap_sys_chroot=ep /usr/bin/loolkit
+setcap cap_fowner,cap_mknod,cap_sys_chroot=ep /usr/bin/loolbroker
+setcap cap_fowner,cap_mknod,cap_sys_chroot=ep /usr/bin/loolkit
 
 getent group %{group} >/dev/null || groupadd -r %{group}
 getent passwd %{owner} >/dev/null || useradd -g %{group} -r %{owner}
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org

[Libreoffice-commits] online.git: loolwsd/debian

2016-01-08 Thread Andras Timar 
 loolwsd/debian/rules |5 -
 1 file changed, 4 insertions(+), 1 deletion(-)

New commits:
commit dc23d5f91efd19ff8f107ff1aa4ac19625f8027a
Author: Andras Timar 
Date:   Fri Jan 8 15:04:35 2016 +0100

loolwsd: deb rules: fix build of tests, and do not run tests

diff --git a/loolwsd/debian/rules b/loolwsd/debian/rules
index a1e9d92..5ac9c8a 100755
--- a/loolwsd/debian/rules
+++ b/loolwsd/debian/rules
@@ -5,7 +5,7 @@ DPKG_EXPORT_BUILDFLAGS = 1
 
 include /usr/share/dpkg/default.mk
 
-CONFFLAGS = --prefix=/usr --localstatedir=/var 
--with-lokit-path=bundled/include
+CONFFLAGS = --prefix=/usr --localstatedir=/var 
--with-lokit-path=`pwd`/bundled/include --disable-tests
 
 # Avoid setcap when doing "make", when building for packaging
 # the setcap is done at installation time
@@ -17,3 +17,6 @@ export BUILDING_FROM_RPMBUILD=yes
 
 override_dh_auto_configure:
./configure $(CONFFLAGS)
+
+override_dh_auto_test:
+   # do not test
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] online.git: loolwsd/debian

2015-11-25 Thread Andras Timar 
 loolwsd/debian/control |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 2c184ee1c10c2ea543a684b8d983ff8331bd69b3
Author: Andras Timar 
Date:   Wed Nov 25 15:56:46 2015 +0100

bccu#1371 add libsm6 as dependency to loolwsd

diff --git a/loolwsd/debian/control b/loolwsd/debian/control
index aed5804..d1d4bd7 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}, 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, collaboraoffice5.0
 Description: LibreOffice On-Line WebSocket Daemon
  LOOLWSD is a daemon that talks to web browser clients and provides LibreOffice
  services.
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] online.git: loolwsd/debian

2015-11-18 Thread Jan Holesovsky 
 loolwsd/debian/loolwsd.service |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 7e4f1d3b61739d8ce1178280ba07192e32c608ee
Author: Jan Holesovsky 
Date:   Wed Nov 18 18:53:32 2015 +0100

loolwsd: KillMode=control-group for the debian systemd config too.

diff --git a/loolwsd/debian/loolwsd.service b/loolwsd/debian/loolwsd.service
index 8e410f8..136bad4 100644
--- a/loolwsd/debian/loolwsd.service
+++ b/loolwsd/debian/loolwsd.service
@@ -6,7 +6,7 @@ After=network.target
 EnvironmentFile=-/etc/sysconfig/loolwsd
 ExecStart=/usr/bin/loolwsd --systemplate=/opt/lool/systemplate 
--lotemplate=/opt/collaboraoffice5.0 --childroot=/opt/lool/child-roots 
--numprespawns=5
 User=lool
-KillMode=process
+KillMode=control-group
 Restart=always
 
 [Install]
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] online.git: loolwsd/debian loolwsd/loolwsd.service

2015-10-30 Thread Jan Holesovsky 
 loolwsd/debian/loolwsd.service |2 --
 loolwsd/loolwsd.service|2 --
 2 files changed, 4 deletions(-)

New commits:
commit 2691d88909543178eb4b326651e56929de3a0757
Author: Jan Holesovsky 
Date:   Fri Oct 30 11:34:41 2015 +0100

Revert "loolwsd: Update systemplate with every startup of the service."

This is not a good idea, it takes too long for systemd, and times out.

This reverts commit b42409c3883561411a88b95d927fb30ce03d3a0b.

diff --git a/loolwsd/debian/loolwsd.service b/loolwsd/debian/loolwsd.service
index 36180ff..19fb82c 100644
--- a/loolwsd/debian/loolwsd.service
+++ b/loolwsd/debian/loolwsd.service
@@ -4,8 +4,6 @@ After=network.target
 
 [Service]
 EnvironmentFile=-/etc/sysconfig/loolwsd
-ExecStartPre=-rm -rf /opt/lool/systemplate
-ExecStartPre=/usr/bin/loolwsd-systemplate-setup /opt/lool/systemplate 
/opt/libreoffice5.0
 ExecStart=/usr/bin/loolwsd --systemplate=/opt/lool/systemplate 
--lotemplate=/opt/libreoffice5.0 --childroot=/opt/lool/child-roots 
--numprespawns=5
 User=lool
 KillMode=process
diff --git a/loolwsd/loolwsd.service b/loolwsd/loolwsd.service
index 36180ff..19fb82c 100644
--- a/loolwsd/loolwsd.service
+++ b/loolwsd/loolwsd.service
@@ -4,8 +4,6 @@ After=network.target
 
 [Service]
 EnvironmentFile=-/etc/sysconfig/loolwsd
-ExecStartPre=-rm -rf /opt/lool/systemplate
-ExecStartPre=/usr/bin/loolwsd-systemplate-setup /opt/lool/systemplate 
/opt/libreoffice5.0
 ExecStart=/usr/bin/loolwsd --systemplate=/opt/lool/systemplate 
--lotemplate=/opt/libreoffice5.0 --childroot=/opt/lool/child-roots 
--numprespawns=5
 User=lool
 KillMode=process
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] online.git: loolwsd/debian loolwsd/loolwsd.service

2015-10-30 Thread Jan Holesovsky 
 loolwsd/debian/loolwsd.service |2 ++
 loolwsd/loolwsd.service|2 ++
 2 files changed, 4 insertions(+)

New commits:
commit b42409c3883561411a88b95d927fb30ce03d3a0b
Author: Jan Holesovsky 
Date:   Fri Oct 30 10:40:22 2015 +0100

loolwsd: Update systemplate with every startup of the service.

diff --git a/loolwsd/debian/loolwsd.service b/loolwsd/debian/loolwsd.service
index 19fb82c..36180ff 100644
--- a/loolwsd/debian/loolwsd.service
+++ b/loolwsd/debian/loolwsd.service
@@ -4,6 +4,8 @@ After=network.target
 
 [Service]
 EnvironmentFile=-/etc/sysconfig/loolwsd
+ExecStartPre=-rm -rf /opt/lool/systemplate
+ExecStartPre=/usr/bin/loolwsd-systemplate-setup /opt/lool/systemplate 
/opt/libreoffice5.0
 ExecStart=/usr/bin/loolwsd --systemplate=/opt/lool/systemplate 
--lotemplate=/opt/libreoffice5.0 --childroot=/opt/lool/child-roots 
--numprespawns=5
 User=lool
 KillMode=process
diff --git a/loolwsd/loolwsd.service b/loolwsd/loolwsd.service
index 19fb82c..36180ff 100644
--- a/loolwsd/loolwsd.service
+++ b/loolwsd/loolwsd.service
@@ -4,6 +4,8 @@ After=network.target
 
 [Service]
 EnvironmentFile=-/etc/sysconfig/loolwsd
+ExecStartPre=-rm -rf /opt/lool/systemplate
+ExecStartPre=/usr/bin/loolwsd-systemplate-setup /opt/lool/systemplate 
/opt/libreoffice5.0
 ExecStart=/usr/bin/loolwsd --systemplate=/opt/lool/systemplate 
--lotemplate=/opt/libreoffice5.0 --childroot=/opt/lool/child-roots 
--numprespawns=5
 User=lool
 KillMode=process
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] online.git: loolwsd/debian

2015-09-08 Thread Mihai Varga 
 loolwsd/debian/loolwsd.preinst |   10 ++
 1 file changed, 10 insertions(+)

New commits:
commit aad12a8f2bc82615d82ed0c178da312bfdb859f4
Author: Mihai Varga 
Date:   Tue Sep 8 16:31:49 2015 +0300

loolwsd: stop loolwsd service before installing .deb

diff --git a/loolwsd/debian/loolwsd.preinst b/loolwsd/debian/loolwsd.preinst
new file mode 100755
index 000..78112a4
--- /dev/null
+++ b/loolwsd/debian/loolwsd.preinst
@@ -0,0 +1,10 @@
+#!/bin/sh
+
+set -e
+
+# Stop any running loolwsd process
+if [ -d /run/systemd/system ]; then
+deb-systemd-invoke stop loolwsd.service >/dev/null || true
+fi
+
+exit 0
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] online.git: loolwsd/debian

2015-08-31 Thread Andras Timar 
 loolwsd/debian/loolwsd.postinst |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 289b8646d2996c42043af9f96a60b33707d12f7c
Author: Andras Timar 
Date:   Mon Aug 31 12:29:29 2015 +0200

loolwsd: workaround postinstall script failure in docker environment

diff --git a/loolwsd/debian/loolwsd.postinst b/loolwsd/debian/loolwsd.postinst
index 5b0b265..5b9160e 100755
--- a/loolwsd/debian/loolwsd.postinst
+++ b/loolwsd/debian/loolwsd.postinst
@@ -4,7 +4,7 @@ set -e
 
 case "$1" in
 configure)
-   setcap cap_fowner,cap_mknod,cap_sys_chroot=ep /usr/bin/loolwsd
+   setcap cap_fowner,cap_mknod,cap_sys_chroot=ep /usr/bin/loolwsd || true
 
adduser --quiet --system --group --home /opt/lool lool
mkdir -p /var/cache/loolwsd && chmod og+w /var/cache/loolwsd
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] online.git: loolwsd/debian

2015-08-14 Thread Mihai Varga 
 loolwsd/debian/control |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 12ebcd4038eb92e1d56c972252765a6398cabd91
Author: Mihai Varga mihai.va...@collabora.com
Date:   Fri Aug 14 11:46:28 2015 +0300

loolwsd: .deb should depend on libreoffice5.0

diff --git a/loolwsd/debian/control b/loolwsd/debian/control
index 6a204c7..7c20090 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}, libssl1.0.0, libmysqlclient18, 
libodbc1, libxinerama1, libcairo2, libgl1-mesa-glx, libcups2, libdbus-glib-1-2, 
cpio
+Depends: ${shlibs:Depends}, ${misc:Depends}, libssl1.0.0, libmysqlclient18, 
libodbc1, libxinerama1, libcairo2, libgl1-mesa-glx, libcups2, libdbus-glib-1-2, 
cpio, libreoffice5.0
 Description: LibreOffice On-Line WebSocket Daemon
  LOOLWSD is a daemon that talks to web browser clients and provides LibreOffice
  services.
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] online.git: loolwsd/debian

2015-08-06 Thread Tor Lillqvist 
 loolwsd/debian/postinst |9 -
 1 file changed, 9 deletions(-)

New commits:
commit 25333f8f7c03a991d0e53387046fbfc5d9e36fc3
Author: Tor Lillqvist t...@collabora.com
Date:   Thu Aug 6 20:37:28 2015 +0300

loolwsd.postinst has superseded the postinst file

diff --git a/loolwsd/debian/postinst b/loolwsd/debian/postinst
deleted file mode 100755
index f43e259..000
--- a/loolwsd/debian/postinst
+++ /dev/null
@@ -1,9 +0,0 @@
-#!/bin/sh
-
-set -e
-
-case $1 in
-configure)
-   setcap cap_fowner,cap_mknod,cap_sys_chroot=ep /usr/bin/loolwsd
-   ;;
-esac
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] online.git: loolwsd/debian

2015-08-06 Thread Tor Lillqvist 
 loolwsd/debian/loolwsd.postinst |   31 +++
 loolwsd/debian/loolwsd.service  |   13 +
 2 files changed, 44 insertions(+)

New commits:
commit 5b5a5489d557ca20321a9e9cfd6edef0c5cfeae9
Author: Tor Lillqvist t...@collabora.com
Date:   Thu Aug 6 20:01:06 2015 +0300

Set up a lool user, group and systemd service on Debian, too

diff --git a/loolwsd/debian/loolwsd.postinst b/loolwsd/debian/loolwsd.postinst
new file mode 100755
index 000..5b0b265
--- /dev/null
+++ b/loolwsd/debian/loolwsd.postinst
@@ -0,0 +1,31 @@
+#!/bin/sh
+
+set -e
+
+case $1 in
+configure)
+   setcap cap_fowner,cap_mknod,cap_sys_chroot=ep /usr/bin/loolwsd
+
+   adduser --quiet --system --group --home /opt/lool lool
+   mkdir -p /var/cache/loolwsd  chmod og+w /var/cache/loolwsd
+
+   # We assume that the LibreOffice to be used is built TDF-style
+   # and installs in /opt/libreoffice5.0, and that /opt/lool is
+   # on the same file system
+
+   mkdir -p /opt/lool/child-roots
+   chown lool /opt/lool/child-roots
+
+   rm -rf /opt/lool/systemplate
+   su lool --shell=/bin/sh -c loolwsd-systemplate-setup 
/opt/lool/systemplate /opt/libreoffice5.0 /dev/null
+   ;;
+
+esac
+
+if [ -d /run/systemd/system ]; then
+systemctl --system daemon-reload /dev/null || true
+systemctl enable loolwsd.service /dev/null || true
+deb-systemd-invoke start loolwsd.service /dev/null || true
+fi
+
+exit 0
diff --git a/loolwsd/debian/loolwsd.service b/loolwsd/debian/loolwsd.service
new file mode 100644
index 000..19fb82c
--- /dev/null
+++ b/loolwsd/debian/loolwsd.service
@@ -0,0 +1,13 @@
+[Unit]
+Description=LibreOffice On-Line WebSocket Daemon
+After=network.target
+
+[Service]
+EnvironmentFile=-/etc/sysconfig/loolwsd
+ExecStart=/usr/bin/loolwsd --systemplate=/opt/lool/systemplate 
--lotemplate=/opt/libreoffice5.0 --childroot=/opt/lool/child-roots 
--numprespawns=5
+User=lool
+KillMode=process
+Restart=always
+
+[Install]
+WantedBy=multi-user.target
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] online.git: loolwsd/debian

2015-08-04 Thread Tor Lillqvist 
 loolwsd/debian/loolwsd.cron.d |1 +
 1 file changed, 1 insertion(+)

New commits:
commit 13809cb5f33c366b5c8a14f4dcf063b09e281462
Author: Tor Lillqvist t...@collabora.com
Date:   Tue Aug 4 17:44:14 2015 +0300

Add crontab entry to remove old cached tiles

The same entry as Mihai used in the .spec file.

diff --git a/loolwsd/debian/loolwsd.cron.d b/loolwsd/debian/loolwsd.cron.d
new file mode 100644
index 000..6e8d16b
--- /dev/null
+++ b/loolwsd/debian/loolwsd.cron.d
@@ -0,0 +1 @@
+0 0 */1 * * root find /var/cache/loolwsd -name *.png -a -atime +10 -exec rm 
{} ;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] online.git: loolwsd/debian

2015-07-24 Thread Tor Lillqvist 
 loolwsd/debian/control |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 5bee6f71a2048dabe699f9cb5bf5a03a3c1de6b0
Author: Tor Lillqvist t...@collabora.com
Date:   Fri Jul 24 13:39:43 2015 +0300

Add more synthetic dependencies per customer wish

Not sure why they want to depend on those dev packages!?

diff --git a/loolwsd/debian/control b/loolwsd/debian/control
index a15e63e..178761f 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}
+Depends: ${shlibs:Depends}, ${misc:Depends}, libssl1.0.0, libmysqlclient18, 
libodbc1, libpng12-0, libxinerama-dev, libcairo2-dev, libgl1-mesa-dev, 
libcups2-dev, libdbus-glib-1-dev, cpio
 Description: LibreOffice On-Line WebSocket Daemon
  LOOLWSD is a daemon that talks to web browser clients and provides LibreOffice
  services.
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] online.git: loolwsd/debian

2015-07-24 Thread Tor Lillqvist 
 loolwsd/debian/control |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit bbd5e54785b3d2f504520879d1f58b06ba6f1c2e
Author: Tor Lillqvist t...@collabora.com
Date:   Fri Jul 24 14:21:49 2015 +0300

Let's try to have a bit saner dependencies

Surely loolwsd shouldn't depend on dev packages. And libpng12 gets included
automatically.

diff --git a/loolwsd/debian/control b/loolwsd/debian/control
index 178761f..6a204c7 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}, libssl1.0.0, libmysqlclient18, 
libodbc1, libpng12-0, libxinerama-dev, libcairo2-dev, libgl1-mesa-dev, 
libcups2-dev, libdbus-glib-1-dev, cpio
+Depends: ${shlibs:Depends}, ${misc:Depends}, libssl1.0.0, libmysqlclient18, 
libodbc1, libxinerama1, libcairo2, libgl1-mesa-glx, libcups2, libdbus-glib-1-2, 
cpio
 Description: LibreOffice On-Line WebSocket Daemon
  LOOLWSD is a daemon that talks to web browser clients and provides LibreOffice
  services.
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits