diff options
| -rw-r--r-- | security/openssl/distinfo | 4 | ||||
| -rw-r--r-- | security/openssl/patches/patch-ac | 15 |
2 files changed, 15 insertions, 4 deletions
diff --git a/security/openssl/distinfo b/security/openssl/distinfo index 8bdea15b1c5..e8e28d653ca 100644 --- a/security/openssl/distinfo +++ b/security/openssl/distinfo @@ -1,9 +1,9 @@ -$NetBSD: distinfo,v 1.36 2004/12/27 02:31:07 jlam Exp $ +$NetBSD: distinfo,v 1.37 2004/12/27 06:14:40 jlam Exp $ SHA1 (openssl-0.9.7e.tar.gz) = b2eb7f13cc09655ec2378c3dde3025bf7072af54 Size (openssl-0.9.7e.tar.gz) = 3043231 bytes SHA1 (patch-aa) = 5ab4ec9fdf15c9ded6a6205dc4801e053b3769fc -SHA1 (patch-ac) = 72741ca92873024d7615b6ac6cb26fad258b4bf6 +SHA1 (patch-ac) = dce0f8e7722d852c9d7e822d3d86bbe9b97014fd SHA1 (patch-ad) = 3d0a5534c6946aeda219d670f241a01e72d86c6a SHA1 (patch-ae) = cb3ce622ef9efc4098d57b10059e5424272520c8 SHA1 (patch-af) = 4909cf3d5441ae51917281642b3871e1466fd2fa diff --git a/security/openssl/patches/patch-ac b/security/openssl/patches/patch-ac index 6bf62f9e6e5..aa5db213021 100644 --- a/security/openssl/patches/patch-ac +++ b/security/openssl/patches/patch-ac @@ -1,6 +1,6 @@ -$NetBSD: patch-ac,v 1.21 2004/12/27 02:31:07 jlam Exp $ +$NetBSD: patch-ac,v 1.22 2004/12/27 06:14:40 jlam Exp $ ---- Configure.orig 2004-10-01 07:34:28.000000000 -0400 +--- Configure.orig Fri Oct 1 07:34:28 2004 +++ Configure @@ -400,9 +400,23 @@ my %table=( "linux-ia64", "gcc:-DL_ENDIAN -DTERMIO -O3 -fomit-frame-pointer -Wall::-D_REENTRANT::-ldl:SIXTY_FOUR_BIT_LONG RC4_CHUNK RC4_CHAR:asm/ia64.o:::::::::dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)", @@ -40,6 +40,17 @@ $NetBSD: patch-ac,v 1.21 2004/12/27 02:31:07 jlam Exp $ elsif (/^-[^-]/ or /^\+/) { $flags.=$_." "; +@@ -1167,8 +1185,8 @@ if ($fips) + } + $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'; ++$fips_des_obj=$fips_des_enc unless ($fips && $processor eq '386'); ++my $fips_sha1_obj='asm/sx86-elf.o' if ($fips && $processor eq '386'); + $bf_obj=$bf_enc unless ($bf_obj =~ /\.o$/); + $cast_obj=$cast_enc unless ($cast_obj =~ /\.o$/); + $rc4_obj=$rc4_enc unless ($rc4_obj =~ /\.o$/); @@ -1297,7 +1315,7 @@ while (<IN>) elsif ($shared_extension ne "" && $shared_extension =~ /^\.s([ol])\.[^\.]*\.[^\.]*$/) { |