Date: Tue, 4 Sep 2007 06:59:42 GMT From: Alex Deiter <tiamat@komi.mts.ru> To: freebsd-gnats-submit@FreeBSD.org Subject: ports/116072: Cyrus-SASL support for net-im/jabberd and fix depends Message-ID: <200709040659.l846xgBV098538@www.freebsd.org> Resent-Message-ID: <200709040700.l84704tV054801@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 116072 >Category: ports >Synopsis: Cyrus-SASL support for net-im/jabberd and fix depends >Confidential: no >Severity: non-critical >Priority: low >Responsible: freebsd-ports-bugs >State: open >Quarter: >Keywords: >Date-Required: >Class: sw-bug >Submitter-Id: current-users >Arrival-Date: Tue Sep 04 07:00:03 GMT 2007 >Closed-Date: >Last-Modified: >Originator: Alex Deiter >Release: 6.2 >Organization: MTS Komi >Environment: FreeBSD builder.fine-solution.ru 6.2-RELEASE-p7fs FreeBSD 6.2-RELEASE-p7fs #0: Thu Aug 30 16:28:52 MSD 2007 root@builder.fine-solution.ru:/usr/obj/usr/src/sys/GENERIC i386 >Description: Hi, 1. Port net-im/jabberd can be build only with GNU SASL, but many ports used Cyrus-SASL. 2. Port net-im/jabberd have missed depends with WITH_SQLITE option. Thanks! >How-To-Repeat: cd /usr/ports/net-im/jabberd && make WITH_SQLITE=YES WITHOUT_MYSQL=YES WITH_BDB=YES WITH_LDAP=YES WITH_PAM=YES WITH_PIPE=YES install >Fix: Patch attached with submission follows: --- net-im/jabberd/Makefile.orig Tue Sep 4 08:56:26 2007 +++ net-im/jabberd/Makefile Tue Sep 4 10:53:46 2007 @@ -15,7 +15,6 @@ COMMENT= Online presence and instant messaging server LIB_DEPENDS= expat.6:${PORTSDIR}/textproc/expat2 \ - gsasl.10:${PORTSDIR}/security/gsasl \ idn.16:${PORTSDIR}/dns/libidn OPTIONS= MYSQL "Support MySQL (storage/auth/reg)" on \ @@ -27,6 +26,8 @@ PIPE "Enable pipe (auth/reg)" off \ ANON "Enable anonymous (auth/reg)" off \ FS "Filesystem storage (only for testing)" off \ + GSASL "GNU SASL auth" on \ + CYRUS_SASL "Cyrus SASL auth" off \ DEBUG "Compile with debug messages" on GNU_CONFIGURE= yes @@ -79,7 +80,7 @@ .if defined(WITH_SQLITE) CONFIGURE_ARGS+=--enable-sqlite -LIB_DEPENDS+= sqlite3.8:${PORTSDIR}/databases/sqlite3 +LIB_DEPENDS+= sqlite3.8:${PORTSDIR}/databases/sqlite3-threads CFLAGS+= ${PTHREAD_CFLAGS} PLIST_SUB+= SUB_SQLITE="" .else @@ -147,6 +148,18 @@ PLIST_SUB+= SUB_ANON="" .else PLIST_SUB+= SUB_ANON="@comment " +.endif + +.if defined(WITH_GSASL) && defined(WITH_CYRUS_SASL) +IGNORE= Cannot be compiled with both, gsasl and cyrus-sasl. Please (re)run 'make config' and deselect either GSASL or CYRUS_SASL +.elif defined(WITHOUT_GSASL) && defined(WITHOUT_CYRUS_SASL) +IGNORE= Is useless without a sasl library. Please (re)run 'make config' and choose either GSASL or CYRUS_SASL +.elif defined(WITH_GSASL) +CONFIGURE_ARGS+= --enable-sasl=gsasl +LIB_DEPENDS+= gsasl.10:${PORTSDIR}/security/gsasl +.elif defined(WITH_CYRUS_SASL) +CONFIGURE_ARGS+= --enable-sasl=cyrus +LIB_DEPENDS+= sasl2.2:${PORTSDIR}/security/cyrus-sasl2 .endif MAN8= c2s.8 jabberd.8 resolver.8 router.8 s2s.8 sm.8 >Release-Note: >Audit-Trail: >Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200709040659.l846xgBV098538>