Tue Sep 29 23:56:35 2009 UTC ()
Multicast DNS ("Bonjour") support, based on Apple's mDNSResponder.


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

cvs diff -r1.87 -r1.88 src/distrib/sets/sets.subr (expand / switch to unified diff)

--- src/distrib/sets/sets.subr 2009/09/08 07:08:00 1.87
+++ src/distrib/sets/sets.subr 2009/09/29 23:56:26 1.88
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1# $NetBSD: sets.subr,v 1.87 2009/09/08 07:08:00 skrll Exp $ 1# $NetBSD: sets.subr,v 1.88 2009/09/29 23:56:26 tsarna Exp $
2# 2#
3 3
4# 4#
5# The following variables contain defaults for sets.subr functions and callers: 5# The following variables contain defaults for sets.subr functions and callers:
6# setsdir path to src/distrib/sets 6# setsdir path to src/distrib/sets
7# nlists list of base sets 7# nlists list of base sets
8# xlists list of x11 sets 8# xlists list of x11 sets
9# obsolete controls if obsolete files are selected instead 9# obsolete controls if obsolete files are selected instead
10# module if != "no", enable MODULE sets 10# module if != "no", enable MODULE sets
11# shlib shared library format (a.out, elf, or "") 11# shlib shared library format (a.out, elf, or "")
12# stlib static library format (a.out, elf) 12# stlib static library format (a.out, elf)
13# 13#
14# The following <bsd.own.mk> variables are exported to the environment: 14# The following <bsd.own.mk> variables are exported to the environment:
@@ -43,26 +43,27 @@ MKVARS="\ @@ -43,26 +43,27 @@ MKVARS="\
43 MKHTML \ 43 MKHTML \
44 MKINET6 \ 44 MKINET6 \
45 MKINFO \ 45 MKINFO \
46 MKIPFILTER \ 46 MKIPFILTER \
47 MKISCSI \ 47 MKISCSI \
48 MKKERBEROS \ 48 MKKERBEROS \
49 MKKMOD \ 49 MKKMOD \
50 MKLDAP \ 50 MKLDAP \
51 MKLINT \ 51 MKLINT \
52 MKLVM \ 52 MKLVM \
53 MKMAN \ 53 MKMAN \
54 MKMANPAGES \ 54 MKMANPAGES \
55 MKMANZ \ 55 MKMANZ \
 56 MKMDNS \
56 MKNLS \ 57 MKNLS \
57 MKNVI \ 58 MKNVI \
58 MKPAM \ 59 MKPAM \
59 MKPF \ 60 MKPF \
60 MKPIC \ 61 MKPIC \
61 MKPOSTFIX \ 62 MKPOSTFIX \
62 MKPROFILE \ 63 MKPROFILE \
63 MKSHARE \ 64 MKSHARE \
64 MKSKEY \ 65 MKSKEY \
65 MKX11 \ 66 MKX11 \
66 MKX11FONTS \ 67 MKX11FONTS \
67 MKXORG \ 68 MKXORG \
68 MKYP \ 69 MKYP \
@@ -225,27 +226,27 @@ xlists="xbase xcomp xetc xfont xserver" @@ -225,27 +226,27 @@ xlists="xbase xcomp xetc xfont xserver"
225OSRELEASE=`${HOST_SH} ${NETBSDSRCDIR}/sys/conf/osrelease.sh` 226OSRELEASE=`${HOST_SH} ${NETBSDSRCDIR}/sys/conf/osrelease.sh`
226MODULEDIR="stand/${MACHINE}/${OSRELEASE}/modules" 227MODULEDIR="stand/${MACHINE}/${OSRELEASE}/modules"
227SUBST="s#@MODULEDIR@#${MODULEDIR}#g" 228SUBST="s#@MODULEDIR@#${MODULEDIR}#g"
228SUBST="${SUBST};s#@OSRELEASE@#${OSRELEASE}#g" 229SUBST="${SUBST};s#@OSRELEASE@#${OSRELEASE}#g"
229SUBST="${SUBST};s#@MACHINE@#${MACHINE}#g" 230SUBST="${SUBST};s#@MACHINE@#${MACHINE}#g"
230 231
231# 232#
232# list_set_files setfile [...] 233# list_set_files setfile [...]
233#  234#
234# Produce a packing list for setfile(s). 235# Produce a packing list for setfile(s).
235# In each file, a record consists of a path and a System Package name, 236# In each file, a record consists of a path and a System Package name,
236# separated by whitespace. E.g., 237# separated by whitespace. E.g.,
237# 238#
238# # $NetBSD: sets.subr,v 1.87 2009/09/08 07:08:00 skrll Exp $ 239# # $NetBSD: sets.subr,v 1.88 2009/09/29 23:56:26 tsarna Exp $
239# . base-sys-root [keyword[,...]] 240# . base-sys-root [keyword[,...]]
240# ./altroot base-sys-root 241# ./altroot base-sys-root
241# ./bin base-sys-root 242# ./bin base-sys-root
242# ./bin/[ base-util-root 243# ./bin/[ base-util-root
243# ./bin/cat base-util-root 244# ./bin/cat base-util-root
244# [...] 245# [...]
245# 246#
246# A # in the first column marks a comment. 247# A # in the first column marks a comment.
247# 248#
248# If ${obsolete} != 0, only entries with an "obsolete" keyword will 249# If ${obsolete} != 0, only entries with an "obsolete" keyword will
249# be printed. All other keywords must be present. 250# be printed. All other keywords must be present.
250# 251#
251# The third field is an optional comma separated list of keywords to 252# The third field is an optional comma separated list of keywords to
@@ -275,26 +276,27 @@ SUBST="${SUBST};s#@MACHINE@#${MACHINE}#g @@ -275,26 +276,27 @@ SUBST="${SUBST};s#@MACHINE@#${MACHINE}#g
275# html ${MKHTML} != no 276# html ${MKHTML} != no
276# inet6 ${MKINET6} != no 277# inet6 ${MKINET6} != no
277# info ${MKINFO} != no 278# info ${MKINFO} != no
278# ipfilter ${MKIPFILTER} != no 279# ipfilter ${MKIPFILTER} != no
279# iscsi ${MKISCSI} != no 280# iscsi ${MKISCSI} != no
280# kerberos ${MKKERBEROS} != no 281# kerberos ${MKKERBEROS} != no
281# kmod ${MKKMOD} != no 282# kmod ${MKKMOD} != no
282# ldap ${MKLDAP} != no 283# ldap ${MKLDAP} != no
283# lint ${MKLINT} != no 284# lint ${MKLINT} != no
284# lvm ${MKLVM} != no 285# lvm ${MKLVM} != no
285# man ${MKMAN} != no 286# man ${MKMAN} != no
286# manpages ${MKMANPAGES} != no 287# manpages ${MKMANPAGES} != no
287# manz ${MKMANZ} != no 288# manz ${MKMANZ} != no
 289# mdns ${MKMDNS} != no
288# nls ${MKNLS} != no 290# nls ${MKNLS} != no
289# nvi ${MKNVI} != no 291# nvi ${MKNVI} != no
290# pam ${MKPAM} != no 292# pam ${MKPAM} != no
291# pf ${MKPF} != no 293# pf ${MKPF} != no
292# pic ${MKPIC} != no 294# pic ${MKPIC} != no
293# postfix ${MKPOSTFIX} != no 295# postfix ${MKPOSTFIX} != no
294# profile ${MKPROFILE} != no 296# profile ${MKPROFILE} != no
295# share ${MKSHARE} != no 297# share ${MKSHARE} != no
296# skey ${MKSKEY} != no 298# skey ${MKSKEY} != no
297# x11 ${MKX11} != no && ${X11FLAVOUR} != "Xorg" 299# x11 ${MKX11} != no && ${X11FLAVOUR} != "Xorg"
298# xorg ${MKX11} != no && ${X11FLAVOUR} == "Xorg" 300# xorg ${MKX11} != no && ${X11FLAVOUR} == "Xorg"
299# yp ${MKYP} != no 301# yp ${MKYP} != no
300# 302#

cvs diff -r1.830 -r1.831 src/distrib/sets/lists/base/mi (expand / switch to unified diff)

--- src/distrib/sets/lists/base/mi 2009/09/17 07:40:44 1.830
+++ src/distrib/sets/lists/base/mi 2009/09/29 23:56:26 1.831
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1# $NetBSD: mi,v 1.830 2009/09/17 07:40:44 mrg Exp $ 1# $NetBSD: mi,v 1.831 2009/09/29 23:56:26 tsarna Exp $
2# 2#
3# Note: Don't delete entries from here - mark them as "obsolete" instead, 3# Note: Don't delete entries from here - mark them as "obsolete" instead,
4# unless otherwise stated below. 4# unless otherwise stated below.
5# 5#
6# Note: Do not mark "old" major and major.minor shared libraries as 6# Note: Do not mark "old" major and major.minor shared libraries as
7# "obsolete"; just remove the entry, as third-party applications 7# "obsolete"; just remove the entry, as third-party applications
8# may be linked against the old major shared library, and 8# may be linked against the old major shared library, and
9# that is a symlink to the old major.minor shared library. 9# that is a symlink to the old major.minor shared library.
10# e.g., "lib<name>.so.<N>" and "lib<name>.so.<N>.<M>" 10# e.g., "lib<name>.so.<N>" and "lib<name>.so.<N>.<M>"
11# Exceptions to this rule may include shared libraries that 11# Exceptions to this rule may include shared libraries that
12# are dlopen()ed at run-time, such as extra locales, etc. 12# are dlopen()ed at run-time, such as extra locales, etc.
13# 13#
14. base-sys-root 14. base-sys-root
@@ -462,26 +462,27 @@ @@ -462,26 +462,27 @@
462./usr/bin/lpr base-lpr-bin 462./usr/bin/lpr base-lpr-bin
463./usr/bin/lprm base-lpr-bin 463./usr/bin/lprm base-lpr-bin
464./usr/bin/lsextattr base-util-bin 464./usr/bin/lsextattr base-util-bin
465./usr/bin/m4 base-util-bin 465./usr/bin/m4 base-util-bin
466./usr/bin/machine base-util-bin 466./usr/bin/machine base-util-bin
467./usr/bin/mail base-mail-bin 467./usr/bin/mail base-mail-bin
468./usr/bin/mailq base-mailwrapper-bin 468./usr/bin/mailq base-mailwrapper-bin
469./usr/bin/mailx base-mail-bin 469./usr/bin/mailx base-mail-bin
470./usr/bin/make base-util-bin 470./usr/bin/make base-util-bin
471./usr/bin/man base-man-bin 471./usr/bin/man base-man-bin
472./usr/bin/md2 base-util-bin 472./usr/bin/md2 base-util-bin
473./usr/bin/md4 base-util-bin 473./usr/bin/md4 base-util-bin
474./usr/bin/md5 base-util-bin 474./usr/bin/md5 base-util-bin
 475./usr/bin/dns-sd base-mdns-bin mdns
475./usr/bin/merge base-util-bin 476./usr/bin/merge base-util-bin
476./usr/bin/mesg base-util-bin 477./usr/bin/mesg base-util-bin
477./usr/bin/midiplay base-audio-bin 478./usr/bin/midiplay base-audio-bin
478./usr/bin/mixerctl base-audio-bin 479./usr/bin/mixerctl base-audio-bin
479./usr/bin/mk_cmds base-krb5-bin kerberos 480./usr/bin/mk_cmds base-krb5-bin kerberos
480./usr/bin/mkcsmapper base-util-bin 481./usr/bin/mkcsmapper base-util-bin
481./usr/bin/mkdep base-c-bin 482./usr/bin/mkdep base-c-bin
482./usr/bin/mkesdb base-util-bin 483./usr/bin/mkesdb base-util-bin
483./usr/bin/mkfifo base-util-bin 484./usr/bin/mkfifo base-util-bin
484./usr/bin/mklocale base-locale-bin 485./usr/bin/mklocale base-locale-bin
485./usr/bin/mktemp base-util-bin 486./usr/bin/mktemp base-util-bin
486./usr/bin/modstat base-obsolete obsolete 487./usr/bin/modstat base-obsolete obsolete
487./usr/bin/more base-util-bin 488./usr/bin/more base-util-bin
@@ -1109,26 +1110,27 @@ @@ -1109,26 +1110,27 @@
1109./usr/sbin/lockstat base-sysutil-bin 1110./usr/sbin/lockstat base-sysutil-bin
1110./usr/sbin/lpc base-lpr-bin 1111./usr/sbin/lpc base-lpr-bin
1111./usr/sbin/lpd base-lpr-bin 1112./usr/sbin/lpd base-lpr-bin
1112./usr/sbin/lptest base-lpr-bin 1113./usr/sbin/lptest base-lpr-bin
1113./usr/sbin/lwresd base-bind-bin 1114./usr/sbin/lwresd base-bind-bin
1114./usr/sbin/mailstats base-obsolete obsolete 1115./usr/sbin/mailstats base-obsolete obsolete
1115./usr/sbin/mailwrapper base-mailwrapper-bin 1116./usr/sbin/mailwrapper base-mailwrapper-bin
1116./usr/sbin/makedbm base-nis-bin yp 1117./usr/sbin/makedbm base-nis-bin yp
1117./usr/sbin/makefs base-sysutil-bin 1118./usr/sbin/makefs base-sysutil-bin
1118./usr/sbin/makemap base-obsolete obsolete 1119./usr/sbin/makemap base-obsolete obsolete
1119./usr/sbin/map-mbone base-netutil-bin 1120./usr/sbin/map-mbone base-netutil-bin
1120./usr/sbin/mbrlabel base-obsolete obsolete 1121./usr/sbin/mbrlabel base-obsolete obsolete
1121./usr/sbin/mdconfig base-sysutil-bin 1122./usr/sbin/mdconfig base-sysutil-bin
 1123./usr/sbin/mdnsd base-mdns-bin mdns
1122./usr/sbin/mdsetimage base-sysutil-bin binutils 1124./usr/sbin/mdsetimage base-sysutil-bin binutils
1123./usr/sbin/mk-amd-map base-amd-bin 1125./usr/sbin/mk-amd-map base-amd-bin
1124./usr/sbin/mkalias base-nis-bin yp 1126./usr/sbin/mkalias base-nis-bin yp
1125./usr/sbin/mknetid base-nis-bin yp 1127./usr/sbin/mknetid base-nis-bin yp
1126./usr/sbin/mld6query base-netutil-bin use_inet6 1128./usr/sbin/mld6query base-netutil-bin use_inet6
1127./usr/sbin/mlxctl base-sysutil-bin 1129./usr/sbin/mlxctl base-sysutil-bin
1128./usr/sbin/mmcformat base-sysutil-bin 1130./usr/sbin/mmcformat base-sysutil-bin
1129./usr/sbin/mopa.out base-obsolete obsolete 1131./usr/sbin/mopa.out base-obsolete obsolete
1130./usr/sbin/mopchk base-bootserver-bin 1132./usr/sbin/mopchk base-bootserver-bin
1131./usr/sbin/mopcopy base-bootserver-bin 1133./usr/sbin/mopcopy base-bootserver-bin
1132./usr/sbin/mopd base-bootserver-bin 1134./usr/sbin/mopd base-bootserver-bin
1133./usr/sbin/mopprobe base-bootserver-bin 1135./usr/sbin/mopprobe base-bootserver-bin
1134./usr/sbin/moptrace base-bootserver-bin 1136./usr/sbin/moptrace base-bootserver-bin

cvs diff -r1.185 -r1.186 src/distrib/sets/lists/base/Attic/shl.elf (expand / switch to unified diff)

--- src/distrib/sets/lists/base/Attic/shl.elf 2009/09/08 20:34:47 1.185
+++ src/distrib/sets/lists/base/Attic/shl.elf 2009/09/29 23:56:26 1.186
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1# $NetBSD: shl.elf,v 1.185 2009/09/08 20:34:47 pooka Exp $ 1# $NetBSD: shl.elf,v 1.186 2009/09/29 23:56:26 tsarna Exp $
2# 2#
3# Note: Do not mark "old" major and major.minor shared libraries as 3# Note: Do not mark "old" major and major.minor shared libraries as
4# "obsolete"; just remove the entry, as third-party applications 4# "obsolete"; just remove the entry, as third-party applications
5# may be linked against the old major shared library, and 5# may be linked against the old major shared library, and
6# that is a symlink to the old major.minor shared library. 6# that is a symlink to the old major.minor shared library.
7# e.g., "lib<name>.so.<N>" and "lib<name>.so.<N>.<M>" 7# e.g., "lib<name>.so.<N>" and "lib<name>.so.<N>.<M>"
8# Exceptions to this rule may include shared libraries that 8# Exceptions to this rule may include shared libraries that
9# are dlopen()ed at run-time, such as extra locales, etc. 9# are dlopen()ed at run-time, such as extra locales, etc.
10# 10#
11# Note: libtermcap and libtermlib are hardlinked and share the same version. 11# Note: libtermcap and libtermlib are hardlinked and share the same version.
12# 12#
13./lib/libc.so base-sys-shlib dynamicroot 13./lib/libc.so base-sys-shlib dynamicroot
14./lib/libc.so.12 base-sys-shlib dynamicroot 14./lib/libc.so.12 base-sys-shlib dynamicroot
@@ -111,26 +111,28 @@ @@ -111,26 +111,28 @@
111./usr/lib/libcom_err.so.6 base-krb5-shlib kerberos 111./usr/lib/libcom_err.so.6 base-krb5-shlib kerberos
112./usr/lib/libcrypt.so base-sys-shlib 112./usr/lib/libcrypt.so base-sys-shlib
113./usr/lib/libcrypt.so.1 base-sys-shlib 113./usr/lib/libcrypt.so.1 base-sys-shlib
114./usr/lib/libcrypto.so base-crypto-shlib crypto 114./usr/lib/libcrypto.so base-crypto-shlib crypto
115./usr/lib/libcrypto.so.6 base-crypto-shlib crypto 115./usr/lib/libcrypto.so.6 base-crypto-shlib crypto
116./usr/lib/libcurses.so base-sys-shlib 116./usr/lib/libcurses.so base-sys-shlib
117./usr/lib/libcurses.so.7 base-sys-shlib 117./usr/lib/libcurses.so.7 base-sys-shlib
118./usr/lib/libdes.so base-crypto-shlib crypto 118./usr/lib/libdes.so base-crypto-shlib crypto
119./usr/lib/libdes.so.8 base-crypto-shlib crypto 119./usr/lib/libdes.so.8 base-crypto-shlib crypto
120./usr/lib/libdevmapper.so base-lvm-shlib lvm 120./usr/lib/libdevmapper.so base-lvm-shlib lvm
121./usr/lib/libdevmapper.so.1 base-lvm-shlib lvm 121./usr/lib/libdevmapper.so.1 base-lvm-shlib lvm
122./usr/lib/libdns.so base-bind-shlib 122./usr/lib/libdns.so base-bind-shlib
123./usr/lib/libdns.so.4 base-bind-shlib 123./usr/lib/libdns.so.4 base-bind-shlib
 124./usr/lib/libdns_sd.so base-mdns-shlib mdns
 125./usr/lib/libdns_sd.so.1 base-mdns-shlib mdns
