aboutsummaryrefslogtreecommitdiffstats
path: root/security/openssl
diff options
context:
space:
mode:
authordinoex <dinoex@FreeBSD.org>2012-01-11 13:44:00 +0800
committerdinoex <dinoex@FreeBSD.org>2012-01-11 13:44:00 +0800
commitda1d1523e40ea6dde47110f190637938f93324e2 (patch)
tree8568600d2ac5d5a6a7f0dfb6386bf49a9487df35 /security/openssl
parent8002f99a0a9bd739d26972ca05503cd0ad06374b (diff)
downloadfreebsd-ports-gnome-da1d1523e40ea6dde47110f190637938f93324e2.tar.gz
freebsd-ports-gnome-da1d1523e40ea6dde47110f190637938f93324e2.tar.zst
freebsd-ports-gnome-da1d1523e40ea6dde47110f190637938f93324e2.zip
- Build with obsolte MD2 hash by default
- Security Update to 1.0.0f Security: http://openssl.org/news/secadv_20120104.txt Security: CVE-2011-4108 Security: CVE-2011-4109 Security: CVE-2011-4576 Security: CVE-2011-4577 Security: CVE-2011-4619 Security: CVE-2012-0027 Submitted by: Tim Zingelman
Diffstat (limited to 'security/openssl')
-rw-r--r--security/openssl/Makefile21
-rw-r--r--security/openssl/distinfo22
2 files changed, 16 insertions, 27 deletions
diff --git a/security/openssl/Makefile b/security/openssl/Makefile
index e6559fe408b5..fe36764aebd7 100644
--- a/security/openssl/Makefile
+++ b/security/openssl/Makefile
@@ -7,19 +7,16 @@
PORTNAME= openssl
PORTVERSION= 1.0.0
-DISTVERSIONSUFFIX= e
-PORTREVISION= 7
+DISTVERSIONSUFFIX= f
+PORTREVISION= 8
CATEGORIES= security devel
MASTER_SITES= http://www.openssl.org/%SUBDIR%/ \
ftp://ftp.openssl.org/%SUBDIR%/ \
ftp://ftp.cert.dfn.de/pub/tools/net/openssl/%SUBDIR%/
MASTER_SITE_SUBDIR= source
-DIST_SUBDIR= ${DISTNAME}2
+DIST_SUBDIR= ${DISTNAME}
PATCH_SITES= http://sctp.fh-muenster.de/dtls/
-PATCHFILES= dtls-manual-mtu-bug-1.0.0.patch \
- dtls-ecc-key-bug-1.0.0.patch \
- dtls-fragment-assert-bug-1.0.0.patch
MAINTAINER= dinoex@FreeBSD.org
COMMENT= SSL and crypto library
@@ -34,7 +31,7 @@ OPTIONS= I386 "Use optimized assembler for 80386" off \
SSE2 "Use runtime SSE2 detection" on \
ASM "Build with optimized Assembler" on \
ZLIB "Build with zlib compression" on \
- MD2 "Build with MD2 hash (obsolete)" off \
+ MD2 "Build with MD2 hash (obsolete)" on \
RC5 "Build with RC5 chipher (patented)" off \
RFC3779 "Build with RFC3779 support" off \
DTLS_RENEGOTIATION "Build with DTLS Abbr. renegotiations" off \
@@ -1113,20 +1110,18 @@ EXTRACONFIGURE+= sctp
.if defined(WITH_DTLS_HEARTBEAT)
BROKEN= Patches do not merge, please change options
.endif
-.if defined(WITH_DTLS_RENEGOTIATION)
-BROKEN= Patches do not merge, please change options
-.endif
.endif
+
# order of PATCHFILES is important
.if defined(WITH_DTLS_RENEGOTIATION) || make(makesum) || defined(FETCH_ALL)
PATCHFILES+= abbreviated-renegotiation.patch
.endif
-.if defined(WITH_SCTP) || make(makesum) || defined(FETCH_ALL)
-PATCHFILES+= dtls-sctp-24.patch
-.endif
.if defined(WITH_DTLS_HEARTBEAT) || make(makesum) || defined(FETCH_ALL)
PATCHFILES+= dtls-heartbeats.patch
.endif
+.if defined(WITH_SCTP) || make(makesum) || defined(FETCH_ALL)
+PATCHFILES+= dtls-sctp-24.patch
+.endif
.if ${OPENSSL_SHLIBVER_BASE} > ${OPENSSL_SHLIBVER}
pre-everything::
diff --git a/security/openssl/distinfo b/security/openssl/distinfo
index c733511bb210..dbf4ce77a85e 100644
--- a/security/openssl/distinfo
+++ b/security/openssl/distinfo
@@ -1,14 +1,8 @@
-SHA256 (openssl-1.0.0e2/openssl-1.0.0e.tar.gz) = e361dc2775733fb84de7b5bf7b504778b772869e8f7bfac0b28b935cbf7380f7
-SIZE (openssl-1.0.0e2/openssl-1.0.0e.tar.gz) = 4040229
-SHA256 (openssl-1.0.0e2/dtls-manual-mtu-bug-1.0.0.patch) = b28d5810bc6aad1427c0d1464ae4d652befac818e72e50f8ca4f16028ea1d720
-SIZE (openssl-1.0.0e2/dtls-manual-mtu-bug-1.0.0.patch) = 2513
-SHA256 (openssl-1.0.0e2/dtls-ecc-key-bug-1.0.0.patch) = 92c1659fa92308107bee95dadc9f0a8a05fddd02b7b3d0b620b5337f41245b5d
-SIZE (openssl-1.0.0e2/dtls-ecc-key-bug-1.0.0.patch) = 500
-SHA256 (openssl-1.0.0e2/dtls-fragment-assert-bug-1.0.0.patch) = ee95a8a3c1b2d331f0774930dd9faeb48b940886fb764724daee6045ff7c5714
-SIZE (openssl-1.0.0e2/dtls-fragment-assert-bug-1.0.0.patch) = 835
-SHA256 (openssl-1.0.0e2/abbreviated-renegotiation.patch) = f060c344d2eb639d6a7859b00195d6661e29018b4b877e8fc9cc791fd4025272
-SIZE (openssl-1.0.0e2/abbreviated-renegotiation.patch) = 7977
-SHA256 (openssl-1.0.0e2/dtls-sctp-24.patch) = 8335423c6f4767b899d923091244ec90cab4aabbd6e557358d04d0daf023001a
-SIZE (openssl-1.0.0e2/dtls-sctp-24.patch) = 57229
-SHA256 (openssl-1.0.0e2/dtls-heartbeats.patch) = b580ba6419e5732ed09fb9b4a9b2c083b1a002b848b2c71d6357ca7c9c36670e
-SIZE (openssl-1.0.0e2/dtls-heartbeats.patch) = 14132
+SHA256 (openssl-1.0.0f/openssl-1.0.0f.tar.gz) = faf1eab0ef85fd6c3beca271c356b31b5cc831e2c6b7f23cf672e7ab4680fde1
+SIZE (openssl-1.0.0f/openssl-1.0.0f.tar.gz) = 4043367
+SHA256 (openssl-1.0.0f/abbreviated-renegotiation.patch) = f060c344d2eb639d6a7859b00195d6661e29018b4b877e8fc9cc791fd4025272
+SIZE (openssl-1.0.0f/abbreviated-renegotiation.patch) = 7977
+SHA256 (openssl-1.0.0f/dtls-sctp-24.patch) = 8335423c6f4767b899d923091244ec90cab4aabbd6e557358d04d0daf023001a
+SIZE (openssl-1.0.0f/dtls-sctp-24.patch) = 57229
+SHA256 (openssl-1.0.0f/dtls-heartbeats.patch) = b580ba6419e5732ed09fb9b4a9b2c083b1a002b848b2c71d6357ca7c9c36670e
+SIZE (openssl-1.0.0f/dtls-heartbeats.patch) = 14132