cpet/openbsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

use same Configure targets as libssl in the source tree

Browse Source
This commit is contained in:
brad 1999-03-28 23:03:25 +00:00
parent e41e67ca32
commit a3fb4493dd
5 changed files with 62 additions and 45 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

53
security/SSLeay/Makefile
View File

@ -1,18 +1,17 @@
# $OpenBSD: Makefile,v 1.5 1999/03/24 23:53:08 brad Exp $
# $OpenBSD: Makefile,v 1.6 1999/03/28 23:03:25 brad Exp $
DISTNAME= SSLeay-0.9.0b
CATEGORIES= security
MAINTAINER= dugsong@monkey.org
NO_CDROM= "CRYPTO: Third party crypto not allowed."
RESTRICTED= "Crypto; export-controlled"
MASTER_SITES= ftp://ftp.psy.uq.oz.au/pub/Crypto/SSL/ \
ftp://ftp.funet.fi/pub/mirrors/ftp.psy.uq.oz.au/SSL/ \
ftp://sunsite.doc.ic.ac.uk/Mirrors/ftp.psy.uq.oz.au/pub/Crypto/SSL/ \
ftp://ftp.internat.freebsd.org/pub/Crypto/SSL/
NO_CDROM= "CRYPTO: Third party crypto not allowed."
RESTRICTED= "Crypto; export-controlled"
MAINTAINER= dugsong@monkey.org
.if !defined(NO_WARNINGS)
fetch-depends:
.if !defined(USA_RESIDENT) || ${USA_RESIDENT} != YES && ${USA_RESIDENT} != NO
@ -32,37 +31,37 @@ fetch-depends:
.endif
.endif
post-patch:
.if defined(USA_RESIDENT) && ${USA_RESIDENT} == YES
${PATCH} ${PATCH_DIST_ARGS} < ${FILESDIR}/rsaref.patch
.endif
HAS_CONFIGURE= yes
CONFIGURE_SCRIPT= Configure
.if defined(USA_RESIDENT) && ${USA_RESIDENT} == YES
LIB_DEPENDS= rsaref:${PORTSDIR}/security/rsaref
CONFIGURE_ENV+= USA_RESIDENT="YES"
CONFIGURE_ARGS+= -I../../rsaref/ -DRSAref
.endif
HAS_CONFIGURE= yes
CONFIGURE_SCRIPT=Configure
# gcc-2.8.* confuses DES names? destest fails, but not with gcc-2.7.*. fix.
CONFIGURE_ARGS+= -DPERL5
.if (${MACHINE_ARCH} == "sparc")
CONFIGURE_ARGS+= OpenBSD-sparc
.elif (${MACHINE_ARCH} == "i386")
.if defined(USA_RESIDENT) && ${USA_RESIDENT} == YES
LIB_DEPENDS= rsaref:${PORTSDIR}/security/rsaref
CONFIGURE_ENV+= USA_RESIDENT=YES
CONFIGURE_ARGS+= -I../../rsaref/ -DRSAref
.endif
.if (${MACHINE_ARCH} == "i386")
CONFIGURE_ARGS+= OpenBSD-x86
.elif (${MACHINE_ARCH} == "m68k")
CONFIGURE_ARGS+= OpenBSD-m68k
.elif (${MACHINE_ARCH} == "pmax")
CONFIGURE_ARGS+= OpenBSD-pmax
.elif (${MACHINE_ARCH} == "arc")
CONFIGURE_ARGS+= OpenBSD-arc
.elif (${MACHINE_ARCH} == "alpha")
CONFIGURE_ARGS+= alpha-gcc
CONFIGURE_ARGS+= OpenBSD-alpha
.else
CONFIGURE_ARGS+= gcc
CONFIGURE_ARGS+= OpenBSD-be
.endif
ALL_TARGET= all test
post-patch:
.if defined(USA_RESIDENT) && ${USA_RESIDENT} == YES
${PATCH} ${PATCH_DIST_ARGS} < ${FILESDIR}/rsaref.patch
.endif
pre-build:
.if defined(USA_RESIDENT) && ${USA_RESIDENT} == YES
${CP} ${FILESDIR}/do-rsaref-ssl ${WRKSRC}

5
security/SSLeay/files/do-rsaref-ssl
View File

@ -30,11 +30,6 @@ echo "adding rsaref objs to libcrypto"
ar -r -a rsa_enc.o libcrypto.a \
`(ar t libRSAglue.a ; ar t librsaref.a) | egrep '\.o'`
# can't do this cos we need to map RSA_PKCS1_SSLeay -> RSA_PKCS1_RSAref
# could modify src, but it's a pain to maintain.
#echo "getting rid of rsa_enc.o"
#ar dv libcrypto.a rsa_enc.o
echo "generating new symbol table"
ranlib libcrypto.a

14
security/SSLeay/patches/patch-aa
View File

