New commits:
commit 8242424d4cacfbcf3d1bfca94aaa55b3aa7aa18c
Author: Elisamuel Resto <ryuji AT sourcemage.org>
Commit: Elisamuel Resto <ryuji AT sourcemage.org>
mail/postfix: added extra mirrors
commit 88d127e1a048bb0f25d476e661e71e201a3ec9a6
Author: Elisamuel Resto <ryuji AT sourcemage.org>
Commit: Elisamuel Resto <ryuji AT sourcemage.org>
mail/postfix: VDA patch homepage URL updated
commit f213853b108631f1633fa6f7fef07d3c2cd0fe11
Author: Elisamuel Resto <ryuji AT sourcemage.org>
Commit: Elisamuel Resto <ryuji AT sourcemage.org>
mail/postfix: experimental version query should default to 'n'
commit 4e8ccfe88dd8f96948d81ffd736c06af1db15f5c
Author: Elisamuel Resto <ryuji AT sourcemage.org>
Commit: Elisamuel Resto <ryuji AT sourcemage.org>
mail/postfix: only read old variables if upgrading
commit 493e8aa5f6853f2ea63000364cf1caf7366f7802
Author: Elisamuel Resto <ryuji AT sourcemage.org>
Commit: Elisamuel Resto <ryuji AT sourcemage.org>
mail/postfix: only verify and apply VDA patch if requested
commit facd7df6d382977a79dc0783227cfc913d9c1f9f
Author: Elisamuel Resto <ryuji AT sourcemage.org>
Commit: Elisamuel Resto <ryuji AT sourcemage.org>
mail/postfix: read old variables for compatibility's sake
commit 86bc662fab708982ea3f1e8c9ff2b82f5ba4c9f7
Author: Elisamuel Resto <ryuji AT sourcemage.org>
Commit: Elisamuel Resto <ryuji AT sourcemage.org>
mail/postfix: removed broken mirrors
commit 10dff4f415907348bf60e65774f765a1800c886e
Author: Elisamuel Resto <ryuji AT sourcemage.org>
Commit: Elisamuel Resto <ryuji AT sourcemage.org>
mail/postfix: updated to 2.5.5 (experimental to 2.6-20080903)
- Fixed broken chaining in most of the files
- Changed the way depends were done
- Changed the logic in TRIGGERS
- Removed spurious tabs in init.d/postfix
- Set most of the files to 4-space identing
- Removed the ASCII walls, they were out of the screen on 80x60 anyway
- Renamed `wietse.pgp' to `wietse.gpg' like the rest of the keyrings
- Fixed whitespace errors on HISTORY
# fix to get man pages to install in /usr/man
-#sedit "s:/usr/local:${INSTALL_ROOT}/usr:" src/global/mail_params.h &&
-CCARGS="$CCARGS -DDEF_MANPAGE_DIR=\\\"/usr/share/man\\\"" &&
+#sedit "s:/usr/local:${INSTALL_ROOT}/usr:" src/global/mail_params.h &&
+CCARGS="${CCARGS} -DDEF_MANPAGE_DIR=\\\"${INSTALL_ROOT}/usr/share/man\\\"" &&
# Fix directories in the main.cf
-
-
-if [[ "$POSTFIX_PRE_EXISTING" == "yes" ]] ; then
- if [[ "$POSTFIX_FIX_MAINCF" == "y" ]]; then
- # repair directories in the main.cf
- MANPAGE_DIR="$(grep manpage_directory /etc/postfix/main.cf |
cut -d"=" -f2)"
- MANPAGE_DIR="${MANPAGE_DIR## }"
- if [[ "$MANPAGE_DIR" != "/usr/share/man" ]]; then
- sed -i -e "s|manpage_directory.*=.*|manpage_directory
= /usr/share/man|" /etc/postfix/main.cf
- fi
- fi
+if [[ "${POSTFIX_PRE_EXISTING}" == "yes" ]]; then
+ if [[ "${POSTFIX_FIX_MAINCF}" == "y" ]]; then
+ # repair directories in the main.cf
+ local MANPAGE_DIR="$(grep manpage_directory
${INSTALL_ROOT}/etc/postfix/main.cf | cut -d"=" -f2)" &&
+ MANPAGE_DIR="${MANPAGE_DIR## }" &&
+
+ if [[ "$MANPAGE_DIR" != "${INSTALL_ROOT}/usr/share/man" ]]; then
+ sed -i -e "s|manpage_directory.*=.*|manpage_directory =
${INSTALL_ROOT}/usr/share/man|" \
+ ${INSTALL_ROOT}/etc/postfix/main.cf
+ fi
+ fi
fi
-
diff --git a/mail/postfix/CONFIGURE b/mail/postfix/CONFIGURE
index 859a6be..8312e15 100755
--- a/mail/postfix/CONFIGURE
+++ b/mail/postfix/CONFIGURE
@@ -1,64 +1,35 @@
-persistent_add POSTFIX_PRE_EXISTING
-persistent_add POSTFIX_FIX_MAINCF
-if [[ -f /etc/postfix/main.cf ]]; then
- message "${MESSAGE_COLOR}Pre-existing main.cf found. Doing upgrade
install.${DEFAULT_COLOR}"
- POSTFIX_PRE_EXISTING="yes"
- message "${WARNING_COLOR}If you do not say yes to the next question
this spell could fail to install${DEFAULT_COLOR}"
- message "${MESSAGE_COLOR}The spell will go through your main.cf and
ensure that the man pages are
-installed to the right place, because the postfix install program uses the
-values from the main.cf to determine where to install
things.${DEFAULT_COLOR}"
- config_query POSTFIX_FIX_MAINCF "Check for and fix problems in
installed main.cf? (HIGHLY RECOMMENDED)" y
-else
- message "${MESSAGE_COLOR}No pre-existing main.cf found. Doing normal
install.${DEFAULT_COLOR}"
- POSTFIX_PRE_EXISTING="no"
-fi &&
-
-config_query BENCH "install smtpstone benckmarking tools?" n
+persistent_add POSTFIX_PRE_EXISTING &&
+persistent_add POSTFIX_FIX_MAINCF &&
+persistent_add POSTFIX_VDA &&
-#message "${MESSAGE_COLOR}smtp configuration files loss may expose your
system to SPAM relaying. You should backup and restore configuration files
and reply y to the next two questions...${DEFAULT_COLOR}"
-#
-#config_query BACKUP "backup config on dispel?" y
-#config_query RESTORE "restore config on rebuild/update?" y
+if [[ "x${POSTFIX_VDA}" == "x" ]] && spell_ok $SPELL; then
+ persistent_read $SPELL VDA POSTFIX_VDA
+fi &&
-#message "${MESSAGE_COLOR}You should run newaliases after each aliases file
update, and on first $spell cast...${DEFAULT_COLOR}"
-#config_query ALIAS "run newaliases after cast?" y
-
-if spell_ok mysql; then
- config_query MYSQL "Add MySQL support?" y
-else
- config_query MYSQL "Add MySQL support?" n
-fi &&
+if [[ -f /etc/postfix/main.cf ]]; then
+ POSTFIX_PRE_EXISTING="yes" &&
-if spell_ok postgresql; then
- config_query POSTGRES "Add Postgresql support?" y
-else
- config_query POSTGRES "Add Postgresql support?" n
-fi &&
+ message "${MESSAGE_COLOR}Pre-existing main.cf found. Doing upgrade
install.${DEFAULT_COLOR}" &&
+ message "${WARNING_COLOR}If you do not say yes to the next question this
spell could fail to install${DEFAULT_COLOR}" &&
+ message "${MESSAGE_COLOR}The spell will go through your main.cf and
ensure that the man pages are" &&
+ message "installed to the right place, because the postfix install
program uses the" &&
+ message "values from the main.cf to determine where to install
things.${DEFAULT_COLOR}" &&
-if spell_ok openldap; then
- config_query LDAP "Add LDAP support?" y
+ config_query POSTFIX_FIX_MAINCF "Check for and fix problems in installed
main.cf? (HIGHLY RECOMMENDED)" y
else
- config_query LDAP "Add LDAP support?" n
-fi &&
+ POSTFIX_PRE_EXISTING="no" &&
+ message "${MESSAGE_COLOR}No pre-existing main.cf found. Doing normal
install.${DEFAULT_COLOR}"
+fi &&
-if spell_ok linux-pam; then
- config_query PAM "Add PAM support?" y
-else
- config_query PAM "Add PAM support?" n
-fi &&
+config_query POSTFIX_BENCH "Install smtpstone benckmarking tools?" n &&
-if spell_ok openssl; then
- config_query SSL "Add SSL support?" y
- config_query SSL_TLS "Add TLS support?" y
-else
- config_query SSL "Add SSL support?" n
- config_query SSL_TLS "Add TLS support?" n
-fi &&
+# Config file backup
+#message "${MESSAGE_COLOR}smtp configuration files loss may expose your
system to SPAM relaying. You should backup and restore configuration files
and reply y to the next two questions...${DEFAULT_COLOR}" &&
+#config_query BACKUP "Backup config on dispel?" y &&
+#config_query RESTORE "Restore config on rebuild/update?" y
-if spell_ok cyrus-sasl; then
- config_query SASL "Add SASL support?" y
-else
- config_query SASL "Add SASL support?" n
-fi &&
+# Newaliases
+#message "${MESSAGE_COLOR}You should run newaliases after each aliases file
update, and on first $spell cast...${DEFAULT_COLOR}" &&
+#config_query ALIAS "Run newaliases after cast?" y &&
-#
-# Postfix main site
-#
- WEB_SITE=http://www.postfix.org/
+ WEB_SITE="http://www.postfix.org/"
ENTERED=20020125
DOCS="$DOCS README_FILES RELEASE_NOTES* html examples auxiliary"
LICENSE[0]=IBMPL
SHORT="Postfix is a MTA"
+
cat << EOF
Postfix is an attempt to provide an alternative to the widely-used
Sendmail program. Postfix attempts to be fast, easy to administer,
and hopefully secure, while at the same time being sendmail
compatible enough to not upset your users.
-(VDA patch URL: http://www.oav.net/~kiwi/postfix)
+(VDA patch URL: http://vda.sourceforge.net/)
EOF
diff --git a/mail/postfix/HISTORY b/mail/postfix/HISTORY
index f1363a1..5af98e9 100644
--- a/mail/postfix/HISTORY
+++ b/mail/postfix/HISTORY
@@ -1,3 +1,19 @@
+2008-09-22 Elisamuel Resto <ryuji AT sourcemage.org>
+ * PREPARE: experimental version should default to 'n'
+ * DETAILS: VDA patch homepage URL updated; added extra mirrors
+
+2008-09-20 Elisamuel Resto <ryuji AT sourcemage.org>
+ * DETAILS: removed broken mirrors; fetch VDA only if requested
+ * PREPARE, CONFIGURE: read old variables, only if upgrading
+ * PRE_BUILD: only verify and apply VDA patch if requested
+
+2008-09-17 Elisamuel Resto <ryuji AT sourcemage.org>
+ * DETAILS: updated to 2.5.5 (experimental to 2.6-20080903)
+ * BUILD, CONFLICTS, PRE_BUILD, PROVIDES, TRIGGERS, CONFIGURE,
+ DEPENDS, INSTALL, PREPARE: rewrote and reworked the dependency
+ declarations; chained the un-chained lines; removed ascii walls
+ * wietse.pgp: renamed to `wietse.gpg' like usual for other spells
+
2007-11-25 Arjan Bouter <abouter AT sourcemage.org>
* DETAILS: added experimental version
* PREPARE: added
@@ -55,7 +71,7 @@
2005-12-30 David Kowis <dkowis AT sourcemage.org>
* DETAILS: removed all obsolete patches and updated any that were
still
- good, also updated to use gpg signature and had to export wietse's
+ good, also updated to use gpg signature and had to export wietse's
key as a binary keyring.
* PRE_BUILD,BUILD,CONFIGURE: updated for the latest version of postfix
since patches were gone, it changed a great deal of how it was built
@@ -207,7 +223,7 @@
* Added sorcery init.d features.
2003-03-23 M.L. <mlubrano AT sourcemage.org>
- * Fixed bug #2887, added mysql support,
+ * Fixed bug #2887, added mysql support,
thanks to jaanus AT heeringson.com (Jaanus Heeringson)
Added configuration question to use optional libs, or not.
-if [ "$BENCH" == "y" ]; then
- chmod 544 src/smtpstone/qmqp-source \
- src/smtpstone/smtp-sink \
- src/smtpstone/smtp-source &&
+if [[ "${POSTFIX_BENCH}" == "y" ]]; then
+ local file &&
- cp src/smtpstone/qmqp-source ${INSTALL_ROOT}/usr/sbin &&
- cp src/smtpstone/smtp-sink ${INSTALL_ROOT}/usr/sbin &&
- cp src/smtpstone/smtp-source ${INSTALL_ROOT}/usr/sbin
+ for file in qmqp-source smtp-sink smtp-source; do
+ install -v -m 544 src/smtpstone/${file} ${INSTALL_ROOT}/usr/sbin
+ done
fi
-
diff --git a/mail/postfix/PREPARE b/mail/postfix/PREPARE
index 87b0603..5602125 100755
--- a/mail/postfix/PREPARE
+++ b/mail/postfix/PREPARE
@@ -1,2 +1,7 @@
-config_query PFIX_EXP \
-"Build experimental version? (it's used by the author on production
servers)" y
+persistent_add POSTFIX_EXP &&
+
+if [[ "x${POSTFIX_EXP}" == "x" ]] && spell_ok $SPELL; then
+ persistent_read $SPELL PFIX_EXP POSTFIX_EXP
+fi &&
+
+config_query POSTFIX_EXP "Build experimental version? (it's used by the
author on production servers)" n
diff --git a/mail/postfix/PRE_BUILD b/mail/postfix/PRE_BUILD
index 2ac1ccc..468b690 100755
--- a/mail/postfix/PRE_BUILD
+++ b/mail/postfix/PRE_BUILD
@@ -1,4 +1,9 @@
-mk_source_dir $SOURCE_DIRECTORY &&
-unpack_file &&
-verify_file 3 &&
-gunzip -c $SOURCE_CACHE/$SOURCE3 > $SOURCE_DIRECTORY/$NAME3
+mk_source_dir "${SOURCE_DIRECTORY}" &&
+unpack_file &&
+
+if [[ "${POSTFIX_VDA}" == "y" ]] && [[ "${POSTFIX_EXP}" == "n" ]]; then
+ verify_file 3 &&
+ cd "${SOURCE_DIRECTORY}" &&
+ message "${MESSAGE_COLOR}Applying VDA Patch${DEFAULT_COLOR}" &&
+ gzip -cd "${SOURCE_CACHE}/${SOURCE3}" | patch -p1
+fi
diff --git a/mail/postfix/SECURITY b/mail/postfix/SECURITY
index 6bb7f89..7c3437a 100755
--- a/mail/postfix/SECURITY
+++ b/mail/postfix/SECURITY
@@ -1,9 +1,7 @@
-Please make sure you do not run an open mail relay, which
-will be abused by spammers.
+Please make sure you do not run an open mail relay, which will be abused
+by spammers.
-You should try open relay checkers (make a search for
-"open relay check" with your favorite search engine) on your
-mail server.
+You should try open relay checkers (make a search for "open relay check"
+with your favorite search engine) on your mail server.
-You should also use authentication and encryption for
-smtp services.
+You should also use authentication and encryption for SMTP services.
diff --git a/mail/postfix/TRIGGERS b/mail/postfix/TRIGGERS
index fda42bd..8fec85e 100755
--- a/mail/postfix/TRIGGERS
+++ b/mail/postfix/TRIGGERS
@@ -1,9 +1,13 @@
-on_cast cyrus-sasl cast_self
-on_cast db cast_self
-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
+local spelldep &&
+for spelldep in cyrus-sasl db linux-pam; do
+ if is_depends_enabled $SPELL $spelldep; then
+ on_cast $spelldep cast_self
+ fi
+done
+for spelldep in mysql postgresql openssl; do
+ if is_depends_enabled $SPELL $spelldep; then
+ on_cast $spelldep check_self
+ fi
+done
diff --git a/mail/postfix/init.d/postfix b/mail/postfix/init.d/postfix
index 7ad7410..b9106ac 100755
--- a/mail/postfix/init.d/postfix
+++ b/mail/postfix/init.d/postfix
@@ -8,29 +8,31 @@ NEEDS="+network +remote_fs"
. /etc/init.d/smgl_init
start() {
- echo "Starting postfix..."
- if [ -e /etc/aliases ]; then
- if [ -e /etc/aliases.db ] &&
- [ ""`/usr/bin/find /etc/aliases -follow -newer
/etc/aliases.db` != "" ]; then
- echo "/etc/aliases is modified. You may want to run
newaliases"
- fi
- fi
- loadproc postfix start
+ echo "Starting ${NAME}..."
+
+ if [[ -e /etc/aliases ]]; then
+ if [[ -e /etc/aliases.db ]] && \
+ [[ ""`/usr/bin/find /etc/aliases -follow -newer /etc/aliases.db`
!= "" ]]; then
+ echo "/etc/aliases is modified. You may want to run newaliases"
+ fi
+ fi
+
+ loadproc postfix start
}