Compare commits
No commits in common. "c8" and "c9s" have entirely different histories.
3
.gitignore
vendored
3
.gitignore
vendored
@ -1 +1,2 @@
|
||||
SOURCES/libgpg-error-1.31.tar.bz2
|
||||
/libgpg-error-*.tar.bz2
|
||||
/libgpg-error-*.tar.bz2.sig
|
||||
|
@ -1 +0,0 @@
|
||||
2bafad316d4e3e12bae4822b14ed9020090e6acf SOURCES/libgpg-error-1.31.tar.bz2
|
Binary file not shown.
7
gating.yaml
Normal file
7
gating.yaml
Normal file
@ -0,0 +1,7 @@
|
||||
--- !Policy
|
||||
product_versions:
|
||||
- rhel-9
|
||||
decision_context: osci_compose_gate
|
||||
rules:
|
||||
- !PassingTestCaseRule {test_case_name: baseos-ci.brew-build.tier1.functional}
|
||||
- !PassingTestCaseRule {test_case_name: baseos-ci.brew-build.tedude.validation}
|
177
libgpg-error-1.42-coverity.patch
Normal file
177
libgpg-error-1.42-coverity.patch
Normal file
@ -0,0 +1,177 @@
|
||||
From 89a353f418f5e879ab5564ec0767a6cbdb19d51c Mon Sep 17 00:00:00 2001
|
||||
From: NIIBE Yutaka <gniibe@fsij.org>
|
||||
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 <jjelen@redhat.com>
|
||||
Signed-off-by: NIIBE Yutaka <gniibe@fsij.org>
|
||||
---
|
||||
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 <gniibe@fsij.org>
|
||||
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 <jjelen@redhat.com>
|
||||
Signed-off-by: NIIBE Yutaka <gniibe@fsij.org>
|
||||
---
|
||||
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 <jjelen@redhat.com>
|
||||
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 <jjelen@redhat.com>
|
||||
---
|
||||
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 <jjelen@redhat.com>
|
||||
Date: Wed, 7 Apr 2021 11:56:40 +0200
|
||||
Subject: [PATCH Libgpg-error 4/4] logging: Supress cppcheck warning
|
||||
|
||||
Signed-off-by: Jakub Jelen <jjelen@redhat.com>
|
||||
---
|
||||
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
|
||||
|
30
libgpg-error-1.42-inet_pton.patch
Normal file
30
libgpg-error-1.42-inet_pton.patch
Normal file
@ -0,0 +1,30 @@
|
||||
From 75e06a7861cb4a8479a382946217e846e9b58154 Mon Sep 17 00:00:00 2001
|
||||
From: Jakub Jelen <jjelen@redhat.com>
|
||||
Date: Mon, 6 Dec 2021 20:52:57 +0100
|
||||
Subject: [PATCH Libgpg-error] configure: Add missing check for logging
|
||||
|
||||
* configure.ac: Add missing check for inet_pton to avoid using inet_addr
|
||||
in modern systems.
|
||||
--
|
||||
|
||||
Signed-off-by: Jakub Jelen <jjelen@redhat.com>
|
||||
---
|
||||
configure.ac | 2 +-
|
||||
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||
|
||||
diff --git a/configure.ac b/configure.ac
|
||||
index da013d8..3686a9c 100644
|
||||
--- a/configure.ac
|
||||
+++ b/configure.ac
|
||||
@@ -215,7 +215,7 @@ AC_SUBST(INSTALLSHELLPATH)
|
||||
|
||||
AC_FUNC_FORK
|
||||
AC_CHECK_FUNCS([flockfile vasprintf mmap rand strlwr stpcpy setenv stat \
|
||||
- getrlimit getpwnam getpwuid getpwnam_r getpwuid_r ])
|
||||
+ getrlimit getpwnam getpwuid getpwnam_r getpwuid_r inet_pton ])
|
||||
|
||||
|
||||
#
|
||||
--
|
||||
2.31.1
|
||||
|
@ -1,20 +1,23 @@
|
||||
Summary: Library for error values used by GnuPG components
|
||||
Name: libgpg-error
|
||||
Version: 1.31
|
||||
Release: 1%{?dist}
|
||||
Version: 1.42
|
||||
Release: 5%{?dist}
|
||||
Summary: Library for error values used by GnuPG components
|
||||
URL: https://www.gnupg.org/related_software/libgpg-error/
|
||||
Source0: ftp://ftp.gnupg.org/gcrypt/libgpg-error/%{name}-%{version}.tar.bz2
|
||||
Source1: ftp://ftp.gnupg.org/gcrypt/libgpg-error/%{name}-%{version}.tar.bz2.sig
|
||||
Patch1: libgpg-error-1.29-multilib.patch
|
||||
Group: System Environment/Libraries
|
||||
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
|
||||
# https://dev.gnupg.org/T5381
|
||||
Patch2: libgpg-error-1.42-coverity.patch
|
||||
# https://dev.gnupg.org/T5720
|
||||
Patch3: libgpg-error-1.42-inet_pton.patch
|
||||
|
||||
BuildRequires: gcc
|
||||
BuildRequires: gawk, gettext, autoconf, automake, gettext-devel, libtool
|
||||
BuildRequires: texinfo
|
||||
%if 0%{?fedora} > 13
|
||||
BuildRequires: gettext-autopoint
|
||||
%endif
|
||||
BuildRequires: make
|
||||
|
||||
%description
|
||||
This is a library that defines common error values for all GnuPG
|
||||
@ -23,10 +26,8 @@ pinentry, SmartCard Daemon and possibly more in the future.
|
||||
|
||||
%package devel
|
||||
Summary: Development files for the %{name} package
|
||||
Group: Development/Libraries
|
||||
Requires: %{name}%{?_isa} = %{version}-%{release}
|
||||
Requires(pre): /sbin/install-info
|
||||
Requires(post): /sbin/install-info
|
||||
Requires: pkgconfig
|
||||
|
||||
%description devel
|
||||
This is a library that defines common error values for all GnuPG
|
||||
@ -37,22 +38,27 @@ contains files necessary to develop applications using libgpg-error.
|
||||
%prep
|
||||
%setup -q
|
||||
%patch1 -p1 -b .multilib
|
||||
%patch2 -p1 -b .coverity
|
||||
%patch3 -p1 -b .inet_pton
|
||||
|
||||
autoreconf -f
|
||||
|
||||
# The config script already suppresses the -L if it's /usr/lib, so cheat and
|
||||
# set it to a value which we know will be suppressed.
|
||||
sed -i -e 's|^libdir=@libdir@$|libdir=@exec_prefix@/lib|g;s|@GPG_ERROR_CONFIG_HOST@|none|g' src/gpg-error-config.in
|
||||
sed -i -e '/--variable=host/d' src/gpg-error-config-test.sh.in
|
||||
|
||||
# Modify configure to drop rpath for /usr/lib64
|
||||
sed -i -e 's|sys_lib_dlsearch_path_spec="/lib /usr/lib|sys_lib_dlsearch_path_spec="/lib /usr/lib %{_libdir}|g' configure
|
||||
|
||||
%build
|
||||
%configure --disable-static --disable-rpath --disable-languages
|
||||
make %{?_smp_mflags}
|
||||
%make_build
|
||||
|
||||
%install
|
||||
rm -fr $RPM_BUILD_ROOT
|
||||
make install DESTDIR=$RPM_BUILD_ROOT
|
||||
rm -f $RPM_BUILD_ROOT/%{_libdir}/*.la
|
||||
rm -f $RPM_BUILD_ROOT/%{_infodir}/dir
|
||||
%make_install
|
||||
rm -f $RPM_BUILD_ROOT%{_libdir}/*.la
|
||||
rm -f $RPM_BUILD_ROOT%{_infodir}/dir
|
||||
|
||||
%find_lang %{name}
|
||||
|
||||
@ -61,40 +67,80 @@ make check
|
||||
|
||||
%ldconfig_scriptlets
|
||||
|
||||
%post devel
|
||||
[ -f %{_infodir}/gpgrt.info.gz ] && \
|
||||
/sbin/install-info %{_infodir}/gpgrt.info.gz %{_infodir}/dir
|
||||
exit 0
|
||||
|
||||
%preun devel
|
||||
if [ $1 = 0 -a -f %{_infodir}/gpgrt.info.gz ]; then
|
||||
/sbin/install-info --delete %{_infodir}/gpgrt.info.gz %{_infodir}/dir
|
||||
fi
|
||||
exit 0
|
||||
|
||||
%files -f %{name}.lang
|
||||
%defattr(-,root,root)
|
||||
%{!?_licensedir:%global license %%doc}
|
||||
%license COPYING COPYING.LIB
|
||||
%doc AUTHORS README NEWS ChangeLog
|
||||
%doc AUTHORS README NEWS
|
||||
%{_bindir}/gpg-error
|
||||
%{_libdir}/libgpg-error.so.0*
|
||||
%{_datadir}/libgpg-error
|
||||
|
||||
%files devel
|
||||
%defattr(-,root,root)
|
||||
%{_bindir}/gpg-error-config
|
||||
%{_bindir}/gpgrt-config
|
||||
%{_bindir}/yat2m
|
||||
%{_libdir}/libgpg-error.so
|
||||
%{_libdir}/pkgconfig/gpg-error.pc
|
||||
%{_includedir}/gpg-error.h
|
||||
%{_includedir}/gpgrt.h
|
||||
%{_datadir}/aclocal/gpg-error.m4
|
||||
%{_datadir}/aclocal/gpgrt.m4
|
||||
%{_infodir}/gpgrt.info*
|
||||
%{_mandir}/man1/gpg-error-config.*
|
||||
%{_mandir}/man1/gpgrt-config.*
|
||||
|
||||
%changelog
|
||||
* Mon Dec 06 2021 Jakub Jelen <jjelen@redhat.com> - 1.42-5
|
||||
- Avoid using bad function inet_addr
|
||||
|
||||
* Mon Aug 09 2021 Mohan Boddu <mboddu@redhat.com> - 1.42-4
|
||||
- Rebuilt for IMA sigs, glibc 2.34, aarch64 flags
|
||||
Related: rhbz#1991688
|
||||
|
||||
* Fri Apr 16 2021 Mohan Boddu <mboddu@redhat.com> - 1.42-3
|
||||
- Rebuilt for RHEL 9 BETA on Apr 15th 2021. Related: rhbz#1947937
|
||||
|
||||
* Mon Apr 12 2021 Jakub Jelen <jjelen@redhat.com> - 1.42-2
|
||||
- Address coverity reported issues
|
||||
|
||||
* Mon Mar 22 2021 Jakub Jelen <jjelen@redhat.com> - 1.42-1
|
||||
- New upstream release (#1941582)
|
||||
|
||||
* Tue Jan 26 2021 Fedora Release Engineering <releng@fedoraproject.org> - 1.41-2
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
|
||||
|
||||
* Mon Jan 04 2021 Jakub Jelen <jjelen@redhat.com> - 1.41-1
|
||||
- New upstream release (#1909749)
|
||||
|
||||
* Tue Dec 01 2020 Jakub Jelen <jjelen@redhat.com> - 1.39-1
|
||||
- New upstream release (#1800640)
|
||||
|
||||
* Tue Jul 28 2020 Fedora Release Engineering <releng@fedoraproject.org> - 1.37-2
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
|
||||
|
||||
* Fri Feb 28 2020 Tomáš Mráz <tmraz@redhat.com> 1.37-1
|
||||
- new upstream release 1.37
|
||||
|
||||
* Wed Jan 29 2020 Fedora Release Engineering <releng@fedoraproject.org> - 1.36-3
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild
|
||||
|
||||
* Wed Aug 14 2019 Tomáš Mráz <tmraz@redhat.com> 1.36-2
|
||||
- fix FTBFS in rawhide due to new gawk
|
||||
|
||||
* Sat Aug 3 2019 Peter Robinson <pbrobinson@fedoraproject.org> 1.36-1
|
||||
- new upstream release 1.36
|
||||
|
||||
* Thu Jul 25 2019 Fedora Release Engineering <releng@fedoraproject.org> - 1.33-3
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
|
||||
|
||||
* Fri Feb 01 2019 Fedora Release Engineering <releng@fedoraproject.org> - 1.33-2
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
|
||||
|
||||
* Tue Jan 08 2019 Tomáš Mráz <tmraz@redhat.com> 1.33-1
|
||||
- new upstream release 1.33
|
||||
- dropped obsolete install-info scriptlets
|
||||
|
||||
* Fri Jul 13 2018 Fedora Release Engineering <releng@fedoraproject.org> - 1.31-2
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild
|
||||
|
||||
* Mon Jun 11 2018 Tomáš Mráz <tmraz@redhat.com> 1.31-1
|
||||
- new upstream release 1.31
|
||||
|
2
sources
Normal file
2
sources
Normal file
@ -0,0 +1,2 @@
|
||||
SHA512 (libgpg-error-1.42.tar.bz2) = f6d95712a874edefc39a7746062c8037a62801a550560c5b2eab08b5b86987c1de5be60eba5fcb56d35a37db109aa32d07b7eff2bb99800c1c47d2227421a8f4
|
||||
SHA512 (libgpg-error-1.42.tar.bz2.sig) = 216f098c14779e118573e238552496a84d065edf069a42fc82ed4e981480ce8a5d172d8ec69fc5060b12474952e62856c6b59907182527897fb810d54a03b618
|
Loading…
Reference in New Issue
Block a user