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

[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 <vmiklos at collabora.co.uk>
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 <vmiklos at collabora.co.uk>
    Tested-by: Jenkins <ci at libreoffice.org>

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 30b9dfb..51c53a7 100644
  !if "$(WITH_DL)" == "1"
  CFLAGS			= $(CFLAGS) /D "XMLSEC_DL_WIN32"
  APP_CFLAGS		= $(APP_CFLAGS) /D "XMLSEC_CRYPTO_DYNAMIC_LOADING"
-@@ -363,7 +367,11 @@ LIBS 			=
+@@ -365,7 +369,11 @@ LIBS 			=
  !if "$(DEBUG)" == "1"
  LDFLAGS 		= $(LDFLAGS) /DEBUG
  !else