Mailing-List: contact commits-help@apr.apache.org; run by ezmlm
Precedence: bulk
Reply-To: dev@apr.apache.org
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Subject: svn commit: r652836 - in /apr/apr/branches/0.9.x: LICENSE NOTICE
 strings/apr_snprintf.c
Date: Fri, 02 May 2008 17:28:30 -0000
To: commits@apr.apache.org
From: jim@apache.org
Message-Id: <20080502172830.371DE2388A31@eris.apache.org>

Author: jim
Date: Fri May  2 10:28:29 2008
New Revision: 652836

URL: http://svn.apache.org/viewvc?rev=652836&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/0.9.x/LICENSE
    apr/apr/branches/0.9.x/NOTICE
    apr/apr/branches/0.9.x/strings/apr_snprintf.c

Modified: apr/apr/branches/0.9.x/LICENSE
URL: http://svn.apache.org/viewvc/apr/apr/branches/0.9.x/LICENSE?rev=652836&r1=652835&r2=652836&view=diff
==============================================================================
--- apr/apr/branches/0.9.x/LICENSE (original)
+++ apr/apr/branches/0.9.x/LICENSE Fri May  2 10:28:29 2008
@@ -323,3 +323,48 @@
  * 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/0.9.x/NOTICE
URL: http://svn.apache.org/viewvc/apr/apr/branches/0.9.x/NOTICE?rev=652836&r1=652835&r2=652836&view=diff
==============================================================================
--- apr/apr/branches/0.9.x/NOTICE (original)
+++ apr/apr/branches/0.9.x/NOTICE Fri May  2 10:28:29 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/0.9.x/strings/apr_snprintf.c
URL: http://svn.apache.org/viewvc/apr/apr/branches/0.9.x/strings/apr_snprintf.c?rev=652836&r1=652835&r2=652836&view=diff
==============================================================================
--- apr/apr/branches/0.9.x/strings/apr_snprintf.c (original)
+++ apr/apr/branches/0.9.x/strings/apr_snprintf.c Fri May  2 10:28:29 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.
  */
 
 /*