Accepting request 213925 from network:samba:STABLE

- Really add the WINBINDDOPTIONS sysconfig variable on install; (bnc#857454).

- Correct sysconfig variable names by adding the missing D char; (bnc#857454).

- Update to 4.1.4.
  + Fix segfault in smbd; (bso#10284).
  + Fix SMB2 server panic when a smb2 brlock times out; (bso#10311).

OBS-URL: https://build.opensuse.org/request/show/213925
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/samba?expand=0&rev=151
This commit is contained in:
Stephan Kulow 2014-01-15 18:36:17 +00:00 committed by Git OBS Bridge
commit 6409f3c747
7 changed files with 32 additions and 15 deletions

View File

@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:a648c41caa84afa1bc7a1a6e7f35f5607718e6693b6db8bbff32bff02708f577
size 86424
oid sha256:5e644442795539e95b7172924fb8bbd8d1430ab9f3d8700cbe56c94896337d40
size 71127

View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:71da208d412b8d15ee26d2a76b2247df357242177d995fe5d9320355432e24db
size 23161646

View File

@ -1,7 +1,7 @@
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.11 (GNU/Linux)
iD8DBQBSohxebzORW2Vot+oRArlMAKCpy3Q89zh5+0NgkRCPZZJm9JpqygCdElz+
lBN5bia7y0sqvBtZuLMinC0=
=FoPj
iD8DBQBSz6uYbzORW2Vot+oRAgdAAJ9n0GQ8ZwsizWM6CIr5lmJXxo7zpwCfTMpg
1eF2oc0zDz1/27DkBouoLvk=
=tpG3
-----END PGP SIGNATURE-----

3
samba-4.1.4.tar.gz Normal file
View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:1733e1aaa37b4fcb0fc781b07fc6f20831023ce971d8bcd97940c3fbe35766a7
size 23169480

View File

@ -1,3 +1,20 @@
-------------------------------------------------------------------
Tue Jan 14 21:57:32 UTC 2014 - lmuelle@suse.com
- Really add the WINBINDDOPTIONS sysconfig variable on install; (bnc#857454).
-------------------------------------------------------------------
Mon Jan 13 13:04:53 UTC 2014 - lmuelle@suse.com
- Correct sysconfig variable names by adding the missing D char; (bnc#857454).
-------------------------------------------------------------------
Fri Jan 10 17:02:40 UTC 2014 - lmuelle@suse.com
- Update to 4.1.4.
+ Fix segfault in smbd; (bso#10284).
+ Fix SMB2 server panic when a smb2 brlock times out; (bso#10311).
-------------------------------------------------------------------
Wed Jan 8 15:36:42 UTC 2014 - lmuelle@suse.com

View File

@ -112,7 +112,7 @@ BuildRequires: dbus-1-devel
BuildRequires: gpg-offline
BuildRequires: systemd
%endif
%define samba_ver 4.1.3
%define samba_ver 4.1.4
%define samba_ver_suffix %nil
%if "%{samba_ver_suffix}" == ""
%define samba_source_location http://ftp.samba.org/pub/samba/stable/samba-%{version}.tar.gz
@ -139,12 +139,12 @@ BuildRequires: systemd
%else
%define build_make_smp_mflags %{?jobs:-j%jobs}
%endif
%define SOURCE_TIMESTAMP 3144
%define SOURCE_TIMESTAMP 3148
%define BRANCH %{version}
%global with_mitkrb5 1
%global with_dc 0
%global with_get_printing_ticket 0
Version: 4.1.3
Version: 4.1.4
Release: 0
License: GPL-3.0+
Url: http://www.samba.org/
@ -1365,7 +1365,7 @@ for srv_name in nmb smb winbind; do
echo -en "## Type: string
## Default: \"\"
## ServiceRestart:·${srv_name}
${srv_name^^}OPTIONS=\"\"\n" >>SUSE.sysconfig.${srv_name}
${srv_name^^}DOPTIONS=\"\"\n" >>SUSE.sysconfig.${srv_name}
ln -s ../../%{_sbindir}/service %{buildroot}/%{_sbindir}/rc${srv_name}
done
head -n 2 ../packaging/systemd/samba.sysconfig > \
@ -1713,7 +1713,7 @@ fi
%if 0%{?suse_version} > 1220
%service_add_post winbind.service
%{_bindir}/systemd-tmpfiles --create %{_prefix}/lib/tmpfiles.d/samba.conf
%fillup_only -a
%{fillup_only -ans samba winbind}
%endif
%preun winbind

View File

@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:ded4d51dcbc430c440ae6886451317c842615a0eaa77c748b5cb6db7ddf59fd4
size 53841
oid sha256:ad0ebee279c031494c8fca6b30e7ccc2927a014fad9f7d5db06929dea9549121
size 53903