diff --git a/.gitignore b/.gitignore index 0b30322..2a49fcd 100644 --- a/.gitignore +++ b/.gitignore @@ -341,3 +341,27 @@ samba-3.6.0pre1.tar.gz /samba-4.19.0rc1.tar.asc /samba-4.19.0rc2.tar.xz /samba-4.19.0rc2.tar.asc +/samba-4.19.0rc3.tar.xz +/samba-4.19.0rc3.tar.asc +/samba-4.19.0rc4.tar.xz +/samba-4.19.0rc4.tar.asc +/samba-4.19.0.tar.xz +/samba-4.19.0.tar.asc +/samba-4.19.1.tar.xz +/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-4.19.5.tar.xz +/samba-4.19.5.tar.asc +/samba-4.19.6.tar.xz +/samba-4.19.6.tar.asc +/samba-4.19.7.tar.xz +/samba-4.19.7.tar.asc +/samba-4.19.8.tar.xz +/samba-4.19.8.tar.asc +/samba-4.19.9.tar.xz +/samba-4.19.9.tar.asc diff --git a/samba-winbind-systemd-sysusers.conf b/samba-winbind-systemd-sysusers.conf new file mode 100644 index 0000000..7ccc216 --- /dev/null +++ b/samba-winbind-systemd-sysusers.conf @@ -0,0 +1,2 @@ +#Type Name ID +g wbpriv 88 diff --git a/samba.spec b/samba.spec index 65cd11d..5c81e39 100644 --- a/samba.spec +++ b/samba.spec @@ -135,12 +135,18 @@ %bcond_with etcd_mutex %endif +%if 0%{?fedora} || 0%{?rhel} >= 9 +%bcond_without gpupdate +%else +%bcond_with gpupdate +%endif + %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.0 -%global baserelease 3 +%global samba_version 4.19.9 +%global baserelease 1 # This should be rc1 or %%nil -%global pre_release rc2 +%global pre_release %nil %global samba_release %{baserelease} %if "x%{?pre_release}" != "x" @@ -174,7 +180,7 @@ %global talloc_version 2.4.1 %global tdb_version 1.4.9 %global tevent_version 0.15.0 -%global ldb_version 2.8.0 +%global ldb_version 2.8.2 %global required_mit_krb5 1.20.1 @@ -230,12 +236,11 @@ 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} @@ -330,9 +335,11 @@ BuildRequires: zlib-devel >= 1.2.3 BuildRequires: pkgconfig(libsystemd) +%ifnarch i686 %if 0%{?fedora} >= 37 BuildRequires: mold %endif +%endif %if %{with vfs_glusterfs} BuildRequires: glusterfs-api-devel >= 3.4.0.16 @@ -357,6 +364,10 @@ BuildRequires: librados-devel BuildRequires: python3-etcd %endif +%if %{with gpupdate} +BuildRequires: cepces-certmonger >= 0.3.8 +%endif + # pidl requirements BuildRequires: perl(ExtUtils::MakeMaker) BuildRequires: perl(FindBin) @@ -721,19 +732,21 @@ Samba VFS module for GlusterFS integration. %endif ### GPUPDATE -%if %{with dc} +%if %{with gpupdate} %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 (GPO) on Samba clients. -# /with dc +#endif with gpupdate %endif ### KRB5-PRINTING @@ -1261,12 +1274,16 @@ rm -f lib/crypto/{aes,rijndael}*.c # TODO: resolve underlinked python modules export python_LDFLAGS="$(echo %{__global_ldflags} | sed -e 's/-Wl,-z,defs//g')" -# Use the mold linker +# Use the mold linker if possible +export python_LDFLAGS="$(echo %{__global_ldflags} | sed -e 's/-Wl,-z,defs//g')" + +%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')" -%else -export python_LDFLAGS="$(echo %{__global_ldflags} | sed -e 's/-Wl,-z,defs//g')" +#endif fedora >= 37 +%endif +#endif narch i686 %endif # Add support for mock ccache plugin @@ -1397,6 +1414,7 @@ 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 @@ -1424,14 +1442,17 @@ touch %{buildroot}%{_libdir}/krb5/plugins/libkrb5/winbind_krb5_locator.so for i in \ %{_mandir}/man8/samba.8 \ %{_mandir}/man8/samba_downgrade_db.8 \ - %{_mandir}/man8/samba-gpupdate.8 \ %{_unitdir}/samba.service \ - %{_sbindir}/samba-gpupdate \ ; do rm -f %{buildroot}$i done %endif +%if %{without gpupdate} +rm -f %{buildroot}%{_sbindir}/samba-gpupdate +rm -f %{buildroot}%{_mandir}/man8/samba-gpupdate.8* +%endif + %if %{without vfs_glusterfs} rm -f %{buildroot}%{_mandir}/man8/vfs_glusterfs.8* %endif @@ -1508,11 +1529,8 @@ export WINBINDD_DONT_LOG_STDOUT=1 %systemd_postun_with_restart nmb.service %pre common -%if 0%{?fedora} || 0%{?rhel} > 8 +# This creates the group 'printadmin' %sysusers_create_compat %{SOURCE16} -%else -getent group printadmin >/dev/null || groupadd -r printadmin || : -%endif %post common %{?ldconfig} @@ -1571,9 +1589,9 @@ fi %if %{with libwbclient} %pre -n libwbclient if [ $1 -gt 1 ] ; then - rm -rf %{_libdir}/samba/wbclient/ - rm -f /etc/alternatives/libwbclient.so* - rm -f /var/lib/alternatives/libwbclient.so* + rm -rf %{_libdir}/samba/wbclient/ 2>/dev/null + rm -f /etc/alternatives/libwbclient.so* 2>/dev/null + rm -f /var/lib/alternatives/libwbclient.so* 2>/dev/null fi %{?ldconfig} #endif {with libwbclient} @@ -1582,14 +1600,12 @@ fi %ldconfig_scriptlets test %pre usershares -%if 0%{?fedora} || 0%{?rhel} > 8 +# This creates the group 'usershares' %sysusers_create_compat %{SOURCE17} -%else -getent group usershares >/dev/null || groupadd -r usershares || : -%endif %pre winbind -/usr/sbin/groupadd -g 88 wbpriv >/dev/null 2>&1 || : +# This creates the group 'wbpriv' +%sysusers_create_compat %{SOURCE18} %post winbind %systemd_post winbind.service @@ -2032,7 +2048,9 @@ fi %{_libexecdir}/samba/rpcd_fsrvp %{_libexecdir}/samba/rpcd_lsad %{_libexecdir}/samba/rpcd_mdssvc +%if %{with testsuite} %{_libexecdir}/samba/rpcd_rpcecho +%endif %{_libexecdir}/samba/rpcd_spoolss %{_libexecdir}/samba/rpcd_winreg %{_mandir}/man8/samba-dcerpcd.8* @@ -2325,10 +2343,11 @@ fi %endif ### GPUPDATE -%if %{with dc} +%if %{with gpupdate} %files gpupdate %{_mandir}/man8/samba-gpupdate.8* %{_sbindir}/samba-gpupdate +#endif with gpupdate %endif ### KRB5-PRINTING @@ -3043,7 +3062,10 @@ fi %{python3_sitearch}/samba/tests/blackbox/__pycache__/bug13653.*.pyc %{python3_sitearch}/samba/tests/blackbox/__pycache__/check_output.*.pyc %{python3_sitearch}/samba/tests/blackbox/__pycache__/downgradedatabase.*.pyc +%{python3_sitearch}/samba/tests/blackbox/__pycache__/http_chunk.*.pyc +%{python3_sitearch}/samba/tests/blackbox/__pycache__/http_content.*.pyc %{python3_sitearch}/samba/tests/blackbox/__pycache__/mdsearch.*.pyc +%{python3_sitearch}/samba/tests/blackbox/__pycache__/misc_dfs_widelink.*.pyc %{python3_sitearch}/samba/tests/blackbox/__pycache__/ndrdump.*.pyc %{python3_sitearch}/samba/tests/blackbox/__pycache__/netads_dns.*.pyc %{python3_sitearch}/samba/tests/blackbox/__pycache__/netads_json.*.pyc @@ -3060,7 +3082,10 @@ fi %{python3_sitearch}/samba/tests/blackbox/bug13653.py %{python3_sitearch}/samba/tests/blackbox/check_output.py %{python3_sitearch}/samba/tests/blackbox/downgradedatabase.py +%{python3_sitearch}/samba/tests/blackbox/http_chunk.py +%{python3_sitearch}/samba/tests/blackbox/http_content.py %{python3_sitearch}/samba/tests/blackbox/mdsearch.py +%{python3_sitearch}/samba/tests/blackbox/misc_dfs_widelink.py %{python3_sitearch}/samba/tests/blackbox/ndrdump.py %{python3_sitearch}/samba/tests/blackbox/netads_dns.py %{python3_sitearch}/samba/tests/blackbox/netads_json.py @@ -3462,6 +3487,7 @@ 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 @@ -4450,6 +4476,53 @@ fi %endif %changelog +* Thu Oct 17 2024 Guenther Deschner - 4.19.9-1 +- Update to version 4.19.9 + +* Thu Aug 15 2024 Guenther Deschner - 4.19.8-1 +- Update to version 4.19.8 + +* Tue Jun 11 2024 Guenther Deschner - 4.19.7-1 +- Update to version 4.19.7 + +* Mon Apr 08 2024 Guenther Deschner - 4.19.6-1 +- Update to version 4.19.6 + +* Mon Feb 19 2024 Guenther Deschner - 4.19.5-1 +- Update to version 4.19.5 + +* Tue Jan 16 2024 Andreas Schneider - 4.19.4-3 +- Fix samba-gpupdate on Fedora/RHEL + +* Tue Jan 09 2024 Andreas Schneider - 4.19.4-2 +- resolves: rhbz#2256326 - Create all groups using systemd + +* Mon Jan 08 2024 Guenther Deschner - 4.19.4-1 +- resolves: #2257287 - Update to version 4.19.4 + +* Mon Nov 27 2023 Guenther Deschner - 4.19.3-1 +- resolves: #2251766 - Update to version 4.19.3 + +* Mon Oct 16 2023 Guenther Deschner - 4.19.2-1 +- resolves: #2244496 - Update to version 4.19.2 + +* Tue Oct 10 2023 Guenther Deschner - 4.19.1-1 +- resolves: #2243073 - Update to version 4.19.1 +- resolves: #2241881, #2243228: Security fix for CVE-2023-3961 +- resolves: #2241882, #2243231: Security fix for CVE-2023-4091 +- resolves: #2241883, #2243230: Security fix for CVE-2023-4154 +- resolves: #2241884, #2243229: Security fix for CVE-2023-42669 +- resolves: #2241885, #2243232: Security fix for CVE-2023-42670 + +* Mon Sep 04 2023 Guenther Deschner - 4.19.0-1 +- resolves: #2237259 - Update to version 4.19.0 + +* Mon Aug 28 2023 Guenther Deschner - 4.19.0-0.5.rc4 +- resolves: #2232744 - Update to version 4.19.0rc4 + +* Fri Aug 18 2023 Guenther Deschner - 4.19.0-0.4.rc3 +- resolves: #2232744 - Update to version 4.19.0rc3 + * Wed Aug 16 2023 Yaakov Selkowitz - 2:4.19.0-0.3.rc2 - Move ad-claims and authn-policy-util to dc-libs diff --git a/sources b/sources index 66da186..3f3064d 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (samba-4.19.0rc2.tar.xz) = ef521a17a8d407432fe5b74fbbdeb6f61ade04488378591741603935154f975ea7f5ccdbfe11a6dc3a05f3e5e1d767d0cf7c9a82cfb6252d145845f7110ecca7 -SHA512 (samba-4.19.0rc2.tar.asc) = e8b2f909da5aefa65c03a02295638168adc9182d7ab930805ca83f03a3c5f5800c2ee7b4a66c3d1cee09fec3e78eb6df634e64ee945fb4b018780b19e3239170 +SHA512 (samba-4.19.9.tar.xz) = 63612f80d70f67ffa42e43108103a1747b83858be01e6d4ed24a6d1bfcf7ec2f9e739b16d32c5205fec2ffbca845df6e6597c5d99d8f2683d6c5f3ef4c807532 +SHA512 (samba-4.19.9.tar.asc) = fdbc8573a543ec3b9e7eaac4346e95c1410efdc3274ae5d8f3b6d8e8c2c07fa5d14c55713b057163adae26a3bf9c5092928455a59364eec2024b6876ba5df281