Christian Hesse pushed to branch main at Arch Linux / Packaging / Packages / git
Commits:
5876d4b6 by Christian Hesse at 2023-08-21T22:26:47+02:00
upgpkg: 2.42.0-1: new upstream release
- - - - -
2 changed files:
- + 0001-t6300-fix-match-with-insecure-memory.patch
- PKGBUILD
Changes:
=====================================
0001-t6300-fix-match-with-insecure-memory.patch
=====================================
@@ -0,0 +1,40 @@
+From c9bef5a35af160256e3bc351a1d516151d66d505 Mon Sep 17 00:00:00 2001
+From: Christian Hesse <m...@eworm.de>
+Date: Mon, 21 Aug 2023 22:01:31 +0200
+Subject: [PATCH 1/1] t6300: fix match with insecure memory
+
+Running the tests in a build environment makes gnupg print a warning:
+
+gpg: Warning: using insecure memory!
+
+This warning breaks the match, as `head` misses one line. Let's strip
+the line, make `head` return what is expected and fix the match.
+
+Signed-off-by: Christian Hesse <m...@eworm.de>
+---
+ t/t6300-for-each-ref.sh | 5 +++--
+ 1 file changed, 3 insertions(+), 2 deletions(-)
+
+diff --git a/t/t6300-for-each-ref.sh b/t/t6300-for-each-ref.sh
+index 5b434ab451..0f9981798e 100755
+--- a/t/t6300-for-each-ref.sh
++++ b/t/t6300-for-each-ref.sh
+@@ -1764,12 +1764,13 @@ test_expect_success GPGSSH 'setup for signature atom
using ssh' '
+
+ test_expect_success GPG2 'bare signature atom' '
+ git verify-commit first-signed 2>out.raw &&
+- grep -Ev "checking the trustdb|PGP trust model" out.raw >out &&
++ grep -Ev "checking the trustdb|PGP trust model|using insecure memory"
out.raw >out &&
+ head -3 out >expect &&
+ tail -1 out >>expect &&
+ echo >>expect &&
+ git for-each-ref refs/tags/first-signed \
+- --format="%(signature)" >actual &&
++ --format="%(signature)" >out.raw &&
++ grep -Ev "using insecure memory" out.raw >actual &&
+ test_cmp expect actual
+ '
+
+--
+2.41.0
+
=====================================
PKGBUILD
=====================================
@@ -2,8 +2,8 @@
# Maintainer: Dan McGee <d...@archlinux.org>
pkgname=git
-pkgver=2.41.0
-pkgrel=2
+pkgver=2.42.0
+pkgrel=1
pkgdesc='the fast distributed version control system'
arch=('x86_64')
url='https://git-scm.com/'
@@ -11,7 +11,9 @@ license=('GPL2')
depends=('curl' 'expat' 'perl' 'perl-error' 'perl-mailtools'
'openssl' 'pcre2' 'grep' 'shadow' 'zlib')
makedepends=('python' 'xmlto' 'asciidoc')
+checkdepends=('openssh')
optdepends=('tk: gitk and git gui'
+ 'openssh: ssh transport and crypto'
'perl-libwww: git svn'
'perl-term-readkey: git svn and interactive.singlekey setting'
'perl-io-socket-ssl: git send-email TLS support'
@@ -27,11 +29,13 @@ optdepends=('tk: gitk and git gui'
install=git.install
validpgpkeys=('96E07AF25771955980DAD10020D04E5A713660A7') # Junio C Hamano
source=("https://www.kernel.org/pub/software/scm/git/git-$pkgver.tar."{xz,sign}
+ '0001-t6300-fix-match-with-insecure-memory.patch'
'git-daemon@.service'
'git-daemon.socket'
'git-sysusers.conf')
-sha256sums=('e748bafd424cfe80b212cbc6f1bbccc3a47d4862fb1eb7988877750478568040'
+sha256sums=('3278210e9fd2994b8484dd7e3ddd9ea8b940ef52170cdb606daa94d887c93b0d'
'SKIP'
+ '5ab2db5faea2b3ba00b6768589b431211b6c6bfd472a2d54556db30403340812'
'14c0b67cfe116b430645c19d8c4759419657e6809dfa28f438c33a005245ad91'
'ac4c90d62c44926e6d30d18d97767efc901076d4e0283ed812a349aece72f203'
'7630e8245526ad80f703fac9900a1328588c503ce32b37b9f8811674fcda4a45')
@@ -53,6 +57,12 @@ _make() {
make "${make_options[@]}" "$@"
}
+prepare() {
+ cd "$srcdir/$pkgname-$pkgver"
+
+ patch -Np1 < ../0001-t6300-fix-match-with-insecure-memory.patch
+}
+
build() {
cd "$srcdir/$pkgname-$pkgver"
View it on GitLab:
https://gitlab.archlinux.org/archlinux/packaging/packages/git/-/commit/5876d4b6bdc281813aaa0c973c073619a4545b05
--
View it on GitLab:
https://gitlab.archlinux.org/archlinux/packaging/packages/git/-/commit/5876d4b6bdc281813aaa0c973c073619a4545b05
You're receiving this email because of your account on gitlab.archlinux.org.
