Module Name:    src
Committed By:   tsarna
Date:           Tue Sep 29 23:56:35 UTC 2009

Modified Files:
        src/distrib/sets: sets.subr
        src/distrib/sets/lists/base: mi shl.elf shl.mi
        src/distrib/sets/lists/comp: mi shl.mi
        src/distrib/sets/lists/etc: mi
        src/distrib/sets/lists/man: mi
        src/doc: 3RDPARTY
        src/etc: Makefile group master.passwd
        src/etc/defaults: rc.conf
        src/etc/mtree: special
        src/etc/rc.d: Makefile
        src/external: Makefile
        src/external/apache2/mDNSResponder/dist/mDNSPosix: mDNSPosix.c
            mDNSUNP.c
        src/external/apache2/mDNSResponder/dist/mDNSShared: dns-sd.1 dns_sd.h
        src/external/lib: Makefile
        src/share/man/man5: mk.conf.5
        src/share/mk: bsd.README bsd.own.mk
        src/usr.sbin/postinstall: postinstall
Added Files:
        src/etc/rc.d: mdnsd
        src/external/apache2: Makefile
        src/external/apache2/mDNSResponder: Makefile Makefile.inc
            prepare-import.sh
        src/external/apache2/mDNSResponder/lib: Makefile shlib_version
        src/external/apache2/mDNSResponder/usr.bin: Makefile Makefile.inc
        src/external/apache2/mDNSResponder/usr.bin/dns-sd: Makefile
        src/external/apache2/mDNSResponder/usr.sbin: Makefile Makefile.inc
        src/external/apache2/mDNSResponder/usr.sbin/mdnsd: Makefile

Log Message:
Multicast DNS ("Bonjour") support, based on Apple's mDNSResponder.


To generate a diff of this commit:
cvs rdiff -u -r1.87 -r1.88 src/distrib/sets/sets.subr
cvs rdiff -u -r1.830 -r1.831 src/distrib/sets/lists/base/mi
cvs rdiff -u -r1.185 -r1.186 src/distrib/sets/lists/base/shl.elf
cvs rdiff -u -r1.491 -r1.492 src/distrib/sets/lists/base/shl.mi
cvs rdiff -u -r1.1313 -r1.1314 src/distrib/sets/lists/comp/mi
cvs rdiff -u -r1.88 -r1.89 src/distrib/sets/lists/comp/shl.mi
cvs rdiff -u -r1.212 -r1.213 src/distrib/sets/lists/etc/mi
cvs rdiff -u -r1.1158 -r1.1159 src/distrib/sets/lists/man/mi
cvs rdiff -u -r1.717 -r1.718 src/doc/3RDPARTY
cvs rdiff -u -r1.372 -r1.373 src/etc/Makefile
cvs rdiff -u -r1.23 -r1.24 src/etc/group
cvs rdiff -u -r1.39 -r1.40 src/etc/master.passwd
cvs rdiff -u -r1.107 -r1.108 src/etc/defaults/rc.conf
cvs rdiff -u -r1.130 -r1.131 src/etc/mtree/special
cvs rdiff -u -r1.79 -r1.80 src/etc/rc.d/Makefile
cvs rdiff -u -r0 -r1.1 src/etc/rc.d/mdnsd
cvs rdiff -u -r1.6 -r1.7 src/external/Makefile
cvs rdiff -u -r0 -r1.1 src/external/apache2/Makefile
cvs rdiff -u -r0 -r1.1 src/external/apache2/mDNSResponder/Makefile \
    src/external/apache2/mDNSResponder/Makefile.inc \
    src/external/apache2/mDNSResponder/prepare-import.sh
cvs rdiff -u -r1.1.1.1 -r1.2 \
    src/external/apache2/mDNSResponder/dist/mDNSPosix/mDNSPosix.c \
    src/external/apache2/mDNSResponder/dist/mDNSPosix/mDNSUNP.c
cvs rdiff -u -r1.1.1.1 -r1.2 \
    src/external/apache2/mDNSResponder/dist/mDNSShared/dns-sd.1 \
    src/external/apache2/mDNSResponder/dist/mDNSShared/dns_sd.h
cvs rdiff -u -r0 -r1.1 src/external/apache2/mDNSResponder/lib/Makefile \
    src/external/apache2/mDNSResponder/lib/shlib_version
cvs rdiff -u -r0 -r1.1 src/external/apache2/mDNSResponder/usr.bin/Makefile \
    src/external/apache2/mDNSResponder/usr.bin/Makefile.inc
cvs rdiff -u -r0 -r1.1 \
    src/external/apache2/mDNSResponder/usr.bin/dns-sd/Makefile
cvs rdiff -u -r0 -r1.1 src/external/apache2/mDNSResponder/usr.sbin/Makefile \
    src/external/apache2/mDNSResponder/usr.sbin/Makefile.inc
cvs rdiff -u -r0 -r1.1 \
    src/external/apache2/mDNSResponder/usr.sbin/mdnsd/Makefile
cvs rdiff -u -r1.11 -r1.12 src/external/lib/Makefile
cvs rdiff -u -r1.49 -r1.50 src/share/man/man5/mk.conf.5
cvs rdiff -u -r1.252 -r1.253 src/share/mk/bsd.README
cvs rdiff -u -r1.582 -r1.583 src/share/mk/bsd.own.mk
cvs rdiff -u -r1.104 -r1.105 src/usr.sbin/postinstall/postinstall

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/distrib/sets/sets.subr
diff -u src/distrib/sets/sets.subr:1.87 src/distrib/sets/sets.subr:1.88
--- src/distrib/sets/sets.subr:1.87	Tue Sep  8 07:08:00 2009
+++ src/distrib/sets/sets.subr	Tue Sep 29 23:56:26 2009
@@ -1,4 +1,4 @@
-#	$NetBSD: sets.subr,v 1.87 2009/09/08 07:08:00 skrll Exp $
+#	$NetBSD: sets.subr,v 1.88 2009/09/29 23:56:26 tsarna Exp $
 #
 
 #
@@ -53,6 +53,7 @@
 	MKMAN		\
 	MKMANPAGES	\
 	MKMANZ		\
+	MKMDNS		\
 	MKNLS		\
 	MKNVI		\
 	MKPAM		\
@@ -235,7 +236,7 @@
 # In each file, a record consists of a path and a System Package name,
 # separated by whitespace. E.g.,
 #
-# 	# $NetBSD: sets.subr,v 1.87 2009/09/08 07:08:00 skrll Exp $
+# 	# $NetBSD: sets.subr,v 1.88 2009/09/29 23:56:26 tsarna Exp $
 # 	.			base-sys-root	[keyword[,...]]
 # 	./altroot		base-sys-root
 # 	./bin			base-sys-root
