PERFORCE change 128638 for review
John Birrell
jb at FreeBSD.org
Sun Nov 4 14:28:51 PST 2007
http://perforce.freebsd.org/chv.cgi?CH=128638
Change 128638 by jb at jb_freebsd1 on 2007/11/04 22:28:32
IFC
Affected files ...
.. //depot/projects/dtrace/doc/fr_FR.ISO8859-1/books/handbook/Makefile#5 integrate
.. //depot/projects/dtrace/doc/fr_FR.ISO8859-1/books/handbook/virtualization/chapter.sgml#2 integrate
.. //depot/projects/dtrace/ports/MOVED#51 integrate
.. //depot/projects/dtrace/ports/Tools/portbuild/scripts/buildenv#4 integrate
.. //depot/projects/dtrace/ports/Tools/portbuild/scripts/dologs#4 integrate
.. //depot/projects/dtrace/ports/Tools/portbuild/scripts/dopackages#5 integrate
.. //depot/projects/dtrace/ports/Tools/portbuild/scripts/reportload#4 integrate
.. //depot/projects/dtrace/src/etc/namedb/named.root#4 integrate
.. //depot/projects/dtrace/src/rescue/rescue/Makefile#9 integrate
.. //depot/projects/dtrace/src/sbin/geom/Makefile#4 integrate
.. //depot/projects/dtrace/src/sbin/geom/class/part/geom_part.c#3 integrate
.. //depot/projects/dtrace/src/sbin/geom/core/geom.c#6 integrate
.. //depot/projects/dtrace/src/sbin/ifconfig/ifbridge.c#9 integrate
.. //depot/projects/dtrace/src/sbin/ifconfig/ifconfig.8#15 integrate
.. //depot/projects/dtrace/src/sbin/route/route.c#5 integrate
.. //depot/projects/dtrace/src/share/zoneinfo/asia#8 integrate
.. //depot/projects/dtrace/src/share/zoneinfo/northamerica#7 integrate
.. //depot/projects/dtrace/src/share/zoneinfo/pacificnew#1 branch
.. //depot/projects/dtrace/src/sys/amd64/amd64/pmap.c#21 integrate
.. //depot/projects/dtrace/src/sys/arm/xscale/ixp425/if_npe.c#4 integrate
.. //depot/projects/dtrace/src/sys/dev/mpt/mpt.c#20 integrate
.. //depot/projects/dtrace/src/sys/dev/safe/safe.c#8 integrate
.. //depot/projects/dtrace/src/sys/dev/sound/pci/atiixp.c#8 integrate
.. //depot/projects/dtrace/src/sys/dev/sound/pci/atiixp.h#5 integrate
.. //depot/projects/dtrace/src/sys/dev/usb/if_zyd.c#4 integrate
.. //depot/projects/dtrace/src/sys/dev/usb/if_zydfw.h#2 integrate
.. //depot/projects/dtrace/src/sys/dev/usb/usbdevs#17 integrate
.. //depot/projects/dtrace/src/sys/i386/conf/PAE#8 integrate
.. //depot/projects/dtrace/src/sys/i386/i386/pmap.c#17 integrate
.. //depot/projects/dtrace/src/sys/net/if_bridge.c#25 integrate
.. //depot/projects/dtrace/src/sys/net/if_bridgevar.h#12 integrate
.. //depot/projects/dtrace/src/sys/nfsserver/nfs.h#7 integrate
.. //depot/projects/dtrace/src/sys/nfsserver/nfs_srvsubs.c#8 integrate
.. //depot/projects/dtrace/src/tools/tools/net80211/wlanstats/main.c#3 integrate
.. //depot/projects/dtrace/src/tools/tools/net80211/wlanstats/statfoo.c#3 integrate
.. //depot/projects/dtrace/src/tools/tools/net80211/wlanstats/wlanstats.c#6 integrate
.. //depot/projects/dtrace/src/usr.sbin/bluetooth/sdpcontrol/search.c#4 integrate
.. //depot/projects/dtrace/src/usr.sbin/faithd/faithd.c#4 integrate
.. //depot/projects/dtrace/src/usr.sbin/faithd/tcp.c#4 integrate
.. //depot/projects/dtrace/src/usr.sbin/pkg_install/Makefile#4 integrate
.. //depot/projects/dtrace/src/usr.sbin/pkg_install/updating/Makefile#1 branch
.. //depot/projects/dtrace/src/usr.sbin/pkg_install/updating/main.c#1 branch
.. //depot/projects/dtrace/src/usr.sbin/pkg_install/updating/pathnames.h#1 branch
.. //depot/projects/dtrace/src/usr.sbin/pkg_install/updating/pkg_updating.1#1 branch
.. //depot/projects/dtrace/www/en/gnome/docs/gnome2_porting.sgml#7 integrate
.. //depot/projects/dtrace/www/en/gnome/news.xml#18 integrate
.. //depot/projects/dtrace/www/share/sgml/news.xml#26 integrate
.. //depot/projects/dtrace/www/share/sgml/release.ent#12 integrate
Differences ...
==== //depot/projects/dtrace/doc/fr_FR.ISO8859-1/books/handbook/Makefile#5 (text+ko) ====
@@ -1,8 +1,8 @@
# The FreeBSD Documentation Project
# The FreeBSD French Documentation Project
#
-# $FreeBSD: doc/fr_FR.ISO8859-1/books/handbook/Makefile,v 1.32 2007/07/15 12:05:58 blackend Exp $
-# Original revision: 1.106 manque 1.91
+# $FreeBSD: doc/fr_FR.ISO8859-1/books/handbook/Makefile,v 1.33 2007/11/04 18:57:25 blackend Exp $
+# Original revision: 1.108 manque 1.91
#
# Build the FreeBSD Handbook.
#
@@ -49,6 +49,7 @@
IMAGES_EN+= install/adduser1.scr
IMAGES_EN+= install/adduser2.scr
IMAGES_EN+= install/adduser3.scr
+IMAGES_EN+= install/boot-loader-menu.scr
IMAGES_EN+= install/boot-mgr.scr
IMAGES_EN+= install/config-country.scr
IMAGES_EN+= install/console-saver1.scr
@@ -145,6 +146,19 @@
IMAGES_EN+= virtualization/parallels-freebsd11.png
IMAGES_EN+= virtualization/parallels-freebsd12.png
IMAGES_EN+= virtualization/parallels-freebsd13.png
+IMAGES_EN+= virtualization/virtualpc-freebsd1.png
+IMAGES_EN+= virtualization/virtualpc-freebsd2.png
+IMAGES_EN+= virtualization/virtualpc-freebsd3.png
+IMAGES_EN+= virtualization/virtualpc-freebsd4.png
+IMAGES_EN+= virtualization/virtualpc-freebsd5.png
+IMAGES_EN+= virtualization/virtualpc-freebsd6.png
+IMAGES_EN+= virtualization/virtualpc-freebsd7.png
+IMAGES_EN+= virtualization/virtualpc-freebsd8.png
+IMAGES_EN+= virtualization/virtualpc-freebsd9.png
+IMAGES_EN+= virtualization/virtualpc-freebsd10.png
+IMAGES_EN+= virtualization/virtualpc-freebsd11.png
+IMAGES_EN+= virtualization/virtualpc-freebsd12.png
+IMAGES_EN+= virtualization/virtualpc-freebsd13.png
# Images from the cross-document image library
IMAGES_LIB= callouts/1.png
==== //depot/projects/dtrace/doc/fr_FR.ISO8859-1/books/handbook/virtualization/chapter.sgml#2 (text+ko) ====
@@ -2,8 +2,8 @@
The FreeBSD Documentation Project
The FreeBSD French Documentation Project
- $FreeBSD: doc/fr_FR.ISO8859-1/books/handbook/virtualization/chapter.sgml,v 1.2 2007/04/30 18:15:45 blackend Exp $
- Original revision: 1.10
+ $FreeBSD: doc/fr_FR.ISO8859-1/books/handbook/virtualization/chapter.sgml,v 1.3 2007/11/04 19:01:46 blackend Exp $
+ Original revision: 1.13
-->
<chapter id="virtualization">
@@ -43,13 +43,18 @@
</listitem>
<listitem>
+ <para>Comment installer &os; sur un ordinateur &apple;
+ &macintosh; à base &intel;.</para>
+ </listitem>
+
+ <listitem>
<para>Comment installer &os; sur &linux; avec
<application>&xen;</application>.</para>
</listitem>
<listitem>
- <para>Comment installer &os; sur un ordinateur &apple;
- &macintosh; à base &intel;.</para>
+ <para>Comment installer &os; sur µsoft.windows; avec
+ <application>Virtual PC</application>.</para>
</listitem>
<listitem>
@@ -240,10 +245,10 @@
<para>Après avoir installé avec succès
&os; sur &macos; X avec
- <application>Parallels</application>, il y a un certain
- nombre d'opérations de configuration à
- effectuer pour optimiser le système pour une
- utilisation en tant que système virtuel.</para>
+ <application>Parallels</application>,
+ il reste plusieurs points à
+ configurer pour optimiser le système
+ virtuel.</para>
<procedure>
<step>
@@ -612,6 +617,231 @@
</sect3>
</sect2>
+ <sect2 id="virtualization-guest-virtualpc">
+ <title>Virtual PC sur &windows;</title>
+
+ <para><application>Virtual PC</application> pour &windows; est
+ un logiciel µsoft; librement
+ téléchargeable. Consultez la page concernant la
+ <ulink
+ url="http://www.microsoft.com/windows/downloads/virtualpc/sysreq.mspx">configuration
+ minimale requise</ulink>. Une fois <application>Virtual
+ PC</application> installé sous µsoft.windows;,
+ l'utilisateur doit configurer une machine virtuelle puis
+ installer le système d'exploitation invité
+ désiré.</para>
+
+ <sect3 id="virtualization-guest-virtualpc-install">
+ <title>Installer &os; sous Virtual
+ PC/µsoft.windows;</title>
+
+ <para>La première étape de l'installation de
+ &os; sous µsoft.windows;/<application>Virtual
+ PC</application> est la création d'une nouvelle
+ machine virtuelle pour permettre l'installation de &os;.
+ Sélectionnez <guimenuitem>Create a virtual
+ machine</guimenuitem>:</para>
+
+ <mediaobject>
+ <imageobject>
+ <imagedata fileref="virtualization/virtualpc-freebsd1">
+ </imageobject>
+ </mediaobject>
+
+ <mediaobject>
+ <imageobject>
+ <imagedata fileref="virtualization/virtualpc-freebsd2">
+ </imageobject>
+ </mediaobject>
+
+ <para>Puis sélectionnez
+ <guimenuitem>Other</guimenuitem> pour
+ <guimenuitem>Operating system</guimenuitem>:</para>
+
+ <mediaobject>
+ <imageobject>
+ <imagedata fileref="virtualization/virtualpc-freebsd3">
+ </imageobject>
+ </mediaobject>
+
+ <para>Choisissez ensuite une quantité raisonnable
+ d'espace disque et de mémoire en fonction de vos
+ projets pour cette installation de &os;. 4Go d'espace de
+ disque et 512Mo de mémoire vive conviennent pour la
+ plupart des utilisateurs de &os; sous <application>Virtual
+ PC</application>:</para>
+
+ <mediaobject>
+ <imageobject>
+ <imagedata fileref="virtualization/virtualpc-freebsd4">
+ </imageobject>
+ </mediaobject>
+
+ <mediaobject>
+ <imageobject>
+ <imagedata fileref="virtualization/virtualpc-freebsd5">
+ </imageobject>
+ </mediaobject>
+
+ <para>Sauvegardez et poursuivez la configuration:</para>
+
+ <mediaobject>
+ <imageobject>
+ <imagedata fileref="virtualization/virtualpc-freebsd6">
+ </imageobject>
+ </mediaobject>
+
+ <para>Sélectionnez votre machine virtuelle &os;,
+ cliquez sur <guimenu>Settings</guimenu>, puis
+ précisez le type de réseau et l'interface
+ réseau:</para>
+
+ <mediaobject>
+ <imageobject>
+ <imagedata fileref="virtualization/virtualpc-freebsd7">
+ </imageobject>
+ </mediaobject>
+
+ <mediaobject>
+ <imageobject>
+ <imagedata fileref="virtualization/virtualpc-freebsd8">
+ </imageobject>
+ </mediaobject>
+
+ <para>Une fois votre machine virtuelle &os;
+ créée, vous devrez y installer &os;. La
+ meilleure manière étant d'utiliser un CDROM
+ &os; officiel ou une image ISO
+ téléchargée depuis un site FTP
+ officiel. Quand vous avez l'image ISO appropriée
+ sur votre système de fichiers &windows; ou sur un
+ CDROM dans votre lecteur de CD, double-cliquez sur votre
+ machine virtuelle &os; pour démarrer. Puis cliquez
+ sur <guimenu>CD</guimenu> et sélectionnez
+ <guimenu>Capture ISO Image...</guimenu> dans la
+ fenêtre <application>Virtual PC</application>. Une
+ fenêtre apparaîtra et vous permettra
+ d'associer le lecteur de CDROM de votre machine virtuelle
+ avec une image ISO ou votre lecteur de CDROM
+ réel.</para>
+
+ <mediaobject>
+ <imageobject>
+ <imagedata fileref="virtualization/virtualpc-freebsd9">
+ </imageobject>
+ </mediaobject>
+
+ <mediaobject>
+ <imageobject>
+ <imagedata fileref="virtualization/virtualpc-freebsd10">
+ </imageobject>
+ </mediaobject>
+
+ <para>L'association avec votre CDROM source
+ effectuée, redémarrez votre machine
+ virtuelle &os; en cliquant sur <guimenu>Action</guimenu>
+ puis sur <guimenu>Reset</guimenu>. <application>Virtual
+ PC</application> redémarrera, son BIOS
+ vérifiera tout d'abord que vous disposez d'un CDROM
+ comme le ferait n'importe quel BIOS normal.</para>
+
+ <mediaobject>
+ <imageobject>
+ <imagedata fileref="virtualization/virtualpc-freebsd11">
+ </imageobject>
+ </mediaobject>
+
+ <para>Dans ce cas, le support d'installation &os; sera
+ trouvé et une installation classique basée
+ sur <application>sysinstall</application> débutera
+ comme décrit dans le <xref linkend="install">.
+ Vous pouvez installez X11 mais ne tentez pas pour le
+ moment de le configurer.</para>
+
+ <mediaobject>
+ <imageobject>
+ <imagedata fileref="virtualization/virtualpc-freebsd12">
+ </imageobject>
+ </mediaobject>
+
+ <para>Quand vous avez achevé l'installation, pensez
+ à éjecter le CDROM ou l'image ISO. Enfin,
+ redémarrez dans votre machine virtuelle &os;
+ fraîchement installée.</para>
+
+ <mediaobject>
+ <imageobject>
+ <imagedata fileref="virtualization/virtualpc-freebsd13">
+ </imageobject>
+ </mediaobject>
+ </sect3>
+
+ <sect3 id="virtualization-guest-virtualpc-configure">
+ <title>Configuration de &os; sous
+ µsoft.windows;/Virtual PC</title>
+
+ <para>Après avoir installé avec succès
+ &os; sur µsoft.windows; avec <application>Virtual
+ PC</application>, il reste plusieurs points à
+ configurer pour optimiser le système
+ virtuel.</para>
+
+ <procedure>
+ <step>
+ <title>Paramétrer les variables du
+ chargeur</title>
+
+ <para>L'étape la plus importante est la
+ diminution du paramètre
+ <option>kern.hz</option> afin de réduire
+ l'utilisation du CPU de &os; sous l'environnement
+ <application>Virtual PC</application>. Pour cela, il
+ faut ajouter la ligne suivante au fichier
+ <filename>/boot/loader.conf</filename>:</para>
+
+ <programlisting>kern.hz=100</programlisting>
+
+ <para>Sans ce paramétrage, un système
+ d'exploitation invité &os; inactif sous
+ <application>Virtual PC</application>
+ utilisera environ 40% du CPU pour un
+ micro-ordinateur monoprocesseur. Après ce
+ changement l'utilisation du processeur sera plus
+ proche d'un petit 3%.</para>
+ </step>
+
+ <step>
+ <title>Créer un nouveau fichier de configuration
+ du noyau</title>
+
+ <para>Vous pouvez retirer tous les pilotes de
+ périphériques SCSI, FireWire, et USB.
+ <application>Virtual PC</application> fournit une
+ interface réseau virtuelle utilisant
+ le pilote &man.de.4;, aussi tous les autres pilotes
+ réseau en dehors de &man.de.4; et
+ &man.miibus.4; peuvent être supprimés du
+ noyau.</para>
+ </step>
+
+ <step>
+ <title>Configuration du réseau</title>
+
+ <para>La configuration réseau la plus simple
+ utilise DHCP pour connecter votre machine virtuelle
+ sur le même réseau local que votre
+ machine &mac; hôte. Cette configuration se fait
+ en ajoutant la ligne
+ <literal>ifconfig_de0="DHCP"</literal> au fichier
+ <filename>/etc/rc.conf</filename>. Des configurations
+ réseau plus avancées sont
+ présentées dans le <xref
+ linkend="advanced-networking">.</para>
+ </step>
+ </procedure>
+ </sect3>
+ </sect2>
+
<sect2 id="virtualization-guest-vmware">
<title>VMware sur &windows;/&mac;/&linux;</title>
==== //depot/projects/dtrace/ports/MOVED#51 (text+ko) ====
@@ -1,7 +1,7 @@
#
# MOVED - a list of (recently) moved or removed ports
#
-# $FreeBSD: ports/MOVED,v 1.1511 2007/11/01 13:01:57 beech Exp $
+# $FreeBSD: ports/MOVED,v 1.1512 2007/11/03 23:36:39 gerald Exp $
#
# Each entry consists of a single line containing the following four
# fields in the order named, separated with the pipe (`|') character:
@@ -3324,3 +3324,4 @@
print/yatex-mule||2007-10-25|Has expired: emacs19 and related ports are obsolete
devel/py-qt4-qct|devel/qct|2007-10-26|Since it's an application but not a Py/Qt library the port was renamed
net-mgmt/wispy-tools|net-mgmt/spectools|2007-10-29|project renamed
+lang/gcc40|lang/gcc42|2007-11-04|Superseded by gcc41 and later, gcc42 being the recommended update path
==== //depot/projects/dtrace/ports/Tools/portbuild/scripts/buildenv#4 (text+ko) ====
@@ -27,6 +27,12 @@
x7)
export INDEXFILE=INDEX-7
;;
+ x7-exp)
+ export INDEXFILE=INDEX-7
+ ;;
+ x8)
+ export INDEXFILE=INDEX-8
+ ;;
*)
echo "buildenv: invalid branch"
exit 1
@@ -41,7 +47,8 @@
export PKGSUFFIX=.tbz
export PKGZIPCMD=bzip2
export X_WINDOW_SYSTEM=xorg
- export XORG_UPGRADE=1
+
+ #export USA_RESIDENT=yes
# Have to use realpath because 'make index' doesn't deal with symlinks in PORTSDIR
# - kk 020311
@@ -71,8 +78,6 @@
export BATCH=1
export PACKAGE_BUILDING=1
- export USA_RESIDENT=yes
-
export FTP_PASSIVE_MODE=yes
#export FETCH_BEFORE_ARGS=-vvv
}
==== //depot/projects/dtrace/ports/Tools/portbuild/scripts/dologs#4 (text+ko) ====
@@ -9,11 +9,11 @@
scripts=${pb}/scripts
for ver in latest full; do
- for num in 5 5-exp 6 6-exp 6-exp2 7; do
+ for num in 5 5-exp 6 6-exp 6-exp2 7 7-exp 8; do
cd $home/$arch-$num-$ver && ${scripts}/processlogs ${arch}
cd ${pb}/${arch}/${num} && ${scripts}/processfail ${arch} ${num}
done
- for num in 5 5-exp 6 6-exp 6-exp2 7; do
+ for num in 5 5-exp 6 6-exp 6-exp2 7 7-exp 8; do
cd $home/$arch-$num-$ver-logs && ${scripts}/processlogs2
done
# for num in 5 6 6-exp 7; do
==== //depot/projects/dtrace/ports/Tools/portbuild/scripts/dopackages#5 (text+ko) ====
@@ -253,7 +253,7 @@
branch=$1
date=$2
-if [ "x$branch" != x5 -a "x$branch" != x5-exp -a "x$branch" != x6 -a "x$branch" != x6-exp -a "x$branch" != "x6-exp2" -a "x$branch" != x7 ]; then
+if [ "x$branch" != x5 -a "x$branch" != x5-exp -a "x$branch" != x6 -a "x$branch" != x6-exp -a "x$branch" != "x6-exp2" -a "x$branch" != x7 -a "x$branch" != x7-exp -a "x$branch" != x8 ]; then
usage
fi
==== //depot/projects/dtrace/ports/Tools/portbuild/scripts/reportload#4 (text+ko) ====
@@ -20,7 +20,7 @@
done
if [ ${error} = 0 ]; then
- num=$(echo $(ls -1d ${scratchdir}/*/chroot/*/used 2>/dev/null| wc -l))
+ num=$(echo $(ls -1d ${scratchdir}/*/*/used ${scratchdir}/*/chroot/*/used 2>/dev/null| wc -l))
else
num=ERR
fi
==== //depot/projects/dtrace/src/etc/namedb/named.root#4 (text+ko) ====
@@ -1,5 +1,5 @@
;
-; $FreeBSD: src/etc/namedb/named.root,v 1.12 2004/06/06 11:46:29 schweikh Exp $
+; $FreeBSD: src/etc/namedb/named.root,v 1.13 2007/11/02 22:37:15 dougb Exp $
;
; This file holds the information on root name servers needed to
@@ -13,8 +13,8 @@
; on server FTP.INTERNIC.NET
; -OR- RS.INTERNIC.NET
;
-; last update: Jan 29, 2004
-; related version of root zone: 2004012900
+; last update: Nov 01, 2007
+; related version of root zone: 2007110100
;
;
; formerly NS.INTERNIC.NET
@@ -75,7 +75,7 @@
; operated by ICANN
;
. 3600000 NS L.ROOT-SERVERS.NET.
-L.ROOT-SERVERS.NET. 3600000 A 198.32.64.12
+L.ROOT-SERVERS.NET. 3600000 A 199.7.83.42
;
; operated by WIDE
;
==== //depot/projects/dtrace/src/rescue/rescue/Makefile#9 (text+ko) ====
@@ -1,4 +1,4 @@
-#$FreeBSD: src/rescue/rescue/Makefile,v 1.57 2007/10/27 18:18:58 yar Exp $
+#$FreeBSD: src/rescue/rescue/Makefile,v 1.58 2007/11/04 00:44:10 marcel Exp $
# @(#)Makefile 8.1 (Berkeley) 6/2/93
NO_MAN=
@@ -110,10 +110,10 @@
# headers in addition to the standard 'paths.h' header.
#
CRUNCH_SRCDIRS+= sbin
-CRUNCH_PROGS_sbin= atacontrol badsect bsdlabel \
+CRUNCH_PROGS_sbin= atacontrol badsect \
camcontrol ccdconfig clri devfs dmesg dump \
dumpfs dumpon fsck fsck_ffs fsck_msdosfs fsdb \
- fsirand gbde ifconfig init \
+ fsirand gbde geom ifconfig init \
kldconfig kldload kldstat kldunload ldconfig \
md5 mdconfig mdmfs mknod mount mount_cd9660 \
mount_msdosfs mount_nfs mount_ntfs mount_nullfs \
@@ -147,7 +147,7 @@
CRUNCH_LIBS+= -lgeom -lbsdxml -lkiconv -lmd -lreadline -lsbuf -lufs -lz
.if ${MACHINE_ARCH} == "i386"
-CRUNCH_PROGS_sbin+= sconfig fdisk
+CRUNCH_PROGS_sbin+= bsdlabel sconfig fdisk
CRUNCH_ALIAS_bsdlabel= disklabel
#.if ${MK_NCP} != "no"
#CRUNCH_PROGS+= mount_nwfs
@@ -158,19 +158,20 @@
.endif
.if ${MACHINE} == "pc98"
+CRUNCH_PROGS_sbin+= bsdlabel
CRUNCH_SRCDIR_fdisk= $(.CURDIR)/../../sbin/fdisk_pc98
.endif
.if ${MACHINE_ARCH} == "ia64"
-CRUNCH_PROGS_sbin+= mca gpt fdisk
+CRUNCH_PROGS_sbin+= mca
.endif
.if ${MACHINE_ARCH} == "sparc64"
-CRUNCH_PROGS_sbin+= sunlabel
+CRUNCH_PROGS_sbin+= bsdlabel sunlabel
.endif
.if ${MACHINE_ARCH} == "amd64"
-CRUNCH_PROGS_sbin+= fdisk
+CRUNCH_PROGS_sbin+= bsdlabel fdisk
CRUNCH_ALIAS_bsdlabel= disklabel
.endif
@@ -184,6 +185,7 @@
CRUNCH_ALIAS_restore= rrestore
CRUNCH_ALIAS_dump= rdump
CRUNCH_ALIAS_fsck_ffs= fsck_4.2bsd fsck_ufs
+CRUNCH_ALIAS_geom= gpart
# dhclient has historically been troublesome...
CRUNCH_PROGS_sbin+= dhclient
==== //depot/projects/dtrace/src/sbin/geom/Makefile#4 (text+ko) ====
@@ -1,5 +1,23 @@
-# $FreeBSD: src/sbin/geom/Makefile,v 1.1 2004/05/20 10:09:55 pjd Exp $
+# $FreeBSD: src/sbin/geom/Makefile,v 1.2 2007/11/04 00:32:53 marcel Exp $
+
+.if defined(RESCUE)
+
+.PATH: ${.CURDIR}/class/part ${.CURDIR}/core ${.CURDIR}/misc
+
+PROG= geom
+SRCS= geom.c geom_part.c subr.c
+
+CFLAGS+=-I${.CURDIR} -I${.CURDIR}/core
+
+DPADD= ${LIBGEOM} ${LIBSBUF} ${LIBBSDXML} ${LIBUTIL}
+LDADD= -lgeom -lsbuf -lbsdxml -lutil
+
+.include <bsd.prog.mk>
+
+.else
SUBDIR= core class
.include <bsd.subdir.mk>
+
+.endif
==== //depot/projects/dtrace/src/sbin/geom/class/part/geom_part.c#3 (text+ko) ====
@@ -25,7 +25,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sbin/geom/class/part/geom_part.c,v 1.3 2007/10/21 19:38:21 marcel Exp $");
+__FBSDID("$FreeBSD: src/sbin/geom/class/part/geom_part.c,v 1.4 2007/11/04 00:32:53 marcel Exp $");
#include <stdio.h>
#include <stdint.h>
@@ -43,15 +43,21 @@
#include "core/geom.h"
#include "misc/subr.h"
-uint32_t lib_version = G_LIB_VERSION;
-uint32_t version = 0;
+#ifdef RESCUE
+#define PUBSYM(x) gpart_##x
+#else
+#define PUBSYM(x) x
+#endif
+
+uint32_t PUBSYM(lib_version) = G_LIB_VERSION;
+uint32_t PUBSYM(version) = 0;
static char optional[] = "";
static char flags[] = "C";
static void gpart_show(struct gctl_req *, unsigned);
-struct g_command class_commands[] = {
+struct g_command PUBSYM(class_commands)[] = {
{ "add", 0, NULL, {
{ 'b', "start", NULL, G_TYPE_STRING },
{ 's', "size", NULL, G_TYPE_STRING },
==== //depot/projects/dtrace/src/sbin/geom/core/geom.c#6 (text+ko) ====
@@ -25,7 +25,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sbin/geom/core/geom.c,v 1.32 2007/09/21 10:00:05 pjd Exp $");
+__FBSDID("$FreeBSD: src/sbin/geom/core/geom.c,v 1.33 2007/11/04 00:32:54 marcel Exp $");
#include <sys/param.h>
#include <sys/linker.h>
@@ -51,6 +51,10 @@
#include "misc/subr.h"
+#ifdef RESCUE
+extern uint32_t gpart_version;
+extern struct g_command gpart_class_commands[];
+#endif
static char comm[MAXPATHLEN], *class_name = NULL, *gclass_name = NULL;
static uint32_t *version = NULL;
@@ -466,6 +470,7 @@
exit(EXIT_SUCCESS);
}
+#ifndef RESCUE
static const char *
library_path(void)
{
@@ -524,6 +529,7 @@
exit(EXIT_FAILURE);
}
}
+#endif /* !RESCUE */
/*
* Class name should be all capital letters.
@@ -571,8 +577,18 @@
} else {
errx(EXIT_FAILURE, "Invalid utility name.");
}
+
+#ifndef RESCUE
+ load_library();
+#else
+ if (!strcasecmp(class_name, "part")) {
+ version = &gpart_version;
+ class_commands = gpart_class_commands;
+ } else
+ errx(EXIT_FAILURE, "Invalid class name.");
+#endif /* !RESCUE */
+
set_class_name();
- load_library();
if (*argc < 1)
usage();
}
==== //depot/projects/dtrace/src/sbin/ifconfig/ifbridge.c#9 (text+ko) ====
@@ -35,7 +35,7 @@
#ifndef lint
static const char rcsid[] =
- "$FreeBSD: src/sbin/ifconfig/ifbridge.c,v 1.11 2007/08/01 00:33:52 thompsa Exp $";
+ "$FreeBSD: src/sbin/ifconfig/ifbridge.c,v 1.12 2007/11/04 08:32:26 thompsa Exp $";
#endif /* not lint */
#include <sys/param.h>
@@ -177,12 +177,14 @@
printf("%s%s ", prefix, req->ifbr_ifsname);
printb("flags", req->ifbr_ifsflags, IFBIFBITS);
printf("\n");
-
+
+ printf("%s", pad);
+ printf("ifmaxaddr %u", req->ifbr_addrmax);
+ printf(" port %u priority %u", req->ifbr_portno,
+ req->ifbr_priority);
+ printf(" path cost %u", req->ifbr_path_cost);
+
if (req->ifbr_ifsflags & IFBIF_STP) {
- printf("%s", pad);
- printf("port %u priority %u",
- req->ifbr_portno, req->ifbr_priority);
- printf(" path cost %u", req->ifbr_path_cost);
if (req->ifbr_proto <
sizeof(stpproto) / sizeof(stpproto[0]))
printf(" proto %s", stpproto[req->ifbr_proto]);
@@ -203,8 +205,8 @@
else
printf(" <unknown state %d>",
req->ifbr_state);
- printf("\n");
}
+ printf("\n");
}
free(inbuf);
@@ -651,6 +653,25 @@
}
static void
+setbridge_ifmaxaddr(const char *ifn, const char *arg, int s,
+ const struct afswtch *afp)
+{
+ struct ifbreq req;
+ u_long val;
+
+ memset(&req, 0, sizeof(req));
+
+ if (get_val(arg, &val) < 0 || (val & ~0xffffffff) != 0)
+ errx(1, "invalid value: %s", arg);
+
+ strlcpy(req.ifbr_ifsname, ifn, sizeof(req.ifbr_ifsname));
+ req.ifbr_addrmax = val & 0xffffffff;
+
+ if (do_cmd(s, BRDGSIFAMAX, &req, sizeof(req), 1) < 0)
+ err(1, "BRDGSIFAMAX %s", arg);
+}
+
+static void
setbridge_timeout(const char *arg, int d, int s, const struct afswtch *afp)
{
struct ifbrparam param;
@@ -714,6 +735,7 @@
DEF_CMD_ARG("holdcnt", setbridge_holdcount),
DEF_CMD_ARG2("ifpriority", setbridge_ifpriority),
DEF_CMD_ARG2("ifpathcost", setbridge_ifpathcost),
+ DEF_CMD_ARG2("ifmaxaddr", setbridge_ifmaxaddr),
DEF_CMD_ARG("timeout", setbridge_timeout),
DEF_CMD_ARG("private", setbridge_private),
DEF_CMD_ARG("-private", unsetbridge_private),
==== //depot/projects/dtrace/src/sbin/ifconfig/ifconfig.8#15 (text+ko) ====
@@ -26,7 +26,7 @@
.\" SUCH DAMAGE.
.\"
.\" From: @(#)ifconfig.8 8.3 (Berkeley) 1/5/94
-.\" $FreeBSD: src/sbin/ifconfig/ifconfig.8,v 1.143 2007/11/02 05:23:22 sam Exp $
+.\" $FreeBSD: src/sbin/ifconfig/ifconfig.8,v 1.144 2007/11/04 08:32:26 thompsa Exp $
.\"
.Dd October 31, 2007
.Dt IFCONFIG 8
@@ -1623,6 +1623,11 @@
To change a previously selected path cost back to automatic, set the
cost to 0.
The minimum is 1 and the maximum is 200000000.
+.It Cm ifmaxaddr Ar interface Ar size
+Set the maximum number of hosts allowed from an interface, packets with unknown
+source addresses are dropped until an existing host cache entry expires or is
+removed.
+Set to 0 to disable.
.El
.Pp
The following parameters are specific to lagg interfaces:
==== //depot/projects/dtrace/src/sbin/route/route.c#5 (text+ko) ====
@@ -38,7 +38,7 @@
static char sccsid[] = "@(#)route.c 8.6 (Berkeley) 4/28/95";
#endif
static const char rcsid[] =
- "$FreeBSD: src/sbin/route/route.c,v 1.82 2007/10/29 00:08:24 mtm Exp $";
+ "$FreeBSD: src/sbin/route/route.c,v 1.83 2007/11/04 11:12:40 mtm Exp $";
#endif /* not lint */
#include <sys/param.h>
@@ -823,7 +823,6 @@
else
mask = 0xffffffff;
}
- addr &= mask;
}
sin->sin_addr.s_addr = htonl(addr);
sin = &so_mask.sin;
==== //depot/projects/dtrace/src/share/zoneinfo/asia#8 (text+ko) ====
@@ -1,4 +1,4 @@
-# @(#)asia 8.12
+# @(#)asia 8.13
# <pre>
# This data is by no means authoritative; if you think you know better,
@@ -1771,7 +1771,31 @@
# For lack of better info, assume the rule changed to "last Friday in March"
# this year.
Rule Syria 2007 max - Mar lastFri 0:00 1:00 S
-Rule Syria 2007 max - Oct 1 0:00 0 -
+# From Jesper Norgard (2007-10-27):
+# The sister center ICARDA of my work CIMMYT is confirming that Syria DST will
+# not take place 1.st November at 0:00 o'clock but 1.st November at 24:00 or
+# rather Midnight between Thursday and Friday. This does make more sence than
+# having it between Wednesday and Thursday (two workdays in Syria) since the
+# weekend in Syria is not Saturday and Sunday, but Friday and Saturday. So now
+# it is implemented at midnight of the last workday before weekend...
+#
+# From Steffen Thorsen (2007-10-27):
+# Jesper Norgaard Welen wrote:
+#
+# > "Winter local time in Syria will be observed at midnight of Thursday 1
+# > November 2007, and the clock will be put back 1 hour."
+#
+# I found confirmation on this in this gov.sy-article (Arabic):
+# http://wehda.alwehda.gov.sy/_print_veiw.asp?FileName=12521710520070926111247
+#
+# which using Google's translate tools says:
+# Council of Ministers also approved the commencement of work on
+# identifying the winter time as of Friday, 2/11/2007 where the 60th
+# minute delay at midnight Thursday 1/11/2007.
+#
+# From Arthur David Olson (2007-10-30):
+# My best guess for the future is first Friday in November.
+Rule Syria 2007 max - Nov Fri>=1 0:00 0 -
# Zone NAME GMTOFF RULES FORMAT [UNTIL]
Zone Asia/Damascus 2:25:12 - LMT 1920 # Dimashq
2:00 Syria EE%sT
==== //depot/projects/dtrace/src/share/zoneinfo/northamerica#7 (text+ko) ====
@@ -1,4 +1,4 @@
-# @(#)northamerica 8.18
+# @(#)northamerica 8.19
# <pre>
# also includes Central America and the Caribbean
@@ -2187,6 +2187,23 @@
# says Cuban clocks will advance at midnight on March 10.
# For lack of better information, assume Cuba will use US rules,
# except that it switches at midnight standard time as usual.
+#
+# From Steffen Thorsen (2007-10-25):
+# Carlos Alberto Fonseca Arauz informed me that Cuba will end DST one week
+# earlier - on the last Sunday of October, just like in 2006.
+#
+# He supplied these references:
+#
+# http://www.prensalatina.com.mx/article.asp?ID=%7B4CC32C1B-A9F7-42FB-8A07-8631AFC923AF%7D&language=ES
+# http://actualidad.terra.es/sociedad/articulo/cuba_llama_ahorrar_energia_cambio_1957044.htm
+#
+# From Alex Kryvenishev (2007-10-25):
+# Here is also article from Granma (Cuba):
+#
+# [Regira] el Horario Normal desde el [proximo] domingo 28 de octubre
+# http://www.granma.cubaweb.cu/2007/10/24/nacional/artic07.html
+#
+# http://www.worldtimezone.com/dst_news/dst_news_cuba03.html
# Rule NAME FROM TO TYPE IN ON AT SAVE LETTER/S
Rule Cuba 1928 only - Jun 10 0:00 1:00 D
@@ -2218,9 +2235,8 @@
Rule Cuba 1998 1999 - Mar lastSun 0:00s 1:00 D
Rule Cuba 1998 2003 - Oct lastSun 0:00s 0 S
Rule Cuba 2000 2006 - Apr Sun>=1 0:00s 1:00 D
-Rule Cuba 2006 only - Oct lastSun 0:00s 0 S
+Rule Cuba 2006 max - Oct lastSun 0:00s 0 S
Rule Cuba 2007 max - Mar Sun>=8 0:00s 1:00 D
-Rule Cuba 2007 max - Nov Sun>=1 0:00s 0 S
# Zone NAME GMTOFF RULES FORMAT [UNTIL]
Zone America/Havana -5:29:28 - LMT 1890
==== //depot/projects/dtrace/src/sys/amd64/amd64/pmap.c#21 (text+ko) ====
@@ -77,7 +77,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/amd64/amd64/pmap.c,v 1.590 2007/08/21 04:59:33 alc Exp $");
+__FBSDID("$FreeBSD: src/sys/amd64/amd64/pmap.c,v 1.591 2007/11/03 05:15:25 alc Exp $");
/*
* Manages physical address maps.
@@ -1732,7 +1732,10 @@
PV_STAT(pv_entry_allocs++);
pv_entry_count++;
if (pv_entry_count > pv_entry_high_water)
- pagedaemon_wakeup();
+ if (ratecheck(&lastprint, &printinterval))
+ printf("Approaching the limit on PV entries, consider "
+ "increasing either the vm.pmap.shpgperproc or the "
+ "vm.pmap.pv_entry_max sysctl.\n");
pc = TAILQ_FIRST(&pmap->pm_pvchunk);
if (pc != NULL) {
for (field = 0; field < _NPCM; field++) {
@@ -1767,10 +1770,6 @@
* pages. After that, if a pv chunk entry is still needed,
* destroy mappings to active pages.
*/
- if (ratecheck(&lastprint, &printinterval))
- printf("Approaching the limit on PV entries, consider "
- "increasing sysctl vm.pmap.shpgperproc or "
- "vm.pmap.pv_entry_max\n");
PV_STAT(pmap_collect_inactive++);
pmap_collect(pmap, &vm_page_queues[PQ_INACTIVE]);
m = vm_page_alloc(NULL, colour,
==== //depot/projects/dtrace/src/sys/arm/xscale/ixp425/if_npe.c#4 (text+ko) ====
@@ -23,7 +23,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/arm/xscale/ixp425/if_npe.c,v 1.6 2007/05/24 16:31:22 sam Exp $");
+__FBSDID("$FreeBSD: src/sys/arm/xscale/ixp425/if_npe.c,v 1.7 2007/11/04 21:54:52 cognet Exp $");
/*
* Intel XScale NPE Ethernet driver.
@@ -39,7 +39,6 @@
* in the Intel Access Library (IAL) and the OS-specific driver.
*
* XXX add vlan support
- * XXX NPE-C port doesn't work yet
*/
#ifdef HAVE_KERNEL_OPTION_HEADERS
#include "opt_device_polling.h"
==== //depot/projects/dtrace/src/sys/dev/mpt/mpt.c#20 (text+ko) ====
@@ -96,7 +96,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/dev/mpt/mpt.c,v 1.45 2007/10/12 06:03:43 kevlo Exp $");
+__FBSDID("$FreeBSD: src/sys/dev/mpt/mpt.c,v 1.46 2007/11/03 17:33:41 scottl Exp $");
#include <dev/mpt/mpt.h>
#include <dev/mpt/mpt_cam.h> /* XXX For static handler registration */
@@ -562,7 +562,8 @@
"Event %#x (ACK %sequired).\n",
msg->Event, msg->AckRequired? "r" : "not r");
} else if (handled == 0) {
- mpt_lprt(mpt, MPT_PRT_WARN,
+ mpt_lprt(mpt,
+ msg->AckRequired? MPT_PRT_WARN : MPT_PRT_INFO,
"Unhandled Event Notify Frame. Event %#x "
"(ACK %sequired).\n",
msg->Event, msg->AckRequired? "r" : "not r");
==== //depot/projects/dtrace/src/sys/dev/safe/safe.c#8 (text+ko) ====
@@ -26,7 +26,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/dev/safe/safe.c,v 1.18 2007/03/21 03:42:50 sam Exp $");
+__FBSDID("$FreeBSD: src/sys/dev/safe/safe.c,v 1.19 2007/11/03 19:10:14 sam Exp $");
/*
* SafeNet SafeXcel-1141 hardware crypto accelerator
@@ -307,7 +307,7 @@
goto bad4;
}
if (bus_dma_tag_create(NULL, /* parent */
- sizeof(u_int32_t), /* alignment */
+ 1, /* alignment */
SAFE_MAX_DSIZE, /* boundary */
BUS_SPACE_MAXADDR_32BIT, /* lowaddr */
BUS_SPACE_MAXADDR, /* highaddr */
==== //depot/projects/dtrace/src/sys/dev/sound/pci/atiixp.c#8 (text+ko) ====
@@ -63,7 +63,7 @@
#include <dev/sound/pci/atiixp.h>
>>> TRUNCATED FOR MAIL (1000 lines) <<<
More information about the p4-projects
mailing list