From bdfca68bd1c0923b811ab36b3fa41044d62c2b08 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Pavel=20Filipensk=C3=BD?= Date: Mon, 13 Jun 2022 16:16:01 +0200 Subject: [PATCH] Rebase Samba to the latest 4.16.2 --- .gitignore | 2 ++ rpminspect.yaml | 4 ++++ samba.abignore | 5 +++++ samba.spec | 26 +++++++++++++++++++++++--- sources | 4 ++-- 5 files changed, 36 insertions(+), 5 deletions(-) create mode 100644 samba.abignore diff --git a/.gitignore b/.gitignore index 51e5d40..c7bed98 100644 --- a/.gitignore +++ b/.gitignore @@ -259,3 +259,5 @@ samba-3.6.0pre1.tar.gz /samba-4.15.5.tar.asc /samba-4.16.1.tar.asc /samba-4.16.1.tar.xz +/samba-4.16.2.tar.asc +/samba-4.16.2.tar.xz diff --git a/rpminspect.yaml b/rpminspect.yaml index 6de38d7..9c56e6c 100644 --- a/rpminspect.yaml +++ b/rpminspect.yaml @@ -7,6 +7,7 @@ badfuncs: - /usr/lib*/libsmbconf.so.* - /usr/lib*/samba/libgse-samba4.so - /usr/lib*/samba/libsamba-sockets-samba4.so + - /usr/lib*/samba/service/nbtd.so - /usr/libexec/ctdb/smnotify - /usr/sbin/nmbd @@ -14,3 +15,6 @@ runpath: allowed_paths: - /usr/lib/samba - /usr/lib64/samba + +abidiff: + suppression_file: samba.abignore diff --git a/samba.abignore b/samba.abignore new file mode 100644 index 0000000..718059d --- /dev/null +++ b/samba.abignore @@ -0,0 +1,5 @@ +################################################# +# This is a grouping library without any code +################################################# +[suppress_file] +file_name_regexp=.*libdcerpc-samr\\.so.* diff --git a/samba.spec b/samba.spec index 0fd9a33..30054fc 100644 --- a/samba.spec +++ b/samba.spec @@ -136,11 +136,11 @@ %global baserelease 100 -%global samba_version 4.16.1 +%global samba_version 4.16.2 %global talloc_version 2.3.3 %global tdb_version 1.4.6 %global tevent_version 0.12.0 -%global ldb_version 2.5.0 +%global ldb_version 2.5.1 # This should be rc1 or nil %global pre_release %nil @@ -200,6 +200,7 @@ Source11: smb.conf.vendor Source12: smb.conf.example Source13: pam_winbind.conf Source14: samba.pamd +Source15: samba.abignore Source201: README.downgrade @@ -428,7 +429,7 @@ SMB/CIFS clients. Summary: Files used by both Samba servers and clients BuildArch: noarch -Requires(post): systemd +Requires(post): (systemd-standalone-tmpfiles or systemd) Recommends: logrotate Provides: samba4-common = %{samba_depver} @@ -509,6 +510,8 @@ SMB/CIFS clients. %package dc Summary: Samba AD Domain Controller Requires: %{name} = %{samba_depver} +Requires: %{name}-client-libs = %{samba_depver} +Requires: %{name}-common-libs = %{samba_depver} Requires: %{name}-libs = %{samba_depver} Requires: %{name}-dc-provision = %{samba_depver} Requires: %{name}-dc-libs = %{samba_depver} @@ -549,6 +552,7 @@ The samba-dc-provision package provides files to setup a domain controller ### DC-LIBS %package dc-libs Summary: Samba AD Domain Controller Libraries +Requires: %{name}-client-libs = %{samba_depver} Requires: %{name}-common-libs = %{samba_depver} Requires: %{name}-libs = %{samba_depver} @@ -564,9 +568,11 @@ link against the SMB, RPC and other protocols. ### DC-BIND %package dc-bind-dlz Summary: Bind DLZ module for Samba AD +Requires: %{name}-client-libs = %{samba_depver} Requires: %{name}-common = %{samba_depver} Requires: %{name}-dc-libs = %{samba_depver} Requires: %{name}-dc = %{samba_depver} +Requires: %{name}-libs = %{samba_depver} Requires: bind Provides: bundled(libreplace) @@ -582,6 +588,9 @@ name server related details of Samba AD. Summary: Developer tools for Samba libraries Requires: %{name}-libs = %{samba_depver} Requires: %{name}-client-libs = %{samba_depver} +%if %{with dc} +Requires: %{name}-dc-libs = %{samba_depver} +%endif Provides: samba4-devel = %{samba_depver} Obsoletes: samba4-devel < %{samba_depver} @@ -596,6 +605,7 @@ libraries in the Samba suite. %package vfs-cephfs Summary: Samba VFS module for Ceph distributed storage system Requires: %{name} = %{samba_depver} +Requires: %{name}-client-libs = %{samba_depver} Requires: %{name}-libs = %{samba_depver} Provides: bundled(libreplace) @@ -732,6 +742,9 @@ Requires: %{name} = %{samba_depver} Requires: %{name}-client-libs = %{samba_depver} Requires: %{name}-common-libs = %{samba_depver} Requires: %{name}-libs = %{samba_depver} +%if %{with dc} +Requires: %{name}-dc-libs = %{samba_depver} +%endif Requires: python3-talloc Requires: python3-tevent Requires: python3-tdb @@ -770,6 +783,8 @@ If you want to run full set of Samba tests, you need to install this package. %if %{with dc} || %{with testsuite} %package -n python3-samba-dc Summary: Samba Python libraries for Samba AD +Requires: %{name}-client-libs = %{samba_depver} +Requires: %{name}-dc-libs = %{samba_depver} Requires: python3-%{name} = %{samba_depver} %description -n python3-samba-dc @@ -1023,6 +1038,7 @@ and use CTDB instead. Summary: CTDB PCP pmda support Requires: ctdb = %{samba_depver} Requires: pcp-libs +Requires: %{name}-client-libs = %{samba_depver} %description -n ctdb-pcp-pmda Performance Co-Pilot (PCP) support for CTDB @@ -4137,6 +4153,10 @@ fi %endif %changelog +* Mon Jun 13 2022 Pavel Filipenský - 4.16.2-100 +- Fix rpminspect abidiff +- related: rhbz#2077487 - Rebase Samba to 4.16.2 + * Mon May 02 2022 Pavel Filipenský - 4.16.1-100 - resolves: rhbz#2077487 - Rebase Samba to the the latest 4.16.x release diff --git a/sources b/sources index a8e876b..f77879f 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (samba-4.16.1.tar.asc) = 71895a0626dce7fe42f0370190dd4b5f7eb5ce0359bacfe779642c5915a6290d8d4f841f3c258a774829a03fa59be6353863494d2f0cf6bc7640a98af7e928e8 -SHA512 (samba-4.16.1.tar.xz) = a6c54d5f8796b353fce1467a81293491fd2a1c221eba1271a4ee0b9020ff5137d5dba68c8de5e65ab127ab908a403a0b59102def1f675f26f0322a2f7bc41c6f +SHA512 (samba-4.16.2.tar.asc) = bb22bb3da89bffdc213ed240204f8f801291db4ee0df73aa814e222355da5f774997a7a4f0a0685743a660bb4540e4b168dc2d3cd00bc22b9735caf140a3bfa0 +SHA512 (samba-4.16.2.tar.xz) = f29a49b119b55db063bf69a6df57fd29667bb3ee7a22f3af7ea9cafa88b05ce21cae11464de073c1f0c963e46b571c94a5ccaed3f364f851fe8a4b5d5064e794