libreoffice-online: 7.0.1.1

5 files changed, 59 insertions, 115 deletions

diff --git a/.SRCINFO b/.SRCINFO
index ecb27b2aa458..8a6e2928e991 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,23 +1,24 @@
 pkgbase = libreoffice-online
 	pkgdesc = HTML5-based/cloud-based version of the office suite
-	pkgver = 6.2.3.2
-	pkgrel = 3
+	pkgver = 7.0.1.1
+	pkgrel = 1
 	url = https://www.libreoffice.org/download/libreoffice-online/
 	install = libreoffice-online.install
 	arch = x86_64
 	license = MPL
 	makedepends = cppunit
 	makedepends = git
-	makedepends = libreoffice-fresh-sdk>=6.2
+	makedepends = libreoffice-fresh-sdk
 	makedepends = nodejs
 	makedepends = npm
+	makedepends = openssl
 	makedepends = poco
 	makedepends = python-polib
 	depends = poco
-	depends = libreoffice
+	depends = libreoffice-fresh
 	depends = cpio
 	backup = etc/libreoffice-online/loolwsd.xml
-	source = libreoffice-online::git+https://git.libreoffice.org/online#tag=libreoffice-6.2.3.2
+	source = libreoffice-online::git+https://github.com/LibreOffice/online#tag=libreoffice-7.0.1.1
 	source = disable-fc-cache.patch
 	source = loolwsd-config.patch
 	source = loolwsd.service
@@ -25,9 +26,9 @@ pkgbase = libreoffice-online
 	source = libreoffice-online.sysusers
 	source = libreoffice-online.tmpfiles
 	sha512sums = SKIP
-	sha512sums = a7bf2f594be83cee242ca1172edb0f5de33640beee58eef71e1dd476a4b0efafe565e6816f034a91022c415a0755e3a553bc260fc8648163ad6f7a355f996054
-	sha512sums = 0294574cc6b131f170617e1da25b8c9b0c19d1627c4ebfe1fe4facfa66223f06d3aa613f463b6f30b874a628063aef0746c76e788addbab4910512ebc5c43d75
-	sha512sums = 76ec4fe0bfc8d856dc82c3fc993b612b9dd0ad7399bf733d4d4afe89ce393f3651c9734fef044ec4e80f3d2c20d94fe8b68cd6a23dfa3dbd267697b04e9ca73e
+	sha512sums = f7a63c32480b71258bad023095cfaa58baf1477acdcda76fd54e63e33caccb071749cdf577af12a9d4c95a3cd22e5e98ad4e12531307d860322b84e5d8973f92
+	sha512sums = 4b2c91f4cdd27faa6d19683872baac1fac13d85d109b5d7c5be7116ecfeeab2e94bc67f1a02e0f108cdc18777cf9facd0e3c55186615cd5658f7723cdc57bf44
+	sha512sums = 285071cc43da05a1065434078f8fd1d8046ca3deed6e25ddcbead714665940c1c0033559b6b938430878420a564de3927f10f975ac066a6c94a0d5609b8523aa
 	sha512sums = 00002d191aee329197b2a5b82b603e5af7d6e57194d9f4b06f1b5d85c84fca760ae7af19e5e3e67801ec48194d8a8a52163de3e7f6ec09659cd0fa3219e55d81
 	sha512sums = b85929da722e548f5c970c7a15a09d42c7e6b1aceeb4ad6138ade31888a2261155d6f5a187acb930c79ec00988531a3828e983c6b9ed3bd5a42ad62f5ff3b0d2
 	sha512sums = 7764aa3c62ea4fba492a32135c2a1ddbc1686e0e3665c839d40ffbcba7a7a4a3481b54ee5c6640a71de74ecd7a0f6f5f228f9d08f3a82b1b8aca121f4dbd1dc7
diff --git a/PKGBUILD b/PKGBUILD
index a766a0baafd4..4d8c58027bb8 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,30 +1,30 @@
 # $Id: PKGBUILD 266875 2017-11-15 14:29:11Z foutrelis $
-# Maintainer: Sergej Pupykin <arch+pub@sergej.pp.ru>
-# Maintainer: Jonas Heinrich <onny@project-insanity.org>
+# Maintainer: robertfoster
+# Contributor: Sergej Pupykin <arch+pub@sergej.pp.ru>
 # Contributor: Jonas Heinrich <onny@project-insanity.org>
 
 pkgname=libreoffice-online
-pkgver=6.2.3.2
-pkgrel=3
+pkgver=7.0.1.1
+pkgrel=1
 pkgdesc="HTML5-based/cloud-based version of the office suite"
 arch=('x86_64')
 url="https://www.libreoffice.org/download/libreoffice-online/"
 license=("MPL")
