Date: Mon, 5 May 2003 12:17:02 -0700 (PDT) From: Marcel Moolenaar <marcel@FreeBSD.org> To: Perforce Change Reviews <perforce@freebsd.org> Subject: PERFORCE change 30611 for review Message-ID: <200305051917.h45JH2kn096900@repoman.freebsd.org>
next in thread | raw e-mail | index | archive | help
http://perforce.freebsd.org/chv.cgi?CH=30611 Change 30611 by marcel@marcel_pluto1 on 2003/05/05 12:16:38 IFC @30610 Affected files ... .. //depot/projects/ia64/Makefile.inc1#59 integrate .. //depot/projects/ia64/UPDATING#40 integrate .. //depot/projects/ia64/crypto/telnet/libtelnet/auth.c#4 integrate .. //depot/projects/ia64/crypto/telnet/libtelnet/enc_des.c#4 integrate .. //depot/projects/ia64/crypto/telnet/telnet/authenc.c#3 integrate .. //depot/projects/ia64/crypto/telnet/telnet/commands.c#8 integrate .. //depot/projects/ia64/crypto/telnet/telnet/main.c#4 integrate .. //depot/projects/ia64/crypto/telnet/telnet/network.c#4 integrate .. //depot/projects/ia64/crypto/telnet/telnet/ring.c#3 integrate .. //depot/projects/ia64/crypto/telnet/telnet/sys_bsd.c#6 integrate .. //depot/projects/ia64/crypto/telnet/telnet/telnet.c#4 integrate .. //depot/projects/ia64/crypto/telnet/telnet/terminal.c#4 integrate .. //depot/projects/ia64/crypto/telnet/telnet/utilities.c#4 integrate .. //depot/projects/ia64/crypto/telnet/telnetd/authenc.c#3 integrate .. //depot/projects/ia64/crypto/telnet/telnetd/global.c#2 integrate .. //depot/projects/ia64/crypto/telnet/telnetd/slc.c#3 integrate .. //depot/projects/ia64/crypto/telnet/telnetd/state.c#4 integrate .. //depot/projects/ia64/crypto/telnet/telnetd/sys_term.c#6 integrate .. //depot/projects/ia64/crypto/telnet/telnetd/telnetd.c#3 integrate .. //depot/projects/ia64/crypto/telnet/telnetd/termstat.c#3 integrate .. //depot/projects/ia64/crypto/telnet/telnetd/utility.c#3 integrate .. //depot/projects/ia64/etc/rc.d/abi#2 integrate .. //depot/projects/ia64/etc/rc.d/cron#3 integrate .. //depot/projects/ia64/etc/rc.d/devfs#4 integrate .. //depot/projects/ia64/etc/rc.d/jail#3 integrate .. //depot/projects/ia64/etc/rc.d/localdaemons#2 integrate .. //depot/projects/ia64/etc/rc.d/network3#4 integrate .. //depot/projects/ia64/etc/rc.d/securelevel#6 integrate .. //depot/projects/ia64/etc/rc.d/serial#5 integrate .. //depot/projects/ia64/etc/rc.d/virecover#5 integrate .. //depot/projects/ia64/games/caesar/caesar.c#3 integrate .. //depot/projects/ia64/games/fortune/fortune/fortune.c#4 integrate .. //depot/projects/ia64/games/fortune/strfile/strfile.c#4 integrate .. //depot/projects/ia64/games/fortune/unstr/unstr.c#4 integrate .. //depot/projects/ia64/games/pom/pom.c#3 integrate .. //depot/projects/ia64/games/random/random.c#5 integrate .. //depot/projects/ia64/gnu/usr.bin/cvs/cvs/Makefile#6 integrate .. //depot/projects/ia64/include/Makefile#26 integrate .. //depot/projects/ia64/include/rpcsvc/bootparam_prot.x#2 integrate .. //depot/projects/ia64/include/rpcsvc/crypt.x#2 integrate .. //depot/projects/ia64/include/rpcsvc/key_prot.x#2 integrate .. //depot/projects/ia64/include/rpcsvc/klm_prot.x#2 integrate .. //depot/projects/ia64/include/rpcsvc/mount.x#2 integrate .. //depot/projects/ia64/include/rpcsvc/nfs_prot.x#2 integrate .. //depot/projects/ia64/include/rpcsvc/nis.x#3 integrate .. //depot/projects/ia64/include/rpcsvc/nis_cache.x#2 integrate .. //depot/projects/ia64/include/rpcsvc/nis_callback.x#2 integrate .. //depot/projects/ia64/include/rpcsvc/nlm_prot.x#2 integrate .. //depot/projects/ia64/include/rpcsvc/pmap_prot.x#3 integrate .. //depot/projects/ia64/include/rpcsvc/rex.x#2 integrate .. //depot/projects/ia64/include/rpcsvc/rnusers.x#2 integrate .. //depot/projects/ia64/include/rpcsvc/rquota.x#2 integrate .. //depot/projects/ia64/include/rpcsvc/rstat.x#3 integrate .. //depot/projects/ia64/include/rpcsvc/sm_inter.x#3 integrate .. //depot/projects/ia64/include/rpcsvc/spray.x#2 integrate .. //depot/projects/ia64/include/rpcsvc/yp.x#2 integrate .. //depot/projects/ia64/include/rpcsvc/yppasswd.x#3 integrate .. //depot/projects/ia64/include/rpcsvc/ypupdate_prot.x#2 integrate .. //depot/projects/ia64/include/rpcsvc/ypxfrd.x#2 integrate .. //depot/projects/ia64/kerberos5/Makefile#6 integrate .. //depot/projects/ia64/lib/Makefile#24 integrate .. //depot/projects/ia64/lib/csu/common/crtbrand.c#3 integrate .. //depot/projects/ia64/lib/csu/i386-elf/Makefile#6 integrate .. //depot/projects/ia64/lib/libc/net/getaddrinfo.c#13 integrate .. //depot/projects/ia64/lib/libc/net/name6.c#9 integrate .. //depot/projects/ia64/lib/libpam/modules/modules.inc#15 integrate .. //depot/projects/ia64/lib/libpthread/sys/lock.c#2 integrate .. //depot/projects/ia64/lib/libpthread/sys/lock.h#2 integrate .. //depot/projects/ia64/lib/libpthread/thread/thr_create.c#8 integrate .. //depot/projects/ia64/lib/libpthread/thread/thr_kern.c#14 integrate .. //depot/projects/ia64/lib/libpthread/thread/thr_private.h#11 integrate .. //depot/projects/ia64/lib/libpthread/thread/thr_resume_np.c#3 integrate .. //depot/projects/ia64/lib/libpthread/thread/thr_sig.c#7 integrate .. //depot/projects/ia64/lib/libpthread/thread/thr_suspend_np.c#4 integrate .. //depot/projects/ia64/lib/libutil/login.conf.5#8 integrate .. //depot/projects/ia64/libexec/Makefile#13 integrate .. //depot/projects/ia64/libexec/rlogind/rlogind.c#4 integrate .. //depot/projects/ia64/libexec/rtld-elf/malloc.c#5 integrate .. //depot/projects/ia64/libexec/rtld-elf/map_object.c#5 integrate .. //depot/projects/ia64/libexec/rtld-elf/rtld.c#13 integrate .. //depot/projects/ia64/libexec/ypxfr/yp_dbwrite.c#3 integrate .. //depot/projects/ia64/libexec/ypxfr/ypxfr_getmap.c#4 integrate .. //depot/projects/ia64/libexec/ypxfr/ypxfr_main.c#4 integrate .. //depot/projects/ia64/libexec/ypxfr/ypxfr_misc.c#5 integrate .. //depot/projects/ia64/libexec/ypxfr/ypxfrd_getmap.c#3 integrate .. //depot/projects/ia64/release/Makefile#49 integrate .. //depot/projects/ia64/release/doc/en_US.ISO8859-1/hardware/alpha/proc-alpha.sgml#23 integrate .. //depot/projects/ia64/release/doc/en_US.ISO8859-1/hardware/common/dev.sgml#47 integrate .. //depot/projects/ia64/release/doc/en_US.ISO8859-1/relnotes/common/new.sgml#88 integrate .. //depot/projects/ia64/release/i386/dokern.sh#17 integrate .. //depot/projects/ia64/sbin/atacontrol/atacontrol.c#11 integrate .. //depot/projects/ia64/sbin/bsdlabel/bsdlabel.c#4 integrate .. //depot/projects/ia64/sbin/routed/rtquery/rtquery.8#3 integrate .. //depot/projects/ia64/sbin/vinum/commands.c#7 integrate .. //depot/projects/ia64/sbin/vinum/list.c#7 integrate .. //depot/projects/ia64/sbin/vinum/vinum.8#8 integrate .. //depot/projects/ia64/secure/lib/Makefile#6 integrate .. //depot/projects/ia64/secure/lib/libssh/Makefile#10 integrate .. //depot/projects/ia64/secure/libexec/Makefile#5 integrate .. //depot/projects/ia64/secure/usr.bin/Makefile#6 integrate .. //depot/projects/ia64/secure/usr.bin/ssh/Makefile#9 integrate .. //depot/projects/ia64/secure/usr.sbin/sshd/Makefile#14 integrate .. //depot/projects/ia64/share/dict/web2#3 integrate .. //depot/projects/ia64/share/examples/etc/make.conf#29 integrate .. //depot/projects/ia64/share/man/man4/geom.4#7 integrate .. //depot/projects/ia64/share/man/man5/make.conf.5#33 integrate .. //depot/projects/ia64/share/man/man5/rc.conf.5#36 integrate .. //depot/projects/ia64/share/man/man7/release.7#20 integrate .. //depot/projects/ia64/share/mk/bsd.libnames.mk#15 integrate .. //depot/projects/ia64/share/syscons/keymaps/INDEX.keymaps#4 integrate .. //depot/projects/ia64/share/syscons/keymaps/Makefile#7 integrate .. //depot/projects/ia64/share/syscons/keymaps/norwegian.dvorak.kbd#1 branch .. //depot/projects/ia64/sys/alpha/include/_limits.h#4 integrate .. //depot/projects/ia64/sys/amd64/include/_limits.h#2 integrate .. //depot/projects/ia64/sys/arm/include/_limits.h#3 integrate .. //depot/projects/ia64/sys/boot/common/help.common#8 integrate .. //depot/projects/ia64/sys/boot/common/loader.8#16 integrate .. //depot/projects/ia64/sys/compat/linux/linux_ipc.c#8 integrate .. //depot/projects/ia64/sys/dev/aic7xxx/ahc_eisa.c#8 integrate .. //depot/projects/ia64/sys/dev/aic7xxx/ahc_pci.c#10 integrate .. //depot/projects/ia64/sys/dev/aic7xxx/ahd_pci.c#7 integrate .. //depot/projects/ia64/sys/dev/aic7xxx/aic7770.c#6 integrate .. //depot/projects/ia64/sys/dev/aic7xxx/aic79xx.c#10 integrate .. //depot/projects/ia64/sys/dev/aic7xxx/aic79xx.h#8 integrate .. //depot/projects/ia64/sys/dev/aic7xxx/aic79xx.reg#9 integrate .. //depot/projects/ia64/sys/dev/aic7xxx/aic79xx.seq#8 integrate .. //depot/projects/ia64/sys/dev/aic7xxx/aic79xx_inline.h#8 integrate .. //depot/projects/ia64/sys/dev/aic7xxx/aic79xx_osm.c#9 integrate .. //depot/projects/ia64/sys/dev/aic7xxx/aic79xx_pci.c#9 integrate .. //depot/projects/ia64/sys/dev/aic7xxx/aic7xxx.c#10 integrate .. //depot/projects/ia64/sys/dev/aic7xxx/aic7xxx.h#6 integrate .. //depot/projects/ia64/sys/dev/aic7xxx/aic7xxx.reg#6 integrate .. //depot/projects/ia64/sys/dev/aic7xxx/aic7xxx_inline.h#5 integrate .. //depot/projects/ia64/sys/dev/aic7xxx/aic7xxx_osm.c#9 integrate .. //depot/projects/ia64/sys/dev/aic7xxx/aic7xxx_pci.c#7 integrate .. //depot/projects/ia64/sys/dev/ata/ata-all.c#36 integrate .. //depot/projects/ia64/sys/dev/ata/ata-all.h#13 integrate .. //depot/projects/ia64/sys/dev/ata/ata-pci.c#27 integrate .. //depot/projects/ia64/sys/dev/ata/ata-raid.c#21 integrate .. //depot/projects/ia64/sys/dev/ata/ata-raid.h#12 integrate .. //depot/projects/ia64/sys/dev/ata/atapi-tape.c#14 integrate .. //depot/projects/ia64/sys/dev/bge/if_bge.c#29 integrate .. //depot/projects/ia64/sys/dev/en/midway.c#13 integrate .. //depot/projects/ia64/sys/dev/en/midwayvar.h#5 integrate .. //depot/projects/ia64/sys/dev/firewire/firewire.c#27 integrate .. //depot/projects/ia64/sys/dev/firewire/sbp.c#31 integrate .. //depot/projects/ia64/sys/dev/mii/brgphy.c#12 integrate .. //depot/projects/ia64/sys/dev/pccbb/pccbb.c#25 integrate .. //depot/projects/ia64/sys/dev/pccbb/pccbbdevid.h#7 integrate .. //depot/projects/ia64/sys/dev/sio/sio.c#43 integrate .. //depot/projects/ia64/sys/dev/usb/usbdevs#34 integrate .. //depot/projects/ia64/sys/dev/usb/usbdevs.h#33 integrate .. //depot/projects/ia64/sys/dev/usb/usbdevs_data.h#33 integrate .. //depot/projects/ia64/sys/dev/vinum/vinum.c#10 integrate .. //depot/projects/ia64/sys/dev/vinum/vinumconfig.c#10 integrate .. //depot/projects/ia64/sys/dev/vinum/vinumext.h#8 integrate .. //depot/projects/ia64/sys/dev/vinum/vinumio.c#14 integrate .. //depot/projects/ia64/sys/dev/vinum/vinumio.h#2 integrate .. //depot/projects/ia64/sys/dev/vinum/vinumioctl.c#12 integrate .. //depot/projects/ia64/sys/dev/vinum/vinumkw.h#3 integrate .. //depot/projects/ia64/sys/dev/vinum/vinumlock.c#3 integrate .. //depot/projects/ia64/sys/dev/vinum/vinumobj.h#4 integrate .. //depot/projects/ia64/sys/dev/vinum/vinumparser.c#4 integrate .. //depot/projects/ia64/sys/dev/vinum/vinumrequest.c#11 integrate .. //depot/projects/ia64/sys/dev/vinum/vinumrevive.c#8 integrate .. //depot/projects/ia64/sys/fs/procfs/procfs_dbregs.c#7 integrate .. //depot/projects/ia64/sys/fs/procfs/procfs_fpregs.c#7 integrate .. //depot/projects/ia64/sys/fs/procfs/procfs_regs.c#7 integrate .. //depot/projects/ia64/sys/fs/udf/udf.h#3 integrate .. //depot/projects/ia64/sys/fs/udf/udf_vfsops.c#10 integrate .. //depot/projects/ia64/sys/fs/udf/udf_vnops.c#18 integrate .. //depot/projects/ia64/sys/geom/bde/g_bde.c#10 integrate .. //depot/projects/ia64/sys/geom/bde/g_bde_work.c#11 integrate .. //depot/projects/ia64/sys/geom/geom.h#30 integrate .. //depot/projects/ia64/sys/geom/geom_aes.c#13 integrate .. //depot/projects/ia64/sys/geom/geom_bsd.c#33 integrate .. //depot/projects/ia64/sys/geom/geom_bsd_enc.c#3 integrate .. //depot/projects/ia64/sys/geom/geom_ctl.c#9 integrate .. //depot/projects/ia64/sys/i386/include/_limits.h#3 integrate .. //depot/projects/ia64/sys/ia64/include/_limits.h#3 integrate .. //depot/projects/ia64/sys/kern/kern_malloc.c#21 integrate .. //depot/projects/ia64/sys/kern/md5c.c#4 integrate .. //depot/projects/ia64/sys/kern/sysv_shm.c#11 integrate .. //depot/projects/ia64/sys/net/if_atm.h#5 integrate .. //depot/projects/ia64/sys/net/if_atmsubr.c#10 integrate .. //depot/projects/ia64/sys/net/if_ethersubr.c#30 integrate .. //depot/projects/ia64/sys/pci/if_en_pci.c#6 integrate .. //depot/projects/ia64/sys/powerpc/include/_limits.h#3 integrate .. //depot/projects/ia64/sys/powerpc/powerpc/ofwmagic.S#2 integrate .. //depot/projects/ia64/sys/sparc64/include/_limits.h#3 integrate .. //depot/projects/ia64/sys/sparc64/sparc64/trap.c#26 integrate .. //depot/projects/ia64/sys/sys/limits.h#3 integrate .. //depot/projects/ia64/sys/sys/soundcard.h#5 integrate .. //depot/projects/ia64/sys/sys/syscallsubr.h#6 integrate .. //depot/projects/ia64/sys/vm/vm_object.c#51 integrate .. //depot/projects/ia64/sys/vm/vm_pageout.c#37 integrate .. //depot/projects/ia64/tools/tools/tinderbox/tbmaster.pl#6 integrate .. //depot/projects/ia64/usr.bin/Makefile#45 integrate .. //depot/projects/ia64/usr.bin/xlint/xlint/xlint.c#12 integrate .. //depot/projects/ia64/usr.sbin/burncd/burncd.8#12 integrate .. //depot/projects/ia64/usr.sbin/burncd/burncd.c#13 integrate .. //depot/projects/ia64/usr.sbin/sysinstall/menus.c#28 integrate .. //depot/projects/ia64/usr.sbin/syslogd/syslogd.c#16 integrate .. //depot/projects/ia64/usr.sbin/usbd/usbd.8#4 integrate Differences ... ==== //depot/projects/ia64/Makefile.inc1#59 (text+ko) ==== @@ -1,8 +1,8 @@ # -# $FreeBSD: src/Makefile.inc1,v 1.353 2003/05/01 20:41:03 ru Exp $ +# $FreeBSD: src/Makefile.inc1,v 1.356 2003/05/05 12:54:26 bde Exp $ # # Make command line options: -# -DMAKE_KERBEROS5 to build Kerberos5 +# -DNO_KERBEROS Do not build Heimdal (Kerberos 5) # -DNOCLEANDIR run ${MAKE} clean, instead of ${MAKE} cleandir # -DNOCLEAN do not clean at all # -DNOCRYPT will prevent building of crypt versions @@ -61,7 +61,7 @@ SUBDIR+= gnu .endif .if exists(${.CURDIR}/kerberos5) && exists(${.CURDIR}/crypto) && \ - !defined(NOCRYPT) && !defined(NO_OPENSSL) && defined(MAKE_KERBEROS5) + !defined(NOCRYPT) && !defined(NO_OPENSSL) && !defined(NO_KERBEROS) SUBDIR+= kerberos5 .endif .if exists(${.CURDIR}/libexec) @@ -119,7 +119,9 @@ .endif MAKEOBJDIRPREFIX?= /usr/obj +.if !defined(OSRELDATE) OSRELDATE!= sysctl -n kern.osreldate +.endif TARGET_ARCH?= ${MACHINE_ARCH} .if ${TARGET_ARCH} == ${MACHINE_ARCH} TARGET?= ${MACHINE} @@ -277,14 +279,10 @@ mkdir -p ${WORLDTMP}/legacy/${_dir} .endfor .for _dir in \ - usr/bin usr/lib/compat/aout usr/libdata/ldscripts usr/libexec usr/share/misc + usr/bin usr/include usr/lib/compat/aout usr/libdata/ldscripts \ + usr/libexec usr/share/misc mkdir -p ${WORLDTMP}/${_dir} .endfor -.for _dir in \ - arpa dev fs g++/backward g++/bits g++/ext isc isofs libmilter \ - objc openssl protocols readline rpc rpcsvc security ufs - mkdir -p ${WORLDTMP}/usr/include/${_dir} -.endfor ln -sf ${.CURDIR}/sys ${WORLDTMP} _legacy: @echo @@ -695,7 +693,7 @@ .endif .if exists(${.CURDIR}/kerberos5) && exists(${.CURDIR}/crypto) && \ - !defined(NOCRYPT) && defined(MAKE_KERBEROS5) + !defined(NOCRYPT) && !defined(NO_KERBEROS) _libkrb5= kerberos5/lib/libroken kerberos5/lib/libvers \ kerberos5/lib/libasn1 kerberos5/lib/libhdb kerberos5/lib/libsl .endif @@ -782,7 +780,7 @@ _generic_libs= gnu/lib -.if !defined(NOCRYPT) && defined(MAKE_KERBEROS5) +.if !defined(NOCRYPT) && !defined(NO_KERBEROS) _prebuild_libs+= kerberos5/lib/libasn1 _prebuild_libs+= kerberos5/lib/libgssapi _prebuild_libs+= kerberos5/lib/libkrb5 ==== //depot/projects/ia64/UPDATING#40 (text+ko) ==== @@ -17,6 +17,12 @@ developers choose to disable these features on build machines to maximize performance. +20030502: + groff has been updated. If you try to do a buildworld and + get an infinite loop in troff, update to May 4th or newer. If you + have a newer kernel than userland, you may need to set the OSRELDATE + to 500110 in your environment before starting a buildworld. + 20030501: The old rc system has been removed. Please report any problems to freebsd-rc@yahoogroups.com, and/or freebsd-current@freebsd.org. @@ -25,7 +31,6 @@ especially when using mergemaster, since the compatibility code that utilizes these old scripts has also been removed. - 20030423: A bug has been fixed in /dev/devctl which would cause devd to hang on boot, were it not for a workaround in devd. The @@ -1268,4 +1273,4 @@ Contact Warner Losh if you have any questions about your use of this document. -$FreeBSD: src/UPDATING,v 1.249 2003/05/02 05:27:33 dougb Exp $ +$FreeBSD: src/UPDATING,v 1.250 2003/05/04 06:26:30 imp Exp $ ==== //depot/projects/ia64/crypto/telnet/libtelnet/auth.c#4 (text+ko) ==== @@ -30,16 +30,16 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/crypto/telnet/libtelnet/auth.c,v 1.9 2001/12/03 12:13:18 markm Exp $ */ -#include <sys/cdefs.h> - -__FBSDID("$FreeBSD: src/crypto/telnet/libtelnet/auth.c,v 1.9 2001/12/03 12:13:18 markm Exp $"); - +#if 0 #ifndef lint static const char sccsid[] = "@(#)auth.c 8.3 (Berkeley) 5/30/95"; #endif /* not lint */ +#endif +#include <sys/cdefs.h> +__FBSDID("$FreeBSD: src/crypto/telnet/libtelnet/auth.c,v 1.10 2003/05/04 02:54:48 obrien Exp $"); + /* * Copyright (C) 1990 by the Massachusetts Institute of Technology ==== //depot/projects/ia64/crypto/telnet/libtelnet/enc_des.c#4 (text+ko) ==== @@ -29,17 +29,15 @@ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. - * - * $FreeBSD: src/crypto/telnet/libtelnet/enc_des.c,v 1.9 2003/01/29 18:14:28 nectar Exp $ */ -#include <sys/cdefs.h> - -__FBSDID("$FreeBSD: src/crypto/telnet/libtelnet/enc_des.c,v 1.9 2003/01/29 18:14:28 nectar Exp $"); - +#if 0 #ifndef lint static const char sccsid[] = "@(#)enc_des.c 8.3 (Berkeley) 5/30/95"; #endif /* not lint */ +#endif +#include <sys/cdefs.h> +__FBSDID("$FreeBSD: src/crypto/telnet/libtelnet/enc_des.c,v 1.10 2003/05/04 02:54:48 obrien Exp $"); #ifdef ENCRYPTION # ifdef AUTHENTICATION ==== //depot/projects/ia64/crypto/telnet/telnet/authenc.c#3 (text+ko) ==== @@ -31,13 +31,13 @@ * SUCH DAMAGE. */ -#include <sys/cdefs.h> - -__FBSDID("$FreeBSD: src/crypto/telnet/telnet/authenc.c,v 1.5 2001/11/30 21:06:35 markm Exp $"); - +#if 0 #ifndef lint static const char sccsid[] = "@(#)authenc.c 8.1 (Berkeley) 6/6/93"; #endif +#endif +#include <sys/cdefs.h> +__FBSDID("$FreeBSD: src/crypto/telnet/telnet/authenc.c,v 1.6 2003/05/04 02:54:48 obrien Exp $"); #ifdef AUTHENTICATION #ifdef ENCRYPTION ==== //depot/projects/ia64/crypto/telnet/telnet/commands.c#8 (text+ko) ==== @@ -31,13 +31,13 @@ * SUCH DAMAGE. */ -#include <sys/cdefs.h> - -__FBSDID("$FreeBSD: src/crypto/telnet/telnet/commands.c,v 1.29 2002/11/27 06:34:24 eric Exp $"); - +#if 0 #ifndef lint static const char sccsid[] = "@(#)commands.c 8.4 (Berkeley) 5/30/95"; #endif +#endif +#include <sys/cdefs.h> +__FBSDID("$FreeBSD: src/crypto/telnet/telnet/commands.c,v 1.30 2003/05/04 02:54:48 obrien Exp $"); #include <sys/param.h> #include <sys/un.h> ==== //depot/projects/ia64/crypto/telnet/telnet/main.c#4 (text+ko) ==== @@ -31,13 +31,13 @@ * SUCH DAMAGE. */ -#include <sys/cdefs.h> - -__FBSDID("$FreeBSD: src/crypto/telnet/telnet/main.c,v 1.16 2002/09/25 07:26:24 markm Exp $"); - +#if 0 #ifndef lint static const char sccsid[] = "@(#)main.c 8.3 (Berkeley) 5/30/95"; #endif +#endif +#include <sys/cdefs.h> +__FBSDID("$FreeBSD: src/crypto/telnet/telnet/main.c,v 1.17 2003/05/04 02:54:48 obrien Exp $"); #include <sys/types.h> #include <sys/socket.h> ==== //depot/projects/ia64/crypto/telnet/telnet/network.c#4 (text+ko) ==== @@ -31,13 +31,13 @@ * SUCH DAMAGE. */ -#include <sys/cdefs.h> - -__FBSDID("$FreeBSD: src/crypto/telnet/telnet/network.c,v 1.6 2002/05/11 03:19:44 alfred Exp $"); - +#if 0 #ifndef lint static const char sccsid[] = "@(#)network.c 8.2 (Berkeley) 12/15/93"; #endif +#endif +#include <sys/cdefs.h> +__FBSDID("$FreeBSD: src/crypto/telnet/telnet/network.c,v 1.7 2003/05/04 02:54:48 obrien Exp $"); #include <sys/types.h> #include <sys/socket.h> ==== //depot/projects/ia64/crypto/telnet/telnet/ring.c#3 (text+ko) ==== @@ -31,13 +31,13 @@ * SUCH DAMAGE. */ -#include <sys/cdefs.h> - -__FBSDID("$FreeBSD: src/crypto/telnet/telnet/ring.c,v 1.6 2001/11/30 21:06:36 markm Exp $"); - +#if 0 #ifndef lint static const char sccsid[] = "@(#)ring.c 8.2 (Berkeley) 5/30/95"; #endif +#endif +#include <sys/cdefs.h> +__FBSDID("$FreeBSD: src/crypto/telnet/telnet/ring.c,v 1.7 2003/05/04 02:54:48 obrien Exp $"); /* * This defines a structure for a ring buffer. ==== //depot/projects/ia64/crypto/telnet/telnet/sys_bsd.c#6 (text+ko) ==== @@ -31,15 +31,13 @@ * SUCH DAMAGE. */ -#include <sys/cdefs.h> -#include <stdlib.h> -#include <err.h> - -__FBSDID("$FreeBSD: src/crypto/telnet/telnet/sys_bsd.c,v 1.11 2002/09/25 07:24:01 markm Exp $"); - +#if 0 #ifndef lint static const char sccsid[] = "@(#)sys_bsd.c 8.4 (Berkeley) 5/30/95"; #endif +#endif +#include <sys/cdefs.h> +__FBSDID("$FreeBSD: src/crypto/telnet/telnet/sys_bsd.c,v 1.12 2003/05/04 02:54:48 obrien Exp $"); /* * The following routines try to encapsulate what is system dependent @@ -49,9 +47,11 @@ #include <sys/param.h> #include <sys/socket.h> #include <sys/time.h> +#include <err.h> #include <errno.h> #include <fcntl.h> #include <signal.h> +#include <stdlib.h> #include <unistd.h> #include <arpa/telnet.h> ==== //depot/projects/ia64/crypto/telnet/telnet/telnet.c#4 (text+ko) ==== @@ -31,13 +31,13 @@ * SUCH DAMAGE. */ -#include <sys/cdefs.h> - -__FBSDID("$FreeBSD: src/crypto/telnet/telnet/telnet.c,v 1.12 2002/09/25 07:26:25 markm Exp $"); - +#if 0 #ifndef lint static const char sccsid[] = "@(#)telnet.c 8.4 (Berkeley) 5/30/95"; #endif +#endif +#include <sys/cdefs.h> +__FBSDID("$FreeBSD: src/crypto/telnet/telnet/telnet.c,v 1.13 2003/05/04 02:54:48 obrien Exp $"); #include <sys/types.h> ==== //depot/projects/ia64/crypto/telnet/telnet/terminal.c#4 (text+ko) ==== @@ -31,13 +31,13 @@ * SUCH DAMAGE. */ -#include <sys/cdefs.h> - -__FBSDID("$FreeBSD: src/crypto/telnet/telnet/terminal.c,v 1.6 2002/05/11 03:19:44 alfred Exp $"); - +#if 0 #ifndef lint static const char sccsid[] = "@(#)terminal.c 8.2 (Berkeley) 2/16/95"; #endif +#endif +#include <sys/cdefs.h> +__FBSDID("$FreeBSD: src/crypto/telnet/telnet/terminal.c,v 1.7 2003/05/04 02:54:48 obrien Exp $"); #include <arpa/telnet.h> #include <sys/types.h> ==== //depot/projects/ia64/crypto/telnet/telnet/utilities.c#4 (text+ko) ==== @@ -31,13 +31,13 @@ * SUCH DAMAGE. */ -#include <sys/cdefs.h> - -__FBSDID("$FreeBSD: src/crypto/telnet/telnet/utilities.c,v 1.7 2002/05/11 03:19:44 alfred Exp $"); - +#if 0 #ifndef lint static const char sccsid[] = "@(#)utilities.c 8.3 (Berkeley) 5/30/95"; #endif +#endif +#include <sys/cdefs.h> +__FBSDID("$FreeBSD: src/crypto/telnet/telnet/utilities.c,v 1.8 2003/05/04 02:54:48 obrien Exp $"); #define TELOPTS #define TELCMDS ==== //depot/projects/ia64/crypto/telnet/telnetd/authenc.c#3 (text+ko) ==== @@ -31,13 +31,13 @@ * SUCH DAMAGE. */ -#include <sys/cdefs.h> - -__FBSDID("$FreeBSD: src/crypto/telnet/telnetd/authenc.c,v 1.7 2001/11/30 21:06:38 markm Exp $"); - +#if 0 #ifndef lint static const char sccsid[] = "@(#)authenc.c 8.2 (Berkeley) 5/30/95"; #endif +#endif +#include <sys/cdefs.h> +__FBSDID("$FreeBSD: src/crypto/telnet/telnetd/authenc.c,v 1.8 2003/05/04 02:54:49 obrien Exp $"); #ifdef AUTHENTICATION #ifdef ENCRYPTION ==== //depot/projects/ia64/crypto/telnet/telnetd/global.c#2 (text+ko) ==== @@ -31,13 +31,13 @@ * SUCH DAMAGE. */ +#if 0 #ifndef lint -#if 0 static const char sccsid[] = "@(#)global.c 8.1 (Berkeley) 6/4/93"; +#endif /* not lint */ #endif -static const char rcsid[] = - "$FreeBSD: src/crypto/telnet/telnetd/global.c,v 1.5 2000/07/16 05:52:45 peter Exp $"; -#endif /* not lint */ +#include <sys/cdefs.h> +__FBSDID("$FreeBSD: src/crypto/telnet/telnetd/global.c,v 1.6 2003/05/04 02:54:49 obrien Exp $"); /* * Allocate global variables. We do this ==== //depot/projects/ia64/crypto/telnet/telnetd/slc.c#3 (text+ko) ==== @@ -31,13 +31,13 @@ * SUCH DAMAGE. */ -#include <sys/cdefs.h> - -__FBSDID("$FreeBSD: src/crypto/telnet/telnetd/slc.c,v 1.8 2001/11/30 21:06:38 markm Exp $"); - +#if 0 #ifndef lint static const char sccsid[] = "@(#)slc.c 8.2 (Berkeley) 5/30/95"; #endif +#endif +#include <sys/cdefs.h> +__FBSDID("$FreeBSD: src/crypto/telnet/telnetd/slc.c,v 1.9 2003/05/04 02:54:49 obrien Exp $"); #include "telnetd.h" ==== //depot/projects/ia64/crypto/telnet/telnetd/state.c#4 (text+ko) ==== @@ -31,13 +31,13 @@ * SUCH DAMAGE. */ -#include <sys/cdefs.h> - -__FBSDID("$FreeBSD: src/crypto/telnet/telnetd/state.c,v 1.13 2002/09/25 07:28:04 markm Exp $"); - +#if 0 #ifndef lint static const char sccsid[] = "@(#)state.c 8.5 (Berkeley) 5/30/95"; #endif +#endif +#include <sys/cdefs.h> +__FBSDID("$FreeBSD: src/crypto/telnet/telnetd/state.c,v 1.14 2003/05/04 02:54:49 obrien Exp $"); #include <stdarg.h> #include "telnetd.h" ==== //depot/projects/ia64/crypto/telnet/telnetd/sys_term.c#6 (text+ko) ==== @@ -31,13 +31,13 @@ * SUCH DAMAGE. */ -#include <sys/cdefs.h> - -__FBSDID("$FreeBSD: src/crypto/telnet/telnetd/sys_term.c,v 1.17 2002/05/27 08:10:21 jmallett Exp $"); - +#if 0 #ifndef lint static const char sccsid[] = "@(#)sys_term.c 8.4+1 (Berkeley) 5/30/95"; #endif +#endif +#include <sys/cdefs.h> +__FBSDID("$FreeBSD: src/crypto/telnet/telnetd/sys_term.c,v 1.18 2003/05/04 02:54:49 obrien Exp $"); #include <sys/types.h> #include <sys/tty.h> ==== //depot/projects/ia64/crypto/telnet/telnetd/telnetd.c#3 (text+ko) ==== @@ -31,13 +31,13 @@ * SUCH DAMAGE. */ -#include <sys/cdefs.h> - -__FBSDID("$FreeBSD: src/crypto/telnet/telnetd/telnetd.c,v 1.21 2001/11/30 22:28:07 markm Exp $"); - +#if 0 #ifndef lint static const char sccsid[] = "@(#)telnetd.c 8.4 (Berkeley) 5/30/95"; #endif +#endif +#include <sys/cdefs.h> +__FBSDID("$FreeBSD: src/crypto/telnet/telnetd/telnetd.c,v 1.22 2003/05/04 02:54:49 obrien Exp $"); #include "telnetd.h" #include "pathnames.h" ==== //depot/projects/ia64/crypto/telnet/telnetd/termstat.c#3 (text+ko) ==== @@ -31,13 +31,13 @@ * SUCH DAMAGE. */ -#include <sys/cdefs.h> - -__FBSDID("$FreeBSD: src/crypto/telnet/telnetd/termstat.c,v 1.11 2001/11/30 21:06:38 markm Exp $"); - +#if 0 #ifndef lint static const char sccsid[] = "@(#)termstat.c 8.2 (Berkeley) 5/30/95"; #endif +#endif +#include <sys/cdefs.h> +__FBSDID("$FreeBSD: src/crypto/telnet/telnetd/termstat.c,v 1.12 2003/05/04 02:54:49 obrien Exp $"); #include "telnetd.h" ==== //depot/projects/ia64/crypto/telnet/telnetd/utility.c#3 (text+ko) ==== @@ -31,13 +31,13 @@ * SUCH DAMAGE. */ +#if 0 #ifndef lint -#if 0 static const char sccsid[] = "@(#)utility.c 8.4 (Berkeley) 5/30/95"; +#endif /* not lint */ #endif -static const char rcsid[] = - "$FreeBSD: src/crypto/telnet/telnetd/utility.c,v 1.12 2001/11/30 21:06:38 markm Exp $"; -#endif /* not lint */ +#include <sys/cdefs.h> +__FBSDID("$FreeBSD: src/crypto/telnet/telnetd/utility.c,v 1.13 2003/05/04 02:54:49 obrien Exp $"); #ifdef __FreeBSD__ #include <locale.h> ==== //depot/projects/ia64/etc/rc.d/abi#2 (text+ko) ==== @@ -1,10 +1,11 @@ #!/bin/sh # -# $FreeBSD: src/etc/rc.d/abi,v 1.1 2002/06/13 22:14:36 gordon Exp $ +# $FreeBSD: src/etc/rc.d/abi,v 1.2 2003/05/05 15:38:41 mtm Exp $ # # PROVIDE: abi # REQUIRE: LOGIN +# BEFORE: securelevel # KEYWORD: FreeBSD . /etc/rc.subr ==== //depot/projects/ia64/etc/rc.d/cron#3 (text+ko) ==== @@ -1,11 +1,12 @@ #!/bin/sh # # $NetBSD: cron,v 1.5 2000/09/19 13:04:38 lukem Exp $ -# $FreeBSD: src/etc/rc.d/cron,v 1.2 2002/06/13 22:14:36 gordon Exp $ +# $FreeBSD: src/etc/rc.d/cron,v 1.3 2003/05/05 15:38:41 mtm Exp $ # # PROVIDE: cron # REQUIRE: LOGIN +# BEFORE: securelevel # KEYWORD: FreeBSD NetBSD shutdown . /etc/rc.subr ==== //depot/projects/ia64/etc/rc.d/devfs#4 (text+ko) ==== @@ -1,10 +1,11 @@ #!/bin/sh # -# $FreeBSD: src/etc/rc.d/devfs,v 1.3 2003/05/02 08:10:58 mtm Exp $ +# $FreeBSD: src/etc/rc.d/devfs,v 1.4 2003/05/05 15:38:41 mtm Exp $ # # PROVIDE: devfs # REQUIRE: LOGIN +# BEFORE: securelevel # KEYWORD: FreeBSD . /etc/rc.subr ==== //depot/projects/ia64/etc/rc.d/jail#3 (text+ko) ==== @@ -1,10 +1,11 @@ #!/bin/sh # -# $FreeBSD: src/etc/rc.d/jail,v 1.3 2003/04/19 07:50:32 mtm Exp $ +# $FreeBSD: src/etc/rc.d/jail,v 1.4 2003/05/05 15:38:41 mtm Exp $ # # PROVIDE: jail # REQUIRE: LOGIN +# BEFORE: securelevel # KEYWORD: FreeBSD . /etc/rc.subr ==== //depot/projects/ia64/etc/rc.d/localdaemons#2 (text+ko) ==== @@ -1,10 +1,11 @@ #!/bin/sh # -# $FreeBSD: src/etc/rc.d/localdaemons,v 1.1 2002/06/13 22:14:36 gordon Exp $ +# $FreeBSD: src/etc/rc.d/localdaemons,v 1.2 2003/05/05 15:38:41 mtm Exp $ # # PROVIDE: localdaemons # REQUIRE: abi +# BEFORE: securelevel # KEYWORD: FreeBSD shutdown . /etc/rc.subr ==== //depot/projects/ia64/etc/rc.d/network3#4 (text+ko) ==== @@ -1,10 +1,11 @@ #!/bin/sh # -# $FreeBSD: src/etc/rc.d/network3,v 1.136 2002/10/12 10:31:31 schweikh Exp $ +# $FreeBSD: src/etc/rc.d/network3,v 1.137 2003/05/05 15:38:41 mtm Exp $ # # PROVIDE: network3 # REQUIRE: localdaemons +# BEFORE: securelevel # KEYWORD: FreeBSD . /etc/rc.subr ==== //depot/projects/ia64/etc/rc.d/securelevel#6 (text+ko) ==== @@ -1,12 +1,10 @@ #!/bin/sh # # $NetBSD: securelevel,v 1.4 2002/03/22 04:34:00 thorpej Exp $ -# $FreeBSD: src/etc/rc.d/securelevel,v 1.5 2003/04/24 08:27:29 mtm Exp $ +# $FreeBSD: src/etc/rc.d/securelevel,v 1.6 2003/05/05 15:38:41 mtm Exp $ # # PROVIDE: securelevel -# REQUIRE: aftermountlkm ipnat mountd -# BEFORE: DAEMON # KEYWORD: FreeBSD NetBSD . /etc/rc.subr ==== //depot/projects/ia64/etc/rc.d/serial#5 (text+ko) ==== @@ -24,7 +24,7 @@ # OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF # SUCH DAMAGE. # -# $FreeBSD: src/etc/rc.d/serial,v 1.18 2002/10/12 10:31:31 schweikh Exp $ +# $FreeBSD: src/etc/rc.d/serial,v 1.20 2003/05/05 03:26:50 bde Exp $ # # PROVIDE: serial @@ -33,7 +33,7 @@ # Change some defaults for serial devices. # Standard defaults are: -# dtrwait 300 drainwait 0 +# dtrwait 300 drainwait `sysctl -n kern.drainwait` # initial cflag from <sys/ttydefaults.h> = cread cs8 hupcl # initial iflag, lflag and oflag all 0 # speed 9600 @@ -47,10 +47,11 @@ ci=$1; shift # call in device identifier co=$1; shift # call out device identifier + drainwait=`sysctl -n kern.drainwait` for i in $* do - comcontrol /dev/tty${ci}${i} dtrwait 300 drainwait 300 + comcontrol /dev/tty${ci}${i} dtrwait 300 drainwait $drainwait stty < /dev/ttyi${ci}${i} -clocal crtscts hupcl 9600 reprint ^R stty < /dev/ttyl${ci}${i} -clocal -crtscts -hupcl 0 stty < /dev/cuai${co}${i} -clocal crtscts hupcl 9600 reprint ^R @@ -90,9 +91,9 @@ comcontrol /dev/tty${ci}${i} dtrwait 100 drainwait 180 # Lock crtscts on. # Speed reasonable for V42bis. - stty < /dev/ttyi${ci}${i} crtscts 57600 + stty < /dev/ttyi${ci}${i} crtscts 115200 stty < /dev/ttyl${ci}${i} crtscts - stty < /dev/cuai${co}${i} crtscts 57600 + stty < /dev/cuai${co}${i} crtscts 115200 stty < /dev/cual${co}${i} crtscts done } ==== //depot/projects/ia64/etc/rc.d/virecover#5 (text+ko) ==== @@ -1,11 +1,11 @@ #!/bin/sh # # $NetBSD: virecover,v 1.6 2002/03/22 04:34:00 thorpej Exp $ -# $FreeBSD: src/etc/rc.d/virecover,v 1.4 2003/02/21 09:37:20 dougb Exp $ +# $FreeBSD: src/etc/rc.d/virecover,v 1.5 2003/05/05 09:53:32 mtm Exp $ # # PROVIDE: virecover -# REQUIRE: mountcritremote +# REQUIRE: mountcritremote ldconfig # BEFORE: DAEMON # KEYWORD: FreeBSD NetBSD # ==== //depot/projects/ia64/games/caesar/caesar.c#3 (text+ko) ==== @@ -39,6 +39,7 @@ * SUCH DAMAGE. */ +#if 0 #ifndef lint static const char copyright[] = "@(#) Copyright (c) 1989, 1993\n\ @@ -46,13 +47,11 @@ #endif /* not lint */ #ifndef lint -#if 0 static const char sccsid[] = "@(#)caesar.c 8.1 (Berkeley) 5/31/93"; -#else -static const char rcsid[] = - "$FreeBSD: src/games/caesar/caesar.c,v 1.12 2002/02/18 05:15:15 imp Exp $"; +#endif /* not lint */ #endif -#endif /* not lint */ +#include <sys/cdefs.h> +__FBSDID("$FreeBSD: src/games/caesar/caesar.c,v 1.13 2003/05/05 09:52:25 obrien Exp $"); #include <errno.h> #include <math.h> ==== //depot/projects/ia64/games/fortune/fortune/fortune.c#4 (text+ko) ==== @@ -34,6 +34,7 @@ * SUCH DAMAGE. */ +#if 0 #ifndef lint static const char copyright[] = "@(#) Copyright (c) 1986, 1993\n\ @@ -41,12 +42,11 @@ #endif /* not lint */ #ifndef lint -#if 0 static const char sccsid[] = "@(#)fortune.c 8.1 (Berkeley) 5/31/93"; +#endif /* not lint */ #endif -static const char rcsid[] = - "$FreeBSD: src/games/fortune/fortune/fortune.c,v 1.22 2002/03/24 01:09:35 imp Exp $"; -#endif /* not lint */ +#include <sys/cdefs.h> +__FBSDID("$FreeBSD: src/games/fortune/fortune/fortune.c,v 1.23 2003/05/05 09:52:25 obrien Exp $"); # include <sys/stat.h> ==== //depot/projects/ia64/games/fortune/strfile/strfile.c#4 (text+ko) ==== @@ -34,6 +34,7 @@ * SUCH DAMAGE. */ +#if 0 #ifndef lint static const char copyright[] = "@(#) Copyright (c) 1989, 1993\n\ @@ -41,13 +42,11 @@ #endif /* not lint */ #ifndef lint -#if 0 static const char sccsid[] = "@(#)strfile.c 8.1 (Berkeley) 5/31/93"; -#else -static const char rcsid[] = - "$FreeBSD: src/games/fortune/strfile/strfile.c,v 1.21 2002/03/24 01:09:35 imp Exp $"; +#endif /* not lint */ #endif -#endif /* not lint */ +#include <sys/cdefs.h> +__FBSDID("$FreeBSD: src/games/fortune/strfile/strfile.c,v 1.22 2003/05/05 09:52:25 obrien Exp $"); # include <sys/param.h> # include <arpa/inet.h> ==== //depot/projects/ia64/games/fortune/unstr/unstr.c#4 (text+ko) ==== @@ -34,6 +34,7 @@ * SUCH DAMAGE. */ +#if 0 #ifndef lint >>> TRUNCATED FOR MAIL (1000 lines) <<<
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200305051917.h45JH2kn096900>