@@ -285,6 +286,7 @@
 #	man			${MKMAN} != no
 #	manpages		${MKMANPAGES} != no
 #	manz			${MKMANZ} != no
+#	mdns			${MKMDNS} != no
 #	nls			${MKNLS} != no
 #	nvi			${MKNVI} != no
 #	pam			${MKPAM} != no

Index: src/distrib/sets/lists/base/mi
diff -u src/distrib/sets/lists/base/mi:1.830 src/distrib/sets/lists/base/mi:1.831
--- src/distrib/sets/lists/base/mi:1.830	Thu Sep 17 07:40:44 2009
+++ src/distrib/sets/lists/base/mi	Tue Sep 29 23:56:26 2009
@@ -1,4 +1,4 @@
-# $NetBSD: mi,v 1.830 2009/09/17 07:40:44 mrg Exp $
+# $NetBSD: mi,v 1.831 2009/09/29 23:56:26 tsarna Exp $
 #
 # Note:	Don't delete entries from here - mark them as "obsolete" instead,
 #	unless otherwise stated below.
@@ -472,6 +472,7 @@
 ./usr/bin/md2					base-util-bin
 ./usr/bin/md4					base-util-bin
 ./usr/bin/md5					base-util-bin
+./usr/bin/dns-sd				base-mdns-bin		mdns
 ./usr/bin/merge					base-util-bin
 ./usr/bin/mesg					base-util-bin
 ./usr/bin/midiplay				base-audio-bin
@@ -1119,6 +1120,7 @@
 ./usr/sbin/map-mbone				base-netutil-bin
 ./usr/sbin/mbrlabel				base-obsolete		obsolete
 ./usr/sbin/mdconfig				base-sysutil-bin
+./usr/sbin/mdnsd				base-mdns-bin		mdns
 ./usr/sbin/mdsetimage				base-sysutil-bin	binutils
 ./usr/sbin/mk-amd-map				base-amd-bin
 ./usr/sbin/mkalias				base-nis-bin		yp

Index: src/distrib/sets/lists/base/shl.elf
diff -u src/distrib/sets/lists/base/shl.elf:1.185 src/distrib/sets/lists/base/shl.elf:1.186
--- src/distrib/sets/lists/base/shl.elf:1.185	Tue Sep  8 20:34:47 2009
+++ src/distrib/sets/lists/base/shl.elf	Tue Sep 29 23:56:26 2009
@@ -1,4 +1,4 @@
-# $NetBSD: shl.elf,v 1.185 2009/09/08 20:34:47 pooka Exp $
+# $NetBSD: shl.elf,v 1.186 2009/09/29 23:56:26 tsarna Exp $
 #
 # Note:	Do not mark "old" major and major.minor shared libraries as
 #	"obsolete"; just remove the entry, as third-party applications
@@ -121,6 +121,8 @@
 ./usr/lib/libdevmapper.so.1			base-lvm-shlib		lvm
 ./usr/lib/libdns.so				base-bind-shlib
 ./usr/lib/libdns.so.4				base-bind-shlib
+./usr/lib/libdns_sd.so				base-mdns-shlib		mdns
+./usr/lib/libdns_sd.so.1			base-mdns-shlib		mdns
 ./usr/lib/libedit.so				base-sys-shlib
 ./usr/lib/libedit.so.3				base-sys-shlib
 ./usr/lib/libevent.so				base-sys-shlib

Index: src/distrib/sets/lists/base/shl.mi
diff -u src/distrib/sets/lists/base/shl.mi:1.491 src/distrib/sets/lists/base/shl.mi:1.492
--- src/distrib/sets/lists/base/shl.mi:1.491	Tue Sep  8 20:34:47 2009
+++ src/distrib/sets/lists/base/shl.mi	Tue Sep 29 23:56:26 2009
@@ -1,4 +1,4 @@
-# $NetBSD: shl.mi,v 1.491 2009/09/08 20:34:47 pooka Exp $
+# $NetBSD: shl.mi,v 1.492 2009/09/29 23:56:26 tsarna Exp $
 #
 # Note:	Don't delete entries from here - mark them as "obsolete" instead,
 #	unless otherwise stated below.
@@ -69,6 +69,7 @@
 ./usr/lib/libdes.so.8.1				base-crypto-shlib	crypto
 ./usr/lib/libdevmapper.so.1.0			base-lvm-shlib		lvm
 ./usr/lib/libdns.so.4.0				base-bind-shlib
+./usr/lib/libdns_sd.so.1.0			base-mdns-shlib		mdns
 ./usr/lib/libedit.so.3.0			base-sys-shlib
 ./usr/lib/libevent.so.3.1			base-sys-shlib
 ./usr/lib/libfetch.so.3.0			base-sys-shlib

Index: src/distrib/sets/lists/comp/mi
diff -u src/distrib/sets/lists/comp/mi:1.1313 src/distrib/sets/lists/comp/mi:1.1314
--- src/distrib/sets/lists/comp/mi:1.1313	Wed Sep 23 09:18:31 2009
+++ src/distrib/sets/lists/comp/mi	Tue Sep 29 23:56:26 2009
@@ -1,4 +1,4 @@
-#	$NetBSD: mi,v 1.1313 2009/09/23 09:18:31 njoly Exp $
+#	$NetBSD: mi,v 1.1314 2009/09/29 23:56:26 tsarna Exp $
 #
 # Note: don't delete entries from here - mark them as "obsolete" instead.
 #
@@ -609,6 +609,7 @@
 ./usr/include/dirent.h				comp-c-include
 ./usr/include/disktab.h				comp-c-include
 ./usr/include/dlfcn.h				comp-c-include
+./usr/include/dns_sd.h				comp-mdns-include	mdns
 ./usr/include/elf.h				comp-c-include
 ./usr/include/err.h				comp-c-include
 ./usr/include/errno.h				comp-c-include
@@ -2349,6 +2350,9 @@
 ./usr/lib/libdns.a				comp-bind-lib
 ./usr/lib/libdns_g.a				-unknown-		debuglib
 ./usr/lib/libdns_p.a				comp-bind-proflib	profile
+./usr/lib/libdns_sd.a				comp-mdns-lib		mdns
+./usr/lib/libdns_sd_g.a				-unknown-		debuglib,mdns
+./usr/lib/libdns_sd_p.a				comp-mdns-proflib	profile,mdns
 ./usr/lib/libedit.a				comp-c-lib
 ./usr/lib/libedit_g.a				-unknown-		debuglib
 ./usr/lib/libedit_p.a				comp-c-proflib		profile
@@ -3594,6 +3598,7 @@
 ./usr/libdata/lint/llib-lcurses.ln		comp-c-lintlib		lint
 ./usr/libdata/lint/llib-ldes.ln			comp-c-lintlib		lint,crypto
 ./usr/libdata/lint/llib-ldns.ln			comp-bind-lintlib	lint
