Permalink
Browse files

OS-2257 unusable SSL libraries should have different names in the pla…

…tform
  • Loading branch information...
1 parent 273199e commit 4a3c89eb792d0f992cb7b97c26fc63f1f2d05536 @wesolows wesolows committed Jun 6, 2013
View
@@ -1,9 +1,14 @@
/bash/bash-4.1-32
/bind/bind-9.8.0-32
+/binutils/binutils-2.22-32
/bzip2/bzip2-1.0.6
/bzip2/bzgrep.tmp
/coreutils/coreutils-8.13-32
-/curl/curl-7.21.2-32
+/cpp/cpp
+/cpp/cpp.o
+/cpp/y.tab.c
+/cpp/y.tab.o
+/curl/curl-7.27.0-32
/dialog/dialog-1.1-20111020-32
/g11n/proto/
/g11n/src/lib/iconv/common/amd64/
@@ -18,7 +23,7 @@
/g11n/src/lib/iconv/utf-8/*.o
/g11n/src/lib/iconv/utf-8/*.so
/gcc4/gcc-4.4.4-32
-/gcc4/gcc-4.4.4-i386-build
+/gcc4/gcc-4.4.4-32.build/
/gnupg/gnupg-1.4.11-32
/gtar/tar-1.23-32
/gzip/gzip-1.3.5-32
@@ -32,13 +37,16 @@
/libm/usr/src/libm/wos/f80387
/libm/usr/src/libm/wos/libmvec
/libm/usr/src/libm/wos64/amd64
-/libxml/libxml2-2.7.6
+/libxml/libxml2-2.7.6-32
/libxml/libxml2-2.7.6-64
/libz/zlib-1.2.3-32
/libz/zlib-1.2.3-64
+/make/.unpack32
+/make/usr-32
/ncurses/ncurses-5.7-32
/ncurses/ncurses-5.7-64
/node.js/genversionjs
+/node.js/wrapper
/node.js/node-v0.8.20-32
/nss-nspr/nss-3.12.8-32
/nss-nspr/nss-3.12.8-64
@@ -47,14 +55,17 @@
/openlldp/openlldp-0.4alpha-32
/openssl/openssl-0.9.8x
/openssl/openssl-0.9.8x-64
+/openssl1x/openssl-1.0.1d-32
+/openssl1x/openssl-1.0.1d-64
/pbzip2/pbzip2-1.1.6-32
/perl/perl-5.12.3-32
+/perl/Config_heavy.pl
/proto
/rsync/rsync-3.0.6-32
/rsyslog/rsyslog-5.8.9-32
/screen/screen-4.0.3-32
/socat/socat-1.7.1.3-32
-/tun/tun-1.1-64
+/tun/tun-1.3-64
/uuid/uuid-1.6.2-32
/vim/vim73-32
/wget/wget-1.12-32
@@ -6113,3 +6113,242 @@ diff -ur curl-7.27.0/m4/curl-openssl.m4 curl-7.27.0-32/m4/curl-openssl.m4
],[
tst_api="0x091"
])
+--- curl-7.27.0-32/configure.ac.orig Wed Jun 5 21:38:11 2013
++++ curl-7.27.0-32/configure.ac Wed Jun 5 21:39:16 2013
+@@ -1508,15 +1508,15 @@
+ ;;
+ esac
+
+- AC_CHECK_LIB(crypto, sunw_CRYPTO_lock,[
++ AC_CHECK_LIB(sunw_crypto, sunw_CRYPTO_lock,[
+ HAVECRYPTO="yes"
+- LIBS="-lcrypto $LIBS"
++ LIBS="-lsunw_crypto $LIBS"
+ ],[
+ LDFLAGS="$CLEANLDFLAGS -L$LIB_OPENSSL"
+ CPPFLAGS="$CLEANCPPFLAGS -I$PREFIX_OPENSSL/include/openssl -I$PREFIX_OPENSSL/include"
+- AC_CHECK_LIB(crypto, sunw_CRYPTO_add_lock,[
++ AC_CHECK_LIB(sunw_crypto, sunw_CRYPTO_add_lock,[
+ HAVECRYPTO="yes"
+- LIBS="-lcrypto $LIBS"], [
++ LIBS="-lsunw_crypto $LIBS"], [
+ LDFLAGS="$CLEANLDFLAGS"
+ CPPFLAGS="$CLEANCPPFLAGS"
+ LIBS="$CLEANLIBS"
+@@ -1528,7 +1528,7 @@
+ dnl This is only reasonable to do if crypto actually is there: check for
+ dnl SSL libs NOTE: it is important to do this AFTER the crypto lib
+
+- AC_CHECK_LIB(ssl, sunw_SSL_connect)
++ AC_CHECK_LIB(sunw_ssl, sunw_SSL_connect)
+
+ if test "$ac_cv_lib_ssl_sunw_SSL_connect" != yes; then
+ dnl we didn't find the SSL lib, try the RSAglue/rsaref stuff
+@@ -1535,7 +1535,7 @@
+ AC_MSG_CHECKING(for ssl with RSAglue/rsaref libs in use);
+ OLIBS=$LIBS
+ LIBS="$LIBS -lRSAglue -lrsaref"
+- AC_CHECK_LIB(ssl, sunw_SSL_connect)
++ AC_CHECK_LIB(sunw_ssl, sunw_SSL_connect)
+ if test "$ac_cv_lib_ssl_sunw_SSL_connect" != yes; then
+ dnl still no SSL_connect
+ AC_MSG_RESULT(no)
+--- curl-7.27.0-32/configure.orig Wed Jun 5 21:38:18 2013
++++ curl-7.27.0-32/configure Wed Jun 5 21:40:26 2013
+@@ -20740,13 +20740,13 @@
+ ;;
+ esac
+
+- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for sunw_CRYPTO_lock in -lcrypto" >&5
+-$as_echo_n "checking for sunw_CRYPTO_lock in -lcrypto... " >&6; }
++ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for sunw_CRYPTO_lock in -lsunw_crypto" >&5
++$as_echo_n "checking for sunw_CRYPTO_lock in -lsunw_crypto... " >&6; }
+ if ${ac_cv_lib_crypto_sunw_CRYPTO_lock+:} false; then :
+ $as_echo_n "(cached) " >&6
+ else
+ ac_check_lib_save_LIBS=$LIBS
+-LIBS="-lcrypto $LIBS"
++LIBS="-lsunw_crypto $LIBS"
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+ /* end confdefs.h. */
+
+@@ -20776,19 +20776,19 @@
+ if test "x$ac_cv_lib_crypto_sunw_CRYPTO_lock" = xyes; then :
+
+ HAVECRYPTO="yes"
+- LIBS="-lcrypto $LIBS"
++ LIBS="-lsunw_crypto $LIBS"
+
+ else
+
+ LDFLAGS="$CLEANLDFLAGS -L$LIB_OPENSSL"
+ CPPFLAGS="$CLEANCPPFLAGS -I$PREFIX_OPENSSL/include/openssl -I$PREFIX_OPENSSL/include"
+- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for sunw_CRYPTO_add_lock in -lcrypto" >&5
+-$as_echo_n "checking for sunw_CRYPTO_add_lock in -lcrypto... " >&6; }
++ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for sunw_CRYPTO_add_lock in -lsunw_crypto" >&5
++$as_echo_n "checking for sunw_CRYPTO_add_lock in -lsunw_crypto... " >&6; }
+ if ${ac_cv_lib_crypto_sunw_CRYPTO_add_lock+:} false; then :
+ $as_echo_n "(cached) " >&6
+ else
+ ac_check_lib_save_LIBS=$LIBS
+-LIBS="-lcrypto $LIBS"
++LIBS="-lsunw_crypto $LIBS"
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+ /* end confdefs.h. */
+
+@@ -20818,7 +20818,7 @@
+ if test "x$ac_cv_lib_crypto_sunw_CRYPTO_add_lock" = xyes; then :
+
+ HAVECRYPTO="yes"
+- LIBS="-lcrypto $LIBS"
++ LIBS="-lsunw_crypto $LIBS"
+ else
+
+ LDFLAGS="$CLEANLDFLAGS"
+@@ -20834,13 +20834,13 @@
+
+ if test X"$HAVECRYPTO" = X"yes"; then
+
+- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for sunw_SSL_connect in -lssl" >&5
+-$as_echo_n "checking for sunw_SSL_connect in -lssl... " >&6; }
++ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for sunw_SSL_connect in -lsunw_ssl" >&5
++$as_echo_n "checking for sunw_SSL_connect in -lsunw_ssl... " >&6; }
+ if ${ac_cv_lib_ssl_sunw_SSL_connect+:} false; then :
+ $as_echo_n "(cached) " >&6
+ else
+ ac_check_lib_save_LIBS=$LIBS
+-LIBS="-lssl $LIBS"
++LIBS="-lsunw_ssl $LIBS"
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+ /* end confdefs.h. */
+
+@@ -20872,7 +20872,7 @@
+ #define HAVE_LIBSSL 1
+ _ACEOF
+
+- LIBS="-lssl $LIBS"
++ LIBS="-lsunw_ssl $LIBS"
+
+ fi
+
+@@ -20882,13 +20882,13 @@
+ $as_echo_n "checking for ssl with RSAglue/rsaref libs in use... " >&6; };
+ OLIBS=$LIBS
+ LIBS="$LIBS -lRSAglue -lrsaref"
+- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for sunw_SSL_connect in -lssl" >&5
+-$as_echo_n "checking for sunw_SSL_connect in -lssl... " >&6; }
++ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for sunw_SSL_connect in -lsunw_ssl" >&5
++$as_echo_n "checking for sunw_SSL_connect in -lsunw_ssl... " >&6; }
+ if ${ac_cv_lib_ssl_sunw_SSL_connect+:} false; then :
+ $as_echo_n "(cached) " >&6
+ else
+ ac_check_lib_save_LIBS=$LIBS
+-LIBS="-lssl $LIBS"
++LIBS="-lsunw_ssl $LIBS"
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+ /* end confdefs.h. */
+
+@@ -20920,7 +20920,7 @@
+ #define HAVE_LIBSSL 1
+ _ACEOF
+
+- LIBS="-lssl $LIBS"
++ LIBS="-lsunw_ssl $LIBS"
+
+ fi
+
+@@ -21921,13 +21921,13 @@
+ fi
+
+ if test "$OPENSSL_ENABLED" = "1"; then
+- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for SRP_Calc_client_key in -lcrypto" >&5
+-$as_echo_n "checking for SRP_Calc_client_key in -lcrypto... " >&6; }
++ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for SRP_Calc_client_key in -lsunw_crypto" >&5
++$as_echo_n "checking for SRP_Calc_client_key in -lsunw_crypto... " >&6; }
+ if ${ac_cv_lib_crypto_SRP_Calc_client_key+:} false; then :
+ $as_echo_n "(cached) " >&6
+ else
+ ac_check_lib_save_LIBS=$LIBS
+-LIBS="-lcrypto $LIBS"
++LIBS="-lsunw_crypto $LIBS"
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+ /* end confdefs.h. */
+
+--- curl-7.27.0-32/configure.ac.orig Wed Jun 5 21:45:37 2013
++++ curl-7.27.0-32/configure.ac Wed Jun 5 21:45:51 2013
+@@ -2886,7 +2886,6 @@
+ AC_TYPE_SIZE_T
+ AC_HEADER_TIME
+ CURL_CHECK_STRUCT_TIMEVAL
+-CURL_VERIFY_RUNTIMELIBS
+
+ AC_CHECK_SIZEOF(size_t)
+ AC_CHECK_SIZEOF(long)
+--- curl-7.27.0-32/configure.orig Wed Jun 5 21:45:42 2013
++++ curl-7.27.0-32/configure Wed Jun 5 21:46:24 2013
+@@ -25387,42 +25387,6 @@
+
+
+
+- if test "x$cross_compiling" != xyes; then
+-
+- { $as_echo "$as_me:${as_lineno-$LINENO}: checking run-time libs availability" >&5
+-$as_echo_n "checking run-time libs availability... " >&6; }
+- if test "$cross_compiling" = yes; then :
+- { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
+-$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
+-as_fn_error $? "cannot run test program while cross compiling
+-See \`config.log' for more details" "$LINENO" 5; }
+-else
+- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+-/* end confdefs.h. */
+-
+-main()
+-{
+- return 0;
+-}
+-
+-_ACEOF
+-if ac_fn_c_try_run "$LINENO"; then :
+- { $as_echo "$as_me:${as_lineno-$LINENO}: result: fine" >&5
+-$as_echo "fine" >&6; }
+-else
+- { $as_echo "$as_me:${as_lineno-$LINENO}: result: failed" >&5
+-$as_echo "failed" >&6; }
+- as_fn_error $? "one or more libs available at link-time are not available run-time. Libs used at link-time: $LIBS" "$LINENO" 5
+-
+-fi
+-rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
+- conftest.$ac_objext conftest.beam conftest.$ac_ext
+-fi
+-
+-
+- fi
+-
+-
+ # The cast to long int works around a bug in the HP C Compiler
+ # version HP92453-01 B.11.11.23709.GP, which incorrectly rejects
+ # declarations like `int a3[[(sizeof (unsigned char)) >= 0]];'.
+--- curl-7.27.0-32/configure.orig Wed Jun 5 21:59:24 2013
++++ curl-7.27.0-32/configure Wed Jun 5 22:00:14 2013
+@@ -25386,7 +25386,9 @@
+ esac
+
+
++cross_compiling=yes
+
++
+ # The cast to long int works around a bug in the HP C Compiler
+ # version HP92453-01 B.11.11.23709.GP, which incorrectly rejects
+ # declarations like `int a3[[(sizeof (unsigned char)) >= 0]];'.
+--- curl-7.27.0-32/configure.ac.orig Wed Jun 5 21:59:19 2013
++++ curl-7.27.0-32/configure.ac Wed Jun 5 21:59:34 2013
+@@ -2887,6 +2887,8 @@
+ AC_HEADER_TIME
+ CURL_CHECK_STRUCT_TIMEVAL
+
++cross_compiling=yes
++
+ AC_CHECK_SIZEOF(size_t)
+ AC_CHECK_SIZEOF(long)
+ AC_CHECK_SIZEOF(int)
Oops, something went wrong.

0 comments on commit 4a3c89e

Please sign in to comment.