Update to version 4.20.1

related: RHEL-33645

.gitignore

@@ -287,3 +287,5 @@ samba-3.6.0pre1.tar.gz
 /samba-4.19.4.tar.asc
 /samba-4.20.0.tar.asc
 /samba-4.20.0.tar.xz
+/samba-4.20.1.tar.asc
+/samba-4.20.1.tar.xz

samba.spec

@@ -146,14 +146,24 @@
 
 %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.0
+%global samba_version 4.20.1
-%global baserelease 103
-# This should be rc1 or %%nil
-%global pre_release %nil
 
-%global samba_release %{baserelease}
+# The release field is extended:
+# <pkgrel>[.<extraver>][.<snapinfo>]%%{?dist}[.<minorbump>]
+# Square brackets indicate an optional item.
+#
+# The autorelease macro accepts these parameters to allow packagers to specify
+# those added fields:
+#
+#  -p: Designates a pre-release, i.e. pkgrel will be prefixed with '0.'.
+#  -e <extraver>: Allows specifying the extraver portion of the release.
+#  -b <baserelease>: Allows specifying a custom base release number (the
+#                    default is 1).
+%global samba_release %autorelease
+
+%global pre_release %nil
 %if "x%{?pre_release}" != "x"
-%global samba_release 0.%{baserelease}.%{pre_release}
+%global samba_release %autorelease -p -e %pre_release
 %endif
 
 
@@ -205,7 +215,7 @@
 
 Name:           samba
 Version:        %{samba_version}
-Release:        %{samba_release}%{?dist}
+Release:        %{samba_release}
 
 %if 0%{?fedora}
 Epoch:          2
@@ -238,8 +248,6 @@ Source18:       samba-winbind-systemd-sysusers.conf
 Source201:      README.downgrade
 Source202:      samba.abignore
 
-Patch0:         ad_lookup_groupmem.patch
-
 Requires(pre): %{name}-common = %{samba_depver}
 Requires: %{name}-common = %{samba_depver}
 Requires: %{name}-common-libs = %{samba_depver}
@@ -1514,14 +1522,17 @@ export WINBINDD_DONT_LOG_STDOUT=1
 %endif
 
 %post
+%systemd_post samba-bgqd.service
 %systemd_post smb.service
 %systemd_post nmb.service
 
 %preun
+%systemd_preun samba-bgqd.service
 %systemd_preun smb.service
 %systemd_preun nmb.service
 
 %postun
+%systemd_postun_with_restart samba-bgqd.service
 %systemd_postun_with_restart smb.service
 %systemd_postun_with_restart nmb.service
 
@@ -1719,6 +1730,7 @@ fi
 
 %{_unitdir}/nmb.service
 %{_unitdir}/smb.service
+%{_unitdir}/samba-bgqd.service
 %dir %{_sysconfdir}/openldap/schema
 %config %{_sysconfdir}/openldap/schema/samba.schema
 %config(noreplace) %{_sysconfdir}/pam.d/samba
@@ -3144,6 +3156,8 @@ fi
 %{python3_sitearch}/samba/tests/blackbox/__pycache__/check_output.*.pyc
 %{python3_sitearch}/samba/tests/blackbox/__pycache__/claims.*.pyc
 %{python3_sitearch}/samba/tests/blackbox/__pycache__/downgradedatabase.*.pyc
+%{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__/ndrdump.*.pyc
 %{python3_sitearch}/samba/tests/blackbox/__pycache__/netads_dns.*.pyc
@@ -3164,6 +3178,8 @@ fi
 %{python3_sitearch}/samba/tests/blackbox/check_output.py
 %{python3_sitearch}/samba/tests/blackbox/claims.py
 %{python3_sitearch}/samba/tests/blackbox/downgradedatabase.py
+%{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/ndrdump.py
 %{python3_sitearch}/samba/tests/blackbox/netads_dns.py
@@ -4588,6 +4604,9 @@ fi
 %endif
 
 %changelog
+* Tue May 28 2024 Pavel Filipenský <pfilipen@redhat.com> - 4.20.1-1
+- related: RHEL-33645 - Update to version 4.20.1
+
 * Mon Apr 29 2024 Pavel Filipenský <pfilipen@redhat.com> - 4.20.0-103
 - resolves: RHEL-20473 - Improve performance of winbind idmap_ad backend
 

sources

@@ -1,2 +1,2 @@
-SHA512 (samba-4.20.0.tar.asc) = e435c68b276e06a469cf8f9a275c6d09987c17b2e42fc0ac8dd74420073bc644598ece464721c71d20d99b4e5d6ec0bdbfa85d45ee46415d25806b336dc4278c
+SHA512 (samba-4.20.1.tar.asc) = 5ce9f0e4358c1ff5ce991204aaf72e1dfe431ba2686d12f1668b15c7b48247666ecbf6354acbadbcf5e77e657ef93bc07fab0ff7ed7b8a7588f5bcc7bf6facef
-SHA512 (samba-4.20.0.tar.xz) = af706b95fbf0f690b1ca6f97c704fa2ab994617c1b94b16c9e83cfba72d6d1e020f1e2225d658629f97bdc3500f91aacfed417605d4806f38eab54ee5999e6af
+SHA512 (samba-4.20.1.tar.xz) = 7cef945833516b305a2eb6bd4717cc4e8d895575e6dcf7a47d80fa1859847adeb4a9f32814bafdd5c732ce63d793ca168b7f4e0bdda89c56f10d1595ea45b5c0