ports/138868: net-im/jabbed: Enable optional Cyrus-SASL support.

[Alexander Nedotsukov]

>Number:         138868
>Category:       ports
>Synopsis:       net-im/jabbed: Enable optional Cyrus-SASL support.
>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:   Wed Sep 16 03:10:02 UTC 2009
>Closed-Date:
>Last-Modified:
>Originator:     Alexander Nedotsukov
>Release:        FreeBSD 7.2-STABLE i386
>Organization:
>Environment:
System: FreeBSD hub.bbnest.net 7.2-STABLE FreeBSD 7.2-STABLE #3: Mon Jul 13 20:52:53 JST 2009 bland at hub.bbnest.net:/usr/obj/usr/src/sys/HUB i386

>Description:
	Due lack of dedicated Cyrus-SASL backend maintaner in the jabberd
developers camp it was disabled. However there is a noticable interest in this
option present till the day. And it works just fine (well at least in my case
plain/digest-md5/gssapi). Also Cyrus-SASL library have much wider usage over
the our ports tree than its GSASL counterpart.

>How-To-Repeat:
>Fix:
	Apply the patch attached.

--- cyrus-sasl.patch begins here ---
Index: Makefile
===================================================================
RCS file: /home/pcvs/ports/net-im/jabberd/Makefile,v
retrieving revision 1.73
diff -u -r1.73 Makefile
--- Makefile	9 Aug 2009 17:57:08 -0000	1.73
+++ Makefile	16 Sep 2009 02:38:30 -0000
@@ -15,7 +15,6 @@
 COMMENT=	Online presence and instant messaging server
 
 LIB_DEPENDS=	expat.6:${PORTSDIR}/textproc/expat2 \
-		gsasl.13:${PORTSDIR}/security/gsasl \
 		idn.16:${PORTSDIR}/dns/libidn \
 		udns.0:${PORTSDIR}/dns/udns
 
@@ -29,7 +28,8 @@
 		ANON "Enable anonymous (auth/reg)" off \
 		FS "Filesystem storage (only for testing)" off \
 		DEBUG "Compile with debug messages" on \
-		REQUIRES "Add backend requires to startup script" off
+		REQUIRES "Add backend requires to startup script" off \
+		CYRUS "Use Cyrus SASL backend (not supported)" off
 
 GNU_CONFIGURE=	yes
 MAKE_JOBS_SAFE=	yes
@@ -166,6 +166,14 @@
 SUB_LIST+=	REQUIRE="LOGIN"
 .endif
 
+.if defined(WITH_CYRUS)
+CONFIGURE_ARGS+=	--with-sasl=cyrus
+LIB_DEPENDS+=	sasl2.2:${PORTSDIR}/security/cyrus-sasl2
+.else
+CONFIGURE_ARGS+=	--with-sasl=gsasl
+LIB_DEPENDS+=	gsasl.13:${PORTSDIR}/security/gsasl
+.endif
+
 MAN8=		c2s.8 jabberd.8 router.8 s2s.8 sm.8
 
 post-patch:
@@ -173,6 +181,10 @@
 		${WRKSRC}/configure
 	@${REINPLACE_CMD} -e 's|%%PERL%%|${PERL}|g' \
 		${WRKSRC}/tools/jabberd.in
+.if defined(WITH_CYRUS)
+	@${REINPLACE_CMD} -e '/^#error /d' \
+		${WRKSRC}/sx/sasl_cyrus.c
+.endif
 
 post-install:
 	@PKG_PREFIX=${PREFIX} ${SH} ${PKGINSTALL} ${PKGNAME} POST-INSTALL
--- cyrus-sasl.patch ends here ---


>Release-Note:
>Audit-Trail:
>Unformatted: