From nobody Mon Sep 19 16:38:28 2022 X-Original-To: dev-commits-ports-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4MWVjc5ysCz4dLQg; Mon, 19 Sep 2022 16:38:28 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4MWVjc5Tjdz3f5s; Mon, 19 Sep 2022 16:38:28 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1663605508; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=7PZG2JpNSdCj8EN0dI2mrcuZIo8mDnWeuObHaM8G1ic=; b=IIEVZmNQ8NqqgWWIcLEqZ9rEXGfKi2RQHuf0IN6u+QV0UXW1TMFi9+1D6ixxOGEyVa6szd FwfI2KUxXLz9dQVjBdH/Jol6121r+cMp98c2gb9UddcR2TgZAxBVaaFHt3g9l5YnMCWlkp aS6sELJox3C8EGS8a7JIAbXyZYGGVitooi6znx6EiBLqtQPDUHpZng0HzlLrEFWK6ZXlKy zdnFCjwUfF2OYvXDkV2Wdax1moLmMdwxkwVINuLztb1Qhe5MCwLJ4TblgaEcW8MDjHwA3n /MCnfaOZJt7x6OBz4n32KR6x4hbEdJTeSJ7h7DbLeR1NCwRThTf9MQILSSqQ5Q== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4MWVjc4YS8zRKW; Mon, 19 Sep 2022 16:38:28 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 28JGcSqv013374; Mon, 19 Sep 2022 16:38:28 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 28JGcSAO013373; Mon, 19 Sep 2022 16:38:28 GMT (envelope-from git) Date: Mon, 19 Sep 2022 16:38:28 GMT Message-Id: <202209191638.28JGcSAO013373@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Neel Chauhan Subject: git: 5b44e5d58747 - main - net/pichi: Fix building failures based of Boost/1.80.0 List-Id: Commit messages for all branches of the ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-all@freebsd.org X-BeenThere: dev-commits-ports-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: nc X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 5b44e5d587471b9bfa60d7314a7626e40df0a52c Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1663605508; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=7PZG2JpNSdCj8EN0dI2mrcuZIo8mDnWeuObHaM8G1ic=; b=g9T/Y9zQWmJ2g+ejeDpdU2KnMPjiv6v1OuYkDuEv0o6GYm1EVw6m7nUJUactrpJtIoAoIN UhZoiSvODCwJ8qqqwxMYjDiUtD3ao/saoQ2TmerjJczGdiDKRr+2U+camowsuWoxGwWrDH kYtIZH+CL4vaFNnKztfQmZRjR+VhzV8b4q3aRTIqbOkVGyNq2xm3eZr90XEyoTMtO2z6k+ M1Y8oFt/qllv86L6IqyhvjrUPKFCXk5guPGVjQlcvU0i/aNdeZ0S04OBny+XWONiNiBGf6 8h5ONY+I4vsv5XNm5Vh1kRLPsjE7AgSr1yvlutUSvRU+7vwWlVW6VnraWrHVLg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1663605508; a=rsa-sha256; cv=none; b=jSyKlY2MKVa7HLeJ5KtqlWIq328SsbdoworVaBrOuvhY82X/OLtkpjO30iXHxjkVFOGw82 2OYsG72B/BnFaj/impcabTbHot1+9uKqmAhsQvNQCoSPygpO3A/6W7f3jM4gkIESMsoOsq zCsHeiQ2dUjSzO26xkcXXG0hBJcHBrpCjtaqC2SDttZXsEi6llNMP7GDsv2UG8CGprin/U gD8fjFdVfj38YCndrWaDE+ieKH07hj2DSLRqK7GjA4+JUeCKQhjBNau1CHChDLnlzeWi0L sDG8Adx6BsWo+VmtXONe/+6NBlSrlL/B8TGNliIneF1r0jUygqIuUfuC5n2SKQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by nc: URL: https://cgit.FreeBSD.org/ports/commit/?id=5b44e5d587471b9bfa60d7314a7626e40df0a52c commit 5b44e5d587471b9bfa60d7314a7626e40df0a52c Author: Pichi AuthorDate: 2022-09-19 16:37:19 +0000 Commit: Neel Chauhan CommitDate: 2022-09-19 16:38:20 +0000 net/pichi: Fix building failures based of Boost/1.80.0 PR: 266483 --- .../files/patch-include_pichi_common_config.hpp.in | 79 ++++++++++++++++++++++ net/pichi/files/patch-src_net_adapter.cpp | 67 ++++++++++++++++++ 2 files changed, 146 insertions(+) diff --git a/net/pichi/files/patch-include_pichi_common_config.hpp.in b/net/pichi/files/patch-include_pichi_common_config.hpp.in new file mode 100644 index 000000000000..fcc42ad57a0e --- /dev/null +++ b/net/pichi/files/patch-include_pichi_common_config.hpp.in @@ -0,0 +1,79 @@ +--- include/pichi/common/config.hpp.in.orig ++++ include/pichi/common/config.hpp.in +@@ -15,48 +15,39 @@ + #cmakedefine HAS_SETSID + #cmakedefine HAS_CLOSE + +-#cmakedefine NO_IGNORED_ATTRIBUTES_FOR_SODIUM +-#cmakedefine DEPRECATED_RFC2818_CLASS ++#ifdef __GNUC__ + +-#cmakedefine DISABLE_SHORTEN_64_TO_32_WARNING +-#if defined(DISABLE_SHORTEN_64_TO_32_WARNING) && defined(__clang__) +-#pragma clang diagnostic push +-#pragma clang diagnostic ignored "-Wshorten-64-to-32" +-#include +-#include +-#include +-#pragma clang diagnostic pop +-#endif // DISABLE_SHORTEN_64_TO_32_WARNING && __clang__ ++#if __GNUC__ >= 8 ++#pragma GCC diagnostic ignored "-Wclass-memaccess" ++#endif // __GNUC__ >= 8 + +-#ifdef _MSC_VER +-#pragma warning(push) +-#pragma warning(disable : 4702) +-#include +-#pragma warning(pop) +-#endif // _MSC_VER ++#cmakedefine DISABLE_GCC_IGNORED_ATTRIBUTES ++#ifdef DISABLE_GCC_IGNORED_ATTRIBUTES ++#pragma GCC diagnostic ignored "-Wignored-attributes" ++#endif // DISABLE_GCC_IGNORED_ATTRIBUTES + +-#cmakedefine HAS_SP_COUNTED_BASE_CLANG_HPP +-#if defined(HAS_SP_COUNTED_BASE_CLANG_HPP) && defined(__clang__) +-#if !__has_feature(c_atomic) +-#pragma clang diagnostic push +-#pragma clang diagnostic ignored "-Wc11-extensions" +-#include +-#pragma clang diagnostic pop +-#endif // !__has_feature(c_atomic) +-#endif // HAS_SP_COUNTED_BASE_CLANG_HPP && __clang__ ++#endif // __GNUC__ + +-#cmakedefine DEPRECATED_ALLOCATOR_VOID +-#if defined(DEPRECATED_ALLOCATOR_VOID) && defined(__clang__) +-#pragma clang diagnostic push ++#ifdef __clang__ ++ ++#if (defined(__APPLE__) && __clang_major__ >= 12) || __clang_major__ >= 11 + #pragma clang diagnostic ignored "-Wdeprecated-declarations" +-#include +-#include +-#include +-#include +-#include +-#include +-#pragma clang diagnostic pop +-#endif // DEPRECATED_ALLOCATOR_VOID && __clang__ ++#endif ++ ++#cmakedefine DISABLE_CLANG_C11_EXTENTIONS ++#if !__has_feature(c_atomic) && defined(DISABLE_CLANG_C11_EXTENTIONS) ++#pragma clang diagnostic ignored "-Wc11-extensions" ++#endif // !__has_feature(c_atomic) && defined(DISABLE_CLANG_C11_EXTENTIONS) ++ ++#endif // __clang__ ++ ++#ifdef _MSC_VER ++ ++#pragma warning(disable : 4459) ++#pragma warning(disable : 4646) ++#pragma warning(disable : 4702) ++ ++#endif // _MSC_VER + + #cmakedefine CMAKE_INSTALL_PREFIX "@CMAKE_INSTALL_PREFIX@" + diff --git a/net/pichi/files/patch-src_net_adapter.cpp b/net/pichi/files/patch-src_net_adapter.cpp new file mode 100644 index 000000000000..359dc4ee1bff --- /dev/null +++ b/net/pichi/files/patch-src_net_adapter.cpp @@ -0,0 +1,67 @@ +--- src/net/adapter.cpp.orig ++++ src/net/adapter.cpp +@@ -27,11 +27,12 @@ + #include + #include + +-#ifdef DEPRECATED_RFC2818_CLASS ++#include ++#if BOOST_VERSION >= 107300 + #include +-#else // DEPRECATED_RFC2818_CLASS ++#else // BOOST_VERSION >= 107300 + #include +-#endif // DEPRECATED_RFC2818_CLASS ++#endif // BOOST_VERSION >= 107300 + + using namespace std; + namespace asio = boost::asio; +@@ -67,11 +68,11 @@ static auto createTlsContext(vo::TlsEgressOption const + ctx.load_verify_file(*option.caFile_); + else { + ctx.set_default_verify_paths(); +-#ifdef DEPRECATED_RFC2818_CLASS ++#if BOOST_VERSION >= 107300 + ctx.set_verify_callback(ssl::host_name_verification{option.serverName_.value_or(serverName)}); +-#else // DEPRECATED_RFC2818_CLASS ++#else // BOOST_VERSION >= 107300 + ctx.set_verify_callback(ssl::rfc2818_verification{option.serverName_.value_or(serverName)}); +-#endif // DEPRECATED_RFC2818_CLASS ++#endif // BOOST_VERSION >= 107300 + } + return ctx; + } +@@ -95,16 +96,10 @@ unique_ptr makeShadowsocksIngress(Socket&& s, + psk = {container, + crypto::generateKey(option.method_, ConstBuffer{option.password_}, container)}; + switch (option.method_) { +-#if MBEDTLS_VERSION_MAJOR < 3 + case CryptoMethod::RC4_MD5: + return make_unique>(psk, forward(s)); + case CryptoMethod::BF_CFB: + return make_unique>(psk, forward(s)); +-#else // MBEDTLS_VERSION_MAJOR < 3 +- case CryptoMethod::RC4_MD5: +- case CryptoMethod::BF_CFB: +- fail(PichiError::SEMANTIC_ERROR, vo::msg::DEPRECATED_METHOD); +-#endif // MBEDTLS_VERSION_MAJOR < 3 + case CryptoMethod::AES_128_CTR: + return make_unique>(psk, forward(s)); + case CryptoMethod::AES_192_CTR: +@@ -158,16 +153,10 @@ static unique_ptr makeShadowsocksEgress(vo::Sh + auto psk = MutableBuffer{container, len}; + + switch (option.method_) { +-#if MBEDTLS_VERSION_MAJOR < 3 + case CryptoMethod::RC4_MD5: + return make_unique>(psk, io); + case CryptoMethod::BF_CFB: + return make_unique>(psk, io); +-#else // MBEDTLS_VERSION_MAJOR < 3 +- case CryptoMethod::RC4_MD5: +- case CryptoMethod::BF_CFB: +- fail(PichiError::SEMANTIC_ERROR, vo::msg::DEPRECATED_METHOD); +-#endif // MBEDTLS_VERSION_MAJOR < 3 + case CryptoMethod::AES_128_CTR: + return make_unique>(psk, io); + case CryptoMethod::AES_192_CTR: