From owner-p4-projects@FreeBSD.ORG Tue Aug 1 23:45:41 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id A23DA16A4E1; Tue, 1 Aug 2006 23:45:41 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 5C4F916A4DE for ; Tue, 1 Aug 2006 23:45:41 +0000 (UTC) (envelope-from imp@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 318F143D6A for ; Tue, 1 Aug 2006 23:45:31 +0000 (GMT) (envelope-from imp@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k71NjVgh062004 for ; Tue, 1 Aug 2006 23:45:31 GMT (envelope-from imp@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k71NjU4t062001 for perforce@freebsd.org; Tue, 1 Aug 2006 23:45:30 GMT (envelope-from imp@freebsd.org) Date: Tue, 1 Aug 2006 23:45:30 GMT Message-Id: <200608012345.k71NjU4t062001@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to imp@freebsd.org using -f From: Warner Losh To: Perforce Change Reviews Cc: Subject: PERFORCE change 102980 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 01 Aug 2006 23:45:41 -0000 http://perforce.freebsd.org/chv.cgi?CH=102980 Change 102980 by imp@imp_harmony on 2006/08/01 23:45:07 IFC @102978 Affected files ... .. //depot/projects/arm/src/bin/sh/parser.c#2 integrate .. //depot/projects/arm/src/bin/test/test.1#3 integrate .. //depot/projects/arm/src/etc/mtree/BSD.include.dist#2 integrate .. //depot/projects/arm/src/include/Makefile#2 integrate .. //depot/projects/arm/src/lib/libarchive/archive_read_support_format_cpio.c#2 integrate .. //depot/projects/arm/src/lib/libarchive/archive_write.c#2 integrate .. //depot/projects/arm/src/lib/libmp/mpasbn.c#3 integrate .. //depot/projects/arm/src/lib/libtelnet/Makefile#2 integrate .. //depot/projects/arm/src/libexec/telnetd/Makefile#3 integrate .. //depot/projects/arm/src/release/doc/en_US.ISO8859-1/hardware/Makefile#2 integrate .. //depot/projects/arm/src/release/doc/en_US.ISO8859-1/hardware/common/hw.ent#2 integrate .. //depot/projects/arm/src/release/doc/en_US.ISO8859-1/hardware/ia64/Makefile#2 integrate .. //depot/projects/arm/src/release/doc/en_US.ISO8859-1/hardware/powerpc/Makefile#1 branch .. //depot/projects/arm/src/release/doc/en_US.ISO8859-1/hardware/powerpc/article.sgml#1 branch .. //depot/projects/arm/src/release/doc/en_US.ISO8859-1/hardware/powerpc/proc-powerpc.sgml#1 branch .. //depot/projects/arm/src/release/doc/en_US.ISO8859-1/installation/Makefile#2 integrate .. //depot/projects/arm/src/release/doc/en_US.ISO8859-1/installation/powerpc/Makefile#1 branch .. //depot/projects/arm/src/release/doc/en_US.ISO8859-1/installation/powerpc/article.sgml#1 branch .. //depot/projects/arm/src/release/doc/en_US.ISO8859-1/relnotes/Makefile#2 integrate .. //depot/projects/arm/src/release/doc/en_US.ISO8859-1/relnotes/common/new.sgml#3 integrate .. //depot/projects/arm/src/release/doc/en_US.ISO8859-1/relnotes/powerpc/Makefile#1 branch .. //depot/projects/arm/src/release/doc/en_US.ISO8859-1/relnotes/powerpc/article.sgml#1 branch .. //depot/projects/arm/src/release/doc/share/examples/Makefile.relnotesng#2 integrate .. //depot/projects/arm/src/release/doc/share/misc/dev.archlist.txt#3 integrate .. //depot/projects/arm/src/share/man/man4/man4.powerpc/Makefile#1 branch .. //depot/projects/arm/src/share/man/man4/man4.powerpc/powermac_nvram.4#1 branch .. //depot/projects/arm/src/share/man/man5/src.conf.5#2 integrate .. //depot/projects/arm/src/share/misc/bsd-family-tree#3 integrate .. //depot/projects/arm/src/sys/amd64/amd64/identcpu.c#8 integrate .. //depot/projects/arm/src/sys/amd64/amd64/pmap.c#21 integrate .. //depot/projects/arm/src/sys/arm/arm/pmap.c#23 integrate .. //depot/projects/arm/src/sys/conf/files.powerpc#10 integrate .. //depot/projects/arm/src/sys/ddb/db_ps.c#4 integrate .. //depot/projects/arm/src/sys/dev/mxge/if_mxge.c#4 integrate .. //depot/projects/arm/src/sys/dev/powermac_nvram/powermac_nvram.c#1 branch .. //depot/projects/arm/src/sys/dev/powermac_nvram/powermac_nvramvar.h#1 branch .. //depot/projects/arm/src/sys/dev/re/if_re.c#14 integrate .. //depot/projects/arm/src/sys/geom/mirror/g_mirror.c#15 integrate .. //depot/projects/arm/src/sys/geom/raid3/g_raid3.c#18 integrate .. //depot/projects/arm/src/sys/i386/i386/identcpu.c#15 integrate .. //depot/projects/arm/src/sys/i386/i386/pmap.c#18 integrate .. //depot/projects/arm/src/sys/ia64/ia64/pmap.c#9 integrate .. //depot/projects/arm/src/sys/kern/kern_fork.c#9 integrate .. //depot/projects/arm/src/sys/kern/kern_ktrace.c#7 integrate .. //depot/projects/arm/src/sys/kern/kern_syscalls.c#2 integrate .. //depot/projects/arm/src/sys/kern/uipc_sockbuf.c#2 integrate .. //depot/projects/arm/src/sys/kern/uipc_socket.c#18 integrate .. //depot/projects/arm/src/sys/kern/uipc_usrreq.c#16 integrate .. //depot/projects/arm/src/sys/modules/Makefile#27 integrate .. //depot/projects/arm/src/sys/modules/powermac_nvram/Makefile#1 branch .. //depot/projects/arm/src/sys/net/bridgestp.c#6 integrate .. //depot/projects/arm/src/sys/net/bridgestp.h#2 integrate .. //depot/projects/arm/src/sys/net/if_bridge.c#19 integrate .. //depot/projects/arm/src/sys/net/if_bridgevar.h#8 integrate .. //depot/projects/arm/src/sys/net/if_vlan.c#13 integrate .. //depot/projects/arm/src/sys/nfsserver/nfs.h#4 integrate .. //depot/projects/arm/src/sys/nfsserver/nfs_srvcache.c#3 integrate .. //depot/projects/arm/src/sys/nfsserver/nfs_srvsubs.c#7 integrate .. //depot/projects/arm/src/sys/nfsserver/nfs_syscalls.c#4 integrate .. //depot/projects/arm/src/sys/pci/if_rlreg.h#7 integrate .. //depot/projects/arm/src/sys/powerpc/conf/GENERIC#10 integrate .. //depot/projects/arm/src/sys/powerpc/powerpc/mmu_if.m#6 integrate .. //depot/projects/arm/src/sys/powerpc/powerpc/mmu_oea.c#7 integrate .. //depot/projects/arm/src/sys/powerpc/powerpc/pmap_dispatch.c#6 integrate .. //depot/projects/arm/src/sys/sparc64/sparc64/pmap.c#10 integrate .. //depot/projects/arm/src/sys/sys/kernel.h#4 integrate .. //depot/projects/arm/src/sys/sys/socketvar.h#11 integrate .. //depot/projects/arm/src/sys/sys/sysent.h#4 integrate .. //depot/projects/arm/src/sys/ufs/ufs/ufs_lookup.c#5 integrate .. //depot/projects/arm/src/sys/vm/pmap.h#8 integrate .. //depot/projects/arm/src/sys/vm/vm_object.c#11 integrate .. //depot/projects/arm/src/sys/vm/vm_page.c#14 integrate .. //depot/projects/arm/src/sys/vm/vm_pageout.c#7 integrate .. //depot/projects/arm/src/tools/build/options/WITHOUT_GNU#1 branch .. //depot/projects/arm/src/tools/build/options/WITHOUT_NS_CACHING#1 branch .. //depot/projects/arm/src/tools/build/options/WITHOUT_PAM#1 branch .. //depot/projects/arm/src/tools/build/options/makeman#2 integrate .. //depot/projects/arm/src/usr.bin/hexdump/conv.c#2 integrate .. //depot/projects/arm/src/usr.bin/tar/read.c#2 integrate .. //depot/projects/arm/src/usr.bin/tar/write.c#2 integrate .. //depot/projects/arm/src/usr.bin/telnet/Makefile#3 integrate .. //depot/projects/arm/src/usr.sbin/Makefile#3 integrate .. //depot/projects/arm/src/usr.sbin/inetd/Makefile#3 integrate .. //depot/projects/arm/src/usr.sbin/kldxref/Makefile#3 integrate .. //depot/projects/arm/src/usr.sbin/nvram/Makefile#1 branch .. //depot/projects/arm/src/usr.sbin/nvram/nvram.8#1 branch .. //depot/projects/arm/src/usr.sbin/nvram/nvram.c#1 branch Differences ... ==== //depot/projects/arm/src/bin/sh/parser.c#2 (text+ko) ==== @@ -36,7 +36,7 @@ #endif #endif /* not lint */ #include -__FBSDID("$FreeBSD: src/bin/sh/parser.c,v 1.56 2005/08/15 17:49:38 stefanf Exp $"); +__FBSDID("$FreeBSD: src/bin/sh/parser.c,v 1.57 2006/07/31 11:32:12 yar Exp $"); #include #include @@ -952,6 +952,7 @@ USTPUTC('\\', out); pungetc(); } else if (c == '\n') { + plinno++; if (doprompt) setprompt(2); else ==== //depot/projects/arm/src/bin/test/test.1#3 (text+ko) ==== @@ -30,9 +30,9 @@ .\" SUCH DAMAGE. .\" .\" @(#)test.1 8.1 (Berkeley) 5/31/93 -.\" $FreeBSD: src/bin/test/test.1,v 1.24 2006/07/27 19:08:21 yar Exp $ +.\" $FreeBSD: src/bin/test/test.1,v 1.25 2006/07/31 09:25:20 yar Exp $ .\" -.Dd July 27, 2006 +.Dd July 31, 2006 .Dt TEST 1 .Os .Sh NAME @@ -339,3 +339,9 @@ .Fl o , unlike in the logical operators of .Xr sh 1 . +For instance, the writable status of +.Pa file +will be tested by the following command even though the former expression +indicated false, which results in a gratuitous access to the file system: +.Pp +.Dl "[ -z abc -a -w file ]" ==== //depot/projects/arm/src/etc/mtree/BSD.include.dist#2 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/etc/mtree/BSD.include.dist,v 1.106 2006/03/19 15:44:53 rwatson Exp $ +# $FreeBSD: src/etc/mtree/BSD.include.dist,v 1.107 2006/08/01 22:19:00 sobomax Exp $ # # Please see the file src/etc/mtree/README before making changes to this file. # @@ -56,6 +56,8 @@ .. ppbus .. + powermac_nvram + .. smbus .. speaker ==== //depot/projects/arm/src/include/Makefile#2 (text+ko) ==== @@ -1,5 +1,5 @@ # @(#)Makefile 8.2 (Berkeley) 1/4/94 -# $FreeBSD: src/include/Makefile,v 1.261 2006/03/30 20:15:53 ume Exp $ +# $FreeBSD: src/include/Makefile,v 1.262 2006/08/01 22:19:00 sobomax Exp $ # # Doing a "make install" builds /usr/include. @@ -41,7 +41,7 @@ LSUBDIRS= cam/scsi \ dev/acpica dev/an dev/bktr dev/firewire dev/hwpmc \ dev/ic dev/iicbus ${_dev_ieee488} dev/lmc dev/ofw \ - dev/pbio dev/ppbus dev/smbus dev/speaker dev/usb dev/wi dev/utopia \ + dev/pbio ${_dev_powermac_nvram} dev/ppbus dev/smbus dev/speaker dev/usb dev/wi dev/utopia \ fs/devfs fs/fdescfs fs/fifofs fs/msdosfs fs/ntfs fs/nullfs \ ${_fs_nwfs} fs/portalfs fs/procfs fs/smbfs fs/udf fs/umapfs \ fs/unionfs \ @@ -55,6 +55,10 @@ security/mac_mls security/mac_partition \ ufs/ffs ufs/ufs +.if ${MACHINE_ARCH} == "powerpc" +_dev_powermac_nvram= dev/powermac_nvram +.endif + .if ${MK_GPIB} != "no" _dev_ieee488= dev/ieee488 .endif ==== //depot/projects/arm/src/lib/libarchive/archive_read_support_format_cpio.c#2 (text+ko) ==== @@ -25,9 +25,12 @@ */ #include "archive_platform.h" -__FBSDID("$FreeBSD: src/lib/libarchive/archive_read_support_format_cpio.c,v 1.17 2006/03/21 16:55:46 kientzle Exp $"); +__FBSDID("$FreeBSD: src/lib/libarchive/archive_read_support_format_cpio.c,v 1.18 2006/07/30 18:33:20 kientzle Exp $"); #include +#ifdef MAJOR_IN_MKDEV +#include +#endif #include /* #include */ /* See archive_platform.h */ ==== //depot/projects/arm/src/lib/libarchive/archive_write.c#2 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include "archive_platform.h" -__FBSDID("$FreeBSD: src/lib/libarchive/archive_write.c,v 1.16 2005/09/24 21:15:00 kientzle Exp $"); +__FBSDID("$FreeBSD: src/lib/libarchive/archive_write.c,v 1.17 2006/08/01 05:31:29 kientzle Exp $"); /* * This file contains the "essential" portions of the write API, that @@ -201,7 +201,9 @@ if (a->state & ARCHIVE_STATE_DATA) ((a->format_finish_entry)(a)); - if (archive_entry_dev(entry) == a->skip_file_dev && + if (a->skip_file_dev != 0 && + archive_entry_dev(entry) == a->skip_file_dev && + a->skip_file_ino != 0 && archive_entry_ino(entry) == a->skip_file_ino) { archive_set_error(a, 0, "Can't add archive to itself"); return (ARCHIVE_WARN); ==== //depot/projects/arm/src/lib/libmp/mpasbn.c#3 (text+ko) ==== @@ -70,7 +70,7 @@ */ #include -__FBSDID("$FreeBSD: src/lib/libmp/mpasbn.c,v 1.4 2006/07/28 23:00:16 simon Exp $"); +__FBSDID("$FreeBSD: src/lib/libmp/mpasbn.c,v 1.5 2006/07/30 19:29:26 simon Exp $"); #include #include @@ -95,15 +95,16 @@ static MINT *_itom(const char *, short); static void _madd(const char *, const MINT *, const MINT *, MINT *); static int _mcmpa(const char *, const MINT *, const MINT *); -static void _mdiv(const char *, const MINT *, const MINT *, MINT *, MINT *); +static void _mdiv(const char *, const MINT *, const MINT *, MINT *, MINT *, + BN_CTX *); static void _mfree(const char *, MINT *); static void _moveb(const char *, const BIGNUM *, MINT *); static void _movem(const char *, const MINT *, MINT *); static void _msub(const char *, const MINT *, const MINT *, MINT *); static char *_mtod(const char *, const MINT *); static char *_mtox(const char *, const MINT *); -static void _mult(const char *, const MINT *, const MINT *, MINT *); -static void _sdiv(const char *, const MINT *, short, MINT *, short *); +static void _mult(const char *, const MINT *, const MINT *, MINT *, BN_CTX *); +static void _sdiv(const char *, const MINT *, short, MINT *, short *, BN_CTX *); static MINT *_xtom(const char *, const char *); /* @@ -223,14 +224,11 @@ * Compute qmp=nmp/dmp and rmp=nmp%dmp. */ static void -_mdiv(const char *msg, const MINT *nmp, const MINT *dmp, MINT *qmp, MINT *rmp) +_mdiv(const char *msg, const MINT *nmp, const MINT *dmp, MINT *qmp, MINT *rmp, + BN_CTX *c) { BIGNUM q, r; - BN_CTX *c; - c = BN_CTX_new(); - if (c == NULL) - _bnerr(msg); BN_init(&r); BN_init(&q); BN_ERRCHECK(msg, BN_div(&q, &r, nmp->bn, dmp->bn, c)); @@ -238,14 +236,18 @@ _moveb(msg, &r, rmp); BN_free(&q); BN_free(&r); - BN_CTX_free(c); } void mdiv(const MINT *nmp, const MINT *dmp, MINT *qmp, MINT *rmp) { + BN_CTX *c; - _mdiv("mdiv", nmp, dmp, qmp, rmp); + c = BN_CTX_new(); + if (c == NULL) + _bnerr("mdiv"); + _mdiv("mdiv", nmp, dmp, qmp, rmp, c); + BN_CTX_free(c); } /* @@ -357,11 +359,15 @@ void msqrt(const MINT *nmp, MINT *xmp, MINT *rmp) { + BN_CTX *c; MINT *tolerance; MINT *ox, *x; MINT *z1, *z2, *z3; short i; + c = BN_CTX_new(); + if (c == NULL) + _bnerr("msqrt"); tolerance = _itom("msqrt", 1); x = _itom("msqrt", 1); ox = _itom("msqrt", 0); @@ -370,13 +376,13 @@ z3 = _itom("msqrt", 0); do { _movem("msqrt", x, ox); - _mdiv("msqrt", nmp, x, z1, z2); + _mdiv("msqrt", nmp, x, z1, z2, c); _madd("msqrt", x, z1, z2); - _sdiv("msqrt", z2, 2, x, &i); + _sdiv("msqrt", z2, 2, x, &i, c); _msub("msqrt", ox, x, z3); } while (_mcmpa("msqrt", z3, tolerance) == 1); _movem("msqrt", x, xmp); - _mult("msqrt", x, x, z1); + _mult("msqrt", x, x, z1, c); _msub("msqrt", nmp, z1, z2); _movem("msqrt", z2, rmp); _mfree("msqrt", tolerance); @@ -385,6 +391,7 @@ _mfree("msqrt", z1); _mfree("msqrt", z2); _mfree("msqrt", z3); + BN_CTX_free(c); } /* @@ -470,26 +477,26 @@ * Compute rmp=mp1*mp2. */ static void -_mult(const char *msg, const MINT *mp1, const MINT *mp2, MINT *rmp) +_mult(const char *msg, const MINT *mp1, const MINT *mp2, MINT *rmp, BN_CTX *c) { BIGNUM b; - BN_CTX *c; - c = BN_CTX_new(); - if (c == NULL) - _bnerr(msg); BN_init(&b); BN_ERRCHECK(msg, BN_mul(&b, mp1->bn, mp2->bn, c)); _moveb(msg, &b, rmp); BN_free(&b); - BN_CTX_free(c); } void mult(const MINT *mp1, const MINT *mp2, MINT *rmp) { + BN_CTX *c; - _mult("mult", mp1, mp2, rmp); + c = BN_CTX_new(); + if (c == NULL) + _bnerr("mult"); + _mult("mult", mp1, mp2, rmp, c); + BN_CTX_free(c); } /* @@ -538,16 +545,13 @@ * Compute qmp=nmp/d and ro=nmp%d. */ static void -_sdiv(const char *msg, const MINT *nmp, short d, MINT *qmp, short *ro) +_sdiv(const char *msg, const MINT *nmp, short d, MINT *qmp, short *ro, + BN_CTX *c) { MINT *dmp, *rmp; BIGNUM q, r; - BN_CTX *c; char *s; - c = BN_CTX_new(); - if (c == NULL) - _bnerr(msg); BN_init(&q); BN_init(&r); dmp = _itom(msg, d); @@ -565,14 +569,18 @@ _mfree(msg, rmp); BN_free(&r); BN_free(&q); - BN_CTX_free(c); } void sdiv(const MINT *nmp, short d, MINT *qmp, short *ro) { + BN_CTX *c; - _sdiv("sdiv", nmp, d, qmp, ro); + c = BN_CTX_new(); + if (c == NULL) + _bnerr("sdiv"); + _sdiv("sdiv", nmp, d, qmp, ro, c); + BN_CTX_free(c); } /* ==== //depot/projects/arm/src/lib/libtelnet/Makefile#2 (text+ko) ==== @@ -1,5 +1,5 @@ # From: @(#)Makefile 8.2 (Berkeley) 12/15/93 -# $FreeBSD: src/lib/libtelnet/Makefile,v 1.23 2006/03/17 18:54:28 ru Exp $ +# $FreeBSD: src/lib/libtelnet/Makefile,v 1.24 2006/07/31 13:29:35 yar Exp $ .include @@ -19,13 +19,14 @@ .if ${MK_OPENSSL} != "no" SRCS+= encrypt.c auth.c enc_des.c sra.c pk.c CFLAGS+= -DENCRYPTION -DAUTHENTICATION -DSRA +.endif + .if ${MK_KERBEROS_SUPPORT} != "no" SRCS+= kerberos5.c CFLAGS+= -DKRB5 -I${KRB5DIR}/lib/krb5 -I${KRB5OBJDIR} -I${ASN1OBJDIR} CFLAGS+= -DFORWARD -Dnet_write=telnet_net_write .endif .endif -.endif INCS= ${TELNETDIR}/arpa/telnet.h INCSDIR= ${INCLUDEDIR}/arpa ==== //depot/projects/arm/src/libexec/telnetd/Makefile#3 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/libexec/telnetd/Makefile,v 1.28 2006/07/27 12:15:37 yar Exp $ +# $FreeBSD: src/libexec/telnetd/Makefile,v 1.31 2006/07/31 19:15:09 yar Exp $ # Do not define -DKLUDGELINEMODE, as it does not interact well with many # telnet implementations. @@ -30,18 +30,20 @@ DPADD= ${LIBUTIL} ${LIBTERMCAP} ${LIBTELNET} LDADD= -lutil -ltermcap ${LIBTELNET} +# XXX for src/release/picobsd .if !defined(RELEASE_CRUNCH) .if ${MK_OPENSSL} != "no" SRCS+= authenc.c CFLAGS+= -DAUTHENTICATION -DENCRYPTION DPADD+= ${LIBMP} ${LIBCRYPTO} ${LIBCRYPT} ${LIBPAM} LDADD+= -lmp -lcrypto -lcrypt ${MINUSLPAM} +.endif + .if ${MK_KERBEROS_SUPPORT} != "no" CFLAGS+= -DKRB5 -DFORWARD -Dnet_write=telnet_net_write DPADD+= ${LIBKRB5} ${LIBASN1} ${LIBROKEN} ${LIBCOM_ERR} LDADD+= -lkrb5 -lasn1 -lroken -lcom_err .endif .endif -.endif .include ==== //depot/projects/arm/src/release/doc/en_US.ISO8859-1/hardware/Makefile#2 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/release/doc/en_US.ISO8859-1/hardware/Makefile,v 1.7 2006/05/15 21:12:12 wilko Exp $ +# $FreeBSD: src/release/doc/en_US.ISO8859-1/hardware/Makefile,v 1.8 2006/07/31 01:32:29 marcel Exp $ RELN_ROOT?= ${.CURDIR}/../.. @@ -6,6 +6,7 @@ SUBDIR+= ia64 SUBDIR+= i386 SUBDIR+= pc98 +SUBDIR+= powerpc SUBDIR+= sparc64 .include "${RELN_ROOT}/share/mk/doc.relnotes.mk" ==== //depot/projects/arm/src/release/doc/en_US.ISO8859-1/hardware/common/hw.ent#2 (text+ko) ==== @@ -1,5 +1,5 @@ - + @@ -11,6 +11,7 @@ + ==== //depot/projects/arm/src/release/doc/en_US.ISO8859-1/hardware/ia64/Makefile#2 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/release/doc/en_US.ISO8859-1/hardware/ia64/Makefile,v 1.3 2004/08/03 22:12:45 simon Exp $ +# $FreeBSD: src/release/doc/en_US.ISO8859-1/hardware/ia64/Makefile,v 1.4 2006/07/31 01:27:16 marcel Exp $ RELN_ROOT?= ${.CURDIR}/../../.. @@ -11,7 +11,7 @@ # SGML content SRCS+= article.sgml -# SRCS+= proc-ia64.sgml +SRCS+= proc-ia64.sgml SRCS+= ../common/hw.ent SRCS+= ../common/artheader.sgml SRCS+= ../common/dev.sgml ==== //depot/projects/arm/src/release/doc/en_US.ISO8859-1/installation/Makefile#2 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/release/doc/en_US.ISO8859-1/installation/Makefile,v 1.7 2006/05/18 16:27:53 bmah Exp $ +# $FreeBSD: src/release/doc/en_US.ISO8859-1/installation/Makefile,v 1.8 2006/07/31 01:32:29 marcel Exp $ RELN_ROOT?= ${.CURDIR}/../.. @@ -6,6 +6,7 @@ SUBDIR+= ia64 SUBDIR+= i386 SUBDIR+= pc98 +SUBDIR+= powerpc SUBDIR+= sparc64 .include "${RELN_ROOT}/share/mk/doc.relnotes.mk" ==== //depot/projects/arm/src/release/doc/en_US.ISO8859-1/relnotes/Makefile#2 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/release/doc/en_US.ISO8859-1/relnotes/Makefile,v 1.7 2006/05/18 16:27:53 bmah Exp $ +# $FreeBSD: src/release/doc/en_US.ISO8859-1/relnotes/Makefile,v 1.8 2006/07/31 01:32:30 marcel Exp $ RELN_ROOT?= ${.CURDIR}/../.. @@ -6,6 +6,7 @@ SUBDIR+= ia64 SUBDIR+= i386 SUBDIR+= pc98 +SUBDIR+= powerpc SUBDIR+= sparc64 .include "${RELN_ROOT}/share/mk/doc.relnotes.mk" ==== //depot/projects/arm/src/release/doc/en_US.ISO8859-1/relnotes/common/new.sgml#3 (text+ko) ==== @@ -3,7 +3,7 @@ The &os; Project - $FreeBSD: src/release/doc/en_US.ISO8859-1/relnotes/common/new.sgml,v 1.958 2006/07/25 21:48:28 bmah Exp $ + $FreeBSD: src/release/doc/en_US.ISO8859-1/relnotes/common/new.sgml,v 1.959 2006/07/31 16:49:25 brueffer Exp $ 2000 @@ -618,7 +618,7 @@ The &man.my.4; driver is now MPSAFE. &merged; - The &man.my.4; driver now supports &man.altq.4;. + The &man.my.4; driver now supports &man.altq.4;. &merged; The &man.mxge.4; driver, which supports Myricom Myri10GE 10 Gigabit Ethernet @@ -641,7 +641,7 @@ The &man.sk.4; driver is now MPSAFE. &merged; - The &man.ste.4; driver is now MPSAFE. + The &man.ste.4; driver is now MPSAFE. &merged; The &man.stge.4; driver has been added. It supports the Sundance/Tamarack TC9021 Gigabit Ethernet controller and was ==== //depot/projects/arm/src/release/doc/share/examples/Makefile.relnotesng#2 (text+ko) ==== @@ -1,12 +1,12 @@ # -*- makefile -*- # -# $FreeBSD: src/release/doc/share/examples/Makefile.relnotesng,v 1.12 2006/05/16 16:12:45 bmah Exp $ +# $FreeBSD: src/release/doc/share/examples/Makefile.relnotesng,v 1.13 2006/07/31 01:32:30 marcel Exp $ # # Sample makefile for rendering and uploading RELNOTESng files outside # the build tree. # -ARCHS= amd64 ia64 i386 pc98 sparc64 +ARCHS= amd64 ia64 i386 pc98 powerpc sparc64 MULTITEXTS= installation relnotes hardware UNITEXTS= readme errata ==== //depot/projects/arm/src/release/doc/share/misc/dev.archlist.txt#3 (text+ko) ==== @@ -23,7 +23,7 @@ # OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF # SUCH DAMAGE. # -# $FreeBSD: src/release/doc/share/misc/dev.archlist.txt,v 1.87 2006/07/25 05:13:53 brueffer Exp $ +# $FreeBSD: src/release/doc/share/misc/dev.archlist.txt,v 1.88 2006/07/31 17:04:28 brueffer Exp $ # # @@ -46,14 +46,14 @@ arcmsr i386,amd64 asr i386 ath i386 -aue i386,pc98,ia64,amd64 +aue i386,pc98,ia64,amd64,powerpc awi i386,pc98,amd64 -axe i386,pc98,amd64 +axe i386,pc98,amd64,powerpc bce i386,amd64 bge i386,pc98,sparc64,ia64,amd64 bktr i386,pc98 bt i386,amd64 -cdce i386,pc98,ia64,amd64 +cdce i386,pc98,ia64,amd64,powerpc ciss i386,ia64,amd64 ce i386,pc98 cm i386 @@ -61,7 +61,7 @@ cp i386,pc98 ct pc98 ctau i386 -cue i386,pc98,ia64,amd64 +cue i386,pc98,ia64,amd64,powerpc cx i386 de i386,pc98,alpha,ia64,amd64 dpt i386,ia64,amd64 @@ -70,8 +70,8 @@ esp sparc64 ex i386,amd64 fe i386,pc98,amd64 -fwohci i386,sparc64,ia64,amd64 -gem sparc64 +fwohci i386,sparc64,ia64,amd64,powerpc +gem sparc64,powerpc hifn i386,pc98,amd64 hptmv i386,amd64 ida i386 @@ -79,7 +79,7 @@ iir i386,ia64,amd64 ips i386,amd64 ixgb i386,amd64 -kue i386,pc98,ia64,amd64 +kue i386,pc98,ia64,amd64,powerpc lge i386,pc98,amd64 mfi i386,alpha,ia64,amd64 mlx i386,alpha,ia64,amd64 @@ -93,7 +93,7 @@ nge i386,pc98,alpha,amd64 nsp i386,pc98 nve i386,amd64 -ohci i386,pc98,alpha,ia64,amd64 +ohci i386,pc98,alpha,ia64,amd64,powerpc oltr i386 pcn i386,pc98,alpha,ia64,amd64 pst i386 @@ -148,13 +148,13 @@ ucycom i386,pc98,amd64 udav i386,pc98,amd64 uftdi i386,pc98,amd64 -uhci i386,pc98,alpha,ia64,amd64 -ulpt i386,pc98,alpha,amd64 -umass i386,pc98,alpha,amd64 +uhci i386,pc98,alpha,ia64,amd64,powerpc +ulpt i386,pc98,alpha,amd64,powerpc +umass i386,pc98,alpha,amd64,powerpc umodem i386,pc98,amd64 uplcom i386,pc98,amd64 -urio i386,pc98,amd64 -uscanner i386,pc98,amd64 +urio i386,pc98,amd64,powerpc +uscanner i386,pc98,amd64,powerpc uvisor i386,pc98,amd64 uvscom i386,pc98,amd64 vge i386,pc98,amd64 ==== //depot/projects/arm/src/share/man/man5/src.conf.5#2 (text) ==== @@ -1,12 +1,12 @@ .\" DO NOT EDIT-- this file is automatically generated. -.\" from FreeBSD: src/tools/build/options/makeman,v 1.2 2006/03/21 09:08:45 ru Exp -.\" $FreeBSD: src/share/man/man5/src.conf.5,v 1.4 2006/05/17 09:33:06 phk Exp $ -.Dd April 13, 2006 +.\" from FreeBSD: src/tools/build/options/makeman,v 1.5 2006/07/31 12:41:13 yar Exp +.\" $FreeBSD: src/share/man/man5/src.conf.5,v 1.6 2006/07/31 14:13:25 yar Exp $ +.Dd July 31, 2006 .Dt SRC.CONF 5 .Os .Sh NAME .Nm src.conf -.Nd source build options +.Nd "source build options" .Sh DESCRIPTION The .Nm @@ -50,7 +50,7 @@ .Nm is to control the compilation of the .Fx -sources, which are usually found in +source code, which is usually located in .Pa /usr/src . As a rule, the system administrator creates .Nm @@ -65,12 +65,14 @@ or in environment; see .Xr environ 7 . .Pp -The values of variables are ignored; the variable being -set at all (even to +The values of variables are ignored regardless of their setting; +even if they would be set to .Dq Li FALSE or -.Dq Li NO ) -causes it to be treated as if it was set with no value. +.Dq Li NO . +Just the existence of an option will cause +it to be honoured by +.Xr make 1 . .Pp The following list provides a name and short description for variables that can be used for source builds. @@ -237,6 +239,12 @@ .\" from FreeBSD: src/tools/build/options/WITHOUT_GDB,v 1.1 2006/03/21 07:50:49 ru Exp Set to not build .Xr gdb 1 . +.It Va WITHOUT_GNU +.\" from FreeBSD: src/tools/build/options/WITHOUT_GNU,v 1.2 2006/07/31 13:53:27 yar Exp +Set to not build contributed GNU software as a part of the base system. +This option can be useful if the system built must not contain any code +covered by the GNU Public License due to legal reasons. +.Sy "The option has no effect yet." When set, it also enforces the following options: .Pp .Bl -item -compact @@ -388,6 +396,14 @@ .\" from FreeBSD: src/tools/build/options/WITHOUT_NLS_CATALOGS,v 1.1 2006/03/21 07:50:50 ru Exp Set to not build NLS catalog support for .Xr csh 1 . +.It Va WITHOUT_NS_CACHING +.\" from FreeBSD: src/tools/build/options/WITHOUT_NS_CACHING,v 1.1 2006/07/31 13:08:47 yar Exp +Set to disable name caching in the +.Pa nsswitch +subsystem. +The generic caching daemon, +.Xr cached 8 , +will not be built either if this option is set. .It Va WITHOUT_OBJC .\" from FreeBSD: src/tools/build/options/WITHOUT_OBJC,v 1.1 2006/03/21 07:50:50 ru Exp Set to not build Objective C support. @@ -407,6 +423,10 @@ .It .Va WITHOUT_OPENSSH .El +.It Va WITHOUT_PAM +.\" from FreeBSD: src/tools/build/options/WITHOUT_PAM,v 1.2 2006/07/31 13:53:27 yar Exp +Set to not build PAM library and modules. +.Sy "This option is deprecated and does nothing." When set, it also enforces the following options: .Pp .Bl -item -compact ==== //depot/projects/arm/src/share/misc/bsd-family-tree#3 (text+ko) ==== @@ -198,12 +198,12 @@ | | | | | NetBSD 2.1 | | | | | | | | | | | | | NetBSD 3.0 | | - | | | | | | | DragonFly 1.4.0 - | | | | | | OpenBSD 3.9 | - | FreeBSD | | | | | | - | 6.1 | | | | | | - | | FreeBSD 5.5 | | \ | | - | V | | NetBSD 3.0.1 | DragonFly 1.6.0 + | | | | | | | DragonFly 1.4.0 + | | | | | | OpenBSD 3.9 | + | FreeBSD | | | | | | + | 6.1 | | | | | | + | | FreeBSD 5.5 | | | | | + | V | | NetBSD 3.0.1 | DragonFly 1.6.0 | | | | | FreeBSD 7 -current | NetBSD -current OpenBSD -current | | | | | | @@ -449,7 +449,7 @@ OpenBSD 3.9 2006-05-01 [OBD] FreeBSD 6.1 2006-05-08 [FBD] FreeBSD 5.5 2006-05-25 [FBD] -NetBSD 3.0.1 2006-07-24 [NBD] +NetBSD 3.0.1 2006-07-24 [NBD] (security/critical release) DragonFly 1.6.0 2006-07-24 [DFB] Bibliography @@ -511,4 +511,4 @@ Copyright (c) 1997-2004 Wolfram Schneider URL: http://cvsweb.freebsd.org/src/share/misc/bsd-family-tree -$FreeBSD: src/share/misc/bsd-family-tree,v 1.106 2006/07/25 13:31:00 maxim Exp $ +$FreeBSD: src/share/misc/bsd-family-tree,v 1.107 2006/08/01 15:26:09 maxim Exp $ ==== //depot/projects/arm/src/sys/amd64/amd64/identcpu.c#8 (text+ko) ==== @@ -39,7 +39,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/amd64/amd64/identcpu.c,v 1.147 2006/07/12 06:04:11 jkim Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/amd64/identcpu.c,v 1.148 2006/08/01 01:23:39 obrien Exp $"); #include "opt_cpu.h" @@ -296,8 +296,8 @@ "\034RDTSCP" /* RDTSCP */ "\035" /* Undefined */ "\036LM" /* 64 bit long mode */ - "\0373DNow+" /* AMD 3DNow! Extensions */ - "\0403DNow" /* AMD 3DNow! */ + "\0373DNow!+" /* AMD 3DNow! Extensions */ + "\0403DNow!" /* AMD 3DNow! */ ); } ==== //depot/projects/arm/src/sys/amd64/amd64/pmap.c#21 (text+ko) ==== @@ -77,7 +77,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/amd64/amd64/pmap.c,v 1.567 2006/07/20 17:48:40 alc Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/amd64/pmap.c,v 1.568 2006/08/01 19:06:04 alc Exp $"); /* * Manages physical address maps. @@ -2972,7 +2972,7 @@ * Clear the write and modified bits in each of the given page's mappings. */ void -pmap_clear_write(vm_page_t m) +pmap_remove_write(vm_page_t m) { pv_entry_t pv; pmap_t pmap; @@ -3002,23 +3002,6 @@ } /* - * pmap_page_protect: - * - * Lower the permission for all mappings to a given page. - */ -void -pmap_page_protect(vm_page_t m, vm_prot_t prot) -{ - if ((prot & VM_PROT_WRITE) == 0) { - if (prot & (VM_PROT_READ | VM_PROT_EXECUTE)) { - pmap_clear_write(m); - } else { - pmap_remove_all(m); - } - } -} - -/* * pmap_ts_referenced: * * Return a count of reference bits for a page, clearing those bits. ==== //depot/projects/arm/src/sys/arm/arm/pmap.c#23 (text+ko) ==== @@ -147,7 +147,7 @@ #include "opt_vm.h" #include -__FBSDID("$FreeBSD: src/sys/arm/arm/pmap.c,v 1.66 2006/07/20 23:26:22 alc Exp $"); +__FBSDID("$FreeBSD: src/sys/arm/arm/pmap.c,v 1.67 2006/08/01 19:06:04 alc Exp $"); #include #include #include @@ -2759,32 +2759,6 @@ /* - * pmap_page_protect: - * - * Lower the permission for all mappings to a given page. - */ -void -pmap_page_protect(vm_page_t m, vm_prot_t prot) -{ - switch(prot) { - case VM_PROT_READ|VM_PROT_WRITE|VM_PROT_EXECUTE: - case VM_PROT_READ|VM_PROT_WRITE: - return; - - case VM_PROT_READ: - case VM_PROT_READ|VM_PROT_EXECUTE: - pmap_clearbit(m, PVF_WRITE); - break; - - default: - pmap_remove_all(m); - break; - } - -} - - -/* * Remove all pages from specified address space * this aids process exit speeds. Also, this code * is special cased for current process only, but @@ -4470,7 +4444,7 @@ * Clear the write and modified bits in each of the given page's mappings. */ void -pmap_clear_write(vm_page_t m) +pmap_remove_write(vm_page_t m) { if (m->md.pvh_attrs & PVF_WRITE) ==== //depot/projects/arm/src/sys/conf/files.powerpc#10 (text+ko) ==== @@ -1,7 +1,7 @@ # This file tells config what files go into building a kernel, # files marked standard are always included. # -# $FreeBSD: src/sys/conf/files.powerpc,v 1.56 2006/07/26 19:44:42 marcel Exp $ +# $FreeBSD: src/sys/conf/files.powerpc,v 1.57 2006/08/01 22:19:01 sobomax Exp $ # # The long compile-with and dependency lines are required because of # limitations in config: backslash-newline doesn't work in strings, and @@ -128,3 +128,5 @@ powerpc/psim/uart_iobus.c optional uart psim dev/scc/scc_bfe_macio.c optional scc powermac + +dev/powermac_nvram/powermac_nvram.c optional powermac powermac_nvram ==== //depot/projects/arm/src/sys/ddb/db_ps.c#4 (text+ko) ==== @@ -28,7 +28,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/ddb/db_ps.c,v 1.61 2006/07/12 21:22:43 jhb Exp $"); +__FBSDID("$FreeBSD: src/sys/ddb/db_ps.c,v 1.63 2006/08/01 22:30:55 jhb Exp $"); #include #include @@ -57,10 +57,10 @@ * * 1 2 3 4 5 6 7 * 1234567890123456789012345678901234567890123456789012345678901234567890 - * pid uid ppid pgrp state wmesg wchan cmd - * < wmesg > < wchan > - * (threaded) - * < wmesg > < wchan > + * pid ppid pgrp uid state wmesg wchan cmd + * < wmesg > < wchan > + * (threaded) + * < wmesg > < wchan > * * For machines with 64-bit pointers, we expand the wchan field 8 more * characters. @@ -83,9 +83,9 @@ p = &proc0; #ifdef __LP64__ - db_printf(" pid uid ppid pgrp state wmesg wchan cmd\n"); + db_printf(" pid ppid pgrp uid state wmesg wchan cmd\n"); #else - db_printf(" pid uid ppid pgrp state wmesg wchan cmd\n"); + db_printf(" pid ppid pgrp uid state wmesg wchan cmd\n"); #endif while (--np >= 0 && !db_pager_quit) { if (p == NULL) { @@ -98,9 +98,9 @@ cred = p->p_ucred; pgrp = p->p_pgrp; - db_printf("%5d %4d %5d %5d ", p->p_pid, >>> TRUNCATED FOR MAIL (1000 lines) <<<