Bump to 6.2.3.2

10 files changed, 164 insertions, 554 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 6f2e883e7870..bbc4683d449e 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,28 +1,35 @@
-# Generated by mksrcinfo v8
-# Fri Feb  3 16:42:19 UTC 2017
 pkgbase = libreoffice-online
 	pkgdesc = HTML5-based/cloud-based version of the office suite
-	pkgver = 2.0.3
-	pkgrel = 5
-	url = https://cgit.freedesktop.org/libreoffice/online/
+	pkgver = 6.2.3.2
+	pkgrel = 1
+	url = https://www.libreoffice.org/download/libreoffice-online/
 	install = libreoffice-online.install
 	arch = x86_64
 	license = MPL
-	makedepends = cppunit
 	makedepends = poco
-	makedepends = libreoffice-fresh-sdk
-	makedepends = jake
+	makedepends = libreoffice-fresh-sdk>=6.2
+	makedepends = nodejs
+	makedepends = python-polib
+	makedepends = cppunit
 	makedepends = npm
-	depends = libpng12
 	depends = poco
-	depends = pcre
-	depends = cpio
 	depends = libreoffice
-	backup = etc/loolwsd/loolwsd.xml
-	source = libreoffice-online-2.0.3.tar.gz::https://github.com/LibreOffice/online/archive/2.0.3.tar.gz
+	depends = cpio
+	backup = etc/libreoffice-online/loolwsd.xml
+	source = libreoffice-online::git+https://git.libreoffice.org/online#tag=libreoffice-6.2.3.2
+	source = disable-fc-cache.patch
+	source = loolwsd-config.patch
 	source = loolwsd.service
-	sha512sums = 4658238b6343a6ed1faf221737486fcbcfc9514d0a5d0e4c0df3c875ae6b78b745e4ea57f79b3e2be107b2acde7ace3d87990241205fcaa30c37fd96ec459203
-	sha512sums = 71fd3aec864b1f084dafc602a7fadc91fed146b57dba8cacc7bc277a42f197616a6a43c07d13e2e74a604166cd691a81f5c7de447ddecb680919e3f6b451adb6
+	source = libreoffice-online.install
+	source = libreoffice-online.sysusers
+	source = libreoffice-online.tmpfiles
+	sha512sums = SKIP
+	sha512sums = a7bf2f594be83cee242ca1172edb0f5de33640beee58eef71e1dd476a4b0efafe565e6816f034a91022c415a0755e3a553bc260fc8648163ad6f7a355f996054
+	sha512sums = 5a3abbfea165527ec97e469e588de77772f138bdb566a4fc69c58999401af0b7569854e35e02dbd27c64ad7f22eaa7a7ecedda0967eb879ca0236f68dd1ddb9c
+	sha512sums = 76ec4fe0bfc8d856dc82c3fc993b612b9dd0ad7399bf733d4d4afe89ce393f3651c9734fef044ec4e80f3d2c20d94fe8b68cd6a23dfa3dbd267697b04e9ca73e
+	sha512sums = 76f6487fedc801e054d75a52fc5204048d4260adf30033d7a38963296cdf7b68255ddfa3aada842340c18f26ae49d7be1551930a714d8ad7c082fdf4640ef3ce
+	sha512sums = b85929da722e548f5c970c7a15a09d42c7e6b1aceeb4ad6138ade31888a2261155d6f5a187acb930c79ec00988531a3828e983c6b9ed3bd5a42ad62f5ff3b0d2
+	sha512sums = 7764aa3c62ea4fba492a32135c2a1ddbc1686e0e3665c839d40ffbcba7a7a4a3481b54ee5c6640a71de74ecd7a0f6f5f228f9d08f3a82b1b8aca121f4dbd1dc7
 
 pkgname = libreoffice-online
 
diff --git a/PKGBUILD b/PKGBUILD
index cce3d640a063..5736a6d6200f 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -4,56 +4,71 @@
 # Contributor: Jonas Heinrich <onny@project-insanity.org>
 
 pkgname=libreoffice-online
-pkgver=5.4.2.2
+pkgver=6.2.3.2
 pkgrel=1
 pkgdesc="HTML5-based/cloud-based version of the office suite"
 arch=('x86_64')
-url="https://cgit.freedesktop.org/libreoffice/online/"
+url="https://www.libreoffice.org/download/libreoffice-online/"
 license=("MPL")
-makedepends=("cppunit" "poco" "libreoffice-fresh-sdk>=5.4" "jake" "npm" "chrpath" "python-polib")
-depends=("libpng12" "poco" "pcre" "cpio" "libreoffice" "openssl-1.0")
+makedepends=("poco" "libreoffice-fresh-sdk>=6.2" "nodejs" "python-polib" "cppunit" "npm")
+depends=("poco" "libreoffice" "cpio")
 backup=("etc/libreoffice-online/loolwsd.xml")
