Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] GIT changes to master grimoire by Eric Sandall (0e918915e6217e09294a20b17e06f8e2f6d5249b)

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

Chronological Thread  
  • From: Eric Sandall <scm AT sourcemage.org>
  • To: sm-commit AT lists.ibiblio.org
  • Subject: [SM-Commit] GIT changes to master grimoire by Eric Sandall (0e918915e6217e09294a20b17e06f8e2f6d5249b)
  • Date: Sat, 28 Jul 2007 18:03:28 -0500

GIT changes to master grimoire by Eric Sandall <sandalle AT sourcemage.org>:

mail/exim/BUILD | 49 +++++++++-----------------
mail/exim/CONFIGURE | 97
++++++++--------------------------------------------
mail/exim/DEPENDS | 88 +++++++++++++++++++++++++----------------------
mail/exim/HISTORY | 10 +++++
mail/exim/PREPARE | 40 +++++++++++----------
5 files changed, 113 insertions(+), 171 deletions(-)

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 :)

diff --git a/mail/exim/BUILD b/mail/exim/BUILD
index 2b097cf..5de45fe 100755
--- a/mail/exim/BUILD
+++ b/mail/exim/BUILD
@@ -29,66 +29,56 @@ chgrp -R exim $INSTALL_ROOT/var/spool/mail &&

mkdir -p Local &&

-if [[ "$EXIM_XFREE86" == "y" ]]
-then
+if list_find "$OPTS" '--enable-x11-monitor'; then
cp src/EDITME Local/Makefile &&
cp exim_monitor/EDITME Local/eximon.conf
else
grep -v "EXIM_MONITOR=" src/EDITME > Local/Makefile
fi &&

-if [[ "$EXIM_TCPWRAPPERS" == "y" ]]
-then
+if list_find "$OPTS" '--enable-tcp-wrappers-access'; then
echo "USE_TCP_WRAPPERS=yes" >> Local/Makefile &&
EXTRALIBS="$EXTRALIBS -lwrap"
fi &&

-if [[ "$EXIM_LINUXPAM" == "y" ]]
-then
+if list_find "$OPTS" '--enable-linux-pam-auth'; then
echo "SUPPORT_PAM=yes" >> Local/Makefile &&
- if spell_ok tcp_wrappers
- then EXTRALIBS="$EXTRALIBS -lpam -ldl -lwrap"
- else EXTRALIBS="$EXTRALIBS -lpam -ldl"
+ if list_find "$OPTS" '--enable-tcp-wrappers-access'; then
+ EXTRALIBS="$EXTRALIBS -lpam -ldl -lwrap"
+ else
+ EXTRALIBS="$EXTRALIBS -lpam -ldl"
fi
fi &&

-if [[ "$EXIM_MYSQL" == "y" ]]
-then
+if list_find "$OPTS" '--enable-mysql-lookup'; then
echo "LOOKUP_MYSQL=yes" >> Local/Makefile &&
echo "LOOKUP_INCLUDE=-I /usr/include/mysql" >> Local/Makefile &&
LOOKUP_LIBS="$LOOKUP_LIBS -lmysqlclient"
fi &&

-if [[ "$EXIM_SQLITE" == "y" ]]
-then
+if list_find "$OPTS" '--enable-sqlite-lookup'; then
echo "LOOKUP_SQLITE=yes" >> Local/Makefile &&
LOOKUP_LIBS="$LOOKUP_LIBS -lsqlite3"
fi &&

-if [[ "$EXIM_PGSQL" == "y" ]]
-then
+if list_find "$OPTS" '--enable-postgresql-lookup'; then
echo "LOOKUP_PGSQL=yes" >> Local/Makefile &&
LOOKUP_LIBS="$LOOKUP_LIBS -lpq"
fi &&

-if [[ "$EXIM_OPENLDAP" == "y" ]]
-then
+if list_find "$OPTS" '--enable-openldap-lookup'; then
echo "LOOKUP_LDAP=yes" >> Local/Makefile &&
echo "LDAP_LIB_TYPE=OPENLDAP2" >> Local/Makefile &&
LOOKUP_LIBS="$LOOKUP_LIBS -lldap -llber"
fi &&

-if [[ "$EXIM_OPENSSL" == "y" ]]
-then
- echo "SUPPORT_TLS=yes" >> Local/Makefile &&
- echo "TLS_LIBS=-lssl -lcrypto" >> Local/Makefile
-fi &&
-
-if [[ "$EXIM_GNUTLS" == "y" ]]
-then
+if [[ "$EXIM_TLS" == "gnutls" ]]; then
echo "SUPPORT_TLS=yes" >> Local/Makefile &&
echo "USE_GNUTLS=yes" >> Local/Makefile &&
echo "TLS_LIBS=-lgnutls -ltasn1 -lgcrypt" >> Local/Makefile
+elif [[ "$EXIM_TLS" == "openssl" ]]; then
+ echo "SUPPORT_TLS=yes" >> Local/Makefile &&
+ echo "TLS_LIBS=-lssl -lcrypto" >> Local/Makefile
fi &&

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 &&

