diff options
| author | Miklos Vajna <vmiklos@collabora.co.uk> | 2016-07-07 21:37:35 +0200 |
|---|---|---|
| committer | Miklos Vajna <vmiklos@collabora.co.uk> | 2016-07-08 07:01:58 +0000 |
| commit | 9d1f51307d61d0b9a8a8e4847b9e7e5c0177322e (patch) | |
| tree | bd69f58e5559fe2cc5cc5da8ee2698cfcb1684bf /external/libxmlsec/xmlsec1-vc.patch.1 | |
| parent | 9960537e66868413c64014815deb698c3fa74758 (diff) | |
Upgrade libxmlsec to 1.2.21
Obsoletes xmlsec1-ooxml.patch.1 and xmlsec1-vs2015.patch.1.
Adds xmlsec1-keyinfo-revert.patch.1 till the LO side is adapted to the
new xmlsec requirements.
Change-Id: I1a46ad8fd7e9c8b4fa7a97591a1d90922969393d
Reviewed-on: https://gerrit.libreoffice.org/24403
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk>
Diffstat (limited to 'external/libxmlsec/xmlsec1-vc.patch.1')
| -rw-r--r-- | external/libxmlsec/xmlsec1-vc.patch.1 | 24 |
1 files changed, 15 insertions, 9 deletions
diff --git a/external/libxmlsec/xmlsec1-vc.patch.1 b/external/libxmlsec/xmlsec1-vc.patch.1 index 8c249e80c89b..9e40c5de5be2 100644 --- a/external/libxmlsec/xmlsec1-vc.patch.1 +++ b/external/libxmlsec/xmlsec1-vc.patch.1 @@ -1,20 +1,17 @@ -From 56448979392d78a6e1688f61ce7bc771f38a880b Mon Sep 17 00:00:00 2001 +From 8586bb027cde6713a9048472917c75095e186643 Mon Sep 17 00:00:00 2001 From: Miklos Vajna <vmiklos@collabora.co.uk> Date: Fri, 4 Mar 2016 16:12:29 +0100 Subject: [PATCH] xmlsec1-vc.patch --- - apps/cmdline.c | 2 +- - apps/crypto.c | 2 +- - apps/xmlsec.c | 2 +- win32/Makefile.msvc | 10 +++++++++- - 4 files changed, 12 insertions(+), 4 deletions(-) + 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/win32/Makefile.msvc b/win32/Makefile.msvc -index d833497..065595b 100644 +index 30b9dfb..51c53a7 100644 --- a/win32/Makefile.msvc +++ b/win32/Makefile.msvc -@@ -311,6 +311,10 @@ CFLAGS = $(CFLAGS) /D PACKAGE=\"$(XMLSEC_NAME)\" +@@ -309,6 +309,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" @@ -25,7 +22,16 @@ index d833497..065595b 100644 !if "$(UNICODE)" == "1" CFLAGS = $(CFLAGS) /D "UNICODE" /D "_UNICODE" -@@ -365,7 +369,11 @@ LIBS = +@@ -332,7 +332,7 @@ CFLAGS = $(CFLAGS) /DXMLSEC_MSCRYPTO_NT4=1 + !else + !endif + +-APP_CFLAGS = /D "XMLSEC_DEFAULT_CRYPTO=\"$(XMLSEC_DEFAULT_CRYPTO)\"" ++CFLAGS = $(CFLAGS) /D "XMLSEC_DEFAULT_CRYPTO=\"$(XMLSEC_DEFAULT_CRYPTO)\"" + !if "$(WITH_DL)" == "1" + CFLAGS = $(CFLAGS) /D "XMLSEC_DL_WIN32" + APP_CFLAGS = $(APP_CFLAGS) /D "XMLSEC_CRYPTO_DYNAMIC_LOADING" +@@ -363,7 +367,11 @@ LIBS = !if "$(DEBUG)" == "1" LDFLAGS = $(LDFLAGS) /DEBUG !else @@ -39,5 +45,5 @@ index d833497..065595b 100644 SOLIBS = $(LIBS) libxml2.lib -- -2.6.2 +2.6.6 |