[Pkg-openssl-changes] r624 - openssl/trunk/debian

[Kurt Roeckx]

Author: kroeckx
Date: 2013-12-22 16:50:52 +0000 (Sun, 22 Dec 2013)
New Revision: 624

Modified:
   openssl/trunk/debian/changelog
   openssl/trunk/debian/control
   openssl/trunk/debian/rules
Log:
disable zlib support.


Modified: openssl/trunk/debian/changelog
===================================================================
--- openssl/trunk/debian/changelog	2013-12-22 16:47:39 UTC (rev 623)
+++ openssl/trunk/debian/changelog	2013-12-22 16:50:52 UTC (rev 624)
@@ -14,8 +14,9 @@
     - adjust fix-pod-errors.patch for the reordering of items in the
       documentation they've done trying to fix those pod errors.
   * disable rdrand engine by default (Closes: #732710)
+  * disable zlib support.  Fixes CVE-2012-4929 (Closes: #728055)
 
- -- Kurt Roeckx <kurt at roeckx.be>  Sun, 22 Dec 2013 17:46:08 +0100
+ -- Kurt Roeckx <kurt at roeckx.be>  Sun, 22 Dec 2013 17:49:12 +0100
 
 openssl (1.0.1e-4) unstable; urgency=low
 

Modified: openssl/trunk/debian/control
===================================================================
--- openssl/trunk/debian/control	2013-12-22 16:47:39 UTC (rev 623)
+++ openssl/trunk/debian/control	2013-12-22 16:50:52 UTC (rev 624)
@@ -1,5 +1,5 @@
 Source: openssl
-Build-Depends: debhelper (>= 9), zlib1g-dev, m4, bc, dpkg-dev (>= 1.15.7)
+Build-Depends: debhelper (>= 9), m4, bc, dpkg-dev (>= 1.15.7)
 Section: utils
 Priority: optional
 Maintainer: Debian OpenSSL Team <pkg-openssl-devel at lists.alioth.debian.org>

Modified: openssl/trunk/debian/rules
===================================================================
--- openssl/trunk/debian/rules	2013-12-22 16:47:39 UTC (rev 623)
+++ openssl/trunk/debian/rules	2013-12-22 16:50:52 UTC (rev 624)
@@ -20,7 +20,7 @@
 DEB_HOST_MULTIARCH=$(shell dpkg-architecture -qDEB_HOST_MULTIARCH)
 DEB_HOST_ARCH_CPU=$(shell dpkg-architecture -qDEB_HOST_ARCH_CPU)
 
-CONFARGS  = --prefix=/usr --openssldir=/usr/lib/ssl --libdir=lib/$(DEB_HOST_MULTIARCH) no-idea no-mdc2 no-rc5 zlib  enable-tlsext no-ssl2
+CONFARGS  = --prefix=/usr --openssldir=/usr/lib/ssl --libdir=lib/$(DEB_HOST_MULTIARCH) no-idea no-mdc2 no-rc5 no-zlib  enable-tlsext no-ssl2
 OPT_alpha = ev4 ev5
 OPT_i386  = i586 i686/cmov
 ARCHOPTS  = OPT_$(DEB_HOST_ARCH)