upstream v3.0.0

2 files changed, 43 insertions, 43 deletions

diff --git a/.SRCINFO b/.SRCINFO
index d2b3a3a1eafa..09c1669c9904 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 = 2.1.5
-	pkgrel = 2
+	pkgver = 3.0.0
+	pkgrel = 1
 	url = https://www.collaboraoffice.com/code/
 	install = install
 	arch = x86_64
@@ -12,6 +12,7 @@ pkgbase = collabora-online-server-nodocker
 	depends = libpng12
 	depends = poco178
 	depends = openssl-1.0
+	depends = zlib
 	depends = fontconfig
 	depends = libsm
 	depends = unixodbc
@@ -55,48 +56,48 @@ pkgbase = collabora-online-server-nodocker
 	source = nginx.conf
 	source = sysusers
 	source = tmpfiles
-	source = https://www.collaboraoffice.com/repos/CollaboraOnline/CODE/loolwsd_2.1.5-5_amd64.deb
-	source = https://www.collaboraoffice.com/repos/CollaboraOnline/CODE/collaboraofficebasis5.3-calc_5.3.10.32-32_amd64.deb
-	source = https://www.collaboraoffice.com/repos/CollaboraOnline/CODE/collaboraofficebasis5.3-core_5.3.10.32-32_amd64.deb
-	source = https://www.collaboraoffice.com/repos/CollaboraOnline/CODE/collaboraoffice5.3-ure_5.3.10.32-32_amd64.deb
-	source = https://www.collaboraoffice.com/repos/CollaboraOnline/CODE/collaboraofficebasis5.3-graphicfilter_5.3.10.32-32_amd64.deb
-	source = https://www.collaboraoffice.com/repos/CollaboraOnline/CODE/collaboraofficebasis5.3-images_5.3.10.32-32_amd64.deb
-	source = https://www.collaboraoffice.com/repos/CollaboraOnline/CODE/collaboraofficebasis5.3-impress_5.3.10.32-32_amd64.deb
-	source = https://www.collaboraoffice.com/repos/CollaboraOnline/CODE/collaboraofficebasis5.3-ooofonts_5.3.10.32-32_amd64.deb
-	source = https://www.collaboraoffice.com/repos/CollaboraOnline/CODE/collaboraofficebasis5.3-writer_5.3.10.32-32_amd64.deb
-	source = https://www.collaboraoffice.com/repos/CollaboraOnline/CODE/collaboraoffice5.3_5.3.10.32-32_amd64.deb
-	source = https://www.collaboraoffice.com/repos/CollaboraOnline/CODE/collaboraofficebasis5.3-en-us_5.3.10.32-32_amd64.deb
-	source = https://www.collaboraoffice.com/repos/CollaboraOnline/CODE/collaboraofficebasis5.3-en-us-calc_5.3.10.32-32_amd64.deb
-	source = https://www.collaboraoffice.com/repos/CollaboraOnline/CODE/collaboraofficebasis5.3-en-us-res_5.3.10.32-32_amd64.deb
-	source = https://www.collaboraoffice.com/repos/CollaboraOnline/CODE/collaboraofficebasis5.3-noto-fonts_5.3.10.32-32_amd64.deb
-	source = https://www.collaboraoffice.com/repos/CollaboraOnline/CODE/collaboraofficebasis5.3-draw_5.3.10.32-32_amd64.deb
-	source = https://www.collaboraoffice.com/repos/CollaboraOnline/CODE/collaboraofficebasis5.3-extension-pdf-import_5.3.10.32-32_amd64.deb
-	source = https://www.collaboraoffice.com/repos/CollaboraOnline/CODE/collaboraofficebasis5.3-filter-data_5.3.10.32-32_amd64.deb
-	source = https://www.collaboraoffice.com/repos/CollaboraOnline/CODE/code-brand_2.0.2-3_all.deb
+	source = https://www.collaboraoffice.com/repos/CollaboraOnline/CODE/loolwsd_3.0.0-4_amd64.deb
+	source = https://www.collaboraoffice.com/repos/CollaboraOnline/CODE/collaboraofficebasis5.3-calc_5.3.10.36-36_amd64.deb
+	source = https://www.collaboraoffice.com/repos/CollaboraOnline/CODE/collaboraofficebasis5.3-core_5.3.10.36-36_amd64.deb
+	source = https://www.collaboraoffice.com/repos/CollaboraOnline/CODE/collaboraoffice5.3-ure_5.3.10.36-36_amd64.deb
+	source = https://www.collaboraoffice.com/repos/CollaboraOnline/CODE/collaboraofficebasis5.3-graphicfilter_5.3.10.36-36_amd64.deb
+	source = https://www.collaboraoffice.com/repos/CollaboraOnline/CODE/collaboraofficebasis5.3-images_5.3.10.36-36_amd64.deb
+	source = https://www.collaboraoffice.com/repos/CollaboraOnline/CODE/collaboraofficebasis5.3-impress_5.3.10.36-36_amd64.deb
+	source = https://www.collaboraoffice.com/repos/CollaboraOnline/CODE/collaboraofficebasis5.3-ooofonts_5.3.10.36-36_amd64.deb
+	source = https://www.collaboraoffice.com/repos/CollaboraOnline/CODE/collaboraofficebasis5.3-writer_5.3.10.36-36_amd64.deb
+	source = https://www.collaboraoffice.com/repos/CollaboraOnline/CODE/collaboraoffice5.3_5.3.10.36-36_amd64.deb
+	source = https://www.collaboraoffice.com/repos/CollaboraOnline/CODE/collaboraofficebasis5.3-en-us_5.3.10.36-36_amd64.deb
+	source = https://www.collaboraoffice.com/repos/CollaboraOnline/CODE/collaboraofficebasis5.3-en-us-calc_5.3.10.36-36_amd64.deb
+	source = https://www.collaboraoffice.com/repos/CollaboraOnline/CODE/collaboraofficebasis5.3-en-us-res_5.3.10.36-36_amd64.deb
+	source = https://www.collaboraoffice.com/repos/CollaboraOnline/CODE/collaboraofficebasis5.3-noto-fonts_5.3.10.36-36_amd64.deb
+	source = https://www.collaboraoffice.com/repos/CollaboraOnline/CODE/collaboraofficebasis5.3-draw_5.3.10.36-36_amd64.deb
+	source = https://www.collaboraoffice.com/repos/CollaboraOnline/CODE/collaboraofficebasis5.3-extension-pdf-import_5.3.10.36-36_amd64.deb
+	source = https://www.collaboraoffice.com/repos/CollaboraOnline/CODE/collaboraofficebasis5.3-filter-data_5.3.10.36-36_amd64.deb
+	source = https://www.collaboraoffice.com/repos/CollaboraOnline/CODE/code-brand_3.0-2_all.deb
 	sha1sums = SKIP
 	sha1sums = 3452d27a4c2dd0e6eee4c1c30302fb9b25eac9b8
 	sha1sums = 68ac242ad285eeeca07cb486c22dfbf3a658fe81
 	sha1sums = fe998836dbbd5c153de77d4ea877f25719dae304
 	sha1sums = 2d271f9493ea14c675af1bfa76f6b654569dd51f
 	sha1sums = f9c102a06b2582548f13121e78790237e2cb38e1
