Update to 2.4.16:

Released 2.4.16 2014-09-10

Changes since 2.4.15:

Lib/
* New convenience function ldap.dn.is_dn()
* New convenience function ldap.escape_str()
* New convenience methods LDAPObject.read_s() and
  LDAPObject.find_unique_entry()
* Fixed invoking start_tls_s() in ReconnectLDAPObject.reconnect()
  (thanks to Philipp Hahn)

4 files changed, 16 insertions, 24 deletions

diff --git a/databases/py-ldap/Makefile b/databases/py-ldap/Makefile
index c505c168a0a..0a615384a6d 100644
--- a/databases/py-ldap/Makefile
+++ b/databases/py-ldap/Makefile
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.56 2014/05/09 07:36:57 wiz Exp $
+# $NetBSD: Makefile,v 1.57 2014/09/14 17:48:37 wiz Exp $
 
-DISTNAME=	python-ldap-2.4.15
+DISTNAME=	python-ldap-2.4.16
 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 68eff9c6a5f..880fc6af655 100644
--- a/databases/py-ldap/PLIST
+++ b/databases/py-ldap/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.12 2014/04/01 21:15:23 wiz Exp $
+@comment $NetBSD: PLIST,v 1.13 2014/09/14 17:48:37 wiz Exp $
 ${PYSITELIB}/${EGG_INFODIR}/PKG-INFO
 ${PYSITELIB}/${EGG_INFODIR}/SOURCES.txt
 ${PYSITELIB}/${EGG_INFODIR}/dependency_links.txt
@@ -111,6 +111,7 @@ 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
diff --git a/databases/py-ldap/distinfo b/databases/py-ldap/distinfo
index 8322a108d58..48242366629 100644
--- a/databases/py-ldap/distinfo
+++ b/databases/py-ldap/distinfo
@@ -1,6 +1,6 @@
-$NetBSD: distinfo,v 1.22 2014/04/01 21:15:23 wiz Exp $
+$NetBSD: distinfo,v 1.23 2014/09/14 17:48:37 wiz Exp $
 
-SHA1 (python-ldap-2.4.15.tar.gz) = cfd116af0c0d71d250a8cf31d32051f81e3b6310
-RMD160 (python-ldap-2.4.15.tar.gz) = 64b828cf4107bbe3902efda81296ba9aac029e5b
-Size (python-ldap-2.4.15.tar.gz) = 111597 bytes
-SHA1 (patch-aa) = 562902dcfd3ed6b85cebbde54245b2e9dc9f908c
+SHA1 (python-ldap-2.4.16.tar.gz) = e25e1edda67ced26a31e8b7a68eb003c039ba21a
+RMD160 (python-ldap-2.4.16.tar.gz) = 09acdac22ab686575b946d579b33d124f3b3b5f9
+Size (python-ldap-2.4.16.tar.gz) = 137873 bytes
+SHA1 (patch-aa) = b647e7f7c61e013b47be69831d5f2ba9f1caa13a
diff --git a/databases/py-ldap/patches/patch-aa b/databases/py-ldap/patches/patch-aa
index c7320884124..01974714480 100644
--- a/databases/py-ldap/patches/patch-aa
+++ b/databases/py-ldap/patches/patch-aa
@@ -1,28 +1,19 @@
-$NetBSD: patch-aa,v 1.11 2014/04/01 21:15:23 wiz Exp $
+$NetBSD: patch-aa,v 1.12 2014/09/14 17:48:37 wiz Exp $
 
---- setup.cfg.orig	2012-02-21 17:17:16.000000000 +0000
+--- setup.cfg.orig	2014-09-10 12:17:37.000000000 +0000
 +++ setup.cfg
-@@ -8,19 +8,19 @@
+@@ -1,10 +1,10 @@
  [_ldap]
- 
- # Define extra include and library dirs if needed
--library_dirs = /opt/openldap-RE24/lib /usr/lib
--include_dirs = /opt/openldap-RE24/include /usr/include/sasl /usr/include
+-library_dirs = /opt/openldap/lib64 /usr/lib
+-include_dirs = /opt/openldap/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@
- 
- # These defines needs OpenLDAP built with
- # ./configure --with-cyrus-sasl --with-tls
--defines = HAVE_SASL HAVE_TLS HAVE_LIBLDAP_R
 +defines = HAVE_TLS HAVE_LIBLDAP_R
- 
  extra_compile_args = 
  extra_objects = 
- 
- # Example for full-featured build:
- # Support for StartTLS/LDAPS, SASL bind and reentrant libldap_r.
 -libs = ldap_r
 +libs = @PY_LDAP_LIBS@
  
- # Installation options
  [install]
+ compile = 1