Date: Thu, 28 Jun 2007 21:03:52 GMT From: Matt Jacob <mjacob@FreeBSD.org> To: Perforce Change Reviews <perforce@freebsd.org> Subject: PERFORCE change 122499 for review Message-ID: <200706282103.l5SL3qBj081322@repoman.freebsd.org>
next in thread | raw e-mail | index | archive | help
http://perforce.freebsd.org/chv.cgi?CH=122499 Change 122499 by mjacob@mjexp on 2007/06/28 21:03:32 IFC Affected files ... .. //depot/projects/mjexp/ObsoleteFiles.inc#19 integrate .. //depot/projects/mjexp/contrib/ipfilter/tools/ipfstat.c#3 integrate .. //depot/projects/mjexp/contrib/less/main.c#4 integrate .. //depot/projects/mjexp/contrib/less/screen.c#4 integrate .. //depot/projects/mjexp/etc/mtree/BSD.include.dist#9 integrate .. //depot/projects/mjexp/include/Makefile#8 integrate .. //depot/projects/mjexp/lib/libarchive/Makefile#12 integrate .. //depot/projects/mjexp/lib/libarchive/archive.h.in#13 integrate .. //depot/projects/mjexp/lib/libarchive/archive_read_open_fd.c#6 integrate .. //depot/projects/mjexp/lib/libarchive/archive_read_open_file.c#5 integrate .. //depot/projects/mjexp/lib/libarchive/archive_read_open_filename.c#5 integrate .. //depot/projects/mjexp/lib/libarchive/archive_write_set_format.c#4 integrate .. //depot/projects/mjexp/lib/libarchive/archive_write_set_format_by_name.c#5 integrate .. //depot/projects/mjexp/lib/libarchive/archive_write_set_format_cpio_newc.c#1 branch .. //depot/projects/mjexp/lib/libarchive/test/Makefile#7 integrate .. //depot/projects/mjexp/lib/libarchive/test/test_write_format_cpio.c#1 branch .. //depot/projects/mjexp/lib/libc/arm/sys/sbrk.S#2 integrate .. //depot/projects/mjexp/lib/libc/net/sctp_sys_calls.c#6 integrate .. //depot/projects/mjexp/release/scripts/src-install.sh#2 integrate .. //depot/projects/mjexp/rescue/rescue/Makefile#4 integrate .. //depot/projects/mjexp/sbin/Makefile#6 integrate .. //depot/projects/mjexp/sbin/mount/mount.8#2 integrate .. //depot/projects/mjexp/sbin/mount/mount.c#7 integrate .. //depot/projects/mjexp/sbin/mount_umapfs/Makefile#2 delete .. //depot/projects/mjexp/sbin/mount_umapfs/mount_umapfs.8#2 delete .. //depot/projects/mjexp/sbin/mount_umapfs/mount_umapfs.c#2 delete .. //depot/projects/mjexp/sbin/mount_umapfs/sample.group.mapfile#2 delete .. //depot/projects/mjexp/sbin/mount_umapfs/sample.user.mapfile#2 delete .. //depot/projects/mjexp/sbin/mount_umapfs/umap_manual#2 delete .. //depot/projects/mjexp/share/Makefile#2 integrate .. //depot/projects/mjexp/share/man/man4/bce.4#6 integrate .. //depot/projects/mjexp/share/man/man4/mac.4#2 integrate .. //depot/projects/mjexp/share/man/man4/pcm.4#6 integrate .. //depot/projects/mjexp/share/man/man4/tty.4#2 integrate .. //depot/projects/mjexp/share/man/man7/hier.7#8 integrate .. //depot/projects/mjexp/share/man/man9/priv.9#5 integrate .. //depot/projects/mjexp/share/man/man9/suser.9#4 integrate .. //depot/projects/mjexp/share/misc/committers-src.dot#6 integrate .. //depot/projects/mjexp/share/mk/bsd.own.mk#8 integrate .. //depot/projects/mjexp/share/mk/sys.mk#3 integrate .. //depot/projects/mjexp/sys/cam/scsi/scsi_da.c#15 integrate .. //depot/projects/mjexp/sys/conf/NOTES#27 integrate .. //depot/projects/mjexp/sys/contrib/opensolaris/uts/common/fs/zfs/zfs_vfsops.c#7 integrate .. //depot/projects/mjexp/sys/dev/ata/ata-all.h#7 integrate .. //depot/projects/mjexp/sys/dev/ata/ata-disk.c#6 integrate .. //depot/projects/mjexp/sys/dev/isp/isp_pci.c#31 integrate .. //depot/projects/mjexp/sys/dev/iwi/if_iwi.c#12 integrate .. //depot/projects/mjexp/sys/dev/rp/rp.c#3 integrate .. //depot/projects/mjexp/sys/dev/usb/if_ural.c#15 integrate .. //depot/projects/mjexp/sys/dev/usb/ugen.c#3 integrate .. //depot/projects/mjexp/sys/dev/usb/umodem.c#5 integrate .. //depot/projects/mjexp/sys/dev/usb/usbdevs#15 integrate .. //depot/projects/mjexp/sys/fs/tmpfs/tmpfs.h#2 integrate .. //depot/projects/mjexp/sys/fs/tmpfs/tmpfs_fifoops.c#2 integrate .. //depot/projects/mjexp/sys/fs/tmpfs/tmpfs_fifoops.h#2 integrate .. //depot/projects/mjexp/sys/fs/tmpfs/tmpfs_subr.c#2 integrate .. //depot/projects/mjexp/sys/fs/tmpfs/tmpfs_uma.c#2 integrate .. //depot/projects/mjexp/sys/fs/tmpfs/tmpfs_uma.h#2 integrate .. //depot/projects/mjexp/sys/fs/tmpfs/tmpfs_vfsops.c#2 integrate .. //depot/projects/mjexp/sys/fs/tmpfs/tmpfs_vnops.c#2 integrate .. //depot/projects/mjexp/sys/fs/tmpfs/tmpfs_vnops.h#2 integrate .. //depot/projects/mjexp/sys/kern/kern_malloc.c#8 integrate .. //depot/projects/mjexp/sys/kern/kern_rwlock.c#10 integrate .. //depot/projects/mjexp/sys/kern/kern_timeout.c#4 integrate .. //depot/projects/mjexp/sys/net/if_gre.c#3 integrate .. //depot/projects/mjexp/sys/netatalk/aarp.h#3 integrate .. //depot/projects/mjexp/sys/netatalk/ddp.h#3 integrate .. //depot/projects/mjexp/sys/netinet/sctputil.c#18 integrate .. //depot/projects/mjexp/sys/security/audit/audit.h#6 integrate .. //depot/projects/mjexp/sys/security/audit/audit_arg.c#10 integrate .. //depot/projects/mjexp/sys/security/audit/audit_bsm.c#6 integrate .. //depot/projects/mjexp/sys/security/audit/audit_bsm_token.c#6 integrate .. //depot/projects/mjexp/sys/security/audit/audit_syscalls.c#11 integrate .. //depot/projects/mjexp/sys/security/mac/mac_audit.c#2 integrate .. //depot/projects/mjexp/sys/security/mac/mac_framework.h#7 integrate .. //depot/projects/mjexp/sys/security/mac/mac_policy.h#4 integrate .. //depot/projects/mjexp/sys/security/mac_stub/mac_stub.c#7 integrate .. //depot/projects/mjexp/sys/security/mac_test/mac_test.c#7 integrate .. //depot/projects/mjexp/sys/sys/_rwlock.h#3 integrate .. //depot/projects/mjexp/sys/sys/rwlock.h#7 integrate .. //depot/projects/mjexp/sys/vm/vm_pageout.c#10 integrate .. //depot/projects/mjexp/tools/regression/fsx/fsx.c#2 integrate .. //depot/projects/mjexp/tools/regression/lib/libc/nss/test-gethostby.c#2 integrate .. //depot/projects/mjexp/tools/regression/lib/libc/nss/test-gethostby.t#2 integrate .. //depot/projects/mjexp/tools/regression/tmpfs/Makefile#2 integrate .. //depot/projects/mjexp/tools/regression/tmpfs/t_id_gen#2 delete .. //depot/projects/mjexp/tools/tools/tinybsd/conf/bridge/tinybsd.basefiles#3 integrate .. //depot/projects/mjexp/tools/tools/tinybsd/conf/default/tinybsd.basefiles#3 integrate .. //depot/projects/mjexp/tools/tools/tinybsd/conf/firewall/tinybsd.basefiles#3 integrate .. //depot/projects/mjexp/tools/tools/tinybsd/conf/minimal/tinybsd.basefiles#3 integrate .. //depot/projects/mjexp/tools/tools/tinybsd/conf/vpn/tinybsd.basefiles#3 integrate .. //depot/projects/mjexp/tools/tools/tinybsd/conf/wireless/tinybsd.basefiles#3 integrate .. //depot/projects/mjexp/tools/tools/tinybsd/conf/wrap/tinybsd.basefiles#3 integrate .. //depot/projects/mjexp/usr.bin/calendar/calendars/calendar.freebsd#14 integrate .. //depot/projects/mjexp/usr.bin/truss/amd64-fbsd.c#3 integrate .. //depot/projects/mjexp/usr.bin/truss/i386-fbsd.c#3 integrate .. //depot/projects/mjexp/usr.bin/truss/i386-linux.c#3 integrate .. //depot/projects/mjexp/usr.bin/truss/ia64-fbsd.c#3 integrate .. //depot/projects/mjexp/usr.bin/truss/main.c#3 integrate .. //depot/projects/mjexp/usr.bin/truss/powerpc-fbsd.c#3 integrate .. //depot/projects/mjexp/usr.bin/truss/setup.c#3 integrate .. //depot/projects/mjexp/usr.bin/truss/sparc64-fbsd.c#3 integrate .. //depot/projects/mjexp/usr.sbin/periodic/periodic.8#2 integrate .. //depot/projects/mjexp/usr.sbin/periodic/periodic.sh#2 integrate .. //depot/projects/mjexp/usr.sbin/sysinstall/dist.c#5 integrate .. //depot/projects/mjexp/usr.sbin/sysinstall/dist.h#2 integrate .. //depot/projects/mjexp/usr.sbin/sysinstall/help/distributions.hlp#2 integrate .. //depot/projects/mjexp/usr.sbin/sysinstall/help/fixit.hlp#2 integrate .. //depot/projects/mjexp/usr.sbin/sysinstall/help/media.hlp#2 integrate .. //depot/projects/mjexp/usr.sbin/sysinstall/help/network_device.hlp#2 integrate .. //depot/projects/mjexp/usr.sbin/sysinstall/help/options.hlp#2 integrate .. //depot/projects/mjexp/usr.sbin/sysinstall/help/securelevel.hlp#2 integrate .. //depot/projects/mjexp/usr.sbin/sysinstall/help/shortcuts.hlp#2 integrate .. //depot/projects/mjexp/usr.sbin/sysinstall/index.c#7 integrate .. //depot/projects/mjexp/usr.sbin/sysinstall/install.c#4 integrate .. //depot/projects/mjexp/usr.sbin/sysinstall/menus.c#5 integrate .. //depot/projects/mjexp/usr.sbin/sysinstall/sysinstall.8#3 integrate .. //depot/projects/mjexp/usr.sbin/sysinstall/sysinstall.h#3 integrate .. //depot/projects/mjexp/usr.sbin/sysinstall/system.c#3 integrate Differences ... ==== //depot/projects/mjexp/ObsoleteFiles.inc#19 (text+ko) ==== @@ -1,5 +1,5 @@ # -# $FreeBSD: src/ObsoleteFiles.inc,v 1.96 2007/06/18 18:50:59 rafan Exp $ +# $FreeBSD: src/ObsoleteFiles.inc,v 1.97 2007/06/25 05:06:52 rafan 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,12 @@ # The file is partitioned: OLD_FILES first, then OLD_LIBS and OLD_DIRS last. # +# 20070625: umapfs removal +OLD_FILES+=rescue/mount_umapfs +OLD_FILES+=sbin/mount_umapfs +OLD_FILES+=usr/include/fs/umapfs/umap.h +OLD_FILES+=usr/share/man/man8/mount_umapfs.8.gz +OLD_DIRS+=usr/include/fs/umapfs # 20070618: shared library version bump OLD_LIBS+=lib/libalias.so.5 OLD_LIBS+=lib/libbsnmp.so.3 ==== //depot/projects/mjexp/contrib/ipfilter/tools/ipfstat.c#3 (text+ko) ==== @@ -1,4 +1,4 @@ -/* $FreeBSD: src/contrib/ipfilter/tools/ipfstat.c,v 1.5 2007/06/04 02:54:34 darrenr Exp $ */ +/* $FreeBSD: src/contrib/ipfilter/tools/ipfstat.c,v 1.6 2007/06/24 16:39:12 darrenr Exp $ */ /* * Copyright (C) 2002-2006 by Darren Reed. @@ -1811,7 +1811,7 @@ *port = -1; } else if (!sscanf(comma + 1, "%d", port) || (*port < 0) || (*port > 65535)) { - fprintf(stderr, "Invalid port specfication in %s\n", + fprintf(stderr, "Invalid port specification in %s\n", argument); free(s); exit(-2); @@ -1823,6 +1823,7 @@ /* get ip address */ if (!strcasecmp(s, "any")) { ip->in4.s_addr = INADDR_ANY; + ok = 1; #ifdef USE_INET6 ip->in6 = in6addr_any; } else if (use_inet6 && inet_pton(AF_INET6, s, &ip->in6)) { ==== //depot/projects/mjexp/contrib/less/main.c#4 (text+ko) ==== @@ -1,4 +1,4 @@ -/* $FreeBSD: src/contrib/less/main.c,v 1.8 2007/06/21 10:39:24 delphij Exp $ */ +/* $FreeBSD: src/contrib/less/main.c,v 1.9 2007/06/23 15:28:00 delphij Exp $ */ /* * Copyright (C) 1984-2007 Mark Nudelman * @@ -59,6 +59,7 @@ extern int missing_cap; extern int know_dumb; extern int quit_if_one_screen; +extern int no_init; extern int pr_type; @@ -165,7 +166,7 @@ } if (less_is_more && get_quit_at_eof()) - quit_if_one_screen = TRUE; + no_init = quit_if_one_screen = TRUE; #if EDITOR editor = lgetenv("VISUAL"); ==== //depot/projects/mjexp/contrib/less/screen.c#4 (text+ko) ==== @@ -1,4 +1,4 @@ -/* $FreeBSD: src/contrib/less/screen.c,v 1.7 2007/06/21 10:44:50 delphij Exp $ */ +/* $FreeBSD: src/contrib/less/screen.c,v 1.8 2007/06/23 15:28:00 delphij Exp $ */ /* * Copyright (C) 1984-2007 Mark Nudelman * @@ -228,8 +228,6 @@ extern int no_back_scroll; extern int swindow; extern int no_init; -extern int quit_at_eof; -extern int less_is_more; extern int no_keypad; extern int sigs; extern int wscroll; @@ -1211,19 +1209,11 @@ if (sc_e_keypad == NULL) sc_e_keypad = ""; - /* - * This loses for terminals with termcap entries with ti/te strings - * that switch to/from an alternate screen, and we're in quit_at_eof - * (eg, more(1)). - */ - if (!quit_at_eof && !less_is_more) { - sc_init = ltgetstr("ti", &sp); - sc_deinit = ltgetstr("te", &sp); - } - + sc_init = ltgetstr("ti", &sp); if (sc_init == NULL) sc_init = ""; + sc_deinit= ltgetstr("te", &sp); if (sc_deinit == NULL) sc_deinit = ""; ==== //depot/projects/mjexp/etc/mtree/BSD.include.dist#9 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/etc/mtree/BSD.include.dist,v 1.114 2007/06/01 18:53:36 ru Exp $ +# $FreeBSD: src/etc/mtree/BSD.include.dist,v 1.115 2007/06/25 05:06:53 rafan Exp $ # # Please see the file src/etc/mtree/README before making changes to this file. # @@ -146,8 +146,6 @@ .. udf .. - umapfs - .. unionfs .. .. ==== //depot/projects/mjexp/include/Makefile#8 (text+ko) ==== @@ -1,5 +1,5 @@ # @(#)Makefile 8.2 (Berkeley) 1/4/94 -# $FreeBSD: src/include/Makefile,v 1.270 2007/04/13 01:39:33 pjd Exp $ +# $FreeBSD: src/include/Makefile,v 1.271 2007/06/25 05:06:53 rafan Exp $ # # Doing a "make install" builds /usr/include. @@ -43,8 +43,7 @@ dev/ic dev/iicbus ${_dev_ieee488} dev/lmc dev/ofw \ dev/pbio ${_dev_powermac_nvram} dev/ppbus dev/smbus dev/speaker dev/usb dev/utopia dev/vkbd dev/wi \ fs/devfs fs/fdescfs fs/fifofs fs/msdosfs fs/ntfs fs/nullfs \ - ${_fs_nwfs} fs/portalfs fs/procfs fs/smbfs fs/udf fs/umapfs \ - fs/unionfs \ + ${_fs_nwfs} fs/portalfs fs/procfs fs/smbfs fs/udf fs/unionfs \ geom/cache geom/concat geom/eli geom/gate geom/journal geom/label \ geom/mirror geom/multipath geom/nop geom/raid3 geom/shsec geom/stripe \ netatm/ipatm netatm/sigpvc netatm/spans netatm/uni \ ==== //depot/projects/mjexp/lib/libarchive/Makefile#12 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/lib/libarchive/Makefile,v 1.72 2007/05/29 01:00:18 kientzle Exp $ +# $FreeBSD: src/lib/libarchive/Makefile,v 1.73 2007/06/22 05:47:00 kientzle Exp $ LIB= archive DPADD= ${LIBBZ2} ${LIBZ} @@ -87,6 +87,7 @@ archive_write_set_format_ar.c \ archive_write_set_format_by_name.c \ archive_write_set_format_cpio.c \ + archive_write_set_format_cpio_newc.c \ archive_write_set_format_pax.c \ archive_write_set_format_shar.c \ archive_write_set_format_ustar.c \ ==== //depot/projects/mjexp/lib/libarchive/archive.h.in#13 (text+ko) ==== @@ -22,7 +22,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.44 2007/05/29 01:00:18 kientzle Exp $ + * $FreeBSD: src/lib/libarchive/archive.h.in,v 1.45 2007/06/22 05:47:00 kientzle Exp $ */ #ifndef ARCHIVE_H_INCLUDED @@ -390,6 +390,7 @@ int archive_write_set_format_ar_bsd(struct archive *); int archive_write_set_format_ar_svr4(struct archive *); int archive_write_set_format_cpio(struct archive *); +int archive_write_set_format_cpio_newc(struct archive *); /* TODO: int archive_write_set_format_old_tar(struct archive *); */ int archive_write_set_format_pax(struct archive *); int archive_write_set_format_pax_restricted(struct archive *); ==== //depot/projects/mjexp/lib/libarchive/archive_read_open_fd.c#6 (text+ko) ==== @@ -24,7 +24,7 @@ */ #include "archive_platform.h" -__FBSDID("$FreeBSD: src/lib/libarchive/archive_read_open_fd.c,v 1.12 2007/06/18 00:36:54 kientzle Exp $"); +__FBSDID("$FreeBSD: src/lib/libarchive/archive_read_open_fd.c,v 1.13 2007/06/26 03:06:48 kientzle Exp $"); #ifdef HAVE_SYS_STAT_H #include <sys/stat.h> @@ -78,7 +78,8 @@ return (ARCHIVE_FATAL); } mine->fd = fd; - mine->can_skip = 1; + /* lseek() hardly ever works, so disable it by default. See below. */ + mine->can_skip = 0; return (archive_read_open2(a, mine, file_open, file_read, file_skip, file_close)); } @@ -93,8 +94,18 @@ return (ARCHIVE_FATAL); } - if (S_ISREG(st.st_mode)) + if (S_ISREG(st.st_mode)) { archive_read_extract_set_skip_file(a, st.st_dev, st.st_ino); + /* + * Enabling skip here is a performance optimization for + * anything that supports lseek(). On FreeBSD, only + * regular files and raw disk devices support lseek() and + * there's no portable way to determine if a device is + * a raw disk device, so we only enable this optimization + * for regular files. + */ + mine->can_skip = 1; + } return (ARCHIVE_OK); } ==== //depot/projects/mjexp/lib/libarchive/archive_read_open_file.c#5 (text+ko) ==== @@ -24,7 +24,7 @@ */ #include "archive_platform.h" -__FBSDID("$FreeBSD: src/lib/libarchive/archive_read_open_file.c,v 1.19 2007/01/09 08:05:55 kientzle Exp $"); +__FBSDID("$FreeBSD: src/lib/libarchive/archive_read_open_file.c,v 1.20 2007/06/26 03:06:48 kientzle Exp $"); #ifdef HAVE_SYS_STAT_H #include <sys/stat.h> @@ -51,6 +51,7 @@ FILE *f; size_t block_size; void *buffer; + char can_skip; }; static int file_close(struct archive *, void *); @@ -80,6 +81,8 @@ return (ARCHIVE_FATAL); } mine->f = f; + /* Suppress skip by default. See below. */ + mine->can_skip = 0; return (archive_read_open2(a, mine, file_open, file_read, file_skip, file_close)); } @@ -95,8 +98,11 @@ * it's not a file. (FILE * objects can wrap many kinds * of I/O streams.) */ - if (fstat(fileno(mine->f), &st) == 0 && S_ISREG(st.st_mode)) + if (fstat(fileno(mine->f), &st) == 0 && S_ISREG(st.st_mode)) { archive_read_extract_set_skip_file(a, st.st_dev, st.st_ino); + /* Enable the seek optimization for regular files. */ + mine->can_skip = 1; + } return (ARCHIVE_OK); } @@ -125,21 +131,25 @@ { struct read_FILE_data *mine = (struct read_FILE_data *)client_data; + (void)a; /* UNUSED */ + /* - * Note: the 'fd' and 'filename' versions round the request - * down to a multiple of the block size to ensure proper - * operation on block-oriented media such as tapes. But stdio - * doesn't work with such media (it doesn't ensure blocking), - * so we don't need to bother. + * If we can't skip, return 0 as the amount we did step and + * the caller will work around by reading and discarding. */ + if (!mine->can_skip) + return (0); + if (request == 0) + return (0); + #if HAVE_FSEEKO if (fseeko(mine->f, request, SEEK_CUR) != 0) #else if (fseek(mine->f, request, SEEK_CUR) != 0) #endif { - archive_set_error(a, errno, "Error skipping forward"); - return (ARCHIVE_FATAL); + mine->can_skip = 0; + return (0); } return (request); } ==== //depot/projects/mjexp/lib/libarchive/archive_read_open_filename.c#5 (text+ko) ==== @@ -24,7 +24,7 @@ */ #include "archive_platform.h" -__FBSDID("$FreeBSD: src/lib/libarchive/archive_read_open_filename.c,v 1.19 2007/06/18 00:36:54 kientzle Exp $"); +__FBSDID("$FreeBSD: src/lib/libarchive/archive_read_open_filename.c,v 1.20 2007/06/26 03:06:48 kientzle Exp $"); #ifdef HAVE_SYS_STAT_H #include <sys/stat.h> @@ -96,7 +96,8 @@ mine->block_size = block_size; mine->buffer = NULL; mine->fd = -1; - mine->can_skip = 1; + /* lseek() almost never works; disable it by default. See below. */ + mine->can_skip = 0; return (archive_read_open2(a, mine, file_open, file_read, file_skip, file_close)); } @@ -123,8 +124,19 @@ if (fstat(mine->fd, &st) == 0) { /* 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)) + if (S_ISREG(st.st_mode)) { archive_read_extract_set_skip_file(a, st.st_dev, st.st_ino); + /* + * Enabling skip here is a performance + * optimization for anything that supports + * lseek(). On FreeBSD, only regular files + * and raw disk devices support lseek() and + * there's no portable way to determine if a + * device is a raw disk device, so we only + * enable this optimization for regular files. + */ + mine->can_skip = 1; + } /* Remember mode so close can decide whether to flush. */ mine->st_mode = st.st_mode; } else { ==== //depot/projects/mjexp/lib/libarchive/archive_write_set_format.c#4 (text+ko) ==== @@ -24,7 +24,7 @@ */ #include "archive_platform.h" -__FBSDID("$FreeBSD: src/lib/libarchive/archive_write_set_format.c,v 1.4 2007/01/09 08:05:56 kientzle Exp $"); +__FBSDID("$FreeBSD: src/lib/libarchive/archive_write_set_format.c,v 1.5 2007/06/22 05:47:00 kientzle Exp $"); #ifdef HAVE_SYS_TYPES_H #include <sys/types.h> @@ -42,6 +42,7 @@ struct { int code; int (*setter)(struct archive *); } codes[] = { { ARCHIVE_FORMAT_CPIO, archive_write_set_format_cpio }, + { ARCHIVE_FORMAT_CPIO_SVR4_NOCRC, archive_write_set_format_cpio_newc }, { ARCHIVE_FORMAT_CPIO_POSIX, archive_write_set_format_cpio }, { ARCHIVE_FORMAT_SHAR, archive_write_set_format_shar }, { ARCHIVE_FORMAT_SHAR_BASE, archive_write_set_format_shar }, ==== //depot/projects/mjexp/lib/libarchive/archive_write_set_format_by_name.c#5 (text+ko) ==== @@ -24,7 +24,7 @@ */ #include "archive_platform.h" -__FBSDID("$FreeBSD: src/lib/libarchive/archive_write_set_format_by_name.c,v 1.6 2007/04/14 22:34:10 kientzle Exp $"); +__FBSDID("$FreeBSD: src/lib/libarchive/archive_write_set_format_by_name.c,v 1.7 2007/06/22 05:47:00 kientzle Exp $"); #ifdef HAVE_SYS_TYPES_H #include <sys/types.h> @@ -49,6 +49,8 @@ { "argnu", archive_write_set_format_ar_svr4 }, { "arsvr4", archive_write_set_format_ar_svr4 }, { "cpio", archive_write_set_format_cpio }, + { "newc", archive_write_set_format_cpio_newc }, + { "odc", archive_write_set_format_cpio }, { "pax", archive_write_set_format_pax }, { "posix", archive_write_set_format_pax }, { "shar", archive_write_set_format_shar }, ==== //depot/projects/mjexp/lib/libarchive/test/Makefile#7 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/lib/libarchive/test/Makefile,v 1.7 2007/06/13 03:35:37 kientzle Exp $ +# $FreeBSD: src/lib/libarchive/test/Makefile,v 1.9 2007/06/22 05:49:13 kientzle Exp $ TESTS= \ test_acl_basic.c \ @@ -37,6 +37,7 @@ test_write_disk_perms.c \ test_write_disk_secure.c \ test_write_format_ar.c \ + test_write_format_cpio.c \ test_write_format_cpio_empty.c \ test_write_format_shar_empty.c \ test_write_format_tar.c \ ==== //depot/projects/mjexp/lib/libc/arm/sys/sbrk.S#2 (text+ko) ==== @@ -32,10 +32,10 @@ */ #include <machine/asm.h> -__FBSDID("$FreeBSD: src/lib/libc/arm/sys/sbrk.S,v 1.2 2004/11/09 16:49:14 cognet Exp $"); +__FBSDID("$FreeBSD: src/lib/libc/arm/sys/sbrk.S,v 1.3 2007/06/27 02:45:37 kan Exp $"); #include "SYS.h" - .globl _C_LABEL(end) + .globl _C_LABEL(_end) #ifdef WEAK_ALIAS WEAK_ALIAS(sbrk, _sbrk) @@ -46,7 +46,7 @@ .globl CURBRK .type CURBRK,#object CURBRK: - .word _C_LABEL(end) + .word _C_LABEL(_end) /* * Change the data segment size ==== //depot/projects/mjexp/lib/libc/net/sctp_sys_calls.c#6 (text+ko) ==== @@ -29,7 +29,7 @@ * SUCH DAMAGE. */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/lib/libc/net/sctp_sys_calls.c,v 1.8 2007/06/11 21:05:29 rrs Exp $"); +__FBSDID("$FreeBSD: src/lib/libc/net/sctp_sys_calls.c,v 1.11 2007/06/26 02:07:47 mjacob Exp $"); #include <stdio.h> #include <string.h> #include <errno.h> @@ -152,14 +152,14 @@ sd = socket(AF_INET6, SOCK_SEQPACKET, IPPROTO_SCTP); #endif if (sd == -1) { - return (errno); + return (-1); } error = getsockopt(sd, IPPROTO_SCTP, SCTP_GET_ADDR_LEN, &av, &siz); close(sd); if (error == 0) { return ((int)av.assoc_value); } else { - return (error); + return (-1); } } @@ -185,10 +185,18 @@ /* validate all the addresses and get the size */ for (i = 0; i < addrcnt; i++) { if (at->sa_family == AF_INET) { + if (at->sa_len != sizeof(struct sockaddr_in)) { + errno = EINVAL; + return (-1); + } memcpy(cpto, at, at->sa_len); cpto = ((caddr_t)cpto + at->sa_len); len += at->sa_len; } else if (at->sa_family == AF_INET6) { + if (at->sa_len != sizeof(struct sockaddr_in6)) { + errno = EINVAL; + return (-1); + } if (IN6_IS_ADDR_V4MAPPED(&((struct sockaddr_in6 *)at)->sin6_addr)) { len += sizeof(struct sockaddr_in); in6_sin6_2_sin((struct sockaddr_in *)cpto, (struct sockaddr_in6 *)at); @@ -205,7 +213,8 @@ } if (len > (sizeof(buf) - sizeof(int))) { /* Never enough memory */ - return (E2BIG); + errno = E2BIG; + return (-1); } at = (struct sockaddr *)((caddr_t)at + at->sa_len); cnt++; @@ -231,7 +240,7 @@ { struct sctp_getaddresses *gaddrs; struct sockaddr *sa; - int i, sz, fam, argsz; + int i, sz, argsz; /* validate the flags */ if ((flags != SCTP_BINDX_ADD_ADDR) && @@ -251,23 +260,30 @@ errno = ENOMEM; return (-1); } - gaddrs->sget_assoc_id = 0; sa = addrs; for (i = 0; i < addrcnt; i++) { sz = sa->sa_len; - fam = sa->sa_family; - ((struct sockaddr_in *)&addrs[i])->sin_port = ((struct sockaddr_in *)sa)->sin_port; - if ((fam != AF_INET) && (fam != AF_INET6)) { + if (sa->sa_family == AF_INET) { + if (sa->sa_len != sizeof(struct sockaddr_in)) + goto out_error; + } else if (sa->sa_family == AF_INET6) { + if (sa->sa_len != sizeof(struct sockaddr_in6)) + goto out_error; + } else { + /* invalid address family specified */ + out_error: + free(gaddrs); errno = EINVAL; return (-1); } + memset(gaddrs, 0, argsz); + gaddrs->sget_assoc_id = 0; memcpy(gaddrs->addr, sa, sz); - if (setsockopt(sd, IPPROTO_SCTP, flags, - gaddrs, (socklen_t) argsz) != 0) { + if (setsockopt(sd, IPPROTO_SCTP, flags, gaddrs, + (socklen_t) argsz) != 0) { free(gaddrs); return (-1); } - memset(gaddrs, 0, argsz); sa = (struct sockaddr *)((caddr_t)sa + sz); } free(gaddrs); @@ -315,7 +331,6 @@ errno = ENOMEM; return (-1); } - memset(addrs, 0, siz); addrs->sget_assoc_id = id; /* Now lets get the array of addresses */ if (getsockopt(sd, IPPROTO_SCTP, SCTP_GET_PEER_ADDRESSES, @@ -380,7 +395,6 @@ errno = ENOMEM; return (-1); } - memset(addrs, 0, siz); addrs->sget_assoc_id = id; /* Now lets get the array of addresses */ if (getsockopt(sd, IPPROTO_SCTP, SCTP_GET_LOCAL_ADDRESSES, addrs, ==== //depot/projects/mjexp/release/scripts/src-install.sh#2 (text+ko) ==== @@ -1,6 +1,6 @@ #!/bin/sh # -# $FreeBSD: src/release/scripts/src-install.sh,v 1.10 2004/08/06 08:42:05 cperciva Exp $ +# $FreeBSD: src/release/scripts/src-install.sh,v 1.11 2007/06/28 18:26:35 jhb Exp $ # if [ "`id -u`" != "0" ]; then @@ -11,7 +11,7 @@ echo "You must specify which components of src to extract" echo "possible subcomponents are:" echo - echo "base bin contrib crypto etc games gnu include krb5 lib" + echo "base bin cddl contrib crypto etc games gnu include krb5 lib" echo "libexec release rescue sbin secure share sys tools ubin" echo "usbin" echo @@ -20,7 +20,7 @@ fi if [ "$1" = "all" ]; then - dists="base bin contrib crypto etc games gnu include krb5 lib libexec release rescue sbin secure share sys tools ubin usbin" + dists="base bin cddl contrib crypto etc games gnu include krb5 lib libexec release rescue sbin secure share sys tools ubin usbin" else dists="$*" fi ==== //depot/projects/mjexp/rescue/rescue/Makefile#4 (text+ko) ==== @@ -1,4 +1,4 @@ -#$FreeBSD: src/rescue/rescue/Makefile,v 1.54 2007/01/26 10:19:07 delphij Exp $ +#$FreeBSD: src/rescue/rescue/Makefile,v 1.55 2007/06/25 05:06:53 rafan Exp $ # @(#)Makefile 8.1 (Berkeley) 6/2/93 NO_MAN= @@ -113,7 +113,7 @@ kldconfig kldload kldstat kldunload ldconfig \ md5 mdconfig mdmfs mknod mount mount_cd9660 \ mount_msdosfs mount_nfs mount_ntfs mount_nullfs \ - mount_udf mount_umapfs mount_unionfs newfs \ + mount_udf mount_unionfs newfs \ newfs_msdos nos-tun ping reboot \ restore rcorder route routed rtquery rtsol savecore \ slattach spppcontrol startslip swapon sysctl tunefs umount ==== //depot/projects/mjexp/sbin/Makefile#6 (text+ko) ==== @@ -1,5 +1,5 @@ # @(#)Makefile 8.5 (Berkeley) 3/31/94 -# $FreeBSD: src/sbin/Makefile,v 1.166 2007/06/12 21:31:39 phk Exp $ +# $FreeBSD: src/sbin/Makefile,v 1.167 2007/06/25 05:06:53 rafan Exp $ .include <bsd.own.mk> @@ -59,7 +59,6 @@ mount_ntfs \ mount_nullfs \ mount_udf \ - mount_umapfs \ mount_unionfs \ natd \ newfs \ ==== //depot/projects/mjexp/sbin/mount/mount.8#2 (text+ko) ==== @@ -26,7 +26,7 @@ .\" SUCH DAMAGE. .\" .\" @(#)mount.8 8.8 (Berkeley) 6/16/94 -.\" $FreeBSD: src/sbin/mount/mount.8,v 1.81 2006/09/18 11:55:10 ru Exp $ +.\" $FreeBSD: src/sbin/mount/mount.8,v 1.82 2007/06/25 05:06:54 rafan Exp $ .\" .Dd July 12, 2006 .Dt MOUNT 8 @@ -420,7 +420,6 @@ .Cm portalfs , .Cm smbfs , .Cm udf , -.Cm umapfs , and .Cm unionfs , .Nm @@ -513,7 +512,6 @@ .Xr mount_smbfs 8 , .Xr mount_std 8 , .Xr mount_udf 8 , -.Xr mount_umapfs 8 , .Xr mount_unionfs 8 , .Xr umount 8 .Sh CAVEATS ==== //depot/projects/mjexp/sbin/mount/mount.c#7 (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.95 2007/04/13 21:30:47 phk Exp $"; + "$FreeBSD: src/sbin/mount/mount.c,v 1.96 2007/06/25 05:06:54 rafan Exp $"; #endif /* not lint */ #include <sys/param.h> @@ -135,8 +135,7 @@ unsigned int i; const char *fs[] = { "cd9660", "mfs", "msdosfs", "nfs", "nfs4", "ntfs", - "nwfs", "nullfs", "portalfs", "smbfs", "udf", "umapfs", - "unionfs", + "nwfs", "nullfs", "portalfs", "smbfs", "udf", "unionfs", NULL }; ==== //depot/projects/mjexp/share/Makefile#2 (text+ko) ==== @@ -1,5 +1,5 @@ # @(#)Makefile 8.1 (Berkeley) 6/5/93 -# $FreeBSD: src/share/Makefile,v 1.36 2006/03/17 18:54:32 ru Exp $ +# $FreeBSD: src/share/Makefile,v 1.37 2007/06/26 19:40:03 remko Exp $ .include <bsd.own.mk> @@ -25,7 +25,7 @@ tabset \ termcap \ ${_timedef} \ - zoneinfo + ${_zoneinfo} .if ${MK_LOCALES} != "no" _colldef = colldef @@ -68,4 +68,8 @@ _doc= doc .endif +.if ${MK_ZONEINFO} != "no" +_zoneinfo= zoneinfo +.endif + .include <bsd.subdir.mk> ==== //depot/projects/mjexp/share/man/man4/bce.4#6 (text) ==== @@ -26,9 +26,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/bce.4,v 1.7 2007/02/09 18:26:13 brueffer Exp $ +.\" $FreeBSD: src/share/man/man4/bce.4,v 1.8 2007/06/24 18:36:07 brueffer Exp $ .\" -.Dd February 9, 2007 +.Dd June 24, 2007 .Dt BCE 4 .Os .Sh NAME @@ -140,6 +140,17 @@ .It HP NC370i Multifunction Gigabit Server Adapter .El +.Sh SYSCTL VARIABLES +The following variables are available as both +.Xr sysctl 8 +variables and +.Xr loader 8 +tunables: +.Bl -tag -width indent +.It Va hw.bce.msi_enable +Whether or not MSI support is enabled in the driver. +The default value is 1. +.El .Sh DIAGNOSTICS .Bl -diag .It "bce%d: PCI memory allocation failed!" ==== //depot/projects/mjexp/share/man/man4/mac.4#2 (text+ko) ==== @@ -28,7 +28,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $FreeBSD: src/share/man/man4/mac.4,v 1.12 2004/07/03 18:29:20 ru Exp $ +.\" $FreeBSD: src/share/man/man4/mac.4,v 1.13 2007/06/27 09:32:50 kevlo Exp $ .\" .Dd January 8, 2003 .Os @@ -109,10 +109,6 @@ .Pa /dev ) corresponding to the file system on which to enable multilabel support. .Ss Policy Enforcement -MAC can be configured to enforce only specific portions of -policies -(see -.Sx "Runtime Configuration" ) . Policy enforcement is divided into the following areas of the system: .Bl -ohang .It Sy "File System" @@ -187,40 +183,6 @@ is documented in the .Xr mac 3 man page. -.Ss Runtime Configuration -The following -.Xr sysctl 8 -MIBs are available for fine-tuning the enforcement of MAC policies. -Unless specifically noted, all MIBs default to 1 -(that is, all areas are enforced by default): -.Bl -tag -width ".Va security.mac.enforce_network" -.It Va security.mac.enforce_fs -Enforce MAC policies for file system accesses. -.It Va security.mac.enforce_kld -Enforce MAC policies on -.Xr kld 4 . -.It Va security.mac.enforce_network -Enforce MAC policies on network interfaces. -.It Va security.mac.enforce_pipe -Enforce MAC policies on pipes. -.It Va security.mac.enforce_process -Enforce MAC policies between system processes -(e.g.\& -.Xr ps 1 , -.Xr ktrace 2 ) . -.It Va security.mac.enforce_socket -Enforce MAC policies on sockets. -.It Va security.mac.enforce_system -Enforce MAC policies on system-related items -(e.g.\& -.Xr kenv 1 , -.Xr acct 2 , -.Xr reboot 2 ) . -.It Va security.mac.enforce_vm -Enforce MAC policies on -.Xr mmap 2 -and -.Xr mprotect 2 . .\" *** XXX *** .\" Support for this feature is poor and should not be encouraged. .\" ==== //depot/projects/mjexp/share/man/man4/pcm.4#6 (text+ko) ==== @@ -23,9 +23,9 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $FreeBSD: src/share/man/man4/pcm.4,v 1.51 2007/05/31 20:26:39 joel Exp $ +.\" $FreeBSD: src/share/man/man4/pcm.4,v 1.52 2007/06/23 14:34:30 joel Exp $ .\" -.Dd May 31, 2007 +.Dd June 23, 2007 .Dt SOUND 4 .Os .Sh NAME @@ -191,6 +191,11 @@ available transparently to the application software. When disabled or not available, the application will only be able to select formats the device natively supports. +.It Va hw.snd.compat_linux_mmap +Enable to allow PROT_EXEC page mappings. +All Linux applications using sound and +.Xr mmap 2 +require this. .It Va hw.snd.feeder_rate_round Sample rate rounding threshold, to avoid large prime division at the cost of accuracy. @@ -245,6 +250,9 @@ .Pa /dev/dsp to .Pa /dev/dsp Ns Va ${hw.snd.default_unit} . +.It Va hw.snd.default_auto +Enable to automatically assign default sound unit to the most recent +attached device. .It Va dev.pcm.%d.[play|rec].vchans The current number of .Tn VCHANs ==== //depot/projects/mjexp/share/man/man4/tty.4#2 (text+ko) ==== @@ -30,9 +30,9 @@ .\" SUCH DAMAGE. .\" .\" @(#)tty.4 8.3 (Berkeley) 4/19/94 -.\" $FreeBSD: src/share/man/man4/tty.4,v 1.22 2005/02/13 22:25:17 ru Exp $ +.\" $FreeBSD: src/share/man/man4/tty.4,v 1.23 2007/06/27 15:14:06 remko Exp $ .\" -.Dd August 14, 1992 +.Dd Jun 27, 2007 .Dt TTY 4 .Os .Sh NAME @@ -280,7 +280,7 @@ a process on an .Fn open call: there is a specific ioctl called -.Dv TIOSCTTY +.Dv TIOCSCTTY to make a terminal the controlling terminal. In addition, a program can ==== //depot/projects/mjexp/share/man/man7/hier.7#8 (text+ko) ==== @@ -30,7 +30,7 @@ .\" SUCH DAMAGE. .\" .\" @(#)hier.7 8.1 (Berkeley) 6/5/93 -.\" $FreeBSD: src/share/man/man7/hier.7,v 1.127 2007/06/10 08:51:03 brueffer Exp $ +.\" $FreeBSD: src/share/man/man7/hier.7,v 1.128 2007/06/25 05:06:55 rafan Exp $ .\" .Dd June 10, 2007 .Dt HIER 7 @@ -268,8 +268,6 @@ SMB/CIFS file system .It Pa udf/ UDF file system -.It Pa umapfs/ -alternate uid/gid mappings file system >>> TRUNCATED FOR MAIL (1000 lines) <<<
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200706282103.l5SL3qBj081322>