Date: Wed, 6 Feb 2019 06:59:38 +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: r492287 - in head/devel/gsoap: . files Message-ID: <201902060659.x166xco9051921@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: bofh Date: Wed Feb 6 06:59:38 2019 New Revision: 492287 URL: https://svnweb.freebsd.org/changeset/ports/492287 Log: devel/gsoap: Update version 2.8.74=>2.8.78 - Fixes virtualbox-se build with libressl [1] PR: 235506 [1] Reported by: rozhuk.im@gmail.com [1] Modified: head/devel/gsoap/Makefile head/devel/gsoap/distinfo head/devel/gsoap/files/patch-gsoap_VisualStudio2005_wsdl2h_wsdl2h_stdsoap2.cpp head/devel/gsoap/files/patch-gsoap_plugin_mecevp.c head/devel/gsoap/files/patch-gsoap_samples_calc__vs2005_calc__vs2005_stdsoap2.cpp head/devel/gsoap/files/patch-gsoap_stdsoap2.c head/devel/gsoap/files/patch-gsoap_stdsoap2.cpp head/devel/gsoap/pkg-plist Modified: head/devel/gsoap/Makefile ============================================================================== --- head/devel/gsoap/Makefile Wed Feb 6 05:46:55 2019 (r492286) +++ head/devel/gsoap/Makefile Wed Feb 6 06:59:38 2019 (r492287) @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= gsoap -PORTVERSION= 2.8.74 +PORTVERSION= 2.8.78 CATEGORIES= devel MASTER_SITES= SF/${PORTNAME}2/gsoap-2.8 DISTNAME= ${PORTNAME}_${PORTVERSION} @@ -12,7 +12,7 @@ COMMENT= Generator Tools for Coding SOAP/XML Web Servi LICENSE= GPLv2 -USES= autoreconf pathfix zip +USES= autoreconf pathfix ssl zip CONFIGURE_ENV= LEX=flex YACC=yacc GNU_CONFIGURE= yes Modified: head/devel/gsoap/distinfo ============================================================================== --- head/devel/gsoap/distinfo Wed Feb 6 05:46:55 2019 (r492286) +++ head/devel/gsoap/distinfo Wed Feb 6 06:59:38 2019 (r492287) @@ -1,3 +1,3 @@ -TIMESTAMP = 1546287355 -SHA256 (gsoap_2.8.74.zip) = edb5b620a5017543d79dc9df301456ab105f4448aa126758c9c69b85ca563290 -SIZE (gsoap_2.8.74.zip) = 32304642 +TIMESTAMP = 1549394550 +SHA256 (gsoap_2.8.78.zip) = c4381f12edc0d18c7e674f5a5ef56b2f00cf2713f1097175e4f46740951a2af2 +SIZE (gsoap_2.8.78.zip) = 32507212 Modified: head/devel/gsoap/files/patch-gsoap_VisualStudio2005_wsdl2h_wsdl2h_stdsoap2.cpp ============================================================================== --- head/devel/gsoap/files/patch-gsoap_VisualStudio2005_wsdl2h_wsdl2h_stdsoap2.cpp Wed Feb 6 05:46:55 2019 (r492286) +++ head/devel/gsoap/files/patch-gsoap_VisualStudio2005_wsdl2h_wsdl2h_stdsoap2.cpp Wed Feb 6 06:59:38 2019 (r492287) @@ -1,47 +1,20 @@ ---- gsoap/VisualStudio2005/wsdl2h/wsdl2h/stdsoap2.cpp.orig 2018-04-08 14:22:45 UTC +--- gsoap/VisualStudio2005/wsdl2h/wsdl2h/stdsoap2.cpp.orig 2019-01-27 15:50:05 UTC +++ gsoap/VisualStudio2005/wsdl2h/wsdl2h/stdsoap2.cpp -@@ -4281,7 +4281,7 @@ ssl_auth_init(struct soap *soap) +@@ -4302,7 +4302,7 @@ ssl_auth_init(struct soap *soap) ERR_clear_error(); if (!soap->ctx) { --#if (OPENSSL_VERSION_NUMBER >= 0x10100000L) +-#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 -@@ -4369,7 +4369,7 @@ ssl_auth_init(struct soap *soap) +@@ -4390,7 +4390,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 +#if (OPENSSL_VERSION_NUMBER >= 0x10100000L && !defined(LIBRESSL_VERSION_NUMBER)) if (SSL_CTX_need_tmp_RSA(soap->ctx)) #endif { -@@ -6390,7 +6390,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); -@@ -6416,7 +6416,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); -@@ -7096,7 +7096,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_plugin_mecevp.c ============================================================================== --- head/devel/gsoap/files/patch-gsoap_plugin_mecevp.c Wed Feb 6 05:46:55 2019 (r492286) +++ head/devel/gsoap/files/patch-gsoap_plugin_mecevp.c Wed Feb 6 06:59:38 2019 (r492287) @@ -1,6 +1,6 @@ ---- gsoap/plugin/mecevp.c.orig 2018-04-08 14:22:44 UTC +--- gsoap/plugin/mecevp.c.orig 2019-01-27 15:50:03 UTC +++ gsoap/plugin/mecevp.c -@@ -284,7 +284,7 @@ soap_mec_init(struct soap *soap, struct soap_mec_data +@@ -336,7 +336,7 @@ soap_mec_init(struct soap *soap, struct soap_mec_data int ok = 1; DBGLOG(TEST, SOAP_MESSAGE(fdebug, "soap_mec_init()\n")); soap_ssl_init(); @@ -9,7 +9,7 @@ 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, struct soap_mec_da +@@ -500,7 +500,7 @@ soap_mec_cleanup(struct soap *soap, struct soap_mec_da data->type = NULL; if (data->ctx) { Modified: head/devel/gsoap/files/patch-gsoap_samples_calc__vs2005_calc__vs2005_stdsoap2.cpp ============================================================================== --- head/devel/gsoap/files/patch-gsoap_samples_calc__vs2005_calc__vs2005_stdsoap2.cpp Wed Feb 6 05:46:55 2019 (r492286) +++ head/devel/gsoap/files/patch-gsoap_samples_calc__vs2005_calc__vs2005_stdsoap2.cpp Wed Feb 6 06:59:38 2019 (r492287) @@ -1,47 +1,20 @@ ---- gsoap/samples/calc_vs2005/calc_vs2005/stdsoap2.cpp.orig 2018-04-08 14:22:45 UTC +--- gsoap/samples/calc_vs2005/calc_vs2005/stdsoap2.cpp.orig 2019-01-27 15:50:05 UTC +++ gsoap/samples/calc_vs2005/calc_vs2005/stdsoap2.cpp -@@ -4281,7 +4281,7 @@ ssl_auth_init(struct soap *soap) +@@ -4302,7 +4302,7 @@ ssl_auth_init(struct soap *soap) ERR_clear_error(); if (!soap->ctx) { --#if (OPENSSL_VERSION_NUMBER >= 0x10100000L) +-#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 -@@ -4369,7 +4369,7 @@ ssl_auth_init(struct soap *soap) +@@ -4390,7 +4390,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 +#if (OPENSSL_VERSION_NUMBER >= 0x10100000L && !defined(LIBRESSL_VERSION_NUMBER)) if (SSL_CTX_need_tmp_RSA(soap->ctx)) #endif { -@@ -6390,7 +6390,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); -@@ -6416,7 +6416,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); -@@ -7096,7 +7096,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 Wed Feb 6 05:46:55 2019 (r492286) +++ head/devel/gsoap/files/patch-gsoap_stdsoap2.c Wed Feb 6 06:59:38 2019 (r492287) @@ -1,42 +1,24 @@ ---- gsoap/stdsoap2.c.orig 2018-04-08 14:22:45 UTC +--- gsoap/stdsoap2.c.orig 2019-01-27 15:50:05 UTC +++ gsoap/stdsoap2.c -@@ -4281,7 +4281,7 @@ ssl_auth_init(struct soap *soap) +@@ -4302,7 +4302,7 @@ ssl_auth_init(struct soap *soap) ERR_clear_error(); if (!soap->ctx) { --#if (OPENSSL_VERSION_NUMBER >= 0x10100000L) +-#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 -@@ -4369,7 +4369,7 @@ ssl_auth_init(struct soap *soap) +@@ -4390,7 +4390,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 +#if (OPENSSL_VERSION_NUMBER >= 0x10100000L && !defined(LIBRESSL_VERSION_NUMBER)) if (SSL_CTX_need_tmp_RSA(soap->ctx)) #endif { -@@ -6390,7 +6390,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); -@@ -6416,7 +6416,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); -@@ -6603,6 +6603,9 @@ soap_bind(struct soap *soap, const char *host, int por +@@ -6682,6 +6682,9 @@ soap_bind(struct soap *soap, const char *host, int por } #endif #ifdef TCP_FASTOPEN @@ -46,12 +28,3 @@ if (!(soap->omode & SOAP_IO_UDP) && setsockopt(soap->master, IPPROTO_TCP, TCP_FASTOPEN, (char*)&set, sizeof(int))) { /* silently ignore */ -@@ -7096,7 +7099,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 Wed Feb 6 05:46:55 2019 (r492286) +++ head/devel/gsoap/files/patch-gsoap_stdsoap2.cpp Wed Feb 6 06:59:38 2019 (r492287) @@ -1,42 +1,24 @@ ---- gsoap/stdsoap2.cpp.orig 2018-04-08 14:22:45 UTC +--- gsoap/stdsoap2.cpp.orig 2019-01-27 15:50:05 UTC +++ gsoap/stdsoap2.cpp -@@ -4281,7 +4281,7 @@ ssl_auth_init(struct soap *soap) +@@ -4302,7 +4302,7 @@ ssl_auth_init(struct soap *soap) ERR_clear_error(); if (!soap->ctx) { --#if (OPENSSL_VERSION_NUMBER >= 0x10100000L) +-#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 -@@ -4369,7 +4369,7 @@ ssl_auth_init(struct soap *soap) +@@ -4390,7 +4390,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 +#if (OPENSSL_VERSION_NUMBER >= 0x10100000L && !defined(LIBRESSL_VERSION_NUMBER)) if (SSL_CTX_need_tmp_RSA(soap->ctx)) #endif { -@@ -6390,7 +6390,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); -@@ -6416,7 +6416,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); -@@ -6603,6 +6603,9 @@ soap_bind(struct soap *soap, const char *host, int por +@@ -6682,6 +6682,9 @@ soap_bind(struct soap *soap, const char *host, int por } #endif #ifdef TCP_FASTOPEN @@ -46,12 +28,3 @@ if (!(soap->omode & SOAP_IO_UDP) && setsockopt(soap->master, IPPROTO_TCP, TCP_FASTOPEN, (char*)&set, sizeof(int))) { /* silently ignore */ -@@ -7096,7 +7099,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/pkg-plist ============================================================================== --- head/devel/gsoap/pkg-plist Wed Feb 6 05:46:55 2019 (r492286) +++ head/devel/gsoap/pkg-plist Wed Feb 6 06:59:38 2019 (r492287) @@ -170,6 +170,8 @@ libdata/pkgconfig/gsoapssl.pc %%DATADIR%%/plugin/httpmd5.h %%DATADIR%%/plugin/httpmd5test.c %%DATADIR%%/plugin/httpmd5test.h +%%DATADIR%%/plugin/httppipe.c +%%DATADIR%%/plugin/httppipe.h %%DATADIR%%/plugin/httppost.c %%DATADIR%%/plugin/httppost.h %%DATADIR%%/plugin/httpposttest.c
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201902060659.x166xco9051921>