databases/py-ldap 2.0.6

[Marc Balmer <marc_(_at_)_msys_(_dot_)_ch>]

Hi

Attached is an update to databases/py-ldap which brings this port to 
version 2.0.6.

comments? ok?

- Marc
diff -x CVS /usr/ports/databases/py-ldap/Makefile py-ldap/Makefile
--- /usr/ports/databases/py-ldap/Makefile	Mon Nov  1 07:52:00 2004
+++ py-ldap/Makefile	Sat Dec  4 11:56:04 2004
@@ -1,18 +1,17 @@
-# $OpenBSD: Makefile,v 1.5 2004/09/14 23:29:07 espie Exp $
+# $openBSD: Makefile,v 1.5 2004/09/14 23:29:07 espie Exp $
 
 SHARED_ONLY=	Yes
 
 COMMENT=	"LDAP client API for Python"
-COMMENT-examples=	"LDAP client API for Python, samples"
 
-VERSION=	2.0.0pre19
+VERSION=	2.0.6
 DISTNAME=	python-ldap-${VERSION}
 PKGNAME=	py-ldap-${VERSION}
 CATEGORIES=	databases
 
 HOMEPAGE=	http://python-ldap.sourceforge.net/
 
-MAINTAINER=	Marc Balmer <marc_(_at_)_msys_(_dot_)_ch>
+MAINTAINER=	Marc Balmer <mbalmer_(_at_)_openbsd_(_dot_)_org>
 
 # Python
 PERMIT_PACKAGE_FTP=	Yes
@@ -22,20 +21,19 @@
 
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=python-ldap/}
 
-FLAVORS=	py2.1 py2.2 py2.3
-FLAVOR?=	py2.1
+FLAVORS=	sasl
+FLAVOR?=
 
-MODULES=	lang/python
+LIB_DEPENDS=	ldap_r,lber::databases/openldap
 
