upstream v4.0.0-2

2 files changed, 69 insertions, 63 deletions

diff --git a/.SRCINFO b/.SRCINFO
index ce79ad1ec6aa..8a63cc2b0993 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
 pkgbase = collabora-online-server-nodocker
 	pkgdesc = Collabora CODE (LibreOffice Online) server for Nextcloud or ownCloud, without Docker
-	pkgver = 3.3.1
-	pkgrel = 3
+	pkgver = 4.0.0
+	pkgrel = 1
 	url = https://www.collaboraoffice.com/code/
 	install = install
 	arch = x86_64
@@ -21,13 +21,13 @@ pkgbase = collabora-online-server-nodocker
 	makedepends = xz
 	depends = cpio
 	depends = noto-fonts
+	depends = poco
 	depends = gcc-libs
 	depends = libcap
 	depends = pam
 	depends = libpng12
-	depends = poco
-	depends = openssl-1.0
 	depends = zlib
+	depends = openssl-1.0
 	depends = fontconfig
 	depends = libsm
 	depends = libxinerama
@@ -61,7 +61,7 @@ pkgbase = collabora-online-server-nodocker
 	optdepends = hyphen-pl: Polish hyphenation rules for LibreOffice
 	provides = libreoffice
 	provides = libreoffice-en-US
-	backup = opt/collaboraoffice5.3/share/psprint/psprint.conf
+	backup = opt/collaboraoffice6.0/share/psprint/psprint.conf
 	backup = etc/loolwsd/loolkitconfig.xcu
 	backup = etc/loolwsd/loolwsd.xml
 	source = https://www.collaboraoffice.com/repos/CollaboraOnline/CODE/Packages
@@ -70,50 +70,58 @@ pkgbase = collabora-online-server-nodocker
 	source = nginx.conf
 	source = sysusers
 	source = tmpfiles
