diff options
author | Dirk Froemberg <dirk@FreeBSD.org> | 2000-04-16 12:24:45 +0000 |
---|---|---|
committer | Dirk Froemberg <dirk@FreeBSD.org> | 2000-04-16 12:24:45 +0000 |
commit | e9294f816193a7ad134e7224288130f800bcf88c (patch) | |
tree | dc17f22f65e406425a7ac0e9a0ca1b495fc333cd /security | |
parent | Fix typo: `=' -> `+=' to have correct LIB_DEPENDS. (diff) |
Upgrade to 0.9.5a.
Notes
Notes:
svn path=/head/; revision=27653
Diffstat (limited to 'security')
-rw-r--r-- | security/openssl-beta/Makefile | 41 | ||||
-rw-r--r-- | security/openssl-beta/distinfo | 2 | ||||
-rw-r--r-- | security/openssl-beta/files/patch-ac | 47 | ||||
-rw-r--r-- | security/openssl-beta/files/patch-ah | 48 | ||||
-rw-r--r-- | security/openssl-beta/pkg-plist | 13 | ||||
-rw-r--r-- | security/openssl/Makefile | 41 | ||||
-rw-r--r-- | security/openssl/distinfo | 2 | ||||
-rw-r--r-- | security/openssl/files/patch-ac | 47 | ||||
-rw-r--r-- | security/openssl/files/patch-ah | 48 | ||||
-rw-r--r-- | security/openssl/pkg-plist | 13 |
10 files changed, 162 insertions, 140 deletions
diff --git a/security/openssl-beta/Makefile b/security/openssl-beta/Makefile index 962098f9c621..ad8b19effd1e 100644 --- a/security/openssl-beta/Makefile +++ b/security/openssl-beta/Makefile @@ -6,7 +6,7 @@ # PORTNAME= openssl -PORTVERSION= 0.9.4 +PORTVERSION= 0.9.5a CATEGORIES= security devel MASTER_SITES= http://www.openssl.org/source/ \ ftp://ftp.openssl.org/source/ \ @@ -26,6 +26,41 @@ ALL_TARGET= freebsd-shared all SHLIBVER= 1 MAKE_ENV+= SHLIBVER=${SHLIBVER} +MANPREFIX= ${PREFIX}/openssl +MAN1= CA.pl.1 asn1parse.1 ca.1 ciphers.1 crl.1 crl2pkcs7.1 dgst.1 \ + dhparam.1 dsa.1 dsaparam.1 enc.1 gendsa.1 genrsa.1 nseq.1 \ + openssl.1 passwd.1 pkcs12.1 pkcs7.1 pkcs8.1 rand.1 req.1 \ + rsa.1 s_client.1 s_server.1 sess_id.1 smime.1 speed.1 \ + spkac.1 verify.1 version.1 x509.1 +MAN3= BN_CTX_new.3 BN_CTX_start.3 BN_add.3 BN_add_word.3 \ + BN_bn2bin.3 BN_cmp.3 BN_copy.3 BN_generate_prime.3 \ + BN_mod_inverse.3 BN_mod_mul_montgomery.3 \ + BN_mod_mul_reciprocal.3 BN_new.3 BN_num_bytes.3 BN_rand.3 \ + BN_set_bit.3 BN_zero.3 CRYPTO_set_ex_data.3 \ + DH_generate_key.3 DH_generate_parameters.3 \ + DH_get_ex_new_index.3 DH_new.3 DH_set_method.3 DH_size.3 \ + DSA_SIG_new.3 DSA_do_sign.3 DSA_dup_DH.3 DSA_generate_key.3 \ + DSA_generate_parameters.3 DSA_get_ex_new_index.3 DSA_new.3 \ + DSA_set_method.3 DSA_sign.3 DSA_size.3 ERR_GET_LIB.3 \ + ERR_clear_error.3 ERR_error_string.3 ERR_get_error.3 \ + ERR_load_crypto_strings.3 ERR_load_strings.3 \ + ERR_print_errors.3 ERR_put_error.3 ERR_remove_state.3 \ + EVP_DigestInit.3 EVP_EncryptInit.3 EVP_OpenInit.3 \ + EVP_SealInit.3 EVP_SignInit.3 EVP_VerifyInit.3 \ + OPENSSL_VERSION_NUMBER.3 OpenSSL_add_all_algorithms.3 \ + RAND_add.3 RAND_bytes.3 RAND_cleanup.3 RAND_egd.3 \ + RAND_load_file.3 RAND_set_rand_method.3 RSA_blinding_on.3 \ + RSA_check_key.3 RSA_generate_key.3 RSA_get_ex_new_index.3 \ + RSA_new.3 RSA_padding_add_PKCS1_type_1.3 RSA_print.3 \ + RSA_private_encrypt.3 RSA_public_encrypt.3 RSA_set_method.3 \ + RSA_sign.3 RSA_sign_ASN1_OCTET_STRING.3 RSA_size.3 \ + SSL_get_error.3 blowfish.3 bn.3 bn_internal.3 buffer.3 \ + crypto.3 d2i_DHparams.3 d2i_RSAPublicKey.3 des.3 dh.3 dsa.3 \ + err.3 hmac.3 lh_stats.3 lhash.3 md5.3 mdc2.3 rand.3 rc4.3 \ + ripemd.3 rsa.3 sha.3 ssl.3 threads.3 +MAN5= config.5 +MAN7= des_modes.7 + .if !defined(USA_RESIDENT) || ${USA_RESIDENT} != YES && ${USA_RESIDENT} != NO pre-fetch: @${ECHO} "" @@ -49,12 +84,12 @@ do-configure: post-install: .for i in libcrypto libssl @${INSTALL_DATA} ${WRKSRC}/$i.so.${SHLIBVER} ${PREFIX}/lib - @${LN} -s $i.so.${SHLIBVER} ${PREFIX}/lib/$i.so + @${LN} -sf $i.so.${SHLIBVER} ${PREFIX}/lib/$i.so .endfor @${SETENV} OBJFORMAT=${PORTOBJFORMAT} ${LDCONFIG} -m ${PREFIX}/lib .if !defined(NOPORTDOCS) @${MKDIR} ${PREFIX}/share/doc/openssl - @${INSTALL_DATA} ${WRKSRC}/doc/* ${PREFIX}/share/doc/openssl + @${INSTALL_DATA} ${WRKSRC}/doc/openssl.txt ${PREFIX}/share/doc/openssl .endif @${SED} -e 's#/usr/local#${PREFIX}#g' ${PKGDIR}/MESSAGE diff --git a/security/openssl-beta/distinfo b/security/openssl-beta/distinfo index 28fa47e94e3b..4c5f4c4055a5 100644 --- a/security/openssl-beta/distinfo +++ b/security/openssl-beta/distinfo @@ -1 +1 @@ -MD5 (openssl-0.9.4.tar.gz) = ee27fd88986143156920a0da362135fb +MD5 (openssl-0.9.5a.tar.gz) = 8fcb6a8ba511ec8b54b95f267ef52cf0 diff --git a/security/openssl-beta/files/patch-ac b/security/openssl-beta/files/patch-ac index 00f9f5b48023..e155fb2697f6 100644 --- a/security/openssl-beta/files/patch-ac +++ b/security/openssl-beta/files/patch-ac @@ -1,31 +1,22 @@ ---- Configure.orig Sun Aug 8 13:56:29 1999 -+++ Configure Mon Aug 9 20:25:48 1999 -@@ -193,7 +193,7 @@ - "alpha-gcc","gcc:-O3::(unknown)::SIXTY_FOUR_BIT_LONG DES_UNROLL DES_RISC1:::", - "alpha-cc", "cc:-std1 -tune host -O4 -readonly_strings::(unknown)::SIXTY_FOUR_BIT_LONG:::", - "alpha164-cc", "cc:-std1 -tune host -fast -readonly_strings::(unknown)::SIXTY_FOUR_BIT_LONG:::", --"FreeBSD-alpha","gcc:-DTERMIOS -O3 -fomit-frame-pointer::(unknown)::SIXTY_FOUR_BIT_LONG DES_INT DES_PTR DES_RISC2:::", -+"FreeBSD-alpha","$ENV{CC}:-DTERMIOS $ENV{CFLAGS}::(unknown)::SIXTY_FOUR_BIT_LONG DES_INT DES_PTR DES_RISC2:::", +--- Configure.orig Mon Mar 27 23:28:10 2000 ++++ Configure Sat Apr 15 13:30:38 2000 +@@ -243,7 +243,7 @@ + "alpha-gcc","gcc:-O3::(unknown)::SIXTY_FOUR_BIT_LONG RC4_CHUNK DES_UNROLL DES_RISC1:asm/alpha.o::", + "alpha-cc", "cc:-std1 -tune host -O4 -readonly_strings::(unknown)::SIXTY_FOUR_BIT_LONG RC4_CHUNK:asm/alpha.o::", + "alpha164-cc", "cc:-std1 -tune host -fast -readonly_strings::(unknown)::SIXTY_FOUR_BIT_LONG RC4_CHUNK:asm/alpha.o::", +-"FreeBSD-alpha","gcc:-DTERMIOS -O3 -fomit-frame-pointer::(unknown)::SIXTY_FOUR_BIT_LONG RC4_CHUNK DES_INT DES_PTR DES_RISC2:::", ++"FreeBSD-alpha","$ENV{CC}:-DTERMIOS $ENV{CFLAGS}::(unknown)::SIXTY_FOUR_BIT_LONG RC4_CHUNK DES_INT DES_PTR DES_RISC2:::", - # assembler versions -- currently defunct: - ##"alpha-gcc","gcc:-O3::(unknown)::SIXTY_FOUR_BIT_LONG DES_UNROLL DES_RISC1:asm/alpha.o::", -@@ -211,8 +211,8 @@ + #### Alpha Linux with GNU C and Compaq C setups + # Special notes: +@@ -277,8 +277,8 @@ "NetBSD-sparc", "gcc:-DTERMIOS -O3 -fomit-frame-pointer -mv8 -Wall -DB_ENDIAN::(unknown)::BN_LLONG MD2_CHAR RC4_INDEX DES_UNROLL:::", "NetBSD-m68", "gcc:-DTERMIOS -O3 -fomit-frame-pointer -Wall -DB_ENDIAN::(unknown)::BN_LLONG MD2_CHAR RC4_INDEX DES_UNROLL:::", - "NetBSD-x86", "gcc:-DTERMIOS -O3 -fomit-frame-pointer -m486 -Wall::(unknown)::BN_LLONG $x86_gcc_des $x86_gcc_opts:", --"FreeBSD-elf", "gcc:-DTERMIOS -DL_ENDIAN -fomit-frame-pointer -O3 -m486 -Wall::(unknown)::BN_LLONG $x86_gcc_des $x86_gcc_opts:$x86_elf_asm", --"FreeBSD", "gcc:-DTERMIOS -DL_ENDIAN -fomit-frame-pointer -O3 -m486 -Wall::(unknown)::BN_LLONG $x86_gcc_des $x86_gcc_opts:$x86_out_asm", -+"FreeBSD-elf", "$ENV{CC}:-DTERMIOS -DL_ENDIAN $ENV{CFLAGS}::(unknown)::BN_LLONG $x86_gcc_des $x86_gcc_opts:$x86_elf_asm", -+"FreeBSD", "$ENV{CC}:-DTERMIOS -DL_ENDIAN $ENV{CFLAGS}::(unknown)::BN_LLONG $x86_gcc_des $x86_gcc_opts:$x86_out_asm", - "bsdi-gcc", "gcc:-O3 -ffast-math -DL_ENDIAN -DPERL5 -m486::(unknown)::RSA_LLONG $x86_gcc_des $x86_gcc_opts:$x86_bsdi_asm", - "bsdi-elf-gcc", "gcc:-DPERL5 -DL_ENDIAN -fomit-frame-pointer -O3 -m486 -Wall::(unknown)::BN_LLONG $x86_gcc_des $x86_gcc_opts:$x86_elf_asm", - "nextstep", "cc:-O -Wall:<libc.h>:(unknown)::BN_LLONG $x86_gcc_des ${x86_gcc_opts}:::", -@@ -337,7 +337,7 @@ - my $perl; - - $ranlib=&which("ranlib") or $ranlib="true"; --$perl=&which("perl5") or $perl=&which("perl") or $perl="perl"; -+$perl=$ENV{PERL}; - - &usage if ($#ARGV < 0); - + "NetBSD-x86", "gcc:-DTERMIOS -O3 -fomit-frame-pointer -m486 -Wall::(unknown)::BN_LLONG ${x86_gcc_des} ${x86_gcc_opts}:", +-"FreeBSD-elf", "gcc:-DTERMIOS -DL_ENDIAN -fomit-frame-pointer -O3 -m486 -Wall::(unknown)::BN_LLONG ${x86_gcc_des} ${x86_gcc_opts}:${x86_elf_asm}", +-"FreeBSD", "gcc:-DTERMIOS -DL_ENDIAN -fomit-frame-pointer -O3 -m486 -Wall::(unknown)::BN_LLONG ${x86_gcc_des} ${x86_gcc_opts}:${x86_out_asm}", ++"FreeBSD-elf", "$ENV{CC}:-DTERMIOS -DL_ENDIAN $ENV{CFLAGS}::(unknown)::BN_LLONG ${x86_gcc_des} ${x86_gcc_opts}:${x86_elf_asm}", ++"FreeBSD", "$ENV{CC}:-DTERMIOS -DL_ENDIAN $ENV{CFLAGS}::(unknown)::BN_LLONG ${x86_gcc_des} ${x86_gcc_opts}:${x86_out_asm}", + "bsdi-gcc", "gcc:-O3 -ffast-math -DL_ENDIAN -DPERL5 -m486::(unknown)::RSA_LLONG ${x86_gcc_des} ${x86_gcc_opts}:${x86_bsdi_asm}", + "bsdi-elf-gcc", "gcc:-DPERL5 -DL_ENDIAN -fomit-frame-pointer -O3 -m486 -Wall::(unknown)::BN_LLONG ${x86_gcc_des} ${x86_gcc_opts}:${x86_elf_asm}", + "nextstep", "cc:-O -Wall:<libc.h>:(unknown)::BN_LLONG ${x86_gcc_des} ${x86_gcc_opts}:::", diff --git a/security/openssl-beta/files/patch-ah b/security/openssl-beta/files/patch-ah index 4d54b18d5fc2..7ca781180b32 100644 --- a/security/openssl-beta/files/patch-ah +++ b/security/openssl-beta/files/patch-ah @@ -1,6 +1,6 @@ ---- config.orig Mon Aug 9 12:16:51 1999 -+++ config Mon Aug 9 20:30:08 1999 -@@ -297,40 +297,6 @@ +--- config.orig Tue Mar 14 00:52:44 2000 ++++ config Sat Apr 15 14:18:03 2000 +@@ -311,50 +311,6 @@ esac done @@ -18,7 +18,7 @@ -fi - -if [ "$SYSTEM" = "SunOS" ]; then -- # assume output is "blah-blah C x.x" +- # check for WorkShop C, expected output is "cc: blah-blah C x.x" - CCVER=`(cc -V 2>&1) 2>/dev/null | \ - egrep -e '^cc: .* C [0-9]\.[0-9]' | \ - sed 's/.* C \([0-9]\)\.\([0-9]\).*/\1\2/'` @@ -35,31 +35,19 @@ - fi -fi - --GCCVER=${GCCVER:-0} --CCVER=${CCVER:-0} -- - # read the output of the embedded GuessOS - read GUESSOS - -@@ -423,21 +389,6 @@ - # *-dgux) OUT="dgux" ;; - *) OUT=`echo $GUESSOS | awk -F- '{print $3}'`;; - esac -- --# gcc < 2.8 does not support -mcpu=ultrasparc --if [ "$OUT" = solaris-sparcv9-gcc -a $GCCVER -lt 28 ] --then -- echo "WARNING! Do consider upgrading to gcc-2.8 or later." -- sleep 5 -- OUT=solaris-sparcv9-gcc27 --fi --if [ "$OUT" = "linux-sparcv9" -a $GCCVER -lt 28 ] --then -- echo "WARNING! Falling down to 'linux-sparcv8'." -- echo " Upgrade to gcc-2.8 or later." -- sleep 5 -- OUT=linux-sparcv8 +-if [ "${SYSTEM}-${MACHINE}" = "Linux-alpha" ]; then +- # check for Compaq C, expected output is "blah-blah C Vx.x" +- CCCVER=`(ccc -V 2>&1) 2>/dev/null | \ +- egrep -e '.* C V[0-9]\.[0-9]' | \ +- sed 's/.* C V\([0-9]\)\.\([0-9]\).*/\1\2/'` +- CCCVER=${CCCVER:-0} +- if [ $CCCVER -gt 60 ]; then +- CC=ccc # overrides gcc!!! well, ccc outperforms inoticeably +- # only on hash routines and des, otherwise gcc (2.95) +- # keeps along rather tight... +- fi -fi +- + GCCVER=${GCCVER:-0} + CCVER=${CCVER:-0} - case "$GUESSOS" in - i386-*) options="$options 386" ;; diff --git a/security/openssl-beta/pkg-plist b/security/openssl-beta/pkg-plist index 8457dbaaa473..890ede42b0ec 100644 --- a/security/openssl-beta/pkg-plist +++ b/security/openssl-beta/pkg-plist @@ -65,18 +65,15 @@ openssl/misc/c_issuer openssl/misc/c_name openssl/misc/der_chop openssl/openssl.cnf.sample -share/doc/openssl/README -share/doc/openssl/c-indentation.el -share/doc/openssl/crypto.pod -share/doc/openssl/openssl.pod share/doc/openssl/openssl.txt -share/doc/openssl/openssl_button.gif -share/doc/openssl/openssl_button.html -share/doc/openssl/ssl.pod -share/doc/openssl/ssleay.txt @dirrm include/openssl @dirrm openssl/certs @dirrm openssl/lib +@dirrm openssl/man/man1 +@dirrm openssl/man/man3 +@dirrm openssl/man/man5 +@dirrm openssl/man/man7 +@dirrm openssl/man @dirrm openssl/misc @dirrm openssl/private @dirrm openssl diff --git a/security/openssl/Makefile b/security/openssl/Makefile index 962098f9c621..ad8b19effd1e 100644 --- a/security/openssl/Makefile +++ b/security/openssl/Makefile @@ -6,7 +6,7 @@ # PORTNAME= openssl -PORTVERSION= 0.9.4 +PORTVERSION= 0.9.5a CATEGORIES= security devel MASTER_SITES= http://www.openssl.org/source/ \ ftp://ftp.openssl.org/source/ \ @@ -26,6 +26,41 @@ ALL_TARGET= freebsd-shared all SHLIBVER= 1 MAKE_ENV+= SHLIBVER=${SHLIBVER} +MANPREFIX= ${PREFIX}/openssl +MAN1= CA.pl.1 asn1parse.1 ca.1 ciphers.1 crl.1 crl2pkcs7.1 dgst.1 \ + dhparam.1 dsa.1 dsaparam.1 enc.1 gendsa.1 genrsa.1 nseq.1 \ + openssl.1 passwd.1 pkcs12.1 pkcs7.1 pkcs8.1 rand.1 req.1 \ + rsa.1 s_client.1 s_server.1 sess_id.1 smime.1 speed.1 \ + spkac.1 verify.1 version.1 x509.1 +MAN3= BN_CTX_new.3 BN_CTX_start.3 BN_add.3 BN_add_word.3 \ + BN_bn2bin.3 BN_cmp.3 BN_copy.3 BN_generate_prime.3 \ + BN_mod_inverse.3 BN_mod_mul_montgomery.3 \ + BN_mod_mul_reciprocal.3 BN_new.3 BN_num_bytes.3 BN_rand.3 \ + BN_set_bit.3 BN_zero.3 CRYPTO_set_ex_data.3 \ + DH_generate_key.3 DH_generate_parameters.3 \ + DH_get_ex_new_index.3 DH_new.3 DH_set_method.3 DH_size.3 \ + DSA_SIG_new.3 DSA_do_sign.3 DSA_dup_DH.3 DSA_generate_key.3 \ + DSA_generate_parameters.3 DSA_get_ex_new_index.3 DSA_new.3 \ + DSA_set_method.3 DSA_sign.3 DSA_size.3 ERR_GET_LIB.3 \ + ERR_clear_error.3 ERR_error_string.3 ERR_get_error.3 \ + ERR_load_crypto_strings.3 ERR_load_strings.3 \ + ERR_print_errors.3 ERR_put_error.3 ERR_remove_state.3 \ + EVP_DigestInit.3 EVP_EncryptInit.3 EVP_OpenInit.3 \ + EVP_SealInit.3 EVP_SignInit.3 EVP_VerifyInit.3 \ + OPENSSL_VERSION_NUMBER.3 OpenSSL_add_all_algorithms.3 \ + RAND_add.3 RAND_bytes.3 RAND_cleanup.3 RAND_egd.3 \ + RAND_load_file.3 RAND_set_rand_method.3 RSA_blinding_on.3 \ + RSA_check_key.3 RSA_generate_key.3 RSA_get_ex_new_index.3 \ + RSA_new.3 RSA_padding_add_PKCS1_type_1.3 RSA_print.3 \ + RSA_private_encrypt.3 RSA_public_encrypt.3 RSA_set_method.3 \ + RSA_sign.3 RSA_sign_ASN1_OCTET_STRING.3 RSA_size.3 \ + SSL_get_error.3 blowfish.3 bn.3 bn_internal.3 buffer.3 \ + crypto.3 d2i_DHparams.3 d2i_RSAPublicKey.3 des.3 dh.3 dsa.3 \ + err.3 hmac.3 lh_stats.3 lhash.3 md5.3 mdc2.3 rand.3 rc4.3 \ + ripemd.3 rsa.3 sha.3 ssl.3 threads.3 +MAN5= config.5 +MAN7= des_modes.7 + .if !defined(USA_RESIDENT) || ${USA_RESIDENT} != YES && ${USA_RESIDENT} != NO pre-fetch: @${ECHO} "" @@ -49,12 +84,12 @@ do-configure: post-install: .for i in libcrypto libssl @${INSTALL_DATA} ${WRKSRC}/$i.so.${SHLIBVER} ${PREFIX}/lib - @${LN} -s $i.so.${SHLIBVER} ${PREFIX}/lib/$i.so + @${LN} -sf $i.so.${SHLIBVER} ${PREFIX}/lib/$i.so .endfor @${SETENV} OBJFORMAT=${PORTOBJFORMAT} ${LDCONFIG} -m ${PREFIX}/lib .if !defined(NOPORTDOCS) @${MKDIR} ${PREFIX}/share/doc/openssl - @${INSTALL_DATA} ${WRKSRC}/doc/* ${PREFIX}/share/doc/openssl + @${INSTALL_DATA} ${WRKSRC}/doc/openssl.txt ${PREFIX}/share/doc/openssl .endif @${SED} -e 's#/usr/local#${PREFIX}#g' ${PKGDIR}/MESSAGE diff --git a/security/openssl/distinfo b/security/openssl/distinfo index 28fa47e94e3b..4c5f4c4055a5 100644 --- a/security/openssl/distinfo +++ b/security/openssl/distinfo @@ -1 +1 @@ -MD5 (openssl-0.9.4.tar.gz) = ee27fd88986143156920a0da362135fb +MD5 (openssl-0.9.5a.tar.gz) = 8fcb6a8ba511ec8b54b95f267ef52cf0 diff --git a/security/openssl/files/patch-ac b/security/openssl/files/patch-ac index 00f9f5b48023..e155fb2697f6 100644 --- a/security/openssl/files/patch-ac +++ b/security/openssl/files/patch-ac @@ -1,31 +1,22 @@ ---- Configure.orig Sun Aug 8 13:56:29 1999 -+++ Configure Mon Aug 9 20:25:48 1999 -@@ -193,7 +193,7 @@ - "alpha-gcc","gcc:-O3::(unknown)::SIXTY_FOUR_BIT_LONG DES_UNROLL DES_RISC1:::", - "alpha-cc", "cc:-std1 -tune host -O4 -readonly_strings::(unknown)::SIXTY_FOUR_BIT_LONG:::", - "alpha164-cc", "cc:-std1 -tune host -fast -readonly_strings::(unknown)::SIXTY_FOUR_BIT_LONG:::", --"FreeBSD-alpha","gcc:-DTERMIOS -O3 -fomit-frame-pointer::(unknown)::SIXTY_FOUR_BIT_LONG DES_INT DES_PTR DES_RISC2:::", -+"FreeBSD-alpha","$ENV{CC}:-DTERMIOS $ENV{CFLAGS}::(unknown)::SIXTY_FOUR_BIT_LONG DES_INT DES_PTR DES_RISC2:::", +--- Configure.orig Mon Mar 27 23:28:10 2000 ++++ Configure Sat Apr 15 13:30:38 2000 +@@ -243,7 +243,7 @@ + "alpha-gcc","gcc:-O3::(unknown)::SIXTY_FOUR_BIT_LONG RC4_CHUNK DES_UNROLL DES_RISC1:asm/alpha.o::", + "alpha-cc", "cc:-std1 -tune host -O4 -readonly_strings::(unknown)::SIXTY_FOUR_BIT_LONG RC4_CHUNK:asm/alpha.o::", + "alpha164-cc", "cc:-std1 -tune host -fast -readonly_strings::(unknown)::SIXTY_FOUR_BIT_LONG RC4_CHUNK:asm/alpha.o::", +-"FreeBSD-alpha","gcc:-DTERMIOS -O3 -fomit-frame-pointer::(unknown)::SIXTY_FOUR_BIT_LONG RC4_CHUNK DES_INT DES_PTR DES_RISC2:::", ++"FreeBSD-alpha","$ENV{CC}:-DTERMIOS $ENV{CFLAGS}::(unknown)::SIXTY_FOUR_BIT_LONG RC4_CHUNK DES_INT DES_PTR DES_RISC2:::", - # assembler versions -- currently defunct: - ##"alpha-gcc","gcc:-O3::(unknown)::SIXTY_FOUR_BIT_LONG DES_UNROLL DES_RISC1:asm/alpha.o::", -@@ -211,8 +211,8 @@ + #### Alpha Linux with GNU C and Compaq C setups + # Special notes: +@@ -277,8 +277,8 @@ "NetBSD-sparc", "gcc:-DTERMIOS -O3 -fomit-frame-pointer -mv8 -Wall -DB_ENDIAN::(unknown)::BN_LLONG MD2_CHAR RC4_INDEX DES_UNROLL:::", "NetBSD-m68", "gcc:-DTERMIOS -O3 -fomit-frame-pointer -Wall -DB_ENDIAN::(unknown)::BN_LLONG MD2_CHAR RC4_INDEX DES_UNROLL:::", - "NetBSD-x86", "gcc:-DTERMIOS -O3 -fomit-frame-pointer -m486 -Wall::(unknown)::BN_LLONG $x86_gcc_des $x86_gcc_opts:", --"FreeBSD-elf", "gcc:-DTERMIOS -DL_ENDIAN -fomit-frame-pointer -O3 -m486 -Wall::(unknown)::BN_LLONG $x86_gcc_des $x86_gcc_opts:$x86_elf_asm", --"FreeBSD", "gcc:-DTERMIOS -DL_ENDIAN -fomit-frame-pointer -O3 -m486 -Wall::(unknown)::BN_LLONG $x86_gcc_des $x86_gcc_opts:$x86_out_asm", -+"FreeBSD-elf", "$ENV{CC}:-DTERMIOS -DL_ENDIAN $ENV{CFLAGS}::(unknown)::BN_LLONG $x86_gcc_des $x86_gcc_opts:$x86_elf_asm", -+"FreeBSD", "$ENV{CC}:-DTERMIOS -DL_ENDIAN $ENV{CFLAGS}::(unknown)::BN_LLONG $x86_gcc_des $x86_gcc_opts:$x86_out_asm", - "bsdi-gcc", "gcc:-O3 -ffast-math -DL_ENDIAN -DPERL5 -m486::(unknown)::RSA_LLONG $x86_gcc_des $x86_gcc_opts:$x86_bsdi_asm", - "bsdi-elf-gcc", "gcc:-DPERL5 -DL_ENDIAN -fomit-frame-pointer -O3 -m486 -Wall::(unknown)::BN_LLONG $x86_gcc_des $x86_gcc_opts:$x86_elf_asm", - "nextstep", "cc:-O -Wall:<libc.h>:(unknown)::BN_LLONG $x86_gcc_des ${x86_gcc_opts}:::", -@@ -337,7 +337,7 @@ - my $perl; - - $ranlib=&which("ranlib") or $ranlib="true"; --$perl=&which("perl5") or $perl=&which("perl") or $perl="perl"; -+$perl=$ENV{PERL}; - - &usage if ($#ARGV < 0); - + "NetBSD-x86", "gcc:-DTERMIOS -O3 -fomit-frame-pointer -m486 -Wall::(unknown)::BN_LLONG ${x86_gcc_des} ${x86_gcc_opts}:", +-"FreeBSD-elf", "gcc:-DTERMIOS -DL_ENDIAN -fomit-frame-pointer -O3 -m486 -Wall::(unknown)::BN_LLONG ${x86_gcc_des} ${x86_gcc_opts}:${x86_elf_asm}", +-"FreeBSD", "gcc:-DTERMIOS -DL_ENDIAN -fomit-frame-pointer -O3 -m486 -Wall::(unknown)::BN_LLONG ${x86_gcc_des} ${x86_gcc_opts}:${x86_out_asm}", ++"FreeBSD-elf", "$ENV{CC}:-DTERMIOS -DL_ENDIAN $ENV{CFLAGS}::(unknown)::BN_LLONG ${x86_gcc_des} ${x86_gcc_opts}:${x86_elf_asm}", ++"FreeBSD", "$ENV{CC}:-DTERMIOS -DL_ENDIAN $ENV{CFLAGS}::(unknown)::BN_LLONG ${x86_gcc_des} ${x86_gcc_opts}:${x86_out_asm}", + "bsdi-gcc", "gcc:-O3 -ffast-math -DL_ENDIAN -DPERL5 -m486::(unknown)::RSA_LLONG ${x86_gcc_des} ${x86_gcc_opts}:${x86_bsdi_asm}", + "bsdi-elf-gcc", "gcc:-DPERL5 -DL_ENDIAN -fomit-frame-pointer -O3 -m486 -Wall::(unknown)::BN_LLONG ${x86_gcc_des} ${x86_gcc_opts}:${x86_elf_asm}", + "nextstep", "cc:-O -Wall:<libc.h>:(unknown)::BN_LLONG ${x86_gcc_des} ${x86_gcc_opts}:::", diff --git a/security/openssl/files/patch-ah b/security/openssl/files/patch-ah index 4d54b18d5fc2..7ca781180b32 100644 --- a/security/openssl/files/patch-ah +++ b/security/openssl/files/patch-ah @@ -1,6 +1,6 @@ ---- config.orig Mon Aug 9 12:16:51 1999 -+++ config Mon Aug 9 20:30:08 1999 -@@ -297,40 +297,6 @@ +--- config.orig Tue Mar 14 00:52:44 2000 ++++ config Sat Apr 15 14:18:03 2000 +@@ -311,50 +311,6 @@ esac done @@ -18,7 +18,7 @@ -fi - -if [ "$SYSTEM" = "SunOS" ]; then -- # assume output is "blah-blah C x.x" +- # check for WorkShop C, expected output is "cc: blah-blah C x.x" - CCVER=`(cc -V 2>&1) 2>/dev/null | \ - egrep -e '^cc: .* C [0-9]\.[0-9]' | \ - sed 's/.* C \([0-9]\)\.\([0-9]\).*/\1\2/'` @@ -35,31 +35,19 @@ - fi -fi - --GCCVER=${GCCVER:-0} --CCVER=${CCVER:-0} -- - # read the output of the embedded GuessOS - read GUESSOS - -@@ -423,21 +389,6 @@ - # *-dgux) OUT="dgux" ;; - *) OUT=`echo $GUESSOS | awk -F- '{print $3}'`;; - esac -- --# gcc < 2.8 does not support -mcpu=ultrasparc --if [ "$OUT" = solaris-sparcv9-gcc -a $GCCVER -lt 28 ] --then -- echo "WARNING! Do consider upgrading to gcc-2.8 or later." -- sleep 5 -- OUT=solaris-sparcv9-gcc27 --fi --if [ "$OUT" = "linux-sparcv9" -a $GCCVER -lt 28 ] --then -- echo "WARNING! Falling down to 'linux-sparcv8'." -- echo " Upgrade to gcc-2.8 or later." -- sleep 5 -- OUT=linux-sparcv8 +-if [ "${SYSTEM}-${MACHINE}" = "Linux-alpha" ]; then +- # check for Compaq C, expected output is "blah-blah C Vx.x" +- CCCVER=`(ccc -V 2>&1) 2>/dev/null | \ +- egrep -e '.* C V[0-9]\.[0-9]' | \ +- sed 's/.* C V\([0-9]\)\.\([0-9]\).*/\1\2/'` +- CCCVER=${CCCVER:-0} +- if [ $CCCVER -gt 60 ]; then +- CC=ccc # overrides gcc!!! well, ccc outperforms inoticeably +- # only on hash routines and des, otherwise gcc (2.95) +- # keeps along rather tight... +- fi -fi +- + GCCVER=${GCCVER:-0} + CCVER=${CCVER:-0} - case "$GUESSOS" in - i386-*) options="$options 386" ;; diff --git a/security/openssl/pkg-plist b/security/openssl/pkg-plist index 8457dbaaa473..890ede42b0ec 100644 --- a/security/openssl/pkg-plist +++ b/security/openssl/pkg-plist @@ -65,18 +65,15 @@ openssl/misc/c_issuer openssl/misc/c_name openssl/misc/der_chop openssl/openssl.cnf.sample -share/doc/openssl/README -share/doc/openssl/c-indentation.el -share/doc/openssl/crypto.pod -share/doc/openssl/openssl.pod share/doc/openssl/openssl.txt -share/doc/openssl/openssl_button.gif -share/doc/openssl/openssl_button.html -share/doc/openssl/ssl.pod -share/doc/openssl/ssleay.txt @dirrm include/openssl @dirrm openssl/certs @dirrm openssl/lib +@dirrm openssl/man/man1 +@dirrm openssl/man/man3 +@dirrm openssl/man/man5 +@dirrm openssl/man/man7 +@dirrm openssl/man @dirrm openssl/misc @dirrm openssl/private @dirrm openssl |