+./usr/libdata/lint/llib-ldns_sd.ln		comp-mdns-lintlib	lint,mdns
 ./usr/libdata/lint/llib-ledit.ln		comp-c-lintlib		lint
 ./usr/libdata/lint/llib-lfetch.ln		comp-c-lintlib		lint
 ./usr/libdata/lint/llib-lform.ln		comp-c-lintlib		lint

Index: src/distrib/sets/lists/comp/shl.mi
diff -u src/distrib/sets/lists/comp/shl.mi:1.88 src/distrib/sets/lists/comp/shl.mi:1.89
--- src/distrib/sets/lists/comp/shl.mi:1.88	Tue Sep  8 20:34:48 2009
+++ src/distrib/sets/lists/comp/shl.mi	Tue Sep 29 23:56:26 2009
@@ -1,4 +1,4 @@
-# $NetBSD: shl.mi,v 1.88 2009/09/08 20:34:48 pooka Exp $
+# $NetBSD: shl.mi,v 1.89 2009/09/29 23:56:26 tsarna Exp $
 #
 # Note: don't delete entries from here - mark them as "obsolete" instead.
 #
@@ -22,6 +22,7 @@
 ./usr/lib/libdes_pic.a				comp-c-piclib		crypto
 ./usr/lib/libdevmapper_pic.a			comp-lvm-piclib		lvm
 ./usr/lib/libdns_pic.a				comp-bind-piclib
+./usr/lib/libdns_sd_pic.a			comp-mdns-piclib	mdns
 ./usr/lib/libedit_pic.a				comp-c-piclib
 ./usr/lib/libevent_pic.a			comp-c-piclib
 ./usr/lib/libfetch_pic.a			comp-c-piclib

Index: src/distrib/sets/lists/etc/mi
diff -u src/distrib/sets/lists/etc/mi:1.212 src/distrib/sets/lists/etc/mi:1.213
--- src/distrib/sets/lists/etc/mi:1.212	Sat Jul 25 16:22:59 2009
+++ src/distrib/sets/lists/etc/mi	Tue Sep 29 23:56:26 2009
@@ -1,4 +1,4 @@
-# $NetBSD: mi,v 1.212 2009/07/25 16:22:59 mbalmer Exp $
+# $NetBSD: mi,v 1.213 2009/09/29 23:56:26 tsarna Exp $
 #
 # Note: end-user configuration files that are moved to another location
 #	should not be marked "obsolete"; they should just be removed from
@@ -218,6 +218,7 @@
 ./etc/rc.d/local				etc-sys-rc
 ./etc/rc.d/lpd					etc-lpr-rc
 ./etc/rc.d/lvm					etc-sys-rc
+./etc/rc.d/mdnsd				etc-mdns-rc
 ./etc/rc.d/mixerctl				etc-audio-rc
 ./etc/rc.d/mopd					etc-bootserver-rc
 ./etc/rc.d/motd					etc-sys-rc

Index: src/distrib/sets/lists/man/mi
diff -u src/distrib/sets/lists/man/mi:1.1158 src/distrib/sets/lists/man/mi:1.1159
--- src/distrib/sets/lists/man/mi:1.1158	Mon Sep 14 10:36:49 2009
+++ src/distrib/sets/lists/man/mi	Tue Sep 29 23:56:27 2009
@@ -1,4 +1,4 @@
-# $NetBSD: mi,v 1.1158 2009/09/14 10:36:49 degroote Exp $
+# $NetBSD: mi,v 1.1159 2009/09/29 23:56:27 tsarna Exp $
 #
 # Note: don't delete entries from here - mark them as "obsolete" instead.
 #
@@ -127,6 +127,7 @@
 ./usr/share/man/cat1/dig.0			man-netutil-catman	.cat
 ./usr/share/man/cat1/dirname.0			man-util-catman		.cat
 ./usr/share/man/cat1/dirs.0			man-util-catman		.cat
+./usr/share/man/cat1/dns-sd.0			man-mdns-catman		mdns,.cat
 ./usr/share/man/cat1/dnskeygen.0		man-obsolete		obsolete
 ./usr/share/man/cat1/dnsquery.0			man-obsolete		obsolete
 ./usr/share/man/cat1/domainname.0		man-nis-catman		.cat
@@ -2262,6 +2263,7 @@
 ./usr/share/man/cat8/mbr.0			man-obsolete		obsolete
 ./usr/share/man/cat8/mbrlabel.0			man-sysutil-catman	.cat
 ./usr/share/man/cat8/mdconfig.0			man-sysutil-catman	.cat
+./usr/share/man/cat8/mdnsd.0			man-mdns-catman		mdns,.cat
 ./usr/share/man/cat8/mdsetimage.0		man-sysutil-catman	binutils,.cat
 ./usr/share/man/cat8/mfs.0			man-sys-catman		.cat
 ./usr/share/man/cat8/mipsco/MAKEDEV.0		man-obsolete		obsolete
@@ -2825,6 +2827,7 @@
 ./usr/share/man/html1/dig.html			man-netutil-htmlman	html
 ./usr/share/man/html1/dirname.html		man-util-htmlman	html
 ./usr/share/man/html1/dirs.html			man-util-htmlman	html
+./usr/share/man/html1/dns-sd.html			man-mdns-htmlman	mdns,html
 ./usr/share/man/html1/domainname.html		man-nis-htmlman		html
 ./usr/share/man/html1/download-vulnerability-list.html	man-obsolete		obsolete
 ./usr/share/man/html1/dtmfdecode.html		man-isdn-htmlman	html
@@ -4682,6 +4685,7 @@
 ./usr/share/man/html8/master.html		man-postfix-htmlman	postfix,html
 ./usr/share/man/html8/mbrlabel.html		man-sysutil-htmlman	html
 ./usr/share/man/html8/mdconfig.html		man-sysutil-htmlman	html
+./usr/share/man/html8/mdnsd.html		man-mdns-htmlman	mdns,html
 ./usr/share/man/html8/mdsetimage.html		man-sysutil-htmlman	binutils,html
 ./usr/share/man/html8/mfs.html			man-sys-htmlman		html
 ./usr/share/man/html8/mk-amd-map.html		man-amd-htmlman		html
@@ -5139,6 +5143,7 @@
 ./usr/share/man/man1/dig.1			man-netutil-man		.man
 ./usr/share/man/man1/dirname.1			man-util-man		.man
 ./usr/share/man/man1/dirs.1			man-util-man		.man
+./usr/share/man/man1/dns-sd.1			man-mdns-man		mdns,.man
 ./usr/share/man/man1/dnskeygen.1		man-obsolete		obsolete
 ./usr/share/man/man1/dnsquery.1			man-obsolete		obsolete
 ./usr/share/man/man1/domainname.1		man-nis-man		.man
