From 786059c188f1e9ceb10767999ab5160c93104816e9d003e4b006cf4afbdbbfbb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Lars=20M=C3=BCller?= Date: Mon, 20 Jan 2014 11:14:25 +0000 Subject: [PATCH 01/18] Default sysconfig daemon options to -D; (bnc#857454). OBS-URL: https://build.opensuse.org/package/show/network:samba:STABLE/samba?expand=0&rev=371 --- patches.tar.bz2 | 4 ++-- samba.changes | 5 +++++ samba.spec | 6 +++--- vendor-files.tar.bz2 | 4 ++-- 4 files changed, 12 insertions(+), 7 deletions(-) diff --git a/patches.tar.bz2 b/patches.tar.bz2 index e149b7a..dcfbbf9 100644 --- a/patches.tar.bz2 +++ b/patches.tar.bz2 @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:737b49ddce985a38831576325e1cff02f058f01c3bccc674dfad4b133a67cdb0 -size 71125 +oid sha256:63495c38f2b027e56578884e7c7dbc37847b1a6821a0349f710e2712c81924de +size 71322 diff --git a/samba.changes b/samba.changes index c62d4b6..2f2866b 100644 --- a/samba.changes +++ b/samba.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Mon Jan 20 10:47:54 UTC 2014 - lmuelle@suse.com + +- Default sysconfig daemon options to -D; (bnc#857454). + ------------------------------------------------------------------- Thu Jan 16 19:19:58 UTC 2014 - lmuelle@suse.com diff --git a/samba.spec b/samba.spec index b8c510b..36a1ce7 100644 --- a/samba.spec +++ b/samba.spec @@ -139,7 +139,7 @@ BuildRequires: systemd %else %define build_make_smp_mflags %{?jobs:-j%jobs} %endif -%define SOURCE_TIMESTAMP 3149 +%define SOURCE_TIMESTAMP 3150 %define BRANCH %{version} %global with_mitkrb5 1 %global with_dc 0 @@ -1364,9 +1364,9 @@ for srv_name in nmb smb winbind; do ../packaging/systemd/${srv_name}.service \ >%{buildroot}/%{_unitdir}/${srv_name}.service echo -en "## Type: string -## Default: \"\" +## Default: \"-D\" ## ServiceRestart:ยท${srv_name} -${srv_name^^}DOPTIONS=\"\"\n" >>SUSE.sysconfig.${srv_name} +${srv_name^^}DOPTIONS=\"-D\"\n" >>SUSE.sysconfig.${srv_name} ln -s ../../%{_sbindir}/service %{buildroot}/%{_sbindir}/rc${srv_name} done head -n 2 ../packaging/systemd/samba.sysconfig > \ diff --git a/vendor-files.tar.bz2 b/vendor-files.tar.bz2 index 2927a30..20ecde8 100644 --- a/vendor-files.tar.bz2 +++ b/vendor-files.tar.bz2 @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:f088cb963b4ad40f07f844e699699e3e8e806bcacd0c8c4e9b0eb14c8c65affc -size 53881 +oid sha256:72bdf9eeaf035395a85e467c7f7a6b78117c4b82be0608429358511fe7247c31 +size 54003 From 1b850caca9c88ffaf7c620ca53e043097462f7d41e5669e377ebf6af3ee650d6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Lars=20M=C3=BCller?= Date: Mon, 20 Jan 2014 14:16:06 +0000 Subject: [PATCH 02/18] Add reference to upstream bug ID of bnc#857454, bso#10388 too. OBS-URL: https://build.opensuse.org/package/show/network:samba:STABLE/samba?expand=0&rev=372 --- patches.tar.bz2 | 4 ++-- samba.changes | 2 +- samba.spec | 2 +- vendor-files.tar.bz2 | 4 ++-- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/patches.tar.bz2 b/patches.tar.bz2 index dcfbbf9..a26da60 100644 --- a/patches.tar.bz2 +++ b/patches.tar.bz2 @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:63495c38f2b027e56578884e7c7dbc37847b1a6821a0349f710e2712c81924de -size 71322 +oid sha256:e50482396b199135d8c130e77457f033d31f2d5c73d42cb6a1c41540934059d3 +size 71250 diff --git a/samba.changes b/samba.changes index 2f2866b..e61dad3 100644 --- a/samba.changes +++ b/samba.changes @@ -1,7 +1,7 @@ ------------------------------------------------------------------- Mon Jan 20 10:47:54 UTC 2014 - lmuelle@suse.com -- Default sysconfig daemon options to -D; (bnc#857454). +- Default sysconfig daemon options to -D; (bso#10388); (bnc#857454). ------------------------------------------------------------------- Thu Jan 16 19:19:58 UTC 2014 - lmuelle@suse.com diff --git a/samba.spec b/samba.spec index 36a1ce7..02a99a9 100644 --- a/samba.spec +++ b/samba.spec @@ -139,7 +139,7 @@ BuildRequires: systemd %else %define build_make_smp_mflags %{?jobs:-j%jobs} %endif -%define SOURCE_TIMESTAMP 3150 +%define SOURCE_TIMESTAMP 3151 %define BRANCH %{version} %global with_mitkrb5 1 %global with_dc 0 diff --git a/vendor-files.tar.bz2 b/vendor-files.tar.bz2 index 20ecde8..5a878a2 100644 --- a/vendor-files.tar.bz2 +++ b/vendor-files.tar.bz2 @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:72bdf9eeaf035395a85e467c7f7a6b78117c4b82be0608429358511fe7247c31 -size 54003 +oid sha256:0b283c7805cfce8a902ddbf20444e8830176c6e26dfcc95169a5288b6a3ed808 +size 53860 From 57b22ce7e94c559e40461c40c375a7956b8a6cba0f5abbde9796b06414893e66 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Lars=20M=C3=BCller?= Date: Wed, 22 Jan 2014 13:38:32 +0000 Subject: [PATCH 03/18] - Allow smbcacls to take a '--propagate-inheritance' flag to indicate that the add, delete, modify and set operations now support automatic propagation of inheritable ACE(s); (FATE#316474). OBS-URL: https://build.opensuse.org/package/show/network:samba:STABLE/samba?expand=0&rev=373 --- patches.tar.bz2 | 4 ++-- samba.changes | 7 +++++++ samba.spec | 2 +- vendor-files.tar.bz2 | 4 ++-- 4 files changed, 12 insertions(+), 5 deletions(-) diff --git a/patches.tar.bz2 b/patches.tar.bz2 index a26da60..c822de3 100644 --- a/patches.tar.bz2 +++ b/patches.tar.bz2 @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:e50482396b199135d8c130e77457f033d31f2d5c73d42cb6a1c41540934059d3 -size 71250 +oid sha256:9a369dc5e420f6950789121f2b358a8bce09a5068979a2dad2e10900ad2ee824 +size 78912 diff --git a/samba.changes b/samba.changes index e61dad3..e0bbb1d 100644 --- a/samba.changes +++ b/samba.changes @@ -1,3 +1,10 @@ +------------------------------------------------------------------- +Tue Jan 21 20:22:12 CET 2014 - nopower@suse.de + +- Allow smbcacls to take a '--propagate-inheritance' flag to indicate that + the add, delete, modify and set operations now support automatic + propagation of inheritable ACE(s); (FATE#316474). + ------------------------------------------------------------------- Mon Jan 20 10:47:54 UTC 2014 - lmuelle@suse.com diff --git a/samba.spec b/samba.spec index 02a99a9..ecde355 100644 --- a/samba.spec +++ b/samba.spec @@ -139,7 +139,7 @@ BuildRequires: systemd %else %define build_make_smp_mflags %{?jobs:-j%jobs} %endif -%define SOURCE_TIMESTAMP 3151 +%define SOURCE_TIMESTAMP 3153 %define BRANCH %{version} %global with_mitkrb5 1 %global with_dc 0 diff --git a/vendor-files.tar.bz2 b/vendor-files.tar.bz2 index 5a878a2..f187587 100644 --- a/vendor-files.tar.bz2 +++ b/vendor-files.tar.bz2 @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:0b283c7805cfce8a902ddbf20444e8830176c6e26dfcc95169a5288b6a3ed808 -size 53860 +oid sha256:1f4714c7a4b065f4827608070d2f7ec67b430192efa029761bc538e5a2f6caed +size 53872 From 7d91470d10f23caf2d7d27f28713a64cc1faa331345265bf89b9babb56a70b35 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Lars=20M=C3=BCller?= Date: Wed, 22 Jan 2014 13:40:50 +0000 Subject: [PATCH 04/18] Remove trailing whitespace. OBS-URL: https://build.opensuse.org/package/show/network:samba:STABLE/samba?expand=0&rev=374 --- patches.tar.bz2 | 4 ++-- samba.changes | 2 +- samba.spec | 2 +- vendor-files.tar.bz2 | 4 ++-- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/patches.tar.bz2 b/patches.tar.bz2 index c822de3..e0b5b79 100644 --- a/patches.tar.bz2 +++ b/patches.tar.bz2 @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:9a369dc5e420f6950789121f2b358a8bce09a5068979a2dad2e10900ad2ee824 -size 78912 +oid sha256:57611bf48b7145abef1aecc7f702b40e0e6e11276ce466230b5a7ad622dc48eb +size 78803 diff --git a/samba.changes b/samba.changes index e0bbb1d..8eedced 100644 --- a/samba.changes +++ b/samba.changes @@ -3,7 +3,7 @@ Tue Jan 21 20:22:12 CET 2014 - nopower@suse.de - Allow smbcacls to take a '--propagate-inheritance' flag to indicate that the add, delete, modify and set operations now support automatic - propagation of inheritable ACE(s); (FATE#316474). + propagation of inheritable ACE(s); (FATE#316474). ------------------------------------------------------------------- Mon Jan 20 10:47:54 UTC 2014 - lmuelle@suse.com diff --git a/samba.spec b/samba.spec index ecde355..e0ec0b3 100644 --- a/samba.spec +++ b/samba.spec @@ -139,7 +139,7 @@ BuildRequires: systemd %else %define build_make_smp_mflags %{?jobs:-j%jobs} %endif -%define SOURCE_TIMESTAMP 3153 +%define SOURCE_TIMESTAMP 3154 %define BRANCH %{version} %global with_mitkrb5 1 %global with_dc 0 diff --git a/vendor-files.tar.bz2 b/vendor-files.tar.bz2 index f187587..e05ecd6 100644 --- a/vendor-files.tar.bz2 +++ b/vendor-files.tar.bz2 @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:1f4714c7a4b065f4827608070d2f7ec67b430192efa029761bc538e5a2f6caed -size 53872 +oid sha256:35003098013096ed2df963e94462b00c99d2a147a036d5d34d774e437a8da8a0 +size 54160 From e914f958b1b8573cf1e912d943880de1c0fa37ac47698431958d39952913afd6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Lars=20M=C3=BCller?= Date: Wed, 22 Jan 2014 21:51:51 +0000 Subject: [PATCH 05/18] Make winbindd print the interface version when it gets an INTERFACE_VERSION request; (bnc#726937). OBS-URL: https://build.opensuse.org/package/show/network:samba:STABLE/samba?expand=0&rev=375 --- patches.tar.bz2 | 4 ++-- samba.changes | 6 ++++++ samba.spec | 2 +- vendor-files.tar.bz2 | 4 ++-- 4 files changed, 11 insertions(+), 5 deletions(-) diff --git a/patches.tar.bz2 b/patches.tar.bz2 index e0b5b79..ad31556 100644 --- a/patches.tar.bz2 +++ b/patches.tar.bz2 @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:57611bf48b7145abef1aecc7f702b40e0e6e11276ce466230b5a7ad622dc48eb -size 78803 +oid sha256:3be0c01b021f8bb9ee5fda5d68bffc84c3c6ec0170ed013568694114d2396080 +size 79312 diff --git a/samba.changes b/samba.changes index 8eedced..0b62eb7 100644 --- a/samba.changes +++ b/samba.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Wed Jan 22 17:32:54 CET 2014 - nopower@suse.de + +- Make winbindd print the interface version when it gets an INTERFACE_VERSION + request; (bnc#726937). + ------------------------------------------------------------------- Tue Jan 21 20:22:12 CET 2014 - nopower@suse.de diff --git a/samba.spec b/samba.spec index e0ec0b3..f07a371 100644 --- a/samba.spec +++ b/samba.spec @@ -139,7 +139,7 @@ BuildRequires: systemd %else %define build_make_smp_mflags %{?jobs:-j%jobs} %endif -%define SOURCE_TIMESTAMP 3154 +%define SOURCE_TIMESTAMP 3155 %define BRANCH %{version} %global with_mitkrb5 1 %global with_dc 0 diff --git a/vendor-files.tar.bz2 b/vendor-files.tar.bz2 index e05ecd6..9fe1774 100644 --- a/vendor-files.tar.bz2 +++ b/vendor-files.tar.bz2 @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:35003098013096ed2df963e94462b00c99d2a147a036d5d34d774e437a8da8a0 -size 54160 +oid sha256:8ce7f58fe8da96fb8380c142d8b22a84f3b1708d045822b22325ed954e52de76 +size 53985 From 02a72d49c734e832056e325b00d17b3d9cdd35ce45c832abf532c1fb30d25a80 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Lars=20M=C3=BCller?= Date: Fri, 24 Jan 2014 15:41:11 +0000 Subject: [PATCH 06/18] - s3-dir: Fix the DOS clients against 64-bit smbd's; (bso#2662). - shadow_copy2: module "Previous Version" not working in Windows 7; (bso#10259). - s3-passdb: Fix string duplication to pointers; (bso#10367). - vfs/glusterfs: in case atime is not passed, set it to the current atime; (bso#10384) - s3: winbindd: Move calling setup_domain_child() into add_trusted_domain(); (bso#10358); (bnc#786677). OBS-URL: https://build.opensuse.org/package/show/network:samba:STABLE/samba?expand=0&rev=376 --- patches.tar.bz2 | 4 ++-- samba.changes | 16 ++++++++++++++++ samba.spec | 2 +- vendor-files.tar.bz2 | 4 ++-- 4 files changed, 21 insertions(+), 5 deletions(-) diff --git a/patches.tar.bz2 b/patches.tar.bz2 index ad31556..7c5428e 100644 --- a/patches.tar.bz2 +++ b/patches.tar.bz2 @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:3be0c01b021f8bb9ee5fda5d68bffc84c3c6ec0170ed013568694114d2396080 -size 79312 +oid sha256:de0d4c40b503f72806644aba57f7f8d38c03e31d5ef8fb99c3a4a089c49f8572 +size 102326 diff --git a/samba.changes b/samba.changes index 0b62eb7..d02a662 100644 --- a/samba.changes +++ b/samba.changes @@ -1,3 +1,19 @@ +------------------------------------------------------------------- +Fri Jan 24 15:17:53 UTC 2014 - lmuelle@suse.com + +- s3-dir: Fix the DOS clients against 64-bit smbd's; (bso#2662). +- shadow_copy2: module "Previous Version" not working in Windows 7; + (bso#10259). +- s3-passdb: Fix string duplication to pointers; (bso#10367). +- vfs/glusterfs: in case atime is not passed, set it to the current atime; + (bso#10384) + +------------------------------------------------------------------- +Fri Jan 24 14:30:45 UTC 2014 - lmuelle@suse.com + +- s3: winbindd: Move calling setup_domain_child() into add_trusted_domain(); + (bso#10358); (bnc#786677). + ------------------------------------------------------------------- Wed Jan 22 17:32:54 CET 2014 - nopower@suse.de diff --git a/samba.spec b/samba.spec index f07a371..58e0053 100644 --- a/samba.spec +++ b/samba.spec @@ -139,7 +139,7 @@ BuildRequires: systemd %else %define build_make_smp_mflags %{?jobs:-j%jobs} %endif -%define SOURCE_TIMESTAMP 3155 +%define SOURCE_TIMESTAMP 3157 %define BRANCH %{version} %global with_mitkrb5 1 %global with_dc 0 diff --git a/vendor-files.tar.bz2 b/vendor-files.tar.bz2 index 9fe1774..65bcf1e 100644 --- a/vendor-files.tar.bz2 +++ b/vendor-files.tar.bz2 @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:8ce7f58fe8da96fb8380c142d8b22a84f3b1708d045822b22325ed954e52de76 -size 53985 +oid sha256:73aff7206c8cabccada7417c3405eb915fa1d317c2b5c4f8106d3254b9f936d6 +size 53916 From abb9e149a43ef9af3ed1aaa2ea224a9a2a38173f5d040c3c898dfbda33862094 Mon Sep 17 00:00:00 2001 From: David Disseldorp Date: Fri, 24 Jan 2014 20:52:15 +0000 Subject: [PATCH 07/18] - Add File Server Remote VSS Protocol (FSRVP) server for SMB share shadow-copies; (fate#313346). OBS-URL: https://build.opensuse.org/package/show/network:samba:STABLE/samba?expand=0&rev=377 --- patches.tar.bz2 | 4 ++-- samba.changes | 6 ++++++ samba.spec | 2 +- vendor-files.tar.bz2 | 4 ++-- 4 files changed, 11 insertions(+), 5 deletions(-) diff --git a/patches.tar.bz2 b/patches.tar.bz2 index 7c5428e..3bebc1d 100644 --- a/patches.tar.bz2 +++ b/patches.tar.bz2 @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:de0d4c40b503f72806644aba57f7f8d38c03e31d5ef8fb99c3a4a089c49f8572 -size 102326 +oid sha256:0d7f02fa4adf4445a18e032abc6ba18ff2487587330b3581fa44135917c46455 +size 152758 diff --git a/samba.changes b/samba.changes index d02a662..7e3aeaa 100644 --- a/samba.changes +++ b/samba.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Fri Jan 24 19:41:59 UTC 2014 - ddiss@suse.com + +- Add File Server Remote VSS Protocol (FSRVP) server for SMB share + shadow-copies; (fate#313346). + ------------------------------------------------------------------- Fri Jan 24 15:17:53 UTC 2014 - lmuelle@suse.com diff --git a/samba.spec b/samba.spec index 58e0053..61449fb 100644 --- a/samba.spec +++ b/samba.spec @@ -139,7 +139,7 @@ BuildRequires: systemd %else %define build_make_smp_mflags %{?jobs:-j%jobs} %endif -%define SOURCE_TIMESTAMP 3157 +%define SOURCE_TIMESTAMP 3158 %define BRANCH %{version} %global with_mitkrb5 1 %global with_dc 0 diff --git a/vendor-files.tar.bz2 b/vendor-files.tar.bz2 index 65bcf1e..1758ae4 100644 --- a/vendor-files.tar.bz2 +++ b/vendor-files.tar.bz2 @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:73aff7206c8cabccada7417c3405eb915fa1d317c2b5c4f8106d3254b9f936d6 -size 53916 +oid sha256:5c881ecf3ea27c0440c767bd2a16589076d1975f87e174bf1ec0e36cb3b94622 +size 53734 From d72154b4b6e860540f58af636a4997a2df2e7cb9c95e78c073c386a02295fb37 Mon Sep 17 00:00:00 2001 From: David Disseldorp Date: Tue, 28 Jan 2014 02:08:23 +0000 Subject: [PATCH 08/18] - Ensure ndr table initialization; (bnc#860648). OBS-URL: https://build.opensuse.org/package/show/network:samba:STABLE/samba?expand=0&rev=378 --- patches.tar.bz2 | 4 ++-- samba.changes | 5 +++++ samba.spec | 2 +- vendor-files.tar.bz2 | 4 ++-- 4 files changed, 10 insertions(+), 5 deletions(-) diff --git a/patches.tar.bz2 b/patches.tar.bz2 index 3bebc1d..b75476f 100644 --- a/patches.tar.bz2 +++ b/patches.tar.bz2 @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:0d7f02fa4adf4445a18e032abc6ba18ff2487587330b3581fa44135917c46455 -size 152758 +oid sha256:378822fdd28fea27ee4358ed29629dec772e7e2875c28c5449cb57a7508b2f8a +size 153712 diff --git a/samba.changes b/samba.changes index 7e3aeaa..762db84 100644 --- a/samba.changes +++ b/samba.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Tue Jan 28 01:57:08 UTC 2014 - ddiss@suse.com + +- Ensure ndr table initialization; (bnc#860648). + ------------------------------------------------------------------- Fri Jan 24 19:41:59 UTC 2014 - ddiss@suse.com diff --git a/samba.spec b/samba.spec index 61449fb..5e839ae 100644 --- a/samba.spec +++ b/samba.spec @@ -139,7 +139,7 @@ BuildRequires: systemd %else %define build_make_smp_mflags %{?jobs:-j%jobs} %endif -%define SOURCE_TIMESTAMP 3158 +%define SOURCE_TIMESTAMP 3159 %define BRANCH %{version} %global with_mitkrb5 1 %global with_dc 0 diff --git a/vendor-files.tar.bz2 b/vendor-files.tar.bz2 index 1758ae4..b4229b9 100644 --- a/vendor-files.tar.bz2 +++ b/vendor-files.tar.bz2 @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:5c881ecf3ea27c0440c767bd2a16589076d1975f87e174bf1ec0e36cb3b94622 -size 53734 +oid sha256:368741fa7fd94afc49bae0bb297f31416048e4bce3994e427f18ec8feed97b2d +size 53727 From 782d94ce5612cc6e0847b0fab50a2a9a6abddde373770081f2eca3c10bfe1d98 Mon Sep 17 00:00:00 2001 From: David Disseldorp Date: Tue, 28 Jan 2014 14:42:43 +0000 Subject: [PATCH 09/18] - Check for NULL gensec_security in gensec_security_by_auth_type(); (bnc#860809). OBS-URL: https://build.opensuse.org/package/show/network:samba:STABLE/samba?expand=0&rev=379 --- patches.tar.bz2 | 4 ++-- samba.changes | 6 ++++++ samba.spec | 2 +- vendor-files.tar.bz2 | 4 ++-- 4 files changed, 11 insertions(+), 5 deletions(-) diff --git a/patches.tar.bz2 b/patches.tar.bz2 index b75476f..0716674 100644 --- a/patches.tar.bz2 +++ b/patches.tar.bz2 @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:378822fdd28fea27ee4358ed29629dec772e7e2875c28c5449cb57a7508b2f8a -size 153712 +oid sha256:b5f1c70e53f933f40d7de5e78231c3ca40cf7e5354b416340d02410c4502408e +size 155870 diff --git a/samba.changes b/samba.changes index 762db84..82672e5 100644 --- a/samba.changes +++ b/samba.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Tue Jan 28 14:34:57 UTC 2014 - ddiss@suse.com + +- Check for NULL gensec_security in gensec_security_by_auth_type(); + (bnc#860809). + ------------------------------------------------------------------- Tue Jan 28 01:57:08 UTC 2014 - ddiss@suse.com diff --git a/samba.spec b/samba.spec index 5e839ae..adbd6e5 100644 --- a/samba.spec +++ b/samba.spec @@ -139,7 +139,7 @@ BuildRequires: systemd %else %define build_make_smp_mflags %{?jobs:-j%jobs} %endif -%define SOURCE_TIMESTAMP 3159 +%define SOURCE_TIMESTAMP 3160 %define BRANCH %{version} %global with_mitkrb5 1 %global with_dc 0 diff --git a/vendor-files.tar.bz2 b/vendor-files.tar.bz2 index b4229b9..0126035 100644 --- a/vendor-files.tar.bz2 +++ b/vendor-files.tar.bz2 @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:368741fa7fd94afc49bae0bb297f31416048e4bce3994e427f18ec8feed97b2d -size 53727 +oid sha256:7491d7871395869ef840ae65595bb39f00ac69d8c929f893be2fc965f0b745ba +size 53739 From 68568bc354702a6db70c83961ebb3d3e717f2d1104511be1d7189dda0dae1f7e Mon Sep 17 00:00:00 2001 From: David Disseldorp Date: Tue, 28 Jan 2014 15:24:56 +0000 Subject: [PATCH 10/18] - Fix vfs_btrfs build on older platforms with duplicate WRITE_FLUSH definitions; (bnc#860832). OBS-URL: https://build.opensuse.org/package/show/network:samba:STABLE/samba?expand=0&rev=380 --- patches.tar.bz2 | 4 ++-- samba.changes | 6 ++++++ samba.spec | 2 +- vendor-files.tar.bz2 | 4 ++-- 4 files changed, 11 insertions(+), 5 deletions(-) diff --git a/patches.tar.bz2 b/patches.tar.bz2 index 0716674..fd31bfa 100644 --- a/patches.tar.bz2 +++ b/patches.tar.bz2 @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:b5f1c70e53f933f40d7de5e78231c3ca40cf7e5354b416340d02410c4502408e -size 155870 +oid sha256:4fc8fdce86859fe3874c82f5a2b15533e816e6297a1bbe3461d31f97850ef850 +size 159039 diff --git a/samba.changes b/samba.changes index 82672e5..ff70b51 100644 --- a/samba.changes +++ b/samba.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Tue Jan 28 15:16:30 UTC 2014 - ddiss@suse.com + +- Fix vfs_btrfs build on older platforms with duplicate WRITE_FLUSH + definitions; (bnc#860832). + ------------------------------------------------------------------- Tue Jan 28 14:34:57 UTC 2014 - ddiss@suse.com diff --git a/samba.spec b/samba.spec index adbd6e5..18e08b0 100644 --- a/samba.spec +++ b/samba.spec @@ -139,7 +139,7 @@ BuildRequires: systemd %else %define build_make_smp_mflags %{?jobs:-j%jobs} %endif -%define SOURCE_TIMESTAMP 3160 +%define SOURCE_TIMESTAMP 3161 %define BRANCH %{version} %global with_mitkrb5 1 %global with_dc 0 diff --git a/vendor-files.tar.bz2 b/vendor-files.tar.bz2 index 0126035..fc75b3c 100644 --- a/vendor-files.tar.bz2 +++ b/vendor-files.tar.bz2 @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:7491d7871395869ef840ae65595bb39f00ac69d8c929f893be2fc965f0b745ba -size 53739 +oid sha256:f3d4235fe6fd2963996cacbea4590c142cba0920d9a39c4d810a1ba298140ae8 +size 53716 From 83453d57a58de29d2b28e1937c4951c9fb8b2ddcfbb093c3c7584944cf2ffdd2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Lars=20M=C3=BCller?= Date: Tue, 4 Feb 2014 17:45:37 +0000 Subject: [PATCH 11/18] - Set the PID directory to /run/samba on post-12.2 systems. - Make use of the tmpfilesdir macro while calling systemd-tmpfiles. OBS-URL: https://build.opensuse.org/package/show/network:samba:STABLE/samba?expand=0&rev=381 --- patches.tar.bz2 | 4 ++-- samba.changes | 36 +++++++++++++++++++++++------------- samba.spec | 18 +++++++++++------- vendor-files.tar.bz2 | 4 ++-- 4 files changed, 38 insertions(+), 24 deletions(-) diff --git a/patches.tar.bz2 b/patches.tar.bz2 index fd31bfa..d788d14 100644 --- a/patches.tar.bz2 +++ b/patches.tar.bz2 @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:4fc8fdce86859fe3874c82f5a2b15533e816e6297a1bbe3461d31f97850ef850 -size 159039 +oid sha256:447f4b88477ebc5311e4fe54433e750d6bd70b29c4e5f266efda33fdcf0dd485 +size 159179 diff --git a/samba.changes b/samba.changes index ff70b51..2a3b876 100644 --- a/samba.changes +++ b/samba.changes @@ -1,3 +1,19 @@ +------------------------------------------------------------------- +Tue Feb 4 17:22:52 UTC 2014 - lmuelle@suse.com + +- Set the PID directory to /run/samba on post-12.2 systems. + +------------------------------------------------------------------- +Tue Feb 4 16:02:45 UTC 2014 - lmuelle@suse.com + +- Make use of the tmpfilesdir macro while calling systemd-tmpfiles. + +------------------------------------------------------------------- +Tue Jan 28 20:05:30 CET 2014 - nopower@suse.de + +- Make winbindd print the interface version when it gets an INTERFACE_VERSION + request; (bnc#726937). + ------------------------------------------------------------------- Tue Jan 28 15:16:30 UTC 2014 - ddiss@suse.com @@ -37,19 +53,6 @@ Fri Jan 24 14:30:45 UTC 2014 - lmuelle@suse.com - s3: winbindd: Move calling setup_domain_child() into add_trusted_domain(); (bso#10358); (bnc#786677). -------------------------------------------------------------------- -Wed Jan 22 17:32:54 CET 2014 - nopower@suse.de - -- Make winbindd print the interface version when it gets an INTERFACE_VERSION - request; (bnc#726937). - -------------------------------------------------------------------- -Tue Jan 21 20:22:12 CET 2014 - nopower@suse.de - -- Allow smbcacls to take a '--propagate-inheritance' flag to indicate that - the add, delete, modify and set operations now support automatic - propagation of inheritable ACE(s); (FATE#316474). - ------------------------------------------------------------------- Mon Jan 20 10:47:54 UTC 2014 - lmuelle@suse.com @@ -218,6 +221,13 @@ Thu Nov 21 14:13:37 UTC 2013 - lmuelle@suse.com - Add systemd support for post-12.2 systems. +------------------------------------------------------------------- +Tue Nov 19 19:17:40 CET 2013 - nopower@suse.de + +- Allow smbcacls to take a '--propagate-inheritance' flag to indicate that + the add, delete, modify and set operations now support automatic + propagation of inheritable ACE(s); (FATE#316474). + ------------------------------------------------------------------- Fri Nov 15 18:04:50 UTC 2013 - lmuelle@suse.com diff --git a/samba.spec b/samba.spec index 18e08b0..e07bd27 100644 --- a/samba.spec +++ b/samba.spec @@ -15,6 +15,8 @@ # Please submit bugfixes or comments via http://bugs.opensuse.org/ # +%{!?_tmpfilesdir:%global _tmpfilesdir /usr/lib/tmpfiles.d} + Name: samba %if 0%{?suse_version} == 0 || 0%{?suse_version} > 1140 BuildRequires: autoconf @@ -139,7 +141,7 @@ BuildRequires: systemd %else %define build_make_smp_mflags %{?jobs:-j%jobs} %endif -%define SOURCE_TIMESTAMP 3161 +%define SOURCE_TIMESTAMP 3177 %define BRANCH %{version} %global with_mitkrb5 1 %global with_dc 0 @@ -198,7 +200,11 @@ PreReq: %{fillup_prereq} %define LOCKDIR %{_localstatedir}/lib/samba %define CONFIGDIR %{_sysconfdir}/samba %define INITDIR %{_sysconfdir}/init.d +%if 0%{?suse_version} > 1220 +%define PIDDIR /run/samba +%else %define PIDDIR %{_localstatedir}/run/samba +%endif %if "%{_vendor}" == "suse" %define NET_CFGDIR network %else @@ -1531,7 +1537,7 @@ getent group ntadmin >/dev/null || groupadd -g 71 -o -r ntadmin || : %post %if 0%{?suse_version} > 1220 %service_add_post nmb.service smb.service -%{_bindir}/systemd-tmpfiles --create %{_prefix}/lib/tmpfiles.d/samba.conf +%{_bindir}/systemd-tmpfiles --create %{_tmpfilesdir}/samba.conf %fillup_only %endif @@ -1713,7 +1719,7 @@ else fi %if 0%{?suse_version} > 1220 %service_add_post winbind.service -%{_bindir}/systemd-tmpfiles --create %{_prefix}/lib/tmpfiles.d/samba.conf +%{_bindir}/systemd-tmpfiles --create %{_tmpfilesdir}/samba.conf %{fillup_only -ans samba winbind} %endif @@ -1764,6 +1770,8 @@ fi %else %{_unitdir}/nmb.service %{_unitdir}/smb.service +%dir %{_tmpfilesdir} +%{_tmpfilesdir}/samba.conf %endif %if 0%{?suse_version} && 0%{?suse_version} < 1111 %attr(0600,root,root) %config(noreplace) %{CONFIGDIR}/smbpasswd @@ -1800,10 +1808,6 @@ fi %attr(0644,root,root) %{_datadir}/omc/svcinfo.d/smb.xml %dir %{_datadir}/samba %{_datadir}/samba/update-apparmor-samba-profile -%if 0%{?suse_version} > 1222 -%dir %{_prefix}/lib/tmpfiles.d -%{_prefix}/lib/tmpfiles.d/samba.conf -%endif %doc %{_mandir}/man1/smbstatus.1.* %doc %{_mandir}/man5/smbpasswd.5.* %doc %{_mandir}/man8/nmbd.8.* diff --git a/vendor-files.tar.bz2 b/vendor-files.tar.bz2 index fc75b3c..c134fee 100644 --- a/vendor-files.tar.bz2 +++ b/vendor-files.tar.bz2 @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:f3d4235fe6fd2963996cacbea4590c142cba0920d9a39c4d810a1ba298140ae8 -size 53716 +oid sha256:6a2851cf9bd81cce52815f70f686c87f05b946ff36938c5b2647b2fda27d71ce +size 54144 From eed44281afe309b214a206f96298a41f1095901b7949ecc17fa4b90885c19d5d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Lars=20M=C3=BCller?= Date: Fri, 7 Feb 2014 17:18:53 +0000 Subject: [PATCH 12/18] - Streamline the vendor suffix handling and add support for SLE 12. - Fix zero length server-side copy request handling; (bso#10424); (bnc#862558). + Refresh context in remaining patch stack. OBS-URL: https://build.opensuse.org/package/show/network:samba:STABLE/samba?expand=0&rev=382 --- patches.tar.bz2 | 4 ++-- samba.changes | 12 ++++++++++++ samba.spec | 22 +++++++++++----------- vendor-files.tar.bz2 | 4 ++-- 4 files changed, 27 insertions(+), 15 deletions(-) diff --git a/patches.tar.bz2 b/patches.tar.bz2 index d788d14..0b951ab 100644 --- a/patches.tar.bz2 +++ b/patches.tar.bz2 @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:447f4b88477ebc5311e4fe54433e750d6bd70b29c4e5f266efda33fdcf0dd485 -size 159179 +oid sha256:1776acdd67d05bb03c06284f9692cf1a179754c1bbecd5cf32e914c0b0448128 +size 160302 diff --git a/samba.changes b/samba.changes index 2a3b876..2ca4691 100644 --- a/samba.changes +++ b/samba.changes @@ -1,3 +1,15 @@ +------------------------------------------------------------------- +Fri Feb 7 16:48:52 UTC 2014 - lmuelle@suse.com + +- Streamline the vendor suffix handling and add support for SLE 12. + +------------------------------------------------------------------- +Fri Feb 7 16:07:50 UTC 2014 - ddiss@suse.com + +- Fix zero length server-side copy request handling; (bso#10424); + (bnc#862558). + + Refresh context in remaining patch stack. + ------------------------------------------------------------------- Tue Feb 4 17:22:52 UTC 2014 - lmuelle@suse.com diff --git a/samba.spec b/samba.spec index e07bd27..d96278d 100644 --- a/samba.spec +++ b/samba.spec @@ -141,7 +141,7 @@ BuildRequires: systemd %else %define build_make_smp_mflags %{?jobs:-j%jobs} %endif -%define SOURCE_TIMESTAMP 3177 +%define SOURCE_TIMESTAMP 3179 %define BRANCH %{version} %global with_mitkrb5 1 %global with_dc 0 @@ -1178,20 +1178,20 @@ test 0%{?fedora_version} -gt 0 && product_version=%{?fedora_version} test 0%{?mandriva_version} -gt 0 && product_version=%{?mandriva_version} test 0%{?rhel_version} -gt 0 && product_version=%{?rhel_version} test 0%{?suse_version} -gt 0 && product_version=%{?suse_version} +%if 0%{?suse_version} > 0 major_version=$((${product_version}/100)) minor_version=$((${product_version}/10)) minor_version="${minor_version#$major_version}" product_version="${major_version}.${minor_version}" -product_suffix="" -if test "%{VENDOR}" != "UL"; then - if test 0%{?sles_version} -gt 0; then - product_suffix="-SLE_%{sles_version}" - elif test 0%{?suse_version} -gt 0; then - product_suffix="-oS${product_version}" - else - product_suffix="-OBS" - fi -fi +case "%{suse_version}" in + 1010) product_suffix="-SLE_10" ;; + 1110) product_suffix="-SLE_11" ;; + 1315) product_suffix="-SLE_12" ;; + *) product_suffix="-oS${product_version}" ;; +esac +%else +product_suffix="-OBS" +%endif # Add the build architecture test "%{_build_arch}" != "" && \ product_suffix="${product_suffix}-%{_build_arch}" diff --git a/vendor-files.tar.bz2 b/vendor-files.tar.bz2 index c134fee..6c2f8d8 100644 --- a/vendor-files.tar.bz2 +++ b/vendor-files.tar.bz2 @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:6a2851cf9bd81cce52815f70f686c87f05b946ff36938c5b2647b2fda27d71ce -size 54144 +oid sha256:6d918ceca730ea881ad0081b31cf9a07441a22024ca01800c180a4305a4e5442 +size 53922 From b7a23241d15f5dd5f51c65b9470bd001122e04902a26762d9bc478ee586f3642 Mon Sep 17 00:00:00 2001 From: David Disseldorp Date: Sat, 8 Feb 2014 10:50:51 +0000 Subject: [PATCH 13/18] - Fix memory overwrite in FSCTL_VALIDATE_NEGOTIATE_INFO handler; (bso#10415); (bnc#862370). OBS-URL: https://build.opensuse.org/package/show/network:samba:STABLE/samba?expand=0&rev=383 --- patches.tar.bz2 | 4 ++-- samba.changes | 7 ++++++- samba.spec | 2 +- vendor-files.tar.bz2 | 4 ++-- 4 files changed, 11 insertions(+), 6 deletions(-) diff --git a/patches.tar.bz2 b/patches.tar.bz2 index 0b951ab..0b20795 100644 --- a/patches.tar.bz2 +++ b/patches.tar.bz2 @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:1776acdd67d05bb03c06284f9692cf1a179754c1bbecd5cf32e914c0b0448128 -size 160302 +oid sha256:22896379a7f5a04736e9090c5da774b15885b47041aa9a8f766f8061495ab0aa +size 162537 diff --git a/samba.changes b/samba.changes index 2ca4691..6214760 100644 --- a/samba.changes +++ b/samba.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Sat Feb 8 10:39:25 UTC 2014 - ddiss@suse.com + +- Fix memory overwrite in FSCTL_VALIDATE_NEGOTIATE_INFO handler; (bso#10415); + (bnc#862370). + ------------------------------------------------------------------- Fri Feb 7 16:48:52 UTC 2014 - lmuelle@suse.com @@ -8,7 +14,6 @@ Fri Feb 7 16:07:50 UTC 2014 - ddiss@suse.com - Fix zero length server-side copy request handling; (bso#10424); (bnc#862558). - + Refresh context in remaining patch stack. ------------------------------------------------------------------- Tue Feb 4 17:22:52 UTC 2014 - lmuelle@suse.com diff --git a/samba.spec b/samba.spec index d96278d..8af767d 100644 --- a/samba.spec +++ b/samba.spec @@ -141,7 +141,7 @@ BuildRequires: systemd %else %define build_make_smp_mflags %{?jobs:-j%jobs} %endif -%define SOURCE_TIMESTAMP 3179 +%define SOURCE_TIMESTAMP 3180 %define BRANCH %{version} %global with_mitkrb5 1 %global with_dc 0 diff --git a/vendor-files.tar.bz2 b/vendor-files.tar.bz2 index 6c2f8d8..159a71b 100644 --- a/vendor-files.tar.bz2 +++ b/vendor-files.tar.bz2 @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:6d918ceca730ea881ad0081b31cf9a07441a22024ca01800c180a4305a4e5442 -size 53922 +oid sha256:9e4fd956999ee9b66cb8b26369cc8e29a4b6ec8c619afa6a0c815361125c6cc7 +size 53845 From 302d41fe88c76cde5fe38214387246c58b3e0719ae411558070a8796a4e7252a Mon Sep 17 00:00:00 2001 From: David Disseldorp Date: Fri, 14 Feb 2014 00:42:14 +0000 Subject: [PATCH 14/18] - Migrate @GMT token parsing functionality into vfs_snapper; (bnc#863079). + Improve vfs_snapper documentation. OBS-URL: https://build.opensuse.org/package/show/network:samba:STABLE/samba?expand=0&rev=384 --- patches.tar.bz2 | 4 ++-- samba.changes | 12 ++++++++++++ samba.spec | 2 +- vendor-files.tar.bz2 | 4 ++-- 4 files changed, 17 insertions(+), 5 deletions(-) diff --git a/patches.tar.bz2 b/patches.tar.bz2 index 0b20795..376fcf8 100644 --- a/patches.tar.bz2 +++ b/patches.tar.bz2 @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:22896379a7f5a04736e9090c5da774b15885b47041aa9a8f766f8061495ab0aa -size 162537 +oid sha256:03bb05af9d5505bd34d4bd1374091e4fca80ee7be40b3b6061177267d2a16d87 +size 158825 diff --git a/samba.changes b/samba.changes index 6214760..f7049f4 100644 --- a/samba.changes +++ b/samba.changes @@ -1,3 +1,15 @@ +------------------------------------------------------------------- +Fri Feb 14 00:31:35 UTC 2014 - ddiss@suse.com + +- Migrate @GMT token parsing functionality into vfs_snapper; (bnc#863079). + + Improve vfs_snapper documentation. + +------------------------------------------------------------------- +Wed Feb 12 17:50:02 UTC 2014 - ddiss@suse.com + +- Fix Winbind 100% CPU utilization caused by domain list corruption; + (bso#10358); (bnc#786677). + ------------------------------------------------------------------- Sat Feb 8 10:39:25 UTC 2014 - ddiss@suse.com diff --git a/samba.spec b/samba.spec index 8af767d..892c7c3 100644 --- a/samba.spec +++ b/samba.spec @@ -141,7 +141,7 @@ BuildRequires: systemd %else %define build_make_smp_mflags %{?jobs:-j%jobs} %endif -%define SOURCE_TIMESTAMP 3180 +%define SOURCE_TIMESTAMP 3182 %define BRANCH %{version} %global with_mitkrb5 1 %global with_dc 0 diff --git a/vendor-files.tar.bz2 b/vendor-files.tar.bz2 index 159a71b..42114bc 100644 --- a/vendor-files.tar.bz2 +++ b/vendor-files.tar.bz2 @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:9e4fd956999ee9b66cb8b26369cc8e29a4b6ec8c619afa6a0c815361125c6cc7 -size 53845 +oid sha256:bf41d3da443a8000fa11f17c6bd481bac83dbf5010c8d107c38180cefe55f903 +size 53864 From 864f8e3eaf2d8cb129d02476c8fd989a8ab38041446002d47f10c7747b9e6c6a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Lars=20M=C3=BCller?= Date: Tue, 18 Feb 2014 13:34:08 +0000 Subject: [PATCH 15/18] Remove superfluous obsoletes *-64bit in the ifarch ppc64 case; (bnc#437293). OBS-URL: https://build.opensuse.org/package/show/network:samba:STABLE/samba?expand=0&rev=385 --- patches.tar.bz2 | 4 ++-- samba.changes | 5 +++++ samba.spec | 14 +------------- vendor-files.tar.bz2 | 4 ++-- 4 files changed, 10 insertions(+), 17 deletions(-) diff --git a/patches.tar.bz2 b/patches.tar.bz2 index 376fcf8..8163937 100644 --- a/patches.tar.bz2 +++ b/patches.tar.bz2 @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:03bb05af9d5505bd34d4bd1374091e4fca80ee7be40b3b6061177267d2a16d87 -size 158825 +oid sha256:307f0dd91a559973b13a14bfd56ed740f8f4bf3a4d425ef3ff36a77f21fb50b9 +size 158227 diff --git a/samba.changes b/samba.changes index f7049f4..3142c61 100644 --- a/samba.changes +++ b/samba.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Tue Feb 18 13:04:37 UTC 2014 - lmuelle@suse.com + +- Remove superfluous obsoletes *-64bit in the ifarch ppc64 case; (bnc#437293). + ------------------------------------------------------------------- Fri Feb 14 00:31:35 UTC 2014 - ddiss@suse.com diff --git a/samba.spec b/samba.spec index 892c7c3..8d818ba 100644 --- a/samba.spec +++ b/samba.spec @@ -141,7 +141,7 @@ BuildRequires: systemd %else %define build_make_smp_mflags %{?jobs:-j%jobs} %endif -%define SOURCE_TIMESTAMP 3182 +%define SOURCE_TIMESTAMP 3183 %define BRANCH %{version} %global with_mitkrb5 1 %global with_dc 0 @@ -153,9 +153,6 @@ Url: http://www.samba.org/ Group: Productivity/Networking/Samba Provides: samba-gplv3 = %{version} Obsoletes: samba-gplv3 < %{version} -%ifarch ppc64 -Obsoletes: samba-64bit -%endif Requires: samba-client >= %{version} %if 0%{?suse_version} > 1030 Recommends: cron @@ -259,9 +256,6 @@ Provides: smbfs Obsoletes: samba-gplv3-client < %{version} Provides: samba-client-gplv2 = %{version} Obsoletes: samba-client-gplv2 < %{version} -%ifarch ppc64 -Obsoletes: samba-client-64bit -%endif %if 0%{?suse_version} > 0 PreReq: %{?fillup_prereq} PreReq: %{?insserv_prereq} @@ -441,9 +435,6 @@ Group: Productivity/Networking/Samba Provides: samba-gplv3-winbind = %{version} Obsoletes: samba-gplv3-winbind < %{version} Provides: samba-client:/usr/sbin/winbindd -%ifarch ppc64 -Obsoletes: samba-winbind-64bit -%endif Requires: samba-client >= %{version} %if 0%{?suse_version} Requires: pam-config @@ -1014,9 +1005,6 @@ License: GPL-3.0+ Provides: libsmbclient = %{version} Obsoletes: libsmbclient %endif -%ifarch ppc64 -Obsoletes: libsmbclient-64bit -%endif Summary: Samba Client Library Group: System/Libraries PreReq: /sbin/ldconfig diff --git a/vendor-files.tar.bz2 b/vendor-files.tar.bz2 index 42114bc..b869703 100644 --- a/vendor-files.tar.bz2 +++ b/vendor-files.tar.bz2 @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:bf41d3da443a8000fa11f17c6bd481bac83dbf5010c8d107c38180cefe55f903 -size 53864 +oid sha256:e727372c473d1a0cc0b6ca1afe1e5c8f3c4f9719cf38379bc13be12b75fd2156 +size 54202 From 3814a3b1b1f978316e5b5121fa971807bf06b013bbfad9fae891574ecbe5781c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Lars=20M=C3=BCller?= Date: Fri, 21 Feb 2014 14:30:23 +0000 Subject: [PATCH 16/18] - Update to 4.1.5. + Fix 100% CPU utilization in winbindd when trying to free memory in winbindd_reinit_after_fork; (bso#10358); (bnc#786677). + smbd: Fix memory overwrites; (bso#10415). OBS-URL: https://build.opensuse.org/package/show/network:samba:STABLE/samba?expand=0&rev=386 --- patches.tar.bz2 | 4 ++-- samba-4.1.4.tar.asc | 7 ------- samba-4.1.4.tar.gz | 3 --- samba-4.1.5.tar.asc | 7 +++++++ samba-4.1.5.tar.gz | 3 +++ samba.changes | 25 +++++++++++++++++++++++++ samba.spec | 6 +++--- vendor-files.tar.bz2 | 4 ++-- 8 files changed, 42 insertions(+), 17 deletions(-) delete mode 100644 samba-4.1.4.tar.asc delete mode 100644 samba-4.1.4.tar.gz create mode 100644 samba-4.1.5.tar.asc create mode 100644 samba-4.1.5.tar.gz diff --git a/patches.tar.bz2 b/patches.tar.bz2 index 8163937..95b16f0 100644 --- a/patches.tar.bz2 +++ b/patches.tar.bz2 @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:307f0dd91a559973b13a14bfd56ed740f8f4bf3a4d425ef3ff36a77f21fb50b9 -size 158227 +oid sha256:1882b53540b5bcae8b8746b793a9db04b6767932c53e1145c8b9e4afdd397a06 +size 128899 diff --git a/samba-4.1.4.tar.asc b/samba-4.1.4.tar.asc deleted file mode 100644 index 023ee1b..0000000 --- a/samba-4.1.4.tar.asc +++ /dev/null @@ -1,7 +0,0 @@ ------BEGIN PGP SIGNATURE----- -Version: GnuPG v1.4.11 (GNU/Linux) - -iD8DBQBSz6uYbzORW2Vot+oRAgdAAJ9n0GQ8ZwsizWM6CIr5lmJXxo7zpwCfTMpg -1eF2oc0zDz1/27DkBouoLvk= -=tpG3 ------END PGP SIGNATURE----- diff --git a/samba-4.1.4.tar.gz b/samba-4.1.4.tar.gz deleted file mode 100644 index 74f78a1..0000000 --- a/samba-4.1.4.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:1733e1aaa37b4fcb0fc781b07fc6f20831023ce971d8bcd97940c3fbe35766a7 -size 23169480 diff --git a/samba-4.1.5.tar.asc b/samba-4.1.5.tar.asc new file mode 100644 index 0000000..6aa442c --- /dev/null +++ b/samba-4.1.5.tar.asc @@ -0,0 +1,7 @@ +-----BEGIN PGP SIGNATURE----- +Version: GnuPG v1.4.11 (GNU/Linux) + +iEYEABECAAYFAlMHHEcACgkQbzORW2Vot+pNiwCePohuvj4WvbYp0AmHW7HXkTD0 +ExgAn0Qq3LcJ2KBjX+s8gHk23yGtWA27 +=K+he +-----END PGP SIGNATURE----- diff --git a/samba-4.1.5.tar.gz b/samba-4.1.5.tar.gz new file mode 100644 index 0000000..e149019 --- /dev/null +++ b/samba-4.1.5.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:d98c1554d6f857053557ff024c243df5d15dd9ca436d5804be4b0546ede94cc8 +size 23177512 diff --git a/samba.changes b/samba.changes index 3142c61..13f8a90 100644 --- a/samba.changes +++ b/samba.changes @@ -1,3 +1,28 @@ +------------------------------------------------------------------- +Fri Feb 21 13:16:01 UTC 2014 - lmuelle@suse.com + +- Update to 4.1.5. + + Fix 100% CPU utilization in winbindd when trying to free memory in + winbindd_reinit_after_fork; (bso#10358); (bnc#786677). + + smbd: Fix memory overwrites; (bso#10415). + + + s3-winbind: Improve performance of wb_fill_pwent_sid2uid_done(); + (bso#2191). + + ntlm_auth sometimes returns the wrong username to mod_ntlm_auth_winbind; + (bso#10087). + + s3: smbpasswd: Fix crashes on invalid input; (bso#10320). + + s3: vfs_dirsort module: Allow dirsort to work when multiple simultaneous + directories are open; (bso#10406). + + Add support for Heimdal's unified krb5 and hdb plugin system, cope with + first element in hdb_method having a different name in different heimdal + versions and fix INTERNAL ERROR: Signal 11 in the kdc pid; (bso#10418). + + vfs_btrfs: Fix incorrect zero length server-side copy request handling; + (bso#10424). + + s3: modules: streaminfo: As we have no VFS function SMB_VFS_LLISTXATTR we + can't cope with a symlink when lp_posix_pathnames() is true; (bso#10429). + + smbd: Fix an ancient oplock bug; (bso#10436). + + Fix crash bug in smb2_notify code; (bso#10442). + ------------------------------------------------------------------- Tue Feb 18 13:04:37 UTC 2014 - lmuelle@suse.com diff --git a/samba.spec b/samba.spec index 8d818ba..a1bde09 100644 --- a/samba.spec +++ b/samba.spec @@ -114,7 +114,7 @@ BuildRequires: dbus-1-devel BuildRequires: gpg-offline BuildRequires: systemd %endif -%define samba_ver 4.1.4 +%define samba_ver 4.1.5 %define samba_ver_suffix %nil %if "%{samba_ver_suffix}" == "" %define samba_source_location http://ftp.samba.org/pub/samba/stable/samba-%{version}.tar.gz @@ -141,12 +141,12 @@ BuildRequires: systemd %else %define build_make_smp_mflags %{?jobs:-j%jobs} %endif -%define SOURCE_TIMESTAMP 3183 +%define SOURCE_TIMESTAMP 3184 %define BRANCH %{version} %global with_mitkrb5 1 %global with_dc 0 %global with_get_printing_ticket 0 -Version: 4.1.4 +Version: 4.1.5 Release: 0 License: GPL-3.0+ Url: http://www.samba.org/ diff --git a/vendor-files.tar.bz2 b/vendor-files.tar.bz2 index b869703..f35fc8b 100644 --- a/vendor-files.tar.bz2 +++ b/vendor-files.tar.bz2 @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:e727372c473d1a0cc0b6ca1afe1e5c8f3c4f9719cf38379bc13be12b75fd2156 -size 54202 +oid sha256:9d40cb312753d439c8a0506a1d27b820a619902086acd3a24181bcaf34784f73 +size 54143 From 7684b4f2384b298a2936b28a994448e95f880e5025d0586bdda0ee97d58ca9d7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Lars=20M=C3=BCller?= Date: Fri, 21 Feb 2014 16:47:16 +0000 Subject: [PATCH 17/18] Depend on %version-%release with all manual Provides and Requires; (bnc#844307). OBS-URL: https://build.opensuse.org/package/show/network:samba:STABLE/samba?expand=0&rev=387 --- patches.tar.bz2 | 4 +- samba.changes | 6 +++ samba.spec | 98 ++++++++++++++++++++++---------------------- vendor-files.tar.bz2 | 4 +- 4 files changed, 59 insertions(+), 53 deletions(-) diff --git a/patches.tar.bz2 b/patches.tar.bz2 index 95b16f0..0ab393b 100644 --- a/patches.tar.bz2 +++ b/patches.tar.bz2 @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:1882b53540b5bcae8b8746b793a9db04b6767932c53e1145c8b9e4afdd397a06 -size 128899 +oid sha256:da36e31e01694b79a1489775403a2727161368a3ffdde422523d2b84963fcda3 +size 128908 diff --git a/samba.changes b/samba.changes index 13f8a90..13526e6 100644 --- a/samba.changes +++ b/samba.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Fri Feb 21 16:02:12 UTC 2014 - lmuelle@suse.com + +- Depend on %version-%release with all manual Provides and Requires; + (bnc#844307). + ------------------------------------------------------------------- Fri Feb 21 13:16:01 UTC 2014 - lmuelle@suse.com diff --git a/samba.spec b/samba.spec index a1bde09..2adb855 100644 --- a/samba.spec +++ b/samba.spec @@ -141,7 +141,7 @@ BuildRequires: systemd %else %define build_make_smp_mflags %{?jobs:-j%jobs} %endif -%define SOURCE_TIMESTAMP 3184 +%define SOURCE_TIMESTAMP 3185 %define BRANCH %{version} %global with_mitkrb5 1 %global with_dc 0 @@ -151,7 +151,7 @@ Release: 0 License: GPL-3.0+ Url: http://www.samba.org/ Group: Productivity/Networking/Samba -Provides: samba-gplv3 = %{version} +Provides: samba-gplv3 = %{version}-%{release} Obsoletes: samba-gplv3 < %{version} Requires: samba-client >= %{version} %if 0%{?suse_version} > 1030 @@ -251,10 +251,10 @@ Branch: %{BRANCH} License: GPL-3.0+ Summary: Samba Client Utilities Group: Productivity/Networking/Samba -Provides: samba-gplv3-client = %{version} +Provides: samba-gplv3-client = %{version}-%{release} Provides: smbfs Obsoletes: samba-gplv3-client < %{version} -Provides: samba-client-gplv2 = %{version} +Provides: samba-client-gplv2 = %{version}-%{release} Obsoletes: samba-client-gplv2 < %{version} %if 0%{?suse_version} > 0 PreReq: %{?fillup_prereq} @@ -310,9 +310,9 @@ Summary: Samba Documentation Group: Documentation/Other PreReq: coreutils PreReq: findutils -Provides: samba-gplv3-doc = %{version} +Provides: samba-gplv3-doc = %{version}-%{release} Obsoletes: samba-gplv3-doc < %{version} -Provides: samba-doc-gplv2 = %{version} +Provides: samba-doc-gplv2 = %{version}-%{release} Obsoletes: samba-doc-gplv2 < %{version} %if 0%{?suse_version} > 1110 BuildArch: noarch @@ -334,7 +334,7 @@ License: GPL-3.0+ Summary: Wrapper binary for kerberized printing Group: Productivity/Networking/Samba PreReq: coreutils -Provides: samba-gplv3-krb-printing = %{version} +Provides: samba-gplv3-krb-printing = %{version}-%{release} Obsoletes: samba-gplv3-krb-printing < %{version} %if 0%{?suse_version} > 1000 PreReq: permissions @@ -385,7 +385,7 @@ Branch: %{BRANCH} License: GPL-3.0+ Summary: Samba Python libraries Group: Applications/System -Requires: %{name} = %{version} +Requires: %{name} = %{version}-%{release} Requires: python-tevent Requires: python-tdb Requires: pyldb @@ -403,8 +403,8 @@ Branch: %{BRANCH} License: GPL-3.0+ Summary: Testing tools for Samba servers and clients Group: Applications/System -Requires: samba = %{version} -Requires: samba-winbind = %{version} +Requires: samba = %{version}-%{release} +Requires: samba-winbind = %{version}-%{release} PreReq: /sbin/ldconfig %description test @@ -432,7 +432,7 @@ Branch: %{BRANCH} License: GPL-3.0+ Summary: Winbind Daemon and Tool Group: Productivity/Networking/Samba -Provides: samba-gplv3-winbind = %{version} +Provides: samba-gplv3-winbind = %{version}-%{release} Obsoletes: samba-gplv3-winbind < %{version} Provides: samba-client:/usr/sbin/winbindd Requires: samba-client >= %{version} @@ -476,7 +476,7 @@ Branch: %{BRANCH} License: GPL-3.0+ Summary: Development files for the DCE/RPC ATSVC library Group: Development/Libraries/C and C++ -Requires: libdcerpc-atsvc0 = %{version} +Requires: libdcerpc-atsvc0 = %{version}-%{release} %description -n libdcerpc-atsvc-devel ATSVC is a DCE/RPC based protocol used by CIFS hosts to @@ -515,7 +515,7 @@ Branch: %{BRANCH} License: GPL-3.0+ Summary: Development files for the SAMR protocol library Group: Development/Libraries/C and C++ -Requires: libdcerpc-samr0 = %{version} +Requires: libdcerpc-samr0 = %{version}-%{release} %description -n libdcerpc-samr-devel This subpackage contains libraries and header files for developing @@ -546,9 +546,9 @@ Branch: %{BRANCH} License: GPL-3.0+ Summary: Development files for the DCE/RPC library Group: Development/Libraries/C and C++ -Requires: libdcerpc0 = %{version} -Requires: libdcerpc-binding0 = %{version} -Requires: samba-core-devel = %{version} +Requires: libdcerpc0 = %{version}-%{release} +Requires: libdcerpc-binding0 = %{version}-%{release} +Requires: samba-core-devel = %{version}-%{release} %description -n libdcerpc-devel DCE/RPC, short for "Distributed Computing Environment / Remote @@ -580,8 +580,8 @@ Branch: %{BRANCH} License: GPL-3.0+ Summary: Development files for Samba's generic security library Group: Development/Libraries/C and C++ -Requires: libgensec0 = %{version} -Requires: samba-core-devel = %{version} +Requires: libgensec0 = %{version}-%{release} +Requires: samba-core-devel = %{version}-%{release} %description -n libgensec-devel This subpackage contains libraries and header files for developing @@ -606,8 +606,8 @@ Branch: %{BRANCH} License: GPL-3.0+ Summary: Development files for the ndr-krb5pac library Group: Development/Libraries/C and C++ -Requires: libndr-krb5pac0 = %{version} -Requires: samba-core-devel = %{version} +Requires: libndr-krb5pac0 = %{version}-%{release} +Requires: samba-core-devel = %{version}-%{release} %description -n libndr-krb5pac-devel This subpackage contains libraries and header files for developing @@ -632,8 +632,8 @@ Branch: %{BRANCH} License: GPL-3.0+ Summary: Development files for the ndr-nbt library Group: Development/Libraries/C and C++ -Requires: libndr-nbt0 = %{version} -Requires: samba-core-devel = %{version} +Requires: libndr-nbt0 = %{version}-%{release} +Requires: samba-core-devel = %{version}-%{release} %description -n libndr-nbt-devel This subpackage contains libraries and header files for developing @@ -658,8 +658,8 @@ Branch: %{BRANCH} License: GPL-3.0+ Summary: Development files for the libndr-standard library Group: Development/Libraries/C and C++ -Requires: libndr-standard0 = %{version} -Requires: samba-core-devel = %{version} +Requires: libndr-standard0 = %{version}-%{release} +Requires: samba-core-devel = %{version}-%{release} %description -n libndr-standard-devel This subpackage contains libraries and header files for developing @@ -686,8 +686,8 @@ Branch: %{BRANCH} License: GPL-3.0+ Summary: Development files for the Network Data Representation library Group: Development/Libraries/C and C++ -Requires: libndr0 = %{version} -Requires: samba-core-devel = %{version} +Requires: libndr0 = %{version}-%{release} +Requires: samba-core-devel = %{version}-%{release} %description -n libndr-devel Network Data Representation (NDR) is an implementation of the @@ -715,8 +715,8 @@ Branch: %{BRANCH} License: GPL-3.0+ Summary: Development files for the Samba3 password database library Group: Development/Libraries/C and C++ -Requires: libpdb0 = %{version} -Requires: libndr-standard-devel = %{version} +Requires: libpdb0 = %{version}-%{release} +Requires: libndr-standard-devel = %{version}-%{release} Requires: libtevent-devel %description -n libpdb-devel @@ -742,8 +742,8 @@ Branch: %{BRANCH} License: GPL-3.0+ Summary: Development files for the Samba Windows-style registry library Group: Development/Libraries/C and C++ -Requires: libregistry0 = %{version} -Requires: samba-core-devel = %{version} +Requires: libregistry0 = %{version}-%{release} +Requires: samba-core-devel = %{version}-%{release} %description -n libregistry-devel This subpackage contains libraries and header files for developing @@ -768,7 +768,7 @@ Branch: %{BRANCH} License: GPL-3.0+ Summary: Development files for the Samba credential management library Group: Development/Libraries/C and C++ -Requires: libsamba-credentials0 = %{version} +Requires: libsamba-credentials0 = %{version}-%{release} %description -n libsamba-credentials-devel This subpackage contains libraries and header files for developing @@ -793,8 +793,8 @@ Branch: %{BRANCH} License: GPL-3.0+ Summary: Development files for the host-wide Samba configuration library Group: Development/Libraries/C and C++ -Requires: libsamba-hostconfig0 = %{version} -Requires: samba-core-devel = %{version} +Requires: libsamba-hostconfig0 = %{version}-%{release} +Requires: samba-core-devel = %{version}-%{release} %description -n libsamba-hostconfig-devel This subpackage contains libraries and header files for developing @@ -819,7 +819,7 @@ Branch: %{BRANCH} License: GPL-3.0+ Summary: Development files for the Samba AD Group Policy library Group: Development/Libraries/C and C++ -Requires: libsamba-policy0 = %{version} +Requires: libsamba-policy0 = %{version}-%{release} %description -n libsamba-policy-devel This subpackage contains libraries and header files for developing @@ -844,8 +844,8 @@ Branch: %{BRANCH} License: GPL-3.0+ Summary: Development files for the Samba utility function library Group: Development/Libraries/C and C++ -Requires: libsamba-util0 = %{version} -Requires: samba-core-devel = %{version} +Requires: libsamba-util0 = %{version}-%{release} +Requires: samba-core-devel = %{version}-%{release} %description -n libsamba-util-devel This subpackage contains libraries and header files for developing @@ -870,7 +870,7 @@ Branch: %{BRANCH} License: GPL-3.0+ Summary: Development files for Samba's SAM database library Group: Development/Libraries/C and C++ -Requires: libsamdb0 = %{version} +Requires: libsamdb0 = %{version}-%{release} %description -n libsamdb-devel This subpackage contains libraries and header files for developing @@ -895,8 +895,8 @@ Branch: %{BRANCH} License: GPL-3.0+ Summary: Development files for Samba4's raw SMB client library Group: Development/Libraries/C and C++ -Requires: libsmbclient-raw0 = %{version} -Requires: samba-core-devel = %{version} +Requires: libsmbclient-raw0 = %{version}-%{release} +Requires: samba-core-devel = %{version}-%{release} %description -n libsmbclient-raw-devel This subpackage contains libraries and header files for developing @@ -923,7 +923,7 @@ Branch: %{BRANCH} License: GPL-3.0+ Summary: Development files for the Samba3 configuration library Group: Development/Libraries/C and C++ -Requires: libsmbconf0 = %{version} +Requires: libsmbconf0 = %{version}-%{release} %description -n libsmbconf-devel libsmbconf is a library to read or, based on the backend, modify the @@ -952,7 +952,7 @@ Branch: %{BRANCH} License: GPL-3.0+ Summary: Development files for the smbldap library Group: Development/Libraries/C and C++ -Requires: libsmbldap0 = %{version} +Requires: libsmbldap0 = %{version}-%{release} Requires: libtalloc-devel Requires: libtevent-devel Requires: openldap2-devel @@ -985,8 +985,8 @@ License: GPL-3.0+ Summary: Development files for the Samba tevent utility library Group: Development/Libraries/C and C++ Requires: libtevent-devel -Requires: libtevent-util0 = %{version} -Requires: samba-core-devel = %{version} +Requires: libtevent-util0 = %{version}-%{release} +Requires: samba-core-devel = %{version}-%{release} %description -n libtevent-util-devel The libtevent-util library contains functions to convert tevent error @@ -1002,7 +1002,7 @@ Branch: %{BRANCH} %package -n %{libsmbclient_name} License: GPL-3.0+ %if 0%{?suse_version} > 1030 -Provides: libsmbclient = %{version} +Provides: libsmbclient = %{version}-%{release} Obsoletes: libsmbclient %endif Summary: Samba Client Library @@ -1024,7 +1024,7 @@ Summary: Libraries and Header Files to Develop Programs with smbclient Su Group: Development/Libraries/C and C++ BuildRequires: %{pkgconfig_req} Requires: krb5-devel -Requires: %{libsmbclient_name} = %{version} +Requires: %{libsmbclient_name} = %{version}-%{release} %description -n libsmbclient-devel This package contains the static libraries and header files needed to @@ -1052,7 +1052,7 @@ License: GPL-3.0+ Summary: Libraries and Header Files to Develop Programs with netapi Support Group: Development/Libraries/C and C++ BuildRequires: %{pkgconfig_req} -Requires: %{libnetapi_name} = %{version} +Requires: %{libnetapi_name} = %{version}-%{release} %description -n libnetapi-devel This package contains the static libraries and header files needed to @@ -1065,7 +1065,7 @@ Branch: %{BRANCH} %package -n %{libsmbsharemodes_name} License: GPL-3.0+ %if 0%{?suse_version} > 1030 -Provides: libsmbsharemodes = %{version} +Provides: libsmbsharemodes = %{version}-%{release} Obsoletes: libsmbsharemodes %endif Summary: Samba smbsharemodes Library @@ -1084,7 +1084,7 @@ License: GPL-3.0+ Summary: Libraries and Header Files to Develop Programs with smbsharemodes Support Group: Development/Libraries/C and C++ BuildRequires: %{pkgconfig_req} -Requires: %{libsmbsharemodes_name} = %{version} +Requires: %{libsmbsharemodes_name} = %{version}-%{release} %description -n libsmbsharemodes-devel This package contains the static libraries and header files needed to @@ -1112,7 +1112,7 @@ License: LGPL-3.0+ Summary: Libraries and Header Files to Develop Programs with wbclient Support Group: Development/Libraries/C and C++ BuildRequires: %{pkgconfig_req} -Requires: %{libwbclient_name} = %{version} +Requires: %{libwbclient_name} = %{version}-%{release} %description -n libwbclient-devel This package contains the static libraries and header files needed to diff --git a/vendor-files.tar.bz2 b/vendor-files.tar.bz2 index f35fc8b..5cb441b 100644 --- a/vendor-files.tar.bz2 +++ b/vendor-files.tar.bz2 @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:9d40cb312753d439c8a0506a1d27b820a619902086acd3a24181bcaf34784f73 -size 54143 +oid sha256:36a0897149207a54808f6f516277e8bc89d89a0ef24a9dd508d44dff43d7c33b +size 54227 From ca813d4800e7d47e6fca1f786ddbae7558ebdcf98300e54a2f9ad6fe407125e9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Lars=20M=C3=BCller?= Date: Sat, 22 Feb 2014 14:33:35 +0000 Subject: [PATCH 18/18] Use libarchive to provide improved smbclient tarmode functionality; (bso#9667); (bnc#861135). OBS-URL: https://build.opensuse.org/package/show/network:samba:STABLE/samba?expand=0&rev=388 --- patches.tar.bz2 | 4 ++-- samba.changes | 6 ++++++ samba.spec | 5 ++++- vendor-files.tar.bz2 | 4 ++-- 4 files changed, 14 insertions(+), 5 deletions(-) diff --git a/patches.tar.bz2 b/patches.tar.bz2 index 0ab393b..f681789 100644 --- a/patches.tar.bz2 +++ b/patches.tar.bz2 @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:da36e31e01694b79a1489775403a2727161368a3ffdde422523d2b84963fcda3 -size 128908 +oid sha256:1dd3ab475ebb5408b757d7d91d462c8bedca2f65c59b8013a4aa791a327b966b +size 167077 diff --git a/samba.changes b/samba.changes index 13526e6..b9d323e 100644 --- a/samba.changes +++ b/samba.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Fri Feb 21 17:57:57 UTC 2014 - ddiss@suse.com + +- Use libarchive to provide improved smbclient tarmode functionality; + (bso#9667); (bnc#861135). + ------------------------------------------------------------------- Fri Feb 21 16:02:12 UTC 2014 - lmuelle@suse.com diff --git a/samba.spec b/samba.spec index 2adb855..b63f724 100644 --- a/samba.spec +++ b/samba.spec @@ -27,6 +27,9 @@ BuildRequires: patch BuildRequires: cups-devel BuildRequires: cyrus-sasl-devel BuildRequires: e2fsprogs-devel +%if 0%{?suse_version} > 1300 +BuildRequires: libarchive-devel +%endif %if 0%{?suse_version} > 1210 BuildRequires: gamin-devel %else @@ -141,7 +144,7 @@ BuildRequires: systemd %else %define build_make_smp_mflags %{?jobs:-j%jobs} %endif -%define SOURCE_TIMESTAMP 3185 +%define SOURCE_TIMESTAMP 3186 %define BRANCH %{version} %global with_mitkrb5 1 %global with_dc 0 diff --git a/vendor-files.tar.bz2 b/vendor-files.tar.bz2 index 5cb441b..989b8be 100644 --- a/vendor-files.tar.bz2 +++ b/vendor-files.tar.bz2 @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:36a0897149207a54808f6f516277e8bc89d89a0ef24a9dd508d44dff43d7c33b -size 54227 +oid sha256:0aff77e09c7329ae8188c64fb7397460b096ebda69bb1a477539f6e1538a9873 +size 54192