diff options
| author | V3n3RiX <venerix@redcorelinux.org> | 2018-07-14 21:03:06 +0100 |
|---|---|---|
| committer | V3n3RiX <venerix@redcorelinux.org> | 2018-07-14 21:03:06 +0100 |
| commit | 8376ef56580626e9c0f796d5b85b53a0a1c7d5f5 (patch) | |
| tree | 7681bbd4e8b05407772df40a4bf04cbbc8afc3fa /dev-libs/xml-security-c/files | |
| parent | 30a9caf154332f12ca60756e1b75d2f0e3e1822d (diff) | |
gentoo resync : 14.07.2018
Diffstat (limited to 'dev-libs/xml-security-c/files')
| -rw-r--r-- | dev-libs/xml-security-c/files/xml-security-c-1.6.1-nss-compilation-fix.patch | 13 | ||||
| -rw-r--r-- | dev-libs/xml-security-c/files/xml-security-c-1.7.3-fix-c++14.patch | 36 |
2 files changed, 49 insertions, 0 deletions
diff --git a/dev-libs/xml-security-c/files/xml-security-c-1.6.1-nss-compilation-fix.patch b/dev-libs/xml-security-c/files/xml-security-c-1.6.1-nss-compilation-fix.patch new file mode 100644 index 000000000000..1635d6b80339 --- /dev/null +++ b/dev-libs/xml-security-c/files/xml-security-c-1.6.1-nss-compilation-fix.patch @@ -0,0 +1,13 @@ +diff --git a/xsec/tools/xtest/xtest.cpp b/xsec/tools/xtest/xtest.cpp +index ec40cb2..9cd389e 100644 +--- a/xsec/tools/xtest/xtest.cpp ++++ b/xsec/tools/xtest/xtest.cpp +@@ -2566,7 +2566,7 @@ int main(int argc, char **argv) { + } + #endif + #if defined(XSEC_HAVE_NSS) +- else if (stricmp(argv[paramCount], "--nss") == 0 || stricmp(argv[paramCount], "-n") == 0) { ++ else if (_stricmp(argv[paramCount], "--nss") == 0 || _stricmp(argv[paramCount], "-n") == 0) { + g_useNSS = true; + paramCount++; + } diff --git a/dev-libs/xml-security-c/files/xml-security-c-1.7.3-fix-c++14.patch b/dev-libs/xml-security-c/files/xml-security-c-1.7.3-fix-c++14.patch new file mode 100644 index 000000000000..40783bf21b29 --- /dev/null +++ b/dev-libs/xml-security-c/files/xml-security-c-1.7.3-fix-c++14.patch @@ -0,0 +1,36 @@ +Fix building with C++14, which errors out due to bool -> T* conversions +See also: https://bugs.gentoo.org/show_bug.cgi?id=594234 + +--- a/xsec/enc/OpenSSL/OpenSSLCryptoSymmetricKey.hpp ++++ b/xsec/enc/OpenSSL/OpenSSLCryptoSymmetricKey.hpp +@@ -151,7 +151,7 @@ + SymmetricKeyMode mode = MODE_CBC, + const unsigned char * iv = NULL, + const unsigned char* tag = NULL, +- unsigned int taglen = NULL); ++ unsigned int taglen = 0); + + /** + * \brief Continue an decrypt operation using this key. +--- a/xsec/enc/XSECCryptoSymmetricKey.hpp ++++ b/xsec/enc/XSECCryptoSymmetricKey.hpp +@@ -185,7 +185,7 @@ + SymmetricKeyMode mode = MODE_CBC, + const unsigned char* iv = NULL, + const unsigned char* tag = NULL, +- unsigned int taglen = NULL) = 0; ++ unsigned int taglen = 0) = 0; + + /** + * \brief Continue a decrypt operation using this key. +--- a/xsec/tools/checksig/InteropResolver.cpp ++++ b/xsec/tools/checksig/InteropResolver.cpp +@@ -645,7 +645,7 @@ + + } + +- return false; ++ return NULL; + + } + |