Bug#984790: buster-pu: package libreoffice/1:6.1.5-3+deb10u7
Package: release.debian.org
Severity: normal
Tags: buster
User: release.debian.org@packages.debian.org
Usertags: pu
Hi,
see https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=984703.
The Security Team suggests to fix this via the next point release
instead of a DSA, so here it is :-)
Diff:
diff -Nru libreoffice-6.1.5/debian/changelog libreoffice-6.1.5/debian/changelog
--- libreoffice-6.1.5/debian/changelog 2020-02-01 15:13:43.000000000 +0100
+++ libreoffice-6.1.5/debian/changelog 2021-03-08 13:13:24.000000000 +0100
@@ -1,3 +1,11 @@
+libreoffice (1:6.1.5-3+deb10u7) buster; urgency=medium
+
+ * debian/patches/fix-PYTHONPATH.diff: backport upstream fix to
+ not leave a bare trailing : in PYTHONPATH as it causes unconditional
+ loading of encodings.py from . (closes: #984703)
+
+ -- Rene Engelhard <rene@debian.org> Mon, 08 Mar 2021 13:13:24 +0100
+
libreoffice (1:6.1.5-3+deb10u6) buster; urgency=medium
* debian/patches/glm-0.9.9-ctor.diff: add from master, fix opengl slide
diff -Nru libreoffice-6.1.5/debian/patches/fix-PYTHONPATH.diff libreoffice-6.1.5/debian/patches/fix-PYTHONPATH.diff
--- libreoffice-6.1.5/debian/patches/fix-PYTHONPATH.diff 1970-01-01 01:00:00.000000000 +0100
+++ libreoffice-6.1.5/debian/patches/fix-PYTHONPATH.diff 2021-03-08 00:15:24.000000000 +0100
@@ -0,0 +1,66 @@
+From f463cbd6ea2fd8ab80b812425eb05ae83fa6a426 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Caol=C3=A1n=20McNamara?= <caolanm@redhat.com>
+Date: Fri, 19 Jun 2020 11:32:00 +0100
+Subject: tdf#121384 don't leave a bare trailing : in PYTHONPATH
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+and don't insert any empty path entries if that situation
+was to arise
+
+Change-Id: I8d8183485f457c3e4385181fee07390c4bfef603
+Reviewed-on: https://gerrit.libreoffice.org/c/core/+/96707
+Reviewed-by: Tomáš Chvátal <tchvatal@suse.com>
+Reviewed-by: Adolfo Jayme Barrientos <fitojb@ubuntu.com>
+Tested-by: Jenkins
+(cherry picked from commit b72705d5391b849fc70a0a4cac33523c0ea5d054)
+Reviewed-on: https://gerrit.libreoffice.org/c/core/+/96803
+Tested-by: Stephan Bergmann <sbergman@redhat.com>
+Reviewed-by: Stephan Bergmann <sbergman@redhat.com>
+---
+ pyuno/source/loader/pyuno_loader.cxx | 14 ++++++++++++--
+ 1 file changed, 12 insertions(+), 2 deletions(-)
+
+diff --git a/pyuno/source/loader/pyuno_loader.cxx b/pyuno/source/loader/pyuno_loader.cxx
+index ffdb81143961..e35148f8ddbc 100644
+--- a/pyuno/source/loader/pyuno_loader.cxx
++++ b/pyuno/source/loader/pyuno_loader.cxx
+@@ -145,6 +145,7 @@ static void setPythonHome ( const OUString & pythonHome )
+ static void prependPythonPath( const OUString & pythonPathBootstrap )
+ {
+ OUStringBuffer bufPYTHONPATH( 256 );
++ bool bAppendSep = false;
+ sal_Int32 nIndex = 0;
+ while( true )
+ {
+@@ -160,15 +161,24 @@ static void prependPythonPath( const OUString & pythonPathBootstrap )
+ }
+ OUString systemPath;
+ osl_getSystemPathFromFileURL( fileUrl.pData, &(systemPath.pData) );
+- bufPYTHONPATH.append( systemPath );
+- bufPYTHONPATH.append( static_cast<sal_Unicode>(SAL_PATHSEPARATOR) );
++ if (!systemPath.isEmpty())
++ {
++ if (bAppendSep)
++ bufPYTHONPATH.append(static_cast<sal_Unicode>(SAL_PATHSEPARATOR));
++ bufPYTHONPATH.append(systemPath);
++ bAppendSep = true;
++ }
+ if( nNew == -1 )
+ break;
+ nIndex = nNew + 1;
+ }
+ const char * oldEnv = getenv( "PYTHONPATH");
+ if( oldEnv )
++ {
++ if (bAppendSep)
++ bufPYTHONPATH.append( static_cast<sal_Unicode>(SAL_PATHSEPARATOR) );
+ bufPYTHONPATH.append( OUString(oldEnv, strlen(oldEnv), osl_getThreadTextEncoding()) );
++ }
+
+ OUString envVar("PYTHONPATH");
+ OUString envValue(bufPYTHONPATH.makeStringAndClear());
+--
+cgit v1.2.1
+
diff -Nru libreoffice-6.1.5/debian/patches/series libreoffice-6.1.5/debian/patches/series
--- libreoffice-6.1.5/debian/patches/series 2020-02-01 14:28:40.000000000 +0100
+++ libreoffice-6.1.5/debian/patches/series 2021-03-08 00:19:35.000000000 +0100
@@ -65,3 +65,4 @@
allow-link-updates-in-an-intermediate-linked-document.diff
Postgresql-12-no-adsrc.diff
glm-0.9.9-ctor.diff
+fix-PYTHONPATH.diff
Regards,
Rene
Reply to: