diff options
author | erh <erh@pkgsrc.org> | 1999-11-25 18:51:47 +0000 |
---|---|---|
committer | erh <erh@pkgsrc.org> | 1999-11-25 18:51:47 +0000 |
commit | c11044fe629094efd415d170f992d4a32d41dc79 (patch) | |
tree | c32e3435ad52bc3d9b0a9e9835afbf64e73ba307 /security | |
parent | 75d6a9d82da56f9909d1409a8b482d4076a03e26 (diff) | |
download | pkgsrc-c11044fe629094efd415d170f992d4a32d41dc79.tar.gz |
Update openssl to 0.9.4.
Diffstat (limited to 'security')
-rw-r--r-- | security/openssl/Makefile | 34 | ||||
-rw-r--r-- | security/openssl/files/get_progs.sh | 13 | ||||
-rwxr-xr-x | security/openssl/files/makelib | 10 | ||||
-rw-r--r-- | security/openssl/files/md5 | 5 | ||||
-rw-r--r-- | security/openssl/files/patch-sum | 23 | ||||
-rw-r--r-- | security/openssl/patches/patch-aa | 33 | ||||
-rw-r--r-- | security/openssl/patches/patch-ab | 179 | ||||
-rw-r--r-- | security/openssl/patches/patch-ac | 8 | ||||
-rw-r--r-- | security/openssl/patches/patch-ad | 29 | ||||
-rw-r--r-- | security/openssl/patches/patch-ae | 14 | ||||
-rw-r--r-- | security/openssl/patches/patch-af | 8 | ||||
-rw-r--r-- | security/openssl/patches/patch-ag | 10 | ||||
-rw-r--r-- | security/openssl/patches/patch-ah | 12 | ||||
-rw-r--r-- | security/openssl/patches/patch-ai | 10 | ||||
-rw-r--r-- | security/openssl/patches/patch-aj | 22 | ||||
-rw-r--r-- | security/openssl/patches/patch-ak | 13 | ||||
-rw-r--r-- | security/openssl/pkg/PLIST | 14 |
17 files changed, 268 insertions, 169 deletions
diff --git a/security/openssl/Makefile b/security/openssl/Makefile index 5d7536f7ce0..faa2aaaae99 100644 --- a/security/openssl/Makefile +++ b/security/openssl/Makefile @@ -1,13 +1,10 @@ -# $NetBSD: Makefile,v 1.8 1999/08/24 07:46:41 simonb Exp $ +# $NetBSD: Makefile,v 1.9 1999/11/25 18:51:47 erh Exp $ # -DISTNAME= openssl-0.9.2b +DISTNAME= openssl-0.9.4 CATEGORIES= security MASTER_SITES= ftp://ftp.openssl.org/source/ -PATCH_SITES= ${MASTER_SITES} -PATCHFILES= openssl-0.9.2b-rsaoaep.patch - MAINTAINER= packages@netbsd.org HOMEPAGE= http://www.openssl.org/ @@ -23,7 +20,8 @@ ONLY_FOR_PLATFORM= NetBSD-*-alpha NetBSD-*-arm32 NetBSD-*-i386 \ NetBSD-*-mipsel NetBSD-*-ns32k NetBSD-*-powerpc \ NetBSD-*-sparc NetBSD-*-vax -CONFIGURE_ARGS= -fPIC -DPIC ${LDFLAGS} +CONFIGURE_ARGS= -fPIC -DPIC --openssldir=${PREFIX} --prefix=${PREFIX} \ + ${LDFLAGS} #CONFIGURE_ENV= PREFIX=${PREFIX} MAKE_ENV= LD_LIBRARY_PATH=${WRKSRC} MAKELIB=${FILESDIR}/makelib @@ -35,7 +33,7 @@ IGNORE= requires shared object support .if defined(USE_RSAREF2) && ${USE_RSAREF2} == YES DEPENDS= rsaref-2.0p2:../../security/rsaref -CONFIGURE_ARGS+= -DRSAref -L${PREFIX}/lib -lrsaref ${LDFLAGS} +CONFIGURE_ARGS+= rsaref .endif fetch-depends: @@ -52,7 +50,6 @@ fetch-depends: # The Perl stuff doesn't work yet (nor did it work properly in SSLeay...) do-configure: @cd ${WRKSRC} && ${LOCALBASE}/bin/perl util/perlpath.pl ${LOCALBASE}/bin - @cd ${WRKSRC} && ${LOCALBASE}/bin/perl util/ssldir.pl ${PREFIX} @cd ${WRKSRC} && ${SETENV} ${CONFIGURE_ENV} ./config ${CONFIGURE_ARGS} # @cd ${WRKSRC}/perl && ${SETENV} ${CONFIGURE_ENV} ${LOCALBASE}/bin/perl \ # Makefile.PL @@ -69,9 +66,9 @@ do-install: des-ede-ofb des-ede3 des-ede3-cbc des-ede3-cfb des-ede3-ofb \ des-ofb des3 desx dgst dh dsa dsaparam enc errstr gendh gendsa \ genrsa idea idea-cbc idea-cfb idea-ecb idea-ofb md2 mdc2 nseq \ - pkcs7 rc2 rc2-cbc rc2-cfb rc2-ecb rc2-ofb rc4 rc5 rc5-cbc rc5-cfb \ - rc5-ecb rc5-ofb req rmd160 rsa s_client s_server s_time sess_id \ - sha sha1 verify x509 ssleay; do \ + pkcs12 pkcs7 pkcs8 rc2 rc2-cbc rc2-cfb rc2-ecb rc2-ofb rc4 rc5 \ + rc5-cbc rc5-cfb rc5-ecb rc5-ofb req rmd160 rsa s_client s_server \ + s_time sess_id sha sha1 speed verify version x509; do \ ${LN} -sf openssl $$file; \ done cd ${WRKSRC}/tools && ${INSTALL_SCRIPT} \ @@ -83,13 +80,14 @@ do-install: cd ${WRKSRC} && \ ${INSTALL_DATA} libcrypto.so.?.0 libssl.so.?.0 ${PREFIX}/lib/ ${INSTALL_DATA_DIR} ${PREFIX}/include/openssl - cd ${WRKSRC}/include && \ - for file in asn1.h asn1_mac.h bio.h blowfish.h bn.h buffer.h \ - cast.h comp.h conf.h cryptall.h crypto.h des.h dh.h dsa.h err.h \ - evp.h hmac.h idea.h lhash.h md2.h md5.h mdc2.h objects.h \ - opensslv.h pem.h pem2.h pkcs7.h rand.h rc2.h rc4.h rc5.h ripemd.h \ - rsa.h sha.h ssl.h ssl2.h ssl23.h ssl3.h stack.h tls1.h tmdiff.h \ - txt_db.h x509.h x509_vfy.h x509v3.h; do \ + cd ${WRKSRC}/include/openssl && \ + for file in \ + asn1.h asn1_mac.h bio.h blowfish.h bn.h buffer.h cast.h comp.h conf.h \ + crypto.h des.h dh.h dsa.h e_os.h e_os2.h ebcdic.h err.h evp.h hmac.h \ + idea.h lhash.h md2.h md5.h mdc2.h objects.h opensslconf.h opensslv.h \ + pem.h pem2.h pkcs12.h pkcs7.h rand.h rc2.h rc4.h rc5.h ripemd.h rsa.h \ + safestack.h sha.h ssl.h ssl2.h ssl23.h ssl3.h stack.h tls1.h tmdiff.h \ + txt_db.h x509.h x509_vfy.h x509v3.h ; do \ ${INSTALL_DATA} $$file ${PREFIX}/include/openssl/; \ done # @cd ${WRKSRC}/perl && ${MAKE} install diff --git a/security/openssl/files/get_progs.sh b/security/openssl/files/get_progs.sh new file mode 100644 index 00000000000..3c2f0ce129f --- /dev/null +++ b/security/openssl/files/get_progs.sh @@ -0,0 +1,13 @@ +#!/bin/sh +# Help figure out what programs openssl wants to install. +# Use when updating this package. +# +export SCRIPTS="`grep ^SCRIPTS= apps/Makefile | sed -es/^SCRIPTS=//`" +export PROGRAM="`grep ^PROGRAM= apps/Makefile | sed -es/^PROGRAM=//`" +export APPS="`grep ^APPS= tools/Makefile | sed -es/^APPS=//`" +export MISC_APPS="`grep ^MISC_APPS= tools/Makefile | sed -es/^MISC_APPS=//`" +(for f in $SCRIPTS $PROGRAM $APPS $MISC_APPS ; do + echo bin/$f +done ; +grep FUNC_TYPE apps/progs.h | awk ' BEGIN { FS="," } { print $2 }' | sed -e's/\"//g' -e's,^,bin/,') \ + | sort | uniq | awk ' /^bin\/.+/ { print }' diff --git a/security/openssl/files/makelib b/security/openssl/files/makelib index d76343bc09b..8056f1d4d6e 100755 --- a/security/openssl/files/makelib +++ b/security/openssl/files/makelib @@ -1,11 +1,13 @@ #!/bin/csh -f -# $NetBSD: makelib,v 1.1.1.1 1999/04/30 15:19:13 tv Exp $ +# $NetBSD: makelib,v 1.2 1999/11/25 18:51:47 erh Exp $ # simplistic library builder -# usage: makelib outfile.so.x.y infile... +# usage: makelib is_elf outfile.so.x.y infile... -echo __ELF__ | $CC -E - | grep -q __ELF__ -if ($status == 0) then +#echo __ELF__ | $CC -E - | grep -q __ELF__ +setenv IS_ELF $1 +shift +if ($IS_ELF == 0) then ld -Bshareable -Bforcearchive -o $* |& sed /RRS/d || exit 1 else ld -shared -soname $1:r --whole-archive -o $* || exit 1 diff --git a/security/openssl/files/md5 b/security/openssl/files/md5 index 87ffaf92e4f..7d43b4935e4 100644 --- a/security/openssl/files/md5 +++ b/security/openssl/files/md5 @@ -1,4 +1,3 @@ -$NetBSD: md5,v 1.3 1999/06/08 16:58:57 tv Exp $ +$NetBSD: md5,v 1.4 1999/11/25 18:51:47 erh Exp $ -MD5 (openssl-0.9.2b.tar.gz) = e78a6b30b443cd0d118b376a4dfe4745 -MD5 (openssl-0.9.2b-rsaoaep.patch) = 7336290517c4b3f8e74c462affff1c6b +MD5 (openssl-0.9.4.tar.gz) = ee27fd88986143156920a0da362135fb diff --git a/security/openssl/files/patch-sum b/security/openssl/files/patch-sum index 5d3295ea5a0..3cd5df4e212 100644 --- a/security/openssl/files/patch-sum +++ b/security/openssl/files/patch-sum @@ -1,12 +1,13 @@ -$NetBSD: patch-sum,v 1.2 1999/10/19 04:09:19 erh Exp $ +$NetBSD: patch-sum,v 1.3 1999/11/25 18:51:47 erh Exp $ -MD5 (patch-aa) = 72fbff3284c0417fa5bffa2f7f7d0535 -MD5 (patch-ab) = 598eb8f5d530f3fd7cd7f96d702cd1c3 -MD5 (patch-ac) = e55eb7efc1f516e8fa41e0a1769228ed -MD5 (patch-ad) = b7e3c64c926b3ef6636ca4e5ddddbae2 -MD5 (patch-ae) = 8320c6bbad2baa7f8112126b5e0c636b -MD5 (patch-af) = a0e9319927132349b15cafc2243c104d -MD5 (patch-ag) = f4ae349377a6432c90b4e00a9aaa1366 -MD5 (patch-ah) = 8de78a8d42f6d3d261535052da64fb06 -MD5 (patch-ai) = c90f6317abe0db70d5bdc9f9f4f4a645 -MD5 (patch-aj) = b328a44ac729eec8dfa484212e356213 +MD5 (patch-aa) = 680dc7f99217e4bff63d6f7493af35e2 +MD5 (patch-ab) = 1ce74c455bdb8ae7cc4dfb507e2cebad +MD5 (patch-ac) = d5a887ca7ddc1d41e133adc9a0f7656c +MD5 (patch-ad) = df1eb0ff26293644a86aeeafc8e1e706 +MD5 (patch-ae) = c9f265f64112b3084724098a9fd067b3 +MD5 (patch-af) = 8e9d113f2eb57e38aa4a72e25b53bd12 +MD5 (patch-ag) = 7974ea53bbf2b6bc27d60759a51fa671 +MD5 (patch-ah) = 6aa582063a0c12937e8c8e5c866ac9f5 +MD5 (patch-ai) = 854e5d35fe75cb8d892e1d05804b004b +MD5 (patch-aj) = e384033045020bb34648cc10358fb9bd +MD5 (patch-ak) = 8444eb11b0918fc3a10f16bbb47df9a1 diff --git a/security/openssl/patches/patch-aa b/security/openssl/patches/patch-aa index fb86a3cca39..ad1cd9e81f9 100644 --- a/security/openssl/patches/patch-aa +++ b/security/openssl/patches/patch-aa @@ -1,13 +1,13 @@ -$NetBSD: patch-aa,v 1.1.1.1 1999/04/30 15:19:13 tv Exp $ +$NetBSD: patch-aa,v 1.2 1999/11/25 18:51:47 erh Exp $ ---- config.orig Sun Jan 17 09:20:20 1999 -+++ config Tue Apr 27 10:22:07 1999 -@@ -137,12 +137,16 @@ - echo "${MACHINE}-whatever-freebsd"; exit 0 - ;; +--- config.orig Mon Aug 9 05:16:51 1999 ++++ config Wed Oct 20 17:12:32 1999 +@@ -155,8 +155,12 @@ + echo "${MACH}-${ARCH}-freebsd${VERS}"; exit 0 + ;; -- NetBSD:*:*:*486*) -- echo "i486-whatever-netbsd"; exit 0 +- NetBSD:*:*:*386*) +- echo "`sysctl -n hw.model | sed 's,.*\(.\)86-class.*,i\186,'`-whateve\r-netbsd"; exit 0 + NetBSD:*:*:i386) + if echo __ELF__ | cc -E - | grep -q __ELF__; then + echo "i386-whatever-netbsd"; exit 0 @@ -17,20 +17,15 @@ $NetBSD: patch-aa,v 1.1.1.1 1999/04/30 15:19:13 tv Exp $ ;; NetBSD:*) -- echo "${MACHINE}-whatever-netbsd"; exit 0 -+ echo "`sysctl -n hw.machine_arch`-whatever-netbsd"; exit 0 - ;; - - OpenBSD:*) -@@ -310,9 +314,9 @@ - *-*-sunos4) OUT="sunos-$CC" ;; - *-freebsd3) OUT="FreeBSD-elf" ;; - *-freebsd) OUT="FreeBSD" ;; +@@ -404,9 +408,9 @@ + alpha*-*-freebsd*) OUT="FreeBSD-alpha" ;; + *-freebsd[3-9]*) OUT="FreeBSD-elf" ;; + *-freebsd[1-2]*) OUT="FreeBSD" ;; - *86*-*-netbsd) OUT="NetBSD-x86" ;; - sun3*-*-netbsd) OUT="NetBSD-m68" ;; - *-*-netbsd) OUT="NetBSD-sparc" ;; -+ i386elf-*-netbsd) OUT="NetBSD-i386elf" ;; -+ mips-*-netbsd) OUT="NetBSD-mipsel" ;; ++ *86elf*-*-netbsd) OUT="NetBSD-i386elf" ;; ++ *86-*-netbsd) OUT="NetBSD-i386" ;; + *-netbsd) OUT="NetBSD-`sysctl -n hw.machine_arch`" ;; *86*-*-openbsd) OUT="OpenBSD-x86" ;; alpha*-*-openbsd) OUT="OpenBSD-alpha" ;; diff --git a/security/openssl/patches/patch-ab b/security/openssl/patches/patch-ab index c46b361fa4e..e77367280db 100644 --- a/security/openssl/patches/patch-ab +++ b/security/openssl/patches/patch-ab @@ -1,92 +1,147 @@ -$NetBSD: patch-ab,v 1.2 1999/10/19 04:09:19 erh Exp $ - ---- 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 - -Wuninitialized:::BN_LLONG:", --"NetBSD-sparc", "gcc:-DTERMIOS -O3 -fomit-frame-pointer -mv8 -Wall -DB_ENDIAN::BN_LLONG MD2_CHAR RC4_INDEX DES_UNROLL:::", --"NetBSD-m68", "gcc:-DTERMIOS -O3 -fomit-frame-pointer -Wall -DB_ENDIAN::BN_LLONG MD2_CHAR RC4_INDEX DES_UNROLL:::", --"NetBSD-x86", "gcc:-DTERMIOS -D_ANSI_SOURCE -O3 -fomit-frame-pointer -m486 -Wall::BN_LLONG $x86_gcc_des $x86_gcc_opts:", - #"FreeBSD", "gcc:-DTERMIOS -DL_ENDIAN -D_ANSI_SOURCE -fomit-frame-pointer -O3 -m486 -Wall::BN_LLONG $x86_gcc_des $x86_gcc_opts:$x86_out_asm", - "FreeBSD", "gcc:-DTERMIOS -DL_ENDIAN -fomit-frame-pointer -O3 -m486 -Wall::BN_LLONG $x86_gcc_des $x86_gcc_opts:$x86_out_asm", - "FreeBSD-elf", "gcc:-DTERMIOS -DL_ENDIAN -fomit-frame-pointer -O3 -m486 -Wall::BN_LLONG $x86_gcc_des $x86_gcc_opts:$x86_elf_asm", -@@ -172,6 +169,20 @@ - "aix-cc", "cc:-O -DAIX -DB_ENDIAN::BN_LLONG RC4_CHAR:::", - "aix-gcc", "gcc:-O2 -DAIX -DB_ENDIAN::BN_LLONG RC4_CHAR:::", +--- Configure.orig Wed Oct 20 18:41:27 1999 ++++ Configure Thu Oct 21 00:05:25 1999 +@@ -82,8 +82,9 @@ + # -DB_ENDIAN slows things down on a sparc for md5, but helps sha1. + # So the md5_locl.h file has an undef B_ENDIAN if sun is defined + +-#config-string CC : CFLAGS : LDFLAGS : special header file mods:bn_asm \ +-# des_asm:bf_asm ++#config-string CC : CFLAGS : unistd : thread cflag : LDFLAGS : \ ++# bn_ops : bn_obj : des_obj : bf_obj : md5_obj : sha1_obj : cast_obj : \ ++# rc4_obj : rmd160_obj : rc5_obj + my %table=( + #"b", "$tcc:$tflags::$tlib:$bits1:$tbn_mul::", + #"bl-4c-2c", "$tcc:$tflags::$tlib:${bits1}BN_LLONG RC4_CHAR MD2_CHAR:$tbn_mul::", +@@ -208,9 +209,6 @@ + "linux-aout", "gcc:-DL_ENDIAN -DTERMIO -O3 -fomit-frame-pointer -m486 -Wall::(unknown)::BN_LLONG $x86_gcc_des $x86_gcc_opts:$x86_out_asm", + "linux-mips", "gcc:-DL_ENDIAN -DTERMIO -O3 -fomit-frame-pointer -Wall::(unknown)::BN_LLONG:::", + "linux-ppc", "gcc:-DB_ENDIAN -DTERMIO -O3 -fomit-frame-pointer -Wall::(unknown)::::", +-"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", + "bsdi-gcc", "gcc:-O3 -ffast-math -DL_ENDIAN -DPERL5 -m486::(unknown)::RSA_LLONG $x86_gcc_des $x86_gcc_opts:$x86_bsdi_asm", +@@ -228,6 +226,20 @@ + "aix-cc", "cc:-O -DAIX -DB_ENDIAN::(unknown)::BN_LLONG RC4_CHAR:::", + "aix-gcc", "gcc:-O3 -DAIX -DB_ENDIAN::(unknown)::BN_LLONG RC4_CHAR:::", +# NetBSD -+"NetBSD-alpha", "gcc:-DTERMIOS -O3 -Wall::SIXTY_FOUR_BIT_LONG DES_INT DES_PTR DES_RISC2:::", -+"NetBSD-arm32", "gcc:-DTERMIOS -O3 -Wall -DL_ENDIAN::BN_LLONG MD2_CHAR RC4_INDEX DES_UNROLL:::", -+"NetBSD-i386", "gcc:-DTERMIOS -O3 -fomit-frame-pointer -m486 -Wall -DL_ENDIAN -DBN_ASM::BN_LLONG $x86_gcc_des $x86_gcc_opts:$x86_out_asm", -+"NetBSD-i386elf", "gcc:-DTERMIOS -O3 -fomit-frame-pointer -m486 -Wall -DL_ENDIAN -DBN_ASM::BN_LLONG $x86_gcc_des $x86_gcc_opts:$x86_elf_asm", -+"NetBSD-m68k", "gcc:-DTERMIOS -O3 -fomit-frame-pointer -Wall -DB_ENDIAN::BN_LLONG MD2_CHAR RC4_INDEX DES_UNROLL:::", -+"NetBSD-mipseb", "gcc:-DTERMIOS -O3 -Wall -DB_ENDIAN::BN_LLONG MD2_CHAR RC4_INDEX DES_UNROLL:::", -+"NetBSD-mipsel", "gcc:-DTERMIOS -O3 -Wall -DL_ENDIAN::BN_LLONG MD2_CHAR RC4_INDEX DES_UNROLL:::", -+"NetBSD-ns32k", "gcc:-DTERMIOS -O3 -Wall -DL_ENDIAN::BN_LLONG MD2_CHAR RC4_INDEX DES_UNROLL:::", -+"NetBSD-powerpc", "gcc:-DTERMIOS -O3 -Wall -DB_ENDIAN::BN_LLONG MD2_CHAR RC4_INDEX DES_UNROLL:::", -+"NetBSD-sparc", "gcc:-DTERMIOS -O3 -fomit-frame-pointer -mv8 -Wall -DB_ENDIAN::BN_LLONG MD2_CHAR RC4_INDEX DES_UNROLL:::", -+"NetBSD-sparc64", "gcc:-DTERMIOS -O3 -fomit-frame-pointer -Wall::SIXTY_FOUR_BIT_LONG DES_INT DES_PTR DES_RISC1:::", -+"NetBSD-vax", "gcc:-DTERMIOS -O3 -Wall -DL_ENDIAN::BN_LLONG MD2_CHAR RC4_INDEX DES_UNROLL:::", ++"NetBSD-alpha", "gcc:-DTERMIOS -O3 -Wall::(unknown)::SIXTY_FOUR_BIT_LONG DES_INT DES_PTR DES_RISC2:", ++"NetBSD-arm32", "gcc:-DTERMIOS -O3 -Wall -DL_ENDIAN::(unknown)::BN_LLONG MD2_CHAR RC4_INDEX DES_UNROLL:", ++"NetBSD-i386", "gcc:-DBN_ASM -DL_ENDIAN -DTERMIOS -O3 -fomit-frame-pointer -m486 -Wall::(unknown)::BN_LLONG $x86_gcc_des $x86_gcc_opts:$x86_out_asm:", ++"NetBSD-i386elf", "gcc:-DBN_ASM -DL_ENDIAN -DTERMIOS -O3 -fomit-frame-pointer -m486 -Wall::(unknown)::BN_LLONG $x86_gcc_des $x86_gcc_opts:$x86_elf_asm:", ++"NetBSD-m68k", "gcc:-DTERMIOS -O3 -fomit-frame-pointer -Wall -DB_ENDIAN::(unknown)::BN_LLONG MD2_CHAR RC4_INDEX DES_UNROLL:", ++"NetBSD-mipseb", "gcc:-DTERMIOS -O3 -Wall -DB_ENDIAN::(unknown)::BN_LLONG MD2_CHAR RC4_INDEX DES_UNROLL:", ++"NetBSD-mipsel", "gcc:-DTERMIOS -O3 -Wall -DL_ENDIAN::(unknown)::BN_LLONG MD2_CHAR RC4_INDEX DES_UNROLL:", ++"NetBSD-ns32k", "gcc:-DTERMIOS -O3 -Wall -DL_ENDIAN::(unknown)::BN_LLONG MD2_CHAR RC4_INDEX DES_UNROLL:", ++"NetBSD-powerpc", "gcc:-DTERMIOS -O3 -Wall -DB_ENDIAN::(unknown)::BN_LLONG MD2_CHAR RC4_INDEX DES_UNROLL:", ++"NetBSD-sparc", "gcc:-DTERMIOS -O3 -fomit-frame-pointer -mv8 -Wall -DB_ENDIAN::(unknown)::BN_LLONG MD2_CHAR RC4_INDEX DES_UNROLL:", ++"NetBSD-sparc64", "gcc:-DTERMIOS -O3 -fomit-frame-pointer -Wall::(unknown)::SIXTY_FOUR_BIT_LONG DES_INT DES_PTR DES_RISC1:", ++"NetBSD-vax", "gcc:-DTERMIOS -O3 -Wall -DL_ENDIAN::(unknown)::BN_LLONG MD2_CHAR RC4_INDEX DES_UNROLL:", + # # Cray T90 (SDSC) # It's Big-endian, but the algorithms work properly when B_ENDIAN is NOT -@@ -282,19 +293,23 @@ - my $flags=""; +@@ -345,6 +357,7 @@ + my $depflags=""; my $libs=""; my $target=""; -+my $usersaref=0; -+my $xmakelib=" cd .. && csh \${MAKELIB} libcrypto.so.1.0 libcrypto.a"; -+ ++my $xmakelib=""; + my $options=""; foreach (@ARGV) { - if ($_ =~ /^no-asm$/) - { $no_asm=1; } - elsif ($_ =~ /^-/) +@@ -377,10 +390,11 @@ + { + $libs.= "-lRSAglue -lrsaref "; + $flags.= "-DRSAref "; ++ $xmakelib=" libRSAglue.a"; + } + elsif (/^[-+]/) { -- if ($_ =~ /^-[lL](.*)$/) -+ if ($_ =~ /^-([lLR]|Wl,)(.*)$/) +- if (/^-[lL](.*)$/) ++ if (/^-([lLR]|Wl,)(.*)$/) { $libs.=$_." "; } - elsif ($_ =~ /^-D(.*)$/) - { - $flags.=$_." "; -+ $usersaref=1 if ($_ =~ /^-DRSAref(.*)$/); - } - elsif ($_ =~ /^-[fK](.*)$/) - { -@@ -321,6 +336,11 @@ - } +@@ -524,13 +538,19 @@ + + if ($version =~ /(^[0-9]*)\.([0-9\.]*)/) + { +- $major=$1; +- $minor=$2; ++# XXX Openssl version is 0.9, not 1.0 ++ $major=1; ++ $minor=0; } -+if ($usersaref == 1) + open(IN,'<Makefile.org') || die "unable to read Makefile.org:$!\n"; + open(OUT,">$Makefile") || die "unable to create $Makefile:$!\n"; + my $sdirs=0; ++my $is_elf="0"; ++if ($target =~ /.*elf.*/) + { -+ $xmakelib.=" libRSAglue.a"; ++ $is_elf="1"; + } -+ - if (!defined($table{$target})) + while (<IN>) { - &bad_target; -@@ -370,6 +390,19 @@ - # $rmd160_obj=$rmd160_enc; - $cflags.=" -DRMD160_ASM"; - } -+ + chop; +@@ -542,6 +562,7 @@ + } + } + $sdirs = 0 unless /\\$/; ++ s/^IS_ELF=.*/IS_ELF=$is_elf/; + s/^VERSION=.*/VERSION=$version/; + s/^MAJOR=.*/MAJOR=$major/; + s/^MINOR=.*/MINOR=$minor/; +@@ -571,6 +592,19 @@ + close(IN); + close(OUT); + +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(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/; ++ s/^(.*)\${MAKELIB}(.*)$/$&$xmakelib/; + print OUT $_."\n"; + } +close(IN); +close(OUT); ++ + print "CC =$cc\n"; + print "CFLAG =$cflags\n"; + print "EX_LIBS =$lflags\n"; +@@ -747,30 +781,6 @@ + $pwd =`pwd`; + chop($pwd); + } +-print <<EOF; +- +-NOTE: The OpenSSL header files have been moved from include/*.h +-to include/openssl/*.h. To include OpenSSL header files, now +-directives of the form +- #include <openssl/foo.h> +-should be used instead of #include <foo.h>. +-These new file locations allow installing the OpenSSL header +-files in /usr/local/include/openssl/ and should help avoid +-conflicts with other libraries. +- +-To compile programs that use the old form <foo.h>, +-usually an additional compiler option will suffice: E.g., add +- -I$prefix/include/openssl +-or +- -I$pwd/include/openssl +-to the CFLAGS in the Makefile of the program that you want to compile +-(and leave all the original -I...'s in place!). +- +-Please make sure that no old OpenSSL header files are around: +-The include directory should now be empty except for the openssl +-subdirectory. +- +-EOF + + print <<\EOF if (!$no_threads && !$threads); - 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-ac b/security/openssl/patches/patch-ac index 3921245b1a0..bede19e4b7d 100644 --- a/security/openssl/patches/patch-ac +++ b/security/openssl/patches/patch-ac @@ -1,8 +1,8 @@ -$NetBSD: patch-ac,v 1.1.1.1 1999/04/30 15:19:13 tv Exp $ +$NetBSD: patch-ac,v 1.2 1999/11/25 18:51:47 erh Exp $ ---- crypto/bn/Makefile.ssl.orig Wed Dec 23 03:21:12 1998 -+++ crypto/bn/Makefile.ssl Tue Mar 16 10:30:01 1999 -@@ -81,6 +81,9 @@ +--- crypto/bn/Makefile.ssl.orig Sun Jul 25 17:25:11 1999 ++++ crypto/bn/Makefile.ssl Wed Oct 20 17:12:41 1999 +@@ -82,6 +82,9 @@ # a.out asm/bn86-out.o: asm/bn86unix.cpp $(CPP) -DOUT asm/bn86unix.cpp | as -o asm/bn86-out.o diff --git a/security/openssl/patches/patch-ad b/security/openssl/patches/patch-ad index ab4dfe26d31..7e6abef381c 100644 --- a/security/openssl/patches/patch-ad +++ b/security/openssl/patches/patch-ad @@ -1,13 +1,28 @@ -$NetBSD: patch-ad,v 1.1.1.1 1999/04/30 15:19:13 tv Exp $ - ---- Makefile.org.orig Tue Apr 27 14:34:38 1999 -+++ Makefile.org Tue Apr 27 14:34:53 1999 -@@ -126,7 +126,7 @@ +--- Makefile.org.orig Wed Oct 20 19:34:31 1999 ++++ Makefile.org Wed Oct 20 19:48:25 1999 +@@ -50,6 +50,7 @@ + CC= gcc + #CFLAG= -DL_ENDIAN -DTERMIO -O3 -fomit-frame-pointer -m486 -Wall -Wuninitialized -DSHA1_ASM -DMD5_ASM -DRMD160_ASM + CFLAG= -DTERMIOS -DL_ENDIAN -fomit-frame-pointer -O3 -m486 -Wall -DSHA1_ASM -DMD5_ASM -DRMD160_ASM ++IS_ELF=0 + DEPFLAG= + PEX_LIBS= -L. -L.. -L../.. -L../../.. + EX_LIBS= +@@ -142,7 +143,7 @@ #RMD160_ASM_OBJ= asm/rm86-out.o # a.out, FreeBSD #RMD160_ASM_OBJ= asm/rm86bsdi.o # bsdi -DIRS= crypto ssl rsaref apps test tools +DIRS= rsaref crypto ssl apps test tools + SHLIBDIRS= crypto ssl + # dirs in crypto to build - SDIRS= \ - md2 md5 sha mdc2 hmac ripemd \ +@@ -178,7 +179,7 @@ + @for i in $(DIRS) ;\ + do \ + (cd $$i && echo "making all in $$i..." && \ +- $(MAKE) CC='${CC}' PLATFORM='${PLATFORM}' CFLAG='${CFLAG}' 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}' SDIRS='${SDIRS}' AR='${AR}' PROCESSOR='${PROCESSOR}' PERL='${PERL}' RANLIB='${RANLIB}' all ) || exit 1; \ ++ $(MAKE) CC='${CC}' PLATFORM='${PLATFORM}' CFLAG='${CFLAG}' 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}' SDIRS='${SDIRS}' AR='${AR}' PROCESSOR='${PROCESSOR}' PERL='${PERL}' RANLIB='${RANLIB}' MAJOR='${MAJOR}' MINOR='${MINOR}' IS_ELF='${IS_ELF}' all ) || exit 1; \ + done + -@# cd perl; $(PERL) Makefile.PL; make + diff --git a/security/openssl/patches/patch-ae b/security/openssl/patches/patch-ae index 680d85b1f64..7a3776129e8 100644 --- a/security/openssl/patches/patch-ae +++ b/security/openssl/patches/patch-ae @@ -1,12 +1,12 @@ -$NetBSD: patch-ae,v 1.2 1999/10/19 04:09:19 erh Exp $ +$NetBSD: patch-ae,v 1.3 1999/11/25 18:51:47 erh Exp $ ---- crypto/Makefile.ssl.orig Mon Mar 22 06:21:17 1999 -+++ crypto/Makefile.ssl Mon Oct 18 22:19:47 1999 +--- crypto/Makefile.ssl.orig Mon Aug 2 16:44:47 1999 ++++ crypto/Makefile.ssl Wed Oct 20 17:31:16 1999 @@ -48,6 +48,7 @@ @(cd ..; $(MAKE) DIRS=$(DIR) all) - all: date.h lib subdirs -+ XMAKELIB + all: buildinf.h lib subdirs ++ cd ${TOP} && csh ${MAKELIB} ${IS_ELF} libcrypto.so.${MAJOR}.${MINOR} libcrypto.a - date.h: ../Makefile.ssl - echo "#define DATE \"`date`\"" >date.h + buildinf.h: ../Makefile.ssl + ( echo "#ifndef MK1MF_BUILD"; \ diff --git a/security/openssl/patches/patch-af b/security/openssl/patches/patch-af index 84e43ee686f..73dff8cc22d 100644 --- a/security/openssl/patches/patch-af +++ b/security/openssl/patches/patch-af @@ -1,12 +1,12 @@ -$NetBSD: patch-af,v 1.1.1.1 1999/04/30 15:19:13 tv Exp $ +$NetBSD: patch-af,v 1.2 1999/11/25 18:51:47 erh Exp $ ---- ssl/Makefile.ssl.orig Tue Apr 27 14:38:06 1999 -+++ ssl/Makefile.ssl Tue Apr 27 14:38:21 1999 +--- ssl/Makefile.ssl.orig Fri May 21 06:16:45 1999 ++++ ssl/Makefile.ssl Wed Oct 20 17:31:33 1999 @@ -52,6 +52,7 @@ (cd ..; $(MAKE) DIRS=$(DIR) all) all: lib -+ cd .. && csh ${MAKELIB} libssl.so.1.0 libssl.a ++ cd ${TOP} && csh ${MAKELIB} ${IS_ELF} libssl.so.${MAJOR}.${MINOR} libssl.a lib: $(LIBOBJ) $(AR) $(LIB) $(LIBOBJ) diff --git a/security/openssl/patches/patch-ag b/security/openssl/patches/patch-ag index c16b74ae570..0a32e455cbe 100644 --- a/security/openssl/patches/patch-ag +++ b/security/openssl/patches/patch-ag @@ -1,13 +1,13 @@ -$NetBSD: patch-ag,v 1.1.1.1 1999/04/30 15:19:13 tv Exp $ +$NetBSD: patch-ag,v 1.2 1999/11/25 18:51:47 erh Exp $ ---- apps/Makefile.ssl.orig Tue Apr 27 14:38:49 1999 -+++ apps/Makefile.ssl Tue Apr 27 14:39:13 1999 -@@ -16,7 +16,7 @@ +--- apps/Makefile.ssl.orig Mon Jun 21 05:04:37 1999 ++++ apps/Makefile.ssl Thu Oct 21 00:09:56 1999 +@@ -18,7 +18,7 @@ PEX_LIBS= EX_LIBS= -CFLAGS= -DMONOLITH $(INCLUDES) $(CFLAG) +CFLAGS= -DMONOLITH $(INCLUDES) $(CFLAG:N*PIC) - GENERAL=Makefile + GENERAL=Makefile makeapps.com install.com diff --git a/security/openssl/patches/patch-ah b/security/openssl/patches/patch-ah index 202475da9bd..72e9ff765c2 100644 --- a/security/openssl/patches/patch-ah +++ b/security/openssl/patches/patch-ah @@ -1,13 +1,13 @@ -$NetBSD: patch-ah,v 1.1.1.1 1999/04/30 15:19:13 tv Exp $ +$NetBSD: patch-ah,v 1.2 1999/11/25 18:51:47 erh Exp $ ---- test/Makefile.ssl.orig Tue Apr 27 14:39:30 1999 -+++ test/Makefile.ssl Tue Apr 27 14:39:44 1999 -@@ -15,7 +15,7 @@ +--- test/Makefile.ssl.orig Thu Aug 5 06:50:18 1999 ++++ test/Makefile.ssl Thu Oct 21 00:09:58 1999 +@@ -17,7 +17,7 @@ PEX_LIBS= EX_LIBS= #-lnsl -lsocket -CFLAGS= $(INCLUDES) $(CFLAG) +CFLAGS= $(INCLUDES) $(CFLAG:N*PIC) - GENERAL=Makefile.ssl - + GENERAL=Makefile.ssl maketests.com \ + tests.com testenc.com tx509.com trsa.com tcrl.com tsid.com treq.com \ diff --git a/security/openssl/patches/patch-ai b/security/openssl/patches/patch-ai index 361ee9c6d80..e5749d1e7fe 100644 --- a/security/openssl/patches/patch-ai +++ b/security/openssl/patches/patch-ai @@ -1,12 +1,12 @@ -$NetBSD: patch-ai,v 1.1.1.1 1999/04/30 15:19:13 tv Exp $ +$NetBSD: patch-ai,v 1.2 1999/11/25 18:51:47 erh Exp $ ---- apps/ca.c.orig Fri Apr 30 10:51:58 1999 -+++ apps/ca.c Fri Apr 30 10:52:06 1999 -@@ -83,7 +83,7 @@ +--- apps/ca.c.orig Fri Aug 6 16:47:09 1999 ++++ apps/ca.c Wed Oct 20 17:49:43 1999 +@@ -98,7 +98,7 @@ #define PROG ca_main #define BASE_SECTION "ca" --#define CONFIG_FILE "lib/openssl.cnf" +-#define CONFIG_FILE "openssl.cnf" +#define CONFIG_FILE "etc/openssl.cnf" #define ENV_DEFAULT_CA "default_ca" diff --git a/security/openssl/patches/patch-aj b/security/openssl/patches/patch-aj index 8e729c4500f..5579ea265d6 100644 --- a/security/openssl/patches/patch-aj +++ b/security/openssl/patches/patch-aj @@ -1,13 +1,13 @@ -$NetBSD: patch-aj,v 1.1 1999/05/01 17:12:00 tv Exp $ +$NetBSD: patch-aj,v 1.2 1999/11/25 18:51:47 erh Exp $ ---- crypto/bn/bn_div.c.orig Sat May 1 13:10:52 1999 -+++ crypto/bn/bn_div.c Sat May 1 13:11:42 1999 -@@ -61,7 +61,7 @@ - #include "bn_lcl.h" +--- e_os.h.orig Thu Jun 10 03:12:20 1999 ++++ e_os.h Wed Oct 20 17:50:34 1999 +@@ -231,7 +231,7 @@ + /* !defined VMS */ + # include OPENSSL_UNISTD - /* The old slow way */ --#if 0 -+#if defined(__NetBSD__) && defined(__m68k__) && (__GNUC_MINOR__ == 91) - int BN_div(dv, rem, m, d,ctx) - BIGNUM *dv; - BIGNUM *rem; +-# define OPENSSL_CONF "openssl.cnf" ++# define OPENSSL_CONF "etc/openssl.cnf" + # define SSLEAY_CONF OPENSSL_CONF + # define RFILE ".rnd" + # define LIST_SEPARATOR_CHAR ':' diff --git a/security/openssl/patches/patch-ak b/security/openssl/patches/patch-ak new file mode 100644 index 00000000000..ec3056952d6 --- /dev/null +++ b/security/openssl/patches/patch-ak @@ -0,0 +1,13 @@ +$NetBSD: patch-ak,v 1.1 1999/11/25 18:51:47 erh Exp $ + +--- crypto/bn/bn_div.c.orig Tue Aug 3 05:18:27 1999 ++++ crypto/bn/bn_div.c Wed Oct 20 17:12:41 1999 +@@ -62,7 +62,7 @@ + #include "bn_lcl.h" + + /* The old slow way */ +-#if 0 ++#if defined(__NetBSD__) && defined(__m68k__) && (__GNUC_MINOR__ == 91) + int BN_div(BIGNUM *dv, BIGNUM *rem, BIGNUM *m, BIGNUM *d, BN_CTX *ctx) + { + int i,nm,nd; diff --git a/security/openssl/pkg/PLIST b/security/openssl/pkg/PLIST index 07ddd8debdd..64aa31897cb 100644 --- a/security/openssl/pkg/PLIST +++ b/security/openssl/pkg/PLIST @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.1.1.1 1999/04/30 15:19:13 tv Exp $ +@comment $NetBSD: PLIST,v 1.2 1999/11/25 18:51:47 erh Exp $ bin/CA.pl bin/CA.sh bin/asn1parse @@ -57,7 +57,9 @@ bin/md2 bin/mdc2 bin/nseq bin/openssl +bin/pkcs12 bin/pkcs7 +bin/pkcs8 bin/rc2 bin/rc2-cbc bin/rc2-cfb @@ -78,8 +80,9 @@ bin/s_time bin/sess_id bin/sha bin/sha1 -bin/ssleay +bin/speed bin/verify +bin/version bin/x509 etc/openssl.cnf.example @exec if [ -f %D/etc/openssl.cnf ]; then : ; else cp -p %D/%F %D/etc/openssl.cnf; fi @@ -92,11 +95,13 @@ include/openssl/buffer.h include/openssl/cast.h include/openssl/comp.h include/openssl/conf.h -include/openssl/cryptall.h include/openssl/crypto.h include/openssl/des.h include/openssl/dh.h include/openssl/dsa.h +include/openssl/e_os.h +include/openssl/e_os2.h +include/openssl/ebcdic.h include/openssl/err.h include/openssl/evp.h include/openssl/hmac.h @@ -106,9 +111,11 @@ include/openssl/md2.h include/openssl/md5.h include/openssl/mdc2.h include/openssl/objects.h +include/openssl/opensslconf.h include/openssl/opensslv.h include/openssl/pem.h include/openssl/pem2.h +include/openssl/pkcs12.h include/openssl/pkcs7.h include/openssl/rand.h include/openssl/rc2.h @@ -116,6 +123,7 @@ include/openssl/rc4.h include/openssl/rc5.h include/openssl/ripemd.h include/openssl/rsa.h +include/openssl/safestack.h include/openssl/sha.h include/openssl/ssl.h include/openssl/ssl2.h |