[gentoo-commits] repo/gentoo:master commit in: net-proxy/trojan/

2024-08-23 Thread Yixun Lan 
commit: bd2fde68657be50be9f70fdcd2910f328dec027f
Author: blackteahamburger  outlook  com>
AuthorDate: Tue Aug 20 04:24:59 2024 +
Commit: Yixun Lan  gentoo  org>
CommitDate: Fri Aug 23 11:04:59 2024 +
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)
)

[gentoo-commits] repo/gentoo:master commit in: net-proxy/trojan/

2024-04-13 Thread Michał Górny 
commit: 46fba48edea512362ea7bf53ae4f468abdecf8a5
Author: Xin Yang  icloud  com>
AuthorDate: Sat Apr 13 10:24:06 2024 +
Commit: Michał Górny  gentoo  org>
CommitDate: Sat Apr 13 14:09:06 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=46fba48e

net-proxy/trojan: enable py3.12

Signed-off-by: Xin Yang  icloud.com>
Closes: https://github.com/gentoo/gentoo/pull/36234
Signed-off-by: Michał Górny  gentoo.org>

 net-proxy/trojan/trojan-1.16.0-r2.ebuild | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/net-proxy/trojan/trojan-1.16.0-r2.ebuild 
b/net-proxy/trojan/trojan-1.16.0-r2.ebuild
index 50c1e89008da..b5b332947cbb 100644
--- a/net-proxy/trojan/trojan-1.16.0-r2.ebuild
+++ b/net-proxy/trojan/trojan-1.16.0-r2.ebuild
@@ -1,11 +1,11 @@
-# Copyright 1999-2023 Gentoo Authors
+# 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_{9..11} )
+PYTHON_COMPAT=( python3_{10..12} )
 
 inherit cmake python-any-r1 systemd readme.gentoo-r1
 DESCRIPTION="An unidentifiable mechanism that helps you bypass GFW"

[gentoo-commits] repo/gentoo:master commit in: net-proxy/trojan/

2023-05-20 Thread Joonas Niilola 
commit: a83b48d803ba34d09bd547d7ba4c8d96bbb35f72
Author: Xin Yang  icloud  com>
AuthorDate: Mon May  8 06:38:41 2023 +
Commit: Joonas Niilola  gentoo  org>
CommitDate: Sat May 20 12:27:48 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a83b48d8

net-proxy/trojan: add py3.11 PYTHON_COMPAT #897150

Signed-off-by: Xin Yang  icloud.com>
Closes: https://github.com/gentoo/gentoo/pull/30929
Closes: https://bugs.gentoo.org/897150
Signed-off-by: Joonas Niilola  gentoo.org>

 net-proxy/trojan/trojan-1.16.0-r2.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-proxy/trojan/trojan-1.16.0-r2.ebuild 
b/net-proxy/trojan/trojan-1.16.0-r2.ebuild
index a741316e0c58..50c1e89008da 100644
--- a/net-proxy/trojan/trojan-1.16.0-r2.ebuild
+++ b/net-proxy/trojan/trojan-1.16.0-r2.ebuild
@@ -5,7 +5,7 @@ EAPI=7
 
 DISABLE_AUTOFORMATTING=1
 FORCE_PRINT_ELOG=1
-PYTHON_COMPAT=( python3_{9..10} )
+PYTHON_COMPAT=( python3_{9..11} )
 
 inherit cmake python-any-r1 systemd readme.gentoo-r1
 DESCRIPTION="An unidentifiable mechanism that helps you bypass GFW"

[gentoo-commits] repo/gentoo:master commit in: net-proxy/trojan/

2022-09-04 Thread David Seifert 
commit: 1fedbd5f46f338c1823a1b923fb1e0d302f8515d
Author: David Seifert  gentoo  org>
AuthorDate: Sun Sep  4 13:03:21 2022 +
Commit: David Seifert  gentoo  org>
CommitDate: Sun Sep  4 13:03:21 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1fedbd5f

net-proxy/trojan: remove stale boost lower bounds

Signed-off-by: David Seifert  gentoo.org>

 net-proxy/trojan/trojan-1.16.0-r2.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-proxy/trojan/trojan-1.16.0-r2.ebuild 
b/net-proxy/trojan/trojan-1.16.0-r2.ebuild
index 36c1a9d0370e..e29b705e2620 100644
--- a/net-proxy/trojan/trojan-1.16.0-r2.ebuild
+++ b/net-proxy/trojan/trojan-1.16.0-r2.ebuild
@@ -26,7 +26,7 @@ IUSE="mysql test"
 RESTRICT="test"
 
 RDEPEND="
-   >=dev-libs/boost-1.66.0:=
+   dev-libs/boost:=
dev-libs/openssl:0=
mysql? ( dev-db/mysql-connector-c:= )
 "

[gentoo-commits] repo/gentoo:master commit in: net-proxy/trojan/

2022-05-31 Thread Sam James 
commit: 283d2a9c4d105ec018723be9f31a3fabdd2a25ae
Author: Sam James  gentoo  org>
AuthorDate: Wed Jun  1 01:42:44 2022 +
Commit: Sam James  gentoo  org>
CommitDate: Wed Jun  1 01:42:44 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=283d2a9c

net-proxy/trojan: enable py3.10 and disable py3.7

Signed-off-by: Sam James  gentoo.org>

 net-proxy/trojan/trojan-1.16.0-r2.ebuild | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/net-proxy/trojan/trojan-1.16.0-r2.ebuild 
b/net-proxy/trojan/trojan-1.16.0-r2.ebuild
index 181c880f56cb..36c1a9d0370e 100644
--- a/net-proxy/trojan/trojan-1.16.0-r2.ebuild
+++ b/net-proxy/trojan/trojan-1.16.0-r2.ebuild
@@ -1,11 +1,11 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 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_{7..9} )
+PYTHON_COMPAT=( python3_{8..10} )
 
 inherit cmake python-any-r1 systemd readme.gentoo-r1
 DESCRIPTION="An unidentifiable mechanism that helps you bypass GFW"

[gentoo-commits] repo/gentoo:master commit in: net-proxy/trojan/

2021-12-02 Thread Yixun Lan 
commit: 607ef99d81232490b87614c64edd16002c02b4aa
Author: Yixun Lan  gentoo  org>
AuthorDate: Fri Dec  3 00:12:18 2021 +
Commit: Yixun Lan  gentoo  org>
CommitDate: Fri Dec  3 01:23:43 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=607ef99d

net-proxy/trojan: keyword ~riscv

Package-Manager: Portage-3.0.28, Repoman-3.0.3
Signed-off-by: Yixun Lan  gentoo.org>

 net-proxy/trojan/trojan-1.16.0-r2.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-proxy/trojan/trojan-1.16.0-r2.ebuild 
b/net-proxy/trojan/trojan-1.16.0-r2.ebuild
index 2c5d64a5c9dc..181c880f56cb 100644
--- a/net-proxy/trojan/trojan-1.16.0-r2.ebuild
+++ b/net-proxy/trojan/trojan-1.16.0-r2.ebuild
@@ -15,7 +15,7 @@ if [[ "${PV}" ==  ]] ; then
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"
+   KEYWORDS="~amd64 ~arm ~arm64 ~riscv ~x86"
 fi
 
 LICENSE="GPL-3+"

[gentoo-commits] repo/gentoo:master commit in: net-proxy/trojan/

2021-06-07 Thread Sam James 
commit: 8f8f487566d8f8c3ed76f91b9955706a31e080f4
Author: Sam James  gentoo  org>
AuthorDate: Mon Jun  7 16:49:01 2021 +
Commit: Sam James  gentoo  org>
CommitDate: Mon Jun  7 16:49:01 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8f8f4875

net-proxy/trojan: only requre Python for tests

Closes: https://bugs.gentoo.org/764644
Signed-off-by: Sam James  gentoo.org>

 net-proxy/trojan/trojan-1.16.0-r2.ebuild | 4 
 1 file changed, 4 insertions(+)

diff --git a/net-proxy/trojan/trojan-1.16.0-r2.ebuild 
b/net-proxy/trojan/trojan-1.16.0-r2.ebuild
index 88eb4b02d0a..2c5d64a5c9d 100644
--- a/net-proxy/trojan/trojan-1.16.0-r2.ebuild
+++ b/net-proxy/trojan/trojan-1.16.0-r2.ebuild
@@ -36,6 +36,10 @@ DEPEND="${RDEPEND}
test? ( net-misc/curl ${PYTHON_DEPS} )
 "
 
