Attachment #85674 for issue #127116

View | Details | Raw Unified | Return to issue 127116
Collapse All | Expand All

Lines 153-161 Link Here

(-)main/external_deps.lst (-3 / +3 lines)
153	URL2 = $(OOO_EXTRAS)$(MD5)-$(name)	153	URL2 = $(OOO_EXTRAS)$(MD5)-$(name)
154		154
155	if (SYSTEM_OPENSSL!=YES && DISABLE_OPENSSL!=TRUE)	155	if (SYSTEM_OPENSSL!=YES && DISABLE_OPENSSL!=TRUE)
156	MD5 = 0a912b6623ac95a8627ea2bd0e0abf1b	156	MD5 = c813c065dd53d7bd0a560a870ddd0af5
157	name = openssl-0.9.8zg.tar.gz	157	name = openssl-0.9.8zh.tar.gz
158	URL1 = http://www.openssl.org/source/openssl-0.9.8zg.tar.gz	158	URL1 = https://www.openssl.org/source/old/0.9.x/openssl-0.9.8zh.tar.gz
159	URL2 = $(OOO_EXTRAS)$(MD5)-$(name)	159	URL2 = $(OOO_EXTRAS)$(MD5)-$(name)
160		160
161	if ( true )	161	if ( true )




	@echo "openssl disabled...."
.ENDIF

OPENSSL_NAME=openssl-0.9.8zh

TARFILE_NAME=$(OPENSSL_NAME)
TARFILE_MD5=c813c065dd53d7bd0a560a870ddd0af5

CONFIGURE_DIR=.
CONFIGURE_ACTION=config

.IF "$(OS)" == "LINUX" || "$(OS)" == "FREEBSD"
	PATCH_FILES=openssllnx.patch
	ADDITIONAL_FILES:= \
		libcrypto_OOo_0_9_8zh.map \
		libssl_OOo_0_9_8zh.map
	.IF "$(CPU)" == "I"
		.IF "$(UNAME)" == "GNU/kFreeBSD"
			CONFIGURE_ACTION=Configure debian-kfreebsd-i386

.IF "$(OS)" == "SOLARIS"
	PATCH_FILES=opensslsol.patch
	ADDITIONAL_FILES:= \
		libcrypto_OOo_0_9_8zh.map \
		libssl_OOo_0_9_8zh.map
	#BUILD_ACTION=make 'SHARED_LDFLAGS=-G -dy -z text -M./lib$$$$$$$$(SHLIBDIRS)_OOo_0_9_8e.map'

	# Use BUILD64 when 1 to select new specific 64bit Configurations if necessary

	.ENDIF
.ENDIF

PATCH_FILES += openssl-0.9.8zh-clang.patch

#set INCLUDE=D:\sol_temp\n\msvc7net3\PlatformSDK\include;D:\sol_temp\n\msvc7net3\include\ && set path=%path%;D:\sol_temp\r\btw\SRC680\perl\bin &&


Lines 1-11 Link Here

(-)main/openssl/openssl-0.9.8zg-clang.patch

Line 0 Link Here

(-)main/openssl/openssl.patch (+1 lines)
	1	--- misc/openssl-0.9.8zh/crypto/md32_common.h 2015-09-20 11:10:48.263008317 -0500
Lines 1-5 Link Here

Lines 9-16 Link Here

(-)- misc/openssl-0.9.8zg/crypto/x509v3/v3_pci.c
9	* (Royal Institute of Technology, Stockholm, Sweden).	9	* (Royal Institute of Technology, Stockholm, Sweden).
10	* All rights reserved.	10	* All rights reserved.
11	*	11	*

Lines 20-27 Link Here

(-)- misc/openssl-0.9.8zg/crypto/x509v3/v3_pcia.c
20	* (Royal Institute of Technology, Stockholm, Sweden).	20	* (Royal Institute of Technology, Stockholm, Sweden).
21	* All rights reserved.	21	* All rights reserved.
22	*	22	*

Lines 41-48 Link Here

(-)- misc/openssl-0.9.8zg/ms/do_ms.bat
41	-perl util\mkdef.pl 32 ssleay > ms\ssleay32.def	41	-perl util\mkdef.pl 32 ssleay > ms\ssleay32.def
42	+%1 util\mkdef.pl 32 libeay > ms\libeay32.def	42	+%1 util\mkdef.pl 32 libeay > ms\libeay32.def
43	+%1 util\mkdef.pl 32 ssleay > ms\ssleay32.def	43	+%1 util\mkdef.pl 32 ssleay > ms\ssleay32.def

Lines 73-80 Link Here

