From owner-p4-projects@FreeBSD.ORG Thu Sep 7 22:01:14 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 79CB816A4E0; Thu, 7 Sep 2006 22:01:14 +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 552A416A4DD for ; Thu, 7 Sep 2006 22:01:14 +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 0FA0C43D45 for ; Thu, 7 Sep 2006 22:01:14 +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 k87M1DC6082768 for ; Thu, 7 Sep 2006 22:01:13 GMT (envelope-from imp@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k87M1DEW082763 for perforce@freebsd.org; Thu, 7 Sep 2006 22:01:13 GMT (envelope-from imp@freebsd.org) Date: Thu, 7 Sep 2006 22:01:13 GMT Message-Id: <200609072201.k87M1DEW082763@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 105821 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: Thu, 07 Sep 2006 22:01:14 -0000 http://perforce.freebsd.org/chv.cgi?CH=105821 Change 105821 by imp@imp_paco-paco on 2006/09/07 22:00:17 IFC @105820 Affected files ... .. //depot/projects/arm/src/Makefile.inc1#14 integrate .. //depot/projects/arm/src/release/doc/en_US.ISO8859-1/relnotes/common/new.sgml#11 integrate .. //depot/projects/arm/src/sys/arm/at91/at91_twi.c#22 integrate .. //depot/projects/arm/src/sys/arm/at91/if_atereg.h#11 integrate .. //depot/projects/arm/src/usr.bin/tip/tip/cu.c#3 integrate Differences ... ==== //depot/projects/arm/src/Makefile.inc1#14 (text+ko) ==== @@ -1,5 +1,5 @@ # -# $FreeBSD: src/Makefile.inc1,v 1.556 2006/09/07 16:41:30 ru Exp $ +# $FreeBSD: src/Makefile.inc1,v 1.558 2006/09/07 20:27:56 ru Exp $ # # Make command line options: # -DNO_CLEANDIR run ${MAKE} clean, instead of ${MAKE} cleandir @@ -212,6 +212,7 @@ # cross-tools stage XMAKE= TOOLS_PREFIX=${WORLDTMP} ${BMAKE} \ + TARGET=${TARGET} TARGET_ARCH=${TARGET_ARCH} \ -DWITHOUT_FORTRAN -DWITHOUT_GDB # world stage @@ -487,9 +488,19 @@ WMAKE_TGTS+= build32 .endif -buildworld: ${WMAKE_TGTS} -.ORDER: ${WMAKE_TGTS} +buildworld: buildworld_prologue ${WMAKE_TGTS} buildworld_epilogue +.ORDER: buildworld_prologue ${WMAKE_TGTS} buildworld_epilogue + +buildworld_prologue: + @echo "--------------------------------------------------------------" + @echo ">>> World build started on `LC_ALL=C date`" + @echo "--------------------------------------------------------------" +buildworld_epilogue: + @echo + @echo "--------------------------------------------------------------" + @echo ">>> World build completed on `LC_ALL=C date`" + @echo "--------------------------------------------------------------" # # We need to have this as a target because the indirection between Makefile ==== //depot/projects/arm/src/release/doc/en_US.ISO8859-1/relnotes/common/new.sgml#11 (text+ko) ==== @@ -3,7 +3,7 @@ The &os; Project - $FreeBSD: src/release/doc/en_US.ISO8859-1/relnotes/common/new.sgml,v 1.971 2006/09/05 14:55:31 bmah Exp $ + $FreeBSD: src/release/doc/en_US.ISO8859-1/relnotes/common/new.sgml,v 1.972 2006/09/07 18:58:19 bmah Exp $ 2000 @@ -202,6 +202,16 @@ A potential buffer overflow condition in &man.sppp.4; has been corrected. For more details, see security advisory FreeBSD-SA-06:18.ppp. &merged; + + An OpenSSL bug related to validation of PKCS#1 v1.5 + signatures has been fixed. For more details, see security + advisory + FreeBSD-SA-06:19.openssl. &merged; + + A potential denial of service attack against &man.named.8; + has been fixed. For more details, see security advisory + FreeBSD-SA-06:20.named. &merged; + @@ -1580,7 +1590,7 @@ has been updated to 20051021. BIND has been updated from 9.3.1 - to 9.3.2. &merged; + to 9.3.2-P1. &merged; BSNMPD has been updated from 1.11 to 1.12. @@ -1597,7 +1607,7 @@ included in OpenBSD 3.9. &merged; GCC has been updated from 3.4.4 - to 3.4.6. + to 3.4.6. &merged; GNU Readline library has been updated from 5.0 to 5.1. ==== //depot/projects/arm/src/sys/arm/at91/at91_twi.c#22 (text+ko) ==== @@ -23,7 +23,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/arm/at91/at91_twi.c,v 1.3 2006/07/14 22:40:24 imp Exp $"); +__FBSDID("$FreeBSD: src/sys/arm/at91/at91_twi.c,v 1.4 2006/09/07 21:53:28 imp Exp $"); #include #include ==== //depot/projects/arm/src/sys/arm/at91/if_atereg.h#11 (text+ko) ==== @@ -22,7 +22,7 @@ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -/* $FreeBSD: src/sys/arm/at91/if_atereg.h,v 1.1 2006/02/04 23:32:13 imp Exp $ */ +/* $FreeBSD: src/sys/arm/at91/if_atereg.h,v 1.2 2006/09/07 21:50:01 imp Exp $ */ #ifndef ARM_AT91_IF_ATEREG_H #define ARM_AT91_IF_ATEREG_H ==== //depot/projects/arm/src/usr.bin/tip/tip/cu.c#3 (text+ko) ==== @@ -31,7 +31,7 @@ */ #include -__FBSDID("$FreeBSD: src/usr.bin/tip/tip/cu.c,v 1.6 2006/08/31 14:14:29 ru Exp $"); +__FBSDID("$FreeBSD: src/usr.bin/tip/tip/cu.c,v 1.7 2006/09/07 19:48:52 ru Exp $"); #ifndef lint #if 0 @@ -60,7 +60,26 @@ CU = DV = NOSTR; BR = DEFBR; parity = 0; /* none */ - while ((ch = getopt(argc, argv, "a:l:s:htoe0123456789")) != -1) { + + /* + * We want to accept -# as a speed. It's easiest to look through + * the arguments, replace -# with -s#, and let getopt() handle it. + */ + for (i = 1; i < argc; i++) { + if (argv[i][0] == '-' && + argv[i][1] >= '0' && argv[i][1] <= '9') { + asprintf(&cp, "-s%s", argv[i] + 1); + if (cp == NULL) { + fprintf(stderr, + "%s: cannot convert -# to -s#\n", + __progname); + exit(3); + } + argv[i] = cp; + } + } + + while ((ch = getopt(argc, argv, "a:l:s:htoe")) != -1) { switch (ch) { case 'a': CU = optarg; @@ -105,13 +124,6 @@ else parity = -1; /* even */ break; - case '0': case '1': case '2': case '3': case '4': - case '5': case '6': case '7': case '8': case '9': - if (CU) - CU[strlen(CU)-1] = ch; - if (DV) - DV[strlen(DV)-1] = ch; - break; default: cuusage(); break;