summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorThomas Deutschmann <whissi@gentoo.org>2017-10-10 20:27:14 +0200
committerThomas Deutschmann <whissi@gentoo.org>2017-10-10 20:27:35 +0200
commit93a507b9f4d2aafaeab51480446a68167eb4456e (patch)
tree6f881f6e8cafd21d1ebdddb8e9078a8f32e4a5a7 /sys-block/mbuffer/files
parentsys-apps/iucode_tool: Bump to v2.2 (diff)
downloadgentoo-93a507b9f4d2aafaeab51480446a68167eb4456e.tar.gz
gentoo-93a507b9f4d2aafaeab51480446a68167eb4456e.tar.bz2
gentoo-93a507b9f4d2aafaeab51480446a68167eb4456e.zip
sys-block/mbuffer: Bump to v20170921
Fixes: https://bugs.gentoo.org/624012 Package-Manager: Portage-2.3.10, Repoman-2.3.3
Diffstat (limited to 'sys-block/mbuffer/files')
-rw-r--r--sys-block/mbuffer/files/mbuffer-20170921-resolv-multi-order-issue.patch23
-rw-r--r--sys-block/mbuffer/files/mbuffer-20170921-sysconfdir.patch28
2 files changed, 51 insertions, 0 deletions
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 000000000000..f8771145aa6b
--- /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 000000000000..1b9031aa58b4
--- /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)