gentoo auto-resync : 29:06:2024 - 08:00:25

3 files changed, 79 insertions, 2 deletions

diff --git a/dev-libs/libcdio/Manifest b/dev-libs/libcdio/Manifest
index 5d94213e285d..c4a24ad6999a 100644
--- a/dev-libs/libcdio/Manifest
+++ b/dev-libs/libcdio/Manifest
@@ -1,5 +1,6 @@
 AUX libcdio-2.1.0-ncurses_pkgconfig.patch 923 BLAKE2B 848a76241ca173c452cf7b04142c249ca6c33b7d0514f03353bb7b1f43635d1bec36cf9f3e3ce61ab51d6cb42ab123f620fe6fe1706b71148ec2ab9592c0bc02 SHA512 98c16eebd1cd6bf57e85dd3abafba22a4a1f2f88e0d5f1c9ee98d7409c360c6e3dda43233823de97429a54be66969cec1eb8df4bbb7d0341a54c6a1ae475dd7b
+AUX libcdio-2.1.0-no-lfs-shims.patch 2588 BLAKE2B 8a6fae6bcd84dfe14789ce268f808dbc10198089ba64b1825b690982847a5b40497a3b645020e5c68ccbbd221e1b8c4e978260ec4af06406d758f0809c346107 SHA512 1ea4bfa0684c7a3aa3c5769f779b1b025986b346eec811216c18f39e1e9fda35dc3916eaefc82ec05d72b56cae88373f98dea516739d082494f93b402c8e0871
 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 2068 BLAKE2B 10889e86c81a9ece0aeaf5d29622a0f29b369265c75ef375611e859d9ea51fcda793e282ce4bdd879ae07cda34dd29a6c03f0ba2d9b51a09fbd56a34aab62791 SHA512 e101ff312f76df08ee52304e5158dad5329c5d11e0f954ed11b13793641fd1e70187dae399d67de1efda8b115f9067b4821446319649f9f64e0add1ecd6801a2
+EBUILD libcdio-2.1.0-r2.ebuild 2107 BLAKE2B d2caa7df359e5c5be8eea9fc588aba3bebb9706b1a4480963558cc922a678ce1f2137afee9b7a9bacfbe5603499d9cfd62ab076018a5d426f03ecec34476ce19 SHA512 62965087b3f2355242b2be90a3733189a41168187a0f4a361678e9c45d3f7881bf12482171e7b91184d82bbdb15305628f0169416582a053bfb3206b747fa5c6
 MISC metadata.xml 607 BLAKE2B f3850b573e21dbfa2c9bb30265db3bb9db41408685f7aa6234b77f2cf73d8e304ebe8b2a4ff3f6bcb67a9291f38138c18f2740ac166a96cb45a94e5c1981a27d SHA512 b07c8e25ac87bb07ce32e4b92704f1c5bb0f52fb06ab77267655449e005b159589eefef1bf7bb2318ef98f83fe34ec2f224c29ce0aec41b665161fc1e5d123e8
