Accepting request 1006436 from home:npower:update_samba

- Disable SMB1 for tumbleweed builds. - Update to 4.17.0 * acl_xattr VFS module may unintentionally use filesystem permissions instead of ACL from xattr; (bso#15126). * Missing SMB2-GETINFO access checks from MS-SMB2 3.3.5.20.1; (bso#15153). * assert failed: !is_named_stream(smb_fname)") at ../../lib/util/fault.c:197; (bso#15161). * acl_xattr VFS module may unintentionally use filesystem permissions instead of ACL from xattr; (bso#15126). * assert failed: !is_named_stream(smb_fname)") at ../../lib/util/fault.c:197; (bso#15161). * Cross-node multi-channel reconnects result in SMB2 Negotiate returning NT_STATUS_NOT_SUPPORTED; (bso#15159). * winbind at info level debug can coredump when processing wb_lookupusergroups; (bso#15160). * Make use of glfs_*at() API calls in vfs_glusterfs; (bso#15157). * Possible use after free of connection_struct when iterating smbd_server_connection->connections; (bso#15128). * `net usershare add` fails with flag works with --long but fails with -l; (bso#15145). * acl_xattr VFS module may unintentionally use filesystem permissions instead of ACL from xattr; (bso#15126). * Performance regression on contended path based operations; (bso#15125). * Missing READ_LEASE break could cause data corruption; (bso#15148). * libsamba-errors uses a wrong version number; (bso#15141). OBS-URL: https://build.opensuse.org/request/show/1006436 OBS-URL: https://build.opensuse.org/package/show/network:samba:STABLE/samba?expand=0&rev=667
2022-09-29 14:50:35 +00:00 · 2022-09-29 14:50:35 +00:00 · e8347df805
commit e8347df805
parent 8e8c7e7ee5
6 changed files with 105 additions and 12 deletions
--- a/2
+++ b/2
@ -2,7 +2,7 @@
        <service name="tar_scm" mode="disabled">
                <param name="url">https://gitlab.suse.de/samba/suse-samba.git/</param>
                <param name="scm">git</param>
-                <param name="revision">factory-4-16-stable</param>
+                <param name="revision">factory-4-17-stable</param>
                <param name="versionformat">@PARENT_TAG@+git.@TAG_OFFSET@.%h</param>
                <param name="versionrewrite-pattern">samba-(.*)</param>
                <param name="versionrewrite-replacement">\1</param>
--- a/samba-4.16.4+git.297.1497eb221ed.tar.bz2
+++ b/samba-4.16.4+git.297.1497eb221ed.tar.bz2
@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:864cc492fd79a360f09a53b4f99951f2bc54cbdc40d0ace217ec87fbdd1a6c2b
-size 34022530
--- a/samba-4.17.0+git.255.cbd95157a4b.tar.bz2
+++ b/samba-4.17.0+git.255.cbd95157a4b.tar.bz2
@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:b615e433a61b58a5240f2a24ce2db13c4faca19556e3b4348ac91a78d2b8502c
+size 34220695
--- a/samba-4.17.0+git.257.5f0ed03584a.tar.bz2
+++ b/samba-4.17.0+git.257.5f0ed03584a.tar.bz2
@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:fb8a6b3b72951b53c43fb4d6a62b9a27254ec615c83132b08bcdd926aa1271a2
+size 34219401
--- a/samba.changes
+++ b/samba.changes
@ -1,3 +1,65 @@
+-------------------------------------------------------------------
+Mon Sep 26 09:38:59 UTC 2022 - Noel Power <nopower@suse.com>
+
+- Disable SMB1 for tumbleweed builds.
+
+-------------------------------------------------------------------
+Fri Sep 23 16:22:12 UTC 2022 - Noel Power <nopower@suse.com>
+
+- Update to 4.17.0
+  * acl_xattr VFS module may unintentionally use filesystem
+    permissions instead of ACL from xattr; (bso#15126).
+  * Missing SMB2-GETINFO access checks from MS-SMB2 3.3.5.20.1;
+    (bso#15153).
+  * assert failed: !is_named_stream(smb_fname)") at
+    ../../lib/util/fault.c:197; (bso#15161).
+  * acl_xattr VFS module may unintentionally use filesystem
+    permissions instead of ACL from xattr; (bso#15126).
+  * assert failed: !is_named_stream(smb_fname)") at
+    ../../lib/util/fault.c:197; (bso#15161).
+  * Cross-node multi-channel reconnects result in SMB2 Negotiate
+    returning NT_STATUS_NOT_SUPPORTED; (bso#15159).
+  * winbind at info level debug can coredump when processing
+    wb_lookupusergroups; (bso#15160).
+  * Make use of glfs_*at() API calls in vfs_glusterfs;
+    (bso#15157).
+  * Possible use after free of connection_struct when iterating
+    smbd_server_connection->connections; (bso#15128).
+  * `net usershare add` fails with flag works with --long but
+    fails with -l; (bso#15145).
+  * acl_xattr VFS module may unintentionally use filesystem
+    permissions instead of ACL from xattr; (bso#15126).
+  * Performance regression on contended path based operations;
+    (bso#15125).
+  * Missing READ_LEASE break could cause data corruption;
+    (bso#15148).
+  * libsamba-errors uses a wrong version number; (bso#15141).
+  * SMB1 negotiation can fail to handle connection errors;
+    (bso#15152).
+  * New filename parser doesn't check veto files smb.conf
+    parameter; (bso#15143).
+  * 4.17.rc1 still uses symlink-race prone unix_convert();
+    (bso#15144).
+  * Backport fileserver related changed to 4.17.0rc2;
+    (bso#15146).
+  * Manpage for smbstatus json is missing; (bso#15147).
+  * Backport fileserver related changed to 4.17.0rc2;
+    (bso#15146).
+  * Performance regression on contended path based operations;
+    (bso#15125).
+  * Backport fileserver related changed to 4.17.0rc2;
+    (bso#15146).
+  * Fix issues found by coverity in smbstatus json code;
+    (bso#15140).
+  * Backport fileserver related changed to 4.17.0rc2;
+    (bso#15146).
+
+-------------------------------------------------------------------
+Thu Sep  1 06:07:15 UTC 2022 - Stefan Schubert <schubi@suse.com>
+
+- Migration to /usr/etc: Saving user changed configuration files
+  in /etc and restoring them while an RPM update.
+
 -------------------------------------------------------------------
 Thu Jul 28 11:56:31 UTC 2022 - Samuel Cabrero <scabrero@suse.de>

--- a/samba.spec
+++ b/samba.spec
@ -32,10 +32,10 @@
 %define build_ceph 1
 %endif

-%define talloc_version 2.3.3
-%define tevent_version 0.11.0
-%define tdb_version    1.4.6
-%define ldb_version    2.5.0
+%define talloc_version 2.3.4
+%define tevent_version 0.13.0
+%define tdb_version    1.4.7
+%define ldb_version    2.6.1

 # This table represents the possible combinations of build macros.
 # They are defined only if not already defined in the build service
@ -145,7 +145,7 @@ BuildRequires:  liburing-devel
 %endif
 BuildRequires:  sysuser-tools

-Version:        4.16.4+git.297.1497eb221ed
+Version:        4.17.0+git.257.5f0ed03584a
 Release:        0
 URL:            https://www.samba.org/
 Obsoletes:      samba-32bit < %{version}
@ -681,6 +681,9 @@ CONFIGURE_OPTIONS="\
 %endif
 	--bundled-libraries=NONE,socket_wrapper,cmocka,${bundled_libraries_extra} \
 	--without-fam \
+%if 0%{?suse_version} > 1500
+	--without-smb1-server \
+%endif
 "

 ./configure ${CONFIGURE_OPTIONS}
@ -743,7 +746,6 @@ rm \

 # CTDB
 install -m 0644 packaging/SuSE/config/sysconfig.ctdb %{buildroot}/%{_fillupdir}
-install -m 0755 ctdb/config/ctdb.service %{buildroot}%{_unitdir}/ctdb.service
 ln -s service %{buildroot}/%{_sbindir}/rcctdb
 # create tmpfile conf
 install -d -m 0755 %{buildroot}/%{_tmpfilesdir}
@ -925,6 +927,20 @@ install -m 0644 examples/LDAP/samba-nds.schema %{buildroot}/%{_datadir}/samba/LD

 %pre -f samba.pre
 %service_add_pre nmb.service smb.service
+%if 0%{?suse_version} > 1500
+# Prepare for migration to /usr/etc; save any old .rpmsave
+for i in logrotate.d/samba ; do
+   test -f %{_sysconfdir}/${i}.rpmsave && mv -v %{_sysconfdir}/${i}.rpmsave %{_sysconfdir}/${i}.rpmsave.old ||:
+done
+%endif
+
+%if 0%{?suse_version} > 1500
+%posttrans
+# Migration to /usr/etc, restore just created .rpmsave
+for i in logrotate.d/samba ; do
+   test -f %{_sysconfdir}/${i}.rpmsave && mv -v %{_sysconfdir}/${i}.rpmsave %{_sysconfdir}/${i} ||:
+done
+%endif

 %if %{with_dc}
 %pre ad-dc
@ -1017,6 +1033,20 @@ ln -sf %{_libdir}/samba/ldb %{_libdir}/ldb2/modules/ldb/samba

 %pre winbind -f winbind.pre
 %service_add_pre winbind.service
+%if 0%{?suse_version} > 1500
+# Prepare for migration to /usr/etc; save any old .rpmsave
+for i in logrotate.d/samba-winbind ; do
+   test -f %{_sysconfdir}/${i}.rpmsave && mv -v %{_sysconfdir}/${i}.rpmsave %{_sysconfdir}/${i}.rpmsave.old ||:
+done
+%endif
+
+%if 0%{?suse_version} > 1500
+%posttrans winbind
+# Migration to /usr/etc, restore just created .rpmsave
+for i in logrotate.d/samba-winbind ; do
+   test -f %{_sysconfdir}/${i}.rpmsave && mv -v %{_sysconfdir}/${i}.rpmsave %{_sysconfdir}/${i} ||:
+done
+%endif

 %post winbind
 /sbin/ldconfig
@ -1633,7 +1663,6 @@ exit 0
 %config %{_sysconfdir}/ctdb/nfs-checks.d/50.rquotad.check
 %{_sysconfdir}/ctdb/nfs-checks.d/README
 %{_sbindir}/ctdbd
-%{_sbindir}/ctdbd_wrapper
 %{_sbindir}/rcctdb
 %{_bindir}/ctdb
 %{_bindir}/ctdb_diagnostics
@ -1661,7 +1690,6 @@ exit 0
 %ghost %dir /run/ctdb
 %{_mandir}/man1/ctdb.1.gz
 %{_mandir}/man1/ctdbd.1.gz
-%{_mandir}/man1/ctdbd_wrapper.1.gz
 %{_mandir}/man1/ctdb_diagnostics.1.gz
 %{_mandir}/man1/ltdbtool.1.gz
 %{_mandir}/man1/onnode.1.gz