Skip to Content.
Sympa Menu

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

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

Chronological Thread  
  • From: Eric Sandall <scm AT mail.sourcemage.org>
  • To: sm-commit AT lists.ibiblio.org
  • Subject: [SM-Commit] GIT changes to master grimoire by Eric Sandall (76daef94d15bbfdfce98b0a3379c5c896054f5ca)
  • Date: Thu, 13 Jul 2006 21:47:42 -0500

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

mail/MAINTAINER | 1
mail/exim/CONFIGURE | 79 +++++++++++++++++++++++++++++++++
mail/exim/DEPENDS | 122
+++++-----------------------------------------------
mail/exim/DETAILS | 82 +++++++++++-----------------------
mail/exim/HISTORY | 17 +++++++
mail/exim/INSTALL | 14 ++---
mail/exim/PREPARE | 24 ++++++++--
7 files changed, 163 insertions(+), 176 deletions(-)

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

-if [ "$EXIM_LINUXPAM" == "y" ]
-then
+if [ "$EXIM_PGSQL" == "y" ]; then
+ depends postgresql
+fi &&
+
+if [ "$EXIM_LINUXPAM" == "y" ]; then
depends linux-pam
fi &&

-if [ "$EXIM_OPENLDAP" == "y" ]
-then
+if [ "$EXIM_OPENLDAP" == "y" ]; then
depends openldap
fi &&

-if [ "$EXIM_OPENSSL" == "y" ]
-then
+if [ "$EXIM_OPENSSL" == "y" ]; then
depends openssl
fi &&

-if [ "$EXIM_GNUTLS" == "y" ]
-then
+if [ "$EXIM_GNUTLS" == "y" ]; then
depends gnutls
fi &&

-if [ "$EXIM_SASL" == "y" ]
-then
+if [ "$EXIM_SASL" == "y" ]; then
depends cyrus-sasl
fi
diff --git a/mail/exim/DETAILS b/mail/exim/DETAILS
index 63a46e3..870613c 100755
--- a/mail/exim/DETAILS
+++ b/mail/exim/DETAILS
@@ -1,21 +1,18 @@
SPELL=exim
- VERSION=4.60
+ VERSION=4.62
SOURCE=$SPELL-$VERSION.tar.bz2
SOURCE2=$SOURCE.sig
SOURCE_GPG="exim.gpg:$SOURCE2:VERIFIED_UPSTREAM_KEY"
SOURCE2_IGNORE=signature
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
-if [[ "$EXIM_MIRRORS" == "austria" ]]
-then
+if [[ "$EXIM_MIRRORS" == "austria" ]]; then
SOURCE_URL[0]=http://gd.tuwien.ac.at/infosys/mail/exim/exim/exim4/$SOURCE
SOURCE_URL[1]=ftp://gd.tuwien.ac.at/infosys/mail/exim/exim/exim4/$SOURCE
SOURCE_URL[2]=ftp://exim.inode.at/exim/exim4/$SOURCE
SOURCE2_URL[0]=http://gd.tuwien.ac.at/infosys/mail/exim/exim/exim4/$SOURCE2
SOURCE2_URL[1]=ftp://gd.tuwien.ac.at/infosys/mail/exim/exim/exim4/$SOURCE2
SOURCE2_URL[2]=ftp://exim.inode.at/exim/exim4/$SOURCE2
-fi
-if [[ "$EXIM_MIRRORS" == "germany" ]]
-then
+elif [[ "$EXIM_MIRRORS" == "germany" ]]; then

