Update of /cvsroot/fink/dists/10.3/stable/main/finkinfo/libs
In directory
sc8-pr-cvs5.sourceforge.net:/tmp/cvs-serv6263/10.3/stable/main/finkinfo/libs
Added Files:
openldap23.info openldap23.patch
Log Message:
Move version 2.3.27 to stable
--- NEW FILE: openldap23.patch ---
diff -uNr openldap-2.3.27/include/ldap.h openldap-2.3.27-new/include/ldap.h
--- openldap-2.3.27/include/ldap.h 2005-01-20 12:00:58.000000000 -0500
+++ openldap-2.3.27-new/include/ldap.h 2005-08-29 14:13:15.000000000 -0400
@@ -2118,5 +2118,25 @@
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 */
diff -uNr openldap-2.3.27/libraries/libldap/Makefile.in
openldap-2.3.27-new/libraries/libldap/Makefile.in
--- openldap-2.3.27/libraries/libldap/Makefile.in 2005-01-20
12:01:01.000000000 -0500
+++ openldap-2.3.27-new/libraries/libldap/Makefile.in 2005-08-29
14:13:15.000000000 -0400
@@ -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 \
@@ -47,7 +47,7 @@
XLIBS = $(LIBRARY) $(LDAP_LIBLBER_LA) $(LDAP_LIBLUTIL_A)
XXLIBS = $(SECURITY_LIBS) $(LUTIL_LIBS)
NT_LINK_LIBS = $(LDAP_LIBLBER_LA) $(AC_LIBS) $(SECURITY_LIBS)
-UNIX_LINK_LIBS = $(LDAP_LIBLBER_LA) $(AC_LIBS) $(SECURITY_LIBS)
+UNIX_LINK_LIBS = $(LDAP_LIBLBER_LA) $(SECURITY_LIBS) $(AC_LIBS)
apitest: $(XLIBS) apitest.o
$(LTLINK) -o $@ apitest.o $(LIBS)
diff -uNr openldap-2.2.26/libraries/libldap/ntlm.c
openldap-2.2.26-new/libraries/libldap/ntlm.c
--- openldap-2.2.26/libraries/libldap/ntlm.c 1969-12-31 19:00:00.000000000
-0500
+++ openldap-2.2.26-new/libraries/libldap/ntlm.c 2005-08-29
14:13:15.000000000 -0400
@@ -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 );
+}
+
diff -urNad openldap2.3-2.3.11~/libraries/libldap_r/Makefile.in
openldap2.3-2.3.11/libraries/libldap_r/Makefile.in
--- openldap2.3-2.3.11~/libraries/libldap_r/Makefile.in 2005-12-01
13:48:50.000000000 +0100
+++ openldap2.3-2.3.11/libraries/libldap_r/Makefile.in 2005-12-02
10:05:17.637342000 +0100
@@ -22,7 +22,7 @@
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 \
@@ -38,7 +38,7 @@
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 \
@@ -56,7 +56,7 @@
XXLIBS = $(SECURITY_LIBS) $(LUTIL_LIBS)
XXXLIBS = $(LTHREAD_LIBS)
NT_LINK_LIBS = $(LDAP_LIBLBER_LA) $(AC_LIBS) $(SECURITY_LIBS)
-UNIX_LINK_LIBS = $(LDAP_LIBLBER_LA) $(AC_LIBS) $(SECURITY_LIBS)
+UNIX_LINK_LIBS = $(LDAP_LIBLBER_LA) $(AC_LIBS) $(SECURITY_LIBS) $(LTHREAD_LIBS)
.links : Makefile
@for i in $(XXSRCS); do \
--- NEW FILE: openldap23.info ---
Package: openldap23
Version: 2.3.27
Revision: 1
Maintainer: None <[email protected]>
Source: mirror:custom:openldap-release/openldap-%v.tgz
CustomMirror: <<
asi-JP: ftp://ftp.dti.ad.jp/pub/net/OpenLDAP/
asi-JP: ftp://ftp.u-aizu.ac.jp/pub/net/openldap/
asi-KR: ftp://ftp.holywar.net/pub/mirror/OpenLDAP/
aus-AU: http://www.PlanetMirror.com/pub/openldap/
eur-AT: ftp://gd.tuwien.ac.at/infosys/network/OpenLDAP/
eur-CH: ftp://sunsite.cnlab-switch.ch/mirror/OpenLDAP/
eur-GR: ftp://ftp.ntua.gr/mirror/OpenLDAP/
eur-IT: ftp://it.openldap.org/pub/OpenLDAP/
eur-NL: ftp://ftp.nl.uu.net/pub/unix/db/openldap/
eur-PT: ftp://ftp.linux.pt/pub/mirrors/OpenLDAP/
eur-UK: ftp://ftp.plig.net/pub/OpenLDAP/
nam-US: ftp://ftp.OpenLDAP.org/pub/OpenLDAP/
sam-BR: ftp://ftp.matrix.com.br/pub/openldap/
<<
Source-MD5: 0fbae4e9279aaa586adcd9f19b66a5ed
Depends: %N-shlibs (= %v-%r), daemonic
BuildDepends: system-openssl-dev, db43-ssl | db43, cyrus-sasl2-dev (>=
2.1.21-3), readline5
Conflicts: openldap-ssl
Replaces: openldap-ssl
Patch: %n.patch
NoSetLDFLAGS: True
SetLibs: -lkrb5 -ldb-4.3 -L%p/lib/system-openssl/lib -L%p/lib
SetCPPFLAGS: -I%p/lib/system-openssl/include -I%p/include/db4 -DBIND_8_COMPAT
NoSetMAKEFLAGS: true
SetMAKEFLAGS: -j1
ConfigureParams: --libexecdir=%p/sbin --mandir=%p/share/man
--infodir=%p/share/info/%n --with-cyrus-sasl --enable-ldap --enable-ldbm
--disable-dependency-tracking
InstallScript: <<
make install DESTDIR=%d
perl -pi -e 's|%p/lib/libdb-4.3.la|-ldb-4.3|g' %i/lib/libldap.la
perl -pi -e 's|%p/lib/libdb-4.3.la|-ldb-4.3|g' %i/lib/libldap_r.la
<<
DocFiles: ANNOUNCEMENT CHANGES COPYRIGHT LICENSE README build/LICENSE-2.0.1
doc/drafts/draft*
ConfFiles: <<
%p/etc/openldap/ldap.conf
%p/etc/openldap/slapd.conf
<<
SplitOff: <<
Package: %N-shlibs
Depends: readline5-shlibs, cyrus-sasl2-shlibs (>= 2.1.21-1), db43-ssl-shlibs |
db43-shlibs
Description: Shared libraries for LDAP
Files: lib/*-2.3.0*.dylib
Shlibs: <<
%p/lib/liblber-2.3.0.dylib 2.0.0 %n (>= 2.3.11-1)
%p/lib/libldap-2.3.0.dylib 2.0.0 %n (>= 2.3.11-1)
%p/lib/libldap_r-2.3.0.dylib 2.0.0 %n (>= 2.3.11-1)
<<
DocFiles: ANNOUNCEMENT CHANGES COPYRIGHT LICENSE README build/LICENSE-2.0.1
<<
SplitOff2: <<
Package: %N-dev
Depends: %N-shlibs (= %v-%r)
Conflicts: openldap-ssl-dev
Replaces: openldap-ssl-dev
Description: Libraries and headers for LDAP development
Files: include lib/*.a lib/*.la lib/*.dylib share/man/man3
BuildDependsOnly: True
DocFiles: COPYRIGHT LICENSE README build/LICENSE-2.0.1
<<
DaemonicName: slapd
DaemonicFile: <<
<service>
<description>LDAP Server</description>
<message>LDAP Server</message>
<daemon name="slapd">
<executable background="yes">%p/sbin/slapd</executable>
<configfile>%p/etc/openldap/slapd.conf</configfile>
</daemon>
</service>
<<
PreRmScript: <<
if [ $1 != "upgrade" ]; then
daemonic remove slapd
fi
<<
Description: LDAP directory services implementation
DescDetail: <<
OpenLDAP is an open source implementation of the Lightweight Directory
Access Protocol. The suite includes:
* slapd - stand-alone LDAP server
* slurpd - stand-alone LDAP replication server
* libraries implementing the LDAP protocol, and
* utilities, tools, and sample clients.
<<
DescUsage: <<
To create a startup item that starts slapd after reboot just run as root
'daemonic enable slapd'. To remove the slapd startup item just run as root
'daemonic remove slapd'.
<<
DescPort: <<
Patch taken from:
http://packages.debian.org/unstable/libs/libldap-2.3-0
<<
DescPackaging: <<
Originally packaged by Matt Stephenson.
<<
License: Restrictive/Distributable
Homepage: http://www.openldap.org
-------------------------------------------------------------------------
Take Surveys. Earn Cash. Influence the Future of IT
Join SourceForge.net's Techsay panel and you'll get the chance to share your
opinions on IT & business topics through brief surveys - and earn cash
http://www.techsay.com/default.php?page=join.php&p=sourceforge&CID=DEVDEV
_______________________________________________
Fink-commits mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/fink-commits
