summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authortron <tron>2010-11-17 18:47:28 +0000
committertron <tron>2010-11-17 18:47:28 +0000
commit97c8002c0d447b8a5b7501ccf08f074b29764988 (patch)
tree253858486765026c2cfb4878c1ce4fa536010041
parent28242bb8f26e7ff245edf80a20cb9b2aa12f1995 (diff)
downloadpkgsrc-97c8002c0d447b8a5b7501ccf08f074b29764988.tar.gz
Pullup ticket #3276 - requested by taca
security/openssl: security update Revisions pulled up: - security/openssl/Makefile 1.152 - security/openssl/distinfo 1.78 - security/openssl/patches/patch-bd delete --- Module Name: pkgsrc Committed By: taca Date: Wed Nov 17 00:52:26 UTC 2010 Modified Files: pkgsrc/security/openssl: Makefile distinfo Removed Files: pkgsrc/security/openssl/patches: patch-bd Log Message: Update security/openssl package to 0.9.8p. OpenSSL version 0.9.8p released =============================== OpenSSL - The Open Source toolkit for SSL/TLS http://www.openssl.org/ The OpenSSL project team is pleased to announce the release of version 0.9.8p of our open source toolkit for SSL/TLS. This new OpenSSL version is a security and bugfix release which addresses CVE-2010-3864. For a complete list of changes, please see http://www.openssl.org/source/exp/CHANGES.
-rw-r--r--security/openssl/Makefile5
-rw-r--r--security/openssl/distinfo9
-rw-r--r--security/openssl/patches/patch-bd14
3 files changed, 6 insertions, 22 deletions
diff --git a/security/openssl/Makefile b/security/openssl/Makefile
index 3d28656fe0c..e5e0c3d5647 100644
--- a/security/openssl/Makefile
+++ b/security/openssl/Makefile
@@ -1,9 +1,8 @@
-# $NetBSD: Makefile,v 1.151 2010/10/08 20:04:58 tez Exp $
+# $NetBSD: Makefile,v 1.151.2.1 2010/11/17 18:47:28 tron Exp $
OPENSSL_SNAPSHOT?= # empty
OPENSSL_STABLE?= # empty
-OPENSSL_VERS?= 0.9.8o
-PKGREVISION= 1
+OPENSSL_VERS?= 0.9.8p
.if empty(OPENSSL_SNAPSHOT)
DISTNAME= openssl-${OPENSSL_VERS}
diff --git a/security/openssl/distinfo b/security/openssl/distinfo
index 8d68e86987a..c1b48bfe8de 100644
--- a/security/openssl/distinfo
+++ b/security/openssl/distinfo
@@ -1,8 +1,8 @@
-$NetBSD: distinfo,v 1.77 2010/10/08 20:04:58 tez Exp $
+$NetBSD: distinfo,v 1.77.2.1 2010/11/17 18:47:29 tron Exp $
-SHA1 (openssl-0.9.8o.tar.gz) = 80c73afc7dca790cd26936cb392a4dfd14d4e4d7
-RMD160 (openssl-0.9.8o.tar.gz) = c2e455a17bce59c8a54522ffaa26c3a5cb26b510
-Size (openssl-0.9.8o.tar.gz) = 3772542 bytes
+SHA1 (openssl-0.9.8p.tar.gz) = 4ba43f4110432d7518c4f5d7be79077705ae7f16
+RMD160 (openssl-0.9.8p.tar.gz) = 13ec0427100f3d31940fe3725ca7c73163dc9fdd
+Size (openssl-0.9.8p.tar.gz) = 3772501 bytes
SHA1 (patch-aa) = eb25505e8a745eb5ba85f857b0f9302fd5e9bda1
SHA1 (patch-ac) = 6ff4a20440666f5c520837e10547091e1bee2208
SHA1 (patch-ad) = bb86ac463fc4ab8b485df5f1a4fb9c13c1fc41c3
@@ -11,4 +11,3 @@ SHA1 (patch-af) = 2610930b6b06397fa2e3955b3244c02193f5b7a6
SHA1 (patch-ag) = 5f12c72b85e4b6c6a79dfcf87055e9e029fbd8c8
SHA1 (patch-ak) = 049250b9bd42e6f155145703135dab39a7ec17e0
SHA1 (patch-al) = 076a606352bdeaeea1cc64f16be2ac1325882302
-SHA1 (patch-bd) = 988316ad0a4e0a369cff600e7ea0ef234e6c1461
diff --git a/security/openssl/patches/patch-bd b/security/openssl/patches/patch-bd
deleted file mode 100644
index e56a73b2e76..00000000000
--- a/security/openssl/patches/patch-bd
+++ /dev/null
@@ -1,14 +0,0 @@
-$NetBSD: patch-bd,v 1.1 2010/10/08 20:04:58 tez Exp $
-
-Fix for CVE-2010-2939
-
---- ssl/s3_clnt.c.orig 2010-10-07 15:13:10.061888900 -0500
-+++ ssl/s3_clnt.c 2010-10-07 15:14:30.209139600 -0500
-@@ -1377,6 +1377,7 @@
- s->session->sess_cert->peer_ecdh_tmp=ecdh;
- ecdh=NULL;
- BN_CTX_free(bn_ctx);
-+ bn_ctx = NULL;
- EC_POINT_free(srvr_ecpoint);
- srvr_ecpoint = NULL;
- }