package/heirloom-mailx: security bump to version 12.5-5 from Debian
Our current heirloom-mailx package is affected by CVE-2014-7844. It has been fixed by a Debian patch 0014-globname-Invoke-wordexp-with-WRDE_NOCMD.patch, but it does rely on other Debian patches as well. Instead of bringing those patches locally, we just update the package to use version 12.5-5 from Debian, including its patches. The local patch 0001-Patched-out-SSL2-support-since-it-is-no-longer-suppo.patch is removed as it is part of the Debian patches. The remaining patch 0002-fix-libressl-support.patch is renumbered. Signed-off-by: Thomas Petazzoni <thomas.petazzoni@bootlin.com> Signed-off-by: Yann E. MORIN <yann.morin.1998@free.fr>
This commit is contained in:
parent
53993f2529
commit
15972770cf
|
@ -1,42 +0,0 @@
|
||||||
From: Hilko Bengen <bengen@debian.org>
|
|
||||||
Date: Wed, 27 Apr 2011 00:18:42 +0200
|
|
||||||
Subject: Patched out SSL2 support since it is no longer supported by OpenSSL.
|
|
||||||
|
|
||||||
Now that openssl has dropped SSLv2 support we need to patch it out.
|
|
||||||
Patch picked up from debian patchseries 5.
|
|
||||||
|
|
||||||
Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
|
|
||||||
|
|
||||||
---
|
|
||||||
mailx.1 | 2 +-
|
|
||||||
openssl.c | 4 +---
|
|
||||||
2 files changed, 2 insertions(+), 4 deletions(-)
|
|
||||||
|
|
||||||
diff --git a/mailx.1 b/mailx.1
|
|
||||||
index 417ea04..a02e430 100644
|
|
||||||
--- a/mailx.1
|
|
||||||
+++ b/mailx.1
|
|
||||||
@@ -3575,7 +3575,7 @@ Only applicable if SSL/TLS support is built using OpenSSL.
|
|
||||||
.TP
|
|
||||||
.B ssl-method
|
|
||||||
Selects a SSL/TLS protocol version;
|
|
||||||
-valid values are `ssl2', `ssl3', and `tls1'.
|
|
||||||
+valid values are `ssl3', and `tls1'.
|
|
||||||
If unset, the method is selected automatically,
|
|
||||||
if possible.
|
|
||||||
.TP
|
|
||||||
diff --git a/openssl.c b/openssl.c
|
|
||||||
index b4e33fc..44fe4e5 100644
|
|
||||||
--- a/openssl.c
|
|
||||||
+++ b/openssl.c
|
|
||||||
@@ -216,9 +216,7 @@ ssl_select_method(const char *uhp)
|
|
||||||
|
|
||||||
cp = ssl_method_string(uhp);
|
|
||||||
if (cp != NULL) {
|
|
||||||
- if (equal(cp, "ssl2"))
|
|
||||||
- method = SSLv2_client_method();
|
|
||||||
- else if (equal(cp, "ssl3"))
|
|
||||||
+ if (equal(cp, "ssl3"))
|
|
||||||
method = SSLv3_client_method();
|
|
||||||
else if (equal(cp, "tls1"))
|
|
||||||
method = TLSv1_client_method();
|
|
|
@ -1,4 +1,5 @@
|
||||||
# From http://snapshot.debian.org/archive/debian/20141023T043132Z/pool/main/h/heirloom-mailx/heirloom-mailx_12.5-3.dsc
|
# From http://snapshot.debian.org/archive/debian/20150815T155609Z/pool/main/h/heirloom-mailx/heirloom-mailx_12.5-5.dsc
|
||||||
sha256 015ba4209135867f37a0245d22235a392b8bbed956913286b887c2e2a9a421ad heirloom-mailx_12.5.orig.tar.gz
|
sha256 015ba4209135867f37a0245d22235a392b8bbed956913286b887c2e2a9a421ad heirloom-mailx_12.5.orig.tar.gz
|
||||||
|
sha256 0140cef831f966cf65a0a6ba2ed4eef4f2bfb402b7b18db7307bc42e63328ce6 heirloom-mailx_12.5-5.debian.tar.xz
|
||||||
# Locally computed
|
# Locally computed
|
||||||
sha256 5ddc00aed98a0cf75fc7edfd9f3aeb1e919ae0ad5e9ff55d61f643d62d802b07 COPYING
|
sha256 5ddc00aed98a0cf75fc7edfd9f3aeb1e919ae0ad5e9ff55d61f643d62d802b07 COPYING
|
||||||
|
|
|
@ -6,11 +6,14 @@
|
||||||
|
|
||||||
HEIRLOOM_MAILX_VERSION = 12.5
|
HEIRLOOM_MAILX_VERSION = 12.5
|
||||||
HEIRLOOM_MAILX_SOURCE = heirloom-mailx_$(HEIRLOOM_MAILX_VERSION).orig.tar.gz
|
HEIRLOOM_MAILX_SOURCE = heirloom-mailx_$(HEIRLOOM_MAILX_VERSION).orig.tar.gz
|
||||||
HEIRLOOM_MAILX_SITE = http://snapshot.debian.org/archive/debian/20141023T043132Z/pool/main/h/heirloom-mailx
|
HEIRLOOM_MAILX_SITE = http://snapshot.debian.org/archive/debian/20150815T155609Z/pool/main/h/heirloom-mailx
|
||||||
|
HEIRLOOM_MAILX_PATCH = heirloom-mailx_$(HEIRLOOM_MAILX_VERSION)-5.debian.tar.xz
|
||||||
HEIRLOOM_MAILX_LICENSE = BSD-4-Clause, Bellcore (base64), OpenVision (imap_gssapi), RSA Data Security (md5), Network Working Group (hmac), MPL-1.1 (nss)
|
HEIRLOOM_MAILX_LICENSE = BSD-4-Clause, Bellcore (base64), OpenVision (imap_gssapi), RSA Data Security (md5), Network Working Group (hmac), MPL-1.1 (nss)
|
||||||
HEIRLOOM_MAILX_LICENSE_FILES = COPYING
|
HEIRLOOM_MAILX_LICENSE_FILES = COPYING
|
||||||
HEIRLOOM_MAILX_CPE_ID_VENDOR = heirloom
|
HEIRLOOM_MAILX_CPE_ID_VENDOR = heirloom
|
||||||
HEIRLOOM_MAILX_CPE_ID_PRODUCT = mailx
|
HEIRLOOM_MAILX_CPE_ID_PRODUCT = mailx
|
||||||
|
# 0014-globname-Invoke-wordexp-with-WRDE_NOCMD.patch in the Debian patches
|
||||||
|
HEIRLOOM_MAILX_IGNORE_CVES += CVE-2014-7844
|
||||||
|
|
||||||
ifeq ($(BR2_PACKAGE_OPENSSL),y)
|
ifeq ($(BR2_PACKAGE_OPENSSL),y)
|
||||||
HEIRLOOM_MAILX_DEPENDENCIES += openssl
|
HEIRLOOM_MAILX_DEPENDENCIES += openssl
|
||||||
|
|
Loading…
Reference in a new issue