-install="libreoffice-online.install"
-source=("${pkgname}-${pkgver}.tar.gz::https://github.com/LibreOffice/online/archive/libreoffice-${pkgver}.tar.gz"
-	"loolwsd.service"
-	"build-fix.patch"
-	"hack-annoying-errors.patch")
-sha512sums=('0f49884e5e7ddea9cf1c97565f38e50b790da5c81486580dd77556995f6078be25c981b1496dcf488482bedbfe0fcffed9d45f52bb51e51f67f4527842025d47'
-            '4a809d8420f42eef99a831b32c94d9ce336b5aa5ccac3c44b99346b94e9d7a6ae8b4e06760057f20e844837c3ab2175146bef63ba99e1a50d016a890704cc2c9'
-            '049036898f59f1a7f18c6f186042b7ecee84b010256c813c633e0854b206b1b94343972cc8a374990eb22919a223429de4db712f70a89851f266e6500b67c2b1'
-            '530dad9becee9504d1e2fff5c7e5115daf62ac48312c5cf42f9b44dc0f21665a05f5788606d988f631d3b6dc4dfcf866d564ac1f8bf087c4efe3c197b3206f2d')
+source=("${pkgname}::git+https://git.libreoffice.org/online#tag=libreoffice-${pkgver}"
+        "disable-fc-cache.patch"
+        "loolwsd-config.patch"
+        "loolwsd.service"
+        "libreoffice-online.install"
+        "libreoffice-online.sysusers"
+        "libreoffice-online.tmpfiles")
+
+sha512sums=('SKIP'
+            'a7bf2f594be83cee242ca1172edb0f5de33640beee58eef71e1dd476a4b0efafe565e6816f034a91022c415a0755e3a553bc260fc8648163ad6f7a355f996054'
+            '5a3abbfea165527ec97e469e588de77772f138bdb566a4fc69c58999401af0b7569854e35e02dbd27c64ad7f22eaa7a7ecedda0967eb879ca0236f68dd1ddb9c'
+            '76ec4fe0bfc8d856dc82c3fc993b612b9dd0ad7399bf733d4d4afe89ce393f3651c9734fef044ec4e80f3d2c20d94fe8b68cd6a23dfa3dbd267697b04e9ca73e'
+            '76f6487fedc801e054d75a52fc5204048d4260adf30033d7a38963296cdf7b68255ddfa3aada842340c18f26ae49d7be1551930a714d8ad7c082fdf4640ef3ce'
+            'b85929da722e548f5c970c7a15a09d42c7e6b1aceeb4ad6138ade31888a2261155d6f5a187acb930c79ec00988531a3828e983c6b9ed3bd5a42ad62f5ff3b0d2'
+            '7764aa3c62ea4fba492a32135c2a1ddbc1686e0e3665c839d40ffbcba7a7a4a3481b54ee5c6640a71de74ecd7a0f6f5f228f9d08f3a82b1b8aca121f4dbd1dc7')
+
+install=libreoffice-online.install
 
 prepare() {
-  cd "${srcdir}/online-libreoffice-${pkgver}"
-  patch -p1 <"$srcdir"/build-fix.patch
-  patch -p1 <"$srcdir"/hack-annoying-errors.patch
+  cd "${srcdir}/${pkgname}"
+  patch -p1 < "${srcdir}/disable-fc-cache.patch"
+  patch -p1 < "${srcdir}/loolwsd-config.patch"
 }
 
 build() {
-  cd "${srcdir}/online-libreoffice-${pkgver}"
+  cd "${srcdir}/${pkgname}"
   ./autogen.sh
-  export PKG_CONFIG_PATH=/usr/lib/openssl-1.0/pkgconfig
-  CPPFLAGS="-I/usr/include/openssl-1.0 -Wno-implicit-fallthrough -Wno-format-truncation" \
-  CFLAGS="-I/usr/include/openssl-1.0" \
-  LDFLAGS="-L/usr/lib/openssl-1.0" \
-      ./configure --enable-silent-rules \
-	--with-lokit-path=/usr/include/libreoffice \
-	--with-lo-path=/usr/lib/libreoffice \
-	--prefix=/usr \
-	--sysconfdir=/etc
-  BUILDING_FROM_RPMBUILD=yes make
+
+  ./configure \
+      --prefix=/usr \
+      --mandir=/usr/share/man \
+      --infodir=/usr/share/info \
+      --datadir=/usr/share \
+      --sysconfdir=/etc \
+      --localstatedir=/var/lib \
+      --disable-dependency-tracking \
+      --disable-silent-rules \
+      --docdir=/usr/share/doc/libreoffice-online \
+      --htmldir=/usr/share/doc/libreoffice-online/html \
+      --with-sysroot=/ \
+      --libdir=/usr/lib64 \
+      --with-logfile=/var/log/libreoffice-online/loolwsd.log \
+      --disable-setcap \
+      --disable-werror \
+      --enable-anonymize-usernames \
+      --enable-anonymize-filenames
+
+      make
 }
 
 package() {
-  cd "${srcdir}/online-libreoffice-${pkgver}"
-  BUILDING_FROM_RPMBUILD=yes make DESTDIR=${pkgdir} install
-  install -Dm644 "${srcdir}/loolwsd.service" "${pkgdir}/usr/lib/systemd/system/loolwsd.service"
-  mkdir -p "${pkgdir}/var/lib/lool"
-  mkdir -p "${pkgdir}/var/cache/libreoffice-online"
-  mkdir -p "${pkgdir}/var/lib/lool/child-roots"
-  chmod u+w "${pkgdir}/var/lib/lool/child-roots"
-  sed -i 's|/usr/var/cache/libreoffice-online|/var/cache/libreoffice-online|g' ${pkgdir}/etc/libreoffice-online/loolwsd.xml
-  mkdir -p "${pkgdir}/usr/share/libreoffice-online/loleaflet"
-  cp -r "loleaflet/dist" "${pkgdir}/usr/share/libreoffice-online/loleaflet/"
-  chrpath -d "$pkgdir/usr/bin/"{loolmount,loolforkit}
+  cd "${srcdir}/${pkgname}"
+  make DESTDIR=${pkgdir} install
+  mkdir -p "${pkgdir}/var/log" "${pkgdir}/var/lib/{,cache}/libreoffice-online"
+
+  install -Dm644 "${srcdir}/loolwsd.service"     "${pkgdir}/usr/lib/systemd/system/loolwsd.service"
+  install -Dm644 "${srcdir}/${pkgname}.tmpfiles" "${pkgdir}/usr/lib/tmpfiles.d/${pkgname}.conf"
+  install -Dm644 "${srcdir}/${pkgname}.sysusers" "${pkgdir}/usr/lib/sysusers.d/${pkgname}.conf"
 }
