Date: Mon, 13 Nov 2006 16:40:28 GMT From: Marcel Moolenaar <marcel@FreeBSD.org> To: Perforce Change Reviews <perforce@freebsd.org> Subject: PERFORCE change 109858 for review Message-ID: <200611131640.kADGeSBc031670@repoman.freebsd.org>
next in thread | raw e-mail | index | archive | help
http://perforce.freebsd.org/chv.cgi?CH=109858 Change 109858 by marcel@marcel_nfs on 2006/11/13 16:40:24 IFC @109857 Affected files ... .. //depot/projects/ia64/MAINTAINERS#56 integrate .. //depot/projects/ia64/Makefile.inc1#113 integrate .. //depot/projects/ia64/UPDATING#91 integrate .. //depot/projects/ia64/etc/mtree/BSD.local.dist#31 integrate .. //depot/projects/ia64/etc/rc.d/ipfilter#19 integrate .. //depot/projects/ia64/gnu/usr.bin/groff/tmac/mdoc.local#31 integrate .. //depot/projects/ia64/include/Makefile#56 integrate .. //depot/projects/ia64/include/ar.h#2 integrate .. //depot/projects/ia64/lib/Makefile#59 integrate .. //depot/projects/ia64/lib/libarchive/archive_read_data_into_fd.c#10 integrate .. //depot/projects/ia64/lib/libarchive/archive_read_open_fd.c#7 integrate .. //depot/projects/ia64/lib/libarchive/archive_read_open_file.c#9 integrate .. //depot/projects/ia64/lib/libarchive/archive_write_open_fd.c#5 integrate .. //depot/projects/ia64/lib/libarchive/archive_write_open_file.c#9 integrate .. //depot/projects/ia64/lib/libelf/Makefile#1 branch .. //depot/projects/ia64/lib/libelf/Version.map#1 branch .. //depot/projects/ia64/lib/libelf/_libelf.h#1 branch .. //depot/projects/ia64/lib/libelf/elf.3#1 branch .. //depot/projects/ia64/lib/libelf/elf_begin.3#1 branch .. //depot/projects/ia64/lib/libelf/elf_begin.c#1 branch .. //depot/projects/ia64/lib/libelf/elf_cntl.3#1 branch .. //depot/projects/ia64/lib/libelf/elf_cntl.c#1 branch .. //depot/projects/ia64/lib/libelf/elf_data.c#1 branch .. //depot/projects/ia64/lib/libelf/elf_end.3#1 branch .. //depot/projects/ia64/lib/libelf/elf_end.c#1 branch .. //depot/projects/ia64/lib/libelf/elf_errmsg.3#1 branch .. //depot/projects/ia64/lib/libelf/elf_errmsg.c#1 branch .. //depot/projects/ia64/lib/libelf/elf_errno.c#1 branch .. //depot/projects/ia64/lib/libelf/elf_fill.3#1 branch .. //depot/projects/ia64/lib/libelf/elf_fill.c#1 branch .. //depot/projects/ia64/lib/libelf/elf_flag.c#1 branch .. //depot/projects/ia64/lib/libelf/elf_flagdata.3#1 branch .. //depot/projects/ia64/lib/libelf/elf_getarhdr.3#1 branch .. //depot/projects/ia64/lib/libelf/elf_getarhdr.c#1 branch .. //depot/projects/ia64/lib/libelf/elf_getarsym.3#1 branch .. //depot/projects/ia64/lib/libelf/elf_getarsym.c#1 branch .. //depot/projects/ia64/lib/libelf/elf_getbase.3#1 branch .. //depot/projects/ia64/lib/libelf/elf_getbase.c#1 branch .. //depot/projects/ia64/lib/libelf/elf_getdata.3#1 branch .. //depot/projects/ia64/lib/libelf/elf_getident.3#1 branch .. //depot/projects/ia64/lib/libelf/elf_getident.c#1 branch .. //depot/projects/ia64/lib/libelf/elf_getscn.3#1 branch .. //depot/projects/ia64/lib/libelf/elf_getshnum.3#1 branch .. //depot/projects/ia64/lib/libelf/elf_getshstrndx.3#1 branch .. //depot/projects/ia64/lib/libelf/elf_hash.3#1 branch .. //depot/projects/ia64/lib/libelf/elf_hash.c#1 branch .. //depot/projects/ia64/lib/libelf/elf_kind.3#1 branch .. //depot/projects/ia64/lib/libelf/elf_kind.c#1 branch .. //depot/projects/ia64/lib/libelf/elf_memory.3#1 branch .. //depot/projects/ia64/lib/libelf/elf_memory.c#1 branch .. //depot/projects/ia64/lib/libelf/elf_next.3#1 branch .. //depot/projects/ia64/lib/libelf/elf_next.c#1 branch .. //depot/projects/ia64/lib/libelf/elf_rand.3#1 branch .. //depot/projects/ia64/lib/libelf/elf_rand.c#1 branch .. //depot/projects/ia64/lib/libelf/elf_rawfile.3#1 branch .. //depot/projects/ia64/lib/libelf/elf_rawfile.c#1 branch .. //depot/projects/ia64/lib/libelf/elf_scn.c#1 branch .. //depot/projects/ia64/lib/libelf/elf_shnum.c#1 branch .. //depot/projects/ia64/lib/libelf/elf_shstrndx.c#1 branch .. //depot/projects/ia64/lib/libelf/elf_strptr.3#1 branch .. //depot/projects/ia64/lib/libelf/elf_strptr.c#1 branch .. //depot/projects/ia64/lib/libelf/elf_types.m4#1 branch .. //depot/projects/ia64/lib/libelf/elf_update.3#1 branch .. //depot/projects/ia64/lib/libelf/elf_update.c#1 branch .. //depot/projects/ia64/lib/libelf/elf_version.3#1 branch .. //depot/projects/ia64/lib/libelf/elf_version.c#1 branch .. //depot/projects/ia64/lib/libelf/gelf.3#1 branch .. //depot/projects/ia64/lib/libelf/gelf.h#1 branch .. //depot/projects/ia64/lib/libelf/gelf_cap.c#1 branch .. //depot/projects/ia64/lib/libelf/gelf_checksum.3#1 branch .. //depot/projects/ia64/lib/libelf/gelf_checksum.c#1 branch .. //depot/projects/ia64/lib/libelf/gelf_dyn.c#1 branch .. //depot/projects/ia64/lib/libelf/gelf_ehdr.c#1 branch .. //depot/projects/ia64/lib/libelf/gelf_fsize.3#1 branch .. //depot/projects/ia64/lib/libelf/gelf_fsize.c#1 branch .. //depot/projects/ia64/lib/libelf/gelf_getcap.3#1 branch .. //depot/projects/ia64/lib/libelf/gelf_getclass.3#1 branch .. //depot/projects/ia64/lib/libelf/gelf_getclass.c#1 branch .. //depot/projects/ia64/lib/libelf/gelf_getdyn.3#1 branch .. //depot/projects/ia64/lib/libelf/gelf_getehdr.3#1 branch .. //depot/projects/ia64/lib/libelf/gelf_getmove.3#1 branch .. //depot/projects/ia64/lib/libelf/gelf_getphdr.3#1 branch .. //depot/projects/ia64/lib/libelf/gelf_getrel.3#1 branch .. //depot/projects/ia64/lib/libelf/gelf_getrela.3#1 branch .. //depot/projects/ia64/lib/libelf/gelf_getshdr.3#1 branch .. //depot/projects/ia64/lib/libelf/gelf_getsym.3#1 branch .. //depot/projects/ia64/lib/libelf/gelf_getsyminfo.3#1 branch .. //depot/projects/ia64/lib/libelf/gelf_getsymshndx.3#1 branch .. //depot/projects/ia64/lib/libelf/gelf_move.c#1 branch .. //depot/projects/ia64/lib/libelf/gelf_newehdr.3#1 branch .. //depot/projects/ia64/lib/libelf/gelf_newphdr.3#1 branch .. //depot/projects/ia64/lib/libelf/gelf_phdr.c#1 branch .. //depot/projects/ia64/lib/libelf/gelf_rel.c#1 branch .. //depot/projects/ia64/lib/libelf/gelf_rela.c#1 branch .. //depot/projects/ia64/lib/libelf/gelf_shdr.c#1 branch .. //depot/projects/ia64/lib/libelf/gelf_sym.c#1 branch .. //depot/projects/ia64/lib/libelf/gelf_syminfo.c#1 branch .. //depot/projects/ia64/lib/libelf/gelf_symshndx.c#1 branch .. //depot/projects/ia64/lib/libelf/gelf_update_ehdr.3#1 branch .. //depot/projects/ia64/lib/libelf/gelf_xlate.c#1 branch .. //depot/projects/ia64/lib/libelf/gelf_xlatetof.3#1 branch .. //depot/projects/ia64/lib/libelf/libelf.c#1 branch .. //depot/projects/ia64/lib/libelf/libelf.h#1 branch .. //depot/projects/ia64/lib/libelf/libelf_align.c#1 branch .. //depot/projects/ia64/lib/libelf/libelf_allocate.c#1 branch .. //depot/projects/ia64/lib/libelf/libelf_ar.c#1 branch .. //depot/projects/ia64/lib/libelf/libelf_checksum.c#1 branch .. //depot/projects/ia64/lib/libelf/libelf_convert.m4#1 branch .. //depot/projects/ia64/lib/libelf/libelf_data.c#1 branch .. //depot/projects/ia64/lib/libelf/libelf_ehdr.c#1 branch .. //depot/projects/ia64/lib/libelf/libelf_fsize.m4#1 branch .. //depot/projects/ia64/lib/libelf/libelf_msize.m4#1 branch .. //depot/projects/ia64/lib/libelf/libelf_phdr.c#1 branch .. //depot/projects/ia64/lib/libelf/libelf_shdr.c#1 branch .. //depot/projects/ia64/lib/libelf/libelf_xlate.c#1 branch .. //depot/projects/ia64/lib/libthr/thread/thr_mutex.c#28 integrate .. //depot/projects/ia64/release/Makefile#100 integrate .. //depot/projects/ia64/release/doc/en_US.ISO8859-1/relnotes/common/new.sgml#166 integrate .. //depot/projects/ia64/share/doc/IPv6/IMPLEMENTATION#7 integrate .. //depot/projects/ia64/share/man/man4/sem.4#3 integrate .. //depot/projects/ia64/share/man/man4/snd_spicds.4#2 integrate .. //depot/projects/ia64/share/man/man7/release.7#41 integrate .. //depot/projects/ia64/share/man/man9/LOCK_PROFILING.9#1 branch .. //depot/projects/ia64/share/man/man9/MUTEX_PROFILING.9#6 delete .. //depot/projects/ia64/share/man/man9/Makefile#63 integrate .. //depot/projects/ia64/share/man/man9/mutex.9#20 integrate .. //depot/projects/ia64/sys/amd64/amd64/pmap.c#57 integrate .. //depot/projects/ia64/sys/amd64/include/pmap.h#22 integrate .. //depot/projects/ia64/sys/arm/arm/pmap.c#23 integrate .. //depot/projects/ia64/sys/arm/include/pmap.h#18 integrate .. //depot/projects/ia64/sys/coda/coda_vnops.c#23 integrate .. //depot/projects/ia64/sys/coda/coda_vnops.h#10 integrate .. //depot/projects/ia64/sys/conf/files.sun4v#4 integrate .. //depot/projects/ia64/sys/fs/nullfs/null_vnops.c#23 integrate .. //depot/projects/ia64/sys/i386/i386/pmap.c#97 integrate .. //depot/projects/ia64/sys/i386/include/pmap.h#30 integrate .. //depot/projects/ia64/sys/ia64/ia64/pmap.c#99 integrate .. //depot/projects/ia64/sys/ia64/include/pmap.h#23 integrate .. //depot/projects/ia64/sys/kern/kern_lock.c#35 integrate .. //depot/projects/ia64/sys/kern/kern_mutex.c#47 integrate .. //depot/projects/ia64/sys/kern/kern_rwlock.c#6 integrate .. //depot/projects/ia64/sys/kern/kern_sx.c#14 integrate .. //depot/projects/ia64/sys/kern/subr_lock.c#4 integrate .. //depot/projects/ia64/sys/kern/uipc_syscalls.c#67 integrate .. //depot/projects/ia64/sys/kern/vfs_default.c#44 integrate .. //depot/projects/ia64/sys/kern/vfs_subr.c#95 integrate .. //depot/projects/ia64/sys/kern/vfs_vnops.c#58 integrate .. //depot/projects/ia64/sys/kern/vnode_if.src#26 integrate .. //depot/projects/ia64/sys/powerpc/powerpc/mmu_oea.c#5 integrate .. //depot/projects/ia64/sys/sparc64/sparc64/pmap.c#65 integrate .. //depot/projects/ia64/sys/sun4v/include/pmap.h#2 integrate .. //depot/projects/ia64/sys/sun4v/sun4v/pmap.c#5 integrate .. //depot/projects/ia64/sys/sun4v/sun4v/rtc.c#2 integrate .. //depot/projects/ia64/sys/sun4v/sun4v/trap.c#4 integrate .. //depot/projects/ia64/sys/sys/_lock.h#7 integrate .. //depot/projects/ia64/sys/sys/lock.h#16 integrate .. //depot/projects/ia64/sys/sys/lock_profile.h#3 integrate .. //depot/projects/ia64/sys/sys/proc.h#106 integrate .. //depot/projects/ia64/sys/sys/vnode.h#58 integrate .. //depot/projects/ia64/sys/ufs/ffs/ffs_vnops.c#52 integrate .. //depot/projects/ia64/sys/vm/vm_fault.c#59 integrate .. //depot/projects/ia64/sys/vm/vm_kern.c#40 integrate .. //depot/projects/ia64/tools/regression/file/dup/Makefile#1 branch .. //depot/projects/ia64/tools/regression/file/dup/dup.c#1 branch .. //depot/projects/ia64/tools/regression/file/dup/dup.t#1 branch .. //depot/projects/ia64/usr.bin/sockstat/sockstat.1#6 integrate .. //depot/projects/ia64/usr.bin/sockstat/sockstat.c#9 integrate .. //depot/projects/ia64/usr.sbin/bluetooth/rfcomm_pppd/rfcomm_pppd.8#10 integrate .. //depot/projects/ia64/usr.sbin/ipfwpcap/ipfwpcap.8#3 integrate .. //depot/projects/ia64/usr.sbin/pccard/dumpcis/dumpcis.8#2 integrate .. //depot/projects/ia64/usr.sbin/pppd/Makefile#9 integrate .. //depot/projects/ia64/usr.sbin/pppd/eui64.c#1 branch .. //depot/projects/ia64/usr.sbin/pppd/eui64.h#1 branch .. //depot/projects/ia64/usr.sbin/pppd/ipv6cp.c#1 branch .. //depot/projects/ia64/usr.sbin/pppd/ipv6cp.h#1 branch .. //depot/projects/ia64/usr.sbin/pppd/main.c#4 integrate .. //depot/projects/ia64/usr.sbin/pppd/options.c#3 integrate .. //depot/projects/ia64/usr.sbin/pppd/pathnames.h#2 integrate .. //depot/projects/ia64/usr.sbin/pppd/pppd.8#7 integrate .. //depot/projects/ia64/usr.sbin/pppd/pppd.h#2 integrate .. //depot/projects/ia64/usr.sbin/pppd/sys-bsd.c#5 integrate .. //depot/projects/ia64/usr.sbin/sysinstall/install.c#39 integrate .. //depot/projects/ia64/usr.sbin/sysinstall/installUpgrade.c#13 integrate Differences ... ==== //depot/projects/ia64/MAINTAINERS#56 (text+ko) ==== @@ -1,4 +1,4 @@ -$FreeBSD: src/MAINTAINERS,v 1.141 2006/09/11 19:39:46 simon Exp $ +$FreeBSD: src/MAINTAINERS,v 1.142 2006/11/11 22:24:10 kris Exp $ Please note that the content of this file is strictly advisory. No locks listed here are valid. The only strict review requirements @@ -126,6 +126,7 @@ usr.bin/bluetooth emax Pre-commit review preferred. usr.sbin/bluetooth emax Pre-commit review preferred. gnu/usr.bin/send-pr bugmaster Pre-commit review requested. +BSD.{local,x11*}.dist portmgr Pre-commit review requested, since these files interface with ports. Following are the entries from the Makefiles, and a few other sources. Please remove stale entries from both their origin, and this file. ==== //depot/projects/ia64/Makefile.inc1#113 (text+ko) ==== @@ -1,5 +1,5 @@ # -# $FreeBSD: src/Makefile.inc1,v 1.563 2006/10/16 22:18:13 jb Exp $ +# $FreeBSD: src/Makefile.inc1,v 1.564 2006/11/13 05:52:11 ru Exp $ # # Make command line options: # -DNO_CLEANDIR run ${MAKE} clean, instead of ${MAKE} cleandir @@ -30,18 +30,17 @@ # entries works correctly. Do it first since it is less likely to # grow dependencies on include and lib than vice versa. # -# We must do lib and libexec before bin, because if installworld +# We must do lib/ and libexec/ before bin/, because if installworld # installs a new /bin/sh, the 'make' command will *immediately* # use that new version. And the new (dynamically-linked) /bin/sh # will expect to find appropriate libraries in /lib and /libexec. # -# We must do etc last for install/distribute to work. -# -SUBDIR= share/info include lib libexec bin +SUBDIR= share/info lib libexec +SUBDIR+=bin .if ${MK_GAMES} != "no" SUBDIR+=games .endif -SUBDIR+=gnu +SUBDIR+=gnu include .if ${MK_KERBEROS} != "no" SUBDIR+=kerberos5 .endif @@ -55,7 +54,11 @@ .if !defined(NO_SHARE) SUBDIR+=share .endif -SUBDIR+=sys usr.bin usr.sbin etc +SUBDIR+=sys usr.bin usr.sbin +# +# We must do etc/ last for install/distribute to work. +# +SUBDIR+=etc # These are last, since it is nice to at least get the base system # rebuilt before you do them. ==== //depot/projects/ia64/UPDATING#91 (text+ko) ==== @@ -20,6 +20,12 @@ in userland, and various verbose features in the kernel. Many developers choose to disable these features on build machines to maximize performance. +20061110: + The MUTEX_PROFILING option has been renamed to LOCK_PROFILING. + The lockmgr object layout has been changed as a result of having + a lock_object embedded in it. As a consequence all file system + kernel modules must be re-compiled. The mutex profiling man page + has not yet been updated to reflect this change. 20061026: KSE in the kernel has now been made optional and turned on by @@ -639,4 +645,4 @@ Contact Warner Losh if you have any questions about your use of this document. -$FreeBSD: src/UPDATING,v 1.462 2006/10/26 22:05:24 jb Exp $ +$FreeBSD: src/UPDATING,v 1.463 2006/11/11 03:18:06 kmacy Exp $ ==== //depot/projects/ia64/etc/mtree/BSD.local.dist#31 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/etc/mtree/BSD.local.dist,v 1.122 2006/11/10 22:57:39 des Exp $ +# $FreeBSD: src/etc/mtree/BSD.local.dist,v 1.125 2006/11/12 12:02:34 ache Exp $ # # Please see the file src/etc/mtree/README before making changes to this file. # @@ -725,14 +725,6 @@ .. lt_LT.UTF-8 .. - mn_MN.UTF-8 - .. - nb_NO.ISO8859-1 - .. - nb_NO.ISO8859-15 - .. - nb_NO.UTF-8 - .. nl_BE.ISO8859-1 .. nl_BE.ISO8859-15 @@ -745,12 +737,6 @@ .. nl_NL.UTF-8 .. - nn_NO.ISO8859-1 - .. - nn_NO.ISO8859-15 - .. - nn_NO.UTF-8 - .. no_NO.ISO8859-1 .. no_NO.ISO8859-15 @@ -840,8 +826,6 @@ .. xml .. - xsl - .. .. www .. ==== //depot/projects/ia64/etc/rc.d/ipfilter#19 (text+ko) ==== @@ -1,7 +1,7 @@ #!/bin/sh # # $NetBSD: ipfilter,v 1.10 2001/02/28 17:03:50 lukem Exp $ -# $FreeBSD: src/etc/rc.d/ipfilter,v 1.24 2005/07/07 05:59:44 jkim Exp $ +# $FreeBSD: src/etc/rc.d/ipfilter,v 1.25 2006/11/11 10:48:34 ceri Exp $ # # PROVIDE: ipfilter @@ -93,11 +93,17 @@ if [ -r "${ipfilter_rules}" ]; then ${ipfilter_program:-/sbin/ipf} -I \ -f "${ipfilter_rules}" ${ipfilter_flags} + if [ $? -ne 0 ]; then + err 1 'Load of rules into alternate set failed; aborting reload' + fi fi ${ipfilter_program:-/sbin/ipf} -I -6 -Fa if [ -r "${ipv6_ipfilter_rules}" ]; then ${ipfilter_program:-/sbin/ipf} -I -6 \ -f "${ipv6_ipfilter_rules}" ${ipfilter_flags} + if [ $? -ne 0 ]; then + err 1 'Load of IPv6 rules into alternate set failed; aborting reload' + fi fi ${ipfilter_program:-/sbin/ipf} -s ==== //depot/projects/ia64/gnu/usr.bin/groff/tmac/mdoc.local#31 (text+ko) ==== @@ -22,7 +22,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $FreeBSD: src/gnu/usr.bin/groff/tmac/mdoc.local,v 1.54 2006/08/08 19:47:10 ru Exp $ +.\" $FreeBSD: src/gnu/usr.bin/groff/tmac/mdoc.local,v 1.55 2006/11/11 17:16:35 jkoshy Exp $ .\" .\" %beginstrip% . @@ -43,6 +43,7 @@ .ds doc-str-Lb-libdevstat Device Statistics Library (libdevstat, \-ldevstat) .ds doc-str-Lb-libdisk Interface to Slice and Partition Labels Library (libdisk, \-ldisk) .ds doc-str-Lb-libedit Line Editor and History Library (libedit, \-ledit) +.ds doc-str-Lb-libelf ELF Parsing Library (libelf, \-lelf) .ds doc-str-Lb-libfetch File Transfer Library (libfetch, \-lfetch) .ds doc-str-Lb-libgeom Userland API Library for kernel GEOM subsystem (libgeom, \-lgeom) .ds doc-str-Lb-libipx IPX Address Conversion Support Library (libipx, \-lipx) ==== //depot/projects/ia64/include/Makefile#56 (text+ko) ==== @@ -1,5 +1,5 @@ # @(#)Makefile 8.2 (Berkeley) 1/4/94 -# $FreeBSD: src/include/Makefile,v 1.265 2006/10/31 22:22:29 pjd Exp $ +# $FreeBSD: src/include/Makefile,v 1.266 2006/11/11 16:26:54 trhodes Exp $ # # Doing a "make install" builds /usr/include. @@ -36,7 +36,7 @@ LDIRS= bsm cam geom net net80211 netatalk netatm netgraph netinet netinet6 \ netipsec ${_netipx} netkey netnatm ${_netncp} netsmb \ nfs nfsclient nfsserver \ - pccard posix4 sys vm + pccard sys vm LSUBDIRS= cam/scsi \ dev/acpica dev/an dev/bktr dev/firewire dev/hwpmc \ @@ -111,7 +111,7 @@ INCSLINKS+= machine/$i ${INCLUDEDIR}/$i .endfor .for i in ${PHDRS} -INCSLINKS+= posix4/$i ${INCLUDEDIR}/$i +INCSLINKS+= sys/$i ${INCLUDEDIR}/$i .endfor .if ${MACHINE} != ${MACHINE_ARCH} ==== //depot/projects/ia64/include/ar.h#2 (text+ko) ==== @@ -39,11 +39,15 @@ * SUCH DAMAGE. * * @(#)ar.h 8.2 (Berkeley) 1/21/94 + * + * $FreeBSD: src/include/ar.h,v 1.2 2006/11/13 04:28:29 jkoshy Exp $ */ #ifndef _AR_H_ #define _AR_H_ +#include <sys/cdefs.h> + /* Pre-4BSD archives had these magic numbers in them. */ #define OARMAG1 0177555 #define OARMAG2 0177545 @@ -62,6 +66,6 @@ char ar_size[10]; /* size in bytes */ #define ARFMAG "`\n" char ar_fmag[2]; /* consistency check */ -}; +} __packed; #endif /* !_AR_H_ */ ==== //depot/projects/ia64/lib/Makefile#59 (text+ko) ==== @@ -1,5 +1,5 @@ # @(#)Makefile 8.1 (Berkeley) 6/4/93 -# $FreeBSD: src/lib/Makefile,v 1.218 2006/09/30 11:32:46 ru Exp $ +# $FreeBSD: src/lib/Makefile,v 1.219 2006/11/11 17:16:32 jkoshy Exp $ .include <bsd.own.mk> @@ -24,7 +24,7 @@ # # Otherwise, the SUBDIR list should be in alphabetical order. -SUBDIR= ${_csu} libbsm libcom_err libcrypt libkvm msun libmd libncurses \ +SUBDIR= ${_csu} libbsm libcom_err libcrypt libelf libkvm msun libmd libncurses \ libnetgraph libradius librpcsvc libsbuf libtacplus libutil \ ${_libypclnt} libalias libarchive ${_libatm} \ libbegemot ${_libbluetooth} libbsnmp libbz2 libc \ ==== //depot/projects/ia64/lib/libarchive/archive_read_data_into_fd.c#10 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include "archive_platform.h" -__FBSDID("$FreeBSD: src/lib/libarchive/archive_read_data_into_fd.c,v 1.11 2006/11/10 06:39:46 kientzle Exp $"); +__FBSDID("$FreeBSD: src/lib/libarchive/archive_read_data_into_fd.c,v 1.12 2006/11/12 23:45:40 kientzle Exp $"); #ifdef HAVE_SYS_TYPES_H #include <sys/types.h> @@ -63,6 +63,7 @@ while ((r = archive_read_data_block(a, &buff, &size, &offset)) == ARCHIVE_OK) { + const char *p = buff; if (offset > output_offset) { lseek(fd, offset - output_offset, SEEK_CUR); output_offset = offset; @@ -71,13 +72,14 @@ bytes_to_write = size; if (bytes_to_write > MAX_WRITE) bytes_to_write = MAX_WRITE; - bytes_written = write(fd, buff, bytes_to_write); + bytes_written = write(fd, p, bytes_to_write); if (bytes_written < 0) { archive_set_error(a, errno, "Write error"); return (-1); } output_offset += bytes_written; total_written += bytes_written; + p += bytes_written; size -= bytes_written; if (a->extract_progress != NULL) (*a->extract_progress)(a->extract_progress_user_data); ==== //depot/projects/ia64/lib/libarchive/archive_read_open_fd.c#7 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include "archive_platform.h" -__FBSDID("$FreeBSD: src/lib/libarchive/archive_read_open_fd.c,v 1.7 2006/11/10 06:39:46 kientzle Exp $"); +__FBSDID("$FreeBSD: src/lib/libarchive/archive_read_open_fd.c,v 1.9 2006/11/13 00:29:57 kientzle Exp $"); #ifdef HAVE_SYS_STAT_H #include <sys/stat.h> @@ -44,7 +44,6 @@ #endif #include "archive.h" -#include "archive_private.h" struct read_fd_data { int fd; @@ -89,8 +88,8 @@ return (ARCHIVE_FATAL); } - a->skip_file_dev = st.st_dev; - a->skip_file_ino = st.st_ino; + if (S_ISREG(st.st_mode)) + archive_read_extract_set_skip_file(a, st.st_dev, st.st_ino); return (ARCHIVE_OK); } ==== //depot/projects/ia64/lib/libarchive/archive_read_open_file.c#9 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include "archive_platform.h" -__FBSDID("$FreeBSD: src/lib/libarchive/archive_read_open_file.c,v 1.12 2006/11/10 06:39:46 kientzle Exp $"); +__FBSDID("$FreeBSD: src/lib/libarchive/archive_read_open_file.c,v 1.14 2006/11/13 00:29:57 kientzle Exp $"); #ifdef HAVE_SYS_STAT_H #include <sys/stat.h> @@ -47,7 +47,6 @@ #endif #include "archive.h" -#include "archive_private.h" struct read_file_data { int fd; @@ -110,9 +109,10 @@ return (ARCHIVE_FATAL); } if (fstat(mine->fd, &st) == 0) { - /* Set dev/ino of archive file so extract won't overwrite. */ - a->skip_file_dev = st.st_dev; - a->skip_file_ino = st.st_ino; + /* If we're reading a file from disk, ensure that we don't + overwrite it with an extracted file. */ + if (S_ISREG(st.st_mode)) + archive_read_extract_set_skip_file(a, st.st_dev, st.st_ino); /* Remember mode so close can decide whether to flush. */ mine->st_mode = st.st_mode; } else { ==== //depot/projects/ia64/lib/libarchive/archive_write_open_fd.c#5 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include "archive_platform.h" -__FBSDID("$FreeBSD: src/lib/libarchive/archive_write_open_fd.c,v 1.5 2006/11/10 06:39:46 kientzle Exp $"); +__FBSDID("$FreeBSD: src/lib/libarchive/archive_write_open_fd.c,v 1.7 2006/11/13 00:29:57 kientzle Exp $"); #ifdef HAVE_SYS_STAT_H #include <sys/stat.h> @@ -44,7 +44,6 @@ #endif #include "archive.h" -#include "archive_private.h" struct write_fd_data { off_t offset; @@ -74,44 +73,35 @@ file_open(struct archive *a, void *client_data) { struct write_fd_data *mine; - struct stat st, *pst; + struct stat st; - pst = NULL; mine = (struct write_fd_data *)client_data; + if (fstat(mine->fd, &st) != 0) { + archive_set_error(a, errno, "Couldn't stat fd %d", mine->fd); + return (ARCHIVE_FATAL); + } + /* + * If this is a regular file, don't add it to itself. + */ + if (S_ISREG(st.st_mode)) + archive_write_set_skip_file(a, st.st_dev, st.st_ino); + + /* * If client hasn't explicitly set the last block handling, - * then set it here: If the output is a block or character - * device, pad the last block, otherwise leave it unpadded. + * then set it here. */ - if (mine->fd >= 0 && a->bytes_in_last_block < 0) { - /* Last block will be fully padded. */ - if (fstat(mine->fd, &st) == 0) { - pst = &st; - if (S_ISCHR(st.st_mode) || S_ISBLK(st.st_mode) || - S_ISFIFO(st.st_mode)) - archive_write_set_bytes_in_last_block(a, 0); - else - archive_write_set_bytes_in_last_block(a, 1); - } - } - - if (mine->fd == 1) { - if (a->bytes_in_last_block < 0) /* Still default? */ + if (archive_write_get_bytes_in_last_block(a) < 0) { + /* If the output is a block or character device, fifo, + * or stdout, pad the last block, otherwise leave it + * unpadded. */ + if (S_ISCHR(st.st_mode) || S_ISBLK(st.st_mode) || + S_ISFIFO(st.st_mode) || (mine->fd == 1)) /* Last block will be fully padded. */ archive_write_set_bytes_in_last_block(a, 0); - } - - if (mine->fd < 0) { - archive_set_error(a, errno, "Failed to open"); - return (ARCHIVE_FATAL); - } - - if (pst == NULL && fstat(mine->fd, &st) == 0) - pst = &st; - if (pst == NULL) { - archive_set_error(a, errno, "Couldn't stat fd %d", mine->fd); - return (ARCHIVE_FATAL); + else + archive_write_set_bytes_in_last_block(a, 1); } return (ARCHIVE_OK); ==== //depot/projects/ia64/lib/libarchive/archive_write_open_file.c#9 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include "archive_platform.h" -__FBSDID("$FreeBSD: src/lib/libarchive/archive_write_open_file.c,v 1.12 2006/11/10 06:39:46 kientzle Exp $"); +__FBSDID("$FreeBSD: src/lib/libarchive/archive_write_open_file.c,v 1.14 2006/11/13 00:29:57 kientzle Exp $"); #ifdef HAVE_SYS_STAT_H #include <sys/stat.h> @@ -47,7 +47,6 @@ #endif #include "archive.h" -#include "archive_private.h" struct write_file_data { int fd; @@ -88,64 +87,51 @@ { int flags; struct write_file_data *mine; - struct stat st, *pst; + struct stat st; - pst = NULL; mine = (struct write_file_data *)client_data; flags = O_WRONLY | O_CREAT | O_TRUNC; + /* + * Open the file. + */ if (mine->filename[0] != '\0') { mine->fd = open(mine->filename, flags, 0666); - + if (mine->fd < 0) { + archive_set_error(a, errno, "Failed to open '%s'", + mine->filename); + return (ARCHIVE_FATAL); + } + } else { /* - * If client hasn't explicitly set the last block - * handling, then set it here: If the output is a - * block or character device, pad the last block, - * otherwise leave it unpadded. + * NULL filename is stdout. */ - if (mine->fd >= 0 && a->bytes_in_last_block < 0) { - if (fstat(mine->fd, &st) == 0) { - pst = &st; - if (S_ISCHR(st.st_mode) || - S_ISBLK(st.st_mode) || - S_ISFIFO(st.st_mode)) - /* Pad last block. */ - archive_write_set_bytes_in_last_block(a, 0); - else - /* Don't pad last block. */ - archive_write_set_bytes_in_last_block(a, 1); - } - } - } else { mine->fd = 1; - if (a->bytes_in_last_block < 0) /* Still default? */ - /* Last block will be fully padded. */ + /* By default, pad archive when writing to stdout. */ + if (archive_write_get_bytes_in_last_block(a) < 0) archive_write_set_bytes_in_last_block(a, 0); } - if (mine->fd < 0) { - archive_set_error(a, errno, "Failed to open '%s'", - mine->filename); - return (ARCHIVE_FATAL); + /* + * Set up default last block handling. + */ + if (archive_write_get_bytes_in_last_block(a) < 0) { + if (S_ISCHR(st.st_mode) || S_ISBLK(st.st_mode) || + S_ISFIFO(st.st_mode)) + /* Pad last block when writing to device or FIFO. */ + archive_write_set_bytes_in_last_block(a, 0); + else + /* Don't pad last block otherwise. */ + archive_write_set_bytes_in_last_block(a, 1); } - if (pst == NULL && fstat(mine->fd, &st) == 0) - pst = &st; - if (pst == NULL) { - archive_set_error(a, errno, "Couldn't stat '%s'", - mine->filename); - return (ARCHIVE_FATAL); - } - /* * If the output file is a regular file, don't add it to * itself. If it's a device file, it's okay to add the device * entry to the output archive. */ - if (S_ISREG(pst->st_mode)) { - a->skip_file_dev = pst->st_dev; - a->skip_file_ino = pst->st_ino; - } + if (S_ISREG(st.st_mode)) + archive_write_set_skip_file(a, st.st_dev, st.st_ino); return (ARCHIVE_OK); } ==== //depot/projects/ia64/lib/libthr/thread/thr_mutex.c#28 (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.47 2006/09/08 09:29:14 davidxu Exp $ + * $FreeBSD: src/lib/libthr/thread/thr_mutex.c,v 1.48 2006/11/11 13:33:47 davidxu Exp $ */ #include "namespace.h" @@ -174,6 +174,18 @@ return (ret); } +static void +set_inherited_priority(struct pthread *curthread, struct pthread_mutex *m) +{ + struct pthread_mutex *m2; + + m2 = TAILQ_LAST(&curthread->pp_mutexq, mutex_queue); + if (m2 != NULL) + m->m_lock.m_ceilings[1] = m2->m_lock.m_ceilings[0]; + else + m->m_lock.m_ceilings[1] = -1; +} + int _pthread_mutex_init(pthread_mutex_t *mutex, const pthread_mutexattr_t *mutex_attr) @@ -213,7 +225,7 @@ _pthread_mutex_destroy(pthread_mutex_t *mutex) { struct pthread *curthread = _get_curthread(); - pthread_mutex_t m, m2; + pthread_mutex_t m; uint32_t id; int ret = 0; @@ -230,20 +242,14 @@ if (ret) return (ret); m = *mutex; - m2 = TAILQ_LAST(&curthread->pp_mutexq, mutex_queue); /* * Check mutex other fields to see if this mutex is * in use. Mostly for prority mutex types, or there * are condition variables referencing it. */ if (m->m_owner != NULL || m->m_refcount != 0) { - if (m->m_lock.m_flags & UMUTEX_PRIO_PROTECT) { - if (m2 != NULL) - m->m_lock.m_ceilings[1] = - m2->m_lock.m_ceilings[0]; - else - m->m_lock.m_ceilings[1] = -1; - } + if (m->m_lock.m_flags & UMUTEX_PRIO_PROTECT) + set_inherited_priority(curthread, m); _thr_umutex_unlock(&m->m_lock, id); ret = EBUSY; } else { @@ -253,13 +259,8 @@ */ *mutex = NULL; - if (m->m_lock.m_flags & UMUTEX_PRIO_PROTECT) { - if (m2 != NULL) - m->m_lock.m_ceilings[1] = - m2->m_lock.m_ceilings[0]; - else - m->m_lock.m_ceilings[1] = -1; - } + if (m->m_lock.m_flags & UMUTEX_PRIO_PROTECT) + set_inherited_priority(curthread, m); _thr_umutex_unlock(&m->m_lock, id); MUTEX_ASSERT_NOT_OWNED(m); @@ -582,7 +583,7 @@ mutex_unlock_common(pthread_mutex_t *mutex) { struct pthread *curthread = _get_curthread(); - struct pthread_mutex *m, *m2; + struct pthread_mutex *m; uint32_t id; if (__predict_false((m = *mutex) == NULL)) @@ -607,12 +608,7 @@ TAILQ_REMOVE(&curthread->mutexq, m, m_qe); else { TAILQ_REMOVE(&curthread->pp_mutexq, m, m_qe); - m2 = TAILQ_LAST(&curthread->pp_mutexq, mutex_queue); - if (m2 != NULL) - m->m_lock.m_ceilings[1] = - m2->m_lock.m_ceilings[0]; - else - m->m_lock.m_ceilings[1] = -1; + set_inherited_priority(curthread, m); } MUTEX_INIT_LINK(m); _thr_umutex_unlock(&m->m_lock, id); @@ -624,7 +620,7 @@ _mutex_cv_unlock(pthread_mutex_t *mutex, int *count) { struct pthread *curthread = _get_curthread(); - struct pthread_mutex *m, *m2; + struct pthread_mutex *m; if (__predict_false((m = *mutex) == NULL)) return (EINVAL); @@ -648,12 +644,7 @@ TAILQ_REMOVE(&curthread->mutexq, m, m_qe); else { TAILQ_REMOVE(&curthread->pp_mutexq, m, m_qe); - - m2 = TAILQ_LAST(&curthread->pp_mutexq, mutex_queue); - if (m2 != NULL) - m->m_lock.m_ceilings[1] = m2->m_lock.m_ceilings[0]; - else - m->m_lock.m_ceilings[1] = -1; + set_inherited_priority(curthread, m); } MUTEX_INIT_LINK(m); _thr_umutex_unlock(&m->m_lock, TID(curthread)); ==== //depot/projects/ia64/release/Makefile#100 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/release/Makefile,v 1.916 2006/10/24 21:00:49 ru Exp $ +# $FreeBSD: src/release/Makefile,v 1.917 2006/11/11 23:18:28 ru Exp $ # # make release [BUILDNAME=somename] CHROOTDIR=/some/dir CVSROOT=/cvs/dir \ # [RELEASETAG=tag] @@ -420,7 +420,7 @@ .endif .endif .if make(rerelease) -.if !defined(RELEASENOUPDATE) +.if !defined(RELEASENOUPDATE) && !defined(EXTSRCDIR) .if !defined(RELEASETAG) cd ${CHROOTDIR}/usr/src && ${CVSPREFIX} cvs -R ${CVSARGS} -q \ update ${CVSCMDARGS} -P -d -A ==== //depot/projects/ia64/release/doc/en_US.ISO8859-1/relnotes/common/new.sgml#166 (text+ko) ==== @@ -3,7 +3,7 @@ <corpauthor>The &os; Project</corpauthor> - <pubdate>$FreeBSD: src/release/doc/en_US.ISO8859-1/relnotes/common/new.sgml,v 1.983 2006/11/08 17:22:55 bmah Exp $</pubdate> + <pubdate>$FreeBSD: src/release/doc/en_US.ISO8859-1/relnotes/common/new.sgml,v 1.987 2006/11/13 01:44:20 bmah Exp $</pubdate> <copyright> <year>2000</year> @@ -301,6 +301,11 @@ &man.pmcstat.8; can now log over a network socket to a remote host.</para> + <para>Support for Kernel Scheduled Entities (KSE) is now a kernel + option (previously it was a mandatory feature in the kernel). + It is enabled in the GENERIC kernel (thus there is no change in + functionality) for all platforms except sun4v.</para> + <para>The &man.random.4; entropy device driver is now MPSAFE. &merged;</para> @@ -513,6 +518,14 @@ <para arch="amd64">The smbios(4) driver support for amd64 has been added.</para> + <para>&os; now has preliminary support for the Sun Microsystems + UltraSPARC-T1 archicture. &os;/sun4v has been demonstrated + to run on the Sun Fire T1000 and Sun Fire T2000 servers. + More information can be found on the + <ulink url="http://www.FreeBSD.org/platforms/sun4v.html">sun4v + Project</ulink> + page.</para> + <para>The tnt4882(4) driver, which supports the National Instruments PCI-GPIB card, has been added.</para> @@ -776,6 +789,9 @@ Packets are Ethernet frames with an EtherIP header prepended. &merged;</para> + <para>The &man.if.bridge.4; driver now supports RSTP, the Rapid + Spanning Tree Protocol (802.1w).</para> + <para>A hard-coded limit on the number of IPv4 multicast group memberships (formerly 20) has been removed.</para> @@ -830,6 +846,9 @@ <para>The &man.natm.4;, Native Mode ATM protocol layer is now MPSAFE.</para> + <para>The &man.ng.ether.4; Netgraph node no longer overwrites + the MAC address of outgoing frames by default. &merged;</para> + <para>The &man.ng.iface.4; Netgraph node now supports &man.altq.4;. &merged;</para> @@ -888,10 +907,17 @@ userland implementation of <quote>The Generalized TTL Security Mechanism (GTSM)</quote> found in RFC 3682.</para> + <para>The kernel &man.ppp.4; driver now supports IPv6.</para> + <para>Stealth forwarding now supports IPv6 as well as IPv4. This behavior can be controlled by using a new sysctl variable <varname>net.inet6.ip6.stealth</varname>.</para> + <para>Support has been added for the Stream Control Transmission + Protocol (SCTP). SCTP implements a reliable, message-oriented + transport protocol, and is defined in RFC 3268. It is enabled + in &os; with the <literal>SCTP</literal> kernel option.</para> + <para>The <literal>IPV6_V6ONLY</literal> socket option now works for UDP.</para> @@ -903,6 +929,21 @@ <varname>net.inet.tcp.inflight.rttthresh</varname> specifies the threshold in milliseconds below which this feature will disengage. It defaults to 10ms. &merged;</para> + + <para>The &os; network stack now has support for TCP + Segmentation Offload (TSO). TSO reduces the overhead of + sending bulk TCP data by allowing a network interface to + convert a large data transfer into multiple TCP segments to be + sent on the network. This functionality can be enabled or + disabled on a per-interface basis with + the <literal>tso</literal> and <literal>-tso</literal> flags + to &man.ifconfig.8;. Network interfaces and drivers + supporting TSO currently include &man.em.4; and + &man.mxge.4;.</para> + + <para>Support for &man.kqueue.2; operations has been added to + the &man.tun.4; driver. &merged;</para> + </sect3> <sect3 id="disks"> @@ -1151,7 +1192,11 @@ <para>The &man.fsdb.8; utility now supports changing the birth time of files on UFS2 file systems using the new - the <literal>btime</literal> command.</para> + <literal>btime</literal> command. &merged;</para> + + <para>The &man.fsdb.8; program now supports + a <literal>findblk</literal> command, which finds the inode(s) + owning a specific disk block. &merged;</para> <para>The &man.find.1; program now supports <option>-Btime</option> and other related primaries, which can be used to create expressions @@ -1404,6 +1449,10 @@ >>> TRUNCATED FOR MAIL (1000 lines) <<<
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200611131640.kADGeSBc031670>