gentoo auto-resync : 10:10:2024 - 04:03:57

4 files changed, 67 insertions, 4 deletions

diff --git a/sys-boot/syslinux/Manifest b/sys-boot/syslinux/Manifest
index d9f2d55320fe..6cc50698d7bd 100644
--- a/sys-boot/syslinux/Manifest
+++ b/sys-boot/syslinux/Manifest
@@ -2,11 +2,12 @@ AUX 6.04_pre1/0001-Strip-the-.note.gnu.property-section-for-the-mbr.patch 1406 B
 AUX 6.04_pre1/0002-Force-the-linker-to-put-all-sections-into-a-single-P.patch 4873 BLAKE2B 851fb44f562d48cc30881d444c424ae6265d884e1ab63bcc41bc55e2fa687c47a208fe4431b57c4042fe8b56f5feb97b7e89d93b1138cf7ad66fb535df7e2115 SHA512 569ee1ccd0639bc79920f38a7d0865a62eee1e55511ec8a1a8e4e5d224de01ce422915cab75134ce836b6880722f9c152ed91ad9fab803a278e7449d5c6c907b
 AUX 6.04_pre1/0003-GCC-10-compatibility-patch.patch 3356 BLAKE2B 1ceb5ce12ae9e1ffd81c6c493f3bf3b357622f91b1080b6cfa2fda9ae5f12e46af242a53cbabc14cee2a5d53ee862ab587fd674fb4342bfdd4e6b3035dc536cd SHA512 4cf21b40dcdfc2f3abba5885fd47ca41def10feedee525a805da2a4a84015ef1f72005b1c75baec4cdae3871519c30d2ed6c215f23c8ddef0a3bf04d0f704ce5
 AUX 6.04_pre1/0004-Inherit-toolchain-vars-from-environment.patch 1446 BLAKE2B fbc9c08173f82a6d07cbe11673a61f97efc5e0a284ce029f1092776fd79dcbf0023f8157d94313fef81703350498cb85e2a97da4338be3b7ddaf33fe6a20fc4f SHA512 0e2d9a7ade52135c4d53c18aa2b674314784cb6ea74e3a55013686b8c4b70304f2400a1f9b8f6c7ddc17556a0982ace67e4e6f4f0cc76c97fe09e0f19e9a3c0b
+AUX 6.04_pre1/0005-Fix-build-with-GCC-14.patch 2114 BLAKE2B f7d5794a4577d2ab697c02890dfbe60a7764301309d66bfdc3c62cb2dc48c185642141ece1dfbb9669a7562cc6c4f13fa7bfa7b61f781cdbdac961e63e8f982b SHA512 9a7856830c7658a2023af647b355e4049ba86e9b6c6abc549168cbdb0fb210d7d2dcfb56859235262542c0d6b4141479b2a8285f38f40dc252a0bf6ad200caf8
 AUX 6.04_pre3/0005-Include-efisetjmp.h-from-efi.h.patch 500 BLAKE2B ed3e0a623c18ecc6880d074397fd6509223e8da1954d09b12f1a6642ca096bcc8a4b9688fbcf239d024a5fe6228aca23dc2069124f3b47c629f67ae8f23e720f SHA512 6dde7d306684174dc68bf952c50f2991d0cbcef545fbc91e220bec620a3e4e2895ac64412b777538d302e2215f1f11e45b29d87918025e98c7e14cf13205eed4
 AUX syslinux-6.03-sysmacros.patch 950 BLAKE2B 60fb26a4bb462409074802b8cf01afe29e8a7f98cb6907f4f2c0902f4cc7342b6053368ddf17331eac888714e795299c155a4078668a3ed0e35d435a8cb241d3 SHA512 8659e82e5a5402633c807c8a8f99b25fd6e3066fd0838a7e984452e2ebeccc0331481c93101f00a698e573cadcd98966ea216e4f2d9873e6893af817998e2549
 AUX syslinux-6.04-binutils-2.41.patch 2966 BLAKE2B a821b540f16da3359daab96d92a0fa45bc9d81bebc305135fedff6c79be482895731450cdb8dca1914edf8408ac5dc1f01d12f6b9d9f6da66e7b4a9b1c699ab1 SHA512 9541ec395352852caa8f07dc54128b542ebd6fda2490de370459a998679ecdd52c5717f2bea3da945bb10a171fab17d35b7a024cdccd6bc00f17b654478a8178
 DIST syslinux-6.04-pre1.tar.xz 5283272 BLAKE2B 800e5977ed13b26a1756c33d8625e850631b642e26a86e3328196ddd998596693c3a26db0ada4c0ba78a4ba692a1cc01886b6eb693d877ddafcfb325ecdeb639 SHA512 7927dd39be8e2dcf4138a6fea33def67d19d938379d694f15b48fdd2f5924c028b7a9e7bd71d0c7c6630c203e9e2a54296628e530632ad5e6f55b1ebefe8fc98
 DIST syslinux-6.04-pre3.tar.gz 10760898 BLAKE2B 708bb7f3ecbe1888471f3be0102270c056bf8c5be22013f36b56c90f13f5358ce1853722b14b962d8156cd1f045b9687166b98a1d7ad2853acbe6303fa40fae9 SHA512 0619a25347f3964e0c7c6ff629b2f59f01bd9e0afd822f46b67f26b8c84cbc55534cf7b22ff1bf83eec4986fd2d8f1646a3d750190a7c6c50251affc0b62594d