+pkg_setup() {
+   use test && python-any-r1_pkg_setup
+}
+
 src_prepare() {
default
cmake_src_prepare

[gentoo-commits] repo/gentoo:master commit in: net-proxy/trojan/, net-proxy/trojan/files/

2021-02-13 Thread Yixun Lan 
commit: f995177fa0ec5b3886809d17666ab509c1476bfb
Author: Yixun Lan  gentoo  org>
AuthorDate: Sat Feb 13 15:21:57 2021 +
Commit: Yixun Lan  gentoo  org>
CommitDate: Sat Feb 13 15:23:00 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f995177f

net-proxy/trojan: create dedicated UID/GID

create dedicated user/group for trojan, so not to expose sensitive info
for the security reason.

also drop the live ebuild while still kept the logic for easy future
updating.

Package-Manager: Portage-3.0.13, Repoman-3.0.2
Signed-off-by: Yixun Lan  gentoo.org>

 net-proxy/trojan/files/README.gentoo   | 14 +
 net-proxy/trojan/files/trojan.initd|  6 +--
 ...an-1.16.0-r1.ebuild => trojan-1.16.0-r2.ebuild} | 37 +++--
 net-proxy/trojan/trojan-.ebuild| 61 --
 4 files changed, 39 insertions(+), 79 deletions(-)

diff --git a/net-proxy/trojan/files/README.gentoo 
b/net-proxy/trojan/files/README.gentoo
new file mode 100644
index 000..caaf236f4c1
--- /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 348d307c526..9c86bf704b9 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
similarity index 60%
rename from net-proxy/trojan/trojan-1.16.0-r1.ebuild
rename to net-proxy/trojan/trojan-1.16.0-r2.ebuild
index 606095c5ab1..88eb4b02d0a 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}" ==  ]] ; 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-.ebuild 
b/net-proxy/trojan/trojan-.ebuild
deleted file mode 100644
index b9a12df1c16..000
--- a/net-proxy/trojan/trojan-.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/troj

[gentoo-commits] repo/gentoo:master commit in: net-proxy/trojan/

2021-01-20 Thread Yixun Lan 
commit: de547aab939095c5e3bc605bae5df2348c5fb517
Author: Yixun Lan  gentoo  org>
AuthorDate: Thu Jan 21 01:51:11 2021 +
Commit: Yixun Lan  gentoo  org>
CommitDate: Thu Jan 21 01:51:47 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=de547aab

net-proxy/trojan: bump PYTHON_COMPAT versions

Package-Manager: Portage-3.0.13, Repoman-3.0.2
Signed-off-by: Yixun Lan  gentoo.org>

 net-proxy/trojan/trojan-1.16.0-r1.ebuild | 4 ++--
 net-proxy/trojan/trojan-.ebuild  | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/net-proxy/trojan/trojan-1.16.0-r1.ebuild 
b/net-proxy/trojan/trojan-1.16.0-r1.ebuild
index 21f494f1364..43966961b72 100644
--- a/net-proxy/trojan/trojan-1.16.0-r1.ebuild
+++ b/net-proxy/trojan/trojan-1.16.0-r1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-PYTHON_COMPAT=( python{3_6,3_7} )
+PYTHON_COMPAT=( python3_{6..9} )
 
 inherit cmake python-any-r1 systemd
 

diff --git a/net-proxy/trojan/trojan-.ebuild 
b/net-proxy/trojan/trojan-.ebuild
index fd0888f198b..bf515ed0730 100644
--- a/net-proxy/trojan/trojan-.ebuild
+++ b/net-proxy/trojan/trojan-.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-PYTHON_COMPAT=( python{3_6,3_7} )
+PYTHON_COMPAT=( python3_{6..9} )
 EGIT_REPO_URI="https://github.com/trojan-gfw/trojan.git";
 
 inherit cmake git-r3 python-any-r1 systemd

[gentoo-commits] repo/gentoo:master commit in: net-proxy/trojan/files/

2020-09-27 Thread Yixun Lan 
commit: af547811efa07620534f0c5b5d1db5fc75ebcf39
Author: Yixun Lan  gentoo  org>
AuthorDate: Sun Sep 27 13:43:35 2020 +
Commit: Yixun Lan  gentoo  org>
CommitDate: Sun Sep 27 13:47:34 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=af547811

net-proxy/trojan: fix permission with log file

Package-Manager: Portage-3.0.0, Repoman-2.3.23
Signed-off-by: Yixun Lan  gentoo.org>

 net-proxy/trojan/files/trojan.initd | 16 ++--
 1 file changed, 10 insertions(+), 6 deletions(-)

diff --git a/net-proxy/trojan/files/trojan.initd 
b/net-proxy/trojan/files/trojan.initd
index c87f6576d6b..348d307c526 100644
--- a/net-proxy/trojan/files/trojan.initd
+++ b/net-proxy/trojan/files/trojan.initd
@@ -2,6 +2,9 @@
 # Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
