upstream v3.2.2-1 + documentation

4 files changed, 113 insertions, 49 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 12154a79be4a..c1f0a6f72888 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
 pkgbase = collabora-online-server-nodocker
 	pkgdesc = Collabora CODE (LibreOffice Online) server for Nextcloud or ownCloud, without Docker
-	pkgver = 3.1.0
+	pkgver = 3.2.2
 	pkgrel = 1
 	url = https://www.collaboraoffice.com/code/
 	install = install
@@ -12,7 +12,7 @@ pkgbase = collabora-online-server-nodocker
 	depends = libcap
 	depends = pam
 	depends = libpng12
-	depends = poco178
+	depends = poco
 	depends = openssl-1.0
 	depends = zlib
 	depends = fontconfig
@@ -57,23 +57,24 @@ pkgbase = collabora-online-server-nodocker
 	source = nginx.conf
 	source = sysusers
 	source = tmpfiles
-	source = https://www.collaboraoffice.com/repos/CollaboraOnline/CODE/loolwsd_3.1.0-4_amd64.deb
-	source = https://www.collaboraoffice.com/repos/CollaboraOnline/CODE/collaboraofficebasis5.3-calc_5.3.10.43-43_amd64.deb
-	source = https://www.collaboraoffice.com/repos/CollaboraOnline/CODE/collaboraofficebasis5.3-core_5.3.10.43-43_amd64.deb
-	source = https://www.collaboraoffice.com/repos/CollaboraOnline/CODE/collaboraoffice5.3-ure_5.3.10.43-43_amd64.deb
-	source = https://www.collaboraoffice.com/repos/CollaboraOnline/CODE/collaboraofficebasis5.3-graphicfilter_5.3.10.43-43_amd64.deb
-	source = https://www.collaboraoffice.com/repos/CollaboraOnline/CODE/collaboraofficebasis5.3-images_5.3.10.43-43_amd64.deb
-	source = https://www.collaboraoffice.com/repos/CollaboraOnline/CODE/collaboraofficebasis5.3-impress_5.3.10.43-43_amd64.deb
-	source = https://www.collaboraoffice.com/repos/CollaboraOnline/CODE/collaboraofficebasis5.3-ooofonts_5.3.10.43-43_amd64.deb
-	source = https://www.collaboraoffice.com/repos/CollaboraOnline/CODE/collaboraofficebasis5.3-writer_5.3.10.43-43_amd64.deb
-	source = https://www.collaboraoffice.com/repos/CollaboraOnline/CODE/collaboraoffice5.3_5.3.10.43-43_amd64.deb
-	source = https://www.collaboraoffice.com/repos/CollaboraOnline/CODE/collaboraofficebasis5.3-en-us_5.3.10.43-43_amd64.deb
-	source = https://www.collaboraoffice.com/repos/CollaboraOnline/CODE/collaboraofficebasis5.3-en-us-calc_5.3.10.43-43_amd64.deb
-	source = https://www.collaboraoffice.com/repos/CollaboraOnline/CODE/collaboraofficebasis5.3-en-us-res_5.3.10.43-43_amd64.deb
-	source = https://www.collaboraoffice.com/repos/CollaboraOnline/CODE/collaboraofficebasis5.3-noto-fonts_5.3.10.43-43_amd64.deb
-	source = https://www.collaboraoffice.com/repos/CollaboraOnline/CODE/collaboraofficebasis5.3-draw_5.3.10.43-43_amd64.deb
-	source = https://www.collaboraoffice.com/repos/CollaboraOnline/CODE/collaboraofficebasis5.3-extension-pdf-import_5.3.10.43-43_amd64.deb
-	source = https://www.collaboraoffice.com/repos/CollaboraOnline/CODE/collaboraofficebasis5.3-filter-data_5.3.10.43-43_amd64.deb
+	source = https://www.collaboraoffice.com/repos/CollaboraOnline/CODE/loolwsd_3.2.2-1_amd64.deb
+	source = https://www.collaboraoffice.com/repos/CollaboraOnline/CODE/collaboraofficebasis5.3-calc_5.3.10.46-46_amd64.deb
+	source = https://www.collaboraoffice.com/repos/CollaboraOnline/CODE/collaboraofficebasis5.3-core_5.3.10.46-46_amd64.deb
+	source = https://www.collaboraoffice.com/repos/CollaboraOnline/CODE/collaboraoffice5.3-ure_5.3.10.46-46_amd64.deb
+	source = https://www.collaboraoffice.com/repos/CollaboraOnline/CODE/collaboraofficebasis5.3-graphicfilter_5.3.10.46-46_amd64.deb
+	source = https://www.collaboraoffice.com/repos/CollaboraOnline/CODE/collaboraofficebasis5.3-images_5.3.10.46-46_amd64.deb
+	source = https://www.collaboraoffice.com/repos/CollaboraOnline/CODE/collaboraofficebasis5.3-impress_5.3.10.46-46_amd64.deb
+	source = https://www.collaboraoffice.com/repos/CollaboraOnline/CODE/collaboraofficebasis5.3-ooofonts_5.3.10.46-46_amd64.deb
+	source = https://www.collaboraoffice.com/repos/CollaboraOnline/CODE/collaboraofficebasis5.3-writer_5.3.10.46-46_amd64.deb
+	source = https://www.collaboraoffice.com/repos/CollaboraOnline/CODE/collaboraoffice5.3_5.3.10.46-46_amd64.deb
+	source = https://www.collaboraoffice.com/repos/CollaboraOnline/CODE/collaboraofficebasis5.3-en-us_5.3.10.46-46_amd64.deb
+	source = https://www.collaboraoffice.com/repos/CollaboraOnline/CODE/collaboraofficebasis5.3-en-us-calc_5.3.10.46-46_amd64.deb
+	source = https://www.collaboraoffice.com/repos/CollaboraOnline/CODE/collaboraofficebasis5.3-en-us-res_5.3.10.46-46_amd64.deb
+	source = https://www.collaboraoffice.com/repos/CollaboraOnline/CODE/collaboraofficebasis5.3-noto-fonts_5.3.10.46-46_amd64.deb
+	source = https://www.collaboraoffice.com/repos/CollaboraOnline/CODE/collaboraofficebasis5.3-draw_5.3.10.46-46_amd64.deb
+	source = https://www.collaboraoffice.com/repos/CollaboraOnline/CODE/collaboraofficebasis5.3-extension-pdf-import_5.3.10.46-46_amd64.deb
+	source = https://www.collaboraoffice.com/repos/CollaboraOnline/CODE/collaboraofficebasis5.3-filter-data_5.3.10.46-46_amd64.deb
+	source = https://www.collaboraoffice.com/repos/CollaboraOnline/CODE/collaboraofficebasis5.3-ooolinguistic_5.3.10.46-46_amd64.deb
 	source = https://www.collaboraoffice.com/repos/CollaboraOnline/CODE/code-brand_3.1-1_all.deb
 	sha1sums = SKIP
 	sha1sums = 3452d27a4c2dd0e6eee4c1c30302fb9b25eac9b8
