Source Mage code commit list

[Ismael Luceno <scm AT sourcemage.org>]

GIT changes to master grimoire by Ismael Luceno <ismael AT sourcemage.org>:

 collab/openldap/CONFIGURE                  |    4 
 collab/openldap/HISTORY                    |    2 
 collab/openldap/PRE_BUILD                  |    6 
 collab/openldap/PRE_SUB_DEPENDS            |    1 
 collab/openldap/SUB_DEPENDS                |    2 
 collab/openldap/openldap-2.4.31-ntlm.patch |  219 
-----------------------------
 6 files changed, 4 insertions(+), 230 deletions(-)

New commits:
commit f88d6cef05109879b424cd78deac1e3073cbabdf
Author: Ismael Luceno <ismael AT sourcemage.org>
Commit: Ismael Luceno <ismael AT sourcemage.org>

    openldap: Remove (legacy) plain NTLM support
    
    The patch doesn't apply and probably there's no servers requiring this
    anywhere anymore.

diff --git a/collab/openldap/CONFIGURE b/collab/openldap/CONFIGURE
index bf4518b..e9e3029 100755
--- a/collab/openldap/CONFIGURE
+++ b/collab/openldap/CONFIGURE
@@ -1,3 +1,5 @@
+persistent_remove OPENLDAP_NTLM &&
+
 source $GRIMOIRE/config_query_multi.function &&
 
 config_query_option OPENLDAP_OPTS "Enable IPv6 support?" y \
@@ -163,7 +165,5 @@ if list_find "$OPENLDAP_OPTS" "--enable-slapd"; then
                                  gmp
 fi &&
 
-config_query OPENLDAP_NTLM "Enable NTLM API support (needed for Evolution 
Exchange plugin)?" n &&
-
 message "${MESSAGE_COLOR}If you care about security, check out 
http://timof.qipc.org/ldap/libldap.html .$DEFAULT_COLOR" &&
 message "${MESSAGE_COLOR}The patch is not in the spell anymore because of 
version mismatch...$DEFAULT_COLOR."
diff --git a/collab/openldap/HISTORY b/collab/openldap/HISTORY
index bf53299..59554f5 100644
--- a/collab/openldap/HISTORY
+++ b/collab/openldap/HISTORY
@@ -1,5 +1,7 @@
 2022-03-26 Ismael Luceno <ismael AT sourcemage.org>
        * DETAILS, PREPARE: removed OPENLDAP_BRANCH
+       * PRE_BUILD, openldap-2.4.31-ntlm.patch: removed, no longer needed
+       * CONFIGURE, PRE_SUB_DEPENDS, SUB_DEPENDS: removed (legacy) plain 
NTLM support
 
 2022-01-29 Florian Franzmann <bwlf AT bandrate.org>
        * DETAILS: version 2.6.1
diff --git a/collab/openldap/PRE_BUILD b/collab/openldap/PRE_BUILD
deleted file mode 100755
index 258ed08..0000000
--- a/collab/openldap/PRE_BUILD
+++ /dev/null
@@ -1,6 +0,0 @@
-default_pre_build &&
-cd "$SOURCE_DIRECTORY" &&
-
-if [[ $OPENLDAP_NTLM == y ]]; then
-  patch -p1 < "$SPELL_DIRECTORY/openldap-2.4.31-ntlm.patch"
-fi
diff --git a/collab/openldap/PRE_SUB_DEPENDS b/collab/openldap/PRE_SUB_DEPENDS
index 4328e50..a327d71 100755
--- a/collab/openldap/PRE_SUB_DEPENDS
+++ b/collab/openldap/PRE_SUB_DEPENDS
@@ -1,6 +1,5 @@
 case $THIS_SUB_DEPENDS in
   SASL) is_depends_enabled $SPELL $(get_spell_provider $SPELL LIBSASL);;
-  NTLM) [[ OPENLDAP_NTLM == "y" ]] && return 0;;
      *) message "${PROBLEM_COLOR}bogus sub_depends: $SPELL 
$THIS_SUB_DEPENDS${DEFAULT_COLOR}"
         return 1;;
 esac
diff --git a/collab/openldap/SUB_DEPENDS b/collab/openldap/SUB_DEPENDS
index a92065e..c6c4b76 100755
--- a/collab/openldap/SUB_DEPENDS
+++ b/collab/openldap/SUB_DEPENDS
@@ -1,8 +1,6 @@
 case $THIS_SUB_DEPENDS in
   SASL) message "OpenLDAP with SASL support requested, forcing cyrus-sasl 
dependency" &&
         depends LIBSASL "--with-cyrus-sasl";;
-  NTLM) message "OpenLDAP with NTLM support requested, forcing NTLM patch"  
&&
-        OPENLDAP_NTLM=y ;;
      *) message "${PROBLEM_COLOR}bogus sub_depends: $SPELL 
$THIS_SUB_DEPENDS${DEFAULT_COLOR}"
         return 1;;
 esac
