[gentoo-commits] repo/gentoo:master commit in: sys-block/mbuffer/, sys-block/mbuffer/files/

[Thomas Deutschmann]

commit:     81f9b755901654bdf1313619127996d99c844e05
Author:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
AuthorDate: Tue Nov  7 10:53:09 2017 +0000
Commit:     Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
CommitDate: Tue Nov  7 10:56:53 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=81f9b755

sys-block/mbuffer: Bump to v20171011

- Test suite re-enabled which was accidentally disabled all the times
  via commit 93a507b9f4d2aafaeab51480446a68167eb4456e.

Package-Manager: Portage-2.3.13, Repoman-2.3.4

 sys-block/mbuffer/Manifest                         |  1 +
 ...mbuffer-20171011-resolv-multi-order-issue.patch | 14 ++++++
 .../files/mbuffer-20171011-sysconfdir.patch        | 28 +++++++++++
 sys-block/mbuffer/mbuffer-20171011.ebuild          | 58 ++++++++++++++++++++++
 4 files changed, 101 insertions(+)

diff --git a/sys-block/mbuffer/Manifest b/sys-block/mbuffer/Manifest
index 43514873c13..1931516e91a 100644
--- a/sys-block/mbuffer/Manifest
+++ b/sys-block/mbuffer/Manifest
@@ -2,3 +2,4 @@ DIST mbuffer-20150412.tgz 122935 SHA256 0c78dcb194d1f0316c51f277ea09ec20efd175bb
 DIST mbuffer-20160228.tgz 123108 SHA256 f7769f729e9b26a22a5d91922a740a0d1df6004dbe2b7a1febb0d7e4c3ef9e62 SHA512 0706b8dd137f5f5b01885bcca4bf799cbd14b25895402f0c73f874d78fc160c7fae8c5a229c40efce9ba96288972a8e5846443ef5cd4d1ff02af92f703e33a2e WHIRLPOOL d1b356e5b7a8313f9fc1ef01392ee44969fedf2f3c33c8848b763d8cf5bd92ddfde8ddc881ef33b9dad849dfee51582c89c72869eb0d603b13a7ad3719d748a3
 DIST mbuffer-20170515.tgz 125736 SHA256 154fa0836777b21032b2e4f738fb0aa4dea218551b7cade93cf1b7245aca5e4f SHA512 991cb33b09e48f1177b7a05e5ab2c189aa2cb0f03e220d7e46996b3a3e3ba1e3f3ad4a68b8750ed73dc765c5874029715bba1d2f5a80a9601cd0a39e1f9fd447 WHIRLPOOL 015bc2a57b529d54bf5e4092c30585373003a3159fc66a528ae1ad9208134d1ba9c8e3cb44afa4ef246ea4babf96e6aed8b7166a350b4a2a7f82f91b74a85e52
 DIST mbuffer-20170921.tgz 136192 SHA256 8c38ec7cb7f63e1cd4100c6f8a15a2c335ad080760157fc44e88e3465cc47027 SHA512 f4b897e7649893cb02f9b3b806e956acf60692cd549f9cfe6cf164c703f369f0af251bfdabfbcdd76dacf5a4c3871ed7b98fbd6b5fcb97d184b7c317082bfaee WHIRLPOOL b789e0f5ac522edbb373cd3de377c78952b2d9bcc1a09a6731971695694134e36c8909f0c1aeb5ffbe9d44f5a2209c2c8b21592209d0b750b97ac4546fd90bed
+DIST mbuffer-20171011.tgz 136630 SHA256 eb2f979708bb5ba42a6c1f12c7502dff3b05df8e49b5686c308eda96cad0d1fc SHA512 398d7545388a94b4f8961193192cd5e1139b84f31c7699c2b7f66b84a40488a2e70c88a2a70578bd95375e11efc87978a5f6fec805dbbc5f1fea460b3a9c68c4 WHIRLPOOL 8a2357e2c133450749ca93c96488560f6f5e234acaba9c395da948658e2e796e8fe92a83932c5a6aab522b6efd4cd3511f822a65d950404887d8bd3a0bdf03ab