+TJ_USER=nobody
+TJ_GROUP=nobody
+
 TJ_NAME=${SVCNAME##*.}
 if [ -n "${TJ_NAME}" -a "${SVCNAME}" != "trojan" ]; then
TJ_PIDFILE="/run/trojan.${TJ_NAME}.pid"
@@ -19,10 +22,11 @@ depend() {
 
 start() {
ebegin "Starting Trojan, Log File: ${TJ_LOG}"
-   start-stop-daemon --start -b \
-   --user nobody --group nobody \
-   -1 "${TJ_LOG}" -2 "${TJ_LOG}" \
-   -m -p "${TJ_PIDFILE}" \
+   checkpath -f -m 0600 -o ${TJ_USER}:${TJ_GROUP} "${TJ_LOG}"
+   start-stop-daemon --start --background \
+   --user ${TJ_USER} --group ${TJ_GROUP} \
+   --stdout "${TJ_LOG}" --stderr "${TJ_LOG}" \
+   --make-pidfile --pidfile "${TJ_PIDFILE}" \
--exec /usr/bin/trojan  -- "${TJ_CONFIG}"
eend $?
 }
@@ -30,7 +34,7 @@ start() {
 stop() {
ebegin "Stopping Trojan"
start-stop-daemon --stop \
-   --user nobody --group nobody \
-   -p "${TJ_PIDFILE}"
+   --user ${TJ_USER} --group ${TJ_GROUP} \
+   --pidfile "${TJ_PIDFILE}"
eend $?
 }

[gentoo-commits] repo/gentoo:master commit in: net-proxy/trojan/files/, net-proxy/trojan/

2020-09-27 Thread Yixun Lan 
commit: ee7dfe493ec4984750352a7184967121d02d50c8
Author: Yixun Lan  gentoo  org>
AuthorDate: Sun Sep 27 08:55:02 2020 +
Commit: Yixun Lan  gentoo  org>
CommitDate: Sun Sep 27 09:12:18 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ee7dfe49

net-proxy/trojan: run as non-privilege user due to security concern

Package-Manager: Portage-3.0.0, Repoman-2.3.23
Signed-off-by: Yixun Lan  gentoo.org>

 net-proxy/trojan/files/trojan.initd| 5 -
 net-proxy/trojan/{trojan-1.16.0.ebuild => trojan-1.16.0-r1.ebuild} | 0
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/net-proxy/trojan/files/trojan.initd 
b/net-proxy/trojan/files/trojan.initd
index 2990245430d..c87f6576d6b 100644
--- a/net-proxy/trojan/files/trojan.initd
+++ b/net-proxy/trojan/files/trojan.initd
@@ -20,6 +20,7 @@ depend() {
 start() {
ebegin "Starting Trojan, Log File: ${TJ_LOG}"
start-stop-daemon --start -b \
+   --user nobody --group nobody \
-1 "${TJ_LOG}" -2 "${TJ_LOG}" \
-m -p "${TJ_PIDFILE}" \
--exec /usr/bin/trojan  -- "${TJ_CONFIG}"
@@ -28,6 +29,8 @@ start() {
 
 stop() {
ebegin "Stopping Trojan"
-   start-stop-daemon --stop -p "${TJ_PIDFILE}"
+   start-stop-daemon --stop \
+   --user nobody --group nobody \
+   -p "${TJ_PIDFILE}"
eend $?
 }

diff --git a/net-proxy/trojan/trojan-1.16.0.ebuild 
b/net-proxy/trojan/trojan-1.16.0-r1.ebuild
similarity index 100%
rename from net-proxy/trojan/trojan-1.16.0.ebuild
rename to net-proxy/trojan/trojan-1.16.0-r1.ebuild

[gentoo-commits] repo/gentoo:master commit in: net-proxy/trojan/

2020-09-27 Thread Yixun Lan 
commit: e6dfc0e9af89fb71fa1924190155256c9ad5ba55
Author: Yixun Lan  gentoo  org>
AuthorDate: Sun Sep 27 09:11:49 2020 +
Commit: Yixun Lan  gentoo  org>
CommitDate: Sun Sep 27 09:12:21 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e6dfc0e9

net-proxy/trojan: drop old

Package-Manager: Portage-3.0.0, Repoman-2.3.23
Signed-off-by: Yixun Lan  gentoo.org>

 net-proxy/trojan/Manifest |  1 -
 net-proxy/trojan/trojan-1.15.1.ebuild | 61 ---
 2 files changed, 62 deletions(-)

diff --git a/net-proxy/trojan/Manifest b/net-proxy/trojan/Manifest
index 493d1564747..0ccbae793da 100644
--- a/net-proxy/trojan/Manifest
+++ b/net-proxy/trojan/Manifest
@@ -1,2 +1 @@
-DIST trojan-1.15.1.tar.gz 48121 BLAKE2B 
38f288d8b9a6c7a98ada85b6b2dd2448604f54068334380c2e6b49d6ee015a1fad2847747734ef1e670d201d9625e64859ccddde5b924ea09c4e87e206997431
 SHA512 
5e0dfb46116b9de54f5d4e6d0646ab5ba3746143c5ad0f275c894929ba7fc840cacb187e514bbfaa770f0651fc4d3ff9e662f648f515a972ddf72ad0e93d616f
 DIST trojan-1.16.0.tar.gz 51669 BLAKE2B 
9238f9886820ca3625a894ac8de1e199e238029593634436f3aa529d5c576f2636d5183b64a2e6155a888fe8f45629c94625f02119fbfb4ada01b1bd9e502fcf
 SHA512 
60aa8539731eee6f15cbcb18b20b45435fc2dfe439a2f67fe9770257c3b6ffe219efe376cfd909f748d523a18645c96f6859b8487cacaba04ac7d93cf762f153

diff --git a/net-proxy/trojan/trojan-1.15.1.ebuild 
b/net-proxy/trojan/trojan-1.15.1.ebuild
deleted file mode 100644
index 21f494f1364..000
--- a/net-proxy/trojan/trojan-1.15.1.ebuild
+++ /dev/null
@@ -1,61 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python{3_6,3_7} )
-
-inherit cmake python-any-r1 systemd
-
-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"
-
-LICENSE="GPL-3+"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86"
-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 ""
-}

[gentoo-commits] repo/gentoo:master commit in: net-proxy/trojan/

2020-07-09 Thread Yixun Lan 
commit: 33e1f9a1d5d9f7377a2a386d96b252d9d0e71d32
Author: Yixun Lan  gentoo  org>
AuthorDate: Thu Jul  9 14:07:55 2020 +
Commit: Yixun Lan  gentoo  org>
CommitDate: Thu Jul  9 14:08:20 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=33e1f9a1

net-proxy/trojan: version bump, 1.16.0

Package-Manager: Portage-2.3.100, Repoman-2.3.22
Signed-off-by: Yixun Lan  gentoo.org>

 net-proxy/trojan/Manifest |  1 +
 net-proxy/trojan/trojan-1.16.0.ebuild | 61 +++
 2 files changed, 62 insertions(+)

diff --git a/net-proxy/trojan/Manifest b/net-proxy/trojan/Manifest
index 68ef8ddb402..493d1564747 100644
--- a/net-proxy/trojan/Manifest
+++ b/net-proxy/trojan/Manifest
@@ -1 +1,2 @@
 DIST trojan-1.15.1.tar.gz 48121 BLAKE2B 
38f288d8b9a6c7a98ada85b6b2dd2448604f54068334380c2e6b49d6ee015a1fad2847747734ef1e670d201d9625e64859ccddde5b924ea09c4e87e206997431
 SHA512 
5e0dfb46116b9de54f5d4e6d0646ab5ba3746143c5ad0f275c894929ba7fc840cacb187e514bbfaa770f0651fc4d3ff9e662f648f515a972ddf72ad0e93d616f
+DIST trojan-1.16.0.tar.gz 51669 BLAKE2B 
9238f9886820ca3625a894ac8de1e199e238029593634436f3aa529d5c576f2636d5183b64a2e6155a888fe8f45629c94625f02119fbfb4ada01b1bd9e502fcf
 SHA512 
60aa8539731eee6f15cbcb18b20b45435fc2dfe439a2f67fe9770257c3b6ffe219efe376cfd909f748d523a18645c96f6859b8487cacaba04ac7d93cf762f153

diff --git a/net-proxy/trojan/trojan-1.16.0.ebuild 
b/net-proxy/trojan/trojan-1.16.0.ebuild
new file mode 100644
index 000..21f494f1364
--- /dev/null
+++ b/net-proxy/trojan/trojan-1.16.0.ebuild
@@ -0,0 +1,61 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python{3_6,3_7} )
+
+inherit cmake python-any-r1 systemd
+
+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"
+
+LICENSE="GPL-3+"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+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 ""
+}

[gentoo-commits] repo/gentoo:master commit in: net-proxy/trojan/

2020-04-17 Thread Yixun Lan 
commit: 4cf1f47a810d944cc6060255083260bea2f67b4f
Author: Yixun Lan  gentoo  org>
AuthorDate: Fri Apr 17 14:04:12 2020 +
Commit: Yixun Lan  gentoo  org>
CommitDate: Fri Apr 17 14:04:49 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4cf1f47a

net-proxy/trojan: add live ebuild

also drop the old version

Package-Manager: Portage-2.3.89, Repoman-2.3.20
Signed-off-by: Yixun Lan  gentoo.org>

 net-proxy/trojan/Manifest | 1 -
 net-proxy/trojan/{trojan-1.14.1.ebuild => trojan-.ebuild} | 6 +++---
 2 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/net-proxy/trojan/Manifest b/net-proxy/trojan/Manifest
index 6b77b1c4fd0..68ef8ddb402 100644
--- a/net-proxy/trojan/Manifest
+++ b/net-proxy/trojan/Manifest
@@ -1,2 +1 @@
-DIST trojan-1.14.1.tar.gz 45884 BLAKE2B 
2498476f7e1a2190e21d85b2572fbc91a77b50f9f2adc2d3c3c5cef2554da17f322fbdb23232a55c66c38a4f680175f5c2aa87cefc25853b2007de4bb8bac84d
 SHA512 
c8fcdae584e742d958c896e3a18605f22073341a8227a1d7cb116e9f2ddadd6e5007bfe40ff765d564f8659cd9e9d11731d95a5c74459b0698cc48dac49ead19
 DIST trojan-1.15.1.tar.gz 48121 BLAKE2B 
38f288d8b9a6c7a98ada85b6b2dd2448604f54068334380c2e6b49d6ee015a1fad2847747734ef1e670d201d9625e64859ccddde5b924ea09c4e87e206997431
 SHA512 
5e0dfb46116b9de54f5d4e6d0646ab5ba3746143c5ad0f275c894929ba7fc840cacb187e514bbfaa770f0651fc4d3ff9e662f648f515a972ddf72ad0e93d616f

diff --git a/net-proxy/trojan/trojan-1.14.1.ebuild 
b/net-proxy/trojan/trojan-.ebuild
similarity index 88%
rename from net-proxy/trojan/trojan-1.14.1.ebuild
rename to net-proxy/trojan/trojan-.ebuild
index 21f494f1364..fd0888f198b 100644
--- a/net-proxy/trojan/trojan-1.14.1.ebuild
+++ b/net-proxy/trojan/trojan-.ebuild
@@ -4,16 +4,16 @@
 EAPI=7
 
 PYTHON_COMPAT=( python{3_6,3_7} )
+EGIT_REPO_URI="https://github.com/trojan-gfw/trojan.git";
 
-inherit cmake python-any-r1 systemd
+inherit cmake git-r3 python-any-r1 systemd
 
 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"
 
 LICENSE="GPL-3+"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+KEYWORDS=""
 IUSE="mysql test"
 
 # Some hiccups setting up local network server.

[gentoo-commits] repo/gentoo:master commit in: net-proxy/trojan/, net-proxy/trojan/files/

2020-04-07 Thread Yixun Lan 
commit: d72647710c1f67bffde1559a4463cf19b42ade69
Author: Yixun Lan  gentoo  org>
AuthorDate: Tue Apr  7 14:08:04 2020 +
Commit: Yixun Lan  gentoo  org>
CommitDate: Tue Apr  7 14:20:29 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d7264771

net-proxy/trojan: add multi instances support

enable running multi instances while using openrc.

Package-Manager: Portage-2.3.89, Repoman-2.3.20
Signed-off-by: Yixun Lan  gentoo.org>

 net-proxy/trojan/files/trojan.initd   | 15 +++
 net-proxy/trojan/trojan-1.14.1.ebuild | 14 ++
 net-proxy/trojan/trojan-1.15.1.ebuild | 14 ++
 3 files changed, 39 insertions(+), 4 deletions(-)

diff --git a/net-proxy/trojan/files/trojan.initd 
b/net-proxy/trojan/files/trojan.initd
index cee794ad4d7..2990245430d 100644
--- a/net-proxy/trojan/files/trojan.initd
+++ b/net-proxy/trojan/files/trojan.initd
@@ -1,10 +1,17 @@
 #!/sbin/openrc-run
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-TJ_CONFIG="/etc/trojan/config.json"
-TJ_PIDFILE="/run/trojan.pid"
-TJ_LOG="/var/log/trojan.log"
+TJ_NAME=${SVCNAME##*.}
+if [ -n "${TJ_NAME}" -a "${SVCNAME}" != "trojan" ]; then
+   TJ_PIDFILE="/run/trojan.${TJ_NAME}.pid"
+   TJ_CONFIG="/etc/trojan/${TJ_NAME}.json"
+   TJ_LOG="/var/log/trojan.${TJ_NAME}.log"
+else
+   TJ_PIDFILE="/run/trojan.pid"
+   TJ_CONFIG="/etc/trojan/config.json"
+   TJ_LOG="/var/log/trojan.log"
+fi
 
 depend() {
need net

diff --git a/net-proxy/trojan/trojan-1.14.1.ebuild 
b/net-proxy/trojan/trojan-1.14.1.ebuild
index aa4fa9f95be..21f494f1364 100644
--- a/net-proxy/trojan/trojan-1.14.1.ebuild
+++ b/net-proxy/trojan/trojan-1.14.1.ebuild
@@ -45,3 +45,17 @@ src_install() {
 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 ""
+}

diff --git a/net-proxy/trojan/trojan-1.15.1.ebuild 
b/net-proxy/trojan/trojan-1.15.1.ebuild
index aa4fa9f95be..21f494f1364 100644
--- a/net-proxy/trojan/trojan-1.15.1.ebuild
+++ b/net-proxy/trojan/trojan-1.15.1.ebuild
@@ -45,3 +45,17 @@ src_install() {
 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 ""
+}

[gentoo-commits] repo/gentoo:master commit in: net-proxy/trojan/

2020-04-07 Thread Yixun Lan 
commit: b53dae54c92fb82fe1328f0915235e7a4de33669
Author: Yixun Lan  gentoo  org>
AuthorDate: Tue Apr  7 13:39:08 2020 +
Commit: Yixun Lan  gentoo  org>
CommitDate: Tue Apr  7 13:43:20 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b53dae54

net-proxy/trojan: add myself as co-maintainer

Package-Manager: Portage-2.3.89, Repoman-2.3.20
Signed-off-by: Yixun Lan  gentoo.org>

 net-proxy/trojan/metadata.xml | 4 
 1 file changed, 4 insertions(+)

diff --git a/net-proxy/trojan/metadata.xml b/net-proxy/trojan/metadata.xml
index 9b97efd6cb4..097dc171860 100644
--- a/net-proxy/trojan/metadata.xml
+++ b/net-proxy/trojan/metadata.xml
@@ -5,6 +5,10 @@
yangm...@icloud.com
Xin Yang

+   
+   d...@gentoo.org
+   Yixun Lan
+   

proxy-ma...@gentoo.org
Proxy Maintainers

[gentoo-commits] repo/gentoo:master commit in: net-proxy/trojan/

2020-04-07 Thread Yixun Lan 
commit: 44515d959f120d8fe405a0f1f1ee5bf0cae62bab
Author: Yixun Lan  gentoo  org>
AuthorDate: Tue Apr  7 13:41:52 2020 +
Commit: Yixun Lan  gentoo  org>
CommitDate: Tue Apr  7 13:43:23 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=44515d95

net-proxy/trojan: drop old versions

Package-Manager: Portage-2.3.89, Repoman-2.3.20
Signed-off-by: Yixun Lan  gentoo.org>

 net-proxy/trojan/Manifest |  3 ---
 net-proxy/trojan/trojan-1.10.0.ebuild | 47 ---
 net-proxy/trojan/trojan-1.12.3.ebuild | 46 --
 net-proxy/trojan/trojan-1.13.0.ebuild | 47 ---
 4 files changed, 143 deletions(-)

diff --git a/net-proxy/trojan/Manifest b/net-proxy/trojan/Manifest
index 971a605d3db..6b77b1c4fd0 100644
--- a/net-proxy/trojan/Manifest
+++ b/net-proxy/trojan/Manifest
@@ -1,5 +1,2 @@
-DIST trojan-1.10.0.tar.gz 38230 BLAKE2B 
2cfa77ebfbae62edef983d1e57e3ce00a61118f6458cab353af60960e2586750fcd0c4237631481cfdfc8ed0ddad586e1d649046269c7e9177594869c187d8d1
 SHA512 
9d9a74218369f8094b292b8892e5f877ccec7d8912657491bb37da8e9ae4817f07a83fe401e33bbbdd2ac9c50c1440f3a021f93d85999b43df4849b0a04049cf
-DIST trojan-1.12.3.tar.gz 41786 BLAKE2B 
f6306210a46316906b919fefb245a7c379ddcf785513bfbc3b8fc6a9c78e1c8cf22069533f58086fb4ffad05b625ab2b2fcacf2256520833ea49c0f307cee296
 SHA512 
f59afa28446dfef8680d7530aaff3609566b2873416bb11f8981ef111f63ed8deeacb2093373012547ede02dfb9beb8d92655b8f9ebafd6012c45b3ce787c22f
-DIST trojan-1.13.0.tar.gz 44579 BLAKE2B 
87aba58687fa5f42385893b8d919a46428b7d3cdbd2da38ee3e96900c11a6a3df7778c2a54295d5abb1964991d2d30433c4b37e70a9ca4ba184005d338bbed74
 SHA512 
5904ff75d348e9ccdd451836b1b05df6736e22530643d67a192e393fe32623576e0bbc106c883b6bc32daa2a086d5a7e42f836d684b66fc0deca019b14e3b3ab
 DIST trojan-1.14.1.tar.gz 45884 BLAKE2B 
2498476f7e1a2190e21d85b2572fbc91a77b50f9f2adc2d3c3c5cef2554da17f322fbdb23232a55c66c38a4f680175f5c2aa87cefc25853b2007de4bb8bac84d
 SHA512 
c8fcdae584e742d958c896e3a18605f22073341a8227a1d7cb116e9f2ddadd6e5007bfe40ff765d564f8659cd9e9d11731d95a5c74459b0698cc48dac49ead19
 DIST trojan-1.15.1.tar.gz 48121 BLAKE2B 
38f288d8b9a6c7a98ada85b6b2dd2448604f54068334380c2e6b49d6ee015a1fad2847747734ef1e670d201d9625e64859ccddde5b924ea09c4e87e206997431
 SHA512 
5e0dfb46116b9de54f5d4e6d0646ab5ba3746143c5ad0f275c894929ba7fc840cacb187e514bbfaa770f0651fc4d3ff9e662f648f515a972ddf72ad0e93d616f

diff --git a/net-proxy/trojan/trojan-1.10.0.ebuild 
b/net-proxy/trojan/trojan-1.10.0.ebuild
deleted file mode 100644
index 9926cef05cc..000
--- a/net-proxy/trojan/trojan-1.10.0.ebuild
+++ /dev/null
@@ -1,47 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python{3_6,3_7} )
-
-inherit cmake-utils python-any-r1 systemd
-
-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"
-
-LICENSE="GPL-3+"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86"
-IUSE="mysql test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-   >=dev-libs/boost-1.54.0:=
-   >=dev-libs/openssl-1.0.2:=
-   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)
-   -DCMAKE_INSTALL_DOCDIR=share/doc/${PF}
-   )
-   cmake-utils_src_configure
-}
-
-src_install() {
-   cmake-utils_src_install
-   newinitd "${FILESDIR}/trojan.initd" trojan
-}
-
-src_test() {
-   cmake-utils_src_test -j1
-}

