From dc2e1e141ac75d34fdc781c20e599d88e5d41327 Mon Sep 17 00:00:00 2001 From: lyn1001 Date: Fri, 13 May 2022 11:47:25 +0800 Subject: [PATCH] Remove error-prone, redundant test (cherry picked from commit 43ca2c7183abdcc6d7c3e608f36e64c222e6a274) --- Remove-error-prone-redundant-test.patch | 13 +++++++++++++ libgit2.spec | 6 +++++- 2 files changed, 18 insertions(+), 1 deletion(-) create mode 100644 Remove-error-prone-redundant-test.patch diff --git a/Remove-error-prone-redundant-test.patch b/Remove-error-prone-redundant-test.patch new file mode 100644 index 0000000..e80e31c --- /dev/null +++ b/Remove-error-prone-redundant-test.patch @@ -0,0 +1,13 @@ +diff --git a/tests/refs/revparse.c b/tests/refs/revparse.c +index 459188c..2bb19ff 100644 +--- a/tests/refs/revparse.c ++++ b/tests/refs/revparse.c +@@ -400,8 +400,6 @@ void test_refs_revparse__date(void) + * a65fedf HEAD@{1335806603 -0900}: commit: + * be3563a HEAD@{1335806563 -0700}: clone: from /Users/ben/src/libgit2/tests/resour + */ +- test_object("HEAD@{10 years ago}", NULL); +- + test_object("HEAD@{1 second}", "a65fedf39aefe402d3bb6e24df4d4f5fe4547750"); + test_object("HEAD@{1 second ago}", "a65fedf39aefe402d3bb6e24df4d4f5fe4547750"); + test_object("HEAD@{2 days ago}", "a65fedf39aefe402d3bb6e24df4d4f5fe4547750"); diff --git a/libgit2.spec b/libgit2.spec index 19415f6..70c99c1 100644 --- a/libgit2.spec +++ b/libgit2.spec @@ -1,6 +1,6 @@ Name: libgit2 Version: 0.27.8 -Release: 4 +Release: 5 Summary: portable, pure C implementation of the Git core methods License: GPLv2 with exceptions URL: https://libgit2.org @@ -9,6 +9,7 @@ Source0: https://github.com/libgit2/libgit2/archive/v%{version}.tar.gz Patch0001: 0001-tests-don-t-run-buf-oom-on-32-bit-systems.patch Patch0002: CVE-2020-12278.patch Patch0003: CVE-2020-12279.patch +Patch0004: Remove-error-prone-redundant-test.patch BuildRequires: gcc cmake >= 2.8.11 ninja-build http-parser-devel libcurl-devel BuildRequires: libssh2-devel openssl-devel python3 zlib-devel @@ -57,6 +58,9 @@ sed -i '/ADD_TEST(online/s/^/#/' tests/CMakeLists.txt %{_includedir}/git2* %changelog +* Fri May 13 2022 liyanan - 0.27.8-5 +- Remove error-prone, redundant test + * Fri Jul 23 2021 guoxiaoqi - 0.27.8-4 - fix CVE-2020-12278 and CVE-2020-12279