Add coexistent Hellfire .desktop resources

libreoffice-online: 6.4.4-3

9 files changed, 123 insertions, 84 deletions

diff --git a/.SRCINFO b/.SRCINFO
index f0a747ed4fe5..3fb8bcf608fe 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,8 @@
 pkgbase = libreoffice-online
 	pkgdesc = HTML5-based/cloud-based version of the office suite
-	pkgver = 7.0.1.1
-	pkgrel = 2
+	pkgver = 6.4.4
+	pkgrel = 1
+	epoch = 1
 	url = https://www.libreoffice.org/download/libreoffice-online/
 	install = libreoffice-online.install
 	arch = x86_64
@@ -12,25 +13,35 @@ pkgbase = libreoffice-online
 	makedepends = npm
 	makedepends = python-polib
 	depends = cpio
+	depends = fontconfig
+	depends = libcap
+	depends = libcap-ng
+	depends = libpng
 	depends = libreoffice-fresh
-	depends = nodejs
 	depends = openssl
+	depends = pam
 	depends = poco
-	backup = etc/libreoffice-online/loolwsd.xml
-	source = https://github.com/LibreOffice/online/archive/libreoffice-7.0.1.1.tar.gz
-	source = disable-fc-cache.patch
+	depends = zlib
+	backup = etc/conf.d/loolwsd
+	backup = etc/httpd/conf/extra/loolwsd.conf
+	backup = etc/loolwsd/loolkitconfig.xcu
+	backup = etc/loolwsd/loolwsd.xml
+	backup = etc/nginx/snippets/loolwsd.conf
+	backup = etc/pam.d/loolwsd
+	source = https://github.com/CollaboraOnline/online/archive/cp-6.4.4-3.tar.gz
+	source = loolwsd.pam.d
 	source = loolwsd-config.patch
 	source = loolwsd.service
 	source = libreoffice-online.install
 	source = libreoffice-online.sysusers
 	source = libreoffice-online.tmpfiles
-	sha512sums = 092be634649fb28391ba1164343a8a26958159243455f9f98178d6ca3312d2c9b5e79738e8a557197b9fe545f5f01764cd57042c1fed3a1b11117ddab616f31c
-	sha512sums = f7a63c32480b71258bad023095cfaa58baf1477acdcda76fd54e63e33caccb071749cdf577af12a9d4c95a3cd22e5e98ad4e12531307d860322b84e5d8973f92
-	sha512sums = 4b2c91f4cdd27faa6d19683872baac1fac13d85d109b5d7c5be7116ecfeeab2e94bc67f1a02e0f108cdc18777cf9facd0e3c55186615cd5658f7723cdc57bf44
-	sha512sums = 285071cc43da05a1065434078f8fd1d8046ca3deed6e25ddcbead714665940c1c0033559b6b938430878420a564de3927f10f975ac066a6c94a0d5609b8523aa
-	sha512sums = 00002d191aee329197b2a5b82b603e5af7d6e57194d9f4b06f1b5d85c84fca760ae7af19e5e3e67801ec48194d8a8a52163de3e7f6ec09659cd0fa3219e55d81
-	sha512sums = b85929da722e548f5c970c7a15a09d42c7e6b1aceeb4ad6138ade31888a2261155d6f5a187acb930c79ec00988531a3828e983c6b9ed3bd5a42ad62f5ff3b0d2
-	sha512sums = 7764aa3c62ea4fba492a32135c2a1ddbc1686e0e3665c839d40ffbcba7a7a4a3481b54ee5c6640a71de74ecd7a0f6f5f228f9d08f3a82b1b8aca121f4dbd1dc7
+	sha512sums = 0b940660d9fa10609f968bfaf8e888142a861dd8e608ce334bb924da399ffb8ae0e5c9d14dba30c869242bed026bc5478ee655200c25a8b3f0c24109ff6736d0
+	sha512sums = df03ce4ef23948e7fbb3cef7f6ea7c0b692cb0816370995051b7256a0b94ef288ca28157c3418ba235459902d2be2998e3742ef0e872a97952a9e380490d8d10
+	sha512sums = 61870a3fe597f37bbf0d8713f9a8c5af4ea9392a56afb065db6cda475755fca5c601922f03fe83443b49edf9d5eaebc7d7cf3bef499cda21e62dbbc5f6a768f7
+	sha512sums = 4292f1e750a0a1466a8b8cdd0ad03d0edc6c6c14e91c785880713b99d256ca779c4a63ad3c1a7439d21af3dae6fd79dc38e079316d3ba5caff454016b0aed759
+	sha512sums = 0847ec0e92841ef17303c90d00fd5364043c973d49d1b6070c184ae923cfe61a7355ad211f00654d27ca769def202b1024b48add0cd8f8c43203a4b2b116f9ef
+	sha512sums = 8a195f809b288b97bdf26a9bc578fdb2aa6a5b3f28c63aad81ca9741dac0ea51208e5145401b5e398c96fb3e6775de1cea450e55fd2dab43be184dd11a4f2c3d
+	sha512sums = 0dd767e95435f6c501e913d3cfc866f3f4f7160fe08cb406b7d5d7a07bc2a524a475828a34c5d68692ae954dd4f1affb689dacc95ede6d3561ef977553b0c3fc
 
 pkgname = libreoffice-online
 
