Skip to content

Commit 4a3c89e

Browse files
author
Keith M Wesolowski
committed
OS-2257 unusable SSL libraries should have different names in the platform
1 parent 273199e commit 4a3c89e

File tree

12 files changed

+31863
-37
lines changed

12 files changed

+31863
-37
lines changed

‎.gitignore

+15-4
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,14 @@
11
/bash/bash-4.1-32
22
/bind/bind-9.8.0-32
3+
/binutils/binutils-2.22-32
34
/bzip2/bzip2-1.0.6
45
/bzip2/bzgrep.tmp
56
/coreutils/coreutils-8.13-32
6-
/curl/curl-7.21.2-32
7+
/cpp/cpp
8+
/cpp/cpp.o
9+
/cpp/y.tab.c
10+
/cpp/y.tab.o
11+
/curl/curl-7.27.0-32
712
/dialog/dialog-1.1-20111020-32
813
/g11n/proto/
914
/g11n/src/lib/iconv/common/amd64/
@@ -18,7 +23,7 @@
1823
/g11n/src/lib/iconv/utf-8/*.o
1924
/g11n/src/lib/iconv/utf-8/*.so
2025
/gcc4/gcc-4.4.4-32
21-
/gcc4/gcc-4.4.4-i386-build
26+
/gcc4/gcc-4.4.4-32.build/
2227
/gnupg/gnupg-1.4.11-32
2328
/gtar/tar-1.23-32
2429
/gzip/gzip-1.3.5-32
@@ -32,13 +37,16 @@
3237
/libm/usr/src/libm/wos/f80387
3338
/libm/usr/src/libm/wos/libmvec
3439
/libm/usr/src/libm/wos64/amd64
35-
/libxml/libxml2-2.7.6
40+
/libxml/libxml2-2.7.6-32
3641
/libxml/libxml2-2.7.6-64
3742
/libz/zlib-1.2.3-32
3843
/libz/zlib-1.2.3-64
44+
/make/.unpack32
45+
/make/usr-32
3946
/ncurses/ncurses-5.7-32
4047
/ncurses/ncurses-5.7-64
4148
/node.js/genversionjs
49+
/node.js/wrapper
4250
/node.js/node-v0.8.20-32
4351
/nss-nspr/nss-3.12.8-32
4452
/nss-nspr/nss-3.12.8-64
@@ -47,14 +55,17 @@
4755
/openlldp/openlldp-0.4alpha-32
4856
/openssl/openssl-0.9.8x
4957
/openssl/openssl-0.9.8x-64
58+
/openssl1x/openssl-1.0.1d-32
59+
/openssl1x/openssl-1.0.1d-64
5060
/pbzip2/pbzip2-1.1.6-32
5161
/perl/perl-5.12.3-32
62+
/perl/Config_heavy.pl
5263
/proto
5364
/rsync/rsync-3.0.6-32
5465
/rsyslog/rsyslog-5.8.9-32
5566
/screen/screen-4.0.3-32
5667
/socat/socat-1.7.1.3-32
57-
/tun/tun-1.1-64
68+
/tun/tun-1.3-64
5869
/uuid/uuid-1.6.2-32
5970
/vim/vim73-32
6071
/wget/wget-1.12-32

‎curl/Patches/sunw-openssl.diff

+239
Original file line numberDiff line numberDiff line change
@@ -6113,3 +6113,242 @@ diff -ur curl-7.27.0/m4/curl-openssl.m4 curl-7.27.0-32/m4/curl-openssl.m4
61136113
],[
61146114
tst_api="0x091"
61156115
])
6116+
--- curl-7.27.0-32/configure.ac.orig Wed Jun 5 21:38:11 2013
6117+
+++ curl-7.27.0-32/configure.ac Wed Jun 5 21:39:16 2013
6118+
@@ -1508,15 +1508,15 @@
6119+
;;
6120+
esac
6121+
6122+
- AC_CHECK_LIB(crypto, sunw_CRYPTO_lock,[
6123+
+ AC_CHECK_LIB(sunw_crypto, sunw_CRYPTO_lock,[
6124+
HAVECRYPTO="yes"
6125+
- LIBS="-lcrypto $LIBS"
6126+
+ LIBS="-lsunw_crypto $LIBS"
6127+
],[
6128+
LDFLAGS="$CLEANLDFLAGS -L$LIB_OPENSSL"
6129+
CPPFLAGS="$CLEANCPPFLAGS -I$PREFIX_OPENSSL/include/openssl -I$PREFIX_OPENSSL/include"
6130+
- AC_CHECK_LIB(crypto, sunw_CRYPTO_add_lock,[
6131+
+ AC_CHECK_LIB(sunw_crypto, sunw_CRYPTO_add_lock,[
6132+
HAVECRYPTO="yes"
6133+
- LIBS="-lcrypto $LIBS"], [
6134+
+ LIBS="-lsunw_crypto $LIBS"], [
6135+
LDFLAGS="$CLEANLDFLAGS"
6136+
CPPFLAGS="$CLEANCPPFLAGS"
6137+
LIBS="$CLEANLIBS"
6138+
@@ -1528,7 +1528,7 @@
6139+
dnl This is only reasonable to do if crypto actually is there: check for
6140+
dnl SSL libs NOTE: it is important to do this AFTER the crypto lib
6141+
6142+
- AC_CHECK_LIB(ssl, sunw_SSL_connect)
6143+
+ AC_CHECK_LIB(sunw_ssl, sunw_SSL_connect)
6144+
6145+
if test "$ac_cv_lib_ssl_sunw_SSL_connect" != yes; then
6146+
dnl we didn't find the SSL lib, try the RSAglue/rsaref stuff
6147+
@@ -1535,7 +1535,7 @@
6148+
AC_MSG_CHECKING(for ssl with RSAglue/rsaref libs in use);
6149+
OLIBS=$LIBS
6150+
LIBS="$LIBS -lRSAglue -lrsaref"
6151+
- AC_CHECK_LIB(ssl, sunw_SSL_connect)
6152+
+ AC_CHECK_LIB(sunw_ssl, sunw_SSL_connect)
6153+
if test "$ac_cv_lib_ssl_sunw_SSL_connect" != yes; then
6154+
dnl still no SSL_connect
6155+
AC_MSG_RESULT(no)
6156+
--- curl-7.27.0-32/configure.orig Wed Jun 5 21:38:18 2013
6157+
+++ curl-7.27.0-32/configure Wed Jun 5 21:40:26 2013
6158+
@@ -20740,13 +20740,13 @@
6159+
;;
6160+
esac
6161+
6162+
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for sunw_CRYPTO_lock in -lcrypto" >&5
6163+
-$as_echo_n "checking for sunw_CRYPTO_lock in -lcrypto... " >&6; }
6164+
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for sunw_CRYPTO_lock in -lsunw_crypto" >&5
6165+
+$as_echo_n "checking for sunw_CRYPTO_lock in -lsunw_crypto... " >&6; }
6166+
if ${ac_cv_lib_crypto_sunw_CRYPTO_lock+:} false; then :
6167+
$as_echo_n "(cached) " >&6
6168+
else
6169+
ac_check_lib_save_LIBS=$LIBS
6170+
-LIBS="-lcrypto $LIBS"
6171+
+LIBS="-lsunw_crypto $LIBS"
6172+
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
6173+
/* end confdefs.h. */
6174+
6175+
@@ -20776,19 +20776,19 @@
6176+
if test "x$ac_cv_lib_crypto_sunw_CRYPTO_lock" = xyes; then :
6177+
6178+
HAVECRYPTO="yes"
6179+
- LIBS="-lcrypto $LIBS"
6180+
+ LIBS="-lsunw_crypto $LIBS"
6181+
6182+
else
6183+
6184+
LDFLAGS="$CLEANLDFLAGS -L$LIB_OPENSSL"
6185+
CPPFLAGS="$CLEANCPPFLAGS -I$PREFIX_OPENSSL/include/openssl -I$PREFIX_OPENSSL/include"
6186+
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for sunw_CRYPTO_add_lock in -lcrypto" >&5
6187+
-$as_echo_n "checking for sunw_CRYPTO_add_lock in -lcrypto... " >&6; }
6188+
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for sunw_CRYPTO_add_lock in -lsunw_crypto" >&5
6189+
+$as_echo_n "checking for sunw_CRYPTO_add_lock in -lsunw_crypto... " >&6; }
6190+
if ${ac_cv_lib_crypto_sunw_CRYPTO_add_lock+:} false; then :
6191+
$as_echo_n "(cached) " >&6
6192+
else
6193+
ac_check_lib_save_LIBS=$LIBS
6194+
-LIBS="-lcrypto $LIBS"
6195+
+LIBS="-lsunw_crypto $LIBS"
6196+
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
6197+
/* end confdefs.h. */
6198+
6199+
@@ -20818,7 +20818,7 @@
6200+
if test "x$ac_cv_lib_crypto_sunw_CRYPTO_add_lock" = xyes; then :
6201+
6202+
HAVECRYPTO="yes"
6203+
- LIBS="-lcrypto $LIBS"
6204+
+ LIBS="-lsunw_crypto $LIBS"
6205+
else
6206+
6207+
LDFLAGS="$CLEANLDFLAGS"
6208+
@@ -20834,13 +20834,13 @@
6209+
6210+
if test X"$HAVECRYPTO" = X"yes"; then
6211+
6212+
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for sunw_SSL_connect in -lssl" >&5
6213+
-$as_echo_n "checking for sunw_SSL_connect in -lssl... " >&6; }
6214+
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for sunw_SSL_connect in -lsunw_ssl" >&5
6215+
+$as_echo_n "checking for sunw_SSL_connect in -lsunw_ssl... " >&6; }
6216+
if ${ac_cv_lib_ssl_sunw_SSL_connect+:} false; then :
6217+
$as_echo_n "(cached) " >&6
6218+
else
6219+
ac_check_lib_save_LIBS=$LIBS
6220+
-LIBS="-lssl $LIBS"
6221+
+LIBS="-lsunw_ssl $LIBS"
6222+
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
6223+
/* end confdefs.h. */
6224+
6225+
@@ -20872,7 +20872,7 @@
6226+
#define HAVE_LIBSSL 1
6227+
_ACEOF
6228+
6229+
- LIBS="-lssl $LIBS"
6230+
+ LIBS="-lsunw_ssl $LIBS"
6231+
6232+
fi
6233+
6234+
@@ -20882,13 +20882,13 @@
6235+
$as_echo_n "checking for ssl with RSAglue/rsaref libs in use... " >&6; };
6236+
OLIBS=$LIBS
6237+
LIBS="$LIBS -lRSAglue -lrsaref"
6238+
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for sunw_SSL_connect in -lssl" >&5
6239+
-$as_echo_n "checking for sunw_SSL_connect in -lssl... " >&6; }
6240+
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for sunw_SSL_connect in -lsunw_ssl" >&5
6241+
+$as_echo_n "checking for sunw_SSL_connect in -lsunw_ssl... " >&6; }
6242+
if ${ac_cv_lib_ssl_sunw_SSL_connect+:} false; then :
6243+
$as_echo_n "(cached) " >&6
6244+
else
6245+
ac_check_lib_save_LIBS=$LIBS
6246+
-LIBS="-lssl $LIBS"
6247+
+LIBS="-lsunw_ssl $LIBS"
6248+
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
6249+
/* end confdefs.h. */
6250+
6251+
@@ -20920,7 +20920,7 @@
6252+
#define HAVE_LIBSSL 1
6253+
_ACEOF
6254+
6255+
- LIBS="-lssl $LIBS"
6256+
+ LIBS="-lsunw_ssl $LIBS"
6257+
6258+
fi
6259+
6260+
@@ -21921,13 +21921,13 @@
6261+
fi
6262+
6263+
if test "$OPENSSL_ENABLED" = "1"; then
6264+
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for SRP_Calc_client_key in -lcrypto" >&5
6265+
-$as_echo_n "checking for SRP_Calc_client_key in -lcrypto... " >&6; }
6266+
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for SRP_Calc_client_key in -lsunw_crypto" >&5
6267+
+$as_echo_n "checking for SRP_Calc_client_key in -lsunw_crypto... " >&6; }
6268+
if ${ac_cv_lib_crypto_SRP_Calc_client_key+:} false; then :
6269+
$as_echo_n "(cached) " >&6
6270+
else
6271+
ac_check_lib_save_LIBS=$LIBS
6272+
-LIBS="-lcrypto $LIBS"
6273+
+LIBS="-lsunw_crypto $LIBS"
6274+
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
6275+
/* end confdefs.h. */
6276+
6277+
--- curl-7.27.0-32/configure.ac.orig Wed Jun 5 21:45:37 2013
6278+
+++ curl-7.27.0-32/configure.ac Wed Jun 5 21:45:51 2013
6279+
@@ -2886,7 +2886,6 @@
6280+
AC_TYPE_SIZE_T
6281+
AC_HEADER_TIME
6282+
CURL_CHECK_STRUCT_TIMEVAL
6283+
-CURL_VERIFY_RUNTIMELIBS
6284+
6285+
AC_CHECK_SIZEOF(size_t)
6286+
AC_CHECK_SIZEOF(long)
6287+
--- curl-7.27.0-32/configure.orig Wed Jun 5 21:45:42 2013
6288+
+++ curl-7.27.0-32/configure Wed Jun 5 21:46:24 2013
6289+
@@ -25387,42 +25387,6 @@
6290+
6291+
6292+
6293+
- if test "x$cross_compiling" != xyes; then
6294+
-
6295+
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking run-time libs availability" >&5
6296+
-$as_echo_n "checking run-time libs availability... " >&6; }
6297+
- if test "$cross_compiling" = yes; then :
6298+
- { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
6299+
-$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
6300+
-as_fn_error $? "cannot run test program while cross compiling
6301+
-See \`config.log' for more details" "$LINENO" 5; }
6302+
-else
6303+
- cat confdefs.h - <<_ACEOF >conftest.$ac_ext
6304+
-/* end confdefs.h. */
6305+
-
6306+
-main()
6307+
-{
6308+
- return 0;
6309+
-}
6310+
-
6311+
-_ACEOF
6312+
-if ac_fn_c_try_run "$LINENO"; then :
6313+
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: fine" >&5
6314+
-$as_echo "fine" >&6; }
6315+
-else
6316+
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: failed" >&5
6317+
-$as_echo "failed" >&6; }
6318+
- as_fn_error $? "one or more libs available at link-time are not available run-time. Libs used at link-time: $LIBS" "$LINENO" 5
6319+
-
6320+
-fi
6321+
-rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
6322+
- conftest.$ac_objext conftest.beam conftest.$ac_ext
6323+
-fi
6324+
-
6325+
-
6326+
- fi
6327+
-
6328+
-
6329+
# The cast to long int works around a bug in the HP C Compiler
6330+
# version HP92453-01 B.11.11.23709.GP, which incorrectly rejects
6331+
# declarations like `int a3[[(sizeof (unsigned char)) >= 0]];'.
6332+
--- curl-7.27.0-32/configure.orig Wed Jun 5 21:59:24 2013
6333+
+++ curl-7.27.0-32/configure Wed Jun 5 22:00:14 2013
6334+
@@ -25386,7 +25386,9 @@
6335+
esac
6336+
6337+
6338+
+cross_compiling=yes
6339+
6340+
+
6341+
# The cast to long int works around a bug in the HP C Compiler
6342+
# version HP92453-01 B.11.11.23709.GP, which incorrectly rejects
6343+
# declarations like `int a3[[(sizeof (unsigned char)) >= 0]];'.
6344+
--- curl-7.27.0-32/configure.ac.orig Wed Jun 5 21:59:19 2013
6345+
+++ curl-7.27.0-32/configure.ac Wed Jun 5 21:59:34 2013
6346+
@@ -2887,6 +2887,8 @@
6347+
AC_HEADER_TIME
6348+
CURL_CHECK_STRUCT_TIMEVAL
6349+
6350+
+cross_compiling=yes
6351+
+
6352+
AC_CHECK_SIZEOF(size_t)
6353+
AC_CHECK_SIZEOF(long)
6354+
AC_CHECK_SIZEOF(int)

0 commit comments

Comments
 (0)