From 196b5bef802e0320fd63047a8d60a397772e7b16 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Pavel=20Filipensk=C3=BD?= <pfilipensky@samba.org>
Date: Tue, 2 Jul 2024 16:11:42 +0200
Subject: [PATCH] Update to version 4.20.2

related: RHEL-33645
---
 .gitignore |  2 ++
 samba.spec | 13 +++++++++----
 sources    |  4 ++--
 3 files changed, 13 insertions(+), 6 deletions(-)

diff --git a/.gitignore b/.gitignore
index 98b2e47..3611e32 100644
--- a/.gitignore
+++ b/.gitignore
@@ -289,3 +289,5 @@ samba-3.6.0pre1.tar.gz
 /samba-4.20.0.tar.xz
 /samba-4.20.1.tar.asc
 /samba-4.20.1.tar.xz
+/samba-4.20.2.tar.asc
+/samba-4.20.2.tar.xz
diff --git a/samba.spec b/samba.spec
index 9157617..ac290f9 100644
--- a/samba.spec
+++ b/samba.spec
@@ -146,7 +146,7 @@
 
 %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.20.1
+%global samba_version 4.20.2
 %global baserelease 1
 # This should be rc1 or %%nil
 %global pre_release %nil
@@ -183,7 +183,7 @@
 %global talloc_version 2.4.2
 %global tdb_version 1.4.10
 %global tevent_version 0.16.1
-%global ldb_version 2.9.0
+%global ldb_version 2.9.1
 
 %global required_mit_krb5 1.20.1
 
@@ -1647,8 +1647,6 @@ fi
 
 ### SAMBA
 %files
-%license COPYING
-%doc README.md WHATSNEW.txt
 %doc examples/autofs examples/LDAP examples/misc
 %doc examples/printer-accounting examples/printing
 %doc packaging/README.downgrade
@@ -1985,6 +1983,8 @@ fi
 
 ### COMMON
 %files common
+%doc README.md WHATSNEW.txt
+%license COPYING
 %{_tmpfilesdir}/samba.conf
 %{_sysusersdir}/samba.conf
 %dir %{_sysconfdir}/logrotate.d/
@@ -3149,6 +3149,7 @@ fi
 %{python3_sitearch}/samba/tests/blackbox/__pycache__/http_chunk.*.pyc
 %{python3_sitearch}/samba/tests/blackbox/__pycache__/http_content.*.pyc
 %{python3_sitearch}/samba/tests/blackbox/__pycache__/mdsearch.*.pyc
+%{python3_sitearch}/samba/tests/blackbox/__pycache__/misc_dfs_widelink.*.pyc
 %{python3_sitearch}/samba/tests/blackbox/__pycache__/ndrdump.*.pyc
 %{python3_sitearch}/samba/tests/blackbox/__pycache__/netads_dns.*.pyc
 %{python3_sitearch}/samba/tests/blackbox/__pycache__/netads_json.*.pyc
@@ -3171,6 +3172,7 @@ fi
 %{python3_sitearch}/samba/tests/blackbox/http_chunk.py
 %{python3_sitearch}/samba/tests/blackbox/http_content.py
 %{python3_sitearch}/samba/tests/blackbox/mdsearch.py
+%{python3_sitearch}/samba/tests/blackbox/misc_dfs_widelink.py
 %{python3_sitearch}/samba/tests/blackbox/ndrdump.py
 %{python3_sitearch}/samba/tests/blackbox/netads_dns.py
 %{python3_sitearch}/samba/tests/blackbox/netads_json.py
@@ -4594,6 +4596,9 @@ fi
 %endif
 
 %changelog
+* Tue Jul 02 2024 Pavel Filipenský <pfilipen@redhat.com> - 4.20.2-1
+- related: RHEL-33645 - Update to version 4.20.2
+
 * Wed May 29 2024 Pavel Filipenský <pfilipen@redhat.com> - 4.20.1-1
 - related: RHEL-33645 - Remove autorelease - rpmautospec is not available for rhel-9 yet
 
diff --git a/sources b/sources
index e4dfedc..db96b97 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
-SHA512 (samba-4.20.1.tar.asc) = 5ce9f0e4358c1ff5ce991204aaf72e1dfe431ba2686d12f1668b15c7b48247666ecbf6354acbadbcf5e77e657ef93bc07fab0ff7ed7b8a7588f5bcc7bf6facef
-SHA512 (samba-4.20.1.tar.xz) = 7cef945833516b305a2eb6bd4717cc4e8d895575e6dcf7a47d80fa1859847adeb4a9f32814bafdd5c732ce63d793ca168b7f4e0bdda89c56f10d1595ea45b5c0
+SHA512 (samba-4.20.2.tar.asc) = a0051efdca684bc6c3e40367b0a8b862d0b1b988aa9c15ec6987d5f97440daa1f7609e6be61611aa9bbed56d89e0258b192c43028384899c75c4cd449cc99694
+SHA512 (samba-4.20.2.tar.xz) = cf07b12b6c1ac9bc3fd0df7fd658529ebd08309a0823f49c68dd3c55c0c80f412d6af50a0f78b8f4484635029aeb292a72dd0a6638edbd463e73baff404d5315