-	sha1sums = c7efc31311549001c92094de382f1fdce5d2a6af
-	sha1sums = 226e04a39609d627f37c60924ffdcd4af575a628
-	sha1sums = 332a95742b2fe0f6eca18e5e1f0ac7ad88487b6b
-	sha1sums = a9b74ff574189b82eec85270467b819fbce1eb2c
-	sha1sums = 6b78ade545a5f993949ceceae9ce86861234e07f
-	sha1sums = b558be06b53319d33d6ff7ec64b5e2c9b25efe60
-	sha1sums = 0b65e9a55e86133e2853c81461bed3e63390537b
-	sha1sums = cb5eef96881e3aea6a812b3334d62629ced27c1a
-	sha1sums = 60e663e386b38f0207749bbb6fd3132d84717b3b
-	sha1sums = 5922acff55b38c23346e7df6a8fd197d97a7693f
-	sha1sums = ed56dc1fc0721ad6b8a2658d70d133fcb4952a87
-	sha1sums = 80feaf88bf61c7d11814dfde5e80adec420c106b
-	sha1sums = a08fb6e10386c7e0872749153618ed588a929de7
-	sha1sums = 7b4ee21690123e388cbeba2b6e2e9f0b58a1e6d7
-	sha1sums = 2c25e5fb08ab3a5314e0162c4a233a862375c5a3
-	sha1sums = 6178eb3e39896860df7fd079a52956b928976535
-	sha1sums = 8329427a16756156698dd4f600b0684ebf1ef527
-	sha1sums = cb16065c67fb0697d63f9fd6c77fda673f9e5397
+	sha1sums = b06d48fad289ba47de26a223f84140d4e207a7e2
+	sha1sums = cb8d78bfac9fed012b91c023bd44d34db2c425c7
+	sha1sums = 5da843f577abaf3f021bdbcd325672c94c484711
+	sha1sums = 91aa5f175d9bf1eaa3ab2f76193fb882360e441d
+	sha1sums = 4a234078ccea11d538f290f479c34c734092bd2c
+	sha1sums = 4ee5a4f39fdeb95b5880abc479803f8086519f4b
+	sha1sums = acf31c15e2cd66511c244806b4e12ab1b5bc99fc
+	sha1sums = 2cdb9377188fa2985dfa0594728a27b0cdd25030
+	sha1sums = c0edb3374f8a9bdd23a1c8def710355ddfa18f40
+	sha1sums = 6272afc75a653744c1c4ec840e0d6a8f5a575963
+	sha1sums = 60715b85f4bb3617852c76d6e273d6cd1ccc95a8
+	sha1sums = 9bc1ad900014a975023c9b090202d9549d14891f
+	sha1sums = c7d3f59f2b935ffd5f08b660dc14c21af13f304a
+	sha1sums = 2808f9acf8c910975294c066370d710cb86bebb3
+	sha1sums = 7c23679da454e44e35b8ebaa869c02749c8fca1e
+	sha1sums = ebe293244eabb16e8ecbf010042edbfd5de00b0c
+	sha1sums = 7f9829685514fb4fc4cb47eb6bee79944f446f61
+	sha1sums = 1e4b0c8226ad560bcc90910e80154f0507b66304
 
 pkgname = collabora-online-server-nodocker
 
diff --git a/PKGBUILD b/PKGBUILD
index 06a9423cd147..b584c4c65593 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,8 +1,8 @@
 # Maintainer: Yves G. <theYinYeti@yalis.fr>
 
 pkgname=collabora-online-server-nodocker
-pkgver=2.1.5
-pkgrel=2
+pkgver=3.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/"
@@ -90,6 +90,7 @@ _upstream_equiv='
   libssl1.0.0         = openssl-1.0
   libstdc++6          = gcc-libs
   libxinerama1        = libxinerama
+  zlib1g              = zlib
 '
 _upstream_handle_dep() {
   local dep="$1"
@@ -146,13 +147,11 @@ package() {
     *) echo "Unknown file format: $data" >&2; exit 1 ;;
     esac
   done
+  chown -R $(id -nu):$(id -ng) .
 
   # /lib is deprecated
   mv {lib,usr/lib}
 
-  # replace the too-generic “code-brand” name
-  mv usr/share/doc/code-brand usr/share/doc/lool-code-brand
-
   # use systemd for user allocation
   install -Dm0644 "$srcdir"/sysusers usr/lib/sysusers.d/$pkgname.conf