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)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 3886B158094 for ; Fri, 30 Sep 2022 04:19:01 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 7C3A42BC082; Fri, 30 Sep 2022 04:19:00 +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)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 637622BC082 for ; Fri, 30 Sep 2022 04:19:00 +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 2BEE8341377 for ; Fri, 30 Sep 2022 04:18:59 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 6F7255BF for ; Fri, 30 Sep 2022 04:18:57 +0000 (UTC) From: "Sam James" 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" Message-ID: <1664511522.b23366c1e34cd6c65ca1aa439d7a98a8c5dfd8cc.sam@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: net-fs/samba/ X-VCS-Repository: repo/gentoo X-VCS-Files: net-fs/samba/samba-4.16.5-r1.ebuild X-VCS-Directories: net-fs/samba/ X-VCS-Committer: sam X-VCS-Committer-Name: Sam James X-VCS-Revision: b23366c1e34cd6c65ca1aa439d7a98a8c5dfd8cc X-VCS-Branch: master Date: Fri, 30 Sep 2022 04:18:57 +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: b67906de-3481-4430-816d-31c7d014679e X-Archives-Hash: 2f1f9f55d88c42cde02296bdd7e8da64 commit: b23366c1e34cd6c65ca1aa439d7a98a8c5dfd8cc Author: Sam James gentoo org> AuthorDate: Fri Sep 30 04:15:58 2022 +0000 Commit: Sam James gentoo org> CommitDate: Fri Sep 30 04:18:42 2022 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b23366c1 net-fs/samba: add talloc/tdb/tevent version checker Nabbed Ionen's sed from wine-proton etc. Signed-off-by: Sam James gentoo.org> net-fs/samba/samba-4.16.5-r1.ebuild | 35 ++++++++++++++++++++++++++++++++--- 1 file changed, 32 insertions(+), 3 deletions(-) diff --git a/net-fs/samba/samba-4.16.5-r1.ebuild b/net-fs/samba/samba-4.16.5-r1.ebuild index b14d8de3be2c..4ece5b887999 100644 --- a/net-fs/samba/samba-4.16.5-r1.ebuild +++ b/net-fs/samba/samba-4.16.5-r1.ebuild @@ -55,6 +55,10 @@ MULTILIB_WRAPPED_HEADERS=( /usr/include/samba-4.0/ctdb_version.h ) +TALLOC_VERSION="2.3.3" +TDB_VERSION="1.4.6" +TEVENT_VERSION="0.11.0" + COMMON_DEPEND=" >=app-arch/libarchive-3.1.2[${MULTILIB_USEDEP}] dev-lang/perl:= @@ -71,9 +75,9 @@ COMMON_DEPEND=" sys-libs/liburing:=[${MULTILIB_USEDEP}] sys-libs/ncurses:= sys-libs/readline:= - >=sys-libs/talloc-2.3.3[${MULTILIB_USEDEP}] - >=sys-libs/tdb-1.4.6[${MULTILIB_USEDEP}] - >=sys-libs/tevent-0.11.0[${MULTILIB_USEDEP}] + >=sys-libs/talloc-${TALLOC_VERSION}[${MULTILIB_USEDEP}] + >=sys-libs/tdb-${TDB_VERSION}[${MULTILIB_USEDEP}] + >=sys-libs/tevent-${TEVENT_VERSION}[${MULTILIB_USEDEP}] sys-libs/zlib[${MULTILIB_USEDEP}] virtual/libcrypt:=[${MULTILIB_USEDEP}] virtual/libiconv @@ -166,9 +170,34 @@ pkg_setup() { fi } +check_samba_dep_versions() { + actual_talloc_version=$(sed -En '/^VERSION =/{s/[^0-9.]//gp}' lib/talloc/wscript || die) + if [[ ${actual_talloc_version} != ${TALLOC_VERSION} ]] ; then + eerror "Source talloc version: ${TALLOC_VERSION}" + eerror "Ebuild talloc version: ${actual_talloc_version}" + die "Ebuild needs to fix TALLOC_VERSION!" + fi + + actual_tdb_version=$(sed -En '/^VERSION =/{s/[^0-9.]//gp}' lib/tdb/wscript || die) + if [[ ${actual_tdb_version} != ${TDB_VERSION} ]] ; then + eerror "Source tdb version: ${TDB_VERSION}" + eerror "Ebuild tdb version: ${actual_tdb_version}" + die "Ebuild needs to fix TDB_VERSION!" + fi + + actual_tevent_version=$(sed -En '/^VERSION =/{s/[^0-9.]//gp}' lib/tevent/wscript || die) + if [[ ${actual_tevent_version} != ${TEVENT_VERSION} ]] ; then + eerror "Source tevent version: ${TEVENT_VERSION}" + eerror "Ebuild tevent version: ${actual_tevent_version}" + die "Ebuild needs to fix TEVENT_VERSION!" + fi +} + src_prepare() { default + check_samba_dep_versions + # Unbundle dnspython sed -i -e '/"dns.resolver":/d' "${S}"/third_party/wscript || die