Mon Jan 12 11:46:29 2015 UTC ()
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


(adam)
diff -r1.60 -r1.61 pkgsrc/databases/py-ldap/Makefile
diff -r1.13 -r1.14 pkgsrc/databases/py-ldap/PLIST
diff -r1.25 -r1.26 pkgsrc/databases/py-ldap/distinfo
diff -r1.12 -r1.13 pkgsrc/databases/py-ldap/patches/patch-aa
cvs diff -r1.60 -r1.61 pkgsrc/databases/py-ldap/Makefile (expand / switch to unified diff)

--- pkgsrc/databases/py-ldap/Makefile 2014/12/31 13:57:25 1.60
+++ pkgsrc/databases/py-ldap/Makefile 2015/01/12 11:46:29 1.61
@@ -1,43 +1,35 @@ @@ -1,43 +1,35 @@
1# $NetBSD: Makefile,v 1.60 2014/12/31 13:57:25 wiz Exp $ 1# $NetBSD: Makefile,v 1.61 2015/01/12 11:46:29 adam Exp $
2 2
3DISTNAME= python-ldap-2.4.18 3DISTNAME= python-ldap-2.4.19
4PKGNAME= ${DISTNAME:S/python/${PYPKGPREFIX}/} 4PKGNAME= ${DISTNAME:S/python/${PYPKGPREFIX}/}
5CATEGORIES= databases python 5CATEGORIES= databases python
6MASTER_SITES= http://pypi.python.org/packages/source/p/python-ldap/ 6MASTER_SITES= http://pypi.python.org/packages/source/p/python-ldap/
7 7
8MAINTAINER= pkgsrc-users@NetBSD.org 8MAINTAINER= pkgsrc-users@NetBSD.org
9HOMEPAGE= http://www.python-ldap.org/ 9HOMEPAGE= http://www.python-ldap.org/
10COMMENT= LDAP client API for Python 10COMMENT= LDAP client API for Python
11LICENSE= python-software-foundation 11LICENSE= python-software-foundation
12 12
13PY_LDAP_LIBRARY_DIRS= ${BUILDLINK_PREFIX.openldap-client}/lib 13PY_LDAP_LIBRARY_DIRS= ${BUILDLINK_PREFIX.openldap-client}/lib
14PY_LDAP_INCLUDE_DIRS= ${BUILDLINK_PREFIX.openldap-client}/include 14PY_LDAP_INCLUDE_DIRS= ${BUILDLINK_PREFIX.openldap-client}/include
15PY_LDAP_LIBS= ldap_r lber ssl crypto 15PY_LDAP_LIBS= ldap_r lber ssl crypto
16PYTHON_VERSIONS_INCOMPATIBLE= 33 34 # not yet ported as of 2.4.13 16PYTHON_VERSIONS_INCOMPATIBLE= 33 34 # not yet ported as of 2.4.13
17 17
18.include "options.mk" 18.include "options.mk"
19 19
20SUBST_CLASSES+= setup 20SUBST_CLASSES+= setup
21SUBST_STAGE.setup= pre-configure 21SUBST_STAGE.setup= pre-configure
22SUBST_FILES.setup= setup.cfg 22SUBST_FILES.setup= setup.cfg
23SUBST_SED.setup= -e 's|@PY_LDAP_LIBRARY_DIRS@|${PY_LDAP_LIBRARY_DIRS:Q}|' 23SUBST_SED.setup= -e 's|@PY_LDAP_LIBRARY_DIRS@|${PY_LDAP_LIBRARY_DIRS:Q}|'
24SUBST_SED.setup+= -e 's|@PY_LDAP_INCLUDE_DIRS@|${PY_LDAP_INCLUDE_DIRS:Q}|' 24SUBST_SED.setup+= -e 's|@PY_LDAP_INCLUDE_DIRS@|${PY_LDAP_INCLUDE_DIRS:Q}|'
25SUBST_SED.setup+= -e 's|@PY_LDAP_LIBS@|${PY_LDAP_LIBS}|' 25SUBST_SED.setup+= -e 's|@PY_LDAP_LIBS@|${PY_LDAP_LIBS}|'
26 26
27PY_LDAP_DOCDIR= ${PREFIX}/share/doc/py-ldap 
28 
29USE_TOOLS+= pax 27USE_TOOLS+= pax
30 28
31INSTALLATION_DIRS= ${PY_LDAP_DOCDIR} 
32 
33REPLACE_PYTHON= Lib/ldap/controls/readentry.py 29REPLACE_PYTHON= Lib/ldap/controls/readentry.py
34 30
35post-install: 
36 cd ${WRKSRC} && pax -s,.cvsignore,, -rw CHANGES README INSTALL TODO Demo \ 
37 ${DESTDIR}${PY_LDAP_DOCDIR} 
38 
39.include "../../databases/openldap-client/buildlink3.mk" 31.include "../../databases/openldap-client/buildlink3.mk"
40.include "../../security/openssl/buildlink3.mk" 32.include "../../security/openssl/buildlink3.mk"
41.include "../../lang/python/application.mk" 33.include "../../lang/python/application.mk"
42.include "../../lang/python/egg.mk" 34.include "../../lang/python/egg.mk"
43.include "../../mk/bsd.pkg.mk" 35.include "../../mk/bsd.pkg.mk"
cvs diff -r1.13 -r1.14 pkgsrc/databases/py-ldap/PLIST (expand / switch to unified diff)

