From d534bf00beacd0267825f4bcb21ad9caad9a99a1 Mon Sep 17 00:00:00 2001 From: Sam James Date: Sat, 16 Sep 2023 12:43:49 +0100 Subject: [PATCH] dev-libs/libcdio: backport test(-only) fix No revbump as it only affects the tests themselves (and fixes an error in the tests), not runtime behaviour at all. Closes: https://bugs.gentoo.org/834342 Signed-off-by: Sam James --- .../libcdio-2.1.0-realpath-test-fix.patch | 48 +++++++++++++++++++ dev-libs/libcdio/libcdio-2.1.0-r1.ebuild | 1 + 2 files changed, 49 insertions(+) create mode 100644 dev-libs/libcdio/files/libcdio-2.1.0-realpath-test-fix.patch diff --git a/dev-libs/libcdio/files/libcdio-2.1.0-realpath-test-fix.patch b/dev-libs/libcdio/files/libcdio-2.1.0-realpath-test-fix.patch new file mode 100644 index 0000000000000..10325682aec2f --- /dev/null +++ b/dev-libs/libcdio/files/libcdio-2.1.0-realpath-test-fix.patch @@ -0,0 +1,48 @@ +https://bugs.gentoo.org/834342 +https://git.savannah.gnu.org/cgit/libcdio.git/commit/?id=56335fff0f21d294cd0e478d49542a43e9495ed0 + +From 56335fff0f21d294cd0e478d49542a43e9495ed0 Mon Sep 17 00:00:00 2001 +From: "R. Bernstein" +Date: Wed, 24 Aug 2022 14:34:33 -0400 +Subject: Correct realpath test failure +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +See https://savannah.gnu.org/bugs/?62948 +Patch courtesy of Martin Liška +--- a/test/driver/realpath.c ++++ b/test/driver/realpath.c +@@ -1,5 +1,7 @@ + /* -*- C -*- +- Copyright (C) 2010-2012, 2015, 2017 Rocky Bernstein ++ ++ Copyright (C) 2010-2012, 2015, 2017, 2022 Rocky Bernstein ++ + + 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); +-- +cgit v1.1 diff --git a/dev-libs/libcdio/libcdio-2.1.0-r1.ebuild b/dev-libs/libcdio/libcdio-2.1.0-r1.ebuild index 43365dc41f6e6..122dfa96d5362 100644 --- a/dev-libs/libcdio/libcdio-2.1.0-r1.ebuild +++ b/dev-libs/libcdio/libcdio-2.1.0-r1.ebuild @@ -38,6 +38,7 @@ MULTILIB_WRAPPED_HEADERS=( PATCHES=( "${FILESDIR}/${PN}-2.1.0-ncurses_pkgconfig.patch" + "${FILESDIR}/${P}-realpath-test-fix.patch" ) src_prepare() {