From owner-svn-src-projects@FreeBSD.ORG Sun Nov 21 02:00:55 2010 Return-Path: Delivered-To: svn-src-projects@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 4489E106564A; Sun, 21 Nov 2010 02:00:55 +0000 (UTC) (envelope-from sbruno@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id 301D98FC17; Sun, 21 Nov 2010 02:00:55 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id oAL20tcl033290; Sun, 21 Nov 2010 02:00:55 GMT (envelope-from sbruno@svn.freebsd.org) Received: (from sbruno@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id oAL20sQg033260; Sun, 21 Nov 2010 02:00:54 GMT (envelope-from sbruno@svn.freebsd.org) Message-Id: <201011210200.oAL20sQg033260@svn.freebsd.org> From: Sean Bruno Date: Sun, 21 Nov 2010 02:00:54 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org X-SVN-Group: projects MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r215604 - in projects/sbruno_64cpus: bin/sh contrib/ipfilter/man contrib/top lib/liblzma sbin/camcontrol sbin/geom/class/part sbin/mount share/man/man1 share/man/man4 share/mk sys/amd64... X-BeenThere: svn-src-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "SVN commit messages for the src " projects" tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 21 Nov 2010 02:00:55 -0000 Author: sbruno Date: Sun Nov 21 02:00:54 2010 New Revision: 215604 URL: http://svn.freebsd.org/changeset/base/215604 Log: Merge to head for retesting Added: projects/sbruno_64cpus/tools/regression/bin/sh/builtins/wait3.0 - copied unchanged from r215603, head/tools/regression/bin/sh/builtins/wait3.0 projects/sbruno_64cpus/tools/regression/bin/sh/expansion/arith6.0 - copied unchanged from r215603, head/tools/regression/bin/sh/expansion/arith6.0 Deleted: projects/sbruno_64cpus/sys/ufs/ffs/README.snapshot Modified: projects/sbruno_64cpus/bin/sh/Makefile projects/sbruno_64cpus/bin/sh/builtins.def projects/sbruno_64cpus/bin/sh/eval.c projects/sbruno_64cpus/bin/sh/expand.c projects/sbruno_64cpus/bin/sh/main.c projects/sbruno_64cpus/bin/sh/mksyntax.c projects/sbruno_64cpus/bin/sh/options.c projects/sbruno_64cpus/bin/sh/output.c projects/sbruno_64cpus/bin/sh/output.h projects/sbruno_64cpus/bin/sh/sh.1 projects/sbruno_64cpus/bin/sh/var.c projects/sbruno_64cpus/contrib/ipfilter/man/ipnat.8 projects/sbruno_64cpus/contrib/ipfilter/man/mkfilters.1 projects/sbruno_64cpus/lib/liblzma/Symbol.map projects/sbruno_64cpus/sbin/camcontrol/camcontrol.c projects/sbruno_64cpus/sbin/geom/class/part/geom_part.c projects/sbruno_64cpus/sbin/geom/class/part/gpart.8 projects/sbruno_64cpus/sbin/mount/mount.8 projects/sbruno_64cpus/share/man/man1/builtin.1 projects/sbruno_64cpus/share/man/man4/ata.4 projects/sbruno_64cpus/sys/amd64/include/specialreg.h projects/sbruno_64cpus/sys/boot/ofw/libofw/openfirm.c projects/sbruno_64cpus/sys/dev/acpica/acpi_hpet.c projects/sbruno_64cpus/sys/dev/ata/ata-all.c projects/sbruno_64cpus/sys/dev/ata/ata-all.h projects/sbruno_64cpus/sys/dev/atkbdc/psm.c projects/sbruno_64cpus/sys/dev/mii/atphy.c projects/sbruno_64cpus/sys/fs/cd9660/cd9660_node.c projects/sbruno_64cpus/sys/fs/coda/coda_vnops.c projects/sbruno_64cpus/sys/fs/ext2fs/ext2_inode.c projects/sbruno_64cpus/sys/fs/hpfs/hpfs_vnops.c projects/sbruno_64cpus/sys/fs/msdosfs/msdosfs_denode.c projects/sbruno_64cpus/sys/fs/nfsclient/nfs_clnode.c projects/sbruno_64cpus/sys/fs/ntfs/ntfs_vnops.c projects/sbruno_64cpus/sys/gnu/fs/reiserfs/reiserfs_inode.c projects/sbruno_64cpus/sys/i386/i386/initcpu.c projects/sbruno_64cpus/sys/i386/include/pmap.h projects/sbruno_64cpus/sys/i386/include/specialreg.h projects/sbruno_64cpus/sys/i386/xen/mp_machdep.c projects/sbruno_64cpus/sys/i386/xen/pmap.c projects/sbruno_64cpus/sys/i386/xen/xen_machdep.c projects/sbruno_64cpus/sys/kern/kern_module.c projects/sbruno_64cpus/sys/kern/p1003_1b.c projects/sbruno_64cpus/sys/kern/posix4_mib.c projects/sbruno_64cpus/sys/kern/uipc_sem.c projects/sbruno_64cpus/sys/kern/vfs_subr.c projects/sbruno_64cpus/sys/netinet/siftr.c projects/sbruno_64cpus/sys/netinet6/nd6_nbr.c projects/sbruno_64cpus/sys/nfsclient/nfs_node.c projects/sbruno_64cpus/sys/sys/vnode.h projects/sbruno_64cpus/sys/ufs/ufs/ufs_inode.c projects/sbruno_64cpus/sys/vm/vm_contig.c projects/sbruno_64cpus/sys/vm/vm_object.c projects/sbruno_64cpus/sys/vm/vm_page.c projects/sbruno_64cpus/sys/vm/vm_pageout.c projects/sbruno_64cpus/sys/vm/vm_pageout.h projects/sbruno_64cpus/sys/vm/vm_reserv.c projects/sbruno_64cpus/usr.bin/at/at.c projects/sbruno_64cpus/usr.bin/chkey/chkey.c projects/sbruno_64cpus/usr.bin/netstat/if.c projects/sbruno_64cpus/usr.bin/printf/printf.1 projects/sbruno_64cpus/usr.bin/printf/printf.c projects/sbruno_64cpus/usr.bin/vmstat/vmstat.c projects/sbruno_64cpus/usr.sbin/mfiutil/mfi_config.c projects/sbruno_64cpus/usr.sbin/mfiutil/mfi_evt.c projects/sbruno_64cpus/usr.sbin/mfiutil/mfi_flash.c Directory Properties: projects/sbruno_64cpus/ (props changed) projects/sbruno_64cpus/cddl/contrib/opensolaris/ (props changed) projects/sbruno_64cpus/contrib/bind9/ (props changed) projects/sbruno_64cpus/contrib/binutils/ (props changed) projects/sbruno_64cpus/contrib/bzip2/ (props changed) projects/sbruno_64cpus/contrib/ee/ (props changed) projects/sbruno_64cpus/contrib/expat/ (props changed) projects/sbruno_64cpus/contrib/file/ (props changed) projects/sbruno_64cpus/contrib/gdb/ (props changed) projects/sbruno_64cpus/contrib/gdtoa/ (props changed) projects/sbruno_64cpus/contrib/gnu-sort/ (props changed) projects/sbruno_64cpus/contrib/groff/ (props changed) projects/sbruno_64cpus/contrib/less/ (props changed) projects/sbruno_64cpus/contrib/libpcap/ (props changed) projects/sbruno_64cpus/contrib/llvm/ (props changed) projects/sbruno_64cpus/contrib/llvm/tools/clang/ (props changed) projects/sbruno_64cpus/contrib/ncurses/ (props changed) projects/sbruno_64cpus/contrib/netcat/ (props changed) projects/sbruno_64cpus/contrib/ntp/ (props changed) projects/sbruno_64cpus/contrib/one-true-awk/ (props changed) projects/sbruno_64cpus/contrib/openbsm/ (props changed) projects/sbruno_64cpus/contrib/openpam/ (props changed) projects/sbruno_64cpus/contrib/pf/ (props changed) projects/sbruno_64cpus/contrib/sendmail/ (props changed) projects/sbruno_64cpus/contrib/tcpdump/ (props changed) projects/sbruno_64cpus/contrib/tcsh/ (props changed) projects/sbruno_64cpus/contrib/top/ (props changed) projects/sbruno_64cpus/contrib/top/install-sh (props changed) projects/sbruno_64cpus/contrib/tzcode/stdtime/ (props changed) projects/sbruno_64cpus/contrib/tzcode/zic/ (props changed) projects/sbruno_64cpus/contrib/tzdata/ (props changed) projects/sbruno_64cpus/contrib/wpa/ (props changed) projects/sbruno_64cpus/contrib/xz/ (props changed) projects/sbruno_64cpus/crypto/openssh/ (props changed) projects/sbruno_64cpus/crypto/openssl/ (props changed) projects/sbruno_64cpus/lib/libc/ (props changed) projects/sbruno_64cpus/lib/libc/stdtime/ (props changed) projects/sbruno_64cpus/lib/libutil/ (props changed) projects/sbruno_64cpus/lib/libz/ (props changed) projects/sbruno_64cpus/sbin/ (props changed) projects/sbruno_64cpus/sbin/ipfw/ (props changed) projects/sbruno_64cpus/share/mk/bsd.arch.inc.mk (props changed) projects/sbruno_64cpus/share/zoneinfo/ (props changed) projects/sbruno_64cpus/sys/ (props changed) projects/sbruno_64cpus/sys/amd64/include/xen/ (props changed) projects/sbruno_64cpus/sys/cddl/contrib/opensolaris/ (props changed) projects/sbruno_64cpus/sys/contrib/dev/acpica/ (props changed) projects/sbruno_64cpus/sys/contrib/pf/ (props changed) projects/sbruno_64cpus/sys/contrib/x86emu/ (props changed) projects/sbruno_64cpus/sys/dev/xen/xenpci/ (props changed) projects/sbruno_64cpus/usr.bin/calendar/ (props changed) projects/sbruno_64cpus/usr.bin/csup/ (props changed) projects/sbruno_64cpus/usr.bin/procstat/ (props changed) projects/sbruno_64cpus/usr.sbin/zic/ (props changed) Modified: projects/sbruno_64cpus/bin/sh/Makefile ============================================================================== --- projects/sbruno_64cpus/bin/sh/Makefile Sun Nov 21 00:53:27 2010 (r215603) +++ projects/sbruno_64cpus/bin/sh/Makefile Sun Nov 21 02:00:54 2010 (r215604) @@ -5,7 +5,7 @@ PROG= sh INSTALLFLAGS= -S SHSRCS= alias.c arith.y arith_lex.l cd.c echo.c error.c eval.c exec.c expand.c \ histedit.c input.c jobs.c mail.c main.c memalloc.c miscbltin.c \ - mystring.c options.c output.c parser.c redir.c show.c \ + mystring.c options.c output.c parser.c printf.c redir.c show.c \ test.c trap.c var.c GENSRCS= builtins.c init.c nodes.c syntax.c GENHDRS= builtins.h nodes.h syntax.h token.h @@ -26,7 +26,8 @@ WARNS?= 2 WFORMAT=0 .PATH: ${.CURDIR}/bltin \ - ${.CURDIR}/../test + ${.CURDIR}/../test \ + ${.CURDIR}/../../usr.bin/printf CLEANFILES+= mkinit mkinit.o mknodes mknodes.o \ mksyntax mksyntax.o Modified: projects/sbruno_64cpus/bin/sh/builtins.def ============================================================================== --- projects/sbruno_64cpus/bin/sh/builtins.def Sun Nov 21 00:53:27 2010 (r215603) +++ projects/sbruno_64cpus/bin/sh/builtins.def Sun Nov 21 02:00:54 2010 (r215604) @@ -71,7 +71,7 @@ histcmd -h fc jobidcmd jobid jobscmd jobs localcmd local -#printfcmd printf +printfcmd printf pwdcmd pwd readcmd read returncmd -s return Modified: projects/sbruno_64cpus/bin/sh/eval.c ============================================================================== --- projects/sbruno_64cpus/bin/sh/eval.c Sun Nov 21 00:53:27 2010 (r215603) +++ projects/sbruno_64cpus/bin/sh/eval.c Sun Nov 21 02:00:54 2010 (r215604) @@ -699,13 +699,13 @@ evalcommand(union node *cmd, int flags, for (sp = varlist.list ; sp ; sp = sp->next) { if (sep != 0) out2c(' '); - p = sp->text; - while (*p != '=' && *p != '\0') - out2c(*p++); - if (*p != '\0') { - out2c(*p++); + p = strchr(sp->text, '='); + if (p != NULL) { + p++; + outbin(sp->text, p - sp->text, out2); out2qstr(p); - } + } else + out2qstr(sp->text); sep = ' '; } for (sp = arglist.list ; sp ; sp = sp->next) { Modified: projects/sbruno_64cpus/bin/sh/expand.c ============================================================================== --- projects/sbruno_64cpus/bin/sh/expand.c Sun Nov 21 00:53:27 2010 (r215603) +++ projects/sbruno_64cpus/bin/sh/expand.c Sun Nov 21 02:00:54 2010 (r215604) @@ -1592,9 +1592,7 @@ wordexpcmd(int argc, char **argv) for (i = 1, len = 0; i < argc; i++) len += strlen(argv[i]); out1fmt("%08x", (int)len); - for (i = 1; i < argc; i++) { - out1str(argv[i]); - out1c('\0'); - } + for (i = 1; i < argc; i++) + outbin(argv[i], strlen(argv[i]) + 1, out1); return (0); } Modified: projects/sbruno_64cpus/bin/sh/main.c ============================================================================== --- projects/sbruno_64cpus/bin/sh/main.c Sun Nov 21 00:53:27 2010 (r215603) +++ projects/sbruno_64cpus/bin/sh/main.c Sun Nov 21 02:00:54 2010 (r215604) @@ -128,10 +128,8 @@ main(int argc, char *argv[]) exitshell(exitstatus); } reset(); - if (exception == EXINT) { - out2c('\n'); - flushout(&errout); - } + if (exception == EXINT) + out2fmt_flush("\n"); popstackmark(&smark); FORCEINTON; /* enable interrupts */ if (state == 1) Modified: projects/sbruno_64cpus/bin/sh/mksyntax.c ============================================================================== --- projects/sbruno_64cpus/bin/sh/mksyntax.c Sun Nov 21 00:53:27 2010 (r215603) +++ projects/sbruno_64cpus/bin/sh/mksyntax.c Sun Nov 21 02:00:54 2010 (r215604) @@ -342,9 +342,9 @@ print(const char *name) static const char *macro[] = { "#define is_digit(c)\t((is_type+SYNBASE)[(int)c] & ISDIGIT)", "#define is_eof(c)\t((c) == PEOF)", - "#define is_alpha(c)\t(((c) < CTLESC || (c) > CTLQUOTEMARK) && (is_type+SYNBASE)[(int)c] & (ISUPPER|ISLOWER))", - "#define is_name(c)\t(((c) < CTLESC || (c) > CTLQUOTEMARK) && (is_type+SYNBASE)[(int)c] & (ISUPPER|ISLOWER|ISUNDER))", - "#define is_in_name(c)\t(((c) < CTLESC || (c) > CTLQUOTEMARK) && (is_type+SYNBASE)[(int)c] & (ISUPPER|ISLOWER|ISUNDER|ISDIGIT))", + "#define is_alpha(c)\t((is_type+SYNBASE)[(int)c] & (ISUPPER|ISLOWER))", + "#define is_name(c)\t((is_type+SYNBASE)[(int)c] & (ISUPPER|ISLOWER|ISUNDER))", + "#define is_in_name(c)\t((is_type+SYNBASE)[(int)c] & (ISUPPER|ISLOWER|ISUNDER|ISDIGIT))", "#define is_special(c)\t((is_type+SYNBASE)[(int)c] & (ISSPECL|ISDIGIT))", NULL }; Modified: projects/sbruno_64cpus/bin/sh/options.c ============================================================================== --- projects/sbruno_64cpus/bin/sh/options.c Sun Nov 21 00:53:27 2010 (r215603) +++ projects/sbruno_64cpus/bin/sh/options.c Sun Nov 21 02:00:54 2010 (r215604) @@ -261,13 +261,12 @@ minus_o(char *name, int val) optlist[i].val ? "on" : "off"); } else { /* Output suitable for re-input to shell. */ - for (i = 0; i < NOPTS; i++) { - if (i % 6 == 0) - out1str(i == 0 ? "set" : "\nset"); - out1fmt(" %co %s", optlist[i].val ? '-' : '+', - optlist[i].name); - } - out1c('\n'); + for (i = 0; i < NOPTS; i++) + out1fmt("%s %co %s%s", + i % 6 == 0 ? "set" : "", + optlist[i].val ? '-' : '+', + optlist[i].name, + i % 6 == 5 || i == NOPTS - 1 ? "\n" : ""); } } else { for (i = 0; i < NOPTS; i++) Modified: projects/sbruno_64cpus/bin/sh/output.c ============================================================================== --- projects/sbruno_64cpus/bin/sh/output.c Sun Nov 21 00:53:27 2010 (r215603) +++ projects/sbruno_64cpus/bin/sh/output.c Sun Nov 21 02:00:54 2010 (r215604) @@ -96,6 +96,12 @@ RESET { void +outcslow(int c, struct output *file) +{ + outc(c, file); +} + +void out1str(const char *p) { outstr(p, out1); @@ -149,19 +155,19 @@ outqstr(const char *p, struct output *fi case '\'': /* Can't quote single quotes inside single quotes. */ if (inquotes) - outc('\'', file); + outcslow('\'', file); inquotes = 0; outstr("\\'", file); break; default: if (!inquotes) - outc('\'', file); + outcslow('\'', file); inquotes = 1; outc(ch, file); } } if (inquotes) - outc('\'', file); + outcslow('\'', file); } void Modified: projects/sbruno_64cpus/bin/sh/output.h ============================================================================== --- projects/sbruno_64cpus/bin/sh/output.h Sun Nov 21 00:53:27 2010 (r215603) +++ projects/sbruno_64cpus/bin/sh/output.h Sun Nov 21 02:00:54 2010 (r215604) @@ -54,6 +54,7 @@ extern struct output *out1; /* &memout i extern struct output *out2; /* &memout if backquote with 2>&1, otherwise &errout */ +void outcslow(int, struct output *); void out1str(const char *); void out1qstr(const char *); void out2str(const char *); @@ -74,7 +75,7 @@ int xwrite(int, const char *, int); #define outc(c, file) (--(file)->nleft < 0? (emptyoutbuf(file), *(file)->nextc++ = (c)) : (*(file)->nextc++ = (c))) #define out1c(c) outc(c, out1); -#define out2c(c) outc(c, out2); +#define out2c(c) outcslow(c, out2); #define OUTPUT_INCL #endif Modified: projects/sbruno_64cpus/bin/sh/sh.1 ============================================================================== --- projects/sbruno_64cpus/bin/sh/sh.1 Sun Nov 21 00:53:27 2010 (r215603) +++ projects/sbruno_64cpus/bin/sh/sh.1 Sun Nov 21 02:00:54 2010 (r215604) @@ -32,7 +32,7 @@ .\" from: @(#)sh.1 8.6 (Berkeley) 5/4/95 .\" $FreeBSD$ .\" -.Dd November 12, 2010 +.Dd November 19, 2010 .Dt SH 1 .Os .Sh NAME @@ -2049,6 +2049,9 @@ line. See the .Sx Functions subsection. +.It Ic printf +A built-in equivalent of +.Xr printf 1 . .It Ic pwd Op Fl L | P Print the path of the current directory. The built-in command may @@ -2470,6 +2473,7 @@ will return the argument. .Xr echo 1 , .Xr ed 1 , .Xr emacs 1 , +.Xr printf 1 , .Xr pwd 1 , .Xr test 1 , .Xr vi 1 , Modified: projects/sbruno_64cpus/bin/sh/var.c ============================================================================== --- projects/sbruno_64cpus/bin/sh/var.c Sun Nov 21 00:53:27 2010 (r215603) +++ projects/sbruno_64cpus/bin/sh/var.c Sun Nov 21 02:00:54 2010 (r215604) @@ -633,10 +633,10 @@ showvarscmd(int argc __unused, char **ar qsort(vars, n, sizeof(*vars), var_compare); for (i = 0; i < n; i++) { - for (s = vars[i]; *s != '='; s++) - out1c(*s); - out1c('='); - out1qstr(s + 1); + s = strchr(vars[i], '='); + s++; + outbin(vars[i], s - vars[i], out1); + out1qstr(s); out1c('\n'); } ckfree(vars); @@ -710,12 +710,15 @@ found:; out1str(cmdname); out1c(' '); } - for (p = vp->text ; *p != '=' ; p++) - out1c(*p); + p = strchr(vp->text, '='); if (values && !(vp->flags & VUNSET)) { - out1c('='); - out1qstr(p + 1); - } + p++; + outbin(vp->text, p - vp->text, + out1); + out1qstr(p); + } else + outbin(vp->text, p - vp->text, + out1); out1c('\n'); } } Modified: projects/sbruno_64cpus/contrib/ipfilter/man/ipnat.8 ============================================================================== --- projects/sbruno_64cpus/contrib/ipfilter/man/ipnat.8 Sun Nov 21 00:53:27 2010 (r215603) +++ projects/sbruno_64cpus/contrib/ipfilter/man/ipnat.8 Sun Nov 21 02:00:54 2010 (r215604) @@ -66,6 +66,6 @@ and active rules/table entries. .SH FILES /dev/ipnat .br -/usr/share/examples/ipf Directory with examples. +/usr/share/examples/ipfilter Directory with examples. .SH SEE ALSO ipnat(5), ipf(8), ipfstat(8) Modified: projects/sbruno_64cpus/contrib/ipfilter/man/mkfilters.1 ============================================================================== --- projects/sbruno_64cpus/contrib/ipfilter/man/mkfilters.1 Sun Nov 21 00:53:27 2010 (r215603) +++ projects/sbruno_64cpus/contrib/ipfilter/man/mkfilters.1 Sun Nov 21 02:00:54 2010 (r215604) @@ -6,7 +6,7 @@ mkfilters \- generate a minimal firewall .SH SYNOPSIS .B mkfilters .SH FILES -/usr/share/examples/ipf/mkfilters +/usr/share/examples/ipfilter/mkfilters .SH DESCRIPTION .PP \fBmkfilters\fP is a perl script that generates a minimal filter rule set for Modified: projects/sbruno_64cpus/lib/liblzma/Symbol.map ============================================================================== --- projects/sbruno_64cpus/lib/liblzma/Symbol.map Sun Nov 21 00:53:27 2010 (r215603) +++ projects/sbruno_64cpus/lib/liblzma/Symbol.map Sun Nov 21 02:00:54 2010 (r215604) @@ -107,7 +107,6 @@ XZprivate_1.0 { lzma_check_finish; lzma_check_init; lzma_check_update; - lzma_chunk_size; lzma_delta_coder_init; lzma_delta_coder_memusage; lzma_delta_decoder_init; Modified: projects/sbruno_64cpus/sbin/camcontrol/camcontrol.c ============================================================================== --- projects/sbruno_64cpus/sbin/camcontrol/camcontrol.c Sun Nov 21 00:53:27 2010 (r215603) +++ projects/sbruno_64cpus/sbin/camcontrol/camcontrol.c Sun Nov 21 02:00:54 2010 (r215604) @@ -1526,6 +1526,7 @@ rescan_or_reset_bus(int bus, int rescan) bzero(&(&matchccb.ccb_h)[1], sizeof(struct ccb_dev_match) - sizeof(struct ccb_hdr)); matchccb.ccb_h.func_code = XPT_DEV_MATCH; + matchccb.ccb_h.path_id = CAM_BUS_WILDCARD; bufsize = sizeof(struct dev_match_result) * 20; matchccb.cdm.match_buf_len = bufsize; matchccb.cdm.matches=(struct dev_match_result *)malloc(bufsize); Modified: projects/sbruno_64cpus/sbin/geom/class/part/geom_part.c ============================================================================== --- projects/sbruno_64cpus/sbin/geom/class/part/geom_part.c Sun Nov 21 00:53:27 2010 (r215603) +++ projects/sbruno_64cpus/sbin/geom/class/part/geom_part.c Sun Nov 21 02:00:54 2010 (r215604) @@ -31,6 +31,7 @@ __FBSDID("$FreeBSD$"); #include #include +#include #include #include #include @@ -85,6 +86,8 @@ static int gpart_show_hasopt(struct gctl static void gpart_write_partcode(struct ggeom *, int, void *, ssize_t); static void gpart_write_partcode_vtoc8(struct ggeom *, int, void *); static void gpart_print_error(const char *); +static void gpart_backup(struct gctl_req *, unsigned int); +static void gpart_restore(struct gctl_req *, unsigned int); struct g_command PUBSYM(class_commands)[] = { { "add", 0, gpart_issue, { @@ -97,6 +100,11 @@ struct g_command PUBSYM(class_commands)[ G_OPT_SENTINEL }, "[-b start] [-s size] -t type [-i index] [-l label] [-f flags] geom" }, + { "backup", 0, gpart_backup, { + { 'l', "backup_labels", NULL, G_TYPE_BOOL}, + G_OPT_SENTINEL }, + "[-l] geom" + }, { "bootcode", 0, gpart_bootcode, { { 'b', GPART_PARAM_BOOTCODE, G_VAL_OPTIONAL, G_TYPE_STRING }, { 'p', GPART_PARAM_PARTCODE, G_VAL_OPTIONAL, G_TYPE_STRING }, @@ -165,6 +173,12 @@ struct g_command PUBSYM(class_commands)[ G_OPT_SENTINEL }, "[-s size] -i index [-f flags] geom" }, + { "restore", 0, gpart_restore, { + { 'F', "force", NULL, G_TYPE_BOOL }, + { 'f', "flags", GPART_FLAGS, G_TYPE_STRING }, + G_OPT_SENTINEL }, + "[-F] [-f flags] provider [...]" + }, { "recover", 0, gpart_issue, { { 'f', "flags", GPART_FLAGS, G_TYPE_STRING }, G_OPT_SENTINEL }, @@ -654,6 +668,295 @@ gpart_show(struct gctl_req *req, unsigne geom_deletetree(&mesh); } +static void +gpart_backup(struct gctl_req *req, unsigned int fl __unused) +{ + struct gmesh mesh; + struct gclass *classp; + struct gprovider *pp; + struct ggeom *gp; + const char *s, *scheme; + off_t sector, end; + off_t length, secsz; + int error, labels, i, windex, wblocks, wtype; + + if (gctl_get_int(req, "nargs") != 1) + errx(EXIT_FAILURE, "Invalid number of arguments."); + error = geom_gettree(&mesh); + if (error != 0) + errc(EXIT_FAILURE, error, "Cannot get GEOM tree"); + s = gctl_get_ascii(req, "class"); + if (s == NULL) + abort(); + classp = find_class(&mesh, s); + if (classp == NULL) { + geom_deletetree(&mesh); + errx(EXIT_FAILURE, "Class %s not found.", s); + } + s = gctl_get_ascii(req, "arg0"); + if (s == NULL) + abort(); + labels = gctl_get_int(req, "backup_labels"); + gp = find_geom(classp, s); + if (gp == NULL) + errx(EXIT_FAILURE, "No such geom: %s.", s); + scheme = find_geomcfg(gp, "scheme"); + if (scheme == NULL) + abort(); + pp = LIST_FIRST(&gp->lg_consumer)->lg_provider; + secsz = pp->lg_sectorsize; + s = find_geomcfg(gp, "last"); + wblocks = strlen(s); + wtype = 0; + LIST_FOREACH(pp, &gp->lg_provider, lg_provider) { + s = find_provcfg(pp, "type"); + i = strlen(s); + if (i > wtype) + wtype = i; + } + s = find_geomcfg(gp, "entries"); + windex = strlen(s); + printf("%s %s\n", scheme, s); + LIST_FOREACH(pp, &gp->lg_provider, lg_provider) { + s = find_provcfg(pp, "start"); + if (s == NULL) { + s = find_provcfg(pp, "offset"); + sector = (off_t)strtoimax(s, NULL, 0) / secsz; + } else + sector = (off_t)strtoimax(s, NULL, 0); + + s = find_provcfg(pp, "end"); + if (s == NULL) { + s = find_provcfg(pp, "length"); + length = (off_t)strtoimax(s, NULL, 0) / secsz; + } else { + end = (off_t)strtoimax(s, NULL, 0); + length = end - sector + 1; + } + s = find_provcfg(pp, "label"); + printf("%-*s %*s %*jd %*jd", + windex, find_provcfg(pp, "index"), + wtype, find_provcfg(pp, "type"), + wblocks, (intmax_t)sector, + wblocks, (intmax_t)length); + if (labels && s != NULL) + printf(" %s", s); + printf(" %s\n", fmtattrib(pp)); + } + geom_deletetree(&mesh); +} + +static int +skip_line(const char *p) +{ + + while (*p != '\0') { + if (*p == '#') + return (1); + if (isspace(*p) == 0) + return (0); + p++; + } + return (1); +} + +static void +gpart_restore(struct gctl_req *req, unsigned int fl __unused) +{ + struct gmesh mesh; + struct gclass *classp; + struct gctl_req *r; + struct ggeom *gp; + const char *s, *flags, *errstr, *label; + char **ap, *argv[6], line[BUFSIZ], *pline; + int error, forced, i, l, nargs, created; + intmax_t n; + + nargs = gctl_get_int(req, "nargs"); + if (nargs < 1) + errx(EXIT_FAILURE, "Invalid number of arguments."); + + forced = gctl_get_int(req, "force"); + flags = gctl_get_ascii(req, "flags"); + s = gctl_get_ascii(req, "class"); + if (s == NULL) + abort(); + error = geom_gettree(&mesh); + if (error != 0) + errc(EXIT_FAILURE, error, "Cannot get GEOM tree"); + classp = find_class(&mesh, s); + if (classp == NULL) { + geom_deletetree(&mesh); + errx(EXIT_FAILURE, "Class %s not found.", s); + } + if (forced) { + /* destroy existent partition table before restore */ + for (i = 0; i < nargs; i++) { + s = gctl_get_ascii(req, "arg%d", i); + gp = find_geom(classp, s); + if (gp != NULL) { + r = gctl_get_handle(); + gctl_ro_param(r, "class", -1, + classp->lg_name); + gctl_ro_param(r, "verb", -1, "destroy"); + gctl_ro_param(r, "flags", -1, "restore"); + gctl_ro_param(r, "force", sizeof(forced), + &forced); + gctl_ro_param(r, "arg0", -1, s); + errstr = gctl_issue(r); + if (errstr != NULL && errstr[0] != '\0') { + gpart_print_error(errstr); + gctl_free(r); + goto backout; + } + gctl_free(r); + } + } + } + created = 0; + while (fgets(line, sizeof(line) - 1, stdin)) { + /* Format of backup entries: + * + * [label] ['['attrib[,attrib]']'] + */ + pline = (char *)line; + pline[strlen(line) - 1] = 0; + if (skip_line(pline)) + continue; + for (ap = argv; + (*ap = strsep(&pline, " \t")) != NULL;) + if (**ap != '\0' && ++ap >= &argv[6]) + break; + l = ap - &argv[0]; + label = pline = NULL; + if (l == 2) { /* create table */ + if (created) + errx(EXIT_FAILURE, "Incorrect backup format."); + n = atoi(argv[1]); + for (i = 0; i < nargs; i++) { + s = gctl_get_ascii(req, "arg%d", i); + r = gctl_get_handle(); + n = strtoimax(argv[1], NULL, 0); + gctl_ro_param(r, "class", -1, + classp->lg_name); + gctl_ro_param(r, "verb", -1, "create"); + gctl_ro_param(r, "scheme", -1, argv[0]); + gctl_ro_param(r, "entries", sizeof(n), &n); + gctl_ro_param(r, "flags", -1, "restore"); + gctl_ro_param(r, "arg0", -1, s); + errstr = gctl_issue(r); + if (errstr != NULL && errstr[0] != '\0') { + gpart_print_error(errstr); + gctl_free(r); + goto backout; + } + gctl_free(r); + } + created = 1; + continue; + } else if (l < 4 || created == 0) + errx(EXIT_FAILURE, "Incorrect backup format."); + else if (l == 5) { + if (strchr(argv[4], '[') == NULL) + label = argv[4]; + else + pline = argv[4]; + } else if (l == 6) { + label = argv[4]; + pline = argv[5]; + } + /* Add partitions to each table */ + for (i = 0; i < nargs; i++) { + s = gctl_get_ascii(req, "arg%d", i); + r = gctl_get_handle(); + n = strtoimax(argv[0], NULL, 0); + gctl_ro_param(r, "class", -1, classp->lg_name); + gctl_ro_param(r, "verb", -1, "add"); + gctl_ro_param(r, "flags", -1, "restore"); + gctl_ro_param(r, GPART_PARAM_INDEX, sizeof(n), &n); + gctl_ro_param(r, "type", -1, argv[1]); + gctl_ro_param(r, "start", -1, argv[2]); + gctl_ro_param(r, "size", -1, argv[3]); + if (label != NULL) + gctl_ro_param(r, "label", -1, argv[4]); + gctl_ro_param(r, "arg0", -1, s); + error = gpart_autofill(r); + if (error != 0) + errc(EXIT_FAILURE, error, "autofill"); + errstr = gctl_issue(r); + if (errstr != NULL && errstr[0] != '\0') { + gpart_print_error(errstr); + gctl_free(r); + goto backout; + } + gctl_free(r); + } + if (pline == NULL || *pline != '[') + continue; + /* set attributes */ + pline++; + for (ap = argv; + (*ap = strsep(&pline, ",]")) != NULL;) + if (**ap != '\0' && ++ap >= &argv[6]) + break; + for (i = 0; i < nargs; i++) { + l = ap - &argv[0]; + s = gctl_get_ascii(req, "arg%d", i); + while (l > 0) { + r = gctl_get_handle(); + gctl_ro_param(r, "class", -1, classp->lg_name); + gctl_ro_param(r, "verb", -1, "set"); + gctl_ro_param(r, "flags", -1, "restore"); + gctl_ro_param(r, GPART_PARAM_INDEX, + sizeof(n), &n); + gctl_ro_param(r, "attrib", -1, argv[--l]); + gctl_ro_param(r, "arg0", -1, s); + errstr = gctl_issue(r); + if (errstr != NULL && errstr[0] != '\0') { + gpart_print_error(errstr); + gctl_free(r); + goto backout; + } + gctl_free(r); + } + } + } + /* commit changes if needed */ + if (strchr(flags, 'C') != NULL) { + for (i = 0; i < nargs; i++) { + s = gctl_get_ascii(req, "arg%d", i); + r = gctl_get_handle(); + gctl_ro_param(r, "class", -1, classp->lg_name); + gctl_ro_param(r, "verb", -1, "commit"); + gctl_ro_param(r, "arg0", -1, s); + errstr = gctl_issue(r); + if (errstr != NULL && errstr[0] != '\0') { + gpart_print_error(errstr); + gctl_free(r); + goto backout; + } + gctl_free(r); + } + } + gctl_free(req); + geom_deletetree(&mesh); + exit(EXIT_SUCCESS); + +backout: + for (i = 0; i < nargs; i++) { + s = gctl_get_ascii(req, "arg%d", i); + r = gctl_get_handle(); + gctl_ro_param(r, "class", -1, classp->lg_name); + gctl_ro_param(r, "verb", -1, "undo"); + gctl_ro_param(r, "arg0", -1, s); + gctl_issue(r); + gctl_free(r); + } + gctl_free(req); + geom_deletetree(&mesh); + exit(EXIT_FAILURE); +} + static void * gpart_bootfile_read(const char *bootfile, ssize_t *size) { Modified: projects/sbruno_64cpus/sbin/geom/class/part/gpart.8 ============================================================================== --- projects/sbruno_64cpus/sbin/geom/class/part/gpart.8 Sun Nov 21 00:53:27 2010 (r215603) +++ projects/sbruno_64cpus/sbin/geom/class/part/gpart.8 Sun Nov 21 02:00:54 2010 (r215604) @@ -24,7 +24,7 @@ .\" .\" $FreeBSD$ .\" -.Dd October 25, 2010 +.Dd November 20, 2010 .Dt GPART 8 .Os .Sh NAME @@ -91,6 +91,11 @@ utility: .Op Fl l Ar label .Op Fl f Ar flags .Ar geom +.\" ==== BACKUP ==== +.Nm +.Cm backup +.Op Fl l +.Ar geom .\" ==== BOOTCODE ==== .Nm .Cm bootcode @@ -141,6 +146,13 @@ utility: .Op Fl s Ar size .Op Fl f Ar flags .Ar geom +.\" ==== RESTORE ==== +.Nm +.Cm restore +.Op Fl F +.Op Fl f Ar flags +.Ar provider +.Op Ar ... .\" ==== SET ==== .Nm .Cm set @@ -208,6 +220,17 @@ See the section entitled below for a discussion about its use. .El +.\" ==== BACKUP ==== +.It Cm backup +Dump a partition table to standard output in special format used by +.Cm restore +action. +.Pp +Additional options include: +.Bl -tag -width 10n +.It Fl l +Dump partition labels for partitioning schemes that support them. +.El .\" ==== BOOTCODE ==== .It Cm bootcode Embed bootstrap code into the partitioning scheme's metadata on the @@ -401,6 +424,28 @@ See the section entitled below for a discussion about its use. .El +.\" ==== RESTORE ==== +.It Cm restore +Restore the partition table from backup previously created by +.Cm backup +action and given from standard input. Only partition table +may be restored. This action does not affect content of partitions. +This mean that you should copy your data from backup after restoring +partition table and write bootcode again if it is needed. +.Pp +Additional options include: +.Bl -tag -width 10n +.It Fl F +Destroy partition table on the given +.Ar provider +before doing restore. +.It Fl f Ar flags +Additional operational flags. +See the section entitled +.Sx "OPERATIONAL FLAGS" +below for a discussion +about its use. +.El .\" ==== SET ==== .It Cm set Set the named attribute on the partition entry. @@ -770,6 +815,28 @@ After having created all required partit .Bd -literal -offset indent /sbin/gpart bootcode -p /boot/boot1 da0 .Ed +.Pp +Create backup of partition table from +.Pa da0 +.Bd -literal -offset indent +/sbin/gpart backup -l da0 > da0.backup +.Ed +.Pp +Restore partition table from backup to +.Pa da0 +.Bd -literal -offset indent +/sbin/gpart restore da0 < /mnt/da0.backup +.Ed +.Pp +Clone partition table from +.Pa ada0 +to +.Pa ada1 +and +.Pa ada2 +.Bd -literal -offset indent +/sbin/gpart backup ada0 | /sbin/gpart restore -F ada1 ada2 +.Ed .Sh SEE ALSO .Xr dd 1 , .Xr geom 4 , Modified: projects/sbruno_64cpus/sbin/mount/mount.8 ============================================================================== --- projects/sbruno_64cpus/sbin/mount/mount.8 Sun Nov 21 00:53:27 2010 (r215603) +++ projects/sbruno_64cpus/sbin/mount/mount.8 Sun Nov 21 02:00:54 2010 (r215604) @@ -305,9 +305,6 @@ When you are done with the mounted snaps umount /mnt mdconfig -d -u 4 .Ed -.Pp -Further details can be found in the file at -.Pa /usr/src/sys/ufs/ffs/README.snapshot . .El .It Cm suiddir A directory on the mounted file system will respond to the SUID bit Modified: projects/sbruno_64cpus/share/man/man1/builtin.1 ============================================================================== --- projects/sbruno_64cpus/share/man/man1/builtin.1 Sun Nov 21 00:53:27 2010 (r215603) +++ projects/sbruno_64cpus/share/man/man1/builtin.1 Sun Nov 21 02:00:54 2010 (r215604) @@ -26,7 +26,7 @@ .\" .\" $FreeBSD$ .\" -.Dd May 9, 2010 +.Dd November 19, 2010 .Dt BUILTIN 1 .Os .Sh NAME @@ -99,6 +99,7 @@ .Nm onintr , .Nm popd , .Nm printenv , +.Nm printf , .Nm pushd , .Nm pwd , .Nm read , @@ -263,6 +264,7 @@ but are implemented as scripts using a b .It Ic onintr Ta \&No Ta Yes Ta \&No .It Ic popd Ta \&No Ta Yes Ta \&No .It Ic printenv Ta Yes Ta Yes Ta \&No +.It Ic printf Ta Yes Ta \&No Ta Yes .It Ic pushd Ta \&No Ta Yes Ta \&No .It Ic pwd Ta Yes Ta \&No Ta Yes .It Ic read Ta No** Ta \&No Ta Yes @@ -313,6 +315,7 @@ but are implemented as scripts using a b .Xr nice 1 , .Xr nohup 1 , .Xr printenv 1 , +.Xr printf 1 , .Xr pwd 1 , .Xr sh 1 , .Xr test 1 , Modified: projects/sbruno_64cpus/share/man/man4/ata.4 ============================================================================== --- projects/sbruno_64cpus/share/man/man4/ata.4 Sun Nov 21 00:53:27 2010 (r215603) +++ projects/sbruno_64cpus/share/man/man4/ata.4 Sun Nov 21 02:00:54 2010 (r215604) @@ -183,7 +183,7 @@ SIS963, SIS964, SIS965. .It VIA: VT6410, VT6420, VT6421, VT82C586, VT82C586B, VT82C596, VT82C596B, VT82C686, VT82C686A, VT82C686B, VT8231, VT8233, VT8233A, VT8233C, VT8235, VT8237, -VT8237A, VT8237S, VT8251, CX700, VX800, VX855. +VT8237A, VT8237S, VT8251, CX700, VX800, VX855, VX900. .El .Pp Unknown ATA chipsets are supported in PIO modes, and if the standard Modified: projects/sbruno_64cpus/sys/amd64/include/specialreg.h ============================================================================== --- projects/sbruno_64cpus/sys/amd64/include/specialreg.h Sun Nov 21 00:53:27 2010 (r215603) +++ projects/sbruno_64cpus/sys/amd64/include/specialreg.h Sun Nov 21 02:00:54 2010 (r215604) @@ -206,6 +206,7 @@ #define AMDPM_100MHZ_STEPS 0x00000040 #define AMDPM_HW_PSTATE 0x00000080 #define AMDPM_TSC_INVARIANT 0x00000100 +#define AMDPM_CPB 0x00000200 /* * AMD extended function 8000_0008h ecx info @@ -239,6 +240,8 @@ #define MSR_BIOS_SIGN 0x08b #define MSR_PERFCTR0 0x0c1 #define MSR_PERFCTR1 0x0c2 +#define MSR_MPERF 0x0e7 +#define MSR_APERF 0x0e8 #define MSR_IA32_EXT_CONFIG 0x0ee /* Undocumented. Core Solo/Duo only */ #define MSR_MTRRcap 0x0fe #define MSR_BBL_CR_ADDR 0x116 @@ -503,6 +506,7 @@ #define MSR_PERFCTR2 0xc0010006 #define MSR_PERFCTR3 0xc0010007 #define MSR_SYSCFG 0xc0010010 +#define MSR_HWCR 0xc0010015 #define MSR_IORRBASE0 0xc0010016 #define MSR_IORRMASK0 0xc0010017 #define MSR_IORRBASE1 0xc0010018 Modified: projects/sbruno_64cpus/sys/boot/ofw/libofw/openfirm.c ============================================================================== --- projects/sbruno_64cpus/sys/boot/ofw/libofw/openfirm.c Sun Nov 21 00:53:27 2010 (r215603) +++ projects/sbruno_64cpus/sys/boot/ofw/libofw/openfirm.c Sun Nov 21 02:00:54 2010 (r215604) @@ -77,7 +77,7 @@ void OF_init(int (*openfirm)(void *)) { phandle_t options; - char mode[8]; + char mode[sizeof("true")]; openfirmware = openfirm; @@ -93,13 +93,13 @@ OF_init(int (*openfirm)(void *)) if (OF_getprop(chosen, "mmu", &mmu, sizeof(mmu)) == -1) OF_exit(); - /* + /* * Check if we run in real mode. If so, we do not need to map * memory later on. */ options = OF_finddevice("/options"); - OF_getprop(options, "real-mode?", mode, sizeof(mode)); - if (strncmp(mode, "true", 4) == 0) + if (OF_getprop(options, "real-mode?", mode, sizeof(mode)) > 0 && + strcmp(mode, "true") == 0) real_mode = 1; } Modified: projects/sbruno_64cpus/sys/dev/acpica/acpi_hpet.c ============================================================================== --- projects/sbruno_64cpus/sys/dev/acpica/acpi_hpet.c Sun Nov 21 00:53:27 2010 (r215603) +++ projects/sbruno_64cpus/sys/dev/acpica/acpi_hpet.c Sun Nov 21 02:00:54 2010 (r215604) @@ -501,7 +501,7 @@ hpet_attach(device_t dev) /* * Neither QEMU nor VirtualBox report supported IRQs correctly. * The only way to use HPET there is to specify IRQs manually - * and/or use legacy_route. Legacy_route mode work on both. + * and/or use legacy_route. Legacy_route mode works on both. */ if (vm_guest) sc->allowed_irqs = 0x00000000; @@ -591,7 +591,7 @@ hpet_attach(device_t dev) bus_write_4(sc->mem_res, HPET_ISR, 0xffffffff); sc->irq = -1; sc->intr_rid = -1; - /* If at least one timer needs legacy IRQ - setup it. */ + /* If at least one timer needs legacy IRQ - set it up. */ if (sc->useirq) { j = i = fls(cvectors) - 1; while (j > 0 && (cvectors & (1 << (j - 1))) != 0) Modified: projects/sbruno_64cpus/sys/dev/ata/ata-all.c ============================================================================== --- projects/sbruno_64cpus/sys/dev/ata/ata-all.c Sun Nov 21 00:53:27 2010 (r215603) +++ projects/sbruno_64cpus/sys/dev/ata/ata-all.c Sun Nov 21 02:00:54 2010 (r215604) @@ -171,7 +171,12 @@ ata_attach(device_t dev) ch->user[i].bytecount = 8192; else ch->user[i].bytecount = MAXPHYS; + ch->user[i].caps = 0; ch->curr[i] = ch->user[i]; + if (ch->pm_level > 0) + ch->user[i].caps |= CTS_SATA_CAPS_H_PMREQ; + if (ch->pm_level > 1) + ch->user[i].caps |= CTS_SATA_CAPS_D_PMREQ; } #endif callout_init(&ch->poll_callout, 1); @@ -1627,6 +1632,8 @@ ataaction(struct cam_sim *sim, union ccb d->bytecount = min(8192, cts->xport_specific.sata.bytecount); if (cts->xport_specific.sata.valid & CTS_SATA_VALID_ATAPI) d->atapi = cts->xport_specific.sata.atapi; + if (cts->xport_specific.sata.valid & CTS_SATA_VALID_CAPS) + d->caps = cts->xport_specific.sata.caps; } else { if (cts->xport_specific.ata.valid & CTS_ATA_VALID_MODE) { if (cts->type == CTS_TYPE_CURRENT_SETTINGS) { @@ -1672,9 +1679,21 @@ ataaction(struct cam_sim *sim, union ccb cts->xport_specific.sata.valid |= CTS_SATA_VALID_REVISION; } + cts->xport_specific.sata.caps = + d->caps & CTS_SATA_CAPS_D; + if (ch->pm_level) { + cts->xport_specific.sata.caps |= + CTS_SATA_CAPS_H_PMREQ; + } + cts->xport_specific.sata.caps &= + ch->user[ccb->ccb_h.target_id].caps; + cts->xport_specific.sata.valid |= + CTS_SATA_VALID_CAPS; } else { cts->xport_specific.sata.revision = d->revision; cts->xport_specific.sata.valid |= CTS_SATA_VALID_REVISION; + cts->xport_specific.sata.caps = d->caps; + cts->xport_specific.sata.valid |= CTS_SATA_VALID_CAPS; } cts->xport_specific.sata.atapi = d->atapi; cts->xport_specific.sata.valid |= CTS_SATA_VALID_ATAPI; Modified: projects/sbruno_64cpus/sys/dev/ata/ata-all.h ============================================================================== --- projects/sbruno_64cpus/sys/dev/ata/ata-all.h Sun Nov 21 00:53:27 2010 (r215603) +++ projects/sbruno_64cpus/sys/dev/ata/ata-all.h Sun Nov 21 02:00:54 2010 (r215604) @@ -535,6 +535,7 @@ struct ata_cam_device { int mode; u_int bytecount; u_int atapi; + u_int caps; }; #endif Modified: projects/sbruno_64cpus/sys/dev/atkbdc/psm.c ============================================================================== --- projects/sbruno_64cpus/sys/dev/atkbdc/psm.c Sun Nov 21 00:53:27 2010 (r215603) +++ projects/sbruno_64cpus/sys/dev/atkbdc/psm.c Sun Nov 21 02:00:54 2010 (r215604) @@ -1214,12 +1214,12 @@ psmprobe(device_t dev) * be that this is only the case when the controller DOES have the aux * port but the port is not wired on the motherboard.) The keyboard * controllers without the port, such as the original AT, are - * supporsed to return with an error code or simply time out. In any + * supposed to return with an error code or simply time out. In any * case, we have to continue probing the port even when the controller * passes this test. * * XXX: some controllers erroneously return the error code 1, 2 or 3 - * when it has the perfectly functional aux port. We have to ignore + * when it has a perfectly functional aux port. We have to ignore * this error code. Even if the controller HAS error with the aux * port, it will be detected later... * XXX: another incompatible controller returns PSM_ACK (0xfa)... @@ -1250,7 +1250,7 @@ psmprobe(device_t dev) if (sc->config & PSM_CONFIG_NORESET) { /* * Don't try to reset the pointing device. It may possibly be - * left in the unknown state, though... + * left in an unknown state, though... */ } else { /* @@ -1277,7 +1277,7 @@ psmprobe(device_t dev) } /* - * both the aux port and the aux device is functioning, see if the + * both the aux port and the aux device are functioning, see if the * device can be enabled. NOTE: when enabled, the device will start * sending data; we shall immediately disable the device once we know * the device can be enabled. Modified: projects/sbruno_64cpus/sys/dev/mii/atphy.c ============================================================================== --- projects/sbruno_64cpus/sys/dev/mii/atphy.c Sun Nov 21 00:53:27 2010 (r215603) +++ projects/sbruno_64cpus/sys/dev/mii/atphy.c Sun Nov 21 02:00:54 2010 (r215604) @@ -317,6 +317,7 @@ atphy_status(struct mii_softc *sc) static void atphy_reset(struct mii_softc *sc) { + struct ifmedia_entry *ife = sc->mii_pdata->mii_media.ifm_cur; struct atphy_softc *asc; uint32_t reg; int i; @@ -339,7 +340,7 @@ atphy_reset(struct mii_softc *sc) PHY_WRITE(sc, ATPHY_SCR, reg); /* Workaround F1 bug to reset phy. */ - atphy_setmedia(sc, sc->mii_pdata->mii_media.ifm_cur->ifm_media); + atphy_setmedia(sc, ife == NULL ? IFM_AUTO : ife->ifm_media); for (i = 0; i < 1000; i++) { DELAY(1); Modified: projects/sbruno_64cpus/sys/fs/cd9660/cd9660_node.c ============================================================================== --- projects/sbruno_64cpus/sys/fs/cd9660/cd9660_node.c Sun Nov 21 00:53:27 2010 (r215603) +++ projects/sbruno_64cpus/sys/fs/cd9660/cd9660_node.c Sun Nov 21 02:00:54 2010 (r215604) @@ -69,9 +69,6 @@ cd9660_inactive(ap) struct iso_node *ip = VTOI(vp); int error = 0; - if (prtactive && vrefcnt(vp) != 0) - vprint("cd9660_inactive: pushing active", vp); - /* * If we are done with the inode, reclaim it * so that it can be reused immediately. @@ -93,8 +90,6 @@ cd9660_reclaim(ap) { struct vnode *vp = ap->a_vp; - if (prtactive && vrefcnt(vp) != 0) - vprint("cd9660_reclaim: pushing active", vp); /* *** DIFF OUTPUT TRUNCATED AT 1000 LINES *** From owner-svn-src-projects@FreeBSD.ORG Mon Nov 22 01:22:24 2010 Return-Path: Delivered-To: svn-src-projects@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 8FF76106564A; Mon, 22 Nov 2010 01:22:24 +0000 (UTC) (envelope-from sbruno@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id 7EA658FC14; Mon, 22 Nov 2010 01:22:24 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id oAM1MOdu073852; Mon, 22 Nov 2010 01:22:24 GMT (envelope-from sbruno@svn.freebsd.org) Received: (from sbruno@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id oAM1MO6o073848; Mon, 22 Nov 2010 01:22:24 GMT (envelope-from sbruno@svn.freebsd.org) Message-Id: <201011220122.oAM1MO6o073848@svn.freebsd.org> From: Sean Bruno Date: Mon, 22 Nov 2010 01:22:24 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org X-SVN-Group: projects MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r215650 - in projects/sbruno_64cpus/sys/amd64: amd64 include X-BeenThere: svn-src-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "SVN commit messages for the src " projects" tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 22 Nov 2010 01:22:24 -0000 Author: sbruno Date: Mon Nov 22 01:22:24 2010 New Revision: 215650 URL: http://svn.freebsd.org/changeset/base/215650 Log: Patch from alc@ to test large memory systems. I can't quite see how to build a release ISO from a local directory, so commit this here for testing. Modified: projects/sbruno_64cpus/sys/amd64/amd64/pmap.c projects/sbruno_64cpus/sys/amd64/include/pmap.h projects/sbruno_64cpus/sys/amd64/include/vmparam.h Modified: projects/sbruno_64cpus/sys/amd64/amd64/pmap.c ============================================================================== --- projects/sbruno_64cpus/sys/amd64/amd64/pmap.c Mon Nov 22 01:11:28 2010 (r215649) +++ projects/sbruno_64cpus/sys/amd64/amd64/pmap.c Mon Nov 22 01:22:24 2010 (r215650) @@ -530,6 +530,8 @@ create_pagetables(vm_paddr_t *firstaddr) /* Connect the Direct Map slot up to the PML4 */ ((pdp_entry_t *)KPML4phys)[DMPML4I] = DMPDPphys; ((pdp_entry_t *)KPML4phys)[DMPML4I] |= PG_RW | PG_V | PG_U; + ((pdp_entry_t *)KPML4phys)[DMPML4I + 1] = DMPDPphys + PAGE_SIZE; + ((pdp_entry_t *)KPML4phys)[DMPML4I + 1] |= PG_RW | PG_V | PG_U; /* Connect the KVA slot up to the PML4 */ ((pdp_entry_t *)KPML4phys)[KPML4I] = KPDPphys; @@ -1620,6 +1622,7 @@ pmap_pinit(pmap_t pmap) /* Wire in kernel global address entries. */ pmap->pm_pml4[KPML4I] = KPDPphys | PG_RW | PG_V | PG_U; pmap->pm_pml4[DMPML4I] = DMPDPphys | PG_RW | PG_V | PG_U; + pmap->pm_pml4[DMPML4I + 1] = (DMPDPphys + PAGE_SIZE) | PG_RW | PG_V | PG_U; /* install self-referential address mapping entry(s) */ pmap->pm_pml4[PML4PML4I] = VM_PAGE_TO_PHYS(pml4pg) | PG_V | PG_RW | PG_A | PG_M; @@ -1879,6 +1882,7 @@ pmap_release(pmap_t pmap) pmap->pm_pml4[KPML4I] = 0; /* KVA */ pmap->pm_pml4[DMPML4I] = 0; /* Direct Map */ + pmap->pm_pml4[DMPML4I + 1] = 0; /* Direct Map */ pmap->pm_pml4[PML4PML4I] = 0; /* Recursive Mapping */ m->wire_count--; Modified: projects/sbruno_64cpus/sys/amd64/include/pmap.h ============================================================================== --- projects/sbruno_64cpus/sys/amd64/include/pmap.h Mon Nov 22 01:11:28 2010 (r215649) +++ projects/sbruno_64cpus/sys/amd64/include/pmap.h Mon Nov 22 01:22:24 2010 (r215650) @@ -125,7 +125,7 @@ #define NUPDPE (NUPML4E*NPDPEPG)/* number of userland PDP pages */ #define NUPDE (NUPDPE*NPDEPG) /* number of userland PD entries */ -#define NDMPML4E 1 /* number of dmap PML4 slots */ +#define NDMPML4E 2 /* number of dmap PML4 slots */ /* * The *PDI values control the layout of virtual memory @@ -133,7 +133,7 @@ #define PML4PML4I (NPML4EPG/2) /* Index of recursive pml4 mapping */ #define KPML4I (NPML4EPG-1) /* Top 512GB for KVM */ -#define DMPML4I (KPML4I-1) /* Next 512GB down for direct map */ +#define DMPML4I (KPML4I-3) /* Next 512GB down for direct map */ #define KPDPI (NPDPEPG-2) /* kernbase at -2GB */ Modified: projects/sbruno_64cpus/sys/amd64/include/vmparam.h ============================================================================== --- projects/sbruno_64cpus/sys/amd64/include/vmparam.h Mon Nov 22 01:11:28 2010 (r215649) +++ projects/sbruno_64cpus/sys/amd64/include/vmparam.h Mon Nov 22 01:22:24 2010 (r215650) @@ -176,7 +176,7 @@ #define VM_MIN_KERNEL_ADDRESS KVADDR(KPML4I, NPDPEPG-512, 0, 0) #define DMAP_MIN_ADDRESS KVADDR(DMPML4I, 0, 0, 0) -#define DMAP_MAX_ADDRESS KVADDR(DMPML4I+1, 0, 0, 0) +#define DMAP_MAX_ADDRESS KVADDR(DMPML4I+2, 0, 0, 0) #define KERNBASE KVADDR(KPML4I, KPDPI, 0, 0) From owner-svn-src-projects@FreeBSD.ORG Mon Nov 22 20:52:19 2010 Return-Path: Delivered-To: svn-src-projects@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id F0962106564A; Mon, 22 Nov 2010 20:52:19 +0000 (UTC) (envelope-from dim@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id DB2B68FC08; Mon, 22 Nov 2010 20:52:19 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id oAMKqJiQ005490; Mon, 22 Nov 2010 20:52:19 GMT (envelope-from dim@svn.freebsd.org) Received: (from dim@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id oAMKqJQO005451; Mon, 22 Nov 2010 20:52:19 GMT (envelope-from dim@svn.freebsd.org) Message-Id: <201011222052.oAMKqJQO005451@svn.freebsd.org> From: Dimitry Andric Date: Mon, 22 Nov 2010 20:52:19 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org X-SVN-Group: projects MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r215710 - in projects/binutils-2.17: . bin/sh contrib/binutils/bfd contrib/binutils/binutils contrib/binutils/include/elf contrib/file contrib/gcc contrib/gcc/config contrib/gcc/config/... X-BeenThere: svn-src-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "SVN commit messages for the src " projects" tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 22 Nov 2010 20:52:20 -0000 Author: dim Date: Mon Nov 22 20:52:18 2010 New Revision: 215710 URL: http://svn.freebsd.org/changeset/base/215710 Log: Sync: merge r215464 through r215708 from ^/head. Added: projects/binutils-2.17/sys/dev/usb/usb_pf.c - copied unchanged from r215706, head/sys/dev/usb/usb_pf.c projects/binutils-2.17/sys/dev/usb/usb_pf.h - copied unchanged from r215706, head/sys/dev/usb/usb_pf.h projects/binutils-2.17/tools/regression/bin/sh/builtins/wait3.0 - copied unchanged from r215706, head/tools/regression/bin/sh/builtins/wait3.0 projects/binutils-2.17/tools/regression/bin/sh/expansion/arith6.0 - copied unchanged from r215706, head/tools/regression/bin/sh/expansion/arith6.0 projects/binutils-2.17/usr.sbin/usbdump/ - copied from r215706, head/usr.sbin/usbdump/ Deleted: projects/binutils-2.17/sys/ufs/ffs/README.snapshot Modified: projects/binutils-2.17/ObsoleteFiles.inc projects/binutils-2.17/bin/sh/Makefile projects/binutils-2.17/bin/sh/arith_lex.l projects/binutils-2.17/bin/sh/builtins.def projects/binutils-2.17/bin/sh/eval.c projects/binutils-2.17/bin/sh/expand.c projects/binutils-2.17/bin/sh/main.c projects/binutils-2.17/bin/sh/mksyntax.c projects/binutils-2.17/bin/sh/options.c projects/binutils-2.17/bin/sh/output.c projects/binutils-2.17/bin/sh/output.h projects/binutils-2.17/bin/sh/sh.1 projects/binutils-2.17/bin/sh/var.c projects/binutils-2.17/contrib/binutils/bfd/elf-bfd.h projects/binutils-2.17/contrib/binutils/bfd/elf.c projects/binutils-2.17/contrib/binutils/binutils/readelf.c projects/binutils-2.17/contrib/binutils/include/elf/common.h projects/binutils-2.17/contrib/file/readelf.h projects/binutils-2.17/contrib/gcc/cgraphunit.c projects/binutils-2.17/contrib/gcc/config/elfos.h projects/binutils-2.17/contrib/gcc/config/ia64/hpux.h projects/binutils-2.17/contrib/gcc/config/ia64/ia64.c projects/binutils-2.17/contrib/gcc/config/ia64/unwind-ia64.h projects/binutils-2.17/contrib/gcc/output.h projects/binutils-2.17/contrib/gcc/toplev.c projects/binutils-2.17/contrib/gcc/varasm.c projects/binutils-2.17/contrib/gdb/gdb/fbsd-proc.c projects/binutils-2.17/crypto/openssl/CHANGES projects/binutils-2.17/crypto/openssl/Configure projects/binutils-2.17/crypto/openssl/FAQ projects/binutils-2.17/crypto/openssl/Makefile projects/binutils-2.17/crypto/openssl/NEWS projects/binutils-2.17/crypto/openssl/PROBLEMS projects/binutils-2.17/crypto/openssl/README projects/binutils-2.17/crypto/openssl/apps/apps.c projects/binutils-2.17/crypto/openssl/apps/dh.c projects/binutils-2.17/crypto/openssl/apps/dhparam.c projects/binutils-2.17/crypto/openssl/apps/dsaparam.c projects/binutils-2.17/crypto/openssl/apps/ec.c projects/binutils-2.17/crypto/openssl/apps/ecparam.c projects/binutils-2.17/crypto/openssl/apps/enc.c projects/binutils-2.17/crypto/openssl/apps/gendh.c projects/binutils-2.17/crypto/openssl/apps/gendsa.c projects/binutils-2.17/crypto/openssl/apps/genrsa.c projects/binutils-2.17/crypto/openssl/apps/pkcs7.c projects/binutils-2.17/crypto/openssl/apps/rand.c projects/binutils-2.17/crypto/openssl/apps/s_server.c projects/binutils-2.17/crypto/openssl/apps/s_socket.c projects/binutils-2.17/crypto/openssl/apps/speed.c projects/binutils-2.17/crypto/openssl/apps/x509.c projects/binutils-2.17/crypto/openssl/crypto/aes/aes_wrap.c projects/binutils-2.17/crypto/openssl/crypto/aes/asm/aes-x86_64.pl projects/binutils-2.17/crypto/openssl/crypto/asn1/a_int.c projects/binutils-2.17/crypto/openssl/crypto/asn1/n_pkey.c projects/binutils-2.17/crypto/openssl/crypto/asn1/t_crl.c projects/binutils-2.17/crypto/openssl/crypto/asn1/tasn_dec.c projects/binutils-2.17/crypto/openssl/crypto/asn1/x_x509.c projects/binutils-2.17/crypto/openssl/crypto/bio/b_sock.c projects/binutils-2.17/crypto/openssl/crypto/bio/bf_nbio.c projects/binutils-2.17/crypto/openssl/crypto/bio/bio_lib.c projects/binutils-2.17/crypto/openssl/crypto/bio/bss_acpt.c projects/binutils-2.17/crypto/openssl/crypto/bio/bss_sock.c projects/binutils-2.17/crypto/openssl/crypto/bn/bn_exp2.c projects/binutils-2.17/crypto/openssl/crypto/bn/bn_mul.c projects/binutils-2.17/crypto/openssl/crypto/cms/cms_asn1.c projects/binutils-2.17/crypto/openssl/crypto/conf/conf_def.c projects/binutils-2.17/crypto/openssl/crypto/des/rpc_des.h projects/binutils-2.17/crypto/openssl/crypto/dsa/dsa_gen.c projects/binutils-2.17/crypto/openssl/crypto/dsa/dsa_ossl.c projects/binutils-2.17/crypto/openssl/crypto/ec/ec2_mult.c projects/binutils-2.17/crypto/openssl/crypto/ec/ec_mult.c projects/binutils-2.17/crypto/openssl/crypto/ecdh/ech_lib.c projects/binutils-2.17/crypto/openssl/crypto/ecdsa/ecs_lib.c projects/binutils-2.17/crypto/openssl/crypto/engine/eng_list.c projects/binutils-2.17/crypto/openssl/crypto/err/err_prn.c projects/binutils-2.17/crypto/openssl/crypto/evp/bio_b64.c projects/binutils-2.17/crypto/openssl/crypto/evp/enc_min.c projects/binutils-2.17/crypto/openssl/crypto/evp/encode.c projects/binutils-2.17/crypto/openssl/crypto/evp/evp_pbe.c projects/binutils-2.17/crypto/openssl/crypto/hmac/hmac.c projects/binutils-2.17/crypto/openssl/crypto/md32_common.h projects/binutils-2.17/crypto/openssl/crypto/o_init.c projects/binutils-2.17/crypto/openssl/crypto/ocsp/ocsp_ht.c projects/binutils-2.17/crypto/openssl/crypto/ocsp/ocsp_prn.c projects/binutils-2.17/crypto/openssl/crypto/opensslv.h projects/binutils-2.17/crypto/openssl/crypto/pem/pem_lib.c projects/binutils-2.17/crypto/openssl/crypto/pkcs12/p12_key.c projects/binutils-2.17/crypto/openssl/crypto/pkcs12/p12_npas.c projects/binutils-2.17/crypto/openssl/crypto/pkcs7/pk7_doit.c projects/binutils-2.17/crypto/openssl/crypto/pkcs7/pk7_lib.c projects/binutils-2.17/crypto/openssl/crypto/pkcs7/pk7_mime.c projects/binutils-2.17/crypto/openssl/crypto/pqueue/pqueue.c projects/binutils-2.17/crypto/openssl/crypto/rand/rand_nw.c projects/binutils-2.17/crypto/openssl/crypto/rand/randfile.c projects/binutils-2.17/crypto/openssl/crypto/rsa/rsa_eay.c projects/binutils-2.17/crypto/openssl/crypto/x509/x509.h projects/binutils-2.17/crypto/openssl/crypto/x509/x509_vfy.c projects/binutils-2.17/crypto/openssl/crypto/x509/x_all.c projects/binutils-2.17/crypto/openssl/crypto/x509v3/v3_ncons.c projects/binutils-2.17/crypto/openssl/crypto/x509v3/v3_pci.c projects/binutils-2.17/crypto/openssl/doc/apps/smime.pod projects/binutils-2.17/crypto/openssl/doc/crypto/ASN1_OBJECT_new.pod projects/binutils-2.17/crypto/openssl/doc/crypto/ASN1_STRING_length.pod projects/binutils-2.17/crypto/openssl/doc/crypto/ASN1_STRING_new.pod projects/binutils-2.17/crypto/openssl/doc/crypto/ASN1_generate_nconf.pod projects/binutils-2.17/crypto/openssl/doc/crypto/BIO_f_buffer.pod projects/binutils-2.17/crypto/openssl/doc/crypto/BIO_should_retry.pod projects/binutils-2.17/crypto/openssl/doc/crypto/CRYPTO_set_ex_data.pod projects/binutils-2.17/crypto/openssl/doc/crypto/OBJ_nid2obj.pod projects/binutils-2.17/crypto/openssl/doc/crypto/PKCS7_decrypt.pod projects/binutils-2.17/crypto/openssl/doc/crypto/PKCS7_encrypt.pod projects/binutils-2.17/crypto/openssl/doc/crypto/PKCS7_sign.pod projects/binutils-2.17/crypto/openssl/doc/crypto/PKCS7_verify.pod projects/binutils-2.17/crypto/openssl/doc/crypto/SMIME_read_PKCS7.pod projects/binutils-2.17/crypto/openssl/doc/crypto/SMIME_write_PKCS7.pod projects/binutils-2.17/crypto/openssl/doc/crypto/X509_NAME_ENTRY_get_object.pod projects/binutils-2.17/crypto/openssl/doc/crypto/X509_NAME_add_entry_by_txt.pod projects/binutils-2.17/crypto/openssl/doc/crypto/X509_NAME_get_index_by_NID.pod projects/binutils-2.17/crypto/openssl/doc/crypto/X509_new.pod projects/binutils-2.17/crypto/openssl/doc/crypto/bn_internal.pod projects/binutils-2.17/crypto/openssl/doc/crypto/ui_compat.pod projects/binutils-2.17/crypto/openssl/doc/ssl/SSL_library_init.pod projects/binutils-2.17/crypto/openssl/e_os.h projects/binutils-2.17/crypto/openssl/engines/e_chil.c projects/binutils-2.17/crypto/openssl/engines/e_cswift.c projects/binutils-2.17/crypto/openssl/engines/e_ubsec.c projects/binutils-2.17/crypto/openssl/fips/mkfipsscr.pl projects/binutils-2.17/crypto/openssl/openssl.spec projects/binutils-2.17/crypto/openssl/ssl/d1_both.c projects/binutils-2.17/crypto/openssl/ssl/d1_clnt.c projects/binutils-2.17/crypto/openssl/ssl/d1_enc.c projects/binutils-2.17/crypto/openssl/ssl/d1_lib.c projects/binutils-2.17/crypto/openssl/ssl/d1_pkt.c projects/binutils-2.17/crypto/openssl/ssl/dtls1.h projects/binutils-2.17/crypto/openssl/ssl/s23_clnt.c projects/binutils-2.17/crypto/openssl/ssl/s23_lib.c projects/binutils-2.17/crypto/openssl/ssl/s2_srvr.c projects/binutils-2.17/crypto/openssl/ssl/s3_both.c projects/binutils-2.17/crypto/openssl/ssl/s3_clnt.c projects/binutils-2.17/crypto/openssl/ssl/s3_enc.c projects/binutils-2.17/crypto/openssl/ssl/ssl_algs.c projects/binutils-2.17/crypto/openssl/ssl/ssl_asn1.c projects/binutils-2.17/crypto/openssl/ssl/ssl_cert.c projects/binutils-2.17/crypto/openssl/ssl/ssl_ciph.c projects/binutils-2.17/crypto/openssl/ssl/ssl_lib.c projects/binutils-2.17/crypto/openssl/ssl/ssltest.c projects/binutils-2.17/crypto/openssl/ssl/t1_enc.c projects/binutils-2.17/crypto/openssl/ssl/t1_lib.c projects/binutils-2.17/crypto/openssl/test/cms-test.pl projects/binutils-2.17/crypto/openssl/tools/c_rehash projects/binutils-2.17/crypto/openssl/tools/c_rehash.in projects/binutils-2.17/crypto/openssl/util/libeay.num projects/binutils-2.17/crypto/openssl/util/mkdef.pl projects/binutils-2.17/crypto/openssl/util/pl/VC-32.pl projects/binutils-2.17/gnu/usr.bin/gdb/libgdb/fbsd-threads.c projects/binutils-2.17/lib/liblzma/Symbol.map projects/binutils-2.17/lib/libpam/modules/pam_unix/pam_unix.c projects/binutils-2.17/sbin/bsdlabel/bsdlabel.c projects/binutils-2.17/sbin/camcontrol/camcontrol.c projects/binutils-2.17/sbin/ddb/ddb.c projects/binutils-2.17/sbin/devd/devd.cc projects/binutils-2.17/sbin/devd/token.l projects/binutils-2.17/sbin/geom/class/eli/geom_eli.c projects/binutils-2.17/sbin/geom/class/part/geom_part.c projects/binutils-2.17/sbin/geom/class/part/gpart.8 projects/binutils-2.17/sbin/geom/class/virstor/geom_virstor.c projects/binutils-2.17/sbin/growfs/debug.c projects/binutils-2.17/sbin/gvinum/gvinum.c projects/binutils-2.17/sbin/hastctl/Makefile projects/binutils-2.17/sbin/hastd/Makefile projects/binutils-2.17/sbin/mknod/mknod.c projects/binutils-2.17/sbin/mount/mount.8 projects/binutils-2.17/sbin/routed/parms.c projects/binutils-2.17/secure/lib/libcrypto/Makefile.inc projects/binutils-2.17/secure/lib/libcrypto/man/ASN1_OBJECT_new.3 projects/binutils-2.17/secure/lib/libcrypto/man/ASN1_STRING_length.3 projects/binutils-2.17/secure/lib/libcrypto/man/ASN1_STRING_new.3 projects/binutils-2.17/secure/lib/libcrypto/man/ASN1_STRING_print_ex.3 projects/binutils-2.17/secure/lib/libcrypto/man/ASN1_generate_nconf.3 projects/binutils-2.17/secure/lib/libcrypto/man/BIO_ctrl.3 projects/binutils-2.17/secure/lib/libcrypto/man/BIO_f_base64.3 projects/binutils-2.17/secure/lib/libcrypto/man/BIO_f_buffer.3 projects/binutils-2.17/secure/lib/libcrypto/man/BIO_f_cipher.3 projects/binutils-2.17/secure/lib/libcrypto/man/BIO_f_md.3 projects/binutils-2.17/secure/lib/libcrypto/man/BIO_f_null.3 projects/binutils-2.17/secure/lib/libcrypto/man/BIO_f_ssl.3 projects/binutils-2.17/secure/lib/libcrypto/man/BIO_find_type.3 projects/binutils-2.17/secure/lib/libcrypto/man/BIO_new.3 projects/binutils-2.17/secure/lib/libcrypto/man/BIO_push.3 projects/binutils-2.17/secure/lib/libcrypto/man/BIO_read.3 projects/binutils-2.17/secure/lib/libcrypto/man/BIO_s_accept.3 projects/binutils-2.17/secure/lib/libcrypto/man/BIO_s_bio.3 projects/binutils-2.17/secure/lib/libcrypto/man/BIO_s_connect.3 projects/binutils-2.17/secure/lib/libcrypto/man/BIO_s_fd.3 projects/binutils-2.17/secure/lib/libcrypto/man/BIO_s_file.3 projects/binutils-2.17/secure/lib/libcrypto/man/BIO_s_mem.3 projects/binutils-2.17/secure/lib/libcrypto/man/BIO_s_null.3 projects/binutils-2.17/secure/lib/libcrypto/man/BIO_s_socket.3 projects/binutils-2.17/secure/lib/libcrypto/man/BIO_set_callback.3 projects/binutils-2.17/secure/lib/libcrypto/man/BIO_should_retry.3 projects/binutils-2.17/secure/lib/libcrypto/man/BN_BLINDING_new.3 projects/binutils-2.17/secure/lib/libcrypto/man/BN_CTX_new.3 projects/binutils-2.17/secure/lib/libcrypto/man/BN_CTX_start.3 projects/binutils-2.17/secure/lib/libcrypto/man/BN_add.3 projects/binutils-2.17/secure/lib/libcrypto/man/BN_add_word.3 projects/binutils-2.17/secure/lib/libcrypto/man/BN_bn2bin.3 projects/binutils-2.17/secure/lib/libcrypto/man/BN_cmp.3 projects/binutils-2.17/secure/lib/libcrypto/man/BN_copy.3 projects/binutils-2.17/secure/lib/libcrypto/man/BN_generate_prime.3 projects/binutils-2.17/secure/lib/libcrypto/man/BN_mod_inverse.3 projects/binutils-2.17/secure/lib/libcrypto/man/BN_mod_mul_montgomery.3 projects/binutils-2.17/secure/lib/libcrypto/man/BN_mod_mul_reciprocal.3 projects/binutils-2.17/secure/lib/libcrypto/man/BN_new.3 projects/binutils-2.17/secure/lib/libcrypto/man/BN_num_bytes.3 projects/binutils-2.17/secure/lib/libcrypto/man/BN_rand.3 projects/binutils-2.17/secure/lib/libcrypto/man/BN_set_bit.3 projects/binutils-2.17/secure/lib/libcrypto/man/BN_swap.3 projects/binutils-2.17/secure/lib/libcrypto/man/BN_zero.3 projects/binutils-2.17/secure/lib/libcrypto/man/CONF_modules_free.3 projects/binutils-2.17/secure/lib/libcrypto/man/CONF_modules_load_file.3 projects/binutils-2.17/secure/lib/libcrypto/man/CRYPTO_set_ex_data.3 projects/binutils-2.17/secure/lib/libcrypto/man/DH_generate_key.3 projects/binutils-2.17/secure/lib/libcrypto/man/DH_generate_parameters.3 projects/binutils-2.17/secure/lib/libcrypto/man/DH_get_ex_new_index.3 projects/binutils-2.17/secure/lib/libcrypto/man/DH_new.3 projects/binutils-2.17/secure/lib/libcrypto/man/DH_set_method.3 projects/binutils-2.17/secure/lib/libcrypto/man/DH_size.3 projects/binutils-2.17/secure/lib/libcrypto/man/DSA_SIG_new.3 projects/binutils-2.17/secure/lib/libcrypto/man/DSA_do_sign.3 projects/binutils-2.17/secure/lib/libcrypto/man/DSA_dup_DH.3 projects/binutils-2.17/secure/lib/libcrypto/man/DSA_generate_key.3 projects/binutils-2.17/secure/lib/libcrypto/man/DSA_generate_parameters.3 projects/binutils-2.17/secure/lib/libcrypto/man/DSA_get_ex_new_index.3 projects/binutils-2.17/secure/lib/libcrypto/man/DSA_new.3 projects/binutils-2.17/secure/lib/libcrypto/man/DSA_set_method.3 projects/binutils-2.17/secure/lib/libcrypto/man/DSA_sign.3 projects/binutils-2.17/secure/lib/libcrypto/man/DSA_size.3 projects/binutils-2.17/secure/lib/libcrypto/man/ERR_GET_LIB.3 projects/binutils-2.17/secure/lib/libcrypto/man/ERR_clear_error.3 projects/binutils-2.17/secure/lib/libcrypto/man/ERR_error_string.3 projects/binutils-2.17/secure/lib/libcrypto/man/ERR_get_error.3 projects/binutils-2.17/secure/lib/libcrypto/man/ERR_load_crypto_strings.3 projects/binutils-2.17/secure/lib/libcrypto/man/ERR_load_strings.3 projects/binutils-2.17/secure/lib/libcrypto/man/ERR_print_errors.3 projects/binutils-2.17/secure/lib/libcrypto/man/ERR_put_error.3 projects/binutils-2.17/secure/lib/libcrypto/man/ERR_remove_state.3 projects/binutils-2.17/secure/lib/libcrypto/man/ERR_set_mark.3 projects/binutils-2.17/secure/lib/libcrypto/man/EVP_BytesToKey.3 projects/binutils-2.17/secure/lib/libcrypto/man/EVP_DigestInit.3 projects/binutils-2.17/secure/lib/libcrypto/man/EVP_EncryptInit.3 projects/binutils-2.17/secure/lib/libcrypto/man/EVP_OpenInit.3 projects/binutils-2.17/secure/lib/libcrypto/man/EVP_PKEY_new.3 projects/binutils-2.17/secure/lib/libcrypto/man/EVP_PKEY_set1_RSA.3 projects/binutils-2.17/secure/lib/libcrypto/man/EVP_SealInit.3 projects/binutils-2.17/secure/lib/libcrypto/man/EVP_SignInit.3 projects/binutils-2.17/secure/lib/libcrypto/man/EVP_VerifyInit.3 projects/binutils-2.17/secure/lib/libcrypto/man/OBJ_nid2obj.3 projects/binutils-2.17/secure/lib/libcrypto/man/OPENSSL_Applink.3 projects/binutils-2.17/secure/lib/libcrypto/man/OPENSSL_VERSION_NUMBER.3 projects/binutils-2.17/secure/lib/libcrypto/man/OPENSSL_config.3 projects/binutils-2.17/secure/lib/libcrypto/man/OPENSSL_ia32cap.3 projects/binutils-2.17/secure/lib/libcrypto/man/OPENSSL_load_builtin_modules.3 projects/binutils-2.17/secure/lib/libcrypto/man/OpenSSL_add_all_algorithms.3 projects/binutils-2.17/secure/lib/libcrypto/man/PKCS12_create.3 projects/binutils-2.17/secure/lib/libcrypto/man/PKCS12_parse.3 projects/binutils-2.17/secure/lib/libcrypto/man/PKCS7_decrypt.3 projects/binutils-2.17/secure/lib/libcrypto/man/PKCS7_encrypt.3 projects/binutils-2.17/secure/lib/libcrypto/man/PKCS7_sign.3 projects/binutils-2.17/secure/lib/libcrypto/man/PKCS7_verify.3 projects/binutils-2.17/secure/lib/libcrypto/man/RAND_add.3 projects/binutils-2.17/secure/lib/libcrypto/man/RAND_bytes.3 projects/binutils-2.17/secure/lib/libcrypto/man/RAND_cleanup.3 projects/binutils-2.17/secure/lib/libcrypto/man/RAND_egd.3 projects/binutils-2.17/secure/lib/libcrypto/man/RAND_load_file.3 projects/binutils-2.17/secure/lib/libcrypto/man/RAND_set_rand_method.3 projects/binutils-2.17/secure/lib/libcrypto/man/RSA_blinding_on.3 projects/binutils-2.17/secure/lib/libcrypto/man/RSA_check_key.3 projects/binutils-2.17/secure/lib/libcrypto/man/RSA_generate_key.3 projects/binutils-2.17/secure/lib/libcrypto/man/RSA_get_ex_new_index.3 projects/binutils-2.17/secure/lib/libcrypto/man/RSA_new.3 projects/binutils-2.17/secure/lib/libcrypto/man/RSA_padding_add_PKCS1_type_1.3 projects/binutils-2.17/secure/lib/libcrypto/man/RSA_print.3 projects/binutils-2.17/secure/lib/libcrypto/man/RSA_private_encrypt.3 projects/binutils-2.17/secure/lib/libcrypto/man/RSA_public_encrypt.3 projects/binutils-2.17/secure/lib/libcrypto/man/RSA_set_method.3 projects/binutils-2.17/secure/lib/libcrypto/man/RSA_sign.3 projects/binutils-2.17/secure/lib/libcrypto/man/RSA_sign_ASN1_OCTET_STRING.3 projects/binutils-2.17/secure/lib/libcrypto/man/RSA_size.3 projects/binutils-2.17/secure/lib/libcrypto/man/SMIME_read_PKCS7.3 projects/binutils-2.17/secure/lib/libcrypto/man/SMIME_write_PKCS7.3 projects/binutils-2.17/secure/lib/libcrypto/man/X509_NAME_ENTRY_get_object.3 projects/binutils-2.17/secure/lib/libcrypto/man/X509_NAME_add_entry_by_txt.3 projects/binutils-2.17/secure/lib/libcrypto/man/X509_NAME_get_index_by_NID.3 projects/binutils-2.17/secure/lib/libcrypto/man/X509_NAME_print_ex.3 projects/binutils-2.17/secure/lib/libcrypto/man/X509_new.3 projects/binutils-2.17/secure/lib/libcrypto/man/bio.3 projects/binutils-2.17/secure/lib/libcrypto/man/blowfish.3 projects/binutils-2.17/secure/lib/libcrypto/man/bn.3 projects/binutils-2.17/secure/lib/libcrypto/man/bn_internal.3 projects/binutils-2.17/secure/lib/libcrypto/man/buffer.3 projects/binutils-2.17/secure/lib/libcrypto/man/crypto.3 projects/binutils-2.17/secure/lib/libcrypto/man/d2i_ASN1_OBJECT.3 projects/binutils-2.17/secure/lib/libcrypto/man/d2i_DHparams.3 projects/binutils-2.17/secure/lib/libcrypto/man/d2i_DSAPublicKey.3 projects/binutils-2.17/secure/lib/libcrypto/man/d2i_PKCS8PrivateKey.3 projects/binutils-2.17/secure/lib/libcrypto/man/d2i_RSAPublicKey.3 projects/binutils-2.17/secure/lib/libcrypto/man/d2i_X509.3 projects/binutils-2.17/secure/lib/libcrypto/man/d2i_X509_ALGOR.3 projects/binutils-2.17/secure/lib/libcrypto/man/d2i_X509_CRL.3 projects/binutils-2.17/secure/lib/libcrypto/man/d2i_X509_NAME.3 projects/binutils-2.17/secure/lib/libcrypto/man/d2i_X509_REQ.3 projects/binutils-2.17/secure/lib/libcrypto/man/d2i_X509_SIG.3 projects/binutils-2.17/secure/lib/libcrypto/man/des.3 projects/binutils-2.17/secure/lib/libcrypto/man/dh.3 projects/binutils-2.17/secure/lib/libcrypto/man/dsa.3 projects/binutils-2.17/secure/lib/libcrypto/man/ecdsa.3 projects/binutils-2.17/secure/lib/libcrypto/man/engine.3 projects/binutils-2.17/secure/lib/libcrypto/man/err.3 projects/binutils-2.17/secure/lib/libcrypto/man/evp.3 projects/binutils-2.17/secure/lib/libcrypto/man/hmac.3 projects/binutils-2.17/secure/lib/libcrypto/man/lh_stats.3 projects/binutils-2.17/secure/lib/libcrypto/man/lhash.3 projects/binutils-2.17/secure/lib/libcrypto/man/md5.3 projects/binutils-2.17/secure/lib/libcrypto/man/mdc2.3 projects/binutils-2.17/secure/lib/libcrypto/man/pem.3 projects/binutils-2.17/secure/lib/libcrypto/man/rand.3 projects/binutils-2.17/secure/lib/libcrypto/man/rc4.3 projects/binutils-2.17/secure/lib/libcrypto/man/ripemd.3 projects/binutils-2.17/secure/lib/libcrypto/man/rsa.3 projects/binutils-2.17/secure/lib/libcrypto/man/sha.3 projects/binutils-2.17/secure/lib/libcrypto/man/threads.3 projects/binutils-2.17/secure/lib/libcrypto/man/ui.3 projects/binutils-2.17/secure/lib/libcrypto/man/ui_compat.3 projects/binutils-2.17/secure/lib/libcrypto/man/x509.3 projects/binutils-2.17/secure/lib/libssl/man/SSL_CIPHER_get_name.3 projects/binutils-2.17/secure/lib/libssl/man/SSL_COMP_add_compression_method.3 projects/binutils-2.17/secure/lib/libssl/man/SSL_CTX_add_extra_chain_cert.3 projects/binutils-2.17/secure/lib/libssl/man/SSL_CTX_add_session.3 projects/binutils-2.17/secure/lib/libssl/man/SSL_CTX_ctrl.3 projects/binutils-2.17/secure/lib/libssl/man/SSL_CTX_flush_sessions.3 projects/binutils-2.17/secure/lib/libssl/man/SSL_CTX_free.3 projects/binutils-2.17/secure/lib/libssl/man/SSL_CTX_get_ex_new_index.3 projects/binutils-2.17/secure/lib/libssl/man/SSL_CTX_get_verify_mode.3 projects/binutils-2.17/secure/lib/libssl/man/SSL_CTX_load_verify_locations.3 projects/binutils-2.17/secure/lib/libssl/man/SSL_CTX_new.3 projects/binutils-2.17/secure/lib/libssl/man/SSL_CTX_sess_number.3 projects/binutils-2.17/secure/lib/libssl/man/SSL_CTX_sess_set_cache_size.3 projects/binutils-2.17/secure/lib/libssl/man/SSL_CTX_sess_set_get_cb.3 projects/binutils-2.17/secure/lib/libssl/man/SSL_CTX_sessions.3 projects/binutils-2.17/secure/lib/libssl/man/SSL_CTX_set_cert_store.3 projects/binutils-2.17/secure/lib/libssl/man/SSL_CTX_set_cert_verify_callback.3 projects/binutils-2.17/secure/lib/libssl/man/SSL_CTX_set_cipher_list.3 projects/binutils-2.17/secure/lib/libssl/man/SSL_CTX_set_client_CA_list.3 projects/binutils-2.17/secure/lib/libssl/man/SSL_CTX_set_client_cert_cb.3 projects/binutils-2.17/secure/lib/libssl/man/SSL_CTX_set_default_passwd_cb.3 projects/binutils-2.17/secure/lib/libssl/man/SSL_CTX_set_generate_session_id.3 projects/binutils-2.17/secure/lib/libssl/man/SSL_CTX_set_info_callback.3 projects/binutils-2.17/secure/lib/libssl/man/SSL_CTX_set_max_cert_list.3 projects/binutils-2.17/secure/lib/libssl/man/SSL_CTX_set_mode.3 projects/binutils-2.17/secure/lib/libssl/man/SSL_CTX_set_msg_callback.3 projects/binutils-2.17/secure/lib/libssl/man/SSL_CTX_set_options.3 projects/binutils-2.17/secure/lib/libssl/man/SSL_CTX_set_quiet_shutdown.3 projects/binutils-2.17/secure/lib/libssl/man/SSL_CTX_set_session_cache_mode.3 projects/binutils-2.17/secure/lib/libssl/man/SSL_CTX_set_session_id_context.3 projects/binutils-2.17/secure/lib/libssl/man/SSL_CTX_set_ssl_version.3 projects/binutils-2.17/secure/lib/libssl/man/SSL_CTX_set_timeout.3 projects/binutils-2.17/secure/lib/libssl/man/SSL_CTX_set_tmp_dh_callback.3 projects/binutils-2.17/secure/lib/libssl/man/SSL_CTX_set_tmp_rsa_callback.3 projects/binutils-2.17/secure/lib/libssl/man/SSL_CTX_set_verify.3 projects/binutils-2.17/secure/lib/libssl/man/SSL_CTX_use_certificate.3 projects/binutils-2.17/secure/lib/libssl/man/SSL_SESSION_free.3 projects/binutils-2.17/secure/lib/libssl/man/SSL_SESSION_get_ex_new_index.3 projects/binutils-2.17/secure/lib/libssl/man/SSL_SESSION_get_time.3 projects/binutils-2.17/secure/lib/libssl/man/SSL_accept.3 projects/binutils-2.17/secure/lib/libssl/man/SSL_alert_type_string.3 projects/binutils-2.17/secure/lib/libssl/man/SSL_clear.3 projects/binutils-2.17/secure/lib/libssl/man/SSL_connect.3 projects/binutils-2.17/secure/lib/libssl/man/SSL_do_handshake.3 projects/binutils-2.17/secure/lib/libssl/man/SSL_free.3 projects/binutils-2.17/secure/lib/libssl/man/SSL_get_SSL_CTX.3 projects/binutils-2.17/secure/lib/libssl/man/SSL_get_ciphers.3 projects/binutils-2.17/secure/lib/libssl/man/SSL_get_client_CA_list.3 projects/binutils-2.17/secure/lib/libssl/man/SSL_get_current_cipher.3 projects/binutils-2.17/secure/lib/libssl/man/SSL_get_default_timeout.3 projects/binutils-2.17/secure/lib/libssl/man/SSL_get_error.3 projects/binutils-2.17/secure/lib/libssl/man/SSL_get_ex_data_X509_STORE_CTX_idx.3 projects/binutils-2.17/secure/lib/libssl/man/SSL_get_ex_new_index.3 projects/binutils-2.17/secure/lib/libssl/man/SSL_get_fd.3 projects/binutils-2.17/secure/lib/libssl/man/SSL_get_peer_cert_chain.3 projects/binutils-2.17/secure/lib/libssl/man/SSL_get_peer_certificate.3 projects/binutils-2.17/secure/lib/libssl/man/SSL_get_rbio.3 projects/binutils-2.17/secure/lib/libssl/man/SSL_get_session.3 projects/binutils-2.17/secure/lib/libssl/man/SSL_get_verify_result.3 projects/binutils-2.17/secure/lib/libssl/man/SSL_get_version.3 projects/binutils-2.17/secure/lib/libssl/man/SSL_library_init.3 projects/binutils-2.17/secure/lib/libssl/man/SSL_load_client_CA_file.3 projects/binutils-2.17/secure/lib/libssl/man/SSL_new.3 projects/binutils-2.17/secure/lib/libssl/man/SSL_pending.3 projects/binutils-2.17/secure/lib/libssl/man/SSL_read.3 projects/binutils-2.17/secure/lib/libssl/man/SSL_rstate_string.3 projects/binutils-2.17/secure/lib/libssl/man/SSL_session_reused.3 projects/binutils-2.17/secure/lib/libssl/man/SSL_set_bio.3 projects/binutils-2.17/secure/lib/libssl/man/SSL_set_connect_state.3 projects/binutils-2.17/secure/lib/libssl/man/SSL_set_fd.3 projects/binutils-2.17/secure/lib/libssl/man/SSL_set_session.3 projects/binutils-2.17/secure/lib/libssl/man/SSL_set_shutdown.3 projects/binutils-2.17/secure/lib/libssl/man/SSL_set_verify_result.3 projects/binutils-2.17/secure/lib/libssl/man/SSL_shutdown.3 projects/binutils-2.17/secure/lib/libssl/man/SSL_state_string.3 projects/binutils-2.17/secure/lib/libssl/man/SSL_want.3 projects/binutils-2.17/secure/lib/libssl/man/SSL_write.3 projects/binutils-2.17/secure/lib/libssl/man/d2i_SSL_SESSION.3 projects/binutils-2.17/secure/lib/libssl/man/ssl.3 projects/binutils-2.17/secure/usr.bin/openssl/man/CA.pl.1 projects/binutils-2.17/secure/usr.bin/openssl/man/asn1parse.1 projects/binutils-2.17/secure/usr.bin/openssl/man/ca.1 projects/binutils-2.17/secure/usr.bin/openssl/man/ciphers.1 projects/binutils-2.17/secure/usr.bin/openssl/man/crl.1 projects/binutils-2.17/secure/usr.bin/openssl/man/crl2pkcs7.1 projects/binutils-2.17/secure/usr.bin/openssl/man/dgst.1 projects/binutils-2.17/secure/usr.bin/openssl/man/dhparam.1 projects/binutils-2.17/secure/usr.bin/openssl/man/dsa.1 projects/binutils-2.17/secure/usr.bin/openssl/man/dsaparam.1 projects/binutils-2.17/secure/usr.bin/openssl/man/ec.1 projects/binutils-2.17/secure/usr.bin/openssl/man/ecparam.1 projects/binutils-2.17/secure/usr.bin/openssl/man/enc.1 projects/binutils-2.17/secure/usr.bin/openssl/man/errstr.1 projects/binutils-2.17/secure/usr.bin/openssl/man/gendsa.1 projects/binutils-2.17/secure/usr.bin/openssl/man/genrsa.1 projects/binutils-2.17/secure/usr.bin/openssl/man/nseq.1 projects/binutils-2.17/secure/usr.bin/openssl/man/ocsp.1 projects/binutils-2.17/secure/usr.bin/openssl/man/openssl.1 projects/binutils-2.17/secure/usr.bin/openssl/man/passwd.1 projects/binutils-2.17/secure/usr.bin/openssl/man/pkcs12.1 projects/binutils-2.17/secure/usr.bin/openssl/man/pkcs7.1 projects/binutils-2.17/secure/usr.bin/openssl/man/pkcs8.1 projects/binutils-2.17/secure/usr.bin/openssl/man/rand.1 projects/binutils-2.17/secure/usr.bin/openssl/man/req.1 projects/binutils-2.17/secure/usr.bin/openssl/man/rsa.1 projects/binutils-2.17/secure/usr.bin/openssl/man/rsautl.1 projects/binutils-2.17/secure/usr.bin/openssl/man/s_client.1 projects/binutils-2.17/secure/usr.bin/openssl/man/s_server.1 projects/binutils-2.17/secure/usr.bin/openssl/man/s_time.1 projects/binutils-2.17/secure/usr.bin/openssl/man/sess_id.1 projects/binutils-2.17/secure/usr.bin/openssl/man/smime.1 projects/binutils-2.17/secure/usr.bin/openssl/man/speed.1 projects/binutils-2.17/secure/usr.bin/openssl/man/spkac.1 projects/binutils-2.17/secure/usr.bin/openssl/man/verify.1 projects/binutils-2.17/secure/usr.bin/openssl/man/version.1 projects/binutils-2.17/secure/usr.bin/openssl/man/x509.1 projects/binutils-2.17/secure/usr.bin/openssl/man/x509v3_config.1 projects/binutils-2.17/share/man/man1/builtin.1 projects/binutils-2.17/sys/Makefile projects/binutils-2.17/sys/amd64/amd64/pmap.c projects/binutils-2.17/sys/amd64/include/specialreg.h projects/binutils-2.17/sys/boot/ofw/libofw/openfirm.c projects/binutils-2.17/sys/compat/freebsd32/freebsd32.h projects/binutils-2.17/sys/compat/linux/linux_emul.c projects/binutils-2.17/sys/compat/linux/linux_emul.h projects/binutils-2.17/sys/compat/linux/linux_futex.c projects/binutils-2.17/sys/compat/linux/linux_misc.c projects/binutils-2.17/sys/compat/ndis/kern_windrv.c projects/binutils-2.17/sys/compat/ndis/ntoskrnl_var.h projects/binutils-2.17/sys/compat/ndis/subr_ntoskrnl.c projects/binutils-2.17/sys/compat/ndis/winx64_wrap.S projects/binutils-2.17/sys/conf/files projects/binutils-2.17/sys/dev/acpica/acpi_hpet.c projects/binutils-2.17/sys/dev/ata/ata-all.c projects/binutils-2.17/sys/dev/ata/ata-all.h projects/binutils-2.17/sys/dev/atkbdc/psm.c projects/binutils-2.17/sys/dev/mxge/if_mxge.c projects/binutils-2.17/sys/dev/usb/controller/usb_controller.c projects/binutils-2.17/sys/dev/usb/usb_bus.h projects/binutils-2.17/sys/dev/usb/usb_controller.h projects/binutils-2.17/sys/dev/usb/usb_transfer.c projects/binutils-2.17/sys/fs/cd9660/cd9660_node.c projects/binutils-2.17/sys/fs/coda/coda_vnops.c projects/binutils-2.17/sys/fs/ext2fs/ext2_inode.c projects/binutils-2.17/sys/fs/hpfs/hpfs_vnops.c projects/binutils-2.17/sys/fs/msdosfs/msdosfs_denode.c projects/binutils-2.17/sys/fs/nfsclient/nfs_clnode.c projects/binutils-2.17/sys/fs/ntfs/ntfs_vnops.c projects/binutils-2.17/sys/geom/geom_event.c projects/binutils-2.17/sys/geom/geom_kern.c projects/binutils-2.17/sys/gnu/fs/reiserfs/reiserfs_inode.c projects/binutils-2.17/sys/i386/i386/initcpu.c projects/binutils-2.17/sys/i386/i386/pmap.c projects/binutils-2.17/sys/i386/include/pmap.h projects/binutils-2.17/sys/i386/include/specialreg.h projects/binutils-2.17/sys/i386/xen/clock.c projects/binutils-2.17/sys/i386/xen/mp_machdep.c projects/binutils-2.17/sys/i386/xen/pmap.c projects/binutils-2.17/sys/i386/xen/xen_machdep.c projects/binutils-2.17/sys/kern/imgact_elf.c projects/binutils-2.17/sys/kern/kern_clock.c projects/binutils-2.17/sys/kern/kern_clocksource.c projects/binutils-2.17/sys/kern/kern_exit.c projects/binutils-2.17/sys/kern/kern_module.c projects/binutils-2.17/sys/kern/kern_tc.c projects/binutils-2.17/sys/kern/kern_umtx.c projects/binutils-2.17/sys/kern/p1003_1b.c projects/binutils-2.17/sys/kern/posix4_mib.c projects/binutils-2.17/sys/kern/sched_4bsd.c projects/binutils-2.17/sys/kern/subr_pcpu.c projects/binutils-2.17/sys/kern/sys_process.c projects/binutils-2.17/sys/kern/uipc_sem.c projects/binutils-2.17/sys/kern/vfs_subr.c projects/binutils-2.17/sys/mips/mips/tick.c projects/binutils-2.17/sys/mips/rmi/tick.c projects/binutils-2.17/sys/modules/usb/usb/Makefile projects/binutils-2.17/sys/net/flowtable.c projects/binutils-2.17/sys/net/if.c projects/binutils-2.17/sys/net/if_clone.c projects/binutils-2.17/sys/net/if_epair.c projects/binutils-2.17/sys/net/if_ethersubr.c projects/binutils-2.17/sys/net/if_gif.c projects/binutils-2.17/sys/net/if_llatbl.c projects/binutils-2.17/sys/net/if_loop.c projects/binutils-2.17/sys/net/route.c projects/binutils-2.17/sys/net/vnet.c projects/binutils-2.17/sys/net/vnet.h projects/binutils-2.17/sys/net80211/ieee80211_scan_sta.c projects/binutils-2.17/sys/netgraph/ng_base.c projects/binutils-2.17/sys/netgraph/ng_eiface.c projects/binutils-2.17/sys/netgraph/ng_eiface.h projects/binutils-2.17/sys/netgraph/ng_iface.c projects/binutils-2.17/sys/netinet/if_ether.c projects/binutils-2.17/sys/netinet/igmp.c projects/binutils-2.17/sys/netinet/in.c projects/binutils-2.17/sys/netinet/in_pcb.c projects/binutils-2.17/sys/netinet/in_rmx.c projects/binutils-2.17/sys/netinet/ip_divert.c projects/binutils-2.17/sys/netinet/ip_fastfwd.c projects/binutils-2.17/sys/netinet/ip_icmp.c projects/binutils-2.17/sys/netinet/ip_input.c projects/binutils-2.17/sys/netinet/ip_ipsec.c projects/binutils-2.17/sys/netinet/ip_mroute.c projects/binutils-2.17/sys/netinet/ipfw/ip_fw2.c projects/binutils-2.17/sys/netinet/ipfw/ip_fw_dynamic.c projects/binutils-2.17/sys/netinet/ipfw/ip_fw_nat.c projects/binutils-2.17/sys/netinet/ipfw/ip_fw_pfil.c projects/binutils-2.17/sys/netinet/siftr.c projects/binutils-2.17/sys/netinet/tcp_hostcache.c projects/binutils-2.17/sys/netinet/tcp_reass.c projects/binutils-2.17/sys/netinet/tcp_subr.c projects/binutils-2.17/sys/netinet/tcp_syncache.c projects/binutils-2.17/sys/netinet/tcp_timewait.c projects/binutils-2.17/sys/netinet/udp_usrreq.c projects/binutils-2.17/sys/netinet6/frag6.c projects/binutils-2.17/sys/netinet6/icmp6.c projects/binutils-2.17/sys/netinet6/in6_rmx.c projects/binutils-2.17/sys/netinet6/in6_src.c projects/binutils-2.17/sys/netinet6/ip6_ipsec.c projects/binutils-2.17/sys/netinet6/ip6_mroute.c projects/binutils-2.17/sys/netinet6/mld6.c projects/binutils-2.17/sys/netinet6/nd6.c projects/binutils-2.17/sys/netinet6/nd6_nbr.c projects/binutils-2.17/sys/netinet6/nd6_rtr.c projects/binutils-2.17/sys/netinet6/scope6.c projects/binutils-2.17/sys/netinet6/send.c projects/binutils-2.17/sys/netipsec/key.c projects/binutils-2.17/sys/netipsec/keysock.c projects/binutils-2.17/sys/netipsec/xform_esp.c projects/binutils-2.17/sys/nfsclient/nfs_node.c projects/binutils-2.17/sys/powerpc/aim/clock.c projects/binutils-2.17/sys/powerpc/booke/clock.c projects/binutils-2.17/sys/sys/cdefs.h projects/binutils-2.17/sys/sys/elf_common.h projects/binutils-2.17/sys/sys/linker_set.h projects/binutils-2.17/sys/sys/pcpu.h projects/binutils-2.17/sys/sys/procfs.h projects/binutils-2.17/sys/sys/ptrace.h projects/binutils-2.17/sys/sys/vnode.h projects/binutils-2.17/sys/ufs/ufs/ufs_inode.c projects/binutils-2.17/sys/vm/vm_contig.c projects/binutils-2.17/sys/vm/vm_object.c projects/binutils-2.17/sys/vm/vm_page.c projects/binutils-2.17/sys/vm/vm_pageout.c projects/binutils-2.17/sys/vm/vm_pageout.h projects/binutils-2.17/sys/vm/vm_reserv.c projects/binutils-2.17/usr.bin/ar/acplex.l projects/binutils-2.17/usr.bin/at/at.c projects/binutils-2.17/usr.bin/bc/scan.l projects/binutils-2.17/usr.bin/chkey/chkey.c projects/binutils-2.17/usr.bin/colldef/Makefile projects/binutils-2.17/usr.bin/gcore/elfcore.c projects/binutils-2.17/usr.bin/ldd/ldd.c projects/binutils-2.17/usr.bin/netstat/if.c projects/binutils-2.17/usr.bin/printf/printf.1 projects/binutils-2.17/usr.bin/printf/printf.c projects/binutils-2.17/usr.bin/vmstat/vmstat.c projects/binutils-2.17/usr.bin/xargs/xargs.c projects/binutils-2.17/usr.sbin/apmd/apmdlex.l projects/binutils-2.17/usr.sbin/bluetooth/bthidd/lexer.l projects/binutils-2.17/usr.sbin/bluetooth/hcsecd/lexer.l projects/binutils-2.17/usr.sbin/config/lang.l projects/binutils-2.17/usr.sbin/kbdcontrol/lex.l projects/binutils-2.17/usr.sbin/mfiutil/mfi_config.c projects/binutils-2.17/usr.sbin/mfiutil/mfi_evt.c projects/binutils-2.17/usr.sbin/mfiutil/mfi_flash.c projects/binutils-2.17/usr.sbin/mptutil/mpt_config.c projects/binutils-2.17/usr.sbin/newsyslog/newsyslog.c projects/binutils-2.17/usr.sbin/sysinstall/dispatch.c Directory Properties: projects/binutils-2.17/ (props changed) projects/binutils-2.17/cddl/contrib/opensolaris/ (props changed) projects/binutils-2.17/contrib/bind9/ (props changed) projects/binutils-2.17/contrib/binutils/ (props changed) projects/binutils-2.17/contrib/bzip2/ (props changed) projects/binutils-2.17/contrib/ee/ (props changed) projects/binutils-2.17/contrib/expat/ (props changed) projects/binutils-2.17/contrib/file/ (props changed) projects/binutils-2.17/contrib/gdb/ (props changed) projects/binutils-2.17/contrib/gdtoa/ (props changed) projects/binutils-2.17/contrib/gnu-sort/ (props changed) projects/binutils-2.17/contrib/groff/ (props changed) projects/binutils-2.17/contrib/less/ (props changed) projects/binutils-2.17/contrib/libpcap/ (props changed) projects/binutils-2.17/contrib/llvm/ (props changed) projects/binutils-2.17/contrib/llvm/tools/clang/ (props changed) projects/binutils-2.17/contrib/ncurses/ (props changed) projects/binutils-2.17/contrib/netcat/ (props changed) projects/binutils-2.17/contrib/ntp/ (props changed) projects/binutils-2.17/contrib/one-true-awk/ (props changed) projects/binutils-2.17/contrib/openbsm/ (props changed) projects/binutils-2.17/contrib/openpam/ (props changed) projects/binutils-2.17/contrib/pf/ (props changed) projects/binutils-2.17/contrib/sendmail/ (props changed) projects/binutils-2.17/contrib/tcpdump/ (props changed) projects/binutils-2.17/contrib/tcsh/ (props changed) projects/binutils-2.17/contrib/top/ (props changed) projects/binutils-2.17/contrib/top/install-sh (props changed) projects/binutils-2.17/contrib/tzcode/stdtime/ (props changed) projects/binutils-2.17/contrib/tzcode/zic/ (props changed) projects/binutils-2.17/contrib/tzdata/ (props changed) projects/binutils-2.17/contrib/wpa/ (props changed) projects/binutils-2.17/contrib/xz/ (props changed) projects/binutils-2.17/crypto/openssh/ (props changed) projects/binutils-2.17/crypto/openssl/ (props changed) projects/binutils-2.17/lib/libc/ (props changed) projects/binutils-2.17/lib/libc/stdtime/ (props changed) projects/binutils-2.17/lib/libutil/ (props changed) projects/binutils-2.17/lib/libz/ (props changed) projects/binutils-2.17/sbin/ (props changed) projects/binutils-2.17/sbin/ipfw/ (props changed) projects/binutils-2.17/share/mk/bsd.arch.inc.mk (props changed) projects/binutils-2.17/share/zoneinfo/ (props changed) projects/binutils-2.17/sys/ (props changed) projects/binutils-2.17/sys/amd64/include/xen/ (props changed) projects/binutils-2.17/sys/cddl/contrib/opensolaris/ (props changed) projects/binutils-2.17/sys/contrib/dev/acpica/ (props changed) projects/binutils-2.17/sys/contrib/pf/ (props changed) projects/binutils-2.17/sys/contrib/x86emu/ (props changed) projects/binutils-2.17/sys/dev/xen/xenpci/ (props changed) projects/binutils-2.17/usr.bin/calendar/ (props changed) projects/binutils-2.17/usr.bin/csup/ (props changed) projects/binutils-2.17/usr.bin/procstat/ (props changed) projects/binutils-2.17/usr.sbin/zic/ (props changed) Modified: projects/binutils-2.17/ObsoleteFiles.inc ============================================================================== --- projects/binutils-2.17/ObsoleteFiles.inc Mon Nov 22 20:50:40 2010 (r215709) +++ projects/binutils-2.17/ObsoleteFiles.inc Mon Nov 22 20:52:18 2010 (r215710) @@ -13,6 +13,15 @@ # # The file is partitioned: OLD_FILES first, then OLD_LIBS and OLD_DIRS last. # +# Before you commit changes to this file please check if any entries in +# tools/build/mk/OptionalObsoleteFiles.inc can be removed. The following +# command tells which files are listed more than once regardless of some +# architecture specific conditionals, so you can not blindly trust the +# output: +# ( grep '+=' /usr/src/ObsoleteFiles.inc | sort -u ; \ +# grep '+=' /usr/src/tools/build/mk/OptionalObsoleteFiles.inc | sort -u) | \ +# sort | uniq -d +# # 20101112: vgonel(9) has gone to private API a while ago OLD_FILES+=usr/share/man/man9/vgonel.9.gz @@ -1634,7 +1643,7 @@ OLD_DIRS+=usr/include/c++/3.4 OLD_FILES+=usr/sbin/zfs OLD_FILES+=usr/sbin/zpool # 20070423: rc.bluetooth (examples) removed -OLD_FILES+=usr/share/examples/netgraph/bluetooth/rc.bluetooth +OLD_FILES+=usr/share/examples/netgraph/bluetooth/rc.bluetooth # 20070421: worm.4 removed OLD_FILES+=usr/share/man/man4/worm.4.gz # 20070417: trunk(4) renamed to lagg(4) Modified: projects/binutils-2.17/bin/sh/Makefile ============================================================================== --- projects/binutils-2.17/bin/sh/Makefile Mon Nov 22 20:50:40 2010 (r215709) +++ projects/binutils-2.17/bin/sh/Makefile Mon Nov 22 20:52:18 2010 (r215710) @@ -5,7 +5,7 @@ PROG= sh INSTALLFLAGS= -S SHSRCS= alias.c arith.y arith_lex.l cd.c echo.c error.c eval.c exec.c expand.c \ histedit.c input.c jobs.c mail.c main.c memalloc.c miscbltin.c \ - mystring.c options.c output.c parser.c redir.c show.c \ + mystring.c options.c output.c parser.c printf.c redir.c show.c \ test.c trap.c var.c GENSRCS= builtins.c init.c nodes.c syntax.c GENHDRS= builtins.h nodes.h syntax.h token.h @@ -26,7 +26,8 @@ WARNS?= 2 WFORMAT=0 .PATH: ${.CURDIR}/bltin \ - ${.CURDIR}/../test + ${.CURDIR}/../test \ + ${.CURDIR}/../../usr.bin/printf CLEANFILES+= mkinit mkinit.o mknodes mknodes.o \ mksyntax mksyntax.o Modified: projects/binutils-2.17/bin/sh/arith_lex.l ============================================================================== --- projects/binutils-2.17/bin/sh/arith_lex.l Mon Nov 22 20:50:40 2010 (r215709) +++ projects/binutils-2.17/bin/sh/arith_lex.l Mon Nov 22 20:52:18 2010 (r215710) @@ -55,6 +55,7 @@ int yylex(void); #define YY_INPUT(buf,result,max) \ result = (*buf = *arith_buf++) ? 1 : YY_NULL; #define YY_NO_UNPUT +#define YY_NO_INPUT %} %% Modified: projects/binutils-2.17/bin/sh/builtins.def ============================================================================== --- projects/binutils-2.17/bin/sh/builtins.def Mon Nov 22 20:50:40 2010 (r215709) +++ projects/binutils-2.17/bin/sh/builtins.def Mon Nov 22 20:52:18 2010 (r215710) @@ -71,7 +71,7 @@ histcmd -h fc jobidcmd jobid jobscmd jobs localcmd local -#printfcmd printf +printfcmd printf pwdcmd pwd readcmd read returncmd -s return Modified: projects/binutils-2.17/bin/sh/eval.c ============================================================================== --- projects/binutils-2.17/bin/sh/eval.c Mon Nov 22 20:50:40 2010 (r215709) +++ projects/binutils-2.17/bin/sh/eval.c Mon Nov 22 20:52:18 2010 (r215710) @@ -699,13 +699,13 @@ evalcommand(union node *cmd, int flags, for (sp = varlist.list ; sp ; sp = sp->next) { if (sep != 0) out2c(' '); - p = sp->text; - while (*p != '=' && *p != '\0') - out2c(*p++); - if (*p != '\0') { - out2c(*p++); + p = strchr(sp->text, '='); + if (p != NULL) { + p++; + outbin(sp->text, p - sp->text, out2); out2qstr(p); - } + } else + out2qstr(sp->text); sep = ' '; } for (sp = arglist.list ; sp ; sp = sp->next) { Modified: projects/binutils-2.17/bin/sh/expand.c ============================================================================== --- projects/binutils-2.17/bin/sh/expand.c Mon Nov 22 20:50:40 2010 (r215709) +++ projects/binutils-2.17/bin/sh/expand.c Mon Nov 22 20:52:18 2010 (r215710) @@ -1592,9 +1592,7 @@ wordexpcmd(int argc, char **argv) for (i = 1, len = 0; i < argc; i++) len += strlen(argv[i]); out1fmt("%08x", (int)len); - for (i = 1; i < argc; i++) { - out1str(argv[i]); - out1c('\0'); - } + for (i = 1; i < argc; i++) + outbin(argv[i], strlen(argv[i]) + 1, out1); return (0); } Modified: projects/binutils-2.17/bin/sh/main.c ============================================================================== --- projects/binutils-2.17/bin/sh/main.c Mon Nov 22 20:50:40 2010 (r215709) +++ projects/binutils-2.17/bin/sh/main.c Mon Nov 22 20:52:18 2010 (r215710) @@ -128,10 +128,8 @@ main(int argc, char *argv[]) exitshell(exitstatus); } reset(); - if (exception == EXINT) { - out2c('\n'); - flushout(&errout); - } + if (exception == EXINT) + out2fmt_flush("\n"); popstackmark(&smark); FORCEINTON; /* enable interrupts */ if (state == 1) Modified: projects/binutils-2.17/bin/sh/mksyntax.c ============================================================================== --- projects/binutils-2.17/bin/sh/mksyntax.c Mon Nov 22 20:50:40 2010 (r215709) +++ projects/binutils-2.17/bin/sh/mksyntax.c Mon Nov 22 20:52:18 2010 (r215710) @@ -342,9 +342,9 @@ print(const char *name) static const char *macro[] = { "#define is_digit(c)\t((is_type+SYNBASE)[(int)c] & ISDIGIT)", "#define is_eof(c)\t((c) == PEOF)", - "#define is_alpha(c)\t(((c) < CTLESC || (c) > CTLQUOTEMARK) && (is_type+SYNBASE)[(int)c] & (ISUPPER|ISLOWER))", - "#define is_name(c)\t(((c) < CTLESC || (c) > CTLQUOTEMARK) && (is_type+SYNBASE)[(int)c] & (ISUPPER|ISLOWER|ISUNDER))", - "#define is_in_name(c)\t(((c) < CTLESC || (c) > CTLQUOTEMARK) && (is_type+SYNBASE)[(int)c] & (ISUPPER|ISLOWER|ISUNDER|ISDIGIT))", + "#define is_alpha(c)\t((is_type+SYNBASE)[(int)c] & (ISUPPER|ISLOWER))", + "#define is_name(c)\t((is_type+SYNBASE)[(int)c] & (ISUPPER|ISLOWER|ISUNDER))", + "#define is_in_name(c)\t((is_type+SYNBASE)[(int)c] & (ISUPPER|ISLOWER|ISUNDER|ISDIGIT))", "#define is_special(c)\t((is_type+SYNBASE)[(int)c] & (ISSPECL|ISDIGIT))", NULL }; Modified: projects/binutils-2.17/bin/sh/options.c ============================================================================== --- projects/binutils-2.17/bin/sh/options.c Mon Nov 22 20:50:40 2010 (r215709) +++ projects/binutils-2.17/bin/sh/options.c Mon Nov 22 20:52:18 2010 (r215710) @@ -261,13 +261,12 @@ minus_o(char *name, int val) optlist[i].val ? "on" : "off"); } else { /* Output suitable for re-input to shell. */ - for (i = 0; i < NOPTS; i++) { - if (i % 6 == 0) - out1str(i == 0 ? "set" : "\nset"); - out1fmt(" %co %s", optlist[i].val ? '-' : '+', - optlist[i].name); - } - out1c('\n'); + for (i = 0; i < NOPTS; i++) + out1fmt("%s %co %s%s", + i % 6 == 0 ? "set" : "", + optlist[i].val ? '-' : '+', + optlist[i].name, + i % 6 == 5 || i == NOPTS - 1 ? "\n" : ""); } } else { for (i = 0; i < NOPTS; i++) Modified: projects/binutils-2.17/bin/sh/output.c ============================================================================== --- projects/binutils-2.17/bin/sh/output.c Mon Nov 22 20:50:40 2010 (r215709) +++ projects/binutils-2.17/bin/sh/output.c Mon Nov 22 20:52:18 2010 (r215710) @@ -96,6 +96,12 @@ RESET { void +outcslow(int c, struct output *file) +{ + outc(c, file); +} + +void out1str(const char *p) { outstr(p, out1); @@ -149,19 +155,19 @@ outqstr(const char *p, struct output *fi case '\'': /* Can't quote single quotes inside single quotes. */ if (inquotes) - outc('\'', file); + outcslow('\'', file); inquotes = 0; outstr("\\'", file); break; default: if (!inquotes) - outc('\'', file); + outcslow('\'', file); inquotes = 1; outc(ch, file); } } if (inquotes) - outc('\'', file); + outcslow('\'', file); } void Modified: projects/binutils-2.17/bin/sh/output.h ============================================================================== --- projects/binutils-2.17/bin/sh/output.h Mon Nov 22 20:50:40 2010 (r215709) +++ projects/binutils-2.17/bin/sh/output.h Mon Nov 22 20:52:18 2010 (r215710) @@ -54,6 +54,7 @@ extern struct output *out1; /* &memout i extern struct output *out2; /* &memout if backquote with 2>&1, otherwise &errout */ +void outcslow(int, struct output *); void out1str(const char *); void out1qstr(const char *); void out2str(const char *); @@ -74,7 +75,7 @@ int xwrite(int, const char *, int); #define outc(c, file) (--(file)->nleft < 0? (emptyoutbuf(file), *(file)->nextc++ = (c)) : (*(file)->nextc++ = (c))) #define out1c(c) outc(c, out1); -#define out2c(c) outc(c, out2); +#define out2c(c) outcslow(c, out2); #define OUTPUT_INCL #endif Modified: projects/binutils-2.17/bin/sh/sh.1 ============================================================================== --- projects/binutils-2.17/bin/sh/sh.1 Mon Nov 22 20:50:40 2010 (r215709) +++ projects/binutils-2.17/bin/sh/sh.1 Mon Nov 22 20:52:18 2010 (r215710) @@ -32,7 +32,7 @@ .\" from: @(#)sh.1 8.6 (Berkeley) 5/4/95 .\" $FreeBSD$ .\" -.Dd November 12, 2010 +.Dd November 19, 2010 .Dt SH 1 .Os .Sh NAME @@ -2049,6 +2049,9 @@ line. See the .Sx Functions subsection. +.It Ic printf +A built-in equivalent of +.Xr printf 1 . .It Ic pwd Op Fl L | P Print the path of the current directory. The built-in command may @@ -2470,6 +2473,7 @@ will return the argument. .Xr echo 1 , .Xr ed 1 , .Xr emacs 1 , +.Xr printf 1 , .Xr pwd 1 , .Xr test 1 , .Xr vi 1 , Modified: projects/binutils-2.17/bin/sh/var.c ============================================================================== --- projects/binutils-2.17/bin/sh/var.c Mon Nov 22 20:50:40 2010 (r215709) +++ projects/binutils-2.17/bin/sh/var.c Mon Nov 22 20:52:18 2010 (r215710) @@ -633,10 +633,10 @@ showvarscmd(int argc __unused, char **ar qsort(vars, n, sizeof(*vars), var_compare); for (i = 0; i < n; i++) { - for (s = vars[i]; *s != '='; s++) - out1c(*s); - out1c('='); - out1qstr(s + 1); + s = strchr(vars[i], '='); + s++; + outbin(vars[i], s - vars[i], out1); + out1qstr(s); out1c('\n'); } ckfree(vars); @@ -710,12 +710,15 @@ found:; out1str(cmdname); out1c(' '); } - for (p = vp->text ; *p != '=' ; p++) - out1c(*p); + p = strchr(vp->text, '='); if (values && !(vp->flags & VUNSET)) { - out1c('='); - out1qstr(p + 1); - } + p++; + outbin(vp->text, p - vp->text, + out1); + out1qstr(p); + } else + outbin(vp->text, p - vp->text, + out1); out1c('\n'); } } Modified: projects/binutils-2.17/contrib/binutils/bfd/elf-bfd.h ============================================================================== --- projects/binutils-2.17/contrib/binutils/bfd/elf-bfd.h Mon Nov 22 20:50:40 2010 (r215709) +++ projects/binutils-2.17/contrib/binutils/bfd/elf-bfd.h Mon Nov 22 20:52:18 2010 (r215710) @@ -2003,6 +2003,8 @@ extern char * elfcore_write_pstatus (bfd *, char *, int *, long, int, const void *); extern char *elfcore_write_prfpreg (bfd *, char *, int *, const void *, int); +extern char *elfcore_write_thrmisc + (bfd *, char *, int *, const char *, int); extern char *elfcore_write_prxfpreg (bfd *, char *, int *, const void *, int); extern char *elfcore_write_lwpstatus Modified: projects/binutils-2.17/contrib/binutils/bfd/elf.c ============================================================================== --- projects/binutils-2.17/contrib/binutils/bfd/elf.c Mon Nov 22 20:50:40 2010 (r215709) +++ projects/binutils-2.17/contrib/binutils/bfd/elf.c Mon Nov 22 20:52:18 2010 (r215710) @@ -7443,6 +7443,12 @@ _bfd_elf_rel_vtable_reloc_fn #ifdef HAVE_SYS_PROCFS_H # include + +/* Define HAVE_THRMISC_T for consistency with other similar GNU-type stubs. */ +#undef HAVE_THRMISC_T +#if defined (THRMISC_VERSION) +#define HAVE_THRMISC_T 1 +#endif #endif /* FIXME: this is kinda wrong, but it's what gdb wants. */ @@ -7623,6 +7629,16 @@ elfcore_grok_prxfpreg (bfd *abfd, Elf_In return elfcore_make_note_pseudosection (abfd, ".reg-xfp", note); } +#if defined (HAVE_THRMISC_T) + +static bfd_boolean +elfcore_grok_thrmisc (bfd *abfd, Elf_Internal_Note *note) +{ + return elfcore_make_note_pseudosection (abfd, ".tname", note); +} + +#endif /* defined (HAVE_THRMISC_T) */ + #if defined (HAVE_PRPSINFO_T) typedef prpsinfo_t elfcore_psinfo_t; #if defined (HAVE_PRPSINFO32_T) /* Sparc64 cross Sparc32 */ @@ -7986,6 +8002,12 @@ elfcore_grok_note (bfd *abfd, Elf_Intern return TRUE; } + +#if defined (HAVE_THRMISC_T) + case NT_THRMISC: + return elfcore_grok_thrmisc (abfd, note); +#endif + } } @@ -8451,6 +8473,22 @@ elfcore_write_prfpreg (bfd *abfd, } char * +elfcore_write_thrmisc (bfd *abfd, + char *buf, + int *bufsiz, + const char *tname, + int size) +{ +#if defined (HAVE_THRMISC_T) + char *note_name = "CORE"; + return elfcore_write_note (abfd, buf, bufsiz, + note_name, NT_THRMISC, tname, size); +#else + return buf; +#endif +} + +char * elfcore_write_prxfpreg (bfd *abfd, char *buf, int *bufsiz, Modified: projects/binutils-2.17/contrib/binutils/binutils/readelf.c ============================================================================== --- projects/binutils-2.17/contrib/binutils/binutils/readelf.c Mon Nov 22 20:50:40 2010 (r215709) +++ projects/binutils-2.17/contrib/binutils/binutils/readelf.c Mon Nov 22 20:52:18 2010 (r215710) @@ -9103,6 +9103,8 @@ get_note_type (unsigned e_type) return _("NT_FPREGS (floating point registers)"); case NT_PSINFO: return _("NT_PSINFO (psinfo structure)"); + case NT_THRMISC: + return _("NT_THRMISC (thrmisc structure)"); case NT_LWPSTATUS: return _("NT_LWPSTATUS (lwpstatus_t structure)"); case NT_LWPSINFO: Modified: projects/binutils-2.17/contrib/binutils/include/elf/common.h ============================================================================== --- projects/binutils-2.17/contrib/binutils/include/elf/common.h Mon Nov 22 20:50:40 2010 (r215709) +++ projects/binutils-2.17/contrib/binutils/include/elf/common.h Mon Nov 22 20:52:18 2010 (r215710) @@ -388,6 +388,7 @@ #define NT_PRPSINFO 3 /* Contains copy of prpsinfo struct */ #define NT_TASKSTRUCT 4 /* Contains copy of task struct */ #define NT_AUXV 6 /* Contains copy of Elfxx_auxv_t */ +#define NT_THRMISC 7 /* Contains copy of thrmisc struct */ #define NT_PRXFPREG 0x46e62b7f /* Contains a user_xfpregs_struct; */ /* note name must be "LINUX". */ Modified: projects/binutils-2.17/contrib/file/readelf.h ============================================================================== --- projects/binutils-2.17/contrib/file/readelf.h Mon Nov 22 20:50:40 2010 (r215709) +++ projects/binutils-2.17/contrib/file/readelf.h Mon Nov 22 20:52:18 2010 (r215710) @@ -224,6 +224,7 @@ typedef struct { #define NT_TASKSTRUCT 4 #define NT_PLATFORM 5 #define NT_AUXV 6 +#define NT_THRMISC 7 /* Note types used in executables */ /* NetBSD executables (name = "NetBSD") */ Modified: projects/binutils-2.17/contrib/gcc/cgraphunit.c ============================================================================== --- projects/binutils-2.17/contrib/gcc/cgraphunit.c Mon Nov 22 20:50:40 2010 (r215709) +++ projects/binutils-2.17/contrib/gcc/cgraphunit.c Mon Nov 22 20:52:18 2010 (r215710) @@ -1536,8 +1536,6 @@ cgraph_optimize (void) return; } - process_pending_assemble_externals (); - /* Frontend may output common variables after the unit has been finalized. It is safe to deal with them here as they are always zero initialized. */ cgraph_varpool_analyze_pending_decls (); Modified: projects/binutils-2.17/contrib/gcc/config/elfos.h ============================================================================== --- projects/binutils-2.17/contrib/gcc/config/elfos.h Mon Nov 22 20:50:40 2010 (r215709) +++ projects/binutils-2.17/contrib/gcc/config/elfos.h Mon Nov 22 20:52:18 2010 (r215710) @@ -496,3 +496,13 @@ Boston, MA 02110-1301, USA. */ fprintf ((FILE), "\"\n"); \ } \ while (0) + +/* A C statement (sans semicolon) to output to the stdio stream STREAM + any text necessary for declaring the name of an external symbol + named NAME whch is referenced in this compilation but not defined. + It is needed to properly support non-default visibility. */ + +#ifndef ASM_OUTPUT_EXTERNAL +#define ASM_OUTPUT_EXTERNAL(FILE, DECL, NAME) \ + default_elf_asm_output_external (FILE, DECL, NAME) +#endif Modified: projects/binutils-2.17/contrib/gcc/config/ia64/hpux.h ============================================================================== --- projects/binutils-2.17/contrib/gcc/config/ia64/hpux.h Mon Nov 22 20:50:40 2010 (r215709) +++ projects/binutils-2.17/contrib/gcc/config/ia64/hpux.h Mon Nov 22 20:52:18 2010 (r215710) @@ -144,10 +144,6 @@ do { \ definitions, so do not use them in gthr-posix.h. */ #define GTHREAD_USE_WEAK 0 -/* Put out the needed function declarations at the end. */ - -#define TARGET_ASM_FILE_END ia64_hpux_file_end - #undef CTORS_SECTION_ASM_OP #define CTORS_SECTION_ASM_OP "\t.section\t.init_array,\t\"aw\",\"init_array\"" Modified: projects/binutils-2.17/contrib/gcc/config/ia64/ia64.c ============================================================================== --- projects/binutils-2.17/contrib/gcc/config/ia64/ia64.c Mon Nov 22 20:50:40 2010 (r215709) +++ projects/binutils-2.17/contrib/gcc/config/ia64/ia64.c Mon Nov 22 20:52:18 2010 (r215710) @@ -250,10 +250,6 @@ static section *ia64_select_rtx_section static void ia64_output_dwarf_dtprel (FILE *, int, rtx) ATTRIBUTE_UNUSED; static unsigned int ia64_section_type_flags (tree, const char *, int); -static void ia64_hpux_add_extern_decl (tree decl) - ATTRIBUTE_UNUSED; -static void ia64_hpux_file_end (void) - ATTRIBUTE_UNUSED; static void ia64_init_libfuncs (void) ATTRIBUTE_UNUSED; static void ia64_hpux_init_libfuncs (void) @@ -5015,49 +5011,6 @@ ia64_secondary_reload_class (enum reg_cl } -/* Emit text to declare externally defined variables and functions, because - the Intel assembler does not support undefined externals. */ - -void -ia64_asm_output_external (FILE *file, tree decl, const char *name) -{ - int save_referenced; - - /* GNU as does not need anything here, but the HP linker does need - something for external functions. */ - - if (TARGET_GNU_AS - && (!TARGET_HPUX_LD - || TREE_CODE (decl) != FUNCTION_DECL - || strstr (name, "__builtin_") == name)) - return; - - /* ??? The Intel assembler creates a reference that needs to be satisfied by - the linker when we do this, so we need to be careful not to do this for - builtin functions which have no library equivalent. Unfortunately, we - can't tell here whether or not a function will actually be called by - expand_expr, so we pull in library functions even if we may not need - them later. */ - if (! strcmp (name, "__builtin_next_arg") - || ! strcmp (name, "alloca") - || ! strcmp (name, "__builtin_constant_p") - || ! strcmp (name, "__builtin_args_info")) - return; - - if (TARGET_HPUX_LD) - ia64_hpux_add_extern_decl (decl); - else - { - /* assemble_name will set TREE_SYMBOL_REFERENCED, so we must save and - restore it. */ - save_referenced = TREE_SYMBOL_REFERENCED (DECL_ASSEMBLER_NAME (decl)); - if (TREE_CODE (decl) == FUNCTION_DECL) - ASM_OUTPUT_TYPE_DIRECTIVE (file, name, "function"); - (*targetm.asm_out.globalize_label) (file, name); - TREE_SYMBOL_REFERENCED (DECL_ASSEMBLER_NAME (decl)) = save_referenced; - } -} - /* Parse the -mfixed-range= option string. */ static void @@ -9223,55 +9176,33 @@ ia64_hpux_function_arg_padding (enum mac return DEFAULT_FUNCTION_ARG_PADDING (mode, type); } -/* Linked list of all external functions that are to be emitted by GCC. - We output the name if and only if TREE_SYMBOL_REFERENCED is set in - order to avoid putting out names that are never really used. */ - -struct extern_func_list GTY(()) -{ - struct extern_func_list *next; - tree decl; -}; - -static GTY(()) struct extern_func_list *extern_func_head; - -static void -ia64_hpux_add_extern_decl (tree decl) -{ - struct extern_func_list *p = ggc_alloc (sizeof (struct extern_func_list)); - - p->decl = decl; - p->next = extern_func_head; - extern_func_head = p; -} - -/* Print out the list of used global functions. */ +/* Emit text to declare externally defined variables and functions, because + the Intel assembler does not support undefined externals. */ -static void -ia64_hpux_file_end (void) +void +ia64_asm_output_external (FILE *file, tree decl, const char *name) { - struct extern_func_list *p; - - for (p = extern_func_head; p; p = p->next) - { - tree decl = p->decl; - tree id = DECL_ASSEMBLER_NAME (decl); - - gcc_assert (id); - - if (!TREE_ASM_WRITTEN (decl) && TREE_SYMBOL_REFERENCED (id)) - { - const char *name = XSTR (XEXP (DECL_RTL (decl), 0), 0); - - TREE_ASM_WRITTEN (decl) = 1; - (*targetm.asm_out.globalize_label) (asm_out_file, name); - fputs (TYPE_ASM_OP, asm_out_file); - assemble_name (asm_out_file, name); - fprintf (asm_out_file, "," TYPE_OPERAND_FMT "\n", "function"); - } + /* We output the name if and only if TREE_SYMBOL_REFERENCED is + set in order to avoid putting out names that are never really + used. */ + if (TREE_SYMBOL_REFERENCED (DECL_ASSEMBLER_NAME (decl))) + { + /* maybe_assemble_visibility will return 1 if the assembler + visibility directive is outputed. */ + int need_visibility = ((*targetm.binds_local_p) (decl) + && maybe_assemble_visibility (decl)); + + /* GNU as does not need anything here, but the HP linker does + need something for external functions. */ + if ((TARGET_HPUX_LD || !TARGET_GNU_AS) + && TREE_CODE (decl) == FUNCTION_DECL) + { + ASM_OUTPUT_TYPE_DIRECTIVE (file, name, "function"); + (*targetm.asm_out.globalize_label) (file, name); + } + else if (need_visibility && !TARGET_GNU_AS) + (*targetm.asm_out.globalize_label) (file, name); } - - extern_func_head = 0; } /* Set SImode div/mod functions, init_integral_libfuncs only initializes Modified: projects/binutils-2.17/contrib/gcc/config/ia64/unwind-ia64.h ============================================================================== --- projects/binutils-2.17/contrib/gcc/config/ia64/unwind-ia64.h Mon Nov 22 20:50:40 2010 (r215709) +++ projects/binutils-2.17/contrib/gcc/config/ia64/unwind-ia64.h Mon Nov 22 20:52:18 2010 (r215710) @@ -19,6 +19,13 @@ the Free Software Foundation, 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ +#ifdef __FreeBSD__ +/* On FreeBSD, _Unwind_FindTableEntry is in libc, and must not be hidden here. */ +#define ATTRIBUTE_HIDDEN +#else +#define ATTRIBUTE_HIDDEN __attribute__ ((__visibility__ ("hidden"))) +#endif + struct unw_table_entry { unsigned long start_offset; @@ -29,4 +36,4 @@ struct unw_table_entry extern struct unw_table_entry * _Unwind_FindTableEntry (void *pc, unsigned long *segment_base, unsigned long *gp) - __attribute__ ((__visibility__ ("hidden"))); + ATTRIBUTE_HIDDEN; Modified: projects/binutils-2.17/contrib/gcc/output.h ============================================================================== --- projects/binutils-2.17/contrib/gcc/output.h Mon Nov 22 20:50:40 2010 (r215709) +++ projects/binutils-2.17/contrib/gcc/output.h Mon Nov 22 20:52:18 2010 (r215710) @@ -200,9 +200,9 @@ extern void assemble_variable (tree, int DONT_OUTPUT_DATA is from assemble_variable. */ extern void align_variable (tree decl, bool dont_output_data); -/* Output something to declare an external symbol to the assembler. - (Most assemblers don't need this, so we normally output nothing.) - Do nothing if DECL is not external. */ +/* Queue for outputing something to declare an external symbol to the + assembler. (Most assemblers don't need this, so we normally output + nothing.) Do nothing if DECL is not external. */ extern void assemble_external (tree); /* Assemble code to leave SIZE bytes of zeros. */ @@ -607,6 +607,10 @@ extern void default_file_start (void); extern void file_end_indicate_exec_stack (void); extern bool default_valid_pointer_mode (enum machine_mode); +extern void default_elf_asm_output_external (FILE *file, tree, + const char *); +extern int maybe_assemble_visibility (tree); + extern int default_address_cost (rtx); /* dbxout helper functions */ Modified: projects/binutils-2.17/contrib/gcc/toplev.c ============================================================================== --- projects/binutils-2.17/contrib/gcc/toplev.c Mon Nov 22 20:50:40 2010 (r215709) +++ projects/binutils-2.17/contrib/gcc/toplev.c Mon Nov 22 20:52:18 2010 (r215710) @@ -1080,9 +1080,7 @@ compile_file (void) dw2_output_indirect_constants (); - /* Flush any pending external directives. cgraph did this for - assemble_external calls from the front end, but the RTL - expander can also generate them. */ + /* Flush any pending external directives. */ process_pending_assemble_externals (); /* Attach a special .ident directive to the end of the file to identify Modified: projects/binutils-2.17/contrib/gcc/varasm.c ============================================================================== --- projects/binutils-2.17/contrib/gcc/varasm.c Mon Nov 22 20:50:40 2010 (r215709) +++ projects/binutils-2.17/contrib/gcc/varasm.c Mon Nov 22 20:52:18 2010 (r215710) @@ -126,7 +126,6 @@ static unsigned HOST_WIDE_INT array_size static unsigned min_align (unsigned, unsigned); static void output_constructor (tree, unsigned HOST_WIDE_INT, unsigned int); static void globalize_decl (tree); -static void maybe_assemble_visibility (tree); #ifdef BSS_SECTION_ASM_OP #ifdef ASM_OUTPUT_BSS static void asm_output_bss (FILE *, tree, const char *, @@ -1957,11 +1956,10 @@ assemble_external (tree decl ATTRIBUTE_U if (!DECL_P (decl) || !DECL_EXTERNAL (decl) || !TREE_PUBLIC (decl)) return; - if (flag_unit_at_a_time) - pending_assemble_externals = tree_cons (0, decl, - pending_assemble_externals); - else - assemble_external_real (decl); + /* We want to output external symbols at very last to check if they + are references or not. */ + pending_assemble_externals = tree_cons (0, decl, + pending_assemble_externals); #endif } @@ -5064,13 +5062,18 @@ default_assemble_visibility (tree decl, /* A helper function to call assemble_visibility when needed for a decl. */ -static void +int maybe_assemble_visibility (tree decl) { enum symbol_visibility vis = DECL_VISIBILITY (decl); if (vis != VISIBILITY_DEFAULT) - targetm.asm_out.visibility (decl, vis); + { + targetm.asm_out.visibility (decl, vis); + return 1; + } + else + return 0; } /* Returns 1 if the target configuration supports defining public symbols @@ -6224,4 +6227,19 @@ output_object_blocks (void) htab_traverse (object_block_htab, output_object_block_htab, NULL); } +/* Emit text to declare externally defined symbols. It is needed to + properly support non-default visibility. */ +void +default_elf_asm_output_external (FILE *file ATTRIBUTE_UNUSED, + tree decl, + const char *name ATTRIBUTE_UNUSED) +{ + /* We output the name if and only if TREE_SYMBOL_REFERENCED is + set in order to avoid putting out names that are never really + used. */ + if (TREE_SYMBOL_REFERENCED (DECL_ASSEMBLER_NAME (decl)) + && targetm.binds_local_p (decl)) + maybe_assemble_visibility (decl); +} + #include "gt-varasm.h" Modified: projects/binutils-2.17/contrib/gdb/gdb/fbsd-proc.c ============================================================================== --- projects/binutils-2.17/contrib/gdb/gdb/fbsd-proc.c Mon Nov 22 20:50:40 2010 (r215709) +++ projects/binutils-2.17/contrib/gdb/gdb/fbsd-proc.c Mon Nov 22 20:52:18 2010 (r215710) @@ -124,6 +124,7 @@ fbsd_make_corefile_notes (bfd *obfd, int fpregset_t fpregs; char *note_data = NULL; Elf_Internal_Ehdr *i_ehdrp; + char fakename; /* Put a "FreeBSD" label in the ELF header. */ i_ehdrp = elf_elfheader (obfd); @@ -138,6 +139,10 @@ fbsd_make_corefile_notes (bfd *obfd, int note_data = elfcore_write_prfpreg (obfd, note_data, note_size, &fpregs, sizeof (fpregs)); + fakename = '\0'; + note_data = elfcore_write_thrmisc (obfd, note_data, note_size, + &fakename, sizeof (fakename)); + if (get_exec_file (0)) { char *fname = strrchr (get_exec_file (0), '/') + 1; Modified: projects/binutils-2.17/crypto/openssl/CHANGES ============================================================================== --- projects/binutils-2.17/crypto/openssl/CHANGES Mon Nov 22 20:50:40 2010 (r215709) +++ projects/binutils-2.17/crypto/openssl/CHANGES Mon Nov 22 20:52:18 2010 (r215710) @@ -2,6 +2,51 @@ OpenSSL CHANGES _______________ + Changes between 0.9.8o and 0.9.8p [16 Nov 2010] + + *) Fix extension code to avoid race conditions which can result in a buffer + overrun vulnerability: resumed sessions must not be modified as they can + be shared by multiple threads. CVE-2010-3864 + [Steve Henson] + + *) Fix for double free bug in ssl/s3_clnt.c CVE-2010-2939 + [Steve Henson] + + *) Don't reencode certificate when calculating signature: cache and use + the original encoding instead. This makes signature verification of + some broken encodings work correctly. + [Steve Henson] + + *) ec2_GF2m_simple_mul bugfix: compute correct result if the output EC_POINT + is also one of the inputs. + [Emilia Käsper (Google)] + + *) Don't repeatedly append PBE algorithms to table if they already exist. + Sort table on each new add. This effectively makes the table read only + after all algorithms are added and subsequent calls to PKCS12_pbe_add + etc are non-op. + [Steve Henson] + + Changes between 0.9.8n and 0.9.8o [01 Jun 2010] + + [NB: OpenSSL 0.9.8o and later 0.9.8 patch levels were released after + OpenSSL 1.0.0.] + + *) Correct a typo in the CMS ASN1 module which can result in invalid memory + access or freeing data twice (CVE-2010-0742) + [Steve Henson, Ronald Moesbergen ] + + *) Add SHA2 algorithms to SSL_library_init(). SHA2 is becoming far more + common in certificates and some applications which only call + SSL_library_init and not OpenSSL_add_all_algorithms() will fail. + [Steve Henson] + + *) VMS fixes: + Reduce copying into .apps and .test in makevms.com + Don't try to use blank CA certificate in CA.com + Allow use of C files from original directories in maketests.com + [Steven M. Schweda" ] + Changes between 0.9.8m and 0.9.8n [24 Mar 2010] *) When rejecting SSL/TLS records due to an incorrect version number, never Modified: projects/binutils-2.17/crypto/openssl/Configure ============================================================================== --- projects/binutils-2.17/crypto/openssl/Configure Mon Nov 22 20:50:40 2010 (r215709) +++ projects/binutils-2.17/crypto/openssl/Configure Mon Nov 22 20:52:18 2010 (r215710) @@ -1812,11 +1812,11 @@ EOF (system $make_command.$make_targets) == 0 or exit $? if $make_targets ne ""; if ( $perl =~ m@^/@) { - &dofile("tools/c_rehash",$perl,'^#!/', '#!%s','^my \$dir;$', 'my $dir = "' . $openssldir . '";'); + &dofile("tools/c_rehash",$perl,'^#!/', '#!%s','^my \$dir;$', 'my $dir = "' . $openssldir . '";', '^my \$prefix;$', 'my $prefix = "' . $prefix . '";'); &dofile("apps/CA.pl",$perl,'^#!/', '#!%s'); } else { # No path for Perl known ... - &dofile("tools/c_rehash",'/usr/local/bin/perl','^#!/', '#!%s','^my \$dir;$', 'my $dir = "' . $openssldir . '";'); + &dofile("tools/c_rehash",'/usr/local/bin/perl','^#!/', '#!%s','^my \$dir;$', 'my $dir = "' . $openssldir . '";', '^my \$prefix;$', 'my $prefix = "' . $prefix . '";'); &dofile("apps/CA.pl",'/usr/local/bin/perl','^#!/', '#!%s'); } if ($depflags ne $default_depflags && !$make_depend) { Modified: projects/binutils-2.17/crypto/openssl/FAQ ============================================================================== --- projects/binutils-2.17/crypto/openssl/FAQ Mon Nov 22 20:50:40 2010 (r215709) +++ projects/binutils-2.17/crypto/openssl/FAQ Mon Nov 22 20:52:18 2010 (r215710) @@ -70,6 +70,7 @@ OpenSSL - Frequently Asked Questions * I think I've detected a memory leak, is this a bug? * Why does Valgrind complain about the use of uninitialized data? * Why doesn't a memory BIO work when a file does? +* Where are the declarations and implementations of d2i_X509() etc? =============================================================================== @@ -78,7 +79,7 @@ OpenSSL - Frequently Asked Questions * Which is the current version of OpenSSL? The current version is available from . -OpenSSL 0.9.8n was released on Mar 24th, 2010. +OpenSSL 1.0.0b was released on Nov 16th, 2010. In addition to the current stable release, you can also access daily snapshots of the OpenSSL development version at . +. Note that the online documents refer +to the very latest development versions of OpenSSL and may include features +not present in released versions. If in doubt refer to the documentation +that came with the version of OpenSSL you are using. For information on parts of libcrypto that are not yet documented, you might want to read Ariel Glenn's documentation on SSLeay 0.9, OpenSSL's @@ -717,8 +721,10 @@ file. Multi-threaded applications must provide two callback functions to OpenSSL by calling CRYPTO_set_locking_callback() and -CRYPTO_set_id_callback(). This is described in the threads(3) -manpage. +CRYPTO_set_id_callback(), for all versions of OpenSSL up to and +including 0.9.8[abc...]. As of version 1.0.0, CRYPTO_set_id_callback() +and associated APIs are deprecated by CRYPTO_THREADID_set_callback() +and friends. This is described in the threads(3) manpage. * I've compiled a program under Windows and it crashes: why? @@ -962,4 +968,15 @@ is needed. This must be done by calling: See the manual pages for more details. +* Where are the declarations and implementations of d2i_X509() etc? + +These are defined and implemented by macros of the form: + + + DECLARE_ASN1_FUNCTIONS(X509) and IMPLEMENT_ASN1_FUNCTIONS(X509) + +The implementation passes an ASN1 "template" defining the structure into an +ASN1 interpreter using generalised functions such as ASN1_item_d2i(). + + =============================================================================== Modified: projects/binutils-2.17/crypto/openssl/Makefile ============================================================================== --- projects/binutils-2.17/crypto/openssl/Makefile Mon Nov 22 20:50:40 2010 (r215709) +++ projects/binutils-2.17/crypto/openssl/Makefile Mon Nov 22 20:52:18 2010 (r215710) @@ -4,7 +4,7 @@ ## Makefile for OpenSSL ## -VERSION=0.9.8n +VERSION=0.9.8p MAJOR=0 MINOR=9.8 SHLIB_VERSION_NUMBER=0.9.8 Modified: projects/binutils-2.17/crypto/openssl/NEWS ============================================================================== --- projects/binutils-2.17/crypto/openssl/NEWS Mon Nov 22 20:50:40 2010 (r215709) +++ projects/binutils-2.17/crypto/openssl/NEWS Mon Nov 22 20:52:18 2010 (r215710) @@ -5,6 +5,18 @@ This file gives a brief overview of the major changes between each OpenSSL release. For more details please read the CHANGES file. + Major changes between OpenSSL 0.9.8o and OpenSSL 0.9.8p: + + o Fix for security issue CVE-2010-3864. + + Major changes between OpenSSL 0.9.8n and OpenSSL 0.9.8o: + + o Fix for security issue CVE-2010-0742. + o Various DTLS fixes. + o Recognise SHA2 certificates if only SSL algorithms added. + o Fix for no-rc4 compilation. + o Chil ENGINE unload workaround. + Major changes between OpenSSL 0.9.8m and OpenSSL 0.9.8n: o CFB cipher definition fixes. Modified: projects/binutils-2.17/crypto/openssl/PROBLEMS ============================================================================== --- projects/binutils-2.17/crypto/openssl/PROBLEMS Mon Nov 22 20:50:40 2010 (r215709) +++ projects/binutils-2.17/crypto/openssl/PROBLEMS Mon Nov 22 20:52:18 2010 (r215710) @@ -36,7 +36,9 @@ may differ on your machine. As long as Apple doesn't fix the problem with ld, this problem building -OpenSSL will remain as is. +OpenSSL will remain as is. Well, the problem was addressed in 0.9.8f by +passing -Wl,-search_paths_first, but it's unknown if the flag was +supported from the initial MacOS X release. * Parallell make leads to errors Modified: projects/binutils-2.17/crypto/openssl/README ============================================================================== --- projects/binutils-2.17/crypto/openssl/README Mon Nov 22 20:50:40 2010 (r215709) +++ projects/binutils-2.17/crypto/openssl/README Mon Nov 22 20:52:18 2010 (r215710) @@ -1,5 +1,5 @@ - OpenSSL 0.9.8n + OpenSSL 0.9.8p 16 Nov 2010 Copyright (c) 1998-2009 The OpenSSL Project Copyright (c) 1995-1998 Eric A. Young, Tim J. Hudson Modified: projects/binutils-2.17/crypto/openssl/apps/apps.c ============================================================================== --- projects/binutils-2.17/crypto/openssl/apps/apps.c Mon Nov 22 20:50:40 2010 (r215709) +++ projects/binutils-2.17/crypto/openssl/apps/apps.c Mon Nov 22 20:52:18 2010 (r215710) @@ -351,13 +351,12 @@ void program_name(char *in, char *out, i int chopup_args(ARGS *arg, char *buf, int *argc, char **argv[]) { - int num,len,i; + int num,i; char *p; *argc=0; *argv=NULL; - len=strlen(buf); i=0; if (arg->count == 0) { @@ -866,10 +865,17 @@ EVP_PKEY *load_key(BIO *err, const char if (format == FORMAT_ENGINE) { if (!e) - BIO_printf(bio_err,"no engine specified\n"); + BIO_printf(err,"no engine specified\n"); else + { pkey = ENGINE_load_private_key(e, file, ui_method, &cb_data); + if (!pkey) + { + BIO_printf(err,"cannot load %s from engine\n",key_descrip); + ERR_print_errors(err); + } + } goto end; } #endif @@ -919,8 +925,11 @@ EVP_PKEY *load_key(BIO *err, const char } end: if (key != NULL) BIO_free(key); - if (pkey == NULL) + if (pkey == NULL) + { BIO_printf(err,"unable to load %s\n", key_descrip); + ERR_print_errors(err); + } return(pkey); } Modified: projects/binutils-2.17/crypto/openssl/apps/dh.c ============================================================================== --- projects/binutils-2.17/crypto/openssl/apps/dh.c Mon Nov 22 20:50:40 2010 (r215709) +++ projects/binutils-2.17/crypto/openssl/apps/dh.c Mon Nov 22 20:52:18 2010 (r215710) @@ -88,9 +88,6 @@ int MAIN(int, char **); int MAIN(int argc, char **argv) { -#ifndef OPENSSL_NO_ENGINE - ENGINE *e = NULL; -#endif DH *dh=NULL; int i,badops=0,text=0; BIO *in=NULL,*out=NULL; @@ -189,7 +186,7 @@ bad: ERR_load_crypto_strings(); #ifndef OPENSSL_NO_ENGINE - e = setup_engine(bio_err, engine, 0); + setup_engine(bio_err, engine, 0); #endif in=BIO_new(BIO_s_file()); Modified: projects/binutils-2.17/crypto/openssl/apps/dhparam.c ============================================================================== --- projects/binutils-2.17/crypto/openssl/apps/dhparam.c Mon Nov 22 20:50:40 2010 (r215709) +++ projects/binutils-2.17/crypto/openssl/apps/dhparam.c Mon Nov 22 20:52:18 2010 (r215710) @@ -149,9 +149,6 @@ int MAIN(int, char **); int MAIN(int argc, char **argv) { -#ifndef OPENSSL_NO_ENGINE - ENGINE *e = NULL; -#endif DH *dh=NULL; int i,badops=0,text=0; #ifndef OPENSSL_NO_DSA @@ -270,7 +267,7 @@ bad: ERR_load_crypto_strings(); *** DIFF OUTPUT TRUNCATED AT 1000 LINES *** From owner-svn-src-projects@FreeBSD.ORG Tue Nov 23 03:53:53 2010 Return-Path: Delivered-To: svn-src-projects@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 70E64106566C; Tue, 23 Nov 2010 03:53:53 +0000 (UTC) (envelope-from jeff@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id 5FC958FC16; Tue, 23 Nov 2010 03:53:53 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id oAN3rrAh015929; Tue, 23 Nov 2010 03:53:53 GMT (envelope-from jeff@svn.freebsd.org) Received: (from jeff@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id oAN3rrDm015927; Tue, 23 Nov 2010 03:53:53 GMT (envelope-from jeff@svn.freebsd.org) Message-Id: <201011230353.oAN3rrDm015927@svn.freebsd.org> From: Jeff Roberson Date: Tue, 23 Nov 2010 03:53:53 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org X-SVN-Group: projects MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r215731 - projects/ofed/head/sys/ofed/drivers/infiniband/core X-BeenThere: svn-src-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "SVN commit messages for the src " projects" tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 23 Nov 2010 03:53:53 -0000 Author: jeff Date: Tue Nov 23 03:53:53 2010 New Revision: 215731 URL: http://svn.freebsd.org/changeset/base/215731 Log: - Fix a bug by enclosing the ternary operator in parentheses. This was made more problematic by the definition of VM_MAP_WIRE_KERNEL as 0 rather than a real value. Sponsored by: Isilon Systems, iX Systems, and Panasas. Modified: projects/ofed/head/sys/ofed/drivers/infiniband/core/umem.c Modified: projects/ofed/head/sys/ofed/drivers/infiniband/core/umem.c ============================================================================== --- projects/ofed/head/sys/ofed/drivers/infiniband/core/umem.c Tue Nov 23 01:39:30 2010 (r215730) +++ projects/ofed/head/sys/ofed/drivers/infiniband/core/umem.c Tue Nov 23 03:53:53 2010 (r215731) @@ -328,7 +328,7 @@ out: } error = vm_map_wire(&proc->p_vmspace->vm_map, start, end, VM_MAP_WIRE_USER | VM_MAP_WIRE_NOHOLES | - umem->writable ? VM_MAP_WIRE_WRITE : 0); + (umem->writable ? VM_MAP_WIRE_WRITE : 0)); if (error != KERN_SUCCESS) { kfree(umem); return ERR_PTR(-ENOMEM); From owner-svn-src-projects@FreeBSD.ORG Wed Nov 24 00:43:07 2010 Return-Path: Delivered-To: svn-src-projects@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 31681106566B; Wed, 24 Nov 2010 00:43:07 +0000 (UTC) (envelope-from sbruno@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id 1C0478FC19; Wed, 24 Nov 2010 00:43:07 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id oAO0h779049409; Wed, 24 Nov 2010 00:43:07 GMT (envelope-from sbruno@svn.freebsd.org) Received: (from sbruno@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id oAO0h6ru049369; Wed, 24 Nov 2010 00:43:06 GMT (envelope-from sbruno@svn.freebsd.org) Message-Id: <201011240043.oAO0h6ru049369@svn.freebsd.org> From: Sean Bruno Date: Wed, 24 Nov 2010 00:43:06 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org X-SVN-Group: projects MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r215787 - in projects/sbruno_64cpus: . bin/sh contrib/binutils/bfd contrib/binutils/binutils contrib/binutils/include/elf contrib/file contrib/gdb/gdb contrib/top crypto/openssl crypto/... X-BeenThere: svn-src-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "SVN commit messages for the src " projects" tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 24 Nov 2010 00:43:07 -0000 Author: sbruno Date: Wed Nov 24 00:43:05 2010 New Revision: 215787 URL: http://svn.freebsd.org/changeset/base/215787 Log: Merge from head for further bugfixes Added: projects/sbruno_64cpus/sys/dev/usb/usb_pf.c - copied, changed from r215730, head/sys/dev/usb/usb_pf.c projects/sbruno_64cpus/sys/dev/usb/usb_pf.h - copied unchanged from r215730, head/sys/dev/usb/usb_pf.h projects/sbruno_64cpus/usr.sbin/usbdump/ - copied from r215730, head/usr.sbin/usbdump/ Deleted: projects/sbruno_64cpus/usr.sbin/kernbb/ Modified: projects/sbruno_64cpus/ObsoleteFiles.inc projects/sbruno_64cpus/bin/sh/arith_lex.l projects/sbruno_64cpus/bin/sh/cd.c projects/sbruno_64cpus/contrib/binutils/bfd/elf-bfd.h projects/sbruno_64cpus/contrib/binutils/bfd/elf.c projects/sbruno_64cpus/contrib/binutils/binutils/readelf.c projects/sbruno_64cpus/contrib/binutils/include/elf/common.h projects/sbruno_64cpus/contrib/file/readelf.h projects/sbruno_64cpus/contrib/gdb/gdb/fbsd-proc.c projects/sbruno_64cpus/crypto/openssl/CHANGES projects/sbruno_64cpus/crypto/openssl/Configure projects/sbruno_64cpus/crypto/openssl/FAQ projects/sbruno_64cpus/crypto/openssl/Makefile projects/sbruno_64cpus/crypto/openssl/NEWS projects/sbruno_64cpus/crypto/openssl/PROBLEMS projects/sbruno_64cpus/crypto/openssl/README projects/sbruno_64cpus/crypto/openssl/apps/apps.c projects/sbruno_64cpus/crypto/openssl/apps/dh.c projects/sbruno_64cpus/crypto/openssl/apps/dhparam.c projects/sbruno_64cpus/crypto/openssl/apps/dsaparam.c projects/sbruno_64cpus/crypto/openssl/apps/ec.c projects/sbruno_64cpus/crypto/openssl/apps/ecparam.c projects/sbruno_64cpus/crypto/openssl/apps/enc.c projects/sbruno_64cpus/crypto/openssl/apps/gendh.c projects/sbruno_64cpus/crypto/openssl/apps/gendsa.c projects/sbruno_64cpus/crypto/openssl/apps/genrsa.c projects/sbruno_64cpus/crypto/openssl/apps/pkcs7.c projects/sbruno_64cpus/crypto/openssl/apps/rand.c projects/sbruno_64cpus/crypto/openssl/apps/s_server.c projects/sbruno_64cpus/crypto/openssl/apps/s_socket.c projects/sbruno_64cpus/crypto/openssl/apps/speed.c projects/sbruno_64cpus/crypto/openssl/apps/x509.c projects/sbruno_64cpus/crypto/openssl/crypto/aes/aes_wrap.c projects/sbruno_64cpus/crypto/openssl/crypto/aes/asm/aes-x86_64.pl projects/sbruno_64cpus/crypto/openssl/crypto/asn1/a_int.c projects/sbruno_64cpus/crypto/openssl/crypto/asn1/n_pkey.c projects/sbruno_64cpus/crypto/openssl/crypto/asn1/t_crl.c projects/sbruno_64cpus/crypto/openssl/crypto/asn1/tasn_dec.c projects/sbruno_64cpus/crypto/openssl/crypto/asn1/x_x509.c projects/sbruno_64cpus/crypto/openssl/crypto/bio/b_sock.c projects/sbruno_64cpus/crypto/openssl/crypto/bio/bf_nbio.c projects/sbruno_64cpus/crypto/openssl/crypto/bio/bio_lib.c projects/sbruno_64cpus/crypto/openssl/crypto/bio/bss_acpt.c projects/sbruno_64cpus/crypto/openssl/crypto/bio/bss_sock.c projects/sbruno_64cpus/crypto/openssl/crypto/bn/bn_exp2.c projects/sbruno_64cpus/crypto/openssl/crypto/bn/bn_mul.c projects/sbruno_64cpus/crypto/openssl/crypto/cms/cms_asn1.c projects/sbruno_64cpus/crypto/openssl/crypto/conf/conf_def.c projects/sbruno_64cpus/crypto/openssl/crypto/des/rpc_des.h projects/sbruno_64cpus/crypto/openssl/crypto/dsa/dsa_gen.c projects/sbruno_64cpus/crypto/openssl/crypto/dsa/dsa_ossl.c projects/sbruno_64cpus/crypto/openssl/crypto/ec/ec2_mult.c projects/sbruno_64cpus/crypto/openssl/crypto/ec/ec_mult.c projects/sbruno_64cpus/crypto/openssl/crypto/ecdh/ech_lib.c projects/sbruno_64cpus/crypto/openssl/crypto/ecdsa/ecs_lib.c projects/sbruno_64cpus/crypto/openssl/crypto/engine/eng_list.c projects/sbruno_64cpus/crypto/openssl/crypto/err/err_prn.c projects/sbruno_64cpus/crypto/openssl/crypto/evp/bio_b64.c projects/sbruno_64cpus/crypto/openssl/crypto/evp/enc_min.c projects/sbruno_64cpus/crypto/openssl/crypto/evp/encode.c projects/sbruno_64cpus/crypto/openssl/crypto/evp/evp_pbe.c projects/sbruno_64cpus/crypto/openssl/crypto/hmac/hmac.c projects/sbruno_64cpus/crypto/openssl/crypto/md32_common.h projects/sbruno_64cpus/crypto/openssl/crypto/o_init.c projects/sbruno_64cpus/crypto/openssl/crypto/ocsp/ocsp_ht.c projects/sbruno_64cpus/crypto/openssl/crypto/ocsp/ocsp_prn.c projects/sbruno_64cpus/crypto/openssl/crypto/opensslv.h projects/sbruno_64cpus/crypto/openssl/crypto/pem/pem_lib.c projects/sbruno_64cpus/crypto/openssl/crypto/pkcs12/p12_key.c projects/sbruno_64cpus/crypto/openssl/crypto/pkcs12/p12_npas.c projects/sbruno_64cpus/crypto/openssl/crypto/pkcs7/pk7_doit.c projects/sbruno_64cpus/crypto/openssl/crypto/pkcs7/pk7_lib.c projects/sbruno_64cpus/crypto/openssl/crypto/pkcs7/pk7_mime.c projects/sbruno_64cpus/crypto/openssl/crypto/pqueue/pqueue.c projects/sbruno_64cpus/crypto/openssl/crypto/rand/rand_nw.c projects/sbruno_64cpus/crypto/openssl/crypto/rand/randfile.c projects/sbruno_64cpus/crypto/openssl/crypto/rsa/rsa_eay.c projects/sbruno_64cpus/crypto/openssl/crypto/x509/x509.h projects/sbruno_64cpus/crypto/openssl/crypto/x509/x509_vfy.c projects/sbruno_64cpus/crypto/openssl/crypto/x509/x_all.c projects/sbruno_64cpus/crypto/openssl/crypto/x509v3/v3_ncons.c projects/sbruno_64cpus/crypto/openssl/crypto/x509v3/v3_pci.c projects/sbruno_64cpus/crypto/openssl/doc/apps/smime.pod projects/sbruno_64cpus/crypto/openssl/doc/crypto/ASN1_OBJECT_new.pod projects/sbruno_64cpus/crypto/openssl/doc/crypto/ASN1_STRING_length.pod projects/sbruno_64cpus/crypto/openssl/doc/crypto/ASN1_STRING_new.pod projects/sbruno_64cpus/crypto/openssl/doc/crypto/ASN1_generate_nconf.pod projects/sbruno_64cpus/crypto/openssl/doc/crypto/BIO_f_buffer.pod projects/sbruno_64cpus/crypto/openssl/doc/crypto/BIO_should_retry.pod projects/sbruno_64cpus/crypto/openssl/doc/crypto/CRYPTO_set_ex_data.pod projects/sbruno_64cpus/crypto/openssl/doc/crypto/OBJ_nid2obj.pod projects/sbruno_64cpus/crypto/openssl/doc/crypto/PKCS7_decrypt.pod projects/sbruno_64cpus/crypto/openssl/doc/crypto/PKCS7_encrypt.pod projects/sbruno_64cpus/crypto/openssl/doc/crypto/PKCS7_sign.pod projects/sbruno_64cpus/crypto/openssl/doc/crypto/PKCS7_verify.pod projects/sbruno_64cpus/crypto/openssl/doc/crypto/SMIME_read_PKCS7.pod projects/sbruno_64cpus/crypto/openssl/doc/crypto/SMIME_write_PKCS7.pod projects/sbruno_64cpus/crypto/openssl/doc/crypto/X509_NAME_ENTRY_get_object.pod projects/sbruno_64cpus/crypto/openssl/doc/crypto/X509_NAME_add_entry_by_txt.pod projects/sbruno_64cpus/crypto/openssl/doc/crypto/X509_NAME_get_index_by_NID.pod projects/sbruno_64cpus/crypto/openssl/doc/crypto/X509_new.pod projects/sbruno_64cpus/crypto/openssl/doc/crypto/bn_internal.pod projects/sbruno_64cpus/crypto/openssl/doc/crypto/ui_compat.pod projects/sbruno_64cpus/crypto/openssl/doc/ssl/SSL_library_init.pod projects/sbruno_64cpus/crypto/openssl/e_os.h projects/sbruno_64cpus/crypto/openssl/engines/e_chil.c projects/sbruno_64cpus/crypto/openssl/engines/e_cswift.c projects/sbruno_64cpus/crypto/openssl/engines/e_ubsec.c projects/sbruno_64cpus/crypto/openssl/fips/mkfipsscr.pl projects/sbruno_64cpus/crypto/openssl/openssl.spec projects/sbruno_64cpus/crypto/openssl/ssl/d1_both.c projects/sbruno_64cpus/crypto/openssl/ssl/d1_clnt.c projects/sbruno_64cpus/crypto/openssl/ssl/d1_enc.c projects/sbruno_64cpus/crypto/openssl/ssl/d1_lib.c projects/sbruno_64cpus/crypto/openssl/ssl/d1_pkt.c projects/sbruno_64cpus/crypto/openssl/ssl/dtls1.h projects/sbruno_64cpus/crypto/openssl/ssl/s23_clnt.c projects/sbruno_64cpus/crypto/openssl/ssl/s23_lib.c projects/sbruno_64cpus/crypto/openssl/ssl/s2_srvr.c projects/sbruno_64cpus/crypto/openssl/ssl/s3_both.c projects/sbruno_64cpus/crypto/openssl/ssl/s3_clnt.c projects/sbruno_64cpus/crypto/openssl/ssl/s3_enc.c projects/sbruno_64cpus/crypto/openssl/ssl/ssl_algs.c projects/sbruno_64cpus/crypto/openssl/ssl/ssl_asn1.c projects/sbruno_64cpus/crypto/openssl/ssl/ssl_cert.c projects/sbruno_64cpus/crypto/openssl/ssl/ssl_ciph.c projects/sbruno_64cpus/crypto/openssl/ssl/ssl_lib.c projects/sbruno_64cpus/crypto/openssl/ssl/ssltest.c projects/sbruno_64cpus/crypto/openssl/ssl/t1_enc.c projects/sbruno_64cpus/crypto/openssl/ssl/t1_lib.c projects/sbruno_64cpus/crypto/openssl/test/cms-test.pl projects/sbruno_64cpus/crypto/openssl/tools/c_rehash projects/sbruno_64cpus/crypto/openssl/tools/c_rehash.in projects/sbruno_64cpus/crypto/openssl/util/libeay.num projects/sbruno_64cpus/crypto/openssl/util/mkdef.pl projects/sbruno_64cpus/crypto/openssl/util/pl/VC-32.pl projects/sbruno_64cpus/gnu/usr.bin/gdb/libgdb/fbsd-threads.c projects/sbruno_64cpus/lib/libpam/modules/pam_unix/pam_unix.c projects/sbruno_64cpus/sbin/bsdlabel/bsdlabel.c projects/sbruno_64cpus/sbin/ddb/ddb.c projects/sbruno_64cpus/sbin/devd/devd.cc projects/sbruno_64cpus/sbin/devd/token.l projects/sbruno_64cpus/sbin/geom/class/eli/geom_eli.c projects/sbruno_64cpus/sbin/geom/class/part/geom_part.c projects/sbruno_64cpus/sbin/geom/class/part/gpart.8 projects/sbruno_64cpus/sbin/geom/class/virstor/geom_virstor.c projects/sbruno_64cpus/sbin/growfs/debug.c projects/sbruno_64cpus/sbin/gvinum/gvinum.c projects/sbruno_64cpus/sbin/hastctl/Makefile projects/sbruno_64cpus/sbin/hastd/Makefile projects/sbruno_64cpus/sbin/mknod/mknod.c projects/sbruno_64cpus/sbin/routed/parms.c projects/sbruno_64cpus/secure/lib/libcrypto/Makefile.inc projects/sbruno_64cpus/secure/lib/libcrypto/man/ASN1_OBJECT_new.3 projects/sbruno_64cpus/secure/lib/libcrypto/man/ASN1_STRING_length.3 projects/sbruno_64cpus/secure/lib/libcrypto/man/ASN1_STRING_new.3 projects/sbruno_64cpus/secure/lib/libcrypto/man/ASN1_STRING_print_ex.3 projects/sbruno_64cpus/secure/lib/libcrypto/man/ASN1_generate_nconf.3 projects/sbruno_64cpus/secure/lib/libcrypto/man/BIO_ctrl.3 projects/sbruno_64cpus/secure/lib/libcrypto/man/BIO_f_base64.3 projects/sbruno_64cpus/secure/lib/libcrypto/man/BIO_f_buffer.3 projects/sbruno_64cpus/secure/lib/libcrypto/man/BIO_f_cipher.3 projects/sbruno_64cpus/secure/lib/libcrypto/man/BIO_f_md.3 projects/sbruno_64cpus/secure/lib/libcrypto/man/BIO_f_null.3 projects/sbruno_64cpus/secure/lib/libcrypto/man/BIO_f_ssl.3 projects/sbruno_64cpus/secure/lib/libcrypto/man/BIO_find_type.3 projects/sbruno_64cpus/secure/lib/libcrypto/man/BIO_new.3 projects/sbruno_64cpus/secure/lib/libcrypto/man/BIO_push.3 projects/sbruno_64cpus/secure/lib/libcrypto/man/BIO_read.3 projects/sbruno_64cpus/secure/lib/libcrypto/man/BIO_s_accept.3 projects/sbruno_64cpus/secure/lib/libcrypto/man/BIO_s_bio.3 projects/sbruno_64cpus/secure/lib/libcrypto/man/BIO_s_connect.3 projects/sbruno_64cpus/secure/lib/libcrypto/man/BIO_s_fd.3 projects/sbruno_64cpus/secure/lib/libcrypto/man/BIO_s_file.3 projects/sbruno_64cpus/secure/lib/libcrypto/man/BIO_s_mem.3 projects/sbruno_64cpus/secure/lib/libcrypto/man/BIO_s_null.3 projects/sbruno_64cpus/secure/lib/libcrypto/man/BIO_s_socket.3 projects/sbruno_64cpus/secure/lib/libcrypto/man/BIO_set_callback.3 projects/sbruno_64cpus/secure/lib/libcrypto/man/BIO_should_retry.3 projects/sbruno_64cpus/secure/lib/libcrypto/man/BN_BLINDING_new.3 projects/sbruno_64cpus/secure/lib/libcrypto/man/BN_CTX_new.3 projects/sbruno_64cpus/secure/lib/libcrypto/man/BN_CTX_start.3 projects/sbruno_64cpus/secure/lib/libcrypto/man/BN_add.3 projects/sbruno_64cpus/secure/lib/libcrypto/man/BN_add_word.3 projects/sbruno_64cpus/secure/lib/libcrypto/man/BN_bn2bin.3 projects/sbruno_64cpus/secure/lib/libcrypto/man/BN_cmp.3 projects/sbruno_64cpus/secure/lib/libcrypto/man/BN_copy.3 projects/sbruno_64cpus/secure/lib/libcrypto/man/BN_generate_prime.3 projects/sbruno_64cpus/secure/lib/libcrypto/man/BN_mod_inverse.3 projects/sbruno_64cpus/secure/lib/libcrypto/man/BN_mod_mul_montgomery.3 projects/sbruno_64cpus/secure/lib/libcrypto/man/BN_mod_mul_reciprocal.3 projects/sbruno_64cpus/secure/lib/libcrypto/man/BN_new.3 projects/sbruno_64cpus/secure/lib/libcrypto/man/BN_num_bytes.3 projects/sbruno_64cpus/secure/lib/libcrypto/man/BN_rand.3 projects/sbruno_64cpus/secure/lib/libcrypto/man/BN_set_bit.3 projects/sbruno_64cpus/secure/lib/libcrypto/man/BN_swap.3 projects/sbruno_64cpus/secure/lib/libcrypto/man/BN_zero.3 projects/sbruno_64cpus/secure/lib/libcrypto/man/CONF_modules_free.3 projects/sbruno_64cpus/secure/lib/libcrypto/man/CONF_modules_load_file.3 projects/sbruno_64cpus/secure/lib/libcrypto/man/CRYPTO_set_ex_data.3 projects/sbruno_64cpus/secure/lib/libcrypto/man/DH_generate_key.3 projects/sbruno_64cpus/secure/lib/libcrypto/man/DH_generate_parameters.3 projects/sbruno_64cpus/secure/lib/libcrypto/man/DH_get_ex_new_index.3 projects/sbruno_64cpus/secure/lib/libcrypto/man/DH_new.3 projects/sbruno_64cpus/secure/lib/libcrypto/man/DH_set_method.3 projects/sbruno_64cpus/secure/lib/libcrypto/man/DH_size.3 projects/sbruno_64cpus/secure/lib/libcrypto/man/DSA_SIG_new.3 projects/sbruno_64cpus/secure/lib/libcrypto/man/DSA_do_sign.3 projects/sbruno_64cpus/secure/lib/libcrypto/man/DSA_dup_DH.3 projects/sbruno_64cpus/secure/lib/libcrypto/man/DSA_generate_key.3 projects/sbruno_64cpus/secure/lib/libcrypto/man/DSA_generate_parameters.3 projects/sbruno_64cpus/secure/lib/libcrypto/man/DSA_get_ex_new_index.3 projects/sbruno_64cpus/secure/lib/libcrypto/man/DSA_new.3 projects/sbruno_64cpus/secure/lib/libcrypto/man/DSA_set_method.3 projects/sbruno_64cpus/secure/lib/libcrypto/man/DSA_sign.3 projects/sbruno_64cpus/secure/lib/libcrypto/man/DSA_size.3 projects/sbruno_64cpus/secure/lib/libcrypto/man/ERR_GET_LIB.3 projects/sbruno_64cpus/secure/lib/libcrypto/man/ERR_clear_error.3 projects/sbruno_64cpus/secure/lib/libcrypto/man/ERR_error_string.3 projects/sbruno_64cpus/secure/lib/libcrypto/man/ERR_get_error.3 projects/sbruno_64cpus/secure/lib/libcrypto/man/ERR_load_crypto_strings.3 projects/sbruno_64cpus/secure/lib/libcrypto/man/ERR_load_strings.3 projects/sbruno_64cpus/secure/lib/libcrypto/man/ERR_print_errors.3 projects/sbruno_64cpus/secure/lib/libcrypto/man/ERR_put_error.3 projects/sbruno_64cpus/secure/lib/libcrypto/man/ERR_remove_state.3 projects/sbruno_64cpus/secure/lib/libcrypto/man/ERR_set_mark.3 projects/sbruno_64cpus/secure/lib/libcrypto/man/EVP_BytesToKey.3 projects/sbruno_64cpus/secure/lib/libcrypto/man/EVP_DigestInit.3 projects/sbruno_64cpus/secure/lib/libcrypto/man/EVP_EncryptInit.3 projects/sbruno_64cpus/secure/lib/libcrypto/man/EVP_OpenInit.3 projects/sbruno_64cpus/secure/lib/libcrypto/man/EVP_PKEY_new.3 projects/sbruno_64cpus/secure/lib/libcrypto/man/EVP_PKEY_set1_RSA.3 projects/sbruno_64cpus/secure/lib/libcrypto/man/EVP_SealInit.3 projects/sbruno_64cpus/secure/lib/libcrypto/man/EVP_SignInit.3 projects/sbruno_64cpus/secure/lib/libcrypto/man/EVP_VerifyInit.3 projects/sbruno_64cpus/secure/lib/libcrypto/man/OBJ_nid2obj.3 projects/sbruno_64cpus/secure/lib/libcrypto/man/OPENSSL_Applink.3 projects/sbruno_64cpus/secure/lib/libcrypto/man/OPENSSL_VERSION_NUMBER.3 projects/sbruno_64cpus/secure/lib/libcrypto/man/OPENSSL_config.3 projects/sbruno_64cpus/secure/lib/libcrypto/man/OPENSSL_ia32cap.3 projects/sbruno_64cpus/secure/lib/libcrypto/man/OPENSSL_load_builtin_modules.3 projects/sbruno_64cpus/secure/lib/libcrypto/man/OpenSSL_add_all_algorithms.3 projects/sbruno_64cpus/secure/lib/libcrypto/man/PKCS12_create.3 projects/sbruno_64cpus/secure/lib/libcrypto/man/PKCS12_parse.3 projects/sbruno_64cpus/secure/lib/libcrypto/man/PKCS7_decrypt.3 projects/sbruno_64cpus/secure/lib/libcrypto/man/PKCS7_encrypt.3 projects/sbruno_64cpus/secure/lib/libcrypto/man/PKCS7_sign.3 projects/sbruno_64cpus/secure/lib/libcrypto/man/PKCS7_verify.3 projects/sbruno_64cpus/secure/lib/libcrypto/man/RAND_add.3 projects/sbruno_64cpus/secure/lib/libcrypto/man/RAND_bytes.3 projects/sbruno_64cpus/secure/lib/libcrypto/man/RAND_cleanup.3 projects/sbruno_64cpus/secure/lib/libcrypto/man/RAND_egd.3 projects/sbruno_64cpus/secure/lib/libcrypto/man/RAND_load_file.3 projects/sbruno_64cpus/secure/lib/libcrypto/man/RAND_set_rand_method.3 projects/sbruno_64cpus/secure/lib/libcrypto/man/RSA_blinding_on.3 projects/sbruno_64cpus/secure/lib/libcrypto/man/RSA_check_key.3 projects/sbruno_64cpus/secure/lib/libcrypto/man/RSA_generate_key.3 projects/sbruno_64cpus/secure/lib/libcrypto/man/RSA_get_ex_new_index.3 projects/sbruno_64cpus/secure/lib/libcrypto/man/RSA_new.3 projects/sbruno_64cpus/secure/lib/libcrypto/man/RSA_padding_add_PKCS1_type_1.3 projects/sbruno_64cpus/secure/lib/libcrypto/man/RSA_print.3 projects/sbruno_64cpus/secure/lib/libcrypto/man/RSA_private_encrypt.3 projects/sbruno_64cpus/secure/lib/libcrypto/man/RSA_public_encrypt.3 projects/sbruno_64cpus/secure/lib/libcrypto/man/RSA_set_method.3 projects/sbruno_64cpus/secure/lib/libcrypto/man/RSA_sign.3 projects/sbruno_64cpus/secure/lib/libcrypto/man/RSA_sign_ASN1_OCTET_STRING.3 projects/sbruno_64cpus/secure/lib/libcrypto/man/RSA_size.3 projects/sbruno_64cpus/secure/lib/libcrypto/man/SMIME_read_PKCS7.3 projects/sbruno_64cpus/secure/lib/libcrypto/man/SMIME_write_PKCS7.3 projects/sbruno_64cpus/secure/lib/libcrypto/man/X509_NAME_ENTRY_get_object.3 projects/sbruno_64cpus/secure/lib/libcrypto/man/X509_NAME_add_entry_by_txt.3 projects/sbruno_64cpus/secure/lib/libcrypto/man/X509_NAME_get_index_by_NID.3 projects/sbruno_64cpus/secure/lib/libcrypto/man/X509_NAME_print_ex.3 projects/sbruno_64cpus/secure/lib/libcrypto/man/X509_new.3 projects/sbruno_64cpus/secure/lib/libcrypto/man/bio.3 projects/sbruno_64cpus/secure/lib/libcrypto/man/blowfish.3 projects/sbruno_64cpus/secure/lib/libcrypto/man/bn.3 projects/sbruno_64cpus/secure/lib/libcrypto/man/bn_internal.3 projects/sbruno_64cpus/secure/lib/libcrypto/man/buffer.3 projects/sbruno_64cpus/secure/lib/libcrypto/man/crypto.3 projects/sbruno_64cpus/secure/lib/libcrypto/man/d2i_ASN1_OBJECT.3 projects/sbruno_64cpus/secure/lib/libcrypto/man/d2i_DHparams.3 projects/sbruno_64cpus/secure/lib/libcrypto/man/d2i_DSAPublicKey.3 projects/sbruno_64cpus/secure/lib/libcrypto/man/d2i_PKCS8PrivateKey.3 projects/sbruno_64cpus/secure/lib/libcrypto/man/d2i_RSAPublicKey.3 projects/sbruno_64cpus/secure/lib/libcrypto/man/d2i_X509.3 projects/sbruno_64cpus/secure/lib/libcrypto/man/d2i_X509_ALGOR.3 projects/sbruno_64cpus/secure/lib/libcrypto/man/d2i_X509_CRL.3 projects/sbruno_64cpus/secure/lib/libcrypto/man/d2i_X509_NAME.3 projects/sbruno_64cpus/secure/lib/libcrypto/man/d2i_X509_REQ.3 projects/sbruno_64cpus/secure/lib/libcrypto/man/d2i_X509_SIG.3 projects/sbruno_64cpus/secure/lib/libcrypto/man/des.3 projects/sbruno_64cpus/secure/lib/libcrypto/man/dh.3 projects/sbruno_64cpus/secure/lib/libcrypto/man/dsa.3 projects/sbruno_64cpus/secure/lib/libcrypto/man/ecdsa.3 projects/sbruno_64cpus/secure/lib/libcrypto/man/engine.3 projects/sbruno_64cpus/secure/lib/libcrypto/man/err.3 projects/sbruno_64cpus/secure/lib/libcrypto/man/evp.3 projects/sbruno_64cpus/secure/lib/libcrypto/man/hmac.3 projects/sbruno_64cpus/secure/lib/libcrypto/man/lh_stats.3 projects/sbruno_64cpus/secure/lib/libcrypto/man/lhash.3 projects/sbruno_64cpus/secure/lib/libcrypto/man/md5.3 projects/sbruno_64cpus/secure/lib/libcrypto/man/mdc2.3 projects/sbruno_64cpus/secure/lib/libcrypto/man/pem.3 projects/sbruno_64cpus/secure/lib/libcrypto/man/rand.3 projects/sbruno_64cpus/secure/lib/libcrypto/man/rc4.3 projects/sbruno_64cpus/secure/lib/libcrypto/man/ripemd.3 projects/sbruno_64cpus/secure/lib/libcrypto/man/rsa.3 projects/sbruno_64cpus/secure/lib/libcrypto/man/sha.3 projects/sbruno_64cpus/secure/lib/libcrypto/man/threads.3 projects/sbruno_64cpus/secure/lib/libcrypto/man/ui.3 projects/sbruno_64cpus/secure/lib/libcrypto/man/ui_compat.3 projects/sbruno_64cpus/secure/lib/libcrypto/man/x509.3 projects/sbruno_64cpus/secure/lib/libssl/man/SSL_CIPHER_get_name.3 projects/sbruno_64cpus/secure/lib/libssl/man/SSL_COMP_add_compression_method.3 projects/sbruno_64cpus/secure/lib/libssl/man/SSL_CTX_add_extra_chain_cert.3 projects/sbruno_64cpus/secure/lib/libssl/man/SSL_CTX_add_session.3 projects/sbruno_64cpus/secure/lib/libssl/man/SSL_CTX_ctrl.3 projects/sbruno_64cpus/secure/lib/libssl/man/SSL_CTX_flush_sessions.3 projects/sbruno_64cpus/secure/lib/libssl/man/SSL_CTX_free.3 projects/sbruno_64cpus/secure/lib/libssl/man/SSL_CTX_get_ex_new_index.3 projects/sbruno_64cpus/secure/lib/libssl/man/SSL_CTX_get_verify_mode.3 projects/sbruno_64cpus/secure/lib/libssl/man/SSL_CTX_load_verify_locations.3 projects/sbruno_64cpus/secure/lib/libssl/man/SSL_CTX_new.3 projects/sbruno_64cpus/secure/lib/libssl/man/SSL_CTX_sess_number.3 projects/sbruno_64cpus/secure/lib/libssl/man/SSL_CTX_sess_set_cache_size.3 projects/sbruno_64cpus/secure/lib/libssl/man/SSL_CTX_sess_set_get_cb.3 projects/sbruno_64cpus/secure/lib/libssl/man/SSL_CTX_sessions.3 projects/sbruno_64cpus/secure/lib/libssl/man/SSL_CTX_set_cert_store.3 projects/sbruno_64cpus/secure/lib/libssl/man/SSL_CTX_set_cert_verify_callback.3 projects/sbruno_64cpus/secure/lib/libssl/man/SSL_CTX_set_cipher_list.3 projects/sbruno_64cpus/secure/lib/libssl/man/SSL_CTX_set_client_CA_list.3 projects/sbruno_64cpus/secure/lib/libssl/man/SSL_CTX_set_client_cert_cb.3 projects/sbruno_64cpus/secure/lib/libssl/man/SSL_CTX_set_default_passwd_cb.3 projects/sbruno_64cpus/secure/lib/libssl/man/SSL_CTX_set_generate_session_id.3 projects/sbruno_64cpus/secure/lib/libssl/man/SSL_CTX_set_info_callback.3 projects/sbruno_64cpus/secure/lib/libssl/man/SSL_CTX_set_max_cert_list.3 projects/sbruno_64cpus/secure/lib/libssl/man/SSL_CTX_set_mode.3 projects/sbruno_64cpus/secure/lib/libssl/man/SSL_CTX_set_msg_callback.3 projects/sbruno_64cpus/secure/lib/libssl/man/SSL_CTX_set_options.3 projects/sbruno_64cpus/secure/lib/libssl/man/SSL_CTX_set_quiet_shutdown.3 projects/sbruno_64cpus/secure/lib/libssl/man/SSL_CTX_set_session_cache_mode.3 projects/sbruno_64cpus/secure/lib/libssl/man/SSL_CTX_set_session_id_context.3 projects/sbruno_64cpus/secure/lib/libssl/man/SSL_CTX_set_ssl_version.3 projects/sbruno_64cpus/secure/lib/libssl/man/SSL_CTX_set_timeout.3 projects/sbruno_64cpus/secure/lib/libssl/man/SSL_CTX_set_tmp_dh_callback.3 projects/sbruno_64cpus/secure/lib/libssl/man/SSL_CTX_set_tmp_rsa_callback.3 projects/sbruno_64cpus/secure/lib/libssl/man/SSL_CTX_set_verify.3 projects/sbruno_64cpus/secure/lib/libssl/man/SSL_CTX_use_certificate.3 projects/sbruno_64cpus/secure/lib/libssl/man/SSL_SESSION_free.3 projects/sbruno_64cpus/secure/lib/libssl/man/SSL_SESSION_get_ex_new_index.3 projects/sbruno_64cpus/secure/lib/libssl/man/SSL_SESSION_get_time.3 projects/sbruno_64cpus/secure/lib/libssl/man/SSL_accept.3 projects/sbruno_64cpus/secure/lib/libssl/man/SSL_alert_type_string.3 projects/sbruno_64cpus/secure/lib/libssl/man/SSL_clear.3 projects/sbruno_64cpus/secure/lib/libssl/man/SSL_connect.3 projects/sbruno_64cpus/secure/lib/libssl/man/SSL_do_handshake.3 projects/sbruno_64cpus/secure/lib/libssl/man/SSL_free.3 projects/sbruno_64cpus/secure/lib/libssl/man/SSL_get_SSL_CTX.3 projects/sbruno_64cpus/secure/lib/libssl/man/SSL_get_ciphers.3 projects/sbruno_64cpus/secure/lib/libssl/man/SSL_get_client_CA_list.3 projects/sbruno_64cpus/secure/lib/libssl/man/SSL_get_current_cipher.3 projects/sbruno_64cpus/secure/lib/libssl/man/SSL_get_default_timeout.3 projects/sbruno_64cpus/secure/lib/libssl/man/SSL_get_error.3 projects/sbruno_64cpus/secure/lib/libssl/man/SSL_get_ex_data_X509_STORE_CTX_idx.3 projects/sbruno_64cpus/secure/lib/libssl/man/SSL_get_ex_new_index.3 projects/sbruno_64cpus/secure/lib/libssl/man/SSL_get_fd.3 projects/sbruno_64cpus/secure/lib/libssl/man/SSL_get_peer_cert_chain.3 projects/sbruno_64cpus/secure/lib/libssl/man/SSL_get_peer_certificate.3 projects/sbruno_64cpus/secure/lib/libssl/man/SSL_get_rbio.3 projects/sbruno_64cpus/secure/lib/libssl/man/SSL_get_session.3 projects/sbruno_64cpus/secure/lib/libssl/man/SSL_get_verify_result.3 projects/sbruno_64cpus/secure/lib/libssl/man/SSL_get_version.3 projects/sbruno_64cpus/secure/lib/libssl/man/SSL_library_init.3 projects/sbruno_64cpus/secure/lib/libssl/man/SSL_load_client_CA_file.3 projects/sbruno_64cpus/secure/lib/libssl/man/SSL_new.3 projects/sbruno_64cpus/secure/lib/libssl/man/SSL_pending.3 projects/sbruno_64cpus/secure/lib/libssl/man/SSL_read.3 projects/sbruno_64cpus/secure/lib/libssl/man/SSL_rstate_string.3 projects/sbruno_64cpus/secure/lib/libssl/man/SSL_session_reused.3 projects/sbruno_64cpus/secure/lib/libssl/man/SSL_set_bio.3 projects/sbruno_64cpus/secure/lib/libssl/man/SSL_set_connect_state.3 projects/sbruno_64cpus/secure/lib/libssl/man/SSL_set_fd.3 projects/sbruno_64cpus/secure/lib/libssl/man/SSL_set_session.3 projects/sbruno_64cpus/secure/lib/libssl/man/SSL_set_shutdown.3 projects/sbruno_64cpus/secure/lib/libssl/man/SSL_set_verify_result.3 projects/sbruno_64cpus/secure/lib/libssl/man/SSL_shutdown.3 projects/sbruno_64cpus/secure/lib/libssl/man/SSL_state_string.3 projects/sbruno_64cpus/secure/lib/libssl/man/SSL_want.3 projects/sbruno_64cpus/secure/lib/libssl/man/SSL_write.3 projects/sbruno_64cpus/secure/lib/libssl/man/d2i_SSL_SESSION.3 projects/sbruno_64cpus/secure/lib/libssl/man/ssl.3 projects/sbruno_64cpus/secure/usr.bin/openssl/man/CA.pl.1 projects/sbruno_64cpus/secure/usr.bin/openssl/man/asn1parse.1 projects/sbruno_64cpus/secure/usr.bin/openssl/man/ca.1 projects/sbruno_64cpus/secure/usr.bin/openssl/man/ciphers.1 projects/sbruno_64cpus/secure/usr.bin/openssl/man/crl.1 projects/sbruno_64cpus/secure/usr.bin/openssl/man/crl2pkcs7.1 projects/sbruno_64cpus/secure/usr.bin/openssl/man/dgst.1 projects/sbruno_64cpus/secure/usr.bin/openssl/man/dhparam.1 projects/sbruno_64cpus/secure/usr.bin/openssl/man/dsa.1 projects/sbruno_64cpus/secure/usr.bin/openssl/man/dsaparam.1 projects/sbruno_64cpus/secure/usr.bin/openssl/man/ec.1 projects/sbruno_64cpus/secure/usr.bin/openssl/man/ecparam.1 projects/sbruno_64cpus/secure/usr.bin/openssl/man/enc.1 projects/sbruno_64cpus/secure/usr.bin/openssl/man/errstr.1 projects/sbruno_64cpus/secure/usr.bin/openssl/man/gendsa.1 projects/sbruno_64cpus/secure/usr.bin/openssl/man/genrsa.1 projects/sbruno_64cpus/secure/usr.bin/openssl/man/nseq.1 projects/sbruno_64cpus/secure/usr.bin/openssl/man/ocsp.1 projects/sbruno_64cpus/secure/usr.bin/openssl/man/openssl.1 projects/sbruno_64cpus/secure/usr.bin/openssl/man/passwd.1 projects/sbruno_64cpus/secure/usr.bin/openssl/man/pkcs12.1 projects/sbruno_64cpus/secure/usr.bin/openssl/man/pkcs7.1 projects/sbruno_64cpus/secure/usr.bin/openssl/man/pkcs8.1 projects/sbruno_64cpus/secure/usr.bin/openssl/man/rand.1 projects/sbruno_64cpus/secure/usr.bin/openssl/man/req.1 projects/sbruno_64cpus/secure/usr.bin/openssl/man/rsa.1 projects/sbruno_64cpus/secure/usr.bin/openssl/man/rsautl.1 projects/sbruno_64cpus/secure/usr.bin/openssl/man/s_client.1 projects/sbruno_64cpus/secure/usr.bin/openssl/man/s_server.1 projects/sbruno_64cpus/secure/usr.bin/openssl/man/s_time.1 projects/sbruno_64cpus/secure/usr.bin/openssl/man/sess_id.1 projects/sbruno_64cpus/secure/usr.bin/openssl/man/smime.1 projects/sbruno_64cpus/secure/usr.bin/openssl/man/speed.1 projects/sbruno_64cpus/secure/usr.bin/openssl/man/spkac.1 projects/sbruno_64cpus/secure/usr.bin/openssl/man/verify.1 projects/sbruno_64cpus/secure/usr.bin/openssl/man/version.1 projects/sbruno_64cpus/secure/usr.bin/openssl/man/x509.1 projects/sbruno_64cpus/secure/usr.bin/openssl/man/x509v3_config.1 projects/sbruno_64cpus/share/misc/bsd-family-tree projects/sbruno_64cpus/sys/Makefile projects/sbruno_64cpus/sys/amd64/acpica/acpi_switch.S projects/sbruno_64cpus/sys/amd64/acpica/acpi_wakecode.S projects/sbruno_64cpus/sys/amd64/acpica/acpi_wakeup.c projects/sbruno_64cpus/sys/amd64/amd64/mp_machdep.c projects/sbruno_64cpus/sys/amd64/amd64/pmap.c projects/sbruno_64cpus/sys/amd64/include/specialreg.h projects/sbruno_64cpus/sys/boot/common/load_elf.c projects/sbruno_64cpus/sys/compat/freebsd32/freebsd32.h projects/sbruno_64cpus/sys/compat/freebsd32/freebsd32_misc.c projects/sbruno_64cpus/sys/compat/ia32/ia32_signal.h projects/sbruno_64cpus/sys/compat/ia32/ia32_util.h projects/sbruno_64cpus/sys/compat/linux/linux_emul.c projects/sbruno_64cpus/sys/compat/linux/linux_emul.h projects/sbruno_64cpus/sys/compat/linux/linux_futex.c projects/sbruno_64cpus/sys/compat/linux/linux_misc.c projects/sbruno_64cpus/sys/compat/ndis/kern_windrv.c projects/sbruno_64cpus/sys/compat/ndis/ntoskrnl_var.h projects/sbruno_64cpus/sys/compat/ndis/subr_ntoskrnl.c projects/sbruno_64cpus/sys/compat/ndis/winx64_wrap.S projects/sbruno_64cpus/sys/conf/files projects/sbruno_64cpus/sys/dev/ahci/ahci.c projects/sbruno_64cpus/sys/dev/cas/if_cas.c projects/sbruno_64cpus/sys/dev/fxp/if_fxp.c projects/sbruno_64cpus/sys/dev/fxp/if_fxpvar.h projects/sbruno_64cpus/sys/dev/gem/if_gem.c projects/sbruno_64cpus/sys/dev/mii/bmtphy.c projects/sbruno_64cpus/sys/dev/mii/gentbi.c projects/sbruno_64cpus/sys/dev/mii/inphy.c projects/sbruno_64cpus/sys/dev/mii/mii.c projects/sbruno_64cpus/sys/dev/mii/miidevs projects/sbruno_64cpus/sys/dev/mii/nsgphy.c projects/sbruno_64cpus/sys/dev/mii/nsphyter.c projects/sbruno_64cpus/sys/dev/mii/ukphy.c projects/sbruno_64cpus/sys/dev/mxge/if_mxge.c projects/sbruno_64cpus/sys/dev/pci/pci.c projects/sbruno_64cpus/sys/dev/usb/controller/usb_controller.c projects/sbruno_64cpus/sys/dev/usb/serial/u3g.c projects/sbruno_64cpus/sys/dev/usb/usb_bus.h projects/sbruno_64cpus/sys/dev/usb/usb_controller.h projects/sbruno_64cpus/sys/dev/usb/usb_transfer.c projects/sbruno_64cpus/sys/dev/usb/usbdevs projects/sbruno_64cpus/sys/geom/geom_event.c projects/sbruno_64cpus/sys/geom/geom_kern.c projects/sbruno_64cpus/sys/i386/i386/pmap.c projects/sbruno_64cpus/sys/i386/include/specialreg.h projects/sbruno_64cpus/sys/i386/xen/clock.c projects/sbruno_64cpus/sys/kern/imgact_elf.c projects/sbruno_64cpus/sys/kern/kern_clock.c projects/sbruno_64cpus/sys/kern/kern_clocksource.c projects/sbruno_64cpus/sys/kern/kern_exit.c projects/sbruno_64cpus/sys/kern/kern_module.c projects/sbruno_64cpus/sys/kern/kern_tc.c projects/sbruno_64cpus/sys/kern/kern_umtx.c projects/sbruno_64cpus/sys/kern/sched_4bsd.c projects/sbruno_64cpus/sys/kern/subr_pcpu.c projects/sbruno_64cpus/sys/kern/subr_taskqueue.c projects/sbruno_64cpus/sys/kern/sys_process.c projects/sbruno_64cpus/sys/kern/vfs_mount.c projects/sbruno_64cpus/sys/mips/mips/tick.c projects/sbruno_64cpus/sys/mips/rmi/tick.c projects/sbruno_64cpus/sys/modules/usb/usb/Makefile projects/sbruno_64cpus/sys/net/flowtable.c projects/sbruno_64cpus/sys/net/if.c projects/sbruno_64cpus/sys/net/if_clone.c projects/sbruno_64cpus/sys/net/if_epair.c projects/sbruno_64cpus/sys/net/if_ethersubr.c projects/sbruno_64cpus/sys/net/if_gif.c projects/sbruno_64cpus/sys/net/if_llatbl.c projects/sbruno_64cpus/sys/net/if_loop.c projects/sbruno_64cpus/sys/net/if_vlan.c projects/sbruno_64cpus/sys/net/route.c projects/sbruno_64cpus/sys/net/vnet.c projects/sbruno_64cpus/sys/net/vnet.h projects/sbruno_64cpus/sys/net80211/ieee80211_scan_sta.c projects/sbruno_64cpus/sys/netgraph/ng_base.c projects/sbruno_64cpus/sys/netgraph/ng_eiface.c projects/sbruno_64cpus/sys/netgraph/ng_eiface.h projects/sbruno_64cpus/sys/netgraph/ng_iface.c projects/sbruno_64cpus/sys/netinet/if_ether.c projects/sbruno_64cpus/sys/netinet/igmp.c projects/sbruno_64cpus/sys/netinet/in.c projects/sbruno_64cpus/sys/netinet/in_pcb.c projects/sbruno_64cpus/sys/netinet/in_rmx.c projects/sbruno_64cpus/sys/netinet/ip_divert.c projects/sbruno_64cpus/sys/netinet/ip_fastfwd.c projects/sbruno_64cpus/sys/netinet/ip_icmp.c projects/sbruno_64cpus/sys/netinet/ip_input.c projects/sbruno_64cpus/sys/netinet/ip_ipsec.c projects/sbruno_64cpus/sys/netinet/ip_mroute.c projects/sbruno_64cpus/sys/netinet/ipfw/ip_fw2.c projects/sbruno_64cpus/sys/netinet/ipfw/ip_fw_dynamic.c projects/sbruno_64cpus/sys/netinet/ipfw/ip_fw_nat.c projects/sbruno_64cpus/sys/netinet/ipfw/ip_fw_pfil.c projects/sbruno_64cpus/sys/netinet/siftr.c projects/sbruno_64cpus/sys/netinet/tcp_hostcache.c projects/sbruno_64cpus/sys/netinet/tcp_reass.c projects/sbruno_64cpus/sys/netinet/tcp_subr.c projects/sbruno_64cpus/sys/netinet/tcp_syncache.c projects/sbruno_64cpus/sys/netinet/tcp_timewait.c projects/sbruno_64cpus/sys/netinet/udp_usrreq.c projects/sbruno_64cpus/sys/netinet6/frag6.c projects/sbruno_64cpus/sys/netinet6/icmp6.c projects/sbruno_64cpus/sys/netinet6/in6_rmx.c projects/sbruno_64cpus/sys/netinet6/in6_src.c projects/sbruno_64cpus/sys/netinet6/ip6_ipsec.c projects/sbruno_64cpus/sys/netinet6/ip6_mroute.c projects/sbruno_64cpus/sys/netinet6/mld6.c projects/sbruno_64cpus/sys/netinet6/nd6.c projects/sbruno_64cpus/sys/netinet6/nd6_nbr.c projects/sbruno_64cpus/sys/netinet6/nd6_rtr.c projects/sbruno_64cpus/sys/netinet6/scope6.c projects/sbruno_64cpus/sys/netinet6/send.c projects/sbruno_64cpus/sys/netipsec/key.c projects/sbruno_64cpus/sys/netipsec/keysock.c projects/sbruno_64cpus/sys/netipsec/xform_esp.c projects/sbruno_64cpus/sys/powerpc/aim/clock.c projects/sbruno_64cpus/sys/powerpc/booke/clock.c projects/sbruno_64cpus/sys/sys/cdefs.h projects/sbruno_64cpus/sys/sys/elf_common.h projects/sbruno_64cpus/sys/sys/linker_set.h projects/sbruno_64cpus/sys/sys/pcpu.h projects/sbruno_64cpus/sys/sys/procfs.h projects/sbruno_64cpus/sys/sys/ptrace.h projects/sbruno_64cpus/sys/vm/vm_object.c projects/sbruno_64cpus/sys/x86/x86/local_apic.c projects/sbruno_64cpus/tools/tools/sysbuild/sysbuild.sh projects/sbruno_64cpus/usr.bin/ar/acplex.l projects/sbruno_64cpus/usr.bin/bc/scan.l projects/sbruno_64cpus/usr.bin/colldef/Makefile projects/sbruno_64cpus/usr.bin/gcore/elfcore.c projects/sbruno_64cpus/usr.bin/ldd/ldd.c projects/sbruno_64cpus/usr.bin/locate/locate/locate.h projects/sbruno_64cpus/usr.bin/netstat/inet.c projects/sbruno_64cpus/usr.bin/xargs/xargs.c projects/sbruno_64cpus/usr.sbin/apmd/apmdlex.l projects/sbruno_64cpus/usr.sbin/bluetooth/bthidd/lexer.l projects/sbruno_64cpus/usr.sbin/bluetooth/hcsecd/lexer.l projects/sbruno_64cpus/usr.sbin/config/lang.l projects/sbruno_64cpus/usr.sbin/kbdcontrol/lex.l projects/sbruno_64cpus/usr.sbin/mptutil/mpt_config.c projects/sbruno_64cpus/usr.sbin/newsyslog/newsyslog.c projects/sbruno_64cpus/usr.sbin/sysinstall/dispatch.c Directory Properties: projects/sbruno_64cpus/ (props changed) projects/sbruno_64cpus/cddl/contrib/opensolaris/ (props changed) projects/sbruno_64cpus/contrib/bind9/ (props changed) projects/sbruno_64cpus/contrib/binutils/ (props changed) projects/sbruno_64cpus/contrib/bzip2/ (props changed) projects/sbruno_64cpus/contrib/ee/ (props changed) projects/sbruno_64cpus/contrib/expat/ (props changed) projects/sbruno_64cpus/contrib/file/ (props changed) projects/sbruno_64cpus/contrib/gdb/ (props changed) projects/sbruno_64cpus/contrib/gdtoa/ (props changed) projects/sbruno_64cpus/contrib/gnu-sort/ (props changed) projects/sbruno_64cpus/contrib/groff/ (props changed) projects/sbruno_64cpus/contrib/less/ (props changed) projects/sbruno_64cpus/contrib/libpcap/ (props changed) projects/sbruno_64cpus/contrib/llvm/ (props changed) projects/sbruno_64cpus/contrib/llvm/tools/clang/ (props changed) projects/sbruno_64cpus/contrib/ncurses/ (props changed) projects/sbruno_64cpus/contrib/netcat/ (props changed) projects/sbruno_64cpus/contrib/ntp/ (props changed) projects/sbruno_64cpus/contrib/one-true-awk/ (props changed) projects/sbruno_64cpus/contrib/openbsm/ (props changed) projects/sbruno_64cpus/contrib/openpam/ (props changed) projects/sbruno_64cpus/contrib/pf/ (props changed) projects/sbruno_64cpus/contrib/sendmail/ (props changed) projects/sbruno_64cpus/contrib/tcpdump/ (props changed) projects/sbruno_64cpus/contrib/tcsh/ (props changed) projects/sbruno_64cpus/contrib/top/ (props changed) projects/sbruno_64cpus/contrib/top/install-sh (props changed) projects/sbruno_64cpus/contrib/tzcode/stdtime/ (props changed) projects/sbruno_64cpus/contrib/tzcode/zic/ (props changed) projects/sbruno_64cpus/contrib/tzdata/ (props changed) projects/sbruno_64cpus/contrib/wpa/ (props changed) projects/sbruno_64cpus/contrib/xz/ (props changed) projects/sbruno_64cpus/crypto/openssh/ (props changed) projects/sbruno_64cpus/crypto/openssl/ (props changed) projects/sbruno_64cpus/lib/libc/ (props changed) projects/sbruno_64cpus/lib/libc/stdtime/ (props changed) projects/sbruno_64cpus/lib/libutil/ (props changed) projects/sbruno_64cpus/lib/libz/ (props changed) projects/sbruno_64cpus/sbin/ (props changed) projects/sbruno_64cpus/sbin/ipfw/ (props changed) projects/sbruno_64cpus/share/mk/bsd.arch.inc.mk (props changed) projects/sbruno_64cpus/share/zoneinfo/ (props changed) projects/sbruno_64cpus/sys/ (props changed) projects/sbruno_64cpus/sys/amd64/include/xen/ (props changed) projects/sbruno_64cpus/sys/cddl/contrib/opensolaris/ (props changed) projects/sbruno_64cpus/sys/contrib/dev/acpica/ (props changed) projects/sbruno_64cpus/sys/contrib/pf/ (props changed) projects/sbruno_64cpus/sys/contrib/x86emu/ (props changed) projects/sbruno_64cpus/sys/dev/xen/xenpci/ (props changed) projects/sbruno_64cpus/usr.bin/calendar/ (props changed) projects/sbruno_64cpus/usr.bin/csup/ (props changed) projects/sbruno_64cpus/usr.bin/procstat/ (props changed) projects/sbruno_64cpus/usr.sbin/zic/ (props changed) Modified: projects/sbruno_64cpus/ObsoleteFiles.inc ============================================================================== --- projects/sbruno_64cpus/ObsoleteFiles.inc Wed Nov 24 00:05:19 2010 (r215786) +++ projects/sbruno_64cpus/ObsoleteFiles.inc Wed Nov 24 00:43:05 2010 (r215787) @@ -13,6 +13,15 @@ # # The file is partitioned: OLD_FILES first, then OLD_LIBS and OLD_DIRS last. # +# Before you commit changes to this file please check if any entries in +# tools/build/mk/OptionalObsoleteFiles.inc can be removed. The following +# command tells which files are listed more than once regardless of some +# architecture specific conditionals, so you can not blindly trust the +# output: +# ( grep '+=' /usr/src/ObsoleteFiles.inc | sort -u ; \ +# grep '+=' /usr/src/tools/build/mk/OptionalObsoleteFiles.inc | sort -u) | \ +# sort | uniq -d +# # 20101112: vgonel(9) has gone to private API a while ago OLD_FILES+=usr/share/man/man9/vgonel.9.gz @@ -1634,7 +1643,7 @@ OLD_DIRS+=usr/include/c++/3.4 OLD_FILES+=usr/sbin/zfs OLD_FILES+=usr/sbin/zpool # 20070423: rc.bluetooth (examples) removed -OLD_FILES+=usr/share/examples/netgraph/bluetooth/rc.bluetooth +OLD_FILES+=usr/share/examples/netgraph/bluetooth/rc.bluetooth # 20070421: worm.4 removed OLD_FILES+=usr/share/man/man4/worm.4.gz # 20070417: trunk(4) renamed to lagg(4) Modified: projects/sbruno_64cpus/bin/sh/arith_lex.l ============================================================================== --- projects/sbruno_64cpus/bin/sh/arith_lex.l Wed Nov 24 00:05:19 2010 (r215786) +++ projects/sbruno_64cpus/bin/sh/arith_lex.l Wed Nov 24 00:43:05 2010 (r215787) @@ -53,8 +53,17 @@ int yylex(void); #undef YY_INPUT #define YY_INPUT(buf,result,max) \ - result = (*buf = *arith_buf++) ? 1 : YY_NULL; + do { \ + result = strnlen(arith_buf, max); \ + if (result == 0) \ + result = YY_NULL; \ + else { \ + memcpy(buf, arith_buf, result); \ + arith_buf += result; \ + } \ + } while (0); #define YY_NO_UNPUT +#define YY_NO_INPUT %} %% Modified: projects/sbruno_64cpus/bin/sh/cd.c ============================================================================== --- projects/sbruno_64cpus/bin/sh/cd.c Wed Nov 24 00:05:19 2010 (r215786) +++ projects/sbruno_64cpus/bin/sh/cd.c Wed Nov 24 00:43:05 2010 (r215787) @@ -219,10 +219,13 @@ cdphysical(char *dest) char *p; INTOFF; - if (chdir(dest) < 0 || (p = findcwd(NULL)) == NULL) { + if (chdir(dest) < 0) { INTON; return (-1); } + p = findcwd(NULL); + if (p == NULL) + out2fmt_flush("cd: warning: failed to get name of current directory\n"); updatepwd(p); INTON; return (0); @@ -304,7 +307,7 @@ updatepwd(char *dir) if (prevdir) ckfree(prevdir); prevdir = curdir; - curdir = savestr(dir); + curdir = dir ? savestr(dir) : NULL; setvar("PWD", curdir, VEXPORT); setvar("OLDPWD", prevdir, VEXPORT); } Modified: projects/sbruno_64cpus/contrib/binutils/bfd/elf-bfd.h ============================================================================== --- projects/sbruno_64cpus/contrib/binutils/bfd/elf-bfd.h Wed Nov 24 00:05:19 2010 (r215786) +++ projects/sbruno_64cpus/contrib/binutils/bfd/elf-bfd.h Wed Nov 24 00:43:05 2010 (r215787) @@ -1673,6 +1673,8 @@ extern char * elfcore_write_pstatus (bfd *, char *, int *, long, int, const void *); extern char *elfcore_write_prfpreg (bfd *, char *, int *, const void *, int); +extern char *elfcore_write_thrmisc + (bfd *, char *, int *, const char *, int); extern char *elfcore_write_prxfpreg (bfd *, char *, int *, const void *, int); extern char *elfcore_write_lwpstatus Modified: projects/sbruno_64cpus/contrib/binutils/bfd/elf.c ============================================================================== --- projects/sbruno_64cpus/contrib/binutils/bfd/elf.c Wed Nov 24 00:05:19 2010 (r215786) +++ projects/sbruno_64cpus/contrib/binutils/bfd/elf.c Wed Nov 24 00:43:05 2010 (r215787) @@ -6316,6 +6316,12 @@ _bfd_elf_rel_vtable_reloc_fn #ifdef HAVE_SYS_PROCFS_H # include + +/* Define HAVE_THRMISC_T for consistency with other similar GNU-type stubs. */ +#undef HAVE_THRMISC_T +#if defined (THRMISC_VERSION) +#define HAVE_THRMISC_T 1 +#endif #endif /* FIXME: this is kinda wrong, but it's what gdb wants. */ @@ -6497,6 +6503,16 @@ elfcore_grok_prxfpreg (bfd *abfd, Elf_In return elfcore_make_note_pseudosection (abfd, ".reg-xfp", note); } +#if defined (HAVE_THRMISC_T) + +static bfd_boolean +elfcore_grok_thrmisc (bfd *abfd, Elf_Internal_Note *note) +{ + return elfcore_make_note_pseudosection (abfd, ".tname", note); +} + +#endif /* defined (HAVE_THRMISC_T) */ + #if defined (HAVE_PRPSINFO_T) typedef prpsinfo_t elfcore_psinfo_t; #if defined (HAVE_PRPSINFO32_T) /* Sparc64 cross Sparc32 */ @@ -6863,6 +6879,12 @@ elfcore_grok_note (bfd *abfd, Elf_Intern return TRUE; } + +#if defined (HAVE_THRMISC_T) + case NT_THRMISC: + return elfcore_grok_thrmisc (abfd, note); +#endif + } } @@ -7245,6 +7267,22 @@ elfcore_write_prfpreg (bfd *abfd, } char * +elfcore_write_thrmisc (bfd *abfd, + char *buf, + int *bufsiz, + const char *tname, + int size) +{ +#if defined (HAVE_THRMISC_T) + char *note_name = "CORE"; + return elfcore_write_note (abfd, buf, bufsiz, + note_name, NT_THRMISC, tname, size); +#else + return buf; +#endif +} + +char * elfcore_write_prxfpreg (bfd *abfd, char *buf, int *bufsiz, Modified: projects/sbruno_64cpus/contrib/binutils/binutils/readelf.c ============================================================================== --- projects/sbruno_64cpus/contrib/binutils/binutils/readelf.c Wed Nov 24 00:05:19 2010 (r215786) +++ projects/sbruno_64cpus/contrib/binutils/binutils/readelf.c Wed Nov 24 00:43:05 2010 (r215787) @@ -9908,6 +9908,7 @@ get_note_type (unsigned e_type) case NT_PSTATUS: return _("NT_PSTATUS (pstatus structure)"); case NT_FPREGS: return _("NT_FPREGS (floating point registers)"); case NT_PSINFO: return _("NT_PSINFO (psinfo structure)"); + case NT_THRMISC: return _("NT_THRMISC (thrmisc structure)"); case NT_LWPSTATUS: return _("NT_LWPSTATUS (lwpstatus_t structure)"); case NT_LWPSINFO: return _("NT_LWPSINFO (lwpsinfo_t structure)"); case NT_WIN32PSTATUS: return _("NT_WIN32PSTATUS (win32_pstatus structure)"); Modified: projects/sbruno_64cpus/contrib/binutils/include/elf/common.h ============================================================================== --- projects/sbruno_64cpus/contrib/binutils/include/elf/common.h Wed Nov 24 00:05:19 2010 (r215786) +++ projects/sbruno_64cpus/contrib/binutils/include/elf/common.h Wed Nov 24 00:43:05 2010 (r215787) @@ -366,6 +366,7 @@ #define NT_PRPSINFO 3 /* Contains copy of prpsinfo struct */ #define NT_TASKSTRUCT 4 /* Contains copy of task struct */ #define NT_AUXV 6 /* Contains copy of Elfxx_auxv_t */ +#define NT_THRMISC 7 /* Contains copy of thrmisc struct */ #define NT_PRXFPREG 0x46e62b7f /* Contains a user_xfpregs_struct; */ /* note name must be "LINUX". */ Modified: projects/sbruno_64cpus/contrib/file/readelf.h ============================================================================== --- projects/sbruno_64cpus/contrib/file/readelf.h Wed Nov 24 00:05:19 2010 (r215786) +++ projects/sbruno_64cpus/contrib/file/readelf.h Wed Nov 24 00:43:05 2010 (r215787) @@ -224,6 +224,7 @@ typedef struct { #define NT_TASKSTRUCT 4 #define NT_PLATFORM 5 #define NT_AUXV 6 +#define NT_THRMISC 7 /* Note types used in executables */ /* NetBSD executables (name = "NetBSD") */ Modified: projects/sbruno_64cpus/contrib/gdb/gdb/fbsd-proc.c ============================================================================== --- projects/sbruno_64cpus/contrib/gdb/gdb/fbsd-proc.c Wed Nov 24 00:05:19 2010 (r215786) +++ projects/sbruno_64cpus/contrib/gdb/gdb/fbsd-proc.c Wed Nov 24 00:43:05 2010 (r215787) @@ -124,6 +124,7 @@ fbsd_make_corefile_notes (bfd *obfd, int fpregset_t fpregs; char *note_data = NULL; Elf_Internal_Ehdr *i_ehdrp; + char fakename; /* Put a "FreeBSD" label in the ELF header. */ i_ehdrp = elf_elfheader (obfd); @@ -138,6 +139,10 @@ fbsd_make_corefile_notes (bfd *obfd, int note_data = elfcore_write_prfpreg (obfd, note_data, note_size, &fpregs, sizeof (fpregs)); + fakename = '\0'; + note_data = elfcore_write_thrmisc (obfd, note_data, note_size, + &fakename, sizeof (fakename)); + if (get_exec_file (0)) { char *fname = strrchr (get_exec_file (0), '/') + 1; Modified: projects/sbruno_64cpus/crypto/openssl/CHANGES ============================================================================== --- projects/sbruno_64cpus/crypto/openssl/CHANGES Wed Nov 24 00:05:19 2010 (r215786) +++ projects/sbruno_64cpus/crypto/openssl/CHANGES Wed Nov 24 00:43:05 2010 (r215787) @@ -2,6 +2,51 @@ OpenSSL CHANGES _______________ + Changes between 0.9.8o and 0.9.8p [16 Nov 2010] + + *) Fix extension code to avoid race conditions which can result in a buffer + overrun vulnerability: resumed sessions must not be modified as they can + be shared by multiple threads. CVE-2010-3864 + [Steve Henson] + + *) Fix for double free bug in ssl/s3_clnt.c CVE-2010-2939 + [Steve Henson] + + *) Don't reencode certificate when calculating signature: cache and use + the original encoding instead. This makes signature verification of + some broken encodings work correctly. + [Steve Henson] + + *) ec2_GF2m_simple_mul bugfix: compute correct result if the output EC_POINT + is also one of the inputs. + [Emilia Käsper (Google)] + + *) Don't repeatedly append PBE algorithms to table if they already exist. + Sort table on each new add. This effectively makes the table read only + after all algorithms are added and subsequent calls to PKCS12_pbe_add + etc are non-op. + [Steve Henson] + + Changes between 0.9.8n and 0.9.8o [01 Jun 2010] + + [NB: OpenSSL 0.9.8o and later 0.9.8 patch levels were released after + OpenSSL 1.0.0.] + + *) Correct a typo in the CMS ASN1 module which can result in invalid memory + access or freeing data twice (CVE-2010-0742) + [Steve Henson, Ronald Moesbergen ] + + *) Add SHA2 algorithms to SSL_library_init(). SHA2 is becoming far more + common in certificates and some applications which only call + SSL_library_init and not OpenSSL_add_all_algorithms() will fail. + [Steve Henson] + + *) VMS fixes: + Reduce copying into .apps and .test in makevms.com + Don't try to use blank CA certificate in CA.com + Allow use of C files from original directories in maketests.com + [Steven M. Schweda" ] + Changes between 0.9.8m and 0.9.8n [24 Mar 2010] *) When rejecting SSL/TLS records due to an incorrect version number, never Modified: projects/sbruno_64cpus/crypto/openssl/Configure ============================================================================== --- projects/sbruno_64cpus/crypto/openssl/Configure Wed Nov 24 00:05:19 2010 (r215786) +++ projects/sbruno_64cpus/crypto/openssl/Configure Wed Nov 24 00:43:05 2010 (r215787) @@ -1812,11 +1812,11 @@ EOF (system $make_command.$make_targets) == 0 or exit $? if $make_targets ne ""; if ( $perl =~ m@^/@) { - &dofile("tools/c_rehash",$perl,'^#!/', '#!%s','^my \$dir;$', 'my $dir = "' . $openssldir . '";'); + &dofile("tools/c_rehash",$perl,'^#!/', '#!%s','^my \$dir;$', 'my $dir = "' . $openssldir . '";', '^my \$prefix;$', 'my $prefix = "' . $prefix . '";'); &dofile("apps/CA.pl",$perl,'^#!/', '#!%s'); } else { # No path for Perl known ... - &dofile("tools/c_rehash",'/usr/local/bin/perl','^#!/', '#!%s','^my \$dir;$', 'my $dir = "' . $openssldir . '";'); + &dofile("tools/c_rehash",'/usr/local/bin/perl','^#!/', '#!%s','^my \$dir;$', 'my $dir = "' . $openssldir . '";', '^my \$prefix;$', 'my $prefix = "' . $prefix . '";'); &dofile("apps/CA.pl",'/usr/local/bin/perl','^#!/', '#!%s'); } if ($depflags ne $default_depflags && !$make_depend) { Modified: projects/sbruno_64cpus/crypto/openssl/FAQ ============================================================================== --- projects/sbruno_64cpus/crypto/openssl/FAQ Wed Nov 24 00:05:19 2010 (r215786) +++ projects/sbruno_64cpus/crypto/openssl/FAQ Wed Nov 24 00:43:05 2010 (r215787) @@ -70,6 +70,7 @@ OpenSSL - Frequently Asked Questions * I think I've detected a memory leak, is this a bug? * Why does Valgrind complain about the use of uninitialized data? * Why doesn't a memory BIO work when a file does? +* Where are the declarations and implementations of d2i_X509() etc? =============================================================================== @@ -78,7 +79,7 @@ OpenSSL - Frequently Asked Questions * Which is the current version of OpenSSL? The current version is available from . -OpenSSL 0.9.8n was released on Mar 24th, 2010. +OpenSSL 1.0.0b was released on Nov 16th, 2010. In addition to the current stable release, you can also access daily snapshots of the OpenSSL development version at . +. Note that the online documents refer +to the very latest development versions of OpenSSL and may include features +not present in released versions. If in doubt refer to the documentation +that came with the version of OpenSSL you are using. For information on parts of libcrypto that are not yet documented, you might want to read Ariel Glenn's documentation on SSLeay 0.9, OpenSSL's @@ -717,8 +721,10 @@ file. Multi-threaded applications must provide two callback functions to OpenSSL by calling CRYPTO_set_locking_callback() and -CRYPTO_set_id_callback(). This is described in the threads(3) -manpage. +CRYPTO_set_id_callback(), for all versions of OpenSSL up to and +including 0.9.8[abc...]. As of version 1.0.0, CRYPTO_set_id_callback() +and associated APIs are deprecated by CRYPTO_THREADID_set_callback() +and friends. This is described in the threads(3) manpage. * I've compiled a program under Windows and it crashes: why? @@ -962,4 +968,15 @@ is needed. This must be done by calling: See the manual pages for more details. +* Where are the declarations and implementations of d2i_X509() etc? + +These are defined and implemented by macros of the form: + + + DECLARE_ASN1_FUNCTIONS(X509) and IMPLEMENT_ASN1_FUNCTIONS(X509) + +The implementation passes an ASN1 "template" defining the structure into an +ASN1 interpreter using generalised functions such as ASN1_item_d2i(). + + =============================================================================== Modified: projects/sbruno_64cpus/crypto/openssl/Makefile ============================================================================== --- projects/sbruno_64cpus/crypto/openssl/Makefile Wed Nov 24 00:05:19 2010 (r215786) +++ projects/sbruno_64cpus/crypto/openssl/Makefile Wed Nov 24 00:43:05 2010 (r215787) @@ -4,7 +4,7 @@ ## Makefile for OpenSSL ## -VERSION=0.9.8n +VERSION=0.9.8p MAJOR=0 MINOR=9.8 SHLIB_VERSION_NUMBER=0.9.8 Modified: projects/sbruno_64cpus/crypto/openssl/NEWS ============================================================================== --- projects/sbruno_64cpus/crypto/openssl/NEWS Wed Nov 24 00:05:19 2010 (r215786) +++ projects/sbruno_64cpus/crypto/openssl/NEWS Wed Nov 24 00:43:05 2010 (r215787) @@ -5,6 +5,18 @@ This file gives a brief overview of the major changes between each OpenSSL release. For more details please read the CHANGES file. + Major changes between OpenSSL 0.9.8o and OpenSSL 0.9.8p: + + o Fix for security issue CVE-2010-3864. + + Major changes between OpenSSL 0.9.8n and OpenSSL 0.9.8o: + + o Fix for security issue CVE-2010-0742. + o Various DTLS fixes. + o Recognise SHA2 certificates if only SSL algorithms added. + o Fix for no-rc4 compilation. + o Chil ENGINE unload workaround. + Major changes between OpenSSL 0.9.8m and OpenSSL 0.9.8n: o CFB cipher definition fixes. Modified: projects/sbruno_64cpus/crypto/openssl/PROBLEMS ============================================================================== --- projects/sbruno_64cpus/crypto/openssl/PROBLEMS Wed Nov 24 00:05:19 2010 (r215786) +++ projects/sbruno_64cpus/crypto/openssl/PROBLEMS Wed Nov 24 00:43:05 2010 (r215787) @@ -36,7 +36,9 @@ may differ on your machine. As long as Apple doesn't fix the problem with ld, this problem building -OpenSSL will remain as is. +OpenSSL will remain as is. Well, the problem was addressed in 0.9.8f by +passing -Wl,-search_paths_first, but it's unknown if the flag was +supported from the initial MacOS X release. * Parallell make leads to errors Modified: projects/sbruno_64cpus/crypto/openssl/README ============================================================================== --- projects/sbruno_64cpus/crypto/openssl/README Wed Nov 24 00:05:19 2010 (r215786) +++ projects/sbruno_64cpus/crypto/openssl/README Wed Nov 24 00:43:05 2010 (r215787) @@ -1,5 +1,5 @@ - OpenSSL 0.9.8n + OpenSSL 0.9.8p 16 Nov 2010 Copyright (c) 1998-2009 The OpenSSL Project Copyright (c) 1995-1998 Eric A. Young, Tim J. Hudson Modified: projects/sbruno_64cpus/crypto/openssl/apps/apps.c ============================================================================== --- projects/sbruno_64cpus/crypto/openssl/apps/apps.c Wed Nov 24 00:05:19 2010 (r215786) +++ projects/sbruno_64cpus/crypto/openssl/apps/apps.c Wed Nov 24 00:43:05 2010 (r215787) @@ -351,13 +351,12 @@ void program_name(char *in, char *out, i int chopup_args(ARGS *arg, char *buf, int *argc, char **argv[]) { - int num,len,i; + int num,i; char *p; *argc=0; *argv=NULL; - len=strlen(buf); i=0; if (arg->count == 0) { @@ -866,10 +865,17 @@ EVP_PKEY *load_key(BIO *err, const char if (format == FORMAT_ENGINE) { if (!e) - BIO_printf(bio_err,"no engine specified\n"); + BIO_printf(err,"no engine specified\n"); else + { pkey = ENGINE_load_private_key(e, file, ui_method, &cb_data); + if (!pkey) + { + BIO_printf(err,"cannot load %s from engine\n",key_descrip); + ERR_print_errors(err); + } + } goto end; } #endif @@ -919,8 +925,11 @@ EVP_PKEY *load_key(BIO *err, const char } end: if (key != NULL) BIO_free(key); - if (pkey == NULL) + if (pkey == NULL) + { BIO_printf(err,"unable to load %s\n", key_descrip); + ERR_print_errors(err); + } return(pkey); } Modified: projects/sbruno_64cpus/crypto/openssl/apps/dh.c ============================================================================== --- projects/sbruno_64cpus/crypto/openssl/apps/dh.c Wed Nov 24 00:05:19 2010 (r215786) +++ projects/sbruno_64cpus/crypto/openssl/apps/dh.c Wed Nov 24 00:43:05 2010 (r215787) @@ -88,9 +88,6 @@ int MAIN(int, char **); int MAIN(int argc, char **argv) { -#ifndef OPENSSL_NO_ENGINE - ENGINE *e = NULL; -#endif DH *dh=NULL; int i,badops=0,text=0; BIO *in=NULL,*out=NULL; @@ -189,7 +186,7 @@ bad: ERR_load_crypto_strings(); #ifndef OPENSSL_NO_ENGINE - e = setup_engine(bio_err, engine, 0); + setup_engine(bio_err, engine, 0); #endif in=BIO_new(BIO_s_file()); Modified: projects/sbruno_64cpus/crypto/openssl/apps/dhparam.c ============================================================================== --- projects/sbruno_64cpus/crypto/openssl/apps/dhparam.c Wed Nov 24 00:05:19 2010 (r215786) +++ projects/sbruno_64cpus/crypto/openssl/apps/dhparam.c Wed Nov 24 00:43:05 2010 (r215787) @@ -149,9 +149,6 @@ int MAIN(int, char **); int MAIN(int argc, char **argv) { -#ifndef OPENSSL_NO_ENGINE - ENGINE *e = NULL; -#endif DH *dh=NULL; int i,badops=0,text=0; #ifndef OPENSSL_NO_DSA @@ -270,7 +267,7 @@ bad: ERR_load_crypto_strings(); #ifndef OPENSSL_NO_ENGINE - e = setup_engine(bio_err, engine, 0); + setup_engine(bio_err, engine, 0); #endif if (g && !num) Modified: projects/sbruno_64cpus/crypto/openssl/apps/dsaparam.c ============================================================================== --- projects/sbruno_64cpus/crypto/openssl/apps/dsaparam.c Wed Nov 24 00:05:19 2010 (r215786) +++ projects/sbruno_64cpus/crypto/openssl/apps/dsaparam.c Wed Nov 24 00:43:05 2010 (r215787) @@ -111,9 +111,6 @@ int MAIN(int, char **); int MAIN(int argc, char **argv) { -#ifndef OPENSSL_NO_ENGINE - ENGINE *e = NULL; -#endif DSA *dsa=NULL; int i,badops=0,text=0; BIO *in=NULL,*out=NULL; @@ -278,7 +275,7 @@ bad: } #ifndef OPENSSL_NO_ENGINE - e = setup_engine(bio_err, engine, 0); + setup_engine(bio_err, engine, 0); #endif if (need_rand) @@ -357,12 +354,10 @@ bad: if (C) { unsigned char *data; - int l,len,bits_p,bits_q,bits_g; + int l,len,bits_p; len=BN_num_bytes(dsa->p); bits_p=BN_num_bits(dsa->p); - bits_q=BN_num_bits(dsa->q); - bits_g=BN_num_bits(dsa->g); data=(unsigned char *)OPENSSL_malloc(len+20); if (data == NULL) { Modified: projects/sbruno_64cpus/crypto/openssl/apps/ec.c ============================================================================== --- projects/sbruno_64cpus/crypto/openssl/apps/ec.c Wed Nov 24 00:05:19 2010 (r215786) +++ projects/sbruno_64cpus/crypto/openssl/apps/ec.c Wed Nov 24 00:43:05 2010 (r215787) @@ -85,9 +85,6 @@ int MAIN(int, char **); int MAIN(int argc, char **argv) { -#ifndef OPENSSL_NO_ENGINE - ENGINE *e = NULL; -#endif int ret = 1; EC_KEY *eckey = NULL; const EC_GROUP *group; @@ -254,7 +251,7 @@ bad: ERR_load_crypto_strings(); #ifndef OPENSSL_NO_ENGINE - e = setup_engine(bio_err, engine, 0); + setup_engine(bio_err, engine, 0); #endif if(!app_passwd(bio_err, passargin, passargout, &passin, &passout)) Modified: projects/sbruno_64cpus/crypto/openssl/apps/ecparam.c ============================================================================== --- projects/sbruno_64cpus/crypto/openssl/apps/ecparam.c Wed Nov 24 00:05:19 2010 (r215786) +++ projects/sbruno_64cpus/crypto/openssl/apps/ecparam.c Wed Nov 24 00:43:05 2010 (r215787) @@ -129,9 +129,6 @@ int MAIN(int argc, char **argv) char *infile = NULL, *outfile = NULL, *prog; BIO *in = NULL, *out = NULL; int informat, outformat, noout = 0, C = 0, ret = 1; -#ifndef OPENSSL_NO_ENGINE - ENGINE *e = NULL; -#endif char *engine = NULL; BIGNUM *ec_p = NULL, *ec_a = NULL, *ec_b = NULL, @@ -340,7 +337,7 @@ bad: } #ifndef OPENSSL_NO_ENGINE - e = setup_engine(bio_err, engine, 0); + setup_engine(bio_err, engine, 0); #endif if (list_curves) Modified: projects/sbruno_64cpus/crypto/openssl/apps/enc.c ============================================================================== --- projects/sbruno_64cpus/crypto/openssl/apps/enc.c Wed Nov 24 00:05:19 2010 (r215786) +++ projects/sbruno_64cpus/crypto/openssl/apps/enc.c Wed Nov 24 00:43:05 2010 (r215787) @@ -100,9 +100,6 @@ int MAIN(int, char **); int MAIN(int argc, char **argv) { -#ifndef OPENSSL_NO_ENGINE - ENGINE *e = NULL; -#endif static const char magic[]="Salted__"; char mbuf[sizeof magic-1]; char *strbuf=NULL; @@ -311,7 +308,7 @@ bad: } #ifndef OPENSSL_NO_ENGINE - e = setup_engine(bio_err, engine, 0); + setup_engine(bio_err, engine, 0); #endif if (md && (dgst=EVP_get_digestbyname(md)) == NULL) Modified: projects/sbruno_64cpus/crypto/openssl/apps/gendh.c ============================================================================== --- projects/sbruno_64cpus/crypto/openssl/apps/gendh.c Wed Nov 24 00:05:19 2010 (r215786) +++ projects/sbruno_64cpus/crypto/openssl/apps/gendh.c Wed Nov 24 00:43:05 2010 (r215787) @@ -89,9 +89,6 @@ int MAIN(int, char **); int MAIN(int argc, char **argv) { BN_GENCB cb; -#ifndef OPENSSL_NO_ENGINE - ENGINE *e = NULL; -#endif DH *dh=NULL; int ret=1,num=DEFBITS; int g=2; @@ -163,7 +160,7 @@ bad: } #ifndef OPENSSL_NO_ENGINE - e = setup_engine(bio_err, engine, 0); + setup_engine(bio_err, engine, 0); #endif out=BIO_new(BIO_s_file()); Modified: projects/sbruno_64cpus/crypto/openssl/apps/gendsa.c ============================================================================== --- projects/sbruno_64cpus/crypto/openssl/apps/gendsa.c Wed Nov 24 00:05:19 2010 (r215786) +++ projects/sbruno_64cpus/crypto/openssl/apps/gendsa.c Wed Nov 24 00:43:05 2010 (r215787) @@ -78,9 +78,6 @@ int MAIN(int, char **); int MAIN(int argc, char **argv) { -#ifndef OPENSSL_NO_ENGINE - ENGINE *e = NULL; -#endif DSA *dsa=NULL; int ret=1; char *outfile=NULL; @@ -206,7 +203,7 @@ bad: } #ifndef OPENSSL_NO_ENGINE - e = setup_engine(bio_err, engine, 0); + setup_engine(bio_err, engine, 0); #endif if(!app_passwd(bio_err, NULL, passargout, NULL, &passout)) { Modified: projects/sbruno_64cpus/crypto/openssl/apps/genrsa.c ============================================================================== --- projects/sbruno_64cpus/crypto/openssl/apps/genrsa.c Wed Nov 24 00:05:19 2010 (r215786) +++ projects/sbruno_64cpus/crypto/openssl/apps/genrsa.c Wed Nov 24 00:43:05 2010 (r215787) @@ -89,9 +89,6 @@ int MAIN(int, char **); int MAIN(int argc, char **argv) { BN_GENCB cb; -#ifndef OPENSSL_NO_ENGINE - ENGINE *e = NULL; -#endif int ret=1; int i,num=DEFBITS; long l; @@ -235,7 +232,7 @@ bad: } #ifndef OPENSSL_NO_ENGINE - e = setup_engine(bio_err, engine, 0); + setup_engine(bio_err, engine, 0); #endif if (outfile == NULL) Modified: projects/sbruno_64cpus/crypto/openssl/apps/pkcs7.c ============================================================================== --- projects/sbruno_64cpus/crypto/openssl/apps/pkcs7.c Wed Nov 24 00:05:19 2010 (r215786) +++ projects/sbruno_64cpus/crypto/openssl/apps/pkcs7.c Wed Nov 24 00:43:05 2010 (r215787) @@ -82,9 +82,6 @@ int MAIN(int, char **); int MAIN(int argc, char **argv) { -#ifndef OPENSSL_NO_ENGINE - ENGINE *e = NULL; -#endif PKCS7 *p7=NULL; int i,badops=0; BIO *in=NULL,*out=NULL; @@ -180,7 +177,7 @@ bad: ERR_load_crypto_strings(); #ifndef OPENSSL_NO_ENGINE - e = setup_engine(bio_err, engine, 0); + setup_engine(bio_err, engine, 0); #endif in=BIO_new(BIO_s_file()); Modified: projects/sbruno_64cpus/crypto/openssl/apps/rand.c ============================================================================== --- projects/sbruno_64cpus/crypto/openssl/apps/rand.c Wed Nov 24 00:05:19 2010 (r215786) +++ projects/sbruno_64cpus/crypto/openssl/apps/rand.c Wed Nov 24 00:43:05 2010 (r215787) @@ -77,9 +77,6 @@ int MAIN(int, char **); int MAIN(int argc, char **argv) { -#ifndef OPENSSL_NO_ENGINE - ENGINE *e = NULL; -#endif int i, r, ret = 1; int badopt; char *outfile = NULL; @@ -178,7 +175,7 @@ int MAIN(int argc, char **argv) } #ifndef OPENSSL_NO_ENGINE - e = setup_engine(bio_err, engine, 0); + setup_engine(bio_err, engine, 0); #endif app_RAND_load_file(NULL, bio_err, (inrand != NULL)); Modified: projects/sbruno_64cpus/crypto/openssl/apps/s_server.c ============================================================================== --- projects/sbruno_64cpus/crypto/openssl/apps/s_server.c Wed Nov 24 00:05:19 2010 (r215786) +++ projects/sbruno_64cpus/crypto/openssl/apps/s_server.c Wed Nov 24 00:43:05 2010 (r215787) @@ -2075,12 +2075,14 @@ static int www_body(char *hostname, int { char *buf=NULL; int ret=1; - int i,j,k,blank,dot; + int i,j,k,dot; struct stat st_buf; SSL *con; SSL_CIPHER *c; BIO *io,*ssl_bio,*sbio; +#ifdef RENEG long total_bytes; +#endif buf=OPENSSL_malloc(bufsize); if (buf == NULL) return(0); @@ -2151,7 +2153,6 @@ static int www_body(char *hostname, int SSL_set_msg_callback_arg(con, bio_s_out); } - blank=0; for (;;) { if (hack) @@ -2388,7 +2389,9 @@ static int www_body(char *hostname, int BIO_puts(io,"HTTP/1.0 200 ok\r\nContent-type: text/plain\r\n\r\n"); } /* send the file */ +#ifdef RENEG total_bytes=0; +#endif for (;;) { i=BIO_read(file,buf,bufsize); Modified: projects/sbruno_64cpus/crypto/openssl/apps/s_socket.c ============================================================================== --- projects/sbruno_64cpus/crypto/openssl/apps/s_socket.c Wed Nov 24 00:05:19 2010 (r215786) +++ projects/sbruno_64cpus/crypto/openssl/apps/s_socket.c Wed Nov 24 00:43:05 2010 (r215787) @@ -329,7 +329,7 @@ static int init_server_long(int *sock, i { int ret=0; struct sockaddr_in server; - int s= -1,i; + int s= -1; if (!ssl_sock_init()) return(0); @@ -368,7 +368,6 @@ static int init_server_long(int *sock, i } /* Make it 128 for linux */ if (type==SOCK_STREAM && listen(s,128) == -1) goto err; - i=0; *sock=s; ret=1; err: @@ -386,7 +385,7 @@ static int init_server(int *sock, int po static int do_accept(int acc_sock, int *sock, char **host) { - int ret,i; + int ret; struct hostent *h1,*h2; static struct sockaddr_in from; int len; @@ -409,6 +408,7 @@ redoit: if (ret == INVALID_SOCKET) { #if defined(OPENSSL_SYS_WINDOWS) || (defined(OPENSSL_SYS_NETWARE) && !defined(NETWARE_BSDSOCK)) + int i; i=WSAGetLastError(); BIO_printf(bio_err,"accept error %d\n",i); #else @@ -463,7 +463,6 @@ redoit: BIO_printf(bio_err,"gethostbyname failure\n"); return(0); } - i=0; if (h2->h_addrtype != AF_INET) { BIO_printf(bio_err,"gethostbyname addr is not AF_INET\n"); Modified: projects/sbruno_64cpus/crypto/openssl/apps/speed.c ============================================================================== --- projects/sbruno_64cpus/crypto/openssl/apps/speed.c Wed Nov 24 00:05:19 2010 (r215786) +++ projects/sbruno_64cpus/crypto/openssl/apps/speed.c Wed Nov 24 00:43:05 2010 (r215787) @@ -500,9 +500,6 @@ int MAIN(int, char **); int MAIN(int argc, char **argv) { -#ifndef OPENSSL_NO_ENGINE - ENGINE *e = NULL; -#endif unsigned char *buf=NULL,*buf2=NULL; int mret=1; long count=0,save_count=0; @@ -593,7 +590,6 @@ int MAIN(int argc, char **argv) unsigned char DES_iv[8]; unsigned char iv[2*MAX_BLOCK_SIZE/8]; #ifndef OPENSSL_NO_DES - DES_cblock *buf_as_des_cblock = NULL; static DES_cblock key ={0x12,0x34,0x56,0x78,0x9a,0xbc,0xde,0xf0}; static DES_cblock key2={0x34,0x56,0x78,0x9a,0xbc,0xde,0xf0,0x12}; static DES_cblock key3={0x56,0x78,0x9a,0xbc,0xde,0xf0,0x12,0x34}; @@ -806,9 +802,6 @@ int MAIN(int argc, char **argv) BIO_printf(bio_err,"out of memory\n"); goto end; } -#ifndef OPENSSL_NO_DES - buf_as_des_cblock = (DES_cblock *)buf; -#endif if ((buf2=(unsigned char *)OPENSSL_malloc((int)BUFSIZE)) == NULL) { BIO_printf(bio_err,"out of memory\n"); @@ -883,7 +876,7 @@ int MAIN(int argc, char **argv) BIO_printf(bio_err,"no engine given\n"); goto end; } - e = setup_engine(bio_err, *argv, 0); + setup_engine(bio_err, *argv, 0); /* j will be increased again further down. We just don't want speed to confuse an engine with an algorithm, especially when none is given (which @@ -1388,7 +1381,8 @@ int MAIN(int argc, char **argv) count*=2; Time_F(START); for (it=count; it; it--) - DES_ecb_encrypt(buf_as_des_cblock,buf_as_des_cblock, + DES_ecb_encrypt((DES_cblock *)buf, + (DES_cblock *)buf, &sch,DES_ENCRYPT); d=Time_F(STOP); } while (d <3); Modified: projects/sbruno_64cpus/crypto/openssl/apps/x509.c ============================================================================== --- projects/sbruno_64cpus/crypto/openssl/apps/x509.c Wed Nov 24 00:05:19 2010 (r215786) +++ projects/sbruno_64cpus/crypto/openssl/apps/x509.c Wed Nov 24 00:43:05 2010 (r215787) @@ -539,7 +539,6 @@ bad: if (reqfile) { EVP_PKEY *pkey; - X509_CINF *ci; BIO *in; if (!sign_flag && !CA_flag) @@ -607,7 +606,6 @@ bad: print_name(bio_err, "subject=", X509_REQ_get_subject_name(req), nmflag); if ((x=X509_new()) == NULL) goto end; - ci=x->cert_info; if (sno == NULL) { Modified: projects/sbruno_64cpus/crypto/openssl/crypto/aes/aes_wrap.c ============================================================================== --- projects/sbruno_64cpus/crypto/openssl/crypto/aes/aes_wrap.c Wed Nov 24 00:05:19 2010 (r215786) +++ projects/sbruno_64cpus/crypto/openssl/crypto/aes/aes_wrap.c Wed Nov 24 00:43:05 2010 (r215787) @@ -85,9 +85,9 @@ int AES_wrap_key(AES_KEY *key, const uns A[7] ^= (unsigned char)(t & 0xff); if (t > 0xff) { - A[6] ^= (unsigned char)((t & 0xff) >> 8); - A[5] ^= (unsigned char)((t & 0xff) >> 16); - A[4] ^= (unsigned char)((t & 0xff) >> 24); + A[6] ^= (unsigned char)((t >> 8) & 0xff); + A[5] ^= (unsigned char)((t >> 16) & 0xff); + A[4] ^= (unsigned char)((t >> 24) & 0xff); } memcpy(R, B + 8, 8); } @@ -119,9 +119,9 @@ int AES_unwrap_key(AES_KEY *key, const u A[7] ^= (unsigned char)(t & 0xff); if (t > 0xff) { - A[6] ^= (unsigned char)((t & 0xff) >> 8); - A[5] ^= (unsigned char)((t & 0xff) >> 16); - A[4] ^= (unsigned char)((t & 0xff) >> 24); + A[6] ^= (unsigned char)((t >> 8) & 0xff); + A[5] ^= (unsigned char)((t >> 16) & 0xff); + A[4] ^= (unsigned char)((t >> 24) & 0xff); } memcpy(B + 8, R, 8); AES_decrypt(B, B, key); Modified: projects/sbruno_64cpus/crypto/openssl/crypto/aes/asm/aes-x86_64.pl ============================================================================== --- projects/sbruno_64cpus/crypto/openssl/crypto/aes/asm/aes-x86_64.pl Wed Nov 24 00:05:19 2010 (r215786) +++ projects/sbruno_64cpus/crypto/openssl/crypto/aes/asm/aes-x86_64.pl Wed Nov 24 00:43:05 2010 (r215787) @@ -751,7 +751,19 @@ $code.=<<___; AES_set_encrypt_key: push %rbx push %rbp + sub \$8,%rsp + call _x86_64_AES_set_encrypt_key + + mov 8(%rsp),%rbp + mov 16(%rsp),%rbx + add \$24,%rsp + ret +.size AES_set_encrypt_key,.-AES_set_encrypt_key + +.type _x86_64_AES_set_encrypt_key,\@abi-omnipotent +.align 16 +_x86_64_AES_set_encrypt_key: mov %esi,%ecx # %ecx=bits mov %rdi,%rsi # %rsi=userKey mov %rdx,%rdi # %rdi=key @@ -938,10 +950,8 @@ $code.=<<___; .Lbadpointer: mov \$-1,%rax .Lexit: - pop %rbp - pop %rbx - ret -.size AES_set_encrypt_key,.-AES_set_encrypt_key + .byte 0xf3,0xc3 # rep ret +.size _x86_64_AES_set_encrypt_key,.-_x86_64_AES_set_encrypt_key ___ sub deckey() @@ -973,15 +983,14 @@ $code.=<<___; .type AES_set_decrypt_key,\@function,3 .align 16 AES_set_decrypt_key: - push %rdx - call AES_set_encrypt_key - cmp \$0,%eax - je .Lproceed - lea 24(%rsp),%rsp - ret -.Lproceed: + push %rbx + push %rbp + push %rdx # save key schedule + + call _x86_64_AES_set_encrypt_key mov (%rsp),%r8 # restore key schedule - mov %rbx,(%rsp) + cmp \$0,%eax + jne .Labort mov 240(%r8),%ecx # pull number of rounds xor %rdi,%rdi @@ -1023,7 +1032,10 @@ $code.=<<___; jnz .Lpermute xor %rax,%rax - pop %rbx +.Labort: + mov 8(%rsp),%rbp + mov 16(%rsp),%rbx + add \$24,%rsp ret .size AES_set_decrypt_key,.-AES_set_decrypt_key ___ Modified: projects/sbruno_64cpus/crypto/openssl/crypto/asn1/a_int.c ============================================================================== --- projects/sbruno_64cpus/crypto/openssl/crypto/asn1/a_int.c Wed Nov 24 00:05:19 2010 (r215786) +++ projects/sbruno_64cpus/crypto/openssl/crypto/asn1/a_int.c Wed Nov 24 00:43:05 2010 (r215787) @@ -273,7 +273,7 @@ ASN1_INTEGER *d2i_ASN1_UINTEGER(ASN1_INT { ASN1_INTEGER *ret=NULL; const unsigned char *p; - unsigned char *to,*s; + unsigned char *s; long len; int inf,tag,xclass; int i; @@ -308,7 +308,6 @@ ASN1_INTEGER *d2i_ASN1_UINTEGER(ASN1_INT i=ERR_R_MALLOC_FAILURE; goto err; } - to=s; ret->type=V_ASN1_INTEGER; if(len) { if ((*p == 0) && (len != 1)) Modified: projects/sbruno_64cpus/crypto/openssl/crypto/asn1/n_pkey.c ============================================================================== --- projects/sbruno_64cpus/crypto/openssl/crypto/asn1/n_pkey.c Wed Nov 24 00:05:19 2010 (r215786) +++ projects/sbruno_64cpus/crypto/openssl/crypto/asn1/n_pkey.c Wed Nov 24 00:43:05 2010 (r215787) @@ -242,7 +242,7 @@ RSA *d2i_RSA_NET(RSA **a, const unsigned int sgckey) { RSA *ret=NULL; - const unsigned char *p, *kp; + const unsigned char *p; NETSCAPE_ENCRYPTED_PKEY *enckey = NULL; p = *pp; @@ -265,7 +265,6 @@ RSA *d2i_RSA_NET(RSA **a, const unsigned ASN1err(ASN1_F_D2I_RSA_NET,ASN1_R_UNSUPPORTED_ENCRYPTION_ALGORITHM); goto err; } - kp = enckey->enckey->digest->data; if (cb == NULL) cb=EVP_read_pw_string; if ((ret=d2i_RSA_NET_2(a, enckey->enckey->digest,cb, sgckey)) == NULL) goto err; Modified: projects/sbruno_64cpus/crypto/openssl/crypto/asn1/t_crl.c ============================================================================== --- projects/sbruno_64cpus/crypto/openssl/crypto/asn1/t_crl.c Wed Nov 24 00:05:19 2010 (r215786) +++ projects/sbruno_64cpus/crypto/openssl/crypto/asn1/t_crl.c Wed Nov 24 00:43:05 2010 (r215787) @@ -87,7 +87,7 @@ int X509_CRL_print(BIO *out, X509_CRL *x STACK_OF(X509_REVOKED) *rev; X509_REVOKED *r; long l; - int i, n; + int i; char *p; BIO_printf(out, "Certificate Revocation List (CRL):\n"); @@ -107,7 +107,6 @@ int X509_CRL_print(BIO *out, X509_CRL *x else BIO_printf(out,"NONE"); BIO_printf(out,"\n"); - n=X509_CRL_get_ext_count(x); X509V3_extensions_print(out, "CRL extensions", x->crl->extensions, 0, 8); Modified: projects/sbruno_64cpus/crypto/openssl/crypto/asn1/tasn_dec.c ============================================================================== --- projects/sbruno_64cpus/crypto/openssl/crypto/asn1/tasn_dec.c Wed Nov 24 00:05:19 2010 (r215786) +++ projects/sbruno_64cpus/crypto/openssl/crypto/asn1/tasn_dec.c Wed Nov 24 00:43:05 2010 (r215787) @@ -166,7 +166,7 @@ int ASN1_item_ex_d2i(ASN1_VALUE **pval, int i; int otag; int ret = 0; - ASN1_VALUE *pchval, **pchptr, *ptmpval; *** DIFF OUTPUT TRUNCATED AT 1000 LINES *** From owner-svn-src-projects@FreeBSD.ORG Wed Nov 24 21:57:46 2010 Return-Path: Delivered-To: svn-src-projects@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 9E0D41065675; Wed, 24 Nov 2010 21:57:46 +0000 (UTC) (envelope-from sbruno@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id 895D78FC2E; Wed, 24 Nov 2010 21:57:46 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id oAOLvkjf084297; Wed, 24 Nov 2010 21:57:46 GMT (envelope-from sbruno@svn.freebsd.org) Received: (from sbruno@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id oAOLvkb7084270; Wed, 24 Nov 2010 21:57:46 GMT (envelope-from sbruno@svn.freebsd.org) Message-Id: <201011242157.oAOLvkb7084270@svn.freebsd.org> From: Sean Bruno Date: Wed, 24 Nov 2010 21:57:46 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org X-SVN-Group: projects MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r215806 - in projects/sbruno_64cpus: bin/sh contrib/top etc/defaults etc/rc.d share/man/man4 share/man/man5 share/man/man9 share/mk sys/amd64/amd64 sys/compat/ndis sys/dev/e1000 sys/dev... X-BeenThere: svn-src-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "SVN commit messages for the src " projects" tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 24 Nov 2010 21:57:46 -0000 Author: sbruno Date: Wed Nov 24 21:57:45 2010 New Revision: 215806 URL: http://svn.freebsd.org/changeset/base/215806 Log: Merge from head Modified: projects/sbruno_64cpus/bin/sh/cd.c projects/sbruno_64cpus/bin/sh/eval.c projects/sbruno_64cpus/bin/sh/expand.c projects/sbruno_64cpus/bin/sh/histedit.c projects/sbruno_64cpus/bin/sh/memalloc.c projects/sbruno_64cpus/bin/sh/memalloc.h projects/sbruno_64cpus/bin/sh/miscbltin.c projects/sbruno_64cpus/bin/sh/parser.c projects/sbruno_64cpus/etc/defaults/rc.conf projects/sbruno_64cpus/etc/rc.d/gptboot projects/sbruno_64cpus/share/man/man4/bge.4 projects/sbruno_64cpus/share/man/man4/msk.4 projects/sbruno_64cpus/share/man/man4/nge.4 projects/sbruno_64cpus/share/man/man4/sk.4 projects/sbruno_64cpus/share/man/man4/stge.4 projects/sbruno_64cpus/share/man/man4/vge.4 projects/sbruno_64cpus/share/man/man5/rc.conf.5 projects/sbruno_64cpus/share/man/man9/vrele.9 projects/sbruno_64cpus/sys/amd64/amd64/cpu_switch.S projects/sbruno_64cpus/sys/compat/ndis/ntoskrnl_var.h projects/sbruno_64cpus/sys/compat/ndis/subr_ndis.c projects/sbruno_64cpus/sys/compat/ndis/subr_ntoskrnl.c projects/sbruno_64cpus/sys/dev/e1000/e1000_api.c projects/sbruno_64cpus/sys/dev/e1000/e1000_hw.h projects/sbruno_64cpus/sys/dev/e1000/if_igb.c projects/sbruno_64cpus/sys/dev/e1000/if_igb.h projects/sbruno_64cpus/sys/dev/usb/controller/usb_controller.c projects/sbruno_64cpus/sys/dev/usb/usb_bus.h projects/sbruno_64cpus/sys/dev/usb/usb_pf.c projects/sbruno_64cpus/sys/dev/usb/usb_pf.h projects/sbruno_64cpus/sys/kern/vfs_subr.c projects/sbruno_64cpus/sys/net/bpf_buffer.c projects/sbruno_64cpus/sys/netgraph/ng_pipe.c projects/sbruno_64cpus/sys/netinet/ip_carp.c projects/sbruno_64cpus/sys/vm/vm_object.c projects/sbruno_64cpus/tools/tools/sysbuild/sysbuild.sh projects/sbruno_64cpus/usr.sbin/iostat/iostat.8 projects/sbruno_64cpus/usr.sbin/usbdump/usbdump.c Directory Properties: projects/sbruno_64cpus/ (props changed) projects/sbruno_64cpus/cddl/contrib/opensolaris/ (props changed) projects/sbruno_64cpus/contrib/bind9/ (props changed) projects/sbruno_64cpus/contrib/binutils/ (props changed) projects/sbruno_64cpus/contrib/bzip2/ (props changed) projects/sbruno_64cpus/contrib/ee/ (props changed) projects/sbruno_64cpus/contrib/expat/ (props changed) projects/sbruno_64cpus/contrib/file/ (props changed) projects/sbruno_64cpus/contrib/gdb/ (props changed) projects/sbruno_64cpus/contrib/gdtoa/ (props changed) projects/sbruno_64cpus/contrib/gnu-sort/ (props changed) projects/sbruno_64cpus/contrib/groff/ (props changed) projects/sbruno_64cpus/contrib/less/ (props changed) projects/sbruno_64cpus/contrib/libpcap/ (props changed) projects/sbruno_64cpus/contrib/llvm/ (props changed) projects/sbruno_64cpus/contrib/llvm/tools/clang/ (props changed) projects/sbruno_64cpus/contrib/ncurses/ (props changed) projects/sbruno_64cpus/contrib/netcat/ (props changed) projects/sbruno_64cpus/contrib/ntp/ (props changed) projects/sbruno_64cpus/contrib/one-true-awk/ (props changed) projects/sbruno_64cpus/contrib/openbsm/ (props changed) projects/sbruno_64cpus/contrib/openpam/ (props changed) projects/sbruno_64cpus/contrib/pf/ (props changed) projects/sbruno_64cpus/contrib/sendmail/ (props changed) projects/sbruno_64cpus/contrib/tcpdump/ (props changed) projects/sbruno_64cpus/contrib/tcsh/ (props changed) projects/sbruno_64cpus/contrib/top/ (props changed) projects/sbruno_64cpus/contrib/top/install-sh (props changed) projects/sbruno_64cpus/contrib/tzcode/stdtime/ (props changed) projects/sbruno_64cpus/contrib/tzcode/zic/ (props changed) projects/sbruno_64cpus/contrib/tzdata/ (props changed) projects/sbruno_64cpus/contrib/wpa/ (props changed) projects/sbruno_64cpus/contrib/xz/ (props changed) projects/sbruno_64cpus/crypto/openssh/ (props changed) projects/sbruno_64cpus/crypto/openssl/ (props changed) projects/sbruno_64cpus/lib/libc/ (props changed) projects/sbruno_64cpus/lib/libc/stdtime/ (props changed) projects/sbruno_64cpus/lib/libutil/ (props changed) projects/sbruno_64cpus/lib/libz/ (props changed) projects/sbruno_64cpus/sbin/ (props changed) projects/sbruno_64cpus/sbin/ipfw/ (props changed) projects/sbruno_64cpus/share/mk/bsd.arch.inc.mk (props changed) projects/sbruno_64cpus/share/zoneinfo/ (props changed) projects/sbruno_64cpus/sys/ (props changed) projects/sbruno_64cpus/sys/amd64/include/xen/ (props changed) projects/sbruno_64cpus/sys/cddl/contrib/opensolaris/ (props changed) projects/sbruno_64cpus/sys/contrib/dev/acpica/ (props changed) projects/sbruno_64cpus/sys/contrib/pf/ (props changed) projects/sbruno_64cpus/sys/contrib/x86emu/ (props changed) projects/sbruno_64cpus/usr.bin/calendar/ (props changed) projects/sbruno_64cpus/usr.bin/csup/ (props changed) projects/sbruno_64cpus/usr.bin/procstat/ (props changed) projects/sbruno_64cpus/usr.sbin/zic/ (props changed) Modified: projects/sbruno_64cpus/bin/sh/cd.c ============================================================================== --- projects/sbruno_64cpus/bin/sh/cd.c Wed Nov 24 21:54:45 2010 (r215805) +++ projects/sbruno_64cpus/bin/sh/cd.c Wed Nov 24 21:57:45 2010 (r215806) @@ -192,8 +192,7 @@ cdlogical(char *dest) STPUTC('/', p); first = 0; component = q; - while (*q) - STPUTC(*q++, p); + STPUTS(q, p); if (equal(component, "..")) continue; STACKSTRNUL(p); @@ -273,10 +272,8 @@ findcwd(char *dir) scopy(dir, cdcomppath); STARTSTACKSTR(new); if (*dir != '/') { - p = curdir; - while (*p) - STPUTC(*p++, new); - if (p[-1] == '/') + STPUTS(curdir, new); + if (STTOPC(new) == '/') STUNPUTC(new); } while ((p = getcomponent()) != NULL) { @@ -284,8 +281,7 @@ findcwd(char *dir) while (new > stackblock() && (STUNPUTC(new), *new) != '/'); } else if (*p != '\0' && ! equal(p, ".")) { STPUTC('/', new); - while (*p) - STPUTC(*p++, new); + STPUTS(p, new); } } if (new == stackblock()) Modified: projects/sbruno_64cpus/bin/sh/eval.c ============================================================================== --- projects/sbruno_64cpus/bin/sh/eval.c Wed Nov 24 21:54:45 2010 (r215805) +++ projects/sbruno_64cpus/bin/sh/eval.c Wed Nov 24 21:57:45 2010 (r215806) @@ -135,8 +135,7 @@ evalcmd(int argc, char **argv) STARTSTACKSTR(concat); ap = argv + 2; for (;;) { - while (*p) - STPUTC(*p++, concat); + STPUTS(p, concat); if ((p = *ap++) == NULL) break; STPUTC(' ', concat); Modified: projects/sbruno_64cpus/bin/sh/expand.c ============================================================================== --- projects/sbruno_64cpus/bin/sh/expand.c Wed Nov 24 21:54:45 2010 (r215805) +++ projects/sbruno_64cpus/bin/sh/expand.c Wed Nov 24 21:57:45 2010 (r215806) @@ -225,6 +225,7 @@ argstr(char *p, int flag) if (*p == '~' && (flag & (EXP_TILDE | EXP_VARTILDE))) p = exptilde(p, flag); for (;;) { + CHECKSTRSPACE(2, expdest); switch (c = *p++) { case '\0': case CTLENDVAR: @@ -235,16 +236,16 @@ argstr(char *p, int flag) if (p[0] == CTLVAR && p[2] == '@' && p[3] == '=') break; if ((flag & EXP_FULL) != 0) - STPUTC(c, expdest); + USTPUTC(c, expdest); break; case CTLQUOTEEND: lit_quoted = 0; break; case CTLESC: if (quotes) - STPUTC(c, expdest); + USTPUTC(c, expdest); c = *p++; - STPUTC(c, expdest); + USTPUTC(c, expdest); if (split_lit && !lit_quoted) recordregion(expdest - stackblock() - (quotes ? 2 : 1), @@ -267,7 +268,7 @@ argstr(char *p, int flag) * sort of a hack - expand tildes in variable * assignments (after the first '=' and after ':'s). */ - STPUTC(c, expdest); + USTPUTC(c, expdest); if (split_lit && !lit_quoted) recordregion(expdest - stackblock() - 1, expdest - stackblock(), 0); @@ -279,7 +280,7 @@ argstr(char *p, int flag) } break; default: - STPUTC(c, expdest); + USTPUTC(c, expdest); if (split_lit && !lit_quoted) recordregion(expdest - stackblock() - 1, expdest - stackblock(), 0); @@ -902,8 +903,7 @@ varvalue(char *name, int quoted, int sub STPUTC(*p++, expdest); \ } \ } else \ - while (*p) \ - STPUTC(*p++, expdest); \ + STPUTS(p, expdest); \ } while (0) @@ -1573,8 +1573,7 @@ cvtnum(int num, char *buf) if (neg) *--p = '-'; - while (*p) - STPUTC(*p++, buf); + STPUTS(p, buf); return buf; } Modified: projects/sbruno_64cpus/bin/sh/histedit.c ============================================================================== --- projects/sbruno_64cpus/bin/sh/histedit.c Wed Nov 24 21:54:45 2010 (r215805) +++ projects/sbruno_64cpus/bin/sh/histedit.c Wed Nov 24 21:57:45 2010 (r215806) @@ -411,8 +411,7 @@ fc_replace(const char *s, char *p, char STARTSTACKSTR(dest); while (*s) { if (*s == *p && strncmp(s, p, plen) == 0) { - while (*r) - STPUTC(*r++, dest); + STPUTS(r, dest); s += plen; *p = '\0'; /* so no more matches */ } else Modified: projects/sbruno_64cpus/bin/sh/memalloc.c ============================================================================== --- projects/sbruno_64cpus/bin/sh/memalloc.c Wed Nov 24 21:54:45 2010 (r215805) +++ projects/sbruno_64cpus/bin/sh/memalloc.c Wed Nov 24 21:57:45 2010 (r215806) @@ -340,3 +340,20 @@ ungrabstackstr(char *s, char *p) stacknxt = s; sstrnleft = stacknleft - (p - s); } + + +char * +stputbin(const char *data, int len, char *p) +{ + int i; + + for (i = 0; i < len; i++) + STPUTC(data[i], p); + return (p); +} + +char * +stputs(const char *data, char *p) +{ + return (stputbin(data, strlen(data), p)); +} Modified: projects/sbruno_64cpus/bin/sh/memalloc.h ============================================================================== --- projects/sbruno_64cpus/bin/sh/memalloc.h Wed Nov 24 21:54:45 2010 (r215805) +++ projects/sbruno_64cpus/bin/sh/memalloc.h Wed Nov 24 21:57:45 2010 (r215806) @@ -61,6 +61,8 @@ void grabstackblock(int); char *growstackstr(void); char *makestrspace(void); void ungrabstackstr(char *, char *); +char *stputbin(const char *data, int len, char *p); +char *stputs(const char *data, char *p); @@ -82,3 +84,5 @@ void ungrabstackstr(char *, char *); #define STTOPC(p) p[-1] #define STADJUST(amount, p) (p += (amount), sstrnleft -= (amount)) #define grabstackstr(p) stalloc(stackblocksize() - sstrnleft) +#define STPUTBIN(s, len, p) p = stputbin((s), (len), p) +#define STPUTS(s, p) p = stputs((s), p) Modified: projects/sbruno_64cpus/bin/sh/miscbltin.c ============================================================================== --- projects/sbruno_64cpus/bin/sh/miscbltin.c Wed Nov 24 21:54:45 2010 (r215805) +++ projects/sbruno_64cpus/bin/sh/miscbltin.c Wed Nov 24 21:57:45 2010 (r215806) @@ -172,11 +172,12 @@ readcmd(int argc __unused, char **argv _ } if (c == '\0') continue; + CHECKSTRSPACE(1, p); if (backslash) { backslash = 0; startword = 0; if (c != '\n') - STPUTC(c, p); + USTPUTC(c, p); continue; } if (!rflag && c == '\\') { @@ -194,14 +195,14 @@ readcmd(int argc __unused, char **argv _ if (is_ifs == 1) { /* Ignore leading IFS whitespace */ if (saveall) - STPUTC(c, p); + USTPUTC(c, p); continue; } if (is_ifs == 2 && startword == 1) { /* Only one non-whitespace IFS per word */ startword = 2; if (saveall) - STPUTC(c, p); + USTPUTC(c, p); continue; } } @@ -212,7 +213,7 @@ readcmd(int argc __unused, char **argv _ if (saveall) /* Not just a spare terminator */ saveall++; - STPUTC(c, p); + USTPUTC(c, p); continue; } @@ -222,7 +223,7 @@ readcmd(int argc __unused, char **argv _ if (ap[1] == NULL) { /* Last variable needs all IFS chars */ saveall++; - STPUTC(c, p); + USTPUTC(c, p); continue; } Modified: projects/sbruno_64cpus/bin/sh/parser.c ============================================================================== --- projects/sbruno_64cpus/bin/sh/parser.c Wed Nov 24 21:54:45 2010 (r215805) +++ projects/sbruno_64cpus/bin/sh/parser.c Wed Nov 24 21:57:45 2010 (r215806) @@ -1017,6 +1017,7 @@ parsebackq(char *out, struct nodelist ** setprompt(2); needprompt = 0; } + CHECKSTRSPACE(2, oout); switch (c = pgetc()) { case '`': goto done; @@ -1031,14 +1032,14 @@ parsebackq(char *out, struct nodelist ** /* * If eating a newline, avoid putting * the newline into the new character - * stream (via the STPUTC after the + * stream (via the USTPUTC after the * switch). */ continue; } if (c != '\\' && c != '`' && c != '$' && (!dblquote || c != '"')) - STPUTC('\\', oout); + USTPUTC('\\', oout); break; case '\n': @@ -1054,10 +1055,10 @@ parsebackq(char *out, struct nodelist ** default: break; } - STPUTC(c, oout); + USTPUTC(c, oout); } done: - STPUTC('\0', oout); + USTPUTC('\0', oout); olen = oout - stackblock(); INTOFF; ostr = ckmalloc(olen); @@ -1444,7 +1445,6 @@ parsesub: { char *p; static const char types[] = "}-+?="; int bracketed_name = 0; /* used to handle ${[0-9]*} variables */ - int i; int linno; int length; @@ -1498,8 +1498,7 @@ parsesub: { linno -= funclinno - 1; snprintf(buf, sizeof(buf), "%d", linno); STADJUST(-6, out); - for (i = 0; buf[i] != '\0'; i++) - STPUTC(buf[i], out); + STPUTS(buf, out); flags |= VSLINENO; } } else if (is_digit(c)) { Modified: projects/sbruno_64cpus/etc/defaults/rc.conf ============================================================================== --- projects/sbruno_64cpus/etc/defaults/rc.conf Wed Nov 24 21:54:45 2010 (r215805) +++ projects/sbruno_64cpus/etc/defaults/rc.conf Wed Nov 24 21:57:45 2010 (r215806) @@ -58,6 +58,8 @@ rc_conf_files="/etc/rc.conf /etc/rc.conf # ZFS support zfs_enable="NO" # Set to YES to automatically mount ZFS file systems +gptboot_enable="YES" # GPT boot success/failure reporting. + # Experimental - test before enabling gbde_autoattach_all="NO" # YES automatically mounts gbde devices from fstab gbde_devices="NO" # Devices to automatically attach (list, or AUTO) Modified: projects/sbruno_64cpus/etc/rc.d/gptboot ============================================================================== --- projects/sbruno_64cpus/etc/rc.d/gptboot Wed Nov 24 21:54:45 2010 (r215805) +++ projects/sbruno_64cpus/etc/rc.d/gptboot Wed Nov 24 21:57:45 2010 (r215806) @@ -34,6 +34,7 @@ . /etc/rc.subr name="gptboot" +rcvar=`set_rcvar` start_cmd="gptboot_report" gptboot_report() Modified: projects/sbruno_64cpus/share/man/man4/bge.4 ============================================================================== --- projects/sbruno_64cpus/share/man/man4/bge.4 Wed Nov 24 21:54:45 2010 (r215805) +++ projects/sbruno_64cpus/share/man/man4/bge.4 Wed Nov 24 21:57:45 2010 (r215806) @@ -31,7 +31,7 @@ .\" .\" $FreeBSD$ .\" -.Dd November 7, 2010 +.Dd November 23, 2010 .Dt BGE 4 .Os .Sh NAME @@ -144,27 +144,6 @@ Force full duplex operation. Force half duplex operation. .El .Pp -The -.Nm -driver also supports one special link option for 1000baseTX cards: -.Bl -tag -width ".Cm link0" -.It Cm link0 -With 1000baseTX cards, establishing a link between two ports requires -that one port be configured as a master and the other a slave. -With autonegotiation, -the master/slave settings will be chosen automatically. -However when manually selecting the link state, it is necessary to -force one side of the link to be a master and the other a slave. -The -.Nm -driver configures the ports as slaves by default. -Setting the -.Cm link0 -flag with -.Xr ifconfig 8 -will set a port as a master instead. -.El -.Pp For more information on configuring this device, see .Xr ifconfig 8 . .Sh HARDWARE Modified: projects/sbruno_64cpus/share/man/man4/msk.4 ============================================================================== --- projects/sbruno_64cpus/share/man/man4/msk.4 Wed Nov 24 21:54:45 2010 (r215805) +++ projects/sbruno_64cpus/share/man/man4/msk.4 Wed Nov 24 21:57:45 2010 (r215806) @@ -24,7 +24,7 @@ .\" .\" $FreeBSD$ .\" -.Dd April 30, 2010 +.Dd November 23, 2010 .Dt MSK 4 .Os .Sh NAME @@ -125,27 +125,6 @@ Force full duplex operation. Force half duplex operation. .El .Pp -The -.Nm -driver also supports one special link option for 1000baseTX cards: -.Bl -tag -width ".Cm link0" -.It Cm link0 -With 1000baseTX cards, establishing a link between two ports requires -that one port is configured as master and the other one as slave. -With autonegotiation, -the master/slave settings will be chosen automatically. -However when manually selecting the link state, it is necessary to -force one side of the link to be a master and the other a slave. -The -.Nm -driver configures the ports as slaves by default. -Setting the -.Cm link0 -flag with -.Xr ifconfig 8 -will set a port as a master instead. -.El -.Pp For more information on configuring this device, see .Xr ifconfig 8 . .Sh HARDWARE Modified: projects/sbruno_64cpus/share/man/man4/nge.4 ============================================================================== --- projects/sbruno_64cpus/share/man/man4/nge.4 Wed Nov 24 21:54:45 2010 (r215805) +++ projects/sbruno_64cpus/share/man/man4/nge.4 Wed Nov 24 21:57:45 2010 (r215806) @@ -31,7 +31,7 @@ .\" .\" $FreeBSD$ .\" -.Dd May 21, 2009 +.Dd November 23, 2010 .Dt NGE 4 .Os .Sh NAME @@ -131,27 +131,6 @@ Force full duplex operation. Force half duplex operation. .El .Pp -The -.Nm -driver also supports one special link option for 1000baseTX cards: -.Bl -tag -width link0 -.It Cm link0 -With 1000baseTX cards, establishing a link between two ports requires -that one port be configured as a master and the other a slave. -With autonegotiation, -the master/slave settings will be chosen automatically. -However when manually selecting the link state, it is necessary to -force one side of the link to be a master and the other a slave. -The -.Nm -driver configures the ports as slaves by default. -Setting the -.Cm link0 -flag with -.Xr ifconfig 8 -will set a port as a master instead. -.El -.Pp For more information on configuring this device, see .Xr ifconfig 8 . .Sh HARDWARE Modified: projects/sbruno_64cpus/share/man/man4/sk.4 ============================================================================== --- projects/sbruno_64cpus/share/man/man4/sk.4 Wed Nov 24 21:54:45 2010 (r215805) +++ projects/sbruno_64cpus/share/man/man4/sk.4 Wed Nov 24 21:57:45 2010 (r215806) @@ -30,7 +30,7 @@ .\" .\" $FreeBSD$ .\" -.Dd January 23, 2009 +.Dd November 23, 2010 .Dt SK 4 .Os .Sh NAME @@ -132,27 +132,6 @@ Force full duplex operation Force half duplex operation. .El .Pp -The -.Nm -driver also supports one special link option for 1000baseTX cards: -.Bl -tag -width xxxxxxxxxxxxxxxxxxxx -.It link0 -With 1000baseTX cards, establishing a link between two ports requires -that one port is configured as master and the other one as slave. -With autonegotiation, -the master/slave settings will be chosen automatically. -However when manually selecting the link state, it is necessary to -force one side of the link to be a master and the other a slave. -The -.Nm -driver configures the ports as slaves by default. -Setting the -.Ar link0 -flag with -.Xr ifconfig 8 -will set a port as a master instead. -.El -.Pp For more information on configuring this device, see .Xr ifconfig 8 . .Sh HARDWARE Modified: projects/sbruno_64cpus/share/man/man4/stge.4 ============================================================================== --- projects/sbruno_64cpus/share/man/man4/stge.4 Wed Nov 24 21:54:45 2010 (r215805) +++ projects/sbruno_64cpus/share/man/man4/stge.4 Wed Nov 24 21:57:45 2010 (r215806) @@ -29,7 +29,7 @@ .\" .\" $FreeBSD$ .\" -.Dd July 25, 2006 +.Dd November 23, 2010 .Dt STGE 4 .Os .Sh NAME @@ -129,27 +129,6 @@ Force full duplex operation. Force half duplex operation. .El .Pp -The -.Nm -driver also supports one special link option for 1000baseTX cards: -.Bl -tag -width ".Cm link0" -.It Cm link0 -With 1000baseTX cards, establishing a link between two ports requires -that one port is configured as master and the other one as slave. -With autonegotiation, -the master/slave settings will be chosen automatically. -However when manually selecting the link state, it is necessary to -force one side of the link to be a master and the other a slave. -The -.Nm -driver configures the ports as slaves by default. -Setting the -.Cm link0 -flag with -.Xr ifconfig 8 -will set a port as a master instead. -.El -.Pp For more information on configuring this device, see .Xr ifconfig 8 . .Sh HARDWARE Modified: projects/sbruno_64cpus/share/man/man4/vge.4 ============================================================================== --- projects/sbruno_64cpus/share/man/man4/vge.4 Wed Nov 24 21:54:45 2010 (r215805) +++ projects/sbruno_64cpus/share/man/man4/vge.4 Wed Nov 24 21:57:45 2010 (r215806) @@ -30,7 +30,7 @@ .\" .\" $FreeBSD$ .\" -.Dd December 18, 2009 +.Dd November 23, 2010 .Dt VGE 4 .Os .Sh NAME @@ -137,27 +137,6 @@ Force full duplex operation. Force half duplex operation. .El .Pp -The -.Nm -driver also supports one special link option for 1000baseTX cards: -.Bl -tag -width ".Cm link0" -.It Cm link0 -With 1000baseTX cards, establishing a link between two ports requires -that one port be configured as a master and the other a slave. -With autonegotiation, -the master/slave settings will be chosen automatically. -However when manually selecting the link state, it is necessary to -force one side of the link to be a master and the other a slave. -The -.Nm -driver configures the ports as slaves by default. -Setting the -.Cm link0 -flag with -.Xr ifconfig 8 -will set a port as a master instead. -.El -.Pp For more information on configuring this device, see .Xr ifconfig 8 . .Sh HARDWARE Modified: projects/sbruno_64cpus/share/man/man5/rc.conf.5 ============================================================================== --- projects/sbruno_64cpus/share/man/man5/rc.conf.5 Wed Nov 24 21:54:45 2010 (r215805) +++ projects/sbruno_64cpus/share/man/man5/rc.conf.5 Wed Nov 24 21:57:45 2010 (r215806) @@ -24,7 +24,7 @@ .\" .\" $FreeBSD$ .\" -.Dd November 13, 2010 +.Dd November 24, 2010 .Dt RC.CONF 5 .Os .Sh NAME @@ -1575,6 +1575,17 @@ If set to .Pa /etc/rc.d/zfs will attempt to automatically mount ZFS file systems and initialize ZFS volumes (ZVOLs). +.It Va gptboot_enable +.Pq Vt bool +If set to +.Dq Li YES , +.Pa /etc/rc.d/gptboot +will log if the system successfully (or not) booted from a GPT partition, +which had the +.Ar bootonce +attribute set using +.Xr gpart 8 +utility. .It Va gbde_autoattach_all .Pq Vt bool If set to Modified: projects/sbruno_64cpus/share/man/man9/vrele.9 ============================================================================== --- projects/sbruno_64cpus/share/man/man9/vrele.9 Wed Nov 24 21:54:45 2010 (r215805) +++ projects/sbruno_64cpus/share/man/man9/vrele.9 Wed Nov 24 21:57:45 2010 (r215806) @@ -29,7 +29,7 @@ .\" .\" $FreeBSD$ .\" -.Dd October 17, 2010 +.Dd November 20, 2010 .Dt VRELE 9 .Os .Sh NAME @@ -74,10 +74,6 @@ with less overhead. The .Fn vunref function takes a locked vnode as argument, and returns with the vnode locked. -Nonetheless, the -.Fn vunref -might drop the vnode lock during the operation, so caller should not expect -that non-doomed vnode is still non-doomed after the function returned. .Pp Any code in the system which signified its use of a vnode by usecount should call one of the listed function to decrement use counter. Modified: projects/sbruno_64cpus/sys/amd64/amd64/cpu_switch.S ============================================================================== --- projects/sbruno_64cpus/sys/amd64/amd64/cpu_switch.S Wed Nov 24 21:54:45 2010 (r215805) +++ projects/sbruno_64cpus/sys/amd64/amd64/cpu_switch.S Wed Nov 24 21:57:45 2010 (r215806) @@ -276,7 +276,7 @@ load_dr: do_tss: movq %rdx,PCPU(TSSP) movq %rdx,%rcx movq PCPU(TSS),%rax - movw %rcx,2(%rax) + movw %cx,2(%rax) shrq $16,%rcx movb %cl,4(%rax) shrq $8,%rcx Modified: projects/sbruno_64cpus/sys/compat/ndis/ntoskrnl_var.h ============================================================================== --- projects/sbruno_64cpus/sys/compat/ndis/ntoskrnl_var.h Wed Nov 24 21:54:45 2010 (r215805) +++ projects/sbruno_64cpus/sys/compat/ndis/ntoskrnl_var.h Wed Nov 24 21:57:45 2010 (r215806) @@ -1282,6 +1282,7 @@ typedef struct driver_object driver_obje #define STATUS_PENDING 0x00000103 #define STATUS_FAILURE 0xC0000001 #define STATUS_NOT_IMPLEMENTED 0xC0000002 +#define STATUS_ACCESS_VIOLATION 0xC0000005 #define STATUS_INVALID_PARAMETER 0xC000000D #define STATUS_INVALID_DEVICE_REQUEST 0xC0000010 #define STATUS_MORE_PROCESSING_REQUIRED 0xC0000016 Modified: projects/sbruno_64cpus/sys/compat/ndis/subr_ndis.c ============================================================================== --- projects/sbruno_64cpus/sys/compat/ndis/subr_ndis.c Wed Nov 24 21:54:45 2010 (r215805) +++ projects/sbruno_64cpus/sys/compat/ndis/subr_ndis.c Wed Nov 24 21:57:45 2010 (r215806) @@ -254,6 +254,7 @@ static uint8_t void *, void *); static void NdisGetCurrentSystemTime(uint64_t *); static void NdisGetSystemUpTime(uint32_t *); +static uint32_t NdisGetVersion(void); static void NdisInitializeString(unicode_string *, char *); static void NdisInitAnsiString(ansi_string *, char *); static void NdisInitUnicodeString(unicode_string *, uint16_t *); @@ -274,6 +275,7 @@ static void NdisMapFile(ndis_status *, v static void NdisUnmapFile(ndis_handle); static void NdisCloseFile(ndis_handle); static uint8_t NdisSystemProcessorCount(void); +static void NdisGetCurrentProcessorCounts(uint32_t *, uint32_t *, uint32_t *); static void NdisMIndicateStatusComplete(ndis_handle); static void NdisMIndicateStatus(ndis_handle, ndis_status, void *, uint32_t); @@ -2067,6 +2069,12 @@ NdisInterlockedDecrement(addend) return (*addend); } +static uint32_t +NdisGetVersion(void) +{ + return (0x00050001); +} + static void NdisInitializeEvent(event) ndis_event *event; @@ -2950,6 +2958,20 @@ NdisSystemProcessorCount() return (mp_ncpus); } +static void +NdisGetCurrentProcessorCounts(idle_count, kernel_and_user, index) + uint32_t *idle_count; + uint32_t *kernel_and_user; + uint32_t *index; +{ + struct pcpu *pcpu; + + pcpu = pcpu_find(curthread->td_oncpu); + *index = pcpu->pc_cpuid; + *idle_count = pcpu->pc_cp_time[CP_IDLE]; + *kernel_and_user = pcpu->pc_cp_time[CP_INTR]; +} + typedef void (*ndis_statusdone_handler)(ndis_handle); typedef void (*ndis_status_handler)(ndis_handle, ndis_status, void *, uint32_t); @@ -3207,6 +3229,7 @@ image_patch_table ndis_functbl[] = { IMPORT_SFUNC(NdisMIndicateStatusComplete, 1), IMPORT_SFUNC(NdisMIndicateStatus, 4), IMPORT_SFUNC(NdisSystemProcessorCount, 0), + IMPORT_SFUNC(NdisGetCurrentProcessorCounts, 3), IMPORT_SFUNC(NdisUnchainBufferAtBack, 2), IMPORT_SFUNC(NdisGetFirstBufferFromPacket, 5), IMPORT_SFUNC(NdisGetFirstBufferFromPacketSafe, 6), @@ -3224,6 +3247,7 @@ image_patch_table ndis_functbl[] = { IMPORT_SFUNC(NdisFreeString, 1), IMPORT_SFUNC(NdisGetCurrentSystemTime, 1), IMPORT_SFUNC(NdisGetSystemUpTime, 1), + IMPORT_SFUNC(NdisGetVersion, 0), IMPORT_SFUNC(NdisMSynchronizeWithInterrupt, 3), IMPORT_SFUNC(NdisMAllocateSharedMemoryAsync, 4), IMPORT_SFUNC(NdisInterlockedInsertHeadList, 3), Modified: projects/sbruno_64cpus/sys/compat/ndis/subr_ntoskrnl.c ============================================================================== --- projects/sbruno_64cpus/sys/compat/ndis/subr_ntoskrnl.c Wed Nov 24 21:54:45 2010 (r215805) +++ projects/sbruno_64cpus/sys/compat/ndis/subr_ntoskrnl.c Wed Nov 24 21:57:45 2010 (r215806) @@ -128,6 +128,7 @@ static kspin_lock ntoskrnl_intlock; static uint8_t RtlEqualUnicodeString(unicode_string *, unicode_string *, uint8_t); +static void RtlCopyString(ansi_string *, const ansi_string *); static void RtlCopyUnicodeString(unicode_string *, unicode_string *); static irp *IoBuildSynchronousFsdRequest(uint32_t, device_object *, @@ -180,7 +181,9 @@ static uint64_t _aullrem(uint64_t, uint6 static uint64_t _aullshr(uint64_t, uint8_t); static uint64_t _aullshl(uint64_t, uint8_t); static slist_entry *ntoskrnl_pushsl(slist_header *, slist_entry *); +static void InitializeSListHead(slist_header *); static slist_entry *ntoskrnl_popsl(slist_header *); +static void ExFreePoolWithTag(void *, uint32_t); static void ExInitializePagedLookasideList(paged_lookaside_list *, lookaside_alloc_func *, lookaside_free_func *, uint32_t, size_t, uint32_t, uint16_t); @@ -210,6 +213,10 @@ static void *MmMapLockedPagesSpecifyCach static void MmUnmapLockedPages(void *, mdl *); static device_t ntoskrnl_finddev(device_t, uint64_t, struct resource **); static void RtlZeroMemory(void *, size_t); +static void RtlSecureZeroMemory(void *, size_t); +static void RtlFillMemory(void *, size_t, uint8_t); +static void RtlMoveMemory(void *, const void *, size_t); +static ndis_status RtlCharToInteger(const char *, uint32_t, uint32_t *); static void RtlCopyMemory(void *, const void *, size_t); static size_t RtlCompareMemory(const void *, const void *, size_t); static ndis_status RtlUnicodeStringToInteger(unicode_string *, @@ -538,6 +545,20 @@ RtlEqualUnicodeString(unicode_string *st } static void +RtlCopyString(dst, src) + ansi_string *dst; + const ansi_string *src; +{ + if (src != NULL && src->as_buf != NULL && dst->as_buf != NULL) { + dst->as_len = min(src->as_len, dst->as_maxlen); + memcpy(dst->as_buf, src->as_buf, dst->as_len); + if (dst->as_len < dst->as_maxlen) + dst->as_buf[dst->as_len] = 0; + } else + dst->as_len = 0; +} + +static void RtlCopyUnicodeString(dest, src) unicode_string *dest; unicode_string *src; @@ -650,6 +671,14 @@ ExAllocatePoolWithTag(pooltype, len, tag return (buf); } +static void +ExFreePoolWithTag(buf, tag) + void *buf; + uint32_t tag; +{ + ExFreePool(buf); +} + void ExFreePool(buf) void *buf; @@ -2056,6 +2085,13 @@ ntoskrnl_pushsl(head, entry) return (oldhead); } +static void +InitializeSListHead(head) + slist_header *head; +{ + memset(head, 0, sizeof(*head)); +} + static slist_entry * ntoskrnl_popsl(head) slist_header *head; @@ -2725,6 +2761,59 @@ ntoskrnl_workitem_thread(arg) return; /* notreached */ } +static ndis_status +RtlCharToInteger(src, base, val) + const char *src; + uint32_t base; + uint32_t *val; +{ + int negative = 0; + uint32_t res; + + if (!src || !val) + return (STATUS_ACCESS_VIOLATION); + while (*src != '\0' && *src <= ' ') + src++; + if (*src == '+') + src++; + else if (*src == '-') { + src++; + negative = 1; + } + if (base == 0) { + base = 10; + if (*src == '0') { + src++; + if (*src == 'b') { + base = 2; + src++; + } else if (*src == 'o') { + base = 8; + src++; + } else if (*src == 'x') { + base = 16; + src++; + } + } + } else if (!(base == 2 || base == 8 || base == 10 || base == 16)) + return (STATUS_INVALID_PARAMETER); + + for (res = 0; *src; src++) { + int v; + if (isdigit(*src)) + v = *src - '0'; + else if (isxdigit(*src)) + v = tolower(*src) - 'a' + 10; + else + v = base; + if (v >= base) + return (STATUS_INVALID_PARAMETER); + res = res * base + v; + } + *val = negative ? -res : res; + return (STATUS_SUCCESS); +} + static void ntoskrnl_destroy_workitem_threads(void) { @@ -2905,6 +2994,32 @@ RtlZeroMemory(dst, len) } static void +RtlSecureZeroMemory(dst, len) + void *dst; + size_t len; +{ + memset(dst, 0, len); +} + +static void +RtlFillMemory(dst, len, c) + void *dst; + size_t len; + uint8_t c; +{ + memset(dst, c, len); +} + +static void +RtlMoveMemory(dst, src, len) + void *dst; + const void *src; + size_t len; +{ + memmove(dst, src, len); +} + +static void RtlCopyMemory(dst, src, len) void *dst; const void *src; @@ -2919,17 +3034,14 @@ RtlCompareMemory(s1, s2, len) const void *s2; size_t len; { - size_t i, total = 0; + size_t i; uint8_t *m1, *m2; m1 = __DECONST(char *, s1); m2 = __DECONST(char *, s2); - for (i = 0; i < len; i++) { - if (m1[i] == m2[i]) - total++; - } - return (total); + for (i = 0; i < len && m1[i] == m2[i]; i++); + return (i); } void @@ -4124,7 +4236,12 @@ dummy() image_patch_table ntoskrnl_functbl[] = { IMPORT_SFUNC(RtlZeroMemory, 2), + IMPORT_SFUNC(RtlSecureZeroMemory, 2), + IMPORT_SFUNC(RtlFillMemory, 3), + IMPORT_SFUNC(RtlMoveMemory, 3), + IMPORT_SFUNC(RtlCharToInteger, 3), IMPORT_SFUNC(RtlCopyMemory, 3), + IMPORT_SFUNC(RtlCopyString, 2), IMPORT_SFUNC(RtlCompareMemory, 3), IMPORT_SFUNC(RtlEqualUnicodeString, 3), IMPORT_SFUNC(RtlCopyUnicodeString, 2), @@ -4211,6 +4328,7 @@ image_patch_table ntoskrnl_functbl[] = { IMPORT_SFUNC(ExInitializeNPagedLookasideList, 7), IMPORT_SFUNC(ExDeleteNPagedLookasideList, 1), IMPORT_FFUNC(InterlockedPopEntrySList, 1), + IMPORT_FFUNC(InitializeSListHead, 1), IMPORT_FFUNC(InterlockedPushEntrySList, 2), IMPORT_SFUNC(ExQueryDepthSList, 1), IMPORT_FFUNC_MAP(ExpInterlockedPopEntrySList, @@ -4220,6 +4338,7 @@ image_patch_table ntoskrnl_functbl[] = { IMPORT_FFUNC(ExInterlockedPopEntrySList, 2), IMPORT_FFUNC(ExInterlockedPushEntrySList, 3), IMPORT_SFUNC(ExAllocatePoolWithTag, 3), + IMPORT_SFUNC(ExFreePoolWithTag, 2), IMPORT_SFUNC(ExFreePool, 1), #ifdef __i386__ IMPORT_FFUNC(KefAcquireSpinLockAtDpcLevel, 1), Modified: projects/sbruno_64cpus/sys/dev/e1000/e1000_api.c ============================================================================== --- projects/sbruno_64cpus/sys/dev/e1000/e1000_api.c Wed Nov 24 21:54:45 2010 (r215805) +++ projects/sbruno_64cpus/sys/dev/e1000/e1000_api.c Wed Nov 24 21:57:45 2010 (r215806) @@ -312,6 +312,8 @@ s32 e1000_set_mac_type(struct e1000_hw * case E1000_DEV_ID_82580_SGMII: case E1000_DEV_ID_82580_COPPER_DUAL: case E1000_DEV_ID_82580_QUAD_FIBER: + case E1000_DEV_ID_DH89XXCC_SGMII: + case E1000_DEV_ID_DH89XXCC_SERDES: mac->type = e1000_82580; break; case E1000_DEV_ID_82576_VF: Modified: projects/sbruno_64cpus/sys/dev/e1000/e1000_hw.h ============================================================================== --- projects/sbruno_64cpus/sys/dev/e1000/e1000_hw.h Wed Nov 24 21:54:45 2010 (r215805) +++ projects/sbruno_64cpus/sys/dev/e1000/e1000_hw.h Wed Nov 24 21:57:45 2010 (r215806) @@ -150,6 +150,8 @@ struct e1000_hw; #define E1000_DEV_ID_82580_SGMII 0x1511 #define E1000_DEV_ID_82580_COPPER_DUAL 0x1516 #define E1000_DEV_ID_82580_QUAD_FIBER 0x1527 +#define E1000_DEV_ID_DH89XXCC_SGMII 0x0436 +#define E1000_DEV_ID_DH89XXCC_SERDES 0x0438 #define E1000_REVISION_0 0 #define E1000_REVISION_1 1 #define E1000_REVISION_2 2 Modified: projects/sbruno_64cpus/sys/dev/e1000/if_igb.c ============================================================================== --- projects/sbruno_64cpus/sys/dev/e1000/if_igb.c Wed Nov 24 21:54:45 2010 (r215805) +++ projects/sbruno_64cpus/sys/dev/e1000/if_igb.c Wed Nov 24 21:57:45 2010 (r215806) @@ -99,7 +99,7 @@ int igb_display_debug_stats = 0; /********************************************************************* * Driver version: *********************************************************************/ -char igb_driver_version[] = "version - 2.0.4"; +char igb_driver_version[] = "version - 2.0.7"; /********************************************************************* @@ -137,6 +137,10 @@ static igb_vendor_info_t igb_vendor_info { 0x8086, E1000_DEV_ID_82580_SGMII, PCI_ANY_ID, PCI_ANY_ID, 0}, { 0x8086, E1000_DEV_ID_82580_COPPER_DUAL, PCI_ANY_ID, PCI_ANY_ID, 0}, + { 0x8086, E1000_DEV_ID_82580_QUAD_FIBER, + PCI_ANY_ID, PCI_ANY_ID, 0}, + { 0x8086, E1000_DEV_ID_DH89XXCC_SERDES, PCI_ANY_ID, PCI_ANY_ID, 0}, + { 0x8086, E1000_DEV_ID_DH89XXCC_SGMII, PCI_ANY_ID, PCI_ANY_ID, 0}, /* required last entry */ { 0, 0, 0, 0, 0} }; @@ -307,11 +311,19 @@ static int igb_enable_msix = 1; TUNABLE_INT("hw.igb.enable_msix", &igb_enable_msix); /* - * Header split has seemed to be beneficial in - * many circumstances tested, however there have - * been some stability issues, so the default is - * off. - */ +** Tuneable Interrupt rate +*/ +static int igb_max_interrupt_rate = 8000; +TUNABLE_INT("hw.igb.max_interrupt_rate", &igb_max_interrupt_rate); + +/* +** Header split causes the packet header to +** be dma'd to a seperate mbuf from the payload. +** this can have memory alignment benefits. But +** another plus is that small packets often fit +** into the header and thus use no cluster. Its +** a very workload dependent type feature. +*/ static bool igb_header_split = FALSE; TUNABLE_INT("hw.igb.hdr_split", &igb_header_split); @@ -330,15 +342,6 @@ TUNABLE_INT("hw.igb.rx_process_limit", & static int igb_fc_setting = e1000_fc_full; TUNABLE_INT("hw.igb.fc_setting", &igb_fc_setting); -/* -** Shadow VFTA table, this is needed because -** the real filter table gets cleared during -** a soft reset and the driver needs to be able -** to repopulate it. -*/ -static u32 igb_shadow_vfta[IGB_VFTA_SIZE]; - - /********************************************************************* * Device identification routine * @@ -818,7 +821,7 @@ igb_start_locked(struct tx_ring *txr, st /* Set watchdog on */ txr->watchdog_time = ticks; - txr->watchdog_check = TRUE; + txr->queue_status = IGB_QUEUE_WORKING; } } @@ -922,7 +925,7 @@ igb_mq_start_locked(struct ifnet *ifp, s } if (enq > 0) { /* Set the watchdog */ - txr->watchdog_check = TRUE; + txr->queue_status = IGB_QUEUE_WORKING; txr->watchdog_time = ticks; } return (err); @@ -1049,6 +1052,11 @@ igb_ioctl(struct ifnet *ifp, u_long comm } *** DIFF OUTPUT TRUNCATED AT 1000 LINES *** From owner-svn-src-projects@FreeBSD.ORG Thu Nov 25 18:36:45 2010 Return-Path: Delivered-To: svn-src-projects@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 8249A1065672; Thu, 25 Nov 2010 18:36:45 +0000 (UTC) (envelope-from dim@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id 6C3498FC17; Thu, 25 Nov 2010 18:36:45 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id oAPIajEa013975; Thu, 25 Nov 2010 18:36:45 GMT (envelope-from dim@svn.freebsd.org) Received: (from dim@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id oAPIaiGp013938; Thu, 25 Nov 2010 18:36:44 GMT (envelope-from dim@svn.freebsd.org) Message-Id: <201011251836.oAPIaiGp013938@svn.freebsd.org> From: Dimitry Andric Date: Thu, 25 Nov 2010 18:36:44 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org X-SVN-Group: projects MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r215830 - in projects/binutils-2.17: bin/sh contrib/top etc/defaults etc/rc.d share/man/man4 share/man/man5 share/man/man9 share/misc share/mk sys/amd64/acpica sys/amd64/amd64 sys/amd64... X-BeenThere: svn-src-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "SVN commit messages for the src " projects" tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 25 Nov 2010 18:36:45 -0000 Author: dim Date: Thu Nov 25 18:36:44 2010 New Revision: 215830 URL: http://svn.freebsd.org/changeset/base/215830 Log: Sync: merge r215709 through r215824 from ^/head. Added: projects/binutils-2.17/sys/netinet/sctp_dtrace_declare.h - copied unchanged from r215824, head/sys/netinet/sctp_dtrace_declare.h projects/binutils-2.17/sys/netinet/sctp_dtrace_define.h - copied unchanged from r215824, head/sys/netinet/sctp_dtrace_define.h Deleted: projects/binutils-2.17/usr.sbin/kernbb/ Modified: projects/binutils-2.17/bin/sh/arith_lex.l projects/binutils-2.17/bin/sh/cd.c projects/binutils-2.17/bin/sh/eval.c projects/binutils-2.17/bin/sh/expand.c projects/binutils-2.17/bin/sh/histedit.c projects/binutils-2.17/bin/sh/memalloc.c projects/binutils-2.17/bin/sh/memalloc.h projects/binutils-2.17/bin/sh/miscbltin.c projects/binutils-2.17/bin/sh/parser.c projects/binutils-2.17/etc/defaults/rc.conf projects/binutils-2.17/etc/rc.d/gptboot projects/binutils-2.17/etc/rc.d/mountcritlocal projects/binutils-2.17/share/man/man4/bge.4 projects/binutils-2.17/share/man/man4/msk.4 projects/binutils-2.17/share/man/man4/nge.4 projects/binutils-2.17/share/man/man4/sk.4 projects/binutils-2.17/share/man/man4/stge.4 projects/binutils-2.17/share/man/man4/vge.4 projects/binutils-2.17/share/man/man5/rc.conf.5 projects/binutils-2.17/share/man/man9/vrele.9 projects/binutils-2.17/share/misc/bsd-family-tree projects/binutils-2.17/sys/amd64/acpica/acpi_switch.S projects/binutils-2.17/sys/amd64/acpica/acpi_wakecode.S projects/binutils-2.17/sys/amd64/acpica/acpi_wakeup.c projects/binutils-2.17/sys/amd64/amd64/cpu_switch.S projects/binutils-2.17/sys/amd64/amd64/mp_machdep.c projects/binutils-2.17/sys/amd64/amd64/pmap.c projects/binutils-2.17/sys/amd64/include/specialreg.h projects/binutils-2.17/sys/boot/common/load_elf.c projects/binutils-2.17/sys/compat/freebsd32/freebsd32_misc.c projects/binutils-2.17/sys/compat/ia32/ia32_signal.h projects/binutils-2.17/sys/compat/ia32/ia32_util.h projects/binutils-2.17/sys/compat/ndis/ntoskrnl_var.h projects/binutils-2.17/sys/compat/ndis/subr_ndis.c projects/binutils-2.17/sys/compat/ndis/subr_ntoskrnl.c projects/binutils-2.17/sys/dev/ahci/ahci.c projects/binutils-2.17/sys/dev/cas/if_cas.c projects/binutils-2.17/sys/dev/e1000/e1000_api.c projects/binutils-2.17/sys/dev/e1000/e1000_hw.h projects/binutils-2.17/sys/dev/e1000/if_em.c projects/binutils-2.17/sys/dev/e1000/if_igb.c projects/binutils-2.17/sys/dev/e1000/if_igb.h projects/binutils-2.17/sys/dev/fxp/if_fxp.c projects/binutils-2.17/sys/dev/fxp/if_fxpvar.h projects/binutils-2.17/sys/dev/gem/if_gem.c projects/binutils-2.17/sys/dev/mii/bmtphy.c projects/binutils-2.17/sys/dev/mii/gentbi.c projects/binutils-2.17/sys/dev/mii/inphy.c projects/binutils-2.17/sys/dev/mii/mii.c projects/binutils-2.17/sys/dev/mii/miidevs projects/binutils-2.17/sys/dev/mii/nsgphy.c projects/binutils-2.17/sys/dev/mii/nsphyter.c projects/binutils-2.17/sys/dev/mii/ukphy.c projects/binutils-2.17/sys/dev/pci/pci.c projects/binutils-2.17/sys/dev/pci/pci_pci.c projects/binutils-2.17/sys/dev/usb/controller/usb_controller.c projects/binutils-2.17/sys/dev/usb/serial/u3g.c projects/binutils-2.17/sys/dev/usb/usb_bus.h projects/binutils-2.17/sys/dev/usb/usb_pf.c projects/binutils-2.17/sys/dev/usb/usb_pf.h projects/binutils-2.17/sys/dev/usb/usbdevs projects/binutils-2.17/sys/i386/i386/pmap.c projects/binutils-2.17/sys/i386/include/specialreg.h projects/binutils-2.17/sys/i386/include/xen/hypercall.h projects/binutils-2.17/sys/i386/isa/npx.c projects/binutils-2.17/sys/i386/pci/pci_bus.c projects/binutils-2.17/sys/i386/xen/pmap.c projects/binutils-2.17/sys/i386/xen/xen_machdep.c projects/binutils-2.17/sys/kern/kern_tc.c projects/binutils-2.17/sys/kern/subr_taskqueue.c projects/binutils-2.17/sys/kern/vfs_mount.c projects/binutils-2.17/sys/kern/vfs_subr.c projects/binutils-2.17/sys/net/bpf_buffer.c projects/binutils-2.17/sys/net/if_vlan.c projects/binutils-2.17/sys/netgraph/ng_pipe.c projects/binutils-2.17/sys/netinet/ip_carp.c projects/binutils-2.17/sys/netinet/sctp_cc_functions.c projects/binutils-2.17/sys/netinet/sctp_pcb.c projects/binutils-2.17/sys/netinet/sctp_uio.h projects/binutils-2.17/sys/sys/elf_common.h projects/binutils-2.17/sys/sys/sysctl.h projects/binutils-2.17/sys/vm/vm_object.c projects/binutils-2.17/sys/x86/x86/local_apic.c projects/binutils-2.17/tools/tools/sysbuild/sysbuild.sh projects/binutils-2.17/usr.bin/locate/locate/locate.h projects/binutils-2.17/usr.bin/netstat/inet.c projects/binutils-2.17/usr.sbin/iostat/iostat.8 projects/binutils-2.17/usr.sbin/usbdump/usbdump.c Directory Properties: projects/binutils-2.17/ (props changed) projects/binutils-2.17/cddl/contrib/opensolaris/ (props changed) projects/binutils-2.17/contrib/bind9/ (props changed) projects/binutils-2.17/contrib/binutils/ (props changed) projects/binutils-2.17/contrib/bzip2/ (props changed) projects/binutils-2.17/contrib/ee/ (props changed) projects/binutils-2.17/contrib/expat/ (props changed) projects/binutils-2.17/contrib/file/ (props changed) projects/binutils-2.17/contrib/gdb/ (props changed) projects/binutils-2.17/contrib/gdtoa/ (props changed) projects/binutils-2.17/contrib/gnu-sort/ (props changed) projects/binutils-2.17/contrib/groff/ (props changed) projects/binutils-2.17/contrib/less/ (props changed) projects/binutils-2.17/contrib/libpcap/ (props changed) projects/binutils-2.17/contrib/llvm/ (props changed) projects/binutils-2.17/contrib/llvm/tools/clang/ (props changed) projects/binutils-2.17/contrib/ncurses/ (props changed) projects/binutils-2.17/contrib/netcat/ (props changed) projects/binutils-2.17/contrib/ntp/ (props changed) projects/binutils-2.17/contrib/one-true-awk/ (props changed) projects/binutils-2.17/contrib/openbsm/ (props changed) projects/binutils-2.17/contrib/openpam/ (props changed) projects/binutils-2.17/contrib/pf/ (props changed) projects/binutils-2.17/contrib/sendmail/ (props changed) projects/binutils-2.17/contrib/tcpdump/ (props changed) projects/binutils-2.17/contrib/tcsh/ (props changed) projects/binutils-2.17/contrib/top/ (props changed) projects/binutils-2.17/contrib/top/install-sh (props changed) projects/binutils-2.17/contrib/tzcode/stdtime/ (props changed) projects/binutils-2.17/contrib/tzcode/zic/ (props changed) projects/binutils-2.17/contrib/tzdata/ (props changed) projects/binutils-2.17/contrib/wpa/ (props changed) projects/binutils-2.17/contrib/xz/ (props changed) projects/binutils-2.17/crypto/openssh/ (props changed) projects/binutils-2.17/crypto/openssl/ (props changed) projects/binutils-2.17/lib/libc/ (props changed) projects/binutils-2.17/lib/libc/stdtime/ (props changed) projects/binutils-2.17/lib/libutil/ (props changed) projects/binutils-2.17/lib/libz/ (props changed) projects/binutils-2.17/sbin/ (props changed) projects/binutils-2.17/sbin/ipfw/ (props changed) projects/binutils-2.17/share/mk/bsd.arch.inc.mk (props changed) projects/binutils-2.17/share/zoneinfo/ (props changed) projects/binutils-2.17/sys/ (props changed) projects/binutils-2.17/sys/amd64/include/xen/ (props changed) projects/binutils-2.17/sys/cddl/contrib/opensolaris/ (props changed) projects/binutils-2.17/sys/contrib/dev/acpica/ (props changed) projects/binutils-2.17/sys/contrib/pf/ (props changed) projects/binutils-2.17/sys/contrib/x86emu/ (props changed) projects/binutils-2.17/usr.bin/calendar/ (props changed) projects/binutils-2.17/usr.bin/csup/ (props changed) projects/binutils-2.17/usr.bin/procstat/ (props changed) projects/binutils-2.17/usr.sbin/zic/ (props changed) Modified: projects/binutils-2.17/bin/sh/arith_lex.l ============================================================================== --- projects/binutils-2.17/bin/sh/arith_lex.l Thu Nov 25 18:34:42 2010 (r215829) +++ projects/binutils-2.17/bin/sh/arith_lex.l Thu Nov 25 18:36:44 2010 (r215830) @@ -53,7 +53,15 @@ int yylex(void); #undef YY_INPUT #define YY_INPUT(buf,result,max) \ - result = (*buf = *arith_buf++) ? 1 : YY_NULL; + do { \ + result = strnlen(arith_buf, max); \ + if (result == 0) \ + result = YY_NULL; \ + else { \ + memcpy(buf, arith_buf, result); \ + arith_buf += result; \ + } \ + } while (0); #define YY_NO_UNPUT #define YY_NO_INPUT %} Modified: projects/binutils-2.17/bin/sh/cd.c ============================================================================== --- projects/binutils-2.17/bin/sh/cd.c Thu Nov 25 18:34:42 2010 (r215829) +++ projects/binutils-2.17/bin/sh/cd.c Thu Nov 25 18:36:44 2010 (r215830) @@ -192,8 +192,7 @@ cdlogical(char *dest) STPUTC('/', p); first = 0; component = q; - while (*q) - STPUTC(*q++, p); + STPUTS(q, p); if (equal(component, "..")) continue; STACKSTRNUL(p); @@ -219,10 +218,13 @@ cdphysical(char *dest) char *p; INTOFF; - if (chdir(dest) < 0 || (p = findcwd(NULL)) == NULL) { + if (chdir(dest) < 0) { INTON; return (-1); } + p = findcwd(NULL); + if (p == NULL) + out2fmt_flush("cd: warning: failed to get name of current directory\n"); updatepwd(p); INTON; return (0); @@ -270,10 +272,8 @@ findcwd(char *dir) scopy(dir, cdcomppath); STARTSTACKSTR(new); if (*dir != '/') { - p = curdir; - while (*p) - STPUTC(*p++, new); - if (p[-1] == '/') + STPUTS(curdir, new); + if (STTOPC(new) == '/') STUNPUTC(new); } while ((p = getcomponent()) != NULL) { @@ -281,8 +281,7 @@ findcwd(char *dir) while (new > stackblock() && (STUNPUTC(new), *new) != '/'); } else if (*p != '\0' && ! equal(p, ".")) { STPUTC('/', new); - while (*p) - STPUTC(*p++, new); + STPUTS(p, new); } } if (new == stackblock()) @@ -304,7 +303,7 @@ updatepwd(char *dir) if (prevdir) ckfree(prevdir); prevdir = curdir; - curdir = savestr(dir); + curdir = dir ? savestr(dir) : NULL; setvar("PWD", curdir, VEXPORT); setvar("OLDPWD", prevdir, VEXPORT); } Modified: projects/binutils-2.17/bin/sh/eval.c ============================================================================== --- projects/binutils-2.17/bin/sh/eval.c Thu Nov 25 18:34:42 2010 (r215829) +++ projects/binutils-2.17/bin/sh/eval.c Thu Nov 25 18:36:44 2010 (r215830) @@ -135,8 +135,7 @@ evalcmd(int argc, char **argv) STARTSTACKSTR(concat); ap = argv + 2; for (;;) { - while (*p) - STPUTC(*p++, concat); + STPUTS(p, concat); if ((p = *ap++) == NULL) break; STPUTC(' ', concat); Modified: projects/binutils-2.17/bin/sh/expand.c ============================================================================== --- projects/binutils-2.17/bin/sh/expand.c Thu Nov 25 18:34:42 2010 (r215829) +++ projects/binutils-2.17/bin/sh/expand.c Thu Nov 25 18:36:44 2010 (r215830) @@ -225,6 +225,7 @@ argstr(char *p, int flag) if (*p == '~' && (flag & (EXP_TILDE | EXP_VARTILDE))) p = exptilde(p, flag); for (;;) { + CHECKSTRSPACE(2, expdest); switch (c = *p++) { case '\0': case CTLENDVAR: @@ -235,16 +236,16 @@ argstr(char *p, int flag) if (p[0] == CTLVAR && p[2] == '@' && p[3] == '=') break; if ((flag & EXP_FULL) != 0) - STPUTC(c, expdest); + USTPUTC(c, expdest); break; case CTLQUOTEEND: lit_quoted = 0; break; case CTLESC: if (quotes) - STPUTC(c, expdest); + USTPUTC(c, expdest); c = *p++; - STPUTC(c, expdest); + USTPUTC(c, expdest); if (split_lit && !lit_quoted) recordregion(expdest - stackblock() - (quotes ? 2 : 1), @@ -267,7 +268,7 @@ argstr(char *p, int flag) * sort of a hack - expand tildes in variable * assignments (after the first '=' and after ':'s). */ - STPUTC(c, expdest); + USTPUTC(c, expdest); if (split_lit && !lit_quoted) recordregion(expdest - stackblock() - 1, expdest - stackblock(), 0); @@ -279,7 +280,7 @@ argstr(char *p, int flag) } break; default: - STPUTC(c, expdest); + USTPUTC(c, expdest); if (split_lit && !lit_quoted) recordregion(expdest - stackblock() - 1, expdest - stackblock(), 0); @@ -902,8 +903,7 @@ varvalue(char *name, int quoted, int sub STPUTC(*p++, expdest); \ } \ } else \ - while (*p) \ - STPUTC(*p++, expdest); \ + STPUTS(p, expdest); \ } while (0) @@ -1573,8 +1573,7 @@ cvtnum(int num, char *buf) if (neg) *--p = '-'; - while (*p) - STPUTC(*p++, buf); + STPUTS(p, buf); return buf; } Modified: projects/binutils-2.17/bin/sh/histedit.c ============================================================================== --- projects/binutils-2.17/bin/sh/histedit.c Thu Nov 25 18:34:42 2010 (r215829) +++ projects/binutils-2.17/bin/sh/histedit.c Thu Nov 25 18:36:44 2010 (r215830) @@ -411,8 +411,7 @@ fc_replace(const char *s, char *p, char STARTSTACKSTR(dest); while (*s) { if (*s == *p && strncmp(s, p, plen) == 0) { - while (*r) - STPUTC(*r++, dest); + STPUTS(r, dest); s += plen; *p = '\0'; /* so no more matches */ } else Modified: projects/binutils-2.17/bin/sh/memalloc.c ============================================================================== --- projects/binutils-2.17/bin/sh/memalloc.c Thu Nov 25 18:34:42 2010 (r215829) +++ projects/binutils-2.17/bin/sh/memalloc.c Thu Nov 25 18:36:44 2010 (r215830) @@ -340,3 +340,20 @@ ungrabstackstr(char *s, char *p) stacknxt = s; sstrnleft = stacknleft - (p - s); } + + +char * +stputbin(const char *data, int len, char *p) +{ + int i; + + for (i = 0; i < len; i++) + STPUTC(data[i], p); + return (p); +} + +char * +stputs(const char *data, char *p) +{ + return (stputbin(data, strlen(data), p)); +} Modified: projects/binutils-2.17/bin/sh/memalloc.h ============================================================================== --- projects/binutils-2.17/bin/sh/memalloc.h Thu Nov 25 18:34:42 2010 (r215829) +++ projects/binutils-2.17/bin/sh/memalloc.h Thu Nov 25 18:36:44 2010 (r215830) @@ -61,6 +61,8 @@ void grabstackblock(int); char *growstackstr(void); char *makestrspace(void); void ungrabstackstr(char *, char *); +char *stputbin(const char *data, int len, char *p); +char *stputs(const char *data, char *p); @@ -82,3 +84,5 @@ void ungrabstackstr(char *, char *); #define STTOPC(p) p[-1] #define STADJUST(amount, p) (p += (amount), sstrnleft -= (amount)) #define grabstackstr(p) stalloc(stackblocksize() - sstrnleft) +#define STPUTBIN(s, len, p) p = stputbin((s), (len), p) +#define STPUTS(s, p) p = stputs((s), p) Modified: projects/binutils-2.17/bin/sh/miscbltin.c ============================================================================== --- projects/binutils-2.17/bin/sh/miscbltin.c Thu Nov 25 18:34:42 2010 (r215829) +++ projects/binutils-2.17/bin/sh/miscbltin.c Thu Nov 25 18:36:44 2010 (r215830) @@ -172,11 +172,12 @@ readcmd(int argc __unused, char **argv _ } if (c == '\0') continue; + CHECKSTRSPACE(1, p); if (backslash) { backslash = 0; startword = 0; if (c != '\n') - STPUTC(c, p); + USTPUTC(c, p); continue; } if (!rflag && c == '\\') { @@ -194,14 +195,14 @@ readcmd(int argc __unused, char **argv _ if (is_ifs == 1) { /* Ignore leading IFS whitespace */ if (saveall) - STPUTC(c, p); + USTPUTC(c, p); continue; } if (is_ifs == 2 && startword == 1) { /* Only one non-whitespace IFS per word */ startword = 2; if (saveall) - STPUTC(c, p); + USTPUTC(c, p); continue; } } @@ -212,7 +213,7 @@ readcmd(int argc __unused, char **argv _ if (saveall) /* Not just a spare terminator */ saveall++; - STPUTC(c, p); + USTPUTC(c, p); continue; } @@ -222,7 +223,7 @@ readcmd(int argc __unused, char **argv _ if (ap[1] == NULL) { /* Last variable needs all IFS chars */ saveall++; - STPUTC(c, p); + USTPUTC(c, p); continue; } Modified: projects/binutils-2.17/bin/sh/parser.c ============================================================================== --- projects/binutils-2.17/bin/sh/parser.c Thu Nov 25 18:34:42 2010 (r215829) +++ projects/binutils-2.17/bin/sh/parser.c Thu Nov 25 18:36:44 2010 (r215830) @@ -1017,6 +1017,7 @@ parsebackq(char *out, struct nodelist ** setprompt(2); needprompt = 0; } + CHECKSTRSPACE(2, oout); switch (c = pgetc()) { case '`': goto done; @@ -1031,14 +1032,14 @@ parsebackq(char *out, struct nodelist ** /* * If eating a newline, avoid putting * the newline into the new character - * stream (via the STPUTC after the + * stream (via the USTPUTC after the * switch). */ continue; } if (c != '\\' && c != '`' && c != '$' && (!dblquote || c != '"')) - STPUTC('\\', oout); + USTPUTC('\\', oout); break; case '\n': @@ -1054,10 +1055,10 @@ parsebackq(char *out, struct nodelist ** default: break; } - STPUTC(c, oout); + USTPUTC(c, oout); } done: - STPUTC('\0', oout); + USTPUTC('\0', oout); olen = oout - stackblock(); INTOFF; ostr = ckmalloc(olen); @@ -1444,7 +1445,6 @@ parsesub: { char *p; static const char types[] = "}-+?="; int bracketed_name = 0; /* used to handle ${[0-9]*} variables */ - int i; int linno; int length; @@ -1498,8 +1498,7 @@ parsesub: { linno -= funclinno - 1; snprintf(buf, sizeof(buf), "%d", linno); STADJUST(-6, out); - for (i = 0; buf[i] != '\0'; i++) - STPUTC(buf[i], out); + STPUTS(buf, out); flags |= VSLINENO; } } else if (is_digit(c)) { Modified: projects/binutils-2.17/etc/defaults/rc.conf ============================================================================== --- projects/binutils-2.17/etc/defaults/rc.conf Thu Nov 25 18:34:42 2010 (r215829) +++ projects/binutils-2.17/etc/defaults/rc.conf Thu Nov 25 18:36:44 2010 (r215830) @@ -58,6 +58,8 @@ rc_conf_files="/etc/rc.conf /etc/rc.conf # ZFS support zfs_enable="NO" # Set to YES to automatically mount ZFS file systems +gptboot_enable="YES" # GPT boot success/failure reporting. + # Experimental - test before enabling gbde_autoattach_all="NO" # YES automatically mounts gbde devices from fstab gbde_devices="NO" # Devices to automatically attach (list, or AUTO) Modified: projects/binutils-2.17/etc/rc.d/gptboot ============================================================================== --- projects/binutils-2.17/etc/rc.d/gptboot Thu Nov 25 18:34:42 2010 (r215829) +++ projects/binutils-2.17/etc/rc.d/gptboot Thu Nov 25 18:36:44 2010 (r215830) @@ -34,6 +34,7 @@ . /etc/rc.subr name="gptboot" +rcvar=`set_rcvar` start_cmd="gptboot_report" gptboot_report() Modified: projects/binutils-2.17/etc/rc.d/mountcritlocal ============================================================================== --- projects/binutils-2.17/etc/rc.d/mountcritlocal Thu Nov 25 18:34:42 2010 (r215829) +++ projects/binutils-2.17/etc/rc.d/mountcritlocal Thu Nov 25 18:36:44 2010 (r215830) @@ -5,13 +5,13 @@ # PROVIDE: mountcritlocal # REQUIRE: root hostid_save mdconfig -# KEYWORD: nojail +# KEYWORD: nojail shutdown . /etc/rc.subr name="mountcritlocal" start_cmd="mountcritlocal_start" -stop_cmd=":" +stop_cmd=sync mountcritlocal_start() { Modified: projects/binutils-2.17/share/man/man4/bge.4 ============================================================================== --- projects/binutils-2.17/share/man/man4/bge.4 Thu Nov 25 18:34:42 2010 (r215829) +++ projects/binutils-2.17/share/man/man4/bge.4 Thu Nov 25 18:36:44 2010 (r215830) @@ -31,7 +31,7 @@ .\" .\" $FreeBSD$ .\" -.Dd November 7, 2010 +.Dd November 23, 2010 .Dt BGE 4 .Os .Sh NAME @@ -144,27 +144,6 @@ Force full duplex operation. Force half duplex operation. .El .Pp -The -.Nm -driver also supports one special link option for 1000baseTX cards: -.Bl -tag -width ".Cm link0" -.It Cm link0 -With 1000baseTX cards, establishing a link between two ports requires -that one port be configured as a master and the other a slave. -With autonegotiation, -the master/slave settings will be chosen automatically. -However when manually selecting the link state, it is necessary to -force one side of the link to be a master and the other a slave. -The -.Nm -driver configures the ports as slaves by default. -Setting the -.Cm link0 -flag with -.Xr ifconfig 8 -will set a port as a master instead. -.El -.Pp For more information on configuring this device, see .Xr ifconfig 8 . .Sh HARDWARE Modified: projects/binutils-2.17/share/man/man4/msk.4 ============================================================================== --- projects/binutils-2.17/share/man/man4/msk.4 Thu Nov 25 18:34:42 2010 (r215829) +++ projects/binutils-2.17/share/man/man4/msk.4 Thu Nov 25 18:36:44 2010 (r215830) @@ -24,7 +24,7 @@ .\" .\" $FreeBSD$ .\" -.Dd April 30, 2010 +.Dd November 23, 2010 .Dt MSK 4 .Os .Sh NAME @@ -125,27 +125,6 @@ Force full duplex operation. Force half duplex operation. .El .Pp -The -.Nm -driver also supports one special link option for 1000baseTX cards: -.Bl -tag -width ".Cm link0" -.It Cm link0 -With 1000baseTX cards, establishing a link between two ports requires -that one port is configured as master and the other one as slave. -With autonegotiation, -the master/slave settings will be chosen automatically. -However when manually selecting the link state, it is necessary to -force one side of the link to be a master and the other a slave. -The -.Nm -driver configures the ports as slaves by default. -Setting the -.Cm link0 -flag with -.Xr ifconfig 8 -will set a port as a master instead. -.El -.Pp For more information on configuring this device, see .Xr ifconfig 8 . .Sh HARDWARE Modified: projects/binutils-2.17/share/man/man4/nge.4 ============================================================================== --- projects/binutils-2.17/share/man/man4/nge.4 Thu Nov 25 18:34:42 2010 (r215829) +++ projects/binutils-2.17/share/man/man4/nge.4 Thu Nov 25 18:36:44 2010 (r215830) @@ -31,7 +31,7 @@ .\" .\" $FreeBSD$ .\" -.Dd May 21, 2009 +.Dd November 23, 2010 .Dt NGE 4 .Os .Sh NAME @@ -131,27 +131,6 @@ Force full duplex operation. Force half duplex operation. .El .Pp -The -.Nm -driver also supports one special link option for 1000baseTX cards: -.Bl -tag -width link0 -.It Cm link0 -With 1000baseTX cards, establishing a link between two ports requires -that one port be configured as a master and the other a slave. -With autonegotiation, -the master/slave settings will be chosen automatically. -However when manually selecting the link state, it is necessary to -force one side of the link to be a master and the other a slave. -The -.Nm -driver configures the ports as slaves by default. -Setting the -.Cm link0 -flag with -.Xr ifconfig 8 -will set a port as a master instead. -.El -.Pp For more information on configuring this device, see .Xr ifconfig 8 . .Sh HARDWARE Modified: projects/binutils-2.17/share/man/man4/sk.4 ============================================================================== --- projects/binutils-2.17/share/man/man4/sk.4 Thu Nov 25 18:34:42 2010 (r215829) +++ projects/binutils-2.17/share/man/man4/sk.4 Thu Nov 25 18:36:44 2010 (r215830) @@ -30,7 +30,7 @@ .\" .\" $FreeBSD$ .\" -.Dd January 23, 2009 +.Dd November 23, 2010 .Dt SK 4 .Os .Sh NAME @@ -132,27 +132,6 @@ Force full duplex operation Force half duplex operation. .El .Pp -The -.Nm -driver also supports one special link option for 1000baseTX cards: -.Bl -tag -width xxxxxxxxxxxxxxxxxxxx -.It link0 -With 1000baseTX cards, establishing a link between two ports requires -that one port is configured as master and the other one as slave. -With autonegotiation, -the master/slave settings will be chosen automatically. -However when manually selecting the link state, it is necessary to -force one side of the link to be a master and the other a slave. -The -.Nm -driver configures the ports as slaves by default. -Setting the -.Ar link0 -flag with -.Xr ifconfig 8 -will set a port as a master instead. -.El -.Pp For more information on configuring this device, see .Xr ifconfig 8 . .Sh HARDWARE Modified: projects/binutils-2.17/share/man/man4/stge.4 ============================================================================== --- projects/binutils-2.17/share/man/man4/stge.4 Thu Nov 25 18:34:42 2010 (r215829) +++ projects/binutils-2.17/share/man/man4/stge.4 Thu Nov 25 18:36:44 2010 (r215830) @@ -29,7 +29,7 @@ .\" .\" $FreeBSD$ .\" -.Dd July 25, 2006 +.Dd November 23, 2010 .Dt STGE 4 .Os .Sh NAME @@ -129,27 +129,6 @@ Force full duplex operation. Force half duplex operation. .El .Pp -The -.Nm -driver also supports one special link option for 1000baseTX cards: -.Bl -tag -width ".Cm link0" -.It Cm link0 -With 1000baseTX cards, establishing a link between two ports requires -that one port is configured as master and the other one as slave. -With autonegotiation, -the master/slave settings will be chosen automatically. -However when manually selecting the link state, it is necessary to -force one side of the link to be a master and the other a slave. -The -.Nm -driver configures the ports as slaves by default. -Setting the -.Cm link0 -flag with -.Xr ifconfig 8 -will set a port as a master instead. -.El -.Pp For more information on configuring this device, see .Xr ifconfig 8 . .Sh HARDWARE Modified: projects/binutils-2.17/share/man/man4/vge.4 ============================================================================== --- projects/binutils-2.17/share/man/man4/vge.4 Thu Nov 25 18:34:42 2010 (r215829) +++ projects/binutils-2.17/share/man/man4/vge.4 Thu Nov 25 18:36:44 2010 (r215830) @@ -30,7 +30,7 @@ .\" .\" $FreeBSD$ .\" -.Dd December 18, 2009 +.Dd November 23, 2010 .Dt VGE 4 .Os .Sh NAME @@ -137,27 +137,6 @@ Force full duplex operation. Force half duplex operation. .El .Pp -The -.Nm -driver also supports one special link option for 1000baseTX cards: -.Bl -tag -width ".Cm link0" -.It Cm link0 -With 1000baseTX cards, establishing a link between two ports requires -that one port be configured as a master and the other a slave. -With autonegotiation, -the master/slave settings will be chosen automatically. -However when manually selecting the link state, it is necessary to -force one side of the link to be a master and the other a slave. -The -.Nm -driver configures the ports as slaves by default. -Setting the -.Cm link0 -flag with -.Xr ifconfig 8 -will set a port as a master instead. -.El -.Pp For more information on configuring this device, see .Xr ifconfig 8 . .Sh HARDWARE Modified: projects/binutils-2.17/share/man/man5/rc.conf.5 ============================================================================== --- projects/binutils-2.17/share/man/man5/rc.conf.5 Thu Nov 25 18:34:42 2010 (r215829) +++ projects/binutils-2.17/share/man/man5/rc.conf.5 Thu Nov 25 18:36:44 2010 (r215830) @@ -24,7 +24,7 @@ .\" .\" $FreeBSD$ .\" -.Dd November 13, 2010 +.Dd November 24, 2010 .Dt RC.CONF 5 .Os .Sh NAME @@ -1575,6 +1575,17 @@ If set to .Pa /etc/rc.d/zfs will attempt to automatically mount ZFS file systems and initialize ZFS volumes (ZVOLs). +.It Va gptboot_enable +.Pq Vt bool +If set to +.Dq Li YES , +.Pa /etc/rc.d/gptboot +will log if the system successfully (or not) booted from a GPT partition, +which had the +.Ar bootonce +attribute set using +.Xr gpart 8 +utility. .It Va gbde_autoattach_all .Pq Vt bool If set to Modified: projects/binutils-2.17/share/man/man9/vrele.9 ============================================================================== --- projects/binutils-2.17/share/man/man9/vrele.9 Thu Nov 25 18:34:42 2010 (r215829) +++ projects/binutils-2.17/share/man/man9/vrele.9 Thu Nov 25 18:36:44 2010 (r215830) @@ -29,7 +29,7 @@ .\" .\" $FreeBSD$ .\" -.Dd October 17, 2010 +.Dd November 20, 2010 .Dt VRELE 9 .Os .Sh NAME @@ -74,10 +74,6 @@ with less overhead. The .Fn vunref function takes a locked vnode as argument, and returns with the vnode locked. -Nonetheless, the -.Fn vunref -might drop the vnode lock during the operation, so caller should not expect -that non-doomed vnode is still non-doomed after the function returned. .Pp Any code in the system which signified its use of a vnode by usecount should call one of the listed function to decrement use counter. Modified: projects/binutils-2.17/share/misc/bsd-family-tree ============================================================================== --- projects/binutils-2.17/share/misc/bsd-family-tree Thu Nov 25 18:34:42 2010 (r215829) +++ projects/binutils-2.17/share/misc/bsd-family-tree Thu Nov 25 18:36:44 2010 (r215830) @@ -228,20 +228,20 @@ FreeBSD 5.2 | | | FreeBSD 7.1 | | | | | | | | | DragonFly 2.2.0 | FreeBSD 7.2 | NetBSD 5.0 OpenBSD 4.5 | - | \ | | | | - | | | | | DragonFly 2.4.0 - | | | | OpenBSD 4.6 | - | | | | | | - *--FreeBSD | | | | | - | 8.0 | | | | | - | | FreeBSD | | | | - | | 7.3 | | | DragonFly 2.6.0 - | | | | OpenBSD 4.7 | - | FreeBSD | | | | - | 8.1 | | | | - | | | | | DragonFly 2.8.0 - | | | | OpenBSD 4.8 | - | V | | | | + | \ | | | | | + | | | | | | DragonFly 2.4.0 + | | | | | OpenBSD 4.6 | + | | | | | | | + *--FreeBSD | | | | | | + | 8.0 | | | | | | + | | FreeBSD | | | | | + | | 7.3 | | | | DragonFly 2.6.0 + | | | | | OpenBSD 4.7 | + | FreeBSD | | | | | + | 8.1 | | | | | + | | | | | | DragonFly 2.8.0 + | | | | | OpenBSD 4.8 | + | V | | NetBSD 5.1 | | | | | | | FreeBSD 9 -current | NetBSD -current OpenBSD -current | | | | | | @@ -523,6 +523,7 @@ OpenBSD 4.7 2010-05-19 [OBD] FreeBSD 8.1 2010-07-24 [FBD] DragonFly 2.8.0 2010-10-30 [DFB] OpenBSD 4.8 2010-11-01 [OBD] +NetBSD 5.1 2010-11-19 [NBD] Bibliography ------------------------ Modified: projects/binutils-2.17/sys/amd64/acpica/acpi_switch.S ============================================================================== --- projects/binutils-2.17/sys/amd64/acpica/acpi_switch.S Thu Nov 25 18:34:42 2010 (r215829) +++ projects/binutils-2.17/sys/amd64/acpica/acpi_switch.S Thu Nov 25 18:36:44 2010 (r215830) @@ -76,12 +76,6 @@ ENTRY(acpi_restorecpu) movl WAKEUP_CTX(efer), %eax wrmsr - /* Restore PAT. */ - movl $MSR_PAT, %ecx - movl WAKEUP_CTX(pat), %eax - movl 4 + WAKEUP_CTX(pat), %edx - wrmsr - /* Restore fast syscall stuff. */ movl $MSR_STAR, %ecx movl WAKEUP_CTX(star), %eax Modified: projects/binutils-2.17/sys/amd64/acpica/acpi_wakecode.S ============================================================================== --- projects/binutils-2.17/sys/amd64/acpica/acpi_wakecode.S Thu Nov 25 18:34:42 2010 (r215829) +++ projects/binutils-2.17/sys/amd64/acpica/acpi_wakecode.S Thu Nov 25 18:36:44 2010 (r215830) @@ -274,8 +274,6 @@ wakeup_gdt: ALIGN_DATA wakeup_efer: .quad 0 -wakeup_pat: - .quad 0 wakeup_star: .quad 0 wakeup_lstar: Modified: projects/binutils-2.17/sys/amd64/acpica/acpi_wakeup.c ============================================================================== --- projects/binutils-2.17/sys/amd64/acpica/acpi_wakeup.c Thu Nov 25 18:34:42 2010 (r215829) +++ projects/binutils-2.17/sys/amd64/acpica/acpi_wakeup.c Thu Nov 25 18:36:44 2010 (r215830) @@ -278,6 +278,7 @@ acpi_sleep_machdep(struct acpi_softc *sc for (;;) ia32_pause(); } else { + pmap_init_pat(); PCPU_SET(switchtime, 0); PCPU_SET(switchticks, ticks); #ifdef SMP @@ -372,7 +373,6 @@ acpi_install_wakeup_handler(struct acpi_ WAKECODE_FIXUP(wakeup_ctx, vm_offset_t, WAKECODE_VADDR(sc) + wakeup_ctx); WAKECODE_FIXUP(wakeup_efer, uint64_t, rdmsr(MSR_EFER)); - WAKECODE_FIXUP(wakeup_pat, uint64_t, rdmsr(MSR_PAT)); WAKECODE_FIXUP(wakeup_star, uint64_t, rdmsr(MSR_STAR)); WAKECODE_FIXUP(wakeup_lstar, uint64_t, rdmsr(MSR_LSTAR)); WAKECODE_FIXUP(wakeup_cstar, uint64_t, rdmsr(MSR_CSTAR)); Modified: projects/binutils-2.17/sys/amd64/amd64/cpu_switch.S ============================================================================== --- projects/binutils-2.17/sys/amd64/amd64/cpu_switch.S Thu Nov 25 18:34:42 2010 (r215829) +++ projects/binutils-2.17/sys/amd64/amd64/cpu_switch.S Thu Nov 25 18:36:44 2010 (r215830) @@ -276,7 +276,7 @@ load_dr: do_tss: movq %rdx,PCPU(TSSP) movq %rdx,%rcx movq PCPU(TSS),%rax - movw %rcx,2(%rax) + movw %cx,2(%rax) shrq $16,%rcx movb %cl,4(%rax) shrq $8,%rcx Modified: projects/binutils-2.17/sys/amd64/amd64/mp_machdep.c ============================================================================== --- projects/binutils-2.17/sys/amd64/amd64/mp_machdep.c Thu Nov 25 18:34:42 2010 (r215829) +++ projects/binutils-2.17/sys/amd64/amd64/mp_machdep.c Thu Nov 25 18:36:44 2010 (r215830) @@ -1410,6 +1410,7 @@ cpususpend_handler(void) wbinvd(); atomic_set_int(&stopped_cpus, cpumask); } else { + pmap_init_pat(); PCPU_SET(switchtime, 0); PCPU_SET(switchticks, ticks); } Modified: projects/binutils-2.17/sys/amd64/amd64/pmap.c ============================================================================== --- projects/binutils-2.17/sys/amd64/amd64/pmap.c Thu Nov 25 18:34:42 2010 (r215829) +++ projects/binutils-2.17/sys/amd64/amd64/pmap.c Thu Nov 25 18:36:44 2010 (r215830) @@ -183,8 +183,7 @@ pt_entry_t pg_nx; SYSCTL_NODE(_vm, OID_AUTO, pmap, CTLFLAG_RD, 0, "VM/pmap parameters"); static int pat_works = 1; -TUNABLE_INT("vm.pmap.pat_works", &pat_works); -SYSCTL_INT(_vm_pmap, OID_AUTO, pat_works, CTLFLAG_RDTUN, &pat_works, 1, +SYSCTL_INT(_vm_pmap, OID_AUTO, pat_works, CTLFLAG_RD, &pat_works, 1, "Is page attribute table fully functional?"); static int pg_ps_enabled = 1; Modified: projects/binutils-2.17/sys/amd64/include/specialreg.h ============================================================================== --- projects/binutils-2.17/sys/amd64/include/specialreg.h Thu Nov 25 18:34:42 2010 (r215829) +++ projects/binutils-2.17/sys/amd64/include/specialreg.h Thu Nov 25 18:36:44 2010 (r215830) @@ -136,6 +136,15 @@ #define CPUID2_AESNI 0x02000000 /* + * Important bits in the Thermal and Power Management flags + * CPUID.6 EAX and ECX. + */ +#define CPUTPM1_SENSOR 0x00000001 +#define CPUTPM1_TURBO 0x00000002 +#define CPUTPM1_ARAT 0x00000004 +#define CPUTPM2_EFFREQ 0x00000001 + +/* * Important bits in the AMD extended cpuid flags */ #define AMDID_SYSCALL 0x00000800 Modified: projects/binutils-2.17/sys/boot/common/load_elf.c ============================================================================== --- projects/binutils-2.17/sys/boot/common/load_elf.c Thu Nov 25 18:34:42 2010 (r215829) +++ projects/binutils-2.17/sys/boot/common/load_elf.c Thu Nov 25 18:36:44 2010 (r215830) @@ -453,7 +453,8 @@ __elfN(loadimage)(struct preloaded_file } result = archsw.arch_readin(ef->fd, lastaddr, shdr[i].sh_size); if (result < 0 || (size_t)result != shdr[i].sh_size) { - printf("\nelf" __XSTRING(__ELF_WORD_SIZE) "_loadimage: could not read symbols - skipped!"); + printf("\nelf" __XSTRING(__ELF_WORD_SIZE) "_loadimage: could not read symbols - skipped! (%ju != %ju)", (uintmax_t)result, + (uintmax_t)shdr[i].sh_size); lastaddr = ssym; ssym = 0; goto nosyms; Modified: projects/binutils-2.17/sys/compat/freebsd32/freebsd32_misc.c ============================================================================== --- projects/binutils-2.17/sys/compat/freebsd32/freebsd32_misc.c Thu Nov 25 18:34:42 2010 (r215829) +++ projects/binutils-2.17/sys/compat/freebsd32/freebsd32_misc.c Thu Nov 25 18:36:44 2010 (r215830) @@ -2365,7 +2365,8 @@ freebsd32_nmount(struct thread *td, * Filter out MNT_ROOTFS. We do not want clients of nmount() in * userspace to set this flag, but we must filter it out if we want * MNT_UPDATE on the root file system to work. - * MNT_ROOTFS should only be set in the kernel in vfs_mountroot_try(). + * MNT_ROOTFS should only be set by the kernel when mounting its + * root file system. */ uap->flags &= ~MNT_ROOTFS; Modified: projects/binutils-2.17/sys/compat/ia32/ia32_signal.h ============================================================================== --- projects/binutils-2.17/sys/compat/ia32/ia32_signal.h Thu Nov 25 18:34:42 2010 (r215829) +++ projects/binutils-2.17/sys/compat/ia32/ia32_signal.h Thu Nov 25 18:36:44 2010 (r215830) @@ -29,6 +29,9 @@ * $FreeBSD$ */ +#ifndef _COMPAT_IA32_IA32_SIGNAL_H +#define _COMPAT_IA32_IA32_SIGNAL_H + struct ia32_mcontext { u_int32_t mc_onstack; /* XXX - sigcontext compat. */ u_int32_t mc_gs; /* machine state (struct trapframe) */ @@ -188,3 +191,5 @@ extern int sz_freebsd4_ia32_sigcode; extern void ia32_sendsig(sig_t, struct ksiginfo *, sigset_t *); extern void ia32_setregs(struct thread *td, struct image_params *imgp, u_long stack); + +#endif Modified: projects/binutils-2.17/sys/compat/ia32/ia32_util.h ============================================================================== --- projects/binutils-2.17/sys/compat/ia32/ia32_util.h Thu Nov 25 18:34:42 2010 (r215829) +++ projects/binutils-2.17/sys/compat/ia32/ia32_util.h Thu Nov 25 18:36:44 2010 (r215830) @@ -28,6 +28,9 @@ * $FreeBSD$ */ +#ifndef _COMPAT_IA32_IA32_UTIL_H +#define _COMPAT_IA32_IA32_UTIL_H + #include #include #include @@ -51,3 +54,5 @@ struct syscall_args; int ia32_fetch_syscall_args(struct thread *td, struct syscall_args *sa); void ia32_set_syscall_retval(struct thread *, int); + +#endif Modified: projects/binutils-2.17/sys/compat/ndis/ntoskrnl_var.h ============================================================================== --- projects/binutils-2.17/sys/compat/ndis/ntoskrnl_var.h Thu Nov 25 18:34:42 2010 (r215829) +++ projects/binutils-2.17/sys/compat/ndis/ntoskrnl_var.h Thu Nov 25 18:36:44 2010 (r215830) @@ -1282,6 +1282,7 @@ typedef struct driver_object driver_obje #define STATUS_PENDING 0x00000103 #define STATUS_FAILURE 0xC0000001 #define STATUS_NOT_IMPLEMENTED 0xC0000002 +#define STATUS_ACCESS_VIOLATION 0xC0000005 #define STATUS_INVALID_PARAMETER 0xC000000D #define STATUS_INVALID_DEVICE_REQUEST 0xC0000010 #define STATUS_MORE_PROCESSING_REQUIRED 0xC0000016 Modified: projects/binutils-2.17/sys/compat/ndis/subr_ndis.c ============================================================================== --- projects/binutils-2.17/sys/compat/ndis/subr_ndis.c Thu Nov 25 18:34:42 2010 (r215829) +++ projects/binutils-2.17/sys/compat/ndis/subr_ndis.c Thu Nov 25 18:36:44 2010 (r215830) @@ -254,6 +254,7 @@ static uint8_t void *, void *); static void NdisGetCurrentSystemTime(uint64_t *); static void NdisGetSystemUpTime(uint32_t *); +static uint32_t NdisGetVersion(void); static void NdisInitializeString(unicode_string *, char *); static void NdisInitAnsiString(ansi_string *, char *); static void NdisInitUnicodeString(unicode_string *, uint16_t *); @@ -274,6 +275,7 @@ static void NdisMapFile(ndis_status *, v static void NdisUnmapFile(ndis_handle); static void NdisCloseFile(ndis_handle); static uint8_t NdisSystemProcessorCount(void); +static void NdisGetCurrentProcessorCounts(uint32_t *, uint32_t *, uint32_t *); static void NdisMIndicateStatusComplete(ndis_handle); static void NdisMIndicateStatus(ndis_handle, ndis_status, void *, uint32_t); @@ -2067,6 +2069,12 @@ NdisInterlockedDecrement(addend) return (*addend); } +static uint32_t +NdisGetVersion(void) +{ + return (0x00050001); +} + static void NdisInitializeEvent(event) ndis_event *event; @@ -2950,6 +2958,20 @@ NdisSystemProcessorCount() return (mp_ncpus); } +static void +NdisGetCurrentProcessorCounts(idle_count, kernel_and_user, index) + uint32_t *idle_count; + uint32_t *kernel_and_user; + uint32_t *index; +{ + struct pcpu *pcpu; + + pcpu = pcpu_find(curthread->td_oncpu); + *index = pcpu->pc_cpuid; + *idle_count = pcpu->pc_cp_time[CP_IDLE]; + *kernel_and_user = pcpu->pc_cp_time[CP_INTR]; +} + typedef void (*ndis_statusdone_handler)(ndis_handle); typedef void (*ndis_status_handler)(ndis_handle, ndis_status, void *, uint32_t); @@ -3207,6 +3229,7 @@ image_patch_table ndis_functbl[] = { IMPORT_SFUNC(NdisMIndicateStatusComplete, 1), IMPORT_SFUNC(NdisMIndicateStatus, 4), IMPORT_SFUNC(NdisSystemProcessorCount, 0), + IMPORT_SFUNC(NdisGetCurrentProcessorCounts, 3), IMPORT_SFUNC(NdisUnchainBufferAtBack, 2), IMPORT_SFUNC(NdisGetFirstBufferFromPacket, 5), IMPORT_SFUNC(NdisGetFirstBufferFromPacketSafe, 6), @@ -3224,6 +3247,7 @@ image_patch_table ndis_functbl[] = { IMPORT_SFUNC(NdisFreeString, 1), IMPORT_SFUNC(NdisGetCurrentSystemTime, 1), IMPORT_SFUNC(NdisGetSystemUpTime, 1), + IMPORT_SFUNC(NdisGetVersion, 0), IMPORT_SFUNC(NdisMSynchronizeWithInterrupt, 3), IMPORT_SFUNC(NdisMAllocateSharedMemoryAsync, 4), IMPORT_SFUNC(NdisInterlockedInsertHeadList, 3), Modified: projects/binutils-2.17/sys/compat/ndis/subr_ntoskrnl.c ============================================================================== --- projects/binutils-2.17/sys/compat/ndis/subr_ntoskrnl.c Thu Nov 25 18:34:42 2010 (r215829) +++ projects/binutils-2.17/sys/compat/ndis/subr_ntoskrnl.c Thu Nov 25 18:36:44 2010 (r215830) @@ -128,6 +128,7 @@ static kspin_lock ntoskrnl_intlock; static uint8_t RtlEqualUnicodeString(unicode_string *, unicode_string *, uint8_t); +static void RtlCopyString(ansi_string *, const ansi_string *); static void RtlCopyUnicodeString(unicode_string *, unicode_string *); static irp *IoBuildSynchronousFsdRequest(uint32_t, device_object *, @@ -180,7 +181,9 @@ static uint64_t _aullrem(uint64_t, uint6 static uint64_t _aullshr(uint64_t, uint8_t); static uint64_t _aullshl(uint64_t, uint8_t); static slist_entry *ntoskrnl_pushsl(slist_header *, slist_entry *); +static void InitializeSListHead(slist_header *); static slist_entry *ntoskrnl_popsl(slist_header *); +static void ExFreePoolWithTag(void *, uint32_t); static void ExInitializePagedLookasideList(paged_lookaside_list *, lookaside_alloc_func *, lookaside_free_func *, uint32_t, size_t, uint32_t, uint16_t); @@ -210,6 +213,10 @@ static void *MmMapLockedPagesSpecifyCach static void MmUnmapLockedPages(void *, mdl *); static device_t ntoskrnl_finddev(device_t, uint64_t, struct resource **); static void RtlZeroMemory(void *, size_t); +static void RtlSecureZeroMemory(void *, size_t); +static void RtlFillMemory(void *, size_t, uint8_t); +static void RtlMoveMemory(void *, const void *, size_t); +static ndis_status RtlCharToInteger(const char *, uint32_t, uint32_t *); static void RtlCopyMemory(void *, const void *, size_t); static size_t RtlCompareMemory(const void *, const void *, size_t); static ndis_status RtlUnicodeStringToInteger(unicode_string *, @@ -538,6 +545,20 @@ RtlEqualUnicodeString(unicode_string *st } static void +RtlCopyString(dst, src) + ansi_string *dst; + const ansi_string *src; +{ + if (src != NULL && src->as_buf != NULL && dst->as_buf != NULL) { + dst->as_len = min(src->as_len, dst->as_maxlen); + memcpy(dst->as_buf, src->as_buf, dst->as_len); + if (dst->as_len < dst->as_maxlen) + dst->as_buf[dst->as_len] = 0; + } else + dst->as_len = 0; +} + +static void RtlCopyUnicodeString(dest, src) unicode_string *dest; unicode_string *src; @@ -650,6 +671,14 @@ ExAllocatePoolWithTag(pooltype, len, tag return (buf); } +static void +ExFreePoolWithTag(buf, tag) + void *buf; + uint32_t tag; +{ + ExFreePool(buf); +} + void ExFreePool(buf) void *buf; @@ -2056,6 +2085,13 @@ ntoskrnl_pushsl(head, entry) return (oldhead); } +static void +InitializeSListHead(head) + slist_header *head; +{ + memset(head, 0, sizeof(*head)); +} + static slist_entry * *** DIFF OUTPUT TRUNCATED AT 1000 LINES *** From owner-svn-src-projects@FreeBSD.ORG Fri Nov 26 05:29:19 2010 Return-Path: Delivered-To: svn-src-projects@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id C553E1065670; Fri, 26 Nov 2010 05:29:19 +0000 (UTC) (envelope-from pho@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id A7DAD8FC0C; Fri, 26 Nov 2010 05:29:19 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id oAQ5TJIX028799; Fri, 26 Nov 2010 05:29:19 GMT (envelope-from pho@svn.freebsd.org) Received: (from pho@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id oAQ5TJJW028796; Fri, 26 Nov 2010 05:29:19 GMT (envelope-from pho@svn.freebsd.org) Message-Id: <201011260529.oAQ5TJJW028796@svn.freebsd.org> From: Peter Holm Date: Fri, 26 Nov 2010 05:29:19 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org X-SVN-Group: projects MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r215853 - projects/stress2/misc X-BeenThere: svn-src-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "SVN commit messages for the src " projects" tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 26 Nov 2010 05:29:19 -0000 Author: pho Date: Fri Nov 26 05:29:19 2010 New Revision: 215853 URL: http://svn.freebsd.org/changeset/base/215853 Log: Vnode reference leak tests added. Added: projects/stress2/misc/vunref.sh (contents, props changed) projects/stress2/misc/vunref2.sh (contents, props changed) Added: projects/stress2/misc/vunref.sh ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ projects/stress2/misc/vunref.sh Fri Nov 26 05:29:19 2010 (r215853) @@ -0,0 +1,225 @@ +#!/bin/sh + +# +# Copyright (c) 2010 Peter Holm +# All rights reserved. +# +# Redistribution and use in source and binary forms, with or without +# modification, are permitted provided that the following conditions +# are met: +# 1. Redistributions of source code must retain the above copyright +# notice, this list of conditions and the following disclaimer. +# 2. Redistributions in binary form must reproduce the above copyright +# notice, this list of conditions and the following disclaimer in the +# documentation and/or other materials provided with the distribution. +# +# THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND +# ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE +# IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE +# ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE +# FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL +# DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS +# OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) +# HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT +# LIABILITY, OR TORT (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: projects/stress2/misc/umountf4.sh 197027 2009-09-09 10:13:56Z pho $ +# + +# Vnode reference leak test scenario by kib@. +# Will fail with "umount: unmount of /mnt5 failed: Device busy" +# vnode leak not seen on HEAD. + +[ `id -u ` -ne 0 ] && echo "Must be root!" && exit 1 + +. ../default.cfg +here=`pwd` +mounts=2 # Number of parallel scripts +D=$diskimage + +[ -d "$RUNDIR" ] || mkdir $RUNDIR +cd $RUNDIR + +if [ $# -eq 0 ]; then + sed '1,/^EOF/d' < $here/$0 > vunref.c + cc -o vunref -Wall -Wextra -O2 vunref.c + rm -f vunref.c + cd $here + + rm -f $RUNDIR/active.* + for i in `jot $mounts`; do + m=$(( i + mdstart - 1 )) + [ ! -d ${mntpoint}$m ] && mkdir ${mntpoint}$m + mount | grep "$mntpoint" | grep -q md$m && umount -f ${mntpoint}$m + mdconfig -l | grep -q md$m && mdconfig -d -u $m + + dede $D.$m 1m 10 + mdconfig -a -t vnode -f $D.$m -u $m + bsdlabel -w md$m auto + newfs md${m}$part > /dev/null 2>&1 + done + + # start the parallel tests + for i in `jot $mounts`; do + m=$((i + mdstart - 1)) + $0 mmap $m & + sleep 0.2 + $0 $m & + done + + sleep 2 + + while [ ! -z "`ls $RUNDIR/active.* 2>/dev/null`" ] ; do + ../testcases/swap/swap -t 2m -i 20 + done + + for i in `jot $mounts`; do + wait; wait + done + + for i in `jot $mounts`; do + m=$((i + mdstart - 1)) + mdconfig -d -u $m + rm -f $D$m + done + rm -f $RUNDIR/vunref $RUNDIR/active.* $diskimage.* ${mntpoint}*/p* + +else + if [ $1 = mmap ]; then + touch $RUNDIR/active.$2 + for i in `jot 500`; do + cd ${mntpoint}$2 + $RUNDIR/vunref > /dev/null 2>&1 + cd / + [ -f $RUNDIR/active.$2 ] || exit + sleep 0.1 + done + rm -f $RUNDIR/active.$2 + else + # The test: Parallel mount and unmounts + m=$1 + mount $opt /dev/md${m}$part ${mntpoint}$m + while [ -f $RUNDIR/active.$m ] ; do + sleep 0.1 + n=0 + while mount | grep -qw $mntpoint$m; do + umount ${mntpoint}$m > /dev/null 2>&1 && n=0 + n=$((n + 1)) + if [ $n -gt 600 ]; then + echo "*** Leak detected ***" + fstat $mntpoint$m + rm -f $RUNDIR/active.* + exit 1 + fi + sleep 0.1 + done + mount $opt /dev/md${m}$part ${mntpoint}$m + done + mount | grep "$mntpoint" | grep -q md$m && umount ${mntpoint}$m + fi +fi +exit +EOF +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include + +#define INPUTFILE "/bin/date" + +int +test(void) +{ + int i; + pid_t pid; + char file[128]; + int fdin, fdout; + char *src, *dst; + struct stat statbuf; + + pid = getpid(); + for (i = 0; i < 100; i++) { + sprintf(file,"p%05d.%05d", pid, i); + + if ((fdin = open(INPUTFILE, O_RDONLY)) < 0) + err(1, INPUTFILE); + + if ((fdout = open(file, O_RDWR | O_CREAT | O_TRUNC, 0600)) < 0) + err(1, "%s", file); + + if (fstat(fdin, &statbuf) < 0) + err(1, "fstat error"); + + if (lseek(fdout, statbuf.st_size - 1, SEEK_SET) == -1) + err(1, "lseek error"); + + /* write a dummy byte at the last location */ + if (write(fdout, "", 1) != 1) + err(1, "write error"); + + if ((src = mmap(0, statbuf.st_size, PROT_READ, MAP_SHARED, fdin, 0)) == + (caddr_t) - 1) + err(1, "mmap error for input"); + + if ((dst = mmap(0, statbuf.st_size, PROT_READ | PROT_WRITE, + MAP_SHARED, fdout, 0)) == (caddr_t) - 1) + err(1, "mmap error for output"); + + memcpy(dst, src, statbuf.st_size); + + + if (munmap(src, statbuf.st_size) == -1) + err(1, "munmap"); + close(fdin); + + if (munmap(dst, statbuf.st_size) == -1) + err(1, "munmap"); + close(fdout); + + if (unlink(file) == -1) + err(3, "unlink(%s)", file); + } + + + return (0); +} + +int +main() +{ + int i; + char path[MAXPATHLEN+1]; + struct statfs buf; + + if (getcwd(path, sizeof(path)) == NULL) + err(1, "getcwd()"); + + if (statfs(path, &buf) < 0) + err(1, "statfs(%s)", path); + + if (!strcmp(buf.f_mntonname, "/")) + return (1); + + for (i = 0; i < 2; i++) { + if (fork() == 0) + test(); + } + for (i = 0; i < 2; i++) + wait(NULL); + + return (0); +} Added: projects/stress2/misc/vunref2.sh ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ projects/stress2/misc/vunref2.sh Fri Nov 26 05:29:19 2010 (r215853) @@ -0,0 +1,74 @@ +#!/bin/sh + +# +# Copyright (c) 2010 Peter Holm +# All rights reserved. +# +# Redistribution and use in source and binary forms, with or without +# modification, are permitted provided that the following conditions +# are met: +# 1. Redistributions of source code must retain the above copyright +# notice, this list of conditions and the following disclaimer. +# 2. Redistributions in binary form must reproduce the above copyright +# notice, this list of conditions and the following disclaimer in the +# documentation and/or other materials provided with the distribution. +# +# THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND +# ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE +# IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE +# ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE +# FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL +# DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS +# OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) +# HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT +# LIABILITY, OR TORT (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: projects/stress2/misc/umountf4.sh 197027 2009-09-09 10:13:56Z pho $ +# + +# Vnode reference leak test scenario. +# Will fail with "umount: unmount of /mnt5 failed: Device busy" +# vnode leak not seen on HEAD. + +[ `id -u ` -ne 0 ] && echo "Must be root!" && exit 1 + +. ../default.cfg + +mount | grep "${mntpoint}" | grep -q md${mdstart}${part} && umount -f $mntpoint +mdconfig -l | grep -q md$mdstart && mdconfig -d -u $mdstart + +mdconfig -a -t swap -s 12m -u $mdstart +bsdlabel -w md$mdstart auto +newfs -U md${mdstart}${part} > /dev/null +mount /dev/md${mdstart}${part} $mntpoint +chmod 777 ${mntpoint} + +export runRUNTIME=5m +export LOAD=100 +export swapLOAD=100 +export RUNDIR=${mntpoint}/stressX + +for i in `jot 10`; do + su $testuser -c "\ + cd ..; testcases/run/run testcases/mmap/mmap testcases/swap/swap + " + + sync;sync;sync + sleep 5 + n=0 + while mount | grep -qw $mntpoint; do + umount ${mntpoint} > /dev/null 2>&1 || sleep 0.1 + n=$((n + 1)) + if [ $n -gt 25 ]; then + echo "*** Leak detected ***" + fstat $mntpoint + exit 1 + fi + done + mount /dev/md${mdstart}${part} $mntpoint +done + +umount $mntpoint +mdconfig -d -u $mdstart