From 2891d29af8907ce881662f4a02844926d7a293c7 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Mon, 31 Dec 2018 13:43:35 +0000 Subject: gentoo resync : 31.12.2018 --- net-proxy/Manifest.gz | Bin 5879 -> 5878 bytes net-proxy/sshuttle/Manifest | 5 +- .../files/sshuttle-0.78.3-remote-python.patch | 70 --------------------- net-proxy/sshuttle/sshuttle-0.78.3-r2.ebuild | 55 ---------------- net-proxy/sshuttle/sshuttle-0.78.4.ebuild | 8 +-- 5 files changed, 5 insertions(+), 133 deletions(-) delete mode 100644 net-proxy/sshuttle/files/sshuttle-0.78.3-remote-python.patch delete mode 100644 net-proxy/sshuttle/sshuttle-0.78.3-r2.ebuild (limited to 'net-proxy') diff --git a/net-proxy/Manifest.gz b/net-proxy/Manifest.gz index 4a8bcb436c89..9ff83ba35da1 100644 Binary files a/net-proxy/Manifest.gz and b/net-proxy/Manifest.gz differ diff --git a/net-proxy/sshuttle/Manifest b/net-proxy/sshuttle/Manifest index c8a630889a4e..b5535be33340 100644 --- a/net-proxy/sshuttle/Manifest +++ b/net-proxy/sshuttle/Manifest @@ -1,6 +1,3 @@ -AUX sshuttle-0.78.3-remote-python.patch 2297 BLAKE2B edb955c130d3ec230ea2c5395f6479d11192b95ac40bc30808d709109b9f596c476763955ce62d087c1f29e4b70525e11d32002d8a0a2826519ec0b540ea2e43 SHA512 3636d33f2dabb4ea2bfdabc5e68a110412db6bacddf083509fdaf7a9d12f4b9eee75ca9a62d9991c54f2d952f774e79ce2346009ae4189c2d08b9a1e750e75bc -DIST sshuttle-0.78.3.tar.gz 69460 BLAKE2B af6835ac6ca8d2d4d94f86067b2d9024ad531de2c35f07432f4b7319c5ff133349c8975a15d30486bf5cc0e9d9a71798ec2d3ecab943b5992f66b5c371b45de1 SHA512 581955d9868bdd369a37386b273d53448944b1fb5458a25d5930b348630521cadcaea8cf45371942f96c789889d2a405e8bbe824af3d0c6def73f017f1149a1e DIST sshuttle-0.78.4.tar.gz 72465 BLAKE2B 655df610757e245b66db61955306908c8d1e41db7d093dc44d55260a34b30d4605973815c64d59a860974e9a268e3fcefbba41a104da5ad73f6a8a292bc64b80 SHA512 6e3e49a638ad56fbb00b197d33426f9ccb9afe3d71f8109eb886bc9047083100c910fef7cb42f0426246e585138ce996872179d23fca98afd9e9ccca376da1e6 -EBUILD sshuttle-0.78.3-r2.ebuild 1290 BLAKE2B 536dae8060516bf799eb9c6f37bcb1baea85364c495dc57d8ff2dc4df3b1d46e1d2280ed186c764b0fa1eb336dc69351a5c1cc62fac6f4eccf8dd538f8555948 SHA512 59736a77d18c4c274fd4b24cb368feb6317780d94f447db8dbe52b8c19dfd1f2afb4aa12128d6ff4c852458d5afadf7bfa67eb59f32010af52c73ed602818dd6 -EBUILD sshuttle-0.78.4.ebuild 1275 BLAKE2B d1e52fd05758633a8203673e2145676f58afd9f58a59f6f929ce2ea8f30a2d678a38cb8d76838944590a7f90d6ca23abf5f8b0943a3decbb3fdd6cbe2b6bb806 SHA512 6c900f23f25d96cfbf58c6bc714ceb84dc4ab44ed3f39bce982dbc564e3b6114a5c1eb7cb4bc75a135d2d2a9564dcdc90b22fb66c907527d8bf9788c970cc1b2 +EBUILD sshuttle-0.78.4.ebuild 1278 BLAKE2B 943cb741fdba4de960022d341e64eb75e9b78fea65c46c243b85321faf6d81d0c41ead95db8a766c5b7879f9bb71eddd6114a5653f2ea2d9d53d7895088e2230 SHA512 35df645c112c1a2b5cf2f055e321cac5ed699d051590aff9e132814a64f8eea7c312353ca2e439582d163925fe2448585081bac1240ce8df5dfaf60a32396084 MISC metadata.xml 386 BLAKE2B 5a94094f59d57f94569067c3ef424b46cec97b8c6f552422ca4b5baa910f9b5f547215c49647f8e2b4ab7f008abc57e4fc407f38f8fab252d17dfb072993a496 SHA512 988f65a4a15eac0630b83d0e090749c12ef58ca1284ed94f45f6eb9c4a5ff0678a481519f435a992f572b98a8878fbfeb7bf573443c128cd29e5c365a8eb2e32 diff --git a/net-proxy/sshuttle/files/sshuttle-0.78.3-remote-python.patch b/net-proxy/sshuttle/files/sshuttle-0.78.3-remote-python.patch deleted file mode 100644 index c8138f732771..000000000000 --- a/net-proxy/sshuttle/files/sshuttle-0.78.3-remote-python.patch +++ /dev/null @@ -1,70 +0,0 @@ -From 9b7ce2811ec3ef35b9b7f7dfc157127bc46ece47 Mon Sep 17 00:00:00 2001 -From: vieira -Date: Fri, 20 Oct 2017 22:52:06 +0000 -Subject: [PATCH] Use versions of python3 greater than 3.5 when available (e.g. - 3.6) - -Some Linux distros, like Alpine, Arch, etc and some BSDs, like FreeBSD, are -now shipping with python3.6 as the default python3. Both the client and the -server are failing to run in this distros, because we are specifically looking -for python3.5. - -These changes make the run shell script use python3 if the version is greater -than 3.5, otherwise falling back as usual. - -On the server any version of python3 will do, use it before falling back to -python, as the server code can run with any version of python3. ---- - run | 28 +++++++++++++++++----------- - sshuttle/ssh.py | 2 +- - 2 files changed, 18 insertions(+), 12 deletions(-) - -diff --git a/run b/run -index ec2d3f0..a14d831 100755 ---- a/run -+++ b/run -@@ -1,11 +1,17 @@ --#!/bin/sh --source_dir="$(dirname $0)" --(cd "$source_dir" && "$source_dir/setup.py" --version > /dev/null) --export PYTHONPATH="$source_dir:$PYTHONPATH" --if python3.5 -V >/dev/null 2>&1; then -- exec python3.5 -m "sshuttle" "$@" --elif python2.7 -V >/dev/null 2>&1; then -- exec python2.7 -m "sshuttle" "$@" --else -- exec python -m "sshuttle" "$@" --fi -+#!/usr/bin/env sh -+set -e -+export PYTHONPATH="$(dirname $0):$PYTHONPATH" -+ -+python_best_version() { -+ if [ -x "$(command -v python3)" ]; then -+ if python3 -c "import sys; sys.exit(not sys.version_info > (3, 5))"; then -+ exec python3 "$@" -+ fi -+ elif [ -x "$(command -v python2.7)" ]; then -+ exec python2.7 "$@" -+ else -+ exec python "$@" -+ fi -+} -+ -+python_best_version -m "sshuttle" "$@" -diff --git a/sshuttle/ssh.py b/sshuttle/ssh.py -index f4c84cc..a1f2997 100644 ---- a/sshuttle/ssh.py -+++ b/sshuttle/ssh.py -@@ -116,7 +116,7 @@ def connect(ssh_cmd, rhostport, python, stderr, options): - if python: - pycmd = "'%s' -c '%s'" % (python, pyscript) - else: -- pycmd = ("P=python3.5; $P -V 2>/dev/null || P=python; " -+ pycmd = ("P=python3; $P -V 2>/dev/null || P=python; " - "exec \"$P\" -c %s") % quote(pyscript) - pycmd = ("exec /bin/sh -c %s" % quote(pycmd)) - argv = (sshl + --- -2.16.1 - diff --git a/net-proxy/sshuttle/sshuttle-0.78.3-r2.ebuild b/net-proxy/sshuttle/sshuttle-0.78.3-r2.ebuild deleted file mode 100644 index 1a4ce06c0fe5..000000000000 --- a/net-proxy/sshuttle/sshuttle-0.78.3-r2.ebuild +++ /dev/null @@ -1,55 +0,0 @@ -# Copyright 1999-2018 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 -PYTHON_COMPAT=( python{2_7,3_5,3_6} ) - -inherit linux-info distutils-r1 - -DESCRIPTION="Transparent proxy server that works as a poor man's VPN using ssh" -HOMEPAGE="https://github.com/sshuttle/sshuttle https://pypi.org/project/sshuttle/" -SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz" - -LICENSE="GPL-2+" -SLOT="0" -KEYWORDS="amd64 x86" -IUSE="test" - -RDEPEND=" - dev-python/setuptools[${PYTHON_USEDEP}] - net-firewall/iptables -" -DEPEND=" - dev-python/sphinx - dev-python/setuptools[${PYTHON_USEDEP}] - dev-python/setuptools_scm[${PYTHON_USEDEP}] - test? ( - dev-python/pytest[${PYTHON_USEDEP}] - dev-python/mock[${PYTHON_USEDEP}] - ) -" - -CONFIG_CHECK="~NETFILTER_XT_TARGET_HL ~IP_NF_TARGET_REDIRECT ~IP_NF_MATCH_TTL ~NF_NAT" - -PATCHES=( "${FILESDIR}"/${P}-remote-python.patch ) - -python_prepare_all() { - # don't run tests via setup.py pytest - sed -i "/setup_requires=/s/'pytest-runner'//" setup.py || die - - distutils-r1_python_prepare_all -} - -python_compile_all() { - emake -C docs html man -} - -python_test() { - py.test || die "Tests fail under ${EPYTHON}" -} - -python_install_all() { - HTML_DOCS=( "${S}"/docs/_build/html/. ) - doman "${S}"/docs/_build/man/* - distutils-r1_python_install_all -} diff --git a/net-proxy/sshuttle/sshuttle-0.78.4.ebuild b/net-proxy/sshuttle/sshuttle-0.78.4.ebuild index de0f9599f260..a4f04e43049b 100644 --- a/net-proxy/sshuttle/sshuttle-0.78.4.ebuild +++ b/net-proxy/sshuttle/sshuttle-0.78.4.ebuild @@ -1,8 +1,8 @@ -# Copyright 1999-2018 Gentoo Foundation +# Copyright 1999-2018 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=6 -PYTHON_COMPAT=( python{2_7,3_5,3_6} ) +PYTHON_COMPAT=( python{2_7,3_5,3_6,3_7} ) inherit linux-info distutils-r1 @@ -12,7 +12,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz" LICENSE="LGPL-2.1+" SLOT="0" -KEYWORDS="~amd64 ~x86" +KEYWORDS="amd64 x86" IUSE="test" RDEPEND=" @@ -39,7 +39,7 @@ python_prepare_all() { } python_compile_all() { - emake -C docs html man + emake -j1 -C docs html man } python_test() { -- cgit v1.2.3