124./usr/lib/libedit.so base-sys-shlib 126./usr/lib/libedit.so base-sys-shlib
125./usr/lib/libedit.so.3 base-sys-shlib 127./usr/lib/libedit.so.3 base-sys-shlib
126./usr/lib/libevent.so base-sys-shlib 128./usr/lib/libevent.so base-sys-shlib
127./usr/lib/libevent.so.3 base-sys-shlib 129./usr/lib/libevent.so.3 base-sys-shlib
128./usr/lib/libfetch.so base-sys-shlib 130./usr/lib/libfetch.so base-sys-shlib
129./usr/lib/libfetch.so.3 base-sys-shlib 131./usr/lib/libfetch.so.3 base-sys-shlib
130./usr/lib/libform.so base-sys-shlib 132./usr/lib/libform.so base-sys-shlib
131./usr/lib/libform.so.6 base-sys-shlib 133./usr/lib/libform.so.6 base-sys-shlib
132./usr/lib/libg2c.so base-sys-shlib gcc=3 134./usr/lib/libg2c.so base-sys-shlib gcc=3
133./usr/lib/libg2c.so.2 base-sys-shlib gcc=3 135./usr/lib/libg2c.so.2 base-sys-shlib gcc=3
134./usr/lib/libgcc_s.so base-sys-shlib gcc 136./usr/lib/libgcc_s.so base-sys-shlib gcc
135./usr/lib/libgcc_s.so.1 base-sys-shlib gcc 137./usr/lib/libgcc_s.so.1 base-sys-shlib gcc
136./usr/lib/libgnumalloc.so base-sys-shlib 138./usr/lib/libgnumalloc.so base-sys-shlib

cvs diff -r1.491 -r1.492 src/distrib/sets/lists/base/shl.mi (expand / switch to unified diff)

--- src/distrib/sets/lists/base/shl.mi 2009/09/08 20:34:47 1.491
+++ src/distrib/sets/lists/base/shl.mi 2009/09/29 23:56:26 1.492
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1# $NetBSD: shl.mi,v 1.491 2009/09/08 20:34:47 pooka Exp $ 1# $NetBSD: shl.mi,v 1.492 2009/09/29 23:56:26 tsarna Exp $
2# 2#
3# Note: Don't delete entries from here - mark them as "obsolete" instead, 3# Note: Don't delete entries from here - mark them as "obsolete" instead,
4# unless otherwise stated below. 4# unless otherwise stated below.
5# 5#
6# Note: Do not mark "old" major and major.minor shared libraries as 6# Note: Do not mark "old" major and major.minor shared libraries as
7# "obsolete"; just remove the entry, as third-party applications 7# "obsolete"; just remove the entry, as third-party applications
8# may be linked against the old major shared library, and 8# may be linked against the old major shared library, and
9# that is a symlink to the old major.minor shared library. 9# that is a symlink to the old major.minor shared library.
10# e.g., "lib<name>.so.<N>" and "lib<name>.so.<N>.<M>" 10# e.g., "lib<name>.so.<N>" and "lib<name>.so.<N>.<M>"
11# Exceptions to this rule may include shared libraries that 11# Exceptions to this rule may include shared libraries that
12# are dlopen()ed at run-time, such as extra locales, etc. 12# are dlopen()ed at run-time, such as extra locales, etc.
13# 13#
14# Note: libtermcap and libtermlib are hardlinked and share the same version. 14# Note: libtermcap and libtermlib are hardlinked and share the same version.
@@ -59,26 +59,27 @@ @@ -59,26 +59,27 @@
59./usr/lib/libbfd.so.11.0 base-sys-shlib binutils=219 59./usr/lib/libbfd.so.11.0 base-sys-shlib binutils=219
60./usr/lib/libbind9.so.4.0 base-bind-shlib 60./usr/lib/libbind9.so.4.0 base-bind-shlib
61./usr/lib/libbluetooth.so.4.2 base-sys-shlib 61./usr/lib/libbluetooth.so.4.2 base-sys-shlib
62./usr/lib/libbsdmalloc.so.0.0 base-sys-shlib 62./usr/lib/libbsdmalloc.so.0.0 base-sys-shlib
63./usr/lib/libbz2.so.1.1 base-sys-shlib 63./usr/lib/libbz2.so.1.1 base-sys-shlib
64./usr/lib/libc.so.12.170 base-sys-shlib 64./usr/lib/libc.so.12.170 base-sys-shlib
65./usr/lib/libcom_err.so.6.0 base-krb5-shlib kerberos 65./usr/lib/libcom_err.so.6.0 base-krb5-shlib kerberos
66./usr/lib/libcrypt.so.1.0 base-sys-shlib 66./usr/lib/libcrypt.so.1.0 base-sys-shlib
67./usr/lib/libcrypto.so.6.0 base-crypto-shlib crypto 67./usr/lib/libcrypto.so.6.0 base-crypto-shlib crypto
68./usr/lib/libcurses.so.7.0 base-sys-shlib 68./usr/lib/libcurses.so.7.0 base-sys-shlib
69./usr/lib/libdes.so.8.1 base-crypto-shlib crypto 69./usr/lib/libdes.so.8.1 base-crypto-shlib crypto
70./usr/lib/libdevmapper.so.1.0 base-lvm-shlib lvm 70./usr/lib/libdevmapper.so.1.0 base-lvm-shlib lvm
71./usr/lib/libdns.so.4.0 base-bind-shlib 71./usr/lib/libdns.so.4.0 base-bind-shlib
 72./usr/lib/libdns_sd.so.1.0 base-mdns-shlib mdns
72./usr/lib/libedit.so.3.0 base-sys-shlib 73./usr/lib/libedit.so.3.0 base-sys-shlib
73./usr/lib/libevent.so.3.1 base-sys-shlib 74./usr/lib/libevent.so.3.1 base-sys-shlib
74./usr/lib/libfetch.so.3.0 base-sys-shlib 75./usr/lib/libfetch.so.3.0 base-sys-shlib
75./usr/lib/libform.so.6.0 base-sys-shlib 76./usr/lib/libform.so.6.0 base-sys-shlib
76./usr/lib/libg2c.so.2.0 base-sys-shlib gcc=3 77./usr/lib/libg2c.so.2.0 base-sys-shlib gcc=3
77./usr/lib/libgcc_s.so.1.0 base-sys-shlib gcc 78./usr/lib/libgcc_s.so.1.0 base-sys-shlib gcc
78./usr/lib/libgnumalloc.so.1.0 base-sys-shlib 79./usr/lib/libgnumalloc.so.1.0 base-sys-shlib
79./usr/lib/libgssapi.so.9.0 base-krb5-shlib kerberos 80./usr/lib/libgssapi.so.9.0 base-krb5-shlib kerberos
80./usr/lib/libhdb.so.13.0 base-krb5-shlib kerberos 81./usr/lib/libhdb.so.13.0 base-krb5-shlib kerberos
81./usr/lib/libheimntlm.so.3.0 base-krb5-shlib kerberos 82./usr/lib/libheimntlm.so.3.0 base-krb5-shlib kerberos
82./usr/lib/libhx509.so.4.0 base-krb5-shlib kerberos 83./usr/lib/libhx509.so.4.0 base-krb5-shlib kerberos
83./usr/lib/libintl.so.1.0 base-sys-shlib 84./usr/lib/libintl.so.1.0 base-sys-shlib
84./usr/lib/libipsec.so.3.0 base-net-shlib 85./usr/lib/libipsec.so.3.0 base-net-shlib

cvs diff -r1.1313 -r1.1314 src/distrib/sets/lists/comp/mi (expand / switch to unified diff)

--- src/distrib/sets/lists/comp/mi 2009/09/23 09:18:31 1.1313
+++ src/distrib/sets/lists/comp/mi 2009/09/29 23:56:26 1.1314
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1# $NetBSD: mi,v 1.1313 2009/09/23 09:18:31 njoly Exp $ 1# $NetBSD: mi,v 1.1314 2009/09/29 23:56:26 tsarna Exp $
2# 2#
3# Note: don't delete entries from here - mark them as "obsolete" instead. 3# Note: don't delete entries from here - mark them as "obsolete" instead.
4# 4#
5./etc/mtree/set.comp comp-sys-root 5./etc/mtree/set.comp comp-sys-root
6./usr/bin/addr2line comp-debug-bin binutils 6./usr/bin/addr2line comp-debug-bin binutils
7./usr/bin/ar comp-util-bin binutils 7./usr/bin/ar comp-util-bin binutils
8./usr/bin/as comp-util-bin binutils 8./usr/bin/as comp-util-bin binutils
9./usr/bin/asa comp-fortran-bin 9./usr/bin/asa comp-fortran-bin
10./usr/bin/atf-compile comp-atf-bin 10./usr/bin/atf-compile comp-atf-bin
11./usr/bin/c++ comp-cxx-bin gcccmds 11./usr/bin/c++ comp-cxx-bin gcccmds
12./usr/bin/c++filt comp-cxx-bin binutils 12./usr/bin/c++filt comp-cxx-bin binutils
13./usr/bin/c89 comp-c-bin 13./usr/bin/c89 comp-c-bin
14./usr/bin/c99 comp-c-bin 14./usr/bin/c99 comp-c-bin
@@ -599,26 +599,27 @@ @@ -599,26 +599,27 @@
599./usr/include/dev/wscons/wscons_rfont.h comp-obsolete obsolete 599./usr/include/dev/wscons/wscons_rfont.h comp-obsolete obsolete
600./usr/include/dev/wscons/wsconsio.h comp-c-include 600./usr/include/dev/wscons/wsconsio.h comp-c-include
601./usr/include/dev/wscons/wsdisplay_usl_io.h comp-c-include 601./usr/include/dev/wscons/wsdisplay_usl_io.h comp-c-include
602./usr/include/dev/wscons/wsdisplayvar.h comp-obsolete obsolete 602./usr/include/dev/wscons/wsdisplayvar.h comp-obsolete obsolete
603./usr/include/dev/wscons/wsemulvar.h comp-obsolete obsolete 603./usr/include/dev/wscons/wsemulvar.h comp-obsolete obsolete
604./usr/include/dev/wscons/wseventvar.h comp-obsolete obsolete 604./usr/include/dev/wscons/wseventvar.h comp-obsolete obsolete
605./usr/include/dev/wscons/wskbdvar.h comp-obsolete obsolete 605./usr/include/dev/wscons/wskbdvar.h comp-obsolete obsolete
606./usr/include/dev/wscons/wsksymdef.h comp-c-include 606./usr/include/dev/wscons/wsksymdef.h comp-c-include
607./usr/include/dev/wscons/wsksymvar.h comp-c-include 607./usr/include/dev/wscons/wsksymvar.h comp-c-include
608./usr/include/dev/wscons/wsmousevar.h comp-obsolete obsolete 608./usr/include/dev/wscons/wsmousevar.h comp-obsolete obsolete
609./usr/include/dirent.h comp-c-include 609./usr/include/dirent.h comp-c-include
610./usr/include/disktab.h comp-c-include 610./usr/include/disktab.h comp-c-include
611./usr/include/dlfcn.h comp-c-include 611./usr/include/dlfcn.h comp-c-include
 612./usr/include/dns_sd.h comp-mdns-include mdns
612./usr/include/elf.h comp-c-include 613./usr/include/elf.h comp-c-include
613./usr/include/err.h comp-c-include 614./usr/include/err.h comp-c-include
614./usr/include/errno.h comp-c-include 615./usr/include/errno.h comp-c-include
615./usr/include/eti.h comp-c-include 616./usr/include/eti.h comp-c-include
616./usr/include/evdns.h comp-c-include 617./usr/include/evdns.h comp-c-include
617./usr/include/event.h comp-c-include 618./usr/include/event.h comp-c-include
618./usr/include/event-config.h comp-c-include 619./usr/include/event-config.h comp-c-include
619./usr/include/evhttp.h comp-c-include 620./usr/include/evhttp.h comp-c-include
620./usr/include/evrpc.h comp-c-include 621./usr/include/evrpc.h comp-c-include
621./usr/include/evutil.h comp-c-include 622./usr/include/evutil.h comp-c-include
622./usr/include/fcntl.h comp-c-include 623./usr/include/fcntl.h comp-c-include
623./usr/include/fetch.h comp-c-include 624./usr/include/fetch.h comp-c-include
624./usr/include/filecorefs/filecore_mount.h comp-c-include 625./usr/include/filecorefs/filecore_mount.h comp-c-include
@@ -2339,26 +2340,29 @@ @@ -2339,26 +2340,29 @@
2339./usr/lib/libcrypto_rc5_p.a comp-c-proflib profile,crypto_rc5 2340./usr/lib/libcrypto_rc5_p.a comp-c-proflib profile,crypto_rc5
2340./usr/lib/libcurses.a comp-c-lib 2341./usr/lib/libcurses.a comp-c-lib
2341./usr/lib/libcurses_g.a -unknown- debuglib 2342./usr/lib/libcurses_g.a -unknown- debuglib
2342./usr/lib/libcurses_p.a comp-c-proflib profile 2343./usr/lib/libcurses_p.a comp-c-proflib profile
2343./usr/lib/libdes.a comp-c-lib crypto 2344./usr/lib/libdes.a comp-c-lib crypto
2344./usr/lib/libdes_g.a -unknown- debuglib,crypto 2345./usr/lib/libdes_g.a -unknown- debuglib,crypto
2345./usr/lib/libdes_p.a comp-c-proflib profile,crypto 2346./usr/lib/libdes_p.a comp-c-proflib profile,crypto
2346./usr/lib/libdevmapper.a comp-lvm-lib lvm 2347./usr/lib/libdevmapper.a comp-lvm-lib lvm
2347./usr/lib/libdevmapper_g.a -unknown- debuglib,lvm 2348./usr/lib/libdevmapper_g.a -unknown- debuglib,lvm
2348./usr/lib/libdevmapper_p.a comp-lvm-proflib profile,lvm 2349./usr/lib/libdevmapper_p.a comp-lvm-proflib profile,lvm
2349./usr/lib/libdns.a comp-bind-lib 2350./usr/lib/libdns.a comp-bind-lib
2350./usr/lib/libdns_g.a -unknown- debuglib 2351./usr/lib/libdns_g.a -unknown- debuglib
2351./usr/lib/libdns_p.a comp-bind-proflib profile 2352./usr/lib/libdns_p.a comp-bind-proflib profile
 2353./usr/lib/libdns_sd.a comp-mdns-lib mdns
 2354./usr/lib/libdns_sd_g.a -unknown- debuglib,mdns
 2355./usr/lib/libdns_sd_p.a comp-mdns-proflib profile,mdns
2352./usr/lib/libedit.a comp-c-lib 2356./usr/lib/libedit.a comp-c-lib
2353./usr/lib/libedit_g.a -unknown- debuglib 2357./usr/lib/libedit_g.a -unknown- debuglib
2354./usr/lib/libedit_p.a comp-c-proflib profile 2358./usr/lib/libedit_p.a comp-c-proflib profile
2355./usr/lib/libevent.a comp-c-lib 2359./usr/lib/libevent.a comp-c-lib
2356./usr/lib/libevent_g.a -unknown- debuglib 2360./usr/lib/libevent_g.a -unknown- debuglib
2357./usr/lib/libevent_p.a comp-c-proflib profile 2361./usr/lib/libevent_p.a comp-c-proflib profile
2358./usr/lib/libfetch.a comp-c-lib 2362./usr/lib/libfetch.a comp-c-lib
2359./usr/lib/libfetch_g.a -unknown- debuglib 2363./usr/lib/libfetch_g.a -unknown- debuglib
2360./usr/lib/libfetch_p.a comp-c-proflib profile 2364./usr/lib/libfetch_p.a comp-c-proflib profile
2361./usr/lib/libfl.a comp-c-lib 2365./usr/lib/libfl.a comp-c-lib
2362./usr/lib/libfl_p.a comp-c-proflib profile 2366./usr/lib/libfl_p.a comp-c-proflib profile
2363./usr/lib/libform.a comp-c-lib 2367./usr/lib/libform.a comp-c-lib
2364./usr/lib/libform_g.a -unknown- debuglib 2368./usr/lib/libform_g.a -unknown- debuglib
@@ -3584,26 +3588,27 @@ @@ -3584,26 +3588,27 @@
3584./usr/libdata/lint/llib-lbluetooth.ln comp-c-lintlib lint 3588./usr/libdata/lint/llib-lbluetooth.ln comp-c-lintlib lint
3585./usr/libdata/lint/llib-lbsdmalloc.ln comp-c-lintlib lint 3589./usr/libdata/lint/llib-lbsdmalloc.ln comp-c-lintlib lint
3586./usr/libdata/lint/llib-lbz2.ln comp-c-lintlib lint 3590./usr/libdata/lint/llib-lbz2.ln comp-c-lintlib lint
3587./usr/libdata/lint/llib-lc.ln comp-c-lintlib lint 3591./usr/libdata/lint/llib-lc.ln comp-c-lintlib lint
3588./usr/libdata/lint/llib-lcompat.ln comp-c-lintlib lint 3592./usr/libdata/lint/llib-lcompat.ln comp-c-lintlib lint
3589./usr/libdata/lint/llib-lcrypt.ln comp-c-lintlib lint 3593./usr/libdata/lint/llib-lcrypt.ln comp-c-lintlib lint
3590./usr/libdata/lint/llib-lcrypto.ln comp-c-lintlib lint,crypto 3594./usr/libdata/lint/llib-lcrypto.ln comp-c-lintlib lint,crypto
3591./usr/libdata/lint/llib-lcrypto_idea.ln comp-c-lintlib lint,crypto_idea 3595./usr/libdata/lint/llib-lcrypto_idea.ln comp-c-lintlib lint,crypto_idea
3592./usr/libdata/lint/llib-lcrypto_mdc2.ln comp-c-lintlib lint,crypto_mdc2 3596./usr/libdata/lint/llib-lcrypto_mdc2.ln comp-c-lintlib lint,crypto_mdc2
3593./usr/libdata/lint/llib-lcrypto_rc5.ln comp-c-lintlib lint,crypto_rc5 3597./usr/libdata/lint/llib-lcrypto_rc5.ln comp-c-lintlib lint,crypto_rc5
3594./usr/libdata/lint/llib-lcurses.ln comp-c-lintlib lint 3598./usr/libdata/lint/llib-lcurses.ln comp-c-lintlib lint
3595./usr/libdata/lint/llib-ldes.ln comp-c-lintlib lint,crypto 3599./usr/libdata/lint/llib-ldes.ln comp-c-lintlib lint,crypto
3596./usr/libdata/lint/llib-ldns.ln comp-bind-lintlib lint 3600./usr/libdata/lint/llib-ldns.ln comp-bind-lintlib lint
 3601./usr/libdata/lint/llib-ldns_sd.ln comp-mdns-lintlib lint,mdns
