upstream v3.3.1-3 (/usr/bin/loolmount removed)

3 files changed, 40 insertions, 41 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 03484053c9a5..83548f1831ac 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 = 1
+	pkgrel = 2
 	url = https://www.collaboraoffice.com/code/
 	install = install
 	arch = x86_64
@@ -57,49 +57,49 @@ pkgbase = collabora-online-server-nodocker
 	source = nginx.conf
 	source = sysusers
 	source = tmpfiles
-	source = https://www.collaboraoffice.com/repos/CollaboraOnline/CODE/loolwsd_3.3.1-2_amd64.deb
-	source = https://www.collaboraoffice.com/repos/CollaboraOnline/CODE/collaboraofficebasis5.3-calc_5.3.10.52-52_amd64.deb
-	source = https://www.collaboraoffice.com/repos/CollaboraOnline/CODE/collaboraofficebasis5.3-core_5.3.10.52-52_amd64.deb
-	source = https://www.collaboraoffice.com/repos/CollaboraOnline/CODE/collaboraoffice5.3-ure_5.3.10.52-52_amd64.deb
-	source = https://www.collaboraoffice.com/repos/CollaboraOnline/CODE/collaboraofficebasis5.3-graphicfilter_5.3.10.52-52_amd64.deb
-	source = https://www.collaboraoffice.com/repos/CollaboraOnline/CODE/collaboraofficebasis5.3-images_5.3.10.52-52_amd64.deb
-	source = https://www.collaboraoffice.com/repos/CollaboraOnline/CODE/collaboraofficebasis5.3-impress_5.3.10.52-52_amd64.deb
-	source = https://www.collaboraoffice.com/repos/CollaboraOnline/CODE/collaboraofficebasis5.3-ooofonts_5.3.10.52-52_amd64.deb
-	source = https://www.collaboraoffice.com/repos/CollaboraOnline/CODE/collaboraofficebasis5.3-writer_5.3.10.52-52_amd64.deb
-	source = https://www.collaboraoffice.com/repos/CollaboraOnline/CODE/collaboraoffice5.3_5.3.10.52-52_amd64.deb
-	source = https://www.collaboraoffice.com/repos/CollaboraOnline/CODE/collaboraofficebasis5.3-en-us_5.3.10.52-52_amd64.deb
-	source = https://www.collaboraoffice.com/repos/CollaboraOnline/CODE/collaboraofficebasis5.3-en-us-calc_5.3.10.52-52_amd64.deb
-	source = https://www.collaboraoffice.com/repos/CollaboraOnline/CODE/collaboraofficebasis5.3-en-us-res_5.3.10.52-52_amd64.deb
-	source = https://www.collaboraoffice.com/repos/CollaboraOnline/CODE/collaboraofficebasis5.3-noto-fonts_5.3.10.52-52_amd64.deb
-	source = https://www.collaboraoffice.com/repos/CollaboraOnline/CODE/collaboraofficebasis5.3-draw_5.3.10.52-52_amd64.deb
-	source = https://www.collaboraoffice.com/repos/CollaboraOnline/CODE/collaboraofficebasis5.3-extension-pdf-import_5.3.10.52-52_amd64.deb
-	source = https://www.collaboraoffice.com/repos/CollaboraOnline/CODE/collaboraofficebasis5.3-filter-data_5.3.10.52-52_amd64.deb
-	source = https://www.collaboraoffice.com/repos/CollaboraOnline/CODE/collaboraofficebasis5.3-ooolinguistic_5.3.10.52-52_amd64.deb
+	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
 	sha1sums = SKIP
-	sha1sums = 3452d27a4c2dd0e6eee4c1c30302fb9b25eac9b8
+	sha1sums = e2fe8ff373261782d93c500bcfb87de1350d225a
 	sha1sums = 68ac242ad285eeeca07cb486c22dfbf3a658fe81
 	sha1sums = fe998836dbbd5c153de77d4ea877f25719dae304
 	sha1sums = 2d271f9493ea14c675af1bfa76f6b654569dd51f
 	sha1sums = f9c102a06b2582548f13121e78790237e2cb38e1
-	sha1sums = 13d097ba051d2cae8509ef35c59f74f9560eced4
-	sha1sums = d74d6f22dd56ca369170746066058bba8dde704c
-	sha1sums = 25b9562192f69271b69f506037da59e89f971ca2
-	sha1sums = e690d87ba1c33059636d3c3984292149194a2c97
-	sha1sums = 4e5f84536e17d83a545120659433ef77649f885d
-	sha1sums = bb7087926ce8ba1104e2f1e67eb6f547bb55f62f
-	sha1sums = 40a357eba9b9a840fbde7bccaad15f2258a771bd
-	sha1sums = 479aad9bf3eff41311cb594abda4ce7d86d1e3f4
-	sha1sums = fb6f116889dfaebf6ee521d772bb79f6eee85114
-	sha1sums = 6711f4c3d4cd9f91ce05641c62231d9d346b960e
-	sha1sums = 881bf12a8e84b7b09e42962cc51e40346f97fe0a
-	sha1sums = 5ab67c7e78f3fe6aaff7909c968f25c6bc22de61
-	sha1sums = 2b03d759edba822785b22e4d63914a4abf34b77c
-	sha1sums = e596af7cf6bd188ba0240a44a5923d156f5abdb0
-	sha1sums = 089731eb6de4dba5d57eb823d5d193e4ec7b2556
-	sha1sums = 5389fbcce9443e07c59df402ee72202f59294b0c
-	sha1sums = 656b3f54adf7e41ab498d6fa98c59d49677a6f1e
-	sha1sums = 6ecf62ec9e418b482b32b913078f16721cc4a693
+	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
 
 pkgname = collabora-online-server-nodocker
diff --git a/PKGBUILD b/PKGBUILD
index 1579b529fb55..3daed4c3230f 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -2,7 +2,7 @@
 
 pkgname=collabora-online-server-nodocker
 pkgver=3.3.1
-pkgrel=1
+pkgrel=2
 pkgdesc="Collabora CODE (LibreOffice Online) server for Nextcloud or ownCloud, without Docker"
 arch=('x86_64')
 url="https://www.collaboraoffice.com/code/"
@@ -47,7 +47,7 @@ source=(
 )
 sha1sums=(
   'SKIP'
-  '3452d27a4c2dd0e6eee4c1c30302fb9b25eac9b8'
+  'e2fe8ff373261782d93c500bcfb87de1350d225a'
   '68ac242ad285eeeca07cb486c22dfbf3a658fe81'
   'fe998836dbbd5c153de77d4ea877f25719dae304'
   '2d271f9493ea14c675af1bfa76f6b654569dd51f'
diff --git a/install b/install
index 9575d370dc2d..d407e72369fc 100644
--- a/install
+++ b/install
@@ -45,7 +45,6 @@ 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