[csw-devel] SF.net SVN: gar:[5066] csw/mgar/pkg/openldap/trunk
dmichelsen at users.sourceforge.net
dmichelsen at users.sourceforge.net
Tue May 26 22:05:39 CEST 2009
Revision: 5066
http://gar.svn.sourceforge.net/gar/?rev=5066&view=rev
Author: dmichelsen
Date: 2009-05-26 20:05:35 +0000 (Tue, 26 May 2009)
Log Message:
-----------
openldap: Move to dynamic gspec, update to 2.4.16
Modified Paths:
--------------
csw/mgar/pkg/openldap/trunk/Makefile
csw/mgar/pkg/openldap/trunk/checksums
Removed Paths:
-------------
csw/mgar/pkg/openldap/trunk/files/CSWoldap.depend
csw/mgar/pkg/openldap/trunk/files/CSWoldapclient.depend
csw/mgar/pkg/openldap/trunk/files/CSWoldapclient.gspec
csw/mgar/pkg/openldap/trunk/files/CSWoldapdevel.depend
csw/mgar/pkg/openldap/trunk/files/CSWoldaprt.depend
csw/mgar/pkg/openldap/trunk/files/patch-oldap-2.3.24-ntlm.diff
Modified: csw/mgar/pkg/openldap/trunk/Makefile
===================================================================
--- csw/mgar/pkg/openldap/trunk/Makefile 2009-05-26 19:56:55 UTC (rev 5065)
+++ csw/mgar/pkg/openldap/trunk/Makefile 2009-05-26 20:05:35 UTC (rev 5066)
@@ -1,5 +1,5 @@
GARNAME = openldap
-GARVERSION = 2.3.40
+GARVERSION = 2.4.16
CATEGORIES = server
DESCRIPTION = Open source implementation of the Lightweight Directory Access Protocol
@@ -13,23 +13,40 @@
MASTER_SITES = ftp://ftp.openldap.org/pub/OpenLDAP/openldap-release/
DISTFILES = $(GARNAME)-$(GARVERSION).tgz
-DISTFILES += $(call admfiles,CSWoldap,depend)
+DISTFILES += $(call admfiles,CSWoldap)
DISTFILES += cswopenldap openldap.xml svc-openldap
-DISTFILES += $(call admfiles,CSWoldapclient,depend)
-DISTFILES += $(call admfiles,CSWoldapdevel,depend)
-DISTFILES += $(call admfiles,CSWoldaprt,depend)
DISTFILES += README.CSW openldaprc
+LICENSE = COPYRIGHT
+
+PACKAGES = CSWoldap CSWoldapclient CSWoldapdevel CSWoldaprt
+
+CATALOGNAME_CSWoldapclient = openldap_client
+CATALOGNAME_CSWoldapdevel = openldap_devel
+CATALOGNAME_CSWoldaprt = openldap_rt
+
+SPKG_DESC_CSWoldapclient = OpenLDAP client executables
+SPKG_DESC_CSWoldapdevel = OpenLDAP development support
+SPKG_DESC_CSWoldaprt = OpenLDAP runtime libraries
+
+REQUIRED_PKGS_CSWoldap = CSWbdb4 CSWiconv CSWlibnet CSWlibtoolrt CSWoldaprt
+REQUIRED_PKGS_CSWoldap += CSWosslrt CSWsasl CSWtcpwrap CSWunixodbc
+REQUIRED_PKGS_CSWoldapclient = CSWlibnet CSWoldaprt CSWosslrt CSWsasl
+REQUIRED_PKGS_CSWoldapdevel = CSWoldaprt
+REQUIRED_PKGS_CSWoldaprt = CSWlibnet CSWosslrt CSWsasl
+
+SPKG_SOURCEURL = http://www.openldap.org
+
# We define upstream file regex so we can be notifed of new upstream software release
UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.gz
-PATCHFILES = patch-oldap-2.3.24-ntlm.diff
+PATCHFILES = patch-oldap-2.4.16-ntlm.diff
DISTFILES += $(PATCHFILES)
EXTRA_DOCS = README.CSW openldaprc $(PATCHFILES)
-EXTRA_LIB = $(prefix)/bdb4/lib
-EXTRA_INC = $(prefix)/bdb4/include
+EXTRA_LIB = $(prefix)/bdb44/lib
+EXTRA_INC = $(prefix)/bdb44/include
CONFIGURE_ARGS = $(DIRPATHS)
@@ -50,8 +67,11 @@
PKGFILES_CSWoldaprt += $(sysconfdir)/ldap.conf
PKGFILES_CSWoldaprt += $(mandir)/man5/ldap.conf.5
-include ../category.mk
+include gar/category.mk
+CFLAGS := $(filter-out -I%,$(CFLAGS))
+DIRECTORY_EXPORTS := $(filter-out includedir,$(DIRECTORY_EXPORTS))
+
INSTALL_SCRIPTS += custom
install-custom:
Modified: csw/mgar/pkg/openldap/trunk/checksums
===================================================================
--- csw/mgar/pkg/openldap/trunk/checksums 2009-05-26 19:56:55 UTC (rev 5065)
+++ csw/mgar/pkg/openldap/trunk/checksums 2009-05-26 20:05:35 UTC (rev 5066)
@@ -1,19 +1,8 @@
-728e95d806a3d47d9686481d72e62072 download/openldap-2.3.40.tgz
2f6e6a8c9c3497f1c0c9d52ea2d1dafa download/CSWoldap.gspec
-059b2c7ae6d2f181e9098a8afc852ce4 download/CSWoldap.depend
-bebf1c2805dfe126938a9631f9d7947f download/CSWoldap.prototype
+892dba5f625755be024c30ea0055fd55 download/README.CSW
d7e13ba31a8de786f7cdbe3d529a9728 download/cswopenldap
+ed5b86e9d2b372d10edfe3bb59fee165 download/openldap-2.4.16.tgz
0e57547ad2b5fedca9f0bd4beaddfe39 download/openldap.xml
-e15c2020566e56f02118e75c89111f15 download/svc-openldap
-5eb9a4b33ac44dd218d508e17f827461 download/CSWoldapclient.gspec
-ff1e9fbbaf7b56927e297226ed429b0f download/CSWoldapclient.depend
-14406b97a0e1587071f8598132f64bab download/CSWoldapclient.prototype
-16a7768e2473edbbb3bdff1c64835f1c download/CSWoldapdevel.gspec
-6d30b718d20705441b89353dae9e64b4 download/CSWoldapdevel.depend
-aa020153cf5ecfc19252d45e89708eda download/CSWoldapdevel.prototype
-0cc22644bd37d23564afb7fba580d607 download/CSWoldaprt.gspec
-85d952cebd7d6cc954c08f8b446815ba download/CSWoldaprt.depend
-755aef96cb0ab523b49e83504d37c107 download/CSWoldaprt.prototype
-892dba5f625755be024c30ea0055fd55 download/README.CSW
ab2ac7519b092ce8d16124c5270bfec0 download/openldaprc
-2d8b0286819ffcb41761a6fdd735c5ae download/patch-oldap-2.3.24-ntlm.diff
+d3dee9018137c39f357859b652e3a67c download/patch-oldap-2.4.16-ntlm.diff
+e15c2020566e56f02118e75c89111f15 download/svc-openldap
Deleted: csw/mgar/pkg/openldap/trunk/files/CSWoldap.depend
===================================================================
--- csw/mgar/pkg/openldap/trunk/files/CSWoldap.depend 2009-05-26 19:56:55 UTC (rev 5065)
+++ csw/mgar/pkg/openldap/trunk/files/CSWoldap.depend 2009-05-26 20:05:35 UTC (rev 5066)
@@ -1,9 +0,0 @@
-P CSWbdb4 berkeleydb4 - Embedded database libraries and utilities
-P CSWiconv libiconv - GNU iconv library
-P CSWlibnet libnet - the libnet packet construction library
-P CSWlibtool libtool - Generic library support script
-P CSWoldaprt openldap_rt - OpenLDAP runtime libraries (oldaprt)
-P CSWossl openssl - Openssl meta package
-P CSWsasl sasl - Simple Authentication and Security Layer
-P CSWtcpwrap tcpwrappers - (ipv6.4 patched) lib and tools for pre-screening tcp connections
-P CSWunixodbc unixodbc - ODBC access to data sources
Deleted: csw/mgar/pkg/openldap/trunk/files/CSWoldapclient.depend
===================================================================
--- csw/mgar/pkg/openldap/trunk/files/CSWoldapclient.depend 2009-05-26 19:56:55 UTC (rev 5065)
+++ csw/mgar/pkg/openldap/trunk/files/CSWoldapclient.depend 2009-05-26 20:05:35 UTC (rev 5066)
@@ -1,4 +0,0 @@
-P CSWlibnet libnet - the libnet packet construction library
-P CSWoldaprt openldap_rt - OpenLDAP runtime libraries (oldaprt)
-P CSWosslrt openssl_rt - Openssl runtime libraries
-P CSWsasl sasl - Simple Authentication and Security Layer
Deleted: csw/mgar/pkg/openldap/trunk/files/CSWoldapclient.gspec
===================================================================
--- csw/mgar/pkg/openldap/trunk/files/CSWoldapclient.gspec 2009-05-26 19:56:55 UTC (rev 5065)
+++ csw/mgar/pkg/openldap/trunk/files/CSWoldapclient.gspec 2009-05-26 20:05:35 UTC (rev 5066)
@@ -1,5 +0,0 @@
-%var bitname openldap_client
-%var pkgname CSWoldapclient
-%include url file://%{PKGLIB}/csw_dyndepend.gspec
-%var desc OpenLDAP client executables (oldapclient)
-%copyright url file://%{WORKSRC}/COPYRIGHT
Deleted: csw/mgar/pkg/openldap/trunk/files/CSWoldapdevel.depend
===================================================================
--- csw/mgar/pkg/openldap/trunk/files/CSWoldapdevel.depend 2009-05-26 19:56:55 UTC (rev 5065)
+++ csw/mgar/pkg/openldap/trunk/files/CSWoldapdevel.depend 2009-05-26 20:05:35 UTC (rev 5066)
@@ -1 +0,0 @@
-P CSWoldaprt openldap_rt - OpenLDAP runtime libraries (oldaprt)
Deleted: csw/mgar/pkg/openldap/trunk/files/CSWoldaprt.depend
===================================================================
--- csw/mgar/pkg/openldap/trunk/files/CSWoldaprt.depend 2009-05-26 19:56:55 UTC (rev 5065)
+++ csw/mgar/pkg/openldap/trunk/files/CSWoldaprt.depend 2009-05-26 20:05:35 UTC (rev 5066)
@@ -1,3 +0,0 @@
-P CSWlibnet libnet - the libnet packet construction library
-P CSWosslrt openssl_rt - Openssl runtime libraries
-P CSWsasl sasl - Simple Authentication and Security Layer
Deleted: csw/mgar/pkg/openldap/trunk/files/patch-oldap-2.3.24-ntlm.diff
===================================================================
--- csw/mgar/pkg/openldap/trunk/files/patch-oldap-2.3.24-ntlm.diff 2009-05-26 19:56:55 UTC (rev 5065)
+++ csw/mgar/pkg/openldap/trunk/files/patch-oldap-2.3.24-ntlm.diff 2009-05-26 20:05:35 UTC (rev 5066)
@@ -1,199 +0,0 @@
-(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.3.20. Apply with -p0
-
-
---- ./include/ldap.h~ 2006-02-15 16:32:17.000000000 -0500
-+++ ./include/ldap.h 2006-03-08 20:29:49.092866000 -0500
-@@ -2115,5 +2115,26 @@
- ldap_passwordpolicy_err2txt LDAP_P(( LDAPPasswordPolicyError ));
- #endif /* LDAP_CONTROL_PASSWORDPOLICYREQUEST */
-
-+/*
-+ * 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 */
---- ./libraries/libldap/Makefile.in~ 2006-01-03 17:16:08.000000000 -0500
-+++ ./libraries/libldap/Makefile.in 2006-03-08 20:29:49.177284000 -0500
-@@ -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 sbind.c kbind.c unbind.c cancel.c \
-+ sasl.c ntlm.c sbind.c kbind.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 sortctrl.c vlvctrl.c \
-@@ -31,7 +31,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 sbind.lo kbind.lo unbind.lo cancel.lo \
-+ sasl.lo ntlm.lo sbind.lo kbind.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 sortctrl.lo vlvctrl.lo \
---- /dev/null 2004-06-30 15:04:37.000000000 -0400
-+++ ./libraries/libldap/ntlm.c 2004-07-14 13:44:18.000000000 -0400
-@@ -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 );
-+}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
More information about the devel
mailing list