3597./usr/libdata/lint/llib-ledit.ln comp-c-lintlib lint 3602./usr/libdata/lint/llib-ledit.ln comp-c-lintlib lint
3598./usr/libdata/lint/llib-lfetch.ln comp-c-lintlib lint 3603./usr/libdata/lint/llib-lfetch.ln comp-c-lintlib lint
3599./usr/libdata/lint/llib-lform.ln comp-c-lintlib lint 3604./usr/libdata/lint/llib-lform.ln comp-c-lintlib lint
3600./usr/libdata/lint/llib-lgnumalloc.ln comp-c-lintlib lint 3605./usr/libdata/lint/llib-lgnumalloc.ln comp-c-lintlib lint
3601./usr/libdata/lint/llib-lintl.ln comp-c-lintlib lint 3606./usr/libdata/lint/llib-lintl.ln comp-c-lintlib lint
3602./usr/libdata/lint/llib-lipsec.ln comp-c-lintlib lint 3607./usr/libdata/lint/llib-lipsec.ln comp-c-lintlib lint
3603./usr/libdata/lint/llib-lisc.ln comp-bind-lintlib lint 3608./usr/libdata/lint/llib-lisc.ln comp-bind-lintlib lint
3604./usr/libdata/lint/llib-lisccc.ln comp-bind-lintlib lint 3609./usr/libdata/lint/llib-lisccc.ln comp-bind-lintlib lint
3605./usr/libdata/lint/llib-lisccfg.ln comp-bind-lintlib lint 3610./usr/libdata/lint/llib-lisccfg.ln comp-bind-lintlib lint
3606./usr/libdata/lint/llib-liscsi.ln comp-c-lintlib lint,iscsi 3611./usr/libdata/lint/llib-liscsi.ln comp-c-lintlib lint,iscsi
3607./usr/libdata/lint/llib-lkstream.ln comp-c-lintlib obsolete 3612./usr/libdata/lint/llib-lkstream.ln comp-c-lintlib obsolete
3608./usr/libdata/lint/llib-lkvm.ln comp-c-lintlib lint 3613./usr/libdata/lint/llib-lkvm.ln comp-c-lintlib lint
3609./usr/libdata/lint/llib-ll.ln comp-c-lintlib lint 3614./usr/libdata/lint/llib-ll.ln comp-c-lintlib lint

cvs diff -r1.88 -r1.89 src/distrib/sets/lists/comp/shl.mi (expand / switch to unified diff)

--- src/distrib/sets/lists/comp/shl.mi 2009/09/08 20:34:48 1.88
+++ src/distrib/sets/lists/comp/shl.mi 2009/09/29 23:56:26 1.89
@@ -1,37 +1,38 @@ @@ -1,37 +1,38 @@
1# $NetBSD: shl.mi,v 1.88 2009/09/08 20:34:48 pooka Exp $ 1# $NetBSD: shl.mi,v 1.89 2009/09/29 23:56:26 tsarna Exp $
2# 2#
3# Note: don't delete entries from here - mark them as "obsolete" instead. 3# Note: don't delete entries from here - mark them as "obsolete" instead.
4# 4#
5./usr/lib/crtbeginT.o comp-c-lib 5./usr/lib/crtbeginT.o comp-c-lib
6./usr/lib/libarchive_pic.a comp-c-piclib 6./usr/lib/libarchive_pic.a comp-c-piclib
7./usr/lib/libasn1_pic.a comp-c-piclib kerberos 7./usr/lib/libasn1_pic.a comp-c-piclib kerberos
8./usr/lib/libatf_pic.a comp-obsolete obsolete 8./usr/lib/libatf_pic.a comp-obsolete obsolete
9./usr/lib/libatf-c_pic.a comp-atf-piclib 9./usr/lib/libatf-c_pic.a comp-atf-piclib
10./usr/lib/libatf-c++_pic.a comp-atf-piclib 10./usr/lib/libatf-c++_pic.a comp-atf-piclib
11./usr/lib/libbind9_pic.a comp-bind-piclib 11./usr/lib/libbind9_pic.a comp-bind-piclib
12./usr/lib/libbluetooth_pic.a comp-c-piclib 12./usr/lib/libbluetooth_pic.a comp-c-piclib
13./usr/lib/libbsdmalloc_pic.a comp-c-piclib 13./usr/lib/libbsdmalloc_pic.a comp-c-piclib
14./usr/lib/libbz2_pic.a comp-c-piclib 14./usr/lib/libbz2_pic.a comp-c-piclib
15./usr/lib/libc_pic.a comp-c-piclib 15./usr/lib/libc_pic.a comp-c-piclib
16./usr/lib/libcdk_pic.a comp-obsolete obsolete 16./usr/lib/libcdk_pic.a comp-obsolete obsolete
17./usr/lib/libcom_err_pic.a comp-c-piclib kerberos 17./usr/lib/libcom_err_pic.a comp-c-piclib kerberos
18./usr/lib/libcompat_pic.a comp-c-piclib 18./usr/lib/libcompat_pic.a comp-c-piclib
19./usr/lib/libcrypt_pic.a comp-c-piclib 19./usr/lib/libcrypt_pic.a comp-c-piclib
20./usr/lib/libcrypto_pic.a comp-c-piclib crypto 20./usr/lib/libcrypto_pic.a comp-c-piclib crypto
21./usr/lib/libcurses_pic.a comp-c-piclib 21./usr/lib/libcurses_pic.a comp-c-piclib
22./usr/lib/libdes_pic.a comp-c-piclib crypto 22./usr/lib/libdes_pic.a comp-c-piclib crypto
23./usr/lib/libdevmapper_pic.a comp-lvm-piclib lvm 23./usr/lib/libdevmapper_pic.a comp-lvm-piclib lvm
24./usr/lib/libdns_pic.a comp-bind-piclib 24./usr/lib/libdns_pic.a comp-bind-piclib
 25./usr/lib/libdns_sd_pic.a comp-mdns-piclib mdns
25./usr/lib/libedit_pic.a comp-c-piclib 26./usr/lib/libedit_pic.a comp-c-piclib
26./usr/lib/libevent_pic.a comp-c-piclib 27./usr/lib/libevent_pic.a comp-c-piclib
27./usr/lib/libfetch_pic.a comp-c-piclib 28./usr/lib/libfetch_pic.a comp-c-piclib
28./usr/lib/libform_pic.a comp-c-piclib 29./usr/lib/libform_pic.a comp-c-piclib
29./usr/lib/libg2c_pic.a comp-fortran-lib gcc=3 30./usr/lib/libg2c_pic.a comp-fortran-lib gcc=3
30./usr/lib/libg2c_pic.a comp-obsolete obsolete,gcc=4 31./usr/lib/libg2c_pic.a comp-obsolete obsolete,gcc=4
31./usr/lib/libgcc_eh.a comp-c-lib 32./usr/lib/libgcc_eh.a comp-c-lib
32./usr/lib/libgcc_eh_p.a comp-c-proflib profile 33./usr/lib/libgcc_eh_p.a comp-c-proflib profile
33./usr/lib/libgcc_eh_pic.a comp-c-piclib 34./usr/lib/libgcc_eh_pic.a comp-c-piclib
34./usr/lib/libgcc_pic.a comp-c-lib 35./usr/lib/libgcc_pic.a comp-c-lib
35./usr/lib/libgnumalloc_pic.a comp-c-piclib 36./usr/lib/libgnumalloc_pic.a comp-c-piclib
36./usr/lib/libgssapi_pic.a comp-c-piclib kerberos 37./usr/lib/libgssapi_pic.a comp-c-piclib kerberos
37./usr/lib/libhdb_pic.a comp-c-piclib kerberos 38./usr/lib/libhdb_pic.a comp-c-piclib kerberos

cvs diff -r1.212 -r1.213 src/distrib/sets/lists/etc/mi (expand / switch to unified diff)

--- src/distrib/sets/lists/etc/mi 2009/07/25 16:22:59 1.212
+++ src/distrib/sets/lists/etc/mi 2009/09/29 23:56:26 1.213
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1# $NetBSD: mi,v 1.212 2009/07/25 16:22:59 mbalmer Exp $ 1# $NetBSD: mi,v 1.213 2009/09/29 23:56:26 tsarna Exp $
2# 2#
3# Note: end-user configuration files that are moved to another location 3# Note: end-user configuration files that are moved to another location
4# should not be marked "obsolete"; they should just be removed from 4# should not be marked "obsolete"; they should just be removed from
5# the set list, a custom fix should be added to postinstall(8), and 5# the set list, a custom fix should be added to postinstall(8), and
6# an item should be added to src/UPDATING for MKUPDATE=yes users. 6# an item should be added to src/UPDATING for MKUPDATE=yes users.
7# This is an exception to the general rule that moved/removed files 7# This is an exception to the general rule that moved/removed files
8# are marked as "obsolete", because we don't want to arbitrarily 8# are marked as "obsolete", because we don't want to arbitrarily
9# remove end-user configuration files. 9# remove end-user configuration files.
10# 10#
11./.cshrc etc-util-etc 11./.cshrc etc-util-etc
12./.profile etc-util-etc 12./.profile etc-util-etc
13./dev/MAKEDEV etc-sys-etc 13./dev/MAKEDEV etc-sys-etc
14./dev/MAKEDEV.local etc-sys-etc 14./dev/MAKEDEV.local etc-sys-etc
@@ -208,26 +208,27 @@ @@ -208,26 +208,27 @@
208./etc/rc.d/ipsec etc-net-rc 208./etc/rc.d/ipsec etc-net-rc
209./etc/rc.d/irdaattach etc-sys-rc 209./etc/rc.d/irdaattach etc-sys-rc
210./etc/rc.d/iscsi_target etc-iscsi-rc 210./etc/rc.d/iscsi_target etc-iscsi-rc
211./etc/rc.d/isdnd etc-isdn-rc 211./etc/rc.d/isdnd etc-isdn-rc
212./etc/rc.d/kdc etc-krb5-rc 212./etc/rc.d/kdc etc-krb5-rc
213./etc/rc.d/kerberos etc-obsolete obsolete 213./etc/rc.d/kerberos etc-obsolete obsolete
214./etc/rc.d/ldconfig etc-sys-rc 214./etc/rc.d/ldconfig etc-sys-rc
215./etc/rc.d/lkm1 etc-obsolete obsolete 215./etc/rc.d/lkm1 etc-obsolete obsolete
216./etc/rc.d/lkm2 etc-obsolete obsolete 216./etc/rc.d/lkm2 etc-obsolete obsolete
217./etc/rc.d/lkm3 etc-obsolete obsolete 217./etc/rc.d/lkm3 etc-obsolete obsolete
218./etc/rc.d/local etc-sys-rc 218./etc/rc.d/local etc-sys-rc
219./etc/rc.d/lpd etc-lpr-rc 219./etc/rc.d/lpd etc-lpr-rc
220./etc/rc.d/lvm etc-sys-rc 220./etc/rc.d/lvm etc-sys-rc
 221./etc/rc.d/mdnsd etc-mdns-rc
221./etc/rc.d/mixerctl etc-audio-rc 222./etc/rc.d/mixerctl etc-audio-rc
222./etc/rc.d/mopd etc-bootserver-rc 223./etc/rc.d/mopd etc-bootserver-rc
223./etc/rc.d/motd etc-sys-rc 224./etc/rc.d/motd etc-sys-rc
224./etc/rc.d/mountall etc-sys-rc 225./etc/rc.d/mountall etc-sys-rc
225./etc/rc.d/mountcritlocal etc-sys-rc 226./etc/rc.d/mountcritlocal etc-sys-rc
226./etc/rc.d/mountcritremote etc-sys-rc 227./etc/rc.d/mountcritremote etc-sys-rc
227./etc/rc.d/mountd etc-nfsserver-rc 228./etc/rc.d/mountd etc-nfsserver-rc
228./etc/rc.d/moused etc-sysutil-rc 229./etc/rc.d/moused etc-sysutil-rc
229./etc/rc.d/mrouted etc-router-rc 230./etc/rc.d/mrouted etc-router-rc
230./etc/rc.d/named etc-bind-rc 231./etc/rc.d/named etc-bind-rc
231./etc/rc.d/ndbootd etc-bootserver-rc 232./etc/rc.d/ndbootd etc-bootserver-rc
232./etc/rc.d/network etc-net-rc 233./etc/rc.d/network etc-net-rc
233./etc/rc.d/newsyslog etc-sys-rc 234./etc/rc.d/newsyslog etc-sys-rc

cvs diff -r1.1158 -r1.1159 src/distrib/sets/lists/man/mi (expand / switch to unified diff)

--- src/distrib/sets/lists/man/mi 2009/09/14 10:36:49 1.1158
+++ src/distrib/sets/lists/man/mi 2009/09/29 23:56:27 1.1159
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1# $NetBSD: mi,v 1.1158 2009/09/14 10:36:49 degroote Exp $ 1# $NetBSD: mi,v 1.1159 2009/09/29 23:56:27 tsarna Exp $
2# 2#
3# Note: don't delete entries from here - mark them as "obsolete" instead. 3# Note: don't delete entries from here - mark them as "obsolete" instead.
4# 4#
5./etc/mtree/set.man man-sys-root 5./etc/mtree/set.man man-sys-root
6./usr/share/info/am-utils.info man-amd-info info 6./usr/share/info/am-utils.info man-amd-info info
7./usr/share/info/as.info man-computil-info binutils,info 7./usr/share/info/as.info man-computil-info binutils,info
8./usr/share/info/awk.info man-util-info info 8./usr/share/info/awk.info man-util-info info
9./usr/share/info/bfd.info man-computil-info binutils,info 9./usr/share/info/bfd.info man-computil-info binutils,info
10./usr/share/info/binutils.info man-computil-info binutils,info 10./usr/share/info/binutils.info man-computil-info binutils,info
11./usr/share/info/bzip2.info man-obsolete obsolete 11./usr/share/info/bzip2.info man-obsolete obsolete
12./usr/share/info/cpp.info man-util-info gcccmds,info 12./usr/share/info/cpp.info man-util-info gcccmds,info
13./usr/share/info/cvs.info man-cvs-info cvs,info 13./usr/share/info/cvs.info man-cvs-info cvs,info
14./usr/share/info/cvsclient.info man-cvs-info cvs,info 14./usr/share/info/cvsclient.info man-cvs-info cvs,info
@@ -117,26 +117,27 @@ @@ -117,26 +117,27 @@
117./usr/share/man/cat1/cut.0 man-util-catman .cat 117./usr/share/man/cat1/cut.0 man-util-catman .cat
118./usr/share/man/cat1/daicctl.0 man-sysutil-catman .cat 118./usr/share/man/cat1/daicctl.0 man-sysutil-catman .cat
119./usr/share/man/cat1/date.0 man-util-catman .cat 119./usr/share/man/cat1/date.0 man-util-catman .cat
120./usr/share/man/cat1/db.0 man-util-catman .cat 120./usr/share/man/cat1/db.0 man-util-catman .cat
121./usr/share/man/cat1/dc.0 man-util-catman .cat 121./usr/share/man/cat1/dc.0 man-util-catman .cat
122./usr/share/man/cat1/dd.0 man-util-catman .cat 122./usr/share/man/cat1/dd.0 man-util-catman .cat
123./usr/share/man/cat1/deroff.0 man-util-catman .cat 123./usr/share/man/cat1/deroff.0 man-util-catman .cat
124./usr/share/man/cat1/df.0 man-util-catman .cat 124./usr/share/man/cat1/df.0 man-util-catman .cat
125./usr/share/man/cat1/diff.0 man-util-catman .cat 125./usr/share/man/cat1/diff.0 man-util-catman .cat
126./usr/share/man/cat1/diff3.0 man-util-catman .cat 126./usr/share/man/cat1/diff3.0 man-util-catman .cat
127./usr/share/man/cat1/dig.0 man-netutil-catman .cat 127./usr/share/man/cat1/dig.0 man-netutil-catman .cat
128./usr/share/man/cat1/dirname.0 man-util-catman .cat 128./usr/share/man/cat1/dirname.0 man-util-catman .cat
129./usr/share/man/cat1/dirs.0 man-util-catman .cat 129./usr/share/man/cat1/dirs.0 man-util-catman .cat
 130./usr/share/man/cat1/dns-sd.0 man-mdns-catman mdns,.cat
