gentoo resync : 16.06.2019

3 files changed, 76 insertions, 2 deletions

diff --git a/net-misc/smb4k/Manifest b/net-misc/smb4k/Manifest
index 61cea3815fb4..bc3b70ba2bbe 100644
--- a/net-misc/smb4k/Manifest
+++ b/net-misc/smb4k/Manifest
@@ -1,5 +1,6 @@
+AUX smb4k-3.0.0-fix-mount-readwrite-shares.patch 4702 BLAKE2B 762b5023d8249b5c35f53ac34d6b779b8464384d08957c3c8ee1f3bfb9ab78d052f0570e47a2338296ef4a70c02ebe93fd7822b480c51325639f7eb4bbae52e7 SHA512 1c6ec72764ea682b6a3e97c857eb86e497f02cb2e525cd92baab3249cb967d836f6aa52a00c41bec2da6349eb7855b8f1911cec8a98ed6cb1e4356fa33720bfb
 DIST smb4k-2.1.1.tar.xz 3718220 BLAKE2B 99258ac57d3b8ff2861b8635b6a0799a347f3934c8d070d41c09f49b69caa7b59f502db9041d1bc4f875ae15544254faaafaae6429200ddf5526a06812983e1f SHA512 d69cb9f4c22e2afdd111e73c3d99d6868f959aa5476ffe10620862d3659b5a4f3b814856b17a9dced7bf6dde524f5bcf224e62d413d2aa92b0bcc2272ddf22b7
-DIST smb4k-2.9.90.tar.xz 3846724 BLAKE2B 644c08fe6d052d9cbe7d24c228d808a6087d63d8426dd442580e78938c2f1255cb1b381cbf88b495f000d77ae231759ed4adc17dd907e620229063447dc64b4e SHA512 b95d798bee22fd77d0f16deacf329ebd58ac651c99a97ec7107544ac873737848c256b3559e307b0cd63bd593aa0713a307520d533e81d4b40edb42a500f2803
+DIST smb4k-3.0.0.tar.xz 3825920 BLAKE2B 5439caa8f02fc93cd2065384e2b502abdca328fd186cb10ac0837d7eb289a2d62bedd81439a6d5b0e815edfb7fe168fcb70f0e645f3bae2d39a391d0688487f6 SHA512 b32a7151adb46b93e2c245136752435d3842e135baeb2b44343287d2eaf9f2aa5622a28b19df7d821390a35994f3ce204fdf20aeeac6ad67e9eb3b144ee22e33
 EBUILD smb4k-2.1.1.ebuild 1352 BLAKE2B 98f727608542565fb7d3ea95feb5519dbc4c14ca6545ac332e5cf41495bb73f592303cb20f9d9d8a6466674aac6ee79f8f1c9be35fed91fc0b1639b7d2e38959 SHA512 fadf1efd2d4ceb8fc733397435d4ca39d8d336dfd47b6430cfa3009e02169450f47f06a651313056db1bc3e3f119ea375a0340a1727b4961e54da6ce373c45db
-EBUILD smb4k-2.9.90.ebuild 1360 BLAKE2B 0100fc6dad643df05d01a270aeeb62c7d4b798fc154fd8ba916b36718a8306834e8e2f9434b501ec665cbae8591f4086131979e5dfa998f180c9c383633b3690 SHA512 1dec88f0346b8737a2e3834c60a1b55c61d45b02bd95746dc8c34ddc853cc29c57c39363630ee098efbaffd67ee4937da4a196bf04a4dafc46acc8c7c6414066
+EBUILD smb4k-3.0.0-r1.ebuild 1709 BLAKE2B d29e564e1db91c9ffe2b0c0fc2dd19661e5c7ee697be1b7bf1ffc5ef9790ebb6ba44ef8a02c57a0e746cc7b802d2402bda054896676958b50550227e8e5c06dc SHA512 b0bb163c2f74ae280813c82031ce1fb3766bb74c582ad4e5c55699b8fd68003339e6d64b049ac47c5acebea5d67e2b68cb3ba0bf6ba2fb38ddbc1dfc3e581ff8
 MISC metadata.xml 324 BLAKE2B 9e05620c3d07398233f8ac54e9d9d3267e21835594d8bae1c14a68d3650be7a7e904b57281823e6886efcd56a33e4e9d576c8cbfe0d9b148641fae8a7ce01ce4 SHA512 48a26e2c744b920776e2d7a8a33ce6188a785f34ce783e59f9f4898947320b2ce6b0205e0848aff7c03151349d8fd6dd4dda705b695e1c4ed3c46a17347d8711
