A recent misc@ thread makes it clear that we don't have a py3 version of
python-ldap in ports (otherwise I'd have just suggested installing that
and using virtualenv with system-site-packages). Here's a diff that
updates the version and enables py3 support.
If any users of directoryassistant, luma or trac-ldapplugin are reading,
please test and report back.
Index: Makefile
===================================================================
RCS file: /cvs/ports/databases/py-ldap/Makefile,v
retrieving revision 1.45
diff -u -p -r1.45 Makefile
--- Makefile 23 Jul 2017 09:30:23 -0000 1.45
+++ Makefile 27 Aug 2018 13:27:51 -0000
@@ -3,10 +3,14 @@
COMMENT-main= LDAP client API for Python
COMMENT-examples= example programs for the LDAP client API for Python
-MODPY_EGG_VERSION = 2.4.41
+MODPY_EGG_VERSION = 3.1.0
DISTNAME= python-ldap-${MODPY_EGG_VERSION}
-PKGNAME-main= py-ldap-${MODPY_EGG_VERSION}
-PKGNAME-examples= py-ldap-examples-${MODPY_EGG_VERSION}
+PKGNAME= py-ldap-${MODPY_EGG_VERSION}
+
+FULLPKGPATH-main= databases/py-ldap,-main${MODPY_FLAVOR}
+FULLPKGNAME-main= ${MODPY_PY_PREFIX}ldap-${MODPY_EGG_VERSION}
+FULLPKGPATH-examples= databases/py-ldap,-examples${MODPY_FLAVOR}
+FULLPKGNAME-examples= ${MODPY_PY_PREFIX}ldap-examples-${MODPY_EGG_VERSION}
CATEGORIES= databases
@@ -15,12 +19,23 @@ HOMEPAGE= http://python-ldap.sourceforg
# Python
PERMIT_PACKAGE_CDROM= Yes
-WANTLIB-main += ldap_r pthread ${MODPY_WANTLIB}
+WANTLIB-main += lber ldap_r pthread ${MODPY_WANTLIB}
MULTI_PACKAGES= -main -examples
MODULES= lang/python
+FLAVORS= python3
+FLAVOR?=
+
+# @pkgpath markers only for py2 flavour
+SUBST_VARS+= MODPY_2ONLY
+.if ${FLAVOR} == python3
+MODPY_2ONLY = "@comment "
+.else
+MODPY_2ONLY =
+.endif
+
MODPY_PI= Yes
MODPY_SETUPTOOLS= Yes
@@ -28,21 +43,18 @@ LIB_DEPENDS-main= ${MODPY_LIB_DEPENDS} \
databases/openldap
RUN_DEPENDS-main= ${MODPY_RUN_DEPENDS} \
- devel/py-asn1-modules
+ devel/py-asn1-modules${MODPY_FLAVOR}
TEST_DEPENDS= ${RUN_DEPENDS-main} \
databases/openldap,-server
+TEST_ENV= SBIN=${LOCALBASE}/libexec:${LOCALBASE}/sbin
pre-configure:
- sed -i -e 's,/opt/openldap-RE24/lib,${LOCALBASE}/lib,;' \
- -e 's,/opt/openldap-RE24/include,${LOCALBASE}/include,;' \
- -e 's,/usr/include/sasl,${LOCALBASE}/include/sasl,' \
- ${WRKSRC}/setup.cfg
+ ${SUBST_CMD} ${WRKSRC}/setup.cfg
post-install:
- ${INSTALL_DATA_DIR} ${PREFIX}/share/examples/py-ldap
+ ${INSTALL_DATA_DIR} ${PREFIX}/share/examples/${MODPY_PY_PREFIX}ldap
cd ${WRKSRC}; tar cf - Demo | tar xf - -C \
- ${PREFIX}/share/examples/py-ldap
- find ${PREFIX} -name '.cvsignore' -exec rm '{}' \+
+ ${PREFIX}/share/examples/${MODPY_PY_PREFIX}ldap
.include <bsd.port.mk>
Index: distinfo
===================================================================
RCS file: /cvs/ports/databases/py-ldap/distinfo,v
retrieving revision 1.17
diff -u -p -r1.17 distinfo
--- distinfo 23 Jul 2017 09:30:23 -0000 1.17
+++ distinfo 27 Aug 2018 13:27:51 -0000
@@ -1,2 +1,2 @@
-SHA256 (python-ldap-2.4.41.tar.gz) =
bUMOzwQPL8cE7jFtM5DLH1QZwZE3Hh4TG671Sg5CzvA=
-SIZE (python-ldap-2.4.41.tar.gz) = 298212
+SHA256 (python-ldap-3.1.0.tar.gz) =
QZdeeUBlAsCScyxX7wwsLrMY2R6Odl+B9dSrbB23J8U=
+SIZE (python-ldap-3.1.0.tar.gz) = 366019
Index: patches/patch-setup_cfg
===================================================================
RCS file: patches/patch-setup_cfg
diff -N patches/patch-setup_cfg
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ patches/patch-setup_cfg 27 Aug 2018 13:27:51 -0000
@@ -0,0 +1,12 @@
+$OpenBSD$
+
+Index: setup.cfg
+--- setup.cfg.orig
++++ setup.cfg
+@@ -1,4 +1,6 @@
+ [_ldap]
++library_dirs = ${LOCALBASE}/lib
++include_dirs = ${LOCALBASE}/include ${LOCALBASE}/include/sasl
+ defines = HAVE_SASL HAVE_TLS HAVE_LIBLDAP_R
+ extra_compile_args =
+ extra_objects =
Index: pkg/PLIST-examples
===================================================================
RCS file: /cvs/ports/databases/py-ldap/pkg/PLIST-examples,v
retrieving revision 1.10
diff -u -p -r1.10 PLIST-examples
--- pkg/PLIST-examples 13 Nov 2015 08:44:53 -0000 1.10
+++ pkg/PLIST-examples 27 Aug 2018 13:27:51 -0000
@@ -1,5 +1,5 @@
@comment $OpenBSD: PLIST-examples,v 1.10 2015/11/13 08:44:53 ajacoutot Exp $
-@pkgpath
databases/py-ldap,-examples[,python2.4][,python2.5][,python2.6][,python2.7]
+${MODPY_2ONLY}@pkgpath
databases/py-ldap,-examples[,python2.4][,python2.5][,python2.6][,python2.7]
share/examples/${MODPY_PY_PREFIX}ldap/
share/examples/${MODPY_PY_PREFIX}ldap/Demo/
share/examples/${MODPY_PY_PREFIX}ldap/Demo/Lib/
@@ -14,6 +14,7 @@ share/examples/${MODPY_PY_PREFIX}ldap/De
share/examples/${MODPY_PY_PREFIX}ldap/Demo/Lib/ldif/ldifcopy.py
share/examples/${MODPY_PY_PREFIX}ldap/Demo/initialize.py
share/examples/${MODPY_PY_PREFIX}ldap/Demo/ldapcontrols.py
+share/examples/${MODPY_PY_PREFIX}ldap/Demo/ldapurl_search.py
share/examples/${MODPY_PY_PREFIX}ldap/Demo/matchedvalues.py
share/examples/${MODPY_PY_PREFIX}ldap/Demo/ms_ad_bind.py
share/examples/${MODPY_PY_PREFIX}ldap/Demo/options.py
@@ -29,6 +30,7 @@ share/examples/${MODPY_PY_PREFIX}ldap/De
share/examples/${MODPY_PY_PREFIX}ldap/Demo/pyasn1/psearch.py
share/examples/${MODPY_PY_PREFIX}ldap/Demo/pyasn1/readentrycontrol.py
share/examples/${MODPY_PY_PREFIX}ldap/Demo/pyasn1/sessiontrack.py
+share/examples/${MODPY_PY_PREFIX}ldap/Demo/pyasn1/sss_highest_number.py
share/examples/${MODPY_PY_PREFIX}ldap/Demo/pyasn1/syncrepl.py
share/examples/${MODPY_PY_PREFIX}ldap/Demo/reconnect.py
share/examples/${MODPY_PY_PREFIX}ldap/Demo/rename.py
Index: pkg/PLIST-main
===================================================================
RCS file: /cvs/ports/databases/py-ldap/pkg/PLIST-main,v
retrieving revision 1.11
diff -u -p -r1.11 PLIST-main
--- pkg/PLIST-main 23 Jul 2017 09:30:23 -0000 1.11
+++ pkg/PLIST-main 27 Aug 2018 13:27:51 -0000
@@ -1,107 +1,126 @@
@comment $OpenBSD: PLIST-main,v 1.11 2017/07/23 09:30:23 ajacoutot Exp $
-@pkgpath databases/py-ldap
-@pkgpath
databases/py-ldap,-main[,python2.4][,python2.5][,python2.6][,python2.7]
+${MODPY_2ONLY}@pkgpath databases/py-ldap
+${MODPY_2ONLY}@pkgpath
databases/py-ldap,-main[,python2.4][,python2.5][,python2.6][,python2.7]
+lib/python${MODPY_VERSION}/site-packages/${MODPY_PYCACHE}ldapurl.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
+lib/python${MODPY_VERSION}/site-packages/${MODPY_PYCACHE}ldapurl.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/${MODPY_PYCACHE}ldif.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
+lib/python${MODPY_VERSION}/site-packages/${MODPY_PYCACHE}ldif.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/_ldap.so
-lib/python${MODPY_VERSION}/site-packages/dsml.py
-lib/python${MODPY_VERSION}/site-packages/dsml.pyc
-lib/python${MODPY_VERSION}/site-packages/dsml.${MODPY_PYOEXTENSION}
lib/python${MODPY_VERSION}/site-packages/ldap/
lib/python${MODPY_VERSION}/site-packages/ldap/__init__.py
-lib/python${MODPY_VERSION}/site-packages/ldap/__init__.pyc
-lib/python${MODPY_VERSION}/site-packages/ldap/__init__.${MODPY_PYOEXTENSION}
+${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/ldap/${MODPY_PYCACHE}/
+lib/python${MODPY_VERSION}/site-packages/ldap/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
+lib/python${MODPY_VERSION}/site-packages/ldap/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/ldap/${MODPY_PYCACHE}async.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
+lib/python${MODPY_VERSION}/site-packages/ldap/${MODPY_PYCACHE}async.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/ldap/${MODPY_PYCACHE}asyncsearch.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
+lib/python${MODPY_VERSION}/site-packages/ldap/${MODPY_PYCACHE}asyncsearch.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/ldap/${MODPY_PYCACHE}cidict.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
+lib/python${MODPY_VERSION}/site-packages/ldap/${MODPY_PYCACHE}cidict.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/ldap/${MODPY_PYCACHE}compat.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
+lib/python${MODPY_VERSION}/site-packages/ldap/${MODPY_PYCACHE}compat.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/ldap/${MODPY_PYCACHE}constants.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
+lib/python${MODPY_VERSION}/site-packages/ldap/${MODPY_PYCACHE}constants.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/ldap/${MODPY_PYCACHE}dn.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
+lib/python${MODPY_VERSION}/site-packages/ldap/${MODPY_PYCACHE}dn.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/ldap/${MODPY_PYCACHE}filter.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
+lib/python${MODPY_VERSION}/site-packages/ldap/${MODPY_PYCACHE}filter.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/ldap/${MODPY_PYCACHE}functions.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
+lib/python${MODPY_VERSION}/site-packages/ldap/${MODPY_PYCACHE}functions.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/ldap/${MODPY_PYCACHE}ldapobject.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
+lib/python${MODPY_VERSION}/site-packages/ldap/${MODPY_PYCACHE}ldapobject.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/ldap/${MODPY_PYCACHE}logger.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
+lib/python${MODPY_VERSION}/site-packages/ldap/${MODPY_PYCACHE}logger.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/ldap/${MODPY_PYCACHE}modlist.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
+lib/python${MODPY_VERSION}/site-packages/ldap/${MODPY_PYCACHE}modlist.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/ldap/${MODPY_PYCACHE}pkginfo.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
+lib/python${MODPY_VERSION}/site-packages/ldap/${MODPY_PYCACHE}pkginfo.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/ldap/${MODPY_PYCACHE}resiter.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
+lib/python${MODPY_VERSION}/site-packages/ldap/${MODPY_PYCACHE}resiter.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/ldap/${MODPY_PYCACHE}sasl.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
+lib/python${MODPY_VERSION}/site-packages/ldap/${MODPY_PYCACHE}sasl.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/ldap/${MODPY_PYCACHE}syncrepl.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
+lib/python${MODPY_VERSION}/site-packages/ldap/${MODPY_PYCACHE}syncrepl.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/ldap/async.py
-lib/python${MODPY_VERSION}/site-packages/ldap/async.pyc
-lib/python${MODPY_VERSION}/site-packages/ldap/async.${MODPY_PYOEXTENSION}
+lib/python${MODPY_VERSION}/site-packages/ldap/asyncsearch.py
lib/python${MODPY_VERSION}/site-packages/ldap/cidict.py
-lib/python${MODPY_VERSION}/site-packages/ldap/cidict.pyc
-lib/python${MODPY_VERSION}/site-packages/ldap/cidict.${MODPY_PYOEXTENSION}
+lib/python${MODPY_VERSION}/site-packages/ldap/compat.py
+lib/python${MODPY_VERSION}/site-packages/ldap/constants.py
lib/python${MODPY_VERSION}/site-packages/ldap/controls/
lib/python${MODPY_VERSION}/site-packages/ldap/controls/__init__.py
-lib/python${MODPY_VERSION}/site-packages/ldap/controls/__init__.pyc
-lib/python${MODPY_VERSION}/site-packages/ldap/controls/__init__.${MODPY_PYOEXTENSION}
+${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/ldap/controls/${MODPY_PYCACHE}/
+lib/python${MODPY_VERSION}/site-packages/ldap/controls/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
+lib/python${MODPY_VERSION}/site-packages/ldap/controls/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/ldap/controls/${MODPY_PYCACHE}deref.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
+lib/python${MODPY_VERSION}/site-packages/ldap/controls/${MODPY_PYCACHE}deref.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/ldap/controls/${MODPY_PYCACHE}libldap.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
+lib/python${MODPY_VERSION}/site-packages/ldap/controls/${MODPY_PYCACHE}libldap.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/ldap/controls/${MODPY_PYCACHE}openldap.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
+lib/python${MODPY_VERSION}/site-packages/ldap/controls/${MODPY_PYCACHE}openldap.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/ldap/controls/${MODPY_PYCACHE}pagedresults.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
+lib/python${MODPY_VERSION}/site-packages/ldap/controls/${MODPY_PYCACHE}pagedresults.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/ldap/controls/${MODPY_PYCACHE}ppolicy.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
+lib/python${MODPY_VERSION}/site-packages/ldap/controls/${MODPY_PYCACHE}ppolicy.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/ldap/controls/${MODPY_PYCACHE}psearch.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
+lib/python${MODPY_VERSION}/site-packages/ldap/controls/${MODPY_PYCACHE}psearch.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/ldap/controls/${MODPY_PYCACHE}pwdpolicy.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
+lib/python${MODPY_VERSION}/site-packages/ldap/controls/${MODPY_PYCACHE}pwdpolicy.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/ldap/controls/${MODPY_PYCACHE}readentry.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
+lib/python${MODPY_VERSION}/site-packages/ldap/controls/${MODPY_PYCACHE}readentry.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/ldap/controls/${MODPY_PYCACHE}sessiontrack.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
+lib/python${MODPY_VERSION}/site-packages/ldap/controls/${MODPY_PYCACHE}sessiontrack.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/ldap/controls/${MODPY_PYCACHE}simple.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
+lib/python${MODPY_VERSION}/site-packages/ldap/controls/${MODPY_PYCACHE}simple.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/ldap/controls/${MODPY_PYCACHE}sss.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
+lib/python${MODPY_VERSION}/site-packages/ldap/controls/${MODPY_PYCACHE}sss.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/ldap/controls/${MODPY_PYCACHE}vlv.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
+lib/python${MODPY_VERSION}/site-packages/ldap/controls/${MODPY_PYCACHE}vlv.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/ldap/controls/deref.py
-lib/python${MODPY_VERSION}/site-packages/ldap/controls/deref.pyc
-lib/python${MODPY_VERSION}/site-packages/ldap/controls/deref.${MODPY_PYOEXTENSION}
lib/python${MODPY_VERSION}/site-packages/ldap/controls/libldap.py
-lib/python${MODPY_VERSION}/site-packages/ldap/controls/libldap.pyc
-lib/python${MODPY_VERSION}/site-packages/ldap/controls/libldap.${MODPY_PYOEXTENSION}
lib/python${MODPY_VERSION}/site-packages/ldap/controls/openldap.py
-lib/python${MODPY_VERSION}/site-packages/ldap/controls/openldap.pyc
-lib/python${MODPY_VERSION}/site-packages/ldap/controls/openldap.${MODPY_PYOEXTENSION}
+lib/python${MODPY_VERSION}/site-packages/ldap/controls/pagedresults.py
lib/python${MODPY_VERSION}/site-packages/ldap/controls/ppolicy.py
-lib/python${MODPY_VERSION}/site-packages/ldap/controls/ppolicy.pyc
-lib/python${MODPY_VERSION}/site-packages/ldap/controls/ppolicy.${MODPY_PYOEXTENSION}
lib/python${MODPY_VERSION}/site-packages/ldap/controls/psearch.py
-lib/python${MODPY_VERSION}/site-packages/ldap/controls/psearch.pyc
-lib/python${MODPY_VERSION}/site-packages/ldap/controls/psearch.${MODPY_PYOEXTENSION}
lib/python${MODPY_VERSION}/site-packages/ldap/controls/pwdpolicy.py
-lib/python${MODPY_VERSION}/site-packages/ldap/controls/pwdpolicy.pyc
-lib/python${MODPY_VERSION}/site-packages/ldap/controls/pwdpolicy.${MODPY_PYOEXTENSION}
lib/python${MODPY_VERSION}/site-packages/ldap/controls/readentry.py
-lib/python${MODPY_VERSION}/site-packages/ldap/controls/readentry.pyc
-lib/python${MODPY_VERSION}/site-packages/ldap/controls/readentry.${MODPY_PYOEXTENSION}
lib/python${MODPY_VERSION}/site-packages/ldap/controls/sessiontrack.py
-lib/python${MODPY_VERSION}/site-packages/ldap/controls/sessiontrack.pyc
-lib/python${MODPY_VERSION}/site-packages/ldap/controls/sessiontrack.${MODPY_PYOEXTENSION}
lib/python${MODPY_VERSION}/site-packages/ldap/controls/simple.py
-lib/python${MODPY_VERSION}/site-packages/ldap/controls/simple.pyc
-lib/python${MODPY_VERSION}/site-packages/ldap/controls/simple.${MODPY_PYOEXTENSION}
lib/python${MODPY_VERSION}/site-packages/ldap/controls/sss.py
-lib/python${MODPY_VERSION}/site-packages/ldap/controls/sss.pyc
-lib/python${MODPY_VERSION}/site-packages/ldap/controls/sss.${MODPY_PYOEXTENSION}
+lib/python${MODPY_VERSION}/site-packages/ldap/controls/vlv.py
lib/python${MODPY_VERSION}/site-packages/ldap/dn.py
-lib/python${MODPY_VERSION}/site-packages/ldap/dn.pyc
-lib/python${MODPY_VERSION}/site-packages/ldap/dn.${MODPY_PYOEXTENSION}
lib/python${MODPY_VERSION}/site-packages/ldap/extop/
lib/python${MODPY_VERSION}/site-packages/ldap/extop/__init__.py
-lib/python${MODPY_VERSION}/site-packages/ldap/extop/__init__.pyc
-lib/python${MODPY_VERSION}/site-packages/ldap/extop/__init__.${MODPY_PYOEXTENSION}
+${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/ldap/extop/${MODPY_PYCACHE}/
+lib/python${MODPY_VERSION}/site-packages/ldap/extop/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
+lib/python${MODPY_VERSION}/site-packages/ldap/extop/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/ldap/extop/${MODPY_PYCACHE}dds.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
+lib/python${MODPY_VERSION}/site-packages/ldap/extop/${MODPY_PYCACHE}dds.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/ldap/extop/dds.py
-lib/python${MODPY_VERSION}/site-packages/ldap/extop/dds.pyc
-lib/python${MODPY_VERSION}/site-packages/ldap/extop/dds.${MODPY_PYOEXTENSION}
lib/python${MODPY_VERSION}/site-packages/ldap/filter.py
-lib/python${MODPY_VERSION}/site-packages/ldap/filter.pyc
-lib/python${MODPY_VERSION}/site-packages/ldap/filter.${MODPY_PYOEXTENSION}
lib/python${MODPY_VERSION}/site-packages/ldap/functions.py
-lib/python${MODPY_VERSION}/site-packages/ldap/functions.pyc
-lib/python${MODPY_VERSION}/site-packages/ldap/functions.${MODPY_PYOEXTENSION}
lib/python${MODPY_VERSION}/site-packages/ldap/ldapobject.py
-lib/python${MODPY_VERSION}/site-packages/ldap/ldapobject.pyc
-lib/python${MODPY_VERSION}/site-packages/ldap/ldapobject.${MODPY_PYOEXTENSION}
lib/python${MODPY_VERSION}/site-packages/ldap/logger.py
-lib/python${MODPY_VERSION}/site-packages/ldap/logger.pyc
-lib/python${MODPY_VERSION}/site-packages/ldap/logger.${MODPY_PYOEXTENSION}
lib/python${MODPY_VERSION}/site-packages/ldap/modlist.py
-lib/python${MODPY_VERSION}/site-packages/ldap/modlist.pyc
-lib/python${MODPY_VERSION}/site-packages/ldap/modlist.${MODPY_PYOEXTENSION}
+lib/python${MODPY_VERSION}/site-packages/ldap/pkginfo.py
lib/python${MODPY_VERSION}/site-packages/ldap/resiter.py
-lib/python${MODPY_VERSION}/site-packages/ldap/resiter.pyc
-lib/python${MODPY_VERSION}/site-packages/ldap/resiter.${MODPY_PYOEXTENSION}
lib/python${MODPY_VERSION}/site-packages/ldap/sasl.py
-lib/python${MODPY_VERSION}/site-packages/ldap/sasl.pyc
-lib/python${MODPY_VERSION}/site-packages/ldap/sasl.${MODPY_PYOEXTENSION}
lib/python${MODPY_VERSION}/site-packages/ldap/schema/
lib/python${MODPY_VERSION}/site-packages/ldap/schema/__init__.py
-lib/python${MODPY_VERSION}/site-packages/ldap/schema/__init__.pyc
-lib/python${MODPY_VERSION}/site-packages/ldap/schema/__init__.${MODPY_PYOEXTENSION}
+${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/ldap/schema/${MODPY_PYCACHE}/
+lib/python${MODPY_VERSION}/site-packages/ldap/schema/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
+lib/python${MODPY_VERSION}/site-packages/ldap/schema/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/ldap/schema/${MODPY_PYCACHE}models.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
+lib/python${MODPY_VERSION}/site-packages/ldap/schema/${MODPY_PYCACHE}models.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/ldap/schema/${MODPY_PYCACHE}subentry.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
+lib/python${MODPY_VERSION}/site-packages/ldap/schema/${MODPY_PYCACHE}subentry.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/ldap/schema/${MODPY_PYCACHE}tokenizer.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
+lib/python${MODPY_VERSION}/site-packages/ldap/schema/${MODPY_PYCACHE}tokenizer.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/ldap/schema/models.py
-lib/python${MODPY_VERSION}/site-packages/ldap/schema/models.pyc
-lib/python${MODPY_VERSION}/site-packages/ldap/schema/models.${MODPY_PYOEXTENSION}
lib/python${MODPY_VERSION}/site-packages/ldap/schema/subentry.py
-lib/python${MODPY_VERSION}/site-packages/ldap/schema/subentry.pyc
-lib/python${MODPY_VERSION}/site-packages/ldap/schema/subentry.${MODPY_PYOEXTENSION}
lib/python${MODPY_VERSION}/site-packages/ldap/schema/tokenizer.py
-lib/python${MODPY_VERSION}/site-packages/ldap/schema/tokenizer.pyc
-lib/python${MODPY_VERSION}/site-packages/ldap/schema/tokenizer.${MODPY_PYOEXTENSION}
lib/python${MODPY_VERSION}/site-packages/ldap/syncrepl.py
-lib/python${MODPY_VERSION}/site-packages/ldap/syncrepl.pyc
-lib/python${MODPY_VERSION}/site-packages/ldap/syncrepl.${MODPY_PYOEXTENSION}
lib/python${MODPY_VERSION}/site-packages/ldapurl.py
-lib/python${MODPY_VERSION}/site-packages/ldapurl.pyc
-lib/python${MODPY_VERSION}/site-packages/ldapurl.${MODPY_PYOEXTENSION}
lib/python${MODPY_VERSION}/site-packages/ldif.py
-lib/python${MODPY_VERSION}/site-packages/ldif.pyc
-lib/python${MODPY_VERSION}/site-packages/ldif.${MODPY_PYOEXTENSION}
lib/python${MODPY_VERSION}/site-packages/python_ldap-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/
lib/python${MODPY_VERSION}/site-packages/python_ldap-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/PKG-INFO
lib/python${MODPY_VERSION}/site-packages/python_ldap-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/SOURCES.txt
@@ -109,6 +128,23 @@ lib/python${MODPY_VERSION}/site-packages
lib/python${MODPY_VERSION}/site-packages/python_ldap-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/not-zip-safe
lib/python${MODPY_VERSION}/site-packages/python_ldap-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/requires.txt
lib/python${MODPY_VERSION}/site-packages/python_ldap-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/top_level.txt
-lib/python${MODPY_VERSION}/site-packages/slapdtest.py
-lib/python${MODPY_VERSION}/site-packages/slapdtest.pyc
-lib/python${MODPY_VERSION}/site-packages/slapdtest.${MODPY_PYOEXTENSION}
+lib/python${MODPY_VERSION}/site-packages/slapdtest/
+lib/python${MODPY_VERSION}/site-packages/slapdtest/__init__.py
+${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/slapdtest/${MODPY_PYCACHE}/
+lib/python${MODPY_VERSION}/site-packages/slapdtest/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
+lib/python${MODPY_VERSION}/site-packages/slapdtest/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/slapdtest/${MODPY_PYCACHE}_slapdtest.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
+lib/python${MODPY_VERSION}/site-packages/slapdtest/${MODPY_PYCACHE}_slapdtest.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/slapdtest/_slapdtest.py
+lib/python${MODPY_VERSION}/site-packages/slapdtest/certs/
+lib/python${MODPY_VERSION}/site-packages/slapdtest/certs/README
+lib/python${MODPY_VERSION}/site-packages/slapdtest/certs/ca.conf
+lib/python${MODPY_VERSION}/site-packages/slapdtest/certs/ca.pem
+lib/python${MODPY_VERSION}/site-packages/slapdtest/certs/client.conf
+lib/python${MODPY_VERSION}/site-packages/slapdtest/certs/client.key
+lib/python${MODPY_VERSION}/site-packages/slapdtest/certs/client.pem
+lib/python${MODPY_VERSION}/site-packages/slapdtest/certs/gencerts.sh
+lib/python${MODPY_VERSION}/site-packages/slapdtest/certs/gennssdb.sh
+lib/python${MODPY_VERSION}/site-packages/slapdtest/certs/server.conf
+lib/python${MODPY_VERSION}/site-packages/slapdtest/certs/server.key
+lib/python${MODPY_VERSION}/site-packages/slapdtest/certs/server.pem
