Gentoo Archives: gentoo-commits

From: Matthew Thode <prometheanfire@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: app-admin/puppet-agent/
Date: Tue, 28 Sep 2021 20:25:28
Message-Id: 1632860718.12a5605caf7ef360ceea481138405ad0b961f30e.prometheanfire@gentoo
1 commit: 12a5605caf7ef360ceea481138405ad0b961f30e
2 Author: Phil DeMonaco <phil <AT> demona <DOT> co>
3 AuthorDate: Wed Sep 1 18:51:29 2021 +0000
4 Commit: Matthew Thode <prometheanfire <AT> gentoo <DOT> org>
5 CommitDate: Tue Sep 28 20:25:18 2021 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=12a5605c
7
8 app-admin/puppet-agent: symlink fix
9
10 Both 7.9 and 7.10 installed a broken symlink to the libcrypt.so.1
11 library which cause the agent to fail. There may be some systems where
12 the appropriate library still appears first in the system search path,
13 however, on my system the glibc version is selected and it does not
14 contain `XCRYPT_2.0` which ruby apparently requires.
15
16 Closes: https://bugs.gentoo.org/809263
17 Package-Manager: Portage-3.0.20, Repoman-3.0.3
18 Signed-off-by: Philip DeMonaco <phil <AT> demona.co>
19 Signed-off-by: Matthew Thode <prometheanfire <AT> gentoo.org>
20
21 app-admin/puppet-agent/puppet-agent-7.10.0.ebuild | 2 +-
22 app-admin/puppet-agent/puppet-agent-7.11.0.ebuild | 2 +-
23 2 files changed, 2 insertions(+), 2 deletions(-)
24
25 diff --git a/app-admin/puppet-agent/puppet-agent-7.10.0.ebuild b/app-admin/puppet-agent/puppet-agent-7.10.0.ebuild
26 index 1af71eb6f52..8ad3ca37f43 100644
27 --- a/app-admin/puppet-agent/puppet-agent-7.10.0.ebuild
28 +++ b/app-admin/puppet-agent/puppet-agent-7.10.0.ebuild
29 @@ -70,7 +70,7 @@ src_install() {
30 dosym ../../opt/puppetlabs/bin/facter /usr/bin/facter
31 dosym ../../opt/puppetlabs/bin/hiera /usr/bin/hiera
32 dosym ../../opt/puppetlabs/bin/puppet /usr/bin/puppet
33 - dosym ../../../../usr/lib/libcrypt.so.1 /opt/puppetlabs/puppet/lib/libcrypt.so.1
34 + dosym ../../../../usr/lib64/xcrypt/libcrypt.so.1 /opt/puppetlabs/puppet/lib/libcrypt.so.1
35 }
36
37 pkg_postinst() {
38
39 diff --git a/app-admin/puppet-agent/puppet-agent-7.11.0.ebuild b/app-admin/puppet-agent/puppet-agent-7.11.0.ebuild
40 index c24ff0f353a..f90ff43e876 100644
41 --- a/app-admin/puppet-agent/puppet-agent-7.11.0.ebuild
42 +++ b/app-admin/puppet-agent/puppet-agent-7.11.0.ebuild
43 @@ -70,7 +70,7 @@ src_install() {
44 dosym ../../opt/puppetlabs/bin/facter /usr/bin/facter
45 dosym ../../opt/puppetlabs/bin/hiera /usr/bin/hiera
46 dosym ../../opt/puppetlabs/bin/puppet /usr/bin/puppet
47 - dosym ../../../../usr/lib/libcrypt.so.1 /opt/puppetlabs/puppet/lib/libcrypt.so.1
48 + dosym ../../../../usr/lib64/xcrypt/libcrypt.so.1 /opt/puppetlabs/puppet/lib/libcrypt.so.1
49 }
50
51 pkg_postinst() {