[samba4] Further headers and public functions cleanups
Simo Sorce
simo at fedoraproject.org
Thu Mar 17 19:58:08 UTC 2011
commit 702cb2a5620d7f06cbd4c29ae53c216afe94d160
Author: Simo Sorce <ssorce at redhat.com>
Date: Thu Mar 17 15:57:35 2011 -0400
Further headers and public functions cleanups
...pc-we-do-not-need-these-as-public-headers.patch | 48 ++++++++++++++++
...-put-data_blob-back-in-the-public-library.patch | 59 ++++++++++++++++++++
samba4.spec | 9 ++-
3 files changed, 113 insertions(+), 3 deletions(-)
---
diff --git a/0001-dcerpc-we-do-not-need-these-as-public-headers.patch b/0001-dcerpc-we-do-not-need-these-as-public-headers.patch
new file mode 100644
index 0000000..67fa73f
--- /dev/null
+++ b/0001-dcerpc-we-do-not-need-these-as-public-headers.patch
@@ -0,0 +1,48 @@
+From 2a608ba856a4f28c13f295ac554e46168f3f045c Mon Sep 17 00:00:00 2001
+From: Simo Sorce <idra at samba.org>
+Date: Wed, 16 Mar 2011 15:32:53 -0400
+Subject: [PATCH] dcerpc: we do not need these as public headers
+
+latest openchange doesn't need these headers either
+fix _PRINTF_ATTRIBUTE in tdr.h, as it was failing to work after removing
+proto.h due to side effects. PRINTF_ATTRIBUTE is ok and is define in talloc.h
+which is included by tdr.h
+
+Autobuild-User: Simo Sorce <idra at samba.org>
+Autobuild-Date: Wed Mar 16 23:45:20 CET 2011 on sn-devel-104
+---
+ lib/tdr/tdr.h | 2 +-
+ source4/rpc_server/wscript_build | 2 --
+ 2 files changed, 1 insertions(+), 3 deletions(-)
+ mode change 100644 => 100755 source4/rpc_server/wscript_build
+
+diff --git a/lib/tdr/tdr.h b/lib/tdr/tdr.h
+index cd4785e63c1713d93dc288cd9db2f7fc76f50312..fa0a4d7a77a0add388f1dd3cb7d479308ce2df67 100644
+--- a/lib/tdr/tdr.h
++++ b/lib/tdr/tdr.h
+@@ -95,6 +95,6 @@ struct tdr_push *tdr_push_init(TALLOC_CTX *mem_ctx);
+ struct tdr_pull *tdr_pull_init(TALLOC_CTX *mem_ctx);
+
+ NTSTATUS tdr_push_to_fd(int fd, tdr_push_fn_t push_fn, const void *p);
+-void tdr_print_debug_helper(struct tdr_print *tdr, const char *format, ...) _PRINTF_ATTRIBUTE(2,3);
++void tdr_print_debug_helper(struct tdr_print *tdr, const char *format, ...) PRINTF_ATTRIBUTE(2,3);
+
+ #endif /* __TDR_H__ */
+diff --git a/source4/rpc_server/wscript_build b/source4/rpc_server/wscript_build
+old mode 100644
+new mode 100755
+index a1d1fc56a60d6191555a62d3b38eea73aaf1e4a3..f1d3c0db908d98fcd6f76bc5a333677ea3ec56c6
+--- a/source4/rpc_server/wscript_build
++++ b/source4/rpc_server/wscript_build
+@@ -9,8 +9,6 @@ bld.SAMBA_SUBSYSTEM('DCERPC_SHARE',
+ bld.SAMBA_SUBSYSTEM('DCERPC_COMMON',
+ source='common/forward.c common/reply.c dcesrv_auth.c',
+ autoproto='common/proto.h',
+- public_headers='common/common.h common/proto.h',
+- header_path='dcerpc_server',
+ deps='ldb DCERPC_SHARE samba_server_gensec'
+ )
+
+--
+1.7.4
+
diff --git a/0001-lib-util-put-data_blob-back-in-the-public-library.patch b/0001-lib-util-put-data_blob-back-in-the-public-library.patch
new file mode 100644
index 0000000..fbc65de
--- /dev/null
+++ b/0001-lib-util-put-data_blob-back-in-the-public-library.patch
@@ -0,0 +1,59 @@
+From 5d55ae0a2907b5ead5fb7d131aa00788d806ed9a Mon Sep 17 00:00:00 2001
+From: Simo Sorce <idra at samba.org>
+Date: Thu, 17 Mar 2011 09:02:57 -0400
+Subject: [PATCH] lib-util: put data_blob back in the public library
+
+data_blob is defined ina public header, so it needs to be exposed in the public
+library.
+
+Autobuild-User: Simo Sorce <idra at samba.org>
+Autobuild-Date: Thu Mar 17 15:39:08 CET 2011 on sn-devel-104
+---
+ lib/util/wscript_build | 4 ++--
+ source3/wscript_build | 2 +-
+ 2 files changed, 3 insertions(+), 3 deletions(-)
+ mode change 100644 => 100755 lib/util/wscript_build
+ mode change 100644 => 100755 source3/wscript_build
+
+diff --git a/lib/util/wscript_build b/lib/util/wscript_build
+old mode 100644
+new mode 100755
+index e8883a3a8422a07e1b5e73a6c8528c375cbdb06d..7c18075faa5569c666a918b3b8d23f41cd650f5a
+--- a/lib/util/wscript_build
++++ b/lib/util/wscript_build
+@@ -6,7 +6,7 @@ bld.SAMBA_LIBRARY('samba-util-common',
+ source='''talloc_stack.c smb_threads.c xfile.c
+ util_file.c time.c rbtree.c rfc1738.c select.c
+ genrand.c fsusage.c blocking.c become_daemon.c
+- data_blob.c signal.c system.c params.c util.c util_id.c util_net.c
++ signal.c system.c params.c util.c util_id.c util_net.c
+ util_strlist.c idtree.c debug.c''',
+ public_deps='talloc pthread LIBCRYPTO',
+ # until we get all the dependencies in this library in common
+@@ -20,7 +20,7 @@ bld.SAMBA_LIBRARY('samba-util-common',
+
+ if bld.env._SAMBA_BUILD_ == 4:
+ bld.SAMBA_LIBRARY('samba-util',
+- source='''dprintf.c fault.c
++ source='''dprintf.c fault.c data_blob.c
+ ms_fnmatch.c parmlist.c substitute.c util_str.c
+ ''',
+ deps='samba-util-common',
+diff --git a/source3/wscript_build b/source3/wscript_build
+old mode 100644
+new mode 100755
+index 3f7e3b6b800436f7123316c888d49bba2997bfc3..dbfb465bedddf9be38dcceebf9861272ce6a6bbd
+--- a/source3/wscript_build
++++ b/source3/wscript_build
+@@ -962,7 +962,7 @@ bld.SAMBA3_SUBSYSTEM('CHARSET3',
+ deps='DYNCONFIG')
+
+ bld.SAMBA3_SUBSYSTEM('samba-util3',
+- source='',
++ source='../lib/util/data_blob.c',
+ deps='talloc CHARSET3 samba-util-common')
+
+ bld.SAMBA3_SUBSYSTEM('ldb3',
+--
+1.7.4
+
diff --git a/samba4.spec b/samba4.spec
index d0d3e07..8517d2f 100644
--- a/samba4.spec
+++ b/samba4.spec
@@ -48,6 +48,8 @@ Source5: %{name}.init
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
Requires(pre): /usr/sbin/groupadd
@@ -177,6 +179,8 @@ domains and to use Windows user and group accounts on Linux.
%patch01 -p1 -b .rm-libwbclient-dep
%patch02 -p1 -b .unneded-headers
+%patch03 -p1 -b .unneded-headers-2
+%patch04 -p1 -b .public-functions
%build
%configure \
@@ -594,7 +598,6 @@ exit 0
%{_includedir}/samba-4.0/core/ntstatus.h
%{_includedir}/samba-4.0/core/werror.h
%{_includedir}/samba-4.0/credentials.h
-%{_includedir}/samba-4.0/dcerpc_server/common.h
%{_includedir}/samba-4.0/dcerpc_server.h
%{_includedir}/samba-4.0/dcerpc.h
%{_includedir}/samba-4.0/dlinklist.h
@@ -658,7 +661,6 @@ exit 0
%{_includedir}/samba-4.0/util/xfile.h
%{_includedir}/samba-4.0/util.h
%{_includedir}/samba-4.0/util_ldb.h
-%{_includedir}/samba-4.0/dcerpc_server/proto.h
%{_includedir}/samba-4.0/rpc_common.h
%{_includedir}/samba-4.0/ndr/ndr_svcctl.h
@@ -703,9 +705,10 @@ exit 0
%endif
%changelog
-* Wed Mar 16 2011 Simo Sorce <ssorce at redhat.com> - 4.0.0-34.alpha15GITa6a722b
+* Thu Mar 17 2011 Simo Sorce <ssorce at redhat.com> - 4.0.0-34.alpha15GITa6a722b
- New snapshot with fixes for openchange builds
- Additional patches to fix public headers install
+- Move public function in public library
* Thu Mar 10 2011 Simo Sorce <ssorce at redhat.com> - 4.0.0-33.alpha15
- Remove unneded dependency.
More information about the scm-commits
mailing list