forked from gentoo/gentoo
-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
net-libs/gsoap: compatibility patch for LibreSSL
This patch fixes building with dev-libs/libressl-2.6.4. This patch will not be needed once dev-libs/libressl-2.7.x goes stable. Additionally, fix slot/subslot modifier to ensure rebuilds are trigged for API changes. Closes: https://bugs.gentoo.org/617264 Package-Manager: Portage-2.3.31, Repoman-2.3.9
- Loading branch information
1 parent
ddca072
commit c3de07e
Showing
2 changed files
with
43 additions
and
2 deletions.
There are no files selected for viewing
38 changes: 38 additions & 0 deletions
38
net-libs/gsoap/files/gsoap-2.8.51-libressl-2.6-compatibility.patch
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,38 @@ | ||
--- a/gsoap/plugin/smdevp.c 2018-04-20 15:45:25.112658174 +0000 | ||
+++ b/gsoap/plugin/smdevp.c 2018-04-20 15:47:58.826360980 +0000 | ||
@@ -479,7 +479,7 @@ | ||
/* allocate and init the OpenSSL HMAC or EVP_MD context */ | ||
if ((alg & SOAP_SMD_ALGO) == SOAP_SMD_HMAC) | ||
{ | ||
-#if (OPENSSL_VERSION_NUMBER < 0x10100000L) | ||
+#if (OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER)) | ||
data->ctx = (void*)SOAP_MALLOC(soap, sizeof(HMAC_CTX)); | ||
if (data->ctx) | ||
HMAC_CTX_init((HMAC_CTX*)data->ctx); | ||
@@ -489,7 +489,7 @@ | ||
} | ||
else | ||
{ | ||
-#if (OPENSSL_VERSION_NUMBER < 0x10100000L) | ||
+#if (OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER)) | ||
data->ctx = (void*)SOAP_MALLOC(soap, sizeof(EVP_MD_CTX)); | ||
if (data->ctx) | ||
EVP_MD_CTX_init((EVP_MD_CTX*)data->ctx); | ||
@@ -642,7 +642,7 @@ | ||
*len = (int)n; | ||
} | ||
/* cleanup */ | ||
-#if (OPENSSL_VERSION_NUMBER < 0x10100000L) | ||
+#if (OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER)) | ||
if ((data->alg & SOAP_SMD_ALGO) == SOAP_SMD_HMAC) | ||
HMAC_CTX_cleanup((HMAC_CTX*)data->ctx); | ||
else | ||
@@ -687,7 +687,7 @@ | ||
} | ||
if (data->ctx) | ||
{ | ||
-#if (OPENSSL_VERSION_NUMBER < 0x10100000L) | ||
+#if (OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER)) | ||
if ((data->alg & SOAP_SMD_ALGO) == SOAP_SMD_HMAC) | ||
HMAC_CTX_cleanup((HMAC_CTX*)data->ctx); | ||
else |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters