summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorA. Wilcox <awilcox@wilcox-tech.com>2019-12-22 02:44:46 +0000
committerA. Wilcox <awilcox@wilcox-tech.com>2019-12-22 02:44:46 +0000
commita24bcf8622ec851fd7171293c03b609f3433f9cd (patch)
treeabb818127d519f80b1ab4bdf27b3274c3b28edc5
parent821a2d880672b2266f3494119e231797113adeb1 (diff)
parentbcf59c2bb3e2e9c42ed6d97c213a1f12feef4019 (diff)
downloadpackages-a24bcf8622ec851fd7171293c03b609f3433f9cd.tar.gz
packages-a24bcf8622ec851fd7171293c03b609f3433f9cd.tar.bz2
packages-a24bcf8622ec851fd7171293c03b609f3433f9cd.tar.xz
packages-a24bcf8622ec851fd7171293c03b609f3433f9cd.zip
Merge branch 'sysv.git.cve' into 'master'
secbump git to 2.24.1 See merge request adelie/packages!380
-rw-r--r--system/git/APKBUILD14
1 files changed, 12 insertions, 2 deletions
diff --git a/system/git/APKBUILD b/system/git/APKBUILD
index 35b792322..ba6a1b3fd 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.24.0
+pkgver=2.24.1
pkgrel=0
pkgdesc="Distributed version control system"
url="https://www.git-scm.com/"
@@ -32,6 +32,16 @@ source="https://www.kernel.org/pub/software/scm/git/git-$pkgver.tar.xz
_gitcoredir=/usr/libexec/git-core
# secfixes:
+# 2.24.1
+# - CVE-2019-1348
+# - CVE-2019-1349
+# - CVE-2019-1350
+# - CVE-2019-1351
+# - CVE-2019-1352
+# - CVE-2019-1353
+# - CVE-2019-1354
+# - CVE-2019-1387
+# - CVE-2019-19604
# 2.19.2:
# - CVE-2018-19486
# 2.14.1:
@@ -163,7 +173,7 @@ subtree_doc() {
gzip -9 "$subpkgdir"/usr/share/man/man1/git-subtree.1
}
-sha512sums="31c8c001fdea3b1e3e732cc42299979f1329d564f76d3950c90a0090afc1fa1ba50bdb7f86da92066843887986cc73a34c13dd651566d1af9036ecbe8aee42c3 git-2.24.0.tar.xz
+sha512sums="010c13d4023c142876d0e075a394b74bef422944d8ca602325d0b2b47bf28b1d534283c7f295751113c83fdfcc0c91f97090e8f906560d44b04a94607fd8fcf7 git-2.24.1.tar.xz
315e4666c425b31a7f7a447e777cbf2a1050feac9b4d4b8a61c05248024e790d4d18f3336faf2a2c68584e05e8194c22a09e1caba1352cfec194e0bc01277a6c dont-test-other-encodings.patch
89528cdd14c51fd568aa61cf6c5eae08ea0844e59f9af9292da5fc6c268261f4166017d002d494400945e248df6b844e2f9f9cd2d9345d516983f5a110e4c42a git-daemon.initd
fbf1f425206a76e2a8f82342537ed939ff7e623d644c086ca2ced5f69b36734695f9f80ebda1728f75a94d6cd2fcb71bf845b64239368caab418e4d368c141ec git-daemon.confd"