From 1fa58bde0fbeb6239176eebee484ccdcbadbf5dd Mon Sep 17 00:00:00 2001 From: Andreas Schneider Date: Thu, 29 Apr 2021 11:58:11 +0200 Subject: [PATCH] Update to Samba 4.14.4 resolves: rhbz#1954531 --- .gitignore | 2 ++ samba.spec | 56 ++++++++++++++++++++++++++++++++++++++++++++++++------ sources | 4 ++-- 3 files changed, 54 insertions(+), 8 deletions(-) diff --git a/.gitignore b/.gitignore index 01c732c..710a9fb 100644 --- a/.gitignore +++ b/.gitignore @@ -245,3 +245,5 @@ samba-3.6.0pre1.tar.gz /samba-4.14.1.tar.asc /samba-4.14.2.tar.xz /samba-4.14.2.tar.asc +/samba-4.14.4.tar.xz +/samba-4.14.4.tar.asc diff --git a/samba.spec b/samba.spec index 8e33353..15539d6 100644 --- a/samba.spec +++ b/samba.spec @@ -108,9 +108,9 @@ %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 main_release 0 +%global main_release 1 -%global samba_version 4.14.2 +%global samba_version 4.14.4 %global talloc_version 2.3.2 %global tdb_version 1.4.3 %global tevent_version 0.10.2 @@ -145,7 +145,7 @@ Name: samba Version: %{samba_version} -Release: %{samba_release}.1 +Release: %{samba_release} %if 0%{?rhel} Epoch: 0 @@ -214,6 +214,8 @@ Obsoletes: samba-swat < %{samba_depver} Provides: samba4-swat = %{samba_depver} Obsoletes: samba4-swat < %{samba_depver} +Provides: bundled(libreplace) + BuildRequires: make BuildRequires: gcc BuildRequires: avahi-devel @@ -310,6 +312,7 @@ BuildRequires: libtdb-devel >= %{tdb_version} BuildRequires: python3-tdb >= %{tdb_version} BuildRequires: libldb-devel >= %{ldb_version} +BuildRequires: python3-ldb >= %{ldb_version} BuildRequires: python3-ldb-devel >= %{ldb_version} %else BuildRequires: lmdb-devel @@ -355,6 +358,8 @@ Obsoletes: samba4-client < %{samba_depver} Requires(post): %{_sbindir}/update-alternatives Requires(postun): %{_sbindir}/update-alternatives +Provides: bundled(libreplace) + %description client The %{name}-client package provides some SMB/CIFS clients to complement the built-in SMB/CIFS filesystem in Linux. These clients allow access @@ -386,12 +391,14 @@ Recommends: logrotate Provides: samba4-common = %{samba_depver} Obsoletes: samba4-common < %{samba_depver} -%if %{with dc} || %{with testsuite} +%if %{without dc} && %{without testsuite} Obsoletes: samba-dc < %{samba_depver} Obsoletes: samba-dc-libs < %{samba_depver} Obsoletes: samba-dc-bind-dlz < %{samba_depver} %endif +Provides: bundled(libreplace) + %description common samba-common provides files necessary for both the server and client packages of Samba. @@ -406,6 +413,8 @@ Requires: %{name}-client-libs = %{samba_depver} Requires: libwbclient = %{samba_depver} %endif +Provides: bundled(libreplace) + %description common-libs The samba-common-libs package contains internal libraries needed by the SMB/CIFS clients. @@ -420,6 +429,8 @@ Requires: samba-libs = %{samba_depver} Requires: libwbclient = %{samba_depver} %endif +Provides: bundled(libreplace) + %description common-tools The samba-common-tools package contains tools for Samba servers and SMB/CIFS clients. @@ -457,6 +468,8 @@ Requires: krb5-server >= %{required_mit_krb5} Provides: samba4-dc = %{samba_depver} Obsoletes: samba4-dc < %{samba_depver} +Provides: bundled(libreplace) + %description dc The samba-dc package provides AD Domain Controller functionality @@ -477,6 +490,8 @@ Requires: %{name}-libs = %{samba_depver} Provides: samba4-dc-libs = %{samba_depver} Obsoletes: samba4-dc-libs < %{samba_depver} +Provides: bundled(libreplace) + %description dc-libs The %{name}-dc-libs package contains the libraries needed by the DC to link against the SMB, RPC and other protocols. @@ -489,6 +504,8 @@ Requires: %{name}-dc-libs = %{samba_depver} Requires: %{name}-dc = %{samba_depver} Requires: bind +Provides: bundled(libreplace) + %description dc-bind-dlz The %{name}-dc-bind-dlz package contains the libraries for bind to manage all name server related details of Samba AD. @@ -516,6 +533,8 @@ Summary: Samba VFS module for Ceph distributed storage system Requires: %{name} = %{samba_depver} Requires: %{name}-libs = %{samba_depver} +Provides: bundled(libreplace) + %description vfs-cephfs Samba VFS module for Ceph distributed storage system integration. #endif with vfs_cephfs @@ -538,6 +557,8 @@ Requires: libwbclient = %{samba_depver} Obsoletes: samba-glusterfs < %{samba_depver} Provides: samba-glusterfs = %{samba_depver} +Provides: bundled(libreplace) + %description vfs-glusterfs Samba VFS module for GlusterFS integration. %endif @@ -569,6 +590,8 @@ Requires: libwbclient = %{samba_depver} Provides: samba4-libs = %{samba_depver} Obsoletes: samba4-libs < %{samba_depver} +Provides: bundled(libreplace) + %description libs The %{name}-libs package contains the libraries needed by programs that link against the SMB, RPC and other protocols provided by the Samba suite. @@ -641,6 +664,8 @@ Requires: libsmbclient = %{samba_depver} Requires: libwbclient = %{samba_depver} %endif +Provides: bundled(libreplace) + %description -n python3-%{name} The python3-%{name} package contains the Python 3 libraries needed by programs that use SMB, RPC and other Samba provided protocols in Python 3 programs. @@ -715,6 +740,8 @@ Requires: perl(Archive::Tar) Provides: samba4-test = %{samba_depver} Obsoletes: samba4-test < %{samba_depver} +Provides: bundled(libreplace) + %description test %{name}-test provides testing tools for both the server and client packages of Samba. @@ -732,6 +759,8 @@ Requires: libwbclient = %{samba_depver} Provides: %{name}-test-devel = %{samba_depver} Obsoletes: %{name}-test-devel < %{samba_depver} +Provides: bundled(libreplace) + %description test-libs %{name}-test-libs provides libraries required by the testing tools. @@ -757,6 +786,8 @@ Obsoletes: samba4-winbind < %{samba_depver} # Old NetworkManager expects the dispatcher scripts in a different place Conflicts: NetworkManager < 1.20 +Provides: bundled(libreplace) + %description winbind The samba-winbind package provides the winbind NSS library, and some client tools. Winbind enables Linux to be a full member in Windows domains and to use @@ -777,6 +808,8 @@ Requires: libwbclient = %{samba_depver} Provides: samba4-winbind-clients = %{samba_depver} Obsoletes: samba4-winbind-clients < %{samba_depver} +Provides: bundled(libreplace) + %description winbind-clients The samba-winbind-clients package provides the wbinfo and ntlm_auth tool. @@ -804,6 +837,8 @@ Requires(post): %{_sbindir}/update-alternatives Requires(postun): %{_sbindir}/update-alternatives Requires(preun): %{_sbindir}/update-alternatives +Provides: bundled(libreplace) + %description winbind-krb5-locator The winbind krb5 locator is a plugin for the system kerberos library to allow the local kerberos library to use the same KDC as samba and winbind use @@ -818,6 +853,8 @@ Requires: libwbclient = %{samba_depver} %endif Requires: pam +Provides: bundled(libreplace) + %description winbind-modules The samba-winbind-modules package provides the NSS library and a PAM module necessary to communicate to the Winbind Daemon @@ -829,6 +866,8 @@ Summary: Samba Winexe Windows Binary License: GPLv3 Requires: %{name}-client-libs = %{samba_depver} +Provides: bundled(libreplace) + %description winexe Winexe is a Remote Windows®-command executor %endif @@ -862,6 +901,8 @@ Requires(post): systemd-units Requires(preun): systemd-units Requires(postun): systemd-units +Provides: bundled(libreplace) + %description -n ctdb CTDB is a cluster implementation of the TDB database used by Samba and other projects to store temporary data. If an application is already using TDB for @@ -1513,7 +1554,7 @@ fi %{_bindir}/cifsdd %{_bindir}/dbwrap_tool %{_bindir}/dumpmscat -%{_bindir}/findsmb +%exclude %{_bindir}/findsmb %{_bindir}/mvxattr %{_bindir}/mdfind %{_bindir}/nmblookup @@ -1542,7 +1583,7 @@ fi %{_mandir}/man1/regpatch.1* %{_mandir}/man1/regshell.1* %{_mandir}/man1/regtree.1* -%{_mandir}/man1/findsmb.1* +%exclude %{_mandir}/man1/findsmb.1* %{_mandir}/man1/log2pcap.1* %{_mandir}/man1/mdfind.1* %{_mandir}/man1/mvxattr.1* @@ -3839,6 +3880,9 @@ fi %endif %changelog +* Thu Apr 29 2021 Andreas Schneider - 4.14.4-1 +- resolves: rhbz#1954531 - Update to Samba 4.14.4 + * Fri Apr 16 2021 Mohan Boddu - 0:4.14.2-0.1 - Rebuilt for RHEL 9 BETA on Apr 15th 2021. Related: rhbz#1947937 diff --git a/sources b/sources index 03983cb..63cae90 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (samba-4.14.2.tar.xz) = 5353cf67eac165afc0443639266354402f8d20437f8cd9389ff33201ab8261aacd21cfb9140b5816a9c39e2471fe6bce405d5b99103b1410768f56619010429d -SHA512 (samba-4.14.2.tar.asc) = 586d8a38be861195f87f4d23149c5483494a7fdbb530f4707b8ce0cfb39723ca0b6c5d9c1064c6235d1bb652558c5c113482d46163982e67c78bff2238605e25 +SHA512 (samba-4.14.4.tar.xz) = 83994dae39455a1b888dc0ebd48e18fd00ae08ce1c7e23d3e26911a21ca0651fe3e9e076f21ceb83570fa25ad0fb6a03b02a55905eaac5d94712ffa103d9481d +SHA512 (samba-4.14.4.tar.asc) = 82e698310c7a1c9783d4e1c7ec2d5032cee518c73fd4065343cd2f0bdf84764e58d7e48c97ebe0106c17eb63e1922192ef0ca6c0747eee6ddd388c3a62ebd683