diff options
Diffstat (limited to 'system/git')
| -rw-r--r-- | system/git/APKBUILD | 37 |
1 files changed, 23 insertions, 14 deletions
diff --git a/system/git/APKBUILD b/system/git/APKBUILD index 505ae0a0d..07adcfdaa 100644 --- a/system/git/APKBUILD +++ b/system/git/APKBUILD @@ -1,21 +1,16 @@ # 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="A distributed version control system" +pkgdesc="Distributed version control system" url="https://www.git-scm.com/" arch="all" license="GPL-2.0+" depends="perl-error" -replaces="git-perl perl-git" - -# secfixes: -# 2.19.2: -# - CVE-2018-19486 -# 2.14.1: -# - CVE-2017-1000117 - +checkdepends="python3" +makedepends="zlib-dev openssl-dev curl-dev expat-dev perl-dev + pcre2-dev asciidoctor xmlto perl-error docbook-xsl-ns" # note that order matters subpackages="$pkgname-doc $pkgname-bash-completion:completion:noarch @@ -28,9 +23,7 @@ subpackages="$pkgname-doc $pkgname-subtree::noarch $pkgname-subtree-doc:subtree_doc:noarch " -makedepends="zlib-dev openssl-dev curl-dev expat-dev perl-dev - pcre2-dev asciidoctor xmlto perl-error docbook-xsl-ns" -checkdepends="python3" +replaces="git-perl perl-git" source="https://www.kernel.org/pub/software/scm/git/git-$pkgver.tar.xz dont-test-other-encodings.patch git-daemon.initd @@ -38,6 +31,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 + prepare() { default_prepare cat >> config.mak <<-EOF @@ -164,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" |