Fix build with gcc 10
Resolves: rhbz#1800239
This commit is contained in:
parent
b7991404c4
commit
f5375f041a
@ -0,0 +1,33 @@
|
|||||||
|
From 8882c5f7788fc2ea7cae824a7fa09b82782fc81e Mon Sep 17 00:00:00 2001
|
||||||
|
From: =?UTF-8?q?Ond=C5=99ej=20Lyson=C4=9Bk?= <olysonek@redhat.com>
|
||||||
|
Date: Fri, 7 Feb 2020 11:51:46 +0100
|
||||||
|
Subject: [PATCH] Fix assignment of an enumerator of a different type
|
||||||
|
|
||||||
|
The kVSFSysStrOpenUnknown enumerator is not part of the
|
||||||
|
EVSFSysUtilOpenMode enum. The assignment causes a build failure with
|
||||||
|
gcc 10.
|
||||||
|
|
||||||
|
The open_mode variable need not be initialized, because the switch
|
||||||
|
statement either sets the variable or causes us to exit.
|
||||||
|
|
||||||
|
Resolves: rhbz#1800239
|
||||||
|
---
|
||||||
|
sysstr.c | 2 +-
|
||||||
|
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||||
|
|
||||||
|
diff --git a/sysstr.c b/sysstr.c
|
||||||
|
index d86cdf1..ff2671b 100644
|
||||||
|
--- a/sysstr.c
|
||||||
|
+++ b/sysstr.c
|
||||||
|
@@ -74,7 +74,7 @@ str_chdir(const struct mystr* p_str)
|
||||||
|
int
|
||||||
|
str_open(const struct mystr* p_str, const enum EVSFSysStrOpenMode mode)
|
||||||
|
{
|
||||||
|
- enum EVSFSysUtilOpenMode open_mode = kVSFSysStrOpenUnknown;
|
||||||
|
+ enum EVSFSysUtilOpenMode open_mode;
|
||||||
|
switch (mode)
|
||||||
|
{
|
||||||
|
case kVSFSysStrOpenReadOnly:
|
||||||
|
--
|
||||||
|
2.24.1
|
||||||
|
|
@ -2,7 +2,7 @@
|
|||||||
|
|
||||||
Name: vsftpd
|
Name: vsftpd
|
||||||
Version: 3.0.3
|
Version: 3.0.3
|
||||||
Release: 35%{?dist}
|
Release: 36%{?dist}
|
||||||
Summary: Very Secure Ftp Daemon
|
Summary: Very Secure Ftp Daemon
|
||||||
|
|
||||||
# OpenSSL link exception
|
# OpenSSL link exception
|
||||||
@ -92,6 +92,7 @@ Patch62: 0002-Prevent-recursion-in-bug.patch
|
|||||||
Patch63: 0001-Set-s_uwtmp_inserted-only-after-record-insertion-rem.patch
|
Patch63: 0001-Set-s_uwtmp_inserted-only-after-record-insertion-rem.patch
|
||||||
Patch64: 0002-Repeat-pututxline-if-it-fails-with-EINTR.patch
|
Patch64: 0002-Repeat-pututxline-if-it-fails-with-EINTR.patch
|
||||||
Patch65: 0001-Repeat-pututxline-until-it-succeeds-if-it-fails-with.patch
|
Patch65: 0001-Repeat-pututxline-until-it-succeeds-if-it-fails-with.patch
|
||||||
|
Patch66: 0001-Fix-assignment-of-an-enumerator-of-a-different-type.patch
|
||||||
|
|
||||||
%description
|
%description
|
||||||
vsftpd is a Very Secure FTP daemon. It was written completely from
|
vsftpd is a Very Secure FTP daemon. It was written completely from
|
||||||
@ -160,6 +161,10 @@ mkdir -p $RPM_BUILD_ROOT/%{_var}/ftp/pub
|
|||||||
%{_var}/ftp
|
%{_var}/ftp
|
||||||
|
|
||||||
%changelog
|
%changelog
|
||||||
|
* Fri Feb 07 2020 Ondřej Lysoněk <olysonek@redhat.com> - 3.0.3-36
|
||||||
|
- Fix build with gcc 10
|
||||||
|
- Resolves: rhbz#1800239
|
||||||
|
|
||||||
* Fri Jan 31 2020 Fedora Release Engineering <releng@fedoraproject.org> - 3.0.3-35
|
* Fri Jan 31 2020 Fedora Release Engineering <releng@fedoraproject.org> - 3.0.3-35
|
||||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild
|
- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user