[SM-Commit] GIT changes to master grimoire by Elisamuel Resto (8242424d4cacfbcf3d1bfca94aaa55b3aa7aa18c)

Elisamuel Resto scm at sourcemage.org
Tue Sep 23 17:36:29 EDT 2008


GIT changes to master grimoire by Elisamuel Resto <ryuji at sourcemage.org>:

 dev/null                    |binary
 mail/postfix/BUILD          |  148 ++++++++++++++++++++------------------------
 mail/postfix/CONFIGURE      |   81 +++++++-----------------
 mail/postfix/CONFLICTS      |    6 -
 mail/postfix/DEPENDS        |   44 +++++--------
 mail/postfix/DETAILS        |   77 ++++++++++++----------
 mail/postfix/HISTORY        |   21 +++++-
 mail/postfix/INSTALL        |   80 +++++++++++------------
 mail/postfix/PREPARE        |    9 ++
 mail/postfix/PRE_BUILD      |   13 ++-
 mail/postfix/SECURITY       |   12 +--
 mail/postfix/TRIGGERS       |   18 +++--
 mail/postfix/init.d/postfix |   34 +++++-----
 mail/postfix/wietse.gpg     |binary
 mail/postfix/wietse.pgp     |    0 
 15 files changed, 267 insertions(+), 276 deletions(-)

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

