From 505be3e83b36b5a3d56a461110c541321247ef7635975adfc8c93244838fb5bd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Lars=20M=C3=BCller?= Date: Wed, 9 Sep 2015 16:28:50 +0000 Subject: [PATCH 01/10] Require to install libfam0-gamin from samba-libs on post-12.1 and pre-13.15 systems; (bnc#945013). OBS-URL: https://build.opensuse.org/package/show/network:samba:STABLE/samba?expand=0&rev=487 --- 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 0e084fd..3d64ed7 100644 --- a/patches.tar.bz2 +++ b/patches.tar.bz2 @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:da494bf2b836804c369acea802fe3e4351137b2ede7221a4ebdc37168d651b87 -size 29309 +oid sha256:5d89a280c01071d8bcc9baa2f0596b4c56879a54388b18a9770a666f6c3a3bc1 +size 29260 diff --git a/samba.changes b/samba.changes index 9d2abc3..42b70ff 100644 --- a/samba.changes +++ b/samba.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Wed Sep 9 10:57:52 UTC 2015 - lmuelle@suse.com + +- Require to install libfam0-gamin from samba-libs on post-12.1 and pre-13.15 + systems; (bnc#945013). + ------------------------------------------------------------------- Tue Sep 8 16:40:50 UTC 2015 - lmuelle@suse.com diff --git a/samba.spec b/samba.spec index f7cc581..3ab5ca2 100644 --- a/samba.spec +++ b/samba.spec @@ -144,7 +144,7 @@ BuildRequires: systemd-devel %else %define build_make_smp_mflags %{?jobs:-j%jobs} %endif -%define SOURCE_TIMESTAMP 3465 +%define SOURCE_TIMESTAMP 3467 %define BRANCH %{version} %global with_mitkrb5 1 %global with_dc 0 @@ -336,6 +336,9 @@ License: GPL-3.0+ Group: Development/Libraries/C and C++ Requires: krb5 PreReq: /sbin/ldconfig +%if 0%{?suse_version} > 1210 && 0%{?suse_version} < 1315 +Requires: libfam0-gamin +%endif %description libs The samba-libs package contains the libraries needed by programs that diff --git a/vendor-files.tar.bz2 b/vendor-files.tar.bz2 index c523e82..5873fec 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:c51c866e1445b298e8e9218a131af28d943d14f42247c1aa66682edaf471030d -size 52983 +oid sha256:501dbd56c76e11891881981c39a16bdbf031fe5042ecbd994ed9ec35fed3d89e +size 52903 From 9fbd9cad4e79c4872144e419d134732b6fffb029b5de711108d56cab4b1a9db7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Lars=20M=C3=BCller?= Date: Fri, 11 Sep 2015 16:05:32 +0000 Subject: [PATCH 02/10] Package /var/lib/samba/msg with 0755 permissions; (bnc#945502). OBS-URL: https://build.opensuse.org/package/show/network:samba:STABLE/samba?expand=0&rev=488 --- patches.tar.bz2 | 4 ++-- samba.changes | 7 ++++++- samba.spec | 3 ++- vendor-files.tar.bz2 | 4 ++-- 4 files changed, 12 insertions(+), 6 deletions(-) diff --git a/patches.tar.bz2 b/patches.tar.bz2 index 3d64ed7..6422dd3 100644 --- a/patches.tar.bz2 +++ b/patches.tar.bz2 @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:5d89a280c01071d8bcc9baa2f0596b4c56879a54388b18a9770a666f6c3a3bc1 -size 29260 +oid sha256:605fbbf67006f7acc753c452b85b738e920178513d9c8fc25d8f259b4bfabba5 +size 29270 diff --git a/samba.changes b/samba.changes index 42b70ff..68ea7c2 100644 --- a/samba.changes +++ b/samba.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Fri Sep 11 15:53:45 UTC 2015 - lmuelle@suse.com + +- Package /var/lib/samba/msg with 0755 permissions; (bnc#945502). + ------------------------------------------------------------------- Wed Sep 9 10:57:52 UTC 2015 - lmuelle@suse.com @@ -132,7 +137,7 @@ Fri Jul 3 15:06:57 UTC 2015 - lmuelle@suse.com Tue Jun 16 14:27:28 UTC 2015 - nopower@suse.com - Backport changes to use resource group sids obtained from pac logon_info; - (bso#11328); (bnc#912457) + (bso#11328); (bnc#912457). ------------------------------------------------------------------- Sat Jun 6 03:41:17 UTC 2015 - crrodriguez@opensuse.org diff --git a/samba.spec b/samba.spec index 3ab5ca2..04f370c 100644 --- a/samba.spec +++ b/samba.spec @@ -144,7 +144,7 @@ BuildRequires: systemd-devel %else %define build_make_smp_mflags %{?jobs:-j%jobs} %endif -%define SOURCE_TIMESTAMP 3467 +%define SOURCE_TIMESTAMP 3477 %define BRANCH %{version} %global with_mitkrb5 1 %global with_dc 0 @@ -1666,6 +1666,7 @@ fi %endif /%{_lib}/security/pam_smbpass.so %dir %{_libdir}/samba +%attr(0755,root,root) %dir %{_libdir}/samba/msg %dir %{_libdir}/samba/vfs %{_libdir}/samba/auth %{_libdir}/samba/config diff --git a/vendor-files.tar.bz2 b/vendor-files.tar.bz2 index 5873fec..06ab82a 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:501dbd56c76e11891881981c39a16bdbf031fe5042ecbd994ed9ec35fed3d89e -size 52903 +oid sha256:76a296176b8f0bc22fdc5dfa5476c8d580a1f09daeb34cf11d598bdfbeb33064 +size 52877 From 4feae129de824944ce4e7dfe86a21498553c7c0333089d70d942b282ffff6c78 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Lars=20M=C3=BCller?= Date: Fri, 11 Sep 2015 17:58:11 +0000 Subject: [PATCH 03/10] Replace _libdir by _localstatedir for the msg dir OBS-URL: https://build.opensuse.org/package/show/network:samba:STABLE/samba?expand=0&rev=489 --- patches.tar.bz2 | 4 ++-- samba.spec | 6 +++--- vendor-files.tar.bz2 | 4 ++-- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/patches.tar.bz2 b/patches.tar.bz2 index 6422dd3..4a9faec 100644 --- a/patches.tar.bz2 +++ b/patches.tar.bz2 @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:605fbbf67006f7acc753c452b85b738e920178513d9c8fc25d8f259b4bfabba5 -size 29270 +oid sha256:5cd9e36158beb7e32fe817edf75a9ffcc41cda9c8fe53d1933d0dd3b4df467e9 +size 29279 diff --git a/samba.spec b/samba.spec index 04f370c..a3d4e1a 100644 --- a/samba.spec +++ b/samba.spec @@ -144,7 +144,7 @@ BuildRequires: systemd-devel %else %define build_make_smp_mflags %{?jobs:-j%jobs} %endif -%define SOURCE_TIMESTAMP 3477 +%define SOURCE_TIMESTAMP 3478 %define BRANCH %{version} %global with_mitkrb5 1 %global with_dc 0 @@ -1224,7 +1224,7 @@ install -d -m 0755 -p \ %{buildroot}/%{_datadir}/omc/svcinfo.d \ %{buildroot}/%{_datadir}/samba/{LDAP,templates} \ %{buildroot}/%{_localstatedir}/adm \ - %{buildroot}/%{LOCKDIR}/{netlogon,drivers/{WIN40,W32X86,W32MIPS,W32ALPHA,W32PPC,IA64,x64},printing,profiles,winbindd_privileged} \ + %{buildroot}/%{LOCKDIR}/{drivers/{WIN40,W32X86,W32MIPS,W32ALPHA,W32PPC,IA64,x64},netlogon,msg,printing,profiles,winbindd_privileged} \ %{buildroot}/%{LOGDIR} \ %{buildroot}/%{PIDDIR} \ %{buildroot}/%{_var}/adm/fillup-templates \ @@ -1666,12 +1666,12 @@ fi %endif /%{_lib}/security/pam_smbpass.so %dir %{_libdir}/samba -%attr(0755,root,root) %dir %{_libdir}/samba/msg %dir %{_libdir}/samba/vfs %{_libdir}/samba/auth %{_libdir}/samba/config %{_libdir}/samba/rpc %attr(0775,root,ntadmin) %{LOCKDIR}/drivers +%attr(0755,root,root) %dir %{LOCKDIR}/msg %{LOCKDIR}/netlogon %attr(0770,root,users) %dir %{LOCKDIR}/profiles %{_bindir}/smbstatus diff --git a/vendor-files.tar.bz2 b/vendor-files.tar.bz2 index 06ab82a..3bfe6b6 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:76a296176b8f0bc22fdc5dfa5476c8d580a1f09daeb34cf11d598bdfbeb33064 -size 52877 +oid sha256:4cafb8bd308d250a037eda3b8f6e0db22a847f4ad9814072cb7dfe7fc39d0e7f +size 52929 From 7430495a61ddb0732f2463a79ac92f11bf8000e7169fadb4b5d2daffac1d1c23 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Lars=20M=C3=BCller?= Date: Fri, 11 Sep 2015 18:22:32 +0000 Subject: [PATCH 04/10] Drop superfluous %attr from msg dir 0755 is the mode we use by default to create the dirs at build-time OBS-URL: https://build.opensuse.org/package/show/network:samba:STABLE/samba?expand=0&rev=490 --- 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 4a9faec..8c6b61e 100644 --- a/patches.tar.bz2 +++ b/patches.tar.bz2 @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:5cd9e36158beb7e32fe817edf75a9ffcc41cda9c8fe53d1933d0dd3b4df467e9 -size 29279 +oid sha256:a59d1cedc84c7025cd908504565a918a744416b65c210eafa808f249e668369f +size 29330 diff --git a/samba.spec b/samba.spec index a3d4e1a..32cf992 100644 --- a/samba.spec +++ b/samba.spec @@ -144,7 +144,7 @@ BuildRequires: systemd-devel %else %define build_make_smp_mflags %{?jobs:-j%jobs} %endif -%define SOURCE_TIMESTAMP 3478 +%define SOURCE_TIMESTAMP 3479 %define BRANCH %{version} %global with_mitkrb5 1 %global with_dc 0 @@ -1671,7 +1671,7 @@ fi %{_libdir}/samba/config %{_libdir}/samba/rpc %attr(0775,root,ntadmin) %{LOCKDIR}/drivers -%attr(0755,root,root) %dir %{LOCKDIR}/msg +%dir %{LOCKDIR}/msg %{LOCKDIR}/netlogon %attr(0770,root,users) %dir %{LOCKDIR}/profiles %{_bindir}/smbstatus diff --git a/vendor-files.tar.bz2 b/vendor-files.tar.bz2 index 3bfe6b6..2bdbd91 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:4cafb8bd308d250a037eda3b8f6e0db22a847f4ad9814072cb7dfe7fc39d0e7f -size 52929 +oid sha256:742de3afacfb450f4de61c3d480fb7f686d9e5a99693e57575ed2eaf18897f58 +size 52934 From eb55750eeff40317c8dd243fb973e77d31f490c936eec90c9224381f93a2511a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Lars=20M=C3=BCller?= Date: Wed, 16 Sep 2015 13:30:51 +0000 Subject: [PATCH 05/10] Package /var/lib/samba/private/sock with 0700 permissions; (bnc#946051). OBS-URL: https://build.opensuse.org/package/show/network:samba:STABLE/samba?expand=0&rev=491 --- patches.tar.bz2 | 4 ++-- samba.changes | 5 +++++ samba.spec | 7 ++++--- vendor-files.tar.bz2 | 4 ++-- 4 files changed, 13 insertions(+), 7 deletions(-) diff --git a/patches.tar.bz2 b/patches.tar.bz2 index 8c6b61e..b66ac75 100644 --- a/patches.tar.bz2 +++ b/patches.tar.bz2 @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:a59d1cedc84c7025cd908504565a918a744416b65c210eafa808f249e668369f -size 29330 +oid sha256:b67f27626d2de8af237aa565110757c9883e04ac6b1908d6266ec32d743b0400 +size 29269 diff --git a/samba.changes b/samba.changes index 68ea7c2..3b4e9ea 100644 --- a/samba.changes +++ b/samba.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Wed Sep 16 13:06:36 UTC 2015 - lmuelle@suse.com + +- Package /var/lib/samba/private/sock with 0700 permissions; (bnc#946051). + ------------------------------------------------------------------- Fri Sep 11 15:53:45 UTC 2015 - lmuelle@suse.com diff --git a/samba.spec b/samba.spec index 32cf992..8d6aaca 100644 --- a/samba.spec +++ b/samba.spec @@ -144,7 +144,7 @@ BuildRequires: systemd-devel %else %define build_make_smp_mflags %{?jobs:-j%jobs} %endif -%define SOURCE_TIMESTAMP 3479 +%define SOURCE_TIMESTAMP 3481 %define BRANCH %{version} %global with_mitkrb5 1 %global with_dc 0 @@ -1173,7 +1173,6 @@ CONFIGURE_OPTIONS="\ --with-pammodulesdir=%{_lib}/security \ --with-pam_smbpass \ --with-piddir=%{PIDDIR} \ - --with-privatedir=%{CONFIGDIR} \ --with-quotas \ --with-syslog \ %if 0%{?suse_version} > 1220 @@ -1224,7 +1223,7 @@ install -d -m 0755 -p \ %{buildroot}/%{_datadir}/omc/svcinfo.d \ %{buildroot}/%{_datadir}/samba/{LDAP,templates} \ %{buildroot}/%{_localstatedir}/adm \ - %{buildroot}/%{LOCKDIR}/{drivers/{WIN40,W32X86,W32MIPS,W32ALPHA,W32PPC,IA64,x64},netlogon,msg,printing,profiles,winbindd_privileged} \ + %{buildroot}/%{LOCKDIR}/{drivers/{WIN40,W32X86,W32MIPS,W32ALPHA,W32PPC,IA64,x64},netlogon,msg,printing,private/sock,profiles,winbindd_privileged} \ %{buildroot}/%{LOGDIR} \ %{buildroot}/%{PIDDIR} \ %{buildroot}/%{_var}/adm/fillup-templates \ @@ -1673,6 +1672,8 @@ fi %attr(0775,root,ntadmin) %{LOCKDIR}/drivers %dir %{LOCKDIR}/msg %{LOCKDIR}/netlogon +%dir %{LOCKDIR}/private +%attr(0700,root,root) %dir %{LOCKDIR}/private/sock %attr(0770,root,users) %dir %{LOCKDIR}/profiles %{_bindir}/smbstatus %{_sbindir}/nmbd diff --git a/vendor-files.tar.bz2 b/vendor-files.tar.bz2 index 2bdbd91..efd5a8e 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:742de3afacfb450f4de61c3d480fb7f686d9e5a99693e57575ed2eaf18897f58 -size 52934 +oid sha256:3c9cf9426f10cd78e5979540812b845e42e38918efaf18b2b77588a0c0c21e45 +size 52927 From 5b4a4124a0d2783a372e430bf10e24f2e956d5424ef3eed73183c99ef05b78c1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Lars=20M=C3=BCller?= Date: Wed, 16 Sep 2015 14:42:27 +0000 Subject: [PATCH 06/10] Follow up to the previous commit /var/lib/samba/private/sock belongs to the client package which is required by winbind and the main Samba package. OBS-URL: https://build.opensuse.org/package/show/network:samba:STABLE/samba?expand=0&rev=492 --- patches.tar.bz2 | 4 ++-- samba.spec | 6 +++--- vendor-files.tar.bz2 | 4 ++-- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/patches.tar.bz2 b/patches.tar.bz2 index b66ac75..82f057f 100644 --- a/patches.tar.bz2 +++ b/patches.tar.bz2 @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:b67f27626d2de8af237aa565110757c9883e04ac6b1908d6266ec32d743b0400 -size 29269 +oid sha256:c36571cf9688890a4a69f6924cdf1d383661444577eaa0f56926f91bcccae652 +size 29266 diff --git a/samba.spec b/samba.spec index 8d6aaca..1e0d435 100644 --- a/samba.spec +++ b/samba.spec @@ -144,7 +144,7 @@ BuildRequires: systemd-devel %else %define build_make_smp_mflags %{?jobs:-j%jobs} %endif -%define SOURCE_TIMESTAMP 3481 +%define SOURCE_TIMESTAMP 3482 %define BRANCH %{version} %global with_mitkrb5 1 %global with_dc 0 @@ -1672,8 +1672,6 @@ fi %attr(0775,root,ntadmin) %{LOCKDIR}/drivers %dir %{LOCKDIR}/msg %{LOCKDIR}/netlogon -%dir %{LOCKDIR}/private -%attr(0700,root,root) %dir %{LOCKDIR}/private/sock %attr(0770,root,users) %dir %{LOCKDIR}/profiles %{_bindir}/smbstatus %{_sbindir}/nmbd @@ -1849,6 +1847,8 @@ fi %{_localstatedir}/adm/fillup-templates/samba-client-dhcp.conf %{_localstatedir}/adm/fillup-templates/sysconfig.dhcp-samba-client %dir %{LOCKDIR} +%dir %{LOCKDIR}/private +%attr(0700,root,root) %dir %{LOCKDIR}/private/sock %attr(0750,root,root) %dir %{LOGDIR} %ghost %dir %{PIDDIR} %if 0%{?suse_version} > 1220 diff --git a/vendor-files.tar.bz2 b/vendor-files.tar.bz2 index efd5a8e..6344da6 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:3c9cf9426f10cd78e5979540812b845e42e38918efaf18b2b77588a0c0c21e45 -size 52927 +oid sha256:9d9248fce6083b90aad859771a5dc43dd08bcd6af60ab38547391122ecd58e2a +size 52939 From 684bdd790c4d9d34c3717e7d8389e1595223d48fe40517fa97f0e41fd419328d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Lars=20M=C3=BCller?= Date: Wed, 16 Sep 2015 14:44:27 +0000 Subject: [PATCH 07/10] Now with the correct build source timestamp 3482 OBS-URL: https://build.opensuse.org/package/show/network:samba:STABLE/samba?expand=0&rev=493 --- patches.tar.bz2 | 4 ++-- vendor-files.tar.bz2 | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/patches.tar.bz2 b/patches.tar.bz2 index 82f057f..3311935 100644 --- a/patches.tar.bz2 +++ b/patches.tar.bz2 @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:c36571cf9688890a4a69f6924cdf1d383661444577eaa0f56926f91bcccae652 -size 29266 +oid sha256:892dfa35fcbe496c94c29c62f1b403bfa873fcef48e4c3a7a4caa2339c9b26fd +size 29285 diff --git a/vendor-files.tar.bz2 b/vendor-files.tar.bz2 index 6344da6..e5f3e89 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:9d9248fce6083b90aad859771a5dc43dd08bcd6af60ab38547391122ecd58e2a -size 52939 +oid sha256:79c82f98880c69d38d46c1f9bdd86aed2f06d453aa17d8502559ed9dc5c9bbf6 +size 52911 From 067d02bf439f028070587101eb27018421ed8ffa3db1ddf4ce6ac179f259cac8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Lars=20M=C3=BCller?= Date: Wed, 16 Sep 2015 20:36:06 +0000 Subject: [PATCH 08/10] Migarte passdb.tdb secrets.tdb smbpasswd - to enhance the previous commit - do it in the post of the client which is required by winbind and the main package; a potential race condition is the restart on update mechanism if the main or winbind packages gets installed before the client package OBS-URL: https://build.opensuse.org/package/show/network:samba:STABLE/samba?expand=0&rev=494 --- patches.tar.bz2 | 4 ++-- samba.spec | 6 +++++- vendor-files.tar.bz2 | 4 ++-- 3 files changed, 9 insertions(+), 5 deletions(-) diff --git a/patches.tar.bz2 b/patches.tar.bz2 index 3311935..6b33805 100644 --- a/patches.tar.bz2 +++ b/patches.tar.bz2 @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:892dfa35fcbe496c94c29c62f1b403bfa873fcef48e4c3a7a4caa2339c9b26fd -size 29285 +oid sha256:0d8de14f3d3713b98925dd38925b9fc4040ea0b0392bb725aefd595ed7a31154 +size 29251 diff --git a/samba.spec b/samba.spec index 1e0d435..08229bc 100644 --- a/samba.spec +++ b/samba.spec @@ -144,7 +144,7 @@ BuildRequires: systemd-devel %else %define build_make_smp_mflags %{?jobs:-j%jobs} %endif -%define SOURCE_TIMESTAMP 3482 +%define SOURCE_TIMESTAMP 3483 %define BRANCH %{version} %global with_mitkrb5 1 %global with_dc 0 @@ -1505,6 +1505,10 @@ else %endif done fi +for fn in passdb.tdb secrets.tdb smbpasswd; do + test ! -e %{LOCKDIR}/private/$fn && test -e %{CONFIGDIR}/$fn && \ + mv %{CONFIGDIR}/$fn %{LOCKDIR}/private +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 e5f3e89..495c156 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:79c82f98880c69d38d46c1f9bdd86aed2f06d453aa17d8502559ed9dc5c9bbf6 -size 52911 +oid sha256:f80640c657ac307e0c1a7da5f584d6a135f6bc60f2cbf18fc74a589e6a2808df +size 53066 From 1461cfcec99af9b954c41dcb54ec6ec0ecdfe83d99aa8ff06688046f16b82ab6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Lars=20M=C3=BCller?= Date: Thu, 17 Sep 2015 12:44:19 +0000 Subject: [PATCH 09/10] Enhance last commit by adding netlogon_creds_cli.tdb OBS-URL: https://build.opensuse.org/package/show/network:samba:STABLE/samba?expand=0&rev=495 --- 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 6b33805..939e2eb 100644 --- a/patches.tar.bz2 +++ b/patches.tar.bz2 @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:0d8de14f3d3713b98925dd38925b9fc4040ea0b0392bb725aefd595ed7a31154 -size 29251 +oid sha256:f0ee579f6828ad87516f296afe8e1020ab874da2f83ecc86e239e0748a05807a +size 29260 diff --git a/samba.spec b/samba.spec index 08229bc..a3be57f 100644 --- a/samba.spec +++ b/samba.spec @@ -144,7 +144,7 @@ BuildRequires: systemd-devel %else %define build_make_smp_mflags %{?jobs:-j%jobs} %endif -%define SOURCE_TIMESTAMP 3483 +%define SOURCE_TIMESTAMP 3484 %define BRANCH %{version} %global with_mitkrb5 1 %global with_dc 0 @@ -1505,7 +1505,7 @@ else %endif done fi -for fn in passdb.tdb secrets.tdb smbpasswd; do +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 diff --git a/vendor-files.tar.bz2 b/vendor-files.tar.bz2 index 495c156..24e9f66 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:f80640c657ac307e0c1a7da5f584d6a135f6bc60f2cbf18fc74a589e6a2808df -size 53066 +oid sha256:5abf6368a5cc2b7668ae41c2b6065f7941e7a6f44274f7103ace8b4e961a286d +size 52821 From a5ea207f93c7069bb3ccb4f1fc02c00deab946f4adbc7117e6480d85e749d680 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Lars=20M=C3=BCller?= Date: Fri, 18 Sep 2015 07:18:52 +0000 Subject: [PATCH 10/10] Revert 'Do not provide and obsolete libpdb0 from libsamba-passdb0' bnc#942716 OBS-URL: https://build.opensuse.org/package/show/network:samba:STABLE/samba?expand=0&rev=496 --- patches.tar.bz2 | 4 ++-- samba.changes | 5 ----- samba.spec | 4 +++- vendor-files.tar.bz2 | 4 ++-- 4 files changed, 7 insertions(+), 10 deletions(-) diff --git a/patches.tar.bz2 b/patches.tar.bz2 index 939e2eb..37f0942 100644 --- a/patches.tar.bz2 +++ b/patches.tar.bz2 @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:f0ee579f6828ad87516f296afe8e1020ab874da2f83ecc86e239e0748a05807a -size 29260 +oid sha256:f41b1ca9ba6ac11db93bf35ee0be2b4951c6ab3828d6177c48c091d672134eb6 +size 29304 diff --git a/samba.changes b/samba.changes index 3b4e9ea..e61e0a7 100644 --- a/samba.changes +++ b/samba.changes @@ -53,11 +53,6 @@ Tue Sep 8 16:40:50 UTC 2015 - lmuelle@suse.com + AD samr GetGroupsForUser fails for users with "()" in their name; (bso#11488). -------------------------------------------------------------------- -Tue Sep 8 10:59:47 UTC 2015 - lmuelle@suse.com - -- Do not provide and obsolete libpdb0 from libsamba-passdb0; (bnc#942716). - ------------------------------------------------------------------- Mon Aug 31 22:34:57 UTC 2015 - lmuelle@suse.com diff --git a/samba.spec b/samba.spec index a3be57f..1b16c94 100644 --- a/samba.spec +++ b/samba.spec @@ -144,7 +144,7 @@ BuildRequires: systemd-devel %else %define build_make_smp_mflags %{?jobs:-j%jobs} %endif -%define SOURCE_TIMESTAMP 3484 +%define SOURCE_TIMESTAMP 3485 %define BRANCH %{version} %global with_mitkrb5 1 %global with_dc 0 @@ -765,6 +765,8 @@ Branch: %{BRANCH} Summary: Samba3 password database library License: GPL-3.0+ Group: System/Libraries +Provides: libpdb0 +Obsoletes: libpdb0 %description -n libsamba-passdb0 diff --git a/vendor-files.tar.bz2 b/vendor-files.tar.bz2 index 24e9f66..dc79b66 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:5abf6368a5cc2b7668ae41c2b6065f7941e7a6f44274f7103ace8b4e961a286d -size 52821 +oid sha256:a80b6dfa1b959e07fabaf9cbe58450211ebed1bca0f181b05d5ad4ecaabbeb25 +size 52898