From owner-svn-src-stable-8@FreeBSD.ORG Sun Aug 31 20:14:23 2014 Return-Path: Delivered-To: svn-src-stable-8@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id EC979752; Sun, 31 Aug 2014 20:14:23 +0000 (UTC) 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)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id BE42613CF; Sun, 31 Aug 2014 20:14:23 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id s7VKENvi043467; Sun, 31 Aug 2014 20:14:23 GMT (envelope-from peter@FreeBSD.org) Received: (from peter@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id s7VKEMXE043461; Sun, 31 Aug 2014 20:14:22 GMT (envelope-from peter@FreeBSD.org) Message-Id: <201408312014.s7VKEMXE043461@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: peter set sender to peter@FreeBSD.org using -f From: Peter Wemm Date: Sun, 31 Aug 2014 20:14:22 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-8@freebsd.org Subject: svn commit: r270887 - in stable/8: share/mk tools/build/mk tools/build/options usr.sbin X-SVN-Group: stable-8 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-stable-8@freebsd.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: SVN commit messages for only the 8-stable src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 31 Aug 2014 20:14:24 -0000 Author: peter Date: Sun Aug 31 20:14:22 2014 New Revision: 270887 URL: http://svnweb.freebsd.org/changeset/base/270887 Log: Backport the separation of the knob that controls the legacy pkg_install tools (ie: WITH/WITHOUT_PKGTOOLS) and the pkg bootstrap tool. Added: stable/8/tools/build/options/WITHOUT_PKGBOOTSTRAP - copied unchanged from r270885, head/tools/build/options/WITHOUT_PKGBOOTSTRAP Modified: stable/8/share/mk/bsd.own.mk stable/8/tools/build/mk/OptionalObsoleteFiles.inc stable/8/usr.sbin/Makefile Modified: stable/8/share/mk/bsd.own.mk ============================================================================== --- stable/8/share/mk/bsd.own.mk Sun Aug 31 20:11:26 2014 (r270886) +++ stable/8/share/mk/bsd.own.mk Sun Aug 31 20:14:22 2014 (r270887) @@ -383,6 +383,7 @@ WITH_IDEA= OPENSSL \ PAM \ PF \ + PKGBOOTSTRAP \ PKGTOOLS \ PMC \ PORTSNAP \ Modified: stable/8/tools/build/mk/OptionalObsoleteFiles.inc ============================================================================== --- stable/8/tools/build/mk/OptionalObsoleteFiles.inc Sun Aug 31 20:11:26 2014 (r270886) +++ stable/8/tools/build/mk/OptionalObsoleteFiles.inc Sun Aug 31 20:14:22 2014 (r270887) @@ -1216,6 +1216,11 @@ OLD_FILES+=usr/share/man/man1/nc.1.gz # to be filled in #.endif +.if ${MK_PKGBOOTSTRAP} == no +OLD_FILES+=usr/sbin/pkg +OLD_FILES+=usr/share/man/man7/pkg.7.gz +.endif + .if ${MK_PKGTOOLS} == no OLD_FILES+=etc/periodic/security/460.chkportsum OLD_FILES+=etc/periodic/weekly/400.status-pkg Copied: stable/8/tools/build/options/WITHOUT_PKGBOOTSTRAP (from r270885, head/tools/build/options/WITHOUT_PKGBOOTSTRAP) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ stable/8/tools/build/options/WITHOUT_PKGBOOTSTRAP Sun Aug 31 20:14:22 2014 (r270887, copy of r270885, head/tools/build/options/WITHOUT_PKGBOOTSTRAP) @@ -0,0 +1,4 @@ +.\" $FreeBSD$ +Set to not build +.Xr pkg 7 +bootstrap tool. Modified: stable/8/usr.sbin/Makefile ============================================================================== --- stable/8/usr.sbin/Makefile Sun Aug 31 20:11:26 2014 (r270886) +++ stable/8/usr.sbin/Makefile Sun Aug 31 20:14:22 2014 (r270887) @@ -361,9 +361,12 @@ _keyserv= keyserv _ftp-proxy= ftp-proxy .endif +.if ${MK_PKGBOOTSTRAP} != "no" +SUBDIR+= pkg +.endif + .if ${MK_PKGTOOLS} != "no" _pkg_install= pkg_install -SUBDIR+= pkg .endif # XXX MK_TOOLCHAIN? From owner-svn-src-stable-8@FreeBSD.ORG Sun Aug 31 20:23:57 2014 Return-Path: Delivered-To: svn-src-stable-8@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 ESMTPS id 00FBBEBE; Sun, 31 Aug 2014 20:23:56 +0000 (UTC) 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)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id DFEF6153E; Sun, 31 Aug 2014 20:23:56 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id s7VKNuFO048715; Sun, 31 Aug 2014 20:23:56 GMT (envelope-from peter@FreeBSD.org) Received: (from peter@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id s7VKNu8x048714; Sun, 31 Aug 2014 20:23:56 GMT (envelope-from peter@FreeBSD.org) Message-Id: <201408312023.s7VKNu8x048714@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: peter set sender to peter@FreeBSD.org using -f From: Peter Wemm Date: Sun, 31 Aug 2014 20:23:56 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-8@freebsd.org Subject: svn commit: r270889 - stable/8/share/man/man5 X-SVN-Group: stable-8 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-stable-8@freebsd.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: SVN commit messages for only the 8-stable src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 31 Aug 2014 20:23:57 -0000 Author: peter Date: Sun Aug 31 20:23:56 2014 New Revision: 270889 URL: http://svnweb.freebsd.org/changeset/base/270889 Log: Regenerate Modified: stable/8/share/man/man5/src.conf.5 Modified: stable/8/share/man/man5/src.conf.5 ============================================================================== --- stable/8/share/man/man5/src.conf.5 Sun Aug 31 20:21:08 2014 (r270888) +++ stable/8/share/man/man5/src.conf.5 Sun Aug 31 20:23:56 2014 (r270889) @@ -1,7 +1,7 @@ .\" DO NOT EDIT-- this file is automatically generated. .\" from FreeBSD: stable/8/tools/build/options/makeman 236431 2012-06-02 02:26:49Z gjb .\" $FreeBSD$ -.Dd March 1, 2013 +.Dd August 31, 2014 .Dt SRC.CONF 5 .Os .Sh NAME @@ -668,7 +668,7 @@ Set to not build Objective C support. .\" from FreeBSD: stable/8/tools/build/options/WITHOUT_OPENSSH 156932 2006-03-21 07:50:50Z ru Set to not build OpenSSH. .It Va WITH_OPENSSH_NONE_CIPHER -.\" $FreeBSD$ +.\" from FreeBSD: stable/8/tools/build/options/WITH_OPENSSH_NONE_CIPHER 247521 2013-03-01 02:06:04Z des Set to include the "None" cipher support in OpenSSH and its libraries. Additional adjustments may need to be done to system configuration files, such as @@ -721,6 +721,11 @@ When set, it also enforces the following .It .Va WITHOUT_AUTHPF .El +.It Va WITHOUT_PKGBOOTSTRAP +.\" from FreeBSD: stable/8/tools/build/options/WITHOUT_PKGBOOTSTRAP 270887 2014-08-31 20:14:22Z peter +Set to not build +.Xr pkg 7 +bootstrap tool. .It Va WITHOUT_PKGTOOLS .\" from FreeBSD: stable/8/tools/build/options/WITHOUT_PKGTOOLS 183242 2008-09-21 22:02:26Z sam Set to not build From owner-svn-src-stable-8@FreeBSD.ORG Mon Sep 1 09:00:01 2014 Return-Path: Delivered-To: svn-src-stable-8@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 ESMTPS id 3221DBE0; Mon, 1 Sep 2014 09:00:01 +0000 (UTC) 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)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 052EE1C44; Mon, 1 Sep 2014 09:00:01 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id s81900KO002125; Mon, 1 Sep 2014 09:00:00 GMT (envelope-from ae@FreeBSD.org) Received: (from ae@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id s81900NX002124; Mon, 1 Sep 2014 09:00:00 GMT (envelope-from ae@FreeBSD.org) Message-Id: <201409010900.s81900NX002124@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: ae set sender to ae@FreeBSD.org using -f From: "Andrey V. Elsukov" Date: Mon, 1 Sep 2014 09:00:00 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-8@freebsd.org Subject: svn commit: r270926 - stable/8/sys/netinet6 X-SVN-Group: stable-8 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-stable-8@freebsd.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: SVN commit messages for only the 8-stable src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 01 Sep 2014 09:00:01 -0000 Author: ae Date: Mon Sep 1 09:00:00 2014 New Revision: 270926 URL: http://svnweb.freebsd.org/changeset/base/270926 Log: MFC r257985: Fix panic with RADIX_MPATH, when RTFREE_LOCKED() called for already unlocked route. Use in6_rtalloc() instead of in6_rtalloc1. This helps simplify the code and remove several now unused variables. PR: 156283 Modified: stable/8/sys/netinet6/nd6_nbr.c Directory Properties: stable/8/sys/ (props changed) stable/8/sys/netinet6/ (props changed) Modified: stable/8/sys/netinet6/nd6_nbr.c ============================================================================== --- stable/8/sys/netinet6/nd6_nbr.c Mon Sep 1 08:34:39 2014 (r270925) +++ stable/8/sys/netinet6/nd6_nbr.c Mon Sep 1 09:00:00 2014 (r270926) @@ -227,41 +227,28 @@ nd6_ns_input(struct mbuf *m, int off, in /* (2) check. */ if (ifa == NULL) { - struct rtentry *rt; - struct sockaddr_in6 tsin6; - int need_proxy; -#ifdef RADIX_MPATH struct route_in6 ro; -#endif + int need_proxy; - bzero(&tsin6, sizeof tsin6); - tsin6.sin6_len = sizeof(struct sockaddr_in6); - tsin6.sin6_family = AF_INET6; - tsin6.sin6_addr = taddr6; + bzero(&ro, sizeof(ro)); + ro.ro_dst.sin6_len = sizeof(struct sockaddr_in6); + ro.ro_dst.sin6_family = AF_INET6; + ro.ro_dst.sin6_addr = taddr6; /* Always use the default FIB. */ #ifdef RADIX_MPATH - bzero(&ro, sizeof(ro)); - ro.ro_dst = tsin6; rtalloc_mpath_fib((struct route *)&ro, RTF_ANNOUNCE, RT_DEFAULT_FIB); - rt = ro.ro_rt; #else - rt = in6_rtalloc1((struct sockaddr *)&tsin6, 0, 0, - RT_DEFAULT_FIB); + in6_rtalloc(&ro, RT_DEFAULT_FIB); #endif - need_proxy = (rt && (rt->rt_flags & RTF_ANNOUNCE) != 0 && - rt->rt_gateway->sa_family == AF_LINK); - if (rt != NULL) { - /* - * Make a copy while we can be sure that rt_gateway - * is still stable before unlocking to avoid lock - * order problems. proxydl will only be used if - * proxy will be set in the next block. - */ + need_proxy = (ro.ro_rt && + (ro.ro_rt->rt_flags & RTF_ANNOUNCE) != 0 && + ro.ro_rt->rt_gateway->sa_family == AF_LINK); + if (ro.ro_rt != NULL) { if (need_proxy) - proxydl = *SDL(rt->rt_gateway); - RTFREE_LOCKED(rt); + proxydl = *SDL(ro.ro_rt->rt_gateway); + RTFREE(ro.ro_rt); } if (need_proxy) { /* From owner-svn-src-stable-8@FreeBSD.ORG Wed Sep 3 11:17:27 2014 Return-Path: Delivered-To: svn-src-stable-8@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id BF969A72; Wed, 3 Sep 2014 11:17:27 +0000 (UTC) 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)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 904F717D3; Wed, 3 Sep 2014 11:17:27 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id s83BHRnw070151; Wed, 3 Sep 2014 11:17:27 GMT (envelope-from ae@FreeBSD.org) Received: (from ae@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id s83BHRoq070150; Wed, 3 Sep 2014 11:17:27 GMT (envelope-from ae@FreeBSD.org) Message-Id: <201409031117.s83BHRoq070150@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: ae set sender to ae@FreeBSD.org using -f From: "Andrey V. Elsukov" Date: Wed, 3 Sep 2014 11:17:27 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-8@freebsd.org Subject: svn commit: r271016 - stable/8/contrib/libarchive/tar X-SVN-Group: stable-8 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-stable-8@freebsd.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: SVN commit messages for only the 8-stable src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 03 Sep 2014 11:17:27 -0000 Author: ae Date: Wed Sep 3 11:17:27 2014 New Revision: 271016 URL: http://svnweb.freebsd.org/changeset/base/271016 Log: MFC r270661: Remove leading '/' from hardlink name when removing them from the regular file name. This fixes the problem, when bsdtar can not create hardlinks to extracted files. Modified: stable/8/contrib/libarchive/tar/util.c Directory Properties: stable/8/contrib/libarchive/tar/ (props changed) Modified: stable/8/contrib/libarchive/tar/util.c ============================================================================== --- stable/8/contrib/libarchive/tar/util.c Wed Sep 3 11:17:11 2014 (r271015) +++ stable/8/contrib/libarchive/tar/util.c Wed Sep 3 11:17:27 2014 (r271016) @@ -349,6 +349,21 @@ strip_components(const char *p, int elem } } +static const char* +strip_leading_slashes(const char *p) +{ + + /* Remove leading "/../", "//", etc. */ + while (p[0] == '/' || p[0] == '\\') { + if (p[1] == '.' && p[2] == '.' && ( + p[3] == '/' || p[3] == '\\')) { + p += 3; /* Remove "/..", leave "/" for next pass. */ + } else + p += 1; /* Remove "/". */ + } + return (p); +} + /* * Handle --strip-components and any future path-rewriting options. * Returns non-zero if the pathname should not be extracted. @@ -453,16 +468,7 @@ edit_pathname(struct bsdtar *bsdtar, str p += 2; slashonly = 0; } - /* Remove leading "/../", "//", etc. */ - while (p[0] == '/' || p[0] == '\\') { - if (p[1] == '.' && p[2] == '.' && - (p[3] == '/' || p[3] == '\\')) { - p += 3; /* Remove "/..", leave "/" - * for next pass. */ - slashonly = 0; - } else - p += 1; /* Remove "/". */ - } + p = strip_leading_slashes(p); } while (rp != p); if (p != name && !bsdtar->warned_lead_slash) { @@ -483,6 +489,19 @@ edit_pathname(struct bsdtar *bsdtar, str name = "."; else name = p; + + p = archive_entry_hardlink(entry); + if (p != NULL) { + rp = strip_leading_slashes(p); + if (rp == '\0') + return (1); + if (rp != p) { + char *linkname = strdup(rp); + + archive_entry_copy_hardlink(entry, linkname); + free(linkname); + } + } } else { /* Strip redundant leading '/' characters. */ while (name[0] == '/' && name[1] == '/') From owner-svn-src-stable-8@FreeBSD.ORG Fri Sep 5 17:22:21 2014 Return-Path: Delivered-To: svn-src-stable-8@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 ESMTPS id 967DF6A0; Fri, 5 Sep 2014 17:22:21 +0000 (UTC) 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)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 66EEF1363; Fri, 5 Sep 2014 17:22:21 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id s85HMLkw028661; Fri, 5 Sep 2014 17:22:21 GMT (envelope-from jhb@FreeBSD.org) Received: (from jhb@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id s85HMLlP028659; Fri, 5 Sep 2014 17:22:21 GMT (envelope-from jhb@FreeBSD.org) Message-Id: <201409051722.s85HMLlP028659@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: jhb set sender to jhb@FreeBSD.org using -f From: John Baldwin Date: Fri, 5 Sep 2014 17:22:21 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-8@freebsd.org Subject: svn commit: r271176 - in stable: 10/usr.bin/ktrace 8/usr.bin/ktrace 9/usr.bin/ktrace X-SVN-Group: stable-8 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-stable-8@freebsd.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: SVN commit messages for only the 8-stable src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 05 Sep 2014 17:22:21 -0000 Author: jhb Date: Fri Sep 5 17:22:20 2014 New Revision: 271176 URL: http://svnweb.freebsd.org/changeset/base/271176 Log: MFC 270674: Clarify that the -c argument clears the list of tracepoints specified by -t (it does not clear all tracepoints). Approved by: re (gjb for 10) Modified: stable/8/usr.bin/ktrace/ktrace.1 Directory Properties: stable/8/usr.bin/ktrace/ (props changed) Changes in other areas also in this revision: Modified: stable/10/usr.bin/ktrace/ktrace.1 stable/9/usr.bin/ktrace/ktrace.1 Directory Properties: stable/10/ (props changed) stable/9/usr.bin/ktrace/ (props changed) Modified: stable/8/usr.bin/ktrace/ktrace.1 ============================================================================== --- stable/8/usr.bin/ktrace/ktrace.1 Fri Sep 5 17:05:51 2014 (r271175) +++ stable/8/usr.bin/ktrace/ktrace.1 Fri Sep 5 17:22:20 2014 (r271176) @@ -32,7 +32,7 @@ .\" @(#)ktrace.1 8.1 (Berkeley) 6/6/93 .\" $FreeBSD$ .\" -.Dd May 31, 2012 +.Dd August 26, 2014 .Dt KTRACE 1 .Os .Sh NAME @@ -85,7 +85,7 @@ Append to the trace file instead of recr Disable tracing on all user-owned processes, and, if executed by root, all processes in the system. .It Fl c -Clear the trace points associated with the specified file or processes. +Clear the specified trace points associated with the given file or processes. .It Fl d Descendants; perform the operation for all current children of the designated processes. @@ -106,8 +106,10 @@ Enable (disable) tracing on the indicate .Fl p flag is permitted). .It Fl t Ar trstr -The string argument represents the kernel trace points, one per letter. -The following table equates the letters with the tracepoints: +Specify the list of trace points to enable or disable, one per letter. +If an explicit list is not specified, the default set of trace points is used. +.Pp +The following trace points are supported: .Pp .Bl -tag -width flag -compact .It Cm c From owner-svn-src-stable-8@FreeBSD.ORG Fri Sep 5 17:44:11 2014 Return-Path: Delivered-To: svn-src-stable-8@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id BDFB8238; Fri, 5 Sep 2014 17:44:11 +0000 (UTC) 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)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id A8D8A173F; Fri, 5 Sep 2014 17:44:11 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id s85HiBlx038489; Fri, 5 Sep 2014 17:44:11 GMT (envelope-from jhb@FreeBSD.org) Received: (from jhb@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id s85HiBSp038488; Fri, 5 Sep 2014 17:44:11 GMT (envelope-from jhb@FreeBSD.org) Message-Id: <201409051744.s85HiBSp038488@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: jhb set sender to jhb@FreeBSD.org using -f From: John Baldwin Date: Fri, 5 Sep 2014 17:44:11 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-8@freebsd.org Subject: svn commit: r271177 - in stable: 10/sbin/gbde 8/sbin/gbde 9/sbin/gbde X-SVN-Group: stable-8 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-stable-8@freebsd.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: SVN commit messages for only the 8-stable src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 05 Sep 2014 17:44:11 -0000 Author: jhb Date: Fri Sep 5 17:44:10 2014 New Revision: 271177 URL: http://svnweb.freebsd.org/changeset/base/271177 Log: MFC 270722: Correct the destroy example. The -n argument is not needed (and is not valid). Approved by: re (gjb for 10) Modified: stable/8/sbin/gbde/gbde.8 Directory Properties: stable/8/sbin/gbde/ (props changed) Changes in other areas also in this revision: Modified: stable/10/sbin/gbde/gbde.8 stable/9/sbin/gbde/gbde.8 Directory Properties: stable/10/ (props changed) stable/9/sbin/gbde/ (props changed) Modified: stable/8/sbin/gbde/gbde.8 ============================================================================== --- stable/8/sbin/gbde/gbde.8 Fri Sep 5 17:22:20 2014 (r271176) +++ stable/8/sbin/gbde/gbde.8 Fri Sep 5 17:44:10 2014 (r271177) @@ -31,7 +31,7 @@ .\" .\" $FreeBSD$ .\" -.Dd February 8, 2006 +.Dd August 27, 2014 .Dt GBDE 8 .Os .Sh NAME @@ -235,7 +235,7 @@ pass-phrase: .Pp To destroy all copies of the masterkey: .Pp -.Dl "gbde destroy ad0s1f -n -1" +.Dl "gbde destroy ad0s1f" .Sh SEE ALSO .Xr gbde 4 , .Xr geom 4