svn commit: r203623 - in user/imp/tbemd: . bin/pax bin/sh
contrib/binutils/bfd etc etc/defaults etc/rc.d games/morse
gnu/lib/libgomp gnu/usr.bin/binutils gnu/usr.bin/binutils/gdb
gnu/usr.bin/binuti...
Warner Losh
imp at FreeBSD.org
Sun Feb 7 19:04:13 UTC 2010
Author: imp
Date: Sun Feb 7 19:04:12 2010
New Revision: 203623
URL: http://svn.freebsd.org/changeset/base/203623
Log:
merge from base/head
Added:
user/imp/tbemd/etc/rc.d/rtsold
- copied unchanged from r203622, head/etc/rc.d/rtsold
user/imp/tbemd/tools/regression/bin/sh/parameters/mail1.0
- copied unchanged from r203622, head/tools/regression/bin/sh/parameters/mail1.0
user/imp/tbemd/tools/regression/bin/sh/parameters/mail2.0
- copied unchanged from r203622, head/tools/regression/bin/sh/parameters/mail2.0
user/imp/tbemd/usr.bin/tar/err.c
- copied unchanged from r203622, head/usr.bin/tar/err.c
user/imp/tbemd/usr.bin/tar/err.h
- copied unchanged from r203622, head/usr.bin/tar/err.h
user/imp/tbemd/usr.bin/tar/line_reader.c
- copied unchanged from r203622, head/usr.bin/tar/line_reader.c
user/imp/tbemd/usr.bin/tar/line_reader.h
- copied unchanged from r203622, head/usr.bin/tar/line_reader.h
user/imp/tbemd/usr.bin/tar/matching.h
- copied unchanged from r203622, head/usr.bin/tar/matching.h
user/imp/tbemd/usr.bin/tar/pathmatch.c
- copied unchanged from r203622, head/usr.bin/tar/pathmatch.c
user/imp/tbemd/usr.bin/tar/pathmatch.h
- copied unchanged from r203622, head/usr.bin/tar/pathmatch.h
Deleted:
user/imp/tbemd/gnu/usr.bin/binutils/gdb/Makefile.alpha
user/imp/tbemd/gnu/usr.bin/binutils/ld/Makefile.alpha
user/imp/tbemd/gnu/usr.bin/binutils/libbfd/Makefile.alpha
user/imp/tbemd/gnu/usr.bin/binutils/libopcodes/Makefile.alpha
user/imp/tbemd/sys/cddl/contrib/opensolaris/uts/common/sys/dkio.h
user/imp/tbemd/sys/cddl/contrib/opensolaris/uts/common/sys/dklabel.h
user/imp/tbemd/usr.bin/tar/siginfo.c
Modified:
user/imp/tbemd/Makefile.inc1
user/imp/tbemd/bin/pax/Makefile
user/imp/tbemd/bin/pax/cpio.h
user/imp/tbemd/bin/pax/tar.h
user/imp/tbemd/bin/sh/main.c
user/imp/tbemd/bin/sh/var.c
user/imp/tbemd/contrib/binutils/bfd/elf32-mips.c
user/imp/tbemd/etc/defaults/rc.conf
user/imp/tbemd/etc/network.subr
user/imp/tbemd/etc/rc.d/Makefile
user/imp/tbemd/etc/services
user/imp/tbemd/games/morse/Makefile
user/imp/tbemd/games/morse/morse.c
user/imp/tbemd/gnu/lib/libgomp/Makefile
user/imp/tbemd/gnu/usr.bin/binutils/Makefile.inc
user/imp/tbemd/gnu/usr.bin/binutils/libbfd/Makefile
user/imp/tbemd/lib/libc/gen/getutxent.3
user/imp/tbemd/lib/libc/mips/sys/ptrace.S
user/imp/tbemd/lib/libc/string/memccpy.3
user/imp/tbemd/lib/libc/string/memchr.3
user/imp/tbemd/lib/libc/string/memcmp.3
user/imp/tbemd/lib/libc/string/memset.3
user/imp/tbemd/lib/msun/amd64/fenv.c
user/imp/tbemd/lib/msun/amd64/fenv.h
user/imp/tbemd/lib/msun/i387/fenv.c
user/imp/tbemd/lib/msun/i387/fenv.h
user/imp/tbemd/release/doc/en_US.ISO8859-1/hardware/article.sgml
user/imp/tbemd/sbin/dump/itime.c
user/imp/tbemd/sbin/dump/main.c
user/imp/tbemd/sbin/geom/class/multipath/geom_multipath.c
user/imp/tbemd/sbin/ifconfig/ifcarp.c
user/imp/tbemd/sbin/iscontrol/iscontrol.h
user/imp/tbemd/sbin/iscontrol/pdu.c
user/imp/tbemd/sbin/mount_nfs/mount_nfs.c
user/imp/tbemd/sbin/newfs/newfs.c
user/imp/tbemd/sbin/sysctl/sysctl.8
user/imp/tbemd/sbin/umount/umount.c
user/imp/tbemd/share/man/man4/acpi_sony.4
user/imp/tbemd/share/man/man4/vr.4
user/imp/tbemd/share/man/man9/mtx_pool.9
user/imp/tbemd/share/misc/committers-src.dot
user/imp/tbemd/sys/boot/arm/uboot/ldscript.arm
user/imp/tbemd/sys/cam/ata/ata_all.c
user/imp/tbemd/sys/cam/ata/ata_xpt.c
user/imp/tbemd/sys/cam/cam_xpt.c
user/imp/tbemd/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/vdev_geom.c
user/imp/tbemd/sys/conf/Makefile.mips
user/imp/tbemd/sys/conf/NOTES
user/imp/tbemd/sys/conf/files
user/imp/tbemd/sys/conf/files.mips
user/imp/tbemd/sys/conf/kern.mk
user/imp/tbemd/sys/conf/kern.pre.mk
user/imp/tbemd/sys/conf/kmod.mk
user/imp/tbemd/sys/dev/acpi_support/acpi_sony.c
user/imp/tbemd/sys/dev/acpica/acpi_cpu.c
user/imp/tbemd/sys/dev/ahci/ahci.c
user/imp/tbemd/sys/dev/ata/atapi-cam.c
user/imp/tbemd/sys/dev/ata/chipsets/ata-siliconimage.c
user/imp/tbemd/sys/dev/ciss/ciss.c
user/imp/tbemd/sys/dev/fb/vesa.c
user/imp/tbemd/sys/dev/isp/isp.c
user/imp/tbemd/sys/dev/isp/isp_freebsd.c
user/imp/tbemd/sys/dev/isp/isp_library.c
user/imp/tbemd/sys/dev/isp/isp_library.h
user/imp/tbemd/sys/dev/isp/isp_pci.c
user/imp/tbemd/sys/dev/isp/isp_sbus.c
user/imp/tbemd/sys/dev/isp/ispmbox.h
user/imp/tbemd/sys/dev/isp/ispvar.h
user/imp/tbemd/sys/dev/mpt/mpt_cam.c
user/imp/tbemd/sys/dev/mpt/mpt_raid.c
user/imp/tbemd/sys/dev/pci/pci.c
user/imp/tbemd/sys/dev/pci/pcivar.h
user/imp/tbemd/sys/dev/siis/siis.c
user/imp/tbemd/sys/dev/usb/serial/u3g.c
user/imp/tbemd/sys/dev/usb/usbdevs
user/imp/tbemd/sys/geom/geom_redboot.c
user/imp/tbemd/sys/geom/virstor/g_virstor.c
user/imp/tbemd/sys/ia64/ia64/trap.c
user/imp/tbemd/sys/kern/kern_shutdown.c
user/imp/tbemd/sys/kern/kern_sysctl.c
user/imp/tbemd/sys/kern/kern_umtx.c
user/imp/tbemd/sys/kern/subr_bus.c
user/imp/tbemd/sys/kern/tty_inq.c
user/imp/tbemd/sys/kern/tty_outq.c
user/imp/tbemd/sys/kern/vfs_lookup.c
user/imp/tbemd/sys/mips/conf/SWARM
user/imp/tbemd/sys/mips/include/proc.h
user/imp/tbemd/sys/mips/mips/exception.S
user/imp/tbemd/sys/mips/mips/swtch.S
user/imp/tbemd/sys/mips/mips/trap.c
user/imp/tbemd/sys/mips/sibyte/sb_asm.S
user/imp/tbemd/sys/mips/sibyte/sb_machdep.c
user/imp/tbemd/sys/mips/sibyte/sb_scd.c
user/imp/tbemd/sys/mips/sibyte/sb_scd.h
user/imp/tbemd/sys/mips/sibyte/sb_zbbus.c
user/imp/tbemd/sys/mips/sibyte/sb_zbpci.c
user/imp/tbemd/sys/net/if_lagg.c
user/imp/tbemd/sys/net/if_lagg.h
user/imp/tbemd/sys/net/vnet.c
user/imp/tbemd/sys/net/vnet.h
user/imp/tbemd/sys/net80211/ieee80211_adhoc.c
user/imp/tbemd/sys/net80211/ieee80211_hostap.c
user/imp/tbemd/sys/net80211/ieee80211_mesh.c
user/imp/tbemd/sys/net80211/ieee80211_sta.c
user/imp/tbemd/sys/net80211/ieee80211_wds.c
user/imp/tbemd/sys/netinet/in.c
user/imp/tbemd/sys/netinet/sctp_input.c
user/imp/tbemd/sys/sys/ata.h
user/imp/tbemd/sys/vm/default_pager.c
user/imp/tbemd/tools/build/mk/OptionalObsoleteFiles.inc
user/imp/tbemd/usr.bin/bc/Makefile
user/imp/tbemd/usr.bin/bc/bc.y
user/imp/tbemd/usr.bin/bc/extern.h
user/imp/tbemd/usr.bin/bc/scan.l
user/imp/tbemd/usr.bin/dc/Makefile
user/imp/tbemd/usr.bin/dc/bcode.c
user/imp/tbemd/usr.bin/dc/bcode.h
user/imp/tbemd/usr.bin/dc/dc.c
user/imp/tbemd/usr.bin/dc/inout.c
user/imp/tbemd/usr.bin/dc/mem.c
user/imp/tbemd/usr.bin/dc/stack.c
user/imp/tbemd/usr.bin/gcore/extern.h
user/imp/tbemd/usr.bin/gcore/gcore.c
user/imp/tbemd/usr.bin/kdump/kdump.c
user/imp/tbemd/usr.bin/procstat/procstat.1
user/imp/tbemd/usr.bin/tar/Makefile
user/imp/tbemd/usr.bin/tar/bsdtar.c
user/imp/tbemd/usr.bin/tar/bsdtar.h
user/imp/tbemd/usr.bin/tar/bsdtar_platform.h
user/imp/tbemd/usr.bin/tar/cmdline.c
user/imp/tbemd/usr.bin/tar/config_freebsd.h
user/imp/tbemd/usr.bin/tar/getdate.c
user/imp/tbemd/usr.bin/tar/matching.c
user/imp/tbemd/usr.bin/tar/read.c
user/imp/tbemd/usr.bin/tar/subst.c
user/imp/tbemd/usr.bin/tar/util.c
user/imp/tbemd/usr.bin/tar/write.c
user/imp/tbemd/usr.bin/truss/mips-fbsd.c
user/imp/tbemd/usr.sbin/powerd/Makefile
user/imp/tbemd/usr.sbin/powerd/powerd.c
user/imp/tbemd/usr.sbin/rpcbind/rpcb_svc_com.c
Directory Properties:
user/imp/tbemd/ (props changed)
Modified: user/imp/tbemd/Makefile.inc1
==============================================================================
--- user/imp/tbemd/Makefile.inc1 Sun Feb 7 18:36:30 2010 (r203622)
+++ user/imp/tbemd/Makefile.inc1 Sun Feb 7 19:04:12 2010 (r203623)
@@ -605,7 +605,7 @@ _zoneinfo= zic tzsetup
.endif
ITOOLS= [ awk cap_mkdb cat chflags chmod chown \
- date echo egrep find grep ${_install-info} \
+ install date echo egrep find grep ${_install-info} \
ln lockf make mkdir mtree mv pwd_mkdb rm sed sh sysctl \
test true uname wc ${_zoneinfo}
Modified: user/imp/tbemd/bin/pax/Makefile
==============================================================================
--- user/imp/tbemd/bin/pax/Makefile Sun Feb 7 18:36:30 2010 (r203622)
+++ user/imp/tbemd/bin/pax/Makefile Sun Feb 7 19:04:12 2010 (r203623)
@@ -33,9 +33,4 @@ SRCS= ar_io.c ar_subs.c buf_subs.c cache
#MAN= pax.1 tar.1 cpio.1
#LINKS= ${BINDIR}/pax ${BINDIR}/tar ${BINDIR}/pax ${BINDIR}/cpio
-# This is verboten
-.if ${MACHINE_CPUARCH} == "arm"
-WARNS?= 3
-.endif
-
.include <bsd.prog.mk>
Modified: user/imp/tbemd/bin/pax/cpio.h
==============================================================================
--- user/imp/tbemd/bin/pax/cpio.h Sun Feb 7 18:36:30 2010 (r203622)
+++ user/imp/tbemd/bin/pax/cpio.h Sun Feb 7 19:04:12 2010 (r203623)
@@ -67,7 +67,7 @@ typedef struct {
char c_mtime[11]; /* modification time */
char c_namesize[6]; /* length of pathname */
char c_filesize[11]; /* length of file in bytes */
-} HD_CPIO;
+} HD_CPIO __aligned(1);
#define MAGIC 070707 /* transportable archive id */
@@ -98,7 +98,7 @@ typedef struct {
u_char h_namesize[2];
u_char h_filesize_1[2];
u_char h_filesize_2[2];
-} HD_BCPIO;
+} HD_BCPIO __aligned(1);
#ifdef _PAX_
/*
@@ -136,7 +136,7 @@ typedef struct {
char c_rmin[8]; /* special file minor # */
char c_namesize[8]; /* length of pathname */
char c_chksum[8]; /* 0 OR CRC of bytes of FILE data */
-} HD_VCPIO;
+} HD_VCPIO __aligned(1);
#define VMAGIC 070701 /* sVr4 new portable archive id */
#define VCMAGIC 070702 /* sVr4 new portable archive id CRC */
Modified: user/imp/tbemd/bin/pax/tar.h
==============================================================================
--- user/imp/tbemd/bin/pax/tar.h Sun Feb 7 18:36:30 2010 (r203622)
+++ user/imp/tbemd/bin/pax/tar.h Sun Feb 7 19:04:12 2010 (r203623)
@@ -96,7 +96,7 @@ typedef struct {
char chksum[CHK_LEN]; /* checksum */
char linkflag; /* norm, hard, or sym. */
char linkname[TNMSZ]; /* linked to name */
-} HD_TAR;
+} HD_TAR __aligned(1);
#ifdef _PAX_
/*
@@ -142,4 +142,4 @@ typedef struct {
char devmajor[8]; /* major device number */
char devminor[8]; /* minor device number */
char prefix[TPFSZ]; /* linked to name */
-} HD_USTAR;
+} HD_USTAR __aligned(1);
Modified: user/imp/tbemd/bin/sh/main.c
==============================================================================
--- user/imp/tbemd/bin/sh/main.c Sun Feb 7 18:36:30 2010 (r203622)
+++ user/imp/tbemd/bin/sh/main.c Sun Feb 7 19:04:12 2010 (r203623)
@@ -157,6 +157,8 @@ main(int argc, char *argv[])
out2fmt_flush("sh: cannot determine working directory\n");
if (getpwd() != NULL)
setvar ("PWD", getpwd(), VEXPORT);
+ if (iflag)
+ chkmail(1);
if (argv[0] && argv[0][0] == '-') {
state = 1;
read_profile("/etc/profile");
Modified: user/imp/tbemd/bin/sh/var.c
==============================================================================
--- user/imp/tbemd/bin/sh/var.c Sun Feb 7 18:36:30 2010 (r203622)
+++ user/imp/tbemd/bin/sh/var.c Sun Feb 7 19:04:12 2010 (r203623)
@@ -337,8 +337,13 @@ setvareq(char *s, int flags)
/*
* We could roll this to a function, to handle it as
* a regular variable function callback, but why bother?
+ *
+ * Note: this assumes iflag is not set to 1 initially.
+ * As part of init(), this is called before arguments
+ * are looked at.
*/
- if (vp == &vmpath || (vp == &vmail && ! mpathset()))
+ if ((vp == &vmpath || (vp == &vmail && ! mpathset())) &&
+ iflag == 1)
chkmail(1);
if ((vp->flags & VEXPORT) && localevar(s)) {
change_env(s, 1);
Modified: user/imp/tbemd/contrib/binutils/bfd/elf32-mips.c
==============================================================================
--- user/imp/tbemd/contrib/binutils/bfd/elf32-mips.c Sun Feb 7 18:36:30 2010 (r203622)
+++ user/imp/tbemd/contrib/binutils/bfd/elf32-mips.c Sun Feb 7 19:04:12 2010 (r203623)
@@ -1611,7 +1611,7 @@ static const struct ecoff_debug_swap mip
/* The SVR4 MIPS ABI says that this should be 0x10000, and Linux uses
page sizes of up to that limit, so we need to respect it. */
-#define ELF_MAXPAGESIZE 0x10000
+#define ELF_MAXPAGESIZE 0x1000
#define elf32_bed elf32_tradbed
/* Include the target file again for this target. */
Modified: user/imp/tbemd/etc/defaults/rc.conf
==============================================================================
--- user/imp/tbemd/etc/defaults/rc.conf Sun Feb 7 18:36:30 2010 (r203622)
+++ user/imp/tbemd/etc/defaults/rc.conf Sun Feb 7 19:04:12 2010 (r203623)
@@ -460,6 +460,10 @@ ipv6_default_interface="NO" # Default ou
# Now this works only for IPv6 link local
# multicast addrs.
rtsol_flags="" # Flags to IPv6 router solicitation.
+rtsold_enable="NO" # Set to YES to enable an IPv6 router
+ # solicitation daemon.
+rtsold_flags="-a" # Flags to an IPv6 router solicitation
+ # daemon.
rtadvd_enable="NO" # Set to YES to enable an IPv6 router
# advertisement daemon. If set to YES,
# this router becomes a possible candidate
Modified: user/imp/tbemd/etc/network.subr
==============================================================================
--- user/imp/tbemd/etc/network.subr Sun Feb 7 18:36:30 2010 (r203622)
+++ user/imp/tbemd/etc/network.subr Sun Feb 7 19:04:12 2010 (r203623)
@@ -882,7 +882,9 @@ ipv6_accept_rtadv_up()
{
if ipv6_autoconfif $1; then
ifconfig $1 inet6 accept_rtadv up
- rtsol ${rtsol_flags} $1
+ if ! checkyesno rtsold_enable; then
+ rtsol ${rtsol_flags} $1
+ fi
fi
}
Modified: user/imp/tbemd/etc/rc.d/Makefile
==============================================================================
--- user/imp/tbemd/etc/rc.d/Makefile Sun Feb 7 18:36:30 2010 (r203622)
+++ user/imp/tbemd/etc/rc.d/Makefile Sun Feb 7 19:04:12 2010 (r203623)
@@ -30,7 +30,7 @@ FILES= DAEMON FILESYSTEMS LOGIN NETWORKI
powerd power_profile ppp pppoed pwcheck \
quota \
random rarpd resolv rfcomm_pppd_server root \
- route6d routed routing rpcbind rtadvd rwho \
+ route6d routed routing rpcbind rtadvd rtsold rwho \
savecore sdpd securelevel sendmail \
serial sppp statd static_arp stf swap1 \
syscons sysctl syslogd \
Copied: user/imp/tbemd/etc/rc.d/rtsold (from r203622, head/etc/rc.d/rtsold)
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ user/imp/tbemd/etc/rc.d/rtsold Sun Feb 7 19:04:12 2010 (r203623, copy of r203622, head/etc/rc.d/rtsold)
@@ -0,0 +1,26 @@
+#!/bin/sh
+#
+# $FreeBSD$
+#
+
+# PROVIDE: rtsold
+# REQUIRE: netif
+# BEFORE: NETWORKING
+# KEYWORD: nojail
+
+. /etc/rc.subr
+
+name="rtsold"
+rcvar=`set_rcvar`
+command="/usr/sbin/${name}"
+pidfile="/var/run/${name}.pid"
+start_postcmd="rtsold_poststart"
+
+rtsold_poststart()
+{
+ # wait for DAD
+ sleep $(($(${SYSCTL_N} net.inet6.ip6.dad_count) + 1))
+}
+
+load_rc_config $name
+run_rc_command "$1"
Modified: user/imp/tbemd/etc/services
==============================================================================
--- user/imp/tbemd/etc/services Sun Feb 7 18:36:30 2010 (r203622)
+++ user/imp/tbemd/etc/services Sun Feb 7 19:04:12 2010 (r203623)
@@ -2340,6 +2340,8 @@ sge_execd 6445/tcp #Grid Engine Execut
sge_execd 6445/udp #Grid Engine Execution Service
xdsxdm 6558/tcp
xdsxdm 6558/udp
+sane-port 6566/tcp #Scanner Access Now Easy (SANE) Control Port
+sane-port 6566/udp #Scanner Access Now Easy (SANE) Control Port
ircd 6667/tcp #Internet Relay Chat (unoffical)
acmsoda 6969/tcp
acmsoda 6969/udp
Modified: user/imp/tbemd/games/morse/Makefile
==============================================================================
--- user/imp/tbemd/games/morse/Makefile Sun Feb 7 18:36:30 2010 (r203622)
+++ user/imp/tbemd/games/morse/Makefile Sun Feb 7 19:04:12 2010 (r203623)
@@ -4,8 +4,4 @@
PROG= morse
MAN= morse.6
-.if ${MACHINE_CPUARCH} == "i386" || ${MACHINE_CPUARCH} == "amd64"
-CFLAGS += -DSPEAKER=\"/dev/speaker\"
-.endif
-
.include <bsd.prog.mk>
Modified: user/imp/tbemd/games/morse/morse.c
==============================================================================
--- user/imp/tbemd/games/morse/morse.c Sun Feb 7 18:36:30 2010 (r203622)
+++ user/imp/tbemd/games/morse/morse.c Sun Feb 7 19:04:12 2010 (r203623)
@@ -63,6 +63,9 @@ static const char rcsid[] =
#include <termios.h>
#include <unistd.h>
+/* Always use the speaker, let the open fail if -p is selected */
+#define SPEAKER "/dev/speaker"
+
#ifdef SPEAKER
#include <dev/speaker/speaker.h>
#endif
Modified: user/imp/tbemd/gnu/lib/libgomp/Makefile
==============================================================================
--- user/imp/tbemd/gnu/lib/libgomp/Makefile Sun Feb 7 18:36:30 2010 (r203622)
+++ user/imp/tbemd/gnu/lib/libgomp/Makefile Sun Feb 7 19:04:12 2010 (r203623)
@@ -25,7 +25,7 @@ VERSION_MAP= ${SRCDIR}/libgomp.map
# Target-specific OpenMP configuration
.if ${MACHINE_CPUARCH} == arm || ${MACHINE_CPUARCH} == i386 || \
${MACHINE_ARCH} == mipsel || ${MACHINE_ARCH} == mipseb || \
- ${MACHINE_ARCH} == powerpc ||
+ ${MACHINE_ARCH} == powerpc
OMP_LOCK_ALIGN = 4
OMP_LOCK_KIND= 4
OMP_LOCK_SIZE= 4
Modified: user/imp/tbemd/gnu/usr.bin/binutils/Makefile.inc
==============================================================================
--- user/imp/tbemd/gnu/usr.bin/binutils/Makefile.inc Sun Feb 7 18:36:30 2010 (r203622)
+++ user/imp/tbemd/gnu/usr.bin/binutils/Makefile.inc Sun Feb 7 19:04:12 2010 (r203623)
@@ -1,9 +1,5 @@
# $FreeBSD$
-.if (${TARGET_ARCH} == "alpha")
-WARNS?= 2
-.else
WARNS?= 3
-.endif
.include "../Makefile.inc"
Modified: user/imp/tbemd/gnu/usr.bin/binutils/libbfd/Makefile
==============================================================================
--- user/imp/tbemd/gnu/usr.bin/binutils/libbfd/Makefile Sun Feb 7 18:36:30 2010 (r203622)
+++ user/imp/tbemd/gnu/usr.bin/binutils/libbfd/Makefile Sun Feb 7 19:04:12 2010 (r203623)
@@ -11,8 +11,7 @@ SRCS+= archive.c archive64.c archures.c
section.c srec.c stab-syms.c stabs.c syms.c targets.c tekhex.c \
targmatch.h dwarf1.c dwarf2.c config.h bfdver.h bfdio.c simple.c
WARNS?= 0
-.if (${TARGET_ARCH} == "alpha" || ${TARGET_ARCH} == "ia64" || \
- ${TARGET_ARCH} == "sparc64")
+.if (${TARGET_ARCH} == "ia64" || ${TARGET_ARCH} == "sparc64")
WARNS?= 2
.endif
CFLAGS+= -D_GNU_SOURCE
Modified: user/imp/tbemd/lib/libc/gen/getutxent.3
==============================================================================
--- user/imp/tbemd/lib/libc/gen/getutxent.3 Sun Feb 7 18:36:30 2010 (r203622)
+++ user/imp/tbemd/lib/libc/gen/getutxent.3 Sun Feb 7 19:04:12 2010 (r203623)
@@ -426,8 +426,10 @@ database files, depending on its
.Fa ut_type .
This prevents the need for special utility functions to update the other
databases, such as the
+.Fn updlastlogx
+and
.Fn updwtmpx
-function which is often available in other implementations.
+functions which are available in other implementations.
It also tries to replace
.Dv DEAD_PROCESS
entries in the active sessions database when storing
Modified: user/imp/tbemd/lib/libc/mips/sys/ptrace.S
==============================================================================
--- user/imp/tbemd/lib/libc/mips/sys/ptrace.S Sun Feb 7 18:36:30 2010 (r203622)
+++ user/imp/tbemd/lib/libc/mips/sys/ptrace.S Sun Feb 7 19:04:12 2010 (r203623)
@@ -42,14 +42,26 @@ __FBSDID("$FreeBSD$");
#endif /* LIBC_SCCS and not lint */
LEAF(ptrace)
+ .frame sp, 40, ra
+ .mask 0x80000000, -8
#ifdef __ABICALLS__
.set noreorder
.cpload t9
.set reorder
#endif
+ subu sp, sp, 40
+ sw ra, 32(sp)
+#ifdef __ABICALLS__
+ .cprestore 16
+#endif
la t9, _C_LABEL(__error) # locate address of errno
jalr t9
+#ifdef __ABICALLS__
+ lw gp, 16(sp)
+#endif
sw zero, 0(v0)
+ lw ra, 32(sp)
+ addu sp, sp, 40
li v0, SYS_ptrace
syscall
bne a3, zero, 1f
Modified: user/imp/tbemd/lib/libc/string/memccpy.3
==============================================================================
--- user/imp/tbemd/lib/libc/string/memccpy.3 Sun Feb 7 18:36:30 2010 (r203622)
+++ user/imp/tbemd/lib/libc/string/memccpy.3 Sun Feb 7 19:04:12 2010 (r203623)
@@ -50,7 +50,9 @@ to string
.Fa dst .
If the character
.Fa c
-(as converted to an unsigned char) occurs in the string
+(as converted to an
+.Vt "unsigned char" )
+occurs in the string
.Fa src ,
the copy stops and a pointer to the byte after the copy of
.Fa c
Modified: user/imp/tbemd/lib/libc/string/memchr.3
==============================================================================
--- user/imp/tbemd/lib/libc/string/memchr.3 Sun Feb 7 18:36:30 2010 (r203622)
+++ user/imp/tbemd/lib/libc/string/memchr.3 Sun Feb 7 19:04:12 2010 (r203623)
@@ -52,7 +52,8 @@ The
function
locates the first occurrence of
.Fa c
-(converted to an unsigned char)
+(converted to an
+.Vt "unsigned char" )
in string
.Fa b .
.Pp
Modified: user/imp/tbemd/lib/libc/string/memcmp.3
==============================================================================
--- user/imp/tbemd/lib/libc/string/memcmp.3 Sun Feb 7 18:36:30 2010 (r203622)
+++ user/imp/tbemd/lib/libc/string/memcmp.3 Sun Feb 7 19:04:12 2010 (r203623)
@@ -61,7 +61,9 @@ The
function
returns zero if the two strings are identical,
otherwise returns the difference between the first two differing bytes
-(treated as unsigned char values, so that
+(treated as
+.Vt "unsigned char"
+values, so that
.Sq Li \e200
is greater than
.Sq Li \&\e0 ,
Modified: user/imp/tbemd/lib/libc/string/memset.3
==============================================================================
--- user/imp/tbemd/lib/libc/string/memset.3 Sun Feb 7 18:36:30 2010 (r203622)
+++ user/imp/tbemd/lib/libc/string/memset.3 Sun Feb 7 19:04:12 2010 (r203623)
@@ -52,7 +52,9 @@ writes
.Fa len
bytes of value
.Fa c
-(converted to an unsigned char) to the string
+(converted to an
+.Vt "unsigned char" )
+to the string
.Fa b .
.Sh RETURN VALUES
The
Modified: user/imp/tbemd/lib/msun/amd64/fenv.c
==============================================================================
--- user/imp/tbemd/lib/msun/amd64/fenv.c Sun Feb 7 18:36:30 2010 (r203622)
+++ user/imp/tbemd/lib/msun/amd64/fenv.c Sun Feb 7 19:04:12 2010 (r203623)
@@ -86,7 +86,7 @@ fegetenv(fenv_t *envp)
int
feholdexcept(fenv_t *envp)
{
- int mxcsr;
+ __uint32_t mxcsr;
__stmxcsr(&mxcsr);
__fnstenv(&envp->__x87);
@@ -101,7 +101,8 @@ feholdexcept(fenv_t *envp)
int
feupdateenv(const fenv_t *envp)
{
- int mxcsr, status;
+ __uint32_t mxcsr;
+ __uint16_t status;
__fnstsw(&status);
__stmxcsr(&mxcsr);
@@ -113,7 +114,8 @@ feupdateenv(const fenv_t *envp)
int
__feenableexcept(int mask)
{
- int mxcsr, control, omask;
+ __uint32_t mxcsr, omask;
+ __uint16_t control;
mask &= FE_ALL_EXCEPT;
__fnstcw(&control);
@@ -129,7 +131,8 @@ __feenableexcept(int mask)
int
__fedisableexcept(int mask)
{
- int mxcsr, control, omask;
+ __uint32_t mxcsr, omask;
+ __uint16_t control;
mask &= FE_ALL_EXCEPT;
__fnstcw(&control);
Modified: user/imp/tbemd/lib/msun/amd64/fenv.h
==============================================================================
--- user/imp/tbemd/lib/msun/amd64/fenv.h Sun Feb 7 18:36:30 2010 (r203622)
+++ user/imp/tbemd/lib/msun/amd64/fenv.h Sun Feb 7 19:04:12 2010 (r203623)
@@ -110,7 +110,8 @@ feclearexcept(int __excepts)
static __inline int
fegetexceptflag(fexcept_t *__flagp, int __excepts)
{
- int __mxcsr, __status;
+ __uint32_t __mxcsr;
+ __uint16_t __status;
__stmxcsr(&__mxcsr);
__fnstsw(&__status);
@@ -124,7 +125,8 @@ int feraiseexcept(int __excepts);
static __inline int
fetestexcept(int __excepts)
{
- int __mxcsr, __status;
+ __uint32_t __mxcsr;
+ __uint16_t __status;
__stmxcsr(&__mxcsr);
__fnstsw(&__status);
@@ -134,7 +136,7 @@ fetestexcept(int __excepts)
static __inline int
fegetround(void)
{
- int __control;
+ __uint16_t __control;
/*
* We assume that the x87 and the SSE unit agree on the
@@ -149,7 +151,8 @@ fegetround(void)
static __inline int
fesetround(int __round)
{
- int __mxcsr, __control;
+ __uint32_t __mxcsr;
+ __uint16_t __control;
if (__round & ~_ROUND_MASK)
return (-1);
@@ -197,7 +200,7 @@ int fedisableexcept(int __mask);
static __inline int
fegetexcept(void)
{
- int __control;
+ __uint16_t __control;
/*
* We assume that the masks for the x87 and the SSE unit are
Modified: user/imp/tbemd/lib/msun/i387/fenv.c
==============================================================================
--- user/imp/tbemd/lib/msun/i387/fenv.c Sun Feb 7 18:36:30 2010 (r203622)
+++ user/imp/tbemd/lib/msun/i387/fenv.c Sun Feb 7 19:04:12 2010 (r203623)
@@ -87,7 +87,7 @@ int
fesetexceptflag(const fexcept_t *flagp, int excepts)
{
fenv_t env;
- int mxcsr;
+ __uint32_t mxcsr;
__fnstenv(&env);
env.__status &= ~excepts;
@@ -117,7 +117,7 @@ feraiseexcept(int excepts)
int
fegetenv(fenv_t *envp)
{
- int mxcsr;
+ __uint32_t mxcsr;
__fnstenv(envp);
/*
@@ -135,7 +135,7 @@ fegetenv(fenv_t *envp)
int
feholdexcept(fenv_t *envp)
{
- int mxcsr;
+ __uint32_t mxcsr;
__fnstenv(envp);
__fnclex();
@@ -152,7 +152,8 @@ feholdexcept(fenv_t *envp)
int
feupdateenv(const fenv_t *envp)
{
- int mxcsr, status;
+ __uint32_t mxcsr;
+ __uint16_t status;
__fnstsw(&status);
if (__HAS_SSE())
@@ -167,7 +168,8 @@ feupdateenv(const fenv_t *envp)
int
__feenableexcept(int mask)
{
- int mxcsr, control, omask;
+ __uint32_t mxcsr, omask;
+ __uint16_t control;
mask &= FE_ALL_EXCEPT;
__fnstcw(&control);
@@ -188,7 +190,8 @@ __feenableexcept(int mask)
int
__fedisableexcept(int mask)
{
- int mxcsr, control, omask;
+ __uint32_t mxcsr, omask;
+ __uint16_t control;
mask &= FE_ALL_EXCEPT;
__fnstcw(&control);
Modified: user/imp/tbemd/lib/msun/i387/fenv.h
==============================================================================
--- user/imp/tbemd/lib/msun/i387/fenv.h Sun Feb 7 18:36:30 2010 (r203622)
+++ user/imp/tbemd/lib/msun/i387/fenv.h Sun Feb 7 19:04:12 2010 (r203623)
@@ -114,7 +114,7 @@ static __inline int
feclearexcept(int __excepts)
{
fenv_t __env;
- int __mxcsr;
+ __uint32_t __mxcsr;
if (__excepts == FE_ALL_EXCEPT) {
__fnclex();
@@ -134,7 +134,8 @@ feclearexcept(int __excepts)
static __inline int
fegetexceptflag(fexcept_t *__flagp, int __excepts)
{
- int __mxcsr, __status;
+ __uint32_t __mxcsr;
+ __uint16_t __status;
__fnstsw(&__status);
if (__HAS_SSE())
@@ -151,7 +152,8 @@ int feraiseexcept(int __excepts);
static __inline int
fetestexcept(int __excepts)
{
- int __mxcsr, __status;
+ __uint32_t __mxcsr;
+ __uint16_t __status;
__fnstsw(&__status);
if (__HAS_SSE())
@@ -164,7 +166,7 @@ fetestexcept(int __excepts)
static __inline int
fegetround(void)
{
- int __control;
+ __uint16_t __control;
/*
* We assume that the x87 and the SSE unit agree on the
@@ -179,7 +181,8 @@ fegetround(void)
static __inline int
fesetround(int __round)
{
- int __mxcsr, __control;
+ __uint32_t __mxcsr;
+ __uint16_t __control;
if (__round & ~_ROUND_MASK)
return (-1);
@@ -206,7 +209,7 @@ static __inline int
fesetenv(const fenv_t *__envp)
{
fenv_t __env = *__envp;
- int __mxcsr;
+ __uint32_t __mxcsr;
__mxcsr = __get_mxcsr(__env);
__set_mxcsr(__env, 0xffffffff);
@@ -234,7 +237,7 @@ int fedisableexcept(int __mask);
static __inline int
fegetexcept(void)
{
- int __control;
+ __uint16_t __control;
/*
* We assume that the masks for the x87 and the SSE unit are
Modified: user/imp/tbemd/release/doc/en_US.ISO8859-1/hardware/article.sgml
==============================================================================
--- user/imp/tbemd/release/doc/en_US.ISO8859-1/hardware/article.sgml Sun Feb 7 18:36:30 2010 (r203622)
+++ user/imp/tbemd/release/doc/en_US.ISO8859-1/hardware/article.sgml Sun Feb 7 19:04:12 2010 (r203623)
@@ -316,8 +316,51 @@
<sect2 id="proc-powerpc">
<title>powerpc</title>
- <para>The information for this paragraph has yet to be
- compiled.</para>
+ <para>This section describes the systems currently known to be
+ supported by &os; on the PowerPC platform. This list is not
+ exhaustive.</para>
+
+ <para>In general, all New World architecture Apple hardware
+ is supported, as well a limited selection of non-Apple
+ machines.</para>
+
+ <para>All systems listed below are fully supported, with the
+ exception that software fan control is currently missing on
+ the Power Macintosh G5. SMP is supported on all systems with
+ more than 1 processor.</para>
+
+ <itemizedlist>
+ <listitem>
+ <para>Apple iMac</para>
+ </listitem>
+ <listitem>
+ <para>Apple Power Macintosh G3 (Blue & White)</para>
+ </listitem>
+ <listitem>
+ <para>Apple Power Macintosh G4</para>
+ </listitem>
+ <listitem>
+ <para>Apple Power Macintosh G5 (non-970MP models)</para>
+ </listitem>
+ <listitem>
+ <para>Apple iBook</para>
+ </listitem>
+ <listitem>
+ <para>Apple PowerBook G4</para>
+ </listitem>
+ <listitem>
+ <para>Apple XServe G4</para>
+ </listitem>
+ <listitem>
+ <para>Apple XServe G5</para>
+ </listitem>
+ <listitem>
+ <para>Apple Mac Mini</para>
+ </listitem>
+ <listitem>
+ <para>Embedded boards based on MPC85XX</para>
+ </listitem>
+ </itemizedlist>
</sect2>
<sect2 id="proc-sparc64">
Modified: user/imp/tbemd/sbin/dump/itime.c
==============================================================================
--- user/imp/tbemd/sbin/dump/itime.c Sun Feb 7 18:36:30 2010 (r203622)
+++ user/imp/tbemd/sbin/dump/itime.c Sun Feb 7 19:04:12 2010 (r203623)
@@ -106,8 +106,10 @@ readdumptimes(FILE *df)
for (;;) {
dtwalk = (struct dumptime *)calloc(1, sizeof (struct dumptime));
- if (getrecord(df, &(dtwalk->dt_value)) < 0)
+ if (getrecord(df, &(dtwalk->dt_value)) < 0) {
+ free(dtwalk);
break;
+ }
nddates++;
SLIST_INSERT_HEAD(&dthead, dtwalk, dt_list);
}
Modified: user/imp/tbemd/sbin/dump/main.c
==============================================================================
--- user/imp/tbemd/sbin/dump/main.c Sun Feb 7 18:36:30 2010 (r203622)
+++ user/imp/tbemd/sbin/dump/main.c Sun Feb 7 19:04:12 2010 (r203623)
@@ -767,7 +767,8 @@ obsolete(int *argcp, char **argvp[])
if (flags) {
*p = '\0';
*nargv++ = flagsp;
- }
+ } else
+ free(flagsp);
/* Copy remaining arguments. */
while ((*nargv++ = *argv++));
Modified: user/imp/tbemd/sbin/geom/class/multipath/geom_multipath.c
==============================================================================
--- user/imp/tbemd/sbin/geom/class/multipath/geom_multipath.c Sun Feb 7 18:36:30 2010 (r203622)
+++ user/imp/tbemd/sbin/geom/class/multipath/geom_multipath.c Sun Feb 7 19:04:12 2010 (r203623)
@@ -55,6 +55,10 @@ struct g_command class_commands[] = {
NULL, "[-v] name prov ..."
},
{
+ "destroy", G_FLAG_VERBOSE, NULL, G_NULL_OPTS,
+ NULL, "[-v] prov ..."
+ },
+ {
"clear", G_FLAG_VERBOSE, mp_main, G_NULL_OPTS,
NULL, "[-v] prov ..."
},
Modified: user/imp/tbemd/sbin/ifconfig/ifcarp.c
==============================================================================
--- user/imp/tbemd/sbin/ifconfig/ifcarp.c Sun Feb 7 18:36:30 2010 (r203622)
+++ user/imp/tbemd/sbin/ifconfig/ifcarp.c Sun Feb 7 19:04:12 2010 (r203623)
@@ -96,6 +96,7 @@ setcarp_passwd(const char *val, int d, i
if (ioctl(s, SIOCGVH, (caddr_t)&ifr) == -1)
err(1, "SIOCGVH");
+ memset(carpr.carpr_key, 0, sizeof(carpr.carpr_key));
/* XXX Should hash the password into the key here, perhaps? */
strlcpy(carpr.carpr_key, val, CARP_KEY_LEN);
Modified: user/imp/tbemd/sbin/iscontrol/iscontrol.h
==============================================================================
--- user/imp/tbemd/sbin/iscontrol/iscontrol.h Sun Feb 7 18:36:30 2010 (r203622)
+++ user/imp/tbemd/sbin/iscontrol/iscontrol.h Sun Feb 7 19:04:12 2010 (r203623)
@@ -144,7 +144,6 @@ int addText(pdu_t *pp, char *fmt, ...);
void freePDU(pdu_t *pp);
int xmitpdu(isess_t *sess, pdu_t *pp);
int recvpdu(isess_t *sess, pdu_t *pp);
-void pukeText(char *it, pdu_t *pp);
int lookup(token_t *tbl, char *m);
Modified: user/imp/tbemd/sbin/iscontrol/pdu.c
==============================================================================
--- user/imp/tbemd/sbin/iscontrol/pdu.c Sun Feb 7 18:36:30 2010 (r203622)
+++ user/imp/tbemd/sbin/iscontrol/pdu.c Sun Feb 7 19:04:12 2010 (r203623)
@@ -46,6 +46,8 @@ __FBSDID("$FreeBSD$");
#include "iscsi.h"
#include "iscontrol.h"
+static void pukeText(char *it, pdu_t *pp);
+
int
xmitpdu(isess_t *sess, pdu_t *pp)
{
@@ -153,7 +155,7 @@ freePDU(pdu_t *pp)
pp->ds_size = pp->ds_len = 0;
}
-void
+static void
pukeText(char *it, pdu_t *pp)
{
char *ptr;
Modified: user/imp/tbemd/sbin/mount_nfs/mount_nfs.c
==============================================================================
--- user/imp/tbemd/sbin/mount_nfs/mount_nfs.c Sun Feb 7 18:36:30 2010 (r203622)
+++ user/imp/tbemd/sbin/mount_nfs/mount_nfs.c Sun Feb 7 19:04:12 2010 (r203623)
@@ -130,20 +130,19 @@ enum tryret {
TRYRET_LOCALERR /* Local failure. */
};
-int fallback_mount(struct iovec *iov, int iovlen, int mntflags);
-int sec_name_to_num(char *sec);
-char *sec_num_to_name(int num);
-int getnfsargs(char *, struct iovec **iov, int *iovlen);
+static int fallback_mount(struct iovec *iov, int iovlen, int mntflags);
+static int sec_name_to_num(char *sec);
+static char *sec_num_to_name(int num);
+static int getnfsargs(char *, struct iovec **iov, int *iovlen);
/* void set_rpc_maxgrouplist(int); */
-struct netconfig *getnetconf_cached(const char *netid);
-const char *netidbytype(int af, int sotype);
-void usage(void) __dead2;
-int xdr_dir(XDR *, char *);
-int xdr_fh(XDR *, struct nfhret *);
-enum tryret nfs_tryproto(struct addrinfo *ai, char *hostp, char *spec,
+static struct netconfig *getnetconf_cached(const char *netid);
+static const char *netidbytype(int af, int sotype);
+static void usage(void) __dead2;
+static int xdr_dir(XDR *, char *);
+static int xdr_fh(XDR *, struct nfhret *);
+static enum tryret nfs_tryproto(struct addrinfo *ai, char *hostp, char *spec,
char **errstr, struct iovec **iov, int *iovlen);
-enum tryret returncode(enum clnt_stat stat, struct rpc_err *rpcerr);
-extern int getosreldate(void);
+static enum tryret returncode(enum clnt_stat stat, struct rpc_err *rpcerr);
int
main(int argc, char *argv[])
@@ -476,7 +475,7 @@ copyopt(struct iovec **newiov, int *newi
* passing NFS mount options to nmount() as individual
* parameters. It should be eventually be removed.
*/
-int
+static int
fallback_mount(struct iovec *iov, int iovlen, int mntflags)
{
struct nfs_args args = {
@@ -663,7 +662,7 @@ fallback_mount(struct iovec *iov, int io
return nmount(newiov, newiovlen, mntflags);
}
-int
+static int
sec_name_to_num(char *sec)
{
if (!strcmp(sec, "krb5"))
@@ -677,7 +676,7 @@ sec_name_to_num(char *sec)
return (-1);
}
-char *
+static char *
sec_num_to_name(int flavor)
{
switch (flavor) {
@@ -693,17 +692,22 @@ sec_num_to_name(int flavor)
return (NULL);
}
-int
+static int
getnfsargs(char *spec, struct iovec **iov, int *iovlen)
{
struct addrinfo hints, *ai_nfs, *ai;
enum tryret ret;
- int ecode, speclen, remoteerr;
+ int ecode, speclen, remoteerr, offset, have_bracket = 0;
char *hostp, *delimp, *errstr;
size_t len;
static char nam[MNAMELEN + 1], pname[MAXHOSTNAMELEN + 5];
- if ((delimp = strrchr(spec, ':')) != NULL) {
+ if (*spec == '[' && (delimp = strchr(spec + 1, ']')) != NULL &&
+ *(delimp + 1) == ':') {
+ hostp = spec + 1;
+ spec = delimp + 2;
+ have_bracket = 1;
+ } else if ((delimp = strrchr(spec, ':')) != NULL) {
hostp = spec;
spec = delimp + 1;
} else if ((delimp = strrchr(spec, '@')) != NULL) {
@@ -731,10 +735,15 @@ getnfsargs(char *spec, struct iovec **io
/* Make both '@' and ':' notations equal */
if (*hostp != '\0') {
len = strlen(hostp);
- memmove(nam, hostp, len);
- nam[len] = ':';
- memmove(nam + len + 1, spec, speclen);
- nam[len + speclen + 1] = '\0';
+ offset = 0;
+ if (have_bracket)
+ nam[offset++] = '[';
+ memmove(nam + offset, hostp, len);
+ if (have_bracket)
+ nam[len + offset++] = ']';
+ nam[len + offset++] = ':';
+ memmove(nam + len + offset, spec, speclen);
+ nam[len + speclen + offset] = '\0';
}
/*
@@ -839,7 +848,7 @@ getnfsargs(char *spec, struct iovec **io
* In all error cases, *errstr will be set to a statically-allocated string
* describing the error.
*/
-enum tryret
+static enum tryret
nfs_tryproto(struct addrinfo *ai, char *hostp, char *spec, char **errstr,
struct iovec **iov, int *iovlen)
{
@@ -1061,7 +1070,7 @@ tryagain:
* Catagorise a RPC return status and error into an `enum tryret'
* return code.
*/
-enum tryret
+static enum tryret
returncode(enum clnt_stat stat, struct rpc_err *rpcerr)
{
switch (stat) {
@@ -1096,7 +1105,7 @@ returncode(enum clnt_stat stat, struct r
*
* XXX there should be a library function for this.
*/
-const char *
+static const char *
netidbytype(int af, int sotype)
{
struct nc_protos *p;
@@ -1116,7 +1125,7 @@ netidbytype(int af, int sotype)
* Otherwise it behaves just like getnetconfigent(), so nc_*error()
* work on failure.
*/
-struct netconfig *
+static struct netconfig *
getnetconf_cached(const char *netid)
{
static struct nc_entry {
@@ -1144,13 +1153,13 @@ getnetconf_cached(const char *netid)
/*
* xdr routines for mount rpc's
*/
-int
+static int
xdr_dir(XDR *xdrsp, char *dirp)
{
return (xdr_string(xdrsp, &dirp, MNTPATHLEN));
}
-int
+static int
xdr_fh(XDR *xdrsp, struct nfhret *np)
{
int i;
@@ -1196,8 +1205,8 @@ xdr_fh(XDR *xdrsp, struct nfhret *np)
return (0);
}
-void
-usage()
+static void
+usage(void)
{
(void)fprintf(stderr, "%s\n%s\n%s\n%s\n",
"usage: mount_nfs [-23bcdiLlNPsTU] [-a maxreadahead] [-D deadthresh]",
Modified: user/imp/tbemd/sbin/newfs/newfs.c
==============================================================================
--- user/imp/tbemd/sbin/newfs/newfs.c Sun Feb 7 18:36:30 2010 (r203622)
+++ user/imp/tbemd/sbin/newfs/newfs.c Sun Feb 7 19:04:12 2010 (r203623)
@@ -499,13 +499,13 @@ usage()
getprogname(),
" [device-type]");
fprintf(stderr, "where fsoptions are:\n");
- fprintf(stderr, "\t-E Erase previuos disk content\n");
+ fprintf(stderr, "\t-E Erase previous disk content\n");
fprintf(stderr, "\t-J Enable journaling via gjournal\n");
fprintf(stderr, "\t-L volume label to add to superblock\n");
fprintf(stderr,
"\t-N do not create file system, just print out parameters\n");
fprintf(stderr, "\t-O file system format: 1 => UFS1, 2 => UFS2\n");
- fprintf(stderr, "\t-R regression test, supress random factors\n");
+ fprintf(stderr, "\t-R regression test, suppress random factors\n");
fprintf(stderr, "\t-S sector size\n");
fprintf(stderr, "\t-T disktype\n");
fprintf(stderr, "\t-U enable soft updates\n");
Modified: user/imp/tbemd/sbin/sysctl/sysctl.8
==============================================================================
--- user/imp/tbemd/sbin/sysctl/sysctl.8 Sun Feb 7 18:36:30 2010 (r203622)
+++ user/imp/tbemd/sbin/sysctl/sysctl.8 Sun Feb 7 19:04:12 2010 (r203623)
@@ -28,7 +28,7 @@
.\" From: @(#)sysctl.8 8.1 (Berkeley) 6/6/93
.\" $FreeBSD$
.\"
-.Dd January 31, 2010
+.Dd February 6, 2010
.Dt SYSCTL 8
.Os
.Sh NAME
@@ -36,7 +36,7 @@
.Nd get or set kernel state
.Sh SYNOPSIS
.Nm
-.Op Fl bdehNnoqx
+.Op Fl bdehiNnoqx
.Ar name Ns Op = Ns Ar value
.Ar ...
.Nm
Modified: user/imp/tbemd/sbin/umount/umount.c
==============================================================================
--- user/imp/tbemd/sbin/umount/umount.c Sun Feb 7 18:36:30 2010 (r203622)
+++ user/imp/tbemd/sbin/umount/umount.c Sun Feb 7 19:04:12 2010 (r203623)
@@ -325,14 +325,21 @@ umountfs(struct statfs *sfs)
if ((nfsdirname = strdup(sfs->f_mntfromname)) == NULL)
err(1, "strdup");
orignfsdirname = nfsdirname;
- if ((delimp = strrchr(nfsdirname, ':')) != NULL) {
- *delimp = '\0';
+ if (*nfsdirname == '[' &&
+ (delimp = strchr(nfsdirname + 1, ']')) != NULL &&
+ *(delimp + 1) == ':') {
+ hostp = nfsdirname + 1;
+ nfsdirname = delimp + 2;
+ } else if ((delimp = strrchr(nfsdirname, ':')) != NULL) {
hostp = nfsdirname;
+ nfsdirname = delimp + 1;
+ }
+ if (hostp != NULL) {
+ *delimp = '\0';
getaddrinfo(hostp, NULL, &hints, &ai);
if (ai == NULL) {
warnx("can't get net id for host");
}
- nfsdirname = delimp + 1;
}
/*
Modified: user/imp/tbemd/share/man/man4/acpi_sony.4
==============================================================================
--- user/imp/tbemd/share/man/man4/acpi_sony.4 Sun Feb 7 18:36:30 2010 (r203622)
+++ user/imp/tbemd/share/man/man4/acpi_sony.4 Sun Feb 7 19:04:12 2010 (r203623)
@@ -24,7 +24,7 @@
.\"
.\" $FreeBSD$
.\"
-.Dd September 14, 2005
+.Dd February 7, 2010
.Dt ACPI_SONY 4 i386
.Os
.Sh NAME
@@ -48,15 +48,24 @@ acpi_sony_load="YES"
The
.Nm
driver provides support for the notebook controller in Sony laptops.
+Note that not all features will work on all laptop models.
.Sh SYSCTLS
-The following sysctl is currently implemented:
+The following sysctl nodes are currently implemented:
.Bl -tag -width indent
.It Va dev.acpi_sony.0.brightness
Current brightness level of the display.
+.It Va dev.acpi_sony.0.brightness_default
+Default brightness level of the display (survives reboot).
+.It Va dev.acpi_sony.0.contrast
+Current contrast level of the display.
+.It Va dev.acpi_sony.0.bass_gain
+Enable or disable the Bass Gain feature.
.It Va dev.acpi_sony.0.cdp
Turns the CD power on or off.
.It Va dev.acpi_sony.0.azp
Turns the audio power on or off.
+.It Va dev.acpi_sony.0.lnp
+Turns the wired network interface power on or off.
.El
.Sh SEE ALSO
.Xr acpi 4 ,
Modified: user/imp/tbemd/share/man/man4/vr.4
==============================================================================
--- user/imp/tbemd/share/man/man4/vr.4 Sun Feb 7 18:36:30 2010 (r203622)
+++ user/imp/tbemd/share/man/man4/vr.4 Sun Feb 7 19:04:12 2010 (r203623)
@@ -30,7 +30,7 @@
.\"
.\" $FreeBSD$
.\"
-.Dd March 11, 2008
+.Dd February 7, 2010
.Dt VR 4
.Os
.Sh NAME
@@ -130,6 +130,8 @@ Fast Ethernet adapters including:
.It
AOpen/Acer ALN-320
.It
+D-Link DFE520-TX
+.It
D-Link DFE530-TX
.It
Hawking Technologies PN102TX
Modified: user/imp/tbemd/share/man/man9/mtx_pool.9
==============================================================================
--- user/imp/tbemd/share/man/man9/mtx_pool.9 Sun Feb 7 18:36:30 2010 (r203622)
+++ user/imp/tbemd/share/man/man9/mtx_pool.9 Sun Feb 7 19:04:12 2010 (r203623)
@@ -27,7 +27,7 @@
.\"
.\" $FreeBSD$
.\"
-.Dd March 25, 2002
+.Dd February 6, 2010
.Dt MTX_POOL 9
.Os
.Sh NAME
@@ -177,7 +177,7 @@ on each mutex in the specified pool,
deallocates the memory associated with the pool,
and assigns NULL to the pool pointer.
.Sh SEE ALSO
-.Xr locking 9
+.Xr locking 9 ,
.Xr mutex 9
*** DIFF OUTPUT TRUNCATED AT 1000 LINES ***
More information about the svn-src-user
mailing list