New commits:
commit 76daef94d15bbfdfce98b0a3379c5c896054f5ca
Author: Eric Sandall <sandalle AT sourcemage.org>
Commit: Eric Sandall <sandalle AT sourcemage.org>
Updated exim to 4.62 and cleaned up PREPARE
commit a7df4d07a92ddc60db69eb6cd592a47c17b7f76c
Author: Eric Sandall <sandalle AT sourcemage.org>
Commit: Eric Sandall <sandalle AT sourcemage.org>
Fix the symlink madness
commit a16ca3bf201786ed5ac120c31e5f14a0445559ee
Author: Eric Sandall <sandalle AT sourcemage.org>
Commit: Eric Sandall <sandalle AT sourcemage.org>
Fixes bug #10158
commit 1598d023def6c1ae25d5bc180e0c6c03929722b2
Author: Eric Sandall <sandalle AT sourcemage.org>
Commit: Eric Sandall <sandalle AT sourcemage.org>
Take ownership of exim
diff --git a/mail/MAINTAINER b/mail/MAINTAINER
index 72792b8..c70bf30 100644
--- a/mail/MAINTAINER
+++ b/mail/MAINTAINER
@@ -1,5 +1,6 @@
David Kowis <dkowis AT shlrm.org>
etpan-ng - Andraž "ruskie" Levstik <ruskie AT mages.ath.cx>
+exim - Eric Sandall <sandalle AT sourcemage.org>
libetpan - Andraž "ruskie" Levstik <ruskie AT mages.ath.cx>
gurgitate-mail - Andraž "ruskie" Levstik <ruskie AT mages.ath.cx>
mpop - Andraž "ruskie" Levstik <ruskie AT mages.ath.cx>
diff --git a/mail/exim/CONFIGURE b/mail/exim/CONFIGURE
index ac30d45..3deccbe 100755
--- a/mail/exim/CONFIGURE
+++ b/mail/exim/CONFIGURE
@@ -12,4 +12,81 @@ config_query EXIM_SCAN "Enable cont
config_query EXIM_MD5 "Enable cram/md5 authentication?" n
&&
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
+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 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
+else
+ config_query EXIM_SASL "Use cyrus-sasl for authentication?" n
+fi &&
+
+if spell_ok readline; then
+ config_query EXIM_READLINE "Use readline for read data testing?" y
+else
+ config_query EXIM_READLINE "Use readline for read data testing?" n
+fi
diff --git a/mail/exim/DEPENDS b/mail/exim/DEPENDS
index 9a30b23..4d553cb 100755
--- a/mail/exim/DEPENDS
+++ b/mail/exim/DEPENDS
@@ -1,140 +1,46 @@
depends db &&
depends gawk &&
-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 postgresql
-then
- config_query EXIM_PGSQL "Use postgresql for SQL lookup tables?" y
-else
- config_query EXIM_PGSQL "Use postgresql for SQL lookup tables?" y
-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
-else
- config_query EXIM_SASL "Use cyrus-sasl for authentication?" n
-fi &&
-
-if spell_ok readline
-then
- config_query EXIM_READLINE "Use readline for read data testing?" y
-else
- config_query EXIM_READLINE "Use readline for read data testing?" n
-fi &&
-
-if [ "$EXIM_HCCRON" == "y" ]
-then
+if [ "$EXIM_HCCRON" == "y" ]; then
depends hc-cron
fi &&
-if [ "$EXIM_FCRON" == "y" ]
-then
+if [ "$EXIM_FCRON" == "y" ]; then
depends fcron
fi &&
-if [ "$EXIM_XFREE86" == "y" ]
-then
+if [ "$EXIM_XFREE86" == "y" ]; then
depends X11-LIBS
fi &&
-if [ "$EXIM_TCPWRAPPERS" == "y" ]
-then
+if [ "$EXIM_TCPWRAPPERS" == "y" ]; then
depends tcp_wrappers
fi &&
-if [ "$EXIM_MYSQL" == "y" ]
-then
+if [ "$EXIM_MYSQL" == "y" ]; then
depends mysql
fi &&
SOURCE2_URL[1]=http://mirror.fr.claryss.net/ftp.exim.org/exim/exim4/$SOURCE2
-fi
-if [[ "$EXIM_MIRRORS" == "indonesia" ]]
-then
+elif [[ "$EXIM_MIRRORS" == "indonesia" ]]; then
SOURCE_URL[0]=ftp://mirror.cbn.net.id/pub/exim//exim4/$SOURCE
SOURCE2_URL[0]=ftp://mirror.cbn.net.id/pub/exim//exim4/$SOURCE2
+else # "united-states" list
+ SOURCE_URL[0]=ftp://ftp.gr-linux.com/pub/exim/exim/exim4/$SOURCE
+ SOURCE_URL[1]=http://www.mirrormonster.com/exim/exim4/$SOURCE
+ SOURCE_URL[2]=ftp://ftp.fsckit.net/pub/exim/exim4/$SOURCE
+ SOURCE2_URL[0]=ftp://ftp.gr-linux.com/pub/exim/exim/exim4/$SOURCE2
+ SOURCE2_URL[1]=http://www.mirrormonster.com/exim/exim4/$SOURCE2
+ SOURCE2_URL[2]=ftp://ftp.fsckit.net/pub/exim/exim4/$SOURCE2
fi
- WEB_SITE=http://www.exim.org
- ENTERED=20020227
- UPDATED=20050302
LICENSE[0]=GPL
- BUILD_API=2
+ WEB_SITE=http://www.exim.org/
KEYWORDS="email mail"
+ ENTERED=20020227
SHORT="An e-mail server"
cat << EOF
Exim is a message transfer agent (MTA) developed at the University of
diff --git a/mail/exim/HISTORY b/mail/exim/HISTORY
index 2b13b32..4c90419 100644
--- a/mail/exim/HISTORY
+++ b/mail/exim/HISTORY
@@ -1,3 +1,20 @@
+2006-07-13 Eric Sandall <eric AT sandall.us>
+ * DETAILS: Updated to 4.62.
+ Use if/elif instead of a lot of ifs for SOURCE_URLs.
+ Have a last else for SOURCE_URLs in case EXIM_MIRRORS hasn't been
+ configured yet (duplicate "united-states" list for else).
+ Removed UPDATED and BUILD_API=2 (grimoire-wide).
+ * PREPARE: Alphabatize mirror list (easier to find your location).
+ One mirror per line to make it easier to add/remove entries.
+ * CONFIGURE: Added config_queries from DEPENDS (Bug #10158)
+ * DEPENDS: If postgresql is not installed, don't default to using
+ it (Bug #10158).
+ Removed config_queries (moved to CONFIGURE) (Bug #10158)
+ Added missing check and dependency for postgresql (Bug #10158)
+ * INSTALL: Not sure what symlink magic was being played here, but the
exim
+ binary most certainly isn't in INSTALL_ROOT/, it's in
+ INSTALL_ROOT/usr/sbin. Fixed the links appropriately.
+
2006-03-12 Karsten Behrmann <BearPerson AT sourcemage.org>
* DETAILS: (automated) Add KEYWORDS
diff --git a/mail/exim/INSTALL b/mail/exim/INSTALL
index 7a654b3..e90366a 100755
--- a/mail/exim/INSTALL
+++ b/mail/exim/INSTALL
@@ -14,13 +14,13 @@ message "Look @ /usr/doc/exim/doc for co
cp -v src/convert*.src doc/ &&