commit: 93a507b9f4d2aafaeab51480446a68167eb4456e Author: Thomas Deutschmann <whissi <AT> gentoo <DOT> org> AuthorDate: Tue Oct 10 18:27:14 2017 +0000 Commit: Thomas Deutschmann <whissi <AT> gentoo <DOT> org> CommitDate: Tue Oct 10 18:27:35 2017 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=93a507b9
sys-block/mbuffer: Bump to v20170921 Fixes: https://bugs.gentoo.org/624012 Package-Manager: Portage-2.3.10, Repoman-2.3.3 sys-block/mbuffer/Manifest | 1 + ...mbuffer-20170921-resolv-multi-order-issue.patch | 23 +++++++++ .../files/mbuffer-20170921-sysconfdir.patch | 28 +++++++++++ sys-block/mbuffer/mbuffer-20170921.ebuild | 55 ++++++++++++++++++++++ 4 files changed, 107 insertions(+) diff --git a/sys-block/mbuffer/Manifest b/sys-block/mbuffer/Manifest index 9046e5bf264..43514873c13 100644 --- a/sys-block/mbuffer/Manifest +++ b/sys-block/mbuffer/Manifest @@ -1,3 +1,4 @@ DIST mbuffer-20150412.tgz 122935 SHA256 0c78dcb194d1f0316c51f277ea09ec20efd175bbd45f0a3f81bf1202c33301e4 SHA512 cef64f1229872e2207e678aa77dc95e0c24f54e4a88a57a0e797d10b07a16d1f5fa96c8cfa3876ff65dd97c114eff87b683917fa1d39cdb4f08c864325e4223c WHIRLPOOL cdd82ef4d036438b36c4ecc0058e3757116e5f01897eee89870e08e73323dc135accf4d69fc57cac87082a2a78bfb1841af62bced56f93388870bc1c3b8590cd 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 diff --git a/sys-block/mbuffer/files/mbuffer-20170921-resolv-multi-order-issue.patch b/sys-block/mbuffer/files/mbuffer-20170921-resolv-multi-order-issue.patch new file mode 100644 index 00000000000..f8771145aa6 --- /dev/null +++ b/sys-block/mbuffer/files/mbuffer-20170921-resolv-multi-order-issue.patch @@ -0,0 +1,23 @@ +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 -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 -4 -O 127.0.0.1:8000 -H; \ + wait + sync + diff $@.md5 test.md5 +@@ -101,7 +101,7 @@ test3: test.md5 + ./mbuffer -q -6 -I :8000 | openssl md5 > $@.md5 & \ + sleep 1; \ + rm -f $@.tar; \ +- ./mbuffer -i test.tar -o /dev/null -6 -O ip6-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/files/mbuffer-20170921-sysconfdir.patch b/sys-block/mbuffer/files/mbuffer-20170921-sysconfdir.patch new file mode 100644 index 00000000000..1b9031aa58b --- /dev/null +++ b/sys-block/mbuffer/files/mbuffer-20170921-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)$(prefix)/etc: ++$(DESTDIR)$(sysconfdir): + -$(INSTALL) -d -m 755 $@ + +-$(DESTDIR)$(prefix)/etc/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-20170921.ebuild b/sys-block/mbuffer/mbuffer-20170921.ebuild new file mode 100644 index 00000000000..3baf4645d8f --- /dev/null +++ b/sys-block/mbuffer/mbuffer-20170921.ebuild @@ -0,0 +1,55 @@ +# 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" + +DEPEND="ssl? ( dev-libs/openssl:0= )" +RDEPEND="${DEPEND}" + +PATCHES=( + "${FILESDIR}/${PN}-20170921-resolv-multi-order-issue.patch" + "${FILESDIR}/${PN}-20170921-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 +} + +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 +}
