From 1beef3fa804f37ccd6f7e7db421a1e991561073f Mon Sep 17 00:00:00 2001 From: CN_SZTL Date: Tue, 31 Dec 2019 15:02:53 +0800 Subject: [PATCH] trojan: merge upstream source --- package/lienol/trojan/Makefile | 4 +++- .../trojan/patches/001-force-openssl-version.patch | 11 +++++++++++ 2 files changed, 14 insertions(+), 1 deletion(-) create mode 100644 package/lienol/trojan/patches/001-force-openssl-version.patch diff --git a/package/lienol/trojan/Makefile b/package/lienol/trojan/Makefile index 688e9c919f..f755210a81 100644 --- a/package/lienol/trojan/Makefile +++ b/package/lienol/trojan/Makefile @@ -41,8 +41,10 @@ TARGET_LDFLAGS += -Wl,--gc-sections CMAKE_OPTIONS += \ -DENABLE_MYSQL=OFF \ - -DENABLE_SSL_KEYLOG=ON \ -DENABLE_NAT=ON \ + -DENABLE_REUSE_PORT=ON \ + -DENABLE_SSL_KEYLOG=ON \ + -DENABLE_TLS13_CIPHERSUITES=ON \ -DFORCE_TCP_FASTOPEN=OFF \ -DSYSTEMD_SERVICE=OFF \ -DOPENSSL_USE_STATIC_LIBS=FALSE \ diff --git a/package/lienol/trojan/patches/001-force-openssl-version.patch b/package/lienol/trojan/patches/001-force-openssl-version.patch new file mode 100644 index 0000000000..7ee8f631cc --- /dev/null +++ b/package/lienol/trojan/patches/001-force-openssl-version.patch @@ -0,0 +1,11 @@ +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -43,7 +43,7 @@ if(MSVC) + add_definitions(-DBOOST_DATE_TIME_NO_LIB) + endif() + +-find_package(OpenSSL 1.1.0 REQUIRED) ++find_package(OpenSSL 1.1.1 REQUIRED) + include_directories(${OPENSSL_INCLUDE_DIR}) + target_link_libraries(trojan ${OPENSSL_LIBRARIES}) + if(OPENSSL_VERSION VERSION_GREATER_EQUAL 1.1.1)