Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] GIT changes to master grimoire by Remko van der Vossen (b03869a9ff1c03f13e20b0515bd65ccde4fe4cbc)

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

Chronological Thread  
  • From: Remko van der Vossen <scm AT sourcemage.org>
  • To: sm-commit AT lists.ibiblio.org
  • Subject: [SM-Commit] GIT changes to master grimoire by Remko van der Vossen (b03869a9ff1c03f13e20b0515bd65ccde4fe4cbc)
  • Date: Wed, 20 Jun 2007 16:46:31 -0500

GIT changes to master grimoire by Remko van der Vossen <wich AT stack.nl>:

mail/courier/BUILD | 36 ++------
mail/courier/CONFIGURE | 209
+++++++++++++++++++++++++------------------------
mail/courier/CONFLICTS | 12 +-
mail/courier/DEPENDS | 115 +++++++++++++-------------
mail/courier/HISTORY | 6 +
mail/courier/INSTALL | 1
mail/courier/TRIGGERS | 12 +-
7 files changed, 192 insertions(+), 199 deletions(-)

New commits:
commit b03869a9ff1c03f13e20b0515bd65ccde4fe4cbc
Author: Remko van der Vossen <wich AT stack.nl>
Commit: Remko van der Vossen <wich AT stack.nl>

mail/courier: sanitized spell, added mime-support dependency and fixed
bugs 13744 and 12813

diff --git a/mail/courier/BUILD b/mail/courier/BUILD
index b9e3ea3..8ae9a1f 100755
--- a/mail/courier/BUILD
+++ b/mail/courier/BUILD
@@ -1,29 +1,13 @@
-create_account courier &&
+create_account courier &&

-case "${COURIER_SSLWEBMAIL}" in
- yes) OPTS="$OPTS --enable-https"
- ;;
- login_only) OPTS="$OPTS --enable-https=login"
- ;;
- user_decides_via_url) OPTS="$OPTS --enable-https=auto"
- ;;
- deafult) OPTS="$OPTS --enable-https=login \
- --enable-https=auto"
- ;;
- no) OPTS="$OPTS --disable-https"
- ;;
-esac &&
-
-OPTS="${COURIER_OPTS} \
- ${COURIER_IMAPBUGS} \
- ${COURIER_TRASHQUOTA} \
- --sysconfdir=${INSTALL_ROOT}/etc/courier \
- --localstatedir=${INSTALL_ROOT}/var/courier \
- --datadir=${INSTALL_ROOT}/usr/share/courier \
- --with-shellpath=${PATH} \
- --disable-root-check \
- --with-mailuser=courier \
- --with-mailgroup=courier \
- ${OPTS}" &&
+OPTS="${COURIER_OPTS} \
+ --sysconfdir=${INSTALL_ROOT}/etc/courier \
+ --localstatedir=${INSTALL_ROOT}/var/courier \
+ --datadir=${INSTALL_ROOT}/usr/share/courier \
+ --with-shellpath=${PATH} \
+ --disable-root-check \
+ --with-mailuser=courier \
+ --with-mailgroup=courier \
+ ${OPTS}" &&

default_build
diff --git a/mail/courier/CONFIGURE b/mail/courier/CONFIGURE
index 153b71e..ca5697d 100755
--- a/mail/courier/CONFIGURE
+++ b/mail/courier/CONFIGURE
@@ -1,102 +1,109 @@
-config_query_list COURIER_IPV6


\
- "Attempt to install support for IPv6? (If you choose Yes
and IPv6 is not detected, the install will fail. If you choose Courier and
IPV6 is not detected, the install will continue and Courier will not install
support for it.) " \
- Courier


\
- Yes


\
- No


&&
-case ${COURIER_IPV6} in
- Yes) COURIER_OPTS="${COURIER_OPTS} --with-ipv6"
- ;;
- No) COURIER_OPTS="${COURIER_OPTS} --without-ipv6"
- ;;
-esac
-
-config_query_list COURIER_DBLIB
\
- "Which database library do you want to use with Courier?"
\
- gdbm
\
- db
&&
-
-config_query_option COURIER_OPTS
\
- "Are you running Courier on a network with access to a
DNS server?" \
- y
\
- "--with-tcpddns"
\
- "--without-tcpddns"
&&
-
-config_query_option COURIER_OPTS

\
- "Do you wish to enable the automatic syncing of the
mail queue? This may increase performance, but will reduce reliability
unless the queue is installed on a reliable disk array or a network file
server. " \
- y

\
- "--with-explicitsync"

\
- "--without-explicitsync"

