diff options
| author | V3n3RiX <venerix@redcorelinux.org> | 2018-07-14 20:57:42 +0100 |
|---|---|---|
| committer | V3n3RiX <venerix@redcorelinux.org> | 2018-07-14 20:57:42 +0100 |
| commit | 1798c4aeca70ac8d0a243684d6a798fbc65735f8 (patch) | |
| tree | e48e19cb6fa03de18e1c63e1a93371b7ebc4eb56 /dev-libs/xml-security-c/files | |
| parent | d87262dd706fec50cd150aab3e93883b6337466d (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, 0 insertions, 49 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 deleted file mode 100644 index 1635d6b80339..000000000000 --- a/dev-libs/xml-security-c/files/xml-security-c-1.6.1-nss-compilation-fix.patch +++ /dev/null @@ -1,13 +0,0 @@ -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 deleted file mode 100644 index 40783bf21b29..000000000000 --- a/dev-libs/xml-security-c/files/xml-security-c-1.7.3-fix-c++14.patch +++ /dev/null @@ -1,36 +0,0 @@ -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; - - } - |