From owner-freebsd-security  Fri Feb  9 16:15:20 2001
Delivered-To: freebsd-security@freebsd.org
Received: from fw.wintelcom.net (ns1.wintelcom.net [209.1.153.20])
	by hub.freebsd.org (Postfix) with ESMTP
	id 1A4C937B6C7; Fri,  9 Feb 2001 16:15:03 -0800 (PST)
Received: (from bright@localhost)
	by fw.wintelcom.net (8.10.0/8.10.0) id f1A0F2t01737;
	Fri, 9 Feb 2001 16:15:02 -0800 (PST)
Date: Fri, 9 Feb 2001 16:15:02 -0800
From: Alfred Perlstein <bright@wintelcom.net>
To: dirk@freebsd.org
Cc: security@freebsd.org
Subject: OpenSSL shlib on 2.2.x
Message-ID: <20010209161502.X26076@fw.wintelcom.net>
Mime-Version: 1.0
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline
User-Agent: Mutt/1.2.5i
Sender: owner-freebsd-security@FreeBSD.ORG
Precedence: bulk
X-Loop: FreeBSD.org

This should make openssl work on pre-ELF machines.

Along with a recent commit to 2.2-stable and the recent OpenSSH
patches, this patch should make OpenSSH work on FreeBSD 2.2-stable.

I'd like to apply this delta asap.

thanks.

Index: Makefile
===================================================================
RCS file: /home/ncvs/ports/security/openssl/Makefile,v
retrieving revision 1.48
diff -u -u -r1.48 Makefile
--- Makefile	2000/10/08 10:22:52	1.48
+++ Makefile	2001/02/10 00:15:47
@@ -20,8 +20,11 @@
 .if ${OSVERSION} >= 400014
 FORBIDDEN=	"OpenSSL is already in the base system"
 .endif
+
 .if ${PORTOBJFORMAT} == "aout"
-NOSHARED=	yes
+MAKE_ARGS+= WHOLE_ARCHIVE_FLAG=-Bforcearchive
+.else
+MAKE_ARGS+= WHOLE_ARCHIVE_FLAG=--whole-archive
 .endif
 
 USE_PERL5=	yes
Index: files/patch-ab
===================================================================
RCS file: /home/ncvs/ports/security/openssl/files/patch-ab,v
retrieving revision 1.9
diff -u -u -r1.9 patch-ab
--- files/patch-ab	1999/11/07 22:19:48	1.9
+++ files/patch-ab	2001/02/10 00:16:13
@@ -22,7 +22,7 @@
 +	${MAKE} CC='${CC}' PLATFORM='${PLATFORM}' CFLAG='-fPIC ${CFLAG}' SDIRS='${SDIRS}' INSTALLTOP='${INSTALLTOP}' PEX_LIBS='${PEX_LIBS}' EX_LIBS='${EX_LIBS}' BN_ASM='${BN_ASM}' DES_ENC='${DES_ENC}' 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}' AR='${AR}' DIRS=$$i clean all || exit 1; \
 +	( set -x; ${CC}  -shared -o lib$$i.so.${SHLIBVER} \
 +		-Wl,-S,-soname=lib$$i.so.${SHLIBVER} \
-+		-Wl,--whole-archive lib$$i.a ) || exit 1; \
++		-Wl,${WHOLE_ARCHIVE_FLAG} lib$$i.a ) || exit 1; \
 +	rm -f lib$$i.a; (cd $$i ; ${MAKE} clean) || exit 1 ;\
 +	done;
 +	@set -x; \

-- 
-Alfred Perlstein - [bright@wintelcom.net|alfred@freebsd.org]
"I have the heart of a child; I keep it in a jar on my desk."


To Unsubscribe: send mail to majordomo@FreeBSD.org
with "unsubscribe freebsd-security" in the body of the message