diff --git a/libgpg-error-1.42-coverity.patch b/libgpg-error-1.42-coverity.patch deleted file mode 100644 index 2618eb3..0000000 --- a/libgpg-error-1.42-coverity.patch +++ /dev/null @@ -1,177 +0,0 @@ -From 89a353f418f5e879ab5564ec0767a6cbdb19d51c Mon Sep 17 00:00:00 2001 -From: NIIBE Yutaka -Date: Wed, 7 Apr 2021 16:59:35 +0900 -Subject: [PATCH Libgpg-error 1/4] build: Fix gpgrt-config for handling - 'Requires' field. - -* src/gpgrt-config.in (get_attr_l): Fix thinko for word split. - --- - -GnuPG-bug-id: 5381 -Reported-by: Jakub Jelen -Signed-off-by: NIIBE Yutaka ---- - src/gpgrt-config.in | 3 ++- - 1 file changed, 2 insertions(+), 1 deletion(-) - -diff --git a/src/gpgrt-config.in b/src/gpgrt-config.in -index 0fe14e8..6352384 100644 ---- a/src/gpgrt-config.in -+++ b/src/gpgrt-config.in -@@ -1,4 +1,5 @@ - #!@INSTALLSHELLPATH@ -+# -*- mode: shell-script; sh-shell: "/bin/sh" -*- - # Copyright (C) 2018, 2021 g10 Code GmbH - # - # This file is free software; as a special exception the author gives -@@ -41,7 +42,7 @@ get_attr () { - - # variant of get_attr for list (separated by ',') - get_attr_l () { -- (IFS=', '; for x in "$(get_attr $1)"; do echo $x; done) -+ (IFS=', '; echo "$(get_attr $1)") - } - - # Remove ${varname} part in the beginning of a string. --- -2.30.2 - - -From 956c40f106ead6d0191bc183805021e70c15e760 Mon Sep 17 00:00:00 2001 -From: NIIBE Yutaka -Date: Thu, 8 Apr 2021 10:58:56 +0900 -Subject: [PATCH Libgpg-error 2/4] core: Fix gpgrt_wait_processes, by skipping - invalid PID. - -* src/spawn-posix.c (_gpgrt_wait_processes): Skip invalid PID. - --- - -The API itself is not good to handle multiple processes. Given the -API, skipping invalid PID is better for usefulness. - -GnuPG-bug-id: 5381 -Reported-by: Jakub Jelen -Signed-off-by: NIIBE Yutaka ---- - src/spawn-posix.c | 7 ++++++- - 1 file changed, 6 insertions(+), 1 deletion(-) - -diff --git a/src/spawn-posix.c b/src/spawn-posix.c -index ac4c4ce..d33bade 100644 ---- a/src/spawn-posix.c -+++ b/src/spawn-posix.c -@@ -703,8 +703,13 @@ _gpgrt_wait_processes (const char **pgmnames, pid_t *pids, size_t count, - { - int status = -1; - -+ /* Skip invalid PID. */ - if (pids[i] == (pid_t)(-1)) -- return GPG_ERR_INV_VALUE; -+ { -+ r_exitcodes[i] = -1; -+ left -= 1; -+ continue; -+ } - - /* See if there was a previously stored result for this pid. */ - if (get_result (pids[i], &status)) --- -2.30.2 - - -From ad062b0a5b7d598081405ecfb71b51540281a1b7 Mon Sep 17 00:00:00 2001 -From: Jakub Jelen -Date: Mon, 12 Apr 2021 13:06:17 +0900 -Subject: [PATCH Libgpg-error 3/4] build,tests: Fix leaks of memory or file - pointer. - -* src/mkheader.c (parse_config_h): Close FP. -* tests/t-b64.c (test_b64enc_string): Free STATE. -(test_b64dec_string): Free BUFFER. -* tests/t-syserror.c (main): Close FP. - --- - -GnuPG-bug-id: 5381 -Signed-off-by: Jakub Jelen ---- - src/mkheader.c | 1 + - tests/t-b64.c | 2 ++ - tests/t-syserror.c | 1 + - 3 files changed, 4 insertions(+) - -diff --git a/src/mkheader.c b/src/mkheader.c -index 77826da..1d2ea20 100644 ---- a/src/mkheader.c -+++ b/src/mkheader.c -@@ -244,6 +244,7 @@ parse_config_h (const char *fname) - { - fprintf (stderr, "%s:%d: error reading file: %s\n", - fname, lnr, strerror (errno)); -+ fclose (fp); - return 1; - } - -diff --git a/tests/t-b64.c b/tests/t-b64.c -index 0171909..db08fc0 100644 ---- a/tests/t-b64.c -+++ b/tests/t-b64.c -@@ -108,6 +108,7 @@ test_b64enc_string (const char *string, const char *expected, const char *title) - err = gpgrt_b64enc_write (state, string, strlen (string)); - if (err) - { -+ free (state); - fail ("gpgrt_b64enc_write failed: %s\n", gpg_strerror (err)); - return err; - } -@@ -191,6 +192,7 @@ test_b64dec_string (const char *string, const char *expected, const char *title) - gpgrt_log_debug_string (expected, "expect(len=%zu): ", - strlen (expected)); - } -+ free (buffer); - return GPG_ERR_FALSE; - } - -diff --git a/tests/t-syserror.c b/tests/t-syserror.c -index a4cb983..93264dd 100644 ---- a/tests/t-syserror.c -+++ b/tests/t-syserror.c -@@ -49,6 +49,7 @@ main (int argc, char *argv[]) - } - if (fp) - { -+ fclose (fp); - fprintf (stderr, "unable to run test\n"); - return 1; - } --- -2.30.2 - - -From 5e60ba508a2b23aa73a9b26616e1dd3f1fc1cb7d Mon Sep 17 00:00:00 2001 -From: Jakub Jelen -Date: Wed, 7 Apr 2021 11:56:40 +0200 -Subject: [PATCH Libgpg-error 4/4] logging: Supress cppcheck warning - -Signed-off-by: Jakub Jelen ---- - src/logging.c | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/src/logging.c b/src/logging.c -index e4b7e40..69bf8c5 100644 ---- a/src/logging.c -+++ b/src/logging.c -@@ -1274,6 +1274,7 @@ _gpgrt_log_printhex (const void *buffer, size_t length, - * complains about uninitialized use. */ - static va_list dummy_argptr; - -+ // cppcheck-suppress va_list_usedBeforeStarted - _gpgrt_logv_printhex (buffer, length, NULL, dummy_argptr); - } - } --- -2.30.2 - diff --git a/libgpg-error.spec b/libgpg-error.spec index 0eff5ce..692a30d 100644 --- a/libgpg-error.spec +++ b/libgpg-error.spec @@ -1,6 +1,6 @@ Name: libgpg-error -Version: 1.42 -Release: 3%{?dist} +Version: 1.43 +Release: 1%{?dist} Summary: Library for error values used by GnuPG components URL: https://www.gnupg.org/related_software/libgpg-error/ License: LGPLv2+ @@ -8,7 +8,6 @@ License: LGPLv2+ Source0: https://www.gnupg.org/ftp/gcrypt/libgpg-error/%{name}-%{version}.tar.bz2 Source1: https://www.gnupg.org/ftp/gcrypt/libgpg-error/%{name}-%{version}.tar.bz2.sig Patch1: libgpg-error-1.29-multilib.patch -Patch2: libgpg-error-1.42-coverity.patch BuildRequires: gcc BuildRequires: gawk, gettext, autoconf, automake, gettext-devel, libtool @@ -35,7 +34,6 @@ contains files necessary to develop applications using libgpg-error. %prep %setup -q %patch1 -p1 -b .multilib -%patch2 -p1 -b .coverity autoreconf -f @@ -84,6 +82,9 @@ make check %{_mandir}/man1/gpgrt-config.* %changelog +* Wed Nov 03 2021 Jakub Jelen - 1.43-1 +- New upstream release (#2019881) + * Thu Jul 22 2021 Fedora Release Engineering - 1.42-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild diff --git a/sources b/sources index ca9b1b7..2248100 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (libgpg-error-1.42.tar.bz2) = f6d95712a874edefc39a7746062c8037a62801a550560c5b2eab08b5b86987c1de5be60eba5fcb56d35a37db109aa32d07b7eff2bb99800c1c47d2227421a8f4 -SHA512 (libgpg-error-1.42.tar.bz2.sig) = 216f098c14779e118573e238552496a84d065edf069a42fc82ed4e981480ce8a5d172d8ec69fc5060b12474952e62856c6b59907182527897fb810d54a03b618 +SHA512 (libgpg-error-1.43.tar.bz2) = 36769a62d0b4b219a6d58195bed692e34d3b0313f628b1036055ca34b69332edbe6bcdace9855a60d06e7be5998dc13bf1305d0b2bb211a4d8f701e85040961c +SHA512 (libgpg-error-1.43.tar.bz2.sig) = 071e2743e9d1b22b5dce1cdb001f6946bc2003bd65393df5e6112ac005f3f5d122957d88e9861213539c424e8e9861970c6210a7a9aa289aafcd8fa6defd5aa2