Update to Samba 4.25.0rc1

- resolves: rhbz#2514222

Guenther

0001-printing-Fix-compilation-error-for-native-32-bit-tim.patch

@@ -1,63 +0,0 @@
-From 56d8c64eef9f5bfa5d9fd683718c9d13acaaa25c Mon Sep 17 00:00:00 2001
-From: Michael Tokarev <mjt@tls.msk.ru>
-Date: Wed, 21 Jan 2026 10:35:15 +0530
-Subject: [PATCH] printing: Fix compilation error for native 32-bit time_t
-
-commit#e9a7dce599eb12d broke samba compilation for 32-bit time_t.
-
-BUG: https://bugzilla.samba.org/show_bug.cgi?id=15976
-Used correct pointer type to fix the warning to fix compialtion.
-
-Pair-Programmed-With: Vinit Agnihotri <vagnihot@redhat.com>
-Signed-off-by: Michael Tokarev <mjt@tls.msk.ru>
-Signed-off-by: Vinit Agnihotri <vagnihot@redhat.com>
----
- source3/printing/printing.c | 7 +++++--
- 1 file changed, 5 insertions(+), 2 deletions(-)
-
-diff --git a/source3/printing/printing.c b/source3/printing/printing.c
-index a9e8422efab..bcfd893456b 100644
---- a/source3/printing/printing.c
-+++ b/source3/printing/printing.c
-@@ -59,6 +59,7 @@ static int fetch_share_cache_time(const char *key_name,
- 				  time_t *curr_time)
- {
- 	char *key = NULL;
-+	int64_t curr_time64 = -1;
- 
- 	key = talloc_asprintf(NULL, "%s/%s", key_name, sharename);
- 	if (key == NULL) {
-@@ -66,11 +67,12 @@ static int fetch_share_cache_time(const char *key_name,
- 		return -1;
- 	}
- 
--	if (tdb_fetch_int64(tdb, key, curr_time) != 0) {
-+	if (tdb_fetch_int64(tdb, key, &curr_time64) != 0) {
- 		DBG_ERR("No timing record found for[%s]!\n", sharename);
- 		TALLOC_FREE(key);
- 		return -1;
- 	}
-+	*curr_time = curr_time64;
- 
- 	TALLOC_FREE(key);
- 	return 0;
-@@ -82,6 +84,7 @@ static int update_share_cache_time(const char *key_name,
- 				   time_t curr_time)
- {
- 	char *key = NULL;
-+	int64_t curr_time64 = curr_time;
- 
- 	key = talloc_asprintf(NULL, "%s/%s", key_name, sharename);
- 	if (key == NULL) {
-@@ -89,7 +92,7 @@ static int update_share_cache_time(const char *key_name,
- 		return -1;
- 	}
- 
--	if (tdb_store_int64(tdb, key, (int64_t)curr_time) != 0) {
-+	if (tdb_store_int64(tdb, key, curr_time64) != 0) {
- 		DBG_ERR("Unable to update print cache for %s\n", sharename);
- 		TALLOC_FREE(key);
- 		return -1;
--- 
-2.52.0
-

samba.spec

@@ -65,24 +65,27 @@
 # Build vfs_ceph module and ctdb cepth mutex helper by default on 64bit Fedora
 %if 0%{?fedora}
 
-%ifarch aarch64 ppc64le s390x x86_64 riscv64
+%ifarch aarch64 ppc64le s390x x86_64 riscv64 loongarch64
 %bcond vfs_cephfs 1
+%bcond vfs_ceph_rgw 1
 %bcond ceph_mutex 1
 %else
 %bcond vfs_cephfs 0
+%bcond vfs_ceph_rgw 0
 %bcond ceph_mutex 0
 #endifarch
 %endif
 
 %else
 %bcond vfs_cephfs 0
+%bcond vfs_ceph_rgw 0
 %bcond ceph_mutex 0
 #endif fedora
 %endif
 
 %if 0%{?fedora}
 
-%ifarch aarch64 ppc64le s390x x86_64 riscv64
+%ifarch aarch64 ppc64le s390x x86_64 riscv64 loongarch64
 %bcond vfs_glusterfs 1
 %else
 %bcond vfs_glusterfs 0
@@ -93,7 +96,7 @@
 %endif
 
 # Build vfs_io_uring module by default on 64bit Fedora
-%ifarch aarch64 ppc64le s390x x86_64 riscv64
+%ifarch aarch64 ppc64le s390x x86_64 riscv64 loongarch64
 %bcond vfs_io_uring 1
 %else
 %bcond vfs_io_uring 0
@@ -125,7 +128,7 @@
 %bcond prometheus 0
 %endif
 
-%ifarch aarch64 ppc64le s390x x86_64 riscv64
+%ifarch aarch64 ppc64le s390x x86_64 riscv64 loongarch64
 %bcond lmdb 1
 %else
 %bcond lmdb 0
@@ -137,7 +140,7 @@
 %bcond varlink 0
 %endif
 
-%global samba_version 4.24.0
+%global samba_version 4.25.0
 
 # The release field is extended:
 # <pkgrel>[.<extraver>][.<snapinfo>]%%{?dist}[.<minorbump>]
@@ -182,9 +185,9 @@
 %global libsmbclient_so_version 0
 %global libwbclient_so_version 0
 
-%global talloc_version 2.4.4
+%global talloc_version 2.5.0
 %global tdb_version 1.4.15
-%global tevent_version 0.17.1
+%global tevent_version 0.17.2
 
 %global required_mit_krb5 1.20.1
 
@@ -239,8 +242,6 @@ Source18:       samba-winbind-systemd-sysusers.conf
 Source201:      README.downgrade
 Source202:      samba.abignore
 
-Patch0:         0001-printing-Fix-compilation-error-for-native-32-bit-tim.patch
-
 Requires(pre): %{name}-common = %{samba_depver}
 Requires: %{name}-common = %{samba_depver}
 Requires: %{name}-ndr-libs = %{samba_depver}
@@ -367,6 +368,10 @@ BuildRequires: glusterfs-devel >= 3.4.0.16
 BuildRequires: libcephfs-devel
 %endif
 
+%if %{with vfs_ceph_rgw}
+BuildRequires: librgw-devel
+%endif
+
 %if %{with vfs_io_uring}
 BuildRequires: liburing-devel >= 0.4
 %endif
@@ -748,6 +753,22 @@ Samba VFS module for Ceph distributed storage system integration.
 #endif with vfs_cephfs
 %endif
 
+%if %{with vfs_ceph_rgw}
+%package vfs-ceph-rgw
+Summary: Samba VFS module for exporting Ceph-RGW buckets
+Requires: %{name} = %{samba_depver}
+Requires: %{name}-client-libs = %{samba_depver}
+Requires: %{name}-libs = %{samba_depver}
+Requires: libldb = %{samba_depver}
+Requires: libwbclient = %{samba_depver}
+
+Provides: bundled(libreplace) = %{samba_depver}
+
+%description vfs-ceph-rgw
+Samba VFS module for exporting Ceph-RGW buckets.
+#endif with vfs_ceph_rgw
+%endif
+
 ### IOURING
 %if %{with vfs_io_uring}
 %package vfs-iouring
@@ -1081,9 +1102,6 @@ Requires: %{name}-dcerpc = %{samba_depver}
 Provides: samba4-winbind = %{samba_depver}
 Obsoletes: samba4-winbind < %{samba_depver}
 
-# Old NetworkManager expects the dispatcher scripts in a different place
-Conflicts: NetworkManager < 1.20
-
 Provides: bundled(libreplace) = %{samba_depver}
 
 %description winbind
@@ -1472,10 +1490,14 @@ export PYTHONARCHDIR=%{python3_sitearch}
 %endif
 %if %{with varlink}
         --with-systemd-userdb \
+%endif
+%if %{with vfs_ceph_rgw}
+        --enable-cephrgw \
 %endif
         --with-profiling-data \
         --with-systemd \
         --with-quotas \
+        --with-ratelimitd \
         --systemd-install-services \
         --with-systemddir=/usr/lib/systemd/system \
         --systemd-smb-extra=%{_systemd_extra} \
@@ -1601,6 +1623,10 @@ rm -f %{buildroot}%{_mandir}/man8/vfs_ceph.8*
 rm -f %{buildroot}%{_mandir}/man8/vfs_ceph_snapshots.8*
 %endif
 
+%if %{without vfs_ceph_rgw}
+rm -f %{buildroot}%{_mandir}/man8/vfs_ceph_rgw.8*
+%endif
+
 # This makes the right links, as rpmlint requires that
 # the ldconfig-created links be recorded in the RPM.
 /sbin/ldconfig -N -n %{buildroot}%{_libdir}
@@ -1636,6 +1662,9 @@ rm -f %{buildroot}%{_mandir}/man3/PyLdb*
 # CTDB
 %if %{with clustering}
 touch %{buildroot}%{_libexecdir}/ctdb/statd_callout
+
+# Remove symlinks that are marked as %ghost (CTDB will create them at runtime)
+rm -f %{buildroot}%{_sysconfdir}/ctdb/statd-callout
 #endif with clustering
 %endif
 
@@ -2543,6 +2572,13 @@ fi
 %{_mandir}/man8/vfs_ceph_snapshots.8*
 %endif
 
+### VFS-CEPH-RGW
+%if %{with vfs_ceph_rgw}
+%files vfs-ceph-rgw
+%{_libdir}/samba/vfs/ceph_rgw.so
+%{_mandir}/man8/vfs_ceph_rgw.8*
+%endif
+
 ### VFS-IOURING
 %if %{with vfs_io_uring}
 %files vfs-iouring
@@ -2762,10 +2798,12 @@ fi
 %{python3_sitearch}/samba/dcerpc/drsuapi.*.so
 %{python3_sitearch}/samba/dcerpc/echo.*.so
 %{python3_sitearch}/samba/dcerpc/epmapper.*.so
+%{python3_sitearch}/samba/dcerpc/file_id.*.so
 %{python3_sitearch}/samba/dcerpc/gkdi.*.so
 %{python3_sitearch}/samba/dcerpc/gmsa.*.so
 %{python3_sitearch}/samba/dcerpc/idmap.*.so
 %{python3_sitearch}/samba/dcerpc/initshutdown.*.so
+%{python3_sitearch}/samba/dcerpc/ioctl.*.so
 %{python3_sitearch}/samba/dcerpc/irpc.*.so
 %{python3_sitearch}/samba/dcerpc/keycredlink.*.so
 %{python3_sitearch}/samba/dcerpc/krb5ccache.*.so
@@ -3365,8 +3403,10 @@ fi
 %{python3_sitearch}/samba/tests/__pycache__/net_join_no_spnego.*.pyc
 %{python3_sitearch}/samba/tests/__pycache__/net_join.*.pyc
 %{python3_sitearch}/samba/tests/__pycache__/netlogonsvc.*.pyc
-%{python3_sitearch}/samba/tests/__pycache__/ntacls.*.pyc
+%{python3_sitearch}/samba/tests/__pycache__/nps_echo_test.*.pyc
+%{python3_sitearch}/samba/tests/__pycache__/ntacl_resource_attr_ace.*.pyc
 %{python3_sitearch}/samba/tests/__pycache__/ntacls_backup.*.pyc
+%{python3_sitearch}/samba/tests/__pycache__/ntacls.*.pyc
 %{python3_sitearch}/samba/tests/__pycache__/ntlmdisabled.*.pyc
 %{python3_sitearch}/samba/tests/__pycache__/ntlm_auth.*.pyc
 %{python3_sitearch}/samba/tests/__pycache__/ntlm_auth_base.*.pyc
@@ -3728,12 +3768,14 @@ fi
 %{python3_sitearch}/samba/tests/net_join_no_spnego.py
 %{python3_sitearch}/samba/tests/net_join.py
 %{python3_sitearch}/samba/tests/netlogonsvc.py
+%{python3_sitearch}/samba/tests/nps_echo_test.py
 %dir %{python3_sitearch}/samba/tests/nss
 %dir %{python3_sitearch}/samba/tests/nss/__pycache__
 %{python3_sitearch}/samba/tests/nss/__pycache__/base.*.pyc
 %{python3_sitearch}/samba/tests/nss/__pycache__/group.*.pyc
 %{python3_sitearch}/samba/tests/nss/base.py
 %{python3_sitearch}/samba/tests/nss/group.py
+%{python3_sitearch}/samba/tests/ntacl_resource_attr_ace.py
 %{python3_sitearch}/samba/tests/ntacls.py
 %{python3_sitearch}/samba/tests/ntacls_backup.py
 %{python3_sitearch}/samba/tests/ntlmdisabled.py
@@ -4079,6 +4121,7 @@ fi
 %{_datadir}/ctdb/events/legacy/11.natgw.script
 %{_datadir}/ctdb/events/legacy/11.routing.script
 %{_datadir}/ctdb/events/legacy/13.per_ip_routing.script
+%{_datadir}/ctdb/events/legacy/15.network.script
 %{_datadir}/ctdb/events/legacy/20.multipathd.script
 %{_datadir}/ctdb/events/legacy/31.clamd.script
 %{_datadir}/ctdb/events/legacy/40.vsftpd.script

sources

@@ -1,2 +1,2 @@
-SHA512 (samba-4.24.0rc1.tar.xz) = 05109431874e70fc110626a8233df70f84cb2b61a594227d2327b516f25e1865dda6ecf5830fac2489fc43e8fbbf629f6cf7ec88763e73702b1edc257b78f086
-SHA512 (samba-4.24.0rc1.tar.asc) = edbaeb47dcceaedf6eac28c44fade6534d580f647fde15cb9ff2b6ffb3bede991803fb8c61d75d0c06f7051a150a5a18bbabd963cdfb7fe4fa91ad3c8ce501ab
+SHA512 (samba-4.25.0rc1.tar.xz) = 34b1a2ebf9b391fa9f03cfc6bb95cfb47237e1c0a677144b6e699420fe27fe22a113783e6bc17244948156091bf1d24debe3b996ff026724f0c2aaf06e2ed736
+SHA512 (samba-4.25.0rc1.tar.asc) = f8ed4617e56f9925c2591ffdf3c0aa010750a08ea216f05414e50c8e90817da49fc4bbf799e64459ea36b57341b566961e7f3434505ce656be39ee9b56ee4709