diff --git a/samba-4.15.3+git.219.40cc1cd8591.tar.bz2 b/samba-4.15.3+git.219.40cc1cd8591.tar.bz2 deleted file mode 100644 index 3cab1f3..0000000 --- a/samba-4.15.3+git.219.40cc1cd8591.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:a37dfcb03e72db04b53ed9f322a1eee4bf3e56995d4d5310927953075d960513 -size 25614195 diff --git a/samba-4.15.4+git.224.dea2f6dc836.tar.bz2 b/samba-4.15.4+git.224.dea2f6dc836.tar.bz2 new file mode 100644 index 0000000..9d5edb0 --- /dev/null +++ b/samba-4.15.4+git.224.dea2f6dc836.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:2de5e513ff0564cdbf19cefb2a0d662af9afab72dc0754ea3358ebc956c437c0 +size 25627178 diff --git a/samba.changes b/samba.changes index 027a3ae..2b8fa75 100644 --- a/samba.changes +++ b/samba.changes @@ -1,3 +1,27 @@ +------------------------------------------------------------------- +Fri Jan 21 12:37:42 UTC 2022 - Samuel Cabrero + +- Update to 4.15.4 + * Duplicate SMB file_ids leading to Windows client cache + poisoning; (bso#14928); + * Failed to parse NTLMv2_RESPONSE length 95 - Buffer Size Error - + NT_STATUS_BUFFER_TOO_SMALL; (bso#14932); + * kill_tcp_connections does not work; (bso#14934); + * Can't connect to Windows shares not requiring authentication + using KDE/Gnome; (bso#14935); + * smbclient -L doesn't set "client max protocol" to NT1 before + calling the "Reconnecting with SMB1 for workgroup listing" + path; (bso#14939); + * Cross device copy of the crossrename module always fails; + (bso#14940); + * symlinkat function from VFS cap module always fails with an + error; (bso#14941); + * Fix possible fsp pointer deference; (bso#14942); + * Missing pop_sec_ctx() in error path inside close_directory(); + (bso#14944); + * "smbd --build-options" no longer works without an smb.conf file; + (bso#14945); + ------------------------------------------------------------------- Tue Jan 18 09:14:20 UTC 2022 - Dominique Leuenberger diff --git a/samba.spec b/samba.spec index ed6b159..3c548c6 100644 --- a/samba.spec +++ b/samba.spec @@ -141,6 +141,8 @@ BuildRequires: fdupes %endif %define pkgconfig_req pkg-config BuildRequires: %{pkgconfig_req} +%if 0%{?sle_version} != 120500 || 0%{?is_opensuse} +# Build with embedded libraries only in SLE 12 SP5, jsc#SLE-23330 BuildRequires: libldb-devel >= %{ldb_version} BuildRequires: libtalloc-devel >= %{talloc_version} BuildRequires: libtdb-devel >= %{tdb_version} @@ -149,6 +151,7 @@ BuildRequires: python3-ldb-devel >= %{ldb_version} BuildRequires: python3-talloc-devel BuildRequires: python3-tdb BuildRequires: python3-tevent +%endif # to generate the man pages BuildRequires: docbook-xsl-stylesheets BuildRequires: libxslt @@ -205,7 +208,7 @@ BuildRequires: liburing-devel %else %define build_make_smp_mflags %{?jobs:-j%jobs} %endif -Version: 4.15.3+git.219.40cc1cd8591 +Version: 4.15.4+git.224.dea2f6dc836 Release: 0 URL: https://www.samba.org/ Obsoletes: samba-32bit < %{version} @@ -724,6 +727,12 @@ bundled_libraries_extra="libarchive" %if ! 0%{?with_mscat} bundled_libraries_extra+=",libtasn1" %endif +%if 0%{?sle_version} == 120500 && !0%{?is_opensuse} +# Build with embedded libraries only in SLE 12 SP5, jsc#SLE-23330 +bundled_libraries_extra+=",talloc,pytalloc,tdb,pytdb,tevent,pytevent,ldb,pyldb" +bundled_libraries_extra+=",pytalloc-util.%{py3_soflags}" +bundled_libraries_extra+=",pyldb-util.%{py3_soflags}" +%endif CONFIGURE_OPTIONS="\ --prefix=%{_prefix} \ --localstatedir=%{_localstatedir} \ @@ -842,6 +851,44 @@ make %{?_smp_mflags} install \ CONFIGDIR=%{CONFIGDIR} %endif +%if 0%{?sle_version} == 120500 && !0%{?is_opensuse} +# Build with embedded libraries only in SLE 12 SP5, jsc#SLE-23330 +# Move the ldb and tdb tools to libdir to do not interfere with +# system-wide tools provided by libldb1 and libtdb1 system packages + +install -d -m 0755 %{buildroot}/%{_libdir}/samba/bin +mv %{buildroot}/%{_bindir}/ldbadd \ + %{buildroot}/%{_bindir}/ldbdel \ + %{buildroot}/%{_bindir}/ldbedit \ + %{buildroot}/%{_bindir}/ldbmodify \ + %{buildroot}/%{_bindir}/ldbrename \ + %{buildroot}/%{_bindir}/ldbsearch \ + %{buildroot}/%{_bindir}/tdbbackup \ + %{buildroot}/%{_bindir}/tdbdump \ + %{buildroot}/%{_bindir}/tdbrestore \ + %{buildroot}/%{_bindir}/tdbtool \ + %{buildroot}/%{_libdir}/samba/bin + +install -d -m 0755 %{buildroot}/%{_libdir}/samba/man/man1 +install -d -m 0755 %{buildroot}/%{_libdir}/samba/man/man3 +install -d -m 0755 %{buildroot}/%{_libdir}/samba/man/man8 +mv %{buildroot}/%{_mandir}/man1/ldbadd.1 \ + %{buildroot}/%{_mandir}/man1/ldbdel.1 \ + %{buildroot}/%{_mandir}/man1/ldbedit.1 \ + %{buildroot}/%{_mandir}/man1/ldbmodify.1 \ + %{buildroot}/%{_mandir}/man1/ldbrename.1 \ + %{buildroot}/%{_mandir}/man1/ldbsearch.1 \ + %{buildroot}/%{_libdir}/samba/man/man1/ +mv %{buildroot}/%{_mandir}/man3/ldb.3 \ + %{buildroot}/%{_mandir}/man3/talloc.3 \ + %{buildroot}/%{_libdir}/samba/man/man3/ +mv %{buildroot}/%{_mandir}/man8/tdbbackup.8 \ + %{buildroot}/%{_mandir}/man8/tdbdump.8 \ + %{buildroot}/%{_mandir}/man8/tdbrestore.8 \ + %{buildroot}/%{_mandir}/man8/tdbtool.8 \ + %{buildroot}/%{_libdir}/samba/man/man8/ +%endif + # debug symbols are created and installed if the files are excluded only %if ! %{with_dc} rm \ @@ -1521,6 +1568,36 @@ exit 0 %if %{with_mscat} %{_bindir}/dumpmscat %endif +%if 0%{?sle_version} == 120500 && !0%{?is_opensuse} +# Build with embedded libraries for SLE 12 SP5, jsc#SLE-23330 +%dir %{_libdir}/samba/bin/ +%{_libdir}/samba/bin/ldbadd +%{_libdir}/samba/bin/ldbdel +%{_libdir}/samba/bin/ldbedit +%{_libdir}/samba/bin/ldbmodify +%{_libdir}/samba/bin/ldbrename +%{_libdir}/samba/bin/ldbsearch +%{_libdir}/samba/bin/tdbbackup +%{_libdir}/samba/bin/tdbdump +%{_libdir}/samba/bin/tdbrestore +%{_libdir}/samba/bin/tdbtool +%dir %{_libdir}/samba/man +%dir %{_libdir}/samba/man/man1 +%{_libdir}/samba/man/man1/ldbadd.1* +%{_libdir}/samba/man/man1/ldbdel.1* +%{_libdir}/samba/man/man1/ldbedit.1* +%{_libdir}/samba/man/man1/ldbmodify.1* +%{_libdir}/samba/man/man1/ldbrename.1* +%{_libdir}/samba/man/man1/ldbsearch.1* +%dir %{_libdir}/samba/man/man3 +%{_libdir}/samba/man/man3/ldb.3* +%{_libdir}/samba/man/man3/talloc.3* +%dir %{_libdir}/samba/man/man8 +%{_libdir}/samba/man/man8/tdbbackup.8* +%{_libdir}/samba/man/man8/tdbdump.8* +%{_libdir}/samba/man/man8/tdbrestore.8* +%{_libdir}/samba/man/man8/tdbtool.8* +%endif %files devel %defattr(-,root,root) @@ -1747,6 +1824,27 @@ exit 0 %{_libdir}/samba/libutil-setid-samba4.so %{_libdir}/samba/libutil-tdb-samba4.so %{_libdir}/samba/libwinbind-client-samba4.so +%if 0%{?sle_version} == 120500 && !0%{?is_opensuse} +# Build with embedded libraries for SLE 12 SP5, jsc#SLE-23330 +%{_libdir}/samba/libtalloc.so.* +%{_libdir}/samba/libtdb.so.* +%{_libdir}/samba/libtevent.so.* +%{_libdir}/samba/libldb.so.* +%{_libdir}/samba/libldb-cmdline-samba4.so +%{_libdir}/samba/libldb-key-value-samba4.so +%{_libdir}/samba/libldb-tdb-err-map-samba4.so +%{_libdir}/samba/libldb-tdb-int-samba4.so +%{_libdir}/samba/ldb/asq.so +%{_libdir}/samba/ldb/ldb.so +%{_libdir}/samba/ldb/paged_searches.so +%{_libdir}/samba/ldb/rdn_name.so +%{_libdir}/samba/ldb/sample.so +%{_libdir}/samba/ldb/server_sort.so +%{_libdir}/samba/ldb/skel.so +%{_libdir}/samba/ldb/tdb.so +%{_libdir}/samba/libpyldb-util.%{py3_soflags_dash}.so.* +%{_libdir}/samba/libpytalloc-util.%{py3_soflags_dash}.so.* +%endif %if %{with_mscat} %{_libdir}/samba/libmscat-samba4.so %endif