The branch, master has been updated
via e3373e9 Revert "lib: Fix deps for LIBCRYPTO"
from 15ac12a ctdb: strip trailing spaces from nodes file.
https://git.samba.org/?p=samba.git;a=shortlog;h=master
- Log -----------------------------------------------------------------
commit e3373e9d1463fc26f52dfea18fca4739578e482e
Author: Douglas Bagnall <[email protected]>
Date: Fri Jun 26 15:33:28 2015 +1200
Revert "lib: Fix deps for LIBCRYPTO"
This reverts commit 30bfb8d63804f0c98312fadaadcb104120dadafb.
Talloc is still needed by LIBCRYPTO, because arcfour.h
includes lib/util/data_blob.h which includes talloc.h.
It seems arcfour only uses the DATA_BLOB struct (in e.g. arcfour_crypt
and arcfour_init).
Signed-off-by: Douglas Bagnall <[email protected]>
Reviewed-by: Volker Lendecke <[email protected]>
Reviewed-by: Michael Adam <[email protected]>
Autobuild-User(master): Volker Lendecke <[email protected]>
Autobuild-Date(master): Sun Jun 28 11:47:16 CEST 2015 on sn-devel-104
-----------------------------------------------------------------------
Summary of changes:
lib/crypto/wscript_build | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
Changeset truncated at 500 lines:
diff --git a/lib/crypto/wscript_build b/lib/crypto/wscript_build
index 0224feb..f2326a2 100644
--- a/lib/crypto/wscript_build
+++ b/lib/crypto/wscript_build
@@ -15,12 +15,12 @@ bld.SAMBA_SUBSYSTEM('LIBCRYPTO',
source='''crc32.c hmacmd5.c md4.c arcfour.c sha256.c sha512.c
hmacsha256.c
aes.c rijndael-alg-fst.c aes_cmac_128.c aes_ccm_128.c aes_gcm_128.c
''' + extra_source,
- deps=extra_deps
+ deps='talloc' + extra_deps
)
bld.SAMBA_SUBSYSTEM('TORTURE_LIBCRYPTO',
source='md4test.c md5test.c hmacmd5test.c aes_cmac_128_test.c
aes_gcm_128_test.c',
autoproto='test_proto.h',
- deps='talloc LIBCRYPTO'
+ deps='LIBCRYPTO'
)
--
Samba Shared Repository
