net-misc/wget: Security cleanup (bug #612326)
authorThomas Deutschmann <whissi@gentoo.org>
Sat, 17 Jun 2017 21:14:02 +0000 (23:14 +0200)
committerLars Wendler <polynomial-c@gentoo.org>
Sat, 17 Jun 2017 21:36:52 +0000 (23:36 +0200)
Package-Manager: Portage-2.3.5, Repoman-2.3.2
Closes: https://github.com/gentoo/gentoo/pull/4954

net-misc/wget/Manifest
net-misc/wget/files/wget-1.17.1-gnulib-cygwin-sys_select.patch [deleted file]
net-misc/wget/wget-1.18.ebuild [deleted file]
net-misc/wget/wget-1.19.1.ebuild [deleted file]
net-misc/wget/wget-1.19.ebuild [deleted file]

index 21fc31be37faf2ea701e172be8603d22cec1ded3..fb79385186c2045881f06ebdd22c7213013ca63c 100644 (file)
@@ -1,3 +1 @@
-DIST wget-1.18.tar.xz 1922376 SHA256 b5b55b75726c04c06fe253daec9329a6f1a3c0c1878e3ea76ebfebc139ea9cc1 SHA512 a3f6fe2f44a8d797659d55cffaf81eb82b770c96222a0ee29bc4931b13846f8d8b9a07806f2197723c873a1248922d59cca5a81869661d9c6c3107447c184338 WHIRLPOOL a9e467f8bd17909485329103c17a27da345421257ce82fdf77ff2e00bdae50b13570506a1887300868e99b608c71598596ee260d86879aaeddad14cbb5ec634d
 DIST wget-1.19.1.tar.xz 2111756 SHA256 0c950b9671881222a4d385b013c9604e98a8025d1988529dfca0e93617744cd2 SHA512 00864d225439bcb7c5af01d7ef19efa615427812d3320ab3f4c8f62c38191e837b1392397843f935d7dc5860a4d0ce89ee31f2730c4a729402f1f2bf3e5f64e5 WHIRLPOOL 2a4bd80f1e7134637227609f532ee3385472a6895ff22efeface42d082072a09abaa5dd2d8653bfdab015de801d31426b01d73ab5dd1a6864b84c29dc8e72462
-DIST wget-1.19.tar.xz 2075916 SHA256 0f1157bbf4daae19f3e1ddb70c6ccb2067feb834a6aa23c9d9daa7f048606384 SHA512 2dd49d063dc3a210c4959b70ec301bb3ea5c6ba00c9a6407d0b79f8ab5a14534a2a1108b2013ff959e8089f706006d103c8794c6d638b954996873ca3ef481fc WHIRLPOOL 7e272d05713d27d92cd17204adb4824478021c4edebff4bf9c34dda52366adb5afec3897b7571e9533adaca18b7f4b4abdbb75770d1439630dadfd2a9ac13afd
diff --git a/net-misc/wget/files/wget-1.17.1-gnulib-cygwin-sys_select.patch b/net-misc/wget/files/wget-1.17.1-gnulib-cygwin-sys_select.patch
deleted file mode 100644 (file)
index 0755136..0000000
+++ /dev/null
@@ -1,22 +0,0 @@
-https://lists.gnu.org/archive/html/bug-gnulib/2016-03/msg00065.html
-
---- gnulib/lib/sys_select.in.h.orig    2014-08-03 15:31:22.000000000 +0200
-+++ gnulib/lib/sys_select.in.h 2016-05-19 12:57:51.243064700 +0200
-@@ -81,7 +81,7 @@
-    Also, Mac OS X, AIX, HP-UX, IRIX, Solaris, Interix declare select()
-    in <sys/time.h>.
-    But avoid namespace pollution on glibc systems.  */
--# ifndef __GLIBC__
-+# if !(defined __GLIBC__ || defined __NEWLIB__)
- #  include <sys/time.h>
- # endif
- 
-@@ -102,7 +102,7 @@
-    But avoid namespace pollution on glibc systems.
-    Do this after the include_next (for the sake of OpenBSD 5.0) but before
-    the split double-inclusion guard (for the sake of Solaris).  */
--#if !(defined __GLIBC__ && !defined __UCLIBC__)
-+#if !((defined __GLIBC__ || defined __NEWLIB__) && !defined __UCLIBC__)
- # include <signal.h>
- #endif
- 
diff --git a/net-misc/wget/wget-1.18.ebuild b/net-misc/wget/wget-1.18.ebuild
deleted file mode 100644 (file)
index 1637e99..0000000
+++ /dev/null
@@ -1,99 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-
-PYTHON_COMPAT=( python3_4 )
-
-inherit flag-o-matic python-any-r1 toolchain-funcs eutils
-
-DESCRIPTION="Network utility to retrieve files from the WWW"
-HOMEPAGE="https://www.gnu.org/software/wget/"
-SRC_URI="mirror://gnu/wget/${P}.tar.xz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~arm-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 )"
-
-LIB_DEPEND="idn? ( net-dns/libidn[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[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() {
-       epatch "${FILESDIR}"/${PN}-1.17.1-gnulib-cygwin-sys_select.patch
-       # revert some hack that breaks linking, bug #585924
-       if [[ ${CHOST} == *-darwin* ]] || [[ ${CHOST} == *-solaris* ]] || [[ ${CHOST} == *-uclibc* ]]; 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
-       econf \
-               --disable-assert \
-               --disable-rpath \
-               $(use_with ssl ssl $(usex gnutls gnutls openssl)) \
-               $(use_enable ssl opie) \
-               $(use_enable ssl digest) \
-               $(use_enable idn iri) \
-               $(use_enable ipv6) \
-               $(use_enable nls) \
-               $(use_enable ntlm) \
-               $(use_enable pcre) \
-               $(use_enable debug) \
-               $(use_with uuid libuuid) \
-               $(use_with zlib)
-}
-
-src_test() {
-       emake check
-}
-
-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
-}
diff --git a/net-misc/wget/wget-1.19.1.ebuild b/net-misc/wget/wget-1.19.1.ebuild
deleted file mode 100644 (file)
index 9a65682..0000000
+++ /dev/null
@@ -1,99 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-
-PYTHON_COMPAT=( python3_{4,5} )
-
-inherit flag-o-matic python-any-r1 toolchain-funcs eutils
-
-DESCRIPTION="Network utility to retrieve files from the WWW"
-HOMEPAGE="https://www.gnu.org/software/wget/"
-SRC_URI="mirror://gnu/wget/${P}.tar.xz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~arm-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 )"
-
-LIB_DEPEND="idn? ( net-dns/libidn2[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[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() {
-       # revert some hack that breaks linking, bug #585924
-       if [[ ${CHOST} == *-darwin* ]] || [[ ${CHOST} == *-solaris* ]] || [[ ${CHOST} == *-uclibc* ]]; 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
-       econf \
-               --disable-assert \
-               --disable-rpath \
-               $(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)
-}
-
-src_test() {
-       emake check
-}
-
-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
-}
diff --git a/net-misc/wget/wget-1.19.ebuild b/net-misc/wget/wget-1.19.ebuild
deleted file mode 100644 (file)
index 9a65682..0000000
+++ /dev/null
@@ -1,99 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-
-PYTHON_COMPAT=( python3_{4,5} )
-
-inherit flag-o-matic python-any-r1 toolchain-funcs eutils
-
-DESCRIPTION="Network utility to retrieve files from the WWW"
-HOMEPAGE="https://www.gnu.org/software/wget/"
-SRC_URI="mirror://gnu/wget/${P}.tar.xz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~arm-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 )"
-
-LIB_DEPEND="idn? ( net-dns/libidn2[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[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() {
-       # revert some hack that breaks linking, bug #585924
-       if [[ ${CHOST} == *-darwin* ]] || [[ ${CHOST} == *-solaris* ]] || [[ ${CHOST} == *-uclibc* ]]; 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
-       econf \
-               --disable-assert \
-               --disable-rpath \
-               $(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)
-}
-
-src_test() {
-       emake check
-}
-
-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
-}