From 8be70107efbb417f839292165ee39d07a062046f Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Sat, 13 Jan 2018 06:19:51 +0000 Subject: gentoo resync : 13.01.2018 --- net-analyzer/Manifest.gz | Bin 49468 -> 49476 bytes net-analyzer/linkchecker/Manifest | 3 +- .../files/linkchecker-9.3.1-requests.patch | 46 +++++++++++++ .../linkchecker/linkchecker-9.3.1-r1.ebuild | 76 +++++++++++++++++++++ net-analyzer/linkchecker/linkchecker-9.3.1.ebuild | 75 -------------------- net-analyzer/netcat/Manifest | 2 + net-analyzer/netcat/netcat-110.20180111.ebuild | 52 ++++++++++++++ net-analyzer/prometheus/Manifest | 7 +- net-analyzer/prometheus/files/prometheus-3.initd | 11 ++- net-analyzer/prometheus/files/prometheus.initd | 19 ------ net-analyzer/prometheus/prometheus-1.8.2.ebuild | 59 ---------------- net-analyzer/prometheus/prometheus-2.0.0-r1.ebuild | 68 ++++++++++++++++++ net-analyzer/prometheus/prometheus-2.0.0.ebuild | 68 ------------------ 13 files changed, 258 insertions(+), 228 deletions(-) create mode 100644 net-analyzer/linkchecker/files/linkchecker-9.3.1-requests.patch create mode 100644 net-analyzer/linkchecker/linkchecker-9.3.1-r1.ebuild delete mode 100644 net-analyzer/linkchecker/linkchecker-9.3.1.ebuild create mode 100644 net-analyzer/netcat/netcat-110.20180111.ebuild delete mode 100644 net-analyzer/prometheus/files/prometheus.initd delete mode 100644 net-analyzer/prometheus/prometheus-1.8.2.ebuild create mode 100644 net-analyzer/prometheus/prometheus-2.0.0-r1.ebuild delete mode 100644 net-analyzer/prometheus/prometheus-2.0.0.ebuild (limited to 'net-analyzer') diff --git a/net-analyzer/Manifest.gz b/net-analyzer/Manifest.gz index 5673f1cd3c91..884da13749cf 100644 Binary files a/net-analyzer/Manifest.gz and b/net-analyzer/Manifest.gz differ diff --git a/net-analyzer/linkchecker/Manifest b/net-analyzer/linkchecker/Manifest index 94af727d4f47..172d94af3c6b 100644 --- a/net-analyzer/linkchecker/Manifest +++ b/net-analyzer/linkchecker/Manifest @@ -3,9 +3,10 @@ AUX linkchecker-9.3-bash-completion.patch 621 BLAKE2B bce120caf1cddcd11e49c06b5c AUX linkchecker-9.3-desktop.patch 1783 BLAKE2B 8735cdb6e486ad292cbbf397c59e57a33bd7fee4058250766deaf0c7039b76020e10aa7972a7e780726671c0346015a20ed502ac8a6a4172043d17d2e35fa313 SHA512 4100c7844548a7894157cf884ed3093e3cb4d11cad33bda605ce1328e7214fb40a229935716a1775978bfe96c87413b52fca4783d7a167027736a1284b8d39b0 AUX linkchecker-9.3-requests-check.patch 1538 BLAKE2B a24a8471d5b42c07afaf17611860b10c001cfb2a2282219f70389bbdb18111901feefc2c73683f4661aa80311565d0bb4c0b2239140c944b617beb86df164988 SHA512 3ba20f160aa27a611d92ad5b6a31f134b64f52644ad1ac73d41dd7ea77fa3b5d743f3fd51cf5f6d4f3229ec27cfb0758d1d4c87dd14c95ab83c0af54236d5d96 AUX linkchecker-9.3.1-build-fix.patch 450 BLAKE2B 176f2617c0e2285473d500b351a918d9a48ef631662f6ecbfe7abe8ac37a6a8fd0406838193f068c42a9baeb09d9630e70aa518f51e480dfc3dc0c8ae17d6e9a SHA512 47c30bb1e2724ec96ca0c5223dce4ab0c79e30752be799498e84ff5953f78d9495265f59635a337690d28e6d44740296d9771c342cee6a88b30fe46bf2c58952 +AUX linkchecker-9.3.1-requests.patch 1870 BLAKE2B 6ac551b151b805f373b2bccf6d47e08158e85c894721c640d8d1701e177e52a4bd780b0b195503bf0e8e3709175f1ec73c8f7e24dd578aa63846cfd17b851e47 SHA512 fbfd999cdb48628bb3ce14bca2f114e104a69c0355a00c9b81a543c5ac10a8bec0ab71dcbbefc81bc8f468a7e17a9a89dcd5d795ce565b9452131ac2ee6e5fe3 DIST LinkChecker-9.3.tar.gz 719896 BLAKE2B f0fb43d320c0d82d5cb8fdc277e74c820501d602fd5ea0004155db8fa9b27976c0fcd5af23eb2ceda21315b94c13ac1d5aed5507555889f16b6b47a92a8c18d8 SHA512 26686e5373aaa942b631b5184f8bda8fbe1410c8875bf8499a2b61dc18b7bdfa29a3c18edf98c28dc189a493a3f5794a0020a0211b7d5d3814b33994603dcc59 DIST linkchecker-9.3.1.tar.gz 779286 BLAKE2B eec374a3455b5348533b29b03ab14558dd19a20e1058947eed9d8027a8b1705b63525e6b8fcf2c4feb59a782ca0e0ad8567e321ca4679320e9d6f256e14df990 SHA512 355c9d262502e123732807b5aaabc17060d267de44a6dc1fee9dd6655c56320ded0c1ff638d985c2dbec366d15803cfb78fae4c1a9943de11c5b4292f5a99305 EBUILD linkchecker-9.3-r2.ebuild 2016 BLAKE2B 735b62d47111032c2a2e1530f542516588d17752381741124f52a22b83c55179119f3b7775effee058ff4ae01279f32ad74a49c298fc729d843b0b8799703631 SHA512 daba5c569f2be5f22df9a7c8330a47cdb8aade0329e90ac682aef133fa0b69e2315bb0aaa6470327595c4d9c61f586c65263279890c3f79d710fa9b3e962d3b5 -EBUILD linkchecker-9.3.1.ebuild 1907 BLAKE2B ded9b7c575996ad738102498ad0f2804b1953e46512113448c7fd61b541f8dd8d044ae815f7faa04f6820e3823f0309f6e7fa9a947629616f87e9b6f17718970 SHA512 6dbd7a7a64d5f7898ec1bd77be1e2c1cc804ae0b84e468e5b124271584d8e948ce57de9b6812f1965f48ffcc89c5b188c6a96d7b152b45ad5e0a3f44e32031b3 +EBUILD linkchecker-9.3.1-r1.ebuild 1942 BLAKE2B de9f519af202980a5d954d7a33301677594e4bcc183d0362b2ddef0eee830df433354d1000f827f68e0300034ab778bd56a3b7079a044cd46c6ee7d9dec1e994 SHA512 03d33e0203aeb0c36d39caab3456c599a281898acb3cb35e2a69723c39ae38bf2048f8e26643eb06b2b16443cdea3e9f26a1907190520537f79421af42643c88 EBUILD linkchecker-9999.ebuild 1873 BLAKE2B d1afdc7f039b7eb2ffb83138e3d20ad7ed88c3d71d5c8e6cd482d578ab45b8860ef97fca67a8a5500f7a28cebfdc61c372cdbd3b30931ea460bcf0e7be3d85c0 SHA512 7857c356f300001bb66978ec65a006f19f334047723b152f62a83c9a219f69120c5e23f285d8884948f57ac5289767b48f551b513aa01569a340988bb1804670 MISC metadata.xml 319 BLAKE2B dbf67b67a9a9a65ff108e9ee4c5881023a53533d9bbeee71e9ba1a55658f2a746b408859515f593ce2ef0fd93f938fbb17c5c7a70fa48eda4be977634d11e7c5 SHA512 2fbc3b85bcfd178e2614ef73d55c633e6e3b5ee59d39ca0a6099ffd7e8067e890f69252666d8d6d9a173371d95c4b1fbb8157cb94fd307ee20672fb9ff4182fb diff --git a/net-analyzer/linkchecker/files/linkchecker-9.3.1-requests.patch b/net-analyzer/linkchecker/files/linkchecker-9.3.1-requests.patch new file mode 100644 index 000000000000..56c57fa37997 --- /dev/null +++ b/net-analyzer/linkchecker/files/linkchecker-9.3.1-requests.patch @@ -0,0 +1,46 @@ +From 9b12b5d66fa9b832f4d9e19a0b9dcb92607ee3e5 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Antoine=20Beaupr=C3=A9?= +Date: Mon, 2 Oct 2017 20:18:54 -0400 +Subject: [PATCH] workaround new limitation in requests + +newer requests do not expose the internal SSL socket object so we +cannot verify certificates. there was work to allow custom +verification routines which we could use, but this never finished: + +https://github.com/shazow/urllib3/pull/257 + +so right now, just treat missing socket information as if the cert was +missing. + +Closes: #76 +--- + linkcheck/checker/httpurl.py | 9 ++++++++- + 1 file changed, 8 insertions(+), 1 deletion(-) + +diff --git a/linkcheck/checker/httpurl.py b/linkcheck/checker/httpurl.py +index 161619c5..bde77c70 100644 +--- a/linkcheck/checker/httpurl.py ++++ b/linkcheck/checker/httpurl.py +@@ -194,6 +194,10 @@ def _get_ssl_sock(self): + """Get raw SSL socket.""" + assert self.scheme == u"https", self + raw_connection = self.url_connection.raw._connection ++ if not raw_connection: ++ # this happens with newer requests versions: ++ # https://github.com/linkcheck/linkchecker/issues/76 ++ return None + if raw_connection.sock is None: + # sometimes the socket is not yet connected + # see https://github.com/kennethreitz/requests/issues/1966 +@@ -204,7 +208,10 @@ def _add_ssl_info(self): + """Add SSL cipher info.""" + if self.scheme == u'https': + sock = self._get_ssl_sock() +- if hasattr(sock, 'cipher'): ++ if not sock: ++ log.debug(LOG_CHECK, "cannot extract SSL certificate from connection") ++ self.ssl_cert = None ++ elif hasattr(sock, 'cipher'): + self.ssl_cert = sock.getpeercert() + else: + # using pyopenssl diff --git a/net-analyzer/linkchecker/linkchecker-9.3.1-r1.ebuild b/net-analyzer/linkchecker/linkchecker-9.3.1-r1.ebuild new file mode 100644 index 000000000000..109499f785bb --- /dev/null +++ b/net-analyzer/linkchecker/linkchecker-9.3.1-r1.ebuild @@ -0,0 +1,76 @@ +# Copyright 1999-2018 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +EAPI=6 + +PYTHON_COMPAT=( python2_7 ) +PYTHON_REQ_USE="sqlite?" + +inherit bash-completion-r1 distutils-r1 eutils multilib + +DESCRIPTION="Check websites for broken links" +HOMEPAGE="https://github.com/linkcheck/linkchecker" +SRC_URI="https://github.com/linkcheck/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~amd64 ~x86 ~ppc-macos ~x64-solaris" +IUSE="gnome sqlite X" + +RDEPEND=" + virtual/python-dnspython[${PYTHON_USEDEP}] + dev-python/requests[${PYTHON_USEDEP}] + gnome? ( dev-python/pygtk:2[${PYTHON_USEDEP}] ) + X? ( + dev-python/PyQt4[X,help,${PYTHON_USEDEP}] + dev-python/qscintilla-python[qt4(+),${PYTHON_USEDEP}] + )" +DEPEND=" + X? ( + dev-qt/qthelp:4 + dev-python/markdown2[${PYTHON_USEDEP}] + )" + +RESTRICT="test" + +python_prepare_all() { + local PATCHES=( + "${FILESDIR}/${PN}-9.2-unbundle.patch" + "${FILESDIR}/${PN}-9.3-bash-completion.patch" + "${FILESDIR}/${PN}-9.3-desktop.patch" + "${FILESDIR}/${PN}-9.3.1-build-fix.patch" + "${FILESDIR}/${PN}-9.3.1-requests.patch" + ) + + distutils-r1_python_prepare_all +} + +python_install_all() { + DOCS=( + doc/upgrading.txt + doc/python3.txt + doc/changelog.txt + doc/development.txt + ) + distutils-r1_python_install_all + if ! use X; then + delete_gui() { + rm -rf \ + "${ED}"/usr/bin/linkchecker-gui* \ + "${ED}"/$(python_get_sitedir)/linkcheck/gui* || die + } + python_foreach_impl delete_gui + rm -f "${ED}"/usr/share/applications/linkchecker*.desktop || die + fi + + rm -f "${ED}"/usr/share/applications/linkchecker.desktop || die + + newicon doc/html/logo64x64.png ${PN}.png + + docinto html + dodoc doc/html/* + newbashcomp config/linkchecker-completion ${PN} + optfeature "bash-completion support" dev-python/argcomplete[${PYTHON_USEDEP}] + optfeature "Virus scanning" app-antivirus/clamav + optfeature "Geo IP support" dev-python/geoip-python[${PYTHON_USEDEP}] +} diff --git a/net-analyzer/linkchecker/linkchecker-9.3.1.ebuild b/net-analyzer/linkchecker/linkchecker-9.3.1.ebuild deleted file mode 100644 index 512db84e331a..000000000000 --- a/net-analyzer/linkchecker/linkchecker-9.3.1.ebuild +++ /dev/null @@ -1,75 +0,0 @@ -# Copyright 1999-2017 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -PYTHON_COMPAT=( python2_7 ) -PYTHON_REQ_USE="sqlite?" - -inherit bash-completion-r1 distutils-r1 eutils multilib - -DESCRIPTION="Check websites for broken links" -HOMEPAGE="https://github.com/linkcheck/linkchecker" -SRC_URI="https://github.com/linkcheck/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~amd64 ~x86 ~ppc-macos ~x64-solaris" -IUSE="gnome sqlite X" - -RDEPEND=" - virtual/python-dnspython[${PYTHON_USEDEP}] -