summaryrefslogtreecommitdiff
path: root/security
diff options
context:
space:
mode:
authorDirk Meyer <dinoex@FreeBSD.org>2003-02-19 21:12:51 +0000
committerDirk Meyer <dinoex@FreeBSD.org>2003-02-19 21:12:51 +0000
commitb8dd3b052db623a84396a893d57344e794d908fa (patch)
tree0489bbfbb35636dd0f6954831c11652238b4cc66 /security
parent- merged some patches in distribution (diff)
- merged some patches in distribution
- added thread support on alpha, sparc64 - Update to 0.9.7a (with security fix) - defaults openssl to port
Notes
Notes: svn path=/head/; revision=75911
Diffstat (limited to 'security')
-rw-r--r--security/openssl/Makefile89
-rw-r--r--security/openssl/Makefile.ssl11
-rw-r--r--security/openssl/distinfo2
-rw-r--r--security/openssl/files/patch-Configure (renamed from security/openssl/files/patch-ac)16
-rw-r--r--security/openssl/files/patch-config20
5 files changed, 60 insertions, 78 deletions
diff --git a/security/openssl/Makefile b/security/openssl/Makefile
index 35ff33923870..c27aa2c08e32 100644
--- a/security/openssl/Makefile
+++ b/security/openssl/Makefile
@@ -6,8 +6,7 @@
#
PORTNAME= openssl
-PORTVERSION= 0.9.7
-PORTREVISION= 1
+PORTVERSION= 0.9.7a
CATEGORIES= security devel
MASTER_SITES= http://www.openssl.org/source/ \
ftp://ftp.openssl.org/source/ \
@@ -20,49 +19,6 @@ MAINTAINER= dinoex@FreeBSD.org
.error You have `USE_OPENSSL' variable defined either in environment or in make(1) arguments. Please undefine and try again.
.endif
-.include <bsd.port.pre.mk>
-
-.if ${PORTOBJFORMAT} == "aout"
-MAKE_ARGS+= WHOLE_ARCHIVE_FLAG=-Bforcearchive
-.else
-MAKE_ARGS+= WHOLE_ARCHIVE_FLAG=--whole-archive
-.endif
-
-USE_PERL5= yes
-.if defined(NOSHARED)
-PLIST_SUB+= SHARED="@comment "
-.else
-PLIST_SUB+= SHARED=""
-ALL_TARGET= freebsd-shared all
-.if exists(/usr/lib/libcrypto.so.3)
-SHLIBVER= 4
-.else
-SHLIBVER= 3
-.endif
-MAKE_ENV+= SHLIBVER=${SHLIBVER}
-PLIST_SUB+= SHLIBVER=${SHLIBVER}
-INSTALLS_SHLIB= yes
-.endif
-
-.if defined(OPENSSL_OVERWRITE_BASE)
-PKGNAMESUFFIX= -overwrite-base
-PREFIX= /usr
-.if exists(/usr/lib/libcrypto.so.3)
-SHLIBVER= 3
-.else
-SHLIBVER= 2
-.endif
-OPENSSLDIR= /etc/ssl
-MANPREFIX= ${PREFIX}/openssl
-PLIST_SUB+= MANDIR=""
-PLIST_SUB+= NOBASE="@comment "
-.else
-OPENSSLDIR= ${PREFIX}/openssl
-MANPREFIX= ${PREFIX}
-PLIST_SUB+= MANDIR="@comment "
-PLIST_SUB+= NOBASE=""
-.endif
-
MAKE_ENV+= MANPREFIX=${MANPREFIX}
NOPRECIOUSMAKEVARS= Too many _MLINKS for fetch
@@ -856,6 +812,49 @@ MLINKS= dgst.1 md4.1 \
des_modes.7 Modes.7 \
des_modes.7 of.7
+.include <bsd.port.pre.mk>
+
+.if ${PORTOBJFORMAT} == "aout"
+MAKE_ARGS+= WHOLE_ARCHIVE_FLAG=-Bforcearchive
+.else
+MAKE_ARGS+= WHOLE_ARCHIVE_FLAG=--whole-archive
+.endif
+
+USE_PERL5= yes
+.if defined(NOSHARED)
+PLIST_SUB+= SHARED="@comment "
+.else
+PLIST_SUB+= SHARED=""
+ALL_TARGET= freebsd-shared all
+.if exists(/usr/lib/libcrypto.so.3)
+SHLIBVER= 4
+.else
+SHLIBVER= 3
+.endif
+MAKE_ENV+= SHLIBVER=${SHLIBVER}
+PLIST_SUB+= SHLIBVER=${SHLIBVER}
+INSTALLS_SHLIB= yes
+.endif
+
+.if defined(OPENSSL_OVERWRITE_BASE)
+PKGNAMESUFFIX= -overwrite-base
+PREFIX= /usr
+.if exists(/usr/lib/libcrypto.so.3)
+SHLIBVER= 3
+.else
+SHLIBVER= 2
+.endif
+OPENSSLDIR= /etc/ssl
+MANPREFIX= ${PREFIX}/openssl
+PLIST_SUB+= MANDIR=""
+PLIST_SUB+= NOBASE="@comment "
+.else
+OPENSSLDIR= ${PREFIX}/openssl
+MANPREFIX= ${PREFIX}
+PLIST_SUB+= MANDIR="@comment "
+PLIST_SUB+= NOBASE=""
+.endif
+
.if defined(BATCH) || defined(OPENSSL_WITH_386)
.if ${MACHINE_ARCH} == "i386"
EXTRACONFIGURE= 386
diff --git a/security/openssl/Makefile.ssl b/security/openssl/Makefile.ssl
index bfec6062204a..f135538c89d9 100644
--- a/security/openssl/Makefile.ssl
+++ b/security/openssl/Makefile.ssl
@@ -26,11 +26,12 @@
# but give an installed port preference over it.
.if !defined(USE_OPENSSL_BASE) && \
!defined(USE_OPENSSL_BETA) && \
- !defined(USE_OPENSSL_PORT)
-# 4.7-STABLE has 0.9.7 after 2003-02-14
-# 5.0-CURRENT has 0.9.7 after 2003-01-28, 500100 was bumped at 2003-01-23
-.if exists(/usr/lib/libcrypto.so.3) && !exists(${LOCALBASE}/lib/libcrypto.so)
-USE_OPENSSL_BASE=yes
+ !defined(USE_OPENSSL_PORT) && \
+ !exists(${LOCALBASE}/lib/libcrypto.so)
+# 4.7-STABLE has not yet 0.9.7a
+# 5.0-CURRENT has not yet 0.9.7a
+.if exists(/usr/lib/libcrypto.so.3)
+#USE_OPENSSL_BASE=yes
.endif
.endif
diff --git a/security/openssl/distinfo b/security/openssl/distinfo
index bef51b441d0e..7596c06f5dd3 100644
--- a/security/openssl/distinfo
+++ b/security/openssl/distinfo
@@ -1 +1 @@
-MD5 (openssl-0.9.7.tar.gz) = ef376d14205afcfb831cd3720f705d79
+MD5 (openssl-0.9.7a.tar.gz) = a0d3203ecf10989fdc61c784ae82e531
diff --git a/security/openssl/files/patch-ac b/security/openssl/files/patch-Configure
index e0c621fba728..6c5cdbf36e16 100644
--- a/security/openssl/files/patch-ac
+++ b/security/openssl/files/patch-Configure
@@ -1,23 +1,25 @@
---- Configure.orig Fri Dec 27 17:35:11 2002
-+++ Configure Sat Jan 11 01:44:38 2003
-@@ -350,7 +350,9 @@
+--- Configure.orig Tue Feb 18 13:15:09 2003
++++ Configure Wed Feb 19 19:28:01 2003
+@@ -349,7 +349,7 @@
#
# This probably belongs in a different section.
#
-"FreeBSD-alpha","gcc:-DTERMIOS -O -fomit-frame-pointer::(unknown):::SIXTY_FOUR_BIT_LONG RC4_CHUNK DES_INT DES_PTR DES_RISC2::::::::::dlfcn:bsd-gcc-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
-+"FreeBSD-alpha","$ENV{CC}:-DTERMIOS $ENV{CFLAGS}::(unknown):::SIXTY_FOUR_BIT_LONG RC4_CHUNK DES_INT DES_PTR DES_RISC2::::::::::dlfcn:bsd-gcc-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
-+"FreeBSD-sparc64","$ENV{CC}:-DTERMIOS -DB_ENDIAN -DULTRASPARC -DBN_DIV2W $ENV{CFLAGS}::(unknown):::SIXTY_FOUR_BIT_LONG RC4_CHAR RC4_CHUNK DES_INT DES_PTR DES_RISC1 DES_UNROLL BF_PTR::::::::::dlfcn:bsd-gcc-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
-+"FreeBSD-ia64","$ENV{CC}:-DL_ENDIAN -DTERMIOS $ENV{CFLAGS}::(unknown):::SIXTY_FOUR_BIT_LONG RC4_CHUNK RC4_CHAR:asm/ia64-cpp.o:::::::::dlfcn:bsd-gcc-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
++"FreeBSD-alpha","$ENV{CC}:-DTERMIOS $ENV{CFLAGS}::-pthread -D_REENTRANT -D_THREAD_SAFE -D_THREADSAFE:::SIXTY_FOUR_BIT_LONG RC4_CHUNK DES_INT DES_PTR DES_RISC2::::::::::dlfcn:bsd-gcc-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
#### Alpha Linux with GNU C and Compaq C setups
# Special notes:
-@@ -395,8 +397,8 @@
+@@ -394,10 +394,10 @@
"NetBSD-sparc", "gcc:-DTERMIOS -O3 -fomit-frame-pointer -mv8 -Wall -DB_ENDIAN::(unknown):::BN_LLONG MD2_CHAR RC4_INDEX DES_UNROLL::::::::::dlfcn:bsd-gcc-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
"NetBSD-m68", "gcc:-DTERMIOS -O3 -fomit-frame-pointer -Wall -DB_ENDIAN::(unknown):::BN_LLONG MD2_CHAR RC4_INDEX DES_UNROLL::::::::::dlfcn:bsd-gcc-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
"NetBSD-x86", "gcc:-DTERMIOS -O3 -fomit-frame-pointer -m486 -Wall::(unknown):::BN_LLONG ${x86_gcc_des} ${x86_gcc_opts}::::::::::dlfcn:bsd-gcc-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
-"FreeBSD-elf", "gcc:-DTERMIOS -DL_ENDIAN -fomit-frame-pointer -O3 -m486 -Wall::-pthread -D_REENTRANT -D_THREAD_SAFE -D_THREADSAFE:::BN_LLONG ${x86_gcc_des} ${x86_gcc_opts}:${x86_elf_asm}:dlfcn:bsd-gcc-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
+-"FreeBSD-sparc64","gcc:-DB_ENDIAN -DTERMIOS -O3 -fomit-frame-pointer::-pthread -D_REENTRANT -D_THREAD_SAFE -D_THREADSAFE:::SIXTY_FOUR_BIT_LONG DES_INT DES_PTR DES_RISC2 BF_PTR::::::::::dlfcn:bsd-gcc-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
+-"FreeBSD-ia64","gcc:-DL_ENDIAN -DTERMIOS -O -fomit-frame-pointer::(unknown):::SIXTY_FOUR_BIT_LONG RC4_CHUNK RC4_CHAR:asm/ia64-cpp.o:::::::::dlfcn:bsd-gcc-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
-"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} -Wall::-pthread -D_REENTRANT -D_THREAD_SAFE -D_THREADSAFE:::BN_LLONG ${x86_gcc_des} ${x86_gcc_opts}:${x86_elf_asm}:dlfcn:bsd-gcc-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
++"FreeBSD-sparc64","$ENV{CC}:-DB_ENDIAN -DTERMIOS $ENV{CFLAGS}::-pthread -D_REENTRANT -D_THREAD_SAFE -D_THREADSAFE:::SIXTY_FOUR_BIT_LONG DES_INT DES_PTR DES_RISC2 BF_PTR::::::::::dlfcn:bsd-gcc-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
++"FreeBSD-ia64","$ENV{CC}:-DL_ENDIAN -DTERMIOS $ENV{CFLAGS}::(unknown):::SIXTY_FOUR_BIT_LONG RC4_CHUNK RC4_CHAR:asm/ia64-cpp.o:::::::::dlfcn:bsd-gcc-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
+"FreeBSD", "$ENV{CC}:-DTERMIOS -DL_ENDIAN $ENV{CFLAGS} -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}",
"bsdi-elf-gcc", "gcc:-DPERL5 -DL_ENDIAN -fomit-frame-pointer -O3 -m486 -Wall::(unknown)::-ldl:BN_LLONG ${x86_gcc_des} ${x86_gcc_opts}:${x86_elf_asm}:dlfcn:bsd-gcc-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
diff --git a/security/openssl/files/patch-config b/security/openssl/files/patch-config
deleted file mode 100644
index 13e7a230da9f..000000000000
--- a/security/openssl/files/patch-config
+++ /dev/null
@@ -1,20 +0,0 @@
---- config.orig Fri Dec 6 08:45:11 2002
-+++ config Sat Jan 11 01:37:40 2003
-@@ -206,6 +206,8 @@
- Pentium\ II*) MACH="i686" ;;
- Pentium* ) MACH="i586" ;;
- Alpha* ) MACH="alpha" ;;
-+ UltraSparc* ) MACH="sparc64" ;;
-+ Itanium* ) MACH="ia64" ;;
- * ) MACH="$MACHINE" ;;
- esac
- case ${MACH} in
-@@ -640,6 +642,8 @@
- *86*-*-solaris2) OUT="solaris-x86-$CC" ;;
- *-*-sunos4) OUT="sunos-$CC" ;;
- alpha*-*-freebsd*) OUT="FreeBSD-alpha" ;;
-+ sparc64*-*-freebsd*) OUT="FreeBSD-sparc64" ;;
-+ ia64*-*-freebsd*) OUT="FreeBSD-ia64" ;;
- *-freebsd[3-9]*) OUT="FreeBSD-elf" ;;
- *-freebsd[1-2]*) OUT="FreeBSD" ;;
- *86*-*-netbsd) OUT="NetBSD-x86" ;;
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-02 01:52:24 +0000