From 08bb86fb332c5a90aa41e52d0a609a2fb4ca57da Mon Sep 17 00:00:00 2001 From: Pacho Ramos Date: Mon, 18 Feb 2019 22:17:59 +0100 Subject: net-analyzer/linkchecker: Drop old Package-Manager: Portage-2.3.61, Repoman-2.3.12 Signed-off-by: Pacho Ramos --- net-analyzer/linkchecker/Manifest | 1 - .../files/linkchecker-9.2-unbundle.patch | 30 ---------- .../files/linkchecker-9.3.1-build-fix.patch | 14 ----- .../files/linkchecker-9.3.1-requests.patch | 46 --------------- .../linkchecker/linkchecker-9.3.1-r1.ebuild | 69 ---------------------- 5 files changed, 160 deletions(-) delete mode 100644 net-analyzer/linkchecker/files/linkchecker-9.2-unbundle.patch delete mode 100644 net-analyzer/linkchecker/files/linkchecker-9.3.1-build-fix.patch delete mode 100644 net-analyzer/linkchecker/files/linkchecker-9.3.1-requests.patch delete mode 100644 net-analyzer/linkchecker/linkchecker-9.3.1-r1.ebuild diff --git a/net-analyzer/linkchecker/Manifest b/net-analyzer/linkchecker/Manifest index 667d05c1cc11..b02b528ba45e 100644 --- a/net-analyzer/linkchecker/Manifest +++ b/net-analyzer/linkchecker/Manifest @@ -1,2 +1 @@ -DIST linkchecker-9.3.1.tar.gz 779286 BLAKE2B eec374a3455b5348533b29b03ab14558dd19a20e1058947eed9d8027a8b1705b63525e6b8fcf2c4feb59a782ca0e0ad8567e321ca4679320e9d6f256e14df990 SHA512 355c9d262502e123732807b5aaabc17060d267de44a6dc1fee9dd6655c56320ded0c1ff638d985c2dbec366d15803cfb78fae4c1a9943de11c5b4292f5a99305 DIST linkchecker-9.4.0.tar.gz 489909 BLAKE2B 1c9d9af96778f9d2b542a078ba9da8751d6f7bc170809d5eefef6e8e2d5587e969f1cba3d6ae116b6de981949dd638b0d78fc416ce5055b3156da308b5a95d67 SHA512 3423f710a46d921c4387ffcfe1a8632cb889bcfdb4d56cbabcae87ca41547221e854546efd6e440e798ea85531c34a35f3ab779cd6bc2b6e63095015ad0537ba diff --git a/net-analyzer/linkchecker/files/linkchecker-9.2-unbundle.patch b/net-analyzer/linkchecker/files/linkchecker-9.2-unbundle.patch deleted file mode 100644 index 598f856b0007..000000000000 --- a/net-analyzer/linkchecker/files/linkchecker-9.2-unbundle.patch +++ /dev/null @@ -1,30 +0,0 @@ - setup.py | 7 ------- - 1 file changed, 7 deletions(-) - -diff --git a/setup.py b/setup.py -old mode 100755 -new mode 100644 -index dc30a7d..d62622b ---- a/setup.py -+++ b/setup.py -@@ -900,9 +900,6 @@ o a command line, GUI and web interface - 'py2exe': MyPy2exe, - 'py2app': MyPy2app, - }, -- package_dir = { -- 'linkcheck_dns.dns': 'third_party/dnspython/dns', -- }, - packages = [ - 'linkcheck', - 'linkcheck.bookmarks', -@@ -917,10 +914,6 @@ o a command line, GUI and web interface - 'linkcheck.network', - 'linkcheck.parser', - 'linkcheck.plugins', -- 'linkcheck_dns.dns', -- 'linkcheck_dns.dns.rdtypes', -- 'linkcheck_dns.dns.rdtypes.ANY', -- 'linkcheck_dns.dns.rdtypes.IN', - ], - ext_modules = [ - Extension('linkcheck.HtmlParser.htmlsax', diff --git a/net-analyzer/linkchecker/files/linkchecker-9.3.1-build-fix.patch b/net-analyzer/linkchecker/files/linkchecker-9.3.1-build-fix.patch deleted file mode 100644 index bcfd2cc800e4..000000000000 --- a/net-analyzer/linkchecker/files/linkchecker-9.3.1-build-fix.patch +++ /dev/null @@ -1,14 +0,0 @@ -diff --git a/setup.py b/setup.py -index b42ed8c..ec206e6 100755 ---- a/setup.py -+++ b/setup.py -@@ -654,8 +654,7 @@ myemail = "bastian.kleineidam@web.de" - - data_files = [ - ('share/linkchecker', -- ['config/linkcheckerrc', -- 'doc/html/lccollection.qhc', 'doc/html/lcdoc.qch']), -+ ['config/linkcheckerrc']), - ('share/linkchecker/examples', - ['cgi-bin/lconline/leer.html.en', - 'cgi-bin/lconline/leer.html.de', diff --git a/net-analyzer/linkchecker/files/linkchecker-9.3.1-requests.patch b/net-analyzer/linkchecker/files/linkchecker-9.3.1-requests.patch deleted file mode 100644 index 56c57fa37997..000000000000 --- a/net-analyzer/linkchecker/files/linkchecker-9.3.1-requests.patch +++ /dev/null @@ -1,46 +0,0 @@ -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 deleted file mode 100644 index dd72dc62cfd6..000000000000 --- a/net-analyzer/linkchecker/linkchecker-9.3.1-r1.ebuild +++ /dev/null @@ -1,69 +0,0 @@ -# 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 - -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" - -RDEPEND=" - dev-python/requests[${PYTHON_USEDEP}] - virtual/python-dnspython[${PYTHON_USEDEP}] - gnome? ( dev-python/pygtk:2[${PYTHON_USEDEP}] ) -" -DEPEND="" - -RESTRICT="test" - -python_prepare_all() { - local PATCHES=( - "${FILESDIR}/${PN}-9.2-unbundle.patch" - "${FILESDIR}/${PN}-9.3-bash-completion.patch" - "${FILESDIR}/${PN}-9.3.1-build-fix.patch" - "${FILESDIR}/${PN}-9.3.1-requests.patch" - ) - - distutils-r1_python_prepare_all -} - -python_install_all() { - delete_gui() { - rm -rf \ - "${ED}"/usr/bin/linkchecker-gui* \ - "${ED}"/$(python_get_sitedir)/linkcheck/gui* || die - } - - DOCS=( - doc/upgrading.txt - doc/python3.txt - doc/changelog.txt - doc/development.txt - ) - distutils-r1_python_install_all - - python_foreach_impl delete_gui - 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} -} - -pkg_postinst() { - 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}] -} -- cgit v1.2.3