diff options
author | erh <erh> | 1999-10-19 04:09:19 +0000 |
---|---|---|
committer | erh <erh> | 1999-10-19 04:09:19 +0000 |
commit | 3fc72a94719c238fb3cd8e2fd5ca6c8245f9b15d (patch) | |
tree | 556fcd7be0e4a1eae7e01d9067562fa051a0ed9a /security | |
parent | 501fde60548beadd68bd287e33b8e5816efc7f37 (diff) | |
download | pkgsrc-3fc72a94719c238fb3cd8e2fd5ca6c8245f9b15d.tar.gz |
Make openssl compile whether or not RSAref is defined.
Diffstat (limited to 'security')
-rw-r--r-- | security/openssl/files/patch-sum | 6 | ||||
-rw-r--r-- | security/openssl/patches/patch-ab | 56 | ||||
-rw-r--r-- | security/openssl/patches/patch-ae | 8 |
3 files changed, 59 insertions, 11 deletions
diff --git a/security/openssl/files/patch-sum b/security/openssl/files/patch-sum index 738c07f20bc..5d3295ea5a0 100644 --- a/security/openssl/files/patch-sum +++ b/security/openssl/files/patch-sum @@ -1,10 +1,10 @@ -$NetBSD: patch-sum,v 1.1 1999/07/09 14:23:03 agc Exp $ +$NetBSD: patch-sum,v 1.2 1999/10/19 04:09:19 erh Exp $ MD5 (patch-aa) = 72fbff3284c0417fa5bffa2f7f7d0535 -MD5 (patch-ab) = f0af8a6b2144728a936c157683e34d24 +MD5 (patch-ab) = 598eb8f5d530f3fd7cd7f96d702cd1c3 MD5 (patch-ac) = e55eb7efc1f516e8fa41e0a1769228ed MD5 (patch-ad) = b7e3c64c926b3ef6636ca4e5ddddbae2 -MD5 (patch-ae) = 8e51255a944f9c4e5ffc9c50571dbd9e +MD5 (patch-ae) = 8320c6bbad2baa7f8112126b5e0c636b MD5 (patch-af) = a0e9319927132349b15cafc2243c104d MD5 (patch-ag) = f4ae349377a6432c90b4e00a9aaa1366 MD5 (patch-ah) = 8de78a8d42f6d3d261535052da64fb06 diff --git a/security/openssl/patches/patch-ab b/security/openssl/patches/patch-ab index 1b3668dc0b1..c46b361fa4e 100644 --- a/security/openssl/patches/patch-ab +++ b/security/openssl/patches/patch-ab @@ -1,7 +1,7 @@ -$NetBSD: patch-ab,v 1.1.1.1 1999/04/30 15:19:13 tv Exp $ +$NetBSD: patch-ab,v 1.2 1999/10/19 04:09:19 erh Exp $ ---- Configure.orig Fri Mar 12 15:31:13 1999 -+++ Configure Tue Apr 27 13:35:42 1999 +--- Configure.orig Mon Oct 18 21:46:47 1999 ++++ Configure Mon Oct 18 22:28:19 1999 @@ -153,9 +153,6 @@ "linux-aout", "gcc:-DL_ENDIAN -DTERMIO -O3 -fomit-frame-pointer -m486 -Wall::BN_LLONG $x86_gcc_des $x86_gcc_opts:$x86_out_asm", "linux-mips", "gcc:-DL_ENDIAN -DTERMIO -O3 -fomit-frame-pointer -Wall @@ -33,7 +33,16 @@ $NetBSD: patch-ab,v 1.1.1.1 1999/04/30 15:19:13 tv Exp $ # # Cray T90 (SDSC) # It's Big-endian, but the algorithms work properly when B_ENDIAN is NOT -@@ -288,7 +299,7 @@ +@@ -282,19 +293,23 @@ + my $flags=""; + my $libs=""; + my $target=""; ++my $usersaref=0; ++my $xmakelib=" cd .. && csh \${MAKELIB} libcrypto.so.1.0 libcrypto.a"; ++ + foreach (@ARGV) + { + if ($_ =~ /^no-asm$/) { $no_asm=1; } elsif ($_ =~ /^-/) { @@ -42,3 +51,42 @@ $NetBSD: patch-ab,v 1.1.1.1 1999/04/30 15:19:13 tv Exp $ { $libs.=$_." "; } + elsif ($_ =~ /^-D(.*)$/) + { + $flags.=$_." "; ++ $usersaref=1 if ($_ =~ /^-DRSAref(.*)$/); + } + elsif ($_ =~ /^-[fK](.*)$/) + { +@@ -321,6 +336,11 @@ + } + } + ++if ($usersaref == 1) ++ { ++ $xmakelib.=" libRSAglue.a"; ++ } ++ + if (!defined($table{$target})) + { + &bad_target; +@@ -370,6 +390,19 @@ + # $rmd160_obj=$rmd160_enc; + $cflags.=" -DRMD160_ASM"; + } ++ ++rename("crypto/Makefile.ssl", "crypto/Makefile.org") unless -e "crypto/Makefile.org"; ++open(IN,'<crypto/Makefile.org') || die "unable to read crypto/Makefile.org:$!\n"; ++open(OUT,">crypto/Makefile.ssl") || die "unable to create crypto/Makefile.ssl:$!\n"; ++ ++while (<IN>) ++ { ++ chop; ++ s/^ XMAKELIB$/$xmakelib/; ++ print OUT $_."\n"; ++ } ++close(IN); ++close(OUT); + + open(IN,'<Makefile.org') || die "unable to read Makefile.org:$!\n"; + open(OUT,">$Makefile") || die "unable to create $Makefile:$!\n"; diff --git a/security/openssl/patches/patch-ae b/security/openssl/patches/patch-ae index ddb90821561..680d85b1f64 100644 --- a/security/openssl/patches/patch-ae +++ b/security/openssl/patches/patch-ae @@ -1,12 +1,12 @@ -$NetBSD: patch-ae,v 1.1.1.1 1999/04/30 15:19:13 tv Exp $ +$NetBSD: patch-ae,v 1.2 1999/10/19 04:09:19 erh Exp $ ---- crypto/Makefile.ssl.orig Tue Apr 27 14:35:41 1999 -+++ crypto/Makefile.ssl Tue Apr 27 14:37:46 1999 +--- crypto/Makefile.ssl.orig Mon Mar 22 06:21:17 1999 ++++ crypto/Makefile.ssl Mon Oct 18 22:19:47 1999 @@ -48,6 +48,7 @@ @(cd ..; $(MAKE) DIRS=$(DIR) all) all: date.h lib subdirs -+ cd .. && csh ${MAKELIB} libcrypto.so.1.0 libcrypto.a libRSAglue.a ++ XMAKELIB date.h: ../Makefile.ssl echo "#define DATE \"`date`\"" >date.h |