PERFORCE change 130657 for review
Kip Macy
kmacy at FreeBSD.org
Tue Dec 11 18:20:27 PST 2007
http://perforce.freebsd.org/chv.cgi?CH=130657
Change 130657 by kmacy at kmacy:storage:toehead on 2007/12/12 02:20:02
IFC 130640
Affected files ...
.. //depot/projects/toehead/Makefile#2 integrate
.. //depot/projects/toehead/contrib/amd/FREEBSD-Xlist#2 integrate
.. //depot/projects/toehead/contrib/amd/FREEBSD-upgrade#2 integrate
.. //depot/projects/toehead/contrib/gcc/fold-const.c#2 integrate
.. //depot/projects/toehead/lib/Makefile#2 integrate
.. //depot/projects/toehead/lib/libc/stdlib/rand.c#2 integrate
.. //depot/projects/toehead/lib/libthr/thread/thr_mutex.c#2 integrate
.. //depot/projects/toehead/sbin/natd/natd.8#2 integrate
.. //depot/projects/toehead/share/man/man4/nve.4#2 integrate
.. //depot/projects/toehead/share/man/man5/src.conf.5#2 integrate
.. //depot/projects/toehead/share/man/man7/build.7#2 integrate
.. //depot/projects/toehead/share/mk/bsd.own.mk#2 integrate
.. //depot/projects/toehead/sys/arm/arm/pmap.c#2 integrate
.. //depot/projects/toehead/sys/cam/scsi/scsi_da.c#2 integrate
.. //depot/projects/toehead/sys/compat/freebsd32/freebsd32_misc.c#2 integrate
.. //depot/projects/toehead/sys/dev/usb/umass.c#2 integrate
.. //depot/projects/toehead/sys/dev/usb/usbdevs#2 integrate
.. //depot/projects/toehead/sys/fs/udf/udf_vfsops.c#2 integrate
.. //depot/projects/toehead/sys/kern/kern_resource.c#2 integrate
.. //depot/projects/toehead/sys/kern/sched_4bsd.c#2 integrate
.. //depot/projects/toehead/sys/kern/sched_ule.c#2 integrate
.. //depot/projects/toehead/sys/netinet6/dest6.c#2 integrate
.. //depot/projects/toehead/sys/netinet6/frag6.c#2 integrate
.. //depot/projects/toehead/sys/netinet6/icmp6.c#2 integrate
.. //depot/projects/toehead/sys/netinet6/in6.c#2 integrate
.. //depot/projects/toehead/sys/netinet6/in6.h#2 integrate
.. //depot/projects/toehead/sys/netinet6/in6_cksum.c#2 integrate
.. //depot/projects/toehead/sys/netinet6/in6_gif.c#2 integrate
.. //depot/projects/toehead/sys/netinet6/in6_gif.h#2 integrate
.. //depot/projects/toehead/sys/netinet6/in6_ifattach.c#2 integrate
.. //depot/projects/toehead/sys/netinet6/in6_ifattach.h#2 integrate
.. //depot/projects/toehead/sys/netinet6/in6_pcb.c#2 integrate
.. //depot/projects/toehead/sys/netinet6/in6_pcb.h#2 integrate
.. //depot/projects/toehead/sys/netinet6/in6_proto.c#2 integrate
.. //depot/projects/toehead/sys/netinet6/in6_rmx.c#2 integrate
.. //depot/projects/toehead/sys/netinet6/in6_src.c#2 integrate
.. //depot/projects/toehead/sys/netinet6/in6_var.h#2 integrate
.. //depot/projects/toehead/sys/netinet6/ip6_ecn.h#2 integrate
.. //depot/projects/toehead/sys/netinet6/ip6_forward.c#2 integrate
.. //depot/projects/toehead/sys/netinet6/ip6_id.c#2 integrate
.. //depot/projects/toehead/sys/netinet6/ip6_input.c#2 integrate
.. //depot/projects/toehead/sys/netinet6/ip6_ipsec.c#2 integrate
.. //depot/projects/toehead/sys/netinet6/ip6_ipsec.h#2 integrate
.. //depot/projects/toehead/sys/netinet6/ip6_mroute.c#2 integrate
.. //depot/projects/toehead/sys/netinet6/ip6_mroute.h#2 integrate
.. //depot/projects/toehead/sys/netinet6/ip6_output.c#2 integrate
.. //depot/projects/toehead/sys/netinet6/ip6_var.h#2 integrate
.. //depot/projects/toehead/sys/netinet6/ip6protosw.h#2 integrate
.. //depot/projects/toehead/sys/netinet6/mld6.c#2 integrate
.. //depot/projects/toehead/sys/netinet6/mld6_var.h#2 integrate
.. //depot/projects/toehead/sys/netinet6/nd6.c#2 integrate
.. //depot/projects/toehead/sys/netinet6/nd6.h#2 integrate
.. //depot/projects/toehead/sys/netinet6/nd6_nbr.c#2 integrate
.. //depot/projects/toehead/sys/netinet6/nd6_rtr.c#2 integrate
.. //depot/projects/toehead/sys/netinet6/pim6.h#2 integrate
.. //depot/projects/toehead/sys/netinet6/pim6_var.h#2 integrate
.. //depot/projects/toehead/sys/netinet6/raw_ip6.c#2 integrate
.. //depot/projects/toehead/sys/netinet6/raw_ip6.h#2 integrate
.. //depot/projects/toehead/sys/netinet6/route6.c#2 integrate
.. //depot/projects/toehead/sys/netinet6/scope6.c#2 integrate
.. //depot/projects/toehead/sys/netinet6/scope6_var.h#2 integrate
.. //depot/projects/toehead/sys/netinet6/sctp6_usrreq.c#2 integrate
.. //depot/projects/toehead/sys/netinet6/sctp6_var.h#2 integrate
.. //depot/projects/toehead/sys/netinet6/tcp6_var.h#2 integrate
.. //depot/projects/toehead/sys/netinet6/udp6_usrreq.c#2 integrate
.. //depot/projects/toehead/sys/netinet6/udp6_var.h#2 integrate
.. //depot/projects/toehead/sys/vm/vm_page.c#2 integrate
.. //depot/projects/toehead/tools/build/options/WITHOUT_KERBEROS#2 integrate
.. //depot/projects/toehead/tools/build/options/WITH_GSSAPI#1 branch
.. //depot/projects/toehead/usr.bin/procstat/procstat_args.c#2 integrate
.. //depot/projects/toehead/usr.bin/procstat/procstat_bin.c#2 integrate
.. //depot/projects/toehead/usr.bin/procstat/procstat_cred.c#2 integrate
.. //depot/projects/toehead/usr.bin/procstat/procstat_files.c#2 integrate
.. //depot/projects/toehead/usr.sbin/syslogd/syslogd.c#2 integrate
Differences ...
==== //depot/projects/toehead/Makefile#2 (text+ko) ====
@@ -1,5 +1,5 @@
#
-# $FreeBSD: src/Makefile,v 1.342 2007/10/18 08:41:52 delphij Exp $
+# $FreeBSD: src/Makefile,v 1.343 2007/12/11 20:00:55 imp Exp $
#
# The user-driven targets are:
#
@@ -234,17 +234,19 @@
PATH=${PATH} ${BINMAKE} obj >/dev/null 2>&1 && \
PATH=${PATH} ${BINMAKE} >/dev/null 2>&1); \
then \
- (cd ${.CURDIR} && make make); \
+ (cd ${.CURDIR} && ${BSDMAKE} make); \
fi
#
# Upgrade make(1) to the current version using the installed
-# headers, libraries and tools.
+# headers, libraries and tools. Also, allow the location of
+# the system bsdmake-like utility to be overridden.
#
+BSDMAKE?=make
MMAKEENV= MAKEOBJDIRPREFIX=${MAKEPATH} \
DESTDIR= \
INSTALL="sh ${.CURDIR}/tools/install.sh"
-MMAKE= ${MMAKEENV} make \
+MMAKE= ${MMAKEENV} ${BSDMAKE} \
-D_UPGRADING \
-DNOMAN -DNO_MAN -DNOSHARED -DNO_SHARED \
-DNO_CPU_CFLAGS -DNO_WERROR
==== //depot/projects/toehead/contrib/amd/FREEBSD-Xlist#2 (text+ko) ====
@@ -1,7 +1,8 @@
-$FreeBSD: src/contrib/amd/FREEBSD-Xlist,v 1.5 2004/07/06 12:52:27 mbr Exp $
+$FreeBSD: src/contrib/amd/FREEBSD-Xlist,v 1.6 2007/12/11 19:15:17 obrien Exp $
*LSM.am-utils
*Makefile.*
*README.autofs
+*README.osx
*ac*.m4
*.old
*acconfig.h
@@ -15,6 +16,7 @@
*missing
*mkinstalldirs
*stamp-h.in
+*amd/test1.sh
*amd/Makefile.*
*amq/Makefile.*
*commit
@@ -38,10 +40,13 @@
*conf/fh_dref/fh_dref_sunos3.h
*conf/fh_dref/fh_dref_sunos4.h
*conf/fh_dref/fh_dref_svr4.h
+*conf/hn_dref/hn_dref_default.h,
*conf/hn_dref/hn_dref_isc3.h
*conf/hn_dref/hn_dref_linux.h
*conf/mount/mount_aix.c
+*conf/mount/mount_aix3.c
*conf/mount/mount_bsdi3.c
+*conf/mount/mount_default.c
*conf/mount/mount_freebsd3.c
*conf/mount/mount_hpux.c
*conf/mount/mount_irix5.c
@@ -54,6 +59,7 @@
*conf/mtab/mtab_aix.c
*conf/mtab/mtab_file.c
*conf/mtab/mtab_isc3.c
+*conf/mtab/mtab_linux.c
*conf/mtab/mtab_mach3.c
*conf/mtab/mtab_osf.c
*conf/mtab/mtab_svr4.c
@@ -63,6 +69,7 @@
*conf/nfs_prot/nfs_prot_aix4_2.h
*conf/nfs_prot/nfs_prot_aix4_3.h
*conf/nfs_prot/nfs_prot_aix5_1.h
+*conf/nfs_prot/nfs_prot_aix5_2.h
*conf/nfs_prot/nfs_prot_bsdi2.h
*conf/nfs_prot/nfs_prot_bsdi3.h
*conf/nfs_prot/nfs_prot_darwin.h
@@ -92,6 +99,12 @@
*conf/nfs_prot/nfs_prot_sunos5_8.h
*conf/nfs_prot/nfs_prot_svr4.h
*conf/nfs_prot/nfs_prot_ultrix.h
+*conf/autofs/autofs_linux.h
+*conf/autofs/autofs_linux.c
+*conf/autofs/autofs_solaris_v1.h
+*conf/autofs/autofs_solaris_v1.c
+*conf/autofs/autofs_solaris_v2_v3.h
+*conf/autofs/autofs_solaris_v2_v3.c
*conf/sa_dref/sa_dref_386bsd.h
*conf/sa_dref/sa_dref_aix3.h
*conf/sa_dref/sa_dref_aoi.h
@@ -103,6 +116,7 @@
*conf/trap/trap_aix3.h
*conf/trap/trap_aux.h
*conf/trap/trap_dgux.h
+*conf/trap/trap_freebsd3.h
*conf/trap/trap_hcx.h
*conf/trap/trap_hpux.h
*conf/trap/trap_hpux11.h
@@ -115,7 +129,9 @@
*conf/trap/trap_stellix.h
*conf/trap/trap_svr4.h
*conf/trap/trap_ultrix.h
+*conf/umount/umount_aix.c
*conf/umount/umount_default.c
+*conf/umount/umount_linux.c
*conf/umount/umount_osf.c
*doc/Makefile.am
*doc/Makefile.in
@@ -135,11 +151,118 @@
*fsinfo/Makefile.*
*hlfsd/Makefile.*
*libamu/Makefile.*
+*libamu/alloca.c
*libamu/clnt_sperrno.c
*libamu/memcmp.c
*libamu/strcasecmp.c
*libamu/strdup.c
*libamu/strstr.c
+*libamu/strlcat.c
+*libamu/strlcpy.c
*libamu/ualarm.c
*mk-amd-map/Makefile.*
*wire-test/Makefile.*
+*m4/GNUmakefile
+*m4/amdgrep*
+*m4/amindent*
+*m4/autopat*
+*m4/chop-aclocal.pl*
+*m4/copy-if-newbig*
+*m4/mk-aclocal*
+*m4/mkconf*
+*m4/rmtspc*
+*m4/update_build_version*
+*m4/macros/HEADER
+*m4/macros/TRAILER
+*m4/macros/c_void_p.m4
+*m4/macros/cache_check_dynamic.m4
+*m4/macros/check_amu_fs.m4
+*m4/macros/check_checkmount_style.m4
+*m4/macros/check_extern.m4
+*m4/macros/check_fhandle.m4
+*m4/macros/check_field.m4
+*m4/macros/check_fs_headers.m4
+*m4/macros/check_fs_mntent.m4
+*m4/macros/check_gnu_getopt.m4
+*m4/macros/check_hide_mount_type.m4
+*m4/macros/check_lib2.m4
+*m4/macros/check_map_funcs.m4
+*m4/macros/check_mnt2_cdfs_opt.m4
+*m4/macros/check_mnt2_gen_opt.m4
+*m4/macros/check_mnt2_nfs_opt.m4
+*m4/macros/check_mnttab_file_name.m4
+*m4/macros/check_mnttab_location.m4
+*m4/macros/check_mnttab_opt.m4
+*m4/macros/check_mnttab_style.m4
+*m4/macros/check_mnttab_type.m4
+*m4/macros/check_mount_style.m4
+*m4/macros/check_mount_trap.m4
+*m4/macros/check_mount_type.m4
+*m4/macros/check_mtype_printf_type.m4
+*m4/macros/check_mtype_type.m4
+*m4/macros/check_network_transport_type.m4
+*m4/macros/check_nfs_fh_dref.m4
+*m4/macros/check_nfs_hn_dref.m4
+*m4/macros/check_nfs_prot_headers.m4
+*m4/macros/check_nfs_sa_dref.m4
+*m4/macros/check_nfs_socket_connection.m4
+*m4/macros/check_os_libs.m4
+*m4/macros/check_restartable_signal_handler.m4
+*m4/macros/check_umount_style.m4
+*m4/macros/check_unmount_args.m4
+*m4/macros/check_unmount_call.m4
+*m4/macros/expand_cpp_hex.m4
+*m4/macros/expand_cpp_int.m4
+*m4/macros/expand_cpp_string.m4
+*m4/macros/expand_run_string.m4
+*m4/macros/extern_optarg.m4
+*m4/macros/extern_sys_errlist.m4
+*m4/macros/field_mntent_t_mnt_time_string.m4
+*m4/macros/func_bad_memcmp.m4
+*m4/macros/func_bad_yp_all.m4
+*m4/macros/header_templates.m4
+*m4/macros/host_macros.m4
+*m4/macros/linux_headers.m4
+*m4/macros/localconfig.m4
+*m4/macros/mount_headers.m4
+*m4/macros/name_package.m4
+*m4/macros/name_version.m4
+*m4/macros/opt_amu_cflags.m4
+*m4/macros/opt_cppflags.m4
+*m4/macros/opt_debug.m4
+*m4/macros/opt_ldflags.m4
+*m4/macros/opt_libs.m4
+*m4/macros/os_cflags.m4
+*m4/macros/os_cppflags.m4
+*m4/macros/os_ldflags.m4
+*m4/macros/package_bugreport.m4
+*m4/macros/package_name.m4
+*m4/macros/package_version.m4
+*m4/macros/save_state.m4
+*m4/macros/struct_field_nfs_fh.m4
+*m4/macros/struct_mntent.m4
+*m4/macros/struct_mnttab.m4
+*m4/macros/struct_nfs_args.m4
+*m4/macros/struct_nfs_fh.m4
+*m4/macros/struct_nfs_fh3.m4
+*m4/macros/struct_nfs_gfs_mount.m4
+*m4/macros/try_compile_anyfs.m4
+*m4/macros/try_compile_nfs.m4
+*m4/macros/try_compile_rpc.m4
+*m4/macros/type_auth_create_gidlist.m4
+*m4/macros/type_cachefs_args.m4
+*m4/macros/type_cdfs_args.m4
+*m4/macros/type_efs_args.m4
+*m4/macros/type_lofs_args.m4
+*m4/macros/type_mfs_args.m4
+*m4/macros/type_pcfs_args.m4
+*m4/macros/type_recvfrom_fromlen.m4
+*m4/macros/type_rfs_args.m4
+*m4/macros/type_svc_in_arg.m4
+*m4/macros/type_time_t.m4
+*m4/macros/type_tmpfs_args.m4
+*m4/macros/type_ufs_args.m4
+*m4/macros/type_xdrproc_t.m4
+*m4/macros/type_xfs_args.m4
+*m4/macros/type_yp_order_outorder.m4
+*m4/macros/with_addon.m4
==== //depot/projects/toehead/contrib/amd/FREEBSD-upgrade#2 (text+ko) ====
@@ -1,21 +1,19 @@
# ex:ts=8
-$FreeBSD: src/contrib/amd/FREEBSD-upgrade,v 1.15 2004/05/14 13:29:48 mbr Exp $
+$FreeBSD: src/contrib/amd/FREEBSD-upgrade,v 1.16 2007/12/11 19:16:51 obrien Exp $
-AMD (am-utils) 6.0.9
- originals can be found at: ftp://shekel.mcl.cs.columbia.edu/pub/am-utils/
- (http://www.cs.columbia.edu/~ezk/am-utils/index.html)
-
+AMD (am-utils) 6.1.5
+ originals can be found at: ftp://ftp.am-utils.org/pub/am-utils/
For the import of AMD many files were pruned by:
- tar -X FREEBSD-Xlist -xzf am-utils-6.0.9.tar.gz
+ tar -X FREEBSD-Xlist -xf am-utils-6.1.5.tar.gz
and `find . -name '.cvsignore' -delete`
Then imported by:
- cvs import -m 'Virgin import of AMD (am-utils) v6.0.9' \
- src/contrib/amd COLUMBIA amd_6_0_9
+ cvs import -m 'Virgin import of AMD (am-utils) v6.1.5' \
+ src/contrib/amd COLUMBIA amd_6_1_5
After the import, a separate extraction of am-utils was GNU configured in
the "normal" way. The resulting config.h file should be compared with
@@ -25,8 +23,11 @@
To make local changes to amd, simply patch and commit to the main
branch (aka HEAD). Never make local changes on the vendor (COLUMBIA) branch.
-All local changes should be submitted to "amd-dev at majordomo.cs.columbia.edu"
-for inclusion in the next vendor release.
+Note, we don't trim anything in scripts/ as sysadmins may find the bits
+as a useful reference.
+
+All local changes should be submitted to "am-utils at am-utils.org" or
+https://bugzilla.am-utils.org for inclusion in the next vendor release.
Local changes:
==== //depot/projects/toehead/contrib/gcc/fold-const.c#2 (text+ko) ====
@@ -5661,6 +5661,9 @@
}
break;
}
+ /* If the constant is negative, we cannot simplify this. */
+ if (tree_int_cst_sgn (c) == -1)
+ break;
/* FALLTHROUGH */
case NEGATE_EXPR:
if ((t1 = extract_muldiv (op0, c, code, wide_type, strict_overflow_p))
==== //depot/projects/toehead/lib/Makefile#2 (text+ko) ====
@@ -1,5 +1,5 @@
# @(#)Makefile 8.1 (Berkeley) 6/4/93
-# $FreeBSD: src/lib/Makefile,v 1.226 2007/11/17 21:29:02 cognet Exp $
+# $FreeBSD: src/lib/Makefile,v 1.227 2007/12/10 19:09:24 dougb Exp $
.include <bsd.own.mk>
@@ -31,7 +31,7 @@
libbegemot ${_libbluetooth} libbsnmp libbz2 \
libcalendar libcam libcompat libdevinfo libdevstat libdisk \
libedit libexpat libfetch libftpio libgeom ${_libgpib} \
- libgssapi libipsec \
+ ${_libgssapi} libipsec \
${_libipx} libkiconv libmagic libmemstat ${_libmilter} ${_libmp} \
${_libncp} ${_libngatm} libopie libpam libpcap \
libpmc ${_libkse} librt ${_libsdp} ${_libsm} ${_libsmb} \
@@ -62,6 +62,14 @@
_libsdp= libsdp
.endif
+.if ${MK_KERBEROS} != "no"
+_libgssapi= libgssapi
+.else
+.if ${MK_GSSAPI} == "yes"
+_libgssapi= libgssapi
+.endif
+.endif
+
.if ${MK_IPX} != "no"
_libipx= libipx
.endif
==== //depot/projects/toehead/lib/libc/stdlib/rand.c#2 (text+ko) ====
@@ -33,7 +33,7 @@
static char sccsid[] = "@(#)rand.c 8.1 (Berkeley) 6/14/93";
#endif /* LIBC_SCCS and not lint */
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/lib/libc/stdlib/rand.c,v 1.16 2007/01/09 00:28:10 imp Exp $");
+__FBSDID("$FreeBSD: src/lib/libc/stdlib/rand.c,v 1.17 2007/12/11 20:39:32 ache Exp $");
#include "namespace.h"
#include <sys/time.h> /* for sranddev() */
@@ -60,7 +60,7 @@
#else /* !USE_WEAK_SEEDING */
/*
* Compute x = (7^5 * x) mod (2^31 - 1)
- * wihout overflowing 31 bits:
+ * without overflowing 31 bits:
* (2^31 - 1) = 127773 * (7^5) + 2836
* From "Random number generators: good ones are hard to find",
* Park and Miller, Communications of the ACM, vol. 31, no. 10,
==== //depot/projects/toehead/lib/libthr/thread/thr_mutex.c#2 (text+ko) ====
@@ -30,7 +30,7 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
- * $FreeBSD: src/lib/libthr/thread/thr_mutex.c,v 1.63 2007/11/28 00:16:24 jasone Exp $
+ * $FreeBSD: src/lib/libthr/thread/thr_mutex.c,v 1.64 2007/12/11 08:00:58 davidxu Exp $
*/
#include "namespace.h"
@@ -296,13 +296,15 @@
#define ENQUEUE_MUTEX(curthread, m) \
- m->m_owner = curthread; \
+ do { \
+ (m)->m_owner = curthread; \
/* Add to the list of owned mutexes: */ \
- MUTEX_ASSERT_NOT_OWNED(m); \
- if ((m->m_lock.m_flags & UMUTEX_PRIO_PROTECT) == 0) \
- TAILQ_INSERT_TAIL(&curthread->mutexq, m, m_qe); \
+ MUTEX_ASSERT_NOT_OWNED((m)); \
+ if (((m)->m_lock.m_flags & UMUTEX_PRIO_PROTECT) == 0) \
+ TAILQ_INSERT_TAIL(&curthread->mutexq, (m), m_qe);\
else \
- TAILQ_INSERT_TAIL(&curthread->pp_mutexq, m, m_qe)
+ TAILQ_INSERT_TAIL(&curthread->pp_mutexq, (m), m_qe);\
+ } while (0)
static int
mutex_trylock_common(struct pthread *curthread, pthread_mutex_t *mutex)
==== //depot/projects/toehead/sbin/natd/natd.8#2 (text+ko) ====
@@ -1,5 +1,5 @@
-.\" $FreeBSD: src/sbin/natd/natd.8,v 1.62 2005/01/15 12:28:00 ru Exp $
-.Dd February 28, 2003
+.\" $FreeBSD: src/sbin/natd/natd.8,v 1.64 2007/12/10 12:03:23 ceri Exp $
+.Dd December 10, 2007
.Dt NATD 8
.Os
.Sh NAME
@@ -421,6 +421,26 @@
is synonymous with
.Fl log .
.Pp
+Options can be divided to several sections. Each section applies to own
+.Nm
+instance. This ability allow to configure one
+.Nm
+process for several NAT instances. The first instance that always exists is
+a "default" instance. Each another instance should begin with
+.Pp
+.Dl instance Ar instance_name
+.Pp
+At the next should be placed a configuration option. Example:
+.Pp
+.Dl \&# default instance
+.Dl port 8668
+.Dl alias_address 158.152.17.1
+.Pp
+.Dl \&# second instance
+.Dl instance dsl1
+.Dl port 8888
+.Dl alias_address 192.168.0.1
+.Pp
Trailing spaces and empty lines are ignored.
A
.Ql \&#
==== //depot/projects/toehead/share/man/man4/nve.4#2 (text+ko) ====
@@ -24,7 +24,7 @@
.\"
.\" $Id: nvnet.4,v 1.1 2003/10/09 16:48:01 q Exp $
.\"
-.\" $FreeBSD: src/share/man/man4/nve.4,v 1.10 2007/12/08 23:42:01 remko Exp $
+.\" $FreeBSD: src/share/man/man4/nve.4,v 1.11 2007/12/10 12:01:27 ceri Exp $
.\"
.Dd December 8, 2007
.Dt NVE 4
@@ -115,8 +115,8 @@
the network connection (cable).
.El
.Sh BUGS
-There are mentionings that when the card is in auto select mode,
-ifconfig output reports a 10baseT/UTP output while the leds and
+There are reports that when the card is in auto select mode,
+ifconfig output reports a 10baseT/UTP output while the LEDs and
bandwidth show that the card is actually in 100baseTX mode.
.Sh SEE ALSO
.Xr altq 4 ,
==== //depot/projects/toehead/share/man/man5/src.conf.5#2 (text) ====
@@ -1,7 +1,7 @@
.\" DO NOT EDIT-- this file is automatically generated.
.\" from FreeBSD: src/tools/build/options/makeman,v 1.7 2007/11/06 23:12:53 danger Exp
-.\" $FreeBSD: src/share/man/man5/src.conf.5,v 1.21 2007/12/09 21:57:27 dougb Exp $
-.Dd December 9, 2007
+.\" $FreeBSD: src/share/man/man5/src.conf.5,v 1.22 2007/12/10 19:11:56 dougb Exp $
+.Dd December 10, 2007
.Dt SRC.CONF 5
.Os
.Sh NAME
@@ -288,6 +288,11 @@
.\" from FreeBSD: src/tools/build/options/WITHOUT_GROFF,v 1.1 2006/03/21 07:50:49 ru Exp
Set to not build
.Xr groff 1 .
+.It Va WITH_GSSAPI
+.\" from FreeBSD: src/tools/build/options/WITH_GSSAPI,v 1.1 2007/12/10 19:09:24 dougb Exp
+Set to build libgssapi when
+.Va WITHOUT_KERBEROS
+is set.
.It Va WITH_HESIOD
.\" from FreeBSD: src/tools/build/options/WITH_HESIOD,v 1.1 2006/03/21 07:50:50 ru Exp
Set to build Hesiod support.
@@ -346,8 +351,13 @@
.\" from FreeBSD: src/tools/build/options/WITHOUT_IPX_SUPPORT,v 1.1 2006/03/21 07:50:50 ru Exp
Set to build some programs without IPX support.
.It Va WITHOUT_KERBEROS
-.\" from FreeBSD: src/tools/build/options/WITHOUT_KERBEROS,v 1.1 2006/03/21 07:50:50 ru Exp
+.\" from FreeBSD: src/tools/build/options/WITHOUT_KERBEROS,v 1.2 2007/12/10 19:09:24 dougb Exp
Set this if you do not want to build Kerberos 5 (KTH Heimdal).
+This option implies
+.Va WITHOUT_GSSAPI .
+Set
+.Va WITH_GSSAPI
+to override.
When set, it also enforces the following options:
.Pp
.Bl -item -compact
==== //depot/projects/toehead/share/man/man7/build.7#2 (text+ko) ====
@@ -22,7 +22,7 @@
.\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
.\" SUCH DAMAGE.
.\"
-.\" $FreeBSD: src/share/man/man7/build.7,v 1.46 2006/12/14 13:37:08 mpp Exp $
+.\" $FreeBSD: src/share/man/man7/build.7,v 1.47 2007/12/11 21:14:10 imp Exp $
.\"
.Dd October 1, 2006
.Dt BUILD 7
@@ -335,6 +335,16 @@
.Xr make 1
variables:
.Bl -tag -width ".Va SUBDIR_OVERRIDE"
+.It Va BSDMAKE
+If set, this variable supplies the name of the
+program to use in early boot strapping that is compatible with the
+default
+.Fx
+.Xr make 1
+program.
+This program is subjected to the normal make regression tests at the
+start of the build, and is used to build a more compatible make, if
+necessary, which is used to build the rest of the system.
.It Va LOCAL_DIRS
If set, this variable supplies a list of additional directories to
build, relative to the root of the source tree.
@@ -366,7 +376,10 @@
Set this to cross-build for a different architecture.
If not set,
.Va TARGET_ARCH
-defaults to the current machine architecture.
+defaults to the current machine architecture, unless
+.Va TARGET
+is also set, in which case it defaults to the appropriate
+value for that platform.
.El
.Pp
Builds under directory
@@ -402,8 +415,8 @@
system for the sparc64 architecture on an i386 host:
.Bd -literal -offset indent
cd /usr/src
-make TARGET_ARCH=sparc64 buildworld
-make TARGET_ARCH=sparc64 DESTDIR=/clients/sparc64 installworld
+make TARGET=sparc64 buildworld
+make TARGET=sparc64 DESTDIR=/clients/sparc64 installworld
.Ed
.Sh SEE ALSO
.Xr cc 1 ,
==== //depot/projects/toehead/share/mk/bsd.own.mk#2 (text+ko) ====
@@ -1,4 +1,4 @@
-# $FreeBSD: src/share/mk/bsd.own.mk,v 1.69 2007/10/20 19:01:49 ru Exp $
+# $FreeBSD: src/share/mk/bsd.own.mk,v 1.70 2007/12/10 19:09:24 dougb Exp $
#
# The include file <bsd.own.mk> set common variables for owner,
# group, mode, and directories. Defaults are in brackets.
@@ -381,6 +381,7 @@
#
.for var in \
BIND_LIBS \
+ GSSAPI \
HESIOD \
IDEA
.if defined(WITH_${var}) && defined(WITHOUT_${var})
==== //depot/projects/toehead/sys/arm/arm/pmap.c#2 (text+ko) ====
@@ -147,7 +147,7 @@
#include "opt_vm.h"
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/arm/arm/pmap.c,v 1.92 2007/12/07 10:42:11 cognet Exp $");
+__FBSDID("$FreeBSD: src/sys/arm/arm/pmap.c,v 1.93 2007/12/11 20:35:44 cognet Exp $");
#include <sys/param.h>
#include <sys/systm.h>
#include <sys/kernel.h>
@@ -3277,7 +3277,6 @@
if (pg != NULL) {
f = pmap_modify_pv(pg, pm, sva,
PVF_WRITE, 0);
- pmap_vac_me_harder(pg, pm, sva);
vm_page_dirty(pg);
} else
f = PVF_REF | PVF_EXEC;
==== //depot/projects/toehead/sys/cam/scsi/scsi_da.c#2 (text+ko) ====
@@ -27,7 +27,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/cam/scsi/scsi_da.c,v 1.224 2007/07/01 17:42:07 imp Exp $");
+__FBSDID("$FreeBSD: src/sys/cam/scsi/scsi_da.c,v 1.225 2007/12/11 06:41:38 davidxu Exp $");
#include <sys/param.h>
@@ -535,6 +535,10 @@
{T_DIRECT, SIP_MEDIA_REMOVABLE, "ChipsBnk", "USB*",
"*"}, /*quirks*/ DA_Q_NO_SYNC_CACHE
},
+ {
+ {T_DIRECT, SIP_MEDIA_REMOVABLE, "Netac", "OnlyDisk*",
+ "2000"}, /*quirks*/ DA_Q_NO_SYNC_CACHE
+ }
};
static disk_strategy_t dastrategy;
==== //depot/projects/toehead/sys/compat/freebsd32/freebsd32_misc.c#2 (text+ko) ====
@@ -25,7 +25,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/compat/freebsd32/freebsd32_misc.c,v 1.73 2007/12/08 01:41:31 scottl Exp $");
+__FBSDID("$FreeBSD: src/sys/compat/freebsd32/freebsd32_misc.c,v 1.74 2007/12/10 19:42:23 jhb Exp $");
#include "opt_compat.h"
@@ -145,7 +145,7 @@
}
#ifdef COMPAT_FREEBSD4
-static int
+static void
copy_statfs(struct statfs *in, struct statfs32 *out)
{
@@ -157,25 +157,21 @@
CP(*in, *out, f_bfree);
CP(*in, *out, f_bavail);
out->f_files = MIN(in->f_files, INT32_MAX);
- if (in->f_ffree < 0)
- out->f_ffree = MAX(in->f_ffree, INT32_MIN);
- else
- out->f_ffree = MIN(in->f_ffree, INT32_MAX);
+ out->f_ffree = MIN(in->f_ffree, INT32_MAX);
CP(*in, *out, f_fsid);
CP(*in, *out, f_owner);
CP(*in, *out, f_type);
CP(*in, *out, f_flags);
- CP(*in, *out, f_syncwrites);
- CP(*in, *out, f_asyncwrites);
+ out->f_syncwrites = MIN(in->f_syncwrites, INT32_MAX);
+ out->f_asyncwrites = MIN(in->f_asyncwrites, INT32_MAX);
strlcpy(out->f_fstypename,
in->f_fstypename, MFSNAMELEN);
strlcpy(out->f_mntonname,
in->f_mntonname, min(MNAMELEN, FREEBSD4_MNAMELEN));
- CP(*in, *out, f_syncreads);
- CP(*in, *out, f_asyncreads);
+ out->f_syncreads = MIN(in->f_syncreads, INT32_MAX);
+ out->f_asyncreads = MIN(in->f_asyncreads, INT32_MAX);
strlcpy(out->f_mntfromname,
in->f_mntfromname, min(MNAMELEN, FREEBSD4_MNAMELEN));
- return (0);
}
#endif
@@ -195,9 +191,7 @@
count = td->td_retval[0];
sp = buf;
while (count > 0 && error == 0) {
- error = copy_statfs(sp, &stat32);
- if (error)
- break;
+ copy_statfs(sp, &stat32);
error = copyout(&stat32, uap->buf, sizeof(stat32));
sp++;
uap->buf++;
@@ -1272,9 +1266,7 @@
error = kern_statfs(td, uap->path, UIO_USERSPACE, &s);
if (error)
return (error);
- error = copy_statfs(&s, &s32);
- if (error)
- return (error);
+ copy_statfs(&s, &s32);
return (copyout(&s32, uap->buf, sizeof(s32)));
}
#endif
@@ -1290,9 +1282,7 @@
error = kern_fstatfs(td, uap->fd, &s);
if (error)
return (error);
- error = copy_statfs(&s, &s32);
- if (error)
- return (error);
+ copy_statfs(&s, &s32);
return (copyout(&s32, uap->buf, sizeof(s32)));
}
#endif
@@ -1311,9 +1301,7 @@
error = kern_fhstatfs(td, fh, &s);
if (error)
return (error);
- error = copy_statfs(&s, &s32);
- if (error)
- return (error);
+ copy_statfs(&s, &s32);
return (copyout(&s32, uap->buf, sizeof(s32)));
}
#endif
==== //depot/projects/toehead/sys/dev/usb/umass.c#2 (text+ko) ====
@@ -24,7 +24,7 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
- * $FreeBSD: src/sys/dev/usb/umass.c,v 1.160 2007/07/05 05:26:08 imp Exp $
+ * $FreeBSD: src/sys/dev/usb/umass.c,v 1.161 2007/12/11 06:41:38 davidxu Exp $
* $NetBSD: umass.c,v 1.28 2000/04/02 23:46:53 augustss Exp $
*/
@@ -564,6 +564,10 @@
UMASS_PROTO_SCSI | UMASS_PROTO_BBB,
NO_INQUIRY
},
+ { USB_VENDOR_NETAC, USB_PRODUCT_NETAC_ONLYDISK, RID_WILDCARD,
+ UMASS_PROTO_SCSI | UMASS_PROTO_BBB,
+ IGNORE_RESIDUE
+ },
{ USB_VENDOR_NETCHIP, USB_PRODUCT_NETCHIP_CLIK_40, RID_WILDCARD,
UMASS_PROTO_ATAPI,
NO_INQUIRY
==== //depot/projects/toehead/sys/dev/usb/usbdevs#2 (text+ko) ====
@@ -1,4 +1,4 @@
-$FreeBSD: src/sys/dev/usb/usbdevs,v 1.335 2007/11/26 05:47:15 jb Exp $
+$FreeBSD: src/sys/dev/usb/usbdevs,v 1.336 2007/12/11 06:41:38 davidxu Exp $
/* $NetBSD: usbdevs,v 1.392 2004/12/29 08:38:44 imp Exp $ */
/*-
@@ -1737,6 +1737,7 @@
/* Netac products */
product NETAC CF_CARD 0x1060 USB-CF-Card
+product NETAC ONLYDISK 0x0003 OnlyDisk
/* NetChip Technology Products */
product NETCHIP TURBOCONNECT 0x1080 Turbo-Connect
==== //depot/projects/toehead/sys/fs/udf/udf_vfsops.c#2 (text+ko) ====
@@ -23,7 +23,7 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
- * $FreeBSD: src/sys/fs/udf/udf_vfsops.c,v 1.49 2007/10/16 10:54:54 alfred Exp $
+ * $FreeBSD: src/sys/fs/udf/udf_vfsops.c,v 1.50 2007/12/11 19:49:40 markus Exp $
*/
/* udf_vfsops.c */
@@ -290,7 +290,7 @@
if (le16toh(tag->id) != id)
return (EINVAL);
- for (i = 0; i < 15; i++)
+ for (i = 0; i < 16; i++)
cksum = cksum + itag[i];
cksum = cksum - itag[4];
==== //depot/projects/toehead/sys/kern/kern_resource.c#2 (text+ko) ====
@@ -35,7 +35,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/kern/kern_resource.c,v 1.180 2007/07/17 01:08:09 jeff Exp $");
+__FBSDID("$FreeBSD: src/sys/kern/kern_resource.c,v 1.181 2007/12/11 08:25:35 davidxu Exp $");
#include "opt_compat.h"
@@ -56,6 +56,7 @@
#include <sys/syscallsubr.h>
#include <sys/sysent.h>
#include <sys/time.h>
+#include <sys/umtx.h>
#include <vm/vm.h>
#include <vm/vm_param.h>
@@ -482,6 +483,7 @@
rtp_to_pri(struct rtprio *rtp, struct thread *td)
{
u_char newpri;
+ u_char oldpri;
if (rtp->prio > RTP_PRIO_MAX)
return (EINVAL);
@@ -501,10 +503,15 @@
return (EINVAL);
}
sched_class(td, rtp->type); /* XXX fix */
+ oldpri = td->td_user_pri;
sched_user_prio(td, newpri);
if (curthread == td)
sched_prio(curthread, td->td_user_pri); /* XXX dubious */
- thread_unlock(td);
+ if (TD_ON_UPILOCK(td) && oldpri != newpri) {
+ thread_unlock(td);
+ umtx_pi_adjust(td, oldpri);
+ } else
+ thread_unlock(td);
return (0);
}
==== //depot/projects/toehead/sys/kern/sched_4bsd.c#2 (text+ko) ====
@@ -33,7 +33,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/kern/sched_4bsd.c,v 1.110 2007/11/14 06:21:22 julian Exp $");
+__FBSDID("$FreeBSD: src/sys/kern/sched_4bsd.c,v 1.111 2007/12/11 08:25:36 davidxu Exp $");
#include "opt_hwpmc_hooks.h"
@@ -762,14 +762,12 @@
{
u_char oldprio;
+ THREAD_LOCK_ASSERT(td, MA_OWNED);
td->td_base_user_pri = prio;
if (td->td_flags & TDF_UBORROWING && td->td_user_pri <= prio)
return;
oldprio = td->td_user_pri;
td->td_user_pri = prio;
-
- if (TD_ON_UPILOCK(td) && oldprio != prio)
- umtx_pi_adjust(td, oldprio);
}
void
@@ -777,13 +775,10 @@
{
u_char oldprio;
+ THREAD_LOCK_ASSERT(td, MA_OWNED);
td->td_flags |= TDF_UBORROWING;
-
oldprio = td->td_user_pri;
td->td_user_pri = prio;
-
- if (TD_ON_UPILOCK(td) && oldprio != prio)
- umtx_pi_adjust(td, oldprio);
}
void
@@ -791,12 +786,14 @@
{
u_char base_pri;
+ THREAD_LOCK_ASSERT(td, MA_OWNED);
base_pri = td->td_base_user_pri;
if (prio >= base_pri) {
td->td_flags &= ~TDF_UBORROWING;
sched_user_prio(td, base_pri);
- } else
+ } else {
sched_lend_user_prio(td, prio);
+ }
}
void
==== //depot/projects/toehead/sys/kern/sched_ule.c#2 (text+ko) ====
@@ -36,7 +36,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/kern/sched_ule.c,v 1.217 2007/11/14 06:21:23 julian Exp $");
+__FBSDID("$FreeBSD: src/sys/kern/sched_ule.c,v 1.218 2007/12/11 08:25:36 davidxu Exp $");
#include "opt_hwpmc_hooks.h"
#include "opt_sched.h"
@@ -1709,9 +1709,6 @@
return;
oldprio = td->td_user_pri;
td->td_user_pri = prio;
-
- if (TD_ON_UPILOCK(td) && oldprio != prio)
- umtx_pi_adjust(td, oldprio);
}
void
@@ -1719,13 +1716,10 @@
{
u_char oldprio;
+ THREAD_LOCK_ASSERT(td, MA_OWNED);
td->td_flags |= TDF_UBORROWING;
-
oldprio = td->td_user_pri;
td->td_user_pri = prio;
-
- if (TD_ON_UPILOCK(td) && oldprio != prio)
- umtx_pi_adjust(td, oldprio);
}
void
@@ -1733,12 +1727,14 @@
{
u_char base_pri;
+ THREAD_LOCK_ASSERT(td, MA_OWNED);
base_pri = td->td_base_user_pri;
if (prio >= base_pri) {
td->td_flags &= ~TDF_UBORROWING;
sched_user_prio(td, base_pri);
- } else
+ } else {
sched_lend_user_prio(td, prio);
+ }
}
/*
==== //depot/projects/toehead/sys/netinet6/dest6.c#2 (text+ko) ====
@@ -1,6 +1,3 @@
-/* $FreeBSD: src/sys/netinet6/dest6.c,v 1.11 2007/07/05 16:23:46 delphij Exp $ */
-/* $KAME: dest6.c,v 1.59 2003/07/11 13:21:16 t-momose Exp $ */
-
/*-
* Copyright (C) 1995, 1996, 1997, and 1998 WIDE Project.
* All rights reserved.
@@ -28,8 +25,13 @@
>>> TRUNCATED FOR MAIL (1000 lines) <<<
More information about the p4-projects
mailing list