win32/patches/openldap.patch

   1 diff -upr -x .deps -x .libs -x '*.la' -x '*.lo' openldap-2.4.39.old/Makefile openldap-2.4.39/Makefile
   2 --- openldap-2.4.39.old/Makefile        2015-07-06 18:34:49 +0000
   3 +++ openldap-2.4.39/Makefile    2015-07-06 17:28:46 +0000
   4 @@ -266,7 +266,7 @@ FORCE:
   5  ## top-level directory of the distribution or, alternatively, at
   6  ## <http://www.OpenLDAP.org/license.html>.
   7
   8 -SUBDIRS= include libraries clients servers tests doc
   9 +SUBDIRS= include libraries clients servers
  10  CLEANDIRS=
  11  INSTALLDIRS=
  12
  13 diff -upr -x .deps -x .libs -x '*.la' -x '*.lo' openldap-2.4.39.old/Makefile.in openldap-2.4.39/Makefile.in
  14 --- openldap-2.4.39.old/Makefile.in     2015-07-06 18:34:49 +0000
  15 +++ openldap-2.4.39/Makefile.in 2015-07-06 17:28:46 +0000
  16 @@ -13,7 +13,7 @@
  17  ## top-level directory of the distribution or, alternatively, at
  18  ## <http://www.OpenLDAP.org/license.html>.
  19
  20 -SUBDIRS= include libraries clients servers tests doc
  21 +SUBDIRS= include libraries clients servers
  22  CLEANDIRS=
  23  INSTALLDIRS=
  24
  25 diff -upr -x .deps -x .libs -x '*.la' -x '*.lo' openldap-2.4.39.old/include/ldap.h openldap-2.4.39/include/ldap.h
  26 --- openldap-2.4.39.old/include/ldap.h  2014-01-25 13:36:15 +0000
  27 +++ openldap-2.4.39/include/ldap.h      2015-07-06 18:47:29 +0000
  28 @@ -2211,7 +2211,7 @@ ldap_parse_vlvresponse_control LDAP_P((
  29         ber_int_t *target_posp,
  30         ber_int_t *list_countp,
  31         struct berval **contextp,
  32 -       int           *errcodep ));
  33 +       ber_int_t     *errcodep ));
  34
  35  /*
  36   * LDAP Who Am I?
  37 diff -upr -x .deps -x .libs -x '*.la' -x '*.lo' openldap-2.4.39.old/include/ldap_pvt_thread.h openldap-2.4.39/include/ldap_pvt_thread.h
  38 --- openldap-2.4.39.old/include/ldap_pvt_thread.h       2015-07-06 18:34:49 +0000
  39 +++ openldap-2.4.39/include/ldap_pvt_thread.h   2015-07-06 17:28:50 +0000
  40 @@ -68,7 +68,7 @@ ldap_pvt_thread_set_concurrency LDAP_P((
  41  #      undef LDAP_PVT_THREAD_SET_STACK_SIZE
  42  #elif !defined( LDAP_PVT_THREAD_STACK_SIZE )
  43         /* LARGE stack. Will be twice as large on 64 bit machine. */
  44 -#      define LDAP_PVT_THREAD_STACK_SIZE ( 1 * 1024 * 1024 * sizeof(void *) )
  45 +#      define LDAP_PVT_THREAD_STACK_SIZE ( 1 * 1024 * 1024 * 8 )
  46  #endif
  47  #endif /* !LDAP_PVT_THREAD_H_DONE */
  48
  49 diff -upr -x .deps -x .libs -x '*.la' -x '*.lo' openldap-2.4.39.old/include/portable.h openldap-2.4.39/include/portable.h
  50 --- openldap-2.4.39.old/include/portable.h      2015-07-06 18:38:19 +0000
  51 +++ openldap-2.4.39/include/portable.h  2015-07-06 17:28:46 +0000
  52 @@ -1113,7 +1113,7 @@
  53  #define snprintf _snprintf
  54
  55  /* Define like ber_socklen_t if <sys/socket.h> does not define. */
  56 -#define socklen_t int
  57 +/*#define socklen_t int*/
  58
  59  /* Define to `signed int' if <sys/types.h> does not define. */
  60  /* #undef ssize_t */
  61 diff -upr -x .deps -x .libs -x '*.la' -x '*.lo' openldap-2.4.39.old/libraries/libldap/tls_g.c openldap-2.4.39/libraries/libldap/tls_g.c
  62 --- openldap-2.4.39.old/libraries/libldap/tls_g.c       2014-01-25 13:36:15 +0000
  63 +++ openldap-2.4.39/libraries/libldap/tls_g.c   2015-07-06 19:13:40 +0000
  64 @@ -158,7 +158,9 @@ static struct gcry_thread_cbs tlsg_threa
  65  static void
  66  tlsg_thr_init( void )
  67  {
  68 +       #if LIBGNUTLS_VERSION_NUMBER <= 0x020b00
  69         gcry_control (GCRYCTL_SET_THREAD_CBS, &tlsg_thread_cbs);
  70 +       #endif
  71  }
  72  #endif /* LDAP_R_COMPILE */
  73
  74 @@ -168,7 +170,7 @@ tlsg_thr_init( void )
  75  static int
  76  tlsg_init( void )
  77  {
  78 -#ifdef HAVE_GCRYPT_RAND
  79 +#if defined(HAVE_GCRYPT_RAND) && LIBGNUTLS_VERSION_NUMBER <= 0x020b00
  80         struct ldapoptions *lo = LDAP_INT_GLOBAL_OPT();
  81         if ( lo->ldo_tls_randfile &&
  82                 gcry_control( GCRYCTL_SET_RNDEGD_SOCKET, lo->ldo_tls_randfile )) {
  83 @@ -368,23 +370,24 @@ tlsg_ctx_init( struct ldapoptions *lo, s
  84                  * then we have to build the cert chain.
  85                  */
  86                 if ( max == 1 && !gnutls_x509_crt_check_issuer( certs[0], certs[0] )) {
  87 -                       gnutls_x509_crt_t *cas;
  88 -                       unsigned int i, j, ncas;
  89 +                       unsigned int i;
  90
  91 -                       gnutls_certificate_get_x509_cas( ctx->cred, &cas, &ncas );
  92 +                       /*gnutls_certificate_get_x509_cas( ctx->cred, &cas, &ncas );*/
  93                         for ( i = 1; i<VERIFY_DEPTH; i++ ) {
  94 -                               for ( j = 0; j<ncas; j++ ) {
  95 -                                       if ( gnutls_x509_crt_check_issuer( certs[i-1], cas[j] )) {
  96 -                                               certs[i] = cas[j];
  97 +                               int found = 0;
  98 +                               gnutls_x509_crt_t issuer;
  99 +                               if (gnutls_certificate_get_issuer(ctx->cred, certs[i-1], &issuer, GNUTLS_TL_GET_COPY) == GNUTLS_E_SUCCESS) {
 100 +                                       if ( gnutls_x509_crt_check_issuer( certs[i-1], issuer )) {
 101 +                                               certs[i] = issuer;
 102                                                 max++;
 103                                                 /* If this CA is self-signed, we're done */
 104 -                                               if ( gnutls_x509_crt_check_issuer( cas[j], cas[j] ))
 105 -                                                       j = ncas;
 106 +                                               if ( gnutls_x509_crt_check_issuer( issuer, issuer ))
 107 +                                                       found = 1;
 108                                                 break;
 109                                         }
 110                                 }
 111                                 /* only continue if we found a CA and it was not self-signed */
 112 -                               if ( j == ncas )
 113 +                               if ( found )
 114                                         break;
 115                         }
 116                 }
 117 diff -upr -x .deps -x .libs -x '*.la' -x '*.lo' openldap-2.4.39.old/libraries/libldap_r/Makefile openldap-2.4.39/libraries/libldap_r/Makefile
 118 --- openldap-2.4.39.old/libraries/libldap_r/Makefile    2015-07-06 18:34:49 +0000
 119 +++ openldap-2.4.39/libraries/libldap_r/Makefile        2015-07-06 17:28:46 +0000
 120 @@ -310,10 +310,10 @@ LIB_DEFS = -DLDAP_LIBRARY
 121
 122  XDEFS = -DLDAP_R_COMPILE -I$(XXDIR)
 123  XLIBS = $(LIBRARY) $(LDAP_LIBLBER_LA) $(LDAP_LIBLUTIL_A)
 124 -XXLIBS = $(SECURITY_LIBS) $(LUTIL_LIBS)
 125 +XXLIBS = $(SECURITY_LIBS) $(LUTIL_LIBS) -lgcrypt
 126  XXXLIBS = $(LTHREAD_LIBS)
 127 -NT_LINK_LIBS = $(LDAP_LIBLBER_LA) $(AC_LIBS) $(SECURITY_LIBS)
 128 -UNIX_LINK_LIBS = $(LDAP_LIBLBER_LA) $(AC_LIBS) $(SECURITY_LIBS) $(LTHREAD_LIBS)
 129 +NT_LINK_LIBS = $(LDAP_LIBLBER_LA) $(AC_LIBS) $(SECURITY_LIBS) -lgcrypt
 130 +UNIX_LINK_LIBS = $(LDAP_LIBLBER_LA) $(AC_LIBS) $(SECURITY_LIBS) $(LTHREAD_LIBS) -lgcrypt
 131
 132  .links : Makefile
 133         @for i in $(XXSRCS); do \
 134 diff -upr -x .deps -x .libs -x '*.la' -x '*.lo' openldap-2.4.39.old/libraries/libldap_r/Makefile.in openldap-2.4.39/libraries/libldap_r/Makefile.in
 135 --- openldap-2.4.39.old/libraries/libldap_r/Makefile.in 2015-07-06 18:34:49 +0000
 136 +++ openldap-2.4.39/libraries/libldap_r/Makefile.in     2015-07-06 17:28:46 +0000
 137 @@ -57,10 +57,10 @@ LIB_DEFS = -DLDAP_LIBRARY
 138
 139  XDEFS = -DLDAP_R_COMPILE -I$(XXDIR)
 140  XLIBS = $(LIBRARY) $(LDAP_LIBLBER_LA) $(LDAP_LIBLUTIL_A)
 141 -XXLIBS = $(SECURITY_LIBS) $(LUTIL_LIBS)
 142 +XXLIBS = $(SECURITY_LIBS) $(LUTIL_LIBS) -lgcrypt
 143  XXXLIBS = $(LTHREAD_LIBS)
 144 -NT_LINK_LIBS = $(LDAP_LIBLBER_LA) $(AC_LIBS) $(SECURITY_LIBS)
 145 -UNIX_LINK_LIBS = $(LDAP_LIBLBER_LA) $(AC_LIBS) $(SECURITY_LIBS) $(LTHREAD_LIBS)
 146 +NT_LINK_LIBS = $(LDAP_LIBLBER_LA) $(AC_LIBS) $(SECURITY_LIBS) -lgcrypt
 147 +UNIX_LINK_LIBS = $(LDAP_LIBLBER_LA) $(AC_LIBS) $(SECURITY_LIBS) $(LTHREAD_LIBS) -lgcrypt
 148
 149  .links : Makefile
 150         @for i in $(XXSRCS); do \