diff --git a/mail/postfix/BUILD b/mail/postfix/BUILD
index 392e3fd..6f31aed 100755
--- a/mail/postfix/BUILD
+++ b/mail/postfix/BUILD
@@ -1,87 +1,79 @@
-create_account  postfix   &&
-create_account  postdrop  &&
-create_account  mail      &&
- 
-mkdir  -p         ${INSTALL_ROOT}/var/spool/mail  &&
-chmod  1777       ${INSTALL_ROOT}/var/spool/mail  &&
-chown  mail:mail  ${INSTALL_ROOT}/var/spool/mail  &&
-chgrp  -R  mail   ${INSTALL_ROOT}/var/spool/mail  &&
-
-if  [  "$LDAP"  ==  "y"  ];  then
-  AUXLIBS="-lldap -llber"  &&
-  CCARGS="-DHAS_LDAP"      &&
-  message "${MESSAGE_COLOR}Openldap detected: Using OpenLDAP${DEFAULT_COLOR}"
-fi  &&
-
-if  [  "$PAM"  ==  "y"  ];  then
-  AUXLIBS="$AUXLIBS -lpam -lpam_misc"  &&
-  CCARGS="$CCARGS  -DHAS_PAM"          &&
-  message "${MESSAGE_COLOR}Linux-Pam detected: Using linux-pam${DEFAULT_COLOR}"
-fi  &&
-
-if  [  "$SASL"  ==  "y"  ];  then
-  AUXLIBS="$AUXLIBS -lsasl2"                             &&
-  CCARGS="$CCARGS  -DUSE_SASL_AUTH -DUSE_CYRUS_SASL -I/usr/include/sasl"  &&
-  message "${MESSAGE_COLOR}Cyrus-sasl detected: Using Cyrus-SASL${DEFAULT_COLOR}"
-fi  &&
-
-if  [  "$MYSQL"  ==  "y"  ];  then
-  AUXLIBS="$AUXLIBS -L/usr/lib -lmysqlclient -lz -lm"  &&
-  CCARGS="$CCARGS -DHAS_MYSQL -I/usr/include/mysql"    &&
-  message "${MESSAGE_COLOR}MySQL detected: Using MySQL ${DEFAULT_COLOR}"
-fi  &&
-
-if  [  "$POSTGRES"  ==  "y"  ];  then
-  AUXLIBS="$AUXLIBS -L/usr/lib -lpq"  &&
-  CCARGS="$CCARGS -DHAS_PGSQL -I/usr/include/pgsql"    &&
-  message "${MESSAGE_COLOR}PostgreSQL detected: Using PostgresSQL ${DEFAULT_COLOR}"
-fi  &&
-
-if  [  "$SSL"  ==  "y"  ];  then
-  AUXLIBS="$AUXLIBS -lssl -lcrypto"                  &&
-  CCARGS="$CCARGS -DHAS_SSL -I/usr/include/openssl"  &&
-  message "${MESSAGE_COLOR}OpenSSL detected: Using OpenSSL for SSL ${DEFAULT_COLOR}"
-fi  &&
-
-if  [  "$SSL_TLS"  ==  "y"  ];  then
-  AUXLIBS="$AUXLIBS -lssl -lcrypto"                  &&
-  CCARGS="$CCARGS -DUSE_TLS -I/usr/include/openssl"  &&
-  message "${MESSAGE_COLOR}OpenSSL detected: Using OpenSSL for TLS ${DEFAULT_COLOR}"
-fi  &&
-
-if  [  "$VDA"  ==  "y"  ];  then
-    message "${MESSAGE_COLOR}Applying VDA Patch${DEFAULT_COLOR}"  &&
-    patch -p1 < $NAME3
-fi   &&
+create_account postfix &&
+create_account postdrop &&
+create_account mail &&
+
+mkdir -p "${INSTALL_ROOT}/var/spool/mail" &&
+chmod 1777 "${INSTALL_ROOT}/var/spool/mail" &&
+chown mail:mail "${INSTALL_ROOT}/var/spool/mail" &&
+chgrp -R mail "${INSTALL_ROOT}/var/spool/mail" &&
+
+# We want blank vars
+local AUXLIBS="" &&
+local CCARGS="" &&
+
+if is_depends_enabled $SPELL openldap; then
+    AUXLIBS="${AUXLIBS} -lldap -llber" &&
+    CCARGS="${CCARGS} -DHAS_LDAP" &&
+    message "${MESSAGE_COLOR}OpenLDAP requested: Using OpenLDAP${DEFAULT_COLOR}"
+fi &&
+
+if is_depends_enabled $SPELL linux-pam; then
+    AUXLIBS="${AUXLIBS} -lpam -lpam_misc" &&
+    CCARGS="${CCARGS} -DHAS_PAM" &&
+    message "${MESSAGE_COLOR}Linux-PAM requested: Using Linux-PAM${DEFAULT_COLOR}"
+fi &&
+
+if is_depends_enabled $SPELL cyrus-sasl; then
+    AUXLIBS="${AUXLIBS} -lsasl2" &&
+    CCARGS="${CCARGS} -DUSE_SASL_AUTH -DUSE_CYRUS_SASL -I${INSTALL_ROOT}/usr/include/sasl" &&
+    message "${MESSAGE_COLOR}Cyrus-SASL requested: Using Cyrus-SASL${DEFAULT_COLOR}"
+fi &&
+
+if is_depends_enabled $SPELL mysql; then
+    AUXLIBS="${AUXLIBS} -L${INSTALL_ROOT}/usr/lib -lmysqlclient -lz -lm" &&
+    CCARGS="${CCARGS} -DHAS_MYSQL -I${INSTALL_ROOT}/usr/include/mysql" &&
+    message "${MESSAGE_COLOR}MySQL requested: Using MySQL${DEFAULT_COLOR}"
+fi &&
+
+if is_depends_enabled $SPELL postgresql; then
+    AUXLIBS="${AUXLIBS} -L${INSTALL_ROOT}/usr/lib -lpq" &&
+    CCARGS="${CCARGS} -DHAS_PGSQL -I${INSTALL_ROOT}/usr/include/pgsql" &&
+    message "${MESSAGE_COLOR}PostgreSQL requested: Using PostgresSQL${DEFAULT_COLOR}"
+fi &&
+
+if is_depends_enabled $SPELL openssl; then
+    AUXLIBS="${AUXLIBS} -lssl -lcrypto" &&
+    CCARGS="${CCARGS} -DHAS_SSL -DUSE_TLS -I${INSTALL_ROOT}/usr/include/openssl" &&
+    message "${MESSAGE_COLOR}OpenSSL requested: Using OpenSSL for SSL/TLS${DEFAULT_COLOR}"
+fi &&
 
 # 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\\\"" &&
 
 
 # NPTL glibc fix