diff --git a/net-misc/smb4k/files/smb4k-3.0.0-fix-mount-readwrite-shares.patch b/net-misc/smb4k/files/smb4k-3.0.0-fix-mount-readwrite-shares.patch
new file mode 100644
index 000000000000..84d50b75b463
--- /dev/null
+++ b/net-misc/smb4k/files/smb4k-3.0.0-fix-mount-readwrite-shares.patch
@@ -0,0 +1,61 @@
+From 886af393dab0f6efe0f8bafc03522f25c15e0ba6 Mon Sep 17 00:00:00 2001
+From: Alexander Reinholdt <alexander.reinholdt@kdemail.net>
+Date: Thu, 13 Jun 2019 20:57:38 +0200
+Subject: It was reported that Smb4K mounts shares read-only that were
+ previously accessible read-write. It turns out that the default for the "CIFS
+ Unix extensions" setting were not chosen very carefully. This commit changes
+ the default values back, so that mounting should work again as expected.
+
+(cherry picked from commit d3b89af5410ea8d4cb5f34921d48fdda486990f2)
+---
+ core/smb4kmountsettings_linux.kcfg | 10 +++++-----
+ 1 file changed, 5 insertions(+), 5 deletions(-)
+
+diff --git a/core/smb4kmountsettings_linux.kcfg b/core/smb4kmountsettings_linux.kcfg
+index 4ad329c..7e046dd 100644
+--- a/core/smb4kmountsettings_linux.kcfg
++++ b/core/smb4kmountsettings_linux.kcfg
+@@ -11,12 +11,12 @@
+     <entry name="CifsUnixExtensionsSupport" type="Bool">
+       <label>All or most of the servers support the CIFS Unix extensions</label>
+       <whatsthis>Most versions of Samba support the CIFS Unix or POSIX extensions. For these servers, some options are not needed, because the right values are negotiated during the mount process. For other servers, you might want to uncheck this option, so that predefined values can be passed to the server. Please note that if your computer is located in a Windows dominated network neighborhood with only a few Samba servers, you can safely uncheck this option and define custom options for the Samba servers.</whatsthis>
+-      <default>true</default>
++      <default>false</default>
+     </entry>
+     <entry name="UseUserId" type="Bool">
+       <label>User ID:</label>
+       <whatsthis>This is the user ID (a number) that the files and directories of the mounted share will have. If you are using the CIFS filesystem under Linux and the remote server supports the CIFS Unix Extensions, this setting will be ignored unless the assignment of the user ID is forced.</whatsthis>
+-      <default>false</default>
++      <default>true</default>
+     </entry>
+     <entry name="UserId" type="String">
+       <whatsthis>This is the user ID (a number) that the files and directories of the mounted share will have. If you are using the CIFS filesystem under Linux and the remote server supports the CIFS Unix Extensions, this setting will be ignored unless the assignment of the user ID is forced.</whatsthis>
+@@ -25,7 +25,7 @@
+     <entry name="UseGroupId" type="Bool">
+       <label>Group ID:</label>
+       <whatsthis>This is the group ID (a number) that the files and directories of the mounted share will have. If you are using the CIFS filesystem under Linux and the remote server supports the CIFS Unix Extensions, this setting will be ignored unless the assignment of the group ID is forced.</whatsthis>
+-      <default>false</default>
++      <default>true</default>
+     </entry>
+     <entry name="GroupId" type="String">
+       <whatsthis>This is the group ID (a number) that the files and directories of the mounted share will have. If you are using the CIFS filesystem under Linux and the remote server supports the CIFS Unix Extensions, this setting will be ignored unless the assignment of the group ID is forced.</whatsthis>
+@@ -34,7 +34,7 @@
+     <entry name="UseFileMode" type="Bool">
+       <label>File mode:</label>
+       <whatsthis>This is the file mode that will be used for creating files. It must be defined in octal. In case the CIFS file system is used, this setting only takes effect if the server does not support the CIFS Unix Extensions.</whatsthis>
+-      <default>false</default>
++      <default>true</default>
+     </entry>
+     <entry name="FileMode" type="String">
+       <whatsthis>This is the filemode that will be used for creating files. It must be defined in octal. In case the CIFS file system is used, this setting only takes effect if the server does not support the CIFS Unix Extensions.</whatsthis>
+@@ -43,7 +43,7 @@
+     <entry name="UseDirectoryMode" type="Bool">
+       <label>Directory mode:</label>
+       <whatsthis>This is the directory mode that will be used for creating directories. It must be defined in octal. In case the CIFS file system is used, this setting only takes effect if the server does not support the CIFS Unix Extensions.</whatsthis>
+-      <default>false</default>
++      <default>true</default>
+     </entry>
+     <entry name="DirectoryMode" type="String">
+       <whatsthis>This is the directory mode that will be used for creating directories. It must be defined in octal. In case the CIFS file system is used, this setting only takes effect if the server does not support the CIFS Unix Extensions.</whatsthis>
+-- 
+cgit v1.1
diff --git a/net-misc/smb4k/smb4k-2.9.90.ebuild b/net-misc/smb4k/smb4k-3.0.0-r1.ebuild
index 578795e8d724..fd64fcc60aab 100644
--- a/net-misc/smb4k/smb4k-2.9.90.ebuild
+++ b/net-misc/smb4k/smb4k-3.0.0-r1.ebuild
@@ -50,9 +50,21 @@ RDEPEND="${DEPEND}
 	)
 "
 
+PATCHES=( "${FILESDIR}/${P}-fix-mount-readwrite-shares.patch" )
+
 src_configure(){
 	local mycmakeargs=(
 		-DINSTALL_PLASMOID=$(usex plasma)
 	)
 	kde5_src_configure
 }
+
+pkg_postinst() {
+	kde5_pkg_postinst
+	elog "Users of Samba 4.7 and above please note that for the time being,"
+	elog "the following setting has to be added to or changed in the [global]"
+	elog "section of the smb.conf file:"
+	elog
+	elog "[global]"
+	elog "client max protocol = NT1"
+}