From 77e7f5e1acc46cec7ad4916c8588e8d19edf7b12bf478056dc4b04e6cc98d716 Mon Sep 17 00:00:00 2001 From: David Disseldorp Date: Tue, 14 May 2019 23:56:57 +0000 Subject: [PATCH 1/2] - Fix cephwrap_flistxattr() debug message; (bso#13940); (bsc#1134697). - Add ceph_snapshots VFS module; (jsc#SES-183). - Fix vfs_ceph realpath; (bso#13918); (bsc#1134452). - Explicitly enable libcephfs POSIX ACL support; (bso#13896); (bsc#1130245). OBS-URL: https://build.opensuse.org/package/show/network:samba:STABLE/samba?expand=0&rev=616 --- samba-4.10.2+git.78.0c89af72312.tar.bz2 | 3 --- samba-4.10.2+git.92.9c4903ace94.tar.bz2 | 3 +++ samba.changes | 16 ++++++++++++++++ samba.spec | 17 +++++++++++++---- 4 files changed, 32 insertions(+), 7 deletions(-) delete mode 100644 samba-4.10.2+git.78.0c89af72312.tar.bz2 create mode 100644 samba-4.10.2+git.92.9c4903ace94.tar.bz2 diff --git a/samba-4.10.2+git.78.0c89af72312.tar.bz2 b/samba-4.10.2+git.78.0c89af72312.tar.bz2 deleted file mode 100644 index 10dc84b..0000000 --- a/samba-4.10.2+git.78.0c89af72312.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:2e389527a89ab02245ea40f32b18db7539a6a1a0e6b1f1cf167303f34fbae4f9 -size 24772325 diff --git a/samba-4.10.2+git.92.9c4903ace94.tar.bz2 b/samba-4.10.2+git.92.9c4903ace94.tar.bz2 new file mode 100644 index 0000000..c96e88b --- /dev/null +++ b/samba-4.10.2+git.92.9c4903ace94.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:1b778916a07370aea65c1190b422b3b1657e6895cbfbc3bfda8d8a65798f6084 +size 24796725 diff --git a/samba.changes b/samba.changes index ff99dff..ea8565e 100644 --- a/samba.changes +++ b/samba.changes @@ -1,3 +1,14 @@ +------------------------------------------------------------------- +Tue May 14 14:22:11 UTC 2019 - David Disseldorp + +- Fix cephwrap_flistxattr() debug message; (bso#13940); (bsc#1134697). +- Add ceph_snapshots VFS module; (jsc#SES-183). + +------------------------------------------------------------------- +Wed May 8 12:42:31 UTC 2019 - David Disseldorp + +- Fix vfs_ceph realpath; (bso#13918); (bsc#1134452). + ------------------------------------------------------------------- Wed Apr 17 11:20:32 UTC 2019 - npower @@ -143,6 +154,11 @@ Wed Mar 27 18:47:07 UTC 2019 - David Mulder + vfs_fileid: Fix get_connectpath_ino; (bso#13741); + vfs_fileid: Fix fsname_norootdir algorithm; (bso#13744); +------------------------------------------------------------------- +Sun Apr 14 22:31:32 UTC 2019 - David Disseldorp + +- Explicitly enable libcephfs POSIX ACL support; (bso#13896); (bsc#1130245). + ------------------------------------------------------------------- Mon Mar 4 12:42:36 UTC 2019 - David Disseldorp diff --git a/samba.spec b/samba.spec index 3d63e68..a39c2e7 100644 --- a/samba.spec +++ b/samba.spec @@ -170,7 +170,7 @@ BuildRequires: libtasn1-devel >= 3.8 %else %define build_make_smp_mflags %{?jobs:-j%jobs} %endif -Version: 4.10.2+git.78.0c89af72312 +Version: 4.10.2+git.92.9c4903ace94 Release: 0 Url: https://www.samba.org/ Obsoletes: samba-32bit < %{version} @@ -343,11 +343,11 @@ Summary: Samba Python3 libraries License: GPL-3.0-or-later Group: Development/Libraries/Python Requires: %{name} = %{version} -Requires: libsamba-policy0-python3 = %{version} Requires: python3-ldb Requires: python3-talloc Requires: python3-tdb Requires: python3-tevent +Requires: libsamba-policy0-python3 = %{version} %description python3 The samba-python3 package contains the Python libraries needed by programs @@ -381,8 +381,8 @@ Requires: %{?insserv_prereq} %endif Requires(pre): /usr/sbin/groupadd Requires: coreutils -Requires: libtevent-util0 >= %{version} Requires: samba-client >= %{version} +Requires: libtevent-util0 >= %{version} Requires(post): /sbin/ldconfig Requires(postun): /sbin/ldconfig @@ -1287,9 +1287,10 @@ for file in $( find %{buildroot}%{DOCDIR} -maxdepth 1); do echo "%doc ${file#%{buildroot}}" >>"%{_builddir}/samba-%{version}/filelist-samba-doc" done for file in $( find %{buildroot}%{_libdir}/samba/vfs/ -mindepth 1 ); do - # if built we don't want vfs_ceph in the base package + # if built we don't want ceph VFS modules in the base package case "${file#%{buildroot}}" in %{_libdir}/samba/vfs/ceph.so) continue ;; + %{_libdir}/samba/vfs/ceph_snapshots.so) continue ;; esac echo "${file#%{buildroot}}" >>%{_builddir}/samba-%{version}/filelist-samba done @@ -1299,6 +1300,12 @@ for file in %{buildroot}%{_mandir}/man8/vfs_*; do %{_mandir}/man8/vfs_ceph.8) %if 0%{?build_ceph} == 0 rm ${file} +%endif + continue + ;; + %{_mandir}/man8/vfs_ceph_snapshots.8) +%if 0%{?build_ceph} == 0 + rm ${file} %endif continue ;; @@ -2453,6 +2460,8 @@ exit 0 %defattr(-,root,root) %{_mandir}/man8/vfs_ceph.8.* %{_libdir}/samba/vfs/ceph.so +%{_mandir}/man8/vfs_ceph_snapshots.8.* +%{_libdir}/samba/vfs/ceph_snapshots.so %{_mandir}/man7/ctdb_mutex_ceph_rados_helper.7.* %{_libdir}/ctdb/ctdb_mutex_ceph_rados_helper %endif From 9e27d199dea11c37faeb3e624c835db1704d996d5fead7e800dd9f86a7bfda02 Mon Sep 17 00:00:00 2001 From: David Disseldorp Date: Wed, 15 May 2019 00:09:54 +0000 Subject: [PATCH 2/2] Fix changelog chronological order OBS-URL: https://build.opensuse.org/package/show/network:samba:STABLE/samba?expand=0&rev=617 --- samba-4.10.2+git.92.9c4903ace94.tar.bz2 | 3 --- samba-4.10.2+git.94.31fb5e37171.tar.bz2 | 3 +++ samba.changes | 10 +++++----- samba.spec | 2 +- 4 files changed, 9 insertions(+), 9 deletions(-) delete mode 100644 samba-4.10.2+git.92.9c4903ace94.tar.bz2 create mode 100644 samba-4.10.2+git.94.31fb5e37171.tar.bz2 diff --git a/samba-4.10.2+git.92.9c4903ace94.tar.bz2 b/samba-4.10.2+git.92.9c4903ace94.tar.bz2 deleted file mode 100644 index c96e88b..0000000 --- a/samba-4.10.2+git.92.9c4903ace94.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:1b778916a07370aea65c1190b422b3b1657e6895cbfbc3bfda8d8a65798f6084 -size 24796725 diff --git a/samba-4.10.2+git.94.31fb5e37171.tar.bz2 b/samba-4.10.2+git.94.31fb5e37171.tar.bz2 new file mode 100644 index 0000000..2e994a4 --- /dev/null +++ b/samba-4.10.2+git.94.31fb5e37171.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:2c1a39f2dc3c7ccb1030d2a246077b2569b607f9babf6de05c4e5eb8c22975f0 +size 24797292 diff --git a/samba.changes b/samba.changes index ea8565e..3f50ff5 100644 --- a/samba.changes +++ b/samba.changes @@ -87,6 +87,11 @@ Wed Apr 17 11:20:32 UTC 2019 - npower + lib/winbind_util: Add winbind_xid_to_sid for --without-winbind; (bso#13813); + lib:util: Move debug message for mkdir failing to log level 1; (bso#13823); +------------------------------------------------------------------- +Sun Apr 14 22:31:32 UTC 2019 - David Disseldorp + +- Explicitly enable libcephfs POSIX ACL support; (bso#13896); (bsc#1130245). + ------------------------------------------------------------------- Wed Mar 27 18:47:07 UTC 2019 - David Mulder @@ -154,11 +159,6 @@ Wed Mar 27 18:47:07 UTC 2019 - David Mulder + vfs_fileid: Fix get_connectpath_ino; (bso#13741); + vfs_fileid: Fix fsname_norootdir algorithm; (bso#13744); -------------------------------------------------------------------- -Sun Apr 14 22:31:32 UTC 2019 - David Disseldorp - -- Explicitly enable libcephfs POSIX ACL support; (bso#13896); (bsc#1130245). - ------------------------------------------------------------------- Mon Mar 4 12:42:36 UTC 2019 - David Disseldorp diff --git a/samba.spec b/samba.spec index a39c2e7..ea77ece 100644 --- a/samba.spec +++ b/samba.spec @@ -170,7 +170,7 @@ BuildRequires: libtasn1-devel >= 3.8 %else %define build_make_smp_mflags %{?jobs:-j%jobs} %endif -Version: 4.10.2+git.92.9c4903ace94 +Version: 4.10.2+git.94.31fb5e37171 Release: 0 Url: https://www.samba.org/ Obsoletes: samba-32bit < %{version}