[samba/f19] Update to Samba 4.0.6.

[asn]

commit 5e698b04bbe029b62c1811338a8b173856b4832e
Author: Andreas Schneider <asn at redhat.com>
Date:   Tue May 21 14:42:38 2013 +0200

    Update to Samba 4.0.6.

 .gitignore                            |    1 +
 samba-4.0.6_add_passdb_upn_enum.patch |  406 ---------------------------------
 samba.spec                            |   24 +-
 sources                               |    2 +-
 4 files changed, 14 insertions(+), 419 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 723fb99..65e7409 100644
--- a/.gitignore
+++ b/.gitignore
@@ -24,3 +24,4 @@ samba-3.6.0pre1.tar.gz
 /samba-4.0.3.tar.bz2
 /samba-4.0.4.tar.bz2
 /samba-4.0.5.tar.bz2
+/samba-4.0.6.tar.bz2
diff --git a/samba.spec b/samba.spec
index e4adc3d..260c189 100644
--- a/samba.spec
+++ b/samba.spec
@@ -3,7 +3,7 @@
 
 %define main_release 1
 
-%define samba_version 4.0.5
+%define samba_version 4.0.6
 %define talloc_version 2.0.7
 %define ntdb_version 0.9
 %define tdb_version 1.2.11
@@ -22,14 +22,14 @@
 %global with_libwbclient 1
 
 %global with_pam_smbpass 0
-%global with_internal_talloc 0
-%global with_internal_tevent 0
-%global with_internal_tdb 0
+%global with_internal_talloc 1
+%global with_internal_tevent 1
+%global with_internal_tdb 1
 %global with_internal_ntdb 1
-%global with_internal_ldb 0
+%global with_internal_ldb 1
 
-%global with_mitkrb5 1
-%global with_dc 0
+%global with_mitkrb5 0
+%global with_dc 1
 
 %if %{with testsuite}
 # The testsuite only works with a full build right now.
@@ -76,8 +76,6 @@ Source6: samba.pamd
 Source200: README.dc
 Source201: README.downgrade
 
-Patch0: samba-4.0.6_add_passdb_upn_enum.patch
-
 BuildRoot:      %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
 
 Requires(pre): /usr/sbin/groupadd
@@ -191,6 +189,7 @@ Obsoletes: samba4-common < %{samba_depver}
 
 # This is for upgrading from F17 to F18
 Obsoletes: samba-doc
+Obsoletes: samba-domainjoin-gui
 
 %description common
 samba4-common provides files necessary for both the server and client
@@ -434,8 +433,6 @@ the local kerberos library to use the same KDC as samba and winbind use
 %prep
 %setup -q -n samba-%{version}%{pre_release}
 
-%patch0 -p1 -b .add_passdb_upn_enum
-
 %build
 %global _talloc_lib ,talloc,pytalloc,pytalloc-util
 %global _tevent_lib ,tevent,pytevent
@@ -822,7 +819,7 @@ rm -rf %{buildroot}
 %{_bindir}/smbcontrol
 %{_bindir}/testparm
 %{_datadir}/samba/codepages
-%{_sysconfdir}/logrotate.d/
+%dir %{_sysconfdir}/logrotate.d/
 %config(noreplace) %{_sysconfdir}/logrotate.d/samba
 %attr(0700,root,root) %dir /var/log/samba
 %attr(0700,root,root) %dir /var/log/samba/old
@@ -1353,6 +1350,9 @@ rm -rf %{buildroot}
 %{_mandir}/man7/winbind_krb5_locator.7*
 
 %changelog
+* Tue May 21 2013 - Andreas Schneider <asn at redhat.com> - 2:4.0.6-1
+- Update to Samba 4.0.6.
+
 * Tue Apr 10 2013 - Andreas Schneider <asn at redhat.com> - 2:4.0.5-1
 - Update to Samba 4.0.5.
 - Add UPN enumeration to passdb internal API (bso #9779).
diff --git a/sources b/sources
index 72c96cd..7c50980 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-5e6693c55e43a1ad58a3d9ade249c178  samba-4.0.5.tar.bz2
+875b319ff3f32a46366859864612767a  samba-4.0.6.tar.bz2