&&
-
-config_query_option COURIER_OPTS
\
- "Do you also wish to sync the mail queue's parent
directory?" \
- n
\
- "--with-dirsync"
\
- "--without-dirsync"
&&
-
-config_query_option COURIER_OPTS


\
- "Normally, in addition to accepting mail that's
addressed to <user AT domain.com>, Courier can accept mail that's addressed to
<user-xxx AT domain.com>, for arbitrary values of xxx. Do you wish to enable
this feature?" \
- n


\
- "--enable-local-extensions"


\
- "--disable-local-extensions"


&&
-
-config_query_option COURIER_OPTS
\
- "Do you wish for Courier to be paranoid when
negotiating specific ESMTP extensions with remote servers?" \
- n
\
- "--with-paranoid-smtpext"
\
- "--without-paranoid-smtpext"
&&
-
-config_query COURIER_IMAP "Do you want to install and configure the IMAP
portion of Courier? " y &&
-if [ "${COURIER_IMAP}" == "y" ]; then
- COURIER_OPTS="${COURIER_OPTS} --enable-utf7-folder-encoding"
&&
-
- config_query_option COURIER_IMAPBUGS
\
- "Do you want to enable workarounds for some IMAP
clients that have a buggy implementation of IMAP4rev1?" \
- n
\
- "--enable-workarounds-for-imap-client-bugs"
\
- "--disable-workarounds-for-imap-client-bugs"
&&
-
- config_query_option COURIER_OPTS
\
- "Do you to disable the automatic renaming of the
IMAP Sent folder every month?" \
- n
\
- "--enable-autorenamesent"
\
- "--disable-autorenamesent"
&&
-
- config_query_option COURIER_TRASHQUOTA
\
- "Do you wish to include the Trash folder in the
IMAP quota usage?" \
- n
\
- "--with-trashquota"
\
- "--without-trashquota"
-else
- COURIER_OPTS="${COURIER_OPTS} --disable-utf7-folder-encoding"
-fi
&&
-
-config_query COURIER_WEBMAIL "Do you want to install and configure the
webmail portion of Courier? " y &&
-if [ "${COURIER_WEBMAIL}" == "y" ]; then
- config_query_list COURIER_SSLWEBMAIL
\
- "Would you like to enable SSL for the Webmail server?
" \
- yes
\
- courier_default
\
- login_only
\
- user_decides_via_url
\
- no
&&
-
- config_query_option COURIER_SPELLCHECK
\
- "Do you want to enable spell checking in Courier's
webmail? " y \
- ""
\
- "--without-ispell"
&&
-
- if [ "${COURIER_SPELLCHECK}" == "y" ]
- then
- config_query_list COURIER_SPLCHECKER \
- "Which spell checker do you want to use?" \
- aspell \
- ispell
- fi
-fi
&&
-
-config_query_option COURIER_OPTS
\
- "Include the ability to search and sort messages in
character sets other than the default ISO-8859-1/US-ASCII?" \
- n
\
- "--enable-unicode"
\
- "--disable-unicode"
+config_query_option COURIER_OPTS \
+ "Are you running Courier on a network with access to a DNS server?" \
+ y \
+ "--with-tcpddns" \
+ "--without-tcpddns" &&
+
+config_query_option COURIER_OPTS \
+ "Compile IPv6 support?" \
+ y \
+ "--with-ipv6" \
+ "--without-ipv6" &&
+
+config_query_list COURIER_DBLIB \
+ "Which database library do you want to use with Courier?" \
+ gdbm \
+ db &&
+
+config_query_option COURIER_OPTS \
+ "Enable automatic syncing of the mail queue? Disabling this may increase
performance, but will reduce reliability and worsen mail queue corruption in
the event op system failure." \
+ y \
+ "--with-explicitsync" \
+ "--without-explicitsync" &&
+
+config_query_option COURIER_OPTS \
+ "Also sync the directory containing each file synced? Some believe this
necessary for adequate file syncing on ext2." \
+ n \
+ "--with-dirsync" \
+ "--without-dirsync" &&
+
+config_query_option COURIER_OPTS \
+ "Support accepting mail addressed to <user-xxx AT domain.com>, for arbitrary
values of xxx, as mail for <user AT domain.com>?" \
+ y \
+ "--enable-local-extensions" \
+ "--disable-local-extensions" &&
+
+config_query_option COURIER_OPTS \
+ "Do you wish for Courier to be paranoid when negotiating courier specific
ESMTP extensions with remote servers?" \
+ n \
+ "--with-paranoid-smtpext" \
+ "--without-paranoid-smtpext" &&
+
+config_query COURIER_WEBMAIL \
+ "Do you want to install and configure the webmail portion of Courier?" \
+ y &&
+
+if [ "${COURIER_WEBMAIL}" == "y" ]; then
+ config_query_list COURIER_SSLWEBMAIL \
+ "Would you like to enable SSL for the Webmail server?" \
+ yes \
+ login_only \
+ no &&
+
+ case "${COURIER_SSLWEBMAIL}" in
+ yes) COURIER_OPTS="$COURIER_OPTS --enable-https=auto"
+ ;;
+ login_only) COURIER_OPTS="$COURIER_OPTS --enable-https=login"
+ ;;
+ no) COURIER_OPTS="$COURIER_OPTS --disable-https"
+ ;;
+ esac &&
+
+ config_query_option COURIER_OPTS \
+ "Do you want to enable spell checking in Courier's webmail? " \
+ y \
+ "--with-ispell" \
+ "--without-ispell" &&
+
+ if list_find "$COURIER_OPTS" "--with-ispell"; then
+ config_query_list COURIER_SPELLCHECKER \
+ "Which spell checker do you want to use?" \
+ aspell \
+ ispell
+ fi &&
+
+ config_query_option COURIER_OPTS \
+ "Enable automatic monthly renaming of the IMAP Sent folder?" \
+ y \
+ "--enable-autorenamesent" \
+ "--disable-autorenamesent"
+fi &&
+
+config_query COURIER_FAXES \
+ "Do you want to use courier fax support?" \
+ n &&
+
+config_query_option COURIER_OPTS \
+ "Enable workarounds for IMAP clients that have a buggy implementation of
IMAP4rev1?" \
+ n \
+ "--enable-workarounds-for-imap-client-bugs" \
+ "--disable-workarounds-for-imap-client-bugs" &&
+
+config_query_option COURIER_OPTS \
+ "Include the Trash folder in the IMAP quota usage?" \
+ n \
+ "--with-trashquota" \
+ "--without-trashquota" &&
+
+config_query_option COURIER_OPTS \
+ "Enable sorting/searching in character sets other than
ISO-8859-1/US-ASCII? (IMAP Only)" \
+ n \
+ "--enable-unicode" \
+ "--disable-unicode" &&
+
+config_query_option COURIER_OPTS \
+ "Do you want to want to use utf7 folder encoding? (IMAP only)" \
+ y \
+ "--enable-utf7-folder-encoding" \
+ "--disable-utf7-folder-encoding"

