Date: Tue, 21 Nov 2006 17:08:41 GMT From: Marcel Moolenaar <marcel@FreeBSD.org> To: Perforce Change Reviews <perforce@freebsd.org> Subject: PERFORCE change 110236 for review Message-ID: <200611211708.kALH8fl8065091@repoman.freebsd.org>
next in thread | raw e-mail | index | archive | help
http://perforce.freebsd.org/chv.cgi?CH=110236 Change 110236 by marcel@marcel_cluster on 2006/11/19 00:33:02 IFC @110235 Affected files ... .. //depot/projects/ia64/ObsoleteFiles.inc#13 integrate .. //depot/projects/ia64/UPDATING#92 integrate .. //depot/projects/ia64/lib/libarchive/archive.h.in#10 integrate .. //depot/projects/ia64/lib/libarchive/archive_private.h#11 integrate .. //depot/projects/ia64/lib/libarchive/archive_read_open_file.c#10 integrate .. //depot/projects/ia64/lib/libarchive/archive_read_support_format_tar.c#17 integrate .. //depot/projects/ia64/lib/libarchive/archive_write.c#12 integrate .. //depot/projects/ia64/lib/libarchive/archive_write_open_file.c#10 integrate .. //depot/projects/ia64/lib/libarchive/archive_write_set_format_cpio.c#7 integrate .. //depot/projects/ia64/lib/libarchive/archive_write_set_format_pax.c#15 integrate .. //depot/projects/ia64/lib/libarchive/archive_write_set_format_shar.c#7 integrate .. //depot/projects/ia64/lib/libarchive/archive_write_set_format_ustar.c#8 integrate .. //depot/projects/ia64/release/Makefile#101 integrate .. //depot/projects/ia64/release/doc/en_US.ISO8859-1/relnotes/common/new.sgml#167 integrate .. //depot/projects/ia64/release/scripts/package-split.py#9 integrate .. //depot/projects/ia64/release/sun4v/boot_crunch.conf#1 branch .. //depot/projects/ia64/sbin/mount/mount.c#30 integrate .. //depot/projects/ia64/share/man/man4/Makefile#98 integrate .. //depot/projects/ia64/share/man/man4/uark.4#1 branch .. //depot/projects/ia64/share/man/man4/ucom.4#7 integrate .. //depot/projects/ia64/share/man/man4/uhid.4#6 integrate .. //depot/projects/ia64/share/man/man4/uhidev.4#4 delete .. //depot/projects/ia64/share/man/man9/p_candebug.9#3 integrate .. //depot/projects/ia64/share/man/man9/sleepqueue.9#7 integrate .. //depot/projects/ia64/sys/amd64/amd64/db_disasm.c#5 integrate .. //depot/projects/ia64/sys/amd64/amd64/db_trace.c#17 integrate .. //depot/projects/ia64/sys/amd64/amd64/intr_machdep.c#15 integrate .. //depot/projects/ia64/sys/amd64/amd64/io_apic.c#12 integrate .. //depot/projects/ia64/sys/amd64/amd64/local_apic.c#17 integrate .. //depot/projects/ia64/sys/amd64/amd64/machdep.c#43 integrate .. //depot/projects/ia64/sys/amd64/amd64/mptable_pci.c#5 integrate .. //depot/projects/ia64/sys/amd64/amd64/msi.c#1 branch .. //depot/projects/ia64/sys/amd64/amd64/nexus.c#18 integrate .. //depot/projects/ia64/sys/amd64/include/apicvar.h#13 integrate .. //depot/projects/ia64/sys/amd64/include/intr_machdep.h#9 integrate .. //depot/projects/ia64/sys/amd64/include/pmap.h#23 integrate .. //depot/projects/ia64/sys/amd64/include/reg.h#6 integrate .. //depot/projects/ia64/sys/amd64/pci/pci_bus.c#16 integrate .. //depot/projects/ia64/sys/arm/arm/nexus.c#8 integrate .. //depot/projects/ia64/sys/arm/xscale/i80321/ep80219_machdep.c#3 integrate .. //depot/projects/ia64/sys/arm/xscale/i80321/iq31244_machdep.c#15 integrate .. //depot/projects/ia64/sys/boot/arm/at91/boot0/Makefile#3 integrate .. //depot/projects/ia64/sys/boot/arm/at91/boot0/arm_init.s#2 delete .. //depot/projects/ia64/sys/boot/arm/at91/boot0iic/Makefile#3 integrate .. //depot/projects/ia64/sys/boot/arm/at91/boot0iic/main.c#4 integrate .. //depot/projects/ia64/sys/boot/arm/at91/boot0spi/Makefile#3 integrate .. //depot/projects/ia64/sys/boot/arm/at91/boot0spi/main.c#4 integrate .. //depot/projects/ia64/sys/boot/arm/at91/boot2/Makefile#3 integrate .. //depot/projects/ia64/sys/boot/arm/at91/boot2/boot2.c#3 integrate .. //depot/projects/ia64/sys/boot/arm/at91/bootiic/Makefile#4 integrate .. //depot/projects/ia64/sys/boot/arm/at91/bootiic/arm_init.S#3 delete .. //depot/projects/ia64/sys/boot/arm/at91/bootspi/Makefile#5 integrate .. //depot/projects/ia64/sys/boot/arm/at91/bootspi/arm_init.S#3 delete .. //depot/projects/ia64/sys/boot/arm/at91/libat91/arm_init.S#1 branch .. //depot/projects/ia64/sys/boot/arm/at91/libat91/mci_device.c#3 delete .. //depot/projects/ia64/sys/boot/i386/loader/main.c#15 integrate .. //depot/projects/ia64/sys/compat/linux/linux_emul.c#4 integrate .. //depot/projects/ia64/sys/compat/linux/linux_getcwd.c#20 integrate .. //depot/projects/ia64/sys/compat/linux/linux_misc.c#50 integrate .. //depot/projects/ia64/sys/conf/NOTES#112 integrate .. //depot/projects/ia64/sys/conf/files#151 integrate .. //depot/projects/ia64/sys/conf/files.amd64#42 integrate .. //depot/projects/ia64/sys/conf/files.i386#81 integrate .. //depot/projects/ia64/sys/conf/files.pc98#68 integrate .. //depot/projects/ia64/sys/conf/files.sun4v#5 integrate .. //depot/projects/ia64/sys/ddb/db_watch.c#9 integrate .. //depot/projects/ia64/sys/dev/acpica/acpi_pcib_acpi.c#19 integrate .. //depot/projects/ia64/sys/dev/acpica/acpi_pcib_pci.c#12 integrate .. //depot/projects/ia64/sys/dev/ata/ata-all.c#71 integrate .. //depot/projects/ia64/sys/dev/bce/if_bce.c#6 integrate .. //depot/projects/ia64/sys/dev/bce/if_bcereg.h#7 integrate .. //depot/projects/ia64/sys/dev/em/if_em.c#57 integrate .. //depot/projects/ia64/sys/dev/em/if_em.h#37 integrate .. //depot/projects/ia64/sys/dev/fxp/if_fxp.c#69 integrate .. //depot/projects/ia64/sys/dev/isp/isp.c#32 integrate .. //depot/projects/ia64/sys/dev/isp/isp_freebsd.c#35 integrate .. //depot/projects/ia64/sys/dev/isp/isp_freebsd.h#28 integrate .. //depot/projects/ia64/sys/dev/isp/isp_library.c#5 integrate .. //depot/projects/ia64/sys/dev/isp/isp_library.h#3 integrate .. //depot/projects/ia64/sys/dev/isp/isp_pci.c#34 integrate .. //depot/projects/ia64/sys/dev/isp/isp_stds.h#2 integrate .. //depot/projects/ia64/sys/dev/isp/ispmbox.h#18 integrate .. //depot/projects/ia64/sys/dev/isp/ispvar.h#26 integrate .. //depot/projects/ia64/sys/dev/mfi/mfi.c#7 integrate .. //depot/projects/ia64/sys/dev/mfi/mfi_ioctl.h#3 integrate .. //depot/projects/ia64/sys/dev/mfi/mfi_linux.c#2 integrate .. //depot/projects/ia64/sys/dev/mpt/mpt.c#16 integrate .. //depot/projects/ia64/sys/dev/mpt/mpt.h#15 integrate .. //depot/projects/ia64/sys/dev/mpt/mpt_cam.c#12 integrate .. //depot/projects/ia64/sys/dev/mpt/mpt_pci.c#25 integrate .. //depot/projects/ia64/sys/dev/nfe/if_nfe.c#4 integrate .. //depot/projects/ia64/sys/dev/pci/pci.c#62 integrate .. //depot/projects/ia64/sys/dev/pci/pci_if.m#7 integrate .. //depot/projects/ia64/sys/dev/pci/pci_pci.c#33 integrate .. //depot/projects/ia64/sys/dev/pci/pci_private.h#16 integrate .. //depot/projects/ia64/sys/dev/pci/pcib_if.m#5 integrate .. //depot/projects/ia64/sys/dev/pci/pcib_private.h#8 integrate .. //depot/projects/ia64/sys/dev/pci/pcireg.h#16 integrate .. //depot/projects/ia64/sys/dev/pci/pcivar.h#18 integrate .. //depot/projects/ia64/sys/dev/syscons/syscons.c#44 integrate .. //depot/projects/ia64/sys/dev/usb/uark.c#1 branch .. //depot/projects/ia64/sys/dev/usb/usbdevs#79 integrate .. //depot/projects/ia64/sys/fs/procfs/procfs_ioctl.c#13 integrate .. //depot/projects/ia64/sys/gnu/fs/ext2fs/ext2_vfsops.c#7 integrate .. //depot/projects/ia64/sys/i386/i386/db_trace.c#25 integrate .. //depot/projects/ia64/sys/i386/i386/intr_machdep.c#14 integrate .. //depot/projects/ia64/sys/i386/i386/io_apic.c#13 integrate .. //depot/projects/ia64/sys/i386/i386/local_apic.c#18 integrate .. //depot/projects/ia64/sys/i386/i386/machdep.c#75 integrate .. //depot/projects/ia64/sys/i386/i386/mptable_pci.c#5 integrate .. //depot/projects/ia64/sys/i386/i386/msi.c#1 branch .. //depot/projects/ia64/sys/i386/i386/nexus.c#18 integrate .. //depot/projects/ia64/sys/i386/i386/pmap.c#98 integrate .. //depot/projects/ia64/sys/i386/include/apicvar.h#14 integrate .. //depot/projects/ia64/sys/i386/include/intr_machdep.h#10 integrate .. //depot/projects/ia64/sys/i386/include/pmap.h#31 integrate .. //depot/projects/ia64/sys/i386/include/reg.h#8 integrate .. //depot/projects/ia64/sys/i386/pci/pci_bus.c#29 integrate .. //depot/projects/ia64/sys/ia64/ia64/genassym.c#22 integrate .. //depot/projects/ia64/sys/ia64/ia64/interrupt.c#44 integrate .. //depot/projects/ia64/sys/ia64/ia64/machdep.c#123 integrate .. //depot/projects/ia64/sys/ia64/ia64/mp_machdep.c#44 integrate .. //depot/projects/ia64/sys/ia64/include/kdb.h#4 integrate .. //depot/projects/ia64/sys/ia64/include/pcpu.h#6 integrate .. //depot/projects/ia64/sys/kern/kern_condvar.c#34 integrate .. //depot/projects/ia64/sys/kern/kern_synch.c#67 integrate .. //depot/projects/ia64/sys/kern/sched_4bsd.c#38 integrate .. //depot/projects/ia64/sys/kern/subr_sleepqueue.c#16 integrate .. //depot/projects/ia64/sys/kern/sysv_msg.c#24 integrate .. //depot/projects/ia64/sys/modules/Makefile#100 integrate .. //depot/projects/ia64/sys/modules/uark/Makefile#1 branch .. //depot/projects/ia64/sys/net/ethernet.h#9 integrate .. //depot/projects/ia64/sys/net/if_ethersubr.c#53 integrate .. //depot/projects/ia64/sys/netinet/ip_fw2.c#62 integrate .. //depot/projects/ia64/sys/nfsclient/nfs_node.c#24 integrate .. //depot/projects/ia64/sys/nfsclient/nfs_vnops.c#53 integrate .. //depot/projects/ia64/sys/sparc64/sparc64/autoconf.c#9 integrate .. //depot/projects/ia64/sys/sparc64/sparc64/identcpu.c#13 integrate .. //depot/projects/ia64/sys/sparc64/sparc64/mem.c#14 integrate .. //depot/projects/ia64/sys/sun4v/conf/NOTES#4 integrate .. //depot/projects/ia64/sys/sun4v/include/asmacros.h#2 integrate .. //depot/projects/ia64/sys/sun4v/include/cache.h#2 integrate .. //depot/projects/ia64/sys/sun4v/include/pcpu.h#2 integrate .. //depot/projects/ia64/sys/sun4v/include/tte_hash.h#2 integrate .. //depot/projects/ia64/sys/sun4v/sun4v/autoconf.c#2 delete .. //depot/projects/ia64/sys/sun4v/sun4v/clock.c#2 delete .. //depot/projects/ia64/sys/sun4v/sun4v/counter.c#2 delete .. //depot/projects/ia64/sys/sun4v/sun4v/db_disasm.c#2 delete .. //depot/projects/ia64/sys/sun4v/sun4v/eeprom.c#2 delete .. //depot/projects/ia64/sys/sun4v/sun4v/elf_machdep.c#2 delete .. //depot/projects/ia64/sys/sun4v/sun4v/exception.S#4 integrate .. //depot/projects/ia64/sys/sun4v/sun4v/gdb_machdep.c#2 delete .. //depot/projects/ia64/sys/sun4v/sun4v/identcpu.c#2 delete .. //depot/projects/ia64/sys/sun4v/sun4v/in_cksum.c#2 delete .. //depot/projects/ia64/sys/sun4v/sun4v/interrupt.S#3 integrate .. //depot/projects/ia64/sys/sun4v/sun4v/iommu.c#2 delete .. //depot/projects/ia64/sys/sun4v/sun4v/mem.c#2 delete .. //depot/projects/ia64/sys/sun4v/sun4v/ofw_bus.c#2 delete .. //depot/projects/ia64/sys/sun4v/sun4v/ofw_machdep.c#2 delete .. //depot/projects/ia64/sys/sun4v/sun4v/pmap.c#6 integrate .. //depot/projects/ia64/sys/sun4v/sun4v/prof_machdep.c#2 delete .. //depot/projects/ia64/sys/sun4v/sun4v/rwindow.c#2 delete .. //depot/projects/ia64/sys/sun4v/sun4v/sys_machdep.c#2 delete .. //depot/projects/ia64/sys/sun4v/sun4v/tlb.c#2 delete .. //depot/projects/ia64/sys/sun4v/sun4v/tte_hash.c#2 integrate .. //depot/projects/ia64/sys/sys/elf_common.h#8 integrate .. //depot/projects/ia64/sys/sys/lock_profile.h#4 integrate .. //depot/projects/ia64/sys/sys/mbuf.h#46 integrate .. //depot/projects/ia64/sys/sys/sleepqueue.h#7 integrate .. //depot/projects/ia64/tools/regression/sockets/unix_sendtorace/Makefile#1 branch .. //depot/projects/ia64/tools/regression/sockets/unix_sendtorace/unix_sendtorace.c#1 branch .. //depot/projects/ia64/tools/regression/sysvmsg/msgtest.c#2 integrate .. //depot/projects/ia64/tools/tools/nanobsd/FlashDevice.sub#7 integrate .. //depot/projects/ia64/usr.sbin/Makefile#81 integrate .. //depot/projects/ia64/usr.sbin/kbdcontrol/kbdcontrol.1#8 integrate .. //depot/projects/ia64/usr.sbin/kbdcontrol/kbdcontrol.c#9 integrate .. //depot/projects/ia64/usr.sbin/route6d/route6d.c#7 integrate .. //depot/projects/ia64/usr.sbin/sysinstall/config.c#30 integrate .. //depot/projects/ia64/usr.sbin/wpa/Makefile#3 integrate .. //depot/projects/ia64/usr.sbin/wpa/wpa_passphrase/Makefile#1 branch .. //depot/projects/ia64/usr.sbin/wpa/wpa_passphrase/wpa_passphrase.8#1 branch .. //depot/projects/ia64/usr.sbin/wpa/wpa_supplicant/wpa_supplicant.conf.5#5 integrate Differences ... ==== //depot/projects/ia64/ObsoleteFiles.inc#13 (text+ko) ==== @@ -1,5 +1,5 @@ # -# $FreeBSD: src/ObsoleteFiles.inc,v 1.59 2006/11/08 03:23:49 marcel Exp $ +# $FreeBSD: src/ObsoleteFiles.inc,v 1.61 2006/11/16 22:34:17 brueffer Exp $ # # This file lists old files (OLD_FILES), libraries (OLD_LIBS) and # directories (OLD_DIRS) which should get removed at an update. Recently @@ -14,6 +14,8 @@ # The file is partitioned: OLD_FILES first, then OLD_LIBS and OLD_DIRS last. # +# 20061116: uhidev.4 removed +OLD_FILES+=usr/share/man/man4/uhidev.4.gz .if ${TARGET_ARCH} == "ia64" # 20061104: skiload.help removed OLD_FILES+=boot/skiload.help @@ -708,6 +710,8 @@ OLD_FILES+=usr/sbin/pim6stat OLD_FILES+=usr/sbin/pim6sd OLD_FILES+=usr/sbin/pim6dd +# 20010217 +OLD_FILES+=usr/share/doc/bind/misc/dns-setup # 20001200 OLD_FILES+=usr/lib/libgcc_r_pic.a # 200009XX ==== //depot/projects/ia64/UPDATING#92 (text+ko) ==== @@ -20,6 +20,14 @@ in userland, and various verbose features in the kernel. Many developers choose to disable these features on build machines to maximize performance. + +20061113: + Support for PCI Message Signalled Interrupts on i386 and amd64 + has been added to the kernel and various drivers will soon be + updated to use MSI when it is available. If there are any problems, + MSI can be disabled completely by setting the 'hw.pci.enable_msi' + and 'hw.pci.enable_msix' tunables to 0 in the loader. + 20061110: The MUTEX_PROFILING option has been renamed to LOCK_PROFILING. The lockmgr object layout has been changed as a result of having @@ -645,4 +653,4 @@ Contact Warner Losh if you have any questions about your use of this document. -$FreeBSD: src/UPDATING,v 1.463 2006/11/11 03:18:06 kmacy Exp $ +$FreeBSD: src/UPDATING,v 1.464 2006/11/15 20:02:20 jhb Exp $ ==== //depot/projects/ia64/lib/libarchive/archive.h.in#10 (text+ko) ==== @@ -23,7 +23,7 @@ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * - * $FreeBSD: src/lib/libarchive/archive.h.in,v 1.31 2006/09/05 05:59:45 kientzle Exp $ + * $FreeBSD: src/lib/libarchive/archive.h.in,v 1.32 2006/11/15 05:33:38 kientzle Exp $ */ #ifndef ARCHIVE_H_INCLUDED @@ -46,8 +46,8 @@ /* * If ARCHIVE_API_VERSION != archive_api_version(), then the library you - * were linked with is using an incompatible API. This is almost - * certainly a fatal problem. + * were linked with is using an incompatible API to the one you were + * compiled with. This is almost certainly a fatal problem. * * ARCHIVE_API_FEATURE is incremented with each significant feature * addition, so you can test (at compile or run time) if a particular @@ -196,12 +196,17 @@ archive_skip_callback *, archive_close_callback *); /* - * The archive_read_open_file function is a convenience function built - * on archive_read_open that uses a canned callback suitable for - * common situations. Note that a NULL filename indicates stdin. + * A variety of shortcuts that invoke archive_read_open() with + * canned callbacks suitable for common situations. The ones that + * accept a block size handle tape blocking correctly. */ -int archive_read_open_file(struct archive *, const char *_file, - size_t _block_size); +/* Use this if you know the filename. Note: NULL indicates stdin. */ +int archive_read_open_filename(struct archive *, + const char *_filename, size_t _block_size); +/* archive_read_open_file() is a deprecated synonym for ..._open_filename(). */ +int archive_read_open_file(struct archive *, + const char *_filename, size_t _block_size); +/* Read an archive that's already open, using the file descriptor. */ int archive_read_open_fd(struct archive *, int _fd, size_t _block_size); @@ -325,6 +330,8 @@ archive_open_callback *, archive_write_callback *, archive_close_callback *); int archive_write_open_fd(struct archive *, int _fd); +int archive_write_open_filename(struct archive *, const char *_file); +/* A deprecated synonym for archive_write_open_filename() */ int archive_write_open_file(struct archive *, const char *_file); /* ==== //depot/projects/ia64/lib/libarchive/archive_private.h#11 (text+ko) ==== @@ -23,7 +23,7 @@ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * - * $FreeBSD: src/lib/libarchive/archive_private.h,v 1.23 2006/09/05 05:59:45 kientzle Exp $ + * $FreeBSD: src/lib/libarchive/archive_private.h,v 1.24 2006/11/15 05:14:20 kientzle Exp $ */ #ifndef ARCHIVE_PRIVATE_H_INCLUDED @@ -182,7 +182,7 @@ int (*format_finish_entry)(struct archive *); int (*format_write_header)(struct archive *, struct archive_entry *); - int (*format_write_data)(struct archive *, + ssize_t (*format_write_data)(struct archive *, const void *buff, size_t); /* ==== //depot/projects/ia64/lib/libarchive/archive_read_open_file.c#10 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include "archive_platform.h" -__FBSDID("$FreeBSD: src/lib/libarchive/archive_read_open_file.c,v 1.14 2006/11/13 00:29:57 kientzle Exp $"); +__FBSDID("$FreeBSD: src/lib/libarchive/archive_read_open_file.c,v 1.15 2006/11/15 05:33:38 kientzle Exp $"); #ifdef HAVE_SYS_STAT_H #include <sys/stat.h> @@ -65,6 +65,13 @@ archive_read_open_file(struct archive *a, const char *filename, size_t block_size) { + return (archive_read_open_filename(a, filename, block_size)); +} + +int +archive_read_open_filename(struct archive *a, const char *filename, + size_t block_size) +{ struct read_file_data *mine; if (filename == NULL || filename[0] == '\0') { ==== //depot/projects/ia64/lib/libarchive/archive_read_support_format_tar.c#17 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include "archive_platform.h" -__FBSDID("$FreeBSD: src/lib/libarchive/archive_read_support_format_tar.c,v 1.44 2006/11/10 06:39:46 kientzle Exp $"); +__FBSDID("$FreeBSD: src/lib/libarchive/archive_read_support_format_tar.c,v 1.45 2006/11/13 16:50:18 kientzle Exp $"); #ifdef HAVE_SYS_STAT_H #include <sys/stat.h> @@ -497,7 +497,12 @@ if (tar->entry_bytes_remaining > 0) { bytes_read = (a->compression_read_ahead)(a, buff, 1); - if (bytes_read <= 0) + if (bytes_read == 0) { + archive_set_error(a, ARCHIVE_ERRNO_MISC, + "Truncated tar archive"); + return (ARCHIVE_FATAL); + } + if (bytes_read < 0) return (ARCHIVE_FATAL); if (bytes_read > tar->entry_bytes_remaining) bytes_read = tar->entry_bytes_remaining; ==== //depot/projects/ia64/lib/libarchive/archive_write.c#12 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include "archive_platform.h" -__FBSDID("$FreeBSD: src/lib/libarchive/archive_write.c,v 1.20 2006/11/10 06:39:46 kientzle Exp $"); +__FBSDID("$FreeBSD: src/lib/libarchive/archive_write.c,v 1.21 2006/11/15 05:14:20 kientzle Exp $"); /* * This file contains the "essential" portions of the write API, that @@ -271,9 +271,7 @@ int archive_write_data(struct archive *a, const void *buff, size_t s) { - int ret; __archive_check_magic(a, ARCHIVE_WRITE_MAGIC, ARCHIVE_STATE_DATA, "archive_write_data"); archive_string_empty(&a->error_string); - ret = (a->format_write_data)(a, buff, s); - return (ret == ARCHIVE_OK ? (ssize_t)s : -1); + return ((a->format_write_data)(a, buff, s)); } ==== //depot/projects/ia64/lib/libarchive/archive_write_open_file.c#10 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include "archive_platform.h" -__FBSDID("$FreeBSD: src/lib/libarchive/archive_write_open_file.c,v 1.14 2006/11/13 00:29:57 kientzle Exp $"); +__FBSDID("$FreeBSD: src/lib/libarchive/archive_write_open_file.c,v 1.15 2006/11/15 05:33:38 kientzle Exp $"); #ifdef HAVE_SYS_STAT_H #include <sys/stat.h> @@ -60,6 +60,12 @@ int archive_write_open_file(struct archive *a, const char *filename) { + return (archive_write_open_filename(a, filename)); +} + +int +archive_write_open_filename(struct archive *a, const char *filename) +{ struct write_file_data *mine; if (filename == NULL || filename[0] == '\0') { ==== //depot/projects/ia64/lib/libarchive/archive_write_set_format_cpio.c#7 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include "archive_platform.h" -__FBSDID("$FreeBSD: src/lib/libarchive/archive_write_set_format_cpio.c,v 1.7 2006/11/10 06:39:46 kientzle Exp $"); +__FBSDID("$FreeBSD: src/lib/libarchive/archive_write_set_format_cpio.c,v 1.8 2006/11/15 05:14:20 kientzle Exp $"); #ifdef HAVE_SYS_STAT_H #include <sys/stat.h> @@ -45,7 +45,7 @@ #include "archive_entry.h" #include "archive_private.h" -static int archive_write_cpio_data(struct archive *, const void *buff, +static ssize_t archive_write_cpio_data(struct archive *, const void *buff, size_t s); static int archive_write_cpio_finish(struct archive *); static int archive_write_cpio_finish_entry(struct archive *); @@ -167,7 +167,7 @@ return (ret); } -static int +static ssize_t archive_write_cpio_data(struct archive *a, const void *buff, size_t s) { struct cpio *cpio; @@ -179,7 +179,10 @@ ret = (a->compression_write)(a, buff, s); cpio->entry_bytes_remaining -= s; - return (ret); + if (ret >= 0) + return (s); + else + return (ret); } /* ==== //depot/projects/ia64/lib/libarchive/archive_write_set_format_pax.c#15 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include "archive_platform.h" -__FBSDID("$FreeBSD: src/lib/libarchive/archive_write_set_format_pax.c,v 1.35 2006/11/10 06:39:46 kientzle Exp $"); +__FBSDID("$FreeBSD: src/lib/libarchive/archive_write_set_format_pax.c,v 1.36 2006/11/15 05:14:20 kientzle Exp $"); #ifdef HAVE_SYS_STAT_H #include <sys/stat.h> @@ -70,7 +70,7 @@ unsigned long nanos); static void add_pax_attr_w(struct archive_string *, const char *key, const wchar_t *wvalue); -static int archive_write_pax_data(struct archive *, +static ssize_t archive_write_pax_data(struct archive *, const void *, size_t); static int archive_write_pax_finish(struct archive *); static int archive_write_pax_finish_entry(struct archive *); @@ -1081,7 +1081,7 @@ return (ARCHIVE_OK); } -static int +static ssize_t archive_write_pax_data(struct archive *a, const void *buff, size_t s) { struct pax *pax; @@ -1094,7 +1094,10 @@ ret = (a->compression_write)(a, buff, s); pax->entry_bytes_remaining -= s; - return (ret); + if (ret == ARCHIVE_OK) + return (s); + else + return (ret); } static int ==== //depot/projects/ia64/lib/libarchive/archive_write_set_format_shar.c#7 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include "archive_platform.h" -__FBSDID("$FreeBSD: src/lib/libarchive/archive_write_set_format_shar.c,v 1.12 2006/11/10 06:39:46 kientzle Exp $"); +__FBSDID("$FreeBSD: src/lib/libarchive/archive_write_set_format_shar.c,v 1.14 2006/11/15 05:20:14 kientzle Exp $"); #ifdef HAVE_SYS_STAT_H #include <sys/stat.h> @@ -64,9 +64,9 @@ static int archive_write_shar_finish(struct archive *); static int archive_write_shar_header(struct archive *, struct archive_entry *); -static int archive_write_shar_data_sed(struct archive *, +static ssize_t archive_write_shar_data_sed(struct archive *, const void * buff, size_t); -static int archive_write_shar_data_uuencode(struct archive *, +static ssize_t archive_write_shar_data_uuencode(struct archive *, const void * buff, size_t); static int archive_write_shar_finish_entry(struct archive *); static int shar_printf(struct archive *, const char *fmt, ...); @@ -323,12 +323,13 @@ } /* XXX TODO: This could be more efficient XXX */ -static int +static ssize_t archive_write_shar_data_sed(struct archive *a, const void *buff, size_t n) { struct shar *shar; const char *src; int ret; + size_t written = n; shar = (struct shar *)a->format_data; if (!shar->has_data) @@ -357,7 +358,9 @@ if (shar->outpos > 0) ret = (a->compression_write)(a, shar->outbuff, shar->outpos); - return (ret); + if (ret != ARCHIVE_OK) + return (ret); + return (written); } #define UUENC(c) (((c)!=0) ? ((c) & 077) + ' ': '`') @@ -384,7 +387,7 @@ shar->outbuff[shar->outpos] = 0; } -static int +static ssize_t archive_write_shar_data_uuencode(struct archive *a, const void *buff, size_t length) { @@ -413,7 +416,7 @@ shar->uubuffer[shar->uuavail++] = *src++; shar->outbytes++; } - return (ARCHIVE_OK); + return (length); } static int ==== //depot/projects/ia64/lib/libarchive/archive_write_set_format_ustar.c#8 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include "archive_platform.h" -__FBSDID("$FreeBSD: src/lib/libarchive/archive_write_set_format_ustar.c,v 1.15 2006/11/10 06:39:46 kientzle Exp $"); +__FBSDID("$FreeBSD: src/lib/libarchive/archive_write_set_format_ustar.c,v 1.16 2006/11/15 05:14:20 kientzle Exp $"); #ifdef HAVE_SYS_STAT_H #include <sys/stat.h> @@ -113,7 +113,7 @@ { "" } /* padding */ }; -static int archive_write_ustar_data(struct archive *a, const void *buff, +static ssize_t archive_write_ustar_data(struct archive *a, const void *buff, size_t s); static int archive_write_ustar_finish(struct archive *); static int archive_write_ustar_finish_entry(struct archive *); @@ -493,7 +493,7 @@ return (ARCHIVE_OK); } -static int +static ssize_t archive_write_ustar_data(struct archive *a, const void *buff, size_t s) { struct ustar *ustar; @@ -504,5 +504,7 @@ s = ustar->entry_bytes_remaining; ret = (a->compression_write)(a, buff, s); ustar->entry_bytes_remaining -= s; - return (ret); + if (ret != ARCHIVE_OK) + return (ret); + return (s); } ==== //depot/projects/ia64/release/Makefile#101 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/release/Makefile,v 1.917 2006/11/11 23:18:28 ru Exp $ +# $FreeBSD: src/release/Makefile,v 1.918 2006/11/16 23:09:35 kensmith Exp $ # # make release [BUILDNAME=somename] CHROOTDIR=/some/dir CVSROOT=/cvs/dir \ # [RELEASETAG=tag] @@ -257,6 +257,9 @@ CD_BOOT= ${CD}/bootonly CD_DISC1= ${CD}/disc1 CD_DISC2= ${CD}/disc2 +.if !defined(NODOC) +CD_DOCS= ${CD}/docs +.endif .if defined(SEPARATE_LIVEFS) CD_LIVEFS= ${CD}/livefs .else @@ -982,12 +985,15 @@ @echo "CD_VERSION = ${BUILDNAME}" > ${CD_DISC2}/cdrom.inf @echo "CD_VOLUME = 2" >> ${CD_DISC2}/cdrom.inf .if !defined(NODOC) - @mkdir -p ${CD_DISC2}/usr/share/doc + echo "Building CDROM docs filesystem image" + @mkdir -p ${CD_DOCS} + @echo "CD_VERSION = ${BUILDNAME}" > ${CD_DOCS}/cdrom.inf + @mkdir -p ${CD_DOCS}/usr/share/doc @for i in `ls ${CD_LIVEFS}/usr/share/doc`; do \ if [ -L ${CD_LIVEFS}/usr/share/doc/$$i -o \ -d /usr/doc/$$i ]; then \ mv ${CD_LIVEFS}/usr/share/doc/$$i \ - ${CD_DISC2}/usr/share/doc; \ + ${CD_DOCS}/usr/share/doc; \ fi \ done .endif @@ -1039,6 +1045,11 @@ FreeBSD_Packages \ ${CD}/${BUILDNAME}-${TARGET}-disc2.iso ${CD_DISC2} \ ${CD_DISC2_PKGS} +.if !defined(NODOC) + @sh ${.CURDIR}/${TARGET_ARCH}/mkisoimages.sh \ + FreeBSD_Documentation \ + ${CD}/${BUILDNAME}-${TARGET}-docs.iso ${CD_DOCS} +.endif .if defined(SEPARATE_LIVEFS) @sh ${.CURDIR}/${TARGET_ARCH}/mkisoimages.sh ${BOOTABLE} \ FreeBSD_LiveFS \ ==== //depot/projects/ia64/release/doc/en_US.ISO8859-1/relnotes/common/new.sgml#167 (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.987 2006/11/13 01:44:20 bmah Exp $</pubdate> + <pubdate>$FreeBSD: src/release/doc/en_US.ISO8859-1/relnotes/common/new.sgml,v 1.990 2006/11/17 20:15:26 bmah Exp $</pubdate> <copyright> <year>2000</year> @@ -1519,6 +1519,11 @@ <para>The &man.snapinfo.8; utility, which shows snapshot locations on UFS filesystems, has been added. &merged;</para> + <para>The &man.sockstat.1; utility, which shows connected and + listening network sockets, now supports a new <option>-P</option> + command-line option, which can be used to filter displayed sockets + by protocol name (as listed in &man.protocols.5;).</para> + <para>The &man.strtonum.3; library function has been implemented based on OpenBSD's implementation. This is an improved version of &man.strtoll.3;. &merged;</para> @@ -1538,6 +1543,11 @@ <para>The &man.time.1; utility now prints the time that a given command has been running if sent a <literal>SIGINFO</literal> signal.</para> + <para>The &man.traceroute.8; program now supports + a <option>-D</option> flag, which causes it to display the + differences between the sent and received + packets. &merged;</para> + <para>The &man.traceroute.8; utility now supports a <option>-e</option> option, which sets a fixed destination port for probe packets. This can be useful for tracing behind @@ -1914,7 +1924,11 @@ <para>The supported version of the <application>GNOME</application> desktop environment (<filename role="package">x11/gnome2</filename>) has been - updated from 2.10.2 to 2.16.1. &merged;</para> + updated from 2.10.2 to 2.16.1. As a part of this update, the + default prefix for <application>GNOME</application> (and some + related programs) has moved from + <filename>/usr/X11R6</filename> + to <filename>/usr/local</filename>. &merged;</para> <para>The supported version of the <application>KDE</application> desktop environment ==== //depot/projects/ia64/release/scripts/package-split.py#9 (text+ko) ==== @@ -7,7 +7,7 @@ # # Usage: package-split.py <INDEX> <master INDEX> # -# $FreeBSD: src/release/scripts/package-split.py,v 1.13 2006/10/17 13:50:22 bmah Exp $ +# $FreeBSD: src/release/scripts/package-split.py,v 1.16 2006/11/17 05:10:41 kensmith Exp $ import os import sys @@ -31,10 +31,8 @@ pkgs.extend(['x11/xorg', 'x11/xorg-manpages', 'devel/imake-6']) - if arch == 'alpha': - pkgs.append('emulators/osf1_base') - elif arch == 'i386': - pkgs.append('emulators/linux_base-8') + if arch == 'i386': + pkgs.append('emulators/linux_base-fc4') return pkgs # List of packages for disc2. This includes packages that the X desktop @@ -56,7 +54,7 @@ 'astro/xearth', 'devel/gmake', 'editors/emacs', - 'editors/vim', + 'editors/vim-lite', 'emulators/mtools', 'graphics/png', 'graphics/xv', ==== //depot/projects/ia64/sbin/mount/mount.c#30 (text+ko) ==== @@ -38,7 +38,7 @@ static char sccsid[] = "@(#)mount.c 8.25 (Berkeley) 5/8/95"; #endif static const char rcsid[] = - "$FreeBSD: src/sbin/mount/mount.c,v 1.91 2006/10/31 21:54:51 pjd Exp $"; + "$FreeBSD: src/sbin/mount/mount.c,v 1.92 2006/11/14 01:07:42 rodrigc Exp $"; #endif /* not lint */ #include <sys/param.h> @@ -530,7 +530,10 @@ argv[argc] = NULL; if (debug) { - (void)printf("exec: mount_%s", vfstype); + if (use_mountprog(vfstype)) + printf("exec: mount_%s", vfstype); + else + printf("mount -t %s", vfstype); for (i = 1; i < argc; i++) (void)printf(" %s", argv[i]); (void)printf("\n"); ==== //depot/projects/ia64/share/man/man4/Makefile#98 (text+ko) ==== @@ -1,5 +1,5 @@ # @(#)Makefile 8.1 (Berkeley) 6/18/93 -# $FreeBSD: src/share/man/man4/Makefile,v 1.365 2006/10/08 17:05:15 ceri Exp $ +# $FreeBSD: src/share/man/man4/Makefile,v 1.367 2006/11/16 22:32:26 brueffer Exp $ MAN= aac.4 \ acpi.4 \ @@ -349,6 +349,7 @@ twe.4 \ tx.4 \ txp.4 \ + uark.4 \ uart.4 \ ubsa.4 \ ubsec.4 \ @@ -365,7 +366,6 @@ ugen.4 \ uhci.4 \ uhid.4 \ - uhidev.4 \ ukbd.4 \ ulpt.4 \ umass.4 \ ==== //depot/projects/ia64/share/man/man4/ucom.4#7 (text+ko) ==== @@ -34,16 +34,28 @@ .\" ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE .\" POSSIBILITY OF SUCH DAMAGE. .\" -.\" $FreeBSD: src/share/man/man4/ucom.4,v 1.6 2005/04/17 16:08:51 simon Exp $ +.\" $FreeBSD: src/share/man/man4/ucom.4,v 1.7 2006/11/18 08:07:43 brueffer Exp $ .\" -.Dd November 25, 1999 +.Dd November 18, 2006 .Dt UCOM 4 .Os .Sh NAME .Nm ucom .Nd USB tty support .Sh SYNOPSIS +To compile this driver into the kernel, +place the following line in your +kernel configuration file: +.Bd -ragged -offset indent .Cd "device ucom" +.Ed +.Pp +Alternatively, to load the driver as a +module at boot time, place the following line in +.Xr loader.conf 5 : +.Bd -literal -offset indent +ucom_load="YES" +.Ed .Sh DESCRIPTION The .Nm @@ -69,6 +81,7 @@ .El .Sh SEE ALSO .Xr tty 4 , +.Xr uark 4 , .Xr uftdi 4 , .Xr umct 4 , .Xr umodem 4 , ==== //depot/projects/ia64/share/man/man4/uhid.4#6 (text+ko) ==== @@ -34,9 +34,9 @@ .\" ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE .\" POSSIBILITY OF SUCH DAMAGE. .\" -.\" $FreeBSD: src/share/man/man4/uhid.4,v 1.5 2005/08/04 21:26:38 brueffer Exp $ +.\" $FreeBSD: src/share/man/man4/uhid.4,v 1.6 2006/11/16 22:32:27 brueffer Exp $ .\" -.Dd July 12, 1998 +.Dd November 16, 2006 .Dt UHID 4 .Os .Sh NAME @@ -128,7 +128,6 @@ .El .Sh SEE ALSO .Xr usbhidctl 1 , -.Xr uhidev 4 , .Xr usb 4 .Sh HISTORY The ==== //depot/projects/ia64/share/man/man9/p_candebug.9#3 (text+ko) ==== @@ -25,15 +25,16 @@ .\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF .\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. .\" -.\" $FreeBSD: src/share/man/man9/p_candebug.9,v 1.3 2004/07/06 07:26:23 ru Exp $ +.\" $FreeBSD: src/share/man/man9/p_candebug.9,v 1.4 2006/11/18 17:56:59 ceri Exp $ .\" -.Dd November 11, 2003 +.Dd November 18, 2006 .Os .Dt P_CANDEBUG 9 .Sh NAME .Nm p_candebug .Nd determine debuggability of a process .Sh SYNOPSIS +.In sys/param.h .In sys/proc.h .Ft int .Fn p_candebug "struct thread *td" "struct proc *p" ==== //depot/projects/ia64/share/man/man9/sleepqueue.9#7 (text+ko) ==== @@ -21,7 +21,7 @@ .\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF .\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. .\" -.\" $FreeBSD: src/share/man/man9/sleepqueue.9,v 1.12 2005/04/19 16:30:25 jkoshy Exp $ +.\" $FreeBSD: src/share/man/man9/sleepqueue.9,v 1.13 2006/11/16 01:02:00 pjd Exp $ .\" .Dd March 10, 2004 .Dt SLEEPQUEUE 9 @@ -54,7 +54,7 @@ .Ft void .Fn sleepq_abort "struct thread *td" .Ft void -.Fn sleepq_add "void *wchan" "struct mtx *lock" "const char *wmesg" "int flags" +.Fn sleepq_add "void *wchan" "struct lock_object *lock" "const char *wmesg" "int flags" .Ft struct sleepqueue * .Fn sleepq_alloc "void" .Ft void @@ -157,12 +157,12 @@ must be locked by a prior call to .Fn sleepq_lock when this function is called. -If a mutex is specified via the +If a lock is specified via the .Fa lock argument, and if the kernel was compiled with .Cd "options INVARIANTS" , then the sleep queue code will perform extra checks to ensure that -the mutex is used by all threads sleeping on +the lock is used by all threads sleeping on .Fa wchan . The .Fa wmesg ==== //depot/projects/ia64/sys/amd64/amd64/db_disasm.c#5 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/sys/amd64/amd64/db_disasm.c,v 1.30 2005/03/30 22:57:41 peter Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/amd64/db_disasm.c,v 1.31 2006/11/13 21:14:54 jhb Exp $"); /* * Instruction disassembler. @@ -84,6 +84,7 @@ #define Ib 21 /* byte immediate, unsigned */ #define Ibs 22 /* byte immediate, signed */ #define Iw 23 /* word immediate, unsigned */ +#define Ilq 24 /* long/quad immediate, unsigned */ #define O 25 /* direct address */ #define Db 26 /* byte displacement from EIP */ #define Dl 27 /* long displacement from EIP */ @@ -351,7 +352,6 @@ 0, 0, 0, - 0, db_inst_0f8x, db_inst_0f9x, db_inst_0fax, @@ -752,14 +752,14 @@ /*b6*/ { "mov", FALSE, BYTE, op2(I, Ri), 0 }, /*b7*/ { "mov", FALSE, BYTE, op2(I, Ri), 0 }, -/*b8*/ { "mov", FALSE, LONG, op2(I, Ri), 0 }, -/*b9*/ { "mov", FALSE, LONG, op2(I, Ri), 0 }, -/*ba*/ { "mov", FALSE, LONG, op2(I, Ri), 0 }, -/*bb*/ { "mov", FALSE, LONG, op2(I, Ri), 0 }, -/*bc*/ { "mov", FALSE, LONG, op2(I, Ri), 0 }, -/*bd*/ { "mov", FALSE, LONG, op2(I, Ri), 0 }, -/*be*/ { "mov", FALSE, LONG, op2(I, Ri), 0 }, -/*bf*/ { "mov", FALSE, LONG, op2(I, Ri), 0 }, +/*b8*/ { "mov", FALSE, LONG, op2(Ilq, Ri), 0 }, +/*b9*/ { "mov", FALSE, LONG, op2(Ilq, Ri), 0 }, +/*ba*/ { "mov", FALSE, LONG, op2(Ilq, Ri), 0 }, +/*bb*/ { "mov", FALSE, LONG, op2(Ilq, Ri), 0 }, +/*bc*/ { "mov", FALSE, LONG, op2(Ilq, Ri), 0 }, +/*bd*/ { "mov", FALSE, LONG, op2(Ilq, Ri), 0 }, +/*be*/ { "mov", FALSE, LONG, op2(Ilq, Ri), 0 }, +/*bf*/ { "mov", FALSE, LONG, op2(Ilq, Ri), 0 }, /*c0*/ { "", TRUE, BYTE, op2(Ib, E), db_Grp2 }, /*c1*/ { "", TRUE, LONG, op2(Ib, E), db_Grp2 }, @@ -854,17 +854,6 @@ int ss; }; -static const char * const db_index_reg_16[8] = { - "%bx,%si", - "%bx,%di", - "%bp,%si", - "%bp,%di", - "%si", - "%di", - "%bp", - "%bx" -}; - static const char * const db_reg[2][4][16] = { {{"%al", "%cl", "%dl", "%bl", "%ah", "%ch", "%dh", "%bh", @@ -927,7 +916,7 @@ int regmodrm; struct i_addr * addrp; /* out */ { - int mod, rm, sib, index, disp; + int mod, rm, sib, index, disp, size, have_sib; mod = f_mod(rex, regmodrm); rm = f_rm(rex, regmodrm); @@ -940,68 +929,49 @@ addrp->is_reg = FALSE; addrp->index = 0; - if (short_addr) { - addrp->index = 0; - addrp->ss = 0; - switch (mod) { >>> TRUNCATED FOR MAIL (1000 lines) <<<
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200611211708.kALH8fl8065091>