diff options
| author | Miklos Vajna <vmiklos@collabora.co.uk> | 2016-03-02 09:26:22 +0100 |
|---|---|---|
| committer | Miklos Vajna <vmiklos@collabora.co.uk> | 2016-07-07 17:42:12 +0200 |
| commit | 4d9b3fe072e65bbcb8f175fc76496ebb4a9ce8d0 (patch) | |
| tree | db00a0b3b45fa8556c5408c54326602336a11477 /external | |
| parent | b28b989688651332b1d4e9caf56bac3775a07d21 (diff) | |
libxmlsec: start tracking patch upstreaming effort
Change-Id: I45519896d745bcc4162d655746585051d47b732d
(cherry picked from commit 3f9416d703a3d38f4ff59beddc06eb8e1efa52e4)
Diffstat (limited to 'external')
| -rw-r--r-- | external/libxmlsec/UnpackedTarball_xmlsec.mk | 38 |
1 files changed, 22 insertions, 16 deletions
diff --git a/external/libxmlsec/UnpackedTarball_xmlsec.mk b/external/libxmlsec/UnpackedTarball_xmlsec.mk index 8492b7a392b2..a5a3d258fadc 100644 --- a/external/libxmlsec/UnpackedTarball_xmlsec.mk +++ b/external/libxmlsec/UnpackedTarball_xmlsec.mk @@ -7,27 +7,33 @@ # file, You can obtain one at http://mozilla.org/MPL/2.0/. # +xmlsec_patches := +xmlsec_patches += xmlsec1-configure.patch +xmlsec_patches += xmlsec1-configure-libxml-libxslt.patch +xmlsec_patches += xmlsec1-oldlibtool.patch +xmlsec_patches += xmlsec1-nssdisablecallbacks.patch +xmlsec_patches += xmlsec1-nssmangleciphers.patch +xmlsec_patches += xmlsec1-noverify.patch +xmlsec_patches += xmlsec1-mingw-keymgr-mscrypto.patch +xmlsec_patches += xmlsec1-vc.patch +xmlsec_patches += xmlsec1-1.2.14_fix_extern_c.patch +xmlsec_patches += xmlsec1-android.patch +# Partial backport of <https://github.com/lsh123/xmlsec/commit/6a4968bc33f83aaf61efc0a80333350ce9c372f5>. +xmlsec_patches += xmlsec1-1.2.14-ansi.patch +xmlsec_patches += xmlsec1-customkeymanage.patch +xmlsec_patches += xmlsec1-update-config.guess.patch.1 +# Upstreamed as <https://github.com/lsh123/xmlsec/commit/7069e2b0ab49679008abedd6d223fb95538b0684>. +xmlsec_patches += xmlsec1-ooxml.patch.1 +# Partial backport of <https://github.com/lsh123/xmlsec/commit/a17e8da3a8f56348d71d325aa8d3e6366f13b512>. +xmlsec_patches += xmlsec1-nss-sha256.patch.1 +xmlsec_patches += xmlsec1-mscrypto-sha256.patch.1 + $(eval $(call gb_UnpackedTarball_UnpackedTarball,xmlsec)) $(eval $(call gb_UnpackedTarball_set_tarball,xmlsec,$(LIBXMLSEC_TARBALL),,libxmlsec)) $(eval $(call gb_UnpackedTarball_add_patches,xmlsec,\ - external/libxmlsec/xmlsec1-configure.patch \ - external/libxmlsec/xmlsec1-configure-libxml-libxslt.patch \ - external/libxmlsec/xmlsec1-oldlibtool.patch \ - external/libxmlsec/xmlsec1-nssdisablecallbacks.patch \ - external/libxmlsec/xmlsec1-nssmangleciphers.patch \ - external/libxmlsec/xmlsec1-noverify.patch \ - external/libxmlsec/xmlsec1-mingw-keymgr-mscrypto.patch \ - external/libxmlsec/xmlsec1-vc.patch \ - external/libxmlsec/xmlsec1-1.2.14_fix_extern_c.patch \ - external/libxmlsec/xmlsec1-android.patch \ - external/libxmlsec/xmlsec1-1.2.14-ansi.patch \ - external/libxmlsec/xmlsec1-customkeymanage.patch \ - external/libxmlsec/xmlsec1-update-config.guess.patch.1 \ - external/libxmlsec/xmlsec1-ooxml.patch.1 \ - external/libxmlsec/xmlsec1-nss-sha256.patch.1 \ - external/libxmlsec/xmlsec1-mscrypto-sha256.patch.1 \ + $(foreach patch,$(xmlsec_patches),external/libxmlsec/$(patch)) \ )) $(eval $(call gb_UnpackedTarball_add_file,xmlsec,include/xmlsec/mscrypto/akmngr.h,external/libxmlsec/include/akmngr_mscrypto.h)) |