From d57e235c8e8bac2bf861707ea7fe14f84980423d Mon Sep 17 00:00:00 2001 From: Zhao Hang Date: Wed, 26 Jun 2024 10:03:29 +0800 Subject: [PATCH 1/2] update to git-2.43.5-1.src.rpm Signed-off-by: Zhao Hang --- dist | 2 +- download | 4 +-- ...patch => git-2.43.0-core-crypto-hmac.patch | 20 ++++++------ git.spec | 32 ++++++++----------- 4 files changed, 27 insertions(+), 31 deletions(-) rename git-2.38.1-core-crypto-hmac.patch => git-2.43.0-core-crypto-hmac.patch (81%) diff --git a/dist b/dist index 5aa45c5..1fe92cf 100644 --- a/dist +++ b/dist @@ -1 +1 @@ -an8_8 +an8_10 diff --git a/download b/download index b92e4f1..b1ff92e 100644 --- a/download +++ b/download @@ -1,2 +1,2 @@ -70c7e2e9e5e5dc8daf3cb2cd6e9cfc6e git-2.39.3.tar.sign -1dcaf08f8d008cfdf177b1b8b6962879 git-2.39.3.tar.xz +fe1b6816eeda80a0ad1854afc7bbe3aa git-2.43.5.tar.sign +b2a0e95a31b41b8ed8ab5d543db823ad git-2.43.5.tar.xz diff --git a/git-2.38.1-core-crypto-hmac.patch b/git-2.43.0-core-crypto-hmac.patch similarity index 81% rename from git-2.38.1-core-crypto-hmac.patch rename to git-2.43.0-core-crypto-hmac.patch index b908ced..26343f8 100644 --- a/git-2.38.1-core-crypto-hmac.patch +++ b/git-2.43.0-core-crypto-hmac.patch @@ -1,16 +1,16 @@ -diff -ur a/builtin/receive-pack.c b/builtin/receive-pack.c ---- a/builtin/receive-pack.c 2022-10-07 06:48:26.000000000 +0200 -+++ b/builtin/receive-pack.c 2022-11-21 16:34:02.417278135 +0100 -@@ -30,6 +30,8 @@ - #include "commit-reach.h" +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 +#include static const char * const receive_pack_usage[] = { N_("git receive-pack "), -@@ -528,43 +530,11 @@ +@@ -538,43 +540,11 @@ return 0; } @@ -56,10 +56,10 @@ diff -ur a/builtin/receive-pack.c b/builtin/receive-pack.c } static char *prepare_push_cert_nonce(const char *path, timestamp_t stamp) -diff -ur a/Makefile b/Makefile ---- a/Makefile 2022-10-07 06:48:26.000000000 +0200 -+++ b/Makefile 2022-11-21 16:35:56.986792752 +0100 -@@ -2008,6 +2008,8 @@ +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 diff --git a/git.spec b/git.spec index 0551315..cfdb747 100644 --- a/git.spec +++ b/git.spec @@ -1,4 +1,3 @@ -%define anolis_release .0.1 # Pass --without docs to rpmbuild if you don't want the documentation %bcond_without docs @@ -93,8 +92,8 @@ #global rcrev .rc0 Name: git -Version: 2.39.3 -Release: 1%{?rcrev}%{anolis_release}%{?dist} +Version: 2.43.5 +Release: 1%{?rcrev}%{?dist} Summary: Fast Version Control System License: GPLv2 URL: https://git-scm.com/ @@ -127,7 +126,7 @@ Source99: print-failed-test-output Patch0: git-cvsimport-Ignore-cvsps-2.2b1-Branches-output.patch Patch1: 0001-Switch-git-instaweb-default-to-apache-2.26.2.patch # https://bugzilla.redhat.com/show_bug.cgi?id=1619113 -Patch2: git-2.38.1-core-crypto-hmac.patch +Patch2: git-2.43.0-core-crypto-hmac.patch # https://bugzilla.redhat.com/2114531 # tests: try harder to find open ports for apache, git, and svn @@ -908,18 +907,6 @@ GIT_SKIP_TESTS="$GIT_SKIP_TESTS t5300.1[02348] t5300.2[03459] t5300.30 t5300.4[5 %endif # endif rhel == 8 && arch == s390x -%if 0%{?rhel} == 8 && "%{_arch}" == "aarch64" -# Skip tests which fail on aarch64 on anolis-8 -# -# The following tests fail on aarch64 & an8. The cause should be investigated. -# However, it's a lower priority test. -# The failures seem to originate in t6300. -# -# t6300.91 'basic atom: tag objectsize:disk' -GIT_SKIP_TESTS="$GIT_SKIP_TESTS t6300.91" -%endif -# endif rhel == 8 && arch == aarch64 - export GIT_SKIP_TESTS # Set LANG so various UTF-8 tests are run @@ -1112,8 +1099,17 @@ rmdir --ignore-fail-on-non-empty "$testdir" %{?with_docs:%{_pkgdocdir}/git-svn.html} %changelog -* Wed May 24 2023 Chang Gao - 2.39.3-1.0.1 -- Skip 6300.91 test on aarch64 +* Wed Jun 05 2024 Ondřej Pohořelský - 2.43.5-1 +- Update to 2.43.5 +- Related: RHEL-36399, RHEL-36411 + +* Wed May 15 2024 Ondřej Pohořelský - 2.43.4-1 +- Update to 2.43.4 +- Resolves: RHEL-36399, RHEL-36411 + +* Wed Dec 06 2023 Ondřej Pohořelský - 2.43.0-1 +- Update to 2.43.0 +- Resolves: RHEL-17103 * Thu Apr 27 2023 Ondřej Pohořelský - 2.39.3-1 - Update to 2.39.3 -- Gitee From 012d618f8803485005cf9a7ae9425dfaedd1a1dd Mon Sep 17 00:00:00 2001 From: "taifu.gc" Date: Wed, 24 May 2023 10:03:57 +0800 Subject: [PATCH 2/2] Skip some test on aarch64 --- git.spec | 18 +++++++++++++++++- 1 file changed, 17 insertions(+), 1 deletion(-) diff --git a/git.spec b/git.spec index cfdb747..82318f5 100644 --- a/git.spec +++ b/git.spec @@ -1,3 +1,4 @@ +%define anolis_release .0.1 # Pass --without docs to rpmbuild if you don't want the documentation %bcond_without docs @@ -93,7 +94,7 @@ Name: git Version: 2.43.5 -Release: 1%{?rcrev}%{?dist} +Release: 1%{?rcrev}%{anolis_release}%{?dist} Summary: Fast Version Control System License: GPLv2 URL: https://git-scm.com/ @@ -907,6 +908,18 @@ GIT_SKIP_TESTS="$GIT_SKIP_TESTS t5300.1[02348] t5300.2[03459] t5300.30 t5300.4[5 %endif # endif rhel == 8 && arch == s390x +%if 0%{?rhel} == 8 && "%{_arch}" == "aarch64" +# Skip tests which fail on aarch64 on anolis-8 +# +# The following tests fail on aarch64 & an8. The cause should be investigated. +# However, it's a lower priority test. +# The failures seem to originate in t6300. +# +# t6300.91 'basic atom: tag objectsize:disk' +GIT_SKIP_TESTS="$GIT_SKIP_TESTS t6300.91" +%endif +# endif rhel == 8 && arch == aarch64 + export GIT_SKIP_TESTS # Set LANG so various UTF-8 tests are run @@ -1099,6 +1112,9 @@ rmdir --ignore-fail-on-non-empty "$testdir" %{?with_docs:%{_pkgdocdir}/git-svn.html} %changelog +* Wed Jun 26 2024 Chang Gao - 2.43.5-1.0.1 +- Skip 6300.91 test on aarch64 + * Wed Jun 05 2024 Ondřej Pohořelský - 2.43.5-1 - Update to 2.43.5 - Related: RHEL-36399, RHEL-36411 -- Gitee