diff options
| -rw-r--r-- | databases/py-ldap/Makefile | 7 | ||||
| -rw-r--r-- | databases/py-ldap/PLIST | 9 | ||||
| -rw-r--r-- | databases/py-ldap/distinfo | 10 | ||||
| -rw-r--r-- | databases/py-ldap/patches/patch-aa | 23 |
4 files changed, 33 insertions, 16 deletions
diff --git a/databases/py-ldap/Makefile b/databases/py-ldap/Makefile index 906527af693..d1a3e917216 100644 --- a/databases/py-ldap/Makefile +++ b/databases/py-ldap/Makefile @@ -1,6 +1,6 @@ -# $NetBSD: Makefile,v 1.54 2014/03/03 17:01:34 adam Exp $ +# $NetBSD: Makefile,v 1.55 2014/04/01 21:15:23 wiz Exp $ -DISTNAME= python-ldap-2.4.14 +DISTNAME= python-ldap-2.4.15 PKGNAME= ${DISTNAME:S/python/${PYPKGPREFIX}/} CATEGORIES= databases python MASTER_SITES= http://pypi.python.org/packages/source/p/python-ldap/ @@ -31,11 +31,14 @@ 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" .include "../../lang/python/egg.mk" .include "../../mk/bsd.pkg.mk" diff --git a/databases/py-ldap/PLIST b/databases/py-ldap/PLIST index a3006a29c72..68eff9c6a5f 100644 --- a/databases/py-ldap/PLIST +++ b/databases/py-ldap/PLIST @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.11 2014/03/03 17:01:34 adam Exp $ +@comment $NetBSD: PLIST,v 1.12 2014/04/01 21:15:23 wiz Exp $ ${PYSITELIB}/${EGG_INFODIR}/PKG-INFO ${PYSITELIB}/${EGG_INFODIR}/SOURCES.txt ${PYSITELIB}/${EGG_INFODIR}/dependency_links.txt @@ -24,12 +24,18 @@ ${PYSITELIB}/ldap/controls/__init__.pyo ${PYSITELIB}/ldap/controls/libldap.py ${PYSITELIB}/ldap/controls/libldap.pyc ${PYSITELIB}/ldap/controls/libldap.pyo +${PYSITELIB}/ldap/controls/openldap.py +${PYSITELIB}/ldap/controls/openldap.pyc +${PYSITELIB}/ldap/controls/openldap.pyo ${PYSITELIB}/ldap/controls/ppolicy.py ${PYSITELIB}/ldap/controls/ppolicy.pyc ${PYSITELIB}/ldap/controls/ppolicy.pyo ${PYSITELIB}/ldap/controls/psearch.py ${PYSITELIB}/ldap/controls/psearch.pyc ${PYSITELIB}/ldap/controls/psearch.pyo +${PYSITELIB}/ldap/controls/pwdpolicy.py +${PYSITELIB}/ldap/controls/pwdpolicy.pyc +${PYSITELIB}/ldap/controls/pwdpolicy.pyo ${PYSITELIB}/ldap/controls/readentry.py ${PYSITELIB}/ldap/controls/readentry.pyc ${PYSITELIB}/ldap/controls/readentry.pyo @@ -105,7 +111,6 @@ 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 83e93f38307..8322a108d58 100644 --- a/databases/py-ldap/distinfo +++ b/databases/py-ldap/distinfo @@ -1,6 +1,6 @@ -$NetBSD: distinfo,v 1.21 2014/03/03 17:01:34 adam Exp $ +$NetBSD: distinfo,v 1.22 2014/04/01 21:15:23 wiz Exp $ -SHA1 (python-ldap-2.4.14.tar.gz) = ecfc85d8c20272fa05a6d4b50a0cba3a0ae5e8b3 -RMD160 (python-ldap-2.4.14.tar.gz) = c7cc8d13b973a9ce6b32230f65838297e547b539 -Size (python-ldap-2.4.14.tar.gz) = 136808 bytes -SHA1 (patch-aa) = 9666857ff98f506fca100d202613fdd6b0c39493 +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 diff --git a/databases/py-ldap/patches/patch-aa b/databases/py-ldap/patches/patch-aa index 11673f2e7f6..c7320884124 100644 --- a/databases/py-ldap/patches/patch-aa +++ b/databases/py-ldap/patches/patch-aa @@ -1,19 +1,28 @@ -$NetBSD: patch-aa,v 1.10 2014/03/03 17:01:34 adam Exp $ +$NetBSD: patch-aa,v 1.11 2014/04/01 21:15:23 wiz Exp $ ---- setup.cfg.orig 2012-02-21 17:18:54.000000000 +0000 +--- setup.cfg.orig 2012-02-21 17:17:16.000000000 +0000 +++ setup.cfg -@@ -1,10 +1,10 @@ +@@ -8,19 +8,19 @@ [_ldap] --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 + + # 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 = @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 |