Changes 2.4.19:

* Fixed missing ReconnectLDAPObject._reconnect_lock when pickling
* Added ldap.controls.pagedresults which is pure Python implementation of
  Simple Paged Results Control (see RFC 2696) and delivers the correct
  result size

4 files changed, 12 insertions, 54 deletions

diff --git a/databases/py-ldap/Makefile b/databases/py-ldap/Makefile
index 3640feb39ab..6a3c3de9b41 100644
--- a/databases/py-ldap/Makefile
+++ b/databases/py-ldap/Makefile
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.60 2014/12/31 13:57:25 wiz Exp $
+# $NetBSD: Makefile,v 1.61 2015/01/12 11:46:29 adam Exp $
 
-DISTNAME=	python-ldap-2.4.18
+DISTNAME=	python-ldap-2.4.19
 PKGNAME=	${DISTNAME:S/python/${PYPKGPREFIX}/}
 CATEGORIES=	databases python
 MASTER_SITES=	http://pypi.python.org/packages/source/p/python-ldap/
@@ -24,18 +24,10 @@ SUBST_SED.setup=	-e 's|@PY_LDAP_LIBRARY_DIRS@|${PY_LDAP_LIBRARY_DIRS:Q}|'
 SUBST_SED.setup+=	-e 's|@PY_LDAP_INCLUDE_DIRS@|${PY_LDAP_INCLUDE_DIRS:Q}|'
 SUBST_SED.setup+=	-e 's|@PY_LDAP_LIBS@|${PY_LDAP_LIBS}|'
 
-PY_LDAP_DOCDIR=		${PREFIX}/share/doc/py-ldap
-
 USE_TOOLS+=		pax
 
-INSTALLATION_DIRS=	${PY_LDAP_DOCDIR}
-
 REPLACE_PYTHON=		Lib/ldap/controls/readentry.py
 
-post-install:
-	cd ${WRKSRC} && pax -s,.cvsignore,, -rw CHANGES README INSTALL TODO Demo \
-		${DESTDIR}${PY_LDAP_DOCDIR}
-
 .include "../../databases/openldap-client/buildlink3.mk"
 .include "../../security/openssl/buildlink3.mk"
 .include "../../lang/python/application.mk"
diff --git a/databases/py-ldap/PLIST b/databases/py-ldap/PLIST
index 880fc6af655..69756851eb6 100644
--- a/databases/py-ldap/PLIST
+++ b/databases/py-ldap/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.13 2014/09/14 17:48:37 wiz Exp $
+@comment $NetBSD: PLIST,v 1.14 2015/01/12 11:46:29 adam Exp $
 ${PYSITELIB}/${EGG_INFODIR}/PKG-INFO
 ${PYSITELIB}/${EGG_INFODIR}/SOURCES.txt
 ${PYSITELIB}/${EGG_INFODIR}/dependency_links.txt
@@ -96,37 +96,3 @@ ${PYSITELIB}/ldapurl.pyo
 ${PYSITELIB}/ldif.py
 ${PYSITELIB}/ldif.pyc
 ${PYSITELIB}/ldif.pyo
-share/doc/py-ldap/CHANGES
-share/doc/py-ldap/Demo/Lib/ldap/async/deltree.py
-share/doc/py-ldap/Demo/Lib/ldap/async/ldifwriter.py
-share/doc/py-ldap/Demo/Lib/ldap/async/sizelimit.py
-share/doc/py-ldap/Demo/Lib/ldapurl/urlsearch.py
-share/doc/py-ldap/Demo/Lib/ldif/ldifcopy.py
-share/doc/py-ldap/Demo/initialize.py
-share/doc/py-ldap/Demo/ldapcontrols.py
-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/noopsearch.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
-share/doc/py-ldap/Demo/sasl_bind.py
-share/doc/py-ldap/Demo/schema.py
-share/doc/py-ldap/Demo/schema_tree.py
-share/doc/py-ldap/Demo/simple.py
-share/doc/py-ldap/Demo/simplebrowse.py
-share/doc/py-ldap/INSTALL
-share/doc/py-ldap/README
-share/doc/py-ldap/TODO
diff --git a/databases/py-ldap/distinfo b/databases/py-ldap/distinfo
index 33099e35274..0e9c7a4d420 100644
--- a/databases/py-ldap/distinfo
+++ b/databases/py-ldap/distinfo
@@ -1,6 +1,6 @@
-$NetBSD: distinfo,v 1.25 2014/10/12 14:53:38 wiz Exp $
+$NetBSD: distinfo,v 1.26 2015/01/12 11:46:29 adam Exp $
 
-SHA1 (python-ldap-2.4.18.tar.gz) = d254d56a9cebbf89c080a6edb73da5722f2c53b2
-RMD160 (python-ldap-2.4.18.tar.gz) = 8c89930dc7921a13f4979406bf352890bc1fb343
-Size (python-ldap-2.4.18.tar.gz) = 137451 bytes
-SHA1 (patch-aa) = b647e7f7c61e013b47be69831d5f2ba9f1caa13a
+SHA1 (python-ldap-2.4.19.tar.gz) = 164062f52fce14b8afbedc45ae5d5eef0c31afce
+RMD160 (python-ldap-2.4.19.tar.gz) = 90353d5871aac0f0987ec08b15e705cba6f18749
+Size (python-ldap-2.4.19.tar.gz) = 138503 bytes
+SHA1 (patch-aa) = 24b77bbe1ea2b1e46f3cb50332d7befae41a4989
diff --git a/databases/py-ldap/patches/patch-aa b/databases/py-ldap/patches/patch-aa
index 01974714480..c3875ee1f94 100644
--- a/databases/py-ldap/patches/patch-aa
+++ b/databases/py-ldap/patches/patch-aa
@@ -1,11 +1,11 @@
-$NetBSD: patch-aa,v 1.12 2014/09/14 17:48:37 wiz Exp $
+$NetBSD: patch-aa,v 1.13 2015/01/12 11:46:29 adam Exp $
 
---- setup.cfg.orig	2014-09-10 12:17:37.000000000 +0000
+--- setup.cfg.orig	2015-01-10 17:19:29.000000000 +0000
 +++ setup.cfg
 @@ -1,10 +1,10 @@
  [_ldap]
--library_dirs = /opt/openldap/lib64 /usr/lib
--include_dirs = /opt/openldap/include /usr/include/sasl /usr/include
+-library_dirs = /opt/openldap-RE24/lib /usr/lib
+-include_dirs = /opt/openldap-RE24/include /usr/include/sasl /usr/include
 -defines = HAVE_SASL HAVE_TLS HAVE_LIBLDAP_R
 +library_dirs = @PY_LDAP_LIBRARY_DIRS@
 +include_dirs = @PY_LDAP_INCLUDE_DIRS@