Source-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[src/trunk]: src Multicast DNS ("Bonjour") support, based on Apple's mDNSResp...



details:   https://anonhg.NetBSD.org/src/rev/20ab5518ff1c
branches:  trunk
changeset: 747731:20ab5518ff1c
user:      tsarna <tsarna%NetBSD.org@localhost>
date:      Tue Sep 29 23:56:26 2009 +0000

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

diffstat:

 distrib/sets/lists/base/mi                                |   4 +-
 distrib/sets/lists/base/shl.elf                           |   4 +-
 distrib/sets/lists/base/shl.mi                            |   3 +-
 distrib/sets/lists/comp/mi                                |   7 ++-
 distrib/sets/lists/comp/shl.mi                            |   3 +-
 distrib/sets/lists/etc/mi                                 |   3 +-
 distrib/sets/lists/man/mi                                 |   8 ++-
 distrib/sets/sets.subr                                    |   6 +-
 doc/3RDPARTY                                              |  15 +++++-
 etc/Makefile                                              |   4 +-
 etc/defaults/rc.conf                                      |   3 +-
 etc/group                                                 |   1 +
 etc/master.passwd                                         |   1 +
 etc/mtree/special                                         |   3 +-
 etc/rc.d/Makefile                                         |   8 +-
 etc/rc.d/mdnsd                                            |  26 ++++++++++
 external/Makefile                                         |   4 +-
 external/apache2/Makefile                                 |   9 +++
 external/apache2/mDNSResponder/Makefile                   |   5 ++
 external/apache2/mDNSResponder/Makefile.inc               |  15 ++++++
 external/apache2/mDNSResponder/dist/mDNSPosix/mDNSPosix.c |  16 +++++-
 external/apache2/mDNSResponder/dist/mDNSPosix/mDNSUNP.c   |   4 +-
 external/apache2/mDNSResponder/dist/mDNSShared/dns-sd.1   |  18 ++-----
 external/apache2/mDNSResponder/dist/mDNSShared/dns_sd.h   |   2 +
 external/apache2/mDNSResponder/lib/Makefile               |  18 +++++++
 external/apache2/mDNSResponder/lib/shlib_version          |   5 ++
 external/apache2/mDNSResponder/prepare-import.sh          |  37 +++++++++++++++
 external/apache2/mDNSResponder/usr.bin/Makefile           |   5 ++
 external/apache2/mDNSResponder/usr.bin/Makefile.inc       |   7 ++
 external/apache2/mDNSResponder/usr.bin/dns-sd/Makefile    |  13 +++++
 external/apache2/mDNSResponder/usr.sbin/Makefile          |   5 ++
 external/apache2/mDNSResponder/usr.sbin/Makefile.inc      |   7 ++
 external/apache2/mDNSResponder/usr.sbin/mdnsd/Makefile    |  19 +++++++
 external/lib/Makefile                                     |   6 ++-
 share/man/man5/mk.conf.5                                  |   8 ++-
 share/mk/bsd.README                                       |   6 ++-
 share/mk/bsd.own.mk                                       |   3 +-
 usr.sbin/postinstall/postinstall                          |  10 ++--
 38 files changed, 276 insertions(+), 45 deletions(-)

diffs (truncated from 809 to 300 lines):

