[samba4] Rebase to samba4 alpha16
Simo Sorce
simo at fedoraproject.org
Wed Aug 3 21:33:59 UTC 2011
commit 018337fee440da88c028e5f5970bf97d1f6912bd
Author: Simo Sorce <ssorce at redhat.com>
Date: Tue Aug 2 17:42:03 2011 -0400
Rebase to samba4 alpha16
...pc-we-do-not-need-these-as-public-headers.patch | 48 ----
...-put-data_blob-back-in-the-public-library.patch | 59 -----
...change-doesn-t-need-these-headers-any-mor.patch | 29 ---
...ove-partly-implemented-libwbclient-module.patch | 234 --------------------
samba4.spec | 179 +++++++++++++---
sources | 2 +-
6 files changed, 152 insertions(+), 399 deletions(-)
---
diff --git a/samba4.spec b/samba4.spec
index 288e81c..73c95c9 100644
--- a/samba4.spec
+++ b/samba4.spec
@@ -1,4 +1,4 @@
-%define main_release 34
+%define main_release 35
%define samba4_version 4.0.0
%define talloc_version 2.0.5
@@ -6,13 +6,11 @@
%define tevent_version 0.9.11
%define ldb_version 1.0.2
-%define scmtype GIT
-%define scmrev a6a722b
-%define pre_release alpha15
+%define pre_release alpha16
-%define tarball_name samba-%{samba4_version}%{pre_release}-%{scmtype}-%{scmrev}
+%define tarball_name samba-%{samba4_version}%{pre_release}
-%define samba4_release %{main_release}.%{pre_release}%{scmtype}%{scmrev}%{?dist}
+%define samba4_release %{main_release}.%{pre_release}%{?dist}
# Most of these subpackages are disabled because they are not
# needed by OpenChange, and to avoid file conflicts with Samba3.
@@ -31,7 +29,7 @@
Name: samba4
Version: %{samba4_version}
-Release: %{samba4_release}.1
+Release: %{samba4_release}
Group: System Environment/Daemons
Summary: The Samba4 CIFS and AD client and server suite
License: GPLv3+ and LGPLv3+
@@ -46,10 +44,7 @@ Source4: %{name}.sysconfig
Source5: %{name}.init
%endif
-Patch01: 0001-s4-auth-Remove-partly-implemented-libwbclient-module.patch
-Patch02: 0001-libcli-openchange-doesn-t-need-these-headers-any-mor.patch
-Patch03: 0001-dcerpc-we-do-not-need-these-as-public-headers.patch
-Patch04: 0001-lib-util-put-data_blob-back-in-the-public-library.patch
+Patch01: samba-4.0.0alpha16.buildfix.patch
Requires(pre): /usr/sbin/groupadd
@@ -176,24 +171,20 @@ domains and to use Windows user and group accounts on Linux.
%setup -q -n %{tarball_name}
# copy Red Hat specific scripts
-
-%patch01 -p1 -b .rm-libwbclient-dep
-%patch02 -p1 -b .unneded-headers
-%patch03 -p1 -b .unneded-headers-2
-%patch04 -p1 -b .public-functions
+%patch01 -p1 -b .buildfix
%build
%configure \
- --enable-fhs \
+ --with-modulesdir=%{_libdir}/samba \
--with-lockdir=/var/lib/%{name} \
--with-piddir=/var/run \
--with-privatedir=/var/lib/%{name}/private \
+ --with-sockets-dir=/var/run \
--sysconfdir=%{_sysconfdir}/%{name} \
- --with-winbindd-socket-dir=/var/run/winbind \
- --with-ntp-signd-socket-dir=/var/run/ntp_signd \
+ --datadir=%{_datadir}/samba \
--disable-gnutls \
--disable-rpath-install \
- --bundled-libraries=heimdal
+ --bundled-libraries=heimdal,!talloc,!tdb,!tevent,!ldb
# Build PIDL for installation into vendor directories before
# 'make proto' gets to it.
@@ -284,9 +275,10 @@ rm $RPM_BUILD_ROOT%{_sbindir}/upgradeprovision
rm $RPM_BUILD_ROOT%{_sbindir}/samba_dnsupdate
rm $RPM_BUILD_ROOT%{_sbindir}/samba_spnupdate
rm $RPM_BUILD_ROOT%{_bindir}/samba-tool
-rm -r $RPM_BUILD_ROOT%{_datadir}/samba/setup
rm $RPM_BUILD_ROOT%{_libdir}/mit_samba.so
rm $RPM_BUILD_ROOT%{_mandir}/man8/samba.*
+rm -rf $RPM_BUILD_ROOT%{_datadir}/samba/setup
+rm -rf $RPM_BUILD_ROOT%{_datadir}/samba/swat
%endif
%if ! %enable_client
rm $RPM_BUILD_ROOT%{_bindir}/nmblookup
@@ -334,6 +326,135 @@ rm -r $RPM_BUILD_ROOT%{python_sitearch}/*
rm $RPM_BUILD_ROOT%{_mandir}/man1/oLschema2ldif.1
#rm $RPM_BUILD_ROOT/usr/share/swig/*/talloc.i
+rm $RPM_BUILD_ROOT%{_libdir}/pam_smbpass.so
+
+# Remove Files conflicting with regular samba 3.x packages
+rm $RPM_BUILD_ROOT%{_libdir}/samba/CHARSET/charset_CP437.so
+rm $RPM_BUILD_ROOT%{_libdir}/samba/CHARSET/charset_CP850.so
+rm $RPM_BUILD_ROOT%{_libdir}/samba/auth/script.so
+rm $RPM_BUILD_ROOT%{_libdir}/samba/idmap/autorid.so
+rm $RPM_BUILD_ROOT%{_libdir}/samba/ldb/dirsync.so
+rm $RPM_BUILD_ROOT%{_libdir}/samba/libCHARSET3.so
+rm $RPM_BUILD_ROOT%{_libdir}/samba/libLIBCLI_CLDAP.so
+rm $RPM_BUILD_ROOT%{_libdir}/samba/libLIBCLI_LSA3.so
+rm $RPM_BUILD_ROOT%{_libdir}/samba/libLIBCLI_RAW.so
+rm $RPM_BUILD_ROOT%{_libdir}/samba/libLIBCLI_SMB_COMMON.so
+rm $RPM_BUILD_ROOT%{_libdir}/samba/libLIBSMB.so
+rm $RPM_BUILD_ROOT%{_libdir}/samba/libPOPT_SAMBA3.so
+rm $RPM_BUILD_ROOT%{_libdir}/samba/libUTIL_CMDLINE.so
+rm $RPM_BUILD_ROOT%{_libdir}/samba/libUTIL_TDB.so
+rm $RPM_BUILD_ROOT%{_libdir}/samba/libaddns.so
+rm $RPM_BUILD_ROOT%{_libdir}/samba/libads.so
+rm $RPM_BUILD_ROOT%{_libdir}/samba/libadt_tree.so
+rm $RPM_BUILD_ROOT%{_libdir}/samba/libasn1util.so
+rm $RPM_BUILD_ROOT%{_libdir}/samba/libauth_sam_reply.so
+rm $RPM_BUILD_ROOT%{_libdir}/samba/libbitmap.so
+rm $RPM_BUILD_ROOT%{_libdir}/samba/libccan.so.0
+rm $RPM_BUILD_ROOT%{_libdir}/samba/libccan.so.0.1-init-1161-g661d41f
+rm $RPM_BUILD_ROOT%{_libdir}/samba/libcli-ldap-common.so
+rm $RPM_BUILD_ROOT%{_libdir}/samba/libdbwrap_util.so
+rm $RPM_BUILD_ROOT%{_libdir}/samba/libflag_mapping.so
+rm $RPM_BUILD_ROOT%{_libdir}/samba/libinterfaces.so
+rm $RPM_BUILD_ROOT%{_libdir}/samba/libmemcache.so
+rm $RPM_BUILD_ROOT%{_libdir}/samba/libmsrpc3.so
+rm $RPM_BUILD_ROOT%{_libdir}/samba/libnamearray.so
+rm $RPM_BUILD_ROOT%{_libdir}/samba/libnpa_tstream.so
+rm $RPM_BUILD_ROOT%{_libdir}/samba/libpassdb.so
+rm $RPM_BUILD_ROOT%{_libdir}/samba/libsmbd_base.so
+rm $RPM_BUILD_ROOT%{_libdir}/samba/libsmbd_conn.so
+rm $RPM_BUILD_ROOT%{_libdir}/samba/libsmbd_shim.so
+rm $RPM_BUILD_ROOT%{_libdir}/samba/libsmbregistry.so
+rm $RPM_BUILD_ROOT%{_libdir}/samba/libstring_init.so
+rm $RPM_BUILD_ROOT%{_libdir}/samba/libtdb_compat.so
+rm $RPM_BUILD_ROOT%{_libdir}/samba/libutil_malloc.so
+rm $RPM_BUILD_ROOT%{_libdir}/samba/libutil_reg.so
+rm $RPM_BUILD_ROOT%{_libdir}/samba/libutil_sec.so
+rm $RPM_BUILD_ROOT%{_libdir}/samba/libutil_str.so
+rm $RPM_BUILD_ROOT%{_libdir}/samba/vfs/acl_tdb.so
+rm $RPM_BUILD_ROOT%{_libdir}/samba/vfs/acl_xattr.so
+rm $RPM_BUILD_ROOT%{_libdir}/samba/vfs/aio_fork.so
+rm $RPM_BUILD_ROOT%{_libdir}/samba/vfs/audit.so
+rm $RPM_BUILD_ROOT%{_libdir}/samba/vfs/cap.so
+rm $RPM_BUILD_ROOT%{_libdir}/samba/vfs/catia.so
+rm $RPM_BUILD_ROOT%{_libdir}/samba/vfs/crossrename.so
+rm $RPM_BUILD_ROOT%{_libdir}/samba/vfs/default_quota.so
+rm $RPM_BUILD_ROOT%{_libdir}/samba/vfs/dirsort.so
+rm $RPM_BUILD_ROOT%{_libdir}/samba/vfs/expand_msdfs.so
+rm $RPM_BUILD_ROOT%{_libdir}/samba/vfs/extd_audit.so
+rm $RPM_BUILD_ROOT%{_libdir}/samba/vfs/fake_perms.so
+rm $RPM_BUILD_ROOT%{_libdir}/samba/vfs/fileid.so
+rm $RPM_BUILD_ROOT%{_libdir}/samba/vfs/full_audit.so
+rm $RPM_BUILD_ROOT%{_libdir}/samba/vfs/linux_xfs_sgid.so
+rm $RPM_BUILD_ROOT%{_libdir}/samba/vfs/netatalk.so
+rm $RPM_BUILD_ROOT%{_libdir}/samba/vfs/preopen.so
+rm $RPM_BUILD_ROOT%{_libdir}/samba/vfs/readahead.so
+rm $RPM_BUILD_ROOT%{_libdir}/samba/vfs/readonly.so
+rm $RPM_BUILD_ROOT%{_libdir}/samba/vfs/recycle.so
+rm $RPM_BUILD_ROOT%{_libdir}/samba/vfs/scannedonly.so
+rm $RPM_BUILD_ROOT%{_libdir}/samba/vfs/shadow_copy.so
+rm $RPM_BUILD_ROOT%{_libdir}/samba/vfs/shadow_copy2.so
+rm $RPM_BUILD_ROOT%{_libdir}/samba/vfs/smb_traffic_analyzer.so
+rm $RPM_BUILD_ROOT%{_libdir}/samba/vfs/streams_depot.so
+rm $RPM_BUILD_ROOT%{_libdir}/samba/vfs/streams_xattr.so
+rm $RPM_BUILD_ROOT%{_libdir}/samba/vfs/syncops.so
+rm $RPM_BUILD_ROOT%{_libdir}/samba/vfs/time_audit.so
+rm $RPM_BUILD_ROOT%{_libdir}/samba/vfs/xattr_tdb.so
+rm $RPM_BUILD_ROOT%{_libdir}/winbind_krb5_locator.so
+rm $RPM_BUILD_ROOT%{_libdir}/libsmb/libsmbclient.so*
+rm $RPM_BUILD_ROOT%{_libdir}/libsmbconf.so*
+rm $RPM_BUILD_ROOT%{_libdir}/libsmbsharemodes.so*
+rm $RPM_BUILD_ROOT%{_libdir}/libnetapi.so*
+rm $RPM_BUILD_ROOT%{_libdir}/libnss_wins.so.2
+rm $RPM_BUILD_ROOT%{_includedir}/samba-4.0/libsmbclient.h
+rm $RPM_BUILD_ROOT%{_includedir}/samba-4.0/netapi.h
+rm $RPM_BUILD_ROOT%{_includedir}/samba-4.0/smb_share_modes.h
+rm $RPM_BUILD_ROOT%{_includedir}/samba-4.0/smbconf.h
+rm $RPM_BUILD_ROOT%{_sbindir}/nmbd
+rm $RPM_BUILD_ROOT%{_sbindir}/smbd
+rm $RPM_BUILD_ROOT%{_sbindir}/swat
+rm $RPM_BUILD_ROOT%{_sbindir}/winbindd
+rm $RPM_BUILD_ROOT%{_bindir}/dbwrap_tool
+rm $RPM_BUILD_ROOT%{_bindir}/dbwrap_torture
+rm $RPM_BUILD_ROOT%{_bindir}/debug2html
+rm $RPM_BUILD_ROOT%{_bindir}/eventlogadm
+rm $RPM_BUILD_ROOT%{_bindir}/locktest2
+rm $RPM_BUILD_ROOT%{_bindir}/locktest3
+rm $RPM_BUILD_ROOT%{_bindir}/log2pcap
+rm $RPM_BUILD_ROOT%{_bindir}/masktest3
+rm $RPM_BUILD_ROOT%{_bindir}/msgtest
+rm $RPM_BUILD_ROOT%{_bindir}/net
+rm $RPM_BUILD_ROOT%{_bindir}/nmblookup3
+rm $RPM_BUILD_ROOT%{_bindir}/ntlm_auth3
+rm $RPM_BUILD_ROOT%{_bindir}/pdbedit
+rm $RPM_BUILD_ROOT%{_bindir}/pdbtest
+rm $RPM_BUILD_ROOT%{_bindir}/profiles
+rm $RPM_BUILD_ROOT%{_bindir}/pthreadpooltest
+rm $RPM_BUILD_ROOT%{_bindir}/rpc_open_tcp
+rm $RPM_BUILD_ROOT%{_bindir}/rpcclient
+rm $RPM_BUILD_ROOT%{_bindir}/sharesec
+rm $RPM_BUILD_ROOT%{_bindir}/smbcacls
+rm $RPM_BUILD_ROOT%{_bindir}/smbclient3
+rm $RPM_BUILD_ROOT%{_bindir}/smbconftort
+rm $RPM_BUILD_ROOT%{_bindir}/smbcontrol
+rm $RPM_BUILD_ROOT%{_bindir}/smbcquotas
+rm $RPM_BUILD_ROOT%{_bindir}/smbfilter
+rm $RPM_BUILD_ROOT%{_bindir}/smbget
+rm $RPM_BUILD_ROOT%{_bindir}/smbiconv
+rm $RPM_BUILD_ROOT%{_bindir}/smbpasswd
+rm $RPM_BUILD_ROOT%{_bindir}/smbspool
+rm $RPM_BUILD_ROOT%{_bindir}/smbstatus
+rm $RPM_BUILD_ROOT%{_bindir}/smbta-util
+rm $RPM_BUILD_ROOT%{_bindir}/smbtorture3
+rm $RPM_BUILD_ROOT%{_bindir}/smbtree
+rm $RPM_BUILD_ROOT%{_bindir}/split_tokens
+rm $RPM_BUILD_ROOT%{_bindir}/test_lp_load
+rm $RPM_BUILD_ROOT%{_bindir}/timelimit
+rm $RPM_BUILD_ROOT%{_bindir}/versiontest
+rm $RPM_BUILD_ROOT%{_bindir}/vfstest
+rm $RPM_BUILD_ROOT%{_bindir}/vlp
+rm $RPM_BUILD_ROOT%{_bindir}/wbinfo3
+
+
# This makes the right links, as rpmlint requires that
# the ldconfig-created links be recorded in the RPM.
/sbin/ldconfig -N -n $RPM_BUILD_ROOT%{_libdir}
@@ -381,7 +502,7 @@ exit 0
%files
%defattr(-,root,root,-)
-%doc COPYING WHATSNEW4.txt
+%doc COPYING
%if %enable_samba4
%{_sbindir}/provision
%{_sbindir}/samba
@@ -389,7 +510,6 @@ exit 0
%{_sbindir}/samba_dnsupdate
%{_sbindir}/samba_spnupdate
%{_bindir}/samba-tool
-%{_datadir}/samba/setup
%{_libdir}/mit_samba.so
%{_mandir}/man8/samba.*
%dir /var/lib/%{name}/sysvol
@@ -409,7 +529,7 @@ exit 0
#smb.conf
#%config(noreplace) %{_sysconfdir}/%{name}/smb.conf
%dir %{_datadir}/samba
-%{_datadir}/samba/*.dat
+%{_datadir}/samba/codepages/*.dat
%{_libdir}/libdcerpc-atsvc.so.*
%{_libdir}/libdcerpc-samr.so.*
@@ -509,7 +629,6 @@ exit 0
%{_libdir}/samba/libsamba-net.so
%{_libdir}/samba/libsamba_python.so
%{_libdir}/samba/libsamba-sockets.so
-%{_libdir}/samba/libsamba-util-common.so
%{_libdir}/samba/libsamdb-common.so
%{_libdir}/samba/libsecurity.so
%{_libdir}/samba/libservice.so
@@ -520,7 +639,6 @@ exit 0
%{_libdir}/samba/libwinbind-client.so
%{_libdir}/samba/libwind-samba4.so.*
%{_libdir}/samba/libwrap_xattr.so
-%{_libdir}/samba/libz.so
%{_libdir}/samba/process_model/onefork.so
%{_libdir}/samba/process_model/prefork.so
%{_libdir}/samba/process_model/standard.so
@@ -627,7 +745,7 @@ exit 0
%{_includedir}/samba-4.0/gen_ndr/netlogon.h
%{_includedir}/samba-4.0/gen_ndr/samr.h
%{_includedir}/samba-4.0/gen_ndr/security.h
-%{_includedir}/samba-4.0/gen_ndr/server_id4.h
+%{_includedir}/samba-4.0/gen_ndr/server_id.h
%{_includedir}/samba-4.0/gen_ndr/svcctl.h
%{_includedir}/samba-4.0/gensec.h
%{_includedir}/samba-4.0/ldap_errors.h
@@ -638,11 +756,11 @@ exit 0
%{_includedir}/samba-4.0/ndr.h
%{_includedir}/samba-4.0/param.h
%{_includedir}/samba-4.0/registry.h
+%{_includedir}/samba-4.0/roles.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/tdb_wrap.h
%{_includedir}/samba-4.0/tdr.h
%{_includedir}/samba-4.0/torture.h
%{_includedir}/samba-4.0/tsocket.h
@@ -653,6 +771,7 @@ exit 0
%{_includedir}/samba-4.0/util/debug.h
%{_includedir}/samba-4.0/util/memory.h
%{_includedir}/samba-4.0/util/safe_string.h
+%{_includedir}/samba-4.0/util/string_wrappers.h
%{_includedir}/samba-4.0/util/talloc_stack.h
%{_includedir}/samba-4.0/util/tevent_ntstatus.h
%{_includedir}/samba-4.0/util/tevent_unix.h
@@ -705,6 +824,10 @@ exit 0
%endif
%changelog
+* Tue Aug 2 2011 Simo Sorce <ssorce at redhat.com> - 4.0.0-35.alpha16
+- Rebase to new upstream release.
+ This release is needed to build newer openchange libraries.
+
* Sun Jun 19 2011 Marcela Mašláňová <mmaslano at redhat.com> - 4.0.0-34.alpha15GITa6a722b.1
- Perl mass rebuild
diff --git a/sources b/sources
index 946821d..3373aa3 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-d62ba770fd414eb449b69108a3350514 samba-4.0.0alpha15-GIT-a6a722b.tar.gz
+66afcc4484e7e2b1962554aed3b9c2a7 samba-4.0.0alpha16.tar.gz
More information about the scm-commits
mailing list