From 2018227e9344edb9da15fc6a4a8298086cc2aa77 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Sun, 2 Jun 2019 21:45:28 +0100 Subject: gentoo resync : 02.06.2019 --- net-proxy/3proxy/3proxy-0.8.12.ebuild | 46 ++++++++++++++++++++ net-proxy/3proxy/Manifest | 3 ++ net-proxy/3proxy/files/3proxy-0.8.12-gentoo.patch | 49 ++++++++++++++++++++++ net-proxy/Manifest.gz | Bin 5538 -> 5546 bytes net-proxy/trojan/Manifest | 4 +- net-proxy/trojan/files/trojan.initd | 2 +- net-proxy/trojan/trojan-1.12.2.ebuild | 47 +++++++++++++++++++++ 7 files changed, 149 insertions(+), 2 deletions(-) create mode 100644 net-proxy/3proxy/3proxy-0.8.12.ebuild create mode 100644 net-proxy/3proxy/files/3proxy-0.8.12-gentoo.patch mode change 100755 => 100644 net-proxy/trojan/files/trojan.initd create mode 100644 net-proxy/trojan/trojan-1.12.2.ebuild (limited to 'net-proxy') diff --git a/net-proxy/3proxy/3proxy-0.8.12.ebuild b/net-proxy/3proxy/3proxy-0.8.12.ebuild new file mode 100644 index 000000000000..5ebf6061b3da --- /dev/null +++ b/net-proxy/3proxy/3proxy-0.8.12.ebuild @@ -0,0 +1,46 @@ +# Copyright 1999-2019 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +inherit toolchain-funcs + +DESCRIPTION="A really tiny cross-platform proxy servers set" +HOMEPAGE="https://www.3proxy.ru/" +SRC_URI="https://github.com/z3APA3A/3proxy/archive/${PV}.tar.gz -> ${P}.tar.gz" +LICENSE="BSD" +SLOT="0" +KEYWORDS="~alpha ~amd64 ~arm ~ppc ~sparc ~x86" +IUSE="" + +PATCHES=( + "${FILESDIR}"/${PN}-0.8.12-gentoo.patch +) + +DOCS=( README cfg ) +HTML_DOCS=( doc/html/. ) + +src_prepare() { + default + cp Makefile.Linux Makefile || die +} + +src_compile() { + emake CC="$(tc-getCC)" LN="$(tc-getCC)" +} + +src_install() { + local x + + pushd src >/dev/null || die + dobin 3proxy + for x in proxy socks ftppr pop3p tcppm udppm mycrypt dighosts icqpr smtpp; do + newbin ${x} ${PN}-${x} + [[ -f "${S}"/man/${x}.8 ]] && newman "${S}"/man/${x}.8 ${PN}-${x}.8 + done + popd >/dev/null + + doman man/3proxy*.[38] + + einstalldocs +} diff --git a/net-proxy/3proxy/Manifest b/net-proxy/3proxy/Manifest index bae405396403..0b02cc1dc9b4 100644 --- a/net-proxy/3proxy/Manifest +++ b/net-proxy/3proxy/Manifest @@ -1,4 +1,7 @@ +AUX 3proxy-0.8.12-gentoo.patch 1749 BLAKE2B 8ee153ae343989faef6f36dbdc072b933fbee2d2ad129b0e6573dd57e465916d94f0868fcfd03a2099879b3c7bc925ac3be1adb7be52043fbb9996cbc8ff0ed2 SHA512 b8c3a9d5cf1ad20ef517ec6ec5626cf9f6094777c0870e53fd35e32f49a518fecdfa05a5806514957d10943da7bdcaa63e2ad6fce32506d7fd1a467bb7b2e652 AUX 3proxy-0.8.8-gentoo.patch 1471 BLAKE2B daccc5f278ba4ac59aad24b463557a49e177f0dea679deea0b1282ba31eac21d76ee4587c3a6523da29ea8130ac24c75ee8b0ceecceb1ec57a53cc6028c9bb51 SHA512 9c41df962691f8b2b832495a5e644fcbe58805839b2b40dd65564dc3eb9897de1a744677e2c4a032e39d64b34c4190893049f2ed86be8908f739f720633b2f3a +DIST 3proxy-0.8.12.tar.gz 528990 BLAKE2B fb338c93e25fe4d03d626118f8c3ef52af7104599e11d535dfa572c4fb47d609da66f199406a3c6bb9739766163bb7b54b529f71d4d6ff637567f2f67d3a9ed1 SHA512 33412e89991055598e06210dbcd7b2f9ee6810753c8f40ada02f222def0a49047a90ff7f2efa6895bc4f8ad99193866c980de2e79464310a77cc8e63c8b9813d DIST 3proxy-0.8.9.tar.gz 497006 BLAKE2B c57e98eb586dfacefd530e091fecbee274d8104698ca082b71ea0607294199cb7db63fc32787236b7e797c928a7ba4f7bafa3ef35551bef76aacfbdf1f259fff SHA512 35153882fec7077b05b23f9cea91443126a8a9faf9818915612e0739196a8bd1f00e0bcefb339a86bad10bb0c1b9891bd06847934787f4758ec55e6cc2e9e815 +EBUILD 3proxy-0.8.12.ebuild 923 BLAKE2B 1a29d1e6f61fe79a9db6a1963794fb7276ae4364caa6d4549506ac65b947daf7344512c902e1428f10cf55be5e27d75416927be6f6c41872c423c91997f29426 SHA512 55101f5091f615a6411680b737ea82f275e910d9d9bc93ceacb42ab297cbe4099aa7746cf1578a34bcc1b187e822f9ff118bf80866e75166ad1554bca500c006 EBUILD 3proxy-0.8.9.ebuild 837 BLAKE2B 7f5666c6d09b04d57be1147421436435f0ce8487ae5957a474cee81064642bde3b4b80b52d9a14c6a9e0c16e61518cf6b1a412dddf354edc2cbec821e2351207 SHA512 ef8abe07dff61866d3b2a887511aaaba995fbdf3173213790f71a42f64d61b2fa224f41cb1f11d9d42ffbca04c579a013f2adc8ce19c06f03b9b5491552009c4 MISC metadata.xml 1102 BLAKE2B 1c5bfc3ff94b076a5bc8f7c87091b08e9f2fe69a49776687379d1149cfc3cc3f04fff7278858a548746110533b528fa0d83e7af9c384143ddcf6a9d3e796502b SHA512 f9c7b4b3b9f045b76049a75f2e65f70a316a3ad08f44a39d1c7ea23e5b23bc92232eae7487b4bf7534bb2fbd2655a9debf35ac3ba8ee4de6583d49f61bfc6076 diff --git a/net-proxy/3proxy/files/3proxy-0.8.12-gentoo.patch b/net-proxy/3proxy/files/3proxy-0.8.12-gentoo.patch new file mode 100644 index 000000000000..33950f45ceeb --- /dev/null +++ b/net-proxy/3proxy/files/3proxy-0.8.12-gentoo.patch @@ -0,0 +1,49 @@ +diff -uNr a/Makefile.Linux b/Makefile.Linux +--- a/Makefile.Linux 2018-04-18 22:48:45.000000000 +0300 ++++ b/Makefile.Linux 2019-05-26 14:42:38.927811513 +0300 +@@ -8,13 +8,13 @@ + # library support. Add -DSAFESQL for poorely written ODBC library / drivers. + + BUILDDIR = +-CC = gcc ++CC ?= gcc + +-CFLAGS = -g -O2 -fno-strict-aliasing -c -pthread -DGETHOSTBYNAME_R -D_THREAD_SAFE -D_REENTRANT -DNOODBC -DWITH_STD_MALLOC -DFD_SETSIZE=4096 -DWITH_POLL ++CFLAGS += -fno-strict-aliasing -c -pthread -DGETHOSTBYNAME_R -D_THREAD_SAFE -D_REENTRANT -DNOODBC -DWITH_STD_MALLOC -DFD_SETSIZE=4096 -DWITH_POLL + COUT = -o +-LN = gcc ++LN ?= gcc + DCFLAGS = -fpic +-LDFLAGS = -O2 -fno-strict-aliasing -pthread ++LDFLAGS += -fno-strict-aliasing -pthread + DLFLAGS = -shared + DLSUFFICS = .ld.so + # -lpthreads may be reuqired on some platforms instead of -pthreads +@@ -39,12 +39,12 @@ + include Makefile.inc + + allplugins: +- @list='$(PLUGINS)'; for p in $$list; do cp Makefile Makefile.var plugins/$$p; cd plugins/$$p ; make ; cd ../.. ; done ++ @list='$(PLUGINS)'; for p in $$list; do cp Makefile Makefile.var plugins/$$p; cd plugins/$$p ; $(MAKE) ; cd ../.. ; done + + DESTDIR = +-prefix = /usr/local ++prefix = + exec_prefix = $(prefix) +-man_prefix = $(prefix)/share ++man_prefix = $(prefix)/usr/share + + INSTALL = /usr/bin/install + INSTALL_BIN = $(INSTALL) -m 755 +diff -uNr a/src/stringtable.c b/src/stringtable.c +--- a/src/stringtable.c 2018-04-18 22:48:45.000000000 +0300 ++++ b/src/stringtable.c 2019-05-26 14:42:07.437810566 +0300 +@@ -38,7 +38,7 @@ + /* 24 */ NULL, + #ifndef TPROXY_CONF + #ifndef _WIN32 +-/* 25 */ (unsigned char *)"/usr/local/etc/3proxy/3proxy.cfg", ++/* 25 */ (unsigned char *)"/etc/3proxy/3proxy.cfg", + #else + /* 25 */ (unsigned char *)"3proxy.cfg", + #endif diff --git a/net-proxy/Manifest.gz b/net-proxy/Manifest.gz index 4c7a3adae643..ecfcf475b1f7 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 85d74032a3ff..7d90d37e1ee2 100644 --- a/net-proxy/trojan/Manifest +++ b/net-proxy/trojan/Manifest @@ -1,4 +1,6 @@ -AUX trojan.initd 542 BLAKE2B 2e5597381353f1aa8da392027b9a4179da08bb387a776f584bd508f9e7d20747317d78ed7506e97047eb809e0e9726f3f52a9f75a2aacf26d349ec8628b23acb SHA512 1e1f230c96c1d7f8c6f0dc23c40eb8895d004448d802c85d62b34e186bea964753e28e90978075dcbe9fbc2e73074564303f6e28cf12633e424230a2d415910e +AUX trojan.initd 539 BLAKE2B 1dcca22a0647d109928570ab58780237a67bf5bd5952da6a0e68cc4b8d75348b392ea309beddda64e3f00619f3ce2744a29445794338c406b50b28cd44687fcd SHA512 d032f840d2e3dc0a9f3fe92d40aad3946a9c70217c673ecb89a9da8bf14fa9c4e764431534f63edf70d38fed293903aa8a298af474ddc8343e10d169855d81e6 DIST trojan-1.10.0.tar.gz 38230 BLAKE2B 2cfa77ebfbae62edef983d1e57e3ce00a61118f6458cab353af60960e2586750fcd0c4237631481cfdfc8ed0ddad586e1d649046269c7e9177594869c187d8d1 SHA512 9d9a74218369f8094b292b8892e5f877ccec7d8912657491bb37da8e9ae4817f07a83fe401e33bbbdd2ac9c50c1440f3a021f93d85999b43df4849b0a04049cf +DIST trojan-1.12.2.tar.gz 41742 BLAKE2B 7090c426c66877ed31a61b8b678d5169094af4687b37622cacac758ce907154f579b5a5455d850ed1ca5fb70e8793a13c3c4aa20015cca70d78d0ce51c747e2c SHA512 1cf0eb7cf740f6212140886e481adb00883f7132ba21d346812a2c23fca35222b93251b3cdaba6b6dad66b15f743d8627a5d42e28f32aaef5cab682ea37b5983 EBUILD trojan-1.10.0.ebuild 1024 BLAKE2B 37744644fa8f9e38d54cdc08cbaf6174676e7b6fdc8521c62b403048fc827c62eb2fe8b9f611195a55463626d69835641c2245ebabf645dcfea46e185f2de662 SHA512 306cb838df2d05604940c1c519865829e3eb65a78e87df80b248cf93eb8d4628a69f65460cdf5e8537ef9f2622cae960bbfd0b4c82491fe369e477959283a118 +EBUILD trojan-1.12.2.ebuild 1021 BLAKE2B 14122028ed5d2eaed5b8ceeb702119efffb1864a7b09f7db43501ca546c100dad1c666502ca159a371415d912f4352066c6a1a71acc249a2f68520fca63ae6dc SHA512 86108b7321ae1bb4bc5fed94196f463fbbaafa58cea4a4c5003d84aa5947b01d547d266b8e9496326ce3f6eb78f1197ae6329f774f21337723597b55e50721b6 MISC metadata.xml 1023 BLAKE2B cea392d59eea944198e523e0dfdab0325180568d9f3f39e40fc7c94c43a1c8b9811e787da5174f4f0b85d932778b34dcf4a07afccc4cf02972de57e7a3004ad4 SHA512 b1a1a6bdb8ea7d62bce25a439753c85e5e340be804ac8a71a3fbbd4f671270c174f9db77b72c2d00cdc1ede7cea6f7a86d2401e6cb8c8f9e395573c9216dfa4b diff --git a/net-proxy/trojan/files/trojan.initd b/net-proxy/trojan/files/trojan.initd old mode 100755 new mode 100644 index f525eefe74df..cee794ad4d72 --- a/net-proxy/trojan/files/trojan.initd +++ b/net-proxy/trojan/files/trojan.initd @@ -1,5 +1,5 @@ #!/sbin/openrc-run -# Copyright 1999-2018 Gentoo Foundation +# Copyright 1999-2019 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 TJ_CONFIG="/etc/trojan/config.json" diff --git a/net-proxy/trojan/trojan-1.12.2.ebuild b/net-proxy/trojan/trojan-1.12.2.ebuild new file mode 100644 index 000000000000..e394deff72a0 --- /dev/null +++ b/net-proxy/trojan/trojan-1.12.2.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 +} -- cgit v1.2.3