gentoo auto-resync : 09:05:2023 - 23:42:14

3 files changed, 49 insertions, 1 deletions

diff --git a/sys-libs/efivar/Manifest b/sys-libs/efivar/Manifest
index 26cd8a917f76..22cca4e3933a 100644
--- a/sys-libs/efivar/Manifest
+++ b/sys-libs/efivar/Manifest
@@ -1,3 +1,4 @@
+AUX efivar-38-64bit-off_t.patch 1618 BLAKE2B b288f171ce505a696a7ad36dc306153dac2694a47593aa3be07dcdb8c39ada23b0e5afe9cb43b222300ad12a76e20237c24588192bf8c9c5403f15f4e18a946a SHA512 50046e222f22cd6158f4b38853bf3478ac8508fe86893976554bfb312369315d2f67bf855308d6d4eb73f09da4420c440e7fc56c06063225ec42628ab53e8b98
 AUX efivar-38-Makefile-dep.patch 1126 BLAKE2B aeeddf608f1bcf9c2a729559ccca6c85271159f4ca0ea82b6685995f34c2ae39c996bb0f98bebfc9abf77ef0b679622267ad31f682f312d58a775a837bfe2bd4 SHA512 156314cbc49f2e298b1a46810ce261716384d19f8d1cc3c7a0aaba816c96cde286b52a578338e2948f770e9404f9c292ce6c0319bdb56963e3ac05789473eb45
 AUX efivar-38-binutils-2.36.patch 1231 BLAKE2B ccddc04ab83d4dcf570d5a89e43fc27d36e2010513b36d9eb2fcdea71ceb5dba96a064a1cbca9ffdecf17fb5b9cb22cfe89eae4ee3a188547a4ab6fa6b4e2983 SHA512 568bc88b182875c37479c49b3dbf5b8ee6edf8090f940176e67c9aa28dd2ff6f417c70b2bef6b5df99ada2afa33db3efd295ba9de5d68b3ecc5ce1dc3361d042
 AUX efivar-38-efisecdb-musl.patch 4344 BLAKE2B 5705405e6800dd38a569d2977003d441fb5d184918f94139e59f2f934f157f76f3d3ef6a0d0e3a24509bd541f88f84e1c91d6bcc02dae6cef02f916e6a8c3ace SHA512 c8b78e99317a30b7baaeba9617a76185d6bf030d538fd2fb44267c95fec259ec672b9d9c91a6b38394e614367646bbfa9ea445738b814d289277e870594b2e70
@@ -8,5 +9,5 @@ AUX efivar-38-ld-locale.patch 1203 BLAKE2B b5814d3708999288d35d3d972f854087b8c07
 AUX efivar-38-lld-fixes.patch 12397 BLAKE2B 0aed2f3bed5584f97f38e7d61bc6883e9c3020cadbba2cb37cec3e5b876c6a535f721817a46068d47413551f823489fb048201b81c1e3894eae4d65e3493129c SHA512 008931110a7d9ae7bfd70fae60a2feb01482f4d14ac81c107bdb612d8079546c748905a10a4f1cffee0385cdcee3e7a9c9606bfd24c005ba2333cef2fc444b4b
 AUX efivar-38-march-native.patch 1203 BLAKE2B 950a72a5ae4872894379a6688e80c796dd43db67667dd0b30515e2911a981339af6069405e3058ef49be159e37fa6000dbf26db1378b665f3acf6204feaee906 SHA512 fbe34223677a80c5b4e98db7a0171d48a6b56a8d2fd6793299200a64e81c1415913b1b098b5bca8183cbd0f6dada9802aa1967607217a7398f189f58370bb44a
 DIST efivar-38.tar.bz2 320221 BLAKE2B 0b96f3d71ddc2246e6a11a5cd32af3d007823c4a283186a428c3f145cd74425a31bd22c4671ad1ab252a3c572991bb1698381cb8bdf51efcbebd62befdc6c070 SHA512 c2f17297c863ece134a9dd758d237fd2df8c8d072f87af1d0bf2bcf9acfc7a53c25597f03fd4fb8cc664b205743d4ffa0ef1b068d0f73c58fa573d40993f3155
