svn commit: r479133 - in head/net/samba48: . files
Timur I. Bakeyev
timur at FreeBSD.org
Thu Sep 6 18:55:49 UTC 2018
Author: timur
Date: Thu Sep 6 18:55:48 2018
New Revision: 479133
URL: https://svnweb.freebsd.org/changeset/ports/479133
Log:
Last patches cleanup removed one extra patch, essensial for the MacOS and vfs_fruit users. Bring it back.
Sponsored by: my wife
Added:
head/net/samba48/files/0001-bug-13441-extra.patch (contents, props changed)
Modified:
head/net/samba48/Makefile
Modified: head/net/samba48/Makefile
==============================================================================
--- head/net/samba48/Makefile Thu Sep 6 18:55:36 2018 (r479132)
+++ head/net/samba48/Makefile Thu Sep 6 18:55:48 2018 (r479133)
@@ -3,7 +3,7 @@
PORTNAME= ${SAMBA4_BASENAME}48
PORTVERSION= ${SAMBA4_VERSION}
-PORTREVISION= 0
+PORTREVISION= 1
CATEGORIES?= net
MASTER_SITES= SAMBA/samba/stable SAMBA/samba/rc
DISTNAME= ${SAMBA4_DISTNAME}
@@ -22,6 +22,7 @@ EXTRA_PATCHES+= ${PATCHDIR}/0001-Zfs-provision-1.pat
EXTRA_PATCHES+= ${PATCHDIR}/0001-Freenas-master-mdns-fixes-22.patch:-p1
EXTRA_PATCHES+= ${PATCHDIR}/0001-audit.patch:-p1
EXTRA_PATCHES+= ${PATCHDIR}/0001-bug-13175.patch:-p1
+EXTRA_PATCHES+= ${PATCHDIR}/0001-bug-13441-extra.patch:-p1
EXTRA_PATCHES+= ${PATCHDIR}/0001-bug-228462.patch:-p1
SAMBA4_BASENAME= samba
Added: head/net/samba48/files/0001-bug-13441-extra.patch
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/net/samba48/files/0001-bug-13441-extra.patch Thu Sep 6 18:55:48 2018 (r479133)
@@ -0,0 +1,102 @@
+From 76b4f9879c9e83f5e20caf7242f5e30ddb1cc84c Mon Sep 17 00:00:00 2001
+From: Volker Lendecke <vl at samba.org>
+Date: Tue, 7 Aug 2018 15:10:31 +0200
+Subject: [PATCH 1/2] vfs_fruit: Don't unlink the main file
+
+Follow-up to
+
+Bug: https://bugzilla.samba.org/show_bug.cgi?id=13441
+Signed-off-by: Volker Lendecke <vl at samba.org>
+---
+ source3/modules/vfs_fruit.c | 4 +++-
+ 1 file changed, 3 insertions(+), 1 deletion(-)
+
+diff --git a/source3/modules/vfs_fruit.c b/source3/modules/vfs_fruit.c
+index 078426290a4..191477c0e1d 100644
+--- a/source3/modules/vfs_fruit.c
++++ b/source3/modules/vfs_fruit.c
+@@ -5562,7 +5562,9 @@ static int fruit_ftruncate(struct vfs_handle_struct *handle,
+ (intmax_t)offset);
+
+ if (fio == NULL) {
+- if (offset == 0 && global_fruit_config.nego_aapl) {
++ if (offset == 0 &&
++ global_fruit_config.nego_aapl &&
++ fsp->fsp_name->stream_name != NULL) {
+ return SMB_VFS_NEXT_UNLINK(handle, fsp->fsp_name);
+ }
+ return SMB_VFS_NEXT_FTRUNCATE(handle, fsp, offset);
+--
+2.11.0
+
+
+From a5b8908a29b7c5266381faac0471ad6dddd0f658 Mon Sep 17 00:00:00 2001
+From: Volker Lendecke <vl at samba.org>
+Date: Tue, 7 Aug 2018 15:11:22 +0200
+Subject: [PATCH 2/2] torture: Make sure that fruit_ftruncate only unlinks
+ streams
+
+Signed-off-by: Volker Lendecke <vl at samba.org>
+---
+ source4/torture/vfs/fruit.c | 45 +++++++++++++++++++++++++++++++++++++++++++++
+ 1 file changed, 45 insertions(+)
+
+diff --git a/source4/torture/vfs/fruit.c b/source4/torture/vfs/fruit.c
+index 4c49a6bf532..25c0668ea5d 100644
+--- a/source4/torture/vfs/fruit.c
++++ b/source4/torture/vfs/fruit.c
+@@ -4773,6 +4773,51 @@ static bool test_setinfo_stream_eof(struct torture_context *tctx,
+ tctx, status, NT_STATUS_OBJECT_NAME_NOT_FOUND, ret, done,
+ "Unexpected status\n");
+
++ torture_comment(
++ tctx, "Setting main file EOF to 1 to force 0-truncate\n");
++
++ status = torture_smb2_testfile_access(
++ tree,
++ fname,
++ &h1,
++ SEC_FILE_WRITE_DATA);
++ torture_assert_ntstatus_ok_goto(tctx, status, ret, done,
++ "torture_smb2_testfile failed\n");
++
++ ZERO_STRUCT(sfinfo);
++ sfinfo.generic.in.file.handle = h1;
++ sfinfo.generic.level = RAW_SFILEINFO_END_OF_FILE_INFORMATION;
++ sfinfo.position_information.in.position = 1;
++ status = smb2_setinfo_file(tree, &sfinfo);
++ torture_assert_ntstatus_ok_goto(
++ tctx,
++ status,
++ ret,
++ done,
++ "set eof 1 failed\n");
++
++ sfinfo.position_information.in.position = 0;
++ status = smb2_setinfo_file(tree, &sfinfo);
++ torture_assert_ntstatus_ok_goto(
++ tctx,
++ status,
++ ret,
++ done,
++ "set eof 0 failed\n");
++
++ smb2_util_close(tree, h1);
++
++ ZERO_STRUCT(create);
++ create.in.desired_access = SEC_FILE_READ_ATTRIBUTE;
++ create.in.share_access = NTCREATEX_SHARE_ACCESS_MASK;
++ create.in.file_attributes = FILE_ATTRIBUTE_NORMAL;
++ create.in.create_disposition = NTCREATEX_DISP_OPEN;
++ create.in.fname = fname;
++
++ status = smb2_create(tree, tctx, &create);
++ torture_assert_ntstatus_ok_goto(tctx, status, ret, done,
++ "torture_smb2_testfile failed\n");
++ smb2_util_close(tree, h1);
+ done:
+ smb2_util_unlink(tree, fname);
+ smb2_util_rmdir(tree, BASEDIR);
+--
+2.11.0
+
More information about the svn-ports-head
mailing list