From fd4f4a74aca9fe1af359f0430ac5e81a96f08dd9544bc92f8f2765d04a212968 Mon Sep 17 00:00:00 2001
From: OBS User unknown <null@suse.de>
Date: Sun, 7 Jun 2009 23:56:37 +0000
Subject: [PATCH] OBS-URL:
 https://build.opensuse.org/package/show/openSUSE:Factory/samba?expand=0&rev=39

---
 build-source-timestamp |  2 +-
 patches.tar.bz2        |  4 +--
 samba-doc.spec         |  6 ++--
 samba.changes          | 25 +++++++++++++++
 samba.spec             | 73 +++++++++++++++++++++++++-----------------
 vendor-files.tar.bz2   |  4 +--
 6 files changed, 77 insertions(+), 37 deletions(-)

diff --git a/build-source-timestamp b/build-source-timestamp
index 90e1af1..2706c48 100644
--- a/build-source-timestamp
+++ b/build-source-timestamp
@@ -1,2 +1,2 @@
-2115
+2135
 Branch      : 3.3.4
diff --git a/patches.tar.bz2 b/patches.tar.bz2
index 0a04025..729852d 100644
--- a/patches.tar.bz2
+++ b/patches.tar.bz2
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:d1a9e8e88fedfc48dc07e46853f4b02602158ee8694706302149eda1ef390d6b
-size 58686
+oid sha256:28ca69163a240ff842e12592d672d5a8a7c9d4772da716fa623653a0d9b55c61
+size 58949
diff --git a/samba-doc.spec b/samba-doc.spec
index 05d74ef..0d8ec09 100644
--- a/samba-doc.spec
+++ b/samba-doc.spec
@@ -26,7 +26,7 @@ BuildRequires:  ccache cracklib-devel cups-devel e2fsprogs-devel gdbm-devel krb5
 License:        GPL v3 or later
 Url:            http://www.samba.org/
 Version:        3.3.4
-Release:        2
+Release:        3
 Summary:        Samba Documentation
 Group:          Documentation/Other
 AutoReqProv:    on
@@ -50,7 +50,7 @@ BuildRequires:  ccache
 %define	make_utils 0
 %define	make_vscan 1
 %define	make_ldapsmb 1
-%if 0%{?suse_version} > 1020 || 0%{?centos_version} > 500 || 0%{?fedora_version} > 7 || 0%{?rhel_version} > 500
+%if 0%{?suse_version} > 1000 || 0%{?centos_version} > 500 || 0%{?fedora_version} > 7 || 0%{?rhel_version} > 500
 %define	make_cifsupcall 1
 %else
 %define	make_cifsupcall 0
@@ -323,7 +323,7 @@ Authors:
 --------
     The Samba Team <samba@samba.org>
 
-Source Timestamp: 2115
+Source Timestamp: 2135
 Branch      : 3.3.4
 
 %changelog
