Source-Changes-HG archive

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

[src/minoura-xpg4dl]: src Sync w/ netbsd-1-5-base.



details:   https://anonhg.NetBSD.org/src/rev/a18a229ad427
branches:  minoura-xpg4dl
changeset: 486692:a18a229ad427
user:      minoura <minoura%NetBSD.org@localhost>
date:      Fri Jun 23 15:45:55 2000 +0000

description:
Sync w/ netbsd-1-5-base.

diffstat:

 etc/Makefile                 |    23 +-
 etc/changelist               |     3 +-
 etc/daily                    |     8 +-
 etc/etc.alpha/MAKEDEV        |    29 +-
 etc/etc.cobalt/fstab.wd      |     4 +-
 etc/etc.hp300/Makefile.inc   |    14 +-
 etc/etc.hpcmips/Makefile.inc |    12 +
 etc/etc.i386/MAKEDEV         |    28 +-
 etc/etc.i386/Makefile.inc    |     9 +-
 etc/etc.i386/ttyaction       |     4 +
 etc/etc.mac68k/Makefile.inc  |    11 +-
 etc/etc.macppc/MAKEDEV       |    30 +-
 etc/etc.macppc/Makefile.inc  |    12 +
 etc/etc.macppc/fstab.wd      |     7 +
 etc/etc.news68k/MAKEDEV      |    27 +-
 etc/etc.news68k/Makefile.inc |    12 +
 etc/etc.sgimips/MAKEDEV      |   348 ++++++++++++
 etc/etc.sgimips/disktab      |    28 +
 etc/etc.sgimips/fstab.sd     |     5 +
 etc/etc.sgimips/ttys         |    49 +
 etc/etc.sparc/disktab        |     8 +-
 etc/etc.sun3/disktab         |     6 +-
 etc/etc.vax/Makefile.inc     |    13 +-
 etc/inetd.conf               |    24 +-
 etc/netconfig                |    19 +
 etc/rc.conf                  |     9 +-
 etc/rc.d/DAEMON              |     4 +-
 etc/rc.d/Makefile            |     7 +-
 etc/rc.d/amd                 |     9 +-
 etc/rc.d/bootparams          |     4 +-
 etc/rc.d/ipsec               |    60 ++
 etc/rc.d/mountd              |     4 +-
 etc/rc.d/nfsd                |     4 +-
 etc/rc.d/portmap             |    15 -
 etc/rc.d/rpcbind             |    16 +
 etc/rc.d/sendmail            |    22 +-
 etc/rc.d/sysctl              |     4 +-
 etc/rc.d/yppasswdd           |     4 +-
 etc/rc.d/ypserv              |     6 +-
 etc/rc.subr                  |     6 +-
 etc/rpc                      |     4 +-
 etc/services                 |     9 +-
 include/dlfcn.h              |    14 +-
 include/errno.h              |     4 +-
 include/heimdal/config.h     |  1201 ++++++++++++++++++++++++++++++++++++++++++
 include/heimdal/krb5-types.h |    10 +
 include/heimdal/ktypes.h     |    10 +
 include/heimdal/protos.h     |   277 +++++++++
 include/heimdal/roken.h      |   211 +++++++
 include/heimdal/version.h    |     5 +
 include/ieeefp.h             |    14 +-
 include/ifaddrs.h            |     6 +-
 include/math.h               |   224 +++---
 include/netconfig.h          |    95 +++
 include/netdb.h              |    13 +-
 include/nsswitch.h           |    20 +-
 include/rpc/Makefile         |    17 +
 include/rpc/auth.h           |     8 +-
 include/rpc/clnt.h           |   364 +++++++++---
 include/rpc/clnt_soc.h       |   117 ++++
 include/rpc/nettype.h        |    63 ++
 include/rpc/pmap_clnt.h      |     5 +-
 include/rpc/pmap_prot.h      |     3 +-
 include/rpc/raw.h            |    57 +
 include/rpc/rpc.h            |    35 +-
 include/rpc/rpc_msg.h        |    20 +-
 include/rpc/rpcb_clnt.h      |    84 ++
 include/rpc/rpcb_prot.x      |   559 +++++++++++++++++++
 include/rpc/rpcent.h         |    68 ++
 include/rpc/svc.h            |   201 +++++-
 include/rpc/svc_auth.h       |     5 +-
 include/rpc/svc_soc.h        |   115 ++++
 include/rpc/types.h          |    58 +-
 include/rpc/xdr.h            |    22 +-
 include/search.h             |    38 +-
 75 files changed, 4375 insertions(+), 488 deletions(-)

