Gentoo Archives: gentoo-commits

From: Thomas Deutschmann <whissi@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: net-misc/openssh/
Date: Mon, 02 Jul 2018 22:35:57
Message-Id: 1530570946.12d29e46359700c563ed2f064bb895535d76a749.whissi@gentoo
1 commit: 12d29e46359700c563ed2f064bb895535d76a749
2 Author: Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
3 AuthorDate: Mon Jul 2 22:35:08 2018 +0000
4 Commit: Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
5 CommitDate: Mon Jul 2 22:35:46 2018 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=12d29e46
7
8 net-misc/openssh: fix libexec directory in ldap wrapper
9
10 Reported-by: Sergey Popov <pinkbyte <AT> gentoo.org>
11 Package-Manager: Portage-2.3.40, Repoman-2.3.9
12
13 .../{openssh-7.7_p1-r102.ebuild => openssh-7.7_p1-r103.ebuild} | 5 +++++
14 1 file changed, 5 insertions(+)
15
16 diff --git a/net-misc/openssh/openssh-7.7_p1-r102.ebuild b/net-misc/openssh/openssh-7.7_p1-r103.ebuild
17 similarity index 98%
18 rename from net-misc/openssh/openssh-7.7_p1-r102.ebuild
19 rename to net-misc/openssh/openssh-7.7_p1-r103.ebuild
20 index 83b9dd34711..3a2abed912e 100644
21 --- a/net-misc/openssh/openssh-7.7_p1-r102.ebuild
22 +++ b/net-misc/openssh/openssh-7.7_p1-r103.ebuild
23 @@ -393,6 +393,11 @@ src_install() {
24 if use ldap && [[ -n ${LDAP_PATCH} ]] ; then
25 insinto /etc/openldap/schema/
26 doins openssh-lpk-{sun,openldap}.schema
27 +
28 + # Set the same libexec directory as in src_configure
29 + sed -i \
30 + -e "s:libexec/openssh:$(get_libdir)/misc:" \
31 + "${ED%/}/usr/$(get_libdir)/misc/ssh-ldap-wrapper" || die
32 fi
33
34 doman contrib/ssh-copy-id.1