commit: 16b8804428d68538b75e21a597ab687830787097 Author: Lars Wendler <polynomial-c <AT> gentoo <DOT> org> AuthorDate: Sat Jun 12 22:35:44 2021 +0000 Commit: Lars Wendler <polynomial-c <AT> gentoo <DOT> 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 <polynomial-c <AT> 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 <gni...@fsij.org> +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 <gni...@fsij.org> +--- + 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
