gentoo resync : 10.02.2020

7 files changed, 98 insertions, 4 deletions

diff --git a/net-proxy/Manifest.gz b/net-proxy/Manifest.gz
index 079a89fa1480..4681f23abcd9 100644
--- a/net-proxy/Manifest.gz
+++ b/net-proxy/Manifest.gz
diff --git a/net-proxy/redsocks/Manifest b/net-proxy/redsocks/Manifest
index 02f0c6442aac..c3b182c37d09 100644
--- a/net-proxy/redsocks/Manifest
+++ b/net-proxy/redsocks/Manifest
@@ -1,7 +1,9 @@
 AUX redsocks.conf 350 BLAKE2B 52bf1cb52f94d7eb2ab151905fb8b66644868c9cfb72b1d73951b0442bb300062f5c7b7776f80d1c74733a3980f73aecbc75b1b7364c5dc0bccc9d324b5504d5 SHA512 c6ce0622a54fafef31f40ed01b210c5ffb9af0504303fc5d2a4fb335ac3617fc7832c16b0885471e6f1eea168a0e4aa490089a00fd28e26ce0f9b59db0ac238b
 AUX redsocks.init 1282 BLAKE2B 1efeb84d25630df8501b53d36f056a62733ab2f1c40a591d1c2b321224e3ed526fae1a0cbb4502c233c66b2c7c0541c0893311b749fb486176b978d79b10097b SHA512 81af76d7917273028cda3fa62e2c04ae27f763d93c6abac12c9b47877ae64918b4b07ed680fefb0e11ac3476c3f490f5e6d315ba8b0cf9a40b756cd32fc5234c
+AUX redsocks.init-r1 926 BLAKE2B b167e64335e45806c2791e72667f984f7b9ffb23d2be6c38bc4575d8487320eeb8ae270c0940fc4c198d7064323f3ba561c6954657fb4015a62f30d00ae06274 SHA512 c8c52571fd167d9ca6bb75e5b44741e87f5c57b6752b16026691a71a932cfa55ed43d186cd9d662997020faf370ce3e797ccc555e641149d5f5f8e43bb94901c
 AUX redsocks.service 437 BLAKE2B 919055f6cd25a605b3cff1ad63e69579975868952ef362ddf6f025404a0109e159af51854ef3d24663322f1515508b2dfe89b00bc53070a63d515b3bcd0858a8 SHA512 73d2b6df7d1688b2605ec56f1843de1b58a5e3d8e88267cd99aa774303f8184ff5c7756b4fdd7215e3ccba8637eb8e41dac121fbe0339730fa1e51943957ce27
 DIST redsocks-0.5.tar.gz 496403 BLAKE2B 7416340a7142669c72a8aeebc2c0775a393781de7fcbb63e4fbc71ce828658bc2b0615b394a990683c9fd13f41f050c92609dd956b4468bb06ec1ff261324c23 SHA512 678faca95b3570f793754abfe752b3d3580ea125aac8615ca2a1fce92cd50e7919832afe7cf5d1cc40b700045fca08f86ea1697d062ac8e7be706d166e69ff70
+EBUILD redsocks-0.5-r1.ebuild 1130 BLAKE2B 4f67d7a965df21a88953fb1150b702fffe6ec31c3512bd967a7cdac4abe063fc8242ba6df9a14eda38c7e8dcae11589c0a5ac2b9411b60f261782a5007a8501a SHA512 49a61fb4abf69bcf23fb34d95143052430d19a4a65dc469aafcd3354a5de7428fc07b9878b22acc89ce67d4d582cf19828ce6475995c077cfb2af71f1902a179
 EBUILD redsocks-0.5.ebuild 1130 BLAKE2B 3fb70113213f328699d3a3649d4453c74e252ef7c20bc377587b0b21ae099df730aa8e922d265ca71368bf4ad6b89ebd0080128d58da9167895da32b886c0619 SHA512 c832d72a0858e49c70807c825518c5d4bd68a689234f2087ad37aca39f26130498d2753b059651f39f7897be4cb41a589e8ee4e0a66c1c1df318a975e2ec7bc7
 EBUILD redsocks-9999.ebuild 1130 BLAKE2B 3fb70113213f328699d3a3649d4453c74e252ef7c20bc377587b0b21ae099df730aa8e922d265ca71368bf4ad6b89ebd0080128d58da9167895da32b886c0619 SHA512 c832d72a0858e49c70807c825518c5d4bd68a689234f2087ad37aca39f26130498d2753b059651f39f7897be4cb41a589e8ee4e0a66c1c1df318a975e2ec7bc7
 MISC metadata.xml 1060 BLAKE2B b7db194e1155a93ff22b6ca713a442ae08f21ae27f9835e0f3ec09ccf86d4f33fa2d4da20251c58acdbeeeaa6bef3fe95de7e22f67eae2acf28406f53e494569 SHA512 5b48446a0edf223af4775df8ebf02b71112cbda5494853e97c0dfaa7aaeecc2529af8c340ab36507c96eaaade07e6ac73bcf51d23acc4a5ddaaf69bbe093a321
