diff options
| author |   Wolfram Schlich <wschlich@gentoo.org> | 2012-12-04 22:12:37 +0000 |
|---|---|---|
| committer | Wolfram Schlich <wschlich@gentoo.org> | 2012-12-04 22:12:37 +0000 |
| commit | 5fad268900e7da24ed9df1c84f8b53ad09e758d2 (patch) | |
| tree | 52f354510d7ec968c3a49069fe1de311bd9d15f3 /sys-block/mbuffer | |
| parent | Add IUSE default (-) on recently removed qt-static USE flag from skype, bug ... (diff) | |
| download | gentoo-2-5fad268900e7da24ed9df1c84f8b53ad09e758d2.tar.gz gentoo-2-5fad268900e7da24ed9df1c84f8b53ad09e758d2.tar.bz2 gentoo-2-5fad268900e7da24ed9df1c84f8b53ad09e758d2.zip | |
add patch for test phase
(Portage version: 2.2.0_alpha136/cvs/Linux x86_64)
Diffstat (limited to 'sys-block/mbuffer')
| -rw-r--r-- | sys-block/mbuffer/ChangeLog | 6 | ||||
| -rw-r--r-- | sys-block/mbuffer/files/mbuffer-20121111-resolv-multi-order-issue.patch | 21 | ||||
| -rw-r--r-- | sys-block/mbuffer/mbuffer-20121111.ebuild | 7 |
3 files changed, 32 insertions, 2 deletions
diff --git a/sys-block/mbuffer/ChangeLog b/sys-block/mbuffer/ChangeLog index a8480361a69a..3fd085427632 100644 --- a/sys-block/mbuffer/ChangeLog +++ b/sys-block/mbuffer/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for sys-block/mbuffer # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/sys-block/mbuffer/ChangeLog,v 1.29 2012/12/04 19:47:42 wschlich Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-block/mbuffer/ChangeLog,v 1.30 2012/12/04 22:12:37 wschlich Exp $ + + 04 Dec 2012; Wolfram Schlich <wschlich@gentoo.org> mbuffer-20121111.ebuild, + +files/mbuffer-20121111-resolv-multi-order-issue.patch: + add patch for test phase 04 Dec 2012; Wolfram Schlich <wschlich@gentoo.org> mbuffer-20121111.ebuild: version bump, minor cleanup diff --git a/sys-block/mbuffer/files/mbuffer-20121111-resolv-multi-order-issue.patch b/sys-block/mbuffer/files/mbuffer-20121111-resolv-multi-order-issue.patch new file mode 100644 index 000000000000..08e0b83441b5 --- /dev/null +++ b/sys-block/mbuffer/files/mbuffer-20121111-resolv-multi-order-issue.patch @@ -0,0 +1,21 @@ +diff -u mbuffer-20121111.orig/Makefile.in mbuffer-20121111/Makefile.in +--- mbuffer-20121111.orig/Makefile.in 2012-11-16 11:17:11.000000000 +0100 ++++ mbuffer-20121111/Makefile.in 2012-12-04 22:43:00.186863737 +0100 +@@ -77,7 +77,7 @@ + ./mbuffer -q -I :8000 -o $@.tar -o - | openssl md5 > $@.md5 & \ + sleep 1; \ + rm -f $@.tar; \ +- ./mbuffer -i test.tar -o /dev/null -O localhost:8000 -H; \ ++ ./mbuffer -i test.tar -o /dev/null -O 127.0.0.1:8000 -H; \ + wait + sync + diff $@.md5 test.md5 +@@ -92,7 +92,7 @@ + ./mbuffer -q -6 -I :8000 | openssl md5 > $@.md5 & \ + sleep 1; \ + rm -f $@.tar; \ +- ./mbuffer -i test.tar -o /dev/null -6 -O localhost:8000 -o $@.tar -H; \ ++ ./mbuffer -i test.tar -o /dev/null -6 -O ::1:8000 -o $@.tar -H; \ + wait + sync + diff $@.md5 test.md5 diff --git a/sys-block/mbuffer/mbuffer-20121111.ebuild b/sys-block/mbuffer/mbuffer-20121111.ebuild index 0b789ce2541e..31b2a6e3f50c 100644 --- a/sys-block/mbuffer/mbuffer-20121111.ebuild +++ b/sys-block/mbuffer/mbuffer-20121111.ebuild @@ -1,9 +1,11 @@ # Copyright 1999-2012 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sys-block/mbuffer/mbuffer-20121111.ebuild,v 1.2 2012/12/04 19:47:42 wschlich Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-block/mbuffer/mbuffer-20121111.ebuild,v 1.3 2012/12/04 22:12:37 wschlich Exp $ EAPI="4" +inherit eutils + DESCRIPTION="M(easuring)buffer is a replacement for buffer with additional functionality" HOMEPAGE="http://www.maier-komor.de/mbuffer.html" SRC_URI="http://www.maier-komor.de/software/mbuffer/${P}.tgz" @@ -18,6 +20,9 @@ RDEPEND="${DEPEND}" src_prepare() { ln -s "${DISTDIR}"/${P}.tgz test.tar #258881 + # work around "multi off" in /etc/host.conf and "::1 localhost" + # *not* being the *first* "localhost" entry in /etc/hosts + epatch "${FILESDIR}/${P}-resolv-multi-order-issue.patch" } src_configure() { |