[Libreoffice-commits] core.git: download.lst external/libxmlsec external/Module_external.mk external/xmlsec Makefile.fetch

2017-09-15 Thread Michael Stahl 
 Makefile.fetch|2 +-
 download.lst  |4 ++--
 external/Module_external.mk   |2 +-
 external/xmlsec/Module_xmlsec.mk  |4 ++--
 external/xmlsec/UnpackedTarball_xmlsec.mk |4 ++--
 5 files changed, 8 insertions(+), 8 deletions(-)

New commits:
commit 6cdf761c7a9e167cde85d4e8e6f356c99a259f68
Author: Michael Stahl 
Date:   Thu Sep 14 15:11:33 2017 +0200

consistent naming of externals: libxmlsec -> xmlsec

Change-Id: I9774dbec91b397d291d8f7f9bf96bbb75fc2baad
Reviewed-on: https://gerrit.libreoffice.org/42298
Tested-by: Jenkins 
Reviewed-by: Michael Stahl 

diff --git a/Makefile.fetch b/Makefile.fetch
index af57d2f9066c..e0bff2616b99 100644
--- a/Makefile.fetch
+++ b/Makefile.fetch
@@ -161,7 +161,7 @@ $(WORKDIR)/download: $(BUILDDIR)/config_$(gb_Side).mk 
$(SRCDIR)/download.lst $(S
$(call fetch_Optional,LIBPNG,LIBPNG_TARBALL) \
$(call fetch_Optional,LIBTOMMATH,LIBTOMMATH_TARBALL) \
$(call fetch_Optional,LIBXML2,LIBXML_TARBALL) \
-   LIBXMLSEC_TARBALL \
+   XMLSEC_TARBALL \
$(call fetch_Optional,LIBXSLT,LIBXSLT_TARBALL) \
$(call fetch_Optional,LPSOLVE,LPSOLVE_TARBALL) \
$(call 
fetch_Optional,MARIADB_CONNECTOR_C,MARIADB_CONNECTOR_C_TARBALL) \
diff --git a/download.lst b/download.lst
index f59fd67b0337..679a97ab30eb 100644
--- a/download.lst
+++ b/download.lst
@@ -141,8 +141,8 @@ export LIBLANGTAG_SHA256SUM := 
d6242790324f1432fb0a6fae71b6851f520b2c5a87675497c
 export LIBLANGTAG_TARBALL := liblangtag-0.6.2.tar.bz2
 export LIBTOMMATH_SHA256SUM := 
083daa92d8ee6f4af96a6143b12d7fc8fe1a547e14f862304f7281f8f7347483
 export LIBTOMMATH_TARBALL := ltm-1.0.zip
-export LIBXMLSEC_SHA256SUM := 
99a8643f118bb1261a72162f83e2deba0f4f690893b4b90e1be4f708e8d481cc
-export LIBXMLSEC_TARBALL := xmlsec1-1.2.24.tar.gz
+export XMLSEC_SHA256SUM := 
99a8643f118bb1261a72162f83e2deba0f4f690893b4b90e1be4f708e8d481cc
+export XMLSEC_TARBALL := xmlsec1-1.2.24.tar.gz
 export LIBXML_SHA256SUM := 
4031c1ecee9ce7ba4f313e91ef6284164885cdb69937a123f6a83bb6a72dcd38
 export LIBXML_TARBALL := libxml2-2.9.5.tar.gz
 export LIBXSLT_SHA256SUM := 
ba65236116de8326d83378b2bd929879fa185195bc530b9d1aba72107910b6b3
diff --git a/external/Module_external.mk b/external/Module_external.mk
index df0fc408a787..de79fb2f7d56 100644
--- a/external/Module_external.mk
+++ b/external/Module_external.mk
@@ -14,7 +14,7 @@ $(eval $(call gb_Module_add_moduledir,external,msc-externals))
 endif
 
 $(eval $(call gb_Module_add_moduledirs,external,\
-   $(if $(filter-out IOS,$(OS)),$(call 
gb_Helper_optional,XMLSEC,libxmlsec)) \
+   $(if $(filter-out IOS,$(OS)),$(call gb_Helper_optional,XMLSEC,xmlsec)) \
$(call gb_Helper_optional,ABW,libabw) \
$(call gb_Helper_optional,APACHE_COMMONS,apache-commons) \
$(call gb_Helper_optional,APR,apr) \
diff --git a/external/libxmlsec/ExternalPackage_xmlsec.mk 
b/external/xmlsec/ExternalPackage_xmlsec.mk
similarity index 100%
rename from external/libxmlsec/ExternalPackage_xmlsec.mk
rename to external/xmlsec/ExternalPackage_xmlsec.mk
diff --git a/external/libxmlsec/ExternalProject_xmlsec.mk 
b/external/xmlsec/ExternalProject_xmlsec.mk
similarity index 100%
rename from external/libxmlsec/ExternalProject_xmlsec.mk
rename to external/xmlsec/ExternalProject_xmlsec.mk
diff --git a/external/libxmlsec/Makefile b/external/xmlsec/Makefile
similarity index 100%
rename from external/libxmlsec/Makefile
rename to external/xmlsec/Makefile
diff --git a/external/libxmlsec/Module_libxmlsec.mk 
b/external/xmlsec/Module_xmlsec.mk
similarity index 82%
rename from external/libxmlsec/Module_libxmlsec.mk
rename to external/xmlsec/Module_xmlsec.mk
index 7196c02cec9f..55b0a46547a4 100644
--- a/external/libxmlsec/Module_libxmlsec.mk
+++ b/external/xmlsec/Module_xmlsec.mk
@@ -7,9 +7,9 @@
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 #
 
-$(eval $(call gb_Module_Module,libxmlsec))
+$(eval $(call gb_Module_Module,xmlsec))
 
-$(eval $(call gb_Module_add_targets,libxmlsec,\
+$(eval $(call gb_Module_add_targets,xmlsec,\
UnpackedTarball_xmlsec \
ExternalPackage_xmlsec \
ExternalProject_xmlsec \
diff --git a/external/libxmlsec/README b/external/xmlsec/README
similarity index 100%
rename from external/libxmlsec/README
rename to external/xmlsec/README
diff --git a/external/libxmlsec/UnpackedTarball_xmlsec.mk 
b/external/xmlsec/UnpackedTarball_xmlsec.mk
similarity index 83%
rename from external/libxmlsec/UnpackedTarball_xmlsec.mk
rename to external/xmlsec/UnpackedTarball_xmlsec.mk
index e07601c594be..0ee75129856f 100644
--- a/external/libxmlsec/UnpackedTarball_xmlsec.mk
+++ b/external/xmlsec/UnpackedTarball_xmlsec.mk
@@ -17,10 +17,10 @@ xmlsec_patches += 
xmlsec1-mscrypto-fix-signing-regression.patch.1
 
 $(eval $(call

[Libreoffice-commits] core.git: download.lst external/libxmlsec

2017-05-10 Thread Miklos Vajna 
 download.lst   |4 
 external/libxmlsec/UnpackedTarball_xmlsec.mk   |6 
 external/libxmlsec/xmlsec1-1.2.14_fix_extern_c.patch.1 |6 
 external/libxmlsec/xmlsec1-configure.patch.1   |   85 
 external/libxmlsec/xmlsec1-customkeymanage.patch.1 |  863 
+++---
 external/libxmlsec/xmlsec1-mscrypto-fix-signing-regression.patch.1 |   46 
 external/libxmlsec/xmlsec1-noverify.patch.1|   66 
 external/libxmlsec/xmlsec1-nss-ecdsa-memset.patch.1|   37 
 external/libxmlsec/xmlsec1-nss-ecdsa-sha256.patch.1|  434 -
 external/libxmlsec/xmlsec1-nssdisablecallbacks.patch.1 |   10 
 external/libxmlsec/xmlsec1-vc.patch.1  |   16 
 11 files changed, 477 insertions(+), 1096 deletions(-)

New commits:
commit ad319fdfcaaa6092ea1ff76935e088c5122e0d2e
Author: Miklos Vajna 
Date:   Wed May 10 09:06:59 2017 +0200

Upgrade libxmlsec to 1.2.24

Upstream changes interesting for us:

- Added ECDSA-SHA1, ECDSA-SHA256, ECDSA-SHA512 support for xmlsec-nss,
  so we can drop 2 patches
- Fixed XMLSEC_KEYINFO_FLAGS_X509DATA_DONT_VERIFY_CERTS handling, which
  allows dropping xmlsec1-noverify.patch.1 in the future

Also backport a patch from xmlsec master that fixes signature creation
on Windows (the release regressed in this regard).

Change-Id: I2c14328283bf7d4f8af5595ea4c1efc29ee81f9e

diff --git a/download.lst b/download.lst
index c0af455665f5..8abec7d647d6 100644
--- a/download.lst
+++ b/download.lst
@@ -139,8 +139,8 @@ export LIBLANGTAG_SHA256SUM := 
d6242790324f1432fb0a6fae71b6851f520b2c5a87675497c
 export LIBLANGTAG_TARBALL := liblangtag-0.6.2.tar.bz2
 export LIBTOMMATH_SHA256SUM := 
083daa92d8ee6f4af96a6143b12d7fc8fe1a547e14f862304f7281f8f7347483
 export LIBTOMMATH_TARBALL := ltm-1.0.zip
-export LIBXMLSEC_SHA256SUM := 
41d463d16c9894cd3317098d027c038039c6d896b9cbb9bad9c4e29959e10e9f
-export LIBXMLSEC_TARBALL := 
86b1daaa438f5a7bea9a52d7b9799ac0-xmlsec1-1.2.23.tar.gz
+export LIBXMLSEC_SHA256SUM := 
99a8643f118bb1261a72162f83e2deba0f4f690893b4b90e1be4f708e8d481cc
+export LIBXMLSEC_TARBALL := xmlsec1-1.2.24.tar.gz
 export LIBXML_SHA256SUM := 
ffb911191e509b966deb55de705387f14156e1a56b21824357cdf0053233633c
 export LIBXML_TARBALL := ae249165c173b1ff386ee8ad676815f5-libxml2-2.9.4.tar.gz
 export LIBXSLT_SHA256SUM := 
b5976e3857837e7617b29f2249ebb5eeac34e249208d31f1fbf7a6ba7a4090ce
diff --git a/external/libxmlsec/UnpackedTarball_xmlsec.mk 
b/external/libxmlsec/UnpackedTarball_xmlsec.mk
index 64fb37aad058..62adcf788a85 100644
--- a/external/libxmlsec/UnpackedTarball_xmlsec.mk
+++ b/external/libxmlsec/UnpackedTarball_xmlsec.mk
@@ -14,10 +14,8 @@ xmlsec_patches += xmlsec1-noverify.patch.1
 xmlsec_patches += xmlsec1-vc.patch.1
 xmlsec_patches += xmlsec1-1.2.14_fix_extern_c.patch.1
 xmlsec_patches += xmlsec1-customkeymanage.patch.1
-# Backport of .
-xmlsec_patches += xmlsec1-nss-ecdsa-sha256.patch.1
-# Backport of .
-xmlsec_patches += xmlsec1-nss-ecdsa-memset.patch.1
+# Backport of .
+xmlsec_patches += xmlsec1-mscrypto-fix-signing-regression.patch.1
 
 $(eval $(call gb_UnpackedTarball_UnpackedTarball,xmlsec))
 
diff --git a/external/libxmlsec/xmlsec1-1.2.14_fix_extern_c.patch.1 
b/external/libxmlsec/xmlsec1-1.2.14_fix_extern_c.patch.1
index 9ead19c343c7..9ff5e52872a9 100644
--- a/external/libxmlsec/xmlsec1-1.2.14_fix_extern_c.patch.1
+++ b/external/libxmlsec/xmlsec1-1.2.14_fix_extern_c.patch.1
@@ -1,4 +1,4 @@
-From b4cb46f2737f7e3a4073b747ed4a0dfb99d48fdd Mon Sep 17 00:00:00 2001
+From 057ee59c4e63b9afe0e95c626312ac530feadbeb Mon Sep 17 00:00:00 2001
 From: Miklos Vajna 
 Date: Fri, 4 Mar 2016 16:12:48 +0100
 Subject: [PATCH] xmlsec1-1.2.14_fix_extern_c.patch
@@ -10,7 +10,7 @@ Conflicts:
  1 file changed, 4 insertions(+), 4 deletions(-)
 
 diff --git a/include/xmlsec/xmlsec.h b/include/xmlsec/xmlsec.h
-index 963b37a..ec58bec 100644
+index 69d765f2..11b9975c 100644
 --- a/include/xmlsec/xmlsec.h
 +++ b/include/xmlsec/xmlsec.h
 @@ -11,16 +11,16 @@
@@ -35,5 +35,5 @@ index 963b37a..ec58bec 100644
   *
   * Basic types to make ports to exotic platforms easier
 -- 
-2.6.6
+2.12.0
 
diff --git a/external/libxmlsec/xmlsec1-configure.patch.1 
b/external/libxmlsec/xmlsec1-configure.patch.1
index e114012ab602..5718e223cad7 100644
--- a/external/libxmlsec/xmlsec1-configure.patch.1
+++ b/external/libxmlsec/xmlsec1-configure.patch.1
@@ -1,4 +1,4 @@
-From 70139f4422c78f21ed9a7435267e37d15c4c8fa6 Mon Sep 17 00:00:00 2001
+From 49f9bed356b307d7700f429851f1509639956b20 Mon Sep 17 00:00:00 2001
 From: Miklos Vajna 
 Date: Fri, 4 Mar 2016 16:06:19 +0100
 Subject: [PATCH]

[Libreoffice-commits] core.git: download.lst external/libxmlsec

2016-11-04 Thread Miklos Vajna 
 download.lst |2 
 external/libxmlsec/UnpackedTarball_xmlsec.mk |2 
 external/libxmlsec/xmlsec1-1.2.14_fix_extern_c.patch.1   |2 
 external/libxmlsec/xmlsec1-configure.patch.1 |   28 ++--
 external/libxmlsec/xmlsec1-customkeymanage.patch.1   |  104 ++-
 external/libxmlsec/xmlsec1-mingw-keymgr-mscrypto.patch.1 |   10 -
 external/libxmlsec/xmlsec1-noverify.patch.1  |2 
 external/libxmlsec/xmlsec1-nssdisablecallbacks.patch.1   |2 
 external/libxmlsec/xmlsec1-nssmangleciphers.patch.1  |2 
 external/libxmlsec/xmlsec1-vc.patch.1|8 -
 external/libxmlsec/xmlsec1-win32-fix-undeclared.patch.1  |   31 
 11 files changed, 76 insertions(+), 117 deletions(-)

New commits:
commit f0167eced77657190226d24a19005a66ff7e739e
Author: Miklos Vajna 
Date:   Thu Nov 3 18:18:09 2016 +0100

Upgrade libxmlsec to 1.2.23

Obsoletes xmlsec1-win32-fix-undeclared.patch.1.

Change-Id: I11cd52aebbe5ab224de9ab00b74c02abb46296f6
Reviewed-on: https://gerrit.libreoffice.org/30539
Tested-by: Jenkins 
Reviewed-by: Miklos Vajna 

diff --git a/download.lst b/download.lst
index 6a6bace..71cd479 100644
--- a/download.lst
+++ b/download.lst
@@ -94,7 +94,7 @@ export LIBLANGTAG_MD5SUM := 284f120247323a35122ab32b4b359c45
 export LIBLANGTAG_TARBALL := liblangtag-0.6.2.tar.bz2
 export LIBTOMMATH_MD5SUM := da283d2e3e72137d0c600ac36b991c9d
 export LIBTOMMATH_TARBALL := ltm-1.0.zip
-export LIBXMLSEC_TARBALL := 
0fb1bb06d60d7708abc4797008209bcc-xmlsec1-1.2.22.tar.gz
+export LIBXMLSEC_TARBALL := 
86b1daaa438f5a7bea9a52d7b9799ac0-xmlsec1-1.2.23.tar.gz
 export LIBXML_TARBALL := ae249165c173b1ff386ee8ad676815f5-libxml2-2.9.4.tar.gz
 export LIBXSLT_TARBALL := 
a129d3c44c022de3b9dcf6d6f288d72e-libxslt-1.1.29.tar.gz
 export LPSOLVE_TARBALL := 26b3e95ddf3d9c077c480ea45874b3b8-lp_solve_5.5.tar.gz
diff --git a/external/libxmlsec/UnpackedTarball_xmlsec.mk 
b/external/libxmlsec/UnpackedTarball_xmlsec.mk
index badd5c3..3a0469c 100644
--- a/external/libxmlsec/UnpackedTarball_xmlsec.mk
+++ b/external/libxmlsec/UnpackedTarball_xmlsec.mk
@@ -13,8 +13,6 @@ xmlsec_patches += xmlsec1-nssdisablecallbacks.patch.1
 xmlsec_patches += xmlsec1-nssmangleciphers.patch.1
 xmlsec_patches += xmlsec1-noverify.patch.1
 xmlsec_patches += xmlsec1-mingw-keymgr-mscrypto.patch.1
-# Upstreamed as .
-xmlsec_patches += xmlsec1-win32-fix-undeclared.patch.1
 xmlsec_patches += xmlsec1-vc.patch.1
 xmlsec_patches += xmlsec1-1.2.14_fix_extern_c.patch.1
 xmlsec_patches += xmlsec1-customkeymanage.patch.1
diff --git a/external/libxmlsec/xmlsec1-1.2.14_fix_extern_c.patch.1 
b/external/libxmlsec/xmlsec1-1.2.14_fix_extern_c.patch.1
index 0ae592b..9ead19c 100644
--- a/external/libxmlsec/xmlsec1-1.2.14_fix_extern_c.patch.1
+++ b/external/libxmlsec/xmlsec1-1.2.14_fix_extern_c.patch.1
@@ -1,4 +1,4 @@
-From 145ae5235f79fec807f360cc34a0bf16cd6b6d75 Mon Sep 17 00:00:00 2001
+From b4cb46f2737f7e3a4073b747ed4a0dfb99d48fdd Mon Sep 17 00:00:00 2001
 From: Miklos Vajna 
 Date: Fri, 4 Mar 2016 16:12:48 +0100
 Subject: [PATCH] xmlsec1-1.2.14_fix_extern_c.patch
diff --git a/external/libxmlsec/xmlsec1-configure.patch.1 
b/external/libxmlsec/xmlsec1-configure.patch.1
index b82ee08..2b496d7 100644
--- a/external/libxmlsec/xmlsec1-configure.patch.1
+++ b/external/libxmlsec/xmlsec1-configure.patch.1
@@ -1,4 +1,4 @@
-From 3a8aaa9a5baf91ef6bf9c24b4080896fb8615b0c Mon Sep 17 00:00:00 2001
+From 70139f4422c78f21ed9a7435267e37d15c4c8fa6 Mon Sep 17 00:00:00 2001
 From: Miklos Vajna 
 Date: Fri, 4 Mar 2016 16:06:19 +0100
 Subject: [PATCH] xmlsec1-configure.patch
@@ -15,7 +15,7 @@ Conflicts:
  4 files changed, 42 insertions(+), 14 deletions(-)
 
 diff --git a/Makefile.am b/Makefile.am
-index 3453c01..da71139 100644
+index 3453c01..2c5effb 100644
 --- a/Makefile.am
 +++ b/Makefile.am
 @@ -1,7 +1,7 @@
@@ -28,10 +28,10 @@ index 3453c01..da71139 100644
  DEFAULT_CRYPTO= @XMLSEC_DEFAULT_CRYPTO@
  
 diff --git a/Makefile.in b/Makefile.in
-index 6b23543..759b33e 100644
+index f35b430..f3ca4ed 100644
 --- a/Makefile.in
 +++ b/Makefile.in
-@@ -469,7 +469,7 @@ top_builddir = @top_builddir@
+@@ -468,7 +468,7 @@ top_builddir = @top_builddir@
  top_srcdir = @top_srcdir@
  NULL = 
  SAFE_VERSION = @XMLSEC_VERSION_SAFE@
@@ -41,10 +41,10 @@ index 6b23543..759b33e 100644
  DEFAULT_CRYPTO = @XMLSEC_DEFAULT_CRYPTO@
  bin_SCRIPTS = xmlsec1-config
 diff --git a/configure.ac b/configure.ac
-index 8fb8740..67905b5 100644
+index b8770ad..721e4ca 100644
 --- a/configure.ac
 +++ b/configure.ac
-@@ -230,8 +230,8 @@ dnl find libxml
+@@ -227,8 +227,8 @@ dnl find libxml
  dnl ==
  LIBXML_MIN_VERSION="2.7.4"
  LIBXML_CONFIG="xml2-config"
@@ -55,7

[Libreoffice-commits] core.git: download.lst external/libxmlsec

2016-07-14 Thread Miklos Vajna 
 download.lst   |2 +-
 external/libxmlsec/xmlsec1-configure.patch.1   |4 ++--
 external/libxmlsec/xmlsec1-customkeymanage.patch.1 |6 +++---
 external/libxmlsec/xmlsec1-vc.patch.1  |   12 ++--
 4 files changed, 12 insertions(+), 12 deletions(-)

New commits:
commit 742e632d8acbe5d0a036d748c062a6616acfdf4a
Author: Miklos Vajna 
Date:   Wed Jul 13 19:14:48 2016 +0200

Upgrade libxmlsec to 1.2.22

No major changes for us, except that finally we bundle the latest
upstream (but still heavily patch it).

Change-Id: I6bcfcdf48ec5d25eb3f7b14c89838942b4a11b48
Reviewed-on: https://gerrit.libreoffice.org/27196
Reviewed-by: Miklos Vajna 
Tested-by: Jenkins 

diff --git a/download.lst b/download.lst
index dd56086..2061dad 100644
--- a/download.lst
+++ b/download.lst
@@ -92,7 +92,7 @@ export LIBEXTTEXTCAT_TARBALL := 
10d61fbaa6a06348823651b1bd7940fe-libexttextcat-3
 export LIBGLTF_MD5SUM := d63a9f47ab048f5009d90693d6aa6424
 export LIBGLTF_TARBALL := libgltf-0.0.2.tar.bz2
 export LIBLANGTAG_TARBALL := 
aa899eff126216dafe721149fbdb511b-liblangtag-0.5.8.tar.bz2
-export LIBXMLSEC_TARBALL := 
95f31bcbe0ae278a22d3f77f1e732d29-xmlsec1-1.2.21.tar.gz
+export LIBXMLSEC_TARBALL := 
0fb1bb06d60d7708abc4797008209bcc-xmlsec1-1.2.22.tar.gz
 export LIBXML_TARBALL := ae249165c173b1ff386ee8ad676815f5-libxml2-2.9.4.tar.gz
 export LIBXSLT_TARBALL := 
a129d3c44c022de3b9dcf6d6f288d72e-libxslt-1.1.29.tar.gz
 export LPSOLVE_TARBALL := 26b3e95ddf3d9c077c480ea45874b3b8-lp_solve_5.5.tar.gz
diff --git a/external/libxmlsec/xmlsec1-configure.patch.1 
b/external/libxmlsec/xmlsec1-configure.patch.1
index 2c0df5b..02a675f 100644
--- a/external/libxmlsec/xmlsec1-configure.patch.1
+++ b/external/libxmlsec/xmlsec1-configure.patch.1
@@ -166,10 +166,10 @@ index 8fb8740..67905b5 100644
if test "z$dir" = "z/usr/lib" ; then
NSS_LIBS="$NSS_LIBS_LIST"
 diff --git a/win32/Makefile.msvc b/win32/Makefile.msvc
-index 357a890..30b9dfb 100644
+index e3d5262..978336e 100644
 --- a/win32/Makefile.msvc
 +++ b/win32/Makefile.msvc
-@@ -392,7 +392,7 @@ APP_LIBS   = $(SOLIBS) $(XMLSEC_CRYPTO_SOLIBS)
+@@ -394,7 +394,7 @@ APP_LIBS   = $(SOLIBS) $(XMLSEC_CRYPTO_SOLIBS)
  XMLSEC_OPENSSL_SOLIBS   = libeay32.lib wsock32.lib kernel32.lib user32.lib 
gdi32.lib
  XMLSEC_OPENSSL_ALIBS= libeay32.lib wsock32.lib kernel32.lib user32.lib 
gdi32.lib
  
diff --git a/external/libxmlsec/xmlsec1-customkeymanage.patch.1 
b/external/libxmlsec/xmlsec1-customkeymanage.patch.1
index d17b313..f80b994 100644
--- a/external/libxmlsec/xmlsec1-customkeymanage.patch.1
+++ b/external/libxmlsec/xmlsec1-customkeymanage.patch.1
@@ -4876,10 +4876,10 @@ index 0edaa2d..c8baaab 100644
  
  
 diff --git a/win32/Makefile.msvc b/win32/Makefile.msvc
-index 51c53a7..525ae8d 100644
+index a474592..f9ddd74 100644
 --- a/win32/Makefile.msvc
 +++ b/win32/Makefile.msvc
-@@ -224,6 +224,9 @@ XMLSEC_OPENSSL_OBJS_A = \
+@@ -226,6 +226,9 @@ XMLSEC_OPENSSL_OBJS_A = \
$(XMLSEC_OPENSSL_INTDIR_A)\x509vfy.obj 
  
  XMLSEC_NSS_OBJS = \
@@ -4889,7 +4889,7 @@ index 51c53a7..525ae8d 100644
$(XMLSEC_NSS_INTDIR)\app.obj\
$(XMLSEC_NSS_INTDIR)\bignum.obj\
$(XMLSEC_NSS_INTDIR)\ciphers.obj \
-@@ -259,6 +262,7 @@ XMLSEC_NSS_OBJS_A = \
+@@ -261,6 +264,7 @@ XMLSEC_NSS_OBJS_A = \
$(XMLSEC_NSS_INTDIR_A)\strings.obj
  
  XMLSEC_MSCRYPTO_OBJS = \
diff --git a/external/libxmlsec/xmlsec1-vc.patch.1 
b/external/libxmlsec/xmlsec1-vc.patch.1
index 9e40c5d..117a031 100644
--- a/external/libxmlsec/xmlsec1-vc.patch.1
+++ b/external/libxmlsec/xmlsec1-vc.patch.1
@@ -4,14 +4,14 @@ Date: Fri, 4 Mar 2016 16:12:29 +0100
 Subject: [PATCH] xmlsec1-vc.patch
 
 ---
- win32/Makefile.msvc | 10 +-
- 1 file changed, 9 insertions(+), 1 deletion(-)
+ win32/Makefile.msvc | 12 ++--
+ 1 file changed, 10 insertions(+), 2 deletions(-)
 
 diff --git a/win32/Makefile.msvc b/win32/Makefile.msvc
-index 30b9dfb..51c53a7 100644
+index 978336e..a474592 100644
 --- a/win32/Makefile.msvc
 +++ b/win32/Makefile.msvc
-@@ -309,6 +309,10 @@ CFLAGS= $(CFLAGS) /D 
PACKAGE=\"$(XMLSEC_NAME)\"
+@@ -311,6 +311,10 @@ CFLAGS= $(CFLAGS) /D 
PACKAGE=\"$(XMLSEC_NAME)\"
  CFLAGS= $(CFLAGS) /D "HAVE_STDIO_H" /D "HAVE_STDLIB_H"
  CFLAGS= $(CFLAGS) /D "HAVE_STRING_H" /D "HAVE_CTYPE_H"
  CFLAGS= $(CFLAGS) /D "HAVE_MALLOC_H" /D 
"HAVE_MEMORY_H"
@@ -22,7 +22,7 @@ index 30b9dfb..51c53a7 100644
  
  !if "$(UNICODE)" == "1"
  CFLAGS= $(CFLAGS) /D "UNICODE" /D "_UNICODE"
-@@ -332,7 +332,7 @@ CFLAGS = $(CFLAGS) 
/DXMLSEC_MSCRYPTO_NT4=1
+@@ -334,7 +338,7 @@ CFLAGS = $(CFLAGS) 
/DXMLSEC_MSCRYPTO_NT4=1
  !else 
  !endif
  
@@ -31,7 +31,7 @@ index

[Libreoffice-commits] core.git: download.lst external/libxmlsec

2016-04-13 Thread Miklos Vajna 
 download.lst |2 
 external/libxmlsec/UnpackedTarball_xmlsec.mk |1 
 external/libxmlsec/xmlsec1-configure.patch.1 |   24 
 external/libxmlsec/xmlsec1-customkeymanage.patch.1   |   20 
 external/libxmlsec/xmlsec1-mingw-keymgr-mscrypto.patch.1 |   12 
 external/libxmlsec/xmlsec1-ooxml.patch.1 |  946 ---
 external/libxmlsec/xmlsec1-update-config.guess.patch.1   |  672 --
 7 files changed, 576 insertions(+), 1101 deletions(-)

New commits:
commit 3dcd271f7e62e6d175cb187dbb2bbd099f5ca28e
Author: Miklos Vajna 
Date:   Tue Apr 12 17:37:28 2016 +0200

Upgrade libxmlsec to 1.2.20

Obsoletes xmlsec1-update-config.guess.patch.1.

Also update xmlsec1-ooxml.patch.1 as it was upstreamed at the end (with
improved error checks, etc), which wasn't possible before without loads
of conflicts.

Change-Id: I6fee428f73f8908289d87cc262ad323ec62e65cf
Reviewed-on: https://gerrit.libreoffice.org/24032
Tested-by: Jenkins 
Reviewed-by: Miklos Vajna 

diff --git a/download.lst b/download.lst
index 21c95b1..c76e00a 100644
--- a/download.lst
+++ b/download.lst
@@ -92,7 +92,7 @@ export LIBEXTTEXTCAT_TARBALL := 
10d61fbaa6a06348823651b1bd7940fe-libexttextcat-3
 export LIBGLTF_MD5SUM := d63a9f47ab048f5009d90693d6aa6424
 export LIBGLTF_TARBALL := libgltf-0.0.2.tar.bz2
 export LIBLANGTAG_TARBALL := 
aa899eff126216dafe721149fbdb511b-liblangtag-0.5.8.tar.bz2
-export LIBXMLSEC_TARBALL := 
fe664ba5f01ebfaeb0ab5deeb0b2249e-xmlsec1-1.2.19.tar.gz
+export LIBXMLSEC_TARBALL := 
ce12af00283eb90d9281956524250d6e-xmlsec1-1.2.20.tar.gz
 export LIBXML_TARBALL := daece17e045f1c107610e137ab50c179-libxml2-2.9.3.tar.gz
 export LIBXSLT_TARBALL := 
9667bf6f9310b957254fdcf6596600b7-libxslt-1.1.28.tar.gz
 export LPSOLVE_TARBALL := 26b3e95ddf3d9c077c480ea45874b3b8-lp_solve_5.5.tar.gz
diff --git a/external/libxmlsec/UnpackedTarball_xmlsec.mk 
b/external/libxmlsec/UnpackedTarball_xmlsec.mk
index 67913b7..81600b9 100644
--- a/external/libxmlsec/UnpackedTarball_xmlsec.mk
+++ b/external/libxmlsec/UnpackedTarball_xmlsec.mk
@@ -17,7 +17,6 @@ xmlsec_patches += xmlsec1-mingw-keymgr-mscrypto.patch.1
 xmlsec_patches += xmlsec1-vc.patch.1
 xmlsec_patches += xmlsec1-1.2.14_fix_extern_c.patch.1
 xmlsec_patches += xmlsec1-customkeymanage.patch.1
-xmlsec_patches += xmlsec1-update-config.guess.patch.1
 # Upstreamed as 
.
 xmlsec_patches += xmlsec1-ooxml.patch.1
 
diff --git a/external/libxmlsec/xmlsec1-configure.patch.1 
b/external/libxmlsec/xmlsec1-configure.patch.1
index 323177f..91ffb9a 100644
--- a/external/libxmlsec/xmlsec1-configure.patch.1
+++ b/external/libxmlsec/xmlsec1-configure.patch.1
@@ -29,10 +29,10 @@ index 669f996..0cf0798 100644
  
  bin_SCRIPTS   = xmlsec1-config
 diff --git a/Makefile.in b/Makefile.in
-index 25e6087..f9aa108 100644
+index 9b252ff..c42b984 100644
 --- a/Makefile.in
 +++ b/Makefile.in
-@@ -372,8 +372,9 @@ top_builddir = @top_builddir@
+@@ -452,8 +452,9 @@ top_builddir = @top_builddir@
  top_srcdir = @top_srcdir@
  NULL = 
  SAFE_VERSION = @XMLSEC_VERSION_SAFE@
@@ -45,10 +45,10 @@ index 25e6087..f9aa108 100644
  bin_SCRIPTS = xmlsec1-config
  pkgconfig_DATA = xmlsec1.pc @XMLSEC_CRYPTO_PC_FILES_LIST@
 diff --git a/configure.in b/configure.in
-index 1b46a92..92c4cc2 100644
+index 7690e7a..f2c98e3 100644
 --- a/configure.in
 +++ b/configure.in
-@@ -185,8 +185,8 @@ dnl find libxml
+@@ -188,8 +188,8 @@ dnl find libxml
  dnl ==
  LIBXML_MIN_VERSION="2.7.4"
  LIBXML_CONFIG="xml2-config"
@@ -59,7 +59,7 @@ index 1b46a92..92c4cc2 100644
  LIBXML_FOUND="no"
  AC_ARG_WITH(libxml, 
  [  --with-libxml=[PFX]   libxml2 location]
-@@ -195,6 +195,8 @@ AC_ARG_WITH(libxml-src,
+@@ -198,6 +198,8 @@ AC_ARG_WITH(libxml-src,
  [  --with-libxml-src=[PFX]   not installed yet libxml2 location]
  )
  
@@ -68,7 +68,7 @@ index 1b46a92..92c4cc2 100644
  if test "z$with_libxml" = "zno" -o "z$with_libxml_src" = "zno"; then 
  AC_MSG_CHECKING(for libxml2 libraries >= $LIBXML_MIN_VERSION) 
  AC_MSG_ERROR(libxml2 >= $LIBXML_MIN_VERSION is required for 
$XMLSEC_PACKAGE)
-@@ -243,6 +245,8 @@ if test "z$LIBXML_FOUND" = "zno" ; then
+@@ -246,6 +248,8 @@ if test "z$LIBXML_FOUND" = "zno" ; then
  fi
  fi
  
@@ -77,7 +77,7 @@ index 1b46a92..92c4cc2 100644
  AC_SUBST(LIBXML_CFLAGS)
  AC_SUBST(LIBXML_LIBS)
  AC_SUBST(LIBXML_CONFIG)
-@@ -551,12 +555,26 @@ dnl 
==
+@@ -570,12 +574,26 @@ dnl 
==
  XMLSEC_NO_NSS="1"
  SEAMONKEY_MIN_VERSION="1.0"
  MOZILLA_MIN_VERSION="1.4"
@@ -106,7 +106,7 @@ index 1b46a92..92c4cc2 100644

[Libreoffice-commits] core.git: download.lst external/libxmlsec

2016-04-06 Thread Miklos Vajna 
 download.lst |2 
 external/libxmlsec/UnpackedTarball_xmlsec.mk |3 
 external/libxmlsec/xmlsec1-1.2.14-ansi.patch.1   |   27 
 external/libxmlsec/xmlsec1-1.2.14_fix_extern_c.patch.1   |4 
 external/libxmlsec/xmlsec1-android.patch.1   |   34 
 external/libxmlsec/xmlsec1-configure.patch.1 |   30 
 external/libxmlsec/xmlsec1-customkeymanage.patch.1   |   36 
 external/libxmlsec/xmlsec1-mingw-keymgr-mscrypto.patch.1 |   26 
 external/libxmlsec/xmlsec1-noverify.patch.1  |4 
 external/libxmlsec/xmlsec1-nssdisablecallbacks.patch.1   |4 
 external/libxmlsec/xmlsec1-nssmangleciphers.patch.1  |4 
 external/libxmlsec/xmlsec1-oldlibtool.patch.1|4 
 external/libxmlsec/xmlsec1-ooxml.patch.1 |   24 
 external/libxmlsec/xmlsec1-update-config.guess.patch.1   |  986 +--
 external/libxmlsec/xmlsec1-vc.patch.1|8 
 15 files changed, 180 insertions(+), 1016 deletions(-)

New commits:
commit b87c4d8a7539c6b36250adc5626f13458a4c3016
Author: Miklos Vajna 
Date:   Tue Apr 5 19:39:40 2016 +0200

Upgrade libxmlsec to 1.2.19

Obsoletes our xmlsec1-1.2.14-ansi.patch.1 and xmlsec1-android.patch.1.

Change-Id: Ic6499b1a79e3f5a6d94beb62c0c338789c782c86
Reviewed-on: https://gerrit.libreoffice.org/23844
Tested-by: Jenkins 
Reviewed-by: Miklos Vajna 

diff --git a/download.lst b/download.lst
index 5a0ef86..23ec620 100644
--- a/download.lst
+++ b/download.lst
@@ -92,7 +92,7 @@ export LIBEXTTEXTCAT_TARBALL := 
10d61fbaa6a06348823651b1bd7940fe-libexttextcat-3
 export LIBGLTF_MD5SUM := d63a9f47ab048f5009d90693d6aa6424
 export LIBGLTF_TARBALL := libgltf-0.0.2.tar.bz2
 export LIBLANGTAG_TARBALL := 
aa899eff126216dafe721149fbdb511b-liblangtag-0.5.8.tar.bz2
-export LIBXMLSEC_TARBALL := 
8694b4609aab647186607f79e1da7f1a-xmlsec1-1.2.18.tar.gz
+export LIBXMLSEC_TARBALL := 
fe664ba5f01ebfaeb0ab5deeb0b2249e-xmlsec1-1.2.19.tar.gz
 export LIBXML_TARBALL := daece17e045f1c107610e137ab50c179-libxml2-2.9.3.tar.gz
 export LIBXSLT_TARBALL := 
9667bf6f9310b957254fdcf6596600b7-libxslt-1.1.28.tar.gz
 export LPSOLVE_TARBALL := 26b3e95ddf3d9c077c480ea45874b3b8-lp_solve_5.5.tar.gz
diff --git a/external/libxmlsec/UnpackedTarball_xmlsec.mk 
b/external/libxmlsec/UnpackedTarball_xmlsec.mk
index fd2fbb7..67913b7 100644
--- a/external/libxmlsec/UnpackedTarball_xmlsec.mk
+++ b/external/libxmlsec/UnpackedTarball_xmlsec.mk
@@ -16,9 +16,6 @@ xmlsec_patches += xmlsec1-noverify.patch.1
 xmlsec_patches += xmlsec1-mingw-keymgr-mscrypto.patch.1
 xmlsec_patches += xmlsec1-vc.patch.1
 xmlsec_patches += xmlsec1-1.2.14_fix_extern_c.patch.1
-xmlsec_patches += xmlsec1-android.patch.1
-# Partial backport of 
.
-xmlsec_patches += xmlsec1-1.2.14-ansi.patch.1
 xmlsec_patches += xmlsec1-customkeymanage.patch.1
 xmlsec_patches += xmlsec1-update-config.guess.patch.1
 # Upstreamed as 
.
diff --git a/external/libxmlsec/xmlsec1-1.2.14-ansi.patch.1 
b/external/libxmlsec/xmlsec1-1.2.14-ansi.patch.1
deleted file mode 100644
index 6dd3c55..000
--- a/external/libxmlsec/xmlsec1-1.2.14-ansi.patch.1
+++ /dev/null
@@ -1,27 +0,0 @@
-From cbe91fb9ff4d17dc4d7d1ea075718374b0c9591c Mon Sep 17 00:00:00 2001
-From: Miklos Vajna 
-Date: Fri, 4 Mar 2016 16:15:25 +0100
-Subject: [PATCH 11/14] xmlsec1-1.2.14-ansi.patch
-

- configure.in | 4 
- 1 file changed, 4 deletions(-)
-
-diff --git a/configure.in b/configure.in
-index 0721cfa..cf196e2 100644
 a/configure.in
-+++ b/configure.in
-@@ -47,10 +47,6 @@ AC_PATH_PROG(TAR, tar, /bin/tar)
- AC_PATH_PROG(HELP2MAN, help2man)
- AC_PATH_PROG(MAN2HTML, man2html)
- 
--dnl Make sure we have an ANSI compiler
--AM_C_PROTOTYPES
--test "z$U" != "z" && AC_MSG_ERROR(Compiler not ANSI compliant)
--
- dnl Checks for header files.
- AC_HEADER_DIRENT
- AC_HEADER_STDC
--- 
-2.6.2
-
diff --git a/external/libxmlsec/xmlsec1-1.2.14_fix_extern_c.patch.1 
b/external/libxmlsec/xmlsec1-1.2.14_fix_extern_c.patch.1
index bc23158..8266d8d 100644
--- a/external/libxmlsec/xmlsec1-1.2.14_fix_extern_c.patch.1
+++ b/external/libxmlsec/xmlsec1-1.2.14_fix_extern_c.patch.1
@@ -1,7 +1,7 @@
-From c0ee9f2e99da3d6900427b4a1ac58e9d48e5f746 Mon Sep 17 00:00:00 2001
+From 88dbb430ab261c153c51094dc183dd8876f9ba50 Mon Sep 17 00:00:00 2001
 From: Miklos Vajna 
 Date: Fri, 4 Mar 2016 16:12:48 +0100
-Subject: [PATCH 09/14] xmlsec1-1.2.14_fix_extern_c.patch
+Subject: [PATCH] xmlsec1-1.2.14_fix_extern_c.patch
 
 Conflicts:
include/xmlsec/xmlsec.h
diff --git a/external/libxmlsec/xmlsec1-android.patch.1 
b/external/libxmlsec/xmlsec1-android.patch.1
deleted file mode 100644
index

[Libreoffice-commits] core.git: download.lst external/libxmlsec

2016-03-25 Thread Miklos Vajna 
 download.lst|2 
 external/libxmlsec/UnpackedTarball_xmlsec.mk|1 
 external/libxmlsec/xmlsec1-1.2.14-ansi.patch.1  |2 
 external/libxmlsec/xmlsec1-android.patch.1  |4 
 external/libxmlsec/xmlsec1-configure-libxml-libxslt.patch.1 |   34 -
 external/libxmlsec/xmlsec1-configure.patch.1|   22 
 external/libxmlsec/xmlsec1-customkeymanage.patch.1  |   22 
 external/libxmlsec/xmlsec1-mingw-keymgr-mscrypto.patch.1|   12 
 external/libxmlsec/xmlsec1-ooxml.patch.1|   12 
 external/libxmlsec/xmlsec1-update-config.guess.patch.1  |  397 
 10 files changed, 195 insertions(+), 313 deletions(-)

New commits:
commit 7e7a156b4b1b1a22a077968810db9f9958130339
Author: Miklos Vajna 
Date:   Thu Mar 24 18:57:46 2016 +0100

Upgrade libxmlsec to 1.2.17

So we can drop xmlsec1-configure-libxml-libxslt.patch.1, as upstream
commit be72c468dfd3165105ed5cdc949493332c4d3064 (fixed configure issue
with emapty --with-libxml/libxsl and config scripts in /bin directory,
2010-07-19) fixes the same problem.

Change-Id: Ibb01fb2c5e4074d39168df487180fa88c7bb8035
Reviewed-on: https://gerrit.libreoffice.org/23498
Tested-by: Jenkins 
Reviewed-by: Miklos Vajna 

diff --git a/download.lst b/download.lst
index 7a932bb..7ba8351 100644
--- a/download.lst
+++ b/download.lst
@@ -91,7 +91,7 @@ export LIBEXTTEXTCAT_TARBALL := 
10d61fbaa6a06348823651b1bd7940fe-libexttextcat-3
 export LIBGLTF_MD5SUM := d63a9f47ab048f5009d90693d6aa6424
 export LIBGLTF_TARBALL := libgltf-0.0.2.tar.bz2
 export LIBLANGTAG_TARBALL := 
aa899eff126216dafe721149fbdb511b-liblangtag-0.5.8.tar.bz2
-export LIBXMLSEC_TARBALL := 
17e8eb9a4ec4139b7689d139be4da133-xmlsec1-1.2.16.tar.gz
+export LIBXMLSEC_TARBALL := 
d37daeccb841e5a457b9476d613a6012-xmlsec1-1.2.17.tar.gz
 export LIBXML_TARBALL := daece17e045f1c107610e137ab50c179-libxml2-2.9.3.tar.gz
 export LIBXSLT_TARBALL := 
9667bf6f9310b957254fdcf6596600b7-libxslt-1.1.28.tar.gz
 export LPSOLVE_TARBALL := 26b3e95ddf3d9c077c480ea45874b3b8-lp_solve_5.5.tar.gz
diff --git a/external/libxmlsec/UnpackedTarball_xmlsec.mk 
b/external/libxmlsec/UnpackedTarball_xmlsec.mk
index 79b019c..fd2fbb7 100644
--- a/external/libxmlsec/UnpackedTarball_xmlsec.mk
+++ b/external/libxmlsec/UnpackedTarball_xmlsec.mk
@@ -9,7 +9,6 @@
 
 xmlsec_patches :=
 xmlsec_patches += xmlsec1-configure.patch.1
-xmlsec_patches += xmlsec1-configure-libxml-libxslt.patch.1
 xmlsec_patches += xmlsec1-oldlibtool.patch.1
 xmlsec_patches += xmlsec1-nssdisablecallbacks.patch.1
 xmlsec_patches += xmlsec1-nssmangleciphers.patch.1
diff --git a/external/libxmlsec/xmlsec1-1.2.14-ansi.patch.1 
b/external/libxmlsec/xmlsec1-1.2.14-ansi.patch.1
index 3b23758..6dd3c55 100644
--- a/external/libxmlsec/xmlsec1-1.2.14-ansi.patch.1
+++ b/external/libxmlsec/xmlsec1-1.2.14-ansi.patch.1
@@ -11,7 +11,7 @@ diff --git a/configure.in b/configure.in
 index 0721cfa..cf196e2 100644
 --- a/configure.in
 +++ b/configure.in
-@@ -46,10 +46,6 @@ AC_PATH_PROG(TAR, tar, /bin/tar)
+@@ -47,10 +47,6 @@ AC_PATH_PROG(TAR, tar, /bin/tar)
  AC_PATH_PROG(HELP2MAN, help2man)
  AC_PATH_PROG(MAN2HTML, man2html)
  
diff --git a/external/libxmlsec/xmlsec1-android.patch.1 
b/external/libxmlsec/xmlsec1-android.patch.1
index a2ae090..0212f02 100644
--- a/external/libxmlsec/xmlsec1-android.patch.1
+++ b/external/libxmlsec/xmlsec1-android.patch.1
@@ -11,7 +11,7 @@ diff --git a/config.sub b/config.sub
 index eb0389a..f0c82d4 100755
 --- a/config.sub
 +++ b/config.sub
-@@ -120,7 +120,7 @@ esac
+@@ -124,7 +124,7 @@ esac
  # Here we must recognize all the valid KERNEL-OS combinations.
  maybe_os=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\2/'`
  case $maybe_os in
@@ -20,7 +20,7 @@ index eb0389a..f0c82d4 100755
uclinux-uclibc* | uclinux-gnu* | kfreebsd*-gnu* | knetbsd*-gnu* | 
netbsd*-gnu* | \
kopensolaris*-gnu* | \
storm-chaos* | os2-emx* | rtmk-nova*)
-@@ -1282,7 +1282,7 @@ case $os in
+@@ -1301,7 +1301,7 @@ case $os in
  | -udi* | -eabi* | -lites* | -ieee* | -go32* | -aux* \
  | -chorusos* | -chorusrdb* | -cegcc* \
  | -cygwin* | -pe* | -psos* | -moss* | -proelf* | -rtems* \
diff --git a/external/libxmlsec/xmlsec1-configure-libxml-libxslt.patch.1 
b/external/libxmlsec/xmlsec1-configure-libxml-libxslt.patch.1
deleted file mode 100644
index cb7d4bd..000
--- a/external/libxmlsec/xmlsec1-configure-libxml-libxslt.patch.1
+++ /dev/null
@@ -1,34 +0,0 @@
-From 40dfb0d39abb949b9fc3f9919e8d0d92b0c0baa0 Mon Sep 17 00:00:00 2001
-From: Miklos Vajna 
-Date: Fri, 4 Mar 2016 16:06:58 +0100
-Subject: [PATCH 02/14] xmlsec1-configure-libxml-libxslt.patch
-

- configure.in | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/configure.in b/configure.in
-index

[Libreoffice-commits] core.git: download.lst external/libxmlsec

2016-03-19 Thread Miklos Vajna 
 download.lst|2 
 external/libxmlsec/xmlsec1-1.2.14-ansi.patch.1  |4 
 external/libxmlsec/xmlsec1-1.2.14_fix_extern_c.patch.1  |4 
 external/libxmlsec/xmlsec1-android.patch.1  |6 
 external/libxmlsec/xmlsec1-configure-libxml-libxslt.patch.1 |4 
 external/libxmlsec/xmlsec1-configure.patch.1|   60 +-
 external/libxmlsec/xmlsec1-customkeymanage.patch.1  |   26 -
 external/libxmlsec/xmlsec1-mingw-keymgr-mscrypto.patch.1|   30 -
 external/libxmlsec/xmlsec1-noverify.patch.1 |6 
 external/libxmlsec/xmlsec1-nssdisablecallbacks.patch.1  |2 
 external/libxmlsec/xmlsec1-nssmangleciphers.patch.1 |2 
 external/libxmlsec/xmlsec1-oldlibtool.patch.1   |2 
 external/libxmlsec/xmlsec1-ooxml.patch.1|2 
 external/libxmlsec/xmlsec1-update-config.guess.patch.1  |  253 +++-
 external/libxmlsec/xmlsec1-vc.patch.1   |   10 
 15 files changed, 155 insertions(+), 258 deletions(-)

New commits:
commit 19a98755b9a9d90091c413cfa5f285ea4a06097e
Author: Miklos Vajna 
Date:   Thu Mar 17 21:03:47 2016 +0100

Upgrade libxmlsec to 1.2.16

No instant drop of any of our patches this time, but a considerable
amount of xmlsec1-customkeymanage.patch.1 is now redundant, as part of
the key wrapper code is available in this upstream release for both
mscrypto and nss.

But that can be cleaned up in a separate follow-up commit.

Change-Id: I197eaffe3a52f2f9c02af982872185e017965006
Reviewed-on: https://gerrit.libreoffice.org/23344
Tested-by: Jenkins 
Reviewed-by: Miklos Vajna 

diff --git a/download.lst b/download.lst
index 957451f..7a932bb 100644
--- a/download.lst
+++ b/download.lst
@@ -91,7 +91,7 @@ export LIBEXTTEXTCAT_TARBALL := 
10d61fbaa6a06348823651b1bd7940fe-libexttextcat-3
 export LIBGLTF_MD5SUM := d63a9f47ab048f5009d90693d6aa6424
 export LIBGLTF_TARBALL := libgltf-0.0.2.tar.bz2
 export LIBLANGTAG_TARBALL := 
aa899eff126216dafe721149fbdb511b-liblangtag-0.5.8.tar.bz2
-export LIBXMLSEC_TARBALL := 
43bc8011a33ef9fba862eca4573034c4-xmlsec1-1.2.15.tar.gz
+export LIBXMLSEC_TARBALL := 
17e8eb9a4ec4139b7689d139be4da133-xmlsec1-1.2.16.tar.gz
 export LIBXML_TARBALL := daece17e045f1c107610e137ab50c179-libxml2-2.9.3.tar.gz
 export LIBXSLT_TARBALL := 
9667bf6f9310b957254fdcf6596600b7-libxslt-1.1.28.tar.gz
 export LPSOLVE_TARBALL := 26b3e95ddf3d9c077c480ea45874b3b8-lp_solve_5.5.tar.gz
diff --git a/external/libxmlsec/xmlsec1-1.2.14-ansi.patch.1 
b/external/libxmlsec/xmlsec1-1.2.14-ansi.patch.1
index a004295..3b23758 100644
--- a/external/libxmlsec/xmlsec1-1.2.14-ansi.patch.1
+++ b/external/libxmlsec/xmlsec1-1.2.14-ansi.patch.1
@@ -1,4 +1,4 @@
-From 7aaf2be1bb36db78450ea7f06dd571d98f57c06f Mon Sep 17 00:00:00 2001
+From cbe91fb9ff4d17dc4d7d1ea075718374b0c9591c Mon Sep 17 00:00:00 2001
 From: Miklos Vajna 
 Date: Fri, 4 Mar 2016 16:15:25 +0100
 Subject: [PATCH 11/14] xmlsec1-1.2.14-ansi.patch
@@ -8,7 +8,7 @@ Subject: [PATCH 11/14] xmlsec1-1.2.14-ansi.patch
  1 file changed, 4 deletions(-)
 
 diff --git a/configure.in b/configure.in
-index cbf6e4a..403ec63 100644
+index 0721cfa..cf196e2 100644
 --- a/configure.in
 +++ b/configure.in
 @@ -46,10 +46,6 @@ AC_PATH_PROG(TAR, tar, /bin/tar)
diff --git a/external/libxmlsec/xmlsec1-1.2.14_fix_extern_c.patch.1 
b/external/libxmlsec/xmlsec1-1.2.14_fix_extern_c.patch.1
index 120462f..bc23158 100644
--- a/external/libxmlsec/xmlsec1-1.2.14_fix_extern_c.patch.1
+++ b/external/libxmlsec/xmlsec1-1.2.14_fix_extern_c.patch.1
@@ -1,4 +1,4 @@
-From 4acfcb9acf87b4e6e6ee4d68875255b198b0fa0c Mon Sep 17 00:00:00 2001
+From c0ee9f2e99da3d6900427b4a1ac58e9d48e5f746 Mon Sep 17 00:00:00 2001
 From: Miklos Vajna 
 Date: Fri, 4 Mar 2016 16:12:48 +0100
 Subject: [PATCH 09/14] xmlsec1-1.2.14_fix_extern_c.patch
@@ -10,7 +10,7 @@ Conflicts:
  1 file changed, 4 insertions(+), 4 deletions(-)
 
 diff --git a/include/xmlsec/xmlsec.h b/include/xmlsec/xmlsec.h
-index 9ab4cea..a6c09f2 100644
+index ad44918..b72aa62 100644
 --- a/include/xmlsec/xmlsec.h
 +++ b/include/xmlsec/xmlsec.h
 @@ -11,16 +11,16 @@
diff --git a/external/libxmlsec/xmlsec1-android.patch.1 
b/external/libxmlsec/xmlsec1-android.patch.1
index d2dc1b4..a2ae090 100644
--- a/external/libxmlsec/xmlsec1-android.patch.1
+++ b/external/libxmlsec/xmlsec1-android.patch.1
@@ -1,4 +1,4 @@
-From f78fe748f06042492147e4ca57621acd3da2c605 Mon Sep 17 00:00:00 2001
+From 69969d29e78b5443dd013ee977bdd5481f561369 Mon Sep 17 00:00:00 2001
 From: Miklos Vajna 
 Date: Fri, 4 Mar 2016 16:13:10 +0100
 Subject: [PATCH 10/14] xmlsec1-android.patch
@@ -8,7 +8,7 @@ Subject: [PATCH 10/14] xmlsec1-android.patch
  1 file changed, 2 insertions(+), 2 deletions(-)
 
 diff --git

[Libreoffice-commits] core.git: download.lst external/libxmlsec

2016-03-10 Thread Miklos Vajna 
 download.lst|2 
 external/libxmlsec/UnpackedTarball_xmlsec.mk|   25 
 external/libxmlsec/xmlsec1-1.2.14-ansi.patch|   13 
 external/libxmlsec/xmlsec1-1.2.14-ansi.patch.1  |   27 
 external/libxmlsec/xmlsec1-1.2.14_fix_extern_c.patch|   23 
 external/libxmlsec/xmlsec1-1.2.14_fix_extern_c.patch.1  |   39 
 external/libxmlsec/xmlsec1-android.patch|   20 
 external/libxmlsec/xmlsec1-android.patch.1  |   34 
 external/libxmlsec/xmlsec1-configure-libxml-libxslt.patch   |   20 
 external/libxmlsec/xmlsec1-configure-libxml-libxslt.patch.1 |   34 
 external/libxmlsec/xmlsec1-configure.patch  |  171 
 external/libxmlsec/xmlsec1-configure.patch.1|  196 +
 external/libxmlsec/xmlsec1-customkeymanage.patch.1  | 2108 +---
 external/libxmlsec/xmlsec1-mingw-keymgr-mscrypto.patch  |   62 
 external/libxmlsec/xmlsec1-mingw-keymgr-mscrypto.patch.1|   81 
 external/libxmlsec/xmlsec1-mscrypto-sha256.patch.1  |  388 --
 external/libxmlsec/xmlsec1-noverify.patch   |   59 
 external/libxmlsec/xmlsec1-noverify.patch.1 |   78 
 external/libxmlsec/xmlsec1-nss-sha256.patch.1   |  237 -
 external/libxmlsec/xmlsec1-nssdisablecallbacks.patch|   36 
 external/libxmlsec/xmlsec1-nssdisablecallbacks.patch.1  |   52 
 external/libxmlsec/xmlsec1-nssmangleciphers.patch   | 1134 --
 external/libxmlsec/xmlsec1-nssmangleciphers.patch.1 | 1145 ++
 external/libxmlsec/xmlsec1-oldlibtool.patch |  145 
 external/libxmlsec/xmlsec1-oldlibtool.patch.1   |  161 
 external/libxmlsec/xmlsec1-ooxml.patch.1|   42 
 external/libxmlsec/xmlsec1-update-config.guess.patch.1  |6 
 external/libxmlsec/xmlsec1-vc.patch |   64 
 external/libxmlsec/xmlsec1-vc.patch.1   |   82 
 29 files changed, 3012 insertions(+), 3472 deletions(-)

New commits:
commit 70c8d27892f811121a891ebd4742c97d19632f93
Author: Miklos Vajna 
Date:   Wed Mar 9 18:19:29 2016 +0100

Upgrade libxmlsec to 1.2.15

The primary benefit is that this release supports sha256 out of the box,
so we can drop xmlsec1-nss-sha256.patch.1 and
xmlsec1-mscrypto-sha256.patch.1.

Change-Id: I78606c02591ac8ae7e347b0faa510ae2483e3183
Reviewed-on: https://gerrit.libreoffice.org/23096
Tested-by: Jenkins 
Reviewed-by: Caolán McNamara 
Tested-by: Caolán McNamara 

diff --git a/download.lst b/download.lst
index 71a5de4..7072a3a 100644
--- a/download.lst
+++ b/download.lst
@@ -91,7 +91,7 @@ export LIBEXTTEXTCAT_TARBALL := 
10d61fbaa6a06348823651b1bd7940fe-libexttextcat-3
 export LIBGLTF_MD5SUM := d63a9f47ab048f5009d90693d6aa6424
 export LIBGLTF_TARBALL := libgltf-0.0.2.tar.bz2
 export LIBLANGTAG_TARBALL := 
aa899eff126216dafe721149fbdb511b-liblangtag-0.5.8.tar.bz2
-export LIBXMLSEC_TARBALL := 
1f24ab1d39f4a51faf22244c94a6203f-xmlsec1-1.2.14.tar.gz
+export LIBXMLSEC_TARBALL := 
43bc8011a33ef9fba862eca4573034c4-xmlsec1-1.2.15.tar.gz
 export LIBXML_TARBALL := daece17e045f1c107610e137ab50c179-libxml2-2.9.3.tar.gz
 export LIBXSLT_TARBALL := 
9667bf6f9310b957254fdcf6596600b7-libxslt-1.1.28.tar.gz
 export LPSOLVE_TARBALL := 26b3e95ddf3d9c077c480ea45874b3b8-lp_solve_5.5.tar.gz
diff --git a/external/libxmlsec/UnpackedTarball_xmlsec.mk 
b/external/libxmlsec/UnpackedTarball_xmlsec.mk
index 5915631..79b019c 100644
--- a/external/libxmlsec/UnpackedTarball_xmlsec.mk
+++ b/external/libxmlsec/UnpackedTarball_xmlsec.mk
@@ -8,25 +8,22 @@
 #
 
 xmlsec_patches :=
-xmlsec_patches += xmlsec1-configure.patch
-xmlsec_patches += xmlsec1-configure-libxml-libxslt.patch
-xmlsec_patches += xmlsec1-oldlibtool.patch
-xmlsec_patches += xmlsec1-nssdisablecallbacks.patch
-xmlsec_patches += xmlsec1-nssmangleciphers.patch
-xmlsec_patches += xmlsec1-noverify.patch
-xmlsec_patches += xmlsec1-mingw-keymgr-mscrypto.patch
-xmlsec_patches += xmlsec1-vc.patch
-xmlsec_patches += xmlsec1-1.2.14_fix_extern_c.patch
-xmlsec_patches += xmlsec1-android.patch
+xmlsec_patches += xmlsec1-configure.patch.1
+xmlsec_patches += xmlsec1-configure-libxml-libxslt.patch.1
+xmlsec_patches += xmlsec1-oldlibtool.patch.1
+xmlsec_patches += xmlsec1-nssdisablecallbacks.patch.1
+xmlsec_patches += xmlsec1-nssmangleciphers.patch.1
+xmlsec_patches += xmlsec1-noverify.patch.1
+xmlsec_patches += xmlsec1-mingw-keymgr-mscrypto.patch.1
+xmlsec_patches += xmlsec1-vc.patch.1
+xmlsec_patches += xmlsec1-1.2.14_fix_extern_c.patch.1
+xmlsec_patches += xmlsec1-android.patch.1
 # Partial backport of 
.
-xmlsec_patches += xmlsec1-1.2.14-ansi.patch
+xmlsec_patches += xmlsec1-1.2.14-ansi.patch.1
 xmlsec_patches +=