miredo-1.2.2:

* Fix SIGHUP signal handling (again).
* Fix deadlock if Miredo fails to start.

4 files changed, 26 insertions, 41 deletions

diff --git a/net/miredo/Makefile b/net/miredo/Makefile
index 5554804b713..00ac7b38b6d 100644
--- a/net/miredo/Makefile
+++ b/net/miredo/Makefile
@@ -1,9 +1,8 @@
-# $NetBSD: Makefile,v 1.18 2010/06/06 17:31:05 gson Exp $
+# $NetBSD: Makefile,v 1.19 2010/06/15 23:49:30 pettai Exp $
 
-DISTNAME=	miredo-1.1.7
-PKGREVISION=	1
+DISTNAME=	miredo-1.2.2
 CATEGORIES=	net
-MASTER_SITES=	http://www.remlab.net/files/miredo/archive/
+MASTER_SITES=	http://www.remlab.net/files/miredo/
 EXTRACT_SUFX=	.tar.bz2
 
 MAINTAINER=	pkgsrc-users@NetBSD.org
diff --git a/net/miredo/distinfo b/net/miredo/distinfo
index 3f536be239d..7a3eb90f259 100644
--- a/net/miredo/distinfo
+++ b/net/miredo/distinfo
@@ -1,8 +1,7 @@
-$NetBSD: distinfo,v 1.10 2010/05/14 06:18:48 pettai Exp $
+$NetBSD: distinfo,v 1.11 2010/06/15 23:49:30 pettai Exp $
 
-SHA1 (miredo-1.1.7.tar.bz2) = a1484c7b47f332b551ef946e064d116cb11af432
-RMD160 (miredo-1.1.7.tar.bz2) = e15aa09f03fe47a6da1cfc4a53c5cf69399fd013
-Size (miredo-1.1.7.tar.bz2) = 517231 bytes
+SHA1 (miredo-1.2.2.tar.bz2) = 9facd2ef23ae7a9969dfbe179a6c3ebddd87a2cc
+RMD160 (miredo-1.2.2.tar.bz2) = 16c9ec08d5ae935027a49153dc44745e2cc916c7
+Size (miredo-1.2.2.tar.bz2) = 529200 bytes
 SHA1 (patch-ab) = b9b1ed3d47ebe992e3eb33dec46a7419273e7d3c
-SHA1 (patch-ag) = 75223566133380122c8ea58c8509d2180fe778fd
-SHA1 (patch-ah) = 078cb0a78210aa6d77e8f1fa1d158b03bb9204bc
+SHA1 (patch-ah) = 2091460b84a8a84a4e7595e5ec4fa13b03287c4f
diff --git a/net/miredo/patches/patch-ag b/net/miredo/patches/patch-ag
deleted file mode 100644
index 33b4d4b255d..00000000000
--- a/net/miredo/patches/patch-ag
+++ /dev/null
@@ -1,16 +0,0 @@
-$NetBSD: patch-ag,v 1.1 2010/05/14 06:18:49 pettai Exp $
-
---- libtun6/diag.c.orig	2010-05-11 21:04:33.000000000 +0200
-+++ libtun6/diag.c	2010-05-11 21:10:22.000000000 +0200
-@@ -98,10 +98,10 @@
- 			return -1;
- 	}
- #else
-+	const char tundev[] = "/dev/tun0";
- #if 1	/* BSD creates a tunnel even on stat() - skip diagnostics */
- 	return 0;
- #else
--	const char tundev[] = "/dev/tun0";
- 	struct stat st;
- 
- 	if (stat (tundev, &st) == 0)
diff --git a/net/miredo/patches/patch-ah b/net/miredo/patches/patch-ah
index 0af5a0cb6e7..1e9294db976 100644
--- a/net/miredo/patches/patch-ah
+++ b/net/miredo/patches/patch-ah
@@ -1,21 +1,24 @@
-$NetBSD: patch-ah,v 1.1 2010/05/14 06:18:49 pettai Exp $
+$NetBSD: patch-ah,v 1.2 2010/06/15 23:49:30 pettai Exp $
 
---- misc/Makefile.in.orig	2009-07-06 17:57:11.000000000 +0200
-+++ misc/Makefile.in	2010-05-13 23:34:06.000000000 +0200
-@@ -265,13 +265,13 @@
- 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+--- 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)
  	@$(NORMAL_INSTALL)
 -	test -z "$(confdir)" || $(MKDIR_P) "$(DESTDIR)$(confdir)"
-+	test -z "$(confdir)" || $(MKDIR_P) "$(DESTDIR)$(examplesdir)/../rc.d"
- 	@list='$(conf_SCRIPTS)'; for p in $$list; do \
++	test -z "$(examplesdir)/../rc.d" || $(MKDIR_P) "$(DESTDIR)$(examplesdir)/../rc.d"
+ 	@list='$(conf_SCRIPTS)'; test -n "$(confdir)" || list=; \
+ 	for p in $$list; do \
  	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
- 	  if test -f $$d$$p; then \
- 	    f=`echo "$$p" | sed 's|^.*/||;$(transform)'`; \
--	    echo " $(confSCRIPT_INSTALL) '$$d$$p' '$(DESTDIR)$(confdir)/$$f'"; \
--	    $(confSCRIPT_INSTALL) "$$d$$p" "$(DESTDIR)$(confdir)/$$f"; \
-+	    echo " $(confSCRIPT_INSTALL) '$$d$$p' '$(DESTDIR)$(examplesdir)/../rc.d/$$f'"; \
-+	    $(confSCRIPT_INSTALL) "$$d$$p" "$(DESTDIR)$(examplesdir)/../rc.d/$$f"; \
- 	  else :; fi; \
- 	done
+@@ -315,8 +315,8 @@
+ 	while read type dir files; do \
+ 	     if test "$$dir" = .; then dir=; else dir=/$$dir; fi; \
+ 	     test -z "$$files" || { \
+-	       echo " $(INSTALL_SCRIPT) $$files '$(DESTDIR)$(confdir)$$dir'"; \
+-	       $(INSTALL_SCRIPT) $$files "$(DESTDIR)$(confdir)$$dir" || exit $$?; \
++	       echo " $(INSTALL_SCRIPT) $$files '$(DESTDIR)$(examplesdir)/../rc.d/$$dir'"; \
++	       $(INSTALL_SCRIPT) $$files "$(DESTDIR)$(examplesdir)/../rc.d/$$dir" || exit $$?; \
+ 	     } \
+ 	; done