diff --git a/net/samba419/Makefile b/net/samba419/Makefile --- a/net/samba419/Makefile +++ b/net/samba419/Makefile @@ -1,6 +1,6 @@ PORTNAME= ${SAMBA4_BASENAME}419 PORTVERSION= ${SAMBA4_VERSION} -PORTREVISION= 5 +PORTREVISION= 6 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 --- /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) + diff --git a/net/samba420/Makefile b/net/samba420/Makefile --- a/net/samba420/Makefile +++ b/net/samba420/Makefile @@ -1,6 +1,6 @@ PORTNAME= ${SAMBA4_BASENAME}420 PORTVERSION= ${SAMBA4_VERSION} -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES?= net MASTER_SITES= SAMBA/samba/stable SAMBA/samba/rc DISTNAME= ${SAMBA4_DISTNAME} diff --git a/net/samba420/files/patch-python_samba_tdb__util.py b/net/samba420/files/patch-python_samba_tdb__util.py new file mode 100644 --- /dev/null +++ b/net/samba420/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) +