[samba4] Update to Samba 4.0.0 alpha 21.

asn asn at fedoraproject.org
Wed May 30 15:21:45 UTC 2012 

commit 63f5477fc6e19dbd93772664f370ba4e82f6471a
Author: Andreas Schneider <asn at cryptomilk.org>
Date:   Wed May 30 17:21:11 2012 +0200

    Update to Samba 4.0.0 alpha 21.

 samba4-4.0.0-alpha19-CVE-2012-1182.patch |  511 ------------------------------
 samba4-4.0.0-alpha20-lib-private.patch   |  174 ----------
 samba4-CVE-2012-2111.patch               |   74 -----
 samba4-external_ldap_callback.patch      |   86 -----
 samba4-samr-lsa-session_key.patch        |  434 -------------------------
 samba4-waf_target.patch                  |   29 --
 samba4.spec                              |   50 ++--
 7 files changed, 20 insertions(+), 1338 deletions(-)
---
diff --git a/samba4.spec b/samba4.spec
index c530e41..581ce22 100644
--- a/samba4.spec
+++ b/samba4.spec
@@ -1,11 +1,11 @@
-%define main_release 50
+%define main_release 51
 
 %define samba_version 4.0.0
 %define talloc_version 2.0.7
-%define tdb_version 1.2.9
+%define tdb_version 1.2.10
 %define tevent_version 0.9.15
-%define ldb_version 1.1.4
-%define pre_release alpha18
+%define ldb_version 1.1.6
+%define pre_release alpha21
 
 %define samba_release %{main_release}%{pre_release}%{?dist}
 
@@ -72,12 +72,6 @@ Source101: smb.init
 Source102: winbind.init
 
 Patch1: samba4-libpdb-soversion.patch
-Patch2: samba4-samr-lsa-session_key.patch
-Patch3: samba4-waf_target.patch
-Patch4: samba4-external_ldap_callback.patch
-Patch5: samba4-4.0.0-alpha19-CVE-2012-1182.patch
-Patch6: samba4-4.0.0-alpha20-lib-private.patch
-Patch7: samba4-CVE-2012-2111.patch
 
 BuildRoot:      %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
 
@@ -139,14 +133,14 @@ BuildRequires: libtevent-devel >= %{libtevent_version}
 %endif
 
 %if ! %with_ldb
-%define libldb_version 1.1.0
+%define libldb_version 1.1.6
 
 BuildRequires: libldb-devel >= %{libldb_version}
 BuildRequires: pyldb-devel >= %{libldb_version}
 %endif
 
 %if ! %with_tdb
-%define libtdb_version 1.2.9
+%define libtdb_version 1.2.10
 
 BuildRequires: libtdb-devel >= %{libtdb_version}
 %endif
@@ -351,12 +345,6 @@ link against the SMB, RPC and other protocols.
 %setup -q -n samba-%{version}%{pre_release}
 
 %patch1 -p1 -b .waf_tdb
-%patch2 -p1 -b .session_key
-%patch3 -p1 -b .waf_target
-%patch4 -p1 -b .external_callback
-%patch5 -p1 -b .CVE-2012-1182
-%patch6 -p1 -b .private-lib
-%patch7 -p1 -b .CVE-2012-2111
 
 %build
 %define _talloc_lib %nil
@@ -705,8 +693,6 @@ rm -rf %{buildroot}
 %{_libdir}/samba/libCHARSET3.so
 %{_libdir}/samba/libHDB_SAMBA4.so
 %{_libdir}/samba/libLIBWBCLIENT_OLD.so
-%{_libdir}/samba/libUTIL_TDB.so
-%{_libdir}/samba/libadt_tree.so
 %{_libdir}/samba/libasn1-samba4.so.8
 %{_libdir}/samba/libasn1-samba4.so.8.0.0
 %{_libdir}/samba/libasn1util.so
@@ -719,6 +705,7 @@ rm -rf %{buildroot}
 %{_libdir}/samba/libcli_cldap.so
 %{_libdir}/samba/libcli_smb_common.so
 %{_libdir}/samba/libcliauth.so
+%{_libdir}/samba/libclidns.so
 %{_libdir}/samba/libcluster.so
 %{_libdir}/samba/libdb-glue.so
 %{_libdir}/samba/libdbwrap.so
@@ -739,19 +726,19 @@ rm -rf %{buildroot}
 %{_libdir}/samba/libhx509-samba4.so.5
 %{_libdir}/samba/libhx509-samba4.so.5.0.0
 %{_libdir}/samba/libinterfaces.so
-%{_libdir}/samba/libkdc-policy.so
+%{_libdir}/samba/libkrb5samba.so
 %{_libdir}/samba/libkrb5-samba4.so.26
 %{_libdir}/samba/libkrb5-samba4.so.26.0.0
 %{_libdir}/samba/libldbsamba.so
 %{_libdir}/samba/liblibcli_lsa3.so
 %{_libdir}/samba/liblibcli_netlogon3.so
 %{_libdir}/samba/liblibsmb.so
-%{_libdir}/samba/libmemcache.so
 %{_libdir}/samba/libmsrpc3.so
 %{_libdir}/samba/libndr-samba.so
 %{_libdir}/samba/libndr-samba4.so
 %{_libdir}/samba/libnetif.so
 %{_libdir}/samba/libnpa_tstream.so
