[arch-commits] Commit in git/repos/testing-x86_64 (10 files)

Christian Hesse eworm at archlinux.org
Sat Aug 17 20:49:50 UTC 2019


    Date: Saturday, August 17, 2019 @ 20:49:49
  Author: eworm
Revision: 359942

archrelease: copy trunk to testing-x86_64

Added:
  git/repos/testing-x86_64/PKGBUILD
    (from rev 359941, git/trunk/PKGBUILD)
  git/repos/testing-x86_64/git-daemon.socket
    (from rev 359941, git/trunk/git-daemon.socket)
  git/repos/testing-x86_64/git-daemon at .service
    (from rev 359941, git/trunk/git-daemon at .service)
  git/repos/testing-x86_64/git-sysusers.conf
    (from rev 359941, git/trunk/git-sysusers.conf)
  git/repos/testing-x86_64/git.install
    (from rev 359941, git/trunk/git.install)
Deleted:
  git/repos/testing-x86_64/PKGBUILD
  git/repos/testing-x86_64/git-daemon.socket
  git/repos/testing-x86_64/git-daemon at .service
  git/repos/testing-x86_64/git-sysusers.conf
  git/repos/testing-x86_64/git.install

---------------------+
 PKGBUILD            |  278 +++++++++++++++++++++++++-------------------------
 git-daemon.socket   |   18 +--
 git-daemon at .service |   28 ++---
 git-sysusers.conf   |    2 
 git.install         |   28 ++---
 5 files changed, 177 insertions(+), 177 deletions(-)

Deleted: PKGBUILD
===================================================================
--- PKGBUILD	2019-08-17 20:49:32 UTC (rev 359941)
+++ PKGBUILD	2019-08-17 20:49:49 UTC (rev 359942)
@@ -1,139 +0,0 @@
-# Maintainer: Christian Hesse <mail at eworm.de>
-# Maintainer: Dan McGee <dan at archlinux.org>
-
-pkgname=git
-pkgver=2.22.1
-pkgrel=2
-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-daemon at .service'
-        'git-daemon.socket'
-        'git-sysusers.conf')
-sha256sums=('4ce1f93ab77847e9a9d565ee7c94ceadb80ea7d477fe68123f2329f8d4937824'
-            'SKIP'
-            '14c0b67cfe116b430645c19d8c4759419657e6809dfa28f438c33a005245ad91'
-            'ac4c90d62c44926e6d30d18d97767efc901076d4e0283ed812a349aece72f203'
-            '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"
-  INSTALL_SYMLINKS=1
-  MAN_BOLD_LITERAL=1
-  NO_PERL_CPAN_FALLBACKS=1
-  USE_LIBPCRE2=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
-
-  # git-daemon via systemd socket activation
-  install -D -m 0644 "$srcdir"/git-daemon at .service "$pkgdir"/usr/lib/systemd/system/git-daemon at .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/PKGBUILD (from rev 359941, git/trunk/PKGBUILD)
===================================================================
--- PKGBUILD	                        (rev 0)
+++ PKGBUILD	2019-08-17 20:49:49 UTC (rev 359942)
@@ -0,0 +1,139 @@
+# Maintainer: Christian Hesse <mail at eworm.de>
+# Maintainer: Dan McGee <dan at archlinux.org>
+
+pkgname=git
+pkgver=2.23.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-daemon at .service'
+        'git-daemon.socket'
+        'git-sysusers.conf')
+sha256sums=('234fa05b6839e92dc300b2dd78c92ec9c0c8d439f65e1d430a7034f60af16067'
+            'SKIP'
+            '14c0b67cfe116b430645c19d8c4759419657e6809dfa28f438c33a005245ad91'
+            'ac4c90d62c44926e6d30d18d97767efc901076d4e0283ed812a349aece72f203'
+            '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"
+  INSTALL_SYMLINKS=1
+  MAN_BOLD_LITERAL=1
+  NO_PERL_CPAN_FALLBACKS=1
+  USE_LIBPCRE2=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
+
+  # git-daemon via systemd socket activation
+  install -D -m 0644 "$srcdir"/git-daemon at .service "$pkgdir"/usr/lib/systemd/system/git-daemon at .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
+}

Deleted: git-daemon.socket
===================================================================
--- git-daemon.socket	2019-08-17 20:49:32 UTC (rev 359941)
+++ git-daemon.socket	2019-08-17 20:49:49 UTC (rev 359942)
@@ -1,9 +0,0 @@
-[Unit]
-Description=Git Daemon Socket
-
-[Socket]
-ListenStream=9418
-Accept=true
-
-[Install]
-WantedBy=sockets.target

Copied: git/repos/testing-x86_64/git-daemon.socket (from rev 359941, git/trunk/git-daemon.socket)
===================================================================
--- git-daemon.socket	                        (rev 0)
+++ git-daemon.socket	2019-08-17 20:49:49 UTC (rev 359942)
@@ -0,0 +1,9 @@
+[Unit]
+Description=Git Daemon Socket
+
+[Socket]
+ListenStream=9418
+Accept=true
+
+[Install]
+WantedBy=sockets.target

Deleted: git-daemon at .service
===================================================================
--- git-daemon at .service	2019-08-17 20:49:32 UTC (rev 359941)
+++ git-daemon at .service	2019-08-17 20:49:49 UTC (rev 359942)
@@ -1,14 +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
-ProtectSystem=full
-ProtectHome=on
-PrivateDevices=on
-NoNewPrivileges=on

Copied: git/repos/testing-x86_64/git-daemon at .service (from rev 359941, git/trunk/git-daemon at .service)
===================================================================
--- git-daemon at .service	                        (rev 0)
+++ git-daemon at .service	2019-08-17 20:49:49 UTC (rev 359942)
@@ -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

Deleted: git-sysusers.conf
===================================================================
--- git-sysusers.conf	2019-08-17 20:49:32 UTC (rev 359941)
+++ git-sysusers.conf	2019-08-17 20:49:49 UTC (rev 359942)
@@ -1 +0,0 @@
-u git - "git daemon user" / /usr/bin/git-shell

Copied: git/repos/testing-x86_64/git-sysusers.conf (from rev 359941, git/trunk/git-sysusers.conf)
===================================================================
--- git-sysusers.conf	                        (rev 0)
+++ git-sysusers.conf	2019-08-17 20:49:49 UTC (rev 359942)
@@ -0,0 +1 @@
+u git - "git daemon user" / /usr/bin/git-shell

Deleted: git.install
===================================================================
--- git.install	2019-08-17 20:49:32 UTC (rev 359941)
+++ git.install	2019-08-17 20:49:49 UTC (rev 359942)
@@ -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
-}

Copied: git/repos/testing-x86_64/git.install (from rev 359941, git/trunk/git.install)
===================================================================
--- git.install	                        (rev 0)
+++ git.install	2019-08-17 20:49:49 UTC (rev 359942)
@@ -0,0 +1,14 @@
+#!/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
+}



More information about the arch-commits mailing list