From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from smtp.gentoo.org (woodpecker.gentoo.org [140.211.166.183]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 23DC71582EF for ; Mon, 10 Feb 2025 09:01:47 +0000 (UTC) Received: from lists.gentoo.org (bobolink.gentoo.org [140.211.166.189]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) (Authenticated sender: relay-lists.gentoo.org@gentoo.org) by smtp.gentoo.org (Postfix) with ESMTPSA id 0E8F4343132 for ; Mon, 10 Feb 2025 09:01:47 +0000 (UTC) Received: from bobolink.gentoo.org (localhost [127.0.0.1]) by bobolink.gentoo.org (Postfix) with ESMTP id 8CC34110472; Mon, 10 Feb 2025 09:01:36 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.gentoo.org [140.211.166.183]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by bobolink.gentoo.org (Postfix) with ESMTPS id 81FF8110472 for ; Mon, 10 Feb 2025 09:01:36 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 316F23430A8 for ; Mon, 10 Feb 2025 09:01:36 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 8F597276D for ; Mon, 10 Feb 2025 09:01:34 +0000 (UTC) From: "Sam James" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Sam James" Message-ID: <1739178022.a5e6a6d51e03408edadbee16bb7e8b5cc1e8883a.sam@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: net-dns/idnkit/files/, net-dns/idnkit/ X-VCS-Repository: repo/gentoo X-VCS-Files: net-dns/idnkit/files/idnkit-2.3-incompatible-pointers.patch net-dns/idnkit/idnkit-2.3-r1.ebuild net-dns/idnkit/idnkit-2.3-r2.ebuild X-VCS-Directories: net-dns/idnkit/ net-dns/idnkit/files/ X-VCS-Committer: sam X-VCS-Committer-Name: Sam James X-VCS-Revision: a5e6a6d51e03408edadbee16bb7e8b5cc1e8883a X-VCS-Branch: master Date: Mon, 10 Feb 2025 09:01:34 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 1cdad125-8feb-4cd3-a743-8e2f8897d211 X-Archives-Hash: 5a4758d68a8d3ced46b1cece73c82a0b commit: a5e6a6d51e03408edadbee16bb7e8b5cc1e8883a Author: NHOrus yahoo com> AuthorDate: Tue Jan 21 16:34:46 2025 +0000 Commit: Sam James gentoo org> CommitDate: Mon Feb 10 09:00:22 2025 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a5e6a6d5 net-dns/idnkit: Fix incompatible pointers Part of modern C conversion Bug: https://bugs.gentoo.org/919224 Signed-off-by: NHOrus yahoo.com> Closes: https://github.com/gentoo/gentoo/pull/40248 Signed-off-by: Sam James gentoo.org> .../files/idnkit-2.3-incompatible-pointers.patch | 29 ++++++++++++++++++++++ .../{idnkit-2.3-r1.ebuild => idnkit-2.3-r2.ebuild} | 4 ++- 2 files changed, 32 insertions(+), 1 deletion(-) diff --git a/net-dns/idnkit/files/idnkit-2.3-incompatible-pointers.patch b/net-dns/idnkit/files/idnkit-2.3-incompatible-pointers.patch new file mode 100644 index 000000000000..130d18b2307f --- /dev/null +++ b/net-dns/idnkit/files/idnkit-2.3-incompatible-pointers.patch @@ -0,0 +1,29 @@ +Fix incompatible pointers for modern C, hope that restrict qualifier +holds in this scenario +https://bugs.gentoo.org/919224 +--- a/lib/localconverter.c ++++ b/lib/localconverter.c +@@ -599,12 +599,12 @@ + inleft = 0; + outbuf = NULL; + outleft = 0; +- iconv(ictx, (const char **)NULL, &inleft, &outbuf, &outleft); ++ iconv(ictx, NULL, &inleft, &outbuf, &outleft); + + inleft = strlen(from); + inbuf = from; + outleft = tolen - 1; /* reserve space for terminating NUL */ +- sz = iconv(ictx, (const char **)&inbuf, &inleft, &to, &outleft); ++ sz = iconv(ictx, (char ** restrict)&inbuf, &inleft, &to, &outleft); + + if (sz == (size_t)(-1) || inleft > 0) { + switch (errno) { +@@ -630,7 +630,7 @@ + * Append a sequence of state reset. + */ + inleft = 0; +- sz = iconv(ictx, (const char **)NULL, &inleft, &to, &outleft); ++ sz = iconv(ictx, NULL, &inleft, &to, &outleft); + if (sz == (size_t)(-1)) { + switch (errno) { + case EILSEQ: diff --git a/net-dns/idnkit/idnkit-2.3-r1.ebuild b/net-dns/idnkit/idnkit-2.3-r2.ebuild similarity index 84% rename from net-dns/idnkit/idnkit-2.3-r1.ebuild rename to net-dns/idnkit/idnkit-2.3-r2.ebuild index 67dd9b43e2e0..3a20fa937d68 100644 --- a/net-dns/idnkit/idnkit-2.3-r1.ebuild +++ b/net-dns/idnkit/idnkit-2.3-r2.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2024 Gentoo Authors +# Copyright 1999-2025 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -19,6 +19,8 @@ DEPEND=" dev-lang/perl " +PATCHES=( "${FILESDIR}"/"${P}"-incompatible-pointers.patch ) + src_configure() { econf $(use_enable liteonly) }