upstream v4.0.5-2

4 files changed, 75 insertions, 40 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 52eb7314f27d..0706f134d2f5 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 = 4.0.4
+	pkgver = 4.0.5
 	pkgrel = 1
 	url = https://www.collaboraoffice.com/code/
 	install = install
@@ -23,9 +23,9 @@ pkgbase = collabora-online-server-nodocker
 	depends = libcap
 	depends = pam
 	depends = libpng12
-	depends = poco
-	depends = openssl-1.0
+	depends = pcre
 	depends = zlib
+	depends = openssl-1.0
 	depends = libsm
 	depends = libxinerama
 	depends = libxrender
@@ -36,6 +36,8 @@ pkgbase = collabora-online-server-nodocker
 	depends = expat
 	depends = fontconfig
 	depends = cpio
+	optdepends = hunspell: Use with language-specific hunspell dictionaries for LibreOffice spell-check
+	optdepends = hyphen: Use with language-specific hyphen rules for LibreOffice hyphenation
 	provides = libreoffice
 	provides = libreoffice-en-US
 	backup = opt/collaboraoffice6.0/share/psprint/psprint.conf
@@ -49,40 +51,54 @@ pkgbase = collabora-online-server-nodocker
 	source = mkcert_example.sh
 	source = sysusers
 	source = tmpfiles
-	source = https://www.collaboraoffice.com/repos/CollaboraOnline/CODE/loolwsd_4.0.4-3_amd64.deb
-	source = https://www.collaboraoffice.com/repos/CollaboraOnline/CODE/collaboraofficebasis6.0-calc_6.0.10.29-29_amd64.deb
-	source = https://www.collaboraoffice.com/repos/CollaboraOnline/CODE/collaboraofficebasis6.0-core_6.0.10.29-29_amd64.deb
-	source = https://www.collaboraoffice.com/repos/CollaboraOnline/CODE/collaboraoffice6.0-ure_6.0.10.29-29_amd64.deb
-	source = https://www.collaboraoffice.com/repos/CollaboraOnline/CODE/collaboraofficebasis6.0-graphicfilter_6.0.10.29-29_amd64.deb
-	source = https://www.collaboraoffice.com/repos/CollaboraOnline/CODE/collaboraofficebasis6.0-images_6.0.10.29-29_amd64.deb
-	source = https://www.collaboraoffice.com/repos/CollaboraOnline/CODE/collaboraofficebasis6.0-impress_6.0.10.29-29_amd64.deb
-	source = https://www.collaboraoffice.com/repos/CollaboraOnline/CODE/collaboraofficebasis6.0-ooofonts_6.0.10.29-29_amd64.deb
-	source = https://www.collaboraoffice.com/repos/CollaboraOnline/CODE/collaboraofficebasis6.0-writer_6.0.10.29-29_amd64.deb
-	source = https://www.collaboraoffice.com/repos/CollaboraOnline/CODE/collaboraoffice6.0_6.0.10.29-29_amd64.deb
-	source = https://www.collaboraoffice.com/repos/CollaboraOnline/CODE/collaboraofficebasis6.0-en-us_6.0.10.29-29_amd64.deb
-	source = https://www.collaboraoffice.com/repos/CollaboraOnline/CODE/collaboraofficebasis6.0-draw_6.0.10.29-29_amd64.deb
-	source = https://www.collaboraoffice.com/repos/CollaboraOnline/CODE/collaboraofficebasis6.0-extension-pdf-import_6.0.10.29-29_amd64.deb
-	source = https://www.collaboraoffice.com/repos/CollaboraOnline/CODE/collaboraofficebasis6.0-ooolinguistic_6.0.10.29-29_amd64.deb
+	source = https://www.collaboraoffice.com/repos/CollaboraOnline/CODE/loolwsd_4.0.5-2_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.29-292_amd64.deb
+	source = https://www.collaboraoffice.com/repos/CollaboraOnline/CODE/collaboraofficebasis6.0-core_6.0.10.29-292_amd64.deb
+	source = https://www.collaboraoffice.com/repos/CollaboraOnline/CODE/collaboraoffice6.0-ure_6.0.10.29-292_amd64.deb
+	source = https://www.collaboraoffice.com/repos/CollaboraOnline/CODE/collaboraofficebasis6.0-graphicfilter_6.0.10.29-292_amd64.deb
+	source = https://www.collaboraoffice.com/repos/CollaboraOnline/CODE/collaboraofficebasis6.0-images_6.0.10.29-292_amd64.deb
+	source = https://www.collaboraoffice.com/repos/CollaboraOnline/CODE/collaboraofficebasis6.0-impress_6.0.10.29-292_amd64.deb
+	source = https://www.collaboraoffice.com/repos/CollaboraOnline/CODE/collaboraofficebasis6.0-ooofonts_6.0.10.29-292_amd64.deb
+	source = https://www.collaboraoffice.com/repos/CollaboraOnline/CODE/collaboraofficebasis6.0-writer_6.0.10.29-292_amd64.deb
+	source = https://www.collaboraoffice.com/repos/CollaboraOnline/CODE/collaboraoffice6.0_6.0.10.29-292_amd64.deb
+	source = https://www.collaboraoffice.com/repos/CollaboraOnline/CODE/collaboraofficebasis6.0-en-us_6.0.10.29-292_amd64.deb
+	source = https://www.collaboraoffice.com/repos/CollaboraOnline/CODE/collaboraofficebasis6.0-draw_6.0.10.29-292_amd64.deb
+	source = https://www.collaboraoffice.com/repos/CollaboraOnline/CODE/collaboraofficebasis6.0-extension-pdf-import_6.0.10.29-292_amd64.deb
+	source = https://www.collaboraoffice.com/repos/CollaboraOnline/CODE/collaboraofficebasis6.0-ooolinguistic_6.0.10.29-292_amd64.deb
 	source = https://www.collaboraoffice.com/repos/CollaboraOnline/CODE/code-brand_4.0-2_all.deb
 	sha1sums = SKIP
 	sha1sums = 3b7c52a40becb96ed9698e624a23cadfe1250a73
 	sha1sums = 132642655c8684a434ad2a43f1661020218cdfde
 	sha1sums = 2d271f9493ea14c675af1bfa76f6b654569dd51f
 	sha1sums = f9c102a06b2582548f13121e78790237e2cb38e1
