Dont install the fips stuff #80878 by Kaiting Chen.

(Portage version: 2.0.51.19)

3 files changed, 51 insertions, 3 deletions

diff --git a/dev-libs/openssl/ChangeLog b/dev-libs/openssl/ChangeLog
index d2f7a85d1854..2d03b346c748 100644
--- a/dev-libs/openssl/ChangeLog
+++ b/dev-libs/openssl/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-libs/openssl
 # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/openssl/ChangeLog,v 1.105 2005/03/03 02:12:39 morfic Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/openssl/ChangeLog,v 1.106 2005/03/13 10:07:49 vapier Exp $
+
+  13 Mar 2005; Mike Frysinger <vapier@gentoo.org>
+  +files/openssl-0.9.7e-no-fips.patch, openssl-0.9.7e-r1.ebuild:
+  Dont install the fips stuff #80878 by Kaiting Chen.
 
   02 Mar 2005; Daniel Goller <morfic@gentoo.org> openssl-0.9.7e.ebuild:
   Stable on ppc
diff --git a/dev-libs/openssl/files/openssl-0.9.7e-no-fips.patch b/dev-libs/openssl/files/openssl-0.9.7e-no-fips.patch
new file mode 100644
index 000000000000..56bcde64e8cb
--- /dev/null
+++ b/dev-libs/openssl/files/openssl-0.9.7e-no-fips.patch
@@ -0,0 +1,43 @@
+Ripped from fedora
+
+--- openssl-0.9.7e/Configure
++++ openssl-0.9.7e/Configure
+@@ -1161,15 +1161,21 @@
+ 
+ $bn_obj = $bn_asm unless $bn_obj ne "";
+ 
++my $fips_des_obj;
++my $fips_sha1_obj;
+ if ($fips)
+ 	{
++	if ($des_obj =~ /\-elf\.o$/ && $no_shared) # FIPS DES module is not PIC
++		{
++		$fips_des_obj='asm/fips-dx86-elf.o';
++		$openssl_other_defines.="#define OPENSSL_FIPS_DES_ASM\n";
++		}
++	else {	$fips_des_obj=$fips_des_enc;  }
++	$fips_sha1_obj='asm/sx86-elf.o' if ($sha1_obj =~ /\-elf\.o$/);
+ 	$des_obj=$sha1_obj="";
+ 	$openssl_other_defines.="#define OPENSSL_FIPS\n";
+ 	}
+-$des_obj=$des_enc	unless (!$fips && $des_obj =~ /\.o$/);
+-my $fips_des_obj='asm/fips-dx86-elf.o';
+-$fips_des_obj=$fips_des_enc unless $processor eq '386';
+-my $fips_sha1_obj='asm/sx86-elf.o' if $processor eq '386';
++$des_obj=$des_enc	unless ($des_obj =~ /\.o$/);
+ $bf_obj=$bf_enc		unless ($bf_obj =~ /\.o$/);
+ $cast_obj=$cast_enc	unless ($cast_obj =~ /\.o$/);
+ $rc4_obj=$rc4_enc	unless ($rc4_obj =~ /\.o$/);
+--- openssl-0.9.7e/Makefile.org
++++ openssl-0.9.7e/Makefile.org
+@@ -176,8 +176,8 @@
+ # we might set SHLIB_MARK to '$(SHARED_LIBS)'.
+ SHLIB_MARK=
+ 
+-DIRS=   crypto fips ssl $(SHLIB_MARK) sigs apps test tools
+-SHLIBDIRS= fips crypto ssl
++DIRS=   crypto ssl $(SHLIB_MARK) sigs apps test tools
++SHLIBDIRS= crypto ssl
+ 
+ # dirs in crypto to build
+ SDIRS=  objects \
diff --git a/dev-libs/openssl/openssl-0.9.7e-r1.ebuild b/dev-libs/openssl/openssl-0.9.7e-r1.ebuild
index c09366fb436b..70e00a7ecff4 100644
--- a/dev-libs/openssl/openssl-0.9.7e-r1.ebuild
+++ b/dev-libs/openssl/openssl-0.9.7e-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/openssl/openssl-0.9.7e-r1.ebuild,v 1.2 2005/02/14 19:17:27 eradicator Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/openssl/openssl-0.9.7e-r1.ebuild,v 1.3 2005/03/13 10:07:49 vapier Exp $
 
 inherit eutils flag-o-matic toolchain-funcs
 
@@ -37,6 +37,7 @@ src_unpack() {
 	epatch ${FILESDIR}/${PN}-0.9.7-arm-big-endian.patch
 	epatch ${FILESDIR}/${PN}-0.9.7-hppa-fix-detection.patch
 	epatch ${FILESDIR}/${PN}-0.9.7-alpha-default-gcc.patch
+	epatch ${FILESDIR}/${PN}-0.9.7e-no-fips.patch
 
 	case $(gcc-version) in
 		3.2)
@@ -207,7 +208,7 @@ src_install() {
 	# openssl-0.9.7
 	cd ${WORKDIR}/${P}
 	make INSTALL_PREFIX=${D} MANDIR=/usr/share/man install || die
-	dodoc CHANGES* FAQ LICENSE NEWS README
+	dodoc CHANGES* FAQ NEWS README
 	dodoc doc/*.txt
 	dohtml doc/*
 	insinto /usr/share/emacs/site-lisp