diffs (truncated from 6175 to 300 lines):

diff -r c5cc8efe04a1 -r a18a229ad427 etc/Makefile
--- a/etc/Makefile      Thu Jun 22 18:00:41 2000 +0000
+++ b/etc/Makefile      Fri Jun 23 15:45:55 2000 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: Makefile,v 1.150 2000/05/13 08:07:01 lukem Exp $
+#      $NetBSD: Makefile,v 1.150.2.1 2000/06/23 15:45:55 minoura Exp $
 #      from: @(#)Makefile      8.7 (Berkeley) 5/25/95
 
 # Environment variables without default values:
@@ -25,11 +25,7 @@
 #   BUILD_KERNELS are a machine-dependent list of kernels that should just
 #      be built in place but not made into sets or installed, e.g., an
 #      INSTALL kernel used later in src/distrib/.
-#   CRYPTOPATH is automatically defined by bsd.crypto.mk to be either
-#      ../crypto-us or ../crypto-intl.  It controls the building of
-#      the secr set, which can be disabled by setting CRYPTOPATH to
-#      "none".
-# 
+#
 # Targets:
 #    distribution: makes a full NetBSD distribution in DESTDIR. If
 #      INSTALL_DONE is set, it will not do a `make install.'
@@ -43,10 +39,8 @@
 # do this before bsd.own.mk so we get correct KERNSRCDIR
 .include "../Makefile.inc"
 
-# For NO_SENDMAIL and INSTPRIV and CRYPTOPATH
+# For NO_SENDMAIL and INSTPRIV
 .include <bsd.own.mk>
-SRCTOP= ..
-.include <bsd.crypto.mk>
 
 TZDIR=         /usr/share/zoneinfo
 LOCALTIME?=    US/Pacific
@@ -84,7 +78,7 @@
        daily.conf dm.conf floppytab ftpchroot ftpusers ftpwelcome \
        gettytab group hosts hosts.lpd inetd.conf lkm.conf \
        mailer.conf man.conf monthly monthly.conf mrouted.conf \
-       networks newsyslog.conf nsswitch.conf ntp.conf \
+       netconfig networks newsyslog.conf nsswitch.conf ntp.conf \
        phones printcap profile protocols rbootd.conf rc rc.conf \
        rc.lkm rc.local rc.subr rc.shutdown rc.wscons remote rpc \
        security security.conf services shells sysctl.conf syslog.conf \
@@ -100,6 +94,10 @@
 BIN1+= etc.${MACHINE_ARCH}/ld.so.conf
 .endif
 
+.if exists(etc.${MACHINE_ARCH}/ttyaction)
+BIN1+= etc.${MACHINE_ARCH}/ttyaction
+.endif
+
 # IPv6
 BIN1+= rtadvd.conf
 
@@ -236,7 +234,7 @@
        (cd ../gnu/usr.sbin/postfix/; ${MAKE} distribution)
 .ifndef NO_SENDMAIL
        (cd ../gnu/usr.sbin/sendmail/cf/cf; ${MAKE} distribution)
-       ${DESTDIR}/usr/libexec/sendmail/sendmail -C ${DESTDIR}/etc/mail/sendmail.cf -O AliasFile=${DESTDIR}/etc/mail/aliases -O DontBlameSendmail=groupwritabledirpathsafe -bi
+       ${DESTDIR}/usr/libexec/sendmail/sendmail -C ${DESTDIR}/etc/mail/sendmail.cf -O AliasFile=${DESTDIR}/etc/mail/aliases -O DontBlameSendmail=MapInUnsafeDirPath -bi
 .endif
 
 distrib-dirs:
