Date: Wed, 2 Jul 2003 22:34:32 -0700 (PDT) From: Marcel Moolenaar <marcel@FreeBSD.org> To: Perforce Change Reviews <perforce@freebsd.org> Subject: PERFORCE change 34005 for review Message-ID: <200307030534.h635YWqU099646@repoman.freebsd.org>
next in thread | raw e-mail | index | archive | help
http://perforce.freebsd.org/chv.cgi?CH=34005 Change 34005 by marcel@marcel_nfs on 2003/07/02 22:34:06 IFC @34004 Affected files ... .. //depot/projects/ia64/Makefile.inc1#70 integrate .. //depot/projects/ia64/contrib/groff/tmac/tty-char.tmac#4 integrate .. //depot/projects/ia64/kerberos5/Makefile.inc#9 integrate .. //depot/projects/ia64/kerberos5/libexec/hprop/Makefile#4 integrate .. //depot/projects/ia64/kerberos5/libexec/hpropd/Makefile#6 integrate .. //depot/projects/ia64/kerberos5/libexec/ipropd-master/Makefile#7 integrate .. //depot/projects/ia64/kerberos5/libexec/ipropd-slave/Makefile#7 integrate .. //depot/projects/ia64/kerberos5/libexec/kadmind/Makefile#3 integrate .. //depot/projects/ia64/kerberos5/libexec/kdc/Makefile#7 integrate .. //depot/projects/ia64/kerberos5/libexec/kpasswdd/Makefile#3 integrate .. //depot/projects/ia64/kerberos5/libexec/telnetd/Makefile#7 integrate .. //depot/projects/ia64/kerberos5/usr.bin/kadmin/Makefile#4 integrate .. //depot/projects/ia64/kerberos5/usr.bin/kdestroy/Makefile#2 integrate .. //depot/projects/ia64/kerberos5/usr.bin/kinit/Makefile#2 integrate .. //depot/projects/ia64/kerberos5/usr.bin/klist/Makefile#2 integrate .. //depot/projects/ia64/kerberos5/usr.bin/kpasswd/Makefile#2 integrate .. //depot/projects/ia64/kerberos5/usr.bin/ksu/Makefile#2 integrate .. //depot/projects/ia64/kerberos5/usr.bin/telnet/Makefile#7 integrate .. //depot/projects/ia64/kerberos5/usr.sbin/kstash/Makefile#3 integrate .. //depot/projects/ia64/kerberos5/usr.sbin/ktutil/Makefile#7 integrate .. //depot/projects/ia64/lib/libc/stdio/vsnprintf.c#7 integrate .. //depot/projects/ia64/lib/libc_r/Makefile#5 integrate .. //depot/projects/ia64/lib/libc_r/arch/alpha/_atomic_lock.S#2 integrate .. //depot/projects/ia64/lib/libpthread/Makefile#10 integrate .. //depot/projects/ia64/lib/libpthread/support/Makefile.inc#3 integrate .. //depot/projects/ia64/lib/libpthread/thread/thr_cancel.c#8 integrate .. //depot/projects/ia64/lib/libpthread/thread/thr_cond.c#13 integrate .. //depot/projects/ia64/lib/libthr/thread/thr_mutex.c#11 integrate .. //depot/projects/ia64/release/doc/ja_JP.eucJP/errata/article.sgml#14 integrate .. //depot/projects/ia64/sbin/Makefile#27 integrate .. //depot/projects/ia64/sbin/mount_nwfs/Makefile#3 delete .. //depot/projects/ia64/sbin/mount_nwfs/mount_nwfs.8#7 delete .. //depot/projects/ia64/sbin/mount_nwfs/mount_nwfs.c#3 delete .. //depot/projects/ia64/sbin/mount_portalfs/Makefile#3 delete .. //depot/projects/ia64/sbin/mount_portalfs/activate.c#2 delete .. //depot/projects/ia64/sbin/mount_portalfs/conf.c#2 delete .. //depot/projects/ia64/sbin/mount_portalfs/mount_portalfs.8#4 delete .. //depot/projects/ia64/sbin/mount_portalfs/mount_portalfs.c#4 delete .. //depot/projects/ia64/sbin/mount_portalfs/pathnames.h#2 delete .. //depot/projects/ia64/sbin/mount_portalfs/portal.conf#2 delete .. //depot/projects/ia64/sbin/mount_portalfs/portald.h#3 delete .. //depot/projects/ia64/sbin/mount_portalfs/pt_conf.c#2 delete .. //depot/projects/ia64/sbin/mount_portalfs/pt_exec.c#2 delete .. //depot/projects/ia64/sbin/mount_portalfs/pt_file.c#2 delete .. //depot/projects/ia64/sbin/mount_portalfs/pt_tcp.c#2 delete .. //depot/projects/ia64/sbin/mount_portalfs/pt_tcplisten.c#2 delete .. //depot/projects/ia64/sbin/mount_smbfs/Makefile#3 delete .. //depot/projects/ia64/secure/usr.bin/ssh/Makefile#10 integrate .. //depot/projects/ia64/secure/usr.sbin/sshd/Makefile#15 integrate .. //depot/projects/ia64/share/man/man4/umass.4#10 integrate .. //depot/projects/ia64/share/mk/bsd.dep.mk#11 integrate .. //depot/projects/ia64/share/mk/bsd.lib.mk#23 integrate .. //depot/projects/ia64/share/mk/bsd.libnames.mk#18 integrate .. //depot/projects/ia64/share/mk/sys.mk#10 integrate .. //depot/projects/ia64/sys/alpha/alpha/mp_machdep.c#10 integrate .. //depot/projects/ia64/sys/boot/efi/libefi/Makefile#8 integrate .. //depot/projects/ia64/sys/boot/i386/libi386/Makefile#10 integrate .. //depot/projects/ia64/sys/boot/ia64/libski/Makefile#8 integrate .. //depot/projects/ia64/sys/boot/ia64/libski/pal_stub.S#1 branch .. //depot/projects/ia64/sys/boot/ia64/libski/pal_stub.s#2 delete .. //depot/projects/ia64/sys/boot/pc98/libpc98/Makefile#9 integrate .. //depot/projects/ia64/sys/conf/files.ia64#41 integrate .. //depot/projects/ia64/sys/dev/acpica/acpi.c#32 integrate .. //depot/projects/ia64/sys/dev/ata/ata-chipset.c#20 integrate .. //depot/projects/ia64/sys/dev/ata/ata-pci.c#29 integrate .. //depot/projects/ia64/sys/dev/ata/ata-pci.h#11 integrate .. //depot/projects/ia64/sys/dev/fatm/if_fatm.c#3 integrate .. //depot/projects/ia64/sys/dev/ips/ips_pci.c#4 integrate .. //depot/projects/ia64/sys/dev/kbd/atkbd.c#7 integrate .. //depot/projects/ia64/sys/dev/ppc/ppc.c#1 branch .. //depot/projects/ia64/sys/dev/ppc/ppcreg.h#1 branch .. //depot/projects/ia64/sys/dev/random/randomdev.c#9 integrate .. //depot/projects/ia64/sys/dev/sio/sio.c#46 integrate .. //depot/projects/ia64/sys/geom/geom_ctl.c#14 integrate .. //depot/projects/ia64/sys/i386/bios/apm.c#4 integrate .. //depot/projects/ia64/sys/i386/isa/pcvt/pcvt_drv.c#8 integrate .. //depot/projects/ia64/sys/ia64/ia64/context.S#1 branch .. //depot/projects/ia64/sys/ia64/ia64/context.s#3 delete .. //depot/projects/ia64/sys/ia64/ia64/exception.S#1 branch .. //depot/projects/ia64/sys/ia64/ia64/exception.s#26 delete .. //depot/projects/ia64/sys/ia64/ia64/locore.S#1 branch .. //depot/projects/ia64/sys/ia64/ia64/locore.s#17 delete .. //depot/projects/ia64/sys/ia64/ia64/pal.S#1 branch .. //depot/projects/ia64/sys/ia64/ia64/pal.s#3 delete .. //depot/projects/ia64/sys/ia64/ia64/setjmp.S#1 branch .. //depot/projects/ia64/sys/ia64/ia64/setjmp.s#2 delete .. //depot/projects/ia64/sys/ia64/ia64/support.S#1 branch .. //depot/projects/ia64/sys/ia64/ia64/support.s#9 delete .. //depot/projects/ia64/sys/ia64/ia64/syscall.S#1 branch .. //depot/projects/ia64/sys/ia64/ia64/syscall.s#12 delete .. //depot/projects/ia64/sys/isa/atkbdc_isa.c#4 integrate .. //depot/projects/ia64/sys/isa/fd.c#19 integrate .. //depot/projects/ia64/sys/isa/isahint.c#3 integrate .. //depot/projects/ia64/sys/isa/syscons_isa.c#8 integrate .. //depot/projects/ia64/sys/kern/kern_mutex.c#27 integrate .. //depot/projects/ia64/sys/kern/kern_tc.c#25 integrate .. //depot/projects/ia64/sys/kern/subr_hints.c#6 integrate .. //depot/projects/ia64/sys/netgraph/atm/ng_atm.c#2 integrate .. //depot/projects/ia64/sys/nfsclient/nfs_nfsiod.c#7 integrate .. //depot/projects/ia64/sys/nfsserver/nfs_syscalls.c#16 integrate .. //depot/projects/ia64/sys/pc98/pc98/fd.c#20 integrate .. //depot/projects/ia64/sys/pc98/pc98/pc98kbd.c#5 integrate .. //depot/projects/ia64/sys/pc98/pc98/sio.c#24 integrate .. //depot/projects/ia64/sys/pc98/pc98/syscons_pc98.c#5 integrate .. //depot/projects/ia64/sys/sys/bus.h#9 integrate .. //depot/projects/ia64/usr.sbin/Makefile#43 integrate .. //depot/projects/ia64/usr.sbin/mount_nwfs/Makefile#1 branch .. //depot/projects/ia64/usr.sbin/mount_nwfs/mount_nwfs.8#1 branch .. //depot/projects/ia64/usr.sbin/mount_nwfs/mount_nwfs.c#1 branch .. //depot/projects/ia64/usr.sbin/mount_portalfs/Makefile#1 branch .. //depot/projects/ia64/usr.sbin/mount_portalfs/activate.c#1 branch .. //depot/projects/ia64/usr.sbin/mount_portalfs/conf.c#1 branch .. //depot/projects/ia64/usr.sbin/mount_portalfs/mount_portalfs.8#1 branch .. //depot/projects/ia64/usr.sbin/mount_portalfs/mount_portalfs.c#1 branch .. //depot/projects/ia64/usr.sbin/mount_portalfs/pathnames.h#1 branch .. //depot/projects/ia64/usr.sbin/mount_portalfs/portal.conf#1 branch .. //depot/projects/ia64/usr.sbin/mount_portalfs/portald.h#1 branch .. //depot/projects/ia64/usr.sbin/mount_portalfs/pt_conf.c#1 branch .. //depot/projects/ia64/usr.sbin/mount_portalfs/pt_exec.c#1 branch .. //depot/projects/ia64/usr.sbin/mount_portalfs/pt_file.c#1 branch .. //depot/projects/ia64/usr.sbin/mount_portalfs/pt_tcp.c#1 branch .. //depot/projects/ia64/usr.sbin/mount_portalfs/pt_tcplisten.c#1 branch .. //depot/projects/ia64/usr.sbin/mount_smbfs/Makefile#1 branch .. //depot/projects/ia64/usr.sbin/watchdogd/Makefile#2 integrate .. //depot/projects/ia64/usr.sbin/watchdogd/watchdogd.c#2 integrate Differences ... ==== //depot/projects/ia64/Makefile.inc1#70 (text+ko) ==== @@ -1,5 +1,5 @@ # -# $FreeBSD: src/Makefile.inc1,v 1.373 2003/07/01 23:10:39 gordon Exp $ +# $FreeBSD: src/Makefile.inc1,v 1.374 2003/07/02 19:26:19 gordon Exp $ # # Make command line options: # -DNO_KERBEROS Do not build Heimdal (Kerberos 5) @@ -667,7 +667,7 @@ _yacc= usr.bin/yacc .endif -.if exists(${.CURDIR}/rescue) && !defined(NO_RESCUE) && \ +.if exists(${.CURDIR}/rescue) && defined(RESCUE) && \ ${BOOTSTRAPPING} < 501100 _crunchgen= usr.sbin/crunch/crunchgen .endif @@ -752,7 +752,7 @@ _btxld= usr.sbin/btxld .endif -.if (exists(${.CURDIR}/rescue) && !defined(NO_RESCUE) || \ +.if (exists(${.CURDIR}/rescue) && defined(RESCUE) || \ defined(RELEASEDIR)) && \ ( ${TARGET_ARCH} != ${MACHINE_ARCH} || ${BOOTSTRAPPING} < 501101 ) _crunchide= usr.sbin/crunch/crunchide ==== //depot/projects/ia64/contrib/groff/tmac/tty-char.tmac#4 (text+ko) ==== @@ -135,6 +135,12 @@ .tty-char \[rf] _| .tty-char \[lc] |~ .tty-char \[rc] ~| +.tty-char \[lb] `- +.tty-char \[rb] -' +.tty-char \[lk] { +.tty-char \[rk] } +.tty-char \[lt] ,- +.tty-char \[rt] -. .\" Latin-1 characters .tty-char \[r!] \z,i .tty-char \[Po] \z-L ==== //depot/projects/ia64/kerberos5/Makefile.inc#9 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/kerberos5/Makefile.inc,v 1.16 2003/06/18 14:23:44 mr Exp $ +# $FreeBSD: src/kerberos5/Makefile.inc,v 1.17 2003/07/02 23:46:37 ru Exp $ DISTRIBUTION?= crypto NOLINT= true @@ -45,9 +45,9 @@ .endif .if exists(${.OBJDIR}/../../lib/libvers) -VERSOBJDIR= ${.OBJDIR}/../../lib/libvers +LIBVERS= ${.OBJDIR}/../../lib/libvers/libvers.a .else -VERSOBJDIR= ${.CURDIR}/../../lib/libvers +LIBVERS= ${.CURDIR}/../../lib/libvers/libvers.a .endif .if exists(${.OBJDIR}/../../lib/libkrb5) @@ -56,40 +56,10 @@ KRB5OBJDIR= ${.CURDIR}/../../lib/libkrb5 .endif -.if exists(${.OBJDIR}/../../lib/libkadm5clnt) -KADM5COBJDIR= ${.OBJDIR}/../../lib/libkadm5clnt -.else -KADM5COBJDIR= ${.CURDIR}/../../lib/libkadm5clnt -.endif - -.if exists(${.OBJDIR}/../../lib/libkadm5srv) -KADM5SOBJDIR= ${.OBJDIR}/../../lib/libkadm5srv -.else -KADM5SOBJDIR= ${.CURDIR}/../../lib/libkadm5srv -.endif - -.if exists(${.OBJDIR}/../../lib/libkafs5) -KAFS5OBJDIR= ${.OBJDIR}/../../lib/libkafs5 -.else -KAFS5OBJDIR= ${.CURDIR}/../../lib/libkafs5 -.endif - -.if exists(${.OBJDIR}/../../lib/libkrb5util) -KRB5UTILOBJDIR= ${.OBJDIR}/../../lib/libkrb5util -.else -KRB5UTILOBJDIR= ${.CURDIR}/../../lib/libkrb5util -.endif - -.if exists(${.OBJDIR}/../../lib/libkdb5) -KDB5OBJDIR= ${.OBJDIR}/../../lib/libkdb5 -.else -KDB5OBJDIR= ${.CURDIR}/../../lib/libkdb5 -.endif - .if exists(${.OBJDIR}/../../lib/libsl) -SLOBJDIR= ${.OBJDIR}/../../lib/libsl +LIBSL= ${.OBJDIR}/../../lib/libsl/libsl.a .else -SLOBJDIR= ${.CURDIR}/../../lib/libsl +LIBSL= ${.CURDIR}/../../lib/libsl/libsl.a .endif .if exists(${.OBJDIR}/../../lib/libtelnet) ==== //depot/projects/ia64/kerberos5/libexec/hprop/Makefile#4 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/kerberos5/libexec/hprop/Makefile,v 1.8 2003/03/09 21:56:51 markm Exp $ +# $FreeBSD: src/kerberos5/libexec/hprop/Makefile,v 1.9 2003/07/02 23:46:37 ru Exp $ PROG= hprop SRCS= hprop.c mit_dump.c v4_dump.c hprop.h kadb.h hdb_err.h @@ -12,11 +12,9 @@ -I${ASN1OBJDIR} \ -I${HDBOBJDIR} \ -I${.OBJDIR} -LDADD= -L${KRB5OBJDIR} -lkrb5 -L${KAFS5OBJDIR} -lkafs5 \ - -L${HDBOBJDIR} -lhdb -L${ROKENOBJDIR} -lroken \ - -L${VERSOBJDIR} -lvers \ - -L${ASN1OBJDIR} -lasn1 -lcrypto -lcrypt -lcom_err -DPADD= ${LIBKRB5} ${LIBKAFS5} ${LIBHDB} ${LIBROKEN} \ +LDADD= -lkrb5 -lkafs5 -lhdb -lroken ${LIBVERS} \ + -lasn1 -lcrypto -lcrypt -lcom_err +DPADD= ${LIBKRB5} ${LIBKAFS5} ${LIBHDB} ${LIBROKEN} ${LIBVERS} \ ${LIBASN1} ${LIBCRYPTO} ${LIBCRYPT} ${LIBCOM_ERR} MAN= hprop.8 ==== //depot/projects/ia64/kerberos5/libexec/hpropd/Makefile#6 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/kerberos5/libexec/hpropd/Makefile,v 1.10 2003/06/18 09:11:33 mr Exp $ +# $FreeBSD: src/kerberos5/libexec/hpropd/Makefile,v 1.11 2003/07/02 23:46:37 ru Exp $ PROG= hpropd SRCS= hpropd.c hprop.h hdb_err.h @@ -13,11 +13,9 @@ -I${HDBOBJDIR} \ -I${.OBJDIR} \ ${LDAPCFLAGS} -LDADD= -L${KRB5OBJDIR} -lkrb5 \ - -L${HDBOBJDIR} -lhdb -L${ROKENOBJDIR} -lroken \ - -L${VERSOBJDIR} -lvers \ - -L${ASN1OBJDIR} -lasn1 -lcrypto -lcrypt -lcom_err ${LDAPLDADD} -DPADD= ${LIBKRB5} ${LIBKAFS5} ${LIBHDB} ${LIBROKEN} \ +LDADD= -lkrb5 -lhdb -lroken ${LIBVERS} \ + -lasn1 -lcrypto -lcrypt -lcom_err ${LDAPLDADD} +DPADD= ${LIBKRB5} ${LIBHDB} ${LIBROKEN} ${LIBVERS} \ ${LIBASN1} ${LIBCRYPTO} ${LIBCRYPT} ${LIBCOM_ERR} ${LDAPLIBS} MAN= hpropd.8 ==== //depot/projects/ia64/kerberos5/libexec/ipropd-master/Makefile#7 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/kerberos5/libexec/ipropd-master/Makefile,v 1.11 2003/06/18 09:11:33 mr Exp $ +# $FreeBSD: src/kerberos5/libexec/ipropd-master/Makefile,v 1.12 2003/07/02 23:46:37 ru Exp $ PROG= ipropd-master SRCS= ipropd_master.c iprop.h kadm5_locl.h kadm5_err.h hdb_err.h @@ -13,13 +13,9 @@ -I${HDBOBJDIR} \ -I${.OBJDIR} \ ${LDAPCFLAGS} -LDADD= \ - -L${KADM5SOBJDIR} -lkadm5srv \ - -L${KRB5OBJDIR} -lkrb5 \ - -L${HDBOBJDIR} -lhdb -L${ROKENOBJDIR} -lroken \ - -L${VERSOBJDIR} -lvers \ - -L${ASN1OBJDIR} -lasn1 -lcrypto -lcrypt -lcom_err ${LDAPLDADD} -DPADD= ${LIBKRB5} ${LIBKAFS5} ${LIBHDB} ${LIBROKEN} \ +LDADD= -lkadm5srv -lkrb5 -lhdb -lroken ${LIBVERS} \ + -lasn1 -lcrypto -lcrypt -lcom_err ${LDAPLDADD} +DPADD= ${LIBKADM5SRV} ${LIBKRB5} ${LIBHDB} ${LIBROKEN} ${LIBVERS} \ ${LIBASN1} ${LIBCRYPTO} ${LIBCRYPT} ${LIBCOM_ERR} ${LDAPLIBS} NOMAN= yes ==== //depot/projects/ia64/kerberos5/libexec/ipropd-slave/Makefile#7 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/kerberos5/libexec/ipropd-slave/Makefile,v 1.11 2003/06/18 09:11:33 mr Exp $ +# $FreeBSD: src/kerberos5/libexec/ipropd-slave/Makefile,v 1.12 2003/07/02 23:46:37 ru Exp $ PROG= ipropd-slave SRCS= ipropd_slave.c iprop.h kadm5_locl.h kadm5_err.h hdb_err.h @@ -13,13 +13,9 @@ -I${HDBOBJDIR} \ -I${.OBJDIR} \ ${LDAPCFLAGS} -LDADD= \ - -L${KADM5SOBJDIR} -lkadm5srv \ - -L${KRB5OBJDIR} -lkrb5 \ - -L${HDBOBJDIR} -lhdb -L${ROKENOBJDIR} -lroken \ - -L${VERSOBJDIR} -lvers \ - -L${ASN1OBJDIR} -lasn1 -lcrypto -lcrypt -lcom_err ${LDAPLDADD} -DPADD= ${LIBKRB5} ${LIBKAFS5} ${LIBHDB} ${LIBROKEN} \ +LDADD= -lkadm5srv -lkrb5 -lhdb -lroken ${LIBVERS} \ + -lasn1 -lcrypto -lcrypt -lcom_err ${LDAPLDADD} +DPADD= ${LIBKADM5SRV} ${LIBKRB5} ${LIBHDB} ${LIBROKEN} ${LIBVERS} \ ${LIBASN1} ${LIBCRYPTO} ${LIBCRYPT} ${LIBCOM_ERR} ${LDAPLIBS} NOMAN= yes ==== //depot/projects/ia64/kerberos5/libexec/kadmind/Makefile#3 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/kerberos5/libexec/kadmind/Makefile,v 1.12 2003/06/18 09:11:33 mr Exp $ +# $FreeBSD: src/kerberos5/libexec/kadmind/Makefile,v 1.13 2003/07/02 23:46:37 ru Exp $ PROG= kadmind SRCS= kadmind.c server.c kadm_conn.c \ @@ -15,14 +15,9 @@ -I${HDBOBJDIR} \ -I${.OBJDIR} \ ${LDAPCFLAGS} -LDADD= -L${KRB5OBJDIR} -lkrb5 \ - -L${ROKENOBJDIR} -lroken \ - -L${VERSOBJDIR} -lvers \ - -L${KADM5SOBJDIR} -lkadm5srv \ - -L${HDBOBJDIR} -lhdb \ - -L${ASN1OBJDIR} -lasn1 -lcrypto -lcrypt -lcom_err ${LDAPLDADD} -DPADD= ${LIBKRB5} ${LIBKAFS5} ${LIBROKEN} \ - ${LIBKADM5CLNT} ${LIBKADM5SRV} ${LIBHDB} \ +LDADD= -lkrb5 -lroken ${LIBVERS} -lkadm5srv -lhdb \ + -lasn1 -lcrypto -lcrypt -lcom_err ${LDAPLDADD} +DPADD= ${LIBKRB5} ${LIBROKEN} ${LIBVERS} ${LIBKADM5SRV} ${LIBHDB} \ ${LIBASN1} ${LIBCRYPTO} ${LIBCRYPT} ${LIBCOM_ERR} ${LDAPLIBS} NOMAN= yes ==== //depot/projects/ia64/kerberos5/libexec/kdc/Makefile#7 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/kerberos5/libexec/kdc/Makefile,v 1.11 2003/06/18 09:11:34 mr Exp $ +# $FreeBSD: src/kerberos5/libexec/kdc/Makefile,v 1.12 2003/07/02 23:46:38 ru Exp $ PROG= kdc SRCS= \ @@ -21,11 +21,9 @@ -I${HDBOBJDIR} \ -I${.OBJDIR} \ ${LDAPCFLAGS} -LDADD= -L${KRB5OBJDIR} -lkrb5 \ - -L${HDBOBJDIR} -lhdb -L${ROKENOBJDIR} -lroken \ - -L${VERSOBJDIR} -lvers \ - -L${ASN1OBJDIR} -lasn1 -lcrypto -lcrypt -lcom_err ${LDAPLDADD} -DPADD= ${LIBKRB5} ${LIBKAFS5} ${LIBHDB} ${LIBROKEN} \ +LDADD= -lkrb5 -lhdb -lroken ${LIBVERS} \ + -lasn1 -lcrypto -lcrypt -lcom_err ${LDAPLDADD} +DPADD= ${LIBKRB5} ${LIBHDB} ${LIBROKEN} ${LIBVERS} \ ${LIBASN1} ${LIBCRYPTO} ${LIBCRYPT} ${LIBCOM_ERR} ${LDAPLIBS} MAN= kdc.8 ==== //depot/projects/ia64/kerberos5/libexec/kpasswdd/Makefile#3 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/kerberos5/libexec/kpasswdd/Makefile,v 1.13 2003/06/18 09:11:34 mr Exp $ +# $FreeBSD: src/kerberos5/libexec/kpasswdd/Makefile,v 1.14 2003/07/02 23:46:37 ru Exp $ PROG= kpasswdd SRCS= kpasswdd.c krb5_err.h heim_err.h hdb_err.h \ @@ -14,11 +14,9 @@ -I${HDBOBJDIR} \ -I${.OBJDIR} \ ${LDAPCFLAGS} -LDADD= -L${KRB5OBJDIR} -lkrb5 -L${ROKENOBJDIR} -lroken \ - -L${VERSOBJDIR} -lvers \ - -L${KADM5SOBJDIR} -lkadm5srv -L${HDBOBJDIR} -lhdb \ - -L${ASN1OBJDIR} -lasn1 -lcrypto -lcrypt -lcom_err ${LDAPLDADD} -DPADD= ${LIBKRB5} ${LIBROKEN} \ +LDADD= -lkrb5 -lroken ${LIBVERS} -lkadm5srv -lhdb \ + -lasn1 -lcrypto -lcrypt -lcom_err ${LDAPLDADD} +DPADD= ${LIBKRB5} ${LIBROKEN} ${LIBVERS} ${LIBKADM5SRV} ${LIBHDB} \ ${LIBASN1} ${LIBCRYPTO} ${LIBCRYPT} ${LIBCOM_ERR} ${LDAPLIBS} MAN= kpasswdd.8 ==== //depot/projects/ia64/kerberos5/libexec/telnetd/Makefile#7 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/kerberos5/libexec/telnetd/Makefile,v 1.17 2003/03/09 21:56:53 markm Exp $ +# $FreeBSD: src/kerberos5/libexec/telnetd/Makefile,v 1.18 2003/07/02 23:46:38 ru Exp $ # Do not define -DKLUDGELINEMODE, as it does not interact well with many # telnet implementations. @@ -20,8 +20,7 @@ ${LIBKRB5} ${LIBASN1} ${LIBROKEN} ${LIBCOM_ERR} \ ${LIBCRYPT} ${LIBPAM} LDADD= -lutil -ltermcap ${LIBTELNET} -lmp -lcrypto \ - -L${KRB5OBJDIR} -lkrb5 -L${ASN1OBJDIR} -lasn1 \ - -L${ROKENOBJDIR} -lroken -lcom_err \ + -lkrb5 -lasn1 -lroken -lcom_err \ -lcrypt ${MINUSLPAM} .include <bsd.prog.mk> ==== //depot/projects/ia64/kerberos5/usr.bin/kadmin/Makefile#4 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/kerberos5/usr.bin/kadmin/Makefile,v 1.13 2003/06/18 09:11:34 mr Exp $ +# $FreeBSD: src/kerberos5/usr.bin/kadmin/Makefile,v 1.14 2003/07/02 23:46:38 ru Exp $ PROG= kadmin SRCS= \ @@ -34,16 +34,13 @@ -I${HDBOBJDIR} \ -I${.OBJDIR} \ ${LDAPCFLAGS} -LDADD= -L${KADM5COBJDIR} -lkadm5clnt -L${KADM5SOBJDIR} -lkadm5srv \ - -L${KRB5OBJDIR} -lkrb5 \ - -L${ROKENOBJDIR} -lroken \ - -L${VERSOBJDIR} -lvers \ - -L${HDBOBJDIR} -lhdb \ - -L${ASN1OBJDIR} -lasn1 -lcrypto -lcrypt -lcom_err \ - -L${SLOBJDIR} -lsl -lreadline -lcurses ${LDAPLDADD} -DPADD= ${LIBKRB5} ${LIBKAFS5} ${LIBROKEN} \ - ${LIBKADM5CLNT} ${LIBKADM5SRV} ${LIBHDB} \ - ${LIBASN1} ${LIBCRYPTO} ${LIBCRYPT} ${LIBCOM_ERR} \ +LDADD= -lkadm5clnt -lkadm5srv -lkrb5 -lroken \ + ${LIBVERS} -lhdb -lasn1 \ + -lcrypto -lcrypt -lcom_err \ + ${LIBSL} -lreadline -lcurses ${LDAPLDADD} +DPADD= ${LIBKADM5CLNT} ${LIBKADM5SRV} ${LIBKRB5} ${LIBROKEN} \ + ${LIBVERS} ${LIBHDB} ${LIBASN1} \ + ${LIBCRYPTO} ${LIBCRYPT} ${LIBCOM_ERR} \ ${LIBSL} ${LIBREADLINE} ${LIBCURSES} ${LDAPLIBS} MAN= kadmin.8 ==== //depot/projects/ia64/kerberos5/usr.bin/kdestroy/Makefile#2 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/kerberos5/usr.bin/kdestroy/Makefile,v 1.10 2003/03/09 21:56:54 markm Exp $ +# $FreeBSD: src/kerberos5/usr.bin/kdestroy/Makefile,v 1.11 2003/07/02 23:46:38 ru Exp $ PROG= kdestroy SRCS= kdestroy.c krb5_err.h heim_err.h k524_err.h @@ -10,11 +10,9 @@ -I${KRB5DIR}/kuser \ -I${ASN1OBJDIR} \ -I${.OBJDIR} -LDADD= -L${KRB5OBJDIR} -lkrb5 \ - -L${ROKENOBJDIR} -lroken \ - -L${VERSOBJDIR} -lvers \ - -L${ASN1OBJDIR} -lasn1 -lcrypto -lcrypt -lcom_err -DPADD= ${LIBKRB5} ${LIBKAFS5} ${LIBROKEN} \ +LDADD= -lkrb5 -lroken ${LIBVERS} \ + -lasn1 -lcrypto -lcrypt -lcom_err +DPADD= ${LIBKRB5} ${LIBROKEN} ${LIBVERS} \ ${LIBASN1} ${LIBCRYPTO} ${LIBCRYPT} ${LIBCOM_ERR} .include <bsd.prog.mk> ==== //depot/projects/ia64/kerberos5/usr.bin/kinit/Makefile#2 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/kerberos5/usr.bin/kinit/Makefile,v 1.10 2003/03/09 21:56:54 markm Exp $ +# $FreeBSD: src/kerberos5/usr.bin/kinit/Makefile,v 1.11 2003/07/02 23:46:38 ru Exp $ PROG= kinit SRCS= kinit.c asn1_err.h krb5_err.h heim_err.h \ @@ -11,11 +11,9 @@ -I${KRB5DIR}/kuser \ -I${ASN1OBJDIR} \ -I${.OBJDIR} -LDADD= -L${KRB5OBJDIR} -lkrb5 \ - -L${ROKENOBJDIR} -lroken \ - -L${VERSOBJDIR} -lvers \ - -L${ASN1OBJDIR} -lasn1 -lcrypto -lcrypt -lcom_err -DPADD= ${LIBKRB5} ${LIBKAFS5} ${LIBROKEN} \ +LDADD= -lkrb5 -lroken ${LIBVERS} \ + -lasn1 -lcrypto -lcrypt -lcom_err +DPADD= ${LIBKRB5} ${LIBROKEN} ${LIBVERS} \ ${LIBASN1} ${LIBCRYPTO} ${LIBCRYPT} ${LIBCOM_ERR} .include <bsd.prog.mk> ==== //depot/projects/ia64/kerberos5/usr.bin/klist/Makefile#2 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/kerberos5/usr.bin/klist/Makefile,v 1.10 2003/03/09 21:56:54 markm Exp $ +# $FreeBSD: src/kerberos5/usr.bin/klist/Makefile,v 1.11 2003/07/02 23:46:38 ru Exp $ PROG= klist SRCS= klist.c krb5_err.h heim_err.h k524_err.h @@ -10,11 +10,9 @@ -I${KRB5DIR}/kuser \ -I${ASN1OBJDIR} \ -I${.OBJDIR} -LDADD= -L${KRB5OBJDIR} -lkrb5 \ - -L${ROKENOBJDIR} -lroken \ - -L${VERSOBJDIR} -lvers \ - -L${ASN1OBJDIR} -lasn1 -lcrypto -lcrypt -lcom_err -DPADD= ${LIBKRB5} ${LIBKAFS5} ${LIBROKEN} \ +LDADD= -lkrb5 -lroken ${LIBVERS} \ + -lasn1 -lcrypto -lcrypt -lcom_err +DPADD= ${LIBKRB5} ${LIBROKEN} ${LIBVERS} \ ${LIBASN1} ${LIBCRYPTO} ${LIBCRYPT} ${LIBCOM_ERR} .include <bsd.prog.mk> ==== //depot/projects/ia64/kerberos5/usr.bin/kpasswd/Makefile#2 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/kerberos5/usr.bin/kpasswd/Makefile,v 1.10 2003/03/09 21:56:54 markm Exp $ +# $FreeBSD: src/kerberos5/usr.bin/kpasswd/Makefile,v 1.11 2003/07/02 23:46:38 ru Exp $ PROG= kpasswd SRCS= kpasswd.c krb5_err.h heim_err.h k524_err.h @@ -9,10 +9,9 @@ -I${KRB5DIR}/kpasswd \ -I${ASN1OBJDIR} \ -I${.OBJDIR} -LDADD= -L${KRB5OBJDIR} -lkrb5 -L${ROKENOBJDIR} -lroken \ - -L${VERSOBJDIR} -lvers \ - -L${ASN1OBJDIR} -lasn1 -lcrypto -lcrypt -lcom_err -DPADD= ${LIBKRB5} ${LIBROKEN} \ +LDADD= -lkrb5 -lroken ${LIBVERS} \ + -lasn1 -lcrypto -lcrypt -lcom_err +DPADD= ${LIBKRB5} ${LIBROKEN} ${LIBVERS} \ ${LIBASN1} ${LIBCRYPTO} ${LIBCRYPT} ${LIBCOM_ERR} .include <bsd.prog.mk> ==== //depot/projects/ia64/kerberos5/usr.bin/ksu/Makefile#2 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/kerberos5/usr.bin/ksu/Makefile,v 1.8 2003/03/09 21:56:54 markm Exp $ +# $FreeBSD: src/kerberos5/usr.bin/ksu/Makefile,v 1.9 2003/07/02 23:46:38 ru Exp $ PROG= ksu SRCS= su.c asn1_err.h krb5_err.h heim_err.h k524_err.h @@ -11,11 +11,9 @@ -I${ASN1OBJDIR} \ -I${.OBJDIR} NOMAN= true -LDADD= -L${KRB5OBJDIR} -lkrb5 \ - -L${ROKENOBJDIR} -lroken \ - -L${VERSOBJDIR} -lvers \ - -L${ASN1OBJDIR} -lasn1 -lcrypto -lcrypt -lcom_err -DPADD= ${LIBKRB5} ${LIBKAFS5} ${LIBROKEN} \ +LDADD= -lkrb5 -lroken ${LIBVERS} \ + -lasn1 -lcrypto -lcrypt -lcom_err +DPADD= ${LIBKRB5} ${LIBROKEN} ${LIBVERS} \ ${LIBASN1} ${LIBCRYPTO} ${LIBCRYPT} ${LIBCOM_ERR} .if defined(ENABLE_SUID_K5SU) BINMODE=4555 ==== //depot/projects/ia64/kerberos5/usr.bin/telnet/Makefile#7 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/kerberos5/usr.bin/telnet/Makefile,v 1.18 2003/03/09 21:56:55 markm Exp $ +# $FreeBSD: src/kerberos5/usr.bin/telnet/Makefile,v 1.19 2003/07/02 23:46:38 ru Exp $ PROG= telnet @@ -17,8 +17,7 @@ ${LIBKRB5} ${LIBASN1} ${LIBCOM_ERR} ${LIBROKEN} \ ${LIBCRYPTO} ${LIBCRYPT} ${LIBIPSEC} ${LIBPAM} LDADD= -ltermcap ${LIBTELNET} -lmp \ - -L${KRB5OBJDIR} -lkrb5 -L${ASN1OBJDIR} -lasn1 -lcom_err \ - -L${ROKENOBJDIR} -lroken \ + -lkrb5 -lasn1 -lcom_err -lroken \ -lcrypto -lcrypt -lipsec ${MINUSLPAM} .include <bsd.prog.mk> ==== //depot/projects/ia64/kerberos5/usr.sbin/kstash/Makefile#3 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/kerberos5/usr.sbin/kstash/Makefile,v 1.12 2003/06/18 09:11:34 mr Exp $ +# $FreeBSD: src/kerberos5/usr.sbin/kstash/Makefile,v 1.13 2003/07/02 23:46:39 ru Exp $ PROG= kstash SRCS= kstash.c hdb_err.h @@ -12,12 +12,9 @@ -I${HDBOBJDIR} \ -I${.OBJDIR} \ ${LDAPCFLAGS} -LDADD= -L${HDBOBJDIR} -lhdb \ - -L${KRB5OBJDIR} -lkrb5 \ - -L${ROKENOBJDIR} -lroken \ - -L${VERSOBJDIR} -lvers \ - -L${ASN1OBJDIR} -lasn1 -lcrypto -lcrypt -lcom_err ${LDAPLDADD} -DPADD= ${LIBKRB5} ${LIBKAFS5} ${LIBROKEN} \ +LDADD= -lhdb -lkrb5 -lroken ${LIBVERS} \ + -lasn1 -lcrypto -lcrypt -lcom_err ${LDAPLDADD} +DPADD= ${LIBHDB} ${LIBKRB5} ${LIBROKEN} ${LIBVERS} \ ${LIBASN1} ${LIBCRYPTO} ${LIBCRYPT} ${LIBCOM_ERR} ${LDAPLIBS} MAN= kstash.8 ==== //depot/projects/ia64/kerberos5/usr.sbin/ktutil/Makefile#7 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/kerberos5/usr.sbin/ktutil/Makefile,v 1.12 2003/05/11 18:49:29 markm Exp $ +# $FreeBSD: src/kerberos5/usr.sbin/ktutil/Makefile,v 1.13 2003/07/02 23:46:39 ru Exp $ PROG= ktutil SRCS= \ @@ -25,16 +25,12 @@ -I${KRB5DIR}/admin \ -I${ASN1OBJDIR} \ -I${.OBJDIR} -LDADD= -L${KADM5COBJDIR} -lkadm5clnt \ - -L${KRB5OBJDIR} -lkrb5 \ - -L${ROKENOBJDIR} -lroken \ - -L${VERSOBJDIR} -lvers \ - -L${SLOBJDIR} -lsl -L${ASN1OBJDIR} -lasn1 \ - -lcrypto -lcrypt -lcom_err -lreadline -lcurses -DPADD= ${LIBKRB5} ${LIBKAFS5} ${LIBROKEN} \ - ${LIBSL} ${LIBASN1} ${LIBKADM5CLNT} \ - ${LIBCRYPTO} ${LIBCRYPT} ${LIBCOM_ERR} ${LIBREADLINE} \ - ${LIBCURSES} +LDADD= -lkadm5clnt -lkrb5 -lroken ${LIBVERS} \ + ${LIBSL} -lasn1 -lcrypto -lcrypt -lcom_err \ + -lreadline -lcurses +DPADD= ${LIBKADM5CLNT} ${LIBKRB5} ${LIBROKEN} ${LIBVERS} \ + ${LIBSL} ${LIBASN1} ${LIBCRYPTO} ${LIBCRYPT} ${LIBCOM_ERR} \ + ${LIBREADLINE} ${LIBCURSES} MAN= ktutil.8 .include <bsd.prog.mk> ==== //depot/projects/ia64/lib/libc/stdio/vsnprintf.c#7 (text+ko) ==== @@ -38,7 +38,7 @@ static char sccsid[] = "@(#)vsnprintf.c 8.1 (Berkeley) 6/4/93"; #endif /* LIBC_SCCS and not lint */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/lib/libc/stdio/vsnprintf.c,v 1.21 2002/09/17 11:28:24 maxim Exp $"); +__FBSDID("$FreeBSD: src/lib/libc/stdio/vsnprintf.c,v 1.22 2003/07/02 07:08:44 jkh Exp $"); #include <limits.h> #include <stdio.h> @@ -50,7 +50,7 @@ { size_t on; int ret; - char dummy; + char dummy[2]; FILE f; struct __sFILEX ext; @@ -61,8 +61,10 @@ n = INT_MAX; /* Stdio internals do not deal correctly with zero length buffer */ if (n == 0) { - str = &dummy; - n = 1; + if (on > 0) + *str = '\0'; + str = dummy; + n = 1; } f._file = -1; f._flags = __SWR | __SSTR; ==== //depot/projects/ia64/lib/libc_r/Makefile#5 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/lib/libc_r/Makefile,v 1.33 2003/07/01 15:07:01 ru Exp $ +# $FreeBSD: src/lib/libc_r/Makefile,v 1.35 2003/07/02 13:27:54 ru Exp $ # # All library objects contain FreeBSD revision strings by default; they may be # excluded as a space-saving measure. To produce a library that does ==== //depot/projects/ia64/lib/libc_r/arch/alpha/_atomic_lock.S#2 (text+ko) ==== @@ -19,11 +19,11 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/lib/libc_r/arch/alpha/_atomic_lock.S,v 1.3 1999/08/28 00:03:00 peter Exp $ + * $FreeBSD: src/lib/libc_r/arch/alpha/_atomic_lock.S,v 1.4 2003/07/02 13:27:54 ru Exp $ * */ -#include "SYS.h" +#include <machine/asm.h> /* * Atomicly lock a location with an identifier provided the location ==== //depot/projects/ia64/lib/libpthread/Makefile#10 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/lib/libpthread/Makefile,v 1.45 2003/07/01 15:37:35 ru Exp $ +# $FreeBSD: src/lib/libpthread/Makefile,v 1.46 2003/07/02 20:51:30 ru Exp $ # # All library objects contain FreeBSD revision strings by default; they may be # excluded as a space-saving measure. To produce a library that does @@ -35,3 +35,9 @@ .include "${.CURDIR}/thread/Makefile.inc" .include <bsd.lib.mk> + +# Can't put thr_support.c in SRCS but want it in .depend. +${DEPENDFILE}: thr_support.c + +# LIBC_PIC is defined only after <bsd.lib.mk> is included. +thr_libc.So: ${LIBC_PIC} ==== //depot/projects/ia64/lib/libpthread/support/Makefile.inc#3 (text+ko) ==== @@ -1,10 +1,9 @@ -# $FreeBSD: src/lib/libpthread/support/Makefile.inc,v 1.2 2003/06/08 03:58:20 imp Exp $ +# $FreeBSD: src/lib/libpthread/support/Makefile.inc,v 1.4 2003/07/02 20:52:39 ru Exp $ -.PATH: ${.CURDIR}/support +.PATH: ${.CURDIR}/support -SRCS += thr_support.c -SOBJS+= thr_libc.So +SOBJS+= thr_libc.So +CLEANFILES+= thr_support.So thr_libc.So: thr_support.So - ${CC} -nostdlib -o ${.TARGET} -Wl,-x,-r ${.ALLSRC} -lc_pic - + ${CC} -nostdlib -o ${.TARGET} -Wl,-r thr_support.So -lc_pic ==== //depot/projects/ia64/lib/libpthread/thread/thr_cancel.c#8 (text+ko) ==== @@ -1,6 +1,6 @@ /* * David Leonard <d@openbsd.org>, 1999. Public domain. - * $FreeBSD: src/lib/libpthread/thread/thr_cancel.c,v 1.22 2003/06/28 09:39:35 davidxu Exp $ + * $FreeBSD: src/lib/libpthread/thread/thr_cancel.c,v 1.23 2003/07/02 13:23:03 davidxu Exp $ */ #include <sys/errno.h> #include <pthread.h> @@ -75,7 +75,7 @@ pthread->cancelflags |= THR_CANCELLING; _thr_setrunnable_unlocked(pthread); if ((joinee != NULL) && - (curthread->kseg == joinee->kseg)) { + (pthread->kseg == joinee->kseg)) { /* Remove the joiner from the joinee. */ joinee->joiner = NULL; joinee = NULL; ==== //depot/projects/ia64/lib/libpthread/thread/thr_cond.c#13 (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.45 2003/06/28 09:40:57 davidxu Exp $ + * $FreeBSD: src/lib/libpthread/thread/thr_cond.c,v 1.46 2003/07/02 14:12:37 davidxu Exp $ */ #include <stdlib.h> #include <errno.h> @@ -539,8 +539,10 @@ /* The wait timedout. */ rval = ETIMEDOUT; (void)_mutex_cv_lock(mutex); - } else if (interrupted || done) + } else if (interrupted || done) { rval = _mutex_cv_lock(mutex); + unlock_mutex = 1; + } } } break; @@ -738,7 +740,7 @@ while ((pthread = TAILQ_FIRST(&cond->c_queue)) != NULL) { TAILQ_REMOVE(&cond->c_queue, pthread, sqe); - THR_CONDQ_SET(pthread); + THR_CONDQ_CLEAR(pthread); if ((pthread->timeout == 0) && (pthread->interrupted == 0)) /* * Only exit the loop when we find a thread ==== //depot/projects/ia64/lib/libthr/thread/thr_mutex.c#11 (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/libthr/thread/thr_mutex.c,v 1.14 2003/07/01 15:52:09 mtm Exp $ + * $FreeBSD: src/lib/libthr/thread/thr_mutex.c,v 1.15 2003/07/02 02:05:23 mtm Exp $ */ #include <stdlib.h> #include <errno.h> @@ -85,11 +85,11 @@ /* Single underscore versions provided for libc internal usage: */ __weak_reference(__pthread_mutex_trylock, pthread_mutex_trylock); __weak_reference(__pthread_mutex_lock, pthread_mutex_lock); +__weak_reference(__pthread_mutex_unlock, pthread_mutex_unlock); /* No difference between libc and application usage of these: */ __weak_reference(_pthread_mutex_init, pthread_mutex_init); __weak_reference(_pthread_mutex_destroy, pthread_mutex_destroy); -__weak_reference(_pthread_mutex_unlock, pthread_mutex_unlock); /* @@ -505,6 +505,9 @@ return (ret); } +/* + * Libc internal. + */ int _pthread_mutex_lock(pthread_mutex_t *mutex) { @@ -513,6 +516,8 @@ if (_thread_initial == NULL) _thread_init(); + _thread_sigblock(); + if (mutex == NULL) ret = EINVAL; @@ -524,13 +529,28 @@ ((ret = mutex_init(mutex, 1)) == 0)) ret = mutex_lock_common(mutex, 0); + if (ret != 0) + _thread_sigunblock(); + return (ret); } int +__pthread_mutex_unlock(pthread_mutex_t * mutex) +{ + return (mutex_unlock_common(mutex, /* add reference */ 0)); +} + +/* + * Libc internal + */ +int _pthread_mutex_unlock(pthread_mutex_t * mutex) { - return (mutex_unlock_common(mutex, /* add reference */ 0)); + int error; + if ((error = mutex_unlock_common(mutex, /* add reference */ 0)) == 0) + _thread_sigunblock(); + return (error); } int ==== //depot/projects/ia64/release/doc/ja_JP.eucJP/errata/article.sgml#14 (text+ko) ==== @@ -1,8 +1,8 @@ <!-- FreeBSD Japanese Documentation Project - $FreeBSD: src/release/doc/ja_JP.eucJP/errata/article.sgml,v 1.20 2003/06/09 22:54:00 rushani Exp $ - Original revision: 1.41 + $FreeBSD: src/release/doc/ja_JP.eucJP/errata/article.sgml,v 1.21 2003/07/02 21:04:48 hrs Exp $ + Original revision: 1.43 --> <!-- @@ -44,7 +44,7 @@ <corpauthor>&os; プロジェクト</corpauthor> - <pubdate>$FreeBSD: src/release/doc/ja_JP.eucJP/errata/article.sgml,v 1.20 2003/06/09 22:54:00 rushani Exp $</pubdate> + <pubdate>$FreeBSD: src/release/doc/ja_JP.eucJP/errata/article.sgml,v 1.21 2003/07/02 21:04:48 hrs Exp $</pubdate> <copyright> <year>2000</year> @@ -151,12 +151,25 @@ ]]> <![ %release.type.snapshot [ - <para>マニュアルページ &man.raid.4; に記載されている - RAIDframe ディスクドライバは、このリリースではうまく動作しません。</para> + <para>&man.raid.4; に記載されている + RAIDframe ディスクドライバは、このリリースでは正常に動作しません。</para> - <para>ACPI によって不安定になる i386 マシンがあるようです。 - ACPI 機能を無効にすると問題解決の役に立つかもしれません。 + <para>ACPI を有効にすると不安定になる i386 マシンがあるようです。 + ACPI 機能を無効にすると問題が解決する可能性があります。 <xref linkend="late-news"> にある項をご覧ください。</para> + + <para>整数演算のオーバフローが原因で、ある大きさのメモリを搭載した + マシンで PAE を有効にすると、カーネルがパニックする可能性があります。 + このバグは <literal>RELENG_5_1</literal>、<literal>HEAD</literal> + の、両方のブランチで修正されました。この問題を回避するには、 + メモリを少し減らして問題のあるシステムをアップグレードし、 + メモリを再度搭載してください。</para> + + <para><command>mount -u</command> を使って読み込み専用から読み書き可能に変更した + &man.msdosfs.5; ファイルシステムが、システムをロックさせてしまう可能性があります。 + この問題を回避するには、<command>mount -u</command> を使うのではなく、 + そのファイルシステムを一度アンマウントしてから、 + オプションを適切に設定して再マウントしてください。</para> ]]> <sect1 id="late-news"> @@ -168,27 +181,28 @@ <![ %release.type.snapshot [ <para>&man.ipfw.4; が alpha や sparc64 のような 64-bit - ストリクトアラインメント環境下で正しく動作するようになったはずです。</para> + アラインメントを厳密に要求する環境下でも正しく動作するようになっています。</para> - <para>i386 プラットフォーム では <filename>libthr</filename> ライブラリが - デフォルトで構築されるとリリースノートに明示すべきでした。</para> + <para>リリースノートには、i386 プラットフォーム では + <filename>libthr</filename> ライブラリがデフォルトで構築されることが + 書かれていませんでした。</para> <para>&os; &release.prev; には、 新しい起動ローダスクリプトが含まれています。 - これは &os; を異なるオプションで簡単に起動するために設計されたもので + これは &os; を異なるオプションで簡単に起動できるようにする目的で設計されたもので、 起動時の問題を診断する役に立つかもしれません。 - 既存の Forth ベースの起動ローダスクリプトを基にしているため、 - <filename>/boot/loader.conf</filename> および - 他のローダ設定ファイルを活用することができます。 + 既存の Forth ベースの起動ローダスクリプトを基にしています + (そのため、<filename>/boot/loader.conf</filename> や、 + 他の既存のローダ設定ファイルを読み込みます)。 なお、デフォルトでは、新規に - i386 マシンにバイナリインストールした時にのみ有効です。 - このスクリプトは起動メニューを表示し、 - &os; がどのように起動されるかを制御します。 + i386 マシンにバイナリインストールした時にのみ、インストールされます。 + この新しいスクリプトでは起動時に、&os; どのように起動するかを + 制御できるメニューを表示します。 具体的には、ACPI の無効化、<quote>安全モード</quote>、 シングルユーザモードや出力形式を詳細にするように 選択して起動することができます。 <quote>安全モード</quote> での起動は、 - システムのハードウェア互換性が不明瞭な時に特に便利です。 + ある搭載されているハードウェアに、システムが対応しているかどうか分からない時に便利です。 このモードではカーネル変数を次のように設定します。</para> <programlisting>hint.acpi.0.disabled=1 # ACPI を無効にします (i386 アーキテクチャのみ)。 @@ -197,16 +211,16 @@ hw.ata.wc=0 # IDE ディスクの書込みキャッシュを無効にします。 hw.eisa_slots=0 # EISA デバイスの検出を無効にします。</programlisting> - <para>i386 アーキテクチャマシンでの新規インストールでは、 - &man.sysinstall.8; は ACPI が - 新しい起動ローダスクリプトで上記のように無効にされているかどうかを判断し、 - もしそうならこの変更を恒久的に利用すべきかどうか尋ねます。</para> + <para>i386 アーキテクチャマシンの新規インストールでは、 + 新しい起動ローダスクリプトで ACPI が + 無効にされているかどうかを &man.sysinstall.8; が判断し、 + もしそうなら、変更をファイルに書き込むかどうか尋ねます。</para> - <para>OpenPAM、NSS 対応、PAE 対応、 + <para>リリースノートには、OpenPAM、NSS 対応、PAE 対応、 強制アクセス制御 (MAC) 機構のさまざまな更新、 - GEOM ディスクジオメトリシステムなどの機能を追加する作業は - 国防省高等研究開発局 (DARPA) に後援していただいたことを - リリースノートで言及すべきでした。</para> >>> TRUNCATED FOR MAIL (1000 lines) <<<
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200307030534.h635YWqU099646>