| 1 |
commit: abe372a63dacd57ed7809233ef02591e37941cb4 |
| 2 |
Author: Phil DeMonaco <phil <AT> demona <DOT> co> |
| 3 |
AuthorDate: Tue Sep 28 19:09:22 2021 +0000 |
| 4 |
Commit: Matthew Thode <prometheanfire <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Tue Sep 28 20:25:19 2021 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=abe372a6 |
| 7 |
|
| 8 |
app-admin/puppet-agent: libxcrypt logic fix #22183 |
| 9 |
|
| 10 |
Incorporates the logic suggested by thesamesame that directs to the |
| 11 |
libxcrypt non-system path if and only if the crypt flag is still enabled |
| 12 |
on sys-libs/glibc. |
| 13 |
|
| 14 |
Package-Manager: Portage-3.0.20, Repoman-3.0.3 |
| 15 |
Signed-off-by: Philip DeMonaco <phil <AT> demona.co> |
| 16 |
Signed-off-by: Matthew Thode <prometheanfire <AT> gentoo.org> |
| 17 |
|
| 18 |
app-admin/puppet-agent/puppet-agent-6.19.1-r1.ebuild | 11 ++++++++++- |
| 19 |
app-admin/puppet-agent/puppet-agent-7.10.0.ebuild | 11 ++++++++++- |
| 20 |
app-admin/puppet-agent/puppet-agent-7.11.0.ebuild | 11 ++++++++++- |
| 21 |
3 files changed, 30 insertions(+), 3 deletions(-) |
| 22 |
|
| 23 |
diff --git a/app-admin/puppet-agent/puppet-agent-6.19.1-r1.ebuild b/app-admin/puppet-agent/puppet-agent-6.19.1-r1.ebuild |
| 24 |
index e99c2fe2b84..22dc570bbd3 100644 |
| 25 |
--- a/app-admin/puppet-agent/puppet-agent-6.19.1-r1.ebuild |
| 26 |
+++ b/app-admin/puppet-agent/puppet-agent-6.19.1-r1.ebuild |
| 27 |
@@ -72,7 +72,16 @@ src_install() { |
| 28 |
dosym ../../opt/puppetlabs/bin/hiera /usr/bin/hiera |
| 29 |
dosym ../../opt/puppetlabs/bin/puppet /usr/bin/puppet |
| 30 |
dosym ../../opt/puppetlabs/puppet/bin/virt-what /usr/bin/virt-what |
| 31 |
- dosym ../../../../usr/lib64/xcrypt/libcrypt.so.1 /opt/puppetlabs/puppet/lib/libcrypt.so.1 |
| 32 |
+ |
| 33 |
+ # Handling of the path to the crypt library during the ongoing migration |
| 34 |
+ # from glibc[crypt] to libxcrypt |
| 35 |
+ # https://www.gentoo.org/support/news-items/2021-07-23-libxcrypt-migration.html |
| 36 |
+ if has_version "sys-libs/glibc[crypt]"; then |
| 37 |
+ local crypt_target='../../../../usr/lib64/xcrypt/libcrypt.so.1' |
| 38 |
+ else |
| 39 |
+ local crypt_target='../../../../usr/lib/libcrypt.so.1' |
| 40 |
+ fi |
| 41 |
+ dosym $crypt_target /opt/puppetlabs/puppet/lib/libcrypt.so.1 |
| 42 |
} |
| 43 |
|
| 44 |
pkg_postinst() { |
| 45 |
|
| 46 |
diff --git a/app-admin/puppet-agent/puppet-agent-7.10.0.ebuild b/app-admin/puppet-agent/puppet-agent-7.10.0.ebuild |
| 47 |
index 8ad3ca37f43..8621917db95 100644 |
| 48 |
--- a/app-admin/puppet-agent/puppet-agent-7.10.0.ebuild |
| 49 |
+++ b/app-admin/puppet-agent/puppet-agent-7.10.0.ebuild |
| 50 |
@@ -70,7 +70,16 @@ src_install() { |
| 51 |
dosym ../../opt/puppetlabs/bin/facter /usr/bin/facter |
| 52 |
dosym ../../opt/puppetlabs/bin/hiera /usr/bin/hiera |
| 53 |
dosym ../../opt/puppetlabs/bin/puppet /usr/bin/puppet |
| 54 |
- dosym ../../../../usr/lib64/xcrypt/libcrypt.so.1 /opt/puppetlabs/puppet/lib/libcrypt.so.1 |
| 55 |
+ |
| 56 |
+ # Handling of the path to the crypt library during the ongoing migration |
| 57 |
+ # from glibc[crypt] to libxcrypt |
| 58 |
+ # https://www.gentoo.org/support/news-items/2021-07-23-libxcrypt-migration.html |
| 59 |
+ if has_version "sys-libs/glibc[crypt]"; then |
| 60 |
+ local crypt_target='../../../../usr/lib64/xcrypt/libcrypt.so.1' |
| 61 |
+ else |
| 62 |
+ local crypt_target='../../../../usr/lib/libcrypt.so.1' |
| 63 |
+ fi |
| 64 |
+ dosym $crypt_target /opt/puppetlabs/puppet/lib/libcrypt.so.1 |
| 65 |
} |
| 66 |
|
| 67 |
pkg_postinst() { |
| 68 |
|
| 69 |
diff --git a/app-admin/puppet-agent/puppet-agent-7.11.0.ebuild b/app-admin/puppet-agent/puppet-agent-7.11.0.ebuild |
| 70 |
index f90ff43e876..302711db8e5 100644 |
| 71 |
--- a/app-admin/puppet-agent/puppet-agent-7.11.0.ebuild |
| 72 |
+++ b/app-admin/puppet-agent/puppet-agent-7.11.0.ebuild |
| 73 |
@@ -70,7 +70,16 @@ src_install() { |
| 74 |
dosym ../../opt/puppetlabs/bin/facter /usr/bin/facter |
| 75 |
dosym ../../opt/puppetlabs/bin/hiera /usr/bin/hiera |
| 76 |
dosym ../../opt/puppetlabs/bin/puppet /usr/bin/puppet |
| 77 |
- dosym ../../../../usr/lib64/xcrypt/libcrypt.so.1 /opt/puppetlabs/puppet/lib/libcrypt.so.1 |
| 78 |
+ |
| 79 |
+ # Handling of the path to the crypt library during the ongoing migration |
| 80 |
+ # from glibc[crypt] to libxcrypt |
| 81 |
+ # https://www.gentoo.org/support/news-items/2021-07-23-libxcrypt-migration.html |
| 82 |
+ if has_version "sys-libs/glibc[crypt]"; then |
| 83 |
+ local crypt_target='../../../../usr/lib64/xcrypt/libcrypt.so.1' |
| 84 |
+ else |
| 85 |
+ local crypt_target='../../../../usr/lib/libcrypt.so.1' |
| 86 |
+ fi |
| 87 |
+ dosym $crypt_target /opt/puppetlabs/puppet/lib/libcrypt.so.1 |
| 88 |
} |
| 89 |
|
| 90 |
pkg_postinst() { |
Archives