diff --git a/net-proxy/trojan/trojan-1.12.3.ebuild 
b/net-proxy/trojan/trojan-1.12.3.ebuild
deleted file mode 100644
index 5a088c7f298..000
--- a/net-proxy/trojan/trojan-1.12.3.ebuild
+++ /dev/null
@@ -1,46 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python{3_6,3_7} )
-
-inherit cmake python-any-r1 systemd
-
-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"
-
-LICENSE="GPL-3+"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86"
-IUSE="mysql test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-   >=dev-libs/boost-1.66.0:=
-   >=dev-libs/openssl-1.0.2:=
-   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_ge

[gentoo-commits] repo/gentoo:master commit in: net-proxy/trojan/

2020-04-01 Thread Joonas Niilola 
commit: 719edaad089608726ada45078dbc732e9ee4d03c
Author: YangMame  icloud  com>
AuthorDate: Tue Mar 31 01:10:33 2020 +
Commit: Joonas Niilola  gentoo  org>
CommitDate: Wed Apr  1 14:37:34 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=719edaad

net-proxy/trojan: version bump to 1.15.1

Signed-off-by: Xin Yang  icloud.com>
Closes: https://github.com/gentoo/gentoo/pull/15181
Signed-off-by: Joonas Niilola  gentoo.org>

 net-proxy/trojan/Manifest |  1 +
 net-proxy/trojan/trojan-1.15.1.ebuild | 47 +++
 2 files changed, 48 insertions(+)

