diff options
| author | Natanael Copa <ncopa@alpinelinux.org> | 2018-04-03 19:20:07 +0000 |
|---|---|---|
| committer | Natanael Copa <ncopa@alpinelinux.org> | 2018-04-06 05:19:23 +0000 |
| commit | 4bba1c97a7bcdb124f871d80b06455a8da6c7688 (patch) | |
| tree | ce59bcd64ab52baac2b12a59bf117e083eac1c8e /main/git | |
| parent | 71a4eb4092b9dc0348ecc99cb6fa399e8c329b25 (diff) | |
| download | aports-4bba1c97a7bcdb124f871d80b06455a8da6c7688.tar.bz2 aports-4bba1c97a7bcdb124f871d80b06455a8da6c7688.tar.xz | |
main/git: upgrade to 2.17.0
Diffstat (limited to 'main/git')
| -rw-r--r-- | main/git/APKBUILD | 18 |
1 files changed, 8 insertions, 10 deletions
diff --git a/main/git/APKBUILD b/main/git/APKBUILD index 117fd13de5..1113e6dd9a 100644 --- a/main/git/APKBUILD +++ b/main/git/APKBUILD @@ -5,8 +5,8 @@ # 2.14.1: # - CVE-2017-1000117 pkgname=git -pkgver=2.16.3 -pkgrel=1 +pkgver=2.17.0 +pkgrel=0 pkgdesc="Distributed version control system" url="https://www.git-scm.com" arch="all" @@ -60,16 +60,15 @@ prepare() { build() { cd "$builddir" - - make -j1 prefix=/usr DESTDIR="$pkgdir" perl/perl.mak - make prefix=/usr DESTDIR="$pkgdir" + make prefix=/usr DESTDIR="$pkgdir" perllibdir=$(_perl_config vendorlib) } package() { cd "$builddir" - make -j1 prefix=/usr DESTDIR="$pkgdir" INSTALLDIRS=vendor install - make prefix=/usr DESTDIR="$pkgdir" install-man + make prefix=/usr DESTDIR="$pkgdir" INSTALLDIRS=vendor \ + perllibdir=$(_perl_config vendorlib) \ + install install-man mkdir -p "$pkgdir"/var/git install -Dm755 "$srcdir"/git-daemon.initd "$pkgdir"/etc/init.d/git-daemon @@ -95,6 +94,7 @@ _perl_git() { local i for i in "$(_perl_config vendorlib)" "$(_perl_config vendorarch)"; do + [ -d "$pkgdir/$i" ] || continue mkdir -p "$subpkgdir"/${i%/*} mv "$pkgdir"/$i "$subpkgdir"/$i done @@ -248,8 +248,6 @@ _git_perl() { replaces="" mkdir -p "$subpkgdir"/usr/lib - mv "$pkgdir"/usr/lib/perl* "$subpkgdir"/usr/lib/ - cd "$pkgdir" find -type f | xargs file --mime-type | grep perl | cut -d: -f1| while read f; do mkdir -p "$subpkgdir"/${f%/*} @@ -263,7 +261,7 @@ _perl_config() { perl -e "use Config; print \$Config{$1};" } -sha512sums="73520cf3500b2d13b77eb1e5ec0d60263aad07732d25631732f0d986abd023f97b8a6db4abff64d342cb053018289b5f7a3e32f10b86bd9092a37ee0585adc8a git-2.16.3.tar.xz +sha512sums="dab1c1d5d384b36720abc049a66ba60631e17958b214cfbec467be7adc02e82190e5282554da71797892c16bfe52d65b6244a281f504385083125bcb98ec7ee9 git-2.17.0.tar.xz 85767b5e03137008d6a96199e769e3979f75d83603ac8cb13a3481a915005637409a4fd94e0720da2ec6cd1124f35eba7cf20109a94816c4b4898a81fbc46bd2 bb-tar.patch 89528cdd14c51fd568aa61cf6c5eae08ea0844e59f9af9292da5fc6c268261f4166017d002d494400945e248df6b844e2f9f9cd2d9345d516983f5a110e4c42a git-daemon.initd fbf1f425206a76e2a8f82342537ed939ff7e623d644c086ca2ced5f69b36734695f9f80ebda1728f75a94d6cd2fcb71bf845b64239368caab418e4d368c141ec git-daemon.confd" |