130./usr/share/man/cat1/dnskeygen.0 man-obsolete obsolete 131./usr/share/man/cat1/dnskeygen.0 man-obsolete obsolete
131./usr/share/man/cat1/dnsquery.0 man-obsolete obsolete 132./usr/share/man/cat1/dnsquery.0 man-obsolete obsolete
132./usr/share/man/cat1/domainname.0 man-nis-catman .cat 133./usr/share/man/cat1/domainname.0 man-nis-catman .cat
133./usr/share/man/cat1/download-vulnerability-list.0 man-obsolete obsolete 134./usr/share/man/cat1/download-vulnerability-list.0 man-obsolete obsolete
134./usr/share/man/cat1/dtmfdecode.0 man-isdn-catman .cat 135./usr/share/man/cat1/dtmfdecode.0 man-isdn-catman .cat
135./usr/share/man/cat1/du.0 man-util-catman .cat 136./usr/share/man/cat1/du.0 man-util-catman .cat
136./usr/share/man/cat1/echo.0 man-util-catman .cat 137./usr/share/man/cat1/echo.0 man-util-catman .cat
137./usr/share/man/cat1/ed.0 man-util-catman .cat 138./usr/share/man/cat1/ed.0 man-util-catman .cat
138./usr/share/man/cat1/egrep.0 man-util-catman .cat 139./usr/share/man/cat1/egrep.0 man-util-catman .cat
139./usr/share/man/cat1/eject.0 man-util-catman .cat 140./usr/share/man/cat1/eject.0 man-util-catman .cat
140./usr/share/man/cat1/env.0 man-util-catman .cat 141./usr/share/man/cat1/env.0 man-util-catman .cat
141./usr/share/man/cat1/error.0 man-util-catman .cat 142./usr/share/man/cat1/error.0 man-util-catman .cat
142./usr/share/man/cat1/ex.0 man-util-catman .cat 143./usr/share/man/cat1/ex.0 man-util-catman .cat
@@ -2252,26 +2253,27 @@ @@ -2252,26 +2253,27 @@
2252./usr/share/man/cat8/mailwrapper.0 man-mailwrapper-catman .cat 2253./usr/share/man/cat8/mailwrapper.0 man-mailwrapper-catman .cat
2253./usr/share/man/cat8/makedbm.0 man-nis-catman yp,.cat 2254./usr/share/man/cat8/makedbm.0 man-nis-catman yp,.cat
2254./usr/share/man/cat8/makedev.0 man-sysutil-catman .cat 2255./usr/share/man/cat8/makedev.0 man-sysutil-catman .cat
2255./usr/share/man/cat8/makedev.local.0 man-sysutil-catman .cat 2256./usr/share/man/cat8/makedev.local.0 man-sysutil-catman .cat
2256./usr/share/man/cat8/makefs.0 man-sysutil-catman .cat 2257./usr/share/man/cat8/makefs.0 man-sysutil-catman .cat
2257./usr/share/man/cat8/makekey.0 man-crypto-catman .cat 2258./usr/share/man/cat8/makekey.0 man-crypto-catman .cat
2258./usr/share/man/cat8/makemap.0 man-obsolete obsolete 2259./usr/share/man/cat8/makemap.0 man-obsolete obsolete
2259./usr/share/man/cat8/makewhatis.0 man-man-catman .cat 2260./usr/share/man/cat8/makewhatis.0 man-man-catman .cat
2260./usr/share/man/cat8/map-mbone.0 man-netutil-catman .cat 2261./usr/share/man/cat8/map-mbone.0 man-netutil-catman .cat
2261./usr/share/man/cat8/master.0 man-postfix-catman postfix,.cat 2262./usr/share/man/cat8/master.0 man-postfix-catman postfix,.cat
2262./usr/share/man/cat8/mbr.0 man-obsolete obsolete 2263./usr/share/man/cat8/mbr.0 man-obsolete obsolete
2263./usr/share/man/cat8/mbrlabel.0 man-sysutil-catman .cat 2264./usr/share/man/cat8/mbrlabel.0 man-sysutil-catman .cat
2264./usr/share/man/cat8/mdconfig.0 man-sysutil-catman .cat 2265./usr/share/man/cat8/mdconfig.0 man-sysutil-catman .cat
 2266./usr/share/man/cat8/mdnsd.0 man-mdns-catman mdns,.cat
2265./usr/share/man/cat8/mdsetimage.0 man-sysutil-catman binutils,.cat 2267./usr/share/man/cat8/mdsetimage.0 man-sysutil-catman binutils,.cat
2266./usr/share/man/cat8/mfs.0 man-sys-catman .cat 2268./usr/share/man/cat8/mfs.0 man-sys-catman .cat
2267./usr/share/man/cat8/mipsco/MAKEDEV.0 man-obsolete obsolete 2269./usr/share/man/cat8/mipsco/MAKEDEV.0 man-obsolete obsolete
2268./usr/share/man/cat8/mipsco/makedev.0 man-obsolete obsolete 2270./usr/share/man/cat8/mipsco/makedev.0 man-obsolete obsolete
2269./usr/share/man/cat8/mk-amd-map.0 man-amd-catman .cat 2271./usr/share/man/cat8/mk-amd-map.0 man-amd-catman .cat
2270./usr/share/man/cat8/mkalias.0 man-nis-catman yp,.cat 2272./usr/share/man/cat8/mkalias.0 man-nis-catman yp,.cat
2271./usr/share/man/cat8/mknetid.0 man-nis-catman yp,.cat 2273./usr/share/man/cat8/mknetid.0 man-nis-catman yp,.cat
2272./usr/share/man/cat8/mknod.0 man-sysutil-catman .cat 2274./usr/share/man/cat8/mknod.0 man-sysutil-catman .cat
2273./usr/share/man/cat8/mld6query.0 man-netutil-catman use_inet6,.cat 2275./usr/share/man/cat8/mld6query.0 man-netutil-catman use_inet6,.cat
2274./usr/share/man/cat8/mlxctl.0 man-sysutil-catman .cat 2276./usr/share/man/cat8/mlxctl.0 man-sysutil-catman .cat
2275./usr/share/man/cat8/mmcformat.0 man-sysutil-catman .cat 2277./usr/share/man/cat8/mmcformat.0 man-sysutil-catman .cat
2276./usr/share/man/cat8/mmeye/MAKEDEV.0 man-obsolete obsolete 2278./usr/share/man/cat8/mmeye/MAKEDEV.0 man-obsolete obsolete
2277./usr/share/man/cat8/mmeye/makedev.0 man-obsolete obsolete 2279./usr/share/man/cat8/mmeye/makedev.0 man-obsolete obsolete
@@ -2815,26 +2817,27 @@ @@ -2815,26 +2817,27 @@
2815./usr/share/man/html1/cut.html man-util-htmlman html 2817./usr/share/man/html1/cut.html man-util-htmlman html
2816./usr/share/man/html1/daicctl.html man-sysutil-htmlman html 2818./usr/share/man/html1/daicctl.html man-sysutil-htmlman html
2817./usr/share/man/html1/date.html man-util-htmlman html 2819./usr/share/man/html1/date.html man-util-htmlman html
2818./usr/share/man/html1/db.html man-util-htmlman html 2820./usr/share/man/html1/db.html man-util-htmlman html
2819./usr/share/man/html1/dc.html man-util-htmlman html 2821./usr/share/man/html1/dc.html man-util-htmlman html
2820./usr/share/man/html1/dd.html man-util-htmlman html 2822./usr/share/man/html1/dd.html man-util-htmlman html
2821./usr/share/man/html1/deroff.html man-util-htmlman html 2823./usr/share/man/html1/deroff.html man-util-htmlman html
2822./usr/share/man/html1/df.html man-util-htmlman html 2824./usr/share/man/html1/df.html man-util-htmlman html
2823./usr/share/man/html1/diff.html man-util-htmlman html 2825./usr/share/man/html1/diff.html man-util-htmlman html
2824./usr/share/man/html1/diff3.html man-util-htmlman html 2826./usr/share/man/html1/diff3.html man-util-htmlman html
2825./usr/share/man/html1/dig.html man-netutil-htmlman html 2827./usr/share/man/html1/dig.html man-netutil-htmlman html
2826./usr/share/man/html1/dirname.html man-util-htmlman html 2828./usr/share/man/html1/dirname.html man-util-htmlman html
2827./usr/share/man/html1/dirs.html man-util-htmlman html 2829./usr/share/man/html1/dirs.html man-util-htmlman html
 2830./usr/share/man/html1/dns-sd.html man-mdns-htmlman mdns,html
2828./usr/share/man/html1/domainname.html man-nis-htmlman html 2831./usr/share/man/html1/domainname.html man-nis-htmlman html
2829./usr/share/man/html1/download-vulnerability-list.html man-obsolete obsolete 2832./usr/share/man/html1/download-vulnerability-list.html man-obsolete obsolete
2830./usr/share/man/html1/dtmfdecode.html man-isdn-htmlman html 2833./usr/share/man/html1/dtmfdecode.html man-isdn-htmlman html
2831./usr/share/man/html1/du.html man-util-htmlman html 2834./usr/share/man/html1/du.html man-util-htmlman html
2832./usr/share/man/html1/echo.html man-util-htmlman html 2835./usr/share/man/html1/echo.html man-util-htmlman html
2833./usr/share/man/html1/ed.html man-util-htmlman html 2836./usr/share/man/html1/ed.html man-util-htmlman html
2834./usr/share/man/html1/egrep.html man-util-htmlman html 2837./usr/share/man/html1/egrep.html man-util-htmlman html
2835./usr/share/man/html1/eject.html man-util-htmlman html 2838./usr/share/man/html1/eject.html man-util-htmlman html
2836./usr/share/man/html1/env.html man-util-htmlman html 2839./usr/share/man/html1/env.html man-util-htmlman html
2837./usr/share/man/html1/error.html man-util-htmlman html 2840./usr/share/man/html1/error.html man-util-htmlman html
2838./usr/share/man/html1/ex.html man-util-htmlman html 2841./usr/share/man/html1/ex.html man-util-htmlman html
2839./usr/share/man/html1/expand.html man-util-htmlman html 2842./usr/share/man/html1/expand.html man-util-htmlman html
2840./usr/share/man/html1/expr.html man-util-htmlman html 2843./usr/share/man/html1/expr.html man-util-htmlman html
@@ -4672,26 +4675,27 @@ @@ -4672,26 +4675,27 @@
4672./usr/share/man/html8/macppc/ofwboot.xcf.html man-sysutil-htmlman html 4675./usr/share/man/html8/macppc/ofwboot.xcf.html man-sysutil-htmlman html
4673./usr/share/man/html8/mail.local.html man-mail-htmlman html 4676./usr/share/man/html8/mail.local.html man-mail-htmlman html
4674./usr/share/man/html8/mailwrapper.html man-mailwrapper-htmlman html 4677./usr/share/man/html8/mailwrapper.html man-mailwrapper-htmlman html
4675./usr/share/man/html8/makedbm.html man-nis-htmlman yp,html 4678./usr/share/man/html8/makedbm.html man-nis-htmlman yp,html
4676./usr/share/man/html8/makedev.html man-sysutil-htmlman html 4679./usr/share/man/html8/makedev.html man-sysutil-htmlman html
4677./usr/share/man/html8/makedev.local.html man-sysutil-htmlman html 4680./usr/share/man/html8/makedev.local.html man-sysutil-htmlman html
4678./usr/share/man/html8/makefs.html man-sysutil-htmlman html 4681./usr/share/man/html8/makefs.html man-sysutil-htmlman html
4679./usr/share/man/html8/makekey.html man-crypto-htmlman html 4682./usr/share/man/html8/makekey.html man-crypto-htmlman html
4680./usr/share/man/html8/makewhatis.html man-man-htmlman html 4683./usr/share/man/html8/makewhatis.html man-man-htmlman html
4681./usr/share/man/html8/map-mbone.html man-netutil-htmlman html 4684./usr/share/man/html8/map-mbone.html man-netutil-htmlman html
4682./usr/share/man/html8/master.html man-postfix-htmlman postfix,html 4685./usr/share/man/html8/master.html man-postfix-htmlman postfix,html
4683./usr/share/man/html8/mbrlabel.html man-sysutil-htmlman html 4686./usr/share/man/html8/mbrlabel.html man-sysutil-htmlman html
4684./usr/share/man/html8/mdconfig.html man-sysutil-htmlman html 4687./usr/share/man/html8/mdconfig.html man-sysutil-htmlman html
 4688./usr/share/man/html8/mdnsd.html man-mdns-htmlman mdns,html
4685./usr/share/man/html8/mdsetimage.html man-sysutil-htmlman binutils,html 4689./usr/share/man/html8/mdsetimage.html man-sysutil-htmlman binutils,html
4686./usr/share/man/html8/mfs.html man-sys-htmlman html 4690./usr/share/man/html8/mfs.html man-sys-htmlman html
4687./usr/share/man/html8/mk-amd-map.html man-amd-htmlman html 4691./usr/share/man/html8/mk-amd-map.html man-amd-htmlman html
4688./usr/share/man/html8/mkalias.html man-nis-htmlman yp,html 4692./usr/share/man/html8/mkalias.html man-nis-htmlman yp,html
4689./usr/share/man/html8/mknetid.html man-nis-htmlman yp,html 4693./usr/share/man/html8/mknetid.html man-nis-htmlman yp,html
4690./usr/share/man/html8/mknod.html man-sysutil-htmlman html 4694./usr/share/man/html8/mknod.html man-sysutil-htmlman html
4691./usr/share/man/html8/mld6query.html man-netutil-htmlman use_inet6,html 4695./usr/share/man/html8/mld6query.html man-netutil-htmlman use_inet6,html
4692./usr/share/man/html8/mlxctl.html man-sysutil-htmlman html 4696./usr/share/man/html8/mlxctl.html man-sysutil-htmlman html
4693./usr/share/man/html8/mmcformat.html man-sysutil-htmlman html 4697./usr/share/man/html8/mmcformat.html man-sysutil-htmlman html
4694./usr/share/man/html8/modload.html man-sysutil-htmlman html 4698./usr/share/man/html8/modload.html man-sysutil-htmlman html
4695./usr/share/man/html8/modstat.html man-sysutil-htmlman html 4699./usr/share/man/html8/modstat.html man-sysutil-htmlman html
4696./usr/share/man/html8/modunload.html man-sysutil-htmlman html 4700./usr/share/man/html8/modunload.html man-sysutil-htmlman html
4697./usr/share/man/html8/mopd.html man-bootserver-htmlman html 4701./usr/share/man/html8/mopd.html man-bootserver-htmlman html
@@ -5129,26 +5133,27 @@ @@ -5129,26 +5133,27 @@
5129./usr/share/man/man1/cut.1 man-util-man .man 5133./usr/share/man/man1/cut.1 man-util-man .man
5130./usr/share/man/man1/daicctl.1 man-sysutil-man .man 5134./usr/share/man/man1/daicctl.1 man-sysutil-man .man
5131./usr/share/man/man1/date.1 man-util-man .man 5135./usr/share/man/man1/date.1 man-util-man .man
5132./usr/share/man/man1/db.1 man-util-man .man 5136./usr/share/man/man1/db.1 man-util-man .man
5133./usr/share/man/man1/dc.1 man-util-man .man 5137./usr/share/man/man1/dc.1 man-util-man .man
5134./usr/share/man/man1/dd.1 man-util-man .man 5138./usr/share/man/man1/dd.1 man-util-man .man
5135./usr/share/man/man1/deroff.1 man-util-man .man 5139./usr/share/man/man1/deroff.1 man-util-man .man
5136./usr/share/man/man1/df.1 man-util-man .man 5140./usr/share/man/man1/df.1 man-util-man .man
5137./usr/share/man/man1/diff.1 man-util-man .man 5141./usr/share/man/man1/diff.1 man-util-man .man
5138./usr/share/man/man1/diff3.1 man-util-man .man 5142./usr/share/man/man1/diff3.1 man-util-man .man
5139./usr/share/man/man1/dig.1 man-netutil-man .man 5143./usr/share/man/man1/dig.1 man-netutil-man .man
5140./usr/share/man/man1/dirname.1 man-util-man .man 5144./usr/share/man/man1/dirname.1 man-util-man .man
5141./usr/share/man/man1/dirs.1 man-util-man .man 5145./usr/share/man/man1/dirs.1 man-util-man .man
 5146./usr/share/man/man1/dns-sd.1 man-mdns-man mdns,.man
