From 00ddcaae7dc8bc216d49d6806bd4d4807878574e Mon Sep 17 00:00:00 2001
From: Andreas Schneider <asn@cryptomilk.org>
Date: Thu, 17 Aug 2023 14:36:08 +0200
Subject: [PATCH] Update to version 4.18.6

related: rhbz#2190417
---
 .gitignore                        |   2 ++
 samba-pubkey_AA99442FB680B620.gpg | Bin 0 -> 2290 bytes
 samba.spec                        |   7 +++++--
 sources                           |   5 ++---
 4 files changed, 9 insertions(+), 5 deletions(-)
 create mode 100644 samba-pubkey_AA99442FB680B620.gpg

diff --git a/.gitignore b/.gitignore
index d0312e2..064a588 100644
--- a/.gitignore
+++ b/.gitignore
@@ -10,3 +10,5 @@ SOURCES/samba-pubkey_AA99442FB680B620.gpg
 /samba-4.18.4.tar.xz
 /samba-4.18.5.tar.asc
 /samba-4.18.5.tar.xz
+/samba-4.18.6.tar.xz
+/samba-4.18.6.tar.asc
diff --git a/samba-pubkey_AA99442FB680B620.gpg b/samba-pubkey_AA99442FB680B620.gpg
new file mode 100644
index 0000000000000000000000000000000000000000..c901409c92a9ccaa3f29dca796283d35ba462c4c
GIT binary patch
literal 2290
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
F{3jr|REz)s

literal 0
HcmV?d00001

diff --git a/samba.spec b/samba.spec
index 8861a2b..bdc1a9e 100644
--- a/samba.spec
+++ b/samba.spec
@@ -137,8 +137,8 @@
 
 %define samba_requires_eq()  %(LC_ALL="C" echo '%*' | xargs -r rpm -q --qf 'Requires: %%{name} = %%{epoch}:%%{version}\\n' | sed -e 's/ (none):/ /' -e 's/ 0:/ /' | grep -v "is not")
 
-%global samba_version 4.18.5
-%global baserelease 0
+%global samba_version 4.18.6
+%global baserelease 1
 # This should be rc1 or %%nil
 %global pre_release %nil
 
@@ -4328,6 +4328,9 @@ fi
 %endif
 
 %changelog
+* Thu Aug 17 2023 Andreas Schneider <asn@redhat.com> - 4.18.6-1
+- related: rhbz#2190417 - Update to version 4.18.6
+
 * Thu Jul 20 2023 Pavel Filipenský <pfilipen@redhat.com> - 4.18.5-0
 - resolves: rhbz#2222894 - Fix CVE-2022-2127 CVE-2023-3347 CVE-2023-34966 CVE-2023-34967 CVE-2023-34968
 
diff --git a/sources b/sources
index da80411..18c8d6c 100644
--- a/sources
+++ b/sources
@@ -1,3 +1,2 @@
-SHA512 (samba-4.18.5.tar.asc) = 29b541a95dc565e541526a9aeecff5d4df4e7df38c5c00ec8cc848b13c683c0d0c7dee442ab1a2d03e0f88b960cec7fb5a2cb8ea44c53ce29c858f5a058e7f84
-SHA512 (samba-4.18.5.tar.xz) = 3e405731813d5b0937e6c16938c6dcf8e182dafd29010dc75711afc397a63ee459fda04e78ff24e31fa0efd213e25a7e6c214a5bdf82d4d0f0123f2c6a8ebdd6
-SHA512 (samba-pubkey_AA99442FB680B620.gpg) = 4a13414888fae9776a8edfb629e7002689f01cc482df9686c91eaec793b5e2afa2e1afe6ffeb424093a12259594676d40b4343e844a00499888840f7fe96a199
+SHA512 (samba-4.18.6.tar.xz) = 019c66aafe4a8c83da096ff264836c73a56e388ff7fa2d97587f4fb77b08d382146cac807f01e8c35fe873e938501a70d68f0e0947f8856d99c0dfc4ab3f4d94
+SHA512 (samba-4.18.6.tar.asc) = b7d7198a536c47cae8b44f0c2b9ad528f0b9422fb6b6bec93ce44b6f7fcb894f6622fa5de67654f6d435f922666328408ea2be82ebf50f46b4651ee21f129896