diff options
| author |   Phil DeMonaco <phil@demona.co> | 2021-09-28 15:09:22 -0400 |
|---|---|---|
| committer |   Matthew Thode <prometheanfire@gentoo.org> | 2021-09-28 15:25:19 -0500 |
| commit | abe372a63dacd57ed7809233ef02591e37941cb4 (patch) | |
| tree | b5575a979cd860438685a6c446d81f2b57f81a90 /app-admin | |
| parent | app-admin/puppet-agent: symlink fix (diff) | |
| download | gentoo-abe372a63dacd57ed7809233ef02591e37941cb4.tar.gz gentoo-abe372a63dacd57ed7809233ef02591e37941cb4.tar.bz2 gentoo-abe372a63dacd57ed7809233ef02591e37941cb4.zip | |
app-admin/puppet-agent: libxcrypt logic fix #22183
Incorporates the logic suggested by thesamesame that directs to the
libxcrypt non-system path if and only if the crypt flag is still enabled
on sys-libs/glibc.
Package-Manager: Portage-3.0.20, Repoman-3.0.3
Signed-off-by: Philip DeMonaco <phil@demona.co>
Signed-off-by: Matthew Thode <prometheanfire@gentoo.org>
Diffstat (limited to 'app-admin')
| -rw-r--r-- | app-admin/puppet-agent/puppet-agent-6.19.1-r1.ebuild | 11 | ||||
| -rw-r--r-- | app-admin/puppet-agent/puppet-agent-7.10.0.ebuild | 11 | ||||
| -rw-r--r-- | app-admin/puppet-agent/puppet-agent-7.11.0.ebuild | 11 |
3 files changed, 30 insertions, 3 deletions
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 index e99c2fe2b84a..22dc570bbd32 100644 --- a/app-admin/puppet-agent/puppet-agent-6.19.1-r1.ebuild +++ b/app-admin/puppet-agent/puppet-agent-6.19.1-r1.ebuild @@ -72,7 +72,16 @@ src_install() { dosym ../../opt/puppetlabs/bin/hiera /usr/bin/hiera dosym ../../opt/puppetlabs/bin/puppet /usr/bin/puppet dosym ../../opt/puppetlabs/puppet/bin/virt-what /usr/bin/virt-what - dosym ../../../../usr/lib64/xcrypt/libcrypt.so.1 /opt/puppetlabs/puppet/lib/libcrypt.so.1 + + # Handling of the path to the crypt library during the ongoing migration + # from glibc[crypt] to libxcrypt + # https://www.gentoo.org/support/news-items/2021-07-23-libxcrypt-migration.html + if has_version "sys-libs/glibc[crypt]"; then + local crypt_target='../../../../usr/lib64/xcrypt/libcrypt.so.1' + else + local crypt_target='../../../../usr/lib/libcrypt.so.1' + fi + dosym $crypt_target /opt/puppetlabs/puppet/lib/libcrypt.so.1 } pkg_postinst() { diff --git a/app-admin/puppet-agent/puppet-agent-7.10.0.ebuild b/app-admin/puppet-agent/puppet-agent-7.10.0.ebuild index 8ad3ca37f43e..8621917db95a 100644 --- a/app-admin/puppet-agent/puppet-agent-7.10.0.ebuild +++ b/app-admin/puppet-agent/puppet-agent-7.10.0.ebuild @@ -70,7 +70,16 @@ src_install() { dosym ../../opt/puppetlabs/bin/facter /usr/bin/facter dosym ../../opt/puppetlabs/bin/hiera /usr/bin/hiera dosym ../../opt/puppetlabs/bin/puppet /usr/bin/puppet - dosym ../../../../usr/lib64/xcrypt/libcrypt.so.1 /opt/puppetlabs/puppet/lib/libcrypt.so.1 + + # Handling of the path to the crypt library during the ongoing migration + # from glibc[crypt] to libxcrypt + # https://www.gentoo.org/support/news-items/2021-07-23-libxcrypt-migration.html + if has_version "sys-libs/glibc[crypt]"; then + local crypt_target='../../../../usr/lib64/xcrypt/libcrypt.so.1' + else + local crypt_target='../../../../usr/lib/libcrypt.so.1' + fi + dosym $crypt_target /opt/puppetlabs/puppet/lib/libcrypt.so.1 } pkg_postinst() { diff --git a/app-admin/puppet-agent/puppet-agent-7.11.0.ebuild b/app-admin/puppet-agent/puppet-agent-7.11.0.ebuild index f90ff43e8768..302711db8e50 100644 --- a/app-admin/puppet-agent/puppet-agent-7.11.0.ebuild +++ b/app-admin/puppet-agent/puppet-agent-7.11.0.ebuild @@ -70,7 +70,16 @@ src_install() { dosym ../../opt/puppetlabs/bin/facter /usr/bin/facter dosym ../../opt/puppetlabs/bin/hiera /usr/bin/hiera dosym ../../opt/puppetlabs/bin/puppet /usr/bin/puppet - dosym ../../../../usr/lib64/xcrypt/libcrypt.so.1 /opt/puppetlabs/puppet/lib/libcrypt.so.1 + + # Handling of the path to the crypt library during the ongoing migration + # from glibc[crypt] to libxcrypt + # https://www.gentoo.org/support/news-items/2021-07-23-libxcrypt-migration.html + if has_version "sys-libs/glibc[crypt]"; then + local crypt_target='../../../../usr/lib64/xcrypt/libcrypt.so.1' + else + local crypt_target='../../../../usr/lib/libcrypt.so.1' + fi + dosym $crypt_target /opt/puppetlabs/puppet/lib/libcrypt.so.1 } pkg_postinst() { |