diff options
author | V3n3RiX <venerix@redcorelinux.org> | 2021-02-13 21:41:11 +0000 |
---|---|---|
committer | V3n3RiX <venerix@redcorelinux.org> | 2021-02-13 21:41:11 +0000 |
commit | c8d60dada2ec8eb48b2d2b290cd6683ccec40e39 (patch) | |
tree | c44943ee0563a3fa957716de909fed683117fcb9 /net-proxy/trojan | |
parent | 69051588e2f955485fe5d45d45e616bc60a2de57 (diff) |
gentoo (valentine's day) resync : 14.02.2021
Diffstat (limited to 'net-proxy/trojan')
-rw-r--r-- | net-proxy/trojan/Manifest | 6 | ||||
-rw-r--r-- | net-proxy/trojan/files/README.gentoo | 14 | ||||
-rw-r--r-- | net-proxy/trojan/files/trojan.initd | 6 | ||||
-rw-r--r-- | net-proxy/trojan/trojan-1.16.0-r2.ebuild (renamed from net-proxy/trojan/trojan-1.16.0-r1.ebuild) | 37 | ||||
-rw-r--r-- | net-proxy/trojan/trojan-9999.ebuild | 61 |
5 files changed, 42 insertions, 82 deletions
diff --git a/net-proxy/trojan/Manifest b/net-proxy/trojan/Manifest index e5dfe1f39e42..860228e347ad 100644 --- a/net-proxy/trojan/Manifest +++ b/net-proxy/trojan/Manifest @@ -1,5 +1,5 @@ -AUX trojan.initd 981 BLAKE2B fd66aa23bed621362d28d27125388de413dc554180283337f49feacbab3f2bae8b28409b0c2e8d980ff79d1082ac0a56657bb7d089262c99658afba0f3d28eff SHA512 d6c79b5705da095173e6a590d128d77d68036e20916ce17144d6889d45ccb9cf5422665a22f192019e0624d60998dfd077587c2ebc2f7b0d4078e33113a8a462 +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-r1.ebuild 1317 BLAKE2B 885e8b32a2139844af2216674bb541117a9f76d6802a8ee3ef004d4f13df6bef35904e077198c975a9ab56e011e6beae7284124b1dc226af8665dbcc3365d7af SHA512 d974d214ffe5de584f0d01f2ce2a6e8c2e46b30a82730ec68df8e3b73ad1d9c762c2dd1393a1e5e53abcb04da24c72f19c9b711aa557c0ce4e6fbed6b146c56f -EBUILD trojan-9999.ebuild 1275 BLAKE2B 9ca76e77a9d8315a5d0f5bbcb33391f123d1a771f0ad385d044b822c671dbb99e0f064a96fb390d0b2e5968aac5364e4f046b09ffc895991d592fb0a9674ee31 SHA512 50bcb42d8fb833d2e9b2e7fde8e5c73d611c0752de2211af5fffc753acf21f15ca6c50ecc890c920e021660ab53a02b6648ff6322b9e69ccd0efb3d8389302a4 +EBUILD trojan-1.16.0-r2.ebuild 1401 BLAKE2B 21d9c6dd44b740e96589dcad0b66d5cb5bbd0d92d9b8d19eefcc8e4860e1181ed3ceaa34126a11eca86d8093c41a77de01c3e819bc254ec5bc9ab051eab185fa SHA512 720b67a3c3a3b1eb1f599d94399e1f6d88267b949c002dd925f881b754fc180234d6fa30c47b239998b39058f1074c01ce0a2fea84180c4880d283ba54e62234 MISC metadata.xml 1124 BLAKE2B 0d11d3625f824da33597ff489cb1170cac018279c80ce230c0b0233c7bc1e19a279adbea4f2aa9d83077ac8359d37714326dddb3c8f7f8503dbc9e17857a08d5 SHA512 2c912d390ff5483dc5458ff887958e259bdd6897754a3374d5d978729b692d0fc99768bd12975dc6c9e44b4080046914d9f55bc67045f68e792e2712cc513f30 diff --git a/net-proxy/trojan/files/README.gentoo b/net-proxy/trojan/files/README.gentoo new file mode 100644 index 000000000000..caaf236f4c1c --- /dev/null +++ b/net-proxy/trojan/files/README.gentoo @@ -0,0 +1,14 @@ +Notes: + 1) starting from version 1.16.0-r2, the daemon will +run as user='trojan', previous it's run as user='nobody', +you might want to fix the permissions at /etc/trojan/*. + + 2) Running Trojan with multi instances + + a) Using OpenRC + Prepare /etc/trojan/${foo}.json first + # ln -s /etc/init.d/trojan{,.${foo}} + # rc-update add trojan.${foo} default + + b) Using Systemd + # systemctl enable trojan.${foo} diff --git a/net-proxy/trojan/files/trojan.initd b/net-proxy/trojan/files/trojan.initd index 348d307c5264..9c86bf704b9b 100644 --- a/net-proxy/trojan/files/trojan.initd +++ b/net-proxy/trojan/files/trojan.initd @@ -1,9 +1,9 @@ #!/sbin/openrc-run -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -TJ_USER=nobody -TJ_GROUP=nobody +TJ_USER=trojan +TJ_GROUP=trojan TJ_NAME=${SVCNAME##*.} if [ -n "${TJ_NAME}" -a "${SVCNAME}" != "trojan" ]; then diff --git a/net-proxy/trojan/trojan-1.16.0-r1.ebuild b/net-proxy/trojan/trojan-1.16.0-r2.ebuild index 606095c5ab12..88eb4b02d0ad 100644 --- a/net-proxy/trojan/trojan-1.16.0-r1.ebuild +++ b/net-proxy/trojan/trojan-1.16.0-r2.ebuild @@ -3,17 +3,23 @@ EAPI=7 +DISABLE_AUTOFORMATTING=1 +FORCE_PRINT_ELOG=1 PYTHON_COMPAT=( python3_{7..9} ) -inherit cmake python-any-r1 systemd - +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" -SRC_URI="https://github.com/trojan-gfw/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz" +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 ~x86" +fi LICENSE="GPL-3+" SLOT="0" -KEYWORDS="~amd64 ~arm ~arm64 ~x86" IUSE="mysql test" # Some hiccups setting up local network server. @@ -25,9 +31,18 @@ RDEPEND=" mysql? ( dev-db/mysql-connector-c:= ) " DEPEND="${RDEPEND} + acct-group/trojan + acct-user/trojan test? ( net-misc/curl ${PYTHON_DEPS} ) " +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) @@ -40,6 +55,8 @@ src_configure() { src_install() { cmake_src_install newinitd "${FILESDIR}/trojan.initd" trojan + + readme.gentoo_create_doc } src_test() { @@ -47,15 +64,5 @@ src_test() { } pkg_postinst() { - elog "Running Trojan with multi instances" - elog "" - - elog "Prepare /etc/trojan/\${blah}.json first" - elog "Config with Openrc" - elog " ln -s /etc/init.d/trojan{,.\${blah}}" - elog " rc-update add trojan.\${blah} default" - elog "" - elog "Config with Systemd" - elog " systemctl enable trojan.\${blah}" - elog "" + readme.gentoo_print_elog } diff --git a/net-proxy/trojan/trojan-9999.ebuild b/net-proxy/trojan/trojan-9999.ebuild deleted file mode 100644 index b9a12df1c16e..000000000000 --- a/net-proxy/trojan/trojan-9999.ebuild +++ /dev/null @@ -1,61 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -PYTHON_COMPAT=( python3_{7..9} ) -EGIT_REPO_URI="https://github.com/trojan-gfw/trojan.git" - -inherit cmake git-r3 python-any-r1 systemd - -DESCRIPTION="An unidentifiable mechanism that helps you bypass GFW" -HOMEPAGE="https://github.com/trojan-gfw/trojan" - -LICENSE="GPL-3+" -SLOT="0" -KEYWORDS="" -IUSE="mysql test" - -# Some hiccups setting up local network server. -RESTRICT="test" - -RDEPEND=" - >=dev-libs/boost-1.66.0:= - dev-libs/openssl:0= - mysql? ( dev-db/mysql-connector-c:= ) -" -DEPEND="${RDEPEND} - test? ( net-misc/curl ${PYTHON_DEPS} ) -" - -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 -} - -src_test() { - cmake_src_test -j1 -} - -pkg_postinst() { - elog "Running Trojan with multi instances" - elog "" - - elog "Prepare /etc/trojan/\${blah}.json first" - elog "Config with Openrc" - elog " ln -s /etc/init.d/trojan{,.\${blah}}" - elog " rc-update add trojan.\${blah} default" - elog "" - elog "Config with Systemd" - elog " systemctl enable trojan.\${blah}" - elog "" -} |