+%{_libdir}/samba/libposix_eadb.so
 %{_libdir}/samba/libreplace.so
 %{_libdir}/samba/libroken-samba4.so.19
 %{_libdir}/samba/libroken-samba4.so.19.0.1
@@ -764,20 +751,19 @@ rm -rf %{buildroot}
 %{_libdir}/samba/libsecurity.so
 %{_libdir}/samba/libserver-role.so
 %{_libdir}/samba/libshares.so
+%{_libdir}/samba/libsamba3-util.so
 %{_libdir}/samba/libsmbd_shim.so
 %{_libdir}/samba/libsmbpasswdparser.so
 %{_libdir}/samba/libsmbregistry.so
-%{_libdir}/samba/libstring_init.so
 %{_libdir}/samba/libtdb-wrap.so
 %{_libdir}/samba/libtdb_compat.so
 %{_libdir}/samba/libutil_cmdline.so
-%{_libdir}/samba/libutil_malloc.so
 %{_libdir}/samba/libutil_reg.so
-%{_libdir}/samba/libutil_sec.so
-%{_libdir}/samba/libutil_str.so
+%{_libdir}/samba/libutil_tdb.so
 %{_libdir}/samba/libwind-samba4.so.0
 %{_libdir}/samba/libwind-samba4.so.0.0.0
 %{_libdir}/samba/libwrap_xattr.so
+%{_libdir}/samba/libxattr_tdb.so
 
 %if %{with_ldb}
 %{_libdir}/samba/libldb.so.1
@@ -828,7 +814,6 @@ rm -rf %{buildroot}
 # common libraries
 %{_libdir}/samba/libads.so
 %{_libdir}/samba/libauth.so
-%{_libdir}/samba/libnamearray.so
 %{_libdir}/samba/libnet_keytab.so
 %{_libdir}/samba/libpdb.so.*
 %{_libdir}/samba/libpopt_samba3.so
@@ -840,6 +825,7 @@ rm -rf %{buildroot}
 
 %files dc
 %defattr(-,root,root)
+%{_bindir}/samba-dig
 %{_bindir}/samba-tool
 %{_bindir}/samba_kcc
 %{_sbindir}/provision
@@ -847,7 +833,7 @@ rm -rf %{buildroot}
 %{_sbindir}/upgradeprovision
 %{_sbindir}/samba_dnsupdate
 %{_sbindir}/samba_spnupdate
-%{_sbindir}/upgradedns
+%{_sbindir}/samba_upgradedns
 %{_libdir}/mit_samba.so
 %{_libdir}/samba/bind9/dlz_bind9.so
 %{_libdir}/samba/libcmdline-credentials.so
@@ -873,6 +859,7 @@ rm -rf %{buildroot}
 %{_libdir}/samba/libntvfs.so
 %{_libdir}/samba/libprocess_model.so
 %{_libdir}/samba/libservice.so
+%{_libdir}/samba/bind9/dlz_bind9_9.so
 
 %files winbind
 %defattr(-,root,root)
@@ -881,7 +868,6 @@ rm -rf %{buildroot}
 %{_libdir}/samba/nss_info
 %{_libdir}/samba/libnss_info.so
 %{_libdir}/samba/libidmap.so
-%{_libdir}/samba/idmap
 %{_sbindir}/winbindd
 %ghost %dir /var/run/winbindd
 %attr(750,root,wbpriv) %dir /var/lib/samba/winbindd_privileged
@@ -1080,16 +1066,17 @@ rm -rf %{buildroot}
 %{_includedir}/samba-4.0/registry.h
 %{_includedir}/samba-4.0/roles.h
 %{_includedir}/samba-4.0/rpc_common.h
-%{_includedir}/samba-4.0/samba/popt.h
 %{_includedir}/samba-4.0/samba/session.h
 %{_includedir}/samba-4.0/samba/version.h
 %{_includedir}/samba-4.0/share.h
+%{_includedir}/samba-4.0/smb2.h
 %{_includedir}/samba-4.0/smb2_constants.h
 %{_includedir}/samba-4.0/smb2_create_blob.h
 %{_includedir}/samba-4.0/smb2_signing.h
 %{_includedir}/samba-4.0/smb_cli.h
 %{_includedir}/samba-4.0/smb_cliraw.h
 %{_includedir}/samba-4.0/smb_common.h
+%{_includedir}/samba-4.0/smb_composite.h
 %{_includedir}/samba-4.0/smbconf.h
 %{_includedir}/samba-4.0/smb_constants.h
 %{_includedir}/samba-4.0/smb_ldap.h
@@ -1225,6 +1212,9 @@ rm -rf %{buildroot}
 %endif # with_libwbclient
 
 %changelog
+* Wed May 30 2012 Andreas Schneider <asn at redhat.com> - 2:4.0.0-51.alpha21
+- Update to Samba 4.0.0 alpha 21.
+
 * Mon May 21 2012 Andreas Schneider <asn at redhat.com> - 2:4.0.0-50.alpha18
 - Add missing python-tevent to BuildRequires.
 - Move idmap modlues to winbind package.

More information about the scm-commits mailing list