Update "howl" package to version 1.0.0. Changes since version 0.9.10:

- update to mDNSResponder core 58-8-1
- compile out heap debugging when NDEBUG macro is set during compilation
- errors encountered when parsing conf file are logged
- fix various unsafe sprintf calls (contributed by
  David Young dyoung@pobox.com)
- compiles cleanly using cygwin
- support for compiling under OpenBSD
- error in docs regarding swapped parameters to sw_discovery_publish_reply

4 files changed, 28 insertions, 40 deletions

diff --git a/net/howl/Makefile b/net/howl/Makefile
index cc372cb9813..ba988dc76e0 100644
--- a/net/howl/Makefile
+++ b/net/howl/Makefile
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.12 2005/12/29 06:21:59 jlam Exp $
+# $NetBSD: Makefile,v 1.13 2006/01/01 18:27:53 tron Exp $
 
-DISTNAME=		howl-0.9.10
+DISTNAME=		howl-1.0.0
 CATEGORIES=		net
 MASTER_SITES=		http://www.porchdogsoft.com/download/
 
@@ -14,8 +14,13 @@ GNU_CONFIGURE=		yes
 PTHREAD_AUTO_VARS=	yes
 
 RCD_SCRIPTS=		howl
-PKG_GROUPS+=		howl
-PKG_USERS+=		howl:howl::Zeroconf\ user
+PKG_GROUPS+=		${HOWL_GROUP}
+PKG_USERS+=		${HOWL_USER}:${HOWL_GROUP}::Zeroconf\ user
+
+BUILD_DEFS+=		HOWL_GROUP HOWL_USER
+
+FILES_SUBST+=		HOWL_GROUP=${HOWL_GROUP:Q}
+FILES_SUBST+=		HOWL_USER=${HOWL_USER:Q}
 
 .include "../../mk/pthread.buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/net/howl/distinfo b/net/howl/distinfo
index 893ae198103..76ed04c9f51 100644
--- a/net/howl/distinfo
+++ b/net/howl/distinfo
@@ -1,6 +1,6 @@
-$NetBSD: distinfo,v 1.6 2005/03/22 19:55:37 nathanw Exp $
+$NetBSD: distinfo,v 1.7 2006/01/01 18:27:53 tron Exp $
 
-SHA1 (howl-0.9.10.tar.gz) = 40e9c0fbfa8239641be3afa47a31ae6c10af1127
-RMD160 (howl-0.9.10.tar.gz) = 41cbcf538216f86f0058733ebb202385d6190852
-Size (howl-0.9.10.tar.gz) = 541004 bytes
-SHA1 (patch-aa) = c7218a7c4a58498c465057dde43c5943bce2ea5b
+SHA1 (howl-1.0.0.tar.gz) = 0592b72e8d2fac24e737cf3455969a95c6505e24
+RMD160 (howl-1.0.0.tar.gz) = f8eb6633d9edbb62038795ea66dcbf9dca4cffc1
+Size (howl-1.0.0.tar.gz) = 542782 bytes
+SHA1 (patch-aa) = 1766b2457f52a81f649e8b22c453a55342846a27
diff --git a/net/howl/files/howl.sh b/net/howl/files/howl.sh
index 4cf66bd93fc..378503eebf7 100644
--- a/net/howl/files/howl.sh
+++ b/net/howl/files/howl.sh
@@ -1,6 +1,6 @@
 #!@RCD_SCRIPTS_SHELL@
 #
-# $NetBSD: howl.sh,v 1.1 2005/01/08 06:24:41 schmonz Exp $
+# $NetBSD: howl.sh,v 1.2 2006/01/01 18:27:53 tron Exp $
 #
 
 # PROVIDE: howl
@@ -11,8 +11,8 @@
 name="howl"
 rcvar=$name
 command="@PREFIX@/bin/mDNSResponder"
-stop_cmd=":"
-howl_user="howl"
+howl_user="@HOWL_USER@"
+sig_stop=KILL
 
 load_rc_config $name
 run_rc_command "$1"
diff --git a/net/howl/patches/patch-aa b/net/howl/patches/patch-aa
index 5764134d3ec..794ef1861ed 100644
--- a/net/howl/patches/patch-aa
+++ b/net/howl/patches/patch-aa
@@ -1,30 +1,13 @@
-$NetBSD: patch-aa,v 1.3 2005/01/08 06:24:41 schmonz Exp $
+$NetBSD: patch-aa,v 1.4 2006/01/01 18:27:53 tron Exp $
 
---- src/lib/howl/socket.c.orig	2004-10-27 13:39:52.000000000 -0400
-+++ src/lib/howl/socket.c
-@@ -261,7 +261,7 @@ sw_multicast_socket_super_init(
- 	err = sw_translate_error(self->m_desc != SW_INVALID_SOCKET, sw_socket_errno());
- 	sw_check_okay_log(err, exit);
- 
--#if defined(__APPLE__) || defined(__VXWORKS__) || defined(__FreeBSD__)
-+#if defined(__APPLE__) || defined(__VXWORKS__) || defined(__FreeBSD__) || defined(__NetBSD__)
-    res = setsockopt(self->m_desc, SOL_SOCKET, SO_REUSEPORT, (char*) &opt, sizeof(opt));
+--- src/lib/howl/socket.c.orig	2005-05-19 03:02:57.000000000 +0100
++++ src/lib/howl/socket.c	2006-01-01 17:01:35.000000000 +0000
+@@ -628,7 +628,7 @@
+ 
+    if (options->m_reuseaddr.m_modified)
+    {      
+-#if defined(__APPLE__) || defined(__VXWORKS__)
++#if defined(__APPLE__) || defined(__VXWORKS__) || defined(__NetBSD__)
+ 		res = setsockopt(self->m_desc, SOL_SOCKET, SO_REUSEPORT, (char*) &options->m_reuseaddr.m_val, sizeof(options->m_reuseaddr.m_val));
  #else
- 	res = setsockopt(self->m_desc, SOL_SOCKET, SO_REUSEADDR, (char*) &opt, sizeof(opt));
-@@ -375,6 +375,7 @@ sw_socket_join_multicast_group(
- #endif
- 	int							res;
- 	sw_result					err;
-+ 	sw_uchar						mttl					= (sw_uchar) ttl;
- 
-    /*
-       initialize the group membership
-@@ -425,7 +426,7 @@ sw_socket_join_multicast_group(
- 	err = sw_translate_error(res == 0, sw_socket_errno());
- 	sw_check_okay_log(err, exit);
- 
--	res = setsockopt(self->m_desc, IPPROTO_IP, IP_MULTICAST_TTL, (char*) &real_ttl, sizeof(real_ttl));
-+	res = setsockopt(self->m_desc, IPPROTO_IP, IP_MULTICAST_TTL, (char*) &mttl, sizeof(mttl));
- 	err = sw_translate_error(res == 0, sw_socket_errno());
- 	sw_check_okay_log(err, exit);
- 
+ 		res = setsockopt(self->m_desc, SOL_SOCKET, SO_REUSEADDR, (char*) &options->m_reuseaddr.m_val, sizeof(options->m_reuseaddr.m_val));