--- pkgsrc/databases/py-ldap/PLIST 2014/09/14 17:48:37 1.13
+++ pkgsrc/databases/py-ldap/PLIST 2015/01/12 11:46:29 1.14
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1@comment $NetBSD: PLIST,v 1.13 2014/09/14 17:48:37 wiz Exp $ 1@comment $NetBSD: PLIST,v 1.14 2015/01/12 11:46:29 adam Exp $
2${PYSITELIB}/${EGG_INFODIR}/PKG-INFO 2${PYSITELIB}/${EGG_INFODIR}/PKG-INFO
3${PYSITELIB}/${EGG_INFODIR}/SOURCES.txt 3${PYSITELIB}/${EGG_INFODIR}/SOURCES.txt
4${PYSITELIB}/${EGG_INFODIR}/dependency_links.txt 4${PYSITELIB}/${EGG_INFODIR}/dependency_links.txt
5${PYSITELIB}/${EGG_INFODIR}/not-zip-safe 5${PYSITELIB}/${EGG_INFODIR}/not-zip-safe
6${PYSITELIB}/${EGG_INFODIR}/requires.txt 6${PYSITELIB}/${EGG_INFODIR}/requires.txt
7${PYSITELIB}/${EGG_INFODIR}/top_level.txt 7${PYSITELIB}/${EGG_INFODIR}/top_level.txt
8${PYSITELIB}/_ldap.so 8${PYSITELIB}/_ldap.so
9${PYSITELIB}/dsml.py 9${PYSITELIB}/dsml.py
10${PYSITELIB}/dsml.pyc 10${PYSITELIB}/dsml.pyc
11${PYSITELIB}/dsml.pyo 11${PYSITELIB}/dsml.pyo
12${PYSITELIB}/ldap/__init__.py 12${PYSITELIB}/ldap/__init__.py
13${PYSITELIB}/ldap/__init__.pyc 13${PYSITELIB}/ldap/__init__.pyc
14${PYSITELIB}/ldap/__init__.pyo 14${PYSITELIB}/ldap/__init__.pyo
@@ -86,47 +86,13 @@ ${PYSITELIB}/ldap/schema/subentry.pyc @@ -86,47 +86,13 @@ ${PYSITELIB}/ldap/schema/subentry.pyc
86${PYSITELIB}/ldap/schema/subentry.pyo 86${PYSITELIB}/ldap/schema/subentry.pyo
87${PYSITELIB}/ldap/schema/tokenizer.py 87${PYSITELIB}/ldap/schema/tokenizer.py
88${PYSITELIB}/ldap/schema/tokenizer.pyc 88${PYSITELIB}/ldap/schema/tokenizer.pyc
89${PYSITELIB}/ldap/schema/tokenizer.pyo 89${PYSITELIB}/ldap/schema/tokenizer.pyo
90${PYSITELIB}/ldap/syncrepl.py 90${PYSITELIB}/ldap/syncrepl.py
91${PYSITELIB}/ldap/syncrepl.pyc 91${PYSITELIB}/ldap/syncrepl.pyc
92${PYSITELIB}/ldap/syncrepl.pyo 92${PYSITELIB}/ldap/syncrepl.pyo
93${PYSITELIB}/ldapurl.py 93${PYSITELIB}/ldapurl.py
94${PYSITELIB}/ldapurl.pyc 94${PYSITELIB}/ldapurl.pyc
95${PYSITELIB}/ldapurl.pyo 95${PYSITELIB}/ldapurl.pyo
96${PYSITELIB}/ldif.py 96${PYSITELIB}/ldif.py
97${PYSITELIB}/ldif.pyc 97${PYSITELIB}/ldif.pyc
98${PYSITELIB}/ldif.pyo 98${PYSITELIB}/ldif.pyo
99share/doc/py-ldap/CHANGES 
100share/doc/py-ldap/Demo/Lib/ldap/async/deltree.py 
101share/doc/py-ldap/Demo/Lib/ldap/async/ldifwriter.py 
102share/doc/py-ldap/Demo/Lib/ldap/async/sizelimit.py 
103share/doc/py-ldap/Demo/Lib/ldapurl/urlsearch.py 
104share/doc/py-ldap/Demo/Lib/ldif/ldifcopy.py 
105share/doc/py-ldap/Demo/initialize.py 
106share/doc/py-ldap/Demo/ldapcontrols.py 
107share/doc/py-ldap/Demo/matchedvalues.py 
108share/doc/py-ldap/Demo/ms_ad_bind.py 
109share/doc/py-ldap/Demo/options.py 
110share/doc/py-ldap/Demo/page_control.py 
111share/doc/py-ldap/Demo/paged_search_ext_s.py 
112share/doc/py-ldap/Demo/passwd_ext_op.py 
113share/doc/py-ldap/Demo/pickle_ldapobject.py 
114share/doc/py-ldap/Demo/pyasn1/README 
115share/doc/py-ldap/Demo/pyasn1/dds.py 
116share/doc/py-ldap/Demo/pyasn1/noopsearch.py 
117share/doc/py-ldap/Demo/pyasn1/ppolicy.py 
118share/doc/py-ldap/Demo/pyasn1/psearch.py 
119share/doc/py-ldap/Demo/pyasn1/readentrycontrol.py 
120share/doc/py-ldap/Demo/pyasn1/sessiontrack.py 
121share/doc/py-ldap/Demo/pyasn1/syncrepl.py 
122share/doc/py-ldap/Demo/reconnect.py 
123share/doc/py-ldap/Demo/rename.py 
124share/doc/py-ldap/Demo/resiter.py 
125share/doc/py-ldap/Demo/sasl_bind.py 
126share/doc/py-ldap/Demo/schema.py 
127share/doc/py-ldap/Demo/schema_tree.py 
128share/doc/py-ldap/Demo/simple.py 
129share/doc/py-ldap/Demo/simplebrowse.py 
130share/doc/py-ldap/INSTALL 
131share/doc/py-ldap/README 
132share/doc/py-ldap/TODO 
cvs diff -r1.25 -r1.26 pkgsrc/databases/py-ldap/distinfo (expand / switch to unified diff)

