$ git diff --patch-with-stat --summary a12f799ed882a5aec128a529750089feda546bc2..bf9436e38f31744b43102aea9c28a0d4687bd466

 .abf.yml                 |  2 +-
 samba-4.11-compile.patch | 14 --------------
 samba-4.17.2.tar.asc     | 16 ----------------
 samba-4.18.1.tar.asc     | 16 ++++++++++++++++
 samba.spec               | 17 +++++++++++------
 smb.conf                 |  9 ++++++++-
 6 files changed, 36 insertions(+), 38 deletions(-)
 delete mode 100644 samba-4.11-compile.patch
 delete mode 100644 samba-4.17.2.tar.asc
 create mode 100644 samba-4.18.1.tar.asc

diff --git a/.abf.yml b/.abf.yml
index dccc68b..c2aef08 100644
--- a/.abf.yml
+++ b/.abf.yml
@@ -1,3 +1,3 @@
 sources:
   samba-pubkey.asc: 3cf1a279a71d4f263e025f5cd2c85d78940a7e61
-  samba-4.17.2.tar.gz: 1974cd9a48dc1ac08e8f29b2da677a09efad2f32
+  samba-4.18.1.tar.gz: 201ef9473bc678160eeae9bb1044f121a892bd6d
diff --git a/samba-4.11-compile.patch b/samba-4.11-compile.patch
deleted file mode 100644
index 63724e4..0000000
--- a/samba-4.11-compile.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-diff -up samba-4.11.0rc2/lib/replace/system/network.h.omv~ samba-4.11.0rc2/lib/replace/system/network.h
---- samba-4.11.0rc2/lib/replace/system/network.h.omv~	2019-08-23 22:09:57.781158376 +0200
-+++ samba-4.11.0rc2/lib/replace/system/network.h	2019-08-23 22:10:02.272141508 +0200
-@@ -87,10 +87,6 @@
- #include <sys/uio.h>
- #endif
- 
--#ifdef HAVE_STROPTS_H
--#include <stropts.h>
--#endif
--
- #ifndef HAVE_SOCKLEN_T
- #define HAVE_SOCKLEN_T
- typedef int socklen_t;
diff --git a/samba-4.17.2.tar.asc b/samba-4.17.2.tar.asc
deleted file mode 100644
index 146e2fb..0000000
--- a/samba-4.17.2.tar.asc
+++ /dev/null
@@ -1,16 +0,0 @@
------BEGIN PGP SIGNATURE-----
-
-iQIzBAABCgAdFiEEgfXigyvSVFoYl7cTqplEL7aAtiAFAmNWbqoACgkQqplEL7aA
-tiBRRBAArva0cDJeuSvlmC5t+i+WZTrFwg7txiu6a+GccMxwVIu9Ab2BeJSHA2Fe
-Ghh9VGDkaaRlzyJNHZtnt5xn9tRcSVVAy4+8/hSroP0uW97JIyGRfnWNExsEyM6w
-uSGFLsDpVsvpzMCfJqRm2umCO+XZ90M2ZQs6AlqbqyF6lHAY4jzI75o56T9GxijV
-wx4gCdFSFQas79G/apNhuAuotqZHwEPxb8vUkoEgS1PbfbiVoYoI6RQDZ7WpOfwM
-nKO3rbTGOZBGX7oJPUfSGPww/xrhoxaHv/9ixwruEqEPTUFQk+lWnY2DJ7EGGW5U
-D7wSs/iW/TgDZAFsEv928odHNluSIZYktDBoKAG6cS/iiA3Bqv0U97CZBrJWj3P6
-vjpJECOHJDSq8UeimP4aToFP9NvZNr+GawNpOkL3N6lfPOIk7naRdqN7C01kNIoA
-UX90K31J5YK440jlSwJ/uJAS1p1slvcsr+OYlAsRSc+Dug2biKonqv42qBgA+SvI
-8pNOQVwINqujL/utoNbQ0Nu54RJ67C6l1Jh77Ng8OhtAtm5Jojm6ceXzms4pJCJ8
-8t/RO3/TqOl7ZxlBSsdiTt0peOAO/fvxpJYM3mVgWQBfjSNkHM8QhDJALXgKoJv3
-FXZG0peM5inxK70bDAN+fc0Ika74bT505OOtPzlwmjwxzHSKAJM=
-=9Stz
------END PGP SIGNATURE-----
diff --git a/samba-4.18.1.tar.asc b/samba-4.18.1.tar.asc
new file mode 100644
index 0000000..39d888f
--- /dev/null
+++ b/samba-4.18.1.tar.asc
@@ -0,0 +1,16 @@
+-----BEGIN PGP SIGNATURE-----
+
+iQIzBAABCgAdFiEEgfXigyvSVFoYl7cTqplEL7aAtiAFAmQkO6sACgkQqplEL7aA
+tiB4Sw/+KS5Fuqs7DezZGaiez3OQrQuzNKYp9W/68bd4djU/baRZ7KVYX6ryvua+
+k8z+IQvLF59SiyIx5GswUDkxFx/ts5IC8bgKdhFgQBkfPRM5kYHsWrNRaoou+pc7
+DdhUgFJ4l8os3qWLLPMsfzL5xL35qoxx2fhUXaY6JPiCULNDys2WewZFPo/TTEnO
+l5EyRX3kh3hMpOd2DiQ9E5oSNO4tCQROBrXvOW43oyObqdtznj8Z75dAKiSjfRmH
+0ofvQLUfVAOUcS//PZP//vTNI0Jo7C5Dj2vycseBSMoYvN6gIWE/o78xu3F1nPyt
+q/TeDlZ27OhHaR9y0VbAnJqZA3/FMAFou0v5yysinhc9uFONgTjKTgAoMd9cBWrq
+NR/u37ZP34Wc+o+zqadjvfaO6jcq4NEEsEPTYFE+qighfrC+fu93NIrTXJKzeyJy
+kD9ao5B61nUECj9/00YUGEA8MOlnzNWbHohbOjhzgwnN6fWOHof/EJKzL2BWXyNE
+RNWztY+DVePrpe66wRmm9IyYYoc9hi154PMpC3vJV2FVWltGvBKgMTpYlyFigg/k
+bYLjSDqH8EatjiWS81kN9ZxvUpWu13k9kOqWkfyGQ3if0SidbAu6cttgbFTBUOHH
+sw8uxA1a74IzxSZJEuoM4EJc347OEJVW0BXqWuXp38JnJiJmnRw=
+=CFcz
+-----END PGP SIGNATURE-----
diff --git a/samba.spec b/samba.spec
index db1c790..aea80fa 100644
--- a/samba.spec
+++ b/samba.spec
@@ -104,22 +104,21 @@
 %define _serverbuild_flags -fstack-protector-all
 
 # (tpg) set here maximum supported ldb version
