git: 3.15 - update to 2.37.3

3.15-stable
parent a04ed1ba21
commit 229d564f8a
  1. 68
      main/git/APKBUILD

@ -34,15 +34,23 @@
# - CVE-2021-46101
pkgname=git
pkgver=2.37.1
pkgrel=2
pkgver=2.37.3
pkgrel=1
pkgdesc="Distributed version control system"
url="https://www.git-scm.com/"
arch="all"
license="GPL-2.0-or-later"
# we need tcl and tk to be built before git due to git-gui and gitk
makedepends="zlib-dev openssl1.1-compat-dev curl-dev expat-dev perl-dev
pcre2-dev xmlto perl-error"
makedepends="
curl-dev
expat-dev
openssl-dev
pcre2-dev
perl-dev
perl-error
xmlto
zlib-dev
"
# note that order matters
subpackages="$pkgname-dbg
$pkgname-bash-completion
@ -80,6 +88,13 @@ if [ -z "$BOOTSTRAP" ]; then
"
fi
case "$CARCH" in
s390x)
# todo: they fail with strange between-test email mismatches
options="$options !check"
;;
esac
prepare() {
default_prepare
@ -87,10 +102,14 @@ prepare() {
NO_GETTEXT=YesPlease
NO_SVN_TESTS=YesPlease
NO_REGEX=YesPlease
USE_LIBPCRE2=YesPlease
NO_SYS_POLL_H=1
CFLAGS=$CFLAGS
ICONV_OMITS_BOM=Yes
INSTALL_SYMLINKS=1
CC=${CC:-cc}
CXX=${CC:-c++}
CFLAGS=$CFLAGS
LDFLAGS=$LDFLAGS
USE_LIBPCRE2=YesPlease
PYTHON_PATH=/usr/bin/python3
EOF
@ -103,32 +122,36 @@ prepare() {
}
build() {
make prefix=/usr DESTDIR="$pkgdir" perllibdir=$(_perl_config vendorlib)
make prefix=/usr \
DESTDIR="$pkgdir" \
perllibdir="$(_perl_config vendorlib)" \
all
if [ -z "$BOOTSTRAP" ]; then
# generate manpages outside of package()
make prefix=/usr man
cd "$builddir"/contrib/credential/libsecret
make prefix=/usr
make prefix=/usr -C contrib/credential/libsecret
fi
}
check() {
make prefix=/usr DESTDIR="$pkgdir" \
perlibdir=$(_perl_config vendorlib) \
test
make -C t prefix=/usr DESTDIR="$pkgdir" \
perlibdir="$(_perl_config vendorlib)" \
all
}
package() {
local install_man
install_man=install-man
if [ -n "$BOOTSTRAP" ]; then
install_man=""
if [ -z "$BOOTSTRAP" ]; then
local install_man=install-man
fi
make prefix=/usr DESTDIR="$pkgdir" INSTALLDIRS=vendor \
perllibdir=$(_perl_config vendorlib) \
install $install_man
make prefix=/usr \
DESTDIR="$pkgdir" \
INSTALLDIRS=vendor \
perllibdir="$(_perl_config vendorlib)" \
install \
$install_man
mkdir -p "$pkgdir"/var/git
@ -146,9 +169,8 @@ package() {
_perl_git_svn() {
pkgdesc="Perl interface to Git::SVN"
depends="git=$pkgver-r$pkgrel perl-git=$pkgver-r$pkgrel"
local vendorlib
vendorlib=$(_perl_config vendorlib)
local vendorlib=$(_perl_config vendorlib)
mkdir -p "$subpkgdir"/$vendorlib/Git
mv "$pkgdir"/$vendorlib/Git/SVN* "$subpkgdir"/$vendorlib/Git/
@ -308,7 +330,7 @@ _git_perl() {
mkdir -p "$subpkgdir"/usr/lib
cd "$pkgdir"
find -type f | xargs file --mime-type | grep perl | cut -d: -f1| while read f; do
find . -type f -print0 | xargs -0 file --mime-type | grep perl | cut -d: -f1 | while read -r f; do
mkdir -p "$subpkgdir"/${f%/*}
mv "$f" "$subpkgdir"/${f%/*}
done
@ -321,7 +343,7 @@ _perl_config() {
}
sha512sums="
3c9cad6b4757f425ee53996d8d80db2226b246513cbcec9011022e02e4235d7ec38c7c1aada73bb3c9279a91d1aaf8664633356ce1dce847e0d371f702a5b766 git-2.37.1.tar.xz
9120050b01d8ac8d9f9e85f19cb84dc90c28f3beadc3ea94da94845f2eb5e35aa83eee8447a7ecef5190b8eb5d01be621be2e82bb3020e51e05037cd1fa9b58f git-2.37.3.tar.xz
89528cdd14c51fd568aa61cf6c5eae08ea0844e59f9af9292da5fc6c268261f4166017d002d494400945e248df6b844e2f9f9cd2d9345d516983f5a110e4c42a git-daemon.initd
fbf1f425206a76e2a8f82342537ed939ff7e623d644c086ca2ced5f69b36734695f9f80ebda1728f75a94d6cd2fcb71bf845b64239368caab418e4d368c141ec git-daemon.confd
be5d568fc5b8b84c9afb97b31e471e41f32ccfe188eba0588ea0ef98b2d96c2ce4b2c1a3d70e88205aa4f6667f850b3f32c13bbb149ecddbf670344c162a4e25 fix-t4219-with-sticky-bit.patch

Loading…
Cancel
Save