--- pkgsrc/databases/py-ldap/distinfo 2014/10/12 14:53:38 1.25
+++ pkgsrc/databases/py-ldap/distinfo 2015/01/12 11:46:29 1.26
@@ -1,6 +1,6 @@ @@ -1,6 +1,6 @@
1$NetBSD: distinfo,v 1.25 2014/10/12 14:53:38 wiz Exp $ 1$NetBSD: distinfo,v 1.26 2015/01/12 11:46:29 adam Exp $
2 2
3SHA1 (python-ldap-2.4.18.tar.gz) = d254d56a9cebbf89c080a6edb73da5722f2c53b2 3SHA1 (python-ldap-2.4.19.tar.gz) = 164062f52fce14b8afbedc45ae5d5eef0c31afce
4RMD160 (python-ldap-2.4.18.tar.gz) = 8c89930dc7921a13f4979406bf352890bc1fb343 4RMD160 (python-ldap-2.4.19.tar.gz) = 90353d5871aac0f0987ec08b15e705cba6f18749
5Size (python-ldap-2.4.18.tar.gz) = 137451 bytes 5Size (python-ldap-2.4.19.tar.gz) = 138503 bytes
6SHA1 (patch-aa) = b647e7f7c61e013b47be69831d5f2ba9f1caa13a 6SHA1 (patch-aa) = 24b77bbe1ea2b1e46f3cb50332d7befae41a4989
cvs diff -r1.12 -r1.13 pkgsrc/databases/py-ldap/patches/Attic/patch-aa (expand / switch to unified diff)

--- pkgsrc/databases/py-ldap/patches/Attic/patch-aa 2014/09/14 17:48:37 1.12
+++ pkgsrc/databases/py-ldap/patches/Attic/patch-aa 2015/01/12 11:46:29 1.13
@@ -1,19 +1,19 @@ @@ -1,19 +1,19 @@
1$NetBSD: patch-aa,v 1.12 2014/09/14 17:48:37 wiz Exp $ 1$NetBSD: patch-aa,v 1.13 2015/01/12 11:46:29 adam Exp $
2 2
3--- setup.cfg.orig 2014-09-10 12:17:37.000000000 +0000 3--- setup.cfg.orig 2015-01-10 17:19:29.000000000 +0000
4+++ setup.cfg 4+++ setup.cfg
5@@ -1,10 +1,10 @@ 5@@ -1,10 +1,10 @@
6 [_ldap] 6 [_ldap]
7-library_dirs = /opt/openldap/lib64 /usr/lib 7-library_dirs = /opt/openldap-RE24/lib /usr/lib
8-include_dirs = /opt/openldap/include /usr/include/sasl /usr/include 8-include_dirs = /opt/openldap-RE24/include /usr/include/sasl /usr/include
9-defines = HAVE_SASL HAVE_TLS HAVE_LIBLDAP_R 9-defines = HAVE_SASL HAVE_TLS HAVE_LIBLDAP_R
10+library_dirs = @PY_LDAP_LIBRARY_DIRS@ 10+library_dirs = @PY_LDAP_LIBRARY_DIRS@
11+include_dirs = @PY_LDAP_INCLUDE_DIRS@ 11+include_dirs = @PY_LDAP_INCLUDE_DIRS@
12+defines = HAVE_TLS HAVE_LIBLDAP_R 12+defines = HAVE_TLS HAVE_LIBLDAP_R
13 extra_compile_args =  13 extra_compile_args =
14 extra_objects =  14 extra_objects =
15-libs = ldap_r 15-libs = ldap_r
16+libs = @PY_LDAP_LIBS@ 16+libs = @PY_LDAP_LIBS@
17  17
18 [install] 18 [install]
19 compile = 1 19 compile = 1