-	source = https://www.collaboraoffice.com/repos/CollaboraOnline/CODE/loolwsd_3.3.1-3_amd64.deb
-	source = https://www.collaboraoffice.com/repos/CollaboraOnline/CODE/collaboraofficebasis5.3-calc_5.3.10.53-53_amd64.deb
-	source = https://www.collaboraoffice.com/repos/CollaboraOnline/CODE/collaboraofficebasis5.3-core_5.3.10.53-53_amd64.deb
-	source = https://www.collaboraoffice.com/repos/CollaboraOnline/CODE/collaboraoffice5.3-ure_5.3.10.53-53_amd64.deb
-	source = https://www.collaboraoffice.com/repos/CollaboraOnline/CODE/collaboraofficebasis5.3-graphicfilter_5.3.10.53-53_amd64.deb
-	source = https://www.collaboraoffice.com/repos/CollaboraOnline/CODE/collaboraofficebasis5.3-images_5.3.10.53-53_amd64.deb
-	source = https://www.collaboraoffice.com/repos/CollaboraOnline/CODE/collaboraofficebasis5.3-impress_5.3.10.53-53_amd64.deb
-	source = https://www.collaboraoffice.com/repos/CollaboraOnline/CODE/collaboraofficebasis5.3-ooofonts_5.3.10.53-53_amd64.deb
-	source = https://www.collaboraoffice.com/repos/CollaboraOnline/CODE/collaboraofficebasis5.3-writer_5.3.10.53-53_amd64.deb
-	source = https://www.collaboraoffice.com/repos/CollaboraOnline/CODE/collaboraoffice5.3_5.3.10.53-53_amd64.deb
-	source = https://www.collaboraoffice.com/repos/CollaboraOnline/CODE/collaboraofficebasis5.3-en-us_5.3.10.53-53_amd64.deb
-	source = https://www.collaboraoffice.com/repos/CollaboraOnline/CODE/collaboraofficebasis5.3-en-us-calc_5.3.10.53-53_amd64.deb
-	source = https://www.collaboraoffice.com/repos/CollaboraOnline/CODE/collaboraofficebasis5.3-en-us-res_5.3.10.53-53_amd64.deb
-	source = https://www.collaboraoffice.com/repos/CollaboraOnline/CODE/collaboraofficebasis5.3-noto-fonts_5.3.10.53-53_amd64.deb
-	source = https://www.collaboraoffice.com/repos/CollaboraOnline/CODE/collaboraofficebasis5.3-draw_5.3.10.53-53_amd64.deb
-	source = https://www.collaboraoffice.com/repos/CollaboraOnline/CODE/collaboraofficebasis5.3-extension-pdf-import_5.3.10.53-53_amd64.deb
-	source = https://www.collaboraoffice.com/repos/CollaboraOnline/CODE/collaboraofficebasis5.3-filter-data_5.3.10.53-53_amd64.deb
-	source = https://www.collaboraoffice.com/repos/CollaboraOnline/CODE/collaboraofficebasis5.3-ooolinguistic_5.3.10.53-53_amd64.deb
-	source = https://www.collaboraoffice.com/repos/CollaboraOnline/CODE/code-brand_3.3-1_all.deb
+	source = https://www.collaboraoffice.com/repos/CollaboraOnline/CODE/loolwsd_4.0.0-4_amd64.deb
+	source = https://www.collaboraoffice.com/repos/CollaboraOnline/CODE/libpococrypto60_1.9.0-1_amd64.deb
+	source = https://www.collaboraoffice.com/repos/CollaboraOnline/CODE/libpocofoundation60_1.9.0-1_amd64.deb
+	source = https://www.collaboraoffice.com/repos/CollaboraOnline/CODE/libpocojson60_1.9.0-1_amd64.deb
+	source = https://www.collaboraoffice.com/repos/CollaboraOnline/CODE/libpoconet60_1.9.0-1_amd64.deb
+	source = https://www.collaboraoffice.com/repos/CollaboraOnline/CODE/libpoconetssl60_1.9.0-1_amd64.deb
+	source = https://www.collaboraoffice.com/repos/CollaboraOnline/CODE/libpocoutil60_1.9.0-1_amd64.deb
+	source = https://www.collaboraoffice.com/repos/CollaboraOnline/CODE/libpocoxml60_1.9.0-1_amd64.deb
+	source = https://www.collaboraoffice.com/repos/CollaboraOnline/CODE/collaboraofficebasis6.0-calc_6.0.10.18-18_amd64.deb
+	source = https://www.collaboraoffice.com/repos/CollaboraOnline/CODE/collaboraofficebasis6.0-core_6.0.10.18-18_amd64.deb
+	source = https://www.collaboraoffice.com/repos/CollaboraOnline/CODE/collaboraoffice6.0-ure_6.0.10.18-18_amd64.deb
+	source = https://www.collaboraoffice.com/repos/CollaboraOnline/CODE/collaboraofficebasis6.0-graphicfilter_6.0.10.18-18_amd64.deb
+	source = https://www.collaboraoffice.com/repos/CollaboraOnline/CODE/collaboraofficebasis6.0-images_6.0.10.18-18_amd64.deb
+	source = https://www.collaboraoffice.com/repos/CollaboraOnline/CODE/collaboraofficebasis6.0-impress_6.0.10.18-18_amd64.deb
+	source = https://www.collaboraoffice.com/repos/CollaboraOnline/CODE/collaboraofficebasis6.0-ooofonts_6.0.10.18-18_amd64.deb
+	source = https://www.collaboraoffice.com/repos/CollaboraOnline/CODE/collaboraofficebasis6.0-writer_6.0.10.18-18_amd64.deb
+	source = https://www.collaboraoffice.com/repos/CollaboraOnline/CODE/collaboraoffice6.0_6.0.10.18-18_amd64.deb
+	source = https://www.collaboraoffice.com/repos/CollaboraOnline/CODE/collaboraofficebasis6.0-en-us_6.0.10.18-18_amd64.deb
+	source = https://www.collaboraoffice.com/repos/CollaboraOnline/CODE/collaboraofficebasis6.0-draw_6.0.10.18-18_amd64.deb
+	source = https://www.collaboraoffice.com/repos/CollaboraOnline/CODE/collaboraofficebasis6.0-extension-pdf-import_6.0.10.18-18_amd64.deb
+	source = https://www.collaboraoffice.com/repos/CollaboraOnline/CODE/collaboraofficebasis6.0-ooolinguistic_6.0.10.18-18_amd64.deb
+	source = https://www.collaboraoffice.com/repos/CollaboraOnline/CODE/collaboraoffice6.0-dict-en_6.0.10.18-18_amd64.deb
+	source = https://www.collaboraoffice.com/repos/CollaboraOnline/CODE/code-brand_4.0-1_all.deb
 	sha1sums = SKIP
 	sha1sums = e2fe8ff373261782d93c500bcfb87de1350d225a
 	sha1sums = 68ac242ad285eeeca07cb486c22dfbf3a658fe81
 	sha1sums = fe998836dbbd5c153de77d4ea877f25719dae304
 	sha1sums = 2d271f9493ea14c675af1bfa76f6b654569dd51f
 	sha1sums = f9c102a06b2582548f13121e78790237e2cb38e1