diff -r aa0e923f4fc8 -r 20ab5518ff1c distrib/sets/lists/base/mi
--- a/distrib/sets/lists/base/mi        Tue Sep 29 22:40:15 2009 +0000
+++ b/distrib/sets/lists/base/mi        Tue Sep 29 23:56:26 2009 +0000
@@ -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
diff -r aa0e923f4fc8 -r 20ab5518ff1c distrib/sets/lists/base/shl.elf
--- a/distrib/sets/lists/base/shl.elf   Tue Sep 29 22:40:15 2009 +0000
+++ b/distrib/sets/lists/base/shl.elf   Tue Sep 29 23:56:26 2009 +0000
@@ -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
diff -r aa0e923f4fc8 -r 20ab5518ff1c distrib/sets/lists/base/shl.mi
--- a/distrib/sets/lists/base/shl.mi    Tue Sep 29 22:40:15 2009 +0000
+++ b/distrib/sets/lists/base/shl.mi    Tue Sep 29 23:56:26 2009 +0000
@@ -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
diff -r aa0e923f4fc8 -r 20ab5518ff1c distrib/sets/lists/comp/mi
--- a/distrib/sets/lists/comp/mi        Tue Sep 29 22:40:15 2009 +0000
+++ b/distrib/sets/lists/comp/mi        Tue Sep 29 23:56:26 2009 +0000
@@ -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
diff -r aa0e923f4fc8 -r 20ab5518ff1c distrib/sets/lists/comp/shl.mi
--- a/distrib/sets/lists/comp/shl.mi    Tue Sep 29 22:40:15 2009 +0000
+++ b/distrib/sets/lists/comp/shl.mi    Tue Sep 29 23:56:26 2009 +0000
@@ -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
diff -r aa0e923f4fc8 -r 20ab5518ff1c distrib/sets/lists/etc/mi
--- a/distrib/sets/lists/etc/mi Tue Sep 29 22:40:15 2009 +0000
+++ b/distrib/sets/lists/etc/mi Tue Sep 29 23:56:26 2009 +0000
@@ -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
diff -r aa0e923f4fc8 -r 20ab5518ff1c distrib/sets/lists/man/mi
--- a/distrib/sets/lists/man/mi Tue Sep 29 22:40:15 2009 +0000
+++ b/distrib/sets/lists/man/mi Tue Sep 29 23:56:26 2009 +0000
@@ -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
diff -r aa0e923f4fc8 -r 20ab5518ff1c distrib/sets/sets.subr
--- a/distrib/sets/sets.subr    Tue Sep 29 22:40:15 2009 +0000
+++ b/distrib/sets/sets.subr    Tue Sep 29 23:56:26 2009 +0000
@@ -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
diff -r aa0e923f4fc8 -r 20ab5518ff1c doc/3RDPARTY
--- a/doc/3RDPARTY      Tue Sep 29 22:40:15 2009 +0000
+++ b/doc/3RDPARTY      Tue Sep 29 23:56:26 2009 +0000
@@ -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-dev%lists.apple.com@localhost
+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:
diff -r aa0e923f4fc8 -r 20ab5518ff1c etc/Makefile
--- a/etc/Makefile      Tue Sep 29 22:40:15 2009 +0000
+++ b/etc/Makefile      Tue Sep 29 23:56:26 2009 +0000
@@ -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 \
diff -r aa0e923f4fc8 -r 20ab5518ff1c etc/defaults/rc.conf
--- a/etc/defaults/rc.conf      Tue Sep 29 22:40:15 2009 +0000
+++ b/etc/defaults/rc.conf      Tue Sep 29 23:56:26 2009 +0000
@@ -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
diff -r aa0e923f4fc8 -r 20ab5518ff1c etc/group
--- a/etc/group Tue Sep 29 22:40:15 2009 +0000
+++ b/etc/group Tue Sep 29 23:56:26 2009 +0000
@@ -20,6 +20,7 @@
 _timedc:*:22:
 _sdpd:*:23:
 _httpd:*:24:
+_mdnsd:*:25:
 guest:*:31:root
 nobody:*:39:
 utmp:*:45:
diff -r aa0e923f4fc8 -r 20ab5518ff1c etc/master.passwd
--- a/etc/master.passwd Tue Sep 29 22:40:15 2009 +0000
+++ b/etc/master.passwd Tue Sep 29 23:56:26 2009 +0000
@@ -14,5 +14,6 @@
 _timedc:*:22:22::0:0:& pseudo-user:/nonexistent:/sbin/nologin



Home | Main Index | Thread Index | Old Index