diff --git a/collab/openldap/openldap-2.4.31-ntlm.patch 
b/collab/openldap/openldap-2.4.31-ntlm.patch
deleted file mode 100644
index ae981eb..0000000
--- a/collab/openldap/openldap-2.4.31-ntlm.patch
+++ /dev/null
@@ -1,219 +0,0 @@
-Submitted By:            Armin K. <krejzi at email dot com>
-Date:                    2012-04-06
-Initial Package Version: 2.4.30
-Upstream Status:         Unknown
-Origin:                  Debian
-Description:             Patch from evolution-exchange (2.10.3).  The 
ldap_ntlm_bind function is
-                         actually called by evolution-data-server, checked 
at version 1.12.2.
-                         Without this patch, the Exchange addressbook 
integration uses simple binds
-                         with cleartext passwords.
-
---- openldap.orig/include/ldap.h       2012-02-29 18:37:09.000000000 +0100
-+++ openldap/include/ldap.h    2012-04-01 00:20:00.059827789 +0200
-@@ -2517,5 +2517,25 @@
-       LDAPControl     **ctrls,
-       LDAPDerefRes    **drp ));
- 
-+/*
-+ * hacks for NTLM
-+ */
-+#define LDAP_AUTH_NTLM_REQUEST ((ber_tag_t) 0x8aU)
-+#define LDAP_AUTH_NTLM_RESPONSE  ((ber_tag_t) 0x8bU)
-+LDAP_F( int )
-+ldap_ntlm_bind LDAP_P((
-+      LDAP    *ld,
-+      LDAP_CONST char *dn,
-+      ber_tag_t tag,
-+      struct berval *cred,
-+      LDAPControl **sctrls,
-+      LDAPControl **cctrls,
-+      int   *msgidp ));
-+LDAP_F( int )
-+ldap_parse_ntlm_bind_result LDAP_P((
-+      LDAP    *ld,
-+      LDAPMessage *res,
-+      struct berval *challenge));
-+
- LDAP_END_DECL
- #endif /* _LDAP_H */
---- openldap.orig/libraries/libldap/Makefile.in        2012-04-01 
00:18:54.233419658 +0200
-+++ openldap/libraries/libldap/Makefile.in     2012-04-01 00:20:00.060827810 
+0200
-@@ -27,7 +27,7 @@
-       init.c options.c print.c string.c util-int.c schema.c \
-       charray.c os-local.c dnssrv.c utf-8.c utf-8-conv.c \
-       tls2.c tls_o.c tls_g.c tls_m.c \
--      turn.c ppolicy.c dds.c txn.c ldap_sync.c stctrl.c \
-+      turn.c ppolicy.c dds.c txn.c ldap_sync.c stctrl.c ntlm.c \
-       assertion.c deref.c ldif.c fetch.c
- 
- OBJS  = bind.lo open.lo result.lo error.lo compare.lo search.lo \
-@@ -40,7 +40,7 @@
-       init.lo options.lo print.lo string.lo util-int.lo schema.lo \
-       charray.lo os-local.lo dnssrv.lo utf-8.lo utf-8-conv.lo \
-       tls2.lo tls_o.lo tls_g.lo tls_m.lo \
--      turn.lo ppolicy.lo dds.lo txn.lo ldap_sync.lo stctrl.lo \
-+      turn.lo ppolicy.lo dds.lo txn.lo ldap_sync.lo stctrl.lo ntlm.lo \
-       assertion.lo deref.lo ldif.lo fetch.lo
- 
- LDAP_INCDIR= ../../include       
---- openldap.orig/libraries/libldap/ntlm.c     1970-01-01 01:00:00.000000000 
+0100
-+++ openldap/libraries/libldap/ntlm.c  2012-04-01 00:20:00.059827789 +0200
-@@ -0,0 +1,138 @@
-+/* $OpenLDAP: pkg/ldap/libraries/libldap/ntlm.c,v 1.1.4.10 2002/01/04 
20:38:21 kurt Exp $ */
-+/*
-+ * Copyright 1998-2002 The OpenLDAP Foundation, All Rights Reserved.
-+ * COPYING RESTRICTIONS APPLY, see COPYRIGHT file
-+ */
-+
-+/* Mostly copied from sasl.c */
-+
-+#include "portable.h"
-+
-+#include <stdlib.h>
-+#include <stdio.h>
-+
-+#include <ac/socket.h>
-+#include <ac/string.h>
-+#include <ac/time.h>
-+#include <ac/errno.h>
-+
-+#include "ldap-int.h"
-+
-+int
-+ldap_ntlm_bind(
-+ LDAP    *ld,
-+ LDAP_CONST char *dn,
-+ ber_tag_t tag,
-+ struct berval *cred,
-+ LDAPControl **sctrls,
-+ LDAPControl **cctrls,
-+ int   *msgidp )
-+{
-+ BerElement  *ber;
-+ int rc;
-+ ber_int_t id;
-+
-+ Debug( LDAP_DEBUG_TRACE, "ldap_ntlm_bind\n", 0, 0, 0 );
-+
-+ assert( ld != NULL );
-+ assert( LDAP_VALID( ld ) );
-+ assert( msgidp != NULL );
-+
-+ if( msgidp == NULL ) {
-+   ld->ld_errno = LDAP_PARAM_ERROR;
-+   return ld->ld_errno;
-+ }
-+
-+ /* create a message to send */
-+ if ( (ber = ldap_alloc_ber_with_options( ld )) == NULL ) {
-+   ld->ld_errno = LDAP_NO_MEMORY;
-+   return ld->ld_errno;
-+ }
-+
-+ assert( LBER_VALID( ber ) );
-+
-+ LDAP_NEXT_MSGID( ld, id );
-+ rc = ber_printf( ber, "{it{istON}" /*}*/,
-+      id, LDAP_REQ_BIND,
-+      ld->ld_version, dn, tag,
-+      cred );
-+
-+ /* Put Server Controls */
-+ if( ldap_int_put_controls( ld, sctrls, ber ) != LDAP_SUCCESS ) {
-+   ber_free( ber, 1 );
-+   return ld->ld_errno;
-+ }
-+
-+ if ( ber_printf( ber, /*{*/ "N}" ) == -1 ) {
-+   ld->ld_errno = LDAP_ENCODING_ERROR;
-+   ber_free( ber, 1 );
-+   return ld->ld_errno;
-+ }
-+
-+ /* send the message */
-+ *msgidp = ldap_send_initial_request( ld, LDAP_REQ_BIND, dn, ber, id );
-+
-+ if(*msgidp < 0)
-+   return ld->ld_errno;
-+
-+ return LDAP_SUCCESS;
-+}
-+
-+int
-+ldap_parse_ntlm_bind_result(
-+ LDAP    *ld,
-+ LDAPMessage *res,
-+ struct berval *challenge)
-+{
-+ ber_int_t errcode;
-+ ber_tag_t tag;
-+ BerElement  *ber;
-+ ber_len_t len;
-+
-+ Debug( LDAP_DEBUG_TRACE, "ldap_parse_ntlm_bind_result\n", 0, 0, 0 );
-+
-+ assert( ld != NULL );
-+ assert( LDAP_VALID( ld ) );
-+ assert( res != NULL );
-+
-+ if ( ld == NULL || res == NULL ) {
-+   return LDAP_PARAM_ERROR;
-+ }
-+
-+ if( res->lm_msgtype != LDAP_RES_BIND ) {
-+   ld->ld_errno = LDAP_PARAM_ERROR;
-+   return ld->ld_errno;
-+ }
-+
-+ if ( ld->ld_error ) {
-+   LDAP_FREE( ld->ld_error );
-+   ld->ld_error = NULL;
-+ }
-+ if ( ld->ld_matched ) {
-+   LDAP_FREE( ld->ld_matched );
-+   ld->ld_matched = NULL;
-+ }
-+
-+ /* parse results */
-+
-+ ber = ber_dup( res->lm_ber );
-+
-+ if( ber == NULL ) {
-+   ld->ld_errno = LDAP_NO_MEMORY;
-+   return ld->ld_errno;
-+ }
-+
-+ tag = ber_scanf( ber, "{ioa" /*}*/,
-+      &errcode, challenge, &ld->ld_error );
-+ ber_free( ber, 0 );
-+
-+ if( tag == LBER_ERROR ) {
-+   ld->ld_errno = LDAP_DECODING_ERROR;
-+   return ld->ld_errno;
-+ }
-+
-+ ld->ld_errno = errcode;
-+
-+ return( ld->ld_errno );
-+}
-+
---- openldap.orig/libraries/libldap_r/Makefile.in      2012-04-01 
00:18:54.234419703 +0200
-+++ openldap/libraries/libldap_r/Makefile.in   2012-04-01 00:20:00.060827810 
+0200
-@@ -29,7 +29,7 @@
-       init.c options.c print.c string.c util-int.c schema.c \
-       charray.c os-local.c dnssrv.c utf-8.c utf-8-conv.c \
-       tls2.c tls_o.c tls_g.c tls_m.c \
--      turn.c ppolicy.c dds.c txn.c ldap_sync.c stctrl.c \
-+      turn.c ppolicy.c dds.c txn.c ldap_sync.c stctrl.c ntlm.c \
-       assertion.c deref.c ldif.c fetch.c
- SRCS  = threads.c rdwr.c rmutex.c tpool.c rq.c \
-       thr_posix.c thr_cthreads.c thr_thr.c thr_nt.c \
-@@ -47,7 +47,7 @@
-       init.lo options.lo print.lo string.lo util-int.lo schema.lo \
-       charray.lo os-local.lo dnssrv.lo utf-8.lo utf-8-conv.lo \
-       tls2.lo tls_o.lo tls_g.lo tls_m.lo \
--      turn.lo ppolicy.lo dds.lo txn.lo ldap_sync.lo stctrl.lo \
-+      turn.lo ppolicy.lo dds.lo txn.lo ldap_sync.lo stctrl.lo ntlm.lo \
-       assertion.lo deref.lo ldif.lo fetch.lo
- 
- LDAP_INCDIR= ../../include