From 7b830374520118e805fdd214530a389653750f51 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Sat, 16 Sep 2023 17:00:58 +0100 Subject: gentoo auto-resync : 16:09:2023 - 17:00:58 --- dev-libs/libcdio/Manifest | 3 +- .../files/libcdio-2.1.0-realpath-test-fix.patch | 48 ++++++++++++++++++++++ dev-libs/libcdio/libcdio-2.1.0-r1.ebuild | 1 + 3 files changed, 51 insertions(+), 1 deletion(-) create mode 100644 dev-libs/libcdio/files/libcdio-2.1.0-realpath-test-fix.patch (limited to 'dev-libs/libcdio') diff --git a/dev-libs/libcdio/Manifest b/dev-libs/libcdio/Manifest index 040d9c820b6f..0ed51e7a4cdc 100644 --- a/dev-libs/libcdio/Manifest +++ b/dev-libs/libcdio/Manifest @@ -1,4 +1,5 @@ AUX libcdio-2.1.0-ncurses_pkgconfig.patch 923 BLAKE2B 848a76241ca173c452cf7b04142c249ca6c33b7d0514f03353bb7b1f43635d1bec36cf9f3e3ce61ab51d6cb42ab123f620fe6fe1706b71148ec2ab9592c0bc02 SHA512 98c16eebd1cd6bf57e85dd3abafba22a4a1f2f88e0d5f1c9ee98d7409c360c6e3dda43233823de97429a54be66969cec1eb8df4bbb7d0341a54c6a1ae475dd7b +AUX libcdio-2.1.0-realpath-test-fix.patch 1838 BLAKE2B 9e500479587a76925adc0bc6fed620e8a4880b45ca691ed0eb3aec4909ff48f14804a3d44405204d27d89628f050bb6f0f0d6342e483222e565d3613e97c550a SHA512 2395fb3cf9b56beeca6e91399be185d01ad460217ba144b5959d3941cdfca450795b0fab6466c471cb2714a4c004c3acf0097da1696cb33074d4aa0567feb504 DIST libcdio-2.1.0.tar.bz2 1759040 BLAKE2B 4859fc545cf81246279b7b0434c02916e874681b40d00f8253fd7837941a34c5a717a81b1c3b1714153ad343e03c28668984f6fd5647662ec4e6759752326cb0 SHA512 c290821da55fd9ae366670a58857aa6efcebc9f25b7caea063cf12f9cbda84fe770c5f59f972227fda50517ca58c5f39c0137daa0f93179e3daa45303d8b610f -EBUILD libcdio-2.1.0-r1.ebuild 1769 BLAKE2B 03066ffe81bd07b320119da094beabbb018dbb09e096e43c6f742a75b5120f2df99130cfb2cbfd82593f063a158f6f867202c29ae933e352d4b1ce9c209c6187 SHA512 0de998c904d01ce81e3600f855d10f6c894cc9b99448ec1d81944fc13156c875a07ac691d1e1a8ef4a6ad9155d509b4a76a6867d8c11757525def11229ad5012 +EBUILD libcdio-2.1.0-r1.ebuild 1813 BLAKE2B cdbe473d6e21b15f678ce60ea214dc225d9da5488f36595947f7241ffbe1e43dee1070770584d427c647b7d0781e4bd13aa8653c794518121ac56807dcdd8f87 SHA512 59be8a5fd57a59e18257dab01f82c552492998aca985551a08efd94a423851a8d419b6f17a860787f444ac8153fbb2dd2eef34bc9a6f0bcaa6c854dc0b1e4aec MISC metadata.xml 607 BLAKE2B f3850b573e21dbfa2c9bb30265db3bb9db41408685f7aa6234b77f2cf73d8e304ebe8b2a4ff3f6bcb67a9291f38138c18f2740ac166a96cb45a94e5c1981a27d SHA512 b07c8e25ac87bb07ce32e4b92704f1c5bb0f52fb06ab77267655449e005b159589eefef1bf7bb2318ef98f83fe34ec2f224c29ce0aec41b665161fc1e5d123e8 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() { -- cgit v1.2.3