From mboxrd@z Thu Jan 1 00:00:00 1970
Return-Path: <gentoo-commits+bounces-1531397-garchives=archives.gentoo.org@lists.gentoo.org>
Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80])
(using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)
key-exchange X25519 server-signature RSA-PSS (2048 bits))
(No client certificate requested)
by finch.gentoo.org (Postfix) with ESMTPS id 49D1A158009
for <garchives@archives.gentoo.org>; Thu, 22 Jun 2023 06:11:19 +0000 (UTC)
Received: from pigeon.gentoo.org (localhost [127.0.0.1])
by pigeon.gentoo.org (Postfix) with SMTP id 8A3C5E0920;
Thu, 22 Jun 2023 06:11:18 +0000 (UTC)
Received: from smtp.gentoo.org (dev.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4])
(using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)
key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256)
(No client certificate requested)
by pigeon.gentoo.org (Postfix) with ESMTPS id 6B99DE0920
for <gentoo-commits@lists.gentoo.org>; Thu, 22 Jun 2023 06:11:18 +0000 (UTC)
Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52])
(using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)
key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256)
(No client certificate requested)
by smtp.gentoo.org (Postfix) with ESMTPS id 95097335D5D
for <gentoo-commits@lists.gentoo.org>; Thu, 22 Jun 2023 06:11:17 +0000 (UTC)
Received: from localhost.localdomain (localhost [IPv6:::1])
by oystercatcher.gentoo.org (Postfix) with ESMTP id 00ECBA95
for <gentoo-commits@lists.gentoo.org>; Thu, 22 Jun 2023 06:11:16 +0000 (UTC)
From: "Sam James" <sam@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Content-Transfer-Encoding: 8bit
Content-type: text/plain; charset=UTF-8
Reply-To: gentoo-dev@lists.gentoo.org, "Sam James" <sam@gentoo.org>
Message-ID: <1687414239.161b4e469a0ef4ff533091bf8c820e0371f61f19.sam@gentoo>
Subject: [gentoo-commits] repo/gentoo:master commit in: dev-libs/openssl/
X-VCS-Repository: repo/gentoo
X-VCS-Files: dev-libs/openssl/openssl-3.0.9-r1.ebuild dev-libs/openssl/openssl-3.0.9.ebuild dev-libs/openssl/openssl-3.1.1-r1.ebuild dev-libs/openssl/openssl-3.1.1.ebuild
X-VCS-Directories: dev-libs/openssl/
X-VCS-Committer: sam
X-VCS-Committer-Name: Sam James
X-VCS-Revision: 161b4e469a0ef4ff533091bf8c820e0371f61f19
X-VCS-Branch: master
Date: Thu, 22 Jun 2023 06:11:16 +0000 (UTC)
Precedence: bulk
List-Post: <mailto:gentoo-commits@lists.gentoo.org>
List-Help: <mailto:gentoo-commits+help@lists.gentoo.org>
List-Unsubscribe: <mailto:gentoo-commits+unsubscribe@lists.gentoo.org>
List-Subscribe: <mailto:gentoo-commits+subscribe@lists.gentoo.org>
List-Id: Gentoo Linux mail <gentoo-commits.gentoo.org>
X-BeenThere: gentoo-commits@lists.gentoo.org
X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply
X-Archives-Salt: af9a18bb-8c60-4a44-b43c-c62768e329d9
X-Archives-Hash: 684db3dc6056f9fb83cf0b161ae38ae1
commit: 161b4e469a0ef4ff533091bf8c820e0371f61f19
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Thu Jun 22 06:07:07 2023 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Thu Jun 22 06:10:39 2023 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=161b4e46
dev-libs/openssl: use preserve-libs.eclass
coreutils[openssl] will make e.g. sort use openssl for acceleration. For
users with FEATURES="-preserve-libs" (non-default, pretty rare), we need to
use preserve-libs.eclass to force preservation as it'll result in a bricked
system otherwise.
Reported on the forums at https://forums.gentoo.org/viewtopic-t-1163916.html too.
If you've hit this:
* you'll likely need to use a rescue environment to install a binary package
of coreutils built without openssl, or downgrade openssl instead.
See https://wiki.gentoo.org/wiki/Fix_my_Gentoo.
* you may want to (although it's not required) set FEATURES="preserved-libs"
in make.conf.
Bug: https://bugs.gentoo.org/908746
Bug: https://bugs.gentoo.org/908849
Fixes: 842c8893492294933fc5527af41c3c9ab16d0efd
Signed-off-by: Sam James <sam <AT> gentoo.org>
.../openssl/{openssl-3.0.9.ebuild => openssl-3.0.9-r1.ebuild} | 9 ++++++++-
.../openssl/{openssl-3.1.1.ebuild => openssl-3.1.1-r1.ebuild} | 9 ++++++++-
2 files changed, 16 insertions(+), 2 deletions(-)
diff --git a/dev-libs/openssl/openssl-3.0.9.ebuild b/dev-libs/openssl/openssl-3.0.9-r1.ebuild
similarity index 95%
rename from dev-libs/openssl/openssl-3.0.9.ebuild
rename to dev-libs/openssl/openssl-3.0.9-r1.ebuild
index ee26cdf431c1..05076efcb217 100644
--- a/dev-libs/openssl/openssl-3.0.9.ebuild
+++ b/dev-libs/openssl/openssl-3.0.9-r1.ebuild
@@ -4,7 +4,8 @@
EAPI=8
VERIFY_SIG_OPENPGP_KEY_PATH="${BROOT}"/usr/share/openpgp-keys/openssl.org.asc
-inherit edo flag-o-matic linux-info toolchain-funcs multilib-minimal multiprocessing verify-sig
+inherit edo flag-o-matic linux-info toolchain-funcs
+inherit multilib multilib-minimal multiprocessing preserve-libs verify-sig
DESCRIPTION="Robust, full-featured Open Source Toolkit for the Transport Layer Security (TLS)"
HOMEPAGE="https://www.openssl.org/"
@@ -264,10 +265,16 @@ pkg_preinst() {
-module "${ED}/usr/$(get_libdir)/ossl-modules/fips.so"
eend $?
fi
+
+ preserve_old_lib /usr/$(get_libdir)/lib{crypto,ssl}$(get_libname 1) \
+ /usr/$(get_libdir)/lib{crypto,ssl}$(get_libname 1.1)
}
pkg_postinst() {
ebegin "Running 'openssl rehash ${EROOT}${SSL_CNF_DIR}/certs' to rebuild hashes (bug #333069)"
openssl rehash "${EROOT}${SSL_CNF_DIR}/certs"
eend $?
+
+ preserve_old_lib_notify /usr/$(get_libdir)/lib{crypto,ssl}$(get_libname 1) \
+ /usr/$(get_libdir)/lib{crypto,ssl}$(get_libname 1.1)
}
diff --git a/dev-libs/openssl/openssl-3.1.1.ebuild b/dev-libs/openssl/openssl-3.1.1-r1.ebuild
similarity index 95%
rename from dev-libs/openssl/openssl-3.1.1.ebuild
rename to dev-libs/openssl/openssl-3.1.1-r1.ebuild
index 66fb41062dec..a8e1fa9a6549 100644
--- a/dev-libs/openssl/openssl-3.1.1.ebuild
+++ b/dev-libs/openssl/openssl-3.1.1-r1.ebuild
@@ -4,7 +4,8 @@
EAPI=8
VERIFY_SIG_OPENPGP_KEY_PATH="${BROOT}"/usr/share/openpgp-keys/openssl.org.asc
-inherit edo flag-o-matic linux-info toolchain-funcs multilib-minimal multiprocessing verify-sig
+inherit edo flag-o-matic linux-info toolchain-funcs
+inherit multilib multilib-minimal multiprocessing preserve-libs verify-sig
DESCRIPTION="Robust, full-featured Open Source Toolkit for the Transport Layer Security (TLS)"
HOMEPAGE="https://www.openssl.org/"
@@ -267,10 +268,16 @@ pkg_preinst() {
-module "${ED}/usr/$(get_libdir)/ossl-modules/fips.so"
eend $?
fi
+
+ preserve_old_lib /usr/$(get_libdir)/lib{crypto,ssl}$(get_libname 1) \
+ /usr/$(get_libdir)/lib{crypto,ssl}$(get_libname 1.1)
}
pkg_postinst() {
ebegin "Running 'openssl rehash ${EROOT}${SSL_CNF_DIR}/certs' to rebuild hashes (bug #333069)"
openssl rehash "${EROOT}${SSL_CNF_DIR}/certs"
eend $?
+
+ preserve_old_lib_notify /usr/$(get_libdir)/lib{crypto,ssl}$(get_libname 1) \
+ /usr/$(get_libdir)/lib{crypto,ssl}$(get_libname 1.1)
}