(-)- misc/openssl-0.9.8zg/util/mk1mf.pl
73	#define PLATFORM "$platform"	73	#define PLATFORM "$platform"
74	EOF	74	EOF
75	printf OUT " #define DATE \"%s\"\n", scalar gmtime();	75	printf OUT " #define DATE \"%s\"\n", scalar gmtime();

Lines 1-5 Link Here

(-)main/openssl/openssllnx.patch

Lines 10-17 Link Here

(-)- misc/build/openssl-0.9.8zg/Configure-old
10	"nextstep", "cc:-O -Wall:<libc.h>:(unknown):::BN_LLONG ${x86_gcc_des} ${x86_gcc_opts}:::",	10	"nextstep", "cc:-O -Wall:<libc.h>:(unknown):::BN_LLONG ${x86_gcc_des} ${x86_gcc_opts}:::",
11	"nextstep3.3", "cc:-O3 -Wall:<libc.h>:(unknown):::BN_LLONG ${x86_gcc_des} ${x86_gcc_opts}:::",	11	"nextstep3.3", "cc:-O3 -Wall:<libc.h>:(unknown):::BN_LLONG ${x86_gcc_des} ${x86_gcc_opts}:::",
12		12

Lines 21-28 Link Here

(-)- misc/build/openssl-0.9.8zg/Makefile.org
21	AR='${AR}' PERL='${PERL}' RANLIB='${RANLIB}' \	21	AR='${AR}' PERL='${PERL}' RANLIB='${RANLIB}' \
22	SDIRS='${SDIRS}' LIBRPATH='${INSTALLTOP}/$(LIBDIR)' \	22	SDIRS='${SDIRS}' LIBRPATH='${INSTALLTOP}/$(LIBDIR)' \
23	INSTALL_PREFIX='${INSTALL_PREFIX}' \	23	INSTALL_PREFIX='${INSTALL_PREFIX}' \

Lines 66-76 Link Here

(-)- misc/openssl-0.9.8zg/config
66	fi	66	fi
67	GCCVER=${GCCVER:-0}	67	GCCVER=${GCCVER:-0}
68	if [ "$SYSTEM" = "HP-UX" ];then	68	if [ "$SYSTEM" = "HP-UX" ];then

Lines 1389-1395 Link Here

(-)- misc/openssl-0.9.8zg/libcrypto_OOo_0_9_8zg.map (-1 / +1 lines)
1389	+KRB5_TKTBODY_free;	1389	+KRB5_TKTBODY_free;
1390	+KRB5_TKTBODY_it;	1390	+KRB5_TKTBODY_it;
1391	+KRB5_TKTBODY_new;	1391	+KRB5_TKTBODY_new;
1392	+libcrypto_OOo_0_9_8zg;	1392	+libcrypto_OOo_0_9_8zh;
1393	+LONG_it;	1393	+LONG_it;
1394	+MD2;	1394	+MD2;
1395	+MD2_Final;	1395	+MD2_Final;
Lines 3365-3375 Link Here
3365	+ local:	3365	+ local:
3366	+ *;	3366	+ *;
3367	+};	3367	+};

Lines 3382-3388 Link Here

(-)- misc/openssl-0.9.8zg/libssl_OOo_0_9_8zg.map (-1 / +1 lines)
3382	+DTLSv1_method;	3382	+DTLSv1_method;
3383	+DTLSv1_server_method;	3383	+DTLSv1_server_method;
3384	+ERR_load_SSL_strings;	3384	+ERR_load_SSL_strings;
3385	+LIBSSL_OOO_0_9_8zg;	3385	+LIBSSL_OOO_0_9_8zh;
3386	+SSL_CIPHER_description;	3386	+SSL_CIPHER_description;
3387	+SSL_CIPHER_get_bits;	3387	+SSL_CIPHER_get_bits;
3388	+SSL_CIPHER_get_name;	3388	+SSL_CIPHER_get_name;

Lines 1-7 Link Here

(-)main/openssl/opensslmacosx.patch

Lines 3304-3313 Link Here

(-)- misc/build/openssl-0.9.8zg/libcrypto_OOo_0_9_8zg.map
3304	+ local:	3304	+ local:
3305	+ *;	3305	+ *;
3306	+};	3306	+};

Lines 1-5 Link Here

(-)main/openssl/opensslmingw.patch

Lines 21-28 Link Here

(-)- misc/openssl-0.9.8zg/Makefile.shared
21	[ -f apps/$$SHLIB$$SHLIB_SUFFIX ] && rm apps/$$SHLIB$$SHLIB_SUFFIX; \	21	[ -f apps/$$SHLIB$$SHLIB_SUFFIX ] && rm apps/$$SHLIB$$SHLIB_SUFFIX; \
22	[ -f test/$$SHLIB$$SHLIB_SUFFIX ] && rm test/$$SHLIB$$SHLIB_SUFFIX; \	22	[ -f test/$$SHLIB$$SHLIB_SUFFIX ] && rm test/$$SHLIB$$SHLIB_SUFFIX; \
23	$(LINK_SO_A) \|\| exit 1; \	23	$(LINK_SO_A) \|\| exit 1; \

