[samba4] Update to Samba 4.0.0 beta7.

[asn]

commit 056482fd195d4e92f04e46853bd7984069a824cd
Author: Andreas Schneider <asn at cryptomilk.org>
Date:   Wed Aug 29 14:13:30 2012 +0200

    Update to Samba 4.0.0 beta7.

 .gitignore                       |    1 +
 samba4-beta7-fix_mit_build.patch |   44 ++++++++++++++++++++++++++++++++++++++
 samba4.spec                      |   20 +++++++++++------
 sources                          |    2 +-
 4 files changed, 59 insertions(+), 8 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 45a96d4..3321d61 100644
--- a/.gitignore
+++ b/.gitignore
@@ -11,3 +11,4 @@ samba-4.0.0alpha11.tar.gz
 /samba-4.0.0beta4.tar.bz2
 /samba-4.0.0beta5.tar.bz2
 /samba-4.0.0beta6.tar.bz2
+/samba-4.0.0beta7.tar.bz2
diff --git a/samba4-beta7-fix_mit_build.patch b/samba4-beta7-fix_mit_build.patch
new file mode 100644
index 0000000..ecf53f5
--- /dev/null
+++ b/samba4-beta7-fix_mit_build.patch
@@ -0,0 +1,44 @@
+commit 24356f3cc9382b321939a53efec313ebce0acfa5
+Author:     Andreas Schneider <asn at samba.org>
+AuthorDate: Wed Aug 29 10:36:21 2012 +0200
+Commit:     Andreas Schneider <asn at cryptomilk.org>
+CommitDate: Wed Aug 29 12:23:37 2012 +0200
+
+    libkrb5: Fix build with MIT Kerberos.
+    
+    Autobuild-User(master): Andreas Schneider <asn at cryptomilk.org>
+    Autobuild-Date(master): Wed Aug 29 12:23:37 CEST 2012 on sn-devel-104
+---
+ lib/krb5_wrap/enctype_convert.c | 12 ++++++------
+ 1 file changed, 6 insertions(+), 6 deletions(-)
+
+diff --git a/lib/krb5_wrap/enctype_convert.c b/lib/krb5_wrap/enctype_convert.c
+index 446384e..b78304f 100644
+--- a/lib/krb5_wrap/enctype_convert.c
++++ b/lib/krb5_wrap/enctype_convert.c
+@@ -28,11 +28,11 @@ const krb5_enctype *samba_all_enctypes(void)
+ {
+ 	/* TODO: Find a way not to have to use a fixed list */
+ 	static const krb5_enctype enctypes[] = {
+-		KRB5_ENCTYPE_DES_CBC_CRC,
+-		KRB5_ENCTYPE_DES_CBC_MD5,
+-		KRB5_ENCTYPE_AES128_CTS_HMAC_SHA1_96,
+-		KRB5_ENCTYPE_AES256_CTS_HMAC_SHA1_96,
+-		KRB5_ENCTYPE_ARCFOUR_HMAC_MD5,
++		ENCTYPE_DES_CBC_CRC,
++		ENCTYPE_DES_CBC_MD5,
++		ENCTYPE_AES128_CTS_HMAC_SHA1_96,
++		ENCTYPE_AES256_CTS_HMAC_SHA1_96,
++		ENCTYPE_ARCFOUR_HMAC,
+ 		0
+ 	};
+ 	return enctypes;
+@@ -47,7 +47,7 @@ uint32_t kerberos_enctype_to_bitmap(krb5_enctype enc_type_enum)
+ 		return ENC_CRC32;
+ 	case ENCTYPE_DES_CBC_MD5:
+ 		return ENC_RSA_MD5;
+-	case ENCTYPE_ARCFOUR_HMAC_MD5:
++	case ENCTYPE_ARCFOUR_HMAC:
+ 		return ENC_RC4_HMAC_MD5;
+ 	case ENCTYPE_AES128_CTS_HMAC_SHA1_96:
+ 		return ENC_HMAC_SHA1_96_AES128;
diff --git a/samba4.spec b/samba4.spec
index d809b7a..14ad72b 100644
--- a/samba4.spec
+++ b/samba4.spec
@@ -1,12 +1,12 @@
-%define main_release 136
+%define main_release 137
 
 %define samba_version 4.0.0
 %define talloc_version 2.0.7
 %define ntdb_version 0.9
 %define tdb_version 1.2.10
-%define tevent_version 0.9.16
+%define tevent_version 0.9.17
 %define ldb_version 1.1.10
-%define pre_release beta6
+%define pre_release beta7
 
 %define samba_release %{main_release}%{?dist}.%{pre_release}
 
@@ -93,6 +93,7 @@ Source200: README.dc
 Source201: README.downgrade
 
 Patch1: samba4-libpdb-soversion.patch
+Patch2: samba4-beta7-fix_mit_build.patch
 
 BuildRoot:      %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
 
@@ -157,7 +158,7 @@ BuildRequires: python-tevent >= %{libtevent_version}
 %endif
 
 %if ! %with_ldb
-%global libldb_version 1.1.10
+%global libldb_version 1.1.11
 
 BuildRequires: libldb-devel >= %{libldb_version}
 BuildRequires: pyldb-devel >= %{libldb_version}
@@ -378,6 +379,7 @@ link against the SMB, RPC and other protocols.
 %setup -q -n samba-%{version}%{pre_release}
 
 %patch1 -p1 -b .waf_tdb
+%patch2 -p1 -b .fix_mit_build
 
 %build
 %global _talloc_lib ,talloc,pytalloc,pytalloc-util
@@ -832,6 +834,7 @@ rm -rf %{buildroot}
 %{_libdir}/samba/liblibcli_lsa3.so
 %{_libdir}/samba/liblibcli_netlogon3.so
 %{_libdir}/samba/liblibsmb.so
+%{_libdir}/samba/libsmb_transport.so
 %{_libdir}/samba/libmsrpc3.so
 %{_libdir}/samba/libndr-samba.so
 %{_libdir}/samba/libndr-samba4.so
@@ -1040,7 +1043,6 @@ rm -rf %{buildroot}
 %files client
 %defattr(-,root,root)
 %{_bindir}/cifsdd
-%{_bindir}/cclean
 %{_bindir}/dbwrap_tool
 %{_bindir}/debug2html
 %{_bindir}/log2pcap
@@ -1339,7 +1341,7 @@ rm -rf %{buildroot}
 %{_libdir}/libsmbclient.so
 %{_libdir}/libsmbsharemodes.so
 %{_libdir}/pkgconfig/smbclient.pc
-#%{_libdir}/pkgconfig/smbsharemodes.pc
+%{_libdir}/pkgconfig/smbsharemodes.pc
 #%{_mandir}/man7/libsmbclient.7*
 %endif # with_libsmbclient
 
@@ -1357,7 +1359,11 @@ rm -rf %{buildroot}
 %endif # with_libwbclient
 
 %changelog
-* Thu Aug 23 2012 - Andreas Schneider <asn at redhat.com>
+* Wed Aug 29 2012 - Andreas Schneider <asn at redhat.com> - 2:4.0.0-137.beta7
+- Update to Samba 4.0.0 beta7.
+- Fix building with MIT Kerberos.
+
+* Thu Aug 23 2012 - Andreas Schneider <asn at redhat.com> - 2:4.0.0-136.beta6
 - Introduce new systemd-rpm macros for F18 and RHEL7.
 - resolves: #850306
 
diff --git a/sources b/sources
index 1f809b2..a71a62e 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-1ea3a8c7da77819cf61b550772b5579c  samba-4.0.0beta6.tar.bz2
+c28ee9020569782156656f6de53b4478  samba-4.0.0beta7.tar.bz2