From 8a2bceb7d67f568f6ccda8e0c6f98d5b296803e939bea6347b5c5bfa3d4146ee Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Lars=20M=C3=BCller?= Date: Tue, 1 Mar 2016 17:45:52 +0000 Subject: [PATCH 1/5] Relocate existing lock files to /var/lib/samba/lock; (bsc#968963). OBS-URL: https://build.opensuse.org/package/show/network:samba:STABLE/samba?expand=0&rev=527 --- patches.tar.bz2 | 4 ++-- samba.changes | 5 +++++ samba.spec | 6 +++++- vendor-files.tar.bz2 | 4 ++-- 4 files changed, 14 insertions(+), 5 deletions(-) diff --git a/patches.tar.bz2 b/patches.tar.bz2 index 6af1457..9392af3 100644 --- a/patches.tar.bz2 +++ b/patches.tar.bz2 @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:abff919fade9fd55a74acd398865ab0ad9ef30052a25c876f54a831bbe512a45 -size 12703 +oid sha256:6f1cfb5be95e738f5532b1823d05d62cd74a0180d483213703f2eccb879e8100 +size 12725 diff --git a/samba.changes b/samba.changes index 72055e8..e0f8f75 100644 --- a/samba.changes +++ b/samba.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Tue Mar 1 17:28:09 UTC 2016 - lmuelle@suse.com + +- Relocate existing lock files to /var/lib/samba/lock; (bsc#968963). + ------------------------------------------------------------------- Tue Feb 23 09:47:53 UTC 2016 - lmuelle@suse.com diff --git a/samba.spec b/samba.spec index 1f129a4..b98d510 100644 --- a/samba.spec +++ b/samba.spec @@ -142,7 +142,7 @@ BuildRequires: libpcp-devel %else %define build_make_smp_mflags %{?jobs:-j%jobs} %endif -%define SOURCE_TIMESTAMP 3599 +%define SOURCE_TIMESTAMP 3607 %define BRANCH %{version} %global with_mitkrb5 1 %global with_dc 0 @@ -1574,6 +1574,10 @@ for fn in netlogon_creds_cli.tdb passdb.tdb secrets.tdb smbpasswd; do test ! -e %{LOCKDIR}/private/$fn && test -e %{CONFIGDIR}/$fn && \ mv %{CONFIGDIR}/$fn %{LOCKDIR}/private done +for fn in brlock.tdb dbwrap_watchers.tdb gencache_notrans.tdb leases.tdb locking.tdb mutex.tdb names.tdb printer_list.tdb serverid.tdb smbXsrv_client_global.tdb smbXsrv_open_global.tdb smbXsrv_session_global.tdb smbXsrv_tcon_global.tdb smbXsrv_version_global.tdb srv_fss.tdb; do + test ! -e %{LOCKDIR}/lock/$fn && test -e %{LOCKDIR}/$fn && \ + mv %{LOCKDIR}/$fn %{LOCKDIR}/lock +done %if 0%{?suse_version} && 0%{?suse_version} < 1221 if [ ${1:-0} -gt 1 -a -f /var/adm/backup/etc_samba_smbfstab-move ]; then test -f /etc/samba/cifstab && \ diff --git a/vendor-files.tar.bz2 b/vendor-files.tar.bz2 index 8221e67..417c837 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:dfbf445865578d7e39cbe5d2d1f9f38b1c19496edc80b7f6ddb541ee4f80418e -size 55671 +oid sha256:163edeacaedd59e3721c0c113cfd03abadf8b1648dac2a2f3bfe7010b967ef07 +size 55710 From e8d66ad90cbbe8386403d3a526885ae7487b4cd9ebaed2665fbd388f74c81e86 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Lars=20M=C3=BCller?= Date: Tue, 1 Mar 2016 18:18:14 +0000 Subject: [PATCH 2/5] Only obsolete but do not provide gplv2/3 package names; (bsc#968973). OBS-URL: https://build.opensuse.org/package/show/network:samba:STABLE/samba?expand=0&rev=528 --- patches.tar.bz2 | 4 ++-- samba.changes | 5 +++++ samba.spec | 8 +------- vendor-files.tar.bz2 | 4 ++-- 4 files changed, 10 insertions(+), 11 deletions(-) diff --git a/patches.tar.bz2 b/patches.tar.bz2 index 9392af3..250d7be 100644 --- a/patches.tar.bz2 +++ b/patches.tar.bz2 @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:6f1cfb5be95e738f5532b1823d05d62cd74a0180d483213703f2eccb879e8100 -size 12725 +oid sha256:7faac92050b79673cf8dc00b1f58c0514be1e032e76920bb35c44b5733574109 +size 12707 diff --git a/samba.changes b/samba.changes index e0f8f75..0168dbd 100644 --- a/samba.changes +++ b/samba.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Tue Mar 1 18:03:17 UTC 2016 - lmuelle@suse.com + +- Only obsolete but do not provide gplv2/3 package names; (bsc#968973). + ------------------------------------------------------------------- Tue Mar 1 17:28:09 UTC 2016 - lmuelle@suse.com diff --git a/samba.spec b/samba.spec index b98d510..e3a347a 100644 --- a/samba.spec +++ b/samba.spec @@ -142,14 +142,13 @@ BuildRequires: libpcp-devel %else %define build_make_smp_mflags %{?jobs:-j%jobs} %endif -%define SOURCE_TIMESTAMP 3607 +%define SOURCE_TIMESTAMP 0 %define BRANCH %{version} %global with_mitkrb5 1 %global with_dc 0 Version: 4.3.5 Release: 0 Url: https://www.samba.org/ -Provides: samba-gplv3 = %{version} Obsoletes: samba-gplv3 < %{version} %if 0%{?suse_version} > 1030 Recommends: cron @@ -251,10 +250,8 @@ Branch: %{BRANCH} Summary: Samba Client Utilities License: GPL-3.0+ Group: Productivity/Networking/Samba -Provides: samba-gplv3-client = %{version} Provides: smbfs Obsoletes: samba-gplv3-client < %{version} -Provides: samba-client-gplv2 = %{version} Obsoletes: samba-client-gplv2 < %{version} %if 0%{?suse_version} > 0 PreReq: %{?insserv_prereq} @@ -309,9 +306,7 @@ License: GPL-3.0+ Group: Documentation/Other PreReq: coreutils PreReq: findutils -Provides: samba-gplv3-doc = %{version} Obsoletes: samba-gplv3-doc < %{version} -Provides: samba-doc-gplv2 = %{version} Obsoletes: samba-doc-gplv2 < %{version} %if 0%{?suse_version} > 1110 BuildArch: noarch @@ -414,7 +409,6 @@ Branch: %{BRANCH} Summary: Winbind Daemon and Tool License: GPL-3.0+ Group: Productivity/Networking/Samba -Provides: samba-gplv3-winbind = %{version} Obsoletes: samba-gplv3-winbind < %{version} Provides: samba-client:/usr/sbin/winbindd Requires: %{libwbclient_name} = %{version}-%{release} diff --git a/vendor-files.tar.bz2 b/vendor-files.tar.bz2 index 417c837..c358f76 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:163edeacaedd59e3721c0c113cfd03abadf8b1648dac2a2f3bfe7010b967ef07 -size 55710 +oid sha256:00a65248884f3df5c551e5eca9e1ee237d44857b6931e038830932b741ad3259 +size 55714 From 91761c314579f1d1a1516127361b5da015b07e0537627971c8af7a97fe81b2f9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Lars=20M=C3=BCller?= Date: Wed, 2 Mar 2016 15:19:44 +0000 Subject: [PATCH 3/5] Relocate lock directory to the client package Else the directory is missing at install time and the relocating mv command stacked one dir into the next with the same name. The last remaining lock file then later got replaced by the dir created by the samba (main) package. Adding a ending / to the destination also of lock and private ensures this will not bit us again. OBS-URL: https://build.opensuse.org/package/show/network:samba:STABLE/samba?expand=0&rev=529 --- patches.tar.bz2 | 4 ++-- samba.spec | 8 ++++---- vendor-files.tar.bz2 | 4 ++-- 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/patches.tar.bz2 b/patches.tar.bz2 index 250d7be..f2e3a0b 100644 --- a/patches.tar.bz2 +++ b/patches.tar.bz2 @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:7faac92050b79673cf8dc00b1f58c0514be1e032e76920bb35c44b5733574109 -size 12707 +oid sha256:6dd076b965812674d50e32648319ffbcc14a2ce2b876224fe913eacb7c621ca2 +size 12702 diff --git a/samba.spec b/samba.spec index e3a347a..b46d9b4 100644 --- a/samba.spec +++ b/samba.spec @@ -142,7 +142,7 @@ BuildRequires: libpcp-devel %else %define build_make_smp_mflags %{?jobs:-j%jobs} %endif -%define SOURCE_TIMESTAMP 0 +%define SOURCE_TIMESTAMP 3609 %define BRANCH %{version} %global with_mitkrb5 1 %global with_dc 0 @@ -1566,11 +1566,11 @@ else fi for fn in netlogon_creds_cli.tdb passdb.tdb secrets.tdb smbpasswd; do test ! -e %{LOCKDIR}/private/$fn && test -e %{CONFIGDIR}/$fn && \ - mv %{CONFIGDIR}/$fn %{LOCKDIR}/private + mv %{CONFIGDIR}/$fn %{LOCKDIR}/private/ done for fn in brlock.tdb dbwrap_watchers.tdb gencache_notrans.tdb leases.tdb locking.tdb mutex.tdb names.tdb printer_list.tdb serverid.tdb smbXsrv_client_global.tdb smbXsrv_open_global.tdb smbXsrv_session_global.tdb smbXsrv_tcon_global.tdb smbXsrv_version_global.tdb srv_fss.tdb; do test ! -e %{LOCKDIR}/lock/$fn && test -e %{LOCKDIR}/$fn && \ - mv %{LOCKDIR}/$fn %{LOCKDIR}/lock + mv %{LOCKDIR}/$fn %{LOCKDIR}/lock/ done %if 0%{?suse_version} && 0%{?suse_version} < 1221 if [ ${1:-0} -gt 1 -a -f /var/adm/backup/etc_samba_smbfstab-move ]; then @@ -1773,7 +1773,6 @@ fi %{_libdir}/samba/config %{_libdir}/samba/rpc %attr(0775,root,ntadmin) %{LOCKDIR}/drivers -%dir %{LOCKDIR}/lock %dir %{LOCKDIR}/lock/msg.lock %{LOCKDIR}/netlogon %attr(0770,root,users) %dir %{LOCKDIR}/profiles @@ -1953,6 +1952,7 @@ fi %{_localstatedir}/adm/fillup-templates/samba-client-dhcp.conf %{_localstatedir}/adm/fillup-templates/sysconfig.dhcp-samba-client %dir %{LOCKDIR} +%dir %{LOCKDIR}/lock %dir %{LOCKDIR}/private %attr(0700,root,root) %dir %{LOCKDIR}/private/msg.sock %attr(0750,root,root) %dir %{LOGDIR} diff --git a/vendor-files.tar.bz2 b/vendor-files.tar.bz2 index c358f76..5076734 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:00a65248884f3df5c551e5eca9e1ee237d44857b6931e038830932b741ad3259 -size 55714 +oid sha256:3aa0febdd885f37e1b8b757160e883ca17a79a165210c4f89db13dc41a91d8bc +size 55686 From 5a0be9a0e1e07776773a12c94ac6d56dfd88343e85c62a6724eb5bab3b8de3ef Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Lars=20M=C3=BCller?= Date: Wed, 2 Mar 2016 17:55:24 +0000 Subject: [PATCH 4/5] Add connections.tdb and g_lock.tdb OBS-URL: https://build.opensuse.org/package/show/network:samba:STABLE/samba?expand=0&rev=530 --- patches.tar.bz2 | 4 ++-- samba.spec | 4 ++-- vendor-files.tar.bz2 | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/patches.tar.bz2 b/patches.tar.bz2 index f2e3a0b..266fcf4 100644 --- a/patches.tar.bz2 +++ b/patches.tar.bz2 @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:6dd076b965812674d50e32648319ffbcc14a2ce2b876224fe913eacb7c621ca2 -size 12702 +oid sha256:9d62271131b8536fc1e4b964e69d48e0d735b0bb4cde3c82517b38bcf94bb748 +size 12670 diff --git a/samba.spec b/samba.spec index b46d9b4..7204091 100644 --- a/samba.spec +++ b/samba.spec @@ -142,7 +142,7 @@ BuildRequires: libpcp-devel %else %define build_make_smp_mflags %{?jobs:-j%jobs} %endif -%define SOURCE_TIMESTAMP 3609 +%define SOURCE_TIMESTAMP 3610 %define BRANCH %{version} %global with_mitkrb5 1 %global with_dc 0 @@ -1568,7 +1568,7 @@ for fn in netlogon_creds_cli.tdb passdb.tdb secrets.tdb smbpasswd; do test ! -e %{LOCKDIR}/private/$fn && test -e %{CONFIGDIR}/$fn && \ mv %{CONFIGDIR}/$fn %{LOCKDIR}/private/ done -for fn in brlock.tdb dbwrap_watchers.tdb gencache_notrans.tdb leases.tdb locking.tdb mutex.tdb names.tdb printer_list.tdb serverid.tdb smbXsrv_client_global.tdb smbXsrv_open_global.tdb smbXsrv_session_global.tdb smbXsrv_tcon_global.tdb smbXsrv_version_global.tdb srv_fss.tdb; do +for fn in brlock.tdb connections.tdb dbwrap_watchers.tdb gencache_notrans.tdb g_lock.tdb leases.tdb locking.tdb mutex.tdb names.tdb printer_list.tdb serverid.tdb smbXsrv_client_global.tdb smbXsrv_open_global.tdb smbXsrv_session_global.tdb smbXsrv_tcon_global.tdb smbXsrv_version_global.tdb srv_fss.tdb; do test ! -e %{LOCKDIR}/lock/$fn && test -e %{LOCKDIR}/$fn && \ mv %{LOCKDIR}/$fn %{LOCKDIR}/lock/ done diff --git a/vendor-files.tar.bz2 b/vendor-files.tar.bz2 index 5076734..a639e1e 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:3aa0febdd885f37e1b8b757160e883ca17a79a165210c4f89db13dc41a91d8bc -size 55686 +oid sha256:5aaef1388aa1efc0353dd3fedbce14c9a9731043b5615d895a9198bf0855ed78 +size 55695 From ff89e0fef754fa0b79c4991f5b0b1eeae1a8d976ff7509ae83e85ab52ed9c683 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Lars=20M=C3=BCller?= Date: Wed, 2 Mar 2016 18:25:28 +0000 Subject: [PATCH 5/5] Add MACHINE.SID idmap2.tdb, and idmap_test.tdb OBS-URL: https://build.opensuse.org/package/show/network:samba:STABLE/samba?expand=0&rev=531 --- patches.tar.bz2 | 4 ++-- samba.spec | 4 ++-- vendor-files.tar.bz2 | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/patches.tar.bz2 b/patches.tar.bz2 index 266fcf4..1feb124 100644 --- a/patches.tar.bz2 +++ b/patches.tar.bz2 @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:9d62271131b8536fc1e4b964e69d48e0d735b0bb4cde3c82517b38bcf94bb748 -size 12670 +oid sha256:5b6319e2b07c7f7a2448209f2128daf859bb853040bbc95a51e5e6fc06a1c7f8 +size 12667 diff --git a/samba.spec b/samba.spec index 7204091..43a8a01 100644 --- a/samba.spec +++ b/samba.spec @@ -142,7 +142,7 @@ BuildRequires: libpcp-devel %else %define build_make_smp_mflags %{?jobs:-j%jobs} %endif -%define SOURCE_TIMESTAMP 3610 +%define SOURCE_TIMESTAMP 3611 %define BRANCH %{version} %global with_mitkrb5 1 %global with_dc 0 @@ -1564,7 +1564,7 @@ else %endif done fi -for fn in netlogon_creds_cli.tdb passdb.tdb secrets.tdb smbpasswd; do +for fn in MACHINE.SID idmap2.tdb idmap_test.tdb netlogon_creds_cli.tdb passdb.tdb secrets.tdb smbpasswd; do test ! -e %{LOCKDIR}/private/$fn && test -e %{CONFIGDIR}/$fn && \ mv %{CONFIGDIR}/$fn %{LOCKDIR}/private/ done diff --git a/vendor-files.tar.bz2 b/vendor-files.tar.bz2 index a639e1e..532b5ae 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:5aaef1388aa1efc0353dd3fedbce14c9a9731043b5615d895a9198bf0855ed78 -size 55695 +oid sha256:c65045cb4ebca0aa228364c5ea385f1818d0ada08bed54384b09668d082beb9e +size 55702