[Libreoffice-commits] core.git: Branch 'libreoffice-6-4' - download.lst external/pdfium RepositoryExternal.mk solenv/flatpak-manifest.in svx/source vcl/qa

2020-09-10 Thread Miklos Vajna (via logerrit) 
 RepositoryExternal.mk  |1 +
 download.lst   |4 ++--
 external/pdfium/Library_pdfium.mk  |   19 +++
 external/pdfium/UnpackedTarball_pdfium.mk  |3 ++-
 external/pdfium/build.patch.1  |   21 -
 external/pdfium/c++20-comparison.patch |   13 +
 external/pdfium/inc/pch/precompiled_pdfium.hxx |   22 ++
 external/pdfium/ubsan.patch|   20 ++--
 external/pdfium/visibility.patch.1 |   22 --
 solenv/flatpak-manifest.in |6 +++---
 svx/source/svdraw/svdpdf.cxx   |   21 +++--
 vcl/qa/cppunit/pdfexport/pdfexport.cxx |   11 +++
 12 files changed, 70 insertions(+), 93 deletions(-)

New commits:
commit 434d611e22c4fe76a11d2de26b9f185bb04e5ad3
Author: Miklos Vajna 
AuthorDate: Tue Jan 14 21:34:52 2020 +0100
Commit: Caolán McNamara 
CommitDate: Thu Sep 10 16:23:56 2020 +0200

external: update pdfium from 3963 to 4137

This is a combination of 6 commits, which brings pdfium to the same
version as libreoffice-7-0.

This is the 1st commit message:

external: update pdfium to 4021

(cherry picked from commit 1cb70721ba00dd6c6958f0a10e39aa5c1866ec96)

This is the commit message #2:

external/pdfium: C++20 comparison operator fix

Missing const leads to overload resolution ambiguity when a synthesized
candidate of operator == for a reversed-argument rewrite conflicts with the
actual operator ==, due to the asymmetric const-ness of the implicit object
parameter and the RHS parameter:

