From commits-return-9465-apmail-apr-commits-archive=apr.apache.org@apr.apache.org Fri May 02 17:27:01 2008 Return-Path: Delivered-To: apmail-apr-commits-archive@www.apache.org Received: (qmail 15914 invoked from network); 2 May 2008 17:27:01 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.2) by minotaur.apache.org with SMTP; 2 May 2008 17:27:01 -0000 Received: (qmail 92864 invoked by uid 500); 2 May 2008 17:27:02 -0000 Delivered-To: apmail-apr-commits-archive@apr.apache.org Received: (qmail 92811 invoked by uid 500); 2 May 2008 17:27:02 -0000 Mailing-List: contact commits-help@apr.apache.org; run by ezmlm Precedence: bulk List-Post: List-Help: List-Unsubscribe: Reply-To: dev@apr.apache.org List-Id: Delivered-To: mailing list commits@apr.apache.org Received: (qmail 92800 invoked by uid 99); 2 May 2008 17:27:02 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 02 May 2008 10:27:02 -0700 X-ASF-Spam-Status: No, hits=-2000.0 required=10.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 02 May 2008 17:26:17 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id AB7F52388A22; Fri, 2 May 2008 10:26:37 -0700 (PDT) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r652833 - in /apr/apr/branches/1.2.x: LICENSE NOTICE strings/apr_snprintf.c Date: Fri, 02 May 2008 17:26:37 -0000 To: commits@apr.apache.org From: jim@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20080502172637.AB7F52388A22@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: jim Date: Fri May 2 10:26:37 2008 New Revision: 652833 URL: http://svn.apache.org/viewvc?rev=652833&view=rev Log: Merge r652832 from trunk: Document cvt from V7, not GNU libc, and copyright Caldera International Inc. Reviewed by: jim Modified: apr/apr/branches/1.2.x/LICENSE apr/apr/branches/1.2.x/NOTICE apr/apr/branches/1.2.x/strings/apr_snprintf.c Modified: apr/apr/branches/1.2.x/LICENSE URL: http://svn.apache.org/viewvc/apr/apr/branches/1.2.x/LICENSE?rev=652833&r1=652832&r2=652833&view=diff ============================================================================== --- apr/apr/branches/1.2.x/LICENSE (original) +++ apr/apr/branches/1.2.x/LICENSE Fri May 2 10:26:37 2008 @@ -295,3 +295,47 @@ misrepresented as being the original software. 3. This notice may not be removed or altered from any source distribution. +From strings/apr_snprintf.c: + + * + * cvt - IEEE floating point formatting routines. + * Derived from UNIX V7, Copyright(C) Caldera International Inc. + * + + Copyright(C) Caldera International Inc. 2001-2002. All rights reserved. + + Redistribution and use in source and binary forms, with or without + modification, are permitted provided that the following conditions are + met: + + Redistributions of source code and documentation must retain the above + copyright notice, this list of conditions and the following disclaimer. + + 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. + + All advertising materials mentioning features or use of this software + must display the following acknowledgement: + + This product includes software developed or owned by Caldera + International, Inc. + + Neither the name of Caldera International, Inc. nor the names of other + contributors may be used to endorse or promote products derived from + this software without specific prior written permission. + + USE OF THE SOFTWARE PROVIDED FOR UNDER THIS LICENSE BY CALDERA + INTERNATIONAL, INC. 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 CALDERA INTERNATIONAL, INC. 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. + + Modified: apr/apr/branches/1.2.x/NOTICE URL: http://svn.apache.org/viewvc/apr/apr/branches/1.2.x/NOTICE?rev=652833&r1=652832&r2=652833&view=diff ============================================================================== --- apr/apr/branches/1.2.x/NOTICE (original) +++ apr/apr/branches/1.2.x/NOTICE Fri May 2 10:26:37 2008 @@ -7,3 +7,6 @@ This software contains code derived from the RSA Data Security Inc. MD5 Message-Digest Algorithm. + +This software contains code derived from UNIX V7, Copyright(C) +Caldera International Inc. Modified: apr/apr/branches/1.2.x/strings/apr_snprintf.c URL: http://svn.apache.org/viewvc/apr/apr/branches/1.2.x/strings/apr_snprintf.c?rev=652833&r1=652832&r2=652833&view=diff ============================================================================== --- apr/apr/branches/1.2.x/strings/apr_snprintf.c (original) +++ apr/apr/branches/1.2.x/strings/apr_snprintf.c Fri May 2 10:26:37 2008 @@ -79,8 +79,8 @@ #define NUM_BUF_SIZE 512 /* - * cvt.c - IEEE floating point formatting routines for FreeBSD - * from GNU libc-4.6.27. Modified to be thread safe. + * cvt - IEEE floating point formatting routines. + * Derived from UNIX V7, Copyright(C) Caldera International Inc. */ /*