@@ -81,23 +82,24 @@ pkgbase = collabora-online-server-nodocker
 	sha1sums = fe998836dbbd5c153de77d4ea877f25719dae304
 	sha1sums = 2d271f9493ea14c675af1bfa76f6b654569dd51f
 	sha1sums = f9c102a06b2582548f13121e78790237e2cb38e1
-	sha1sums = f4aa1f481a4f92dc8911843f778417533471b2ac
-	sha1sums = 8c3b76e9c440a87692039c5c9024183e68b180b0
-	sha1sums = e74ab278a386fe0f8fdcd6d78a489264376dcdc2
-	sha1sums = 9390ee41112b53115118573a4db6ad4ededf9232
-	sha1sums = 0255caf64b8ac0e8a1e1ead7ec5291815f30a640
-	sha1sums = 1b31f9f5dfd09d3ce2be57e0d7632923e14a1029
-	sha1sums = 9a23086da10d894eb2eed35734fcf21d7913664d
-	sha1sums = 29c9f34c9c5b71b70ff945b49302b0a39e7b2fcb
-	sha1sums = 8f05307543a1dd1e30cb2d11b8f455c65f467dcb
-	sha1sums = 5622d040666f7981d896f8a3c02924daba0d83c2
-	sha1sums = 200ccfbfb0141acb37bae58d0f759b7b6bd513fd
-	sha1sums = 2c9925354344c2989021a8bdb026f28db69959d7
-	sha1sums = 834bfd4aaa86a6605171727e66f2db8a609fc36f
-	sha1sums = e6e191a08831e67f55c8edbc7283ad47764192f8
-	sha1sums = 96cc658684f4ebb7ccbfd7c386fb125850ec68b6
-	sha1sums = 6fe33944d57d9a22a8418c7a1d48df4fdfe1d5cd
-	sha1sums = a552d9e35e5afdbbae654d639222ecead15a7fc3
+	sha1sums = c3fc313751181601891b9b9a97bf5006ae2ba252
+	sha1sums = 95b9d6f2fdabca4bf4d8eec0971c4d32361bf322
+	sha1sums = 2c6b26ea524eabf8a8fb409664a3445aef75ba19
+	sha1sums = f00ba3e577868c541ce3c2618f87e55078472c8c
+	sha1sums = 0d7408d85b82f930104ba9680a56987b5332f3e7
+	sha1sums = 71854465f3d528e4c0f6bd31f2bb2961b0777245
+	sha1sums = 438cffc61057db019b89bea6e2160c6434889bb6
+	sha1sums = 3a51689eaebcea1c446199911c1ae2d89bfb9380
+	sha1sums = 7b3b93468ce892bac49d75b3d6b1f67f91096123
+	sha1sums = 6f97811040122e30e7b262b2e1edb6d7ea46266b
+	sha1sums = 17b6c1034673cce6a3ca89884947eb2ca4dc308c
+	sha1sums = 207ec6b3a14a819e2932f6359d4b978f939b2d92
+	sha1sums = 895a6d5b72398a62454f9203a67083cfef762ff6
+	sha1sums = d7023a2029f086a4f45e44aaf0432a536b5adff2
+	sha1sums = f3ebbb9b018a229893d3fd179dae0cd858779342
+	sha1sums = 50d0957502b756cf87b70ca6990868ef90989003
+	sha1sums = 6d7e9d6f4cb68bb753ad85cc5b86a2f0df73dc1b
+	sha1sums = ffe1139392596a33312ca25780065bbf962fd463
 	sha1sums = 94796bcb2d9d510704d006966a8f3784ecacb3c3
 
 pkgname = collabora-online-server-nodocker