-if  glibc_is_nptl; then
-  AUXLIBS="$AUXLIBS  -lpthread"
-fi  &&
-
-make  makefiles           \
-      "OPTS="             \
-      "OPT=$CFLAGS"       \
-      "AUXLIBS=$AUXLIBS"  \
-      "CCARGS=$CCARGS"    &&
+if glibc_is_nptl; then
+    AUXLIBS="${AUXLIBS} -lpthread"
+fi &&
+
+make makefiles \
+     "OPTS=" \
+     "OPT=${CFLAGS}" \
+     "AUXLIBS=${AUXLIBS}" \
+     "CCARGS=${CCARGS}" &&
 make &&
 
 # 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 &&
 
-config_query  VDA      "Apply Virtual Delivery Agent (VDA) patch (EXPERIMENTAL?)"  n
+config_query POSTFIX_VDA "Apply Virtual Delivery Agent (VDA) patch? (EXPERIMENTAL)" n
diff --git a/mail/postfix/CONFLICTS b/mail/postfix/CONFLICTS
index aedc328..ef52ac0 100755
--- a/mail/postfix/CONFLICTS
+++ b/mail/postfix/CONFLICTS
@@ -1,3 +1,3 @@
-conflicts  exim
-conflicts  qmail
-conflicts  sendmail
+conflicts exim &&
+conflicts qmail &&
+conflicts sendmail
diff --git a/mail/postfix/DEPENDS b/mail/postfix/DEPENDS
index 0cb6e9b..e772230 100755
--- a/mail/postfix/DEPENDS
+++ b/mail/postfix/DEPENDS
@@ -1,30 +1,26 @@
-depends  db    &&
-depends  pcre  &&
+depends db &&
+depends pcre &&
 
-if  [  "$MYSQL"  ==  "y"  ];  then
-  depends  mysql
-fi  &&
+optional_depends mysql \
+                 "" "" \
+                 "for MySQL support" &&
 
-if  [  "$POSTGRES"  ==  "y"  ];  then
-  depends  postgresql
-fi  &&
+optional_depends postgresql \
+                 "" "" \
+                 "for PostgreSQL support" &&
 
-if  [  "$PAM"  ==  "y"  ];  then
-  depends  linux-pam
-fi  &&
+optional_depends openldap \
+                 "" "" \
+                 "for LDAP support" &&
 
-if  [  "$SSL"  ==  "y"  ];  then
-  depends  openssl
-fi  &&
+optional_depends linux-pam \
+                 "" "" \
+                 "for PAM support" &&
 
-if  [  "$SSL_TLS"  ==  "y"  ];  then
-  depends  openssl
-fi  &&
+optional_depends openssl \
+                 "" "" \
+                 "for SSL/TLS support" &&
 
-if  [  "$LDAP"  ==  "y"  ];  then
-  depends  openldap
-fi  &&
-
-if  [  "$SASL"  ==  "y"  ];  then
-  depends  cyrus-sasl
-fi
+optional_depends cyrus-sasl \
+                 "" "" \
+                 "for SASL authentication mechanisms"
diff --git a/mail/postfix/DETAILS b/mail/postfix/DETAILS
index 381ea0a..fe1bec9 100755
--- a/mail/postfix/DETAILS
+++ b/mail/postfix/DETAILS
@@ -1,36 +1,43 @@
             SPELL=postfix
-if [[ "$PFIX_EXP" = "y" ]]; then
-          VERSION=2.5-20071121
+
+if [[ "${POSTFIX_EXP}" == "y" ]]; then
+          VERSION=2.6-20080903
       PFIX_BRANCH=experimental
 else
-          VERSION=2.4.5
+          VERSION=2.5.5
       PFIX_BRANCH=official
 fi
+
            SOURCE=$SPELL-$VERSION.tar.gz
           SOURCE2=$SPELL-$VERSION.tar.gz.sig
    SOURCE2_IGNORE=signature
-       SOURCE_GPG=wietse.pgp:$SOURCE2:ESTABLISHED_UPSTREAM_KEY
+       SOURCE_GPG="wietse.gpg:${SOURCE2}:ESTABLISHED_UPSTREAM_KEY"
  SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
+
+    # Source URLs
     SOURCE_URL[0]=ftp://ftp.porcupine.org/mirrors/postfix-release/$PFIX_BRANCH/$SOURCE
