From nobody Tue Oct 25 23:36:36 2022 X-Original-To: dev-commits-ports-main@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 4MxpHS33rHz4gM4d; Tue, 25 Oct 2022 23:36:36 +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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4MxpHS2f8pz3vcL; Tue, 25 Oct 2022 23:36:36 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1666740996; 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=yAKKKZLfb6TEVt6C0ZUshTsORZwqesT9Rtax0Vf6+3o=; b=xfkNIok4eSkEgXIEieGfryp6hCjtDMtEV0awiDVrKQtF86jjqUeWPBhwxq8dUXWzUS54H0 oR551qFg0e/8nNvYbdLjOBiJqXz/PD0b06ms6pIBIXrj9flP27nWbQ/Om/PPGPICjtfYUI 60HrZfeUYQCEALLodLM4IvV5w38teU4T09HnjpORJDskIbRay0QxRafApHaYe/8JszhQow QmDE1F5xs1oK27ROswtc+ugZuXELmndXgy4PJGZlEBnWvYiroj5/UTTFeuNdTHeQbM7HOi wkwL0FZhXuZuBmSWmviwNexl3w8KeMN8YqpkhjP+PnfB0gv08BmmPmUHC2Yamg== 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 4MxpHS1jlVzwW3; Tue, 25 Oct 2022 23:36:36 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 29PNaaKe031347; Tue, 25 Oct 2022 23:36:36 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 29PNaaSI031346; Tue, 25 Oct 2022 23:36:36 GMT (envelope-from git) Date: Tue, 25 Oct 2022 23:36:36 GMT Message-Id: <202210252336.29PNaaSI031346@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: "Timur I. Bakeyev" Subject: git: d485effa8f70 - main - net/samba412: Remove Samba 4.12 from the default versions List-Id: Commits to the main branch of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-main@freebsd.org X-BeenThere: dev-commits-ports-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: timur X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: d485effa8f7044005d25bfcba00e5bf079813cf8 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1666740996; 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=yAKKKZLfb6TEVt6C0ZUshTsORZwqesT9Rtax0Vf6+3o=; b=SeIfuWlHgVfnPJ7HoVlzMJ9uiKsXnEYfUv1p9YPOszpClrIwUrw6sz8Oimjan0B55Da/kz F5mTdWnztjhIqfUNFNj260jZzm4L5u16QtJPG6yLMwC3z8jsfANpyPspybWRcu+5GOceqo U1O1YFan0c1UXoJNtSUctqVm+LpKU+d2Yq+oncYBOW88niFJFFM4aPnWYaXYRB/jEf+yKp 0y/IrPLXCHKjY+vrjIf+n7eMuxJ2PSzl2uGw6az4CMhwvPI7SGfDpo3ghQPx0TyrQA46sD opmiGYjM2KihUa9KXjh05nq2NfpIdbvcH33dHtzk6jfRnpMoSVwj4IU7pZB69Q== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1666740996; a=rsa-sha256; cv=none; b=vsmyp5Q4OG0DD8j5v2/paaCUa/RLJ1BXdQ+v+XwBlNYAiJJ5PYSN4fJ5RPfpO4O6Yu5QjA uYtQs32TMM/+vwIzt1MOubQBohAR2ucZmrBV1+a+1Px8iLPn4CKBfvJxf2RbpM0gGYYhS3 iZEsfaNvK7fB5YgIVv0ahJ8JX274L+osncqJAicLZY65ZbTmGNUR8AT0hVo+pJBIp7FkF6 etf12KKEXt02gDtBhUz8VgvziVrheo75ak1mNU9PKqpvK/mCy3c3MfFcg1T4XuxgrEfLRA mjxfDcEBaonQhy3Gcx2Ft3WXei8v2i7xjMwfbhOB/6InNWFvSmAz1p/PlUVmTA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by timur: URL: https://cgit.FreeBSD.org/ports/commit/?id=d485effa8f7044005d25bfcba00e5bf079813cf8 commit d485effa8f7044005d25bfcba00e5bf079813cf8 Author: Timur I. Bakeyev AuthorDate: 2022-10-25 23:35:19 +0000 Commit: Timur I. Bakeyev CommitDate: 2022-10-25 23:35:19 +0000 net/samba412: Remove Samba 4.12 from the default versions And add samba416 as a new option. Make samba413 a default for now. --- Mk/Uses/samba.mk | 2 +- Mk/bsd.default-versions.mk | 4 ++-- net/samba412/Makefile | 6 +++--- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/Mk/Uses/samba.mk b/Mk/Uses/samba.mk index c040d99fb374..bd4ccb0a6189 100644 --- a/Mk/Uses/samba.mk +++ b/Mk/Uses/samba.mk @@ -21,7 +21,7 @@ IGNORE= USES=samba has invalid arguments: ${samba_ARGS:Nbuild:Nenv:Nlib:Nrun} SAMBAPORT= net/samba${SAMBA_DEFAULT:S/.//} SAMBAINCLUDES= ${LOCALBASE}/include/samba4 -. if ${SAMBA_DEFAULT} == 4.12 || ${SAMBA_DEFAULT} == 4.13 +. if ${SAMBA_DEFAULT} == 4.13 || ${SAMBA_DEFAULT} == 4.16 SAMBALIBS= ${LOCALBASE}/lib/samba4 . else IGNORE= Invalid version of samba: ${SAMBA_DEFAULT} diff --git a/Mk/bsd.default-versions.mk b/Mk/bsd.default-versions.mk index c6c620ec8010..b0f29516b685 100644 --- a/Mk/bsd.default-versions.mk +++ b/Mk/bsd.default-versions.mk @@ -130,8 +130,8 @@ PYTHON3_DEFAULT?= 3.9 RUBY_DEFAULT?= 3.0 # Possible values: rust, rust-nightly RUST_DEFAULT?= rust -# Possible values: 4.12, 4.13 -SAMBA_DEFAULT?= 4.12 +# Possible values: 4.13, 4.16 +SAMBA_DEFAULT?= 4.13 # Possible values: base, openssl, libressl, libressl-devel . if !defined(SSL_DEFAULT) # If no preference was set, check for an installed base version diff --git a/net/samba412/Makefile b/net/samba412/Makefile index 7fb0f4565b71..eb7083bb884b 100644 --- a/net/samba412/Makefile +++ b/net/samba412/Makefile @@ -7,13 +7,13 @@ DISTNAME= ${SAMBA4_DISTNAME} MAINTAINER= timur@FreeBSD.org COMMENT= Free SMB/CIFS and AD/DC server and client for Unix -WWW= https://www.samba.org/ +WWW= https://www.samba.org/ LICENSE= GPLv3+ LICENSE_FILE= ${WRKSRC}/COPYING -DEPRECATED= Reached its EoL on September 20, 2021 -EXPIRATION_DATE= 2022-11-30 +DEPRECATED= Reached its EoL on September 20, 2021 +EXPIRATION_DATE= 2022-11-30 IGNORE_NONTHREAD_PYTHON= needs port lang/python${PYTHON_SUFFIX} to be build with THREADS support CONFLICTS_INSTALL?= samba4* # bin/cifsdd bin/dbwrap_tool bin/dumpmscat bin/findsmb bin/gentest