Date: Thursday, August 10, 2017 @ 18:25:22
Author: eworm
Revision: 301848
archrelease: copy trunk to testing-i686, testing-x86_64
Added:
git/repos/testing-i686/
git/repos/testing-i686/PKGBUILD
(from rev 301847, git/trunk/PKGBUILD)
git/repos/testing-i686/git-daemon.socket
(from rev 301847, git/trunk/git-daemon.socket)
git/repos/testing-i686/git-daemon@.service
(from rev 301847, git/trunk/git-daemon@.service)
git/repos/testing-i686/git.install
(from rev 301847, git/trunk/git.install)
git/repos/testing-x86_64/
git/repos/testing-x86_64/PKGBUILD
(from rev 301847, git/trunk/PKGBUILD)
git/repos/testing-x86_64/git-daemon.socket
(from rev 301847, git/trunk/git-daemon.socket)
git/repos/testing-x86_64/git-daemon@.service
(from rev 301847, git/trunk/git-daemon@.service)
git/repos/testing-x86_64/git.install
(from rev 301847, git/trunk/git.install)
------------------------------------+
testing-i686/PKGBUILD | 132 +++++++++++++++++++++++++++++++++++
testing-i686/git-daemon.socket | 9 ++
testing-i686/git-daemon@.service | 10 ++
testing-i686/git.install | 21 +++++
testing-x86_64/PKGBUILD | 132 +++++++++++++++++++++++++++++++++++
testing-x86_64/git-daemon.socket | 9 ++
testing-x86_64/git-daemon@.service | 10 ++
testing-x86_64/git.install | 21 +++++
8 files changed, 344 insertions(+)
Copied: git/repos/testing-i686/PKGBUILD (from rev 301847, git/trunk/PKGBUILD)
===================================================================
--- testing-i686/PKGBUILD (rev 0)
+++ testing-i686/PKGBUILD 2017-08-10 18:25:22 UTC (rev 301848)
@@ -0,0 +1,132 @@
+# $Id$
+# Maintainer: Christian Hesse <m...@eworm.de>
+# Maintainer: Dan McGee <d...@archlinux.org>
+
+pkgname=git
+pkgver=2.14.1
+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' 'pcre2')
+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'
+ 'cvsps2: git cvsimport'
+ '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";
+ "https://www.kernel.org/pub/software/scm/git/git-$pkgver.tar.sign";
+ git-daemon@.service
+ git-daemon.socket)
+sha256sums=('6f724c6d0e9e13114ab35db6f67e1b2c1934b641e89366e6a0e37618231f2cc6'
+ 'SKIP'
+ '3bc3250d9e04b05c41975c01f85f512d3386d60b41475cbc7292bc88148852f6'
+ 'ac4c90d62c44926e6d30d18d97767efc901076d4e0283ed812a349aece72f203')
+
+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 -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
+ # libsecret credentials helper
+ install -m755 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 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
+}
Copied: git/repos/testing-i686/git-daemon.socket (from rev 301847,
git/trunk/git-daemon.socket)
===================================================================
--- testing-i686/git-daemon.socket (rev 0)
+++ testing-i686/git-daemon.socket 2017-08-10 18:25:22 UTC (rev 301848)
@@ -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 301847,
git/trunk/git-daemon@.service)
===================================================================
--- testing-i686/git-daemon@.service (rev 0)
+++ testing-i686/git-daemon@.service 2017-08-10 18:25:22 UTC (rev 301848)
@@ -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 301847,
git/trunk/git.install)
===================================================================
--- testing-i686/git.install (rev 0)
+++ testing-i686/git.install 2017-08-10 18:25:22 UTC (rev 301848)
@@ -0,0 +1,21 @@
+#!/bin/sh
+
+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 /usr/bin/git-shell
git
+ fi
+ if ! grep -qe '^/usr/bin/git-shell$' etc/shells; then
+ echo '/usr/bin/git-shell' >> etc/shells
+ fi
+}
+
+post_upgrade() {
+ post_install $1
+}
+
+post_remove() {
+ sed -i -r '/^\/usr\/bin\/git-shell$/d' etc/shells
+}
Copied: git/repos/testing-x86_64/PKGBUILD (from rev 301847, git/trunk/PKGBUILD)
===================================================================
--- testing-x86_64/PKGBUILD (rev 0)
+++ testing-x86_64/PKGBUILD 2017-08-10 18:25:22 UTC (rev 301848)
@@ -0,0 +1,132 @@
+# $Id$
+# Maintainer: Christian Hesse <m...@eworm.de>
+# Maintainer: Dan McGee <d...@archlinux.org>
+
+pkgname=git
+pkgver=2.14.1
+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' 'pcre2')
+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'
+ 'cvsps2: git cvsimport'
+ '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";
+ "https://www.kernel.org/pub/software/scm/git/git-$pkgver.tar.sign";
+ git-daemon@.service
+ git-daemon.socket)
+sha256sums=('6f724c6d0e9e13114ab35db6f67e1b2c1934b641e89366e6a0e37618231f2cc6'
+ 'SKIP'
+ '3bc3250d9e04b05c41975c01f85f512d3386d60b41475cbc7292bc88148852f6'
+ 'ac4c90d62c44926e6d30d18d97767efc901076d4e0283ed812a349aece72f203')
+
+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 -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
+ # libsecret credentials helper
+ install -m755 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 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
+}
Copied: git/repos/testing-x86_64/git-daemon.socket (from rev 301847,
git/trunk/git-daemon.socket)
===================================================================
--- testing-x86_64/git-daemon.socket (rev 0)
+++ testing-x86_64/git-daemon.socket 2017-08-10 18:25:22 UTC (rev 301848)
@@ -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 301847,
git/trunk/git-daemon@.service)
===================================================================
--- testing-x86_64/git-daemon@.service (rev 0)
+++ testing-x86_64/git-daemon@.service 2017-08-10 18:25:22 UTC (rev 301848)
@@ -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 301847,
git/trunk/git.install)
===================================================================
--- testing-x86_64/git.install (rev 0)
+++ testing-x86_64/git.install 2017-08-10 18:25:22 UTC (rev 301848)
@@ -0,0 +1,21 @@
+#!/bin/sh
+
+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 /usr/bin/git-shell
git
+ fi
+ if ! grep -qe '^/usr/bin/git-shell$' etc/shells; then
+ echo '/usr/bin/git-shell' >> etc/shells
+ fi
+}
+
+post_upgrade() {
+ post_install $1
+}
+
+post_remove() {
+ sed -i -r '/^\/usr\/bin\/git-shell$/d' etc/shells
+}
