external/openldap/openldap-2.4.31.patch

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