diff --git a/net-proxy/redsocks/files/redsocks.init-r1 b/net-proxy/redsocks/files/redsocks.init-r1
new file mode 100644
index 000000000000..861054fc914a
--- /dev/null
+++ b/net-proxy/redsocks/files/redsocks.init-r1
@@ -0,0 +1,43 @@
+#!/sbin/openrc-run
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+command=${REDSOCKS_BINARY:=/usr/sbin/redsocks}
+: ${REDSOCKS_CONFIG:=/etc/redsocks.conf}
+pidfile=${REDSOCKS_PIDFILE:=/run/redsocks/redsocks.pid}
+command_args="-p ${pidfile} -c ${REDSOCKS_CONFIG}"
+
+extra_commands="checkconfig"
+extra_started_commands="reload"
+
+depend() {
+	need localmount
+	use dns
+}
+
+checkconfig() {
+	if [ ! -f "${REDSOCKS_CONFIG}" ] ; then
+		eerror "No ${REDSOCKS_CONFIG} file exists!"
+		return 1
+	fi
+
+        "${command}" -t -c ${REDSOCKS_CONFIG} || return 1
+}
+
+start_pre() {
+        checkconfig || return 1
+}
+
+stop_pre() {
+        if [ "${RC_CMD}" = "restart" ] ; then
+                checkconfig || return 1
+        fi
+}
+
+reload() {
+        checkconfig || return 1
+
+        ebegin "Reloading ${SVCNAME}"
+        start-stop-daemon --signal HUP --pidfile "${pidfile}"
+        eend $?
+}
diff --git a/net-proxy/redsocks/redsocks-0.5-r1.ebuild b/net-proxy/redsocks/redsocks-0.5-r1.ebuild
new file mode 100644
index 000000000000..665f5a700021
--- /dev/null
+++ b/net-proxy/redsocks/redsocks-0.5-r1.ebuild
@@ -0,0 +1,49 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+if [[ ${PV} != *9999* ]]; then
+	SRC_URI="https://github.com/darkk/${PN}/archive/release-${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64 ~x86"
+else
+	GIT_ECLASS="git-r3"
+	EGIT_REPO_URI="https://github.com/darkk/${PN}.git"
+fi
+
+inherit systemd toolchain-funcs user ${GIT_ECLASS}
+
+DESCRIPTION="Transparent redirector of any TCP connection to proxy"
+HOMEPAGE="http://darkk.net.ru/redsocks/"
+LICENSE="Apache-2.0 LGPL-2.1+ ZLIB"
+SLOT="0"
+IUSE="doc"
+RESTRICT="test"
+
+DEPEND="dev-libs/libevent:0="
+RDEPEND="${DEPEND}
+	net-firewall/iptables"
+
+[[ ${PV} != *9999 ]] && S="${WORKDIR}"/"${PN}"-release-"${PV}"
+
+pkg_setup() {
+	enewgroup redsocks
+	enewuser redsocks -1 -1 /run/redsocks redsocks
+}
+
+src_compile() {
+	CC="$(tc-getCC)" emake
+}
+
+src_install() {
+	dosbin redsocks
+	doman debian/redsocks.8
+	use doc && dodoc README doc/*
+	insinto /etc
+	newins debian/redsocks.conf redsocks.conf
+
+	newinitd "${FILESDIR}"/redsocks.init-r1 redsocks
+	newconfd "${FILESDIR}"/redsocks.conf redsocks
+
+	systemd_dounit "${FILESDIR}"/redsocks.service
+}
diff --git a/net-proxy/trojan/Manifest b/net-proxy/trojan/Manifest
index c950394b51f2..3b834a60870e 100644
--- a/net-proxy/trojan/Manifest
+++ b/net-proxy/trojan/Manifest
@@ -3,8 +3,8 @@ 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
-EBUILD trojan-1.10.0.ebuild 1017 BLAKE2B 7f946e5d93d6637a0de5850b97c841abb5053eae85d4edf539a63779670c643507463c71ffe23d9b56ebac04dee2a674324fe1da9ed5dc98dee6c2a86bb6ee25 SHA512 1058ceedc28c35f385352db9fb63c3b9ad566c2d24b2cfd7233ac48e801b9adc968d91fe79b62fa7eee49f5fbc46299062a2cadecdca7501bf0295ee886808ca
-EBUILD trojan-1.12.3.ebuild 952 BLAKE2B 29b89597e886409b80feb112edb8446d594d8b54a097f75c5bd3e4c9fd6cc946bf96bc8c51644006f134aae370692f6e0a1c5ecfd47f0e078a66c09353011ccf SHA512 a755aabb7cadf51614069261bc8026a5a2cb264df654d9b9b0bf04f8beadc0cecff9f3df7d6f4b5e2cef10356470242c4b31c56ba4e5b5eb9b6adfbcd7f05f09
+EBUILD trojan-1.10.0.ebuild 1018 BLAKE2B 06f93c7c4672a215fcc139a17b2f17ce6d5eec88b11d598d7409db5000f11bf91ed1159a17df95b836a94602a7eaf686b1b3e2afaf98cd0478f9844ef9bfa2ca SHA512 50d3b4acd48770c5b4ebd19aec6f69c75b1c44ee0bdc1958cec7d67eea9834ce6edfc9483c802b24728babdbee19e97201335aa7bf697984316221f47d9bbb7e
+EBUILD trojan-1.12.3.ebuild 953 BLAKE2B 90151ee22e7c2f4cbe748ba3cbb450dcab5a1fbd7d85c121a939e3bd38e451e7800d37b9bf6590ce2c1ef9b49461e8fed272812d657c1a9e1e006f7fdde13fcd SHA512 1dea01ddce5a14f536f0abdd9ba2da7450a92c773045714fb024870dfcfa31a71a38feef35c86715f75f7655cea86c7c699887cd8d66e51155117d465ab6d361
 EBUILD trojan-1.13.0.ebuild 982 BLAKE2B ede4d5b6092f26415ebe3b4648a17c45414f945cdf7240eccd4b8568e12e0bbcfa3c0840e0f59606979a43bff606969c72ecaad5bc39103e316bb4872a3447d9 SHA512 18df4cf86d54b8566144cba94906f082b2841a2147756537b21fcaabb37d87dd1f66378420d0d098a7f819631394c1d36c5c8cff0d949ae0d98699bcfb524d4e
 EBUILD trojan-1.14.1.ebuild 982 BLAKE2B ede4d5b6092f26415ebe3b4648a17c45414f945cdf7240eccd4b8568e12e0bbcfa3c0840e0f59606979a43bff606969c72ecaad5bc39103e316bb4872a3447d9 SHA512 18df4cf86d54b8566144cba94906f082b2841a2147756537b21fcaabb37d87dd1f66378420d0d098a7f819631394c1d36c5c8cff0d949ae0d98699bcfb524d4e
 MISC metadata.xml 1023 BLAKE2B cea392d59eea944198e523e0dfdab0325180568d9f3f39e40fc7c94c43a1c8b9811e787da5174f4f0b85d932778b34dcf4a07afccc4cf02972de57e7a3004ad4 SHA512 b1a1a6bdb8ea7d62bce25a439753c85e5e340be804ac8a71a3fbbd4f671270c174f9db77b72c2d00cdc1ede7cea6f7a86d2401e6cb8c8f9e395573c9216dfa4b
diff --git a/net-proxy/trojan/trojan-1.10.0.ebuild b/net-proxy/trojan/trojan-1.10.0.ebuild
index cca6f739ed10..9926cef05ccd 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 a380f99123e8..5a088c7f2987 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+"