Date: Sun, 13 Sep 2020 07:22:31 +0000 (UTC) From: Li-Wen Hsu <lwhsu@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r548461 - in head/net/pichi: . files Message-ID: <202009130722.08D7MVe7028858@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: lwhsu Date: Sun Sep 13 07:22:30 2020 New Revision: 548461 URL: https://svnweb.freebsd.org/changeset/ports/548461 Log: net/pichi: Update to 1.3.1 PR: 249043 Submitted by: Pichi <pichi@elude.in> (maintainer) Added: head/net/pichi/files/patch-cmake_Configure.cmake (contents, props changed) head/net/pichi/files/patch-src_api_egress__manager.cpp (contents, props changed) head/net/pichi/files/patch-src_api_vos.cpp (contents, props changed) head/net/pichi/files/patch-src_net_spawn.cpp (contents, props changed) Deleted: head/net/pichi/files/patch-server_main.cpp head/net/pichi/files/patch-test_endpoint.cpp head/net/pichi/files/patch-test_method.cpp head/net/pichi/files/patch-test_utils.hpp Modified: head/net/pichi/Makefile head/net/pichi/distinfo head/net/pichi/files/patch-include_pichi_config.hpp.in head/net/pichi/pkg-plist Modified: head/net/pichi/Makefile ============================================================================== --- head/net/pichi/Makefile Sun Sep 13 07:14:55 2020 (r548460) +++ head/net/pichi/Makefile Sun Sep 13 07:22:30 2020 (r548461) @@ -1,7 +1,7 @@ # $FreeBSD$ PORTNAME= pichi -DISTVERSION= 1.3.0 +DISTVERSION= 1.3.1 CATEGORIES= net MAINTAINER= pichi@elude.in Modified: head/net/pichi/distinfo ============================================================================== --- head/net/pichi/distinfo Sun Sep 13 07:14:55 2020 (r548460) +++ head/net/pichi/distinfo Sun Sep 13 07:22:30 2020 (r548461) @@ -1,3 +1,3 @@ -TIMESTAMP = 1554899633 -SHA256 (pichi-router-pichi-1.3.0_GH0.tar.gz) = f5686a1e7c98d9c9eca88d88af53b85648ceeff9aa33bf2b1d95a09462d74d1c -SIZE (pichi-router-pichi-1.3.0_GH0.tar.gz) = 2066723 +TIMESTAMP = 1599981725 +SHA256 (pichi-router-pichi-1.3.1_GH0.tar.gz) = be1dc4d501387ef3524697ac804bec3ceb235a0c323ef8901532f04b0fab5cac +SIZE (pichi-router-pichi-1.3.1_GH0.tar.gz) = 2068432 Added: head/net/pichi/files/patch-cmake_Configure.cmake ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/net/pichi/files/patch-cmake_Configure.cmake Sun Sep 13 07:22:30 2020 (r548461) @@ -0,0 +1,26 @@ +--- cmake/Configure.cmake.orig 1970-01-01 00:00:00 UTC ++++ cmake/Configure.cmake +@@ -104,6 +104,14 @@ else () + set(DEPRECATED_RFC2818_CLASS OFF) + endif () + ++if (CMAKE_CXX_COMPILER_ID STREQUAL "Clang" AND ++ CMAKE_CXX_COMPILER_VERSION VERSION_GREATER_EQUAL "11.0.0") ++ # From clang 11.0.0, using std::allocator<void> triggers -Wdeprecated-declarations ++ set(DEPRECATED_ALLOCATOR_VOID ON) ++else () ++ set(DEPRECATED_ALLOCATOR_VOID OFF) ++endif () ++ + # TODO check_cxx_compiler_flag command always gets failed when generating for iOS + if (IOS) + set(DISABLE_SHORTEN_64_TO_32_WARNING ON) +@@ -125,6 +133,7 @@ if (BUILD_SERVER) + check_function_exists("close" HAS_CLOSE) + endif () + +-configure_file(${CMAKE_SOURCE_DIR}/include/pichi/config.hpp.in ${CMAKE_BINARY_DIR}/include/pichi/config.hpp) ++configure_file(${CMAKE_SOURCE_DIR}/include/pichi/config.hpp.in ++ ${CMAKE_BINARY_DIR}/include/pichi/config.hpp) + + message(STATUS "Generating config.hpp - done") Modified: head/net/pichi/files/patch-include_pichi_config.hpp.in ============================================================================== --- head/net/pichi/files/patch-include_pichi_config.hpp.in Sun Sep 13 07:14:55 2020 (r548460) +++ head/net/pichi/files/patch-include_pichi_config.hpp.in Sun Sep 13 07:22:30 2020 (r548461) @@ -1,18 +1,63 @@ --- include/pichi/config.hpp.in.orig 1970-01-01 00:00:00 UTC +++ include/pichi/config.hpp.in -@@ -42,6 +42,15 @@ +@@ -25,7 +25,7 @@ + #pragma clang diagnostic ignored "-Wreturn-std-move" + #include <boost/asio/ip/basic_resolver.hpp> + #pragma clang diagnostic pop +-#endif // NO_RETURN_STD_MOVE_FOR_BOOST_ASIO && __clang__ ++#endif // NO_RETURN_STD_MOVE_FOR_BOOST_ASIO && __clang__ + + #cmakedefine DISABLE_SHORTEN_64_TO_32_WARNING + #if defined(DISABLE_SHORTEN_64_TO_32_WARNING) && defined(__clang__) +@@ -33,7 +33,7 @@ + #pragma clang diagnostic ignored "-Wshorten-64-to-32" + #include <boost/asio/basic_socket.hpp> + #pragma clang diagnostic pop +-#endif // NO_RETURN_STD_MOVE_FOR_BOOST_ASIO && __clang__ ++#endif // NO_RETURN_STD_MOVE_FOR_BOOST_ASIO && __clang__ + + #cmakedefine DISABLE_C4702_FOR_BEAST_FIELDS + #if defined(DISABLE_C4702_FOR_BEAST_FIELDS) && defined(_MSC_VER) +@@ -41,7 +41,7 @@ + #pragma warning(disable : 4702) + #include <boost/beast/http/fields.hpp> #pragma warning(pop) - #endif // DISABLE_C4702_FOR_BEAST_FIELDS && _MSC_VER +-#endif // DISABLE_C4702_FOR_BEAST_FIELDS && _MSC_VER ++#endif // DISABLE_C4702_FOR_BEAST_FIELDS && _MSC_VER -+#ifdef __clang__ -+#if !__has_feature(c_atomic) + #ifdef __clang__ + #if !__has_feature(c_atomic) +@@ -49,18 +49,28 @@ + #pragma clang diagnostic ignored "-Wc11-extensions" + #include <boost/smart_ptr/detail/sp_counted_base_clang.hpp> + #pragma clang diagnostic pop +-#endif // !__has_feature(c_atomic) +-#endif // __clang__ ++#endif // !__has_feature(c_atomic) ++#endif // __clang__ + ++#cmakedefine DEPRECATED_ALLOCATOR_VOID ++#if defined(DEPRECATED_ALLOCATOR_VOID) && defined(__clang__) +#pragma clang diagnostic push -+#pragma clang diagnostic ignored "-Wc11-extensions" -+#include <boost/smart_ptr/detail/sp_counted_base_clang.hpp> ++#pragma clang diagnostic ignored "-Wdeprecated-declarations" ++#include <boost/asio/associated_allocator.hpp> ++#include <boost/asio/impl/executor.hpp> ++#include <boost/beast/core/async_base.hpp> +#pragma clang diagnostic pop -+#endif // !__has_feature(c_atomic) -+#endif // __clang__ ++#endif // DEPRECATED_ALLOCATOR_VOID && __clang__ + #cmakedefine CMAKE_INSTALL_PREFIX "@CMAKE_INSTALL_PREFIX@" #ifdef CMAKE_INSTALL_PREFIX + #define PICHI_PREFIX CMAKE_INSTALL_PREFIX +-#else // CMAKE_INSTALL_PREFIX ++#else // CMAKE_INSTALL_PREFIX + #error "CMAKE_INSTALL_PREFIX not defined" +-#endif // CMAKE_INSTALL_PREFIX ++#endif // CMAKE_INSTALL_PREFIX + + #cmakedefine ENABLE_TLS + #cmakedefine BUILD_TEST + +-#endif // PICHI_CONFIG_H ++#endif // PICHI_CONFIG_H Added: head/net/pichi/files/patch-src_api_egress__manager.cpp ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/net/pichi/files/patch-src_api_egress__manager.cpp Sun Sep 13 07:22:30 2020 (r548461) @@ -0,0 +1,26 @@ +--- src/api/egress_manager.cpp.orig 1970-01-01 00:00:00 UTC ++++ src/api/egress_manager.cpp +@@ -1,5 +1,6 @@ +-#include <pichi/api/egress_manager.hpp> + #include <pichi/config.hpp> ++// Include config.hpp first ++#include <pichi/api/egress_manager.hpp> + + using namespace std; + +@@ -9,7 +10,7 @@ void EgressManager::update(string const& name, EgressV + { + #ifndef ENABLE_TLS + assertFalse(vo.tls_.has_value() && *vo.tls_, PichiError::SEMANTIC_ERROR, "TLS not supported"); +-#endif // ENABLE_TLS ++#endif // ENABLE_TLS + c_[name] = move(vo); + } + +@@ -25,4 +26,4 @@ EgressManager::ConstIterator EgressManager::end() cons + + EgressManager::ConstIterator EgressManager::find(string_view name) const { return c_.find(name); } + +-} // namespace pichi::api +\ No newline at end of file ++} // namespace pichi::api Added: head/net/pichi/files/patch-src_api_vos.cpp ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/net/pichi/files/patch-src_api_vos.cpp Sun Sep 13 07:22:30 2020 (r548461) @@ -0,0 +1,65 @@ +--- src/api/vos.cpp.orig 1970-01-01 00:00:00 UTC ++++ src/api/vos.cpp +@@ -1,3 +1,5 @@ ++#include <pichi/config.hpp> ++// Include config.hpp first + #include <numeric> + #include <pichi/api/vos.hpp> + #include <pichi/common.hpp> +@@ -57,7 +59,7 @@ static decltype(auto) keyFile_ = "key_file"; + static decltype(auto) destinations_ = "destinations"; + static decltype(auto) balance_ = "balance"; + +-} // namespace IngressVOKey ++} // namespace IngressVOKey + + namespace EgressVOKey { + +@@ -73,7 +75,7 @@ static decltype(auto) tls_ = "tls"; + static decltype(auto) insecure_ = "insecure"; + static decltype(auto) caFile_ = "ca_file"; + +-} // namespace EgressVOKey ++} // namespace EgressVOKey + + namespace RuleVOKey { + +@@ -84,20 +86,20 @@ static decltype(auto) pattern_ = "pattern"; + static decltype(auto) domain_ = "domain"; + static decltype(auto) country_ = "country"; + +-} // namespace RuleVOKey ++} // namespace RuleVOKey + + namespace RouteVOKey { + + static decltype(auto) default_ = "default"; + static decltype(auto) rules_ = "rules"; + +-} // namespace RouteVOKey ++} // namespace RouteVOKey + + namespace ErrorVOKey { + + static decltype(auto) message_ = "message"; + +-} // namespace ErrorVOKey ++} // namespace ErrorVOKey + + namespace msg { + +@@ -129,7 +131,7 @@ static auto const TOO_LONG_NAME_PASSWORD = "Name or pa + static auto const MISSING_DESTINATIONS_FIELD = "Missiong destinations field"sv; + static auto const MISSING_BALANCE_FIELD = "Missiong balance field"sv; + +-} // namespace msg ++} // namespace msg + + static DelayMode parseDelayMode(json::Value const& v) + { +@@ -683,4 +685,4 @@ template <> RouteVO parse(json::Value const& v) + return rvo; + } + +-} // namespace pichi::api ++} // namespace pichi::api Added: head/net/pichi/files/patch-src_net_spawn.cpp ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/net/pichi/files/patch-src_net_spawn.cpp Sun Sep 13 07:22:30 2020 (r548461) @@ -0,0 +1,14 @@ +--- src/net/spawn.cpp.orig 1970-01-01 00:00:00 UTC ++++ src/net/spawn.cpp +@@ -1,3 +1,5 @@ ++#include <pichi/config.hpp> ++// Include config.hpp first + #include <boost/beast/http/error.hpp> + #include <iostream> + #include <pichi/exception.hpp> +@@ -28,4 +30,4 @@ void logException(std::exception_ptr eptr) noexcept + + void stubHandler(std::exception_ptr, asio::yield_context) noexcept {} + +-} // namespace pichi::net ++} // namespace pichi::net Modified: head/net/pichi/pkg-plist ============================================================================== --- head/net/pichi/pkg-plist Sun Sep 13 07:14:55 2020 (r548460) +++ head/net/pichi/pkg-plist Sun Sep 13 07:22:30 2020 (r548461) @@ -37,7 +37,7 @@ bin/pichi %%DEVEL%%include/pichi/net/spawn.hpp %%DEVEL%%include/pichi/net/ssaead.hpp %%DEVEL%%include/pichi/net/ssstream.hpp +%%DEVEL%%include/pichi/net/stream.hpp %%DEVEL%%include/pichi/net/tunnel.hpp -%%DEVEL%%include/pichi/test/socket.hpp %%DEVEL%%include/pichi/uri.hpp %%DEVEL%%include/pichi.h
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202009130722.08D7MVe7028858>