upstream v2.1.5

3 files changed, 57 insertions, 53 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 35f5e590286c..8655432909ac 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,11 +1,12 @@
 pkgbase = collabora-online-server-nodocker
 	pkgdesc = Collabora CODE (LibreOffice Online) server for Nextcloud or ownCloud, without Docker
-	pkgver = 2.1.4
-	pkgrel = 2
+	pkgver = 2.1.5
+	pkgrel = 1
 	url = https://www.collaboraoffice.com/code/
 	install = install
 	arch = x86_64
 	license = MPL
+	depends = cpio
 	depends = gcc-libs
 	depends = libcap
 	depends = libpng12
@@ -54,45 +55,45 @@ pkgbase = collabora-online-server-nodocker
 	source = nginx.conf
 	source = sysusers
 	source = tmpfiles
-	source = https://www.collaboraoffice.com/repos/CollaboraOnline/CODE/loolwsd_2.1.4-3_amd64.deb
-	source = https://www.collaboraoffice.com/repos/CollaboraOnline/CODE/collaboraofficebasis5.3-calc_5.3.10.28-28_amd64.deb
-	source = https://www.collaboraoffice.com/repos/CollaboraOnline/CODE/collaboraofficebasis5.3-core_5.3.10.28-28_amd64.deb
-	source = https://www.collaboraoffice.com/repos/CollaboraOnline/CODE/collaboraoffice5.3-ure_5.3.10.28-28_amd64.deb
-	source = https://www.collaboraoffice.com/repos/CollaboraOnline/CODE/collaboraofficebasis5.3-graphicfilter_5.3.10.28-28_amd64.deb
-	source = https://www.collaboraoffice.com/repos/CollaboraOnline/CODE/collaboraofficebasis5.3-images_5.3.10.28-28_amd64.deb
-	source = https://www.collaboraoffice.com/repos/CollaboraOnline/CODE/collaboraofficebasis5.3-impress_5.3.10.28-28_amd64.deb
-	source = https://www.collaboraoffice.com/repos/CollaboraOnline/CODE/collaboraofficebasis5.3-ooofonts_5.3.10.28-28_amd64.deb
-	source = https://www.collaboraoffice.com/repos/CollaboraOnline/CODE/collaboraofficebasis5.3-writer_5.3.10.28-28_amd64.deb
-	source = https://www.collaboraoffice.com/repos/CollaboraOnline/CODE/collaboraoffice5.3_5.3.10.28-28_amd64.deb
-	source = https://www.collaboraoffice.com/repos/CollaboraOnline/CODE/collaboraofficebasis5.3-en-us_5.3.10.28-28_amd64.deb
-	source = https://www.collaboraoffice.com/repos/CollaboraOnline/CODE/collaboraofficebasis5.3-en-us-calc_5.3.10.28-28_amd64.deb
-	source = https://www.collaboraoffice.com/repos/CollaboraOnline/CODE/collaboraofficebasis5.3-en-us-res_5.3.10.28-28_amd64.deb
-	source = https://www.collaboraoffice.com/repos/CollaboraOnline/CODE/collaboraofficebasis5.3-noto-fonts_5.3.10.28-28_amd64.deb
-	source = https://www.collaboraoffice.com/repos/CollaboraOnline/CODE/collaboraofficebasis5.3-draw_5.3.10.28-28_amd64.deb
-	source = https://www.collaboraoffice.com/repos/CollaboraOnline/CODE/collaboraofficebasis5.3-extension-pdf-import_5.3.10.28-28_amd64.deb
+	source = https://www.collaboraoffice.com/repos/CollaboraOnline/CODE/loolwsd_2.1.5-4_amd64.deb
+	source = https://www.collaboraoffice.com/repos/CollaboraOnline/CODE/collaboraofficebasis5.3-calc_5.3.10.30-30_amd64.deb
+	source = https://www.collaboraoffice.com/repos/CollaboraOnline/CODE/collaboraofficebasis5.3-core_5.3.10.30-30_amd64.deb
+	source = https://www.collaboraoffice.com/repos/CollaboraOnline/CODE/collaboraoffice5.3-ure_5.3.10.30-30_amd64.deb
+	source = https://www.collaboraoffice.com/repos/CollaboraOnline/CODE/collaboraofficebasis5.3-graphicfilter_5.3.10.30-30_amd64.deb
+	source = https://www.collaboraoffice.com/repos/CollaboraOnline/CODE/collaboraofficebasis5.3-images_5.3.10.30-30_amd64.deb
+	source = https://www.collaboraoffice.com/repos/CollaboraOnline/CODE/collaboraofficebasis5.3-impress_5.3.10.30-30_amd64.deb
+	source = https://www.collaboraoffice.com/repos/CollaboraOnline/CODE/collaboraofficebasis5.3-ooofonts_5.3.10.30-30_amd64.deb
+	source = https://www.collaboraoffice.com/repos/CollaboraOnline/CODE/collaboraofficebasis5.3-writer_5.3.10.30-30_amd64.deb
+	source = https://www.collaboraoffice.com/repos/CollaboraOnline/CODE/collaboraoffice5.3_5.3.10.30-30_amd64.deb
+	source = https://www.collaboraoffice.com/repos/CollaboraOnline/CODE/collaboraofficebasis5.3-en-us_5.3.10.30-30_amd64.deb
+	source = https://www.collaboraoffice.com/repos/CollaboraOnline/CODE/collaboraofficebasis5.3-en-us-calc_5.3.10.30-30_amd64.deb
+	source = https://www.collaboraoffice.com/repos/CollaboraOnline/CODE/collaboraofficebasis5.3-en-us-res_5.3.10.30-30_amd64.deb
+	source = https://www.collaboraoffice.com/repos/CollaboraOnline/CODE/collaboraofficebasis5.3-noto-fonts_5.3.10.30-30_amd64.deb
+	source = https://www.collaboraoffice.com/repos/CollaboraOnline/CODE/collaboraofficebasis5.3-draw_5.3.10.30-30_amd64.deb
+	source = https://www.collaboraoffice.com/repos/CollaboraOnline/CODE/collaboraofficebasis5.3-extension-pdf-import_5.3.10.30-30_amd64.deb
 	source = https://www.collaboraoffice.com/repos/CollaboraOnline/CODE/code-brand_2.0.2-3_all.deb
