From d4d26d56574f27cc0cc171f91907f28c9527769110d3091c106686a63321d86a Mon Sep 17 00:00:00 2001
From: Noel Power <nopower@suse.com>
Date: Mon, 20 Mar 2023 10:00:12 +0000
Subject: [PATCH] OBS-URL:
 https://build.opensuse.org/package/show/network:samba:STABLE/samba?expand=0&rev=678

---
 _service                                |  2 +-
 samba-4.17.5+git.320.c38ca0f84a.tar.bz2 |  3 ---
 samba-4.18.0+git.294.508b693e5c.tar.bz2 |  3 +++
 samba.changes                           | 13 +++++++++++++
 samba.spec                              | 16 +++++++++++-----
 5 files changed, 28 insertions(+), 9 deletions(-)
 delete mode 100644 samba-4.17.5+git.320.c38ca0f84a.tar.bz2
 create mode 100644 samba-4.18.0+git.294.508b693e5c.tar.bz2

diff --git a/_service b/_service
index 09b546d..4f05c98 100644
--- a/_service
+++ b/_service
@@ -2,7 +2,7 @@
         <service name="tar_scm" mode="disabled">
                 <param name="url">https://gitlab.suse.de/samba/suse-samba.git/</param>
                 <param name="scm">git</param>
-                <param name="revision">factory-4-17-stable</param>
+                <param name="revision">factory-4-18-stable</param>
                 <param name="versionformat">@PARENT_TAG@+git.@TAG_OFFSET@.%h</param>
                 <param name="versionrewrite-pattern">samba-(.*)</param>
                 <param name="versionrewrite-replacement">\1</param>
diff --git a/samba-4.17.5+git.320.c38ca0f84a.tar.bz2 b/samba-4.17.5+git.320.c38ca0f84a.tar.bz2
deleted file mode 100644
index c530afd..0000000
--- a/samba-4.17.5+git.320.c38ca0f84a.tar.bz2
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:9ae272793a8bbcf2e229b48ad286dec4b56660f6e900556080fa61baebb5d765
-size 34354551
diff --git a/samba-4.18.0+git.294.508b693e5c.tar.bz2 b/samba-4.18.0+git.294.508b693e5c.tar.bz2
new file mode 100644
index 0000000..80b402c
--- /dev/null
+++ b/samba-4.18.0+git.294.508b693e5c.tar.bz2
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:4c06914375aa668ad62ed3d8b812ddf8c45609dfc8f279d462ef386e45382cbd
+size 43838365
diff --git a/samba.changes b/samba.changes
index 6f40cc0..1f67679 100644
--- a/samba.changes
+++ b/samba.changes
@@ -1,3 +1,16 @@
+-------------------------------------------------------------------
+Fri Mar 17 08:09:32 UTC 2023 - Samuel Cabrero <scabrero@suse.de>
+
+- Update to 4.18.0
+  * SMB server performance improvements
+  * More succinct samba-tool error messages
+  * Color output with samba-tool --color
+    The NO_COLOR environment variable will disable colour output
+  * New samba-tool dsacl subcommand for deleting ACEs
+  * New wbinfo option --change-secret-at
+  * Net option to change the NT ACL default location
+  * Azure AD / Office365 synchronization improvements
+
 -------------------------------------------------------------------
 Tue Feb 14 08:21:13 UTC 2023 - Samuel Cabrero <scabrero@suse.de>
 
diff --git a/samba.spec b/samba.spec
index 4777b1d..d2fe020 100644
--- a/samba.spec
+++ b/samba.spec
@@ -38,10 +38,10 @@
 %define build_ceph 1
 %endif
 
-%define talloc_version 2.3.4
-%define tevent_version 0.13.0
-%define tdb_version    1.4.7
-%define ldb_version    2.6.1
+%define talloc_version 2.4.0
+%define tevent_version 0.14.1
+%define tdb_version    1.4.8
+%define ldb_version    2.7.1
 
 # This table represents the possible combinations of build macros.
 # They are defined only if not already defined in the build service
@@ -158,7 +158,7 @@ BuildRequires:  liburing-devel
 %endif
 BuildRequires:  sysuser-tools
 
-Version:        4.17.5+git.320.c38ca0f84a
+Version:        4.18.0+git.294.508b693e5c
 Release:        0
 URL:            https://www.samba.org/
 Obsoletes:      samba-32bit < %{version}
@@ -1298,6 +1298,7 @@ exit 0
 %_includedir/samba-4.0/gen_ndr/misc.h
 %_includedir/samba-4.0/gen_ndr/ndr_misc.h
 %_includedir/samba-4.0/gen_ndr/auth.h
+%_includedir/samba-4.0/gen_ndr/claims.h
 %_includedir/samba-4.0/gen_ndr/dcerpc.h
 %_includedir/samba-4.0/gen_ndr/drsblobs.h
 %_includedir/samba-4.0/gen_ndr/drsuapi.h
@@ -1449,6 +1450,7 @@ exit 0
 %{_libdir}/samba/liblibcli-lsa3-samba4.so
 %{_libdir}/samba/liblibcli-netlogon3-samba4.so
 %{_libdir}/samba/liblibsmb-samba4.so
+%{_libdir}/samba/libstable-sort-samba4.so
 %{_libdir}/libtevent-util.so.*
 %{_libdir}/samba/libmessages-dgm-samba4.so
 %{_libdir}/samba/libmessages-util-samba4.so
@@ -1842,8 +1844,12 @@ exit 0
 %{_datadir}/samba/setup/display-specifiers/DisplaySpecifiers-Win2k8R2.txt
 %dir %{_datadir}/samba/admx
 %{_datadir}/samba/admx/samba.admx
+%{_datadir}/samba/admx/GNOME_Settings.admx
 %dir %{_datadir}/samba/admx/en-US
 %{_datadir}/samba/admx/en-US/samba.adml
+%{_datadir}/samba/admx/en-US/GNOME_Settings.adml
+%dir %{_datadir}/samba/admx/ru-RU
+%{_datadir}/samba/admx/ru-RU/GNOME_Settings.adml
 %{_mandir}/man8/samba.8.*
 %{_mandir}/man8/samba_downgrade_db.8.*
 %endif