Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Browse files

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

…tform
  • Loading branch information...
commit 4a3c89eb792d0f992cb7b97c26fc63f1f2d05536 1 parent 273199e
@wesolows wesolows authored
View
19 .gitignore
@@ -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
View
239 curl/Patches/sunw-openssl.diff
@@ -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)
View
120 ipmitool/Patches/configure.diff
@@ -225,3 +225,123 @@ diff -ur ipmitool-1.8.11/configure.in ipmitool-1.8.11-joyent/configure.in
[if test "x$enable_internal_md5" != "xyes"; then
if test "x$have_crypto" != "xyes" && test "x$have_md5" != "xyes"; then
LIBS="$LIBS -lcrypto"
+--- ipmitool-1.8.11-32/configure.orig Wed Jun 5 22:13:14 2013
++++ ipmitool-1.8.11-32/configure Wed Jun 5 22:14:12 2013
+@@ -22148,13 +22148,13 @@
+ enable_internal_md5=no
+ fi;
+
+-echo "$as_me:$LINENO: checking for sunw_EVP_aes_128_cbc in -lcrypto" >&5
+-echo $ECHO_N "checking for sunw_EVP_aes_128_cbc in -lcrypto... $ECHO_C" >&6
++echo "$as_me:$LINENO: checking for sunw_EVP_aes_128_cbc in -lsunw_crypto" >&5
++echo $ECHO_N "checking for sunw_EVP_aes_128_cbc in -lsunw_crypto... $ECHO_C" >&6
+ if test "${ac_cv_lib_crypto_sunw_EVP_aes_128_cbc+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+ ac_check_lib_save_LIBS=$LIBS
+-LIBS="-lcrypto -lcrypto $LIBS"
++LIBS="-lsunw_crypto -lsunw_crypto $LIBS"
+ cat >conftest.$ac_ext <<_ACEOF
+ /* confdefs.h. */
+ _ACEOF
+@@ -22214,7 +22214,7 @@
+ echo "${ECHO_T}$ac_cv_lib_crypto_sunw_EVP_aes_128_cbc" >&6
+ if test $ac_cv_lib_crypto_sunw_EVP_aes_128_cbc = yes; then
+ if test "x$enable_internal_md5" != "xyes"; then
+- have_crypto=yes; LIBS="$LIBS -lcrypto"
++ have_crypto=yes; LIBS="$LIBS -lsunw_crypto"
+ fi
+ else
+ have_crypto=no
+@@ -22221,13 +22221,13 @@
+ fi
+
+
+-echo "$as_me:$LINENO: checking for sunw_MD5_Init in -lcrypto" >&5
+-echo $ECHO_N "checking for sunw_MD5_Init in -lcrypto... $ECHO_C" >&6
++echo "$as_me:$LINENO: checking for sunw_MD5_Init in -lsunw_crypto" >&5
++echo $ECHO_N "checking for sunw_MD5_Init in -lsunw_crypto... $ECHO_C" >&6
+ if test "${ac_cv_lib_crypto_sunw_MD5_Init+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+ ac_check_lib_save_LIBS=$LIBS
+-LIBS="-lcrypto -lcrypto $LIBS"
++LIBS="-lsunw_crypto -lsunw_crypto $LIBS"
+ cat >conftest.$ac_ext <<_ACEOF
+ /* confdefs.h. */
+ _ACEOF
+@@ -22288,7 +22288,7 @@
+ if test $ac_cv_lib_crypto_sunw_MD5_Init = yes; then
+ if test "x$enable_internal_md5" != "xyes"; then
+ if test "x$have_crypto" != "xyes"; then
+- LIBS="$LIBS -lcrypto"
++ LIBS="$LIBS -lsunw_crypto"
+ have_md5=yes
+ fi
+
+@@ -22300,13 +22300,13 @@
+ fi
+
+
+-echo "$as_me:$LINENO: checking for sunw_MD2_Init in -lcrypto" >&5
+-echo $ECHO_N "checking for sunw_MD2_Init in -lcrypto... $ECHO_C" >&6
++echo "$as_me:$LINENO: checking for sunw_MD2_Init in -lsunw_crypto" >&5
++echo $ECHO_N "checking for sunw_MD2_Init in -lsunw_crypto... $ECHO_C" >&6
+ if test "${ac_cv_lib_crypto_sunw_MD2_Init+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+ ac_check_lib_save_LIBS=$LIBS
+-LIBS="-lcrypto -lcrypto $LIBS"
++LIBS="-lsunw_crypto -lsunw_crypto $LIBS"
+ cat >conftest.$ac_ext <<_ACEOF
+ /* confdefs.h. */
+ _ACEOF
+@@ -22367,7 +22367,7 @@
+ if test $ac_cv_lib_crypto_sunw_MD2_Init = yes; then
+ if test "x$enable_internal_md5" != "xyes"; then
+ if test "x$have_crypto" != "xyes" && test "x$have_md5" != "xyes"; then
+- LIBS="$LIBS -lcrypto"
++ LIBS="$LIBS -lsunw_crypto"
+ have_md2=yes
+ fi
+
+--- ipmitool-1.8.11-32/configure.in.orig Wed Jun 5 22:14:56 2013
++++ ipmitool-1.8.11-32/configure.in Wed Jun 5 22:15:40 2013
+@@ -116,28 +116,28 @@
+ [enable internal MD5 library [default=no]])],
+ [], [enable_internal_md5=no])
+
+-AC_CHECK_LIB([crypto], [sunw_EVP_aes_128_cbc],
++AC_CHECK_LIB([sunw_crypto], [sunw_EVP_aes_128_cbc],
+ [if test "x$enable_internal_md5" != "xyes"; then
+- have_crypto=yes; LIBS="$LIBS -lcrypto"
+- fi], [have_crypto=no], [-lcrypto])
++ have_crypto=yes; LIBS="$LIBS -lsunw_crypto"
++ fi], [have_crypto=no], [-lsunw_crypto])
+
+-AC_CHECK_LIB([crypto], [sunw_MD5_Init],
++AC_CHECK_LIB([sunw_crypto], [sunw_MD5_Init],
+ [if test "x$enable_internal_md5" != "xyes"; then
+ if test "x$have_crypto" != "xyes"; then
+- LIBS="$LIBS -lcrypto"
++ LIBS="$LIBS -lsunw_crypto"
+ have_md5=yes
+ fi
+ AC_DEFINE(HAVE_CRYPTO_MD5, [1], [Define to 1 if libcrypto supports MD5.])
+- fi], [], [-lcrypto])
++ fi], [], [-lsunw_crypto])
+
+-AC_CHECK_LIB([crypto], [sunw_MD2_Init],
++AC_CHECK_LIB([sunw_crypto], [sunw_MD2_Init],
+ [if test "x$enable_internal_md5" != "xyes"; then
+ if test "x$have_crypto" != "xyes" && test "x$have_md5" != "xyes"; then
+- LIBS="$LIBS -lcrypto"
++ LIBS="$LIBS -lsunw_crypto"
+ have_md2=yes
+ fi
+ AC_DEFINE(HAVE_CRYPTO_MD2, [1], [Define to 1 if libcrypto supports MD2.])
+- fi], [], [-lcrypto])
++ fi], [], [-lsunw_crypto])
+
+ dnl enable IPMIv1.5 LAN interface
+ AC_ARG_ENABLE([intf-lan],
View
16 manifest
@@ -461,21 +461,21 @@ f usr/sbin/lldpneighbors 0555 root bin
f usr/bin/amd64/openssl 0555 root bin
s usr/sfw/bin/amd64/openssl=../../../bin/amd64/openssl
f lib/amd64/libcrypto.so.0.9.8 0755 root bin
-f lib/amd64/libcrypto.so.1.0.0 0755 root bin
+f lib/amd64/libsunw_crypto.so.1.0.0 0755 root bin
s usr/lib/amd64/libcrypto.so.0.9.8=../../../lib/amd64/libcrypto.so.0.9.8
-s usr/lib/amd64/libcrypto.so.1.0.0=../../../lib/amd64/libcrypto.so.1.0.0
+s usr/lib/amd64/libsunw_crypto.so.1.0.0=../../../lib/amd64/libsunw_crypto.so.1.0.0
f lib/amd64/libssl.so.0.9.8 0755 root bin
-f lib/amd64/libssl.so.1.0.0 0755 root bin
+f lib/amd64/libsunw_ssl.so.1.0.0 0755 root bin
s usr/lib/amd64/libssl.so.0.9.8=../../../lib/amd64/libssl.so.0.9.8
-s usr/lib/amd64/libssl.so.1.0.0=../../../lib/amd64/libssl.so.1.0.0
+s usr/lib/amd64/libsunw_ssl.so.1.0.0=../../../lib/amd64/libsunw_ssl.so.1.0.0
f lib/libcrypto.so.0.9.8 0755 root bin
-f lib/libcrypto.so.1.0.0 0755 root bin
+f lib/libsunw_crypto.so.1.0.0 0755 root bin
s usr/lib/libcrypto.so.0.9.8=../../lib/libcrypto.so.0.9.8
-s usr/lib/libcrypto.so.1.0.0=../../lib/libcrypto.so.1.0.0
+s usr/lib/libsunw_crypto.so.1.0.0=../../lib/libsunw_crypto.so.1.0.0
f lib/libssl.so.0.9.8 0755 root bin
-f lib/libssl.so.1.0.0 0755 root bin
+f lib/libsunw_ssl.so.1.0.0 0755 root bin
s usr/lib/libssl.so.0.9.8=../../lib/libssl.so.0.9.8
-s usr/lib/libssl.so.1.0.0=../../lib/libssl.so.1.0.0
+s usr/lib/libsunw_ssl.so.1.0.0=../../lib/libsunw_ssl.so.1.0.0
f usr/bin/CA.pl 0555 root bin
f usr/bin/openssl 0555 root bin
s usr/sfw/bin/openssl=../../bin/openssl
View
23 node.js/Makefile
@@ -51,6 +51,7 @@ AUTOCONF_OPTS += \
--openssl-use-sys \
--openssl-libpath=$(DESTDIR)/lib \
--openssl-includes=$(DESTDIR)/usr/include \
+ --shared-openssl-libname=sunw_crypto,sunw_ssl \
--shared-zlib \
--shared-zlib-libpath=$(DESTDIR)/lib \
--shared-zlib-includes=$(DESTDIR)/usr/include \
@@ -68,11 +69,11 @@ AUTOCONF_ENV += CXXFLAGS="$(CPPFLAGS) $(CFLAGS)"
# patch to the python configure program is also required to make this work.
#
AUTOCONF_ENV += LDFLAGS.host="-Wl,-i"
-AUTOCONF_ENV += CXX.host="$(GXX.host)"
-AUTOCONF_ENV += CC.host="$(GCC.host)"
-AUTOCONF_ENV += CXX_host="$(GXX.host)"
-AUTOCONF_ENV += CC_host="$(GCC.host)"
-AUTOCONF_ENV += LINK.host="$(GXX.host)"
+AUTOCONF_ENV += CXX.host="$(BASE)/wrapper $(GXX.host)"
+AUTOCONF_ENV += CC.host="$(BASE)/wrapper $(GCC.host)"
+AUTOCONF_ENV += CXX_host="$(BASE)/wrapper $(GXX.host)"
+AUTOCONF_ENV += CC_host="$(BASE)/wrapper $(GCC.host)"
+AUTOCONF_ENV += LINK.host="$(BASE)/wrapper $(GXX.host)"
OVERRIDES += $(AUTOCONF_ENV)
@@ -83,6 +84,8 @@ CLEANFILES += genversionjs
all: all_autoconf
+all_autoconf: wrapper
+
#
# We build a host tool against the installed header so that we can spew a
# JavaScript file containing the version of the installed node.js binary.
@@ -90,6 +93,16 @@ all: all_autoconf
genversionjs: genversionjs.c install_autoconf
$(GCC.host) -o $@ -include $(NODE_ROOT)/include/node/node_version.h $<
+#
+# Ready for another hack? This wrapper "translates" target gcc options into
+# ones suitable for running on the host during the build. This is needed
+# because node's build system doesn't have any way to pass different options
+# for the host and taget, and tries to build host tools as part of the build.
+# Hooray, node!
+#
+wrapper: wrapper.c
+ $(GCC.host) -Wall -Wextra -Werror -O2 -o $@ $<
+
# - platform_node_version.js is autogenerated with the current node version
# - we move man pages as we want them in /usr/node/0.8/man
install: install_autoconf genversionjs
View
54 node.js/wrapper.c
@@ -0,0 +1,54 @@
+#include <sys/types.h>
+#include <stdlib.h>
+#include <unistd.h>
+#include <err.h>
+#include <errno.h>
+#include <string.h>
+
+static const struct subst {
+ const char *s_in;
+ const char *s_out;
+} stbl[] = {
+ {
+ .s_in = "-lsunw_crypto",
+ .s_out = "-lcrypto"
+ },
+ {
+ .s_in = "-lsunw_ssl",
+ .s_out = "-lssl"
+ }
+};
+
+static const uint_t n_substs = sizeof (stbl) / sizeof (stbl[0]);
+
+int
+main(int argc, char *argv[])
+{
+ const char **nargv;
+ uint_t i, j;
+
+ if (argc < 2)
+ err(-1, "Usage: %s <compiler> <arguments...>", argv[0]);
+
+ if ((nargv = malloc(argc * sizeof (char *))) == NULL)
+ err(-1, "malloc");
+
+ nargv[0] = argv[1];
+
+ for (i = 2; i < (uint_t)argc; i++) {
+ nargv[i - 1] = argv[i];
+ for (j = 0; j < n_substs; j++) {
+ if (strcmp(argv[i], stbl[j].s_in) == 0) {
+ nargv[i - 1] = stbl[j].s_out;
+ break;
+ }
+ }
+ }
+
+ nargv[argc - 1] = NULL;
+
+ if (execvp(nargv[0], (char **)nargv) != 0)
+ err(-1, "failed to exec %s", nargv[0]);
+
+ _exit(0);
+}
View
83 openldap/Patches/sunw-openssl.diff
@@ -5690,3 +5690,86 @@ diff -ur openldap-2.4.26/configure.in openldap-2.4.26-32/configure.in
need_rsaref=yes], [have_openssl=no],
[-lcrypto -lRSAglue -lrsaref])
Only in openldap-2.4.26-32: libtool
+--- openldap-2.4.26-32/configure.in.orig Wed Jun 5 22:21:56 2013
++++ openldap-2.4.26-32/configure.in Wed Jun 5 22:22:38 2013
+@@ -1161,16 +1161,16 @@
+ AC_CHECK_HEADERS(openssl/ssl.h)
+
+ if test $ac_cv_header_openssl_ssl_h = yes ; then
+- AC_CHECK_LIB(ssl, sunw_SSL_library_init,
++ AC_CHECK_LIB(sunw_ssl, sunw_SSL_library_init,
+ [have_openssl=yes
+ need_rsaref=no], [have_openssl=no],
+- [-lcrypto])
++ [-lsunw_crypto])
+
+ if test $have_openssl = no ; then
+- AC_CHECK_LIB(ssl, sunw_ssl3_accept,
++ AC_CHECK_LIB(sunw_ssl, sunw_ssl3_accept,
+ [have_openssl=yes
+ need_rsaref=yes], [have_openssl=no],
+- [-lcrypto -lRSAglue -lrsaref])
++ [-lsunw_crypto -lRSAglue -lrsaref])
+ fi
+
+ if test $have_openssl = yes ; then
+@@ -1184,9 +1184,9 @@
+ AC_DEFINE(HAVE_RSAREF, 1,
+ [define if OpenSSL needs RSAref])
+
+- TLS_LIBS="-lssl -lcrypto -lRSAglue -lrsaref"
++ TLS_LIBS="-lsunw_ssl -lsunw_crypto -lRSAglue -lrsaref"
+ else
+- TLS_LIBS="-lssl -lcrypto"
++ TLS_LIBS="-lsunw_ssl -lsunw_crypto"
+ fi
+
+ OL_SSL_COMPAT
+--- openldap-2.4.26-32/configure.orig Wed Jun 5 22:21:51 2013
++++ openldap-2.4.26-32/configure Wed Jun 5 22:23:46 2013
+@@ -15443,13 +15443,13 @@
+
+
+ if test $ac_cv_header_openssl_ssl_h = yes ; then
+- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for sunw_SSL_library_init in -lssl" >&5
+-$as_echo_n "checking for sunw_SSL_library_init in -lssl... " >&6; }
++ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for sunw_SSL_library_init in -lsunw_ssl" >&5
++$as_echo_n "checking for sunw_SSL_library_init in -lsunw_ssl... " >&6; }
+ if ${ac_cv_lib_ssl_sunw_SSL_library_init+:} false; then :
+ $as_echo_n "(cached) " >&6
+ else
+ ac_check_lib_save_LIBS=$LIBS
+-LIBS="-lssl -lcrypto $LIBS"
++LIBS="-lsunw_ssl -lsunw_crypto $LIBS"
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+ /* end confdefs.h. */
+
+@@ -15488,13 +15488,13 @@
+
+
+ if test $have_openssl = no ; then
+- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for sunw_ssl3_accept in -lssl" >&5
+-$as_echo_n "checking for sunw_ssl3_accept in -lssl... " >&6; }
++ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for sunw_ssl3_accept in -lsunw_ssl" >&5
++$as_echo_n "checking for sunw_ssl3_accept in -lsunw_ssl... " >&6; }
+ if ${ac_cv_lib_ssl_sunw_ssl3_accept+:} false; then :
+ $as_echo_n "(cached) " >&6
+ else
+ ac_check_lib_save_LIBS=$LIBS
+-LIBS="-lssl -lcrypto -lRSAglue -lrsaref $LIBS"
++LIBS="-lsunw_ssl -lsunw_crypto -lRSAglue -lrsaref $LIBS"
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+ /* end confdefs.h. */
+
+@@ -15546,9 +15546,9 @@
+ $as_echo "#define HAVE_RSAREF 1" >>confdefs.h
+
+
+- TLS_LIBS="-lssl -lcrypto -lRSAglue -lrsaref"
++ TLS_LIBS="-lsunw_ssl -lsunw_crypto -lRSAglue -lrsaref"
+ else
+- TLS_LIBS="-lssl -lcrypto"
++ TLS_LIBS="-lsunw_ssl -lsunw_crypto"
+ fi
+
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking OpenSSL library version (CRL checking capability)" >&5
View
8 openssl1x/Makefile
@@ -52,10 +52,10 @@ PKCS11.32 = $(PKCS11_SRCS:%=$(PKCS11_DST.32)/%)
PKCS11.64 = $(PKCS11_SRCS:%=$(PKCS11_DST.64)/%)
CHECK_LIBS = \
- $(VER.32)/libcrypto.so.$(LIBVER) \
- $(VER.32)/libssl.so.$(LIBVER) \
- $(VER.64)/libcrypto.so.$(LIBVER) \
- $(VER.64)/libssl.so.$(LIBVER)
+ $(VER.32)/libsunw_crypto.so.$(LIBVER) \
+ $(VER.32)/libsunw_ssl.so.$(LIBVER) \
+ $(VER.64)/libsunw_crypto.so.$(LIBVER) \
+ $(VER.64)/libsunw_ssl.so.$(LIBVER)
#
# There are races between the building of assembly language sources and
View
107 openssl1x/Patches/prefix.diff
@@ -80,3 +80,110 @@ diff -urN openssl-1.0.1c/crypto/opensslconf.h.in openssl-1.0.1c-32/crypto/openss
/* Generate 80386 code? */
#undef I386_ONLY
+--- openssl-1.0.1d-32/ssl/Makefile.orig Wed Jun 5 20:12:33 2013
++++ openssl-1.0.1d-32/ssl/Makefile Wed Jun 5 20:12:43 2013
+@@ -19,7 +19,7 @@
+ APPS=
+
+ LIB=$(TOP)/libssl.a
+-SHARED_LIB= libssl$(SHLIB_EXT)
++SHARED_LIB= libsunw_ssl$(SHLIB_EXT)
+ LIBSRC= \
+ s2_meth.c s2_srvr.c s2_clnt.c s2_lib.c s2_enc.c s2_pkt.c \
+ s3_meth.c s3_srvr.c s3_clnt.c s3_lib.c s3_enc.c s3_pkt.c s3_both.c s3_cbc.c \
+--- openssl-1.0.1d-32/crypto/Makefile.orig Wed Jun 5 20:12:14 2013
++++ openssl-1.0.1d-32/crypto/Makefile Wed Jun 5 20:12:24 2013
+@@ -33,7 +33,7 @@
+ GENERAL=Makefile README crypto-lib.com install.com
+
+ LIB= $(TOP)/libcrypto.a
+-SHARED_LIB= libcrypto$(SHLIB_EXT)
++SHARED_LIB= libsunw_crypto$(SHLIB_EXT)
+ LIBSRC= cryptlib.c mem.c mem_clr.c mem_dbg.c cversion.c ex_data.c cpt_err.c \
+ ebcdic.c uid.c o_time.c o_str.c o_dir.c o_fips.c o_init.c fips_ers.c
+ LIBOBJ= cryptlib.o mem.o mem_dbg.o cversion.o ex_data.o cpt_err.o ebcdic.o \
+--- openssl-1.0.1d-32/Makefile.org.orig Wed Jun 5 21:04:03 2013
++++ openssl-1.0.1d-32/Makefile.org Wed Jun 5 21:09:12 2013
+@@ -170,8 +170,8 @@
+ EDIRS= times doc bugs util include certs ms shlib mt demos perl sf dep VMS
+ WDIRS= windows
+ LIBS= libcrypto.a libssl.a
+-SHARED_CRYPTO=libcrypto$(SHLIB_EXT)
+-SHARED_SSL=libssl$(SHLIB_EXT)
++SHARED_CRYPTO=libsunw_crypto$(SHLIB_EXT)
++SHARED_SSL=libsunw_ssl$(SHLIB_EXT)
+ SHARED_LIBS=
+ SHARED_LIBS_LINK_EXTS=
+ SHARED_LDFLAGS=
+@@ -295,7 +295,7 @@
+ $(FIPSLIBDIR)fips_premain.c $(FIPSLIBDIR)fipscanister.o \
+ libcrypto.a $(EX_LIBS)
+
+-libcrypto$(SHLIB_EXT): libcrypto.a fips_premain_dso$(EXE_EXT)
++libsunw_crypto$(SHLIB_EXT): libcrypto.a fips_premain_dso$(EXE_EXT)
+ @if [ "$(SHLIB_TARGET)" != "" ]; then \
+ if [ "$(FIPSCANLIB)" = "libcrypto" ]; then \
+ FIPSLD_LIBCRYPTO=libcrypto.a ; \
+@@ -308,9 +308,9 @@
+ exit 1; \
+ fi
+
+-libssl$(SHLIB_EXT): libcrypto$(SHLIB_EXT) libssl.a
++libsunw_ssl$(SHLIB_EXT): libsunw_crypto$(SHLIB_EXT) libssl.a
+ @if [ "$(SHLIB_TARGET)" != "" ]; then \
+- $(MAKE) SHLIBDIRS=ssl SHLIBDEPS='-lcrypto' build-shared; \
++ $(MAKE) SHLIBDIRS=ssl SHLIBDEPS='-lsunw_crypto' build-shared; \
+ else \
+ echo "There's no support for shared libraries on this platform" >&2; \
+ exit 1; \
+@@ -336,7 +336,7 @@
+ LIBNAME=$$i LIBVERSION=$(SHLIB_MAJOR).$(SHLIB_MINOR) \
+ LIBCOMPATVERSIONS=";$(SHLIB_VERSION_HISTORY)" \
+ symlink.$(SHLIB_TARGET); \
+- libs="$$libs -l$$i"; \
++ libs="$$libs -lsunw_$$i"; \
+ done
+
+ build-shared: do_$(SHLIB_TARGET) link-shared
+@@ -351,7 +351,7 @@
+ LIBCOMPATVERSIONS=";$(SHLIB_VERSION_HISTORY)" \
+ LIBDEPS="$$libs $(EX_LIBS)" \
+ link_a.$(SHLIB_TARGET); \
+- libs="-l$$i $$libs"; \
++ libs="-lsunw_$$i $$libs"; \
+ done
+
+ libcrypto.pc: Makefile
+--- openssl-1.0.1d-32/Makefile.shared.orig Wed Jun 5 21:04:10 2013
++++ openssl-1.0.1d-32/Makefile.shared Wed Jun 5 21:07:16 2013
+@@ -368,7 +368,7 @@
+ $(CALC_VERSIONS); \
+ MINUSZ='-z '; \
+ ($(CC) -v 2>&1 | grep gcc) > /dev/null && MINUSZ='-Wl,-z,'; \
+- SHLIB=lib$(LIBNAME).so; \
++ SHLIB=libsunw_$(LIBNAME).so; \
+ SHLIB_SUFFIX=; \
+ ALLSYMSFLAGS="$${MINUSZ}allextract"; \
+ NOALLSYMSFLAGS="$${MINUSZ}defaultextract"; \
+@@ -382,7 +382,7 @@
+ $(CALC_VERSIONS); \
+ MINUSZ='-z '; \
+ ($(CC) -v 2>&1 | grep gcc) > /dev/null && MINUSZ='-Wl,-z,'; \
+- SHLIB=lib$(LIBNAME).so; \
++ SHLIB=libsunw_$(LIBNAME).so; \
+ SHLIB_SUFFIX=;\
+ ALLSYMSFLAGS="$${MINUSZ}allextract"; \
+ NOALLSYMSFLAGS="$${MINUSZ}defaultextract"; \
+--- openssl-1.0.1d-32/apps/Makefile.orig Wed Jun 5 21:18:05 2013
++++ openssl-1.0.1d-32/apps/Makefile Wed Jun 5 21:18:21 2013
+@@ -26,8 +26,8 @@
+
+ DLIBCRYPTO=../libcrypto.a
+ DLIBSSL=../libssl.a
+-LIBCRYPTO=-L.. -lcrypto
+-LIBSSL=-L.. -lssl
++LIBCRYPTO=-L.. -lsunw_crypto
++LIBSSL=-L.. -lsunw_ssl
+
+ PROGRAM= openssl
+
View
19 openssl1x/install-sfw
@@ -49,14 +49,17 @@ source ../install.subr
cd $VERDIR
# Install libraries
-_install D libcrypto.so.${LIBVER} ${LIBDIR}/libcrypto.so.${LIBVER} 0755
-_install L libcrypto.so.${LIBVER} ${LIBDIR}/libcrypto.so
-_install D libssl.so.${LIBVER} ${LIBDIR}/libssl.so.${LIBVER} 0755
-_install L libssl.so.${LIBVER} ${LIBDIR}/libssl.so
-_install L ../../lib/libcrypto.so.${LIBVER} ${USRLIBDIR}/libcrypto.so.${LIBVER}
-_install L ../../lib/libcrypto.so ${USRLIBDIR}/libcrypto.so
-_install L ../../lib/libssl.so.${LIBVER} ${USRLIBDIR}/libssl.so.${LIBVER}
-_install L ../../lib/libssl.so ${USRLIBDIR}/libssl.so
+_install D libsunw_crypto.so.${LIBVER} \
+ ${LIBDIR}/libsunw_crypto.so.${LIBVER} 0755
+_install L libsunw_crypto.so.${LIBVER} ${LIBDIR}/libsunw_crypto.so
+_install D libsunw_ssl.so.${LIBVER} ${LIBDIR}/libsunw_ssl.so.${LIBVER} 0755
+_install L libsunw_ssl.so.${LIBVER} ${LIBDIR}/libsunw_ssl.so
+_install L ../../lib/libsunw_crypto.so.${LIBVER} \
+ ${USRLIBDIR}/libsunw_crypto.so.${LIBVER}
+_install L ../../lib/libsunw_crypto.so ${USRLIBDIR}/libsunw_crypto.so
+_install L ../../lib/libsunw_ssl.so.${LIBVER} \
+ ${USRLIBDIR}/libsunw_ssl.so.${LIBVER}
+_install L ../../lib/libsunw_ssl.so ${USRLIBDIR}/libsunw_ssl.so
# Install commands
_install P apps/CA.pl ${BINDIR}/CA.pl 0555
View
20 openssl1x/install-sfw-64
@@ -53,14 +53,18 @@ _install E apps/openssl ${BINDIR}/openssl 0555
_install L ../../../bin/amd64/openssl ${SFWBINDIR}/openssl
# Install libraries
-_install D libcrypto.so.${LIBVER} ${LIBDIR}/libcrypto.so.${LIBVER} 0755
-_install L libcrypto.so.${LIBVER} ${LIBDIR}/libcrypto.so
-_install D libssl.so.${LIBVER} ${LIBDIR}/libssl.so.${LIBVER} 0755
-_install L libssl.so.${LIBVER} ${LIBDIR}/libssl.so
+_install D libsunw_crypto.so.${LIBVER} \
+ ${LIBDIR}/libsunw_crypto.so.${LIBVER} 0755
+_install L libsunw_crypto.so.${LIBVER} ${LIBDIR}/libsunw_crypto.so
+_install D libsunw_ssl.so.${LIBVER} ${LIBDIR}/libsunw_ssl.so.${LIBVER} 0755
+_install L libsunw_ssl.so.${LIBVER} ${LIBDIR}/libsunw_ssl.so
_install L amd64 ${DESTDIR}/lib/64
-_install L ../../../lib/amd64/libcrypto.so.${LIBVER} ${USRLIBDIR}/libcrypto.so.${LIBVER}
-_install L ../../../lib/amd64/libcrypto.so ${USRLIBDIR}/libcrypto.so
-_install L ../../../lib/amd64/libssl.so.${LIBVER} ${USRLIBDIR}/libssl.so.${LIBVER}
-_install L ../../../lib/amd64/libssl.so ${USRLIBDIR}/libssl.so
+_install L ../../../lib/amd64/libsunw_crypto.so.${LIBVER} \
+ ${USRLIBDIR}/libsunw_crypto.so.${LIBVER}
+_install L ../../../lib/amd64/libsunw_crypto.so \
+ ${USRLIBDIR}/libsunw_crypto.so
+_install L ../../../lib/amd64/libsunw_ssl.so.${LIBVER} \
+ ${USRLIBDIR}/libsunw_ssl.so.${LIBVER}
+_install L ../../../lib/amd64/libsunw_ssl.so ${USRLIBDIR}/libsunw_ssl.so
exit 0
View
31,192 wget/Patches/sunw-openssl.diff
31,192 additions, 0 deletions not shown
Please sign in to comment.
Something went wrong with that request. Please try again.