From a0336c4092b05e1146074d069bf0077995c4afe3 Mon Sep 17 00:00:00 2001 From: liyuan Date: Thu, 21 Dec 2023 15:33:27 +0800 Subject: [PATCH] backport lib/node.c: Fix minor typo in error message --- ...de.c-Fix-minor-typo-in-error-message.patch | 25 +++++++++++++++++++ hivex.spec | 6 ++++- 2 files changed, 30 insertions(+), 1 deletion(-) create mode 100644 0001-lib-node.c-Fix-minor-typo-in-error-message.patch diff --git a/0001-lib-node.c-Fix-minor-typo-in-error-message.patch b/0001-lib-node.c-Fix-minor-typo-in-error-message.patch new file mode 100644 index 0000000..9127350 --- /dev/null +++ b/0001-lib-node.c-Fix-minor-typo-in-error-message.patch @@ -0,0 +1,25 @@ +From bb92eed6b57ed29d8230ca688ff73771b8b7e845 Mon Sep 17 00:00:00 2001 +From: "Richard W.M. Jones" +Date: Fri, 16 Jul 2021 09:49:04 +0100 +Subject: [PATCH] lib/node.c: Fix minor typo in error message + +--- + lib/node.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/lib/node.c b/lib/node.c +index 21cd127..7b002a4 100644 +--- a/lib/node.c ++++ b/lib/node.c +@@ -346,7 +346,7 @@ _hivex_get_children (hive_h *h, hive_node_h node, + if (!h->unsafe) { + SET_ERRNO (ENOTSUP, + "nr_subkeys_in_nk = %zu " +- "is not equal to number of childred read %zu", ++ "is not equal to number of children read %zu", + nr_subkeys_in_nk, nr_children); + goto error; + } else { +-- +2.33.0 + diff --git a/hivex.spec b/hivex.spec index 95ae7bd..602e6f7 100644 --- a/hivex.spec +++ b/hivex.spec @@ -6,7 +6,7 @@ Name: hivex Version: 1.3.17 -Release: 4 +Release: 5 Summary: Windows Registry "hive" extraction library License: LGPLv2 URL: http://libguestfs.org/ @@ -16,6 +16,7 @@ Source1: http://libguestfs.org/download/hivex/%{name}-%{version}.tar.gz.s Source2: libguestfs.keyring Patch0: CVE-2021-3504.patch Patch1: CVE-2021-3622.patch +Patch2: 0001-lib-node.c-Fix-minor-typo-in-error-message.patch BuildRequires: perl-interpreter, perl, perl-podlators, perl-devel, perl-generators, perl(bytes), perl(Carp), perl(Encode), perl(ExtUtils::MakeMaker), perl(Exporter), perl(IO::Scalar), perl(IO::Stringy), perl(strict), perl(Test::More), perl(utf8), perl(vars), perl(warnings), perl(XSLoader), perl(Test::Pod) >= 1.00, perl(Test::Pod::Coverage) >= 1.00 @@ -231,6 +232,9 @@ cd python3 && make check && cd .. %changelog +* Thu Dec 21 2023 liyuanyuan - 1.3.17-5 +- lib/node.c: Fix minor typo in error message + * Fri Sep 24 2021 yaoxin - 1.3.17-4 - Fix CVE-2021-3622 -- Gitee