@ -1,16 +1,18 @@
--- Configure.orig Fri Jun 26 04:25:25 1998
+++ Configure Wed Mar 24 18:19:32 1999
@@ -133,6 +133,9 @@
+++ Configure Sun Mar 28 01:52:43 1999
@@ -133,6 +133,11 @@
"NetBSD-m86", "gcc:-DTERMIOS -O3 -fomit-frame-pointer -Wall -DB_ENDIAN::BN_LLONG MD2_CHAR RC4_INDEX DES_UNROLL:::",
"NetBSD-x86", "gcc:-DTERMIOS -DBN_ASM -D_ANSI_SOURCE -O3 -fomit-frame-pointer -m486 -Wall::BN_LLONG $x86_gcc_des $x86_gcc_opts:",
"FreeBSD", "gcc:-DTERMIOS -DBN_ASM -DL_ENDIAN -D_ANSI_SOURCE -fomit-frame-pointer -O3 -m486 -Wall::BN_LLONG $x86_gcc_des $x86_gcc_opts:$x86_out_asm",
+"OpenBSD-sparc", "gcc:-DTERMIOS -O3 -fomit-frame-pointer -mv8 -Wall::BN_LLONG MD2_CHAR RC4_INDEX DES_UNROLL:::",
+"OpenBSD-m68k", "gcc:-DTERMIOS -O3 -fomit-frame-pointer -Wall -DB_ENDIAN::BN_LLONG MD2_CHAR RC4_INDEX DES_UNROLL:::",
+"OpenBSD-x86", "gcc:-DTERMIOS -DBN_ASM -D_ANSI_SOURCE -O3 -fomit-frame-pointer -m486 -Wall::BN_LLONG $x86_gcc_des $x86_gcc_opts:",
+"OpenBSD-be", "gcc:-DTERMIOS -D_ANSI_SOURCE -O3 -fomit-frame-pointer -Wall -DB_ENDIAN::BN_LLONG MD2_CHAR RC4_INDEX DES_UNROLL:::",
+"OpenBSD-alpha","gcc:-DTERMIOS -D_ANSI_SOURCE -O3 -fomit-frame-pointer -Wall::SIXTY_FOUR_BIT_LONGS DES_INT DES_PTR DES_RISC2:asm/alpha.o::",
+"OpenBSD-x86", "gcc:-DTERMIOS -D_ANSI_SOURCE -O3 -fomit-frame-pointer -Wall -DBN_ASM -DL_ENDIAN::BN_LLONG $x86_gcc_des $x86_gcc_opts:$x86_out_asm",
+"OpenBSD-pmax", "gcc:-DTERMIOS -D_ANSI_SOURCE -O3 -fomit-frame-pointer -Wall -DL_ENDIAN::BN_LLONG MD2_CHAR RC4_INDEX DES_UNROLL:::",
+"OpenBSD-arc", "gcc:-DTERMIOS -D_ANSI_SOURCE -O3 -fomit-frame-pointer -Wall -DL_ENDIAN::BN_LLONG MD2_CHAR RC4_INDEX DES_UNROLL:::",
#"bsdi-gcc", "gcc:-O3 -ffast-math -DBN_ASM -DL_ENDIAN -DPERL5 -m486::RSA_LLONG $x86_gc_des $x86_gcc_opts:$x86_bsdi_asm",
"nextstep", "cc:-O3 -Wall -DBN_ASM::BN_LLONG $x86_gcc_des $x86_gcc_opts:::",
# NCR MP-RAS UNIX ver 02.03.01
@@ -221,13 +224,13 @@
@@ -221,13 +226,13 @@
{
$libs.=$_." ";
}

17
security/SSLeay/patches/patch-ab
View File

@ -1,10 +1,13 @@
--- crypto/bn/Makefile.ssl.orig Thu Apr 9 11:47:18 1998
+++ crypto/bn/Makefile.ssl Fri Mar 12 13:14:55 1999
@@ -57,6 +57,7 @@
+++ crypto/bn/Makefile.ssl Sat Mar 27 23:04:34 1999
@@ -82,6 +82,10 @@
asm/bn86unix.cpp:
(cd asm; perl bn-586.pl cpp >bn86unix.cpp )
+# alpha
+asm/alpha.o: asm/alpha.s
+ as -o asm/alpha.o asm/alpha.s
+
files:
perl $(TOP)/util/files.pl Makefile.ssl >> $(TOP)/MINFO
lib: $(LIBOBJ)
+ cp `basename $(BN_MULW)` asm/
$(AR) $(LIB) $(LIBOBJ)
sh $(TOP)/util/ranlib.sh $(LIB)
@touch lib

18
security/SSLeay/patches/patch-ac Normal file
View File

@ -0,0 +1,18 @@
--- crypto/bn/asm/alpha.s.orig Sat Mar 27 21:36:52 1999
+++ crypto/bn/asm/alpha.s Sat Mar 27 21:54:18 1999
@@ -195,7 +195,7 @@
addq $8,$3,$3 # c+=carry
cmpult $3,$8,$8 # did we overflow?
- stq $3,($16) # r[0]=c
+ stq $3,0($16) # r[0]=c
addq $7,$8,$8 # add into overflow
subq $19,1,$19 # loop--
@@ -339,6 +339,3 @@
addq $30,48,$30
ret $31,($26),1
.end bn_div64
- .ident "GCC: (GNU) 2.7.2.1"
-
-