Lines 32-39 Link Here

(-)- misc/openssl-0.9.8zg/e_os2.h
32	# define OPENSSL_DECLARE_GLOBAL(type,name) type *_shadow_##name(void)	32	# define OPENSSL_DECLARE_GLOBAL(type,name) type *_shadow_##name(void)
33	# define OPENSSL_GLOBAL_REF(name) (*(_shadow_##name()))	33	# define OPENSSL_GLOBAL_REF(name) (*(_shadow_##name()))
34	#else	34	#else

Lines 79-86 Link Here

(-)- misc/openssl-0.9.8zg/ms/mingw32.bat
79	echo Done compiling OpenSSL	79	echo Done compiling OpenSSL
80		80
81	:end	81	:end

Lines 1-5 Link Here

(-)main/openssl/opensslsol.patch

Lines 11-18 Link Here

(-)- misc/openssl-0.9.8zg/Configure
11		11
12	#### SPARC Solaris with GNU C setups	12	#### SPARC Solaris with GNU C setups
13	"solaris-sparcv7-gcc","gcc:-O3 -fomit-frame-pointer -Wall -DB_ENDIAN -DBN_DIV2W::-D_REENTRANT::-lsocket -lnsl -ldl:BN_LLONG RC4_CHAR RC4_CHUNK DES_UNROLL BF_PTR:${no_asm}:dlfcn:solaris-shared:-fPIC:-shared:.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",	13	"solaris-sparcv7-gcc","gcc:-O3 -fomit-frame-pointer -Wall -DB_ENDIAN -DBN_DIV2W::-D_REENTRANT::-lsocket -lnsl -ldl:BN_LLONG RC4_CHAR RC4_CHUNK DES_UNROLL BF_PTR:${no_asm}:dlfcn:solaris-shared:-fPIC:-shared:.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",

Lines 31-38 Link Here

(-)- misc/openssl-0.9.8zg/Makefile.shared
31	$${SHAREDCMD} $${SHAREDFLAGS} \	31	$${SHAREDCMD} $${SHAREDFLAGS} \
32	-o $$SHLIB$$SHLIB_SOVER$$SHLIB_SUFFIX \	32	-o $$SHLIB$$SHLIB_SOVER$$SHLIB_SUFFIX \
33	$$ALLSYMSFLAGS $$SHOBJECTS $$NOALLSYMSFLAGS $$LIBDEPS \	33	$$ALLSYMSFLAGS $$SHOBJECTS $$NOALLSYMSFLAGS $$LIBDEPS \

Lines 79-89 Link Here

(-)- misc/openssl-0.9.8zg/config
79	GCCVER=${GCCVER:-0}	79	GCCVER=${GCCVER:-0}
80	if [ "$SYSTEM" = "HP-UX" ];then	80	if [ "$SYSTEM" = "HP-UX" ];then
81	# By default gcc is a ILP32 compiler (with long long == 64).	81	# By default gcc is a ILP32 compiler (with long long == 64).

Lines 1402-1408 Link Here

(-)- misc/openssl-0.9.8zg/libcrypto_OOo_0_9_8zg.map (-1 / +1 lines)
1402	+KRB5_TKTBODY_free;	1402	+KRB5_TKTBODY_free;
1403	+KRB5_TKTBODY_it;	1403	+KRB5_TKTBODY_it;
1404	+KRB5_TKTBODY_new;	1404	+KRB5_TKTBODY_new;
1405	+LIBCRYPTO_OOO_0_9_8zg;	1405	+LIBCRYPTO_OOO_0_9_8zh;
1406	+LONG_it;	1406	+LONG_it;
1407	+MD2;	1407	+MD2;
1408	+MD2_Final;	1408	+MD2_Final;
Lines 3379-3389 Link Here
3379	+ *;	3379	+ *;
3380	+};	3380	+};
3381	+	3381	+

Lines 3396-3402 Link Here

(-)- misc/openssl-0.9.8zg/libssl_OOo_0_9_8zg.map (-1 / +1 lines)
3396	+DTLSv1_method;	3396	+DTLSv1_method;
3397	+DTLSv1_server_method;	3397	+DTLSv1_server_method;
3398	+ERR_load_SSL_strings;	3398	+ERR_load_SSL_strings;
3399	+LIBSSL_OOO_0_9_8zg;	3399	+LIBSSL_OOO_0_9_8zh;
3400	+SSL_CIPHER_description;	3400	+SSL_CIPHER_description;
3401	+SSL_CIPHER_get_bits;	3401	+SSL_CIPHER_get_bits;
3402	+SSL_CIPHER_get_name;	3402	+SSL_CIPHER_get_name;