diff --git a/mail/courier/CONFLICTS b/mail/courier/CONFLICTS
index 5948828..d60101b 100755
--- a/mail/courier/CONFLICTS
+++ b/mail/courier/CONFLICTS
@@ -1,6 +1,6 @@
-conflicts courier-imap &&
-conflicts esmtp &&
-conflicts exim &&
-conflicts postfix &&
-conflicts sendmail &&
-conflicts netqmail
+conflicts courier-imap &&
+conflicts esmtp &&
+conflicts exim &&
+conflicts postfix &&
+conflicts sendmail &&
+conflicts netqmail
diff --git a/mail/courier/DEPENDS b/mail/courier/DEPENDS
index 811a552..64ce682 100755
--- a/mail/courier/DEPENDS
+++ b/mail/courier/DEPENDS
@@ -1,61 +1,58 @@
-depends courier-authlib
&&
-depends perl
&&
+depends courier-authlib &&
+depends pcre &&
+depends perl &&
+depends mime-support &&

case "${COURIER_DBLIB}" in
- "gdbm") depends gdbm "--with-db=gdbm"
- ;;
- "db") depends db "--with-db=db"
- ;;
-esac
&&
-
-if [ "${COURIER_IMAP}" == "y" ]; then
- optional_depends "fam"
\
- ""
\
- ""
\
- "for enhanced IMAP idle implementation"
-fi
&&
-
-if [ "${COURIER_WEBMAIL}" == "y" ]; then
- depends WEBSERVER
&&
-
- if [ "${COURIER_SSLWEBMAIL}" != "no" ]; then
- depends openssl
- else
- optional_depends "openssl"
\
- ""
\
- ""
\
- "for SSL/TLS enrypted mail delivery support"
- fi
&&
-
- if [ "${COURIER_SPELLCHECK}" == "y" ]; then
- if ! [ "${COURIER_SPLCHECKER}" == "" ]; then
- depends ${COURIER_SPLCHECKER}
"--with-ispell=${COURIER_SPLCHECKER}"
- fi
- fi
-fi
&&
-
-optional_depends "openldap"
\
- ""
\
- ""
\
- "for LDAP directory services"
&&
-
-if [ "${COURIER_FAXES}" == "y" ]; then
- depends mgetty
&&
- depends groff
&&
-
- optional_depends "netpbm"
\
- ""
\
- ""
\
- "to send e-mail messages via fax - GIF, JPEG and PNG
support" &&
-
- optional_depends "POSTSCRIPT-INTERPRETER"
\
- ""
\
- ""
\
- "to send e-mail via fax - Postscript and PDF support"
-fi
&&
-
-optional_depends "uucp"
\
- ""
\
- ""
\
- "for using Courier as a gateway to or from another UUCP
server"
-
+ "gdbm") depends gdbm "--with-db=gdbm"
+ ;;
+ "db") depends db "--with-db=db"
+ ;;
+esac &&
+
+optional_depends "fam" \
+ "" \
+ "" \
+ "for enhanced IMAP idle implementation" &&
+
+optional_depends "openssl" \
+ "" \
+ "" \
+ "for SSL/TLS encrypted mail delivery support" &&
+
+optional_depends "openldap" \
+ "" \
+ "" \
+ "for LDAP directory services" &&
+
+if [ "${COURIER_WEBMAIL}" == "y" ]; then
+ depends WEBSERVER &&
+
+ if [ "${COURIER_SSLWEBMAIL}" != "no" ]; then
+ depends openssl
+ fi &&
+
+ if [ "${COURIER_SPELLCHECKER}" != "" ]; then
+ depends ${COURIER_SPELLCHECKER} "--with-ispell=${COURIER_SPELLCHECKER}"
+ fi
+fi &&
+
+if [ "${COURIER_FAXES}" == "y" ]; then
+ depends mgetty &&
+ depends groff &&
+
+ optional_depends "POSTSCRIPT-INTERPRETER" \
+ "" \
+ "" \
+ "to send e-mail via fax - Postscript and PDF support" &&
+
+ optional_depends "netpbm" \
+ "" \
+ "" \
+ "to send e-mail via fax - GIF, JPEG and PNG support"
+fi &&
+
+optional_depends "uucp" \
+ "" \
+ "" \
+ "for using Courier as a gateway to or from another UUCP
server"
diff --git a/mail/courier/HISTORY b/mail/courier/HISTORY
index b961b8e..6bb734a 100644
--- a/mail/courier/HISTORY
+++ b/mail/courier/HISTORY
@@ -1,3 +1,9 @@
+2007-06-20 Remko van der Vossen <wich AT stack.nl>
+ * Sanitized all spell files
+ * CONFIGURE: Re-Added fax support query (bug #12813)
+ * DEPENDS: Added PCRE (bug #13744)
+ * DEPENDS: Added mime-support
+
2007-05-31 Remko van der Vossen <wich AT stack.nl>
* DETAILS: Version bump to 0.55.1
Removed UPDATED
diff --git a/mail/courier/INSTALL b/mail/courier/INSTALL
index bb71ea1..ccae980 100755
--- a/mail/courier/INSTALL
+++ b/mail/courier/INSTALL
@@ -1,4 +1,3 @@
make install &&
make install-configure &&
ln -s $TRACK_ROOT/usr/bin/sendmail $INSTALL_ROOT/usr/lib/sendmail
-
diff --git a/mail/courier/TRIGGERS b/mail/courier/TRIGGERS
index fc5c73e..6c5b41f 100755
--- a/mail/courier/TRIGGERS
+++ b/mail/courier/TRIGGERS
@@ -1,8 +1,8 @@
-for i in `grep $SPELL $DEPENDS_STATUS`
- do if [ `echo $i | cut -d: -f1` = "$SPELL" ] &&
- [ `echo $i | cut -d: -f2` == "linux-pam" ] &&
- [ `echo $i | cut -d: -f3` = "on" ]
- then on_cast linux-pam cast_self
- fi
+for i in `grep $SPELL $DEPENDS_STATUS`
+ do if [ `echo $i | cut -d: -f1` = "$SPELL" ] &&
+ [ `echo $i | cut -d: -f2` == "linux-pam" ] &&
+ [ `echo $i | cut -d: -f3` = "on" ]
+ then on_cast linux-pam cast_self
+ fi
done




  • [SM-Commit] GIT changes to master grimoire by Remko van der Vossen (b03869a9ff1c03f13e20b0515bd65ccde4fe4cbc), Remko van der Vossen, 06/20/2007

Archive powered by MHonArc 2.6.24.

Top of Page