@@ -253,9 +251,6 @@
        (cd ../distrib/sets; ${MAKE} sets)
        sh ../distrib/sets/makesums -t ${RELEASEDIR}/binary/kernel '*.gz'
 
-cryptoset: distribution snap_pre snap_md_pre snap_kern snap_md_post
-       (cd ../distrib/sets; ${MAKE} cryptoset)
-
 snap_pre:
        /bin/rm -rf ${RELEASEDIR}
        ${INSTALL} ${INSTPRIV} -d -o root -g wheel -m 755 ${RELEASEDIR}
diff -r c5cc8efe04a1 -r a18a229ad427 etc/changelist
--- a/etc/changelist    Thu Jun 22 18:00:41 2000 +0000
+++ b/etc/changelist    Fri Jun 23 15:45:55 2000 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: changelist,v 1.13 2000/05/22 04:14:30 itojun Exp $
+#      $NetBSD: changelist,v 1.13.2.1 2000/06/23 15:45:55 minoura Exp $
 #      from: @(#)changelist    8.1 (Berkeley) 6/9/93
 #
 # List of files which the security script backs up and checks
@@ -47,6 +47,7 @@
 /etc/inetd.conf
 /etc/ipf.conf
 /etc/ipnat.conf
+/etc/ipsec.conf
 /etc/ld.so.conf
 /etc/lkm.conf
 /etc/login.conf
diff -r c5cc8efe04a1 -r a18a229ad427 etc/daily
--- a/etc/daily Thu Jun 22 18:00:41 2000 +0000
+++ b/etc/daily Fri Jun 23 15:45:55 2000 +0000
@@ -1,6 +1,6 @@
 #!/bin/sh -
 #
-#      $NetBSD: daily,v 1.32 2000/01/20 04:13:54 itojun Exp $
+#      $NetBSD: daily,v 1.32.2.1 2000/06/23 15:45:55 minoura Exp $
 #      @(#)daily       8.2 (Berkeley) 1/25/94
 #
 
@@ -187,11 +187,7 @@
 if checkyesno check_network; then
        echo ""
        echo "network:"