-EBUILD syslinux-6.04_pre1-r5.ebuild 1984 BLAKE2B db70078894a4d78f405250d689e578205d43c57a977c38b94d8fa4cc8b160e55489f11404d14d279cd19cdbc117efcdc13a820a2e5f1ef9d9cc0213e9a549e4c SHA512 d3e5d62106adcc74882e09ed11fc7971b85b0086868afa34b2762303a9ec5a5eba1484165f631f40ec10417dbf45e33add9bb00c825ddbf7b3fa87887593c925
-EBUILD syslinux-6.04_pre3-r1.ebuild 2237 BLAKE2B b6d3e19cb7107f47397938c71168e5beba010c754078644bf8a3ee0f70c519e9acc805b9c316a94c531f91228c8dc607471f77f6cb5f999a66659f9081cc1033 SHA512 506ceee0a7dd3982da879140ac033efed85450635106ca68645a6dcd200328d527fa0a2021ca01a87b3b761e9d6aab8d3a1a870a420561417486c6506d2a9ab8
+EBUILD syslinux-6.04_pre1-r5.ebuild 1994 BLAKE2B 188966d671517f481141e7513ade3c269983f11744b409fb1d8ca7d00187e1f00159485d63652a855be2e88b787ccc4bdb94b62f62024c1187b5859f57d367ad SHA512 65254c1ac42880d3030d8f46c3d1589f26e6711ccc6a164db3e0a8e053faba824ddf12cd76a55208b29ad68ad2526853fb632f7ebb7a8c7d4c4266d5e3a2de1a
+EBUILD syslinux-6.04_pre3-r1.ebuild 2247 BLAKE2B 469799882c3374292241d104731313385a9c8d045f0d69d53bbe4b91526fccd94c78c506c1d3b3c9e035500c7dbeb02b7814c7ddb37958f969e34f9a70925b25 SHA512 7b6f3b5f977001c35feebf19796063d1600a0ec7bbc3911b8232b9fadfcb3941a1997431cabd6927bffb2a083c3c1d675881bbcf68928f8c10ce8e1d025a849c
 MISC metadata.xml 531 BLAKE2B 34e572ef969d9af7e6ca3ae97625dd1b1c84f47b41b0dbd81d3cd613615cfb88d367dd9d0415f72c9a3327df73123a9f8074ac391b3478520160717fb9dd5246 SHA512 49d64e1d28d60fe6565c550c25538402ed33a608b55ffbc376e7e27f55992982bf3466443d11382dd777ebb1a35a0b4bad04d7c9bbd29f1a489553baf96911d6