-    SOURCE_URL[1]=ftp://ftp.oav.net/postfix/$PFIX_BRANCH/$SOURCE
-    SOURCE_URL[2]=ftp://ftp.doc.cs.univ-paris8.fr/mirrors/ftp.porcupine.org/postfix-release/$PFIX_BRANCH/$SOURCE
-    SOURCE_URL[3]=ftp://mirror.widexs.nl/pub/postfix/$PFIX_BRANCH/$SOURCE
-    SOURCE_URL[4]=ftp://ftp.tuke.sk/pub/postfix/postfix-release/$PFIX_BRANCH/$SOURCE
-    SOURCE_URL[5]=ftp://ftp.easynet.be/postfix/$PFIX_BRANCH/$SOURCE
-    SOURCE_URL[6]=ftp://ftp.sgh.waw.pl/pub/postfix/src/$PFIX_BRANCH/$SOURCE
-    SOURCE_URL[7]=ftp://ftp.linux.lv/pub/software/postfix/$PFIX_BRANCH/$SOURCE
-    SOURCE_URL[8]=ftp://ftp3.linux.it/pub/mirrors/postfix/$PFIX_BRANCH/$SOURCE
-    SOURCE_URL[9]=ftp://ftp.kfki.hu/pub/packages/mail/postfix/$PFIX_BRANCH/$SOURCE
-   SOURCE_URL[10]=ftp://ftp3.informatik.uni-bonn.de/pub/software/postfix/$PFIX_BRANCH/$SOURCE
-   SOURCE_URL[11]=ftp://ftp.cgs.pl/pub/mirror/postfix/postfix-release/$PFIX_BRANCH/$SOURCE
-   SOURCE_URL[12]=ftp://ftp.is.co.za/networking/mail/mta/postfix/$PFIX_BRANCH/$SOURCE
-   SOURCE_URL[13]=ftp://postfix.linuxaid.com.cn/pub/postfix/$PFIX_BRANCH/$SOURCE
-   SOURCE_URL[14]=http://postfix.cakraweb.com/download/$PFIX_BRANCH/$SOURCE
-   SOURCE_URL[15]=http://postfix.manic.co.kr/pub/$PFIX_BRANCH/$SOURCE
-   SOURCE_URL[16]=ftp://ftp.utoronto.ca/mirror/packages/postfix/$PFIX_BRANCH/$SOURCE
-   SOURCE_URL[17]=ftp://postfix.webweaver.net/$PFIX_BRANCH/$SOURCE
-   SOURCE_URL[18]=ftp://ftp.arnes.si/packages/postfix-release/$PFIX_BRANCH/$SOURCE
-#Signature URLs
+    SOURCE_URL[1]=ftp://mirror.widexs.nl/pub/postfix/$PFIX_BRANCH/$SOURCE
+    SOURCE_URL[2]=ftp://ftp.easynet.be/postfix/$PFIX_BRANCH/$SOURCE
+    SOURCE_URL[3]=ftp://ftp.linux.lv/mirrors/ftp.postfix.org/$PFIX_BRANCH/$SOURCE
+    SOURCE_URL[4]=ftp://ftp.kfki.hu/pub/packages/mail/postfix/$PFIX_BRANCH/$SOURCE
+    SOURCE_URL[5]=ftp://ftp.cgs.pl/pub/mirror/postfix/postfix-release/$PFIX_BRANCH/$SOURCE
+    SOURCE_URL[6]=ftp://ftp.is.co.za/networking/mail/mta/postfix/$PFIX_BRANCH/$SOURCE
+    SOURCE_URL[7]=ftp://ftp.utoronto.ca/mirror/packages/postfix/$PFIX_BRANCH/$SOURCE
+    SOURCE_URL[8]=ftp://mir1.ovh.net/ftp.postfix.org/postfix-release/$PFIX_BRANCH/$SOURCE
+    SOURCE_URL[9]=ftp://ftp.arnes.si/packages/postfix-release/$PFIX_BRANCH/$SOURCE
+   SOURCE_URL[10]=http://mirrors.bbnx.net/postfix/source/$PFIX_BRANCH/$SOURCE
+   SOURCE_URL[11]=ftp://ftp.reverse.net/pub/postfix/$PFIX_BRANCH/$SOURCE
+   SOURCE_URL[12]=http://www.subneural.net/postfix-release/$PFIX_BRANCH/$SOURCE
+   SOURCE_URL[13]=ftp://ftp.samurai.com/pub/postfix/$PFIX_BRANCH/$SOURCE
+   SOURCE_URL[14]=ftp://postfix.cloud9.net/$PFIX_BRANCH/$SOURCE
+   SOURCE_URL[15]=http://mirror.postfix.jp/postfix-release/$PFIX_BRANCH/$SOURCE
+   SOURCE_URL[16]=http://postfix.bairesweb.com/mirrors/postfix-release/$PFIX_BRANCH/$SOURCE
+   SOURCE_URL[17]=http://mirror.ramix.jp/postfix-release/$PFIX_BRANCH/$SOURCE
+   SOURCE_URL[18]=ftp://ftp.tau.ac.il/pub/unix/mail/postfix/$PFIX_BRANCH/$SOURCE
+   SOURCE_URL[19]=ftp://ftp.esat.net/mirrors/ftp.porcupine.org/mirrors/postfix-release/$PFIX_BRANCH/$SOURCE
+   SOURCE_URL[20]=ftp://totem.fix.no/pub/postfix/$PFIX_BRANCH/$SOURCE
+
+   # Signature URLs
    SOURCE2_URL[0]=${SOURCE_URL[0]}.sig
    SOURCE2_URL[1]=${SOURCE_URL[1]}.sig
    SOURCE2_URL[2]=${SOURCE_URL[2]}.sig
