Date: Mon, 19 May 2003 14:46:55 -0700 (PDT) From: Peter Wemm <peter@FreeBSD.org> To: Perforce Change Reviews <perforce@freebsd.org> Subject: PERFORCE change 31481 for review Message-ID: <200305192146.h4JLkt8m036883@repoman.freebsd.org>
next in thread | raw e-mail | index | archive | help
http://perforce.freebsd.org/chv.cgi?CH=31481 Change 31481 by peter@peter_daintree on 2003/05/19 14:46:30 IFC @31479 Affected files ... .. //depot/projects/hammer/Makefile.inc1#16 integrate .. //depot/projects/hammer/bin/chflags/chflags.1#3 integrate .. //depot/projects/hammer/bin/ed/Makefile#2 integrate .. //depot/projects/hammer/bin/pwd/pwd.1#3 integrate .. //depot/projects/hammer/bin/sh/sh.1#6 integrate .. //depot/projects/hammer/contrib/groff/tmac/doc.tmac#4 integrate .. //depot/projects/hammer/etc/rc.d/Makefile#8 integrate .. //depot/projects/hammer/etc/rc.d/ldconfig#5 integrate .. //depot/projects/hammer/games/caesar/caesar.6#3 integrate .. //depot/projects/hammer/games/factor/Makefile#3 integrate .. //depot/projects/hammer/games/grdc/grdc.6#4 integrate .. //depot/projects/hammer/lib/Makefile#13 integrate .. //depot/projects/hammer/lib/libc/gen/dlinfo.3#3 integrate .. //depot/projects/hammer/lib/libc/gen/getfsent.3#3 integrate .. //depot/projects/hammer/lib/libc/i386/sys/i386_vm86.2#4 integrate .. //depot/projects/hammer/lib/libc/ia64/sys/brk.S#3 integrate .. //depot/projects/hammer/lib/libc/ia64/sys/pipe.S#3 integrate .. //depot/projects/hammer/lib/libc/ia64/sys/sbrk.S#4 integrate .. //depot/projects/hammer/lib/libc/net/nsdispatch.3#4 integrate .. //depot/projects/hammer/lib/libc/rpc/svc_generic.c#2 integrate .. //depot/projects/hammer/lib/libcrypt/Makefile#2 integrate .. //depot/projects/hammer/lib/libfetch/Makefile#7 integrate .. //depot/projects/hammer/lib/libgeom/Makefile#3 integrate .. //depot/projects/hammer/lib/libkvm/kvm_ia64.c#3 integrate .. //depot/projects/hammer/lib/libpam/modules/modules.inc#8 integrate .. //depot/projects/hammer/lib/libpthread/sys/lock.c#3 integrate .. //depot/projects/hammer/lib/libpthread/sys/lock.h#3 integrate .. //depot/projects/hammer/lib/libpthread/thread/thr_cond.c#5 integrate .. //depot/projects/hammer/lib/libpthread/thread/thr_exit.c#4 integrate .. //depot/projects/hammer/lib/libpthread/thread/thr_init.c#6 integrate .. //depot/projects/hammer/lib/libpthread/thread/thr_join.c#4 integrate .. //depot/projects/hammer/lib/libpthread/thread/thr_kern.c#9 integrate .. //depot/projects/hammer/lib/libpthread/thread/thr_mutex.c#4 integrate .. //depot/projects/hammer/lib/libpthread/thread/thr_nanosleep.c#4 integrate .. //depot/projects/hammer/lib/libpthread/thread/thr_private.h#8 integrate .. //depot/projects/hammer/lib/libpthread/thread/thr_sig.c#7 integrate .. //depot/projects/hammer/lib/libpthread/thread/thr_sigsuspend.c#4 integrate .. //depot/projects/hammer/lib/libpthread/thread/thr_sigwait.c#5 integrate .. //depot/projects/hammer/lib/libpthread/thread/thr_yield.c#4 integrate .. //depot/projects/hammer/libexec/Makefile#15 integrate .. //depot/projects/hammer/libexec/ftpd/ftpd.8#5 integrate .. //depot/projects/hammer/libexec/rtld-elf/libmap.c#4 integrate .. //depot/projects/hammer/libexec/rtld-elf/rtld.1#4 integrate .. //depot/projects/hammer/release/Makefile#18 integrate .. //depot/projects/hammer/release/alpha/dokern.sh#8 integrate .. //depot/projects/hammer/release/alpha/drivers.conf#9 integrate .. //depot/projects/hammer/release/alpha/fixit_crunch.conf#4 integrate .. //depot/projects/hammer/release/doc/en_US.ISO8859-1/hardware/common/dev.sgml#19 integrate .. //depot/projects/hammer/release/doc/en_US.ISO8859-1/relnotes/common/new.sgml#24 integrate .. //depot/projects/hammer/release/i386/dokern.sh#12 integrate .. //depot/projects/hammer/release/i386/fixit_crunch.conf#4 integrate .. //depot/projects/hammer/release/ia64/doFS.sh#4 integrate .. //depot/projects/hammer/release/pc98/dokern.sh#9 integrate .. //depot/projects/hammer/release/pc98/fixit-small_crunch.conf#3 integrate .. //depot/projects/hammer/release/pc98/fixit_crunch.conf#4 integrate .. //depot/projects/hammer/release/scripts/doFS.sh#10 integrate .. //depot/projects/hammer/release/sparc64/mkisoimages.sh#2 integrate .. //depot/projects/hammer/sbin/Makefile#7 integrate .. //depot/projects/hammer/sbin/bsdlabel/Makefile#6 integrate .. //depot/projects/hammer/sbin/devd/devd.8#6 integrate .. //depot/projects/hammer/sbin/disklabel/disklabel.8#7 integrate .. //depot/projects/hammer/sbin/gbde/Makefile#6 integrate .. //depot/projects/hammer/sbin/mdmfs/mdmfs.8#7 integrate .. //depot/projects/hammer/sbin/mount/mount.8#5 integrate .. //depot/projects/hammer/sbin/mount_nfs/mount_nfs.8#6 integrate .. //depot/projects/hammer/sbin/raidctl/raidctl.8#3 integrate .. //depot/projects/hammer/sbin/routed/rtquery/rtquery.8#3 integrate .. //depot/projects/hammer/sbin/sunlabel/Makefile#6 integrate .. //depot/projects/hammer/sbin/sysctl/sysctl.8#2 integrate .. //depot/projects/hammer/sbin/umount/umount.8#4 integrate .. //depot/projects/hammer/sbin/vinum/vinum.8#5 integrate .. //depot/projects/hammer/share/examples/etc/make.conf#10 integrate .. //depot/projects/hammer/share/man/man4/Makefile#13 integrate .. //depot/projects/hammer/share/man/man4/acpi.4#6 integrate .. //depot/projects/hammer/share/man/man4/ehci.4#1 branch .. //depot/projects/hammer/share/man/man4/man4.i386/cx.4#3 integrate .. //depot/projects/hammer/share/man/man4/my.4#1 branch .. //depot/projects/hammer/share/man/man5/make.conf.5#8 integrate .. //depot/projects/hammer/share/man/man5/rc.conf.5#10 integrate .. //depot/projects/hammer/share/man/man9/KASSERT.9#2 integrate .. //depot/projects/hammer/share/man/man9/byteorder.9#3 integrate .. //depot/projects/hammer/share/man/man9/mbuf.9#5 integrate .. //depot/projects/hammer/share/man/man9/signal.9#3 integrate .. //depot/projects/hammer/share/mk/bsd.README#4 integrate .. //depot/projects/hammer/sys/alpha/conf/GENERIC#9 integrate .. //depot/projects/hammer/sys/alpha/include/_limits.h#5 integrate .. //depot/projects/hammer/sys/alpha/include/limits.h#4 integrate .. //depot/projects/hammer/sys/amd64/amd64/machdep.c#38 integrate .. //depot/projects/hammer/sys/amd64/include/_limits.h#4 integrate .. //depot/projects/hammer/sys/amd64/include/limits.h#3 integrate .. //depot/projects/hammer/sys/arm/include/_limits.h#4 integrate .. //depot/projects/hammer/sys/arm/include/limits.h#4 integrate .. //depot/projects/hammer/sys/boot/common/loader.8#6 integrate .. //depot/projects/hammer/sys/boot/i386/libi386/amd64_tramp.S#5 integrate .. //depot/projects/hammer/sys/conf/Makefile.ia64#5 integrate .. //depot/projects/hammer/sys/conf/files.ia64#9 integrate .. //depot/projects/hammer/sys/conf/options#15 integrate .. //depot/projects/hammer/sys/conf/options.ia64#7 integrate .. //depot/projects/hammer/sys/dev/ata/ata-all.c#11 integrate .. //depot/projects/hammer/sys/dev/ata/ata-chipset.c#11 integrate .. //depot/projects/hammer/sys/dev/ata/ata-disk.c#8 integrate .. //depot/projects/hammer/sys/dev/ata/ata-pci.h#8 integrate .. //depot/projects/hammer/sys/dev/usb/ugen.c#4 integrate .. //depot/projects/hammer/sys/dev/vinum/vinumio.c#8 integrate .. //depot/projects/hammer/sys/i386/conf/GENERIC#11 integrate .. //depot/projects/hammer/sys/i386/include/_limits.h#4 integrate .. //depot/projects/hammer/sys/i386/include/limits.h#4 integrate .. //depot/projects/hammer/sys/ia64/ia32/ia32_sysvec.c#3 integrate .. //depot/projects/hammer/sys/ia64/ia32/ia32_util.h#3 integrate .. //depot/projects/hammer/sys/ia64/ia64/db_interface.c#2 integrate .. //depot/projects/hammer/sys/ia64/ia64/db_trace.c#5 integrate .. //depot/projects/hammer/sys/ia64/ia64/elf_machdep.c#6 integrate .. //depot/projects/hammer/sys/ia64/ia64/exception.s#8 integrate .. //depot/projects/hammer/sys/ia64/ia64/genassym.c#4 integrate .. //depot/projects/hammer/sys/ia64/ia64/interrupt.c#6 integrate .. //depot/projects/hammer/sys/ia64/ia64/locore.s#7 integrate .. //depot/projects/hammer/sys/ia64/ia64/machdep.c#13 integrate .. //depot/projects/hammer/sys/ia64/ia64/mp_machdep.c#6 integrate .. //depot/projects/hammer/sys/ia64/ia64/pmap.c#11 integrate .. //depot/projects/hammer/sys/ia64/ia64/support.s#3 integrate .. //depot/projects/hammer/sys/ia64/ia64/swtch.s#4 delete .. //depot/projects/hammer/sys/ia64/ia64/trap.c#9 integrate .. //depot/projects/hammer/sys/ia64/ia64/unaligned.c#2 integrate .. //depot/projects/hammer/sys/ia64/ia64/unwind.c#3 integrate .. //depot/projects/hammer/sys/ia64/ia64/vm_machdep.c#6 integrate .. //depot/projects/hammer/sys/ia64/include/_limits.h#4 integrate .. //depot/projects/hammer/sys/ia64/include/asm.h#3 integrate .. //depot/projects/hammer/sys/ia64/include/cpu.h#4 integrate .. //depot/projects/hammer/sys/ia64/include/db_machdep.h#2 integrate .. //depot/projects/hammer/sys/ia64/include/frame.h#2 integrate .. //depot/projects/hammer/sys/ia64/include/limits.h#4 integrate .. //depot/projects/hammer/sys/ia64/include/pcb.h#4 integrate .. //depot/projects/hammer/sys/ia64/include/pmap.h#6 integrate .. //depot/projects/hammer/sys/ia64/include/proc.h#2 integrate .. //depot/projects/hammer/sys/ia64/include/reg.h#4 integrate .. //depot/projects/hammer/sys/ia64/include/rse.h#2 delete .. //depot/projects/hammer/sys/ia64/include/signal.h#6 integrate .. //depot/projects/hammer/sys/ia64/include/smp.h#2 integrate .. //depot/projects/hammer/sys/ia64/include/ucontext.h#2 integrate .. //depot/projects/hammer/sys/ia64/include/unwind.h#3 integrate .. //depot/projects/hammer/sys/ia64/include/vmparam.h#3 integrate .. //depot/projects/hammer/sys/kern/kern_synch.c#17 integrate .. //depot/projects/hammer/sys/kern/kern_thr.c#7 integrate .. //depot/projects/hammer/sys/kern/kern_thread.c#25 integrate .. //depot/projects/hammer/sys/powerpc/include/_limits.h#4 integrate .. //depot/projects/hammer/sys/powerpc/include/limits.h#4 integrate .. //depot/projects/hammer/sys/sparc64/include/_limits.h#4 integrate .. //depot/projects/hammer/sys/sparc64/include/limits.h#4 integrate .. //depot/projects/hammer/sys/sys/ata.h#5 integrate .. //depot/projects/hammer/sys/sys/limits.h#5 integrate .. //depot/projects/hammer/sys/sys/mutex.h#4 integrate .. //depot/projects/hammer/sys/sys/proc.h#23 integrate .. //depot/projects/hammer/sys/ufs/ffs/ffs_rawread.c#4 integrate .. //depot/projects/hammer/sys/vm/vm_object.c#20 integrate .. //depot/projects/hammer/sys/vm/vm_object.h#9 integrate .. //depot/projects/hammer/sys/vm/vm_pageout.c#16 integrate .. //depot/projects/hammer/tools/make_libdeps.sh#3 integrate .. //depot/projects/hammer/tools/tools/tinderbox/tbmaster.1#2 integrate .. //depot/projects/hammer/tools/tools/tinderbox/tbmaster.pl#7 integrate .. //depot/projects/hammer/tools/tools/tinderbox/tinderbox.1#2 integrate .. //depot/projects/hammer/tools/tools/tinderbox/tinderbox.pl#4 integrate .. //depot/projects/hammer/tools/tools/tinderbox/www/Makefile#2 integrate .. //depot/projects/hammer/tools/tools/tinderbox/www/index.cgi#2 integrate .. //depot/projects/hammer/usr.bin/Makefile#14 integrate .. //depot/projects/hammer/usr.bin/fetch/Makefile#4 integrate .. //depot/projects/hammer/usr.bin/fetch/fetch.1#3 integrate .. //depot/projects/hammer/usr.bin/truss/ia64-fbsd.c#3 integrate .. //depot/projects/hammer/usr.sbin/burncd/burncd.8#5 integrate .. //depot/projects/hammer/usr.sbin/pkg_install/Makefile#3 integrate .. //depot/projects/hammer/usr.sbin/pkg_install/add/Makefile#2 integrate .. //depot/projects/hammer/usr.sbin/pkg_install/create/Makefile#3 integrate .. //depot/projects/hammer/usr.sbin/pkg_install/delete/Makefile#4 integrate .. //depot/projects/hammer/usr.sbin/pkg_install/info/Makefile#2 integrate .. //depot/projects/hammer/usr.sbin/pkg_install/info/pkg_info.1#4 integrate .. //depot/projects/hammer/usr.sbin/pkg_install/version/Makefile#2 integrate .. //depot/projects/hammer/usr.sbin/ppp/Makefile#2 integrate .. //depot/projects/hammer/usr.sbin/pppd/Makefile#3 integrate .. //depot/projects/hammer/usr.sbin/sendmail/Makefile#4 integrate .. //depot/projects/hammer/usr.sbin/syslogd/Makefile#3 integrate .. //depot/projects/hammer/usr.sbin/syslogd/syslogd.c#9 integrate .. //depot/projects/hammer/usr.sbin/tcpdump/tcpdump/Makefile#2 integrate Differences ... ==== //depot/projects/hammer/Makefile.inc1#16 (text+ko) ==== @@ -1,5 +1,5 @@ # -# $FreeBSD: src/Makefile.inc1,v 1.357 2003/05/15 17:59:32 ru Exp $ +# $FreeBSD: src/Makefile.inc1,v 1.361 2003/05/19 15:51:58 des Exp $ # # Make command line options: # -DNO_KERBEROS Do not build Heimdal (Kerberos 5) @@ -8,7 +8,6 @@ # -DNOCRYPT will prevent building of crypt versions # -DNOMAN do not build the manual pages # -DNOPROFILE do not build profiled libraries -# -DNOSECURE do not go into secure subdir # -DNOGAMES do not go into games subdir # -DNOSHARE do not go into share subdir # -DNOINFO do not make or install info files @@ -70,7 +69,7 @@ .if exists(${.CURDIR}/sbin) SUBDIR+= sbin .endif -.if exists(${.CURDIR}/secure) && !defined(NOCRYPT) && !defined(NOSECURE) +.if exists(${.CURDIR}/secure) && !defined(NOCRYPT) SUBDIR+= secure .endif .if exists(${.CURDIR}/share) && !defined(NOSHARE) @@ -284,6 +283,8 @@ usr/libexec usr/share/misc mkdir -p ${WORLDTMP}/${_dir} .endfor + mtree -deU -f ${.CURDIR}/etc/mtree/BSD.include.dist \ + -p ${WORLDTMP}/usr/include ln -sf ${.CURDIR}/sys ${WORLDTMP} _legacy: @echo @@ -789,7 +790,8 @@ _generic_libs+= kerberos5/lib .endif -_prebuild_libs+= lib/libcom_err lib/libcrypt lib/libkvm lib/libmd \ +_prebuild_libs+= lib/libcom_err lib/libcrypt lib/libexpat \ + lib/libkvm lib/libmd \ lib/libncurses lib/libopie lib/libpam lib/libradius \ lib/librpcsvc \ lib/libsbuf lib/libtacplus lib/libutil lib/libypclnt \ @@ -800,7 +802,7 @@ _generic_libs+= lib -.if !defined(NOCRYPT) && !defined(NOSECURE) +.if !defined(NOCRYPT) .if !defined(NO_OPENSSL) _prebuild_libs+= secure/lib/libcrypto secure/lib/libssl .if !defined(NO_OPENSSH) ==== //depot/projects/hammer/bin/chflags/chflags.1#3 (text+ko) ==== @@ -33,9 +33,9 @@ .\" SUCH DAMAGE. .\" .\" @(#)chflags.1 8.4 (Berkeley) 5/2/95 -.\" $FreeBSD: src/bin/chflags/chflags.1,v 1.16 2003/03/24 20:15:58 johan Exp $ +.\" $FreeBSD: src/bin/chflags/chflags.1,v 1.17 2003/05/16 21:18:01 ru Exp $ .\" -.Dd Mar 24, 2003 +.Dd March 24, 2003 .Dt CHFLAGS 1 .Os .Sh NAME ==== //depot/projects/hammer/bin/ed/Makefile#2 (text+ko) ==== @@ -1,11 +1,11 @@ -# $FreeBSD: src/bin/ed/Makefile,v 1.21 2001/12/06 10:50:23 ru Exp $ +# $FreeBSD: src/bin/ed/Makefile,v 1.22 2003/05/19 15:51:58 des Exp $ PROG= ed SRCS= buf.c cbc.c glbl.c io.c main.c re.c sub.c undo.c LINKS= ${BINDIR}/ed ${BINDIR}/red MLINKS= ed.1 red.1 -.if exists(${.CURDIR}/../../secure) && !defined(NOCRYPT) && !defined(NOSECURE) +.if exists(${.CURDIR}/../../secure) && !defined(NOCRYPT) DISTRIBUTION=crypto CFLAGS+=-DDES DPADD= ${LIBCIPHER} ==== //depot/projects/hammer/bin/pwd/pwd.1#3 (text+ko) ==== @@ -33,7 +33,7 @@ .\" SUCH DAMAGE. .\" .\" @(#)pwd.1 8.2 (Berkeley) 4/28/95 -.\" $FreeBSD: src/bin/pwd/pwd.1,v 1.21 2003/04/12 03:22:54 tjr Exp $ +.\" $FreeBSD: src/bin/pwd/pwd.1,v 1.22 2003/05/16 21:19:32 ru Exp $ .\" .Dd April 12, 2003 .Dt PWD 1 @@ -43,7 +43,7 @@ .Nd return working directory name .Sh SYNOPSIS .Nm -.Oo Fl L | Fl P Oc +.Op Fl L | P .Sh DESCRIPTION The .Nm ==== //depot/projects/hammer/bin/sh/sh.1#6 (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.86 2003/04/30 19:18:50 schweikh Exp $ +.\" $FreeBSD: src/bin/sh/sh.1,v 1.87 2003/05/16 21:19:32 ru Exp $ .\" .Dd April 12, 2003 .Dt SH 1 @@ -1295,7 +1295,7 @@ List or alter key bindings for the line editor. This command is documented in .Xr editrc 5 . -.It Ic cd Oo Fl L | Fl P Oc Op Ar directory +.It Ic cd Oo Fl L | P Oc Op Ar directory Switch to the specified .Ar directory , or to the directory specified in the @@ -1626,7 +1626,7 @@ If the .Fl s option is specified, only the PIDs of the jobs are printed, one per line. -.It Ic pwd Oo Fl L | Fl P Oc +.It Ic pwd Op Fl L | P Print the path of the current directory. The built-in command may differ from the program of the same name because the built-in command remembers what the current directory ==== //depot/projects/hammer/contrib/groff/tmac/doc.tmac#4 (text+ko) ==== @@ -3959,15 +3959,16 @@ . ti -\n[doc-reg-dtl]u . . nh -. ie (\n[dl]u > \n[doc-list-indent-stack\n[doc-list-depth]]u) \{\ -. doc-item-box\n[doc-list-depth] +. doc-item-box\n[doc-list-depth] +. ie (\n[dl]u > \n[doc-list-indent-stack\n[doc-list-depth]]u) \ . br -. \} . el \{\ -. chop doc-item-box\n[doc-list-depth] -. \" Using \Z prevents stretching of the spaces in the tag -. nop \Z'\*[doc-item-box\n[doc-list-depth]]'\c -. nop \h'\n[doc-reg-dtl]u'\c +. \" format the tag separately to prevent stretching of spaces +. vpt 0 +. br +. sp -1 +. vpt 1 +. nop \&\c . nr doc-have-space 1 . \} . ==== //depot/projects/hammer/etc/rc.d/Makefile#8 (text+ko) ==== @@ -1,5 +1,5 @@ # $NetBSD: Makefile,v 1.16 2001/01/14 15:37:22 minoura Exp $ -# $FreeBSD: src/etc/rc.d/Makefile,v 1.15 2003/04/24 08:20:47 mtm Exp $ +# $FreeBSD: src/etc/rc.d/Makefile,v 1.16 2003/05/18 03:34:24 mtm Exp $ .include <bsd.own.mk> @@ -7,7 +7,7 @@ apm apmd atm1 atm2.sh atm3.sh archdep bgfsck bootparams ccd cleanvar \ cleartmp cron devd devdb devfs dhclient diskless dmesg dumpon fsck \ hostname inetd initdiskless initrandom ip6fw ipfilter ipfs ipfw ipmon \ - ipnat ipsec ipxrouted isdnd jail kadmind kerberos keyserv kldxref \ + ipnat ipsec ipxrouted isdnd jail kadmind kerberos keyserv kldxref kpasswdd \ ldconfig local localdaemons lomac lpd motd mountcritlocal mountcritremote \ mountd moused mroute6d mrouted msgs named netif network1 network2 network3 \ network_ipv6 nfsclient nfsd nfslocking nfsserver nisdomain ntpd \ ==== //depot/projects/hammer/etc/rc.d/ldconfig#5 (text+ko) ==== @@ -1,7 +1,7 @@ #!/bin/sh # # $NetBSD: ldconfig,v 1.5 2002/03/22 04:33:58 thorpej Exp $ -# $FreeBSD: src/etc/rc.d/ldconfig,v 1.5 2003/04/30 07:12:09 mtm Exp $ +# $FreeBSD: src/etc/rc.d/ldconfig,v 1.6 2003/05/18 03:39:39 mtm Exp $ # # PROVIDE: ldconfig @@ -20,8 +20,9 @@ { case ${OSTYPE} in FreeBSD) + _ins= ldconfig=${ldconfig_command} - checkyesno ldconfig_insecure && ldconfig="${ldconfig} -i" + checkyesno ldconfig_insecure && _ins="-i" if [ -x "${ldconfig_command}" ]; then _LDC=/usr/lib for i in ${ldconfig_paths}; do @@ -30,7 +31,7 @@ fi done echo 'ELF ldconfig path:' ${_LDC} - ${ldconfig} -elf ${_LDC} + ${ldconfig} -elf ${_ins} ${_LDC} # Legacy aout support for i386 only case `sysctl -n hw.machine_arch` in @@ -44,7 +45,7 @@ fi done echo 'a.out ldconfig path:' ${_LDC} - ${ldconfig} -aout ${_LDC} + ${ldconfig} -aout ${_ins} ${_LDC} ;; esac fi ==== //depot/projects/hammer/games/caesar/caesar.6#3 (text+ko) ==== @@ -30,13 +30,13 @@ .\" SUCH DAMAGE. .\" .\" @(#)caesar.6 8.2 (Berkeley) 11/16/93 -.\" $FreeBSD: src/games/caesar/caesar.6,v 1.8 2003/03/24 11:18:30 tjr Exp $ +.\" $FreeBSD: src/games/caesar/caesar.6,v 1.9 2003/05/16 21:26:39 ru Exp $ .\" .Dd November 16, 1993 .Dt CAESAR 6 .Os .Sh NAME -.Nm caesar +.Nm caesar , rot13 .Nd decrypt caesar ciphers .Sh SYNOPSIS .Nm ==== //depot/projects/hammer/games/factor/Makefile#3 (text+ko) ==== @@ -1,11 +1,11 @@ # @(#)Makefile 8.1 (Berkeley) 5/31/93 -# $FreeBSD: src/games/factor/Makefile,v 1.5 2002/10/09 19:55:04 fanf Exp $ +# $FreeBSD: src/games/factor/Makefile,v 1.6 2003/05/19 15:52:50 des Exp $ PROG= factor SRCS= factor.c pr_tbl.c CFLAGS+=-I${.CURDIR}/../primes -.if exists(${.CURDIR}/../../crypto) && !defined(NO_OPENSSL) +.if exists(${.CURDIR}/../../crypto) && !defined(NOCRYPT) && !defined(NO_OPENSSL) CFLAGS+=-DHAVE_OPENSSL LDADD+= -lcrypto DPADD+= ${LIBCRYPTO} ==== //depot/projects/hammer/games/grdc/grdc.6#4 (text+ko) ==== @@ -1,4 +1,4 @@ -.\" $FreeBSD: src/games/grdc/grdc.6,v 1.5 2003/03/28 16:37:45 mux Exp $ +.\" $FreeBSD: src/games/grdc/grdc.6,v 1.6 2003/05/16 21:27:23 ru Exp $ .Dd September 25, 2001 .Dt GRDC 6 .Os @@ -7,8 +7,7 @@ .Nd grand digital clock (curses) .Sh SYNOPSIS .Nm -.Op Fl s -.Op Fl t +.Op Fl st .Op Ar n .Sh DESCRIPTION .Nm ==== //depot/projects/hammer/lib/Makefile#13 (text+ko) ==== @@ -1,5 +1,5 @@ # @(#)Makefile 8.1 (Berkeley) 6/4/93 -# $FreeBSD: src/lib/Makefile,v 1.156 2003/05/05 07:58:42 markm Exp $ +# $FreeBSD: src/lib/Makefile,v 1.157 2003/05/19 15:51:59 des Exp $ # To satisfy shared library or ELF linkage when only the libraries being # built are visible: @@ -79,13 +79,11 @@ .if defined(RELEASEDIR) || \ (!exists(${.CURDIR}/../secure) && !exists(${.CURDIR}/../kerberos5)) || \ - defined(NOCRYPT) || defined(NO_OPENSSL) || \ - (defined(NOSECURE) && defined(NO_KERBEROS)) + defined(NOCRYPT) || defined(NO_OPENSSL) || defined(NO_KERBEROS) _libtelnet= libtelnet .endif -.if exists(${.CURDIR}/../crypto) && !defined(NOCRYPT) && !defined(NO_OPENSSL) \ - && !defined(NOSECURE) +.if exists(${.CURDIR}/../crypto) && !defined(NOCRYPT) && !defined(NO_OPENSSL) _libmp= libmp .endif ==== //depot/projects/hammer/lib/libc/gen/dlinfo.3#3 (text+ko) ==== @@ -23,7 +23,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $FreeBSD: src/lib/libc/gen/dlinfo.3,v 1.4 2003/03/24 16:07:19 charnier Exp $ +.\" $FreeBSD: src/lib/libc/gen/dlinfo.3,v 1.5 2003/05/18 21:05:21 ru Exp $ .\" .Dd February 14, 2003 .Os @@ -195,7 +195,7 @@ dlinfo(RTLD_SELF, RTLD_DI_LINKMAP, &map); while (map != NULL) { - printf("%p: %s\n", map->l_addr, map->l_name); + printf("%p: %s\\n", map->l_addr, map->l_name); map = map->l_next; } .Ed @@ -227,7 +227,7 @@ path = &info->dls_serpath[0]; for (cnt = 1; cnt <= info->dls_cnt; cnt++, path++) { - (void) printf("%2d: %s\n", cnt, path->dls_name); + (void) printf("%2d: %s\\n", cnt, path->dls_name); } .Ed .Sh RETURN VALUES ==== //depot/projects/hammer/lib/libc/gen/getfsent.3#3 (text+ko) ==== @@ -30,7 +30,7 @@ .\" SUCH DAMAGE. .\" .\" @(#)getfsent.3 8.1 (Berkeley) 6/4/93 -.\" $FreeBSD: src/lib/libc/gen/getfsent.3,v 1.12 2003/04/07 22:59:12 mdodd Exp $ +.\" $FreeBSD: src/lib/libc/gen/getfsent.3,v 1.13 2003/05/18 21:05:21 ru Exp $ .\" .Dd April 7, 2003 .Dt GETFSENT 3 @@ -182,7 +182,7 @@ and .Fn getfstab functions appeared in -.Fx 5.1. +.Fx 5.1 . .Sh BUGS These functions use static data storage; if the data is needed for future use, it should be ==== //depot/projects/hammer/lib/libc/i386/sys/i386_vm86.2#4 (text+ko) ==== @@ -22,7 +22,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $FreeBSD: src/lib/libc/i386/sys/i386_vm86.2,v 1.13 2003/04/29 08:35:28 mdodd Exp $ +.\" $FreeBSD: src/lib/libc/i386/sys/i386_vm86.2,v 1.14 2003/05/18 21:05:21 ru Exp $ .\" .Dd July 27, 1998 .Os @@ -110,7 +110,7 @@ .Pp .Fa state will contain the state of the VME flag on return. -\" .It Dv VM86_SET_VME +.\" .It Dv VM86_SET_VME .El .Pp vm86 mode is entered by calling ==== //depot/projects/hammer/lib/libc/ia64/sys/brk.S#3 (text+ko) ==== @@ -28,7 +28,7 @@ */ #include <machine/asm.h> -__FBSDID("$FreeBSD: src/lib/libc/ia64/sys/brk.S,v 1.3 2003/03/03 01:09:46 obrien Exp $"); +__FBSDID("$FreeBSD: src/lib/libc/ia64/sys/brk.S,v 1.4 2003/05/16 21:26:39 marcel Exp $"); #include "SYS.h" @@ -44,12 +44,14 @@ add r14=@ltoff(minbrk),gp ;; ld8 r14=[r14] ;; ld8 r14=[r14] ;; - cmp.ltu p6,p0=in0,r14 ;; -(p6) mov in0=r14 + cmp.ltu p6,p0=r32,r14 ;; +(p6) mov r32=r14 ;; + st8 [sp]=r32 CALLSYS_ERROR(break) + ld8 r15=[sp] add r14=@ltoff(curbrk),gp ;; ld8 r14=[r14] ;; - st8 [r14]=in0 + st8 [r14]=r15 mov ret0=0 br.ret.sptk.few rp END(brk) ==== //depot/projects/hammer/lib/libc/ia64/sys/pipe.S#3 (text+ko) ==== @@ -28,14 +28,20 @@ */ #include <machine/asm.h> -__FBSDID("$FreeBSD: src/lib/libc/ia64/sys/pipe.S,v 1.3 2003/03/03 01:09:46 obrien Exp $"); +__FBSDID("$FreeBSD: src/lib/libc/ia64/sys/pipe.S,v 1.4 2003/05/16 21:26:39 marcel Exp $"); #include "SYS.h" -SYSCALL(pipe) - .regstk 1,0,0,0 - st4 [in0]=ret0,4 ;; - st4 [in0]=ret1 - mov ret0=0 +ENTRY(__sys_pipe, 1) + WEAK_ALIAS(pipe, __sys_pipe) + WEAK_ALIAS(_pipe, __sys_pipe) + st8 [sp]=r32 + CALLSYS_ERROR(pipe) + ld8 r14=[sp] + ;; + st4 [r14]=ret0,4 + ;; + st4 [r14]=ret1 + mov ret0=0 br.ret.sptk.few rp -END(pipe) +END(__sys_pipe) ==== //depot/projects/hammer/lib/libc/ia64/sys/sbrk.S#4 (text+ko) ==== @@ -28,7 +28,7 @@ */ #include <machine/asm.h> -__FBSDID("$FreeBSD: src/lib/libc/ia64/sys/sbrk.S,v 1.4 2003/03/03 01:09:46 obrien Exp $"); +__FBSDID("$FreeBSD: src/lib/libc/ia64/sys/sbrk.S,v 1.5 2003/05/16 21:26:39 marcel Exp $"); #include "SYS.h" @@ -43,18 +43,21 @@ add r14 = @ltoff(curbrk), gp ;; ld8 r14 = [r14] - cmp.eq p6, p0 = in0, r0 + cmp.eq p6, p0 = r32, r0 ;; ld8 ret0 = [r14] (p6) br.ret.sptk.few rp ;; - add in0 = ret0, in0 + add r32 = ret0, r32 + ;; + st8 [sp] = r32 CALLSYS_ERROR(break) + ld8 r15 = [sp] add r14 = @ltoff(curbrk), gp ;; ld8 r14 = [r14] ;; ld8 ret0 = [r14] - st8 [r14] = in0 + st8 [r14] = r15 br.ret.sptk.few rp END(sbrk) ==== //depot/projects/hammer/lib/libc/net/nsdispatch.3#4 (text+ko) ==== @@ -1,5 +1,5 @@ .\" $NetBSD: nsdispatch.3,v 1.8 1999/03/22 19:44:53 garbled Exp $ -.\" $FreeBSD: src/lib/libc/net/nsdispatch.3,v 1.9 2003/04/17 14:14:22 nectar Exp $ +.\" $FreeBSD: src/lib/libc/net/nsdispatch.3,v 1.10 2003/05/18 21:05:21 ru Exp $ .\" .\" Copyright (c) 1997, 1998, 1999 The NetBSD Foundation, Inc. .\" All rights reserved. @@ -238,7 +238,8 @@ "nsswitch.conf\*(lp4\*(rp" manual pages. The -.Fx Project +.Fx +Project added the support for threads and NSS modules, and normalized the uses of .Fn nsdispatch ==== //depot/projects/hammer/lib/libc/rpc/svc_generic.c#2 (text+ko) ==== @@ -39,7 +39,7 @@ static char sccsid[] = "@(#)svc_generic.c 1.21 89/02/28 Copyr 1988 Sun Micro"; #endif #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/lib/libc/rpc/svc_generic.c,v 1.4 2002/03/22 23:18:37 obrien Exp $"); +__FBSDID("$FreeBSD: src/lib/libc/rpc/svc_generic.c,v 1.5 2003/05/18 15:07:25 mbr Exp $"); /* * svc_generic.c, Server side for RPC. @@ -245,7 +245,7 @@ _listen(fd, SOMAXCONN); } else { if (_bind(fd, - (struct sockaddr *)(void *)&bindaddr->addr.buf, + (struct sockaddr *)bindaddr->addr.buf, (socklen_t)si.si_alen) < 0) { warnx( "svc_tli_create: could not bind to requested address"); ==== //depot/projects/hammer/lib/libcrypt/Makefile#2 (text+ko) ==== @@ -1,5 +1,5 @@ # -# $FreeBSD: src/lib/libcrypt/Makefile,v 1.30 2001/03/27 17:26:59 ru Exp $ +# $FreeBSD: src/lib/libcrypt/Makefile,v 1.31 2003/05/19 15:51:59 des Exp $ # SHLIB_MAJOR= 2 @@ -13,7 +13,7 @@ CFLAGS+= -DLIBC_SCCS -Wall # Pull in the crypt-des.c source, assuming it is present. .if exists(${.CURDIR}/../../secure/lib/libcrypt/crypt-des.c) && \ - !defined(NOSECURE) && !defined(NOCRYPT) + !defined(NOCRYPT) .PATH: ${.CURDIR}/../../secure/lib/libcrypt SRCS+= crypt-des.c crypt-blowfish.c blowfish.c CFLAGS+= -I${.CURDIR} -DHAS_DES -DHAS_BLOWFISH ==== //depot/projects/hammer/lib/libfetch/Makefile#7 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/lib/libfetch/Makefile,v 1.40 2003/05/01 14:39:43 des Exp $ +# $FreeBSD: src/lib/libfetch/Makefile,v 1.41 2003/05/19 15:51:59 des Exp $ LIB= fetch CFLAGS+= -I. @@ -9,7 +9,7 @@ MAN= fetch.3 CLEANFILES= ftperr.h httperr.h -.if !defined(NOCRYPT) && !defined(NOSECURE) && !defined(NO_OPENSSL) +.if !defined(NOCRYPT) && !defined(NO_OPENSSL) CFLAGS+= -DWITH_SSL DPADD= ${LIBSSL} ${LIBCRYPTO} LDADD= -lssl -lcrypto ==== //depot/projects/hammer/lib/libgeom/Makefile#3 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/lib/libgeom/Makefile,v 1.5 2003/03/23 10:15:02 phk Exp $ +# $FreeBSD: src/lib/libgeom/Makefile,v 1.6 2003/05/17 19:05:17 ru Exp $ LIB= geom SRCS+= geom_getxml.c @@ -11,6 +11,9 @@ WARNS?= 3 +DPADD= ${LIBBSDXML} ${LIBSBUF} +LDADD= -lbsdxml -lsbuf + MAN= libgeom.3 MLINKS+= \ ==== //depot/projects/hammer/lib/libkvm/kvm_ia64.c#3 (text+ko) ==== @@ -1,4 +1,4 @@ -/* $FreeBSD: src/lib/libkvm/kvm_ia64.c,v 1.3 2002/10/21 04:21:12 marcel Exp $ */ +/* $FreeBSD: src/lib/libkvm/kvm_ia64.c,v 1.4 2003/05/16 21:26:40 marcel Exp $ */ /* $NetBSD: kvm_alpha.c,v 1.7.2.1 1997/11/02 20:34:26 mellon Exp $ */ /* @@ -148,7 +148,7 @@ * addresses/values. */ - nlist[0].n_name = "kptdir"; + nlist[0].n_name = "ia64_kptdir"; nlist[1].n_name = 0; if (kvm_nlist(kd, nlist) != 0) { ==== //depot/projects/hammer/lib/libpam/modules/modules.inc#8 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/lib/libpam/modules/modules.inc,v 1.16 2003/05/05 07:58:42 markm Exp $ +# $FreeBSD: src/lib/libpam/modules/modules.inc,v 1.17 2003/05/19 15:51:59 des Exp $ MODULES = MODULES += pam_chroot @@ -24,8 +24,7 @@ MODULES += pam_rootok MODULES += pam_securetty MODULES += pam_self -.if !defined(NOCRYPT) && !defined(NO_OPENSSL) && !defined(NO_OPENSSH) && \ - !defined(NOSECURE) +.if !defined(NOCRYPT) && !defined(NO_OPENSSL) && !defined(NO_OPENSSH) MODULES += pam_ssh .endif MODULES += pam_tacplus ==== //depot/projects/hammer/lib/libpthread/sys/lock.c#3 (text+ko) ==== @@ -23,7 +23,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/lib/libpthread/sys/lock.c,v 1.3 2003/05/04 22:29:09 deischen Exp $ + * $FreeBSD: src/lib/libpthread/sys/lock.c,v 1.4 2003/05/16 19:58:29 deischen Exp $ */ #include <sys/types.h> @@ -65,7 +65,7 @@ lck->l_head->lr_watcher = NULL; lck->l_head->lr_owner = NULL; lck->l_head->lr_waiting = 0; - lck->l_head->lr_handshake = 0; + lck->l_head->lr_active = 1; lck->l_tail = lck->l_head; } return (0); @@ -85,7 +85,7 @@ lu->lu_myreq->lr_watcher = NULL; lu->lu_myreq->lr_owner = lu; lu->lu_myreq->lr_waiting = 0; - lu->lu_myreq->lr_handshake = 0; + lu->lu_myreq->lr_active = 0; lu->lu_watchreq = NULL; lu->lu_priority = 0; lu->lu_private = priv; @@ -166,19 +166,16 @@ for (i = 0; i < MAX_SPINS; i++) { if (lu->lu_watchreq->lr_locked == 0) return; + if (lu->lu_watchreq->lr_active == 0) + break; } atomic_store_rel_long(&lu->lu_watchreq->lr_waiting, 1); while (lu->lu_watchreq->lr_locked != 0) lck->l_wait(lck, lu); atomic_store_rel_long(&lu->lu_watchreq->lr_waiting, 0); - /* - * Wait for original owner to stop accessing the - * lockreq object. - */ - while (lu->lu_watchreq->lr_handshake) - ; } } + lu->lu_myreq->lr_active = 1; } /* @@ -240,24 +237,21 @@ } } if (lu_h != NULL) { - lu_h->lu_watchreq->lr_handshake = 1; /* Give the lock to the highest priority user. */ - atomic_store_rel_long(&lu_h->lu_watchreq->lr_locked, 0); if ((lu_h->lu_watchreq->lr_waiting != 0) && (lck->l_wakeup != NULL)) /* Notify the sleeper */ lck->l_wakeup(lck, lu_h->lu_myreq->lr_watcher); - atomic_store_rel_long(&lu_h->lu_watchreq->lr_handshake, - 0); + else + atomic_store_rel_long(&lu_h->lu_watchreq->lr_locked, 0); } else { - myreq->lr_handshake = 1; - /* Give the lock to the previous request. */ - atomic_store_rel_long(&myreq->lr_locked, 0); if ((myreq->lr_waiting != 0) && (lck->l_wakeup != NULL)) /* Notify the sleeper */ lck->l_wakeup(lck, myreq->lr_watcher); - atomic_store_rel_long(&myreq->lr_handshake, 0); + else + /* Give the lock to the previous request. */ + atomic_store_rel_long(&myreq->lr_locked, 0); } } else { /* @@ -270,19 +264,25 @@ lu->lu_watchreq = NULL; lu->lu_myreq->lr_locked = 1; lu->lu_myreq->lr_waiting = 0; - if (lck->l_wakeup) { - /* Start wakeup */ - myreq->lr_handshake = 1; + if (myreq->lr_waiting != 0 && lck->l_wakeup) + /* Notify the sleeper */ + lck->l_wakeup(lck, myreq->lr_watcher); + else /* Give the lock to the previous request. */ atomic_store_rel_long(&myreq->lr_locked, 0); - if (myreq->lr_waiting != 0) { - /* Notify the sleeper */ - lck->l_wakeup(lck, myreq->lr_watcher); - } - /* Stop wakeup */ - atomic_store_rel_long(&myreq->lr_handshake, 0); - } else { - atomic_store_rel_long(&myreq->lr_locked, 0); - } } + lu->lu_myreq->lr_active = 0; +} + +void +_lock_grant(struct lock *lck /* unused */, struct lockuser *lu) +{ + atomic_store_rel_long(&lu->lu_watchreq->lr_locked, 0); } + +void +_lockuser_setactive(struct lockuser *lu, int active) +{ + lu->lu_myreq->lr_active = active; +} + ==== //depot/projects/hammer/lib/libpthread/sys/lock.h#3 (text+ko) ==== @@ -23,7 +23,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/lib/libpthread/sys/lock.h,v 1.3 2003/05/04 22:29:09 deischen Exp $ + * $FreeBSD: src/lib/libpthread/sys/lock.h,v 1.4 2003/05/16 19:58:29 deischen Exp $ */ #ifndef _LOCK_H_ @@ -55,7 +55,7 @@ struct lockuser *lr_watcher; /* only used for priority locks */ struct lockuser *lr_owner; /* only used for priority locks */ long lr_waiting; /* non-zero when wakeup needed */ - volatile long lr_handshake; /* non-zero when wakeup in progress */ + volatile int lr_active; /* non-zero if the lock is last lock for thread */ }; struct lockuser { @@ -72,6 +72,7 @@ #define _LCK_REQUEST_INITIALIZER { 0, NULL, NULL, 0 } #define _LCK_BUSY(lu) ((lu)->lu_watchreq->lr_locked != 0) +#define _LCK_ACTIVE(lu) ((lu)->lu_watchreq->lr_active != 0) #define _LCK_GRANTED(lu) ((lu)->lu_watchreq->lr_locked == 0) #define _LCK_SET_PRIVATE(lu, p) (lu)->lu_private = (void *)(p) @@ -84,7 +85,9 @@ lock_handler_t *, lock_handler_t *); int _lockuser_init(struct lockuser *lu, void *priv); void _lockuser_destroy(struct lockuser *lu); +void _lockuser_setactive(struct lockuser *lu, int active); void _lock_acquire(struct lock *, struct lockuser *, int); void _lock_release(struct lock *, struct lockuser *); +void _lock_grant(struct lock *, struct lockuser *); #endif ==== //depot/projects/hammer/lib/libpthread/thread/thr_cond.c#5 (text+ko) ==== @@ -29,7 +29,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/lib/libpthread/thread/thr_cond.c,v 1.39 2003/05/02 11:39:00 davidxu Exp $ + * $FreeBSD: src/lib/libpthread/thread/thr_cond.c,v 1.40 2003/05/16 19:58:29 deischen Exp $ */ #include <stdlib.h> #include <errno.h> @@ -267,11 +267,12 @@ * lock); we should be able to safely * set the state. */ - THR_LOCK_SWITCH(curthread); + THR_SCHED_LOCK(curthread, curthread); THR_SET_STATE(curthread, PS_COND_WAIT); /* Remember the CV: */ curthread->data.cond = *cond; + THR_SCHED_UNLOCK(curthread, curthread); /* Unlock the CV structure: */ THR_LOCK_RELEASE(curthread, @@ -281,7 +282,6 @@ _thr_sched_switch(curthread); curthread->data.cond = NULL; - THR_UNLOCK_SWITCH(curthread); /* * XXX - This really isn't a good check @@ -479,11 +479,12 @@ * lock); we should be able to safely * set the state. */ - THR_LOCK_SWITCH(curthread); + THR_SCHED_LOCK(curthread, curthread); THR_SET_STATE(curthread, PS_COND_WAIT); >>> TRUNCATED FOR MAIL (1000 lines) <<<
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200305192146.h4JLkt8m036883>