5142./usr/share/man/man1/dnskeygen.1 man-obsolete obsolete 5147./usr/share/man/man1/dnskeygen.1 man-obsolete obsolete
5143./usr/share/man/man1/dnsquery.1 man-obsolete obsolete 5148./usr/share/man/man1/dnsquery.1 man-obsolete obsolete
5144./usr/share/man/man1/domainname.1 man-nis-man .man 5149./usr/share/man/man1/domainname.1 man-nis-man .man
5145./usr/share/man/man1/download-vulnerability-list.1 man-obsolete obsolete 5150./usr/share/man/man1/download-vulnerability-list.1 man-obsolete obsolete
5146./usr/share/man/man1/dtmfdecode.1 man-isdn-man .man 5151./usr/share/man/man1/dtmfdecode.1 man-isdn-man .man
5147./usr/share/man/man1/du.1 man-util-man .man 5152./usr/share/man/man1/du.1 man-util-man .man
5148./usr/share/man/man1/echo.1 man-util-man .man 5153./usr/share/man/man1/echo.1 man-util-man .man
5149./usr/share/man/man1/ed.1 man-util-man .man 5154./usr/share/man/man1/ed.1 man-util-man .man
5150./usr/share/man/man1/egrep.1 man-util-man .man 5155./usr/share/man/man1/egrep.1 man-util-man .man
5151./usr/share/man/man1/eject.1 man-util-man .man 5156./usr/share/man/man1/eject.1 man-util-man .man
5152./usr/share/man/man1/env.1 man-util-man .man 5157./usr/share/man/man1/env.1 man-util-man .man
5153./usr/share/man/man1/error.1 man-util-man .man 5158./usr/share/man/man1/error.1 man-util-man .man
5154./usr/share/man/man1/ex.1 man-util-man .man 5159./usr/share/man/man1/ex.1 man-util-man .man
@@ -7264,26 +7269,27 @@ @@ -7264,26 +7269,27 @@
7264./usr/share/man/man8/mailwrapper.8 man-mailwrapper-man .man 7269./usr/share/man/man8/mailwrapper.8 man-mailwrapper-man .man
7265./usr/share/man/man8/makedbm.8 man-nis-man yp,.man 7270./usr/share/man/man8/makedbm.8 man-nis-man yp,.man
7266./usr/share/man/man8/makedev.8 man-sysutil-man .man 7271./usr/share/man/man8/makedev.8 man-sysutil-man .man
7267./usr/share/man/man8/makedev.local.8 man-sysutil-man .man 7272./usr/share/man/man8/makedev.local.8 man-sysutil-man .man
7268./usr/share/man/man8/makefs.8 man-sysutil-man .man 7273./usr/share/man/man8/makefs.8 man-sysutil-man .man
7269./usr/share/man/man8/makekey.8 man-crypto-man .man 7274./usr/share/man/man8/makekey.8 man-crypto-man .man
7270./usr/share/man/man8/makemap.8 man-obsolete obsolete 7275./usr/share/man/man8/makemap.8 man-obsolete obsolete
7271./usr/share/man/man8/makewhatis.8 man-man-man .man 7276./usr/share/man/man8/makewhatis.8 man-man-man .man
7272./usr/share/man/man8/map-mbone.8 man-netutil-man .man 7277./usr/share/man/man8/map-mbone.8 man-netutil-man .man
7273./usr/share/man/man8/master.8 man-postfix-man postfix,.man 7278./usr/share/man/man8/master.8 man-postfix-man postfix,.man
7274./usr/share/man/man8/mbr.8 man-obsolete obsolete 7279./usr/share/man/man8/mbr.8 man-obsolete obsolete
7275./usr/share/man/man8/mbrlabel.8 man-sysutil-man .man 7280./usr/share/man/man8/mbrlabel.8 man-sysutil-man .man
7276./usr/share/man/man8/mdconfig.8 man-sysutil-man .man 7281./usr/share/man/man8/mdconfig.8 man-sysutil-man .man
 7282./usr/share/man/man8/mdnsd.8 man-mdns-man mdns,.man
7277./usr/share/man/man8/mdsetimage.8 man-sysutil-man binutils,.man 7283./usr/share/man/man8/mdsetimage.8 man-sysutil-man binutils,.man
7278./usr/share/man/man8/mfs.8 man-sys-man .man 7284./usr/share/man/man8/mfs.8 man-sys-man .man
7279./usr/share/man/man8/mipsco/MAKEDEV.8 man-obsolete obsolete 7285./usr/share/man/man8/mipsco/MAKEDEV.8 man-obsolete obsolete
7280./usr/share/man/man8/mipsco/makedev.8 man-obsolete obsolete 7286./usr/share/man/man8/mipsco/makedev.8 man-obsolete obsolete
7281./usr/share/man/man8/mk-amd-map.8 man-amd-man .man 7287./usr/share/man/man8/mk-amd-map.8 man-amd-man .man
7282./usr/share/man/man8/mkalias.8 man-nis-man yp,.man 7288./usr/share/man/man8/mkalias.8 man-nis-man yp,.man
7283./usr/share/man/man8/mknetid.8 man-nis-man yp,.man 7289./usr/share/man/man8/mknetid.8 man-nis-man yp,.man
7284./usr/share/man/man8/mknod.8 man-sysutil-man .man 7290./usr/share/man/man8/mknod.8 man-sysutil-man .man
7285./usr/share/man/man8/mld6query.8 man-netutil-man use_inet6,.man 7291./usr/share/man/man8/mld6query.8 man-netutil-man use_inet6,.man
7286./usr/share/man/man8/mlxctl.8 man-sysutil-man .man 7292./usr/share/man/man8/mlxctl.8 man-sysutil-man .man
7287./usr/share/man/man8/mmcformat.8 man-sysutil-man .man 7293./usr/share/man/man8/mmcformat.8 man-sysutil-man .man
7288./usr/share/man/man8/mmeye/MAKEDEV.8 man-obsolete obsolete 7294./usr/share/man/man8/mmeye/MAKEDEV.8 man-obsolete obsolete
7289./usr/share/man/man8/mmeye/makedev.8 man-obsolete obsolete 7295./usr/share/man/man8/mmeye/makedev.8 man-obsolete obsolete

cvs diff -r1.717 -r1.718 src/doc/3RDPARTY (expand / switch to unified diff)