-	sha1sums = 2ca8c48b6230083e17526f40069927a79a7aaf82
-	sha1sums = 61172880dee538aaddce775fa87c220a6a11e365
-	sha1sums = 9851e2238800b0ed770d7844d3f9a87a5338d5c7
-	sha1sums = 09e585c8663858a47b7d8e3c63aa4b861ee9ae5a
-	sha1sums = dcf8ed243cbe7047aee8c0007a2ee6170511c6ef
-	sha1sums = 012467d373381de2ee7316ecae0c3eb0f8ab7d00
-	sha1sums = a4224f2c1e7ab31eb468e1e83e26b56db98976d0
-	sha1sums = 57902c91a463656d288871019b59b77458e6c4ad
-	sha1sums = 2c9a1148e514011fd4a5a5c462447104cd669409
-	sha1sums = ec141d17c285498e14d77f38aa0b1bc95fd4af2c
-	sha1sums = efb30b4a0c7b6d290d74526b187707c1d62f7555
-	sha1sums = fccf5636eac3d8913b0664530889997b822a26ab
-	sha1sums = dc1b9c62128e6d5ed792e1eec9ff475ac862a707
-	sha1sums = 3fb31cae026f649642ecdee0d4cd56cc127d7d47
-	sha1sums = 885724bf6b1eca83c56f46114aa16ff4d10a520b
-	sha1sums = fced499d5f8f5431814973aa8350b976e076e2fc
-	sha1sums = 320d6341027955c4691337f73ef13ca09aca53b5
-	sha1sums = 09a4bd20733c9f4a9d3c5eaeceba9471920d0be0
-	sha1sums = c56c8bd4e3ff16069951f152a7efe77f0ef2036c
+	sha1sums = f5d8a32868626bd0ecfc1f802c40e561fdc405db
+	sha1sums = db6802765a9b375d2dc9fb608b7b3a4330b3e3b2
+	sha1sums = ea8fd569bcf2de1e76a09ae6815d8d9d487bda02
+	sha1sums = 255b30039316a5aca69dda37802c77addd0c53be
+	sha1sums = 1ba0f47996fbf8debb2d0cc8ece6d84d663725ed
+	sha1sums = 0bca129a6d9b123cc38927b80c99a4f7417c4eea
+	sha1sums = ade47f887c83ebff13dccc661fcbd700629ba50f
+	sha1sums = a19808dc78a3977a4f4173eee238890ab8d1c684
+	sha1sums = 2608f7e60c592308627fa0e3e1ea7f7064672433
+	sha1sums = efa428964e0ca49308b8af89d5692842f9612edb
+	sha1sums = eb2cac057590c4aad2c318f93c80b7a149b07fe2
+	sha1sums = 5230b63a7db3174a4b3a31faed2cd32c67d82c11
+	sha1sums = 7f9f40b700f34add9af19b18cc40fe7be61a86de
+	sha1sums = 05870aff37ccd1827011c69184504dc066afd821
+	sha1sums = 96438311fb50ef416e6f801185cde28efe5c1bee
+	sha1sums = ef1feb6b9d7236acd58a27b640fcfce06451f44d
+	sha1sums = 9b39c79618321e53a8b7173d5444027b5dcc05f4
+	sha1sums = a34d545d74e6a8bf7b1eafc2fd7cfc493f4acdee
+	sha1sums = 916e2f28c40f678bd54804c27ac7099c49c9f628
+	sha1sums = d12992e94e1cebe32839331f2f7c05df12d9efa9
+	sha1sums = 6fa1afa9882e50de51ad2a986b62dc0142c0c884
+	sha1sums = a65a1c513d3bc2870b2192a8d151eca6e4770ca3
+	sha1sums = c79bc2410320d515515ad2c381e31aaea0de106b
 
 pkgname = collabora-online-server-nodocker
 
diff --git a/PKGBUILD b/PKGBUILD
index 5495ec250c3c..fe6b03fa1e3f 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,8 +1,8 @@
 # Maintainer: Yves G. <theYinYeti@yalis.fr>
 
 pkgname=collabora-online-server-nodocker
-pkgver=3.3.1
-pkgrel=3
+pkgver=4.0.0
+pkgrel=1
 pkgdesc="Collabora CODE (LibreOffice Online) server for Nextcloud or ownCloud, without Docker"
 arch=('x86_64')
 url="https://www.collaboraoffice.com/code/"
