Date: Tue, 2 Apr 2013 07:28:14 +0000 (UTC) From: Alexander Motin <mav@FreeBSD.org> To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r249003 - in projects/camlock: . bin/setfacl bin/sh cddl/contrib/opensolaris/cmd/dtrace/test/cmd/jdtrace cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/usdt cddl/contrib/opensolari... Message-ID: <201304020728.r327SEQh095972@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: mav Date: Tue Apr 2 07:28:14 2013 New Revision: 249003 URL: http://svnweb.freebsd.org/changeset/base/249003 Log: MFC @r249002 Added: projects/camlock/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/usdt/tst.noreap.ksh - copied unchanged from r249002, head/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/usdt/tst.noreap.ksh projects/camlock/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/usdt/tst.noreapring.ksh - copied unchanged from r249002, head/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/usdt/tst.noreapring.ksh projects/camlock/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/usdt/tst.reap.ksh - copied unchanged from r249002, head/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/usdt/tst.reap.ksh Modified: projects/camlock/Makefile projects/camlock/Makefile.inc1 projects/camlock/bin/setfacl/setfacl.1 projects/camlock/bin/sh/exec.c projects/camlock/bin/sh/expand.c projects/camlock/bin/sh/input.c projects/camlock/bin/sh/input.h projects/camlock/bin/sh/jobs.c projects/camlock/bin/sh/main.c projects/camlock/bin/sh/memalloc.c projects/camlock/bin/sh/memalloc.h projects/camlock/bin/sh/parser.c projects/camlock/bin/sh/parser.h projects/camlock/bin/sh/trap.c projects/camlock/cddl/contrib/opensolaris/cmd/dtrace/test/cmd/jdtrace/exception.lst projects/camlock/cddl/contrib/opensolaris/tools/ctf/cvt/input.c projects/camlock/contrib/libarchive/libarchive/archive_write_disk_posix.c projects/camlock/contrib/libarchive/libarchive/test/test_extattr_freebsd.c projects/camlock/crypto/openssh/umac128.c projects/camlock/etc/mtree/BSD.usr.dist projects/camlock/lib/libc/gen/wordexp.c projects/camlock/lib/libc/sys/extattr_get_file.2 projects/camlock/sys/amd64/vmm/intel/vmx.c projects/camlock/sys/amd64/vmm/io/vlapic.c projects/camlock/sys/amd64/vmm/vmm_stat.c projects/camlock/sys/amd64/vmm/vmm_stat.h projects/camlock/sys/arm/arm/locore.S projects/camlock/sys/arm/at91/at91rm9200.c projects/camlock/sys/arm/at91/uart_dev_at91usart.c projects/camlock/sys/arm/s3c2xx0/uart_dev_s3c2410.c projects/camlock/sys/arm/sa11x0/uart_dev_sa1110.c projects/camlock/sys/boot/arm/uboot/start.S projects/camlock/sys/boot/fdt/fdt_loader_cmd.c projects/camlock/sys/cam/scsi/scsi_all.c projects/camlock/sys/cam/scsi/scsi_all.h projects/camlock/sys/cddl/contrib/opensolaris/uts/common/dtrace/dtrace.c projects/camlock/sys/cddl/contrib/opensolaris/uts/common/dtrace/fasttrap.c projects/camlock/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zvol.c projects/camlock/sys/cddl/contrib/opensolaris/uts/common/sys/dtrace_impl.h projects/camlock/sys/compat/freebsd32/freebsd32_proto.h projects/camlock/sys/compat/freebsd32/freebsd32_syscall.h projects/camlock/sys/compat/freebsd32/freebsd32_syscalls.c projects/camlock/sys/compat/freebsd32/freebsd32_sysent.c projects/camlock/sys/compat/freebsd32/freebsd32_systrace_args.c projects/camlock/sys/compat/freebsd32/syscalls.master projects/camlock/sys/compat/linux/linux_file.c projects/camlock/sys/conf/NOTES projects/camlock/sys/dev/ath/if_ath.c projects/camlock/sys/dev/ath/if_ath_misc.h projects/camlock/sys/dev/ath/if_ath_rx.c projects/camlock/sys/dev/ath/if_ath_rx_edma.c projects/camlock/sys/dev/ath/if_ath_tx.c projects/camlock/sys/dev/bge/if_bge.c projects/camlock/sys/dev/nvd/nvd.c projects/camlock/sys/dev/nvme/nvme.h projects/camlock/sys/dev/nvme/nvme_ns.c projects/camlock/sys/dev/nvme/nvme_ns_cmd.c projects/camlock/sys/dev/nvme/nvme_private.h projects/camlock/sys/dev/nvme/nvme_qpair.c projects/camlock/sys/dev/tws/tws_cam.c projects/camlock/sys/dev/tws/tws_user.c projects/camlock/sys/dev/uart/uart_core.c projects/camlock/sys/dev/uart/uart_dev_imx.c projects/camlock/sys/dev/uart/uart_dev_pl011.c projects/camlock/sys/dev/uart/uart_dev_quicc.c projects/camlock/sys/dev/uart/uart_dev_sab82532.c projects/camlock/sys/dev/uart/uart_dev_z8530.c projects/camlock/sys/fs/nfsclient/nfs_clbio.c projects/camlock/sys/kern/init_sysent.c projects/camlock/sys/kern/sys_pipe.c projects/camlock/sys/kern/syscalls.c projects/camlock/sys/kern/syscalls.master projects/camlock/sys/kern/systrace_args.c projects/camlock/sys/kern/vfs_extattr.c projects/camlock/sys/kern/vfs_lookup.c projects/camlock/sys/kern/vfs_vnops.c projects/camlock/sys/mips/adm5120/uart_dev_adm5120.c projects/camlock/sys/mips/rt305x/uart_dev_rt305x.c projects/camlock/sys/modules/dtrace/dtrace/Makefile projects/camlock/sys/netinet/sctp_constants.h projects/camlock/sys/netpfil/ipfw/ip_fw_sockopt.c projects/camlock/sys/sparc64/pci/sbbc.c projects/camlock/sys/sys/extattr.h projects/camlock/sys/sys/socket.h projects/camlock/sys/sys/syscall.h projects/camlock/sys/sys/syscall.mk projects/camlock/sys/sys/syscallsubr.h projects/camlock/sys/sys/sysproto.h projects/camlock/sys/x86/x86/busdma_machdep.c projects/camlock/tools/regression/lib/libc/gen/test-wordexp.c projects/camlock/usr.sbin/bhyvectl/bhyvectl.c projects/camlock/usr.sbin/extattr/rmextattr.c Directory Properties: projects/camlock/ (props changed) projects/camlock/cddl/ (props changed) projects/camlock/cddl/contrib/opensolaris/ (props changed) projects/camlock/contrib/libarchive/ (props changed) projects/camlock/contrib/libarchive/libarchive/ (props changed) projects/camlock/crypto/openssh/ (props changed) projects/camlock/lib/libc/ (props changed) projects/camlock/sys/ (props changed) projects/camlock/sys/amd64/vmm/ (props changed) projects/camlock/sys/boot/ (props changed) projects/camlock/sys/cddl/contrib/opensolaris/ (props changed) projects/camlock/sys/conf/ (props changed) projects/camlock/usr.sbin/bhyvectl/ (props changed) Modified: projects/camlock/Makefile ============================================================================== --- projects/camlock/Makefile Tue Apr 2 06:49:44 2013 (r249002) +++ projects/camlock/Makefile Tue Apr 2 07:28:14 2013 (r249003) @@ -392,6 +392,14 @@ universe_${target}_${target_arch}: unive .endfor .endif .if !defined(MAKE_JUST_WORLDS) +# If we are building world and kernels wait for the required worlds to finish +.if !defined(MAKE_JUST_KERNELS) +.for target_arch in ${TARGET_ARCHES_${target}} +universe_${target}_kernels: universe_${target}_${target_arch} +.endfor +.endif +universe_${target}: universe_${target}_kernels +universe_${target}_kernels: universe_${target}_prologue .if exists(${KERNSRCDIR}/${target}/conf/NOTES) @(cd ${KERNSRCDIR}/${target}/conf && env __MAKE_CONF=/dev/null \ ${MAKE} LINT > ${.CURDIR}/_.${target}.makeLINT 2>&1 || \ Modified: projects/camlock/Makefile.inc1 ============================================================================== --- projects/camlock/Makefile.inc1 Tue Apr 2 06:49:44 2013 (r249002) +++ projects/camlock/Makefile.inc1 Tue Apr 2 07:28:14 2013 (r249003) @@ -1743,13 +1743,15 @@ XDTP=/usr/${XDDIR} CDBENV=MAKEOBJDIRPREFIX=${MAKEOBJDIRPREFIX}/${XDDIR} \ INSTALL="sh ${.CURDIR}/tools/install.sh" CDENV= ${CDBENV} \ - _SHLIBDIRPREFIX=${XDTP} \ - TOOLS_PREFIX=${XDTP} -CD2ENV=${CDENV} \ + _SHLIBDIRPREFIX=${XDDESTDIR} \ + TOOLS_PREFIX=${XDDESTDIR} +CD2CFLAGS=-isystem ${XDDESTDIR}/usr/include -L${XDDESTDIR}/usr/lib \ + -B${XDDESTDIR}/usr/lib +CD2ENV=${CDENV} CC="${CC} ${CD2CFLAGS}" \ MACHINE=${XDEV} MACHINE_ARCH=${XDEV_ARCH} -CDTMP= ${MAKEOBJDIRPREFIX}/${XDEV}/${.CURDIR}/tmp -CDMAKE=${CDENV} ${MAKE} ${NOFUN} +CDTMP= ${MAKEOBJDIRPREFIX}/${XDDIR}/${.CURDIR}/tmp +CDMAKE=${CDENV} PATH=${CDTMP}/usr/bin:${PATH} ${MAKE} ${NOFUN} CD2MAKE=${CD2ENV} PATH=${CDTMP}/usr/bin:${XDTP}/usr/bin:${PATH} ${MAKE} ${NOFUN} XDDESTDIR=${DESTDIR}${XDTP} .if !defined(OSREL) @@ -1759,8 +1761,24 @@ OSREL!= uname -r | sed -e 's/[-(].*//' .ORDER: xdev-build xdev-install xdev: xdev-build xdev-install -.ORDER: _xb-build-tools _xb-cross-tools -xdev-build: _xb-build-tools _xb-cross-tools +.ORDER: _xb-worldtmp _xb-bootstrap-tools _xb-build-tools _xb-cross-tools +xdev-build: _xb-worldtmp _xb-bootstrap-tools _xb-build-tools _xb-cross-tools + +_xb-worldtmp: + mkdir -p ${CDTMP}/usr + mtree -deU -f ${.CURDIR}/etc/mtree/BSD.usr.dist \ + -p ${CDTMP}/usr >/dev/null + +_xb-bootstrap-tools: +.for _tool in \ + ${_clang_tblgen} + ${_+_}@${ECHODIR} "===> ${_tool} (obj,depend,all,install)"; \ + cd ${.CURDIR}/${_tool}; \ + ${CDMAKE} DIRPRFX=${_tool}/ obj; \ + ${CDMAKE} DIRPRFX=${_tool}/ depend; \ + ${CDMAKE} DIRPRFX=${_tool}/ all; \ + ${CDMAKE} DIRPRFX=${_tool}/ DESTDIR=${CDTMP} install +.endfor _xb-build-tools: ${_+_}@cd ${.CURDIR}; \ @@ -1770,7 +1788,9 @@ _xb-cross-tools: .for _tool in \ gnu/usr.bin/binutils \ gnu/usr.bin/cc \ - usr.bin/ar + usr.bin/ar \ + ${_clang_libs} \ + ${_clang} ${_+_}@${ECHODIR} "===> xdev ${_tool} (obj,depend,all)"; \ cd ${.CURDIR}/${_tool}; \ ${CDMAKE} DIRPRFX=${_tool}/ obj; \ @@ -1796,7 +1816,8 @@ _xi-cross-tools: .for _tool in \ gnu/usr.bin/binutils \ gnu/usr.bin/cc \ - usr.bin/ar + usr.bin/ar \ + ${_clang} ${_+_}@${ECHODIR} "===> xdev ${_tool} (install)"; \ cd ${.CURDIR}/${_tool}; \ ${CDMAKE} DIRPRFX=${_tool}/ install DESTDIR=${XDDESTDIR} Modified: projects/camlock/bin/setfacl/setfacl.1 ============================================================================== --- projects/camlock/bin/setfacl/setfacl.1 Tue Apr 2 06:49:44 2013 (r249002) +++ projects/camlock/bin/setfacl/setfacl.1 Tue Apr 2 07:28:14 2013 (r249003) @@ -26,7 +26,7 @@ .\" .\" $FreeBSD$ .\" -.Dd February 8, 2013 +.Dd April 1, 2013 .Dt SETFACL 1 .Os .Sh NAME @@ -401,6 +401,10 @@ NFSv4 ACL entries are evaluated in their .Pp Multiple ACL entries specified on the command line are separated by commas. +.Pp +Note that the file owner is always granted the read_acl, write_acl, +read_attributes, and write_attributes permissions, even if the ACL +would deny it. .Sh EXIT STATUS .Ex -std .Sh EXAMPLES Modified: projects/camlock/bin/sh/exec.c ============================================================================== --- projects/camlock/bin/sh/exec.c Tue Apr 2 06:49:44 2013 (r249002) +++ projects/camlock/bin/sh/exec.c Tue Apr 2 07:28:14 2013 (r249003) @@ -165,7 +165,7 @@ tryexec(char *cmd, char **argv, char **e } } *argv = cmd; - *--argv = _PATH_BSHELL; + *--argv = __DECONST(char *, _PATH_BSHELL); execve(_PATH_BSHELL, argv, envp); } errno = e; @@ -188,7 +188,7 @@ padvance(const char **path, const char * { const char *p, *start; char *q; - int len; + size_t len; if (*path == NULL) return NULL; Modified: projects/camlock/bin/sh/expand.c ============================================================================== --- projects/camlock/bin/sh/expand.c Tue Apr 2 06:49:44 2013 (r249002) +++ projects/camlock/bin/sh/expand.c Tue Apr 2 07:28:14 2013 (r249003) @@ -460,7 +460,7 @@ expbackq(union node *cmd, int quoted, in int startloc = dest - stackblock(); char const *syntax = quoted? DQSYNTAX : BASESYNTAX; int quotes = flag & (EXP_FULL | EXP_CASE | EXP_REDIR); - int nnl; + size_t nnl; INTOFF; saveifs = ifsfirst; @@ -1163,9 +1163,9 @@ nometa: static void expmeta(char *enddir, char *name) { - char *p; - char *q; - char *start; + const char *p; + const char *q; + const char *start; char *endname; int metaflag; struct stat statb; @@ -1229,7 +1229,7 @@ expmeta(char *enddir, char *name) addfname(expdir); return; } - endname = p; + endname = name + (p - name); if (start != name) { p = name; while (p < start) { @@ -1412,7 +1412,8 @@ match_charclass(const char *p, wchar_t c *end = NULL; p++; nameend = strstr(p, ":]"); - if (nameend == NULL || nameend - p >= sizeof(name) || nameend == p) + if (nameend == NULL || (size_t)(nameend - p) >= sizeof(name) || + nameend == p) return 0; memcpy(name, p, nameend - p); name[nameend - p] = '\0'; Modified: projects/camlock/bin/sh/input.c ============================================================================== --- projects/camlock/bin/sh/input.c Tue Apr 2 06:49:44 2013 (r249002) +++ projects/camlock/bin/sh/input.c Tue Apr 2 07:28:14 2013 (r249003) @@ -66,7 +66,7 @@ __FBSDID("$FreeBSD$"); struct strpush { struct strpush *prev; /* preceding string on stack */ - char *prevstring; + const char *prevstring; int prevnleft; int prevlleft; struct alias *ap; /* if push was associated with an alias */ @@ -83,7 +83,7 @@ struct parsefile { int fd; /* file descriptor (or -1 if string) */ int nleft; /* number of chars left in this line */ int lleft; /* number of lines left in this buffer */ - char *nextc; /* next char in buffer */ + const char *nextc; /* next char in buffer */ char *buf; /* input buffer */ struct strpush *strpush; /* for pushing strings at this level */ struct strpush basestrpush; /* so pushing one is fast */ @@ -93,7 +93,7 @@ struct parsefile { int plinno = 1; /* input line number */ int parsenleft; /* copy of parsefile->nleft */ MKINIT int parselleft; /* copy of parsefile->lleft */ -char *parsenextc; /* copy of parsefile->nextc */ +const char *parsenextc; /* copy of parsefile->nextc */ static char basebuf[BUFSIZ + 1];/* buffer for top level input file */ static struct parsefile basepf = { /* top level input file */ .nextc = basebuf, @@ -185,7 +185,7 @@ retry: nr = el_len; if (nr > BUFSIZ) nr = BUFSIZ; - memcpy(parsenextc, rl_cp, nr); + memcpy(parsefile->buf, rl_cp, nr); if (nr != el_len) { el_len -= nr; rl_cp += nr; @@ -194,7 +194,7 @@ retry: } } else #endif - nr = read(parsefile->fd, parsenextc, BUFSIZ); + nr = read(parsefile->fd, parsefile->buf, BUFSIZ); if (nr <= 0) { if (nr < 0) { @@ -252,7 +252,7 @@ again: } } - q = p = parsenextc; + q = p = parsefile->buf + (parsenextc - parsefile->buf); /* delete nul characters */ something = 0; @@ -439,7 +439,7 @@ setinputfd(int fd, int push) */ void -setinputstring(char *string, int push) +setinputstring(const char *string, int push) { INTOFF; if (push) Modified: projects/camlock/bin/sh/input.h ============================================================================== --- projects/camlock/bin/sh/input.h Tue Apr 2 06:49:44 2013 (r249002) +++ projects/camlock/bin/sh/input.h Tue Apr 2 07:28:14 2013 (r249003) @@ -42,7 +42,7 @@ */ extern int plinno; extern int parsenleft; /* number of characters left in input buffer */ -extern char *parsenextc; /* next character in input buffer */ +extern const char *parsenextc; /* next character in input buffer */ struct alias; struct parsefile; @@ -55,7 +55,7 @@ void pungetc(void); void pushstring(char *, int, struct alias *); void setinputfile(const char *, int); void setinputfd(int, int); -void setinputstring(char *, int); +void setinputstring(const char *, int); void popfile(void); struct parsefile *getcurrentfile(void); void popfilesupto(struct parsefile *); Modified: projects/camlock/bin/sh/jobs.c ============================================================================== --- projects/camlock/bin/sh/jobs.c Tue Apr 2 06:49:44 2013 (r249002) +++ projects/camlock/bin/sh/jobs.c Tue Apr 2 07:28:14 2013 (r249003) @@ -668,7 +668,8 @@ makejob(union node *node __unused, int n jobtab = jp; } jp = jobtab + njobs; - for (i = 4 ; --i >= 0 ; jobtab[njobs++].used = 0); + for (i = 4 ; --i >= 0 ; jobtab[njobs++].used = 0) + ; INTON; break; } @@ -1005,7 +1006,7 @@ waitforjob(struct job *jp, int *origstat static void -dummy_handler(int sig) +dummy_handler(int sig __unused) { } Modified: projects/camlock/bin/sh/main.c ============================================================================== --- projects/camlock/bin/sh/main.c Tue Apr 2 06:49:44 2013 (r249002) +++ projects/camlock/bin/sh/main.c Tue Apr 2 07:28:14 2013 (r249003) @@ -80,7 +80,7 @@ struct jmploc main_handler; int localeisutf8, initial_localeisutf8; static void cmdloop(int); -static void read_profile(char *); +static void read_profile(const char *); static char *find_dot_file(char *); /* @@ -239,7 +239,7 @@ cmdloop(int top) */ static void -read_profile(char *name) +read_profile(const char *name) { int fd; const char *expandedname; Modified: projects/camlock/bin/sh/memalloc.c ============================================================================== --- projects/camlock/bin/sh/memalloc.c Tue Apr 2 06:49:44 2013 (r249002) +++ projects/camlock/bin/sh/memalloc.c Tue Apr 2 07:28:14 2013 (r249003) @@ -233,7 +233,8 @@ growstackblock(int min) if (min < stacknleft) min = stacknleft; - if (min >= INT_MAX / 2 - ALIGN(sizeof(struct stack_block))) + if ((unsigned int)min >= + INT_MAX / 2 - ALIGN(sizeof(struct stack_block))) error("Out of space"); min += stacknleft; min += ALIGN(sizeof(struct stack_block)); @@ -327,7 +328,7 @@ makestrspace(int min, char *p) char * -stputbin(const char *data, int len, char *p) +stputbin(const char *data, size_t len, char *p) { CHECKSTRSPACE(len, p); memcpy(p, data, len); Modified: projects/camlock/bin/sh/memalloc.h ============================================================================== --- projects/camlock/bin/sh/memalloc.h Tue Apr 2 06:49:44 2013 (r249002) +++ projects/camlock/bin/sh/memalloc.h Tue Apr 2 07:28:14 2013 (r249003) @@ -57,7 +57,7 @@ void setstackmark(struct stackmark *); void popstackmark(struct stackmark *); char *growstackstr(void); char *makestrspace(int, char *); -char *stputbin(const char *data, int len, char *p); +char *stputbin(const char *data, size_t len, char *p); char *stputs(const char *data, char *p); @@ -67,7 +67,7 @@ char *stputs(const char *data, char *p); #define grabstackblock(n) stalloc(n) #define STARTSTACKSTR(p) p = stackblock() #define STPUTC(c, p) do { if (p == sstrend) p = growstackstr(); *p++ = (c); } while(0) -#define CHECKSTRSPACE(n, p) { if (sstrend - p < n) p = makestrspace(n, p); } +#define CHECKSTRSPACE(n, p) { if ((size_t)(sstrend - p) < n) p = makestrspace(n, p); } #define USTPUTC(c, p) (*p++ = (c)) /* * STACKSTRNUL's use is where we want to be able to turn a stack Modified: projects/camlock/bin/sh/parser.c ============================================================================== --- projects/camlock/bin/sh/parser.c Tue Apr 2 06:49:44 2013 (r249002) +++ projects/camlock/bin/sh/parser.c Tue Apr 2 07:28:14 2013 (r249003) @@ -119,7 +119,7 @@ static void parseheredoc(void); static int peektoken(void); static int readtoken(void); static int xxreadtoken(void); -static int readtoken1(int, char const *, char *, int); +static int readtoken1(int, const char *, const char *, int); static int noexpand(char *); static void synexpect(int) __dead2; static void synerror(const char *) __dead2; @@ -983,7 +983,7 @@ parsebackq(char *out, struct nodelist ** char *volatile str; struct jmploc jmploc; struct jmploc *const savehandler = handler; - int savelen; + size_t savelen; int saveprompt; const int bq_startlinno = plinno; char *volatile ostr = NULL; @@ -1300,7 +1300,8 @@ readcstyleesc(char *out) #define PARSEARITH() {goto parsearith; parsearith_return:;} static int -readtoken1(int firstc, char const *initialsyntax, char *eofmark, int striptabs) +readtoken1(int firstc, char const *initialsyntax, const char *eofmark, + int striptabs) { int c = firstc; char *out; @@ -1521,7 +1522,7 @@ checkend: { } if (c == *eofmark) { if (pfgets(line, sizeof line) != NULL) { - char *p, *q; + const char *p, *q; p = line; for (q = eofmark + 1 ; *q && *p == *q ; p++, q++); @@ -2038,7 +2039,7 @@ getprompt(void *unused __unused) const char * -expandstr(char *ps) +expandstr(const char *ps) { union node n; struct jmploc jmploc; Modified: projects/camlock/bin/sh/parser.h ============================================================================== --- projects/camlock/bin/sh/parser.h Tue Apr 2 06:49:44 2013 (r249002) +++ projects/camlock/bin/sh/parser.h Tue Apr 2 07:28:14 2013 (r249003) @@ -82,4 +82,4 @@ void fixredir(union node *, const char * int goodname(const char *); int isassignment(const char *); char *getprompt(void *); -const char *expandstr(char *); +const char *expandstr(const char *); Modified: projects/camlock/bin/sh/trap.c ============================================================================== --- projects/camlock/bin/sh/trap.c Tue Apr 2 06:49:44 2013 (r249002) +++ projects/camlock/bin/sh/trap.c Tue Apr 2 07:28:14 2013 (r249003) @@ -150,7 +150,7 @@ printsignals(void) * The trap builtin. */ int -trapcmd(int argc, char **argv) +trapcmd(int argc __unused, char **argv) { char *action; int signo; Modified: projects/camlock/cddl/contrib/opensolaris/cmd/dtrace/test/cmd/jdtrace/exception.lst ============================================================================== --- projects/camlock/cddl/contrib/opensolaris/cmd/dtrace/test/cmd/jdtrace/exception.lst Tue Apr 2 06:49:44 2013 (r249002) +++ projects/camlock/cddl/contrib/opensolaris/cmd/dtrace/test/cmd/jdtrace/exception.lst Tue Apr 2 07:28:14 2013 (r249003) @@ -23,7 +23,6 @@ # Copyright 2008 Sun Microsystems, Inc. All rights reserved. # Use is subject to license terms. # -# ident "%Z%%M% %I% %E% SMI" # Exception list: names tests that are bypassed when running in Java # mode (relative to /opt/SUNWdtrt/tst) @@ -52,14 +51,17 @@ common/usdt/tst.enabled.ksh common/usdt/tst.enabled2.ksh common/usdt/tst.entryreturn.ksh common/usdt/tst.fork.ksh -common/usdt/tst.header.ksh common/usdt/tst.guess32.ksh common/usdt/tst.guess64.ksh +common/usdt/tst.header.ksh common/usdt/tst.linkpriv.ksh common/usdt/tst.linkunpriv.ksh common/usdt/tst.multiple.ksh common/usdt/tst.nodtrace.ksh +common/usdt/tst.noreap.ksh +common/usdt/tst.noreapring.ksh common/usdt/tst.onlyenabled.ksh +common/usdt/tst.reap.ksh common/usdt/tst.reeval.ksh common/usdt/tst.static.ksh common/usdt/tst.static2.ksh Copied: projects/camlock/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/usdt/tst.noreap.ksh (from r249002, head/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/usdt/tst.noreap.ksh) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ projects/camlock/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/usdt/tst.noreap.ksh Tue Apr 2 07:28:14 2013 (r249003, copy of r249002, head/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/usdt/tst.noreap.ksh) @@ -0,0 +1,128 @@ +# +# CDDL HEADER START +# +# The contents of this file are subject to the terms of the +# Common Development and Distribution License (the "License"). +# You may not use this file except in compliance with the License. +# +# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE +# or http://www.opensolaris.org/os/licensing. +# See the License for the specific language governing permissions +# and limitations under the License. +# +# When distributing Covered Code, include this CDDL HEADER in each +# file and include the License file at usr/src/OPENSOLARIS.LICENSE. +# If applicable, add the following below this CDDL HEADER, with the +# fields enclosed by brackets "[]" replaced with your own identifying +# information: Portions Copyright [yyyy] [name of copyright owner] +# +# CDDL HEADER END +# + +# +# Copyright (c) 2011, Joyent, Inc. All rights reserved. +# + +if [ $# != 1 ]; then + echo expected one argument: '<'dtrace-path'>' + exit 2 +fi + +dtrace=$1 +DIR=/var/tmp/dtest.$$ + +mkdir $DIR +cd $DIR + +cat > test.c <<EOF +#include <unistd.h> +#include <sys/sdt.h> + +int +main(int argc, char **argv) +{ + DTRACE_PROBE(test_prov, probe1); +} +EOF + +cat > prov.d <<EOF +provider test_prov { + probe probe1(); +}; +EOF + +gcc -c test.c +if [ $? -ne 0 ]; then + print -u2 "failed to compile test.c" + exit 1 +fi +$dtrace -G -32 -s prov.d test.o +if [ $? -ne 0 ]; then + print -u2 "failed to create DOF" + exit 1 +fi +gcc -o test test.o prov.o +if [ $? -ne 0 ]; then + print -u2 "failed to link final executable" + exit 1 +fi + +script() +{ + $dtrace -Zwqs /dev/stdin <<EOF + + BEGIN + { + spec = speculation(); + speculate(spec); + printf("this is speculative!\n"); + } + + test_prov*::: + { + probeid = id; + } + + tick-1sec + /probeid == 0/ + { + printf("launching test\n"); + system("./test"); + } + + tick-1sec + /probeid != 0/ + { + printf("attempting re-enabling\n"); + system("dtrace -e -x errtags -i %d", probeid); + attempts++; + } + + tick-1sec + /attempts > 10/ + { + exit(0); + } +EOF +} + +script 2>&1 | tee test.out + +# +# It should be true that our probe was not reaped after the provider was made +# defunct: the speculative tracing action prevents reaping of any ECB in the +# enabling. +# +status=0 + +if grep D_PDESC_INVAL test.out 2> /dev/null 1>&2 ; then + status=1 +else + grep D_PROC_GRAB test.out 2> /dev/null 1>&2 + status=$? +fi + +cd / +/usr/bin/rm -rf $DIR + +exit $status Copied: projects/camlock/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/usdt/tst.noreapring.ksh (from r249002, head/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/usdt/tst.noreapring.ksh) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ projects/camlock/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/usdt/tst.noreapring.ksh Tue Apr 2 07:28:14 2013 (r249003, copy of r249002, head/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/usdt/tst.noreapring.ksh) @@ -0,0 +1,124 @@ +# +# CDDL HEADER START +# +# The contents of this file are subject to the terms of the +# Common Development and Distribution License (the "License"). +# You may not use this file except in compliance with the License. +# +# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE +# or http://www.opensolaris.org/os/licensing. +# See the License for the specific language governing permissions +# and limitations under the License. +# +# When distributing Covered Code, include this CDDL HEADER in each +# file and include the License file at usr/src/OPENSOLARIS.LICENSE. +# If applicable, add the following below this CDDL HEADER, with the +# fields enclosed by brackets "[]" replaced with your own identifying +# information: Portions Copyright [yyyy] [name of copyright owner] +# +# CDDL HEADER END +# + +# +# Copyright (c) 2011, Joyent, Inc. All rights reserved. +# + +if [ $# != 1 ]; then + echo expected one argument: '<'dtrace-path'>' + exit 2 +fi + +dtrace=$1 +DIR=/var/tmp/dtest.$$ + +mkdir $DIR +cd $DIR + +cat > test.c <<EOF +#include <unistd.h> +#include <sys/sdt.h> + +int +main(int argc, char **argv) +{ + DTRACE_PROBE(test_prov, probe1); +} +EOF + +cat > prov.d <<EOF +provider test_prov { + probe probe1(); +}; +EOF + +gcc -c test.c +if [ $? -ne 0 ]; then + print -u2 "failed to compile test.c" + exit 1 +fi +$dtrace -G -32 -s prov.d test.o +if [ $? -ne 0 ]; then + print -u2 "failed to create DOF" + exit 1 +fi +gcc -o test test.o prov.o +if [ $? -ne 0 ]; then + print -u2 "failed to link final executable" + exit 1 +fi + +script() +{ + $dtrace -Zwqs /dev/stdin <<EOF + test_prov*::: + { + probeid = id; + } + + tick-1sec + /probeid == 0/ + { + printf("launching test\n"); + system("./test"); + } + + tick-1sec + /probeid != 0/ + { + printf("attempting re-enabling\n"); + system("dtrace -e -x errtags -i %d", probeid); + attempts++; + } + + tick-1sec + /attempts > 10/ + { + exit(0); + } +EOF +} + +$dtrace -x bufpolicy=ring -ZwqP test_prov\* > /dev/null 2>&1 & +background=$! +echo launched ring buffered enabling as pid $background +script 2>&1 | tee test.out + +# +# It should be true that our probe was not reaped after the provider was made +# defunct: the active ring buffer in the earlier enabling prevents reaping of +# any of the earlier enabling's ECBs. +# +status=0 + +if grep D_PDESC_INVAL test.out 2> /dev/null 1>&2 ; then + status=1 +else + grep D_PROC_GRAB test.out 2> /dev/null 1>&2 + status=$? +fi + +kill $background +cd / +/usr/bin/rm -rf $DIR + +exit $status Copied: projects/camlock/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/usdt/tst.reap.ksh (from r249002, head/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/usdt/tst.reap.ksh) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ projects/camlock/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/usdt/tst.reap.ksh Tue Apr 2 07:28:14 2013 (r249003, copy of r249002, head/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/usdt/tst.reap.ksh) @@ -0,0 +1,115 @@ +# +# CDDL HEADER START +# +# The contents of this file are subject to the terms of the +# Common Development and Distribution License (the "License"). +# You may not use this file except in compliance with the License. +# +# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE +# or http://www.opensolaris.org/os/licensing. +# See the License for the specific language governing permissions +# and limitations under the License. +# +# When distributing Covered Code, include this CDDL HEADER in each +# file and include the License file at usr/src/OPENSOLARIS.LICENSE. +# If applicable, add the following below this CDDL HEADER, with the +# fields enclosed by brackets "[]" replaced with your own identifying +# information: Portions Copyright [yyyy] [name of copyright owner] +# +# CDDL HEADER END +# + +# +# Copyright (c) 2011, Joyent, Inc. All rights reserved. +# + +if [ $# != 1 ]; then + echo expected one argument: '<'dtrace-path'>' + exit 2 +fi + +dtrace=$1 +DIR=/var/tmp/dtest.$$ + +mkdir $DIR +cd $DIR + +cat > test.c <<EOF +#include <unistd.h> +#include <sys/sdt.h> + +int +main(int argc, char **argv) +{ + DTRACE_PROBE(test_prov, probe1); +} +EOF + +cat > prov.d <<EOF +provider test_prov { + probe probe1(); +}; +EOF + +gcc -c test.c +if [ $? -ne 0 ]; then + print -u2 "failed to compile test.c" + exit 1 +fi +$dtrace -G -32 -s prov.d test.o +if [ $? -ne 0 ]; then + print -u2 "failed to create DOF" + exit 1 +fi +gcc -o test test.o prov.o +if [ $? -ne 0 ]; then + print -u2 "failed to link final executable" + exit 1 +fi + +script() +{ + $dtrace -Zwqs /dev/stdin <<EOF + test_prov*::: + { + probeid = id; + } + + tick-1sec + /probeid == 0/ + { + printf("launching test\n"); + system("./test"); + } + + tick-1sec + /probeid != 0/ + { + printf("attempting re-enabling\n"); + system("dtrace -e -x errtags -i %d", probeid); + attempts++; + } + + tick-1sec + /attempts > 10/ + { + exit(0); + } +EOF +} + +script 2>&1 | tee test.out + +# +# It should be true that our probe was reaped over the course of the enabling, +# causing the embedded DTrace invocation to fail on an invalid probe (that is, +# D_PDESC_INVAL) instead of an inability to grab the underlying process +# (D_PROC_GRAB). +# +grep D_PDESC_INVAL test.out 2> /dev/null 1>&2 +status=$? + +cd / +/usr/bin/rm -rf $DIR + +exit $status Modified: projects/camlock/cddl/contrib/opensolaris/tools/ctf/cvt/input.c ============================================================================== --- projects/camlock/cddl/contrib/opensolaris/tools/ctf/cvt/input.c Tue Apr 2 06:49:44 2013 (r249002) +++ projects/camlock/cddl/contrib/opensolaris/tools/ctf/cvt/input.c Tue Apr 2 07:28:14 2013 (r249003) @@ -387,6 +387,7 @@ GElf_Sym * symit_next(symit_data_t *si, int type) { GElf_Sym sym; + char *bname; int check_sym = (type == STT_OBJECT || type == STT_FUNC); for (; si->si_next < si->si_nument; si->si_next++) { @@ -394,8 +395,10 @@ symit_next(symit_data_t *si, int type) gelf_getsym(si->si_symd, si->si_next, &sym); si->si_curname = (caddr_t)si->si_strd->d_buf + sym.st_name; - if (GELF_ST_TYPE(sym.st_info) == STT_FILE) - si->si_curfile = si->si_curname; + if (GELF_ST_TYPE(sym.st_info) == STT_FILE) { + bname = strrchr(si->si_curname, '/'); + si->si_curfile = bname == NULL ? si->si_curname : bname + 1; + } if (GELF_ST_TYPE(sym.st_info) != type || sym.st_shndx == SHN_UNDEF) Modified: projects/camlock/contrib/libarchive/libarchive/archive_write_disk_posix.c ============================================================================== --- projects/camlock/contrib/libarchive/libarchive/archive_write_disk_posix.c Tue Apr 2 06:49:44 2013 (r249002) +++ projects/camlock/contrib/libarchive/libarchive/archive_write_disk_posix.c Tue Apr 2 07:28:14 2013 (r249003) @@ -3707,7 +3707,7 @@ set_xattrs(struct archive_write_disk *a) size_t size; archive_entry_xattr_next(entry, &name, &value, &size); if (name != NULL) { - int e; + ssize_t e; int namespace; if (strncmp(name, "user.", 5) == 0) { @@ -3734,7 +3734,7 @@ set_xattrs(struct archive_write_disk *a) e = extattr_set_file(archive_entry_pathname(entry), namespace, name, value, size); } - if (e != (int)size) { + if (e != (ssize_t)size) { if (errno == ENOTSUP || errno == ENOSYS) { if (!warning_done) { warning_done = 1; Modified: projects/camlock/contrib/libarchive/libarchive/test/test_extattr_freebsd.c ============================================================================== --- projects/camlock/contrib/libarchive/libarchive/test/test_extattr_freebsd.c Tue Apr 2 06:49:44 2013 (r249002) +++ projects/camlock/contrib/libarchive/libarchive/test/test_extattr_freebsd.c Tue Apr 2 07:28:14 2013 (r249003) @@ -47,7 +47,8 @@ DEFINE_TEST(test_extattr_freebsd) struct stat st; struct archive *a; struct archive_entry *ae; - int n, fd; + ssize_t n; + int fd; int extattr_privilege_bug = 0; /* Modified: projects/camlock/crypto/openssh/umac128.c ============================================================================== --- projects/camlock/crypto/openssh/umac128.c Tue Apr 2 06:49:44 2013 (r249002) +++ projects/camlock/crypto/openssh/umac128.c Tue Apr 2 07:28:14 2013 (r249003) @@ -1,7 +1,11 @@ /* $FreeBSD$ */ #define UMAC_OUTPUT_LEN 16 +#undef umac_new #define umac_new ssh_umac128_new +#undef umac_update #define umac_update ssh_umac128_update +#undef umac_final #define umac_final ssh_umac128_final +#undef umac_delete #define umac_delete ssh_umac128_delete #include "umac.c" Modified: projects/camlock/etc/mtree/BSD.usr.dist ============================================================================== --- projects/camlock/etc/mtree/BSD.usr.dist Tue Apr 2 06:49:44 2013 (r249002) +++ projects/camlock/etc/mtree/BSD.usr.dist Tue Apr 2 07:28:14 2013 (r249003) @@ -22,14 +22,14 @@ .. engines .. - i18n - .. + i18n + .. .. lib32 - dtrace - .. - i18n - .. + dtrace + .. + i18n + .. .. libdata gcc @@ -40,8 +40,8 @@ .. .. libexec - bsdinstall - .. + bsdinstall + .. lpr ru .. @@ -207,7 +207,7 @@ dtrace toolkit .. - .. + .. examples BSD_daemon .. @@ -330,79 +330,79 @@ fortune .. .. + i18n + csmapper + APPLE + .. + AST + .. + BIG5 + .. + CNS + .. + CP + .. + EBCDIC + .. + GB + .. + GEORGIAN + .. + ISO-8859 + .. + ISO646 + .. + JIS + .. + KAZAKH + .. + KOI + .. + KS + .. + MISC + .. + TCVN + .. + .. + esdb + APPLE + .. + AST + .. + BIG5 + .. + CP + .. + DEC + .. + EBCDIC + .. + EUC + .. + GB + .. + GEORGIAN + .. + ISO-2022 + .. + ISO-8859 + .. + ISO646 + .. + KAZAKH + .. + KOI + .. + MISC + .. + TCVN + .. + UTF + .. + .. + .. *** DIFF OUTPUT TRUNCATED AT 1000 LINES ***
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201304020728.r327SEQh095972>