From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id D51EF15852A for ; Fri, 23 Aug 2024 11:09:50 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 101C32BC014; Fri, 23 Aug 2024 11:09:50 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (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) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id EA9442BC014 for ; Fri, 23 Aug 2024 11:09:49 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (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) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id F2449341465 for ; Fri, 23 Aug 2024 11:09:48 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 325CB18EB for ; Fri, 23 Aug 2024 11:09:47 +0000 (UTC) From: "Yixun Lan" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Yixun Lan" Message-ID: <1724411099.bd2fde68657be50be9f70fdcd2910f328dec027f.dlan@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: net-proxy/trojan/ X-VCS-Repository: repo/gentoo X-VCS-Files: net-proxy/trojan/metadata.xml net-proxy/trojan/trojan-1.16.0-r2.ebuild net-proxy/trojan/trojan-1.16.0-r3.ebuild X-VCS-Directories: net-proxy/trojan/ X-VCS-Committer: dlan X-VCS-Committer-Name: Yixun Lan X-VCS-Revision: bd2fde68657be50be9f70fdcd2910f328dec027f X-VCS-Branch: master Date: Fri, 23 Aug 2024 11:09:47 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: f07e3734-0996-434c-9a55-4b109dcf1930 X-Archives-Hash: ce51fdbdb08fa99dfae5b3b483fe7fbe commit: bd2fde68657be50be9f70fdcd2910f328dec027f Author: blackteahamburger outlook com> AuthorDate: Tue Aug 20 04:24:59 2024 +0000 Commit: Yixun Lan gentoo org> CommitDate: Fri Aug 23 11:04:59 2024 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=bd2fde68 net-proxy/trojan: add tcpfastopen, nat and reuseport use flag Closes: https://bugs.gentoo.org/938213 Closes: https://github.com/gentoo/gentoo/pull/38213 Signed-off-by: blackteahamburger outlook.com> Signed-off-by: Yixun Lan gentoo.org> net-proxy/trojan/metadata.xml | 3 +++ .../trojan/{trojan-1.16.0-r2.ebuild => trojan-1.16.0-r3.ebuild} | 7 +++++-- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/net-proxy/trojan/metadata.xml b/net-proxy/trojan/metadata.xml index c141a430b420..c04b8ddb549e 100644 --- a/net-proxy/trojan/metadata.xml +++ b/net-proxy/trojan/metadata.xml @@ -25,6 +25,9 @@ build with MySQL support + Build with NAT support + Build with SO_REUSEPORT support + Force build with TCP Fast Open support trojan-gfw/trojan diff --git a/net-proxy/trojan/trojan-1.16.0-r2.ebuild b/net-proxy/trojan/trojan-1.16.0-r3.ebuild similarity index 89% rename from net-proxy/trojan/trojan-1.16.0-r2.ebuild rename to net-proxy/trojan/trojan-1.16.0-r3.ebuild index b5b332947cbb..f77acffb22dc 100644 --- a/net-proxy/trojan/trojan-1.16.0-r2.ebuild +++ b/net-proxy/trojan/trojan-1.16.0-r3.ebuild @@ -1,7 +1,7 @@ # Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=7 +EAPI=8 DISABLE_AUTOFORMATTING=1 FORCE_PRINT_ELOG=1 @@ -20,7 +20,7 @@ fi LICENSE="GPL-3+" SLOT="0" -IUSE="mysql test" +IUSE="mysql +nat +reuseport tcpfastopen test" # Some hiccups setting up local network server. RESTRICT="test" @@ -50,6 +50,9 @@ src_prepare() { src_configure() { local mycmakeargs=( -DENABLE_MYSQL=$(usex mysql) + -DENABLE_NAT=$(usex nat) + -DENABLE_REUSE_PORT=$(usex reuseport) + -DFORCE_TCP_FASTOPEN=$(usex tcpfastopen) -DSYSTEMD_SERVICE=ON -DSYSTEMD_SERVICE_PATH=$(systemd_get_systemunitdir) )