misc/mbuffer: Update to 20180625.

20180625:
- linking of available hash libraries during runtime

20180505:
- fix typo in summary
- fix potential hang with small input size
- testing fix for BSD
- configure enhancement: objdump may be named gobjdump
- fix tape end of file marker may be ignored
- removed obsolete alpha code

20180410:
- build fix for hashing library variants
- support tapetest on systems with name variants of open and write
- run only network tests for supported address families
  (patch supplied by Peter Pentchev)
- code update for hashing infrastructure
- make idev tests usable on more platforms
- determine amount of available memory via procfs
- option -d unintentionally consumes an argument
- idev.c should use libc's names
- support use of autoreconf

20180318:
- performance optimized defaults
- stricter arguments checking of mbuffer.rc
- handle FreeBSD's maximum semaphore value transparently
- print base 2 dimensions correctly (ki,Mi,Gi,Ti)
- FreeBSD patches by Eric Borisch

20171011:
- use $(etcdir) consistently for installation
- use AC_COMPILE_IF instead of AC_RUN_IF to support cross-compiling
- remove forward typedef for dest_t to support older compilers
- build fix for Solaris
- updated test infrastructure
- print pid on every message with --pid
- fix: potential hang, when one output fails to open

20170921:
- added jumpbuffer reading mode for inconsistent block sizes
- code separation into more files for enhanced readability
- some cleanup work for global variables
- fixed regression in sanity checks
- fix: option -f should truncate output file
- fix: failed opening of network output should not redirect to stdout
- fix: summary printout should respect quiet options

20170806:
- add support for libgcrypt
- add support for tape aware out-of-space handling
- support setting verbosity in config file
- suppress gcc's unused result warnings - all have been manually
  checked
- updated install-sh, config.sub, and config.guess
- exit cleanly if all outputs failed to open but hashers are left
- minor fixes and enhancements
- minor code refactoring for clearer structure
- some code hardening
- build fix for OpenBSD
- work around mhash_get_hash_name_static crashing

20170515:
- fix false warning on comments in config files
- code update for config parsing
- makefile compatibility update

20170514:
- update: configure update for latest cygwin
- fix: detect missing md5.h in configure
- enhancement: adjust some messages to avoid line-wrapping
- enhancement: print status message to log if suppressed on console
- enhancement: also read config files in /etc and ${prefix}/etc
- enhancement: simplified memory conifguration detection scheme
- added an example config file, with documentation of all options
- added parameter StatusInterval
- fix for handling empty lines in config files
- fix: --append rejects existing files
- fix warnings related to thread status return code

20161115:
- enhancement: report percent done, when input size is known (is a
  file)
- enhancement: watchdog raises SIGKILL if SIGINT had no effect
- change: start watchdog when parsing option -W or after parsing all
  options when activated via defaults file
- fix: use thread-safe mt_usleep instead of sleep(3) for watchdog
  timing
- change: adjusted interface of mt_usleep to accept 64bit arguments

20160613:
- fix: fix potential assertion triggered by interrupted system call
- enhancement: ignore EINTR for I/O syscalls

20160228:
- fix: fix listen's backlog argument, which can cause issues on Linux
  4.4

7 files changed, 88 insertions, 27 deletions

diff --git a/misc/mbuffer/Makefile b/misc/mbuffer/Makefile
index 84e08442b03..cb9a5ca911f 100644
--- a/misc/mbuffer/Makefile
+++ b/misc/mbuffer/Makefile
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.4 2015/11/26 00:27:23 wiedi Exp $
+# $NetBSD: Makefile,v 1.5 2018/09/18 09:49:29 fhajny Exp $
 
-DISTNAME=	mbuffer-20151002
+DISTNAME=	mbuffer-20180625
 CATEGORIES=	misc
 MASTER_SITES=	http://www.maier-komor.de/software/mbuffer/
 EXTRACT_SUFX=	.tgz
@@ -14,4 +14,18 @@ BROKEN_ON_PLATFORM=	NetBSD-*-*	# Needs sysctl bits
 
 GNU_CONFIGURE=	yes
 
+USE_LANGUAGES=	c c99
+
+SUBST_CLASSES+=		etc
+SUBST_STAGE.etc=	pre-configure
+SUBST_FILES.etc=	mbuffer.rc
+SUBST_MESSAGE.etc=	Fix default sysconfdir
+SUBST_VARS.etc+=	PKG_SYSCONFDIR
+
+INSTALL_MAKE_FLAGS+=	etcdir=${PREFIX}/share/examples/mbuffer
+INSTALLATION_DIRS+=	share/examples/mbuffer
+CONF_FILES+=		share/examples/mbuffer/mbuffer.rc \
+			${PKG_SYSCONFDIR}/mbuffer.rc
+
+.include "../../security/openssl/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/misc/mbuffer/PLIST b/misc/mbuffer/PLIST
index b5a6773270a..22ce82cc468 100644
--- a/misc/mbuffer/PLIST
+++ b/misc/mbuffer/PLIST
@@ -1,3 +1,4 @@
-@comment $NetBSD: PLIST,v 1.1 2014/05/08 11:21:24 jperkin Exp $
+@comment $NetBSD: PLIST,v 1.2 2018/09/18 09:49:29 fhajny Exp $
 bin/mbuffer
 man/man1/mbuffer.1