@@ -37,7 +37,7 @@ optdepends=(
   'hyphen-hu: Hungarian hyphenation rules for LibreOffice'
   'hyphen-pl: Polish hyphenation rules for LibreOffice'
 )
-depends=(cpio noto-fonts)
+depends=(cpio noto-fonts poco)
 source=(
   'https://www.collaboraoffice.com/repos/CollaboraOnline/CODE/Packages'
   install
@@ -57,7 +57,7 @@ sha1sums=(
 
 # From deb’s conffiles
 backup=(
-  opt/collaboraoffice5.3/share/psprint/psprint.conf
+  opt/collaboraoffice6.0/share/psprint/psprint.conf
   etc/loolwsd/loolkitconfig.xcu
   etc/loolwsd/loolwsd.xml
 )
@@ -101,13 +101,6 @@ _upstream_equiv='
   libpam0g            = pam
   libpcre3            = 
   libpng12-0          = libpng12
-  libpococrypto60     = poco
-  libpocofoundation60 = poco
-  libpocojson60       = poco
-  libpoconet60        = poco
-  libpoconetssl60     = poco
-  libpocoutil60       = poco
-  libpocoxml60        = poco
   libsm6              = libsm
   libssl1.0.0         = openssl-1.0
   libstdc++6          = gcc-libs
@@ -184,6 +177,9 @@ package() {
   # /lib is deprecated
   mv {lib,usr/lib}
 
+  # replace the embedded poco, which depends on unknown libpcre.so.3, with Arch poco
+  rm -f usr/lib/libPoco*
+
   # use systemd for user allocation
   install -Dm0644 "$srcdir"/sysusers usr/lib/sysusers.d/$pkgname.conf
 
@@ -192,6 +188,8 @@ package() {
   install -Dm0644 "$srcdir"/tmpfiles usr/lib/tmpfiles.d/$pkgname.conf
 
   # add dependency on systemd
+  mv usr/lib{/lib,}/systemd
+  rmdir usr/lib/lib
   sed -i '/^\[Unit\]/ a \
 After=systemd-tmpfiles-setup.service' usr/lib/systemd/system/loolwsd.service
 
@@ -200,23 +198,23 @@ After=systemd-tmpfiles-setup.service' usr/lib/systemd/system/loolwsd.service
 
   # actually provide libreoffice, without conflicting with Archlinux’ libreoffice
   mkdir -p usr/share/applications
-  sed -i 's#^Exec=collaboraoffice5.3#Exec=/opt/collaboraoffice5.3/program/soffice#' \
-    opt/collaboraoffice5.3/share/xdg/*
-  ls opt/collaboraoffice5.3/share/xdg \
+  sed -i 's#^Exec=collaboraoffice6.0#Exec=/opt/collaboraoffice6.0/program/soffice#' \
+    opt/collaboraoffice6.0/share/xdg/*
+  ls opt/collaboraoffice6.0/share/xdg \
   | while read f; do
     case "$f" in
     calc.desktop|draw.desktop|impress.desktop|writer.desktop)
-      sed -i "s#^Icon=.*#Icon=/opt/collaboraoffice5.3/share/config/wizard/web/images/${f%.desktop}.gif#" \
-        opt/collaboraoffice5.3/share/xdg/$f
+      sed -i "s#^Icon=.*#Icon=/opt/collaboraoffice6.0/share/config/wizard/web/images/${f%.desktop}.gif#" \
+        opt/collaboraoffice6.0/share/xdg/$f
       ;;
     *)
-      sed -i 's#^Icon=.*#Icon=/opt/collaboraoffice5.3/share/config/wizard/web/images/other.gif#' \
-        opt/collaboraoffice5.3/share/xdg/$f
+      sed -i 's#^Icon=.*#Icon=/opt/collaboraoffice6.0/share/config/wizard/web/images/other.gif#' \
+        opt/collaboraoffice6.0/share/xdg/$f
       ;;
     esac
-    mv opt/collaboraoffice5.3/share/xdg/"$f" usr/share/applications/"collaboraoffice-$f"
+    mv opt/collaboraoffice6.0/share/xdg/"$f" usr/share/applications/"collaboraoffice-$f"
   done
-  rm -rf opt/collaboraoffice5.3/share/xdg
+  rm -rf opt/collaboraoffice6.0/share/xdg
 
   # give some hints about usage
   install -Dm0644 "$srcdir"/nginx.conf usr/share/doc/loolwsd/example.nginx.conf