Grab fix from upstream for progress bar assert failure in some locales #208484 by...

Package-Manager: portage-2.2_pre2

diff --git a/net-misc/wget/ChangeLog b/net-misc/wget/ChangeLog
index 3b13c12f17b74960abd27e91698d78c8c64297e3..3784911ed0d6562c42356f6c2d51eb1e83667e95 100644 (file)
--- a/net-misc/wget/ChangeLog
+++ b/net-misc/wget/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for net-misc/wget
 # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/wget/ChangeLog,v 1.91 2008/01/28 17:36:04 pva Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/wget/ChangeLog,v 1.92 2008/02/16 22:12:23 vapier Exp $
+
+*wget-1.11-r1 (16 Feb 2008)
+
+  16 Feb 2008; Mike Frysinger <vapier@gentoo.org>
+  +files/wget-1.11-progress-bar-assert.patch, +wget-1.11-r1.ebuild:
+  Grab fix from upstream for progress bar assert failure in some locales
+  #208484 by Maxim Britov.
 
   28 Jan 2008; <pva@gentoo.org> wget-1.10.2.ebuild, wget-1.11.ebuild:
   License changed to GPL-3, thank you Winterheart for report, quotation fix.

diff --git a/net-misc/wget/Manifest b/net-misc/wget/Manifest
index f6bd2434733a74b6a4630771263db9bde9966886..f5fe433c49eea8dd23c3fdfc46100500b40097e3 100644 (file)
--- a/net-misc/wget/Manifest
+++ b/net-misc/wget/Manifest
@@ -1,4 +1,8 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX wget-1.11-linking.patch 4935 RMD160 4285dd7325f29ac49edd5c42853c9f09b683b844 SHA1 2ae2e3202daa7ed0c4f33bd005469ab7c558ae7d SHA256 3f3a1b6ec439ba042c3da92cca04990e71ff4894ffc04d2d52a3186194665171
+AUX wget-1.11-progress-bar-assert.patch 366 RMD160 af5f5c0f06b7c94ccc925d80dca0b688decfdb2d SHA1 c002b9db3bb210c9bc93f420fe341199077fc489 SHA256 b418b405e87498fd51d925297b8606da61464ed7e502af116db45c552674ac63
 AUX wgetrc-ipv6 54 RMD160 62ef29e13163463d42934b2ee970e235e64249dc SHA1 35a259c6817cccd04f23c56c9fd5b915f5f0fa00 SHA256 21bae947f1f94b09d2bf50704e1a69d7e90ee59898fd512c146d24e408d1a518
 DIST wget-1.10.2-gentoo-0.2.tar.bz2 4777 RMD160 678649734bd03962e1b61605f7da588b62c46342 SHA1 f7312f65893282276872ac519b4609a48eb510ef SHA256 8adddaa841895854fc997561c24f1963b9e3a0cc239e0260b43361d1435e6882
 DIST wget-1.10.2.tar.gz 1213056 RMD160 2969f534ad811034048f3558b975c6452883ebda SHA1 a258357297959964fd42fed6afa1a4cce9069980 SHA256 a83419494813209af670c4d3073a75640a9a52bdb5b89a0eb9096ed8bbaf1262
@@ -6,7 +10,14 @@ DIST wget-1.11.tar.bz2 930167 RMD160 b7f34013e53970299b0d80c22bdcbbf5f93f8eb7 SH
 DIST wget-1.9.1-gentoo-0.4.tar.bz2 37430 RMD160 10da86db2c3d6340da59650eaff1d3dccc7aa6a1 SHA1 1464ceb1f20c89f2cc7f7c05e7814d4413295977 SHA256 ca66b31da2bec760a4d3f884a424d770ac7df1c317b9a4cceed3260d0a60a51a
 DIST wget-1.9.1.tar.gz 1322378 RMD160 46db7bd647f7482a1066bac10fb0836f70e7832f SHA1 0597a4f47b056e3e60cf7d08c9409d67358e7099 SHA256 69044b87c517b986dbc17a5f7e4de430cb56e605330c19c6bb0d384d5c37e638
 EBUILD wget-1.10.2.ebuild 1851 RMD160 dd3651e28f179f8e275a9478cd933f6aefb3843d SHA1 5738da384744447840e3f4cad4b10eed14807359 SHA256 4a9c2ccd05eb77a8f1388a697d466559042cd2da0723678ed5bff67f1b78212d
-EBUILD wget-1.11.ebuild 1900 RMD160 317378d1073d2b40ab06739e9aac4d1f4cf2c0a3 SHA1 b63c29394383955466f85d50f9907e472f398c1d SHA256 28c1bbde2fca0dee60777dd72173c7f890aecef6a6a1d17e5d1ab0547ac77a9a
+EBUILD wget-1.11-r1.ebuild 1967 RMD160 ab1ea66769a35a85dd72bdeff1867dd7d3acb454 SHA1 5f5bdbabc6cbc93c0a423d43ed1213f755b49a64 SHA256 37cf508196372e695056c53311875aa4d6d3345185dab1c0f74988d4cd55da95
 EBUILD wget-1.9.1-r5.ebuild 1616 RMD160 4e7dfec61ff2f37de8d8dce703271a82562c6472 SHA1 4179df695ce27f2cd732fa001b2ade4cff7ba4a5 SHA256 33e5408ea0c3a15ee58d870affa9d07456d75cef9d81d096a20bd1bca3658e6d
