FreeBSD Bugzilla – Attachment 81022 Details for
Bug 116072
Cyrus-SASL support for net-im/jabberd and fix depends
Home
|
New
|
Browse
|
Search
|
[?]
|
Reports
|
Help
|
New Account
|
Log In
Remember
[x]
|
Forgot Password
Login:
[x]
[patch]
file.diff
file.diff (text/plain), 1.63 KB, created by
Alex Deiter
on 2007-09-04 08:00:03 UTC
(
hide
)
Description:
file.diff
Filename:
MIME Type:
Creator:
Alex Deiter
Created:
2007-09-04 08:00:03 UTC
Size:
1.63 KB
patch
obsolete
>--- 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
You cannot view the attachment while viewing its details because your browser does not support IFRAMEs.
View the attachment on a separate page
.
View Attachment As Diff
View Attachment As Raw
Actions:
View
|
Diff
Attachments on
bug 116072
: 81022