@@ -50,30 +57,28 @@ fi
   SOURCE2_URL[16]=${SOURCE_URL[16]}.sig
   SOURCE2_URL[17]=${SOURCE_URL[17]}.sig
   SOURCE2_URL[18]=${SOURCE_URL[18]}.sig
+  SOURCE2_URL[19]=${SOURCE_URL[19]}.sig
+  SOURCE2_URL[20]=${SOURCE_URL[20]}.sig
 
-#
-# VDA patch
-#
-         VERSION3=2.4.5-vda
-            NAME3=$SPELL-$VERSION3-ng.patch
-          SOURCE3=$NAME3.gz
-SOURCE3_DIRECTORY=$SOURCE_DIRECTORY
+# VDA patch (see: http://vda.sourceforge.net/)
+if [[ "${POSTFIX_VDA}" == "y" ]]; then
+         VERSION3=2.5.5-vda
+          SOURCE3=$SPELL-$VERSION3-ng.patch.gz
    SOURCE3_URL[0]=http://vda.sourceforge.net/VDA/$SOURCE3
-   SOURCE3_HASH=sha512:e48c949bd8e66b01091122ffee5d00fc0eb629d34248e328b890e5157dd7719737c646d3c67068433dced8d4c5c7d43a2663c6f0618f50c974847185667c8e47
+   SOURCE3_HASH=sha512:3cb64d30c4e60dfec7940ef137ced067335abdb468b54e28c16e84b78acdaf5373660dc2a61a343e8d3af74e7761b61c58915360965a4e8779f971591f092924
+fi
 
-#
-# 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.
 
@@ -352,4 +368,3 @@
 
 2002-03-12 Kyle Sallee <anonymous at sourcemage.org>
 	* 1.0.4 and before: forgotten history...