diff --git a/net-proxy/trojan/Manifest b/net-proxy/trojan/Manifest
index 68ba07117b8..971a605d3db 100644
--- a/net-proxy/trojan/Manifest
+++ b/net-proxy/trojan/Manifest
@@ -2,3 +2,4 @@ DIST trojan-1.10.0.tar.gz 38230 BLAKE2B 
2cfa77ebfbae62edef983d1e57e3ce00a61118f6
 DIST trojan-1.12.3.tar.gz 41786 BLAKE2B 
f6306210a46316906b919fefb245a7c379ddcf785513bfbc3b8fc6a9c78e1c8cf22069533f58086fb4ffad05b625ab2b2fcacf2256520833ea49c0f307cee296
 SHA512 
f59afa28446dfef8680d7530aaff3609566b2873416bb11f8981ef111f63ed8deeacb2093373012547ede02dfb9beb8d92655b8f9ebafd6012c45b3ce787c22f
 DIST trojan-1.13.0.tar.gz 44579 BLAKE2B 
87aba58687fa5f42385893b8d919a46428b7d3cdbd2da38ee3e96900c11a6a3df7778c2a54295d5abb1964991d2d30433c4b37e70a9ca4ba184005d338bbed74
 SHA512 
5904ff75d348e9ccdd451836b1b05df6736e22530643d67a192e393fe32623576e0bbc106c883b6bc32daa2a086d5a7e42f836d684b66fc0deca019b14e3b3ab
 DIST trojan-1.14.1.tar.gz 45884 BLAKE2B 
2498476f7e1a2190e21d85b2572fbc91a77b50f9f2adc2d3c3c5cef2554da17f322fbdb23232a55c66c38a4f680175f5c2aa87cefc25853b2007de4bb8bac84d
 SHA512 
c8fcdae584e742d958c896e3a18605f22073341a8227a1d7cb116e9f2ddadd6e5007bfe40ff765d564f8659cd9e9d11731d95a5c74459b0698cc48dac49ead19
+DIST trojan-1.15.1.tar.gz 48121 BLAKE2B 
38f288d8b9a6c7a98ada85b6b2dd2448604f54068334380c2e6b49d6ee015a1fad2847747734ef1e670d201d9625e64859ccddde5b924ea09c4e87e206997431
 SHA512 
5e0dfb46116b9de54f5d4e6d0646ab5ba3746143c5ad0f275c894929ba7fc840cacb187e514bbfaa770f0651fc4d3ff9e662f648f515a972ddf72ad0e93d616f

diff --git a/net-proxy/trojan/trojan-1.15.1.ebuild 
b/net-proxy/trojan/trojan-1.15.1.ebuild
new file mode 100644
index 000..aa4fa9f95be
--- /dev/null
+++ b/net-proxy/trojan/trojan-1.15.1.ebuild
@@ -0,0 +1,47 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python{3_6,3_7} )
+
+inherit cmake python-any-r1 systemd
+
+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"
+
+LICENSE="GPL-3+"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+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
+}

[gentoo-commits] repo/gentoo:master commit in: net-proxy/trojan/

2020-02-08 Thread David Seifert 
commit: fd18631a68c79c6a5267bc90ff3ad8c5c979f1b4
Author: David Seifert  gentoo  org>
AuthorDate: Sat Feb  8 18:55:23 2020 +
Commit: David Seifert  gentoo  org>
CommitDate: Sat Feb  8 18:55:23 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=fd18631a

net-proxy/trojan: [QA] Fix VariableInHomepage

Signed-off-by: David Seifert  gentoo.org>

 net-proxy/trojan/trojan-1.10.0.ebuild | 2 +-
 net-proxy/trojan/trojan-1.12.3.ebuild | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/net-proxy/trojan/trojan-1.10.0.ebuild 
b/net-proxy/trojan/trojan-1.10.0.ebuild
index cca6f739ed1..9926cef05cc 100644
--- a/net-proxy/trojan/trojan-1.10.0.ebuild
+++ b/net-proxy/trojan/trojan-1.10.0.ebuild
@@ -8,7 +8,7 @@ PYTHON_COMPAT=( python{3_6,3_7} )
 inherit cmake-utils python-any-r1 systemd
 
 DESCRIPTION="An unidentifiable mechanism that helps you bypass GFW"
-HOMEPAGE="https://github.com/trojan-gfw/${PN}";
+HOMEPAGE="https://github.com/trojan-gfw/trojan";
 SRC_URI="https://github.com/trojan-gfw/${PN}/archive/v${PV}.tar.gz -> 
${P}.tar.gz"
 
 LICENSE="GPL-3+"

diff --git a/net-proxy/trojan/trojan-1.12.3.ebuild 
b/net-proxy/trojan/trojan-1.12.3.ebuild
index a380f99123e..5a088c7f298 100644
--- a/net-proxy/trojan/trojan-1.12.3.ebuild
+++ b/net-proxy/trojan/trojan-1.12.3.ebuild
@@ -8,7 +8,7 @@ PYTHON_COMPAT=( python{3_6,3_7} )
 inherit cmake python-any-r1 systemd
 
 DESCRIPTION="An unidentifiable mechanism that helps you bypass GFW"
-HOMEPAGE="https://github.com/trojan-gfw/${PN}";
+HOMEPAGE="https://github.com/trojan-gfw/trojan";
 SRC_URI="https://github.com/trojan-gfw/${PN}/archive/v${PV}.tar.gz -> 
${P}.tar.gz"
 
 LICENSE="GPL-3+"

[gentoo-commits] repo/gentoo:master commit in: net-proxy/trojan/

2020-02-02 Thread Joonas Niilola 
commit: 903817176be4857233d9131ea536704fa30252c3
Author: YangMame  icloud  com>
AuthorDate: Sat Feb  1 14:24:48 2020 +
Commit: Joonas Niilola  gentoo  org>
CommitDate: Mon Feb  3 06:37:52 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=90381717

net-proxy/trojan: version bump to 1.14.1

Signed-off-by: Xin Yang  icloud.com>
Closes: https://github.com/gentoo/gentoo/pull/14522
Signed-off-by: Joonas Niilola  gentoo.org>

 net-proxy/trojan/Manifest |  1 +
 net-proxy/trojan/trojan-1.14.1.ebuild | 47 +++
 2 files changed, 48 insertions(+)

diff --git a/net-proxy/trojan/Manifest b/net-proxy/trojan/Manifest
index 9aea0f4395a..68ba07117b8 100644
--- a/net-proxy/trojan/Manifest
+++ b/net-proxy/trojan/Manifest
@@ -1,3 +1,4 @@
 DIST trojan-1.10.0.tar.gz 38230 BLAKE2B 
2cfa77ebfbae62edef983d1e57e3ce00a61118f6458cab353af60960e2586750fcd0c4237631481cfdfc8ed0ddad586e1d649046269c7e9177594869c187d8d1
 SHA512 
9d9a74218369f8094b292b8892e5f877ccec7d8912657491bb37da8e9ae4817f07a83fe401e33bbbdd2ac9c50c1440f3a021f93d85999b43df4849b0a04049cf
 DIST trojan-1.12.3.tar.gz 41786 BLAKE2B 
f6306210a46316906b919fefb245a7c379ddcf785513bfbc3b8fc6a9c78e1c8cf22069533f58086fb4ffad05b625ab2b2fcacf2256520833ea49c0f307cee296
 SHA512 
f59afa28446dfef8680d7530aaff3609566b2873416bb11f8981ef111f63ed8deeacb2093373012547ede02dfb9beb8d92655b8f9ebafd6012c45b3ce787c22f
 DIST trojan-1.13.0.tar.gz 44579 BLAKE2B 
87aba58687fa5f42385893b8d919a46428b7d3cdbd2da38ee3e96900c11a6a3df7778c2a54295d5abb1964991d2d30433c4b37e70a9ca4ba184005d338bbed74
 SHA512 
5904ff75d348e9ccdd451836b1b05df6736e22530643d67a192e393fe32623576e0bbc106c883b6bc32daa2a086d5a7e42f836d684b66fc0deca019b14e3b3ab
+DIST trojan-1.14.1.tar.gz 45884 BLAKE2B 
2498476f7e1a2190e21d85b2572fbc91a77b50f9f2adc2d3c3c5cef2554da17f322fbdb23232a55c66c38a4f680175f5c2aa87cefc25853b2007de4bb8bac84d
 SHA512 
c8fcdae584e742d958c896e3a18605f22073341a8227a1d7cb116e9f2ddadd6e5007bfe40ff765d564f8659cd9e9d11731d95a5c74459b0698cc48dac49ead19