Lines 22-29 Link Here

(-)main/openssl/version.mk (-2 / +2 lines)
22		22
23		23
24		24
25	OPENSSL_VERSION=0.9.8zg	25	OPENSSL_VERSION=0.9.8zh
26		26
27	.IF "$(OS)" == "SOLARIS"	27	.IF "$(OS)" == "SOLARIS"
28	OPENSSL_NAME=openssl-0.9.8zg	28	OPENSSL_NAME=openssl-0.9.8zh
29	.ENDIF	29	.ENDIF

Return to issue 127116

Lines 42-51 Link Here

(-)main/openssl/makefile.mk (-7 / +7 lines)
42	@echo "openssl disabled...."	42	@echo "openssl disabled...."
43	.ENDIF	43	.ENDIF
44		44
45	OPENSSL_NAME=openssl-0.9.8zg	45	OPENSSL_NAME=openssl-0.9.8zh
46		46
47	TARFILE_NAME=$(OPENSSL_NAME)	47	TARFILE_NAME=$(OPENSSL_NAME)
48	TARFILE_MD5=0a912b6623ac95a8627ea2bd0e0abf1b	48	TARFILE_MD5=c813c065dd53d7bd0a560a870ddd0af5
49		49
50	CONFIGURE_DIR=.	50	CONFIGURE_DIR=.
51	CONFIGURE_ACTION=config	51	CONFIGURE_ACTION=config
Lines 63-70 Link Here
63	.IF "$(OS)" == "LINUX" \|\| "$(OS)" == "FREEBSD"	63	.IF "$(OS)" == "LINUX" \|\| "$(OS)" == "FREEBSD"
64	PATCH_FILES=openssllnx.patch	64	PATCH_FILES=openssllnx.patch
65	ADDITIONAL_FILES:= \	65	ADDITIONAL_FILES:= \
66	libcrypto_OOo_0_9_8zg.map \	66	libcrypto_OOo_0_9_8zh.map \
67	libssl_OOo_0_9_8zg.map	67	libssl_OOo_0_9_8zh.map
68	.IF "$(CPU)" == "I"	68	.IF "$(CPU)" == "I"
69	.IF "$(UNAME)" == "GNU/kFreeBSD"	69	.IF "$(UNAME)" == "GNU/kFreeBSD"
70	CONFIGURE_ACTION=Configure debian-kfreebsd-i386	70	CONFIGURE_ACTION=Configure debian-kfreebsd-i386
Lines 87-94 Link Here
87	.IF "$(OS)" == "SOLARIS"	87	.IF "$(OS)" == "SOLARIS"
88	PATCH_FILES=opensslsol.patch	88	PATCH_FILES=opensslsol.patch
89	ADDITIONAL_FILES:= \	89	ADDITIONAL_FILES:= \
90	libcrypto_OOo_0_9_8zg.map \	90	libcrypto_OOo_0_9_8zh.map \
91	libssl_OOo_0_9_8zg.map	91	libssl_OOo_0_9_8zh.map
92	#BUILD_ACTION=make 'SHARED_LDFLAGS=-G -dy -z text -M./lib$$$$$$$$(SHLIBDIRS)_OOo_0_9_8e.map'	92	#BUILD_ACTION=make 'SHARED_LDFLAGS=-G -dy -z text -M./lib$$$$$$$$(SHLIBDIRS)_OOo_0_9_8e.map'
93		93
94	# Use BUILD64 when 1 to select new specific 64bit Configurations if necessary	94	# Use BUILD64 when 1 to select new specific 64bit Configurations if necessary
Lines 159-165 Link Here
159	.ENDIF	159	.ENDIF
160	.ENDIF	160	.ENDIF
161		161
162	PATCH_FILES += openssl-0.9.8zg-clang.patch	162	PATCH_FILES += openssl-0.9.8zh-clang.patch
163		163
164	#set INCLUDE=D:\sol_temp\n\msvc7net3\PlatformSDK\include;D:\sol_temp\n\msvc7net3\include\ && set path=%path%;D:\sol_temp\r\btw\SRC680\perl\bin &&	164	#set INCLUDE=D:\sol_temp\n\msvc7net3\PlatformSDK\include;D:\sol_temp\n\msvc7net3\include\ && set path=%path%;D:\sol_temp\r\btw\SRC680\perl\bin &&
165		165