.git.metadata

@@ -1,2 +1,2 @@
-7577a22e233e892dba5cf19a3a57cef2062d01e6 SOURCES/git-2.43.5.tar.sign
+e164197ede0c38287bb59a50b18cd808629a7fc4 SOURCES/git-2.45.2.tar.sign
-31decef72034ae36c8098a9e6bb13a7dd4859fd9 SOURCES/git-2.43.5.tar.xz
+c7b6becec398e69130e4f066390e1519a417eb35 SOURCES/git-2.45.2.tar.xz

.gitignore

@@ -1,2 +1,2 @@
-SOURCES/git-2.43.5.tar.sign
+SOURCES/git-2.45.2.tar.sign
-SOURCES/git-2.43.5.tar.xz
+SOURCES/git-2.45.2.tar.xz

SOURCES/0001-t-lib-httpd-try-harder-to-find-a-port-for-apache.patch

@@ -1,4 +1,4 @@
-From aedeaaf788bd8a7fc5a1887196b6f6d8a5c31362 Mon Sep 17 00:00:00 2001
+From 89ccbc15948db9ddbf74530e3fd66dd78ae897ae Mon Sep 17 00:00:00 2001
 From: Todd Zullinger <tmz@pobox.com>
 Date: Sun, 21 Aug 2022 13:49:57 -0400
 Subject: [PATCH] t/lib-httpd: try harder to find a port for apache
@@ -30,10 +30,10 @@ Signed-off-by: Todd Zullinger <tmz@pobox.com>
  1 file changed, 18 insertions(+), 11 deletions(-)
 
 diff --git a/t/lib-httpd.sh b/t/lib-httpd.sh
-index 1f6b9b08d1..9279dcd659 100644
+index 2fb1b2ae56..4afdf5a6aa 100644
 --- a/t/lib-httpd.sh
 +++ b/t/lib-httpd.sh