+share/examples/mbuffer/mbuffer.rc
diff --git a/misc/mbuffer/distinfo b/misc/mbuffer/distinfo
index 333e6cf1ef5..d8ec148a86e 100644
--- a/misc/mbuffer/distinfo
+++ b/misc/mbuffer/distinfo
@@ -1,9 +1,11 @@
-$NetBSD: distinfo,v 1.4 2015/11/26 00:27:23 wiedi Exp $
+$NetBSD: distinfo,v 1.5 2018/09/18 09:49:29 fhajny Exp $
 
-SHA1 (mbuffer-20151002.tgz) = 1ea592c395ba2e83dd3747c7d6f334fadc87065c
-RMD160 (mbuffer-20151002.tgz) = a3391f15759c1743b3b9b64c3f872d614c1c0102
-SHA512 (mbuffer-20151002.tgz) = 513b3b53c135338447ab7bd4f390ebfa6c49f8e9580a48288306a8a8dc92e1442f63bb1be9774378ccf30e30c7c2b911f3a7c1838e0c5f61429da279328765bd
-Size (mbuffer-20151002.tgz) = 123022 bytes
-SHA1 (patch-Makefile.in) = 81118c470367b0136f868f8ccb0f35e3c389150c
+SHA1 (mbuffer-20180625.tgz) = d3beb0aa92de4095bdbb819a6f0a977507155c96
+RMD160 (mbuffer-20180625.tgz) = d3fb1e03c40719e72af852692cfcce5db0992b0c
+SHA512 (mbuffer-20180625.tgz) = 01d712f51ac0b206d6ee91fbbd4cea4873784aaca02daa9b3d72cfcc0a63696b20c15ca4b6e834924f02f2878ac90192110df584c55fb1a65620ae8b0f7ec87e
+Size (mbuffer-20180625.tgz) = 140946 bytes
+SHA1 (patch-Makefile.in) = 5b1285fd94aad7c9eaf803527a514cd7385cc448
 SHA1 (patch-configure) = e3f9fe62c308369f89511dc31f781a92fd7b4405
-SHA1 (patch-network.c) = 6d5b5a937ce71482b1b2f13cf0a3d8b2d8b45e4f
+SHA1 (patch-mbuffer.c) = ca1b0fee1a11529f787b2a2b0d6ee03ed9fcfd14
+SHA1 (patch-mbuffer.rc) = f6639110e0a30f62a8a61e725a5403c88703d671
+SHA1 (patch-network.c) = 496fa35d88a9cdec4f7a6121c8b31a64f0ee8f57
diff --git a/misc/mbuffer/patches/patch-Makefile.in b/misc/mbuffer/patches/patch-Makefile.in
index 29a8ea8e60b..5340bc3eb3b 100644
--- a/misc/mbuffer/patches/patch-Makefile.in
+++ b/misc/mbuffer/patches/patch-Makefile.in
@@ -1,21 +1,35 @@
-$NetBSD: patch-Makefile.in,v 1.1 2014/05/08 11:21:24 jperkin Exp $
+$NetBSD: patch-Makefile.in,v 1.2 2018/09/18 09:49:29 fhajny Exp $
 
 Fix install permissions.
+Pass sysconfdir.
 
---- Makefile.in.orig	2014-03-10 22:41:15.000000000 +0000
+--- Makefile.in.orig	2018-06-25 20:37:20.000000000 +0000
 +++ Makefile.in
-@@ -39,10 +39,10 @@ distclean: clean
+@@ -1,5 +1,5 @@
+ CC		= @CC@
+-DEFS		= @DEFS@ -DPREFIX=\"${prefix}\"
++DEFS		= @DEFS@ -DSYSCONFDIR=\"${etcdir}\"
+ CFLAGS		= @CFLAGS@ $(DEFS) -I@srcdir@ -I.
+ LDFLAGS		= @LDFLAGS@
+ LIBS		= @LIBS@
+@@ -47,14 +47,14 @@ distclean: clean
  	config.status Makefile mbuffer.1 core
  
- install: $(TARGET)
--	-$(INSTALL) -d $(DESTDIR)$(bindir)
--	$(INSTALL) $(TARGET) $(DESTDIR)$(bindir)
--	-$(INSTALL) -d $(DESTDIR)$(mandir)
--	$(INSTALL) mbuffer.1 $(DESTDIR)$(mandir)
-+	-$(BSD_INSTALL_PROGRAM_DIR) $(DESTDIR)$(bindir)
-+	$(BSD_INSTALL_PROGRAM) $(TARGET) $(DESTDIR)$(bindir)
-+	-$(BSD_INSTALL_MAN_DIR) $(DESTDIR)$(mandir)
-+	$(BSD_INSTALL_MAN) mbuffer.1 $(DESTDIR)$(mandir)
+ $(DESTDIR)$(etcdir)/mbuffer.rc:
+-	-$(INSTALL) -d -m 755 $(DESTDIR)$(etcdir)
+-	$(INSTALL) -m 644 mbuffer.rc $(DESTDIR)$(etcdir)
++	-$(BSD_INSTALL_DATA_DIR) -d -m 755 $(DESTDIR)$(etcdir)
++	$(BSD_INSTALL_DATA) -m 644 mbuffer.rc $(DESTDIR)$(etcdir)
+ 
+ install: $(TARGET) $(DESTDIR)$(etcdir)/mbuffer.rc
+-	-$(INSTALL) -d -m 755 $(DESTDIR)$(bindir)
+-	$(INSTALL) -m 755 $(TARGET) $(DESTDIR)$(bindir)/
+-	-$(INSTALL) -d -m 755 $(DESTDIR)$(mandir)
+-	$(INSTALL) -m 644 mbuffer.1 $(DESTDIR)$(mandir)/
++	-$(BSD_INSTALL_PROGRAM_DIR) -d -m 755 $(DESTDIR)$(bindir)
++	$(BSD_INSTALL_PROGRAM) -m 755 $(TARGET) $(DESTDIR)$(bindir)/
++	-$(BSD_INSTALL_MAN_DIR) -d -m 755 $(DESTDIR)$(mandir)
++	$(BSD_INSTALL_MAN) -m 644 mbuffer.1 $(DESTDIR)$(mandir)/
  
  lint:
  	lint $(DEFS) $(SOURCES)
diff --git a/misc/mbuffer/patches/patch-mbuffer.c b/misc/mbuffer/patches/patch-mbuffer.c
new file mode 100644
index 00000000000..52a93e4e16a
--- /dev/null
+++ b/misc/mbuffer/patches/patch-mbuffer.c
@@ -0,0 +1,15 @@
+$NetBSD: patch-mbuffer.c,v 1.1 2018/09/18 09:49:29 fhajny Exp $
+
+Default sysconfdir location.
+
+--- mbuffer.c.orig	2018-06-25 20:37:20.000000000 +0000
++++ mbuffer.c
+@@ -1029,7 +1029,7 @@ static void initDefaults()
+ 
+ 	const char *home = getenv("HOME");
+ 	readConfigFile("/etc/mbuffer.rc");
+-	readConfigFile(PREFIX "/etc/mbuffer.rc");
++	readConfigFile(SYSCONFDIR "/mbuffer.rc");
+ 	if (home == 0) {
+ 		warningmsg("HOME environment variable not set - unable to find defaults file\n");
+ 		return;
diff --git a/misc/mbuffer/patches/patch-mbuffer.rc b/misc/mbuffer/patches/patch-mbuffer.rc
new file mode 100644
index 00000000000..a4a147c33ab
--- /dev/null
+++ b/misc/mbuffer/patches/patch-mbuffer.rc
@@ -0,0 +1,15 @@
+$NetBSD: patch-mbuffer.rc,v 1.1 2018/09/18 09:49:29 fhajny Exp $
+
+Default sysconfdir location.
+
+--- mbuffer.rc.orig	2018-06-25 20:37:20.000000000 +0000
++++ mbuffer.rc
+@@ -1,7 +1,6 @@
+ #####################################################################
+ ## mbuffer configuration file
+-## /etc/mbuffer.rc
+-## ${PREFIX}/etc/mbuffer.rc
++## @PKG_SYSCONFDIR@/mbuffer.rc
+ ## ${HOME}/.mbuffer.rc
+ #####################################################################
+ ## valid values for boolean options are:
diff --git a/misc/mbuffer/patches/patch-network.c b/misc/mbuffer/patches/patch-network.c
index 2ff93349149..a639d8003b8 100644
--- a/misc/mbuffer/patches/patch-network.c
+++ b/misc/mbuffer/patches/patch-network.c
@@ -1,15 +1,15 @@
-$NetBSD: patch-network.c,v 1.1 2014/05/08 11:21:24 jperkin Exp $
+$NetBSD: patch-network.c,v 1.2 2018/09/18 09:49:29 fhajny Exp $
 
 Portability fix.
 
---- network.c.orig	2014-03-10 22:41:15.000000000 +0000
+--- network.c.orig	2018-06-25 20:37:20.000000000 +0000
 +++ network.c
-@@ -114,7 +114,7 @@ void initNetworkInput(const char *addr)
+@@ -118,7 +118,7 @@ void initNetworkInput(const char *addr)
  		hint.ai_family = AddrFam;
  		hint.ai_protocol = IPPROTO_TCP;
  		hint.ai_socktype = SOCK_STREAM;
--#ifdef __FreeBSD__
-+#if defined(__FreeBSD__) || defined(__NetBSD__)
+-#if defined __FreeBSD__ || defined __OpenBSD__
++#if defined __FreeBSD__ || defined __OpenBSD__ || defined __NetBSD__
  		hint.ai_flags = AI_ADDRCONFIG;
  #else
  		hint.ai_flags = AI_ADDRCONFIG | AI_V4MAPPED;