From 349de04aad582a4c7b261e68f45cfae409d4f634a9dd2668e8c0f7e507a61b3b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Lars=20M=C3=BCller?= Date: Thu, 1 Sep 2011 21:06:45 +0000 Subject: [PATCH] - Fix segfault in iconv.c which caused a null pointer dereference; (bso#8433). - Use /var/run for the cifs state file in the init script too; (bnc#710304). - Fix CUPS print job IDs; (bso#7288); (bnc#701257). OBS-URL: https://build.opensuse.org/package/show/network:samba:STABLE/samba?expand=0&rev=184 --- build-source-timestamp | 2 +- patches.tar.bz2 | 4 +-- samba-doc.spec | 4 +-- samba.changes | 15 +++++++++ samba.spec | 72 +++++++++++++++++++++--------------------- vendor-files.tar.bz2 | 4 +-- 6 files changed, 58 insertions(+), 43 deletions(-) diff --git a/build-source-timestamp b/build-source-timestamp index 5ef24db..4737840 100644 --- a/build-source-timestamp +++ b/build-source-timestamp @@ -1,2 +1,2 @@ -2622 +2625 Branch : trunk diff --git a/patches.tar.bz2 b/patches.tar.bz2 index 9fc1e48..f9c1d0d 100644 --- a/patches.tar.bz2 +++ b/patches.tar.bz2 @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:8519b2358bc4d81cd8b78546d94a8be0afc62237cb9871422294ec2981846a7f -size 50978 +oid sha256:a08bdbeb40452084b78a4dde3aba42fb1cf57eaff29a3b0a5deb971ec7fab53a +size 51178 diff --git a/samba-doc.spec b/samba-doc.spec index 776e966..bb83f64 100644 --- a/samba-doc.spec +++ b/samba-doc.spec @@ -82,7 +82,7 @@ BuildRequires: pkgconfig %endif Url: http://www.samba.org/ Version: 3.6.0 -Release: 3 +Release: 4 License: GPLv3+ Summary: Samba Documentation Group: Documentation/Other @@ -414,7 +414,7 @@ Authors: -------- The Samba Team -Source Timestamp: 2622 +Source Timestamp: 2625 Branch : trunk %changelog diff --git a/samba.changes b/samba.changes index 64bcc1f..b63d72e 100644 --- a/samba.changes +++ b/samba.changes @@ -1,3 +1,13 @@ +------------------------------------------------------------------- +Thu Sep 1 20:54:52 UTC 2011 - lmuelle@suse.de + +- Fix segfault in iconv.c which caused a null pointer dereference; (bso#8433). + +------------------------------------------------------------------- +Wed Aug 31 16:10:03 UTC 2011 - lmuelle@suse.de + +- Use /var/run for the cifs state file in the init script too; (bnc#710304). + ------------------------------------------------------------------- Tue Aug 30 21:38:12 UTC 2011 - lmuelle@suse.de @@ -216,6 +226,11 @@ Tue Jul 26 20:44:01 UTC 2011 - lmuelle@suse.de affected by a cross-site request forgery; CVE-2011-2522; (bso#8290); (bnc#705241). +------------------------------------------------------------------- +Wed Jul 20 11:05:27 CEST 2011 - ddiss@suse.de + +- Fix CUPS print job IDs; (bso#7288); (bnc#701257). + ------------------------------------------------------------------- Thu Jul 14 10:26:22 UTC 2011 - lmuelle@suse.de diff --git a/samba.spec b/samba.spec index 369eb11..3c88152 100644 --- a/samba.spec +++ b/samba.spec @@ -86,7 +86,7 @@ Group: Productivity/Networking/Samba Url: http://www.samba.org/ AutoReqProv: on Version: 3.6.0 -Release: 3 +Release: 4 Provides: samba-gplv3 = %{version}-%{release} Obsoletes: samba-gplv3 < %{version} %ifarch ppc64 @@ -184,7 +184,7 @@ Authors: The Samba Team -Source Timestamp: 2622 +Source Timestamp: 2625 Branch : trunk %package client @@ -224,7 +224,7 @@ Authors: -------- The Samba Team -Source Timestamp: 2622 +Source Timestamp: 2625 Branch : trunk %if 0%{?suse_version} == 0 || 0%{?suse_version} > 1020 @@ -251,7 +251,7 @@ Authors: The Samba Team -Source Timestamp: 2622 +Source Timestamp: 2625 Branch : trunk %endif @@ -281,7 +281,7 @@ Authors: -------- The Samba Team -Source Timestamp: 2622 +Source Timestamp: 2625 Branch : trunk %endif @@ -308,7 +308,7 @@ Authors: -------- Jeremy Allison -Source Timestamp: 2622 +Source Timestamp: 2625 Branch : trunk %if %{make_utils} @@ -330,7 +330,7 @@ Authors: -------- The Samba Team -Source Timestamp: 2622 +Source Timestamp: 2625 Branch : trunk %endif @@ -361,7 +361,7 @@ Authors: -------- The Samba Team -Source Timestamp: 2622 +Source Timestamp: 2625 Branch : trunk %if 0%{?suse_version} && 0%{?suse_version} < 1031 @@ -388,14 +388,14 @@ PreReq: /sbin/ldconfig %description -n libsmbclient -Source Timestamp: 2622 +Source Timestamp: 2625 Branch : trunk %else %description -n libsmbclient0 -Source Timestamp: 2622 +Source Timestamp: 2625 Branch : trunk %endif @@ -441,7 +441,7 @@ Authors: -------- The Samba Team -Source Timestamp: 2622 +Source Timestamp: 2625 Branch : trunk %package -n libnetapi0 @@ -460,7 +460,7 @@ Authors: -------- The Samba Team -Source Timestamp: 2622 +Source Timestamp: 2625 Branch : trunk %package -n libnetapi-devel @@ -485,7 +485,7 @@ Authors: -------- The Samba Team -Source Timestamp: 2622 +Source Timestamp: 2625 Branch : trunk %if 0%{?suse_version} && 0%{?suse_version} < 1031 @@ -507,14 +507,14 @@ PreReq: /sbin/ldconfig %description -n libsmbsharemodes -Source Timestamp: 2622 +Source Timestamp: 2625 Branch : trunk %else %description -n libsmbsharemodes0 -Source Timestamp: 2622 +Source Timestamp: 2625 Branch : trunk %endif @@ -551,7 +551,7 @@ Authors: The Samba Team -Source Timestamp: 2622 +Source Timestamp: 2625 Branch : trunk %package -n libwbclient0 @@ -570,7 +570,7 @@ Authors: -------- The Samba Team -Source Timestamp: 2622 +Source Timestamp: 2625 Branch : trunk %package -n libwbclient-devel @@ -595,7 +595,7 @@ Authors: -------- The Samba Team -Source Timestamp: 2622 +Source Timestamp: 2625 Branch : trunk %package -n libtalloc2 @@ -604,7 +604,7 @@ Summary: Samba talloc Library Group: System/Libraries AutoReqProv: on Version: %{libtalloc_ver} -Release: 3 +Release: 4 PreReq: /sbin/ldconfig %description -n libtalloc2 @@ -616,7 +616,7 @@ Authors: -------- The Samba Team -Source Timestamp: 2622 +Source Timestamp: 2625 Branch : trunk %package -n libtalloc-devel @@ -625,7 +625,7 @@ Summary: Libraries and Header Files to Develop Programs with talloc Suppo Group: Development/Libraries/C and C++ AutoReqProv: on Version: %{libtalloc_ver} -Release: 3 +Release: 4 %if 0%{?suse_version} > 1020 BuildRequires: pkg-config %else @@ -643,7 +643,7 @@ Authors: -------- The Samba Team -Source Timestamp: 2622 +Source Timestamp: 2625 Branch : trunk %package -n libtdb1 @@ -652,7 +652,7 @@ Summary: Samba tdb Library Group: System/Libraries AutoReqProv: on Version: %{libtdb_ver} -Release: 3 +Release: 4 PreReq: /sbin/ldconfig %description -n libtdb1 @@ -664,7 +664,7 @@ Authors: -------- The Samba Team -Source Timestamp: 2622 +Source Timestamp: 2625 Branch : trunk %package -n libtdb-devel @@ -673,7 +673,7 @@ Summary: Libraries and Header Files to Develop Programs with tdb Support Group: Development/Libraries/C and C++ AutoReqProv: on Version: %{libtdb_ver} -Release: 3 +Release: 4 #BuildRequires: pkg-config Requires: libtdb1 = %{libtdb_ver} @@ -687,7 +687,7 @@ Authors: -------- The Samba Team -Source Timestamp: 2622 +Source Timestamp: 2625 Branch : trunk %package -n libtevent0 @@ -696,7 +696,7 @@ Summary: Samba tevent Library Group: System/Libraries AutoReqProv: on Version: %{libtevent_ver} -Release: 3 +Release: 4 PreReq: /sbin/ldconfig %description -n libtevent0 @@ -708,7 +708,7 @@ Authors: -------- The Samba Team -Source Timestamp: 2622 +Source Timestamp: 2625 Branch : trunk %package -n libtevent-devel @@ -717,7 +717,7 @@ Summary: Libraries and Header Files to Develop Programs with tevent Suppo Group: Development/Libraries/C and C++ AutoReqProv: on Version: %{libtevent_ver} -Release: 3 +Release: 4 %if 0%{?suse_version} > 1020 BuildRequires: pkg-config %else @@ -736,7 +736,7 @@ Authors: The Samba Team -Source Timestamp: 2622 +Source Timestamp: 2625 Branch : trunk %package -n libldb1 @@ -745,7 +745,7 @@ Summary: Samba ldb Library Group: System/Libraries AutoReqProv: on Version: %{libldb_ver} -Release: 3 +Release: 4 PreReq: /sbin/ldconfig BuildRequires: popt-devel @@ -759,7 +759,7 @@ Authors: The Samba Team -Source Timestamp: 2622 +Source Timestamp: 2625 Branch : trunk %package -n libldb-devel @@ -768,7 +768,7 @@ Summary: Libraries and Header Files to Develop Programs with ldb Support Group: Development/Libraries/C and C++ AutoReqProv: on Version: %{libldb_ver} -Release: 3 +Release: 4 %if 0%{?suse_version} > 1020 BuildRequires: pkg-config %else @@ -786,7 +786,7 @@ Authors: -------- The Samba Team -Source Timestamp: 2622 +Source Timestamp: 2625 Branch : trunk %if %{make_ldapsmb} @@ -797,7 +797,7 @@ Summary: Tool to administer Samba's LDAP backend Group: Productivity/Networking/Samba AutoReqProv: on Version: 1.34b -Release: 305 +Release: 306 Requires: perl-ldap %description -n ldapsmb @@ -810,7 +810,7 @@ Authors: -------- Guenther Deschner -Source Timestamp: 2622 +Source Timestamp: 2625 Branch : trunk %endif diff --git a/vendor-files.tar.bz2 b/vendor-files.tar.bz2 index 0977e2d..32e8a40 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:444a68e70987401082e07817beca1af11559ca194516efa5f6ef5228d3eabe36 -size 51460 +oid sha256:3f296b09a415dfdf737a6bff3b56c139d9a06a05d70a431a07747ba2c6dd0f28 +size 51438