-	sha1sums = fab66ee561bee5d004068c7c5090b70f91a9fb99
-	sha1sums = 20e4371fe6f03e53684759a11260b71e0f844401
+	sha1sums = c3403b3e7867cfea485f0fd0cd752ed5632ee4fd
+	sha1sums = 3452d27a4c2dd0e6eee4c1c30302fb9b25eac9b8
 	sha1sums = 68ac242ad285eeeca07cb486c22dfbf3a658fe81
 	sha1sums = fe998836dbbd5c153de77d4ea877f25719dae304
 	sha1sums = 2d271f9493ea14c675af1bfa76f6b654569dd51f
 	sha1sums = f9c102a06b2582548f13121e78790237e2cb38e1
-	sha1sums = ee41bb41d18a8af989ccbb297daea641c3d870d6
-	sha1sums = 021cc0d70f7777745f35f1ab92e701f956d1d837
-	sha1sums = de135aa7d17303344ba4014d72876e57b0a276a1
-	sha1sums = dc7741cd9d6786c5cd0b4e9631c674bbbbb148ff
-	sha1sums = 96c25ee57f9347d006222fc20e8c8b83bc1ecef6
-	sha1sums = 15ad54449c7257ff9430987fda334616d8649d91
-	sha1sums = 213f4ab3c1c9677708a05d5454bc75a020e78b38
-	sha1sums = 4e8c82a8ff2589c8814429511230827d0d38b6ef
-	sha1sums = 4a8dc86035c9c4bbe957cf70e0bade7337a3e79d
-	sha1sums = 284886cdd43fae3850c960b9141ce8b2e744bbcc
-	sha1sums = c8e6bbf518a63ca977081871397bc624e89219bc
-	sha1sums = dbe287e4e45d08ebc01e4d7a82150a78f9b59c91
-	sha1sums = 2c1112ec2901e83bed3f120ceb0597b53fc53cf6
-	sha1sums = c9e476f880a36dd7f1562547395547433da41022
-	sha1sums = 639e5c8e56999e56b0ae2348f3a11928fddca539
-	sha1sums = 46e148f221b54fe2b374e4f7201aa404378298b8
+	sha1sums = aedfa1ccf720696d799745494a1a5e4be6f8a90d
+	sha1sums = bf338b0a9caab46e7dc57ff8d6699cb72d863b09
+	sha1sums = 16dd1b02af5d45f9b86624ef1d85e3c45628eaac
+	sha1sums = b1df42a1df497679a7bafc9c7db18cc087b1b99b
+	sha1sums = 75557e569b864d56edace0f284041a6142e4974e
+	sha1sums = ac5f7ea39c0fdfed9ca592acbf42225103733579
+	sha1sums = c55084d453e254bfb7a0b76981f339712aa323a4
+	sha1sums = fbc20b23af1d98ee3866b0f0bd824f6f94f3b314
+	sha1sums = 36d6d3c98bf0e28c8386777835c4062b4fae53bc
+	sha1sums = 2a96ead2ceb5814b06a6e6d4c7850b041982a5bb
+	sha1sums = be7b3e2aac127a3341793c010025025646238445
+	sha1sums = a65c69ce25280141e31bee993dca95074cf51b96
+	sha1sums = 465a3147f182850acee539f2cd24aa82569f9a38
+	sha1sums = 45751352746cda1dced94b1f995399c36c347aec
+	sha1sums = c325c1a815a58e0c3d6cc74e9d09f42b354461f3
+	sha1sums = df5b50cc72cad3c34e95dbbc4acab8326cac965d
 	sha1sums = cb16065c67fb0697d63f9fd6c77fda673f9e5397
 
 pkgname = collabora-online-server-nodocker
