diff --git a/samba.spec b/samba.spec index a5e8ad52f5bdf2be22d72034adfbe9a2ae3fc830..4f75dac71925677a03361a34ca136e5f1ade05c5 100644 --- a/samba.spec +++ b/samba.spec @@ -48,7 +48,7 @@ Name: samba Version: 4.17.5 -Release: 3 +Release: 4 Summary: A suite for Linux to interoperate with Windows License: GPLv3+ and LGPLv3+ @@ -158,7 +158,7 @@ BuildRequires: krb5-server >= %{required_mit_krb5} bind Requires: systemd shadow-utils pam %{name}-common = %{samba_depver} Requires: %{name}-common = %{samba_depver} %{name}-common-tools = %{samba_depver} -Requires: %{name}-client = %{samba_depver} +Requires: %{name}-client-libs = %{samba_depver} %if %with_libwbclient Requires: libwbclient = %{samba_depver} %endif @@ -188,7 +188,8 @@ Librariesfor%{name}. %package client Summary: Client package for %{name} Requires: %{name}-common = %{samba_depver} -Requires: chkconfig krb5-libs >= %{required_mit_krb5} +Requires: %{name}-client-libs = %{samba_depver} +Requires: chkconfig %if %with_libsmbclient Requires: libsmbclient = %{samba_depver} %endif @@ -196,13 +197,24 @@ Requires: libsmbclient = %{samba_depver} Requires: libwbclient = %{samba_depver} %endif -Provides: samba4-client = %{samba_depver} %{name}-client-libs -Obsoletes: samba4-client < %{samba_depver} %{name}-client-libs +Provides: samba4-client = %{samba_depver} +Obsoletes: samba4-client < %{samba_depver} Obsoletes: python2-samba %description client This package includes some files about SMB/CIFS clients to complement the SMB/CIFS clients. +%package client-libs +Summary: Samba client libraries +Requires: %{name}-common = %{samba_depver} +%if %with_libwbclient +Requires: libwbclient = %{samba_depver} +%endif +Requires: krb5-libs >= %{required_mit_krb5} + +%description client-libs +The samba-client-libs package contains internal libraries needed by the SMB/CIFS clients. + %package common Summary: Common package for %{name} client and server Requires: systemd @@ -215,7 +227,7 @@ Obsoletes: samba-dc-bind-dlz < %{samba_depver} %endif Requires: libldb >= %{ldb_version} -Requires: %{name}-client = %{samba_depver} +Requires: %{name}-client-libs = %{samba_depver} %if %with_libwbclient Requires: libwbclient = %{samba_depver} %endif @@ -238,7 +250,7 @@ Obsoletes: ctdb-tests < %{samba_depver} %package common-tools Summary: Tools package for %{name} -Requires: %{name}-common = %{samba_depver} %{name}-client = %{samba_depver} +Requires: %{name}-common = %{samba_depver} %{name}-client-libs = %{samba_depver} Requires: %{name}-libs = %{samba_depver} %if %with_libwbclient Requires: libwbclient = %{samba_depver} @@ -253,12 +265,14 @@ Summary: Domain Controller package for %{name} Requires: %{name} = %{samba_depver} %{name}-winbind = %{samba_depver} Requires: %{name}-common = %{samba_depver} tdb-tools Requires: %{name}-libs = %{samba_depver} +Requires: %{name}-dc-provision = %{samba_depver} +Requires: %{name}-dc-libs = %{samba_depver} Requires: lmdb ldb-tools %samba_requires_eq libldb -Provides: samba4-dc = %{samba_depver} %{name}-dc-libs samba4-dc-libs = %{samba_depver} -Obsoletes: samba4-dc < %{samba_depver} %{name}-dc-libs samba4-dc-libs < %{samba_depver} +Provides: samba4-dc = %{samba_depver} +Obsoletes: samba4-dc < %{samba_depver} %description dc The samba-dc package provides AD Domain Controller functionality, including some @@ -271,6 +285,18 @@ Summary: Samba AD files to provision a DC %description dc-provision The samba-dc-provision package provides files to setup a domain controller +%package dc-libs +Summary: Samba AD Domain Controller Libraries +Requires: %{name}-client-libs = %{samba_depver} +Requires: %{name}-common = %{samba_depver} +Requires: %{name}-libs = %{samba_depver} + +Provides: samba4-dc-libs = %{samba_depver} +Obsoletes: samba4-dc-libs < %{samba_depver} + +%description dc-libs +The %{name}-dc-libs package contains the libraries needed by the DC to +link against the SMB, RPC and other protocols. %package dc-bind-dlz Summary: Bind DLZ module for Samba AD @@ -311,7 +337,7 @@ This is the samba VFS module for Ceph distributed storage system integration. Summary: Samba VFS module for GlusterFS Requires: glusterfs-api >= 3.4.0.16 glusterfs >= 3.4.0.16 Requires: %{name} = %{samba_depver} %{name}-libs = %{samba_depver} -Requires: %{name}-common = %{samba_depver} %{name}-client = %{samba_depver} +Requires: %{name}-common = %{samba_depver} %{name}-client-libs = %{samba_depver} %if %with_libwbclient Requires: libwbclient = %{samba_depver} @@ -326,7 +352,8 @@ Samba VFS module for GlusterFS integration. %package krb5-printing Summary: The samba CUPS backend package for printing with Kerberos -Requires: %{name}-client = %{samba_depver} +Requires: %{name}-client = %{samba_depver} +Requires: %{name}-client-libs = %{samba_depver} %description krb5-printing This package will allow cups to access the Kerberos credentials cache @@ -336,7 +363,7 @@ of the user issuing the print job. %if %with_libsmbclient %package -n libsmbclient Summary: The SMB client library -Requires: %{name}-common = %{samba_depver} %{name}-client = %{samba_depver} +Requires: %{name}-common = %{samba_depver} %{name}-client-libs = %{samba_depver} %if %with_libwbclient Requires: libwbclient = %{samba_depver} %endif @@ -357,7 +384,7 @@ This package provides developer tools for the wbclient library. %if %with_libwbclient %package -n libwbclient Summary: The winbind client library for %{name} -Requires: %{name}-client = %{samba_depver} +Requires: %{name}-client-libs = %{samba_depver} %description -n libwbclient This package contains the winbind client library from the Samba. @@ -376,7 +403,7 @@ This package provides developer tools for the wbclient library. ### PYTHON3 %package -n python3-%{name} Summary: Python3 library package for %{name} -Requires: %{name}-client = %{samba_depver} %{name}-common = %{samba_depver} +Requires: %{name}-client-libs = %{samba_depver} %{name}-common = %{samba_depver} Requires: python3-talloc python3-tevent python3-tdb python3-ldb python3-dns Requires: %{name}-libs = %{samba_depver} Obsoletes: python2-samba @@ -399,7 +426,7 @@ that use SMB, RPC and other Samba provided protocols in Python 3 programs. Summary: Test package for python3 binding for %{name} Requires: python3-%{name} = %{samba_depver} -Requires: %{name}-client = %{samba_depver} +Requires: %{name}-client-libs = %{samba_depver} Requires: %{name}-libs = %{samba_depver} %description -n python3-samba-test @@ -433,9 +460,9 @@ and Wireshark to parse IDL and similar protocols. %package test Summary: Testing tools and libraries for Samba servers and clients Requires: %{name} = %{samba_depver} %{name}-common = %{samba_depver} %{name}-winbind = %{samba_depver} -Requires: %{name}-client = %{samba_depver} %{name}-libs = %{samba_depver} +Requires: %{name}-client-libs = %{samba_depver} %{name}-libs = %{samba_depver} %if %with_dc -Requires: %{name}-dc = %{samba_depver} +Requires: %{name}-dc-libs = %{samba_depver} %endif %if %with_libsmbclient Requires: libsmbclient = %{samba_depver} @@ -467,7 +494,7 @@ as a user using the `net usershare` command. %package winbind Summary: The winbind package for %{name} Requires: %{name}-common = %{samba_depver} %{name}-common-tools = %{samba_depver} -Requires: %{name}-client = %{samba_depver} %{name}-winbind-modules = %{samba_depver} +Requires: %{name}-client-libs = %{samba_depver} %{name}-winbind-modules = %{samba_depver} Requires: libwbclient = %{samba_depver} %{name}-libs = %{samba_depver} Provides: samba4-winbind = %{samba_depver} Obsoletes: samba4-winbind < %{samba_depver} @@ -482,7 +509,7 @@ Windows user and group accounts on Linux. %package winbind-clients Summary: The winbind client package for %{name} -Requires: %{name}-common = %{samba_depver} %{name}-client = %{samba_depver} +Requires: %{name}-common = %{samba_depver} %{name}-client-libs = %{samba_depver} Requires: %{name}-libs = %{samba_depver} %{name}-winbind = %{samba_depver} %if %with_libwbclient Requires: libwbclient = %{samba_depver} @@ -501,7 +528,7 @@ Requires: libwbclient = %{samba_depver} %{name}-winbind = %{samba_depver} %else Requires: %{name}-libs = %{samba_depver} %endif -Requires: samba-client = %{samba_depver} +Requires: samba-client-libs = %{samba_depver} Provides: samba4-winbind-krb5-locator = %{samba_depver} Obsoletes: samba4-winbind-krb5-locator < %{samba_depver} @@ -512,7 +539,7 @@ the local kerberos library to use the same KDC as samba and winbind use %package winbind-modules Summary: The winbind modules for %{name} -Requires: %{name}-client = %{samba_depver} %{name}-libs = %{samba_depver} pam +Requires: %{name}-client-libs = %{samba_depver} %{name}-libs = %{samba_depver} pam %if %with_libwbclient Requires: libwbclient = %{samba_depver} %endif @@ -535,7 +562,7 @@ Winexe is a Remote Windows®-command executor %package -n ctdb Summary: A Clustered Database package based on Samba's Trivial Database (TDB) Requires: %{name}-winbind-clients = %{samba_depver} -Requires: %{name}-common = %{samba_depver} %{name}-client = %{samba_depver} coreutils psmisc +Requires: %{name}-common = %{samba_depver} %{name}-client-libs = %{samba_depver} coreutils psmisc Requires: sed tdb-tools gawk procps-ng net-tools ethtool iproute iptables util-linux systemd-units %description -n ctdb @@ -549,7 +576,7 @@ and use CTDB instead. %package -n ctdb-tests Summary: The test package fors CTDB clustered database Requires: %{name}-common = %{samba_depver} -Requires: %{name}-client = %{samba_depver} +Requires: %{name}-client-libs = %{samba_depver} Requires: ctdb = %{samba_depver} Recommends: nc @@ -992,9 +1019,11 @@ if [ $1 -eq 0 ] ; then fi %endif +%ldconfig_scriptlets client-libs + %if %{with_dc} %ldconfig_scriptlets -n python3-samba-dc -%ldconfig_scriptlets dc-provision +%ldconfig_scriptlets dc-libs %ldconfig_scriptlets dc-bind-dlz %post dc @@ -1239,7 +1268,6 @@ fi %{_libdir}/libdcerpc-server-core.so.* %{_libdir}/samba/libLIBWBCLIENT-OLD-samba4.so -%{_libdir}/samba/libauth4-samba4.so %{_libdir}/samba/libauth-unix-token-samba4.so %{_libdir}/samba/libdcerpc-samba4.so %{_libdir}/samba/libdnsserver-common-samba4.so @@ -1279,8 +1307,9 @@ fi %dir %{_libexecdir}/samba %ghost %{_libexecdir}/samba/cups_backend_smb %endif +%config(noreplace) /etc/ld.so.conf.d/* - +%files client-libs %{_libdir}/libdcerpc-binding.so.* %{_libdir}/libndr.so.* %{_libdir}/libndr-krb5pac.so.* @@ -1441,7 +1470,6 @@ fi %{_libdir}/krb5/plugins/kdb/samba.so %{_libdir}/samba/auth/samba4.so -%{_libdir}/samba/libpac-samba4.so %dir %{_libdir}/samba/gensec %{_libdir}/samba/gensec/krb5.so %{_libdir}/samba/ldb/acl.so @@ -1498,8 +1526,14 @@ fi %files dc-provision %license source4/setup/ad-schema/licence.txt %{_datadir}/samba/setup +#endif with_dc +%endif +%files dc-libs +%{_libdir}/samba/libauth4-samba4.so +%if %{with dc} %{_libdir}/samba/libdb-glue-samba4.so +%{_libdir}/samba/libpac-samba4.so %{_libdir}/samba/libprocess-model-samba4.so %{_libdir}/samba/libservice-samba4.so %dir %{_libdir}/samba/process_model @@ -3521,6 +3555,12 @@ fi %endif %changelog +* Tue Apr 11 2023 yanglu - 4.17.5-4 +- Type:bugfix +- ID:NA +- SUG:NA +- DESC:split samba-client-libs and samba-dc-libs + * Thu Apr 06 2023 xinghe - 4.17.5-3 - Type:cves - ID:CVE-2023-0225 CVE-2023-0614 CVE-2023-0922