From nobody Tue Feb 18 16:53:59 2025 X-Original-To: dev-commits-ports-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Yy5G00lpTz5nsFg; Tue, 18 Feb 2025 16:54:00 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (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 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Yy5G00CH3z4LLx; Tue, 18 Feb 2025 16:54:00 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1739897640; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=x5L9+k3gatm/ZhNFXuzjHXVogmaIDxH/5O/SdLta/fU=; b=GJ3+fuk4qOdZJk1dZrwLLfoQH7xMFGa+y0qRBzCVQ72P2koyDHV6LgZpudYlLdKrUbQzHU 0waYtotaXAVyJ2nEtN5L7CDMOP76z9zoFv7JVteqydxJIWKeyrb7IcMQGUU+8PH9D2DmsE 8cx6PnuRB4hJXwgqQo0itTZzzVVonRm1pSzv/dbJHOW6Xbh+0avx6BmQ3Rckl5AJDhSfl1 178znIhGiF98/5rblsthxrfB4A8YjXNskHqd0IjOWWnOHCi35ImGKPZMr8toCsiytw2vVJ 6X464E/5aaaz10TpjTVx10b76LrtZrsHi1PQ4pskbuFS5+6CmLK/U4VS5UjwVg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1739897640; a=rsa-sha256; cv=none; b=pCCzm12eimYa5ShpZz3IgvAxrCFz/nfxQL7Kd5YquATGyOqOZ9wvNpRmc05z6yLlSJ00pr KvE4KfRqHsEdwAE7mDs4JST14JfJhQaqTOxAygkHxRGHRlBITKWl6WSypLEr9idMLc8U6h R0ViZfaKIVYXm/pXc5Ezq56YQvrF6HOA1XO9lw2McNz8q7wCdztDC+Tlf3u4o1ItEE+CvD WC1lpQuS9IFjaHYJFEV8U0KL9X+xIJwIpdAQAnjiEgRfcHxzLZNE+nbn3eUAa06aNDb0ha hVn9Ef93PNN1acfQfryJbAAAodUddGF4Ugq3mUW2538HdL+DUMY36/7wRIvxFw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1739897640; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=x5L9+k3gatm/ZhNFXuzjHXVogmaIDxH/5O/SdLta/fU=; b=J7YJWM9GlJq1T4DocriKQxIJ/OiEBx40EUwg1Nd69jC1lxPB2PsRhzmrEOXotxVyoPuJc4 ZCWbTqMmuDPF+m/wrM6KbdgVEeBSlggb11w8a1c1Wz+2nShVnHp/dKd4y0+xSGdAVCCSJ/ To7REu2dRcTGKqiekICIZVCbsVnOo98FZPxLyhA6u9z8+V0EpMBGVPrs5DxNCFVD+xEux/ a0rf/+FccHfhqAoxtidI/7VQyJ/3zZ+TSwEbHOXHfodnLBqpWcWhWcz2mm4vGkN613Waw/ +BlmGjoddriCveCHRHAmr0mdIi8NAgkAkrdpbkgg0nEr5AEE97rAVdW0raxU9g== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (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) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Yy5Fz6qCgzCnY; Tue, 18 Feb 2025 16:53:59 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 51IGrx1Y026760; Tue, 18 Feb 2025 16:53:59 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 51IGrx3w026757; Tue, 18 Feb 2025 16:53:59 GMT (envelope-from git) Date: Tue, 18 Feb 2025 16:53:59 GMT Message-Id: <202502181653.51IGrx3w026757@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-branches@FreeBSD.org From: Michael Osipov Subject: git: cbfef6eec11b - 2025Q1 - net/samba419: "samba-tool domain backup offline" hangs List-Id: Commits to the quarterly branches of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-ports-branches@freebsd.org Sender: owner-dev-commits-ports-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: michaelo X-Git-Repository: ports X-Git-Refname: refs/heads/2025Q1 X-Git-Reftype: branch X-Git-Commit: cbfef6eec11b4465f3805ca26988be7e49773675 Auto-Submitted: auto-generated The branch 2025Q1 has been updated by michaelo: URL: https://cgit.FreeBSD.org/ports/commit/?id=cbfef6eec11b4465f3805ca26988be7e49773675 commit cbfef6eec11b4465f3805ca26988be7e49773675 Author: Andrea Venturoli AuthorDate: 2025-02-18 08:10:46 +0000 Commit: Michael Osipov CommitDate: 2025-02-18 16:53:22 +0000 net/samba419: "samba-tool domain backup offline" hangs PR: 250906 Tested by: ml@netfence.it Approved by: otis (mentor), kiwi, vvd, allanjude MFH: 2025Q1 Differential Revision: https://reviews.freebsd.org/D49044 (cherry picked from commit 1db23ed5ef53c509dd421db6ded1c2f528916361) --- net/samba419/Makefile | 2 +- net/samba419/files/patch-python_samba_tdb__util.py | 15 +++++++++++++++ 2 files changed, 16 insertions(+), 1 deletion(-) diff --git a/net/samba419/Makefile b/net/samba419/Makefile index 7849996e83c0..92cc5bb78f0c 100644 --- a/net/samba419/Makefile +++ b/net/samba419/Makefile @@ -1,6 +1,6 @@ PORTNAME= ${SAMBA4_BASENAME}419 PORTVERSION= ${SAMBA4_VERSION} -PORTREVISION= 4 +PORTREVISION= 5 CATEGORIES?= net MASTER_SITES= SAMBA/samba/stable SAMBA/samba/rc DISTNAME= ${SAMBA4_DISTNAME} diff --git a/net/samba419/files/patch-python_samba_tdb__util.py b/net/samba419/files/patch-python_samba_tdb__util.py new file mode 100644 index 000000000000..ffbe35f0016b --- /dev/null +++ b/net/samba419/files/patch-python_samba_tdb__util.py @@ -0,0 +1,15 @@ +--- python/samba/tdb_util.py.orig 2025-02-17 11:38:24.136379000 +0100 ++++ python/samba/tdb_util.py 2025-02-17 11:38:44.171612000 +0100 +@@ -37,9 +37,10 @@ + raise FileNotFoundError(2, "could not find tdbbackup tool: " + "is tdb-tools installed?") + +- tdbbackup_cmd = [toolpath, "-s", ".copy.tdb", file1] + if readonly: +- tdbbackup_cmd.append("-r") ++ tdbbackup_cmd = [toolpath, "-r", "-s", ".copy.tdb", file1] ++ else: ++ tdbbackup_cmd = [toolpath, "-s", ".copy.tdb", file1] + + status = subprocess.check_call(tdbbackup_cmd, close_fds=True, shell=False) +