-%define ldb_max_ver 2.6.999
+%define ldb_max_ver 2.7.999
 
 #define beta rc5
 
 Summary:	Samba SMB server
 Name:		samba
-Version:	4.17.2
+Version:	4.18.1
 License:	GPLv3
 Group:		System/Servers
 Url:		https://www.samba.org
+Release:	%{?beta:0.%{beta}.}1
 %if 0%{?beta:1}
-Release:	0.%{beta}.1
 Source0:	https://download.samba.org/pub/samba/rc/samba-%{version}%{beta}.tar.gz
 Source99:	https://download.samba.org/pub/samba/rc/samba-%{version}%{beta}.tar.asc
 %else
-Release:	1
 Source0:	https://ftp.samba.org/pub/samba/stable/samba-%{version}.tar.gz
 Source99:	https://ftp.samba.org/pub/samba/stable/samba-%{version}.tar.asc
 %endif
@@ -137,7 +136,7 @@ Source28:	samba.pamd
 Source29:	system-auth-winbind.pamd
 Source30:	%{name}-tmpfiles.conf
 Source31:	smb.conf
-Patch1:		samba-4.11-compile.patch
+#Patch1:		samba-4.11-compile.patch
 Patch2:		samba-4.5.0-link-tirpc.patch
 Patch3:		samba-4.5.0-bug12274.patch
 # TODO: Fix broken net rap commands again (smb4k uses) https://bugzilla.samba.org/show_bug.cgi?id=12431
@@ -163,7 +162,7 @@ BuildRequires:	perl-Parse-Yapp
 BuildRequires:	readline-devel
 BuildRequires:	pkgconfig(ctdb) >= 2.0
 BuildRequires:	pkgconfig(gnutls)
-BuildRequires:	pkgconfig(ldb) >= 2.1.1
+BuildRequires:	pkgconfig(ldb) >= 2.7.2
 BuildRequires:	pkgconfig(libcap)
 BuildRequires:	pkgconfig(cmocka)
 BuildRequires:	pkgconfig(libtirpc)
@@ -945,6 +944,10 @@ install -m 0755 packaging/NetworkManager/30-winbind-systemd %{buildroot}%{_sysco
 # install findsmb
 install -c -m 755 examples/scripts/nmb/findsmb %{buildroot}%{_bindir}/findsmb
 
+# User shares, for kdenetwork-filesharing
+# https://community.kde.org/Distributions/Packaging_Recommendations
+mkdir -p %{buildroot}/var/lib/samba/usershares
+
 %post server
 
 # Add a unix group for samba machine accounts
@@ -1041,6 +1044,7 @@ fi
 %{_bindir}/winexe
 %{_mandir}/man1/winexe.1*
 %endif
+%dir %attr(1770,root,users) /var/lib/samba/usershares
 
 %files libs
 %dir %{_libdir}/%{name}
@@ -1159,6 +1163,7 @@ fi
 %{_libdir}/samba/libutil-tdb-samba4.so
 #{_libdir}/samba/libwinbind-client-samba4.so
 %{_libdir}/samba/libxattr-tdb-samba4.so
+%{_libdir}/samba/libstable-sort-samba4.so
 
 %if %{with doc}
 %files doc
diff --git a/smb.conf b/smb.conf
index 971ca19..913c496 100644
--- a/smb.conf
+++ b/smb.conf
@@ -26,7 +26,7 @@
    workgroup = MYGROUP
 
 # server string is the equivalent of the NT Description field
-   server string = Samba Server
+   server string = OpenMandriva Server
 
 # Security mode. Defines in which mode Samba will operate. Possible 
 # values are share, user, server, domain and ads. Most people will want 
@@ -156,6 +156,13 @@
 ;  delete user from group script = /usr/sbin/deluser %u %g
 ;  delete group script = /usr/sbin/groupdel %g
 
+# For kdenetwork-filesharing, as per
+# https://community.kde.org/Distributions/Packaging_Recommendations
+    usershare path = /var/lib/samba/usershares
+    usershare max shares = 100
+    usershare allow guests = yes
+    usershare owner only = yes
+
 
 #============================ Share Definitions ==============================
 [homes]