[samba4/f18] Update to Samba 4.0.0 rc1.
asn
asn at fedoraproject.org
Fri Sep 14 10:12:16 UTC 2012
commit 7e63772b3b8e8940fa1722fd299b0cb90d9a75af
Author: Andreas Schneider <asn at cryptomilk.org>
Date: Fri Sep 14 10:41:58 2012 +0200
Update to Samba 4.0.0 rc1.
.gitignore | 1 +
samba-4.0.0rc2-build_idmap_manpages.patch | 33 +++++++++
samba-4.0.0rc2-fix_passdb.patch | 81 +++++++++++++++++++++++
samba4-libpdb-soversion.patch | 15 ----
samba4.spec | 102 +++++++++++++++++++---------
sources | 2 +-
6 files changed, 185 insertions(+), 49 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 48d6ec5..be0ce87 100644
--- a/.gitignore
+++ b/.gitignore
@@ -13,3 +13,4 @@ samba-4.0.0alpha11.tar.gz
/samba-4.0.0beta6.tar.bz2
/samba-4.0.0beta7.tar.bz2
/samba-4.0.0beta8.tar.bz2
+/samba-4.0.0rc1.tar.bz2
diff --git a/samba-4.0.0rc2-build_idmap_manpages.patch b/samba-4.0.0rc2-build_idmap_manpages.patch
new file mode 100644
index 0000000..0f4fc4f
--- /dev/null
+++ b/samba-4.0.0rc2-build_idmap_manpages.patch
@@ -0,0 +1,33 @@
+From a7a6a368f87c8b8af80511f1a3b32a457e48aa99 Mon Sep 17 00:00:00 2001
+From: Andreas Schneider <asn at samba.org>
+Date: Thu, 13 Sep 2012 17:52:13 +0200
+Subject: [PATCH] docs: Fix generating idmap manpages.
+
+
+Signed-off-by: Andreas Schneider <asn at samba.org>
+---
+ docs-xml/wscript_build | 8 ++++++++
+ 1 file changed, 8 insertions(+)
+
+diff --git a/docs-xml/wscript_build b/docs-xml/wscript_build
+index 14fa152..9a17be3 100644
+--- a/docs-xml/wscript_build
++++ b/docs-xml/wscript_build
+@@ -6,6 +6,14 @@ manpages='''
+ manpages/libsmbclient.7
+ manpages/lmhosts.5
+ manpages/log2pcap.1
++ manpages/idmap_ad.8
++ manpages/idmap_autorid.8
++ manpages/idmap_hash.8
++ manpages/idmap_ldap.8
++ manpages/idmap_nss.8
++ manpages/idmap_rid.8
++ manpages/idmap_tdb.8
++ manpages/idmap_tdb2.8
+ manpages/net.8
+ manpages/nmbd.8
+ manpages/nmblookup.1
+--
+1.7.12
+
diff --git a/samba-4.0.0rc2-fix_passdb.patch b/samba-4.0.0rc2-fix_passdb.patch
new file mode 100644
index 0000000..e77bce6
--- /dev/null
+++ b/samba-4.0.0rc2-fix_passdb.patch
@@ -0,0 +1,81 @@
+From dbb076fdc1687ca8180d9b4e5697cf06cba480fc Mon Sep 17 00:00:00 2001
+From: Alexander Bokovoy <ab at samba.org>
+Date: Thu, 13 Sep 2012 15:40:31 +0300
+Subject: [PATCH] s3: make ldapsam-related functions a smbldaphelper subsystem
+
+Since these functions are used in pdb_ldap and idmap_ldap, and
+pdb_ldap might be statically linked to libpdb (default), it is
+better to keep them as separate subsystem to avoid polluting libpdb
+namespace.
+
+This is first step in refactoring libpdb. Right now I cannot move
+these functions into proper libsmbldaphelper as it uses more of
+libpdb-included functions and linking pdb_ldap against libsmbldaphelper
+library would have created a loop if pdb_ldap is included into libpdb.
+---
+ source3/passdb/wscript_build | 4 ++--
+ source3/winbindd/wscript_build | 2 +-
+ source3/wscript_build | 5 ++++-
+ 3 files changed, 7 insertions(+), 4 deletions(-)
+
+diff --git a/source3/passdb/wscript_build b/source3/passdb/wscript_build
+index 1dfdfd0444a394df8f96d45643779f4882f65f5d..d26afc2a700fd2ae15e0c970199fbd705fa939eb 100644
+--- a/source3/passdb/wscript_build
++++ b/source3/passdb/wscript_build
+@@ -1,7 +1,7 @@
+ #!/usr/bin/env python
+
+ PDB_TDBSAM_SRC = 'pdb_tdb.c'
+-PDB_LDAP_SRC = 'pdb_ldap.c pdb_nds.c pdb_ipa.c pdb_ldap_util.c'
++PDB_LDAP_SRC = 'pdb_ldap.c pdb_nds.c pdb_ipa.c'
+ PDB_SMBPASSWD_SRC = 'pdb_smbpasswd.c'
+ PDB_WBC_SAM_SRC = 'pdb_wbc_sam.c'
+
+@@ -15,7 +15,7 @@ bld.SAMBA3_MODULE('pdb_tdbsam',
+
+ bld.SAMBA3_MODULE('pdb_ldap',
+ subsystem='pdb',
+- deps='smbldap',
++ deps='smbldap smbldaphelper',
+ source=PDB_LDAP_SRC,
+ init_function='',
+ internal_module=bld.SAMBA3_IS_STATIC_MODULE('pdb_ldap'),
+diff --git a/source3/winbindd/wscript_build b/source3/winbindd/wscript_build
+index 9f11affcc994f049a0e911ca9cf9d5f4cea6cefd..af3741b0b91a595a10d5a652762daa673e087e24 100644
+--- a/source3/winbindd/wscript_build
++++ b/source3/winbindd/wscript_build
+@@ -62,7 +62,7 @@ bld.SAMBA3_MODULE('idmap_passdb',
+ bld.SAMBA3_MODULE('idmap_ldap',
+ subsystem='idmap',
+ source=IDMAP_LDAP_SRC,
+- deps='smbldap',
++ deps='smbldap smbldaphelper',
+ init_function='',
+ internal_module=bld.SAMBA3_IS_STATIC_MODULE('idmap_ldap'),
+ enabled=bld.SAMBA3_IS_ENABLED_MODULE('idmap_ldap') and bld.env.HAVE_LDAP)
+diff --git a/source3/wscript_build b/source3/wscript_build
+index c7395e765b0c51a8f8e3d115f9cb4f7698923ad9..c534ae6f762cfc5a3d32a856d951a814cc398935 100755
+--- a/source3/wscript_build
++++ b/source3/wscript_build
+@@ -215,7 +215,6 @@ PASSDB_SRC = '''${PASSDB_GET_SET_SRC} passdb/passdb.c
+ passdb/account_pol.c ${PRIVILEGES_SRC}
+ lib/util_nscd.c lib/winbind_util.c
+ passdb/pdb_util.c passdb/pdb_interface.c
+- passdb/pdb_ldap_schema.c
+ passdb/pdb_secrets.c
+ passdb/pdb_unixid.c'''
+ #FIXME: lib/winbind_util.c probably is not part of PASSDB_SRC
+@@ -733,6 +732,10 @@ bld.SAMBA3_LIBRARY('pdb',
+ vnum='0',
+ vars=locals())
+
++bld.SAMBA3_SUBSYSTEM('smbldaphelper',
++ source='passdb/pdb_ldap_schema.c passdb/pdb_ldap_util.c',
++ deps='smbldap secrets3 pdb')
++
+ bld.SAMBA3_SUBSYSTEM('SERVER_MUTEX',
+ source=SERVER_MUTEX_SRC,
+ deps='talloc')
+--
+1.7.12
+
diff --git a/samba4.spec b/samba4.spec
index 0726544..7d82dba 100644
--- a/samba4.spec
+++ b/samba4.spec
@@ -1,4 +1,4 @@
-%define main_release 138
+%define main_release 139
%define samba_version 4.0.0
%define talloc_version 2.0.7
@@ -6,7 +6,7 @@
%define tdb_version 1.2.10
%define tevent_version 0.9.17
%define ldb_version 1.1.12
-%define pre_release beta8
+%define pre_release rc1
%define samba_release %{main_release}%{?dist}.%{pre_release}
@@ -92,7 +92,8 @@ Source102: winbind.init
Source200: README.dc
Source201: README.downgrade
-Patch1: samba4-libpdb-soversion.patch
+Patch0: samba-4.0.0rc2-fix_passdb.patch
+Patch1: samba-4.0.0rc2-build_idmap_manpages.patch
BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
@@ -377,7 +378,8 @@ link against the SMB, RPC and other protocols.
%prep
%setup -q -n samba-%{version}%{pre_release}
-%patch1 -p1 -b .waf_tdb
+%patch0 -p1 -b .fix_passdb
+%patch1 -p1 -b .build_idmap_manpages
%build
%global _talloc_lib ,talloc,pytalloc,pytalloc-util
@@ -506,9 +508,6 @@ chmod 0755 %{buildroot}/%{smb_lib}/libnss_wins.so.2
ln -sf /%{smb_lib}/libnss_winbind.so.2 %{buildroot}%{_libdir}/libnss_winbind.so
ln -sf /%{smb_lib}/libnss_wins.so.2 %{buildroot}%{_libdir}/libnss_wins.so
-# pdb FIXME
-ln -sf %{_libdir}/samba/libpdb.so.0 %{buildroot}%{_libdir}/samba/libpdb.so
-
# Install other stuff
install -m 0644 %{SOURCE1} %{buildroot}%{_sysconfdir}/logrotate.d/samba
install -m 0644 %{SOURCE4} %{buildroot}%{_sysconfdir}/samba/smb.conf
@@ -776,6 +775,11 @@ rm -rf %{buildroot}
%{_initrddir}/smb
%endif
%doc %{_defaultdocdir}/%{name}/README.downgrade
+%{_mandir}/man1/smbstatus.1*
+%{_mandir}/man8/eventlogadm.8*
+%{_mandir}/man8/smbd.8*
+%{_mandir}/man8/nmbd.8*
+%{_mandir}/man8/vfs_*.8*
%files libs
%defattr(-,root,root)
@@ -797,6 +801,8 @@ rm -rf %{buildroot}
%{_libdir}/libsmbclient-raw.so.*
%{_libdir}/libsmbconf.so.*
%{_libdir}/libtevent-util.so.*
+%{_libdir}/libpdb.so.*
+%{_libdir}/libsmbldap.so.*
# libraries needed by the public libraries
%{_libdir}/samba/libCHARSET3.so
@@ -861,8 +867,6 @@ rm -rf %{buildroot}
%{_libdir}/samba/libutil_setid.so
%{_libdir}/samba/libutil_tdb.so
%{_libdir}/samba/libxattr_tdb.so
-%{_libdir}/samba/libpdb.so.*
-%{_libdir}/samba/libsmbldap.so
%if %with_dc
%{_libdir}/samba/libdb-glue.so
@@ -916,6 +920,7 @@ rm -rf %{buildroot}
%if ! %with_libsmbclient
%{_libdir}/samba/libsmbclient.so.*
%{_libdir}/samba/libsmbsharemodes.so.*
+%{_mandir}/man7/libsmbclient.7*
%endif # ! with_libsmbclient
%if ! %with_libwbclient
@@ -942,6 +947,15 @@ rm -rf %{buildroot}
%config(noreplace) %{_sysconfdir}/samba/smb.conf
%config(noreplace) %{_sysconfdir}/samba/lmhosts
%config(noreplace) %{_sysconfdir}/sysconfig/samba
+%{_mandir}/man1/profiles.1*
+%{_mandir}/man1/smbcontrol.1*
+%{_mandir}/man1/testparm.1*
+%{_mandir}/man5/lmhosts.5*
+%{_mandir}/man5/smb.conf.5*
+%{_mandir}/man5/smbpasswd.5*
+%{_mandir}/man7/samba.7*
+%{_mandir}/man8/net.8*
+%{_mandir}/man8/pdbedit.8*
# common libraries
%{_libdir}/samba/libauth.so
@@ -961,13 +975,12 @@ rm -rf %{buildroot}
%if %with_dc
%{_bindir}/samba-tool
-%{_bindir}/samba_kcc
-%{_sbindir}/provision
%{_sbindir}/samba
-%{_sbindir}/upgradeprovision
+%{_sbindir}/samba_kcc
%{_sbindir}/samba_dnsupdate
%{_sbindir}/samba_spnupdate
%{_sbindir}/samba_upgradedns
+%{_sbindir}/samba_upgradeprovision
%{_libdir}/mit_samba.so
%{_libdir}/samba/bind9/dlz_bind9.so
%{_libdir}/samba/libheimntlm-samba4.so.1
@@ -1011,11 +1024,11 @@ rm -rf %{buildroot}
%if 0%{?fedora} > 15 || 0%{?rhel} > 6
%{_unitdir}/winbind.service
%endif
-#%{_mandir}/man1/wbinfo.1*
-#%{_mandir}/man5/pam_winbind.conf.5*
-#%{_mandir}/man8/pam_winbind.8*
-#%{_mandir}/man8/winbindd.8*
-#%{_mandir}/man8/idmap_*.8*
+%{_mandir}/man1/wbinfo.1*
+%{_mandir}/man5/pam_winbind.conf.5*
+%{_mandir}/man8/pam_winbind.8*
+%{_mandir}/man8/winbindd.8*
+%{_mandir}/man8/idmap_*.8*
#%{_datadir}/locale/*/LC_MESSAGES/pam_winbind.mo
%if 0%{?rhel} == 6
%{_initrddir}/winbind
@@ -1023,8 +1036,8 @@ rm -rf %{buildroot}
%files winbind-krb5-locator
%defattr(-,root,root)
-#%{_mandir}/man7/winbind_krb5_locator.7*
%{_libdir}/krb5/plugins/libkrb5/winbind_krb5_locator.so
+%{_mandir}/man7/winbind_krb5_locator.7*
%files winbind-clients
%defattr(-,root,root)
@@ -1068,12 +1081,27 @@ rm -rf %{buildroot}
%{_libdir}/samba/libcli_spoolss.so
%{_libdir}/samba/libldb-cmdline.so
%{_libdir}/samba/libtrusts_util.so
-%{_mandir}/man1/nmblookup.1.gz
-%{_mandir}/man1/oLschema2ldif.1.gz
-%{_mandir}/man1/regdiff.1.gz
-%{_mandir}/man1/regpatch.1.gz
-%{_mandir}/man1/regshell.1.gz
-%{_mandir}/man1/regtree.1.gz
+%{_mandir}/man1/nmblookup.1*
+%{_mandir}/man1/oLschema2ldif.1*
+%{_mandir}/man1/regdiff.1*
+%{_mandir}/man1/regpatch.1*
+%{_mandir}/man1/regshell.1*
+%{_mandir}/man1/regtree.1*
+%exclude %{_mandir}/man1/findsmb.1*
+%{_mandir}/man1/log2pcap.1*
+%{_mandir}/man1/nmblookup4.1*
+%{_mandir}/man1/rpcclient.1*
+%{_mandir}/man1/sharesec.1*
+%{_mandir}/man1/smbcacls.1*
+%{_mandir}/man1/smbclient.1*
+%{_mandir}/man1/smbcquotas.1*
+%{_mandir}/man1/smbget.1*
+%{_mandir}/man5/smbgetrc.5*
+%exclude %{_mandir}/man1/smbtar.1*
+%{_mandir}/man1/smbtree.1*
+%{_mandir}/man8/smbpasswd.8*
+%{_mandir}/man8/smbspool.8*
+%{_mandir}/man8/smbta-util.8*
## we don't build it for now
#%if %{with_ntdb}
@@ -1135,11 +1163,15 @@ rm -rf %{buildroot}
%{_bindir}/vlp
%{_libdir}/libtorture.so.*
%{_libdir}/samba/libsubunit.so
-%{_mandir}/man1/gentest.1.gz
-%{_mandir}/man1/locktest.1.gz
-%{_mandir}/man1/masktest.1.gz
-%{_mandir}/man1/ndrdump.1.gz
-%{_mandir}/man1/smbtorture.1.gz
+%if %with_dc
+%{_libdir}/samba/libdlz_bind9_for_torture.so
+%endif
+%{_mandir}/man1/gentest.1*
+%{_mandir}/man1/locktest.1*
+%{_mandir}/man1/masktest.1*
+%{_mandir}/man1/ndrdump.1*
+%{_mandir}/man1/smbtorture.1*
+%{_mandir}/man1/vfstest.1*
%files devel
%defattr(-,root,root)
@@ -1285,7 +1317,8 @@ rm -rf %{buildroot}
%{_libdir}/pkgconfig/samdb.pc
%{_libdir}/pkgconfig/smbclient-raw.pc
%{_libdir}/pkgconfig/torture.pc
-%{_libdir}/samba/libpdb.so
+%{_libdir}/libpdb.so
+%{_libdir}/libsmbldap.so
%if %with_dc
%{_includedir}/samba-4.0/dcerpc_server.h
@@ -1323,7 +1356,7 @@ rm -rf %{buildroot}
%config(noreplace) %{_sysconfdir}/xinetd.d/swat
%{_datadir}/samba/swat
%{_sbindir}/swat
-#%{_mandir}/man8/swat.8*
+%{_mandir}/man8/swat.8*
#%attr(755,root,root) %{_libdir}/samba/*.msg
%if %with_libsmbclient
@@ -1340,7 +1373,7 @@ rm -rf %{buildroot}
%{_libdir}/libsmbsharemodes.so
%{_libdir}/pkgconfig/smbclient.pc
%{_libdir}/pkgconfig/smbsharemodes.pc
-#%{_mandir}/man7/libsmbclient.7*
+%{_mandir}/man7/libsmbclient.7*
%endif # with_libsmbclient
%if %with_libwbclient
@@ -1357,7 +1390,10 @@ rm -rf %{buildroot}
%endif # with_libwbclient
%changelog
-* Mon Sep 03 2012 - Andreas Schneider <asn at redhat.com>
+* Thu Sep 13 2012 - Andreas Schneider <asn at redhat.com> - 2:4.0.0-139.rc1
+- Update to Samba 4.0.0 rc1.
+
+* Mon Sep 03 2012 - Andreas Schneider <asn at redhat.com> - 2:4.0.0-138.beta8
- Update to Samba 4.0.0 beta8.
* Wed Aug 29 2012 - Andreas Schneider <asn at redhat.com> - 2:4.0.0-137.beta7
diff --git a/sources b/sources
index 16f81c9..ed94bb0 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-308eda469f6a941b2abd67b137130e7b samba-4.0.0beta8.tar.bz2
+9fd5a6ac70f724a66c6fa53b9161ea06 samba-4.0.0rc1.tar.bz2
More information about the scm-commits
mailing list