Accepting request 331893 from network:samba:STABLE

This commit by intention reverts the

  Do not provide and obsolete libpdb0 from libsamba-passdb0

change is the reported issue requires more investigation.

With the first suggested solution we have two issues:

a) a library name conflict as reported to Samba upstream at
   https://bugzilla.samba.org/show_bug.cgi?id=10355

   As libpdb depends heavily on other versioned shared Samba libraries
	libpdb in the old version can't work alone.  We'll end up in a
	library missmatch.

b) libzypp (YaST/ zypper) pulls in libpdb0 _i586_ from the main openSUSE
   13.2 repository for example

The actual package changes are:

- Package /var/lib/samba/private/sock with 0700 permissions; (bnc#946051).

- Package /var/lib/samba/msg with 0755 permissions; (bnc#945502).

- 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/request/show/331893
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/samba?expand=0&rev=190
This commit is contained in:
Stephan Kulow 2015-09-19 04:54:26 +00:00 committed by Git OBS Bridge
commit 2e9518f4f9
4 changed files with 35 additions and 13 deletions

View File

@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:da494bf2b836804c369acea802fe3e4351137b2ede7221a4ebdc37168d651b87
size 29309
oid sha256:f41b1ca9ba6ac11db93bf35ee0be2b4951c6ab3828d6177c48c091d672134eb6
size 29304

View File

@ -1,3 +1,19 @@
-------------------------------------------------------------------
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
- Package /var/lib/samba/msg with 0755 permissions; (bnc#945502).
-------------------------------------------------------------------
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
@ -37,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
@ -126,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

View File

@ -144,7 +144,7 @@ BuildRequires: systemd-devel
%else
%define build_make_smp_mflags %{?jobs:-j%jobs}
%endif
%define SOURCE_TIMESTAMP 3465
%define SOURCE_TIMESTAMP 3485
%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
@ -762,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
@ -1170,7 +1175,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
@ -1221,7 +1225,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,private/sock,profiles,winbindd_privileged} \
%{buildroot}/%{LOGDIR} \
%{buildroot}/%{PIDDIR} \
%{buildroot}/%{_var}/adm/fillup-templates \
@ -1503,6 +1507,10 @@ else
%endif
done
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
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 && \
@ -1668,6 +1676,7 @@ fi
%{_libdir}/samba/config
%{_libdir}/samba/rpc
%attr(0775,root,ntadmin) %{LOCKDIR}/drivers
%dir %{LOCKDIR}/msg
%{LOCKDIR}/netlogon
%attr(0770,root,users) %dir %{LOCKDIR}/profiles
%{_bindir}/smbstatus
@ -1844,6 +1853,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

View File

@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:c51c866e1445b298e8e9218a131af28d943d14f42247c1aa66682edaf471030d
size 52983
oid sha256:a80b6dfa1b959e07fabaf9cbe58450211ebed1bca0f181b05d5ad4ecaabbeb25
size 52898