diff options
Diffstat (limited to 'net/py-ldap2')
| -rw-r--r-- | net/py-ldap2/Makefile | 27 | ||||
| -rw-r--r-- | net/py-ldap2/distinfo | 1 | ||||
| -rw-r--r-- | net/py-ldap2/files/patch-Makefile.in | 11 | ||||
| -rw-r--r-- | net/py-ldap2/files/patch-constants.c | 156 | ||||
| -rw-r--r-- | net/py-ldap2/files/patch-errors.c | 115 | ||||
| -rw-r--r-- | net/py-ldap2/files/patch-message.c | 43 | ||||
| -rw-r--r-- | net/py-ldap2/pkg-comment | 1 | ||||
| -rw-r--r-- | net/py-ldap2/pkg-descr | 13 | ||||
| -rw-r--r-- | net/py-ldap2/pkg-plist | 12 |
9 files changed, 0 insertions, 379 deletions
diff --git a/net/py-ldap2/Makefile b/net/py-ldap2/Makefile deleted file mode 100644 index b4f6c00a6caa..000000000000 --- a/net/py-ldap2/Makefile +++ /dev/null @@ -1,27 +0,0 @@ -# New ports collection makefile for: ldapmodule -# Date created: 05.Jul 2000 -# Whom: dirk.meyer@dinoex.sub.org -# -# $FreeBSD$ - -PORTNAME= ldapmodule -PORTVERSION= 1.10alpha3 -PORTREVISION= 3 -CATEGORIES= net -MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} -MASTER_SITE_SUBDIR= python-ldap -DISTNAME= python-ldap-${PORTVERSION}-src - -MAINTAINER= dinoex@FreeBSD.org - -LIB_DEPENDS= ldap.1:${PORTSDIR}/net/openldap -BUILD_DEPENDS= python:${PORTSDIR}/lang/python -RUN_DEPENDS= python:${PORTSDIR}/lang/python - -# BROKEN for python 2.2 -PYTHON_VERSION= python2.1 -GNU_CONFIGURE= yes -CONFIGURE_ARGS+=--with-ldap=${LOCALBASE} -WRKSRC= ${WRKDIR}/${DISTNAME:S=-src==} - -.include <bsd.port.mk> diff --git a/net/py-ldap2/distinfo b/net/py-ldap2/distinfo deleted file mode 100644 index 07ac0213610a..000000000000 --- a/net/py-ldap2/distinfo +++ /dev/null @@ -1 +0,0 @@ -MD5 (python-ldap-1.10alpha3-src.tar.gz) = a4e95cf9edec1b7952a5decbc8080372 diff --git a/net/py-ldap2/files/patch-Makefile.in b/net/py-ldap2/files/patch-Makefile.in deleted file mode 100644 index 17e51a4a0584..000000000000 --- a/net/py-ldap2/files/patch-Makefile.in +++ /dev/null @@ -1,11 +0,0 @@ ---- Makefile.in.orig Wed May 23 09:11:33 2001 -+++ Makefile.in Wed May 23 09:12:10 2001 -@@ -26,6 +26,8 @@ - $(INSTALL_DIR) $(DESTDIR)$(LIBDEST)/site-packages/python-ldap - $(INSTALL_DATA) $(srcdir)/Misc/ldap.pth \ - $(DESTDIR)$(LIBDEST)/site-packages/ldap.pth -+ $(INSTALL_DATA) $(srcdir)/Modules/_ldapmodule.so \ -+ $(DESTDIR)$(LIBDEST)/site-packages/_ldapmodule.so - for f in $(srcdir)/Lib/*.py; do \ - $(INSTALL_DATA) $$f $(DESTDIR)$(LIBDEST)/site-packages/python-ldap/;\ - done diff --git a/net/py-ldap2/files/patch-constants.c b/net/py-ldap2/files/patch-constants.c deleted file mode 100644 index 65b496acb045..000000000000 --- a/net/py-ldap2/files/patch-constants.c +++ /dev/null @@ -1,156 +0,0 @@ ---- Modules/constants.c.orig Sun Aug 13 16:00:59 2000 -+++ Modules/constants.c Mon Nov 6 11:02:43 2000 -@@ -66,7 +66,6 @@ - add_int(d,VERSION1); - add_int(d,VERSION2); - add_int(d,VERSION); -- add_int(d,MAX_ATTR_LEN); - add_int(d,TAG_MESSAGE); - add_int(d,TAG_MSGID); - -@@ -79,9 +78,27 @@ - add_int(d,REQ_MODRDN); - add_int(d,REQ_COMPARE); - add_int(d,REQ_ABANDON); -+ -+#if defined(LDAP_API_VERSION) -+ /* OpenLDAPv2 */ -+ add_int(d,VERSION3); -+ add_int(d,VERSION_MIN); -+ add_int(d,VERSION_MAX); -+ add_int(d,TAG_LDAPDN); -+ add_int(d,TAG_LDAPCRED); -+ add_int(d,TAG_CONTROLS); -+ add_int(d,TAG_REFERRAL); -+ -+ add_int(d,REQ_MODDN); -+ add_int(d,REQ_RENAME); -+#else -+ /* OpenLDAPv1 */ -+ add_int(d,MAX_ATTR_LEN); -+ - add_int(d,REQ_UNBIND_30); - add_int(d,REQ_DELETE_30); - add_int(d,REQ_ABANDON_30); -+#endif - - /* reversibles */ - -@@ -89,6 +106,14 @@ - PyDict_SetItem( reverse, zero, Py_None ); - Py_DECREF( zero ); - -+#if defined(LDAP_API_VERSION) -+ /* OpenLDAPv2 */ -+ add_int_r(d,RES_SEARCH_REFERENCE); -+ add_int_r(d,RES_MODDN); /* Aliases for RES_MODRDN; */ -+ add_int_r(d,RES_RENAME); /* init them before the main name */ -+ add_int(d,RES_UNSOLICITED); -+#endif -+ - add_int_r(d,RES_BIND); - add_int_r(d,RES_SEARCH_ENTRY); - add_int_r(d,RES_SEARCH_RESULT); -@@ -106,9 +131,6 @@ - add_int(d,AUTH_KRBV4); - add_int(d,AUTH_KRBV41); - add_int(d,AUTH_KRBV42); -- add_int(d,AUTH_SIMPLE_30); -- add_int(d,AUTH_KRBV41_30); -- add_int(d,AUTH_KRBV42_30); - add_int(d,FILTER_AND); - add_int(d,FILTER_OR); - add_int(d,FILTER_NOT); -@@ -118,13 +140,9 @@ - add_int(d,FILTER_LE); - add_int(d,FILTER_PRESENT); - add_int(d,FILTER_APPROX); -- add_int(d,FILTER_PRESENT_30); - add_int(d,SUBSTRING_INITIAL); - add_int(d,SUBSTRING_ANY); - add_int(d,SUBSTRING_FINAL); -- add_int(d,SUBSTRING_INITIAL_30); -- add_int(d,SUBSTRING_ANY_30); -- add_int(d,SUBSTRING_FINAL_30); - add_int(d,SCOPE_BASE); - add_int(d,SCOPE_ONELEVEL); - add_int(d,SCOPE_SUBTREE); -@@ -133,6 +151,16 @@ - add_int(d,MOD_REPLACE); - add_int(d,MOD_BVALUES); - -+#if !defined(LDAP_API_VERSION) -+ /* OpenLDAPv1 */ -+ add_int(d,AUTH_SIMPLE_30); -+ add_int(d,AUTH_KRBV41_30); -+ add_int(d,AUTH_KRBV42_30); -+ add_int(d,FILTER_PRESENT_30); -+ add_int(d,SUBSTRING_INITIAL_30); -+ add_int(d,SUBSTRING_ANY_30); -+ add_int(d,SUBSTRING_FINAL_30); -+ - /* (errors.c contains the error constants) */ - - add_int(d,DEFAULT_REFHOPLIMIT); -@@ -145,15 +173,36 @@ - #ifdef LDAP_CACHE_OPT_CACHEALLERRS - add_int(d,CACHE_OPT_CACHEALLERRS); - #endif -+ -+#endif /* !defined(LDAP_API_VERSION) */ - add_int(d,FILT_MAXSIZ); - add_int(d,DEREF_NEVER); - add_int(d,DEREF_SEARCHING); - add_int(d,DEREF_FINDING); - add_int(d,DEREF_ALWAYS); - add_int(d,NO_LIMIT); -+#if defined(LDAP_API_VERSION) -+ /* OpenLDAPv2 */ -+ add_int(d,OPT_API_INFO); -+ add_int(d,OPT_DESC); -+ add_int(d,OPT_DEREF); -+ add_int(d,OPT_SIZELIMIT); -+ add_int(d,OPT_TIMELIMIT); -+ add_int(d,OPT_PROTOCOL_VERSION); -+ add_int(d,OPT_SERVER_CONTROLS); -+ add_int(d,OPT_CLIENT_CONTROLS); -+ add_int(d,OPT_API_FEATURE_INFO); -+ add_int(d,OPT_HOST_NAME); -+ add_int(d,OPT_ERROR_NUMBER); -+ add_int(d,OPT_ERROR_STRING); -+ add_int(d,OPT_MATCHED_DN); -+ add_int(d,OPT_PRIVATE_EXTENSION_BASE); -+#else -+ /* OpenLDAPv1 */ - #ifdef LDAP_OPT_DNS - add_int(d,OPT_DNS); - #endif -+#endif /* defined(LDAP_API_VERSION) */ - #ifdef LDAP_OPT_REFERRALS - add_int(d,OPT_REFERRALS); - #endif -@@ -161,9 +210,24 @@ - - /* XXX - these belong in errors.c */ - -+#if defined(LDAP_API_VERSION) -+ /* OpenLDAPv2 */ -+ add_int(d,URL_SUCCESS); -+ add_int(d,URL_ERR_PARAM); -+ add_int(d,URL_ERR_BADSCHEME); -+ add_int(d,URL_ERR_BADENCLOSURE); -+ add_int(d,URL_ERR_BADURL); -+ add_int(d,URL_ERR_BADHOST); -+ add_int(d,URL_ERR_BADATTRS); -+ add_int(d,URL_ERR_BADSCOPE); -+ add_int(d,URL_ERR_BADFILTER); -+ add_int(d,URL_ERR_BADEXTS); -+#else -+ /* OpenLDAPv1 */ - add_int(d,URL_ERR_NOTLDAP); - add_int(d,URL_ERR_NODN); - add_int(d,URL_ERR_BADSCOPE); -+#endif /* defined(LDAP_API_VERSION) */ - add_int(d,URL_ERR_MEM); - - /* author */ diff --git a/net/py-ldap2/files/patch-errors.c b/net/py-ldap2/files/patch-errors.c deleted file mode 100644 index 86d6baa60aba..000000000000 --- a/net/py-ldap2/files/patch-errors.c +++ /dev/null @@ -1,115 +0,0 @@ ---- Modules/errors.c.orig Wed Nov 15 10:41:35 2000 -+++ Modules/errors.c Wed Nov 15 14:17:15 2000 -@@ -17,7 +17,13 @@ - - /* list of error objects */ - -+#if defined(LDAP_API_VERSION) -+/* OpenLDAPv2 */ -+#define NUM_LDAP_ERRORS LDAP_REFERRAL_LIMIT_EXCEEDED+1 -+#else -+/* OpenLDAPv1 */ - #define NUM_LDAP_ERRORS LDAP_NO_MEMORY+1 -+#endif - static PyObject* - errobjects[ NUM_LDAP_ERRORS ]; - -@@ -30,21 +36,26 @@ - PyErr_SetFromErrno( LDAPexception_class ); - return NULL; - } --#ifdef LDAP_TYPE_IS_OPAQUE -+#if defined(LDAP_TYPE_IS_OPAQUE) && !defined(LDAP_API_VERSION) - else { - PyErr_SetString(LDAPexception_class, - "unknown error (C API does not expose error)"); - return NULL; - } --#else -+#else /* defined(LDAP_TYPE_IS_OPAQUE) && !defined(LDAP_API_VERSION) */ - else { - int errnum; - PyObject *errobj; - PyObject *info; - PyObject *str; - -+#if defined(LDAP_API_VERSION) -+ char *matched, *error; -+ if (ldap_get_option(l, LDAP_OPT_ERROR_NUMBER, &errnum) < 0) -+#else - errnum = l->ld_errno; - if (errnum<0 || errnum>=NUM_LDAP_ERRORS) -+#endif /* defined(LDAP_API_VERSION) */ - errobj = LDAPexception_class; /* unknown error XXX */ - else - errobj = errobjects[errnum]; -@@ -61,6 +72,35 @@ - PyDict_SetItemString( info, "desc", str ); - Py_XDECREF(str); - -+#if defined(LDAP_API_VERSION) -+ if (ldap_get_option(l, LDAP_OPT_MATCHED_DN, &matched) >= 0 -+ && matched != NULL) { -+ if (*matched != '\0') { -+ str = PyString_FromString(matched); -+ if (str) -+ PyDict_SetItemString( info, "matched", str ); -+ Py_XDECREF(str); -+ } -+ ldap_memfree(matched); -+ } -+ -+ if (errnum == LDAP_REFERRAL) { -+ str = PyString_FromString(msg); -+ if (str) -+ PyDict_SetItemString( info, "info", str ); -+ Py_XDECREF(str); -+ } else if (ldap_get_option(l, LDAP_OPT_ERROR_STRING, &error) >= 0 -+ && error != NULL) { -+ if (error != '\0') { -+ str = PyString_FromString(error); -+ if (str) -+ PyDict_SetItemString( info, "info", str ); -+ Py_XDECREF(str); -+ } -+ ldap_memfree(error); -+ } -+ -+#else /* defined(LDAP_API_VERSION) */ - if (l->ld_matched != NULL && *l->ld_matched != '\0') - { - str = PyString_FromString(l->ld_matched); -@@ -76,11 +116,12 @@ - PyDict_SetItemString( info, "info", str ); - Py_XDECREF(str); - } -+#endif /* defined(LDAP_API_VERSION) */ - PyErr_SetObject( errobj, info ); - Py_DECREF(info); - return NULL; - } --#endif -+#endif /* defined(LDAP_TYPE_IS_OPAQUE) && !defined(LDAP_API_VERSION) */ - } - - -@@ -163,4 +204,19 @@ - seterrobj(USER_CANCELLED); - seterrobj(PARAM_ERROR); - seterrobj(NO_MEMORY); -+#if defined(LDAP_API_VERSION) -+ seterrobj(REFERRAL); -+ seterrobj(ADMINLIMIT_EXCEEDED); -+ seterrobj(UNAVAILABLE_CRITICAL_EXTENSION); -+ seterrobj(CONFIDENTIALITY_REQUIRED); -+ seterrobj(SASL_BIND_IN_PROGRESS); -+ seterrobj(AFFECTS_MULTIPLE_DSAS); -+ seterrobj(CONNECT_ERROR); -+ seterrobj(NOT_SUPPORTED); -+ seterrobj(CONTROL_NOT_FOUND); -+ seterrobj(NO_RESULTS_RETURNED); -+ seterrobj(MORE_RESULTS_TO_RETURN); -+ seterrobj(CLIENT_LOOP); -+ seterrobj(REFERRAL_LIMIT_EXCEEDED); -+#endif - } diff --git a/net/py-ldap2/files/patch-message.c b/net/py-ldap2/files/patch-message.c deleted file mode 100644 index 1b7111a84ae2..000000000000 --- a/net/py-ldap2/files/patch-message.c +++ /dev/null @@ -1,43 +0,0 @@ ---- Modules/message.c.orig Wed Nov 15 10:41:35 2000 -+++ Modules/message.c Wed Nov 15 16:51:18 2000 -@@ -114,6 +114,40 @@ - PyList_Append(result, entrytuple); - Py_DECREF(entrytuple); - } -+#if defined(LDAP_API_VERSION) -+ for(entry = ldap_first_reference(ld,m); -+ entry != NULL; -+ entry = ldap_next_reference(ld,entry)) -+ { -+ char **refs = NULL; -+ PyObject* entrytuple; -+ PyObject* reflist = PyList_New(0); -+ -+ if (reflist == NULL) { -+ Py_DECREF(result); -+ ldap_msgfree( m ); -+ return NULL; -+ } -+ if (ldap_parse_reference(ld, entry, &refs, NULL, 0) != LDAP_SUCCESS) { -+ Py_DECREF(result); -+ ldap_msgfree( m ); -+ return LDAPerror( ld, "ldap_parse_reference" ); -+ } -+ if (refs) { -+ int i; -+ for (i=0; refs[i] != NULL; i++) { -+ PyObject *refstr = PyString_FromString(refs[i]); -+ PyList_Append(reflist, refstr); -+ Py_DECREF(refstr); -+ } -+ ber_memvfree( (void **) refs ); -+ } -+ entrytuple = Py_BuildValue("(sO)", NULL, reflist); -+ Py_DECREF(reflist); -+ PyList_Append(result, entrytuple); -+ Py_DECREF(entrytuple); -+ } -+#endif - ldap_msgfree( m ); - return result; - } diff --git a/net/py-ldap2/pkg-comment b/net/py-ldap2/pkg-comment deleted file mode 100644 index 74fb5d0734c8..000000000000 --- a/net/py-ldap2/pkg-comment +++ /dev/null @@ -1 +0,0 @@ -An LDAP module for python diff --git a/net/py-ldap2/pkg-descr b/net/py-ldap2/pkg-descr deleted file mode 100644 index 3b07d96df9fa..000000000000 --- a/net/py-ldap2/pkg-descr +++ /dev/null @@ -1,13 +0,0 @@ - - LDAP Wrapper for Python - - This module provides an LDAP API to Python in the spirit of RFC1823. - -Some cool things people have done with ldapmodule - - * LANL phone book (source) - * Michael Stroeder's web2ldap (previously ldap-client-cgi.py). - * LDAP support for Zope (see also Zope) - -WWW: http://python-ldap.sourceforge.net/ -FTP: ftp://python-ldap.sourceforge.net/pub/python-ldap/ diff --git a/net/py-ldap2/pkg-plist b/net/py-ldap2/pkg-plist deleted file mode 100644 index a9457c11bd86..000000000000 --- a/net/py-ldap2/pkg-plist +++ /dev/null @@ -1,12 +0,0 @@ -lib/%%PYTHON_VERSION%%/site-packages/python-ldap/ldap.py -lib/%%PYTHON_VERSION%%/site-packages/python-ldap/ldap.pyc -lib/%%PYTHON_VERSION%%/site-packages/python-ldap/ldap.pyo -lib/%%PYTHON_VERSION%%/site-packages/python-ldap/ldif.py -lib/%%PYTHON_VERSION%%/site-packages/python-ldap/ldif.pyc -lib/%%PYTHON_VERSION%%/site-packages/python-ldap/ldif.pyo -lib/%%PYTHON_VERSION%%/site-packages/python-ldap/perldap.py -lib/%%PYTHON_VERSION%%/site-packages/python-ldap/perldap.pyc -lib/%%PYTHON_VERSION%%/site-packages/python-ldap/perldap.pyo -lib/%%PYTHON_VERSION%%/site-packages/_ldapmodule.so -lib/%%PYTHON_VERSION%%/site-packages/ldap.pth -@dirrm lib/%%PYTHON_VERSION%%/site-packages/python-ldap |