SOURCE_URL[0]=ftp://ftp.freenet.de/pub/ftp.csx.cam.ac.uk/pub/software/email/exim/exim4/$SOURCE
SOURCE_URL[1]=ftp://exim.noris.de/exim/exim4/$SOURCE
SOURCE_URL[2]=ftp://ftp.bytemine.net/exim/exim/exim4/$SOURCE
@@ -24,9 +21,7 @@ then
SOURCE2_URL[1]=ftp://exim.noris.de/exim/exim4/$SOURCE2
SOURCE2_URL[2]=ftp://ftp.bytemine.net/exim/exim/exim4/$SOURCE2
SOURCE2_URL[3]=ftp://ftp.tin.org/pub/mail/exim//exim4/$SOURCE2
-fi
-if [[ "$EXIM_MIRRORS" == "netherlands" ]]
-then
+elif [[ "$EXIM_MIRRORS" == "netherlands" ]]; then
SOURCE_URL[0]=http://ftp.easynet.nl/mirror/exim/exim/exim4/$SOURCE
SOURCE_URL[1]=ftp://ftp.eu.uu.net/pub/unix/mail/exim/exim/exim4/$SOURCE
SOURCE_URL[2]=ftp://ftp.demon.nl/pub/mirrors/exim//exim4/$SOURCE
@@ -35,18 +30,14 @@ then
SOURCE2_URL[1]=ftp://ftp.eu.uu.net/pub/unix/mail/exim/exim/exim4/$SOURCE2
SOURCE2_URL[2]=ftp://ftp.demon.nl/pub/mirrors/exim//exim4/$SOURCE2
SOURCE2_URL[3]=ftp://ftp.easynet.nl/mirror/exim/exim/exim4/$SOURCE2
-fi
-if [[ "$EXIM_MIRRORS" == "switzerland" ]]
-then
+elif [[ "$EXIM_MIRRORS" == "switzerland" ]]; then
SOURCE_URL[0]=ftp://mirror.switch.ch/mirror/exim/exim/exim4/$SOURCE
SOURCE_URL[1]=http://mirror.switch.ch/ftp/mirror/exim/exim/exim4/$SOURCE
SOURCE_URL[2]=ftp://exim.zic-network.ch/exim/exim/exim4/$SOURCE
SOURCE2_URL[0]=ftp://mirror.switch.ch/mirror/exim/exim/exim4/$SOURCE2
SOURCE2_URL[1]=http://mirror.switch.ch/ftp/mirror/exim/exim/exim4/$SOURCE2
SOURCE2_URL[2]=ftp://exim.zic-network.ch/exim/exim/exim4/$SOURCE2
-fi
-if [[ "$EXIM_MIRRORS" == "united-kingdom" ]]
-then
+elif [[ "$EXIM_MIRRORS" == "united-kingdom" ]]; then
SOURCE_URL[0]=ftp://ftp.exim.org/pub/exim/exim4/$SOURCE

SOURCE_URL[1]=ftp://ftp.mirrorservice.org/sites/ftp.csx.cam.ac.uk/pub/software/email/exim/exim4/$SOURCE

SOURCE_URL[2]=http://www.mirrorservice.org/sites/ftp.csx.cam.ac.uk/pub/software/email/exim/exim4/$SOURCE
@@ -55,87 +46,68 @@ then

SOURCE2_URL[1]=ftp://ftp.mirrorservice.org/sites/ftp.csx.cam.ac.uk/pub/software/email/exim/exim4/$SOURCE2

SOURCE2_URL[2]=http://www.mirrorservice.org/sites/ftp.csx.cam.ac.uk/pub/software/email/exim/exim4/$SOURCE2
SOURCE2_URL[3]=ftp://ftp.demon.co.uk/pub/mirrors/exim/exim4/$SOURCE2
-fi
-if [[ "$EXIM_MIRRORS" == "united-states" ]]
-then
+elif [[ "$EXIM_MIRRORS" == "united-states" ]]; then
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
-if [[ "$EXIM_MIRRORS" == "ireland" ]]
-then
+elif [[ "$EXIM_MIRRORS" == "ireland" ]]; then

SOURCE_URL[0]=ftp://ftp.esat.net/pub/networking/mail/mta/exim/exim4/$SOURCE

SOURCE_URL[1]=http://ftp.esat.net/pub/networking/mail/mta/exim/exim4/$SOURCE

SOURCE2_URL[0]=ftp://ftp.esat.net/pub/networking/mail/mta/exim/exim4/$SOURCE2

SOURCE2_URL[1]=http://ftp.esat.net/pub/networking/mail/mta/exim/exim4/$SOURCE2
-fi
-if [[ "$EXIM_MIRRORS" == "japan" ]]
-then
+elif [[ "$EXIM_MIRRORS" == "japan" ]]; then
SOURCE_URL[0]=http://washitake.com/mail/exim/mirror/exim/exim4/$SOURCE
SOURCE2_URL[0]=http://washitake.com/mail/exim/mirror/exim/exim4/$SOURCE2
-fi
-if [[ "$EXIM_MIRRORS" == "norway" ]]
-then
+elif [[ "$EXIM_MIRRORS" == "norway" ]]; then
SOURCE_URL[0]=ftp://sunsite.uio.no/pub/mail/exim/exim/exim4/$SOURCE
SOURCE2_URL[0]=ftp://sunsite.uio.no/pub/mail/exim/exim/exim4/$SOURCE2
-fi
-if [[ "$EXIM_MIRRORS" == "poland" ]]
-then
+elif [[ "$EXIM_MIRRORS" == "poland" ]]; then

SOURCE_URL[0]=ftp://sunsite.icm.edu.pl/pub/unix/mail/exim/exim/exim4/$SOURCE

SOURCE_URL[1]=http://sunsite.icm.edu.pl/pub/unix/mail/exim/exim/exim4/$SOURCE

SOURCE2_URL[0]=ftp://sunsite.icm.edu.pl/pub/unix/mail/exim/exim/exim4/$SOURCE2

SOURCE2_URL[1]=http://sunsite.icm.edu.pl/pub/unix/mail/exim/exim/exim4/$SOURCE2
-fi
-if [[ "$EXIM_MIRRORS" == "south-africa" ]]
-then
+elif [[ "$EXIM_MIRRORS" == "south-africa" ]]; then

