gentoo auto-resync : 14:09:2022 - 11:10:10

3 files changed, 32 insertions, 1 deletions

diff --git a/dev-lang/zig/Manifest b/dev-lang/zig/Manifest
index 68ff7750a6f3..49ce3f69896b 100644
--- a/dev-lang/zig/Manifest
+++ b/dev-lang/zig/Manifest
@@ -1,7 +1,9 @@
+AUX zig-0.9.1-fix-bad-hostname-segfault.patch 935 BLAKE2B c1c54ccf40b4db9a8f9f68991e1ebafd81c2b996b41bd904ef842f5feed2d4ec19d61960ed1bda95873cb04a9fc58df7daa5d311537c9711f5100fb095eeb6db SHA512 c620da70b632e5a85d3136d6d54e42fe905ce8b5d899ca5ca9423ac7e7eaff036eea1f90a925c244794c0505469bf1320f5fd5d19d465c66505154ca78bcf519
 AUX zig-0.9.1-fix-riscv.patch 1853 BLAKE2B 0d0c9e1d639ed1a5228ad7db3182f848d9f6deba0e8e091d993256b90fdf152def7f80446ba19aeee0bd4c6d6a87dfcba5df311a54ede2b79510b6552cb2da9c SHA512 5c85a7fed80b5d157c99f80cf9971cdd91c93477de49ad01d163956ebc17d267d6a0002212fe16f5ca04b35c96e5f4721d1be44c6f4955429940763d924cc92f
 AUX zig-0.9.1-fix-single-threaded.patch 390 BLAKE2B 443a5ab709aa90ed92636310c204a15cbb60a997ff39f7f7102fdd4f21f66e64bd79516653729ecbd719aeb39809457c3db2d1c3c9d0614d1fb637307cc2a892 SHA512 f4e6f87a3aae5380c3f3e1eda85f10914119a378dd08c8375d18dd038dc0b131234a62fd86f46f64cd2038e5abd787e4a7876929fceac85b01bd6e4bce3b3263
 AUX zig-9999-stage2-fix.patch 502 BLAKE2B 9f4b8a31bac02ec2895a865f4a724b8431311c4656cbe1a19cb8f861020e2408fe9a7ce5f753ef3ca8f30adf178467b9d16e0019edbfb9b5227d7a4619345fa4 SHA512 d76b13adc6f594693099c4d45c50430cfde4c7c4b7baeededc1272c2284da81758efc91d7282b3e3a5adae4846ae697b4593e80b3e1241c0ba6b936f56c54592
+DIST zig-0.9.1-fix-detecting-abi.patch 22233 BLAKE2B fa523c4c4c23a74c0b4f85c6d2d91ef98b31d25694bb9dbc7988b82db972a16ab273aa9f1883cfa8ca79ef7fc56fca67d0a8656ba248b6db47bc902b7ac64a93 SHA512 259967f88f54c20f556bd9d67189ce3a2cfeb0250f0cee4dffb29020d976d61265a5dd9ae9cfcadfb7b1e152b47ee17f4184eafac2b80495f4ee8f98733cd692
 DIST zig-0.9.1.tar.xz 13940828 BLAKE2B 996b0e945f61b01dddbb7c8674a9e2d2d01b93eb48fdfd2c986496330990ffa64cba15f8bd8518b90ef6f514759ba6cc3fd31d6044c5b11b92bf92e3f7f15303 SHA512 0b8a5f9b7e34e4252536f59bc91429f1e76b2bf8e01f024095919f6ecf34db56b5c86c554fbb94bdcb5255394c87f2c87519c8f34c631f53816927ec0882ae2d