-MISC ChangeLog 14508 RMD160 a49204f8d0558badec0aeced11df03a9678c3ba3 SHA1 d26e888703570dcbbacb06cb64fd33238f8415c0 SHA256 1dd645538e1e31c24577e96e674e0f64c7bed4d08aa3c9b1bf181fe209d5366c
+MISC ChangeLog 14759 RMD160 023b3ac656996a76f60229f9aef4583dded94e7d SHA1 00ccd098d4d66f3a0d3cd9e62fb7c50dcaa67fd7 SHA256 44e0352479862c7e58797a9c68081fdb6d1ad5bfcb9994159e50ff142c6f1850
 MISC metadata.xml 165 RMD160 e3b6f95d509697d06b5f2542a762765d1cdddcf8 SHA1 20a8b2455edbeeaea061b6ca712985e159b56740 SHA256 0ea65a43560f42b54fd7f3146bef9c3ef61acbf12d1f0f5289ae36a386138a1e
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.7 (GNU/Linux)
+
+iD8DBQFHt1/Nj9hvisErhMIRArQUAKCHYSoDDnDQpmoRk0JJPON7Pul1/gCg5nAZ
+F3OIcbFskdFlb3ikPOyzzuY=
+=V2Al
+-----END PGP SIGNATURE-----

diff --git a/net-misc/wget/files/wget-1.11-progress-bar-assert.patch b/net-misc/wget/files/wget-1.11-progress-bar-assert.patch
new file mode 100644 (file)
index 0000000..8a11dde
--- /dev/null
+++ b/net-misc/wget/files/wget-1.11-progress-bar-assert.patch
@@ -0,0 +1,15 @@
+fix from upstream for a progress bar error in some locales
+
+http://bugs.gentoo.org/208484
+
+--- src/progress.c     2008-01-26 11:26:58.000000000 +0200
++++ src/progress.c     2008-02-11 10:12:42.000000000 +0200
+@@ -969,8 +969,6 @@
+       move_to_end (p);
+     }
+ 
+-  assert (p - bp->buffer <= bp->width);
+-
+   while (p < bp->buffer + bp->width)
+     *p++ = ' ';
+   *p = '\0';

diff --git a/net-misc/wget/wget-1.11-r1.ebuild b/net-misc/wget/wget-1.11-r1.ebuild
new file mode 100644 (file)
index 0000000..7489af4
--- /dev/null
+++ b/net-misc/wget/wget-1.11-r1.ebuild
@@ -0,0 +1,68 @@
+# Copyright 1999-2008 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-misc/wget/wget-1.11-r1.ebuild,v 1.1 2008/02/16 22:12:23 vapier Exp $
+
+inherit eutils flag-o-matic
+
+DESCRIPTION="Network utility to retrieve files from the WWW"
+HOMEPAGE="http://www.gnu.org/software/wget/"
+SRC_URI="mirror://gnu/wget/${P}.tar.bz2"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~sparc-fbsd ~x86 ~x86-fbsd"
+IUSE="debug ipv6 nls socks5 ssl static"
+
+RDEPEND="ssl? ( >=dev-libs/openssl-0.9.6b )
+       socks5? ( net-proxy/dante )"
+DEPEND="${RDEPEND}
+       nls? ( sys-devel/gettext )"
+
+src_unpack() {
+       unpack ${A}
+       cd "${S}"
+       epatch "${FILESDIR}"/${P}-linking.patch
+       epatch "${FILESDIR}"/${P}-progress-bar-assert.patch #208484
+}
+
+src_compile() {
+       # openssl-0.9.8 now builds with -pthread on the BSD's
+       use elibc_FreeBSD && use ssl && append-ldflags -pthread
+
+       use static && append-ldflags -static
+       econf \
+               $(use_with ssl) $(use_enable ssl opie) $(use_enable ssl digest) \
+               $(use_enable ipv6) \
+               $(use_enable nls) \
+               $(use_enable debug) \
+               $(use_with socks5 socks) \
+               || die
+       emake || die
+}
+
+src_install() {
+       emake DESTDIR="${D}" install || die
+       dodoc AUTHORS ChangeLog* MAILING-LIST NEWS README
+       dodoc doc/sample.wgetrc
+
+       use ipv6 && cat "${FILESDIR}"/wgetrc-ipv6 >> "${D}"/etc/wgetrc
+
+       sed -i \
+               -e 's:/usr/local/etc:/etc:g' \
+               "${D}"/etc/wgetrc \
+               "${D}"/usr/share/man/man1/wget.1 \
+               "${D}"/usr/share/info/wget.info
+}
+
+pkg_preinst() {
+       ewarn "The /etc/wget/wgetrc file has been relocated to /etc/wgetrc"
+       if [[ -e ${ROOT}/etc/wget/wgetrc ]] ; then
+               if [[ -e ${ROOT}/etc/wgetrc ]] ; then
+                       ewarn "You have both /etc/wget/wgetrc and /etc/wgetrc ... you should delete the former"
+               else
+                       einfo "Moving /etc/wget/wgetrc to /etc/wgetrc for you"
+                       mv "${ROOT}"/etc/wget/wgetrc "${ROOT}"/etc/wgetrc
+                       rmdir "${ROOT}"/etc/wget 2>/dev/null
+               fi
+       fi
+}