-@@ -175,19 +175,26 @@ prepare_httpd() {
+@@ -206,19 +206,26 @@ enable_cgipassauth () {
  }
  
  start_httpd() {

SOURCES/0002-t-lib-git-daemon-try-harder-to-find-a-port.patch

@@ -1,4 +1,4 @@
-From 16750d024ce038b019ab2e9ee5639901e445af37 Mon Sep 17 00:00:00 2001
+From e90e1068ddc9cfa3badd23b16a46c57ed6d8308a Mon Sep 17 00:00:00 2001
 From: Todd Zullinger <tmz@pobox.com>
 Date: Fri, 26 Aug 2022 18:28:44 -0400
 Subject: [PATCH] t/lib-git-daemon: try harder to find a port

SOURCES/0003-t-lib-git-svn-try-harder-to-find-a-port.patch

@@ -1,4 +1,4 @@
-From aa5105dc115b43edc6c9c11714b092583f1221aa Mon Sep 17 00:00:00 2001
+From 41423d666fd52eaa6aa2b44a0de1b81d0857ca06 Mon Sep 17 00:00:00 2001
 From: Todd Zullinger <tmz@pobox.com>
 Date: Fri, 26 Aug 2022 18:28:44 -0400
 Subject: [PATCH] t/lib-git-svn: try harder to find a port

SOURCES/git-2.43.0-core-crypto-hmac.patch

@@ -1,70 +0,0 @@
-diff -ur b/builtin/receive-pack.c a/builtin/receive-pack.c
---- b/builtin/receive-pack.c	2023-11-20 03:07:41.000000000 +0100
-+++ a/builtin/receive-pack.c	2023-12-06 15:34:28.294170714 +0100
-@@ -40,6 +40,8 @@
- #include "worktree.h"
- #include "shallow.h"
- #include "parse-options.h"
-+#include <openssl/hmac.h>	
-+#include <openssl/evp.h>
- 
- static const char * const receive_pack_usage[] = {
- 	N_("git receive-pack <git-dir>"),
-@@ -538,43 +540,11 @@
- 	return 0;
- }
- 
--static void hmac_hash(unsigned char *out,
-+static inline void hmac_hash(unsigned char *out,
- 		      const char *key_in, size_t key_len,
- 		      const char *text, size_t text_len)
- {
--	unsigned char key[GIT_MAX_BLKSZ];
--	unsigned char k_ipad[GIT_MAX_BLKSZ];
--	unsigned char k_opad[GIT_MAX_BLKSZ];
--	int i;
--	git_hash_ctx ctx;
--
--	/* RFC 2104 2. (1) */
--	memset(key, '\0', GIT_MAX_BLKSZ);
--	if (the_hash_algo->blksz < key_len) {
--		the_hash_algo->init_fn(&ctx);
--		the_hash_algo->update_fn(&ctx, key_in, key_len);
--		the_hash_algo->final_fn(key, &ctx);
--	} else {
--		memcpy(key, key_in, key_len);
--	}
--
--	/* RFC 2104 2. (2) & (5) */
--	for (i = 0; i < sizeof(key); i++) {
--		k_ipad[i] = key[i] ^ 0x36;
--		k_opad[i] = key[i] ^ 0x5c;
--	}
--
--	/* RFC 2104 2. (3) & (4) */
--	the_hash_algo->init_fn(&ctx);
--	the_hash_algo->update_fn(&ctx, k_ipad, sizeof(k_ipad));
--	the_hash_algo->update_fn(&ctx, text, text_len);
--	the_hash_algo->final_fn(out, &ctx);
--
--	/* RFC 2104 2. (6) & (7) */
--	the_hash_algo->init_fn(&ctx);
--	the_hash_algo->update_fn(&ctx, k_opad, sizeof(k_opad));
--	the_hash_algo->update_fn(&ctx, out, the_hash_algo->rawsz);
--	the_hash_algo->final_fn(out, &ctx);
-+	HMAC(EVP_sha1(), key_in, key_len, text, text_len, out, NULL);
- }
- 
- static char *prepare_push_cert_nonce(const char *path, timestamp_t stamp)
-diff -ur b/Makefile a/Makefile
---- b/Makefile	2023-11-20 03:07:41.000000000 +0100
-+++ a/Makefile	2023-12-06 15:35:08.506316431 +0100
-@@ -2123,6 +2123,8 @@
- 	EXTLIBS += -lcrypto -lssl
- endif
- 
-+EXTLIBS += -lcrypto
-+
- ifneq ($(PROCFS_EXECUTABLE_PATH),)
- 	procfs_executable_path_SQ = $(subst ','\'',$(PROCFS_EXECUTABLE_PATH))
- 	BASIC_CFLAGS += '-DPROCFS_EXECUTABLE_PATH="$(procfs_executable_path_SQ)"'

SOURCES/git-2.43.5-slow-shallow-clones.patch

@@ -1,115 +0,0 @@
-From 51441e6460b505c07b4a8a6deeaa7de4bf6e8e33 Mon Sep 17 00:00:00 2001
-From: Junio C Hamano <gitster@pobox.com>
-Date: Fri, 3 May 2024 08:34:27 -0700
-Subject: [PATCH] stop using HEAD for attributes in bare repository by default
-
-With 23865355 (attr: read attributes from HEAD when bare repo,
-2023-10-13), we started to use the HEAD tree as the default
-attribute source in a bare repository.  One argument for such a
-behaviour is that it would make things like "git archive" run in
-bare and non-bare repositories for the same commit consistent.
-This changes was merged to Git 2.43 but without an explicit mention
-in its release notes.
-
-It turns out that this change destroys performance of shallowly
-cloning from a bare repository.  As the "server" installations are
-expected to be mostly bare, and "git pack-objects", which is the
-core of driving the other side of "git clone" and "git fetch" wants
-to see if a path is set not to delta with blobs from other paths via
-the attribute system, the change forces the server side to traverse
-the tree of the HEAD commit needlessly to find if each and every
-paths the objects it sends out has the attribute that controls the
-deltification.  Given that (1) most projects do not configure such
-an attribute, and (2) it is dubious for the server side to honor
-such an end-user supplied attribute anyway, this was a poor choice
-of the default.
-
-To mitigate the current situation, let's revert the change that uses
-the tree of HEAD in a bare repository by default as the attribute
-source.  This will help most people who have been happy with the
-behaviour of Git 2.42 and before.
-
-Two things to note:
-
- * If you are stuck with versions of Git 2.43 or newer, that is
-   older than the release this fix appears in, you can explicitly
-   set the attr.tree configuration variable to point at an empty
-   tree object, i.e.
-
-	$ git config attr.tree 4b825dc642cb6eb9a060e54bf8d69288fbee4904
-
- * If you like the behaviour we are reverting, you can explicitly
-   set the attr.tree configuration variable to HEAD, i.e.
-
-	$ git config attr.tree HEAD
-
-The right fix for this is to optimize the code paths that allow
-accesses to attributes in tree objects, but that is a much more
-involved change and is left as a longer-term project, outside the
-scope of this "first step" fix.
-
-Signed-off-by: Junio C Hamano <gitster@pobox.com>
----
- attr.c                  |  7 -------
- t/t0003-attributes.sh   | 10 ++++++++--
- t/t5001-archive-attr.sh |  3 ++-
- 3 files changed, 10 insertions(+), 10 deletions(-)
-
-diff --git a/attr.c b/attr.c
-index e62876dfd3e9be..02ab8436266289 100644
---- a/attr.c
-+++ b/attr.c
-@@ -1213,13 +1213,6 @@ static void compute_default_attr_source(struct object_id *attr_source)
- 		ignore_bad_attr_tree = 1;
- 	}
- 
--	if (!default_attr_source_tree_object_name &&
--	    startup_info->have_repository &&
--	    is_bare_repository()) {
--		default_attr_source_tree_object_name = "HEAD";
--		ignore_bad_attr_tree = 1;
--	}
--
- 	if (!default_attr_source_tree_object_name || !is_null_oid(attr_source))
- 		return;
- 
-diff --git a/t/t0003-attributes.sh b/t/t0003-attributes.sh
-index aee2298f01331a..5de46ddf67f7ff 100755
---- a/t/t0003-attributes.sh
-+++ b/t/t0003-attributes.sh
-@@ -384,13 +384,19 @@ test_expect_success 'bad attr source defaults to reading .gitattributes file' '
- 	)
- '
- 
--test_expect_success 'bare repo defaults to reading .gitattributes from HEAD' '
-+test_expect_success 'bare repo no longer defaults to reading .gitattributes from HEAD' '
- 	test_when_finished rm -rf test bare_with_gitattribute &&
- 	git init test &&
- 	test_commit -C test gitattributes .gitattributes "f/path test=val" &&
- 	git clone --bare test bare_with_gitattribute &&
--	echo "f/path: test: val" >expect &&
-+
-+	echo "f/path: test: unspecified" >expect &&
- 	git -C bare_with_gitattribute check-attr test -- f/path >actual &&
-+	test_cmp expect actual &&
-+
-+	echo "f/path: test: val" >expect &&
-+	git -C bare_with_gitattribute -c attr.tree=HEAD \
-+		check-attr test -- f/path >actual &&
- 	test_cmp expect actual
- '
- 
-diff --git a/t/t5001-archive-attr.sh b/t/t5001-archive-attr.sh
-index eaf959d8f63f15..7310774af5efea 100755
---- a/t/t5001-archive-attr.sh
-+++ b/t/t5001-archive-attr.sh
-@@ -133,7 +133,8 @@ test_expect_success 'git archive vs. bare' '
- '
- 
- test_expect_success 'git archive with worktree attributes, bare' '
--	(cd bare && git archive --worktree-attributes HEAD) >bare-worktree.tar &&
-+	(cd bare &&
-+	git -c attr.tree=HEAD archive --worktree-attributes HEAD) >bare-worktree.tar &&
- 	(mkdir bare-worktree && cd bare-worktree && "$TAR" xf -) <bare-worktree.tar
- '
- 

SOURCES/git-test-apache-davlockdbtype-config.patch

@@ -0,0 +1,14 @@
+diff -ur b/t/lib-httpd/apache.conf a/t/lib-httpd/apache.conf
+--- b/t/lib-httpd/apache.conf	2024-01-09 11:06:46.660868023 +0100
++++ a/t/lib-httpd/apache.conf	2024-01-09 11:09:09.572713625 +0100
+@@ -272,7 +272,9 @@
+ <IfDefine DAV>
+ 	LoadModule dav_module modules/mod_dav.so
+ 	LoadModule dav_fs_module modules/mod_dav_fs.so
+-
++	<IfDirective DavLockDBType>
++   		DavLockDBType sdbm
++	</IfDirective>
+ 	DAVLockDB DAVLock
+ 	<Location /dumb/>
+ 		Dav on

SOURCES/print-failed-test-output

@@ -10,4 +10,17 @@ for exit_file in t/test-results/*.exit; do
     printf '\n%s\n%s\n%s\n' "$sep" "$out_file" "$sep"
     cat "$out_file"
 done
+
+# tar up test-results & $testdir, then print base64 encoded output
+#
+# copy $testdir contents to test-results to avoid absolute paths with tar
+cp -a $testdir/* t/test-results/
+begin='-----BEGIN BASE64 MESSAGE-----'
+end='-----END BASE64 MESSAGE-----'
+printf '\n%s\n' 'test-results and trash directory output follows; decode via:'
+printf '%s\n' "sed -n '/^${begin}$/,/^${end}$/{/^${begin}$/!{/^${end}$/!p}}' build.log | base64 -d >output.tar.zst"
+printf '%s\n' "$begin"
+tar -C t -cf - test-results/ | zstdmt -17 | base64
+printf '%s\n' "$end"
+
 exit 1