From owner-svn-ports-branches@freebsd.org Sun Nov 18 15:06:44 2018 Return-Path: Delivered-To: svn-ports-branches@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 2BEF01104C5E; Sun, 18 Nov 2018 15:06:44 +0000 (UTC) (envelope-from kevans@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id C327081EDB; Sun, 18 Nov 2018 15:06:43 +0000 (UTC) (envelope-from kevans@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 98C7914F0A; Sun, 18 Nov 2018 15:06:43 +0000 (UTC) (envelope-from kevans@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id wAIF6ha2041813; Sun, 18 Nov 2018 15:06:43 GMT (envelope-from kevans@FreeBSD.org) Received: (from kevans@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id wAIF6fOR041802; Sun, 18 Nov 2018 15:06:41 GMT (envelope-from kevans@FreeBSD.org) Message-Id: <201811181506.wAIF6fOR041802@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: kevans set sender to kevans@FreeBSD.org using -f From: Kyle Evans Date: Sun, 18 Nov 2018 15:06:41 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r485228 - in branches/2018Q4/net/freerdp1: . files X-SVN-Group: ports-branches X-SVN-Commit-Author: kevans X-SVN-Commit-Paths: in branches/2018Q4/net/freerdp1: . files X-SVN-Commit-Revision: 485228 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Rspamd-Queue-Id: C327081EDB X-Spamd-Result: default: False [0.20 / 15.00]; local_wl_from(0.00)[FreeBSD.org]; NEURAL_SPAM_SHORT(0.20)[0.205,0]; ASN(0.00)[asn:11403, ipnet:2610:1c1:1::/48, country:US] X-Rspamd-Server: mx1.freebsd.org X-BeenThere: svn-ports-branches@freebsd.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: SVN commit messages for all the branches of the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 18 Nov 2018 15:06:44 -0000 Author: kevans (src committer) Date: Sun Nov 18 15:06:41 2018 New Revision: 485228 URL: https://svnweb.freebsd.org/changeset/ports/485228 Log: MFH: r485226 net/freerdp1: Fix build with OpenSSL 1.1 Patch taken partially from upstream with some minor refactoring because the patch from upstream was fairly far off from where this version of FreeRDP is at. Built with: Poudriere (11.2 and 13.0-CURRENT) Tested with: OpenSSL 1.0.2 (11.2, base) Tested with: OpenSSL 1.1.1 (11.2, security/openssl111) PR: 233014 Approved by: ultima (ports), myself (maintainer) Approved by: ports-secteam (blanket, build fix) Added: branches/2018Q4/net/freerdp1/files/patch-git_1b5f5747 - copied unchanged from r485226, head/net/freerdp1/files/patch-git_1b5f5747 branches/2018Q4/net/freerdp1/files/patch-include_freerdp_crypto_crypto.h - copied unchanged from r485226, head/net/freerdp1/files/patch-include_freerdp_crypto_crypto.h branches/2018Q4/net/freerdp1/files/patch-libfreerdp_common_assistance.c - copied unchanged from r485226, head/net/freerdp1/files/patch-libfreerdp_common_assistance.c branches/2018Q4/net/freerdp1/files/patch-libfreerdp_core_certificate.c - copied unchanged from r485226, head/net/freerdp1/files/patch-libfreerdp_core_certificate.c branches/2018Q4/net/freerdp1/files/patch-libfreerdp_core_tcp.c - copied unchanged from r485226, head/net/freerdp1/files/patch-libfreerdp_core_tcp.c branches/2018Q4/net/freerdp1/files/patch-libfreerdp_core_transport.c - copied unchanged from r485226, head/net/freerdp1/files/patch-libfreerdp_core_transport.c branches/2018Q4/net/freerdp1/files/patch-libfreerdp_crypto_CMakeLists.txt - copied unchanged from r485226, head/net/freerdp1/files/patch-libfreerdp_crypto_CMakeLists.txt branches/2018Q4/net/freerdp1/files/patch-libfreerdp_crypto_crypto.c - copied unchanged from r485226, head/net/freerdp1/files/patch-libfreerdp_crypto_crypto.c branches/2018Q4/net/freerdp1/files/patch-libfreerdp_crypto_opensslcompat.c - copied unchanged from r485226, head/net/freerdp1/files/patch-libfreerdp_crypto_opensslcompat.c branches/2018Q4/net/freerdp1/files/patch-libfreerdp_crypto_opensslcompat.h - copied unchanged from r485226, head/net/freerdp1/files/patch-libfreerdp_crypto_opensslcompat.h branches/2018Q4/net/freerdp1/files/patch-libfreerdp_crypto_tls.c - copied unchanged from r485226, head/net/freerdp1/files/patch-libfreerdp_crypto_tls.c branches/2018Q4/net/freerdp1/files/patch-winpr_libwinpr_crypto_crypto.c - copied unchanged from r485226, head/net/freerdp1/files/patch-winpr_libwinpr_crypto_crypto.c branches/2018Q4/net/freerdp1/files/patch-winpr_libwinpr_crypto_crypto.h - copied unchanged from r485226, head/net/freerdp1/files/patch-winpr_libwinpr_crypto_crypto.h branches/2018Q4/net/freerdp1/files/patch-winpr_libwinpr_sspi_NTLM_ntlm.c - copied unchanged from r485226, head/net/freerdp1/files/patch-winpr_libwinpr_sspi_NTLM_ntlm.c branches/2018Q4/net/freerdp1/files/patch-winpr_libwinpr_sspi_NTLM_ntlm__compute.c - copied unchanged from r485226, head/net/freerdp1/files/patch-winpr_libwinpr_sspi_NTLM_ntlm__compute.c branches/2018Q4/net/freerdp1/files/patch-winpr_tools_makecert_makecert.c - copied unchanged from r485226, head/net/freerdp1/files/patch-winpr_tools_makecert_makecert.c Modified: branches/2018Q4/net/freerdp1/Makefile Directory Properties: branches/2018Q4/ (props changed) Modified: branches/2018Q4/net/freerdp1/Makefile ============================================================================== --- branches/2018Q4/net/freerdp1/Makefile Sun Nov 18 15:02:26 2018 (r485227) +++ branches/2018Q4/net/freerdp1/Makefile Sun Nov 18 15:06:41 2018 (r485228) @@ -3,7 +3,7 @@ PORTNAME= freerdp PORTVERSION= 1.2.0 -PORTREVISION= 12 +PORTREVISION= 13 CATEGORIES= net comms ipv6 PKGNAMESUFFIX= 1 Copied: branches/2018Q4/net/freerdp1/files/patch-git_1b5f5747 (from r485226, head/net/freerdp1/files/patch-git_1b5f5747) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/2018Q4/net/freerdp1/files/patch-git_1b5f5747 Sun Nov 18 15:06:41 2018 (r485228, copy of r485226, head/net/freerdp1/files/patch-git_1b5f5747) @@ -0,0 +1,30 @@ +--- winpr/libwinpr/bcrypt/CMakeLists.txt.orig 2014-09-11 22:46:32 UTC ++++ winpr/libwinpr/bcrypt/CMakeLists.txt +@@ -17,8 +17,3 @@ + + winpr_module_add(bcrypt.c) + +-winpr_include_directory_add( +- ${OPENSSL_INCLUDE_DIR} +- ${ZLIB_INCLUDE_DIRS}) +- +-winpr_library_add(${ZLIB_LIBRARIES}) +--- winpr/libwinpr/crypto/CMakeLists.txt.orig 2014-09-11 22:46:32 UTC ++++ winpr/libwinpr/crypto/CMakeLists.txt +@@ -20,6 +20,16 @@ winpr_module_add( + crypto.h + cert.c) + ++if(OPENSSL_FOUND) ++ winpr_include_directory_add(${OPENSSL_INCLUDE_DIR}) ++ winpr_library_add(${OPENSSL_LIBRARIES}) ++endif() ++ ++if(MBEDTLS_FOUND) ++ winpr_include_directory_add(${MBEDTLS_INCLUDE_DIR}) ++ winpr_library_add(${MBEDTLS_LIBRARIES}) ++endif() ++ + if(WIN32) + winpr_library_add(crypt32) + endif() Copied: branches/2018Q4/net/freerdp1/files/patch-include_freerdp_crypto_crypto.h (from r485226, head/net/freerdp1/files/patch-include_freerdp_crypto_crypto.h) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/2018Q4/net/freerdp1/files/patch-include_freerdp_crypto_crypto.h Sun Nov 18 15:06:41 2018 (r485228, copy of r485226, head/net/freerdp1/files/patch-include_freerdp_crypto_crypto.h) @@ -0,0 +1,23 @@ +--- include/freerdp/crypto/crypto.h.orig 2018-11-06 02:55:10 UTC ++++ include/freerdp/crypto/crypto.h +@@ -61,12 +61,20 @@ struct crypto_rc4_struct + + struct crypto_des3_struct + { ++#if OPENSSL_VERSION_NUMBER >= 0x1010000fL ++ EVP_CIPHER_CTX *des3_ctx; ++#else + EVP_CIPHER_CTX des3_ctx; ++#endif + }; + + struct crypto_hmac_struct + { ++#if OPENSSL_VERSION_NUMBER >= 0x1010000fL ++ HMAC_CTX *hmac_ctx; ++#else + HMAC_CTX hmac_ctx; ++#endif + }; + + struct crypto_cert_struct Copied: branches/2018Q4/net/freerdp1/files/patch-libfreerdp_common_assistance.c (from r485226, head/net/freerdp1/files/patch-libfreerdp_common_assistance.c) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/2018Q4/net/freerdp1/files/patch-libfreerdp_common_assistance.c Sun Nov 18 15:06:41 2018 (r485228, copy of r485226, head/net/freerdp1/files/patch-libfreerdp_common_assistance.c) @@ -0,0 +1,156 @@ +--- libfreerdp/common/assistance.c.orig 2018-11-06 05:10:45 UTC ++++ libfreerdp/common/assistance.c +@@ -478,7 +478,11 @@ BYTE* freerdp_assistance_encrypt_pass_stub(const char* + int cbPassStubW; + int EncryptedSize; + BYTE PasswordHash[16]; ++#if OPENSSL_VERSION_NUMBER >= 0x1010000fL ++ EVP_CIPHER_CTX *rc4Ctx; ++#else + EVP_CIPHER_CTX rc4Ctx; ++#endif + BYTE *pbIn, *pbOut; + int cbOut, cbIn, cbFinal; + WCHAR* PasswordW = NULL; +@@ -516,9 +520,16 @@ BYTE* freerdp_assistance_encrypt_pass_stub(const char* + *((UINT32*) pbIn) = cbPassStubW; + CopyMemory(&pbIn[4], PassStubW, cbPassStubW); + ++#if OPENSSL_VERSION_NUMBER >= 0x1010000fL ++ rc4Ctx = EVP_CIPHER_CTX_new(); ++ EVP_CIPHER_CTX_init(rc4Ctx); ++ ++ status = EVP_EncryptInit_ex(rc4Ctx, EVP_rc4(), NULL, NULL, NULL); ++#else + EVP_CIPHER_CTX_init(&rc4Ctx); + + status = EVP_EncryptInit_ex(&rc4Ctx, EVP_rc4(), NULL, NULL, NULL); ++#endif + + if (!status) + { +@@ -526,7 +537,11 @@ BYTE* freerdp_assistance_encrypt_pass_stub(const char* + return NULL; + } + ++#if OPENSSL_VERSION_NUMBER >= 0x1010000fL ++ status = EVP_EncryptInit_ex(rc4Ctx, NULL, NULL, PasswordHash, NULL); ++#else + status = EVP_EncryptInit_ex(&rc4Ctx, NULL, NULL, PasswordHash, NULL); ++#endif + + if (!status) + { +@@ -537,7 +552,11 @@ BYTE* freerdp_assistance_encrypt_pass_stub(const char* + cbOut = cbFinal = 0; + cbIn = EncryptedSize; + ++#if OPENSSL_VERSION_NUMBER >= 0x1010000fL ++ status = EVP_EncryptUpdate(rc4Ctx, pbOut, &cbOut, pbIn, cbIn); ++#else + status = EVP_EncryptUpdate(&rc4Ctx, pbOut, &cbOut, pbIn, cbIn); ++#endif + + if (!status) + { +@@ -545,7 +564,11 @@ BYTE* freerdp_assistance_encrypt_pass_stub(const char* + return NULL; + } + ++#if OPENSSL_VERSION_NUMBER >= 0x1010000fL ++ status = EVP_EncryptFinal_ex(rc4Ctx, pbOut + cbOut, &cbFinal); ++#else + status = EVP_EncryptFinal_ex(&rc4Ctx, pbOut + cbOut, &cbFinal); ++#endif + + if (!status) + { +@@ -553,7 +576,11 @@ BYTE* freerdp_assistance_encrypt_pass_stub(const char* + return NULL; + } + ++#if OPENSSL_VERSION_NUMBER >= 0x1010000fL ++ EVP_CIPHER_CTX_free(rc4Ctx); ++#else + EVP_CIPHER_CTX_cleanup(&rc4Ctx); ++#endif + + free(pbIn); + free(PasswordW); +@@ -571,7 +598,11 @@ int freerdp_assistance_decrypt2(rdpAssistanceFile* fil + int cbPasswordW; + int cchOutW = 0; + WCHAR* pbOutW = NULL; ++#if OPENSSL_VERSION_NUMBER >= 0x1010000fL ++ EVP_CIPHER_CTX *aesDec; ++#else + EVP_CIPHER_CTX aesDec; ++#endif + WCHAR* PasswordW = NULL; + BYTE *pbIn, *pbOut; + int cbOut, cbIn, cbFinal; +@@ -598,17 +629,31 @@ int freerdp_assistance_decrypt2(rdpAssistanceFile* fil + + ZeroMemory(InitializationVector, sizeof(InitializationVector)); + ++#if OPENSSL_VERSION_NUMBER >= 0x1010000fL ++ aesDec = EVP_CIPHER_CTX_new(); ++ EVP_CIPHER_CTX_init(aesDec); ++ ++ status = EVP_DecryptInit_ex(aesDec, EVP_aes_128_cbc(), NULL, NULL, NULL); ++#else + EVP_CIPHER_CTX_init(&aesDec); + + status = EVP_DecryptInit_ex(&aesDec, EVP_aes_128_cbc(), NULL, NULL, NULL); ++#endif + + if (status != 1) + return -1; + ++#if OPENSSL_VERSION_NUMBER >= 0x1010000fL ++ EVP_CIPHER_CTX_set_key_length(aesDec, (128 / 8)); ++ EVP_CIPHER_CTX_set_padding(aesDec, 0); ++ ++ status = EVP_DecryptInit_ex(aesDec, EVP_aes_128_cbc(), NULL, DerivedKey, InitializationVector); ++#else + EVP_CIPHER_CTX_set_key_length(&aesDec, (128 / 8)); + EVP_CIPHER_CTX_set_padding(&aesDec, 0); + + status = EVP_DecryptInit_ex(&aesDec, EVP_aes_128_cbc(), NULL, DerivedKey, InitializationVector); ++#endif + + if (status != 1) + return -1; +@@ -621,12 +666,20 @@ int freerdp_assistance_decrypt2(rdpAssistanceFile* fil + if (!pbOut) + return -1; + ++#if OPENSSL_VERSION_NUMBER >= 0x1010000fL ++ status = EVP_DecryptUpdate(aesDec, pbOut, &cbOut, pbIn, cbIn); ++#else + status = EVP_DecryptUpdate(&aesDec, pbOut, &cbOut, pbIn, cbIn); ++#endif + + if (status != 1) + return -1; + ++#if OPENSSL_VERSION_NUMBER >= 0x1010000fL ++ status = EVP_DecryptFinal_ex(aesDec, pbOut + cbOut, &cbFinal); ++#else + status = EVP_DecryptFinal_ex(&aesDec, pbOut + cbOut, &cbFinal); ++#endif + + if (status != 1) + { +@@ -634,7 +687,11 @@ int freerdp_assistance_decrypt2(rdpAssistanceFile* fil + return -1; + } + ++#if OPENSSL_VERSION_NUMBER >= 0x1010000fL ++ EVP_CIPHER_CTX_free(aesDec); ++#else + EVP_CIPHER_CTX_cleanup(&aesDec); ++#endif + + cbOut += cbFinal; + cbFinal = 0; Copied: branches/2018Q4/net/freerdp1/files/patch-libfreerdp_core_certificate.c (from r485226, head/net/freerdp1/files/patch-libfreerdp_core_certificate.c) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/2018Q4/net/freerdp1/files/patch-libfreerdp_core_certificate.c Sun Nov 18 15:06:41 2018 (r485228, copy of r485226, head/net/freerdp1/files/patch-libfreerdp_core_certificate.c) @@ -0,0 +1,59 @@ +--- libfreerdp/core/certificate.c.orig 2014-09-11 22:46:32 UTC ++++ libfreerdp/core/certificate.c +@@ -32,6 +32,7 @@ + #include + + #include "certificate.h" ++#include "../crypto/opensslcompat.h" + + #define TAG "com.freerdp.core" + +@@ -652,6 +653,9 @@ rdpRsaKey* key_new(const char* keyfile) + FILE* fp; + RSA* rsa; + rdpRsaKey* key; ++ const BIGNUM *rsa_e = NULL; ++ const BIGNUM *rsa_n = NULL; ++ const BIGNUM *rsa_d = NULL; + key = (rdpRsaKey*)calloc(1, sizeof(rdpRsaKey)); + + if (!key) +@@ -692,31 +696,31 @@ rdpRsaKey* key_new(const char* keyfile) + ERR_print_errors_fp(stderr); + goto out_free_rsa; + } +- +- if (BN_num_bytes(rsa->e) > 4) ++ RSA_get0_key(rsa, &rsa_n, &rsa_e, &rsa_d); ++ if (BN_num_bytes(rsa_e) > 4) + { + DEBUG_WARN("%s: RSA public exponent too large in %s\n", __FUNCTION__, keyfile); + goto out_free_rsa; + } + +- key->ModulusLength = BN_num_bytes(rsa->n); ++ key->ModulusLength = BN_num_bytes(rsa_n); + key->Modulus = (BYTE*)malloc(key->ModulusLength); + + if (!key->Modulus) + goto out_free_rsa; + +- BN_bn2bin(rsa->n, key->Modulus); ++ BN_bn2bin(rsa_n, key->Modulus); + crypto_reverse(key->Modulus, key->ModulusLength); +- key->PrivateExponentLength = BN_num_bytes(rsa->d); ++ key->PrivateExponentLength = BN_num_bytes(rsa_d); + key->PrivateExponent = (BYTE*)malloc(key->PrivateExponentLength); + + if (!key->PrivateExponent) + goto out_free_modulus; + +- BN_bn2bin(rsa->d, key->PrivateExponent); ++ BN_bn2bin(rsa_d, key->PrivateExponent); + crypto_reverse(key->PrivateExponent, key->PrivateExponentLength); + memset(key->exponent, 0, sizeof(key->exponent)); +- BN_bn2bin(rsa->e, key->exponent + sizeof(key->exponent) - BN_num_bytes(rsa->e)); ++ BN_bn2bin(rsa_e, key->exponent + sizeof(key->exponent) - BN_num_bytes(rsa_e)); + crypto_reverse(key->exponent, sizeof(key->exponent)); + RSA_free(rsa); + return key; Copied: branches/2018Q4/net/freerdp1/files/patch-libfreerdp_core_tcp.c (from r485226, head/net/freerdp1/files/patch-libfreerdp_core_tcp.c) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/2018Q4/net/freerdp1/files/patch-libfreerdp_core_tcp.c Sun Nov 18 15:06:41 2018 (r485228, copy of r485226, head/net/freerdp1/files/patch-libfreerdp_core_tcp.c) @@ -0,0 +1,338 @@ +--- libfreerdp/core/tcp.c.orig 2014-09-11 22:46:32 UTC ++++ libfreerdp/core/tcp.c +@@ -71,6 +71,7 @@ + #include + + #include "tcp.h" ++#include "../crypto/opensslcompat.h" + + /* Simple Socket BIO */ + +@@ -86,13 +87,14 @@ static int transport_bio_simple_write(BIO* bio, const + { + int error; + int status = 0; ++ int socket = (int)BIO_get_data(bio); + + if (!buf) + return 0; + + BIO_clear_flags(bio, BIO_FLAGS_WRITE); + +- status = _send((SOCKET) bio->num, buf, size, 0); ++ status = _send(socket, buf, size, 0); + + if (status <= 0) + { +@@ -116,13 +118,14 @@ static int transport_bio_simple_read(BIO* bio, char* b + { + int error; + int status = 0; ++ int socket = (int)BIO_get_data(bio); + + if (!buf) + return 0; + + BIO_clear_flags(bio, BIO_FLAGS_READ); + +- status = _recv((SOCKET) bio->num, buf, size, 0); ++ status = _recv(socket, buf, size, 0); + if (status > 0) + return status; + +@@ -160,6 +163,7 @@ static int transport_bio_simple_gets(BIO* bio, char* s + static long transport_bio_simple_ctrl(BIO* bio, int cmd, long arg1, void* arg2) + { + int status = -1; ++ int socket = (int)BIO_get_data(bio); + + switch (cmd) + { +@@ -167,29 +171,29 @@ static long transport_bio_simple_ctrl(BIO* bio, int cm + if (arg2) + { + transport_bio_simple_free(bio); +- bio->flags = BIO_FLAGS_SHOULD_RETRY; +- bio->num = *((int*) arg2); +- bio->shutdown = (int) arg1; +- bio->init = 1; ++ BIO_set_flags(bio, BIO_FLAGS_SHOULD_RETRY); ++ BIO_set_data(bio, *((int *) arg2)); ++ BIO_set_shutdown(bio, (int) arg1); ++ BIO_set_init(bio, 1); + status = 1; + } + break; + + case BIO_C_GET_FD: +- if (bio->init) ++ if (BIO_get_init(bio)) + { + if (arg2) +- *((int*) arg2) = bio->num; +- status = bio->num; ++ *((int*) arg2) = socket; ++ status = socket; + } + break; + + case BIO_CTRL_GET_CLOSE: +- status = bio->shutdown; ++ status = BIO_get_shutdown(bio); + break; + + case BIO_CTRL_SET_CLOSE: +- bio->shutdown = (int) arg1; ++ BIO_set_shutdown(bio, (int) arg1); + status = 1; + break; + +@@ -211,47 +215,49 @@ static long transport_bio_simple_ctrl(BIO* bio, int cm + + static int transport_bio_simple_new(BIO* bio) + { +- bio->init = 0; +- bio->num = 0; +- bio->ptr = NULL; +- bio->flags = BIO_FLAGS_SHOULD_RETRY; ++ ++ BIO_set_init(bio, 0); ++ BIO_set_data(bio, 0); ++ BIO_set_flags(bio, BIO_FLAGS_SHOULD_RETRY); + return 1; + } + + static int transport_bio_simple_free(BIO* bio) + { ++ int socket = (int)BIO_get_data(bio); + if (!bio) + return 0; + +- if (bio->shutdown) ++ if (BIO_get_shutdown(bio)) + { +- if (bio->init) +- closesocket((SOCKET) bio->num); ++ if (BIO_get_init(bio)) ++ closesocket(socket); + +- bio->init = 0; +- bio->flags = 0; ++ BIO_set_init(bio, 0); ++ BIO_set_flags(bio, 0); ++ BIO_set_data(bio, 0); + } + + return 1; + } + +-static BIO_METHOD transport_bio_simple_socket_methods = +-{ +- BIO_TYPE_SIMPLE, +- "SimpleSocket", +- transport_bio_simple_write, +- transport_bio_simple_read, +- transport_bio_simple_puts, +- transport_bio_simple_gets, +- transport_bio_simple_ctrl, +- transport_bio_simple_new, +- transport_bio_simple_free, +- NULL, +-}; +- + BIO_METHOD* BIO_s_simple_socket(void) + { +- return &transport_bio_simple_socket_methods; ++ static BIO_METHOD* bio_methods = NULL; ++ ++ if (bio_methods == NULL) ++ { ++ if (!(bio_methods = BIO_meth_new(BIO_TYPE_SIMPLE, "SimpleSocket"))) ++ return NULL; ++ BIO_meth_set_write(bio_methods, transport_bio_simple_write); ++ BIO_meth_set_read(bio_methods, transport_bio_simple_read); ++ BIO_meth_set_puts(bio_methods, transport_bio_simple_puts); ++ BIO_meth_set_gets(bio_methods, transport_bio_simple_gets); ++ BIO_meth_set_ctrl(bio_methods, transport_bio_simple_ctrl); ++ BIO_meth_set_create(bio_methods, transport_bio_simple_new); ++ BIO_meth_set_destroy(bio_methods, transport_bio_simple_free); ++ } ++ return bio_methods; + } + + /* Buffered Socket BIO */ +@@ -264,7 +270,8 @@ long transport_bio_buffered_callback(BIO* bio, int mod + static int transport_bio_buffered_write(BIO* bio, const char* buf, int num) + { + int status, ret; +- rdpTcp* tcp = (rdpTcp*) bio->ptr; ++ rdpTcp* tcp = (rdpTcp*) BIO_get_data(bio); ++ BIO *next_bio = NULL; + int nchunks, committedBytes, i; + DataChunk chunks[2]; + +@@ -283,23 +290,24 @@ static int transport_bio_buffered_write(BIO* bio, cons + + committedBytes = 0; + nchunks = ringbuffer_peek(&tcp->xmitBuffer, chunks, ringbuffer_used(&tcp->xmitBuffer)); ++ next_bio = BIO_next(bio); + + for (i = 0; i < nchunks; i++) + { + while (chunks[i].size) + { +- status = BIO_write(bio->next_bio, chunks[i].data, chunks[i].size); ++ status = BIO_write(next_bio, chunks[i].data, chunks[i].size); + + if (status <= 0) + { +- if (!BIO_should_retry(bio->next_bio)) ++ if (!BIO_should_retry(next_bio)) + { + BIO_clear_flags(bio, BIO_FLAGS_SHOULD_RETRY); + ret = -1; /* fatal error */ + goto out; + } + +- if (BIO_should_write(bio->next_bio)) ++ if (BIO_should_write(next_bio)) + { + BIO_set_flags(bio, BIO_FLAGS_WRITE); + tcp->writeBlocked = TRUE; +@@ -321,16 +329,17 @@ out: + static int transport_bio_buffered_read(BIO* bio, char* buf, int size) + { + int status; +- rdpTcp* tcp = (rdpTcp*) bio->ptr; ++ rdpTcp* tcp = (rdpTcp*) BIO_get_data(bio); ++ BIO* next_bio = BIO_next(bio); + + tcp->readBlocked = FALSE; + BIO_clear_flags(bio, BIO_FLAGS_READ); + +- status = BIO_read(bio->next_bio, buf, size); ++ status = BIO_read(next_bio, buf, size); + + if (status <= 0) + { +- if (!BIO_should_retry(bio->next_bio)) ++ if (!BIO_should_retry(next_bio)) + { + BIO_clear_flags(bio, BIO_FLAGS_SHOULD_RETRY); + goto out; +@@ -338,7 +347,7 @@ static int transport_bio_buffered_read(BIO* bio, char* + + BIO_set_flags(bio, BIO_FLAGS_SHOULD_RETRY); + +- if (BIO_should_read(bio->next_bio)) ++ if (BIO_should_read(next_bio)) + { + BIO_set_flags(bio, BIO_FLAGS_READ); + tcp->readBlocked = TRUE; +@@ -362,7 +371,7 @@ static int transport_bio_buffered_gets(BIO* bio, char* + + static long transport_bio_buffered_ctrl(BIO* bio, int cmd, long arg1, void* arg2) + { +- rdpTcp* tcp = (rdpTcp*) bio->ptr; ++ rdpTcp* tcp = (rdpTcp*) BIO_get_data(bio); + + switch (cmd) + { +@@ -376,7 +385,7 @@ static long transport_bio_buffered_ctrl(BIO* bio, int + return 0; + + default: +- return BIO_ctrl(bio->next_bio, cmd, arg1, arg2); ++ return BIO_ctrl(BIO_next(bio), cmd, arg1, arg2); + } + + return 0; +@@ -384,10 +393,9 @@ static long transport_bio_buffered_ctrl(BIO* bio, int + + static int transport_bio_buffered_new(BIO* bio) + { +- bio->init = 1; +- bio->num = 0; +- bio->ptr = NULL; +- bio->flags = BIO_FLAGS_SHOULD_RETRY; ++ BIO_set_init(bio, 1); ++ BIO_set_data(bio, 0); ++ BIO_set_flags(bio, BIO_FLAGS_SHOULD_RETRY); + return 1; + } + +@@ -396,29 +404,28 @@ static int transport_bio_buffered_free(BIO* bio) + return 1; + } + +-static BIO_METHOD transport_bio_buffered_socket_methods = +-{ +- BIO_TYPE_BUFFERED, +- "BufferedSocket", +- transport_bio_buffered_write, +- transport_bio_buffered_read, +- transport_bio_buffered_puts, +- transport_bio_buffered_gets, +- transport_bio_buffered_ctrl, +- transport_bio_buffered_new, +- transport_bio_buffered_free, +- NULL, +-}; +- + BIO_METHOD* BIO_s_buffered_socket(void) + { +- return &transport_bio_buffered_socket_methods; ++ static BIO_METHOD* bio_methods = NULL; ++ if (bio_methods == NULL) ++ { ++ if (!(bio_methods = BIO_meth_new(BIO_TYPE_BUFFERED, "BufferedSocket"))) ++ return NULL; ++ BIO_meth_set_write(bio_methods, transport_bio_buffered_write); ++ BIO_meth_set_read(bio_methods, transport_bio_buffered_read); ++ BIO_meth_set_puts(bio_methods, transport_bio_buffered_puts); ++ BIO_meth_set_gets(bio_methods, transport_bio_buffered_gets); ++ BIO_meth_set_ctrl(bio_methods, transport_bio_buffered_ctrl); ++ BIO_meth_set_create(bio_methods, transport_bio_buffered_new); ++ BIO_meth_set_destroy(bio_methods, transport_bio_buffered_free); ++ } ++ return bio_methods; + } + + BOOL transport_bio_buffered_drain(BIO *bio) + { + int status; +- rdpTcp* tcp = (rdpTcp*) bio->ptr; ++ rdpTcp* tcp = (rdpTcp*) BIO_get_data(bio); + + if (!ringbuffer_used(&tcp->xmitBuffer)) + return 1; +@@ -527,7 +534,10 @@ BOOL tcp_connect(rdpTcp* tcp, const char* hostname, in + if (!tcp->socketBio) + return FALSE; + +- if (BIO_set_conn_hostname(tcp->socketBio, hostname) < 0 || BIO_set_conn_int_port(tcp->socketBio, &port) < 0) ++ char strport[10]; ++ /* XXX HACK */ ++ snprintf(strport, 10, "%d", port); ++ if (BIO_set_conn_hostname(tcp->socketBio, hostname) < 0 || BIO_set_conn_port(tcp->socketBio, strport) < 0) + return FALSE; + + BIO_set_nbio(tcp->socketBio, 1); +@@ -620,7 +630,7 @@ BOOL tcp_connect(rdpTcp* tcp, const char* hostname, in + if (!tcp->bufferedBio) + return FALSE; + +- tcp->bufferedBio->ptr = tcp; ++ BIO_set_data(tcp->bufferedBio, tcp); + + tcp->bufferedBio = BIO_push(tcp->bufferedBio, tcp->socketBio); + +@@ -771,7 +781,7 @@ int tcp_attach(rdpTcp* tcp, int sockfd) + if (!tcp->bufferedBio) + return FALSE; + +- tcp->bufferedBio->ptr = tcp; ++ BIO_set_data(tcp->bufferedBio, tcp); + + tcp->bufferedBio = BIO_push(tcp->bufferedBio, tcp->socketBio); + } Copied: branches/2018Q4/net/freerdp1/files/patch-libfreerdp_core_transport.c (from r485226, head/net/freerdp1/files/patch-libfreerdp_core_transport.c) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/2018Q4/net/freerdp1/files/patch-libfreerdp_core_transport.c Sun Nov 18 15:06:41 2018 (r485228, copy of r485226, head/net/freerdp1/files/patch-libfreerdp_core_transport.c) @@ -0,0 +1,92 @@ +--- libfreerdp/core/transport.c.orig 2014-09-11 22:46:32 UTC ++++ libfreerdp/core/transport.c +@@ -54,6 +54,7 @@ + #include "fastpath.h" + #include "transport.h" + #include "rdp.h" ++#include "../crypto/opensslcompat.h" + + #define TAG FREERDP_TAG("core") + +@@ -122,7 +123,7 @@ static int transport_bio_tsg_write(BIO* bio, const cha + { + int status; + rdpTsg* tsg; +- tsg = (rdpTsg*) bio->ptr; ++ tsg = (rdpTsg*) BIO_get_data(bio); + BIO_clear_flags(bio, BIO_FLAGS_WRITE); + status = tsg_write(tsg, (BYTE*) buf, num); + +@@ -142,9 +143,9 @@ static int transport_bio_tsg_read(BIO* bio, char* buf, + { + int status; + rdpTsg* tsg; +- tsg = (rdpTsg*) bio->ptr; ++ tsg = (rdpTsg*) BIO_get_data(bio); + BIO_clear_flags(bio, BIO_FLAGS_READ); +- status = tsg_read(bio->ptr, (BYTE*) buf, size); ++ status = tsg_read(tsg, (BYTE*) buf, size); + + if (status < 0) + { +@@ -180,10 +181,9 @@ static long transport_bio_tsg_ctrl(BIO* bio, int cmd, + + static int transport_bio_tsg_new(BIO* bio) + { +- bio->init = 1; +- bio->num = 0; +- bio->ptr = NULL; +- bio->flags = BIO_FLAGS_SHOULD_RETRY; ++ BIO_set_init(bio, 1); ++ BIO_set_data(bio, 0); ++ BIO_set_flags(bio, BIO_FLAGS_SHOULD_RETRY); + return 1; + } + +@@ -194,23 +194,22 @@ static int transport_bio_tsg_free(BIO* bio) + + #define BIO_TYPE_TSG 65 + +-static BIO_METHOD transport_bio_tsg_methods = +-{ +- BIO_TYPE_TSG, +- "TSGateway", +- transport_bio_tsg_write, +- transport_bio_tsg_read, +- transport_bio_tsg_puts, +- transport_bio_tsg_gets, +- transport_bio_tsg_ctrl, +- transport_bio_tsg_new, +- transport_bio_tsg_free, +- NULL, +-}; +- + BIO_METHOD* BIO_s_tsg(void) + { +- return &transport_bio_tsg_methods; ++ static BIO_METHOD* bio_methods = NULL; ++ if (bio_methods == NULL) ++ { ++ if (!(bio_methods = BIO_meth_new(BIO_TYPE_TSG, "TSGateway"))) ++ return NULL; ++ BIO_meth_set_write(bio_methods, transport_bio_tsg_write); ++ BIO_meth_set_read(bio_methods, transport_bio_tsg_read); ++ BIO_meth_set_puts(bio_methods, transport_bio_tsg_puts); ++ BIO_meth_set_gets(bio_methods, transport_bio_tsg_gets); ++ BIO_meth_set_ctrl(bio_methods, transport_bio_tsg_ctrl); ++ BIO_meth_set_create(bio_methods, transport_bio_tsg_new); ++ BIO_meth_set_destroy(bio_methods, transport_bio_tsg_free); ++ } ++ return bio_methods; + } + + BOOL transport_connect_tls(rdpTransport* transport) +@@ -426,7 +425,7 @@ BOOL transport_tsg_connect(rdpTransport* transport, co + return FALSE; + + transport->frontBio = BIO_new(BIO_s_tsg()); +- transport->frontBio->ptr = tsg; ++ BIO_set_data(transport->frontBio, tsg); + return TRUE; + } + Copied: branches/2018Q4/net/freerdp1/files/patch-libfreerdp_crypto_CMakeLists.txt (from r485226, head/net/freerdp1/files/patch-libfreerdp_crypto_CMakeLists.txt) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/2018Q4/net/freerdp1/files/patch-libfreerdp_crypto_CMakeLists.txt Sun Nov 18 15:06:41 2018 (r485228, copy of r485226, head/net/freerdp1/files/patch-libfreerdp_crypto_CMakeLists.txt) @@ -0,0 +1,12 @@ +--- libfreerdp/crypto/CMakeLists.txt.orig 2018-11-15 22:43:06 UTC ++++ libfreerdp/crypto/CMakeLists.txt +@@ -26,7 +26,8 @@ freerdp_module_add( + base64.c + certificate.c + crypto.c +- tls.c) ++ tls.c ++ opensslcompat.c) + + freerdp_include_directory_add(${OPENSSL_INCLUDE_DIR}) + freerdp_include_directory_add(${ZLIB_INCLUDE_DIRS}) Copied: branches/2018Q4/net/freerdp1/files/patch-libfreerdp_crypto_crypto.c (from r485226, head/net/freerdp1/files/patch-libfreerdp_crypto_crypto.c) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/2018Q4/net/freerdp1/files/patch-libfreerdp_crypto_crypto.c Sun Nov 18 15:06:41 2018 (r485228, copy of r485226, head/net/freerdp1/files/patch-libfreerdp_crypto_crypto.c) @@ -0,0 +1,189 @@ +--- libfreerdp/crypto/crypto.c.orig 2018-11-06 02:56:44 UTC ++++ libfreerdp/crypto/crypto.c +@@ -92,9 +92,16 @@ CryptoDes3 crypto_des3_encrypt_init(const BYTE* key, c + if (!des3) + return NULL; + ++#if OPENSSL_VERSION_NUMBER >= 0x1010000fL ++ des3->des3_ctx = EVP_CIPHER_CTX_new(); ++ EVP_CIPHER_CTX_init(des3->des3_ctx); ++ EVP_EncryptInit_ex(des3->des3_ctx, EVP_des_ede3_cbc(), NULL, key, ivec); ++ EVP_CIPHER_CTX_set_padding(des3->des3_ctx, 0); ++#else + EVP_CIPHER_CTX_init(&des3->des3_ctx); + EVP_EncryptInit_ex(&des3->des3_ctx, EVP_des_ede3_cbc(), NULL, key, ivec); + EVP_CIPHER_CTX_set_padding(&des3->des3_ctx, 0); ++#endif + return des3; + } + +@@ -103,23 +110,37 @@ CryptoDes3 crypto_des3_decrypt_init(const BYTE* key, c + CryptoDes3 des3 = malloc(sizeof(*des3)); + if (!des3) + return NULL; +- ++#if OPENSSL_VERSION_NUMBER >= 0x1010000fL ++ des3->des3_ctx = EVP_CIPHER_CTX_new(); ++ EVP_CIPHER_CTX_init(des3->des3_ctx); ++ EVP_DecryptInit_ex(des3->des3_ctx, EVP_des_ede3_cbc(), NULL, key, ivec); ++ EVP_CIPHER_CTX_set_padding(des3->des3_ctx, 0); ++#else + EVP_CIPHER_CTX_init(&des3->des3_ctx); + EVP_DecryptInit_ex(&des3->des3_ctx, EVP_des_ede3_cbc(), NULL, key, ivec); + EVP_CIPHER_CTX_set_padding(&des3->des3_ctx, 0); ++#endif + return des3; + } + + void crypto_des3_encrypt(CryptoDes3 des3, UINT32 length, const BYTE* in_data, BYTE* out_data) + { + int len; ++#if OPENSSL_VERSION_NUMBER >= 0x1010000fL ++ EVP_EncryptUpdate(des3->des3_ctx, out_data, &len, in_data, length); ++#else + EVP_EncryptUpdate(&des3->des3_ctx, out_data, &len, in_data, length); ++#endif + } + + void crypto_des3_decrypt(CryptoDes3 des3, UINT32 length, const BYTE* in_data, BYTE* out_data) + { + int len; ++#if OPENSSL_VERSION_NUMBER >= 0x1010000fL ++ EVP_DecryptUpdate(des3->des3_ctx, out_data, &len, in_data, length); ++#else + EVP_DecryptUpdate(&des3->des3_ctx, out_data, &len, in_data, length); ++#endif + + if (length != len) + abort(); /* TODO */ +@@ -129,7 +150,12 @@ void crypto_des3_free(CryptoDes3 des3) + { + if (des3 == NULL) + return; ++#if OPENSSL_VERSION_NUMBER >= 0x1010000fL ++ EVP_CIPHER_CTX_cleanup(des3->des3_ctx); ++ EVP_CIPHER_CTX_free(des3->des3_ctx); ++#else + EVP_CIPHER_CTX_cleanup(&des3->des3_ctx); ++#endif + free(des3); + } + +@@ -139,28 +165,48 @@ CryptoHmac crypto_hmac_new(void) + if (!hmac) + return NULL; + ++#if OPENSSL_VERSION_NUMBER >= 0x1010000fL ++ hmac->hmac_ctx = HMAC_CTX_new(); ++#else + HMAC_CTX_init(&hmac->hmac_ctx); ++#endif + return hmac; + } + + void crypto_hmac_sha1_init(CryptoHmac hmac, const BYTE* data, UINT32 length) + { ++#if OPENSSL_VERSION_NUMBER >= 0x1010000fL ++ HMAC_Init_ex(hmac->hmac_ctx, data, length, EVP_sha1(), NULL); ++#else + HMAC_Init_ex(&hmac->hmac_ctx, data, length, EVP_sha1(), NULL); ++#endif + } + + void crypto_hmac_md5_init(CryptoHmac hmac, const BYTE* data, UINT32 length) + { ++#if OPENSSL_VERSION_NUMBER >= 0x1010000fL ++ HMAC_Init_ex(hmac->hmac_ctx, data, length, EVP_md5(), NULL); ++#else + HMAC_Init_ex(&hmac->hmac_ctx, data, length, EVP_md5(), NULL); ++#endif + } + + void crypto_hmac_update(CryptoHmac hmac, const BYTE* data, UINT32 length) + { ++#if OPENSSL_VERSION_NUMBER >= 0x1010000fL ++ HMAC_Update(hmac->hmac_ctx, data, length); ++#else + HMAC_Update(&hmac->hmac_ctx, data, length); ++#endif + } + + void crypto_hmac_final(CryptoHmac hmac, BYTE* out_data, UINT32 length) + { ++#if OPENSSL_VERSION_NUMBER >= 0x1010000fL ++ HMAC_Final(hmac->hmac_ctx, out_data, &length); ++#else + HMAC_Final(&hmac->hmac_ctx, out_data, &length); ++#endif + } + + void crypto_hmac_free(CryptoHmac hmac) +@@ -168,7 +214,11 @@ void crypto_hmac_free(CryptoHmac hmac) + if (hmac == NULL) + return; + ++#if OPENSSL_VERSION_NUMBER >= 0x1010000fL ++ HMAC_CTX_free(hmac->hmac_ctx); ++#else + HMAC_CTX_cleanup(&hmac->hmac_ctx); ++#endif + free(hmac); + } + +@@ -236,7 +286,11 @@ static int crypto_rsa_common(const BYTE* input, int le + BYTE* input_reverse; + BYTE* modulus_reverse; + BYTE* exponent_reverse; ++#if OPENSSL_VERSION_NUMBER >= 0x1010000fL ++ BIGNUM *mod, *exp, *x, *y; ++#else + BIGNUM mod, exp, x, y; ++#endif + + input_reverse = (BYTE*) malloc(2 * key_length + exponent_size); + if (!input_reverse) +@@ -254,6 +308,18 @@ static int crypto_rsa_common(const BYTE* input, int le + ctx = BN_CTX_new(); + if (!ctx) + goto out_free_input_reverse; ++#if OPENSSL_VERSION_NUMBER >= 0x1010000fL ++ mod = BN_new(); ++ exp = BN_new(); ++ x = BN_new(); ++ y = BN_new(); ++ ++ BN_bin2bn(modulus_reverse, key_length, mod); ++ BN_bin2bn(exponent_reverse, exponent_size, exp); ++ BN_bin2bn(input_reverse, length, x); ++ BN_mod_exp(y, x, exp, mod, ctx); ++ output_length = BN_bn2bin(y, output); ++#else + BN_init(&mod); + BN_init(&exp); + BN_init(&x); +@@ -263,17 +329,24 @@ static int crypto_rsa_common(const BYTE* input, int le + BN_bin2bn(exponent_reverse, exponent_size, &exp); + BN_bin2bn(input_reverse, length, &x); + BN_mod_exp(&y, &x, &exp, &mod, ctx); +- + output_length = BN_bn2bin(&y, output); ++#endif + crypto_reverse(output, output_length); + + if (output_length < (int) key_length) + memset(output + output_length, 0, key_length - output_length); + ++#if OPENSSL_VERSION_NUMBER >= 0x1010000fL ++ BN_free(y); ++ BN_clear_free(x); ++ BN_free(exp); ++ BN_free(mod); ++#else + BN_free(&y); + BN_clear_free(&x); + BN_free(&exp); + BN_free(&mod); ++#endif + BN_CTX_free(ctx); + + out_free_input_reverse: Copied: branches/2018Q4/net/freerdp1/files/patch-libfreerdp_crypto_opensslcompat.c (from r485226, head/net/freerdp1/files/patch-libfreerdp_crypto_opensslcompat.c) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/2018Q4/net/freerdp1/files/patch-libfreerdp_crypto_opensslcompat.c Sun Nov 18 15:06:41 2018 (r485228, copy of r485226, head/net/freerdp1/files/patch-libfreerdp_crypto_opensslcompat.c) @@ -0,0 +1,47 @@ +--- libfreerdp/crypto/opensslcompat.c.orig 2018-11-15 22:42:44 UTC ++++ libfreerdp/crypto/opensslcompat.c +@@ -0,0 +1,44 @@ ++/** ++ * FreeRDP: A Remote Desktop Protocol Implementation ++ * OpenSSL Compatibility ++ * ++ * Copyright (C) 2016 Norbert Federa ++ * ++ * Licensed under the Apache License, Version 2.0 (the "License"); ++ * you may not use this file except in compliance with the License. ++ * You may obtain a copy of the License at ++ * ++ * http://www.apache.org/licenses/LICENSE-2.0 ++ * ++ * Unless required by applicable law or agreed to in writing, software ++ * distributed under the License is distributed on an "AS IS" BASIS, ++ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. ++ * See the License for the specific language governing permissions and ++ * limitations under the License. ++ */ ++ ++#include "opensslcompat.h" ++ ++#if OPENSSL_VERSION_NUMBER < 0x10100000L ++ ++BIO_METHOD* BIO_meth_new(int type, const char* name) ++{ ++ BIO_METHOD* m; ++ if (!(m = calloc(1, sizeof(BIO_METHOD)))) ++ return NULL; ++ m->type = type; ++ m->name = name; ++ return m; ++} ++ ++void RSA_get0_key(const RSA* r, const BIGNUM** n, const BIGNUM** e, const BIGNUM** d) ++{ ++ if (n != NULL) ++ *n = r->n; ++ if (e != NULL) ++ *e = r->e; ++ if (d != NULL) ++ *d = r->d; ++} ++ ++#endif /* OPENSSL < 1.1.0 */ Copied: branches/2018Q4/net/freerdp1/files/patch-libfreerdp_crypto_opensslcompat.h (from r485226, head/net/freerdp1/files/patch-libfreerdp_crypto_opensslcompat.h) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/2018Q4/net/freerdp1/files/patch-libfreerdp_crypto_opensslcompat.h Sun Nov 18 15:06:41 2018 (r485228, copy of r485226, head/net/freerdp1/files/patch-libfreerdp_crypto_opensslcompat.h) @@ -0,0 +1,64 @@ +--- libfreerdp/crypto/opensslcompat.h.orig 2018-11-15 22:42:46 UTC ++++ libfreerdp/crypto/opensslcompat.h +@@ -0,0 +1,61 @@ ++/** ++ * FreeRDP: A Remote Desktop Protocol Implementation ++ * OpenSSL Compatibility ++ * ++ * Copyright (C) 2016 Norbert Federa ++ * ++ * Licensed under the Apache License, Version 2.0 (the "License"); ++ * you may not use this file except in compliance with the License. ++ * You may obtain a copy of the License at ++ * *** DIFF OUTPUT TRUNCATED AT 1000 LINES *** From owner-svn-ports-branches@freebsd.org Sun Nov 18 16:06:30 2018 Return-Path: Delivered-To: svn-ports-branches@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 8A4611105F09; Sun, 18 Nov 2018 16:06:30 +0000 (UTC) (envelope-from asomers@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 193D683C10; Sun, 18 Nov 2018 16:06:30 +0000 (UTC) (envelope-from asomers@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id EA6F2158AB; Sun, 18 Nov 2018 16:06:29 +0000 (UTC) (envelope-from asomers@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id wAIG6T7G072642; Sun, 18 Nov 2018 16:06:29 GMT (envelope-from asomers@FreeBSD.org) Received: (from asomers@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id wAIG6TVP072639; Sun, 18 Nov 2018 16:06:29 GMT (envelope-from asomers@FreeBSD.org) Message-Id: <201811181606.wAIG6TVP072639@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: asomers set sender to asomers@FreeBSD.org using -f From: Alan Somers Date: Sun, 18 Nov 2018 16:06:29 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r485231 - in branches/2018Q4/devel: p4 p4/files subversion/files X-SVN-Group: ports-branches X-SVN-Commit-Author: asomers X-SVN-Commit-Paths: in branches/2018Q4/devel: p4 p4/files subversion/files X-SVN-Commit-Revision: 485231 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Rspamd-Queue-Id: 193D683C10 X-Spamd-Result: default: False [-0.19 / 15.00]; local_wl_from(0.00)[FreeBSD.org]; NEURAL_HAM_SHORT(-0.19)[-0.189,0]; ASN(0.00)[asn:11403, ipnet:2610:1c1:1::/48, country:US] X-Rspamd-Server: mx1.freebsd.org X-BeenThere: svn-ports-branches@freebsd.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: SVN commit messages for all the branches of the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 18 Nov 2018 16:06:30 -0000 Author: asomers (src committer) Date: Sun Nov 18 16:06:28 2018 New Revision: 485231 URL: https://svnweb.freebsd.org/changeset/ports/485231 Log: MFH r484879 devel/p4: fix build with OpenSSL 1.1 PR: 229021 Reported by: brnrd Submitted by: ken MFH: 2018Q4 Approved by: ports-secteam (miwi) Added: branches/2018Q4/devel/p4/files/patch-net_netsslcredentials.cc - copied unchanged from r484879, head/devel/p4/files/patch-net_netsslcredentials.cc Modified: branches/2018Q4/devel/p4/Makefile branches/2018Q4/devel/subversion/files/extra-patch-fbsd-template Directory Properties: branches/2018Q4/ (props changed) Modified: branches/2018Q4/devel/p4/Makefile ============================================================================== --- branches/2018Q4/devel/p4/Makefile Sun Nov 18 15:55:33 2018 (r485230) +++ branches/2018Q4/devel/p4/Makefile Sun Nov 18 16:06:28 2018 (r485231) @@ -3,7 +3,7 @@ PORTNAME= p4 PORTVERSION= ${YEAR}.${MAJOR}.${MINOR} -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= devel # Perforce stupidly rerolls their distfiles on a regular basis, updating the # files' timestamps when they do, which changes the zip file's checksum. Work Copied: branches/2018Q4/devel/p4/files/patch-net_netsslcredentials.cc (from r484879, head/devel/p4/files/patch-net_netsslcredentials.cc) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/2018Q4/devel/p4/files/patch-net_netsslcredentials.cc Sun Nov 18 16:06:28 2018 (r485231, copy of r484879, head/devel/p4/files/patch-net_netsslcredentials.cc) @@ -0,0 +1,23 @@ +--- net/netsslcredentials.cc.orig 2018-02-05 20:46:46.000000000 +0000 ++++ net/netsslcredentials.cc 2018-11-08 16:32:39.241553000 +0000 +@@ -42,6 +42,7 @@ extern "C" + # include + # include + # include ++# include + } + # include + # include "netdebug.h" +@@ -218,7 +219,11 @@ NetSslCredentials::ReadCredentials( Error *e ) + privateKey = PEM_read_PrivateKey(fp, NULL, 0, NULL ); + SSLNULLHANDLER( privateKey, e, "NetSslCredentials::ReadCredentials PEM_read_PrivateKey", failSetError ); + // verify that RSA key ++#if OPENSSL_VERSION_NUMBER < 0x10100000L + if (privateKey->type != EVP_PKEY_RSA) ++#else ++ if (EVP_PKEY_base_id(privateKey) != EVP_PKEY_RSA) ++#endif + { + e->Set( MsgRpc::SslKeyNotRSA ); + goto fail; + Modified: branches/2018Q4/devel/subversion/files/extra-patch-fbsd-template ============================================================================== --- branches/2018Q4/devel/subversion/files/extra-patch-fbsd-template Sun Nov 18 15:55:33 2018 (r485230) +++ branches/2018Q4/devel/subversion/files/extra-patch-fbsd-template Sun Nov 18 16:06:28 2018 (r485231) @@ -1,5 +1,5 @@ ---- subversion/svn/util.c.orig 2015-02-28 13:37:27.000000000 +0300 -+++ subversion/svn/util.c 2016-03-19 16:53:13.016472654 +0300 +--- subversion/svn/util.c.orig 2015-02-28 10:37:27 UTC ++++ subversion/svn/util.c @@ -66,6 +66,9 @@ #include "private/svn_client_private.h" #include "private/svn_cmdline_private.h" @@ -10,7 +10,7 @@ -@@ -331,6 +334,71 @@ +@@ -331,6 +334,72 @@ truncate_buffer_at_prefix(apr_size_t *new_len, } @@ -32,6 +32,7 @@ + "Relnotes:", + "Security:", + "Sponsored by:", ++ "Pull Request:", + "Differential Revision:", +}; + @@ -82,15 +83,15 @@ #define EDITOR_EOF_PREFIX _("--This line, and those below, will be ignored--") svn_error_t * -@@ -343,11 +411,56 @@ +@@ -343,11 +412,58 @@ svn_cl__get_log_message(const char **log_msg, svn_stringbuf_t *default_msg = NULL; struct log_msg_baton *lmb = baton; svn_stringbuf_t *message = NULL; + svn_config_t *cfg; + const char *mfc_after, *sponsored_by; -+ -+ cfg = lmb->config ? svn_hash_gets(lmb->config, SVN_CONFIG_CATEGORY_CONFIG) : NULL; ++ cfg = lmb->config ? svn_hash_gets(lmb->config, SVN_CONFIG_CATEGORY_CONFIG) : NULL; ++ /* Set default message. */ default_msg = svn_stringbuf_create(APR_EOL_STR, pool); + svn_stringbuf_appendcstr(default_msg, APR_EOL_STR); @@ -118,6 +119,7 @@ + if (sponsored_by != NULL) + svn_stringbuf_appendcstr(default_msg, sponsored_by); + svn_stringbuf_appendcstr(default_msg, APR_EOL_STR); ++ svn_stringbuf_appendcstr(default_msg, "Pull Request:\t" APR_EOL_STR); + svn_stringbuf_appendcstr(default_msg, "Differential Revision:\t" APR_EOL_STR); svn_stringbuf_appendcstr(default_msg, EDITOR_EOF_PREFIX); - svn_stringbuf_appendcstr(default_msg, APR_EOL_STR APR_EOL_STR); @@ -134,13 +136,14 @@ + svn_stringbuf_appendcstr(default_msg, "> Relnotes: Set to 'yes' for mention in release notes." APR_EOL_STR); + svn_stringbuf_appendcstr(default_msg, "> Security: Vulnerability reference (one per line) or description." APR_EOL_STR); + svn_stringbuf_appendcstr(default_msg, "> Sponsored by: If the change was sponsored by an organization." APR_EOL_STR); ++ svn_stringbuf_appendcstr(default_msg, "> Pull Request: https://github.com/freebsd/freebsd/pull/### (*full* GitHub URL needed)." APR_EOL_STR); + svn_stringbuf_appendcstr(default_msg, "> Differential Revision: https://reviews.freebsd.org/D### (*full* phabric URL needed)." APR_EOL_STR); + svn_stringbuf_appendcstr(default_msg, "> Empty fields above will be automatically removed." APR_EOL_STR); + svn_stringbuf_appendcstr(default_msg, APR_EOL_STR); *tmp_file = NULL; if (lmb->message) -@@ -362,6 +475,7 @@ +@@ -362,6 +478,7 @@ svn_cl__get_log_message(const char **log_msg, /* Strip off the EOF marker text and the junk that follows it. */ truncate_buffer_at_prefix(&(log_msg_str->len), (char *)log_msg_str->data, EDITOR_EOF_PREFIX); @@ -148,7 +151,7 @@ *log_msg = log_msg_str->data; return SVN_NO_ERROR; -@@ -472,6 +586,13 @@ +@@ -472,6 +589,13 @@ svn_cl__get_log_message(const char **log_msg, if (message) truncate_buffer_at_prefix(&message->len, message->data, EDITOR_EOF_PREFIX); From owner-svn-ports-branches@freebsd.org Mon Nov 19 02:04:12 2018 Return-Path: Delivered-To: svn-ports-branches@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 3143A112FC25; Mon, 19 Nov 2018 02:04:12 +0000 (UTC) (envelope-from jbeich@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id C807B7B839; Mon, 19 Nov 2018 02:04:11 +0000 (UTC) (envelope-from jbeich@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 8D56A1BAE1; Mon, 19 Nov 2018 02:04:11 +0000 (UTC) (envelope-from jbeich@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id wAJ24BEZ086394; Mon, 19 Nov 2018 02:04:11 GMT (envelope-from jbeich@FreeBSD.org) Received: (from jbeich@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id wAJ24AOx086390; Mon, 19 Nov 2018 02:04:10 GMT (envelope-from jbeich@FreeBSD.org) Message-Id: <201811190204.wAJ24AOx086390@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: jbeich set sender to jbeich@FreeBSD.org using -f From: Jan Beich Date: Mon, 19 Nov 2018 02:04:10 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r485297 - in branches/2018Q4: devel/py-game_sdl2 games/renpy X-SVN-Group: ports-branches X-SVN-Commit-Author: jbeich X-SVN-Commit-Paths: in branches/2018Q4: devel/py-game_sdl2 games/renpy X-SVN-Commit-Revision: 485297 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Rspamd-Queue-Id: C807B7B839 X-Spamd-Result: default: False [0.39 / 15.00]; local_wl_from(0.00)[FreeBSD.org]; NEURAL_SPAM_MEDIUM(0.15)[0.147,0]; ASN(0.00)[asn:11403, ipnet:2610:1c1:1::/48, country:US]; NEURAL_SPAM_SHORT(0.25)[0.245,0] X-Rspamd-Server: mx1.freebsd.org X-BeenThere: svn-ports-branches@freebsd.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: SVN commit messages for all the branches of the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 19 Nov 2018 02:04:12 -0000 Author: jbeich Date: Mon Nov 19 02:04:10 2018 New Revision: 485297 URL: https://svnweb.freebsd.org/changeset/ports/485297 Log: MFH: r485224 devel/renpy: update to 7.1.3 Changes: https://www.renpy.org/release/7.1.3 (see Announcment) Changes: https://www.renpy.org/doc/html/changelog.html#renpy-7-1-3 Approved by: ports-secteam (miwi) Modified: branches/2018Q4/devel/py-game_sdl2/Makefile branches/2018Q4/devel/py-game_sdl2/distinfo branches/2018Q4/games/renpy/Makefile branches/2018Q4/games/renpy/distinfo Directory Properties: branches/2018Q4/ (props changed) Modified: branches/2018Q4/devel/py-game_sdl2/Makefile ============================================================================== --- branches/2018Q4/devel/py-game_sdl2/Makefile Mon Nov 19 01:52:39 2018 (r485296) +++ branches/2018Q4/devel/py-game_sdl2/Makefile Mon Nov 19 02:04:10 2018 (r485297) @@ -1,7 +1,7 @@ # $FreeBSD$ PORTNAME= game_sdl2 -PORTVERSION= 7.1.1 +PORTVERSION= 7.1.3 CATEGORIES= devel python MASTER_SITES= http://www.renpy.org/dl/${PORTVERSION}/ \ GENTOO Modified: branches/2018Q4/devel/py-game_sdl2/distinfo ============================================================================== --- branches/2018Q4/devel/py-game_sdl2/distinfo Mon Nov 19 01:52:39 2018 (r485296) +++ branches/2018Q4/devel/py-game_sdl2/distinfo Mon Nov 19 02:04:10 2018 (r485297) @@ -1,3 +1,3 @@ -TIMESTAMP = 1539146356 -SHA256 (pygame_sdl2-2.1.0-for-renpy-7.1.1.tar.gz) = 7237fac5ada6dba6de88305fb5d6538e7d55e2e36fdc8406ab2811272761d0ef -SIZE (pygame_sdl2-2.1.0-for-renpy-7.1.1.tar.gz) = 2697447 +TIMESTAMP = 1542522835 +SHA256 (pygame_sdl2-2.1.0-for-renpy-7.1.3.tar.gz) = a61db36be4f558df7a5e4b1632939f695b49d28fbecb77220ffe563c737e4f4e +SIZE (pygame_sdl2-2.1.0-for-renpy-7.1.3.tar.gz) = 2697454 Modified: branches/2018Q4/games/renpy/Makefile ============================================================================== --- branches/2018Q4/games/renpy/Makefile Mon Nov 19 01:52:39 2018 (r485296) +++ branches/2018Q4/games/renpy/Makefile Mon Nov 19 02:04:10 2018 (r485297) @@ -1,7 +1,7 @@ # $FreeBSD$ PORTNAME= renpy -PORTVERSION?= 7.1.1 +PORTVERSION?= 7.1.3 DISTVERSIONSUFFIX=-sdk PORTREVISION?= 0 CATEGORIES= games devel Modified: branches/2018Q4/games/renpy/distinfo ============================================================================== --- branches/2018Q4/games/renpy/distinfo Mon Nov 19 01:52:39 2018 (r485296) +++ branches/2018Q4/games/renpy/distinfo Mon Nov 19 02:04:10 2018 (r485297) @@ -1,3 +1,3 @@ -TIMESTAMP = 1539146238 -SHA256 (renpy-7.1.1-sdk.tar.bz2) = 5f479d6e7a25f5452e083fe25e016db81d962697139536be598c6c978fd09927 -SIZE (renpy-7.1.1-sdk.tar.bz2) = 92719028 +TIMESTAMP = 1542522656 +SHA256 (renpy-7.1.3-sdk.tar.bz2) = f6f542d1a3e07b48ed7955d6ebfc6e8ec2ab69632145931ecb85e2fa202545ce +SIZE (renpy-7.1.3-sdk.tar.bz2) = 92536390 From owner-svn-ports-branches@freebsd.org Mon Nov 19 02:04:54 2018 Return-Path: Delivered-To: svn-ports-branches@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 52A67112FCD3; Mon, 19 Nov 2018 02:04:54 +0000 (UTC) (envelope-from jbeich@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id E70747B94C; Mon, 19 Nov 2018 02:04:53 +0000 (UTC) (envelope-from jbeich@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id C8D2D1BAE3; Mon, 19 Nov 2018 02:04:53 +0000 (UTC) (envelope-from jbeich@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id wAJ24rHF086551; Mon, 19 Nov 2018 02:04:53 GMT (envelope-from jbeich@FreeBSD.org) Received: (from jbeich@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id wAJ24rfG086550; Mon, 19 Nov 2018 02:04:53 GMT (envelope-from jbeich@FreeBSD.org) Message-Id: <201811190204.wAJ24rfG086550@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: jbeich set sender to jbeich@FreeBSD.org using -f From: Jan Beich Date: Mon, 19 Nov 2018 02:04:53 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r485298 - branches/2018Q4/multimedia/libmtp X-SVN-Group: ports-branches X-SVN-Commit-Author: jbeich X-SVN-Commit-Paths: branches/2018Q4/multimedia/libmtp X-SVN-Commit-Revision: 485298 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Rspamd-Queue-Id: E70747B94C X-Spamd-Result: default: False [0.38 / 15.00]; local_wl_from(0.00)[FreeBSD.org]; NEURAL_SPAM_SHORT(0.24)[0.237,0]; NEURAL_SPAM_MEDIUM(0.14)[0.139,0]; ASN(0.00)[asn:11403, ipnet:2610:1c1:1::/48, country:US] X-Rspamd-Server: mx1.freebsd.org X-BeenThere: svn-ports-branches@freebsd.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: SVN commit messages for all the branches of the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 19 Nov 2018 02:04:54 -0000 Author: jbeich Date: Mon Nov 19 02:04:53 2018 New Revision: 485298 URL: https://svnweb.freebsd.org/changeset/ports/485298 Log: MFH: r483237 multimedia/libmtp: update to 1.1.16 Changes: https://sourceforge.net/p/libmtp/mailman/message/36452265/ ABI: https://abi-laboratory.pro/tracker/timeline/libmtp/ Reported by: portscout Approved by: ports-secteam (miwi) Modified: branches/2018Q4/multimedia/libmtp/Makefile branches/2018Q4/multimedia/libmtp/distinfo Directory Properties: branches/2018Q4/ (props changed) Modified: branches/2018Q4/multimedia/libmtp/Makefile ============================================================================== --- branches/2018Q4/multimedia/libmtp/Makefile Mon Nov 19 02:04:10 2018 (r485297) +++ branches/2018Q4/multimedia/libmtp/Makefile Mon Nov 19 02:04:53 2018 (r485298) @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= libmtp -PORTVERSION= 1.1.15 +PORTVERSION= 1.1.16 CATEGORIES= multimedia audio MASTER_SITES= SF Modified: branches/2018Q4/multimedia/libmtp/distinfo ============================================================================== --- branches/2018Q4/multimedia/libmtp/distinfo Mon Nov 19 02:04:10 2018 (r485297) +++ branches/2018Q4/multimedia/libmtp/distinfo Mon Nov 19 02:04:53 2018 (r485298) @@ -1,3 +1,3 @@ -TIMESTAMP = 1521889450 -SHA256 (libmtp-1.1.15.tar.gz) = d040900b46757e311b1fb3bfa8c05db09c8b6811e044bce8c88c9f3f6d3a3021 -SIZE (libmtp-1.1.15.tar.gz) = 805983 +TIMESTAMP = 1540659484 +SHA256 (libmtp-1.1.16.tar.gz) = 5b68f9dd1ed38de558de687f40e255a39e4d5e32ef3de601f0ac19dd5682bba0 +SIZE (libmtp-1.1.16.tar.gz) = 820516 From owner-svn-ports-branches@freebsd.org Mon Nov 19 03:38:03 2018 Return-Path: Delivered-To: svn-ports-branches@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 78BA511326A2; Mon, 19 Nov 2018 03:38:03 +0000 (UTC) (envelope-from truckman@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 17FD67F4FD; Mon, 19 Nov 2018 03:38:03 +0000 (UTC) (envelope-from truckman@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id E5E111CA3E; Mon, 19 Nov 2018 03:38:02 +0000 (UTC) (envelope-from truckman@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id wAJ3c25q034241; Mon, 19 Nov 2018 03:38:02 GMT (envelope-from truckman@FreeBSD.org) Received: (from truckman@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id wAJ3c2FW034239; Mon, 19 Nov 2018 03:38:02 GMT (envelope-from truckman@FreeBSD.org) Message-Id: <201811190338.wAJ3c2FW034239@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: truckman set sender to truckman@FreeBSD.org using -f From: Don Lewis Date: Mon, 19 Nov 2018 03:38:02 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r485301 - branches/2018Q4/editors/openoffice-4 X-SVN-Group: ports-branches X-SVN-Commit-Author: truckman X-SVN-Commit-Paths: branches/2018Q4/editors/openoffice-4 X-SVN-Commit-Revision: 485301 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Rspamd-Queue-Id: 17FD67F4FD X-Spamd-Result: default: False [0.39 / 15.00]; local_wl_from(0.00)[FreeBSD.org]; NEURAL_SPAM_SHORT(0.25)[0.248,0]; NEURAL_SPAM_MEDIUM(0.15)[0.147,0]; ASN(0.00)[asn:11403, ipnet:2610:1c1:1::/48, country:US] X-Rspamd-Server: mx1.freebsd.org X-BeenThere: svn-ports-branches@freebsd.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: SVN commit messages for all the branches of the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 19 Nov 2018 03:38:03 -0000 Author: truckman Date: Mon Nov 19 03:38:02 2018 New Revision: 485301 URL: https://svnweb.freebsd.org/changeset/ports/485301 Log: MFH: r485282 Upgrade editors/openoffice-4 to version 4.1.6: * Fixed bugs which caused improper handling (crashes) when using Microsoft Drawing Binary File format * Fix a loop that visits all objects on a page so that all objects get visited * Updated logos Release notes: https://s.apache.org/AOO-416releasenotes Pet portlint (add missing USES= entries). Approved by: ports-secteam (miwi) Modified: branches/2018Q4/editors/openoffice-4/Makefile branches/2018Q4/editors/openoffice-4/distinfo Directory Properties: branches/2018Q4/ (props changed) Modified: branches/2018Q4/editors/openoffice-4/Makefile ============================================================================== --- branches/2018Q4/editors/openoffice-4/Makefile Mon Nov 19 02:21:10 2018 (r485300) +++ branches/2018Q4/editors/openoffice-4/Makefile Mon Nov 19 03:38:02 2018 (r485301) @@ -3,9 +3,8 @@ PORTNAME= apache-openoffice PORTVERSION= ${AOOVERSION} -PORTREVISION= 10 CATEGORIES= editors java -MASTER_SITES= APACHE/openoffice/${PORTVERSION}/sources \ +MASTER_SITES= APACHE/openoffice/${PORTVERSION}/source \ http://tools.openoffice.org/unowinreg_prebuild/680/:unoreg \ LOCAL/truckman/openoffice:extsrc .if defined(LANG_PKGNAME) @@ -96,10 +95,9 @@ RUN_DEPENDS= \ ${LOCALBASE}/share/fonts/Carlito/Carlito-Bold.ttf:x11-fonts/crosextrafonts-carlito-ttf \ ${LOCALBASE}/share/fonts/ChromeOS/Arimo-Bold.ttf:x11-fonts/croscorefonts-fonts-ttf -USES= autoreconf bison compiler:c++11-lib cpe \ - desktop-file-utils \ - gettext-runtime gmake iconv jpeg perl5 pkgconfig python:2.7 \ - shared-mime-info ssl tar:bzip2 +USES= autoreconf bison compiler:c++11-lib cpe desktop-file-utils \ + gettext-runtime gl gmake gnome iconv jpeg perl5 pkgconfig \ + python:2.7 shared-mime-info ssl tar:bzip2 USE_GL= gl glu USE_GNOME= gtk20 libxslt libidl glib20 USE_JAVA= yes @@ -115,10 +113,10 @@ CONFLICTS_INSTALL= apache-openoffice-devel-* AOOVERSION1= 4 AOOVERSION2= 1 -AOOVERSION3= 5 +AOOVERSION3= 6 # From solenv/inc/minor.mk SOURCEREVISION LAST_MINOR BUILD -AOOTAG= AOO415m1\(Build:9789\) -SVNREVISION= 1817496 +AOOTAG= AOO416m1\(Build:9790\) +SVNREVISION= 1844436 EXTSRC= ApacheOpenOffice.ext_sources.${AOOVERSION1}.x.x.20150707.tar.gz AOOVERSION= ${AOOVERSION1}.${AOOVERSION2}.${AOOVERSION3} Modified: branches/2018Q4/editors/openoffice-4/distinfo ============================================================================== --- branches/2018Q4/editors/openoffice-4/distinfo Mon Nov 19 02:21:10 2018 (r485300) +++ branches/2018Q4/editors/openoffice-4/distinfo Mon Nov 19 03:38:02 2018 (r485301) @@ -1,7 +1,5 @@ -TIMESTAMP = 1513127206 -SHA256 (openoffice/apache-openoffice-4.1.5-r1817496-src.tar.bz2) = e0d77e762a1554f2a08d0f12c9a958b87632e8adede5c5bafba0bb94d8c96a65 -SIZE (openoffice/apache-openoffice-4.1.5-r1817496-src.tar.bz2) = 219094040 -SHA256 (openoffice/unowinreg.dll) = f563e522922133db9340b0306711c2d8767cc3481dd9e7d9b0d059906d12653c -SIZE (openoffice/unowinreg.dll) = 6144 +TIMESTAMP = 1542135943 +SHA256 (openoffice/apache-openoffice-4.1.6-r1844436-src.tar.bz2) = 5189880207977a0fd6d4ef5eada7d18d8dbf94cddcc71822889cfb6c82cfed18 +SIZE (openoffice/apache-openoffice-4.1.6-r1844436-src.tar.bz2) = 220017032 SHA256 (openoffice/ApacheOpenOffice.ext_sources.4.x.x.20150707.tar.gz) = 966a8333c83a18ddd84401389006d6e0b52b8175924b808b54b88211669985fa SIZE (openoffice/ApacheOpenOffice.ext_sources.4.x.x.20150707.tar.gz) = 28957004 From owner-svn-ports-branches@freebsd.org Mon Nov 19 10:13:32 2018 Return-Path: Delivered-To: svn-ports-branches@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 0F971113B23F; Mon, 19 Nov 2018 10:13:32 +0000 (UTC) (envelope-from joneum@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id A89E66EFED; Mon, 19 Nov 2018 10:13:31 +0000 (UTC) (envelope-from joneum@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 852D820B10; Mon, 19 Nov 2018 10:13:31 +0000 (UTC) (envelope-from joneum@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id wAJADVDn039130; Mon, 19 Nov 2018 10:13:31 GMT (envelope-from joneum@FreeBSD.org) Received: (from joneum@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id wAJADVsc039129; Mon, 19 Nov 2018 10:13:31 GMT (envelope-from joneum@FreeBSD.org) Message-Id: <201811191013.wAJADVsc039129@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: joneum set sender to joneum@FreeBSD.org using -f From: Jochen Neumeister Date: Mon, 19 Nov 2018 10:13:31 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r485311 - in branches/2018Q4/dns/powerdns-recursor: . files X-SVN-Group: ports-branches X-SVN-Commit-Author: joneum X-SVN-Commit-Paths: in branches/2018Q4/dns/powerdns-recursor: . files X-SVN-Commit-Revision: 485311 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Rspamd-Queue-Id: A89E66EFED X-Spamd-Result: default: False [0.34 / 15.00]; local_wl_from(0.00)[FreeBSD.org]; NEURAL_SPAM_SHORT(0.20)[0.204,0]; NEURAL_SPAM_MEDIUM(0.14)[0.139,0]; ASN(0.00)[asn:11403, ipnet:2610:1c1:1::/48, country:US] X-Rspamd-Server: mx1.freebsd.org X-BeenThere: svn-ports-branches@freebsd.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: SVN commit messages for all the branches of the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 19 Nov 2018 10:13:32 -0000 Author: joneum Date: Mon Nov 19 10:13:30 2018 New Revision: 485311 URL: https://svnweb.freebsd.org/changeset/ports/485311 Log: MFH: r485222 Update to 4.1.7 Changelog: https://doc.powerdns.com/recursor/changelog/4.1.html#change-4.1.7 PR: 233140 Submitted by: Ralf van der Enden (maintainer) Security: e9aa0e4c-ea8b-11e8-a5b7-00e04c1ea73d Sponsored by: Netzkommune GmbH Approved by: ports-secteam (miwi) Deleted: branches/2018Q4/dns/powerdns-recursor/files/patch-opensslsigners.cc Modified: branches/2018Q4/dns/powerdns-recursor/Makefile branches/2018Q4/dns/powerdns-recursor/distinfo Directory Properties: branches/2018Q4/ (props changed) Modified: branches/2018Q4/dns/powerdns-recursor/Makefile ============================================================================== --- branches/2018Q4/dns/powerdns-recursor/Makefile Mon Nov 19 09:52:46 2018 (r485310) +++ branches/2018Q4/dns/powerdns-recursor/Makefile Mon Nov 19 10:13:30 2018 (r485311) @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= recursor -DISTVERSION= 4.1.4 +DISTVERSION= 4.1.7 CATEGORIES= dns ipv6 MASTER_SITES= http://downloads.powerdns.com/releases/ PKGNAMEPREFIX= powerdns- Modified: branches/2018Q4/dns/powerdns-recursor/distinfo ============================================================================== --- branches/2018Q4/dns/powerdns-recursor/distinfo Mon Nov 19 09:52:46 2018 (r485310) +++ branches/2018Q4/dns/powerdns-recursor/distinfo Mon Nov 19 10:13:30 2018 (r485311) @@ -1,3 +1,3 @@ -TIMESTAMP = 1535813031 -SHA256 (pdns-recursor-4.1.4.tar.bz2) = b19f4353bea3fe54a581a4e7ace101637f8474f5ebfe925e2d3ff4910b71b550 -SIZE (pdns-recursor-4.1.4.tar.bz2) = 1224360 +TIMESTAMP = 1542545089 +SHA256 (pdns-recursor-4.1.7.tar.bz2) = 9a045cfd1d3b195f3166170c2cb120bea08926c6474ebc67e8020edf1deddb6b +SIZE (pdns-recursor-4.1.7.tar.bz2) = 1237866 From owner-svn-ports-branches@freebsd.org Mon Nov 19 16:17:51 2018 Return-Path: Delivered-To: svn-ports-branches@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 020B31108996; Mon, 19 Nov 2018 16:17:51 +0000 (UTC) (envelope-from joneum@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id A6F057D197; Mon, 19 Nov 2018 16:17:50 +0000 (UTC) (envelope-from joneum@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 87CDB245F6; Mon, 19 Nov 2018 16:17:50 +0000 (UTC) (envelope-from joneum@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id wAJGHomj025349; Mon, 19 Nov 2018 16:17:50 GMT (envelope-from joneum@FreeBSD.org) Received: (from joneum@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id wAJGHoNo025346; Mon, 19 Nov 2018 16:17:50 GMT (envelope-from joneum@FreeBSD.org) Message-Id: <201811191617.wAJGHoNo025346@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: joneum set sender to joneum@FreeBSD.org using -f From: Jochen Neumeister Date: Mon, 19 Nov 2018 16:17:50 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r485329 - in branches/2018Q4/dns/powerdns-recursor40: . files X-SVN-Group: ports-branches X-SVN-Commit-Author: joneum X-SVN-Commit-Paths: in branches/2018Q4/dns/powerdns-recursor40: . files X-SVN-Commit-Revision: 485329 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Rspamd-Queue-Id: A6F057D197 X-Spamd-Result: default: False [0.63 / 15.00]; local_wl_from(0.00)[FreeBSD.org]; NEURAL_SPAM_SHORT(0.57)[0.573,0]; NEURAL_SPAM_MEDIUM(0.05)[0.055,0]; ASN(0.00)[asn:11403, ipnet:2610:1c1:1::/48, country:US] X-Rspamd-Server: mx1.freebsd.org X-BeenThere: svn-ports-branches@freebsd.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: SVN commit messages for all the branches of the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 19 Nov 2018 16:17:51 -0000 Author: joneum Date: Mon Nov 19 16:17:49 2018 New Revision: 485329 URL: https://svnweb.freebsd.org/changeset/ports/485329 Log: MFH: r485315 Update to 4.0.9 Changelog: https://doc.powerdns.com/recursor/changelog/4.0.html Expiration date is 2018-12-31 Please migrate to Version 4.1.x dns/powerdns-recursor PR: 233141 Submitted by: Ralf van der Enden (maintainer) Security: e9aa0e4c-ea8b-11e8-a5b7-00e04c1ea73d Sponsored by: Netzkommune GmbH Approved by: ports-secteam (miwi) Modified: branches/2018Q4/dns/powerdns-recursor40/Makefile branches/2018Q4/dns/powerdns-recursor40/distinfo branches/2018Q4/dns/powerdns-recursor40/files/patch-boost-1.67 Directory Properties: branches/2018Q4/ (props changed) Modified: branches/2018Q4/dns/powerdns-recursor40/Makefile ============================================================================== --- branches/2018Q4/dns/powerdns-recursor40/Makefile Mon Nov 19 16:17:21 2018 (r485328) +++ branches/2018Q4/dns/powerdns-recursor40/Makefile Mon Nov 19 16:17:49 2018 (r485329) @@ -2,8 +2,8 @@ # $FreeBSD$ PORTNAME= recursor -DISTVERSION= 4.0.8 -PORTREVISION= 7 +DISTVERSION= 4.0.9 +PORTREVISION?= 0 CATEGORIES= dns ipv6 MASTER_SITES= http://downloads.powerdns.com/releases/ PKGNAMEPREFIX= powerdns- @@ -14,6 +14,9 @@ MAINTAINER= tremere@cainites.net COMMENT= Advanced DNS recursor LICENSE= GPLv2 + +DEPRECATED= FreeBSD 10.3 has reached EoL since 2018-04-30; users should upgrade and use dns/powerdns-recursor instead +EXPIRATION_DATE= 2018-12-31 BROKEN_armv6= fails to compile: use of overloaded operator << is ambiguous BROKEN_armv7= fails to compile: use of overloaded operator << is ambiguous Modified: branches/2018Q4/dns/powerdns-recursor40/distinfo ============================================================================== --- branches/2018Q4/dns/powerdns-recursor40/distinfo Mon Nov 19 16:17:21 2018 (r485328) +++ branches/2018Q4/dns/powerdns-recursor40/distinfo Mon Nov 19 16:17:49 2018 (r485329) @@ -1,3 +1,3 @@ -TIMESTAMP = 1513108912 -SHA256 (pdns-recursor-4.0.8.tar.bz2) = 9c6ff00f0e26044b0c81f1a8304743b4fc0f6699a356fce28cc8c2e6aaf16513 -SIZE (pdns-recursor-4.0.8.tar.bz2) = 1071831 +TIMESTAMP = 1541587471 +SHA256 (pdns-recursor-4.0.9.tar.bz2) = a4d8cf2401488c0a2d9c5f97bb6ebf135243edf2272aa66aa3855f94551fe8b8 +SIZE (pdns-recursor-4.0.9.tar.bz2) = 1117598 Modified: branches/2018Q4/dns/powerdns-recursor40/files/patch-boost-1.67 ============================================================================== --- branches/2018Q4/dns/powerdns-recursor40/files/patch-boost-1.67 Mon Nov 19 16:17:21 2018 (r485328) +++ branches/2018Q4/dns/powerdns-recursor40/files/patch-boost-1.67 Mon Nov 19 16:17:49 2018 (r485329) @@ -1,8 +1,8 @@ https://github.com/PowerDNS/pdns/commit/e6a9dde524b5 ---- arguments.cc.orig 2017-12-11 10:38:52 UTC +--- arguments.cc.orig 2018-11-06 14:56:58 UTC +++ arguments.cc -@@ -443,7 +443,7 @@ bool ArgvMap::file(const char *fname, bool lax, bool i +@@ -443,7 +443,7 @@ bool ArgvMap::file(const char *fname, bo set("include-dir","Directory to include configuration files from"); if(!parseFile(fname, "", lax)) { @@ -11,7 +11,7 @@ https://github.com/PowerDNS/pdns/commit/e6a9dde524b5 return false; } -@@ -453,7 +453,7 @@ bool ArgvMap::file(const char *fname, bool lax, bool i +@@ -453,7 +453,7 @@ bool ArgvMap::file(const char *fname, bo gatherIncludes(extraConfigs); for(const std::string& fn : extraConfigs) { if (!file(fn.c_str(), lax, true)) { @@ -20,7 +20,7 @@ https://github.com/PowerDNS/pdns/commit/e6a9dde524b5 throw ArgException(fn + " could not be parsed"); } } -@@ -471,18 +471,18 @@ void ArgvMap::gatherIncludes(std::vector +@@ -471,18 +471,18 @@ void ArgvMap::gatherIncludes(std::vector // stat if (stat(params["include-dir"].c_str(), &st)) { @@ -42,7 +42,7 @@ https://github.com/PowerDNS/pdns/commit/e6a9dde524b5 throw ArgException(params["include-dir"] + " is not accessible"); } -@@ -494,7 +494,7 @@ void ArgvMap::gatherIncludes(std::vector +@@ -494,7 +494,7 @@ void ArgvMap::gatherIncludes(std::vector namebuf << params["include-dir"].c_str() << "/" << ent->d_name; // FIXME: Use some path separator // ensure it's readable file if (stat(namebuf.str().c_str(), &st) || !S_ISREG(st.st_mode)) { @@ -51,9 +51,9 @@ https://github.com/PowerDNS/pdns/commit/e6a9dde524b5 closedir(dir); throw ArgException(namebuf.str() + " does not exist!"); } ---- dns.hh.orig 2017-12-11 10:38:52 UTC +--- dns.hh.orig 2018-11-06 14:56:58 UTC +++ dns.hh -@@ -241,7 +241,6 @@ inline uint16_t * getFlagsFromDNSHeader(struct dnshead +@@ -241,7 +241,6 @@ inline uint16_t * getFlagsFromDNSHeader( #define FLAGS_CD_OFFSET (12) #endif @@ -61,9 +61,9 @@ https://github.com/PowerDNS/pdns/commit/e6a9dde524b5 extern time_t s_starttime; uint32_t hashQuestion(const char* packet, uint16_t len, uint32_t init); ---- gss_context.cc.orig 2017-12-11 10:38:52 UTC +--- gss_context.cc.orig 2018-11-06 14:56:58 UTC +++ gss_context.cc -@@ -456,17 +456,17 @@ bool gss_add_signature(const DNSName& context, const s +@@ -456,17 +456,17 @@ bool gss_add_signature(const DNSName& co string tmp_mac; GssContext gssctx(context); if (!gssctx.valid()) { @@ -85,7 +85,7 @@ https://github.com/PowerDNS/pdns/commit/e6a9dde524b5 } return false; } -@@ -477,17 +477,17 @@ bool gss_add_signature(const DNSName& context, const s +@@ -477,17 +477,17 @@ bool gss_add_signature(const DNSName& co bool gss_verify_signature(const DNSName& context, const std::string& message, const std::string& mac) { GssContext gssctx(context); if (!gssctx.valid()) { @@ -107,7 +107,7 @@ https://github.com/PowerDNS/pdns/commit/e6a9dde524b5 } return false; } ---- logger.cc.orig 2017-12-11 10:38:52 UTC +--- logger.cc.orig 2018-11-06 14:56:58 UTC +++ logger.cc @@ -32,15 +32,9 @@ extern StatBag S; #include "namespaces.hh" @@ -127,7 +127,7 @@ https://github.com/PowerDNS/pdns/commit/e6a9dde524b5 void Logger::log(const string &msg, Urgency u) { -@@ -102,7 +96,7 @@ void Logger::setName(const string &_name) +@@ -102,7 +96,7 @@ void Logger::setName(const string &_name void Logger::initKey() { @@ -136,7 +136,7 @@ https://github.com/PowerDNS/pdns/commit/e6a9dde524b5 unixDie("Creating thread key for logger"); } -@@ -137,13 +131,13 @@ void Logger::perThreadDestructor(void* buf) +@@ -137,13 +131,13 @@ void Logger::perThreadDestructor(void* b Logger::PerThread* Logger::getPerThread() { @@ -152,9 +152,9 @@ https://github.com/PowerDNS/pdns/commit/e6a9dde524b5 } return ret; } ---- logger.hh.orig 2017-12-11 10:38:52 UTC +--- logger.hh.orig 2018-11-06 14:56:58 UTC +++ logger.hh -@@ -66,9 +66,9 @@ class Logger (public) +@@ -66,9 +66,9 @@ public: void resetFlags(){flags=0;open();} //!< zero the flags /** Use this to stream to your log, like this: \code @@ -167,7 +167,7 @@ https://github.com/PowerDNS/pdns/commit/e6a9dde524b5 \endcode */ Logger& operator<<(const char *s); -@@ -108,10 +108,10 @@ class Logger (public) +@@ -108,10 +108,10 @@ private: bool opened; bool d_disableSyslog; static pthread_once_t s_once; @@ -180,9 +180,9 @@ https://github.com/PowerDNS/pdns/commit/e6a9dde524b5 #ifdef VERBOSELOG #define DLOG(x) x ---- lua-recursor4.cc.orig 2017-12-11 10:38:52 UTC +--- lua-recursor4.cc.orig 2018-11-06 14:56:58 UTC +++ lua-recursor4.cc -@@ -79,7 +79,6 @@ int RecursorLua4::gettag(const ComboAddress& remote, c +@@ -78,7 +78,6 @@ int RecursorLua4::gettag(const ComboAddr #else @@ -190,7 +190,7 @@ https://github.com/PowerDNS/pdns/commit/e6a9dde524b5 #include "ext/luawrapper/include/LuaContext.hpp" static int followCNAMERecords(vector& ret, const QType& qtype) -@@ -310,7 +309,7 @@ RecursorLua4::RecursorLua4(const std::string& fname) +@@ -309,7 +308,7 @@ RecursorLua4::RecursorLua4(const std::st cas.insert(boost::get(in)); } } @@ -199,7 +199,7 @@ https://github.com/PowerDNS/pdns/commit/e6a9dde524b5 }); d_lw->registerFunction("check",[](const cas_t& cas, const ComboAddress&ca) { -@@ -464,7 +463,7 @@ RecursorLua4::RecursorLua4(const std::string& fname) +@@ -463,7 +462,7 @@ RecursorLua4::RecursorLua4(const std::st } } catch(std::exception& e) { @@ -208,7 +208,7 @@ https://github.com/PowerDNS/pdns/commit/e6a9dde524b5 } } ); -@@ -474,7 +473,7 @@ RecursorLua4::RecursorLua4(const std::string& fname) +@@ -473,7 +472,7 @@ RecursorLua4::RecursorLua4(const std::st d_lw->writeFunction("pdnslog", [](const std::string& msg, boost::optional loglevel) { @@ -217,7 +217,7 @@ https://github.com/PowerDNS/pdns/commit/e6a9dde524b5 }); typedef vector > in_t; vector > > pd{ -@@ -650,7 +649,7 @@ loop:; +@@ -649,7 +648,7 @@ loop:; dq->udpAnswer = GenUDPQueryResponse(dq->udpQueryDest, dq->udpQuery); auto cbFunc = d_lw->readVariable>(dq->udpCallback).get_value_or(0); if(!cbFunc) { @@ -226,9 +226,9 @@ https://github.com/PowerDNS/pdns/commit/e6a9dde524b5 return false; } bool result=cbFunc(dq); ---- lwres.cc.orig 2017-12-11 10:38:52 UTC +--- lwres.cc.orig 2018-11-06 14:56:58 UTC +++ lwres.cc -@@ -236,7 +236,7 @@ int asyncresolve(const ComboAddress& ip, const DNSName +@@ -236,7 +236,7 @@ int asyncresolve(const ComboAddress& ip, if(domain != mdp.d_qname) { if(!mdp.d_qname.empty() && domain.toString().find((char)0) == string::npos /* ugly */) {// embedded nulls are too noisy, plus empty domains are too @@ -237,7 +237,7 @@ https://github.com/PowerDNS/pdns/commit/e6a9dde524b5 } // unexpected count has already been done @ pdns_recursor.cc goto out; -@@ -276,7 +276,7 @@ int asyncresolve(const ComboAddress& ip, const DNSName +@@ -276,7 +276,7 @@ int asyncresolve(const ComboAddress& ip, } catch(std::exception &mde) { if(::arg().mustDo("log-common-errors")) @@ -246,7 +246,7 @@ https://github.com/PowerDNS/pdns/commit/e6a9dde524b5 lwr->d_rcode = RCode::FormErr; g_stats.serverParseError++; #ifdef HAVE_PROTOBUF -@@ -287,7 +287,7 @@ int asyncresolve(const ComboAddress& ip, const DNSName +@@ -287,7 +287,7 @@ int asyncresolve(const ComboAddress& ip, return 1; // success - oddly enough } catch(...) { @@ -255,9 +255,9 @@ https://github.com/PowerDNS/pdns/commit/e6a9dde524b5 } g_stats.serverParseError++; ---- pdns_recursor.cc.orig 2017-12-11 10:38:52 UTC +--- pdns_recursor.cc.orig 2018-11-06 14:56:58 UTC +++ pdns_recursor.cc -@@ -347,12 +347,12 @@ void setSocketBuffer(int fd, int optname, uint32_t siz +@@ -347,12 +347,12 @@ void setSocketBuffer(int fd, int optname socklen_t len=sizeof(psize); if(!getsockopt(fd, SOL_SOCKET, optname, (char*)&psize, &len) && psize > size) { @@ -272,7 +272,7 @@ https://github.com/PowerDNS/pdns/commit/e6a9dde524b5 } -@@ -395,7 +395,7 @@ class UDPClientSocks (public) +@@ -395,7 +395,7 @@ public: closesocket(*fd); } catch(const PDNSException& e) { @@ -281,7 +281,7 @@ https://github.com/PowerDNS/pdns/commit/e6a9dde524b5 } if(err==ENETUNREACH) // Seth "My Interfaces Are Like A Yo Yo" Arnold special -@@ -433,7 +433,7 @@ class UDPClientSocks (public) +@@ -433,7 +433,7 @@ public: closesocket(*i); } catch(const PDNSException& e) { @@ -290,7 +290,7 @@ https://github.com/PowerDNS/pdns/commit/e6a9dde524b5 } d_socks.erase(i++); -@@ -549,7 +549,7 @@ int arecvfrom(char *data, size_t len, int flags, const +@@ -549,7 +549,7 @@ int arecvfrom(char *data, size_t len, in *d_len=packet.size(); memcpy(data,packet.c_str(),min(len,*d_len)); if(*nearMissLimit && pident.nearMisses > *nearMissLimit) { @@ -420,7 +420,7 @@ https://github.com/PowerDNS/pdns/commit/e6a9dde524b5 - L<d_remote.toStringWithPort()<<" failed with: "<d_remote.toStringWithPort()<<" failed with: "<insertResponsePacket(dc->d_tag, dc->d_mdp.d_qname, dc->d_mdp.d_qtype, dc->d_query, + t_packetCache->insertResponsePacket(dc->d_tag, dc->d_mdp.d_qname, dc->d_mdp.d_qtype, dc->d_mdp.d_qclass, dc->d_query, string((const char*)&*packet.begin(), packet.size()), @@ -1157,11 +1157,11 @@ void startDoResolve(void *p) bool hadError=true; @@ -483,7 +483,7 @@ https://github.com/PowerDNS/pdns/commit/e6a9dde524b5 } g_stats.maxMThreadStackUsage = max(MT->getMaxStackUsage(), g_stats.maxMThreadStackUsage); -@@ -1322,7 +1322,7 @@ void handleRunningTCPQuestion(int fd, FDMultiplexer::f +@@ -1322,7 +1322,7 @@ void handleRunningTCPQuestion(int fd, FD } if(!bytes || bytes < 0) { if(g_logCommonErrors) @@ -492,7 +492,7 @@ https://github.com/PowerDNS/pdns/commit/e6a9dde524b5 t_fdm->removeReadFD(fd); return; } -@@ -1330,7 +1330,7 @@ void handleRunningTCPQuestion(int fd, FDMultiplexer::f +@@ -1330,7 +1330,7 @@ void handleRunningTCPQuestion(int fd, FD else if(conn->state==TCPConnection::GETQUESTION) { ssize_t bytes=recv(conn->getFD(), conn->data + conn->bytesread, conn->qlen - conn->bytesread, 0); if(!bytes || bytes < 0 || bytes > std::numeric_limits::max()) { @@ -501,7 +501,7 @@ https://github.com/PowerDNS/pdns/commit/e6a9dde524b5 t_fdm->removeReadFD(fd); return; } -@@ -1345,7 +1345,7 @@ void handleRunningTCPQuestion(int fd, FDMultiplexer::f +@@ -1345,7 +1345,7 @@ void handleRunningTCPQuestion(int fd, FD catch(MOADNSException &mde) { g_stats.clientParseError++; if(g_logCommonErrors) @@ -510,7 +510,7 @@ https://github.com/PowerDNS/pdns/commit/e6a9dde524b5 return; } dc->d_tcpConnection = conn; // carry the torch -@@ -1381,14 +1381,14 @@ void handleRunningTCPQuestion(int fd, FDMultiplexer::f +@@ -1381,14 +1381,14 @@ void handleRunningTCPQuestion(int fd, FD } catch(std::exception& e) { if(g_logCommonErrors) @@ -527,7 +527,7 @@ https://github.com/PowerDNS/pdns/commit/e6a9dde524b5 } } #ifdef HAVE_PROTOBUF -@@ -1404,20 +1404,20 @@ void handleRunningTCPQuestion(int fd, FDMultiplexer::f +@@ -1404,20 +1404,20 @@ void handleRunningTCPQuestion(int fd, FD } catch(std::exception& e) { if(g_logCommonErrors) @@ -551,7 +551,7 @@ https://github.com/PowerDNS/pdns/commit/e6a9dde524b5 return; } else { -@@ -1443,7 +1443,7 @@ void handleNewTCPQuestion(int fd, FDMultiplexer::funcp +@@ -1443,7 +1443,7 @@ void handleNewTCPQuestion(int fd, FDMult closesocket(newsock); } catch(const PDNSException& e) { @@ -560,7 +560,7 @@ https://github.com/PowerDNS/pdns/commit/e6a9dde524b5 } return; } -@@ -1452,14 +1452,14 @@ void handleNewTCPQuestion(int fd, FDMultiplexer::funcp +@@ -1452,14 +1452,14 @@ void handleNewTCPQuestion(int fd, FDMult t_remotes->push_back(addr); if(t_allowFrom && !t_allowFrom->match(&addr)) { if(!g_quiet) @@ -577,7 +577,7 @@ https://github.com/PowerDNS/pdns/commit/e6a9dde524b5 } return; } -@@ -1469,7 +1469,7 @@ void handleNewTCPQuestion(int fd, FDMultiplexer::funcp +@@ -1469,7 +1469,7 @@ void handleNewTCPQuestion(int fd, FDMult closesocket(newsock); // don't call TCPConnection::closeAndCleanup here - did not enter it in the counts yet! } catch(const PDNSException& e) { @@ -586,7 +586,7 @@ https://github.com/PowerDNS/pdns/commit/e6a9dde524b5 } return; } -@@ -1547,14 +1547,14 @@ string* doProcessUDPQuestion(const std::string& questi +@@ -1547,14 +1547,14 @@ string* doProcessUDPQuestion(const std:: } catch(std::exception& e) { if(g_logCommonErrors) @@ -603,7 +603,7 @@ https://github.com/PowerDNS/pdns/commit/e6a9dde524b5 } } -@@ -1579,7 +1579,7 @@ string* doProcessUDPQuestion(const std::string& questi +@@ -1579,7 +1579,7 @@ string* doProcessUDPQuestion(const std:: } #endif /* HAVE_PROTOBUF */ if(!g_quiet) @@ -612,7 +612,7 @@ https://github.com/PowerDNS/pdns/commit/e6a9dde524b5 g_stats.packetCacheHits++; SyncRes::s_queries++; -@@ -1594,7 +1594,7 @@ string* doProcessUDPQuestion(const std::string& questi +@@ -1594,7 +1594,7 @@ string* doProcessUDPQuestion(const std:: addCMsgSrcAddr(&msgh, cbuf, &destaddr, 0); } if(sendmsg(fd, &msgh, 0) < 0 && g_logCommonErrors) @@ -621,7 +621,7 @@ https://github.com/PowerDNS/pdns/commit/e6a9dde524b5 if(response.length() >= sizeof(struct dnsheader)) { struct dnsheader tmpdh; -@@ -1606,14 +1606,14 @@ string* doProcessUDPQuestion(const std::string& questi +@@ -1606,14 +1606,14 @@ string* doProcessUDPQuestion(const std:: } } catch(std::exception& e) { @@ -638,7 +638,7 @@ https://github.com/PowerDNS/pdns/commit/e6a9dde524b5 g_stats.policyDrops++; return 0; } -@@ -1621,7 +1621,7 @@ string* doProcessUDPQuestion(const std::string& questi +@@ -1621,7 +1621,7 @@ string* doProcessUDPQuestion(const std:: if(MT->numProcesses() > g_maxMThreads) { if(!g_quiet) @@ -647,7 +647,7 @@ https://github.com/PowerDNS/pdns/commit/e6a9dde524b5 g_stats.overCapacityDrops++; return 0; -@@ -1672,7 +1672,7 @@ void handleNewUDPQuestion(int fd, FDMultiplexer::funcp +@@ -1672,7 +1672,7 @@ void handleNewUDPQuestion(int fd, FDMult if(t_allowFrom && !t_allowFrom->match(&fromaddr)) { if(!g_quiet) @@ -656,7 +656,7 @@ https://github.com/PowerDNS/pdns/commit/e6a9dde524b5 g_stats.unauthorizedUDP++; return; -@@ -1680,7 +1680,7 @@ void handleNewUDPQuestion(int fd, FDMultiplexer::funcp +@@ -1680,7 +1680,7 @@ void handleNewUDPQuestion(int fd, FDMult BOOST_STATIC_ASSERT(offsetof(sockaddr_in, sin_port) == offsetof(sockaddr_in6, sin6_port)); if(!fromaddr.sin4.sin_port) { // also works for IPv6 if(!g_quiet) @@ -665,7 +665,7 @@ https://github.com/PowerDNS/pdns/commit/e6a9dde524b5 g_stats.clientParseError++; // not quite the best place to put it, but needs to go somewhere return; -@@ -1691,12 +1691,12 @@ void handleNewUDPQuestion(int fd, FDMultiplexer::funcp +@@ -1691,12 +1691,12 @@ void handleNewUDPQuestion(int fd, FDMult if(dh->qr) { g_stats.ignoredCount++; if(g_logCommonErrors) @@ -680,7 +680,7 @@ https://github.com/PowerDNS/pdns/commit/e6a9dde524b5 } else { string question(data, (size_t)len); -@@ -1729,12 +1729,12 @@ void handleNewUDPQuestion(int fd, FDMultiplexer::funcp +@@ -1729,12 +1729,12 @@ void handleNewUDPQuestion(int fd, FDMult catch(MOADNSException& mde) { g_stats.clientParseError++; if(g_logCommonErrors) @@ -840,7 +840,7 @@ https://github.com/PowerDNS/pdns/commit/e6a9dde524b5 throw; } } -@@ -2140,11 +2140,11 @@ void handlePipeRequest(int fd, FDMultiplexer::funcpara +@@ -2140,11 +2140,11 @@ void handlePipeRequest(int fd, FDMultipl } catch(std::exception& e) { if(g_logCommonErrors) @@ -854,7 +854,7 @@ https://github.com/PowerDNS/pdns/commit/e6a9dde524b5 } if(tmsg->wantAnswer) { if(write(g_pipes[t_id].writeFromThread, &resp, sizeof(resp)) != sizeof(resp)) { -@@ -2245,10 +2245,10 @@ void handleRCC(int fd, FDMultiplexer::funcparam_t& var +@@ -2245,10 +2245,10 @@ void handleRCC(int fd, FDMultiplexer::fu command(); } catch(std::exception& e) { @@ -867,7 +867,7 @@ https://github.com/PowerDNS/pdns/commit/e6a9dde524b5 } } -@@ -2335,7 +2335,7 @@ void handleUDPServerResponse(int fd, FDMultiplexer::fu +@@ -2335,7 +2335,7 @@ void handleUDPServerResponse(int fd, FDM else { g_stats.serverParseError++; if(g_logCommonErrors) @@ -876,7 +876,7 @@ https://github.com/PowerDNS/pdns/commit/e6a9dde524b5 ": packet smaller than DNS header"<(boost::get(constGet(have, "zoneSizeHint")))); } } @@ -1380,7 +1380,7 @@ https://github.com/PowerDNS/pdns/commit/e6a9dde524b5 } }); -@@ -198,10 +198,10 @@ void loadRecursorLuaConfig(const std::string& fname, b +@@ -198,10 +198,10 @@ void loadRecursorLuaConfig(const std::st } } catch(std::exception& e) { @@ -1393,7 +1393,7 @@ https://github.com/PowerDNS/pdns/commit/e6a9dde524b5 } }); -@@ -234,7 +234,7 @@ void loadRecursorLuaConfig(const std::string& fname, b +@@ -234,7 +234,7 @@ void loadRecursorLuaConfig(const std::st } } catch(std::exception& e) { @@ -1402,7 +1402,7 @@ https://github.com/PowerDNS/pdns/commit/e6a9dde524b5 } }); -@@ -282,14 +282,14 @@ void loadRecursorLuaConfig(const std::string& fname, b +@@ -282,14 +282,14 @@ void loadRecursorLuaConfig(const std::st } } else { @@ -1420,7 +1420,7 @@ https://github.com/PowerDNS/pdns/commit/e6a9dde524b5 } }); -@@ -302,14 +302,14 @@ void loadRecursorLuaConfig(const std::string& fname, b +@@ -302,14 +302,14 @@ void loadRecursorLuaConfig(const std::st } } else { @@ -1438,7 +1438,7 @@ https://github.com/PowerDNS/pdns/commit/e6a9dde524b5 } }); #endif -@@ -319,22 +319,22 @@ void loadRecursorLuaConfig(const std::string& fname, b +@@ -319,22 +319,22 @@ void loadRecursorLuaConfig(const std::st g_luaconfs.setState(lci); } catch(const LuaContext::ExecutionErrorException& e) { @@ -1465,9 +1465,9 @@ https://github.com/PowerDNS/pdns/commit/e6a9dde524b5 throw; } ---- rec_channel_rec.cc.orig 2017-12-11 10:38:52 UTC +--- rec_channel_rec.cc.orig 2018-11-06 14:56:58 UTC +++ rec_channel_rec.cc -@@ -353,7 +353,7 @@ string doSetDnssecLogBogus(T begin, T end) +@@ -354,7 +354,7 @@ string doSetDnssecLogBogus(T begin, T en if (pdns_iequals(*begin, "on") || pdns_iequals(*begin, "yes")) { if (!g_dnssecLogBogus) { @@ -1476,7 +1476,7 @@ https://github.com/PowerDNS/pdns/commit/e6a9dde524b5 g_dnssecLogBogus = true; return "DNSSEC Bogus logging enabled\n"; } -@@ -362,7 +362,7 @@ string doSetDnssecLogBogus(T begin, T end) +@@ -363,7 +363,7 @@ string doSetDnssecLogBogus(T begin, T en if (pdns_iequals(*begin, "off") || pdns_iequals(*begin, "no")) { if (g_dnssecLogBogus) { @@ -1485,7 +1485,7 @@ https://github.com/PowerDNS/pdns/commit/e6a9dde524b5 g_dnssecLogBogus = false; return "DNSSEC Bogus logging disabled\n"; } -@@ -397,7 +397,7 @@ string doAddNTA(T begin, T end) +@@ -398,7 +398,7 @@ string doAddNTA(T begin, T end) if (begin != end) why += " "; } @@ -1494,7 +1494,7 @@ https://github.com/PowerDNS/pdns/commit/e6a9dde524b5 g_luaconfs.modify([who, why](LuaConfigItems& lci) { lci.negAnchors[who] = why; }); -@@ -412,7 +412,7 @@ string doClearNTA(T begin, T end) +@@ -413,7 +413,7 @@ string doClearNTA(T begin, T end) return "No Negative Trust Anchor specified, doing nothing.\n"; if (begin + 1 == end && *begin == "*"){ @@ -1503,7 +1503,7 @@ https://github.com/PowerDNS/pdns/commit/e6a9dde524b5 g_luaconfs.modify([](LuaConfigItems& lci) { lci.negAnchors.clear(); }); -@@ -440,7 +440,7 @@ string doClearNTA(T begin, T end) +@@ -441,7 +441,7 @@ string doClearNTA(T begin, T end) string removed(""); bool first(true); for (auto const &entry : toRemove) { @@ -1512,14 +1512,14 @@ https://github.com/PowerDNS/pdns/commit/e6a9dde524b5 g_luaconfs.modify([entry](LuaConfigItems& lci) { lci.negAnchors.erase(entry); }); -@@ -488,17 +488,17 @@ string doAddTA(T begin, T end) +@@ -489,17 +489,17 @@ string doAddTA(T begin, T end) } try { - L<(dynamic_cast(DSRecordContent::make(what))); + auto ds=std::dynamic_pointer_cast(DSRecordContent::make(what)); lci.dsAnchors[who].insert(*ds); }); broadcastAccFunction(boost::bind(pleaseWipePacketCache, who, true)); @@ -1533,7 +1533,7 @@ https://github.com/PowerDNS/pdns/commit/e6a9dde524b5 return "Unable to add Trust Anchor for " + who.toStringRootDot() + ": " + e.what() + "\n"; } } -@@ -530,7 +530,7 @@ string doClearTA(T begin, T end) +@@ -531,7 +531,7 @@ string doClearTA(T begin, T end) string removed(""); bool first(true); for (auto const &entry : toRemove) { @@ -1542,7 +1542,7 @@ https://github.com/PowerDNS/pdns/commit/e6a9dde524b5 g_luaconfs.modify([entry](LuaConfigItems& lci) { lci.dsAnchors.erase(entry); }); -@@ -900,7 +900,7 @@ RecursorControlParser::RecursorControlParser() +@@ -901,7 +901,7 @@ RecursorControlParser::RecursorControlPa static void doExitGeneric(bool nicely) { @@ -1551,7 +1551,7 @@ https://github.com/PowerDNS/pdns/commit/e6a9dde524b5 extern RecursorControlChannel s_rcc; s_rcc.~RecursorControlChannel(); -@@ -1214,7 +1214,7 @@ string RecursorControlParser::getAnswer(const string& +@@ -1215,7 +1215,7 @@ string RecursorControlParser::getAnswer( try { loadRecursorLuaConfig(::arg()["lua-config-file"], false); @@ -1560,7 +1560,7 @@ https://github.com/PowerDNS/pdns/commit/e6a9dde524b5 return "Reloaded Lua configuration file '"+::arg()["lua-config-file"]+"'\n"; } catch(std::exception& e) { -@@ -1239,7 +1239,7 @@ string RecursorControlParser::getAnswer(const string& +@@ -1240,7 +1240,7 @@ string RecursorControlParser::getAnswer( if(cmd=="reload-acls") { if(!::arg()["chroot"].empty()) { @@ -1569,7 +1569,7 @@ https://github.com/PowerDNS/pdns/commit/e6a9dde524b5 return "Unable to reload ACL when chroot()'ed, please restart\n"; } -@@ -1248,12 +1248,12 @@ string RecursorControlParser::getAnswer(const string& +@@ -1249,12 +1249,12 @@ string RecursorControlParser::getAnswer( } catch(std::exception& e) { @@ -1584,7 +1584,7 @@ https://github.com/PowerDNS/pdns/commit/e6a9dde524b5 return ae.reason + string("\n"); } return "ok\n"; -@@ -1292,7 +1292,7 @@ string RecursorControlParser::getAnswer(const string& +@@ -1293,7 +1293,7 @@ string RecursorControlParser::getAnswer( if(cmd=="reload-zones") { if(!::arg()["chroot"].empty()) { @@ -1593,7 +1593,7 @@ https://github.com/PowerDNS/pdns/commit/e6a9dde524b5 return "Unable to reload zones and forwards when chroot()'ed, please restart\n"; } return reloadAuthAndForwards(); ---- recursor_cache.hh.orig 2017-12-11 10:38:52 UTC +--- recursor_cache.hh.orig 2018-11-06 14:56:58 UTC +++ recursor_cache.hh @@ -30,7 +30,6 @@ #include @@ -1611,9 +1611,9 @@ https://github.com/PowerDNS/pdns/commit/e6a9dde524b5 #include "namespaces.hh" using namespace ::boost::multi_index; ---- reczones.cc.orig 2017-12-11 10:38:52 UTC +--- reczones.cc.orig 2018-11-06 14:56:58 UTC +++ reczones.cc -@@ -124,10 +124,10 @@ static void makeNameToIPZone(SyncRes::domainmap_t* new +@@ -124,10 +124,10 @@ static void makeNameToIPZone(SyncRes::do ad.d_records.insert(dr); if(newMap->count(dr.d_name)) { @@ -1626,7 +1626,7 @@ https://github.com/PowerDNS/pdns/commit/e6a9dde524b5 (*newMap)[dr.d_name]=ad; } } -@@ -169,11 +169,11 @@ static void makeIPToNamesZone(SyncRes::domainmap_t* ne +@@ -169,11 +169,11 @@ static void makeIPToNamesZone(SyncRes::d } if(newMap->count(dr.d_name)) { @@ -1640,7 +1640,7 @@ https://github.com/PowerDNS/pdns/commit/e6a9dde524b5 (*newMap)[dr.d_name]=ad; } } -@@ -218,15 +218,15 @@ void convertServersForAD(const std::string& input, Syn +@@ -218,15 +218,15 @@ void convertServersForAD(const std::stri for(vector::const_iterator iter = servers.begin(); iter != servers.end(); ++iter) { if(verbose && iter != servers.begin()) @@ -1685,7 +1685,7 @@ https://github.com/PowerDNS/pdns/commit/e6a9dde524b5 } return "reloading failed, see log\n"; } -@@ -325,7 +325,7 @@ void RPZIXFRTracker(const ComboAddress& master, const +@@ -325,7 +325,7 @@ void RPZIXFRTracker(const ComboAddress& sleep(refresh); @@ -1694,7 +1694,7 @@ https://github.com/PowerDNS/pdns/commit/e6a9dde524b5 vector, vector > > deltas; ComboAddress local(localAddress); -@@ -335,12 +335,12 @@ void RPZIXFRTracker(const ComboAddress& master, const +@@ -335,12 +335,12 @@ void RPZIXFRTracker(const ComboAddress& try { deltas = getIXFRDeltas(master, zone, dr, tt, &local, maxReceivedBytes); } catch(std::runtime_error& e ){ @@ -1709,7 +1709,7 @@ https://github.com/PowerDNS/pdns/commit/e6a9dde524b5 auto luaconfsCopy = g_luaconfs.getCopy(); int totremove=0, totadd=0; -@@ -348,7 +348,7 @@ void RPZIXFRTracker(const ComboAddress& master, const +@@ -348,7 +348,7 @@ void RPZIXFRTracker(const ComboAddress& const auto& remove = delta.first; const auto& add = delta.second; if(remove.empty()) { @@ -1718,7 +1718,7 @@ https://github.com/PowerDNS/pdns/commit/e6a9dde524b5 luaconfsCopy.dfe.clear(polZone); } for(const auto& rr : remove) { // should always contain the SOA -@@ -360,11 +360,11 @@ void RPZIXFRTracker(const ComboAddress& master, const +@@ -360,11 +360,11 @@ void RPZIXFRTracker(const ComboAddress& // cout<<"Got good removal of SOA serial "<d_st.serial<(rr); @@ -1755,7 +1755,7 @@ https://github.com/PowerDNS/pdns/commit/e6a9dde524b5 g_luaconfs.setState(luaconfsCopy); } } -@@ -414,7 +414,7 @@ SyncRes::domainmap_t* parseAuthAndForwards() +@@ -414,7 +414,7 @@ SyncRes::domainmap_t* parseAuthAndForwar // headers.first=toCanonic("", headers.first); if(n==0) { ad.d_rdForward = false; @@ -1764,7 +1764,7 @@ https://github.com/PowerDNS/pdns/commit/e6a9dde524b5 ZoneParserTNG zpt(headers.second, DNSName(headers.first)); DNSResourceRecord rr; DNSRecord dr; -@@ -436,13 +436,13 @@ SyncRes::domainmap_t* parseAuthAndForwards() +@@ -436,13 +436,13 @@ SyncRes::domainmap_t* parseAuthAndForwar } } else { @@ -1781,7 +1781,7 @@ https://github.com/PowerDNS/pdns/commit/e6a9dde524b5 convertServersForAD(headers.second, ad, ";"); if(n == 2) { -@@ -455,7 +455,7 @@ SyncRes::domainmap_t* parseAuthAndForwards() +@@ -455,7 +455,7 @@ SyncRes::domainmap_t* parseAuthAndForwar } if(!::arg()["forward-zones-file"].empty()) { @@ -1790,7 +1790,7 @@ https://github.com/PowerDNS/pdns/commit/e6a9dde524b5 SyncRes::AuthDomain ad; FILE *rfp=fopen(::arg()["forward-zones-file"].c_str(), "r"); -@@ -502,7 +502,7 @@ SyncRes::domainmap_t* parseAuthAndForwards() +@@ -502,7 +502,7 @@ SyncRes::domainmap_t* parseAuthAndForwar (*newMap)[DNSName(domain)]=ad; } @@ -1799,7 +1799,7 @@ https://github.com/PowerDNS/pdns/commit/e6a9dde524b5 } if(::arg().mustDo("export-etc-hosts")) { -@@ -511,7 +511,7 @@ SyncRes::domainmap_t* parseAuthAndForwards() +@@ -511,7 +511,7 @@ SyncRes::domainmap_t* parseAuthAndForwar ifstream ifs(fname.c_str()); if(!ifs) { @@ -1808,7 +1808,7 @@ https://github.com/PowerDNS/pdns/commit/e6a9dde524b5 } else { string searchSuffix = ::arg()["export-etc-hosts-search-suffix"]; -@@ -543,7 +543,7 @@ SyncRes::domainmap_t* parseAuthAndForwards() +@@ -543,7 +543,7 @@ SyncRes::domainmap_t* parseAuthAndForwar } } if(::arg().mustDo("serve-rfc1918")) { @@ -1817,7 +1817,7 @@ https://github.com/PowerDNS/pdns/commit/e6a9dde524b5 parts.clear(); parts.push_back("127"); makeIPToNamesZone(newMap, parts); ---- remote_logger.cc.orig 2017-12-11 10:38:52 UTC +--- remote_logger.cc.orig 2018-11-06 14:56:58 UTC +++ remote_logger.cc @@ -21,7 +21,7 @@ bool RemoteLogger::reconnect() } @@ -1837,9 +1837,9 @@ https://github.com/PowerDNS/pdns/commit/e6a9dde524b5 #else vinfolog("Error sending data to remote logger (%s): %s", d_remote.toStringWithPort(), e.what()); #endif ---- rpzloader.cc.orig 2017-12-11 10:38:52 UTC +--- rpzloader.cc.orig 2018-11-06 14:56:58 UTC +++ rpzloader.cc -@@ -159,9 +159,9 @@ void RPZRecordToPolicy(const DNSRecord& dr, DNSFilterE +@@ -159,9 +159,9 @@ void RPZRecordToPolicy(const DNSRecord& shared_ptr loadRPZFromServer(const ComboAddress& master, const DNSName& zone, DNSFilterEngine& target, boost::optional defpol, size_t place, const TSIGTriplet& tt, size_t maxReceivedBytes, const ComboAddress& localAddress) { @@ -1851,7 +1851,7 @@ https://github.com/PowerDNS/pdns/commit/e6a9dde524b5 ComboAddress local(localAddress); if (local == ComboAddress()) -@@ -189,11 +189,11 @@ shared_ptr loadRPZFromServer(const C +@@ -189,11 +189,11 @@ shared_ptr loadRPZFrom nrecords++; } if(last != time(0)) { @@ -1865,7 +1865,7 @@ https://github.com/PowerDNS/pdns/commit/e6a9dde524b5 return sr; } ---- secpoll-recursor.cc.orig 2017-12-11 10:38:52 UTC +--- secpoll-recursor.cc.orig 2018-11-06 14:56:58 UTC +++ secpoll-recursor.cc @@ -53,7 +53,7 @@ void doSecPoll(time_t* last_secpoll) } @@ -1899,7 +1899,7 @@ https://github.com/PowerDNS/pdns/commit/e6a9dde524b5 + g_log<gr_gid; -@@ -205,7 +205,7 @@ int Utility::makeUidNumeric(const string &username) +@@ -205,7 +205,7 @@ int Utility::makeUidNumeric(const string if(!(newuid=atoi(username.c_str()))) { struct passwd *pw=getpwnam(username.c_str()); if(!pw) { @@ -1999,7 +1999,7 @@ https://github.com/PowerDNS/pdns/commit/e6a9dde524b5 exit(1); } newuid=pw->pw_uid; ---- validate-recursor.cc.orig 2017-12-11 10:38:52 UTC +--- validate-recursor.cc.orig 2018-11-06 14:56:58 UTC +++ validate-recursor.cc @@ -6,7 +6,7 @@ DNSSECMode g_dnssecmode{DNSSECMode::ProcessNoValidate}; @@ -2010,7 +2010,7 @@ https://github.com/PowerDNS/pdns/commit/e6a9dde524b5 class SRRecordOracle : public DNSRecordOracle { ---- validate.cc.orig 2017-12-11 10:38:52 UTC +--- validate.cc.orig 2018-11-06 14:56:58 UTC +++ validate.cc @@ -6,7 +6,7 @@ #include "logger.hh" @@ -2021,7 +2021,7 @@ https://github.com/PowerDNS/pdns/commit/e6a9dde524b5 void dotEdge(DNSName zone, string type1, DNSName name1, string tag1, string type2, DNSName name2, string tag2, string color=""); void dotNode(string type, DNSName name, string tag, string content); string dotName(string type, DNSName name, string tag); ---- version.cc.orig 2017-12-11 10:38:52 UTC +--- version.cc.orig 2018-11-06 14:56:58 UTC +++ version.cc @@ -72,22 +72,22 @@ string productTypeApiType() { @@ -2065,7 +2065,7 @@ https://github.com/PowerDNS/pdns/commit/e6a9dde524b5 #undef escape_quotes #undef double_escape #endif ---- webserver.cc.orig 2017-12-11 10:38:52 UTC +--- webserver.cc.orig 2018-11-06 14:56:58 UTC +++ webserver.cc @@ -43,12 +43,12 @@ json11::Json HttpRequest::json() { @@ -2082,7 +2082,7 @@ https://github.com/PowerDNS/pdns/commit/e6a9dde524b5 throw HttpBadRequestException(); } return doc; -@@ -136,13 +136,13 @@ static void apiWrapper(WebServer::HandlerFunction hand +@@ -136,13 +136,13 @@ static void apiWrapper(WebServer::Handle resp->headers["access-control-allow-origin"] = "*"; if (api_key.empty()) { @@ -2098,7 +2098,7 @@ https://github.com/PowerDNS/pdns/commit/e6a9dde524b5 throw HttpUnauthorizedException("X-API-Key"); } -@@ -185,7 +185,7 @@ static void webWrapper(WebServer::HandlerFunction hand +@@ -185,7 +185,7 @@ static void webWrapper(WebServer::Handle if (!web_password.empty()) { bool auth_ok = req->compareAuthorization(web_password); if (!auth_ok) { @@ -2107,7 +2107,7 @@ https://github.com/PowerDNS/pdns/commit/e6a9dde524b5 throw HttpUnauthorizedException("Basic"); } } -@@ -216,11 +216,11 @@ void WebServer::handleRequest(HttpRequest& req, HttpRe +@@ -216,11 +216,11 @@ void WebServer::handleRequest(HttpReques try { if (!req.complete) { @@ -2121,7 +2121,7 @@ https://github.com/PowerDNS/pdns/commit/e6a9dde524b5 YaHTTP::strstr_map_t::iterator header; -@@ -235,33 +235,33 @@ void WebServer::handleRequest(HttpRequest& req, HttpRe +@@ -235,33 +235,33 @@ void WebServer::handleRequest(HttpReques YaHTTP::THandlerFunction handler; if (!YaHTTP::Router::Route(&req, handler)) { @@ -2217,9 +2217,9 @@ https://github.com/PowerDNS/pdns/commit/e6a9dde524b5 } exit(1); } ---- ws-recursor.cc.orig 2017-12-11 10:38:52 UTC +--- ws-recursor.cc.orig 2018-11-06 14:56:58 UTC +++ ws-recursor.cc -@@ -597,7 +597,7 @@ void AsyncWebServer::serveConnection(Socket *client) +@@ -597,7 +597,7 @@ void AsyncWebServer::serveConnection(Soc // now send the reply if (asendtcp(data, client) == -1 || data.empty()) { From owner-svn-ports-branches@freebsd.org Tue Nov 20 00:37:04 2018 Return-Path: Delivered-To: svn-ports-branches@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 590C51130D5C; Tue, 20 Nov 2018 00:37:04 +0000 (UTC) (envelope-from jbeich@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id D52DC6CC3C; Tue, 20 Nov 2018 00:37:03 +0000 (UTC) (envelope-from jbeich@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id B6228178D; Tue, 20 Nov 2018 00:37:03 +0000 (UTC) (envelope-from jbeich@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id wAK0b35A086575; Tue, 20 Nov 2018 00:37:03 GMT (envelope-from jbeich@FreeBSD.org) Received: (from jbeich@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id wAK0b3UO086573; Tue, 20 Nov 2018 00:37:03 GMT (envelope-from jbeich@FreeBSD.org) Message-Id: <201811200037.wAK0b3UO086573@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: jbeich set sender to jbeich@FreeBSD.org using -f From: Jan Beich Date: Tue, 20 Nov 2018 00:37:03 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r485371 - branches/2018Q4/emulators/rpcs3 X-SVN-Group: ports-branches X-SVN-Commit-Author: jbeich X-SVN-Commit-Paths: branches/2018Q4/emulators/rpcs3 X-SVN-Commit-Revision: 485371 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Rspamd-Queue-Id: D52DC6CC3C X-Spamd-Result: default: False [0.42 / 15.00]; local_wl_from(0.00)[FreeBSD.org]; NEURAL_SPAM_SHORT(0.41)[0.405,0]; NEURAL_SPAM_MEDIUM(0.02)[0.018,0]; ASN(0.00)[asn:11403, ipnet:2610:1c1:1::/48, country:US] X-Rspamd-Server: mx1.freebsd.org X-BeenThere: svn-ports-branches@freebsd.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: SVN commit messages for all the branches of the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 20 Nov 2018 00:37:04 -0000 Author: jbeich Date: Tue Nov 20 00:37:03 2018 New Revision: 485371 URL: https://svnweb.freebsd.org/changeset/ports/485371 Log: MFH: r485368 emulators/rpcs3: update to 0.0.5.1045 Changes: https://github.com/RPCS3/rpcs3/compare/225310e04...3c7f02d99 Approved by: ports-secteam (junovitch, implicit for snapshots) Modified: branches/2018Q4/emulators/rpcs3/Makefile branches/2018Q4/emulators/rpcs3/distinfo Directory Properties: branches/2018Q4/ (props changed) Modified: branches/2018Q4/emulators/rpcs3/Makefile ============================================================================== --- branches/2018Q4/emulators/rpcs3/Makefile Tue Nov 20 00:36:04 2018 (r485370) +++ branches/2018Q4/emulators/rpcs3/Makefile Tue Nov 20 00:37:03 2018 (r485371) @@ -2,8 +2,8 @@ PORTNAME= rpcs3 DISTVERSIONPREFIX= v -DISTVERSION= 0.0.5-1039 -DISTVERSIONSUFFIX= -g225310e04 +DISTVERSION= 0.0.5-1045 +DISTVERSIONSUFFIX= -g3c7f02d99 CATEGORIES= emulators PATCH_SITES= https://github.com/${GH_ACCOUNT}/${GH_PROJECT}/commit/ Modified: branches/2018Q4/emulators/rpcs3/distinfo ============================================================================== --- branches/2018Q4/emulators/rpcs3/distinfo Tue Nov 20 00:36:04 2018 (r485370) +++ branches/2018Q4/emulators/rpcs3/distinfo Tue Nov 20 00:37:03 2018 (r485371) @@ -1,6 +1,6 @@ -TIMESTAMP = 1542393427 -SHA256 (RPCS3-rpcs3-v0.0.5-1039-g225310e04_GH0.tar.gz) = 6b3aa62b7d7b6a4f0e47441f131502a05b87972269970dc4f0c7204a278bc95e -SIZE (RPCS3-rpcs3-v0.0.5-1039-g225310e04_GH0.tar.gz) = 5017182 +TIMESTAMP = 1542643539 +SHA256 (RPCS3-rpcs3-v0.0.5-1045-g3c7f02d99_GH0.tar.gz) = 2f6b15588943c294f9a07a4124f67864366e25cb33815fe512bcb49f4c7518b9 +SIZE (RPCS3-rpcs3-v0.0.5-1045-g3c7f02d99_GH0.tar.gz) = 5016019 SHA256 (RPCS3-hidapi-hidapi-0.8.0-rc1-26-g4c27501_GH0.tar.gz) = 4f58ba2a51136cc6af0f1d833688b55f78468c4f5429a4bf9b38bb51c9d212b1 SIZE (RPCS3-hidapi-hidapi-0.8.0-rc1-26-g4c27501_GH0.tar.gz) = 105372 SHA256 (RPCS3-llvm-5c906fd1694e_GH0.tar.gz) = 8bbe95fbbea545ebb03e73d526add64e2853f86176ad42690f8ce5846bd419ce From owner-svn-ports-branches@freebsd.org Tue Nov 20 00:37:56 2018 Return-Path: Delivered-To: svn-ports-branches@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id EA0C31130DBD; Tue, 20 Nov 2018 00:37:55 +0000 (UTC) (envelope-from jbeich@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 8E0DA6CD19; Tue, 20 Nov 2018 00:37:55 +0000 (UTC) (envelope-from jbeich@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 5529E178E; Tue, 20 Nov 2018 00:37:55 +0000 (UTC) (envelope-from jbeich@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id wAK0btnW086738; Tue, 20 Nov 2018 00:37:55 GMT (envelope-from jbeich@FreeBSD.org) Received: (from jbeich@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id wAK0bsWE086737; Tue, 20 Nov 2018 00:37:54 GMT (envelope-from jbeich@FreeBSD.org) Message-Id: <201811200037.wAK0bsWE086737@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: jbeich set sender to jbeich@FreeBSD.org using -f From: Jan Beich Date: Tue, 20 Nov 2018 00:37:54 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r485372 - branches/2018Q4/emulators/citra X-SVN-Group: ports-branches X-SVN-Commit-Author: jbeich X-SVN-Commit-Paths: branches/2018Q4/emulators/citra X-SVN-Commit-Revision: 485372 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Rspamd-Queue-Id: 8E0DA6CD19 X-Spamd-Result: default: False [0.42 / 15.00]; local_wl_from(0.00)[FreeBSD.org]; NEURAL_SPAM_SHORT(0.41)[0.405,0]; NEURAL_SPAM_MEDIUM(0.02)[0.018,0]; ASN(0.00)[asn:11403, ipnet:2610:1c1:1::/48, country:US] X-Rspamd-Server: mx1.freebsd.org X-BeenThere: svn-ports-branches@freebsd.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: SVN commit messages for all the branches of the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 20 Nov 2018 00:37:56 -0000 Author: jbeich Date: Tue Nov 20 00:37:54 2018 New Revision: 485372 URL: https://svnweb.freebsd.org/changeset/ports/485372 Log: MFH: r485369 emulators/citra: update to s20181119 Changes: https://github.com/citra-emu/citra/compare/560df843b...2b768da53 Approved by: ports-secteam (swills, implicit for snapshots) Modified: branches/2018Q4/emulators/citra/Makefile branches/2018Q4/emulators/citra/distinfo Directory Properties: branches/2018Q4/ (props changed) Modified: branches/2018Q4/emulators/citra/Makefile ============================================================================== --- branches/2018Q4/emulators/citra/Makefile Tue Nov 20 00:37:03 2018 (r485371) +++ branches/2018Q4/emulators/citra/Makefile Tue Nov 20 00:37:54 2018 (r485372) @@ -1,7 +1,7 @@ # $FreeBSD$ PORTNAME= citra -PORTVERSION= s20181116 +PORTVERSION= s20181119 PORTREVISION?= 0 CATEGORIES= emulators @@ -23,7 +23,7 @@ BUILD_DEPENDS= boost-libs>=1.66:devel/boost-libs USE_GITHUB= yes GH_ACCOUNT= citra-emu -GH_TAGNAME= 560df843b +GH_TAGNAME= 2b768da53 GH_TUPLE= citra-emu:ext-libressl-portable:7d01cb0:libressl/externals/libressl \ citra-emu:ext-soundtouch:060181e:soundtouch/externals/soundtouch \ MerryMage:dynarmic:r1-992-g4e6848d1:dynarmic/externals/dynarmic \ Modified: branches/2018Q4/emulators/citra/distinfo ============================================================================== --- branches/2018Q4/emulators/citra/distinfo Tue Nov 20 00:37:03 2018 (r485371) +++ branches/2018Q4/emulators/citra/distinfo Tue Nov 20 00:37:54 2018 (r485372) @@ -1,6 +1,6 @@ -TIMESTAMP = 1542344870 -SHA256 (citra-emu-citra-s20181116-560df843b_GH0.tar.gz) = 1bd375fef5d4b8c9a45c34608098e58df2e869a8d0777917aa39a6dc0e4d9db4 -SIZE (citra-emu-citra-s20181116-560df843b_GH0.tar.gz) = 4554034 +TIMESTAMP = 1542644002 +SHA256 (citra-emu-citra-s20181119-2b768da53_GH0.tar.gz) = 9a570076a31dff492c1508344efe2d5d0413f1e0c57446ec5dfd3b9d6bc21bc3 +SIZE (citra-emu-citra-s20181119-2b768da53_GH0.tar.gz) = 4659701 SHA256 (citra-emu-ext-libressl-portable-7d01cb0_GH0.tar.gz) = f3fc8c9d4991b05ca1e1c8f5907ecd3ffd9724a8dccf328087b4784cda5c7db3 SIZE (citra-emu-ext-libressl-portable-7d01cb0_GH0.tar.gz) = 1762942 SHA256 (citra-emu-ext-soundtouch-060181e_GH0.tar.gz) = a593ab188e4feaeef8376c27b554cc413986efc777c195e44c6d3d223de9a63c From owner-svn-ports-branches@freebsd.org Tue Nov 20 10:20:53 2018 Return-Path: Delivered-To: svn-ports-branches@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 3B1CA1109850; Tue, 20 Nov 2018 10:20:53 +0000 (UTC) (envelope-from meta@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id C0B9C84AF3; Tue, 20 Nov 2018 10:20:52 +0000 (UTC) (envelope-from meta@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id A1E287F4F; Tue, 20 Nov 2018 10:20:52 +0000 (UTC) (envelope-from meta@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id wAKAKq4n090414; Tue, 20 Nov 2018 10:20:52 GMT (envelope-from meta@FreeBSD.org) Received: (from meta@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id wAKAKqfY090413; Tue, 20 Nov 2018 10:20:52 GMT (envelope-from meta@FreeBSD.org) Message-Id: <201811201020.wAKAKqfY090413@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: meta set sender to meta@FreeBSD.org using -f From: Koichiro Iwao Date: Tue, 20 Nov 2018 10:20:52 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r485424 - branches/2018Q4/lang/crystal X-SVN-Group: ports-branches X-SVN-Commit-Author: meta X-SVN-Commit-Paths: branches/2018Q4/lang/crystal X-SVN-Commit-Revision: 485424 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Rspamd-Queue-Id: C0B9C84AF3 X-Spamd-Result: default: False [0.66 / 15.00]; local_wl_from(0.00)[FreeBSD.org]; NEURAL_SPAM_SHORT(0.65)[0.648,0]; NEURAL_HAM_LONG(-0.00)[-0.003,0]; NEURAL_SPAM_MEDIUM(0.02)[0.018,0] X-Rspamd-Server: mx1.freebsd.org X-BeenThere: svn-ports-branches@freebsd.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: SVN commit messages for all the branches of the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 20 Nov 2018 10:20:53 -0000 Author: meta Date: Tue Nov 20 10:20:51 2018 New Revision: 485424 URL: https://svnweb.freebsd.org/changeset/ports/485424 Log: lang/crystal: Fix build on 13-CURRENT PR: 232836 Submitted by: Greg V (maintainer) Approved by: portmgr (blanket), pi (mentor) Obtained from: https://github.com/crystal-lang/crystal/pull/6629 Modified: branches/2018Q4/lang/crystal/Makefile branches/2018Q4/lang/crystal/distinfo Modified: branches/2018Q4/lang/crystal/Makefile ============================================================================== --- branches/2018Q4/lang/crystal/Makefile Tue Nov 20 10:18:48 2018 (r485423) +++ branches/2018Q4/lang/crystal/Makefile Tue Nov 20 10:20:51 2018 (r485424) @@ -9,6 +9,9 @@ DISTFILES= ${BOOTSTRAP_PATH}:bootstrap DIST_SUBDIR= ${PORTNAME} EXTRACT_ONLY= ${DISTNAME}${EXTRACT_SUFX} +PATCH_SITES= https://github.com/crystal-lang/crystal/commit/ +PATCHFILES= 8fef4e4.patch:-p1 + MAINTAINER= greg@unrelenting.technology COMMENT= Language with Ruby-like syntax and static type checking Modified: branches/2018Q4/lang/crystal/distinfo ============================================================================== --- branches/2018Q4/lang/crystal/distinfo Tue Nov 20 10:18:48 2018 (r485423) +++ branches/2018Q4/lang/crystal/distinfo Tue Nov 20 10:20:51 2018 (r485424) @@ -1,4 +1,4 @@ -TIMESTAMP = 1531356074 +TIMESTAMP = 1541643714 SHA256 (crystal/crystal-0.25.1-freebsd12.0-aarch64) = fa670991f5db0a25561208c99a8c6fc9aefdc971fd3d3ddda5af928084acf72c SIZE (crystal/crystal-0.25.1-freebsd12.0-aarch64) = 9244872 SHA256 (crystal/crystal-0.25.0-freebsd12.0) = 16099e4a4a28578c38a68885b20b20604554f8471d760867808a5e4572517eed @@ -7,3 +7,5 @@ SHA256 (crystal/crystal-0.25.0-freebsd11.2) = 54a4b6a7 SIZE (crystal/crystal-0.25.0-freebsd11.2) = 10031424 SHA256 (crystal/crystal-lang-crystal-0.25.1_GH0.tar.gz) = 9b5a7bd2de67ab36cc5430133228a1e656a431fc7d928a37a61109bd8da77fc6 SIZE (crystal/crystal-lang-crystal-0.25.1_GH0.tar.gz) = 1961727 +SHA256 (crystal/8fef4e4.patch) = 49ec82b80fdcd945694e939c38c712fd539dcfbcd48c31a60e00a7bb504e1804 +SIZE (crystal/8fef4e4.patch) = 4527 From owner-svn-ports-branches@freebsd.org Tue Nov 20 19:29:49 2018 Return-Path: Delivered-To: svn-ports-branches@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 7080B113B228; Tue, 20 Nov 2018 19:29:49 +0000 (UTC) (envelope-from jkim@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 193D27E2B7; Tue, 20 Nov 2018 19:29:49 +0000 (UTC) (envelope-from jkim@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id EFCB4159F7; Tue, 20 Nov 2018 19:29:48 +0000 (UTC) (envelope-from jkim@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id wAKJTm6N077657; Tue, 20 Nov 2018 19:29:48 GMT (envelope-from jkim@FreeBSD.org) Received: (from jkim@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id wAKJTm2E077654; Tue, 20 Nov 2018 19:29:48 GMT (envelope-from jkim@FreeBSD.org) Message-Id: <201811201929.wAKJTm2E077654@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: jkim set sender to jkim@FreeBSD.org using -f From: Jung-uk Kim Date: Tue, 20 Nov 2018 19:29:48 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r485474 - in branches/2018Q4/www: flashplayer linux-flashplayer X-SVN-Group: ports-branches X-SVN-Commit-Author: jkim X-SVN-Commit-Paths: in branches/2018Q4/www: flashplayer linux-flashplayer X-SVN-Commit-Revision: 485474 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Rspamd-Queue-Id: 193D27E2B7 X-Spamd-Result: default: False [0.43 / 15.00]; local_wl_from(0.00)[FreeBSD.org]; NEURAL_SPAM_MEDIUM(0.13)[0.126,0]; ASN(0.00)[asn:11403, ipnet:2610:1c1:1::/48, country:US]; NEURAL_SPAM_SHORT(0.31)[0.310,0]; NEURAL_HAM_LONG(-0.00)[-0.003,0] X-Rspamd-Server: mx1.freebsd.org X-BeenThere: svn-ports-branches@freebsd.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: SVN commit messages for all the branches of the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 20 Nov 2018 19:29:49 -0000 Author: jkim Date: Tue Nov 20 19:29:48 2018 New Revision: 485474 URL: https://svnweb.freebsd.org/changeset/ports/485474 Log: MFH: r485468 Update to 31.0.0.153. https://helpx.adobe.com/security/products/flash-player/apsb18-44.html Approved by: ports-secteam (blanket) Modified: branches/2018Q4/www/flashplayer/Makefile branches/2018Q4/www/linux-flashplayer/Makefile branches/2018Q4/www/linux-flashplayer/distinfo Directory Properties: branches/2018Q4/ (props changed) Modified: branches/2018Q4/www/flashplayer/Makefile ============================================================================== --- branches/2018Q4/www/flashplayer/Makefile Tue Nov 20 19:27:36 2018 (r485473) +++ branches/2018Q4/www/flashplayer/Makefile Tue Nov 20 19:29:48 2018 (r485474) @@ -2,7 +2,7 @@ PORTNAME= flashplayer PORTVERSION= 31.0 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= www multimedia DISTFILES= Modified: branches/2018Q4/www/linux-flashplayer/Makefile ============================================================================== --- branches/2018Q4/www/linux-flashplayer/Makefile Tue Nov 20 19:27:36 2018 (r485473) +++ branches/2018Q4/www/linux-flashplayer/Makefile Tue Nov 20 19:29:48 2018 (r485474) @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= flashplayer -PORTVERSION= 31.0.0.148 +PORTVERSION= 31.0.0.153 CATEGORIES= www multimedia linux MASTER_SITES= https://fpdownload.macromedia.com/get/flashplayer/pdc/${PORTVERSION}/ PKGNAMEPREFIX= linux- Modified: branches/2018Q4/www/linux-flashplayer/distinfo ============================================================================== --- branches/2018Q4/www/linux-flashplayer/distinfo Tue Nov 20 19:27:36 2018 (r485473) +++ branches/2018Q4/www/linux-flashplayer/distinfo Tue Nov 20 19:29:48 2018 (r485474) @@ -1,3 +1,3 @@ -TIMESTAMP = 1542149803 -SHA256 (flashplayer/31.0.0.148/flash_player_npapi_linux.i386.tar.gz) = c27a78954c1bc83a668b00ecf6fbf61ca79f2e0656b9dd88ec52ebf67606d00f -SIZE (flashplayer/31.0.0.148/flash_player_npapi_linux.i386.tar.gz) = 8529825 +TIMESTAMP = 1542741577 +SHA256 (flashplayer/31.0.0.153/flash_player_npapi_linux.i386.tar.gz) = 478cf3011bcb0eebc87b08a718f07ca4aeff48f1ce5b15615da452df8793bb6b +SIZE (flashplayer/31.0.0.153/flash_player_npapi_linux.i386.tar.gz) = 8529821 From owner-svn-ports-branches@freebsd.org Wed Nov 21 03:09:04 2018 Return-Path: Delivered-To: svn-ports-branches@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 1499211009E3; Wed, 21 Nov 2018 03:09:04 +0000 (UTC) (envelope-from jmd@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id AF6DD6B6C4; Wed, 21 Nov 2018 03:09:03 +0000 (UTC) (envelope-from jmd@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 906EA1A6D6; Wed, 21 Nov 2018 03:09:03 +0000 (UTC) (envelope-from jmd@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id wAL393TJ016642; Wed, 21 Nov 2018 03:09:03 GMT (envelope-from jmd@FreeBSD.org) Received: (from jmd@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id wAL3921F016639; Wed, 21 Nov 2018 03:09:02 GMT (envelope-from jmd@FreeBSD.org) Message-Id: <201811210309.wAL3921F016639@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: jmd set sender to jmd@FreeBSD.org using -f From: Johannes M Dieterich Date: Wed, 21 Nov 2018 03:09:02 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r485494 - branches/2018Q4/graphics/drm-devel-kmod X-SVN-Group: ports-branches X-SVN-Commit-Author: jmd X-SVN-Commit-Paths: branches/2018Q4/graphics/drm-devel-kmod X-SVN-Commit-Revision: 485494 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Rspamd-Queue-Id: AF6DD6B6C4 X-Spamd-Result: default: False [0.50 / 15.00]; local_wl_from(0.00)[FreeBSD.org]; NEURAL_SPAM_LONG(0.00)[0.001,0]; NEURAL_SPAM_MEDIUM(0.14)[0.143,0]; ASN(0.00)[asn:11403, ipnet:2610:1c1:1::/48, country:US]; NEURAL_SPAM_SHORT(0.36)[0.360,0] X-Rspamd-Server: mx1.freebsd.org X-BeenThere: svn-ports-branches@freebsd.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: SVN commit messages for all the branches of the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 21 Nov 2018 03:09:04 -0000 Author: jmd Date: Wed Nov 21 03:09:02 2018 New Revision: 485494 URL: https://svnweb.freebsd.org/changeset/ports/485494 Log: MFH: r485380 graphics/drm-devel-kmod: update to latest snapshot This importantly brings initial support on powerpc64 for amdgpu and radeon. Obtained from: mmacy (powerpc64) via FreeBSDDesktop Approved by: portmgr (drm-driver blanket) Modified: branches/2018Q4/graphics/drm-devel-kmod/Makefile branches/2018Q4/graphics/drm-devel-kmod/distinfo branches/2018Q4/graphics/drm-devel-kmod/pkg-plist Directory Properties: branches/2018Q4/ (props changed) Modified: branches/2018Q4/graphics/drm-devel-kmod/Makefile ============================================================================== --- branches/2018Q4/graphics/drm-devel-kmod/Makefile Wed Nov 21 02:16:51 2018 (r485493) +++ branches/2018Q4/graphics/drm-devel-kmod/Makefile Wed Nov 21 03:09:02 2018 (r485494) @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= drm-devel-kmod -PORTVERSION= 4.16.g20181114 +PORTVERSION= 4.16.g20181119 CATEGORIES= graphics kld MAINTAINER= jmd@FreeBSD.org @@ -11,7 +11,7 @@ COMMENT= DRM modules for the linuxkpi-based KMS compon LICENSE= BSD2CLAUSE MIT GPLv2 LICENSE_COMB= multi -ONLY_FOR_ARCHS= amd64 i386 +ONLY_FOR_ARCHS= amd64 i386 powerpc64 ONLY_FOR_ARCHS_REASON= the new KMS components are only supported on amd64 and i386 RUN_DEPENDS= gpu-firmware-kmod>=g20180319:graphics/gpu-firmware-kmod @@ -20,12 +20,12 @@ CONFLICTS_INSTALL= drm-next-kmod drm-stable-kmod drm-l OPTIONS_DEFINE= DEBUG -USES= kmod uidfix +USES= kmod uidfix compiler:c++11-lang USE_GITHUB= yes GH_ACCOUNT= FreeBSDDesktop GH_PROJECT= kms-drm -GH_TAGNAME= be98d92 +GH_TAGNAME= 5f3b167 .include @@ -37,9 +37,25 @@ IGNORE= not supported on anything but FreeBSD (missin .endif .if ${ARCH} == "amd64" -PLIST_SUB= AMD64="" +PLIST_SUB= AMDGPU="" +PLIST_SUB+= AMDKFD="" +PLIST_SUB+= I915="" +PLIST_SUB+= VMWGFX="" +.elif ${ARCH} == "i386" +PLIST_SUB= AMDGPU="@comment " +PLIST_SUB+= AMDKFD="@comment " +PLIST_SUB+= I915="" +PLIST_SUB+= VMWGFX="" +.elif ${ARCH} == "powerpc64" +PLIST_SUB= AMDGPU="" +PLIST_SUB+= AMDKFD="@comment " +PLIST_SUB+= I915="@comment " +PLIST_SUB+= VMWGFX="@comment " .else -PLIST_SUB= AMD64="@comment " +PLIST_SUB= AMDGPU="@comment " +PLIST_SUB+= AMDKFD="@comment " +PLIST_SUB+= I915="@comment " +PLIST_SUB+= VMWGFX="@comment " .endif .include Modified: branches/2018Q4/graphics/drm-devel-kmod/distinfo ============================================================================== --- branches/2018Q4/graphics/drm-devel-kmod/distinfo Wed Nov 21 02:16:51 2018 (r485493) +++ branches/2018Q4/graphics/drm-devel-kmod/distinfo Wed Nov 21 03:09:02 2018 (r485494) @@ -1,3 +1,3 @@ -TIMESTAMP = 1542224521 -SHA256 (FreeBSDDesktop-kms-drm-4.16.g20181114-be98d92_GH0.tar.gz) = 5ed866ec0ec4d322ec1a9deadf2b59910ecf4ebb423b5434aaef6fde7ce6a111 -SIZE (FreeBSDDesktop-kms-drm-4.16.g20181114-be98d92_GH0.tar.gz) = 13079522 +TIMESTAMP = 1542679664 +SHA256 (FreeBSDDesktop-kms-drm-4.16.g20181119-5f3b167_GH0.tar.gz) = c25e4dd57bc5851633f677e63afd2e1dc23e806886fa677d6df0168f2e2e916a +SIZE (FreeBSDDesktop-kms-drm-4.16.g20181119-5f3b167_GH0.tar.gz) = 13088962 Modified: branches/2018Q4/graphics/drm-devel-kmod/pkg-plist ============================================================================== --- branches/2018Q4/graphics/drm-devel-kmod/pkg-plist Wed Nov 21 02:16:51 2018 (r485493) +++ branches/2018Q4/graphics/drm-devel-kmod/pkg-plist Wed Nov 21 03:09:02 2018 (r485494) @@ -1,8 +1,8 @@ -%%AMD64%%/%%KMODDIR%%/amdgpu.ko -%%AMD64%%/%%KMODDIR%%/amdkfd.ko +%%AMDGPU%%/%%KMODDIR%%/amdgpu.ko +%%AMDKFD%%/%%KMODDIR%%/amdkfd.ko /%%KMODDIR%%/debugfs.ko /%%KMODDIR%%/drm.ko -/%%KMODDIR%%/i915kms.ko +%%I915%%/%%KMODDIR%%/i915kms.ko /%%KMODDIR%%/linuxkpi_gplv2.ko /%%KMODDIR%%/radeonkms.ko -/%%KMODDIR%%/vmwgfx.ko +%%VMWGFX%%/%%KMODDIR%%/vmwgfx.ko From owner-svn-ports-branches@freebsd.org Wed Nov 21 08:52:16 2018 Return-Path: Delivered-To: svn-ports-branches@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 82E33112D145; Wed, 21 Nov 2018 08:52:16 +0000 (UTC) (envelope-from mat@FreeBSD.org) Received: from smtp.freebsd.org (smtp.freebsd.org [96.47.72.83]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "smtp.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 2916D75392; Wed, 21 Nov 2018 08:52:16 +0000 (UTC) (envelope-from mat@FreeBSD.org) Received: from atuin.in.mat.cc (unknown [IPv6:2a01:678:42:ffff:3e15:c2ff:fec4:452e]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) (Authenticated sender: mat/mail) by smtp.freebsd.org (Postfix) with ESMTPSA id 624FE21201; Wed, 21 Nov 2018 08:52:15 +0000 (UTC) (envelope-from mat@FreeBSD.org) Date: Wed, 21 Nov 2018 09:52:16 +0100 From: Mathieu Arnold To: Alan Somers Cc: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: Re: svn commit: r485231 - in branches/2018Q4/devel: p4 p4/files subversion/files Message-ID: <20181121085216.cfwbx6ywdmqrtdh3@atuin.in.mat.cc> References: <201811181606.wAIG6TVP072639@repo.freebsd.org> MIME-Version: 1.0 Content-Type: multipart/signed; micalg=pgp-sha512; protocol="application/pgp-signature"; boundary="ksj2h2qp53qdfzmp" Content-Disposition: inline In-Reply-To: <201811181606.wAIG6TVP072639@repo.freebsd.org> User-Agent: NeoMutt/20180716 X-Rspamd-Queue-Id: 2916D75392 X-Spamd-Result: default: False [1.10 / 15.00]; local_wl_from(0.00)[FreeBSD.org]; NEURAL_SPAM_MEDIUM(0.50)[0.500,0]; ASN(0.00)[asn:11403, ipnet:96.47.64.0/20, country:US]; NEURAL_SPAM_SHORT(0.79)[0.790,0]; NEURAL_HAM_LONG(-0.19)[-0.191,0] X-Rspamd-Server: mx1.freebsd.org X-BeenThere: svn-ports-branches@freebsd.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: SVN commit messages for all the branches of the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 21 Nov 2018 08:52:16 -0000 --ksj2h2qp53qdfzmp Content-Type: text/plain; charset=us-ascii Content-Disposition: inline Content-Transfer-Encoding: quoted-printable On Sun, Nov 18, 2018 at 04:06:29PM +0000, Alan Somers wrote: > Author: asomers (src committer) > Date: Sun Nov 18 16:06:28 2018 > New Revision: 485231 > URL: https://svnweb.freebsd.org/changeset/ports/485231 >=20 > Log: > MFH r484879 > =20 > devel/p4: fix build with OpenSSL 1.1 > =20 > PR: 229021 > Reported by: brnrd > Submitted by: ken > MFH: 2018Q4 > =20 > Approved by: ports-secteam (miwi) >=20 > Added: > branches/2018Q4/devel/p4/files/patch-net_netsslcredentials.cc > - copied unchanged from r484879, head/devel/p4/files/patch-net_netss= lcredentials.cc > Modified: > branches/2018Q4/devel/p4/Makefile > branches/2018Q4/devel/subversion/files/extra-patch-fbsd-template The subversion change was not present in the original commit, what happened here? > Directory Properties: > branches/2018Q4/ (props changed) >=20 > Modified: branches/2018Q4/devel/p4/Makefile > =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D > --- branches/2018Q4/devel/p4/Makefile Sun Nov 18 15:55:33 2018 (r485230) > +++ branches/2018Q4/devel/p4/Makefile Sun Nov 18 16:06:28 2018 (r485231) > @@ -3,7 +3,7 @@ > =20 > PORTNAME=3D p4 > PORTVERSION=3D ${YEAR}.${MAJOR}.${MINOR} > -PORTREVISION=3D 2 > +PORTREVISION=3D 3 > CATEGORIES=3D devel > # Perforce stupidly rerolls their distfiles on a regular basis, updating= the > # files' timestamps when they do, which changes the zip file's checksum.= Work >=20 > Copied: branches/2018Q4/devel/p4/files/patch-net_netsslcredentials.cc (fr= om r484879, head/devel/p4/files/patch-net_netsslcredentials.cc) > =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D > --- /dev/null 00:00:00 1970 (empty, because file is newly added) > +++ branches/2018Q4/devel/p4/files/patch-net_netsslcredentials.cc Sun Nov= 18 16:06:28 2018 (r485231, copy of r484879, head/devel/p4/files/patch-net_= netsslcredentials.cc) > @@ -0,0 +1,23 @@ > +--- net/netsslcredentials.cc.orig 2018-02-05 20:46:46.000000000 +0000 > ++++ net/netsslcredentials.cc 2018-11-08 16:32:39.241553000 +0000 > +@@ -42,6 +42,7 @@ extern "C" > + # include > + # include > + # include > ++# include > + } > + # include > + # include "netdebug.h" > +@@ -218,7 +219,11 @@ NetSslCredentials::ReadCredentials( Error *e ) > + privateKey =3D PEM_read_PrivateKey(fp, NULL, 0, NULL ); > + SSLNULLHANDLER( privateKey, e, "NetSslCredentials::ReadCredentials PEM= _read_PrivateKey", failSetError ); > + // verify that RSA key > ++#if OPENSSL_VERSION_NUMBER < 0x10100000L > + if (privateKey->type !=3D EVP_PKEY_RSA) > ++#else > ++ if (EVP_PKEY_base_id(privateKey) !=3D EVP_PKEY_RSA) > ++#endif > + { > + e->Set( MsgRpc::SslKeyNotRSA ); > + goto fail; > + >=20 > Modified: branches/2018Q4/devel/subversion/files/extra-patch-fbsd-template > =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D > --- branches/2018Q4/devel/subversion/files/extra-patch-fbsd-template Sun = Nov 18 15:55:33 2018 (r485230) > +++ branches/2018Q4/devel/subversion/files/extra-patch-fbsd-template Sun = Nov 18 16:06:28 2018 (r485231) > @@ -1,5 +1,5 @@ > ---- subversion/svn/util.c.orig 2015-02-28 13:37:27.000000000 +0300 > -+++ subversion/svn/util.c 2016-03-19 16:53:13.016472654 +0300 > +--- subversion/svn/util.c.orig 2015-02-28 10:37:27 UTC > ++++ subversion/svn/util.c > @@ -66,6 +66,9 @@ > #include "private/svn_client_private.h" > #include "private/svn_cmdline_private.h" > @@ -10,7 +10,7 @@ > =20 > =0C > =20 > -@@ -331,6 +334,71 @@ > +@@ -331,6 +334,72 @@ truncate_buffer_at_prefix(apr_size_t *new_len, > } > =20 > =20 > @@ -32,6 +32,7 @@ > + "Relnotes:", > + "Security:", > + "Sponsored by:", > ++ "Pull Request:", > + "Differential Revision:", > +}; > + > @@ -82,15 +83,15 @@ > #define EDITOR_EOF_PREFIX _("--This line, and those below, will be ign= ored--") > =20 > svn_error_t * > -@@ -343,11 +411,56 @@ > +@@ -343,11 +412,58 @@ svn_cl__get_log_message(const char **log_msg, > svn_stringbuf_t *default_msg =3D NULL; > struct log_msg_baton *lmb =3D baton; > svn_stringbuf_t *message =3D NULL; > + svn_config_t *cfg; > + const char *mfc_after, *sponsored_by; > -+ > -+ cfg =3D lmb->config ? svn_hash_gets(lmb->config, SVN_CONFIG_CATEGORY_= CONFIG) : NULL; > =20 > ++ cfg =3D lmb->config ? svn_hash_gets(lmb->config, SVN_CONFIG_CATEGORY_= CONFIG) : NULL; > ++ > /* Set default message. */ > default_msg =3D svn_stringbuf_create(APR_EOL_STR, pool); > + svn_stringbuf_appendcstr(default_msg, APR_EOL_STR); > @@ -118,6 +119,7 @@ > + if (sponsored_by !=3D NULL) > + svn_stringbuf_appendcstr(default_msg, sponsored_by); > + svn_stringbuf_appendcstr(default_msg, APR_EOL_STR); > ++ svn_stringbuf_appendcstr(default_msg, "Pull Request:\t" APR_EOL_STR); > + svn_stringbuf_appendcstr(default_msg, "Differential Revision:\t" APR_= EOL_STR); > svn_stringbuf_appendcstr(default_msg, EDITOR_EOF_PREFIX); > - svn_stringbuf_appendcstr(default_msg, APR_EOL_STR APR_EOL_STR); > @@ -134,13 +136,14 @@ > + svn_stringbuf_appendcstr(default_msg, "> Relnotes: Se= t to 'yes' for mention in release notes." APR_EOL_STR); > + svn_stringbuf_appendcstr(default_msg, "> Security: Vu= lnerability reference (one per line) or description." APR_EOL_STR); > + svn_stringbuf_appendcstr(default_msg, "> Sponsored by: If= the change was sponsored by an organization." APR_EOL_STR); > ++ svn_stringbuf_appendcstr(default_msg, "> Pull Request: ht= tps://github.com/freebsd/freebsd/pull/### (*full* GitHub URL needed)." APR_= EOL_STR); > + svn_stringbuf_appendcstr(default_msg, "> Differential Revision: ht= tps://reviews.freebsd.org/D### (*full* phabric URL needed)." APR_EOL_STR); > + svn_stringbuf_appendcstr(default_msg, "> Empty fields above will be a= utomatically removed." APR_EOL_STR); > + svn_stringbuf_appendcstr(default_msg, APR_EOL_STR); > =20 > *tmp_file =3D NULL; > if (lmb->message) > -@@ -362,6 +475,7 @@ > +@@ -362,6 +478,7 @@ svn_cl__get_log_message(const char **log_msg, > /* Strip off the EOF marker text and the junk that follows it. */ > truncate_buffer_at_prefix(&(log_msg_str->len), (char *)log_msg_st= r->data, > EDITOR_EOF_PREFIX); > @@ -148,7 +151,7 @@ > =20 > *log_msg =3D log_msg_str->data; > return SVN_NO_ERROR; > -@@ -472,6 +586,13 @@ > +@@ -472,6 +589,13 @@ svn_cl__get_log_message(const char **log_msg, > if (message) > truncate_buffer_at_prefix(&message->len, message->data, > EDITOR_EOF_PREFIX); >=20 >=20 --=20 Mathieu Arnold --ksj2h2qp53qdfzmp Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- iQKTBAABCgB9FiEEOraXidLtEhBkQLpbOkUW81GDzkgFAlv1HL9fFIAAAAAALgAo aXNzdWVyLWZwckBub3RhdGlvbnMub3BlbnBncC5maWZ0aGhvcnNlbWFuLm5ldDNB QjY5Nzg5RDJFRDEyMTA2NDQwQkE1QjNBNDUxNkYzNTE4M0NFNDgACgkQOkUW81GD zkiI+Q//eP7rlnxluS/5wBc3DgvtpRoQNs0LV5vgj/R99EJLuqlXEnKZhB6i+3xT ec+p+tWLpCm9OMaPZ0/MLlrr/EldNeXylipFklxMg/VhEeD5khrZdJjrf6MixXjK 3lxsFuwKvdIOM3UvM2OxbgNlroM9CkuziC6JGN/zmW/2VVOAJMRurjBT64d4n5XC JCqP0B6cxUD79TykGzNwHUmRPGhbczv+uoa+cqhKUOtS+CEupJtenjBUg0ed+vvG 2WnbuTBi+fm/J26AKjoxDZZ0DuG//TpstLbTUvy4kxaaeIBS/zvlaRvsiZU6ZJtm PSjVFOoBXIlm1L09J/Dn3OJICuuC2swbeDE8NwGkgzuM46QrGTQEpy9oZ3OJOzBi 0vZ+ytF00VBQHtWWTgl+waR3GNnOlGiEU6eUmAlOkBIfwdqNKx4CJYybR0XlCcEF 81PtatVOEe0WXbQCHc1oWNdhdsRikGXx2m8p4yyp2GKrYLub6B+KLKg7M9+LfbQi 71u/YmJAK1YFzeHHr6vOsnRux8vdiYUJayBgZAmmvLAMKWCJZjJzHZP/llgbMGaP 2AQLYQeMj3dwo/ETR7hh3SNhJgzDeuZSwJZdLNOmLe9qh+iUq7aNJBMgU+aWimP/ zQuwcDNSpt5bJ9jhsyZ81fkG9Y0OPtEteiHeG/Ibg3jukYSkBe4= =aYLZ -----END PGP SIGNATURE----- --ksj2h2qp53qdfzmp-- From owner-svn-ports-branches@freebsd.org Wed Nov 21 17:07:44 2018 Return-Path: Delivered-To: svn-ports-branches@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id ADB50113ECB0; Wed, 21 Nov 2018 17:07:44 +0000 (UTC) (envelope-from fernape@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 50F766B25C; Wed, 21 Nov 2018 17:07:44 +0000 (UTC) (envelope-from fernape@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 31FE0233A1; Wed, 21 Nov 2018 17:07:44 +0000 (UTC) (envelope-from fernape@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id wALH7h3J049476; Wed, 21 Nov 2018 17:07:43 GMT (envelope-from fernape@FreeBSD.org) Received: (from fernape@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id wALH7hon049475; Wed, 21 Nov 2018 17:07:43 GMT (envelope-from fernape@FreeBSD.org) Message-Id: <201811211707.wALH7hon049475@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: fernape set sender to fernape@FreeBSD.org using -f From: =?UTF-8?Q?Fernando_Apestegu=c3=ada?= Date: Wed, 21 Nov 2018 17:07:43 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r485522 - in branches/2018Q4/cad/openvsp: . files X-SVN-Group: ports-branches X-SVN-Commit-Author: fernape X-SVN-Commit-Paths: in branches/2018Q4/cad/openvsp: . files X-SVN-Commit-Revision: 485522 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Rspamd-Queue-Id: 50F766B25C X-Spamd-Result: default: False [0.48 / 15.00]; local_wl_from(0.00)[FreeBSD.org]; NEURAL_SPAM_LONG(0.00)[0.004,0]; NEURAL_SPAM_SHORT(0.20)[0.197,0]; NEURAL_SPAM_MEDIUM(0.27)[0.274,0]; ASN(0.00)[asn:11403, ipnet:2610:1c1:1::/48, country:US] X-Rspamd-Server: mx1.freebsd.org X-BeenThere: svn-ports-branches@freebsd.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: SVN commit messages for all the branches of the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 21 Nov 2018 17:07:44 -0000 Author: fernape Date: Wed Nov 21 17:07:43 2018 New Revision: 485522 URL: https://svnweb.freebsd.org/changeset/ports/485522 Log: MFH: r485187 cad/openvsp: Unbreak port Port was broken after last compilers updates in 11 and 12. Clang is now able to compile the port but we need to patch as_callfunc_x86.cpp unconditionally, otherwise clang complains (or dies, depending on the version) with: this directive must appear between .cfi_startproc and .cfi_endproc directives Also use localbase to simplify flags handling. Reported by: pkg-fallout Approved by: portmgr@ Added: branches/2018Q4/cad/openvsp/files/patch-src_external_angelscript_sdk_angelscript_source_as__callfunc__x86.cpp - copied unchanged from r485187, head/cad/openvsp/files/patch-src_external_angelscript_sdk_angelscript_source_as__callfunc__x86.cpp Deleted: branches/2018Q4/cad/openvsp/files/extra-src_external_angelscript_sdk_angelscript_source_as__callfunc__x86.cpp Modified: branches/2018Q4/cad/openvsp/Makefile Directory Properties: branches/2018Q4/ (props changed) Modified: branches/2018Q4/cad/openvsp/Makefile ============================================================================== --- branches/2018Q4/cad/openvsp/Makefile Wed Nov 21 16:37:34 2018 (r485521) +++ branches/2018Q4/cad/openvsp/Makefile Wed Nov 21 17:07:43 2018 (r485522) @@ -30,22 +30,15 @@ BUILD_DEPENDS= ${LOCALBASE}/lib/libopenNURBS.a:graphic ${LOCALBASE}/include/glm/glm.hpp:math/glm \ ${LOCALBASE}/libdata/pkgconfig/pthread-stubs.pc:devel/libpthread-stubs -CMAKE_SOURCE_PATH= ${WRKSRC}/SuperProject -CMAKE_INSTALL_PREFIX= ${STAGEDIR}${PREFIX} +USES= compiler:c++11-lang cmake:outsource,noninja localbase\ + gl gnome jpeg -USES= cmake:outsource,noninja jpeg - USE_GITHUB= yes GH_PROJECT= OpenVSP GH_ACCOUNT= ${GH_PROJECT} -# On FreeBSD < 11 libc++ lacks support for sized delete operators. -# GCC dropped the builtin version of these operators in 6+ by -# defaulting to gnu++14. Force c++11 instead. -# For a more detailed discussion see: -# https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=219484 -USE_CXXSTD= gnu++11 - +CMAKE_SOURCE_PATH= ${WRKSRC}/SuperProject +CMAKE_INSTALL_PREFIX= ${STAGEDIR}${PREFIX} CMAKE_ARGS= -DVSP_USE_SYSTEM_CMINPACK:BOOLEAN=yes \ -DVSP_USE_SYSTEM_CPPTEST:BOOLEAN=yes \ -DVSP_USE_SYSTEM_CODEELI:BOOLEAN=no \ @@ -60,23 +53,8 @@ USE_XORG= ice sm x11 xau xcb xdamage xdmcp xext xfixes USE_GL= gl glu USE_GNOME= libxml2 -CFLAGS+= -I${LOCALBASE}/include/openNURBS .include - -# In 12 gcc can not compile the port so switch to clang 5.0.0 in base. -# But wait! It crashes while compiling so apply a patch to avoid weird asm code -# that makes clang die -# For details see: -# https://lists.freebsd.org/pipermail/freebsd-hackers/2017-August/051352.html - -.if ${OPSYS} == FreeBSD && ${OSVERSION} >= 1200000 -USES+= compiler:c++11-lib -EXTRA_PATCHES= ${FILESDIR}/extra-src_external_angelscript_sdk_angelscript_source_as__callfunc__x86.cpp -CFLAGS+= -I${LOCALBASE}/include -.else -USES+= compiler:gcc-c++11-lib -.endif BUILD_PREFIX= OpenVSP-prefix/src/OpenVSP-build/_CPack_Packages/FreeBSD/ZIP/OpenVSP-${DISTVERSION}-FreeBSD Copied: branches/2018Q4/cad/openvsp/files/patch-src_external_angelscript_sdk_angelscript_source_as__callfunc__x86.cpp (from r485187, head/cad/openvsp/files/patch-src_external_angelscript_sdk_angelscript_source_as__callfunc__x86.cpp) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/2018Q4/cad/openvsp/files/patch-src_external_angelscript_sdk_angelscript_source_as__callfunc__x86.cpp Wed Nov 21 17:07:43 2018 (r485522, copy of r485187, head/cad/openvsp/files/patch-src_external_angelscript_sdk_angelscript_source_as__callfunc__x86.cpp) @@ -0,0 +1,164 @@ +--- src/external/angelscript/sdk/angelscript/source/as_callfunc_x86.cpp.orig 2017-08-02 20:09:54 UTC ++++ src/external/angelscript/sdk/angelscript/source/as_callfunc_x86.cpp +@@ -340,7 +340,7 @@ endcopy: + volatile asPWORD a[] = {asPWORD(args), asPWORD(paramSize), asPWORD(func)}; + + asm __volatile__( +-#ifdef __OPTIMIZE__ ++#if defined(__OPTIMIZE__) && !defined(__clang__) + // When compiled with optimizations the stack unwind doesn't work properly, + // causing exceptions to crash the application. By adding this prologue + // and the epilogue below, the stack unwind works as it should. +@@ -385,7 +385,7 @@ endcopy: + // Pop the alignment bytes + "popl %%esp \n" + "popl %%ebx \n" +-#ifdef __OPTIMIZE__ ++#if defined(__OPTIMIZE__) && !defined(__clang__) + // Epilogue + "movl %%ebp, %%esp \n" + ".cfi_def_cfa_register esp \n" +@@ -462,7 +462,7 @@ endcopy: + volatile asPWORD a[] = {asPWORD(obj), asPWORD(args), asPWORD(paramSize), asPWORD(func)}; + + asm __volatile__ ( +-#ifdef __OPTIMIZE__ ++#if defined(__OPTIMIZE__) && !defined(__clang__) + // When compiled with optimizations the stack unwind doesn't work properly, + // causing exceptions to crash the application. By adding this prologue + // and the epilogue below, the stack unwind works as it should. +@@ -508,7 +508,7 @@ endcopy: + // Pop the alignment bytes + "popl %%esp \n" + "popl %%ebx \n" +-#ifdef __OPTIMIZE__ ++#if defined(__OPTIMIZE__) && !defined(__clang__) + // Epilogue + "movl %%ebp, %%esp \n" + ".cfi_def_cfa_register esp \n" +@@ -585,7 +585,7 @@ endcopy: + volatile asPWORD a[] = {asPWORD(obj), asPWORD(args), asPWORD(paramSize), asPWORD(func)}; + + asm __volatile__ ( +-#ifdef __OPTIMIZE__ ++#if defined(__OPTIMIZE__) && !defined(__clang__) + // When compiled with optimizations the stack unwind doesn't work properly, + // causing exceptions to crash the application. By adding this prologue + // and the epilogue below, the stack unwind works as it should. +@@ -631,7 +631,7 @@ endcopy: + // Pop the alignment bytes + "popl %%esp \n" + "popl %%ebx \n" +-#ifdef __OPTIMIZE__ ++#if defined(__OPTIMIZE__) && !defined(__clang__) + // Epilogue + "movl %%ebp, %%esp \n" + ".cfi_def_cfa_register esp \n" +@@ -717,7 +717,7 @@ endcopy: + volatile asPWORD a[] = {asPWORD(obj), asPWORD(args), asPWORD(paramSize), asPWORD(func), asPWORD(retPtr)}; + + asm __volatile__ ( +-#ifdef __OPTIMIZE__ ++#if defined(__OPTIMIZE__) && !defined(__clang__) + // When compiled with optimizations the stack unwind doesn't work properly, + // causing exceptions to crash the application. By adding this prologue + // and the epilogue below, the stack unwind works as it should. +@@ -767,7 +767,7 @@ endcopy: + // Pop the alignment bytes + "popl %%esp \n" + "popl %%ebx \n" +-#ifdef __OPTIMIZE__ ++#if defined(__OPTIMIZE__) && !defined(__clang__) + // Epilogue + "movl %%ebp, %%esp \n" + ".cfi_def_cfa_register esp \n" +@@ -849,7 +849,7 @@ endcopy: + volatile asPWORD a[] = {asPWORD(args), asPWORD(paramSize), asPWORD(func), asPWORD(retPtr)}; + + asm __volatile__ ( +-#ifdef __OPTIMIZE__ ++#if defined(__OPTIMIZE__) && !defined(__clang__) + // When compiled with optimizations the stack unwind doesn't work properly, + // causing exceptions to crash the application. By adding this prologue + // and the epilogue below, the stack unwind works as it should. +@@ -896,7 +896,7 @@ endcopy: + // Pop the alignment bytes + "popl %%esp \n" + "popl %%ebx \n" +-#ifdef __OPTIMIZE__ ++#if defined(__OPTIMIZE__) && !defined(__clang__) + // Epilogue + "movl %%ebp, %%esp \n" + ".cfi_def_cfa_register esp \n" +@@ -980,7 +980,7 @@ endcopy: + volatile asPWORD a[] = {asPWORD(obj), asPWORD(args), asPWORD(paramSize), asPWORD(func), asPWORD(retPtr)}; + + asm __volatile__ ( +-#ifdef __OPTIMIZE__ ++#if defined(__OPTIMIZE__) && !defined(__clang__) + // When compiled with optimizations the stack unwind doesn't work properly, + // causing exceptions to crash the application. By adding this prologue + // and the epilogue below, the stack unwind works as it should. +@@ -1030,7 +1030,7 @@ endcopy: + // Pop the alignment bytes + "popl %%esp \n" + "popl %%ebx \n" +-#ifdef __OPTIMIZE__ ++#if defined(__OPTIMIZE__) && !defined(__clang__) + // Epilogue + "movl %%ebp, %%esp \n" + ".cfi_def_cfa_register esp \n" +@@ -1102,7 +1102,7 @@ endcopy: + volatile asPWORD a[] = {asPWORD(args), asPWORD(paramSize), asPWORD(func)}; + + asm __volatile__ ( +-#ifdef __OPTIMIZE__ ++#if defined(__OPTIMIZE__) && !defined(__clang__) + // When compiled with optimizations the stack unwind doesn't work properly, + // causing exceptions to crash the application. By adding this prologue + // and the epilogue below, the stack unwind works as it should. +@@ -1145,7 +1145,7 @@ endcopy: + // Pop the alignment bytes + "popl %%esp \n" + "popl %%ebx \n" +-#ifdef __OPTIMIZE__ ++#if defined(__OPTIMIZE__) && !defined(__clang__) + // Epilogue + "movl %%ebp, %%esp \n" + ".cfi_def_cfa_register esp \n" +@@ -1233,7 +1233,7 @@ endcopy: + volatile asPWORD a[] = {asPWORD(obj), asPWORD(args), asPWORD(paramSize), asPWORD(func)}; + + asm __volatile__ ( +-#ifdef __OPTIMIZE__ ++#if defined(__OPTIMIZE__) && !defined(__clang__) + // When compiled with optimizations the stack unwind doesn't work properly, + // causing exceptions to crash the application. By adding this prologue + // and the epilogue below, the stack unwind works as it should. +@@ -1285,7 +1285,7 @@ endcopy: + // Pop the alignment bytes + "popl %%esp \n" + "popl %%ebx \n" +-#ifdef __OPTIMIZE__ ++#if defined(__OPTIMIZE__) && !defined(__clang__) + // Epilogue + "movl %%ebp, %%esp \n" + ".cfi_def_cfa_register esp \n" +@@ -1380,7 +1380,7 @@ endcopy: + volatile asPWORD a[] = {asPWORD(obj), asPWORD(args), asPWORD(paramSize), asPWORD(func), asPWORD(retPtr)}; + + asm __volatile__ ( +-#ifdef __OPTIMIZE__ ++#if defined(__OPTIMIZE__) && !defined(__clang__) + // When compiled with optimizations the stack unwind doesn't work properly, + // causing exceptions to crash the application. By adding this prologue + // and the epilogue below, the stack unwind works as it should. +@@ -1445,7 +1445,7 @@ endcopy: + // Pop the alignment bytes + "popl %%esp \n" + "popl %%ebx \n" +-#ifdef __OPTIMIZE__ ++#if defined(__OPTIMIZE__) && !defined(__clang__) + // Epilogue + "movl %%ebp, %%esp \n" + ".cfi_def_cfa_register esp \n" From owner-svn-ports-branches@freebsd.org Wed Nov 21 20:38:17 2018 Return-Path: Delivered-To: svn-ports-branches@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 0CD7B1145D14; Wed, 21 Nov 2018 20:38:17 +0000 (UTC) (envelope-from truckman@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 9FDDA75CC7; Wed, 21 Nov 2018 20:38:16 +0000 (UTC) (envelope-from truckman@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 80DAD2573A; Wed, 21 Nov 2018 20:38:16 +0000 (UTC) (envelope-from truckman@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id wALKcGWO061281; Wed, 21 Nov 2018 20:38:16 GMT (envelope-from truckman@FreeBSD.org) Received: (from truckman@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id wALKcGWf061280; Wed, 21 Nov 2018 20:38:16 GMT (envelope-from truckman@FreeBSD.org) Message-Id: <201811212038.wALKcGWf061280@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: truckman set sender to truckman@FreeBSD.org using -f From: Don Lewis Date: Wed, 21 Nov 2018 20:38:16 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r485554 - branches/2018Q4/editors/openoffice-4 X-SVN-Group: ports-branches X-SVN-Commit-Author: truckman X-SVN-Commit-Paths: branches/2018Q4/editors/openoffice-4 X-SVN-Commit-Revision: 485554 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Rspamd-Queue-Id: 9FDDA75CC7 X-Spamd-Result: default: False [0.48 / 15.00]; local_wl_from(0.00)[FreeBSD.org]; NEURAL_SPAM_SHORT(0.25)[0.249,0]; NEURAL_HAM_LONG(-0.00)[-0.003,0]; NEURAL_SPAM_MEDIUM(0.23)[0.231,0]; ASN(0.00)[asn:11403, ipnet:2610:1c1:1::/48, country:US] X-Rspamd-Server: mx1.freebsd.org X-BeenThere: svn-ports-branches@freebsd.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: SVN commit messages for all the branches of the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 21 Nov 2018 20:38:17 -0000 Author: truckman Date: Wed Nov 21 20:38:16 2018 New Revision: 485554 URL: https://svnweb.freebsd.org/changeset/ports/485554 Log: MFH: r485501 Get unoregwin.dll back into distinfo. It seems that something has changed in the ports framework such that "make makesum" drops optional distfiles from distinfo if the option to use that distfile is not enabled. Reported by: brian mckeon Approved by: ports-secteam (miwi) Modified: branches/2018Q4/editors/openoffice-4/distinfo Directory Properties: branches/2018Q4/ (props changed) Modified: branches/2018Q4/editors/openoffice-4/distinfo ============================================================================== --- branches/2018Q4/editors/openoffice-4/distinfo Wed Nov 21 20:30:08 2018 (r485553) +++ branches/2018Q4/editors/openoffice-4/distinfo Wed Nov 21 20:38:16 2018 (r485554) @@ -1,5 +1,7 @@ -TIMESTAMP = 1542135943 +TIMESTAMP = 1542783715 SHA256 (openoffice/apache-openoffice-4.1.6-r1844436-src.tar.bz2) = 5189880207977a0fd6d4ef5eada7d18d8dbf94cddcc71822889cfb6c82cfed18 SIZE (openoffice/apache-openoffice-4.1.6-r1844436-src.tar.bz2) = 220017032 SHA256 (openoffice/ApacheOpenOffice.ext_sources.4.x.x.20150707.tar.gz) = 966a8333c83a18ddd84401389006d6e0b52b8175924b808b54b88211669985fa SIZE (openoffice/ApacheOpenOffice.ext_sources.4.x.x.20150707.tar.gz) = 28957004 +SHA256 (openoffice/unowinreg.dll) = f563e522922133db9340b0306711c2d8767cc3481dd9e7d9b0d059906d12653c +SIZE (openoffice/unowinreg.dll) = 6144 From owner-svn-ports-branches@freebsd.org Thu Nov 22 04:43:53 2018 Return-Path: Delivered-To: svn-ports-branches@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 632C41136AA1; Thu, 22 Nov 2018 04:43:53 +0000 (UTC) (envelope-from meta@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 096A289CFA; Thu, 22 Nov 2018 04:43:53 +0000 (UTC) (envelope-from meta@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id DDD0B2D67; Thu, 22 Nov 2018 04:43:52 +0000 (UTC) (envelope-from meta@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id wAM4hq43013862; Thu, 22 Nov 2018 04:43:52 GMT (envelope-from meta@FreeBSD.org) Received: (from meta@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id wAM4hqu0013861; Thu, 22 Nov 2018 04:43:52 GMT (envelope-from meta@FreeBSD.org) Message-Id: <201811220443.wAM4hqu0013861@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: meta set sender to meta@FreeBSD.org using -f From: Koichiro Iwao Date: Thu, 22 Nov 2018 04:43:52 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r485581 - branches/2018Q4/mail/fetchmail X-SVN-Group: ports-branches X-SVN-Commit-Author: meta X-SVN-Commit-Paths: branches/2018Q4/mail/fetchmail X-SVN-Commit-Revision: 485581 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Rspamd-Queue-Id: 096A289CFA X-Spamd-Result: default: False [1.31 / 15.00]; local_wl_from(0.00)[FreeBSD.org]; NEURAL_SPAM_SHORT(0.42)[0.419,0]; NEURAL_SPAM_MEDIUM(0.49)[0.489,0]; NEURAL_SPAM_LONG(0.40)[0.400,0]; ASN(0.00)[asn:11403, ipnet:2610:1c1:1::/48, country:US] X-Rspamd-Server: mx1.freebsd.org X-BeenThere: svn-ports-branches@freebsd.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: SVN commit messages for all the branches of the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 22 Nov 2018 04:43:53 -0000 Author: meta Date: Thu Nov 22 04:43:52 2018 New Revision: 485581 URL: https://svnweb.freebsd.org/changeset/ports/485581 Log: MFH: r485579 mail/fetchmail: backport SNI support from upstream This affects some servers such as Gmail. See also bugs on Linux distributions. * https://bugzilla.redhat.com/show_bug.cgi?id=1611815 * https://bugs.launchpad.net/ubuntu/+source/fetchmail/+bug/1798786 PR: 233078 Submitted by: fuyuhiko.maruyama@gmail.com Approved by: Corey Halpin (maintainer), mentors (implicit) Obtained from: https://gitlab.com/fetchmail/fetchmail/commit/9b8b634312f169fab872f3580c2febe5af031615 Approved by: portmgr (miwi) Modified: branches/2018Q4/mail/fetchmail/Makefile branches/2018Q4/mail/fetchmail/distinfo Directory Properties: branches/2018Q4/ (props changed) Modified: branches/2018Q4/mail/fetchmail/Makefile ============================================================================== --- branches/2018Q4/mail/fetchmail/Makefile Thu Nov 22 04:36:53 2018 (r485580) +++ branches/2018Q4/mail/fetchmail/Makefile Thu Nov 22 04:43:52 2018 (r485581) @@ -3,10 +3,13 @@ PORTNAME= fetchmail PORTVERSION= 6.3.26 -PORTREVISION= 6 +PORTREVISION= 7 CATEGORIES= mail ipv6 MASTER_SITES= SF/${PORTNAME}/branch_6.3/ \ http://mandree.home.pages.de/${PORTNAME}/ + +PATCH_SITES= https://gitlab.com/fetchmail/fetchmail/commit/ +PATCHFILES= 9b8b634.patch:-p1 MAINTAINER= chalpin@cs.wisc.edu COMMENT= Batch mail retrieval utility for IMAP/POP3/ETRN/ODMR Modified: branches/2018Q4/mail/fetchmail/distinfo ============================================================================== --- branches/2018Q4/mail/fetchmail/distinfo Thu Nov 22 04:36:53 2018 (r485580) +++ branches/2018Q4/mail/fetchmail/distinfo Thu Nov 22 04:43:52 2018 (r485581) @@ -1,2 +1,5 @@ +TIMESTAMP = 1542709974 SHA256 (fetchmail-6.3.26.tar.xz) = 79b4c54cdbaf02c1a9a691d9948fcb1a77a1591a813e904283a8b614b757e850 SIZE (fetchmail-6.3.26.tar.xz) = 1283816 +SHA256 (9b8b634.patch) = b0a9f7e28e7e6a5a16669832ad7a7a7dca47b435ce446ef10bd0421deea4a848 +SIZE (9b8b634.patch) = 1023 From owner-svn-ports-branches@freebsd.org Thu Nov 22 08:12:06 2018 Return-Path: Delivered-To: svn-ports-branches@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id CF1AA113FA6A; Thu, 22 Nov 2018 08:12:06 +0000 (UTC) (envelope-from joneum@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 76CE86B525; Thu, 22 Nov 2018 08:12:06 +0000 (UTC) (envelope-from joneum@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 583375467; Thu, 22 Nov 2018 08:12:06 +0000 (UTC) (envelope-from joneum@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id wAM8C6VU018601; Thu, 22 Nov 2018 08:12:06 GMT (envelope-from joneum@FreeBSD.org) Received: (from joneum@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id wAM8C5fs018598; Thu, 22 Nov 2018 08:12:05 GMT (envelope-from joneum@FreeBSD.org) Message-Id: <201811220812.wAM8C5fs018598@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: joneum set sender to joneum@FreeBSD.org using -f From: Jochen Neumeister Date: Thu, 22 Nov 2018 08:12:05 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r485583 - branches/2018Q4/mail/phpmailer6 X-SVN-Group: ports-branches X-SVN-Commit-Author: joneum X-SVN-Commit-Paths: branches/2018Q4/mail/phpmailer6 X-SVN-Commit-Revision: 485583 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Rspamd-Queue-Id: 76CE86B525 X-Spamd-Result: default: False [1.45 / 15.00]; local_wl_from(0.00)[FreeBSD.org]; NEURAL_SPAM_LONG(0.42)[0.420,0]; NEURAL_SPAM_MEDIUM(0.51)[0.514,0]; ASN(0.00)[asn:11403, ipnet:2610:1c1:1::/48, country:US]; NEURAL_SPAM_SHORT(0.52)[0.516,0] X-Rspamd-Server: mx1.freebsd.org X-BeenThere: svn-ports-branches@freebsd.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: SVN commit messages for all the branches of the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 22 Nov 2018 08:12:07 -0000 Author: joneum Date: Thu Nov 22 08:12:05 2018 New Revision: 485583 URL: https://svnweb.freebsd.org/changeset/ports/485583 Log: MFH: r485563 Update to 6.0.6 Changelog: https://github.com/PHPMailer/PHPMailer/releases/tag/v6.0.6 Security: b036faba-edd8-11e8-b3b7-00e04c1ea73d Sponsored by: Netzkommune GmbH Approved by: ports-secteam (miwi) Modified: branches/2018Q4/mail/phpmailer6/Makefile branches/2018Q4/mail/phpmailer6/distinfo branches/2018Q4/mail/phpmailer6/pkg-plist Directory Properties: branches/2018Q4/ (props changed) Modified: branches/2018Q4/mail/phpmailer6/Makefile ============================================================================== --- branches/2018Q4/mail/phpmailer6/Makefile Thu Nov 22 07:45:43 2018 (r485582) +++ branches/2018Q4/mail/phpmailer6/Makefile Thu Nov 22 08:12:05 2018 (r485583) @@ -1,7 +1,7 @@ # $FreeBSD$ PORTNAME= phpmailer -PORTVERSION= 6.0.5 +PORTVERSION= 6.0.6 DISTVERSIONPREFIX= v CATEGORIES= mail PKGNAMESUFFIX= 6 Modified: branches/2018Q4/mail/phpmailer6/distinfo ============================================================================== --- branches/2018Q4/mail/phpmailer6/distinfo Thu Nov 22 07:45:43 2018 (r485582) +++ branches/2018Q4/mail/phpmailer6/distinfo Thu Nov 22 08:12:05 2018 (r485583) @@ -1,3 +1,3 @@ -TIMESTAMP = 1527709440 -SHA256 (PHPMailer-PHPMailer-v6.0.5_GH0.tar.gz) = 3b3148182b4f886c2c1eab1936a2c8d2f90f444e73bfbae265e3ed8e2738d21e -SIZE (PHPMailer-PHPMailer-v6.0.5_GH0.tar.gz) = 88092 +TIMESTAMP = 1542836829 +SHA256 (PHPMailer-PHPMailer-v6.0.6_GH0.tar.gz) = 3cf1f9a2ef06809040cb8b532e3de95d483cb10f25f722548f6a73a0d134666c +SIZE (PHPMailer-PHPMailer-v6.0.6_GH0.tar.gz) = 90407 Modified: branches/2018Q4/mail/phpmailer6/pkg-plist ============================================================================== --- branches/2018Q4/mail/phpmailer6/pkg-plist Thu Nov 22 07:45:43 2018 (r485582) +++ branches/2018Q4/mail/phpmailer6/pkg-plist Thu Nov 22 08:12:05 2018 (r485583) @@ -33,6 +33,7 @@ %%DATADIR%%/language/phpmailer.lang-ko.php %%DATADIR%%/language/phpmailer.lang-lt.php %%DATADIR%%/language/phpmailer.lang-lv.php +%%DATADIR%%/language/phpmailer.lang-mg.php %%DATADIR%%/language/phpmailer.lang-ms.php %%DATADIR%%/language/phpmailer.lang-nb.php %%DATADIR%%/language/phpmailer.lang-nl.php @@ -40,11 +41,12 @@ %%DATADIR%%/language/phpmailer.lang-pt.php %%DATADIR%%/language/phpmailer.lang-pt_br.php %%DATADIR%%/language/phpmailer.lang-ro.php -%%DATADIR%%/language/phpmailer.lang-rs.php %%DATADIR%%/language/phpmailer.lang-ru.php %%DATADIR%%/language/phpmailer.lang-sk.php %%DATADIR%%/language/phpmailer.lang-sl.php +%%DATADIR%%/language/phpmailer.lang-sr.php %%DATADIR%%/language/phpmailer.lang-sv.php +%%DATADIR%%/language/phpmailer.lang-tl.php %%DATADIR%%/language/phpmailer.lang-tr.php %%DATADIR%%/language/phpmailer.lang-uk.php %%DATADIR%%/language/phpmailer.lang-vi.php From owner-svn-ports-branches@freebsd.org Thu Nov 22 10:18:46 2018 Return-Path: Delivered-To: svn-ports-branches@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 8B875114444A; Thu, 22 Nov 2018 10:18:46 +0000 (UTC) (envelope-from mfechner@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 2C0AB70218; Thu, 22 Nov 2018 10:18:46 +0000 (UTC) (envelope-from mfechner@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 08BD368C7; Thu, 22 Nov 2018 10:18:46 +0000 (UTC) (envelope-from mfechner@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id wAMAIjS3083795; Thu, 22 Nov 2018 10:18:45 GMT (envelope-from mfechner@FreeBSD.org) Received: (from mfechner@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id wAMAIjE3083792; Thu, 22 Nov 2018 10:18:45 GMT (envelope-from mfechner@FreeBSD.org) Message-Id: <201811221018.wAMAIjE3083792@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: mfechner set sender to mfechner@FreeBSD.org using -f From: Matthias Fechner Date: Thu, 22 Nov 2018 10:18:45 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r485592 - branches/2018Q4/www/gitlab-ce X-SVN-Group: ports-branches X-SVN-Commit-Author: mfechner X-SVN-Commit-Paths: branches/2018Q4/www/gitlab-ce X-SVN-Commit-Revision: 485592 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Rspamd-Queue-Id: 2C0AB70218 X-Spamd-Result: default: False [1.40 / 15.00]; local_wl_from(0.00)[FreeBSD.org]; NEURAL_SPAM_SHORT(0.47)[0.471,0]; NEURAL_SPAM_MEDIUM(0.51)[0.514,0]; NEURAL_SPAM_LONG(0.42)[0.420,0]; ASN(0.00)[asn:11403, ipnet:2610:1c1:1::/48, country:US] X-Rspamd-Server: mx1.freebsd.org X-BeenThere: svn-ports-branches@freebsd.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: SVN commit messages for all the branches of the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 22 Nov 2018 10:18:46 -0000 Author: mfechner Date: Thu Nov 22 10:18:45 2018 New Revision: 485592 URL: https://svnweb.freebsd.org/changeset/ports/485592 Log: MFH: r485436 Security update to 11.4.7. For detailed changelog see: https://about.gitlab.com/2018/11/19/critical-security-release-gitlab-11-dot-4-dot-6-released/ Approved by: mentors (implicit) MFC after: 1 day Security: d889d32c-ecd9-11e8-9416-001b217b3468 Approved by: ports-secteam (miwi) Modified: branches/2018Q4/www/gitlab-ce/Makefile branches/2018Q4/www/gitlab-ce/distinfo branches/2018Q4/www/gitlab-ce/pkg-plist Directory Properties: branches/2018Q4/ (props changed) Modified: branches/2018Q4/www/gitlab-ce/Makefile ============================================================================== --- branches/2018Q4/www/gitlab-ce/Makefile Thu Nov 22 10:14:55 2018 (r485591) +++ branches/2018Q4/www/gitlab-ce/Makefile Thu Nov 22 10:18:45 2018 (r485592) @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= gitlab-ce -PORTVERSION= 11.4.4 +PORTVERSION= 11.4.7 CATEGORIES= www devel MAINTAINER= mfechner@FreeBSD.org @@ -216,7 +216,7 @@ USE_RC_SUBR= gitlab USE_GITLAB= yes GL_ACCOUNT= gitlab-org # Find the here: https://gitlab.com/gitlab-org/gitlab-ce/tags -GL_COMMIT= 2e8fd64ba68c310e9aa387531d1dc65184a80135 +GL_COMMIT= 98f84238230c94a46a9864a5a267becd67d30b50 USERS= git GROUPS= git Modified: branches/2018Q4/www/gitlab-ce/distinfo ============================================================================== --- branches/2018Q4/www/gitlab-ce/distinfo Thu Nov 22 10:14:55 2018 (r485591) +++ branches/2018Q4/www/gitlab-ce/distinfo Thu Nov 22 10:18:45 2018 (r485592) @@ -1,3 +1,3 @@ -TIMESTAMP = 1541100338 -SHA256 (gitlab-org-gitlab-ce-2e8fd64ba68c310e9aa387531d1dc65184a80135_GL0.tar.gz) = baffd279827d39d48be76386352ee6500877e41e2072f6ea4a5b473950c35b5c -SIZE (gitlab-org-gitlab-ce-2e8fd64ba68c310e9aa387531d1dc65184a80135_GL0.tar.gz) = 43341488 +TIMESTAMP = 1542725881 +SHA256 (gitlab-org-gitlab-ce-98f84238230c94a46a9864a5a267becd67d30b50_GL0.tar.gz) = 3636f7c98c6510c794dea1bcc9e925741c57311d85a809cfbc91582ed5fde494 +SIZE (gitlab-org-gitlab-ce-98f84238230c94a46a9864a5a267becd67d30b50_GL0.tar.gz) = 43343407 Modified: branches/2018Q4/www/gitlab-ce/pkg-plist ============================================================================== --- branches/2018Q4/www/gitlab-ce/pkg-plist Thu Nov 22 10:14:55 2018 (r485591) +++ branches/2018Q4/www/gitlab-ce/pkg-plist Thu Nov 22 10:18:45 2018 (r485592) @@ -8921,6 +8921,7 @@ %%WWWDIR%%/doc/workflow/workflow.md %%WWWDIR%%/docker-compose.yml %%WWWDIR%%/docker/README.md +%%WWWDIR%%/ee/changelogs/unreleased/sh-fix-issue-54189.yml %%WWWDIR%%/fixtures/emojis/aliases.json %%WWWDIR%%/fixtures/emojis/digests.json %%WWWDIR%%/fixtures/emojis/emoji-unicode-version-map.json From owner-svn-ports-branches@freebsd.org Thu Nov 22 10:48:35 2018 Return-Path: Delivered-To: svn-ports-branches@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 962C31144EB7; Thu, 22 Nov 2018 10:48:35 +0000 (UTC) (envelope-from ale@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 2523171280; Thu, 22 Nov 2018 10:48:35 +0000 (UTC) (envelope-from ale@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 013FF6D92; Thu, 22 Nov 2018 10:48:35 +0000 (UTC) (envelope-from ale@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id wAMAmYNN099874; Thu, 22 Nov 2018 10:48:34 GMT (envelope-from ale@FreeBSD.org) Received: (from ale@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id wAMAmXng099868; Thu, 22 Nov 2018 10:48:33 GMT (envelope-from ale@FreeBSD.org) Message-Id: <201811221048.wAMAmXng099868@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: ale set sender to ale@FreeBSD.org using -f From: Alex Dupre Date: Thu, 22 Nov 2018 10:48:33 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r485593 - in branches/2018Q4/security/pam_p11: . files X-SVN-Group: ports-branches X-SVN-Commit-Author: ale X-SVN-Commit-Paths: in branches/2018Q4/security/pam_p11: . files X-SVN-Commit-Revision: 485593 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Rspamd-Queue-Id: 2523171280 X-Spamd-Result: default: False [1.37 / 15.00]; local_wl_from(0.00)[FreeBSD.org]; NEURAL_SPAM_LONG(0.44)[0.439,0]; NEURAL_SPAM_SHORT(0.39)[0.393,0]; NEURAL_SPAM_MEDIUM(0.54)[0.538,0]; ASN(0.00)[asn:11403, ipnet:2610:1c1:1::/48, country:US] X-Rspamd-Server: mx1.freebsd.org X-BeenThere: svn-ports-branches@freebsd.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: SVN commit messages for all the branches of the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 22 Nov 2018 10:48:35 -0000 Author: ale Date: Thu Nov 22 10:48:33 2018 New Revision: 485593 URL: https://svnweb.freebsd.org/changeset/ports/485593 Log: MFH: r482217 r482333 r482904 Update to 0.2.0 release and fix build with OpenSSL 1.1. Approved by: ports-secteam (blanket, build fix) Added: branches/2018Q4/security/pam_p11/files/patch-configure.ac - copied unchanged from r482904, head/security/pam_p11/files/patch-configure.ac branches/2018Q4/security/pam_p11/files/patch-src_Makefile.am - copied unchanged from r482904, head/security/pam_p11/files/patch-src_Makefile.am branches/2018Q4/security/pam_p11/files/patch-src_pam__p11.c - copied, changed from r482217, head/security/pam_p11/files/patch-src_pam__p11.c Deleted: branches/2018Q4/security/pam_p11/files/patch-configure branches/2018Q4/security/pam_p11/files/patch-src_pam_p11.c branches/2018Q4/security/pam_p11/pkg-plist Modified: branches/2018Q4/security/pam_p11/Makefile branches/2018Q4/security/pam_p11/distinfo branches/2018Q4/security/pam_p11/files/patch-src_test.c branches/2018Q4/security/pam_p11/pkg-descr Directory Properties: branches/2018Q4/ (props changed) Modified: branches/2018Q4/security/pam_p11/Makefile ============================================================================== --- branches/2018Q4/security/pam_p11/Makefile Thu Nov 22 10:18:45 2018 (r485592) +++ branches/2018Q4/security/pam_p11/Makefile Thu Nov 22 10:48:33 2018 (r485593) @@ -2,10 +2,10 @@ # $FreeBSD$ PORTNAME= pam_p11 -PORTVERSION= 0.1.5 -PORTREVISION= 3 +PORTVERSION= 0.2.0 +PORTREVISION= 1 CATEGORIES= security -MASTER_SITES= SF/opensc/${PORTNAME} +MASTER_SITES= https://github.com/OpenSC/pam_p11/releases/download/pam_p11-${PORTVERSION}/ MAINTAINER= ale@FreeBSD.org COMMENT= PAM module using crypto tokens for auth @@ -14,20 +14,26 @@ LICENSE= LGPL21 LIB_DEPENDS= libp11.so:security/libp11 -OPTIONS_DEFINE= DOCS +USES= libtool pkgconfig ssl autoreconf +OPTIONS_DEFINE= DOCS NLS + GNU_CONFIGURE= yes -USES= libtool pkgconfig ssl +NLS_CONFIGURE_ENABLE= nls +NLS_USES= gettext +NLS_PLIST_FILES=share/locale/de/LC_MESSAGES/pam_p11.mo + +CONFIGURE_ARGS= --with-libintl-prefix=${LOCALBASE} + CONFIGURE_ENV= OPENSSL_CFLAGS="-I${OPENSSLINC}" \ - OPENSSL_LIBS="-L${OPENSSLLIB} -lssl" + OPENSSL_LIBS="-L${OPENSSLLIB} -lcrypto" +PLIST_FILES= lib/security/pam_p11.so + PORTDOCS= * post-install: - @${MKDIR} ${STAGEDIR}${DOCSDIR}/wiki - @(cd ${WRKSRC} && ${CP} NEWS ${STAGEDIR}${DOCSDIR}) - @(cd ${WRKSRC}/doc && ${CP} README ${STAGEDIR}${DOCSDIR}) - @(cd ${WRKSRC}/doc && ${CP} *.css *.html ${STAGEDIR}${DOCSDIR}/wiki) + ${INSTALL_DATA} ${WRKSRC}/NEWS ${STAGEDIR}${DOCSDIR} .include Modified: branches/2018Q4/security/pam_p11/distinfo ============================================================================== --- branches/2018Q4/security/pam_p11/distinfo Thu Nov 22 10:18:45 2018 (r485592) +++ branches/2018Q4/security/pam_p11/distinfo Thu Nov 22 10:48:33 2018 (r485593) @@ -1,2 +1,3 @@ -SHA256 (pam_p11-0.1.5.tar.gz) = 74da875467c4ba156f7cb7eaec0718f92dded03f40db3c6c0423c03f44d9f25a -SIZE (pam_p11-0.1.5.tar.gz) = 348181 +TIMESTAMP = 1539433560 +SHA256 (pam_p11-0.2.0.tar.gz) = 088d4c05d23fee9535f1b16f6c993c88b11cbed0288d5a1d0b37da2f390325a2 +SIZE (pam_p11-0.2.0.tar.gz) = 417550 Copied: branches/2018Q4/security/pam_p11/files/patch-configure.ac (from r482904, head/security/pam_p11/files/patch-configure.ac) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/2018Q4/security/pam_p11/files/patch-configure.ac Thu Nov 22 10:48:33 2018 (r485593, copy of r482904, head/security/pam_p11/files/patch-configure.ac) @@ -0,0 +1,14 @@ +--- configure.ac.orig 2018-10-24 11:06:32 UTC ++++ configure.ac +@@ -85,6 +85,11 @@ PKG_CHECK_MODULES( + )] + ) + ++saved_LIBS="$LIBS" ++LIBS="$OPENSSL_LIBS $LIBS" ++AC_CHECK_FUNCS(EVP_MD_CTX_new EVP_MD_CTX_free EVP_MD_CTX_reset) ++LIBS="$saved_LIBS" ++ + if test -z "${PAM_LIBS}"; then + AC_ARG_VAR([PAM_CFLAGS], [C compiler flags for pam]) + AC_ARG_VAR([PAM_LIBS], [linker flags for pam]) Copied: branches/2018Q4/security/pam_p11/files/patch-src_Makefile.am (from r482904, head/security/pam_p11/files/patch-src_Makefile.am) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/2018Q4/security/pam_p11/files/patch-src_Makefile.am Thu Nov 22 10:48:33 2018 (r485593, copy of r482904, head/security/pam_p11/files/patch-src_Makefile.am) @@ -0,0 +1,16 @@ +--- src/Makefile.am.orig 2018-10-24 12:39:40 UTC ++++ src/Makefile.am +@@ -14,11 +14,11 @@ pam_p11_la_SOURCES = pam_p11.c base64.c + noinst_PROGRAMS = test-login test-passwd + + test_login_SOURCES = test.c login.c $(pam_p11_la_SOURCES) +-test_login_LDADD = -lpam_misc ++test_login_LDADD = ${INTLLIBS} + test_login_CFLAGS = $(AM_CFLAGS) -DLIBDIR=\"$(libdir)\" -DTEST + + test_passwd_SOURCES = test.c passwd.c $(pam_p11_la_SOURCES) +-test_passwd_LDADD = -lpam_misc ++test_passwd_LDADD = ${INTLLIBS} + test_passwd_CFLAGS = $(AM_CFLAGS) -DLIBDIR=\"$(libdir)\" -DTEST + + format: Copied and modified: branches/2018Q4/security/pam_p11/files/patch-src_pam__p11.c (from r482217, head/security/pam_p11/files/patch-src_pam__p11.c) ============================================================================== --- head/security/pam_p11/files/patch-src_pam__p11.c Tue Oct 16 10:30:43 2018 (r482217, copy source) +++ branches/2018Q4/security/pam_p11/files/patch-src_pam__p11.c Thu Nov 22 10:48:33 2018 (r485593) @@ -1,6 +1,24 @@ ---- src/pam_p11.c.orig 2018-10-16 10:00:15 UTC +--- src/pam_p11.c.orig 2018-05-04 14:52:04 UTC +++ src/pam_p11.c -@@ -53,7 +53,7 @@ +@@ -31,6 +31,17 @@ + #include + #include + ++/* openssl deprecated API emulation */ ++#ifndef HAVE_EVP_MD_CTX_NEW ++#define EVP_MD_CTX_new() EVP_MD_CTX_create() ++#endif ++#ifndef HAVE_EVP_MD_CTX_FREE ++#define EVP_MD_CTX_free(ctx) EVP_MD_CTX_destroy((ctx)) ++#endif ++#ifndef HAVE_EVP_MD_CTX_RESET ++#define EVP_MD_CTX_reset(ctx) EVP_MD_CTX_cleanup((ctx)) ++#endif ++ + #ifdef ENABLE_NLS + #include + #include +@@ -53,7 +64,7 @@ #include #else #define pam_syslog(handle, level, msg...) syslog(level, ## msg) @@ -9,3 +27,39 @@ const char *fmt, va_list args) { int r = PAM_CRED_INSUFFICIENT; +@@ -549,7 +560,7 @@ static int key_find(pam_handle_t *pamh, + return 0; + } + +-static int randomize(pam_handle_t *pamh, unsigned char *r, unsigned int r_len) ++static int randomize(pam_handle_t *pamh, unsigned char *r, int r_len) + { + int ok = 0; + int fd = open("/dev/urandom", O_RDONLY); +@@ -572,7 +583,7 @@ static int key_verify(pam_handle_t *pamh + unsigned char signature[256]; + unsigned int siglen = sizeof signature; + const EVP_MD *md = EVP_sha1(); +- EVP_MD_CTX *md_ctx = EVP_MD_CTX_create(); ++ EVP_MD_CTX *md_ctx = EVP_MD_CTX_new(); + EVP_PKEY *privkey = PKCS11_get_private_key(authkey); + EVP_PKEY *pubkey = PKCS11_get_public_key(authkey); + +@@ -590,7 +601,7 @@ static int key_verify(pam_handle_t *pamh + || !EVP_SignInit(md_ctx, md) + || !EVP_SignUpdate(md_ctx, challenge, sizeof challenge) + || !EVP_SignFinal(md_ctx, signature, &siglen, privkey) +- || !EVP_MD_CTX_cleanup(md_ctx) ++ || !EVP_MD_CTX_reset(md_ctx) + || !EVP_VerifyInit(md_ctx, md) + || !EVP_VerifyUpdate(md_ctx, challenge, sizeof challenge) + || 1 != EVP_VerifyFinal(md_ctx, signature, siglen, pubkey)) { +@@ -607,7 +618,7 @@ err: + if (NULL != privkey) + EVP_PKEY_free(privkey); + if (NULL != md_ctx) { +- EVP_MD_CTX_destroy(md_ctx); ++ EVP_MD_CTX_free(md_ctx); + } + return ok; + } Modified: branches/2018Q4/security/pam_p11/files/patch-src_test.c ============================================================================== --- branches/2018Q4/security/pam_p11/files/patch-src_test.c Thu Nov 22 10:18:45 2018 (r485592) +++ branches/2018Q4/security/pam_p11/files/patch-src_test.c Thu Nov 22 10:48:33 2018 (r485593) @@ -1,10 +1,23 @@ ---- src/test.c.orig 2008-08-26 12:37:37.000000000 +0200 -+++ src/test.c 2008-08-26 12:37:45.000000000 +0200 -@@ -2,7 +2,6 @@ +--- src/test.c.orig 2018-05-04 14:52:04 UTC ++++ src/test.c +@@ -22,9 +22,10 @@ + + #include #include ++#include ++#include #include -#include #include - int main(int argc, char **argv) + #ifndef LIBDIR +@@ -42,7 +43,7 @@ int main(int argc, const char **argv) + }; + pam_handle_t *pamh = NULL; + struct pam_conv conv = { +- misc_conv, ++ openpam_ttyconv, + NULL, + }; + int r; Modified: branches/2018Q4/security/pam_p11/pkg-descr ============================================================================== --- branches/2018Q4/security/pam_p11/pkg-descr Thu Nov 22 10:18:45 2018 (r485592) +++ branches/2018Q4/security/pam_p11/pkg-descr Thu Nov 22 10:48:33 2018 (r485593) @@ -18,4 +18,4 @@ certificate chains, certificate authorities, revocatio lists or OCSP. Perfect for the small installation with no frills. -WWW: https://github.com/OpenSC/OpenSC/wiki/pam_p11-simple-RSA-authentication-with-PKCS%2311-modules +WWW: https://github.com/OpenSC/pam_p11 From owner-svn-ports-branches@freebsd.org Thu Nov 22 10:51:11 2018 Return-Path: Delivered-To: svn-ports-branches@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id DE4271144F50; Thu, 22 Nov 2018 10:51:10 +0000 (UTC) (envelope-from ale@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 8090B715A6; Thu, 22 Nov 2018 10:51:10 +0000 (UTC) (envelope-from ale@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 61D376DC8; Thu, 22 Nov 2018 10:51:10 +0000 (UTC) (envelope-from ale@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id wAMApAvv000987; Thu, 22 Nov 2018 10:51:10 GMT (envelope-from ale@FreeBSD.org) Received: (from ale@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id wAMApAgA000985; Thu, 22 Nov 2018 10:51:10 GMT (envelope-from ale@FreeBSD.org) Message-Id: <201811221051.wAMApAgA000985@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: ale set sender to ale@FreeBSD.org using -f From: Alex Dupre Date: Thu, 22 Nov 2018 10:51:10 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r485594 - branches/2018Q4/security/pkcs11-helper X-SVN-Group: ports-branches X-SVN-Commit-Author: ale X-SVN-Commit-Paths: branches/2018Q4/security/pkcs11-helper X-SVN-Commit-Revision: 485594 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Rspamd-Queue-Id: 8090B715A6 X-Spamd-Result: default: False [1.25 / 15.00]; local_wl_from(0.00)[FreeBSD.org]; NEURAL_SPAM_LONG(0.40)[0.400,0]; NEURAL_SPAM_MEDIUM(0.49)[0.489,0]; ASN(0.00)[asn:11403, ipnet:2610:1c1:1::/48, country:US]; NEURAL_SPAM_SHORT(0.36)[0.364,0] X-Rspamd-Server: mx1.freebsd.org X-BeenThere: svn-ports-branches@freebsd.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: SVN commit messages for all the branches of the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 22 Nov 2018 10:51:11 -0000 Author: ale Date: Thu Nov 22 10:51:09 2018 New Revision: 485594 URL: https://svnweb.freebsd.org/changeset/ports/485594 Log: MFH: r481942 r482900 Update to 1.25.1 release and fix build with OpenSSL 1.1. Approved by: ports-secteam (blanket, build fix) Modified: branches/2018Q4/security/pkcs11-helper/Makefile branches/2018Q4/security/pkcs11-helper/distinfo Directory Properties: branches/2018Q4/ (props changed) Modified: branches/2018Q4/security/pkcs11-helper/Makefile ============================================================================== --- branches/2018Q4/security/pkcs11-helper/Makefile Thu Nov 22 10:48:33 2018 (r485593) +++ branches/2018Q4/security/pkcs11-helper/Makefile Thu Nov 22 10:51:09 2018 (r485594) @@ -2,10 +2,10 @@ # $FreeBSD$ PORTNAME= pkcs11-helper -PORTVERSION= 1.11 -PORTREVISION= 3 +PORTVERSION= 1.25.1 +PORTREVISION= 1 CATEGORIES= security devel -MASTER_SITES= SF/opensc/pkcs11-helper/ +MASTER_SITES= https://github.com/OpenSC/pkcs11-helper/releases/download/pkcs11-helper-${PORTVERSION}/ MAINTAINER= ale@FreeBSD.org COMMENT= Helper library for multiple PKCS\#11 providers @@ -16,17 +16,18 @@ LICENSE_FILE= ${WRKSRC}/COPYING LICENSE_FILE_BSD3CLAUSE=${WRKSRC}/COPYING.BSD LICENSE_FILE_GPLv2= ${WRKSRC}/COPYING.GPL -BROKEN_SSL= openssl-devel - GNU_CONFIGURE= yes USES= libtool:keepla pathfix pkgconfig tar:bzip2 ssl USE_LDCONFIG= yes CONFIGURE_ENV= OPENSSL_CFLAGS="-I${OPENSSLINC}" \ - OPENSSL_LIBS="-L${OPENSSLLIB} -lssl" + OPENSSL_LIBS="-L${OPENSSLLIB} -lcrypto" CONFIGURE_ARGS= --disable-crypto-engine-gnutls \ - --disable-crypto-engine-nss + --disable-crypto-engine-nss \ + --disable-crypto-engine-polarssl \ + --disable-crypto-engine-mbedtls \ + --disable-crypto-engine-cryptoapi OPTIONS_DEFINE= DOCS Modified: branches/2018Q4/security/pkcs11-helper/distinfo ============================================================================== --- branches/2018Q4/security/pkcs11-helper/distinfo Thu Nov 22 10:48:33 2018 (r485593) +++ branches/2018Q4/security/pkcs11-helper/distinfo Thu Nov 22 10:51:09 2018 (r485594) @@ -1,2 +1,3 @@ -SHA256 (pkcs11-helper-1.11.tar.bz2) = 05a078efe1261247f26751fa616de732a64dbe1ed6c83e8ea5e6e85d8f70ff2f -SIZE (pkcs11-helper-1.11.tar.bz2) = 380697 +TIMESTAMP = 1539380995 +SHA256 (pkcs11-helper-1.25.1.tar.bz2) = 10dd8a1dbcf41ece051fdc3e9642b8c8111fe2c524cb966c0870ef3413c75a77 +SIZE (pkcs11-helper-1.25.1.tar.bz2) = 425719 From owner-svn-ports-branches@freebsd.org Thu Nov 22 10:53:59 2018 Return-Path: Delivered-To: svn-ports-branches@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 2EDB6114515B; Thu, 22 Nov 2018 10:53:59 +0000 (UTC) (envelope-from ale@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id C4A9F7182D; Thu, 22 Nov 2018 10:53:58 +0000 (UTC) (envelope-from ale@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id A63826F39; Thu, 22 Nov 2018 10:53:58 +0000 (UTC) (envelope-from ale@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id wAMArw1j004999; Thu, 22 Nov 2018 10:53:58 GMT (envelope-from ale@FreeBSD.org) Received: (from ale@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id wAMArvsg004996; Thu, 22 Nov 2018 10:53:57 GMT (envelope-from ale@FreeBSD.org) Message-Id: <201811221053.wAMArvsg004996@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: ale set sender to ale@FreeBSD.org using -f From: Alex Dupre Date: Thu, 22 Nov 2018 10:53:57 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r485595 - in branches/2018Q4/mail/php56-imap: . files X-SVN-Group: ports-branches X-SVN-Commit-Author: ale X-SVN-Commit-Paths: in branches/2018Q4/mail/php56-imap: . files X-SVN-Commit-Revision: 485595 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Rspamd-Queue-Id: C4A9F7182D X-Spamd-Result: default: False [1.31 / 15.00]; local_wl_from(0.00)[FreeBSD.org]; NEURAL_SPAM_SHORT(0.38)[0.379,0]; NEURAL_SPAM_MEDIUM(0.51)[0.514,0]; NEURAL_SPAM_LONG(0.42)[0.420,0]; ASN(0.00)[asn:11403, ipnet:2610:1c1:1::/48, country:US] X-Rspamd-Server: mx1.freebsd.org X-BeenThere: svn-ports-branches@freebsd.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: SVN commit messages for all the branches of the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 22 Nov 2018 10:53:59 -0000 Author: ale Date: Thu Nov 22 10:53:57 2018 New Revision: 485595 URL: https://svnweb.freebsd.org/changeset/ports/485595 Log: MFH: r485585 Disable rsh/ssh functionality in imap by default (php bug #77153). PR: 233384 Submitted by: joneum Approved by: ports-secteam (blanket, security fix) Added: branches/2018Q4/mail/php56-imap/files/patch-php__imap.c - copied unchanged from r485585, head/mail/php56-imap/files/patch-php__imap.c branches/2018Q4/mail/php56-imap/files/patch-php__imap.h - copied unchanged from r485585, head/mail/php56-imap/files/patch-php__imap.h Modified: branches/2018Q4/mail/php56-imap/Makefile branches/2018Q4/mail/php56-imap/files/patch-config.m4 Directory Properties: branches/2018Q4/ (props changed) Modified: branches/2018Q4/mail/php56-imap/Makefile ============================================================================== --- branches/2018Q4/mail/php56-imap/Makefile Thu Nov 22 10:51:09 2018 (r485594) +++ branches/2018Q4/mail/php56-imap/Makefile Thu Nov 22 10:53:57 2018 (r485595) @@ -2,6 +2,7 @@ # $FreeBSD$ CATEGORIES= mail +PORTREVISION= 1 MASTERDIR= ${.CURDIR}/../../lang/php56 Modified: branches/2018Q4/mail/php56-imap/files/patch-config.m4 ============================================================================== --- branches/2018Q4/mail/php56-imap/files/patch-config.m4 Thu Nov 22 10:51:09 2018 (r485594) +++ branches/2018Q4/mail/php56-imap/files/patch-config.m4 Thu Nov 22 10:53:57 2018 (r485595) @@ -1,6 +1,6 @@ ---- config.m4.orig 2010-02-07 14:06:54.000000000 +0100 -+++ config.m4 2010-03-08 11:56:24.000000000 +0100 -@@ -103,6 +103,8 @@ +--- config.m4.orig 2018-09-11 22:12:36 UTC ++++ config.m4 +@@ -103,6 +103,8 @@ PHP_ARG_WITH(kerberos,for IMAP Kerberos PHP_ARG_WITH(imap-ssl,for IMAP SSL support, [ --with-imap-ssl[=DIR] IMAP: Include SSL support. DIR is the OpenSSL install prefix], no, no) @@ -9,7 +9,7 @@ if test "$PHP_IMAP" != "no"; then PHP_SUBST(IMAP_SHARED_LIBADD) -@@ -119,6 +121,30 @@ +@@ -119,6 +121,30 @@ if test "$PHP_IMAP" != "no"; then fi done Copied: branches/2018Q4/mail/php56-imap/files/patch-php__imap.c (from r485585, head/mail/php56-imap/files/patch-php__imap.c) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/2018Q4/mail/php56-imap/files/patch-php__imap.c Thu Nov 22 10:53:57 2018 (r485595, copy of r485585, head/mail/php56-imap/files/patch-php__imap.c) @@ -0,0 +1,40 @@ +--- php_imap.c.orig 2018-09-11 22:12:36 UTC ++++ php_imap.c +@@ -562,6 +562,15 @@ static const zend_module_dep imap_deps[] + }; + /* }}} */ + ++ ++/* {{{ PHP_INI ++ */ ++PHP_INI_BEGIN() ++STD_PHP_INI_BOOLEAN("imap.enable_insecure_rsh", "0", PHP_INI_SYSTEM, OnUpdateBool, enable_rsh, zend_imap_globals, imap_globals) ++PHP_INI_END() ++/* }}} */ ++ ++ + /* {{{ imap_module_entry + */ + zend_module_entry imap_module_entry = { +@@ -835,6 +844,8 @@ PHP_MINIT_FUNCTION(imap) + { + unsigned long sa_all = SA_MESSAGES | SA_RECENT | SA_UNSEEN | SA_UIDNEXT | SA_UIDVALIDITY; + ++ REGISTER_INI_ENTRIES(); ++ + #ifndef PHP_WIN32 + mail_link(&unixdriver); /* link in the unix driver */ + mail_link(&mhdriver); /* link in the mh driver */ +@@ -1052,6 +1063,12 @@ PHP_MINIT_FUNCTION(imap) + GC_TEXTS texts + */ + ++ if (!IMAPG(enable_rsh)) { ++ /* disable SSH and RSH, see https://bugs.php.net/bug.php?id=77153 */ ++ mail_parameters (NIL, SET_RSHTIMEOUT, 0); ++ mail_parameters (NIL, SET_SSHTIMEOUT, 0); ++ } ++ + le_imap = zend_register_list_destructors_ex(mail_close_it, NULL, "imap", module_number); + return SUCCESS; + } Copied: branches/2018Q4/mail/php56-imap/files/patch-php__imap.h (from r485585, head/mail/php56-imap/files/patch-php__imap.h) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/2018Q4/mail/php56-imap/files/patch-php__imap.h Thu Nov 22 10:53:57 2018 (r485595, copy of r485585, head/mail/php56-imap/files/patch-php__imap.h) @@ -0,0 +1,10 @@ +--- php_imap.h.orig 2018-09-11 22:12:36 UTC ++++ php_imap.h +@@ -214,6 +214,7 @@ ZEND_BEGIN_MODULE_GLOBALS(imap) + #endif + /* php_stream for php_mail_gets() */ + php_stream *gets_stream; ++ zend_bool enable_rsh; + ZEND_END_MODULE_GLOBALS(imap) + + #ifdef ZTS From owner-svn-ports-branches@freebsd.org Thu Nov 22 19:00:07 2018 Return-Path: Delivered-To: svn-ports-branches@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 0CC2D1103F3E; Thu, 22 Nov 2018 19:00:07 +0000 (UTC) (envelope-from antoine@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 8B2E78146F; Thu, 22 Nov 2018 19:00:06 +0000 (UTC) (envelope-from antoine@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 6D31413C72; Thu, 22 Nov 2018 19:00:06 +0000 (UTC) (envelope-from antoine@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id wAMJ06E0052675; Thu, 22 Nov 2018 19:00:06 GMT (envelope-from antoine@FreeBSD.org) Received: (from antoine@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id wAMJ04NL052665; Thu, 22 Nov 2018 19:00:04 GMT (envelope-from antoine@FreeBSD.org) Message-Id: <201811221900.wAMJ04NL052665@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: antoine set sender to antoine@FreeBSD.org using -f From: Antoine Brodin Date: Thu, 22 Nov 2018 19:00:04 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r485608 - in branches/2018Q4/mail: php70-imap php70-imap/files php71-imap php71-imap/files php72-imap php72-imap/files X-SVN-Group: ports-branches X-SVN-Commit-Author: antoine X-SVN-Commit-Paths: in branches/2018Q4/mail: php70-imap php70-imap/files php71-imap php71-imap/files php72-imap php72-imap/files X-SVN-Commit-Revision: 485608 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Rspamd-Queue-Id: 8B2E78146F X-Spamd-Result: default: False [1.13 / 15.00]; local_wl_from(0.00)[FreeBSD.org]; NEURAL_SPAM_SHORT(0.15)[0.155,0]; NEURAL_SPAM_MEDIUM(0.54)[0.538,0]; NEURAL_SPAM_LONG(0.44)[0.439,0]; ASN(0.00)[asn:11403, ipnet:2610:1c1:1::/48, country:US] X-Rspamd-Server: mx1.freebsd.org X-BeenThere: svn-ports-branches@freebsd.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: SVN commit messages for all the branches of the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 22 Nov 2018 19:00:07 -0000 Author: antoine Date: Thu Nov 22 19:00:04 2018 New Revision: 485608 URL: https://svnweb.freebsd.org/changeset/ports/485608 Log: MFH: r485597 Disable rsh/ssh functionality in imap by default (php bug #77153). PR: 233384 Submitted by: joneum Approved by: tz (implicit) Security: ec49f6b5-ee39-11e8-b2f4-74d435b63d51 Sponsored by: Netzkommune GmbH Added: branches/2018Q4/mail/php70-imap/files/patch-php__imap.c - copied unchanged from r485597, head/mail/php70-imap/files/patch-php__imap.c branches/2018Q4/mail/php70-imap/files/patch-php__imap.h - copied unchanged from r485597, head/mail/php70-imap/files/patch-php__imap.h branches/2018Q4/mail/php71-imap/files/patch-php__imap.c - copied unchanged from r485597, head/mail/php71-imap/files/patch-php__imap.c branches/2018Q4/mail/php71-imap/files/patch-php__imap.h - copied unchanged from r485597, head/mail/php71-imap/files/patch-php__imap.h branches/2018Q4/mail/php72-imap/files/patch-php__imap.c - copied unchanged from r485597, head/mail/php72-imap/files/patch-php__imap.c branches/2018Q4/mail/php72-imap/files/patch-php__imap.h - copied unchanged from r485597, head/mail/php72-imap/files/patch-php__imap.h Modified: branches/2018Q4/mail/php70-imap/Makefile branches/2018Q4/mail/php71-imap/Makefile branches/2018Q4/mail/php72-imap/Makefile Modified: branches/2018Q4/mail/php70-imap/Makefile ============================================================================== --- branches/2018Q4/mail/php70-imap/Makefile Thu Nov 22 18:30:10 2018 (r485607) +++ branches/2018Q4/mail/php70-imap/Makefile Thu Nov 22 19:00:04 2018 (r485608) @@ -2,6 +2,7 @@ # $FreeBSD$ CATEGORIES= mail +PORTREVISION= 1 MASTERDIR= ${.CURDIR}/../../lang/php70 Copied: branches/2018Q4/mail/php70-imap/files/patch-php__imap.c (from r485597, head/mail/php70-imap/files/patch-php__imap.c) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/2018Q4/mail/php70-imap/files/patch-php__imap.c Thu Nov 22 19:00:04 2018 (r485608, copy of r485597, head/mail/php70-imap/files/patch-php__imap.c) @@ -0,0 +1,40 @@ +--- php_imap.c.orig 2018-09-11 22:12:36 UTC ++++ php_imap.c +@@ -562,6 +562,15 @@ static const zend_module_dep imap_deps[] + }; + /* }}} */ + ++ ++/* {{{ PHP_INI ++ */ ++PHP_INI_BEGIN() ++STD_PHP_INI_BOOLEAN("imap.enable_insecure_rsh", "0", PHP_INI_SYSTEM, OnUpdateBool, enable_rsh, zend_imap_globals, imap_globals) ++PHP_INI_END() ++/* }}} */ ++ ++ + /* {{{ imap_module_entry + */ + zend_module_entry imap_module_entry = { +@@ -835,6 +844,8 @@ PHP_MINIT_FUNCTION(imap) + { + unsigned long sa_all = SA_MESSAGES | SA_RECENT | SA_UNSEEN | SA_UIDNEXT | SA_UIDVALIDITY; + ++ REGISTER_INI_ENTRIES(); ++ + #ifndef PHP_WIN32 + mail_link(&unixdriver); /* link in the unix driver */ + mail_link(&mhdriver); /* link in the mh driver */ +@@ -1052,6 +1063,12 @@ PHP_MINIT_FUNCTION(imap) + GC_TEXTS texts + */ + ++ if (!IMAPG(enable_rsh)) { ++ /* disable SSH and RSH, see https://bugs.php.net/bug.php?id=77153 */ ++ mail_parameters (NIL, SET_RSHTIMEOUT, 0); ++ mail_parameters (NIL, SET_SSHTIMEOUT, 0); ++ } ++ + le_imap = zend_register_list_destructors_ex(mail_close_it, NULL, "imap", module_number); + return SUCCESS; + } Copied: branches/2018Q4/mail/php70-imap/files/patch-php__imap.h (from r485597, head/mail/php70-imap/files/patch-php__imap.h) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/2018Q4/mail/php70-imap/files/patch-php__imap.h Thu Nov 22 19:00:04 2018 (r485608, copy of r485597, head/mail/php70-imap/files/patch-php__imap.h) @@ -0,0 +1,10 @@ +--- php_imap.h.orig 2018-09-11 22:12:36 UTC ++++ php_imap.h +@@ -214,6 +214,7 @@ ZEND_BEGIN_MODULE_GLOBALS(imap) + #endif + /* php_stream for php_mail_gets() */ + php_stream *gets_stream; ++ zend_bool enable_rsh; + ZEND_END_MODULE_GLOBALS(imap) + + #ifdef ZTS Modified: branches/2018Q4/mail/php71-imap/Makefile ============================================================================== --- branches/2018Q4/mail/php71-imap/Makefile Thu Nov 22 18:30:10 2018 (r485607) +++ branches/2018Q4/mail/php71-imap/Makefile Thu Nov 22 19:00:04 2018 (r485608) @@ -1,6 +1,7 @@ # $FreeBSD$ CATEGORIES= mail +PORTREVISION= 1 MASTERDIR= ${.CURDIR}/../../lang/php71 Copied: branches/2018Q4/mail/php71-imap/files/patch-php__imap.c (from r485597, head/mail/php71-imap/files/patch-php__imap.c) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/2018Q4/mail/php71-imap/files/patch-php__imap.c Thu Nov 22 19:00:04 2018 (r485608, copy of r485597, head/mail/php71-imap/files/patch-php__imap.c) @@ -0,0 +1,40 @@ +--- php_imap.c.orig 2018-09-11 22:12:36 UTC ++++ php_imap.c +@@ -562,6 +562,15 @@ static const zend_module_dep imap_deps[] + }; + /* }}} */ + ++ ++/* {{{ PHP_INI ++ */ ++PHP_INI_BEGIN() ++STD_PHP_INI_BOOLEAN("imap.enable_insecure_rsh", "0", PHP_INI_SYSTEM, OnUpdateBool, enable_rsh, zend_imap_globals, imap_globals) ++PHP_INI_END() ++/* }}} */ ++ ++ + /* {{{ imap_module_entry + */ + zend_module_entry imap_module_entry = { +@@ -835,6 +844,8 @@ PHP_MINIT_FUNCTION(imap) + { + unsigned long sa_all = SA_MESSAGES | SA_RECENT | SA_UNSEEN | SA_UIDNEXT | SA_UIDVALIDITY; + ++ REGISTER_INI_ENTRIES(); ++ + #ifndef PHP_WIN32 + mail_link(&unixdriver); /* link in the unix driver */ + mail_link(&mhdriver); /* link in the mh driver */ +@@ -1052,6 +1063,12 @@ PHP_MINIT_FUNCTION(imap) + GC_TEXTS texts + */ + ++ if (!IMAPG(enable_rsh)) { ++ /* disable SSH and RSH, see https://bugs.php.net/bug.php?id=77153 */ ++ mail_parameters (NIL, SET_RSHTIMEOUT, 0); ++ mail_parameters (NIL, SET_SSHTIMEOUT, 0); ++ } ++ + le_imap = zend_register_list_destructors_ex(mail_close_it, NULL, "imap", module_number); + return SUCCESS; + } Copied: branches/2018Q4/mail/php71-imap/files/patch-php__imap.h (from r485597, head/mail/php71-imap/files/patch-php__imap.h) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/2018Q4/mail/php71-imap/files/patch-php__imap.h Thu Nov 22 19:00:04 2018 (r485608, copy of r485597, head/mail/php71-imap/files/patch-php__imap.h) @@ -0,0 +1,10 @@ +--- php_imap.h.orig 2018-09-11 22:12:36 UTC ++++ php_imap.h +@@ -214,6 +214,7 @@ ZEND_BEGIN_MODULE_GLOBALS(imap) + #endif + /* php_stream for php_mail_gets() */ + php_stream *gets_stream; ++ zend_bool enable_rsh; + ZEND_END_MODULE_GLOBALS(imap) + + #ifdef ZTS Modified: branches/2018Q4/mail/php72-imap/Makefile ============================================================================== --- branches/2018Q4/mail/php72-imap/Makefile Thu Nov 22 18:30:10 2018 (r485607) +++ branches/2018Q4/mail/php72-imap/Makefile Thu Nov 22 19:00:04 2018 (r485608) @@ -1,6 +1,7 @@ # $FreeBSD$ CATEGORIES= mail +PORTREVISION= 1 MASTERDIR= ${.CURDIR}/../../lang/php72 Copied: branches/2018Q4/mail/php72-imap/files/patch-php__imap.c (from r485597, head/mail/php72-imap/files/patch-php__imap.c) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/2018Q4/mail/php72-imap/files/patch-php__imap.c Thu Nov 22 19:00:04 2018 (r485608, copy of r485597, head/mail/php72-imap/files/patch-php__imap.c) @@ -0,0 +1,40 @@ +--- php_imap.c.orig 2018-09-11 22:12:36 UTC ++++ php_imap.c +@@ -562,6 +562,15 @@ static const zend_module_dep imap_deps[] + }; + /* }}} */ + ++ ++/* {{{ PHP_INI ++ */ ++PHP_INI_BEGIN() ++STD_PHP_INI_BOOLEAN("imap.enable_insecure_rsh", "0", PHP_INI_SYSTEM, OnUpdateBool, enable_rsh, zend_imap_globals, imap_globals) ++PHP_INI_END() ++/* }}} */ ++ ++ + /* {{{ imap_module_entry + */ + zend_module_entry imap_module_entry = { +@@ -835,6 +844,8 @@ PHP_MINIT_FUNCTION(imap) + { + unsigned long sa_all = SA_MESSAGES | SA_RECENT | SA_UNSEEN | SA_UIDNEXT | SA_UIDVALIDITY; + ++ REGISTER_INI_ENTRIES(); ++ + #ifndef PHP_WIN32 + mail_link(&unixdriver); /* link in the unix driver */ + mail_link(&mhdriver); /* link in the mh driver */ +@@ -1052,6 +1063,12 @@ PHP_MINIT_FUNCTION(imap) + GC_TEXTS texts + */ + ++ if (!IMAPG(enable_rsh)) { ++ /* disable SSH and RSH, see https://bugs.php.net/bug.php?id=77153 */ ++ mail_parameters (NIL, SET_RSHTIMEOUT, 0); ++ mail_parameters (NIL, SET_SSHTIMEOUT, 0); ++ } ++ + le_imap = zend_register_list_destructors_ex(mail_close_it, NULL, "imap", module_number); + return SUCCESS; + } Copied: branches/2018Q4/mail/php72-imap/files/patch-php__imap.h (from r485597, head/mail/php72-imap/files/patch-php__imap.h) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/2018Q4/mail/php72-imap/files/patch-php__imap.h Thu Nov 22 19:00:04 2018 (r485608, copy of r485597, head/mail/php72-imap/files/patch-php__imap.h) @@ -0,0 +1,10 @@ +--- php_imap.h.orig 2018-09-11 22:12:36 UTC ++++ php_imap.h +@@ -214,6 +214,7 @@ ZEND_BEGIN_MODULE_GLOBALS(imap) + #endif + /* php_stream for php_mail_gets() */ + php_stream *gets_stream; ++ zend_bool enable_rsh; + ZEND_END_MODULE_GLOBALS(imap) + + #ifdef ZTS From owner-svn-ports-branches@freebsd.org Fri Nov 23 10:26:26 2018 Return-Path: Delivered-To: svn-ports-branches@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 380461142418; Fri, 23 Nov 2018 10:26:26 +0000 (UTC) (envelope-from tobik@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id CC2A4826B0; Fri, 23 Nov 2018 10:26:25 +0000 (UTC) (envelope-from tobik@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 8F3E31D434; Fri, 23 Nov 2018 10:26:25 +0000 (UTC) (envelope-from tobik@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id wANAQPni037041; Fri, 23 Nov 2018 10:26:25 GMT (envelope-from tobik@FreeBSD.org) Received: (from tobik@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id wANAQPjN037038; Fri, 23 Nov 2018 10:26:25 GMT (envelope-from tobik@FreeBSD.org) Message-Id: <201811231026.wANAQPjN037038@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: tobik set sender to tobik@FreeBSD.org using -f From: Tobias Kortkamp Date: Fri, 23 Nov 2018 10:26:25 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r485646 - in branches/2018Q4/www/google-sitemapgen: . files X-SVN-Group: ports-branches X-SVN-Commit-Author: tobik X-SVN-Commit-Paths: in branches/2018Q4/www/google-sitemapgen: . files X-SVN-Commit-Revision: 485646 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Rspamd-Queue-Id: CC2A4826B0 X-Spamd-Result: default: False [1.82 / 15.00]; local_wl_from(0.00)[FreeBSD.org]; NEURAL_SPAM_LONG(0.42)[0.420,0]; NEURAL_SPAM_SHORT(0.66)[0.657,0]; NEURAL_SPAM_MEDIUM(0.74)[0.738,0]; ASN(0.00)[asn:11403, ipnet:2610:1c1:1::/48, country:US] X-Rspamd-Server: mx1.freebsd.org X-BeenThere: svn-ports-branches@freebsd.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: SVN commit messages for all the branches of the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 23 Nov 2018 10:26:26 -0000 Author: tobik Date: Fri Nov 23 10:26:24 2018 New Revision: 485646 URL: https://svnweb.freebsd.org/changeset/ports/485646 Log: MFH: r485645 www/google-sitemapgen: Fix obvious typo It causes problems later: Writing index file "sitemap_index.xml" with 13 Sitemaps Traceback (most recent call last): File "/usr/local/lib/python2.7/site-packages/sitemap_gen.py", line 2092, in sitemap.Generate() File "/usr/local/lib/python2.7/site-packages/sitemap_gen.py", line 1665, in Generate self.WriteIndex() File "/usr/local/lib/python2.7/site-packages/sitemap_gen.py", line 1810, in WriteIndex fd.write(sitemap_index_header) UnboundLocalError: local variable 'sitemap_index_header' referenced before assignment PR: 233427 Submitted by: Vladislav Movchan Approved by: ports-secteam blanket Added: branches/2018Q4/www/google-sitemapgen/files/patch-sitemap__gen.py - copied unchanged from r485645, head/www/google-sitemapgen/files/patch-sitemap__gen.py Modified: branches/2018Q4/www/google-sitemapgen/Makefile Directory Properties: branches/2018Q4/ (props changed) Modified: branches/2018Q4/www/google-sitemapgen/Makefile ============================================================================== --- branches/2018Q4/www/google-sitemapgen/Makefile Fri Nov 23 10:16:14 2018 (r485645) +++ branches/2018Q4/www/google-sitemapgen/Makefile Fri Nov 23 10:26:24 2018 (r485646) @@ -3,7 +3,7 @@ PORTNAME= google-sitemapgen PORTVERSION= 1.5 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= www devel MASTER_SITES= https://fossies.org/linux/www/old/ DISTNAME= sitemap_gen_${PORTVERSION} Copied: branches/2018Q4/www/google-sitemapgen/files/patch-sitemap__gen.py (from r485645, head/www/google-sitemapgen/files/patch-sitemap__gen.py) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/2018Q4/www/google-sitemapgen/files/patch-sitemap__gen.py Fri Nov 23 10:26:24 2018 (r485646, copy of r485645, head/www/google-sitemapgen/files/patch-sitemap__gen.py) @@ -0,0 +1,11 @@ +--- sitemap_gen.py.orig 2007-07-19 03:33:30 UTC ++++ sitemap_gen.py +@@ -1799,7 +1799,7 @@ class Sitemap(xml.sax.handler.ContentHandler): + if self._sitemap_type == 'news': + sitemap_index_header = NEWS_SITEMAP_HEADER + else: +- sitemap__index_header = GENERAL_SITEMAP_HEADER ++ sitemap_index_header = GENERAL_SITEMAP_HEADER + + # Make a lastmod time + lastmod = TimestampISO8601(time.time()) From owner-svn-ports-branches@freebsd.org Fri Nov 23 15:40:17 2018 Return-Path: Delivered-To: svn-ports-branches@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id A52AC1149EED; Fri, 23 Nov 2018 15:40:17 +0000 (UTC) (envelope-from feld@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 48E058EE33; Fri, 23 Nov 2018 15:40:17 +0000 (UTC) (envelope-from feld@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 2B2532084D; Fri, 23 Nov 2018 15:40:17 +0000 (UTC) (envelope-from feld@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id wANFeHYU099274; Fri, 23 Nov 2018 15:40:17 GMT (envelope-from feld@FreeBSD.org) Received: (from feld@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id wANFeGqi099273; Fri, 23 Nov 2018 15:40:16 GMT (envelope-from feld@FreeBSD.org) Message-Id: <201811231540.wANFeGqi099273@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: feld set sender to feld@FreeBSD.org using -f From: Mark Felder Date: Fri, 23 Nov 2018 15:40:16 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r485681 - in branches/2018Q4/www/varnish6: . files X-SVN-Group: ports-branches X-SVN-Commit-Author: feld X-SVN-Commit-Paths: in branches/2018Q4/www/varnish6: . files X-SVN-Commit-Revision: 485681 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Rspamd-Queue-Id: 48E058EE33 X-Spamd-Result: default: False [0.91 / 15.00]; local_wl_from(0.00)[FreeBSD.org]; NEURAL_HAM_SHORT(-0.21)[-0.214,0]; NEURAL_SPAM_LONG(0.40)[0.400,0]; NEURAL_SPAM_MEDIUM(0.72)[0.721,0]; ASN(0.00)[asn:11403, ipnet:2610:1c1:1::/48, country:US] X-Rspamd-Server: mx1.freebsd.org X-BeenThere: svn-ports-branches@freebsd.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: SVN commit messages for all the branches of the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 23 Nov 2018 15:40:18 -0000 Author: feld Date: Fri Nov 23 15:40:16 2018 New Revision: 485681 URL: https://svnweb.freebsd.org/changeset/ports/485681 Log: MFH: r485680 www/varnish6: Update to 6.0.2 Deleted: branches/2018Q4/www/varnish6/files/patch-bin_varnishhist_varnishhist.c Modified: branches/2018Q4/www/varnish6/Makefile branches/2018Q4/www/varnish6/distinfo Directory Properties: branches/2018Q4/ (props changed) Modified: branches/2018Q4/www/varnish6/Makefile ============================================================================== --- branches/2018Q4/www/varnish6/Makefile Fri Nov 23 15:39:35 2018 (r485680) +++ branches/2018Q4/www/varnish6/Makefile Fri Nov 23 15:40:16 2018 (r485681) @@ -1,9 +1,9 @@ # $FreeBSD$ PORTNAME= varnish -PORTVERSION= 6.0.1 +PORTVERSION= 6.0.2 DISTVERSIONPREFIX= varnish- -PORTREVISION= 1 +PORTREVISION= 0 CATEGORIES= www PKGNAMESUFFIX= 6 @@ -13,7 +13,8 @@ COMMENT= High-performance HTTP accelerator LICENSE= BSD2CLAUSE LICENSE_FILE= ${WRKSRC}/LICENSE -BUILD_DEPENDS= rst2man:textproc/py-docutils +BUILD_DEPENDS= rst2man:textproc/py-docutils \ + ${PYTHON_PKGNAMEPREFIX}sphinx>0:textproc/py-sphinx@${PY_FLAVOR} LIB_DEPENDS= libpcre.so:devel/pcre CONFLICTS= varnish-2.* varnish-3.* varnish4-4.* varnish5-5.* Modified: branches/2018Q4/www/varnish6/distinfo ============================================================================== --- branches/2018Q4/www/varnish6/distinfo Fri Nov 23 15:39:35 2018 (r485680) +++ branches/2018Q4/www/varnish6/distinfo Fri Nov 23 15:40:16 2018 (r485681) @@ -1,3 +1,3 @@ -TIMESTAMP = 1536763059 -SHA256 (varnishcache-varnish-cache-varnish-6.0.1_GH0.tar.gz) = 2705dc3bffedbdb993f7ae9008a67972f251146401a46b07172c8569646bb975 -SIZE (varnishcache-varnish-cache-varnish-6.0.1_GH0.tar.gz) = 1380728 +TIMESTAMP = 1542986834 +SHA256 (varnishcache-varnish-cache-varnish-6.0.2_GH0.tar.gz) = 7fae78616773d16c521356f0a1f7629edc97271b9cac7686282cf1434737c4e1 +SIZE (varnishcache-varnish-cache-varnish-6.0.2_GH0.tar.gz) = 1395971 From owner-svn-ports-branches@freebsd.org Sat Nov 24 00:48:24 2018 Return-Path: Delivered-To: svn-ports-branches@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 9FC531135D3F; Sat, 24 Nov 2018 00:48:24 +0000 (UTC) (envelope-from jbeich@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 439EF7B8CE; Sat, 24 Nov 2018 00:48:24 +0000 (UTC) (envelope-from jbeich@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 2479A2635A; Sat, 24 Nov 2018 00:48:24 +0000 (UTC) (envelope-from jbeich@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id wAO0mO8J083918; Sat, 24 Nov 2018 00:48:24 GMT (envelope-from jbeich@FreeBSD.org) Received: (from jbeich@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id wAO0mNCT083916; Sat, 24 Nov 2018 00:48:23 GMT (envelope-from jbeich@FreeBSD.org) Message-Id: <201811240048.wAO0mNCT083916@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: jbeich set sender to jbeich@FreeBSD.org using -f From: Jan Beich Date: Sat, 24 Nov 2018 00:48:23 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r485719 - branches/2018Q4/emulators/rpcs3 X-SVN-Group: ports-branches X-SVN-Commit-Author: jbeich X-SVN-Commit-Paths: branches/2018Q4/emulators/rpcs3 X-SVN-Commit-Revision: 485719 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Rspamd-Queue-Id: 439EF7B8CE X-Spamd-Result: default: False [1.61 / 15.00]; local_wl_from(0.00)[FreeBSD.org]; NEURAL_SPAM_LONG(0.40)[0.400,0]; NEURAL_SPAM_SHORT(0.50)[0.502,0]; NEURAL_SPAM_MEDIUM(0.71)[0.712,0]; ASN(0.00)[asn:11403, ipnet:2610:1c1:1::/48, country:US] X-Rspamd-Server: mx1.freebsd.org X-BeenThere: svn-ports-branches@freebsd.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: SVN commit messages for all the branches of the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 24 Nov 2018 00:48:24 -0000 Author: jbeich Date: Sat Nov 24 00:48:23 2018 New Revision: 485719 URL: https://svnweb.freebsd.org/changeset/ports/485719 Log: MFH: r485718 emulators/rpcs3: update to 0.0.5.1050 Changes: https://github.com/RPCS3/rpcs3/compare/3c7f02d99...7f1cbb113 Approved by: ports-secteam (junovitch, implicit for snapshots) Modified: branches/2018Q4/emulators/rpcs3/Makefile branches/2018Q4/emulators/rpcs3/distinfo Directory Properties: branches/2018Q4/ (props changed) Modified: branches/2018Q4/emulators/rpcs3/Makefile ============================================================================== --- branches/2018Q4/emulators/rpcs3/Makefile Sat Nov 24 00:47:36 2018 (r485718) +++ branches/2018Q4/emulators/rpcs3/Makefile Sat Nov 24 00:48:23 2018 (r485719) @@ -2,8 +2,8 @@ PORTNAME= rpcs3 DISTVERSIONPREFIX= v -DISTVERSION= 0.0.5-1045 -DISTVERSIONSUFFIX= -g3c7f02d99 +DISTVERSION= 0.0.5-1050 +DISTVERSIONSUFFIX= -g7f1cbb113 CATEGORIES= emulators PATCH_SITES= https://github.com/${GH_ACCOUNT}/${GH_PROJECT}/commit/ Modified: branches/2018Q4/emulators/rpcs3/distinfo ============================================================================== --- branches/2018Q4/emulators/rpcs3/distinfo Sat Nov 24 00:47:36 2018 (r485718) +++ branches/2018Q4/emulators/rpcs3/distinfo Sat Nov 24 00:48:23 2018 (r485719) @@ -1,6 +1,6 @@ -TIMESTAMP = 1542643539 -SHA256 (RPCS3-rpcs3-v0.0.5-1045-g3c7f02d99_GH0.tar.gz) = 2f6b15588943c294f9a07a4124f67864366e25cb33815fe512bcb49f4c7518b9 -SIZE (RPCS3-rpcs3-v0.0.5-1045-g3c7f02d99_GH0.tar.gz) = 5016019 +TIMESTAMP = 1543017288 +SHA256 (RPCS3-rpcs3-v0.0.5-1050-g7f1cbb113_GH0.tar.gz) = 23bb0d3e41945745b52ba54690fd2c0d08e16c0f5ad49bcb156c59fb3676c32d +SIZE (RPCS3-rpcs3-v0.0.5-1050-g7f1cbb113_GH0.tar.gz) = 5017091 SHA256 (RPCS3-hidapi-hidapi-0.8.0-rc1-26-g4c27501_GH0.tar.gz) = 4f58ba2a51136cc6af0f1d833688b55f78468c4f5429a4bf9b38bb51c9d212b1 SIZE (RPCS3-hidapi-hidapi-0.8.0-rc1-26-g4c27501_GH0.tar.gz) = 105372 SHA256 (RPCS3-llvm-5c906fd1694e_GH0.tar.gz) = 8bbe95fbbea545ebb03e73d526add64e2853f86176ad42690f8ce5846bd419ce From owner-svn-ports-branches@freebsd.org Sat Nov 24 18:45:57 2018 Return-Path: Delivered-To: svn-ports-branches@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 7FD6611352DA; Sat, 24 Nov 2018 18:45:57 +0000 (UTC) (envelope-from riggs@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 26F9F86F54; Sat, 24 Nov 2018 18:45:57 +0000 (UTC) (envelope-from riggs@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 0937311DA7; Sat, 24 Nov 2018 18:45:57 +0000 (UTC) (envelope-from riggs@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id wAOIjuEa060769; Sat, 24 Nov 2018 18:45:56 GMT (envelope-from riggs@FreeBSD.org) Received: (from riggs@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id wAOIjuku060768; Sat, 24 Nov 2018 18:45:56 GMT (envelope-from riggs@FreeBSD.org) Message-Id: <201811241845.wAOIjuku060768@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: riggs set sender to riggs@FreeBSD.org using -f From: Thomas Zander Date: Sat, 24 Nov 2018 18:45:56 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r485780 - branches/2018Q4/irc/bitchx X-SVN-Group: ports-branches X-SVN-Commit-Author: riggs X-SVN-Commit-Paths: branches/2018Q4/irc/bitchx X-SVN-Commit-Revision: 485780 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Rspamd-Queue-Id: 26F9F86F54 X-Spamd-Result: default: False [1.94 / 15.00]; local_wl_from(0.00)[FreeBSD.org]; NEURAL_SPAM_LONG(0.64)[0.643,0]; NEURAL_SPAM_MEDIUM(0.71)[0.712,0]; ASN(0.00)[asn:11403, ipnet:2610:1c1:1::/48, country:US]; NEURAL_SPAM_SHORT(0.58)[0.580,0] X-Rspamd-Server: mx1.freebsd.org X-BeenThere: svn-ports-branches@freebsd.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: SVN commit messages for all the branches of the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 24 Nov 2018 18:45:57 -0000 Author: riggs Date: Sat Nov 24 18:45:56 2018 New Revision: 485780 URL: https://svnweb.freebsd.org/changeset/ports/485780 Log: MFH: r483042 r483384 Unbreak the build against newer versions of OpenSSL where they had removed SSLeay() from libcrypto so configure test for it now fails. Check against ERR_get_error() instead. PR: 232550 - Remove BROKEN_SSL line (should've been part of r483042) - Cleanup options block a bit and use our standard LANG_HE option for Hebrew language support Approved by: ports-secteam (riggs) Modified: branches/2018Q4/irc/bitchx/Makefile Directory Properties: branches/2018Q4/ (props changed) Modified: branches/2018Q4/irc/bitchx/Makefile ============================================================================== --- branches/2018Q4/irc/bitchx/Makefile Sat Nov 24 18:30:53 2018 (r485779) +++ branches/2018Q4/irc/bitchx/Makefile Sat Nov 24 18:45:56 2018 (r485780) @@ -31,27 +31,26 @@ DATADIR= ${PREFIX}/share/bx MAKE_JOBS_UNSAFE= yes -OPTIONS_DEFINE= DOCS HEBREW IPV6 LATIN PLUGINS SSL TOGGLES +OPTIONS_DEFINE= DOCS LANG_HE IPV6 LATIN PLUGINS SSL TOGGLES +OPTIONS_DEFAULT= PLUGINS SSL LATIN_DESC= Recommended for ISO-8859-1 display PLUGINS_DESC= Build a handful of BitchX plugins -HEBREW_DESC= Add support for hebrew language TOGGLES_DESC= Disable annoyance toggles -OPTIONS_DEFAULT= PLUGINS SSL IPV6_CONFIGURE_ENABLE= ipv6 SSL_CONFIGURE_WITH= ssl SSL_USES= ssl -SSL_VARS= BROKEN_SSL=openssl-devel -PLUGINS_CONFIGURE_WITH= plugins="${PLUGIN_LIST:C/\$$/,/g}" +PLUGINS_CONFIGURE_WITH= plugins="${PLUGIN_LIST:C/\$$/,/g}" PLUGIN_LIST= abot acro arcfour autocycle blowfish cavlink cdrom encrypt \ europa fserv hint nap nicklist pkga possum qbx qmail wavplay post-patch: ${REINPLACE_CMD} -e 's|bzip2|true|g' ${WRKSRC}/Makefile.in + ${REINPLACE_CMD} -e 's|SSLeay|ERR_get_error|' ${WRKSRC}/configure post-patch-DOCS-on: @${MKDIR} ${STAGEDIR}${DOCSDIR} @@ -61,7 +60,7 @@ post-patch-LATIN-on: ${REINPLACE_CMD} -e 's|#undef LATIN1|#define LATIN1|' \ ${WRKSRC}/include/config.h -post-patch-HEBREW-on: +post-patch-LANG_HE-on: ${REINPLACE_CMD} -e 's|#undef WANT_HEBREW|#define WANT_HEBREW|' \ ${WRKSRC}/include/config.h From owner-svn-ports-branches@freebsd.org Sat Nov 24 19:08:50 2018 Return-Path: Delivered-To: svn-ports-branches@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id D7E241135D84; Sat, 24 Nov 2018 19:08:50 +0000 (UTC) (envelope-from jmd@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 75A5188387; Sat, 24 Nov 2018 19:08:50 +0000 (UTC) (envelope-from jmd@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 5754B120D8; Sat, 24 Nov 2018 19:08:50 +0000 (UTC) (envelope-from jmd@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id wAOJ8oNG071336; Sat, 24 Nov 2018 19:08:50 GMT (envelope-from jmd@FreeBSD.org) Received: (from jmd@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id wAOJ8oHD071334; Sat, 24 Nov 2018 19:08:50 GMT (envelope-from jmd@FreeBSD.org) Message-Id: <201811241908.wAOJ8oHD071334@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: jmd set sender to jmd@FreeBSD.org using -f From: Johannes M Dieterich Date: Sat, 24 Nov 2018 19:08:50 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r485782 - branches/2018Q4/graphics/drm-devel-kmod X-SVN-Group: ports-branches X-SVN-Commit-Author: jmd X-SVN-Commit-Paths: branches/2018Q4/graphics/drm-devel-kmod X-SVN-Commit-Revision: 485782 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Rspamd-Queue-Id: 75A5188387 X-Spamd-Result: default: False [1.94 / 15.00]; local_wl_from(0.00)[FreeBSD.org]; NEURAL_SPAM_LONG(0.64)[0.643,0]; NEURAL_SPAM_MEDIUM(0.71)[0.712,0]; ASN(0.00)[asn:11403, ipnet:2610:1c1:1::/48, country:US]; NEURAL_SPAM_SHORT(0.58)[0.580,0] X-Rspamd-Server: mx1.freebsd.org X-BeenThere: svn-ports-branches@freebsd.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: SVN commit messages for all the branches of the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 24 Nov 2018 19:08:51 -0000 Author: jmd Date: Sat Nov 24 19:08:49 2018 New Revision: 485782 URL: https://svnweb.freebsd.org/changeset/ports/485782 Log: MFH: r485781 graphics/drm-devel-kmod: update to latest snapshot Fixes a double registration bug in amdgpu. Approved by: portmgr (drm-driver blanket) Modified: branches/2018Q4/graphics/drm-devel-kmod/Makefile branches/2018Q4/graphics/drm-devel-kmod/distinfo Directory Properties: branches/2018Q4/ (props changed) Modified: branches/2018Q4/graphics/drm-devel-kmod/Makefile ============================================================================== --- branches/2018Q4/graphics/drm-devel-kmod/Makefile Sat Nov 24 19:05:52 2018 (r485781) +++ branches/2018Q4/graphics/drm-devel-kmod/Makefile Sat Nov 24 19:08:49 2018 (r485782) @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= drm-devel-kmod -PORTVERSION= 4.16.g20181119 +PORTVERSION= 4.16.g20181121 CATEGORIES= graphics kld MAINTAINER= jmd@FreeBSD.org @@ -25,7 +25,7 @@ USES= kmod uidfix compiler:c++11-lang USE_GITHUB= yes GH_ACCOUNT= FreeBSDDesktop GH_PROJECT= kms-drm -GH_TAGNAME= 5f3b167 +GH_TAGNAME= a45b72a .include Modified: branches/2018Q4/graphics/drm-devel-kmod/distinfo ============================================================================== --- branches/2018Q4/graphics/drm-devel-kmod/distinfo Sat Nov 24 19:05:52 2018 (r485781) +++ branches/2018Q4/graphics/drm-devel-kmod/distinfo Sat Nov 24 19:08:49 2018 (r485782) @@ -1,3 +1,3 @@ -TIMESTAMP = 1542679664 -SHA256 (FreeBSDDesktop-kms-drm-4.16.g20181119-5f3b167_GH0.tar.gz) = c25e4dd57bc5851633f677e63afd2e1dc23e806886fa677d6df0168f2e2e916a -SIZE (FreeBSDDesktop-kms-drm-4.16.g20181119-5f3b167_GH0.tar.gz) = 13088962 +TIMESTAMP = 1542816184 +SHA256 (FreeBSDDesktop-kms-drm-4.16.g20181121-a45b72a_GH0.tar.gz) = ea38de931c4b8ac4f3b9a48c9c4b4a96c73558a1b0e94983195568a5cb03ce7a +SIZE (FreeBSDDesktop-kms-drm-4.16.g20181121-a45b72a_GH0.tar.gz) = 13088779 From owner-svn-ports-branches@freebsd.org Sat Nov 24 19:20:58 2018 Return-Path: Delivered-To: svn-ports-branches@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 75B1C11365F6; Sat, 24 Nov 2018 19:20:58 +0000 (UTC) (envelope-from brnrd@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 1B2F988B67; Sat, 24 Nov 2018 19:20:58 +0000 (UTC) (envelope-from brnrd@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id D656C122B5; Sat, 24 Nov 2018 19:20:57 +0000 (UTC) (envelope-from brnrd@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id wAOJKvdn077204; Sat, 24 Nov 2018 19:20:57 GMT (envelope-from brnrd@FreeBSD.org) Received: (from brnrd@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id wAOJKvfg077203; Sat, 24 Nov 2018 19:20:57 GMT (envelope-from brnrd@FreeBSD.org) Message-Id: <201811241920.wAOJKvfg077203@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: brnrd set sender to brnrd@FreeBSD.org using -f From: Bernard Spil Date: Sat, 24 Nov 2018 19:20:57 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r485784 - branches/2018Q4/databases/mariadb100-server X-SVN-Group: ports-branches X-SVN-Commit-Author: brnrd X-SVN-Commit-Paths: branches/2018Q4/databases/mariadb100-server X-SVN-Commit-Revision: 485784 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Rspamd-Queue-Id: 1B2F988B67 X-Spamd-Result: default: False [1.99 / 15.00]; local_wl_from(0.00)[FreeBSD.org]; NEURAL_SPAM_LONG(0.66)[0.661,0]; NEURAL_SPAM_MEDIUM(0.73)[0.730,0]; ASN(0.00)[asn:11403, ipnet:2610:1c1:1::/48, country:US]; NEURAL_SPAM_SHORT(0.60)[0.599,0] X-Rspamd-Server: mx1.freebsd.org X-BeenThere: svn-ports-branches@freebsd.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: SVN commit messages for all the branches of the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 24 Nov 2018 19:20:58 -0000 Author: brnrd Date: Sat Nov 24 19:20:57 2018 New Revision: 485784 URL: https://svnweb.freebsd.org/changeset/ports/485784 Log: MFH: r483657 databases/mariadb100-server: Security update to 10.0.37 - Broken with OpenSSL 1.1 and thus FreeBSD 12+ Security: ec5072b0-d43a-11e8-a6d2-b499baebfeaf Approved by: ports-secteam (miwi) Modified: branches/2018Q4/databases/mariadb100-server/Makefile branches/2018Q4/databases/mariadb100-server/distinfo Directory Properties: branches/2018Q4/ (props changed) Modified: branches/2018Q4/databases/mariadb100-server/Makefile ============================================================================== --- branches/2018Q4/databases/mariadb100-server/Makefile Sat Nov 24 19:17:05 2018 (r485783) +++ branches/2018Q4/databases/mariadb100-server/Makefile Sat Nov 24 19:20:57 2018 (r485784) @@ -1,8 +1,8 @@ # $FreeBSD$ PORTNAME?= mariadb -PORTVERSION= 10.0.36 -PORTREVISION?= 2 +PORTVERSION= 10.0.37 +PORTREVISION?= 0 CATEGORIES= databases ipv6 MASTER_SITES= http://ftp.osuosl.org/pub/${SITESDIR}/ \ http://mirrors.supportex.net/${SITESDIR}/ \ @@ -17,13 +17,18 @@ PKGNAMESUFFIX?= 100-server MAINTAINER= brnrd@FreeBSD.org COMMENT?= Multithreaded SQL database (server) +DEPRECATED= Upstream End-of-Life March 2019 (https://mariadb.org/about/maintenance-policy/) +EXPIRATION_DATE= 2019-04-01 + LICENSE= GPLv2 LICENSE_NAME_PerconaFT= PerconaFT patents license LICENSE_FILE_PerconaFT= ${WRKSRC}/storage/tokudb/PerconaFT/PATENTS LICENSE_PERMS_PerconaFT= dist-mirror dist-sell pkg-mirror pkg-sell auto-accept -BROKEN_SSL= openssl-devel -BROKEN_SSL_REASON_openssl-devel= incomplete definition of type 'struct dh_st' +BROKEN_SSL= openssl-devel openssl111 +BROKEN_SSL_REASON= incomplete definition of type 'struct dh_st' +BROKEN_FreeBSD_12= Does not support OpenSSL 1.1, use the 10.2 or 10.3 port +BROKEN_FreeBSD_13= ${BROKEN_FreeBSD_12} SUB_FILES= pkg-message Modified: branches/2018Q4/databases/mariadb100-server/distinfo ============================================================================== --- branches/2018Q4/databases/mariadb100-server/distinfo Sat Nov 24 19:17:05 2018 (r485783) +++ branches/2018Q4/databases/mariadb100-server/distinfo Sat Nov 24 19:20:57 2018 (r485784) @@ -1,3 +1,3 @@ -TIMESTAMP = 1533756534 -SHA256 (mariadb-10.0.36.tar.gz) = edf5c73b171ebdd0ef1d847c16f6702e831c351662515bf570bdf025d727f1ce -SIZE (mariadb-10.0.36.tar.gz) = 66577105 +TIMESTAMP = 1541062882 +SHA256 (mariadb-10.0.37.tar.gz) = b49021989bb850163c5a47a4a9496001661b64d7f879b1237a37b07d4090a413 +SIZE (mariadb-10.0.37.tar.gz) = 64728382 From owner-svn-ports-branches@freebsd.org Sat Nov 24 19:25:44 2018 Return-Path: Delivered-To: svn-ports-branches@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 2DC011136B07; Sat, 24 Nov 2018 19:25:44 +0000 (UTC) (envelope-from brnrd@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id C84AB88F9E; Sat, 24 Nov 2018 19:25:43 +0000 (UTC) (envelope-from brnrd@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 9070B12422; Sat, 24 Nov 2018 19:25:43 +0000 (UTC) (envelope-from brnrd@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id wAOJPhxE082382; Sat, 24 Nov 2018 19:25:43 GMT (envelope-from brnrd@FreeBSD.org) Received: (from brnrd@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id wAOJPhEw082380; Sat, 24 Nov 2018 19:25:43 GMT (envelope-from brnrd@FreeBSD.org) Message-Id: <201811241925.wAOJPhEw082380@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: brnrd set sender to brnrd@FreeBSD.org using -f From: Bernard Spil Date: Sat, 24 Nov 2018 19:25:43 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r485785 - branches/2018Q4/databases/mariadb101-server X-SVN-Group: ports-branches X-SVN-Commit-Author: brnrd X-SVN-Commit-Paths: branches/2018Q4/databases/mariadb101-server X-SVN-Commit-Revision: 485785 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Rspamd-Queue-Id: C84AB88F9E X-Spamd-Result: default: False [1.99 / 15.00]; local_wl_from(0.00)[FreeBSD.org]; NEURAL_SPAM_LONG(0.66)[0.661,0]; NEURAL_SPAM_MEDIUM(0.73)[0.730,0]; ASN(0.00)[asn:11403, ipnet:2610:1c1:1::/48, country:US]; NEURAL_SPAM_SHORT(0.60)[0.599,0] X-Rspamd-Server: mx1.freebsd.org X-BeenThere: svn-ports-branches@freebsd.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: SVN commit messages for all the branches of the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 24 Nov 2018 19:25:44 -0000 Author: brnrd Date: Sat Nov 24 19:25:42 2018 New Revision: 485785 URL: https://svnweb.freebsd.org/changeset/ports/485785 Log: MFH: r483888 databases/mariadb101-server: Security update to 10.1.37 - Not broken on i386 since 10.1.36 - Broken with OpenSSL 1.1.x, use MariaDB 10.2 or 10.3 Security: ec5072b0-d43a-11e8-a6d2-b499baebfeaf Approved by: ports-secteam (miwi) Modified: branches/2018Q4/databases/mariadb101-server/Makefile branches/2018Q4/databases/mariadb101-server/distinfo Directory Properties: branches/2018Q4/ (props changed) Modified: branches/2018Q4/databases/mariadb101-server/Makefile ============================================================================== --- branches/2018Q4/databases/mariadb101-server/Makefile Sat Nov 24 19:20:57 2018 (r485784) +++ branches/2018Q4/databases/mariadb101-server/Makefile Sat Nov 24 19:25:42 2018 (r485785) @@ -1,8 +1,7 @@ # $FreeBSD$ PORTNAME?= mariadb -PORTVERSION= 10.1.35 -PORTREVISION?= 1 +PORTVERSION= 10.1.37 CATEGORIES= databases ipv6 MASTER_SITES= http://ftp.osuosl.org/pub/${SITESDIR}/ \ http://mirrors.supportex.net/${SITESDIR}/ \ @@ -22,8 +21,10 @@ LICENSE_NAME_PerconaFT= PerconaFT patents license LICENSE_FILE_PerconaFT= ${WRKSRC}/storage/tokudb/PerconaFT/PATENTS LICENSE_PERMS_PerconaFT= dist-mirror dist-sell pkg-mirror pkg-sell auto-accept -BROKEN_SSL= openssl-devel -BROKEN_SSL_REASON_openssl-devel= incomplete definition of type 'struct dh_st' +BROKEN_SSL= openssl-devel openssl111 +BROKEN_SSL_REASON= incomplete definition of type 'struct dh_st' +BROKEN_FreeBSD_12= Does not support OpenSSL 1.1, use the 10.2 or 10.3 port +BROKEN_FreeBSD_13= ${BROKEN_FreeBSD_12} SUB_FILES= pkg-message @@ -153,10 +154,6 @@ TOKUDB_IMPLIES= SNAPPY TOKUDB_PORTDOCS= README.md TOKUDB_VARS= LICENSE+=PerconaFT LICENSE_COMB=multi ZMQ_LIB_DEPENDS= libzmq.so:net/libzmq4 - -NOT_FOR_ARCHS= i386 -NOT_FOR_ARCHS_REASON= currently does not compile on i386, see \ - https://jira.mariadb.org/browse/MDEV-9627 post-install: # Remove programs to avoid conflict with mariadb101-client Modified: branches/2018Q4/databases/mariadb101-server/distinfo ============================================================================== --- branches/2018Q4/databases/mariadb101-server/distinfo Sat Nov 24 19:20:57 2018 (r485784) +++ branches/2018Q4/databases/mariadb101-server/distinfo Sat Nov 24 19:25:42 2018 (r485785) @@ -1,3 +1,3 @@ -TIMESTAMP = 1533675828 -SHA256 (mariadb-10.1.35.tar.gz) = 9e91d985ed4f662126e3e5791fe91ec8a2f44ec811113c2b6fbc72fa14553c4d -SIZE (mariadb-10.1.35.tar.gz) = 65324620 +TIMESTAMP = 1541157538 +SHA256 (mariadb-10.1.37.tar.gz) = 8cd516b0a7f7aa36a7c1d6e687dbbad8c0b08c92d5fd60c6e691b19a6cab4d46 +SIZE (mariadb-10.1.37.tar.gz) = 63492946 From owner-svn-ports-branches@freebsd.org Sat Nov 24 19:35:00 2018 Return-Path: Delivered-To: svn-ports-branches@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id DE88C1136DB0; Sat, 24 Nov 2018 19:34:59 +0000 (UTC) (envelope-from brnrd@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 826D789350; Sat, 24 Nov 2018 19:34:59 +0000 (UTC) (envelope-from brnrd@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 64C7B125B8; Sat, 24 Nov 2018 19:34:59 +0000 (UTC) (envelope-from brnrd@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id wAOJYxd9087535; Sat, 24 Nov 2018 19:34:59 GMT (envelope-from brnrd@FreeBSD.org) Received: (from brnrd@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id wAOJYwNR087531; Sat, 24 Nov 2018 19:34:58 GMT (envelope-from brnrd@FreeBSD.org) Message-Id: <201811241934.wAOJYwNR087531@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: brnrd set sender to brnrd@FreeBSD.org using -f From: Bernard Spil Date: Sat, 24 Nov 2018 19:34:58 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r485786 - in branches/2018Q4/databases: mariadb102-client mariadb102-server mariadb102-server/files X-SVN-Group: ports-branches X-SVN-Commit-Author: brnrd X-SVN-Commit-Paths: in branches/2018Q4/databases: mariadb102-client mariadb102-server mariadb102-server/files X-SVN-Commit-Revision: 485786 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Rspamd-Queue-Id: 826D789350 X-Spamd-Result: default: False [1.99 / 15.00]; local_wl_from(0.00)[FreeBSD.org]; NEURAL_SPAM_LONG(0.66)[0.661,0]; NEURAL_SPAM_SHORT(0.60)[0.599,0]; NEURAL_SPAM_MEDIUM(0.73)[0.730,0]; ASN(0.00)[asn:11403, ipnet:2610:1c1:1::/48, country:US] X-Rspamd-Server: mx1.freebsd.org X-BeenThere: svn-ports-branches@freebsd.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: SVN commit messages for all the branches of the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 24 Nov 2018 19:35:00 -0000 Author: brnrd Date: Sat Nov 24 19:34:58 2018 New Revision: 485786 URL: https://svnweb.freebsd.org/changeset/ports/485786 Log: MFH: r484896 databases/mariadb102-server: Update to 10.2.19 Security: ec5072b0-d43a-11e8-a6d2-b499baebfeaf Approved by: ports-secteam (miwi) Deleted: branches/2018Q4/databases/mariadb102-server/files/patch-libmariadb_plugins_connection_CMakeLists.txt branches/2018Q4/databases/mariadb102-server/files/patch-libmariadb_plugins_trace_CMakeLists.txt Modified: branches/2018Q4/databases/mariadb102-client/pkg-plist branches/2018Q4/databases/mariadb102-server/Makefile branches/2018Q4/databases/mariadb102-server/distinfo branches/2018Q4/databases/mariadb102-server/files/patch-libmariadb_CMakeLists.txt branches/2018Q4/databases/mariadb102-server/files/patch-libmariadb_plugins_auth_CMakeLists.txt Directory Properties: branches/2018Q4/ (props changed) Modified: branches/2018Q4/databases/mariadb102-client/pkg-plist ============================================================================== --- branches/2018Q4/databases/mariadb102-client/pkg-plist Sat Nov 24 19:25:42 2018 (r485785) +++ branches/2018Q4/databases/mariadb102-client/pkg-plist Sat Nov 24 19:34:58 2018 (r485786) @@ -46,6 +46,7 @@ lib/mysql/plugin/daemon_example.ini lib/mysql/plugin/dialog.so lib/mysql/plugin/mysql_clear_password.so lib/mysql/plugin/sha256_password.so +libdata/pkgconfig/libmariadb.pc %%DATADIR%%/charsets/Index.xml %%DATADIR%%/charsets/README %%DATADIR%%/charsets/armscii8.xml @@ -75,6 +76,7 @@ lib/mysql/plugin/sha256_password.so man/man1/msql2mysql.1.gz man/man1/mysql.1.gz man/man1/mysql_config.1.gz +@comment man/man1/mysql_embedded.1.gz man/man1/mysql_find_rows.1.gz man/man1/mysql_plugin.1.gz man/man1/mysql_waitpid.1.gz Modified: branches/2018Q4/databases/mariadb102-server/Makefile ============================================================================== --- branches/2018Q4/databases/mariadb102-server/Makefile Sat Nov 24 19:25:42 2018 (r485785) +++ branches/2018Q4/databases/mariadb102-server/Makefile Sat Nov 24 19:34:58 2018 (r485786) @@ -1,7 +1,7 @@ # $FreeBSD$ PORTNAME?= mariadb -PORTVERSION= 10.2.17 +PORTVERSION= 10.2.19 PORTREVISION?= 0 CATEGORIES= databases ipv6 MASTER_SITES= http://mirrors.supportex.net/${SITESDIR}/ \ @@ -140,6 +140,7 @@ ${ENGINE}_CMAKE_ON= -DPLUGIN_${ENGINE}=DYNAMIC INNOBASE_CMAKE_OFF= -DPLUGIN_INNOBASE=NO -DWITHOUT_INNOBASE=1 CONNECT_EXTRA_LIB_DEPENDS= libodbc.so:databases/unixODBC +CONNECT_EXTRA_USES= gnome CONNECT_EXTRA_USE= gnome=libxml2 GSSAPI_NONE_CMAKE_ON= -DPLUGIN_AUTH_GSSAPI=NO -DPLUGIN_AUTH_GSSAPI_CLIENT=NO LZ4_CMAKE_OFF= -DGRN_WITH_LZ4=OFF -DWITH_INNODB_LZ4=OFF -DWITH_ROCKSDB_LZ4=OFF @@ -163,10 +164,6 @@ ZMQ_LIB_DEPENDS= libzmq.so:net/libzmq4 ZSTD_CMAKE_ON= -DWITH_ROCKSDB_ZSTD=ON ZSTD_LIB_DEPENDS= libzstd.so:archivers/zstd -NOT_FOR_ARCHS= i386 -NOT_FOR_ARCHS_REASON= currently does not compile on i386, see \ - https://jira.mariadb.org/browse/MDEV-9627 - post-install: # Remove programs to avoid conflict with mariadb102-client # These are "client" components, so there should be a switch that @@ -213,13 +210,5 @@ post-patch: ${CP} ${WRKSRC}/cmake/os/FreeBSD.cmake \ ${WRKSRC}/cmake/os/DragonFly.cmake .endif - -# Fix build failure in mbstream, see https://jira.mariadb.org/browse/MDEV-14072 -post-configure-INNOBASE-on: - ${REINPLACE_CMD} -e 's| ${PREFIX}/lib/liblz4.so\(.* ${PREFIX}/lib/liblz4.so.*\)|\1|' \ - -e 's| ${PREFIX}/lib/liblzo2.so\(.* ${PREFIX}/lib/liblzo2.so.*\)|\1|' \ - -e 's| ${PREFIX}/lib/libsnappy.so\(.* ${PREFIX}/lib/libsnappy.so\)|\1|' \ - -e 's| -llzma\(.* -llzma\)|\1|;s| -lbz2\(.* -lbz2\)|\1|;' \ - ${WRKSRC}/extra/mariabackup/CMakeFiles/mbstream.dir/link.txt .include Modified: branches/2018Q4/databases/mariadb102-server/distinfo ============================================================================== --- branches/2018Q4/databases/mariadb102-server/distinfo Sat Nov 24 19:25:42 2018 (r485785) +++ branches/2018Q4/databases/mariadb102-server/distinfo Sat Nov 24 19:34:58 2018 (r485786) @@ -1,3 +1,3 @@ -TIMESTAMP = 1534231063 -SHA256 (mariadb-10.2.17.tar.gz) = e7b3078f8de874a4d451242a8a3eed49bf6f916dcd52fc3efa55886f5f35be27 -SIZE (mariadb-10.2.17.tar.gz) = 73409162 +TIMESTAMP = 1542115149 +SHA256 (mariadb-10.2.19.tar.gz) = c0e103cfd73ee96d58402073e9513f0f7b5c0bd216641faecc8d763fb6529727 +SIZE (mariadb-10.2.19.tar.gz) = 71856357 Modified: branches/2018Q4/databases/mariadb102-server/files/patch-libmariadb_CMakeLists.txt ============================================================================== --- branches/2018Q4/databases/mariadb102-server/files/patch-libmariadb_CMakeLists.txt Sat Nov 24 19:25:42 2018 (r485785) +++ branches/2018Q4/databases/mariadb102-server/files/patch-libmariadb_CMakeLists.txt Sat Nov 24 19:34:58 2018 (r485786) @@ -1,9 +1,9 @@ ---- libmariadb/CMakeLists.txt.orig 2017-05-28 18:41:39 UTC +--- libmariadb/CMakeLists.txt.orig 2018-11-12 16:32:38 UTC +++ libmariadb/CMakeLists.txt -@@ -360,7 +360,7 @@ ENDIF() +@@ -381,7 +381,7 @@ ENDIF() + INCLUDE(${CC_SOURCE_DIR}/plugins/CMakeLists.txt) ADD_SUBDIRECTORY(include) ADD_SUBDIRECTORY(libmariadb) - ADD_SUBDIRECTORY(plugins) -IF(NOT WIN32) +IF(NOT WIN32 AND NOT WITHOUT_CLIENT) ADD_SUBDIRECTORY(mariadb_config) Modified: branches/2018Q4/databases/mariadb102-server/files/patch-libmariadb_plugins_auth_CMakeLists.txt ============================================================================== --- branches/2018Q4/databases/mariadb102-server/files/patch-libmariadb_plugins_auth_CMakeLists.txt Sat Nov 24 19:25:42 2018 (r485785) +++ branches/2018Q4/databases/mariadb102-server/files/patch-libmariadb_plugins_auth_CMakeLists.txt Sat Nov 24 19:34:58 2018 (r485786) @@ -1,31 +1,31 @@ ---- libmariadb/plugins/auth/CMakeLists.txt.orig 2017-05-14 23:13:15 UTC +--- libmariadb/plugins/auth/CMakeLists.txt.orig 2018-11-12 16:32:38 UTC +++ libmariadb/plugins/auth/CMakeLists.txt -@@ -26,6 +26,7 @@ IF(AUTH_DIALOG_PLUGIN_TYPE MATCHES "DYNA - INSTALL_PLUGIN(dialog ${CC_BINARY_DIR}/plugins/auth) - ENDIF() +@@ -18,6 +18,7 @@ REGISTER_PLUGIN(TARGET dialog + SOURCES ${CC_SOURCE_DIR}/plugins/auth/dialog.c + ${CC_SOURCE_DIR}/libmariadb/get_password.c) +IF(NOT WITHOUT_CLIENT) - # SHA256 plugin - IF(AUTH_SHA256PW_PLUGIN_TYPE MATCHES "DYNAMIC") - ADD_DEFINITIONS(-DHAVE_SHA256PW_DYNAMIC=1) -@@ -51,6 +52,7 @@ IF(AUTH_SHA256PW_PLUGIN_TYPE MATCHES "DY - SIGN_TARGET(sha256_password) - INSTALL_PLUGIN(sha256_password ${CC_BINARY_DIR}/plugins/auth) + #GSSAPI client authentication plugin + IF(NOT WIN32) + INCLUDE(${CC_SOURCE_DIR}/cmake/FindGSSAPI.cmake) +@@ -51,6 +52,7 @@ IF(${WITH_SSL} STREQUAL "OPENSSL" OR ${W + SOURCES ${AUTH_DIR}/sha256_pw.c + LIBRARIES ${SHA256_LIBS}) ENDIF() +ENDIF() # old_password plugin - IF(AUTH_OLDPASSWORD_PLUGIN_TYPE MATCHES "DYNAMIC") -@@ -72,6 +74,7 @@ IF(AUTH_OLDPASSWORD_PLUGIN_TYPE MATCHES - SIGN_TARGET(mysql_old_password) - ENDIF() + REGISTER_PLUGIN(TARGET mysql_old_password +@@ -60,10 +62,11 @@ REGISTER_PLUGIN(TARGET mysql_old_passwor + SOURCES ${AUTH_DIR}/old_password.c) + +IF(NOT WITHOUT_CLIENT) # Cleartext - IF(AUTH_CLEARTEXT_PLUGIN_TYPE MATCHES "DYNAMIC") - ADD_DEFINITIONS(-DHAVE_CLEARTEXT_DYNAMIC=1) -@@ -124,3 +127,4 @@ IF(${AUTH_GSSAPI_PLUGIN_TYPE} MATCHES "D - INSTALL_PLUGIN(auth_gssapi_client ${CC_BINARY_DIR}/plugins/auth) - ENDIF() - ENDIF() + REGISTER_PLUGIN(TARGET mysql_clear_password + TYPE MARIADB_CLIENT_PLUGIN_AUTH + CONFIGURATIONS DYNAMIC STATIC OFF + DEFAULT DYNAMIC + SOURCES ${AUTH_DIR}/mariadb_cleartext.c) +- +ENDIF() From owner-svn-ports-branches@freebsd.org Sat Nov 24 19:36:57 2018 Return-Path: Delivered-To: svn-ports-branches@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id A52DD1136E5A; Sat, 24 Nov 2018 19:36:57 +0000 (UTC) (envelope-from brnrd@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 489B08944C; Sat, 24 Nov 2018 19:36:57 +0000 (UTC) (envelope-from brnrd@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 24CD5125BB; Sat, 24 Nov 2018 19:36:57 +0000 (UTC) (envelope-from brnrd@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id wAOJav50087781; Sat, 24 Nov 2018 19:36:57 GMT (envelope-from brnrd@FreeBSD.org) Received: (from brnrd@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id wAOJau1c087780; Sat, 24 Nov 2018 19:36:56 GMT (envelope-from brnrd@FreeBSD.org) Message-Id: <201811241936.wAOJau1c087780@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: brnrd set sender to brnrd@FreeBSD.org using -f From: Bernard Spil Date: Sat, 24 Nov 2018 19:36:56 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r485787 - branches/2018Q4/databases/mariadb102-server X-SVN-Group: ports-branches X-SVN-Commit-Author: brnrd X-SVN-Commit-Paths: branches/2018Q4/databases/mariadb102-server X-SVN-Commit-Revision: 485787 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Rspamd-Queue-Id: 489B08944C X-Spamd-Result: default: False [1.94 / 15.00]; local_wl_from(0.00)[FreeBSD.org]; NEURAL_SPAM_SHORT(0.58)[0.580,0]; NEURAL_SPAM_MEDIUM(0.71)[0.712,0]; NEURAL_SPAM_LONG(0.64)[0.643,0]; ASN(0.00)[asn:11403, ipnet:2610:1c1:1::/48, country:US] X-Rspamd-Server: mx1.freebsd.org X-BeenThere: svn-ports-branches@freebsd.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: SVN commit messages for all the branches of the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 24 Nov 2018 19:36:57 -0000 Author: brnrd Date: Sat Nov 24 19:36:56 2018 New Revision: 485787 URL: https://svnweb.freebsd.org/changeset/ports/485787 Log: MFH: r485219 databases/mariadb102-server: Fix build with compression - Re-add workaround for link issues [1] with compression options [1]: https://jira.mariadb.org/browse/MDEV-14072 PR: 233274 Submitted by: Dave Bendit Approved by: ports-secteam (miwi) Modified: branches/2018Q4/databases/mariadb102-server/Makefile Directory Properties: branches/2018Q4/ (props changed) Modified: branches/2018Q4/databases/mariadb102-server/Makefile ============================================================================== --- branches/2018Q4/databases/mariadb102-server/Makefile Sat Nov 24 19:34:58 2018 (r485786) +++ branches/2018Q4/databases/mariadb102-server/Makefile Sat Nov 24 19:36:56 2018 (r485787) @@ -211,4 +211,12 @@ post-patch: ${WRKSRC}/cmake/os/DragonFly.cmake .endif +# Fix build failure in mbstream, see https://jira.mariadb.org/browse/MDEV-14072 +post-configure-INNOBASE-on: + ${REINPLACE_CMD} -e 's| ${PREFIX}/lib/liblz4.so\(.* ${PREFIX}/lib/liblz4.so.*\)|\1|' \ + -e 's| ${PREFIX}/lib/liblzo2.so\(.* ${PREFIX}/lib/liblzo2.so.*\)|\1|' \ + -e 's| ${PREFIX}/lib/libsnappy.so\(.* ${PREFIX}/lib/libsnappy.so\)|\1|' \ + -e 's| -llzma\(.* -llzma\)|\1|;s| -lbz2\(.* -lbz2\)|\1|;' \ + ${WRKSRC}/extra/mariabackup/CMakeFiles/mbstream.dir/link.txt + .include