gentoo resync : 11.02.2018

6 files changed, 129 insertions, 2 deletions

diff --git a/net-proxy/Manifest.gz b/net-proxy/Manifest.gz
index 74a9fa50a57c..16ca8efc3d30 100644
--- a/net-proxy/Manifest.gz
+++ b/net-proxy/Manifest.gz
diff --git a/net-proxy/squid/Manifest b/net-proxy/squid/Manifest
index 450d96a6fb6d..acd4fa1f8ef9 100644
--- a/net-proxy/squid/Manifest
+++ b/net-proxy/squid/Manifest
@@ -10,6 +10,6 @@ AUX squid.pam 209 BLAKE2B 113fa119ce4fd96ddf34b95c1a1ca958b34aea405564076f89abdb
 DIST squid-3.5.26.tar.xz 2328352 BLAKE2B 236f2d83176a7596fd2455c6bbe411a9b2c1dfc8b0b6f12f28c2723965418cca59d02dd04d39ca646580042f6fde00f0a7c9bbf4f3a50780d302f3b9473b650a SHA512 08fc7fb5d1dea8d91cc318e5be9044fd75c69d0d2053a0c79ab594155aeb4a0f48bb0ff1dd754497485dc8db117b71f1787b0265842cf61b474293d5d38a9222
 DIST squid-3.5.27.tar.xz 2303468 BLAKE2B 448dbb703469bdd38a0e88da8e473510e9652fc7c7ae2e48bf687a4c2e1698f3baa92c212631fd3734ee51bead89980d31af58d64654418a7c4c4a16e1be751e SHA512 4172a053c3b7ffe7a12dfb3febac96942d0fbbe7e98e3f797f22cd75b0a3a89cbbfe7260b5daad099e79d5e9303bb5dfbfee7499cb30a90590aa1bd242ff4817
 EBUILD squid-3.5.26.ebuild 7357 BLAKE2B c445299036ac606d3b74b163fccd404440eca341d736625898273517fe9111874292c1b4daf2f7d8c8446762c9b6da27d90df71b689b76265dac54fb90f19ba4 SHA512 c3a57bfe2194b64854b26507b595ca0e60d4d6c7dc51c12ef62ea91c734de3fb943008be943421c33c39430249d2831e55358e40b205798c49e1ba0a3c4def4a
-EBUILD squid-3.5.27-r1.ebuild 7757 BLAKE2B da5fe731f07900f25b0b5d5c9ff7ff0a02faf14d5bdd90c2d2bfd7041e128a8cb3852cdca940ab25e7dec2a40da1cf0e1b7f03075dc2c30221ef579bcf3e0dbe SHA512 5103196877a907a0cfdc7dcc817195c79b9cbb2d034f2b08ffc4967b6e9db7f606728b86fd44dfbca184813a0d590bca28f6664d58bcd69aebbde83677cf9f36
+EBUILD squid-3.5.27-r1.ebuild 7754 BLAKE2B 913381a340d2877bb3d943f84e0fdeae34843d1692e7566643b06bdb6808fc21de1aa1d4593dbb74e9e4393f4b6b2c721eced9733fed81b0f982cf882d9f755b SHA512 686ae5505ee1a62c51e5bc9e343eaed1bfa80d0b23a729285a6ec4f8036c2587e760318af087aa22b78c7574d98f338ab8f4a7685fd7d66b9d2baa452f430387
 EBUILD squid-3.5.27.ebuild 7677 BLAKE2B b699b902e394aeda95aa268b57cb5c6480eb23e79e8ed0233244f66027566160489f603ce4341fb70966e73b512c8c1562f78fe496bab1396813099ec3c79890 SHA512 82860ad6254afa72707f9c37a4f582cbfe2b78fb809175d913beb805a38c0a0ee0c5a1c691f977af76fd211866b079ed6bad15ae9712f00964c13e2b4b36694d
 MISC metadata.xml 1539 BLAKE2B 05cdb519d9113240c6b3ec38da9c19cfe3e63ed7423e4555eb198d79e75013d142da7d6d0c2e3f293ecd6c0b3e215806915724eb7c453cc5da1923f61ee9ef30 SHA512 7e28e289a27097bc5b2a4caca81506c9c76898c416842e0858dc82b5a03e5f473818ccd52b43c47ee549cf1bebe7e83a0d125eb24995c1a2d74db4e998825c6d
diff --git a/net-proxy/squid/squid-3.5.27-r1.ebuild b/net-proxy/squid/squid-3.5.27-r1.ebuild
index 959f1917badb..dc5029c0563a 100644
--- a/net-proxy/squid/squid-3.5.27-r1.ebuild
+++ b/net-proxy/squid/squid-3.5.27-r1.ebuild
@@ -10,7 +10,7 @@ SRC_URI="http://www.squid-cache.org/Versions/v3/3.5/${P}.tar.xz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc x86 ~x86-fbsd"
+KEYWORDS="~alpha amd64 arm hppa ia64 ~mips ~ppc ~ppc64 ~sparc x86 ~x86-fbsd"
 IUSE="caps ipv6 pam ldap libressl samba sasl kerberos nis radius ssl snmp selinux logrotate test \
 	ecap esi ssl-crtd \
 	mysql postgres sqlite \
diff --git a/net-proxy/sshuttle/Manifest b/net-proxy/sshuttle/Manifest
index f3daebbca2d0..3133a22b345c 100644
--- a/net-proxy/sshuttle/Manifest
+++ b/net-proxy/sshuttle/Manifest
@@ -1,3 +1,5 @@
+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
+EBUILD sshuttle-0.78.3-r2.ebuild 1295 BLAKE2B e3a6b22fd8bb3fba3694796b3aff280f233a3a929ab2a918eba0830532dfb49278a553a86258ee464f89bb0dfeb40e1fbafd313d7c8556a89c5ba7663669e04f SHA512 31b158ce96be52ec9a3c7e81e9fa7bcf8b8724871f28e718b6e9c8566daf38df8841389e21c79421bd99917debd704ff08d0d8ad05c740ceb0a3e944bcc35015
 EBUILD sshuttle-0.78.3.ebuild 1040 BLAKE2B 0074d8133777bc68ab01304c914079c8a0754ab382f43d03f0d8eceb30bdb6bbf23210027a26780530efdf3a01a7936ad9d54e5e94592afeddd6353794699cc7 SHA512 1b5176e1e6a154922a93102f36822ac2ffdf1ede3abdd9e31d212bad8093af202ec5db77f7e7f6ded46bf70499935cfc53831d3f42b36764be6b6f711ae8b2cd
 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
new file mode 100644
index 000000000000..c8138f732771
--- /dev/null
+++ b/net-proxy/sshuttle/files/sshuttle-0.78.3-remote-python.patch
@@ -0,0 +1,70 @@
+From 9b7ce2811ec3ef35b9b7f7dfc157127bc46ece47 Mon Sep 17 00:00:00 2001
+From: vieira <vieira@yubo.be>
+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
new file mode 100644
index 000000000000..254601915e1c
--- /dev/null
+++ b/net-proxy/sshuttle/sshuttle-0.78.3-r2.ebuild
@@ -0,0 +1,55 @@
+# 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.python.org/pypi/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
+}