Date: Wednesday, December 13, 2017 @ 09:56:04 Author: eworm Revision: 312219
archrelease: copy trunk to testing-x86_64 Added: git/repos/testing-x86_64/ git/repos/testing-x86_64/PKGBUILD (from rev 312218, git/trunk/PKGBUILD) git/repos/testing-x86_64/git-daemon.socket (from rev 312218, git/trunk/git-daemon.socket) git/repos/testing-x86_64/git-daemon@.service (from rev 312218, git/trunk/git-daemon@.service) git/repos/testing-x86_64/git-sysusers.conf (from rev 312218, git/trunk/git-sysusers.conf) git/repos/testing-x86_64/git.install (from rev 312218, git/trunk/git.install) ---------------------+ PKGBUILD | 136 ++++++++++++++++++++++++++++++++++++++++++++++++++ git-daemon.socket | 9 +++ git-daemon@.service | 14 +++++ git-sysusers.conf | 1 git.install | 21 +++++++ 5 files changed, 181 insertions(+) Copied: git/repos/testing-x86_64/PKGBUILD (from rev 312218, git/trunk/PKGBUILD) =================================================================== --- testing-x86_64/PKGBUILD (rev 0) +++ testing-x86_64/PKGBUILD 2017-12-13 09:56:04 UTC (rev 312219) @@ -0,0 +1,136 @@ +# $Id$ +# Maintainer: Christian Hesse <m...@eworm.de> +# Maintainer: Dan McGee <d...@archlinux.org> + +pkgname=git +pkgver=2.15.1 +pkgrel=2 +pkgdesc="the fast distributed version control system" +arch=(x86_64) +url="http://git-scm.com/" +license=('GPL2') +depends=('curl' 'expat>=2.0' 'perl-error' 'perl>=5.14.0' 'openssl' 'pcre2' + 'grep' 'shadow') +makedepends=('python2' 'emacs' 'libgnome-keyring' 'xmlto' 'asciidoc') +optdepends=('tk: gitk and git gui' + 'perl-libwww: git svn' + 'perl-term-readkey: git svn' + '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') +replaces=('git-core') +provides=('git-core') +install=git.install +validpgpkeys=('96E07AF25771955980DAD10020D04E5A713660A7') # Junio C Hamano +source=("https://www.kernel.org/pub/software/scm/git/git-$pkgver.tar."{xz,sign} + 'git-daemon@.service' + 'git-daemon.socket' + 'git-sysusers.conf') +sha256sums=('999c90fd7d45066992cdb87dda35bdff6dfc1d01496118ea718dfb866da4045c' + 'SKIP' + '14c0b67cfe116b430645c19d8c4759419657e6809dfa28f438c33a005245ad91' + 'ac4c90d62c44926e6d30d18d97767efc901076d4e0283ed812a349aece72f203' + '595794856bfa6087c33826640ae7b5447832233844f36dfedc18646d47154730') + +build() { + export PYTHON_PATH='/usr/bin/python2' + cd "$srcdir/$pkgname-$pkgver" + make prefix=/usr gitexecdir=/usr/lib/git-core \ + CFLAGS="$CFLAGS" LDFLAGS="$LDFLAGS" \ + USE_LIBPCRE2=1 \ + NO_CROSS_DIRECTORY_HARDLINKS=1 \ + MAN_BOLD_LITERAL=1 \ + all doc + + make -C contrib/emacs prefix=/usr + make -C contrib/credential/gnome-keyring + make -C contrib/credential/libsecret + make -C contrib/subtree prefix=/usr gitexecdir=/usr/lib/git-core all doc + make -C contrib/mw-to-git prefix=/usr all + make -C contrib/diff-highlight prefix=/usr +} + +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 prefix=/usr gitexecdir=/usr/lib/git-core \ + CFLAGS="$CFLAGS" LDFLAGS="$LDFLAGS" \ + USE_LIBPCRE2=1 \ + NO_CROSS_DIRECTORY_HARDLINKS=1 \ + MAN_BOLD_LITERAL=1 \ + 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 prefix=/usr gitexecdir=/usr/lib/git-core \ + CFLAGS="$CFLAGS" LDFLAGS="$LDFLAGS" \ + USE_LIBPCRE2=1 \ + NO_CROSS_DIRECTORY_HARDLINKS=1 \ + MAN_BOLD_LITERAL=1 \ + INSTALLDIRS=vendor DESTDIR="$pkgdir" install install-doc + + # 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 + # emacs + make -C contrib/emacs prefix=/usr DESTDIR="$pkgdir" install + # gnome credentials helper + 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 prefix=/usr gitexecdir=/usr/lib/git-core DESTDIR="$pkgdir" install install-doc + # mediawiki installation + make -C contrib/mw-to-git prefix=/usr gitexecdir=/usr/lib/git-core 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 + + # perl modules from contrib/ install to site dir... move to vendor + mv "$pkgdir"/usr/share/perl5/site_perl/Git/* "$pkgdir"/usr/share/perl5/vendor_perl/Git/ + rm -rf "$pkgdir"/usr/share/perl5/site_perl + # remove perllocal.pod, .packlist, and empty directories. + rm -rf "$pkgdir"/usr/lib/perl5 + + # git-daemon via systemd socket activation + install -D -m 0644 "$srcdir"/git-daemon@.service "$pkgdir"/usr/lib/systemd/system/git-daemon@.service + install -D -m 0644 "$srcdir"/git-daemon.socket "$pkgdir"/usr/lib/systemd/system/git-daemon.socket + + # sysusers file + install -D -m 0644 "$srcdir"/git-sysusers.conf "$pkgdir"/usr/lib/sysusers.d/git.conf +} Copied: git/repos/testing-x86_64/git-daemon.socket (from rev 312218, git/trunk/git-daemon.socket) =================================================================== --- testing-x86_64/git-daemon.socket (rev 0) +++ testing-x86_64/git-daemon.socket 2017-12-13 09:56:04 UTC (rev 312219) @@ -0,0 +1,9 @@ +[Unit] +Description=Git Daemon Socket + +[Socket] +ListenStream=9418 +Accept=true + +[Install] +WantedBy=sockets.target Copied: git/repos/testing-x86_64/git-daemon@.service (from rev 312218, git/trunk/git-daemon@.service) =================================================================== --- testing-x86_64/git-daemon@.service (rev 0) +++ testing-x86_64/git-daemon@.service 2017-12-13 09:56:04 UTC (rev 312219) @@ -0,0 +1,14 @@ +[Unit] +Description=Git Daemon Instance + +[Service] +User=git +# The '-' is to ignore non-zero exit statuses +ExecStart=-/usr/lib/git-core/git-daemon --inetd --export-all --base-path=/srv/git +StandardInput=socket +StandardOutput=inherit +StandardError=journal +ProtectSystem=full +ProtectHome=on +PrivateDevices=on +NoNewPrivileges=on Copied: git/repos/testing-x86_64/git-sysusers.conf (from rev 312218, git/trunk/git-sysusers.conf) =================================================================== --- testing-x86_64/git-sysusers.conf (rev 0) +++ testing-x86_64/git-sysusers.conf 2017-12-13 09:56:04 UTC (rev 312219) @@ -0,0 +1 @@ +u git - "git daemon user" / Copied: git/repos/testing-x86_64/git.install (from rev 312218, git/trunk/git.install) =================================================================== --- testing-x86_64/git.install (rev 0) +++ testing-x86_64/git.install 2017-12-13 09:56:04 UTC (rev 312219) @@ -0,0 +1,21 @@ +#!/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 + + # make sure the user exists... + systemd-sysusers git.conf + + # ... and change the shell. This is done only once in post-install + # function, so an administrative change is persistent. + chsh --shell /usr/bin/git-shell git > /dev/null +} + +# do not modify user settings (shell) in post-upgrade function! + +post_remove() { + sed -i -r '/^\/usr\/bin\/git-shell$/d' etc/shells +}