external/openldap/openldap-2.4.44.patch.1

   1 --- openldap.org/configure
   2 +++ openldap/configure
   3 @@ -15735,7 +15735,7 @@
   4    $as_echo_n "(cached) " >&6
   5  else
   6    ac_check_lib_save_LIBS=$LIBS
   7 -LIBS="-lnss3  $LIBS"
   8 +LIBS="-lnss3  -lssl3 -lsmime3 -lnss3 -lnssutil3 -lplds4 -lplc4 -lnspr4  $LIBS"
   9  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
  10  /* end confdefs.h.  */
  11
  12 --- openldap.org/configure.in
  13 +++ openldap/configure.in
  14 @@ -1239,7 +1239,8 @@
  15                 AC_CHECK_HEADERS([nssutil.h])
  16                 if test "$ac_cv_header_nssutil_h" = yes ; then
  17                         AC_CHECK_LIB([nss3], [NSS_Initialize],
  18 -                                                [ have_moznss=yes ], [ have_moznss=no ])
  19 +                                                [ have_moznss=yes ], [ have_moznss=no ],
  20 +                                                [ -lssl3 -lsmime3 -lnss3 -lnssutil3 -lplds4 -lplc4 -lnspr4 ])
  21                 fi
  22
  23                 if test "$have_moznss" = yes ; then
  24 --- openldap.org/libraries/libldap/tls_m.c
  25 +++ openldap/libraries/libldap/tls_m.c
  26 @@ -49,17 +49,17 @@
  27  #include <termios.h> /* for echo on/off */
  28  #endif
  29
  30 -#include <nspr/nspr.h>
  31 -#include <nspr/private/pprio.h>
  32 -#include <nss/nss.h>
  33 -#include <nss/ssl.h>
  34 -#include <nss/sslerr.h>
  35 -#include <nss/sslproto.h>
  36 -#include <nss/pk11pub.h>
  37 -#include <nss/secerr.h>
  38 -#include <nss/keyhi.h>
  39 -#include <nss/secmod.h>
  40 -#include <nss/cert.h>
  41 +#include <nspr.h>
  42 +#include <private/pprio.h>
  43 +#include <nss.h>
  44 +#include <ssl.h>
  45 +#include <sslerr.h>
  46 +#include <sslproto.h>
  47 +#include <pk11pub.h>
  48 +#include <secerr.h>
  49 +#include <keyhi.h>
  50 +#include <secmod.h>
  51 +#include <cert.h>
  52
  53  #undef NSS_VERSION_INT
  54  #define        NSS_VERSION_INT ((NSS_VMAJOR << 24) | (NSS_VMINOR << 16) | \
  55 --- openldap.org/Makefile.in
  56 +++ openldap/Makefile.in
  57 @@ -13,7 +13,7 @@
  58  ## top-level directory of the distribution or, alternatively, at
  59  ## <http://www.OpenLDAP.org/license.html>.
  60
  61 -SUBDIRS= include libraries clients servers tests doc
  62 +SUBDIRS= include libraries
  63  CLEANDIRS=
  64  INSTALLDIRS=
  65
  66 @@ -32,7 +32,3 @@
  67         $(RM) config.status libtool stamp-h stamp-h.in
  68
  69  distclean: veryclean FORCE
  70 -
  71 -check: test
  72 -test: FORCE
  73 -       cd tests; $(MAKE) test