# HG changeset patch # User Stefan Teleman # Date 1352241241 28800 # Node ID 31d26adcf6157a2e6a98f2a0bf09a0f159bfbc0f # Parent 15d904c514eecfc55c6c58f14af1a99e1cd5dfd3 15822919 SUNBT7204858-12.0 Upgrade UnixODBC to 2.3.1 diff -r 15d904c514ee -r 31d26adcf615 components/unixodbc/Makefile --- a/components/unixodbc/Makefile Tue Nov 06 13:34:39 2012 -0800 +++ b/components/unixodbc/Makefile Tue Nov 06 14:34:01 2012 -0800 @@ -25,13 +25,13 @@ PATH=$(dir $(CC)):/usr/bin:/usr/gnu/bin COMPONENT_NAME= unixODBC -COMPONENT_VERSION= 2.3.0 +COMPONENT_VERSION= 2.3.1 COMPONENT_SRC= $(COMPONENT_NAME)-$(COMPONENT_VERSION) COMPONENT_PROJECT_URL= http://unixodbc.org/ COMPONENT_ARCHIVE= $(COMPONENT_SRC).tar.gz COMPONENT_ARCHIVE_HASH= \ - sha256:15a7a855a2951a6af7137379bfcdccc15626b869c4804a1d1536cd37e9f3872c -COMPONENT_ARCHIVE_URL= $(COMPONENT_PROJECT_URL)$(COMPONENT_ARCHIVE) + sha256:1f5be3edecff9e31072ef738ea1d8019594c4f0c2e3ab427e6eef153491db6a2 +COMPONENT_ARCHIVE_URL= http://ftp.unixodbc.org/pub/unixODBC/$(COMPONENT_ARCHIVE) include ../../make-rules/prep.mk include ../../make-rules/configure.mk diff -r 15d904c514ee -r 31d26adcf615 components/unixodbc/Solaris/unixODBC.pc --- a/components/unixodbc/Solaris/unixODBC.pc Tue Nov 06 13:34:39 2012 -0800 +++ b/components/unixodbc/Solaris/unixODBC.pc Tue Nov 06 14:34:01 2012 -0800 @@ -19,7 +19,7 @@ # CDDL HEADER END # # -# Copyright (c) 2009, 2011, Oracle and/or its affiliates. All rights reserved. +# Copyright(c) 2009, 2012, Oracle and/or its affiliates. All rights reserved. # # prefix=/usr @@ -32,7 +32,7 @@ Name: unixODBC Description: An Open Source ODBC sub-system and SDK -Version: 2.3.0 +Version: 2.3.1 Libs: -L${libdir} -lodbc Cflags: -I${includedir} -DHAVE_UNISTD_H -DHAVE_PWD_H -DHAVE_SYS_TYPES_H -DHAVE_LONG_LONG -DSIZEOF_LONG=${sizeof_long} diff -r 15d904c514ee -r 31d26adcf615 components/unixodbc/patches/000-configure.patch --- a/components/unixodbc/patches/000-configure.patch Tue Nov 06 13:34:39 2012 -0800 +++ b/components/unixodbc/patches/000-configure.patch Tue Nov 06 14:34:01 2012 -0800 @@ -1,12 +1,12 @@ ---- configure 2010-02-23 07:30:55.000000000 -0500 -+++ configure 2010-09-15 13:44:24.854675000 -0400 +--- configure 2011-11-25 08:14:47.000000000 -0800 ++++ configure 2012-10-18 12:03:36.047791375 -0700 @@ -1,4 +1,4 @@ -#! /bin/sh +#! /bin/bash # Guess values for system-dependent variables and create Makefiles. - # Generated by GNU Autoconf 2.64 for unixODBC 2.3.0. + # Generated by GNU Autoconf 2.65 for unixODBC 2.3.1. # -@@ -238,7 +238,7 @@ +@@ -240,7 +240,7 @@ fi fi fi @@ -15,7 +15,7 @@ export SHELL # Unset more variables known to interfere with behavior of common tools. CLICOLOR_FORCE= GREP_OPTIONS= -@@ -529,7 +529,7 @@ +@@ -533,7 +533,7 @@ # Check that we are running under the correct shell. @@ -24,7 +24,7 @@ case X$lt_ECHO in X*--fallback-echo) -@@ -613,7 +613,7 @@ +@@ -617,7 +617,7 @@ elif { test -f /bin/ksh || test -f /bin/ksh$ac_exeext; } && test "X$CONFIG_SHELL" != X/bin/ksh; then # If we have ksh, try running configure again with it. @@ -33,7 +33,7 @@ export ORIGINAL_CONFIG_SHELL CONFIG_SHELL=/bin/ksh export CONFIG_SHELL -@@ -655,7 +655,7 @@ +@@ -659,7 +659,7 @@ if test "$prev" != 'sed 50q "$0"'; then echo_test_string=`eval $prev` export echo_test_string @@ -42,7 +42,7 @@ else # Oops. We lost completely, so just stick with echo. ECHO=echo -@@ -999,7 +999,7 @@ +@@ -1002,7 +1002,7 @@ datadir='${datarootdir}' sysconfdir='${prefix}/etc' sharedstatedir='${prefix}/com' @@ -51,7 +51,7 @@ includedir='${prefix}/include' oldincludedir='/usr/include' docdir='${datarootdir}/doc/${PACKAGE_TARNAME}' -@@ -2686,7 +2686,7 @@ +@@ -2689,7 +2689,7 @@ ac_cpp='$CPP $CPPFLAGS' ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' @@ -59,35 +59,8 @@ +ac_compiler_gnu="no" - ac_aux_dir= -@@ -3097,7 +3097,7 @@ - $as_echo_n "(cached) " >&6 - else - cat >conftest.make <<\_ACEOF --SHELL = /bin/sh -+SHELL = /bin/bash - all: - @echo '@@@%%%=$(MAKE)=@@@%%%' - _ACEOF -@@ -4153,7 +4153,7 @@ - for i in 1 2 3 4 5 6; do - echo '#include "conftst'$i'.h"' >> sub/conftest.c - # Using `: > sub/conftst$i.h' creates only sub/conftst1.h with -- # Solaris 8's {/usr,}/bin/sh. -+ # Solaris 8's {/usr,}/bin/bash. - touch sub/conftst$i.h - done - echo "${am__include} ${am__quote}sub/conftest.Po${am__quote}" > confmf -@@ -4957,7 +4957,7 @@ - for i in 1 2 3 4 5 6; do - echo '#include "conftst'$i'.h"' >> sub/conftest.c - # Using `: > sub/conftst$i.h' creates only sub/conftst1.h with -- # Solaris 8's {/usr,}/bin/sh. -+ # Solaris 8's {/usr,}/bin/bash. - touch sub/conftst$i.h - done - echo "${am__include} ${am__quote}sub/conftest.Po${am__quote}" > confmf -@@ -5218,7 +5218,7 @@ + +@@ -3100,7 +3100,7 @@ $as_echo_n "(cached) " >&6 else cat >conftest.make <<\_ACEOF @@ -96,7 +69,43 @@ all: @echo '@@@%%%=$(MAKE)=@@@%%%' _ACEOF -@@ -6667,7 +6667,7 @@ +@@ -3346,7 +3346,7 @@ + ac_cpp='$CPP $CPPFLAGS' + ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' + ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' +-ac_compiler_gnu=$ac_cv_c_compiler_gnu ++ac_compiler_gnu="no" + if test -n "$ac_tool_prefix"; then + # Extract the first word of "${ac_tool_prefix}gcc", so it can be a program name with args. + set dummy ${ac_tool_prefix}gcc; ac_word=$2 +@@ -4180,7 +4180,7 @@ + for i in 1 2 3 4 5 6; do + echo '#include "conftst'$i'.h"' >> sub/conftest.c + # Using `: > sub/conftst$i.h' creates only sub/conftst1.h with +- # Solaris 8's {/usr,}/bin/sh. ++ # Solaris 8's {/usr,}/bin/bash. + touch sub/conftst$i.h + done + echo "${am__include} ${am__quote}sub/conftest.Po${am__quote}" > confmf +@@ -4984,7 +4984,7 @@ + for i in 1 2 3 4 5 6; do + echo '#include "conftst'$i'.h"' >> sub/conftest.c + # Using `: > sub/conftst$i.h' creates only sub/conftst1.h with +- # Solaris 8's {/usr,}/bin/sh. ++ # Solaris 8's {/usr,}/bin/bash. + touch sub/conftst$i.h + done + echo "${am__include} ${am__quote}sub/conftest.Po${am__quote}" > confmf +@@ -5245,7 +5245,7 @@ + $as_echo_n "(cached) " >&6 + else + cat >conftest.make <<\_ACEOF +-SHELL = /bin/sh ++SHELL = /bin/bash + all: + @echo '@@@%%%=$(MAKE)=@@@%%%' + _ACEOF +@@ -6705,7 +6705,7 @@ for i in 1 2 3 4 5 6 7 8 ; do teststring=$teststring$teststring done @@ -105,7 +114,7 @@ # If test is not a shell built-in, we'll probably end up computing a # maximum length that is only half of the actual maximum length, but # we can't tell. -@@ -14651,6 +14651,7 @@ +@@ -14678,6 +14678,7 @@ int main () { @@ -113,34 +122,7 @@ mutex_lock() ; return 0; -@@ -14732,7 +14733,8 @@ - $as_echo "#define HAVE_LIBPTHREAD 1" >>confdefs.h - - gotthread="yes"; -- THREADLIB="-lpthread" -+ THREADLIB="-lpthread -lposix4 -lrt" -+ ac_cv_c_compiler_gnu="no" - if test "x$ac_cv_c_compiler_gnu"="xyes"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: checking if compiler accepts -pthread" >&5 - $as_echo_n "checking if compiler accepts -pthread... " >&6; } -@@ -14740,7 +14742,7 @@ - if test -z "`${CC-cc} -pthread -c conftest.c 2>&1`"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 - $as_echo "yes" >&6; } -- CFLAGS="$CFLAGS -pthread" -+ CFLAGS="$CFLAGS" - else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 - $as_echo "no" >&6; } -@@ -14806,6 +14808,7 @@ - - gotthread="yes"; - THREADLIB="" -+ ac_cv_c_compiler_gnu="no" - if test "x$ac_cv_c_compiler_gnu"="xyes"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: checking if compiler accepts -pthread" >&5 - $as_echo_n "checking if compiler accepts -pthread... " >&6; } -@@ -14813,7 +14816,7 @@ +@@ -14767,7 +14768,7 @@ if test -z "`${CC-cc} -pthread -c conftest.c 2>&1`"; then { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 $as_echo "yes" >&6; } @@ -149,16 +131,16 @@ else { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 $as_echo "no" >&6; } -@@ -14843,6 +14846,8 @@ - - fi - -+ ac_cv_c_compiler_gnu="no" -+ ac_cv_c_compiler_gnu="no" - if test "x$gotthread" = "xno"; then - if test "x$ac_cv_c_compiler_gnu"="xyes"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: checking if compiler accepts -pthread" >&5 -@@ -14851,7 +14856,7 @@ +@@ -14840,7 +14841,7 @@ + if test -z "`${CC-cc} -pthread -c conftest.c 2>&1`"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 + $as_echo "yes" >&6; } +- CFLAGS="$CFLAGS -pthread" ++ CFLAGS="$CFLAGS" + else + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 + $as_echo "no" >&6; } +@@ -14878,7 +14879,7 @@ if test -z "`${CC-cc} -pthread -c conftest.c 2>&1`"; then { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 $as_echo "yes" >&6; } @@ -167,7 +149,25 @@ else { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 $as_echo "no" >&6; } -@@ -15053,7 +15058,7 @@ +@@ -14918,7 +14919,7 @@ + + $as_echo "#define HAVE_LIBPTHREAD 1" >>confdefs.h + +- THREADLIB="-pthread -lc_r" ++ THREADLIB="-lpthread -lposix4" + gotthread="yes"; + + else +@@ -14931,7 +14932,7 @@ + + if test "x$gotthread" = "xno"; then + SAVECFLAGS="$CFLAGS" +- CFLAGS="$CFLAGS -D_THREAD_SAFE -D_ALL_SOURCE -D_LONG_LONG" ++ CFLAGS="$CFLAGS -D_REENTRANT -D_THREAD_SAFE -D_ALL_SOURCE -D_LONG_LONG" + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for pthread_mutex_lock in -lpthread" >&5 + $as_echo_n "checking for pthread_mutex_lock in -lpthread... " >&6; } + ac_save_LIBS="$LIBS" +@@ -15080,7 +15081,7 @@ ac_cpp='$CPP $CPPFLAGS' ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' @@ -176,17 +176,16 @@ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for semundo union" >&5 -@@ -15287,7 +15292,8 @@ +@@ -15129,6 +15130,8 @@ - done + fi -- +export drivers="true" +export driverc="true" - if test "x$msql" = "xtrue" ; then - MSQL_TRUE= -@@ -15321,6 +15327,8 @@ + # Check whether --with-msql-lib was given. + if test "${with_msql_lib+set}" = set; then : +@@ -15348,6 +15351,8 @@ QNX_FALSE= fi @@ -195,7 +194,7 @@ if test "x$use_builtin_libtool" = "xyes" ; then WITHLT_TRUE= WITHLT_FALSE='#' -@@ -15873,6 +15881,8 @@ +@@ -15900,6 +15905,8 @@ fi done diff -r 15d904c514ee -r 31d26adcf615 components/unixodbc/unixodbc.license --- a/components/unixodbc/unixodbc.license Tue Nov 06 13:34:39 2012 -0800 +++ b/components/unixodbc/unixodbc.license Tue Nov 06 14:34:01 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. +--------------------- +- UnixODBC v2.3.1 - +--------------------- + -------------------------------------------------------------------------- GNU LESSER GENERAL PUBLIC LICENSE diff -r 15d904c514ee -r 31d26adcf615 components/unixodbc/unixodbc.p5m --- a/components/unixodbc/unixodbc.p5m Tue Nov 06 13:34:39 2012 -0800 +++ b/components/unixodbc/unixodbc.p5m Tue Nov 06 14:34:01 2012 -0800 @@ -18,9 +18,8 @@ # # 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. # - default mangler.man.stability uncommitted> set name=pkg.fmri value=pkg:/library/unixodbc@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION) set name=pkg.summary value="The UnixODBC Subsystem and SDK" @@ -68,16 +67,16 @@ file path=usr/lib/$(MACH64)/libmimerS.so.1.0.0 file path=usr/lib/libnn.so.1.0.0 file path=usr/lib/$(MACH64)/libnn.so.1.0.0 -file path=usr/lib/libodbc.so.1.0.0 -file path=usr/lib/$(MACH64)/libodbc.so.1.0.0 -file path=usr/lib/libodbccr.so.1.0.0 -file path=usr/lib/$(MACH64)/libodbccr.so.1.0.0 +file path=usr/lib/libodbc.so.2.0.0 +file path=usr/lib/$(MACH64)/libodbc.so.2.0.0 +file path=usr/lib/libodbccr.so.2.0.0 +file path=usr/lib/$(MACH64)/libodbccr.so.2.0.0 file path=usr/lib/libodbcdrvcfg1S.so.1.0.0 file path=usr/lib/$(MACH64)/libodbcdrvcfg1S.so.1.0.0 file path=usr/lib/libodbcdrvcfg2S.so.1.0.0 file path=usr/lib/$(MACH64)/libodbcdrvcfg2S.so.1.0.0 -file path=usr/lib/libodbcinst.so.1.0.0 -file path=usr/lib/$(MACH64)/libodbcinst.so.1.0.0 +file path=usr/lib/libodbcinst.so.2.0.0 +file path=usr/lib/$(MACH64)/libodbcinst.so.2.0.0 file path=usr/lib/libodbcminiS.so.1.0.0 file path=usr/lib/$(MACH64)/libodbcminiS.so.1.0.0 file path=usr/lib/libodbcmyS.so.1.0.0 @@ -109,16 +108,19 @@ link path=usr/lib/libmimerS.so target=libmimerS.so.1.0.0 link path=usr/lib/libnn.so.1 target=libnn.so.1.0.0 link path=usr/lib/libnn.so target=libnn.so.1.0.0 -link path=usr/lib/libodbc.so.1 target=libodbc.so.1.0.0 -link path=usr/lib/libodbc.so target=libodbc.so.1.0.0 -link path=usr/lib/libodbccr.so.1 target=libodbccr.so.1.0.0 -link path=usr/lib/libodbccr.so target=libodbccr.so.1.0.0 +link path=usr/lib/libodbc.so.1 target=libodbc.so.2.0.0 +link path=usr/lib/libodbc.so.2 target=libodbc.so.2.0.0 +link path=usr/lib/libodbc.so target=libodbc.so.2.0.0 +link path=usr/lib/libodbccr.so.1 target=libodbccr.so.2.0.0 +link path=usr/lib/libodbccr.so.2 target=libodbccr.so.2.0.0 +link path=usr/lib/libodbccr.so target=libodbccr.so.2.0.0 link path=usr/lib/libodbcdrvcfg1S.so.1 target=libodbcdrvcfg1S.so.1.0.0 link path=usr/lib/libodbcdrvcfg1S.so target=libodbcdrvcfg1S.so.1.0.0 link path=usr/lib/libodbcdrvcfg2S.so.1 target=libodbcdrvcfg2S.so.1.0.0 link path=usr/lib/libodbcdrvcfg2S.so target=libodbcdrvcfg2S.so.1.0.0 -link path=usr/lib/libodbcinst.so.1 target=libodbcinst.so.1.0.0 -link path=usr/lib/libodbcinst.so target=libodbcinst.so.1.0.0 +link path=usr/lib/libodbcinst.so.1 target=libodbcinst.so.2.0.0 +link path=usr/lib/libodbcinst.so.2 target=libodbcinst.so.2.0.0 +link path=usr/lib/libodbcinst.so target=libodbcinst.so.2.0.0 link path=usr/lib/libodbcminiS.so.1 target=libodbcminiS.so.1.0.0 link path=usr/lib/libodbcminiS.so target=libodbcminiS.so.1.0.0 link path=usr/lib/libodbcmyS.so.1 target=libodbcmyS.so.1.0.0 @@ -147,16 +149,19 @@ link path=usr/lib/$(MACH64)/libmimerS.so target=libmimerS.so.1.0.0 link path=usr/lib/$(MACH64)/libnn.so.1 target=libnn.so.1.0.0 link path=usr/lib/$(MACH64)/libnn.so target=libnn.so.1.0.0 -link path=usr/lib/$(MACH64)/libodbc.so.1 target=libodbc.so.1.0.0 -link path=usr/lib/$(MACH64)/libodbc.so target=libodbc.so.1.0.0 -link path=usr/lib/$(MACH64)/libodbccr.so.1 target=libodbccr.so.1.0.0 -link path=usr/lib/$(MACH64)/libodbccr.so target=libodbccr.so.1.0.0 +link path=usr/lib/$(MACH64)/libodbc.so.1 target=libodbc.so.2.0.0 +link path=usr/lib/$(MACH64)/libodbc.so.2 target=libodbc.so.2.0.0 +link path=usr/lib/$(MACH64)/libodbc.so target=libodbc.so.2.0.0 +link path=usr/lib/$(MACH64)/libodbccr.so.1 target=libodbccr.so.2.0.0 +link path=usr/lib/$(MACH64)/libodbccr.so.2 target=libodbccr.so.2.0.0 +link path=usr/lib/$(MACH64)/libodbccr.so target=libodbccr.so.2.0.0 link path=usr/lib/$(MACH64)/libodbcdrvcfg1S.so.1 target=libodbcdrvcfg1S.so.1.0.0 link path=usr/lib/$(MACH64)/libodbcdrvcfg1S.so target=libodbcdrvcfg1S.so.1.0.0 link path=usr/lib/$(MACH64)/libodbcdrvcfg2S.so.1 target=libodbcdrvcfg2S.so.1.0.0 link path=usr/lib/$(MACH64)/libodbcdrvcfg2S.so target=libodbcdrvcfg2S.so.1.0.0 -link path=usr/lib/$(MACH64)/libodbcinst.so.1 target=libodbcinst.so.1.0.0 -link path=usr/lib/$(MACH64)/libodbcinst.so target=libodbcinst.so.1.0.0 +link path=usr/lib/$(MACH64)/libodbcinst.so.1 target=libodbcinst.so.2.0.0 +link path=usr/lib/$(MACH64)/libodbcinst.so.2 target=libodbcinst.so.2.0.0 +link path=usr/lib/$(MACH64)/libodbcinst.so target=libodbcinst.so.2.0.0 link path=usr/lib/$(MACH64)/libodbcminiS.so.1 target=libodbcminiS.so.1.0.0 link path=usr/lib/$(MACH64)/libodbcminiS.so target=libodbcminiS.so.1.0.0 link path=usr/lib/$(MACH64)/libodbcmyS.so.1 target=libodbcmyS.so.1.0.0