diff --git a/dev-libs/libcdio/files/libcdio-2.1.0-no-lfs-shims.patch b/dev-libs/libcdio/files/libcdio-2.1.0-no-lfs-shims.patch
new file mode 100644
index 000000000000..473c54d9b1ee
--- /dev/null
+++ b/dev-libs/libcdio/files/libcdio-2.1.0-no-lfs-shims.patch
@@ -0,0 +1,75 @@
+From https://bugs.gentoo.org/918988
+From: Alfred Wingate <parona@protonmail.com>
+Date: Mon, 20 May 2024 22:02:08 +0300
+Subject: [PATCH] Do not use LFS shims, rely on _FILE_OFFSET_BITS=64
+
+See https://savannah.gnu.org/bugs/?65751 and https://bugs.gentoo.org/918988
+
+Setting _FILE_OFFSET_BITS=64 is enough to get the LFS interface,
+using LFS shims is unnecessary on 64-bit systems and they may
+not be available on 32-bit systems on glibc.
+
+Signed-off-by: Alfred Wingate <parona@protonmail.com>
+--- a/configure.ac
++++ b/configure.ac
+@@ -547,10 +547,10 @@ AC_DEFINE_UNQUOTED(LIBCDIO_SOURCE_PATH, "$LIBCDIO_SOURCE_PATH",
+ 	[Full path to libcdio top_sourcedir.])
+ AC_SUBST(LIBCDIO_SOURCE_PATH)
+ 
+-AC_CHECK_FUNCS( [chdir drand48 fseeko fseeko64 ftruncate geteuid getgid \
+-		 getuid getpwuid gettimeofday lseek64 lstat memcpy memset mkstemp rand \
+-		 seteuid setegid snprintf setenv strndup unsetenv tzset sleep \
+-		 _stati64 usleep vsnprintf readlink realpath gmtime_r localtime_r] )
++AC_CHECK_FUNCS( [chdir drand48 fseeko ftruncate geteuid getgid getuid \
++		 getpwuid gettimeofday lstat memcpy memset mkstemp rand seteuid \
++		 setegid snprintf setenv strndup unsetenv tzset sleep _stati64 \
++		 usleep vsnprintf readlink realpath gmtime_r localtime_r] )
+ 
+ # check for timegm() support
+ AC_CHECK_FUNC(timegm, AC_DEFINE(HAVE_TIMEGM,1,
+--- a/lib/driver/_cdio_generic.c
++++ b/lib/driver/_cdio_generic.c
+@@ -55,16 +55,6 @@
+ #define PATH_MAX 4096
+ #endif
+ 
+-/* If available and LFS is enabled, try to use lseek64 */
+-#if defined(HAVE_LSEEK64) && defined(_FILE_OFFSET_BITS) && (_FILE_OFFSET_BITS == 64)
+-#if defined(_MSC_VER)
+-#include <io.h>
+-#endif
+-#define CDIO_LSEEK lseek64
+-#else
+-#define CDIO_LSEEK lseek
+-#endif
+-
+ /*!
+   Eject media -- there's nothing to do here. We always return -2.
+   Should we also free resources?
+@@ -170,7 +160,7 @@ off_t
+ cdio_generic_lseek (void *user_data, off_t offset, int whence)
+ {
+   generic_img_private_t *p_env = user_data;
+-  return CDIO_LSEEK(p_env->fd, offset, whence);
++  return lseek(p_env->fd, offset, whence);
+ }
+ 
+ /*!
+--- a/lib/driver/_cdio_stdio.c
++++ b/lib/driver/_cdio_stdio.c
+@@ -47,11 +47,7 @@
+ #include "_cdio_stdio.h"
+ #include "cdio_assert.h"
+ 
+-/* On 32 bit platforms, fseek can only access streams of 2 GB or less.
+-   Prefer fseeko/fseeko64, that take a 64 bit offset when LFS is enabled */
+-#if defined(HAVE_FSEEKO64) && defined(_FILE_OFFSET_BITS) && (_FILE_OFFSET_BITS == 64)
+-#define CDIO_FSEEK fseeko64
+-#elif defined(HAVE_FSEEKO)
++#if defined(HAVE_FSEEKO)
+ #define CDIO_FSEEK fseeko
+ #else
+ #define CDIO_FSEEK fseek
+-- 
+2.45.1
+
diff --git a/dev-libs/libcdio/libcdio-2.1.0-r1.ebuild b/dev-libs/libcdio/libcdio-2.1.0-r2.ebuild
index 6f2f17a4791e..5e75f78459fc 100644
--- a/dev-libs/libcdio/libcdio-2.1.0-r1.ebuild
+++ b/dev-libs/libcdio/libcdio-2.1.0-r2.ebuild
@@ -1,7 +1,7 @@
 # Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
 inherit autotools flag-o-matic libtool multilib-minimal
 
@@ -39,6 +39,7 @@ MULTILIB_WRAPPED_HEADERS=(
 PATCHES=(
 	"${FILESDIR}/${PN}-2.1.0-ncurses_pkgconfig.patch"
 	"${FILESDIR}/${P}-realpath-test-fix.patch"
+	"${FILESDIR}/${P}-no-lfs-shims.patch"
 )
 
 src_prepare() {