From c602a3eda5b7729334e3218c3024fedde7039656 Mon Sep 17 00:00:00 2001
From: Y <theYinYeti@yalis.fr>
Date: Sun, 29 Dec 2019 21:56:19 +0100
Subject: [PATCH] advice from genofire on aur + additional fixes

---
 .SRCINFO          | 6 +++---
 PKGBUILD          | 8 ++++----
 install           | 8 ++++----
 mkcert_example.sh | 2 +-
 4 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/.SRCINFO b/.SRCINFO
index 2447458..ff4d5a3 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 = 4.2.0
-	pkgrel = 1
+	pkgrel = 2
 	url = https://www.collaboraoffice.com/code/
 	install = install
 	arch = x86_64
@@ -59,8 +59,8 @@ pkgbase = collabora-online-server-nodocker
 	source = https://www.collaboraoffice.com/repos/CollaboraOnline/CODE/collaboraofficebasis6.2-ooolinguistic_6.2.10.2-2_amd64.deb
 	source = https://www.collaboraoffice.com/repos/CollaboraOnline/CODE/code-brand_4.2-12_all.deb
 	sha1sums = SKIP
-	sha1sums = 3b7c52a40becb96ed9698e624a23cadfe1250a73
-	sha1sums = 132642655c8684a434ad2a43f1661020218cdfde
+	sha1sums = 4dea8c0bb62525f90d94d74a08c6f18f78a27ca9
+	sha1sums = 3fe2db88f4f7ee203520c59760582103d3e41210
 	sha1sums = 2d271f9493ea14c675af1bfa76f6b654569dd51f
 	sha1sums = f9c102a06b2582548f13121e78790237e2cb38e1
 	sha1sums = 751428514b8fdeaad7619b87bfe96ef37a0986b1
diff --git a/PKGBUILD b/PKGBUILD
index ef8a125..2609150 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -2,7 +2,7 @@
 
 pkgname=collabora-online-server-nodocker
 pkgver=4.2.0
-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/"
@@ -27,8 +27,8 @@ source=(
 )
 sha1sums=(
   'SKIP'
-  '3b7c52a40becb96ed9698e624a23cadfe1250a73'
-  '132642655c8684a434ad2a43f1661020218cdfde'
+  '4dea8c0bb62525f90d94d74a08c6f18f78a27ca9'
+  '3fe2db88f4f7ee203520c59760582103d3e41210'
   '2d271f9493ea14c675af1bfa76f6b654569dd51f'
   'f9c102a06b2582548f13121e78790237e2cb38e1'
 )
@@ -166,7 +166,7 @@ package() {
 After=systemd-tmpfiles-setup.service' usr/lib/systemd/system/loolwsd.service
 
   # keep the cert-making script from the Dockerfile for reference
-  install -Dm0644 "$srcdir"/mkcert_example.sh usr/share/doc/loolwsd/example.mkcert.sh
+  install -Dm0755 "$srcdir"/mkcert_example.sh usr/share/doc/loolwsd/example.mkcert.sh
 
   # do not provide libreoffice for the desktop (seems broken…)
   rm -rf opt/collaboraoffice6.2/share/xdg
diff --git a/install b/install
index c77075b..c2b0147 100644
--- a/install
+++ b/install
@@ -5,7 +5,7 @@ post_install() {
   ## From Debian packages ##
 
   # We assume that the LibreOffice to be used is built TDF-style
-  # and installs in /opt/collaboraoffice6.0, and that /opt/lool is
+  # and installs in /opt/collaboraoffice6.2, and that /opt/lool is
   # on the same file system
   mkdir -p opt/lool/child-roots
 
@@ -20,7 +20,7 @@ post_install() {
   cat <<-THEEND
 IMPORTANT!
 IMPORTANT! A certificate must be issued if restricted HTTP access is not possible.
-IMPORTANT! See /usr/share/doc/loolwsd/mkcert_example.sh for guidance.
+IMPORTANT! See /usr/share/doc/loolwsd/example.mkcert.sh for guidance.
 IMPORTANT!
 IMPORTANT! The username and password must be set in /etc/loolwsd/loolwsd.xml
 IMPORTANT! for the admin console.
@@ -51,8 +51,8 @@ post_upgrade() {
 
   chown -R lool:lool opt/lool
 
-  fc-cache opt/collaboraoffice6.0/share/fonts/truetype
-  su lool --shell=/bin/sh -c 'loolwsd-systemplate-setup /opt/lool/systemplate /opt/collaboraoffice6.0 >/dev/null 2>&1'
+  fc-cache opt/collaboraoffice6.2/share/fonts/truetype
+  su lool --shell=/bin/sh -c 'set -x; loolwsd-systemplate-setup /opt/lool/systemplate /opt/collaboraoffice6.2 >/dev/null'
 
   systemctl daemon-reload
   if systemctl list-unit-files loolwsd.service | grep -q 'enabled$'; then
diff --git a/mkcert_example.sh b/mkcert_example.sh
index 7aa3d20..da4f7b9 100644
--- a/mkcert_example.sh
+++ b/mkcert_example.sh
@@ -12,7 +12,7 @@ openssl genrsa -out certs/ca/root.key.pem 2048
 openssl req -x509 -new -nodes -key certs/ca/root.key.pem -days 9131 -out certs/ca/root.crt.pem -subj "/C=DE/ST=BW/L=Stuttgart/O=Dummy Authority/CN=Dummy Authority"
 mkdir -p certs/{servers,tmp}
 mkdir -p "certs/servers/localhost"
-openssl genrsa -out "certs/servers/localhost/privkey.pem" 2048 -key "certs/servers/localhost/privkey.pem"
+openssl genrsa -out "certs/servers/localhost/privkey.pem" 2048
 if test "${cert_domain:-set}" == set; then
   openssl req -key "certs/servers/localhost/privkey.pem" -new -sha256 -out "certs/tmp/localhost.csr.pem" -subj "/C=DE/ST=BW/L=Stuttgart/O=Dummy Authority/CN=localhost"
 else