diff --git a/net-proxy/trojan/trojan-1.14.1.ebuild 
b/net-proxy/trojan/trojan-1.14.1.ebuild
new file mode 100644
index 000..aa4fa9f95be
--- /dev/null
+++ b/net-proxy/trojan/trojan-1.14.1.ebuild
@@ -0,0 +1,47 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python{3_6,3_7} )
+
+inherit cmake python-any-r1 systemd
+
+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"
+
+LICENSE="GPL-3+"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+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
+}

[gentoo-commits] repo/gentoo:master commit in: net-proxy/trojan/

2019-12-15 Thread Joonas Niilola 
commit: aa21fd0dd9ddd3366e7cca0587a7cb821a0193c1
Author: Joonas Niilola  gentoo  org>
AuthorDate: Sun Dec 15 08:19:56 2019 +
Commit: Joonas Niilola  gentoo  org>
CommitDate: Sun Dec 15 08:20:47 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=aa21fd0d

net-proxy/trojan: restrict tests on 1.13.0

Signed-off-by: Joonas Niilola  gentoo.org>

 net-proxy/trojan/trojan-1.13.0.ebuild | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/net-proxy/trojan/trojan-1.13.0.ebuild 
b/net-proxy/trojan/trojan-1.13.0.ebuild
index 02b78af0425..64ae3879792 100644
--- a/net-proxy/trojan/trojan-1.13.0.ebuild
+++ b/net-proxy/trojan/trojan-1.13.0.ebuild
@@ -15,7 +15,9 @@ LICENSE="GPL-3+"
 SLOT="0"
 KEYWORDS="~amd64 ~arm ~arm64 ~x86"
 IUSE="mysql test"
-RESTRICT="!test? ( test )"
+
+# Some hiccups setting up local network server.
+RESTRICT="test"
 
 RDEPEND="
>=dev-libs/boost-1.66.0:=

[gentoo-commits] repo/gentoo:master commit in: net-proxy/trojan/

2019-12-15 Thread Joonas Niilola 
commit: 2529f7ca531918b7d215a9975fcd17c23b637f77
Author: YangMame  icloud  com>
AuthorDate: Sun Oct  6 01:49:52 2019 +
Commit: Joonas Niilola  gentoo  org>
CommitDate: Sun Dec 15 08:20:47 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2529f7ca

net-proxy/trojan: version bump to 1.13.0

Signed-off-by: Xin Yang  icloud.com>
Closes: https://github.com/gentoo/gentoo/pull/13182
Signed-off-by: Joonas Niilola  gentoo.org>

 net-proxy/trojan/Manifest |  1 +
 net-proxy/trojan/trojan-1.13.0.ebuild | 46 +++
 2 files changed, 47 insertions(+)

diff --git a/net-proxy/trojan/Manifest b/net-proxy/trojan/Manifest
index 8ff2ff0fa3b..9aea0f4395a 100644
--- a/net-proxy/trojan/Manifest
+++ b/net-proxy/trojan/Manifest
@@ -1,2 +1,3 @@
 DIST trojan-1.10.0.tar.gz 38230 BLAKE2B 
2cfa77ebfbae62edef983d1e57e3ce00a61118f6458cab353af60960e2586750fcd0c4237631481cfdfc8ed0ddad586e1d649046269c7e9177594869c187d8d1
 SHA512 
9d9a74218369f8094b292b8892e5f877ccec7d8912657491bb37da8e9ae4817f07a83fe401e33bbbdd2ac9c50c1440f3a021f93d85999b43df4849b0a04049cf
 DIST trojan-1.12.3.tar.gz 41786 BLAKE2B 
f6306210a46316906b919fefb245a7c379ddcf785513bfbc3b8fc6a9c78e1c8cf22069533f58086fb4ffad05b625ab2b2fcacf2256520833ea49c0f307cee296
 SHA512 
f59afa28446dfef8680d7530aaff3609566b2873416bb11f8981ef111f63ed8deeacb2093373012547ede02dfb9beb8d92655b8f9ebafd6012c45b3ce787c22f
+DIST trojan-1.13.0.tar.gz 44579 BLAKE2B 
87aba58687fa5f42385893b8d919a46428b7d3cdbd2da38ee3e96900c11a6a3df7778c2a54295d5abb1964991d2d30433c4b37e70a9ca4ba184005d338bbed74
 SHA512 
5904ff75d348e9ccdd451836b1b05df6736e22530643d67a192e393fe32623576e0bbc106c883b6bc32daa2a086d5a7e42f836d684b66fc0deca019b14e3b3ab

diff --git a/net-proxy/trojan/trojan-1.13.0.ebuild 
b/net-proxy/trojan/trojan-1.13.0.ebuild
new file mode 100644
index 000..02b78af0425
--- /dev/null
+++ b/net-proxy/trojan/trojan-1.13.0.ebuild
@@ -0,0 +1,46 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python{3_5,3_6,3_7} )
+
+inherit cmake-utils python-any-r1 systemd
+
+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"
+
+LICENSE="GPL-3+"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+IUSE="mysql test"
+RESTRICT="!test? ( 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)
+   -DCMAKE_INSTALL_DOCDIR=share/doc/${PF}
+   )
+   cmake-utils_src_configure
+}
+
+src_install() {
+   cmake-utils_src_install
+   newinitd "${FILESDIR}/trojan.initd" trojan
+}
+
+src_test() {
+   cmake-utils_src_test -j1
+}

[gentoo-commits] repo/gentoo:master commit in: net-proxy/trojan/

2019-07-21 Thread Michał Górny 
commit: 86c19577416d93e32b571e6b63bb3b84317491a4
Author: YangMame  yangmame  org>
AuthorDate: Mon Jul 22 01:59:38 2019 +
Commit: Michał Górny  gentoo  org>
CommitDate: Mon Jul 22 03:26:38 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=86c19577

net-proxy/trojan: drop version 1.12.2

Signed-off-by: Xin Yang  icloud.com>
Closes: https://github.com/gentoo/gentoo/pull/12448
Signed-off-by: Michał Górny  gentoo.org>

 net-proxy/trojan/Manifest |  1 -
 net-proxy/trojan/trojan-1.12.2.ebuild | 47 ---
 2 files changed, 48 deletions(-)

diff --git a/net-proxy/trojan/Manifest b/net-proxy/trojan/Manifest
index 94a4620a90e..8ff2ff0fa3b 100644
--- a/net-proxy/trojan/Manifest
+++ b/net-proxy/trojan/Manifest
@@ -1,3 +1,2 @@
 DIST trojan-1.10.0.tar.gz 38230 BLAKE2B 
2cfa77ebfbae62edef983d1e57e3ce00a61118f6458cab353af60960e2586750fcd0c4237631481cfdfc8ed0ddad586e1d649046269c7e9177594869c187d8d1
 SHA512 
9d9a74218369f8094b292b8892e5f877ccec7d8912657491bb37da8e9ae4817f07a83fe401e33bbbdd2ac9c50c1440f3a021f93d85999b43df4849b0a04049cf
-DIST trojan-1.12.2.tar.gz 41742 BLAKE2B 
7090c426c66877ed31a61b8b678d5169094af4687b37622cacac758ce907154f579b5a5455d850ed1ca5fb70e8793a13c3c4aa20015cca70d78d0ce51c747e2c
 SHA512 
1cf0eb7cf740f6212140886e481adb00883f7132ba21d346812a2c23fca35222b93251b3cdaba6b6dad66b15f743d8627a5d42e28f32aaef5cab682ea37b5983
 DIST trojan-1.12.3.tar.gz 41786 BLAKE2B 
f6306210a46316906b919fefb245a7c379ddcf785513bfbc3b8fc6a9c78e1c8cf22069533f58086fb4ffad05b625ab2b2fcacf2256520833ea49c0f307cee296
 SHA512 
f59afa28446dfef8680d7530aaff3609566b2873416bb11f8981ef111f63ed8deeacb2093373012547ede02dfb9beb8d92655b8f9ebafd6012c45b3ce787c22f

diff --git a/net-proxy/trojan/trojan-1.12.2.ebuild 
b/net-proxy/trojan/trojan-1.12.2.ebuild
deleted file mode 100644
index e394deff72a..000
--- a/net-proxy/trojan/trojan-1.12.2.ebuild
+++ /dev/null
@@ -1,47 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python{3_5,3_6,3_7} )
-
-inherit cmake-utils python-any-r1 systemd
-
-DESCRIPTION="An unidentifiable mechanism that helps you bypass GFW"
-HOMEPAGE="https://github.com/trojan-gfw/${PN}";
-SRC_URI="https://github.com/trojan-gfw/${PN}/archive/v${PV}.tar.gz -> 
${P}.tar.gz"
-
-LICENSE="GPL-3+"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86"
-IUSE="mysql test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-   >=dev-libs/boost-1.66.0:=
-   >=dev-libs/openssl-1.0.2:=
-   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)
-   -DCMAKE_INSTALL_DOCDIR=share/doc/${PF}
-   )
-   cmake-utils_src_configure
-}
-
-src_install() {
-   cmake-utils_src_install
-   newinitd "${FILESDIR}/trojan.initd" trojan
-}
-
-src_test() {
-   cmake-utils_src_test -j1
-}

