Update of /cvsroot/fink/dists/10.4/stable/main/finkinfo/libs
In directory
sc8-pr-cvs5.sourceforge.net:/tmp/cvs-serv6263/10.4/stable/main/finkinfo/libs
Modified Files:
openldap23.info openldap23.patch
Log Message:
Move version 2.3.27 to stable
Index: openldap23.patch
===================================================================
RCS file: /cvsroot/fink/dists/10.4/stable/main/finkinfo/libs/openldap23.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- openldap23.patch 29 Jan 2006 14:21:59 -0000 1.1
+++ openldap23.patch 8 Jan 2007 00:51:13 -0000 1.2
@@ -1,36 +1,35 @@
-diff -uNr openldap-2.2.26/include/ldap.h openldap-2.2.26-new/include/ldap.h
---- openldap-2.2.26/include/ldap.h 2005-01-20 12:00:58.000000000 -0500
-+++ openldap-2.2.26-new/include/ldap.h 2005-08-29 14:13:15.000000000 -0400
-@@ -2097,5 +2097,26 @@
+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)
++#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 *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 *ld,
++ LDAPMessage *res,
++ struct berval *challenge));
+
LDAP_END_DECL
#endif /* _LDAP_H */
-diff -uNr openldap-2.2.26/libraries/libldap/Makefile.in
openldap-2.2.26-new/libraries/libldap/Makefile.in
---- openldap-2.2.26/libraries/libldap/Makefile.in 2005-01-20
12:01:01.000000000 -0500
-+++ openldap-2.2.26-new/libraries/libldap/Makefile.in 2005-08-29
14:13:15.000000000 -0400
+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 \
@@ -84,131 +83,149 @@
+
+int
+ldap_ntlm_bind(
-+ LDAP *ld,
-+ LDAP_CONST char *dn,
-+ ber_tag_t tag,
-+ struct berval *cred,
-+ LDAPControl **sctrls,
-+ LDAPControl **cctrls,
-+ int *msgidp )
++ 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 );
++ BerElement *ber;
++ int rc;
++ ber_int_t id;
+
-+ assert( ld != NULL );
-+ assert( LDAP_VALID( ld ) );
-+ assert( msgidp != NULL );
++ Debug( LDAP_DEBUG_TRACE, "ldap_ntlm_bind\n", 0, 0, 0 );
+
-+ if( msgidp == NULL ) {
-+ ld->ld_errno = LDAP_PARAM_ERROR;
-+ return ld->ld_errno;
-+ }
++ assert( ld != NULL );
++ assert( LDAP_VALID( ld ) );
++ assert( msgidp != NULL );
+
-+ /* create a message to send */
-+ if ( (ber = ldap_alloc_ber_with_options( ld )) == NULL ) {
-+ ld->ld_errno = LDAP_NO_MEMORY;
-+ return ld->ld_errno;
-+ }
++ if( msgidp == NULL ) {
++ ld->ld_errno = LDAP_PARAM_ERROR;
++ return ld->ld_errno;
++ }
+
-+ assert( LBER_VALID( ber ) );
++ /* create a message to send */
++ if ( (ber = ldap_alloc_ber_with_options( ld )) == NULL ) {
++ ld->ld_errno = LDAP_NO_MEMORY;
++ return ld->ld_errno;
++ }
+
-+ LDAP_NEXT_MSGID( ld, id );
-+ rc = ber_printf( ber, "{it{istON}" /*}*/,
-+ id, LDAP_REQ_BIND,
-+ ld->ld_version, dn, tag,
-+ cred );
++ assert( LBER_VALID( ber ) );
+
-+ /* Put Server Controls */
-+ if( ldap_int_put_controls( ld, sctrls, ber ) != LDAP_SUCCESS ) {
-+ ber_free( ber, 1 );
-+ return ld->ld_errno;
-+ }
++ LDAP_NEXT_MSGID( ld, id );
++ rc = ber_printf( ber, "{it{istON}" /*}*/,
++ id, LDAP_REQ_BIND,
++ ld->ld_version, dn, tag,
++ cred );
+
-+ if ( ber_printf( ber, /*{*/ "N}" ) == -1 ) {
-+ ld->ld_errno = LDAP_ENCODING_ERROR;
-+ ber_free( ber, 1 );
-+ return ld->ld_errno;
-+ }
++ /* 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 );
++ /* send the message */
++ *msgidp = ldap_send_initial_request( ld, LDAP_REQ_BIND, dn, ber, id );
+
-+ if(*msgidp < 0)
-+ return ld->ld_errno;
++ if(*msgidp < 0)
++ return ld->ld_errno;
+
-+ return LDAP_SUCCESS;
++ return LDAP_SUCCESS;
+}
+
+int
+ldap_parse_ntlm_bind_result(
-+ LDAP *ld,
-+ LDAPMessage *res,
-+ struct berval *challenge)
++ LDAP *ld,
++ LDAPMessage *res,
++ struct berval *challenge)
+{
-+ ber_int_t errcode;
-+ ber_tag_t tag;
-+ BerElement *ber;
-+ ber_len_t len;
++ 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 );
++ Debug( LDAP_DEBUG_TRACE, "ldap_parse_ntlm_bind_result\n", 0, 0, 0 );
+
-+ assert( ld != NULL );
-+ assert( LDAP_VALID( ld ) );
-+ assert( res != NULL );
++ assert( ld != NULL );
++ assert( LDAP_VALID( ld ) );
++ assert( res != NULL );
+
-+ if ( ld == NULL || res == NULL ) {
-+ return LDAP_PARAM_ERROR;
-+ }
++ 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( 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;
-+ }
++ 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 */
++ /* parse results */
+
-+ ber = ber_dup( res->lm_ber );
++ ber = ber_dup( res->lm_ber );
+
-+ if( ber == NULL ) {
-+ ld->ld_errno = LDAP_NO_MEMORY;
-+ return ld->ld_errno;
-+ }
++ 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 );
++ 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;
-+ }
++ if( tag == LBER_ERROR ) {
++ ld->ld_errno = LDAP_DECODING_ERROR;
++ return ld->ld_errno;
++ }
+
-+ ld->ld_errno = errcode;
++ ld->ld_errno = errcode;
+
-+ return( ld->ld_errno );
++ return( ld->ld_errno );
+}
-diff -uNr openldap-2.2.26/libraries/libldap_r/Makefile.in
openldap-2.2.26-new/libraries/libldap_r/Makefile.in
---- openldap-2.2.26/libraries/libldap_r/Makefile.in 2005-01-20
12:01:02.000000000 -0500
-+++ openldap-2.2.26-new/libraries/libldap_r/Makefile.in 2005-08-29
14:13:15.000000000 -0400
++
+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) $(SECURITY_LIBS) $(AC_LIBS)
++UNIX_LINK_LIBS = $(LDAP_LIBLBER_LA) $(AC_LIBS) $(SECURITY_LIBS)
$(LTHREAD_LIBS)
.links : Makefile
@for i in $(XXSRCS); do \
Index: openldap23.info
===================================================================
RCS file: /cvsroot/fink/dists/10.4/stable/main/finkinfo/libs/openldap23.info,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- openldap23.info 31 Oct 2006 17:50:28 -0000 1.2
+++ openldap23.info 8 Jan 2007 00:51:13 -0000 1.3
@@ -1,5 +1,5 @@
Package: openldap23
-Version: 2.3.24
+Version: 2.3.27
Revision: 10
Maintainer: None <fink-devel@lists.sourceforge.net>
Source: mirror:custom:openldap-release/openldap-%v.tgz
@@ -18,7 +18,7 @@
nam-US: ftp://ftp.OpenLDAP.org/pub/OpenLDAP/
sam-BR: ftp://ftp.matrix.com.br/pub/openldap/
<<
-Source-MD5: 3e58de30abc959ec88730123cecdb6d1
+Source-MD5: 0fbae4e9279aaa586adcd9f19b66a5ed
Depends: %N-shlibs (= %v-%r), daemonic
BuildDepends: system-openssl-dev, db44-aes (>= 4.4.16-1001) | db44 (>=
4.4.16-1001), cyrus-sasl2-dev (>= 2.1.21-3), readline5 (>= 5.0-1004)
Conflicts: openldap-ssl
@@ -29,7 +29,7 @@
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
+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.4.la|-ldb-4.4|g' %i/lib/libldap.la
@@ -94,6 +94,10 @@
'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.
<<
-------------------------------------------------------------------------
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
Fink-commits@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/fink-commits