> In file included from 
workdir/UnpackedTarball/pdfium/core/fxge/cfx_font.cpp:7:
> In file included from 
workdir/UnpackedTarball/pdfium/core/fxge/cfx_font.h:11:
> llvm/inst/include/c++/v1/vector:1369:27: error: use of overloaded 
operator '!=' is ambiguous (with operand types 
'std::__1::__vector_base 
>::allocator_type' (aka 'FxAllocAllocator') and 
'std::__1::__vector_base 
>::allocator_type')
> if (__base::__alloc() != __c.__alloc())
> ~ ^  ~
> llvm/inst/include/c++/v1/vector:1359:5: note: in instantiation of member 
function 'std::__1::vector 
>::__move_assign' requested here
> __move_assign(__x, integral_constant ^
> workdir/UnpackedTarball/pdfium/core/fxge/cfx_font.cpp:384:24: note: in 
instantiation of member function 'std::__1::vector >::operator=' requested here
>   m_FontDataAllocation = std::vector>(
>^
> workdir/UnpackedTarball/pdfium/core/fxcrt/fx_memory_wrappers.h:74:8: 
note: candidate function
>   bool operator!=(const FxAllocAllocator& that) { return false; }
>^
> workdir/UnpackedTarball/pdfium/core/fxcrt/fx_memory_wrappers.h:73:8: 
note: candidate function
>   bool operator==(const FxAllocAllocator& that) { return true; }
>^
> workdir/UnpackedTarball/pdfium/core/fxcrt/fx_memory_wrappers.h:73:8: 
note: candidate function (with reversed parameter order)

(cherry picked from commit 6e0461d576d9f386e458f98f3c57f0ba385aacb4)

This is the commit message #3:

pdfium: don't patch out the COMPONENT_BUILD check, define it

So next time we update, no need to adapt a failing patch.

(cherry picked from commit 9b4ab9bda41a818832c721933986c9c6e07a6e6c)

This is the commit message #4:

make update_pch also consider files in /src/**/inc

With --enable-pch=full there's not much difference between a "public"
header in /inc and a private one in /src/somewhere/inc .
And since the script searches recursively, this apparently helps to
find even more headers for lower pch levels.

[ Just the pdfium part. ]

(cherry picked from commit 69e0d871ec1de2260f9213d3113464155eac173c)

Change-Id: I8483d0aa5b4fea5a59107c20a8aa5f1ef694af0a

This is the commit message #5:

external: update pdfium to 4083

(cherry picked from commit 9054c36d4ea3bee25fb9a47a96a0ea2cd07148c3)

This is the commit message #6:

external: update pdfium to 4137

(cherry picked from commit 1ffe59ef31186e36ad0aa7bbcdd32e407ee8d26c)

Change-Id: Ib7c12461e04fa97bf55ee967e8d6c9bcf92fdf4a
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/102373
Tested-by: Jenkins
Reviewed-by: Caolán McNamara 

diff --git a/RepositoryExternal.mk b/RepositoryExternal.mk
index f6003fc22aba..8748d8f2f714 100644
--- a/RepositoryExternal.mk
+++ b/RepositoryExternal.mk
@@ -4136,6 +4136,7 @@ ifneq ($(ENABLE_PDFIUM),)
 define gb_LinkTarget__use_pdfium
 $(call gb_LinkTarget_set_include,$(1),\
-I$(call gb_UnpackedTarball_get_dir,pdfium)/public \
+   -DCOMPONENT_BUILD \
$$(INCLUDE) \
 )

[Libreoffice-commits] core.git: Branch 'libreoffice-6-4' - download.lst external/nss

2020-08-17 Thread Michael Stahl (via logerrit) 
 download.lst |4 -
 external/nss/UnpackedTarball_nss.mk  |1 
 external/nss/macos-dlopen.patch.0|   18 
 external/nss/nss.nspr-parallel-win-debug_build.patch |   40 ---
 4 files changed, 11 insertions(+), 52 deletions(-)

New commits:
commit 94cecbfdf3cf01fe3d5658c7edf78696da2a249f
Author: Michael Stahl 
AuthorDate: Fri Aug 7 18:57:00 2020 +0200
Commit: Caolán McNamara 
CommitDate: Mon Aug 17 10:33:47 2020 +0200

nss: upgrade to release 3.55.0

Fixes CVE-2020-6829, CVE-2020-12400 CVE-2020-12401 CVE-2020-12403.
(also CVE-2020-12402 CVE-2020-12399 in older releases since 3.47)

* external/nss/nss.nspr-parallel-win-debug_build.patch:
  remove, merged upstream

Change-Id: I8b48e25ce68a2327cde1420abdaea8f9e51a7888
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/100345
Tested-by: Jenkins
Reviewed-by: Michael Stahl 
(cherry picked from commit 495a5944a3d442cfe748a3bb0dcef76f6a961d30)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/100420
Reviewed-by: Xisco Fauli 
(cherry picked from commit 227d30a3a17f2fffb1a166cdc3e2a796bb335214)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/100590
Reviewed-by: Caolán McNamara 

diff --git a/download.lst b/download.lst
index 3fe12dc913a5..040d0f580235 100644
--- a/download.lst
+++ b/download.lst
@@ -183,8 +183,8 @@ export MYTHES_SHA256SUM := 
1e81f395d8c851c3e4e75b568e20fa2fa549354e75ab397f9de4b
 export MYTHES_TARBALL := a8c2c5b8f09e7ede322d5c602ff6a4b6-mythes-1.2.4.tar.gz
 export NEON_SHA256SUM := 
db0bd8cdec329b48f53a6f00199c92d5ba40b0f015b153718d1b15d3d967fbca
 export NEON_TARBALL := neon-0.30.2.tar.gz
-export NSS_SHA256SUM := 
861a4510b7c21516f49a4cfa5b871aa796e4e1ef2dfe949091970e56f9d60cdf
-export NSS_TARBALL := nss-3.53-with-nspr-4.25.tar.gz
+export NSS_SHA256SUM := 
ec6032d78663c6ef90b4b83eb552dedf721d2bce208cec3bf527b8f637db7e45
+export NSS_TARBALL := nss-3.55-with-nspr-4.27.tar.gz
 export ODFGEN_SHA256SUM := 
2c7b21892f84a4c67546f84611eccdad6259875c971e98ddb027da66ea0ac9c2
 export ODFGEN_VERSION_MICRO := 6
 export ODFGEN_TARBALL := libodfgen-0.1.$(ODFGEN_VERSION_MICRO).tar.bz2
diff --git a/external/nss/UnpackedTarball_nss.mk 
b/external/nss/UnpackedTarball_nss.mk
index 8801c7cdad63..1cad5852fa89 100644
--- a/external/nss/UnpackedTarball_nss.mk
+++ b/external/nss/UnpackedTarball_nss.mk
@@ -23,7 +23,6 @@ $(eval $(call gb_UnpackedTarball_add_patches,nss,\
 external/nss/nss.vs2015.pdb.patch \
 external/nss/nss.bzmozilla1238154.patch \
 external/nss/macos-dlopen.patch.0 \
-external/nss/nss.nspr-parallel-win-debug_build.patch \
 $(if $(filter iOS,$(OS)), \
 external/nss/nss-ios.patch) \
 $(if $(filter ANDROID,$(OS)), \
diff --git a/external/nss/macos-dlopen.patch.0 
b/external/nss/macos-dlopen.patch.0
index 8c484e4c6841..1889b8df7cd3 100644
--- a/external/nss/macos-dlopen.patch.0
+++ b/external/nss/macos-dlopen.patch.0
@@ -1,14 +1,14 @@
 --- nspr/pr/src/linking/prlink.c
 +++ nspr/pr/src/linking/prlink.c
-@@ -793,7 +793,7 @@
- /* ensure the file exists if it contains a slash character i.e. path 
*/
- /* DARWIN's dlopen ignores the provided path and checks for the */
- /* plain filename in DYLD_LIBRARY_PATH */
--if (strchr(name, PR_DIRECTORY_SEPARATOR) == NULL ||
-+if (strchr(name, PR_DIRECTORY_SEPARATOR) == NULL || strncmp(name, 
"@loader_path/", 13) == 0 ||
- PR_Access(name, PR_ACCESS_EXISTS) == PR_SUCCESS) {
- h = dlopen(name, dl_flags);
- }
+@@ -799,7 +799,7 @@
+  * The reason is that DARWIN's dlopen ignores the provided path
+  * and checks for the plain filename in DYLD_LIBRARY_PATH,
+  * which could load an unexpected version of a library. */
+-if (strchr(name, PR_DIRECTORY_SEPARATOR) == NULL) {
++if (strchr(name, PR_DIRECTORY_SEPARATOR) == NULL || strncmp(name, 
"@loader_path/", 13) == 0) {
+   /* no slash, allow to load from any location */
+   okToLoad = PR_TRUE;
+ } else {
 --- nss/lib/libpkix/pkix_pl_nss/module/pkix_pl_httpcertstore.c
 +++ nss/lib/libpkix/pkix_pl_nss/module/pkix_pl_httpcertstore.c
 @@ -224,7 +224,11 @@
diff --git a/external/nss/nss.nspr-parallel-win-debug_build.patch 
b/external/nss/nss.nspr-parallel-win-debug_build.patch
deleted file mode 100644
index 86b55e1ccf7f..
--- a/external/nss/nss.nspr-parallel-win-debug_build.patch
+++ /dev/null
@@ -1,40 +0,0 @@
-Änderung:4866:23940b78e965
-Nutzer:  Jan-Marek Glogowski 
-Datum:   Fri May 01 22:50:55 2020 +
-Dateien: pr/tests/Makefile.in
-Beschreibung:
-Bug 290526 Write separate PDBs for test OBJs r=glandium
-
-Quite often when running a parallel NSS build, I get the following
-compiler error message, resulting in a build failure, despite
-compiling with the -FS flag:
-

[Libreoffice-commits] core.git: Branch 'libreoffice-6-4' - download.lst external/nss

2020-08-17 Thread Jan-Marek Glogowski (via logerrit) 
 download.lst |4 -
 external/nss/ExternalProject_nss.mk  |6 +-
 external/nss/UnpackedTarball_nss.mk  |   38 +-
 external/nss/nsinstall.py|7 ++-
 external/nss/nss-3.13.5-zlib-werror.patch|7 +--
 external/nss/nss-win32-make.patch.1  |2 
 external/nss/nss.nspr-parallel-win-debug_build.patch |   40 +++
 external/nss/nss.windows.patch   |4 -
 8 files changed, 77 insertions(+), 31 deletions(-)

New commits:
commit 3e4dbb1708d4b3b7619602b63602b884a7bb2caa
Author: Jan-Marek Glogowski 
AuthorDate: Wed Jun 26 18:09:19 2019 +0200
Commit: Caolán McNamara 
CommitDate: Mon Aug 17 10:33:22 2020 +0200

NSS: enable parallel build

Since NSS 3.53, the Makefile based build should be fixed (upstream
bug 290526). The only missing patch is a minimal NSPR fix for the
"NSPR, configure + make, parallel, Windows, MS VS, debug" build.
That patch isn't incuded in the NSPR 4.25 release (but it's already
in the mercurial repo for NSPR 4.26).

Change-Id: I8eaa3792a12bdff734e56ac3f552991478957e23
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/95218
Tested-by: Jenkins
Reviewed-by: Jan-Marek Glogowski 
(cherry picked from commit b56e8d6def26a0430853835e997f1be841840a61)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/100419
Reviewed-by: Michael Stahl 
(cherry picked from commit c1bce55faebd9ad8751d7b6b9a7f77dff7b3d507)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/100589

diff --git a/download.lst b/download.lst
index 06b4868dc8d9..3fe12dc913a5 100644
--- a/download.lst
+++ b/download.lst
@@ -183,8 +183,8 @@ export MYTHES_SHA256SUM := 
1e81f395d8c851c3e4e75b568e20fa2fa549354e75ab397f9de4b
 export MYTHES_TARBALL := a8c2c5b8f09e7ede322d5c602ff6a4b6-mythes-1.2.4.tar.gz
 export NEON_SHA256SUM := 
db0bd8cdec329b48f53a6f00199c92d5ba40b0f015b153718d1b15d3d967fbca
 export NEON_TARBALL := neon-0.30.2.tar.gz
-export NSS_SHA256SUM := 
07d4276168f59bb3038c7826dabb5fbfbab8336ddf65e4e6e43bce89ada78c64
-export NSS_TARBALL := nss-3.47.1-with-nspr-4.23.tar.gz
+export NSS_SHA256SUM := 
861a4510b7c21516f49a4cfa5b871aa796e4e1ef2dfe949091970e56f9d60cdf
+export NSS_TARBALL := nss-3.53-with-nspr-4.25.tar.gz
 export ODFGEN_SHA256SUM := 
2c7b21892f84a4c67546f84611eccdad6259875c971e98ddb027da66ea0ac9c2
 export ODFGEN_VERSION_MICRO := 6
 export ODFGEN_TARBALL := libodfgen-0.1.$(ODFGEN_VERSION_MICRO).tar.bz2
diff --git a/external/nss/ExternalProject_nss.mk 
b/external/nss/ExternalProject_nss.mk
index 3ff9951d6e65..ff8dd4c18975 100644
--- a/external/nss/ExternalProject_nss.mk
+++ b/external/nss/ExternalProject_nss.mk
@@ -23,11 +23,11 @@ $(call gb_ExternalProject_get_state_target,nss,build): 
$(call gb_ExternalExecuta
MOZ_DEBUG_SYMBOLS=1 \
MOZ_DEBUG_FLAGS=" " \
OPT_CODE_SIZE=0) \
-   MOZ_MSVCVERSION=9 OS_TARGET=WIN95 \
+   OS_TARGET=WIN95 \
$(if $(filter X86_64,$(CPUNAME)),USE_64=1) \
LIB="$(ILIB)" \
XCFLAGS="-arch:SSE $(SOLARINC)" \
-   $(MAKE) -j1 nss_build_all RC="rc.exe $(SOLARINC)" \
+   $(MAKE) nss_build_all RC="rc.exe $(SOLARINC)" \
NSINSTALL='$(call 
gb_ExternalExecutable_get_command,python) $(SRCDIR)/external/nss/nsinstall.py' \
NSS_DISABLE_GTESTS=1 \
,nss)
@@ -50,7 +50,7 @@ $(call gb_ExternalProject_get_state_target,nss,build): $(call 
gb_ExternalExecuta
$(if $(filter iOS-ARM,$(OS)-$(CPUNAME)),CPU_ARCH=arm) \
NSPR_CONFIGURE_OPTS="--build=$(BUILD_PLATFORM) 
--host=$(HOST_PLATFORM)") \
NSDISTMODE=copy \
-   $(MAKE) -j1 AR="$(AR)" \
+   $(MAKE) AR="$(AR)" \
RANLIB="$(RANLIB)" \
NMEDIT="$(NM)edit" \
COMMA=$(COMMA) \
diff --git a/external/nss/UnpackedTarball_nss.mk 
b/external/nss/UnpackedTarball_nss.mk
index 0e174879a702..8801c7cdad63 100644
--- a/external/nss/UnpackedTarball_nss.mk
+++ b/external/nss/UnpackedTarball_nss.mk
@@ -12,34 +12,34 @@ $(eval $(call gb_UnpackedTarball_UnpackedTarball,nss))
 $(eval $(call gb_UnpackedTarball_set_tarball,nss,$(NSS_TARBALL)))
 
 $(eval $(call gb_UnpackedTarball_add_patches,nss,\
-   external/nss/nss.patch \
-   external/nss/nss.aix.patch \
-   external/nss/nss-3.13.5-zlib-werror.patch \
-   external/nss/nss_macosx.patch \
-   external/nss/nss-win32-make.patch.1 \
-   $(if $(filter WNT,$(OS)),external/nss/nss.windows.patch \
-external/nss/nss.nowerror.patch \
-   external/nss/nss.vs2015.patch) \
+external/nss/nss.patch \
+external/nss/nss.aix.patch \
+external/nss/nss-3.13.5-zlib-werror.patch \
+

[Libreoffice-commits] core.git: Branch 'libreoffice-6-4' - download.lst external/curl

2020-06-30 Thread Michael Stahl (via logerrit) 
 download.lst  |4 ++--
 external/curl/ExternalPackage_curl.mk |2 +-
 external/curl/ExternalProject_curl.mk |1 +
 external/curl/clang-cl.patch.0|4 ++--
 external/curl/curl-msvc.patch.1   |8 
 5 files changed, 10 insertions(+), 9 deletions(-)

New commits:
commit 43130216127913d30074d3fe99c5706dcce44dee
Author: Michael Stahl 
AuthorDate: Mon Jun 29 14:00:56 2020 +0200
Commit: Thorsten Behrens 
CommitDate: Tue Jun 30 23:31:03 2020 +0200

curl: upgrade to release 7.71.0

Fixes CVE-2020-8169, and about 3 other ones that don't affect LO/libcmis.

Disable new optional dependencies "ngtcp2" and "quiche".

Change-Id: I595ed909c4e792ac3244643511a338b117e7f102
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/97406
Tested-by: Jenkins
Reviewed-by: Michael Stahl 
(cherry picked from commit cb0c7e26e5708010b1fe941ae2f66134f31ed876)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/97386
Reviewed-by: Thorsten Behrens 

diff --git a/download.lst b/download.lst
index c1b8858bc443..06b4868dc8d9 100644
--- a/download.lst
+++ b/download.lst
@@ -29,8 +29,8 @@ export CPPUNIT_SHA256SUM := 
3d569869d27b48860210c758c4f313082103a5e58219a7669b52
 export CPPUNIT_TARBALL := cppunit-1.14.0.tar.gz
 export CT2N_SHA256SUM := 
71b238efd2734be9800af07566daea8d6685aeed28db5eb5fa0e6453f4d85de3
 export CT2N_TARBALL := 
1f467e5bb703f12cbbb09d5cf67ecf4a-converttexttonumber-1-5-0.oxt
-export CURL_SHA256SUM := 
7766d263929404f693905b5e5222aa0f2bdf8c66ab4b8758f0c0820a42b966cd
-export CURL_TARBALL := curl-7.65.0.tar.xz
+export CURL_SHA256SUM := 
cdf18794393d8bead915312708a9e5d819c6e9919de14b20d5c8e7987abd9772
+export CURL_TARBALL := curl-7.71.0.tar.xz
 export EBOOK_SHA256SUM := 
7e8d8ff34f27831aca3bc6f9cc532c2f90d2057c778963b884ff3d1e34dfe1f9
 export EBOOK_TARBALL := libe-book-0.1.3.tar.xz
 export EPOXY_SHA256SUM := 
002958c5528321edd53440235d3c44e71b5b1e09b9177e8daf677450b6c4433d
diff --git a/external/curl/ExternalPackage_curl.mk 
b/external/curl/ExternalPackage_curl.mk
index 56c418b6ef0c..8da569e3e0cf 100644
--- a/external/curl/ExternalPackage_curl.mk
+++ b/external/curl/ExternalPackage_curl.mk
@@ -20,7 +20,7 @@ $(eval $(call 
gb_ExternalPackage_add_file,curl,$(LIBO_LIB_FOLDER)/libcurl.4.dyli
 else ifeq ($(OS),AIX)
 $(eval $(call 
gb_ExternalPackage_add_file,curl,$(LIBO_LIB_FOLDER)/libcurl.so,lib/.libs/libcurl.so.4))
 else
-$(eval $(call 
gb_ExternalPackage_add_file,curl,$(LIBO_LIB_FOLDER)/libcurl.so.4,lib/.libs/libcurl.so.4.5.0))
+$(eval $(call 
gb_ExternalPackage_add_file,curl,$(LIBO_LIB_FOLDER)/libcurl.so.4,lib/.libs/libcurl.so.4.6.0))
 endif
 
 endif # $(DISABLE_DYNLOADING)
diff --git a/external/curl/ExternalProject_curl.mk 
b/external/curl/ExternalProject_curl.mk
index 366ff1e39d95..5cbedac82d1a 100644
--- a/external/curl/ExternalProject_curl.mk
+++ b/external/curl/ExternalProject_curl.mk
@@ -48,6 +48,7 @@ $(call gb_ExternalProject_get_state_target,curl,build):
--without-libidn2 --without-libpsl --without-librtmp \
--without-libssh2 --without-metalink --without-nghttp2 \
--without-libssh --without-brotli \
+   --without-ngtcp2 --without-quiche \
--disable-ares \
--disable-dict --disable-file --disable-gopher 
--disable-imap \
--disable-ldap --disable-ldaps --disable-manual 
--disable-pop3 \
diff --git a/external/curl/clang-cl.patch.0 b/external/curl/clang-cl.patch.0
index 2f7fe567460c..2fbb10c2a9aa 100644
--- a/external/curl/clang-cl.patch.0
+++ b/external/curl/clang-cl.patch.0
@@ -4,8 +4,8 @@
  !ELSE
  CC_NODEBUG  = $(CC) /O2 /DNDEBUG
  CC_DEBUG= $(CC) /Od /D_DEBUG /RTC1 /Z7 /LDd
--CFLAGS  = /I. /I ../lib /I../include /nologo /W4 /wd4127 /EHsc /DWIN32 
/FD /c /DBUILDING_LIBCURL $(SOLARINC)
-+CFLAGS  = /I. /I ../lib /I../include /nologo /W4 /wd4127 /EHsc /DWIN32 /c 
/DBUILDING_LIBCURL $(SOLARINC)
+-CFLAGS  = /I. /I ../lib /I../include /nologo /W4 /EHsc /DWIN32 /FD /c 
/DBUILDING_LIBCURL $(SOLARINC)
++CFLAGS  = /I. /I ../lib /I../include /nologo /W4 /EHsc /DWIN32 /c 
/DBUILDING_LIBCURL $(SOLARINC)
  !ENDIF
  
  LFLAGS = /nologo /machine:$(MACHINE)
diff --git a/external/curl/curl-msvc.patch.1 b/external/curl/curl-msvc.patch.1
index 80160958c99d..a5b79a8e9c49 100644
--- a/external/curl/curl-msvc.patch.1
+++ b/external/curl/curl-msvc.patch.1
@@ -6,8 +6,8 @@ MSVC: using SOLARINC
  !ELSE
  CC_NODEBUG  = $(CC) /O2 /DNDEBUG
  CC_DEBUG= $(CC) /Od /D_DEBUG /RTC1 /Z7 /LDd
--CFLAGS  = /I. /I ../lib /I../include /nologo /W4 /wd4127 /EHsc /DWIN32 
/FD /c /DBUILDING_LIBCURL
-+CFLAGS  = /I. /I ../lib /I../include /nologo /W4 /wd4127 /EHsc /DWIN32 
/FD /c /DBUILDING_LIBCURL $(SOLARINC)
+-CFLAGS  = /I. /I ../lib /I../include /nologo /W4 /EHsc /DWIN32 /FD /c 
/DBUILDING_LIBCURL
++CFLAGS  = /I. /I ../lib /I../include /nologo /W4

[Libreoffice-commits] core.git: Branch 'libreoffice-6-4' - download.lst external/mariadb-connector-c RepositoryExternal.mk solenv/clang-format solenv/flatpak-manifest.in

2020-06-23 Thread Michael Stahl (via logerrit) 
 RepositoryExternal.mk   |7 
 download.lst|4 
 external/mariadb-connector-c/README |   18 
 external/mariadb-connector-c/StaticLibrary_mariadb-connector-c.mk   |  113 
+
 external/mariadb-connector-c/UnpackedTarball_mariadb-connector-c.mk |   26 -
 external/mariadb-connector-c/clang-cl.patch.0   |4 
 external/mariadb-connector-c/configs/linux_my_config.h  |  212 
+
 external/mariadb-connector-c/configs/mac_my_config.h|  217 
+-
 external/mariadb-connector-c/configs/mariadb_version.h  |   38 +
 external/mariadb-connector-c/configs/mysql_version.h|   28 -
 external/mariadb-connector-c/configs/wnt_ma_config.h|  154 
+++
 external/mariadb-connector-c/mariadb-CONC-104.patch.1   |   49 --
 external/mariadb-connector-c/mariadb-inline.patch.1 |   23 -
 external/mariadb-connector-c/mariadb-msvc.patch.1   |   13 
 external/mariadb-connector-c/mariadb-swap.patch |   24 -
 solenv/clang-format/blacklist   |3 
 solenv/flatpak-manifest.in  |6 
 17 files changed, 339 insertions(+), 600 deletions(-)

New commits:
commit 329c83c57989948d16b4e4d646607b93ee407a9e
Author: Michael Stahl 
AuthorDate: Tue Jun 16 15:09:50 2020 +0200
Commit: Miklos Vajna 
CommitDate: Tue Jun 23 15:55:40 2020 +0200

mariadb: upgrade to release 3.1.8

Fixes CVE-2018-3081 CVE-2020-2574 CVE-2020-2752 CVE-2020-2922 CVE-2020-13249

Remove obsolete patches:
* mariadb-msvc.patch.1
* mariadb-swap.patch
* mariadb-inline.patch.1
* mariadb-CONC-104.patch.1

Don't build anything from plugins/ in the hope that it's not needed.

Reviewed-on: https://gerrit.libreoffice.org/c/core/+/96466
Tested-by: Jenkins
Reviewed-by: Stephan Bergmann 
(cherry picked from commit fe041bbc343ee08c6e901f63985d55a90da71c8b)

mariadb: forgot to adapt flatpak-manifest.in

mariadb: the "pvio_socket" plugin turns out to be important
... otherwise can't connect to a TCP socket.
(regression from fe041bbc343ee08c6e901f63985d55a90da71c8b)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/96536
Tested-by: Jenkins
Reviewed-by: Michael Stahl 
(cherry picked from commit 82a1650683df7d5c1769dfd68a26a4d071f1a546)

Change-Id: I1c8633866b7108a8bb22dae0e0dd5f4a44bf5150
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/96519
Tested-by: Jenkins
Reviewed-by: Miklos Vajna 

diff --git a/RepositoryExternal.mk b/RepositoryExternal.mk
index 9f172d6af448..f6003fc22aba 100644
--- a/RepositoryExternal.mk
+++ b/RepositoryExternal.mk
@@ -262,6 +262,13 @@ $(call gb_LinkTarget_add_libs,$(1),\
-liconv \
 )
 endif
+$(call gb_LinkTarget_use_system_win32_libs,$(1),\
+   ws2_32 \
+   advapi32 \
+   kernel32 \
+   shlwapi \
+   crypt32 \
+)
 
 endef
 define gb_ExternalProject__use_mariadb-connector-c
diff --git a/download.lst b/download.lst
index 479820f95a5e..c1b8858bc443 100644
--- a/download.lst
+++ b/download.lst
@@ -168,8 +168,8 @@ export LPSOLVE_SHA256SUM := 
171816288f14215c69e730f7a4f1c325739873e21f946ff83884
 export LPSOLVE_TARBALL := 26b3e95ddf3d9c077c480ea45874b3b8-lp_solve_5.5.tar.gz
 export LXML_SHA256SUM := 
940caef1ec7c78e0c34b0f6b94fe42d0f2022915ffc78643d28538a5cfd0f40e
 export LXML_TARBALL := lxml-4.1.1.tgz
-export MARIADB_CONNECTOR_C_SHA256SUM := 
fd2f751dea049c1907735eb236aeace1d811d6a8218118b00bbaa9b84dc5cd60
-export MARIADB_CONNECTOR_C_TARBALL := 
a233181e03d3c307668b4c722d881661-mariadb_client-2.0.0-src.tar.gz
+export MARIADB_CONNECTOR_C_SHA256SUM := 
431434d3926f4bcce2e5c97240609983f60d7ff50df5a72083934759bb863f7b
+export MARIADB_CONNECTOR_C_TARBALL := mariadb-connector-c-3.1.8-src.tar.gz
 export MDDS_SHA256SUM := 
144d6debd7be32726f332eac14ef9f17e2d3cf89cb3250eb31a7127e0789680d
 export MDDS_TARBALL := mdds-1.5.0.tar.bz2
 export MDNSRESPONDER_SHA256SUM := 
e777b4d7dbf5eb1552cb80090ad1ede319067ab6e45e3990d68aabf6e8b3f5a0
diff --git a/external/mariadb-connector-c/README 
b/external/mariadb-connector-c/README
index 03a1138b47f8..25209f97f4d2 100644
--- a/external/mariadb-connector-c/README
+++ b/external/mariadb-connector-c/README
@@ -1,16 +1,8 @@
-Update to new upstream bzr snapshot:
+MariaDB Connector/C
 
-Don't use 'bzr diff', it will not put renames in the diff in a way
-that patch understands.
+https://mariadb.com/kb/en/mariadb-connector-c-release-notes/
+https://downloads.mariadb.com/Connectors/c/
 
-bzr -Ossl.cert_reqs=none branch lp:mariadb-native-client
-mv mariadb-native-client mariadb-native-client.trunk
-cp -R mariadb-native-client.trunk mariadb-native-client.release
-cd mariadb-native-client.release
-bzr revert -r

[Libreoffice-commits] core.git: Branch 'libreoffice-6-4' - download.lst

2020-05-07 Thread Gabor Kelemen (via logerrit) 
 download.lst |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit 55e9293c342647ad89c3f081c5b5b677140ac847
Author: Gabor Kelemen 
AuthorDate: Tue Apr 28 18:07:44 2020 +0200
Commit: Miklos Vajna 
CommitDate: Thu May 7 16:54:34 2020 +0200

tdf#131366 Update graphite to 1.3.14

Change-Id: If7abe97a6b8b9a5c8738db9bce1aec7bf1507ba5
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/93095
Tested-by: Jenkins
Reviewed-by: Miklos Vajna 
(cherry picked from commit 835b86437446a81541ab6923f7776a0a71c44ab9)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/93540

diff --git a/download.lst b/download.lst
index ee4953dafca7..479820f95a5e 100644
--- a/download.lst
+++ b/download.lst
@@ -94,8 +94,8 @@ export GLM_SHA256SUM := 
d0312c360efe04dd048b3311fe375ff36f1993b4c2e3cb58c8106299
 export GLM_TARBALL := 
bae83fa5dc7f081768daace6e199adc3-glm-0.9.4.6-libreoffice.zip
 export GPGME_SHA256SUM := 
1b29fedb8bfad775e70eafac5b0590621683b2d9869db994568e6401f4034ceb
 export GPGME_TARBALL := gpgme-1.9.0.tar.bz2
-export GRAPHITE_SHA256SUM := 
d47d387161db7f7ebade1920aa7cbdc797e79772597d8b55e80b58d1071bcc36
-export GRAPHITE_TARBALL := graphite2-minimal-1.3.13.tgz
+export GRAPHITE_SHA256SUM := 
b8e892d8627c41888ff121e921455b9e2d26836978f2359173d19825da62b8fc
+export GRAPHITE_TARBALL := graphite2-minimal-1.3.14.tgz
 export HARFBUZZ_SHA256SUM := 
9cf7d117548265f95ca884e2f4c9fafaf4e17d45a67b11107147b79eed76c966
 export HARFBUZZ_TARBALL := harfbuzz-2.6.0.tar.xz
 export HSQLDB_SHA256SUM := 
d30b13f4ba2e3b6a2d4f020c0dee0a9fb9fc6fbcc2d561f36b78da4bf3802370
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'libreoffice-6-4' - download.lst

2020-04-23 Thread Eike Rathke (via logerrit) 
 download.lst |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit 715612b80942205ac3aad7ec72c615cf964fc7d2
Author: Eike Rathke 
AuthorDate: Thu Apr 23 13:05:30 2020 +0200
Commit: Adolfo Jayme Barrientos 
CommitDate: Thu Apr 23 21:30:41 2020 +0200

Update language-subtag-registry to 2020-04-01

Change-Id: I89ac10b243ac0babbe0d1bf24a7e0f732fe5a495
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/92755
Reviewed-by: Eike Rathke 
Tested-by: Jenkins
(cherry picked from commit 11ef83aa64af7e366cd56856853a7b332a69d105)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/92767
Reviewed-by: Adolfo Jayme Barrientos 

diff --git a/download.lst b/download.lst
index 8a98a1d0e379..ee4953dafca7 100644
--- a/download.lst
+++ b/download.lst
@@ -132,8 +132,8 @@ export JFREEREPORT_SAC_SHA256SUM := 
085f2112c51fa8c1783fac12fbd45265059641512134
 export JFREEREPORT_SAC_TARBALL := 
39bb3fcea1514f1369fcfc87542390fd-sacjava-1.3.zip
 export LIBJPEG_TURBO_SHA256SUM := 
b24890e2bb46e12e72a79f7e965f409f4e16466d00e1dd15d93d73ee6b592523
 export LIBJPEG_TURBO_TARBALL := libjpeg-turbo-1.5.3.tar.gz
-export LANGTAGREG_SHA256SUM := 
07b66bc0f2786fde55f6bbcbcb4a455a846eb8e2351c8ce3d0a219a73693736a
-export LANGTAGREG_TARBALL := language-subtag-registry-2019-09-16.tar.bz2
+export LANGTAGREG_SHA256SUM := 
fb1ee0dabfd956a445fbe9f351e86a52767808558f20f4256e67fbbb3768e9da
+export LANGTAGREG_TARBALL := language-subtag-registry-2020-04-01.tar.bz2
 export LANGUAGETOOL_SHA256SUM := 
48c87e41636783bba438b65fd895821e369ed139e1465fac654323ad93c5a82d
 export LANGUAGETOOL_TARBALL := 
b63e6340a02ff1cacfeadb2c42286161-JLanguageTool-1.7.0.tar.bz2
 export LCMS2_SHA256SUM := 
48c6fdf98396fa245ed86e622028caf49b96fa22f3e5734f853f806fbc8e7d20
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'libreoffice-6-4' - download.lst external/nss

2019-11-26 Thread Michael Stahl (via logerrit) 
 download.lst|4 ++--
 external/nss/UnpackedTarball_nss.mk |1 -
 external/nss/clang-cl.patch.0   |2 +-
 external/nss/nss.aix.patch  |2 +-
 external/nss/nss.fix-freebl-add-lcc-support.patch.1 |   11 ---
 external/nss/nss.patch  |   14 +++---
 external/nss/nss.vs2015.pdb.patch   |4 ++--
 7 files changed, 13 insertions(+), 25 deletions(-)

New commits:
commit 4a55ffea929ec09716274dc9172fb19c039c6292
Author: Michael Stahl 
AuthorDate: Mon Nov 25 12:34:28 2019 +0100
Commit: Michael Stahl 
CommitDate: Tue Nov 26 14:09:40 2019 +0100

nss: upgrade to release 3.47.1

Fixes CVE-2019-11745.

Remove nss.fix-freebl-add-lcc-support.patch.1, fixed upstream.

Change-Id: I72e35c90fabb0a83f547a787dbaee774e35f9c08
Reviewed-on: https://gerrit.libreoffice.org/83673
Tested-by: Jenkins
Reviewed-by: Michael Stahl 
(cherry picked from commit a6238c3fba80889f9090d997e2a4979b78b34ac7)
Reviewed-on: https://gerrit.libreoffice.org/83738

diff --git a/download.lst b/download.lst
index 589e100575a4..f023795fcc1f 100644
--- a/download.lst
+++ b/download.lst
@@ -181,8 +181,8 @@ export MYTHES_SHA256SUM := 
1e81f395d8c851c3e4e75b568e20fa2fa549354e75ab397f9de4b
 export MYTHES_TARBALL := a8c2c5b8f09e7ede322d5c602ff6a4b6-mythes-1.2.4.tar.gz
 export NEON_SHA256SUM := 
db0bd8cdec329b48f53a6f00199c92d5ba40b0f015b153718d1b15d3d967fbca
 export NEON_TARBALL := neon-0.30.2.tar.gz
-export NSS_SHA256SUM := 
fae11751100510d26f16a245f0db9a5b3d638ab28ce0bccd50d4314f7e526ba1
-export NSS_TARBALL := nss-3.45-with-nspr-4.21.tar.gz
+export NSS_SHA256SUM := 
07d4276168f59bb3038c7826dabb5fbfbab8336ddf65e4e6e43bce89ada78c64
+export NSS_TARBALL := nss-3.47.1-with-nspr-4.23.tar.gz
 export ODFGEN_SHA256SUM := 
2c7b21892f84a4c67546f84611eccdad6259875c971e98ddb027da66ea0ac9c2
 export ODFGEN_VERSION_MICRO := 6
 export ODFGEN_TARBALL := libodfgen-0.1.$(ODFGEN_VERSION_MICRO).tar.bz2
diff --git a/external/nss/UnpackedTarball_nss.mk 
b/external/nss/UnpackedTarball_nss.mk
index bd2ad367c776..3079216b674e 100644
--- a/external/nss/UnpackedTarball_nss.mk
+++ b/external/nss/UnpackedTarball_nss.mk
@@ -22,7 +22,6 @@ $(eval $(call gb_UnpackedTarball_add_patches,nss,\
external/nss/nss.vs2015.patch) \
 external/nss/ubsan.patch.0 \
 external/nss/clang-cl.patch.0 \
-external/nss/nss.fix-freebl-add-lcc-support.patch.1 \
 $(if $(filter iOS,$(OS)), \
 external/nss/nss-ios.patch) \
$(if $(filter MSC-INTEL,$(COM)-$(CPUNAME)), \
diff --git a/external/nss/clang-cl.patch.0 b/external/nss/clang-cl.patch.0
index 111ec934d147..1d615c2397d8 100644
--- a/external/nss/clang-cl.patch.0
+++ b/external/nss/clang-cl.patch.0
@@ -22,7 +22,7 @@
 + defined(_M_ARM64)) && !defined __clang__
  # include 
  # pragma  intrinsic(_BitScanForward,_BitScanReverse)
-   __forceinline static int __prBitScanForward32(unsigned int val)
+ __forceinline static int __prBitScanForward32(unsigned int val)
 @@ -32,7 +32,7 @@
  # define pr_bitscan_ctz32(val)  __prBitScanForward32(val)
  # define pr_bitscan_clz32(val)  __prBitScanReverse32(val)
diff --git a/external/nss/nss.aix.patch b/external/nss/nss.aix.patch
index da9aacb10e84..4b0c6bfb3261 100644
--- a/external/nss/nss.aix.patch
+++ b/external/nss/nss.aix.patch
@@ -38,7 +38,7 @@ diff -ru a/nspr/pr/src/Makefile.in b/nspr/pr/src/Makefile.in
 --- a/a/nspr/pr/src/Makefile.in2014-09-29 16:46:35.281395079 +0100
 +++ b/b/nspr/pr/src/Makefile.in2014-09-29 16:50:33.909375948 +0100
 @@ -74,7 +74,6 @@
- endif
+ endif # SunOS
  
  ifeq ($(OS_ARCH),AIX)
 -DSO_LDOPTS+= -binitfini::_PR_Fini
diff --git a/external/nss/nss.fix-freebl-add-lcc-support.patch.1 
b/external/nss/nss.fix-freebl-add-lcc-support.patch.1
deleted file mode 100644
index 3e3c06327dde..
--- a/external/nss/nss.fix-freebl-add-lcc-support.patch.1
+++ /dev/null
@@ -1,11 +0,0 @@
 b/nss/lib/freebl/Makefile
-+++ a/nss/lib/freebl/Makefile
-@@ -495,7 +495,7 @@
- ifdef USE_64
- # no __int128 at least up to lcc 1.23 (pretending to be gcc5)
- # NB: CC_NAME is not defined here
--ifneq ($(shell $(CC) -? 2>&1 >/dev/null | sed -e 's/:.*//;1q'),lcc)
-+ifneq ($(shell $(CC) -? 2>&1 >/dev/null https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'libreoffice-6-4' - download.lst external/libxslt

2019-11-21 Thread Michael Stahl (via logerrit) 
 download.lst  |4 
 external/libxslt/UnpackedTarball_libxslt.mk   |2 
 external/libxslt/e03553605b45c88f0b4b2980adfbbb8f6fca2fd6.patch.1 |  120 
--
 external/libxslt/e2584eed1c84c18f16e42188c30d2c3d8e3e8853.patch.1 |   69 +
 external/libxslt/libxslt-config.patch.1   |   18 -
 external/libxslt/libxslt-internal-symbols.patch.1 |8 
 6 files changed, 85 insertions(+), 136 deletions(-)

New commits:
commit d19b32c779bfeb51ef9570c3de8ed1925ec44473
Author: Michael Stahl 
AuthorDate: Wed Nov 20 15:08:24 2019 +0100
Commit: Michael Stahl 
CommitDate: Thu Nov 21 14:25:26 2019 +0100

libxslt: upgrade to release 1.1.34

Fixes CVE-2019-18197.

Remove obsolete e03553605b45c88f0b4b2980adfbbb8f6fca2fd6.patch.1.

Change-Id: I95cf498e245083528f98bfef8cdd240bbe2211b9
Reviewed-on: https://gerrit.libreoffice.org/83312
Tested-by: Jenkins
Reviewed-by: Michael Stahl 
(cherry picked from commit e9ea24cc004a8b9a5856f2f268bd40433c504db1)
Reviewed-on: https://gerrit.libreoffice.org/83377

diff --git a/download.lst b/download.lst
index df853ad67db0..589e100575a4 100644
--- a/download.lst
+++ b/download.lst
@@ -159,8 +159,8 @@ export XMLSEC_TARBALL := xmlsec1-1.2.28.tar.gz
 export LIBXML_SHA256SUM := 
aafee193ffb8fe0c82d4afef6ef91972cbaf5feea100edc2f262750611b4be1f
 export LIBXML_VERSION_MICRO := 10
 export LIBXML_TARBALL := libxml2-2.9.$(LIBXML_VERSION_MICRO).tar.gz
-export LIBXSLT_SHA256SUM := 
8e36605144409df979cab43d835002f63988f3dc94d5d3537c12796db90e38c8
-export LIBXSLT_VERSION_MICRO := 33
+export LIBXSLT_SHA256SUM := 
98b1bd46d6792925ad2dfe9a87452ea2adebf69dcb9919ffd55bf926a7f93f7f
+export LIBXSLT_VERSION_MICRO := 34
 export LIBXSLT_TARBALL := libxslt-1.1.$(LIBXSLT_VERSION_MICRO).tar.gz
 export LPSOLVE_SHA256SUM := 
171816288f14215c69e730f7a4f1c325739873e21f946ff83884b350574e6695
 export LPSOLVE_TARBALL := 26b3e95ddf3d9c077c480ea45874b3b8-lp_solve_5.5.tar.gz
diff --git a/external/libxslt/UnpackedTarball_libxslt.mk 
b/external/libxslt/UnpackedTarball_libxslt.mk
index beb591b8b2a8..b035e99f0a79 100644
--- a/external/libxslt/UnpackedTarball_libxslt.mk
+++ b/external/libxslt/UnpackedTarball_libxslt.mk
@@ -19,7 +19,7 @@ $(eval $(call gb_UnpackedTarball_add_patches,libxslt,\
external/libxslt/libxslt-msvc.patch.2 \
external/libxslt/libxslt-1.1.26-memdump.patch \
external/libxslt/rpath.patch.0 \
-   external/libxslt/e03553605b45c88f0b4b2980adfbbb8f6fca2fd6.patch.1 \
+   external/libxslt/e2584eed1c84c18f16e42188c30d2c3d8e3e8853.patch.1 \
 ))
 
 # vim: set noet sw=4 ts=4:
diff --git a/external/libxslt/e03553605b45c88f0b4b2980adfbbb8f6fca2fd6.patch.1 
b/external/libxslt/e03553605b45c88f0b4b2980adfbbb8f6fca2fd6.patch.1
deleted file mode 100644
index 260f35d1a35e..
--- a/external/libxslt/e03553605b45c88f0b4b2980adfbbb8f6fca2fd6.patch.1
+++ /dev/null
@@ -1,120 +0,0 @@
-From e03553605b45c88f0b4b2980adfbbb8f6fca2fd6 Mon Sep 17 00:00:00 2001
-From: Nick Wellnhofer 
-Date: Sun, 24 Mar 2019 09:51:39 +0100
-Subject: [PATCH] Fix security framework bypass
-
-xsltCheckRead and xsltCheckWrite return -1 in case of error but callers
-don't check for this condition and allow access. With a specially
-crafted URL, xsltCheckRead could be tricked into returning an error
-because of a supposedly invalid URL that would still be loaded
-succesfully later on.
-
-Fixes #12.
-
-Thanks to Felix Wilhelm for the report.

- libxslt/documents.c | 18 ++
- libxslt/imports.c   |  9 +
- libxslt/transform.c |  9 +
- libxslt/xslt.c  |  9 +
- 4 files changed, 25 insertions(+), 20 deletions(-)
-
-diff --git a/libxslt/documents.c b/libxslt/documents.c
-index 3f3a7312..4aad11bb 100644
 a/libxslt/documents.c
-+++ b/libxslt/documents.c
-@@ -296,10 +296,11 @@ xsltLoadDocument(xsltTransformContextPtr ctxt, const 
xmlChar *URI) {
-   int res;
- 
-   res = xsltCheckRead(ctxt->sec, ctxt, URI);
--  if (res == 0) {
--  xsltTransformError(ctxt, NULL, NULL,
--   "xsltLoadDocument: read rights for %s denied\n",
--   URI);
-+  if (res <= 0) {
-+if (res == 0)
-+xsltTransformError(ctxt, NULL, NULL,
-+ "xsltLoadDocument: read rights for %s denied\n",
-+ URI);
-   return(NULL);
-   }
- }
-@@ -372,10 +373,11 @@ xsltLoadStyleDocument(xsltStylesheetPtr style, const 
xmlChar *URI) {
-   int res;
- 
-   res = xsltCheckRead(sec, NULL, URI);
--  if (res == 0) {
--  xsltTransformError(NULL, NULL, NULL,
--   "xsltLoadStyleDocument: read rights for %s denied\n",
--   URI);
-+  if (res <= 0) {
-+if (res == 0)
-+xsltTransformError(NULL, NULL, NULL,
-+

[Libreoffice-commits] core.git: Branch 'libreoffice-6-4' - download.lst external/poppler

2019-11-21 Thread Michael Stahl (via logerrit) 
 download.lst|  
  4 -
 external/poppler/0001-ImageStream-getLine-fix-crash-on-broken-files.patch.1 |  
 27 --
 external/poppler/StaticLibrary_poppler.mk   |  
  1 
 external/poppler/UnpackedTarball_poppler.mk |  
  1 
 external/poppler/poppler-config.patch.1 |  
 19 ---
 5 files changed, 14 insertions(+), 38 deletions(-)

New commits:
commit c0c777991022d79e028dc3c85c138bd11f0b8efc
Author: Michael Stahl 
AuthorDate: Wed Nov 20 13:11:59 2019 +0100
Commit: Thorsten Behrens 
CommitDate: Thu Nov 21 09:18:07 2019 +0100

poppler: upgrade to release 0.82.0

fixes CVE-2019-9903 CVE-2019-9631 CVE-2019-9545 CVE-2019-9543
CVE-2019-14494 CVE-2019-12293 CVE-2019-11026 CVE-2019-10873
CVE-2019-10872 CVE-2019-10871 CVE-2019-10018

remove obsolete 0001-ImageStream-getLine-fix-crash-on-broken-files.patch.1

Change-Id: I72b3bf89b294ed3e24157c7e75fd58d4f68d9f35
Reviewed-on: https://gerrit.libreoffice.org/83308
Tested-by: Jenkins
Reviewed-by: Michael Stahl 
(cherry picked from commit 28e52c49452320ac76489d0f93ca5692456e5331)
Reviewed-on: https://gerrit.libreoffice.org/83335
Reviewed-by: Thorsten Behrens 

diff --git a/download.lst b/download.lst
index c67bbf0bc5f8..df853ad67db0 100644
--- a/download.lst
+++ b/download.lst
@@ -206,8 +206,8 @@ export PIXMAN_SHA256SUM := 
21b6b249b51c6800dc9553b65106e1e37d0e25df942c90531d4c3
 export PIXMAN_TARBALL := e80ebae4da01e77f68744319f01d52a3-pixman-0.34.0.tar.gz
 export LIBPNG_SHA256SUM := 
505e70834d35383537b6491e7ae8641f1a4bed1876dbfe361201fc80868d88ca
 export LIBPNG_TARBALL := libpng-1.6.37.tar.xz
-export POPPLER_SHA256SUM := 
92e09fd3302567fd36146b36bb707db43ce436e8841219025a82ea9fb0076b2f
-export POPPLER_TARBALL := poppler-0.74.0.tar.xz
+export POPPLER_SHA256SUM := 
234f8e573ea57fb6a008e7c1e56bfae1af5d1adf0e65f47555e1ae103874e4df
+export POPPLER_TARBALL := poppler-0.82.0.tar.xz
 export POSTGRESQL_SHA256SUM := 
a754c02f7051c2f21e52f8669a421b50485afcde9a581674d6106326b189d126
 export POSTGRESQL_TARBALL := postgresql-9.2.24.tar.bz2
 export PYTHON_SHA256SUM := 
c24a37c63a67f53bdd09c5f287b5cff8e8b98f857bf348c577d454d3f74db049
diff --git 
a/external/poppler/0001-ImageStream-getLine-fix-crash-on-broken-files.patch.1 
b/external/poppler/0001-ImageStream-getLine-fix-crash-on-broken-files.patch.1
deleted file mode 100644
index b459a0a0bef7..
--- 
a/external/poppler/0001-ImageStream-getLine-fix-crash-on-broken-files.patch.1
+++ /dev/null
@@ -1,27 +0,0 @@
-From f4136a6353162db249f63ddb0f20611622ab61b4 Mon Sep 17 00:00:00 2001
-From: Albert Astals Cid 
-Date: Wed, 27 Feb 2019 19:43:22 +0100
-Subject: [PATCH] ImageStream::getLine: fix crash on broken files
-
-Fixes #728

- poppler/Stream.cc | 3 +++
- 1 file changed, 3 insertions(+)
-
-diff --git a/poppler/Stream.cc b/poppler/Stream.cc
-index 33537b0e..a41435ab 100644
 a/poppler/Stream.cc
-+++ b/poppler/Stream.cc
-@@ -496,6 +496,9 @@ unsigned char *ImageStream::getLine() {
-   }
-  
-   int readChars = str->doGetChars(inputLineSize, inputLine);
-+  if (unlikely(readChars == -1)) {
-+  readChars = 0;
-+  }
-   for ( ; readChars < inputLineSize; readChars++) inputLine[readChars] = EOF;
-   if (nBits == 1) {
- unsigned char *p = inputLine;
--- 
-2.20.1
-
diff --git a/external/poppler/StaticLibrary_poppler.mk 
b/external/poppler/StaticLibrary_poppler.mk
index bdb51ad115da..8bf9f528ee9e 100644
--- a/external/poppler/StaticLibrary_poppler.mk
+++ b/external/poppler/StaticLibrary_poppler.mk
@@ -39,7 +39,6 @@ $(eval $(call 
gb_StaticLibrary_add_generated_exception_objects,poppler,\
UnpackedTarball/poppler/goo/gfile \
UnpackedTarball/poppler/goo/GooTimer \
UnpackedTarball/poppler/goo/GooString \
-   UnpackedTarball/poppler/goo/FixedPoint \
UnpackedTarball/poppler/goo/NetPBMWriter \
UnpackedTarball/poppler/goo/PNGWriter \
UnpackedTarball/poppler/goo/TiffWriter \
diff --git a/external/poppler/UnpackedTarball_poppler.mk 
b/external/poppler/UnpackedTarball_poppler.mk
index aaad243fbf0a..68fd06d9403b 100644
--- a/external/poppler/UnpackedTarball_poppler.mk
+++ b/external/poppler/UnpackedTarball_poppler.mk
@@ -13,7 +13,6 @@ $(eval $(call 
gb_UnpackedTarball_set_tarball,poppler,$(POPPLER_TARBALL),,poppler
 
 $(eval $(call gb_UnpackedTarball_add_patches,poppler,\
external/poppler/poppler-config.patch.1 \
-   
external/poppler/0001-ImageStream-getLine-fix-crash-on-broken-files.patch.1 \
 ))
 
 # vim: set noet sw=4 ts=4:
diff --git a/external/poppler/poppler-config.patch.1 
b/external/poppler/poppler-config.patch.1
index 1c68806276f7..cb74cd66fb5e 100644
--- a/external/poppler/poppler-config.patch.1
+++ b/external/poppler/poppler-config.patch.1
@@ -195,7 +195,7 @@ index 0fbd336a..451213f8 100644
 +#define PACKAGE_NAME "poppler"
 +
 +/*

[Libreoffice-commits] core.git: Branch 'libreoffice-6-4' - download.lst external/libxml2

2019-11-21 Thread Michael Stahl (via logerrit) 
 download.lst|4 +-
 external/libxml2/libxml2-android.patch  |2 -
 external/libxml2/libxml2-config.patch.1 |   46 ++--
 3 files changed, 13 insertions(+), 39 deletions(-)

New commits:
commit befc7dcd286c78a29c7458a3d0db1ae1854381cf
Author: Michael Stahl 
AuthorDate: Wed Nov 20 15:05:02 2019 +0100
Commit: Thorsten Behrens 
CommitDate: Thu Nov 21 09:17:47 2019 +0100

libxml2: upgrade to release 2.9.10

... which is, surprisingly enough, required to build the latest libxslt.

Change-Id: Ifbb36ed61b8f68185f9c788f63a8edeb58899f94
Reviewed-on: https://gerrit.libreoffice.org/83311
Tested-by: Jenkins
Reviewed-by: Michael Stahl 
(cherry picked from commit d1bf39a78ed239d4493f0470ca937852265e79d6)
Reviewed-on: https://gerrit.libreoffice.org/83346
Reviewed-by: Thorsten Behrens 

diff --git a/download.lst b/download.lst
index c8b5e0bd8083..c67bbf0bc5f8 100644
--- a/download.lst
+++ b/download.lst
@@ -156,8 +156,8 @@ export LIBTOMMATH_SHA256SUM := 
083daa92d8ee6f4af96a6143b12d7fc8fe1a547e14f862304
 export LIBTOMMATH_TARBALL := ltm-1.0.zip
 export XMLSEC_SHA256SUM := 
13eec4811ea30e3f0e16a734d1dbf7f9d246a71d540b48d143a07b489f6222d4
 export XMLSEC_TARBALL := xmlsec1-1.2.28.tar.gz
-export LIBXML_SHA256SUM := 
94fb70890143e3c6549f265cee93ec064c80a84c42ad0f23e85ee1fd6540a871
-export LIBXML_VERSION_MICRO := 9
+export LIBXML_SHA256SUM := 
aafee193ffb8fe0c82d4afef6ef91972cbaf5feea100edc2f262750611b4be1f
+export LIBXML_VERSION_MICRO := 10
 export LIBXML_TARBALL := libxml2-2.9.$(LIBXML_VERSION_MICRO).tar.gz
 export LIBXSLT_SHA256SUM := 
8e36605144409df979cab43d835002f63988f3dc94d5d3537c12796db90e38c8
 export LIBXSLT_VERSION_MICRO := 33
diff --git a/external/libxml2/libxml2-android.patch 
b/external/libxml2/libxml2-android.patch
index 714de61068fb..42af83274026 100644
--- a/external/libxml2/libxml2-android.patch
+++ b/external/libxml2/libxml2-android.patch
@@ -4,7 +4,7 @@
$(MAKE) $(AM_MAKEFLAGS) $(check_PROGRAMS)
  check: $(BUILT_SOURCES)
$(MAKE) $(AM_MAKEFLAGS) check-recursive
--all-am: Makefile $(LTLIBRARIES) $(PROGRAMS) $(SCRIPTS) $(MANS) $(DATA) \
+-all-am: Makefile $(PROGRAMS) $(LTLIBRARIES) $(SCRIPTS) $(MANS) $(DATA) \
 +all-am: Makefile $(LTLIBRARIES) \
config.h
  install-binPROGRAMS: install-libLTLIBRARIES
diff --git a/external/libxml2/libxml2-config.patch.1 
b/external/libxml2/libxml2-config.patch.1
index 7d96fb530e57..8c28fb6a7806 100644
--- a/external/libxml2/libxml2-config.patch.1
+++ b/external/libxml2/libxml2-config.patch.1
@@ -25,45 +25,19 @@ Hack the xml2-config to return paths into WORKDIR.
;;
  
  --cflags)
--  echo @XML_INCLUDEDIR@ @XML_CFLAGS@
-+echo -I${includedir}
-+# echo @XML_INCLUDEDIR@ @XML_CFLAGS@
+-cflags="@XML_INCLUDEDIR@ @XML_CFLAGS@"
++#cflags="@XML_INCLUDEDIR@ @XML_CFLAGS@"
++cflags="-I${includedir}"
;;
  
  --libtool-libs)
-@@ -82,19 +88,24 @@
-   ;;
+@@ -91,7 +96,8 @@
+ libs="@XML_LIBDIR@ $libs"
+ fi
  
- --libs)
--if [ "`uname`" = "Linux" ]
--  then
--  if [ "@XML_LIBDIR@" = "-L/usr/lib" -o "@XML_LIBDIR@" = 
"-L/usr/lib64" ]
--  then
--  echo @XML_LIBS@ @MODULE_PLATFORM_LIBS@
--  else
--  echo @XML_LIBDIR@ @XML_LIBS@ @MODULE_PLATFORM_LIBS@
--  fi
--  else
--  echo @XML_LIBDIR@ @XML_LIBS@ @MODULE_PLATFORM_LIBS@ 
@WIN32_EXTRA_LIBADD@
--  fi
-+echo -L${libdir} -lxml2 -lm
-+#if [ "`uname`" = "Linux" ]
-+# then
-+# if [ "@XML_LIBDIR@" = "-L/usr/lib" -o "@XML_LIBDIR@" = 
"-L/usr/lib64" ]
-+# then
-+# echo @XML_LIBS@ @MODULE_PLATFORM_LIBS@
-+# else
-+# echo @XML_LIBDIR@ @XML_LIBS@ @MODULE_PLATFORM_LIBS@
-+# fi
-+# else
-+# echo @XML_LIBDIR@ @XML_LIBS@ @MODULE_PLATFORM_LIBS@ 
@WIN32_EXTRA_LIBADD@
-+# fi
-   ;;
+-libs="$libs @WIN32_EXTRA_LIBADD@"
++#libs="$libs @WIN32_EXTRA_LIBADD@"
++libs="-L${libdir} -lxml2 -lm"
+ ;;
  
-+print) # ugly configure hack
-+exit 0
-+;;
-+ 
  *)
-   usage
-   exit 1
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits