Update to 1.2.6. From the changelog:

# Fix compilation on some systems.
# Add simplified Chinese localization.
# Fix compatibility with newer GNU/automake.
# Add systemd configuration file.
# Automatically load if_tun on FreeBSD.
# Use POSIX tree instead of linked list when libJudy is missing/disabled.
# Fix C pointer aliasing violations.
# Fix compilation with FreeBSD 7.2 or later.

6 files changed, 43 insertions, 35 deletions

diff --git a/net/miredo/Makefile b/net/miredo/Makefile
index 7503abc9df7..7cc802863f3 100644
--- a/net/miredo/Makefile
+++ b/net/miredo/Makefile
@@ -1,17 +1,16 @@
-# $NetBSD: Makefile,v 1.24 2017/09/03 08:53:12 wiz Exp $
+# $NetBSD: Makefile,v 1.25 2019/01/05 21:46:05 schmonz Exp $
 
-DISTNAME=	miredo-1.2.2
-PKGREVISION=	2
+DISTNAME=	miredo-1.2.6
 CATEGORIES=	net
 MASTER_SITES=	http://www.remlab.net/files/miredo/
-EXTRACT_SUFX=	.tar.bz2
+EXTRACT_SUFX=	.tar.xz
 
 MAINTAINER=	pkgsrc-users@NetBSD.org
 HOMEPAGE=	https://www.remlab.net/miredo/
 COMMENT=	Teredo IPv6 tunneling
 LICENSE=	gnu-gpl-v2
 
-NOT_FOR_PLATFORM=	Interix-*-* NetBSD-[0-3]*-* SunOS-*-*
+NOT_FOR_PLATFORM=	Interix-*-* NetBSD-[0-3].*-* SunOS-*-*
 
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS+=	--localstatedir=${VARBASE}
@@ -30,6 +29,8 @@ CONF_FILES+=	${EGDIR}/client-hook ${PKG_SYSCONFDIR}/client-hook
 
 RCD_SCRIPTS=	miredo
 
+BUILD_DEFS+=	VARBASE
+
 .include "../../net/libpcap/buildlink3.mk"
 .include "../../devel/libjudy/buildlink3.mk"
 .include "../../mk/pthread.buildlink3.mk"
diff --git a/net/miredo/PLIST b/net/miredo/PLIST
index 44b3f587557..f457b3da325 100644
--- a/net/miredo/PLIST
+++ b/net/miredo/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.11 2014/05/06 14:59:18 jperkin Exp $
+@comment $NetBSD: PLIST,v 1.12 2019/01/05 21:46:05 schmonz Exp $
 bin/teredo-mire
 include/libteredo/teredo-udp.h
 include/libteredo/teredo.h
@@ -6,7 +6,8 @@ include/libteredo/tunnel.h
 include/libtun6/tun6.h
 lib/libteredo.la
 lib/libtun6.la
-lib/miredo/miredo-privproc
+lib/systemd/system/miredo.service
+libexec/miredo/miredo-privproc
 man/man1/teredo-mire.1
 man/man5/miredo-server.conf.5
 man/man5/miredo.conf.5
diff --git a/net/miredo/distinfo b/net/miredo/distinfo
index a9def89a79b..aba8d85c7fe 100644
--- a/net/miredo/distinfo
+++ b/net/miredo/distinfo
@@ -1,9 +1,9 @@
-$NetBSD: distinfo,v 1.14 2015/11/04 00:35:11 agc Exp $
+$NetBSD: distinfo,v 1.15 2019/01/05 21:46:05 schmonz Exp $
 
-SHA1 (miredo-1.2.2.tar.bz2) = 9facd2ef23ae7a9969dfbe179a6c3ebddd87a2cc
-RMD160 (miredo-1.2.2.tar.bz2) = 16c9ec08d5ae935027a49153dc44745e2cc916c7
-SHA512 (miredo-1.2.2.tar.bz2) = 26248e91c3ad4e6ab5a0aaceb00ad69d3a28f3ff2594788694625f5f932502fb90a14b5faa919ada0dc28c303ed8760c4782aa0e2dca818fe693c6fe83116622
-Size (miredo-1.2.2.tar.bz2) = 529200 bytes
+SHA1 (miredo-1.2.6.tar.xz) = 630c84e9919952f6f4792ceda54a12e0aef43bbf
+RMD160 (miredo-1.2.6.tar.xz) = b02b96f233df2211f45c0dad981f0a5ab6aa1789
+SHA512 (miredo-1.2.6.tar.xz) = 9cbc604aecde566f921834a220be7675981e1c603cbcc81c3e2e9c58fdcdae2e78ec6ffc180939d5b8f6d7598ba3967270532b2c0c04de8b688a86c436719caf
+Size (miredo-1.2.6.tar.xz) = 477668 bytes
 SHA1 (patch-ab) = b9b1ed3d47ebe992e3eb33dec46a7419273e7d3c
