From 722fcb6ba88717348a9b0a03d791656f3a2be32f12b1ea504ca3130f594c1d5c Mon Sep 17 00:00:00 2001 From: David Disseldorp Date: Wed, 1 Dec 2010 13:43:54 +0000 Subject: [PATCH 1/2] - Fix Dolphin SMB share IO with SMB signing enabled; (bso#7791); (bnc#656112). - Add Conflicts to the samba-gplv3 main, client, doc, krb-printing, winbind, client-gplv2, and doc-gplv2 packages; (bnc#652620). - Add Provides samba-client-gplv2 and samba-doc-gplv2 to pre-3.2 versions; (bnc#652620). - Obsolete samba-client-gplv2 and samba-doc-gplv2; (bnc#652620). - Remove Provides samba-client:/usr/sbin/winbindd from the samba-gplv3-winbind package to avoide an accidental install trigger; (bnc#652620). - Add Provides samba-client to the samba-gplv3-client package; (bnc#652620). - Remove all Obsoletes from the samba-gplv3 packages and only keep the Provides samba; (bnc#652620). - Add fitting Conflicts to all samba-gplv3 packages; (bnc#652620). - Reduce unnecessary ldap round trips and eliminate invalid DN messages; (bnc#654719). - Exclude cifs-mount and ldapsmb from the samba-gplv3 build of SUSE Linux Enterprise 10 SP 3 and 4. - Change package base name to samba-gplv3 for SUSE Linux Enterprise 10 SP 4. - Do not package libsmbclient and libsmbsharemodes. OBS-URL: https://build.opensuse.org/package/show/network:samba:STABLE/samba?expand=0&rev=146 --- build-source-timestamp | 2 +- patches.tar.bz2 | 4 +-- samba-doc.spec | 6 ++-- samba.changes | 62 ++++++++++++++++++++++++++++++++++++++++++ samba.spec | 60 +++++++++++++++++++++------------------- vendor-files.tar.bz2 | 4 +-- 6 files changed, 103 insertions(+), 35 deletions(-) diff --git a/build-source-timestamp b/build-source-timestamp index 1fc60a6..6f61098 100644 --- a/build-source-timestamp +++ b/build-source-timestamp @@ -1,2 +1,2 @@ -2450 +2470 Branch : 3.5.6 diff --git a/patches.tar.bz2 b/patches.tar.bz2 index 667de14..a6d188b 100644 --- a/patches.tar.bz2 +++ b/patches.tar.bz2 @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:726315650a68c31e6fb4863210a6156099b0ceda2d1abd711295bb59b052e45c -size 72819 +oid sha256:3e4d886f74c3da959cfe9fbdfe52b47e5c6613a4a7dc5465994c7b3f39798544 +size 74835 diff --git a/samba-doc.spec b/samba-doc.spec index dbc1388..49e50d6 100644 --- a/samba-doc.spec +++ b/samba-doc.spec @@ -66,13 +66,15 @@ BuildRequires: pkgconfig %endif Url: http://www.samba.org/ Version: 3.5.6 -Release: 1 +Release: 2 License: GPLv3+ Summary: Samba Documentation Group: Documentation/Other AutoReqProv: on Provides: samba-gplv3-doc = %{version}-%{release} Obsoletes: samba-gplv3-doc < %{version} +Provides: samba-doc-gplv2 = %{version}-%{release} +Obsoletes: samba-doc-gplv2 < %{version} PreReq: coreutils findutils BuildArch: noarch Source: http://samba.org/samba/ftp/samba-%{version}%{samba_ver_suffix}.tar.bz2 @@ -394,7 +396,7 @@ Authors: -------- The Samba Team -Source Timestamp: 2450 +Source Timestamp: 2470 Branch : 3.5.6 %changelog diff --git a/samba.changes b/samba.changes index fcd8ffe..7d621dc 100644 --- a/samba.changes +++ b/samba.changes @@ -1,3 +1,59 @@ +------------------------------------------------------------------- +Tue Nov 30 13:55:27 CET 2010 - ddiss@suse.de + +- Fix Dolphin SMB share IO with SMB signing enabled; (bso#7791); (bnc#656112). + +------------------------------------------------------------------- +Tue Nov 30 12:45:44 UTC 2010 - lmuelle@suse.de + +- Add Conflicts to the samba-gplv3 main, client, doc, krb-printing, winbind, + client-gplv2, and doc-gplv2 packages; (bnc#652620). + +------------------------------------------------------------------- +Fri Nov 26 21:13:10 UTC 2010 - lmuelle@suse.de + +- Add Provides samba-client-gplv2 and samba-doc-gplv2 to pre-3.2 versions; + (bnc#652620). + +------------------------------------------------------------------- +Fri Nov 26 19:56:23 UTC 2010 - lmuelle@suse.de + +- Obsolete samba-client-gplv2 and samba-doc-gplv2; (bnc#652620). + +------------------------------------------------------------------- +Thu Nov 25 17:29:24 UTC 2010 - lmuelle@suse.de + +- Remove Provides samba-client:/usr/sbin/winbindd from the samba-gplv3-winbind + package to avoide an accidental install trigger; (bnc#652620). + +------------------------------------------------------------------- +Thu Nov 25 15:06:44 UTC 2010 - lmuelle@suse.de + +- Add Provides samba-client to the samba-gplv3-client package; (bnc#652620). + +------------------------------------------------------------------- +Wed Nov 24 10:24:21 UTC 2010 - lmuelle@suse.de + +- Remove all Obsoletes from the samba-gplv3 packages and only keep the + Provides samba; (bnc#652620). + +------------------------------------------------------------------- +Sat Nov 20 08:31:14 UTC 2010 - lmuelle@suse.de + +- Add fitting Conflicts to all samba-gplv3 packages; (bnc#652620). + +------------------------------------------------------------------- +Fri Nov 19 19:18:17 CEST 2010 - jmcdonough@suse.de + +- Reduce unnecessary ldap round trips and eliminate invalid DN + messages; (bnc#654719). + +------------------------------------------------------------------- +Fri Nov 12 12:59:23 UTC 2010 - lmuelle@suse.de + +- Exclude cifs-mount and ldapsmb from the samba-gplv3 build of SUSE Linux + Enterprise 10 SP 3 and 4. + ------------------------------------------------------------------- Thu Nov 11 12:36:36 UTC 2010 - lmuelle@suse.de @@ -8,6 +64,12 @@ Thu Oct 28 15:06:20 UTC 2010 - lmuelle@suse.de - Provide and Obsolete samba-gplv3 to replace potentially installed packages. +------------------------------------------------------------------- +Fri Oct 15 12:23:53 UTC 2010 - lmuelle@suse.de + +- Change package base name to samba-gplv3 for SUSE Linux Enterprise 10 SP 4. +- Do not package libsmbclient and libsmbsharemodes. + ------------------------------------------------------------------- Sat Oct 10 13:24:17 CEST 2010 - jmcdonough@suse.de diff --git a/samba.spec b/samba.spec index f1e8a43..007bea2 100644 --- a/samba.spec +++ b/samba.spec @@ -71,7 +71,7 @@ Group: Productivity/Networking/Samba Url: http://www.samba.org/ AutoReqProv: on Version: 3.5.6 -Release: 1 +Release: 2 Provides: samba-gplv3 = %{version}-%{release} Obsoletes: samba-gplv3 < %{version} %ifarch ppc64 @@ -173,7 +173,7 @@ Authors: The Samba Team -Source Timestamp: 2450 +Source Timestamp: 2470 Branch : 3.5.6 %package client @@ -183,6 +183,8 @@ Group: Productivity/Networking/Samba AutoReqProv: on Provides: smbfs samba-gplv3-client = %{version}-%{release} Obsoletes: samba-gplv3-client < %{version} +Provides: samba-client-gplv2 = %{version}-%{release} +Obsoletes: samba-client-gplv2 < %{version} %ifarch ppc64 Obsoletes: samba-client-64bit %endif @@ -217,7 +219,7 @@ Authors: -------- The Samba Team -Source Timestamp: 2450 +Source Timestamp: 2470 Branch : 3.5.6 %if 0%{?suse_version} == 0 || 0%{?suse_version} > 1020 @@ -244,7 +246,7 @@ Authors: The Samba Team -Source Timestamp: 2450 +Source Timestamp: 2470 Branch : 3.5.6 %endif @@ -257,6 +259,8 @@ Group: Documentation/Other AutoReqProv: on Provides: samba-gplv3-doc = %{version}-%{release} Obsoletes: samba-gplv3-doc < %{version} +Provides: samba-doc-gplv2 = %{version}-%{release} +Obsoletes: samba-doc-gplv2 < %{version} PreReq: coreutils findutils %if 0%{?suse_version} > 1110 BuildArch: noarch @@ -272,7 +276,7 @@ Authors: -------- The Samba Team -Source Timestamp: 2450 +Source Timestamp: 2470 Branch : 3.5.6 %endif @@ -299,14 +303,13 @@ Authors: -------- Jeremy Allison -Source Timestamp: 2450 +Source Timestamp: 2470 Branch : 3.5.6 %if %{make_utils} %package utils - Summary: debug tools Group: Productivity/Networking/Samba AutoReqProv: on @@ -350,7 +353,7 @@ Authors: -------- The Samba Team -Source Timestamp: 2450 +Source Timestamp: 2470 Branch : 3.5.6 %if 0%{?suse_version} && 0%{?suse_version} < 1031 @@ -375,7 +378,8 @@ PreReq: /sbin/ldconfig %if 0%{?suse_version} && 0%{?suse_version} < 1031 %description -n libsmbclient -Source Timestamp: 2450 + +Source Timestamp: 2470 Branch : 3.5.6 %else @@ -420,7 +424,7 @@ Authors: -------- The Samba Team -Source Timestamp: 2450 +Source Timestamp: 2470 Branch : 3.5.6 %package -n libnetapi0 @@ -439,7 +443,7 @@ Authors: -------- The Samba Team -Source Timestamp: 2450 +Source Timestamp: 2470 Branch : 3.5.6 %package -n libnetapi-devel @@ -459,7 +463,7 @@ Authors: -------- The Samba Team -Source Timestamp: 2450 +Source Timestamp: 2470 Branch : 3.5.6 %if 0%{?suse_version} && 0%{?suse_version} < 1031 @@ -479,7 +483,8 @@ PreReq: /sbin/ldconfig %if 0%{?suse_version} && 0%{?suse_version} < 1031 %description -n libsmbsharemodes -Source Timestamp: 2450 + +Source Timestamp: 2470 Branch : 3.5.6 %else @@ -515,7 +520,7 @@ Authors: The Samba Team -Source Timestamp: 2450 +Source Timestamp: 2470 Branch : 3.5.6 %package -n libtalloc2 @@ -534,7 +539,7 @@ Authors: -------- The Samba Team -Source Timestamp: 2450 +Source Timestamp: 2470 Branch : 3.5.6 %package -n libtalloc-devel @@ -554,7 +559,7 @@ Authors: -------- The Samba Team -Source Timestamp: 2450 +Source Timestamp: 2470 Branch : 3.5.6 %package -n libtdb1 @@ -573,7 +578,7 @@ Authors: -------- The Samba Team -Source Timestamp: 2450 +Source Timestamp: 2470 Branch : 3.5.6 %package -n libtdb-devel @@ -593,7 +598,7 @@ Authors: -------- The Samba Team -Source Timestamp: 2450 +Source Timestamp: 2470 Branch : 3.5.6 %package -n libwbclient0 @@ -612,7 +617,7 @@ Authors: -------- The Samba Team -Source Timestamp: 2450 +Source Timestamp: 2470 Branch : 3.5.6 %package -n libwbclient-devel @@ -632,7 +637,7 @@ Authors: -------- The Samba Team -Source Timestamp: 2450 +Source Timestamp: 2470 Branch : 3.5.6 %package -n libtevent0 @@ -651,7 +656,7 @@ Authors: -------- The Samba Team -Source Timestamp: 2450 +Source Timestamp: 2470 Branch : 3.5.6 %package -n libtevent-devel @@ -672,7 +677,7 @@ Authors: The Samba Team -Source Timestamp: 2450 +Source Timestamp: 2470 Branch : 3.5.6 %package -n libldb0 @@ -692,7 +697,7 @@ Authors: The Samba Team -Source Timestamp: 2450 +Source Timestamp: 2470 Branch : 3.5.6 %package -n libldb-devel @@ -712,7 +717,7 @@ Authors: -------- The Samba Team -Source Timestamp: 2450 +Source Timestamp: 2470 Branch : 3.5.6 %if %{make_ldapsmb} @@ -723,7 +728,7 @@ Summary: Tool to administer Samba's LDAP backend Group: Productivity/Networking/Samba AutoReqProv: on Version: 1.34b -Release: 293 +Release: 294 Requires: perl-ldap %description -n ldapsmb @@ -736,7 +741,7 @@ Authors: -------- Guenther Deschner -Source Timestamp: 2450 +Source Timestamp: 2470 Branch : 3.5.6 %endif @@ -759,7 +764,7 @@ Authors: -------- Steve French -Source Timestamp: 2450 +Source Timestamp: 2470 Branch : 3.5.6 %endif @@ -1955,5 +1960,4 @@ sed -i -e 's, supplements .*,,' ${RPM_SOURCE_DIR}/baselibs.conf /lib/mkinitrd/scripts/boot-cifs.sh %endif %endif - %changelog diff --git a/vendor-files.tar.bz2 b/vendor-files.tar.bz2 index 089093d..d0ccaeb 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:790184816e96e062b7a5bd2e61f07b62a74c31f78174952e17fa6ca3f5bf04a1 -size 24560 +oid sha256:14aec931070463445bde423a8af4e1279ca59f4acbfe8ca3754689605613c056 +size 24554 From 23c95783312eb5413d5dbcec469db7c5f86a213df5554cdb788de4620ceb6280 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Lars=20M=C3=BCller?= Date: Sun, 5 Dec 2010 22:58:21 +0000 Subject: [PATCH 2/2] - vfs_fill_sparse() doesn't use posix_fallocate when strict allocate is on; (bso#7835). - Replace Requires samba-client by samba-gplv3-client in the gplv3 packages; (bnc#652620). OBS-URL: https://build.opensuse.org/package/show/network:samba:STABLE/samba?expand=0&rev=147 --- build-source-timestamp | 2 +- patches.tar.bz2 | 4 ++-- samba-doc.spec | 2 +- samba.changes | 12 +++++++++++ samba.spec | 48 +++++++++++++++++++++--------------------- vendor-files.tar.bz2 | 4 ++-- 6 files changed, 42 insertions(+), 30 deletions(-) diff --git a/build-source-timestamp b/build-source-timestamp index 6f61098..1775df1 100644 --- a/build-source-timestamp +++ b/build-source-timestamp @@ -1,2 +1,2 @@ -2470 +2472 Branch : 3.5.6 diff --git a/patches.tar.bz2 b/patches.tar.bz2 index a6d188b..7503384 100644 --- a/patches.tar.bz2 +++ b/patches.tar.bz2 @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:3e4d886f74c3da959cfe9fbdfe52b47e5c6613a4a7dc5465994c7b3f39798544 -size 74835 +oid sha256:23c8364e8f94519e06837ce8b7e017f624b71c9f35d324ddc239347e3140c7c8 +size 75451 diff --git a/samba-doc.spec b/samba-doc.spec index 49e50d6..1ad18c6 100644 --- a/samba-doc.spec +++ b/samba-doc.spec @@ -396,7 +396,7 @@ Authors: -------- The Samba Team -Source Timestamp: 2470 +Source Timestamp: 2472 Branch : 3.5.6 %changelog diff --git a/samba.changes b/samba.changes index 7d621dc..5e25ee7 100644 --- a/samba.changes +++ b/samba.changes @@ -1,3 +1,15 @@ +------------------------------------------------------------------- +Sun Dec 5 22:28:35 UTC 2010 - lars@samba.org + +- vfs_fill_sparse() doesn't use posix_fallocate when strict allocate is on; + (bso#7835). + +------------------------------------------------------------------- +Fri Dec 3 11:47:07 UTC 2010 - lmuelle@suse.de + +- Replace Requires samba-client by samba-gplv3-client in the gplv3 packages; + (bnc#652620). + ------------------------------------------------------------------- Tue Nov 30 13:55:27 CET 2010 - ddiss@suse.de diff --git a/samba.spec b/samba.spec index 007bea2..b3e0eda 100644 --- a/samba.spec +++ b/samba.spec @@ -173,7 +173,7 @@ Authors: The Samba Team -Source Timestamp: 2470 +Source Timestamp: 2472 Branch : 3.5.6 %package client @@ -219,7 +219,7 @@ Authors: -------- The Samba Team -Source Timestamp: 2470 +Source Timestamp: 2472 Branch : 3.5.6 %if 0%{?suse_version} == 0 || 0%{?suse_version} > 1020 @@ -246,7 +246,7 @@ Authors: The Samba Team -Source Timestamp: 2470 +Source Timestamp: 2472 Branch : 3.5.6 %endif @@ -276,7 +276,7 @@ Authors: -------- The Samba Team -Source Timestamp: 2470 +Source Timestamp: 2472 Branch : 3.5.6 %endif @@ -303,7 +303,7 @@ Authors: -------- Jeremy Allison -Source Timestamp: 2470 +Source Timestamp: 2472 Branch : 3.5.6 %if %{make_utils} @@ -353,7 +353,7 @@ Authors: -------- The Samba Team -Source Timestamp: 2470 +Source Timestamp: 2472 Branch : 3.5.6 %if 0%{?suse_version} && 0%{?suse_version} < 1031 @@ -379,7 +379,7 @@ PreReq: /sbin/ldconfig %description -n libsmbclient -Source Timestamp: 2470 +Source Timestamp: 2472 Branch : 3.5.6 %else @@ -424,7 +424,7 @@ Authors: -------- The Samba Team -Source Timestamp: 2470 +Source Timestamp: 2472 Branch : 3.5.6 %package -n libnetapi0 @@ -443,7 +443,7 @@ Authors: -------- The Samba Team -Source Timestamp: 2470 +Source Timestamp: 2472 Branch : 3.5.6 %package -n libnetapi-devel @@ -463,7 +463,7 @@ Authors: -------- The Samba Team -Source Timestamp: 2470 +Source Timestamp: 2472 Branch : 3.5.6 %if 0%{?suse_version} && 0%{?suse_version} < 1031 @@ -484,7 +484,7 @@ PreReq: /sbin/ldconfig %description -n libsmbsharemodes -Source Timestamp: 2470 +Source Timestamp: 2472 Branch : 3.5.6 %else @@ -520,7 +520,7 @@ Authors: The Samba Team -Source Timestamp: 2470 +Source Timestamp: 2472 Branch : 3.5.6 %package -n libtalloc2 @@ -539,7 +539,7 @@ Authors: -------- The Samba Team -Source Timestamp: 2470 +Source Timestamp: 2472 Branch : 3.5.6 %package -n libtalloc-devel @@ -559,7 +559,7 @@ Authors: -------- The Samba Team -Source Timestamp: 2470 +Source Timestamp: 2472 Branch : 3.5.6 %package -n libtdb1 @@ -578,7 +578,7 @@ Authors: -------- The Samba Team -Source Timestamp: 2470 +Source Timestamp: 2472 Branch : 3.5.6 %package -n libtdb-devel @@ -598,7 +598,7 @@ Authors: -------- The Samba Team -Source Timestamp: 2470 +Source Timestamp: 2472 Branch : 3.5.6 %package -n libwbclient0 @@ -617,7 +617,7 @@ Authors: -------- The Samba Team -Source Timestamp: 2470 +Source Timestamp: 2472 Branch : 3.5.6 %package -n libwbclient-devel @@ -637,7 +637,7 @@ Authors: -------- The Samba Team -Source Timestamp: 2470 +Source Timestamp: 2472 Branch : 3.5.6 %package -n libtevent0 @@ -656,7 +656,7 @@ Authors: -------- The Samba Team -Source Timestamp: 2470 +Source Timestamp: 2472 Branch : 3.5.6 %package -n libtevent-devel @@ -677,7 +677,7 @@ Authors: The Samba Team -Source Timestamp: 2470 +Source Timestamp: 2472 Branch : 3.5.6 %package -n libldb0 @@ -697,7 +697,7 @@ Authors: The Samba Team -Source Timestamp: 2470 +Source Timestamp: 2472 Branch : 3.5.6 %package -n libldb-devel @@ -717,7 +717,7 @@ Authors: -------- The Samba Team -Source Timestamp: 2470 +Source Timestamp: 2472 Branch : 3.5.6 %if %{make_ldapsmb} @@ -741,7 +741,7 @@ Authors: -------- Guenther Deschner -Source Timestamp: 2470 +Source Timestamp: 2472 Branch : 3.5.6 %endif @@ -764,7 +764,7 @@ Authors: -------- Steve French -Source Timestamp: 2470 +Source Timestamp: 2472 Branch : 3.5.6 %endif diff --git a/vendor-files.tar.bz2 b/vendor-files.tar.bz2 index d0ccaeb..db27fb6 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:14aec931070463445bde423a8af4e1279ca59f4acbfe8ca3754689605613c056 -size 24554 +oid sha256:945a9558f39d87baf548862a8f31f4c4ee45c65e2db84e075f7c0cd58df3f302 +size 24559