diff --git a/sys-block/mbuffer/files/mbuffer-20171011-resolv-multi-order-issue.patch b/sys-block/mbuffer/files/mbuffer-20171011-resolv-multi-order-issue.patch
new file mode 100644
index 00000000000..4702ca0c1a1
--- /dev/null
+++ b/sys-block/mbuffer/files/mbuffer-20171011-resolv-multi-order-issue.patch
@@ -0,0 +1,14 @@
+work around "multi off" in /etc/host.conf and "::1 localhost"
+*not* being the *first* "localhost" entry in /etc/hosts
+
+--- a/Makefile.in
++++ b/Makefile.in
+@@ -86,7 +86,7 @@ test2: test.md5
+ 	./mbuffer --pid -q -4 -I :7001 -o $@.tar -o - | openssl md5 > $@.md5 & \
+ 		sleep 1; \
+ 		rm -f $@.tar; \
+-		./mbuffer --pid -i test.tar -o /dev/null -4 -O localhost:7001 -H; \
++		./mbuffer --pid -i test.tar -o /dev/null -4 -O 127.0.0.1:7001 -H; \
+ 		wait
+ 	sync
+ 	diff $@.md5 test.md5

diff --git a/sys-block/mbuffer/files/mbuffer-20171011-sysconfdir.patch b/sys-block/mbuffer/files/mbuffer-20171011-sysconfdir.patch
new file mode 100644
index 00000000000..ced09536693
--- /dev/null
+++ b/sys-block/mbuffer/files/mbuffer-20171011-sysconfdir.patch
@@ -0,0 +1,28 @@
+--- a/Makefile.in
++++ b/Makefile.in
+@@ -10,6 +10,7 @@ CP		= @CP@
+ VPATH		= @srcdir@
+ prefix		= @prefix@
+ exec_prefix     = @exec_prefix@
++sysconfdir      = @sysconfdir@
+ datarootdir	= @datarootdir@
+ bindir          = @bindir@
+ mandir		= @mandir@/man1
+@@ -40,13 +41,13 @@ distclean: clean
+ 	-$(RM) $(TARGET) config.h config.log \
+ 	config.status Makefile mbuffer.1 core
+ 
+-$(DESTDIR)$(etcdir):
++$(DESTDIR)$(sysconfdir):
+ 	-$(INSTALL) -d -m 755 $@
+ 
+-$(DESTDIR)$(etcdir)/mbuffer.rc:
+-	$(INSTALL) -m 644 mbuffer.rc $(DESTDIR)$(etcdir)
++$(DESTDIR)$(sysconfdir)/mbuffer.rc:
++	$(INSTALL) -m 644 mbuffer.rc $(DESTDIR)$(sysconfdir)/
+ 
+-install: $(TARGET) $(DESTDIR)$(etcdir) $(DESTDIR)$(etcdir)/mbuffer.rc
++install: $(TARGET) $(DESTDIR)$(sysconfdir) $(DESTDIR)$(sysconfdir)/mbuffer.rc
+ 	-$(INSTALL) -d -m 755 $(DESTDIR)$(bindir)
+ 	$(INSTALL) -m 755 $(TARGET) $(DESTDIR)$(bindir)/
+ 	-$(INSTALL) -d -m 755 $(DESTDIR)$(mandir)

diff --git a/sys-block/mbuffer/mbuffer-20171011.ebuild b/sys-block/mbuffer/mbuffer-20171011.ebuild
new file mode 100644
index 00000000000..b7d5ef07646
--- /dev/null
+++ b/sys-block/mbuffer/mbuffer-20171011.ebuild
@@ -0,0 +1,58 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+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"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE="debug ssl test"
+
+RDEPEND="ssl? ( dev-libs/openssl:0= )"
+DEPEND="${RDEPEND}
+	test? ( dev-libs/openssl:0 )"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-20171011-resolv-multi-order-issue.patch"
+	"${FILESDIR}/${PN}-20171011-sysconfdir.patch"
+)
+
+src_prepare() {
+	ln -s "${DISTDIR}"/${P}.tgz test.tar #258881
+
+	# Enforce MAKEOPTS=-j1 because src_test() spawns multiple listener
+	# using same port and src_install may have problems (with /etc folder)
+	export MAKEOPTS=-j1
+
+	default
+}
+
+src_configure() {
+	local myeconfargs=(
+		$(use_enable ssl md5)
+		$(use_enable debug)
+	)
+	econf "${myeconfargs[@]}"
+}
+
+src_test() {
+	if has usersandbox ${FEATURES} || has network-sandbox ${FEATURES}; then
+		ewarn "Some tests may fail with FEATURES=usersandbox or"
+		ewarn "FEATURES=network-sandbox; Skipping tests because"
+		ewarn "test suite would hang forever in such environments!"
+		return 0;
+	fi
+
+	default
+}
+
+pkg_postinst() {
+	if ! has_version "app-arch/mt-st"; then
+		elog ""
+		elog "If you want autoloader support you need to install \"app-arch/mt-st\" in addition!"
+	fi
+}