diff --git a/PKGBUILD b/PKGBUILD
index 4fd6c5bb3dfc..b8d1f068ddc7 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,14 +1,15 @@
 # Maintainer: Yves G. <theYinYeti@yalis.fr>
 
 pkgname=collabora-online-server-nodocker
-pkgver=3.1.0
+pkgver=3.2.2
 pkgrel=1
 pkgdesc="Collabora CODE (LibreOffice Online) server for Nextcloud or ownCloud, without Docker"
 arch=('x86_64')
 url="https://www.collaboraoffice.com/code/"
-# see also: https://github.com/sfoxdev/docker-collabora-code
 license=('MPL')
 provides=('libreoffice' 'libreoffice-en-US')
+
+# From official Archlinux’ LibreOffice:
 optdepends=(
   'hunspell-de: German hunspell dictionaries for LibreOffice'
   'hunspell-en: English (US, UK, etc.) hunspell dictionaries for LibreOffice'
@@ -53,17 +54,37 @@ sha1sums=(
   'f9c102a06b2582548f13121e78790237e2cb38e1'
 )
 
-# From Debian’s conffiles
+# From deb’s conffiles
 backup=(
   opt/collaboraoffice5.3/share/psprint/psprint.conf
   etc/loolwsd/loolkitconfig.xcu
   etc/loolwsd/loolwsd.xml
 )
 
-# From Debian’s pre/post scripts
+# From deb’s pre/post scripts
 install=install
 
-_upstream_deps='loolwsd code-brand collaboraofficebasis5.3-calc collaboraofficebasis5.3-core collaboraofficebasis5.3-extension-pdf-import collaboraofficebasis5.3-filter-data collaboraofficebasis5.3-graphicfilter collaboraofficebasis5.3-images collaboraofficebasis5.3-impress collaboraofficebasis5.3-ooofonts collaboraofficebasis5.3-writer'
+# From Dockerfile (https://github.com/CollaboraOnline/Docker-CODE), minus i18n files
+_upstream_deps='loolwsd code-brand'
+
+# DEBIAN–ARCHLINUX EQUIVALENCES
+#
+# In case of a new upstream release:
+#
+# 1. Move all lines from $_upstream_equiv to $_upstream_equiv_OLD.
+#
+# 2. Run `makepkg -s` iteratively:
+#  * Each time a dependency is missing, move it back from $_upstream_equiv_OLD to $_upstream_equiv.
+#  * If a dependency is new, add a new line in $_upstream_equiv with nothing after the “=” sign.
+#
+# 3. When the package is done, in a terminal run: ./missing-deps.sh
+#
+# 4. For each “not found” line:
+#  * If the missing file should be provided by a new dependency in $_upstream_equiv,
+#    then put after the “=” sign the name of an Archlinux package that provides this file;
+#    you may need to create the package if it does not exist (usually old versions).
+#  * Else the missing file is probably expected to be present on any Debian/Ubuntu system;
+#    thus add the missing dependency in the $depends array.
 _upstream_equiv='
   adduser             = 
   cpio                = 
@@ -73,17 +94,19 @@ _upstream_equiv='
   libcap2             = libcap
   libcap2-bin         = libcap
   libcups2            = libcups
+  libexpat1           = 
   libgcc1             = gcc-libs
   libgl1-mesa-glx     = mesa-libgl
   libpam0g            = pam
+  libpcre3            = 
   libpng12-0          = libpng12
-  libpococrypto48     = poco178
-  libpocofoundation48 = poco178
-  libpocojson48       = poco178
-  libpoconet48        = poco178
-  libpoconetssl48     = poco178
-  libpocoutil48       = poco178
-  libpocoxml48        = poco178
+  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
@@ -93,6 +116,8 @@ _upstream_equiv='
   libxrender1         = libxrender
   zlib1g              = zlib
 '
+_upstream_equiv_OLD='
+'
 _upstream_handle_dep() {
   local dep="$1"
   local eqv="$(grep "^[[:blank:]]*$(sed 's/[.]/\\\0/g' <<<"$dep")[[:blank:]]*=" <<<"$_upstream_equiv")"
@@ -104,7 +129,12 @@ _upstream_handle_dep() {
     for seen in "${depends[@]}"; do
       [ "$seen" == "$dep" ] && return
     done
-    depends[${#depends[*]}]="$dep"
+    if [[ "$dep" =~ :// ]]; then
+      source[${#source[*]}]="$dep"
+      sha1sums[${#sha1sums[*]}]="SKIP"
+    else
+      depends[${#depends[*]}]="$dep"
+    fi
   elif [ -n "$meta" ]; then
     dep="$(sed -rn "s#^Filename:[[:blank:]]*(.*/)?#${source[0]%Packages}#p" <<<"$meta")"
     for seen in "${source[@]}"; do
diff --git a/graphviz-deps.sh b/graphviz-deps.sh
new file mode 100755
index 000000000000..9292074b8f83
--- /dev/null
+++ b/graphviz-deps.sh
@@ -0,0 +1,28 @@
+#!/bin/bash
+
+{
+	printf 'digraph deps {\noverlap=scale;\n'
+	sed -r '
+		s/\([^()]*\)//g
+		s/(collaboraofficebasis5.3)-[a-z]{2,3}(-[a-z]+)*-(calc|res|writer)/\1-LANG-\3/g
+		s/(collaboraoffice5.3-dict|collaboraofficebasis5.3)-[a-z]{2,3}(-[a-z]+)*($|[^-a-z])/\1-LANG\3/g
+	' Packages \
+	| tr -d ' ' | tr '.+-' _ \
+	| gawk -F: '
+		function pr() {
+			if (p ~ /_dev$/ || p ~ /_dbgsym/) return
+			split(d, a, ",")
+			for (i in a) if (a[i] != "") printf("%s -> %s;\n", p, a[i])
+			p=""
+			d=""
+		}
+		/^Package/ { p=$2 }
+		/^Depends/ { d=$2 }
+		/^$/ { pr() }
+		END  { pr() }
+	' | sort -u
+	echo '}'
+} >deps.dot
+dot -Tpdf deps.dot >dot.pdf
+twopi -Tpdf deps.dot >twopi.pdf
+circo -Tpdf deps.dot >circo.pdf
diff --git a/missing-deps.sh b/missing-deps.sh
new file mode 100755
index 000000000000..70ef05167916
--- /dev/null
+++ b/missing-deps.sh
@@ -0,0 +1,4 @@
+#!/bin/bash
+
+cd "$(dirname "$0")/pkg/collabora-online-server-nodocker"
+find * -type f -exec bash -c 'file "$0" | grep -qF " ELF " && { nf="$(LC_ALL=C LANG=C ldd "$0" | grep -F "not found")"; [ -n "$nf" ] && printf "=== %s ===\\n%s\\n" "$0" "$nf"; }' {} \;