summaryrefslogtreecommitdiff
path: root/external/libxmlsec/xmlsec1-vc.patch.1
diff options
context:
space:
mode:
authorMiklos Vajna <vmiklos@collabora.co.uk>2016-03-17 21:03:47 +0100
committerMiklos Vajna <vmiklos@collabora.co.uk>2016-03-18 08:06:16 +0000
commit19a98755b9a9d90091c413cfa5f285ea4a06097e (patch)
treeaaeb982496fea2acf18b3ad0975e8dc21f7323aa /external/libxmlsec/xmlsec1-vc.patch.1
parentb27aabc4ea3692a6ffbf28d8da0f75ad51feece9 (diff)
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 <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.110
1 files changed, 5 insertions, 5 deletions
diff --git a/external/libxmlsec/xmlsec1-vc.patch.1 b/external/libxmlsec/xmlsec1-vc.patch.1
index 36e93cae7fec..cf0d46cc9eaa 100644
--- a/external/libxmlsec/xmlsec1-vc.patch.1
+++ b/external/libxmlsec/xmlsec1-vc.patch.1
@@ -1,4 +1,4 @@
-From de1c40ec9621c4100bc4153a947f2e67be0c42e5 Mon Sep 17 00:00:00 2001
+From 3f9ccaa6ac3113c45a6e021e35b2c81cf541fc1b 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 08/14] xmlsec1-vc.patch
@@ -37,7 +37,7 @@ index 49dd127..f46eeee 100644
#endif
diff --git a/apps/xmlsec.c b/apps/xmlsec.c
-index 72d68fa..364ed5e 100644
+index 3aa6ebd..548cdf9 100644
--- a/apps/xmlsec.c
+++ b/apps/xmlsec.c
@@ -9,7 +9,7 @@
@@ -50,10 +50,10 @@ index 72d68fa..364ed5e 100644
#endif
diff --git a/win32/Makefile.msvc b/win32/Makefile.msvc
-index cfa0a46..2f4c3e7 100644
+index 5269202..9309c3a 100644
--- a/win32/Makefile.msvc
+++ b/win32/Makefile.msvc
-@@ -305,6 +305,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"
@@ -64,7 +64,7 @@ index cfa0a46..2f4c3e7 100644
!if "$(UNICODE)" == "1"
CFLAGS = $(CFLAGS) /D "UNICODE" /D "_UNICODE"
-@@ -359,7 +363,11 @@ LIBS =
+@@ -365,7 +369,11 @@ LIBS =
!if "$(DEBUG)" == "1"
LDFLAGS = $(LDFLAGS) /DEBUG
!else