Date: Wed, 19 Jun 2002 23:10:07 -0700 (PDT) From: Peter Wemm <peter@FreeBSD.org> To: Perforce Change Reviews <perforce@freebsd.org> Subject: PERFORCE change 13189 for review Message-ID: <200206200610.g5K6A7H00343@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
http://people.freebsd.org/~peter/p4db/chv.cgi?CH=13189 Change 13189 by peter@peter_daintree on 2002/06/19 23:09:18 IFC @13188 Affected files ... ... //depot/projects/ia64/bin/ed/ed.h#3 integrate ... //depot/projects/ia64/bin/ed/main.c#3 integrate ... //depot/projects/ia64/bin/sh/jobs.c#7 integrate ... //depot/projects/ia64/bin/sh/mktokens#2 integrate ... //depot/projects/ia64/bin/sh/parser.c#4 integrate ... //depot/projects/ia64/bin/sh/sh.1#8 integrate ... //depot/projects/ia64/contrib/gdb/gdb/coffread.c#1 branch ... //depot/projects/ia64/contrib/gdb/gdb/defs.h#2 integrate ... //depot/projects/ia64/contrib/gdb/gdb/top.c#2 integrate ... //depot/projects/ia64/contrib/gdb/gdb/utils.c#3 integrate ... //depot/projects/ia64/etc/pam.d/Makefile#5 integrate ... //depot/projects/ia64/etc/pam.d/csshd#3 delete ... //depot/projects/ia64/etc/pam.d/sshd#6 integrate ... //depot/projects/ia64/etc/pam.d/telnetd#2 integrate ... //depot/projects/ia64/etc/rc.d/network1#2 integrate ... //depot/projects/ia64/etc/rc.devfs#4 integrate ... //depot/projects/ia64/gnu/lib/libstdc++/Makefile#8 integrate ... //depot/projects/ia64/include/stdbool.h#2 integrate ... //depot/projects/ia64/lib/libfetch/http.c#6 integrate ... //depot/projects/ia64/release/Makefile#15 integrate ... //depot/projects/ia64/share/examples/etc/make.conf#13 integrate ... //depot/projects/ia64/share/man/man4/ng_device.4#1 branch ... //depot/projects/ia64/share/man/man5/make.conf.5#14 integrate ... //depot/projects/ia64/sys/alpha/osf1/osf1_misc.c#8 integrate ... //depot/projects/ia64/sys/cam/scsi/scsi_sa.c#2 integrate ... //depot/projects/ia64/sys/conf/files#30 integrate ... //depot/projects/ia64/sys/conf/options#19 integrate ... //depot/projects/ia64/sys/conf/options.i386#6 integrate ... //depot/projects/ia64/sys/conf/options.ia64#6 integrate ... //depot/projects/ia64/sys/conf/options.pc98#7 integrate ... //depot/projects/ia64/sys/dev/ata/ata-dma.c#14 integrate ... //depot/projects/ia64/sys/dev/ata/ata-pci.c#13 integrate ... //depot/projects/ia64/sys/dev/ata/atapi-fd.c#7 integrate ... //depot/projects/ia64/sys/dev/ata/atapi-fd.h#3 integrate ... //depot/projects/ia64/sys/dev/em/if_em_fxhw.c#4 delete ... //depot/projects/ia64/sys/dev/em/if_em_fxhw.h#4 delete ... //depot/projects/ia64/sys/dev/em/if_em_phy.c#5 delete ... //depot/projects/ia64/sys/dev/em/if_em_phy.h#4 delete ... //depot/projects/ia64/sys/dev/sio/sio.c#10 integrate ... //depot/projects/ia64/sys/dev/sio/sioreg.h#3 integrate ... //depot/projects/ia64/sys/dev/wi/if_wi.c#19 integrate ... //depot/projects/ia64/sys/dev/wi/if_wireg.h#9 integrate ... //depot/projects/ia64/sys/dev/wi/if_wivar.h#7 integrate ... //depot/projects/ia64/sys/kern/kern_exec.c#16 integrate ... //depot/projects/ia64/sys/kern/kern_linker.c#15 integrate ... //depot/projects/ia64/sys/kern/kern_prot.c#16 integrate ... //depot/projects/ia64/sys/kern/sys_generic.c#12 integrate ... //depot/projects/ia64/sys/modules/netgraph/device/Makefile#1 branch ... //depot/projects/ia64/sys/netgraph/ng_device.c#1 branch ... //depot/projects/ia64/sys/netgraph/ng_device.h#1 branch ... //depot/projects/ia64/sys/netinet/if_ether.c#10 integrate ... //depot/projects/ia64/sys/pc98/conf/GENERIC#11 integrate ... //depot/projects/ia64/sys/pc98/pc98/fd.c#7 integrate ... //depot/projects/ia64/sys/pc98/pc98/sio.c#11 integrate ... //depot/projects/ia64/sys/sys/disklabel.h#14 integrate ... //depot/projects/ia64/sys/sys/malloc.h#12 integrate ... //depot/projects/ia64/sys/sys/ucred.h#6 integrate ... //depot/projects/ia64/sys/sys/un.h#4 integrate ... //depot/projects/ia64/sys/ufs/ufs/ufs_readwrite.c#8 integrate ... //depot/projects/ia64/sys/vm/uma.h#7 integrate ... //depot/projects/ia64/sys/vm/uma_core.c#18 integrate ... //depot/projects/ia64/sys/vm/vm_kern.c#7 integrate ... //depot/projects/ia64/sys/vm/vm_map.c#23 integrate ... //depot/projects/ia64/sys/vm/vm_object.c#14 integrate ... //depot/projects/ia64/sys/vm/vm_unix.c#3 integrate ... //depot/projects/ia64/tools/regression/usr.bin/make/Makefile#4 integrate ... //depot/projects/ia64/usr.bin/env/env.c#4 integrate ... //depot/projects/ia64/usr.bin/false/false.c#3 integrate ... //depot/projects/ia64/usr.bin/locate/locate/updatedb.sh#2 integrate ... //depot/projects/ia64/usr.bin/make/var.c#5 integrate ... //depot/projects/ia64/usr.bin/pr/pr.c#4 integrate ... //depot/projects/ia64/usr.bin/printenv/printenv.1#4 integrate ... //depot/projects/ia64/usr.bin/printf/printf.c#5 integrate ... //depot/projects/ia64/usr.bin/true/true.c#3 integrate Differences ... ==== //depot/projects/ia64/bin/ed/ed.h#3 (text+ko) ==== @@ -25,7 +25,7 @@ * SUCH DAMAGE. * * @(#)ed.h,v 1.5 1994/02/01 00:34:39 alm Exp - * $FreeBSD: src/bin/ed/ed.h,v 1.16 2002/02/02 06:36:49 imp Exp $ + * $FreeBSD: src/bin/ed/ed.h,v 1.17 2002/06/20 05:28:02 jmallett Exp $ */ #include <sys/param.h> @@ -270,3 +270,5 @@ extern long first_addr; extern int lineno; extern long second_addr; +extern long u_addr_last; +extern long u_current_addr; ==== //depot/projects/ia64/bin/ed/main.c#3 (text+ko) ==== @@ -34,7 +34,7 @@ #ifndef lint static const char rcsid[] = - "$FreeBSD: src/bin/ed/main.c,v 1.22 2002/02/02 06:36:49 imp Exp $"; + "$FreeBSD: src/bin/ed/main.c,v 1.23 2002/06/20 05:28:02 jmallett Exp $"; #endif /* not lint */ /* @@ -449,9 +449,6 @@ int exec_command(void) { - extern long u_current_addr; - extern long u_addr_last; - static pattern_t *pat = NULL; static int sgflag = 0; static long sgnum = 0; ==== //depot/projects/ia64/bin/sh/jobs.c#7 (text+ko) ==== @@ -39,7 +39,7 @@ static char sccsid[] = "@(#)jobs.c 8.5 (Berkeley) 5/4/95"; #endif static const char rcsid[] = - "$FreeBSD: src/bin/sh/jobs.c,v 1.44 2002/06/04 15:26:00 tjr Exp $"; + "$FreeBSD: src/bin/sh/jobs.c,v 1.45 2002/06/20 05:21:43 jmallett Exp $"; #endif /* not lint */ #include <fcntl.h> @@ -273,7 +273,6 @@ int jobscmd(int argc, char *argv[]) { - struct job *jp; char *id; int ch, sformat, lformat; @@ -926,7 +925,6 @@ struct job *thisjob; int done; int stopped; - int core; int sig; in_dowait++; ==== //depot/projects/ia64/bin/sh/mktokens#2 (text+ko) ==== @@ -35,7 +35,7 @@ # SUCH DAMAGE. # # @(#)mktokens 8.1 (Berkeley) 5/31/93 -# $FreeBSD: src/bin/sh/mktokens,v 1.7 2000/11/22 11:05:51 kris Exp $ +# $FreeBSD: src/bin/sh/mktokens,v 1.8 2002/06/20 05:20:50 jmallett Exp $ # The following is a list of tokens. The second column is nonzero if the # token marks the end of a list. The third column is the name to print in @@ -81,14 +81,14 @@ awk '{print "\t" $2 ","}' $temp echo '}; -char *const tokname[] = {' +const char *const tokname[] = {' sed -e 's/"/\\"/g' \ -e 's/[^ ]*[ ][ ]*[^ ]*[ ][ ]*\(.*\)/ "\1",/' \ $temp echo '}; ' sed 's/"//g' $temp | awk ' -/TIF/{print "#define KWDOFFSET " NR-1; print ""; print "char *const parsekwd[] = {"} +/TIF/{print "#define KWDOFFSET " NR-1; print ""; print "const char *const parsekwd[] = {"} /TIF/,/neverfound/{print " \"" $3 "\","}' echo ' 0 };' ==== //depot/projects/ia64/bin/sh/parser.c#4 (text+ko) ==== @@ -39,7 +39,7 @@ static char sccsid[] = "@(#)parser.c 8.7 (Berkeley) 5/16/95"; #endif static const char rcsid[] = - "$FreeBSD: src/bin/sh/parser.c,v 1.39 2002/05/19 06:03:05 tjr Exp $"; + "$FreeBSD: src/bin/sh/parser.c,v 1.40 2002/06/20 05:20:50 jmallett Exp $"; #endif /* not lint */ #include <stdlib.h> @@ -742,9 +742,9 @@ */ if (t == TWORD && !quoteflag) { - char * const *pp; + const char * const *pp; - for (pp = (char **)parsekwd; *pp; pp++) { + for (pp = parsekwd; *pp; pp++) { if (**pp == *wordtext && equal(*pp, wordtext)) { lasttoken = t = pp - parsekwd + KWDOFFSET; ==== //depot/projects/ia64/bin/sh/sh.1#8 (text+ko) ==== @@ -33,7 +33,7 @@ .\" SUCH DAMAGE. .\" .\" from: @(#)sh.1 8.6 (Berkeley) 5/4/95 -.\" $FreeBSD: src/bin/sh/sh.1,v 1.68 2002/06/06 04:12:50 tjr Exp $ +.\" $FreeBSD: src/bin/sh/sh.1,v 1.69 2002/06/19 12:04:22 tjr Exp $ .\" .Dd May 5, 1995 .Dt SH 1 @@ -1289,16 +1289,18 @@ is specified. If .Ar directory -is not found as a subdirectory of the current directory -(and does not begin with -.Pa / , ./ , +does not begin with +.Pa / , . , or -.Pa ../ ) , +.Pa .. , then the directories listed in the .Ev CDPATH variable will be searched for the specified .Ar directory . +If +.Ev CDPATH +is unset, the current directory is searched. The format of .Ar CDPATH is the same as that of ==== //depot/projects/ia64/contrib/gdb/gdb/defs.h#2 (text+ko) ==== @@ -18,6 +18,8 @@ along with this program; if not, write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ +/* $FreeBSD: src/contrib/gdb/gdb/defs.h,v 1.3 2001/04/11 16:15:19 obrien Exp $ */ + #ifndef DEFS_H #define DEFS_H @@ -505,10 +507,6 @@ extern int read_relative_register_raw_bytes PARAMS ((int, char *)); -/* From readline (but not in any readline .h files). */ - -extern char *tilde_expand PARAMS ((char *)); - /* Control types for commands */ enum misc_command_type ==== //depot/projects/ia64/contrib/gdb/gdb/top.c#2 (text+ko) ==== @@ -18,6 +18,8 @@ along with this program; if not, write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ +/* $FreeBSD: src/contrib/gdb/gdb/top.c,v 1.3 2001/04/14 01:49:32 obrien Exp $ */ + #include "defs.h" #include "gdbcmd.h" #include "call-cmds.h" @@ -1536,8 +1538,6 @@ char *text; char *word; { - /* From readline. */ - extern char *filename_completion_function PARAMS ((char *, int)); int subsequent_name; char **return_val; int return_val_used; ==== //depot/projects/ia64/contrib/gdb/gdb/utils.c#3 (text+ko) ==== @@ -17,6 +17,8 @@ along with this program; if not, write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ +/* $FreeBSD: src/contrib/gdb/gdb/utils.c,v 1.2 2002/01/27 12:45:01 obrien Exp $ */ + #include "defs.h" #include <ctype.h> #include "gdb_string.h" @@ -895,7 +897,7 @@ the caller wanting to allocate zero bytes. */ PTR -xmalloc (size) +USE_FROM_LIBIBERTY_NOW_xmalloc (size) size_t size; { return (xmmalloc ((PTR) NULL, size)); @@ -904,7 +906,7 @@ /* Like mrealloc but get error if no storage available. */ PTR -xrealloc (ptr, size) +USE_FROM_LIBIBERTY_NOW_xrealloc (ptr, size) PTR ptr; size_t size; { ==== //depot/projects/ia64/etc/pam.d/Makefile#5 (text+ko) ==== @@ -1,7 +1,7 @@ -# $FreeBSD: src/etc/pam.d/Makefile,v 1.6 2002/05/02 05:05:28 des Exp $ +# $FreeBSD: src/etc/pam.d/Makefile,v 1.7 2002/06/19 20:01:25 des Exp $ NOOBJ= noobj -FILES= README csshd ftp ftpd gdm imap kde login other passwd pop3 \ +FILES= README ftp ftpd gdm imap kde login other passwd pop3 \ rexecd rsh sshd su telnetd xdm xserver FILESDIR= /etc/pam.d FILESMODE= 644 ==== //depot/projects/ia64/etc/pam.d/sshd#6 (text+ko) ==== @@ -1,11 +1,13 @@ # -# $FreeBSD: src/etc/pam.d/sshd,v 1.6 2002/05/08 00:33:02 des Exp $ +# $FreeBSD: src/etc/pam.d/sshd,v 1.7 2002/06/19 20:00:43 des Exp $ # # PAM configuration for the "sshd" service # # auth auth required pam_nologin.so no_warn +auth sufficient pam_opie.so no_warn no_fake_prompts +auth required pam_opieaccess.so no_warn auth required pam_unix.so no_warn try_first_pass # account ==== //depot/projects/ia64/etc/pam.d/telnetd#2 (text+ko) ==== @@ -1,11 +1,13 @@ # -# $FreeBSD: src/etc/pam.d/telnetd,v 1.2 2001/12/05 21:26:00 des Exp $ +# $FreeBSD: src/etc/pam.d/telnetd,v 1.3 2002/06/19 20:00:43 des Exp $ # # PAM configuration for the "telnetd" service # # auth auth required pam_nologin.so no_warn +auth sufficient pam_opie.so no_warn no_fake_prompts +auth required pam_opieaccess.so no_warn auth required pam_unix.so no_warn try_first_pass # account ==== //depot/projects/ia64/etc/rc.d/network1#2 (text+ko) ==== @@ -1,6 +1,6 @@ #!/bin/sh -x # -# $FreeBSD: src/etc/rc.d/network1,v 1.3 2002/06/16 06:50:38 dougb Exp $ +# $FreeBSD: src/etc/rc.d/network1,v 1.4 2002/06/18 23:12:50 dougb Exp $ # # PROVIDE: network1 @@ -113,10 +113,14 @@ # Set the domainname if we're using NIS # - if checkyesno nisdomainname ; then + case ${nisdomainname} in + [Nn][Oo]|'') + ;; + *) domainname ${nisdomainname} echo -n ' domain' - fi + ;; + esac echo '.' ==== //depot/projects/ia64/etc/rc.devfs#4 (text+ko) ==== @@ -22,7 +22,7 @@ # OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF # SUCH DAMAGE. # -# $FreeBSD: src/etc/rc.devfs,v 1.11 2002/06/18 07:33:56 dougb Exp $ +# $FreeBSD: src/etc/rc.devfs,v 1.12 2002/06/19 05:35:16 dougb Exp $ # # If there is a global system configuration file, suck it in. @@ -41,13 +41,13 @@ # This isn't necessarily a good example, since we probably shouldn't need this. # However, a lot of X software depends on it. # -if [ -c ttyv0 ]; then +if [ -c ttyv0 -a ! -e vga ]; then ln -fs ttyv0 vga fi # Commonly used by many ports # -#if [ -c acd0c ]; then +#if [ -c acd0c -a ! -e cdrom ]; then # ln -fs acd0c cdrom #fi ==== //depot/projects/ia64/gnu/lib/libstdc++/Makefile#8 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/gnu/lib/libstdc++/Makefile,v 1.34 2002/06/02 17:49:08 obrien Exp $ +# $FreeBSD: src/gnu/lib/libstdc++/Makefile,v 1.35 2002/06/19 05:38:45 obrien Exp $ GCCDIR= ${.CURDIR}/../../../contrib/gcc SRCDIR= ${.CURDIR}/../../../contrib/libstdc++ @@ -8,7 +8,7 @@ ${SRCDIR}/config/locale/generic ${SRCDIR} ${SRCDIR}/std \ ${SUPDIR} ${GCCDIR} -SUBDIR= doc +#SUBDIR= doc LIB= stdc++ SHLIB_MAJOR= 4 ==== //depot/projects/ia64/include/stdbool.h#2 (text+ko) ==== @@ -23,7 +23,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/include/stdbool.h,v 1.4 2001/08/13 13:29:29 asmodai Exp $ + * $FreeBSD: src/include/stdbool.h,v 1.5 2002/06/19 06:04:37 obrien Exp $ */ #ifndef _STDBOOL_H_ @@ -31,6 +31,8 @@ #define __bool_true_false_are_defined 1 +#ifndef __cplusplus + #define false 0 #define true 1 @@ -39,4 +41,6 @@ typedef int _Bool; #endif +#endif /* !__cplusplus */ + #endif /* !_STDBOOL_H_ */ ==== //depot/projects/ia64/lib/libfetch/http.c#6 (text+ko) ==== @@ -27,7 +27,7 @@ */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/lib/libfetch/http.c,v 1.59 2002/06/05 21:35:35 des Exp $"); +__FBSDID("$FreeBSD: src/lib/libfetch/http.c,v 1.60 2002/06/19 08:36:00 des Exp $"); /* * The following copyright applies to the base64 code: @@ -766,7 +766,7 @@ conn_t *conn; struct url *url, *new; int chunked, direct, need_auth, noredirect, verbose; - int i, n; + int e, i, n; off_t offset, clength, length, size; time_t mtime; const char *p; @@ -793,6 +793,7 @@ n = noredirect ? 1 : MAX_REDIRECT; i = 0; + e = HTTP_PROTOCOL_ERROR; need_auth = 0; do { new = NULL; @@ -990,6 +991,7 @@ /* we need to provide authentication */ if (conn->err == HTTP_NEED_AUTH) { + e = conn->err; need_auth = 1; _fetch_close(conn); conn = NULL; @@ -997,6 +999,7 @@ } /* all other cases: we got a redirect */ + e = conn->err; need_auth = 0; _fetch_close(conn); conn = NULL; @@ -1011,7 +1014,7 @@ /* we failed, or ran out of retries */ if (conn == NULL) { - _http_seterr(conn->err); + _http_seterr(e); goto ouch; } ==== //depot/projects/ia64/release/Makefile#15 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/release/Makefile,v 1.686 2002/06/08 03:15:50 matusita Exp $ +# $FreeBSD: src/release/Makefile,v 1.687 2002/06/19 15:06:38 matusita Exp $ # # make release CHROOTDIR=/some/dir BUILDNAME=somename CVSROOT=/cvs/dir \ # [ RELEASETAG=tag ] @@ -392,7 +392,7 @@ .endif # Don't remove this, or the build will fall over! echo "export RELEASEDIR=${_R}" >> ${CHROOTDIR}/mk - echo "export PATH=$${PATH}:${LOCALDIR}" >> ${CHROOTDIR}/mk + echo "export PATH=/bin:/usr/bin:/sbin:/usr/sbin:${LOCALDIR}" >> ${CHROOTDIR}/mk echo "export TMPDIR=/tmp" >> ${CHROOTDIR}/mk echo "export MAKEOBJDIRPREFIX=/usr/obj" >> ${CHROOTDIR}/mk echo "export MANBUILDCAT=YES" >> ${CHROOTDIR}/mk @@ -406,7 +406,7 @@ echo "make \$${_RELTARGET}" >> ${CHROOTDIR}/mk echo "echo \">>> make ${.TARGET} for ${TARGET} finished on \`LC_ALL=C TZ=GMT date\`\"" >> ${CHROOTDIR}/mk chmod 755 ${CHROOTDIR}/mk - chroot ${CHROOTDIR} /mk + env -i /usr/sbin/chroot ${CHROOTDIR} /mk clean: rm -rf boot_crunch release.[0-9] ==== //depot/projects/ia64/share/examples/etc/make.conf#13 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/share/examples/etc/make.conf,v 1.191 2002/06/09 09:28:01 dougb Exp $ +# $FreeBSD: src/share/examples/etc/make.conf,v 1.192 2002/06/20 04:33:04 gshapiro Exp $ # # NOTE: Please would any committer updating this file also update the # make.conf(5) manual page, if necessary, which is located in @@ -259,6 +259,9 @@ # install time. Use with caution as a make install will overwrite # any existing /etc/mail/sendmail.cf. Note that SENDMAIL_CF is now # deprecated. The value should be a fully qualified path name. +# Avoid using a value of /etc/mail/sendmail.mc as a buildworld will +# create /etc/mail/sendmail.cf before installworld installs an +# updated sendmail binary. # #SENDMAIL_MC=/etc/mail/myconfig.mc # @@ -266,11 +269,17 @@ # submission to use at install time. Use with caution as a make # install will overwrite any existing /etc/mail/submit.cf. The # value should be a fully qualified path name. +# Avoid using a value of /etc/mail/submit.mc as a buildworld will +# create /etc/mail/submit.cf before installworld installs an +# updated sendmail binary. # #SENDMAIL_SUBMIT_MC=/etc/mail/mysubmit.mc # # If you need to build additional .cf files during a make buildworld, # include the full paths to the .mc files in SENDMAIL_ADDITIONAL_MC. +# Avoid using a value of /etc/mail/sendmail.mc as a buildworld will +# create /etc/mail/sendmail.cf before installworld installs an +# updated sendmail binary. # #SENDMAIL_ADDITIONAL_MC=/etc/mail/foo.mc /etc/mail/bar.mc # ==== //depot/projects/ia64/share/man/man5/make.conf.5#14 (text+ko) ==== @@ -22,7 +22,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $FreeBSD: src/share/man/man5/make.conf.5,v 1.51 2002/06/09 09:28:01 dougb Exp $ +.\" $FreeBSD: src/share/man/man5/make.conf.5,v 1.52 2002/06/20 04:33:06 gshapiro Exp $ .\" .Dd November 3, 2000 .Dt MAKE.CONF 5 @@ -507,6 +507,13 @@ Note that .Va SENDMAIL_CF is now deprecated. +Avoid using a value of +.Pa /etc/mail/sendmail.mc +as a buildworld will create +.Pa /etc/mail/sendmail.cf +before installworld installs an updated +.Xr sendmail 8 +binary. .It Va SENDMAIL_SUBMIT_MC .Pq Vt str The default m4 configuration file for mail submission @@ -517,6 +524,13 @@ .Pa /etc/mail/mysubmit.mc . Use with caution as a make install will overwrite any existing .Pa /etc/mail/submit.cf . +Avoid using a value of +.Pa /etc/mail/submit.mc +as a buildworld will create +.Pa /etc/mail/submit.cf +before installworld installs an updated +.Xr sendmail 8 +binary. .It Va SENDMAIL_ADDITIONAL_MC .Pq Vt str Additional @@ -529,6 +543,13 @@ file(s), e.g., .Pa /etc/mail/foo.mc .Pa /etc/mail/bar.mc . +Avoid using a value of +.Pa /etc/mail/sendmail.mc +as a buildworld will create +.Pa /etc/mail/sendmail.cf +before installworld installs an updated +.Xr sendmail 8 +binary. .It Va SENDMAIL_M4_FLAGS .Pq Vt str Flags passed to m4 when building a ==== //depot/projects/ia64/sys/alpha/osf1/osf1_misc.c#8 (text+ko) ==== @@ -29,7 +29,7 @@ /* * Additional Copyright (c) 1999 by Andrew Gallatin - * $FreeBSD: src/sys/alpha/osf1/osf1_misc.c,v 1.30 2002/04/13 23:11:22 jhb Exp $ + * $FreeBSD: src/sys/alpha/osf1/osf1_misc.c,v 1.31 2002/06/19 06:39:25 alfred Exp $ */ @@ -1056,17 +1056,20 @@ struct proc *p; int error; uid_t uid; + struct uidinfo *uip; struct ucred *newcred, *oldcred; p = td->td_proc; uid = SCARG(uap, uid); newcred = crget(); + uip = uifind(uid); PROC_LOCK(p); oldcred = p->p_ucred; if ((error = suser_cred(p->p_ucred, PRISON_ROOT)) != 0 && uid != oldcred->cr_ruid && uid != oldcred->cr_svuid) { PROC_UNLOCK(p); + uifree(uip); crfree(newcred); return (error); } @@ -1074,7 +1077,7 @@ crcopy(newcred, oldcred); if (error == 0) { if (uid != oldcred->cr_ruid) { - change_ruid(newcred, uid); + change_ruid(newcred, uip); setsugid(p); } if (oldcred->cr_svuid != uid) { @@ -1083,11 +1086,12 @@ } } if (newcred->cr_uid != uid) { - change_euid(newcred, uid); + change_euid(newcred, uip); setsugid(p); } p->p_ucred = newcred; PROC_UNLOCK(p); + uifree(uip); crfree(oldcred); return (0); } ==== //depot/projects/ia64/sys/cam/scsi/scsi_sa.c#2 (text+ko) ==== @@ -1,5 +1,5 @@ /* - * $FreeBSD: src/sys/cam/scsi/scsi_sa.c,v 1.81 2001/09/14 19:00:51 mjacob Exp $ + * $FreeBSD: src/sys/cam/scsi/scsi_sa.c,v 1.82 2002/06/19 20:44:48 robert Exp $ * * Implementation of SCSI Sequential Access Peripheral driver for CAM. * @@ -2298,7 +2298,7 @@ saerror(union ccb *ccb, u_int32_t cflgs, u_int32_t sflgs) { static const char *toobig = - "%d-byte tape record bigger than suplied buffer\n"; + "%d-byte tape record bigger than supplied buffer\n"; struct cam_periph *periph; struct sa_softc *softc; struct ccb_scsiio *csio; ==== //depot/projects/ia64/sys/conf/files#30 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/sys/conf/files,v 1.649 2002/06/17 05:40:40 jhay Exp $ +# $FreeBSD: src/sys/conf/files,v 1.650 2002/06/18 21:32:33 julian Exp $ # # The long compile-with and dependency lines are required because of # limitations in config: backslash-newline doesn't work in strings, and @@ -1114,6 +1114,7 @@ net/bpf_filter.c optional netgraph_bpf netgraph/ng_bridge.c optional netgraph_bridge netgraph/ng_cisco.c optional netgraph_cisco +netgraph/ng_device.c optional netgraph_device netgraph/ng_echo.c optional netgraph_echo netgraph/ng_ether.c optional netgraph_ether netgraph/ng_frame_relay.c optional netgraph_frame_relay ==== //depot/projects/ia64/sys/conf/options#19 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/sys/conf/options,v 1.325 2002/06/13 22:41:23 rwatson Exp $ +# $FreeBSD: src/sys/conf/options,v 1.326 2002/06/18 21:30:36 n_hibma Exp $ # # On the handling of kernel options # @@ -69,10 +69,12 @@ COMPAT_SUNOS opt_compat.h COMPILING_LINT opt_global.h CY_PCI_FASTINTR +CONSPEED opt_comconsole.h DDB DDB_NOKLDSYM opt_ddb.h DDB_UNATTENDED opt_ddb.h GDB_REMOTE_CHAT opt_ddb.h +GDBSPEED opt_ddb.h NODEVFS opt_devfs.h HW_WDOG KTRACE ==== //depot/projects/ia64/sys/conf/options.i386#6 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/sys/conf/options.i386,v 1.170 2002/05/16 21:23:40 trhodes Exp $ +# $FreeBSD: src/sys/conf/options.i386,v 1.171 2002/06/18 21:30:36 n_hibma Exp $ # Options specific to the i386 platform kernels DISABLE_PSE @@ -14,7 +14,6 @@ POWERFAIL_NMI opt_trap.h AUTO_EOI_1 opt_auto_eoi.h AUTO_EOI_2 opt_auto_eoi.h -CONSPEED opt_comconsole.h I586_PMC_GUPROF opt_i586_guprof.h WLCACHE opt_wavelan.h WLDEBUG opt_wavelan.h ==== //depot/projects/ia64/sys/conf/options.ia64#6 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/sys/conf/options.ia64,v 1.10 2002/04/14 04:33:41 peter Exp $ +# $FreeBSD: src/sys/conf/options.ia64,v 1.11 2002/06/18 21:30:37 n_hibma Exp $ # Options specific to the ia64 platform kernels ITANIUM opt_global.h @@ -15,8 +15,6 @@ SHOW_BUSYBUFS PANIC_REBOOT_WAIT_TIME opt_panic.h -CONSPEED opt_comconsole.h - MAXCONS opt_syscons.h SC_ALT_MOUSE_IMAGE opt_syscons.h SC_DEBUG_LEVEL opt_syscons.h ==== //depot/projects/ia64/sys/conf/options.pc98#7 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/sys/conf/options.pc98,v 1.145 2002/05/19 13:18:10 nyan Exp $ +# $FreeBSD: src/sys/conf/options.pc98,v 1.146 2002/06/18 21:30:37 n_hibma Exp $ # Options specific to the pc98 platform kernels DISABLE_PSE @@ -14,7 +14,6 @@ POWERFAIL_NMI opt_trap.h AUTO_EOI_1 opt_auto_eoi.h AUTO_EOI_2 opt_auto_eoi.h -CONSPEED opt_comconsole.h I586_PMC_GUPROF opt_i586_guprof.h WLCACHE opt_wavelan.h WLDEBUG opt_wavelan.h ==== //depot/projects/ia64/sys/dev/ata/ata-dma.c#14 (text+ko) ==== @@ -25,7 +25,7 @@ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * - * $FreeBSD: src/sys/dev/ata/ata-dma.c,v 1.98 2002/04/26 22:48:20 mike Exp $ + * $FreeBSD: src/sys/dev/ata/ata-dma.c,v 1.99 2002/06/19 12:26:20 sos Exp $ */ #include <sys/param.h> @@ -1027,8 +1027,8 @@ } break; + case 0x0d30105a: /* Promise OEM ATA100 controllers */ case 0x4d30105a: /* Promise Ultra/FastTrak 100 controllers */ - case 0x0d30105a: /* Promise OEM ATA100 controllers */ if (!ATAPI_DEVICE(atadev) && udmamode >= 5 && !(pci_read_config(parent, 0x50, 2) & (channel ? 1<<11 : 1<<10))) { error = ata_command(atadev, ATA_C_SETFEATURES, 0, @@ -1044,6 +1044,7 @@ } /* FALLTHROUGH */ + case 0x0d38105a: /* Promise FastTrak 66 controllers */ case 0x4d38105a: /* Promise Ultra/FastTrak 66 controllers */ if (!ATAPI_DEVICE(atadev) && udmamode >= 4 && !(pci_read_config(parent, 0x50, 2) & (channel ? 1<<11 : 1<<10))) { @@ -1398,9 +1399,10 @@ } break; + case 0x0d38105a: /* Promise Fasttrak 66 */ case 0x4d38105a: /* Promise Ultra/Fasttrak 66 */ + case 0x0d30105a: /* Promise OEM ATA 100 */ case 0x4d30105a: /* Promise Ultra/Fasttrak 100 */ - case 0x0d30105a: /* Promise OEM ATA 100 */ switch (mode) { default: case ATA_PIO0: t->pa = 15; t->pb = 31; t->mb = 7; t->mc = 15; break; ==== //depot/projects/ia64/sys/dev/ata/ata-pci.c#13 (text+ko) ==== @@ -25,7 +25,7 @@ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * - * $FreeBSD: src/sys/dev/ata/ata-pci.c,v 1.41 2002/04/16 08:30:51 sos Exp $ + * $FreeBSD: src/sys/dev/ata/ata-pci.c,v 1.42 2002/06/19 12:26:20 sos Exp $ */ #include "opt_ata.h" @@ -243,6 +243,7 @@ case 0x4d33105a: return "Promise ATA33 controller"; + case 0x0d38105a: case 0x4d38105a: return "Promise ATA66 controller"; @@ -404,9 +405,10 @@ (pci_read_config(dev, 0x53, 1) & ~0x01) | 0x02, 1); break; - case 0x4d38105a: /* Promise 66 & 100 (before TX2) need the clock changed */ + case 0x0d30105a: /* Promise 66 & 100 (before TX2) need the clock changed */ case 0x4d30105a: - case 0x0d30105a: + case 0x0d38105a: + case 0x4d38105a: ATA_OUTB(controller->bmio, 0x11, ATA_INB(controller->bmio, 0x11)|0x0a); /* FALLTHROUGH */ @@ -565,9 +567,10 @@ break; case 0x4d33105a: /* Promise Ultra/Fasttrak 33 */ + case 0x0d38105a: /* Promise Fasttrak 66 */ case 0x4d38105a: /* Promise Ultra/Fasttrak 66 */ + case 0x0d30105a: /* Promise OEM ATA100 */ case 0x4d30105a: /* Promise Ultra/Fasttrak 100 */ - case 0x0d30105a: /* Promise OEM ATA100 */ if (!(ATA_INL(ch->r_bmio, (ch->unit ? 0x14 : 0x1c)) & (ch->unit ? 0x00004000 : 0x00000400))) return 1; ==== //depot/projects/ia64/sys/dev/ata/atapi-fd.c#7 (text+ko) ==== @@ -25,7 +25,7 @@ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * - * $FreeBSD: src/sys/dev/ata/atapi-fd.c,v 1.72 2002/05/25 11:18:02 bde Exp $ + * $FreeBSD: src/sys/dev/ata/atapi-fd.c,v 1.73 2002/06/19 12:41:05 sos Exp $ */ #include <sys/param.h> @@ -69,7 +69,6 @@ /* prototypes */ static int afd_sense(struct afd_softc *); static void afd_describe(struct afd_softc *); -static int afd_partial_done(struct atapi_request *); static int afd_done(struct atapi_request *); static int afd_eject(struct afd_softc *, int); static int afd_start_stop(struct afd_softc *, int); @@ -101,17 +100,20 @@ return 0; } - if (!strncmp(atadev->param->model, "IOMEGA ZIP", 10)) - fdp->transfersize = 64; - devstat_add_entry(&fdp->stats, "afd", fdp->lun, DEV_BSIZE, DEVSTAT_NO_ORDERED_TAGS, DEVSTAT_TYPE_DIRECT | DEVSTAT_TYPE_IF_IDE, DEVSTAT_PRIORITY_WFD); dev = disk_create(fdp->lun, &fdp->disk, 0, &afd_cdevsw, &afddisk_cdevsw); dev->si_drv1 = fdp; - dev->si_iosize_max = 252 * DEV_BSIZE; fdp->dev = dev; + + if (!strncmp(atadev->param->model, "IOMEGA ZIP", 10) || + !strncmp(atadev->param->model, "IOMEGA Clik!", 12)) + fdp->dev->si_iosize_max = 64 * DEV_BSIZE; + else + fdp->dev->si_iosize_max = 252 * DEV_BSIZE; + afd_describe(fdp); atadev->flags |= ATA_D_MEDIA_CHANGED; atadev->driver = fdp; @@ -147,7 +149,6 @@ /* The IOMEGA Clik! doesn't support reading the cap page, fake it */ if (!strncmp(fdp->device->param->model, "IOMEGA Clik!", 12)) { - fdp->transfersize = 64; fdp->cap.transfer_rate = 500; fdp->cap.heads = 1; fdp->cap.sectors = 2; @@ -189,8 +190,6 @@ fdp->cap.cylinders, fdp->cap.heads, fdp->cap.sectors, fdp->cap.sector_size); ata_prtdev(fdp->device, "%dKB/s,", fdp->cap.transfer_rate / 8); - if (fdp->transfersize) - printf(" transfer limit %d blks,", fdp->transfersize); printf(" %s\n", ata_mode2str(fdp->device->mode)); if (fdp->cap.medium_type) { ata_prtdev(fdp->device, "Medium: "); @@ -294,6 +293,13 @@ return; } + /* if it's a null transfer, return immediatly. */ + if (bp->bio_bcount == 0) { + bp->bio_resid = 0; + biodone(bp); + return; + } + s = splbio(); bioqdisksort(&fdp->queue, bp); splx(s); @@ -324,7 +330,7 @@ lba = bp->bio_pblkno; count = bp->bio_bcount / fdp->cap.sector_size; data_ptr = bp->bio_data; - bp->bio_resid = 0; + bp->bio_resid = bp->bio_bcount; bzero(ccb, sizeof(ccb)); @@ -333,26 +339,6 @@ else ccb[0] = ATAPI_WRITE_BIG; - devstat_start_transaction(&fdp->stats); - - while (fdp->transfersize && (count > fdp->transfersize)) { - ccb[2] = lba>>24; - ccb[3] = lba>>16; - ccb[4] = lba>>8; - ccb[5] = lba; - ccb[7] = fdp->transfersize>>8; - ccb[8] = fdp->transfersize; - - atapi_queue_cmd(fdp->device, ccb, data_ptr, - fdp->transfersize * fdp->cap.sector_size, - (bp->bio_cmd == BIO_READ) ? ATPR_F_READ : 0, 30, - afd_partial_done, bp); - - count -= fdp->transfersize; - lba += fdp->transfersize; - data_ptr += fdp->transfersize * fdp->cap.sector_size; - } - ccb[2] = lba>>24; ccb[3] = lba>>16; ccb[4] = lba>>8; >>> TRUNCATED FOR MAIL (1000 lines) <<< To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200206200610.g5K6A7H00343>