.gitignore

@@ -351,7 +351,3 @@ samba-3.6.0pre1.tar.gz
 /samba-4.19.1.tar.asc
 /samba-4.19.2.tar.xz
 /samba-4.19.2.tar.asc
-/samba-4.19.3.tar.xz
-/samba-4.19.3.tar.asc
-/samba-4.19.4.tar.xz
-/samba-4.19.4.tar.asc

samba-winbind-systemd-sysusers.conf

@@ -1,2 +0,0 @@
-#Type Name       ID
-g     wbpriv     88

samba.spec

@@ -57,7 +57,7 @@
 
 # ppc64le excluded pending resolution of https://gcc.gnu.org/bugzilla/show_bug.cgi?id=104172
 #%%ifarch aarch64 ppc64le s390x x86_64
-%ifarch aarch64 s390x x86_64 riscv64
+%ifarch aarch64 s390x x86_64
 %bcond_without vfs_cephfs
 %bcond_without ceph_mutex
 %else
@@ -80,7 +80,7 @@
 
 %if 0%{?fedora}
 
-%ifarch aarch64 ppc64le s390x x86_64 riscv64
+%ifarch aarch64 ppc64le s390x x86_64
 %bcond_without vfs_glusterfs
 %else
 %bcond_with vfs_glusterfs
@@ -109,7 +109,7 @@
 # Build vfs_io_uring module by default on 64bit Fedora
 %if 0%{?fedora} || 0%{?rhel} >= 8
 
-%ifarch aarch64 ppc64le s390x x86_64 riscv64
+%ifarch aarch64 ppc64le s390x x86_64
 %bcond_without vfs_io_uring
 %else
 %bcond_with vfs_io_uring
@@ -121,12 +121,9 @@
 #endif fedora || rhel >= 8
 %endif
 
-# Build the ctdb-pcp-pmda package by default on Fedora, except for i686 where
-# pcp is no longer supported
+# Build the ctdb-pcp-pmda package by default on Fedora
 %if 0%{?fedora}
-%ifnarch i686
 %bcond_without pcp_pmda
-%endif
 %else
 %bcond_with pcp_pmda
 %endif
@@ -146,7 +143,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.19.4
+%global samba_version 4.19.2
 %global baserelease 2
 # This should be rc1 or %%nil
 %global pre_release %nil
@@ -197,6 +194,12 @@
 # https://src.fedoraproject.org/rpms/redhat-rpm-config/blob/master/f/buildflags.md
 %undefine _strict_symbol_defs_build
 
+%global libwbc_alternatives_version 0.16
+%global libwbc_alternatives_suffix %nil
+%if 0%{?__isa_bits} == 64
+%global libwbc_alternatives_suffix -64
+%endif
+
 %global _systemd_extra "Environment=KRB5CCNAME=FILE:/run/samba/krb5cc_samba"
 
 # Make a copy of this variable to prevent repeated evaluation of the
@@ -205,7 +208,7 @@
 
 Name:           samba
 Version:        %{samba_version}
-Release:        %{samba_release}.0.riscv64%{?dist}
+Release:        %{samba_release}%{?dist}
 
 %if 0%{?fedora}
 Epoch:          2
@@ -233,11 +236,12 @@ 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
 
+Requires(pre): /usr/sbin/groupadd
+
 Requires(pre): %{name}-common = %{samba_depver}
 Requires: %{name}-common = %{samba_depver}
 Requires: %{name}-common-libs = %{samba_depver}
@@ -332,7 +336,7 @@ BuildRequires: zlib-devel >= 1.2.3
 
 BuildRequires: pkgconfig(libsystemd)
 
-%ifnarch i686 riscv64
+%ifnarch i686
 %if 0%{?fedora} >= 37
 BuildRequires: mold
 %endif
@@ -361,10 +365,6 @@ BuildRequires: librados-devel
 BuildRequires: python3-etcd
 %endif
 
-%if %{with gpupdate}
-BuildRequires: cepces
-%endif
-
 # pidl requirements
 BuildRequires: perl(ExtUtils::MakeMaker)
 BuildRequires: perl(FindBin)
@@ -733,12 +733,9 @@ Samba VFS module for GlusterFS integration.
 %package gpupdate
 Summary: Samba GPO support for clients
 Requires: cepces
-Requires: cepces-certmonger
 Requires: certmonger
 Requires: %{name}-ldb-ldap-modules = %{samba_depver}
 Requires: python3-%{name} = %{samba_depver}
-# samba-tool needs python3-samba-dc also on non-dc build
-Requires: python3-%{name}-dc = %{samba_depver}
 
 %description gpupdate
 This package provides the samba-gpupdate tool to apply Group Policy Objects
