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

[Miklos Vajna]

 external/libxmlsec/UnpackedTarball_xmlsec.mk           |    1 
 external/libxmlsec/xmlsec1-nssdisablecallbacks.patch.1 |   52 -----------------
 2 files changed, 53 deletions(-)

New commits:
commit 501d643e09e75fead105307d041779f179f84a67
Author: Miklos Vajna <vmiklos at collabora.co.uk>
Date:   Tue May 30 22:31:55 2017 +0200

    libxmlsec: drop no longer needed xmlsec1-nssdisablecallbacks.patch.1
    
    Before the gbuild conversion in commit
    ec6af4194e80f5f0b2e46ca59802ff397a2a4a24 (convert libxmlsec to gbuild,
    2012-11-29) the makefile.mk had a comment for this patch: "Disable use
    of smime3 so don't need to package it".
    
    Today smime3 is packaged (see external/nss/ExternalPackage_nss.mk), so
    patching xmlsec is no longer needed.
    
    Change-Id: I73ec13ee92a1860f5dc3cbeed0e51d42a0320baa
    Reviewed-on: https://gerrit.libreoffice.org/38239
    Tested-by: Jenkins <ci at libreoffice.org>
    Reviewed-by: Miklos Vajna <vmiklos at collabora.co.uk>

diff --git a/external/libxmlsec/UnpackedTarball_xmlsec.mk b/external/libxmlsec/UnpackedTarball_xmlsec.mk
index f41434c6d76b..e07601c594be 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-nssdisablecallbacks.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-nssdisablecallbacks.patch.1 b/external/libxmlsec/xmlsec1-nssdisablecallbacks.patch.1
deleted file mode 100644
index 3833bd23fb4d..000000000000
--- a/external/libxmlsec/xmlsec1-nssdisablecallbacks.patch.1
+++ /dev/null
@@ -1,52 +0,0 @@
-From 25b4d8494eaf7b2321a931e29af292f336fe0aff Mon Sep 17 00:00:00 2001
-From: Miklos Vajna <vmiklos at collabora.co.uk>
-Date: Fri, 4 Mar 2016 16:09:10 +0100
-Subject: [PATCH] xmlsec1-nssdisablecallbacks.patch
-
-Conflicts:
-	src/nss/crypto.c
----
- src/nss/crypto.c | 20 ++++++++++++++++++++
- 1 file changed, 20 insertions(+)
-
-diff --git a/src/nss/crypto.c b/src/nss/crypto.c
-index a0559c89..ba8f2dd0 100644
---- a/src/nss/crypto.c
-+++ b/src/nss/crypto.c
-@@ -227,6 +227,7 @@ xmlSecCryptoGetFunctions_nss(void) {
-      * High level routines form xmlsec command line utility
-      *
-      ********************************************************************/
-+#if 0
-     gXmlSecNssFunctions->cryptoAppInit                  = xmlSecNssAppInit;
-     gXmlSecNssFunctions->cryptoAppShutdown              = xmlSecNssAppShutdown;
-     gXmlSecNssFunctions->cryptoAppDefaultKeysMngrInit   = xmlSecNssAppDefaultKeysMngrInit;
-@@ -244,6 +245,25 @@ xmlSecCryptoGetFunctions_nss(void) {
-     gXmlSecNssFunctions->cryptoAppKeyLoad               = xmlSecNssAppKeyLoad;
-     gXmlSecNssFunctions->cryptoAppKeyLoadMemory         = xmlSecNssAppKeyLoadMemory;
-     gXmlSecNssFunctions->cryptoAppDefaultPwdCallback    = (void*)xmlSecNssAppGetDefaultPwdCallback();
-+#else
-+    gXmlSecNssFunctions->cryptoAppInit                  = NULL;
-+    gXmlSecNssFunctions->cryptoAppShutdown              = NULL;
-+    gXmlSecNssFunctions->cryptoAppDefaultKeysMngrInit   = NULL;
-+    gXmlSecNssFunctions->cryptoAppDefaultKeysMngrAdoptKey       = NULL;
-+    gXmlSecNssFunctions->cryptoAppDefaultKeysMngrLoad   = NULL;
-+    gXmlSecNssFunctions->cryptoAppDefaultKeysMngrSave   = NULL;
-+#ifndef XMLSEC_NO_X509
-+    gXmlSecNssFunctions->cryptoAppKeysMngrCertLoad      = NULL;
-+    gXmlSecNssFunctions->cryptoAppKeysMngrCertLoadMemory= NULL;
-+    gXmlSecNssFunctions->cryptoAppPkcs12Load            = NULL;
-+    gXmlSecNssFunctions->cryptoAppPkcs12LoadMemory      = NULL;
-+    gXmlSecNssFunctions->cryptoAppKeyCertLoad           = NULL;
-+    gXmlSecNssFunctions->cryptoAppKeyCertLoadMemory     = NULL;
-+#endif /* XMLSEC_NO_X509 */
-+    gXmlSecNssFunctions->cryptoAppKeyLoad               = NULL;
-+    gXmlSecNssFunctions->cryptoAppKeyLoadMemory         = NULL;
-+    gXmlSecNssFunctions->cryptoAppDefaultPwdCallback    = (void*)NULL;
-+#endif
- 
-     return(gXmlSecNssFunctions);
- }
--- 
-2.12.0
-