summaryrefslogtreecommitdiff
path: root/system
diff options
context:
space:
mode:
authorA. Wilcox <awilcox@wilcox-tech.com>2020-04-18 02:04:17 +0000
committerA. Wilcox <awilcox@wilcox-tech.com>2020-04-18 02:04:17 +0000
commit9b25385882dc8558163704c20233473585d1e5b9 (patch)
tree7096d1efeeeb8dfcf552a0d49d48757265813bdf /system
parent5959188441f553615cc38463766d420730676ad2 (diff)
parent6cc457e46d466f401c524303f2519fa89d4b5dbc (diff)
downloadpackages-9b25385882dc8558163704c20233473585d1e5b9.tar.gz
packages-9b25385882dc8558163704c20233473585d1e5b9.tar.bz2
packages-9b25385882dc8558163704c20233473585d1e5b9.tar.xz
packages-9b25385882dc8558163704c20233473585d1e5b9.zip
Merge branch 'sec/2020.04.06' into 'master'
Security updates for 2020.04.06 See merge request adelie/packages!427
Diffstat (limited to 'system')
-rw-r--r--system/git/APKBUILD34
1 files changed, 18 insertions, 16 deletions
diff --git a/system/git/APKBUILD b/system/git/APKBUILD
index 45d7b033b..8e9a1373d 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.1
+pkgver=2.25.3
pkgrel=0
pkgdesc="Distributed version control system"
url="https://www.git-scm.com/"
@@ -33,20 +33,22 @@ 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:
-# - CVE-2017-1000117
+# 2.25.3-r0:
+# - CVE-2020-5260
+# 2.24.1-r0:
+# - 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-r0:
+# - CVE-2018-19486
+# 2.14.1-r0:
+# - CVE-2017-1000117
prepare() {
default_prepare
@@ -173,7 +175,7 @@ subtree_doc() {
gzip -9 "$subpkgdir"/usr/share/man/man1/git-subtree.1
}
-sha512sums="15241143acfd8542d85d2709ac3c80dbd6e8d5234438f70c4f33cc71a2bdec3e32938df7f6351e2746d570b021d3bd0b70474ea4beec0c51d1fc45f9c287b344 git-2.25.1.tar.xz
+sha512sums="1ea2f0727baa29200f33469463c3b6db04a2e228e83ff552faa47fefe31063d92966d7502b2f13546c36cfc2756d42d71a26e41141c0fb972af9d6760f3aa471 git-2.25.3.tar.xz
0a0935d876024d96156df3aeec06b47fd9e370484d4552786c450cb500ae671a631e64c30994ec39f43a2f313f75d68909688ea92b47327d1af65e365dc77480 dont-test-other-encodings.patch
89528cdd14c51fd568aa61cf6c5eae08ea0844e59f9af9292da5fc6c268261f4166017d002d494400945e248df6b844e2f9f9cd2d9345d516983f5a110e4c42a git-daemon.initd
fbf1f425206a76e2a8f82342537ed939ff7e623d644c086ca2ced5f69b36734695f9f80ebda1728f75a94d6cd2fcb71bf845b64239368caab418e4d368c141ec git-daemon.confd"