From c1839c97223aa60fa40c2812c5fe625df2b60564 Mon Sep 17 00:00:00 2001 From: Thomas Deutschmann Date: Wed, 14 Nov 2018 14:23:37 +0100 Subject: net-misc/wget: fix dot-prefixed domain matching Reported-by: Henning Schild Closes: https://github.com/gentoo/gentoo/pull/10416 Package-Manager: Portage-2.3.51, Repoman-2.3.12 RepoMan-Options: --force Signed-off-by: Thomas Deutschmann --- ...t-1.19.5-fix-dot-prefixed-domain-matching.patch | 33 ++++++ net-misc/wget/wget-1.19.5-r1.ebuild | 119 +++++++++++++++++++++ net-misc/wget/wget-1.19.5.ebuild | 117 -------------------- 3 files changed, 152 insertions(+), 117 deletions(-) create mode 100644 net-misc/wget/files/wget-1.19.5-fix-dot-prefixed-domain-matching.patch create mode 100644 net-misc/wget/wget-1.19.5-r1.ebuild delete mode 100644 net-misc/wget/wget-1.19.5.ebuild (limited to 'net-misc/wget') diff --git a/net-misc/wget/files/wget-1.19.5-fix-dot-prefixed-domain-matching.patch b/net-misc/wget/files/wget-1.19.5-fix-dot-prefixed-domain-matching.patch new file mode 100644 index 000000000000..129f0b675414 --- /dev/null +++ b/net-misc/wget/files/wget-1.19.5-fix-dot-prefixed-domain-matching.patch @@ -0,0 +1,33 @@ +From fd85ac9cc623847e9d94d9f9241ab34e2c146cbf Mon Sep 17 00:00:00 2001 +From: Luiz Angelo Daros de Luca +Date: Thu, 25 Oct 2018 17:39:52 -0300 +Subject: [PATCH] * src/host.c (sufmatch): Fix dot-prefixed domain matching + +Current sufmatch does not match when domain is dot-prefixed. +The example of no_proxy in man (.mit.edu) does use a dot-prefixed +domain. + +Signed-off-by: Luiz Angelo Daros de Luca +Copyright-paperwork-exempt: Yes +--- + src/host.c | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +diff --git a/src/host.c b/src/host.c +index b42cd6e8..2bf848f3 100644 +--- a/src/host.c ++++ b/src/host.c +@@ -1033,8 +1033,9 @@ sufmatch (const char **list, const char *what) + /* Domain or subdomain match + * k == -1: exact match + * k >= 0 && what[k] == '.': subdomain match ++ * k >= 0 && list[i][0] == '.': dot-prefixed subdomain match + */ +- if (j == -1 && (k == -1 || what[k] == '.')) ++ if (j == -1 && (k == -1 || what[k] == '.' || list[i][0] == '.')) + return true; + } + +-- +2.18.1 + diff --git a/net-misc/wget/wget-1.19.5-r1.ebuild b/net-misc/wget/wget-1.19.5-r1.ebuild new file mode 100644 index 000000000000..6db7c1194b03 --- /dev/null +++ b/net-misc/wget/wget-1.19.5-r1.ebuild @@ -0,0 +1,119 @@ +# Copyright 1999-2018 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=6 + +PYTHON_COMPAT=( python3_{4,5,6} ) + +inherit flag-o-matic python-any-r1 toolchain-funcs + +DESCRIPTION="Network utility to retrieve files from the WWW" +HOMEPAGE="https://www.gnu.org/software/wget/" +SRC_URI="mirror://gnu/wget/${P}.tar.gz" + +LICENSE="GPL-3" +SLOT="0" +KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" +IUSE="debug gnutls idn ipv6 libressl nls ntlm pcre +ssl static test uuid zlib" +REQUIRED_USE=" ntlm? ( !gnutls ssl ) gnutls? ( ssl )" + +# Force a newer libidn2 to avoid libunistring deps. #612498 +LIB_DEPEND=" + idn? ( >=net-dns/libidn2-0.14[static-libs(+)] ) + pcre? ( dev-libs/libpcre[static-libs(+)] ) + ssl? ( + gnutls? ( net-libs/gnutls:0=[static-libs(+)] ) + !gnutls? ( + !libressl? ( dev-libs/openssl:0=[static-libs(+)] ) + libressl? ( dev-libs/libressl:0=[static-libs(+)] ) + ) + ) + uuid? ( sys-apps/util-linux[static-libs(+)] ) + zlib? ( sys-libs/zlib[static-libs(+)] ) +" +RDEPEND="!static? ( ${LIB_DEPEND//\[static-libs(+)]} )" +DEPEND=" + ${RDEPEND} + app-arch/xz-utils + virtual/pkgconfig + static? ( ${LIB_DEPEND} ) + test? ( + ${PYTHON_DEPS} + dev-lang/perl + dev-perl/HTTP-Daemon + dev-perl/HTTP-Message + dev-perl/IO-Socket-SSL + ) + nls? ( sys-devel/gettext ) +" + +DOCS=( AUTHORS MAILING-LIST NEWS README doc/sample.wgetrc ) + +PATCHES=( "${FILESDIR}"/${P}-fix-dot-prefixed-domain-matching.patch ) + +pkg_setup() { + use test && python-any-r1_pkg_setup +} + +src_prepare() { + default + + # revert some hack that breaks linking, bug #585924 + if [[ ${CHOST} == *-darwin* ]] \ + || [[ ${CHOST} == *-solaris* ]] \ + || [[ ${CHOST} == *-uclibc* ]] \ + || [[ ${CHOST} == *-cygwin* ]] \ + ; then + sed -i \ + -e 's/^ LIBICONV=$/:/' \ + configure || die + fi +} + +src_configure() { + # fix compilation on Solaris, we need filio.h for FIONBIO as used in + # the included gnutls -- force ioctl.h to include this header + [[ ${CHOST} == *-solaris* ]] && append-cppflags -DBSD_COMP=1 + + if use static ; then + append-ldflags -static + tc-export PKG_CONFIG + PKG_CONFIG+=" --static" + fi + + # There is no flag that controls this. libunistring-prefix only + # controls the search path (which is why we turn it off below). + # Further, libunistring is only needed w/older libidn2 installs, + # and since we force the latest, we can force off libunistring. #612498 + local myeconfargs=( + --disable-assert + --disable-rpath + --without-included-libunistring + --without-libunistring-prefix + $(use_enable debug) + $(use_enable idn iri) + $(use_enable ipv6) + $(use_enable nls) + $(use_enable ntlm) + $(use_enable pcre) + $(use_enable ssl digest) + $(use_enable ssl opie) + $(use_with idn libidn) + $(use_with ssl ssl $(usex gnutls gnutls openssl)) + $(use_with uuid libuuid) + $(use_with zlib) + ) + ac_cv_libunistring=no \ + econf "${myeconfargs[@]}" +} + +src_install() { + default + + sed -i \ + -e "s:/usr/local/etc:${EPREFIX}/etc:g" \ + "${ED%/}"/etc/wgetrc \ + "${ED%/}"/usr/share/man/man1/wget.1 \ + "${ED%/}"/usr/share/info/wget.info \ + || die +} diff --git a/net-misc/wget/wget-1.19.5.ebuild b/net-misc/wget/wget-1.19.5.ebuild deleted file mode 100644 index 15bbc3803482..000000000000 --- a/net-misc/wget/wget-1.19.5.ebuild +++ /dev/null @@ -1,117 +0,0 @@ -# Copyright 1999-2018 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -PYTHON_COMPAT=( python3_{4,5,6} ) - -inherit flag-o-matic python-any-r1 toolchain-funcs - -DESCRIPTION="Network utility to retrieve files from the WWW" -HOMEPAGE="https://www.gnu.org/software/wget/" -SRC_URI="mirror://gnu/wget/${P}.tar.gz" - -LICENSE="GPL-3" -SLOT="0" -KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" -IUSE="debug gnutls idn ipv6 libressl nls ntlm pcre +ssl static test uuid zlib" -REQUIRED_USE=" ntlm? ( !gnutls ssl ) gnutls? ( ssl )" - -# Force a newer libidn2 to avoid libunistring deps. #612498 -LIB_DEPEND=" - idn? ( >=net-dns/libidn2-0.14[static-libs(+)] ) - pcre? ( dev-libs/libpcre[static-libs(+)] ) - ssl? ( - gnutls? ( net-libs/gnutls:0=[static-libs(+)] ) - !gnutls? ( - !libressl? ( dev-libs/openssl:0=[static-libs(+)] ) - libressl? ( dev-libs/libressl:0=[static-libs(+)] ) - ) - ) - uuid? ( sys-apps/util-linux[static-libs(+)] ) - zlib? ( sys-libs/zlib[static-libs(+)] ) -" -RDEPEND="!static? ( ${LIB_DEPEND//\[static-libs(+)]} )" -DEPEND=" - ${RDEPEND} - app-arch/xz-utils - virtual/pkgconfig - static? ( ${LIB_DEPEND} ) - test? ( - ${PYTHON_DEPS} - dev-lang/perl - dev-perl/HTTP-Daemon - dev-perl/HTTP-Message - dev-perl/IO-Socket-SSL - ) - nls? ( sys-devel/gettext ) -" - -DOCS=( AUTHORS MAILING-LIST NEWS README doc/sample.wgetrc ) - -pkg_setup() { - use test && python-any-r1_pkg_setup -} - -src_prepare() { - default - - # revert some hack that breaks linking, bug #585924 - if [[ ${CHOST} == *-darwin* ]] \ - || [[ ${CHOST} == *-solaris* ]] \ - || [[ ${CHOST} == *-uclibc* ]] \ - || [[ ${CHOST} == *-cygwin* ]] \ - ; then - sed -i \ - -e 's/^ LIBICONV=$/:/' \ - configure || die - fi -} - -src_configure() { - # fix compilation on Solaris, we need filio.h for FIONBIO as used in - # the included gnutls -- force ioctl.h to include this header - [[ ${CHOST} == *-solaris* ]] && append-cppflags -DBSD_COMP=1 - - if use static ; then - append-ldflags -static - tc-export PKG_CONFIG - PKG_CONFIG+=" --static" - fi - - # There is no flag that controls this. libunistring-prefix only - # controls the search path (which is why we turn it off below). - # Further, libunistring is only needed w/older libidn2 installs, - # and since we force the latest, we can force off libunistring. #612498 - local myeconfargs=( - --disable-assert - --disable-rpath - --without-included-libunistring - --without-libunistring-prefix - $(use_enable debug) - $(use_enable idn iri) - $(use_enable ipv6) - $(use_enable nls) - $(use_enable ntlm) - $(use_enable pcre) - $(use_enable ssl digest) - $(use_enable ssl opie) - $(use_with idn libidn) - $(use_with ssl ssl $(usex gnutls gnutls openssl)) - $(use_with uuid libuuid) - $(use_with zlib) - ) - ac_cv_libunistring=no \ - econf "${myeconfargs[@]}" -} - -src_install() { - default - - sed -i \ - -e "s:/usr/local/etc:${EPREFIX}/etc:g" \ - "${ED%/}"/etc/wgetrc \ - "${ED%/}"/usr/share/man/man1/wget.1 \ - "${ED%/}"/usr/share/info/wget.info \ - || die -} -- cgit v1.2.3-65-gdbad