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.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 36B5B1382C5 for ; Sat, 12 Jun 2021 22:37:14 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 7B168E07FE; Sat, 12 Jun 2021 22:37:13 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 60D22E07FE for ; Sat, 12 Jun 2021 22:37:13 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 589FB33BED9 for ; Sat, 12 Jun 2021 22:37:12 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 04DAE7A5 for ; Sat, 12 Jun 2021 22:37:11 +0000 (UTC) From: "Lars Wendler" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Lars Wendler" Message-ID: <1623537423.16b8804428d68538b75e21a597ab687830787097.polynomial-c@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: app-crypt/gnupg/, app-crypt/gnupg/files/ X-VCS-Repository: repo/gentoo X-VCS-Files: app-crypt/gnupg/files/gnupg-2.2.28-dirmngr_ldap.patch app-crypt/gnupg/gnupg-2.2.28.ebuild X-VCS-Directories: app-crypt/gnupg/ app-crypt/gnupg/files/ X-VCS-Committer: polynomial-c X-VCS-Committer-Name: Lars Wendler X-VCS-Revision: 16b8804428d68538b75e21a597ab687830787097 X-VCS-Branch: master Date: Sat, 12 Jun 2021 22:37:11 +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: 3f08fedc-268e-48fa-9cdb-97106fedf9ce X-Archives-Hash: 3ade198b98a53bedad1b2dafafeaf1f5 commit: 16b8804428d68538b75e21a597ab687830787097 Author: Lars Wendler gentoo org> AuthorDate: Sat Jun 12 22:35:44 2021 +0000 Commit: Lars Wendler gentoo org> CommitDate: Sat Jun 12 22:37:03 2021 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=16b88044 app-crypt/gnupg: Fixed build with USE="-ldap" Removed "scd-shared-access" USE flag as this finally went into a release Closes: https://bugs.gentoo.org/795669 Signed-off-by: Lars Wendler gentoo.org> .../gnupg/files/gnupg-2.2.28-dirmngr_ldap.patch | 36 ++++++++++++++++++++++ app-crypt/gnupg/gnupg-2.2.28.ebuild | 13 ++------ 2 files changed, 39 insertions(+), 10 deletions(-) diff --git a/app-crypt/gnupg/files/gnupg-2.2.28-dirmngr_ldap.patch b/app-crypt/gnupg/files/gnupg-2.2.28-dirmngr_ldap.patch new file mode 100644 index 00000000000..86e83de8ec3 --- /dev/null +++ b/app-crypt/gnupg/files/gnupg-2.2.28-dirmngr_ldap.patch @@ -0,0 +1,36 @@ +From c8b2162c0e7eb42b74811b7ed225fa0f56be4083 Mon Sep 17 00:00:00 2001 +From: NIIBE Yutaka +Date: Fri, 11 Jun 2021 10:30:02 +0900 +Subject: [PATCH] dirmngir: Fix build with --disable-ldap. + +* dirmngr/dirmngr.c (parse_rereadable_options) [USE_LDAP]: +Conditionalize. + +-- + +Reported-by: Phil Pennock +Signed-off-by: NIIBE Yutaka +--- + dirmngr/dirmngr.c | 2 ++ + 1 file changed, 2 insertions(+) + +diff --git a/dirmngr/dirmngr.c b/dirmngr/dirmngr.c +index 04fe9e238..6a818cabc 100644 +--- a/dirmngr/dirmngr.c ++++ b/dirmngr/dirmngr.c +@@ -736,6 +736,7 @@ parse_rereadable_options (ARGPARSE_ARGS *pargs, int reread) + case oRecursiveResolver: enable_recursive_resolver (1); break; + + case oLDAPServer: ++#if USE_LDAP + { + ldap_server_t server; + char *p; +@@ -757,6 +758,7 @@ parse_rereadable_options (ARGPARSE_ARGS *pargs, int reread) + opt.ldapservers = server; + } + } ++#endif + break; + + case oKeyServer: diff --git a/app-crypt/gnupg/gnupg-2.2.28.ebuild b/app-crypt/gnupg/gnupg-2.2.28.ebuild index f03938727e3..0f4396fc399 100644 --- a/app-crypt/gnupg/gnupg-2.2.28.ebuild +++ b/app-crypt/gnupg/gnupg-2.2.28.ebuild @@ -9,13 +9,12 @@ MY_P="${P/_/-}" DESCRIPTION="The GNU Privacy Guard, a GPL OpenPGP implementation" HOMEPAGE="https://gnupg.org/" -SRC_URI="mirror://gnupg/gnupg/${MY_P}.tar.bz2 - scd-shared-access? ( https://raw.githubusercontent.com/GPGTools/MacGPG2/5ca182f54b7b6cd635d1c0a4713953834489fdd9/patches/gnupg/scdaemon_shared-access.patch -> ${PN}-2.2.16-scdaemon_shared-access.patch )" +SRC_URI="mirror://gnupg/gnupg/${MY_P}.tar.bz2" LICENSE="GPL-3" SLOT="0" KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" -IUSE="bzip2 doc ldap nls readline scd-shared-access selinux +smartcard ssl tofu tools usb user-socket wks-server" +IUSE="bzip2 doc ldap nls readline selinux +smartcard ssl tofu tools usb user-socket wks-server" # Existence of executables is checked during configuration. DEPEND=">=dev-libs/libassuan-2.5.0 @@ -51,18 +50,12 @@ DOCS=( PATCHES=( "${FILESDIR}/${PN}-2.1.20-gpgscm-Use-shorter-socket-path-lengts-to-improve-tes.patch" + "${FILESDIR}/${P}-dirmngr_ldap.patch" #795669 ) src_prepare() { default - # Made optional because it's a non-official patch - if use scd-shared-access ; then - # Patch taken from - # https://github.com/GPGTools/MacGPG2/tree/dev/patches/gnupg - eapply "${DISTDIR}/${PN}-2.2.16-scdaemon_shared-access.patch" - fi - # Inject SSH_AUTH_SOCK into user's sessions after enabling gpg-agent-ssh.socket in systemctl --user mode, # idea borrowed from libdbus, see # https://gitlab.freedesktop.org/dbus/dbus/-/blob/master/bus/systemd-user/dbus.socket.in#L6