From owner-svn-src-stable-6@FreeBSD.ORG Sun Oct 4 21:50:30 2009 Return-Path: Delivered-To: svn-src-stable-6@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 8749310657C7; Sun, 4 Oct 2009 21:50:30 +0000 (UTC) (envelope-from marcus@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id 756978FC15; Sun, 4 Oct 2009 21:50:30 +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 n94LoU5K086491; Sun, 4 Oct 2009 21:50:30 GMT (envelope-from marcus@svn.freebsd.org) Received: (from marcus@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id n94LoUtM086489; Sun, 4 Oct 2009 21:50:30 GMT (envelope-from marcus@svn.freebsd.org) Message-Id: <200910042150.n94LoUtM086489@svn.freebsd.org> From: Joe Marcus Clarke Date: Sun, 4 Oct 2009 21:50:30 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-6@freebsd.org X-SVN-Group: stable-6 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r197760 - stable/6/lib/libc/gen X-BeenThere: svn-src-stable-6@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: SVN commit messages for only the 6-stable src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 04 Oct 2009 21:50:30 -0000 Author: marcus (doc,ports committer) Date: Sun Oct 4 21:50:29 2009 New Revision: 197760 URL: http://svn.freebsd.org/changeset/base/197760 Log: MFC: rev. 197681 Correct the pthread stub prototype for pthread_mutexattr_settype to allow for the type argument. This is known to fix some pthread_mutexattr_settype() invocations, especially when it comes to pulseaudio. Approved by: kib Modified: stable/6/lib/libc/gen/_pthread_stubs.c Modified: stable/6/lib/libc/gen/_pthread_stubs.c ============================================================================== --- stable/6/lib/libc/gen/_pthread_stubs.c Sun Oct 4 21:48:17 2009 (r197759) +++ stable/6/lib/libc/gen/_pthread_stubs.c Sun Oct 4 21:50:29 2009 (r197760) @@ -188,7 +188,7 @@ STUB_FUNC1(pthread_mutex_trylock, PJT_MU STUB_FUNC1(pthread_mutex_unlock, PJT_MUTEX_UNLOCK, int, void *) STUB_FUNC1(pthread_mutexattr_destroy, PJT_MUTEXATTR_DESTROY, int, void *) STUB_FUNC1(pthread_mutexattr_init, PJT_MUTEXATTR_INIT, int, void *) -STUB_FUNC1(pthread_mutexattr_settype, PJT_MUTEXATTR_SETTYPE, int, void *) +STUB_FUNC2(pthread_mutexattr_settype, PJT_MUTEXATTR_SETTYPE, int, void *, int) STUB_FUNC2(pthread_once, PJT_ONCE, int, void *, void *) STUB_FUNC1(pthread_rwlock_destroy, PJT_RWLOCK_DESTROY, int, void *) STUB_FUNC2(pthread_rwlock_init, PJT_RWLOCK_INIT, int, void *, void *) From owner-svn-src-stable-6@FreeBSD.ORG Tue Oct 6 22:21:53 2009 Return-Path: Delivered-To: svn-src-stable-6@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 7AB7E106568B; Tue, 6 Oct 2009 22:21:53 +0000 (UTC) (envelope-from dougb@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id 4F7E38FC0A; Tue, 6 Oct 2009 22:21: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 n96MLpx5065918; Tue, 6 Oct 2009 22:21:51 GMT (envelope-from dougb@svn.freebsd.org) Received: (from dougb@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id n96MLpru065915; Tue, 6 Oct 2009 22:21:51 GMT (envelope-from dougb@svn.freebsd.org) Message-Id: <200910062221.n96MLpru065915@svn.freebsd.org> From: Doug Barton Date: Tue, 6 Oct 2009 22:21:51 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-6@freebsd.org X-SVN-Group: stable-6 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r197823 - stable/6/usr.bin/whois X-BeenThere: svn-src-stable-6@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: SVN commit messages for only the 6-stable src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 06 Oct 2009 22:21:53 -0000 Author: dougb Date: Tue Oct 6 22:21:51 2009 New Revision: 197823 URL: http://svn.freebsd.org/changeset/base/197823 Log: MFC r197725: The 6bone was decommissioned on 6/6/06, so remove references to it. Modified: stable/6/usr.bin/whois/ (props changed) stable/6/usr.bin/whois/whois.1 stable/6/usr.bin/whois/whois.c Modified: stable/6/usr.bin/whois/whois.1 ============================================================================== --- stable/6/usr.bin/whois/whois.1 Tue Oct 6 22:19:32 2009 (r197822) +++ stable/6/usr.bin/whois/whois.1 Tue Oct 6 22:21:51 2009 (r197823) @@ -32,7 +32,7 @@ .\" From: @(#)whois.1 8.1 (Berkeley) 6/6/93 .\" $FreeBSD$ .\" -.Dd December 11, 2004 +.Dd October 2, 2009 .Dt WHOIS 1 .Os .Sh NAME @@ -40,7 +40,7 @@ .Nd "Internet domain name and network number directory service" .Sh SYNOPSIS .Nm -.Op Fl aAbdfgiIklmQrR6 +.Op Fl aAbdfgiIklmQrR .Op Fl c Ar country-code | Fl h Ar host .Op Fl p Ar port .Ar name ... @@ -211,17 +211,14 @@ This option is deprecated; use the option with an argument of .Qq Li RU instead. -.It Fl 6 -Use the IPv6 Resource Center -.Pq Tn 6bone -database. -It contains network names and addresses for the IPv6 network. -.El .Pp The operands specified to .Nm are treated independently and may be used as queries on different whois servers. +.El +.Sh EXIT STATUS +.Ex -std .Sh EXAMPLES Most types of data, such as domain names and .Tn IP @@ -254,15 +251,6 @@ but other .Tn TLDs can be queried by using a similar syntax.) .Pp -The following example demonstrates how to obtain information about an -.Tn IPv6 -address or hostname using the -.Fl 6 -option, which directs the query to -.Tn 6bone . -.Pp -.Dl "whois -6 IPv6-IP-Address" -.Pp The following example demonstrates how to query a whois server using a non-standard port, where .Dq Li query-data Modified: stable/6/usr.bin/whois/whois.c ============================================================================== --- stable/6/usr.bin/whois/whois.c Tue Oct 6 22:19:32 2009 (r197822) +++ stable/6/usr.bin/whois/whois.c Tue Oct 6 22:21:51 2009 (r197823) @@ -72,7 +72,6 @@ __FBSDID("$FreeBSD$"); #define PNICHOST "whois.apnic.net" #define MNICHOST "whois.ra.net" #define QNICHOST_TAIL ".whois-servers.net" -#define SNICHOST "whois.6bone.net" #define BNICHOST "whois.registro.br" #define NORIDHOST "whois.norid.no" #define IANAHOST "whois.iana.org" @@ -164,8 +163,10 @@ main(int argc, char *argv[]) warnx("-R is deprecated; use '-c ru' instead"); country = "ru"; break; + /* Remove in FreeBSD 10 */ case '6': - host = SNICHOST; + errx(EX_USAGE, + "-6 is deprecated; use -[aAflr] instead"); break; case '?': default: From owner-svn-src-stable-6@FreeBSD.ORG Wed Oct 7 21:05:40 2009 Return-Path: Delivered-To: svn-src-stable-6@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id DB957106568D; Wed, 7 Oct 2009 21:05:40 +0000 (UTC) (envelope-from marcus@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id B0B408FC08; Wed, 7 Oct 2009 21:05:40 +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 n97L5eMi099573; Wed, 7 Oct 2009 21:05:40 GMT (envelope-from marcus@svn.freebsd.org) Received: (from marcus@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id n97L5eZH099572; Wed, 7 Oct 2009 21:05:40 GMT (envelope-from marcus@svn.freebsd.org) Message-Id: <200910072105.n97L5eZH099572@svn.freebsd.org> From: Joe Marcus Clarke Date: Wed, 7 Oct 2009 21:05:40 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-6@freebsd.org X-SVN-Group: stable-6 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r197846 - stable/6/lib/libc X-BeenThere: svn-src-stable-6@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: SVN commit messages for only the 6-stable src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 07 Oct 2009 21:05:41 -0000 Author: marcus (doc,ports committer) Date: Wed Oct 7 21:05:40 2009 New Revision: 197846 URL: http://svn.freebsd.org/changeset/base/197846 Log: Record merginfo data for r197681. Approved by: kib Modified: stable/6/lib/libc/ (props changed)