diff options
| author | Dirk Meyer <dinoex@FreeBSD.org> | 2012-03-15 06:15:33 +0000 |
|---|---|---|
| committer | Dirk Meyer <dinoex@FreeBSD.org> | 2012-03-15 06:15:33 +0000 |
| commit | 61cb421f2af336292fe6e877b0d938e382339bf2 (patch) | |
| tree | a17656466138ac8fe8d17db9234d8f61a27cffd1 /security/openssl | |
| parent | d9a7e7c9dfc20eaa895a583f854a416bae3b1075 (diff) | |
| download | ports-61cb421f2af336292fe6e877b0d938e382339bf2.tar.gz ports-61cb421f2af336292fe6e877b0d938e382339bf2.zip | |
- drop DTLS bugfixes, now included upstream
- drop SCTP, will be in 1.0.1
- Security update to 1.0.0h
Security: http://www.openssl.org/news/secadv_20120312.txt
Security: CVE-2012-0884
PR: 166064
Approved by: portmgr (miwi)
Feature safe: yes
Notes
Notes:
svn path=/head/; revision=293329
Diffstat (limited to 'security/openssl')
| -rw-r--r-- | security/openssl/Makefile | 29 | ||||
| -rw-r--r-- | security/openssl/distinfo | 10 |
2 files changed, 5 insertions, 34 deletions
diff --git a/security/openssl/Makefile b/security/openssl/Makefile index 5cb410d22eef..33ef60dd7efd 100644 --- a/security/openssl/Makefile +++ b/security/openssl/Makefile @@ -7,8 +7,8 @@ PORTNAME= openssl PORTVERSION= 1.0.0 -DISTVERSIONSUFFIX= g -PORTREVISION= 9 +DISTVERSIONSUFFIX= h +PORTREVISION= 10 CATEGORIES= security devel MASTER_SITES= http://www.openssl.org/%SUBDIR%/ \ ftp://ftp.openssl.org/%SUBDIR%/ \ @@ -16,8 +16,6 @@ MASTER_SITES= http://www.openssl.org/%SUBDIR%/ \ MASTER_SITE_SUBDIR= source DIST_SUBDIR= ${DISTNAME} -PATCH_SITES= http://sctp.fh-muenster.de/dtls/ - MAINTAINER= dinoex@FreeBSD.org COMMENT= SSL and crypto library @@ -33,10 +31,7 @@ OPTIONS= I386 "Use optimized assembler for 80386" off \ ZLIB "Build with zlib compression" on \ 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 \ - DTLS_HEARTBEAT "Build with DTLS Heartbeat Extension" off \ - SCTP "Build with SCTP support" off \ + RFC3779 "Build with RFC3779 support" off MAKE_JOBS_UNSAFE= yes NOPRECIOUSMAKEVARS= Too many _MLINKS for fetch @@ -1105,24 +1100,6 @@ EXTRACONFIGURE+= enable-rfc3779 EXTRACONFIGURE+= no-rfc3779 .endif -.if defined(WITH_SCTP) -EXTRACONFIGURE+= sctp -.if defined(WITH_DTLS_HEARTBEAT) -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_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:: @${ECHO_CMD} "#" diff --git a/security/openssl/distinfo b/security/openssl/distinfo index 38d90069b9ff..eca61c9bcefa 100644 --- a/security/openssl/distinfo +++ b/security/openssl/distinfo @@ -1,8 +1,2 @@ -SHA256 (openssl-1.0.0g/openssl-1.0.0g.tar.gz) = 905106a1505e7d9f7c36ee81408d3aa3d41aac291a9603d0c290c9530c92fc2c -SIZE (openssl-1.0.0g/openssl-1.0.0g.tar.gz) = 4046513 -SHA256 (openssl-1.0.0g/abbreviated-renegotiation.patch) = f060c344d2eb639d6a7859b00195d6661e29018b4b877e8fc9cc791fd4025272 -SIZE (openssl-1.0.0g/abbreviated-renegotiation.patch) = 7977 -SHA256 (openssl-1.0.0g/dtls-heartbeats.patch) = b580ba6419e5732ed09fb9b4a9b2c083b1a002b848b2c71d6357ca7c9c36670e -SIZE (openssl-1.0.0g/dtls-heartbeats.patch) = 14132 -SHA256 (openssl-1.0.0g/dtls-sctp-24.patch) = 8335423c6f4767b899d923091244ec90cab4aabbd6e557358d04d0daf023001a -SIZE (openssl-1.0.0g/dtls-sctp-24.patch) = 57229 +SHA256 (openssl-1.0.0h/openssl-1.0.0h.tar.gz) = 7e3dfc21aa57ed33ea673170053d1921322803b8a6a624a4f0d2e4c308bd418d +SIZE (openssl-1.0.0h/openssl-1.0.0h.tar.gz) = 4048067 |