From 33ef231f6b01eb955e886425948d31bca9255450 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?G=C3=BCnther=20Deschner?= Date: Thu, 18 Feb 2021 13:13:02 +0100 Subject: [PATCH 1/4] Update to Samba 4.14.0rc3 Guenther --- .gitignore | 2 ++ samba.spec | 5 ++++- sources | 4 ++-- 3 files changed, 8 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index c74b20e..1668ffb 100644 --- a/.gitignore +++ b/.gitignore @@ -235,3 +235,5 @@ samba-3.6.0pre1.tar.gz /samba-4.14.0rc1.tar.asc /samba-4.14.0rc2.tar.xz /samba-4.14.0rc2.tar.asc +/samba-4.14.0rc3.tar.xz +/samba-4.14.0rc3.tar.asc diff --git a/samba.spec b/samba.spec index 5f6927d..14099e1 100644 --- a/samba.spec +++ b/samba.spec @@ -116,7 +116,7 @@ %global tevent_version 0.10.2 %global ldb_version 2.2.0 # This should be rc1 or nil -%global pre_release rc2 +%global pre_release rc3 %global samba_release %{main_release}%{?dist} %if "x%{?pre_release}" != "x" @@ -3834,6 +3834,9 @@ fi %endif %changelog +* Thu Feb 18 2021 Guenther Deschner - 4.14.0rc3-0 +- Update to Samba 4.14.0rc3 + * Thu Feb 04 2021 Guenther Deschner - 4.14.0rc2-0 - Update to Samba 4.14.0rc2 diff --git a/sources b/sources index 2f38afc..19aab9f 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (samba-4.14.0rc2.tar.xz) = 7dd006538ef2d386dc60949bc23a25ff731a0fb4ec4a078500a27b7ea8352b6b5b7c306e0592007d6e79a13da1bfc201ed34c57df6bf2fda3484e5053f13a6e2 -SHA512 (samba-4.14.0rc2.tar.asc) = 104ac6e7ddb341f12432bb3686a80460fe67523a19f9eb058da112eafe0411839ea73510ad964d5f0a3da1d0372d716593fb68a9cc1ae7e7af5e7457417b2d24 +SHA512 (samba-4.14.0rc3.tar.xz) = 5f99e61d87f742850018d4bbed8d7dfd058f3f6b7db068d384680e6ded9fa63b9c1505f918d4e71dcf5d6ff516078346bc24c5ede8078ebec4f05032fb988edd +SHA512 (samba-4.14.0rc3.tar.asc) = 6565849b11918d7d8f0ccc809d862f579ab69a645f8ba6fc26c1e3fc446199874400240a1a5ccf0bd310394e49e6730d033673c6281d23b84fb661243e98ff08 From 61d395767cf79397f103ede6f9a3dd0b0ac0f381 Mon Sep 17 00:00:00 2001 From: Andreas Schneider Date: Thu, 4 Feb 2021 16:59:03 +0100 Subject: [PATCH 2/4] Add python3-pyasn1 for krb5 tests --- samba.spec | 1 + 1 file changed, 1 insertion(+) diff --git a/samba.spec b/samba.spec index 14099e1..2d5992c 100644 --- a/samba.spec +++ b/samba.spec @@ -287,6 +287,7 @@ BuildRequires: liburing-devel >= 0.4 # Add python3-iso8601 to avoid that the # version in Samba is being packaged BuildRequires: python3-iso8601 +BuildRequires: python3-pyasn1 BuildRequires: bind BuildRequires: krb5-server >= %{required_mit_krb5} From 95748acc9ed6faaa7a44566628eaba9bbe65ae40 Mon Sep 17 00:00:00 2001 From: Andreas Schneider Date: Thu, 4 Feb 2021 17:08:03 +0100 Subject: [PATCH 3/4] Protect 'Require' of libwbclient --- samba.spec | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/samba.spec b/samba.spec index 2d5992c..373e69d 100644 --- a/samba.spec +++ b/samba.spec @@ -434,8 +434,10 @@ Requires: %{name}-dc-provision = %{samba_depver} Requires: %{name}-dc-libs = %{samba_depver} Requires: %{name}-winbind = %{samba_depver} +%if %{with libwbclient} Requires(post): libwbclient = %{samba_depver} Requires: libwbclient = %{samba_depver} +%endif # samba-tool needs tdbbackup Requires: tdb-tools @@ -744,8 +746,10 @@ Requires: %{name}-client-libs = %{samba_depver} Requires: %{name}-libs = %{samba_depver} Requires: %{name}-winbind-modules = %{samba_depver} +%if %{with libwbclient} Requires(post): libwbclient = %{samba_depver} Requires: libwbclient = %{samba_depver} +%endif Provides: samba4-winbind = %{samba_depver} Obsoletes: samba4-winbind < %{samba_depver} From 96944d086eba70f6e99df4ee5c58f9a95b49d479 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?G=C3=BCnther=20Deschner?= Date: Mon, 1 Mar 2021 12:15:45 +0100 Subject: [PATCH 4/4] Update to Samba 4.14.0rc4 Guenther --- .gitignore | 2 ++ samba.spec | 5 ++++- sources | 4 ++-- 3 files changed, 8 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index 1668ffb..80b0ec3 100644 --- a/.gitignore +++ b/.gitignore @@ -237,3 +237,5 @@ samba-3.6.0pre1.tar.gz /samba-4.14.0rc2.tar.asc /samba-4.14.0rc3.tar.xz /samba-4.14.0rc3.tar.asc +/samba-4.14.0rc4.tar.xz +/samba-4.14.0rc4.tar.asc diff --git a/samba.spec b/samba.spec index 373e69d..9728166 100644 --- a/samba.spec +++ b/samba.spec @@ -116,7 +116,7 @@ %global tevent_version 0.10.2 %global ldb_version 2.2.0 # This should be rc1 or nil -%global pre_release rc3 +%global pre_release rc4 %global samba_release %{main_release}%{?dist} %if "x%{?pre_release}" != "x" @@ -3839,6 +3839,9 @@ fi %endif %changelog +* Mon Mar 01 2021 Guenther Deschner - 4.14.0rc4-0 +- Update to Samba 4.14.0rc4 + * Thu Feb 18 2021 Guenther Deschner - 4.14.0rc3-0 - Update to Samba 4.14.0rc3 diff --git a/sources b/sources index 19aab9f..2d69cdb 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (samba-4.14.0rc3.tar.xz) = 5f99e61d87f742850018d4bbed8d7dfd058f3f6b7db068d384680e6ded9fa63b9c1505f918d4e71dcf5d6ff516078346bc24c5ede8078ebec4f05032fb988edd -SHA512 (samba-4.14.0rc3.tar.asc) = 6565849b11918d7d8f0ccc809d862f579ab69a645f8ba6fc26c1e3fc446199874400240a1a5ccf0bd310394e49e6730d033673c6281d23b84fb661243e98ff08 +SHA512 (samba-4.14.0rc4.tar.xz) = 82d5577998158338eb2aef4f1466114d549e6b6e728b4f0cf1d2aa09ebb0139d0731e56da24c051ddc8b9a85ab084e1f3db0ac083ca7d92a30270d10e8eba1ea +SHA512 (samba-4.14.0rc4.tar.asc) = a24ac0882279ed1374569ad5e738f9b594aba8b7a0bd86b8a14963146d5f2f55c44fe2e3b925a449f50ef5401418265a8536ed8dbc72b16d443c4a7b9e0b5a68