From ada281e3d7756f1c09b97d110a7aa1f956c5670f Mon Sep 17 00:00:00 2001 From: Sandino Araico Sanchez Date: Fri, 18 Aug 2023 05:48:55 -0600 Subject: [PATCH 1/6] 22.05.9.6 compila contra libreofficekit 7.5.5.2-4+gob.mx MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Opciones de compilación que usó @renichbon Archivo coolwsd.service que mandó @renichbon --- CentOS-9/SOURCES/coolwsd.service | 25 +++++++++++++++++ CentOS-9/SPECS/coolwsd.spec | 48 ++++++++++++++++++++++++-------- 2 files changed, 62 insertions(+), 11 deletions(-) create mode 100644 CentOS-9/SOURCES/coolwsd.service diff --git a/CentOS-9/SOURCES/coolwsd.service b/CentOS-9/SOURCES/coolwsd.service new file mode 100644 index 0000000..16867d6 --- /dev/null +++ b/CentOS-9/SOURCES/coolwsd.service @@ -0,0 +1,25 @@ +[Unit] +Description=Collabora Online WebSocket Daemon +After=network.target + +[Service] +EnvironmentFile=-/etc/sysconfig/coolwsd +ExecStart=/usr/bin/coolwsd --version --o:sys_template_path=/usr/lib64/cool/systemplate --o:child_root_path=/usr/lib64/cool/child-roots --o:file_server_root_path=/usr/share/coolwsd +KillSignal=SIGINT +TimeoutStopSec=120 +User=cool +#KillMode=control-group +Restart=always +LimitNOFILE=infinity:infinity + +#ProtectSystem=strict +#ReadWritePaths=/opt/cool /var/log + +ProtectHome=yes +#PrivateTmp=yes +#ProtectControlGroups=yes +#CapabilityBoundingSet=CAP_FOWNER CAP_CHOWN CAP_MKNOD CAP_SYS_CHROOT CAP_SYS_ADMIN + +[Install] +WantedBy=multi-user.target + diff --git a/CentOS-9/SPECS/coolwsd.spec b/CentOS-9/SPECS/coolwsd.spec index 4122d2b..2f4036c 100644 --- a/CentOS-9/SPECS/coolwsd.spec +++ b/CentOS-9/SPECS/coolwsd.spec @@ -12,27 +12,32 @@ Name: coolwsd%{name_suffix} Name: coolwsd %endif Version: 22.05.9.6 -Release: 1%{?dist} +Release: 2%{?dist} Vendor: %{vendor} Summary: Collabora Online WebSocket Daemon -License: EULA +# https://github.com/CollaboraOnline/online/blob/master/COPYING +License: MPL Source0: coolwsd-%{version}.tar.gz +Source1: coolwsd.service BuildRequires: cppunit-devel +BuildRequires: chromium BuildRequires: fontconfig BuildRequires: gcc-c++ BuildRequires: libcap-devel BuildRequires: libpng-devel +BuildRequires: libreoffice-core +BuildRequires: libreofficekit-devel >= 7.5.3 +BuildRequires: libtool BuildRequires: libzstd-devel >= 1.4.0 BuildRequires: m4 BuildRequires: make -BuildRequires: nodejs +BuildRequires: nodejs-devel BuildRequires: npm BuildRequires: pam-devel BuildRequires: poco-devel -BuildRequires: python3 +BuildRequires: python3-polib BuildRequires: systemd-rpm-macros -BuildRequires: libreofficekit-devel >= 7.5.3 # Red Hat and CentOS %if 0%{?rhel} == 7 @@ -88,9 +93,11 @@ Requires: fontconfig libbz2-1 libexpat1 libfreetype6 libpng16-16 libuuid1 %if 0%{?suse_version} %debug_package %endif + %prep %setup + %build libtoolize @@ -102,10 +109,18 @@ scripts/refresh-git-hooks # usando versión marrana (incluyendo una librería embebida) %configure \ - --enable-silent-rules \ - --with-lokit-path=/usr/include/LibreOfficeKit \ - --with-lo-path=/usr/lib64/libreoffice \ - --disable-setcap \ + --disable-androidapp \ + --disable-android-google-play \ + --disable-iosapp \ + --disable-setcap \ + --disable-werror \ + --enable-cypress \ + --enable-debug \ + --enable-silent-rules \ + --with-dictionaries="en_US es_ES es_MX" \ + --with-lokit-path=/usr/include/LibreOfficeKit \ + --with-lo-path=/usr/lib64/libreoffice \ + --with-vendor="Strepsirrhini" %if 0%{?config_options:1} %{config_options} %endif @@ -119,7 +134,8 @@ env BUILDING_FROM_RPMBUILD=yes make %{?_smp_mflags} env BUILDING_FROM_RPMBUILD=yes make install DESTDIR=%{buildroot} install -d -m 755 %{buildroot}/var/adm/fillup-templates %if 0%{?rhel} -install -D -m 444 coolwsd.service %{buildroot}%{_unitdir}/coolwsd.service +install -D -m 444 %{SOURCE1} %{buildroot}%{_unitdir}/coolwsd.service +#install -D -m 444 coolwsd.service %{buildroot}%{_unitdir}/coolwsd.service # systemd in RHEL 7 does not understand these options %if 0%{?rhel} <= 7 sed -i "/^ReadWritePaths/d;/^ProtectControlGroups/d;/^ProtectSystem/d" %{buildroot}%{_unitdir}/coolwsd.service @@ -130,7 +146,8 @@ install -D -m 755 etc/apache2/coolwsd.conf %{buildroot}/etc/httpd/conf rm %{buildroot}/etc/apache2/conf-available/coolwsd.conf %endif %if 0%{?suse_version} -install -D -m 444 coolwsd.service %{buildroot}%{_unitdir}/coolwsd.service +install -D -m 444 %{SOURCE1} %{buildroot}%{_unitdir}/coolwsd.service +#install -D -m 444 coolwsd.service %{buildroot}%{_unitdir}/coolwsd.service install -D -m 644 sysconfig.coolwsd %{buildroot}/var/adm/fillup-templates %endif mkdir -p %{buildroot}/etc/pam.d @@ -259,6 +276,15 @@ if [ -f /etc/loolwsd/loolwsd.xml ]; then /usr/bin/coolconfig migrateconfig --wri %endif %changelog +* Fri Aug 18 2023 Sandino Araico Sánchez - 22.05.9.6-2 +- 22.05.9.6 compila contra libreofficekit 7.5.5.2-4+gob.mx +- Opciones de compilación que usó @renichbon +- Archivo coolwsd.service que mandó @renichbon + +* Tue May 09 2023 Sandino Araico Sánchez - 22.05.9.6-1 +- basado en el spec que subió @imcsk8 de coolwsd cp-22.05.5-4 +- coolws 22.05.9.6 compila contra libreofficekit 7.5.3 + * Mon Aug 03 2015 Mihai Varga - added the cronjob * Tue May 19 2015 Tor Lillqvist From f9b13a9ce6c958cdf53fde5decc89a0a70d96e79 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandino=20Araico=20S=C3=A1nchez?= Date: Tue, 16 Jan 2024 03:27:10 -0600 Subject: [PATCH 2/6] Dependencia hacia harfbuzz >= 5.1.0 --- CentOS-9/SPECS/coolwsd.spec | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/CentOS-9/SPECS/coolwsd.spec b/CentOS-9/SPECS/coolwsd.spec index 2f4036c..9521d76 100644 --- a/CentOS-9/SPECS/coolwsd.spec +++ b/CentOS-9/SPECS/coolwsd.spec @@ -77,6 +77,8 @@ Requires(post): coreutils grep sed cpio 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 +# Esta dependencia la debería jalar Libreoffice #TODO +Requires: harfbuzz >= 5.1.0 %endif %if 0%{?suse_version} @@ -276,6 +278,9 @@ if [ -f /etc/loolwsd/loolwsd.xml ]; then /usr/bin/coolconfig migrateconfig --wri %endif %changelog +* Tue Jan 16 2024 Sandino Araico Sánchez - 22.05.9.6-3 +- Dependencia hacia harfbuzz >= 5.1.0 + * Fri Aug 18 2023 Sandino Araico Sánchez - 22.05.9.6-2 - 22.05.9.6 compila contra libreofficekit 7.5.5.2-4+gob.mx - Opciones de compilación que usó @renichbon From 7dfed94c42af33e224126647ea19b7a68f397302 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandino=20Araico=20S=C3=A1nchez?= Date: Tue, 16 Jan 2024 04:07:30 -0600 Subject: [PATCH 3/6] =?UTF-8?q?Versi=C3=B3n=2022.05.11.1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- CentOS-9/SPECS/coolwsd.spec | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/CentOS-9/SPECS/coolwsd.spec b/CentOS-9/SPECS/coolwsd.spec index 9521d76..aff3f1a 100644 --- a/CentOS-9/SPECS/coolwsd.spec +++ b/CentOS-9/SPECS/coolwsd.spec @@ -11,8 +11,8 @@ Name: coolwsd%{name_suffix} %else Name: coolwsd %endif -Version: 22.05.9.6 -Release: 2%{?dist} +Version: 22.05.11.1 +Release: 1%{?dist} Vendor: %{vendor} Summary: Collabora Online WebSocket Daemon # https://github.com/CollaboraOnline/online/blob/master/COPYING @@ -278,6 +278,9 @@ if [ -f /etc/loolwsd/loolwsd.xml ]; then /usr/bin/coolconfig migrateconfig --wri %endif %changelog +* Tue Jan 16 2024 Sandino Araico Sánchez - 22.05.11.1-1 +- Subida de versión + * Tue Jan 16 2024 Sandino Araico Sánchez - 22.05.9.6-3 - Dependencia hacia harfbuzz >= 5.1.0 From ec1c40fc3670e672d78b348d46c471d7a6bba946 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandino=20Araico=20S=C3=A1nchez?= Date: Tue, 16 Jan 2024 04:41:19 -0600 Subject: [PATCH 4/6] .gitignore --- .gitignore | 2 ++ 1 file changed, 2 insertions(+) create mode 100644 .gitignore diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..f2c6957 --- /dev/null +++ b/.gitignore @@ -0,0 +1,2 @@ +.*.swp +rpm-tmp.* From 36bff2f6091fcc8a3f69942919caa4550374c33b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandino=20Araico=20S=C3=A1nchez?= Date: Tue, 16 Jan 2024 04:42:54 -0600 Subject: [PATCH 5/6] =?UTF-8?q?Versi=C3=B3n=2022.05.14.3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- CentOS-9/SPECS/coolwsd.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/CentOS-9/SPECS/coolwsd.spec b/CentOS-9/SPECS/coolwsd.spec index aff3f1a..b8fab4e 100644 --- a/CentOS-9/SPECS/coolwsd.spec +++ b/CentOS-9/SPECS/coolwsd.spec @@ -11,7 +11,7 @@ Name: coolwsd%{name_suffix} %else Name: coolwsd %endif -Version: 22.05.11.1 +Version: 22.05.14.3 Release: 1%{?dist} Vendor: %{vendor} Summary: Collabora Online WebSocket Daemon @@ -278,6 +278,9 @@ if [ -f /etc/loolwsd/loolwsd.xml ]; then /usr/bin/coolconfig migrateconfig --wri %endif %changelog +* Tue Jan 16 2024 Sandino Araico Sánchez - 22.05.14.3-1 +- Subida de versión + * Tue Jan 16 2024 Sandino Araico Sánchez - 22.05.11.1-1 - Subida de versión From e9018fbf4ed29ea6f8cb7568512a03f7a2d16476 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandino=20Araico=20S=C3=A1nchez?= Date: Tue, 16 Jan 2024 16:54:22 -0600 Subject: [PATCH 6/6] Dependencias de libreoffice >= 7.6.3 --- CentOS-9/SPECS/coolwsd.spec | 34 +++++++++++++++++++--------------- 1 file changed, 19 insertions(+), 15 deletions(-) diff --git a/CentOS-9/SPECS/coolwsd.spec b/CentOS-9/SPECS/coolwsd.spec index b8fab4e..6ac0a9d 100644 --- a/CentOS-9/SPECS/coolwsd.spec +++ b/CentOS-9/SPECS/coolwsd.spec @@ -6,13 +6,15 @@ # License, v. 2.0. If a copy of the MPL was not distributed with this # file, You can obtain one at http://mozilla.org/MPL/2.0/. +%global libo_version 7.6.3 + %if 0%{?name_suffix:1} Name: coolwsd%{name_suffix} %else Name: coolwsd %endif Version: 22.05.14.3 -Release: 1%{?dist} +Release: 2%{?dist} Vendor: %{vendor} Summary: Collabora Online WebSocket Daemon # https://github.com/CollaboraOnline/online/blob/master/COPYING @@ -27,7 +29,7 @@ BuildRequires: gcc-c++ BuildRequires: libcap-devel BuildRequires: libpng-devel BuildRequires: libreoffice-core -BuildRequires: libreofficekit-devel >= 7.5.3 +BuildRequires: libreofficekit-devel >= %{libo_version} BuildRequires: libtool BuildRequires: libzstd-devel >= 1.4.0 BuildRequires: m4 @@ -57,18 +59,19 @@ BuildRequires: libpcap kernel-headers python3-polib python3-lxml BuildRequires: libcap-progs linux-glibc-devel systemd-rpm-macros python3-polib python3-lxml %endif - -Requires: libreoffice -Requires: libreoffice-calc -Requires: libreoffice-core -Requires: libreoffice-draw -Requires: libreoffice-graphicfilter -Requires: libreoffice-impress -Requires: libreoffice-langpack-en -Requires: libreoffice-math -Requires: libreoffice-pdfimport -Requires: libreoffice-ure -Requires: libreoffice-writer +# Si compilamos contra cierta versiónb libreofficekit, vamos a requerir un libreoffice de esa misma +# versióm o nos va a faltar funcionalidad y algo se podría romper. +Requires: libreoffice >= %{libo_version} +Requires: libreoffice-calc >= %{libo_version} +Requires: libreoffice-core >= %{libo_version} +Requires: libreoffice-draw >= %{libo_version} +Requires: libreoffice-graphicfilter >= %{libo_version} +Requires: libreoffice-impress >= %{libo_version} +Requires: libreoffice-langpack-en >= %{libo_version} +Requires: libreoffice-math >= %{libo_version} +Requires: libreoffice-pdfimport >= %{libo_version} +Requires: libreoffice-ure >= %{libo_version} +Requires: libreoffice-writer >= %{libo_version} Requires(post): coreutils grep sed cpio @@ -278,8 +281,9 @@ if [ -f /etc/loolwsd/loolwsd.xml ]; then /usr/bin/coolconfig migrateconfig --wri %endif %changelog -* Tue Jan 16 2024 Sandino Araico Sánchez - 22.05.14.3-1 +* Tue Jan 16 2024 Sandino Araico Sánchez - 22.05.14.3-2 - Subida de versión +- Dependencias de libreoffice >= 7.6.3 * Tue Jan 16 2024 Sandino Araico Sánchez - 22.05.11.1-1 - Subida de versión