From owner-freebsd-ports-bugs@FreeBSD.ORG Wed Sep 16 03:10:03 2009 Return-Path: Delivered-To: freebsd-ports-bugs@hub.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 0E9091065672 for ; Wed, 16 Sep 2009 03:10:03 +0000 (UTC) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (freefall.freebsd.org [IPv6:2001:4f8:fff6::28]) by mx1.freebsd.org (Postfix) with ESMTP id D9A8D8FC16 for ; Wed, 16 Sep 2009 03:10:02 +0000 (UTC) Received: from freefall.freebsd.org (gnats@localhost [127.0.0.1]) by freefall.freebsd.org (8.14.3/8.14.3) with ESMTP id n8G3A2iJ031256 for ; Wed, 16 Sep 2009 03:10:02 GMT (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.14.3/8.14.3/Submit) id n8G3A2X1031255; Wed, 16 Sep 2009 03:10:02 GMT (envelope-from gnats) Resent-Date: Wed, 16 Sep 2009 03:10:02 GMT Resent-Message-Id: <200909160310.n8G3A2X1031255@freefall.freebsd.org> Resent-From: FreeBSD-gnats-submit@FreeBSD.org (GNATS Filer) Resent-To: freebsd-ports-bugs@FreeBSD.org Resent-Reply-To: FreeBSD-gnats-submit@FreeBSD.org, Alexander Nedotsukov Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id DB1191065670 for ; Wed, 16 Sep 2009 03:08:45 +0000 (UTC) (envelope-from bland@bbnest.net) Received: from mail2.asahi-net.or.jp (mail2.asahi-net.or.jp [202.224.39.198]) by mx1.freebsd.org (Postfix) with ESMTP id AB0048FC0A for ; Wed, 16 Sep 2009 03:08:45 +0000 (UTC) Received: from hub.bbnest.net (w133033.ppp.asahi-net.or.jp [121.1.133.33]) by mail2.asahi-net.or.jp (Postfix) with ESMTP id CE08776F3D for ; Wed, 16 Sep 2009 12:08:44 +0900 (JST) Received: from hub.bbnest.net (localhost [127.0.0.1]) by hub.bbnest.net (8.14.3/8.14.3) with ESMTP id n8G38b1v024086 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=NO) for ; Wed, 16 Sep 2009 12:08:37 +0900 (JST) (envelope-from bland@hub.bbnest.net) Received: (from bland@localhost) by hub.bbnest.net (8.14.3/8.14.3/Submit) id n8G38bKM024085; Wed, 16 Sep 2009 12:08:37 +0900 (JST) (envelope-from bland) Message-Id: <200909160308.n8G38bKM024085@hub.bbnest.net> Date: Wed, 16 Sep 2009 12:08:37 +0900 (JST) From: Alexander Nedotsukov To: FreeBSD-gnats-submit@FreeBSD.org X-Send-Pr-Version: 3.113 Cc: Subject: ports/138868: net-im/jabbed: Enable optional Cyrus-SASL support. X-BeenThere: freebsd-ports-bugs@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list Reply-To: Alexander Nedotsukov List-Id: Ports bug reports List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 16 Sep 2009 03:10:03 -0000 >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@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: