Date: Saturday, May 31, 2014 @ 22:10:52 Author: dan Revision: 213933 archrelease: copy trunk to testing-i686, testing-x86_64
Added: git/repos/testing-i686/ git/repos/testing-i686/PKGBUILD (from rev 213932, git/trunk/PKGBUILD) git/repos/testing-i686/git-daemon.socket (from rev 213932, git/trunk/git-daemon.socket) git/repos/testing-i686/git-daemon@.service (from rev 213932, git/trunk/git-daemon@.service) git/repos/testing-i686/git.install (from rev 213932, git/trunk/git.install) git/repos/testing-x86_64/ git/repos/testing-x86_64/PKGBUILD (from rev 213932, git/trunk/PKGBUILD) git/repos/testing-x86_64/git-daemon.socket (from rev 213932, git/trunk/git-daemon.socket) git/repos/testing-x86_64/git-daemon@.service (from rev 213932, git/trunk/git-daemon@.service) git/repos/testing-x86_64/git.install (from rev 213932, git/trunk/git.install) ------------------------------------+ testing-i686/PKGBUILD | 113 +++++++++++++++++++++++++++++++++++ testing-i686/git-daemon.socket | 9 ++ testing-i686/git-daemon@.service | 10 +++ testing-i686/git.install | 21 ++++++ testing-x86_64/PKGBUILD | 113 +++++++++++++++++++++++++++++++++++ testing-x86_64/git-daemon.socket | 9 ++ testing-x86_64/git-daemon@.service | 10 +++ testing-x86_64/git.install | 21 ++++++ 8 files changed, 306 insertions(+) Copied: git/repos/testing-i686/PKGBUILD (from rev 213932, git/trunk/PKGBUILD) =================================================================== --- testing-i686/PKGBUILD (rev 0) +++ testing-i686/PKGBUILD 2014-05-31 20:10:52 UTC (rev 213933) @@ -0,0 +1,113 @@ +# $Id$ +# Maintainer: Dan McGee <d...@archlinux.org> + +pkgname=git +pkgver=2.0.0 +pkgrel=1 +pkgdesc="the fast distributed version control system" +arch=(i686 x86_64) +url="http://git-scm.com/" +license=('GPL2') +depends=('curl' 'expat>=2.0' 'perl-error' 'perl>=5.14.0' 'openssl' 'pcre') +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' + 'python2: various helper scripts' + 'subversion: git svn' + 'cvsps: git cvsimport' + 'gnome-keyring: GNOME keyring credential helper') +replaces=('git-core') +provides=('git-core') +install=git.install +source=("https://www.kernel.org/pub/software/scm/git/git-$pkgver.tar.xz" + git-daemon@.service + git-daemon.socket) + +build() { + export PYTHON_PATH='/usr/bin/python2' + cd "$srcdir/$pkgname-$pkgver" + make prefix=/usr gitexecdir=/usr/lib/git-core \ + CFLAGS="$CFLAGS" LDFLAGS="$LDFLAGS" \ + USE_LIBPCRE=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/subtree prefix=/usr all doc +} + +check() { + export PYTHON_PATH='/usr/bin/python2' + cd "$srcdir/$pkgname-$pkgver" + local jobs + jobs=$(expr "$MAKEFLAGS" : '.*\(-j[0-9]*\).*') + mkdir -p /dev/shm/git-test + make prefix=/usr gitexecdir=/usr/lib/git-core \ + CFLAGS="$CFLAGS" LDFLAGS="$LDFLAGS" \ + USE_LIBPCRE=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_LIBPCRE=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 -m644 ./contrib/completion/git-completion.bash "$pkgdir"/usr/share/bash-completion/completions/git + # fancy git prompt + mkdir -p "$pkgdir"/usr/share/git/ + install -m644 ./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 -m755 contrib/credential/gnome-keyring/git-credential-gnome-keyring \ + "$pkgdir"/usr/lib/git-core/git-credential-gnome-keyring + make -C contrib/credential/gnome-keyring clean + # subtree installation + sed "s|libexec/git-core|lib/git-core|" -i contrib/subtree/Makefile + make -C contrib/subtree prefix=/usr DESTDIR="$pkgdir" install install-doc + # the rest of the contrib stuff + 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/gitview/gitview \ + "$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 + + # remove perllocal.pod, .packlist, and empty directories. + rm -rf "$pkgdir"/usr/lib/perl5 + + # git-daemon via systemd socket activation + install -D -m 644 "$srcdir"/git-daemon@.service "$pkgdir"/usr/lib/systemd/system/git-daemon@.service + install -D -m 644 "$srcdir"/git-daemon.socket "$pkgdir"/usr/lib/systemd/system/git-daemon.socket +} + +md5sums=('560200d1db05a2dd2b8a2b3718655463' + '042524f942785772d7bd52a1f02fe5ae' + 'f67869315c2cc112e076f0c73f248002') +md5sums=('0646202ae979e4339f3e47f2375b5773' + '042524f942785772d7bd52a1f02fe5ae' + 'f67869315c2cc112e076f0c73f248002') Copied: git/repos/testing-i686/git-daemon.socket (from rev 213932, git/trunk/git-daemon.socket) =================================================================== --- testing-i686/git-daemon.socket (rev 0) +++ testing-i686/git-daemon.socket 2014-05-31 20:10:52 UTC (rev 213933) @@ -0,0 +1,9 @@ +[Unit] +Description=Git Daemon Socket + +[Socket] +ListenStream=9418 +Accept=true + +[Install] +WantedBy=sockets.target Copied: git/repos/testing-i686/git-daemon@.service (from rev 213932, git/trunk/git-daemon@.service) =================================================================== --- testing-i686/git-daemon@.service (rev 0) +++ testing-i686/git-daemon@.service 2014-05-31 20:10:52 UTC (rev 213933) @@ -0,0 +1,10 @@ +[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 Copied: git/repos/testing-i686/git.install (from rev 213932, git/trunk/git.install) =================================================================== --- testing-i686/git.install (rev 0) +++ testing-i686/git.install 2014-05-31 20:10:52 UTC (rev 213933) @@ -0,0 +1,21 @@ +post_install() { + if ! getent group git >/dev/null; then + groupadd --system git + fi + if ! getent passwd git >/dev/null; then + useradd --system -c 'git daemon user' -g git -d / -s /bin/bash git + fi +} + +post_upgrade() { + post_install $1 +} + +post_remove() { + if getent passwd git >/dev/null; then + userdel git + fi + if getent group git >/dev/null; then + groupdel git + fi +} Copied: git/repos/testing-x86_64/PKGBUILD (from rev 213932, git/trunk/PKGBUILD) =================================================================== --- testing-x86_64/PKGBUILD (rev 0) +++ testing-x86_64/PKGBUILD 2014-05-31 20:10:52 UTC (rev 213933) @@ -0,0 +1,113 @@ +# $Id$ +# Maintainer: Dan McGee <d...@archlinux.org> + +pkgname=git +pkgver=2.0.0 +pkgrel=1 +pkgdesc="the fast distributed version control system" +arch=(i686 x86_64) +url="http://git-scm.com/" +license=('GPL2') +depends=('curl' 'expat>=2.0' 'perl-error' 'perl>=5.14.0' 'openssl' 'pcre') +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' + 'python2: various helper scripts' + 'subversion: git svn' + 'cvsps: git cvsimport' + 'gnome-keyring: GNOME keyring credential helper') +replaces=('git-core') +provides=('git-core') +install=git.install +source=("https://www.kernel.org/pub/software/scm/git/git-$pkgver.tar.xz" + git-daemon@.service + git-daemon.socket) + +build() { + export PYTHON_PATH='/usr/bin/python2' + cd "$srcdir/$pkgname-$pkgver" + make prefix=/usr gitexecdir=/usr/lib/git-core \ + CFLAGS="$CFLAGS" LDFLAGS="$LDFLAGS" \ + USE_LIBPCRE=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/subtree prefix=/usr all doc +} + +check() { + export PYTHON_PATH='/usr/bin/python2' + cd "$srcdir/$pkgname-$pkgver" + local jobs + jobs=$(expr "$MAKEFLAGS" : '.*\(-j[0-9]*\).*') + mkdir -p /dev/shm/git-test + make prefix=/usr gitexecdir=/usr/lib/git-core \ + CFLAGS="$CFLAGS" LDFLAGS="$LDFLAGS" \ + USE_LIBPCRE=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_LIBPCRE=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 -m644 ./contrib/completion/git-completion.bash "$pkgdir"/usr/share/bash-completion/completions/git + # fancy git prompt + mkdir -p "$pkgdir"/usr/share/git/ + install -m644 ./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 -m755 contrib/credential/gnome-keyring/git-credential-gnome-keyring \ + "$pkgdir"/usr/lib/git-core/git-credential-gnome-keyring + make -C contrib/credential/gnome-keyring clean + # subtree installation + sed "s|libexec/git-core|lib/git-core|" -i contrib/subtree/Makefile + make -C contrib/subtree prefix=/usr DESTDIR="$pkgdir" install install-doc + # the rest of the contrib stuff + 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/gitview/gitview \ + "$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 + + # remove perllocal.pod, .packlist, and empty directories. + rm -rf "$pkgdir"/usr/lib/perl5 + + # git-daemon via systemd socket activation + install -D -m 644 "$srcdir"/git-daemon@.service "$pkgdir"/usr/lib/systemd/system/git-daemon@.service + install -D -m 644 "$srcdir"/git-daemon.socket "$pkgdir"/usr/lib/systemd/system/git-daemon.socket +} + +md5sums=('560200d1db05a2dd2b8a2b3718655463' + '042524f942785772d7bd52a1f02fe5ae' + 'f67869315c2cc112e076f0c73f248002') +md5sums=('0646202ae979e4339f3e47f2375b5773' + '042524f942785772d7bd52a1f02fe5ae' + 'f67869315c2cc112e076f0c73f248002') Copied: git/repos/testing-x86_64/git-daemon.socket (from rev 213932, git/trunk/git-daemon.socket) =================================================================== --- testing-x86_64/git-daemon.socket (rev 0) +++ testing-x86_64/git-daemon.socket 2014-05-31 20:10:52 UTC (rev 213933) @@ -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 213932, git/trunk/git-daemon@.service) =================================================================== --- testing-x86_64/git-daemon@.service (rev 0) +++ testing-x86_64/git-daemon@.service 2014-05-31 20:10:52 UTC (rev 213933) @@ -0,0 +1,10 @@ +[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 Copied: git/repos/testing-x86_64/git.install (from rev 213932, git/trunk/git.install) =================================================================== --- testing-x86_64/git.install (rev 0) +++ testing-x86_64/git.install 2014-05-31 20:10:52 UTC (rev 213933) @@ -0,0 +1,21 @@ +post_install() { + if ! getent group git >/dev/null; then + groupadd --system git + fi + if ! getent passwd git >/dev/null; then + useradd --system -c 'git daemon user' -g git -d / -s /bin/bash git + fi +} + +post_upgrade() { + post_install $1 +} + +post_remove() { + if getent passwd git >/dev/null; then + userdel git + fi + if getent group git >/dev/null; then + groupdel git + fi +}