From nobody Thu Jan 30 14:44:01 2025 X-Original-To: dev-commits-ports-all@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 4YkMGq6536z5mcrY; Thu, 30 Jan 2025 14:44:03 +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 4YkMGn4kRyz3Mf5; Thu, 30 Jan 2025 14:44:01 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1738248241; 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=LdVyV6M6fw19Acqyzhd9HOrWCOkXi5aVeqDmeUvYY2w=; b=a+KFjl1e+WQ5+Gmt+yBOXHTqHiTnwG0nK7zOmBtr/HgJR2REw2LCaGa/LUGYbGmrIDmh9R xc2JSQSJyR58D2+tD+4vPM5FqlMv+dmoDwUHX1uj/l1IyyWe2RV+Or+/GLVqnJG/SEfkh8 E14h3xmQ9ag2xDrItWqtsOcF2V6viyWX6S54R25RvXqBMZHuXGDvUfTm28c130/qGsDHqg fgYS80bLwmJNNZgvdXnrmjR4Iyk/qhcuh5SHU5VJ0rx3M+SafdUO2TTMuDPbx9wCs1PHNT 7E18dYxAdSte5TiCqrrvOYSpW2+mkEhYj00yIpX6QRd1CbHbDA2M781IDJBZ3A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1738248241; 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=LdVyV6M6fw19Acqyzhd9HOrWCOkXi5aVeqDmeUvYY2w=; b=DQgNUnRQFHveluqhzPo46ZrSGpWckXMxxKl+etmssHf0NjaKQER8ob48Q2aZUxS/Po1hkd thmakd0YU/kJ3VhfcP+pKhVSqPeIBDt1OYe7JWyA8NaamUbfHL8yGC9MQ2gSxPaxiOA/6X fTcSDueD3Uj5QkO3BDxOs839rJ9O0FX3Oay8CiHyXFOxJrErmBBvNgMXa8CbDKHKv+Y263 gG8qJ0O9ax3t/4h9SxGkUjX6OLwGGxVtW+9hQC05odEc7XvBjnawmgIO/wOZzJdVur5RyP NZKgpq+YtO7/eaLXQoj/NqLXB0D20NeojUvttWVxPC4MbpQqnYuYgXpeXZQ8Og== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1738248241; a=rsa-sha256; cv=none; b=QfjzfuK/ZiD9AtEZ/JvVb6BRHss7YP8qC9Mm0RRvJVLZ6qEyTc/OM6sTFG9hjZgjjN5j37 8cw6XGayloDRqkbJM9M6O03EsByY00r0f2Ri4PsaEWRCcWRR2J3ZTbaYaq2KzLm4wdUgFQ QSsm+oDnD5uRP27PDxR2eYitEY9OLUCYdmTLRi/tzBhM950e5jWOsL78H8yYZrWC6ftbx6 OmvyDuSDKSJxoEggQPNW1C221M5wEFZXVKXJhaxqCEa9w06SHjr2WSIxEYQlUkL/ic+iR7 KiY+XCGgO2Ff0q7hzVkXfSYbUiZRI7i1DvaSRM5xV1iXA55B/Iung66ngQ/Smg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none 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 4YkMGn403Fzs9Y; Thu, 30 Jan 2025 14:44:01 +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 50UEi1mQ092840; Thu, 30 Jan 2025 14:44:01 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 50UEi1gf092837; Thu, 30 Jan 2025 14:44:01 GMT (envelope-from git) Date: Thu, 30 Jan 2025 14:44:01 GMT Message-Id: <202501301444.50UEi1gf092837@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Xavier Beaudouin Subject: git: 29ed90005111 - main - Mk: Add Samba 4.20 List-Id: Commit messages for all branches of the ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-ports-all@freebsd.org Sender: owner-dev-commits-ports-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kiwi X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 29ed90005111c56cccb126f4edba998c0a90f5d6 Auto-Submitted: auto-generated The branch main has been updated by kiwi: URL: https://cgit.FreeBSD.org/ports/commit/?id=29ed90005111c56cccb126f4edba998c0a90f5d6 commit 29ed90005111c56cccb126f4edba998c0a90f5d6 Author: Xavier Beaudouin AuthorDate: 2025-01-28 10:16:31 +0000 Commit: Xavier Beaudouin CommitDate: 2025-01-30 14:42:00 +0000 Mk: Add Samba 4.20 Add Samba 4.20 to Uses/samba.mk and bsd.default-versions.mk. PR: 280533 Approved by: samba (0mp, kiwi) Sponsored by: Klara, Inc. Co-authored-by: Mateusz Piotrowski <0mp@FreeBSD.org> --- Mk/Uses/samba.mk | 4 +++- Mk/bsd.default-versions.mk | 2 +- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/Mk/Uses/samba.mk b/Mk/Uses/samba.mk index 27d0ec1595da..9db89f7ed386 100644 --- a/Mk/Uses/samba.mk +++ b/Mk/Uses/samba.mk @@ -18,7 +18,7 @@ samba_ARGS= build run IGNORE= USES=samba has invalid arguments: ${samba_ARGS:Nbuild:Nenv:Nlib:Nrun} . endif -. if ${SAMBA_DEFAULT} != 4.16 && ${SAMBA_DEFAULT} != 4.19 +. if ${SAMBA_DEFAULT} != 4.16 && ${SAMBA_DEFAULT} != 4.19 && ${SAMBA_DEFAULT} != 4.20 IGNORE= Invalid version of samba: ${SAMBA_DEFAULT} . endif @@ -28,6 +28,8 @@ SAMBA_PORT_416= net/samba416 SAMBA_LDB_PORT_416= databases/ldb25 SAMBA_PORT_419= net/samba419 SAMBA_LDB_PORT_419= databases/ldb28 +SAMBA_PORT_420= net/samba420 +SAMBA_LDB_PORT_420= databases/ldb29 SAMBA_PORT= ${SAMBA_PORT_${SAMBA_SUFFIX}} SAMBA_INCLUDEDIR= ${LOCALBASE}/include/samba4 diff --git a/Mk/bsd.default-versions.mk b/Mk/bsd.default-versions.mk index 89b3f32cbb87..fea20e4280e4 100644 --- a/Mk/bsd.default-versions.mk +++ b/Mk/bsd.default-versions.mk @@ -144,7 +144,7 @@ PYTHON2_DEFAULT?= 2.7 RUBY_DEFAULT?= 3.2 # Possible values: rust, rust-nightly RUST_DEFAULT?= rust -# Possible values: 4.16, 4.19 +# Possible values: 4.16, 4.19, 4.20 SAMBA_DEFAULT?= 4.16 # When updating this, please also update the same list in ssl.mk and the checks # for USES=ssl in qa.sh!