From 335a5ae0924b34037b24e56778a5557f005bb150 Mon Sep 17 00:00:00 2001 From: bofh Date: Wed, 25 Jul 2018 01:54:02 +0000 Subject: devel/gsoap: Update version 2.8.66=>2.9.69 Relnotes: https://www.genivia.com/changelog.html --- devel/gsoap/Makefile | 2 +- devel/gsoap/distinfo | 6 +++--- devel/gsoap/files/patch-gsoap_plugin_smdevp.c | 31 +++++++++++++++++---------- devel/gsoap/pkg-plist | 2 ++ 4 files changed, 26 insertions(+), 15 deletions(-) diff --git a/devel/gsoap/Makefile b/devel/gsoap/Makefile index 96fdd273cbf1..fcd0964e83c0 100644 --- a/devel/gsoap/Makefile +++ b/devel/gsoap/Makefile @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= gsoap -PORTVERSION= 2.8.66 +PORTVERSION= 2.8.69 CATEGORIES= devel MASTER_SITES= SF/${PORTNAME}2/gsoap-2.8 DISTNAME= ${PORTNAME}_${PORTVERSION} diff --git a/devel/gsoap/distinfo b/devel/gsoap/distinfo index 0e28b2e58786..a8a3917b9242 100644 --- a/devel/gsoap/distinfo +++ b/devel/gsoap/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1524616877 -SHA256 (gsoap_2.8.66.zip) = ef7a7ebf3963922ebc97424a6b2371b3761581f3fd07ecfdbaf8a36a8df63d59 -SIZE (gsoap_2.8.66.zip) = 33002504 +TIMESTAMP = 1532283428 +SHA256 (gsoap_2.8.69.zip) = df0cc9ab66dce85f1842ca07abebaf9b04ca48a0a39013f90571e8172d4b0c7b +SIZE (gsoap_2.8.69.zip) = 32855072 diff --git a/devel/gsoap/files/patch-gsoap_plugin_smdevp.c b/devel/gsoap/files/patch-gsoap_plugin_smdevp.c index 25196369a403..c58c88217409 100644 --- a/devel/gsoap/files/patch-gsoap_plugin_smdevp.c +++ b/devel/gsoap/files/patch-gsoap_plugin_smdevp.c @@ -1,6 +1,6 @@ ---- gsoap/plugin/smdevp.c.orig 2018-04-08 14:22:44 UTC +--- gsoap/plugin/smdevp.c.orig 2018-07-22 18:18:22 UTC +++ gsoap/plugin/smdevp.c -@@ -479,7 +479,7 @@ soap_smd_init(struct soap *soap, struct soap_smd_data +@@ -480,7 +480,7 @@ soap_smd_init(struct soap *soap, struct soap_smd_data /* allocate and init the OpenSSL HMAC or EVP_MD context */ if ((alg & SOAP_SMD_ALGO) == SOAP_SMD_HMAC) { @@ -9,7 +9,7 @@ data->ctx = (void*)SOAP_MALLOC(soap, sizeof(HMAC_CTX)); if (data->ctx) HMAC_CTX_init((HMAC_CTX*)data->ctx); -@@ -489,7 +489,7 @@ soap_smd_init(struct soap *soap, struct soap_smd_data +@@ -490,7 +490,7 @@ soap_smd_init(struct soap *soap, struct soap_smd_data } else { @@ -18,16 +18,25 @@ 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 @@ soap_smd_final(struct soap *soap, struct soap_smd_data - *len = (int)n; - } - /* cleanup */ +@@ -510,7 +510,7 @@ soap_smd_init(struct soap *soap, struct soap_smd_data + case SOAP_SMD_SHA1: + type = EVP_sha1(); + break; +-#if (OPENSSL_VERSION_NUMBER >= 0x0090800fL) ++#if (OPENSSL_VERSION_NUMBER >= 0x0090800fL || defined(LIBRESSL_VERSION_NUMBER)) + case SOAP_SMD_SHA224: + type = EVP_sha224(); + break; +@@ -662,7 +662,7 @@ soap_smd_cleanup(struct soap *soap, struct soap_smd_da + (void)soap; + 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 -@@ -687,7 +687,7 @@ soap_smd_check(struct soap *soap, struct soap_smd_data + if ((data->alg & SOAP_SMD_ALGO) == SOAP_SMD_HMAC) + HMAC_CTX_cleanup((HMAC_CTX*)data->ctx); + else +@@ -706,7 +706,7 @@ soap_smd_check(struct soap *soap, struct soap_smd_data } if (data->ctx) { diff --git a/devel/gsoap/pkg-plist b/devel/gsoap/pkg-plist index fdbd3268773f..f6e550f63bb9 100644 --- a/devel/gsoap/pkg-plist +++ b/devel/gsoap/pkg-plist @@ -135,7 +135,9 @@ libdata/pkgconfig/gsoapssl.pc %%DATADIR%%/import/wsse11.h %%DATADIR%%/import/wsse2.h %%DATADIR%%/import/wst.h +%%DATADIR%%/import/wst2.h %%DATADIR%%/import/wstx.h +%%DATADIR%%/import/wstx2.h %%DATADIR%%/import/wsu.h %%DATADIR%%/import/xenc.h %%DATADIR%%/import/xenc2.h -- cgit