diff options
Diffstat (limited to 'external/openldap')
| -rw-r--r-- | external/openldap/ExternalProject_openldap.mk | 34 | ||||
| -rw-r--r-- | external/openldap/README | 2 | ||||
| -rw-r--r-- | external/openldap/openldap-2.4.44.patch.1 | 69 |
3 files changed, 23 insertions, 82 deletions
diff --git a/external/openldap/ExternalProject_openldap.mk b/external/openldap/ExternalProject_openldap.mk index 8a102d0028a9..e02a35d9943f 100644 --- a/external/openldap/ExternalProject_openldap.mk +++ b/external/openldap/ExternalProject_openldap.mk @@ -9,20 +9,26 @@ $(eval $(call gb_ExternalProject_ExternalProject,openldap)) -$(eval $(call gb_ExternalProject_use_externals,openldap,nss3)) +$(eval $(call gb_ExternalProject_use_externals,openldap,openssl)) $(eval $(call gb_ExternalProject_register_targets,openldap,\ build \ )) -openldap_LDFLAGS = -ifeq ($(SYSTEM_NSS),) -openldap_LDFLAGS += -L$(call gb_UnpackedTarball_get_dir,nss)/dist/out/lib \ - $(if $(filter AIX,$(OS)),-Wl$(COMMA)-brtl) +openldap_CFLAGS = +ifeq ($(OS),LINUX) # i.e., assuming glibc +# glibc needs at least _XOPEN_SOURCE=500 to declare pthread_getconcurrency and +# pthread_setconcurrency in <pthread.h> (and once that is defined, it also needs either +# _DEFUALT_SOURCE (glibc >= 2.19) or the deprecated _BSD_SOURCE (glibc <= 2.18) to be defined +# explicitly, so that e.g. u_char is declared in <sys/types.h>): +openldap_CFLAGS = -D_XOPEN_SOURCE=500 -D_DEFAULT_SOURCE -D_BSD_SOURCE endif -# Help openldap's configure determine that it needs -lpthread even if libasan.so -# contains a pthread_create override: -ifneq ($(filter -fsanitize=address,$(CC)),) + +openldap_LDFLAGS = $(call gb_ExternalProject_get_link_flags,openldap) +ifeq ($(SYSTEM_OPENSSL),) +openldap_LDFLAGS += -L$(call gb_UnpackedTarball_get_dir,openssl) +endif +ifeq ($(OS),LINUX) openldap_LDFLAGS += -pthread endif @@ -32,20 +38,20 @@ $(call gb_ExternalProject_get_state_target,openldap,build) : $(gb_RUN_CONFIGURE) ./configure \ --disable-slapd \ --with-pic \ - --with-tls=moznss \ + --with-tls=openssl \ --without-cyrus-sasl \ --disable-shared \ --enable-static \ + $(gb_CONFIGURE_PLATFORMS) \ $(if $(CROSS_COMPILING), \ - --build=$(BUILD_PLATFORM) --host=$(HOST_PLATFORM) \ --with-yielding_select=yes \ ac_cv_func_memcmp_working=yes \ ) \ - $(if $(SYSTEM_NSS), \ - CPPFLAGS="$(CPPFLAGS) $(NSS_CFLAGS)" CFLAGS="$(CFLAGS) $(NSS_CFLAGS) $(if $(ENABLE_OPTIMIZED),$(gb_COMPILEROPTFLAGS),$(gb_COMPILERNOOPTFLAGS))" LDFLAGS="$(LDFLAGS) $(NSS_LIBS)" \ + $(if $(SYSTEM_OPENSSL), \ + CPPFLAGS="$(CPPFLAGS) $(OPENSSL_CFLAGS)" CFLAGS="$(CFLAGS) $(openldap_CFLAGS) $(OPENSSL_CFLAGS) $(call gb_ExternalProject_get_build_flags,openldap)" LDFLAGS="$(LDFLAGS) $(openldap_LDFLAGS) $(OPENSSL_LIBS)" \ , \ - CPPFLAGS="$(CPPFLAGS) -I$(call gb_UnpackedTarball_get_dir,nss)/dist/public/nss -I$(call gb_UnpackedTarball_get_dir,nss)/dist/out/include" \ - CFLAGS="$(CFLAGS) $(if $(ENABLE_OPTIMIZED),$(gb_COMPILEROPTFLAGS),$(gb_COMPILERNOOPTFLAGS)) -I$(call gb_UnpackedTarball_get_dir,nss)/dist/public/nss -I$(call gb_UnpackedTarball_get_dir,nss)/dist/out/include" \ + CPPFLAGS="$(CPPFLAGS) -I$(call gb_UnpackedTarball_get_dir,openssl)/include" \ + CFLAGS="$(CFLAGS) $(openldap_CFLAGS) $(call gb_ExternalProject_get_build_flags,openldap) -I$(call gb_UnpackedTarball_get_dir,openssl)/include" \ ) \ $(if $(openldap_LDFLAGS),LDFLAGS="$(LDFLAGS) $(openldap_LDFLAGS)") \ && MAKEFLAGS= && $(MAKE) \ diff --git a/external/openldap/README b/external/openldap/README index 0c1828c12b93..48da788f5447 100644 --- a/external/openldap/README +++ b/external/openldap/README @@ -1,3 +1,3 @@ OpenLDAP provides an LDAP client library -http://www.openldap.org/ +https://www.openldap.org/ diff --git a/external/openldap/openldap-2.4.44.patch.1 b/external/openldap/openldap-2.4.44.patch.1 index 317ef9a62e56..2dfaf355afb0 100644 --- a/external/openldap/openldap-2.4.44.patch.1 +++ b/external/openldap/openldap-2.4.44.patch.1 @@ -1,69 +1,4 @@ -*- Mode: diff -*- ---- openldap.org/configure -+++ openldap/configure -@@ -15735,7 +15735,7 @@ - $as_echo_n "(cached) " >&6 - else - ac_check_lib_save_LIBS=$LIBS --LIBS="-lnss3 $LIBS" -+LIBS="-lnss3 -lssl3 -lsmime3 -lnss3 -lnssutil3 -lplds4 -lplc4 -lnspr4 $LIBS" - cat confdefs.h - <<_ACEOF >conftest.$ac_ext - /* end confdefs.h. */ - ---- openldap.org/configure.in -+++ openldap/configure.in -@@ -1239,7 +1239,8 @@ - AC_CHECK_HEADERS([nssutil.h]) - if test "$ac_cv_header_nssutil_h" = yes ; then - AC_CHECK_LIB([nss3], [NSS_Initialize], -- [ have_moznss=yes ], [ have_moznss=no ]) -+ [ have_moznss=yes ], [ have_moznss=no ], -+ [ -lssl3 -lsmime3 -lnss3 -lnssutil3 -lplds4 -lplc4 -lnspr4 ]) - fi - - if test "$have_moznss" = yes ; then ---- openldap.org/libraries/libldap/tls_m.c -+++ openldap/libraries/libldap/tls_m.c -@@ -49,17 +49,17 @@ - #include <termios.h> /* for echo on/off */ - #endif - --#include <nspr/nspr.h> --#include <nspr/private/pprio.h> --#include <nss/nss.h> --#include <nss/ssl.h> --#include <nss/sslerr.h> --#include <nss/sslproto.h> --#include <nss/pk11pub.h> --#include <nss/secerr.h> --#include <nss/keyhi.h> --#include <nss/secmod.h> --#include <nss/cert.h> -+#include <nspr.h> -+#include <private/pprio.h> -+#include <nss.h> -+#include <ssl.h> -+#include <sslerr.h> -+#include <sslproto.h> -+#include <pk11pub.h> -+#include <secerr.h> -+#include <keyhi.h> -+#include <secmod.h> -+#include <cert.h> - - #undef NSS_VERSION_INT - #define NSS_VERSION_INT ((NSS_VMAJOR << 24) | (NSS_VMINOR << 16) | \ ---- openldap.org/libraries/libldap/tls2.c -+++ openldap.org/libraries/libldap/tls2.c -@@ -80,6 +80,8 @@ - { BER_BVNULL, BER_BVNULL } - }; - -+int ldap_pvt_tls_check_hostname( LDAP *ld, void *s, const char *name_in ); -+ - #ifdef HAVE_TLS - - void --- openldap.org/Makefile.in +++ openldap/Makefile.in @@ -13,7 +13,7 @@ @@ -76,10 +11,10 @@ INSTALLDIRS= @@ -32,7 +32,3 @@ - $(RM) config.status libtool stamp-h stamp-h.in + $(RM) config.status libtool stamp-h stamp-h.in libraries/libldap/ldap.pc libraries/liblber/lber.pc distclean: veryclean FORCE - -check: test -test: FORCE -- cd tests; $(MAKE) test +- cd tests && $(MAKE) test |