Merge branch 'c8' into a8

- add some protocols that don't make sense as floating frame
 targets
- warn about exotic protocols as well
- default to ignoring libreoffice special-purpose protocols
 in calc hyperlink
- reuse AllowedLinkProtocolFromDocument in writer
- reuse AllowedLinkProtocolFromDocument in impress/draw
- CVE-2023-6186 backporting

SPECS/libreoffice.spec

@@ -12,7 +12,7 @@
 %global libo_buildfix %{nil}
 # rhbz#715152 state vendor
 %if 0%{?rhel}
-%global vendoroption --with-vendor="Red Hat, Inc."
+%global vendoroption --with-vendor="AlmaLinux"
 %endif
 %if 0%{?fedora}
 %global vendoroption --with-vendor="The Fedora Project"
@@ -54,7 +54,7 @@ Summary:        Free Software Productivity Suite
 Name:           libreoffice
 Epoch:          1
 Version:        %{libo_version}.2
-Release:        18%{?libo_prerelease}%{?dist}
+Release:        18%{?libo_prerelease}%{?dist}.alma.1
 License:        (MPLv1.1 or LGPLv3+) and LGPLv3 and LGPLv2+ and BSD and (MPLv1.1 or GPLv2 or LGPLv2 or Netscape) and Public Domain and ASL 2.0 and MPLv2.0 and CC0
 URL:            http://www.libreoffice.org/
 
@@ -1020,17 +1020,6 @@ git config gc.auto 0 # disable auto packing
 git add -A
 git commit -q -a -m %{name}-%{version}
 
-#Customize Palette to add Red Hat colours
-(head -n -1 extras/source/palettes/standard.soc && \
- echo -e '  <draw:color draw:name="Red Hat 1" draw:color="#cc0000"/>
-  <draw:color draw:name="Red Hat 2" draw:color="#0093d9"/>
-  <draw:color draw:name="Red Hat 3" draw:color="#ff8d00"/>
-  <draw:color draw:name="Red Hat 4" draw:color="#abb400"/>
-  <draw:color draw:name="Red Hat 5" draw:color="#4e376b"/>' && \
- tail -n 1 extras/source/palettes/standard.soc) > redhat.soc
-mv -f redhat.soc extras/source/palettes/standard.soc
-git commit -q -a -m 'add Red Hat colors to palette'
-
 # apply patches
 git am %{patches}
 
@@ -2308,6 +2297,9 @@ done
 %{_includedir}/LibreOfficeKit
 
 %changelog
+* Tue Aug 20 2024 Eduard Abdullin <eabdullin@almalinux.org> - 1:6.4.7.2-18.alma.1
+- Debrand for AlmaLinux
+
 * Thu Aug 15 2024 Eike Rathke <erack@redhat.com> - 1:6.4.7.2-18
 - Fix CVE-2024-6472 remove ability to trust not validated macro signatures in
   high security