diff options
author | Treeve Jelbert | 2009-02-21 09:25:37 +0100 |
---|---|---|
committer | Treeve Jelbert | 2009-02-21 09:25:37 +0100 |
commit | d7b5063ed0726704ef73ec37469457701bdafaff (patch) | |
tree | a2f2111e00e878514161d63bf459698714597671 | |
parent | e14cf1d4d74618879087549138021d97e3d2e442 (diff) | |
parent | 3bde8160d5d18b18f5b789af8e43c4e7a801d4d0 (diff) |
Merge branch 'master' of ssh://treeve@scm.sourcemage.org/smgl/grimoire
-rwxr-xr-x | collab/openldap/CONFIGURE | 2 | ||||
-rw-r--r-- | collab/openldap/HISTORY | 10 | ||||
-rwxr-xr-x | collab/openldap/PRE_BUILD | 7 | ||||
-rwxr-xr-x | collab/openldap/PRE_SUB_DEPENDS | 1 | ||||
-rwxr-xr-x | collab/openldap/SUB_DEPENDS | 2 | ||||
-rw-r--r-- | collab/openldap/openldap-2.4-ntlm.patch | 203 | ||||
-rw-r--r-- | gnome2-libs/evolution-data-server/HISTORY | 4 | ||||
-rwxr-xr-x | gnome2-libs/evolution-data-server/PRE_SUB_DEPENDS | 4 | ||||
-rwxr-xr-x | gnome2-libs/evolution-data-server/SUB_DEPENDS | 2 | ||||
-rwxr-xr-x | gnome2-libs/evolution-exchange/DEPENDS | 1 | ||||
-rw-r--r-- | gnome2-libs/evolution-exchange/HISTORY | 4 | ||||
-rwxr-xr-x | graphics-libs/mesalib/FINAL | 1 | ||||
-rw-r--r-- | graphics-libs/mesalib/HISTORY | 3 | ||||
-rwxr-xr-x | xorg-xserver/xorg-server/FINAL | 1 | ||||
-rw-r--r-- | xorg-xserver/xorg-server/HISTORY | 3 |
15 files changed, 245 insertions, 3 deletions
diff --git a/collab/openldap/CONFIGURE b/collab/openldap/CONFIGURE index 38022a5010..b4e2bb0f30 100755 --- a/collab/openldap/CONFIGURE +++ b/collab/openldap/CONFIGURE @@ -16,5 +16,7 @@ if echo $OPENLDAP_SLAPD | grep -q enable; then '--enable-aci' '--disable-aci' 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 3b62c9bd7d..48f09a62a7 100644 --- a/collab/openldap/HISTORY +++ b/collab/openldap/HISTORY @@ -1,3 +1,13 @@ +2009-02-18 Eric Sandall <sandalle@sourcemage.org> + * CONFIGURE: Query if we want openldap-2.4-ntlm.patch applied + * PRE_BUILD: Apply openldap-2.4-ntlm.patch if requested + * {PRE_,}SUB_DEPENDS: Allow forcing openldap-2.4-ntlm.patch + * openldap-2.4-ntlm.patch: Patch to provide more NTLM API calls for + evolution-data-server to use for Exchange support + This patch was obtained from + http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SOURCES/openldap-ntlm.diff and + updated to openldap 2.4.14 + 2009-02-15 Ladislav Hagara <hgr@vabo.cz> * DETAILS: 2.4.14 diff --git a/collab/openldap/PRE_BUILD b/collab/openldap/PRE_BUILD new file mode 100755 index 0000000000..b598fd04af --- /dev/null +++ b/collab/openldap/PRE_BUILD @@ -0,0 +1,7 @@ +default_pre_build && + +if [[ "$OPENLDAP_NTLM" == "y" ]] +then + cd $SOURCE_DIRECTORY && + patch -p1 < $SCRIPT_DIRECTORY/openldap-2.4-ntlm.patch +fi diff --git a/collab/openldap/PRE_SUB_DEPENDS b/collab/openldap/PRE_SUB_DEPENDS index bcf947cecb..3625961b4a 100755 --- a/collab/openldap/PRE_SUB_DEPENDS +++ b/collab/openldap/PRE_SUB_DEPENDS @@ -1,5 +1,6 @@ case $THIS_SUB_DEPENDS in SASL) is_depends_enabled $SPELL cyrus-sasl;; + 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 69b3687abc..391032fe68 100755 --- a/collab/openldap/SUB_DEPENDS +++ b/collab/openldap/SUB_DEPENDS @@ -1,6 +1,8 @@ case $THIS_SUB_DEPENDS in SASL) message "OpenLDAP with SASL support requested, forcing cyrus-sasl dependency" && depends cyrus-sasl "--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-ntlm.patch b/collab/openldap/openldap-2.4-ntlm.patch new file mode 100644 index 0000000000..1f1e8f2cb5 --- /dev/null +++ b/collab/openldap/openldap-2.4-ntlm.patch @@ -0,0 +1,203 @@ +(Note that this patch is not useful on its own... it just adds some +hooks to work with the LDAP authentication process at a lower level +than the API otherwise allows. The code that calls these hooks and +actually drives the NTLM authentication process is in +lib/e2k-global-catalog.c, and the code that actually implements the +NTLM algorithms is in xntlm/.) + +This is a patch against OpenLDAP 2.2.6. Apply with -p0 + +This patch was obtained from http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SOURCES/openldap-ntlm.diff and updated to openldap 2.4.14. Apply with -p1. + +diff -Naur openldap-2.4.14.orig/include/ldap.h openldap-2.4.14/include/ldap.h +--- openldap-2.4.14.orig/include/ldap.h 2009-02-18 03:43:05.491974110 -0800 ++++ openldap-2.4.14/include/ldap.h 2009-02-18 03:43:16.327725135 -0800 +@@ -2461,5 +2461,26 @@ + 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 */ +diff -Naur openldap-2.4.14.orig/libraries/libldap/Makefile.in openldap-2.4.14/libraries/libldap/Makefile.in +--- openldap-2.4.14.orig/libraries/libldap/Makefile.in 2009-02-18 03:43:05.489975043 -0800 ++++ openldap-2.4.14/libraries/libldap/Makefile.in 2009-02-18 03:43:16.327725135 -0800 +@@ -20,7 +20,7 @@ + SRCS = bind.c open.c result.c error.c compare.c search.c \ + controls.c messages.c references.c extended.c cyrus.c \ + modify.c add.c modrdn.c delete.c abandon.c \ +- sasl.c gssapi.c sbind.c unbind.c cancel.c \ ++ sasl.c gssapi.c ntlm.c sbind.c unbind.c cancel.c \ + filter.c free.c sort.c passwd.c whoami.c \ + getdn.c getentry.c getattr.c getvalues.c addentry.c \ + request.c os-ip.c url.c pagectrl.c sortctrl.c vlvctrl.c \ +@@ -33,7 +33,7 @@ + OBJS = bind.lo open.lo result.lo error.lo compare.lo search.lo \ + controls.lo messages.lo references.lo extended.lo cyrus.lo \ + modify.lo add.lo modrdn.lo delete.lo abandon.lo \ +- sasl.lo gssapi.lo sbind.lo unbind.lo cancel.lo \ ++ sasl.lo gssapi.lo ntlm.lo sbind.lo unbind.lo cancel.lo \ + filter.lo free.lo sort.lo passwd.lo whoami.lo \ + getdn.lo getentry.lo getattr.lo getvalues.lo addentry.lo \ + request.lo os-ip.lo url.lo pagectrl.lo sortctrl.lo vlvctrl.lo \ +diff -Naur openldap-2.4.14.orig/libraries/libldap/ntlm.c openldap-2.4.14/libraries/libldap/ntlm.c +--- openldap-2.4.14.orig/libraries/libldap/ntlm.c 1969-12-31 16:00:00.000000000 -0800 ++++ openldap-2.4.14/libraries/libldap/ntlm.c 2009-02-18 03:43:16.328725611 -0800 +@@ -0,0 +1,137 @@ ++/* $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 ); ++} diff --git a/gnome2-libs/evolution-data-server/HISTORY b/gnome2-libs/evolution-data-server/HISTORY index 2915210d77..29931ea464 100644 --- a/gnome2-libs/evolution-data-server/HISTORY +++ b/gnome2-libs/evolution-data-server/HISTORY @@ -1,3 +1,7 @@ +2009-02-18 Eric Sandall <sandalle@sourcemage.org> + * {PRE_,}SUB_DEPENDS: In order for Exchange support to be built, + openldap needs to be built with the NTLM patch + 2009-02-09 George Sherwood <gsherwood@sourcemage.org> * DETAILS: Updated to verison 2.24.4.1 diff --git a/gnome2-libs/evolution-data-server/PRE_SUB_DEPENDS b/gnome2-libs/evolution-data-server/PRE_SUB_DEPENDS index f1db0348e9..70cb7983ac 100755 --- a/gnome2-libs/evolution-data-server/PRE_SUB_DEPENDS +++ b/gnome2-libs/evolution-data-server/PRE_SUB_DEPENDS @@ -1,4 +1,6 @@ case $THIS_SUB_DEPENDS in - LDAP) is_depends_enabled $SPELL openldap && return 0;; + LDAP) persistent_read openldap OPENLDAP_NTLM OPENLDAP_NTLM && + is_depends_enabled $SPELL openldap && + [[ OPENLDAP_NTLM == "y" ]] &&return 0;; esac return 1 diff --git a/gnome2-libs/evolution-data-server/SUB_DEPENDS b/gnome2-libs/evolution-data-server/SUB_DEPENDS index 6e0b4a8323..0c5c32e1af 100755 --- a/gnome2-libs/evolution-data-server/SUB_DEPENDS +++ b/gnome2-libs/evolution-data-server/SUB_DEPENDS @@ -1,5 +1,5 @@ case $THIS_SUB_DEPENDS in LDAP) - depends openldap --with-openldap=yes "(because sub depends forced it)" + depends -sub NTLM openldap --with-openldap=yes "(because sub depends forced it)" ;; esac diff --git a/gnome2-libs/evolution-exchange/DEPENDS b/gnome2-libs/evolution-exchange/DEPENDS index a33257c963..21a9ea595d 100755 --- a/gnome2-libs/evolution-exchange/DEPENDS +++ b/gnome2-libs/evolution-exchange/DEPENDS @@ -8,7 +8,6 @@ depends libgnomeui && depends libsoup && depends libxml2 && depends evolution && -depends evolution-data-server && depends -sub LDAP evolution-data-server && depends krb5 && diff --git a/gnome2-libs/evolution-exchange/HISTORY b/gnome2-libs/evolution-exchange/HISTORY index 12e2701239..32b9cb5abf 100644 --- a/gnome2-libs/evolution-exchange/HISTORY +++ b/gnome2-libs/evolution-exchange/HISTORY @@ -1,3 +1,7 @@ +2009-02-18 Eric Sandall <sandalle@sourcemage.org> + * DEPENDS: Removed duplicate dependency on evolution-exchange + Second dependency includes -sub LDAP + 2008-11-30 Robin Cook <rcook@wyrms.net> * DETAILS: updated VERSION to 2.24.2 diff --git a/graphics-libs/mesalib/FINAL b/graphics-libs/mesalib/FINAL index 1895a776f5..5592ab8e72 100755 --- a/graphics-libs/mesalib/FINAL +++ b/graphics-libs/mesalib/FINAL @@ -1 +1,2 @@ +. $GRIMOIRE/FUNCTIONS && glselect mesa diff --git a/graphics-libs/mesalib/HISTORY b/graphics-libs/mesalib/HISTORY index 6363f2e78d..f13574e887 100644 --- a/graphics-libs/mesalib/HISTORY +++ b/graphics-libs/mesalib/HISTORY @@ -1,3 +1,6 @@ +2009-02-20 Andraž "ruskie" Levstik <ruskie@mages.ath.cx> + * FINAL: forgot sourcing of FUNCTIONS + 2009-02-20 Juuso Alasuutari <iuso@sourcemage.org> * PRE_BUILD: Fix git build by changing to $SOURCE_DIRECTORY before running ./autogen.sh. diff --git a/xorg-xserver/xorg-server/FINAL b/xorg-xserver/xorg-server/FINAL index cb13cda5fd..42199eb561 100755 --- a/xorg-xserver/xorg-server/FINAL +++ b/xorg-xserver/xorg-server/FINAL @@ -1,3 +1,4 @@ +. $GRIMOIRE/FUNCTIONS && message "${PROBLEM_COLOR}" message "WARNING: if you have a path defined by RgbPath var in /etc/X11/xorg.conf" message "-- remove it. Since xorg-server 1.5.0 RgbPath has been marked as obsolete" diff --git a/xorg-xserver/xorg-server/HISTORY b/xorg-xserver/xorg-server/HISTORY index f14b8af072..96ae6a1f16 100644 --- a/xorg-xserver/xorg-server/HISTORY +++ b/xorg-xserver/xorg-server/HISTORY @@ -1,3 +1,6 @@ +2009-02-20 Andraž "ruskie" Levstik <ruskie@mages.ath.cx> + * FINAL: left this one out + 2009-02-10 Andraž "ruskie" Levstik <ruskie@mages.ath.cx> * DEPENDS: added z-rej dependency, use NVIDIA provider |