From d0b1e76baddd607459223b16da56e1352fb4c5e2e970d73d5439b77f53985c6f Mon Sep 17 00:00:00 2001 From: OBS User autobuild Date: Fri, 4 Dec 2009 09:43:00 +0000 Subject: [PATCH] Accepting request 25486 from network:samba:STABLE Copy from network:samba:STABLE/samba based on submit request 25486 from user lmuelle OBS-URL: https://build.opensuse.org/request/show/25486 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/samba?expand=0&rev=51 --- build-source-timestamp | 4 +- patches.tar.bz2 | 4 +- samba-doc.spec | 12 +-- samba.changes | 11 +++ samba.spec | 211 ++++++++++++++++++++--------------------- vendor-files.tar.bz2 | 4 +- 6 files changed, 128 insertions(+), 118 deletions(-) diff --git a/build-source-timestamp b/build-source-timestamp index e6fdce3..5461d1a 100644 --- a/build-source-timestamp +++ b/build-source-timestamp @@ -1,2 +1,2 @@ -2240 -Branch : trunk +2248 +Branch : 3.4.3.SLE11_SP1 diff --git a/patches.tar.bz2 b/patches.tar.bz2 index e9b7cfa..7d79f30 100644 --- a/patches.tar.bz2 +++ b/patches.tar.bz2 @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:51c9c027b3f6b1175e02c9b506d9b99b0618e8439d9ecebbfdf4c488d3d42452 -size 59972 +oid sha256:54266f84cb6b1e2335e45c6b8dc80b0f127f270028f00d0558ff09df63123ba0 +size 60366 diff --git a/samba-doc.spec b/samba-doc.spec index 5b3b26d..73ee4a6 100644 --- a/samba-doc.spec +++ b/samba-doc.spec @@ -58,8 +58,8 @@ BuildRequires: fdupes %endif Url: http://www.samba.org/ Version: 3.4.3 -Release: 2 -License: GPL v3 or later +Release: 3 +License: GPLv3+ Summary: Samba Documentation Group: Documentation/Other AutoReqProv: on @@ -364,10 +364,10 @@ Authors: -------- The Samba Team -Source Timestamp: 2240 -Branch : trunk +Source Timestamp: 2248 +Branch : 3.4.3.SLE11_SP1 -Source Timestamp: 2240 -Branch : trunk +Source Timestamp: 2248 +Branch : 3.4.3.SLE11_SP1 %changelog diff --git a/samba.changes b/samba.changes index 1bb5672..7cb8862 100644 --- a/samba.changes +++ b/samba.changes @@ -1,3 +1,14 @@ +------------------------------------------------------------------- +Thu Dec 3 11:47:02 CET 2009 - lmuelle@suse.de + +- Add PreReq /usr/sbin/groupadd to the winbind package; (bnc#559165). +- Simplify the winbind package %pre script and suppress stdout only. + +------------------------------------------------------------------- +Thu Nov 19 03:57:41 CET 2009 - boyang@suse.de + +- Fix kerberos refresh chain; (bnc#546162); (bso#6872). + ------------------------------------------------------------------- Fri Nov 6 19:55:27 CET 2009 - lmuelle@suse.de diff --git a/samba.spec b/samba.spec index 97f075f..f8fdcba 100644 --- a/samba.spec +++ b/samba.spec @@ -58,12 +58,12 @@ BuildRequires: fdupes %endif %define vscan_ver 0.3.6b %define ldapsmb_ver 1.34b -License: GPL v3 or later +License: GPLv3+ Group: Productivity/Networking/Samba Url: http://www.samba.org/ AutoReqProv: on Version: 3.4.3 -Release: 2 +Release: 3 %ifarch ppc64 Obsoletes: samba-64bit %endif @@ -152,14 +152,14 @@ Authors: The Samba Team -Source Timestamp: 2240 -Branch : trunk +Source Timestamp: 2248 +Branch : 3.4.3.SLE11_SP1 -Source Timestamp: 2240 -Branch : trunk +Source Timestamp: 2248 +Branch : 3.4.3.SLE11_SP1 %package client -License: GPL v3 or later +License: GPLv3+ Summary: Samba Client Utilities Group: Productivity/Networking/Samba AutoReqProv: on @@ -195,16 +195,16 @@ Authors: -------- The Samba Team -Source Timestamp: 2240 -Branch : trunk +Source Timestamp: 2248 +Branch : 3.4.3.SLE11_SP1 -Source Timestamp: 2240 -Branch : trunk +Source Timestamp: 2248 +Branch : 3.4.3.SLE11_SP1 %if 0%{?suse_version} == 0 || 0%{?suse_version} > 1020 %package devel -License: GPL v3 or later +License: GPLv3+ Summary: Libraries and Header Files to Develop Programs with Samba Support Group: Development/Libraries/C and C++ AutoReqProv: on @@ -223,17 +223,17 @@ Authors: The Samba Team -Source Timestamp: 2240 -Branch : trunk +Source Timestamp: 2248 +Branch : 3.4.3.SLE11_SP1 -Source Timestamp: 2240 -Branch : trunk +Source Timestamp: 2248 +Branch : 3.4.3.SLE11_SP1 %endif %if 0%{?suse_version} && 0%{?suse_version} < 1001 || 0%{?suse_version} > 1110 %package doc -License: GPL v3 or later +License: GPLv3+ Summary: Samba Documentation Group: Documentation/Other AutoReqProv: on @@ -254,16 +254,16 @@ Authors: -------- The Samba Team -Source Timestamp: 2240 -Branch : trunk +Source Timestamp: 2248 +Branch : 3.4.3.SLE11_SP1 -Source Timestamp: 2240 -Branch : trunk +Source Timestamp: 2248 +Branch : 3.4.3.SLE11_SP1 %endif %package krb-printing -License: GPL v3 or later +License: GPLv3+ Summary: Wrapper binary for kerberized printing Group: Productivity/Networking/Samba AutoReqProv: on @@ -284,11 +284,11 @@ Authors: -------- Jeremy Allison -Source Timestamp: 2240 -Branch : trunk +Source Timestamp: 2248 +Branch : 3.4.3.SLE11_SP1 -Source Timestamp: 2240 -Branch : trunk +Source Timestamp: 2248 +Branch : 3.4.3.SLE11_SP1 %if %{make_utils} @@ -312,7 +312,7 @@ Authors: %endif %package winbind -License: GPL v3 or later +License: GPLv3+ Summary: Winbind Daemon and Tool Group: Productivity/Networking/Samba AutoReqProv: on @@ -325,7 +325,7 @@ Requires: samba-client >= %{version} %if 0%{?suse_version} > 1030 Recommends: cron logrotate %endif -PreReq: coreutils /sbin/ldconfig %{?insserv_prereq} +PreReq: coreutils /sbin/ldconfig %{?insserv_prereq} /usr/sbin/groupadd %description winbind This is the winbind-daemon and the wbinfo-tool. @@ -336,16 +336,16 @@ Authors: -------- The Samba Team -Source Timestamp: 2240 -Branch : trunk +Source Timestamp: 2248 +Branch : 3.4.3.SLE11_SP1 -Source Timestamp: 2240 -Branch : trunk +Source Timestamp: 2248 +Branch : 3.4.3.SLE11_SP1 %if 0%{?suse_version} && 0%{?suse_version} < 1031 %package -n libsmbclient -License: GPL v3 or later +License: GPLv3+ %else %package -n libsmbclient0 @@ -363,11 +363,11 @@ PreReq: /sbin/ldconfig %if 0%{?suse_version} && 0%{?suse_version} < 1031 %description -n libsmbclient -Source Timestamp: 2240 -Branch : trunk +Source Timestamp: 2248 +Branch : 3.4.3.SLE11_SP1 -Source Timestamp: 2240 -Branch : trunk +Source Timestamp: 2248 +Branch : 3.4.3.SLE11_SP1 %else @@ -384,7 +384,7 @@ Authors: The Samba Team %package -n libsmbclient-devel -License: GPL v3 or later +License: GPLv3+ Summary: Libraries and Header Files to Develop Programs with smbclient Support Group: Development/Libraries/C and C++ AutoReqProv: on @@ -408,14 +408,14 @@ Authors: -------- The Samba Team -Source Timestamp: 2240 -Branch : trunk +Source Timestamp: 2248 +Branch : 3.4.3.SLE11_SP1 -Source Timestamp: 2240 -Branch : trunk +Source Timestamp: 2248 +Branch : 3.4.3.SLE11_SP1 %package -n libnetapi0 -License: GPL v3 or later +License: GPLv3+ Summary: Samba netapi Library Group: System/Libraries AutoReqProv: on @@ -430,14 +430,14 @@ Authors: -------- The Samba Team -Source Timestamp: 2240 -Branch : trunk +Source Timestamp: 2248 +Branch : 3.4.3.SLE11_SP1 -Source Timestamp: 2240 -Branch : trunk +Source Timestamp: 2248 +Branch : 3.4.3.SLE11_SP1 %package -n libnetapi-devel -License: GPL v3 or later +License: GPLv3+ Summary: Libraries and Header Files to Develop Programs with netapi Support Group: Development/Libraries/C and C++ AutoReqProv: on @@ -453,16 +453,16 @@ Authors: -------- The Samba Team -Source Timestamp: 2240 -Branch : trunk +Source Timestamp: 2248 +Branch : 3.4.3.SLE11_SP1 -Source Timestamp: 2240 -Branch : trunk +Source Timestamp: 2248 +Branch : 3.4.3.SLE11_SP1 %if 0%{?suse_version} && 0%{?suse_version} < 1031 %package -n libsmbsharemodes -License: GPL v3 or later +License: GPLv3+ %else %package -n libsmbsharemodes0 @@ -475,11 +475,11 @@ PreReq: /sbin/ldconfig %if 0%{?suse_version} && 0%{?suse_version} < 1031 %description -n libsmbsharemodes -Source Timestamp: 2240 -Branch : trunk +Source Timestamp: 2248 +Branch : 3.4.3.SLE11_SP1 -Source Timestamp: 2240 -Branch : trunk +Source Timestamp: 2248 +Branch : 3.4.3.SLE11_SP1 %else @@ -492,7 +492,7 @@ Authors: The Samba Team %package -n libsmbsharemodes-devel -License: GPL v3 or later +License: GPLv3+ Summary: Libraries and Header Files to Develop Programs with smbsharemodes Support Group: Development/Libraries/C and C++ AutoReqProv: on @@ -512,16 +512,16 @@ Authors: -------- The Samba Team -Source Timestamp: 2240 -Branch : trunk +Source Timestamp: 2248 +Branch : 3.4.3.SLE11_SP1 -Source Timestamp: 2240 -Branch : trunk +Source Timestamp: 2248 +Branch : 3.4.3.SLE11_SP1 %if %{make_ldapsmb} %package -n libtalloc1 -License: LGPL v3 or later +License: LGPLv3+ Summary: Samba talloc Library Group: System/Libraries AutoReqProv: on @@ -536,14 +536,14 @@ Authors: -------- The Samba Team -Source Timestamp: 2240 -Branch : trunk +Source Timestamp: 2248 +Branch : 3.4.3.SLE11_SP1 -Source Timestamp: 2240 -Branch : trunk +Source Timestamp: 2248 +Branch : 3.4.3.SLE11_SP1 %package -n libtalloc-devel -License: LGPL v3 or later +License: LGPLv3+ Summary: Libraries and Header Files to Develop Programs with talloc Support Group: Development/Libraries/C and C++ AutoReqProv: on @@ -559,14 +559,14 @@ Authors: -------- The Samba Team -Source Timestamp: 2240 -Branch : trunk +Source Timestamp: 2248 +Branch : 3.4.3.SLE11_SP1 -Source Timestamp: 2240 -Branch : trunk +Source Timestamp: 2248 +Branch : 3.4.3.SLE11_SP1 %package -n libtdb1 -License: LGPL v3 or later +License: LGPLv3+ Summary: Samba tdb Library Group: System/Libraries AutoReqProv: on @@ -581,14 +581,14 @@ Authors: -------- The Samba Team -Source Timestamp: 2240 -Branch : trunk +Source Timestamp: 2248 +Branch : 3.4.3.SLE11_SP1 -Source Timestamp: 2240 -Branch : trunk +Source Timestamp: 2248 +Branch : 3.4.3.SLE11_SP1 %package -n libtdb-devel -License: LGPL v3 or later +License: LGPLv3+ Summary: Libraries and Header Files to Develop Programs with tdb Support Group: Development/Libraries/C and C++ AutoReqProv: on @@ -604,14 +604,14 @@ Authors: -------- The Samba Team -Source Timestamp: 2240 -Branch : trunk +Source Timestamp: 2248 +Branch : 3.4.3.SLE11_SP1 -Source Timestamp: 2240 -Branch : trunk +Source Timestamp: 2248 +Branch : 3.4.3.SLE11_SP1 %package -n libwbclient0 -License: GPL v3 or later +License: GPLv3+ Summary: Samba libwbclient Library Group: System/Libraries AutoReqProv: on @@ -626,14 +626,14 @@ Authors: -------- The Samba Team -Source Timestamp: 2240 -Branch : trunk +Source Timestamp: 2248 +Branch : 3.4.3.SLE11_SP1 -Source Timestamp: 2240 -Branch : trunk +Source Timestamp: 2248 +Branch : 3.4.3.SLE11_SP1 %package -n libwbclient-devel -License: GPL v3 or later +License: GPLv3+ Summary: Libraries and Header Files to Develop Programs with wbclient Support Group: Development/Libraries/C and C++ AutoReqProv: on @@ -649,19 +649,19 @@ Authors: -------- The Samba Team -Source Timestamp: 2240 -Branch : trunk +Source Timestamp: 2248 +Branch : 3.4.3.SLE11_SP1 -Source Timestamp: 2240 -Branch : trunk +Source Timestamp: 2248 +Branch : 3.4.3.SLE11_SP1 %package -n ldapsmb -License: GPL v2 or later +License: GPLv2+ Summary: Tool to administer Samba's LDAP backend Group: Productivity/Networking/Samba AutoReqProv: on Version: 1.34b -Release: 272 +Release: 273 Requires: perl-ldap %description -n ldapsmb @@ -674,17 +674,17 @@ Authors: -------- Guenther Deschner -Source Timestamp: 2240 -Branch : trunk +Source Timestamp: 2248 +Branch : 3.4.3.SLE11_SP1 -Source Timestamp: 2240 -Branch : trunk +Source Timestamp: 2248 +Branch : 3.4.3.SLE11_SP1 %endif %if 0%{?suse_version} == 0 || 0%{?suse_version} > 920 %package -n cifs-mount -License: GPL v3 or later +License: GPLv3+ Summary: Mount using the Common Internet File System (CIFS) Group: System/Filesystems AutoReqProv: on @@ -700,11 +700,11 @@ Authors: -------- Steve French -Source Timestamp: 2240 -Branch : trunk +Source Timestamp: 2248 +Branch : 3.4.3.SLE11_SP1 -Source Timestamp: 2240 -Branch : trunk +Source Timestamp: 2248 +Branch : 3.4.3.SLE11_SP1 %endif %if %{make_vscan} @@ -1291,9 +1291,8 @@ fi %pre winbind # we need this group for squid (ntlmauth) # read access to /var/lib/samba/winbindd_privileged -if [ -z "`%{_bindir}/getent group winbind 2>/dev/null`" ]; then - %{_sbindir}/groupadd -r winbind 2>/dev/null -fi +%{_bindir}/getent group winbind >/dev/null || \ + %{_sbindir}/groupadd -r winbind %post winbind /sbin/ldconfig diff --git a/vendor-files.tar.bz2 b/vendor-files.tar.bz2 index a3b32f7..9753374 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:a692e0d750eb0631c7dc1cd74a25eff0d8b1ae096f383c9eda441eaf59386ad6 -size 24058 +oid sha256:01225dd40262479472fc820ea5bab53c0fbffc8393ca1afd3bb04b8cdaee72ad +size 23942