diff --git a/PKGBUILD b/PKGBUILD
index c46378d45be1..3758acb0e435 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,75 +1,95 @@
-# $Id: PKGBUILD 266875 2017-11-15 14:29:11Z foutrelis $
 # Maintainer: robertfoster
 # Contributor: Sergej Pupykin <arch+pub@sergej.pp.ru>
 # Contributor: Jonas Heinrich <onny@project-insanity.org>
 
 pkgname=libreoffice-online
-pkgver=7.0.1.1
-pkgrel=2
+pkgver=6.4.4
+_rel=3
+pkgrel=1
+epoch=1
 pkgdesc="HTML5-based/cloud-based version of the office suite"
 arch=('x86_64')
 url="https://www.libreoffice.org/download/libreoffice-online/"
 license=("MPL")
-depends=("cpio" "libreoffice-fresh" "nodejs" "openssl" "poco")
+depends=("cpio" "fontconfig" "libcap" "libcap-ng" "libpng" "libreoffice-fresh" "openssl" "pam" "poco" "zlib")
 makedepends=("cppunit" "git" "libreoffice-fresh-sdk" "npm" "python-polib")
-backup=("etc/libreoffice-online/loolwsd.xml")
-source=("https://github.com/LibreOffice/online/archive/libreoffice-${pkgver}.tar.gz"
-  "disable-fc-cache.patch"
+backup=(
+  "etc/conf.d/loolwsd"
+  "etc/httpd/conf/extra/loolwsd.conf"
+  "etc/loolwsd/loolkitconfig.xcu"
+  "etc/loolwsd/loolwsd.xml"
+  "etc/nginx/snippets/loolwsd.conf"
+  "etc/pam.d/loolwsd"
+)
+source=("https://github.com/CollaboraOnline/online/archive/cp-${pkgver}-${_rel}.tar.gz"
+  "loolwsd.pam.d"
   "loolwsd-config.patch"
   "loolwsd.service"
   "libreoffice-online.install"
   "libreoffice-online.sysusers"
-  "libreoffice-online.tmpfiles")
-
-sha512sums=('092be634649fb28391ba1164343a8a26958159243455f9f98178d6ca3312d2c9b5e79738e8a557197b9fe545f5f01764cd57042c1fed3a1b11117ddab616f31c'
-            'f7a63c32480b71258bad023095cfaa58baf1477acdcda76fd54e63e33caccb071749cdf577af12a9d4c95a3cd22e5e98ad4e12531307d860322b84e5d8973f92'
-            '4b2c91f4cdd27faa6d19683872baac1fac13d85d109b5d7c5be7116ecfeeab2e94bc67f1a02e0f108cdc18777cf9facd0e3c55186615cd5658f7723cdc57bf44'
-            '285071cc43da05a1065434078f8fd1d8046ca3deed6e25ddcbead714665940c1c0033559b6b938430878420a564de3927f10f975ac066a6c94a0d5609b8523aa'
-            '00002d191aee329197b2a5b82b603e5af7d6e57194d9f4b06f1b5d85c84fca760ae7af19e5e3e67801ec48194d8a8a52163de3e7f6ec09659cd0fa3219e55d81'
-            'b85929da722e548f5c970c7a15a09d42c7e6b1aceeb4ad6138ade31888a2261155d6f5a187acb930c79ec00988531a3828e983c6b9ed3bd5a42ad62f5ff3b0d2'
-            '7764aa3c62ea4fba492a32135c2a1ddbc1686e0e3665c839d40ffbcba7a7a4a3481b54ee5c6640a71de74ecd7a0f6f5f228f9d08f3a82b1b8aca121f4dbd1dc7')
-
+"libreoffice-online.tmpfiles")
 install=libreoffice-online.install
 
 prepare() {
-  cd "${srcdir}/online-libreoffice-${pkgver}"
-  patch -p1 <"${srcdir}/disable-fc-cache.patch"
+  cd "${srcdir}/online-cp-${pkgver}-${_rel}"
   patch -p1 <"${srcdir}/loolwsd-config.patch"
 }
 
 build() {
-  cd "${srcdir}/online-libreoffice-${pkgver}"
+  cd "${srcdir}/online-cp-${pkgver}-${_rel}"
   ./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/lib \
-    --with-logfile=/var/log/libreoffice-online/loolwsd.log \
-    --disable-setcap \
-    --disable-werror \
-    --with-lo-path=/usr/lib/libreoffice \
-    --disable-debug \
-    --enable-ssl
-
+  --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/loolwsd \
+  --htmldir=/usr/share/doc/loolwsd/html \
+  --with-sysroot=/ \
+  --libdir=/usr/lib \
+  --with-logfile=/var/log/lool/loolwsd.log \
+  --disable-setcap \
+  --disable-werror \
+  --with-lo-path=/usr/lib/libreoffice \
+  --disable-debug \
+  --enable-ssl
+  
   make build-nocheck -j"$(nproc)"
 }
 
 package() {
-  cd "${srcdir}/online-libreoffice-${pkgver}"
+  cd "${srcdir}/online-cp-${pkgver}-${_rel}"
   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"
+  install -dm755 "${pkgdir}"/var/log
+  install -dm755 "${pkgdir}"/var/cache/lool
+  install -dm750 "${pkgdir}"/var/lib/lool
+
+  install -Dm644 sysconfig.loolwsd \
+  "${pkgdir}/etc/conf.d/loolwsd"
+  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"
+  install -Dm644 "${srcdir}/loolwsd.pam.d" \
+  "${pkgdir}/etc/pam.d/loolwsd"
+  install -dm755 "${pkgdir}/etc/httpd/conf"
+  mv "${pkgdir}/etc/apache2/conf-available" \
+  "${pkgdir}/etc/httpd/conf/extra"
+  rm -rf "${pkgdir}/etc/apache2"
 }
