Compare commits

...

10 Commits

Author SHA1 Message Date
openeuler-ci-bot
4db35e4481
!14 fix test case fail
From: @zhouwenpei 
Reviewed-by: @t_feng 
Signed-off-by: @t_feng
2023-01-19 01:12:56 +00:00
zhouwenpei
b0c78604fa fix test case fail 2023-01-17 08:41:41 +00:00
openeuler-ci-bot
9140c68844
!13 [sync] PR-11: 移除自我依赖
From: @openeuler-sync-bot 
Reviewed-by: @zzm_567, @yanan-rock 
Signed-off-by: @yanan-rock
2022-05-10 06:10:15 +00:00
Chenxi Mao
2378f9751e Remove self-dependency
Signed-off-by: Chenxi Mao <chenxi.mao@suse.com>
(cherry picked from commit b5fd977ae895050c392f341ba2d7ea3da0ac09c0)
2022-05-07 10:17:42 +08:00
openeuler-ci-bot
f17e96f744
!10 [sync] PR-8: Fix compiler error for option -Werror=format-security
From: @openeuler-sync-bot 
Reviewed-by: @t_feng 
Signed-off-by: @t_feng
2022-04-02 02:43:34 +00:00
Jun Yang
1810124060 Fix compiler error for option -Werror=format-security
After ncurses upgrade to 6.3, it introduces a format-security
compile error.
To fix it, a format literal string is added.

Reference: https://gitee.com/src-openeuler/gcc/issues/I4W7ZB

Signed-off-by: Jun Yang <jun.yang@suse.com>
(cherry picked from commit 6adce27012d58005c625fda28bcdc6bdb0399433)
2022-03-29 11:18:43 +08:00
openeuler-ci-bot
e85684a7b9 !7 libcdio delete -S git from %autosetup, and delete BuildRequires git
From: @chenyanpanHW
Reviewed-by: @yanan-rock
Signed-off-by: @yanan-rock
2021-08-03 08:12:58 +00:00
chenyanpanHW
83bbbac238
delete -S git from %autosetup, and delete BuildRequires git 2021-07-30 22:58:01 +08:00
openeuler-ci-bot
a89f8e4e77 !5 add old so file
From: @jinzhimin369
Reviewed-by: @orange-snn
Signed-off-by: @orange-snn
2021-02-09 16:03:35 +08:00
jzm369
2fb07f66a4 add old so file 2021-02-09 15:11:59 +08:00
3 changed files with 103 additions and 3 deletions

View File

@ -0,0 +1,39 @@
From 0e2d1498f1172c764eecbd1f278cf65740db0eb4 Mon Sep 17 00:00:00 2001
From: Jun Yang <jun.yang@suse.com>
Date: Wed, 9 Mar 2022 17:35:21 +0800
Subject: [PATCH] fix compiler error for option -Werror=format-security
Signed-off-by: Jun Yang <jun.yang@suse.com>
---
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..3566ca0 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, (char *) "%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, (char *) "%s", line);
attroff(A_STANDOUT);
} else
- mvprintw(i_line++, 0, line);
+ mvprintw(i_line++, 0, (char *) "%s", line);
clrtoeol();
}
}
--
2.34.1

View File

@ -0,0 +1,44 @@
commit 56335fff0f21d294cd0e478d49542a43e9495ed0
Author: R. Bernstein <rocky@gnu.org>
Date: Wed Aug 24 14:34:33 2022 -0400
Correct realpath test failure
See https://savannah.gnu.org/bugs/?62948
Patch courtesy of Martin Liška <marxin>
diff --git a/test/driver/realpath.c b/test/driver/realpath.c
index 289253e4..cd46d620 100644
--- a/test/driver/realpath.c
+++ b/test/driver/realpath.c
@@ -1,5 +1,7 @@
/* -*- C -*-
- Copyright (C) 2010-2012, 2015, 2017 Rocky Bernstein <rocky@gnu.org>
+
+ Copyright (C) 2010-2012, 2015, 2017, 2022 Rocky Bernstein
+ <rocky@gnu.org>
This program is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
@@ -175,16 +177,17 @@ main(int argc, const char *argv[])
rc = check_rc(symlink(psz_symlink_file, psz_symlink_file),
"symlink", psz_symlink_file);
if (0 == rc) {
- cdio_realpath(psz_symlink_file, psz_file_check);
- if (0 != strncmp(psz_file_check, symlink_file, PATH_MAX)) {
+ char *retvalue = cdio_realpath(psz_symlink_file, psz_file_check);
+ if (0 != retvalue) {
+ if (0 != strncmp(psz_file_check, symlink_file, PATH_MAX)) {
fprintf(stderr, "direct cdio_realpath cycle test failed. %s vs %s\n",
psz_file_check, symlink_file);
rc = 5;
goto err_exit;
+ }
+ check_rc(unlink(psz_symlink_file), "unlink", psz_symlink_file);
}
- check_rc(unlink(psz_symlink_file), "unlink", psz_symlink_file);
}
-
}
check_rc(unlink(psz_orig_file), "unlink", psz_orig_file);

View File

@ -1,14 +1,16 @@
Name: libcdio
Version: 2.1.0
Release: 1
Release: 6
Summary: CD-ROM input and control library
License: GPLv3+
URL: http://www.gnu.org/software/libcdio/
Source0: https://ftp.gnu.org/gnu/libcdio/libcdio-%{version}.tar.bz2
Source1: https://ftp.gnu.org/gnu/libcdio/libcdio-%{version}.tar.bz2.sig
Source2: libcdio_x86_64_config.h
Patch6000: backport-correct-realpath-test-failure.patch
Patch9000: 0001-fix-Werror-format-security.patch
BuildRequires: gcc gcc-c++ git pkgconfig doxygen ncurses-devel help2man chrpath gettext-devel
BuildRequires: gcc gcc-c++ pkgconfig doxygen ncurses-devel help2man chrpath gettext-devel
Requires(post): /sbin/ldconfig
Requires(post): /sbin/install-info
Requires(preun): /sbin/install-info
@ -28,7 +30,7 @@ This package contains header files and development Files for for %{name}.
%package_help
%prep
%autosetup -n %{name}-%{version} -p1 -S git
%autosetup -n %{name}-%{version} -p1
iconv -f ISO88591 -t utf-8 -o THANKS.utf8 THANKS && mv THANKS.utf8 THANKS
%build
@ -95,6 +97,21 @@ fi
%{_infodir}/*
%changelog
* Tue Jan 17 2023 zhouwenpei <zhouwenpei@h-partners.com> - 2.1.0-6
- fix test case fail
* Mon Apr 18 2022 Chenxi Mao <chenxi.mao@suse.com> - 2.1.0-5
- Remove self-dependency
* Fri Mar 11 2022 JunYang <jun.yang@suse.com> - 2.1.0-4
- Fix compiler error for option -Werror=format-security
* Fri Jul 30 2021 chenyanpanHW <chenyanpan@huawei.com> - 2.1.0-3
- DESC: delete -S git from %autosetup, and delete BuildRequires git
* Tue Feb 9 2021 jinzhimin <jinzhimin2@huawei.com> - 2.1.0-2
- add old so file
* Fri Jan 29 2021 zhanzhimin <zhanzhimin@huawei.com> - 2.1.0-1
- update to 2.1.0