Date: Sat, 8 Apr 2017 18:37:42 +0000 (UTC) From: Muhammad Moinur Rahman <bofh@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r438059 - in head/devel/gsoap: . files Message-ID: <201704081837.v38IbgCv093820@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: bofh Date: Sat Apr 8 18:37:42 2017 New Revision: 438059 URL: https://svnweb.freebsd.org/changeset/ports/438059 Log: devel/gsoap: Update 2.8.44=>2.8.45 - Fix for building with LibreSSL [1] PR: 218375 [1] Submitted by: grembo [1] Added: head/devel/gsoap/files/patch-gsoap_VisualStudio2005_wsdl2h_wsdl2h_stdsoap2.cpp (contents, props changed) head/devel/gsoap/files/patch-gsoap_plugin_mecevp.c (contents, props changed) head/devel/gsoap/files/patch-gsoap_plugin_smdevp.c (contents, props changed) head/devel/gsoap/files/patch-gsoap_samples_calc__vs2005_calc__vs2005_stdsoap2.cpp (contents, props changed) Modified: head/devel/gsoap/Makefile head/devel/gsoap/distinfo head/devel/gsoap/files/patch-gsoap_stdsoap2.c head/devel/gsoap/files/patch-gsoap_stdsoap2.cpp head/devel/gsoap/files/patch-gsoap_wsdl_Makefile.in Modified: head/devel/gsoap/Makefile ============================================================================== --- head/devel/gsoap/Makefile Sat Apr 8 18:17:45 2017 (r438058) +++ head/devel/gsoap/Makefile Sat Apr 8 18:37:42 2017 (r438059) @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= gsoap -PORTVERSION= 2.8.44 +PORTVERSION= 2.8.45 CATEGORIES= devel MASTER_SITES= SF/${PORTNAME}2/gsoap-2.8 DISTNAME= ${PORTNAME}_${PORTVERSION} Modified: head/devel/gsoap/distinfo ============================================================================== --- head/devel/gsoap/distinfo Sat Apr 8 18:17:45 2017 (r438058) +++ head/devel/gsoap/distinfo Sat Apr 8 18:37:42 2017 (r438059) @@ -1,3 +1,3 @@ -TIMESTAMP = 1488717745 -SHA256 (gsoap_2.8.44.zip) = c61dd4d228e55177b6251bcde6d37c834eeedae434c43ad3af07e38e4b84f94e -SIZE (gsoap_2.8.44.zip) = 36197714 +TIMESTAMP = 1491658793 +SHA256 (gsoap_2.8.45.zip) = 81946d1ecd99ea414383d5f090e6b292908ff3ac0211cb097a1d1d54e9808bce +SIZE (gsoap_2.8.45.zip) = 33590780 Added: head/devel/gsoap/files/patch-gsoap_VisualStudio2005_wsdl2h_wsdl2h_stdsoap2.cpp ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/devel/gsoap/files/patch-gsoap_VisualStudio2005_wsdl2h_wsdl2h_stdsoap2.cpp Sat Apr 8 18:37:42 2017 (r438059) @@ -0,0 +1,47 @@ +--- gsoap/VisualStudio2005/wsdl2h/wsdl2h/stdsoap2.cpp.orig 2017-04-07 18:39:02 UTC ++++ gsoap/VisualStudio2005/wsdl2h/wsdl2h/stdsoap2.cpp +@@ -3735,7 +3735,7 @@ ssl_auth_init(struct soap *soap) + ERR_clear_error(); + if (!soap->ctx) + { +-#if (OPENSSL_VERSION_NUMBER >= 0x10100000L) ++#if (OPENSSL_VERSION_NUMBER >= 0x10100000L && !defined(LIBRESSL_VERSION_NUMBER)) + /* TLS_method: a TLS/SSL connection established may understand the SSLv3, TLSv1, TLSv1.1 and TLSv1.2 protocols. */ + soap->ctx = SSL_CTX_new(TLS_method()); + #else +@@ -3812,7 +3812,7 @@ ssl_auth_init(struct soap *soap) + #endif + if ((soap->ssl_flags & SOAP_SSL_RSA)) + { +-#if (OPENSSL_VERSION_NUMBER >= 0x10100000L) ++#if (OPENSSL_VERSION_NUMBER >= 0x10100000L && !defined(LIBRESSL_VERSION_NUMBER)) + if (SSL_CTX_need_tmp_RSA(soap->ctx)) + #endif + { RSA *rsa = RSA_generate_key(SOAP_SSL_RSA_BITS, RSA_F4, NULL, NULL); +@@ -5501,7 +5501,7 @@ tcp_disconnect(struct soap *soap) + DBGLOG(TEST, SOAP_MESSAGE(fdebug, "Connection lost...\n")); + soap->fclosesocket(soap, soap->socket); + soap->socket = SOAP_INVALID_SOCKET; +-#if (OPENSSL_VERSION_NUMBER >= 0x10100000L) ++#if (OPENSSL_VERSION_NUMBER >= 0x10100000L && !defined(LIBRESSL_VERSION_NUMBER)) + ERR_clear_error(); + #else + ERR_remove_state(0); +@@ -5525,7 +5525,7 @@ tcp_disconnect(struct soap *soap) + } + SSL_free(soap->ssl); + soap->ssl = NULL; +-#if (OPENSSL_VERSION_NUMBER >= 0x10100000L) ++#if (OPENSSL_VERSION_NUMBER >= 0x10100000L && !defined(LIBRESSL_VERSION_NUMBER)) + ERR_clear_error(); + #else + ERR_remove_state(0); +@@ -6146,7 +6146,7 @@ soap_done(struct soap *soap) + soap->ctx = NULL; + } + } +-#if (OPENSSL_VERSION_NUMBER >= 0x10100000L) ++#if (OPENSSL_VERSION_NUMBER >= 0x10100000L && !defined(LIBRESSL_VERSION_NUMBER)) + ERR_clear_error(); + #else + ERR_remove_state(0); Added: head/devel/gsoap/files/patch-gsoap_plugin_mecevp.c ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/devel/gsoap/files/patch-gsoap_plugin_mecevp.c Sat Apr 8 18:37:42 2017 (r438059) @@ -0,0 +1,20 @@ +--- gsoap/plugin/mecevp.c.orig 2017-04-07 18:39:01 UTC ++++ gsoap/plugin/mecevp.c +@@ -284,7 +284,7 @@ soap_mec_init(struct soap *soap, struct + int ok = 1; + DBGLOG(TEST, SOAP_MESSAGE(fdebug, "soap_mec_init()\n")); + soap_ssl_init(); +-#if (OPENSSL_VERSION_NUMBER < 0x10100000L) ++#if (OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER)) + data->ctx = (EVP_CIPHER_CTX*)SOAP_MALLOC(soap, sizeof(EVP_CIPHER_CTX)); + if (data->ctx) + EVP_CIPHER_CTX_init(data->ctx); +@@ -448,7 +448,7 @@ soap_mec_cleanup(struct soap *soap, stru + data->type = NULL; + if (data->ctx) + { +-#if (OPENSSL_VERSION_NUMBER < 0x10100000L) ++#if (OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER)) + EVP_CIPHER_CTX_cleanup(data->ctx); + SOAP_FREE(soap, data->ctx); + #else Added: head/devel/gsoap/files/patch-gsoap_plugin_smdevp.c ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/devel/gsoap/files/patch-gsoap_plugin_smdevp.c Sat Apr 8 18:37:42 2017 (r438059) @@ -0,0 +1,38 @@ +--- gsoap/plugin/smdevp.c.orig 2017-04-07 18:39:01 UTC ++++ gsoap/plugin/smdevp.c +@@ -479,7 +479,7 @@ soap_smd_init(struct soap *soap, struct + /* 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 @@ soap_smd_init(struct soap *soap, struct + } + 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 @@ soap_smd_final(struct soap *soap, struct + *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 @@ soap_smd_check(struct soap *soap, struct + } + 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 Added: head/devel/gsoap/files/patch-gsoap_samples_calc__vs2005_calc__vs2005_stdsoap2.cpp ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/devel/gsoap/files/patch-gsoap_samples_calc__vs2005_calc__vs2005_stdsoap2.cpp Sat Apr 8 18:37:42 2017 (r438059) @@ -0,0 +1,47 @@ +--- gsoap/samples/calc_vs2005/calc_vs2005/stdsoap2.cpp.orig 2017-04-07 18:39:02 UTC ++++ gsoap/samples/calc_vs2005/calc_vs2005/stdsoap2.cpp +@@ -3735,7 +3735,7 @@ ssl_auth_init(struct soap *soap) + ERR_clear_error(); + if (!soap->ctx) + { +-#if (OPENSSL_VERSION_NUMBER >= 0x10100000L) ++#if (OPENSSL_VERSION_NUMBER >= 0x10100000L && !defined(LIBRESSL_VERSION_NUMBER)) + /* TLS_method: a TLS/SSL connection established may understand the SSLv3, TLSv1, TLSv1.1 and TLSv1.2 protocols. */ + soap->ctx = SSL_CTX_new(TLS_method()); + #else +@@ -3812,7 +3812,7 @@ ssl_auth_init(struct soap *soap) + #endif + if ((soap->ssl_flags & SOAP_SSL_RSA)) + { +-#if (OPENSSL_VERSION_NUMBER >= 0x10100000L) ++#if (OPENSSL_VERSION_NUMBER >= 0x10100000L && !defined(LIBRESSL_VERSION_NUMBER)) + if (SSL_CTX_need_tmp_RSA(soap->ctx)) + #endif + { RSA *rsa = RSA_generate_key(SOAP_SSL_RSA_BITS, RSA_F4, NULL, NULL); +@@ -5501,7 +5501,7 @@ tcp_disconnect(struct soap *soap) + DBGLOG(TEST, SOAP_MESSAGE(fdebug, "Connection lost...\n")); + soap->fclosesocket(soap, soap->socket); + soap->socket = SOAP_INVALID_SOCKET; +-#if (OPENSSL_VERSION_NUMBER >= 0x10100000L) ++#if (OPENSSL_VERSION_NUMBER >= 0x10100000L && !defined(LIBRESSL_VERSION_NUMBER)) + ERR_clear_error(); + #else + ERR_remove_state(0); +@@ -5525,7 +5525,7 @@ tcp_disconnect(struct soap *soap) + } + SSL_free(soap->ssl); + soap->ssl = NULL; +-#if (OPENSSL_VERSION_NUMBER >= 0x10100000L) ++#if (OPENSSL_VERSION_NUMBER >= 0x10100000L && !defined(LIBRESSL_VERSION_NUMBER)) + ERR_clear_error(); + #else + ERR_remove_state(0); +@@ -6146,7 +6146,7 @@ soap_done(struct soap *soap) + soap->ctx = NULL; + } + } +-#if (OPENSSL_VERSION_NUMBER >= 0x10100000L) ++#if (OPENSSL_VERSION_NUMBER >= 0x10100000L && !defined(LIBRESSL_VERSION_NUMBER)) + ERR_clear_error(); + #else + ERR_remove_state(0); Modified: head/devel/gsoap/files/patch-gsoap_stdsoap2.c ============================================================================== --- head/devel/gsoap/files/patch-gsoap_stdsoap2.c Sat Apr 8 18:17:45 2017 (r438058) +++ head/devel/gsoap/files/patch-gsoap_stdsoap2.c Sat Apr 8 18:37:42 2017 (r438059) @@ -1,6 +1,42 @@ ---- gsoap/stdsoap2.c.orig 2016-04-03 01:33:31 UTC +--- gsoap/stdsoap2.c.orig 2017-04-07 18:39:02 UTC +++ gsoap/stdsoap2.c -@@ -5396,6 +5396,9 @@ soap_bind(struct soap *soap, const char +@@ -3735,7 +3735,7 @@ ssl_auth_init(struct soap *soap) + ERR_clear_error(); + if (!soap->ctx) + { +-#if (OPENSSL_VERSION_NUMBER >= 0x10100000L) ++#if (OPENSSL_VERSION_NUMBER >= 0x10100000L && !defined(LIBRESSL_VERSION_NUMBER)) + /* TLS_method: a TLS/SSL connection established may understand the SSLv3, TLSv1, TLSv1.1 and TLSv1.2 protocols. */ + soap->ctx = SSL_CTX_new(TLS_method()); + #else +@@ -3812,7 +3812,7 @@ ssl_auth_init(struct soap *soap) + #endif + if ((soap->ssl_flags & SOAP_SSL_RSA)) + { +-#if (OPENSSL_VERSION_NUMBER >= 0x10100000L) ++#if (OPENSSL_VERSION_NUMBER >= 0x10100000L && !defined(LIBRESSL_VERSION_NUMBER)) + if (SSL_CTX_need_tmp_RSA(soap->ctx)) + #endif + { RSA *rsa = RSA_generate_key(SOAP_SSL_RSA_BITS, RSA_F4, NULL, NULL); +@@ -5501,7 +5501,7 @@ tcp_disconnect(struct soap *soap) + DBGLOG(TEST, SOAP_MESSAGE(fdebug, "Connection lost...\n")); + soap->fclosesocket(soap, soap->socket); + soap->socket = SOAP_INVALID_SOCKET; +-#if (OPENSSL_VERSION_NUMBER >= 0x10100000L) ++#if (OPENSSL_VERSION_NUMBER >= 0x10100000L && !defined(LIBRESSL_VERSION_NUMBER)) + ERR_clear_error(); + #else + ERR_remove_state(0); +@@ -5525,7 +5525,7 @@ tcp_disconnect(struct soap *soap) + } + SSL_free(soap->ssl); + soap->ssl = NULL; +-#if (OPENSSL_VERSION_NUMBER >= 0x10100000L) ++#if (OPENSSL_VERSION_NUMBER >= 0x10100000L && !defined(LIBRESSL_VERSION_NUMBER)) + ERR_clear_error(); + #else + ERR_remove_state(0); +@@ -5703,6 +5703,9 @@ soap_bind(struct soap *soap, const char } #endif #ifdef TCP_FASTOPEN @@ -10,3 +46,12 @@ if (!(soap->omode & SOAP_IO_UDP) && setsockopt(soap->master, IPPROTO_TCP, TCP_FASTOPEN, (char*)&set, sizeof(int))) { /* silently ignore */ DBGLOG(TEST, SOAP_MESSAGE(fdebug, "setsockopt TCP_FASTOPEN failed in soap_bind()\n")); +@@ -6146,7 +6149,7 @@ soap_done(struct soap *soap) + soap->ctx = NULL; + } + } +-#if (OPENSSL_VERSION_NUMBER >= 0x10100000L) ++#if (OPENSSL_VERSION_NUMBER >= 0x10100000L && !defined(LIBRESSL_VERSION_NUMBER)) + ERR_clear_error(); + #else + ERR_remove_state(0); Modified: head/devel/gsoap/files/patch-gsoap_stdsoap2.cpp ============================================================================== --- head/devel/gsoap/files/patch-gsoap_stdsoap2.cpp Sat Apr 8 18:17:45 2017 (r438058) +++ head/devel/gsoap/files/patch-gsoap_stdsoap2.cpp Sat Apr 8 18:37:42 2017 (r438059) @@ -1,6 +1,42 @@ ---- gsoap/stdsoap2.cpp.orig 2016-04-03 01:33:31 UTC +--- gsoap/stdsoap2.cpp.orig 2017-04-07 18:39:02 UTC +++ gsoap/stdsoap2.cpp -@@ -5396,6 +5396,9 @@ soap_bind(struct soap *soap, const char +@@ -3735,7 +3735,7 @@ ssl_auth_init(struct soap *soap) + ERR_clear_error(); + if (!soap->ctx) + { +-#if (OPENSSL_VERSION_NUMBER >= 0x10100000L) ++#if (OPENSSL_VERSION_NUMBER >= 0x10100000L && !defined(LIBRESSL_VERSION_NUMBER)) + /* TLS_method: a TLS/SSL connection established may understand the SSLv3, TLSv1, TLSv1.1 and TLSv1.2 protocols. */ + soap->ctx = SSL_CTX_new(TLS_method()); + #else +@@ -3812,7 +3812,7 @@ ssl_auth_init(struct soap *soap) + #endif + if ((soap->ssl_flags & SOAP_SSL_RSA)) + { +-#if (OPENSSL_VERSION_NUMBER >= 0x10100000L) ++#if (OPENSSL_VERSION_NUMBER >= 0x10100000L && !defined(LIBRESSL_VERSION_NUMBER)) + if (SSL_CTX_need_tmp_RSA(soap->ctx)) + #endif + { RSA *rsa = RSA_generate_key(SOAP_SSL_RSA_BITS, RSA_F4, NULL, NULL); +@@ -5501,7 +5501,7 @@ tcp_disconnect(struct soap *soap) + DBGLOG(TEST, SOAP_MESSAGE(fdebug, "Connection lost...\n")); + soap->fclosesocket(soap, soap->socket); + soap->socket = SOAP_INVALID_SOCKET; +-#if (OPENSSL_VERSION_NUMBER >= 0x10100000L) ++#if (OPENSSL_VERSION_NUMBER >= 0x10100000L && !defined(LIBRESSL_VERSION_NUMBER)) + ERR_clear_error(); + #else + ERR_remove_state(0); +@@ -5525,7 +5525,7 @@ tcp_disconnect(struct soap *soap) + } + SSL_free(soap->ssl); + soap->ssl = NULL; +-#if (OPENSSL_VERSION_NUMBER >= 0x10100000L) ++#if (OPENSSL_VERSION_NUMBER >= 0x10100000L && !defined(LIBRESSL_VERSION_NUMBER)) + ERR_clear_error(); + #else + ERR_remove_state(0); +@@ -5703,6 +5703,9 @@ soap_bind(struct soap *soap, const char } #endif #ifdef TCP_FASTOPEN @@ -10,3 +46,12 @@ if (!(soap->omode & SOAP_IO_UDP) && setsockopt(soap->master, IPPROTO_TCP, TCP_FASTOPEN, (char*)&set, sizeof(int))) { /* silently ignore */ DBGLOG(TEST, SOAP_MESSAGE(fdebug, "setsockopt TCP_FASTOPEN failed in soap_bind()\n")); +@@ -6146,7 +6149,7 @@ soap_done(struct soap *soap) + soap->ctx = NULL; + } + } +-#if (OPENSSL_VERSION_NUMBER >= 0x10100000L) ++#if (OPENSSL_VERSION_NUMBER >= 0x10100000L && !defined(LIBRESSL_VERSION_NUMBER)) + ERR_clear_error(); + #else + ERR_remove_state(0); Modified: head/devel/gsoap/files/patch-gsoap_wsdl_Makefile.in ============================================================================== --- head/devel/gsoap/files/patch-gsoap_wsdl_Makefile.in Sat Apr 8 18:17:45 2017 (r438058) +++ head/devel/gsoap/files/patch-gsoap_wsdl_Makefile.in Sat Apr 8 18:37:42 2017 (r438059) @@ -1,4 +1,4 @@ ---- gsoap/wsdl/Makefile.in.orig 2017-02-11 10:40:19 UTC +--- gsoap/wsdl/Makefile.in.orig 2017-04-08 13:59:08 UTC +++ gsoap/wsdl/Makefile.in @@ -314,7 +314,7 @@ SOAP_FLAGS = -SC -pwsdl -I$(srcdir) -I$( BUILT_SOURCES = $(SOAP_CPP_SRC)
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201704081837.v38IbgCv093820>