From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 8164D158018 for ; Tue, 28 Sep 2021 20:25:28 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 37EDEE0901; Tue, 28 Sep 2021 20:25:27 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher ECDHE-RSA-CHACHA20-POLY1305 (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 1A11EE0901 for ; Tue, 28 Sep 2021 20:25:27 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher ECDHE-RSA-CHACHA20-POLY1305 (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 00417342BA9 for ; Tue, 28 Sep 2021 20:25:26 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 39C0B105 for ; Tue, 28 Sep 2021 20:25:24 +0000 (UTC) From: "Matthew Thode" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Matthew Thode" Message-ID: <1632860719.abe372a63dacd57ed7809233ef02591e37941cb4.prometheanfire@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: app-admin/puppet-agent/ X-VCS-Repository: repo/gentoo X-VCS-Files: app-admin/puppet-agent/puppet-agent-6.19.1-r1.ebuild app-admin/puppet-agent/puppet-agent-7.10.0.ebuild app-admin/puppet-agent/puppet-agent-7.11.0.ebuild X-VCS-Directories: app-admin/puppet-agent/ X-VCS-Committer: prometheanfire X-VCS-Committer-Name: Matthew Thode X-VCS-Revision: abe372a63dacd57ed7809233ef02591e37941cb4 X-VCS-Branch: master Date: Tue, 28 Sep 2021 20:25:24 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 5630dc70-4e59-4004-b491-647b3dd52283 X-Archives-Hash: 26273d057b829c0f0e18b8fad4a96324 commit: abe372a63dacd57ed7809233ef02591e37941cb4 Author: Phil DeMonaco demona co> AuthorDate: Tue Sep 28 19:09:22 2021 +0000 Commit: Matthew Thode gentoo org> CommitDate: Tue Sep 28 20:25:19 2021 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=abe372a6 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 demona.co> Signed-off-by: Matthew Thode gentoo.org> app-admin/puppet-agent/puppet-agent-6.19.1-r1.ebuild | 11 ++++++++++- app-admin/puppet-agent/puppet-agent-7.10.0.ebuild | 11 ++++++++++- 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 e99c2fe2b84..22dc570bbd3 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 8ad3ca37f43..8621917db95 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 f90ff43e876..302711db8e5 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() {