[pkgsrc/pkgsrc-2009Q4]: pkgsrc/security/openssl Pullup ticket #2967 - request...

[tron <tron%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/27f98ba072a8
branches:  pkgsrc-2009Q4
changeset: 569206:27f98ba072a8
user:      tron <tron%pkgsrc.org@localhost>
date:      Sun Jan 24 10:56:27 2010 +0000

description:
Pullup ticket #2967 - requested by taca
openssl: security patch

Revisions pulled up:
- security/openssl/Makefile                     1.143
- security/openssl/distinfo                     1.71
- security/openssl/patches/patch-bb             1.1
---
Module Name:    pkgsrc
Committed By:   taca
Date:           Fri Jan 22 03:35:10 UTC 2010

Modified Files:
        pkgsrc/security/openssl: Makefile distinfo
Added Files:
        pkgsrc/security/openssl/patches: patch-bb

Log Message:
Add a patch from OpenSSL's repositroy to deal with CVE-2009-4355.

Bump PKGREVISION.

diffstat:

 security/openssl/Makefile         |   3 +-
 security/openssl/distinfo         |   3 +-
 security/openssl/patches/patch-bb |  44 +++++++++++++++++++++++++++++++++++++++
 3 files changed, 48 insertions(+), 2 deletions(-)

diffs (76 lines):

diff -r 9fc7951b9081 -r 27f98ba072a8 security/openssl/Makefile
--- a/security/openssl/Makefile Thu Jan 21 21:21:13 2010 +0000
+++ b/security/openssl/Makefile Sun Jan 24 10:56:27 2010 +0000
@@ -1,8 +1,9 @@
-# $NetBSD: Makefile,v 1.142 2010/01/15 04:55:30 taca Exp $
+# $NetBSD: Makefile,v 1.142.2.1 2010/01/24 10:56:27 tron Exp $
 
 OPENSSL_SNAPSHOT?=     # empty
 OPENSSL_STABLE?=       # empty
 OPENSSL_VERS?=         0.9.8l
+PKGREVISION=           1
 
 .if empty(OPENSSL_SNAPSHOT)
 DISTNAME=      openssl-${OPENSSL_VERS}
diff -r 9fc7951b9081 -r 27f98ba072a8 security/openssl/distinfo
--- a/security/openssl/distinfo Thu Jan 21 21:21:13 2010 +0000
+++ b/security/openssl/distinfo Sun Jan 24 10:56:27 2010 +0000
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.70 2010/01/15 04:55:30 taca Exp $
+$NetBSD: distinfo,v 1.70.2.1 2010/01/24 10:56:27 tron Exp $
 
 SHA1 (openssl-0.9.8l.tar.gz) = d3fb6ec89532ab40646b65af179bb1770f7ca28f
 RMD160 (openssl-0.9.8l.tar.gz) = 9de81ec2583edcba729e62d50fd22c0a98a52903
@@ -15,3 +15,4 @@
 SHA1 (patch-ay) = 6d5de155e5508cd2237387626c8e1ff7ee603f8e
 SHA1 (patch-az) = aa7ef7192d56979ba09aa1dab8a2cdf9868f9c4a
 SHA1 (patch-ba) = b8ab55c0c6ab4b995cae18517609720f0803e11f
+SHA1 (patch-bb) = a4092a65f52d3c9c85c9015901b2a5eeb11d0955
diff -r 9fc7951b9081 -r 27f98ba072a8 security/openssl/patches/patch-bb
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/security/openssl/patches/patch-bb Sun Jan 24 10:56:27 2010 +0000
@@ -0,0 +1,44 @@
+$NetBSD: patch-bb,v 1.1.2.2 2010/01/24 10:56:27 tron Exp $
+
+deal with CVE-2009-4355, revsion 1.15.2.8 from OpenSSL's CVS repository.
+
+--- crypto/comp/c_zlib.c.orig  2008-12-13 17:00:53.000000000 +0000
++++ crypto/comp/c_zlib.c
+@@ -136,15 +136,6 @@ struct zlib_state
+ 
+ static int zlib_stateful_ex_idx = -1;
+ 
+-static void zlib_stateful_free_ex_data(void *obj, void *item,
+-      CRYPTO_EX_DATA *ad, int ind,long argl, void *argp)
+-      {
+-      struct zlib_state *state = (struct zlib_state *)item;
+-      inflateEnd(&state->istream);
+-      deflateEnd(&state->ostream);
+-      OPENSSL_free(state);
+-      }
+-
+ static int zlib_stateful_init(COMP_CTX *ctx)
+       {
+       int err;
+@@ -188,6 +179,12 @@ static int zlib_stateful_init(COMP_CTX *
+ 
+ static void zlib_stateful_finish(COMP_CTX *ctx)
+       {
++      struct zlib_state *state =
++              (struct zlib_state *)CRYPTO_get_ex_data(&ctx->ex_data,
++                      zlib_stateful_ex_idx);
++      inflateEnd(&state->istream);
++      deflateEnd(&state->ostream);
++      OPENSSL_free(state);
+       CRYPTO_free_ex_data(CRYPTO_EX_INDEX_COMP,ctx,&ctx->ex_data);
+       }
+ 
+@@ -402,7 +399,7 @@ COMP_METHOD *COMP_zlib(void)
+                       if (zlib_stateful_ex_idx == -1)
+                               zlib_stateful_ex_idx =
+                                       CRYPTO_get_ex_new_index(CRYPTO_EX_INDEX_COMP,
+-                                              0,NULL,NULL,NULL,zlib_stateful_free_ex_data);
++                                              0,NULL,NULL,NULL,NULL);
+                       CRYPTO_w_unlock(CRYPTO_LOCK_COMP);
+                       if (zlib_stateful_ex_idx == -1)
+                               goto err;