[gentoo-commits] repo/gentoo:master commit in: net-proxy/trojan/

2019-07-21 Thread Michał Górny 
commit: 278aaf70a77abe9d1f62b1720e93fdd41c21524f
Author: YangMame  yangmame  org>
AuthorDate: Mon Jul 22 01:57:42 2019 +
Commit: Michał Górny  gentoo  org>
CommitDate: Mon Jul 22 03:26:37 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=278aaf70

net-proxy/trojan: version bump to 1.12.3

Signed-off-by: Xin Yang  icloud.com>
Signed-off-by: Michał Górny  gentoo.org>

 net-proxy/trojan/Manifest |  1 +
 net-proxy/trojan/trojan-1.12.3.ebuild | 47 +++
 2 files changed, 48 insertions(+)

diff --git a/net-proxy/trojan/Manifest b/net-proxy/trojan/Manifest
index d1d3c306277..94a4620a90e 100644
--- a/net-proxy/trojan/Manifest
+++ b/net-proxy/trojan/Manifest
@@ -1,2 +1,3 @@
 DIST trojan-1.10.0.tar.gz 38230 BLAKE2B 
2cfa77ebfbae62edef983d1e57e3ce00a61118f6458cab353af60960e2586750fcd0c4237631481cfdfc8ed0ddad586e1d649046269c7e9177594869c187d8d1
 SHA512 
9d9a74218369f8094b292b8892e5f877ccec7d8912657491bb37da8e9ae4817f07a83fe401e33bbbdd2ac9c50c1440f3a021f93d85999b43df4849b0a04049cf
 DIST trojan-1.12.2.tar.gz 41742 BLAKE2B 
7090c426c66877ed31a61b8b678d5169094af4687b37622cacac758ce907154f579b5a5455d850ed1ca5fb70e8793a13c3c4aa20015cca70d78d0ce51c747e2c
 SHA512 
1cf0eb7cf740f6212140886e481adb00883f7132ba21d346812a2c23fca35222b93251b3cdaba6b6dad66b15f743d8627a5d42e28f32aaef5cab682ea37b5983
+DIST trojan-1.12.3.tar.gz 41786 BLAKE2B 
f6306210a46316906b919fefb245a7c379ddcf785513bfbc3b8fc6a9c78e1c8cf22069533f58086fb4ffad05b625ab2b2fcacf2256520833ea49c0f307cee296
 SHA512 
f59afa28446dfef8680d7530aaff3609566b2873416bb11f8981ef111f63ed8deeacb2093373012547ede02dfb9beb8d92655b8f9ebafd6012c45b3ce787c22f

diff --git a/net-proxy/trojan/trojan-1.12.3.ebuild 
b/net-proxy/trojan/trojan-1.12.3.ebuild
new file mode 100644
index 000..e394deff72a
--- /dev/null
+++ b/net-proxy/trojan/trojan-1.12.3.ebuild
@@ -0,0 +1,47 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python{3_5,3_6,3_7} )
+
+inherit cmake-utils python-any-r1 systemd
+
+DESCRIPTION="An unidentifiable mechanism that helps you bypass GFW"
+HOMEPAGE="https://github.com/trojan-gfw/${PN}";
+SRC_URI="https://github.com/trojan-gfw/${PN}/archive/v${PV}.tar.gz -> 
${P}.tar.gz"
+
+LICENSE="GPL-3+"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+IUSE="mysql test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+   >=dev-libs/boost-1.66.0:=
+   >=dev-libs/openssl-1.0.2:=
+   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)
+   -DCMAKE_INSTALL_DOCDIR=share/doc/${PF}
+   )
+   cmake-utils_src_configure
+}
+
+src_install() {
+   cmake-utils_src_install
+   newinitd "${FILESDIR}/trojan.initd" trojan
+}
+
+src_test() {
+   cmake-utils_src_test -j1
+}

[gentoo-commits] repo/gentoo:master commit in: net-proxy/trojan/

2019-01-19 Thread Patrice Clement 
commit: 6827f2a4c03ff3d3ee6f888631d53cbf370462ec
Author: YangMame  yangmame  org>
AuthorDate: Tue Jan 15 02:18:05 2019 +
Commit: Patrice Clement  gentoo  org>
CommitDate: Sat Jan 19 12:10:02 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6827f2a4

net-proxy/trojan: version bump to 1.10.0, drop old.

Signed-off-by: Xin Yang  icloud.com>
Closes: https://github.com/gentoo/gentoo/pull/10835
Signed-off-by: Patrice Clement  gentoo.org>

 net-proxy/trojan/Manifest  |  3 +-
 .../{trojan-1.8.1.ebuild => trojan-1.10.0.ebuild}  |  3 +-
 net-proxy/trojan/trojan-1.9.0.ebuild   | 46 --
 3 files changed, 3 insertions(+), 49 deletions(-)

diff --git a/net-proxy/trojan/Manifest b/net-proxy/trojan/Manifest
index a19c9e2df55..a98743f222c 100644
--- a/net-proxy/trojan/Manifest
+++ b/net-proxy/trojan/Manifest
@@ -1,2 +1 @@
-DIST trojan-1.8.1.tar.gz 37199 BLAKE2B 
be93a119ca95e5f4151db6ab58ffaa123d5bd304247d7835ca34ba870808d7e246d551c204d60ffb2a982f2fcb2c35ada1d9823e7f931b36377f99ebd0f48bd6
 SHA512 
1e2b8e2ddb02b2009181a980781574e6e6375c98475bda4096b70a9c00e61c5ca445f28730e195a5179b85bf5464a6dcb1bcb6ba8dc841d95c9a111f8f87c511
-DIST trojan-1.9.0.tar.gz 37704 BLAKE2B 
5ddfab3408c0f665e0c43e1f23d4d5df6cd38f3525b524b6689e5b25603f928f718bcba7bbd077b7db1c241aea629d01c8dbefc1d35c3dc3d29757c04885
 SHA512 
3d671d1944bf79879bde8ba74d9c3270e475ff1c5d35ff1ef367391fdce223bd24e4c1072ae8506002e5ee10944bfbe10cfb434e8908c9670535c38b275293fa
+DIST trojan-1.10.0.tar.gz 38230 BLAKE2B 
2cfa77ebfbae62edef983d1e57e3ce00a61118f6458cab353af60960e2586750fcd0c4237631481cfdfc8ed0ddad586e1d649046269c7e9177594869c187d8d1
 SHA512 
9d9a74218369f8094b292b8892e5f877ccec7d8912657491bb37da8e9ae4817f07a83fe401e33bbbdd2ac9c50c1440f3a021f93d85999b43df4849b0a04049cf

diff --git a/net-proxy/trojan/trojan-1.8.1.ebuild 
b/net-proxy/trojan/trojan-1.10.0.ebuild
similarity index 90%
rename from net-proxy/trojan/trojan-1.8.1.ebuild
rename to net-proxy/trojan/trojan-1.10.0.ebuild
index b6c8edf97d8..fb823826e18 100644
--- a/net-proxy/trojan/trojan-1.8.1.ebuild
+++ b/net-proxy/trojan/trojan-1.10.0.ebuild
@@ -5,7 +5,7 @@ EAPI=6
 
 PYTHON_COMPAT=( python{3_4,3_5,3_6,3_7} )
 
-inherit cmake-utils python-any-r1
+inherit cmake-utils python-any-r1 systemd
 
 DESCRIPTION="An unidentifiable mechanism that helps you bypass GFW"
 HOMEPAGE="https://github.com/trojan-gfw/${PN}";
@@ -31,6 +31,7 @@ src_configure() {
local mycmakeargs=(
-DENABLE_MYSQL=$(usex mysql)
-DSYSTEMD_SERVICE=ON
+   -DSYSTEMD_SERVICE_PATH=$(systemd_get_systemunitdir)
-DCMAKE_INSTALL_DOCDIR=share/doc/${PF}
)
cmake-utils_src_configure

diff --git a/net-proxy/trojan/trojan-1.9.0.ebuild 
b/net-proxy/trojan/trojan-1.9.0.ebuild
deleted file mode 100644
index b6c8edf97d8..000
--- a/net-proxy/trojan/trojan-1.9.0.ebuild
+++ /dev/null
@@ -1,46 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python{3_4,3_5,3_6,3_7} )
-
-inherit cmake-utils python-any-r1
-
-DESCRIPTION="An unidentifiable mechanism that helps you bypass GFW"
-HOMEPAGE="https://github.com/trojan-gfw/${PN}";
-SRC_URI="https://github.com/trojan-gfw/${PN}/archive/v${PV}.tar.gz -> 
${P}.tar.gz"
-
-LICENSE="GPL-3+"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86"
-IUSE="mysql test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-   >=dev-libs/boost-1.54.0:=
-   >=dev-libs/openssl-1.0.2:=
-   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
-   -DCMAKE_INSTALL_DOCDIR=share/doc/${PF}
-   )
-   cmake-utils_src_configure
-}
-
-src_install() {
-   cmake-utils_src_install
-   newinitd "${FILESDIR}/trojan.initd" trojan
-}
-
-src_test() {
-   cmake-utils_src_test -j1
-}

