[Libreoffice-commits] core.git: Branch 'libreoffice-7-5-6' - configure.ac
configure.ac |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit bed0bcf0808348c9ad94bdd7f9c9d4b25b925356 Author: Christian Lohmaier AuthorDate: Wed Aug 30 15:59:07 2023 +0200 Commit: Christian Lohmaier CommitDate: Wed Aug 30 15:59:07 2023 +0200 bump product version to 7.5.6.2.0+ Change-Id: I0b600b99ad9d7ecf437453e572fd8552972f5ed7 diff --git a/configure.ac b/configure.ac index 4a0bfcffc93a..bafbaa4e726c 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],[7.5.6.1.0+],[],[],[http://documentfoundation.org/]) +AC_INIT([LibreOffice],[7.5.6.2.0+],[],[],[http://documentfoundation.org/]) 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 'libreoffice-7-5-6' - configure.ac download.lst
configure.ac |2 +-
download.lst |4 ++--
2 files changed, 3 insertions(+), 3 deletions(-)
New commits:
commit 68effb9617eef0da325f29958a89af899d773811
Author: Michael Stahl
AuthorDate: Mon Aug 28 10:13:28 2023 +0200
Commit: Christian Lohmaier
CommitDate: Wed Aug 30 12:28:58 2023 +0200
python3: upgrade to release 3.8.18
Fixes CVE-2023-40217
Change-Id: Ie08af471009b7f5c42aa6875dd4f9d886ad1d617
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/156183
Tested-by: Jenkins
Reviewed-by: Michael Stahl
(cherry picked from commit c1586ef57b5770f80ef200ab38ff4538c2dfb145)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/156145
Reviewed-by: Xisco Fauli
(cherry picked from commit 563e7c857e3b370099915b3fb1d620edf216c197)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/156215
Reviewed-by: <20001...@ymail.ne.jp>
Tested-by: Christian Lohmaier
Reviewed-by: Christian Lohmaier
diff --git a/configure.ac b/configure.ac
index 9a4b4d5fb382..4a0bfcffc93a 100644
--- a/configure.ac
+++ b/configure.ac
@@ -9957,7 +9957,7 @@ if test \( "$cross_compiling" = yes -a -z
"$PYTHON_FOR_BUILD" \) -o "$enable_pyt
SYSTEM_PYTHON=
PYTHON_VERSION_MAJOR=3
PYTHON_VERSION_MINOR=8
-PYTHON_VERSION=${PYTHON_VERSION_MAJOR}.${PYTHON_VERSION_MINOR}.17
+PYTHON_VERSION=${PYTHON_VERSION_MAJOR}.${PYTHON_VERSION_MINOR}.18
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 5d426f7717c5..3e68b4fd3527 100644
--- a/download.lst
+++ b/download.lst
@@ -466,8 +466,8 @@ POSTGRESQL_TARBALL := postgresql-13.10.tar.bz2
# three static lines
# so that git cherry-pick
# will not run into conflicts
-PYTHON_SHA256SUM :=
2e54b0c68191f16552f6de2e97a2396540572a219f6bbb28591a137cecc490a9
-PYTHON_TARBALL := Python-3.8.17.tar.xz
+PYTHON_SHA256SUM :=
3ffb71cd349a326ba7b2fadc7e7df86ba577dd9c4917e52a8401adbda7405e3f
+PYTHON_TARBALL := Python-3.8.18.tar.xz
# three static lines
# so that git cherry-pick
# will not run into conflicts
[Libreoffice-commits] core.git: Branch 'libreoffice-7-5-6' - configure.ac
configure.ac |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit ac640194c67c87bb1105063a558cc42b6faf6521 Author: Xisco Fauli AuthorDate: Wed Aug 16 12:15:03 2023 +0200 Commit: Xisco Fauli CommitDate: Wed Aug 16 12:15:03 2023 +0200 bump product version to 7.5.6.1.0+ Change-Id: I2304e6f9e8f418b7752eb07c4f35fc54a2e5e6e9 diff --git a/configure.ac b/configure.ac index 4bd273f026ca..9a4b4d5fb382 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],[7.5.6.0.0+],[],[],[http://documentfoundation.org/]) +AC_INIT([LibreOffice],[7.5.6.1.0+],[],[],[http://documentfoundation.org/]) 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
