Index: head/devel/gsoap/Makefile =================================================================== --- head/devel/gsoap/Makefile (revision 475291) +++ head/devel/gsoap/Makefile (revision 475292) @@ -1,47 +1,47 @@ # Created by: Sergey Matveychuk # $FreeBSD$ PORTNAME= gsoap -PORTVERSION= 2.8.66 +PORTVERSION= 2.8.69 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 CONFIGURE_ENV= LEX=flex YACC=yacc GNU_CONFIGURE= yes MAKE_JOBS_UNSAFE= yes USES= autoreconf pathfix zip 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 475291) +++ head/devel/gsoap/distinfo (revision 475292) @@ -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 Index: head/devel/gsoap/files/patch-gsoap_plugin_smdevp.c =================================================================== --- head/devel/gsoap/files/patch-gsoap_plugin_smdevp.c (revision 475291) +++ head/devel/gsoap/files/patch-gsoap_plugin_smdevp.c (revision 475292) @@ -1,38 +1,47 @@ ---- 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) { -#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 soap_smd_data +@@ -490,7 +490,7 @@ soap_smd_init(struct soap *soap, struct soap_smd_data } 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 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) { -#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 Index: head/devel/gsoap/pkg-plist =================================================================== --- head/devel/gsoap/pkg-plist (revision 475291) +++ head/devel/gsoap/pkg-plist (revision 475292) @@ -1,205 +1,207 @@ bin/soapcpp2 bin/wsdl2h include/stdsoap2.h lib/libgsoap++.a lib/libgsoap.a lib/libgsoapck++.a lib/libgsoapck.a lib/libgsoapssl++.a lib/libgsoapssl.a lib/gsoap/dom.c lib/gsoap/dom.cpp lib/gsoap/stdsoap2.c lib/gsoap/stdsoap2.cpp libdata/pkgconfig/gsoap++.pc libdata/pkgconfig/gsoap.pc libdata/pkgconfig/gsoapck++.pc libdata/pkgconfig/gsoapck.pc libdata/pkgconfig/gsoapssl++.pc libdata/pkgconfig/gsoapssl.pc %%DATADIR%%/WS/LEGAL.txt %%DATADIR%%/WS/README.txt %%DATADIR%%/WS/WS-Addressing.xsd %%DATADIR%%/WS/WS-Addressing03.xsd %%DATADIR%%/WS/WS-Addressing04.xsd %%DATADIR%%/WS/WS-Addressing05.xsd %%DATADIR%%/WS/WS-Discovery.wsdl %%DATADIR%%/WS/WS-Enumeration.wsdl %%DATADIR%%/WS/WS-Policy.xsd %%DATADIR%%/WS/WS-Policy12.xsd %%DATADIR%%/WS/WS-ReliableMessaging.wsdl %%DATADIR%%/WS/WS-ReliableMessaging.xsd %%DATADIR%%/WS/WS-Routing.xsd %%DATADIR%%/WS/WS-SecureConversation.xsd %%DATADIR%%/WS/WS-SecurityPolicy.xsd %%DATADIR%%/WS/WS-Trust.wsdl %%DATADIR%%/WS/WS-Trust.xsd %%DATADIR%%/WS/WS-typemap.dat %%DATADIR%%/WS/discovery.xsd %%DATADIR%%/WS/ds.xsd %%DATADIR%%/WS/enumeration.xsd %%DATADIR%%/WS/oasis-sstc-saml-schema-assertion-1.1.xsd %%DATADIR%%/WS/reference-1.1.xsd %%DATADIR%%/WS/saml-schema-assertion-2.0.xsd %%DATADIR%%/WS/typemap.dat %%DATADIR%%/WS/ws-bpel_abstract_common_base.xsd %%DATADIR%%/WS/ws-bpel_executable.xsd %%DATADIR%%/WS/ws-bpel_plnktype.xsd %%DATADIR%%/WS/ws-bpel_serviceref.xsd %%DATADIR%%/WS/ws-bpel_varprop.xsd %%DATADIR%%/WS/ws-reliability-1.1.xsd %%DATADIR%%/WS/wsse.xsd %%DATADIR%%/WS/wsu.xsd %%DATADIR%%/WS/xenc.xsd %%DATADIR%%/custom/README.txt %%DATADIR%%/custom/chrono_duration.cpp %%DATADIR%%/custom/chrono_duration.h %%DATADIR%%/custom/chrono_time_point.cpp %%DATADIR%%/custom/chrono_time_point.h %%DATADIR%%/custom/duration.c %%DATADIR%%/custom/duration.h %%DATADIR%%/custom/float128.c %%DATADIR%%/custom/float128.h %%DATADIR%%/custom/int128.c %%DATADIR%%/custom/int128.h %%DATADIR%%/custom/long_double.c %%DATADIR%%/custom/long_double.h %%DATADIR%%/custom/long_time.c %%DATADIR%%/custom/long_time.h %%DATADIR%%/custom/qbytearray_base64.cpp %%DATADIR%%/custom/qbytearray_base64.h %%DATADIR%%/custom/qbytearray_hex.cpp %%DATADIR%%/custom/qbytearray_hex.h %%DATADIR%%/custom/qdate.cpp %%DATADIR%%/custom/qdate.h %%DATADIR%%/custom/qdatetime.cpp %%DATADIR%%/custom/qdatetime.h %%DATADIR%%/custom/qstring.cpp %%DATADIR%%/custom/qstring.h %%DATADIR%%/custom/qtime.cpp %%DATADIR%%/custom/qtime.h %%DATADIR%%/custom/struct_timeval.c %%DATADIR%%/custom/struct_timeval.h %%DATADIR%%/custom/struct_tm.c %%DATADIR%%/custom/struct_tm.h %%DATADIR%%/custom/struct_tm_date.c %%DATADIR%%/custom/struct_tm_date.h %%DATADIR%%/extras/README.txt %%DATADIR%%/extras/ckdb.c %%DATADIR%%/extras/ckdb.h %%DATADIR%%/extras/ckdbtest.c %%DATADIR%%/extras/ckdbtest.h %%DATADIR%%/extras/fault.cpp %%DATADIR%%/extras/logging.cpp %%DATADIR%%/extras/soapdefs.h %%DATADIR%%/import/README.txt %%DATADIR%%/import/WS-Header.h %%DATADIR%%/import/WS-example.c %%DATADIR%%/import/WS-example.h %%DATADIR%%/import/c14n.h %%DATADIR%%/import/dom.h %%DATADIR%%/import/ds.h %%DATADIR%%/import/ds2.h %%DATADIR%%/import/plnk.h %%DATADIR%%/import/ref.h %%DATADIR%%/import/saml1.h %%DATADIR%%/import/saml2.h %%DATADIR%%/import/ser.h %%DATADIR%%/import/soap12.h %%DATADIR%%/import/stdstring.h %%DATADIR%%/import/stl.h %%DATADIR%%/import/stldeque.h %%DATADIR%%/import/stllist.h %%DATADIR%%/import/stlset.h %%DATADIR%%/import/stlvector.h %%DATADIR%%/import/vprop.h %%DATADIR%%/import/wsa.h %%DATADIR%%/import/wsa3.h %%DATADIR%%/import/wsa4.h %%DATADIR%%/import/wsa5.h %%DATADIR%%/import/wsc.h %%DATADIR%%/import/wsc2.h %%DATADIR%%/import/wsdd.h %%DATADIR%%/import/wsdd10.h %%DATADIR%%/import/wsdd5.h %%DATADIR%%/import/wsdx.h %%DATADIR%%/import/wsp.h %%DATADIR%%/import/wsp_appliesto.h %%DATADIR%%/import/wsrm.h %%DATADIR%%/import/wsrm4.h %%DATADIR%%/import/wsrm5.h %%DATADIR%%/import/wsrp.h %%DATADIR%%/import/wsrx.h %%DATADIR%%/import/wsrx5.h %%DATADIR%%/import/wsse.h %%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 %%DATADIR%%/import/xlink.h %%DATADIR%%/import/xmime.h %%DATADIR%%/import/xmime4.h %%DATADIR%%/import/xmime5.h %%DATADIR%%/import/xml.h %%DATADIR%%/import/xmlmime.h %%DATADIR%%/import/xmlmime5.h %%DATADIR%%/import/xop.h %%DATADIR%%/import/xsd.h %%DATADIR%%/plugin/README.txt %%DATADIR%%/plugin/cacerts.c %%DATADIR%%/plugin/cacerts.h %%DATADIR%%/plugin/calcrest.h %%DATADIR%%/plugin/curlapi.c %%DATADIR%%/plugin/curlapi.h %%DATADIR%%/plugin/httpda.c %%DATADIR%%/plugin/httpda.h %%DATADIR%%/plugin/httpdatest.c %%DATADIR%%/plugin/httpdatest.h %%DATADIR%%/plugin/httpform.c %%DATADIR%%/plugin/httpform.h %%DATADIR%%/plugin/httpget.c %%DATADIR%%/plugin/httpget.h %%DATADIR%%/plugin/httpgettest.c %%DATADIR%%/plugin/httpgettest.h %%DATADIR%%/plugin/httpmd5.c %%DATADIR%%/plugin/httpmd5.h %%DATADIR%%/plugin/httpmd5test.c %%DATADIR%%/plugin/httpmd5test.h %%DATADIR%%/plugin/httppost.c %%DATADIR%%/plugin/httppost.h %%DATADIR%%/plugin/httpposttest.c %%DATADIR%%/plugin/httpposttest.h %%DATADIR%%/plugin/logging.c %%DATADIR%%/plugin/logging.h %%DATADIR%%/plugin/md5evp.c %%DATADIR%%/plugin/md5evp.h %%DATADIR%%/plugin/mecevp.c %%DATADIR%%/plugin/mecevp.h %%DATADIR%%/plugin/mq.c %%DATADIR%%/plugin/mq.h %%DATADIR%%/plugin/plugin.c %%DATADIR%%/plugin/plugin.h %%DATADIR%%/plugin/sessions.c %%DATADIR%%/plugin/sessions.h %%DATADIR%%/plugin/smdevp.c %%DATADIR%%/plugin/smdevp.h %%DATADIR%%/plugin/threads.c %%DATADIR%%/plugin/threads.h %%DATADIR%%/plugin/wsaapi.c %%DATADIR%%/plugin/wsaapi.h %%DATADIR%%/plugin/wsddapi.c %%DATADIR%%/plugin/wsddapi.h %%DATADIR%%/plugin/wsrmapi.c %%DATADIR%%/plugin/wsrmapi.h %%DATADIR%%/plugin/wsse2api.c %%DATADIR%%/plugin/wsse2api.h %%DATADIR%%/plugin/wsseapi-lite.c %%DATADIR%%/plugin/wsseapi-lite.h %%DATADIR%%/plugin/wsseapi.c %%DATADIR%%/plugin/wsseapi.cpp %%DATADIR%%/plugin/wsseapi.h %%DATADIR%%/plugin/wstapi.c %%DATADIR%%/plugin/wstapi.h