-       # excluding IPv6
-       netstat -in | awk 'NR == 1 {print;} NR > 1 {if ($3 !~ /:/) print; }'
-       echo ""
-       echo "IPv6 network:"
-       netstat -inv | awk 'NR == 1 {print;} NR > 1 {if ($3 ~ /:/) print; }'
+       netstat -inv
        echo ""
        t=/var/rwho/*
        if [ "$t" != '/var/rwho/*' ]; then
diff -r c5cc8efe04a1 -r a18a229ad427 etc/etc.alpha/MAKEDEV
--- a/etc/etc.alpha/MAKEDEV     Thu Jun 22 18:00:41 2000 +0000
+++ b/etc/etc.alpha/MAKEDEV     Fri Jun 23 15:45:55 2000 +0000
@@ -1,5 +1,5 @@
 #!/bin/sh -
-#      $NetBSD: MAKEDEV,v 1.59 2000/04/28 13:55:04 ad Exp $
+#      $NetBSD: MAKEDEV,v 1.59.2.1 2000/06/23 15:45:58 minoura Exp $
 #
 # Copyright (c) 1990 The Regents of the University of California.
 # All rights reserved.
@@ -69,6 +69,8 @@
 #      ttyB?   DEC 3000 ZS8530 ("scc") serial ports
 #      ttyC?   AlphaStation NS16550 ("com") serial ports
 #      ttyE?   Workstation console ("wscons") glass-tty emulators
+#      ttyCZ?  Cyclades-Z multiport serial boards.  Each "unit"
+#              makes 64 ports.
 #
 # Pseudo terminals:
 #      pty*    set of 16 master and slave pseudo terminals
@@ -126,6 +128,7 @@
        sh $0 scsibus0 scsibus1 scsibus2 scsibus3
        sh $0 usbs wscons
        sh $0 music rmidi0 rmidi1 rmidi2 rmidi3 rmidi4 rmidi5 rmidi6 rmidi7
+       sh $0 ttyCZ0
        ;;
 
 minimal)
@@ -292,6 +295,30 @@
        chmod 640 ${name}${unit}[a-h] r${name}${unit}[a-h]
        ;;
 
+ttyCZ*)
+       unit=${i#ttyCZ}
+       major=61
+       minor=$(($unit * 64))
+       eminor=$(($minor + 64))
+       while [ $minor -lt $eminor ]; do
+               if [ $minor -lt 10 ]; then
+                       nminor=000$minor
+               elif [ $minor -lt 100 ]; then
+                       nminor=00$minor
+               elif [ $minor -lt 1000 ]; then
+                       nminor=0$minor
+               else
+                       nminor=$minor
+               fi
+               rm -f ttyCZ$nminor dtyCZ$nminor
+               mknod ttyCZ$nminor c $major $(($minor + $dialin  ))
+               mknod dtyCZ$nminor c $major $(($minor + $dialout ))
+               chown uucp.wheel ttyCZ$nminor dtyCZ$nminor
+               chmod 600 ttyCZ$nminor dtyCZ$nminor
+               minor=$(($minor + 1))
+       done
+       ;;
+
 ttyEcfg)
        rm -f $i
        mknod $i c 25 255
diff -r c5cc8efe04a1 -r a18a229ad427 etc/etc.cobalt/fstab.wd
--- a/etc/etc.cobalt/fstab.wd   Thu Jun 22 18:00:41 2000 +0000
+++ b/etc/etc.cobalt/fstab.wd   Fri Jun 23 15:45:55 2000 +0000
@@ -1,7 +1,5 @@
-#      $NetBSD: fstab.wd,v 1.2 2000/03/29 15:58:34 soren Exp $
+#      $NetBSD: fstab.wd,v 1.2.2.1 2000/06/23 15:45:58 minoura Exp $
 
 /dev/wd0a      /       ffs     rw              1 1
 /dev/wd0e      /stand  ext2fs  rw              1 2
 /dev/wd0f      none    swap    sw              0 0
-kernfs         /kern   kernfs  rw,noauto       0 0
-procfs         /proc   procfs  rw,noauto       0 0
diff -r c5cc8efe04a1 -r a18a229ad427 etc/etc.hp300/Makefile.inc
--- a/etc/etc.hp300/Makefile.inc        Thu Jun 22 18:00:41 2000 +0000
+++ b/etc/etc.hp300/Makefile.inc        Fri Jun 23 15:45:55 2000 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: Makefile.inc,v 1.6 1999/02/05 03:01:52 cjs Exp $
+#      $NetBSD: Makefile.inc,v 1.6.8.1 2000/06/23 15:45:59 minoura Exp $
 #
 #      etc.hp300/Makefile.inc -- hp300-specific etc Makefile targets
 #
@@ -6,3 +6,15 @@
 # Set this for any kernels beyond GENERIC you want to include
 # in the distribution.
 EXTRA_KERNELS+= DISKLESS
+
+# Build the boot media and install notes and install them
+snap_md_post:
+.ifndef UPDATE
+       cd ${.CURDIR}/../distrib && ${MAKE} cleandir
+       cd ${.CURDIR}/../sys/arch/hp300/stand && ${MAKE} cleandir
+.endif
+       cd ${.CURDIR}/../distrib && ${MAKE} depend && ${MAKE}
+       cd ${.CURDIR}/../distrib/miniroot && ${MAKE} release
+       cd ${.CURDIR}/../distrib/notes && ${MAKE} release
+       cd ${.CURDIR}/../sys/arch/hp300/stand && ${MAKE} release
+       sh ${.CURDIR}/../distrib/sets/makesums -t ${RELEASEDIR}/installation/misc 'SYS*'
diff -r c5cc8efe04a1 -r a18a229ad427 etc/etc.hpcmips/Makefile.inc
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/etc/etc.hpcmips/Makefile.inc      Fri Jun 23 15:45:55 2000 +0000
@@ -0,0 +1,12 @@
+#      $NetBSD: Makefile.inc,v 1.2.4.2 2000/06/23 15:45:59 minoura Exp $
+
+EXTRA_KERNELS+=        TX3912 TX3922
+BUILD_KERNELS+=        RAMDISK
+
+snap_md_post:
+.ifndef UPDATE
+       cd ${.CURDIR}/../distrib && ${MAKE} cleandir
+.endif
+       cd ${.CURDIR}/../distrib && ${MAKE} depend && ${MAKE}
+       cd ${.CURDIR}/../distrib/hpcmips && ${MAKE} release
+       cd ${.CURDIR}/../distrib/notes && ${MAKE} release
diff -r c5cc8efe04a1 -r a18a229ad427 etc/etc.i386/MAKEDEV
--- a/etc/etc.i386/MAKEDEV      Thu Jun 22 18:00:41 2000 +0000
+++ b/etc/etc.i386/MAKEDEV      Fri Jun 23 15:45:55 2000 +0000
@@ -1,6 +1,6 @@
 #!/bin/sh -
 #
-#      $NetBSD: MAKEDEV,v 1.113 2000/05/22 17:01:30 thorpej Exp $
+#      $NetBSD: MAKEDEV,v 1.113.2.1 2000/06/23 15:45:59 minoura Exp $
 #
 # Copyright (c) 1990 The Regents of the University of California.
 # All rights reserved.
@@ -56,8 +56,7 @@
 #      ca*     Compaq array disk devices
 #
 # Console ports:
-#      ttyv0   pccons or pcvt screen 0
-#      ttyv*   pcvt
+#      ttyv0   pccons
 #      ttyE*   wscons
 #
 # Pointing devices:
@@ -109,7 +108,7 @@
 #      ch*     SCSI changer
 #      cfs*    Coda file system device
 #      lm      LM7[89] hardware monitor
-#      bktr*   Brooktree 848/849/878/879 based TV cards
+#      bktr    Brooktree 848/849/878/879 based TV cards
 #
 
 dialin=0
@@ -143,14 +142,13 @@
        sh $0 ccd0 ccd1 ccd2 ccd3 md0 ss0 ch0 uk0 uk1 random
        sh $0 speaker lkm mms0 lms0 pms0 joy0 joy1 apm local satlink0
        sh $0 audio
-       sh $0 ttyv0 ttyv1 ttyv2 ttyv3 ttyv4 ttyv5 ttyv6 ttyv7
        sh $0 usbs
        sh $0 music rmidi0 rmidi1 rmidi2 rmidi3 rmidi4 rmidi5 rmidi6 rmidi7
        sh $0 scsibus0 scsibus1 scsibus2 scsibus3
        sh $0 wscons
        sh $0 ca0 ca1 ca2 ca3
        sh $0 lm0
-       sh $0 bktr0
+       sh $0 bktr
        sh $0 ttyCZ0
        ;;
 
@@ -272,11 +270,10 @@
        done
        ;;
 
-ttyv*)
-       chr=12; unit=${i#ttyv}
-       rm -f ttyv$unit
-       mknod ttyv$unit c $chr $unit
-       chown root.wheel ttyv$unit
+ttyv0)
+       rm -f ttyv0
+       mknod ttyv0 c 12 0
+       chown root.wheel ttyv0
        ;;
 
 wscons)
@@ -464,7 +461,7 @@
        4)      name=t;;
        5)      name=u;;
        6)      name=v
-               echo "$0: $i: pty unit conflicts with console ttyv* devices."
+               echo "$0: $i: pty unit conflicts with console ttyv0 device."
                continue;;
        7)      name=w;;
        8)      name=x;;
@@ -683,6 +680,13 @@
        chmod 644 scsibus$unit
        ;;
 



Home | Main Index | Thread Index | Old Index