-.if ${FLAVOR:L} == "py2.1" || ${FLAVOR:L} == "py2.2" || ${FLAVOR:L} == "py2.3"
-MODPY_VERSION=	${FLAVOR:L:S/py//}
+.if ${FLAVOR:L} == "sasl"
+PATCH_LIST=	patch-sasl-*
+LIB_DEPENDS+=	sasl2::security/cyrus-sasl2
 .else
-ERRORS+=	"Fatal: Conflicting flavor: ${FLAVOR}"
+PATCH_LIST=	patch-nosasl-*
 .endif
-MULTI_PACKAGES=-examples
-FULLPKGNAME-examples=py-ldap-examples-${VERSION}
 
-LIB_DEPENDS=	ldap_r,lber::databases/openldap
+MODULES=	lang/python
 
 EXAMPLESDIR=	${PREFIX}/share/examples/py-ldap
 
diff -x CVS /usr/ports/databases/py-ldap/distinfo py-ldap/distinfo
--- /usr/ports/databases/py-ldap/distinfo	Sun Mar  7 09:27:16 2004
+++ py-ldap/distinfo	Sat Dec  4 11:56:12 2004
@@ -1,3 +1,3 @@
-MD5 (python-ldap-2.0.0pre19.tar.gz) = d6a5ad79695dd0ddeac362b1428e2c29
-RMD160 (python-ldap-2.0.0pre19.tar.gz) = 8421bf0eccc4ee6819d77471f66747ca479cce9c
-SHA1 (python-ldap-2.0.0pre19.tar.gz) = 4ca271bb446dcb8db28aceb405e7d7b27b1d62f5
+MD5 (python-ldap-2.0.6.tar.gz) = 59fd9345a77451b7749a28a458406695
+RMD160 (python-ldap-2.0.6.tar.gz) = f0481226536ebd7b7d119f6cbb597cb99358f0e8
+SHA1 (python-ldap-2.0.6.tar.gz) = cebaaf1283c578968160411feac040baf3e44671
diff -x CVS /usr/ports/databases/py-ldap/patches/patch-Modules_ldapmodule_c py-ldap/patches/patch-Modules_ldapmodule_c
--- /usr/ports/databases/py-ldap/patches/patch-Modules_ldapmodule_c	Sat Nov  1 16:24:06 2003
+++ py-ldap/patches/patch-Modules_ldapmodule_c	Thu Jan  1 01:00:00 1970
@@ -1,23 +0,0 @@
---- Modules/ldapmodule.c.orig	Tue Jul  2 20:00:00 2002
-+++ Modules/ldapmodule.c	Tue Sep 23 06:44:49 2003
-@@ -13,6 +13,8 @@
- 
- #include "LDAPObject.h"
- 
-+#include <dlfcn.h>
-+
- DL_EXPORT(void) init_ldap(void);
- 
- /* dummy module methods */
-@@ -27,6 +29,11 @@
- init_ldap()
- {
- 	PyObject *m, *d;
-+
-+	/* Force loading of LDAP and LBER libraries */
-+
-+	dlopen("liblber.so", DL_LAZY);
-+	dlopen("libldap_r.so", DL_LAZY);
- 
- #if defined(WIN32) || defined(__CYGWIN__)
- 	/* See http://www.python.org/doc/FAQ.html#3.24 */
diff -x CVS /usr/ports/databases/py-ldap/patches/patch-nosasl-setup_cfg py-ldap/patches/patch-nosasl-setup_cfg
--- /usr/ports/databases/py-ldap/patches/patch-nosasl-setup_cfg	Thu Jan  1 01:00:00 1970
+++ py-ldap/patches/patch-nosasl-setup_cfg	Mon Nov 22 21:59:18 2004
@@ -0,0 +1,21 @@
+--- setup.cfg.orig	Wed Oct 13 09:17:34 2004
++++ setup.cfg	Mon Nov 22 21:51:41 2004
+@@ -6,9 +6,6 @@
+ # Section for compiling the C extension module
+ # for wrapping OpenLDAP 2 libs
+ 
+-library_dirs = /usr/local/openldap-OPENLDAP_REL_ENG_2_2/lib /usr/local/sasl/lib
+-include_dirs = /usr/local/openldap-OPENLDAP_REL_ENG_2_2/include /usr/local/sasl/include/sasl /usr/include/sasl
+-
+ extra_compile_args = 
+ extra_objects =
+ 
+@@ -16,7 +13,7 @@ extra_objects =
+ # Support for StartTLS/LDAPS, SASL bind and reentrant libldap_r.
+ # This needs recent OpenLDAP 2.0.26+ or 2.1.3+ built with
+ # ./configure --with-cyrus-sasl --with-tls
+-libs = ldap_r lber ssl crypto sasl2
++libs = ldap_r lber
+ 
+ [install]
+ # Installation options
diff -x CVS /usr/ports/databases/py-ldap/patches/patch-nosasl-setup_py py-ldap/patches/patch-nosasl-setup_py
--- /usr/ports/databases/py-ldap/patches/patch-nosasl-setup_py	Thu Jan  1 01:00:00 1970
+++ py-ldap/patches/patch-nosasl-setup_py	Mon Nov 22 22:00:47 2004
@@ -0,0 +1,19 @@
+--- setup.py.orig	Wed Oct 27 00:29:10 2004
++++ setup.py	Mon Nov 22 22:00:29 2004
+@@ -27,8 +27,14 @@ f.close()
+ 
+ #-- A class describing the features and requirements of OpenLDAP 2.0
+ class OpenLDAP2:
+-	library_dirs = []
+-	include_dirs = []
++	localbase = os.getenv('LOCALBASE')
++	if localbase == None:
++		print "LOCALBASE not set"
++		sys.exit(1)
++
++	library_dirs = ['%s/lib' % localbase]
++	include_dirs = ['%s/include' % localbase]
++
+ 	extra_compile_args = []
+ 	extra_link_args = []
+ 	extra_objects = []
diff -x CVS /usr/ports/databases/py-ldap/patches/patch-sasl-setup_cfg py-ldap/patches/patch-sasl-setup_cfg
--- /usr/ports/databases/py-ldap/patches/patch-sasl-setup_cfg	Thu Jan  1 01:00:00 1970
+++ py-ldap/patches/patch-sasl-setup_cfg	Mon Nov  1 16:27:27 2004
@@ -0,0 +1,12 @@
+--- setup.cfg.orig	Mon Nov  1 15:37:24 2004
++++ setup.cfg	Mon Nov  1 15:37:47 2004
+@@ -6,9 +6,6 @@
+ # Section for compiling the C extension module
+ # for wrapping OpenLDAP 2 libs
+ 
+-library_dirs = /usr/local/openldap-OPENLDAP_REL_ENG_2_2/lib /usr/local/sasl/lib
+-include_dirs = /usr/local/openldap-OPENLDAP_REL_ENG_2_2/include /usr/local/sasl/include/sasl /usr/include/sasl
+-
+ extra_compile_args = 
+ extra_objects =
+ 
diff -x CVS /usr/ports/databases/py-ldap/patches/patch-sasl-setup_py py-ldap/patches/patch-sasl-setup_py
--- /usr/ports/databases/py-ldap/patches/patch-sasl-setup_py	Thu Jan  1 01:00:00 1970
+++ py-ldap/patches/patch-sasl-setup_py	Mon Nov 22 22:04:36 2004
@@ -0,0 +1,19 @@
+--- setup.py.orig	Wed Oct 27 00:29:10 2004
++++ setup.py	Mon Nov 22 22:04:13 2004
+@@ -27,8 +27,14 @@ f.close()
+ 
+ #-- A class describing the features and requirements of OpenLDAP 2.0
+ class OpenLDAP2:
+-	library_dirs = []
+-	include_dirs = []
++	localbase = os.getenv('LOCALBASE')
++	if localbase == None:
++		print "LOCALBASE not set"
++		sys.exit(1)
++
++	library_dirs = ['%s/lib' % localbase]
++	include_dirs = ['%s/include' % localbase, '%s/include/sasl' % localbase]
++
+ 	extra_compile_args = []
+ 	extra_link_args = []
+ 	extra_objects = []
diff -x CVS /usr/ports/databases/py-ldap/patches/patch-setup_cfg py-ldap/patches/patch-setup_cfg
--- /usr/ports/databases/py-ldap/patches/patch-setup_cfg	Sat Nov  1 16:24:06 2003
+++ py-ldap/patches/patch-setup_cfg	Thu Jan  1 01:00:00 1970
@@ -1,23 +0,0 @@
---- setup.cfg.orig	Thu Aug 14 12:31:34 2003
-+++ setup.cfg	Thu Oct  9 21:31:54 2003
-@@ -7,8 +7,8 @@
- # for wrapping OpenLDAP 2 libs
- [_ldap]
- 
--library_dirs = /usr/local/openldap-REL_ENG_2_1/lib
--include_dirs = /usr/local/openldap-REL_ENG_2_1/include /usr/include/sasl
-+#library_dirs = /usr/local/openldap-REL_ENG_2_1/lib
-+#include_dirs = /usr/local/openldap-REL_ENG_2_1/include /usr/include/sasl
- 
- extra_compile_args = 
- extra_objects = 
-@@ -25,7 +25,8 @@
- # Support for StartTLS/LDAPS, SASL bind and reentrant libldap_r.
- # This needs recent OpenLDAP 2.0.26+ or 2.1.3+ built with
- # ./configure --with-cyrus-sasl --with-tls
--libs = ldap_r lber sasl2 ssl crypto
-+#libs = ldap_r lber sasl2 ssl crypto
-+libs = ldap_r lber
- 
- # Installation options
- [install]
diff -x CVS /usr/ports/databases/py-ldap/patches/patch-setup_py py-ldap/patches/patch-setup_py
--- /usr/ports/databases/py-ldap/patches/patch-setup_py	Sat Nov  1 16:24:06 2003
+++ py-ldap/patches/patch-setup_py	Thu Jan  1 01:00:00 1970
@@ -1,18 +0,0 @@
---- setup.py.orig	Wed Aug 20 22:27:10 2003
-+++ setup.py	Thu Oct  9 21:34:56 2003
-@@ -27,8 +27,13 @@
- 
- #-- A class describing the features and requirements of OpenLDAP 2.0
- class OpenLDAP2:
--	library_dirs = []
--	include_dirs = []
-+        localbase = os.getenv('LOCALBASE')
-+        if localbase == None:
-+                localbase = '/usr/local'
-+
-+        library_dirs =  ['%s/lib' % localbase]
-+        include_dirs =  ['%s/include' % localbase]
-+ 
- 	extra_compile_args = []
- 	extra_link_args = []
- 	extra_objects = []
diff -x CVS /usr/ports/databases/py-ldap/pkg/DESCR py-ldap/pkg/DESCR
--- /usr/ports/databases/py-ldap/pkg/DESCR	Sat Nov  1 16:24:06 2003
+++ py-ldap/pkg/DESCR	Mon Nov  1 16:30:30 2004
@@ -2,6 +2,8 @@
 directory servers from Python programs. Mainly it wraps the
 OpenLDAP 2.x libs for that purpose.
 
+Use the flavor "sasl" if you want sasl2 support. 
+
 Additionally the package contains modules for other LDAP-related
 stuff (e.g. processing LDIF, LDAPURLs, LDAPv3 sub-schema, etc.).
 
@@ -12,4 +14,3 @@
     l = ldap.open("my_ldap_server.my_domain")
     l.simple_bind_s("","")
     l.search_s("o=My Organisation, c=AU", ldap.SCOPE_SUBTREE, "objectclass=*")
-
diff -x CVS /usr/ports/databases/py-ldap/pkg/DESCR-examples py-ldap/pkg/DESCR-examples
--- /usr/ports/databases/py-ldap/pkg/DESCR-examples	Wed Sep 15 01:29:07 2004
+++ py-ldap/pkg/DESCR-examples	Thu Jan  1 01:00:00 1970
@@ -1,8 +0,0 @@
-python-ldap provides an object-oriented API to access LDAP
-directory servers from Python programs. Mainly it wraps the
-OpenLDAP 2.x libs for that purpose.
-
-Additionally the package contains modules for other LDAP-related
-stuff (e.g. processing LDIF, LDAPURLs, LDAPv3 sub-schema, etc.).
-
-Examples.
diff -x CVS /usr/ports/databases/py-ldap/pkg/PLIST py-ldap/pkg/PLIST
--- /usr/ports/databases/py-ldap/pkg/PLIST	Mon Nov  1 07:52:00 2004
+++ py-ldap/pkg/PLIST	Sat Dec  4 11:56:39 2004
@@ -1,4 +1,6 @@
-_(_at_)_comment $OpenBSD: PLIST,v 1.4 2004/09/14 23:29:07 espie Exp $
+_(_at_)_comment $OpenBSD$
+lib/python${MODPY_VERSION}/
+lib/python${MODPY_VERSION}/site-packages/
 lib/python${MODPY_VERSION}/site-packages/_ldap.so
 lib/python${MODPY_VERSION}/site-packages/dsml.py
 lib/python${MODPY_VERSION}/site-packages/dsml.pyc
@@ -47,3 +49,26 @@
 lib/python${MODPY_VERSION}/site-packages/ldif.py
 lib/python${MODPY_VERSION}/site-packages/ldif.pyc
 lib/python${MODPY_VERSION}/site-packages/ldif.pyo
+share/examples/py-ldap/
+share/examples/py-ldap/Demo/
+share/examples/py-ldap/Demo/Lib/
+share/examples/py-ldap/Demo/Lib/ldap/
+share/examples/py-ldap/Demo/Lib/ldap/res/
+share/examples/py-ldap/Demo/Lib/ldap/res/deltree.py
+share/examples/py-ldap/Demo/Lib/ldap/res/ldifwriter.py
+share/examples/py-ldap/Demo/Lib/ldap/res/sizelimit.py
+share/examples/py-ldap/Demo/Lib/ldapurl/
+share/examples/py-ldap/Demo/Lib/ldapurl/urlsearch.py
+share/examples/py-ldap/Demo/Lib/ldif/
+share/examples/py-ldap/Demo/Lib/ldif/ldifcopy.py
+share/examples/py-ldap/Demo/initialize.py
+share/examples/py-ldap/Demo/options.py
+share/examples/py-ldap/Demo/passwd_ext_op.py
+share/examples/py-ldap/Demo/pickle_ldapobject.py
+share/examples/py-ldap/Demo/reconnect.py
+share/examples/py-ldap/Demo/rename.py
+share/examples/py-ldap/Demo/sasl_bind.py
+share/examples/py-ldap/Demo/schema.py
+share/examples/py-ldap/Demo/schema_tree.py
+share/examples/py-ldap/Demo/simple.py
+share/examples/py-ldap/Demo/simplebrowse.py
diff -x CVS /usr/ports/databases/py-ldap/pkg/PLIST-examples py-ldap/pkg/PLIST-examples
--- /usr/ports/databases/py-ldap/pkg/PLIST-examples	Wed Sep 15 01:29:07 2004
+++ py-ldap/pkg/PLIST-examples	Thu Jan  1 01:00:00 1970
@@ -1,23 +0,0 @@
-_(_at_)_comment $OpenBSD: PLIST-examples,v 1.1 2004/09/14 23:29:07 espie Exp $
-share/examples/py-ldap/
-share/examples/py-ldap/Demo/
-share/examples/py-ldap/Demo/Lib/
-share/examples/py-ldap/Demo/Lib/ldap/
-share/examples/py-ldap/Demo/Lib/ldap/res/
-share/examples/py-ldap/Demo/Lib/ldap/res/deltree.py
-share/examples/py-ldap/Demo/Lib/ldap/res/ldifwriter.py
-share/examples/py-ldap/Demo/Lib/ldap/res/sizelimit.py
-share/examples/py-ldap/Demo/Lib/ldapurl/
-share/examples/py-ldap/Demo/Lib/ldapurl/urlsearch.py
-share/examples/py-ldap/Demo/Lib/ldif/
-share/examples/py-ldap/Demo/Lib/ldif/ldifcopy.py
-share/examples/py-ldap/Demo/initialize.py
-share/examples/py-ldap/Demo/options.py
-share/examples/py-ldap/Demo/pickle_ldapobject.py
-share/examples/py-ldap/Demo/reconnect.py
-share/examples/py-ldap/Demo/rename.py
-share/examples/py-ldap/Demo/sasl_bind.py
-share/examples/py-ldap/Demo/schema.py
-share/examples/py-ldap/Demo/schema_tree.py
-share/examples/py-ldap/Demo/simple.py
-share/examples/py-ldap/Demo/simplebrowse.py