diff options
Diffstat (limited to 'system/git/APKBUILD')
| -rw-r--r-- | system/git/APKBUILD | 68 |
1 files changed, 37 insertions, 31 deletions
diff --git a/system/git/APKBUILD b/system/git/APKBUILD index 4fb71e2a5..0562bfba2 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.22.1 -pkgrel=0 -pkgdesc="A distributed version control system" +pkgver=2.40.0 +pkgrel=1 +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 @@ -24,24 +19,44 @@ subpackages="$pkgname-doc $pkgname-cvs::noarch $pkgname-p4::noarch $pkgname-daemon - $pkgname-gitweb + $pkgname-gitweb::noarch $pkgname-subtree::noarch - $pkgname-subtree-doc:subtree_doc:noarch + $pkgname-lang " -makedepends="zlib-dev openssl-dev curl-dev expat-dev perl-dev - pcre2-dev asciidoctor xmlto perl-error" -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 git-daemon.confd + + disable-t2082-2.patch + perl-getopt-long.patch " _gitcoredir=/usr/libexec/git-core +# secfixes: +# 2.25.4-r0: +# - CVE-2020-11008 +# 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 cat >> config.mak <<-EOF - NO_GETTEXT=YesPlease NO_SVN_TESTS=YesPlease NO_REGEX=YesPlease USE_ASCIIDOCTOR=1 @@ -57,7 +72,6 @@ build() { } check() { - rm t/t9020-remote-svn.sh # Requires /usr/bin/python / python-compat. make prefix=/usr DESTDIR="$pkgdir" -j1 test } @@ -154,17 +168,9 @@ subtree() { make install prefix=/usr DESTDIR="$subpkgdir" } -subtree_doc() { - depends="" - pkgdesc="Split git repository into subtrees (documentation)" - replaces="" - - cd "$builddir"/contrib/subtree - make install-man prefix=/usr DESTDIR="$subpkgdir" - gzip -9 "$subpkgdir"/usr/share/man/man1/git-subtree.1 -} - -sha512sums="8fa0900e1a583cdacbafa2e0d00a4cb50ad225c11227f6a811b721e56677b62b1354995e2b7117a66b1e89dbcb2cddc1eee7ef1e57723d9615a063a318095f14 git-2.22.1.tar.xz -315e4666c425b31a7f7a447e777cbf2a1050feac9b4d4b8a61c05248024e790d4d18f3336faf2a2c68584e05e8194c22a09e1caba1352cfec194e0bc01277a6c dont-test-other-encodings.patch +sha512sums="a2720f8f9a0258c0bb5e23badcfd68a147682e45a5d039a42c47128296c508109d5039029db89311a35db97a9008585e84ed11b400846502c9be913d67f0fd90 git-2.40.0.tar.xz +4bcc8367478601c856e0977d46fc4842f62daf300093a576704ad27ccd9fae975f95d3fbfcb00e9fa7254b1db64cd074f49a94fb5cf0abd8d72d7edc9ab8798c dont-test-other-encodings.patch 89528cdd14c51fd568aa61cf6c5eae08ea0844e59f9af9292da5fc6c268261f4166017d002d494400945e248df6b844e2f9f9cd2d9345d516983f5a110e4c42a git-daemon.initd -fbf1f425206a76e2a8f82342537ed939ff7e623d644c086ca2ced5f69b36734695f9f80ebda1728f75a94d6cd2fcb71bf845b64239368caab418e4d368c141ec git-daemon.confd" +fbf1f425206a76e2a8f82342537ed939ff7e623d644c086ca2ced5f69b36734695f9f80ebda1728f75a94d6cd2fcb71bf845b64239368caab418e4d368c141ec git-daemon.confd +6d7cbb701584a078328056a67bfd32dde5795a80c0911734b38bd534699fb0165ac2b486b267c5c39b90bbb0d7c5ab0ab6ada1d068748865617326da28304eb4 disable-t2082-2.patch +9800318f9e6a8b6bfd8c700cce5cc326522a607b89236a868ef46940efe0566fdadf5d69dc3e72f989d61df66be8510b8989bd4ce3fc780f017f30652c7e9efa perl-getopt-long.patch" |