-
diff --git a/mail/postfix/INSTALL b/mail/postfix/INSTALL
index 8e9ccda..56f03c5 100755
--- a/mail/postfix/INSTALL
+++ b/mail/postfix/INSTALL
@@ -1,48 +1,46 @@
-if [[ $POSTFIX_PRE_EXISTING == "no" ]] ; then
-#OMG YAY fixes for stupid godamn config files!
-note_config_files /etc/postfix/main.cf       &&
-note_config_files /etc/postfix/master.cf     &&
-note_config_files /etc/postfix/aliases       &&
-note_config_files /etc/postfix/access        &&
-note_config_files /etc/postfix/canonical     &&
-note_config_files /etc/postfix/generic       &&
-note_config_files /etc/postfix/header_checks &&
-note_config_files /etc/postfix/relocated     &&
-note_config_files /etc/postfix/transport     &&
-#the below are the answers to the interactive install
-/bin/bash postfix-install -non-interactive        \
-	install_root=$INSTALL_ROOT                    \
-	tempdir=$SOURCE_DIRECTORY                     \
-	config_directory=/etc/postfix                 \
-	daemon_directory=/usr/libexec/postfix         \
-	command_directory=/usr/sbin                   \
-	queue_directory=/var/spool/postfix            \
-	sendmail_path=/usr/bin/mailq                  \
-	newaliases_path=/usr/bin/newaliases           \
-	mailq_path=/usr/bin/mailq                     \
-	mail_owner=postfix                            \
-	setgid_group=postdrop                         \
-	html_directory=no                             \
-	manpage_directory=/usr/share/man              \
-	readme_directory=no                           &&
+if [[ "${POSTFIX_PRE_EXISTING}" == "no" ]]; then
+    # OMG YAY fixes for stupid godamn config files!
+    note_config_files /etc/postfix/main.cf &&
+    note_config_files /etc/postfix/master.cf &&
+    note_config_files /etc/postfix/aliases &&
+    note_config_files /etc/postfix/access &&
+    note_config_files /etc/postfix/canonical &&
+    note_config_files /etc/postfix/generic &&
+    note_config_files /etc/postfix/header_checks &&
+    note_config_files /etc/postfix/relocated &&
+    note_config_files /etc/postfix/transport &&
 
-	# fix the default manpage_directory
-	sed -i -e "s|manpage_directory.*=.*|manpage_directory = /usr/share/man|" /etc/postfix/main.cf
+    # the below are the answers to the interactive install
+    /bin/bash postfix-install -non-interactive \
+              install_root=$INSTALL_ROOT \
+              tempdir=$SOURCE_DIRECTORY \
+              config_directory=/etc/postfix \
+              daemon_directory=/usr/libexec/postfix \
+              command_directory=/usr/sbin \
+              queue_directory=/var/spool/postfix \
+              sendmail_path=/usr/sbin/sendmail \
+              newaliases_path=/usr/bin/newaliases \
+              mailq_path=/usr/bin/mailq \
+              mail_owner=postfix \
+              setgid_group=postdrop \
+              html_directory=no \
+              manpage_directory=/usr/share/man \
+              readme_directory=no &&
+
+    # fix the default manpage_directory
+    sed -i -e "s|manpage_directory.*=.*|manpage_directory = /usr/share/man|" /etc/postfix/main.cf
 else
-	# preexisting install found doing the upgrade, which is unattended
-	make upgrade
+    # preexisting install found doing the upgrade, which is unattended
+    make upgrade
 fi &&
 
-ln  -sf  ../sbin/sendmail   ${INSTALL_ROOT}/usr/lib/sendmail  &&
-ln  -sf  postfix/aliases    ${INSTALL_ROOT}/etc/aliases       &&
+ln -sf ../sbin/sendmail ${INSTALL_ROOT}/usr/lib/sendmail &&
+ln -sf postfix/aliases ${INSTALL_ROOT}/etc/aliases &&
 
-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
 }
 
 stop() {
-           echo     "Stopping postfix..."
-           postfix  stop
-           loadproc true
+    echo "Stopping ${NAME}..."
+    postfix stop
+    loadproc true
 }
 
 restart() {
-	   			 $0 stop
-            	sleep 1
-	   			 $0 start
+    $0 stop
+    sleep 1
+    $0 start
 }
 
 reload() {
-            echo     "Reloading postfix..."
-					 loadproc  postfix  reload
+    echo "Reloading ${NAME}..."
+    loadproc postfix reload
 }
diff --git a/mail/postfix/wietse.gpg b/mail/postfix/wietse.gpg
new file mode 100644
index 0000000..1fcff00
Binary files /dev/null and b/mail/postfix/wietse.gpg differ
diff --git a/mail/postfix/wietse.pgp b/mail/postfix/wietse.pgp
deleted file mode 100644
index 1fcff00..0000000
Binary files a/mail/postfix/wietse.pgp and /dev/null differ



More information about the SM-Commit mailing list