From owner-svn-src-user@FreeBSD.ORG Tue Sep 3 17:02:41 2013
Return-Path: <owner-svn-src-user@FreeBSD.ORG>
Delivered-To: svn-src-user@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
[IPv6:2001:1900:2254:206a::19:1])
(using TLSv1 with cipher ADH-AES256-SHA (256/256 bits))
(No client certificate requested)
by hub.freebsd.org (Postfix) with ESMTP id 2DA16519;
Tue, 3 Sep 2013 17:02:41 +0000 (UTC)
(envelope-from syuu@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org
[IPv6:2001:1900:2254:2068::e6a:0])
(using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
(No client certificate requested)
by mx1.freebsd.org (Postfix) with ESMTPS id 0CF1D2FBB;
Tue, 3 Sep 2013 17:02:41 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id r83H2ecb071557;
Tue, 3 Sep 2013 17:02:40 GMT (envelope-from syuu@svn.freebsd.org)
Received: (from syuu@localhost)
by svn.freebsd.org (8.14.7/8.14.5/Submit) id r83H2cvo071534;
Tue, 3 Sep 2013 17:02:38 GMT (envelope-from syuu@svn.freebsd.org)
Message-Id: <201309031702.r83H2cvo071534@svn.freebsd.org>
From: Takuya ASADA <syuu@FreeBSD.org>
Date: Tue, 3 Sep 2013 17:02:38 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-user@freebsd.org
Subject: svn commit: r255184 - in user/syuu/mq_bpf: contrib/libexecinfo
contrib/wpa/src/utils lib lib/libexecinfo sbin/ifconfig share/mk
sys/dev/xen/blkback sys/modules/cam sys/modules/send sys/sys usr.bin ...
X-SVN-Group: user
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-user@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: "SVN commit messages for the experimental " user"
src tree" <svn-src-user.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-src-user>,
<mailto:svn-src-user-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-user>
List-Post: <mailto:svn-src-user@freebsd.org>
List-Help: <mailto:svn-src-user-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-user>,
<mailto:svn-src-user-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Tue, 03 Sep 2013 17:02:41 -0000
Author: syuu
Date: Tue Sep 3 17:02:38 2013
New Revision: 255184
URL: http://svnweb.freebsd.org/changeset/base/255184
Log:
sync with head
Modified:
user/syuu/mq_bpf/contrib/libexecinfo/execinfo.h
user/syuu/mq_bpf/contrib/wpa/src/utils/radiotap.h
user/syuu/mq_bpf/lib/Makefile
user/syuu/mq_bpf/lib/libexecinfo/Makefile
user/syuu/mq_bpf/sbin/ifconfig/af_inet.c
user/syuu/mq_bpf/share/mk/bsd.libnames.mk
user/syuu/mq_bpf/sys/dev/xen/blkback/blkback.c
user/syuu/mq_bpf/sys/modules/cam/Makefile
user/syuu/mq_bpf/sys/modules/send/Makefile
user/syuu/mq_bpf/sys/sys/param.h
user/syuu/mq_bpf/usr.bin/Makefile
user/syuu/mq_bpf/usr.sbin/periodic/periodic.sh
Modified: user/syuu/mq_bpf/contrib/libexecinfo/execinfo.h
==============================================================================
--- user/syuu/mq_bpf/contrib/libexecinfo/execinfo.h Tue Sep 3 16:29:14 2013 (r255183)
+++ user/syuu/mq_bpf/contrib/libexecinfo/execinfo.h Tue Sep 3 17:02:38 2013 (r255184)
@@ -1,4 +1,5 @@
/* $NetBSD: execinfo.h,v 1.2 2012/06/09 21:22:17 christos Exp $ */
+/* $FreeBSD: head/contrib/libexecinfo/execinfo.h 255177 2013-09-03 13:38:41Z emaste $ */
/*-
* Copyright (c) 2012 The NetBSD Foundation, Inc.
Modified: user/syuu/mq_bpf/contrib/wpa/src/utils/radiotap.h
==============================================================================
--- user/syuu/mq_bpf/contrib/wpa/src/utils/radiotap.h Tue Sep 3 16:29:14 2013 (r255183)
+++ user/syuu/mq_bpf/contrib/wpa/src/utils/radiotap.h Tue Sep 3 17:02:38 2013 (r255184)
@@ -1,4 +1,4 @@
-/* $FreeBSD: user/syuu/mq_bpf/contrib/wpa/src/utils/radiotap.h 214734 2010-11-03 10:43:38Z rpaulo $ */
+/* $FreeBSD: head/contrib/wpa/src/utils/radiotap.h 214734 2010-11-03 10:43:38Z rpaulo $ */
/* $NetBSD: ieee80211_radiotap.h,v 1.11 2005/06/22 06:16:02 dyoung Exp $ */
/*-
Modified: user/syuu/mq_bpf/lib/Makefile
==============================================================================
--- user/syuu/mq_bpf/lib/Makefile Tue Sep 3 16:29:14 2013 (r255183)
+++ user/syuu/mq_bpf/lib/Makefile Tue Sep 3 17:02:38 2013 (r255184)
@@ -72,6 +72,7 @@ SUBDIR= ${SUBDIR_ORDERED} \
libdwarf \
libedit \
${_libefi} \
+ libexecinfo \
libexpat \
libfetch \
libgeom \
Modified: user/syuu/mq_bpf/lib/libexecinfo/Makefile
==============================================================================
--- user/syuu/mq_bpf/lib/libexecinfo/Makefile Tue Sep 3 16:29:14 2013 (r255183)
+++ user/syuu/mq_bpf/lib/libexecinfo/Makefile Tue Sep 3 17:02:38 2013 (r255184)
@@ -7,7 +7,7 @@ SHLIB_MAJOR= 1
.PATH: ${LIBEXECINFO}
-INCS= execinfo.h symtab.h unwind.h
+INCS= execinfo.h
SRCS= backtrace.c symtab.c unwind.c
DPADD= ${LIBELF}
Modified: user/syuu/mq_bpf/sbin/ifconfig/af_inet.c
==============================================================================
--- user/syuu/mq_bpf/sbin/ifconfig/af_inet.c Tue Sep 3 16:29:14 2013 (r255183)
+++ user/syuu/mq_bpf/sbin/ifconfig/af_inet.c Tue Sep 3 17:02:38 2013 (r255184)
@@ -101,9 +101,7 @@ static struct sockaddr_in *sintab[] = {
static void
in_getaddr(const char *s, int which)
{
-#ifndef MIN
#define MIN(a,b) ((a)<(b)?(a):(b))
-#endif
struct sockaddr_in *sin = sintab[which];
struct hostent *hp;
struct netent *np;
Modified: user/syuu/mq_bpf/share/mk/bsd.libnames.mk
==============================================================================
--- user/syuu/mq_bpf/share/mk/bsd.libnames.mk Tue Sep 3 16:29:14 2013 (r255183)
+++ user/syuu/mq_bpf/share/mk/bsd.libnames.mk Tue Sep 3 17:02:38 2013 (r255184)
@@ -51,6 +51,7 @@ LIBDTRACE?= ${DESTDIR}${LIBDIR}/libdtrac
LIBDWARF?= ${DESTDIR}${LIBDIR}/libdwarf.a
LIBEDIT?= ${DESTDIR}${LIBDIR}/libedit.a
LIBELF?= ${DESTDIR}${LIBDIR}/libelf.a
+LIBEXECINFO?= ${DESTDIR}${LIBDIR}/libexecinfo.a
LIBFETCH?= ${DESTDIR}${LIBDIR}/libfetch.a
LIBFL?= "don't use LIBFL, use LIBL"
LIBFORM?= ${DESTDIR}${LIBDIR}/libform.a
Modified: user/syuu/mq_bpf/sys/dev/xen/blkback/blkback.c
==============================================================================
--- user/syuu/mq_bpf/sys/dev/xen/blkback/blkback.c Tue Sep 3 16:29:14 2013 (r255183)
+++ user/syuu/mq_bpf/sys/dev/xen/blkback/blkback.c Tue Sep 3 17:02:38 2013 (r255184)
@@ -1239,6 +1239,7 @@ xbb_get_resources(struct xbb_softc *xbb,
nreq->reqlist = *reqlist;
nreq->req_ring_idx = ring_idx;
+ nreq->id = ring_req->id;
if (xbb->abi != BLKIF_PROTOCOL_NATIVE) {
bcopy(ring_req, &nreq->ring_req_storage, sizeof(*ring_req));
@@ -1608,7 +1609,6 @@ xbb_dispatch_io(struct xbb_softc *xbb, s
req_ring_idx = nreq->req_ring_idx;
nr_sects = 0;
nseg = ring_req->nr_segments;
- nreq->id = ring_req->id;
nreq->nr_pages = nseg;
nreq->nr_512b_sectors = 0;
req_seg_idx = 0;
Modified: user/syuu/mq_bpf/sys/modules/cam/Makefile
==============================================================================
--- user/syuu/mq_bpf/sys/modules/cam/Makefile Tue Sep 3 16:29:14 2013 (r255183)
+++ user/syuu/mq_bpf/sys/modules/cam/Makefile Tue Sep 3 17:02:38 2013 (r255184)
@@ -13,6 +13,7 @@ SRCS+= opt_scsi.h
SRCS+= opt_cd.h
SRCS+= opt_pt.h
SRCS+= opt_sa.h
+SRCS+= opt_ses.h
SRCS+= device_if.h bus_if.h vnode_if.h
SRCS+= cam.c
SRCS+= cam_compat.c
Modified: user/syuu/mq_bpf/sys/modules/send/Makefile
==============================================================================
--- user/syuu/mq_bpf/sys/modules/send/Makefile Tue Sep 3 16:29:14 2013 (r255183)
+++ user/syuu/mq_bpf/sys/modules/send/Makefile Tue Sep 3 17:02:38 2013 (r255184)
@@ -2,6 +2,6 @@
.PATH: ${.CURDIR}/../../netinet6
KMOD= send
-SRCS= send.c
+SRCS= send.c opt_kdtrace.h
.include <bsd.kmod.mk>
Modified: user/syuu/mq_bpf/sys/sys/param.h
==============================================================================
--- user/syuu/mq_bpf/sys/sys/param.h Tue Sep 3 16:29:14 2013 (r255183)
+++ user/syuu/mq_bpf/sys/sys/param.h Tue Sep 3 17:02:38 2013 (r255184)
@@ -58,7 +58,7 @@
* in the range 5 to 9.
*/
#undef __FreeBSD_version
-#define __FreeBSD_version 1000051 /* Master, propagated to newvers */
+#define __FreeBSD_version 1000052 /* Master, propagated to newvers */
/*
* __FreeBSD_kernel__ indicates that this system uses the kernel of FreeBSD,
Modified: user/syuu/mq_bpf/usr.bin/Makefile
==============================================================================
--- user/syuu/mq_bpf/usr.bin/Makefile Tue Sep 3 16:29:14 2013 (r255183)
+++ user/syuu/mq_bpf/usr.bin/Makefile Tue Sep 3 17:02:38 2013 (r255184)
@@ -112,6 +112,7 @@ SUBDIR= alias \
mkuzip \
mt \
ncal \
+ netstat \
newgrp \
nfsstat \
nice \
Modified: user/syuu/mq_bpf/usr.sbin/periodic/periodic.sh
==============================================================================
--- user/syuu/mq_bpf/usr.sbin/periodic/periodic.sh Tue Sep 3 16:29:14 2013 (r255183)
+++ user/syuu/mq_bpf/usr.sbin/periodic/periodic.sh Tue Sep 3 17:02:38 2013 (r255184)
@@ -21,7 +21,7 @@ output_pipe()
case "$output" in
/*) pipe="cat >>$output";;
"") pipe=cat;;
- *) pipe="mail -E -s '$host ${1##*/} run output' $output";;
+ *) pipe="mail -E -s '$host ${2}${2:+ }${1##*/} run output' $output";;
esac
eval $pipe
}
@@ -53,12 +53,13 @@ if [ $1 != "LOCKED" ]; then
case $? in
0) ;;
73) #EX_CANTCREATE
- echo "can't create ${lockfile}" | output_pipe $arg
+ echo "can't create ${lockfile}" | \
+ output_pipe $arg "$PERIODIC"
ret=1
;;
75) #EX_TEMPFAIL
echo "$host ${arg##*/} prior run still in progress" | \
- output_pipe $arg
+ output_pipe $arg "$PERIODIC"
ret=1
;;
*)
@@ -76,6 +77,7 @@ shift
arg=$1
tmp_output=`mktemp ${TMPDIR:-/tmp}/periodic.XXXXXXXXXX`
+context="$PERIODIC"
export PERIODIC="$arg${PERIODIC:+ }${PERIODIC}"
# Execute each executable file in the directory list. If the x bit is not
@@ -136,6 +138,6 @@ esac
echo ""
echo "-- End of $arg output --"
fi
-} | output_pipe ${arg}
+} | output_pipe $arg "$context"
rm -f $tmp_output