-	sha1sums = 746729e20eb09f4cba869d27907587dd8976648a
-	sha1sums = 92736674d7685b164b89d93bb3bdd0e42d70a259
-	sha1sums = 5b0abbf61359915975226bc46f3ae29fa6cf2116
-	sha1sums = 5137e69461969eefc490dc715291840eaf5b023d
-	sha1sums = 92a7036a35ac9f16d2324139fefde7fb75427a43
-	sha1sums = 9e479d244b6cc9d7b78ab8a0e1b3ae96840cf189
-	sha1sums = e1d355c63f704c58805c5c986498e3be0b006ca3
-	sha1sums = 9ccd0a04de3d3933ab30d2052c28568d9898a55d
-	sha1sums = 7a3ecbc6c0e6d155722c8283475d2d0959402e98
-	sha1sums = f0f32316a2bbce734d237d269042fcf067d0608e
-	sha1sums = 9745478a3ef79b0515c9bdc2e7f0e1f2fc479f61
-	sha1sums = 57328f4b5ec57e2310980c86dbe2e944363ac19a
-	sha1sums = b07b130016d4db14d1fb978b24a58d6f4f7ccc40
-	sha1sums = cde43ccfe658718490d1d515df6d0603179719a0
+	sha1sums = 176326e26135c00a1801b0d5c22ca2514284b9ad
+	sha1sums = db6802765a9b375d2dc9fb608b7b3a4330b3e3b2
+	sha1sums = ea8fd569bcf2de1e76a09ae6815d8d9d487bda02
+	sha1sums = 255b30039316a5aca69dda37802c77addd0c53be
+	sha1sums = 1ba0f47996fbf8debb2d0cc8ece6d84d663725ed
+	sha1sums = 0bca129a6d9b123cc38927b80c99a4f7417c4eea
+	sha1sums = ade47f887c83ebff13dccc661fcbd700629ba50f
+	sha1sums = a19808dc78a3977a4f4173eee238890ab8d1c684
+	sha1sums = c4e5f92b7b0c473739b707055401242742c86579
+	sha1sums = cf09b38a560dcb8127ebc4999b50e4b9f0eea4bd
+	sha1sums = 1b6eb55432d9afa91aaf3fc34d20af3d1e9c58dd
+	sha1sums = 955340f21af01f8865886ba9540f9b10b05b1ab9
+	sha1sums = abb05b99684e2599b47f11f3a0a5164b5bad8d7d
+	sha1sums = fa7bd3bd0a6a3008a5e2be22a6d9d7f44a152436
+	sha1sums = ce742934eaa64d563000fbd3e7eb39cd01a090f3
+	sha1sums = 81d510e85f07f3294aebbb88dac10f6ef5618b24
+	sha1sums = 9acc3b6680d5efd9da2145fc10059c36fb9b7f31
+	sha1sums = 185e82e4bf6abea07bf18d6ff2c4fbf7a05224c2
+	sha1sums = 4b5aa817ef52d2aed936b14e6fb6b12adfc658ce
+	sha1sums = ad9ba49a1231d534d3bb52f6ae91553c16d87df4
+	sha1sums = 277a214cb5c2e35eda50a0d3028bbec05e696c31
 	sha1sums = c3ccb514a5693c437ec79817f0730f955ecb5d0b
 
 pkgname = collabora-online-server-nodocker
