loolwsd/LOKitClient.cpp | 3 ++-
loolwsd/LOOLSession.hpp | 2 +-
loolwsd/LOOLWSD.cpp | 14 +++++++++++---
loolwsd/LOOLWSD.hpp | 1 +
loolwsd/TileCache.cpp | 3 ++-
loolwsd/configure.ac | 2 +-
loolwsd/debian/changelog | 15 +++++++++++++++
loolwsd/debian/compat | 1 +
loolwsd/debian/control | 14 ++++++++++++++
loolwsd/debian/copyright | 33 +++++++++++++++++++++++++++++++++
loolwsd/debian/postinst | 9 +++++++++
loolwsd/debian/rules | 19 +++++++++++++++++++
loolwsd/debian/source/format | 1 +
loolwsd/loolwsd.service | 13 +++++++++++++
loolwsd/loolwsd.spec.in | 24 ++++++++++++++++++++++--
loolwsd/sysconfig.loolwsd | 9 +++++++++
16 files changed, 154 insertions(+), 9 deletions(-)
New commits:
commit 9afd4c9955dc3274a17e342544a469382730d7f8
Author: Tor Lillqvist <t...@collabora.com>
Date: Fri Jun 5 13:05:51 2015 +0300
Correct documentation for _docURL
diff --git a/loolwsd/LOOLSession.hpp b/loolwsd/LOOLSession.hpp
index c73456c..7cac320 100644
--- a/loolwsd/LOOLSession.hpp
+++ b/loolwsd/LOOLSession.hpp
@@ -67,7 +67,7 @@ protected:
// jailed process, the websocket to the parent.
std::shared_ptr<Poco::Net::WebSocket> _ws;
- // In the master, the actual URL. In the child, the copy inside the chroot
jail.
+ // The actual URL, also in the child, even if the child never accesses
that.
std::string _docURL;
};
commit 187374dcc0c189dd8915d5eba36f81d3df2aca61
Author: Tor Lillqvist <t...@collabora.com>
Date: Thu Jun 4 17:07:49 2015 +0300
Take the tile cache directory as an option, too
diff --git a/loolwsd/LOOLWSD.cpp b/loolwsd/LOOLWSD.cpp
index b2668cb..18c21b3 100644
--- a/loolwsd/LOOLWSD.cpp
+++ b/loolwsd/LOOLWSD.cpp
@@ -396,6 +396,7 @@ public:
};
int LOOLWSD::portNumber = DEFAULT_CLIENT_PORT_NUMBER;
+std::string LOOLWSD::cache = LOOLWSD_CACHEDIR;
std::string LOOLWSD::sysTemplate;
std::string LOOLWSD::loTemplate;
std::string LOOLWSD::childRoot;
@@ -442,6 +443,11 @@ void LOOLWSD::defineOptions(OptionSet& options)
.repeatable(false)
.argument("port number"));
+ options.addOption(Option("cache", "", "Path to a directory where to keep
the persistent tile cache (default: " + std::string(LOOLWSD_CACHEDIR) + ").")
+ .required(false)
+ .repeatable(false)
+ .argument("directory"));
+
options.addOption(Option("systemplate", "", "Path to a template tree with
shared libraries etc to be used as source for chroot jails for child
processes.")
.required(false)
.repeatable(false)
@@ -500,6 +506,8 @@ void LOOLWSD::handleOption(const std::string& name, const
std::string& value)
}
else if (name == "port")
portNumber = std::stoi(value);
+ else if (name == "cache")
+ cache = value;
else if (name == "systemplate")
sysTemplate = value;
else if (name == "lotemplate")
@@ -720,9 +728,9 @@ int LOOLWSD::main(const std::vector<std::string>& args)
dropCapability();
#endif
- if (access(LOOLWSD_CACHEDIR, R_OK | W_OK | X_OK) != 0)
+ if (access(cache.c_str(), R_OK | W_OK | X_OK) != 0)
{
- std::cout << "Unable to access " << LOOLWSD_CACHEDIR <<
+ std::cout << "Unable to access " << cache <<
", please make sure it exists, and has write permission for this
user." << std::endl;
return Application::EXIT_UNAVAILABLE;
}
diff --git a/loolwsd/LOOLWSD.hpp b/loolwsd/LOOLWSD.hpp
index 2e4b3ef..56a8939 100644
--- a/loolwsd/LOOLWSD.hpp
+++ b/loolwsd/LOOLWSD.hpp
@@ -26,6 +26,7 @@ public:
// An Application is a singleton anyway, so just keep these as
// statics
static int portNumber;
+ static std::string cache;
static std::string sysTemplate;
static std::string loTemplate;
static std::string childRoot;
diff --git a/loolwsd/TileCache.cpp b/loolwsd/TileCache.cpp
index 6622841..a500646 100644
--- a/loolwsd/TileCache.cpp
+++ b/loolwsd/TileCache.cpp
@@ -27,6 +27,7 @@
#include <Poco/Timestamp.h>
#include <Poco/URI.h>
+#include "LOOLWSD.hpp"
#include "TileCache.hpp"
using Poco::DigestEngine;
@@ -190,7 +191,7 @@ std::string TileCache::cacheDirName()
digestEngine.update(_docURL.c_str(), _docURL.size());
- return (LOOLWSD_CACHEDIR "/" +
+ return (LOOLWSD::cache + "/" +
DigestEngine::digestToHex(digestEngine.digest()).insert(3,
"/").insert(2, "/").insert(1, "/"));
}
commit 5c0c928eea1dddc759794bf1d3b6162c09a6b6a0
Author: Tor Lillqvist <t...@collabora.com>
Date: Thu Jun 4 15:53:19 2015 +0300
We want --localstatedir=/var on Debian
diff --git a/loolwsd/debian/rules b/loolwsd/debian/rules
index 474a309..a1e9d92 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 --with-lokit-path=bundled/include
+CONFFLAGS = --prefix=/usr --localstatedir=/var
--with-lokit-path=bundled/include
# Avoid setcap when doing "make", when building for packaging
# the setcap is done at installation time
commit f1c0c39de11a76852eb0c554b8d8849b76486b70
Author: Tor Lillqvist <t...@collabora.com>
Date: Thu Jun 4 13:06:23 2015 +0300
Add Debian packaging
diff --git a/loolwsd/debian/changelog b/loolwsd/debian/changelog
new file mode 100644
index 0000000..bfb559a
--- /dev/null
+++ b/loolwsd/debian/changelog
@@ -0,0 +1,15 @@
+loolwsd (1.0.34-1) UNRELEASED; urgency=medium
+
+ * Back to packaging this for Debian.
+
+ -- Tor Lillqvist <t...@collabora.com> Wed, 03 Jun 2015 20:24:50 +0300
+
+loolwsd (1.0.0-1) unstable; urgency=low
+
+ * Initial release
+
+ * Local Variables:
+ * Mode: fundamental
+ * End:
+
+ -- Tor Lillqvist <t...@collabora.com> Fri, 15 May 2015 11:10:20 +0300
diff --git a/loolwsd/debian/compat b/loolwsd/debian/compat
new file mode 100644
index 0000000..ec63514
--- /dev/null
+++ b/loolwsd/debian/compat
@@ -0,0 +1 @@
+9
diff --git a/loolwsd/debian/control b/loolwsd/debian/control
new file mode 100644
index 0000000..a15e63e
--- /dev/null
+++ b/loolwsd/debian/control
@@ -0,0 +1,14 @@
+Source: loolwsd
+Section: web
+Priority: optional
+Maintainer: Tor Lillqvist <t...@collabora.com>
+Build-Depends: debhelper (>= 8.0.0), libcap-dev, libcap2-bin, libpcre3-dev,
libpng-dev, libpoco-dev (>= 1.6.0)
+Standards-Version: 3.9.2
+
+Package: loolwsd
+Section: web
+Architecture: any
+Depends: ${shlibs:Depends}, ${misc:Depends}
+Description: LibreOffice On-Line WebSocket Daemon
+ LOOLWSD is a daemon that talks to web browser clients and provides LibreOffice
+ services.
diff --git a/loolwsd/debian/copyright b/loolwsd/debian/copyright
new file mode 100644
index 0000000..d2a2a46
--- /dev/null
+++ b/loolwsd/debian/copyright
@@ -0,0 +1,33 @@
+Format-Specification:
http://svn.debian.org/wsvn/dep/web/deps/dep5.mdwn?op=file&rev=135
+Name: loolwsd
+Maintainer: Tor Lillqvist <t...@collabora.com>
+Source: git://gerrit.libreoffice.org/online
+
+Copyright: 2015 Collabora Productivity <libreoff...@collabora.com>
+License: MPL-2
+
+Copyright: 2004-2006, Applied Informatics Software Engineering GmbH
+License:
+ 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.
diff --git a/loolwsd/debian/postinst b/loolwsd/debian/postinst
new file mode 100755
index 0000000..7822fc1
--- /dev/null
+++ b/loolwsd/debian/postinst
@@ -0,0 +1,9 @@
+#!/bin/sh
+
+set -e
+
+case "$1" in
+ configure)
+ setcap cap_fowner,cap_sys_chroot=ep /usr/bin/loolwsd
+ ;;
+esac
diff --git a/loolwsd/debian/rules b/loolwsd/debian/rules
new file mode 100755
index 0000000..474a309
--- /dev/null
+++ b/loolwsd/debian/rules
@@ -0,0 +1,19 @@
+#!/usr/bin/make -f
+
+# see EXAMPLES in dpkg-buildflags(1) and read /usr/share/dpkg/*
+DPKG_EXPORT_BUILDFLAGS = 1
+
+include /usr/share/dpkg/default.mk
+
+CONFFLAGS = --prefix=/usr --with-lokit-path=bundled/include
+
+# Avoid setcap when doing "make", when building for packaging
+# the setcap is done at installation time
+export BUILDING_FROM_RPMBUILD=yes
+
+# main packaging script based on dh7 syntax
+%:
+ dh $@
+
+override_dh_auto_configure:
+ ./configure $(CONFFLAGS)
diff --git a/loolwsd/debian/source/format b/loolwsd/debian/source/format
new file mode 100644
index 0000000..163aaf8
--- /dev/null
+++ b/loolwsd/debian/source/format
@@ -0,0 +1 @@
+3.0 (quilt)
commit c2c942b1aa0797f0f9c6201c11939bd211a03128
Author: Tor Lillqvist <t...@collabora.com>
Date: Thu Jun 4 13:07:42 2015 +0300
Bump version after tarball
diff --git a/loolwsd/configure.ac b/loolwsd/configure.ac
index ff66968..395cec2 100644
--- a/loolwsd/configure.ac
+++ b/loolwsd/configure.ac
@@ -3,7 +3,7 @@
AC_PREREQ([2.69])
-AC_INIT([loolwsd], [1.0.34], [libreoff...@collabora.com])
+AC_INIT([loolwsd], [1.0.35], [libreoff...@collabora.com])
AM_INIT_AUTOMAKE([1.11 silent-rules])
commit 0234892a6bd53108c73f1bf76a89cc8f98395487
Author: Tor Lillqvist <t...@collabora.com>
Date: Wed Jun 3 20:05:15 2015 +0300
Bump version for tarball
diff --git a/loolwsd/configure.ac b/loolwsd/configure.ac
index 43df612..ff66968 100644
--- a/loolwsd/configure.ac
+++ b/loolwsd/configure.ac
@@ -3,7 +3,7 @@
AC_PREREQ([2.69])
-AC_INIT([loolwsd], [1.0.33], [libreoff...@collabora.com])
+AC_INIT([loolwsd], [1.0.34], [libreoff...@collabora.com])
AM_INIT_AUTOMAKE([1.11 silent-rules])
commit bf84ffb5550bae3b5dee52bcc57b1dcdce5ea5bf
Author: Tor Lillqvist <t...@collabora.com>
Date: Wed Jun 3 01:02:10 2015 +0300
Avoid global dtors, just _Exit()
diff --git a/loolwsd/LOKitClient.cpp b/loolwsd/LOKitClient.cpp
index 7ca4dd7..8e0e747 100644
--- a/loolwsd/LOKitClient.cpp
+++ b/loolwsd/LOKitClient.cpp
@@ -151,7 +151,8 @@ protected:
}
}
- return Application::EXIT_OK;
+ // Safest to just bluntly exit
+ _Exit(Application::EXIT_OK);
}
};
commit 9047007ffa482e6de52ebf3d1e485926726d500f
Author: Tor Lillqvist <t...@collabora.com>
Date: Tue Jun 2 10:25:57 2015 +0300
Just use Requires instead of PreReq
They mean the same.
diff --git a/loolwsd/loolwsd.spec.in b/loolwsd/loolwsd.spec.in
index 303912a..f3a857a 100644
--- a/loolwsd/loolwsd.spec.in
+++ b/loolwsd/loolwsd.spec.in
@@ -28,8 +28,7 @@ BuildRequires: libcap-progs libcap-devel libpng-devel
poco-devel >= 1.6.0 syste
# This works for now only with the TDF nightly builds of 5.0 or 5.1, I
# think. But the TDF packages include the version number in their
# names. How clever is that? So we need to specify one.
-Requires: libcap libcap-progs libpng libPocoFoundation30 >= 1.6.0
libPocoNet30 >= 1.6.0 libreofficedev5.1 libreofficedev5.1-en-US
libreofficedev5.1-ure lodevbasis5.1-core lodevbasis5.1-writer
lodevbasis5.1-impress lodevbasis5.1-graphicfilter lodevbasis5.1-en-US
lodevbasis5.1-calc lodevbasis5.1-en-US-res lodevbasis5.1-en-US-calc
lodevbasis5.1-ooofonts lodevbasis5.1-images lodevbasis5.1-filter-data
lodevbasis5.1-draw lodevbasis5.1-base lodevbasis5.1-en-US-writer
lodevbasis5.1-en-US-math lodevbasis5.1-en-US-base Mesa-libEGL1 Mesa-libGL1
Mesa-libglapi0 cups-libs dbus-1-glib fontconfig libbz2-1 libcairo2 libdrm2
libexpat1 libfreetype6 libgbm1 libgio-2_0-0 libglib-2_0-0 libgmodule-2_0-0
libgobject-2_0-0 libgthread-2_0-0 liblzma5 libpcre1 libpixman-1-0 libpng16-16
libuuid1 libxml2-2 %{?systemd_requires}
-PreReq: %{fillup_prereq}
+Requires: libcap libcap-progs libpng libPocoFoundation30 >= 1.6.0
libPocoNet30 >= 1.6.0 libreofficedev5.1 libreofficedev5.1-en-US
libreofficedev5.1-ure lodevbasis5.1-core lodevbasis5.1-writer
lodevbasis5.1-impress lodevbasis5.1-graphicfilter lodevbasis5.1-en-US
lodevbasis5.1-calc lodevbasis5.1-en-US-res lodevbasis5.1-en-US-calc
lodevbasis5.1-ooofonts lodevbasis5.1-images lodevbasis5.1-filter-data
lodevbasis5.1-draw lodevbasis5.1-base lodevbasis5.1-en-US-writer
lodevbasis5.1-en-US-math lodevbasis5.1-en-US-base Mesa-libEGL1 Mesa-libGL1
Mesa-libglapi0 cups-libs dbus-1-glib fontconfig libbz2-1 libcairo2 libdrm2
libexpat1 libfreetype6 libgbm1 libgio-2_0-0 libglib-2_0-0 libgmodule-2_0-0
libgobject-2_0-0 libgthread-2_0-0 liblzma5 libpcre1 libpixman-1-0 libpng16-16
libuuid1 libxml2-2 %{?systemd_requires} %{fillup_prereq}
%define owner lool
%define group lool
commit 02324683dddb9cf8ae20358eab0f5ddacacbe3bb
Author: Tor Lillqvist <t...@collabora.com>
Date: Mon Jun 1 20:18:53 2015 +0300
Post-release bump
diff --git a/loolwsd/configure.ac b/loolwsd/configure.ac
index 212520a..43df612 100644
--- a/loolwsd/configure.ac
+++ b/loolwsd/configure.ac
@@ -3,7 +3,7 @@
AC_PREREQ([2.69])
-AC_INIT([loolwsd], [1.0.32], [libreoff...@collabora.com])
+AC_INIT([loolwsd], [1.0.33], [libreoff...@collabora.com])
AM_INIT_AUTOMAKE([1.11 silent-rules])
commit 836abd31e0660cdcc419c03aa240ce490227ff70
Author: Tor Lillqvist <t...@collabora.com>
Date: Mon Jun 1 20:17:15 2015 +0300
Bump version for tarball
diff --git a/loolwsd/configure.ac b/loolwsd/configure.ac
index 6fa7a55..212520a 100644
--- a/loolwsd/configure.ac
+++ b/loolwsd/configure.ac
@@ -3,7 +3,7 @@
AC_PREREQ([2.69])
-AC_INIT([loolwsd], [1.0.31], [libreoff...@collabora.com])
+AC_INIT([loolwsd], [1.0.32], [libreoff...@collabora.com])
AM_INIT_AUTOMAKE([1.11 silent-rules])
commit 739edf9dcf464f407dfe663fb2f497b866e73333
Author: Tor Lillqvist <t...@collabora.com>
Date: Mon Jun 1 20:14:40 2015 +0300
For some reason I can't get the $LOOLWSD_NUMPRESPAWNS to work
Even though it is set in /etc/sysconfig/loolwsd, it expands to nothing when
used in the loolwsd.services file. Oh well. Let's hardcode a value of 5 for
now.
diff --git a/loolwsd/loolwsd.service b/loolwsd/loolwsd.service
index be776af..526b272 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 --systemplate=/opt/lool/systemplate
--lotemplate=/opt/libreofficedev5.1 --childroot=/opt/lool/child-roots
--numprespawns=$LOOLWSD_NUMPRESPAWNS
+ExecStart=/usr/bin/loolwsd --systemplate=/opt/lool/systemplate
--lotemplate=/opt/libreofficedev5.1 --childroot=/opt/lool/child-roots
--numprespawns=5
User=lool
KillMode=process
Restart=always
commit c7fdd4ade343d91c2b004621f322e59b0823f526
Author: Tor Lillqvist <t...@collabora.com>
Date: Mon Jun 1 19:53:29 2015 +0300
Try to make this handled by systemd
diff --git a/loolwsd/loolwsd.service b/loolwsd/loolwsd.service
new file mode 100644
index 0000000..be776af
--- /dev/null
+++ b/loolwsd/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/libreofficedev5.1 --childroot=/opt/lool/child-roots
--numprespawns=$LOOLWSD_NUMPRESPAWNS
+User=lool
+KillMode=process
+Restart=always
+
+[Install]
+WantedBy=multi-user.target
diff --git a/loolwsd/loolwsd.spec.in b/loolwsd/loolwsd.spec.in
index cec94dc..303912a 100644
--- a/loolwsd/loolwsd.spec.in
+++ b/loolwsd/loolwsd.spec.in
@@ -22,11 +22,14 @@ Vendor: Collabora
Summary: LibreOffice On-Line WebSocket Daemon
License: MPL
Source0: loolwsd-@package_vers...@.tar.gz
-BuildRequires: libcap-progs libcap-devel libpng-devel poco-devel >= 1.6.0
+Source1: loolwsd.service
+Source2: sysconfig.loolwsd
+BuildRequires: libcap-progs libcap-devel libpng-devel poco-devel >= 1.6.0
systemd-rpm-macros
# This works for now only with the TDF nightly builds of 5.0 or 5.1, I
# think. But the TDF packages include the version number in their
# names. How clever is that? So we need to specify one.
Requires: libcap libcap-progs libpng libPocoFoundation30 >= 1.6.0
libPocoNet30 >= 1.6.0 libreofficedev5.1 libreofficedev5.1-en-US
libreofficedev5.1-ure lodevbasis5.1-core lodevbasis5.1-writer
lodevbasis5.1-impress lodevbasis5.1-graphicfilter lodevbasis5.1-en-US
lodevbasis5.1-calc lodevbasis5.1-en-US-res lodevbasis5.1-en-US-calc
lodevbasis5.1-ooofonts lodevbasis5.1-images lodevbasis5.1-filter-data
lodevbasis5.1-draw lodevbasis5.1-base lodevbasis5.1-en-US-writer
lodevbasis5.1-en-US-math lodevbasis5.1-en-US-base Mesa-libEGL1 Mesa-libGL1
Mesa-libglapi0 cups-libs dbus-1-glib fontconfig libbz2-1 libcairo2 libdrm2
libexpat1 libfreetype6 libgbm1 libgio-2_0-0 libglib-2_0-0 libgmodule-2_0-0
libgobject-2_0-0 libgthread-2_0-0 liblzma5 libpcre1 libpixman-1-0 libpng16-16
libuuid1 libxml2-2 %{?systemd_requires}
+PreReq: %{fillup_prereq}
%define owner lool
%define group lool
@@ -46,13 +49,21 @@ env BUILDING_FROM_RPMBUILD=yes make check
%install
env BUILDING_FROM_RPMBUILD=yes make install DESTDIR=%{buildroot}
+%__install -D -m 444 %{SOURCE1} %{buildroot}%{_unitdir}/loolwsd.service
+install -d -m 755 %{buildroot}/var/adm/fillup-templates
+install -D -m 644 %{SOURCE2} %{buildroot}/var/adm/fillup-templates
%files
/usr/bin/loolwsd
/usr/bin/loolwsd-systemplate-setup
+%{_unitdir}/loolwsd.service
+/var/adm/fillup-templates/sysconfig.loolwsd
%doc README
+%pre
+%service_add_pre loolwsd.service
+
%post
setcap cap_fowner,cap_sys_chroot=ep /usr/bin/loolwsd
@@ -73,6 +84,16 @@ chown %{owner} ${loolparent}/lool/child-roots
su %{owner} -c "loolwsd-systemplate-setup ${loolparent}/lool/systemplate
${loroot} >/dev/null"
+%service_add_post loolwsd.service
+
+%{fillup_only -n loolwsd}
+
+%preun
+%service_del_preun loolwsd.service
+
+%postun
+%service_del_postun loolwsd.service
+
%changelog
* Tue May 19 2015 Tor Lillqvist
- Initial RPM release
diff --git a/loolwsd/sysconfig.loolwsd b/loolwsd/sysconfig.loolwsd
new file mode 100644
index 0000000..f8e116c
--- /dev/null
+++ b/loolwsd/sysconfig.loolwsd
@@ -0,0 +1,9 @@
+## Path: Network/Remote access/LOOLWSD
+## Description: LibreOffice On-Line WebSocket Daemon settings
+## Type: string
+## Default: ""
+## ServiceRestart: loolwsd
+#
+# Number of child processes to pre-spawn initially
+#
+LOOLWSD_NUMPRESPAWNS="5"
commit 53051154c5f9ee22ef4797615f40eebd4cfc5dbb
Author: Tor Lillqvist <t...@collabora.com>
Date: Mon Jun 1 19:52:48 2015 +0300
Fix copy/paste error in help message
diff --git a/loolwsd/LOOLWSD.cpp b/loolwsd/LOOLWSD.cpp
index eb47371..b2668cb 100644
--- a/loolwsd/LOOLWSD.cpp
+++ b/loolwsd/LOOLWSD.cpp
@@ -465,7 +465,7 @@ void LOOLWSD::defineOptions(OptionSet& options)
options.addOption(Option("numprespawns", "", "Number of child processes to
keep started in advance and waiting for new clients.")
.required(false)
.repeatable(false)
- .argument("port number"));
+ .argument("number"));
options.addOption(Option("test", "", "Interactive testing.")
.required(false)
commit 987b53564da7e338441cf2701b45d7e7fec4e2b1
Author: Tor Lillqvist <t...@collabora.com>
Date: Mon Jun 1 18:32:04 2015 +0300
Drop more too specific dependencies
diff --git a/loolwsd/loolwsd.spec.in b/loolwsd/loolwsd.spec.in
index 5f423dd..cec94dc 100644
--- a/loolwsd/loolwsd.spec.in
+++ b/loolwsd/loolwsd.spec.in
@@ -26,7 +26,7 @@ BuildRequires: libcap-progs libcap-devel libpng-devel
poco-devel >= 1.6.0
# This works for now only with the TDF nightly builds of 5.0 or 5.1, I
# think. But the TDF packages include the version number in their
# names. How clever is that? So we need to specify one.
-Requires: libcap libcap-progs libpng libPocoFoundation30 >= 1.6.0
libPocoNet30 >= 1.6.0 libreofficedev5.1 libreofficedev5.1-en-US
libreofficedev5.1-ure lodevbasis5.1-core lodevbasis5.1-writer
lodevbasis5.1-impress lodevbasis5.1-graphicfilter lodevbasis5.1-en-US
lodevbasis5.1-calc lodevbasis5.1-en-US-res lodevbasis5.1-en-US-calc
lodevbasis5.1-ooofonts lodevbasis5.1-images lodevbasis5.1-filter-data
lodevbasis5.1-draw lodevbasis5.1-base lodevbasis5.1-en-US-writer
lodevbasis5.1-en-US-math lodevbasis5.1-en-US-base Mesa-libEGL1 Mesa-libGL1
libICE6 libSM6 libX11-xcb1 libX11-6 libXau6 libXdamage1 libXext6 libXfixes3
libXinerama1 libXrender1 libXxf86vm1 libbz2-1 libcairo2 cups-libs dbus-1-glib
libdrm2 libexpat1 fontconfig libfreetype6 libgbm1 libgio-2_0-0 Mesa-libglapi0
libglib-2_0-0 libgmodule-2_0-0 libgobject-2_0-0 krb5 libgthread-2_0-0 krb5 krb5
krb5 liblzma5 libpcre1 libpixman-1-0 libpng16-16 libuuid1 libwayland-client0
libwayland-server0 libxcb-dri2-0 libxcb-dri3-0 libxcb-glx0 lib
xcb-present0 libxcb-render0 libxcb-shm0 libxcb-sync1 libxcb-xfixes0 libxcb1
libxml2-2 libxshmfence1
+Requires: libcap libcap-progs libpng libPocoFoundation30 >= 1.6.0
libPocoNet30 >= 1.6.0 libreofficedev5.1 libreofficedev5.1-en-US
libreofficedev5.1-ure lodevbasis5.1-core lodevbasis5.1-writer
lodevbasis5.1-impress lodevbasis5.1-graphicfilter lodevbasis5.1-en-US
lodevbasis5.1-calc lodevbasis5.1-en-US-res lodevbasis5.1-en-US-calc
lodevbasis5.1-ooofonts lodevbasis5.1-images lodevbasis5.1-filter-data
lodevbasis5.1-draw lodevbasis5.1-base lodevbasis5.1-en-US-writer
lodevbasis5.1-en-US-math lodevbasis5.1-en-US-base Mesa-libEGL1 Mesa-libGL1
Mesa-libglapi0 cups-libs dbus-1-glib fontconfig libbz2-1 libcairo2 libdrm2
libexpat1 libfreetype6 libgbm1 libgio-2_0-0 libglib-2_0-0 libgmodule-2_0-0
libgobject-2_0-0 libgthread-2_0-0 liblzma5 libpcre1 libpixman-1-0 libpng16-16
libuuid1 libxml2-2 %{?systemd_requires}
%define owner lool
%define group lool
commit 7e26097144eb80f645987b35efbc1deef3c261c7
Author: Tor Lillqvist <t...@collabora.com>
Date: Mon Jun 1 17:55:12 2015 +0300
Drop a few too specific dependencies
diff --git a/loolwsd/loolwsd.spec.in b/loolwsd/loolwsd.spec.in
index 9e92ed6..5f423dd 100644
--- a/loolwsd/loolwsd.spec.in
+++ b/loolwsd/loolwsd.spec.in
@@ -26,7 +26,7 @@ BuildRequires: libcap-progs libcap-devel libpng-devel
poco-devel >= 1.6.0
# This works for now only with the TDF nightly builds of 5.0 or 5.1, I
# think. But the TDF packages include the version number in their
# names. How clever is that? So we need to specify one.
-Requires: libcap libcap-progs libpng libPocoFoundation30 >= 1.6.0
libPocoNet30 >= 1.6.0 libreofficedev5.1 libreofficedev5.1-en-US
libreofficedev5.1-ure lodevbasis5.1-core lodevbasis5.1-writer
lodevbasis5.1-impress lodevbasis5.1-graphicfilter lodevbasis5.1-en-US
lodevbasis5.1-calc lodevbasis5.1-en-US-res lodevbasis5.1-en-US-calc
lodevbasis5.1-ooofonts lodevbasis5.1-images lodevbasis5.1-filter-data
lodevbasis5.1-draw lodevbasis5.1-base lodevbasis5.1-en-US-writer
lodevbasis5.1-en-US-math lodevbasis5.1-en-US-base Mesa-libEGL1 Mesa-libGL1
libICE6 libSM6 libX11-xcb1 libX11-6 libXau6 libXdamage1 libXext6 libXfixes3
libXinerama1 libXrender1 libXxf86vm1 libbz2-1 libcairo2 cups-libs dbus-1-glib
libdrm2 libexpat1 libffi4-gcc49 fontconfig libfreetype6 libgbm1 libgio-2_0-0
Mesa-libglapi0 libglib-2_0-0 libgmodule-2_0-0 libgobject-2_0-0 krb5
libgthread-2_0-0 krb5 krb5 krb5 liblzma5 libpcre1 libpixman-1-0 libpng16-16
libstdc++6-gcc49 libuuid1 libwayland-client0 libwayland-server0 libxcb-dri2-
0 libxcb-dri3-0 libxcb-glx0 libxcb-present0 libxcb-render0 libxcb-shm0
libxcb-sync1 libxcb-xfixes0 libxcb1 libxml2-2 libxshmfence1
+Requires: libcap libcap-progs libpng libPocoFoundation30 >= 1.6.0
libPocoNet30 >= 1.6.0 libreofficedev5.1 libreofficedev5.1-en-US
libreofficedev5.1-ure lodevbasis5.1-core lodevbasis5.1-writer
lodevbasis5.1-impress lodevbasis5.1-graphicfilter lodevbasis5.1-en-US
lodevbasis5.1-calc lodevbasis5.1-en-US-res lodevbasis5.1-en-US-calc
lodevbasis5.1-ooofonts lodevbasis5.1-images lodevbasis5.1-filter-data
lodevbasis5.1-draw lodevbasis5.1-base lodevbasis5.1-en-US-writer
lodevbasis5.1-en-US-math lodevbasis5.1-en-US-base Mesa-libEGL1 Mesa-libGL1
libICE6 libSM6 libX11-xcb1 libX11-6 libXau6 libXdamage1 libXext6 libXfixes3
libXinerama1 libXrender1 libXxf86vm1 libbz2-1 libcairo2 cups-libs dbus-1-glib
libdrm2 libexpat1 fontconfig libfreetype6 libgbm1 libgio-2_0-0 Mesa-libglapi0
libglib-2_0-0 libgmodule-2_0-0 libgobject-2_0-0 krb5 libgthread-2_0-0 krb5 krb5
krb5 liblzma5 libpcre1 libpixman-1-0 libpng16-16 libuuid1 libwayland-client0
libwayland-server0 libxcb-dri2-0 libxcb-dri3-0 libxcb-glx0 lib
xcb-present0 libxcb-render0 libxcb-shm0 libxcb-sync1 libxcb-xfixes0 libxcb1
libxml2-2 libxshmfence1
%define owner lool
%define group lool
commit f689c0f960416b35c4c6196c390dae8c466a0b29
Author: Tor Lillqvist <t...@collabora.com>
Date: Mon Jun 1 16:34:24 2015 +0300
Bump version to 1.0.31 after "release"
diff --git a/loolwsd/configure.ac b/loolwsd/configure.ac
index 78e9179..6fa7a55 100644
--- a/loolwsd/configure.ac
+++ b/loolwsd/configure.ac
@@ -3,7 +3,7 @@
AC_PREREQ([2.69])
-AC_INIT([loolwsd], [1.0.30], [libreoff...@collabora.com])
+AC_INIT([loolwsd], [1.0.31], [libreoff...@collabora.com])
AM_INIT_AUTOMAKE([1.11 silent-rules])
commit e4d006a0ab4a8b71e4a1e79839c7fd994481f315
Author: Tor Lillqvist <t...@collabora.com>
Date: Mon Jun 1 16:07:22 2015 +0300
Bump version to 1.0.30 for tarball
diff --git a/loolwsd/configure.ac b/loolwsd/configure.ac
index 0224bb0..78e9179 100644
--- a/loolwsd/configure.ac
+++ b/loolwsd/configure.ac
@@ -3,7 +3,7 @@
AC_PREREQ([2.69])
-AC_INIT([loolwsd], [1.0.29], [libreoff...@collabora.com])
+AC_INIT([loolwsd], [1.0.30], [libreoff...@collabora.com])
AM_INIT_AUTOMAKE([1.11 silent-rules])
commit ee1887c36ab0caae903352878e1e317c2a29ff0f
Author: Tor Lillqvist <t...@collabora.com>
Date: Mon Jun 1 15:50:56 2015 +0300
Add the packages that the TDF build of LO should require (but doesn't)
LibreOffice from TDF, packaged in RPM, does not have proper dependencies as
it
is supposed to be usable on different distros and can't know what names are
used for packages for system libraries used, like the one containing
libdbus-glib. But we must have all dependent libraries installed when
running
the loolwsd-systemplate-setup command in the %post phase. As this spec file
de
facto is for openSUSE 13.2 only anyway, we can find out the package names
and
depend on them...
Add the list from running:
rpm -qf --queryformat '%{NAME} ' `find /opt/libreofficedev5.1 -name '*.so'
-o -name '*.so.[0-9]*' | while read file; do ldd $file; done | grep -v dynamic
| cut -d " " -f 3 | grep -E '^(/lib|/usr)/' | sort -u`
diff --git a/loolwsd/loolwsd.spec.in b/loolwsd/loolwsd.spec.in
index 8162fa2..9e92ed6 100644
--- a/loolwsd/loolwsd.spec.in
+++ b/loolwsd/loolwsd.spec.in
@@ -26,7 +26,7 @@ BuildRequires: libcap-progs libcap-devel libpng-devel
poco-devel >= 1.6.0
# This works for now only with the TDF nightly builds of 5.0 or 5.1, I
# think. But the TDF packages include the version number in their
# names. How clever is that? So we need to specify one.
-Requires: libcap libcap-progs libpng libPocoFoundation30 >= 1.6.0
libPocoNet30 >= 1.6.0 libreofficedev5.1 libreofficedev5.1-en-US
libreofficedev5.1-ure lodevbasis5.1-core lodevbasis5.1-writer
lodevbasis5.1-impress lodevbasis5.1-graphicfilter lodevbasis5.1-en-US
lodevbasis5.1-calc lodevbasis5.1-en-US-res lodevbasis5.1-en-US-calc
lodevbasis5.1-ooofonts lodevbasis5.1-images lodevbasis5.1-filter-data
lodevbasis5.1-draw lodevbasis5.1-base lodevbasis5.1-en-US-writer
lodevbasis5.1-en-US-math lodevbasis5.1-en-US-base
+Requires: libcap libcap-progs libpng libPocoFoundation30 >= 1.6.0
libPocoNet30 >= 1.6.0 libreofficedev5.1 libreofficedev5.1-en-US
libreofficedev5.1-ure lodevbasis5.1-core lodevbasis5.1-writer
lodevbasis5.1-impress lodevbasis5.1-graphicfilter lodevbasis5.1-en-US
lodevbasis5.1-calc lodevbasis5.1-en-US-res lodevbasis5.1-en-US-calc
lodevbasis5.1-ooofonts lodevbasis5.1-images lodevbasis5.1-filter-data
lodevbasis5.1-draw lodevbasis5.1-base lodevbasis5.1-en-US-writer
lodevbasis5.1-en-US-math lodevbasis5.1-en-US-base Mesa-libEGL1 Mesa-libGL1
libICE6 libSM6 libX11-xcb1 libX11-6 libXau6 libXdamage1 libXext6 libXfixes3
libXinerama1 libXrender1 libXxf86vm1 libbz2-1 libcairo2 cups-libs dbus-1-glib
libdrm2 libexpat1 libffi4-gcc49 fontconfig libfreetype6 libgbm1 libgio-2_0-0
Mesa-libglapi0 libglib-2_0-0 libgmodule-2_0-0 libgobject-2_0-0 krb5
libgthread-2_0-0 krb5 krb5 krb5 liblzma5 libpcre1 libpixman-1-0 libpng16-16
libstdc++6-gcc49 libuuid1 libwayland-client0 libwayland-server0 libxcb-dri2-
0 libxcb-dri3-0 libxcb-glx0 libxcb-present0 libxcb-render0 libxcb-shm0
libxcb-sync1 libxcb-xfixes0 libxcb1 libxml2-2 libxshmfence1
%define owner lool
%define group lool
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
