From 9323031c03a8a93098509590bbb093e354edc957 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ond=C5=99ej=20Poho=C5=99elsk=C3=BD?= Date: Tue, 9 Jan 2024 11:47:09 +0100 Subject: [PATCH] apache.conf set DavLockDBType to sdbm With the recent change that drops apr-util-bdb build require, in favor of httpd, t5540 started failing on tests using git-httpd-push. This patch sets DavLockDBType to sdbm, fixing these failures. --- git-test-apache-davlockdbtype-config.patch | 14 ++++++++++++++ git.spec | 4 ++++ 2 files changed, 18 insertions(+) create mode 100644 git-test-apache-davlockdbtype-config.patch diff --git a/git-test-apache-davlockdbtype-config.patch b/git-test-apache-davlockdbtype-config.patch new file mode 100644 index 0000000..882006a --- /dev/null +++ b/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 @@ + + LoadModule dav_module modules/mod_dav.so + LoadModule dav_fs_module modules/mod_dav_fs.so +- ++ ++ DavLockDBType sdbm ++ + DAVLockDB DAVLock + + Dav on diff --git a/git.spec b/git.spec index 0c907b8..5a1b814 100644 --- a/git.spec +++ b/git.spec @@ -130,6 +130,10 @@ Patch3: 0003-t-lib-git-svn-try-harder-to-find-a-port.patch # https://bugzilla.redhat.com/show_bug.cgi?id=2247532#c8 Patch4: 0001-send-email-avoid-duplicate-specification-warnings.patch +# Configurates Apache test server to use `DavLockDBType sdbm` +# Prevents t5540 failures on i686, s390x and ppc64le +Patch5: git-test-apache-davlockdbtype-config.patch + %if %{with docs} # pod2man is needed to build Git.3pm BuildRequires: /usr/bin/pod2man