Date: Wed, 30 Apr 2003 16:39:02 -0700 (PDT) From: Marcel Moolenaar <marcel@FreeBSD.org> To: Perforce Change Reviews <perforce@freebsd.org> Subject: PERFORCE change 30188 for review Message-ID: <200304302339.h3UNd2Qx067968@repoman.freebsd.org>
next in thread | raw e-mail | index | archive | help
http://perforce.freebsd.org/chv.cgi?CH=30188 Change 30188 by marcel@marcel_pluto1 on 2003/04/30 16:38:45 IFC @30180 Affected files ... .. //depot/projects/ia64/Makefile.inc1#57 integrate .. //depot/projects/ia64/bin/cat/cat.c#8 integrate .. //depot/projects/ia64/bin/ps/ps.1#14 integrate .. //depot/projects/ia64/bin/sh/sh.1#21 integrate .. //depot/projects/ia64/etc/Makefile#27 integrate .. //depot/projects/ia64/etc/defaults/rc.conf#30 integrate .. //depot/projects/ia64/etc/etc.amd64/rc.amd64#1 branch .. //depot/projects/ia64/etc/etc.amd64/ttys#1 branch .. //depot/projects/ia64/etc/pam.d/ftpd#7 integrate .. //depot/projects/ia64/etc/pam.d/gdm#6 integrate .. //depot/projects/ia64/etc/pam.d/kde#5 integrate .. //depot/projects/ia64/etc/pam.d/login#9 integrate .. //depot/projects/ia64/etc/pam.d/other#9 integrate .. //depot/projects/ia64/etc/pam.d/sshd#13 integrate .. //depot/projects/ia64/etc/pam.d/su#9 integrate .. //depot/projects/ia64/etc/pam.d/telnetd#6 integrate .. //depot/projects/ia64/etc/pam.d/xdm#7 integrate .. //depot/projects/ia64/etc/rc.d/ipfilter#9 integrate .. //depot/projects/ia64/etc/rc.d/ipnat#7 integrate .. //depot/projects/ia64/etc/rc.d/kpasswdd#1 branch .. //depot/projects/ia64/etc/rc.d/ldconfig#5 integrate .. //depot/projects/ia64/etc/rc.subr#10 integrate .. //depot/projects/ia64/etc/root/dot.k5login#1 branch .. //depot/projects/ia64/etc/root/dot.klogin#2 delete .. //depot/projects/ia64/gnu/usr.bin/groff/font/Makefile.dev#4 integrate .. //depot/projects/ia64/lib/Makefile#22 integrate .. //depot/projects/ia64/lib/csu/amd64/Makefile#1 branch .. //depot/projects/ia64/lib/csu/amd64/crt1.c#1 branch .. //depot/projects/ia64/lib/csu/amd64/crti.S#1 branch .. //depot/projects/ia64/lib/csu/amd64/crtn.S#1 branch .. //depot/projects/ia64/lib/libc/amd64/SYS.h#1 branch .. //depot/projects/ia64/lib/libc/amd64/_fpmath.h#1 branch .. //depot/projects/ia64/lib/libc/amd64/arith.h#1 branch .. //depot/projects/ia64/lib/libc/amd64/gen/Makefile.inc#1 branch .. //depot/projects/ia64/lib/libc/amd64/gen/_setjmp.S#1 branch .. //depot/projects/ia64/lib/libc/amd64/gen/fabs.S#1 branch .. //depot/projects/ia64/lib/libc/amd64/gen/frexp.c#1 branch .. //depot/projects/ia64/lib/libc/amd64/gen/infinity.c#1 branch .. //depot/projects/ia64/lib/libc/amd64/gen/isinf.c#1 branch .. //depot/projects/ia64/lib/libc/amd64/gen/modf.S#1 branch .. //depot/projects/ia64/lib/libc/amd64/gen/setjmp.S#1 branch .. //depot/projects/ia64/lib/libc/amd64/gen/sigsetjmp.S#1 branch .. //depot/projects/ia64/lib/libc/amd64/net/Makefile.inc#1 branch .. //depot/projects/ia64/lib/libc/amd64/net/htonl.S#1 branch .. //depot/projects/ia64/lib/libc/amd64/net/htons.S#1 branch .. //depot/projects/ia64/lib/libc/amd64/net/ntohl.S#1 branch .. //depot/projects/ia64/lib/libc/amd64/net/ntohs.S#1 branch .. //depot/projects/ia64/lib/libc/amd64/stdlib/gdtoa.mk#1 branch .. //depot/projects/ia64/lib/libc/amd64/sys/Makefile.inc#1 branch .. //depot/projects/ia64/lib/libc/amd64/sys/brk.S#1 branch .. //depot/projects/ia64/lib/libc/amd64/sys/cerror.S#1 branch .. //depot/projects/ia64/lib/libc/amd64/sys/exect.S#1 branch .. //depot/projects/ia64/lib/libc/amd64/sys/pipe.S#1 branch .. //depot/projects/ia64/lib/libc/amd64/sys/ptrace.S#1 branch .. //depot/projects/ia64/lib/libc/amd64/sys/reboot.S#1 branch .. //depot/projects/ia64/lib/libc/amd64/sys/sbrk.S#1 branch .. //depot/projects/ia64/lib/libc/amd64/sys/setlogin.S#1 branch .. //depot/projects/ia64/lib/libc/amd64/sys/sigreturn.S#1 branch .. //depot/projects/ia64/lib/libc/amd64/sys/vfork.S#1 branch .. //depot/projects/ia64/lib/libc/gmon/gmon.c#6 integrate .. //depot/projects/ia64/lib/libc/stdlib/malloc.c#16 integrate .. //depot/projects/ia64/lib/libc/stdtime/strptime.c#9 integrate .. //depot/projects/ia64/lib/libc/xdr/xdr_float.c#4 integrate .. //depot/projects/ia64/lib/libdisk/chunk.c#11 integrate .. //depot/projects/ia64/lib/libdisk/create_chunk.c#14 integrate .. //depot/projects/ia64/lib/libdisk/disk.c#18 integrate .. //depot/projects/ia64/lib/libdisk/libdisk.h#14 integrate .. //depot/projects/ia64/lib/libdisk/rules.c#10 integrate .. //depot/projects/ia64/lib/libdisk/write_amd64_disk.c#1 branch .. //depot/projects/ia64/lib/libkvm/kvm_amd64.c#1 branch .. //depot/projects/ia64/lib/libncurses/Makefile#14 integrate .. //depot/projects/ia64/lib/libpam/modules/pam_chroot/pam_chroot.c#3 integrate .. //depot/projects/ia64/lib/libpam/modules/pam_lastlog/pam_lastlog.c#13 integrate .. //depot/projects/ia64/lib/libpam/modules/pam_login_access/pam_login_access.c#4 integrate .. //depot/projects/ia64/lib/libpam/modules/pam_opieaccess/pam_opieaccess.c#8 integrate .. //depot/projects/ia64/lib/libpam/modules/pam_unix/pam_unix.c#14 integrate .. //depot/projects/ia64/lib/libpthread/arch/i386/include/pthread_md.h#2 integrate .. //depot/projects/ia64/lib/libpthread/thread/thr_create.c#7 integrate .. //depot/projects/ia64/lib/libpthread/thread/thr_init.c#8 integrate .. //depot/projects/ia64/lib/libpthread/thread/thr_kern.c#13 integrate .. //depot/projects/ia64/lib/libpthread/thread/thr_private.h#10 integrate .. //depot/projects/ia64/lib/msun/src/math_private.h#6 integrate .. //depot/projects/ia64/libexec/Makefile#11 integrate .. //depot/projects/ia64/libexec/rtld-elf/amd64/Makefile.inc#1 branch .. //depot/projects/ia64/libexec/rtld-elf/amd64/elf_rtld.x#1 branch .. //depot/projects/ia64/libexec/rtld-elf/amd64/lockdflt.c#1 branch .. //depot/projects/ia64/libexec/rtld-elf/amd64/reloc.c#1 branch .. //depot/projects/ia64/libexec/rtld-elf/amd64/rtld_machdep.h#1 branch .. //depot/projects/ia64/libexec/rtld-elf/amd64/rtld_start.S#1 branch .. //depot/projects/ia64/libexec/rtld-elf/libmap.c#3 integrate .. //depot/projects/ia64/release/Makefile#48 integrate .. //depot/projects/ia64/release/picobsd/tinyware/passwd/Makefile#3 integrate .. //depot/projects/ia64/release/scripts/crypto-install.sh#2 integrate .. //depot/projects/ia64/secure/lib/Makefile#5 integrate .. //depot/projects/ia64/secure/lib/Makefile.inc#2 integrate .. //depot/projects/ia64/secure/lib/libcrypto/opensslconf-amd64.h#1 branch .. //depot/projects/ia64/secure/libexec/Makefile#4 integrate .. //depot/projects/ia64/secure/libexec/Makefile.inc#2 integrate .. //depot/projects/ia64/secure/usr.bin/Makefile#5 integrate .. //depot/projects/ia64/secure/usr.bin/Makefile.inc#2 integrate .. //depot/projects/ia64/secure/usr.bin/ssh/Makefile#8 integrate .. //depot/projects/ia64/secure/usr.sbin/Makefile.inc#2 integrate .. //depot/projects/ia64/secure/usr.sbin/sshd/Makefile#13 integrate .. //depot/projects/ia64/share/doc/smm/01.setup/3.t#3 integrate .. //depot/projects/ia64/share/doc/smm/06.nfs/1.t#3 integrate .. //depot/projects/ia64/share/man/man5/make.conf.5#32 integrate .. //depot/projects/ia64/share/man/man5/rc.conf.5#34 integrate .. //depot/projects/ia64/sys/alpha/alpha/trap.c#26 integrate .. //depot/projects/ia64/sys/amd64/compile/.cvsignore#1 branch .. //depot/projects/ia64/sys/amd64/include/_limits.h#1 branch .. //depot/projects/ia64/sys/amd64/include/_stdint.h#1 branch .. //depot/projects/ia64/sys/amd64/include/_types.h#1 branch .. //depot/projects/ia64/sys/amd64/include/endian.h#1 branch .. //depot/projects/ia64/sys/amd64/include/limits.h#1 branch .. //depot/projects/ia64/sys/amd64/include/param.h#1 branch .. //depot/projects/ia64/sys/amd64/include/stdarg.h#1 branch .. //depot/projects/ia64/sys/boot/Makefile#6 integrate .. //depot/projects/ia64/sys/boot/i386/libi386/i386_module.c#5 integrate .. //depot/projects/ia64/sys/boot/powerpc/loader/metadata.c#3 integrate .. //depot/projects/ia64/sys/boot/sparc64/loader/metadata.c#8 integrate .. //depot/projects/ia64/sys/cam/cam_ccb.h#3 integrate .. //depot/projects/ia64/sys/cam/scsi/scsi_all.c#12 integrate .. //depot/projects/ia64/sys/cam/scsi/scsi_all.h#6 integrate .. //depot/projects/ia64/sys/cam/scsi/scsi_da.c#41 integrate .. //depot/projects/ia64/sys/conf/Makefile.amd64#1 branch .. //depot/projects/ia64/sys/conf/Makefile.x86_64#5 delete .. //depot/projects/ia64/sys/conf/files.amd64#1 branch .. //depot/projects/ia64/sys/conf/files.x86_64#9 delete .. //depot/projects/ia64/sys/conf/kern.mk#4 integrate .. //depot/projects/ia64/sys/conf/kern.post.mk#28 integrate .. //depot/projects/ia64/sys/conf/ldscript.amd64#1 branch .. //depot/projects/ia64/sys/conf/options.amd64#1 branch .. //depot/projects/ia64/sys/conf/options.x86_64#6 delete .. //depot/projects/ia64/sys/dev/acpica/acpi_timer.c#12 integrate .. //depot/projects/ia64/sys/dev/firewire/firewire.c#26 integrate .. //depot/projects/ia64/sys/dev/firewire/sbp.c#28 integrate .. //depot/projects/ia64/sys/dev/fxp/if_fxp.c#30 integrate .. //depot/projects/ia64/sys/dev/fxp/if_fxpvar.h#9 integrate .. //depot/projects/ia64/sys/dev/kbd/atkbd.c#6 integrate .. //depot/projects/ia64/sys/dev/puc/puc.c#17 integrate .. //depot/projects/ia64/sys/dev/puc/pucdata.c#14 integrate .. //depot/projects/ia64/sys/dev/sio/sio.c#41 integrate .. //depot/projects/ia64/sys/geom/geom_kern.c#19 integrate .. //depot/projects/ia64/sys/i386/i386/autoconf.c#11 integrate .. //depot/projects/ia64/sys/i386/i386/identcpu.c#19 integrate .. //depot/projects/ia64/sys/i386/i386/trap.c#30 integrate .. //depot/projects/ia64/sys/ia64/ia64/trap.c#49 integrate .. //depot/projects/ia64/sys/ia64/include/param.h#7 integrate .. //depot/projects/ia64/sys/isa/atkbd_isa.c#2 integrate .. //depot/projects/ia64/sys/isa/atkbdc_isa.c#2 integrate .. //depot/projects/ia64/sys/isa/isa_common.c#7 integrate .. //depot/projects/ia64/sys/isa/ppc.c#5 integrate .. //depot/projects/ia64/sys/isa/psm.c#12 integrate .. //depot/projects/ia64/sys/kern/kern_descrip.c#52 integrate .. //depot/projects/ia64/sys/kern/kern_fork.c#36 integrate .. //depot/projects/ia64/sys/kern/kern_mib.c#13 integrate .. //depot/projects/ia64/sys/kern/kern_sig.c#47 integrate .. //depot/projects/ia64/sys/kern/kern_synch.c#32 integrate .. //depot/projects/ia64/sys/kern/kern_thr.c#5 integrate .. //depot/projects/ia64/sys/kern/kern_thread.c#43 integrate .. //depot/projects/ia64/sys/kern/sched_4bsd.c#11 integrate .. //depot/projects/ia64/sys/kern/subr_bus.c#21 integrate .. //depot/projects/ia64/sys/kern/subr_mbuf.c#23 integrate .. //depot/projects/ia64/sys/kern/uipc_socket2.c#23 integrate .. //depot/projects/ia64/sys/net/if.c#23 integrate .. //depot/projects/ia64/sys/net/if_ethersubr.c#29 integrate .. //depot/projects/ia64/sys/powerpc/powerpc/machdep.c#25 integrate .. //depot/projects/ia64/sys/powerpc/powerpc/trap.c#25 integrate .. //depot/projects/ia64/sys/sparc64/sparc64/machdep.c#37 integrate .. //depot/projects/ia64/sys/sparc64/sparc64/trap.c#25 integrate .. //depot/projects/ia64/sys/sys/cdio.h#3 integrate .. //depot/projects/ia64/sys/sys/proc.h#61 integrate .. //depot/projects/ia64/sys/sys/signalvar.h#11 integrate .. //depot/projects/ia64/sys/sys/user.h#9 integrate .. //depot/projects/ia64/sys/ufs/ffs/ffs_snapshot.c#28 integrate .. //depot/projects/ia64/sys/ufs/ufs/ufs_lookup.c#10 integrate .. //depot/projects/ia64/sys/vm/vm_map.c#53 integrate .. //depot/projects/ia64/sys/vm/vm_pageout.c#36 integrate .. //depot/projects/ia64/usr.bin/Makefile#43 integrate .. //depot/projects/ia64/usr.bin/ee/ee.1#3 integrate .. //depot/projects/ia64/usr.bin/mt/mt.1#7 integrate .. //depot/projects/ia64/usr.sbin/fwcontrol/Makefile#4 integrate .. //depot/projects/ia64/usr.sbin/fwcontrol/fwcontrol.c#8 integrate Differences ... ==== //depot/projects/ia64/Makefile.inc1#57 (text+ko) ==== @@ -1,5 +1,5 @@ # -# $FreeBSD: src/Makefile.inc1,v 1.349 2003/04/16 21:05:06 jhb Exp $ +# $FreeBSD: src/Makefile.inc1,v 1.352 2003/04/30 12:38:20 ru Exp $ # # Make command line options: # -DMAKE_KERBEROS5 to build Kerberos5 @@ -203,13 +203,13 @@ BMAKE= MAKEOBJDIRPREFIX=${WORLDTMP} \ ${BMAKEENV} ${MAKE} -f Makefile.inc1 \ BOOTSTRAPPING=${OSRELDATE} \ - -DNOHTML -DNOINFO -DNOMAN -DNOPIC -DNOPROFILE -DNOSHARED \ - -DNO_CPU_CFLAGS -DNO_WARNS + -DNOHTML -DNOINFO -DNOLINT -DNOMAN -DNOPIC -DNOPROFILE \ + -DNOSHARED -DNO_CPU_CFLAGS -DNO_WARNS # build-tools stage TMAKE= MAKEOBJDIRPREFIX=${OBJTREE} \ ${BMAKEENV} ${MAKE} -f Makefile.inc1 \ - BOOTSTRAPPING=${OSRELDATE} -DNO_CPU_CFLAGS -DNO_WARNS + BOOTSTRAPPING=${OSRELDATE} -DNOLINT -DNO_CPU_CFLAGS -DNO_WARNS # cross-tools stage XMAKE= TOOLS_PREFIX=${WORLDTMP} ${BMAKE} -DNO_FORTRAN -DNO_GDB @@ -640,6 +640,12 @@ _strfile= games/fortune/strfile .endif +.if ${BOOTSTRAPPING} < 500042 +_groff= gnu/usr.bin/groff +.else +_groff= gnu/usr.bin/groff/tmac +.endif + .if ( ${BOOTSTRAPPING} < 450005 || \ ( ${BOOTSTRAPPING} >= 500000 && ${BOOTSTRAPPING} < 500034 )) _uudecode= usr.bin/uudecode @@ -664,7 +670,7 @@ usr.bin/makewhatis usr.bin/rpcgen ${_uudecode} \ ${_xargs} usr.bin/xinstall ${_yacc} \ usr.sbin/config ${_kbdcontrol} \ - gnu/usr.bin/gperf gnu/usr.bin/groff gnu/usr.bin/texinfo + gnu/usr.bin/gperf ${_groff} gnu/usr.bin/texinfo @${ECHODIR} "===> ${_tool}"; \ cd ${.CURDIR}/${_tool}; \ ${MAKE} DIRPRFX=${_tool}/ obj; \ ==== //depot/projects/ia64/bin/cat/cat.c#8 (text+ko) ==== @@ -34,11 +34,13 @@ * SUCH DAMAGE. */ +#if 0 #ifndef lint static char const copyright[] = "@(#) Copyright (c) 1989, 1993\n\ The Regents of the University of California. All rights reserved.\n"; #endif /* not lint */ +#endif #ifndef lint #if 0 @@ -46,7 +48,7 @@ #endif #endif /* not lint */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/bin/cat/cat.c,v 1.28 2002/10/23 10:23:38 markm Exp $"); +__FBSDID("$FreeBSD: src/bin/cat/cat.c,v 1.29 2003/04/30 17:40:28 obrien Exp $"); #include <sys/param.h> #include <sys/stat.h> ==== //depot/projects/ia64/bin/ps/ps.1#14 (text+ko) ==== @@ -30,7 +30,7 @@ .\" SUCH DAMAGE. .\" .\" @(#)ps.1 8.3 (Berkeley) 4/18/94 -.\" $FreeBSD: src/bin/ps/ps.1,v 1.60 2002/12/23 16:04:49 ru Exp $ +.\" $FreeBSD: src/bin/ps/ps.1,v 1.61 2003/04/30 19:18:50 schweikh Exp $ .\" .Dd April 18, 1994 .Dt PS 1 @@ -301,9 +301,7 @@ .Pf ( Dv MADV_RANDOM , from .Xr madvise 2 , -for example, -.Xr lisp 1 -in a garbage collect). +for example, lisp in a garbage collect). .It E The process is trying to exit. .It L ==== //depot/projects/ia64/bin/sh/sh.1#21 (text+ko) ==== @@ -33,7 +33,7 @@ .\" SUCH DAMAGE. .\" .\" from: @(#)sh.1 8.6 (Berkeley) 5/4/95 -.\" $FreeBSD: src/bin/sh/sh.1,v 1.85 2003/04/12 03:20:28 tjr Exp $ +.\" $FreeBSD: src/bin/sh/sh.1,v 1.86 2003/04/30 19:18:50 schweikh Exp $ .\" .Dd April 12, 2003 .Dt SH 1 @@ -59,8 +59,7 @@ specification for the shell. This version has many features which make it appear similar in some respects to the Korn shell, but it is not a Korn -shell clone like -.Xr pdksh 1 . +shell clone like pdksh. Only features designated by POSIX, plus a few Berkeley extensions, are being incorporated into this shell. ==== //depot/projects/ia64/etc/Makefile#27 (text+ko) ==== @@ -1,5 +1,5 @@ # from: @(#)Makefile 5.11 (Berkeley) 5/21/91 -# $FreeBSD: src/etc/Makefile,v 1.309 2003/04/18 17:51:53 mtm Exp $ +# $FreeBSD: src/etc/Makefile,v 1.310 2003/04/30 20:58:48 markm Exp $ .if !defined(NO_SENDMAIL) SUBDIR= sendmail @@ -99,7 +99,7 @@ ${INSTALL} -o ${BINOWN} -g ${BINGRP} -m 644 \ dot.cshrc ${DESTDIR}/root/.cshrc; \ ${INSTALL} -o ${BINOWN} -g ${BINGRP} -m 644 \ - dot.klogin ${DESTDIR}/root/.klogin; \ + dot.k5login ${DESTDIR}/root/.k5login; \ ${INSTALL} -o ${BINOWN} -g ${BINGRP} -m 644 \ dot.login ${DESTDIR}/root/.login; \ ${INSTALL} -o ${BINOWN} -g ${BINGRP} -m 644 \ ==== //depot/projects/ia64/etc/defaults/rc.conf#30 (text+ko) ==== @@ -13,7 +13,7 @@ # # All arguments must be in double or single quotes. # -# $FreeBSD: src/etc/defaults/rc.conf,v 1.173 2003/04/27 05:49:53 imp Exp $ +# $FreeBSD: src/etc/defaults/rc.conf,v 1.175 2003/04/30 20:58:49 markm Exp $ ############################################################## ### Important initial Boot-time options #################### @@ -153,8 +153,9 @@ kerberos5_server_enable="NO" # Run a kerberos 5 master server (or NO). kerberos5_server="/usr/libexec/kdc" # path to kerberos 5 KDC kadmind5_server_enable="NO" # Run kadmind (or NO) -kadmind5_server="/usr/libexec/k5admind" # path to kerberos 5 admin daemon -kerberos_stash="NO" # Is the kerberos master key stashed? +kadmind5_server="/usr/libexec/kadmind" # path to kerberos 5 admin daemon +kpasswdd_server_enable="NO" # Run kpasswdd (or NO) +kpasswdd_server="/usr/libexec/kpasswdd" # path to kerberos 5 passwd daemon rwhod_enable="NO" # Run the rwho daemon (or NO). rwhod_flags="" # Flags for rwhod ==== //depot/projects/ia64/etc/pam.d/ftpd#7 (text+ko) ==== @@ -1,5 +1,5 @@ # -# $FreeBSD: src/etc/pam.d/ftpd,v 1.17 2003/03/08 09:50:11 markm Exp $ +# $FreeBSD: src/etc/pam.d/ftpd,v 1.18 2003/04/30 21:57:54 markm Exp $ # # PAM configuration for the "ftpd" service # @@ -17,5 +17,4 @@ account required pam_unix.so # session -#session required pam_krb5.so session required pam_permit.so ==== //depot/projects/ia64/etc/pam.d/gdm#6 (text+ko) ==== @@ -1,5 +1,5 @@ # -# $FreeBSD: src/etc/pam.d/gdm,v 1.6 2003/03/08 09:50:11 markm Exp $ +# $FreeBSD: src/etc/pam.d/gdm,v 1.7 2003/04/30 21:57:54 markm Exp $ # # PAM configuration for the "gdm" service # @@ -15,6 +15,5 @@ account required pam_unix.so # session -#session required pam_krb5.so #session optional pam_ssh.so session required pam_permit.so ==== //depot/projects/ia64/etc/pam.d/kde#5 (text+ko) ==== @@ -1,5 +1,5 @@ # -# $FreeBSD: src/etc/pam.d/kde,v 1.5 2003/03/08 09:50:11 markm Exp $ +# $FreeBSD: src/etc/pam.d/kde,v 1.6 2003/04/30 21:57:54 markm Exp $ # # PAM configuration for the "kde" service # @@ -15,6 +15,5 @@ account required pam_unix.so # session -#session required pam_krb5.so #session optional pam_ssh.so session required pam_permit.so ==== //depot/projects/ia64/etc/pam.d/login#9 (text+ko) ==== @@ -1,5 +1,5 @@ # -# $FreeBSD: src/etc/pam.d/login,v 1.14 2003/03/08 09:50:11 markm Exp $ +# $FreeBSD: src/etc/pam.d/login,v 1.15 2003/04/30 21:57:54 markm Exp $ # # PAM configuration for the "login" service # @@ -20,7 +20,6 @@ account required pam_unix.so # session -#session required pam_krb5.so #session optional pam_ssh.so session required pam_lastlog.so no_fail ==== //depot/projects/ia64/etc/pam.d/other#9 (text+ko) ==== @@ -1,5 +1,5 @@ # -# $FreeBSD: src/etc/pam.d/other,v 1.9 2003/03/08 09:50:11 markm Exp $ +# $FreeBSD: src/etc/pam.d/other,v 1.10 2003/04/30 21:57:54 markm Exp $ # # PAM configuration for the "other" service # @@ -18,7 +18,6 @@ account required pam_unix.so # session -#session required pam_krb5.so #session optional pam_ssh.so session required pam_permit.so ==== //depot/projects/ia64/etc/pam.d/sshd#13 (text+ko) ==== @@ -1,5 +1,5 @@ # -# $FreeBSD: src/etc/pam.d/sshd,v 1.14 2003/03/08 09:50:11 markm Exp $ +# $FreeBSD: src/etc/pam.d/sshd,v 1.15 2003/04/30 21:57:54 markm Exp $ # # PAM configuration for the "sshd" service # @@ -18,7 +18,6 @@ account required pam_unix.so # session -#session required pam_krb5.so #session optional pam_ssh.so session required pam_permit.so ==== //depot/projects/ia64/etc/pam.d/su#9 (text+ko) ==== @@ -1,5 +1,5 @@ # -# $FreeBSD: src/etc/pam.d/su,v 1.13 2003/03/08 09:50:11 markm Exp $ +# $FreeBSD: src/etc/pam.d/su,v 1.14 2003/04/30 21:57:54 markm Exp $ # # PAM configuration for the "su" service # @@ -19,5 +19,4 @@ account required pam_unix.so # session -#session required pam_krb5.so #session optional pam_ssh.so ==== //depot/projects/ia64/etc/pam.d/telnetd#6 (text+ko) ==== @@ -1,5 +1,5 @@ # -# $FreeBSD: src/etc/pam.d/telnetd,v 1.6 2003/03/08 09:50:11 markm Exp $ +# $FreeBSD: src/etc/pam.d/telnetd,v 1.7 2003/04/30 21:57:54 markm Exp $ # # PAM configuration for the "telnetd" service # @@ -18,7 +18,6 @@ account required pam_unix.so # session -#session required pam_krb5.so #session optional pam_ssh.so session required pam_lastlog.so no_fail ==== //depot/projects/ia64/etc/pam.d/xdm#7 (text+ko) ==== @@ -1,5 +1,5 @@ # -# $FreeBSD: src/etc/pam.d/xdm,v 1.7 2003/03/08 09:50:11 markm Exp $ +# $FreeBSD: src/etc/pam.d/xdm,v 1.8 2003/04/30 21:57:54 markm Exp $ # # PAM configuration for the "xdm" service # @@ -15,6 +15,5 @@ account required pam_unix.so # session -#session required pam_krb5.so #session required pam_ssh.so want_agent session required pam_permit.so ==== //depot/projects/ia64/etc/rc.d/ipfilter#9 (text+ko) ==== @@ -1,7 +1,7 @@ #!/bin/sh # # $NetBSD: ipfilter,v 1.10 2001/02/28 17:03:50 lukem Exp $ -# $FreeBSD: src/etc/rc.d/ipfilter,v 1.8 2003/04/24 08:20:47 mtm Exp $ +# $FreeBSD: src/etc/rc.d/ipfilter,v 1.10 2003/04/30 02:54:17 mtm Exp $ # # PROVIDE: ipfilter @@ -42,7 +42,7 @@ # load ipfilter kernel module if needed if ! sysctl net.inet.ipf.fr_pass > /dev/null 2>&1; then if kldload ipl; then - echo 'IP-filter module loaded.' + info 'IP-filter module loaded.' else err 1 'IP-filter module failed to load.' fi @@ -79,12 +79,12 @@ echo "Enabling ipfilter." case ${OSTYPE} in FreeBSD) - ${ipfilter_program:-/sbin/ipf} -Fa + ${ipfilter_program:-/sbin/ipf} -EFa if [ -r "${ipfilter_rules}" ]; then ${ipfilter_program:-/sbin/ipf} \ -f "${ipfilter_rules}" ${ipfilter_flags} fi - ${ipfilter_program:-/sbin/ipf} -6 -Fa + ${ipfilter_program:-/sbin/ipf} -6 -EFa if [ -r "${ipv6_ipfilter_rules}" ]; then ${ipfilter_program:-/sbin/ipf} -6 \ -f "${ipv6_ipfilter_rules}" ${ipfilter_flags} ==== //depot/projects/ia64/etc/rc.d/ipnat#7 (text+ko) ==== @@ -1,7 +1,7 @@ #!/bin/sh # # $NetBSD: ipnat,v 1.6 2000/09/19 13:04:38 lukem Exp $ -# $FreeBSD: src/etc/rc.d/ipnat,v 1.7 2003/04/24 18:14:52 mtm Exp $ +# $FreeBSD: src/etc/rc.d/ipnat,v 1.8 2003/04/30 02:54:17 mtm Exp $ # # PROVIDE: ipnat @@ -44,7 +44,7 @@ # Make sure ipfilter is loaded before continuing if ! ${SYSCTL} net.inet.ipf.fr_pass >/dev/null 2>&1; then if kldload ipl; then - echo 'IP-filter module loaded.' + info 'IP-filter module loaded.' else err 1 'IP-filter module failed to load.' fi @@ -55,10 +55,10 @@ ipnat_start() { if [ ! -f ${ipnat_rules} ]; then - echo -n ' NO IPNAT RULES' + warn 'NO IPNAT RULES' return 0 fi - echo -n "Installing NAT rules ... " + echo -n "Installing NAT rules." ${ipnat_program} -CF -f ${ipnat_rules} ${ipnat_flags} } ==== //depot/projects/ia64/etc/rc.d/ldconfig#5 (text+ko) ==== @@ -1,11 +1,11 @@ #!/bin/sh # # $NetBSD: ldconfig,v 1.5 2002/03/22 04:33:58 thorpej Exp $ -# $FreeBSD: src/etc/rc.d/ldconfig,v 1.4 2002/09/17 01:48:48 peter Exp $ +# $FreeBSD: src/etc/rc.d/ldconfig,v 1.5 2003/04/30 07:12:09 mtm Exp $ # # PROVIDE: ldconfig -# REQUIRE: mountall +# REQUIRE: mountall mountcritremote # BEFORE: DAEMON # KEYWORD: FreeBSD NetBSD ==== //depot/projects/ia64/etc/rc.subr#10 (text+ko) ==== @@ -1,5 +1,5 @@ # $NetBSD: rc.subr,v 1.49 2002/05/21 12:31:01 lukem Exp $ -# $FreeBSD: src/etc/rc.subr,v 1.10 2003/01/20 19:30:15 mtm Exp $ +# $FreeBSD: src/etc/rc.subr,v 1.11 2003/04/30 03:03:47 mtm Exp $ # # Copyright (c) 1997-2002 The NetBSD Foundation, Inc. # All rights reserved. @@ -275,7 +275,7 @@ esac done' - debug "in _find_processes: proccheck is ($_proccheck)." +# debug "in _find_processes: proccheck is ($_proccheck)." eval $_proccheck } ==== //depot/projects/ia64/gnu/usr.bin/groff/font/Makefile.dev#4 (text+ko) ==== @@ -1,11 +1,6 @@ -# $FreeBSD: src/gnu/usr.bin/groff/font/Makefile.dev,v 2.10 2002/07/29 09:40:08 ru Exp $ +# $FreeBSD: src/gnu/usr.bin/groff/font/Makefile.dev,v 2.11 2003/04/30 20:48:03 ru Exp $ -DEVICEDIR?= ${fontdir}/dev${DEV} - -all: ${DEVFILES} - -beforeinstall: ${DEVFILES} - ${INSTALL} -o ${BINOWN} -g ${BINGRP} -m ${NOBINMODE} \ - ${.ALLSRC} ${DESTDIR}${DEVICEDIR} +FILES= ${DEVFILES} +FILESDIR?= ${fontdir}/dev${DEV} .include <bsd.prog.mk> ==== //depot/projects/ia64/lib/Makefile#22 (text+ko) ==== @@ -1,5 +1,5 @@ # @(#)Makefile 8.1 (Berkeley) 6/4/93 -# $FreeBSD: src/lib/Makefile,v 1.151 2003/04/25 01:34:43 deischen Exp $ +# $FreeBSD: src/lib/Makefile,v 1.154 2003/04/30 18:42:25 peter Exp $ # To satisfy shared library or ELF linkage when only the libraries being # built are visible: @@ -29,7 +29,7 @@ libipx libisc libmenu ${_libmilter} ${_libmp} ${_libncp} \ libnetgraph libopie libpam libpanel libpcap ${_libpthread} \ ${_libsm} ${_libsmb} ${_libsmdb} ${_libsmutil} \ - libstand ${_libtelnet} libufs libugidfw libusbhid ${_libvgl} \ + ${_libstand} ${_libtelnet} libufs libugidfw libusbhid ${_libvgl} \ libwrap libxpg4 liby libz .if exists(${.CURDIR}/csu/${MACHINE_ARCH}-elf) @@ -40,9 +40,12 @@ _csu=csu .endif +.if ${MACHINE_ARCH} != "amd64" +_libstand= libstand .if !defined(NOLIBC_R) _libc_r= libc_r .endif +.endif .if !defined(NO_BIND) _libbind= libbind @@ -71,7 +74,7 @@ .endif .if ${MACHINE_ARCH} != "powerpc" -_libdisk=libdisk +_libdisk= libdisk .endif .if defined(RELEASEDIR) || \ ==== //depot/projects/ia64/lib/libc/gmon/gmon.c#6 (text+ko) ==== @@ -35,7 +35,7 @@ static char sccsid[] = "@(#)gmon.c 8.1 (Berkeley) 6/4/93"; #endif #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/lib/libc/gmon/gmon.c,v 1.16 2002/09/17 01:48:50 peter Exp $"); +__FBSDID("$FreeBSD: src/lib/libc/gmon/gmon.c,v 1.17 2003/04/30 19:29:02 peter Exp $"); #include "namespace.h" #include <sys/param.h> @@ -53,7 +53,7 @@ #include "libc_private.h" -#if defined(__i386__) || defined(__sparc64__) +#if defined(__i386__) || defined(__sparc64__) || defined(__amd64__) extern char *minbrk asm (".minbrk"); #else extern char *minbrk asm ("minbrk"); ==== //depot/projects/ia64/lib/libc/stdlib/malloc.c#16 (text+ko) ==== @@ -9,7 +9,7 @@ */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/lib/libc/stdlib/malloc.c,v 1.74 2003/01/30 15:00:17 phk Exp $"); +__FBSDID("$FreeBSD: src/lib/libc/stdlib/malloc.c,v 1.75 2003/04/30 19:30:34 peter Exp $"); /* * Defining EXTRA_SANITY will enable extra checks which are related @@ -62,6 +62,10 @@ # define malloc_pageshift 13U # define malloc_minsize 16U # endif +# if defined(__amd64__) +# define malloc_pageshift 12U +# define malloc_minsize 16U +# endif # if !defined(__NETBSD_SYSCALLS) # define HAS_UTRACE # endif ==== //depot/projects/ia64/lib/libc/stdtime/strptime.c#9 (text+ko) ==== @@ -59,7 +59,7 @@ static char sccsid[] __unused = "@(#)strptime.c 0.1 (Powerdog) 94/03/27"; #endif /* !defined NOID */ #endif /* not lint */ -__FBSDID("$FreeBSD: src/lib/libc/stdtime/strptime.c,v 1.33 2003/04/05 05:46:43 mtm Exp $"); +__FBSDID("$FreeBSD: src/lib/libc/stdtime/strptime.c,v 1.34 2003/04/30 10:25:57 mtm Exp $"); #include "namespace.h" #include <time.h> @@ -518,14 +518,12 @@ struct tm * __restrict tm) { char *ret; - time_t t; int gmt; gmt = 0; - memset((void*)tm, 0, sizeof(struct tm)); ret = _strptime(buf, fmt, tm, &gmt); - if (ret) { - t = gmt ? timegm(tm) : mktime(tm); + if (ret && gmt) { + time_t t = timegm(tm); localtime_r(&t, tm); } ==== //depot/projects/ia64/lib/libc/xdr/xdr_float.c#4 (text+ko) ==== @@ -34,7 +34,7 @@ static char *sccsid = "@(#)xdr_float.c 2.1 88/07/29 4.0 RPCSRC"; #endif #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/lib/libc/xdr/xdr_float.c,v 1.11 2002/03/22 21:53:26 obrien Exp $"); +__FBSDID("$FreeBSD: src/lib/libc/xdr/xdr_float.c,v 1.12 2003/04/30 19:32:25 peter Exp $"); /* * xdr_float.c, Generic XDR routines implementation. @@ -64,7 +64,7 @@ #if defined(__m68k__) || defined(__sparc__) || defined(__i386__) || \ defined(__mips__) || defined(__ns32k__) || defined(__alpha__) || \ defined(__arm32__) || defined(__ppc__) || defined(__ia64__) || \ - defined(__arm26__) || defined(__sparc64__) + defined(__arm26__) || defined(__sparc64__) || defined(__amd64__) #include <machine/endian.h> #define IEEEFP #endif ==== //depot/projects/ia64/lib/libdisk/chunk.c#11 (text+ko) ==== @@ -8,7 +8,7 @@ */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/lib/libdisk/chunk.c,v 1.47 2003/01/10 19:25:38 jhb Exp $"); +__FBSDID("$FreeBSD: src/lib/libdisk/chunk.c,v 1.48 2003/04/30 21:03:16 peter Exp $"); #include <stdio.h> #include <stdlib.h> @@ -239,6 +239,7 @@ /* PLATFORM POLICY BEGIN ------------------------------------- */ switch(platform) { case p_i386: + case p_amd64: switch (type) { case fat: case mbr: @@ -317,7 +318,8 @@ if (platform == p_sparc64) { offset = Prev_Cyl_Aligned(d, offset); size = Next_Cyl_Aligned(d, size); - } else if (platform == p_i386 || platform == p_pc98) { + } else if (platform == p_i386 || platform == p_pc98 || + platform == p_amd64) { if (type != freebsd) break; if (!(flags & CHUNK_ALIGN)) ==== //depot/projects/ia64/lib/libdisk/create_chunk.c#14 (text+ko) ==== @@ -8,7 +8,7 @@ */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/lib/libdisk/create_chunk.c,v 1.80 2003/04/04 16:35:13 phk Exp $"); +__FBSDID("$FreeBSD: src/lib/libdisk/create_chunk.c,v 1.81 2003/04/30 21:03:16 peter Exp $"); #include <stdio.h> #include <stdlib.h> @@ -138,7 +138,7 @@ Fixup_Names(struct disk *d) { struct chunk *c1, *c2; -#if defined(__i386__) || defined(__ia64__) +#if defined(__i386__) || defined(__ia64__) || defined(__amd64__) struct chunk *c3; int j; #endif @@ -149,7 +149,7 @@ continue; if (strcmp(c2->name, "X")) continue; -#if defined(__i386__) || defined(__ia64__) +#if defined(__i386__) || defined(__ia64__) || defined(__amd64__) c2->oname = malloc(12); if (!c2->oname) return -1; ==== //depot/projects/ia64/lib/libdisk/disk.c#18 (text+ko) ==== @@ -8,7 +8,7 @@ */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/lib/libdisk/disk.c,v 1.114 2003/04/04 16:35:13 phk Exp $"); +__FBSDID("$FreeBSD: src/lib/libdisk/disk.c,v 1.116 2003/04/30 21:03:16 peter Exp $"); #include <stdio.h> #include <stdlib.h> @@ -41,6 +41,28 @@ #define DPRINTX(x) #endif +const enum platform platform = +#if defined (P_DEBUG) + P_DEBUG +#elif defined (PC98) + p_pc98 +#elif defined(__i386__) + p_i386 +#elif defined(__alpha__) + p_alpha +#elif defined(__sparc64__) + p_sparc64 +#elif defined(__ia64__) + p_ia64 +#elif defined(__ppc__) + p_ppc +#elif defined(__amd64__) + p_amd64 +#else + IHAVENOIDEA +#endif + ; + const char * chunk_name(chunk_e type) { @@ -371,7 +393,7 @@ #if defined(PC98) printf(" boot1=%p, boot2=%p, bootipl=%p, bootmenu=%p\n", d->boot1, d->boot2, d->bootipl, d->bootmenu); -#elif defined(__i386__) +#elif defined(__i386__) || defined(__amd64__) printf(" boot1=%p, boot2=%p, bootmgr=%p\n", d->boot1, d->boot2, d->bootmgr); #elif defined(__alpha__) @@ -407,7 +429,7 @@ if (d->boot1) free(d->boot1); #endif -#if defined(__i386__) +#if defined(__i386__) || defined(__amd64__) if (d->boot2) free(d->boot2); #endif @@ -536,7 +558,7 @@ int Set_Boot_Blocks(struct disk *d, const u_char *b1, const u_char *b2) { -#if defined(__i386__) +#if defined(__i386__) || defined(__amd64__) if (d->boot1) free(d->boot1); d->boot1 = malloc(512); ==== //depot/projects/ia64/lib/libdisk/libdisk.h#14 (text+ko) ==== @@ -6,7 +6,7 @@ * this stuff is worth it, you can buy me a beer in return. Poul-Henning Kamp * ---------------------------------------------------------------------------- * -* $FreeBSD: src/lib/libdisk/libdisk.h,v 1.55 2003/02/04 17:35:23 jhb Exp $ +* $FreeBSD: src/lib/libdisk/libdisk.h,v 1.57 2003/04/30 21:03:16 peter Exp $ * */ @@ -20,33 +20,17 @@ #define MAX_SEC_SIZE 2048 /* maximum sector size that is supported */ #define MIN_SEC_SIZE 512 /* the sector size to end sensing at */ -static const enum platform { +enum platform { p_any, /* for debugging ! */ p_alpha, p_i386, p_pc98, p_sparc64, p_ia64, - p_ppc -} platform = -#if defined (P_DEBUG) - P_DEBUG -#elif defined (PC98) - p_pc98 -#elif defined(__i386__) - p_i386 -#elif defined(__alpha__) - p_alpha -#elif defined(__sparc64__) - p_sparc64 -#elif defined(__ia64__) - p_ia64 -#elif defined(__ppc__) - p_ppc -#else - IHAVENOIDEA -#endif - ; + p_ppc, + p_amd64 +}; +extern const enum platform platform; typedef enum { whole, @@ -86,7 +70,7 @@ #if !defined(__ia64__) u_char *boot1; #endif -#if defined(__i386__) /* the i386 needs extra help... */ +#if defined(__i386__) || defined(__amd64__) /* the i386 needs extra help... */ u_char *boot2; #endif struct chunk *chunks; ==== //depot/projects/ia64/lib/libdisk/rules.c#10 (text+ko) ==== @@ -8,7 +8,7 @@ */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/lib/libdisk/rules.c,v 1.30 2003/04/23 12:15:31 phk Exp $"); +__FBSDID("$FreeBSD: src/lib/libdisk/rules.c,v 1.31 2003/04/30 21:03:16 peter Exp $"); #include <stdio.h> #include <stdlib.h> @@ -242,6 +242,7 @@ switch (platform) { case p_i386: + case p_amd64: Rule_000(d, c, msg); Rule_001(d, c, msg); Rule_002(d, c, msg); ==== //depot/projects/ia64/lib/libncurses/Makefile#14 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/lib/libncurses/Makefile,v 1.68 2003/04/18 13:01:07 ru Exp $ +# $FreeBSD: src/lib/libncurses/Makefile,v 1.69 2003/04/30 15:49:40 obrien Exp $ NCURSES=${.CURDIR}/../../contrib/ncurses @@ -410,7 +410,7 @@ CLEANFILES+=${page:T:S/x$//g} MAN+=${page:T:S/x$//g} ${page:T:S/x$//g}: ${page} - ln -s ${.ALLSRC} ${.TARGET} + ln -sf ${.ALLSRC} ${.TARGET} .endfor MLINKS+=ncurses.3 curses.3 ==== //depot/projects/ia64/lib/libpam/modules/pam_chroot/pam_chroot.c#3 (text+ko) ==== @@ -33,7 +33,7 @@ */ >>> TRUNCATED FOR MAIL (1000 lines) <<<
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200304302339.h3UNd2Qx067968>