diff --git a/build-fix.patch b/build-fix.patch
deleted file mode 100644
index aa08b7eb34da..000000000000
--- a/build-fix.patch
+++ /dev/null
@@ -1,458 +0,0 @@
-diff -wbBur online-2.1.1/common/Protocol.cpp online-2.1.1.q/common/Protocol.cpp
---- online-2.1.1/common/Protocol.cpp	2017-05-18 22:03:26.000000000 +0300
-+++ online-2.1.1.q/common/Protocol.cpp	2017-07-06 13:44:08.216542616 +0300
-@@ -17,7 +17,7 @@
- #include <string>
- 
- #define LOK_USE_UNSTABLE_API
--#include <LibreOfficeKit/LibreOfficeKitEnums.h>
-+#include "../bundled/include/LibreOfficeKit/LibreOfficeKitEnums.h"
- 
- #include <Poco/StringTokenizer.h>
- 
-diff -wbBur online-2.1.1/common/Protocol.hpp online-2.1.1.q/common/Protocol.hpp
---- online-2.1.1/common/Protocol.hpp	2017-05-18 22:03:26.000000000 +0300
-+++ online-2.1.1.q/common/Protocol.hpp	2017-07-06 13:57:16.563171891 +0300
-@@ -22,7 +22,7 @@
- #include <Poco/Net/WebSocket.h>
- 
- #define LOK_USE_UNSTABLE_API
--#include <LibreOfficeKit/LibreOfficeKitEnums.h>
-+#include "../bundled/include/LibreOfficeKit/LibreOfficeKitEnums.h"
- 
- namespace LOOLProtocol
- {
-@@ -265,7 +265,7 @@
- 
-     inline std::string getAbbreviatedMessage(const std::string& message)
-     {
--        const auto pos = getDelimiterPosition(message.data(), std::min(message.size(), 500UL), '\n');
-+        const auto pos = getDelimiterPosition(message.data(), std::min((unsigned int)message.size(), (unsigned int)500UL), '\n');
- 
-         // If first line is less than the length (minus newline), add ellipsis.
-         if (pos < static_cast<std::string::size_type>(message.size()) - 1)
-diff -wbBur online-2.1.1/common/Seccomp.cpp online-2.1.1.q/common/Seccomp.cpp
---- online-2.1.1/common/Seccomp.cpp	2017-05-18 22:03:26.000000000 +0300
-+++ online-2.1.1.q/common/Seccomp.cpp	2017-07-06 13:44:08.216542616 +0300
-@@ -36,6 +36,12 @@
- #if defined(__x86_64__)
- #  define AUDIT_ARCH_NR AUDIT_ARCH_X86_64
- #  define REG_SYSCALL   REG_RAX
-+#elif defined(__i386__)
-+#  define AUDIT_ARCH_NR AUDIT_ARCH_I386
-+#  define REG_SYSCALL   REG_EAX
-+#elif defined(__arm__)
-+#  define AUDIT_ARCH_NR AUDIT_ARCH_ARM
-+#  define REG_SYSCALL   REG_R7
- #else
- #  error "Platform does not support seccomp filtering yet - unsafe."
- #endif
-@@ -129,12 +135,16 @@
-         KILL_SYSCALL(sendfile),
-         KILL_SYSCALL(shutdown),
-         KILL_SYSCALL(listen),  // server sockets
-+#ifdef __NR_accept
-         KILL_SYSCALL(accept),  // server sockets
-+#endif
- #if 0
-         KILL_SYSCALL(wait4),
- #endif
-         KILL_SYSCALL(kill),   // !
-+#ifdef __NR_shmctl
-         KILL_SYSCALL(shmctl),
-+#endif
-         KILL_SYSCALL(ptrace), // tracing
-         KILL_SYSCALL(capset),
-         KILL_SYSCALL(uselib),
-diff -wbBur online-2.1.1/common/Util.hpp online-2.1.1.q/common/Util.hpp
---- online-2.1.1/common/Util.hpp	2017-05-18 22:03:26.000000000 +0300
-+++ online-2.1.1.q/common/Util.hpp	2017-07-06 13:44:08.216542616 +0300
-@@ -25,7 +25,7 @@
- #include <Poco/RegularExpression.h>
- 
- #define LOK_USE_UNSTABLE_API
--#include <LibreOfficeKit/LibreOfficeKitEnums.h>
-+#include "../bundled/include/LibreOfficeKit/LibreOfficeKitEnums.h"
- 
- namespace Util
- {
-diff -wbBur online-2.1.1/kit/ChildSession.cpp online-2.1.1.q/kit/ChildSession.cpp
---- online-2.1.1/kit/ChildSession.cpp	2017-05-18 22:03:26.000000000 +0300
-+++ online-2.1.1.q/kit/ChildSession.cpp	2017-07-06 13:44:08.216542616 +0300
-@@ -19,6 +19,8 @@
- #include <Poco/StringTokenizer.h>
- #include <Poco/URI.h>
- 
-+#include "../bundled/include/LibreOfficeKit/LibreOfficeKitEnums.h"
-+
- #include "common/FileUtil.hpp"
- #include "KitHelper.hpp"
- #include "Log.hpp"
-diff -wbBur online-2.1.1/kit/DummyLibreOfficeKit.cpp online-2.1.1.q/kit/DummyLibreOfficeKit.cpp
---- online-2.1.1/kit/DummyLibreOfficeKit.cpp	2017-05-18 22:03:26.000000000 +0300
-+++ online-2.1.1.q/kit/DummyLibreOfficeKit.cpp	2017-07-06 13:44:08.216542616 +0300
-@@ -14,7 +14,7 @@
- #include <cstring>
- #include <memory>
- 
--#include <LibreOfficeKit/LibreOfficeKitEnums.h>
-+#include "../bundled/include/LibreOfficeKit/LibreOfficeKitEnums.h"
- #include <LibreOfficeKit/LibreOfficeKitTypes.h>
- 
- struct LibLODocument_Impl : public _LibreOfficeKitDocument
-diff -wbBur online-2.1.1/kit/Kit.cpp online-2.1.1.q/kit/Kit.cpp
---- online-2.1.1/kit/Kit.cpp	2017-05-18 22:03:26.000000000 +0300
-+++ online-2.1.1.q/kit/Kit.cpp	2017-07-06 13:44:08.216542616 +0300
-@@ -1,3 +1,4 @@
-+#include <sys/sysmacros.h>
- /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4; fill-column: 100 -*- */
- /*
-  * This file is part of the LibreOffice project.
-diff -wbBur online-2.1.1/kit/KitHelper.hpp online-2.1.1.q/kit/KitHelper.hpp
---- online-2.1.1/kit/KitHelper.hpp	2017-05-18 22:03:26.000000000 +0300
-+++ online-2.1.1.q/kit/KitHelper.hpp	2017-07-06 13:44:08.216542616 +0300
-@@ -14,7 +14,7 @@
- #include <string>
- 
- #define LOK_USE_UNSTABLE_API
--#include <LibreOfficeKit/LibreOfficeKitEnums.h>
-+#include "../bundled/include/LibreOfficeKit/LibreOfficeKitEnums.h"
- 
- namespace LOKitHelper
- {
-@@ -113,7 +113,8 @@
-             return "INVALIDATE_HEADER";
-         case LOK_CALLBACK_CELL_ADDRESS:
-             return "CELL_ADDRESS";
--
-+        default:
-+            break;
-        }
- 
-         return std::to_string(type);
-diff -wbBur online-2.1.1/net/WebSocketHandler.hpp online-2.1.1.q/net/WebSocketHandler.hpp
---- online-2.1.1/net/WebSocketHandler.hpp	2017-05-18 22:03:26.000000000 +0300
-+++ online-2.1.1.q/net/WebSocketHandler.hpp	2017-07-06 13:44:08.216542616 +0300
-@@ -358,14 +358,14 @@
-         else
-         {
-             out.push_back((char)127);
--            out.push_back(static_cast<char>((len >> 56) & 0xff));
--            out.push_back(static_cast<char>((len >> 48) & 0xff));
--            out.push_back(static_cast<char>((len >> 40) & 0xff));
--            out.push_back(static_cast<char>((len >> 32) & 0xff));
--            out.push_back(static_cast<char>((len >> 24) & 0xff));
--            out.push_back(static_cast<char>((len >> 16) & 0xff));
--            out.push_back(static_cast<char>((len >> 8) & 0xff));
--            out.push_back(static_cast<char>((len >> 0) & 0xff));
-+            out.push_back(static_cast<char>(((uint64_t)len >> 56) & 0xff));
-+            out.push_back(static_cast<char>(((uint64_t)len >> 48) & 0xff));
-+            out.push_back(static_cast<char>(((uint64_t)len >> 40) & 0xff));
-+            out.push_back(static_cast<char>(((uint64_t)len >> 32) & 0xff));
-+            out.push_back(static_cast<char>(((uint64_t)len >> 24) & 0xff));
-+            out.push_back(static_cast<char>(((uint64_t)len >> 16) & 0xff));
-+            out.push_back(static_cast<char>(((uint64_t)len >> 8) & 0xff));
-+            out.push_back(static_cast<char>(((uint64_t)len >> 0) & 0xff));
-         }
- 
-         // Copy the data.
-diff -wbBur online-2.1.1/test/TileQueueTests.cpp online-2.1.1.q/test/TileQueueTests.cpp
---- online-2.1.1/test/TileQueueTests.cpp	2017-05-18 22:03:26.000000000 +0300
-+++ online-2.1.1.q/test/TileQueueTests.cpp	2017-07-06 13:44:08.256542614 +0300
-@@ -281,7 +281,7 @@
- 
-     // Empty queue
-     CPPUNIT_ASSERT_EQUAL(false, queue.dequeue(item));
--    CPPUNIT_ASSERT_EQUAL(0UL, queue.size());
-+    CPPUNIT_ASSERT_EQUAL(0UL, (unsigned long)queue.size());
- 
-     const std::vector<std::string> messages =
-     {
-@@ -295,21 +295,21 @@
-         queue.enqueue(std::make_shared<Message>(msg, Message::Dir::Out));
-     }
- 
--    CPPUNIT_ASSERT_EQUAL(3UL, queue.size());
-+    CPPUNIT_ASSERT_EQUAL(3UL, (unsigned long)queue.size());
- 
-     CPPUNIT_ASSERT_EQUAL(true, queue.dequeue(item));
--    CPPUNIT_ASSERT_EQUAL(2UL, queue.size());
-+    CPPUNIT_ASSERT_EQUAL(2UL, (unsigned long)queue.size());
-     CPPUNIT_ASSERT_EQUAL(messages[0], std::string(item->data().data(), item->data().size()));
- 
-     CPPUNIT_ASSERT_EQUAL(true, queue.dequeue(item));
--    CPPUNIT_ASSERT_EQUAL(1UL, queue.size());
-+    CPPUNIT_ASSERT_EQUAL(1UL, (unsigned long)queue.size());
-     CPPUNIT_ASSERT_EQUAL(messages[1], std::string(item->data().data(), item->data().size()));
- 
-     CPPUNIT_ASSERT_EQUAL(true, queue.dequeue(item));
--    CPPUNIT_ASSERT_EQUAL(0UL, queue.size());
-+    CPPUNIT_ASSERT_EQUAL(0UL, (unsigned long)queue.size());
-     CPPUNIT_ASSERT_EQUAL(messages[2], std::string(item->data().data(), item->data().size()));
- 
--    CPPUNIT_ASSERT_EQUAL(0UL, queue.size());
-+    CPPUNIT_ASSERT_EQUAL(0UL, (unsigned long)queue.size());
- }
- 
- void TileQueueTests::testSenderQueueTileDeduplication()
-@@ -320,7 +320,7 @@
- 
-     // Empty queue
-     CPPUNIT_ASSERT_EQUAL(false, queue.dequeue(item));
--    CPPUNIT_ASSERT_EQUAL(0UL, queue.size());
-+    CPPUNIT_ASSERT_EQUAL(0UL, (unsigned long)queue.size());
- 
-     const std::vector<std::string> part_messages =
-     {
-@@ -334,12 +334,12 @@
-         queue.enqueue(std::make_shared<Message>(msg, Message::Dir::Out));
-     }
- 
--    CPPUNIT_ASSERT_EQUAL(3UL, queue.size());
-+    CPPUNIT_ASSERT_EQUAL(3UL, (unsigned long)queue.size());
-     CPPUNIT_ASSERT_EQUAL(true, queue.dequeue(item));
-     CPPUNIT_ASSERT_EQUAL(true, queue.dequeue(item));
-     CPPUNIT_ASSERT_EQUAL(true, queue.dequeue(item));
- 
--    CPPUNIT_ASSERT_EQUAL(0UL, queue.size());
-+    CPPUNIT_ASSERT_EQUAL(0UL, (unsigned long)queue.size());
- 
-     const std::vector<std::string> dup_messages =
-     {
-@@ -353,13 +353,13 @@
-         queue.enqueue(std::make_shared<Message>(msg, Message::Dir::Out));
-     }
- 
--    CPPUNIT_ASSERT_EQUAL(1UL, queue.size());
-+    CPPUNIT_ASSERT_EQUAL(1UL, (unsigned long)queue.size());
-     CPPUNIT_ASSERT_EQUAL(true, queue.dequeue(item));
- 
-     // The last one should persist.
-     CPPUNIT_ASSERT_EQUAL(dup_messages[2], std::string(item->data().data(), item->data().size()));
- 
--    CPPUNIT_ASSERT_EQUAL(0UL, queue.size());
-+    CPPUNIT_ASSERT_EQUAL(0UL, (unsigned long)queue.size());
- }
- 
- void TileQueueTests::testInvalidateViewCursorDeduplication()
-@@ -370,7 +370,7 @@
- 
-     // Empty queue
-     CPPUNIT_ASSERT_EQUAL(false, queue.dequeue(item));
--    CPPUNIT_ASSERT_EQUAL(0UL, queue.size());
-+    CPPUNIT_ASSERT_EQUAL(0UL, (unsigned long)queue.size());
- 
-     const std::vector<std::string> view_messages =
-     {
-@@ -384,21 +384,21 @@
-         queue.enqueue(std::make_shared<Message>(msg, Message::Dir::Out));
-     }
- 
--    CPPUNIT_ASSERT_EQUAL(3UL, queue.size());
-+    CPPUNIT_ASSERT_EQUAL(3UL, (unsigned long)queue.size());
- 
-     CPPUNIT_ASSERT_EQUAL(true, queue.dequeue(item));
--    CPPUNIT_ASSERT_EQUAL(2UL, queue.size());
-+    CPPUNIT_ASSERT_EQUAL(2UL, (unsigned long)queue.size());
-     CPPUNIT_ASSERT_EQUAL(view_messages[0], std::string(item->data().data(), item->data().size()));
- 
-     CPPUNIT_ASSERT_EQUAL(true, queue.dequeue(item));
--    CPPUNIT_ASSERT_EQUAL(1UL, queue.size());
-+    CPPUNIT_ASSERT_EQUAL(1UL, (unsigned long)queue.size());
-     CPPUNIT_ASSERT_EQUAL(view_messages[1], std::string(item->data().data(), item->data().size()));
- 
-     CPPUNIT_ASSERT_EQUAL(true, queue.dequeue(item));
--    CPPUNIT_ASSERT_EQUAL(0UL, queue.size());
-+    CPPUNIT_ASSERT_EQUAL(0UL, (unsigned long)queue.size());
-     CPPUNIT_ASSERT_EQUAL(view_messages[2], std::string(item->data().data(), item->data().size()));
- 
--    CPPUNIT_ASSERT_EQUAL(0UL, queue.size());
-+    CPPUNIT_ASSERT_EQUAL(0UL, (unsigned long)queue.size());
- 
-     const std::vector<std::string> dup_messages =
-     {
-@@ -412,13 +412,13 @@
-         queue.enqueue(std::make_shared<Message>(msg, Message::Dir::Out));
-     }
- 
--    CPPUNIT_ASSERT_EQUAL(1UL, queue.size());
-+    CPPUNIT_ASSERT_EQUAL(1UL, (unsigned long)queue.size());
-     CPPUNIT_ASSERT_EQUAL(true, queue.dequeue(item));
- 
-     // The last one should persist.
-     CPPUNIT_ASSERT_EQUAL(dup_messages[2], std::string(item->data().data(), item->data().size()));
- 
--    CPPUNIT_ASSERT_EQUAL(0UL, queue.size());
-+    CPPUNIT_ASSERT_EQUAL(0UL, (unsigned long)queue.size());
- }
- 
- void TileQueueTests::testCallbackInvalidation()
-diff -wbBur online-2.1.1/test/WhiteBoxTests.cpp online-2.1.1.q/test/WhiteBoxTests.cpp
---- online-2.1.1/test/WhiteBoxTests.cpp	2017-05-18 22:03:26.000000000 +0300
-+++ online-2.1.1.q/test/WhiteBoxTests.cpp	2017-07-06 13:44:08.326542611 +0300
-@@ -80,53 +80,53 @@
-     CPPUNIT_ASSERT(LOOLProtocol::getTokenKeywordFromMessage(message, "mumble", map, mumble));
-     CPPUNIT_ASSERT_EQUAL(2, mumble);
- 
--    CPPUNIT_ASSERT_EQUAL(1UL, Util::trimmed("A").size());
-+    CPPUNIT_ASSERT_EQUAL(1UL, (unsigned long)Util::trimmed("A").size());
-     CPPUNIT_ASSERT_EQUAL(std::string("A"), Util::trimmed("A"));
- 
--    CPPUNIT_ASSERT_EQUAL(1UL, Util::trimmed(" X").size());
-+    CPPUNIT_ASSERT_EQUAL(1UL, (unsigned long)Util::trimmed(" X").size());
-     CPPUNIT_ASSERT_EQUAL(std::string("X"), Util::trimmed(" X"));
- 
--    CPPUNIT_ASSERT_EQUAL(1UL, Util::trimmed("Y ").size());
-+    CPPUNIT_ASSERT_EQUAL(1UL, (unsigned long)Util::trimmed("Y ").size());
-     CPPUNIT_ASSERT_EQUAL(std::string("Y"), Util::trimmed("Y "));
- 
--    CPPUNIT_ASSERT_EQUAL(1UL, Util::trimmed(" Z ").size());
-+    CPPUNIT_ASSERT_EQUAL(1UL, (unsigned long)Util::trimmed(" Z ").size());
-     CPPUNIT_ASSERT_EQUAL(std::string("Z"), Util::trimmed(" Z "));
- 
--    CPPUNIT_ASSERT_EQUAL(0UL, Util::trimmed(" ").size());
-+    CPPUNIT_ASSERT_EQUAL(0UL, (unsigned long)Util::trimmed(" ").size());
-     CPPUNIT_ASSERT_EQUAL(std::string(""), Util::trimmed(" "));
- 
--    CPPUNIT_ASSERT_EQUAL(0UL, Util::trimmed("   ").size());
-+    CPPUNIT_ASSERT_EQUAL(0UL, (unsigned long)Util::trimmed("   ").size());
-     CPPUNIT_ASSERT_EQUAL(std::string(""), Util::trimmed("   "));
- 
-     std::string s;
- 
-     s = "A";
--    CPPUNIT_ASSERT_EQUAL(1UL, Util::trim(s).size());
-+    CPPUNIT_ASSERT_EQUAL(1UL, (unsigned long)Util::trim(s).size());
-     s = "A";
-     CPPUNIT_ASSERT_EQUAL(std::string("A"), Util::trim(s));
- 
-     s = " X";
--    CPPUNIT_ASSERT_EQUAL(1UL, Util::trim(s).size());
-+    CPPUNIT_ASSERT_EQUAL(1UL, (unsigned long)Util::trim(s).size());
-     s = " X";
-     CPPUNIT_ASSERT_EQUAL(std::string("X"), Util::trim(s));
- 
-     s = "Y ";
--    CPPUNIT_ASSERT_EQUAL(1UL, Util::trim(s).size());
-+    CPPUNIT_ASSERT_EQUAL(1UL, (unsigned long)Util::trim(s).size());
-     s = "Y ";
-     CPPUNIT_ASSERT_EQUAL(std::string("Y"), Util::trim(s));
- 
-     s = " Z ";
--    CPPUNIT_ASSERT_EQUAL(1UL, Util::trim(s).size());
-+    CPPUNIT_ASSERT_EQUAL(1UL, (unsigned long)Util::trim(s).size());
-     s = " Z ";
-     CPPUNIT_ASSERT_EQUAL(std::string("Z"), Util::trim(s));
- 
-     s = " ";
--    CPPUNIT_ASSERT_EQUAL(0UL, Util::trim(s).size());
-+    CPPUNIT_ASSERT_EQUAL(0UL, (unsigned long)Util::trim(s).size());
-     s = " ";
-     CPPUNIT_ASSERT_EQUAL(std::string(""), Util::trim(s));
- 
-     s = "   ";
--    CPPUNIT_ASSERT_EQUAL(0UL, Util::trim(s).size());
-+    CPPUNIT_ASSERT_EQUAL(0UL, (unsigned long)Util::trim(s).size());
-     s = "   ";
-     CPPUNIT_ASSERT_EQUAL(std::string(""), Util::trim(s));
- }
-@@ -162,51 +162,51 @@
-     std::vector<std::string> tokens;
- 
-     tokens = LOOLProtocol::tokenize("");
--    CPPUNIT_ASSERT_EQUAL(0UL, tokens.size());
-+    CPPUNIT_ASSERT_EQUAL(0UL, (unsigned long)tokens.size());
- 
-     tokens = LOOLProtocol::tokenize("  ");
--    CPPUNIT_ASSERT_EQUAL(0UL, tokens.size());
-+    CPPUNIT_ASSERT_EQUAL(0UL, (unsigned long)tokens.size());
- 
-     tokens = LOOLProtocol::tokenize("A");
--    CPPUNIT_ASSERT_EQUAL(1UL, tokens.size());
-+    CPPUNIT_ASSERT_EQUAL(1UL, (unsigned long)tokens.size());
-     CPPUNIT_ASSERT_EQUAL(std::string("A"), tokens[0]);
- 
-     tokens = LOOLProtocol::tokenize("  A");
--    CPPUNIT_ASSERT_EQUAL(1UL, tokens.size());
-+    CPPUNIT_ASSERT_EQUAL(1UL, (unsigned long)tokens.size());
-     CPPUNIT_ASSERT_EQUAL(std::string("A"), tokens[0]);
- 
-     tokens = LOOLProtocol::tokenize("A  ");
--    CPPUNIT_ASSERT_EQUAL(1UL, tokens.size());
-+    CPPUNIT_ASSERT_EQUAL(1UL, (unsigned long)tokens.size());
-     CPPUNIT_ASSERT_EQUAL(std::string("A"), tokens[0]);
- 
-     tokens = LOOLProtocol::tokenize(" A ");
--    CPPUNIT_ASSERT_EQUAL(1UL, tokens.size());
-+    CPPUNIT_ASSERT_EQUAL(1UL, (unsigned long)tokens.size());
-     CPPUNIT_ASSERT_EQUAL(std::string("A"), tokens[0]);
- 
-     tokens = LOOLProtocol::tokenize(" A  Z ");
--    CPPUNIT_ASSERT_EQUAL(2UL, tokens.size());
-+    CPPUNIT_ASSERT_EQUAL(2UL, (unsigned long)tokens.size());
-     CPPUNIT_ASSERT_EQUAL(std::string("A"), tokens[0]);
-     CPPUNIT_ASSERT_EQUAL(std::string("Z"), tokens[1]);
- 
-     tokens = LOOLProtocol::tokenize("\n");
--    CPPUNIT_ASSERT_EQUAL(0UL, tokens.size());
-+    CPPUNIT_ASSERT_EQUAL(0UL, (unsigned long)tokens.size());
- 
-     tokens = LOOLProtocol::tokenize(" A  \nZ ");
--    CPPUNIT_ASSERT_EQUAL(1UL, tokens.size());
-+    CPPUNIT_ASSERT_EQUAL(1UL, (unsigned long)tokens.size());
-     CPPUNIT_ASSERT_EQUAL(std::string("A"), tokens[0]);
- 
-     tokens = LOOLProtocol::tokenize(" A  Z\n ");
--    CPPUNIT_ASSERT_EQUAL(2UL, tokens.size());
-+    CPPUNIT_ASSERT_EQUAL(2UL, (unsigned long)tokens.size());
-     CPPUNIT_ASSERT_EQUAL(std::string("A"), tokens[0]);
-     CPPUNIT_ASSERT_EQUAL(std::string("Z"), tokens[1]);
- 
-     tokens = LOOLProtocol::tokenize(" A  Z  \n ");
--    CPPUNIT_ASSERT_EQUAL(2UL, tokens.size());
-+    CPPUNIT_ASSERT_EQUAL(2UL, (unsigned long)tokens.size());
-     CPPUNIT_ASSERT_EQUAL(std::string("A"), tokens[0]);
-     CPPUNIT_ASSERT_EQUAL(std::string("Z"), tokens[1]);
- 
-     tokens = LOOLProtocol::tokenize("tile part=0 width=256 height=256 tileposx=0 tileposy=0 tilewidth=3840 tileheight=3840 ver=-1");
--    CPPUNIT_ASSERT_EQUAL(9UL, tokens.size());
-+    CPPUNIT_ASSERT_EQUAL(9UL, (unsigned long)tokens.size());
-     CPPUNIT_ASSERT_EQUAL(std::string("tile"), tokens[0]);
-     CPPUNIT_ASSERT_EQUAL(std::string("part=0"), tokens[1]);
-     CPPUNIT_ASSERT_EQUAL(std::string("width=256"), tokens[2]);
-diff -wbBur online-2.1.1/wsd/Admin.cpp online-2.1.1.q/wsd/Admin.cpp
---- online-2.1.1/wsd/Admin.cpp	2017-05-18 22:03:26.000000000 +0300
-+++ online-2.1.1.q/wsd/Admin.cpp	2017-07-06 13:44:08.326542611 +0300
-@@ -326,7 +326,7 @@
-         if (memWait <= 0)
-         {
-             const auto totalMem = getTotalMemoryUsage();
--            if (totalMem != _lastTotalMemory)
-+            if ((long)totalMem != _lastTotalMemory)
-             {
-                 LOG_TRC("Total memory used: " << totalMem);
-                 _lastTotalMemory = totalMem;
-diff -wbBur online-2.1.1/wsd/Storage.cpp online-2.1.1.q/wsd/Storage.cpp
---- online-2.1.1/wsd/Storage.cpp	2017-05-18 22:03:26.000000000 +0300
-+++ online-2.1.1.q/wsd/Storage.cpp	2017-07-06 13:44:08.326542611 +0300
-@@ -224,7 +224,7 @@
-     const auto lastModified = file.getLastModified();
-     const auto size = file.getSize();
- 
--    _fileInfo = FileInfo({filename, "localhost", lastModified, size});
-+    _fileInfo = FileInfo({filename, "localhost", lastModified, (size_t)size});
- 
-     // Set automatic userid and username
-     return std::unique_ptr<LocalStorage::LocalFileInfo>(new LocalFileInfo({"localhost", std::string("Local Host #") + std::to_string(LastLocalStorageId++)}));
-diff -wbBur online-2.1.1/wsd/TraceFile.hpp online-2.1.1.q/wsd/TraceFile.hpp
---- online-2.1.1/wsd/TraceFile.hpp	2017-05-18 22:03:26.000000000 +0300
-+++ online-2.1.1.q/wsd/TraceFile.hpp	2017-07-06 13:44:08.326542611 +0300
-@@ -406,7 +406,7 @@
-             _records[0].Dir != TraceFileRecord::Direction::Event ||
-             _records[0].Payload.find("NewSession") != 0)
-         {
--            fprintf(stderr, "Invalid trace file with %ld records. First record: %s\n", _records.size(),
-+            fprintf(stderr, "Invalid trace file with %ld records. First record: %s\n", (long)_records.size(),
-                     _records.empty() ? "<empty>" : _records[0].Payload.c_str());
-             throw std::runtime_error("Invalid trace file.");
-         }
diff --git a/disable-fc-cache.patch b/disable-fc-cache.patch
new file mode 100644
index 000000000000..2b549111a93a
--- /dev/null
+++ b/disable-fc-cache.patch
@@ -0,0 +1,11 @@
+diff --git a/test/Makefile.am b/test/Makefile.am
+index 62b859b..d9aaa37 100644
+--- a/test/Makefile.am
++++ b/test/Makefile.am
+@@ -144,5 +144,4 @@ all-local: unittest
+ 	@echo
+ 	@echo "Running build-time unit tests.  For more thorough testing, please run 'make check'."
+ 	@echo
+-	@fc-cache "@LO_PATH@"/share/fonts/truetype
+ 	@${top_builddir}/test/unittest
+
diff --git a/hack-annoying-errors.patch b/hack-annoying-errors.patch
deleted file mode 100644
index 5f6ce4b15455..000000000000
--- a/hack-annoying-errors.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-diff -wbBur online-libreoffice-5.3.4.2/kit/Kit.cpp online-libreoffice-5.3.4.2.q/kit/Kit.cpp
---- online-libreoffice-5.3.4.2/kit/Kit.cpp	2017-07-12 19:24:55.656651908 +0300
-+++ online-libreoffice-5.3.4.2.q/kit/Kit.cpp	2017-07-12 19:24:32.139985511 +0300
-@@ -150,8 +150,13 @@
-             File(newPath.parent()).createDirectories();
-             if (link(fpath, newPath.toString().c_str()) == -1)
-             {
-+                if(errno != EEXIST)
-+                {
-+                    if(errno != EXDEV)
-+                    {
-                 LOG_SYS("link(\"" << fpath << "\", \"" <<
-                         newPath.toString() << "\") failed. Will copy.");
-+                    }
-                 try
-                 {
-                     File(fpath).copyTo(newPath.toString());
-@@ -163,6 +168,7 @@
-                     std::_Exit(Application::EXIT_SOFTWARE);
-                 }
-             }
-+            }
-             break;
-         case FTW_D:
-             {
diff --git a/libreoffice-online.install b/libreoffice-online.install
index a609366eb2e3..c507db6a77be 100644
--- a/libreoffice-online.install
+++ b/libreoffice-online.install
@@ -1,21 +1,6 @@
-post_install() {
-  getent group lool > /dev/null || \
-    groupadd -r lool > /dev/null
-  getent passwd lool > /dev/null || \
-    useradd -r -g lool -s /sbin/nologin -d /var/lib/lool -c "Libreoffice Online" lool > /dev/null
-  post_upgrade
-}
 
 post_upgrade() {
-  loolwsd-systemplate-setup /var/lib/lool/systemplate /usr/lib/libreoffice
-  chown -R lool:lool /var/cache/libreoffice-online \
-                     /var/lib/lool/child-roots \
-                     /var/lib/lool/systemplate
-  chmod u+w /var/lib/lool/child-roots
-  setcap cap_fowner,cap_mknod,cap_sys_chroot=ep /usr/bin/loolforkit
-  setcap cap_sys_admin=ep /usr/bin/loolmount
+     loolconfig update-system-template
+     setcap cap_fowner,cap_mknod,cap_sys_chroot=ep /usr/bin/loolforkit
 }
 
-post_remove() {
-  echo "You may want to remove /var/lib/lool and loop user/group"
-}
diff --git a/libreoffice-online.sysusers b/libreoffice-online.sysusers
new file mode 100644
index 000000000000..4a81c6637208
--- /dev/null
+++ b/libreoffice-online.sysusers
@@ -0,0 +1,2 @@
+u lool - "LOOLWSD" /var/lib/libreoffice-online /usr/bin/bash
+
diff --git a/libreoffice-online.tmpfiles b/libreoffice-online.tmpfiles
new file mode 100644
index 000000000000..00276caf989e
--- /dev/null
+++ b/libreoffice-online.tmpfiles
@@ -0,0 +1,6 @@
+d /var/lib/cache/libreoffice-online 0750
+d /var/log/libreoffice-online 0750
+d /var/lib/libreoffice-online 0750
+Z /var/lib/cache/libreoffice-online - lool lool
+Z /var/log/libreoffice-online - lool lool
+Z /var/lib/libreoffice-online - lool lool
diff --git a/loolwsd-config.patch b/loolwsd-config.patch
new file mode 100644
index 000000000000..c5513a76a460
--- /dev/null
+++ b/loolwsd-config.patch
@@ -0,0 +1,67 @@
+diff --git a/configure.ac b/configure.ac
+index 164ec055..384396f0 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -168,7 +168,7 @@ AS_IF([test "$enable_debug" = yes -a -n "$with_poco_libs"],
+ 
+ ENABLE_DEBUG=
+ LOOLWSD_LOGLEVEL="warning"
+-LOOLWSD_LOG_TO_FILE="false"
++LOOLWSD_LOG_TO_FILE="true"
+ LOOLWSD_LOGFILE="/var/log/loolwsd.log"
+ LOOLWSD_ANONYMIZE_FILENAMES=false
+ LOOLWSD_ANONYMIZE_USERNAMES=false
+diff --git a/loolwsd.xml.in b/loolwsd.xml.in
+index 0ea2abd8..89578d98 100644
+--- a/loolwsd.xml.in
++++ b/loolwsd.xml.in
+@@ -6,12 +6,12 @@
+     <allowed_languages desc="List of supported languages of Writing Aids (spell checker, grammar checker, thesaurus, hyphenation) on this instance. Allowing too many has negative effect on startup performance." default="de_DE en_GB en_US es_ES fr_FR it nl pt_BR pt_PT ru">de_DE en_GB en_US es_ES fr_FR it nl pt_BR pt_PT ru</allowed_languages>
+ 
+     <tile_cache_path desc="Path to a directory where to keep the tile cache." type="path" relative="false" default="@LOOLWSD_CACHEDIR@"></tile_cache_path>
+-    <sys_template_path desc="Path to a template tree with shared libraries etc to be used as source for chroot jails for child processes." type="path" relative="true" default="systemplate"></sys_template_path>
++    <sys_template_path desc="Path to a template tree with shared libraries etc to be used as source for chroot jails for child processes." type="path" relative="false" default="/var/lib/libreoffice-online/systemplate"></sys_template_path>
+     <lo_template_path desc="Path to a LibreOffice installation tree to be copied (linked) into the jails for child processes. Should be on the same file system as systemplate." type="path" relative="false" default="@LO_PATH@"></lo_template_path>
+-    <child_root_path desc="Path to the directory under which the chroot jails for the child processes will be created. Should be on the same file system as systemplate and lotemplate. Must be an empty directory." type="path" relative="true" default="jails"></child_root_path>
++    <child_root_path desc="Path to the directory under which the chroot jails for the child processes will be created. Should be on the same file system as systemplate and lotemplate. Must be an empty directory." type="path" relative="false" default="/var/lib/libreoffice-online/jails">/var/lib/libreoffice-online/jails</child_root_path>
+ 
+     <server_name desc="Hostname:port of the server running loolwsd. If empty, it's derived from the request." type="string" default=""></server_name>
+-    <file_server_root_path desc="Path to the directory that should be considered root for the file server. This should be the directory containing loleaflet." type="path" relative="true" default="loleaflet/../"></file_server_root_path>
++    <file_server_root_path desc="Path to the directory that should be considered root for the file server. This should be the directory containing loleaflet." type="path" relative="false" default="/usr/share/libreoffice-online">/usr/share/libreoffice-online</file_server_root_path>
+ 
+     <memproportion desc="The maximum percentage of system memory consumed by all of the LibreOffice Online, after which we start cleaning up idle documents" type="double" default="80.0"></memproportion>
+     <num_prespawn_children desc="Number of child processes to keep started in advance and waiting for new clients." type="uint" default="1">1</num_prespawn_children>
+@@ -42,7 +42,7 @@
+         <level type="string" desc="Can be 0-8, or none (turns off logging), fatal, critical, error, warning, notice, information, debug, trace" default="@LOOLWSD_LOGLEVEL@">@LOOLWSD_LOGLEVEL@</level>
+         <file enable="@LOOLWSD_LOG_TO_FILE@">
+             <property name="path" desc="Log file path.">@LOOLWSD_LOGFILE@</property>
+-            <property name="rotation" desc="Log file rotation strategy. See Poco FileChannel.">never</property>
++            <property name="rotation" desc="Log file rotation strategy. See Poco FileChannel.">weekly</property>
+             <property name="archive" desc="Append either timestamp or number to the archived log filename.">timestamp</property>
+             <property name="compress" desc="Enable/disable log file compression.">true</property>
+             <property name="purgeAge" desc="The maximum age of log files to preserve. See Poco FileChannel.">10 days</property>
+@@ -83,8 +83,8 @@
+     </net>
+ 
+     <ssl desc="SSL settings">
+-        <enable type="bool" desc="Controls whether SSL encryption is enable (do not disable for production deployment). If default is false, must first be compiled with SSL support to enable." default="@ENABLE_SSL@">@ENABLE_SSL@</enable>
+-        <termination desc="Connection via proxy where loolwsd acts as working via https, but actually uses http." type="bool" default="true">false</termination>
++        <enable type="bool" desc="Controls whether SSL encryption is enable. If default is false, must first be compiled with SSL support to enable." default="@ENABLE_SSL@">false</enable>
++        <termination desc="Connection via proxy where loolwsd acts as working via https, but actually uses http." type="bool" default="true">true</termination>
+         <cert_file_path desc="Path to the cert file" relative="false">/etc/loolwsd/cert.pem</cert_file_path>
+         <key_file_path desc="Path to the key file" relative="false">/etc/loolwsd/key.pem</key_file_path>
+         <ca_file_path desc="Path to the ca file" relative="false">/etc/loolwsd/ca-chain.cert.pem</ca_file_path>
+diff --git a/tools/Config.cpp b/tools/Config.cpp
+index 2c257c60..68370cf4 100644
+--- a/tools/Config.cpp
++++ b/tools/Config.cpp
+@@ -337,7 +337,7 @@ int Config::main(const std::vector<std::string>& args)
+     }
+     else if (args[0] == "update-system-template")
+     {
+-        const char command[] = "su lool --shell=/bin/sh -c 'loolwsd-systemplate-setup /opt/lool/systemplate " LO_PATH " >/dev/null 2>&1'";
++        const char command[] = "su lool --shell=/bin/sh -c 'loolwsd-systemplate-setup /var/lib/libreoffice-online/systemplate  " LO_PATH " >/dev/null 2>&1'";
+         std::cout << "Running the following command:" << std::endl
+                   << command << std::endl;
+ 
+
diff --git a/loolwsd.service b/loolwsd.service
index 24da856c628b..d40276695e52 100644
--- a/loolwsd.service
+++ b/loolwsd.service
@@ -4,7 +4,7 @@ Description=loolwsd as a service
 [Service]
 User=lool
 Group=lool
-ExecStart=/usr/bin/loolwsd --o:sys_template_path=/var/lib/lool/systemplate --o:lo_template_path=/usr/lib/libreoffice --o:child_root_path=/var/lib/lool/child-roots --o:file_server_root_path=/usr/share/loolwsd
+ExecStart=/usr/bin/loolwsd 
 ExecReload=/bin/kill -HUP $MAINPID
 KillMode=process
 Restart=on-failure