@@ -7274,6 +7279,7 @@
 ./usr/share/man/man8/mbr.8			man-obsolete		obsolete
 ./usr/share/man/man8/mbrlabel.8			man-sysutil-man		.man
 ./usr/share/man/man8/mdconfig.8			man-sysutil-man		.man
+./usr/share/man/man8/mdnsd.8			man-mdns-man		mdns,.man
 ./usr/share/man/man8/mdsetimage.8		man-sysutil-man		binutils,.man
 ./usr/share/man/man8/mfs.8			man-sys-man		.man
 ./usr/share/man/man8/mipsco/MAKEDEV.8		man-obsolete		obsolete

Index: src/doc/3RDPARTY
diff -u src/doc/3RDPARTY:1.717 src/doc/3RDPARTY:1.718
--- src/doc/3RDPARTY:1.717	Fri Sep  4 19:37:16 2009
+++ src/doc/3RDPARTY	Tue Sep 29 23:56:27 2009
@@ -1,4 +1,4 @@
-#	$NetBSD: 3RDPARTY,v 1.717 2009/09/04 19:37:16 jmcneill Exp $
+#	$NetBSD: 3RDPARTY,v 1.718 2009/09/29 23:56:27 tsarna Exp $
 #
 # This file contains a list of the software that has been integrated into
 # NetBSD where we are not the primary maintainer.
@@ -609,6 +609,19 @@
 under src/usr.sbin). We don't use tcpd; that functionality is built
 into inetd. The provided libwrap2netbsd script handles just libwrap.
 
+Package:	mDNSResponder
+Version:	212.1
+Current Vers:	212.1
+Maintainer:	Apple
+Archive Site:	http://www.opensource.apple.com/tarballs/mDNSResponder/
+Home Page:	http://developer.apple.com/opensource/internet/bonjour.html
+Mailing List:	bonjour-...@lists.apple.com
+License:	Apache2 (mdnsd), BSD 3-clause (libdns_sd),
+		BSD 3-clause like (dns-sd)
+Responsible:	tsarna
+Notes:
+The sources were integrated into src/sys/external/apache2/mDNSResponder/dist.
+
 Package:	mesa-drm
 Version:	git 85b9f737db0d2a845e4d7e2bbf9ad12ff9e2227c
 Current Vers:

Index: src/etc/Makefile
diff -u src/etc/Makefile:1.372 src/etc/Makefile:1.373
--- src/etc/Makefile:1.372	Tue Sep  8 07:08:01 2009
+++ src/etc/Makefile	Tue Sep 29 23:56:27 2009
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.372 2009/09/08 07:08:01 skrll Exp $
+#	$NetBSD: Makefile,v 1.373 2009/09/29 23:56:27 tsarna Exp $
 #	from: @(#)Makefile	8.7 (Berkeley) 5/25/95
 
 # Environment variables without default values:
@@ -189,7 +189,7 @@
 		MKGCC MKGCCCMDS MKGDB \
 		MKHESIOD MKHOSTOBJ MKHTML MKIEEEFP MKINET6 MKINFO MKIPFILTER \
 		MKKERBEROS MKLDAP MKLINKLIB MKLINT \
-		MKMAN MKMANZ MKNLS MKNVI MKOBJ MKOBJDIRS \
+		MKMAN MKMANZ MKMDNS MKNLS MKNVI MKOBJ MKOBJDIRS \
 		MKPAM MKPF MKPIC MKPICINSTALL MKPICLIB MKPOSTFIX MKPROFILE \
 		MKSHARE MKSKEY MKSOFTFLOAT MKSTATICLIB \
 		MKUNPRIVED MKUPDATE MKX11 MKYP \

Index: src/etc/group
diff -u src/etc/group:1.23 src/etc/group:1.24
--- src/etc/group:1.23	Tue Oct 16 02:47:14 2007
+++ src/etc/group	Tue Sep 29 23:56:27 2009
@@ -20,6 +20,7 @@
 _timedc:*:22:
 _sdpd:*:23:
 _httpd:*:24:
+_mdnsd:*:25:
 guest:*:31:root
 nobody:*:39:
 utmp:*:45:

Index: src/etc/master.passwd
diff -u src/etc/master.passwd:1.39 src/etc/master.passwd:1.40
--- src/etc/master.passwd:1.39	Tue Oct 16 02:47:14 2007
+++ src/etc/master.passwd	Tue Sep 29 23:56:27 2009
@@ -14,5 +14,6 @@
 _timedc:*:22:22::0:0:& pseudo-user:/nonexistent:/sbin/nologin
 _sdpd:*:23:23::0:0:& pseudo-user:/nonexistent:/sbin/nologin
 _httpd:*:24:24::0:0:& pseudo-user:/var/www:/sbin/nologin
+_mdnsd:*:25:25::0:0:& pseudo-user:/var/www:/sbin/nologin
 uucp:*:66:1::0:0:UNIX-to-UNIX Copy:/nonexistent:/sbin/nologin
 nobody:*:32767:39::0:0:Unprivileged user:/nonexistent:/sbin/nologin

Index: src/etc/defaults/rc.conf
diff -u src/etc/defaults/rc.conf:1.107 src/etc/defaults/rc.conf:1.108
--- src/etc/defaults/rc.conf:1.107	Sat Sep 19 19:47:48 2009
+++ src/etc/defaults/rc.conf	Tue Sep 29 23:56:27 2009
@@ -1,4 +1,4 @@
-#	$NetBSD: rc.conf,v 1.107 2009/09/19 19:47:48 dholland Exp $
+#	$NetBSD: rc.conf,v 1.108 2009/09/29 23:56:27 tsarna Exp $
 #
 # /etc/defaults/rc.conf --
 #	default configuration of /etc/rc.conf
@@ -160,6 +160,7 @@
 
 # Networking startup.
 #
+mdnsd=NO		mdnsd_user="_mdnsd"
 ipfilter=NO		ipfilter_flags=""	# uses /etc/ipf.conf
 ipnat=NO					# uses /etc/ipnat.conf
 ipfs=NO			ipfs_flags=""		# save/load ipnat and ipf states

Index: src/etc/mtree/special
diff -u src/etc/mtree/special:1.130 src/etc/mtree/special:1.131
--- src/etc/mtree/special:1.130	Thu Sep 17 11:52:02 2009
+++ src/etc/mtree/special	Tue Sep 29 23:56:27 2009
@@ -1,4 +1,4 @@
-#	$NetBSD: special,v 1.130 2009/09/17 11:52:02 tron Exp $
+#	$NetBSD: special,v 1.131 2009/09/29 23:56:27 tsarna Exp $
 #	@(#)special	8.2 (Berkeley) 1/23/94
 #
 # This file may be overwritten on upgrades.