diff --git a/samba.changes b/samba.changes
index b4240c8..9d3265a 100644
--- a/samba.changes
+++ b/samba.changes
@@ -1,3 +1,23 @@
+-------------------------------------------------------------------
+Thu Jun  4 18:54:34 CEST 2009 - sjayaraman@suse.de
+
+- Enable cifs.upcall on versions newer than SUSE 10.0 
+
+-------------------------------------------------------------------
+Thu Jun  4 18:43:13 CEST 2009 - sjayaraman@suse.de
+
+- Add BuildRequires to keyutils-devel.
+
+-------------------------------------------------------------------
+Thu Jun  4 18:14:40 CEST 2009 - sjayaraman@suse.de
+
+- Remove redundant Requires to keyutils-libs for cifs-mount. 
+
+-------------------------------------------------------------------
+Wed May 27 22:26:15 CEST 2009 - jmcdonough@suse.de
+
+- Detect tight loop in tdb_find(); (bnc#450974).
+
 -------------------------------------------------------------------
 Sat May  9 20:19:51 CEST 2009 - lmuelle@suse.de
 
@@ -694,6 +714,11 @@ Thu Nov 27 11:39:36 CET 2008 - anschneider@suse.de
 
 - Fix perl v5.10 warnings in nmbstatus; (bnc#448225).
 
+-------------------------------------------------------------------
+Wed Nov 26 11:19:52 CET 2008 - sjayaraman@suse.de
+
+- Include the missing spec file change mentioned the previous commit.
+
 -------------------------------------------------------------------
 Tue Nov 25 12:31:24 CET 2008 - sjayaraman@suse.de
 
diff --git a/samba.spec b/samba.spec
index 5de4b6e..34f903b 100644
--- a/samba.spec
+++ b/samba.spec
@@ -41,6 +41,9 @@ BuildRequires:  cracklib-devel
 %if 0%{?centos_version} || 0%{?fedora_version} || 0%{?rhel_version} || 0%{?mandriva_version}
 BuildRequires:  krb5-devel openldap-devel
 %endif
+%if 0%{?suse_version} == 0 || 0%{?suse_version} > 1000
+BuildRequires:  keyutils-devel
+%endif
 %if 0%{?suse_version} > 1000 || 0%{?fedora_version} || 0%{?rhel_version} || 0%{?mandriva_version}
 BuildRequires:  ctdb-devel
 %endif
@@ -54,7 +57,7 @@ Group:          Productivity/Networking/Samba
 Url:            http://www.samba.org/
 AutoReqProv:    on
 Version:        3.3.4
-Release:        2
+Release:        3
 %ifarch ppc64
 Obsoletes:      samba-64bit
 %endif
@@ -82,7 +85,7 @@ BuildRequires:  ccache
 %define	make_utils 0
 %define	make_vscan 1
 %define	make_ldapsmb 1
-%if 0%{?suse_version} > 1020 || 0%{?centos_version} > 500 || 0%{?fedora_version} > 7 || 0%{?rhel_version} > 500
+%if 0%{?suse_version} > 1000 || 0%{?centos_version} > 500 || 0%{?fedora_version} > 7 || 0%{?rhel_version} > 500
 %define	make_cifsupcall 1
 %else
 %define	make_cifsupcall 0
@@ -137,7 +140,7 @@ Authors:
 --------
     The Samba Team <samba@samba.org>
 
-Source Timestamp: 2115
+Source Timestamp: 2135
 Branch      : 3.3.4
 
 %package client
@@ -177,7 +180,7 @@ Authors:
 --------
     The Samba Team <samba@samba.org>
 
-Source Timestamp: 2115
+Source Timestamp: 2135
 Branch      : 3.3.4
 
 %if 0%{?suse_version} == 0 || 0%{?suse_version} > 1020
@@ -201,7 +204,7 @@ Authors:
 --------
     The Samba Team <samba@samba.org>
 
-Source Timestamp: 2115
+Source Timestamp: 2135
 Branch      : 3.3.4
 
 %endif
@@ -231,7 +234,7 @@ Authors:
 --------
     The Samba Team <samba@samba.org>
 
-Source Timestamp: 2115
+Source Timestamp: 2135
 Branch      : 3.3.4
 
 %endif
@@ -258,13 +261,13 @@ Authors:
 --------
     Jeremy Allison <jra at samba dot org>
 
-Source Timestamp: 2115
+Source Timestamp: 2135
 Branch      : 3.3.4
 
 %if %{make_utils}
 
 %package utils
-
+License:        GPL v2 or later
 Summary:        debug tools
 Group:          Productivity/Networking/Samba
 AutoReqProv:    on
@@ -280,6 +283,9 @@ Authors:
 --------
     The Samba Team <samba@samba.org>
 
+Source Timestamp: 2135
+Branch      : 3.3.4
+
 %endif
 
 %package winbind
@@ -307,7 +313,7 @@ Authors:
 --------
     The Samba Team <samba@samba.org>
 
-Source Timestamp: 2115
+Source Timestamp: 2135
 Branch      : 3.3.4
 
 %if 0%{?suse_version} && 0%{?suse_version} < 1031
@@ -345,7 +351,7 @@ Authors:
 --------
     The Samba Team <samba@samba.org>
 
-Source Timestamp: 2115
+Source Timestamp: 2135
 Branch      : 3.3.4
 
 %else
@@ -359,7 +365,7 @@ Authors:
 --------
     The Samba Team <samba@samba.org>
 
-Source Timestamp: 2115
+Source Timestamp: 2135
 Branch      : 3.3.4
 
 %endif
@@ -393,7 +399,7 @@ Authors:
 --------
     The Samba Team <samba@samba.org>
 
-Source Timestamp: 2115
+Source Timestamp: 2135
 Branch      : 3.3.4
 
 %package -n libnetapi0
@@ -412,7 +418,7 @@ Authors:
 --------
     The Samba Team <samba@samba.org>
 
-Source Timestamp: 2115
+Source Timestamp: 2135
 Branch      : 3.3.4
 
 %package -n libnetapi-devel
@@ -432,7 +438,7 @@ Authors:
 --------
     The Samba Team <samba@samba.org>
 
-Source Timestamp: 2115
+Source Timestamp: 2135
 Branch      : 3.3.4
 
 %if 0%{?suse_version} && 0%{?suse_version} < 1031
@@ -459,7 +465,7 @@ Authors:
 --------
     The Samba Team <samba@samba.org>
 
-Source Timestamp: 2115
+Source Timestamp: 2135
 Branch      : 3.3.4
 
 %else
@@ -473,7 +479,7 @@ Authors:
 --------
     The Samba Team <samba@samba.org>
 
-Source Timestamp: 2115
+Source Timestamp: 2135
 Branch      : 3.3.4
 
 %endif
@@ -504,7 +510,7 @@ Authors:
 --------
     The Samba Team <samba@samba.org>
 
-Source Timestamp: 2115
+Source Timestamp: 2135
 Branch      : 3.3.4
 
 %if %{make_ldapsmb}
@@ -525,7 +531,7 @@ Authors:
 --------
     The Samba Team <samba@samba.org>
 
-Source Timestamp: 2115
+Source Timestamp: 2135
 Branch      : 3.3.4
 
 %package -n libtalloc-devel
@@ -545,7 +551,7 @@ Authors:
 --------
     The Samba Team <samba@samba.org>
 
-Source Timestamp: 2115
+Source Timestamp: 2135
 Branch      : 3.3.4
 
 %package -n libtdb1
@@ -564,7 +570,7 @@ Authors:
 --------
     The Samba Team <samba@samba.org>
 
-Source Timestamp: 2115
+Source Timestamp: 2135
 Branch      : 3.3.4
 
 %package -n libtdb-devel
@@ -584,7 +590,7 @@ Authors:
 --------
     The Samba Team <samba@samba.org>
 
-Source Timestamp: 2115
+Source Timestamp: 2135
 Branch      : 3.3.4
 
 %package -n libwbclient0
@@ -603,7 +609,7 @@ Authors:
 --------
     The Samba Team <samba@samba.org>
 
-Source Timestamp: 2115
+Source Timestamp: 2135
 Branch      : 3.3.4
 
 %package -n libwbclient-devel
@@ -623,7 +629,7 @@ Authors:
 --------
     The Samba Team <samba@samba.org>
 
-Source Timestamp: 2115
+Source Timestamp: 2135
 Branch      : 3.3.4
 
 %package -n ldapsmb
@@ -632,7 +638,7 @@ Summary:        Tool to administer Samba's LDAP backend
 Group:          Productivity/Networking/Samba
 AutoReqProv:    on
 Version:        1.34b
-Release:        261
+Release:        262
 Requires:       perl-ldap
 
 %description -n ldapsmb
@@ -645,7 +651,7 @@ Authors:
 --------
     Guenther Deschner <guenther at deschner dot de>
 
-Source Timestamp: 2115
+Source Timestamp: 2135
 Branch      : 3.3.4
 
 %endif
@@ -657,7 +663,6 @@ Summary:        Mount using the Common Internet File System (CIFS)
 Group:          System/Filesystems
 AutoReqProv:    on
 Requires:       keyutils
-Requires:       keyutils-libs
 
 %description -n cifs-mount
 mount.cifs mounts a CIFS filesystem. It is usually invoked indirectly
@@ -669,7 +674,7 @@ Authors:
 --------
     Steve French <sfrench at Samba dot org>
 
-Source Timestamp: 2115
+Source Timestamp: 2135
 Branch      : 3.3.4
 
 %endif
@@ -681,7 +686,7 @@ Summary:        On-Access Virus Scanning with Samba
 Group:          Productivity/Networking/Samba
 AutoReqProv:    on
 Version:        0.3.6b
-Release:        265
+Release:        266
 Provides:       samba3-vscan = 0.3.6b
 Obsoletes:      samba3-vscan
 Requires:       samba = %{samba_ver}
@@ -699,7 +704,7 @@ Authors:
 --------
     Rainer Link <rainer@openantivirus.org>
 
-Source Timestamp: 2115
+Source Timestamp: 2135
 Branch      : 3.3.4
 
 %endif
@@ -1701,6 +1706,14 @@ exit 0
 %endif
 
 %changelog
+* Thu Jun 04 2009 sjayaraman@suse.de
+- Enable cifs.upcall on versions newer than SUSE 10.0
+* Thu Jun 04 2009 sjayaraman@suse.de
+- Add BuildRequires to keyutils-devel.
+* Thu Jun 04 2009 sjayaraman@suse.de
+- Remove redundant Requires to keyutils-libs for cifs-mount.
+* Wed May 27 2009 jmcdonough@suse.de
+- Detect tight loop in tdb_find(); (bnc#450974).
 * Sat May 09 2009 lmuelle@suse.de
 - Add BuildRequires to ctdb-devel for systems newer than SUSE 10.0 and all
   other build targets.
@@ -2257,6 +2270,8 @@ exit 0
 - Fix the dhcp hook script and support CODE11; (bnc#442335).
 * Thu Nov 27 2008 anschneider@suse.de
 - Fix perl v5.10 warnings in nmbstatus; (bnc#448225).
+* Wed Nov 26 2008 sjayaraman@suse.de
+- Include the missing spec file change mentioned the previous commit.
 * Tue Nov 25 2008 sjayaraman@suse.de
 - Make cifs-mount depend on keyutils, keyutils-libs packages as they
   are required to support dfs and kerberos; (bnc#432494).
diff --git a/vendor-files.tar.bz2 b/vendor-files.tar.bz2
index dda4861..9e861cd 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:c56201abefe91502537ad412a30680b899a6f0532f344b817ccc8e14c481d4ec
-size 23504
+oid sha256:604ff88aae6ce8c8c962645001db1a82577e1b8ca7bf47af96d1493c29eab6e1
+size 23509