[Libreoffice-commits] online.git: Branch 'distro/collabora/co-4-2-4' - 5 commits - configure.ac debian/changelog debian/control debian/rules EULA .gitreview loolkitconfig.xcu loolwsd.spec.in Makefile.am
Andras Timar (via logerrit)
logerrit at kemper.freedesktop.org
Thu May 28 13:36:30 UTC 2020
.gitreview | 2
EULA | 293 ++++++++++++++++++++++++++++++++++++++++++++++++++++++
Makefile.am | 3
configure.ac | 2
debian/changelog | 94 ++++++++++++++---
debian/control | 18 ++-
debian/rules | 4
loolkitconfig.xcu | 9 +
loolwsd.spec.in | 128 ++++++++++++++---------
9 files changed, 478 insertions(+), 75 deletions(-)
New commits:
commit 51f85f7860f34baa1ff264c47812bf8cac762239
Author: Andras Timar <andras.timar at collabora.com>
AuthorDate: Mon Dec 9 18:09:48 2019 +0100
Commit: Andras Timar <andras.timar at collabora.com>
CommitDate: Thu May 28 15:34:27 2020 +0200
[cp] Bump package version to 4.2.4-1 and update deb/rpm package files
Change-Id: I935425f644f373acdd4bf8d073ec8be3f29313b8
diff --git a/configure.ac b/configure.ac
index 3b2edb7c1..e53a7dbdf 100644
--- a/configure.ac
+++ b/configure.ac
@@ -3,7 +3,7 @@
AC_PREREQ([2.63])
-AC_INIT([loolwsd], [master], [libreoffice at lists.freedesktop.org])
+AC_INIT([loolwsd], [4.2.4], [libreoffice at lists.freedesktop.org])
LT_INIT([shared, disable-static, dlopen])
AM_INIT_AUTOMAKE([1.10 subdir-objects tar-pax -Wno-portability])
diff --git a/debian/changelog b/debian/changelog
index 56cbc5563..9d2f09a50 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,25 +1,89 @@
-loolwsd (1.8.2-1) unstable; urgency=medium
+loolwsd (4.2.4-1) unstable; urgency=medium
- * Fix crash in Impress.
+ * https://cgit.freedesktop.org/libreoffice/online/log/?h=cp-4.2.4-1
- -- Jan Holesovsky <kendy at collabora.com> Thu, 11 Aug 2016 16:46:00 +0100
+ -- Andras Timar <andras.timar at collabora.com> Thu, 28 May 2020 15:00:00 +0200
-loolwsd (1.8.0-1) unstable; urgency=medium
+loolwsd (4.2.3-3) unstable; urgency=medium
- [ Tor Lillqvist ]
- * Back to packaging this for Debian.
+ * https://cgit.freedesktop.org/libreoffice/online/log/?h=cp-4.2.3-3
- [ Jan Holesovsky ]
- * Update to match Collabora Office 5.1
+ -- Andras Timar <andras.timar at collabora.com> Thu, 19 May 2020 09:00:00 +0200
- -- Jan Holesovsky <kendy at collabora.com> Fri, 05 Aug 2016 16:51:54 +0100
+loolwsd (4.2.3-2) unstable; urgency=medium
-loolwsd (1.0.0-1) unstable; urgency=low
+ * https://cgit.freedesktop.org/libreoffice/online/log/?h=CODE-4.2.3-2
- * Initial release
+ -- Andras Timar <andras.timar at collabora.com> Thu, 14 May 2020 09:00:00 +0200
- * Local Variables:
- * Mode: fundamental
- * End:
+loolwsd (4.2.3-1) unstable; urgency=medium
- -- Tor Lillqvist <tml at collabora.com> Fri, 15 May 2015 11:10:20 +0300
+ * https://cgit.freedesktop.org/libreoffice/online/log/?h=CODE-4.2.3-1
+
+ -- Andras Timar <andras.timar at collabora.com> Wed, 06 May 2020 14:00:00 +0200
+
+loolwsd (4.2.2-2) unstable; urgency=medium
+
+ * https://cgit.freedesktop.org/libreoffice/online/log/?h=CODE-4.2.2-2
+
+ -- Andras Timar <andras.timar at collabora.com> Thu, 16 Apr 2020 14:35:00 +0200
+
+loolwsd (4.2.2-1) unstable; urgency=medium
+
+ * https://cgit.freedesktop.org/libreoffice/online/log/?h=CODE-4.2.2-1
+
+ -- Andras Timar <andras.timar at collabora.com> Tue, 07 Apr 2020 18:00:00 +0100
+
+loolwsd (4.2.1-3) unstable; urgency=medium
+
+ * https://cgit.freedesktop.org/libreoffice/online/log/?h=CODE-4.2.1-3
+
+ -- Andras Timar <andras.timar at collabora.com> Thu, 02 Apr 2020 18:00:00 +0100
+
+loolwsd (4.2.1-2) unstable; urgency=medium
+
+ * https://cgit.freedesktop.org/libreoffice/online/log/?h=CODE-4.2.1-2
+
+ -- Andras Timar <andras.timar at collabora.com> Thu, 26 Mar 2020 18:00:00 +0100
+
+loolwsd (4.2.1-1) unstable; urgency=medium
+
+ * https://cgit.freedesktop.org/libreoffice/online/log/?h=CODE-4.2.1-1
+
+ -- Andras Timar <andras.timar at collabora.com> Thu, 19 Mar 2020 12:53:00 +0100
+
+loolwsd (4.2.0-6) unstable; urgency=medium
+
+ * https://cgit.freedesktop.org/libreoffice/online/log/?h=CODE-4.2.0-6
+
+ -- Andras Timar <andras.timar at collabora.com> Wed, 04 Mar 2020 11:26:00 +0100
+
+loolwsd (4.2.0-5) unstable; urgency=medium
+
+ * https://cgit.freedesktop.org/libreoffice/online/log/?h=CODE-4.2.0-5
+
+ -- Andras Timar <andras.timar at collabora.com> Tue, 25 Feb 2020 11:58:00 +0100
+
+loolwsd (4.2.0-4) unstable; urgency=medium
+
+ * https://cgit.freedesktop.org/libreoffice/online/log/?h=CODE-4.2.0-4
+
+ -- Andras Timar <andras.timar at collabora.com> Tue, 28 Jan 2020 18:58:00 +0100
+
+loolwsd (4.2.0-3) unstable; urgency=medium
+
+ * https://cgit.freedesktop.org/libreoffice/online/log/?h=CODE-4.2.0-3
+
+ -- Andras Timar <andras.timar at collabora.com> Thu, 09 Jan 2020 22:12:00 +0100
+
+loolwsd (4.2.0-2) unstable; urgency=medium
+
+ * https://cgit.freedesktop.org/libreoffice/online/log/?h=CODE-4.2.0-2
+
+ -- Andras Timar <andras.timar at collabora.com> Fri, 20 Dec 2019 13:27:00 +0100
+
+loolwsd (4.2.0-1) unstable; urgency=medium
+
+ * https://cgit.freedesktop.org/libreoffice/online/log/?h=CODE-4.2.0-1
+
+ -- Andras Timar <andras.timar at collabora.com> Tue, 10 Dec 2019 20:47:00 +0100
diff --git a/debian/control b/debian/control
index 532367872..c926e9938 100644
--- a/debian/control
+++ b/debian/control
@@ -2,13 +2,27 @@ Source: loolwsd
Section: web
Priority: optional
Maintainer: Andras Timar <andras.timar at collabora.com>
-Build-Depends: debhelper (>= 9), dh-systemd (>= 1.3), libcap-dev, libcap2-bin, libpcre3-dev, libpng-dev, libpoco-dev (>= 1.7.5), linux-libc-dev, nodejs, python-polib, python-lxml, python3-polib, python3-lxml, fontconfig, libpam-dev, libcppunit-dev, pkg-config, devscripts, m4
+Build-Depends: debhelper (>= 9), dh-systemd (>= 1.3), libcap-dev, libcap2-bin, libpcre3-dev, libpng-dev, linux-libc-dev, nodejs, python3-polib, python3-lxml, fontconfig, libpam-dev, libcppunit-dev, pkg-config, devscripts, m4
Standards-Version: 3.9.7
Package: loolwsd
Section: web
Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}, adduser, fontconfig, libsm6, libssl1.0.0, libodbc1, libxinerama1, libxrender1, libcairo2, libgl1-mesa-glx, libcups2, libdbus-glib-1-2, cpio, libcap2-bin, ${lo:Depends}
+Depends: ${shlibs:Depends}, ${misc:Depends},
+ adduser, expat, fontconfig, cpio, libcap2-bin, openssh-client,
+ collaboraofficebasis6.2-calc,
+ collaboraofficebasis6.2-core,
+ collaboraofficebasis6.2-graphicfilter,
+ collaboraofficebasis6.2-images,
+ collaboraofficebasis6.2-impress,
+ collaboraofficebasis6.2-ooofonts,
+ collaboraofficebasis6.2-writer,
+ collaboraoffice6.2,
+ collaboraoffice6.2-ure,
+ collaboraofficebasis6.2-en-us,
+ collaboraofficebasis6.2-draw,
+ collaboraofficebasis6.2-extension-pdf-import,
+ collaboraofficebasis6.2-ooolinguistic
Description: LibreOffice Online WebSocket Daemon
LOOLWSD is a daemon that talks to web browser clients and provides LibreOffice
services.
diff --git a/debian/rules b/debian/rules
index d675675c0..feb980c95 100644
--- a/debian/rules
+++ b/debian/rules
@@ -19,7 +19,3 @@ override_dh_auto_test:
override_dh_installinit:
# no init.d scripts here, assume systemd
-
-override_dh_gencontrol:
- # put package names of LibreOffice here
- # dh_gencontrol -- -Vlo:Depends=""
diff --git a/loolwsd.spec.in b/loolwsd.spec.in
index 7fc8737f0..b9667a7a8 100644
--- a/loolwsd.spec.in
+++ b/loolwsd.spec.in
@@ -15,36 +15,42 @@ Version: @PACKAGE_VERSION@
Release: 1%{?dist}
Vendor: %{vendor}
Summary: LibreOffice Online WebSocket Daemon
-License: MPL
+License: EULA
Source0: loolwsd- at PACKAGE_VERSION@.tar.gz
-BuildRequires: libcap-devel libpng-devel poco-devel >= 1.7.5 m4
-%if 0%{?fedora} || 0%{?rhel} >= 7
-BuildRequires: libpcap kernel-headers
-%else
-%if 0%{?suse_version}
-BuildRequires: libcap-progs linux-glibc-devel systemd-rpm-macros
+BuildRequires: libcap-devel libpng-devel pam-devel gcc-c++ cppunit-devel pam-devel fontconfig make
+
+# Red Hat and CentOS
+%if 0%{?rhel} == 7
+BuildRequires: libpcap kernel-headers python36-polib python36-lxml
+%endif
+
+%if 0%{?rhel} == 8
+BuildRequires: libpcap kernel-headers python3-polib python3-lxml
%endif
+
+# openSUSE Leap 15.x, SLES12, SLES15
+%if 0%{?suse_version}
+BuildRequires: libcap-progs linux-glibc-devel systemd-rpm-macros python3-polib python3-lxml
%endif
-Requires: %{lo_rpm_list}
-Requires: systemd
+Requires: collaboraoffice6.2 collaboraoffice6.2-ure collaboraofficebasis6.2-core collaboraofficebasis6.2-writer collaboraofficebasis6.2-impress collaboraofficebasis6.2-graphicfilter collaboraofficebasis6.2-en-US collaboraofficebasis6.2-calc collaboraofficebasis6.2-ooofonts collaboraofficebasis6.2-images collaboraofficebasis6.2-draw collaboraofficebasis6.2-extension-pdf-import collaboraofficebasis6.2-ooolinguistic
Requires(post): coreutils grep sed
-%if 0%{?fedora} || 0%{?rhel} >= 7
+%if 0%{?rhel}
# loolwsd dependencies
-Requires: expat keyutils-libs krb5-libs libattr libcap libcom_err libgcc libpng libselinux openssl-libs pcre xz-libs zlib
-Requires: poco-crypto >= 1.7.5 poco-foundation >= 1.7.5 poco-json >= 1.7.5 poco-net >= 1.7.5 poco-netssl >= 1.7.5 poco-util >= 1.7.5 poco-xml >= 1.7.5
-# LibreOffice dependencies (unfortunately upstream LibreOffice RPM packages (from TDF) do not have real dependencies)
-Requires: atk avahi-glib avahi-libs bzip2-libs cairo cups-libs dbus-glib dbus-libs fontconfig freetype GConf2 gdk-pixbuf2 glib2 gnome-vfs2 graphite2 gstreamer gstreamer-plugins-base gtk2 harfbuzz libdrm libffi libICE libSM libuuid libX11 libXau libxcb libXcomposite libXcursor libXdamage libXext libXfixes libXi libXinerama libXrandr libXrender libxshmfence libXt libXxf86vm mesa-libEGL mesa-libgbm mesa-libGL mesa-libglapi pango pixman
-%else
+Requires: systemd expat keyutils-libs krb5-libs libattr libcap libcom_err libgcc libpng libselinux openssh-clients openssl-libs pcre xz-libs zlib
+# Collabora Office dependencies (unfortunately Collabora Office RPM packages do not have real dependencies)
+Requires: expat fontconfig freetype libuuid bzip2-libs
+%endif
+
%if 0%{?suse_version}
# loolwsd dependencies
Requires(post): libcap-progs
-Requires: libcap2 libopenssl1_0_0 libpng12-0 libpcre1 libz1 %{?systemd_requires} %{fillup_prereq}
-Requires: libPocoCrypto48 >= 1.7.8 libPocoFoundation48 >= 1.7.8 libPocoJSON48 >= 1.7.8 libPocoNet48 >= 1.7.8 libPocoNetSSL48 >= 1.7.8 libPocoUtil48 >= 1.7.8 libPocoXML48 >= 1.7.8
-# LibreOffice dependencies (unfortunately upstream LibreOffice RPM packages (from TDF) do not have real dependencies)
-Requires: Mesa-libEGL1 Mesa-libGL1 Mesa-libglapi0 cups-libs dbus-1-glib fontconfig libatk-1_0-0 libavahi-client3 libavahi-common3 libavahi-glib1 libbz2-1 libcairo2 libcom_err2 libdbus-1-3 libdrm2 libexpat1 libfreetype6 libgbm1 libgio-2_0-0 libglib-2_0-0 libgmodule-2_0-0 libgobject-2_0-0 libgraphite2-3 libgthread-2_0-0 libgtk-2_0-0 libharfbuzz0 libkeyutils1 liblzma5 libpixman-1-0 libpng16-16 libuuid1 libxml2 libffi4 libgbm1 libICE6 libselinux1 libSM6 libwayland-client0 libwayland-server0 libX11-6 libX11-xcb1 libXau6 libxcb1 libxcb-dri2-0 libxcb-dri3-0 libxcb-glx0 libxcb-present0 libxcb-render0 libxcb-shm0 libxcb-sync1 libxcb-xfixes0 libXdamage1 libXext6 libXfixes3 libXrender1 libxshmfence1 libXxf86vm1
-%endif
+Requires: systemd libopenssl1_0_0 libpcre1 libz1 libcap2 libpng12-0 %{fillup_prereq}
+# Collabora Office dependencies (unfortunately Collabora Office RPM packages do not have real dependencies)
+# cd /opt/collaboraoffice6.2/program ; for i in soffice.bin *.so ;do ldd $i | grep '=>' | sed -e "s/^.*=> //" -e "s/ [(].*$//"; done | sort | uniq | xargs rpm -qf --qf="%{NAME}\n" | sort | uniq | grep -v collaboraoffice
+Requires: fontconfig libbz2-1 libexpat1 libfreetype6 libpng16-16 libuuid1 openssh
%endif
+
%if 0%{?name_suffix:1}
Provides: loleaflet = 1.5.8, loolwsd
%else
@@ -64,28 +70,31 @@ Obsoletes: loleaflet <= 1.5.8
%configure \
--enable-silent-rules \
--with-lokit-path=bundled/include \
- --with-lo-path=%{loroot} \
+ --with-lo-path=/opt/collaboraoffice6.2 \
--disable-setcap \
%if 0%{?config_options:1}
%{config_options}
%endif
-make %{?_smp_mflags}
+env BUILDING_FROM_RPMBUILD=yes make %{?_smp_mflags}
%check
-#make check
+#env BUILDING_FROM_RPMBUILD=yes make check
%install
-make install DESTDIR=%{buildroot}
-%__install -D -m 444 loolwsd.service %{buildroot}%{_unitdir}/loolwsd.service
+env BUILDING_FROM_RPMBUILD=yes make install DESTDIR=%{buildroot}
install -d -m 755 %{buildroot}/var/adm/fillup-templates
-%if 0%{?fedora} || 0%{?rhel} >= 7
+%if 0%{?rhel}
+install -D -m 444 loolwsd.service %{buildroot}%{_unitdir}/loolwsd.service
install -D -m 644 sysconfig.loolwsd %{buildroot}/etc/sysconfig/loolwsd
-%else
+install -d -m 755 %{buildroot}/etc/httpd/conf
+install -D -m 755 etc/apache2/loolwsd.conf %{buildroot}/etc/httpd/conf
+rm %{buildroot}/etc/apache2/conf-available/loolwsd.conf
+%endif
%if 0%{?suse_version}
+install -D -m 444 loolwsd.service %{buildroot}%{_unitdir}/loolwsd.service
install -D -m 644 sysconfig.loolwsd %{buildroot}/var/adm/fillup-templates
%endif
-%endif
mkdir -p %{buildroot}/etc/cron.d
echo "#Remove old tiles once every 10 days at midnight" > %{buildroot}/etc/cron.d/loolwsd.cron
echo "0 0 */1 * * root find /var/cache/loolwsd -type f -a -atime +10 -exec rm {} \;" >> %{buildroot}/etc/cron.d/loolwsd.cron
@@ -94,6 +103,7 @@ echo "auth required pam_unix.so" > %{buildroot}/etc/pam.d/loolwsd
echo "account required pam_unix.so" >> %{buildroot}/etc/pam.d/loolwsd
%files
+%defattr(-,root,root,-)
/usr/bin/loolwsd
/usr/bin/loolwsd-systemplate-setup
/usr/bin/loolwsd-generate-proof-key
@@ -106,28 +116,34 @@ echo "account required pam_unix.so" >> %{buildroot}/etc/pam.d/loolwsd
/usr/share/doc/loolwsd/EULA
/usr/share/doc/loolwsd/README
/usr/share/doc/loolwsd/README.vars
+/usr/share/doc/loolwsd/metrics.txt
/usr/share/doc/loolwsd/protocol.txt
/usr/share/doc/loolwsd/reference.md
-/usr/share/doc/loolwsd/metrics.txt
-/usr/share/man/man1/loolwsd.1
-/usr/share/man/man1/loolforkit.1
-/usr/share/man/man1/loolconvert.1
-/usr/share/man/man1/loolconfig.1
-/usr/share/man/man1/loolwsd-systemplate-setup.1
-/usr/share/man/man1/loolwsd-generate-proof-key.1
+/usr/share/man/man1/loolwsd.1.gz
+/usr/share/man/man1/loolforkit.1.gz
+/usr/share/man/man1/loolconvert.1.gz
+/usr/share/man/man1/loolconfig.1.gz
+/usr/share/man/man1/loolwsd-systemplate-setup.1.gz
+/usr/share/man/man1/loolwsd-generate-proof-key.1.gz
%{_unitdir}/loolwsd.service
-%if 0%{?fedora} || 0%{?rhel} >= 7
+%if 0%{?rhel}
%config(noreplace) /etc/sysconfig/loolwsd
-%else
+%endif
%if 0%{?suse_version}
/var/adm/fillup-templates/sysconfig.loolwsd
%endif
-%endif
%config(noreplace) /etc/cron.d/loolwsd.cron
%config(noreplace) /etc/pam.d/loolwsd
%config(noreplace) %attr(640, lool, root) /etc/loolwsd/loolwsd.xml
%config /etc/loolwsd/loolkitconfig.xcu
+%config(noreplace) /etc/nginx/snippets/loolwsd.conf
+%if 0%{?suse_version} > 0
+%config(noreplace) /etc/apache2/conf-available/loolwsd.conf
+%endif
+%if 0%{?rhel} > 0
+%config(noreplace) /etc/httpd/conf/loolwsd.conf
+%endif
%doc README
@@ -137,17 +153,21 @@ echo "account required pam_unix.so" >> %{buildroot}/etc/pam.d/loolwsd
%endif
getent group lool >/dev/null || groupadd -r lool
-getent passwd lool >/dev/null || useradd -g lool -r lool
+getent passwd lool >/dev/null || useradd -g lool -r lool -d /opt/lool -s /bin/bash
-%post
-setcap cap_fowner,cap_mknod,cap_sys_chroot=ep /usr/bin/loolforkit
+# for filename in `find /opt/lool/systemplate -type f`;do stripped=$(echo -ne $filename | sed -e "s|/opt/lool/systemplate||");rpm -qf --qf="%{NAME}\n" $stripped;done | grep -v devel | grep -v 32bit | grep -v -- -fonts | sort | uniq
+%triggerin -- expat fontconfig freetype freetype2 glibc glibc-locale kernel keyutils-libs krb5 krb5-libs libbz2-1 libcap libcap-ng libcap2 libexpat1 libfreetype6 libgcc libgcc_s1 libgcrypt libiscsi libpng libpng12 libpng12-0 libpng15-15 libpng16-16 libstdc++ libstdc++6 libuuid libuuid1 libz1 lsb nss-mdns nss-softokn-freebl pcre sssd sssd-client systemd-libs timezone tzdata zlib
-mkdir -p /var/cache/loolwsd && chown lool:lool /var/cache/loolwsd
-rm -rf /var/cache/loolwsd/*
+echo -ne "Triggered update of loolwsd systemplate..."
+
+%if 0%{?rhel} >= 7 || 0%{?suse_version} >= 1300
+systemctl is-active -q loolwsd && LOOLWSD_IS_ACTIVE=1 || LOOLWSD_IS_ACTIVE=0
+if [ $LOOLWSD_IS_ACTIVE == "1" ]; then systemctl stop loolwsd; fi
+%endif
# Figure out where LO is installed, let's hope it is not a mount point
# Create a directory for loolwsd on the same file system
-loroot=%{loroot}
+loroot=/opt/collaboraoffice6.2
loolparent=`cd ${loroot} && cd .. && /bin/pwd`
rm -rf ${loolparent}/lool
@@ -159,7 +179,19 @@ fc-cache ${loroot}/share/fonts/truetype
loolwsd-systemplate-setup ${loolparent}/lool/systemplate ${loroot} >/dev/null 2>&1
loolwsd-generate-proof-key >/dev/null 2>&1
-%if 0%{?fedora} || 0%{?rhel} >= 7
+%if 0%{?rhel} || 0%{?suse_version}
+if [ $LOOLWSD_IS_ACTIVE == "1" ]; then systemctl start loolwsd; fi
+%endif
+
+echo " Done."
+
+%post
+setcap cap_fowner,cap_mknod,cap_sys_chroot=ep /usr/bin/loolforkit
+
+mkdir -p /var/cache/loolwsd && chown lool:lool /var/cache/loolwsd
+rm -rf /var/cache/loolwsd/*
+
+%if 0%{?rhel} >= 7
%systemd_post loolwsd.service
%else
%if 0%{?suse_version}
@@ -168,9 +200,8 @@ loolwsd-generate-proof-key >/dev/null 2>&1
%endif
%endif
-
%preun
-%if 0%{?fedora} || 0%{?rhel} >= 7
+%if 0%{?rhel} >= 7
%systemd_preun loolwsd.service
%else
%if 0%{?suse_version}
@@ -179,7 +210,7 @@ loolwsd-generate-proof-key >/dev/null 2>&1
%endif
%postun
-%if 0%{?fedora} || 0%{?rhel} >= 7
+%if 0%{?rhel} >= 7
%systemd_postun loolwsd.service
%else
%if 0%{?suse_version}
commit f9ffe0eac0bb31dcc32b57f83935bd3f057982b0
Author: Andras Timar <andras.timar at collabora.com>
AuthorDate: Tue Apr 7 22:54:49 2020 +0200
Commit: Andras Timar <andras.timar at collabora.com>
CommitDate: Thu May 28 15:30:13 2020 +0200
[cp] EULA 2020-04-07
Change-Id: I3935154d2873de9a3f4b8660e3d367cc4f9c368c
diff --git a/EULA b/EULA
new file mode 100644
index 000000000..3e601e804
--- /dev/null
+++ b/EULA
@@ -0,0 +1,293 @@
+End User License and Subscription Agreement
+Collabora Office (“Software”)
+
+
+An individual acting on their own behalf or on behalf of any corporate entity
+which employs them or which they represent (“an Organisation”) represents that
+he or she has the authority to enter into this agreement on behalf of that
+Organisation. In this Licence Agreement, “You” includes both the reader and any
+Organisation.
+
+PLEASE READ THIS AGREEMENT CAREFULLY. BY PURCHASING, INSTALLING AND/OR USING
+THE COLLABORA OFFICE SOFTWARE (INCLUDING ITS COMPONENTS), YOU AGREE TO THE
+TERMS OF THIS LICENCE AND SUBSCRIPTION AGREEMENT AND ACKNOWLEDGE THAT YOU HAVE
+READ AND UNDERSTAND THIS AGREEMENT.
+
+IF YOU DO NOT AGREE WITH THESE TERMS PLEASE DO NOT DOWNLOAD, INSTALL OR USE THE
+SOFTWARE OR SUBSCRIPTION SERVICES.
+
+PARTIES. This software licence and subscription agreement (“Agreement”) is a
+legally binding agreement between You and Collabora Productivity Limited,
+incorporated and registered in England and Wales with company number 08644931
+whose registered office is at The Platinum Building, St John’s Innovation Park,
+Cambridge, CB4 0DS, United Kingdom (“Collabora”) and where applicable
+references to Collabora shall also refer to its authorised resellers and third
+party distributors from time to time.
+
+SOFTWARE. The Software and each of its components are owned by Collabora or
+other licensors and are protected as copyrighted works of authorship, and are
+also protected under applicable database and other applicable laws. To the
+extent that they are not accompanied by a separate Collabora software licence
+agreement, any modification, update or upgrade to the Software that You may
+download or receive, whether as Subscription Services detailed below or
+otherwise, is included as Software and governed by the “Licenses” heading below
+and generally by this Agreement.
+
+LICENCES. Provided that You have subscribed to the Subscription Services as
+detailed below and Your compliance with the other terms and conditions of this
+Agreement, Collabora grants to You a perpetual, non-transferable, worldwide
+licence (“Licence”) to reproduce and use copies of the Software within Your
+Organization. The Software is licensed (not sold) to You. Accordingly no title
+to or ownership of the Software is transferred to You. You should also be aware
+that in addition to this grant of Licence, many of the individual components of
+the Software are subject to open source licences, as detailed further below
+under “Open Source Licences and Limitations”.
+
+SUBSCRIPTION SERVICES. The Licence to reproduce and use a copy of the Software
+is granted subject to the initial purchase by You of Software maintenance
+and/or support services entitlements (“Subscription Services Entitlements”)
+equivalent in number to the total number of units of the Software that you
+intend to deploy, install or use in Your Organization.
+The Subscription Services Entitlements entitle You during the subscription
+period to make use of the following services (“Subscription Services”):
+a) in the case of maintenance services, to any security fixes and Software
+updates which may be issued by Collabora, including existing fixes from the
+support services set out at (b), on the terms set out in this Agreement and
+from time to time at http://www.CollaboraOffice.com/
+b) in the case of support services, to fee based technical support on the
+terms set out in this Agreement, or any separate agreement, and from time to
+time at http://www.CollaboraOffice.com/.
+All Subscription Services will be supplied in a professional manner in
+accordance with generally accepted industry standards.
+Unless the Subscription Services and Subscription Services Entitlements are set
+out in a separate contract with Collabora, they are offered to You subject to
+the terms set out in this Agreement.
+
+IF THE SUBSCRIPTION SERVICES ENTITLEMENTS PERIOD EXPIRES AND IS NOT RENEWED
+WITHIN 30 DAYS, ACCESS TO SUBSCRIPTION SERVICES IS TERMINATED. IF WITHIN THE
+SUBSCRIPTION SERVICES ENTITLEMENT PERIOD YOU WISH TO INCREASE THE NUMBER OF
+COPIES OF THE SOFTWARE YOUR ORGANISATION IS USING, YOU MUST PURCHASE ADDITIONAL
+UNITS OF SUBSCRIPTION SERVICES ENTITLEMENTS EQUIVALENT TO THE NUMBER OF
+ADDITIONAL SOFTWARE COPIES YOU WISH TO INSTALL. UPON RENEWAL OF YOUR
+SUBSCRIPTION SERVICES ENTITLEMENTS, YOUR SUBMISSION OF A PURCHASE ORDER OR
+PAYMENT OF FEES FOR SUBSCRIPTION SERVICES ENTITLEMENTS WILL BE DEEMED TO BE A
+REPRESENTATION OF THE NUMBER OF COPIES OF THE SOFTWARE INSTALLED AT YOUR
+ORGANISATION AT THAT TIME. COLLABORA RESERVES THE RIGHT AT ITS ENTIRE
+DISCRETION TO CARRY OUT A LICENCE COMPLIANCE AUDIT AT ANY TIME.
+
+HOME USE. Collabora grants primary users of Subscription Services Entitlements
+and their immediate family members a License to reproduce and use copies of the
+Software for Home Use as detailed below unless otherwise prohibited by any
+applicable laws, policies or regulations. Home Use is usage outside the scope
+of normal business that occurs primarily inside the home.
+
+LICENSE COMPLIANCE AUDIT. Collabora may, upon fifteen (15) days’ advance notice
+and at its expense, conduct an annual audit if You are an Organisation, during
+your normal business hours, of Your use of the Software to verify compliance
+with this Agreement and in particular Your commitment under the License herein
+to purchase an equivalent number units of Subscription Services Entitlements.
+You agree to keep records sufficient to certify your compliance with this
+Agreement. Upon Collabora’s or its authorized representative’s reasonable
+written commitment(s) to safeguard your confidential information, you shall
+fully cooperate with such audit and provide any necessary assistance and access
+to records and computers. If an audit reveals that you have or at any time had
+unlicensed installation, use of, or access to the Software, You will promptly
+acquire sufficient Subscription Services Entitlements to cover any shortage. If
+a shortage of 5% or more is found, you must reimburse Collabora for the costs
+incurred in the audit and acquire the necessary additional Subscription
+Services Entitlements within 30 days.
+
+EVALUATION LICENCE. An evaluation licence is granted when You deploy, install
+or use an evaluation version of the Software or You are granted a time limited,
+non-exclusive and non-transferable licence by Collabora for evaluation
+purposes. The Software is licensed to You for the sole purpose of evaluating
+the Software and only for a specified evaluation period of 30 days. After 30
+days You must either purchase an equivalent Subscription Services Entitlement
+from Collabora, or destroy and stop using the Software. If You purchase the
+Subscription Service Entitlement before the expiration of the evaluation time,
+You have a valid licence and You do not need to destroy the Software.
+
+OPEN SOURCE LICENCES/REQUIREMENTS. Many of the individual components included
+in the Software are licensed primarily pursuant to Mozilla Public License v2.0
+open source licence, in addition to other open source licences identified in
+the documentation or located in the source code or binary code for the
+component. For these the source code form of the Software is made available at
+all times under the terms of such licences.
+Whilst this Agreement in no way limits Your rights under such licences, nor is
+it intended to supersede or conflict with the licence terms or obligations for
+use of any individual open source component, the Mozilla Public License v2.0
+has been utilised to license the majority of the components comprising the
+Software because it allows the imposition (as is set out in its paragraph
+3.2(b)) of the conditions of this Agreement on the free distribution of
+Software in its Executable Form.
+For the avoidance of doubt, Collabora branding, theme data and Collabora Marks
+are not made available under an Open Source license.
+
+MAINTENANCE SERVICES.
+1) By purchasing maintenance services You are entitled to install and use all
+upgrades and updates made commercially available by Collabora during the period
+covered by the maintenance services subscription, up to the number of
+installations for which You have purchase maintenance services.
+
+2) Any “update” means a fix or compilation of fixes released by Collabora to
+correct operational errors (a defect that prevents it from operating
+substantially as intended, where such intent shall be deduced based on a
+competent inspection of the source code and documentation) in the Software. An
+“upgrade” means any new version of the Software which bears the same product
+name, including version changes evidenced by a number immediately after the
+name of the Software.
+
+3) If a question arises as to whether a release by Collabora is an upgrade or
+an update or a new Software product, Collabora’s opinion will prevail provided
+that Collabora treats the product offering the same for its end users generally.
+
+4) If Collabora commercially releases any upgrade or updates, it will make such
+upgrades or updates available to You within a reasonable period of time after
+they become commercially available, although Collabora cannot guarantee any
+specific turnaround times and/or regular release intervals.
+
+5) At its sole discretion Collabora will determine whether to eliminate an
+operational error by means of issuing an update. Collabora will inform you by
+email (to the address given on registration of the maintenance services) as
+soon as new updates are released at the Collabora website.
+
+6) Maintenance services do not include integration services, installation of
+upgrades or updates, support services or any other benefits not expressly
+described in this Agreement.
+
+SUPPORT SERVICES
+By purchasing an entitlement to ‘Level 3’ technical support, services will be
+provided on certain terms which include:
+- allocation of a severity level for each support case and any variations on
+this;
+- Collabora’s work availability times, initial response time and the
+communication frequency for each support case based on such allocated case
+severity level;
+- Your limit on the number of support cases that You can report for each such
+allocated case severity level (although for the avoidance of doubt, any unused
+limit cannot be refunded and expires at the end of the Subscription Services
+Entitlement period unless otherwise agreed).
+The specific terms are subject to change from time to time and accordingly are
+set out at http://www.CollaboraOffice.com/, unless separately agreed with You
+such as in a purchase order. You are urged to check these terms again now
+before proceeding with any purchase of Subscription Services Entitlements.
+Alternatively, Collabora also entitle You to purchase the support services
+entitlement from a reseller or other intermediary rather than from Collabora
+directly. If You have purchased the services entitlement from such a party
+please check with them if any support service entitlement terms have been
+separately negotiated between them and Collabora, as any such terms are deemed
+to be incorporated into this Agreement and shall take precedence over any
+conflicting terms set out at http://www.CollaboraOffice.com/ or on a purchase
+order.
+
+LIMITATIONS AND EXCLUSIONS
+1) Collabora offers no rights other than those expressly granted to You in this
+Agreement. Except as agreed to under a separate written agreement with
+Collabora or in the licence terms accompanying a particular component, to the
+maximum extent permitted under applicable law (and not applicable to claims
+relating to death or personal injury caused by negligence or fraudulent
+misrepresentation) the Software is provided and licensed "as is" without any
+warranties of any kind, express or implied, including any implied warranties of
+quality, title, non-infringement, non-interruption or fitness for a particular
+purpose.
+
+2) The Software is only compatible with certain computers and operating
+systems. It is not warranted for non-compatible systems or for incorrect or
+unauthorised use, being use which is not in accordance with the Documentation.
+Please contact Collabora for information about compatibility or incorrect use.
+
+3) The Software may include or be bundled with other software programmes or
+services licensed or sold by an entity other than Collabora. Collabora does not
+warrant non-Collabora products or services, which are provided on an "as is"
+basis. Please see the third party entity regarding remedies.
+
+4) No right or licence, express or implied, is granted under this Agreement
+with respect to any trademark, trade name or service mark (“Mark”) of
+Collabora. If You distribute any open source component of the Software, You
+must remove all Marks except those used to identify Collabora’s ownership or
+licensing of the component. In addition you may not vary, delete or obscure any
+notices of proprietary rights or any product identification or restrictions on
+or in the Software.
+
+ 5) Neither Collabora nor any of its licensors, subsidiaries, contractors or
+employees will in any case be liable for any incidental, consequential,
+indirect or economic damages arising out of the use of or inability to use the
+Software or Subscription Services, including without limitation loss of
+profits, business or data, even if advised of the possibility of those damages.
+In particular, as files may be altered or damaged in the course of Collabora
+providing Subscription Services, You agree to take appropriate measures to
+isolate and back up Your systems.
+
+6) Notwithstanding (5) above, in no event will Collabora's aggregate liability
+for damages (whether in one instance or a series of instances) exceed 1.25
+times the amount paid by You for the Subscription Services Entitlements out of
+which such claim arose.
+
+7) Upon any default in Collabora’s provision of Subscription Services,
+Collabora's only obligation is to either correct the Subscription Services so
+that they comply with this warranty or at its option refund the amount You paid
+to Collabora for the portion of such Services that fail to comply with this
+warranty and in such event You may elect to terminate this Agreement with
+immediate effect.
+
+
+GENERAL TERMS
+1) This Agreement may not be transferred or assigned without the prior written
+approval of Collabora.
+
+2) This Agreement will terminate if You fail to comply with any term or
+condition of this Agreement.
+
+3) Unless explicitly indicated otherwise, this Agreement sets forth the entire
+understanding and agreement between You and Collabora and may be amended or
+modified only by a written agreement agreed to by You and Collabora. No
+licensor, distributor, or reseller is authorised to modify this Agreement
+whether formally or informally.
+
+4) No waiver of any right under this Agreement will be effective unless in
+writing. No waiver of any past or present right will be deemed to be a waiver
+of any future right arising under this Agreement.
+
+5) If any provision in this Agreement is invalid or unenforceable, that
+provision will be construed, limited, modified or, if necessary, severed, to
+the extent necessary, to eliminate its invalidity or unenforceability, and the
+other provisions of this Agreement will remain unaffected.
+
+6) Any products or technical information provided under this Agreement may be
+subject to trade laws of various countries including U.S. export controls. Both
+You and Collabora each agree to comply with all export control regulations and
+to obtain any required licenses or classification to export, re-export or
+import deliverables and Collabora assumes no responsibility for the Your
+failure to comply with any such necessary export control laws, rules or
+regulations.
+
+7) If You are an Organisation You agree that you will not use the Software in
+breach of any relevant laws in the country in which you use the Software, and
+you agree to implement internal safeguards to prevent any unauthorized copying,
+distribution, installation, or use of, or access to, the Software.
+
+8) You may make a reasonable number of copies of the Software over and above
+the number of units of Software for which you have purchased Subscription
+Services Entitlements, purely for backup, archival or other security purposes.
+In so doing You will not be in breach of the terms of this Agreement.
+
+9) Without regard to conflict of laws rules and principles or the United
+Nations Convention of Contracts for the International Sale of Goods, this
+Agreement is governed by the laws of England, and any action relating to this
+Agreement may only be brought before the courts of England.
+
+
+EULA 2020-04-07
+
+------------------------------------------------------------------------------
+
+Collabora Productivity Ltd.
+The Platinum Building
+St John’s Innovation Park
+Cambridge
+CB4 0DS
+United Kingdom
+Registered in England and Wales with company number 08644931
+Telephone: +44 (0)1223 362967
+E-mail: libreoffice at collabora.com
+Web: http://CollaboraOffice.com
diff --git a/Makefile.am b/Makefile.am
index d3c79a36b..cc27e91cf 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -37,7 +37,8 @@ dist_doc_DATA = wsd/README \
wsd/README.vars \
wsd/protocol.txt \
wsd/reference.md \
- wsd/metrics.txt
+ wsd/metrics.txt \
+ EULA
loolwsddatadir = @LOOLWSD_DATADIR@
diff --git a/loolwsd.spec.in b/loolwsd.spec.in
index e8747a5a9..7fc8737f0 100644
--- a/loolwsd.spec.in
+++ b/loolwsd.spec.in
@@ -103,6 +103,7 @@ echo "account required pam_unix.so" >> %{buildroot}/etc/pam.d/loolwsd
/usr/share/loolwsd/discovery.xml
/usr/share/loolwsd/favicon.ico
/usr/share/loolwsd/loleaflet
+/usr/share/doc/loolwsd/EULA
/usr/share/doc/loolwsd/README
/usr/share/doc/loolwsd/README.vars
/usr/share/doc/loolwsd/protocol.txt
commit 9cc39ed6e249e579277e7f9bfc3a12587bd0697b
Author: Andras Timar <andras.timar at collabora.com>
AuthorDate: Tue Feb 25 11:54:14 2020 +0100
Commit: Andras Timar <andras.timar at collabora.com>
CommitDate: Thu May 28 15:29:47 2020 +0200
[cp] Update the .gitreview for this branch.
Change-Id: I9e50cfe2605dfc7b9fbca2d018fdeebb3bb58bb1
Reviewed-on: https://gerrit.libreoffice.org/c/online/+/90742
Tested-by: Andras Timar <andras.timar at collabora.com>
Reviewed-by: Andras Timar <andras.timar at collabora.com>
diff --git a/.gitreview b/.gitreview
index 6907d1470..62b13043a 100644
--- a/.gitreview
+++ b/.gitreview
@@ -3,5 +3,5 @@ host=gerrit.libreoffice.org
port=29418
project=online
defaultremote=logerrit
-defaultbranch=master
+defaultbranch=distro/collabora/co-4-2-4
commit 3de54d583bcbb1287d0eb1189addc0fe2d90aecc
Author: Andras Timar <andras.timar at collabora.com>
AuthorDate: Thu Dec 12 09:30:38 2019 +0100
Commit: Andras Timar <andras.timar at collabora.com>
CommitDate: Thu May 28 15:29:20 2020 +0200
[cp] Use the collabora_svg theme and large icons for the sidebar
Change-Id: I8b58c5e3ebe737abfac1f2c124e00bc717c862df
Reviewed-on: https://gerrit.libreoffice.org/c/online/+/90741
Tested-by: Andras Timar <andras.timar at collabora.com>
Reviewed-by: Andras Timar <andras.timar at collabora.com>
diff --git a/loolkitconfig.xcu b/loolkitconfig.xcu
index 23fe663dc..a2a711711 100644
--- a/loolkitconfig.xcu
+++ b/loolkitconfig.xcu
@@ -25,8 +25,11 @@
<!-- Enable thumbnail generation by default (disabling saves CPU time) -->
<item oor:path="/org.openoffice.Office.Common/Save/Document"><prop oor:name="GenerateThumbnail" oor:op="fuse"><value>true</value></prop></item>
-<!-- Use the colibre_svg theme for the sidebar -->
-<item oor:path="/org.openoffice.Office.Common/Misc"><prop oor:name="SymbolStyle" oor:op="fuse"><value>colibre_svg</value></prop></item>
+<!-- Use the collabora_svg theme for the sidebar -->
+<item oor:path="/org.openoffice.Office.Common/Misc"><prop oor:name="SymbolStyle" oor:op="fuse"><value>collabora_svg</value></prop></item>
+
+<!-- Use the large icons in the sidebar -->
+<item oor:path="/org.openoffice.Office.Common/Misc"><prop oor:name="SidebarIconSize" oor:op="fuse"><value>2</value></prop></item>
<!-- Disable GIO UCP we don't want -->
<item oor:path="/org.openoffice.ucb.Configuration/ContentProviders/Local/SecondaryKeys/Office/ProviderData/Provider999"><prop oor:name="URLTemplate" oor:op="fuse"><value>NeverMatchAnyUrlSuffix</value></prop></item>
commit e31959c9002a58d9363b152b8351855a5935e6bb
Author: Andras Timar <andras.timar at collabora.com>
AuthorDate: Mon Dec 9 17:50:11 2019 +0100
Commit: Andras Timar <andras.timar at collabora.com>
CommitDate: Thu May 28 15:29:15 2020 +0200
[cp] Collabora help URL
Change-Id: I7ba76cab5030d5d637e79ee6414c9963c67211f4
Reviewed-on: https://gerrit.libreoffice.org/c/online/+/90740
Tested-by: Andras Timar <andras.timar at collabora.com>
Reviewed-by: Andras Timar <andras.timar at collabora.com>
diff --git a/loolkitconfig.xcu b/loolkitconfig.xcu
index 539186947..23fe663dc 100644
--- a/loolkitconfig.xcu
+++ b/loolkitconfig.xcu
@@ -11,7 +11,7 @@
<item oor:path="/org.openoffice.Office.Common/AutoCorrect"><prop oor:name="TwoCapitalsAtStart" oor:op="fuse"><value>false</value></prop></item>
<!-- The Help root URL, or empty for no help (hides the help buttons) -->
-<item oor:path="/org.openoffice.Office.Common/Help"><prop oor:name="HelpRootURL" oor:op="fuse"><value>https://help.libreoffice.org/help.html?</value></prop></item>
+<item oor:path="/org.openoffice.Office.Common/Help"><prop oor:name="HelpRootURL" oor:op="fuse"><value>https://help.collaboraoffice.com/help.html?</value></prop></item>
<!-- Enable spell-checking by default -->
<item oor:path="/org.openoffice.Office.Linguistic/SpellChecking"><prop oor:name="IsSpellAuto" oor:op="fuse"><value>true</value></prop></item>
More information about the Libreoffice-commits
mailing list