diff options
| author | sem <sem@FreeBSD.org> | 2006-04-05 15:57:56 +0800 |
|---|---|---|
| committer | sem <sem@FreeBSD.org> | 2006-04-05 15:57:56 +0800 |
| commit | 16ab67815d706a9de9025e98c033ca84249d1ea7 (patch) | |
| tree | e279d2e0db487e85e671aee25dfd1236b18dadaf /net | |
| parent | 1bea0200b1d84923aad87403a0b76ff544c020a2 (diff) | |
| download | freebsd-ports-gnome-16ab67815d706a9de9025e98c033ca84249d1ea7.tar.gz freebsd-ports-gnome-16ab67815d706a9de9025e98c033ca84249d1ea7.tar.zst freebsd-ports-gnome-16ab67815d706a9de9025e98c033ca84249d1ea7.zip | |
- Update to 2.0.11
- Do not depend on OpenLDAP 2.2, this port works fine with 2.3.x series.
- Reorganize REPLACE_ARGS
PR: ports/94725
Submitted by: delphij
Approved by: maintainer timeout (2 weeks)
Diffstat (limited to 'net')
| -rw-r--r-- | net/py-ldap2/Makefile | 15 | ||||
| -rw-r--r-- | net/py-ldap2/distinfo | 6 | ||||
| -rw-r--r-- | net/py-ldap2/files/patch-Modules-LDAPObject.c | 26 |
3 files changed, 36 insertions, 11 deletions
diff --git a/net/py-ldap2/Makefile b/net/py-ldap2/Makefile index acc10bde5984..f56271717b1d 100644 --- a/net/py-ldap2/Makefile +++ b/net/py-ldap2/Makefile @@ -5,7 +5,7 @@ # $FreeBSD$ PORTNAME= ldap2 -PORTVERSION= 2.0.10 +PORTVERSION= 2.0.11 CATEGORIES= net MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} MASTER_SITE_SUBDIR= python-ldap @@ -19,18 +19,17 @@ USE_PYTHON= yes USE_PYDISTUTILS= yes USE_OPENLDAP= yes USE_REINPLACE= yes -WANT_OPENLDAP_VER= 22 -REPLACE_ARGS= -e 's=/opt/openldap-OPENLDAP_REL_ENG_2_3/include=${LOCALBASE}/include=' +REPLACE_ARGS= -e 's=/usr/local/openldap-REL_ENG_2_1/lib=${LOCALBASE}/lib=' \ + -e 's=/usr/local/openldap-REL_ENG_2_1/include=${LOCALBASE}/include=' .if defined(WITH_SASL) WANT_OPENLDAP_SASL= yes -REPLACE_ARGS+= -e 's=/opt/sasl/include/sasl=${LOCALBASE}/include/sasl=' \ - -e 's=/opt/openldap-OPENLDAP_REL_ENG_2_3/lib=${LOCALBASE}/lib ${LOCALBASE}/lib/sasl2=' -CONFLICTS+= openldap22-client-2.* +REPLACE_ARGS+= -e 's=/usr/local/cyrus-sasl/lib=${LOCALBASE}/lib/sasl2=' \ + -e 's=/usr/local/cyrus-sasl/include=${LOCALBASE}/include/sasl2=' +CONFLICTS+= openldap2[23]-client-2.* .else -REPLACE_ARGS+= -e 's=ldap_r lber ssl crypto sasl2=ldap_r lber ssl crypto=' \ - -e 's=/opt/openldap-OPENLDAP_REL_ENG_2_3/lib=${LOCALBASE}/lib=' +REPLACE_ARGS+= -e 's=ldap_r lber sasl2 ssl crypto=ldap_r lber ssl crypto=' .endif pre-everything:: diff --git a/net/py-ldap2/distinfo b/net/py-ldap2/distinfo index 70bbfe482c8b..7bfa90eec552 100644 --- a/net/py-ldap2/distinfo +++ b/net/py-ldap2/distinfo @@ -1,3 +1,3 @@ -MD5 (python-ldap-2.0.10.tar.gz) = 6bae44766e9d7e0b03a1ea5efb5a4382 -SHA256 (python-ldap-2.0.10.tar.gz) = bc8180a9258bd34900794cf019853fafa8a359867aba4cd7e783ed7c1ecab065 -SIZE (python-ldap-2.0.10.tar.gz) = 80655 +MD5 (python-ldap-2.0.11.tar.gz) = 1c20cdbe8cfab1c92b39848f7deeb6ec +SHA256 (python-ldap-2.0.11.tar.gz) = c320ca3502426de75a5b982da2a57c44dc20c1024986d169a782299663f1c69f +SIZE (python-ldap-2.0.11.tar.gz) = 71715 diff --git a/net/py-ldap2/files/patch-Modules-LDAPObject.c b/net/py-ldap2/files/patch-Modules-LDAPObject.c new file mode 100644 index 000000000000..b46aa99e3559 --- /dev/null +++ b/net/py-ldap2/files/patch-Modules-LDAPObject.c @@ -0,0 +1,26 @@ +Index: LDAPObject.c +=================================================================== +RCS file: /cvsroot/python-ldap/python-ldap/Modules/LDAPObject.c,v +retrieving revision 1.72 +diff -u -r1.72 LDAPObject.c +--- Modules/LDAPObject.c 11 Mar 2006 21:05:57 -0000 1.72 ++++ Modules/LDAPObject.c 23 Mar 2006 21:48:33 -0000 +@@ -971,8 +971,16 @@ + if (pmsg == NULL) { + retval = NULL; + } else { +- retval = Py_BuildValue("(OOiO)", result_str, pmsg, res_msgid, +- pyctrls ? pyctrls : PyList_New(0)); ++ if (pyctrls != NULL) { ++ retval = Py_BuildValue("(OOiO)", result_str, pmsg, res_msgid, ++ pyctrls); ++ } else { ++ PyObject *pNewList = PyList_New(0); ++ retval = Py_BuildValue("(OOiO)", result_str, pmsg, res_msgid, ++ pNewList); ++ Py_DECREF(pNewList); ++ } ++ + if (pmsg != Py_None) { + Py_DECREF(pmsg); + } |