[Libreoffice-commits] core.git: download.lst external/xmlsec
Miklos Vajna
vmiklos at collabora.co.uk
Wed Sep 20 15:04:50 UTC 2017
download.lst | 4
external/xmlsec/UnpackedTarball_xmlsec.mk | 2
external/xmlsec/xmlsec1-1.2.14_fix_extern_c.patch.1 | 6
external/xmlsec/xmlsec1-configure.patch.1 | 59 ++------
external/xmlsec/xmlsec1-customkeymanage.patch.1 | 70 +++++-----
external/xmlsec/xmlsec1-mscrypto-fix-signing-regression.patch.1 | 46 ------
external/xmlsec/xmlsec1-vc.patch.1 | 12 -
7 files changed, 60 insertions(+), 139 deletions(-)
New commits:
commit 321c2d4426bf9f856e780c3ad089286d92265047
Author: Miklos Vajna <vmiklos at collabora.co.uk>
Date: Wed Sep 20 17:02:51 2017 +0200
Upgrade libxmlsec to 1.2.25
Part of the configure is upstreamed, drop those 3 hunks.
Change-Id: I5f2ad217aaba050969cb655091f33fe61970a512
diff --git a/download.lst b/download.lst
index cfded142c696..cffec5f2dc84 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 XMLSEC_SHA256SUM := 99a8643f118bb1261a72162f83e2deba0f4f690893b4b90e1be4f708e8d481cc
-export XMLSEC_TARBALL := xmlsec1-1.2.24.tar.gz
+export XMLSEC_SHA256SUM := 967ca83edf25ccb5b48a3c4a09ad3405a63365576503bf34290a42de1b92fcd2
+export XMLSEC_TARBALL := xmlsec1-1.2.25.tar.gz
export LIBXML_SHA256SUM := 4031c1ecee9ce7ba4f313e91ef6284164885cdb69937a123f6a83bb6a72dcd38
export LIBXML_TARBALL := libxml2-2.9.5.tar.gz
export LIBXSLT_SHA256SUM := ba65236116de8326d83378b2bd929879fa185195bc530b9d1aba72107910b6b3
diff --git a/external/xmlsec/UnpackedTarball_xmlsec.mk b/external/xmlsec/UnpackedTarball_xmlsec.mk
index 0ee75129856f..808803d38a8f 100644
--- a/external/xmlsec/UnpackedTarball_xmlsec.mk
+++ b/external/xmlsec/UnpackedTarball_xmlsec.mk
@@ -12,8 +12,6 @@ xmlsec_patches += xmlsec1-configure.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 <https://github.com/lsh123/xmlsec/pull/112>.
-xmlsec_patches += xmlsec1-mscrypto-fix-signing-regression.patch.1
$(eval $(call gb_UnpackedTarball_UnpackedTarball,xmlsec))
diff --git a/external/xmlsec/xmlsec1-1.2.14_fix_extern_c.patch.1 b/external/xmlsec/xmlsec1-1.2.14_fix_extern_c.patch.1
index 9ff5e52872a9..1388dd687a91 100644
--- a/external/xmlsec/xmlsec1-1.2.14_fix_extern_c.patch.1
+++ b/external/xmlsec/xmlsec1-1.2.14_fix_extern_c.patch.1
@@ -1,4 +1,4 @@
-From 057ee59c4e63b9afe0e95c626312ac530feadbeb Mon Sep 17 00:00:00 2001
+From d1c1da86faff8210235255b485e12cf160c6ed6f Mon Sep 17 00:00:00 2001
From: Miklos Vajna <vmiklos at collabora.co.uk>
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 69d765f2..11b9975c 100644
+index 71523197..4e13ea8d 100644
--- a/include/xmlsec/xmlsec.h
+++ b/include/xmlsec/xmlsec.h
@@ -11,16 +11,16 @@
@@ -35,5 +35,5 @@ index 69d765f2..11b9975c 100644
*
* Basic types to make ports to exotic platforms easier
--
-2.12.0
+2.13.5
diff --git a/external/xmlsec/xmlsec1-configure.patch.1 b/external/xmlsec/xmlsec1-configure.patch.1
index 5d53684a99f9..9be26e6e8d61 100644
--- a/external/xmlsec/xmlsec1-configure.patch.1
+++ b/external/xmlsec/xmlsec1-configure.patch.1
@@ -1,4 +1,4 @@
-From 49f9bed356b307d7700f429851f1509639956b20 Mon Sep 17 00:00:00 2001
+From 633ee29e9b15eb2b9d7dc3adb76dfea50ce31221 Mon Sep 17 00:00:00 2001
From: Miklos Vajna <vmiklos at collabora.co.uk>
Date: Fri, 4 Mar 2016 16:06:19 +0100
Subject: [PATCH] xmlsec1-configure.patch
@@ -9,46 +9,15 @@ Conflicts:
configure.ac
win32/Makefile.msvc
---
- Makefile.am | 4 ++--
- Makefile.in | 4 ++--
- configure.ac | 50 +++++++++++++++++++++++++++++++++++++++-----------
+ configure.ac | 42 +++++++++++++++++++++++++++++++++---------
win32/Makefile.msvc | 2 +-
- 4 files changed, 44 insertions(+), 16 deletions(-)
+ 2 files changed, 34 insertions(+), 10 deletions(-)
diff --git a/configure.ac b/configure.ac
-index c100f92e..6e5c387b 100644
+index 32782002..1c19c223 100644
--- a/configure.ac
+++ b/configure.ac
-@@ -226,8 +226,8 @@ dnl find libxml
- dnl ==========================================================================
- LIBXML_MIN_VERSION="2.7.4"
- LIBXML_CONFIG="xml2-config"
--LIBXML_CFLAGS=""
--LIBXML_LIBS=""
-+LIBXML_CFLAGS="$LIBXML_CFLAGS"
-+LIBXML_LIBS="$LIBXML_LIBS"
- LIBXML_FOUND="no"
- AC_ARG_WITH(libxml,
- [ --with-libxml=[PFX] libxml2 location]
-@@ -236,6 +236,8 @@ AC_ARG_WITH(libxml-src,
- [ --with-libxml-src=[PFX] not installed yet libxml2 location]
- )
-
-+if test "z$LIBXML_CFLAGS" = "z" -o "z$LIBXML_LIBS" = "z"; then
-+
- 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)
-@@ -284,6 +286,8 @@ if test "z$LIBXML_FOUND" = "zno" ; then
- fi
- fi
-
-+fi
-+
- AC_SUBST(LIBXML_CFLAGS)
- AC_SUBST(LIBXML_LIBS)
- AC_SUBST(LIBXML_CONFIG)
-@@ -586,12 +590,26 @@ dnl ==========================================================================
+@@ -570,12 +570,26 @@ dnl ==========================================================================
XMLSEC_NO_NSS="1"
SEAMONKEY_MIN_VERSION="1.0"
MOZILLA_MIN_VERSION="1.4"
@@ -77,7 +46,7 @@ index c100f92e..6e5c387b 100644
NSS_CRYPTO_LIB="$XMLSEC_PACKAGE-nss"
NSS_FOUND="no"
NSPR_PACKAGE=mozilla-nspr
-@@ -618,6 +636,16 @@ elif test "z$with_nss" = "z" -a "z$with_nspr" = "z" -a "z$with_mozilla_ver" = "z
+@@ -602,6 +616,16 @@ elif test "z$with_nss" = "z" -a "z$with_nspr" = "z" -a "z$with_mozilla_ver" = "z
dnl We are going to try all options
dnl
if test "z$NSS_FOUND" = "zno" ; then
@@ -94,7 +63,7 @@ index c100f92e..6e5c387b 100644
PKG_CHECK_MODULES(NSS, seamonkey-nspr >= $NSPR_MIN_VERSION seamonkey-nss >= $SEAMONKEY_MIN_VERSION,
[NSS_FOUND=yes NSPR_PACKAGE=seamonkey-nspr NSS_PACKAGE=seamonkey-nss],
[NSS_FOUND=no])
-@@ -649,8 +677,8 @@ if test "z$NSS_FOUND" = "zno" ; then
+@@ -633,8 +657,8 @@ if test "z$NSS_FOUND" = "zno" ; then
ac_mozilla_name=mozilla-$MOZILLA_MIN_VERSION
fi
@@ -105,7 +74,7 @@ index c100f92e..6e5c387b 100644
AC_MSG_CHECKING(for nspr libraries >= $NSPR_MIN_VERSION)
NSPR_INCLUDES_FOUND="no"
-@@ -671,21 +699,21 @@ if test "z$NSS_FOUND" = "zno" ; then
+@@ -655,21 +679,21 @@ if test "z$NSS_FOUND" = "zno" ; then
NSPR_PRINIT_H="$with_nspr/include/prinit.h"
else
for dir in $ac_nss_inc_dir ; do
@@ -131,7 +100,7 @@ index c100f92e..6e5c387b 100644
dnl do not add -L/usr/lib because compiler does it anyway
if test "z$dir" = "z/usr/lib" ; then
NSPR_LIBS="$NSPR_LIBS_LIST"
-@@ -756,7 +784,7 @@ if test "z$NSS_FOUND" = "zno" ; then
+@@ -740,7 +764,7 @@ if test "z$NSS_FOUND" = "zno" ; then
done
for dir in $ac_nss_lib_dir ; do
@@ -141,12 +110,12 @@ index c100f92e..6e5c387b 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 c1eea253..8156caa7 100644
+index 5a7e2d13..e34c3e9f 100644
--- a/win32/Makefile.msvc
+++ b/win32/Makefile.msvc
-@@ -393,7 +393,7 @@ APP_LIBS = $(SOLIBS) $(XMLSEC_CRYPTO_SOLIBS)
- XMLSEC_OPENSSL_SOLIBS = libcrypto.lib wsock32.lib kernel32.lib user32.lib gdi32.lib crypt32.lib advapi32.lib ws2_32.lib
- XMLSEC_OPENSSL_ALIBS = libcrypto.lib wsock32.lib kernel32.lib user32.lib gdi32.lib crypt32.lib advapi32.lib ws2_32.lib
+@@ -399,7 +399,7 @@ XMLSEC_OPENSSL_SOLIBS = libeay32.lib wsock32.lib kernel32.lib user32.lib gdi32
+ XMLSEC_OPENSSL_ALIBS = libeay32.lib wsock32.lib kernel32.lib user32.lib gdi32.lib crypt32.lib advapi32.lib
+ !endif
-XMLSEC_NSS_SOLIBS = smime3.lib ssl3.lib nss3.lib libnspr4.lib libplds4.lib libplc4.lib kernel32.lib user32.lib gdi32.lib
+XMLSEC_NSS_SOLIBS = smime3.lib nss3.lib nspr4.lib kernel32.lib user32.lib gdi32.lib
@@ -154,5 +123,5 @@ index c1eea253..8156caa7 100644
XMLSEC_MSCRYPTO_SOLIBS = kernel32.lib user32.lib gdi32.lib Crypt32.lib Advapi32.lib
--
-2.12.0
+2.13.5
diff --git a/external/xmlsec/xmlsec1-customkeymanage.patch.1 b/external/xmlsec/xmlsec1-customkeymanage.patch.1
index d0984cfc06c1..14595da6df16 100644
--- a/external/xmlsec/xmlsec1-customkeymanage.patch.1
+++ b/external/xmlsec/xmlsec1-customkeymanage.patch.1
@@ -1,4 +1,4 @@
-From 082e7399e0396bef9de46ddf8180d253d594a826 Mon Sep 17 00:00:00 2001
+From 57f9146c45b1819afdd79a96a77ea55fb84ddb50 Mon Sep 17 00:00:00 2001
From: Miklos Vajna <vmiklos at collabora.co.uk>
Date: Fri, 4 Mar 2016 16:19:12 +0100
Subject: [PATCH] xmlsec1-customkeymanage.patch
@@ -14,24 +14,24 @@ Conflicts:
src/nss/x509.c
src/nss/x509vfy.c
---
- include/xmlsec/nss/Makefile.am | 3 +
- include/xmlsec/nss/Makefile.in | 3 +
- include/xmlsec/nss/akmngr.h | 56 +++
- include/xmlsec/nss/app.h | 5 +
- include/xmlsec/nss/ciphers.h | 35 ++
- include/xmlsec/nss/keysstore.h | 4 +
- include/xmlsec/nss/tokens.h | 182 +++++++++
- src/nss/Makefile.am | 2 +
- src/nss/Makefile.in | 20 +
- src/nss/akmngr.c | 384 ++++++++++++++++++
- src/nss/hmac.c | 6 +-
- src/nss/keysstore.c | 772 ++++++++++++++++++++++++++----------
- src/nss/pkikeys.c | 81 ++--
- src/nss/symkeys.c | 705 ++++++++++++++++++++++++++++++--
- src/nss/tokens.c | 544 +++++++++++++++++++++++++
- src/nss/x509.c | 491 ++++++-----------------
- src/nss/x509vfy.c | 248 ++++--------
- 22 files changed, 2971 insertions(+), 838 deletions(-)
+ include/xmlsec/nss/Makefile.am | 3 +
+ include/xmlsec/nss/Makefile.in | 3 +
+ include/xmlsec/nss/akmngr.h | 56 +++
+ include/xmlsec/nss/app.h | 5 +
+ include/xmlsec/nss/ciphers.h | 35 ++
+ include/xmlsec/nss/keysstore.h | 4 +
+ include/xmlsec/nss/tokens.h | 182 ++++++++++
+ src/nss/Makefile.am | 2 +
+ src/nss/Makefile.in | 20 ++
+ src/nss/akmngr.c | 384 ++++++++++++++++++++
+ src/nss/hmac.c | 6 +-
+ src/nss/keysstore.c | 772 +++++++++++++++++++++++++++++------------
+ src/nss/pkikeys.c | 81 ++---
+ src/nss/symkeys.c | 705 +++++++++++++++++++++++++++++++++++--
+ src/nss/tokens.c | 544 +++++++++++++++++++++++++++++
+ src/nss/x509.c | 491 ++++++--------------------
+ src/nss/x509vfy.c | 248 +++++--------
+ 17 files changed, 2703 insertions(+), 838 deletions(-)
create mode 100644 include/xmlsec/nss/akmngr.h
create mode 100644 include/xmlsec/nss/ciphers.h
create mode 100644 include/xmlsec/nss/tokens.h
@@ -53,7 +53,7 @@ index e3521622..997ca7fd 100644
install-exec-hook:
diff --git a/include/xmlsec/nss/Makefile.in b/include/xmlsec/nss/Makefile.in
-index ee5c02e3..6d18158c 100644
+index 6fecb4f5..672d10e7 100644
--- a/include/xmlsec/nss/Makefile.in
+++ b/include/xmlsec/nss/Makefile.in
@@ -407,6 +407,9 @@ bignum.h \
@@ -416,7 +416,7 @@ index e666f33c..ec9e7896 100644
libxmlsec1_nss_la_LIBADD = \
diff --git a/src/nss/Makefile.in b/src/nss/Makefile.in
-index 51836f3a..35acec13 100644
+index 2861e3ce..7532d90e 100644
--- a/src/nss/Makefile.in
+++ b/src/nss/Makefile.in
@@ -140,6 +140,8 @@ am_libxmlsec1_nss_la_OBJECTS = libxmlsec1_nss_la-app.lo \
@@ -858,7 +858,7 @@ index 00000000..65b94ac5
+}
+
diff --git a/src/nss/hmac.c b/src/nss/hmac.c
-index f5158da6..7c294240 100644
+index 558d4b93..2ef668c1 100644
--- a/src/nss/hmac.c
+++ b/src/nss/hmac.c
@@ -23,8 +23,8 @@
@@ -871,7 +871,7 @@ index f5158da6..7c294240 100644
/* sizes in bits */
#define XMLSEC_NSS_MIN_HMAC_SIZE 80
-@@ -343,9 +343,9 @@ xmlSecNssHmacSetKey(xmlSecTransformPtr transform, xmlSecKeyPtr key) {
+@@ -355,9 +355,9 @@ xmlSecNssHmacSetKey(xmlSecTransformPtr transform, xmlSecKeyPtr key) {
keyItem.data = xmlSecBufferGetData(buffer);
keyItem.len = xmlSecBufferGetSize(buffer);
@@ -3353,7 +3353,7 @@ index 00000000..40ad9bbe
+}
+
diff --git a/src/nss/x509.c b/src/nss/x509.c
-index ef61d6b3..ae443717 100644
+index 9c6c46f1..c95522d6 100644
--- a/src/nss/x509.c
+++ b/src/nss/x509.c
@@ -61,33 +61,18 @@ static int xmlSecNssX509DataNodeRead (xmlSecKeyDataPt
@@ -3468,7 +3468,7 @@ index ef61d6b3..ae443717 100644
}
+ /* todo: add \n around base64 data - from context */
+ /* todo: add errors check */
-+ xmlNodeSetContent(cur, xmlSecStringCR);
++ xmlNodeSetContent(cur, xmlSecGetDefaultLineFeed());
+ xmlNodeSetContent(cur, buf);
+ xmlFree(buf);
+ }
@@ -3542,7 +3542,7 @@ index ef61d6b3..ae443717 100644
}
+ /* todo: add \n around base64 data - from context */
+ /* todo: add errors check */
-+ xmlNodeSetContent(cur, xmlSecStringCR);
++ xmlNodeSetContent(cur, xmlSecGetDefaultLineFeed());
+ xmlNodeSetContent(cur, buf);
}
@@ -3575,7 +3575,7 @@ index ef61d6b3..ae443717 100644
-
- /* todo: add \n around base64 data - from context */
- /* todo: add errors check */
-- xmlNodeSetContent(cur, xmlSecStringCR);
+- xmlNodeSetContent(cur, xmlSecGetDefaultLineFeed());
- xmlNodeSetContent(cur, buf);
- xmlFree(buf);
- return(0);
@@ -3833,7 +3833,7 @@ index ef61d6b3..ae443717 100644
- }
- /* todo: add \n around base64 data - from context */
- /* todo: add errors check */
-- xmlNodeSetContent(cur, xmlSecStringCR);
+- xmlNodeSetContent(cur, xmlSecGetDefaultLineFeed());
- xmlNodeSetContent(cur, buf);
- xmlFree(buf);
-
@@ -4011,7 +4011,7 @@ index ef61d6b3..ae443717 100644
xmlSecNssX509CertDebugDump(CERTCertificate* cert, FILE* output) {
SECItem *sn;
diff --git a/src/nss/x509vfy.c b/src/nss/x509vfy.c
-index b28a37e1..39574fdd 100644
+index cd328fea..9f2aca41 100644
--- a/src/nss/x509vfy.c
+++ b/src/nss/x509vfy.c
@@ -30,6 +30,7 @@
@@ -4042,7 +4042,7 @@ index b28a37e1..39574fdd 100644
static xmlSecKeyDataStoreKlass xmlSecNssX509StoreKlass = {
sizeof(xmlSecKeyDataStoreKlass),
-@@ -355,7 +345,7 @@ xmlSecNssX509StoreFinalize(xmlSecKeyDataStorePtr store) {
+@@ -359,7 +349,7 @@ xmlSecNssX509StoreFinalize(xmlSecKeyDataStorePtr store) {
*****************************************************************************/
static CERTName *
xmlSecNssGetCertName(const xmlChar * name) {
@@ -4051,7 +4051,7 @@ index b28a37e1..39574fdd 100644
xmlChar *p;
CERTName *res;
-@@ -375,24 +365,14 @@ xmlSecNssGetCertName(const xmlChar * name) {
+@@ -379,24 +369,14 @@ xmlSecNssGetCertName(const xmlChar * name) {
memcpy(p, " E=", 13);
}
@@ -4079,7 +4079,7 @@ index b28a37e1..39574fdd 100644
return(res);
}
-@@ -468,15 +448,8 @@ xmlSecNssX509FindCert(CERTCertList* certsList, const xmlChar *subjectName,
+@@ -472,15 +452,8 @@ xmlSecNssX509FindCert(CERTCertList* certsList, const xmlChar *subjectName,
issuerAndSN.derIssuer.data = nameitem->data;
issuerAndSN.derIssuer.len = nameitem->len;
@@ -4097,7 +4097,7 @@ index b28a37e1..39574fdd 100644
xmlSecInternalError("xmlSecNssNumToItem(serialNumber)", NULL);
SECITEM_FreeItem(&issuerAndSN.serialNumber, PR_FALSE);
goto done;
-@@ -547,140 +520,6 @@ done:
+@@ -551,140 +524,6 @@ done:
return(cert);
}
@@ -4238,7 +4238,7 @@ index b28a37e1..39574fdd 100644
/* code lifted from NSS */
static int
xmlSecNssNumToItem(SECItem *it, PRUint64 ui)
-@@ -717,6 +556,77 @@ xmlSecNssNumToItem(SECItem *it, PRUint64 ui)
+@@ -721,6 +560,77 @@ xmlSecNssNumToItem(SECItem *it, PRUint64 ui)
PORT_Memcpy(it->data, bb + (zeros_len - 1), it->len);
return(it->len);
}
@@ -4317,5 +4317,5 @@ index b28a37e1..39574fdd 100644
--
-2.12.0
+2.13.5
diff --git a/external/xmlsec/xmlsec1-mscrypto-fix-signing-regression.patch.1 b/external/xmlsec/xmlsec1-mscrypto-fix-signing-regression.patch.1
deleted file mode 100644
index 27c30ba01048..000000000000
--- a/external/xmlsec/xmlsec1-mscrypto-fix-signing-regression.patch.1
+++ /dev/null
@@ -1,46 +0,0 @@
-From 92d28e2a9110c19e75482942702516505714fc72 Mon Sep 17 00:00:00 2001
-From: lsh123 <aleksey at aleksey.com>
-Date: Sun, 7 May 2017 07:53:46 -0700
-Subject: [PATCH] fix regression
-
----
- src/mscrypto/x509.c | 16 ++++------------
- 1 file changed, 4 insertions(+), 12 deletions(-)
-
-diff --git a/src/mscrypto/x509.c b/src/mscrypto/x509.c
-index 08c9088d..497fa0e9 100644
---- a/src/mscrypto/x509.c
-+++ b/src/mscrypto/x509.c
-@@ -392,12 +392,8 @@ xmlSecMSCryptoKeyDataX509GetCert(xmlSecKeyDataPtr data, xmlSecSize pos) {
- xmlSecAssert2(ctx->hMemStore != 0, NULL);
- xmlSecAssert2(ctx->numCerts > pos, NULL);
-
-- while (pos > 0) {
-- pCert = CertEnumCertificatesInStore(ctx->hMemStore, pCert);
-- if(pCert == NULL) {
-- break;
-- }
-- pos--;
-+ while ((pCert = CertEnumCertificatesInStore(ctx->hMemStore, pCert)) && (pos > 0)) {
-+ pos--;
- }
-
- return(pCert);
-@@ -474,12 +470,8 @@ xmlSecMSCryptoKeyDataX509GetCrl(xmlSecKeyDataPtr data, xmlSecSize pos) {
- xmlSecAssert2(ctx->hMemStore != 0, NULL);
- xmlSecAssert2(ctx->numCrls > pos, NULL);
-
-- while(pos > 0) {
-- pCRL = CertEnumCRLsInStore(ctx->hMemStore, pCRL);
-- if(pCRL == NULL) {
-- break;
-- }
-- pos--;
-+ while ((pCRL = CertEnumCRLsInStore(ctx->hMemStore, pCRL)) && (pos > 0)) {
-+ pos--;
- }
-
- return(pCRL);
---
-2.12.0
-
diff --git a/external/xmlsec/xmlsec1-vc.patch.1 b/external/xmlsec/xmlsec1-vc.patch.1
index f84371abb8eb..81073bcfab63 100644
--- a/external/xmlsec/xmlsec1-vc.patch.1
+++ b/external/xmlsec/xmlsec1-vc.patch.1
@@ -1,4 +1,4 @@
-From 223ae3881bedb8070774271ab4300a447f94f845 Mon Sep 17 00:00:00 2001
+From d5548168e6e25a96e2cad3c68534c57a0a890fca Mon Sep 17 00:00:00 2001
From: Miklos Vajna <vmiklos at collabora.co.uk>
Date: Fri, 4 Mar 2016 16:12:29 +0100
Subject: [PATCH] xmlsec1-vc.patch
@@ -6,14 +6,14 @@ Subject: [PATCH] xmlsec1-vc.patch
Conflicts:
win32/Makefile.msvc
---
- win32/Makefile.msvc | 10 +++++++++-
- 1 file changed, 9 insertions(+), 1 deletion(-)
+ win32/Makefile.msvc | 4 ++++
+ 1 file changed, 4 insertions(+)
diff --git a/win32/Makefile.msvc b/win32/Makefile.msvc
-index 8156caa7..ef1909ce 100644
+index e34c3e9f..aedb0188 100644
--- a/win32/Makefile.msvc
+++ b/win32/Makefile.msvc
-@@ -311,6 +311,10 @@ CFLAGS = $(CFLAGS) /D "HAVE_STDIO_H" /D "HAVE_STDLIB_H"
+@@ -312,6 +312,10 @@ 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"
CFLAGS = $(CFLAGS) /D "XMLSEC_NO_GOST" /D "XMLSEC_NO_GOST2012"
@@ -25,5 +25,5 @@ index 8156caa7..ef1909ce 100644
!if "$(UNICODE)" == "1"
CFLAGS = $(CFLAGS) /D "UNICODE" /D "_UNICODE"
--
-2.12.0
+2.13.5
More information about the Libreoffice-commits
mailing list