PERFORCE change 34039 for review
Peter Wemm
peter at FreeBSD.org
Thu Jul 3 15:54:02 PDT 2003
http://perforce.freebsd.org/chv.cgi?CH=34039
Change 34039 by peter at peter_daintree on 2003/07/03 15:53:02
IFC @34036
Affected files ...
.. //depot/projects/hammer/Makefile.inc1#22 integrate
.. //depot/projects/hammer/contrib/groff/tmac/doc-common#7 integrate
.. //depot/projects/hammer/contrib/groff/tmac/doc.tmac#5 integrate
.. //depot/projects/hammer/contrib/groff/tmac/groff_mdoc.man#5 integrate
.. //depot/projects/hammer/etc/motd#2 integrate
.. //depot/projects/hammer/kerberos5/Makefile.inc#6 integrate
.. //depot/projects/hammer/kerberos5/libexec/hprop/Makefile#3 integrate
.. //depot/projects/hammer/kerberos5/libexec/hpropd/Makefile#4 integrate
.. //depot/projects/hammer/kerberos5/libexec/ipropd-master/Makefile#5 integrate
.. //depot/projects/hammer/kerberos5/libexec/ipropd-slave/Makefile#5 integrate
.. //depot/projects/hammer/kerberos5/libexec/kadmind/Makefile#3 integrate
.. //depot/projects/hammer/kerberos5/libexec/kdc/Makefile#4 integrate
.. //depot/projects/hammer/kerberos5/libexec/kpasswdd/Makefile#3 integrate
.. //depot/projects/hammer/kerberos5/libexec/telnetd/Makefile#3 integrate
.. //depot/projects/hammer/kerberos5/usr.bin/kadmin/Makefile#4 integrate
.. //depot/projects/hammer/kerberos5/usr.bin/kdestroy/Makefile#2 integrate
.. //depot/projects/hammer/kerberos5/usr.bin/kinit/Makefile#2 integrate
.. //depot/projects/hammer/kerberos5/usr.bin/klist/Makefile#2 integrate
.. //depot/projects/hammer/kerberos5/usr.bin/kpasswd/Makefile#2 integrate
.. //depot/projects/hammer/kerberos5/usr.bin/ksu/Makefile#2 integrate
.. //depot/projects/hammer/kerberos5/usr.bin/telnet/Makefile#3 integrate
.. //depot/projects/hammer/kerberos5/usr.sbin/kstash/Makefile#3 integrate
.. //depot/projects/hammer/kerberos5/usr.sbin/ktutil/Makefile#4 integrate
.. //depot/projects/hammer/lib/libc/gen/exec.3#5 integrate
.. //depot/projects/hammer/lib/libpthread/Makefile#10 integrate
.. //depot/projects/hammer/lib/libpthread/support/Makefile.inc#3 integrate
.. //depot/projects/hammer/lib/libpthread/thread/thr_kern.c#15 integrate
.. //depot/projects/hammer/lib/libpthread/thread/thr_select.c#3 integrate
.. //depot/projects/hammer/lib/libthr/thread/thr_mutex.c#11 integrate
.. //depot/projects/hammer/release/doc/en_US.ISO8859-1/relnotes/common/new.sgml#32 integrate
.. //depot/projects/hammer/release/doc/ja_JP.eucJP/errata/article.sgml#7 integrate
.. //depot/projects/hammer/secure/usr.bin/ssh/Makefile#6 integrate
.. //depot/projects/hammer/secure/usr.sbin/sshd/Makefile#6 integrate
.. //depot/projects/hammer/share/man/man4/umass.4#8 integrate
.. //depot/projects/hammer/share/man/man5/group.5#3 integrate
.. //depot/projects/hammer/share/man/man5/linprocfs.5#3 integrate
.. //depot/projects/hammer/share/man/man9/bus_dma.9#4 integrate
.. //depot/projects/hammer/share/mk/bsd.dep.mk#6 integrate
.. //depot/projects/hammer/share/mk/bsd.libnames.mk#14 integrate
.. //depot/projects/hammer/sys/alpha/alpha/mp_machdep.c#5 integrate
.. //depot/projects/hammer/sys/alpha/alpha/pmap.c#13 integrate
.. //depot/projects/hammer/sys/amd64/amd64/pmap.c#22 integrate
.. //depot/projects/hammer/sys/dev/firewire/fwohci_pci.c#11 integrate
.. //depot/projects/hammer/sys/dev/fxp/if_fxp.c#20 integrate
.. //depot/projects/hammer/sys/dev/lge/if_lge.c#7 integrate
.. //depot/projects/hammer/sys/dev/nge/if_nge.c#7 integrate
.. //depot/projects/hammer/sys/dev/pccbb/pccbb.c#15 integrate
.. //depot/projects/hammer/sys/dev/txp/if_txp.c#6 integrate
.. //depot/projects/hammer/sys/dev/wi/if_wi.c#14 integrate
.. //depot/projects/hammer/sys/fs/msdosfs/msdosfs_vnops.c#7 integrate
.. //depot/projects/hammer/sys/i386/i386/pmap.c#12 integrate
.. //depot/projects/hammer/sys/i386/isa/pcvt/pcvt_drv.c#5 integrate
.. //depot/projects/hammer/sys/ia64/ia64/pmap.c#16 integrate
.. //depot/projects/hammer/sys/kern/kern_sig.c#18 integrate
.. //depot/projects/hammer/sys/kern/kern_thr.c#10 integrate
.. //depot/projects/hammer/sys/kern/kern_thread.c#31 integrate
.. //depot/projects/hammer/sys/pci/if_dc.c#14 integrate
.. //depot/projects/hammer/sys/pci/if_pcn.c#8 integrate
.. //depot/projects/hammer/sys/pci/if_rl.c#14 integrate
.. //depot/projects/hammer/sys/pci/if_sf.c#9 integrate
.. //depot/projects/hammer/sys/pci/if_sis.c#11 integrate
.. //depot/projects/hammer/sys/pci/if_sk.c#8 integrate
.. //depot/projects/hammer/sys/pci/if_ste.c#10 integrate
.. //depot/projects/hammer/sys/pci/if_vr.c#8 integrate
.. //depot/projects/hammer/sys/pci/if_wb.c#8 integrate
.. //depot/projects/hammer/sys/pci/if_xl.c#15 integrate
.. //depot/projects/hammer/sys/powerpc/powerpc/pmap.c#11 integrate
.. //depot/projects/hammer/sys/sparc64/sparc64/pmap.c#15 integrate
.. //depot/projects/hammer/sys/sys/param.h#16 integrate
.. //depot/projects/hammer/sys/sys/signalvar.h#8 integrate
.. //depot/projects/hammer/sys/vm/pmap.h#11 integrate
.. //depot/projects/hammer/sys/vm/vm_map.c#16 integrate
.. //depot/projects/hammer/usr.sbin/watchdogd/Makefile#2 integrate
.. //depot/projects/hammer/usr.sbin/watchdogd/watchdogd.c#2 integrate
Differences ...
==== //depot/projects/hammer/Makefile.inc1#22 (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/hammer/contrib/groff/tmac/doc-common#7 (text+ko) ====
@@ -101,7 +101,7 @@
.nr Ft 8n\" ?
.nr Fx 1
.nr Ic 10n
-.nr In 12n\" ?
+.nr In 12n
.nr It 8n\" ?
.nr Lb 11n
.nr Li 16n
@@ -587,6 +587,25 @@
..
.
.
+.\" NS doc-check-depth macro
+.\" NS check paired macros
+.
+.de doc-check-depth
+. if \n[doc-list-depth] \{\
+. tm mdoc warning: A .Bl directive has no matching .El (#\n[.c])
+. nr doc-list-depth 0
+. \}
+. if \n[doc-display-depth] \{\
+. tm mdoc warning: A .Bd directive has no matching .Ed (#\n[.c])
+. nr doc-display-depth 0
+. \}
+. if \n[doc-fontmode-depth] \{\
+. tm mdoc warning: A .Bf directive has no matching .Ef (#\n[.c])
+. nr doc-fontmode-depth 0
+. \}
+..
+.
+.
.\" NS doc-end-macro macro
.\" NS finish output
.
@@ -603,8 +622,7 @@
. pl +3v
. fl
.
-. if \n[doc-list-depth] \
-. tm mdoc warning: list open at EOF! A .Bl directive has no matching .El
+. doc-check-depth
.
. if \n[cR] \{\
. sp
@@ -834,6 +852,8 @@
.
. in +\n[doc-subheader-indent]u
. ns
+.
+. doc-check-depth
. \}
..
.
@@ -898,6 +918,8 @@
. ne 2
. br
. ns
+.
+. doc-check-depth
. \}
..
.
==== //depot/projects/hammer/contrib/groff/tmac/doc.tmac#5 (text+ko) ====
@@ -683,7 +683,7 @@
. nr doc-curr-size \n[.ps]
.
. ie \n[doc-in-synopsis-section] \{\
-. if "\*[doc-macro-name]"Cd" \{\
+. ie "\*[doc-macro-name]"Cd" \{\
. br
. if !\n[doc-indent-synopsis] \
. nr doc-indent-synopsis \n[doc-display-indent]u
@@ -694,6 +694,10 @@
. doc-print-recursive
. if !\n[doc-indent-synopsis-active] \
. in -\n[doc-indent-synopsis]u
+. \}
+. el \{\
+. nop \*[doc-Nm-font]\c
+. doc-print-recursive
. \}\}
. el \{\
. nop \*[doc-Nm-font]\c
@@ -820,22 +824,64 @@
.
.
.\" NS In user macro
-.\" NS #include statement - not callable
+.\" NS #include statement in SYNOPSIS
+.\" NS <header.h> if not in SYNOPSIS
.\" NS
.\" NS this function causes a break; it uses the `Fd' font
.\" NS
+.\" NS modifies:
+.\" NS doc-arg-ptr
+.\" NS doc-curr-font
+.\" NS doc-curr-size
+.\" NS doc-indent-synopsis
+.\" NS doc-macro-name
+.\" NS
.\" NS width register `In' set in doc-common
.
.de In
-. ie ((\n[.$] == 1) & (\n[doc-arg-limit] == 0)) \{\
-. doc-do-func-decl
-. nop \*[doc-Fd-font]#include <\$1>
-. br
-. ft \n[doc-curr-font]
-. ps \n[doc-curr-size]u
+. if !\n[doc-arg-limit] \{\
+. ie \n[.$] \{\
+. ds doc-macro-name In
+. doc-parse-args \$@
+. \}
+. el \
+. tm Usage: .In include_file ... (#\n[.c])
. \}
+.
+. if !\n[doc-arg-limit] \
+. return
+.
+. nr doc-arg-ptr +1
+. doc-print-prefixes
+. ie ((\n[doc-arg-limit] >= \n[doc-arg-ptr]) & (\n[doc-type\n[doc-arg-ptr]] == 2)) \{\
+. nr doc-curr-font \n[.f]
+. nr doc-curr-size \n[.ps]
+.
+. ie \n[doc-in-synopsis-section] \{\
+. ie "\*[doc-macro-name]"In" \{\
+. doc-do-func-decl
+. nop \*[doc-Fd-font]#include <\*[doc-arg\n[doc-arg-ptr]]>
+. ft \n[doc-curr-font]
+. ps \n[doc-curr-size]u
+. br
+. nr doc-arg-ptr +1
+. ie (\n[doc-arg-limit] >= \n[doc-arg-ptr]) \
+. doc-print-recursive
+. el \
+. doc-reset-args
+. \}
+. el \{\
+. ds doc-arg\n[doc-arg-ptr] "<\*[doc-Pa-font]\*[doc-arg\n[doc-arg-ptr]]
+. as doc-arg\n[doc-arg-ptr] \f[\n[doc-curr-font]]\s[\n[doc-curr-size]u]>
+. doc-print-recursive
+. \}\}
+. el \{\
+. ds doc-arg\n[doc-arg-ptr] "<\*[doc-Pa-font]\*[doc-arg\n[doc-arg-ptr]]
+. as doc-arg\n[doc-arg-ptr] \f[\n[doc-curr-font]]\s[\n[doc-curr-size]u]>
+. doc-print-recursive
+. \}\}
. el \{\
-. tm Usage: .In include_file -- In is not callable (#\n[.c])
+. tm Usage: .In include_file ... (#\n[.c])
. doc-reset-args
. \}
..
@@ -4676,13 +4722,16 @@
. ds doc-arg\n[doc-arg-ptr] "\*[doc-func-arg]
.
. if (\n[doc-func-arg-count] > 1) \{\
-. nop \f[\n[doc-curr-font]]\s[\n[doc-curr-size]u]\|,\)\c
+. nop \f[\n[doc-curr-font]]\s[\n[doc-curr-size]u]\|\c
+. if !"\*[doc-arg\n[doc-arg-ptr]]"/*" \
+. if !"\*[doc-arg\n[doc-arg-ptr]]"*/" \
+. nop ,\)\c
. nop \)\*[doc-space\n[doc-arg-ptr]]\*[doc-Fa-font]\c
. nop \)\*[doc-arg\n[doc-arg-ptr]]\f[]\s[0]\c
. \}
.
. if (\n[doc-func-arg-count] == 1) \{\
-. nop \|\*[doc-Fa-font]\*[doc-arg\n[doc-arg-ptr]]\c
+. nop \)\*[doc-Fa-font]\*[doc-arg\n[doc-arg-ptr]]\c
. nop \f[]\s[0]\c
. \}
. nr doc-func-arg-count +1
@@ -4755,7 +4804,7 @@
.
. br
. if !\n[doc-indent-synopsis] \
-. nr doc-indent-synopsis (8u * \n[doc-fixed-width]u)
+. nr doc-indent-synopsis (4u * \n[doc-fixed-width]u)
. if !\n[doc-indent-synopsis-active] \
. in +\n[doc-indent-synopsis]u
. ti -\n[doc-indent-synopsis]u
@@ -4833,7 +4882,10 @@
. if (\n[doc-arg-limit] >= \n[doc-arg-ptr]) \{\
. if (\n[doc-type\n[doc-arg-ptr]] == 2) \{\
. nr doc-reg-ddfa (\n[doc-arg-ptr] - 1)
-. nop \|\f[\n[doc-curr-font]]\s[\n[doc-curr-size]u],\)\c
+. nop \f[\n[doc-curr-font]]\s[\n[doc-curr-size]u]\|\c
+. if !"\*[doc-arg\n[doc-arg-ptr]]"/*" \
+. if !"\*[doc-arg\n[doc-arg-ptr]]"*/" \
+. nop ,\)\c
. nop \)\*[doc-space\n[doc-reg-ddfa]]\f[]\s[0]\|\c
. doc-do-func-args
. \}\}
@@ -4917,7 +4969,7 @@
.
. br
. if !\n[doc-indent-synopsis] \
-. nr doc-indent-synopsis (8u * \n[doc-fixed-width]u)
+. nr doc-indent-synopsis (4u * \n[doc-fixed-width]u)
. \}
.
. \" start function box
@@ -6133,19 +6185,19 @@
.
.ds doc-str-Rv-std-prefix "The
.ds doc-str-Rv-std-suffix "function returns the value\~0 if successful;
-.as doc-str-Rv-std-suffix " otherwise the value\~-1 is returned and
+.as doc-str-Rv-std-suffix " otherwise the value\~\-1 is returned and
.as doc-str-Rv-std-suffix " the global variable \*[doc-Va-font]errno\f[]
.as doc-str-Rv-std-suffix " is set to indicate the error.
.
.ds doc-str-Rv-stds-prefix "The
.ds doc-str-Rv-stds-and "and
.ds doc-str-Rv-stds-suffix "functions return the value\~0 if successful;
-.as doc-str-Rv-stds-suffix " otherwise the value\~-1 is returned and
+.as doc-str-Rv-stds-suffix " otherwise the value\~\-1 is returned and
.as doc-str-Rv-stds-suffix " the global variable \*[doc-Va-font]errno\f[]
.as doc-str-Rv-stds-suffix " is set to indicate the error.
.
.ds doc-str-Rv-std0 "Upon successful completion, the value\~0 is returned;
-.as doc-str-Rv-std0 " otherwise the value\~-1 is returned and
+.as doc-str-Rv-std0 " otherwise the value\~\-1 is returned and
.as doc-str-Rv-std0 " the global variable \*[doc-Va-font]errno\f[]
.as doc-str-Rv-std0 " is set to indicate the error.
.
==== //depot/projects/hammer/contrib/groff/tmac/groff_mdoc.man#5 (text+ko) ====
@@ -1398,15 +1398,25 @@
.Pp
The
.Ql .In
-.Li ( #include
-statement)
-macro is the short form of the above example.
+macro, while in the
+.Sx SYNOPSIS
+section, represents the
+.Li #include
+statement, and is the short form of the above example.
It specifies the C\~header file as being included in a C\~program.
-It also causes a line break, and is neither callable nor parsed.
+It also causes a line break.
+.Pp
+While not in the
+.Sx SYNOPSIS
+section, it represents the header file enclosed in angle brackets.
.Pp
.Dl Usage: .In Ao header file Ac
.Pp
.Bl -tag -width ".Li .In\ stdio.h" -compact -offset 15n
+.nr in-synopsis-section 1
+.It Li ".In stdio.h"
+.In stdio.h
+.nr in-synopsis-section 0
.It Li ".In stdio.h"
.In stdio.h
.El
==== //depot/projects/hammer/etc/motd#2 (text+ko) ====
@@ -17,7 +17,7 @@
`uname -a', along with any relevant error messages, and email it
as a question to the questions at FreeBSD.org mailing list. If you are
unfamiliar with FreeBSD's directory layout, please refer to the hier(7)
-man page. If you are not familiar with man pages, type `man man'.
+manual page. If you are not familiar with manual pages, type `man man'.
You may also use sysinstall(8) to re-enter the installation and
configuration utility. Edit /etc/motd to change this login announcement.
==== //depot/projects/hammer/kerberos5/Makefile.inc#6 (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/hammer/kerberos5/libexec/hprop/Makefile#3 (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/hammer/kerberos5/libexec/hpropd/Makefile#4 (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/hammer/kerberos5/libexec/ipropd-master/Makefile#5 (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/hammer/kerberos5/libexec/ipropd-slave/Makefile#5 (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/hammer/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/hammer/kerberos5/libexec/kdc/Makefile#4 (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/hammer/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/hammer/kerberos5/libexec/telnetd/Makefile#3 (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/hammer/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/hammer/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/hammer/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/hammer/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/hammer/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/hammer/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/hammer/kerberos5/usr.bin/telnet/Makefile#3 (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/hammer/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/hammer/kerberos5/usr.sbin/ktutil/Makefile#4 (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/hammer/lib/libc/gen/exec.3#5 (text+ko) ====
@@ -30,7 +30,7 @@
.\" SUCH DAMAGE.
.\"
.\" @(#)exec.3 8.3 (Berkeley) 1/24/94
-.\" $FreeBSD: src/lib/libc/gen/exec.3,v 1.21 2003/06/29 17:33:34 gordon Exp $
+.\" $FreeBSD: src/lib/libc/gen/exec.3,v 1.22 2003/07/03 18:14:39 ru Exp $
.\"
.Dd January 24, 1994
.Dt EXEC 3
@@ -50,11 +50,17 @@
.In unistd.h
.Vt extern char **environ ;
.Ft int
-.Fn execl "const char *path" "const char *arg" "... /*" "(char *)0*/"
+.Fn execl "const char *path" "const char *arg" ... /* "(char *)0" */
.Ft int
-.Fn execlp "const char *file" "const char *arg" "... /*" "(char *)0*/"
+.Fn execlp "const char *file" "const char *arg" ... /* "(char *)0" */
.Ft int
-.Fn execle "const char *path" "const char *arg" "... /*" "(char *)0" "char *const envp[]*/"
+.Fo execle
+.Fa "const char *path" "const char *arg" ...
+.Fa /*
+.Bk -words
+.Fa "(char *)0" "char *const envp[]" */
+.Ek
+.Fc
.Ft int
.Fn exect "const char *path" "char *const argv[]" "char *const envp[]"
.Ft int
==== //depot/projects/hammer/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/hammer/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/hammer/lib/libpthread/thread/thr_kern.c#15 (text+ko) ====
@@ -33,7 +33,7 @@
*
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/lib/libpthread/thread/thr_kern.c,v 1.74 2003/06/30 06:16:50 davidxu Exp $");
+__FBSDID("$FreeBSD: src/lib/libpthread/thread/thr_kern.c,v 1.75 2003/07/03 10:12:21 davidxu Exp $");
#include <sys/types.h>
#include <sys/kse.h>
@@ -673,7 +673,8 @@
/*
* This thread is being resumed; check for cancellations.
*/
- if ((psf.psf_valid || curthread->check_pending)) {
+ if ((psf.psf_valid ||
+ (curthread->check_pending && !THR_IN_CRITICAL(curthread)))) {
resume_once = 0;
THR_GETCONTEXT(&uc);
if (resume_once == 0) {
==== //depot/projects/hammer/lib/libpthread/thread/thr_select.c#3 (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_select.c,v 1.24 2003/04/18 05:04:16 deischen Exp $
+ * $FreeBSD: src/lib/libpthread/thread/thr_select.c,v 1.25 2003/07/03 13:36:29 davidxu Exp $
*/
#include <unistd.h>
#include <errno.h>
@@ -50,11 +50,16 @@
struct timeval *timeout)
{
struct pthread *curthread = _get_curthread();
+ struct timespec ts;
int ret;
- _thr_enter_cancellation_point(curthread);
- ret = __sys_select(numfds, readfds, writefds, exceptfds, timeout);
- _thr_leave_cancellation_point(curthread);
-
+ if (numfds == 0 && timeout != NULL) {
+ TIMEVAL_TO_TIMESPEC(timeout, &ts);
+ return nanosleep(&ts, NULL);
+ } else {
+ _thr_enter_cancellation_point(curthread);
+ ret = __sys_select(numfds, readfds, writefds, exceptfds, timeout);
+ _thr_leave_cancellation_point(curthread);
+ }
return ret;
>>> TRUNCATED FOR MAIL (1000 lines) <<<
More information about the p4-projects
mailing list