1 |
commit: 16b8804428d68538b75e21a597ab687830787097 |
2 |
Author: Lars Wendler <polynomial-c <AT> gentoo <DOT> org> |
3 |
AuthorDate: Sat Jun 12 22:35:44 2021 +0000 |
4 |
Commit: Lars Wendler <polynomial-c <AT> gentoo <DOT> org> |
5 |
CommitDate: Sat Jun 12 22:37:03 2021 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=16b88044 |
7 |
|
8 |
app-crypt/gnupg: Fixed build with USE="-ldap" |
9 |
|
10 |
Removed "scd-shared-access" USE flag as this finally went into a release |
11 |
|
12 |
Closes: https://bugs.gentoo.org/795669 |
13 |
Signed-off-by: Lars Wendler <polynomial-c <AT> gentoo.org> |
14 |
|
15 |
.../gnupg/files/gnupg-2.2.28-dirmngr_ldap.patch | 36 ++++++++++++++++++++++ |
16 |
app-crypt/gnupg/gnupg-2.2.28.ebuild | 13 ++------ |
17 |
2 files changed, 39 insertions(+), 10 deletions(-) |
18 |
|
19 |
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 |
20 |
new file mode 100644 |
21 |
index 00000000000..86e83de8ec3 |
22 |
--- /dev/null |
23 |
+++ b/app-crypt/gnupg/files/gnupg-2.2.28-dirmngr_ldap.patch |
24 |
@@ -0,0 +1,36 @@ |
25 |
+From c8b2162c0e7eb42b74811b7ed225fa0f56be4083 Mon Sep 17 00:00:00 2001 |
26 |
+From: NIIBE Yutaka <gniibe@××××.org> |
27 |
+Date: Fri, 11 Jun 2021 10:30:02 +0900 |
28 |
+Subject: [PATCH] dirmngir: Fix build with --disable-ldap. |
29 |
+ |
30 |
+* dirmngr/dirmngr.c (parse_rereadable_options) [USE_LDAP]: |
31 |
+Conditionalize. |
32 |
+ |
33 |
+-- |
34 |
+ |
35 |
+Reported-by: Phil Pennock |
36 |
+Signed-off-by: NIIBE Yutaka <gniibe@××××.org> |
37 |
+--- |
38 |
+ dirmngr/dirmngr.c | 2 ++ |
39 |
+ 1 file changed, 2 insertions(+) |
40 |
+ |
41 |
+diff --git a/dirmngr/dirmngr.c b/dirmngr/dirmngr.c |
42 |
+index 04fe9e238..6a818cabc 100644 |
43 |
+--- a/dirmngr/dirmngr.c |
44 |
++++ b/dirmngr/dirmngr.c |
45 |
+@@ -736,6 +736,7 @@ parse_rereadable_options (ARGPARSE_ARGS *pargs, int reread) |
46 |
+ case oRecursiveResolver: enable_recursive_resolver (1); break; |
47 |
+ |
48 |
+ case oLDAPServer: |
49 |
++#if USE_LDAP |
50 |
+ { |
51 |
+ ldap_server_t server; |
52 |
+ char *p; |
53 |
+@@ -757,6 +758,7 @@ parse_rereadable_options (ARGPARSE_ARGS *pargs, int reread) |
54 |
+ opt.ldapservers = server; |
55 |
+ } |
56 |
+ } |
57 |
++#endif |
58 |
+ break; |
59 |
+ |
60 |
+ case oKeyServer: |
61 |
|
62 |
diff --git a/app-crypt/gnupg/gnupg-2.2.28.ebuild b/app-crypt/gnupg/gnupg-2.2.28.ebuild |
63 |
index f03938727e3..0f4396fc399 100644 |
64 |
--- a/app-crypt/gnupg/gnupg-2.2.28.ebuild |
65 |
+++ b/app-crypt/gnupg/gnupg-2.2.28.ebuild |
66 |
@@ -9,13 +9,12 @@ MY_P="${P/_/-}" |
67 |
|
68 |
DESCRIPTION="The GNU Privacy Guard, a GPL OpenPGP implementation" |
69 |
HOMEPAGE="https://gnupg.org/" |
70 |
-SRC_URI="mirror://gnupg/gnupg/${MY_P}.tar.bz2 |
71 |
- scd-shared-access? ( https://raw.githubusercontent.com/GPGTools/MacGPG2/5ca182f54b7b6cd635d1c0a4713953834489fdd9/patches/gnupg/scdaemon_shared-access.patch -> ${PN}-2.2.16-scdaemon_shared-access.patch )" |
72 |
+SRC_URI="mirror://gnupg/gnupg/${MY_P}.tar.bz2" |
73 |
|
74 |
LICENSE="GPL-3" |
75 |
SLOT="0" |
76 |
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" |
77 |
-IUSE="bzip2 doc ldap nls readline scd-shared-access selinux +smartcard ssl tofu tools usb user-socket wks-server" |
78 |
+IUSE="bzip2 doc ldap nls readline selinux +smartcard ssl tofu tools usb user-socket wks-server" |
79 |
|
80 |
# Existence of executables is checked during configuration. |
81 |
DEPEND=">=dev-libs/libassuan-2.5.0 |
82 |
@@ -51,18 +50,12 @@ DOCS=( |
83 |
|
84 |
PATCHES=( |
85 |
"${FILESDIR}/${PN}-2.1.20-gpgscm-Use-shorter-socket-path-lengts-to-improve-tes.patch" |
86 |
+ "${FILESDIR}/${P}-dirmngr_ldap.patch" #795669 |
87 |
) |
88 |
|
89 |
src_prepare() { |
90 |
default |
91 |
|
92 |
- # Made optional because it's a non-official patch |
93 |
- if use scd-shared-access ; then |
94 |
- # Patch taken from |
95 |
- # https://github.com/GPGTools/MacGPG2/tree/dev/patches/gnupg |
96 |
- eapply "${DISTDIR}/${PN}-2.2.16-scdaemon_shared-access.patch" |
97 |
- fi |
98 |
- |
99 |
# Inject SSH_AUTH_SOCK into user's sessions after enabling gpg-agent-ssh.socket in systemctl --user mode, |
100 |
# idea borrowed from libdbus, see |
101 |
# https://gitlab.freedesktop.org/dbus/dbus/-/blob/master/bus/systemd-user/dbus.socket.in#L6 |