SOURCE_URL[0]=ftp://ftp.is.co.za/networking/mail/transport/exim/exim4/$SOURCE

SOURCE2_URL[0]=ftp://ftp.is.co.za/networking/mail/transport/exim/exim4/$SOURCE2
-fi
-if [[ "$EXIM_MIRRORS" == "belgium" ]]
-then
+elif [[ "$EXIM_MIRRORS" == "belgium" ]]; then
SOURCE_URL[0]=ftp://ftp.easynet.be/exim/exim/exim4/$SOURCE
SOURCE2_URL[0]=ftp://ftp.easynet.be/exim/exim/exim4/$SOURCE2
-fi
-if [[ "$EXIM_MIRRORS" == "canada" ]]
-then
+elif [[ "$EXIM_MIRRORS" == "canada" ]]; then
SOURCE_URL[0]=ftp://mirror.direct.ca/pub/exim/exim/exim4/$SOURCE
SOURCE_URL[1]=http://exim-ftp.meulie.net/exim//exim4/$SOURCE
SOURCE2_URL[0]=ftp://mirror.direct.ca/pub/exim/exim/exim4/$SOURCE2
SOURCE2_URL[1]=http://exim-ftp.meulie.net/exim//exim4/$SOURCE2
-fi
-if [[ "$EXIM_MIRRORS" == "czech-republic" ]]
-then
+elif [[ "$EXIM_MIRRORS" == "czech-republic" ]]; then
SOURCE_URL[0]=ftp://mirror.kn.vutbr.cz/pub/ftp.exim.org/exim/exim4/$SOURCE

SOURCE2_URL[0]=ftp://mirror.kn.vutbr.cz/pub/ftp.exim.org/exim/exim4/$SOURCE2
-fi
-if [[ "$EXIM_MIRRORS" == "denmark" ]]
-then
+elif [[ "$EXIM_MIRRORS" == "denmark" ]]; then
SOURCE_URL[0]=ftp://sunsite.auc.dk/pub/mail/exim/exim/exim4/$SOURCE
SOURCE_URL[1]=http://ftp.sunsite.dk/pub/mail/exim/exim//exim4/$SOURCE
SOURCE2_URL[0]=ftp://sunsite.auc.dk/pub/mail/exim/exim/exim4/$SOURCE2
SOURCE2_URL[1]=http://ftp.sunsite.dk/pub/mail/exim/exim//exim4/$SOURCE2
-fi
-if [[ "$EXIM_MIRRORS" == "france" ]]
-then
+elif [[ "$EXIM_MIRRORS" == "france" ]]; then
SOURCE_URL[0]=http://exim.mirror.fr//exim4/$SOURCE
SOURCE_URL[1]=http://mirror.fr.claryss.net/ftp.exim.org/exim/exim4/$SOURCE
SOURCE2_URL[0]=http://exim.mirror.fr//exim4/$SOURCE2

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

pushd $INSTALL_ROOT/ &&
-ln -sf ../sbin/exim usr/lib/sendmail &&
-ln -sf exim usr/sbin/sendmail &&
-ln -sf exim usr/sbin/mailq &&
-ln -sf exim usr/sbin/rsmtp &&
-ln -sf exim usr/sbin/rmail &&
-ln -sf exim usr/sbin/runq &&
-ln -sf exim usr/sbin/newaliases &&
+ln -sf usr/sbin/exim usr/lib/sendmail &&
+ln -sf usr/sbin/exim usr/sbin/sendmail &&
+ln -sf usr/sbin/exim usr/sbin/mailq &&
+ln -sf usr/sbin/exim usr/sbin/rsmtp &&
+ln -sf usr/sbin/exim usr/sbin/rmail &&
+ln -sf usr/sbin/exim usr/sbin/runq &&
+ln -sf usr/sbin/exim usr/sbin/newaliases &&
popd &&

if install_config_file src/configure.default \
diff --git a/mail/exim/PREPARE b/mail/exim/PREPARE
index 6734383..9402c3e 100755
--- a/mail/exim/PREPARE
+++ b/mail/exim/PREPARE
@@ -1,5 +1,19 @@
-config_query_list EXIM_MIRRORS "Which group of exim mirrors would you like
to use?" \
-"austria" "germany" "netherlands" "switzerland" "united-kingdom" \
-"united-states" "ireland" "japan" "norway" "poland" "south-africa" \
-"belgium" "canada" "czech-republic" "denmark" "france" "indonesia"
-
+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"



  • [SM-Commit] GIT changes to master grimoire by Eric Sandall (76daef94d15bbfdfce98b0a3379c5c896054f5ca), Eric Sandall, 07/13/2006

Archive powered by MHonArc 2.6.24.

Top of Page