summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorWolfram Schlich <wschlich@gentoo.org>2012-12-04 22:12:40 +0000
committerWolfram Schlich <wschlich@gentoo.org>2012-12-04 22:12:40 +0000
commit85062ce67f22f257837f38a4ba3b3f444d8df66f (patch)
treea65642011930e0855f96548a45ee4ee99627cb89 /sys-block
parentAdd IUSE default (-) on recently removed qt-static USE flag from skype, bug ... (diff)
downloadhistorical-85062ce67f22f257837f38a4ba3b3f444d8df66f.tar.gz
historical-85062ce67f22f257837f38a4ba3b3f444d8df66f.tar.bz2
historical-85062ce67f22f257837f38a4ba3b3f444d8df66f.zip
add patch for test phase
Package-Manager: portage-2.2.0_alpha136/cvs/Linux x86_64
Diffstat (limited to 'sys-block')
-rw-r--r--sys-block/mbuffer/ChangeLog6
-rw-r--r--sys-block/mbuffer/Manifest5
-rw-r--r--sys-block/mbuffer/files/mbuffer-20121111-resolv-multi-order-issue.patch21
-rw-r--r--sys-block/mbuffer/mbuffer-20121111.ebuild7
4 files changed, 35 insertions, 4 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/Manifest b/sys-block/mbuffer/Manifest
index ea649e3664bc..7907a0d46f65 100644
--- a/sys-block/mbuffer/Manifest
+++ b/sys-block/mbuffer/Manifest
@@ -1,3 +1,4 @@
+AUX mbuffer-20121111-resolv-multi-order-issue.patch 780 SHA256 3d4c2e13eb35da30714daa9032aede1d6d7a8016fe090b3a2f039883f4ccbcbf SHA512 d633b4c5185cbb5eb52cb428002e7227e07819f6d49c9ed353c541c2d9234fe9c1f0c7f40e0a1662e47cd13835927b4eff310aae41181526f68cb7b0174218a4 WHIRLPOOL 7bdb121d8c19361f9a3e998af41e64b552fe3b19e92bc34fe8d9f32cfe14a2e09460c5418592ab2b6762a95dfbfa4f3479be11054226ea3f7b6f26c78b2fbd8e
DIST mbuffer-20090113.tgz 106584 SHA256 f36988cafefe0489839ed183123a940ae688f5074a2bf97982f68df6d65314f0
DIST mbuffer-20110724.tgz 117321 SHA256 7e69db02ce518f8583cd76c4c8b152c86d4b3527124518cbf450b7bc58cd3c74
DIST mbuffer-20120505.tgz 117404 SHA256 c8e828056eef1237b08a0581ba4b99b72f850520e602ebfd03864cfdceefdd47 SHA512 64fbd77e5ae95f500b3ecf9065fba4050e67e5063fc52b6316c41708b311ccdb3a8f7a82f0cc65db6448131664c29cae23f2928a9593d833cb247cca891a71e0 WHIRLPOOL 80af2313dbbdbe2162366ad6c038ec29cb640267f0c5914e9643c66869e22ea03d21240a26314ba69f05a5f58e856c00148d2f98817c56f277b149e8cef934b5
@@ -5,6 +6,6 @@ DIST mbuffer-20121111.tgz 120137 SHA256 38359fc57ffbb874c787f337033c833ebf835bc1
EBUILD mbuffer-20090113.ebuild 919 SHA256 1c59c4a832228a3565b23348c61e825857a0b00d5ff1aa9191130da8a8955663 SHA512 be0dd8b1fde2e05d9a3cfaabd7e778fdea2da43c00bda56eb48aea518676b39dd2e28b4cb9221d300b2e56646782d8143d227c3348e8d618b3b6f314fa2f7778 WHIRLPOOL 1e432623a81c143279b5b68064dac2b7d9d1ce170d7586550333777c45f2696782cefbace57418e2968145d89a88c95f7fcecf07674e39c441b4d06f2c0e1ac9
EBUILD mbuffer-20110724.ebuild 945 SHA256 e4539d1fb443f59eb188bf5377a06278d4509f8fd6ed605cbdc1d3fb319c430d SHA512 62b3e6cbf97ecd214b8e3dd8cb9b7c2fab1dcd915d5bf6284a943d753ed4cabc6ad92ebe0fc2c81096b8041f8e156a9146dd48019cb832b5b8e9b44ed942a79f WHIRLPOOL 66a1ea539ce91bf526ec0a1caf606fb8696023f83277d974715f2ed3af564ea91e25abcb7e7f9cfab55ac11bdd0863d0b190d9ba475cb7df06bafa4e3803999c
EBUILD mbuffer-20120505.ebuild 945 SHA256 3b7ce5861a619197e5b805f0d2464518fcd762d2ae6aa31a59d161401049213d SHA512 e761309f7f7cfbf207206d2fc669a604e019522edef8f0aae8b2ba150968b4b6be49a70b60a32b42cddd92b64e9341421a31f69656c62549017d5b29e65d84bc WHIRLPOOL b7234cbc500b16ed30adc3c32729f20d9c450ee3b40f594b826ee932c128448960faab039b30130511ba4097153d15c78b95e75395b7cfed947aea9a2d1351e4
-EBUILD mbuffer-20121111.ebuild 802 SHA256 078d993534347404b2f33f00925d422d31b13d57abd7290a9f17581117e918e0 SHA512 f670bc4eae77bf708fe05fe00a8b98ca3ecaac341e772fc1d5a80bdc76ef40ff940c5dafd43e6aee71b5e3a533e7c1a832381bb648cdcd035ac44a916445ce7d WHIRLPOOL 0ae52e420132615540a0b78aaf40e9d8b90af559222ea99fcd511dedb21cbdcfe656ac10e8e4630183634ab7c8b3b1fca046703c7a948bf27aed9f9e9c7e4054
-MISC ChangeLog 4682 SHA256 bedbed0195cdce5926ea734310a5c9f496f83b58cc0485a0a14b7b894ffcb33f SHA512 69397aa4dddfe4034606451617f9d74ebdd14081af5305f4d4724ce2943c9d17f1f1912b9432df1dd1cd6af91d554b7f8aca5436d87cac6338578b6a27c2427e WHIRLPOOL 7d95d698ff83b6912ab9a286662b3fcd7d167a635491ee014f4de3689688c856b02a8dfa7bca25e5cbe5b9d7dab34c75f44fcd1bdeff56dbd139fa069c6e672b
+EBUILD mbuffer-20121111.ebuild 1000 SHA256 d130dc48b491a1219e425455b27d62737fffef4cf4bc86a3e620734c0db4a045 SHA512 612177cab6430563ec18b4e3b3c207f94f9dfbc22ff0a2da54ae5bb0f7a5f3cc27ed53f9841c51a7ec39efcc960f8dc3a9a26ed7bea0b6b04b239e040b124922 WHIRLPOOL 3480bd776ebfba1115fc81eda7a7888f83325adda6edc015546190e2dc12f22594f47bcdbccf7c0a618ee997d38148be81312cbfcb3029aa6bcb8946b86df0e8
+MISC ChangeLog 4846 SHA256 899ea859032e230789dc9362712ebe2bff52579f8b5356299eed289bf2a1c377 SHA512 997ab7c453bcca52bf669cb27fec1298660fb0d3a23818acd2e74bd20f455b19f9a86cab0ce56739fac40b78560d26414786fb2c446a557e5451f01d8d4efedf WHIRLPOOL 6fdee5ead6f5eb83d0b1547ba804b4643e2e90123f129589ee29a343263638952ac7b11529ea870af21e1f66f836b5f65f676a40f53dde7eb9a49e7b36bb44cc
MISC metadata.xml 164 SHA256 f5f2891f2a4791cd31350bb2bb572131ad7235cd0eeb124c9912c187ac10ce92 SHA512 8eb0d5153d388f6ea069c64b93882244816a0a09aecc0d73cb872121ce0eb24c5ccafa96aad0b620b2300f319e1af101fa7fa6c5d0d561719d49bb07da0a2eca WHIRLPOOL 11a1441bddb7a6c69653c663902b7da5767ae6ad515ac2aabfc42fe37927a1ccc21472deeee454009ff720201a41c3e4a912df42661a0a87150fb46126da2d52
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() {