summaryrefslogtreecommitdiff
path: root/net/samba420
diff options
context:
space:
mode:
Diffstat (limited to 'net/samba420')
-rw-r--r--net/samba420/Makefile5
-rw-r--r--net/samba420/distinfo6
-rw-r--r--net/samba420/files/patch-python_samba_tdb__util.py15
-rw-r--r--net/samba420/pkg-plist.python1
4 files changed, 7 insertions, 20 deletions
diff --git a/net/samba420/Makefile b/net/samba420/Makefile
index 487e6fb0e241..36db6c71fe15 100644
--- a/net/samba420/Makefile
+++ b/net/samba420/Makefile
@@ -1,6 +1,5 @@
PORTNAME= ${SAMBA4_BASENAME}420
PORTVERSION= ${SAMBA4_VERSION}
-PORTREVISION= 11
CATEGORIES?= net
MASTER_SITES= SAMBA/samba/stable SAMBA/samba/rc
DISTNAME= ${SAMBA4_DISTNAME}
@@ -12,6 +11,8 @@ WWW= https://gitlab.com/samba-freebsd/
LICENSE= GPLv3+
LICENSE_FILE= ${WRKSRC}/COPYING
+DEPRECATED= Discontinued upstream; transition to a supported versions of Samba (refer to https://wiki.samba.org/index.php/Samba_Release_Planning)
+
USES= cpe
CONFLICTS_INSTALL?= samba4*
@@ -52,7 +53,7 @@ EXTRA_PATCHES= \
SAMBA4_BASENAME= samba
SAMBA4_PORTNAME= ${SAMBA4_BASENAME}4
-SAMBA4_VERSION= 4.20.7
+SAMBA4_VERSION= 4.20.8
SAMBA4_DISTNAME= ${SAMBA4_BASENAME}-${SAMBA4_VERSION:S|.p|pre|:S|.r|rc|:S|.t|tp|:S|.a|alpha|}
WRKSRC?= ${WRKDIR}/${DISTNAME}
diff --git a/net/samba420/distinfo b/net/samba420/distinfo
index e6dc8bc2d49f..9858f8d90d7f 100644
--- a/net/samba420/distinfo
+++ b/net/samba420/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1737565689
-SHA256 (samba-4.20.7.tar.gz) = 5afe8b66e612ab1c7e57c6146adfe98ec3ea9d40dee2962a2076a3d6d6973b78
-SIZE (samba-4.20.7.tar.gz) = 42523056
+TIMESTAMP = 1766066171
+SHA256 (samba-4.20.8.tar.gz) = 75be0e8d31f45013e9b260fe7cf304a36d2d8128391914772577215ec173a807
+SIZE (samba-4.20.8.tar.gz) = 42531989
diff --git a/net/samba420/files/patch-python_samba_tdb__util.py b/net/samba420/files/patch-python_samba_tdb__util.py
deleted file mode 100644
index ffbe35f0016b..000000000000
--- a/net/samba420/files/patch-python_samba_tdb__util.py
+++ /dev/null
@@ -1,15 +0,0 @@
---- 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)
-
diff --git a/net/samba420/pkg-plist.python b/net/samba420/pkg-plist.python
index 2ee4e7430379..4eba1ad08c42 100644
--- a/net/samba420/pkg-plist.python
+++ b/net/samba420/pkg-plist.python
@@ -432,6 +432,7 @@ lib/samba4/private/libsamba-python%%PYTHON_TAG%%-private-samba.so
%%PYTHON_SITELIBDIR%%/samba/tests/messaging.py
%%PYTHON_SITELIBDIR%%/samba/tests/ndr/gkdi.py
%%PYTHON_SITELIBDIR%%/samba/tests/ndr/gmsa.py
+%%PYTHON_SITELIBDIR%%/samba/tests/ndr/sd.py
%%PYTHON_SITELIBDIR%%/samba/tests/ndr/wbint.py
%%PYTHON_SITELIBDIR%%/samba/tests/net_join.py
%%PYTHON_SITELIBDIR%%/samba/tests/net_join_no_spnego.py