From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (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 5FB58158042 for ; Sun, 3 Nov 2024 11:35:45 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id A915BE096D; Sun, 3 Nov 2024 11:35:44 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (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 pigeon.gentoo.org (Postfix) with ESMTPS id 8D081E096D for ; Sun, 3 Nov 2024 11:35:44 +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 C1C01340BE2 for ; Sun, 3 Nov 2024 11:35:43 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 14D4B1953 for ; Sun, 3 Nov 2024 11:35:42 +0000 (UTC) From: "Fabian Groffen" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Fabian Groffen" Message-ID: <1730633711.46573bad4a55a674fb24b26ec74565e988c44811.grobian@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: app-crypt/gnupg/ X-VCS-Repository: repo/gentoo X-VCS-Files: app-crypt/gnupg/gnupg-2.4.6-r1.ebuild app-crypt/gnupg/gnupg-2.5.1.ebuild X-VCS-Directories: app-crypt/gnupg/ X-VCS-Committer: grobian X-VCS-Committer-Name: Fabian Groffen X-VCS-Revision: 46573bad4a55a674fb24b26ec74565e988c44811 X-VCS-Branch: master Date: Sun, 3 Nov 2024 11:35:42 +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: 90eadb63-c3a6-4bc3-9699-1b9a3305d39a X-Archives-Hash: 1a773ff624c556a3824a093d395a1cd9 commit: 46573bad4a55a674fb24b26ec74565e988c44811 Author: Fabian Groffen gentoo org> AuthorDate: Sun Nov 3 11:30:42 2024 +0000 Commit: Fabian Groffen gentoo org> CommitDate: Sun Nov 3 11:35:11 2024 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=46573bad app-crypt/gnupg: clarify/refresh Solaris workarounds - Filed upstream bug for the standards problems: https://dev.gnupg.org/T7368 - Define _XOPEN_SOURCE=500 for 2.4.6 to resolve the mismatch - Force configure machinery to kick in for 2.5.1 Closes: https://bugs.gentoo.org/942793 Signed-off-by: Fabian Groffen gentoo.org> app-crypt/gnupg/gnupg-2.4.6-r1.ebuild | 9 +++++---- app-crypt/gnupg/gnupg-2.5.1.ebuild | 9 +++++---- 2 files changed, 10 insertions(+), 8 deletions(-) diff --git a/app-crypt/gnupg/gnupg-2.4.6-r1.ebuild b/app-crypt/gnupg/gnupg-2.4.6-r1.ebuild index a9d778121bd4..0b2fe344f8c9 100644 --- a/app-crypt/gnupg/gnupg-2.4.6-r1.ebuild +++ b/app-crypt/gnupg/gnupg-2.4.6-r1.ebuild @@ -96,10 +96,6 @@ src_prepare() { # which in turn requires discovery in Autoconf, something that upstream deeply resents. sed -e "/DirectoryMode=/a ExecStartPost=-${EPREFIX}/bin/systemctl --user set-environment SSH_AUTH_SOCK=%t/gnupg/S.gpg-agent.ssh" \ -i "${T}"/gpg-agent-ssh.socket || die - - # definition of getpeername etc uses different things like socket_fd_t - [[ ${CHOST} == *-solaris* ]] && - append-cflags $(test-flags-CC -Wno-incompatible-pointer-types) } my_src_configure() { @@ -147,6 +143,11 @@ my_src_configure() { append-cppflags -I"${ESYSROOT}/usr/include/libusb-1.0" fi + if [[ ${CHOST} == *-solaris* ]] ; then + # https://dev.gnupg.org/T7368 + append-cppflags -D_XOPEN_SOURCE=500 + fi + # bug #663142 if use user-socket; then myconf+=( --enable-run-gnupg-user-socket ) diff --git a/app-crypt/gnupg/gnupg-2.5.1.ebuild b/app-crypt/gnupg/gnupg-2.5.1.ebuild index 382e366f6c0d..af4b2cee9a10 100644 --- a/app-crypt/gnupg/gnupg-2.5.1.ebuild +++ b/app-crypt/gnupg/gnupg-2.5.1.ebuild @@ -95,10 +95,6 @@ src_prepare() { # which in turn requires discovery in Autoconf, something that upstream deeply resents. sed -e "/DirectoryMode=/a ExecStartPost=-${EPREFIX}/bin/systemctl --user set-environment SSH_AUTH_SOCK=%t/gnupg/S.gpg-agent.ssh" \ -i "${T}"/gpg-agent-ssh.socket || die - - # definition of getpeername etc uses different things like socket_fd_t - [[ ${CHOST} == *-solaris* ]] && - append-cflags $(test-flags-CC -Wno-incompatible-pointer-types) } my_src_configure() { @@ -146,6 +142,11 @@ my_src_configure() { append-cppflags -I"${ESYSROOT}/usr/include/libusb-1.0" fi + if [[ ${CHOST} == *-solaris* ]] ; then + # https://dev.gnupg.org/T7368 + export ac_cv_should_define__xopen_source=yes + fi + # bug #663142 if use user-socket; then myconf+=( --enable-run-gnupg-user-socket )