OLD | NEW |
1 diff --git a/.gitignore b/.gitignore | 1 diff --git a/.gitignore b/.gitignore |
2 new file mode 100644 | 2 new file mode 100644 |
3 --- /dev/null | 3 --- /dev/null |
4 +++ b/.gitignore | 4 +++ b/.gitignore |
5 @@ -0,0 +1,2 @@ | 5 @@ -0,0 +1,2 @@ |
6 +*.pyc | 6 +*.pyc |
7 +/bin | 7 +/bin |
8 diff --git a/buildtools/wafsamba/samba_python.py b/buildtools/wafsamba/samba_pyt
hon.py | 8 diff --git a/buildtools/wafsamba/samba_python.py b/buildtools/wafsamba/samba_pyt
hon.py |
9 --- a/buildtools/wafsamba/samba_python.py | 9 --- a/buildtools/wafsamba/samba_python.py |
10 +++ b/buildtools/wafsamba/samba_python.py | 10 +++ b/buildtools/wafsamba/samba_python.py |
(...skipping 86 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
97 +++ b/lib/ldb-samba/wscript_build | 97 +++ b/lib/ldb-samba/wscript_build |
98 @@ -8,7 +8,7 @@ bld.SAMBA_LIBRARY('ldbsamba', | 98 @@ -8,7 +8,7 @@ bld.SAMBA_LIBRARY('ldbsamba', |
99 source='ldif_handlers.c', | 99 source='ldif_handlers.c', |
100 autoproto='ldif_handlers_proto.h', | 100 autoproto='ldif_handlers_proto.h', |
101 public_deps='ldb', | 101 public_deps='ldb', |
102 - deps='samba-security ndr NDR_DRSBLOBS NDR_DNSP ldbwrap samdb-
common SAMDB_SCHEMA tdb pyldb-util errors', | 102 - deps='samba-security ndr NDR_DRSBLOBS NDR_DNSP ldbwrap samdb-
common SAMDB_SCHEMA tdb pyldb-util errors', |
103 + deps='samba-security ndr NDR_DRSBLOBS NDR_DNSP ldbwrap samdb-
common SAMDB_SCHEMA tdb errors', | 103 + deps='samba-security ndr NDR_DRSBLOBS NDR_DNSP ldbwrap samdb-
common SAMDB_SCHEMA tdb errors', |
104 private_library=True | 104 private_library=True |
105 ) | 105 ) |
106 | 106 |
| 107 diff --git a/lib/replace/replace.h b/lib/replace/replace.h |
| 108 --- a/lib/replace/replace.h |
| 109 +++ b/lib/replace/replace.h |
| 110 @@ -904,4 +904,9 @@ void rep_setproctitle(const char *fmt, ...) PRINTF_ATTRIBUTE
(1, 2); |
| 111 #include <sys/atomic.h> |
| 112 #endif |
| 113 |
| 114 +/* This is needed for the NaCl port for ARM with glibc */ |
| 115 +#ifndef FIONREAD |
| 116 +#define FIONREAD 0x541B |
| 117 +#endif |
| 118 + |
| 119 #endif /* _LIBREPLACE_REPLACE_H */ |
107 diff --git a/lib/replace/system/wait.h b/lib/replace/system/wait.h | 120 diff --git a/lib/replace/system/wait.h b/lib/replace/system/wait.h |
108 --- a/lib/replace/system/wait.h | 121 --- a/lib/replace/system/wait.h |
109 +++ b/lib/replace/system/wait.h | 122 +++ b/lib/replace/system/wait.h |
110 @@ -49,7 +49,7 @@ typedef int sig_atomic_t; | 123 @@ -49,7 +49,7 @@ typedef int sig_atomic_t; |
111 #endif | 124 #endif |
112 | 125 |
113 #if !defined(HAVE_WAITPID) && defined(HAVE_WAIT4) | 126 #if !defined(HAVE_WAITPID) && defined(HAVE_WAIT4) |
114 -int rep_waitpid(pid_t pid,int *status,int options) | 127 -int rep_waitpid(pid_t pid,int *status,int options) |
115 +int rep_waitpid(pid_t pid,int *status,int options); | 128 +int rep_waitpid(pid_t pid,int *status,int options); |
116 #endif | 129 #endif |
(...skipping 206 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
323 conf.CHECK_CODE(''' | 336 conf.CHECK_CODE(''' |
324 @@ -1402,7 +1403,7 @@ main() { | 337 @@ -1402,7 +1403,7 @@ main() { |
325 headers="rpc/rpc.h rpc/types.h rpcsvc/rquota.h rpc/nett
ype.h rpc/xdr.h", | 338 headers="rpc/rpc.h rpc/types.h rpcsvc/rquota.h rpc/nett
ype.h rpc/xdr.h", |
326 define='HAVE_NFS_QUOTAS', | 339 define='HAVE_NFS_QUOTAS', |
327 msg='for NFS QUOTAS', | 340 msg='for NFS QUOTAS', |
328 - execute=True, | 341 - execute=True, |
329 + #execute=True, | 342 + #execute=True, |
330 local_include=False) | 343 local_include=False) |
331 | 344 |
332 if conf.CONFIG_SET('HAVE_QUOTACTL_LINUX') or \ | 345 if conf.CONFIG_SET('HAVE_QUOTACTL_LINUX') or \ |
| 346 diff --git a/source4/heimdal/lib/hcrypto/rand-timer.c b/source4/heimdal/lib/hcry
pto/rand-timer.c |
| 347 --- a/source4/heimdal/lib/hcrypto/rand-timer.c |
| 348 +++ b/source4/heimdal/lib/hcrypto/rand-timer.c |
| 349 @@ -134,7 +134,8 @@ timer_bytes(unsigned char *outdata, int size) |
| 350 pid = fork(); |
| 351 if(pid == -1){ |
| 352 signal(SIGCHLD, ochld != SIG_ERR ? ochld : SIG_DFL); |
| 353 - des_not_rand_data(data, size); |
| 354 + // This is commented out for NaCl build. This function does not exist. |
| 355 + //des_not_rand_data(data, size); |
| 356 return; |
| 357 } |
| 358 if(pid == 0) |
333 diff --git a/source4/libnet/wscript_build b/source4/libnet/wscript_build | 359 diff --git a/source4/libnet/wscript_build b/source4/libnet/wscript_build |
334 --- a/source4/libnet/wscript_build | 360 --- a/source4/libnet/wscript_build |
335 +++ b/source4/libnet/wscript_build | 361 +++ b/source4/libnet/wscript_build |
336 @@ -3,7 +3,7 @@ | 362 @@ -3,7 +3,7 @@ |
337 bld.SAMBA_LIBRARY('samba-net', | 363 bld.SAMBA_LIBRARY('samba-net', |
338 source='libnet.c libnet_passwd.c libnet_time.c libnet_rpc.c libnet_join.
c libnet_site.c libnet_become_dc.c libnet_unbecome_dc.c libnet_vampire.c libnet_
samdump.c libnet_samsync_ldb.c libnet_user.c libnet_group.c libnet_share.c libne
t_lookup.c libnet_domain.c userinfo.c groupinfo.c userman.c groupman.c prereq_do
main.c libnet_samsync.c', | 364 source='libnet.c libnet_passwd.c libnet_time.c libnet_rpc.c libnet_join.
c libnet_site.c libnet_become_dc.c libnet_unbecome_dc.c libnet_vampire.c libnet_
samdump.c libnet_samsync_ldb.c libnet_user.c libnet_group.c libnet_share.c libne
t_lookup.c libnet_domain.c userinfo.c groupinfo.c userman.c groupman.c prereq_do
main.c libnet_samsync.c', |
339 autoproto='libnet_proto.h', | 365 autoproto='libnet_proto.h', |
340 - public_deps='samba-credentials dcerpc dcerpc-samr RPC_NDR_LSA RPC_NDR_SR
VSVC RPC_NDR_DRSUAPI cli_composite LIBCLI_RESOLVE LIBCLI_FINDDCS cli_cldap LIBCL
I_FINDDCS gensec_schannel LIBCLI_AUTH ndr smbpasswdparser PROVISION LIBCLI_SAMSY
NC LIBTSOCKET', | 366 - public_deps='samba-credentials dcerpc dcerpc-samr RPC_NDR_LSA RPC_NDR_SR
VSVC RPC_NDR_DRSUAPI cli_composite LIBCLI_RESOLVE LIBCLI_FINDDCS cli_cldap LIBCL
I_FINDDCS gensec_schannel LIBCLI_AUTH ndr smbpasswdparser PROVISION LIBCLI_SAMSY
NC LIBTSOCKET', |
341 + public_deps='samba-credentials dcerpc dcerpc-samr RPC_NDR_LSA RPC_NDR_SR
VSVC RPC_NDR_DRSUAPI cli_composite LIBCLI_RESOLVE LIBCLI_FINDDCS cli_cldap LIBCL
I_FINDDCS gensec_schannel LIBCLI_AUTH ndr smbpasswdparser LIBCLI_SAMSYNC LIBTSOC
KET', | 367 + public_deps='samba-credentials dcerpc dcerpc-samr RPC_NDR_LSA RPC_NDR_SR
VSVC RPC_NDR_DRSUAPI cli_composite LIBCLI_RESOLVE LIBCLI_FINDDCS cli_cldap LIBCL
I_FINDDCS gensec_schannel LIBCLI_AUTH ndr smbpasswdparser LIBCLI_SAMSYNC LIBTSOC
KET', |
342 private_library=True | 368 private_library=True |
(...skipping 63 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
406 conf.SAMBA_CHECK_PERL(mandatory=True) | 432 conf.SAMBA_CHECK_PERL(mandatory=True) |
407 conf.find_program('xsltproc', var='XSLTPROC') | 433 conf.find_program('xsltproc', var='XSLTPROC') |
408 | 434 |
409 - conf.SAMBA_CHECK_PYTHON(mandatory=True, version=(2,5,0)) | 435 - conf.SAMBA_CHECK_PYTHON(mandatory=True, version=(2,5,0)) |
410 - conf.SAMBA_CHECK_PYTHON_HEADERS(mandatory=True) | 436 - conf.SAMBA_CHECK_PYTHON_HEADERS(mandatory=True) |
411 + conf.SAMBA_CHECK_PYTHON(mandatory=False, version=(2,5,0)) | 437 + conf.SAMBA_CHECK_PYTHON(mandatory=False, version=(2,5,0)) |
412 + conf.SAMBA_CHECK_PYTHON_HEADERS(mandatory=False) | 438 + conf.SAMBA_CHECK_PYTHON_HEADERS(mandatory=False) |
413 | 439 |
414 if sys.platform == 'darwin' and not conf.env['HAVE_ENVIRON_DECL']: | 440 if sys.platform == 'darwin' and not conf.env['HAVE_ENVIRON_DECL']: |
415 # Mac OSX needs to have this and it's also needed that the python is co
mpiled with this | 441 # Mac OSX needs to have this and it's also needed that the python is co
mpiled with this |
OLD | NEW |