--- src/doc/3RDPARTY 2009/09/04 19:37:16 1.717
+++ src/doc/3RDPARTY 2009/09/29 23:56:27 1.718
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1# $NetBSD: 3RDPARTY,v 1.717 2009/09/04 19:37:16 jmcneill Exp $ 1# $NetBSD: 3RDPARTY,v 1.718 2009/09/29 23:56:27 tsarna Exp $
2# 2#
3# This file contains a list of the software that has been integrated into 3# This file contains a list of the software that has been integrated into
4# NetBSD where we are not the primary maintainer. 4# NetBSD where we are not the primary maintainer.
5# 5#
6# When you make changes to this software, be sure to discuss it with the 6# When you make changes to this software, be sure to discuss it with the
7# maintainer and contribute your patches. Divergence from the official 7# maintainer and contribute your patches. Divergence from the official
8# sources is not desirable, and should be avoided as much as possible. 8# sources is not desirable, and should be avoided as much as possible.
9# 9#
10# When importing, please deal with the RCS IDs in this way: 10# When importing, please deal with the RCS IDs in this way:
11# 1. Preserve the RCS IDs in the files by removing the $ signs from 11# 1. Preserve the RCS IDs in the files by removing the $ signs from
12# the IDs before you do the import. 12# the IDs before you do the import.
13# 2. After the import, add NetBSD RCS IDs to all of the files. 13# 2. After the import, add NetBSD RCS IDs to all of the files.
14# 14#
@@ -599,26 +599,39 @@ Package: libwrap @@ -599,26 +599,39 @@ Package: libwrap
599Version: tcp_wrappers 7.6 w/ large amount of IPv6 changes 599Version: tcp_wrappers 7.6 w/ large amount of IPv6 changes
600Current Vers: tcp_wrappers 7.6-ipv6.1 600Current Vers: tcp_wrappers 7.6-ipv6.1
601Maintainer: Wietse Venema <wietse@porcupine.org> 601Maintainer: Wietse Venema <wietse@porcupine.org>
602Archive Site: ftp://ftp.porcupine.org/pub/security/ 602Archive Site: ftp://ftp.porcupine.org/pub/security/
603Home Page: ftp://ftp.porcupine.org/pub/security/ 603Home Page: ftp://ftp.porcupine.org/pub/security/
604Mailing List: 604Mailing List:
605Responsible: cjs 605Responsible: cjs
606License: BSD-like 606License: BSD-like
607Notes: 607Notes:
608We import only libwrap (under src/lib), tcpdchk and tcpdmatch (both 608We import only libwrap (under src/lib), tcpdchk and tcpdmatch (both
609under src/usr.sbin). We don't use tcpd; that functionality is built 609under src/usr.sbin). We don't use tcpd; that functionality is built
610into inetd. The provided libwrap2netbsd script handles just libwrap. 610into inetd. The provided libwrap2netbsd script handles just libwrap.
611 611
 612Package: mDNSResponder
 613Version: 212.1
 614Current Vers: 212.1
 615Maintainer: Apple
 616Archive Site: http://www.opensource.apple.com/tarballs/mDNSResponder/
 617Home Page: http://developer.apple.com/opensource/internet/bonjour.html
 618Mailing List: bonjour-dev@lists.apple.com
 619License: Apache2 (mdnsd), BSD 3-clause (libdns_sd),
 620 BSD 3-clause like (dns-sd)
 621Responsible: tsarna
 622Notes:
 623The sources were integrated into src/sys/external/apache2/mDNSResponder/dist.
 624
612Package: mesa-drm 625Package: mesa-drm
613Version: git 85b9f737db0d2a845e4d7e2bbf9ad12ff9e2227c 626Version: git 85b9f737db0d2a845e4d7e2bbf9ad12ff9e2227c
614Current Vers: 627Current Vers:
615Maintainer: mesa-git@? 628Maintainer: mesa-git@?
616Archive Site: git://anongit.freedesktop.org/git/mesa/drm 629Archive Site: git://anongit.freedesktop.org/git/mesa/drm
617Home Page: http://cgit.freedesktop.org/mesa/drm/ 630Home Page: http://cgit.freedesktop.org/mesa/drm/
618Mailing List: 631Mailing List:
619Responsible: mrg, bjs 632Responsible: mrg, bjs
620License: BSD 633License: BSD
621Notes: 634Notes:
622Imported all except for linux-core into src/sys/external/bsd/drm/dist. 635Imported all except for linux-core into src/sys/external/bsd/drm/dist.
623 636
624Package: mopd 637Package: mopd

cvs diff -r1.372 -r1.373 src/etc/Makefile (expand / switch to unified diff)

--- src/etc/Makefile 2009/09/08 07:08:01 1.372
+++ src/etc/Makefile 2009/09/29 23:56:27 1.373
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1# $NetBSD: Makefile,v 1.372 2009/09/08 07:08:01 skrll Exp $ 1# $NetBSD: Makefile,v 1.373 2009/09/29 23:56:27 tsarna Exp $
2# from: @(#)Makefile 8.7 (Berkeley) 5/25/95 2# from: @(#)Makefile 8.7 (Berkeley) 5/25/95
3 3
4# Environment variables without default values: 4# Environment variables without default values:
5# DESTDIR must be set before anything in this file will work. 5# DESTDIR must be set before anything in this file will work.
6# RELEASEDIR is where the tarred up stuff for a snapshot or 6# RELEASEDIR is where the tarred up stuff for a snapshot or
7# release will be placed. 7# release will be placed.
8# 8#
9# Environment variables with default values: 9# Environment variables with default values:
10# LOCALTIME will set the default local time for the system you 10# LOCALTIME will set the default local time for the system you
11# build; it determines what /etc/localtime is symlink'd to. 11# build; it determines what /etc/localtime is symlink'd to.
12# KERNSRCDIR points to kernel source; it is set by default to ../sys, 12# KERNSRCDIR points to kernel source; it is set by default to ../sys,
13# but can be overridden. 13# but can be overridden.
14# KERNOBJDIR is the kernel build directory, it defaults to 14# KERNOBJDIR is the kernel build directory, it defaults to
@@ -179,27 +179,27 @@ MAKEDEV: .EXEC @@ -179,27 +179,27 @@ MAKEDEV: .EXEC
179 179
180RELEASEVARS= BSDOBJDIR BSDSRCDIR BUILDID \ 180RELEASEVARS= BSDOBJDIR BSDSRCDIR BUILDID \
181 DESTDIR EXTERNAL_TOOLCHAIN HAVE_GCC HAVE_GDB \ 181 DESTDIR EXTERNAL_TOOLCHAIN HAVE_GCC HAVE_GDB \
182 INSTALLWORLDDIR \ 182 INSTALLWORLDDIR \
183 KERNARCHDIR KERNCONFDIR KERNOBJDIR KERNSRCDIR \ 183 KERNARCHDIR KERNCONFDIR KERNOBJDIR KERNSRCDIR \
184 MACHINE MACHINE_ARCH MAKE MAKECONF MAKEFLAGS \ 184 MACHINE MACHINE_ARCH MAKE MAKECONF MAKEFLAGS \
185 MAKEOBJDIR MAKEOBJDIRPREFIX MAKEVERBOSE \ 185 MAKEOBJDIR MAKEOBJDIRPREFIX MAKEVERBOSE \
186 MKBFD MKBINUTILS MKCATPAGES \ 186 MKBFD MKBINUTILS MKCATPAGES \
187 MKCRYPTO MKCRYPTO_IDEA MKCRYPTO_MDC2 MKCRYPTO_RC5 MKCVS \ 187 MKCRYPTO MKCRYPTO_IDEA MKCRYPTO_MDC2 MKCRYPTO_RC5 MKCVS \
188 MKDEBUG MKDEBUGLIB MKDOC MKDYNAMICROOT \ 188 MKDEBUG MKDEBUGLIB MKDOC MKDYNAMICROOT \
189 MKGCC MKGCCCMDS MKGDB \ 189 MKGCC MKGCCCMDS MKGDB \
190 MKHESIOD MKHOSTOBJ MKHTML MKIEEEFP MKINET6 MKINFO MKIPFILTER \ 190 MKHESIOD MKHOSTOBJ MKHTML MKIEEEFP MKINET6 MKINFO MKIPFILTER \
191 MKKERBEROS MKLDAP MKLINKLIB MKLINT \ 191 MKKERBEROS MKLDAP MKLINKLIB MKLINT \
192 MKMAN MKMANZ MKNLS MKNVI MKOBJ MKOBJDIRS \ 192 MKMAN MKMANZ MKMDNS MKNLS MKNVI MKOBJ MKOBJDIRS \
193 MKPAM MKPF MKPIC MKPICINSTALL MKPICLIB MKPOSTFIX MKPROFILE \ 193 MKPAM MKPF MKPIC MKPICINSTALL MKPICLIB MKPOSTFIX MKPROFILE \
194 MKSHARE MKSKEY MKSOFTFLOAT MKSTATICLIB \ 194 MKSHARE MKSKEY MKSOFTFLOAT MKSTATICLIB \
195 MKUNPRIVED MKUPDATE MKX11 MKYP \ 195 MKUNPRIVED MKUPDATE MKX11 MKYP \
196 NBUILDJOBS NETBSDSRCDIR \ 196 NBUILDJOBS NETBSDSRCDIR \
197 NOCLEANDIR NODISTRIBDIRS NOINCLUDES \ 197 NOCLEANDIR NODISTRIBDIRS NOINCLUDES \
198 OBJMACHINE \ 198 OBJMACHINE \
199 RELEASEDIR RELEASEMACHINEDIR TOOLCHAIN_MISSING TOOLDIR \ 199 RELEASEDIR RELEASEMACHINEDIR TOOLCHAIN_MISSING TOOLDIR \
200 USE_HESIOD USE_INET6 USE_JEMALLOC USE_KERBEROS USE_LDAP \ 200 USE_HESIOD USE_INET6 USE_JEMALLOC USE_KERBEROS USE_LDAP \
201 USE_PAM USE_SKEY USE_YP \ 201 USE_PAM USE_SKEY USE_YP \
202 USETOOLS USR_OBJMACHINE \ 202 USETOOLS USR_OBJMACHINE \
203 X11SRCDIR X11FLAVOUR 203 X11SRCDIR X11FLAVOUR
204 204
205params: .PHONY 205params: .PHONY

cvs diff -r1.23 -r1.24 src/etc/group (expand / switch to unified diff)

--- src/etc/group 2007/10/16 02:47:14 1.23
+++ src/etc/group 2009/09/29 23:56:27 1.24
@@ -10,20 +10,21 @@ wsrc:*:9: @@ -10,20 +10,21 @@ wsrc:*:9:
10maildrop:*:11: 10maildrop:*:11:
11postfix:*:12: 11postfix:*:12:
12games:*:13: 12games:*:13:
13named:*:14: 13named:*:14:
14ntpd:*:15: 14ntpd:*:15:
15sshd:*:16: 15sshd:*:16:
16_pflogd:*:18: 16_pflogd:*:18:
17_rwhod:*:19: 17_rwhod:*:19:
18staff:*:20:root 18staff:*:20:root
19_proxy:*:21: 19_proxy:*:21:
20_timedc:*:22: 20_timedc:*:22:
21_sdpd:*:23: 21_sdpd:*:23:
22_httpd:*:24: 22_httpd:*:24:
 23_mdnsd:*:25:
23guest:*:31:root 24guest:*:31:root
24nobody:*:39: 25nobody:*:39:
25utmp:*:45: 26utmp:*:45:
26authpf:*:72: 27authpf:*:72:
27users:*:100: 28users:*:100:
28dialer:*:117: 29dialer:*:117:
29nogroup:*:32766: 30nogroup:*:32766:

cvs diff -r1.39 -r1.40 src/etc/master.passwd (expand / switch to unified diff)

--- src/etc/master.passwd 2007/10/16 02:47:14 1.39
+++ src/etc/master.passwd 2009/09/29 23:56:27 1.40
@@ -4,15 +4,16 @@ daemon:*:1:1::0:0:The devil himself:/:/s @@ -4,15 +4,16 @@ daemon:*:1:1::0:0:The devil himself:/:/s
4operator:*:2:5::0:0:System &:/usr/guest/operator:/sbin/nologin 4operator:*:2:5::0:0:System &:/usr/guest/operator:/sbin/nologin
5bin:*:3:7::0:0:Binaries Commands and Source:/:/sbin/nologin 5bin:*:3:7::0:0:Binaries Commands and Source:/:/sbin/nologin
6games:*:7:13::0:0:& pseudo-user:/usr/games:/sbin/nologin 6games:*:7:13::0:0:& pseudo-user:/usr/games:/sbin/nologin
7postfix:*:12:12::0:0:& pseudo-user:/var/spool/postfix:/sbin/nologin 7postfix:*:12:12::0:0:& pseudo-user:/var/spool/postfix:/sbin/nologin
8named:*:14:14::0:0:& pseudo-user:/var/chroot/named:/sbin/nologin 8named:*:14:14::0:0:& pseudo-user:/var/chroot/named:/sbin/nologin
9ntpd:*:15:15::0:0:& pseudo-user:/var/chroot/ntpd:/sbin/nologin 9ntpd:*:15:15::0:0:& pseudo-user:/var/chroot/ntpd:/sbin/nologin
10sshd:*:16:16::0:0:& pseudo-user:/var/chroot/sshd:/sbin/nologin 10sshd:*:16:16::0:0:& pseudo-user:/var/chroot/sshd:/sbin/nologin
11_pflogd:*:18:18::0:0:& pseudo-user:/var/chroot/pflogd:/sbin/nologin 11_pflogd:*:18:18::0:0:& pseudo-user:/var/chroot/pflogd:/sbin/nologin
12_rwhod:*:19:19::0:0:& pseudo-user:/var/rwho:/sbin/nologin 12_rwhod:*:19:19::0:0:& pseudo-user:/var/rwho:/sbin/nologin
13_proxy:*:21:21::0:0:Proxy Services:/nonexistent:/sbin/nologin 13_proxy:*:21:21::0:0:Proxy Services:/nonexistent:/sbin/nologin
14_timedc:*:22:22::0:0:& pseudo-user:/nonexistent:/sbin/nologin 14_timedc:*:22:22::0:0:& pseudo-user:/nonexistent:/sbin/nologin
15_sdpd:*:23:23::0:0:& pseudo-user:/nonexistent:/sbin/nologin 15_sdpd:*:23:23::0:0:& pseudo-user:/nonexistent:/sbin/nologin
16_httpd:*:24:24::0:0:& pseudo-user:/var/www:/sbin/nologin 16_httpd:*:24:24::0:0:& pseudo-user:/var/www:/sbin/nologin
 17_mdnsd:*:25:25::0:0:& pseudo-user:/var/www:/sbin/nologin
17uucp:*:66:1::0:0:UNIX-to-UNIX Copy:/nonexistent:/sbin/nologin 18uucp:*:66:1::0:0:UNIX-to-UNIX Copy:/nonexistent:/sbin/nologin
18nobody:*:32767:39::0:0:Unprivileged user:/nonexistent:/sbin/nologin 19nobody:*:32767:39::0:0:Unprivileged user:/nonexistent:/sbin/nologin

cvs diff -r1.107 -r1.108 src/etc/defaults/rc.conf (expand / switch to unified diff)

--- src/etc/defaults/rc.conf 2009/09/19 19:47:48 1.107
+++ src/etc/defaults/rc.conf 2009/09/29 23:56:27 1.108
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1# $NetBSD: rc.conf,v 1.107 2009/09/19 19:47:48 dholland Exp $ 1# $NetBSD: rc.conf,v 1.108 2009/09/29 23:56:27 tsarna Exp $
2# 2#
3# /etc/defaults/rc.conf -- 3# /etc/defaults/rc.conf --
4# default configuration of /etc/rc.conf 4# default configuration of /etc/rc.conf
5# 5#
6# see rc.conf(5) for more information. 6# see rc.conf(5) for more information.
7# 7#
8# DO NOT EDIT THIS FILE DIRECTLY; IT MAY BE REPLACED DURING A SYSTEM UPGRADE. 8# DO NOT EDIT THIS FILE DIRECTLY; IT MAY BE REPLACED DURING A SYSTEM UPGRADE.
9# EDIT /etc/rc.conf INSTEAD. 9# EDIT /etc/rc.conf INSTEAD.
10# 10#
11 11
12# 12#
13# Use program=YES to enable program, NO to disable it. program_flags are 13# Use program=YES to enable program, NO to disable it. program_flags are
14# passed to the program on the command line. 14# passed to the program on the command line.
@@ -150,26 +150,27 @@ fsck_flags=-p @@ -150,26 +150,27 @@ fsck_flags=-p
150# Security setting. If $securelevel is non-empty, the system securelevel 150# Security setting. If $securelevel is non-empty, the system securelevel
151# is set to this value early in the boot sequence. Otherwise the default 151# is set to this value early in the boot sequence. Otherwise the default
152# action is taken (see init(8)). 152# action is taken (see init(8)).
153# 153#
154securelevel="" # securelevel to set to 154securelevel="" # securelevel to set to
155 155
156# To set the IP address of an interface either use 156# To set the IP address of an interface either use
157# ifconfig_xxN="IP-NO" 157# ifconfig_xxN="IP-NO"
158# where xxN is the interface. If this variable is not set then 158# where xxN is the interface. If this variable is not set then
159# contents of the file /etc/ifconfig.xxN is used. 159# contents of the file /etc/ifconfig.xxN is used.
160 160
161# Networking startup. 161# Networking startup.
162# 162#
 163mdnsd=NO mdnsd_user="_mdnsd"
163ipfilter=NO ipfilter_flags="" # uses /etc/ipf.conf 164ipfilter=NO ipfilter_flags="" # uses /etc/ipf.conf
164ipnat=NO # uses /etc/ipnat.conf 165ipnat=NO # uses /etc/ipnat.conf
165ipfs=NO ipfs_flags="" # save/load ipnat and ipf states 166ipfs=NO ipfs_flags="" # save/load ipnat and ipf states
166ipsec=NO # uses /etc/ipsec.conf 167ipsec=NO # uses /etc/ipsec.conf
167ipmon=NO ipmon_flags="-Dns" # syslog ipfilter messages 168ipmon=NO ipmon_flags="-Dns" # syslog ipfilter messages
168pf=NO pf_rules="/etc/pf.conf" 169pf=NO pf_rules="/etc/pf.conf"
169pflogd=NO 170pflogd=NO
170ftp_proxy=NO 171ftp_proxy=NO
171racoon=NO # IKE daemon 172racoon=NO # IKE daemon
172auto_ifconfig=YES # config all avail. interfaces 173auto_ifconfig=YES # config all avail. interfaces
173net_interfaces="" # used only if above is NO 174net_interfaces="" # used only if above is NO
174flushroutes=YES # flush routes in netstart 175flushroutes=YES # flush routes in netstart
175dhcpcd=NO 176dhcpcd=NO

cvs diff -r1.130 -r1.131 src/etc/mtree/special (expand / switch to unified diff)

--- src/etc/mtree/special 2009/09/17 11:52:02 1.130
+++ src/etc/mtree/special 2009/09/29 23:56:27 1.131
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1# $NetBSD: special,v 1.130 2009/09/17 11:52:02 tron Exp $ 1# $NetBSD: special,v 1.131 2009/09/29 23:56:27 tsarna Exp $
2# @(#)special 8.2 (Berkeley) 1/23/94 2# @(#)special 8.2 (Berkeley) 1/23/94
3# 3#
4# This file may be overwritten on upgrades. 4# This file may be overwritten on upgrades.
5# Put your custom specifications in /etc/mtree/special.local instead. 5# Put your custom specifications in /etc/mtree/special.local instead.
6# See security.conf(5) for details. 6# See security.conf(5) for details.
7 7
8# 8#
9# /etc/security checks: 9# /etc/security checks:
10# - All of these are checked if $check_mtree is enabled. 10# - All of these are checked if $check_mtree is enabled.
11# - Files with "nodiff" tags are highlighted if they change. 11# - Files with "nodiff" tags are highlighted if they change.
12# - Files without "nodiff" or "exclude" tags are displayed 12# - Files without "nodiff" or "exclude" tags are displayed
13# with diff(1)s if $check_changelist is enabled. 13# with diff(1)s if $check_changelist is enabled.
14# 14#
@@ -396,26 +396,27 @@ @@ -396,26 +396,27 @@
396./var/cron type=dir mode=0755 396./var/cron type=dir mode=0755
397./var/cron/tabs type=dir mode=0700 397./var/cron/tabs type=dir mode=0700
398./var/cron/tabs/root type=file mode=0600 398./var/cron/tabs/root type=file mode=0600
399./var/db type=dir mode=0755 399./var/db type=dir mode=0755
400./var/log type=dir mode=0755 400./var/log type=dir mode=0755
401./var/log/authlog type=file mode=0600 optional tags=exclude 401./var/log/authlog type=file mode=0600 optional tags=exclude
402./var/log/lastlog type=file mode=0664 gname=utmp tags=exclude 402./var/log/lastlog type=file mode=0664 gname=utmp tags=exclude
403./var/log/lastlogx type=file mode=0664 gname=utmp tags=exclude 403./var/log/lastlogx type=file mode=0664 gname=utmp tags=exclude
404./var/log/wtmp type=file mode=0664 gname=utmp tags=exclude 404./var/log/wtmp type=file mode=0664 gname=utmp tags=exclude
405./var/log/wtmpx type=file mode=0664 gname=utmp tags=exclude 405./var/log/wtmpx type=file mode=0664 gname=utmp tags=exclude
406./var/mail type=dir mode=1777 ignore 406./var/mail type=dir mode=1777 ignore
407./var/preserve type=dir mode=0755 ignore 407./var/preserve type=dir mode=0755 ignore
408./var/run type=dir mode=0755 408./var/run type=dir mode=0755
 409./var/run/mdnsd type=dir mode=0755 optional
409./var/run/utmp type=file mode=0664 gname=utmp tags=exclude 410./var/run/utmp type=file mode=0664 gname=utmp tags=exclude
410./var/run/utmpx type=file mode=0664 gname=utmp tags=exclude 411./var/run/utmpx type=file mode=0664 gname=utmp tags=exclude
411./var/spool type=dir mode=0755 412./var/spool type=dir mode=0755
412./var/spool/ftp type=dir mode=0755 optional 413./var/spool/ftp type=dir mode=0755 optional
413./var/spool/ftp/bin type=dir mode=0755 optional 414./var/spool/ftp/bin type=dir mode=0755 optional
414./var/spool/ftp/bin/ls type=file mode=0555 optional 415./var/spool/ftp/bin/ls type=file mode=0555 optional
415./var/spool/ftp/etc type=dir mode=0755 optional 416./var/spool/ftp/etc type=dir mode=0755 optional
416./var/spool/ftp/etc/group type=file mode=0644 optional 417./var/spool/ftp/etc/group type=file mode=0644 optional
417./var/spool/ftp/etc/localtime type=file mode=0644 optional 418./var/spool/ftp/etc/localtime type=file mode=0644 optional
418./var/spool/ftp/etc/master.passwd type=file mode=0600 optional 419./var/spool/ftp/etc/master.passwd type=file mode=0600 optional
419./var/spool/ftp/etc/passwd type=file mode=0644 optional 420./var/spool/ftp/etc/passwd type=file mode=0644 optional
420./var/spool/ftp/hidden type=dir mode=0111 ignore optional 421./var/spool/ftp/hidden type=dir mode=0111 ignore optional
421./var/spool/ftp/pub type=dir mode=0775 ignore optional 422./var/spool/ftp/pub type=dir mode=0775 ignore optional

cvs diff -r1.79 -r1.80 src/etc/rc.d/Makefile (expand / switch to unified diff)

--- src/etc/rc.d/Makefile 2009/07/25 16:20:10 1.79
+++ src/etc/rc.d/Makefile 2009/09/29 23:56:27 1.80
@@ -1,43 +1,43 @@ @@ -1,43 +1,43 @@
1# $NetBSD: Makefile,v 1.79 2009/07/25 16:20:10 mbalmer Exp $ 1# $NetBSD: Makefile,v 1.80 2009/09/29 23:56:27 tsarna Exp $
2 2
3.include <bsd.own.mk> 3.include <bsd.own.mk>
4 4
5# 5#
6# NOTE: 6# NOTE:
7# 7#
8# If you're adding new scripts, don't forget to update following: 8# If you're adding new scripts, don't forget to update following:
9# src/distrib/sets/lists/etc/mi 9# src/distrib/sets/lists/etc/mi
10# src/etc/mtree/special 10# src/etc/mtree/special
11# src/usr.sbin/postinstall/postinstall 11# src/usr.sbin/postinstall/postinstall
12# 12#
13# You can find a script to visualize the dependency graph in 13# You can find a script to visualize the dependency graph in
14# src/sbin/rcorder. 14# src/sbin/rcorder.
15 15
16CONFIGFILES=\ 16CONFIGFILES=\
17 DAEMON DISKS LOGIN NETWORKING SERVERS \ 17 DAEMON DISKS LOGIN NETWORKING SERVERS \
18 accounting altqd amd apmd \ 18 accounting altqd amd apmd \
19 bootconf.sh bootparams btattach btconfig btdevctl bthcid \ 19 bootconf.sh bootparams btattach btconfig btdevctl bthcid \
20 ccd cgd cleartmp cron \ 20 ccd cgd cleartmp cron \
21 dhclient dhcpcd dhcpd dhcrelay dmesg downinterfaces envsys \ 21 dhclient dhcpcd dhcpd dhcrelay dmesg downinterfaces envsys \
22 fsck fsck_root ftp_proxy ftpd \ 22 fsck fsck_root ftp_proxy ftpd \
23 gpio \ 23 gpio \
24 hostapd httpd \ 24 hostapd httpd \
25 identd ifwatchd inetd ipfilter ipfs ipmon ipnat ipsec \ 25 identd ifwatchd inetd ipfilter ipfs ipmon ipnat ipsec \
26 irdaattach iscsi_target isdnd \ 26 irdaattach iscsi_target isdnd \
27 kdc \ 27 kdc \
28 ldconfig local lpd lvm\ 28 ldconfig local lpd lvm \
29 mixerctl mopd motd mountall mountcritlocal mountcritremote \ 29 mdnsd mixerctl mopd motd mountall mountcritlocal \
30 mountd moused mrouted \ 30 mountcritremote mountd moused mrouted \
31 named ndbootd network newsyslog nfsd nfslocking ntpd ntpdate \ 31 named ndbootd network newsyslog nfsd nfslocking ntpd ntpdate \
32 perusertmp pf pf_boot pflogd postfix powerd ppp pwcheck \ 32 perusertmp pf pf_boot pflogd postfix powerd ppp pwcheck \
33 quota \ 33 quota \
34 racoon rpcbind raidframe raidframeparity rarpd rbootd rndctl \ 34 racoon rpcbind raidframe raidframeparity rarpd rbootd rndctl \
35 root route6d routed rtadvd rtclocaltime rtsold rwho \ 35 root route6d routed rtadvd rtclocaltime rtsold rwho \
36 savecore screenblank sdpd securelevel sshd \ 36 savecore screenblank sdpd securelevel sshd \
37 staticroute swap1 swap2 sysctl sysdb syslogd \ 37 staticroute swap1 swap2 sysctl sysdb syslogd \
38 timed tpctl ttys \ 38 timed tpctl ttys \
39 veriexec virecover wdogctl wpa_supplicant wscons wsmoused \ 39 veriexec virecover wdogctl wpa_supplicant wscons wsmoused \
40 ypbind yppasswdd ypserv 40 ypbind yppasswdd ypserv
41FILESDIR= /etc/rc.d 41FILESDIR= /etc/rc.d
42FILESMODE= ${BINMODE} 42FILESMODE= ${BINMODE}
43 43

File Added: src/etc/rc.d/mdnsd
#!/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"

cvs diff -r1.6 -r1.7 src/external/Makefile (expand / switch to unified diff)

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

File Added: src/external/apache2/Makefile
#	$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>

File Added: src/external/apache2/mDNSResponder/Makefile
#	$NetBSD: Makefile,v 1.1 2009/09/29 23:56:27 tsarna Exp $

SUBDIR=	usr.bin usr.sbin

.include <bsd.subdir.mk>

File Added: src/external/apache2/mDNSResponder/Makefile.inc
# $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\"

File Added: src/external/apache2/mDNSResponder/prepare-import.sh
#!/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

cvs diff -r1.1.1.1 -r1.2 src/external/apache2/mDNSResponder/dist/mDNSPosix/mDNSPosix.c (expand / switch to unified diff)

--- src/external/apache2/mDNSResponder/dist/mDNSPosix/mDNSPosix.c 2009/09/29 22:14:13 1.1.1.1
+++ src/external/apache2/mDNSResponder/dist/mDNSPosix/mDNSPosix.c 2009/09/29 23:56:28 1.2
@@ -792,36 +792,48 @@ mDNSlocal int SetupSocket(struct sockadd @@ -792,36 +792,48 @@ mDNSlocal int SetupSocket(struct sockadd
792 bindAddr.sin_family = AF_INET; 792 bindAddr.sin_family = AF_INET;
793 bindAddr.sin_port = port.NotAnInteger; 793 bindAddr.sin_port = port.NotAnInteger;
794 bindAddr.sin_addr.s_addr = INADDR_ANY; // Want to receive multicasts AND unicasts on this socket 794 bindAddr.sin_addr.s_addr = INADDR_ANY; // Want to receive multicasts AND unicasts on this socket
795 err = bind(*sktPtr, (struct sockaddr *) &bindAddr, sizeof(bindAddr)); 795 err = bind(*sktPtr, (struct sockaddr *) &bindAddr, sizeof(bindAddr));
796 if (err < 0) { err = errno; perror("bind"); fflush(stderr); } 796 if (err < 0) { err = errno; perror("bind"); fflush(stderr); }
797 } 797 }
798 } // endif (intfAddr->sa_family == AF_INET) 798 } // endif (intfAddr->sa_family == AF_INET)
799 799
800#if HAVE_IPV6 800#if HAVE_IPV6
801 else if (intfAddr->sa_family == AF_INET6) 801 else if (intfAddr->sa_family == AF_INET6)
802 { 802 {
803 struct ipv6_mreq imr6; 803 struct ipv6_mreq imr6;
804 struct sockaddr_in6 bindAddr6; 804 struct sockaddr_in6 bindAddr6;
805 #if defined(IPV6_PKTINFO) 805 #if defined(IPV6_RECVPKTINFO)
 806 if (err == 0)
 807 {
 808 err = setsockopt(*sktPtr, IPPROTO_IPV6, IPV6_RECVPKTINFO, &kOn, sizeof(kOn));
 809 if (err < 0) { err = errno; perror("setsockopt - IPV6_RECVPKTINFO"); }
 810 }
 811#elif defined(IPV6_PKTINFO)
806 if (err == 0) 812 if (err == 0)
807 { 813 {
808 err = setsockopt(*sktPtr, IPPROTO_IPV6, IPV6_PKTINFO, &kOn, sizeof(kOn)); 814 err = setsockopt(*sktPtr, IPPROTO_IPV6, IPV6_PKTINFO, &kOn, sizeof(kOn));
809 if (err < 0) { err = errno; perror("setsockopt - IPV6_PKTINFO"); } 815 if (err < 0) { err = errno; perror("setsockopt - IPV6_PKTINFO"); }
810 } 816 }
811 #else 817 #else
812 #warning This platform has no way to get the destination interface information for IPv6 -- will only work for single-homed hosts 818 #warning This platform has no way to get the destination interface information for IPv6 -- will only work for single-homed hosts
813 #endif 819 #endif
814 #if defined(IPV6_HOPLIMIT) 820 #if defined(IPV6_RECVHOPLIMIT)
 821 if (err == 0)
 822 {
 823 err = setsockopt(*sktPtr, IPPROTO_IPV6, IPV6_RECVHOPLIMIT, &kOn, sizeof(kOn));
 824 if (err < 0) { err = errno; perror("setsockopt - IPV6_RECVHOPLIMIT"); }
 825 }
 826 #elif defined(IPV6_HOPLIMIT)
815 if (err == 0) 827 if (err == 0)
816 { 828 {
817 err = setsockopt(*sktPtr, IPPROTO_IPV6, IPV6_HOPLIMIT, &kOn, sizeof(kOn)); 829 err = setsockopt(*sktPtr, IPPROTO_IPV6, IPV6_HOPLIMIT, &kOn, sizeof(kOn));
818 if (err < 0) { err = errno; perror("setsockopt - IPV6_HOPLIMIT"); } 830 if (err < 0) { err = errno; perror("setsockopt - IPV6_HOPLIMIT"); }
819 } 831 }
820 #endif 832 #endif
821 833
822 // Add multicast group membership on this interface 834 // Add multicast group membership on this interface
823 if (err == 0 && JoinMulticastGroup) 835 if (err == 0 && JoinMulticastGroup)
824 { 836 {
825 imr6.ipv6mr_multiaddr = *(const struct in6_addr*)&AllDNSLinkGroup_v6.ip.v6; 837 imr6.ipv6mr_multiaddr = *(const struct in6_addr*)&AllDNSLinkGroup_v6.ip.v6;
826 imr6.ipv6mr_interface = interfaceIndex; 838 imr6.ipv6mr_interface = interfaceIndex;
827 //LogMsg("Joining %.16a on %d", &imr6.ipv6mr_multiaddr, imr6.ipv6mr_interface); 839 //LogMsg("Joining %.16a on %d", &imr6.ipv6mr_multiaddr, imr6.ipv6mr_interface);

cvs diff -r1.1.1.1 -r1.2 src/external/apache2/mDNSResponder/dist/mDNSPosix/mDNSUNP.c (expand / switch to unified diff)

--- src/external/apache2/mDNSResponder/dist/mDNSPosix/mDNSUNP.c 2009/09/29 22:14:14 1.1.1.1
+++ src/external/apache2/mDNSResponder/dist/mDNSPosix/mDNSUNP.c 2009/09/29 23:56:28 1.2
@@ -178,28 +178,30 @@ First checkin @@ -178,28 +178,30 @@ First checkin
178 178
179#ifndef SIOCGIFCONF 179#ifndef SIOCGIFCONF
180 #include <sys/sockio.h> 180 #include <sys/sockio.h>
181#endif 181#endif
182 182
183/* sockaddr_dl is only referenced if we're using IP_RECVIF,  183/* sockaddr_dl is only referenced if we're using IP_RECVIF,
184 so only include the header in that case. 184 so only include the header in that case.
185*/ 185*/
186 186
187#ifdef IP_RECVIF 187#ifdef IP_RECVIF
188 #include <net/if_dl.h> 188 #include <net/if_dl.h>
189#endif 189#endif
190 190
191#if defined(AF_INET6) && HAVE_IPV6 && !HAVE_LINUX 191#if defined(AF_INET6) && HAVE_IPV6 && !HAVE_LINUX && !defined(sun)
 192#if defined(__FreeBSD__) || defined(__DragonFly__)
192#include <net/if_var.h> 193#include <net/if_var.h>
 194#endif
193#include <netinet/in_var.h> 195#include <netinet/in_var.h>
194// Note: netinet/in_var.h implicitly includes netinet6/in6_var.h for us 196// Note: netinet/in_var.h implicitly includes netinet6/in6_var.h for us
195#endif 197#endif
196 198
197#if defined(AF_INET6) && HAVE_IPV6 && HAVE_LINUX 199#if defined(AF_INET6) && HAVE_IPV6 && HAVE_LINUX
198#include <netdb.h> 200#include <netdb.h>
199#include <arpa/inet.h> 201#include <arpa/inet.h>
200 202
201/* Converts a prefix length to IPv6 network mask */ 203/* Converts a prefix length to IPv6 network mask */
202void plen_to_mask(int plen, char *addr) { 204void plen_to_mask(int plen, char *addr) {
203 int i; 205 int i;
204 int colons=7; /* Number of colons in IPv6 address */ 206 int colons=7; /* Number of colons in IPv6 address */
205 int bits_in_block=16; /* Bits per IPv6 block */ 207 int bits_in_block=16; /* Bits per IPv6 block */

cvs diff -r1.1.1.1 -r1.2 src/external/apache2/mDNSResponder/dist/mDNSShared/dns-sd.1 (expand / switch to unified diff)

--- src/external/apache2/mDNSResponder/dist/mDNSShared/dns-sd.1 2009/09/29 22:14:14 1.1.1.1
+++ src/external/apache2/mDNSResponder/dist/mDNSShared/dns-sd.1 2009/09/29 23:56:28 1.2
@@ -27,58 +27,53 @@ @@ -27,58 +27,53 @@
27.\" Revision 1.3 2005/02/10 22:35:28 cheshire 27.\" Revision 1.3 2005/02/10 22:35:28 cheshire
28.\" <rdar://problem/3727944> Update name 28.\" <rdar://problem/3727944> Update name
29.\" 29.\"
30.\" Revision 1.2 2004/09/24 18:33:05 cheshire 30.\" Revision 1.2 2004/09/24 18:33:05 cheshire
31.\" <rdar://problem/3561780> Update man pages to clarify that mDNS and dns-sd are not intended for script use 31.\" <rdar://problem/3561780> Update man pages to clarify that mDNS and dns-sd are not intended for script use
32.\" 32.\"
33.\" Revision 1.1 2004/09/22 22:46:25 cheshire 33.\" Revision 1.1 2004/09/22 22:46:25 cheshire
34.\" Man page for dns-sd command-line tool 34.\" Man page for dns-sd command-line tool
35.\" 35.\"
36.\" 36.\"
37.\" 37.\"
38.Dd April 2004 \" Date 38.Dd April 2004 \" Date
39.Dt dns-sd 1 \" Document Title 39.Dt dns-sd 1 \" Document Title
40.Os Darwin \" Operating System 40.Os NetBSD \" Operating System
41.\" 41.\"
42.Sh NAME 42.Sh NAME
43.Nm dns-sd 43.Nm dns-sd
44.Nd Multicast DNS (mDNS) & DNS Service Discovery (DNS-SD) Test Tool \" For whatis 44.Nd Multicast DNS (mDNS) & DNS Service Discovery (DNS-SD) Test Tool \" For whatis
45.\"  45.\"
46.Sh SYNOPSIS 46.Sh SYNOPSIS
47.Nm Fl R Ar name type domain port Op Ar key=value ... 47.Nm Fl R Ar name type domain port Op Ar key=value ...
48.Pp 48.Pp
49.Nm Fl B Ar type domain 49.Nm Fl B Ar type domain
50.Pp 50.Pp
51.Nm Fl L Ar name type domain 51.Nm Fl L Ar name type domain
52.\" 52.\"
53.Sh DESCRIPTION 53.Sh DESCRIPTION
54The 54The
55.Nm 55.Nm
56command is a network diagnostic tool, much like 56command is a network diagnostic tool, much like
57.Xr ping 8 57.Xr ping 8
58or 58or
59.Xr traceroute 8 . 59.Xr traceroute 8 .
60However, unlike those tools, most of its functionality is not implemented in the 60However, unlike those tools, most of its functionality is not implemented in the
61.Nm 61.Nm
62executable itself, but in library code that is available to any application. 62executable itself, but in library code that is available to any application.
63The library API that 63The library API that
64.Nm 64.Nm
65uses is documented in 65uses is documented in
66.Pa /usr/include/dns_sd.h . 66.Pa /usr/include/dns_sd.h .
67The 
68.Nm 
69command replaces the older 
70.Xr mDNS 1 
71command. 
72.Pp 67.Pp
73The 68The
74.Nm 69.Nm
75command is primarily intended for interactive use. 70command is primarily intended for interactive use.
76Because its command-line arguments and output format are subject to change, 71Because its command-line arguments and output format are subject to change,
77invoking it from a shell script will generally be fragile. Additionally, 72invoking it from a shell script will generally be fragile. Additionally,
78the asynchronous nature of DNS Service Discovery does 73the asynchronous nature of DNS Service Discovery does
79not lend itself easily to script-oriented programming. For example, 74not lend itself easily to script-oriented programming. For example,
80calls like "browse" never complete; the action of performing a "browse" 75calls like "browse" never complete; the action of performing a "browse"
81sets in motion machinery to notify the client whenever instances of 76sets in motion machinery to notify the client whenever instances of
82that service type appear or disappear from the network. These 77that service type appear or disappear from the network. These
83notifications continue to be delivered indefinitely, for minutes, 78notifications continue to be delivered indefinitely, for minutes,
84hours, or even days, as services come and go, until the client 79hours, or even days, as services come and go, until the client
@@ -192,24 +187,21 @@ While that command is running, in anothe @@ -192,24 +187,21 @@ While that command is running, in anothe
192example given above to advertise a web page, and you should see the 187example given above to advertise a web page, and you should see the
193"Add" event reported to the 188"Add" event reported to the
194.Nm Fl B 189.Nm Fl B
195window. Now press Ctrl-C in the 190window. Now press Ctrl-C in the
196.Nm Fl R 191.Nm Fl R
197window and you should see the "Remove" event reported to the 192window and you should see the "Remove" event reported to the
198.Nm Fl B 193.Nm Fl B
199window. 194window.
200.Pp 195.Pp
201.Sh FILES 196.Sh FILES
202.Pa /usr/bin/dns-sd \" Pathname 197.Pa /usr/bin/dns-sd \" Pathname
203.\" 198.\"
204.Sh SEE ALSO 199.Sh SEE ALSO
205.Xr mDNS 1 200.Xr mdnsd 8
206.Xr mDNSResponder 8 
207.\" 
208.Sh BUGS 
209.Nm 
210bugs are tracked in Apple Radar component "mDNSResponder". 
211.\" 201.\"
212.Sh HISTORY 202.Sh HISTORY
213The 203The
214.Nm 204.Nm
215command first appeared in Mac OS X 10.4 (Tiger). 205command first appeared in
 206.Nx 6.0 ,
 207having originated in Mac OS X 10.4 (Tiger).

cvs diff -r1.1.1.1 -r1.2 src/external/apache2/mDNSResponder/dist/mDNSShared/dns_sd.h (expand / switch to unified diff)

--- src/external/apache2/mDNSResponder/dist/mDNSShared/dns_sd.h 2009/09/29 22:14:15 1.1.1.1
+++ src/external/apache2/mDNSResponder/dist/mDNSShared/dns_sd.h 2009/09/29 23:56:28 1.2
@@ -2329,30 +2329,32 @@ DNSServiceErrorType DNSSD_API DNSService @@ -2329,30 +2329,32 @@ DNSServiceErrorType DNSSD_API DNSService
2329 DNSServiceFlags flags, 2329 DNSServiceFlags flags,
2330 const char *domain 2330 const char *domain
2331 ); 2331 );
2332 2332
2333/* Symbol defined to tell System Configuration Framework where to look in the Dynamic Store 2333/* Symbol defined to tell System Configuration Framework where to look in the Dynamic Store
2334 * for the list of PrivateDNS domains that need to be handed off to mDNSResponder 2334 * for the list of PrivateDNS domains that need to be handed off to mDNSResponder
2335 * (the complete key is "State:/Network/PrivateDNS") 2335 * (the complete key is "State:/Network/PrivateDNS")
2336 */ 2336 */
2337#define kDNSServiceCompPrivateDNS "PrivateDNS" 2337#define kDNSServiceCompPrivateDNS "PrivateDNS"
2338#define kDNSServiceCompMulticastDNS "MulticastDNS" 2338#define kDNSServiceCompMulticastDNS "MulticastDNS"
2339 2339
2340#endif //__APPLE_API_PRIVATE 2340#endif //__APPLE_API_PRIVATE
2341 2341
 2342#if !defined(__NetBSD__)
2342/* Some C compiler cleverness. We can make the compiler check certain things for us, 2343/* Some C compiler cleverness. We can make the compiler check certain things for us,
2343 * and report errors at compile-time if anything is wrong. The usual way to do this would 2344 * and report errors at compile-time if anything is wrong. The usual way to do this would
2344 * be to use a run-time "if" statement or the conventional run-time "assert" mechanism, but 2345 * be to use a run-time "if" statement or the conventional run-time "assert" mechanism, but
2345 * then you don't find out what's wrong until you run the software. This way, if the assertion 2346 * then you don't find out what's wrong until you run the software. This way, if the assertion
2346 * condition is false, the array size is negative, and the complier complains immediately. 2347 * condition is false, the array size is negative, and the complier complains immediately.
2347 */ 2348 */
2348 2349
2349struct CompileTimeAssertionChecks_DNS_SD 2350struct CompileTimeAssertionChecks_DNS_SD
2350 { 2351 {
2351 char assert0[(sizeof(union _TXTRecordRef_t) == 16) ? 1 : -1]; 2352 char assert0[(sizeof(union _TXTRecordRef_t) == 16) ? 1 : -1];
2352 }; 2353 };
 2354#endif
2353 2355
2354#ifdef __cplusplus 2356#ifdef __cplusplus
2355 } 2357 }
2356#endif 2358#endif
2357 2359
2358#endif /* _DNS_SD_H */ 2360#endif /* _DNS_SD_H */

File Added: src/external/apache2/mDNSResponder/lib/Makefile
#	$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>

File Added: src/external/apache2/mDNSResponder/lib/shlib_version
#       $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

File Added: src/external/apache2/mDNSResponder/usr.bin/Makefile
#	$NetBSD: Makefile,v 1.1 2009/09/29 23:56:28 tsarna Exp $

SUBDIR=		dns-sd

.include <bsd.subdir.mk>

File Added: src/external/apache2/mDNSResponder/usr.bin/Makefile.inc
# $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

File Added: src/external/apache2/mDNSResponder/usr.bin/dns-sd/Makefile
#	$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>

File Added: src/external/apache2/mDNSResponder/usr.sbin/Makefile
#	$NetBSD: Makefile,v 1.1 2009/09/29 23:56:34 tsarna Exp $

SUBDIR=		mdnsd

.include <bsd.subdir.mk>

File Added: src/external/apache2/mDNSResponder/usr.sbin/Makefile.inc
# $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

File Added: src/external/apache2/mDNSResponder/usr.sbin/mdnsd/Makefile
#	$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>

cvs diff -r1.11 -r1.12 src/external/lib/Attic/Makefile (expand / switch to unified diff)

--- src/external/lib/Attic/Makefile 2009/06/25 13:59:02 1.11
+++ src/external/lib/Attic/Makefile 2009/09/29 23:56:34 1.12
@@ -1,27 +1,31 @@ @@ -1,27 +1,31 @@
1# $NetBSD: Makefile,v 1.11 2009/06/25 13:59:02 agc Exp $ 1# $NetBSD: Makefile,v 1.12 2009/09/29 23:56:34 tsarna Exp $
2 2
3# 3#
4# This Makefile exists to provide a single point to build 4# This Makefile exists to provide a single point to build
5# all libraries provided by external packages that may 5# all libraries provided by external packages that may
6# be used by other applications in the system. 6# be used by other applications in the system.
7# 7#
8 8
9.include <bsd.own.mk> 9.include <bsd.own.mk>
10 10
11.if (${MKATF} != "no") 11.if (${MKATF} != "no")
12SUBDIR+= ../bsd/atf/lib 12SUBDIR+= ../bsd/atf/lib
13.endif 13.endif
14 14
 15.if (${MKMDNS} != "no")
 16SUBDIR+= ../apache2/mDNSResponder/lib
 17.endif
 18
15.if (${MKCRYPTO} != "no") 19.if (${MKCRYPTO} != "no")
16SUBDIR+= ../../crypto/external/lib .WAIT 20SUBDIR+= ../../crypto/external/lib .WAIT
17 21
18.if (${MKLDAP} != "no") 22.if (${MKLDAP} != "no")
19SUBDIR+= ../bsd/openldap/lib 23SUBDIR+= ../bsd/openldap/lib
20.endif 24.endif
21.endif 25.endif
22 26
23.if (${MKISCSI} != "no") 27.if (${MKISCSI} != "no")
24SUBDIR+= ../bsd/iscsi/lib # depends on libpthread 28SUBDIR+= ../bsd/iscsi/lib # depends on libpthread
25.endif 29.endif
26 30
27SUBDIR+= ../bsd/fetch/lib 31SUBDIR+= ../bsd/fetch/lib

cvs diff -r1.49 -r1.50 src/share/man/man5/mk.conf.5 (expand / switch to unified diff)

--- src/share/man/man5/mk.conf.5 2009/09/08 07:54:49 1.49
+++ src/share/man/man5/mk.conf.5 2009/09/29 23:56:34 1.50
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1.\" $NetBSD: mk.conf.5,v 1.49 2009/09/08 07:54:49 wiz Exp $ 1.\" $NetBSD: mk.conf.5,v 1.50 2009/09/29 23:56:34 tsarna Exp $
2.\" 2.\"
3.\" Copyright (c) 1999-2003 The NetBSD Foundation, Inc. 3.\" Copyright (c) 1999-2003 The NetBSD Foundation, Inc.
4.\" All rights reserved. 4.\" All rights reserved.
5.\" 5.\"
6.\" This code is derived from software contributed to The NetBSD Foundation 6.\" This code is derived from software contributed to The NetBSD Foundation
7.\" by Luke Mewburn. 7.\" by Luke Mewburn.
8.\" 8.\"
9.\" Redistribution and use in source and binary forms, with or without 9.\" Redistribution and use in source and binary forms, with or without
10.\" modification, are permitted provided that the following conditions 10.\" modification, are permitted provided that the following conditions
11.\" are met: 11.\" are met:
12.\" 1. Redistributions of source code must retain the above copyright 12.\" 1. Redistributions of source code must retain the above copyright
13.\" notice, this list of conditions and the following disclaimer. 13.\" notice, this list of conditions and the following disclaimer.
14.\" 2. Redistributions in binary form must reproduce the above copyright 14.\" 2. Redistributions in binary form must reproduce the above copyright
@@ -477,26 +477,32 @@ Indicates whether manual pages will be i @@ -477,26 +477,32 @@ Indicates whether manual pages will be i
477.Pp 477.Pp
478If 478If
479.Dq no , 479.Dq no ,
480acts as 480acts as
481.Sy MKCATPAGES=no MKHTML=no . 481.Sy MKCATPAGES=no MKHTML=no .
482. 482.
483.It Sy MKMANZ 483.It Sy MKMANZ
484.YorN 484.YorN
485Indicates whether manual pages should be compressed with 485Indicates whether manual pages should be compressed with
486.Xr gzip 1 486.Xr gzip 1
487at installation time. 487at installation time.
488.DFLTn 488.DFLTn
489. 489.
 490.It Sy MKMDNS
 491.YorN
 492Indicates whether the mDNS (Multicast DNS) infrastructure
 493(libraries and support programs) is built and installed.
 494.DFLTy
 495.
490.It Sy MKNLS 496.It Sy MKNLS
491.YorN 497.YorN
492Indicates whether Native Language System (NLS) locale zone files will be 498Indicates whether Native Language System (NLS) locale zone files will be
493built and installed. 499built and installed.
494.DFLTy 500.DFLTy
495. 501.
496.It Sy MKOBJ 502.It Sy MKOBJ
497.YorN 503.YorN
498Indicates whether object directories will be created when running 504Indicates whether object directories will be created when running
499.Dq make obj . 505.Dq make obj .
500If set to 506If set to
501.Dq no , 507.Dq no ,
502then all built files will be located inside the regular source tree. 508then all built files will be located inside the regular source tree.

cvs diff -r1.252 -r1.253 src/share/mk/bsd.README (expand / switch to unified diff)

--- src/share/mk/bsd.README 2009/09/08 07:08:03 1.252
+++ src/share/mk/bsd.README 2009/09/29 23:56:34 1.253
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1# $NetBSD: bsd.README,v 1.252 2009/09/08 07:08:03 skrll Exp $ 1# $NetBSD: bsd.README,v 1.253 2009/09/29 23:56:34 tsarna Exp $
2# @(#)bsd.README 8.2 (Berkeley) 4/2/94 2# @(#)bsd.README 8.2 (Berkeley) 4/2/94
3 3
4This is the README file for the make "include" files for the NetBSD 4This is the README file for the make "include" files for the NetBSD
5source tree. The files are installed in /usr/share/mk, and are, 5source tree. The files are installed in /usr/share/mk, and are,
6by convention, named with the suffix ".mk". 6by convention, named with the suffix ".mk".
7 7
8Note, this file is not intended to replace reading through the .mk 8Note, this file is not intended to replace reading through the .mk
9files for anything tricky. 9files for anything tricky.
10 10
11=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-= 11=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=
12 12
13RANDOM THINGS WORTH KNOWING: 13RANDOM THINGS WORTH KNOWING:
14 14
@@ -231,26 +231,30 @@ MKLINT If "no", don't build or install  @@ -231,26 +231,30 @@ MKLINT If "no", don't build or install
231 Default: yes 231 Default: yes
232 232
233MKLVM If "no", don't build or install teh logical volume manager 233MKLVM If "no", don't build or install teh logical volume manager
234 and device mapper tools and libraries 234 and device mapper tools and libraries
235 Default: no 235 Default: no
236 236
237MKMAN If "no", don't build or install the man or catman pages, 237MKMAN If "no", don't build or install the man or catman pages,
238 and also acts as "MKCATPAGES=no MKHTML=no". 238 and also acts as "MKCATPAGES=no MKHTML=no".
239 Default: yes 239 Default: yes
240 240
241MKMANZ If not "no", compress manual pages at installation time. 241MKMANZ If not "no", compress manual pages at installation time.
242 Default: no 242 Default: no
243 243
 244MKMDNS If "no", disables building of mDNS infrastructure
 245 (libraries and support programs).
 246 Default: yes
 247
244MKNLS If "no", don't build or install the NLS files and locale 248MKNLS If "no", don't build or install the NLS files and locale
245 definition files. 249 definition files.
246 Default: yes 250 Default: yes
247 251
248MKOBJ If "no", don't enable the rule which creates objdirs, 252MKOBJ If "no", don't enable the rule which creates objdirs,
249 and also acts as "MKOBJDIRS=no". 253 and also acts as "MKOBJDIRS=no".
250 Default: yes 254 Default: yes
251 255
252MKOBJDIRS If "no", don't create objdirs during a "make build". 256MKOBJDIRS If "no", don't create objdirs during a "make build".
253 Default: no 257 Default: no
254 258
255MKPAM If "no", disables building of PAM authentication 259MKPAM If "no", disables building of PAM authentication
256 infrastructure (libraries and support programs). 260 infrastructure (libraries and support programs).

cvs diff -r1.582 -r1.583 src/share/mk/bsd.own.mk (expand / switch to unified diff)

--- src/share/mk/bsd.own.mk 2009/09/26 07:28:38 1.582
+++ src/share/mk/bsd.own.mk 2009/09/29 23:56:34 1.583
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1# $NetBSD: bsd.own.mk,v 1.582 2009/09/26 07:28:38 skrll Exp $ 1# $NetBSD: bsd.own.mk,v 1.583 2009/09/29 23:56:34 tsarna Exp $
2 2
3.if !defined(_BSD_OWN_MK_) 3.if !defined(_BSD_OWN_MK_)
4_BSD_OWN_MK_=1 4_BSD_OWN_MK_=1
5 5
6MAKECONF?= /etc/mk.conf 6MAKECONF?= /etc/mk.conf
7.-include "${MAKECONF}" 7.-include "${MAKECONF}"
8 8
9# 9#
10# CPU model, derived from MACHINE_ARCH 10# CPU model, derived from MACHINE_ARCH
11# 11#
12MACHINE_CPU= ${MACHINE_ARCH:C/mipse[bl]/mips/:C/mips64e[bl]/mips/:C/sh3e[bl]/sh3/:S/m68000/m68k/:S/armeb/arm/} 12MACHINE_CPU= ${MACHINE_ARCH:C/mipse[bl]/mips/:C/mips64e[bl]/mips/:C/sh3e[bl]/sh3/:S/m68000/m68k/:S/armeb/arm/}
13 13
14# 14#
@@ -674,26 +674,27 @@ MKBINUTILS?= ${MKBFD} @@ -674,26 +674,27 @@ MKBINUTILS?= ${MKBFD}
674# 674#
675.for var in \ 675.for var in \
676 MKATF \ 676 MKATF \
677 MKBINUTILS \ 677 MKBINUTILS \
678 MKCATPAGES MKCRYPTO MKCOMPLEX MKCVS \ 678 MKCATPAGES MKCRYPTO MKCOMPLEX MKCVS \
679 MKDOC \ 679 MKDOC \
680 MKGCC MKGCCCMDS MKGDB \ 680 MKGCC MKGCCCMDS MKGDB \
681 MKHESIOD MKHTML \ 681 MKHESIOD MKHTML \
682 MKIEEEFP MKINET6 MKINFO MKIPFILTER MKISCSI \ 682 MKIEEEFP MKINET6 MKINFO MKIPFILTER MKISCSI \
683 MKKERBEROS \ 683 MKKERBEROS \
684 MKKMOD \ 684 MKKMOD \
685 MKLDAP MKLINKLIB MKLINT \ 685 MKLDAP MKLINKLIB MKLINT \
686 MKMAN \ 686 MKMAN \
 687 MKMDNS \
687 MKNLS \ 688 MKNLS \
688 MKOBJ \ 689 MKOBJ \
689 MKPAM \ 690 MKPAM \
690 MKPF MKPIC MKPICINSTALL MKPICLIB MKPOSTFIX MKPROFILE \ 691 MKPF MKPIC MKPICINSTALL MKPICLIB MKPOSTFIX MKPROFILE \
691 MKSHARE MKSKEY MKSTATICLIB \ 692 MKSHARE MKSKEY MKSTATICLIB \
692 MKX11FONTS \ 693 MKX11FONTS \
693 MKYP 694 MKYP
694${var}?= yes 695${var}?= yes
695.endfor 696.endfor
696 697
697# 698#
698# MK* options which default to "no". 699# MK* options which default to "no".
699# 700#

cvs diff -r1.104 -r1.105 src/usr.sbin/postinstall/Attic/postinstall (expand / switch to unified diff)

--- src/usr.sbin/postinstall/Attic/postinstall 2009/09/21 18:03:03 1.104
+++ src/usr.sbin/postinstall/Attic/postinstall 2009/09/29 23:56:35 1.105
@@ -1,16 +1,16 @@ @@ -1,16 +1,16 @@
1#!/bin/sh 1#!/bin/sh
2# 2#
3# $NetBSD: postinstall,v 1.104 2009/09/21 18:03:03 njoly Exp $ 3# $NetBSD: postinstall,v 1.105 2009/09/29 23:56:35 tsarna Exp $
4# 4#
5# Copyright (c) 2002-2008 The NetBSD Foundation, Inc. 5# Copyright (c) 2002-2008 The NetBSD Foundation, Inc.
6# All rights reserved. 6# All rights reserved.
7# 7#
8# This code is derived from software contributed to The NetBSD Foundation 8# This code is derived from software contributed to The NetBSD Foundation
9# by Luke Mewburn. 9# by Luke Mewburn.
10# 10#
11# Redistribution and use in source and binary forms, with or without 11# Redistribution and use in source and binary forms, with or without
12# modification, are permitted provided that the following conditions 12# modification, are permitted provided that the following conditions
13# are met: 13# are met:
14# 1. Redistributions of source code must retain the above copyright 14# 1. Redistributions of source code must retain the above copyright
15# notice, this list of conditions and the following disclaimer. 15# notice, this list of conditions and the following disclaimer.
16# 2. Redistributions in binary form must reproduce the above copyright 16# 2. Redistributions in binary form must reproduce the above copyright
@@ -795,27 +795,27 @@ do_fontconfig() @@ -795,27 +795,27 @@ do_fontconfig()
795 return ${failed} 795 return ${failed}
796} 796}
797 797
798# 798#
799# gid 799# gid
800# 800#
801additem gid "required groups in /etc/group" 801additem gid "required groups in /etc/group"
802do_gid() 802do_gid()
803{ 803{
804 [ -n "$1" ] || err 3 "USAGE: do_gid fix|check" 804 [ -n "$1" ] || err 3 "USAGE: do_gid fix|check"
805 805
806 check_ids "$1" groups "${DEST_DIR}/etc/group" \ 806 check_ids "$1" groups "${DEST_DIR}/etc/group" \
807 named ntpd sshd authpf _pflogd _rwhod _proxy _timedc \ 807 named ntpd sshd authpf _pflogd _rwhod _proxy _timedc \
808 _sdpd _httpd 808 _sdpd _httpd _mdnsd
809} 809}
810 810
811# 811#
812# hosts 812# hosts
813# 813#
814additem hosts "/etc/hosts being up to date" 814additem hosts "/etc/hosts being up to date"
815do_hosts() 815do_hosts()
816{ 816{
817 [ -n "$1" ] || err 3 "USAGE: do_hosts fix|check" 817 [ -n "$1" ] || err 3 "USAGE: do_hosts fix|check"
818 818
819 modify_file "$1" "${DEST_DIR}/etc/hosts" "${SCRATCHDIR}/hosts" ' 819 modify_file "$1" "${DEST_DIR}/etc/hosts" "${SCRATCHDIR}/hosts" '
820 /^(127\.0\.0\.1|::1)[ ]+[^\.]*$/ { 820 /^(127\.0\.0\.1|::1)[ ]+[^\.]*$/ {
821 print $0, "localhost." 821 print $0, "localhost."
@@ -1048,28 +1048,28 @@ do_rc() @@ -1048,28 +1048,28 @@ do_rc()
1048 compare_dir "${op}" "${SRC_DIR}/etc/rc.d" "${DEST_DIR}/etc/rc.d" 555 \ 1048 compare_dir "${op}" "${SRC_DIR}/etc/rc.d" "${DEST_DIR}/etc/rc.d" 555 \
1049 DAEMON DISKS LOGIN NETWORKING SERVERS \ 1049 DAEMON DISKS LOGIN NETWORKING SERVERS \
1050 accounting altqd amd apmd \ 1050 accounting altqd amd apmd \
1051 bootconf.sh bootparams btattach btconfig btdevctl bthcid \ 1051 bootconf.sh bootparams btattach btconfig btdevctl bthcid \
1052 ccd cgd cleartmp cron \ 1052 ccd cgd cleartmp cron \
1053 dhclient dhcpcd dhcpd dhcrelay dmesg downinterfaces envsys \ 1053 dhclient dhcpcd dhcpd dhcrelay dmesg downinterfaces envsys \
1054 fsck fsck_root ftp_proxy ftpd \ 1054 fsck fsck_root ftp_proxy ftpd \
1055 gpio \ 1055 gpio \
1056 hostapd httpd \ 1056 hostapd httpd \
1057 identd ifwatchd inetd ipfilter ipfs ipmon ipnat ipsec \ 1057 identd ifwatchd inetd ipfilter ipfs ipmon ipnat ipsec \
1058 irdaattach iscsi_target isdnd \ 1058 irdaattach iscsi_target isdnd \
1059 kdc \ 1059 kdc \
1060 ldconfig local lpd lvm\ 1060 ldconfig local lpd lvm\
1061 mixerctl mopd motd mountall mountcritlocal mountcritremote \ 1061 mdnsd mixerctl mopd motd mountall mountcritlocal \
1062 mountd moused mrouted \ 1062 mountcritremote mountd moused mrouted \
1063 named ndbootd network newsyslog nfsd nfslocking ntpd ntpdate \ 1063 named ndbootd network newsyslog nfsd nfslocking ntpd ntpdate \
1064 perusertmp pf pf_boot pflogd postfix powerd ppp pwcheck \ 1064 perusertmp pf pf_boot pflogd postfix powerd ppp pwcheck \
1065 quota \ 1065 quota \
1066 racoon rpcbind raidframe raidframeparity rarpd rbootd rndctl \ 1066 racoon rpcbind raidframe raidframeparity rarpd rbootd rndctl \
1067 root route6d routed rtadvd rtclocaltime rtsold rwho \ 1067 root route6d routed rtadvd rtclocaltime rtsold rwho \
1068 savecore screenblank sdpd securelevel sshd \ 1068 savecore screenblank sdpd securelevel sshd \
1069 staticroute swap1 swap2 sysctl sysdb syslogd \ 1069 staticroute swap1 swap2 sysctl sysdb syslogd \
1070 timed tpctl ttys \ 1070 timed tpctl ttys \
1071 veriexec virecover wdogctl wpa_supplicant wscons wsmoused \ 1071 veriexec virecover wdogctl wpa_supplicant wscons wsmoused \
1072 ypbind yppasswdd ypserv \ 1072 ypbind yppasswdd ypserv \
1073 ${extra_scripts} 1073 ${extra_scripts}
1074 failed=$(( ${failed} + $? )) 1074 failed=$(( ${failed} + $? ))
1075 1075
@@ -1347,27 +1347,27 @@ do_x11() @@ -1347,27 +1347,27 @@ do_x11()
1347 return ${failed} 1347 return ${failed}
1348} 1348}
1349 1349
1350# 1350#
1351# uid 1351# uid
1352# 1352#
1353additem uid "required users in /etc/master.passwd" 1353additem uid "required users in /etc/master.passwd"
1354do_uid() 1354do_uid()
1355{ 1355{
1356 [ -n "$1" ] || err 3 "USAGE: do_uid fix|check" 1356 [ -n "$1" ] || err 3 "USAGE: do_uid fix|check"
1357 1357
1358 check_ids "$1" users "${DEST_DIR}/etc/master.passwd" \ 1358 check_ids "$1" users "${DEST_DIR}/etc/master.passwd" \
1359 named ntpd postfix sshd _pflogd _rwhod _proxy _timedc \ 1359 named ntpd postfix sshd _pflogd _rwhod _proxy _timedc \
1360 _sdpd _httpd 1360 _sdpd _httpd _mdnsd
1361} 1361}
1362 1362
1363 1363
1364# 1364#
1365# varrwho 1365# varrwho
1366# 1366#
1367additem varrwho "required ownership of files in /var/rwho" 1367additem varrwho "required ownership of files in /var/rwho"
1368do_varrwho() 1368do_varrwho()
1369{ 1369{
1370 [ -n "$1" ] || err 3 "USAGE: do_varrwho fix|check" 1370 [ -n "$1" ] || err 3 "USAGE: do_varrwho fix|check"
1371 1371
1372 contents_owner "$1" "${DEST_DIR}/var/rwho" _rwhod _rwhod 1372 contents_owner "$1" "${DEST_DIR}/var/rwho" _rwhod _rwhod
1373} 1373}