diff options
| author | Ruslan Makhmatkhanov <rm@FreeBSD.org> | 2013-07-07 16:21:03 +0000 |
|---|---|---|
| committer | Ruslan Makhmatkhanov <rm@FreeBSD.org> | 2013-07-07 16:21:03 +0000 |
| commit | e9d0c5d8caf760093f70c84d3bb805902375a8ba (patch) | |
| tree | 278e94ed37ae114befb934bcfd802c9c10a74c37 | |
| parent | Remove dialogwrapper now that dialog4ports exists (diff) | |
- update to 2.4.13
- turn WITH_SASL into an OPTION
changelog:
* ldapobject.ReconnectLDAPObject._apply_last_bind() now sends
anonymous simple bind request even if the calling application
did not to provoke ldap.SERVER_DOWN in method reconnect()
* ldapobject.ReconnectLDAPObject.reconnect() now also catches
ldap.TIMEOUT exception after reconnection attempt
* Several other fixes for ldapobject.ReconnectLDAPObject
(thanks to Jonathan Giannuzzi)
Notes
Notes:
svn path=/head/; revision=322449
| -rw-r--r-- | net/py-ldap2/Makefile | 21 | ||||
| -rw-r--r-- | net/py-ldap2/distinfo | 4 |
2 files changed, 10 insertions, 15 deletions
diff --git a/net/py-ldap2/Makefile b/net/py-ldap2/Makefile index 137d7bae1cd5..c1db5d111212 100644 --- a/net/py-ldap2/Makefile +++ b/net/py-ldap2/Makefile @@ -1,7 +1,7 @@ # $FreeBSD$ PORTNAME= ldap2 -PORTVERSION= 2.4.12 +PORTVERSION= 2.4.13 CATEGORIES= net python MASTER_SITES= CHEESESHOP PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} @@ -25,24 +25,19 @@ REPLACE_ARGS= -e 's,/opt/openldap-RE24/lib,${LOCALBASE}/lib,' \ -e 's,/opt/openldap-RE24/include,${LOCALBASE}/include,' \ -e 's,/usr/include/sasl,${LOCALBASE}/include/sasl,' -.if defined(WITH_SASL) +OPTIONSFILE= ${PORT_DBDIR}/py-${PORTNAME}/options +OPTIONS_DEFINE= SASL + +.include <bsd.port.options.mk> + +.if ${PORT_OPTIONS:MSASL} WANT_OPENLDAP_SASL= yes CONFLICTS+= openldap2[34]-client-2.* .endif -pre-everything:: - @${ECHO} "=============================================================" - @${ECHO} - @${ECHO} "You can build ${PKGNAME} with the following options:" - @${ECHO} - @${ECHO} "WITH_SASL with (Cyrus) SASL2 support" - @${ECHO} - @${ECHO} "=============================================================" - @${ECHO} - do-configure: @${REINPLACE_CMD} ${REPLACE_ARGS} ${WRKSRC}/setup.cfg -.if !defined(WITH_SASL) +.if ! ${PORT_OPTIONS:MSASL} @cd ${WRKSRC} && ${PYTHON_CMD} setup.py -q setopt -c _ldap -s HAVE_TLS -o defines @cd ${WRKSRC} && ${PYTHON_CMD} setup.py -q saveopts .endif diff --git a/net/py-ldap2/distinfo b/net/py-ldap2/distinfo index 4ab001dcb4c2..595b58c7c4a3 100644 --- a/net/py-ldap2/distinfo +++ b/net/py-ldap2/distinfo @@ -1,2 +1,2 @@ -SHA256 (python-ldap-2.4.12.tar.gz) = 8587f8007c603b09ea6aa72fd63f1619b8a0d7f97e81ce955a44e8f84c7c9088 -SIZE (python-ldap-2.4.12.tar.gz) = 135395 +SHA256 (python-ldap-2.4.13.tar.gz) = 96853b9bbdacb341d6a3d60fdc89f8cb8acef47970ce8492ee3cbe975b9c7dbf +SIZE (python-ldap-2.4.13.tar.gz) = 135550 |