-EBUILD zig-0.9.1.ebuild 1345 BLAKE2B 6a7b7477f9e3d8c7b54a1352870d844b3eb5655baf02fa1491c008f53591137db0347323fabdb549c97085ca67f85c7c3ffc48e7182ab8ebfb041bd234a44166 SHA512 eb3df8a8e086406305c2e00409cbf309a9cc7d518e6776360ecf6916b2a641a3640bb5321d264ccf0f454beda000d57762d81114dab0e0d1f7629c98c8d5edbf
+EBUILD zig-0.9.1-r1.ebuild 1556 BLAKE2B a34a4d359ed56a5a056a6c0d2dcc50ea51004b124bee21f258601aa13d3a8901ad52bf1abfe30e748ed1b396a60764d02b2fca468078a6824a463135cd24d36b SHA512 4a051bab1ecbb431f0fcabfabf9c5fc758313001d85bd9b15f3cecbfd1a1ee65877563c85150220acc19d5601730669bf356f0caa12cd9a47705aed599f3f283
 EBUILD zig-9999.ebuild 1852 BLAKE2B 9d22f4948566d50cdef2a8d14ef0c08e97e62c15687626c99a39ed27a734e0cc4e01c979996b471f9616189d520ab82d8147a63d065dcee622cfc112cb48d9f6 SHA512 adcfb7fa6297c131ac0f846f29c7c9475a897311acf16531c2dfbd7393af7f7355dffb45917c31550423768644688a1e79ac3cc50557349ab00feb2b65d9d892
 MISC metadata.xml 541 BLAKE2B 6f5c7fbf759f0430f69073a17a0dae4b8bebf335b54c3b43da6b24104dc3de05a3b686cddbbd31e4dae1fc31695a2f08d000d22437ed6f1847de8fa95e3b1952 SHA512 d49cf0a8ad76ac9a6f6fb091effddbbcd812b56f91df6d3c782e15197cb4ff4423fb1076671a232aabcb9833af19ef8c820ad6df312a1e4d72e665680314c083
diff --git a/dev-lang/zig/files/zig-0.9.1-fix-bad-hostname-segfault.patch b/dev-lang/zig/files/zig-0.9.1-fix-bad-hostname-segfault.patch
new file mode 100644
index 000000000000..2e87ecc6d6ee
--- /dev/null
+++ b/dev-lang/zig/files/zig-0.9.1-fix-bad-hostname-segfault.patch
@@ -0,0 +1,26 @@
+https://github.com/ziglang/zig/commit/601d8f721d6dc90ac390bf5ecc7d8bafdd6a30d8
+Bug https://bugs.gentoo.org/829959
+
+From 601d8f721d6dc90ac390bf5ecc7d8bafdd6a30d8 Mon Sep 17 00:00:00 2001
+From: Veikka Touminen <git@vexu.eu>
+Date: Sun, 10 Jul 2022 04:27:23 -0600
+Subject: [PATCH] std.net.getAddressList: fix segfault on bad hostname
+
+Fixes #12065
+---
+ lib/std/net.zig | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/lib/std/net.zig b/lib/std/net.zig
+index 235ad8496a1..c381df9bce7 100644
+--- a/lib/std/net.zig
++++ b/lib/std/net.zig
+@@ -731,7 +731,7 @@ pub fn getAddressList(allocator: mem.Allocator, name: []const u8, port: u16) !*A
+         break :blk result;
+     };
+     const arena = result.arena.allocator();
+-    errdefer result.arena.deinit();
++    errdefer result.deinit();
+ 
+     if (builtin.target.os.tag == .windows or builtin.link_libc) {
+         const name_c = try std.cstr.addNullByte(allocator, name);
diff --git a/dev-lang/zig/zig-0.9.1.ebuild b/dev-lang/zig/zig-0.9.1-r1.ebuild
index 0c78b3e76b08..10a957c326e9 100644
--- a/dev-lang/zig/zig-0.9.1.ebuild
+++ b/dev-lang/zig/zig-0.9.1-r1.ebuild
@@ -16,6 +16,7 @@ else
 	KEYWORDS="~amd64 ~arm ~arm64"
 fi
 
+SRC_URI+=" https://codeberg.org/BratishkaErik/distfiles/media/branch/master/zig-0.9.1-fix-detecting-abi.patch"
 LICENSE="MIT"
 SLOT="0"
 IUSE="test +threads"
@@ -24,6 +25,8 @@ RESTRICT="!test? ( test )"
 PATCHES=(
 	"${FILESDIR}/${P}-fix-single-threaded.patch"
 	"${FILESDIR}/${P}-fix-riscv.patch"
+	"${FILESDIR}/${P}-fix-bad-hostname-segfault.patch"
+	"${DISTDIR}/zig-0.9.1-fix-detecting-abi.patch"
 )
 
 BUILD_DIR="${S}/build"