summaryrefslogtreecommitdiff
path: root/openssl/openssllnx.patch
diff options
context:
space:
mode:
Diffstat (limited to 'openssl/openssllnx.patch')
-rw-r--r--openssl/openssllnx.patch65
1 files changed, 17 insertions, 48 deletions
diff --git a/openssl/openssllnx.patch b/openssl/openssllnx.patch
index 7f26b997bd1c..abd10061ff5c 100644
--- a/openssl/openssllnx.patch
+++ b/openssl/openssllnx.patch
@@ -1,6 +1,6 @@
---- misc/build/openssl-0.9.8l/Configure-old 2010-04-17 13:51:42.000000000 +0200
-+++ misc/build/openssl-0.9.8l/Configure 2010-04-17 13:52:03.000000000 +0200
-@@ -382,6 +382,9 @@
+--- misc/build/openssl-0.9.8o/Configure-old 2010-04-17 13:51:42.000000000 +0200
++++ misc/build/openssl-0.9.8o/Configure 2010-04-17 13:52:03.000000000 +0200
+@@ -388,6 +388,9 @@
"bsdi-elf-gcc", "gcc:-DPERL5 -DL_ENDIAN -fomit-frame-pointer -O3 -march=i486 -Wall::(unknown)::-ldl:BN_LLONG ${x86_gcc_des} ${x86_gcc_opts}:${x86_elf_asm}:dlfcn:bsd-gcc-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
@@ -10,43 +10,12 @@
"nextstep", "cc:-O -Wall:<libc.h>:(unknown):::BN_LLONG ${x86_gcc_des} ${x86_gcc_opts}:::",
"nextstep3.3", "cc:-O3 -Wall:<libc.h>:(unknown):::BN_LLONG ${x86_gcc_des} ${x86_gcc_opts}:::",
---- misc/openssl-0.9.8l/test/Makefile 2009-03-25 11:59:22.000000000 +0100
-+++ misc/build/openssl-0.9.8l/test/Makefile 2009-03-30 12:51:00.210108929 +0200
-@@ -408,7 +408,7 @@
- LIBRARIES="$(LIBCRYPTO)"; \
- fi; \
- $(MAKE) -f $(TOP)/Makefile.shared -e \
-- CC=$${CC} APPNAME=$$target$(EXE_EXT) OBJECTS="$$target.o" \
-+ CC="$${CC}" APPNAME=$$target$(EXE_EXT) OBJECTS="$$target.o" \
- LIBDEPS="$(PEX_LIBS) $$LIBRARIES $(EX_LIBS)" \
- link_app.$${shlib_target}
-
-@@ -421,7 +421,7 @@
- fi; \
- [ "$(FIPSCANLIB)" = "libfips" ] && LIBRARIES="$$LIBRARIES -lfips"; \
- $(MAKE) -f $(TOP)/Makefile.shared -e \
-- CC=$${CC} APPNAME=$$target$(EXE_EXT) OBJECTS="$$target.o" \
-+ CC="$${CC}" APPNAME=$$target$(EXE_EXT) OBJECTS="$$target.o" \
- LIBDEPS="$(PEX_LIBS) $$LIBRARIES $(EX_LIBS)" \
- link_app.$${shlib_target}
-
---- misc/openssl-0.9.8l/apps/Makefile 2008-11-19 17:03:48.000000000 +0100
-+++ misc/build/openssl-0.9.8l/apps/Makefile 2009-03-30 12:50:56.332719825 +0200
-@@ -158,7 +158,7 @@
- LIBRARIES="$(LIBSSL) $(LIBKRB5) $(LIBCRYPTO)" ; \
- [ "x$(FIPSCANLIB)" = "xlibfips" ] && LIBRARIES="$$LIBRARIES -lfips"; \
- $(MAKE) -f $(TOP)/Makefile.shared -e \
-- CC=$${CC} APPNAME=$(EXE) OBJECTS="$(PROGRAM).o $(E_OBJ)" \
-+ CC="$${CC}" APPNAME=$(EXE) OBJECTS="$(PROGRAM).o $(E_OBJ)" \
- LIBDEPS="$(PEX_LIBS) $$LIBRARIES $(EX_LIBS)" \
- link_app.$${shlib_target}
- -(cd ..; \
---- misc/openssl-0.9.8l/config 2009-02-16 09:43:41.000000000 +0100
-+++ misc/build/openssl-0.9.8l/config 2009-03-30 08:59:09.588448000 +0200
+--- misc/openssl-0.9.8o/config 2009-02-16 09:43:41.000000000 +0100
++++ misc/build/openssl-0.9.8o/config 2009-03-30 08:59:09.588448000 +0200
@@ -399,27 +399,21 @@
# this is where the translation occurs into SSLeay terms
# ---------------------------------------------------------------------------
-
+
-GCCVER=`(gcc -dumpversion) 2>/dev/null`
-if [ "$GCCVER" != "" ]; then
- # then strip off whatever prefix egcs prepends the number with...
@@ -85,12 +54,12 @@
+ fi
fi
GCCVER=${GCCVER:-0}
- if [ "$SYSTEM" = "HP-UX" ];then
---- misc/openssl-0.9.8l/libcrypto_OOo_0_9_8l.map Tue Jan 27 19:52:14 2009
-+++ misc/build/openssl-0.9.8l/libcrypto_OOo_0_9_8l.map Tue Jan 27 19:51:04 2009
-@@ -1,1 +1,3295 @@
+ if [ "$SYSTEM" = "HP-UX" ];then
+--- misc/openssl-0.9.8o/libcrypto_OOo_0_9_8o.map 2010-03-26 15:26:55.958495757 +0100
++++ misc/build/openssl-0.9.8o/libcrypto_OOo_0_9_8o.map 2010-03-26 15:31:38.019501422 +0100
+@@ -1 +1,3295 @@
-dummy
-+LIBCRYPTO_OOO_0_9_8l {
++LIBCRYPTO_OOO_0_9_8o {
+ global:
+ACCESS_DESCRIPTION_free;
+ACCESS_DESCRIPTION_it;
@@ -1409,7 +1378,7 @@
+KRB5_TKTBODY_free;
+KRB5_TKTBODY_it;
+KRB5_TKTBODY_new;
-+LIBCRYPTO_OOO_0_9_8l;
++LIBCRYPTO_OOO_0_9_8o;
+LONG_it;
+MD2;
+MD2_Final;
@@ -3385,11 +3354,11 @@
+ local:
+ *;
+};
---- misc/openssl-0.9.8l/libssl_OOo_0_9_8l.map Tue Jan 27 19:52:14 2009
-+++ misc/build/openssl-0.9.8l/libssl_OOo_0_9_8l.map Tue Jan 27 19:51:04 2009
-@@ -1,1 +1,445 @@
+--- misc/openssl-0.9.8o/libssl_OOo_0_9_8o.map 2010-03-26 15:26:55.966057991 +0100
++++ misc/build/openssl-0.9.8o/libssl_OOo_0_9_8o.map 2010-03-26 15:31:58.552966503 +0100
+@@ -1 +1,445 @@
-dummy
-+LIBSSL_OOO_0_9_8l {
++LIBSSL_OOO_0_9_8o {
+ global:
+BIO_f_ssl;
+BIO_new_buffer_ssl_connect;
@@ -3402,7 +3371,7 @@
+DTLSv1_method;
+DTLSv1_server_method;
+ERR_load_SSL_strings;
-+LIBSSL_OOO_0_9_8l;
++LIBSSL_OOO_0_9_8o;
+SSL_CIPHER_description;
+SSL_CIPHER_get_bits;
+SSL_CIPHER_get_name;