component/libreoffice-bin: version up libreoffice 7.5.2.2

and drop support for linux i386 because libreoffice stopped providing
rpms for i386

component/libreoffice-bin/buildout.cfg

@@ -8,11 +8,11 @@ parts =
 
 [libreoffice-bin]
 recipe = slapos.recipe.build
-version = 5.2.4.2
-url = http://downloadarchive.documentfoundation.org/libreoffice/old/${:version}/rpm/${:_url1}/LibreOffice_${:version}_${:_url2}_rpm.tar.gz
+version = 7.5.2.2
+url = https://downloadarchive.documentfoundation.org/libreoffice/old/${:version}/rpm/${:_url1}/LibreOffice_${:version}_${:_url2}_rpm.tar.gz
 
 # where office code can be found?
-officedir = libreoffice5.2
+officedir = libreoffice7.5
 install =
   import os
   import sys
@@ -38,12 +38,14 @@ install =
 cpio = ${cpio:location}/bin/cpio
 rpm2cpio = ${rpm2cpio:target}
 
-[libreoffice-bin:getattr(sys,'_multiarch',None)=='i386-linux-gnu']
-_url1 = x86
-_url2 = Linux_x86
-md5sum = 7a0b33a2d18f06143258c428c32de213
+[libreoffice-bin:getattr(sys,'_multiarch',None)!='x86_64-linux-gnu']
+recipe = plone.recipe.command
+command =
+  echo unsupported architecture
+  false
+stop-on-error = true
 
 [libreoffice-bin:getattr(sys,'_multiarch',None)=='x86_64-linux-gnu']
 _url1 = x86_64
 _url2 = Linux_x86-64
-md5sum = cbea6cd17063b5bcbe0cb32f7819f0cf
+md5sum = efb0351ac9ebd954c43f77d59632bd28

software/cloudooo/buildout.hash.cfg

@@ -18,7 +18,7 @@ md5sum = d1e4d7306c39f2ebc64d0407860d4301
 
 [template-cloudooo-instance]
 filename = instance-cloudooo.cfg.in
-md5sum = 3c499fd3cdfc7915d6eaf1cf4130b56d
+md5sum = 5b83fa6e0a20f0a31605e372e366c8ea
 
 [template-haproxy-cfg]
 filename = haproxy.cfg.in

software/cloudooo/instance-cloudooo.cfg.in

@@ -155,7 +155,7 @@ includes =
 recipe = slapos.cookbook:generic.cloudooo
 ip = {{ ipv4 }}
 environment =
-  LD_LIBRARY_PATH = {{ parameter_dict['cairo'] }}/lib:{{ parameter_dict['cups'] }}/lib:{{ parameter_dict['cups'] }}/lib64:{{ parameter_dict['dbus'] }}/lib:{{ parameter_dict['dbus-glib'] }}/lib:{{ parameter_dict['file'] }}/lib:{{ parameter_dict['fontconfig'] }}/lib:{{ parameter_dict['freetype'] }}/lib:{{ parameter_dict['gcc'] }}/lib:{{ parameter_dict['gcc'] }}/lib64:{{ parameter_dict['glib'] }}/lib:{{ parameter_dict['glu'] }}/lib:{{ parameter_dict['libICE'] }}/lib:{{ parameter_dict['libSM'] }}/lib:{{ parameter_dict['libX11'] }}/lib:{{ parameter_dict['libXau'] }}/lib:{{ parameter_dict['libXdmcp'] }}/lib:{{ parameter_dict['libXext'] }}/lib:{{ parameter_dict['libXrender'] }}/lib:{{ parameter_dict['libexpat'] }}/lib:{{ parameter_dict['libffi'] }}/lib:{{ parameter_dict['libffi'] }}/lib64:{{ parameter_dict['libpng12'] }}/lib:{{ parameter_dict['libxcb'] }}/lib:{{ parameter_dict['mesa'] }}/lib:{{ parameter_dict['pixman'] }}/lib:{{ parameter_dict['xdamage'] }}/lib:{{ parameter_dict['xfixes'] }}/lib:{{ parameter_dict['zlib'] }}/lib
+  LD_LIBRARY_PATH = {{ parameter_dict['avahi'] }}/lib:{{ parameter_dict['cairo'] }}/lib:{{ parameter_dict['cups'] }}/lib:{{ parameter_dict['cups'] }}/lib64:{{ parameter_dict['dbus'] }}/lib:{{ parameter_dict['dbus-glib'] }}/lib:{{ parameter_dict['file'] }}/lib:{{ parameter_dict['fontconfig'] }}/lib:{{ parameter_dict['freetype'] }}/lib:{{ parameter_dict['gcc'] }}/lib:{{ parameter_dict['gcc'] }}/lib64:{{ parameter_dict['glib'] }}/lib:{{ parameter_dict['glu'] }}/lib:{{ parameter_dict['libICE'] }}/lib:{{ parameter_dict['libSM'] }}/lib:{{ parameter_dict['libX11'] }}/lib:{{ parameter_dict['libXau'] }}/lib:{{ parameter_dict['libXdmcp'] }}/lib:{{ parameter_dict['libXext'] }}/lib:{{ parameter_dict['libXrender'] }}/lib:{{ parameter_dict['libexpat'] }}/lib:{{ parameter_dict['libffi'] }}/lib:{{ parameter_dict['libffi'] }}/lib64:{{ parameter_dict['libpng12'] }}/lib:{{ parameter_dict['libxcb'] }}/lib:{{ parameter_dict['mesa'] }}/lib:{{ parameter_dict['nss'] }}/lib:{{ parameter_dict['nspr'] }}/lib:{{ parameter_dict['pixman'] }}/lib:{{ parameter_dict['xdamage'] }}/lib:{{ parameter_dict['xfixes'] }}/lib:{{ parameter_dict['zlib'] }}/lib
   FONTCONFIG_FILE = ${fontconfig-conf:output}
   PATH = ${binary-link:target-directory}
   LANG = C.UTF-8

