PERFORCE change 34231 for review
Marcel Moolenaar
marcel at FreeBSD.org
Wed Jul 9 00:06:11 PDT 2003
http://perforce.freebsd.org/chv.cgi?CH=34231
Change 34231 by marcel at marcel_nfs on 2003/07/09 00:05:10
IFC @34224
Affected files ...
.. //depot/projects/ia64/MAINTAINERS#32 integrate
.. //depot/projects/ia64/Makefile.inc1#72 integrate
.. //depot/projects/ia64/bin/rmail/Makefile#4 integrate
.. //depot/projects/ia64/contrib/cvs/src/main.c#4 integrate
.. //depot/projects/ia64/contrib/groff/tmac/doc.tmac#7 integrate
.. //depot/projects/ia64/etc/Makefile#31 integrate
.. //depot/projects/ia64/etc/mail/Makefile#13 integrate
.. //depot/projects/ia64/etc/rc.d/ypbind#6 integrate
.. //depot/projects/ia64/etc/rc.d/yppasswdd#6 integrate
.. //depot/projects/ia64/etc/rc.d/ypserv#7 integrate
.. //depot/projects/ia64/etc/rc.d/ypset#5 integrate
.. //depot/projects/ia64/etc/rc.d/ypupdated#4 integrate
.. //depot/projects/ia64/etc/rc.d/ypxfrd#5 integrate
.. //depot/projects/ia64/etc/rc.shutdown#8 integrate
.. //depot/projects/ia64/etc/sendmail/Makefile#10 integrate
.. //depot/projects/ia64/gnu/usr.bin/cvs/lib/config.h.proto#2 integrate
.. //depot/projects/ia64/lib/libc/locale/setlocale.c#8 integrate
.. //depot/projects/ia64/lib/libc/locale/setlocale.h#4 integrate
.. //depot/projects/ia64/lib/libc/locale/setrunelocale.c#7 integrate
.. //depot/projects/ia64/lib/libmilter/Makefile#3 integrate
.. //depot/projects/ia64/lib/libpthread/thread/thr_attr_get_np.c#3 integrate
.. //depot/projects/ia64/lib/libpthread/thread/thr_cancel.c#9 integrate
.. //depot/projects/ia64/lib/libpthread/thread/thr_getschedparam.c#3 integrate
.. //depot/projects/ia64/lib/libpthread/thread/thr_info.c#4 integrate
.. //depot/projects/ia64/lib/libpthread/thread/thr_join.c#6 integrate
.. //depot/projects/ia64/lib/libpthread/thread/thr_kern.c#24 integrate
.. //depot/projects/ia64/lib/libpthread/thread/thr_mutex_prioceiling.c#3 integrate
.. //depot/projects/ia64/lib/libpthread/thread/thr_sig.c#15 integrate
.. //depot/projects/ia64/lib/libpthread/thread/thr_sigaction.c#5 integrate
.. //depot/projects/ia64/lib/libpthread/thread/thr_sigmask.c#5 integrate
.. //depot/projects/ia64/lib/libpthread/thread/thr_sigpending.c#5 integrate
.. //depot/projects/ia64/lib/libpthread/thread/thr_sigsuspend.c#7 integrate
.. //depot/projects/ia64/lib/libsm/Makefile#3 integrate
.. //depot/projects/ia64/lib/libsmdb/Makefile#4 integrate
.. //depot/projects/ia64/lib/libsmutil/Makefile#4 integrate
.. //depot/projects/ia64/lib/libthr/thread/thr_cancel.c#6 integrate
.. //depot/projects/ia64/lib/libthr/thread/thr_detach.c#5 integrate
.. //depot/projects/ia64/lib/libthr/thread/thr_exit.c#8 integrate
.. //depot/projects/ia64/lib/libthr/thread/thr_gc.c#8 integrate
.. //depot/projects/ia64/lib/libthr/thread/thr_init.c#8 integrate
.. //depot/projects/ia64/lib/libthr/thread/thr_join.c#9 integrate
.. //depot/projects/ia64/lib/libthr/thread/thr_kern.c#9 integrate
.. //depot/projects/ia64/lib/libthr/thread/thr_mutex.c#13 integrate
.. //depot/projects/ia64/lib/libthr/thread/thr_private.h#9 integrate
.. //depot/projects/ia64/lib/libthr/thread/thr_spinlock.c#6 integrate
.. //depot/projects/ia64/libexec/mail.local/Makefile#3 integrate
.. //depot/projects/ia64/libexec/smrsh/Makefile#3 integrate
.. //depot/projects/ia64/release/doc/en_US.ISO8859-1/relnotes/common/new.sgml#102 integrate
.. //depot/projects/ia64/sbin/ipfw/ipfw.8#22 integrate
.. //depot/projects/ia64/sbin/ipfw/ipfw2.c#20 integrate
.. //depot/projects/ia64/share/doc/psd/21.ipc/3.t#3 integrate
.. //depot/projects/ia64/share/doc/psd/21.ipc/4.t#2 integrate
.. //depot/projects/ia64/share/doc/smm/08.sendmailop/Makefile#3 integrate
.. //depot/projects/ia64/share/examples/etc/make.conf#33 integrate
.. //depot/projects/ia64/share/man/man4/divert.4#4 integrate
.. //depot/projects/ia64/share/man/man5/Makefile#13 integrate
.. //depot/projects/ia64/share/man/man5/config.5#1 branch
.. //depot/projects/ia64/share/man/man5/make.conf.5#37 integrate
.. //depot/projects/ia64/share/man/man5/utmp.5#6 integrate
.. //depot/projects/ia64/share/man/man7/build.7#7 integrate
.. //depot/projects/ia64/share/man/man7/security.7#7 integrate
.. //depot/projects/ia64/share/sendmail/Makefile#5 integrate
.. //depot/projects/ia64/share/syscons/keymaps/norwegian.iso.kbd#2 integrate
.. //depot/projects/ia64/sys/alpha/alpha/pmap.c#35 integrate
.. //depot/projects/ia64/sys/amd64/amd64/pmap.c#10 integrate
.. //depot/projects/ia64/sys/conf/NOTES#56 integrate
.. //depot/projects/ia64/sys/conf/files#85 integrate
.. //depot/projects/ia64/sys/dev/acpica/acpi_isab.c#1 branch
.. //depot/projects/ia64/sys/dev/pci/isa_pci.c#4 integrate
.. //depot/projects/ia64/sys/dev/sound/pci/ich.c#15 integrate
.. //depot/projects/ia64/sys/dev/sound/pcm/feeder.c#11 integrate
.. //depot/projects/ia64/sys/dev/sound/pcm/feeder.h#3 integrate
.. //depot/projects/ia64/sys/dev/usb/umct.c#3 integrate
.. //depot/projects/ia64/sys/dev/wi/if_wi_pccard.c#22 integrate
.. //depot/projects/ia64/sys/geom/geom_dump.c#22 integrate
.. //depot/projects/ia64/sys/i386/i386/pmap.c#49 integrate
.. //depot/projects/ia64/sys/i386/i386/sys_machdep.c#17 integrate
.. //depot/projects/ia64/sys/i386/i386/vm_machdep.c#27 integrate
.. //depot/projects/ia64/sys/isa/isa_common.c#9 integrate
.. //depot/projects/ia64/sys/isa/isavar.h#4 integrate
.. //depot/projects/ia64/sys/isa/psm.c#16 integrate
.. //depot/projects/ia64/sys/kern/sched_ule.c#22 integrate
.. //depot/projects/ia64/sys/kern/subr_param.c#9 integrate
.. //depot/projects/ia64/sys/kern/sys_pipe.c#33 integrate
.. //depot/projects/ia64/sys/modules/acpi/Makefile#10 integrate
.. //depot/projects/ia64/sys/net/if_vlan.c#14 integrate
.. //depot/projects/ia64/sys/net/if_vlan_var.h#7 integrate
.. //depot/projects/ia64/sys/netinet/ip_fw2.c#23 integrate
.. //depot/projects/ia64/sys/pci/if_dc.c#39 integrate
.. //depot/projects/ia64/sys/pci/if_dcreg.h#13 integrate
.. //depot/projects/ia64/sys/sparc64/sparc64/pmap.c#41 integrate
.. //depot/projects/ia64/sys/sys/pipe.h#5 integrate
.. //depot/projects/ia64/sys/vm/vm_pageout.c#42 integrate
.. //depot/projects/ia64/usr.bin/calendar/calendars/calendar.freebsd#33 integrate
.. //depot/projects/ia64/usr.bin/login/login.1#4 integrate
.. //depot/projects/ia64/usr.bin/vacation/Makefile#4 integrate
.. //depot/projects/ia64/usr.sbin/config/config.y#4 integrate
.. //depot/projects/ia64/usr.sbin/daemon/daemon.c#2 integrate
.. //depot/projects/ia64/usr.sbin/editmap/Makefile#2 integrate
.. //depot/projects/ia64/usr.sbin/fdcontrol/fdcontrol.8#4 integrate
.. //depot/projects/ia64/usr.sbin/jail/jail.c#7 integrate
.. //depot/projects/ia64/usr.sbin/lpr/lpd/lpd.c#6 integrate
.. //depot/projects/ia64/usr.sbin/mailstats/Makefile#3 integrate
.. //depot/projects/ia64/usr.sbin/mailwrapper/mailwrapper.c#3 integrate
.. //depot/projects/ia64/usr.sbin/makemap/Makefile#3 integrate
.. //depot/projects/ia64/usr.sbin/mtest/mtest.c#2 integrate
.. //depot/projects/ia64/usr.sbin/pppctl/pppctl.c#2 integrate
.. //depot/projects/ia64/usr.sbin/praliases/Makefile#3 integrate
.. //depot/projects/ia64/usr.sbin/repquota/repquota.8#5 integrate
.. //depot/projects/ia64/usr.sbin/repquota/repquota.c#7 integrate
.. //depot/projects/ia64/usr.sbin/rtprio/rtprio.c#2 integrate
.. //depot/projects/ia64/usr.sbin/rwhod/rwhod.8#4 integrate
.. //depot/projects/ia64/usr.sbin/rwhod/rwhod.c#4 integrate
.. //depot/projects/ia64/usr.sbin/sendmail/Makefile#8 integrate
.. //depot/projects/ia64/usr.sbin/timed/timed/timed.c#3 integrate
.. //depot/projects/ia64/usr.sbin/timed/timedc/cmds.c#5 integrate
Differences ...
==== //depot/projects/ia64/MAINTAINERS#32 (text+ko) ====
@@ -1,4 +1,4 @@
-$FreeBSD: src/MAINTAINERS,v 1.72 2003/06/16 16:12:05 obrien Exp $
+$FreeBSD: src/MAINTAINERS,v 1.73 2003/07/07 03:54:02 gshapiro Exp $
subsystem login notes
-----------------------------
@@ -86,7 +86,6 @@
stating your preferences here instead.
bin/dd/Makefile:MAINTAINER= green at FreeBSD.org
-bin/rmail/Makefile:MAINTAINER= gshapiro at FreeBSD.org
contrib/cvs/FREEBSD-upgrade:MAINTAINER= peter at FreeBSD.org
games/fortune/datfiles/Makefile:MAINTAINER= jkh at FreeBSD.org
gnu/usr.bin/cvs/Makefile:MAINTAINER= peter at FreeBSD.org
@@ -98,14 +97,8 @@
gnu/usr.bin/cvs/libdiff/Makefile:MAINTAINER= peter at FreeBSD.org
gnu/usr.bin/man/apropos/Makefile:MAINTAINER= wosch at FreeBSD.org
lib/libc/posix1e/Makefile.inc:MAINTAINER= rwatson at FreeBSD.org
-lib/libmilter/Makefile:MAINTAINER= gshapiro at FreeBSD.org
-lib/libsm/Makefile:MAINTAINER= gshapiro at FreeBSD.org
-lib/libsmdb/Makefile:MAINTAINER= gshapiro at FreeBSD.org
-lib/libsmutil/Makefile:MAINTAINER= gshapiro at FreeBSD.org
lib/libusbhid/Makefile:MAINTAINER= n_hibma at FreeBSD.ORG
lib/libz/Makefile:MAINTAINER= peter at FreeBSD.org
-libexec/mail.local/Makefile:MAINTAINER= gshapiro at FreeBSD.org
-libexec/smrsh/Makefile:MAINTAINER= gshapiro at FreeBSD.org
sbin/dhclient/Makefile.inc:MAINTAINER= murray at FreeBSD.org
sbin/ffsinfo/Makefile:MAINTAINER= tomsoft at FreeBSD.ORG, chm at FreeBSD.ORG
sbin/growfs/Makefile:MAINTAINER= tomsoft at FreeBSD.ORG, chm at FreeBSD.ORG
@@ -114,8 +107,6 @@
sbin/ipfstat/Makefile:MAINTAINER= darrenr at freebsd.org
sbin/ipmon/Makefile:MAINTAINER= darrenr at freebsd.org
sbin/ipnat/Makefile:MAINTAINER= darrenr at freebsd.org
-share/doc/smm/08.sendmailop/Makefile:MAINTAINER= gshapiro at FreeBSD.org
-share/sendmail/Makefile:MAINTAINER= gshapiro at FreeBSD.org
sys/boot/i386/cdboot/Makefile:MAINTAINER= jhb at FreeBSD.org
sys/boot/i386/pxeldr/Makefile:MAINTAINER= jhb at FreeBSD.org
sys/compat/svr4/Makefile:MAINTAINER= newton at freebsd.org
@@ -146,18 +137,12 @@
sys/modules/uscanner/Makefile:MAINTAINER= n_hibma at freebsd.org
usr.bin/chat/Makefile:MAINTAINER= peter at freebsd.org
usr.bin/locate/Makefile:MAINTAINER= wosch at FreeBSD.org
-usr.bin/vacation/Makefile:MAINTAINER= gshapiro at FreeBSD.org
-usr.sbin/editmap/Makefile:MAINTAINER= gshapiro at FreeBSD.org
usr.sbin/inetd/Makefile:MAINTAINER= dwmalone at FreeBSD.org
usr.sbin/ipftest/Makefile:MAINTAINER= darrenr at freebsd.org
usr.sbin/ipresend/Makefile:MAINTAINER= darrenr at freebsd.org
usr.sbin/ipsend/Makefile:MAINTAINER= darrenr at freebsd.org
usr.sbin/iptest/Makefile:MAINTAINER= darrenr at freebsd.org
-usr.sbin/mailstats/Makefile:MAINTAINER= gshapiro at FreeBSD.org
-usr.sbin/makemap/Makefile:MAINTAINER= gshapiro at FreeBSD.org
usr.sbin/ntp/doc/Makefile:MAINTAINER= sheldonh at FreeBSD.org
usr.sbin/pppd/Makefile:MAINTAINER= peter at freebsd.org
usr.sbin/pppstats/Makefile:MAINTAINER= peter at freebsd.org
-usr.sbin/praliases/Makefile:MAINTAINER= gshapiro at FreeBSD.org
-usr.sbin/sendmail/Makefile:MAINTAINER= gshapiro at FreeBSD.org
usr.sbin/zic/Makefile:MAINTAINER= wollman at FreeBSD.org
==== //depot/projects/ia64/Makefile.inc1#72 (text+ko) ====
@@ -1,5 +1,5 @@
#
-# $FreeBSD: src/Makefile.inc1,v 1.375 2003/07/04 14:27:06 ru Exp $
+# $FreeBSD: src/Makefile.inc1,v 1.377 2003/07/08 01:24:21 obrien Exp $
#
# Make command line options:
# -DNO_KERBEROS Do not build Heimdal (Kerberos 5)
@@ -373,11 +373,11 @@
#
installcheck:
.if !defined(NO_SENDMAIL)
- @if ! `grep -q '^smmsp:' /etc/passwd`; then \
+ @if ! `id -u smmsp > /dev/null`; then \
echo "ERROR: Required smmsp user is missing, see /usr/src/UPDATING."; \
false; \
fi
- @if ! `grep -q '^smmsp:' /etc/group`; then \
+ @if ! `id -g smmsp > /dev/null`; then \
echo "ERROR: Required smmsp group is missing, see /usr/src/UPDATING."; \
false; \
fi
@@ -667,7 +667,7 @@
_yacc= usr.bin/yacc
.endif
-.if exists(${.CURDIR}/rescue) && defined(RESCUE) && \
+.if defined(RESCUE) && \
${BOOTSTRAPPING} < 501100
_crunchgen= usr.sbin/crunch/crunchgen
.endif
@@ -752,7 +752,7 @@
_btxld= usr.sbin/btxld
.endif
-.if (exists(${.CURDIR}/rescue) && defined(RESCUE) || \
+.if (defined(RESCUE) || \
defined(RELEASEDIR)) && \
(${TARGET_ARCH} != ${MACHINE_ARCH} || ${BOOTSTRAPPING} < 501101)
_crunchide= usr.sbin/crunch/crunchide
==== //depot/projects/ia64/bin/rmail/Makefile#4 (text+ko) ====
@@ -1,7 +1,5 @@
# @(#)Makefile 8.1 (Berkeley) 5/31/93
-# $FreeBSD: src/bin/rmail/Makefile,v 1.17 2002/02/17 22:05:05 gshapiro Exp $
-
-MAINTAINER= gshapiro at FreeBSD.org
+# $FreeBSD: src/bin/rmail/Makefile,v 1.18 2003/07/07 03:54:02 gshapiro Exp $
SENDMAIL_DIR=${.CURDIR}/../../contrib/sendmail
.PATH: ${SENDMAIL_DIR}/rmail
==== //depot/projects/ia64/contrib/cvs/src/main.c#4 (text+ko) ====
@@ -10,7 +10,7 @@
* Credit to Dick Grune, Vrije Universiteit, Amsterdam, for writing
* the shell-script CVS system that this is based on.
*
- * $FreeBSD: src/contrib/cvs/src/main.c,v 1.22 2002/12/02 03:17:48 peter Exp $
+ * $FreeBSD: src/contrib/cvs/src/main.c,v 1.23 2003/07/07 19:15:36 obrien Exp $
*/
#include <assert.h>
@@ -110,7 +110,7 @@
{
{ "add", "ad", "new", add, CVS_CMD_MODIFIES_REPOSITORY | CVS_CMD_USES_WORK_DIR },
{ "admin", "adm", "rcs", admin, CVS_CMD_MODIFIES_REPOSITORY | CVS_CMD_USES_WORK_DIR },
- { "annotate", "ann", NULL, annotate, CVS_CMD_USES_WORK_DIR },
+ { "annotate", "ann", "blame", annotate, CVS_CMD_USES_WORK_DIR },
{ "checkout", "co", "get", checkout, 0 },
{ "commit", "ci", "com", commit, CVS_CMD_MODIFIES_REPOSITORY | CVS_CMD_USES_WORK_DIR },
{ "diff", "di", "dif", diff, CVS_CMD_USES_WORK_DIR },
==== //depot/projects/ia64/contrib/groff/tmac/doc.tmac#7 (text+ko) ====
@@ -2696,10 +2696,8 @@
. nr doc-display-ft-stack\n[doc-display-depth] \n[.f]
. nr doc-display-ps-stack\n[doc-display-depth] \n[.ps]
.
-. ie t \{\
-. nop \*[doc-Li-font]\c
+. ie t \
. ta T 9n
-. \}
. el \
. ta T 8n
. nf
@@ -2747,6 +2745,10 @@
. if !\n[doc-is-compact] \
. sp \n[doc-display-vertical]u
.
+. if "\*[doc-display-type-stack\n[doc-display-depth]]"literal" \
+. if t \
+. nop \*[doc-Li-font]\c
+.
. if !\n[cR] \
. ne 2v
.
==== //depot/projects/ia64/etc/Makefile#31 (text+ko) ====
@@ -1,5 +1,5 @@
# from: @(#)Makefile 5.11 (Berkeley) 5/21/91
-# $FreeBSD: src/etc/Makefile,v 1.314 2003/06/10 01:22:30 ache Exp $
+# $FreeBSD: src/etc/Makefile,v 1.315 2003/07/06 19:23:31 gshapiro Exp $
.if !defined(NO_SENDMAIL)
SUBDIR= sendmail
@@ -45,8 +45,12 @@
PPPCNF= ppp.conf
+.if defined(NO_SENDMAIL)
+ETCMAIL=mailer.conf aliases
+.else
ETCMAIL=Makefile README mailer.conf access.sample virtusertable.sample \
mailertable.sample aliases
+.endif
# Special top level files for FreeBSD
FREEBSD=COPYRIGHT
==== //depot/projects/ia64/etc/mail/Makefile#13 (text+ko) ====
@@ -1,5 +1,5 @@
#
-# $FreeBSD: src/etc/mail/Makefile,v 1.33 2003/02/08 21:55:31 gshapiro Exp $
+# $FreeBSD: src/etc/mail/Makefile,v 1.35 2003/07/06 19:17:04 gshapiro Exp $
#
# This Makefile provides an easy way to generate the configuration
# file and database maps for the sendmail(8) daemon.
@@ -44,16 +44,19 @@
# This Makefile uses `<HOSTNAME>.mc' as the default MTA .mc file. This
# can be changed by defining SENDMAIL_MC in /etc/make.conf, e.g.:
#
-# SENDMAIL_MC=/etc/mail/myconfig.mc
+# SENDMAIL_MC=/etc/mail/myconfig.mc
#
# If '<HOSTNAME>.mc' does not exist, it is created using 'freebsd.mc'
# as a template.
#
-# It also uses 'freebsd.submit.mc' as the default mail submission .mc file.
-# This can be changed by defining SENDMAIL_SUBMIT_MC in /etc/make.conf,
-# e.g.:
+# It also uses '<HOSTNAME>.submit.mc' as the default mail submission .mc
+# file. This can be changed by defining SENDMAIL_SUBMIT_MC in
+# /etc/make.conf, e.g.:
+#
+# SENDMAIL_SUBMIT_MC=/etc/mail/mysubmit.mc
#
-# SENDMAIL_SUBMIT_MC=/etc/mail/mysubmit.mc
+# If '<HOSTNAME>.submit.mc' does not exist, it is created using
+# 'freebsd.submit.mc' as a template.
# ------------------------------------------------------------------------
#
# The Makefile knows about the following maps:
@@ -69,7 +72,13 @@
cp freebsd.mc ${SENDMAIL_MC}
.endif
-SENDMAIL_SUBMIT_MC?= freebsd.submit.mc
+.ifndef SENDMAIL_SUBMIT_MC
+SENDMAIL_SUBMIT_MC!= hostname
+SENDMAIL_SUBMIT_MC:= ${SENDMAIL_SUBMIT_MC}.submit.mc
+
+${SENDMAIL_SUBMIT_MC}:
+ cp freebsd.submit.mc ${SENDMAIL_SUBMIT_MC}
+.endif
INSTALL_CF= ${SENDMAIL_MC:R}.cf
@@ -105,7 +114,7 @@
SENDMAIL_MAP_PERMS?= 0640
# Set a reasonable default
-.MAIN: all
+.MAIN: all
#
# ------------------------------------------------------------------------
@@ -131,16 +140,16 @@
#
.for _f in ${SENDMAIL_MAP_SRC}
.if (exists(${_f}.sample) && !exists(${_f}))
-${_f}: ${_f}.sample
+${_f}: ${_f}.sample
sed -e 's/^/#/' < ${.OODATE} > ${.TARGET}
.endif
-${_f}.db: ${_f}
+${_f}.db: ${_f}
${MAKEMAP} ${SENDMAIL_MAP_TYPE} ${.TARGET} < ${.OODATE}
chmod ${SENDMAIL_MAP_PERMS} ${.TARGET}
.endfor
-userdb.db: userdb
+userdb.db: userdb
${MAKEMAP} btree ${.TARGET} < ${.OODATE}
chmod ${SENDMAIL_MAP_PERMS} ${.TARGET}
@@ -153,18 +162,18 @@
#
# M4(1) is used to generate the .cf file from the .mc file.
#
-.SUFFIXES: .cf .mc
+.SUFFIXES: .cf .mc
-.mc.cf: ${M4FILES}
+.mc.cf: ${M4FILES}
${M4} -D_CF_DIR_=${SENDMAIL_CF_DIR}/ ${SENDMAIL_M4_FLAGS} \
- ${SENDMAIL_CF_DIR}/m4/cf.m4 ${@:R}.mc > ${.TARGET}
+ ${SENDMAIL_CF_DIR}/m4/cf.m4 ${@:R}.mc > ${.TARGET}
#
# Aliases are handled separately since they normally reside in /etc
# and can be rebuild without the help of makemap.
#
.for _f in ${SENDMAIL_ALIASES}
-${_f}.db: ${_f}
+${_f}.db: ${_f}
${SENDMAIL} -bi -OAliasFile=${.ALLSRC}
chmod ${SENDMAIL_MAP_PERMS} ${.TARGET}
.endfor
@@ -173,13 +182,13 @@
# ------------------------------------------------------------------------
#
-all: cf maps aliases
+all: cf maps aliases
clean:
depend:
-cf: ${INSTALL_CF} ${INSTALL_SUBMIT_CF}
+cf: ${INSTALL_CF} ${INSTALL_SUBMIT_CF}
.ifdef SENDMAIL_SET_USER_ID
install: install-cf
@@ -187,13 +196,13 @@
install: install-cf install-submit-cf
.endif
-install-cf: ${INSTALL_CF}
+install-cf: ${INSTALL_CF}
.if ${INSTALL_CF} != /etc/mail/sendmail.cf
${INSTALL} -m ${SHAREMODE} ${INSTALL_CF} /etc/mail/sendmail.cf
.endif
-install-submit-cf: ${INSTALL_SUBMIT_CF}
+install-submit-cf: ${INSTALL_SUBMIT_CF}
.ifdef SENDMAIL_SET_USER_ID
@echo ">>> ERROR: You should not create a submit.cf file if you are using a"
@echo " set-user-ID sendmail binary (SENDMAIL_SET_USER_ID is set"
@@ -205,9 +214,9 @@
.endif
.endif
-aliases: ${SENDMAIL_ALIASES:%=%.db}
+aliases: ${SENDMAIL_ALIASES:%=%.db}
-maps: ${SENDMAIL_MAP_OBJ}
+maps: ${SENDMAIL_MAP_OBJ}
start start-mta start-mspq:
@if [ -r ${SENDMAIL_START_SCRIPT} ]; then \
==== //depot/projects/ia64/etc/rc.d/ypbind#6 (text+ko) ====
@@ -1,7 +1,7 @@
#!/bin/sh
#
# $NetBSD: ypbind,v 1.5 2002/03/22 04:34:01 thorpej Exp $
-# $FreeBSD: src/etc/rc.d/ypbind,v 1.5 2003/01/24 00:37:52 mtm Exp $
+# $FreeBSD: src/etc/rc.d/ypbind,v 1.6 2003/07/09 03:21:03 mtm Exp $
#
# PROVIDE: ypbind
@@ -40,7 +40,7 @@
_domain=`domainname`
if [ -z "$_domain" ]; then
- warn "domainname(1) is not set."
+ warn "NIS domainname(1) is not set."
return 1
fi
}
==== //depot/projects/ia64/etc/rc.d/yppasswdd#6 (text+ko) ====
@@ -1,7 +1,7 @@
#!/bin/sh
#
# $NetBSD: yppasswdd,v 1.6 2002/03/22 04:34:01 thorpej Exp $
-# $FreeBSD: src/etc/rc.d/yppasswdd,v 1.6 2003/01/24 00:37:52 mtm Exp $
+# $FreeBSD: src/etc/rc.d/yppasswdd,v 1.7 2003/07/09 03:21:03 mtm Exp $
#
# PROVIDE: yppasswdd
@@ -46,7 +46,7 @@
_domain=`domainname`
if [ -z "$_domain" ]; then
- warn "domainname(1) is not set."
+ warn "NIS domainname(1) is not set."
return 1
fi
}
==== //depot/projects/ia64/etc/rc.d/ypserv#7 (text+ko) ====
@@ -1,7 +1,7 @@
#!/bin/sh
#
# $NetBSD: ypserv,v 1.5 2000/09/19 13:04:39 lukem Exp $
-# $FreeBSD: src/etc/rc.d/ypserv,v 1.6 2003/01/24 00:37:52 mtm Exp $
+# $FreeBSD: src/etc/rc.d/ypserv,v 1.7 2003/07/09 03:21:03 mtm Exp $
#
# PROVIDE: ypserv
@@ -40,7 +40,7 @@
_domain=`domainname`
if [ -z "$_domain" ]; then
- warn "domainname(1) is not set."
+ warn "NIS domainname(1) is not set."
return 1
fi
==== //depot/projects/ia64/etc/rc.d/ypset#5 (text+ko) ====
@@ -1,6 +1,6 @@
#!/bin/sh
#
-# $FreeBSD: src/etc/rc.d/ypset,v 1.4 2003/01/24 00:37:52 mtm Exp $
+# $FreeBSD: src/etc/rc.d/ypset,v 1.5 2003/07/09 03:21:03 mtm Exp $
#
# PROVIDE: ypset
@@ -31,7 +31,7 @@
_domain=`domainname`
if [ -z "$_domain" ]; then
- warn "domainname(1) is not set."
+ warn "NIS domainname(1) is not set."
return 1
fi
}
==== //depot/projects/ia64/etc/rc.d/ypupdated#4 (text+ko) ====
@@ -1,6 +1,6 @@
#!/bin/sh
#
-# $FreeBSD: src/etc/rc.d/ypupdated,v 1.3 2002/10/12 10:31:31 schweikh Exp $
+# $FreeBSD: src/etc/rc.d/ypupdated,v 1.4 2003/07/09 03:21:03 mtm Exp $
#
# PROVIDE: ypupdated
@@ -29,7 +29,7 @@
_domain=`domainname`
if [ -z "$_domain" ]; then
- warn "domainname(1) is not set."
+ warn "NIS domainname(1) is not set."
return 1
fi
}
==== //depot/projects/ia64/etc/rc.d/ypxfrd#5 (text+ko) ====
@@ -1,6 +1,6 @@
#!/bin/sh
#
-# $FreeBSD: src/etc/rc.d/ypxfrd,v 1.4 2003/01/24 00:37:52 mtm Exp $
+# $FreeBSD: src/etc/rc.d/ypxfrd,v 1.5 2003/07/09 03:21:03 mtm Exp $
#
# PROVIDE: ypxfrd
@@ -31,7 +31,7 @@
_domain=`domainname`
if [ -z "$_domain" ]; then
- warn "domainname(1) is not set."
+ warn "NIS domainname(1) is not set."
return 1
fi
}
==== //depot/projects/ia64/etc/rc.shutdown#8 (text+ko) ====
@@ -24,7 +24,7 @@
# OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
# SUCH DAMAGE.
#
-# $FreeBSD: src/etc/rc.shutdown,v 1.24 2002/09/19 20:14:50 gordon Exp $
+# $FreeBSD: src/etc/rc.shutdown,v 1.25 2003/07/08 02:52:14 mtm Exp $
#
# Site-specific closing actions for daemons run by init on shutdown,
@@ -43,66 +43,10 @@
PATH=/sbin:/bin:/usr/sbin:/usr/bin:/usr/local/sbin
export HOME PATH
-# If there is a global system configuration file, suck it in.
-# XXX - It's only purpose is to catch rc_ng="YES".
-#
-if [ -r /etc/defaults/rc.conf ]; then
- . /etc/defaults/rc.conf
- source_rc_confs
-elif [ -r /etc/rc.conf ]; then
- . /etc/rc.conf
-fi
+. /etc/rc.subr
-case ${rc_ng} in
-[Yy][Ee][Ss])
- . /etc/rc.subr
-
- load_rc_config 'XXX'
-
- # If requested, start a watchdog timer in the background which
- # will terminate rc.shutdown if rc.shutdown doesn't complete
- # within the specified time.
- #
- _rcshutdown_watchdog=
- if [ -n "$rcshutdown_timeout" ]; then
- debug "Initiating watchdog timer."
- sleep $rcshutdown_timeout && (
- _msg="$rcshutdown_timeout second watchdog" \
- " timeout expired. Shutdown terminated."
- logger -t rc.shutdown "$_msg"
- echo "$_msg"
- date
- kill -KILL $$ >/dev/null 2>&1
- ) &
- _rcshutdown_watchdog=$!
- fi
+load_rc_config 'XXX'
- # Determine the shutdown order of the /etc/rc.d scripts,
- # and perform the operation
- # XXX - rcorder(8) with multiple -k switches works as a logical OR,
- # so, we can't do this: rcorder -k shutdown -k FreeBSD.
- #
- files=`eval grep -l \'^# KEYWORD:.*FreeBSD\' \`rcorder -k shutdown /etc/rc.d/* 2>/dev/null\``
-
- for _rc_elem in `reverse_list $files`; do
- debug "run_rc_script $_rc_elem stop"
- run_rc_script $_rc_elem stop
- done
-
- # Terminate the background watchdog timer (if it is running)
- #
- if [ -n "$_rcshutdown_watchdog" ]; then
- kill -TERM $_rcshutdown_watchdog >/dev/null 2>&1
- fi
-
- echo '.'
- exit 0
- ;;
-*)
- # fall-through to the old rc scripts
- ;;
-esac
-
# reverse_list list
# print the list in reverse order
#
@@ -115,93 +59,44 @@
echo $_revlist
}
-# Write some entropy so the rebooting /dev/random can reseed
+# If requested, start a watchdog timer in the background which
+# will terminate rc.shutdown if rc.shutdown doesn't complete
+# within the specified time.
#
-case ${entropy_file} in
-[Nn][Oo] | '')
- ;;
-*)
- echo -n 'Writing entropy file:'
- rm -f ${entropy_file}
- oumask=`umask`
- umask 077
- if touch ${entropy_file} ; then
- entropy_file_confirmed="${entropy_file}"
- else
- # Try this as a reasonable alternative for read-only
- # roots, diskless workstations, etc.
- rm -f /var/db/entropy
- if touch /var/db/entropy ; then
- entropy_file_confirmed=/var/db/entropy
- fi
- fi
- case ${entropy_file_confirmed} in
- '')
- echo ' ERROR - entropy file write failed'
- ;;
- *)
- dd if=/dev/random of=${entropy_file_confirmed} \
- bs=4096 count=1 2> /dev/null
- echo '.'
- ;;
- esac
- umask ${oumask}
- ;;
-esac
+_rcshutdown_watchdog=
+if [ -n "$rcshutdown_timeout" ]; then
+ debug "Initiating watchdog timer."
+ sleep $rcshutdown_timeout && (
+ _msg="$rcshutdown_timeout second watchdog" \
+ " timeout expired. Shutdown terminated."
+ logger -t rc.shutdown "$_msg"
+ echo "$_msg"
+ date
+ kill -KILL $$ >/dev/null 2>&1
+ ) &
+ _rcshutdown_watchdog=$!
+fi
-# Check if /var/db/mounttab is clean.
-case $1 in
-reboot)
- if [ -f /var/db/mounttab ]; then
- rpc.umntall
- fi
- ;;
-esac
+# Determine the shutdown order of the /etc/rc.d scripts,
+# and perform the operation
+# XXX - rcorder(8) with multiple -k switches works as a logical OR,
+# so, we can't do this: rcorder -k shutdown -k FreeBSD.
+#
+files=`eval grep -l \'^# KEYWORD:.*FreeBSD\' \`rcorder -k shutdown /etc/rc.d/* 2>/dev/null\``
-echo -n 'Shutting down daemon processes:'
+for _rc_elem in `reverse_list $files`; do
+ debug "run_rc_script $_rc_elem stop"
+ run_rc_script $_rc_elem stop
+done
-# for each valid dir in $local_startup, search for init scripts matching *.sh
-case ${local_startup} in
-[Nn][Oo] | '')
- ;;
-*)
- slist=""
- if [ -z "${script_name_sep}" ]; then
- script_name_sep=" "
- fi
- for dir in ${local_startup}; do
- if [ -d "${dir}" ]; then
- for script in ${dir}/*.sh; do
- slist="${slist}${script_name_sep}${script}"
- done
- fi
- done
- script_save_sep="$IFS"
- IFS="${script_name_sep}"
- for script in `reverse_list ${slist}`; do
- if [ -x "${script}" ]; then
- (set -T
- trap 'exit 1' 2
- ${script} stop)
- fi
- done
- IFS="${script_save_sep}"
- echo '.'
- ;;
-esac
+# Terminate the background watchdog timer (if it is running)
+#
+if [ -n "$_rcshutdown_watchdog" ]; then
+ kill -TERM $_rcshutdown_watchdog >/dev/null 2>&1
+fi
# Insert other shutdown procedures here
-# Saving firewall state tables should be done last
-echo -n 'Saving firewall state tables:'
-
-# Save IP-filter state tables
-case ${ipfs_enable} in
-[Yy][Ee][Ss])
- echo -n ' ipfs'
- ${ipfs_program:-/sbin/ipfs} -W ${ipfs_flags}
- ;;
-esac
echo '.'
exit 0
==== //depot/projects/ia64/etc/sendmail/Makefile#10 (text+ko) ====
@@ -1,5 +1,5 @@
# @(#)Makefile 8.19 (Berkeley) 1/14/97
-# $FreeBSD: src/etc/sendmail/Makefile,v 1.21 2002/07/29 09:40:06 ru Exp $
+# $FreeBSD: src/etc/sendmail/Makefile,v 1.25 2003/07/07 03:19:46 gshapiro Exp $
M4= m4
CHMOD= chmod
@@ -13,127 +13,86 @@
# this is overkill, but....
M4FILES!= find ${CFDIR} -type f -name '*.m4' -print
-.SUFFIXES: .mc .cf
+.SUFFIXES: .mc .cf
-.mc.cf: ${M4FILES}
+.mc.cf: ${M4FILES}
${RM} ${.TARGET}
- (cd ${.CURDIR} && \
- ${M4} -D_CF_DIR_=${CFDIR}/ ${SENDMAIL_M4_FLAGS} \
- ${CFDIR}/m4/cf.m4 ${@:R}.mc) > ${.TARGET}
+ ${M4} -D_CF_DIR_=${CFDIR}/ ${SENDMAIL_M4_FLAGS} \
+ ${CFDIR}/m4/cf.m4 ${.IMPSRC} > ${.TARGET}
${CHMOD} ${ROMODE} ${.TARGET}
+DEST_CF= ${DESTDIR}/etc/mail/sendmail.cf
+DEST_SUBMIT_CF= ${DESTDIR}/etc/mail/submit.cf
+
ALL= freebsd.cf
-CLEANFILES+= freebsd.cf
# Local SENDMAIL_MC or SENDMAIL_CF may be set in /etc/make.conf.
-# Warning! If set, this causes 'make install' to always copy it
+# Warning! If set, this causes 'make install' to always copy it
# over /etc/mail/sendmail.cf!!!
# Caveat emptor! Be sure you want this before you enable it.
.if defined(SENDMAIL_MC)
-INSTALL_CF= ${SENDMAIL_MC:R}.cf
-.else
-.if defined(SENDMAIL_CF)
+INSTALL_CF= ${SENDMAIL_MC:T:R}.cf
+ALL+= ${INSTALL_CF}
+${INSTALL_CF}: ${SENDMAIL_MC}
+.elif defined(SENDMAIL_CF)
INSTALL_CF= ${SENDMAIL_CF}
.endif
-.endif
-.ifndef SENDMAIL_SET_USER_ID
-.if defined(SENDMAIL_SUBMIT_MC)
-INSTALL_SUBMIT_CF=${SENDMAIL_SUBMIT_MC:R}.cf
+.if !defined(SENDMAIL_SET_USER_ID) && defined(SENDMAIL_SUBMIT_MC)
+INSTALL_SUBMIT_CF= ${SENDMAIL_SUBMIT_MC:T:R}.cf
+ALL+= ${INSTALL_SUBMIT_CF}
+${INSTALL_SUBMIT_CF}: ${SENDMAIL_SUBMIT_MC}
.endif
-.endif
-DEST_CF= ${DESTDIR}/etc/mail/sendmail.cf
-DEST_SUBMIT_CF= ${DESTDIR}/etc/mail/submit.cf
-
-ALL+= ${INSTALL_CF} ${INSTALL_SUBMIT_CF}
-
-# Make sure we don't remove /etc/mail/sendmail.cf on make clean
-# since this will break a running system during a buildworld.
-.if defined(INSTALL_CF)
-.if ${INSTALL_CF} != ${DEST_CF}
-CLEANFILES+= ${INSTALL_CF}
-.endif
-.endif
-
-.if defined(INSTALL_SUBMIT_CF)
-.if ${INSTALL_SUBMIT_CF} != ${DEST_SUBMIT_CF}
-CLEANFILES+= ${INSTALL_SUBMIT_CF}
-.endif
-.endif
-
-# Additional .cf files to build
+# Additional .cf files to build.
.if defined(SENDMAIL_ADDITIONAL_MC)
-SENDMAIL_ADDITIONAL_CF= ${SENDMAIL_ADDITIONAL_MC:S/.mc$/.cf/g}
+SENDMAIL_ADDITIONAL_CF= ${SENDMAIL_ADDITIONAL_MC:T:S/.mc$/.cf/}
ALL+= ${SENDMAIL_ADDITIONAL_CF}
-CLEANFILES+= ${SENDMAIL_ADDITIONAL_CF}
+.for mc in ${SENDMAIL_ADDITIONAL_MC}
+${mc:T:R}.cf: ${mc}
+.endfor
.endif
-all: ${ALL}
+CLEANFILES= ${ALL}
-depend:
+all: ${ALL}
-install: ${INSTALL_CF} ${INSTALL_SUBMIT_CF}
-.if (defined(SENDMAIL_MC) && defined(SENDMAIL_CF))
- @echo ">>> ERROR: Both SENDMAIL_CF and SENDMAIL_MC can not be set"
+install distribution: ${ALL}
+.if defined(SENDMAIL_MC) && defined(SENDMAIL_CF)
+ @echo ">>> ERROR: Both SENDMAIL_MC and SENDMAIL_CF cannot be set"
@false
.endif
-.if defined(INSTALL_CF)
-.if ${INSTALL_CF} != ${DEST_CF}
- ${INSTALL} -o ${BINOWN} -g ${BINGRP} -m 644 ${INSTALL_CF} \
- ${DEST_CF}
+.if make(distribution)
+ ${INSTALL} -o ${BINOWN} -g ${BINGRP} -m 644 \
+ ${.CURDIR}/freebsd.mc freebsd.cf ${DESTDIR}/etc/mail
+ ${INSTALL} -o ${BINOWN} -g ${BINGRP} -m 444 \
+ ${CFDIR}/cf/submit.mc ${DESTDIR}/etc/mail/freebsd.submit.mc
+ ${INSTALL} -o ${BINOWN} -g ${BINGRP} -m 444 \
+ ${CFDIR}/cf/submit.cf ${DESTDIR}/etc/mail/freebsd.submit.cf
+ ${INSTALL} -o ${BINOWN} -g ${BINGRP} -m 444 \
+ ${SMDIR}/helpfile ${DESTDIR}/etc/mail
+ ${INSTALL} -o ${BINOWN} -g ${BINGRP} -m 640 \
+ /dev/null ${DESTDIR}/var/log/sendmail.st
.endif
-.endif
-.if defined(SENDMAIL_ADDITIONAL_CF)
+.if defined(INSTALL_CF) && ${INSTALL_CF} != ${DEST_CF}
+ ${INSTALL} -o ${BINOWN} -g ${BINGRP} -m 644 \
+ ${INSTALL_CF} ${DEST_CF}
+.elif make(distribution)
${INSTALL} -o ${BINOWN} -g ${BINGRP} -m 644 \
- ${SENDMAIL_ADDITIONAL_CF} ${DESTDIR}/etc/mail
+ freebsd.cf ${DEST_CF}
.endif
-.ifndef SENDMAIL_SET_USER_ID
-.if defined(INSTALL_SUBMIT_CF)
-.if ${INSTALL_SUBMIT_CF} != ${DEST_SUBMIT_CF}
+.if defined(SENDMAIL_ADDITIONAL_CF) && make(install)
${INSTALL} -o ${BINOWN} -g ${BINGRP} -m 644 \
- ${INSTALL_SUBMIT_CF} ${DEST_SUBMIT_CF}
+ ${SENDMAIL_ADDITIONAL_CF} ${DESTDIR}/etc/mail
.endif
-.endif
-.endif
-
-# Helper for src/etc/Makefile
-distribution: freebsd.cf freebsd.mc ${INSTALL_CF} ${INSTALL_SUBMIT_CF}
-.if (defined(SENDMAIL_MC) && defined(SENDMAIL_CF))
- @echo ">>> ERROR: Both SENDMAIL_CF and SENDMAIL_MC can not be set"
- @false
-.endif
- ${INSTALL} -o ${BINOWN} -g ${BINGRP} -m 644 ${.CURDIR}/freebsd.mc \
- ${DESTDIR}/etc/mail/freebsd.mc
- ${INSTALL} -o ${BINOWN} -g ${BINGRP} -m 644 freebsd.cf \
- ${DESTDIR}/etc/mail/freebsd.cf
-.if defined(INSTALL_CF)
-.if ${INSTALL_CF} != ${DEST_CF}
- ${INSTALL} -o ${BINOWN} -g ${BINGRP} -m 644 ${INSTALL_CF} \
- ${DEST_CF}
-.endif
-.else
- ${INSTALL} -o ${BINOWN} -g ${BINGRP} -m 644 freebsd.cf \
- ${DEST_CF}
-.endif
- ${INSTALL} -o ${BINOWN} -g ${BINGRP} -m 444 ${CFDIR}/cf/submit.mc \
- ${DESTDIR}/etc/mail/freebsd.submit.mc
- ${INSTALL} -o ${BINOWN} -g ${BINGRP} -m 444 ${CFDIR}/cf/submit.cf \
- ${DESTDIR}/etc/mail/freebsd.submit.cf
-.ifndef SENDMAIL_SET_USER_ID
-.if defined(INSTALL_SUBMIT_CF)
-.if ${INSTALL_SUBMIT_CF} != ${DEST_SUBMIT_CF}
+.if !defined(SENDMAIL_SET_USER_ID)
+.if defined(INSTALL_SUBMIT_CF) && ${INSTALL_SUBMIT_CF} != ${DEST_SUBMIT_CF}
${INSTALL} -o ${BINOWN} -g ${BINGRP} -m 644 \
- ${INSTALL_SUBMIT_CF} ${DEST_SUBMIT_CF}
+ ${INSTALL_SUBMIT_CF} ${DEST_SUBMIT_CF}
+.elif make(distribution)
+ ${INSTALL} -o ${BINOWN} -g ${BINGRP} -m 444 \
+ ${CFDIR}/cf/submit.cf ${DEST_SUBMIT_CF}
.endif
-.else
- ${INSTALL} -o ${BINOWN} -g ${BINGRP} -m 444 ${CFDIR}/cf/submit.cf \
- ${DEST_SUBMIT_CF}
-.endif
.endif
- ${INSTALL} -o ${BINOWN} -g ${BINGRP} -m 444 ${SMDIR}/helpfile \
- ${DESTDIR}/etc/mail/helpfile
- ${INSTALL} -o ${BINOWN} -g ${BINGRP} -m 640 /dev/null \
- ${DESTDIR}/var/log/sendmail.st
.include <bsd.prog.mk>
==== //depot/projects/ia64/gnu/usr.bin/cvs/lib/config.h.proto#2 (text+ko) ====
@@ -1,4 +1,4 @@
-/* $FreeBSD: src/gnu/usr.bin/cvs/lib/config.h.proto,v 1.16 2003/01/21 23:00:36 peter Exp $ */
+/* $FreeBSD: src/gnu/usr.bin/cvs/lib/config.h.proto,v 1.17 2003/07/07 19:13:39 obrien Exp $ */
/* config.h. Generated by configure. */
/* config.h.in. Generated from configure.in by autoheader. */
@@ -38,7 +38,9 @@
absolute path to an executable, use the shell to find where the editor
actually is. This allows sites with /usr/bin/vi or /usr/ucb/vi to work
equally well (assuming that their PATH is reasonable). */
+#ifndef EDITOR_DFLT
#define EDITOR_DFLT "vi"
+#endif
/* Define to enable encryption support. */
/* #undef ENCRYPTION */
==== //depot/projects/ia64/lib/libc/locale/setlocale.c#8 (text+ko) ====
@@ -39,7 +39,7 @@
static char sccsid[] = "@(#)setlocale.c 8.1 (Berkeley) 7/4/93";
#endif /* LIBC_SCCS and not lint */
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/lib/libc/locale/setlocale.c,v 1.46 2003/06/25 22:42:33 phantom Exp $");
+__FBSDID("$FreeBSD: src/lib/libc/locale/setlocale.c,v 1.47 2003/07/06 02:03:37 ache Exp $");
>>> TRUNCATED FOR MAIL (1000 lines) <<<
More information about the p4-projects
mailing list