diff --git a/PKGBUILD b/PKGBUILD
index 2e85da14926f..3526729f725c 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,8 +1,8 @@
 # Maintainer: Yves G. <theYinYeti@yalis.fr>
 
 pkgname=collabora-online-server-nodocker
-pkgver=2.1.4
-pkgrel=2
+pkgver=2.1.5
+pkgrel=1
 pkgdesc="Collabora CODE (LibreOffice Online) server for Nextcloud or ownCloud, without Docker"
 arch=('x86_64')
 url="https://www.collaboraoffice.com/code/"
@@ -35,7 +35,7 @@ optdepends=(
   'hyphen-hu: Hungarian hyphenation rules for LibreOffice'
   'hyphen-pl: Polish hyphenation rules for LibreOffice'
 )
-depends=()
+depends=(cpio)
 source=(
   'https://www.collaboraoffice.com/repos/CollaboraOnline/CODE/Packages'
   install
@@ -45,8 +45,8 @@ source=(
   tmpfiles
 )
 sha1sums=(
-  'fab66ee561bee5d004068c7c5090b70f91a9fb99'
-  '20e4371fe6f03e53684759a11260b71e0f844401'
+  'c3403b3e7867cfea485f0fd0cd752ed5632ee4fd'
+  '3452d27a4c2dd0e6eee4c1c30302fb9b25eac9b8'
   '68ac242ad285eeeca07cb486c22dfbf3a658fe81'
   'fe998836dbbd5c153de77d4ea877f25719dae304'
   '2d271f9493ea14c675af1bfa76f6b654569dd51f'
diff --git a/install b/install
index 86c4a7ac21b3..9575d370dc2d 100644
--- a/install
+++ b/install
@@ -4,21 +4,10 @@ post_install() {
 
   ## From Debian packages ##
 
-  setcap cap_fowner,cap_mknod,cap_sys_chroot=ep usr/bin/loolforkit || true
-  setcap cap_sys_admin=ep usr/bin/loolmount || true
-
-  systemd-sysusers collabora-online-server-nodocker.conf
-  chown lool:lool etc/loolwsd/loolwsd.xml
-  chmod 640       etc/loolwsd/loolwsd.xml
-
   # We assume that the LibreOffice to be used is built TDF-style
   # and installs in /opt/collaboraoffice5.3, and that /opt/lool is
   # on the same file system
   mkdir -p           opt/lool/child-roots
-  chown -R lool:lool opt/lool
-
-  fc-cache opt/collaboraoffice5.3/share/fonts/truetype
-  su lool --shell=/bin/sh -c "loolwsd-systemplate-setup /opt/lool/systemplate /opt/collaboraoffice5.3 >/dev/null 2>&1"
 
   ## From Docker script ##
 
@@ -26,7 +15,6 @@ post_install() {
   [ -d opt/lool/systemplate/etc ] || mkdir -p opt/lool/systemplate/etc
   rm -f opt/lool/systemplate/etc/resolv.conf
   ln -s /etc/resolv.conf opt/lool/systemplate/etc/
-  chown lool:lool opt/lool
 
   # Generate new SSL certificate instead of using the default
   # Replace trusted host and set admin username and password
@@ -53,6 +41,21 @@ pre_upgrade() {
 }
 
 post_upgrade() {
+
+  ## From Debian packages ##
+
+  setcap cap_fowner,cap_mknod,cap_sys_chroot=ep usr/bin/loolforkit || true
+  setcap cap_sys_admin=ep usr/bin/loolmount || true
+
+  systemd-sysusers collabora-online-server-nodocker.conf
+  chown lool:lool etc/loolwsd/loolwsd.xml
+  chmod 640       etc/loolwsd/loolwsd.xml
+
+  chown -R lool:lool opt/lool
+
+  fc-cache opt/collaboraoffice5.3/share/fonts/truetype
+  su lool --shell=/bin/sh -c "loolwsd-systemplate-setup /opt/lool/systemplate /opt/collaboraoffice5.3 >/dev/null 2>&1"
+
   systemctl daemon-reload
   if systemctl list-unit-files loolwsd.service | grep -q 'enabled$'; then
     systemctl start loolwsd.service