diff --git a/sys-block/mbuffer/Manifest b/sys-block/mbuffer/Manifest new file mode 100644 index 0000000..481bc41 --- /dev/null +++ b/sys-block/mbuffer/Manifest @@ -0,0 +1,6 @@ +AUX mbuffer-20121111-resolv-multi-order-issue.patch 780 BLAKE2B 83b253cbd3657c0c05778ca18bcc2cc2a00e24e3ed9ad8ff1539ad97b8d8a25f1f9c076c9c1ee3ce4e6ab0b6a65416689c93ea11fe57b41fd1b50c9871b2c031 SHA512 d633b4c5185cbb5eb52cb428002e7227e07819f6d49c9ed353c541c2d9234fe9c1f0c7f40e0a1662e47cd13835927b4eff310aae41181526f68cb7b0174218a4 +AUX mbuffer-20171011-resolv-multi-order-issue.patch 477 BLAKE2B 125454ba9539a3dba60808a5598cf34f44b3a5aa71ea276eca6694c885e2b89fd13e3b3adf6cffb48fd58113698f670a4ce4a740719e7b3edd545f766c602475 SHA512 cea92010f1de5685077f80490726837dfc066abe5ab4c1f6c01372a238035df351624024099972e0e571093d856873b7bcc6899cf1a0c7c1063a1035ec8d5951 +AUX mbuffer-20171011-sysconfdir.patch 916 BLAKE2B bd9443187e68fc6c67afef232904bdbc268564307b0b2150fe46ee3d2a9b9e480f52c200a3ec218bf795f706fb3f7c5c4a37c2ecaeb03fc1eec9b727622ab445 SHA512 88b19fb1dcd0156c04266f057196a5341896046d1e54ca70529452e72d544768b644d44d469255ecabf28e735ff3a8a41db9e4462bf3ebe079f97ae8520aeeb2 +AUX mbuffer-20180410-sysconfdir.patch 897 BLAKE2B 1fc57be6f5ce11f483d43dc69c9e4120b09a4c59caaee90deefd5500058ea0c8b9cd6b9b3dea1a2f21733acf4eb8a922171d791e57d658275997ca951f73559e SHA512 36964604338a0bfd0e9cb55d17b307f32dfe09d280019e8083e5909b81e091887bb8f360ef9aebf21eb8448a3d9ba305a6f7a7bc35ea4884418bb7d67e9fadb0 +DIST mbuffer-20181119.tgz 141445 BLAKE2B 8900b71af77b42ac6901285391bb571744bdcfd9fea307758b17be48f8ba3fa921c0e4752817d4feb8b139753440af25a8a8162f867e793d00e1baf8f1977e9e SHA512 0a30fa1c16f519a2ce82ae1f0f467dc9672e16affaff17f16cbec7bd3a28aea565e80ab4274ec24e60dd78560c692b8f852c7cba794a3715242f0d2385259347 +EBUILD mbuffer-20181119.ebuild 1555 BLAKE2B 0b186d69dddc6bc27abe991d8a361d9fa73a70d7950cb14fc9b5362fac4780fbb70d9bf2c42dbc6bf80017df4e18561a8e6810721e866e970010fd9c686c234b SHA512 82fbf24467ad437e9bc1a635e929598490b87ab8cb568d4b29b260b7efce4db28e48ec89a880ae28236c5e75f4d04bf789c9a9d9759a5ee10cd503d0cfc2eaa7 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 0000000..08e0b83 --- /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/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 0000000..4702ca0 --- /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 0000000..ced0953 --- /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/files/mbuffer-20180410-sysconfdir.patch b/sys-block/mbuffer/files/mbuffer-20180410-sysconfdir.patch new file mode 100644 index 0000000..560f4c5 --- /dev/null +++ b/sys-block/mbuffer/files/mbuffer-20180410-sysconfdir.patch @@ -0,0 +1,26 @@ +--- a/Makefile.in ++++ b/Makefile.in +@@ -12,6 +12,7 @@ OBJDUMP = @OBJDUMP@ + VPATH = @srcdir@ + prefix = @prefix@ + exec_prefix = @exec_prefix@ ++sysconfdir = @sysconfdir@ + datarootdir = @datarootdir@ + bindir = @bindir@ + mandir = @mandir@/man1 +@@ -46,11 +47,11 @@ distclean: clean + -$(RM) $(TARGET) config.h config.log \ + config.status Makefile mbuffer.1 core + +-$(DESTDIR)$(etcdir)/mbuffer.rc: +- -$(INSTALL) -d -m 755 $(DESTDIR)$(etcdir) +- $(INSTALL) -m 644 mbuffer.rc $(DESTDIR)$(etcdir) ++$(DESTDIR)$(sysconfdir)/mbuffer.rc: ++ -$(INSTALL) -d -m 755 $(DESTDIR)$(sysconfdir) ++ $(INSTALL) -m 644 mbuffer.rc $(DESTDIR)$(sysconfdir)/ + +-install: $(TARGET) $(DESTDIR)$(etcdir)/mbuffer.rc ++install: $(TARGET) $(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-20181119.ebuild b/sys-block/mbuffer/mbuffer-20181119.ebuild new file mode 100644 index 0000000..567248a --- /dev/null +++ b/sys-block/mbuffer/mbuffer-20181119.ebuild @@ -0,0 +1,70 @@ +# Copyright 1999-2019 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=6 + +inherit autotools + +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 libressl ssl test" +RESTRICT="!test? ( test )" + +RDEPEND="ssl? ( + !libressl? ( dev-libs/openssl:0= ) + libressl? ( dev-libs/libressl:0= ) + )" + +DEPEND="${RDEPEND} + test? ( dev-libs/openssl:0 )" + +REQUIRED_USE="test? ( libressl ssl )" + +PATCHES=( + "${FILESDIR}/${PN}-20180410-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 + + mv configure.in configure.ac || die + + eautoreconf +} + +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 +}