Changes 2.4.6:

Lib/
* ldap.controls.ppolicy:
  Another fix for decoding the password policy response control

Changes 2.4.5:
Installation:
* defines for SASL and SSL in setup.cfg to be more friendly to
  Python setup tools (easy_install)
Lib/
* Fixed typo in ldap.functions._ldap_function_call() which
  always released ldap._ldap_module_lock instead of local lock
* ldap.controls.ppolicy:
  Fixed decoding the password policy response control
Demo/
* Demo script for ldap.controls.ppolicy

4 files changed, 19 insertions, 11 deletions

diff --git a/databases/py-ldap/Makefile b/databases/py-ldap/Makefile
index 53082c0d271..d9948b6184d 100644
--- a/databases/py-ldap/Makefile
+++ b/databases/py-ldap/Makefile
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.43 2011/07/28 08:37:08 adam Exp $
+# $NetBSD: Makefile,v 1.44 2011/11/28 10:58:50 adam Exp $
 
-DISTNAME=	python-ldap-2.4.3
+DISTNAME=	python-ldap-2.4.6
 PKGNAME=	${DISTNAME:S/python/${PYPKGPREFIX}/}
 CATEGORIES=	databases python
 MASTER_SITES=	http://pypi.python.org/packages/source/p/python-ldap/
diff --git a/databases/py-ldap/PLIST b/databases/py-ldap/PLIST
index 4d64ebc61d1..c5a13d5e236 100644
--- a/databases/py-ldap/PLIST
+++ b/databases/py-ldap/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.9 2011/07/28 08:37:08 adam Exp $
+@comment $NetBSD: PLIST,v 1.10 2011/11/28 10:58:50 adam Exp $
 ${PYSITELIB}/${EGG_INFODIR}/PKG-INFO
 ${PYSITELIB}/${EGG_INFODIR}/SOURCES.txt
 ${PYSITELIB}/${EGG_INFODIR}/dependency_links.txt
@@ -81,6 +81,9 @@ ${PYSITELIB}/ldap/schema/subentry.pyo
 ${PYSITELIB}/ldap/schema/tokenizer.py
 ${PYSITELIB}/ldap/schema/tokenizer.pyc
 ${PYSITELIB}/ldap/schema/tokenizer.pyo
+${PYSITELIB}/ldap/syncrepl.py
+${PYSITELIB}/ldap/syncrepl.pyc
+${PYSITELIB}/ldap/syncrepl.pyo
 ${PYSITELIB}/ldapurl.py
 ${PYSITELIB}/ldapurl.pyc
 ${PYSITELIB}/ldapurl.pyo
@@ -99,13 +102,16 @@ share/doc/py-ldap/Demo/matchedvalues.py
 share/doc/py-ldap/Demo/ms_ad_bind.py
 share/doc/py-ldap/Demo/options.py
 share/doc/py-ldap/Demo/page_control.py
+share/doc/py-ldap/Demo/paged_search_ext_s.py
 share/doc/py-ldap/Demo/passwd_ext_op.py
 share/doc/py-ldap/Demo/pickle_ldapobject.py
 share/doc/py-ldap/Demo/pyasn1/README
 share/doc/py-ldap/Demo/pyasn1/dds.py
+share/doc/py-ldap/Demo/pyasn1/ppolicy.py
 share/doc/py-ldap/Demo/pyasn1/psearch.py
 share/doc/py-ldap/Demo/pyasn1/readentrycontrol.py
 share/doc/py-ldap/Demo/pyasn1/sessiontrack.py
+share/doc/py-ldap/Demo/pyasn1/syncrepl.py
 share/doc/py-ldap/Demo/reconnect.py
 share/doc/py-ldap/Demo/rename.py
 share/doc/py-ldap/Demo/resiter.py
diff --git a/databases/py-ldap/distinfo b/databases/py-ldap/distinfo
index 8172429b27f..acec53d2fd0 100644
--- a/databases/py-ldap/distinfo
+++ b/databases/py-ldap/distinfo
@@ -1,6 +1,6 @@
-$NetBSD: distinfo,v 1.15 2011/07/28 08:37:08 adam Exp $
+$NetBSD: distinfo,v 1.16 2011/11/28 10:58:50 adam Exp $
 
-SHA1 (python-ldap-2.4.3.tar.gz) = 4bffa539fd24d5b666ce88fdc59bf3d67e56f2e6
-RMD160 (python-ldap-2.4.3.tar.gz) = ee12e22569ec4af8a2102f70d29cae4164e9bbbc
-Size (python-ldap-2.4.3.tar.gz) = 125989 bytes
-SHA1 (patch-aa) = eca9fea2c766221751b987feaceb829be4e4a9fd
+SHA1 (python-ldap-2.4.6.tar.gz) = 64b45faeaf97c602dc776eba48547dd720e624c2
+RMD160 (python-ldap-2.4.6.tar.gz) = 86a5ff46dbe46a509d13dfc8b940bd7f882dc85e
+Size (python-ldap-2.4.6.tar.gz) = 132538 bytes
+SHA1 (patch-aa) = 15fbcb645f656b156a335aa0141a4b0949bbd0a8
diff --git a/databases/py-ldap/patches/patch-aa b/databases/py-ldap/patches/patch-aa
index fd8a4ad732d..bf3fa73f4b7 100644
--- a/databases/py-ldap/patches/patch-aa
+++ b/databases/py-ldap/patches/patch-aa
@@ -1,16 +1,18 @@
-$NetBSD: patch-aa,v 1.7 2011/07/08 10:23:35 adam Exp $
+$NetBSD: patch-aa,v 1.8 2011/11/28 10:58:50 adam Exp $
 
 --- setup.cfg.orig	2011-06-02 18:08:10.000000000 +0000
 +++ setup.cfg
-@@ -1,9 +1,9 @@
+@@ -1,10 +1,10 @@
  [_ldap]
 -library_dirs = /opt/openldap-RE24/lib
 -include_dirs = /opt/openldap-RE24/include /usr/include/sasl
 +library_dirs = @PY_LDAP_LIBRARY_DIRS@
 +include_dirs = @PY_LDAP_INCLUDE_DIRS@
+-defines = HAVE_SASL HAVE_TLS
++defines = HAVE_TLS
  extra_compile_args = -g
  extra_objects = 
--libs = ldap_r lber sasl2 ssl crypto
+-libs = ldap_r
 +libs = @PY_LDAP_LIBS@
  
  [install]