Merged update from upstream sources
This is an automated DistroBaker update from upstream sources. If you do not know what this is about or would like to opt out, contact the OSCI team. Source: https://src.fedoraproject.org/rpms/opensc.git#26c61c67d9b71bcc712e983b30da2e51acf12b63
This commit is contained in:
parent
ce9358e941
commit
00829f6305
17
opensc-gcc11.patch
Normal file
17
opensc-gcc11.patch
Normal file
@ -0,0 +1,17 @@
|
||||
diff --git a/src/tools/opensc-explorer.c b/src/tools/opensc-explorer.c
|
||||
index 41e620a..57f8a79 100644
|
||||
--- a/src/tools/opensc-explorer.c
|
||||
+++ b/src/tools/opensc-explorer.c
|
||||
@@ -1839,6 +1839,12 @@ static int do_apdu(int argc, char **argv)
|
||||
if (argc < 1)
|
||||
return usage(do_apdu);
|
||||
|
||||
+ /* gcc-11 complains about BUF potentially being used without being
|
||||
+ initialized. I can't convince myself that the calls to
|
||||
+ parse_string_or_hexdata will fully initialize it, so we just
|
||||
+ initialize it here. */
|
||||
+ memset (buf, 0, sizeof (buf));
|
||||
+
|
||||
/* loop over the args and parse them, making sure the result fits into buf[] */
|
||||
for (i = 0, len = 0; i < (unsigned) argc && len < sizeof(buf); i++) {
|
||||
size_t len0 = sizeof(buf) - len;
|
@ -3,7 +3,7 @@
|
||||
|
||||
Name: opensc
|
||||
Version: 0.20.0
|
||||
Release: 8%{?dist}
|
||||
Release: 9%{?dist}
|
||||
Summary: Smart card library and applications
|
||||
|
||||
License: LGPLv2+
|
||||
@ -19,6 +19,7 @@ Patch2: opensc-0.20.0-no-common.patch
|
||||
Patch3: opensc-0.20.0-cardos.patch
|
||||
# https://github.com/OpenSC/OpenSC/commit/8551e84d
|
||||
Patch4: opensc-0.20.0-lto-build.patch
|
||||
Patch5: %{name}-gcc11.patch
|
||||
|
||||
BuildRequires: pcsc-lite-devel
|
||||
BuildRequires: readline-devel
|
||||
@ -58,6 +59,7 @@ every software/card that does so, too.
|
||||
%patch2 -p1 -b .no-common
|
||||
%patch3 -p1 -b .cardos
|
||||
%patch4 -p1 -b .lto-build
|
||||
%patch5 -p1 -b .gcc11
|
||||
|
||||
cp %{SOURCE2} tests/
|
||||
# The test-pkcs11-tool-allowed-mechanisms already works in Fedora
|
||||
@ -208,6 +210,9 @@ rm %{buildroot}%{_mandir}/man1/opensc-notify.1*
|
||||
|
||||
|
||||
%changelog
|
||||
* Fri Oct 30 2020 Jeff Law <law@redhat.com> - 0.20.0-9
|
||||
- Fix potentially uninitialized array reference exposed by gcc-11
|
||||
|
||||
* Wed Aug 19 2020 Igor Raits <ignatenkobrain@fedoraproject.org> - 0.20.0-8
|
||||
- Drop useless ldconfig scriptlets
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user