diff --git a/.gitignore b/.gitignore
new file mode 100644
index 000000000000..d767cfd3c8e0
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1,6 @@
+*.code-workspace
+Packages
+*.deb
+/src/
+/pkg/
+/*.tar.xz
\ No newline at end of file
diff --git a/PKGBUILD b/PKGBUILD
index 3705295e251c..ad63270aba52 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,7 +1,7 @@
 # Maintainer: Yves G. <theYinYeti@yalis.fr>
 
 pkgname=collabora-online-server-nodocker
-pkgver=4.0.4
+pkgver=4.0.5
 pkgrel=1
 pkgdesc="Collabora CODE (LibreOffice Online) server for Nextcloud or ownCloud, without Docker"
 arch=('x86_64')
@@ -10,6 +10,11 @@ license=('MPL')
 provides=('libreoffice' 'libreoffice-en-US')
 makedepends=(bzip2 coreutils curl fontconfig gawk grep gzip libcap sed systemd tar util-linux xz)
 
+optdepends=(
+  'hunspell: Use with language-specific hunspell dictionaries for LibreOffice spell-check'
+  'hyphen: Use with language-specific hyphen rules for LibreOffice hyphenation'
+)
+
 # From Dockerfile’s install script, minus inotify-tools+psmisc: not actually part of CODE
 depends=()
 
@@ -77,15 +82,8 @@ _upstream_equiv='
   libgcc1             = gcc-libs
   libgl1-mesa-glx     = mesa-libgl
   libpam0g            = pam
-  libpcre3            = 
+  libpcre3            = pcre
   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
@@ -98,6 +96,8 @@ _upstream_equiv='
 '
 _upstream_equiv_OLD='
 '
+
+# >>>> START OF DYNAMIC ADAPTATION OF PKGBUILD
 _upstream_handle_dep() {
   local dep="$1"
   local eqv="$(grep "^[[:blank:]]*$(sed 's/[.]/\\\0/g' <<<"$dep")[[:blank:]]*=" <<<"$_upstream_equiv")"
@@ -144,6 +144,7 @@ if [ ${#source[*]} -eq 5 ]; then
   done
 fi
 unset _upstream_handle_dep _upstream_equiv _upstream_deps
+# <<<< END OF DYNAMIC ADAPTATION OF PKGBUILD
 
 package() {
   local data= f=
@@ -163,6 +164,10 @@ package() {
   # /lib is deprecated
   mv {lib,usr/lib}
 
+  # link Debian’s libpcre.so.3 to the “standard” naming
+  # (https://archives.gentoo.org/gentoo-dev/message/676cd8b16a7255446355744d91636880)
+  ln -s /usr/lib/libpcre.so usr/lib/libpcre.so.3
+
   # use systemd for user allocation
   install -Dm0644 "$srcdir"/sysusers usr/lib/sysusers.d/$pkgname.conf
 
@@ -170,6 +175,10 @@ package() {
   rm -rf etc/cron.d
   install -Dm0644 "$srcdir"/tmpfiles usr/lib/tmpfiles.d/$pkgname.conf
 
+  # fix the systemd unit path
+  mv usr/lib{/lib,}/systemd
+  rmdir usr/lib/lib
+
   # add dependency on systemd
   sed -i '/^\[Unit\]/ a \
 After=systemd-tmpfiles-setup.service' usr/lib/systemd/system/loolwsd.service
@@ -204,6 +213,9 @@ After=systemd-tmpfiles-setup.service' usr/lib/systemd/system/loolwsd.service
   done
   rm -rf opt/collaboraoffice6.0/share/xdg
 
+  # fix lib + desktop files’ permissions
+  chmod a+x opt/collaboraoffice6.0/program/lib*.so usr/lib/libPoco* usr/share/applications/*.desktop
+
   # https://github.com/CollaboraOnline/Docker-CODE/issues/32
   [ -d etc/sysconfig ] || mkdir etc/sysconfig
   echo 'SLEEPFORDEBUGGER=0' >>etc/sysconfig/loolwsd
diff --git a/missing-deps.sh b/missing-deps.sh
index 70ef05167916..cb58fd529026 100755
--- a/missing-deps.sh
+++ b/missing-deps.sh
@@ -1,4 +1,5 @@
 #!/bin/bash
 
 cd "$(dirname "$0")/pkg/collabora-online-server-nodocker"
+export LD_LIBRARY_PATH="$(pwd)/usr/lib"
 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"; }' {} \;