-SHA1 (patch-ah) = 306c1a289d5a0221231a25b427a754ffc308f814
-SHA1 (patch-libteredo_tunnel.h) = 0706d37f83d94b1b3b4dfedaf5e484a4dcc2eb4a
+SHA1 (patch-ah) = 90a095d0c2cb0fa20e1db0e4f31f39a45984a729
+SHA1 (patch-src_relayd.c) = 2bf2b2443938adf1873482abc52befcaab1e45e2
diff --git a/net/miredo/patches/patch-ah b/net/miredo/patches/patch-ah
index 618b827f875..1b1c8b440b7 100644
--- a/net/miredo/patches/patch-ah
+++ b/net/miredo/patches/patch-ah
@@ -1,19 +1,21 @@
-$NetBSD: patch-ah,v 1.3 2014/05/06 14:59:18 jperkin Exp $
+$NetBSD: patch-ah,v 1.4 2019/01/05 21:46:05 schmonz Exp $
 
 Install client-hook to the correct location.
 
---- misc/Makefile.in.orig	2009-11-05 20:03:42.000000000 +0100
-+++ misc/Makefile.in	2010-06-08 23:15:53.000000000 +0200
-@@ -296,7 +296,7 @@
- $(am__aclocal_m4_deps):
- install-confSCRIPTS: $(conf_SCRIPTS)
+--- misc/Makefile.in.orig	2013-05-23 15:51:51.000000000 +0000
++++ misc/Makefile.in
+@@ -337,8 +337,8 @@ install-confSCRIPTS: $(conf_SCRIPTS)
  	@$(NORMAL_INSTALL)
--	test -z "$(confdir)" || $(MKDIR_P) "$(DESTDIR)$(confdir)"
-+	test -z "$(examplesdir)" || $(MKDIR_P) "$(DESTDIR)$(examplesdir)"
  	@list='$(conf_SCRIPTS)'; test -n "$(confdir)" || list=; \
+ 	if test -n "$$list"; then \
+-	  echo " $(MKDIR_P) '$(DESTDIR)$(confdir)'"; \
+-	  $(MKDIR_P) "$(DESTDIR)$(confdir)" || exit 1; \
++	  echo " $(MKDIR_P) '$(DESTDIR)$(examplesdir)'"; \
++	  $(MKDIR_P) "$(DESTDIR)$(examplesdir)" || exit 1; \
+ 	fi; \
  	for p in $$list; do \
  	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
-@@ -315,8 +315,8 @@
+@@ -357,8 +357,8 @@ install-confSCRIPTS: $(conf_SCRIPTS)
  	while read type dir files; do \
  	     if test "$$dir" = .; then dir=; else dir=/$$dir; fi; \
  	     test -z "$$files" || { \
diff --git a/net/miredo/patches/patch-libteredo_tunnel.h b/net/miredo/patches/patch-libteredo_tunnel.h
deleted file mode 100644
index 6f928e50544..00000000000
--- a/net/miredo/patches/patch-libteredo_tunnel.h
+++ /dev/null
@@ -1,12 +0,0 @@
-$NetBSD: patch-libteredo_tunnel.h,v 1.1 2012/12/25 21:04:15 joerg Exp $
-
---- libteredo/tunnel.h.orig	2012-12-25 14:06:38.000000000 +0000
-+++ libteredo/tunnel.h
-@@ -32,6 +32,7 @@
- # define LIBTEREDO_TUNNEL_H
- 
- # include <stdbool.h>
-+# include <stddef.h>
- 
- # ifdef __cplusplus
- extern "C" {
diff --git a/net/miredo/patches/patch-src_relayd.c b/net/miredo/patches/patch-src_relayd.c
new file mode 100644
index 00000000000..64de239e074
--- /dev/null
+++ b/net/miredo/patches/patch-src_relayd.c
@@ -0,0 +1,16 @@
+$NetBSD: patch-src_relayd.c,v 1.1 2019/01/05 21:46:05 schmonz Exp $
+
+Copy default MSG_NOSIGNAL from src/privproc.c.
+
+--- src/relayd.c.orig	2013-05-23 15:40:42.000000000 +0000
++++ src/relayd.c
+@@ -48,6 +48,9 @@
+ #ifdef HAVE_SYS_CAPABILITY_H
+ # include <sys/capability.h>
+ #endif
++#ifndef MSG_NOSIGNAL
++# define MSG_NOSIGNAL 0 /* Uho */
++#endif
+ #ifndef SOL_IPV6
+ # define SOL_IPV6 IPPROTO_IPV6
+ #endif