From 9c0f7ce959bf39b8ff8ab4af30191f0cc3d081b79bdf0095a46d1d712498bab8 Mon Sep 17 00:00:00 2001 From: David Disseldorp Date: Tue, 12 Feb 2019 18:42:52 +0000 Subject: [PATCH] Accepting request 674202 from home:aaptel:cifs-utils-6.8 remove reference to SLE versions remove man page changes rename patch file to suse-document-new-vers-default-SMB2.1.patch OBS-URL: https://build.opensuse.org/request/show/674202 OBS-URL: https://build.opensuse.org/package/show/network:samba:STABLE/cifs-utils?expand=0&rev=159 --- cifs-utils.changes | 6 +++--- cifs-utils.spec | 2 +- ...=> suse-document-new-vers-default-SMB2.1.patch | 15 +-------------- 3 files changed, 5 insertions(+), 18 deletions(-) rename suse-sle15-changes.patch => suse-document-new-vers-default-SMB2.1.patch (61%) diff --git a/cifs-utils.changes b/cifs-utils.changes index 64c1887..452e9a8 100644 --- a/cifs-utils.changes +++ b/cifs-utils.changes @@ -2,9 +2,9 @@ Tue Feb 12 17:34:00 UTC 2019 - aaptel@suse.com - Document new SMB2.1+ defaults - * be more verbose when mount fails with EHOSTDOWN - * update man page and error message with SLE15 information - * add suse-sle15-changes.patch + * be more verbose on mount errors, especially with EHOSTDOWN which + is often returned on SMB version issues. + * add suse-document-new-vers-default-SMB2.1.patch ------------------------------------------------------------------- Mon Feb 11 08:33:10 UTC 2019 - dmulder@suse.com diff --git a/cifs-utils.spec b/cifs-utils.spec index e06f511..9ac53ab 100644 --- a/cifs-utils.spec +++ b/cifs-utils.spec @@ -42,7 +42,7 @@ Patch6: 0007-checkopts-report-duplicated-options-in-man-page.patch Patch7: 0008-mount.cifs.rst-more-cleanups.patch Patch8: 0009-mount.cifs.rst-document-vers-3-mount-option.patch Patch9: 0010-mount.cifs.rst-document-vers-3.02-mount-option.patch -Patch10: suse-sle15-changes.patch +Patch10: suse-document-new-vers-default-SMB2.1.patch # cifs-utils 6.8 switched to python for man page generation # we need to require either py2 or py3 package diff --git a/suse-sle15-changes.patch b/suse-document-new-vers-default-SMB2.1.patch similarity index 61% rename from suse-sle15-changes.patch rename to suse-document-new-vers-default-SMB2.1.patch index 11f2453..51ed1b0 100644 --- a/suse-sle15-changes.patch +++ b/suse-document-new-vers-default-SMB2.1.patch @@ -21,7 +21,7 @@ Index: cifs-utils-6.8/mount.cifs.c + fprintf(stderr, + "mount error: Server abruptly closed the connection.\n" + "This can happen if the server does not support the SMB version you are trying to use.\n" -+ "Since SLE15 the default SMB version changed from SMB1 to SMB2.1 and above. Try mounting with vers=1.0.\n"); ++ "The default SMB version recently changed from SMB1 to SMB2.1 and above. Try mounting with vers=1.0.\n"); + break; case ENXIO: if (!already_uppercased && @@ -35,16 +35,3 @@ Index: cifs-utils-6.8/mount.cifs.c rc = EX_FAIL; goto mount_exit; } -Index: cifs-utils-6.8/mount.cifs.rst -=================================================================== ---- cifs-utils-6.8.orig/mount.cifs.rst -+++ cifs-utils-6.8/mount.cifs.rst -@@ -598,7 +598,7 @@ vers=arg - Note too that while this option governs the protocol version used, not - all features of each version are available. - -- The default since v4.13.5 is for the client and server to negotiate -+ The default since SLE15 is for the client and server to negotiate - the highest possible version greater than or equal to ``2.1``. In - kernels prior to v4.13, the default was ``1.0``. For kernels - between v4.13 and v4.13.5 the default is ``3.0``.