@@ -1275,7 +1272,7 @@ export python_LDFLAGS="$(echo %{__global_ldflags} | sed -e 's/-Wl,-z,defs//g')"
 # Use the mold linker if possible
 export python_LDFLAGS="$(echo %{__global_ldflags} | sed -e 's/-Wl,-z,defs//g')"
 
-%ifnarch i686 riscv64
+%ifnarch i686
 %if 0%{?fedora} >= 37
 export LDFLAGS="%{__global_ldflags} -fuse-ld=mold"
 export python_LDFLAGS="$(echo ${LDFLAGS} | sed -e 's/-Wl,-z,defs//g')"
@@ -1412,7 +1409,6 @@ 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
@@ -1447,8 +1443,8 @@ done
 %endif
 
 %if %{without gpupdate}
-rm -f %{buildroot}%{_sbindir}/samba-gpupdate
-rm -f %{buildroot}%{_mandir}/man8/samba-gpupdate.8*
+rm -f %{_sbindir}/samba-gpupdate
+rm -f %{_mandir}/man8/samba-gpupdate.8
 %endif
 
 %if %{without vfs_glusterfs}
@@ -1527,8 +1523,11 @@ export WINBINDD_DONT_LOG_STDOUT=1
 %systemd_postun_with_restart nmb.service
 
 %pre common
-# This creates the group 'printadmin'
+%if 0%{?fedora} || 0%{?rhel} > 8
 %sysusers_create_compat %{SOURCE16}
+%else
+getent group printadmin >/dev/null || groupadd -r printadmin || :
+%endif
 
 %post common
 %{?ldconfig}
@@ -1598,12 +1597,14 @@ fi
 %ldconfig_scriptlets test
 
 %pre usershares
-# This creates the group 'usershares'
+%if 0%{?fedora} || 0%{?rhel} > 8
 %sysusers_create_compat %{SOURCE17}
+%else
+getent group usershares >/dev/null || groupadd -r usershares || :
+%endif
 
 %pre winbind
-# This creates the group 'wbpriv'
-%sysusers_create_compat %{SOURCE18}
+/usr/sbin/groupadd -g 88 wbpriv >/dev/null 2>&1 || :
 
 %post winbind
 %systemd_post winbind.service
@@ -3479,7 +3480,6 @@ 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
@@ -4468,22 +4468,6 @@ fi
 %endif
 
 %changelog
-* Thu Jan 11 2024 David Abdurachmanov <davidlt@rivosinc.com> - 4.19.4-2.0.riscv64
-- Add support for riscv64
-- Disable Mold linker on riscv64
-
-* Tue Jan 09 2024 Andreas Schneider <asn@redhat.com> - 4.19.4-2
-- resolves: rhbz#2256326 - Create all groups using systemd
-
-* Mon Jan 08 2024 Guenther Deschner <gdeschner@redhat.com> - 4.19.4-1
-- resolves: #2257287 - Update to version 4.19.4
-
-* Tue Nov 28 2023 Guenther Deschner <gdeschner@redhat.com> - 4.19.3-2
-- Disable performance co-pilot support for i686
-
-* Mon Nov 27 2023 Guenther Deschner <gdeschner@redhat.com> - 4.19.3-1
-- resolves: #2251766 - Update to version 4.19.3
-
 * Wed Nov 15 2023 Andreas Schneider <asn@redhat.com> - 4.19.2-2
 - Package samba-gpupdate also for RHEL9
 

sources

@@ -1,2 +1,2 @@
-SHA512 (samba-4.19.4.tar.xz) = 3d2899e4a3b8bcb77befc29c4af66d3ac858b7f7a0dbbb66a8bc210cd88d9cde3e11361334a5cce650318473134ec8b134148bfa4af4d51f555de33eff395029
-SHA512 (samba-4.19.4.tar.asc) = 11bc51407d1464339817d7568f5d5bb059c19a05b49c6a1307d7425d289acb617ecd3e633e3736bdaa94947a7b3630d6cdb7ed6fe59d52556234c549eca8172a
+SHA512 (samba-4.19.2.tar.xz) = 5b959aa9b276a306ecde99aa8a9ad30e335a7de21d89148d45ccf85ab2027aed31471b379683e5add4436a26cd878a238c7a82df1e0ebf28fc62bcdbc8c5c3ec
+SHA512 (samba-4.19.2.tar.asc) = 998985d0c0d64e5c0c8dea8ddc43be366a3f9f4d4720010d2cbc5a4b72d023aaad7c0c46b010a594404047101c82c2068d5ea04887287b2b8c57efd84b7803e6