-makedepends=("cppunit" "git" "libreoffice-fresh-sdk>=6.2" "nodejs" "npm" "poco" "python-polib")
-depends=("poco" "libreoffice" "cpio")
+makedepends=("cppunit" "git" "libreoffice-fresh-sdk" "nodejs" "npm" "openssl" "poco" "python-polib")
+depends=("poco" "libreoffice-fresh" "cpio")
 backup=("etc/libreoffice-online/loolwsd.xml")
-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")
+source=("${pkgname}::git+https://github.com/LibreOffice/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'
-            '0294574cc6b131f170617e1da25b8c9b0c19d1627c4ebfe1fe4facfa66223f06d3aa613f463b6f30b874a628063aef0746c76e788addbab4910512ebc5c43d75'
-            '76ec4fe0bfc8d856dc82c3fc993b612b9dd0ad7399bf733d4d4afe89ce393f3651c9734fef044ec4e80f3d2c20d94fe8b68cd6a23dfa3dbd267697b04e9ca73e'
+            'f7a63c32480b71258bad023095cfaa58baf1477acdcda76fd54e63e33caccb071749cdf577af12a9d4c95a3cd22e5e98ad4e12531307d860322b84e5d8973f92'
+            '4b2c91f4cdd27faa6d19683872baac1fac13d85d109b5d7c5be7116ecfeeab2e94bc67f1a02e0f108cdc18777cf9facd0e3c55186615cd5658f7723cdc57bf44'
+            '285071cc43da05a1065434078f8fd1d8046ca3deed6e25ddcbead714665940c1c0033559b6b938430878420a564de3927f10f975ac066a6c94a0d5609b8523aa'
             '00002d191aee329197b2a5b82b603e5af7d6e57194d9f4b06f1b5d85c84fca760ae7af19e5e3e67801ec48194d8a8a52163de3e7f6ec09659cd0fa3219e55d81'
             'b85929da722e548f5c970c7a15a09d42c7e6b1aceeb4ad6138ade31888a2261155d6f5a187acb930c79ec00988531a3828e983c6b9ed3bd5a42ad62f5ff3b0d2'
             '7764aa3c62ea4fba492a32135c2a1ddbc1686e0e3665c839d40ffbcba7a7a4a3481b54ee5c6640a71de74ecd7a0f6f5f228f9d08f3a82b1b8aca121f4dbd1dc7')
@@ -33,8 +33,8 @@ install=libreoffice-online.install
 
 prepare() {
   cd "${srcdir}/${pkgname}"
-  patch -p1 < "${srcdir}/disable-fc-cache.patch"
-  patch -p1 < "${srcdir}/loolwsd-config.patch"
+  patch -p1 <"${srcdir}/disable-fc-cache.patch"
+  patch -p1 <"${srcdir}/loolwsd-config.patch"
 }
 
 build() {
@@ -42,33 +42,34 @@ build() {
   ./autogen.sh
 
   ./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
+    --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/lib \
+    --with-logfile=/var/log/libreoffice-online/loolwsd.log \
+    --disable-setcap \
+    --disable-werror \
+    --with-lo-path=/usr/lib/libreoffice \
+    --disable-debug \
+    --enable-ssl
 
-      make
+  make build-nocheck -j"$(nproc)"
 }
 
 package() {
   cd "${srcdir}/${pkgname}"
-  make DESTDIR=${pkgdir} install
+  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}/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/disable-fc-cache.patch b/disable-fc-cache.patch
index 2b549111a93a..076ffc22b4a3 100644
--- a/disable-fc-cache.patch
+++ b/disable-fc-cache.patch
@@ -1,11 +1,8 @@
-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
+--- a/test/Makefile.am	2020-10-12 11:40:10.877977970 +0200
++++ b/test/Makefile.am	2020-10-12 20:52:37.447455858 +0200
+@@ -310,5 +310,4 @@
  	@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
-
+ 	@UNITTEST=1 ${top_builddir}/test/unittest
diff --git a/loolwsd-config.patch b/loolwsd-config.patch
index 90ecfc018cd5..616f8aa72b57 100644
--- a/loolwsd-config.patch
+++ b/loolwsd-config.patch
@@ -1,66 +1,11 @@
-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)
+--- a/tools/Config.cpp	2020-10-12 11:40:10.879977858 +0200
++++ b/tools/Config.cpp	2020-10-12 21:02:47.990039366 +0200
+@@ -364,7 +364,7 @@
      }
      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'";
+-        const char command[] = "loolwsd-systemplate-setup /opt/lool/systemplate " LO_PATH " >/dev/null 2>&1";
++        const char command[] = "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 d40276695e52..0612cb0f86a2 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 
+ExecStart=/usr/bin/loolwsd --o:sys_template_path=/var/lib/libreoffice-online/systemplate --o:child_root_path=/var/lib/libreoffice-online/jails --o:file_server_root_path=/usr/share/loolwsd
 ExecReload=/bin/kill -HUP $MAINPID
 KillMode=process
 Restart=on-failure