diff options
| author | A. Wilcox <awilcox@wilcox-tech.com> | 2020-05-05 03:31:05 +0000 |
|---|---|---|
| committer | A. Wilcox <awilcox@wilcox-tech.com> | 2020-05-05 03:31:05 +0000 |
| commit | 5fb8228fc2a207f2ff6ae3ad98328a7664da0480 (patch) | |
| tree | 18465a76a63599a5c9edf78383aed30cf8c5f7c4 /system | |
| parent | 9680fd28fc8dd8ff8abcb504a0f820ad655d5dfb (diff) | |
| parent | 5df19234b438dd8d1d876033a8987e563c033c1a (diff) | |
| download | packages-5fb8228fc2a207f2ff6ae3ad98328a7664da0480.tar.gz packages-5fb8228fc2a207f2ff6ae3ad98328a7664da0480.tar.bz2 packages-5fb8228fc2a207f2ff6ae3ad98328a7664da0480.tar.xz packages-5fb8228fc2a207f2ff6ae3ad98328a7664da0480.zip | |
Merge branch 'sec/2020.04.20' into 'master'
Security updates for 2020.04.20
See merge request adelie/packages!441
Diffstat (limited to 'system')
| -rw-r--r-- | system/git/APKBUILD | 6 | ||||
| -rw-r--r-- | system/openssl/APKBUILD | 6 |
2 files changed, 8 insertions, 4 deletions
diff --git a/system/git/APKBUILD b/system/git/APKBUILD index e8f9a27b0..04762f7ef 100644 --- a/system/git/APKBUILD +++ b/system/git/APKBUILD @@ -1,7 +1,7 @@ # Contributor: Łukasz Jendrysik <scadu@yandex.com> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=git -pkgver=2.25.3 +pkgver=2.25.4 pkgrel=0 pkgdesc="Distributed version control system" url="https://www.git-scm.com/" @@ -32,6 +32,8 @@ source="https://www.kernel.org/pub/software/scm/git/git-$pkgver.tar.xz _gitcoredir=/usr/libexec/git-core # secfixes: +# 2.25.4-r0: +# - CVE-2020-11008 # 2.25.3-r0: # - CVE-2020-5260 # 2.24.1-r0: @@ -164,7 +166,7 @@ subtree() { make install prefix=/usr DESTDIR="$subpkgdir" } -sha512sums="1ea2f0727baa29200f33469463c3b6db04a2e228e83ff552faa47fefe31063d92966d7502b2f13546c36cfc2756d42d71a26e41141c0fb972af9d6760f3aa471 git-2.25.3.tar.xz +sha512sums="ca2ecc561d06dbb393fe47d445f0d69423d114766d9bcc125ef1d6d37e350ad903c456540cea420c1a51635b750cde3901e4196f29ce95b315fda11270173450 git-2.25.4.tar.xz 0a0935d876024d96156df3aeec06b47fd9e370484d4552786c450cb500ae671a631e64c30994ec39f43a2f313f75d68909688ea92b47327d1af65e365dc77480 dont-test-other-encodings.patch 89528cdd14c51fd568aa61cf6c5eae08ea0844e59f9af9292da5fc6c268261f4166017d002d494400945e248df6b844e2f9f9cd2d9345d516983f5a110e4c42a git-daemon.initd fbf1f425206a76e2a8f82342537ed939ff7e623d644c086ca2ced5f69b36734695f9f80ebda1728f75a94d6cd2fcb71bf845b64239368caab418e4d368c141ec git-daemon.confd" diff --git a/system/openssl/APKBUILD b/system/openssl/APKBUILD index de6ae0084..dde5f8603 100644 --- a/system/openssl/APKBUILD +++ b/system/openssl/APKBUILD @@ -1,6 +1,6 @@ # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=openssl -pkgver=1.1.1f +pkgver=1.1.1g pkgrel=0 pkgdesc="Toolkit for SSL and TLS" url="https://www.openssl.org/" @@ -58,6 +58,8 @@ source="https://www.openssl.org/source/${pkgname}-${pkgver}.tar.gz # - CVE-2019-1563 # 1.1.1d-r0: # - CVE-2019-1551 +# 1.1.1g-r0: +# - CVE-2020-1967 build() { # openssl will prepend crosscompile always core CC et al @@ -127,6 +129,6 @@ libssl() { done } -sha512sums="b00bd9b5ad5298fbceeec6bb19c1ab0c106ca5cfb31178497c58bf7e0e0cf30fcc19c20f84e23af31cc126bf2447d3e4f8461db97bafa7bd78f69561932f000c openssl-1.1.1f.tar.gz +sha512sums="01e3d0b1bceeed8fb066f542ef5480862001556e0f612e017442330bbd7e5faee228b2de3513d7fc347446b7f217e27de1003dc9d7214d5833b97593f3ec25ab openssl-1.1.1g.tar.gz c164dd528d7408b8b2a52a0b181f2066ff00feb635df863bdeb4ce879db9ecdf7dd9033bb14b63ee5239aa814d5d777a86bb99cc37ecedae2d77a6bd86144b88 ppc-auxv.patch e040f23770d52b988578f7ff84d77563340f37c026db7643db8e4ef18e795e27d10cb42cb8656da4d9c57a28283a2828729d70f940edc950c3422a54fea55509 ppc64.patch" |