df-libreoffice:distro/lhm/libreoffice-4-1-6+backports

Last commit made on 2019-06-18
Get this branch:
git clone -b distro/lhm/libreoffice-4-1-6+backports https://git.launchpad.net/df-libreoffice
Members of The Document Foundation can upload to this branch. Log in for directions.

Branch merges

Branch information

Name:
distro/lhm/libreoffice-4-1-6+backports
Repository:
lp:df-libreoffice

Recent commits

d2ce23f... by Xisco Faulí Tarazona

mailmerge.py: Use strip in server name

Using spaces in the dialog might lead to incorrect server name
Reviewed-on: https://gerrit.libreoffice.org/44052
Reviewed-by: Caolán McNamara <email address hidden>
Tested-by: Caolán McNamara <email address hidden>

(cherry picked from commit 55ad93f29b1be106a7b475f92202ece3589584d8)

Change-Id: If057d0bf8dea55ccddfab8e0f21c8ef16d87dc92
Reviewed-on: https://gerrit.libreoffice.org/74187
Reviewed-by: Michael Weghorn <email address hidden>
Tested-by: Michael Weghorn <email address hidden>
(cherry picked from commit 6a3c5250066188f127c5445ae1224e19e20ce33a)

a3d465a... by julien2412

tdf#103363: add unicodedata and import idna encoding for mailmerge

Thank you Moggi for your help on how to add unicodedata module to Python!

Reviewed-on: https://gerrit.libreoffice.org/32140
Reviewed-by: Julien Nabet <email address hidden>
Tested-by: Julien Nabet <email address hidden>
(cherry picked from commit 486efbfc74890582b16f858b8e937d4ae9b66f64)

Reviewed-on: https://gerrit.libreoffice.org/74186
Reviewed-by: Michael Weghorn <email address hidden>
Tested-by: Michael Weghorn <email address hidden>
(cherry picked from commit 6459ec8046231e258d380efcdaac0a5def23276f)

 Conflicts:
 external/python3/ExternalPackage_python3.mk

Change-Id: I1b5b0cb622eb9663d836b773d44a05efc9a59535

cd3559a... by Michael Stahl <email address hidden>

curl: add patches for CVE-2018-16890 and CVE-2019-3822

The third one (CVE-2019-3823) isn't relevant because SMTP is disabled.

Reviewed-on: https://gerrit.libreoffice.org/67445
Reviewed-by: Thorsten Behrens <email address hidden>
Tested-by: Thorsten Behrens <email address hidden>
(cherry picked from commit 9f755aed82154abe29c40899882b3a383aa6f475)

Change-Id: I2383c1a7b0c67c586402d4098092cee565edcdda
Reviewed-on: https://gerrit.libreoffice.org/67509
Reviewed-by: Thorsten Behrens <email address hidden>
Tested-by: Thorsten Behrens <email address hidden>

6b63b53... by =?utf-8?q?Caol=C3=A1n_McNamara?= <email address hidden>

Resolves: tdf#92993 access violation on particular .docx on glyph layout

(cherry picked from commit ae850353151cd6a79f7b4a012d0a411013c841a4)

Change-Id: I69dfd6747e37ddb1727dd41b99d1b70eaed83425
Reviewed-on: https://gerrit.libreoffice.org/66857
Reviewed-by: Thorsten Behrens <email address hidden>
Tested-by: Thorsten Behrens <email address hidden>

c3a3e52... by Michael Stahl <email address hidden>

scp2: package new Linux-only libfreeblpriv3.so

This was added in NSS 3.24 in 488aed9f7c13b04813c3336379f06417f4cde8ab
and added to the ExternalPackage but in the 4.1 branch, that is not
sufficient, because that is not yet used for installation sets,
it needs to be added in scp2 explicitly.

Change-Id: I6134952bce4efe243305c156c738605cb296f5dc
Reviewed-on: https://gerrit.libreoffice.org/66091
Reviewed-by: Michael Stahl <email address hidden>
Tested-by: Michael Stahl <email address hidden>

90d8c98... by =?utf-8?q?Caol=C3=A1n_McNamara?= <email address hidden>

keep pyuno script processing below base uri

Conflicts:
 scripting/source/pyprov/pythonscript.py

Change-Id: Icc13fb7193fb1e7c50e0df286161a10b4ed636c7
Reviewed-on: https://gerrit.libreoffice.org/62174
Reviewed-by: Michael Stahl <email address hidden>
Tested-by: Michael Stahl <email address hidden>

cac9eca... by Thorsten Behrens <email address hidden>

nss: fix initialisation order, and system zlib

Change-Id: Ia2d01d384b13c3b293599a186899d8e5bb381064
Reviewed-on: https://gerrit.libreoffice.org/61679
Reviewed-by: Michael Stahl <email address hidden>
Tested-by: Michael Stahl <email address hidden>

41e255f... by Michael Stahl <email address hidden>

xmlsecurity: nsscrypto_initialize: try to avoid profile migration

https://developer.mozilla.org/en-US/docs/Mozilla/Projects/NSS/NSS_3.35_release_notes

NSS 3.35 and later will automatically migrate migrate profiles from the
old "dbm:" BDB format to the new "sql:" SQLite format.

The new format can be read by NSS 3.12 and later, which is old enough that
it can be assumed to be available.

However LibreOffice still shouldn't migrate the profile on its own:
LO typically uses a Mozilla Firefox or Thunderbird profile, and if it is
a system Firefox with system NSS libraries, then it's probably a bad
idea for LO to migrate the profile under Firefox's nose, particularly
considering the "partial migration" scenario if the profile is
password-protected.

Try to avoid this by checking if the profile is the old format and
explicitly using the "dbm:" prefix to prevent the migration.

Change-Id: I06480522f830ce74e2fb7bf79fee84ad80979b82
Reviewed-on: https://gerrit.libreoffice.org/58756
Tested-by: Jenkins
Reviewed-by: Miklos Vajna <email address hidden>
(cherry picked from commit 61688aa1abd9db9adbb8dc5d5aacc6269b21fd27)

adce51b... by Thorsten Behrens <email address hidden>

liborcus: more backport fixes from upstream

Fixup 77102df29789993bad01392e4b285fed865e98be with one extra
commit from upstream liborcus
(95b06f91d08b827080f472aefab4399a085feda2).

Change-Id: I5b3a47706fd7dfc90f969cce1d483365e0e30c29

d2f9017... by Thorsten Behrens <email address hidden>

nss: add glibc2.5 support

htole32 and friends were only added in glibc 2.9 or something

Change-Id: I902d5d7ab3be959e8a3aeb18ba3ce1bd519219a8