From a8a671572ee7a004f3d8e19058852c46b9ac1b1f537293e3a88097b66c8e78b0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Lars=20M=C3=BCller?= Date: Fri, 14 Oct 2011 12:30:27 +0000 Subject: [PATCH] - Retain the smbd startproc return value for correct startup status reporting. unset was incorrectly being called prior to rc_status, as reported by suse-beta@cboltz.de; (bnc#723724). OBS-URL: https://build.opensuse.org/package/show/network:samba:STABLE/samba?expand=0&rev=196 --- build-source-timestamp | 2 +- samba-doc.spec | 2 +- samba.changes | 7 ++++++ samba.spec | 52 +++++++++++++++++++++--------------------- vendor-files.tar.bz2 | 4 ++-- 5 files changed, 37 insertions(+), 30 deletions(-) diff --git a/build-source-timestamp b/build-source-timestamp index 3b166e1..1e8e793 100644 --- a/build-source-timestamp +++ b/build-source-timestamp @@ -1,2 +1,2 @@ -2674 +2675 Branch : trunk diff --git a/samba-doc.spec b/samba-doc.spec index 4676726..a2d317f 100644 --- a/samba-doc.spec +++ b/samba-doc.spec @@ -432,7 +432,7 @@ Authors: -------- The Samba Team -Source Timestamp: 2674 +Source Timestamp: 2675 Branch : trunk %changelog diff --git a/samba.changes b/samba.changes index a2d7683..a80ae0a 100644 --- a/samba.changes +++ b/samba.changes @@ -1,3 +1,10 @@ +------------------------------------------------------------------- +Fri Oct 14 14:00:57 CEST 2011 - ddiss@suse.de + +- Retain the smbd startproc return value for correct startup status reporting. + unset was incorrectly being called prior to rc_status, as reported by + suse-beta@cboltz.de; (bnc#723724). + ------------------------------------------------------------------- Fri Oct 14 11:46:53 CEST 2011 - ddiss@suse.de diff --git a/samba.spec b/samba.spec index 822fe49..2631095 100644 --- a/samba.spec +++ b/samba.spec @@ -205,7 +205,7 @@ Authors: The Samba Team -Source Timestamp: 2674 +Source Timestamp: 2675 Branch : trunk %package client @@ -249,7 +249,7 @@ Authors: -------- The Samba Team -Source Timestamp: 2674 +Source Timestamp: 2675 Branch : trunk %if 0%{?suse_version} == 0 || 0%{?suse_version} > 1020 @@ -275,7 +275,7 @@ Authors: The Samba Team -Source Timestamp: 2674 +Source Timestamp: 2675 Branch : trunk %endif @@ -305,7 +305,7 @@ Authors: -------- The Samba Team -Source Timestamp: 2674 +Source Timestamp: 2675 Branch : trunk %endif @@ -332,7 +332,7 @@ Authors: -------- Jeremy Allison -Source Timestamp: 2674 +Source Timestamp: 2675 Branch : trunk %if %{make_utils} @@ -353,7 +353,7 @@ Authors: -------- The Samba Team -Source Timestamp: 2674 +Source Timestamp: 2675 Branch : trunk %endif @@ -388,7 +388,7 @@ Authors: -------- The Samba Team -Source Timestamp: 2674 +Source Timestamp: 2675 Branch : trunk %if 0%{?suse_version} && 0%{?suse_version} < 1031 @@ -414,14 +414,14 @@ PreReq: /sbin/ldconfig %description -n libsmbclient -Source Timestamp: 2674 +Source Timestamp: 2675 Branch : trunk %else %description -n libsmbclient0 -Source Timestamp: 2674 +Source Timestamp: 2675 Branch : trunk %endif @@ -469,7 +469,7 @@ Authors: -------- The Samba Team -Source Timestamp: 2674 +Source Timestamp: 2675 Branch : trunk %package -n libnetapi0 @@ -487,7 +487,7 @@ Authors: -------- The Samba Team -Source Timestamp: 2674 +Source Timestamp: 2675 Branch : trunk %package -n libnetapi-devel @@ -511,7 +511,7 @@ Authors: -------- The Samba Team -Source Timestamp: 2674 +Source Timestamp: 2675 Branch : trunk %if 0%{?suse_version} && 0%{?suse_version} < 1031 @@ -532,14 +532,14 @@ PreReq: /sbin/ldconfig %description -n libsmbsharemodes -Source Timestamp: 2674 +Source Timestamp: 2675 Branch : trunk %else %description -n libsmbsharemodes0 -Source Timestamp: 2674 +Source Timestamp: 2675 Branch : trunk %endif @@ -575,7 +575,7 @@ Authors: The Samba Team -Source Timestamp: 2674 +Source Timestamp: 2675 Branch : trunk %package -n libwbclient0 @@ -593,7 +593,7 @@ Authors: -------- The Samba Team -Source Timestamp: 2674 +Source Timestamp: 2675 Branch : trunk %package -n libwbclient-devel @@ -617,7 +617,7 @@ Authors: -------- The Samba Team -Source Timestamp: 2674 +Source Timestamp: 2675 Branch : trunk %package -n libtalloc2 @@ -637,7 +637,7 @@ Authors: -------- The Samba Team -Source Timestamp: 2674 +Source Timestamp: 2675 Branch : trunk %package -n libtalloc-devel @@ -663,7 +663,7 @@ Authors: -------- The Samba Team -Source Timestamp: 2674 +Source Timestamp: 2675 Branch : trunk %package -n libtdb1 @@ -683,7 +683,7 @@ Authors: -------- The Samba Team -Source Timestamp: 2674 +Source Timestamp: 2675 Branch : trunk %package -n libtdb-devel @@ -705,7 +705,7 @@ Authors: -------- The Samba Team -Source Timestamp: 2674 +Source Timestamp: 2675 Branch : trunk %package -n libtevent0 @@ -725,7 +725,7 @@ Authors: -------- The Samba Team -Source Timestamp: 2674 +Source Timestamp: 2675 Branch : trunk %package -n libtevent-devel @@ -753,7 +753,7 @@ Authors: The Samba Team -Source Timestamp: 2674 +Source Timestamp: 2675 Branch : trunk %package -n libldb1 @@ -775,7 +775,7 @@ Authors: The Samba Team -Source Timestamp: 2674 +Source Timestamp: 2675 Branch : trunk %package -n libldb-devel @@ -802,7 +802,7 @@ Authors: -------- The Samba Team -Source Timestamp: 2674 +Source Timestamp: 2675 Branch : trunk %if %{make_ldapsmb} @@ -825,7 +825,7 @@ Authors: -------- Guenther Deschner -Source Timestamp: 2674 +Source Timestamp: 2675 Branch : trunk %endif diff --git a/vendor-files.tar.bz2 b/vendor-files.tar.bz2 index 783cf30..7407fbd 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:6726dc14b674328fd089a7cb33f8d4c6466baf13128b8f4dbfdbc6821933e6ba -size 51543 +oid sha256:3e884fd02f78fbefc4de513a336b4cf47278ccaf0d75aa5b44867b29ef682588 +size 51492