From 5cca13770c503a43eb632d2fa3e5f375751cfb77 Mon Sep 17 00:00:00 2001 From: Günther Deschner Date: Oct 09 2018 09:23:38 +0000 Subject: Update to Samba 4.8.6 Guenther --- diff --git a/.gitignore b/.gitignore index 13f31ef..bb1aa60 100644 --- a/.gitignore +++ b/.gitignore @@ -131,3 +131,5 @@ samba-3.6.0pre1.tar.gz /samba-4.8.4.tar.asc /samba-4.8.5.tar.xz /samba-4.8.5.tar.asc +/samba-4.8.6.tar.xz +/samba-4.8.6.tar.asc diff --git a/samba-4.8.6-vfs_fruit.patch b/samba-4.8.6-vfs_fruit.patch deleted file mode 100644 index 9ad6cf5..0000000 --- a/samba-4.8.6-vfs_fruit.patch +++ /dev/null @@ -1,133 +0,0 @@ -From c39ec64231b261fe4ada02f1f1b9aa344cf35bb5 Mon Sep 17 00:00:00 2001 -From: Volker Lendecke -Date: Tue, 7 Aug 2018 15:11:22 +0200 -Subject: [PATCH] torture: Make sure that fruit_ftruncate only unlinks streams - -Follow-up to - -Bug: https://bugzilla.samba.org/show_bug.cgi?id=13441 - -Signed-off-by: Volker Lendecke -Reviewed-by: Ralph Boehme ---- - selftest/knownfail.d/samba3.vfs.fruit | 1 + - source4/torture/vfs/fruit.c | 45 +++++++++++++++++++++++++++ - 2 files changed, 46 insertions(+) - -diff --git a/selftest/knownfail.d/samba3.vfs.fruit b/selftest/knownfail.d/samba3.vfs.fruit -index 8df25bccb79..d858452eb52 100644 ---- a/selftest/knownfail.d/samba3.vfs.fruit -+++ b/selftest/knownfail.d/samba3.vfs.fruit -@@ -1 +1,2 @@ - ^samba3.vfs.fruit streams_depot.OS X AppleDouble file conversion\(nt4_dc\) -+^samba3.vfs.fruit .*.setinfo eof stream\(nt4_dc\) -diff --git a/source4/torture/vfs/fruit.c b/source4/torture/vfs/fruit.c -index fc1760e02e0..a9ae891a23f 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.17.1 - -From 8c14234871820eacde46670d722a676fb5f3a46c Mon Sep 17 00:00:00 2001 -From: Volker Lendecke -Date: Tue, 7 Aug 2018 15:10:31 +0200 -Subject: [PATCH] vfs_fruit: Don't unlink the main file - -The original fix for bug 13441 was missing a check that verifies that -fruit_ftruncate() is actually called on a stream. - -Follow-up to - -Bug: https://bugzilla.samba.org/show_bug.cgi?id=13441 - -Pair-Programmed-With: Volker Lendecke - -Signed-off-by: Ralph Boehme -Reviewed-by: Volker Lendecke - -Autobuild-User(master): Volker Lendecke -Autobuild-Date(master): Thu Aug 23 15:28:48 CEST 2018 on sn-devel-144 ---- - selftest/knownfail.d/samba3.vfs.fruit | 1 - - source3/modules/vfs_fruit.c | 6 +++++- - 2 files changed, 5 insertions(+), 2 deletions(-) - -diff --git a/selftest/knownfail.d/samba3.vfs.fruit b/selftest/knownfail.d/samba3.vfs.fruit -index d858452eb52..8df25bccb79 100644 ---- a/selftest/knownfail.d/samba3.vfs.fruit -+++ b/selftest/knownfail.d/samba3.vfs.fruit -@@ -1,2 +1 @@ - ^samba3.vfs.fruit streams_depot.OS X AppleDouble file conversion\(nt4_dc\) --^samba3.vfs.fruit .*.setinfo eof stream\(nt4_dc\) -diff --git a/source3/modules/vfs_fruit.c b/source3/modules/vfs_fruit.c -index ebf0f9842f0..1102059bbee 100644 ---- a/source3/modules/vfs_fruit.c -+++ b/source3/modules/vfs_fruit.c -@@ -5570,7 +5570,11 @@ 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 && -+ is_ntfs_stream_smb_fname(fsp->fsp_name) && -+ !is_ntfs_default_stream_smb_fname(fsp->fsp_name)) -+ { - return SMB_VFS_NEXT_UNLINK(handle, fsp->fsp_name); - } - return SMB_VFS_NEXT_FTRUNCATE(handle, fsp, offset); --- -2.17.1 - diff --git a/samba.spec b/samba.spec index 6679744..5ca4089 100644 --- a/samba.spec +++ b/samba.spec @@ -6,9 +6,9 @@ # ctdb is enabled by default, you can disable it with: --without clustering %bcond_without clustering -%define main_release 1 +%define main_release 0 -%define samba_version 4.8.5 +%define samba_version 4.8.6 %define talloc_version 2.1.11 %define tdb_version 1.3.15 %define tevent_version 0.9.36 @@ -122,8 +122,6 @@ Source14: samba.pamd Source200: README.dc Source201: README.downgrade -Patch0: samba-4.8.6-vfs_fruit.patch - Requires(pre): /usr/sbin/groupadd Requires(post): systemd Requires(preun): systemd @@ -3557,6 +3555,9 @@ fi %endif # with_clustering_support %changelog +* Tue Oct 09 2018 Guenther Deschner - 4.8.6-0 +- Update to Samba 4.8.6 + * Thu Oct 04 2018 Guenther Deschner - 4.8.5-1 - resolves: #1625170 - Fix vfs_fruit diff --git a/sources b/sources index 8157fde..4570c70 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (samba-4.8.5.tar.xz) = 13f6d60b850af826101d37745395e04d0b054e858711764b85f7c7f16b556e3d42d10b0da1700d820724f56f425619c1c174068f7ab51e009f4b8086dc68d5e2 -SHA512 (samba-4.8.5.tar.asc) = ded827adf1b5709a20bbb3aa5db618fbc2e2b7b2245cbe3c484d910ab86f587e635eb9deb059633c8a526cc0064f8988b6e190fb5e73918afda81bcda3a35c68 +SHA512 (samba-4.8.6.tar.xz) = 61a81d944f10fdbd5147e0d6a2e1442e5befffbafefffc2653a1bd2ae250509144961a1b8e0db817b70d4e69b04d5ee15f8cc48ae858d474db2fc53df46bb310 +SHA512 (samba-4.8.6.tar.asc) = d45a64d37440e81ed1b6013150377046c16fe39d64a57f959e9a8f53e8bcc2d24d18f54ebf99e14a9311e31f219630b4d4693192a6593833ae1ef9e06cfadc9c