aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTimur I. Bakeyev <timur@FreeBSD.org>2022-10-25 23:35:19 +0000
committerTimur I. Bakeyev <timur@FreeBSD.org>2022-10-25 23:35:19 +0000
commitd485effa8f7044005d25bfcba00e5bf079813cf8 (patch)
tree773fed3bb0f908519b48d3cad8608aa1c25ca7bc
parent890f94ea16e9af2a5f2c74e14d2ffc0873120468 (diff)
net/samba412: Remove Samba 4.12 from the default versions
And add samba416 as a new option. Make samba413 a default for now.
-rw-r--r--Mk/Uses/samba.mk2
-rw-r--r--Mk/bsd.default-versions.mk4
-rw-r--r--net/samba412/Makefile6
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