Index: head/devel/gsoap/Makefile =================================================================== --- head/devel/gsoap/Makefile (revision 493428) +++ head/devel/gsoap/Makefile (revision 493429) @@ -1,48 +1,48 @@ # Created by: Sergey Matveychuk # $FreeBSD$ PORTNAME= gsoap -PORTVERSION= 2.8.78 +PORTVERSION= 2.8.79 CATEGORIES= devel MASTER_SITES= SF/${PORTNAME}2/gsoap-2.8 DISTNAME= ${PORTNAME}_${PORTVERSION} MAINTAINER= bofh@FreeBSD.org COMMENT= Generator Tools for Coding SOAP/XML Web Services in C and C++ LICENSE= GPLv2 USES= autoreconf pathfix ssl zip CONFIGURE_ENV= LEX=flex YACC=yacc GNU_CONFIGURE= yes MAKE_JOBS_UNSAFE= yes WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION:R} OPTIONS_RADIO= SSL OPTIONS_RADIO_SSL= GNUTLS OPENSSL OPTIONS_DEFAULT= OPENSSL GNUTLS_LIB_DEPENDS= libgnutls.so:security/gnutls \ libgcrypt.so:security/libgcrypt \ libgpg-error.so:security/libgpg-error GNUTLS_CONFIGURE_ON= --enable-gnutls GNUTLS_LDFLAGS= -L${LOCALBASE}/lib OPENSSL_CONFIGURE_ENABLE= ssl CFLAGS+= -fPIC post-patch: @${REINPLACE_CMD} -e 's|sys/timeb.h | |' \ -e 's|-DSOAPCPP_IMPORT_PATH=|-DSOAPCPP2_IMPORT_PATH=|' \ -e 's|-DWSDL_IMPORT_PATH=|-DWSDL2H_IMPORT_PATH=|' \ ${WRKSRC}/configure.ac @${REINPLACE_CMD} -e 's|$$(libdir)|$$(libdir)data|' \ ${WRKSRC}/Makefile.am post-install: @${MKDIR} ${STAGEDIR}${PREFIX}/lib/gsoap ${INSTALL_DATA} ${WRKSRC}/gsoap/stdsoap2.c ${WRKSRC}/gsoap/dom.cpp \ ${STAGEDIR}${PREFIX}/lib/gsoap @${LN} -fs stdsoap2.c ${STAGEDIR}${PREFIX}/lib/gsoap/stdsoap2.cpp @${LN} -fs dom.cpp ${STAGEDIR}${PREFIX}/lib/gsoap/dom.c .include Index: head/devel/gsoap/distinfo =================================================================== --- head/devel/gsoap/distinfo (revision 493428) +++ head/devel/gsoap/distinfo (revision 493429) @@ -1,3 +1,3 @@ -TIMESTAMP = 1549394550 -SHA256 (gsoap_2.8.78.zip) = c4381f12edc0d18c7e674f5a5ef56b2f00cf2713f1097175e4f46740951a2af2 -SIZE (gsoap_2.8.78.zip) = 32507212 +TIMESTAMP = 1550518259 +SHA256 (gsoap_2.8.79.zip) = a1c36371598177950829f78c697768bc0227fe851e4172f8bfbee1e37c939cc1 +SIZE (gsoap_2.8.79.zip) = 32686007 Index: head/devel/gsoap/files/patch-gsoap_VisualStudio2005_wsdl2h_wsdl2h_stdsoap2.cpp =================================================================== --- head/devel/gsoap/files/patch-gsoap_VisualStudio2005_wsdl2h_wsdl2h_stdsoap2.cpp (revision 493428) +++ head/devel/gsoap/files/patch-gsoap_VisualStudio2005_wsdl2h_wsdl2h_stdsoap2.cpp (revision 493429) @@ -1,20 +1,20 @@ ---- gsoap/VisualStudio2005/wsdl2h/wsdl2h/stdsoap2.cpp.orig 2019-01-27 15:50:05 UTC +--- gsoap/VisualStudio2005/wsdl2h/wsdl2h/stdsoap2.cpp.orig 2019-02-10 15:19:37 UTC +++ gsoap/VisualStudio2005/wsdl2h/wsdl2h/stdsoap2.cpp -@@ -4302,7 +4302,7 @@ ssl_auth_init(struct soap *soap) +@@ -4306,7 +4306,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 -@@ -4390,7 +4390,7 @@ ssl_auth_init(struct soap *soap) +@@ -4394,7 +4394,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 OPENSSL_VERSION_NUMBER >= 0x10002000L ++#if (OPENSSL_VERSION_NUMBER >= 0x10002000L && !defined(LIBRESSL_VERSION_NUMBER)) if (SSL_CTX_need_tmp_RSA(soap->ctx)) - #endif { + unsigned long e = RSA_F4; Index: 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 (revision 493428) +++ head/devel/gsoap/files/patch-gsoap_samples_calc__vs2005_calc__vs2005_stdsoap2.cpp (revision 493429) @@ -1,20 +1,20 @@ ---- gsoap/samples/calc_vs2005/calc_vs2005/stdsoap2.cpp.orig 2019-01-27 15:50:05 UTC +--- gsoap/samples/calc_vs2005/calc_vs2005/stdsoap2.cpp.orig 2019-02-10 15:19:36 UTC +++ gsoap/samples/calc_vs2005/calc_vs2005/stdsoap2.cpp -@@ -4302,7 +4302,7 @@ ssl_auth_init(struct soap *soap) +@@ -4306,7 +4306,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 -@@ -4390,7 +4390,7 @@ ssl_auth_init(struct soap *soap) +@@ -4394,7 +4394,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 OPENSSL_VERSION_NUMBER >= 0x10002000L ++#if (OPENSSL_VERSION_NUMBER >= 0x10002000L && !defined(LIBRESSL_VERSION_NUMBER)) if (SSL_CTX_need_tmp_RSA(soap->ctx)) - #endif { + unsigned long e = RSA_F4; Index: head/devel/gsoap/files/patch-gsoap_stdsoap2.c =================================================================== --- head/devel/gsoap/files/patch-gsoap_stdsoap2.c (revision 493428) +++ head/devel/gsoap/files/patch-gsoap_stdsoap2.c (revision 493429) @@ -1,30 +1,43 @@ ---- gsoap/stdsoap2.c.orig 2019-01-27 15:50:05 UTC +--- gsoap/stdsoap2.c.orig 2019-02-10 15:19:37 UTC +++ gsoap/stdsoap2.c -@@ -4302,7 +4302,7 @@ ssl_auth_init(struct soap *soap) +@@ -4306,7 +4306,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 -@@ -4390,7 +4390,7 @@ ssl_auth_init(struct soap *soap) +@@ -4394,7 +4394,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 OPENSSL_VERSION_NUMBER >= 0x10002000L ++#if (OPENSSL_VERSION_NUMBER >= 0x10002000L && !defined(LIBRESSL_VERSION_NUMBER)) if (SSL_CTX_need_tmp_RSA(soap->ctx)) - #endif { -@@ -6682,6 +6682,9 @@ soap_bind(struct soap *soap, const char *host, int por + unsigned long e = RSA_F4; +@@ -4473,10 +4473,12 @@ ssl_auth_init(struct soap *soap) + minv = TLS1_1_VERSION; + else if ((soap->ssl_flags & SOAP_TLSv1_2)) + minv = TLS1_2_VERSION; ++#ifdef TLS1_3_VERSION + else if ((soap->ssl_flags & SOAP_TLSv1_3)) + minv = TLS1_3_VERSION; + if ((soap->ssl_flags & SOAP_TLSv1_3) && OpenSSL_version_num() >= 0x10101000L) + maxv = TLS1_3_VERSION; ++#endif + else if ((soap->ssl_flags & SOAP_TLSv1_2)) + maxv = TLS1_2_VERSION; + else if ((soap->ssl_flags & SOAP_TLSv1_1)) +@@ -6714,6 +6716,9 @@ soap_bind(struct soap *soap, const char *host, int por } #endif #ifdef TCP_FASTOPEN + #ifndef SOL_TCP + #define SOL_TCP IPPROTO_TCP + #endif if (!(soap->omode & SOAP_IO_UDP) && setsockopt(soap->master, IPPROTO_TCP, TCP_FASTOPEN, (char*)&set, sizeof(int))) { /* silently ignore */ Index: head/devel/gsoap/files/patch-gsoap_stdsoap2.cpp =================================================================== --- head/devel/gsoap/files/patch-gsoap_stdsoap2.cpp (revision 493428) +++ head/devel/gsoap/files/patch-gsoap_stdsoap2.cpp (revision 493429) @@ -1,30 +1,43 @@ ---- gsoap/stdsoap2.cpp.orig 2019-01-27 15:50:05 UTC +--- gsoap/stdsoap2.cpp.orig 2019-02-10 15:19:37 UTC +++ gsoap/stdsoap2.cpp -@@ -4302,7 +4302,7 @@ ssl_auth_init(struct soap *soap) +@@ -4306,7 +4306,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 -@@ -4390,7 +4390,7 @@ ssl_auth_init(struct soap *soap) +@@ -4394,7 +4394,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 OPENSSL_VERSION_NUMBER >= 0x10002000L ++#if (OPENSSL_VERSION_NUMBER >= 0x10002000L && !defined(LIBRESSL_VERSION_NUMBER)) if (SSL_CTX_need_tmp_RSA(soap->ctx)) - #endif { -@@ -6682,6 +6682,9 @@ soap_bind(struct soap *soap, const char *host, int por + unsigned long e = RSA_F4; +@@ -4473,10 +4473,12 @@ ssl_auth_init(struct soap *soap) + minv = TLS1_1_VERSION; + else if ((soap->ssl_flags & SOAP_TLSv1_2)) + minv = TLS1_2_VERSION; ++#ifdef TLS1_3_VERSION + else if ((soap->ssl_flags & SOAP_TLSv1_3)) + minv = TLS1_3_VERSION; + if ((soap->ssl_flags & SOAP_TLSv1_3) && OpenSSL_version_num() >= 0x10101000L) + maxv = TLS1_3_VERSION; ++#endif + else if ((soap->ssl_flags & SOAP_TLSv1_2)) + maxv = TLS1_2_VERSION; + else if ((soap->ssl_flags & SOAP_TLSv1_1)) +@@ -6714,6 +6716,9 @@ soap_bind(struct soap *soap, const char *host, int por } #endif #ifdef TCP_FASTOPEN + #ifndef SOL_TCP + #define SOL_TCP IPPROTO_TCP + #endif if (!(soap->omode & SOAP_IO_UDP) && setsockopt(soap->master, IPPROTO_TCP, TCP_FASTOPEN, (char*)&set, sizeof(int))) { /* silently ignore */