[gentoo-commits] repo/gentoo:master commit in: net-proxy/trojan/

2018-10-21 Thread Michał Górny 
commit: ead6a7f8ebc9e6ccd003575200421e97c91a85f7
Author: YangMame  icloud  com>
AuthorDate: Sun Oct 21 02:01:27 2018 +
Commit: Michał Górny  gentoo  org>
CommitDate: Sun Oct 21 18:07:24 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ead6a7f8

net-proxy/trojan: version bump to 1.9.0

Signed-off-by: Xin Yang  icloud.com>
Closes: https://github.com/gentoo/gentoo/pull/10181
Signed-off-by: Michał Górny  gentoo.org>

 net-proxy/trojan/Manifest|  1 +
 net-proxy/trojan/trojan-1.9.0.ebuild | 46 
 2 files changed, 47 insertions(+)

diff --git a/net-proxy/trojan/Manifest b/net-proxy/trojan/Manifest
index 958dea17ea5..a19c9e2df55 100644
--- a/net-proxy/trojan/Manifest
+++ b/net-proxy/trojan/Manifest
@@ -1 +1,2 @@
 DIST trojan-1.8.1.tar.gz 37199 BLAKE2B 
be93a119ca95e5f4151db6ab58ffaa123d5bd304247d7835ca34ba870808d7e246d551c204d60ffb2a982f2fcb2c35ada1d9823e7f931b36377f99ebd0f48bd6
 SHA512 
1e2b8e2ddb02b2009181a980781574e6e6375c98475bda4096b70a9c00e61c5ca445f28730e195a5179b85bf5464a6dcb1bcb6ba8dc841d95c9a111f8f87c511
+DIST trojan-1.9.0.tar.gz 37704 BLAKE2B 
5ddfab3408c0f665e0c43e1f23d4d5df6cd38f3525b524b6689e5b25603f928f718bcba7bbd077b7db1c241aea629d01c8dbefc1d35c3dc3d29757c04885
 SHA512 
3d671d1944bf79879bde8ba74d9c3270e475ff1c5d35ff1ef367391fdce223bd24e4c1072ae8506002e5ee10944bfbe10cfb434e8908c9670535c38b275293fa

diff --git a/net-proxy/trojan/trojan-1.9.0.ebuild 
b/net-proxy/trojan/trojan-1.9.0.ebuild
new file mode 100644
index 000..b6c8edf97d8
--- /dev/null
+++ b/net-proxy/trojan/trojan-1.9.0.ebuild
@@ -0,0 +1,46 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python{3_4,3_5,3_6,3_7} )
+
+inherit cmake-utils python-any-r1
+
+DESCRIPTION="An unidentifiable mechanism that helps you bypass GFW"
+HOMEPAGE="https://github.com/trojan-gfw/${PN}";
+SRC_URI="https://github.com/trojan-gfw/${PN}/archive/v${PV}.tar.gz -> 
${P}.tar.gz"
+
+LICENSE="GPL-3+"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+IUSE="mysql test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+   >=dev-libs/boost-1.54.0:=
+   >=dev-libs/openssl-1.0.2:=
+   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
+   -DCMAKE_INSTALL_DOCDIR=share/doc/${PF}
+   )
+   cmake-utils_src_configure
+}
+
+src_install() {
+   cmake-utils_src_install
+   newinitd "${FILESDIR}/trojan.initd" trojan
+}
+
+src_test() {
+   cmake-utils_src_test -j1
+}

[gentoo-commits] repo/gentoo:master commit in: net-proxy/trojan/files/, net-proxy/trojan/

2018-10-11 Thread Michał Górny 
commit: 31847f8923c26e1df0410c8842834c63b543048e
Author: YangMame  icloud  com>
AuthorDate: Sun Oct  7 23:37:52 2018 +
Commit: Michał Górny  gentoo  org>
CommitDate: Thu Oct 11 08:13:58 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=31847f89

net-proxy/trojan: new package

Signed-off-by: Xin Yang  icloud.com>
Signed-off-by: Michał Górny  gentoo.org>
Closes: https://github.com/gentoo/gentoo/pull/9776

 net-proxy/trojan/Manifest|  1 +
 net-proxy/trojan/files/trojan.initd  | 26 
 net-proxy/trojan/metadata.xml| 28 ++
 net-proxy/trojan/trojan-1.8.1.ebuild | 46 
 4 files changed, 101 insertions(+)

diff --git a/net-proxy/trojan/Manifest b/net-proxy/trojan/Manifest
new file mode 100644
index 000..958dea17ea5
--- /dev/null
+++ b/net-proxy/trojan/Manifest
@@ -0,0 +1 @@
+DIST trojan-1.8.1.tar.gz 37199 BLAKE2B 
be93a119ca95e5f4151db6ab58ffaa123d5bd304247d7835ca34ba870808d7e246d551c204d60ffb2a982f2fcb2c35ada1d9823e7f931b36377f99ebd0f48bd6
 SHA512 
1e2b8e2ddb02b2009181a980781574e6e6375c98475bda4096b70a9c00e61c5ca445f28730e195a5179b85bf5464a6dcb1bcb6ba8dc841d95c9a111f8f87c511

diff --git a/net-proxy/trojan/files/trojan.initd 
b/net-proxy/trojan/files/trojan.initd
new file mode 100755
index 000..f525eefe74d
--- /dev/null
+++ b/net-proxy/trojan/files/trojan.initd
@@ -0,0 +1,26 @@
+#!/sbin/openrc-run
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+TJ_CONFIG="/etc/trojan/config.json"
+TJ_PIDFILE="/run/trojan.pid"
+TJ_LOG="/var/log/trojan.log"
+
+depend() {
+   need net
+}
+
+start() {
+   ebegin "Starting Trojan, Log File: ${TJ_LOG}"
+   start-stop-daemon --start -b \
+   -1 "${TJ_LOG}" -2 "${TJ_LOG}" \
+   -m -p "${TJ_PIDFILE}" \
+   --exec /usr/bin/trojan  -- "${TJ_CONFIG}"
+   eend $?
+}
+
+stop() {
+   ebegin "Stopping Trojan"
+   start-stop-daemon --stop -p "${TJ_PIDFILE}"
+   eend $?
+}

diff --git a/net-proxy/trojan/metadata.xml b/net-proxy/trojan/metadata.xml
new file mode 100644
index 000..9b97efd6cb4
--- /dev/null
+++ b/net-proxy/trojan/metadata.xml
@@ -0,0 +1,28 @@
+
+http://www.gentoo.org/dtd/metadata.dtd";>
+
+   
+   yangm...@icloud.com
+   Xin Yang
+   
+   
+   proxy-ma...@gentoo.org
+   Proxy Maintainers
+   
+   
+   An unidentifiable mechanism that helps you bypass GFW.
+   Trojan features multiple protocols over TLS to avoid both
+   active/passive detections and ISP QoS limitations.
+   Trojan is not a fixed program or protocol. It's an idea,
+   an idea that imitating the most common service, to an extent
+   that it behaves identically, could help you get across the
+   Great FireWall permanently, without being identified ever.
+   We are the GreatER Fire; we ship Trojan Horses.
+   
+   
+   build with MySQL support
+   
+   
+   trojan-gfw/trojan
+   
+

diff --git a/net-proxy/trojan/trojan-1.8.1.ebuild 
b/net-proxy/trojan/trojan-1.8.1.ebuild
new file mode 100644
index 000..b6c8edf97d8
--- /dev/null
+++ b/net-proxy/trojan/trojan-1.8.1.ebuild
@@ -0,0 +1,46 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python{3_4,3_5,3_6,3_7} )
+
+inherit cmake-utils python-any-r1
+
+DESCRIPTION="An unidentifiable mechanism that helps you bypass GFW"
+HOMEPAGE="https://github.com/trojan-gfw/${PN}";
+SRC_URI="https://github.com/trojan-gfw/${PN}/archive/v${PV}.tar.gz -> 
${P}.tar.gz"
+
+LICENSE="GPL-3+"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+IUSE="mysql test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+   >=dev-libs/boost-1.54.0:=
+   >=dev-libs/openssl-1.0.2:=
+   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
+   -DCMAKE_INSTALL_DOCDIR=share/doc/${PF}
+   )
+   cmake-utils_src_configure
+}
+
+src_install() {
+   cmake-utils_src_install
+   newinitd "${FILESDIR}/trojan.initd" trojan
+}
+
+src_test() {
+   cmake-utils_src_test -j1
+}