From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id BB7C7158089 for ; Sat, 16 Sep 2023 11:44:26 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id C9CFA2BC01C; Sat, 16 Sep 2023 11:44:25 +0000 (UTC) Received: from smtp.gentoo.org (mail.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id B08722BC01C for ; Sat, 16 Sep 2023 11:44:25 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id B5246335D1B for ; Sat, 16 Sep 2023 11:44:24 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 112CC11BA for ; Sat, 16 Sep 2023 11:44:23 +0000 (UTC) From: "Sam James" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Sam James" Message-ID: <1694864653.d534bf00beacd0267825f4bcb21ad9caad9a99a1.sam@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: dev-libs/libcdio/files/, dev-libs/libcdio/ X-VCS-Repository: repo/gentoo X-VCS-Files: dev-libs/libcdio/files/libcdio-2.1.0-realpath-test-fix.patch dev-libs/libcdio/libcdio-2.1.0-r1.ebuild X-VCS-Directories: dev-libs/libcdio/files/ dev-libs/libcdio/ X-VCS-Committer: sam X-VCS-Committer-Name: Sam James X-VCS-Revision: d534bf00beacd0267825f4bcb21ad9caad9a99a1 X-VCS-Branch: master Date: Sat, 16 Sep 2023 11:44:23 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: ad053f1f-aaef-40bc-bd0f-4cafc80878a1 X-Archives-Hash: e0d9798df8a9488798daf5e58a6b8fe3 commit: d534bf00beacd0267825f4bcb21ad9caad9a99a1 Author: Sam James gentoo org> AuthorDate: Sat Sep 16 11:43:49 2023 +0000 Commit: Sam James gentoo org> CommitDate: Sat Sep 16 11:44:13 2023 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d534bf00 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 gentoo.org> .../files/libcdio-2.1.0-realpath-test-fix.patch | 48 ++++++++++++++++++++++ dev-libs/libcdio/libcdio-2.1.0-r1.ebuild | 1 + 2 files changed, 49 insertions(+) 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 000000000000..10325682aec2 --- /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 43365dc41f6e..122dfa96d536 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() {