New commits:
commit 0e918915e6217e09294a20b17e06f8e2f6d5249b
Author: Eric Sandall <sandalle AT sourcemage.org>
Commit: Eric Sandall <sandalle AT sourcemage.org>
exim: Clean up CONFIGUREd dependencies to be REAL dependencies :)
if [[ "$EXIM_MAILDIR" == "y" ]]
@@ -136,8 +126,7 @@ then
echo "AUTH_CRAM_MD5=yes" >> Local/Makefile
fi &&
-if [[ "$EXIM_SASL" == "y" ]]
-then
+if list_find "$OPTS" '--enable-cyrus-sasl-auth'; then
echo "AUTH_CYRUS_SASL=yes" >> Local/Makefile &&
echo "AUTH_LIBS=-lsasl2" >> Local/Makefile
fi &&
@@ -147,8 +136,7 @@ then
echo "AUTH_PLAINTEXT=yes" >> Local/Makefile
fi &&
-if list_find "$OPTS" '--enable-dovecot-auth'
-then
+if list_find "$OPTS" '--enable-dovecot-auth'; then
echo 'AUTH_DOVECOT=yes' >> Local/Makefile
fi &&
@@ -157,8 +145,7 @@ then
echo "AUTH_SPA=yes" >> Local/Makefile
fi &&
-if [[ "$EXIM_READLINE" == "y" ]]
-then
+if list_find "$OPTS" '--enable-readline-testing'; then
echo "USE_READLINE=yes" >> Local/Makefile &&
EXTRALIBS="$EXTRALIBS -ldl"
fi &&
diff --git a/mail/exim/CONFIGURE b/mail/exim/CONFIGURE
index 9285588..6ac9dca 100755
--- a/mail/exim/CONFIGURE
+++ b/mail/exim/CONFIGURE
@@ -3,10 +3,6 @@ config_query EXIM_MAILSTORE "Support mailstore for
appendfile transport?" n &&
config_query EXIM_MBX "Support MBX for appendfile transport?" n
&&
config_query EXIM_NIS "Enable NIS lookups?" n
&&
config_query EXIM_NISPLUS "Enable NIS+ lookups?" n
&&
-#
-# Oracle doesn't quite compile...
-#
-#config_query EXIM_ORACLE "Enable Oracle lookups?"
n &&
config_query EXIM_PASSWD "Enable /etc/passwd lookups?" n
&&
config_query EXIM_SCAN "Enable content scanning (exiscan)?" n
&&
config_query EXIM_MD5 "Enable cram/md5 authentication?" n
&&
@@ -14,85 +10,24 @@ config_query EXIM_PLAINTEXT "Enable plaintext
authentication?" n &&
config_query EXIM_SPA "Enable SPA authentication?" n
&&
config_query EXIM_FROZEN "Enable moving frozen messages?" n
&&
-
-message "Exim can use either hc-cron or or fcron" \
- "to periodically attempt to resend undelivered mail" &&
-
-if spell_ok hc-cron; then
- config_query EXIM_HCCRON "Attempt to resend undelivered via hc-cron?" y
-else
- config_query EXIM_HCCRON "Attempt to resend undelivered via hc-cron?" n
-fi &&
-
-if spell_ok fcron; then
- config_query EXIM_FCRON "Attempt to resend undelivered via fcron?" y
-else
- config_query EXIM_FCRON "Attempt to resend undelivered via fcron?" n
-fi &&
-
-# The spell only mentioned xfree86, haven't tested with others
-if provider_ok X11-LIBS; then
- config_query EXIM_XFREE86 "Build X11 exim monitor?" y
-else
- config_query EXIM_XFREE86 "Build X11 exim monitor?" n
-fi &&
-
-if spell_ok tcp_wrappers; then
- config_query EXIM_TCPWRAPPERS "Use tcp_wrappers for controlling access?"
y
-else
- config_query EXIM_TCPWRAPPERS "Use tcp_wrappers for controlling access?"
n
-fi &&
-
-if spell_ok mysql; then
- config_query EXIM_MYSQL "Use mysql for SQL lookup tables?" y
-else
- config_query EXIM_MYSQL "Use mysql for SQL lookup tables?" n
-fi &&
-
-if spell_ok sqlite; then
- config_query EXIM_SQLITE "Use sqlite for SQL lookup tables?" y
-else
- config_query EXIM_SQLITE "Use sqlite for SQL lookup tables?" n
-fi &&
-
-if spell_ok postgresql; then
- config_query EXIM_PGSQL "Use postgresql for SQL lookup tables?" y
-else
- config_query EXIM_PGSQL "Use postgresql for SQL lookup tables?" n
-fi &&
-
-if spell_ok linux-pam; then
- config_query EXIM_LINUXPAM "Use linux-pam For PAM authentication?" y
-else
- config_query EXIM_LINUXPAM "Use linux-pam For PAM authentication?" n
-fi &&
-
-if spell_ok openldap; then
- config_query EXIM_OPENLDAP "Use openldap for LDAP lookup tables?" y
-else
- config_query EXIM_OPENLDAP "Use openldap for LDAP lookup tables?" n
-fi &&
-
-if spell_ok openssl; then
- config_query EXIM_OPENSSL "Use openssl for TLS support?" y
-else
- config_query EXIM_OPENSSL "Use openssl for TLS support?" n
-fi &&
-
-if spell_ok gnutls; then
- config_query EXIM_GNUTLS "Use gnutls for TLS support?" y
-else
- config_query EXIM_GNUTLS "Use gnutls for TLS support?" n
-fi &&
-
-if spell_ok cyrus-sasl; then
- config_query EXIM_SASL "Use cyrus-sasl for authentication?" y
+if spell_ok hc-cron; then
+ config_query_list EXIM_CRON "Use which cron to resend undelivered mail?"
\
+ hc-cron fcron none
+elif spell_ok fcron; then
+ config_query_list EXIM_CRON "Use which cron to resend undelivered mail?"
\
+ fcron hc-cron none
else
- config_query EXIM_SASL "Use cyrus-sasl for authentication?" n
+ config_query_list EXIM_CRON "Use which cron to resend undelivered mail?"
\
+ none hc-cron fcron
fi &&
-if spell_ok readline; then
- config_query EXIM_READLINE "Use readline for read data testing?" y
+if spell_ok gnutls; then
+ config_query_list EXIM_TLS 'Enable GNU TLS support?' \
+ gnutls openssl
+elif spell_ok openssl; then
+ config_query_list EXIM_TLS 'Enable GNU TLS support?' \
+ openssl gnutls
else
- config_query EXIM_READLINE "Use readline for read data testing?" n
+ config_query_list EXIM_TLS 'Enable GNU TLS support?' \
+ gnutls openssl
fi
diff --git a/mail/exim/DEPENDS b/mail/exim/DEPENDS
index 798fc7f..3e369cc 100755
--- a/mail/exim/DEPENDS
+++ b/mail/exim/DEPENDS
@@ -1,58 +1,66 @@
depends db &&
depends gawk &&
-if [ "$EXIM_HCCRON" == "y" ]; then
+if [[ "$EXIM_CRON" == "hc-cron" ]]; then
depends hc-cron
-fi &&
-
-if [ "$EXIM_FCRON" == "y" ]; then
+elif [[ "$EXIM_CRON" == "fcron" ]]; then
depends fcron
fi &&
-optional_depends dovecot \
- '--enable-dovecot-auth' \
- '--disable-dovecot-auth' \
- 'for Dovecot POP3/IMAP authentication'
+optional_depends X11-LIBS \
+ '--enable-x11-monitor' \
+ '--disable-x11-monitor' \
+ 'for X monitor'
diff --git a/mail/exim/HISTORY b/mail/exim/HISTORY
index 9aecf86..f86433f 100644
--- a/mail/exim/HISTORY
+++ b/mail/exim/HISTORY
@@ -1,5 +1,15 @@
2007-07-28 Eric Sandall <sandalle AT sourcemage.org>
+ * PREPARE: Use config_query_multi as the list is too large (16!) for
+ config_query_list
+ * CONFIGURE: Changed cyrus-sasl, dovecot, linux-pam, mysql, openldap,
+ postgresql, readline, sqlite, tcp_wrappers, and X11-LIBS from
CONFIGUREd
+ hard dependencies to true optional_depends.
+ Made query for hc-cron or fcron a config_query_list, may only
choose one
+ Only query for gnutls support, openssl support fails to build
* DEPENDS: Optionally depend on dovecot for authentication
+ Changed cyrus-sasl, dovecot, linux-pam, mysql, openldap, postgresql,
+ readline, sqlite, tcp_wrappers, and X11-LIBS from CONFIGUREd hard
+ dependencies to true optional_depends.
* BUILD: Build Dovecot authentication if wanted