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.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 14AA815800F for ; Sat, 4 Feb 2023 01:48:11 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 1132CE07C5; Sat, 4 Feb 2023 01:48:10 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.gentoo.org [140.211.166.183]) (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 8B9CEE07C5 for ; Sat, 4 Feb 2023 01:48:09 +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 774B4340D92 for ; Sat, 4 Feb 2023 01:48:07 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id EA61975 for ; Sat, 4 Feb 2023 01:48:04 +0000 (UTC) From: "Mike Gilbert" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Mike Gilbert" Message-ID: <1675474574.1cb751e862be780084c4d9a1ae09bc19c783b55d.floppym@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: dev-libs/openssl/ X-VCS-Repository: repo/gentoo X-VCS-Files: dev-libs/openssl/openssl-1.1.1s-r1.ebuild dev-libs/openssl/openssl-1.1.1s-r2.ebuild dev-libs/openssl/openssl-3.0.7-r2.ebuild dev-libs/openssl/openssl-3.0.7-r3.ebuild X-VCS-Directories: dev-libs/openssl/ X-VCS-Committer: floppym X-VCS-Committer-Name: Mike Gilbert X-VCS-Revision: 1cb751e862be780084c4d9a1ae09bc19c783b55d X-VCS-Branch: master Date: Sat, 4 Feb 2023 01:48:04 +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: bfd99b34-6ae8-45c3-9129-da5354cf500a X-Archives-Hash: 0b7c2b8f984d20067906702c90400b0b commit: 1cb751e862be780084c4d9a1ae09bc19c783b55d Author: Mike Gilbert gentoo org> AuthorDate: Sat Feb 4 01:36:14 2023 +0000 Commit: Mike Gilbert gentoo 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 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 $? }