diff --git a/sys-boot/syslinux/files/6.04_pre1/0005-Fix-build-with-GCC-14.patch b/sys-boot/syslinux/files/6.04_pre1/0005-Fix-build-with-GCC-14.patch
new file mode 100644
index 000000000000..41414ed0f522
--- /dev/null
+++ b/sys-boot/syslinux/files/6.04_pre1/0005-Fix-build-with-GCC-14.patch
@@ -0,0 +1,62 @@
+From 321433861cc9cd3c7e0ee02830e561bc0f956998 Mon Sep 17 00:00:00 2001
+From: rpm-build <rpm-build>
+Date: Sun, 4 Feb 2024 11:46:02 -0500
+Subject: [PATCH] Fix build with GCC 14
+
+com32/lib/syslinux/debug.c: In function ‘syslinux_debug’:
+com32/lib/syslinux/debug.c:91:5: error: implicit declaration of function ‘printf’
+
+com32/libupload/upload_tftp.c: In function ‘upload_tftp_write’:
+com32/libupload/upload_tftp.c:64:11: error: implicit declaration of function ‘tftp_put’
+
+com32/chain/chain.c: In function ‘main’:
+com32/chain/chain.c:517:44: error: passing argument 3 of ‘loadfile’ from incompatible pointer type
+com32/include/syslinux/loadfile.h:11:37: note: expected ‘size_t *’ but argument is of type ‘addr_t *’
+
+Upstream-Status: Inactive-Upstream [no upstream]
+---
+ com32/chain/chain.c        | 2 +-
+ com32/lib/syslinux/debug.c | 1 +
+ com32/libupload/tftp.h     | 3 +++
+ 3 files changed, 5 insertions(+), 1 deletion(-)
+
+diff --git a/com32/chain/chain.c b/com32/chain/chain.c
+index 4e9e32d..b11b880 100644
+--- a/com32/chain/chain.c
++++ b/com32/chain/chain.c
+@@ -514,7 +514,7 @@ int main(int argc, char *argv[])
+     if (opt.file) {
+ 	fdat.base = (opt.fseg << 4) + opt.foff;
+ 
+-	if (loadfile(opt.file, &fdat.data, &fdat.size)) {
++	if (loadfile(opt.file, &fdat.data, (size_t*)&fdat.size)) {
+ 	    error("Couldn't read the boot file.");
+ 	    goto bail;
+ 	}
+diff --git a/com32/lib/syslinux/debug.c b/com32/lib/syslinux/debug.c
+index d9ab863..e8f53d5 100644
+--- a/com32/lib/syslinux/debug.c
++++ b/com32/lib/syslinux/debug.c
+@@ -1,6 +1,7 @@
+ #include <linux/list.h>
+ #include <string.h>
+ #include <stdbool.h>
++#include <stdio.h>
+ 
+ #ifdef DYNAMIC_DEBUG
+ 
+diff --git a/com32/libupload/tftp.h b/com32/libupload/tftp.h
+index 323dc16..09aa40b 100644
+--- a/com32/libupload/tftp.h
++++ b/com32/libupload/tftp.h
+@@ -19,4 +19,7 @@ TFTP_OK	= 11, /* Not in RFC */
+ };
+ 
+ extern const char *tftp_string_error_message[];
++
++extern int tftp_put(struct url_info *url, int flags, struct inode *inode,
++                               const char **redir, char *data, int data_length);
+ #endif
+-- 
+2.43.0
+
diff --git a/sys-boot/syslinux/syslinux-6.04_pre1-r5.ebuild b/sys-boot/syslinux/syslinux-6.04_pre1-r5.ebuild
index cc03c3c95fd0..b13e8ee8582b 100644
--- a/sys-boot/syslinux/syslinux-6.04_pre1-r5.ebuild
+++ b/sys-boot/syslinux/syslinux-6.04_pre1-r5.ebuild
@@ -60,7 +60,7 @@ src_compile() {
 	unset CFLAGS LDFLAGS
 
 	if use bios; then
-		emake bios DATE="${DATE}" HEXDATE="${HEXDATE}"
+		emake bios DATE="${DATE}" HEXDATE="${HEXDATE}" UPX=false
 	fi
 	if use uefi; then
 		if use abi_x86_32; then
diff --git a/sys-boot/syslinux/syslinux-6.04_pre3-r1.ebuild b/sys-boot/syslinux/syslinux-6.04_pre3-r1.ebuild
index 36ba918ffe7b..cc980c2f0157 100644
--- a/sys-boot/syslinux/syslinux-6.04_pre3-r1.ebuild
+++ b/sys-boot/syslinux/syslinux-6.04_pre3-r1.ebuild
@@ -76,7 +76,7 @@ src_compile() {
 	unset CFLAGS LDFLAGS
 
 	if use bios; then
-		emake bios DATE="${DATE}" HEXDATE="${HEXDATE}"
+		emake bios DATE="${DATE}" HEXDATE="${HEXDATE}" UPX=false
 	fi
 	if use uefi; then
 		if use abi_x86_32; then