Add patch for libcdio to build with ncurses 6.3 (#3215)

* add patch for libcdio

* license verified
This commit is contained in:
Andrew Phelps 2022-06-22 14:32:06 -07:00 committed by GitHub
parent ce21ffa820
commit abd4320c3f
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 57 additions and 1 deletions

View File

@ -0,0 +1,50 @@
http://git.savannah.gnu.org/cgit/libcdio.git/patch/?id=2adb43c60afc6e98e94d86dad9f93d3df52862b1
From 2adb43c60afc6e98e94d86dad9f93d3df52862b1 Mon Sep 17 00:00:00 2001
From: Sergei Trofimovich <slyich@gmail.com>
Date: Mon, 1 Nov 2021 08:00:30 +0000
Subject: src/cdda-player.c: always use "%s"-style format for printf()-style
functions
`ncuses-6.3` added printf-style function attributes and now makes
it easier to catch cases when user input is used in palce of format
string when built with CFLAGS=-Werror=format-security:
cdda-player.c:1032:31:
error: format not a string literal and no format arguments [-Werror=format-security]
1032 | mvprintw(i_line++, 0, line);
| ^~~~
Let's wrap all the missing places with "%s" format.
---
src/cdda-player.c | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/src/cdda-player.c b/src/cdda-player.c
index 69eddee..8834d60 100644
--- a/src/cdda-player.c
+++ b/src/cdda-player.c
@@ -298,7 +298,7 @@ action(const char *psz_action)
psz_action);
else
snprintf(psz_action_line, sizeof(psz_action_line), "%s", "" );
- mvprintw(LINE_ACTION, 0, psz_action_line);
+ mvprintw(LINE_ACTION, 0, "%s", psz_action_line);
clrtoeol();
refresh();
}
@@ -1029,10 +1029,10 @@ display_tracks(void)
}
if (sub.track == i) {
attron(A_STANDOUT);
- mvprintw(i_line++, 0, line);
+ mvprintw(i_line++, 0, "%s", line);
attroff(A_STANDOUT);
} else
- mvprintw(i_line++, 0, line);
+ mvprintw(i_line++, 0, "%s", line);
clrtoeol();
}
}
--
cgit v1.1

View File

@ -2,7 +2,7 @@ Vendor: Microsoft Corporation
Distribution: Mariner
Name: libcdio
Version: 2.0.0
Release: 7%{?dist}
Release: 8%{?dist}
Summary: CD-ROM input and control library
License: GPLv3+
URL: http://www.gnu.org/software/libcdio/
@ -16,6 +16,7 @@ BuildRequires: ncurses-devel
BuildRequires: help2man
BuildRequires: gettext-devel
BuildRequires: chrpath
Patch0: fix_format_security.patch
# ABI compatibility package dropped in F23
@ -38,6 +39,7 @@ This package contains header files and libraries for %{name}.
%prep
%setup -q
%patch0 -p1
iconv -f ISO88591 -t utf-8 -o THANKS.utf8 THANKS && mv THANKS.utf8 THANKS
@ -121,6 +123,10 @@ make check
%changelog
* Tue Jun 21 2022 Andrew Phelps <anphel@microsoft.com> - 2.0.0-8
- Add patch to fix build error with ncurses 6.3
- License verified
* Fri Oct 15 2021 Pawel Winogrodzki <pawelwi@microsoft.com> - 2.0.0-7
- Initial CBL-Mariner import from Fedora 32 (license: MIT).