From 9f6355baa7520cd7955061fae210a5327ffd1a34 Mon Sep 17 00:00:00 2001 From: Michael Adam Date: Thu, 13 Mar 2008 14:30:23 +0100 Subject: fix build of asn1_compile when there is no system inet_aton() function. Michael (This used to be commit f1c2207b3d9411eac27cb85891f62e9d05bf5118) --- source4/heimdal_build/config.mk | 1 + 1 file changed, 1 insertion(+) (limited to 'source4/heimdal_build') diff --git a/source4/heimdal_build/config.mk b/source4/heimdal_build/config.mk index 45bfd8e81f..169e84e7f4 100644 --- a/source4/heimdal_build/config.mk +++ b/source4/heimdal_build/config.mk @@ -471,6 +471,7 @@ OBJ_FILES = \ ../heimdal/lib/roken/get_window_size.ho \ ../heimdal/lib/roken/estrdup.ho \ ../heimdal/lib/roken/ecalloc.ho \ + ../heimdal/lib/roken/inet_aton.ho \ ../heimdal/lib/asn1/symbol.ho \ ../heimdal/lib/vers/print_version.ho \ ../lib/socket_wrapper/socket_wrapper.ho \ -- cgit From 7db5e0a601968b9a5a978abd5a5a21b33913baf1 Mon Sep 17 00:00:00 2001 From: Stefan Metzmacher Date: Thu, 13 Mar 2008 16:26:37 +0100 Subject: build: compile_et also needs inet_aton() metze (This used to be commit b6bcd66612eb3e507da94eb6f05e5d0317a8276c) --- source4/heimdal_build/config.mk | 1 + 1 file changed, 1 insertion(+) (limited to 'source4/heimdal_build') diff --git a/source4/heimdal_build/config.mk b/source4/heimdal_build/config.mk index 169e84e7f4..0235a9750c 100644 --- a/source4/heimdal_build/config.mk +++ b/source4/heimdal_build/config.mk @@ -501,6 +501,7 @@ OBJ_FILES = ../heimdal/lib/vers/print_version.ho \ ../heimdal/lib/roken/get_window_size.ho \ ../heimdal/lib/roken/strupr.ho \ ../heimdal/lib/roken/setprogname.ho \ + ../heimdal/lib/roken/inet_aton.ho \ ../lib/socket_wrapper/socket_wrapper.ho \ replace.ho PRIVATE_DEPENDENCIES = HEIMDAL_COM_ERR_COMPILE_LEX HEIMDAL_ROKEN_GETPROGNAME_H EXT_SOCKET EXT_NSL -- cgit From 6a4928c630cfeee3300b5cdea5f47ab6ae05ae97 Mon Sep 17 00:00:00 2001 From: Michael Adam Date: Fri, 14 Mar 2008 09:04:00 +0100 Subject: heimdal_build: fix linkage of asn1_compile and compile_et. Now inet_aton is available from libreplace. Michael (This used to be commit 3b2a3da2f73020b1d3b08a05a479de380b2aa5c4) --- source4/heimdal_build/config.mk | 2 -- 1 file changed, 2 deletions(-) (limited to 'source4/heimdal_build') diff --git a/source4/heimdal_build/config.mk b/source4/heimdal_build/config.mk index 0235a9750c..45bfd8e81f 100644 --- a/source4/heimdal_build/config.mk +++ b/source4/heimdal_build/config.mk @@ -471,7 +471,6 @@ OBJ_FILES = \ ../heimdal/lib/roken/get_window_size.ho \ ../heimdal/lib/roken/estrdup.ho \ ../heimdal/lib/roken/ecalloc.ho \ - ../heimdal/lib/roken/inet_aton.ho \ ../heimdal/lib/asn1/symbol.ho \ ../heimdal/lib/vers/print_version.ho \ ../lib/socket_wrapper/socket_wrapper.ho \ @@ -501,7 +500,6 @@ OBJ_FILES = ../heimdal/lib/vers/print_version.ho \ ../heimdal/lib/roken/get_window_size.ho \ ../heimdal/lib/roken/strupr.ho \ ../heimdal/lib/roken/setprogname.ho \ - ../heimdal/lib/roken/inet_aton.ho \ ../lib/socket_wrapper/socket_wrapper.ho \ replace.ho PRIVATE_DEPENDENCIES = HEIMDAL_COM_ERR_COMPILE_LEX HEIMDAL_ROKEN_GETPROGNAME_H EXT_SOCKET EXT_NSL -- cgit From 0372704fa2e24c6e0bcfe5fb431058d3186dc621 Mon Sep 17 00:00:00 2001 From: Stefan Metzmacher Date: Tue, 18 Mar 2008 17:58:36 +0100 Subject: heimdal_build: use LIBREPLACE_NETWORK because EXT_SOCKET and EXT_NSL doesn't exist anymore metze (This used to be commit 0fb3d246212e2e7d68c1276dff1628ece9794283) --- source4/heimdal_build/config.mk | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'source4/heimdal_build') diff --git a/source4/heimdal_build/config.mk b/source4/heimdal_build/config.mk index 45bfd8e81f..e6bb73a385 100644 --- a/source4/heimdal_build/config.mk +++ b/source4/heimdal_build/config.mk @@ -415,7 +415,7 @@ PUBLIC_DEPENDENCIES = \ HEIMDAL_ROKEN_GETPROGNAME \ HEIMDAL_ROKEN_CLOSEFROM \ RESOLV \ - EXT_SOCKET + LIBREPLACE_NETWORK # End SUBSYSTEM HEIMDAL_ROKEN ####################### @@ -475,7 +475,7 @@ OBJ_FILES = \ ../heimdal/lib/vers/print_version.ho \ ../lib/socket_wrapper/socket_wrapper.ho \ replace.ho -PRIVATE_DEPENDENCIES = HEIMDAL_ASN1_COMPILE_LEX HEIMDAL_ROKEN_GETPROGNAME_H EXT_SOCKET EXT_NSL +PRIVATE_DEPENDENCIES = HEIMDAL_ASN1_COMPILE_LEX HEIMDAL_ROKEN_GETPROGNAME_H LIBREPLACE_NETWORK # End BINARY asn1_compile ####################### @@ -502,7 +502,7 @@ OBJ_FILES = ../heimdal/lib/vers/print_version.ho \ ../heimdal/lib/roken/setprogname.ho \ ../lib/socket_wrapper/socket_wrapper.ho \ replace.ho -PRIVATE_DEPENDENCIES = HEIMDAL_COM_ERR_COMPILE_LEX HEIMDAL_ROKEN_GETPROGNAME_H EXT_SOCKET EXT_NSL +PRIVATE_DEPENDENCIES = HEIMDAL_COM_ERR_COMPILE_LEX HEIMDAL_ROKEN_GETPROGNAME_H LIBREPLACE_NETWORK # End BINARY compile_et ####################### -- cgit From 9e6b0c28712ee77ce878809c8576826a3ba08d95 Mon Sep 17 00:00:00 2001 From: Andrew Bartlett Date: Wed, 19 Mar 2008 10:17:42 +1100 Subject: Merge lorikeet-heimdal -r 787 into Samba4 tree. Andrew Bartlett (This used to be commit d88b530522d3cef67c24422bd5182fb875d87ee2) --- source4/heimdal_build/config.mk | 35 ++++++++++++++++++++++++++++++++--- 1 file changed, 32 insertions(+), 3 deletions(-) (limited to 'source4/heimdal_build') diff --git a/source4/heimdal_build/config.mk b/source4/heimdal_build/config.mk index 45bfd8e81f..34d3f4bfa5 100644 --- a/source4/heimdal_build/config.mk +++ b/source4/heimdal_build/config.mk @@ -40,6 +40,7 @@ PRIVATE_DEPENDENCIES = HEIMDAL_ROKEN HEIMDAL_HCRYPTO HEIMDAL_KRB5 \ CFLAGS = -Iheimdal_build -Iheimdal/lib/hdb OBJ_FILES = \ ../heimdal/lib/hdb/db.o \ + ../heimdal/lib/hdb/dbinfo.o \ ../heimdal/lib/hdb/hdb.o \ ../heimdal/lib/hdb/ext.o \ ../heimdal/lib/hdb/keytab.o \ @@ -170,7 +171,7 @@ PUBLIC_DEPENDENCIES = HEIMDAL_ROKEN HEIMDAL_KRB5 # Start SUBSYSTEM HEIMDAL_KRB5 [SUBSYSTEM::HEIMDAL_KRB5] CFLAGS = -Iheimdal_build -Iheimdal/lib/krb5 -PRIVATE_DEPENDENCIES = HEIMDAL_ROKEN HEIMDAL_PKINIT_ASN1 +PRIVATE_DEPENDENCIES = HEIMDAL_ROKEN HEIMDAL_PKINIT_ASN1 HEIMDAL_WIND PUBLIC_DEPENDENCIES = HEIMDAL_KRB5_ASN1 HEIMDAL_GLUE HEIMDAL_HX509 HEIMDAL_HCRYPTO OBJ_FILES = \ ../heimdal/lib/krb5/acache.o \ @@ -323,7 +324,9 @@ OBJ_FILES = \ ../heimdal/lib/hcrypto/rand-unix.o \ ../heimdal/lib/hcrypto/rand-fortuna.o \ ../heimdal/lib/hcrypto/rand-timer.o \ - ../heimdal/lib/hcrypto/hmac.o + ../heimdal/lib/hcrypto/hmac.o \ + ../heimdal/lib/hcrypto/camellia.o \ + ../heimdal/lib/hcrypto/camellia-ntt.o # End SUBSYSTEM HEIMDAL_HCRYPTO ####################### @@ -337,7 +340,8 @@ PRIVATE_DEPENDENCIES = \ HEIMDAL_CMS_ASN1 HEIMDAL_RFC2459_ASN1 \ HEIMDAL_OCSP_ASN1 HEIMDAL_PKCS8_ASN1 \ HEIMDAL_PKCS9_ASN1 HEIMDAL_PKCS12_ASN1 \ - HEIMDAL_PKINIT_ASN1 HEIMDAL_PKCS10_ASN1 + HEIMDAL_PKINIT_ASN1 HEIMDAL_PKCS10_ASN1 \ + HEIMDAL_WIND OBJ_FILES = \ ../heimdal/lib/hx509/ca.o \ ../heimdal/lib/hx509/cert.o \ @@ -365,6 +369,30 @@ OBJ_FILES = \ # End SUBSYSTEM HEIMDAL_HX509 ####################### +####################### +# Start SUBSYSTEM HEIMDAL_WIND +[SUBSYSTEM::HEIMDAL_WIND] +CFLAGS = -Iheimdal_build -Iheimdal/lib/wind +PRIVATE_DEPENDENCIES = \ + HEIMDAL_ROKEN HEIMDAL_COM_ERR +OBJ_FILES = \ + ../heimdal/lib/wind/wind_err.o \ + ../heimdal/lib/wind/stringprep.o \ + ../heimdal/lib/wind/errorlist.o \ + ../heimdal/lib/wind/errorlist_table.o \ + ../heimdal/lib/wind/normalize.o \ + ../heimdal/lib/wind/normalize_table.o \ + ../heimdal/lib/wind/combining.o \ + ../heimdal/lib/wind/combining_table.o \ + ../heimdal/lib/wind/utf8.o \ + ../heimdal/lib/wind/bidi.o \ + ../heimdal/lib/wind/bidi_table.o \ + ../heimdal/lib/wind/ldap.o \ + ../heimdal/lib/wind/map.o \ + ../heimdal/lib/wind/map_table.o +# End SUBSYSTEM HEIMDAL_WIND +####################### + [SUBSYSTEM::HEIMDAL_ROKEN_GETPROGNAME] CFLAGS = -Iheimdal_build -Iheimdal/lib/roken -Ilib/socket_wrapper OBJ_FILES = ../heimdal/lib/roken/getprogname.o @@ -532,6 +560,7 @@ mkinclude perl_path_wrapper.sh et_deps.pl heimdal/lib/krb5/krb_err.et heimdal/li mkinclude perl_path_wrapper.sh et_deps.pl heimdal/lib/krb5/krb5_err.et heimdal/lib/krb5| mkinclude perl_path_wrapper.sh et_deps.pl heimdal/lib/gssapi/krb5/gkrb5_err.et heimdal/lib/gssapi| mkinclude perl_path_wrapper.sh et_deps.pl heimdal/lib/hx509/hx509_err.et heimdal/lib/hx509| +mkinclude perl_path_wrapper.sh et_deps.pl heimdal/lib/wind/wind_err.et heimdal/lib/wind| clean:: @-rm -f bin/compile_et bin/asn1_compile -- cgit From 576540b25c6761978d1317334a647fead0155765 Mon Sep 17 00:00:00 2001 From: Andrew Bartlett Date: Wed, 19 Mar 2008 11:10:19 +1100 Subject: Supply HDB_DB_DIR macro While we don't use the default HDB directories, the code needs this macro defined. Andrew Bartlett (This used to be commit b5dbdef1580a58c0f208e83491946391cd08e570) --- source4/heimdal_build/config.h | 2 ++ 1 file changed, 2 insertions(+) (limited to 'source4/heimdal_build') diff --git a/source4/heimdal_build/config.h b/source4/heimdal_build/config.h index 7a51def3c6..e2c735a65f 100644 --- a/source4/heimdal_build/config.h +++ b/source4/heimdal_build/config.h @@ -19,4 +19,6 @@ #define SIGRETURN(x) return (RETSIGTYPE)(x) #endif +#define HDB_DB_DIR "" + #endif -- cgit