r1535 - in trunk: . openssl

jim at linuxfromscratch.org jim at linuxfromscratch.org
Thu May 18 19:47:52 PDT 2006


Author: jim
Date: 2006-05-18 20:47:47 -0600 (Thu, 18 May 2006)
New Revision: 1535

Added:
   trunk/openssl/openssl-0.9.8b-allow_lib64-2.patch
Modified:
   trunk/
Log:
 r1698 at server:  jim | 2006-05-18 19:46:23 -0700
 Added: openssl-0.9.8b-allow_lib64-2.patch



Property changes on: trunk
___________________________________________________________________
Name: svk:merge
   - cc2644d5-6cf8-0310-b111-c40428001e49:/patches:1710
e59974df-c20a-0410-b7e1-d7eaf1be8828:/patches:1686
   + cc2644d5-6cf8-0310-b111-c40428001e49:/patches:1710
e59974df-c20a-0410-b7e1-d7eaf1be8828:/patches:1698

Added: trunk/openssl/openssl-0.9.8b-allow_lib64-2.patch
===================================================================
--- trunk/openssl/openssl-0.9.8b-allow_lib64-2.patch	                        (rev 0)
+++ trunk/openssl/openssl-0.9.8b-allow_lib64-2.patch	2006-05-19 02:47:47 UTC (rev 1535)
@@ -0,0 +1,745 @@
+Submitted By: Jeremy Utley (jeremy at jutley dot org)
+Date: 2006-05-18
+Initial Package Version: 0.9.8b
+Origin: Based on work by Ryan Oliver & Jim Gifford
+Upstream Status: Unknown
+Description: Allows lib{32,64} by adding LIBDIR= to the make line - new OpenSSL
+introduces changes to engines/Makefile that causes the previous patch to fail.
+This new patch corrects that.
+
+diff -Naur openssl-0.9.8b/Makefile.org openssl-0.9.8b-new/Makefile.org
+--- openssl-0.9.8b/Makefile.org	2006-02-10 08:52:56.000000000 +0000
++++ openssl-0.9.8b-new/Makefile.org	2006-05-19 02:02:41.048137327 +0000
+@@ -70,6 +70,7 @@
+ TAR= tar
+ TARFLAGS= --no-recursion
+ MAKEDEPPROG=makedepend
++LIBDIR=lib
+ 
+ # We let the C compiler driver to take care of .s files. This is done in
+ # order to be excused from maintaining a separate set of architecture
+@@ -172,7 +173,7 @@
+ 		CC='${CC}' CFLAG='${CFLAG}' 			\
+ 		AS='${CC}' ASFLAG='${CFLAG} -c'			\
+ 		AR='${AR}' PERL='${PERL}' RANLIB='${RANLIB}'	\
+-		SDIRS='${SDIRS}' LIBRPATH='${INSTALLTOP}/lib'	\
++		SDIRS='${SDIRS}' LIBRPATH='${INSTALLTOP}/$(LIBDIR)'	\
+ 		INSTALL_PREFIX='${INSTALL_PREFIX}'		\
+ 		INSTALLTOP='${INSTALLTOP}' OPENSSLDIR='${OPENSSLDIR}'	\
+ 		MAKEDEPEND='$$$${TOP}/util/domd $$$${TOP} -MD ${MAKEDEPPROG}' \
+@@ -301,7 +302,7 @@
+ libcrypto.pc: Makefile
+ 	@ ( echo 'prefix=$(INSTALLTOP)'; \
+ 	    echo 'exec_prefix=$${prefix}'; \
+-	    echo 'libdir=$${exec_prefix}/lib'; \
++	    echo 'libdir=$${exec_prefix}/$(LIBDIR)'; \
+ 	    echo 'includedir=$${prefix}/include'; \
+ 	    echo ''; \
+ 	    echo 'Name: OpenSSL-libcrypto'; \
+@@ -314,7 +315,7 @@
+ libssl.pc: Makefile
+ 	@ ( echo 'prefix=$(INSTALLTOP)'; \
+ 	    echo 'exec_prefix=$${prefix}'; \
+-	    echo 'libdir=$${exec_prefix}/lib'; \
++	    echo 'libdir=$${exec_prefix}/$(LIBDIR)'; \
+ 	    echo 'includedir=$${prefix}/include'; \
+ 	    echo ''; \
+ 	    echo 'Name: OpenSSL'; \
+@@ -327,7 +328,7 @@
+ openssl.pc: Makefile
+ 	@ ( echo 'prefix=$(INSTALLTOP)'; \
+ 	    echo 'exec_prefix=$${prefix}'; \
+-	    echo 'libdir=$${exec_prefix}/lib'; \
++	    echo 'libdir=$${exec_prefix}/$(LIBDIR)'; \
+ 	    echo 'includedir=$${prefix}/include'; \
+ 	    echo ''; \
+ 	    echo 'Name: OpenSSL'; \
+@@ -477,9 +478,9 @@
+ 
+ install_sw:
+ 	@$(PERL) $(TOP)/util/mkdir-p.pl $(INSTALL_PREFIX)$(INSTALLTOP)/bin \
+-		$(INSTALL_PREFIX)$(INSTALLTOP)/lib \
+-		$(INSTALL_PREFIX)$(INSTALLTOP)/lib/engines \
+-		$(INSTALL_PREFIX)$(INSTALLTOP)/lib/pkgconfig \
++		$(INSTALL_PREFIX)$(INSTALLTOP)/$(LIBDIR) \
++		$(INSTALL_PREFIX)$(INSTALLTOP)/$(LIBDIR)/engines \
++		$(INSTALL_PREFIX)$(INSTALLTOP)/$(LIBDIR)/pkgconfig \
+ 		$(INSTALL_PREFIX)$(INSTALLTOP)/include/openssl \
+ 		$(INSTALL_PREFIX)$(OPENSSLDIR)/misc \
+ 		$(INSTALL_PREFIX)$(OPENSSLDIR)/certs \
+@@ -494,10 +495,10 @@
+ 	do \
+ 		if [ -f "$$i" ]; then \
+ 		(       echo installing $$i; \
+-			cp $$i $(INSTALL_PREFIX)$(INSTALLTOP)/lib/$$i.new; \
+-			$(RANLIB) $(INSTALL_PREFIX)$(INSTALLTOP)/lib/$$i.new; \
+-			chmod 644 $(INSTALL_PREFIX)$(INSTALLTOP)/lib/$$i.new; \
+-			mv -f $(INSTALL_PREFIX)$(INSTALLTOP)/lib/$$i.new $(INSTALL_PREFIX)$(INSTALLTOP)/lib/$$i ); \
++			cp $$i $(INSTALL_PREFIX)$(INSTALLTOP)/$(LIBDIR)/$$i.new; \
++			$(RANLIB) $(INSTALL_PREFIX)$(INSTALLTOP)/$(LIBDIR)/$$i.new; \
++			chmod 644 $(INSTALL_PREFIX)$(INSTALLTOP)/$(LIBDIR)/$$i.new; \
++			mv -f $(INSTALL_PREFIX)$(INSTALLTOP)/$(LIBDIR)/$$i.new $(INSTALL_PREFIX)$(INSTALLTOP)/$(LIBDIR)/$$i ); \
+ 		fi; \
+ 	done;
+ 	@set -e; if [ -n "$(SHARED_LIBS)" ]; then \
+@@ -507,22 +508,22 @@
+ 			if [ -f "$$i" -o -f "$$i.a" ]; then \
+ 			(       echo installing $$i; \
+ 				if [ "$(PLATFORM)" != "Cygwin" ]; then \
+-					cp $$i $(INSTALL_PREFIX)$(INSTALLTOP)/lib/$$i.new; \
+-					chmod 555 $(INSTALL_PREFIX)$(INSTALLTOP)/lib/$$i.new; \
+-					mv -f $(INSTALL_PREFIX)$(INSTALLTOP)/lib/$$i.new $(INSTALL_PREFIX)$(INSTALLTOP)/lib/$$i; \
++					cp $$i $(INSTALL_PREFIX)$(INSTALLTOP)/$(LIBDIR)/$$i.new; \
++					chmod 555 $(INSTALL_PREFIX)$(INSTALLTOP)/$(LIBDIR)/$$i.new; \
++					mv -f $(INSTALL_PREFIX)$(INSTALLTOP)/$(LIBDIR)/$$i.new $(INSTALL_PREFIX)$(INSTALLTOP)/$(LIBDIR)/$$i; \
+ 				else \
+ 					c=`echo $$i | sed 's/^lib\(.*\)\.dll\.a/cyg\1-$(SHLIB_VERSION_NUMBER).dll/'`; \
+ 					cp $$c $(INSTALL_PREFIX)$(INSTALLTOP)/bin/$$c.new; \
+ 					chmod 755 $(INSTALL_PREFIX)$(INSTALLTOP)/bin/$$c.new; \
+ 					mv -f $(INSTALL_PREFIX)$(INSTALLTOP)/bin/$$c.new $(INSTALL_PREFIX)$(INSTALLTOP)/bin/$$c; \
+-					cp $$i $(INSTALL_PREFIX)$(INSTALLTOP)/lib/$$i.new; \
+-					chmod 644 $(INSTALL_PREFIX)$(INSTALLTOP)/lib/$$i.new; \
+-					mv -f $(INSTALL_PREFIX)$(INSTALLTOP)/lib/$$i.new $(INSTALL_PREFIX)$(INSTALLTOP)/lib/$$i; \
++					cp $$i $(INSTALL_PREFIX)$(INSTALLTOP)/$(LIBDIR)/$$i.new; \
++					chmod 644 $(INSTALL_PREFIX)$(INSTALLTOP)/$(LIBDIR)/$$i.new; \
++					mv -f $(INSTALL_PREFIX)$(INSTALLTOP)/$(LIBDIR)/$$i.new $(INSTALL_PREFIX)$(INSTALLTOP)/$(LIBDIR)/$$i; \
+ 				fi ); \
+ 			fi; \
+ 		done; \
+ 		(	here="`pwd`"; \
+-			cd $(INSTALL_PREFIX)$(INSTALLTOP)/lib; \
++			cd $(INSTALL_PREFIX)$(INSTALLTOP)/$(LIBDIR); \
+ 			$(MAKE) -f $$here/Makefile HERE="$$here" link-shared ); \
+ 		if [ "$(INSTALLTOP)" != "/usr" ]; then \
+ 			echo 'OpenSSL shared libraries have been installed in:'; \
+@@ -531,12 +532,12 @@
+ 			sed -e '1,/^$$/d' doc/openssl-shared.txt; \
+ 		fi; \
+ 	fi
+-	cp libcrypto.pc $(INSTALL_PREFIX)$(INSTALLTOP)/lib/pkgconfig
+-	chmod 644 $(INSTALL_PREFIX)$(INSTALLTOP)/lib/pkgconfig/libcrypto.pc
+-	cp libssl.pc $(INSTALL_PREFIX)$(INSTALLTOP)/lib/pkgconfig
+-	chmod 644 $(INSTALL_PREFIX)$(INSTALLTOP)/lib/pkgconfig/libssl.pc
+-	cp openssl.pc $(INSTALL_PREFIX)$(INSTALLTOP)/lib/pkgconfig
+-	chmod 644 $(INSTALL_PREFIX)$(INSTALLTOP)/lib/pkgconfig/openssl.pc
++	cp libcrypto.pc $(INSTALL_PREFIX)$(INSTALLTOP)/$(LIBDIR)/pkgconfig
++	chmod 644 $(INSTALL_PREFIX)$(INSTALLTOP)/$(LIBDIR)/pkgconfig/libcrypto.pc
++	cp libssl.pc $(INSTALL_PREFIX)$(INSTALLTOP)/$(LIBDIR)/pkgconfig
++	chmod 644 $(INSTALL_PREFIX)$(INSTALLTOP)/$(LIBDIR)/pkgconfig/libssl.pc
++	cp openssl.pc $(INSTALL_PREFIX)$(INSTALLTOP)/$(LIBDIR)/pkgconfig
++	chmod 644 $(INSTALL_PREFIX)$(INSTALLTOP)/$(LIBDIR)/pkgconfig/openssl.pc
+ 
+ install_docs:
+ 	@$(PERL) $(TOP)/util/mkdir-p.pl \
+diff -Naur openssl-0.9.8b/Makefile.org.orig openssl-0.9.8b-new/Makefile.org.orig
+--- openssl-0.9.8b/Makefile.org.orig	1970-01-01 00:00:00.000000000 +0000
++++ openssl-0.9.8b-new/Makefile.org.orig	2006-02-10 08:52:56.000000000 +0000
+@@ -0,0 +1,588 @@
++##
++## Makefile for OpenSSL
++##
++
++VERSION=
++MAJOR=
++MINOR=
++SHLIB_VERSION_NUMBER=
++SHLIB_VERSION_HISTORY=
++SHLIB_MAJOR=
++SHLIB_MINOR=
++SHLIB_EXT=
++PLATFORM=dist
++OPTIONS=
++CONFIGURE_ARGS=
++SHLIB_TARGET=
++
++# HERE indicates where this Makefile lives.  This can be used to indicate
++# where sub-Makefiles are expected to be.  Currently has very limited usage,
++# and should probably not be bothered with at all.
++HERE=.
++
++# INSTALL_PREFIX is for package builders so that they can configure
++# for, say, /usr/ and yet have everything installed to /tmp/somedir/usr/.
++# Normally it is left empty.
++INSTALL_PREFIX=
++INSTALLTOP=/usr/local/ssl
++
++# Do not edit this manually. Use Configure --openssldir=DIR do change this!
++OPENSSLDIR=/usr/local/ssl
++
++# NO_IDEA - Define to build without the IDEA algorithm
++# NO_RC4  - Define to build without the RC4 algorithm
++# NO_RC2  - Define to build without the RC2 algorithm
++# THREADS - Define when building with threads, you will probably also need any
++#           system defines as well, i.e. _REENTERANT for Solaris 2.[34]
++# TERMIO  - Define the termio terminal subsystem, needed if sgtty is missing.
++# TERMIOS - Define the termios terminal subsystem, Silicon Graphics.
++# LONGCRYPT - Define to use HPUX 10.x's long password modification to crypt(3).
++# DEVRANDOM - Give this the value of the 'random device' if your OS supports
++#           one.  32 bytes will be read from this when the random
++#           number generator is initalised.
++# SSL_FORBID_ENULL - define if you want the server to be not able to use the
++#           NULL encryption ciphers.
++#
++# LOCK_DEBUG - turns on lots of lock debug output :-)
++# REF_CHECK - turn on some xyz_free() assertions.
++# REF_PRINT - prints some stuff on structure free.
++# CRYPTO_MDEBUG - turns on my 'memory leak' detecting stuff
++# MFUNC - Make all Malloc/Free/Realloc calls call
++#       CRYPTO_malloc/CRYPTO_free/CRYPTO_realloc which can be setup to
++#       call application defined callbacks via CRYPTO_set_mem_functions()
++# MD5_ASM needs to be defined to use the x86 assembler for MD5
++# SHA1_ASM needs to be defined to use the x86 assembler for SHA1
++# RMD160_ASM needs to be defined to use the x86 assembler for RIPEMD160
++# Do not define B_ENDIAN or L_ENDIAN if 'unsigned long' == 8.  It must
++# equal 4.
++# PKCS1_CHECK - pkcs1 tests.
++
++CC= cc
++CFLAG= -O
++DEPFLAG= 
++PEX_LIBS= 
++EX_LIBS= 
++EXE_EXT= 
++ARFLAGS=
++AR=ar $(ARFLAGS) r
++RANLIB= ranlib
++PERL= perl
++TAR= tar
++TARFLAGS= --no-recursion
++MAKEDEPPROG=makedepend
++
++# We let the C compiler driver to take care of .s files. This is done in
++# order to be excused from maintaining a separate set of architecture
++# dependent assembler flags. E.g. if you throw -mcpu=ultrasparc at SPARC
++# gcc, then the driver will automatically translate it to -xarch=v8plus
++# and pass it down to assembler.
++AS=$(CC) -c
++ASFLAG=$(CFLAG)
++
++# For x86 assembler: Set PROCESSOR to 386 if you want to support
++# the 80386.
++PROCESSOR=
++
++# CPUID module collects small commonly used assembler snippets
++CPUID_OBJ= 
++BN_ASM= bn_asm.o
++DES_ENC= des_enc.o fcrypt_b.o
++AES_ASM_OBJ=aes_core.o aes_cbc.o
++BF_ENC= bf_enc.o
++CAST_ENC= c_enc.o
++RC4_ENC= rc4_enc.o
++RC5_ENC= rc5_enc.o
++MD5_ASM_OBJ= 
++SHA1_ASM_OBJ= 
++RMD160_ASM_OBJ= 
++
++# KRB5 stuff
++KRB5_INCLUDES=
++LIBKRB5=
++
++# Zlib stuff
++ZLIB_INCLUDE=
++LIBZLIB=
++
++DIRS=   crypto ssl engines apps test tools
++SHLIBDIRS= crypto ssl
++
++# dirs in crypto to build
++SDIRS=  \
++	objects \
++	md2 md4 md5 sha mdc2 hmac ripemd \
++	des aes rc2 rc4 rc5 idea bf cast \
++	bn ec rsa dsa ecdsa dh ecdh dso engine \
++	buffer bio stack lhash rand err \
++	evp asn1 pem x509 x509v3 conf txt_db pkcs7 pkcs12 comp ocsp ui krb5 \
++	store pqueue
++# keep in mind that the above list is adjusted by ./Configure
++# according to no-xxx arguments...
++
++# tests to perform.  "alltests" is a special word indicating that all tests
++# should be performed.
++TESTS = alltests
++
++MAKEFILE= Makefile
++
++MANDIR=$(OPENSSLDIR)/man
++MAN1=1
++MAN3=3
++MANSUFFIX=
++SHELL=/bin/sh
++
++TOP=    .
++ONEDIRS=out tmp
++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_LIBS=
++SHARED_LIBS_LINK_EXTS=
++SHARED_LDFLAGS=
++
++GENERAL=        Makefile
++BASENAME=       openssl
++NAME=           $(BASENAME)-$(VERSION)
++TARFILE=        $(NAME).tar
++WTARFILE=       $(NAME)-win.tar
++EXHEADER=       e_os2.h
++HEADER=         e_os.h
++
++all: Makefile build_all openssl.pc libssl.pc libcrypto.pc
++
++# as we stick to -e, CLEARENV ensures that local variables in lower
++# Makefiles remain local and variable. $${VAR+VAR} is tribute to Korn
++# shell, which [annoyingly enough] terminates unset with error if VAR
++# is not present:-( TOP= && unset TOP is tribute to HP-UX /bin/sh,
++# which terminates unset with error if no variable was present:-(
++CLEARENV=	TOP= && unset TOP $${LIB+LIB} $${LIBS+LIBS}	\
++		$${INCLUDE+INCLUDE} $${INCLUDES+INCLUDES}	\
++		$${DIR+DIR} $${DIRS+DIRS} $${SRC+SRC}		\
++		$${LIBSRC+LIBSRC} $${LIBOBJ+LIBOBJ} $${ALL+ALL}	\
++		$${EXHEADER+EXHEADER} $${HEADER+HEADER}		\
++		$${GENERAL+GENERAL} $${CFLAGS+CFLAGS}		\
++		$${ASFLAGS+ASFLAGS} $${AFLAGS+AFLAGS}		\
++		$${LDCMD+LDCMD} $${LDFLAGS+LDFLAGS}		\
++		$${SHAREDCMD+SHAREDCMD} $${SHAREDFLAGS+SHAREDFLAGS}	\
++		$${SHARED_LIB+SHARED_LIB} $${LIBEXTRAS+LIBEXTRAS}
++
++BUILDENV=	PLATFORM='${PLATFORM}' PROCESSOR='${PROCESSOR}' \
++		CC='${CC}' CFLAG='${CFLAG}' 			\
++		AS='${CC}' ASFLAG='${CFLAG} -c'			\
++		AR='${AR}' PERL='${PERL}' RANLIB='${RANLIB}'	\
++		SDIRS='${SDIRS}' LIBRPATH='${INSTALLTOP}/lib'	\
++		INSTALL_PREFIX='${INSTALL_PREFIX}'		\
++		INSTALLTOP='${INSTALLTOP}' OPENSSLDIR='${OPENSSLDIR}'	\
++		MAKEDEPEND='$$$${TOP}/util/domd $$$${TOP} -MD ${MAKEDEPPROG}' \
++		DEPFLAG='-DOPENSSL_NO_DEPRECATED ${DEPFLAG}'	\
++		MAKEDEPPROG='${MAKEDEPPROG}'			\
++		SHARED_LDFLAGS='${SHARED_LDFLAGS}'		\
++		KRB5_INCLUDES='${KRB5_INCLUDES}' LIBKRB5='${LIBKRB5}'	\
++		EXE_EXT='${EXE_EXT}' SHARED_LIBS='${SHARED_LIBS}'	\
++		SHLIB_EXT='${SHLIB_EXT}' SHLIB_TARGET='${SHLIB_TARGET}'	\
++		PEX_LIBS='${PEX_LIBS}' EX_LIBS='${EX_LIBS}'	\
++		CPUID_OBJ='${CPUID_OBJ}'			\
++		BN_ASM='${BN_ASM}' DES_ENC='${DES_ENC}' 	\
++		AES_ASM_OBJ='${AES_ASM_OBJ}'			\
++		BF_ENC='${BF_ENC}' CAST_ENC='${CAST_ENC}'	\
++		RC4_ENC='${RC4_ENC}' RC5_ENC='${RC5_ENC}'	\
++		SHA1_ASM_OBJ='${SHA1_ASM_OBJ}'			\
++		MD5_ASM_OBJ='${MD5_ASM_OBJ}'			\
++		RMD160_ASM_OBJ='${RMD160_ASM_OBJ}'		\
++		THIS=$${THIS:-$@} MAKEFILE=Makefile MAKEOVERRIDES=
++# MAKEOVERRIDES= effectively "equalizes" GNU-ish and SysV-ish make flavors,
++# which in turn eliminates ambiguities in variable treatment with -e.
++
++# BUILD_CMD is a generic macro to build a given target in a given
++# subdirectory.  The target must be given through the shell variable
++# `target' and the subdirectory to build in must be given through `dir'.
++# This macro shouldn't be used directly, use RECURSIVE_BUILD_CMD or
++# BUILD_ONE_CMD instead.
++#
++# BUILD_ONE_CMD is a macro to build a given target in a given
++# subdirectory if that subdirectory is part of $(DIRS).  It requires
++# exactly the same shell variables as BUILD_CMD.
++#
++# RECURSIVE_BUILD_CMD is a macro to build a given target in all
++# subdirectories defined in $(DIRS).  It requires that the target
++# is given through the shell variable `target'.
++BUILD_CMD=  if [ -d "$$dir" ]; then \
++	    (	cd $$dir && echo "making $$target in $$dir..." && \
++		$(CLEARENV) && $(MAKE) -e $(BUILDENV) TOP=.. DIR=$$dir $$target \
++	    ) || exit 1; \
++	    fi
++RECURSIVE_BUILD_CMD=for dir in $(DIRS); do $(BUILD_CMD); done
++BUILD_ONE_CMD=\
++	if echo " $(DIRS) " | grep " $$dir " >/dev/null 2>/dev/null; then \
++		$(BUILD_CMD); \
++	fi
++
++reflect:
++	@[ -n "$(THIS)" ] && $(CLEARENV) && $(MAKE) $(THIS) -e $(BUILDENV)
++
++sub_all: build_all
++build_all: build_libs build_apps build_tests build_tools
++
++build_libs: build_crypto build_ssl build_engines
++
++build_crypto:
++	@dir=crypto; target=all; $(BUILD_ONE_CMD)
++build_ssl:
++	@dir=ssl; target=all; $(BUILD_ONE_CMD)
++build_engines:
++	@dir=engines; target=all; $(BUILD_ONE_CMD)
++build_apps:
++	@dir=apps; target=all; $(BUILD_ONE_CMD)
++build_tests:
++	@dir=test; target=all; $(BUILD_ONE_CMD)
++build_tools:
++	@dir=tools; target=all; $(BUILD_ONE_CMD)
++
++all_testapps: build_libs build_testapps
++build_testapps:
++	@dir=crypto; target=testapps; $(BUILD_ONE_CMD)
++
++libcrypto$(SHLIB_EXT): libcrypto.a
++	@if [ "$(SHLIB_TARGET)" != "" ]; then \
++		$(MAKE) SHLIBDIRS=crypto build-shared; \
++	else \
++		echo "There's no support for shared libraries on this platform" >&2; \
++		exit 1; \
++	fi
++
++libssl$(SHLIB_EXT): libcrypto$(SHLIB_EXT) libssl.a
++	@if [ "$(SHLIB_TARGET)" != "" ]; then \
++		$(MAKE) SHLIBDIRS=ssl SHLIBDEPS='-lcrypto' build-shared; \
++	else \
++		echo "There's no support for shared libraries on this platform" >&2; \
++		exit 1; \
++	fi
++
++clean-shared:
++	@set -e; for i in $(SHLIBDIRS); do \
++		if [ -n "$(SHARED_LIBS_LINK_EXTS)" ]; then \
++			tmp="$(SHARED_LIBS_LINK_EXTS)"; \
++			for j in $${tmp:-x}; do \
++				( set -x; rm -f lib$$i$$j ); \
++			done; \
++		fi; \
++		( set -x; rm -f lib$$i$(SHLIB_EXT) ); \
++		if [ "$(PLATFORM)" = "Cygwin" ]; then \
++			( set -x; rm -f cyg$$i$(SHLIB_EXT) lib$$i$(SHLIB_EXT).a ); \
++		fi; \
++	done
++
++link-shared:
++	@ set -e; for i in ${SHLIBDIRS}; do \
++		$(MAKE) -f $(HERE)/Makefile.shared -e $(BUILDENV) \
++			LIBNAME=$$i LIBVERSION=${SHLIB_MAJOR}.${SHLIB_MINOR} \
++			LIBCOMPATVERSIONS=";${SHLIB_VERSION_HISTORY}" \
++			symlink.$(SHLIB_TARGET); \
++		libs="$$libs -l$$i"; \
++	done
++
++build-shared: do_$(SHLIB_TARGET) link-shared
++
++do_$(SHLIB_TARGET):
++	@ set -e; libs='-L. ${SHLIBDEPS}'; for i in ${SHLIBDIRS}; do \
++		if [ "${SHLIBDIRS}" = "ssl" -a -n "$(LIBKRB5)" ]; then \
++			libs="$(LIBKRB5) $$libs"; \
++		fi; \
++		$(CLEARENV) && $(MAKE) -f Makefile.shared -e $(BUILDENV) \
++			LIBNAME=$$i LIBVERSION=${SHLIB_MAJOR}.${SHLIB_MINOR} \
++			LIBCOMPATVERSIONS=";${SHLIB_VERSION_HISTORY}" \
++			LIBDEPS="$$libs $(EX_LIBS)" \
++			link_a.$(SHLIB_TARGET); \
++		libs="-l$$i $$libs"; \
++	done
++
++libcrypto.pc: Makefile
++	@ ( echo 'prefix=$(INSTALLTOP)'; \
++	    echo 'exec_prefix=$${prefix}'; \
++	    echo 'libdir=$${exec_prefix}/lib'; \
++	    echo 'includedir=$${prefix}/include'; \
++	    echo ''; \
++	    echo 'Name: OpenSSL-libcrypto'; \
++	    echo 'Description: OpenSSL cryptography library'; \
++	    echo 'Version: '$(VERSION); \
++	    echo 'Requires: '; \
++	    echo 'Libs: -L$${libdir} -lcrypto $(EX_LIBS)'; \
++	    echo 'Cflags: -I$${includedir} $(KRB5_INCLUDES)' ) > libcrypto.pc
++
++libssl.pc: Makefile
++	@ ( echo 'prefix=$(INSTALLTOP)'; \
++	    echo 'exec_prefix=$${prefix}'; \
++	    echo 'libdir=$${exec_prefix}/lib'; \
++	    echo 'includedir=$${prefix}/include'; \
++	    echo ''; \
++	    echo 'Name: OpenSSL'; \
++	    echo 'Description: Secure Sockets Layer and cryptography libraries'; \
++	    echo 'Version: '$(VERSION); \
++	    echo 'Requires: '; \
++	    echo 'Libs: -L$${libdir} -lssl -lcrypto $(EX_LIBS)'; \
++	    echo 'Cflags: -I$${includedir} $(KRB5_INCLUDES)' ) > libssl.pc
++
++openssl.pc: Makefile
++	@ ( echo 'prefix=$(INSTALLTOP)'; \
++	    echo 'exec_prefix=$${prefix}'; \
++	    echo 'libdir=$${exec_prefix}/lib'; \
++	    echo 'includedir=$${prefix}/include'; \
++	    echo ''; \
++	    echo 'Name: OpenSSL'; \
++	    echo 'Description: Secure Sockets Layer and cryptography libraries and tools'; \
++	    echo 'Version: '$(VERSION); \
++	    echo 'Requires: '; \
++	    echo 'Libs: -L$${libdir} -lssl -lcrypto $(EX_LIBS)'; \
++	    echo 'Cflags: -I$${includedir} $(KRB5_INCLUDES)' ) > openssl.pc
++
++Makefile: Makefile.org Configure config
++	@echo "Makefile is older than Makefile.org, Configure or config."
++	@echo "Reconfigure the source tree (via './config' or 'perl Configure'), please."
++	@false
++
++libclean:
++	rm -f *.map *.so *.so.* *.dll engines/*.so engines/*.dll *.a engines/*.a */lib */*/lib
++
++clean:	libclean
++	rm -f shlib/*.o *.o core a.out fluff rehash.time testlog make.log cctest cctest.c
++	@set -e; target=clean; $(RECURSIVE_BUILD_CMD)
++	rm -f $(LIBS)
++	rm -f openssl.pc libssl.pc libcrypto.pc
++	rm -f speed.* .pure
++	rm -f $(TARFILE)
++	@set -e; for i in $(ONEDIRS) ;\
++	do \
++	rm -fr $$i/*; \
++	done
++
++makefile.one: files
++	$(PERL) util/mk1mf.pl >makefile.one; \
++	sh util/do_ms.sh
++
++files:
++	$(PERL) $(TOP)/util/files.pl Makefile > $(TOP)/MINFO
++	@set -e; target=files; $(RECURSIVE_BUILD_CMD)
++
++links:
++	@$(PERL) $(TOP)/util/mkdir-p.pl include/openssl
++	@$(PERL) $(TOP)/util/mklink.pl include/openssl $(EXHEADER)
++	@set -e; target=links; $(RECURSIVE_BUILD_CMD)
++
++gentests:
++	@(cd test && echo "generating dummy tests (if needed)..." && \
++	$(CLEARENV) && $(MAKE) -e $(BUILDENV) TESTS='${TESTS}' OPENSSL_DEBUG_MEMORY=on generate );
++
++dclean:
++	rm -f *.bak
++	@set -e; target=dclean; $(RECURSIVE_BUILD_CMD)
++
++rehash: rehash.time
++rehash.time: certs
++	@(OPENSSL="`pwd`/util/opensslwrap.sh"; \
++	  OPENSSL_DEBUG_MEMORY=on; \
++	  export OPENSSL OPENSSL_DEBUG_MEMORY; \
++	  $(PERL) tools/c_rehash certs)
++	touch rehash.time
++
++test:   tests
++
++tests: rehash
++	@(cd test && echo "testing..." && \
++	$(CLEARENV) && $(MAKE) -e $(BUILDENV) TOP=.. TESTS='${TESTS}' OPENSSL_DEBUG_MEMORY=on tests );
++	util/opensslwrap.sh version -a
++
++report:
++	@$(PERL) util/selftest.pl
++
++depend:
++	@set -e; target=depend; $(RECURSIVE_BUILD_CMD)
++
++lint:
++	@set -e; target=lint; $(RECURSIVE_BUILD_CMD)
++
++tags:
++	rm -f TAGS
++	find . -name '[^.]*.[ch]' | xargs etags -a
++
++errors:
++	$(PERL) util/mkerr.pl -recurse -write
++	(cd engines; $(MAKE) PERL=$(PERL) errors)
++	$(PERL) util/ck_errf.pl */*.c */*/*.c
++
++stacks:
++	$(PERL) util/mkstack.pl -write
++
++util/libeay.num::
++	$(PERL) util/mkdef.pl crypto update
++
++util/ssleay.num::
++	$(PERL) util/mkdef.pl ssl update
++
++crypto/objects/obj_dat.h: crypto/objects/obj_dat.pl crypto/objects/obj_mac.h
++	$(PERL) crypto/objects/obj_dat.pl crypto/objects/obj_mac.h crypto/objects/obj_dat.h
++crypto/objects/obj_mac.h: crypto/objects/objects.pl crypto/objects/objects.txt crypto/objects/obj_mac.num
++	$(PERL) crypto/objects/objects.pl crypto/objects/objects.txt crypto/objects/obj_mac.num crypto/objects/obj_mac.h
++
++apps/openssl-vms.cnf: apps/openssl.cnf
++	$(PERL) VMS/VMSify-conf.pl < apps/openssl.cnf > apps/openssl-vms.cnf
++
++crypto/bn/bn_prime.h: crypto/bn/bn_prime.pl
++	$(PERL) crypto/bn/bn_prime.pl >crypto/bn/bn_prime.h
++
++
++TABLE: Configure
++	(echo 'Output of `Configure TABLE'"':"; \
++	$(PERL) Configure TABLE) > TABLE
++
++update: errors stacks util/libeay.num util/ssleay.num crypto/objects/obj_dat.h apps/openssl-vms.cnf crypto/bn/bn_prime.h TABLE depend
++
++# Build distribution tar-file. As the list of files returned by "find" is
++# pretty long, on several platforms a "too many arguments" error or similar
++# would occur. Therefore the list of files is temporarily stored into a file
++# and read directly, requiring GNU-Tar. Call "make TAR=gtar dist" if the normal
++# tar does not support the --files-from option.
++tar:
++	find . -type d -print | xargs chmod 755
++	find . -type f -print | xargs chmod a+r
++	find . -type f -perm -0100 -print | xargs chmod a+x
++	find * \! -path CVS/\* \! -path \*/CVS/\* \! -name CVS \! -name .cvsignore \! -name STATUS \! -name TABLE | sort > ../$(TARFILE).list; \
++	$(TAR) $(TARFLAGS) --files-from ../$(TARFILE).list -cvf - | \
++	tardy --user_number=0  --user_name=openssl \
++	      --group_number=0 --group_name=openssl \
++	      --prefix=openssl-$(VERSION) - |\
++	gzip --best >../$(TARFILE).gz; \
++	rm -f ../$(TARFILE).list; \
++	ls -l ../$(TARFILE).gz
++
++tar-snap:
++	@$(TAR) $(TARFLAGS) -cvf - \
++		`find * \! -path CVS/\* \! -path \*/CVS/\* \! -name CVS \! -name .cvsignore \! -name STATUS \! -name TABLE \! -name '*.o' \! -name '*.a' \! -name '*.so' \! -name '*.so.*'  \! -name 'openssl' \! -name '*test' \! -name '.#*' \! -name '*~' | sort` |\
++	tardy --user_number=0  --user_name=openssl \
++	      --group_number=0 --group_name=openssl \
++	      --prefix=openssl-$(VERSION) - > ../$(TARFILE);\
++	ls -l ../$(TARFILE)
++
++dist:   
++	$(PERL) Configure dist
++	@$(MAKE) dist_pem_h
++	@$(MAKE) SDIRS='${SDIRS}' clean
++	@$(MAKE) TAR='${TAR}' TARFLAGS='${TARFLAGS}' tar
++
++dist_pem_h:
++	(cd crypto/pem; $(MAKE) -e $(BUILDENV) pem.h; $(MAKE) clean)
++
++install: all install_docs install_sw
++
++install_sw:
++	@$(PERL) $(TOP)/util/mkdir-p.pl $(INSTALL_PREFIX)$(INSTALLTOP)/bin \
++		$(INSTALL_PREFIX)$(INSTALLTOP)/lib \
++		$(INSTALL_PREFIX)$(INSTALLTOP)/lib/engines \
++		$(INSTALL_PREFIX)$(INSTALLTOP)/lib/pkgconfig \
++		$(INSTALL_PREFIX)$(INSTALLTOP)/include/openssl \
++		$(INSTALL_PREFIX)$(OPENSSLDIR)/misc \
++		$(INSTALL_PREFIX)$(OPENSSLDIR)/certs \
++		$(INSTALL_PREFIX)$(OPENSSLDIR)/private
++	@set -e; headerlist="$(EXHEADER)"; for i in $$headerlist;\
++	do \
++	(cp $$i $(INSTALL_PREFIX)$(INSTALLTOP)/include/openssl/$$i; \
++	chmod 644 $(INSTALL_PREFIX)$(INSTALLTOP)/include/openssl/$$i ); \
++	done;
++	@set -e; target=install; $(RECURSIVE_BUILD_CMD)
++	@set -e; for i in $(LIBS) ;\
++	do \
++		if [ -f "$$i" ]; then \
++		(       echo installing $$i; \
++			cp $$i $(INSTALL_PREFIX)$(INSTALLTOP)/lib/$$i.new; \
++			$(RANLIB) $(INSTALL_PREFIX)$(INSTALLTOP)/lib/$$i.new; \
++			chmod 644 $(INSTALL_PREFIX)$(INSTALLTOP)/lib/$$i.new; \
++			mv -f $(INSTALL_PREFIX)$(INSTALLTOP)/lib/$$i.new $(INSTALL_PREFIX)$(INSTALLTOP)/lib/$$i ); \
++		fi; \
++	done;
++	@set -e; if [ -n "$(SHARED_LIBS)" ]; then \
++		tmp="$(SHARED_LIBS)"; \
++		for i in $${tmp:-x}; \
++		do \
++			if [ -f "$$i" -o -f "$$i.a" ]; then \
++			(       echo installing $$i; \
++				if [ "$(PLATFORM)" != "Cygwin" ]; then \
++					cp $$i $(INSTALL_PREFIX)$(INSTALLTOP)/lib/$$i.new; \
++					chmod 555 $(INSTALL_PREFIX)$(INSTALLTOP)/lib/$$i.new; \
++					mv -f $(INSTALL_PREFIX)$(INSTALLTOP)/lib/$$i.new $(INSTALL_PREFIX)$(INSTALLTOP)/lib/$$i; \
++				else \
++					c=`echo $$i | sed 's/^lib\(.*\)\.dll\.a/cyg\1-$(SHLIB_VERSION_NUMBER).dll/'`; \
++					cp $$c $(INSTALL_PREFIX)$(INSTALLTOP)/bin/$$c.new; \
++					chmod 755 $(INSTALL_PREFIX)$(INSTALLTOP)/bin/$$c.new; \
++					mv -f $(INSTALL_PREFIX)$(INSTALLTOP)/bin/$$c.new $(INSTALL_PREFIX)$(INSTALLTOP)/bin/$$c; \
++					cp $$i $(INSTALL_PREFIX)$(INSTALLTOP)/lib/$$i.new; \
++					chmod 644 $(INSTALL_PREFIX)$(INSTALLTOP)/lib/$$i.new; \
++					mv -f $(INSTALL_PREFIX)$(INSTALLTOP)/lib/$$i.new $(INSTALL_PREFIX)$(INSTALLTOP)/lib/$$i; \
++				fi ); \
++			fi; \
++		done; \
++		(	here="`pwd`"; \
++			cd $(INSTALL_PREFIX)$(INSTALLTOP)/lib; \
++			$(MAKE) -f $$here/Makefile HERE="$$here" link-shared ); \
++		if [ "$(INSTALLTOP)" != "/usr" ]; then \
++			echo 'OpenSSL shared libraries have been installed in:'; \
++			echo '  $(INSTALLTOP)'; \
++			echo ''; \
++			sed -e '1,/^$$/d' doc/openssl-shared.txt; \
++		fi; \
++	fi
++	cp libcrypto.pc $(INSTALL_PREFIX)$(INSTALLTOP)/lib/pkgconfig
++	chmod 644 $(INSTALL_PREFIX)$(INSTALLTOP)/lib/pkgconfig/libcrypto.pc
++	cp libssl.pc $(INSTALL_PREFIX)$(INSTALLTOP)/lib/pkgconfig
++	chmod 644 $(INSTALL_PREFIX)$(INSTALLTOP)/lib/pkgconfig/libssl.pc
++	cp openssl.pc $(INSTALL_PREFIX)$(INSTALLTOP)/lib/pkgconfig
++	chmod 644 $(INSTALL_PREFIX)$(INSTALLTOP)/lib/pkgconfig/openssl.pc
++
++install_docs:
++	@$(PERL) $(TOP)/util/mkdir-p.pl \
++		$(INSTALL_PREFIX)$(MANDIR)/man1 \
++		$(INSTALL_PREFIX)$(MANDIR)/man3 \
++		$(INSTALL_PREFIX)$(MANDIR)/man5 \
++		$(INSTALL_PREFIX)$(MANDIR)/man7
++	@pod2man="`cd util; ./pod2mantest $(PERL)`"; \
++	here="`pwd`"; \
++	filecase=; \
++	if [ "$(PLATFORM)" = "DJGPP" -o "$(PLATFORM)" = "Cygwin" -o "$(PLATFORM)" = "mingw" ]; then \
++		filecase=-i; \
++	fi; \
++	set -e; for i in doc/apps/*.pod; do \
++		fn=`basename $$i .pod`; \
++		sec=`$(PERL) util/extract-section.pl 1 < $$i`; \
++		echo "installing man$$sec/$$fn.$${sec}$(MANSUFFIX)"; \
++		(cd `$(PERL) util/dirname.pl $$i`; \
++		sh -c "$$pod2man \
++			--section=$$sec --center=OpenSSL \
++			--release=$(VERSION) `basename $$i`") \
++			>  $(INSTALL_PREFIX)$(MANDIR)/man$$sec/$$fn.$${sec}$(MANSUFFIX); \
++		$(PERL) util/extract-names.pl < $$i | \
++			(grep -v $$filecase "^$$fn\$$"; true) | \
++			(grep -v "[	]"; true) | \
++			(cd $(INSTALL_PREFIX)$(MANDIR)/man$$sec/; \
++			 while read n; do \
++				$$here/util/point.sh $$fn.$${sec}$(MANSUFFIX) "$$n".$${sec}$(MANSUFFIX); \
++			 done); \
++	done; \
++	set -e; for i in doc/crypto/*.pod doc/ssl/*.pod; do \
++		fn=`basename $$i .pod`; \
++		sec=`$(PERL) util/extract-section.pl 3 < $$i`; \
++		echo "installing man$$sec/$$fn.$${sec}$(MANSUFFIX)"; \
++		(cd `$(PERL) util/dirname.pl $$i`; \
++		sh -c "$$pod2man \
++			--section=$$sec --center=OpenSSL \
++			--release=$(VERSION) `basename $$i`") \
++			>  $(INSTALL_PREFIX)$(MANDIR)/man$$sec/$$fn.$${sec}$(MANSUFFIX); \
++		$(PERL) util/extract-names.pl < $$i | \
++			(grep -v $$filecase "^$$fn\$$"; true) | \
++			(grep -v "[	]"; true) | \
++			(cd $(INSTALL_PREFIX)$(MANDIR)/man$$sec/; \
++			 while read n; do \
++				$$here/util/point.sh $$fn.$${sec}$(MANSUFFIX) "$$n".$${sec}$(MANSUFFIX); \
++			 done); \
++	done
++
++# DO NOT DELETE THIS LINE -- make depend depends on it.
+diff -Naur openssl-0.9.8b/engines/Makefile openssl-0.9.8b-new/engines/Makefile
+--- openssl-0.9.8b/engines/Makefile	2006-02-04 01:49:34.000000000 +0000
++++ openssl-0.9.8b-new/engines/Makefile	2006-05-19 02:00:52.158523141 +0000
+@@ -97,13 +97,13 @@
+ 				*DSO_DL*)	sfx="sl";;	\
+ 				*)		sfx="bad";;	\
+ 				esac; \
+-				cp lib$$l.$$sfx $(INSTALL_PREFIX)$(INSTALLTOP)/lib/engines/lib$$l.$$sfx.new; \
++				cp lib$$l.$$sfx $(INSTALL_PREFIX)$(INSTALLTOP)/$(LIBDIR)/engines/lib$$l.$$sfx.new; \
+ 			  else \
+ 			  	sfx="so"; \
+ 				cp cyg$$l.dll $(INSTALL_PREFIX)$(INSTALLTOP)/lib/engines/lib$$l.$$sfx.new; \
+ 			  fi; \
+-			  chmod 555 $(INSTALL_PREFIX)$(INSTALLTOP)/lib/engines/lib$$l.$$sfx.new; \
+-			  mv -f $(INSTALL_PREFIX)$(INSTALLTOP)/lib/engines/lib$$l.$$sfx.new $(INSTALL_PREFIX)$(INSTALLTOP)/lib/engines/lib$$l.$$sfx ); \
++			  chmod 555 $(INSTALL_PREFIX)$(INSTALLTOP)/$(LIBDIR)/engines/lib$$l.$$sfx.new; \
++			  mv -f $(INSTALL_PREFIX)$(INSTALLTOP)/$(LIBDIR)/engines/lib$$l.$$sfx.new $(INSTALL_PREFIX)$(INSTALLTOP)/$(LIBDIR)/engines/lib$$l.$$sfx ); \
+ 		done; \
+ 	fi
+ 




More information about the patches mailing list