@@ -406,6 +406,7 @@
 ./var/mail			type=dir  mode=1777 ignore
 ./var/preserve			type=dir  mode=0755 ignore
 ./var/run			type=dir  mode=0755
+./var/run/mdnsd			type=dir  mode=0755 optional
 ./var/run/utmp			type=file mode=0664 gname=utmp tags=exclude
 ./var/run/utmpx			type=file mode=0664 gname=utmp tags=exclude
 ./var/spool			type=dir  mode=0755

Index: src/etc/rc.d/Makefile
diff -u src/etc/rc.d/Makefile:1.79 src/etc/rc.d/Makefile:1.80
--- src/etc/rc.d/Makefile:1.79	Sat Jul 25 16:20:10 2009
+++ src/etc/rc.d/Makefile	Tue Sep 29 23:56:27 2009
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.79 2009/07/25 16:20:10 mbalmer Exp $
+# $NetBSD: Makefile,v 1.80 2009/09/29 23:56:27 tsarna Exp $
 
 .include <bsd.own.mk>
 
@@ -25,9 +25,9 @@
 		identd ifwatchd inetd ipfilter ipfs ipmon ipnat ipsec \
 		irdaattach iscsi_target isdnd \
 		kdc \
-		ldconfig local lpd lvm\
-		mixerctl mopd motd mountall mountcritlocal mountcritremote \
-		mountd moused mrouted \
+		ldconfig local lpd lvm \
+		mdnsd mixerctl mopd motd mountall mountcritlocal \
+		mountcritremote mountd moused mrouted \
 		named ndbootd network newsyslog nfsd nfslocking ntpd ntpdate \
 		perusertmp pf pf_boot pflogd postfix powerd ppp pwcheck \
 		quota \

Index: src/external/Makefile
diff -u src/external/Makefile:1.6 src/external/Makefile:1.7
--- src/external/Makefile:1.6	Fri Aug 21 23:13:23 2009
+++ src/external/Makefile	Tue Sep 29 23:56:27 2009
@@ -1,7 +1,7 @@
-#	$NetBSD: Makefile,v 1.6 2009/08/21 23:13:23 skrll Exp $
+#	$NetBSD: Makefile,v 1.7 2009/09/29 23:56:27 tsarna Exp $
 
 SUBDIR+= lib .WAIT
 
-SUBDIR+= bsd intel-fw-eula intel-fw-public gpl2 gpl3 ibm-public intel-public
+SUBDIR+= apache2 bsd intel-fw-eula intel-fw-public gpl2 gpl3 ibm-public intel-public
 
 .include <bsd.subdir.mk>