software/cloudooo/software-common.cfg

@@ -40,6 +40,7 @@ context =
 
 [dynamic-template-cloudooo-instance-parameter-dict]
 apache = ${apache:location}
+avahi = ${avahi:location}
 buildout-bin-directory = ${buildout:bin-directory}
 cairo = ${cairo:location}
 coreutils = ${coreutils:location}
@@ -80,6 +81,8 @@ libpng12 = ${libpng12:location}
 libreoffice-bin = ${libreoffice-bin:location}
 libxcb = ${libxcb:location}
 mesa = ${mesa:location}
+nss = ${nss:location}
+nspr = ${nspr:location}
 openssl = ${openssl:location}
 onlyoffice-core = ${onlyoffice-core:location}
 poppler = ${poppler:location}

software/cloudooo/test/test.py

@@ -195,7 +195,7 @@ class TestWkhtmlToPDF(HTMLtoPDFConversionFontTestMixin, CloudOooTestCase):
 
 class TestLibreoffice(HTMLtoPDFConversionFontTestMixin, CloudOooTestCase):
   __partition_reference__ = 'lo'
-  pdf_producer = 'LibreOffice 5.2'
+  pdf_producer = 'LibreOffice 7.5'
   expected_font_mapping = {
       'Arial': 'LiberationSans',
       'Arial Black': 'DejaVuSans',
@@ -223,7 +223,7 @@ class TestLibreoffice(HTMLtoPDFConversionFontTestMixin, CloudOooTestCase):
       'Liberation Sans Narrow': 'LiberationSansNarrow',
       'Liberation Serif': 'LiberationSerif',
       'Linux LibertineG': 'LinuxLibertineG',
-      'OpenSymbol': 'OpenSymbol',
+      'OpenSymbol': {'OpenSymbol', 'IPAMincho'},
       'Palatino': 'DejaVuSerif',
       'Roboto Black': 'Roboto-Black',
       'Roboto Condensed Light': 'RobotoCondensed-Light',

stack/cloudooo.cfg

 [buildout]
 extends =
   ../stack/slapos.cfg
+  ../component/avahi/buildout.cfg
   ../component/apache/buildout.cfg
   ../component/cloudooo/buildout.cfg
   ../component/coreutils/buildout.cfg
@@ -22,12 +23,12 @@ extends =
   ../component/logrotate/buildout.cfg
   ../component/lxml-python/buildout.cfg
   ../component/mesa/buildout.cfg
+  ../component/nss/buildout.cfg
   ../component/onlyoffice-core/buildout.cfg
+  ../component/openssl/buildout.cfg
   ../component/poppler/buildout.cfg
   ../component/xorg/buildout.cfg
 
-versions = versions
-
 parts =
   ${stack-cloudooo-buildout:parts}