[arch-commits] Commit in git/repos (20 files)
Dan McGee
dan at archlinux.org
Sun Mar 8 02:16:16 UTC 2015
Date: Sunday, March 8, 2015 @ 03:16:15
Author: dan
Revision: 233002
archrelease: copy trunk to extra-i686, extra-x86_64
Added:
git/repos/extra-i686/PKGBUILD
(from rev 233001, git/trunk/PKGBUILD)
git/repos/extra-i686/git-daemon.socket
(from rev 233001, git/trunk/git-daemon.socket)
git/repos/extra-i686/git-daemon at .service
(from rev 233001, git/trunk/git-daemon at .service)
git/repos/extra-i686/git.install
(from rev 233001, git/trunk/git.install)
git/repos/extra-x86_64/PKGBUILD
(from rev 233001, git/trunk/PKGBUILD)
git/repos/extra-x86_64/git-daemon.socket
(from rev 233001, git/trunk/git-daemon.socket)
git/repos/extra-x86_64/git-daemon at .service
(from rev 233001, git/trunk/git-daemon at .service)
git/repos/extra-x86_64/git.install
(from rev 233001, git/trunk/git.install)
Deleted:
git/repos/extra-i686/0001-create-gpg-homedir-on-the-fly.patch
git/repos/extra-i686/0002-skip-RFC1991-tests-for-gnupg-2.1.patch
git/repos/extra-i686/PKGBUILD
git/repos/extra-i686/git-daemon.socket
git/repos/extra-i686/git-daemon at .service
git/repos/extra-i686/git.install
git/repos/extra-x86_64/0001-create-gpg-homedir-on-the-fly.patch
git/repos/extra-x86_64/0002-skip-RFC1991-tests-for-gnupg-2.1.patch
git/repos/extra-x86_64/PKGBUILD
git/repos/extra-x86_64/git-daemon.socket
git/repos/extra-x86_64/git-daemon at .service
git/repos/extra-x86_64/git.install
----------------------------------------------------------+
/PKGBUILD | 224 +++++++++++++
/git-daemon.socket | 18 +
/git-daemon at .service | 20 +
/git.install | 42 ++
extra-i686/0001-create-gpg-homedir-on-the-fly.patch | 58 ---
extra-i686/0002-skip-RFC1991-tests-for-gnupg-2.1.patch | 93 -----
extra-i686/PKGBUILD | 112 ------
extra-i686/git-daemon.socket | 9
extra-i686/git-daemon at .service | 10
extra-i686/git.install | 21 -
extra-x86_64/0001-create-gpg-homedir-on-the-fly.patch | 58 ---
extra-x86_64/0002-skip-RFC1991-tests-for-gnupg-2.1.patch | 93 -----
extra-x86_64/PKGBUILD | 112 ------
extra-x86_64/git-daemon.socket | 9
extra-x86_64/git-daemon at .service | 10
extra-x86_64/git.install | 21 -
16 files changed, 304 insertions(+), 606 deletions(-)
Deleted: extra-i686/0001-create-gpg-homedir-on-the-fly.patch
===================================================================
--- extra-i686/0001-create-gpg-homedir-on-the-fly.patch 2015-03-08 02:16:02 UTC (rev 233001)
+++ extra-i686/0001-create-gpg-homedir-on-the-fly.patch 2015-03-08 02:16:15 UTC (rev 233002)
@@ -1,58 +0,0 @@
-From d2c93870da4997abeb2813873878c1a556defde4 Mon Sep 17 00:00:00 2001
-From: Christian Hesse <mail at eworm.de>
-Date: Fri, 12 Dec 2014 07:34:34 +0100
-Subject: [PATCH 1/3] create gpg homedir on the fly
-
-GnuPG 2.1 homedir looks different, so just create it on the fly by
-importing needed private and public keys and ownertrust.
-This solves an issue with gnupg 2.1 running interactive pinentry when
-old secret key is present.
-
-Signed-off-by: Christian Hesse <mail at eworm.de>
----
- t/lib-gpg.sh | 10 +++++++---
- t/lib-gpg/ownertrust | 4 ++++
- t/lib-gpg/random_seed | Bin 600 -> 0 bytes
- t/lib-gpg/trustdb.gpg | Bin 1360 -> 0 bytes
- 4 files changed, 11 insertions(+), 3 deletions(-)
- create mode 100644 t/lib-gpg/ownertrust
- delete mode 100644 t/lib-gpg/random_seed
- delete mode 100644 t/lib-gpg/trustdb.gpg
-
-diff --git a/t/lib-gpg.sh b/t/lib-gpg.sh
-index cd2baef..4e57942 100755
---- a/t/lib-gpg.sh
-+++ b/t/lib-gpg.sh
-@@ -16,11 +16,15 @@ else
- # Type DSA and Elgamal, size 2048 bits, no expiration date.
- # Name and email: C O Mitter <committer at example.com>
- # No password given, to enable non-interactive operation.
-- cp -R "$TEST_DIRECTORY"/lib-gpg ./gpghome
-- chmod 0700 gpghome
-- chmod 0600 gpghome/*
-+ mkdir ./gpghome
-+ chmod 0700 ./gpghome
- GNUPGHOME="$(pwd)/gpghome"
- export GNUPGHOME
-+ gpg --homedir "${GNUPGHOME}" --import \
-+ "$TEST_DIRECTORY"/lib-gpg/pubring.gpg \
-+ "$TEST_DIRECTORY"/lib-gpg/secring.gpg
-+ gpg --homedir "${GNUPGHOME}" --import-ownertrust \
-+ "$TEST_DIRECTORY"/lib-gpg/ownertrust
- test_set_prereq GPG
- ;;
- esac
-diff --git a/t/lib-gpg/ownertrust b/t/lib-gpg/ownertrust
-new file mode 100644
-index 0000000..b3e3c4f
---- /dev/null
-+++ b/t/lib-gpg/ownertrust
-@@ -0,0 +1,4 @@
-+# List of assigned trustvalues, created Thu 11 Dec 2014 01:26:28 PM CET
-+# (Use "gpg --import-ownertrust" to restore them)
-+73D758744BE721698EC54E8713B6F51ECDDE430D:6:
-+D4BE22311AD3131E5EDA29A461092E85B7227189:3:
-
---
-2.2.0
-
Deleted: extra-i686/0002-skip-RFC1991-tests-for-gnupg-2.1.patch
===================================================================
--- extra-i686/0002-skip-RFC1991-tests-for-gnupg-2.1.patch 2015-03-08 02:16:02 UTC (rev 233001)
+++ extra-i686/0002-skip-RFC1991-tests-for-gnupg-2.1.patch 2015-03-08 02:16:15 UTC (rev 233002)
@@ -1,93 +0,0 @@
-From 2bbdf8703ea22b91f6d0b12b8c4ff3b90293b717 Mon Sep 17 00:00:00 2001
-From: Christian Hesse <mail at eworm.de>
-Date: Fri, 12 Dec 2014 07:40:28 +0100
-Subject: [PATCH 2/3] skip RFC1991 tests for gnupg 2.1
-
-GnuPG >= 2.1.0 does not longer support RFC1991, so skip these
-tests.
-
-Signed-off-by: Christian Hesse <mail at eworm.de>
----
- t/lib-gpg.sh | 3 +++
- t/t7004-tag.sh | 14 +++++++-------
- 2 files changed, 10 insertions(+), 7 deletions(-)
-
-diff --git a/t/lib-gpg.sh b/t/lib-gpg.sh
-index 4e57942..b0138ad 100755
---- a/t/lib-gpg.sh
-+++ b/t/lib-gpg.sh
-@@ -26,6 +26,9 @@ else
- gpg --homedir "${GNUPGHOME}" --import-ownertrust \
- "$TEST_DIRECTORY"/lib-gpg/ownertrust
- test_set_prereq GPG
-+ if echo | gpg --homedir "${GNUPGHOME}" -b --rfc1991 >/dev/null 2>/dev/null; then
-+ test_set_prereq RFC1991
-+ fi
- ;;
- esac
- fi
-diff --git a/t/t7004-tag.sh b/t/t7004-tag.sh
-index 796e9f7..35c805a 100755
---- a/t/t7004-tag.sh
-+++ b/t/t7004-tag.sh
-@@ -1081,7 +1081,7 @@ test_expect_success GPG \
- get_tag_header rfc1991-signed-tag $commit commit $time >expect
- echo "RFC1991 signed tag" >>expect
- echo '-----BEGIN PGP MESSAGE-----' >>expect
--test_expect_success GPG \
-+test_expect_success GPG,RFC1991 \
- 'creating a signed tag with rfc1991' '
- echo "rfc1991" >gpghome/gpg.conf &&
- git tag -s -m "RFC1991 signed tag" rfc1991-signed-tag $commit &&
-@@ -1095,7 +1095,7 @@ cp "$1" actual
- EOF
- chmod +x fakeeditor
-
--test_expect_success GPG \
-+test_expect_success GPG,RFC1991 \
- 'reediting a signed tag body omits signature' '
- echo "rfc1991" >gpghome/gpg.conf &&
- echo "RFC1991 signed tag" >expect &&
-@@ -1103,13 +1103,13 @@ test_expect_success GPG \
- test_cmp expect actual
- '
-
--test_expect_success GPG \
-+test_expect_success GPG,RFC1991 \
- 'verifying rfc1991 signature' '
- echo "rfc1991" >gpghome/gpg.conf &&
- git tag -v rfc1991-signed-tag
- '
-
--test_expect_success GPG \
-+test_expect_success GPG,RFC1991 \
- 'list tag with rfc1991 signature' '
- echo "rfc1991" >gpghome/gpg.conf &&
- echo "rfc1991-signed-tag RFC1991 signed tag" >expect &&
-@@ -1123,12 +1123,12 @@ test_expect_success GPG \
-
- rm -f gpghome/gpg.conf
-
--test_expect_success GPG \
-+test_expect_success GPG,RFC1991 \
- 'verifying rfc1991 signature without --rfc1991' '
- git tag -v rfc1991-signed-tag
- '
-
--test_expect_success GPG \
-+test_expect_success GPG,RFC1991 \
- 'list tag with rfc1991 signature without --rfc1991' '
- echo "rfc1991-signed-tag RFC1991 signed tag" >expect &&
- git tag -l -n1 rfc1991-signed-tag >actual &&
-@@ -1139,7 +1139,7 @@ test_expect_success GPG \
- test_cmp expect actual
- '
-
--test_expect_success GPG \
-+test_expect_success GPG,RFC1991 \
- 'reediting a signed tag body omits signature' '
- echo "RFC1991 signed tag" >expect &&
- GIT_EDITOR=./fakeeditor git tag -f -s rfc1991-signed-tag $commit &&
---
-2.2.0
-
Deleted: extra-i686/PKGBUILD
===================================================================
--- extra-i686/PKGBUILD 2015-03-08 02:16:02 UTC (rev 233001)
+++ extra-i686/PKGBUILD 2015-03-08 02:16:15 UTC (rev 233002)
@@ -1,112 +0,0 @@
-# $Id$
-# Maintainer: Dan McGee <dan at archlinux.org>
-
-pkgname=git
-pkgver=2.3.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' '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'
- 'cvsps2: 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 at .service
- git-daemon.socket)
-md5sums=('0d33343eb442350e8e84e730c3216a38'
- '042524f942785772d7bd52a1f02fe5ae'
- 'f67869315c2cc112e076f0c73f248002')
-
-prepare() {
- cd "$srcdir/$pkgname-$pkgver"
-}
-
-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 gitexecdir=/usr/lib/git-core all doc
-}
-
-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
- 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
- make -C contrib/subtree prefix=/usr gitexecdir=/usr/lib/git-core 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 at .service "$pkgdir"/usr/lib/systemd/system/git-daemon at .service
- install -D -m 644 "$srcdir"/git-daemon.socket "$pkgdir"/usr/lib/systemd/system/git-daemon.socket
-}
Copied: git/repos/extra-i686/PKGBUILD (from rev 233001, git/trunk/PKGBUILD)
===================================================================
--- extra-i686/PKGBUILD (rev 0)
+++ extra-i686/PKGBUILD 2015-03-08 02:16:15 UTC (rev 233002)
@@ -0,0 +1,112 @@
+# $Id$
+# Maintainer: Dan McGee <dan at archlinux.org>
+
+pkgname=git
+pkgver=2.3.2
+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'
+ 'cvsps2: 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 at .service
+ git-daemon.socket)
+md5sums=('56701b3b1815c8bbfd7b43b4773adad7'
+ '042524f942785772d7bd52a1f02fe5ae'
+ 'f67869315c2cc112e076f0c73f248002')
+
+prepare() {
+ cd "$srcdir/$pkgname-$pkgver"
+}
+
+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 gitexecdir=/usr/lib/git-core all doc
+}
+
+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
+ 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
+ make -C contrib/subtree prefix=/usr gitexecdir=/usr/lib/git-core 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 at .service "$pkgdir"/usr/lib/systemd/system/git-daemon at .service
+ install -D -m 644 "$srcdir"/git-daemon.socket "$pkgdir"/usr/lib/systemd/system/git-daemon.socket
+}
Deleted: extra-i686/git-daemon.socket
===================================================================
--- extra-i686/git-daemon.socket 2015-03-08 02:16:02 UTC (rev 233001)
+++ extra-i686/git-daemon.socket 2015-03-08 02:16:15 UTC (rev 233002)
@@ -1,9 +0,0 @@
-[Unit]
-Description=Git Daemon Socket
-
-[Socket]
-ListenStream=9418
-Accept=true
-
-[Install]
-WantedBy=sockets.target
Copied: git/repos/extra-i686/git-daemon.socket (from rev 233001, git/trunk/git-daemon.socket)
===================================================================
--- extra-i686/git-daemon.socket (rev 0)
+++ extra-i686/git-daemon.socket 2015-03-08 02:16:15 UTC (rev 233002)
@@ -0,0 +1,9 @@
+[Unit]
+Description=Git Daemon Socket
+
+[Socket]
+ListenStream=9418
+Accept=true
+
+[Install]
+WantedBy=sockets.target
Deleted: extra-i686/git-daemon at .service
===================================================================
--- extra-i686/git-daemon at .service 2015-03-08 02:16:02 UTC (rev 233001)
+++ extra-i686/git-daemon at .service 2015-03-08 02:16:15 UTC (rev 233002)
@@ -1,10 +0,0 @@
-[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/extra-i686/git-daemon at .service (from rev 233001, git/trunk/git-daemon at .service)
===================================================================
--- extra-i686/git-daemon at .service (rev 0)
+++ extra-i686/git-daemon at .service 2015-03-08 02:16:15 UTC (rev 233002)
@@ -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
Deleted: extra-i686/git.install
===================================================================
--- extra-i686/git.install 2015-03-08 02:16:02 UTC (rev 233001)
+++ extra-i686/git.install 2015-03-08 02:16:15 UTC (rev 233002)
@@ -1,21 +0,0 @@
-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/extra-i686/git.install (from rev 233001, git/trunk/git.install)
===================================================================
--- extra-i686/git.install (rev 0)
+++ extra-i686/git.install 2015-03-08 02:16:15 UTC (rev 233002)
@@ -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
+}
Deleted: extra-x86_64/0001-create-gpg-homedir-on-the-fly.patch
===================================================================
--- extra-x86_64/0001-create-gpg-homedir-on-the-fly.patch 2015-03-08 02:16:02 UTC (rev 233001)
+++ extra-x86_64/0001-create-gpg-homedir-on-the-fly.patch 2015-03-08 02:16:15 UTC (rev 233002)
@@ -1,58 +0,0 @@
-From d2c93870da4997abeb2813873878c1a556defde4 Mon Sep 17 00:00:00 2001
-From: Christian Hesse <mail at eworm.de>
-Date: Fri, 12 Dec 2014 07:34:34 +0100
-Subject: [PATCH 1/3] create gpg homedir on the fly
-
-GnuPG 2.1 homedir looks different, so just create it on the fly by
-importing needed private and public keys and ownertrust.
-This solves an issue with gnupg 2.1 running interactive pinentry when
-old secret key is present.
-
-Signed-off-by: Christian Hesse <mail at eworm.de>
----
- t/lib-gpg.sh | 10 +++++++---
- t/lib-gpg/ownertrust | 4 ++++
- t/lib-gpg/random_seed | Bin 600 -> 0 bytes
- t/lib-gpg/trustdb.gpg | Bin 1360 -> 0 bytes
- 4 files changed, 11 insertions(+), 3 deletions(-)
- create mode 100644 t/lib-gpg/ownertrust
- delete mode 100644 t/lib-gpg/random_seed
- delete mode 100644 t/lib-gpg/trustdb.gpg
-
-diff --git a/t/lib-gpg.sh b/t/lib-gpg.sh
-index cd2baef..4e57942 100755
---- a/t/lib-gpg.sh
-+++ b/t/lib-gpg.sh
-@@ -16,11 +16,15 @@ else
- # Type DSA and Elgamal, size 2048 bits, no expiration date.
- # Name and email: C O Mitter <committer at example.com>
- # No password given, to enable non-interactive operation.
-- cp -R "$TEST_DIRECTORY"/lib-gpg ./gpghome
-- chmod 0700 gpghome
-- chmod 0600 gpghome/*
-+ mkdir ./gpghome
-+ chmod 0700 ./gpghome
- GNUPGHOME="$(pwd)/gpghome"
- export GNUPGHOME
-+ gpg --homedir "${GNUPGHOME}" --import \
-+ "$TEST_DIRECTORY"/lib-gpg/pubring.gpg \
-+ "$TEST_DIRECTORY"/lib-gpg/secring.gpg
-+ gpg --homedir "${GNUPGHOME}" --import-ownertrust \
-+ "$TEST_DIRECTORY"/lib-gpg/ownertrust
- test_set_prereq GPG
- ;;
- esac
-diff --git a/t/lib-gpg/ownertrust b/t/lib-gpg/ownertrust
-new file mode 100644
-index 0000000..b3e3c4f
---- /dev/null
-+++ b/t/lib-gpg/ownertrust
-@@ -0,0 +1,4 @@
-+# List of assigned trustvalues, created Thu 11 Dec 2014 01:26:28 PM CET
-+# (Use "gpg --import-ownertrust" to restore them)
-+73D758744BE721698EC54E8713B6F51ECDDE430D:6:
-+D4BE22311AD3131E5EDA29A461092E85B7227189:3:
-
---
-2.2.0
-
Deleted: extra-x86_64/0002-skip-RFC1991-tests-for-gnupg-2.1.patch
===================================================================
--- extra-x86_64/0002-skip-RFC1991-tests-for-gnupg-2.1.patch 2015-03-08 02:16:02 UTC (rev 233001)
+++ extra-x86_64/0002-skip-RFC1991-tests-for-gnupg-2.1.patch 2015-03-08 02:16:15 UTC (rev 233002)
@@ -1,93 +0,0 @@
-From 2bbdf8703ea22b91f6d0b12b8c4ff3b90293b717 Mon Sep 17 00:00:00 2001
-From: Christian Hesse <mail at eworm.de>
-Date: Fri, 12 Dec 2014 07:40:28 +0100
-Subject: [PATCH 2/3] skip RFC1991 tests for gnupg 2.1
-
-GnuPG >= 2.1.0 does not longer support RFC1991, so skip these
-tests.
-
-Signed-off-by: Christian Hesse <mail at eworm.de>
----
- t/lib-gpg.sh | 3 +++
- t/t7004-tag.sh | 14 +++++++-------
- 2 files changed, 10 insertions(+), 7 deletions(-)
-
-diff --git a/t/lib-gpg.sh b/t/lib-gpg.sh
-index 4e57942..b0138ad 100755
---- a/t/lib-gpg.sh
-+++ b/t/lib-gpg.sh
-@@ -26,6 +26,9 @@ else
- gpg --homedir "${GNUPGHOME}" --import-ownertrust \
- "$TEST_DIRECTORY"/lib-gpg/ownertrust
- test_set_prereq GPG
-+ if echo | gpg --homedir "${GNUPGHOME}" -b --rfc1991 >/dev/null 2>/dev/null; then
-+ test_set_prereq RFC1991
-+ fi
- ;;
- esac
- fi
-diff --git a/t/t7004-tag.sh b/t/t7004-tag.sh
-index 796e9f7..35c805a 100755
---- a/t/t7004-tag.sh
-+++ b/t/t7004-tag.sh
-@@ -1081,7 +1081,7 @@ test_expect_success GPG \
- get_tag_header rfc1991-signed-tag $commit commit $time >expect
- echo "RFC1991 signed tag" >>expect
- echo '-----BEGIN PGP MESSAGE-----' >>expect
--test_expect_success GPG \
-+test_expect_success GPG,RFC1991 \
- 'creating a signed tag with rfc1991' '
- echo "rfc1991" >gpghome/gpg.conf &&
- git tag -s -m "RFC1991 signed tag" rfc1991-signed-tag $commit &&
-@@ -1095,7 +1095,7 @@ cp "$1" actual
- EOF
- chmod +x fakeeditor
-
--test_expect_success GPG \
-+test_expect_success GPG,RFC1991 \
- 'reediting a signed tag body omits signature' '
- echo "rfc1991" >gpghome/gpg.conf &&
- echo "RFC1991 signed tag" >expect &&
-@@ -1103,13 +1103,13 @@ test_expect_success GPG \
- test_cmp expect actual
- '
-
--test_expect_success GPG \
-+test_expect_success GPG,RFC1991 \
- 'verifying rfc1991 signature' '
- echo "rfc1991" >gpghome/gpg.conf &&
- git tag -v rfc1991-signed-tag
- '
-
--test_expect_success GPG \
-+test_expect_success GPG,RFC1991 \
- 'list tag with rfc1991 signature' '
- echo "rfc1991" >gpghome/gpg.conf &&
- echo "rfc1991-signed-tag RFC1991 signed tag" >expect &&
-@@ -1123,12 +1123,12 @@ test_expect_success GPG \
-
- rm -f gpghome/gpg.conf
-
--test_expect_success GPG \
-+test_expect_success GPG,RFC1991 \
- 'verifying rfc1991 signature without --rfc1991' '
- git tag -v rfc1991-signed-tag
- '
-
--test_expect_success GPG \
-+test_expect_success GPG,RFC1991 \
- 'list tag with rfc1991 signature without --rfc1991' '
- echo "rfc1991-signed-tag RFC1991 signed tag" >expect &&
- git tag -l -n1 rfc1991-signed-tag >actual &&
-@@ -1139,7 +1139,7 @@ test_expect_success GPG \
- test_cmp expect actual
- '
-
--test_expect_success GPG \
-+test_expect_success GPG,RFC1991 \
- 'reediting a signed tag body omits signature' '
- echo "RFC1991 signed tag" >expect &&
- GIT_EDITOR=./fakeeditor git tag -f -s rfc1991-signed-tag $commit &&
---
-2.2.0
-
Deleted: extra-x86_64/PKGBUILD
===================================================================
--- extra-x86_64/PKGBUILD 2015-03-08 02:16:02 UTC (rev 233001)
+++ extra-x86_64/PKGBUILD 2015-03-08 02:16:15 UTC (rev 233002)
@@ -1,112 +0,0 @@
-# $Id$
-# Maintainer: Dan McGee <dan at archlinux.org>
-
-pkgname=git
-pkgver=2.3.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' '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'
- 'cvsps2: 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 at .service
- git-daemon.socket)
-md5sums=('0d33343eb442350e8e84e730c3216a38'
- '042524f942785772d7bd52a1f02fe5ae'
- 'f67869315c2cc112e076f0c73f248002')
-
-prepare() {
- cd "$srcdir/$pkgname-$pkgver"
-}
-
-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 gitexecdir=/usr/lib/git-core all doc
-}
-
-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
- 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
- make -C contrib/subtree prefix=/usr gitexecdir=/usr/lib/git-core 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 at .service "$pkgdir"/usr/lib/systemd/system/git-daemon at .service
- install -D -m 644 "$srcdir"/git-daemon.socket "$pkgdir"/usr/lib/systemd/system/git-daemon.socket
-}
Copied: git/repos/extra-x86_64/PKGBUILD (from rev 233001, git/trunk/PKGBUILD)
===================================================================
--- extra-x86_64/PKGBUILD (rev 0)
+++ extra-x86_64/PKGBUILD 2015-03-08 02:16:15 UTC (rev 233002)
@@ -0,0 +1,112 @@
+# $Id$
+# Maintainer: Dan McGee <dan at archlinux.org>
+
+pkgname=git
+pkgver=2.3.2
+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'
+ 'cvsps2: 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 at .service
+ git-daemon.socket)
+md5sums=('56701b3b1815c8bbfd7b43b4773adad7'
+ '042524f942785772d7bd52a1f02fe5ae'
+ 'f67869315c2cc112e076f0c73f248002')
+
+prepare() {
+ cd "$srcdir/$pkgname-$pkgver"
+}
+
+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 gitexecdir=/usr/lib/git-core all doc
+}
+
+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
+ 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
+ make -C contrib/subtree prefix=/usr gitexecdir=/usr/lib/git-core 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 at .service "$pkgdir"/usr/lib/systemd/system/git-daemon at .service
+ install -D -m 644 "$srcdir"/git-daemon.socket "$pkgdir"/usr/lib/systemd/system/git-daemon.socket
+}
Deleted: extra-x86_64/git-daemon.socket
===================================================================
--- extra-x86_64/git-daemon.socket 2015-03-08 02:16:02 UTC (rev 233001)
+++ extra-x86_64/git-daemon.socket 2015-03-08 02:16:15 UTC (rev 233002)
@@ -1,9 +0,0 @@
-[Unit]
-Description=Git Daemon Socket
-
-[Socket]
-ListenStream=9418
-Accept=true
-
-[Install]
-WantedBy=sockets.target
Copied: git/repos/extra-x86_64/git-daemon.socket (from rev 233001, git/trunk/git-daemon.socket)
===================================================================
--- extra-x86_64/git-daemon.socket (rev 0)
+++ extra-x86_64/git-daemon.socket 2015-03-08 02:16:15 UTC (rev 233002)
@@ -0,0 +1,9 @@
+[Unit]
+Description=Git Daemon Socket
+
+[Socket]
+ListenStream=9418
+Accept=true
+
+[Install]
+WantedBy=sockets.target
Deleted: extra-x86_64/git-daemon at .service
===================================================================
--- extra-x86_64/git-daemon at .service 2015-03-08 02:16:02 UTC (rev 233001)
+++ extra-x86_64/git-daemon at .service 2015-03-08 02:16:15 UTC (rev 233002)
@@ -1,10 +0,0 @@
-[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/extra-x86_64/git-daemon at .service (from rev 233001, git/trunk/git-daemon at .service)
===================================================================
--- extra-x86_64/git-daemon at .service (rev 0)
+++ extra-x86_64/git-daemon at .service 2015-03-08 02:16:15 UTC (rev 233002)
@@ -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
Deleted: extra-x86_64/git.install
===================================================================
--- extra-x86_64/git.install 2015-03-08 02:16:02 UTC (rev 233001)
+++ extra-x86_64/git.install 2015-03-08 02:16:15 UTC (rev 233002)
@@ -1,21 +0,0 @@
-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/extra-x86_64/git.install (from rev 233001, git/trunk/git.install)
===================================================================
--- extra-x86_64/git.install (rev 0)
+++ extra-x86_64/git.install 2015-03-08 02:16:15 UTC (rev 233002)
@@ -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
+}
More information about the arch-commits
mailing list