commit: 1cb751e862be780084c4d9a1ae09bc19c783b55d Author: Mike Gilbert <floppym <AT> gentoo <DOT> org> AuthorDate: Sat Feb 4 01:36:14 2023 +0000 Commit: Mike Gilbert <floppym <AT> gentoo <DOT> org> CommitDate: Sat Feb 4 01:36:14 2023 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1cb751e8
dev-libs/openssl: replace c_rehash with openssl rehash Bug: https://bugs.gentoo.org/855494 Signed-off-by: Mike Gilbert <floppym <AT> gentoo.org> .../openssl/{openssl-1.1.1s-r1.ebuild => openssl-1.1.1s-r2.ebuild} | 6 +++--- .../openssl/{openssl-3.0.7-r2.ebuild => openssl-3.0.7-r3.ebuild} | 5 ++--- 2 files changed, 5 insertions(+), 6 deletions(-) diff --git a/dev-libs/openssl/openssl-1.1.1s-r1.ebuild b/dev-libs/openssl/openssl-1.1.1s-r2.ebuild similarity index 98% rename from dev-libs/openssl/openssl-1.1.1s-r1.ebuild rename to dev-libs/openssl/openssl-1.1.1s-r2.ebuild index 910d8fcfbda4..e9c80f3f1ea3 100644 --- a/dev-libs/openssl/openssl-1.1.1s-r1.ebuild +++ b/dev-libs/openssl/openssl-1.1.1s-r2.ebuild @@ -22,7 +22,7 @@ fi IUSE="+asm rfc3779 sctp cpu_flags_x86_sse2 sslv3 static-libs test tls-compression tls-heartbeat vanilla verify-sig weak-ssl-ciphers" RESTRICT="!test? ( test )" -RDEPEND=">=app-misc/c_rehash-1.7-r1 +RDEPEND=" tls-compression? ( >=sys-libs/zlib-1.2.8-r1[static-libs(+)?,${MULTILIB_USEDEP}] )" DEPEND="${RDEPEND}" BDEPEND=" @@ -334,7 +334,7 @@ multilib_src_install_all() { } pkg_postinst() { - ebegin "Running 'c_rehash ${EROOT}${SSL_CNF_DIR}/certs/' to rebuild hashes (bug #333069)" - c_rehash "${EROOT}${SSL_CNF_DIR}/certs" >/dev/null + ebegin "Running 'openssl rehash ${EROOT}${SSL_CNF_DIR}/certs' to rebuild hashes (bug #333069)" + openssl rehash "${EROOT}${SSL_CNF_DIR}/certs" eend $? } diff --git a/dev-libs/openssl/openssl-3.0.7-r2.ebuild b/dev-libs/openssl/openssl-3.0.7-r3.ebuild similarity index 98% rename from dev-libs/openssl/openssl-3.0.7-r2.ebuild rename to dev-libs/openssl/openssl-3.0.7-r3.ebuild index e83dd0df830b..4c45fff5299e 100644 --- a/dev-libs/openssl/openssl-3.0.7-r2.ebuild +++ b/dev-libs/openssl/openssl-3.0.7-r3.ebuild @@ -30,7 +30,6 @@ IUSE="+asm cpu_flags_x86_sse2 fips ktls rfc3779 sctp static-libs test tls-compre RESTRICT="!test? ( test )" COMMON_DEPEND=" - >=app-misc/c_rehash-1.7-r1 tls-compression? ( >=sys-libs/zlib-1.2.8-r1[static-libs(+)?,${MULTILIB_USEDEP}] ) " BDEPEND=" @@ -320,7 +319,7 @@ multilib_src_install_all() { } pkg_postinst() { - ebegin "Running 'c_rehash ${EROOT}${SSL_CNF_DIR}/certs/' to rebuild hashes (bug #333069)" - c_rehash "${EROOT}${SSL_CNF_DIR}/certs" >/dev/null + ebegin "Running 'openssl rehash ${EROOT}${SSL_CNF_DIR}/certs' to rebuild hashes (bug #333069)" + openssl rehash "${EROOT}${SSL_CNF_DIR}/certs" eend $? }
