From owner-p4-projects@FreeBSD.ORG Wed Feb 8 00:18:35 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 5FABB16A423; Wed, 8 Feb 2006 00:18:34 +0000 (GMT) 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 3561516A420 for ; Wed, 8 Feb 2006 00:18:34 +0000 (GMT) (envelope-from soc-andrew@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id D061E43D46 for ; Wed, 8 Feb 2006 00:18:33 +0000 (GMT) (envelope-from soc-andrew@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id k180IX5Z025712 for ; Wed, 8 Feb 2006 00:18:33 GMT (envelope-from soc-andrew@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k180IXBY025709 for perforce@freebsd.org; Wed, 8 Feb 2006 00:18:33 GMT (envelope-from soc-andrew@freebsd.org) Date: Wed, 8 Feb 2006 00:18:33 GMT Message-Id: <200602080018.k180IXBY025709@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to soc-andrew@freebsd.org using -f From: soc-andrew To: Perforce Change Reviews Cc: Subject: PERFORCE change 91352 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: Wed, 08 Feb 2006 00:18:35 -0000 http://perforce.freebsd.org/chv.cgi?CH=91352 Change 91352 by soc-andrew@soc-andrew_serv on 2006/02/08 00:18:26 Catch up with HEAD Affected files ... .. //depot/projects/soc2005/bsdinstaller/src/lib/Makefile#8 integrate .. //depot/projects/soc2005/bsdinstaller/src/release/Makefile#26 integrate .. //depot/projects/soc2005/bsdinstaller/src/release/doc/en_US.ISO8859-1/hardware/common/dev.sgml#5 integrate .. //depot/projects/soc2005/bsdinstaller/src/release/doc/en_US.ISO8859-1/hardware/ia64/proc-ia64.sgml#2 integrate .. //depot/projects/soc2005/bsdinstaller/src/release/doc/en_US.ISO8859-1/relnotes/common/new.sgml#9 integrate .. //depot/projects/soc2005/bsdinstaller/src/release/doc/ja_JP.eucJP/hardware/common/dev.sgml#4 integrate .. //depot/projects/soc2005/bsdinstaller/src/release/doc/ru_RU.KOI8-R/hardware/common/dev.sgml#4 integrate .. //depot/projects/soc2005/bsdinstaller/src/release/doc/share/misc/dev.archlist.txt#8 integrate .. //depot/projects/soc2005/bsdinstaller/src/release/doc/zh_CN.GB2312/hardware/common/dev.sgml#4 integrate .. //depot/projects/soc2005/bsdinstaller/src/release/picobsd/bridge/config#2 integrate .. //depot/projects/soc2005/bsdinstaller/src/release/picobsd/bridge/crunch.conf#2 integrate .. //depot/projects/soc2005/bsdinstaller/src/release/picobsd/build/picobsd#2 integrate .. //depot/projects/soc2005/bsdinstaller/src/usr.bin/Makefile#3 integrate .. //depot/projects/soc2005/bsdinstaller/src/usr.sbin/Makefile#12 integrate Differences ... ==== //depot/projects/soc2005/bsdinstaller/src/lib/Makefile#8 (text+ko) ==== @@ -1,5 +1,5 @@ # @(#)Makefile 8.1 (Berkeley) 6/4/93 -# $FreeBSD: src/lib/Makefile,v 1.209 2005/12/29 14:40:20 dfr Exp $ +# $FreeBSD: src/lib/Makefile,v 1.211 2006/02/02 10:05:39 rwatson Exp $ # To satisfy shared library or ELF linkage when only the libraries being # built are visible: @@ -22,11 +22,11 @@ # # Otherwise, the SUBDIR list should be in alphabetical order. -SUBDIR= ${_csu} libcom_err libcrypt libkvm msun libmd libncurses \ +SUBDIR= ${_csu} libbsm libcom_err libcrypt libkvm msun libmd libncurses \ libnetgraph libradius librpcsvc libsbuf libtacplus libutil \ ${_libypclnt} libalias libarchive ${_libatm} \ libbegemot ${_libbluetooth} libbsnmp libbz2 libc ${_libc_r} \ - libcalendar libcam libcompat libdevinfo libdevstat ${_libdisk} \ + libcalendar libcam libcompat libdevinfo libdevstat libdisk \ libedit libexpat libfetch libform libftpio libgeom ${_libgpib} \ libgssapi ${_libio} libipsec \ libipx libkiconv libmagic libmemstat libmenu ${_libmilter} ${_libmp} \ @@ -69,10 +69,6 @@ _libc_r= .endif -.if ${MACHINE_ARCH} != "arm" -_libdisk= libdisk -.endif - .if ${MACHINE_ARCH} == "alpha" _libio= libio .endif ==== //depot/projects/soc2005/bsdinstaller/src/release/Makefile#26 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/release/Makefile,v 1.896 2006/01/04 18:02:56 jhb Exp $ +# $FreeBSD: src/release/Makefile,v 1.898 2006/01/30 14:24:31 kensmith Exp $ # # make release [BUILDNAME=somename] CHROOTDIR=/some/dir CVSROOT=/cvs/dir \ # [RELEASETAG=tag] @@ -228,6 +228,7 @@ MFSSIZE= 4096 MFSINODE= 8192 MFSLABEL= auto +SPLIT_MFSROOT= .elif ${TARGET_ARCH} == "powerpc" DISKLABEL= "" MFSSIZE= 4096 @@ -1032,11 +1033,11 @@ @mv ${CD_DISC1}/INSTALLATION.TXT ${CD_DISC1}/INSTALL.TXT @mv ${CD_DISC1}/INSTALLATION.HTM ${CD_DISC1}/INSTALL.HTM .endif - @echo "CD_VOLUME = 1" >> ${CD_DISC1}/cdrom.inf .if defined(SEPARATE_LIVEFS) @cp -Rp ${CD_LIVEFS}/boot ${CD_DISC1} @echo "CD_VERSION = ${BUILDNAME}" > ${CD_DISC1}/cdrom.inf .endif + @echo "CD_VOLUME = 1" >> ${CD_DISC1}/cdrom.inf @echo "Building CDROM disc2 filesystem image" @mkdir -p ${CD_DISC2} @echo "CD_VERSION = ${BUILDNAME}" > ${CD_DISC2}/cdrom.inf ==== //depot/projects/soc2005/bsdinstaller/src/release/doc/en_US.ISO8859-1/hardware/common/dev.sgml#5 (text+ko) ==== @@ -29,7 +29,7 @@ - $FreeBSD: src/release/doc/en_US.ISO8859-1/hardware/common/dev.sgml,v 1.292 2005/12/01 17:36:39 jhb Exp $ + $FreeBSD: src/release/doc/en_US.ISO8859-1/hardware/common/dev.sgml,v 1.295 2006/02/07 03:32:22 marcel Exp $ Supported Devices @@ -356,6 +356,8 @@ Miscellaneous Networks + &hwlist.ce; + &hwlist.cx; &hwlist.cp; @@ -470,14 +472,10 @@ Serial Interfaces - PC standard 8250, 16450, and 16550-based serial ports (&man.sio.4; driver) + PC standard 8250, 16450, and 16550-based serial ports (&man.sio.4; driver) - Serial ports based on the SAB82532 serial - chip, console only (&man.sab.4; driver) + &hwlist.uart; - Serial ports based on the Zilog 8530 dual uart, - console only (zs driver) - AST 4 port serial card using shared IRQ ARNET serial cards (&man.ar.4; driver) @@ -535,7 +533,7 @@ Decision Computers PCCOM 4-port serial and dual port RS232/422/485 - Diva Serial (GSP) Multiport UART (development branch only) + Diva Serial (GSP) Multiport UART Dolphin Peripherals 4025/4035/4036 @@ -660,8 +658,6 @@ Sound Devices - &hwlist.sound; - &hwlist.snd.ad1816; &hwlist.snd.als4000; @@ -748,18 +744,18 @@ USB Devices - A range of USB peripherals are supported; devices known to + A range of USB peripherals are supported; devices known to work are listed in this section. Owing to the generic nature of most USB devices, with some exceptions any device of a given class will be supported, even if not explicitly listed here. - + USB Ethernet adapters can be found in the section listing Ethernet interfaces. - + USB Bluetooth adapters can be found in Bluetooth section. @@ -771,9 +767,9 @@ USB 2.0 controllers using the EHCI interface (&man.ehci.4; driver) - Hubs + Hubs - Keyboards (&man.ukbd.4; driver) + Keyboards (&man.ukbd.4; driver) Miscellaneous @@ -799,7 +795,7 @@ &hwlist.umodem; - Mice (&man.ums.4; driver) + Mice (&man.ums.4; driver) &hwlist.ulpt; @@ -870,7 +866,7 @@ Floppy drives (&man.fdc.4; driver) - VGA-compatible video cards + VGA-compatible video cards (&man.vga.4; driver) @@ -887,13 +883,13 @@ AT-style keyboards (&man.atkbd.4; driver) - + PS/2 keyboards (&man.atkbd.4; driver) Standard keyboards - + USB keyboards (&man.ukbd.4; driver) @@ -904,14 +900,14 @@ Bus mice and compatible devices (&man.mse.4; driver) - + PS/2 mice and compatible devices, including many laptop pointing devices (&man.psm.4; driver) Serial mice and compatible devices - + USB mice (&man.ums.4; driver) ==== //depot/projects/soc2005/bsdinstaller/src/release/doc/en_US.ISO8859-1/hardware/ia64/proc-ia64.sgml#2 (text+ko) ==== @@ -1,23 +1,21 @@ Supported Processors and Motherboards - Currently supported processors are the - Itanium - and the Itanium 2. + Currently supported processors are the + + Itanium and the + + Itanium 2. Supported chipsets include: - HP zx1 (only on development branch, see the - Perforce repository) + HP zx1 - HP i2000 - - Intel 460GX @@ -26,58 +24,17 @@ Both Uniprocessor (UP) and Symmetric Multi-processor (SMP) - configurations are under active development. At this time, - SMP-enabled systems are considered less stable. The current - priorities are UP fixes to improve stability. + configurations are supported. Supported Devices Overview - This section contains additional information about what - devices may or may not be supported by &os;/&arch;. - - Except for the PC chipset embedded &man.ata.4; controllers, - most should work out of the box. Eventually, all - &arch;-compatible ATA controllers are expected to be fully - supported. Refer to the following sections for various disk - controllers and their current status. - - In general, PC standard serial ports - supported by the &man.sio.4; driver are expected to work on - Intel legacy machines, but not PA legacy machines. The reason - is that all devices on HP machines are memory-mapped and there - is no ISA device support other than the PCI - dictated VGA legacy. - - In addition to &man.sio.4; devices, the following devices - fail on non-Intel legacy machines (but should work on boxes with - an Intel legacy) because their drivers make ISA-specific - assumptions that do not hold: - - - - - - &man.sio.4; - No support for memory-mapped I/O - - - - &man.syscons.4; - Expect BIOS, VGA probes, etc. - - - - &man.pcm.4; - Probes MSS ISA ports ad nauseum - - - - &man.atkbd.4;, &man.psm.4; - Fixed ISA port locations - - - - + Most devices that can be found in or are compatible with + &arch; machines are fully supported. The notable exception + is the VGA console. The &os; support for VGA consoles is at + this time too much based on PC hardware and not all &arch; + machines have chipsets that provide sufficient PC legacy + support. As such &man.syscons.4; can not be enabled and the + use of a serial console is required. ==== //depot/projects/soc2005/bsdinstaller/src/release/doc/en_US.ISO8859-1/relnotes/common/new.sgml#9 (text+ko) ==== @@ -3,7 +3,7 @@ The &os; Project - $FreeBSD: src/release/doc/en_US.ISO8859-1/relnotes/common/new.sgml,v 1.897 2005/10/31 16:52:11 hrs Exp $ + $FreeBSD: src/release/doc/en_US.ISO8859-1/relnotes/common/new.sgml,v 1.898 2006/02/05 20:54:53 bmah Exp $ 2000 @@ -12,6 +12,7 @@ 2003 2004 2005 + 2006 The &os; Documentation Project @@ -113,7 +114,43 @@ Security Advisories - + A temporary file vulnerability in &man.texindex.1;, which + could allow a local attacker to overwrite files in the context + of a user running the &man.texindex.1; utility, has been fixed. + For more details see security advisory FreeBSD-SA-06:01.texindex. &merged + + A temporary file vulnerability in the &man.ee.1; text + editor, which could allow a local attacker to overwrite files in + the context of a user running &man.ee.1;, has been fixed. For + more details see security advisory FreeBSD-SA-06:02.ee. &merged + + Several vulnerabilities in the &man.cpio.1; utility have + been corrected. For more + details see security advisory FreeBSD-SA-06:03.cpio. &merged + + An error in &man.ipfw.4; IP fragment handling, which could + cause a crash, has been fixed. For more + details see security advisory FreeBSD-SA-06:04.ipfw. &merged + + A potential buffer overflow in the IEEE 802.11 scanning code + has been corrected. For more + details see security advisory FreeBSD-SA-06:05.80211. &merged + + Two instances in which portions of kernel memory could be + disclosed to users have been fixed. For more details see + security advisory FreeBSD-SA-06:06.kmem. &merged + + A logic bug in the IP fragment handling in &man.pf.4;, which + could cause a crash under certain circumstances, has been fixed. + For more details see security advisory FreeBSD-SA-06:07.pf. &merged + ==== //depot/projects/soc2005/bsdinstaller/src/release/doc/ja_JP.eucJP/hardware/common/dev.sgml#4 (text+ko) ==== @@ -26,13 +26,13 @@ this file to fix "missed" conversions are likely to break the build. - $FreeBSD: src/release/doc/ja_JP.eucJP/hardware/common/dev.sgml,v 1.30 2005/08/28 08:20:41 simon Exp $ + $FreeBSD: src/release/doc/ja_JP.eucJP/hardware/common/dev.sgml,v 1.31 2006/01/26 09:37:24 brd Exp $ Original revision: 1.282 --> - $FreeBSD: src/release/doc/ja_JP.eucJP/hardware/common/dev.sgml,v 1.30 2005/08/28 08:20:41 simon Exp $ + $FreeBSD: src/release/doc/ja_JP.eucJP/hardware/common/dev.sgml,v 1.31 2006/01/26 09:37:24 brd Exp $ Âбþ¥Ï¡¼¥É¥¦¥§¥¢ @@ -668,8 +668,6 @@ ¥µ¥¦¥ó¥É¥Ç¥Ð¥¤¥¹ - &hwlist.sound; - &hwlist.snd.ad1816; &hwlist.snd.als4000; ==== //depot/projects/soc2005/bsdinstaller/src/release/doc/ru_RU.KOI8-R/hardware/common/dev.sgml#4 (text+ko) ==== @@ -1,7 +1,7 @@ fail: Error <${errno}> error code <${errcode}> in <${where}>" case ${errcode} in - no_vnconfig) - echo "Error in vnconfig on /dev/${l_vndev}..." - echo "Either you are not running as root or your running kernel" - echo "does not have the ${l_vn}(4) device." - ;; - mfs_disklabel) - echo "Error while labeling ${c_fs} size ${MFS_SIZE}" - ;; - no_mount) - echo "Error while mounting ${c_fs} (/dev/${l_vndev}c) on ${c_mnt}" - ;; mtree) echo "Error while making hierarchy in ${c_mnt}" ;; crunch) echo "Error while building ${name}." ;; - floppy_disklabel) - echo "Error while doing disklabel on of floppy.img size $fd_size" - ;; missing_kernel) echo "Error: you must build PICOBSD${suffix} kernel first" ;; @@ -762,90 +695,91 @@ exit 2 } -# -# Create a zero-filled disk image with a boot sector, and vnconfig it. -# - -init_fs_image() { # filename size_in_kbytes - local imgname imgsize - - log "init_fs_image() $1 $2" - imgname=$1 ; imgsize=$2 - dd if=/dev/zero of=${imgname} count=${imgsize} bs=1k 2> /dev/null - dd if=${c_boot1} of=${imgname} conv=notrunc 2> /dev/null - - if [ "${l_vn}" = "vn" ] ; then - vnconfig -c -s labels ${l_vndev} ${imgname} || fail $? no_vnconfig - else - mdconfig -a -t vnode -u ${l_vnum} -f ${imgname} || fail $? no_vnconfig - fi -} - - fill_floppy_image() { - local blocks sectors dst + local blocks dst mfs_start mfs_end mfs_size img_size log "fill_floppy_image()" dst=${c_mnt} # where to create the image log "Preparing ${fd_size}kB floppy filesystem..." - # correct block and number of sectors according to size. - blocks=${fd_size}; sectors=18 + # correct blocks according to size. + blocks=${fd_size}; if [ "${blocks}" = "1720" ]; then - blocks=1722 ; sectors=21 + blocks=1722 elif [ "${blocks}" = "1480" ]; then - blocks=1476 ; + blocks=1476 fi - init_fs_image ${BUILDDIR}/${c_img} ${blocks} - log "Labeling floppy image" + log "patch ${c_boot2} to boot /kernel right away" b2=${BUILDDIR}/boot2 # modified boot2 - cp ${c_boot2} ${b2} + cp -f ${c_boot2} ${b2} chmod 0644 ${b2} + set `strings -at d ${b2} | grep "/boot/loader"` - echo -e "/kernel\0\0\0\0\0" | dd of=${b2} obs=$1 oseek=1 conv=notrunc + echo -e "/kernel\0\0\0\0\0" | \ + dd of=${b2} obs=$1 oseek=1 conv=notrunc 2>/dev/null chmod 0444 ${b2} - # create a disklabel ... - disklabel -Brw -b ${c_boot1} -s ${b2} ${l_vndev} auto || \ - fail $? floppy_disklabel - - # and copy partition c: into partition a: using some sed magic - disklabel ${l_vndev} | sed -e '/ c:/{p;s/c:/a:/;}' | \ - disklabel -R ${l_vndev} /dev/stdin - - log "Newfs floppy image" - newfs -i ${fd_inodes} ${l_newfs} /dev/${l_vndev}a > /dev/null - - log "Mounting floppy image" - mount /dev/${l_vndev}a ${dst} - + dst=${BUILDDIR}/image.tree + rm -rf ${dst} + mkdir -p ${dst} ( cd ${BUILDDIR} + set 0 0 # reset variables # $1 takes the offset of the MFS filesystem set `strings -at d kernel | grep "MFS Filesystem goes here"` - mfs_ofs=$(($1 + 8192)) - log "Preload kernel with file ${c_fs} at ${mfs_ofs}" - dd if=${c_fs} ibs=8192 iseek=1 of=kernel obs=${mfs_ofs} \ - oseek=1 conv=notrunc + mfs_start=$1 + set 0 0 # reset variables + set `strings -at d kernel | grep "MFS Filesystem had better"` + mfs_end=$1 + mfs_size="$((${mfs_end} - ${mfs_start}))" + set -- `ls -l ${c_fs}`; imgsize="$5" + if [ ${mfs_start} -gt 0 -a ${mfs_size} -ge ${imgsize} ] ; then + mfs_ofs=$((${mfs_start} + 8192)) + log "Preload kernel with file ${c_fs} at ${mfs_ofs}" + dd if=${c_fs} ibs=8192 iseek=1 of=kernel obs=${mfs_ofs} \ + oseek=1 conv=notrunc 2> /dev/null + else + log "not loading mfs, size ${mfs_size} img ${imgsize}" + fi log "Compress with kgzip and copy to floppy image" kgzip -o kernel.gz kernel cp -p kernel.gz ${dst}/kernel || fail $? no_space "copying kernel" - log "now transfer floppy tree if needed" + log "Now transfer floppy tree if not already in MFS image" # now transfer the floppy tree. If it is already in mfs, dont bother. if [ "${o_all_in_mfs}" != "yes" ] ; then cp -Rp floppy.tree/* ${dst} || \ fail $? no_space "copying floppy tree" fi ) - (log "Fixing permissions"; cd ${dst}; chown -R root *) - # rm -rf ${BUILDDIR}/floppy.tree || true # cleanup + (cd ${BUILDDIR} + makefs -t ffs -o bsize=4096 -o fsize=512 \ + -s ${blocks}k -f 50 ${c_img} ${dst} + # ${l_label} -f `pwd`/${c_img} + ${l_label} -w -f `pwd`/${c_img} auto # write in a label + # copy partition c: into a: with some sed magic + ${l_label} -f `pwd`/${c_img} | sed -e '/ c:/{p;s/c:/a:/;}' | \ + ${l_label} -R -f `pwd`/${c_img} /dev/stdin + ${l_label} -f `pwd`/${c_img} + ls -l ${c_img} + logverbose "after disklabel" + ) + # dump the primary and secondary boot + # XXX primary is 512 bytes + dd if=${c_boot1} of=${BUILDDIR}/${c_img} conv=notrunc 2>/dev/null + # XXX secondary starts after the 0x114 = dec 276 bytes of the label + # so we skip 276 from the source, and 276+512=788 from dst + # the old style blocks used 512 and 1024 respectively - df -ik ${dst} | colrm 70 > .build.reply - free_vnode + dd if=${b2} iseek=1 ibs=276 2> /dev/null | \ + dd of=${BUILDDIR}/${c_img} oseek=1 obs=788 conv=notrunc 2>/dev/null + logverbose "done floppy image" + # XXX (log "Fixing permissions"; cd ${dst}; chown -R root *) + rm -rf ${BUILDDIR}/floppy.tree || true # cleanup + # df -ik ${dst} | colrm 70 > .build.reply rm -rf ${dst} rm ${BUILDDIR}/kernel.gz ${BUILDDIR}/${c_fs} } ==== //depot/projects/soc2005/bsdinstaller/src/usr.bin/Makefile#3 (text+ko) ==== @@ -1,5 +1,5 @@ # From: @(#)Makefile 8.3 (Berkeley) 1/7/94 -# $FreeBSD: src/usr.bin/Makefile,v 1.285 2005/09/19 08:13:43 imura Exp $ +# $FreeBSD: src/usr.bin/Makefile,v 1.287 2006/01/05 05:58:16 grehan Exp $ # XXX MISSING: deroff diction graph learn plot # spell spline struct xsend @@ -228,8 +228,7 @@ ${_ypmatch} \ ${_ypwhich} -.if ${MACHINE_ARCH} != "arm" && \ - ${MACHINE_ARCH} != "powerpc" >>> TRUNCATED FOR MAIL (1000 lines) <<<