packages/libcdio
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

!14 fix test case fail

Browse Source 
From: @zhouwenpei 
Reviewed-by: @t_feng 
Signed-off-by: @t_feng
This commit is contained in:
openeuler-ci-bot 2023-01-19 01:12:56 +00:00 committed by Gitee
commit 4db35e4481
No known key found for this signature in database
GPG Key ID: 173E9B9CA92EEF8F
2 changed files with 49 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

44
backport-correct-realpath-test-failure.patch Normal file
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);

6
libcdio.spec
View File

@ -1,12 +1,13 @@
Name: libcdio Name: libcdio
Version: 2.1.0 Version: 2.1.0
Release: 5 Release: 6
Summary: CD-ROM input and control library Summary: CD-ROM input and control library
License: GPLv3+ License: GPLv3+
URL: http://www.gnu.org/software/libcdio/ URL: http://www.gnu.org/software/libcdio/
Source0: https://ftp.gnu.org/gnu/libcdio/libcdio-%{version}.tar.bz2 Source0: https://ftp.gnu.org/gnu/libcdio/libcdio-%{version}.tar.bz2
Source1: https://ftp.gnu.org/gnu/libcdio/libcdio-%{version}.tar.bz2.sig Source1: https://ftp.gnu.org/gnu/libcdio/libcdio-%{version}.tar.bz2.sig
Source2: libcdio_x86_64_config.h Source2: libcdio_x86_64_config.h
Patch6000: backport-correct-realpath-test-failure.patch
Patch9000: 0001-fix-Werror-format-security.patch Patch9000: 0001-fix-Werror-format-security.patch
BuildRequires: gcc gcc-c++ pkgconfig doxygen ncurses-devel help2man chrpath gettext-devel BuildRequires: gcc gcc-c++ pkgconfig doxygen ncurses-devel help2man chrpath gettext-devel
@ -96,6 +97,9 @@ fi
%{_infodir}/* %{_infodir}/*
%changelog %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 * Mon Apr 18 2022 Chenxi Mao <chenxi.mao@suse.com> - 2.1.0-5
- Remove self-dependency - Remove self-dependency