7204859 Upgrade neon to 0.29.6
authorStefan Teleman <stefan.teleman@oracle.com>
Mon, 05 Nov 2012 09:26:49 -0800
changeset 1037 336412dc83cf
parent 1036 3b51f60a0267
child 1038 3b4d8f56a1bf
7204859 Upgrade neon to 0.29.6
components/libneon/Makefile
components/libneon/libneon.license
components/libneon/libneon.p5m
components/libneon/patches/000-configure.patch
--- a/components/libneon/Makefile	Wed Oct 31 04:43:31 2012 -0700
+++ b/components/libneon/Makefile	Mon Nov 05 09:26:49 2012 -0800
@@ -23,12 +23,12 @@
 include ../../make-rules/shared-macros.mk
 
 COMPONENT_NAME = neon
-COMPONENT_VERSION = 0.29.5
+COMPONENT_VERSION = 0.29.6
 COMPONENT_PROJECT_URL=	http://www.webdav.org/neon/
 COMPONENT_SRC = $(COMPONENT_NAME)-$(COMPONENT_VERSION)
 COMPONENT_ARCHIVE = $(COMPONENT_SRC).tar.gz
 COMPONENT_ARCHIVE_HASH = \
-    sha256:dea3c52b9f3f915651c6279c76758acf7c427727e8b9b0130f8b138f24012290
+    sha256:9c640b728d6dc80ef1e48f83181166ab6bc95309cece5537e01ffdd01b96eb43
 COMPONENT_ARCHIVE_URL = $(COMPONENT_PROJECT_URL)$(COMPONENT_ARCHIVE)
 
 include ../../make-rules/prep.mk
--- a/components/libneon/libneon.license	Wed Oct 31 04:43:31 2012 -0700
+++ b/components/libneon/libneon.license	Mon Nov 05 09:26:49 2012 -0800
@@ -1,11 +1,7 @@
-Oracle elects to use only the GNU Lesser General Public License version
-2.1 (LGPL)/GNU General Public License version 2 (GPL) for any software
-where a choice of LGPL/GPL license versions are made available with the
-language indicating that LGPLv2.1/GPLv2 or any later version may be
-used, or where a choice of which version of the LGPL/GPL is applied is
-unspecified.  Unless specifically stated otherwise, where a choice
-exists between another license and either the GPL or the LGPL, Oracle
-chooses the other license.
+-----------------------------------------
+- NEON Client Library (libneon) v0.29.6 -
+-----------------------------------------
+
 -----------------------------------------------------------------------
 
 		  GNU LIBRARY GENERAL PUBLIC LICENSE
--- a/components/libneon/libneon.p5m	Wed Oct 31 04:43:31 2012 -0700
+++ b/components/libneon/libneon.p5m	Mon Nov 05 09:26:49 2012 -0800
@@ -18,7 +18,7 @@
 #
 # CDDL HEADER END
 #
-# Copyright (c) 2011, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2011, 2012, Oracle and/or its affiliates. All rights reserved.
 #
 
 <transform file path=usr.*/man/.+ -> default mangler.man.stability volatile>
@@ -95,9 +95,9 @@
 file path=usr/include/neon/ne_utils.h
 file path=usr/include/neon/ne_xml.h
 file path=usr/include/neon/ne_xmlreq.h
-file path=usr/lib/$(MACH64)/libneon.so.27.2.5
+file path=usr/lib/$(MACH64)/libneon.so.27.2.6
 file path=usr/lib/$(MACH64)/pkgconfig/neon.pc
-file path=usr/lib/libneon.so.27.2.5
+file path=usr/lib/libneon.so.27.2.6
 file path=usr/lib/pkgconfig/neon.pc
 file path=usr/share/doc/neon-$(COMPONENT_VERSION)/html/api.html
 file path=usr/share/doc/neon-$(COMPONENT_VERSION)/html/biblio.html
@@ -248,9 +248,8 @@
 file path=usr/share/man/man3/neon.3
 #
 license libneon.license license="LGPLv2, GPLv2"
-link path=usr/lib/$(MACH64)/libneon.so target=libneon.so.27.2.5
-link path=usr/lib/$(MACH64)/libneon.so.27 target=libneon.so.27.2.5
-link path=usr/lib/libneon.so target=libneon.so.27.2.5
-#
-link path=usr/lib/libneon.so.27 target=libneon.so.27.2.5
+link path=usr/lib/$(MACH64)/libneon.so target=libneon.so.27.2.6
+link path=usr/lib/$(MACH64)/libneon.so.27 target=libneon.so.27.2.6
+link path=usr/lib/libneon.so target=libneon.so.27.2.6
+link path=usr/lib/libneon.so.27 target=libneon.so.27.2.6
 
--- a/components/libneon/patches/000-configure.patch	Wed Oct 31 04:43:31 2012 -0700
+++ b/components/libneon/patches/000-configure.patch	Mon Nov 05 09:26:49 2012 -0800
@@ -1,6 +1,6 @@
---- configure	2010-10-14 08:10:02.000000000 -0700
-+++ configure	2011-03-11 12:28:20.660856505 -0800
[email protected]@ -18897,7 +18897,7 @@
+--- configure	2011-05-03 05:25:31.000000000 -0700
++++ configure	2012-10-08 15:14:24.436052062 -0700
[email protected]@ -12018,7 +12018,7 @@
  	  ;;
  	esac
        fi
@@ -9,11 +9,11 @@
        hardcode_shlibpath_var=no
        case $host_os in
        solaris2.[0-5] | solaris2.[0-5].*) ;;
[email protected]@ -23116,6 +23116,7 @@
[email protected]@ -14580,6 +14580,7 @@
      # in the --cflags output.
      CPPFLAGS="$CPPFLAGS `$XML2_CONFIG --cflags | sed 's| -I/include||g'`"
      NEON_LIBS="$NEON_LIBS `$XML2_CONFIG --libs | sed 's|-L/usr/lib ||g'`"
 +    NEON_LIBS=`echo ${NEON_LIBS} | sed 's|-R/usr/lib ||g'`
- 
- 
- for ac_header in libxml/xmlversion.h libxml/parser.h
+     for ac_header in libxml/xmlversion.h libxml/parser.h
+ do :
+   as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`