diff options
| author | A. Wilcox <AWilcox@Wilcox-Tech.com> | 2019-02-26 20:49:42 +0000 |
|---|---|---|
| committer | A. Wilcox <AWilcox@Wilcox-Tech.com> | 2019-02-26 20:49:42 +0000 |
| commit | b8859d4019084a8fc323aae9de544aef7c717bff (patch) | |
| tree | e9c8cb66832fc751ff4e7f8201ddc466c3ec64bd | |
| parent | ef2e8d505b9496ec1698b16136752c8aca2bd73b (diff) | |
| download | packages-b8859d4019084a8fc323aae9de544aef7c717bff.tar.gz packages-b8859d4019084a8fc323aae9de544aef7c717bff.tar.bz2 packages-b8859d4019084a8fc323aae9de544aef7c717bff.tar.xz packages-b8859d4019084a8fc323aae9de544aef7c717bff.zip | |
system/openssl: bump to 1.0.2r
| -rw-r--r-- | system/openssl/0002-busybox-basename.patch | 34 | ||||
| -rw-r--r-- | system/openssl/APKBUILD | 10 |
2 files changed, 6 insertions, 38 deletions
diff --git a/system/openssl/0002-busybox-basename.patch b/system/openssl/0002-busybox-basename.patch deleted file mode 100644 index 9bbc284f3..000000000 --- a/system/openssl/0002-busybox-basename.patch +++ /dev/null @@ -1,34 +0,0 @@ -From c276ddc394dd402327603959271eac63a2e1ec1c Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Timo=20Ter=C3=A4s?= <timo.teras@iki.fi> -Date: Thu, 5 Feb 2015 08:40:00 +0200 -Subject: [PATCH] busybox basename - ---- - Makefile.org | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/Makefile.org b/Makefile.org -index b7a3f96..035fa83 100644 ---- a/Makefile.org -+++ b/Makefile.org -@@ -649,7 +649,7 @@ install_docs: - filecase=-i; \ - esac; \ - set -e; for i in doc/apps/*.pod; do \ -- fn=`basename $$i .pod`; \ -+ fn=`basename $$i .pod || true`; \ - sec=`$(PERL) util/extract-section.pl 1 < $$i`; \ - echo "installing man$$sec/$$fn.$${sec}$(MANSUFFIX)"; \ - (cd `$(PERL) util/dirname.pl $$i`; \ -@@ -666,7 +666,7 @@ install_docs: - done); \ - done; \ - set -e; for i in doc/crypto/*.pod doc/ssl/*.pod; do \ -- fn=`basename $$i .pod`; \ -+ fn=`basename $$i .pod || true`; \ - sec=`$(PERL) util/extract-section.pl 3 < $$i`; \ - echo "installing man$$sec/$$fn.$${sec}$(MANSUFFIX)"; \ - (cd `$(PERL) util/dirname.pl $$i`; \ --- -2.2.2 - diff --git a/system/openssl/APKBUILD b/system/openssl/APKBUILD index 7aeb36b7b..d6c3b979a 100644 --- a/system/openssl/APKBUILD +++ b/system/openssl/APKBUILD @@ -1,6 +1,6 @@ # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=openssl -pkgver=1.0.2p +pkgver=1.0.2r pkgrel=0 pkgdesc="Toolkit for SSL v2/v3 and TLS v1" url="https://www.openssl.org/" @@ -17,7 +17,6 @@ subpackages="$pkgname-dbg $pkgname-dev $pkgname-doc libcrypto1.0:libcrypto libssl1.0:libssl" source="http://www.openssl.org/source/${pkgname}-${pkgver}.tar.gz - 0002-busybox-basename.patch 0003-use-termios.patch 0004-fix-default-ca-path-for-apps.patch 0005-fix-parallel-build.patch @@ -63,6 +62,10 @@ source="http://www.openssl.org/source/${pkgname}-${pkgver}.tar.gz # - CVE-2018-0739 # - CVE-2018-0737 # - CVE-2018-0732 +# 1.0.2r-r0: +# - CVE-2018-0734 +# - CVE-2018-5407 +# - CVE-2019-1559 builddir="$srcdir"/$pkgname-$pkgver @@ -141,8 +144,7 @@ dev() { default_dev } -sha512sums="958c5a7c3324bbdc8f07dfb13e11329d9a1b4452c07cf41fbd2d42b5fe29c95679332a3476d24c2dc2b88be16e4a24744aba675a05a388c0905756c77a8a2f16 openssl-1.0.2p.tar.gz -2244f46cb18e6b98f075051dd2446c47f7590abccd108fbab707f168a20cad8d32220d704635973f09e3b2879f523be5160f1ffbc12ab3900f8a8891dc855c5c 0002-busybox-basename.patch +sha512sums="6eb2211f3ad56d7573ac26f388338592c37e5faaf5e2d44c0fa9062c12186e56a324f135d1c956a89b55fcce047e6428bec2756658d103e7275e08b46f741235 openssl-1.0.2r.tar.gz 58e42058a0c8086c49d681b1e226da39a8cf8cb88c51cf739dec2ff12e1bb5d7208ac5033264b186d58e9bdfe992fe9ddb95701d01caf1824396b2cefe30c0a4 0003-use-termios.patch c67472879a31b5dbdd313892df6d37e7c93e8c0237d406c30d50b1016c2618ead3c13277f5dc723ef1ceed092d36e3c15a9777daa844f59b9fa2b0a4f04fd9ae 0004-fix-default-ca-path-for-apps.patch 5d4191482f8bbf62c75fe6bc2d9587388022c3310703c2a913788a983b1d1406e706cf3916a5792604f0b0f220a87432d3b82b442cea9915f2abb6fdd8478fcb 0005-fix-parallel-build.patch |