+
+sha512sums=('0b940660d9fa10609f968bfaf8e888142a861dd8e608ce334bb924da399ffb8ae0e5c9d14dba30c869242bed026bc5478ee655200c25a8b3f0c24109ff6736d0'
+            'df03ce4ef23948e7fbb3cef7f6ea7c0b692cb0816370995051b7256a0b94ef288ca28157c3418ba235459902d2be2998e3742ef0e872a97952a9e380490d8d10'
+            '61870a3fe597f37bbf0d8713f9a8c5af4ea9392a56afb065db6cda475755fca5c601922f03fe83443b49edf9d5eaebc7d7cf3bef499cda21e62dbbc5f6a768f7'
+            '4292f1e750a0a1466a8b8cdd0ad03d0edc6c6c14e91c785880713b99d256ca779c4a63ad3c1a7439d21af3dae6fd79dc38e079316d3ba5caff454016b0aed759'
+            '0847ec0e92841ef17303c90d00fd5364043c973d49d1b6070c184ae923cfe61a7355ad211f00654d27ca769def202b1024b48add0cd8f8c43203a4b2b116f9ef'
+            '8a195f809b288b97bdf26a9bc578fdb2aa6a5b3f28c63aad81ca9741dac0ea51208e5145401b5e398c96fb3e6775de1cea450e55fd2dab43be184dd11a4f2c3d'
+            '0dd767e95435f6c501e913d3cfc866f3f4f7160fe08cb406b7d5d7a07bc2a524a475828a34c5d68692ae954dd4f1affb689dacc95ede6d3561ef977553b0c3fc')
diff --git a/disable-fc-cache.patch b/disable-fc-cache.patch
deleted file mode 100644
index 076ffc22b4a3..000000000000
--- a/disable-fc-cache.patch
+++ /dev/null
@@ -1,8 +0,0 @@
---- 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
- 	@UNITTEST=1 ${top_builddir}/test/unittest
diff --git a/libreoffice-online.install b/libreoffice-online.install
index 767f6daac947..20ee89997893 100644
--- a/libreoffice-online.install
+++ b/libreoffice-online.install
@@ -1,9 +1,11 @@
-
 post_install() {
-     loolconfig update-system-template
-     setcap cap_fowner,cap_mknod,cap_sys_chroot=ep /usr/bin/loolforkit
+  loolwsd-systemplate-setup /var/lib/lool/systemplate /usr/lib/libreoffice >/dev/null 2>&1
+  loolwsd-generate-proof-key >/dev/null 2>&1
+  setcap cap_fowner,cap_chown,cap_mknod,cap_sys_chroot=ep /usr/bin/loolforkit
+  setcap cap_sys_admin=ep /usr/bin/loolmount
+  echo "Do your edits into /etc/loolwsd/loolwsd.xml for further customizations"
 }
 
 post_upgrade() {
-    post_install
+  post_install
 }