-EBUILD efivar-38.ebuild 1535 BLAKE2B c670424154c60ac06703b187f89633827a4fc9ab6ea4c76d1163cc181c40144464c7cee474359e6c624b8c50879c27c1dcf3d41d6f1e0093bf61559e64e69ca4 SHA512 f7e7035ca5df0d58c2883d349948885b224efb6a50c0c7ebf051c0c8eda0a5ecb07f94b898a49b4960046c7de00cfd9b33fc68e70314901fe2a0e47729d6e1f1
+EBUILD efivar-38.ebuild 1579 BLAKE2B 30af5e5b273664641c7ce6981284c3a6db34d9523b42bbacab677a4214258378146a28a69fb4d37606b8ae7bf43874e695cdfaecc87a6ae87818ffd746418a93 SHA512 c4f39d8680b84b04789ac1167456bd455268f8a98c548adc7964256d81d277d5d1fab5f4f3b434d8bf787381dd32af6e774297957ac4d50e86b6e050c21968bb
 MISC metadata.xml 330 BLAKE2B 0f894cb3c99d8540d6548f06f146360e20fcff309d867c1da96a15d07e5f1ebb2f03114de8527ddd28c26f4b42a7fa9903dd925015b962b4d4094dda86f76d65 SHA512 c03a2d22f945fd9e4a19143da20b884759e0aa88f73f42a70d47d5b1aeeb43201d9452919779d9c3e020371c3d1519a7068d59c0904043572ae0dd09633989e8
diff --git a/sys-libs/efivar/efivar-38.ebuild b/sys-libs/efivar/efivar-38.ebuild
index d00381caef83..cf449a8640f7 100644
--- a/sys-libs/efivar/efivar-38.ebuild
+++ b/sys-libs/efivar/efivar-38.ebuild
@@ -37,6 +37,7 @@ src_prepare() {
 		"${FILESDIR}"/efivar-38-lld-fixes.patch
 		"${FILESDIR}"/efivar-38-efisecdb-musl.patch
 		"${FILESDIR}"/efivar-38-efisecdb-optarg.patch
+		"${FILESDIR}"/efivar-38-64bit-off_t.patch
 
 		# Rejected upstream, keep this for ia64 support
 		"${FILESDIR}"/efivar-38-ia64-relro.patch
diff --git a/sys-libs/efivar/files/efivar-38-64bit-off_t.patch b/sys-libs/efivar/files/efivar-38-64bit-off_t.patch
new file mode 100644
index 000000000000..d06868b22587
--- /dev/null
+++ b/sys-libs/efivar/files/efivar-38-64bit-off_t.patch
@@ -0,0 +1,46 @@
+https://bugs.gentoo.org/905930
+
+From 914c686cc54b2405dab08bff77cd60827aab54b1 Mon Sep 17 00:00:00 2001
+From: Khem Raj <raj.khem@gmail.com>
+Date: Wed, 14 Dec 2022 16:55:51 -0800
+Subject: [PATCH] Use off_t instead of off64_t
+
+Pass _FILE_OFFSET_BITS=64 to ensure 64bit off_t
+
+This helps building efivar for 32bit arches on systems using musl C
+library. It works with glibc since _GNU_SOURCE defines
+_LARGEFILE64_SOURCE as well, this feature test macro enables the 64bit
+interfaces which were done as intermediate steps when transition to
+66-bit off_t was done as part olf LFS64 support.
+
+Signed-off-by: Khem Raj <raj.khem@gmail.com>
+---
+ src/error.c             | 2 +-
+ src/include/defaults.mk | 1 +
+ 2 files changed, 2 insertions(+), 1 deletion(-)
+
+diff --git a/src/error.c b/src/error.c
+index fcbba0d6..9530e22c 100644
+--- a/src/error.c
++++ b/src/error.c
+@@ -191,7 +191,7 @@ dbglog_write(void *cookie, const char *buf, size_t size)
+ }
+ 
+ static int
+-dbglog_seek(void *cookie UNUSED, off64_t *offset, int whence)
++dbglog_seek(void *cookie UNUSED, off_t *offset, int whence)
+ {
+ 	FILE *log = efi_errlog ? efi_errlog : stderr;
+ 	int rc;
+diff --git a/src/include/defaults.mk b/src/include/defaults.mk
+index 42bd3d6e..bb9c997f 100644
+--- a/src/include/defaults.mk
++++ b/src/include/defaults.mk
+@@ -34,6 +34,7 @@ CPPFLAGS ?=
+ override _CPPFLAGS := $(CPPFLAGS)
+ override CPPFLAGS = $(_CPPFLAGS) -DLIBEFIVAR_VERSION=$(VERSION) \
+ 	    -D_GNU_SOURCE \
++	    -D_FILE_OFFSET_BITS=64 \
+ 	    -I$(TOPDIR)/src/include/
+ CFLAGS ?= $(OPTIMIZE) $(DEBUGINFO) $(WARNINGS) $(ERRORS)
+ CFLAGS_GCC ?= -specs=$(TOPDIR)/src/include/gcc.specs \