Date: Mon, 14 Jul 2008 19:17:19 +0400 (MSD) From: Yuri Pankov <yuri.pankov@gmail.com> To: FreeBSD-gnats-submit@FreeBSD.org Subject: ports/125605: [PATCH] bsd.ports.mk: add -DLDAP_DEPRECATED to CFLAGS; remove support for OpenLDAP 2.2 Message-ID: <200807141517.m6EFHJcv000642@darklight.homeunix.org> Resent-Message-ID: <200807141550.m6EFo62u043638@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 125605
>Category: ports
>Synopsis: [PATCH] bsd.ports.mk: add -DLDAP_DEPRECATED to CFLAGS; remove support for OpenLDAP 2.2
>Confidential: no
>Severity: non-critical
>Priority: low
>Responsible: freebsd-ports-bugs
>State: open
>Quarter:
>Keywords:
>Date-Required:
>Class: change-request
>Submitter-Id: current-users
>Arrival-Date: Mon Jul 14 15:50:06 UTC 2008
>Closed-Date:
>Last-Modified:
>Originator: Yuri Pankov
>Release: FreeBSD 8.0-CURRENT amd64
>Organization:
>Environment:
System: FreeBSD darklight.homeunix.org 8.0-CURRENT FreeBSD 8.0-CURRENT #0: Sun Jul 13 20:51:44 MSD 2008 yuri@darklight.homeunix.org:/usr/obj/usr/src/sys/GENERIC amd64
>Description:
Some (many?) ports are still using functions which are deprecated in OpenLDAP 2.3, 2.4. Those functions are #ifdef'ed LDAP_DEPRECATED in ldap.h, which leads to segfaults on at least FreeBSD/amd64 due to missing function prototypes. Adding -DLDAP_DEPRECATED to CFLAGS if using openldap2?-client could solve the problem.
>How-To-Repeat:
Install a port using deprecated functions on FreeBSD/amd64 (namely cyrus-sasl2-saslauthd).
>Fix:
Add -DLDAP_DEPRECATED to CFLAGS when USE_OPENLDAP is defined.
While here, remove support for long dead openldap22-client port.
--- bsd.ports.mk.diff begins here ---
Index: ports/Mk/bsd.port.mk
===================================================================
RCS file: /home/ncvs/ports/Mk/bsd.port.mk,v
retrieving revision 1.595
diff -u -r1.595 bsd.port.mk
--- ports/Mk/bsd.port.mk 30 Jun 2008 20:16:17 -0000 1.595
+++ ports/Mk/bsd.port.mk 14 Jul 2008 15:01:51 -0000
@@ -1696,14 +1696,13 @@
.endif
.if defined(USE_OPENLDAP)
+CFLAGS+= -DLDAP_DEPRECATED
.if defined(WANT_OPENLDAP_SASL)
_OPENLDAP_FLAVOUR= -sasl
.else
_OPENLDAP_FLAVOUR=
.endif
-.if ${WANT_OPENLDAP_VER} == 22
-LIB_DEPENDS+= ldap-2.2.7:${PORTSDIR}/net/openldap22${_OPENLDAP_FLAVOUR}-client
-.elif ${WANT_OPENLDAP_VER} == 23
+.if ${WANT_OPENLDAP_VER} == 23
LIB_DEPENDS+= ldap-2.3.2:${PORTSDIR}/net/openldap23${_OPENLDAP_FLAVOUR}-client
.elif ${WANT_OPENLDAP_VER} == 24
LIB_DEPENDS+= ldap-2.4.2:${PORTSDIR}/net/openldap24${_OPENLDAP_FLAVOUR}-client
--- bsd.ports.mk.diff ends here ---
>Release-Note:
>Audit-Trail:
>Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200807141517.m6EFHJcv000642>