harmony-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From Mark Hindess <mark.hind...@googlemail.com>
Subject Re: [drlvm] Upgrading APR
Date Fri, 14 Aug 2009 10:06:47 GMT

In message <4A851C7C.9070208@gmail.com>, Tim Ellison writes:
>
> On 13/Aug/2009 22:56, Pavel Pervov wrote:
> > +1. This also makes APR buildable with VS 2K8. Thanks for the effort.
> 
> Almost.  I have a few changes sat in my workspace that are also
> required.  I will commit them after Mark updates APR.

Ok.  My tests ran okay on Linux/x86, Linux/x86_64 and Windows/x86 so I've
committed the upgrade in r804151.

I notice that there are changes to the LICENSE/NOTICE files in APR 1.3.8
(appended below).  Do we need to replicate these in our corresponding
files.

Regards,
 Mark.

--- semis/apr/src/LICENSE	2004-12-05 21:34:37.000000000 +0000
+++ semis/apr/src/LICENSE	2008-05-02 18:26:59.000000000 +0100
@@ -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.
+
+
--- semis/apr/src/NOTICE	2004-11-24 22:51:51.000000000 +0000
+++ semis/apr/src/NOTICE	2009-07-02 03:45:11.000000000 +0100
@@ -1,3 +1,6 @@
+Apache Portable Runtime
+Copyright (c) 2009 The Apache Software Foundation.
+
 This product includes software developed by
 The Apache Software Foundation (http://www.apache.org/).
 
@@ -7,3 +10,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.



Mime
View raw message