Browse Source

[testing] -> [extra] 'git-2.22.0-1' move

master
artoo 2 months ago
parent
commit
af609631e7
Signed by: artoo <artoo@artixlinux.org> GPG Key ID: 3292CD0BB0DB310B

+ 2
- 2
git/repos/extra-x86_64/PKGBUILD View File

@@ -2,7 +2,7 @@
# Maintainer: Dan McGee <dan@archlinux.org>

pkgname=git
pkgver=2.21.0
pkgver=2.22.0
pkgrel=1
pkgdesc='the fast distributed version control system'
arch=(x86_64)
@@ -29,7 +29,7 @@ install=git.install
validpgpkeys=('96E07AF25771955980DAD10020D04E5A713660A7') # Junio C Hamano
source=("https://www.kernel.org/pub/software/scm/git/git-$pkgver.tar."{xz,sign}
'git-sysusers.conf')
sha256sums=('8ccb1ce743ee991d91697e163c47c11be4bf81efbdd9fb0b4a7ad77cc0020d28'
sha256sums=('159e4b599f8af4612e70b666600a3139541f8bacc18124daf2cbe8d1b934f29f'
'SKIP'
'7630e8245526ad80f703fac9900a1328588c503ce32b37b9f8811674fcda4a45')


+ 0
- 131
git/repos/testing-x86_64/PKGBUILD View File

@@ -1,131 +0,0 @@
# Maintainer: Christian Hesse <mail@eworm.de>
# Maintainer: Dan McGee <dan@archlinux.org>

pkgname=git
pkgver=2.22.0
pkgrel=1
pkgdesc='the fast distributed version control system'
arch=(x86_64)
url='https://git-scm.com/'
license=('GPL2')
depends=('curl' 'expat' 'perl' 'perl-error' 'perl-mailtools'
'openssl' 'pcre2' 'grep' 'shadow')
makedepends=('python2' 'libgnome-keyring' 'xmlto' 'asciidoc')
optdepends=('tk: gitk and git gui'
'perl-libwww: git svn'
'perl-term-readkey: git svn and interactive.singlekey setting'
'perl-mime-tools: git send-email'
'perl-net-smtp-ssl: git send-email TLS support'
'perl-authen-sasl: git send-email TLS support'
'perl-mediawiki-api: git mediawiki support'
'perl-datetime-format-iso8601: git mediawiki support'
'perl-lwp-protocol-https: git mediawiki https support'
'perl-cgi: gitweb (web interface) support'
'python2: various helper scripts'
'subversion: git svn'
'gnome-keyring: GNOME keyring credential helper'
'libsecret: libsecret credential helper')
install=git.install
validpgpkeys=('96E07AF25771955980DAD10020D04E5A713660A7') # Junio C Hamano
source=("https://www.kernel.org/pub/software/scm/git/git-$pkgver.tar."{xz,sign}
'git-sysusers.conf')
sha256sums=('159e4b599f8af4612e70b666600a3139541f8bacc18124daf2cbe8d1b934f29f'
'SKIP'
'7630e8245526ad80f703fac9900a1328588c503ce32b37b9f8811674fcda4a45')

_make_paths=(
prefix='/usr'
gitexecdir='/usr/lib/git-core'
perllibdir="$(/usr/bin/perl -MConfig -wle 'print $Config{installvendorlib}')"
)

_make_options=(
CFLAGS="$CFLAGS"
LDFLAGS="$LDFLAGS"
USE_LIBPCRE2=1
NO_CROSS_DIRECTORY_HARDLINKS=1
NO_PERL_CPAN_FALLBACKS=1
MAN_BOLD_LITERAL=1
)

build() {
export PYTHON_PATH='/usr/bin/python2'
cd "$srcdir/$pkgname-$pkgver"

make \
"${_make_paths[@]}" \
"${_make_options[@]}" \
all man

make -C contrib/credential/gnome-keyring
make -C contrib/credential/libsecret
make -C contrib/subtree "${_make_paths[@]}" all man
make -C contrib/mw-to-git "${_make_paths[@]}" all
make -C contrib/diff-highlight "${_make_paths[@]}"
}

check() {
export PYTHON_PATH='/usr/bin/python2'
cd "$srcdir/$pkgname-$pkgver"

local jobs
jobs=$(expr "$MAKEFLAGS" : '.*\(-j[0-9]*\).*') || true
mkdir -p /dev/shm/git-test
# explicitly specify SHELL to avoid a test failure in t/t9903-bash-prompt.sh
# which is caused by 'git rebase' trying to use builduser's SHELL inside the
# build chroot (i.e.: /usr/bin/nologin)
SHELL=/bin/sh \
make \
"${_make_paths[@]}" \
"${_make_options[@]}" \
NO_SVN_TESTS=y \
DEFAULT_TEST_TARGET=prove \
GIT_PROVE_OPTS="$jobs -Q" \
GIT_TEST_OPTS="--root=/dev/shm/git-test" \
test
}

package() {
export PYTHON_PATH='/usr/bin/python2'
cd "$srcdir/$pkgname-$pkgver"

make \
"${_make_paths[@]}" \
"${_make_options[@]}" \
DESTDIR="$pkgdir" \
install install-man

# bash completion
mkdir -p "$pkgdir"/usr/share/bash-completion/completions/
install -m 0644 ./contrib/completion/git-completion.bash "$pkgdir"/usr/share/bash-completion/completions/git
# fancy git prompt
mkdir -p "$pkgdir"/usr/share/git/
install -m 0644 ./contrib/completion/git-prompt.sh "$pkgdir"/usr/share/git/git-prompt.sh
# gnome credentials helper (deprecated, but we will keep it as long there is no extra cost)
# https://gitlab.gnome.org/GNOME/libgnome-keyring/commit/6a5adea4aec93
install -m 0755 contrib/credential/gnome-keyring/git-credential-gnome-keyring \
"$pkgdir"/usr/lib/git-core/git-credential-gnome-keyring
make -C contrib/credential/gnome-keyring clean
# libsecret credentials helper
install -m 0755 contrib/credential/libsecret/git-credential-libsecret \
"$pkgdir"/usr/lib/git-core/git-credential-libsecret
make -C contrib/credential/libsecret clean
# subtree installation
make -C contrib/subtree "${_make_paths[@]}" DESTDIR="$pkgdir" install install-man
# mediawiki installation
make -C contrib/mw-to-git "${_make_paths[@]}" DESTDIR="$pkgdir" install
# the rest of the contrib stuff
find contrib/ -name '.gitignore' -delete
cp -a ./contrib/* $pkgdir/usr/share/git/

# scripts are for python 2.x
sed -i 's|#![ ]*/usr/bin/env python$|#!/usr/bin/env python2|' \
$(find "$pkgdir" -name '*.py') \
"$pkgdir"/usr/share/git/remote-helpers/git-remote-bzr \
"$pkgdir"/usr/share/git/remote-helpers/git-remote-hg
sed -i 's|#![ ]*/usr/bin/python$|#!/usr/bin/python2|' \
"$pkgdir"/usr/share/git/svn-fe/svnrdump_sim.py

# sysusers file
install -D -m 0644 "$srcdir"/git-sysusers.conf "$pkgdir"/usr/lib/sysusers.d/git.conf
}

+ 0
- 1
git/repos/testing-x86_64/git-sysusers.conf View File

@@ -1 +0,0 @@
u git - "git daemon user" / /usr/bin/git-shell

+ 0
- 14
git/repos/testing-x86_64/git.install View File

@@ -1,14 +0,0 @@
#!/bin/sh

post_install() {
# make git-shell a valid shell
if ! grep -qe '^/usr/bin/git-shell$' etc/shells; then
echo '/usr/bin/git-shell' >> etc/shells
fi
}

# do not modify user settings (shell) in post-upgrade function!

post_remove() {
sed -i -r '/^\/usr\/bin\/git-shell$/d' etc/shells
}

Loading…
Cancel
Save