From cd517c5be5d671b32fc98a635a373730ed4dabc4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?G=C3=BCnther=20Deschner?= <gd@samba.org>
Date: Thu, 2 Jul 2020 11:41:22 +0200
Subject: [PATCH] Update to Samba 4.12.4

resolves: #1849489, #1853255 - Security fixes for CVE-2020-10730
resolves: #1849491, #1853256 - Security fixes for CVE-2020-10745
resolves: #1849509, #1853276 - Security fixes for CVE-2020-10760
resolves: #1851298, #1853259 - Security fixes for CVE-2020-14303

Guenther
---
 .gitignore |  2 ++
 samba.spec | 17 +++++++++++++----
 sources    |  4 ++--
 3 files changed, 17 insertions(+), 6 deletions(-)

diff --git a/.gitignore b/.gitignore
index 0081dcb..4a5eb65 100644
--- a/.gitignore
+++ b/.gitignore
@@ -205,3 +205,5 @@ samba-3.6.0pre1.tar.gz
 /samba-4.12.2.tar.asc
 /samba-4.12.3.tar.xz
 /samba-4.12.3.tar.asc
+/samba-4.12.4.tar.xz
+/samba-4.12.4.tar.asc
diff --git a/samba.spec b/samba.spec
index 0d41176..1bbc0e8 100644
--- a/samba.spec
+++ b/samba.spec
@@ -8,13 +8,13 @@
 
 %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")
 
-%define main_release 1
+%define main_release 0
 
-%define samba_version 4.12.3
+%define samba_version 4.12.4
 %define talloc_version 2.3.1
 %define tdb_version 1.4.3
 %define tevent_version 0.10.2
-%define ldb_version 2.1.3
+%define ldb_version 2.1.4
 # This should be rc1 or nil
 %define pre_release %nil
 
@@ -101,7 +101,7 @@
 
 Name:           samba
 Version:        %{samba_version}
-Release:        %{samba_release}.1
+Release:        %{samba_release}
 
 %if 0%{?rhel}
 Epoch:          0
@@ -2295,6 +2295,7 @@ fi
 %{python3_sitearch}/samba/tests/__pycache__/dns_base.*.pyc
 %{python3_sitearch}/samba/tests/__pycache__/dns_forwarder.*.pyc
 %{python3_sitearch}/samba/tests/__pycache__/dns_invalid.*.pyc
+%{python3_sitearch}/samba/tests/__pycache__/dns_packet.*.pyc
 %{python3_sitearch}/samba/tests/__pycache__/dns_tkey.*.pyc
 %{python3_sitearch}/samba/tests/__pycache__/dns_wildcard.*.pyc
 %{python3_sitearch}/samba/tests/__pycache__/dsdb.*.pyc
@@ -2461,6 +2462,7 @@ fi
 %{python3_sitearch}/samba/tests/dns_forwarder_helpers/__pycache__/server.*.pyc
 %{python3_sitearch}/samba/tests/dns_forwarder_helpers/server.py
 %{python3_sitearch}/samba/tests/dns_invalid.py
+%{python3_sitearch}/samba/tests/dns_packet.py
 %{python3_sitearch}/samba/tests/dns_tkey.py
 %{python3_sitearch}/samba/tests/dns_wildcard.py
 %{python3_sitearch}/samba/tests/dsdb.py
@@ -3577,6 +3579,13 @@ fi
 %endif
 
 %changelog
+* Thu Jul 02 2020 Guenther Deschner <gdeschner@redhat.com> - 4.12.4-0
+- Update to Samba 4.12.4
+- resolves: #1849489, #1853255 - Security fixes for CVE-2020-10730
+- resolves: #1849491, #1853256 - Security fixes for CVE-2020-10745
+- resolves: #1849509, #1853276 - Security fixes for CVE-2020-10760
+- resolves: #1851298, #1853259 - Security fixes for CVE-2020-14303
+
 * Sat Jun 27 2020 Jitka Plesnikova <jplesnik@redhat.com> - 2:4.12.3-1.1
 - Perl 5.32 re-rebuild updated packages
 
diff --git a/sources b/sources
index 3d96a8f..e96dccd 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
-SHA512 (samba-4.12.3.tar.xz) = 1810734a5f8645c3784f0341b5a75de240d8227aa9bc66b87b491a438b4623f6bfcf873049bf148ce73d22bfd97da9319c9d9468142063cd377d73503616b632
-SHA512 (samba-4.12.3.tar.asc) = d8911ad4b03cbeb0d35bb0dcaa83dca30dcbe1630cf888f56dc46a821b9e96c57bb3526573478cdb986e881c1577b03e30b6329166e87192fe51fdcabb415b53
+SHA512 (samba-4.12.4.tar.xz) = 4d6afa4a5975944ef665f081e0a761d2c71917f8226de3439fb29c7168397de110b0818e93f5db53f76628b5672b9971b9cfdd4f8fd1bdebf00717995ccc747e
+SHA512 (samba-4.12.4.tar.asc) = 2f48477ed0db124349ddcbd8560ecc67f860543dd36d6f623ce7b17e3af7dfb90ee4a1f2d65dbe1c9cfdf9e2fcb0749ff91769066c64733164e4b559155d6876