From e2dee495bfdd27fbe15a1b5810e14218edd39248 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Pavel=20Filipensk=C3=BD?= <pfilipensky@samba.org>
Date: Tue, 9 Jan 2024 11:56:53 +0100
Subject: [PATCH] Update to version 4.19.4

resolves: RHEL-16483
---
 .gitignore                          |  2 ++
 samba-winbind-systemd-sysusers.conf |  2 ++
 samba.spec                          | 29 ++++++++++++-----------------
 sources                             |  4 ++--
 4 files changed, 18 insertions(+), 19 deletions(-)
 create mode 100644 samba-winbind-systemd-sysusers.conf

diff --git a/.gitignore b/.gitignore
index f49bdce..f4e64f6 100644
--- a/.gitignore
+++ b/.gitignore
@@ -14,3 +14,5 @@ SOURCES/samba-4.17.5.tar.xz
 /samba-4.19.2.tar.xz
 /samba-4.19.3.tar.asc
 /samba-4.19.3.tar.xz
+/samba-4.19.4.tar.asc
+/samba-4.19.4.tar.xz
diff --git a/samba-winbind-systemd-sysusers.conf b/samba-winbind-systemd-sysusers.conf
new file mode 100644
index 0000000..7ccc216
--- /dev/null
+++ b/samba-winbind-systemd-sysusers.conf
@@ -0,0 +1,2 @@
+#Type Name       ID
+g     wbpriv     88
diff --git a/samba.spec b/samba.spec
index b7b5c05..dbe72a4 100644
--- a/samba.spec
+++ b/samba.spec
@@ -146,8 +146,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.19.3
-%global baserelease 2
+%global samba_version 4.19.4
+%global baserelease 1
 # This should be rc1 or %%nil
 %global pre_release %nil
 
@@ -239,16 +239,11 @@ Source14:       samba.pamd
 Source15:       usershares.conf.vendor
 Source16:       samba-systemd-sysusers.conf
 Source17:       samba-usershares-systemd-sysusers.conf
+Source18:       samba-winbind-systemd-sysusers.conf
 
 Source201:      README.downgrade
 Source202:      samba.abignore
 
-Patch0:         v4-19-fix-force-user.patch
-Patch1:         samba-4.19-fix-smbget-debug.patch
-Patch2:         samba-4.19-fix-smbget-auth.patch
-
-Requires(pre): /usr/sbin/groupadd
-
 Requires(pre): %{name}-common = %{samba_depver}
 Requires: %{name}-common = %{samba_depver}
 Requires: %{name}-common-libs = %{samba_depver}
@@ -1420,6 +1415,7 @@ echo "d /run/ctdb 755 root root" > %{buildroot}%{_tmpfilesdir}/ctdb.conf
 install -d -m 0755 %{buildroot}%{_sysusersdir}
 install -m 0644 %{SOURCE16} %{buildroot}%{_sysusersdir}/samba.conf
 install -m 0644 %{SOURCE17} %{buildroot}%{_sysusersdir}/samba-usershares.conf
+install -m 0644 %{SOURCE18} %{buildroot}%{_sysusersdir}/samba-winbind.conf
 
 install -d -m 0755 %{buildroot}%{_sysconfdir}/sysconfig
 install -m 0644 packaging/systemd/samba.sysconfig %{buildroot}%{_sysconfdir}/sysconfig/samba
@@ -1534,11 +1530,8 @@ export WINBINDD_DONT_LOG_STDOUT=1
 %systemd_postun_with_restart nmb.service
 
 %pre common
-%if 0%{?fedora} || 0%{?rhel} > 8
+# This creates the group 'printadmin'
 %sysusers_create_compat %{SOURCE16}
-%else
-getent group printadmin >/dev/null || groupadd -r printadmin || :
-%endif
 
 %post common
 %{?ldconfig}
@@ -1608,14 +1601,12 @@ fi
 %ldconfig_scriptlets test
 
 %pre usershares
-%if 0%{?fedora} || 0%{?rhel} > 8
+# This creates the group 'usershares'
 %sysusers_create_compat %{SOURCE17}
-%else
-getent group usershares >/dev/null || groupadd -r usershares || :
-%endif
 
 %pre winbind
-/usr/sbin/groupadd -g 88 wbpriv >/dev/null 2>&1 || :
+# This creates the group 'wbpriv'
+%sysusers_create_compat %{SOURCE18}
 
 %post winbind
 %systemd_post winbind.service
@@ -3491,6 +3482,7 @@ fi
 %{_libdir}/samba/libnss-info-samba4.so
 %{_libdir}/samba/libidmap-samba4.so
 %{_sbindir}/winbindd
+%{_sysusersdir}/samba-winbind.conf
 %attr(750,root,wbpriv) %dir /var/lib/samba/winbindd_privileged
 %{_unitdir}/winbind.service
 %{_prefix}/lib/NetworkManager
@@ -4479,6 +4471,9 @@ fi
 %endif
 
 %changelog
+* Tue Jan 09 2024 Pavel Filipenský <pfilipen@redhat.com> - 4.19.4-1
+- resolves: RHEL-16483 - Update to version 4.19.4
+
 * Thu Dec 14 2023 Pavel Filipenský <pfilipen@redhat.com> - 4.19.3-2
 - resolves: RHEL-17283 - Fix smbget password interactive authentication
 
diff --git a/sources b/sources
index 0de8827..d4f48db 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
-SHA512 (samba-4.19.3.tar.asc) = 76692b6eced6ecbbb49dea21e895ee4486aa09118a53b9a113ba0679063c6052333789156abe30b9d4ee11527743c2334eb49c055421c2cf6b347df18f6afb03
-SHA512 (samba-4.19.3.tar.xz) = c222d11c2b196c02ce99a5d6b806df5b9dbfdc50f0d5de43723cf75af69e0fb8ec06d9fbd9a4ca8be03f3ff39a8e5422464afb9279816d3350308045350245a3
+SHA512 (samba-4.19.4.tar.asc) = 11bc51407d1464339817d7568f5d5bb059c19a05b49c6a1307d7425d289acb617ecd3e633e3736bdaa94947a7b3630d6cdb7ed6fe59d52556234c549eca8172a
+SHA512 (samba-4.19.4.tar.xz) = 3d2899e4a3b8bcb77befc29c4af66d3ac858b7f7a0dbbb66a8bc210cd88d9cde3e11361334a5cce650318473134ec8b134148bfa4af4d51f555de33eff395029