Index: src/external/apache2/mDNSResponder/dist/mDNSPosix/mDNSPosix.c
diff -u src/external/apache2/mDNSResponder/dist/mDNSPosix/mDNSPosix.c:1.1.1.1 src/external/apache2/mDNSResponder/dist/mDNSPosix/mDNSPosix.c:1.2
--- src/external/apache2/mDNSResponder/dist/mDNSPosix/mDNSPosix.c:1.1.1.1	Tue Sep 29 22:14:13 2009
+++ src/external/apache2/mDNSResponder/dist/mDNSPosix/mDNSPosix.c	Tue Sep 29 23:56:28 2009
@@ -802,7 +802,13 @@
 		{
 		struct ipv6_mreq imr6;
 		struct sockaddr_in6 bindAddr6;
-	#if defined(IPV6_PKTINFO)
+	#if defined(IPV6_RECVPKTINFO)
+		if (err == 0)
+			{
+				err = setsockopt(*sktPtr, IPPROTO_IPV6, IPV6_RECVPKTINFO, &kOn, sizeof(kOn));
+				if (err < 0) { err = errno; perror("setsockopt - IPV6_RECVPKTINFO"); }
+			}
+#elif defined(IPV6_PKTINFO)
 		if (err == 0)
 			{
 				err = setsockopt(*sktPtr, IPPROTO_IPV6, IPV6_PKTINFO, &kOn, sizeof(kOn));
@@ -811,7 +817,13 @@
 	#else
 		#warning This platform has no way to get the destination interface information for IPv6 -- will only work for single-homed hosts
 	#endif
-	#if defined(IPV6_HOPLIMIT)
+	#if defined(IPV6_RECVHOPLIMIT)
+		if (err == 0)
+			{
+				err = setsockopt(*sktPtr, IPPROTO_IPV6, IPV6_RECVHOPLIMIT, &kOn, sizeof(kOn));
+				if (err < 0) { err = errno; perror("setsockopt - IPV6_RECVHOPLIMIT"); }
+			}
+	#elif defined(IPV6_HOPLIMIT)
 		if (err == 0)
 			{
 				err = setsockopt(*sktPtr, IPPROTO_IPV6, IPV6_HOPLIMIT, &kOn, sizeof(kOn));
Index: src/external/apache2/mDNSResponder/dist/mDNSPosix/mDNSUNP.c
diff -u src/external/apache2/mDNSResponder/dist/mDNSPosix/mDNSUNP.c:1.1.1.1 src/external/apache2/mDNSResponder/dist/mDNSPosix/mDNSUNP.c:1.2
--- src/external/apache2/mDNSResponder/dist/mDNSPosix/mDNSUNP.c:1.1.1.1	Tue Sep 29 22:14:14 2009
+++ src/external/apache2/mDNSResponder/dist/mDNSPosix/mDNSUNP.c	Tue Sep 29 23:56:28 2009
@@ -188,8 +188,10 @@
     #include <net/if_dl.h>
 #endif
 
-#if defined(AF_INET6) && HAVE_IPV6 && !HAVE_LINUX
+#if defined(AF_INET6) && HAVE_IPV6 && !HAVE_LINUX && !defined(sun)
+#if defined(__FreeBSD__) || defined(__DragonFly__)
 #include <net/if_var.h>
+#endif
 #include <netinet/in_var.h>
 // Note: netinet/in_var.h implicitly includes netinet6/in6_var.h for us
 #endif

Index: src/external/apache2/mDNSResponder/dist/mDNSShared/dns-sd.1
diff -u src/external/apache2/mDNSResponder/dist/mDNSShared/dns-sd.1:1.1.1.1 src/external/apache2/mDNSResponder/dist/mDNSShared/dns-sd.1:1.2
--- src/external/apache2/mDNSResponder/dist/mDNSShared/dns-sd.1:1.1.1.1	Tue Sep 29 22:14:14 2009
+++ src/external/apache2/mDNSResponder/dist/mDNSShared/dns-sd.1	Tue Sep 29 23:56:28 2009
@@ -37,7 +37,7 @@
 .\"
 .Dd April 2004              \" Date
 .Dt dns-sd 1                \" Document Title
-.Os Darwin                  \" Operating System
+.Os NetBSD                  \" Operating System
 .\"
 .Sh NAME
 .Nm dns-sd
@@ -64,11 +64,6 @@
 .Nm
 uses is documented in
 .Pa /usr/include/dns_sd.h .
-The
-.Nm
-command replaces the older
-.Xr mDNS 1
-command.
 .Pp
 The
 .Nm
@@ -202,14 +197,11 @@
 .Pa /usr/bin/dns-sd \" Pathname
 .\"
 .Sh SEE ALSO
-.Xr mDNS 1
-.Xr mDNSResponder 8
-.\"
-.Sh BUGS
-.Nm
-bugs are tracked in Apple Radar component "mDNSResponder".
+.Xr mdnsd 8
 .\"
 .Sh HISTORY
 The
 .Nm
-command first appeared in Mac OS X 10.4 (Tiger).
+command first appeared in
+.Nx 6.0 ,
+having originated in Mac OS X 10.4 (Tiger). 
Index: src/external/apache2/mDNSResponder/dist/mDNSShared/dns_sd.h
diff -u src/external/apache2/mDNSResponder/dist/mDNSShared/dns_sd.h:1.1.1.1 src/external/apache2/mDNSResponder/dist/mDNSShared/dns_sd.h:1.2
--- src/external/apache2/mDNSResponder/dist/mDNSShared/dns_sd.h:1.1.1.1	Tue Sep 29 22:14:15 2009
+++ src/external/apache2/mDNSResponder/dist/mDNSShared/dns_sd.h	Tue Sep 29 23:56:28 2009
@@ -2339,6 +2339,7 @@
 
 #endif //__APPLE_API_PRIVATE
 
+#if !defined(__NetBSD__)
 /* Some C compiler cleverness. We can make the compiler check certain things for us,
  * and report errors at compile-time if anything is wrong. The usual way to do this would
  * be to use a run-time "if" statement or the conventional run-time "assert" mechanism, but
@@ -2350,6 +2351,7 @@
     {
     char assert0[(sizeof(union _TXTRecordRef_t) == 16) ? 1 : -1];
     };
+#endif
 
 #ifdef  __cplusplus
     }

Index: src/external/lib/Makefile
diff -u src/external/lib/Makefile:1.11 src/external/lib/Makefile:1.12
--- src/external/lib/Makefile:1.11	Thu Jun 25 13:59:02 2009
+++ src/external/lib/Makefile	Tue Sep 29 23:56:34 2009
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.11 2009/06/25 13:59:02 agc Exp $
+#	$NetBSD: Makefile,v 1.12 2009/09/29 23:56:34 tsarna Exp $
 
 #
 # This Makefile exists to provide a single point to build
@@ -12,6 +12,10 @@
 SUBDIR+= ../bsd/atf/lib
 .endif
 
+.if (${MKMDNS} != "no")
+SUBDIR+= ../apache2/mDNSResponder/lib
+.endif
+
 .if (${MKCRYPTO} != "no")
 SUBDIR+= ../../crypto/external/lib .WAIT
 

Index: src/share/man/man5/mk.conf.5
diff -u src/share/man/man5/mk.conf.5:1.49 src/share/man/man5/mk.conf.5:1.50
--- src/share/man/man5/mk.conf.5:1.49	Tue Sep  8 07:54:49 2009
+++ src/share/man/man5/mk.conf.5	Tue Sep 29 23:56:34 2009
@@ -1,4 +1,4 @@
-.\"	$NetBSD: mk.conf.5,v 1.49 2009/09/08 07:54:49 wiz Exp $
+.\"	$NetBSD: mk.conf.5,v 1.50 2009/09/29 23:56:34 tsarna Exp $
 .\"
 .\"  Copyright (c) 1999-2003 The NetBSD Foundation, Inc.
 .\"  All rights reserved.
@@ -487,6 +487,12 @@
 at installation time.
 .DFLTn
 .
+.It Sy MKMDNS
+.YorN
+Indicates whether the mDNS (Multicast DNS) infrastructure
+(libraries and support programs) is built and installed.
+.DFLTy
+.
 .It Sy MKNLS
 .YorN
 Indicates whether Native Language System (NLS) locale zone files will be

Index: src/share/mk/bsd.README
diff -u src/share/mk/bsd.README:1.252 src/share/mk/bsd.README:1.253
--- src/share/mk/bsd.README:1.252	Tue Sep  8 07:08:03 2009
+++ src/share/mk/bsd.README	Tue Sep 29 23:56:34 2009
@@ -1,4 +1,4 @@
-#	$NetBSD: bsd.README,v 1.252 2009/09/08 07:08:03 skrll Exp $
+#	$NetBSD: bsd.README,v 1.253 2009/09/29 23:56:34 tsarna Exp $
 #	@(#)bsd.README	8.2 (Berkeley) 4/2/94
 
 This is the README file for the make "include" files for the NetBSD
@@ -241,6 +241,10 @@
 MKMANZ		If not "no", compress manual pages at installation time.
 		Default: no
 
+MKMDNS		If "no", disables building of mDNS infrastructure
+		(libraries and support programs).
+		Default: yes
+
 MKNLS		If "no", don't build or install the NLS files and locale
 		definition files.
 		Default: yes

Index: src/share/mk/bsd.own.mk
diff -u src/share/mk/bsd.own.mk:1.582 src/share/mk/bsd.own.mk:1.583
--- src/share/mk/bsd.own.mk:1.582	Sat Sep 26 07:28:38 2009
+++ src/share/mk/bsd.own.mk	Tue Sep 29 23:56:34 2009
@@ -1,4 +1,4 @@
-#	$NetBSD: bsd.own.mk,v 1.582 2009/09/26 07:28:38 skrll Exp $
+#	$NetBSD: bsd.own.mk,v 1.583 2009/09/29 23:56:34 tsarna Exp $
 
 .if !defined(_BSD_OWN_MK_)
 _BSD_OWN_MK_=1
@@ -684,6 +684,7 @@
 	MKKMOD \
 	MKLDAP MKLINKLIB MKLINT \
 	MKMAN \
+	MKMDNS \
 	MKNLS \
 	MKOBJ \
 	MKPAM \

Index: src/usr.sbin/postinstall/postinstall
diff -u src/usr.sbin/postinstall/postinstall:1.104 src/usr.sbin/postinstall/postinstall:1.105
--- src/usr.sbin/postinstall/postinstall:1.104	Mon Sep 21 18:03:03 2009
+++ src/usr.sbin/postinstall/postinstall	Tue Sep 29 23:56:35 2009
@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# $NetBSD: postinstall,v 1.104 2009/09/21 18:03:03 njoly Exp $
+# $NetBSD: postinstall,v 1.105 2009/09/29 23:56:35 tsarna Exp $
 #
 # Copyright (c) 2002-2008 The NetBSD Foundation, Inc.
 # All rights reserved.
@@ -805,7 +805,7 @@
 
 	check_ids "$1" groups "${DEST_DIR}/etc/group" \
 	    named ntpd sshd authpf _pflogd _rwhod _proxy _timedc \
-	    _sdpd _httpd
+	    _sdpd _httpd _mdnsd
 }
 
 #
@@ -1058,8 +1058,8 @@
 		irdaattach iscsi_target isdnd \
 		kdc \
 		ldconfig local lpd lvm\
-		mixerctl mopd motd mountall mountcritlocal mountcritremote \
-		mountd moused mrouted \
+		mdnsd mixerctl mopd motd mountall mountcritlocal \
+		mountcritremote mountd moused mrouted \
 		named ndbootd network newsyslog nfsd nfslocking ntpd ntpdate \
 		perusertmp pf pf_boot pflogd postfix powerd ppp pwcheck \
 		quota \
@@ -1357,7 +1357,7 @@
 
 	check_ids "$1" users "${DEST_DIR}/etc/master.passwd" \
 	    named ntpd postfix sshd _pflogd _rwhod _proxy _timedc \
-	    _sdpd _httpd
+	    _sdpd _httpd _mdnsd
 }
 
 

Added files:

Index: src/etc/rc.d/mdnsd
diff -u /dev/null src/etc/rc.d/mdnsd:1.1
--- /dev/null	Tue Sep 29 23:56:35 2009
+++ src/etc/rc.d/mdnsd	Tue Sep 29 23:56:27 2009
@@ -0,0 +1,26 @@
+#!/bin/sh
+#
+# $NetBSD: mdnsd,v 1.1 2009/09/29 23:56:27 tsarna Exp $
+#
+
+# PROVIDE: mdnsd
+# REQUIRE: SERVERS
+
+$_rc_subr_loaded . /etc/rc.subr
+
+name="mdnsd"
+rcvar=$name
+command="/usr/sbin/$name"
+pidfile="/var/run/mdnsd/${name}.pid"
+start_precmd="mdnsd_precmd"
+
+mdnsd_precmd()
+{
+    if [ ! -d /var/run/mdns ]; then
+        mkdir -p -m 755 /var/run/mdnsd
+    fi
+    chown _mdnsd:_mdnsd /var/run/mdnsd
+}
+                                                        
+load_rc_config $name
+run_rc_command "$1"

Index: src/external/apache2/Makefile
diff -u /dev/null src/external/apache2/Makefile:1.1
--- /dev/null	Tue Sep 29 23:56:35 2009
+++ src/external/apache2/Makefile	Tue Sep 29 23:56:27 2009
@@ -0,0 +1,9 @@
+#	$NetBSD: Makefile,v 1.1 2009/09/29 23:56:27 tsarna Exp $
+
+.include <bsd.own.mk>
+
+.if (${MKMDNS} != "no")
+SUBDIR+= mDNSResponder
+.endif
+
+.include <bsd.subdir.mk>

Index: src/external/apache2/mDNSResponder/Makefile
diff -u /dev/null src/external/apache2/mDNSResponder/Makefile:1.1
--- /dev/null	Tue Sep 29 23:56:35 2009
+++ src/external/apache2/mDNSResponder/Makefile	Tue Sep 29 23:56:27 2009
@@ -0,0 +1,5 @@
+#	$NetBSD: Makefile,v 1.1 2009/09/29 23:56:27 tsarna Exp $
+
+SUBDIR=	usr.bin usr.sbin
+
+.include <bsd.subdir.mk>
Index: src/external/apache2/mDNSResponder/Makefile.inc
diff -u /dev/null src/external/apache2/mDNSResponder/Makefile.inc:1.1
--- /dev/null	Tue Sep 29 23:56:35 2009
+++ src/external/apache2/mDNSResponder/Makefile.inc	Tue Sep 29 23:56:27 2009
@@ -0,0 +1,15 @@
+# $NetBSD: Makefile.inc,v 1.1 2009/09/29 23:56:27 tsarna Exp $
+
+.include <bsd.own.mk>
+
+DIST=	${NETBSDSRCDIR}/external/apache2/mDNSResponder/dist
+
+# IPv6 support.
+.if ${MKINET6} == "no"
+CPPFLAGS+=      -DHAVE_IPV6=0
+.else
+CPPFLAGS+=      -DHAVE_IPV6=1
+.endif
+
+CPPFLAGS+=	-DPID_FILE=\"/var/run/mdnsd/mdnsd.pid\" \
+		-DMDNS_UDS_SERVERPATH=\"/var/run/mdnsd/mdnsd\"
Index: src/external/apache2/mDNSResponder/prepare-import.sh
diff -u /dev/null src/external/apache2/mDNSResponder/prepare-import.sh:1.1
--- /dev/null	Tue Sep 29 23:56:35 2009
+++ src/external/apache2/mDNSResponder/prepare-import.sh	Tue Sep 29 23:56:27 2009
@@ -0,0 +1,37 @@
+#!/bin/sh
+# $NetBSD: prepare-import.sh,v 1.1 2009/09/29 23:56:27 tsarna Exp $
+#
+# Extract the new tarball and rename the mDNSResponder-X.Y directory
+# to dist.  Run this script and check for additional files and
+# directories to prune, only relevant content is included.
+
+set -e
+
+cd dist
+rm -rf mDNSMacOS9 mDNSMacOSX mDNSVxWorks mDNSWindows
+rm -f Makefile mDNSResponder.sln README.txt PrivateDNS.txt
+
+cd Clients
+rm -rf BonjourExample DNS-SD.VisualStudio DNS-SD.xcodeproj
+rm -rf DNSServiceBrowser-Info.plist DNSServiceBrowser.NET
+rm -rf DNSServiceBrowser.VB DNSServiceBrowser.m DNSServiceBrowser.nib
+rm -rf DNSServiceReg-Info.plist DNSServiceReg.m DNSServiceReg.nib
+rm -rf ExplorerPlugin Java Makefile PrinterSetupWizard ReadMe.txt
+rm -rf SimpleChat.NET SimpleChat.VB
+
+cd ../mDNSCore
+rm -f Implementer\ Notes.txt
+
+cd ../mDNSPosix
+rm -f Client.c ExampleClientApp.c ExampleClientApp.h Identify.c
+rm -f Makefile NetMonitor.c ProxyResponder.c ReadMe.txt Responder.c
+rm -f Services.txt libnss_mdns.8 mdnsd.sh nss_ReadMe.txt nss_mdns.c
+rm -f nss_mdns.conf nss_mdns.conf.5 parselog.py
+
+cd ../mDNSShared
+rm -rf DebugServices.c DebugServices.h Java dnssd_clientshim.c mDNS.1
+rm -f dnsextd.8 dnsextd.c dnsextd.conf dnsextd.h dnsextd_lexer.l dnsextd_parser.y
+
+# Kill RCS Log lines
+cd ..
+find . | xargs qsubst '$Log' 'Log' -noask

Index: src/external/apache2/mDNSResponder/lib/Makefile
diff -u /dev/null src/external/apache2/mDNSResponder/lib/Makefile:1.1
--- /dev/null	Tue Sep 29 23:56:35 2009
+++ src/external/apache2/mDNSResponder/lib/Makefile	Tue Sep 29 23:56:28 2009
@@ -0,0 +1,18 @@
+#	$NetBSD: Makefile,v 1.1 2009/09/29 23:56:28 tsarna Exp $
+
+.include <bsd.init.mk>
+
+LIB=	dns_sd
+
+SRCS=	dnssd_clientlib.c dnssd_clientstub.c dnssd_ipc.c  
+CPPFLAGS+=-I${DIST}/mDNSShared
+
+INCS=	dns_sd.h
+INCSDIR=/usr/include
+
+.PATH:	${DIST}/mDNSShared
+
+zoot:
+	ls ${DIST}/mDNSShared/dnssd_clientlib.c
+	
+.include <bsd.lib.mk>
Index: src/external/apache2/mDNSResponder/lib/shlib_version
diff -u /dev/null src/external/apache2/mDNSResponder/lib/shlib_version:1.1
--- /dev/null	Tue Sep 29 23:56:35 2009
+++ src/external/apache2/mDNSResponder/lib/shlib_version	Tue Sep 29 23:56:28 2009
@@ -0,0 +1,5 @@
+#       $NetBSD: shlib_version,v 1.1 2009/09/29 23:56:28 tsarna Exp $
+#       Remember to update distrib/sets/lists/base/shl.* when changing
+#
+major=0
+minor=0

Index: src/external/apache2/mDNSResponder/usr.bin/Makefile
diff -u /dev/null src/external/apache2/mDNSResponder/usr.bin/Makefile:1.1
--- /dev/null	Tue Sep 29 23:56:35 2009
+++ src/external/apache2/mDNSResponder/usr.bin/Makefile	Tue Sep 29 23:56:28 2009
@@ -0,0 +1,5 @@
+#	$NetBSD: Makefile,v 1.1 2009/09/29 23:56:28 tsarna Exp $
+
+SUBDIR=		dns-sd
+
+.include <bsd.subdir.mk>
Index: src/external/apache2/mDNSResponder/usr.bin/Makefile.inc
diff -u /dev/null src/external/apache2/mDNSResponder/usr.bin/Makefile.inc:1.1
--- /dev/null	Tue Sep 29 23:56:35 2009
+++ src/external/apache2/mDNSResponder/usr.bin/Makefile.inc	Tue Sep 29 23:56:28 2009
@@ -0,0 +1,7 @@
+# $NetBSD: Makefile.inc,v 1.1 2009/09/29 23:56:28 tsarna Exp $
+
+.include <bsd.own.mk>
+
+.include "${.PARSEDIR}/../Makefile.inc"
+
+BINDIR?=	/usr/bin

Index: src/external/apache2/mDNSResponder/usr.bin/dns-sd/Makefile
diff -u /dev/null src/external/apache2/mDNSResponder/usr.bin/dns-sd/Makefile:1.1
--- /dev/null	Tue Sep 29 23:56:35 2009
+++ src/external/apache2/mDNSResponder/usr.bin/dns-sd/Makefile	Tue Sep 29 23:56:34 2009
@@ -0,0 +1,13 @@
+#	$NetBSD: Makefile,v 1.1 2009/09/29 23:56:34 tsarna Exp $
+
+PROG=	dns-sd
+
+.include <bsd.init.mk>
+
+.PATH:	${DIST}/Clients ${DIST}/mDNSShared
+
+SRCS=	dns-sd.c ClientCommon.c
+LDADD+= -ldns_sd
+DPADD+= ${LIBDNS_SD}
+
+.include <bsd.prog.mk>

Index: src/external/apache2/mDNSResponder/usr.sbin/Makefile
diff -u /dev/null src/external/apache2/mDNSResponder/usr.sbin/Makefile:1.1
--- /dev/null	Tue Sep 29 23:56:35 2009
+++ src/external/apache2/mDNSResponder/usr.sbin/Makefile	Tue Sep 29 23:56:34 2009
@@ -0,0 +1,5 @@
+#	$NetBSD: Makefile,v 1.1 2009/09/29 23:56:34 tsarna Exp $
+
+SUBDIR=		mdnsd
+
+.include <bsd.subdir.mk>
Index: src/external/apache2/mDNSResponder/usr.sbin/Makefile.inc
diff -u /dev/null src/external/apache2/mDNSResponder/usr.sbin/Makefile.inc:1.1
--- /dev/null	Tue Sep 29 23:56:35 2009
+++ src/external/apache2/mDNSResponder/usr.sbin/Makefile.inc	Tue Sep 29 23:56:34 2009
@@ -0,0 +1,7 @@
+# $NetBSD: Makefile.inc,v 1.1 2009/09/29 23:56:34 tsarna Exp $
+
+.include <bsd.own.mk>
+
+.include "${.PARSEDIR}/../Makefile.inc"
+
+BINDIR?=	/usr/sbin

Index: src/external/apache2/mDNSResponder/usr.sbin/mdnsd/Makefile
diff -u /dev/null src/external/apache2/mDNSResponder/usr.sbin/mdnsd/Makefile:1.1
--- /dev/null	Tue Sep 29 23:56:35 2009
+++ src/external/apache2/mDNSResponder/usr.sbin/mdnsd/Makefile	Tue Sep 29 23:56:34 2009
@@ -0,0 +1,19 @@
+#	$NetBSD: Makefile,v 1.1 2009/09/29 23:56:34 tsarna Exp $
+
+PROG=	mdnsd
+
+.include <bsd.init.mk>
+
+.PATH:	${DIST}/mDNSPosix ${DIST}/mDNSCore ${DIST}/mDNSShared
+
+CPPFLAGS+=-I${DIST}/mDNSCore -I${DIST}/mDNSShared
+SRCS=	PosixDaemon.c mDNSPosix.c mDNSUNP.c mDNS.c DNSDigest.c uDNS.c \
+	DNSCommon.c uds_daemon.c mDNSDebug.c dnssd_ipc.c GenLinkedList.c \
+	PlatformCommon.c
+
+MAN=	mdnsd.8
+
+mdnsd.8: mDNSResponder.8
+	${TOOL_CAT} < $? > $@
+                                
+.include <bsd.prog.mk>

Reply via email to