diff --git a/libreoffice-online.sysusers b/libreoffice-online.sysusers
index 4a81c6637208..bc598f4d43f7 100644
--- a/libreoffice-online.sysusers
+++ b/libreoffice-online.sysusers
@@ -1,2 +1,2 @@
-u lool - "LOOLWSD" /var/lib/libreoffice-online /usr/bin/bash
+u lool - "LOOLWSD" /var/lib/lool /usr/bin/bash
 
diff --git a/libreoffice-online.tmpfiles b/libreoffice-online.tmpfiles
index 00276caf989e..849808d73ead 100644
--- a/libreoffice-online.tmpfiles
+++ b/libreoffice-online.tmpfiles
@@ -1,6 +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
+d /var/lib/cache/lool 0750
+d /var/log/lool 0750
+d /var/lib/lool 0750
+Z /var/lib/cache/lool - lool lool
+Z /var/log/lool - lool lool
+Z /var/lib/lool - lool lool
diff --git a/loolwsd-config.patch b/loolwsd-config.patch
index 616f8aa72b57..f59b5914e573 100644
--- a/loolwsd-config.patch
+++ b/loolwsd-config.patch
@@ -5,7 +5,7 @@
      else if (args[0] == "update-system-template")
      {
 -        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";
++        const char command[] = "loolwsd-systemplate-setup /var/lib/lool/systemplate " LO_PATH " >/dev/null 2>&1";
          std::cout << "Running the following command:" << std::endl
                    << command << std::endl;
 
diff --git a/loolwsd.pam.d b/loolwsd.pam.d
new file mode 100644
index 000000000000..ca76dc64a7cb
--- /dev/null
+++ b/loolwsd.pam.d
@@ -0,0 +1,3 @@
+#%PAM-1.0
+auth       required     pam_unix.so
+account    required     pam_unix.so
diff --git a/loolwsd.service b/loolwsd.service
index 0612cb0f86a2..f90795ff593f 100644
--- a/loolwsd.service
+++ b/loolwsd.service
@@ -1,13 +1,24 @@
 [Unit]
-Description=loolwsd as a service
+Description=Collabora Online WebSocket Daemon
+After=network.target
 
 [Service]
+EnvironmentFile=-/etc/sysconfig/loolwsd
+ExecStart=/usr/bin/loolwsd --version --o:sys_template_path=/var/lib/lool/systemplate --o:child_root_path=/var/lib/lool/child-roots --o:file_server_root_path=/usr/share/loolwsd
+KillSignal=SIGINT
+TimeoutStopSec=120
 User=lool
-Group=lool
-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
+KillMode=control-group
+Restart=always
+LimitNOFILE=infinity:infinity
+
+ProtectSystem=strict
+ReadWritePaths=/var/lib/lool /var/log
+
+ProtectHome=yes
+PrivateTmp=yes
+ProtectControlGroups=yes
+CapabilityBoundingSet=CAP_FOWNER CAP_CHOWN CAP_MKNOD CAP_SYS_CHROOT CAP_SYS_ADMIN
 
 [Install]
 WantedBy=multi-user.target