core.git: Branch 'libreoffice-24-2-2' - configure.ac
configure.ac |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 89c0eb3ef22e366b23efc11e073935c9ef70b3d9 Author: Christian Lohmaier AuthorDate: Fri Mar 22 20:35:50 2024 +0100 Commit: Christian Lohmaier CommitDate: Fri Mar 22 20:35:50 2024 +0100 bump product version to 24.2.2.2.0+ Change-Id: I07dcfa3ea315ed6de0169fd2ff37adbbce8c097e diff --git a/configure.ac b/configure.ac index 30cf1ea77625..f5d34080d625 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],[24.2.2.1.0+],[],[],[http://documentfoundation.org/]) +AC_INIT([LibreOffice],[24.2.2.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
core.git: Branch 'libreoffice-24-2-2' - configure.ac download.lst
configure.ac |2 +-
download.lst |4 ++--
2 files changed, 3 insertions(+), 3 deletions(-)
New commits:
commit 7eeaa3f188f8a3c24d2c7a5fe90d97de4708bfc8
Author: Michael Stahl
AuthorDate: Wed Mar 20 10:52:09 2024 +0100
Commit: Christian Lohmaier
CommitDate: Fri Mar 22 19:38:13 2024 +0100
python3: upgrade to release 3.8.19
Fixes CVE-2023-6597 and also CVE-2024-0450
Change-Id: Iebca2608e16a966356736201c63f1be5185430d4
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/165053
Tested-by: Jenkins
Reviewed-by: Michael Stahl
(cherry picked from commit 0633e4b4205334dd65ec64d7f3e306ee125e31be)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/165111
Reviewed-by: Xisco Fauli
Tested-by: Christian Lohmaier
Reviewed-by: Christian Lohmaier
diff --git a/configure.ac b/configure.ac
index 758e160400ba..30cf1ea77625 100644
--- a/configure.ac
+++ b/configure.ac
@@ -10044,7 +10044,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}.18
+PYTHON_VERSION=${PYTHON_VERSION_MAJOR}.${PYTHON_VERSION_MINOR}.19
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 b65f8a067340..f64d3702d481 100644
--- a/download.lst
+++ b/download.lst
@@ -555,8 +555,8 @@ POSTGRESQL_TARBALL := postgresql-13.11.tar.bz2
# three static lines
# so that git cherry-pick
# will not run into conflicts
-PYTHON_SHA256SUM :=
3ffb71cd349a326ba7b2fadc7e7df86ba577dd9c4917e52a8401adbda7405e3f
-PYTHON_TARBALL := Python-3.8.18.tar.xz
+PYTHON_SHA256SUM :=
d2807ac69f69b84fd46a0b93bbd02a4fa48d3e70f4b2835ff0f72a2885040076
+PYTHON_TARBALL := Python-3.8.19.tar.xz
# three static lines
# so that git cherry-pick
# will not run into conflicts
core.git: Branch 'libreoffice-24-2-2' - configure.ac
configure.ac |4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) New commits: commit 78629e74e1e046a9ae4945088e2f7afde6db88d6 Author: Fridrich Strba AuthorDate: Tue Mar 12 11:34:52 2024 +0100 Commit: Stephan Bergmann CommitDate: Fri Mar 15 14:32:43 2024 +0100 Fix build with autoconf 2.72 This commit http://git.savannah.gnu.org/gitweb/ ?p=autoconf.git;a=commitdiff; h=cf09f48841b66fe76f606dd6018bb3a93242a7c9 changed the internal cache variable name and its content The effects show later in message like /tmp/ccyB6wS6.ltrans9.ltrans.o: in function `comphelper::DocPasswordHelper::decryptGpgSession(com::sun::star::uno::Sequence > const&)': /home/abuild/rpmbuild/BUILD/libreoffice-24.2.1.2/comphelper/source/misc/docpasswordhelper.cxx:705:(.text+0x4fb7): undefined reference to `GpgME::Data::seek(long, int)' /usr/bin/ld.bfd: /home/abuild/rpmbuild/BUILD/libreoffice-24.2.1.2/comphelper/source/misc/docpasswordhelper.cxx:716:(.text+0x5402): undefined reference to `GpgME::Data::seek(long, int)' /usr/bin/ld.bfd: /tmp/ccyB6wS6.ltrans13.ltrans.o: in function `comphelper::OStorageHelper::CreateGpgPackageEncryptionData()': /home/abuild/rpmbuild/BUILD/libreoffice-24.2.1.2/comphelper/source/misc/storagehelper.cxx:507:(.text+0x64e3): undefined reference to `GpgME::Data::seek(long, int)' /usr/bin/ld.bfd: /home/abuild/rpmbuild/BUILD/libreoffice-24.2.1.2/comphelper/source/misc/storagehelper.cxx:520:(.text+0x6583): undefined reference to `GpgME::Data::seek(long, int)' collect2: error: ld returned 1 exit status Where the type 'off_t' at the time of inclusion of the header and at the time of compilation of the library differ. Change-Id: Ie0486dbc869e84f5fb2688473334cfe464abd570 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/164704 Tested-by: Jenkins Reviewed-by: Stephan Bergmann Reviewed-on: https://gerrit.libreoffice.org/c/core/+/164715 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/164764 Reviewed-by: Miklos Vajna Reviewed-by: Michael Meeks Tested-by: Stephan Bergmann diff --git a/configure.ac b/configure.ac index 8101a2b2e1dd..758e160400ba 100644 --- a/configure.ac +++ b/configure.ac @@ -7197,7 +7197,9 @@ if test "$_os" != "WINNT"; then dnl Check for large file support AC_SYS_LARGEFILE -if test -n "$ac_cv_sys_file_offset_bits" -a "$ac_cv_sys_file_offset_bits" != "no"; then +if test -n "$ac_cv_sys_largefile_opts" -a "$ac_cv_sys_largefile_opts" != "none needed" -a "$ac_cv_sys_largefile_opts" != "support not detected"; then +LFS_CFLAGS="$ac_cv_sys_largefile_opts" +elif test -n "$ac_cv_sys_file_offset_bits" -a "$ac_cv_sys_file_offset_bits" != "no"; then LFS_CFLAGS="-D_FILE_OFFSET_BITS=$ac_cv_sys_file_offset_bits" fi if test -n "$ac_cv_sys_large_files" -a "$ac_cv_sys_large_files" != "no"; then
core.git: Branch 'libreoffice-24-2-2' - configure.ac
configure.ac |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 195856d74dc68d2d74dfb221a3affadf259ea0d0 Author: Christian Lohmaier AuthorDate: Thu Mar 7 12:32:00 2024 +0100 Commit: Christian Lohmaier CommitDate: Thu Mar 7 12:32:00 2024 +0100 bump product version to 24.2.2.1.0+ Change-Id: Ifc53da8fcbe937df38723adb164846261b6e diff --git a/configure.ac b/configure.ac index 650fe6896be7..8101a2b2e1dd 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],[24.2.2.0.0+],[],[],[http://documentfoundation.org/]) +AC_INIT([LibreOffice],[24.2.2.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
