[Libreoffice-commits] core.git: Branch 'distro/cib/libreoffice-6-4' - configure.ac
Rebased ref, commits from common ancestor: commit 858c5633738c58022c03a2013bd84d0deaa67433 Author: Thorsten Behrens AuthorDate: Wed Oct 11 11:03:15 2023 +0200 Commit: Thorsten Behrens CommitDate: Wed Oct 11 11:33:01 2023 +0200 Bump version to 6.4.0.21 Change-Id: I271f0093fcaebec9ca9272c4a6aed46dfeba4010 diff --git a/configure.ac b/configure.ac index 5e8904798988..39cc33d13928 100644 --- a/configure.ac +++ b/configure.ac @@ -9,7 +9,7 @@ dnl in order to create a configure script. # several non-alphanumeric characters, those are split off and used only for the # ABOUTBOXPRODUCTVERSIONSUFFIX in openoffice.lst. Why that is necessary, no idea. -AC_INIT([CIB Office],[6.4.0.20],[],[],[https://www.cib.de/office/]) +AC_INIT([CIB Office],[6.4.0.21],[],[],[https://www.cib.de/office/]) dnl libnumbertext needs autoconf 2.68, but that can pick up autoconf268 just fine if it is installed dnl whereas aclocal (as run by autogen.sh) insists on using autoconf and fails hard
[Libreoffice-commits] core.git: Branch 'distro/cib/libreoffice-6-4' - configure.ac
configure.ac |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 6c61a4ea4055786209e7e1981bda32a48ca805b2 Author: Thorsten Behrens AuthorDate: Wed Oct 11 11:03:15 2023 +0200 Commit: Thorsten Behrens CommitDate: Wed Oct 11 11:03:15 2023 +0200 Bump version to 6.4.0.21 Change-Id: I271f0093fcaebec9ca9272c4a6aed46dfeba4010 diff --git a/configure.ac b/configure.ac index 5e8904798988..39cc33d13928 100644 --- a/configure.ac +++ b/configure.ac @@ -9,7 +9,7 @@ dnl in order to create a configure script. # several non-alphanumeric characters, those are split off and used only for the # ABOUTBOXPRODUCTVERSIONSUFFIX in openoffice.lst. Why that is necessary, no idea. -AC_INIT([CIB Office],[6.4.0.20],[],[],[https://www.cib.de/office/]) +AC_INIT([CIB Office],[6.4.0.21],[],[],[https://www.cib.de/office/]) dnl libnumbertext needs autoconf 2.68, but that can pick up autoconf268 just fine if it is installed dnl whereas aclocal (as run by autogen.sh) insists on using autoconf and fails hard
[Libreoffice-commits] core.git: Branch 'distro/cib/libreoffice-6-4' - configure.ac
configure.ac |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit dbb6992156773d0be0ea59b3832516f5f16c1f0c Author: Thorsten Behrens AuthorDate: Fri Jul 28 15:13:08 2023 +0200 Commit: Thorsten Behrens CommitDate: Fri Jul 28 15:13:08 2023 +0200 Bump version to 6.4.0.20 Change-Id: Id3648daeb6ac39b5995629a9ad4aee8ef0dd0857 diff --git a/configure.ac b/configure.ac index 23cfdfc91927..ec3bdb6e3a19 100644 --- a/configure.ac +++ b/configure.ac @@ -9,7 +9,7 @@ dnl in order to create a configure script. # several non-alphanumeric characters, those are split off and used only for the # ABOUTBOXPRODUCTVERSIONSUFFIX in openoffice.lst. Why that is necessary, no idea. -AC_INIT([CIB Office],[6.4.0.19],[],[],[https://www.cib.de/office/]) +AC_INIT([CIB Office],[6.4.0.20],[],[],[https://www.cib.de/office/]) dnl libnumbertext needs autoconf 2.68, but that can pick up autoconf268 just fine if it is installed dnl whereas aclocal (as run by autogen.sh) insists on using autoconf and fails hard
[Libreoffice-commits] core.git: Branch 'distro/cib/libreoffice-6-4' - configure.ac
configure.ac |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 8a471c41ac57f9eee8ea97c4b9e5989b86eec67f Author: Thorsten Behrens AuthorDate: Mon Jun 5 14:16:11 2023 +0200 Commit: Thorsten Behrens CommitDate: Mon Jun 5 14:16:11 2023 +0200 Bump version to 6.4.0.18 Change-Id: Id22c6cc988b547e1f88a2aa82542047d27bd9fe7 diff --git a/configure.ac b/configure.ac index d02695f3c53e..6986a174de09 100644 --- a/configure.ac +++ b/configure.ac @@ -9,7 +9,7 @@ dnl in order to create a configure script. # several non-alphanumeric characters, those are split off and used only for the # ABOUTBOXPRODUCTVERSIONSUFFIX in openoffice.lst. Why that is necessary, no idea. -AC_INIT([CIB Office],[6.4.0.17],[],[],[https://www.cib.de/office/]) +AC_INIT([CIB Office],[6.4.0.18],[],[],[https://www.cib.de/office/]) dnl libnumbertext needs autoconf 2.68, but that can pick up autoconf268 just fine if it is installed dnl whereas aclocal (as run by autogen.sh) insists on using autoconf and fails hard
[Libreoffice-commits] core.git: Branch 'distro/cib/libreoffice-6-4' - configure.ac
configure.ac |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit b3a5e338319903bb1fcffe8a9fc7d84a842df0cb Author: Thorsten Behrens AuthorDate: Tue Apr 4 17:44:27 2023 +0200 Commit: Thorsten Behrens CommitDate: Tue Apr 4 17:44:27 2023 +0200 Bump version to 6.4.0.17 Change-Id: I4312569daa24d18bbdf1cfc3e3eff1b5808dd9ce diff --git a/configure.ac b/configure.ac index 42df61c1050d..d02695f3c53e 100644 --- a/configure.ac +++ b/configure.ac @@ -9,7 +9,7 @@ dnl in order to create a configure script. # several non-alphanumeric characters, those are split off and used only for the # ABOUTBOXPRODUCTVERSIONSUFFIX in openoffice.lst. Why that is necessary, no idea. -AC_INIT([CIB Office],[6.4.0.16],[],[],[https://www.cib.de/office/]) +AC_INIT([CIB Office],[6.4.0.17],[],[],[https://www.cib.de/office/]) dnl libnumbertext needs autoconf 2.68, but that can pick up autoconf268 just fine if it is installed dnl whereas aclocal (as run by autogen.sh) insists on using autoconf and fails hard
[Libreoffice-commits] core.git: Branch 'distro/cib/libreoffice-6-4' - configure.ac
configure.ac |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit d64d7fe3819ca2a771a0c839122374fd9972f649 Author: Thorsten Behrens AuthorDate: Tue Mar 21 12:24:05 2023 +0100 Commit: Thorsten Behrens CommitDate: Tue Mar 21 12:25:09 2023 +0100 Bump version to 6.4.0.16 Change-Id: Ib19bb43fcae58bf20df1bf7a1f5863f9cd6215aa diff --git a/configure.ac b/configure.ac index d2938c0fe5bd..42df61c1050d 100644 --- a/configure.ac +++ b/configure.ac @@ -9,7 +9,7 @@ dnl in order to create a configure script. # several non-alphanumeric characters, those are split off and used only for the # ABOUTBOXPRODUCTVERSIONSUFFIX in openoffice.lst. Why that is necessary, no idea. -AC_INIT([CIB Office],[6.4.0.15],[],[],[https://www.cib.de/office/]) +AC_INIT([CIB Office],[6.4.0.16],[],[],[https://www.cib.de/office/]) dnl libnumbertext needs autoconf 2.68, but that can pick up autoconf268 just fine if it is installed dnl whereas aclocal (as run by autogen.sh) insists on using autoconf and fails hard
[Libreoffice-commits] core.git: Branch 'distro/cib/libreoffice-6-4' - configure.ac
configure.ac |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 41ad5981336b573065c78f518bfa8d90aeb27297 Author: Thorsten Behrens AuthorDate: Sun Feb 12 23:42:44 2023 +0100 Commit: Thorsten Behrens CommitDate: Sun Feb 12 23:42:44 2023 +0100 Bump version to 6.4.0.15 Change-Id: I41bbe7003e8caa2905b9434ae4f3a0169cc22df6 diff --git a/configure.ac b/configure.ac index ffad4a34d700..d2938c0fe5bd 100644 --- a/configure.ac +++ b/configure.ac @@ -9,7 +9,7 @@ dnl in order to create a configure script. # several non-alphanumeric characters, those are split off and used only for the # ABOUTBOXPRODUCTVERSIONSUFFIX in openoffice.lst. Why that is necessary, no idea. -AC_INIT([CIB Office],[6.4.0.14],[],[],[https://www.cib.de/office/]) +AC_INIT([CIB Office],[6.4.0.15],[],[],[https://www.cib.de/office/]) dnl libnumbertext needs autoconf 2.68, but that can pick up autoconf268 just fine if it is installed dnl whereas aclocal (as run by autogen.sh) insists on using autoconf and fails hard
[Libreoffice-commits] core.git: Branch 'distro/cib/libreoffice-6-4' - configure.ac
configure.ac |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 666bd11813e99f46373eec5b448dddfdaecdf355 Author: Thorsten Behrens AuthorDate: Mon Dec 26 01:23:38 2022 +0100 Commit: Thorsten Behrens CommitDate: Mon Dec 26 01:23:38 2022 +0100 Bump version to 6.4.0.14 Change-Id: I4768cc2c2bcdb6fb62274a4447e6d16b94fb289c diff --git a/configure.ac b/configure.ac index 06923e7c0f72..ba42d020d5d0 100644 --- a/configure.ac +++ b/configure.ac @@ -9,7 +9,7 @@ dnl in order to create a configure script. # several non-alphanumeric characters, those are split off and used only for the # ABOUTBOXPRODUCTVERSIONSUFFIX in openoffice.lst. Why that is necessary, no idea. -AC_INIT([CIB Office],[6.4.0.13],[],[],[https://www.cib.de/office/]) +AC_INIT([CIB Office],[6.4.0.14],[],[],[https://www.cib.de/office/]) dnl libnumbertext needs autoconf 2.68, but that can pick up autoconf268 just fine if it is installed dnl whereas aclocal (as run by autogen.sh) insists on using autoconf and fails hard
[Libreoffice-commits] core.git: Branch 'distro/cib/libreoffice-6-4' - configure.ac
configure.ac |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 1e97905ed15094c00524e459ac4a4dab3faa4609 Author: Thorsten Behrens AuthorDate: Tue Nov 29 12:19:05 2022 +0100 Commit: Thorsten Behrens CommitDate: Tue Nov 29 12:19:05 2022 +0100 Bump version to 6.4.0.13 Change-Id: Ia41641c6344c5951f07852de68b9e7c4e174d18b diff --git a/configure.ac b/configure.ac index 1ffe98b1b1ff..1c764595515a 100644 --- a/configure.ac +++ b/configure.ac @@ -9,7 +9,7 @@ dnl in order to create a configure script. # several non-alphanumeric characters, those are split off and used only for the # ABOUTBOXPRODUCTVERSIONSUFFIX in openoffice.lst. Why that is necessary, no idea. -AC_INIT([CIB Office],[6.4.0.12],[],[],[https://www.cib.de/office/]) +AC_INIT([CIB Office],[6.4.0.13],[],[],[https://www.cib.de/office/]) dnl libnumbertext needs autoconf 2.68, but that can pick up autoconf268 just fine if it is installed dnl whereas aclocal (as run by autogen.sh) insists on using autoconf and fails hard
[Libreoffice-commits] core.git: Branch 'distro/cib/libreoffice-6-4' - configure.ac
configure.ac |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 0ee8e29fa6cb898780c465033e1d855d8e8e9234 Author: Thorsten Behrens AuthorDate: Fri Oct 21 09:21:42 2022 +0200 Commit: Thorsten Behrens CommitDate: Fri Oct 21 09:21:42 2022 +0200 Bump version to 6.4.0.12 Change-Id: I13976f60cdec2ca0a1c372e324db804caa241904 diff --git a/configure.ac b/configure.ac index 760d6204d511..1ffe98b1b1ff 100644 --- a/configure.ac +++ b/configure.ac @@ -9,7 +9,7 @@ dnl in order to create a configure script. # several non-alphanumeric characters, those are split off and used only for the # ABOUTBOXPRODUCTVERSIONSUFFIX in openoffice.lst. Why that is necessary, no idea. -AC_INIT([CIB Office],[6.4.0.11],[],[],[https://www.cib.de/office/]) +AC_INIT([CIB Office],[6.4.0.12],[],[],[https://www.cib.de/office/]) dnl libnumbertext needs autoconf 2.68, but that can pick up autoconf268 just fine if it is installed dnl whereas aclocal (as run by autogen.sh) insists on using autoconf and fails hard
[Libreoffice-commits] core.git: Branch 'distro/cib/libreoffice-6-4' - configure.ac
configure.ac |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit aa69f260a0c62581861cba642caa148e200044bc Author: Thorsten Behrens AuthorDate: Fri Oct 7 15:36:15 2022 +0200 Commit: Thorsten Behrens CommitDate: Fri Oct 7 15:37:05 2022 +0200 Bump version to 6.4.0.11 Change-Id: Id3998ac42162efdaa14292109c3b483586cd8d0f diff --git a/configure.ac b/configure.ac index db01622ac678..760d6204d511 100644 --- a/configure.ac +++ b/configure.ac @@ -9,7 +9,7 @@ dnl in order to create a configure script. # several non-alphanumeric characters, those are split off and used only for the # ABOUTBOXPRODUCTVERSIONSUFFIX in openoffice.lst. Why that is necessary, no idea. -AC_INIT([CIB Office],[6.4.0.10],[],[],[https://www.cib.de/office/]) +AC_INIT([CIB Office],[6.4.0.11],[],[],[https://www.cib.de/office/]) dnl libnumbertext needs autoconf 2.68, but that can pick up autoconf268 just fine if it is installed dnl whereas aclocal (as run by autogen.sh) insists on using autoconf and fails hard
[Libreoffice-commits] core.git: Branch 'distro/cib/libreoffice-6-4' - configure.ac
configure.ac |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit bff9f605b3c9ea2eec7f7fd5a2f7cc356c86956c Author: Thorsten Behrens AuthorDate: Sun Aug 28 23:39:42 2022 +0200 Commit: Thorsten Behrens CommitDate: Sun Aug 28 23:39:42 2022 +0200 Bump version to 6.4.0.10 Change-Id: Ib17648d2a8344e4fccad19fb1b92924ae08a66b2 diff --git a/configure.ac b/configure.ac index 687bae94c8e2..424142530df5 100644 --- a/configure.ac +++ b/configure.ac @@ -9,7 +9,7 @@ dnl in order to create a configure script. # several non-alphanumeric characters, those are split off and used only for the # ABOUTBOXPRODUCTVERSIONSUFFIX in openoffice.lst. Why that is necessary, no idea. -AC_INIT([CIB Office],[6.4.0.9],[],[],[https://www.cib.de/ciboffice/]) +AC_INIT([CIB Office],[6.4.0.10],[],[],[https://www.cib.de/ciboffice/]) dnl libnumbertext needs autoconf 2.68, but that can pick up autoconf268 just fine if it is installed dnl whereas aclocal (as run by autogen.sh) insists on using autoconf and fails hard
[Libreoffice-commits] core.git: Branch 'distro/cib/libreoffice-6-4' - configure.ac instsetoo_native/inc_ooohelppack instsetoo_native/util sfx2/source svx/source
configure.ac|2 +-
instsetoo_native/inc_ooohelppack/windows/msi_templates/Property.idt |6
+++---
instsetoo_native/util/openoffice.lst.in |8
sfx2/source/appl/appserv.cxx|2 +-
svx/source/dialog/SafeModeDialog.cxx|2 +-
5 files changed, 10 insertions(+), 10 deletions(-)
New commits:
commit 811324120833d9be42b1571dc4317797bd039272
Author: Samuel Mehrbrodt
AuthorDate: Mon Jun 20 12:04:52 2022 +0200
Commit: Samuel Mehrbrodt
CommitDate: Mon Jun 20 12:04:52 2022 +0200
Fix domain
Change-Id: Ic8b21b649ba539d86a2802ddd4f2aaf670d0719b
diff --git a/configure.ac b/configure.ac
index 1510a55b055c..5243821494e3 100644
--- a/configure.ac
+++ b/configure.ac
@@ -9,7 +9,7 @@ dnl in order to create a configure script.
# several non-alphanumeric characters, those are split off and used only for
the
# ABOUTBOXPRODUCTVERSIONSUFFIX in openoffice.lst. Why that is necessary, no
idea.
-AC_INIT([LibreOffice powered by
CIB],[6.4.0.9],[],[],[http://libreoffice.cib.de/])
+AC_INIT([LibreOffice powered by
CIB],[6.4.0.9],[],[],[https://www.cib.de/libreoffice-poweredbycib/])
dnl libnumbertext needs autoconf 2.68, but that can pick up autoconf268 just
fine if it is installed
dnl whereas aclocal (as run by autogen.sh) insists on using autoconf and fails
hard
diff --git
a/instsetoo_native/inc_ooohelppack/windows/msi_templates/Property.idt
b/instsetoo_native/inc_ooohelppack/windows/msi_templates/Property.idt
index 410f48b8bec2..6f92cc4a621e 100644
--- a/instsetoo_native/inc_ooohelppack/windows/msi_templates/Property.idt
+++ b/instsetoo_native/inc_ooohelppack/windows/msi_templates/Property.idt
@@ -8,9 +8,9 @@ ApplicationUsersAllUsers
ALLUSERS 1
ARPCOMMENTSARPCOMMENTSTEMPLATE
ARPCONTACT CIB software GmbH
-ARPHELPLINKhttps://libreoffice.cib.de
-ARPURLINFOABOUThttps://libreoffice.cib.de
-ARPURLUPDATEINFO https://libreoffice.cib.de
+ARPHELPLINKhttps://www.cib.de/libreoffice-poweredbycib
+ARPURLINFOABOUThttps://www.cib.de/libreoffice-poweredbycib
+ARPURLUPDATEINFO https://www.cib.de/libreoffice-poweredbycib
DefaultUIFont Tahoma8
DialogCaption Windows Installer
DiskPrompt [1]
diff --git a/instsetoo_native/util/openoffice.lst.in
b/instsetoo_native/util/openoffice.lst.in
index fd9bf814efb9..4c8092e8b099 100644
--- a/instsetoo_native/util/openoffice.lst.in
+++ b/instsetoo_native/util/openoffice.lst.in
@@ -70,7 +70,7 @@ LibreOfficePoweredByCIB
CHANGETARGETDIR 1
PATCHCODEFILE ooo_patchcodes.txt
STARTCENTER_ADDFEATURE_URL http://extensions.libreoffice.org/
-STARTCENTER_INFO_URL https://libreoffice.cib.de
+STARTCENTER_INFO_URL https://www.cib.de/libreoffice-poweredbycib
STARTCENTER_TEMPLREP_URL http://templates.libreoffice.org/
DICT_REPO_URL http://extensions.libreoffice.org/dictionaries/
STARTCENTER_HIDE_EXTERNAL_LINKS 0
@@ -123,7 +123,7 @@ LibreOfficePoweredByCIBDev
CODEFILENAME codes_ooodev.txt
LOCALUSERDIR $ORIGIN/..
STARTCENTER_ADDFEATURE_URL https://extensions.libreoffice.org/
-STARTCENTER_INFO_URL https://libreoffice.cib.de
+STARTCENTER_INFO_URL https://www.cib.de/libreoffice-poweredbycib
STARTCENTER_TEMPLREP_URL https://templates.libreoffice.org/
DICT_REPO_URL https://extensions.libreoffice.org/dictionaries/
}
@@ -164,7 +164,7 @@ LibreOfficePoweredByCIB_SDK
CHANGETARGETDIR 1
DONTUSESTARTMENUFOLDER 1
STARTCENTER_ADDFEATURE_URL https://extensions.libreoffice.org/
-STARTCENTER_INFO_URL https://libreoffice.cib.de
+STARTCENTER_INFO_URL https://www.cib.de/libreoffice-poweredbycib
STARTCENTER_TEMPLREP_URL https://templates.libreoffice.org/
DICT_REPO_URL https://extensions.libreoffice.org/dictionaries/
}
@@ -209,7 +209,7 @@ LibreOfficePoweredByCIBDev_SDK
CHANGETARGETDIR 1
DONTUSESTARTMENUFOLDER 1
STARTCENTER_ADDFEATURE_URL https://extensions.libreoffice.org/
-STARTCENTER_INFO_URL https://libreoffice.cib.de
+STARTCENTER_INFO_URL https://www.cib.de/libreoffice-poweredbycib
STARTCENTER_TEMPLREP_URL https://templates.libreoffice.org/
DICT_REPO_URL https://extensions.libreoffice.org/dictionaries/
}
diff --git a/sfx2/source/appl/appserv.cxx b/sfx2/source/appl/appserv.cxx
index 400833f9dc79..9df5f4232445 100644
--- a/sfx2/source/appl/appserv.cxx
+++ b/sfx2/source/appl/appserv.cxx
@@ -549,7 +549,7 @@ void SfxApplication::MiscExec_Impl( SfxRequest& rReq )
case SID_SEND_FEEDBACK:
{
-sfx2::openUriExternally("https://libreoffice.cib.de;, false);
+
[Libreoffice-commits] core.git: Branch 'distro/cib/libreoffice-6-4' - configure.ac instsetoo_native/inc_ooohelppack
configure.ac|2 +- instsetoo_native/inc_ooohelppack/windows/msi_templates/Property.idt |6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) New commits: commit 814b1ec465c381a82f58ad3357c0f172eb0d7bae Author: Samuel Mehrbrodt AuthorDate: Mon Jun 20 11:52:53 2022 +0200 Commit: Samuel Mehrbrodt CommitDate: Mon Jun 20 11:52:53 2022 +0200 Fix domain Change-Id: I7714ebc2a332352bd97be87c548a69c05e026c99 diff --git a/configure.ac b/configure.ac index e104a4dd5a27..1510a55b055c 100644 --- a/configure.ac +++ b/configure.ac @@ -9,7 +9,7 @@ dnl in order to create a configure script. # several non-alphanumeric characters, those are split off and used only for the # ABOUTBOXPRODUCTVERSIONSUFFIX in openoffice.lst. Why that is necessary, no idea. -AC_INIT([LibreOffice powered by CIB],[6.4.0.9],[],[],[http://libreoffice.cib.eu/]) +AC_INIT([LibreOffice powered by CIB],[6.4.0.9],[],[],[http://libreoffice.cib.de/]) dnl libnumbertext needs autoconf 2.68, but that can pick up autoconf268 just fine if it is installed dnl whereas aclocal (as run by autogen.sh) insists on using autoconf and fails hard diff --git a/instsetoo_native/inc_ooohelppack/windows/msi_templates/Property.idt b/instsetoo_native/inc_ooohelppack/windows/msi_templates/Property.idt index 1e78c7476822..410f48b8bec2 100644 --- a/instsetoo_native/inc_ooohelppack/windows/msi_templates/Property.idt +++ b/instsetoo_native/inc_ooohelppack/windows/msi_templates/Property.idt @@ -8,9 +8,9 @@ ApplicationUsersAllUsers ALLUSERS 1 ARPCOMMENTSARPCOMMENTSTEMPLATE ARPCONTACT CIB software GmbH -ARPHELPLINKhttps://libreoffice.cib.eu -ARPURLINFOABOUThttps://libreoffice.cib.eu -ARPURLUPDATEINFO https://libreoffice.cib.eu +ARPHELPLINKhttps://libreoffice.cib.de +ARPURLINFOABOUThttps://libreoffice.cib.de +ARPURLUPDATEINFO https://libreoffice.cib.de DefaultUIFont Tahoma8 DialogCaption Windows Installer DiskPrompt [1]
[Libreoffice-commits] core.git: Branch 'distro/cib/libreoffice-6-4' - configure.ac
configure.ac |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit c90f68490430246a53180b6cf35d696021502911 Author: Thorsten Behrens AuthorDate: Mon Jun 20 11:12:06 2022 +0200 Commit: Thorsten Behrens CommitDate: Mon Jun 20 11:12:06 2022 +0200 Bump version to 6.4.0.9 Change-Id: I92aef966a5842fde8a1589165282d8eb9706960b diff --git a/configure.ac b/configure.ac index dbf980544554..e104a4dd5a27 100644 --- a/configure.ac +++ b/configure.ac @@ -9,7 +9,7 @@ dnl in order to create a configure script. # several non-alphanumeric characters, those are split off and used only for the # ABOUTBOXPRODUCTVERSIONSUFFIX in openoffice.lst. Why that is necessary, no idea. -AC_INIT([LibreOffice powered by CIB],[6.4.0.8],[],[],[http://libreoffice.cib.eu/]) +AC_INIT([LibreOffice powered by CIB],[6.4.0.9],[],[],[http://libreoffice.cib.eu/]) dnl libnumbertext needs autoconf 2.68, but that can pick up autoconf268 just fine if it is installed dnl whereas aclocal (as run by autogen.sh) insists on using autoconf and fails hard
[Libreoffice-commits] core.git: Branch 'distro/cib/libreoffice-6-4' - configure.ac
configure.ac |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 843d38d679c3c3d4a73267bd1e09556326c2765b Author: Michael Stahl AuthorDate: Tue May 10 15:24:30 2022 +0200 Commit: Michael Stahl CommitDate: Tue May 10 15:24:30 2022 +0200 Bump version to 6.4.0.8 Change-Id: I2af486b699fee3925d685f8d61d21e8ca64d8af1 diff --git a/configure.ac b/configure.ac index ee45f23f823c..af3e00774bdd 100644 --- a/configure.ac +++ b/configure.ac @@ -9,7 +9,7 @@ dnl in order to create a configure script. # several non-alphanumeric characters, those are split off and used only for the # ABOUTBOXPRODUCTVERSIONSUFFIX in openoffice.lst. Why that is necessary, no idea. -AC_INIT([LibreOffice powered by CIB],[6.4.0.7],[],[],[http://libreoffice.cib.eu/]) +AC_INIT([LibreOffice powered by CIB],[6.4.0.8],[],[],[http://libreoffice.cib.eu/]) dnl libnumbertext needs autoconf 2.68, but that can pick up autoconf268 just fine if it is installed dnl whereas aclocal (as run by autogen.sh) insists on using autoconf and fails hard
[Libreoffice-commits] core.git: Branch 'distro/cib/libreoffice-6-4' - configure.ac
configure.ac |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 444d52aa0acaf1f9dd40bf8efb6f029b9b9d1131 Author: Thorsten Behrens AuthorDate: Tue Apr 12 17:08:04 2022 +0200 Commit: Thorsten Behrens CommitDate: Tue Apr 12 17:08:04 2022 +0200 Bump version to 6.4.0.7 Change-Id: Ib2312b5b49571e0202c2edc5d14eb6a067f9eab6 diff --git a/configure.ac b/configure.ac index 4b05fb8f9a54..ee45f23f823c 100644 --- a/configure.ac +++ b/configure.ac @@ -9,7 +9,7 @@ dnl in order to create a configure script. # several non-alphanumeric characters, those are split off and used only for the # ABOUTBOXPRODUCTVERSIONSUFFIX in openoffice.lst. Why that is necessary, no idea. -AC_INIT([LibreOffice powered by CIB],[6.4.0.6],[],[],[http://libreoffice.cib.eu/]) +AC_INIT([LibreOffice powered by CIB],[6.4.0.7],[],[],[http://libreoffice.cib.eu/]) dnl libnumbertext needs autoconf 2.68, but that can pick up autoconf268 just fine if it is installed dnl whereas aclocal (as run by autogen.sh) insists on using autoconf and fails hard
[Libreoffice-commits] core.git: Branch 'distro/cib/libreoffice-6-4' - configure.ac
configure.ac |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 62343ba171932de1e54a8a63c781b3242cfcc26c Author: Thorsten Behrens AuthorDate: Wed Mar 16 19:15:24 2022 +0100 Commit: Thorsten Behrens CommitDate: Wed Mar 16 19:15:24 2022 +0100 Bump version to 6.4.0.6 Change-Id: Ibeef3d390985232ea12bbbf6df5478323201a923 diff --git a/configure.ac b/configure.ac index 1a0305742346..32ee34f50ffe 100644 --- a/configure.ac +++ b/configure.ac @@ -9,7 +9,7 @@ dnl in order to create a configure script. # several non-alphanumeric characters, those are split off and used only for the # ABOUTBOXPRODUCTVERSIONSUFFIX in openoffice.lst. Why that is necessary, no idea. -AC_INIT([LibreOffice powered by CIB],[6.4.0.5],[],[],[http://libreoffice.cib.eu/]) +AC_INIT([LibreOffice powered by CIB],[6.4.0.6],[],[],[http://libreoffice.cib.eu/]) dnl libnumbertext needs autoconf 2.68, but that can pick up autoconf268 just fine if it is installed dnl whereas aclocal (as run by autogen.sh) insists on using autoconf and fails hard
[Libreoffice-commits] core.git: Branch 'distro/cib/libreoffice-6-4' - configure.ac
configure.ac |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 55b70f54925603b044f2dd40b516f55fafdde735 Author: Thorsten Behrens AuthorDate: Thu Feb 24 19:08:23 2022 +0100 Commit: Thorsten Behrens CommitDate: Thu Feb 24 19:08:23 2022 +0100 Bump version to 6.4.0.5 Change-Id: Idc378f605aab6d8a65568c8553c411f574319f2a diff --git a/configure.ac b/configure.ac index 796a02f2e30a..338c8b881065 100644 --- a/configure.ac +++ b/configure.ac @@ -9,7 +9,7 @@ dnl in order to create a configure script. # several non-alphanumeric characters, those are split off and used only for the # ABOUTBOXPRODUCTVERSIONSUFFIX in openoffice.lst. Why that is necessary, no idea. -AC_INIT([LibreOffice powered by CIB],[6.4.0.4.0],[],[],[http://libreoffice.cib.eu/]) +AC_INIT([LibreOffice powered by CIB],[6.4.0.5.0],[],[],[http://libreoffice.cib.eu/]) dnl libnumbertext needs autoconf 2.68, but that can pick up autoconf268 just fine if it is installed dnl whereas aclocal (as run by autogen.sh) insists on using autoconf and fails hard
[Libreoffice-commits] core.git: Branch 'distro/cib/libreoffice-6-4' - configure.ac
configure.ac |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit d33ec2dcf20dfa938fde26db9cf42ebbd0ffe40b Author: Thorsten Behrens AuthorDate: Mon Feb 7 10:55:13 2022 +0100 Commit: Thorsten Behrens CommitDate: Mon Feb 7 10:55:13 2022 +0100 Bump version to 6.4.0.4 Change-Id: I0e9e68d6f0f30d522e16455a20f89cd31d7c5438 diff --git a/configure.ac b/configure.ac index d6f1b0b055ce..796a02f2e30a 100644 --- a/configure.ac +++ b/configure.ac @@ -9,7 +9,7 @@ dnl in order to create a configure script. # several non-alphanumeric characters, those are split off and used only for the # ABOUTBOXPRODUCTVERSIONSUFFIX in openoffice.lst. Why that is necessary, no idea. -AC_INIT([LibreOffice powered by CIB],[6.4.0.3.0],[],[],[http://libreoffice.cib.eu/]) +AC_INIT([LibreOffice powered by CIB],[6.4.0.4.0],[],[],[http://libreoffice.cib.eu/]) dnl libnumbertext needs autoconf 2.68, but that can pick up autoconf268 just fine if it is installed dnl whereas aclocal (as run by autogen.sh) insists on using autoconf and fails hard
[Libreoffice-commits] core.git: Branch 'distro/cib/libreoffice-6-4' - configure.ac
configure.ac |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit e61367ca3b4a5440b91d2c4d29c773a6d2fe598d Author: Thorsten Behrens AuthorDate: Fri Jan 7 19:29:30 2022 +0100 Commit: Thorsten Behrens CommitDate: Fri Jan 7 19:29:30 2022 +0100 Bump version to 6.4.0.3 Change-Id: Id07a3d58b4aad4ea278db84e389ef408fba449c2 diff --git a/configure.ac b/configure.ac index 5a9db4590d70..970b5b7ab0f0 100644 --- a/configure.ac +++ b/configure.ac @@ -9,7 +9,7 @@ dnl in order to create a configure script. # several non-alphanumeric characters, those are split off and used only for the # ABOUTBOXPRODUCTVERSIONSUFFIX in openoffice.lst. Why that is necessary, no idea. -AC_INIT([LibreOffice powered by CIB],[6.4.0.2.0],[],[],[http://libreoffice.cib.eu/]) +AC_INIT([LibreOffice powered by CIB],[6.4.0.3.0],[],[],[http://libreoffice.cib.eu/]) dnl libnumbertext needs autoconf 2.68, but that can pick up autoconf268 just fine if it is installed dnl whereas aclocal (as run by autogen.sh) insists on using autoconf and fails hard
[Libreoffice-commits] core.git: Branch 'distro/cib/libreoffice-6-4' - configure.ac
configure.ac |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 1703c19f8f4fd1442d4aba77d2cf84e9234e1eff Author: Thorsten Behrens AuthorDate: Mon Dec 6 00:02:43 2021 +0100 Commit: Thorsten Behrens CommitDate: Mon Dec 6 00:02:43 2021 +0100 Bump version to 6.4.0.2 Change-Id: I6597543b6211fa5f7cf661f76c81778d7cddd3b0 diff --git a/configure.ac b/configure.ac index 275f2436e2bf..2408cdacc2bc 100644 --- a/configure.ac +++ b/configure.ac @@ -9,7 +9,7 @@ dnl in order to create a configure script. # several non-alphanumeric characters, those are split off and used only for the # ABOUTBOXPRODUCTVERSIONSUFFIX in openoffice.lst. Why that is necessary, no idea. -AC_INIT([LibreOffice powered by CIB],[6.4.0.1.0],[],[],[http://libreoffice.cib.eu/]) +AC_INIT([LibreOffice powered by CIB],[6.4.0.2.0],[],[],[http://libreoffice.cib.eu/]) dnl libnumbertext needs autoconf 2.68, but that can pick up autoconf268 just fine if it is installed dnl whereas aclocal (as run by autogen.sh) insists on using autoconf and fails hard
[Libreoffice-commits] core.git: Branch 'distro/cib/libreoffice-6-4' - configure.ac
configure.ac |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 392acd06e0f7280b2f1700f59412c630a5dc6ada Author: Thorsten Behrens AuthorDate: Tue Nov 2 15:49:19 2021 +0100 Commit: Thorsten Behrens CommitDate: Tue Nov 2 15:49:19 2021 +0100 Bump version to 6.4.0.1 Change-Id: I15a3a9976aa0aee2884f6969c78a7d6370f0c4e7 diff --git a/configure.ac b/configure.ac index 000ed8c340c7..6ed1a489545e 100644 --- a/configure.ac +++ b/configure.ac @@ -9,7 +9,7 @@ dnl in order to create a configure script. # several non-alphanumeric characters, those are split off and used only for the # ABOUTBOXPRODUCTVERSIONSUFFIX in openoffice.lst. Why that is necessary, no idea. -AC_INIT([LibreOffice powered by CIB],[6.4.0.0.0+],[],[],[http://libreoffice.cib.eu/]) +AC_INIT([LibreOffice powered by CIB],[6.4.0.1.0],[],[],[http://libreoffice.cib.eu/]) dnl libnumbertext needs autoconf 2.68, but that can pick up autoconf268 just fine if it is installed dnl whereas aclocal (as run by autogen.sh) insists on using autoconf and fails hard
[Libreoffice-commits] core.git: Branch 'distro/cib/libreoffice-6-4' - configure.ac download.lst external/python3
configure.ac
|2
download.lst
|4
external/python3/0001-3.6-bpo-17239-Disable-external-entities-in-SAX-parse.patch.1
| 59 --
external/python3/python-3.3.0-darwin.patch.1
|2
4 files changed, 4 insertions(+), 63 deletions(-)
New commits:
commit 576be77c00bf925b02405da3a13236526a8948b4
Author: Michael Stahl
AuthorDate: Wed Feb 17 13:56:52 2021 +0100
Commit: Michael Stahl
CommitDate: Wed Feb 17 15:46:51 2021 +0100
python3: upgrade to release 3.7.10
Fixes CVE-2021-3177 plus these less important ones:
CVE-2021-23336 CVE-2020-27619 CVE-2020-14422 CVE-2020-26116
CVE-2019-20907 CVE-2020-8492 CVE-2019-18348
Change-Id: I8e83395bd3e871eb2ed030a03827b7d261c96049
diff --git a/configure.ac b/configure.ac
index 211ec987d05f..000ed8c340c7 100644
--- a/configure.ac
+++ b/configure.ac
@@ -8798,7 +8798,7 @@ internal)
SYSTEM_PYTHON=
PYTHON_VERSION_MAJOR=3
PYTHON_VERSION_MINOR=7
-PYTHON_VERSION=${PYTHON_VERSION_MAJOR}.${PYTHON_VERSION_MINOR}.7
+PYTHON_VERSION=${PYTHON_VERSION_MAJOR}.${PYTHON_VERSION_MINOR}.10
if ! grep -q -i python.*${PYTHON_VERSION} ${SRC_ROOT}/download.lst; then
AC_MSG_ERROR([PYTHON_VERSION ${PYTHON_VERSION} but no matching file in
download.lst])
fi
diff --git a/download.lst b/download.lst
index bdbed280f3e0..702a921e929b 100644
--- a/download.lst
+++ b/download.lst
@@ -212,8 +212,8 @@ export POPPLER_SHA256SUM :=
016dde34e5f868ea98a32ca99b643325a9682281500942b7113f
export POPPLER_TARBALL := poppler-21.01.0.tar.xz
export POSTGRESQL_SHA256SUM :=
12345c83b89aa29808568977f5200d6da00f88a035517f925293355432ffe61f
export POSTGRESQL_TARBALL := postgresql-13.1.tar.bz2
-export PYTHON_SHA256SUM :=
06a0a9f1bf0d8cd1e4121194d666c4e28ddae4dd54346de6c343206599f02136
-export PYTHON_TARBALL := Python-3.7.7.tar.xz
+export PYTHON_SHA256SUM :=
f8d82e7572c86ec9d55c8627aae5040124fd2203af400c383c821b980306ee6b
+export PYTHON_TARBALL := Python-3.7.10.tar.xz
export QRCODEGEN_SHA256SUM :=
fcdf9fd69fde07ae4dca2351d84271a9de8093002f733b77c70f52f1630f6e4a
export QRCODEGEN_TARBALL := QR-Code-generator-1.4.0.tar.gz
export QXP_SHA256SUM :=
e137b6b110120a52c98edd02ebdc4095ee08d0d5295a94316a981750095a945c
diff --git
a/external/python3/0001-3.6-bpo-17239-Disable-external-entities-in-SAX-parse.patch.1
b/external/python3/0001-3.6-bpo-17239-Disable-external-entities-in-SAX-parse.patch.1
deleted file mode 100644
index 489e5d0e89ee..
---
a/external/python3/0001-3.6-bpo-17239-Disable-external-entities-in-SAX-parse.patch.1
+++ /dev/null
@@ -1,59 +0,0 @@
-From 582d188e6e3487180891f1fc457a80dec8be26a8 Mon Sep 17 00:00:00 2001
-From: Christian Heimes
-Date: Mon, 24 Sep 2018 14:38:31 +0200
-Subject: [PATCH] [3.6] bpo-17239: Disable external entities in SAX parser
- (GH-9217) (GH-9512)
-
-The SAX parser no longer processes general external entities by default
-to increase security. Before, the parser created network connections
-to fetch remote files or loaded local files from the file system for DTD
-and entities.
-
-Signed-off-by: Christian Heimes
-
-https://bugs.python.org/issue17239.
-(cherry picked from commit 17b1d5d4e36aa57a9b25a0e694affbd1ee637e45)
-
-Co-authored-by: Christian Heimes
-
-
-
-https://bugs.python.org/issue17239
- Doc/library/xml.dom.pulldom.rst | 14 +
- Doc/library/xml.rst | 6 +-
- Doc/library/xml.sax.rst | 8 +++
- Doc/whatsnew/3.6.rst | 18 +-
- Lib/test/test_pulldom.py | 7 +++
- Lib/test/test_sax.py | 60 ++-
- Lib/test/test_xml_etree.py| 13
- Lib/xml/sax/expatreader.py| 2 +-
- .../2018-09-11-18-30-55.bpo-17239.kOpwK2.rst | 3 +
- 9 files changed, 125 insertions(+), 6 deletions(-)
- create mode 100644
Misc/NEWS.d/next/Security/2018-09-11-18-30-55.bpo-17239.kOpwK2.rst
-
-diff --git a/Lib/xml/sax/expatreader.py b/Lib/xml/sax/expatreader.py
-index 421358fa5b..5066ffc2fa 100644
a/Lib/xml/sax/expatreader.py
-+++ b/Lib/xml/sax/expatreader.py
-@@ -95,7 +95,7 @@ class ExpatParser(xmlreader.IncrementalParser,
xmlreader.Locator):
- self._lex_handler_prop = None
- self._parsing = 0
- self._entity_stack = []
--self._external_ges = 1
-+self._external_ges = 0
- self._interning = None
-
- # XMLReader methods
-diff --git
a/Misc/NEWS.d/next/Security/2018-09-11-18-30-55.bpo-17239.kOpwK2.rst
b/Misc/NEWS.d/next/Security/2018-09-11-18-30-55.bpo-17239.kOpwK2.rst
-new file mode 100644
-index 00..8dd0fe8c1b
/dev/null
-+++ b/Misc/NEWS.d/next/Security/2018-09-11-18-30-55.bpo-17239.kOpwK2.rst
-@@ -0,0 +1,3 @@
-+The xml.sax and xml.dom.minidom parsers no
