From b818f6a820dceae80d6e3faac5fdf7be0c6fcbe2 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Fri, 23 Aug 2024 14:56:14 +0100 Subject: gentoo auto-resync : 23:08:2024 - 14:56:14 --- net-proxy/Manifest.gz | Bin 5373 -> 5376 bytes net-proxy/trojan/Manifest | 4 +- net-proxy/trojan/metadata.xml | 3 ++ net-proxy/trojan/trojan-1.16.0-r2.ebuild | 72 ----------------------------- net-proxy/trojan/trojan-1.16.0-r3.ebuild | 75 +++++++++++++++++++++++++++++++ 5 files changed, 80 insertions(+), 74 deletions(-) delete mode 100644 net-proxy/trojan/trojan-1.16.0-r2.ebuild create mode 100644 net-proxy/trojan/trojan-1.16.0-r3.ebuild (limited to 'net-proxy') diff --git a/net-proxy/Manifest.gz b/net-proxy/Manifest.gz index 49f32686dc65..bc21a13f2430 100644 Binary files a/net-proxy/Manifest.gz and b/net-proxy/Manifest.gz differ diff --git a/net-proxy/trojan/Manifest b/net-proxy/trojan/Manifest index 48f3c5bc3d59..0c90d9efd00d 100644 --- a/net-proxy/trojan/Manifest +++ b/net-proxy/trojan/Manifest @@ -1,5 +1,5 @@ AUX README.gentoo 418 BLAKE2B ee8bd518461641a83a67f28ce0e93fe0c2763cda74cddae26ca547010b8a9095982e7ee1339bea9fcbcb248f6a800a1fed63902dd2ac9724e8d6a0d47fbd1f02 SHA512 54594e7813f6618e959f8c52cab5804f9403a8f0afbbdbc3bfadb46899c5d383ec3b9ff28a2721912f1b348f7e6c53a783745b5e0fddaca689c97a0ba9ef83fa AUX trojan.initd 981 BLAKE2B 8c021142a6c59dc2fde43bdc75d80c784600583aa997d4bc74539963ec41bdb7a15e57eb7b31ff4ea69e6d3f0034df8bf04fa3f971ca927d306bd9fe12ef9ab5 SHA512 6d419e1c142d8f6c091acb29f0a128742129b7c87f625a7b13e11fdaca6a58c1d2e528cd9ba34658109413735bd6ed8095f16e5eff258ac76f06a727e514793e DIST trojan-1.16.0.tar.gz 51669 BLAKE2B 9238f9886820ca3625a894ac8de1e199e238029593634436f3aa529d5c576f2636d5183b64a2e6155a888fe8f45629c94625f02119fbfb4ada01b1bd9e502fcf SHA512 60aa8539731eee6f15cbcb18b20b45435fc2dfe439a2f67fe9770257c3b6ffe219efe376cfd909f748d523a18645c96f6859b8487cacaba04ac7d93cf762f153 -EBUILD trojan-1.16.0-r2.ebuild 1455 BLAKE2B 53749e4f3d755888821aa1923a1cbc4aeb5f30c833c97d2e8fa217614f035debe5f931c93b2305dfb7a49ca0b9386ca664536a0e41ba07f2d53a043e71469171 SHA512 685801e95cb43e804cbe6fbfc036a56b22fb99fb7e6b1cabe372fcd3a0ce890dd6739189c601aa800d21fd626a53b772ae68e1b8962fbd6aecf8fa6afb1eb997 -MISC metadata.xml 1155 BLAKE2B 4b36b42fd226c7ffb5b28eed065d16bbf10abf68108044d64ae97b5ca46e4b2d38a95f472da080d8884a10ba06a942e9a2aa6a9c3cc79b13a51d33cb06b28859 SHA512 bdbcab7001c48932fdc01158e9b0345141ffc66f0dd413c8d387882b01c73a08dfe5668cc27cdf7f028da7ec3f18613fca46509496d37b1e8ee66efd7fc1f12f +EBUILD trojan-1.16.0-r3.ebuild 1593 BLAKE2B d024064eed3c92e4c309263aa5272190d56871d50424160079345459556f4951fd4e8513a872dc343b24e107b49eb81cc729685e75af00e5f432ba35d644545f SHA512 2bc07fefc50098219d93fcd5215eb0cb2d58da2b8dedc260443d9240c610203083f37054865b79c620742c0ea5252df265359e34816da020c5927e7f96602cb5 +MISC metadata.xml 1341 BLAKE2B 8f28f3a075c3e6f6342ec0f767d135df4e4b91737ad866ba90f34097abac622eea5ec4887b3de4b5c3c736b6b54586d6dfd800b201a1dcb76ce255dc7d47ca6e SHA512 035045fb694f354ca1d669d435882a21e7f9c174a70a80c8215403ed91c0240ed01572c0b5172de8a7bb3441782956ef84c3e8a66491dc672408f16f7d0614dd 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-r2.ebuild deleted file mode 100644 index b5b332947cbb..000000000000 --- a/net-proxy/trojan/trojan-1.16.0-r2.ebuild +++ /dev/null @@ -1,72 +0,0 @@ -# Copyright 1999-2024 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -DISABLE_AUTOFORMATTING=1 -FORCE_PRINT_ELOG=1 -PYTHON_COMPAT=( python3_{10..12} ) - -inherit cmake python-any-r1 systemd readme.gentoo-r1 -DESCRIPTION="An unidentifiable mechanism that helps you bypass GFW" -HOMEPAGE="https://github.com/trojan-gfw/trojan" -if [[ "${PV}" == 9999 ]] ; then - inherit git-r3 - EGIT_REPO_URI="https://github.com/trojan-gfw/trojan.git" -else - SRC_URI="https://github.com/trojan-gfw/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz" - KEYWORDS="~amd64 ~arm ~arm64 ~riscv ~x86" -fi - -LICENSE="GPL-3+" -SLOT="0" -IUSE="mysql test" - -# Some hiccups setting up local network server. -RESTRICT="test" - -RDEPEND=" - dev-libs/boost:= - dev-libs/openssl:0= - mysql? ( dev-db/mysql-connector-c:= ) -" -DEPEND="${RDEPEND} - acct-group/trojan - acct-user/trojan - test? ( net-misc/curl ${PYTHON_DEPS} ) -" - -pkg_setup() { - use test && python-any-r1_pkg_setup -} - -src_prepare() { - default - cmake_src_prepare - sed -i -e "/User/s/nobody/trojan/g" \ - "${S}"/examples/trojan.service-example || die -} - -src_configure() { - local mycmakeargs=( - -DENABLE_MYSQL=$(usex mysql) - -DSYSTEMD_SERVICE=ON - -DSYSTEMD_SERVICE_PATH=$(systemd_get_systemunitdir) - ) - cmake_src_configure -} - -src_install() { - cmake_src_install - newinitd "${FILESDIR}/trojan.initd" trojan - - readme.gentoo_create_doc -} - -src_test() { - cmake_src_test -j1 -} - -pkg_postinst() { - readme.gentoo_print_elog -} diff --git a/net-proxy/trojan/trojan-1.16.0-r3.ebuild b/net-proxy/trojan/trojan-1.16.0-r3.ebuild new file mode 100644 index 000000000000..f77acffb22dc --- /dev/null +++ b/net-proxy/trojan/trojan-1.16.0-r3.ebuild @@ -0,0 +1,75 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +DISABLE_AUTOFORMATTING=1 +FORCE_PRINT_ELOG=1 +PYTHON_COMPAT=( python3_{10..12} ) + +inherit cmake python-any-r1 systemd readme.gentoo-r1 +DESCRIPTION="An unidentifiable mechanism that helps you bypass GFW" +HOMEPAGE="https://github.com/trojan-gfw/trojan" +if [[ "${PV}" == 9999 ]] ; then + inherit git-r3 + EGIT_REPO_URI="https://github.com/trojan-gfw/trojan.git" +else + SRC_URI="https://github.com/trojan-gfw/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz" + KEYWORDS="~amd64 ~arm ~arm64 ~riscv ~x86" +fi + +LICENSE="GPL-3+" +SLOT="0" +IUSE="mysql +nat +reuseport tcpfastopen test" + +# Some hiccups setting up local network server. +RESTRICT="test" + +RDEPEND=" + dev-libs/boost:= + dev-libs/openssl:0= + mysql? ( dev-db/mysql-connector-c:= ) +" +DEPEND="${RDEPEND} + acct-group/trojan + acct-user/trojan + test? ( net-misc/curl ${PYTHON_DEPS} ) +" + +pkg_setup() { + use test && python-any-r1_pkg_setup +} + +src_prepare() { + default + cmake_src_prepare + sed -i -e "/User/s/nobody/trojan/g" \ + "${S}"/examples/trojan.service-example || die +} + +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) + ) + cmake_src_configure +} + +src_install() { + cmake_src_install + newinitd "${FILESDIR}/trojan.initd" trojan + + readme.gentoo_create_doc +} + +src_test() { + cmake_src_test -j1 +} + +pkg_postinst() { + readme.gentoo_print_elog +} -- cgit v1.2.3