-if [ "$EXIM_XFREE86" == "y" ]; then
- depends X11-LIBS
-fi &&
-
-if [ "$EXIM_TCPWRAPPERS" == "y" ]; then
- depends tcp_wrappers
+if [[ "$EXIM_TLS" == "y" ]]; then
+ depends gnutls &&
+ depends libgcrypt &&
+ depends libtasn1
+elif [[ "$EXIM_TLS" == "openssl" ]]; then
+ depends openssl
fi &&

-if [ "$EXIM_MYSQL" == "y" ]; then
- depends mysql
-fi &&
+optional_depends cyrus-sasl \
+ '--enable-cyrus-sasl-auth' \
+ '--disable-cyrus-sasl-auth' \
+ 'for Cyrus SASL authentication' &&

-if [ "$EXIM_SQLITE" == "y" ]; then
- depends sqlite
-fi &&
+optional_depends dovecot \
+ '--enable-dovecot-auth' \
+ '--disable-dovecot-auth' \
+ 'for Dovecot POP3/IMAP authentication' &&

+optional_depends linux-pam \
+ '--enable-linux-pam-auth' \
+ '--disable-linux-pam-auth' \
+ 'for Linux Pluggable Authentication Module support' &&

-if [ "$EXIM_PGSQL" == "y" ]; then
- depends postgresql
-fi &&
+optional_depends mysql \
+ '--enable-mysql-lookup' \
+ '--disable-mysql-lookup' \
+ 'for MySQL-based SQL lookup tables' &&

-if [ "$EXIM_LINUXPAM" == "y" ]; then
- depends linux-pam
-fi &&
+optional_depends openldap \
+ '--enable-openldap-lookup' \
+ '--disable-openldap-lookup' \
+ 'for OpenLDAP lookup tables' &&

-if [ "$EXIM_OPENLDAP" == "y" ]; then
- depends openldap
-fi &&
+optional_depends postgresql \
+ '--enable-postgresql-lookup' \
+ '--disable-postgresql-lookup' \
+ 'for PostgreSQL-based SQL lookup tables' &&

-if [ "$EXIM_OPENSSL" == "y" ]; then
- depends openssl
-fi &&
+optional_depends readline \
+ '--enable-readline-testing' \
+ '--disable-readline-testing' \
+ 'for read data testing' &&

-if [ "$EXIM_GNUTLS" == "y" ]; then
- depends gnutls &&
- depends libgcrypt &&
- depends libtasn1
-fi &&
+optional_depends sqlite \
+ '--enable-sqlite-lookup' \
+ '--disable-sqlite-lookup' \
+ 'for sqlite-based SQL lookup tables' &&

-if [ "$EXIM_SASL" == "y" ]; then
- depends cyrus-sasl
-fi &&
+optional_depends tcp_wrappers \
+ '--enable-tcp-wrappers-access' \
+ '--disable-tcp-wrappers-access' \
+ 'for TCP wrapper access control' &&

-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

2007-03-27 Andraž "ruskie" Levstik <ruskie AT mages.ath.cx>
diff --git a/mail/exim/PREPARE b/mail/exim/PREPARE
index 9402c3e..825c6f8 100755
--- a/mail/exim/PREPARE
+++ b/mail/exim/PREPARE
@@ -1,19 +1,21 @@
-config_query_list EXIM_MIRRORS \
- "Which group of exim mirrors would you like to use?" \
- "austria" \
- "belgium" \
- "canada" \
- "czech-republic" \
- "denmark" \
- "france" \
- "germany" \
- "indonesia" \
- "ireland" \
- "japan" \
- "netherlands" \
- "norway" \
- "poland" \
- "south-africa" \
- "switzerland" \
- "united-kingdom" \
- "united-states"
+source $GRIMOIRE/config_query_multi.function &&
+
+config_query_multi EXIM_MIRRORS \
+ "Which group of exim mirrors would you like to use?" \
+ "austria" \
+ "belgium" \
+ "canada" \
+ "czech-republic" \
+ "denmark" \
+ "france" \
+ "germany" \
+ "indonesia" \
+ "ireland" \
+ "japan" \
+ "netherlands" \
+ "norway" \
+ "poland" \
+ "south-africa" \
+ "switzerland" \
+ "united-kingdom" \
+ "united-states"



  • [SM-Commit] GIT changes to master grimoire by Eric Sandall (0e918915e6217e09294a20b17e06f8e2f6d5249b), Eric Sandall, 07/28/2007

Archive powered by MHonArc 2.6.24.

Top of Page