postfix: Remove experimental branch and VDA patch

5 files changed, 34 insertions, 92 deletions

diff --git a/mail/postfix/CONFIGURE b/mail/postfix/CONFIGURE
index 8031250412..e939e86605 100755
--- a/mail/postfix/CONFIGURE
+++ b/mail/postfix/CONFIGURE
@@ -1,9 +1,8 @@
-local PFIX_VER=$(installed_version $SPELL) &&
-PFIX_VER=$(echo ${PFIX_VER:0:5} | sed -e 's/\.//g') &&
-
-if [[ $PFIX_VER -lt 255 ]]; then
-    persistent_add POSTFIX_VDA &&
-    POSTFIX_VDA=$VDA
+if [[ -n $POSTFIX_EXP ]]; then
+  persistent_remove POSTFIX_EXP
+fi &&
+if [[ -n $POSTFIX_VDA ]]; then
+  persistent_remove POSTFIX_VDA
 fi &&
 
 # removed obsolete configuration settings
@@ -15,8 +14,4 @@ if [[ -n $POSTFIX_FIX_MAINCF ]]; then
   persistent_remove POSTFIX_FIX_MAINCF
 fi &&
 
-config_query POSTFIX_BENCH "Install smtpstone benckmarking tools?" n &&
-
-if [[ "$POSTFIX_EXP" != "y" ]]; then
-    config_query POSTFIX_VDA "Apply Virtual Delivery Agent (VDA) patch? (EXPERIMENTAL)" n
-fi
+config_query POSTFIX_BENCH "Install smtpstone benckmarking tools?" n
diff --git a/mail/postfix/DETAILS b/mail/postfix/DETAILS
index 152cffa7df..22a8dd4cd8 100755
--- a/mail/postfix/DETAILS
+++ b/mail/postfix/DETAILS
@@ -1,88 +1,46 @@
             SPELL=postfix
-
-if [[ "${POSTFIX_EXP}" == "y" ]]; then
-          VERSION=2.9-20110615
-      PFIX_BRANCH=experimental
-else
           VERSION=2.9.11
       PFIX_BRANCH=official
    SECURITY_PATCH=1
        PATCHLEVEL=1
-fi
-
            SOURCE=$SPELL-$VERSION.tar.gz
           SOURCE2=$SPELL-$VERSION.tar.gz.sig
    SOURCE2_IGNORE=signature
        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.nl.uu.net/pub/unix/mail/$SPELL/$PFIX_BRANCH/$SOURCE
-    SOURCE_URL[2]=ftp://ftp.easynet.be/$SPELL/$PFIX_BRANCH/$SOURCE
-    SOURCE_URL[3]=http://mirrors.webhostinggeeks.com/postfix-source/$PFIX_BRANCH/$SOURCE
-    SOURCE_URL[4]=http://postfix.it-austria.net/releases/$PFIX_BRANCH/$SOURCE
-    SOURCE_URL[5]=ftp://mir1.ovh.net/ftp.postfix.org/postfix-release/$PFIX_BRANCH/$SOURCE
-    SOURCE_URL[6]=http://de.postfix.org/ftpmirror/$PFIX_BRANCH/$SOURCE
-    SOURCE_URL[7]=http://archive.mgm51.com/mirrors/postfix-source/$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]=ftp://ftp.fu-berlin.de/unix/mail/$SPELL/$PFIX_BRANCH/$SOURCE
-   SOURCE_URL[11]=ftp://ftp.reverse.net/pub/$SPELL/$PFIX_BRANCH/$SOURCE
-   SOURCE_URL[12]=http://postfix.cybermirror.org/$PFIX_BRANCH/$SOURCE
-   SOURCE_URL[13]=ftp://ftp.opennet.ru/pub/$SPELL/$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]=ftp://ftp.reverse.net/pub/$SPELL/$PFIX_BRANCH/$SOURCE
-   SOURCE_URL[17]=http://mirror.ramix.jp/postfix-release/$PFIX_BRANCH/$SOURCE
-   SOURCE_URL[18]=http://linorg.usp.br/$SPELL/release/$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/$SPELL/$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
-   SOURCE2_URL[3]=${SOURCE_URL[3]}.sig
-   SOURCE2_URL[4]=${SOURCE_URL[4]}.sig
-   SOURCE2_URL[5]=${SOURCE_URL[5]}.sig
-   SOURCE2_URL[6]=${SOURCE_URL[6]}.sig
-   SOURCE2_URL[7]=${SOURCE_URL[7]}.sig
-   SOURCE2_URL[8]=${SOURCE_URL[8]}.sig
-   SOURCE2_URL[9]=${SOURCE_URL[9]}.sig
-  SOURCE2_URL[10]=${SOURCE_URL[10]}.sig
-  SOURCE2_URL[11]=${SOURCE_URL[11]}.sig
-  SOURCE2_URL[12]=${SOURCE_URL[12]}.sig
-  SOURCE2_URL[13]=${SOURCE_URL[13]}.sig
-  SOURCE2_URL[14]=${SOURCE_URL[14]}.sig
-  SOURCE2_URL[15]=${SOURCE_URL[15]}.sig
-  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 (see: http://vda.sourceforge.net/)
-if [[ "$POSTFIX_VDA" == "y" ]]; then
-         VERSION3=2.8.3
-             VTAG=v10
-          SOURCE3=$SPELL-vda-$VTAG-$VERSION3.patch
-   SOURCE3_URL[0]=http://vda.sourceforge.net/VDA/$SOURCE3
-     SOURCE3_HASH=sha512:d8ef65b0eb683ce3636d206bf87d4d2ecfcec10a7c13803a262ae6180e1bb287e033a0f58744c222c9c2319466deb520dd99847387e02802deeb755980cbe16e
-fi
-
+       SOURCE_URL=(
+         ftp://ftp.porcupine.org/mirrors/postfix-release/$PFIX_BRANCH/$SOURCE
+         ftp://ftp.nl.uu.net/pub/unix/mail/$SPELL/$PFIX_BRANCH/$SOURCE
+         ftp://ftp.easynet.be/$SPELL/$PFIX_BRANCH/$SOURCE
+         http://mirrors.webhostinggeeks.com/postfix-source/$PFIX_BRANCH/$SOURCE
+         http://postfix.it-austria.net/releases/$PFIX_BRANCH/$SOURCE
+         ftp://mir1.ovh.net/ftp.postfix.org/postfix-release/$PFIX_BRANCH/$SOURCE
+         http://de.postfix.org/ftpmirror/$PFIX_BRANCH/$SOURCE
+         http://archive.mgm51.com/mirrors/postfix-source/$PFIX_BRANCH/$SOURCE
+         ftp://mir1.ovh.net/ftp.postfix.org/postfix-release/$PFIX_BRANCH/$SOURCE
+         ftp://ftp.arnes.si/packages/postfix-release/$PFIX_BRANCH/$SOURCE
+         ftp://ftp.fu-berlin.de/unix/mail/$SPELL/$PFIX_BRANCH/$SOURCE
+         ftp://ftp.reverse.net/pub/$SPELL/$PFIX_BRANCH/$SOURCE
+         http://postfix.cybermirror.org/$PFIX_BRANCH/$SOURCE
+         ftp://ftp.opennet.ru/pub/$SPELL/$PFIX_BRANCH/$SOURCE
+         ftp://postfix.cloud9.net/$PFIX_BRANCH/$SOURCE
+         http://mirror.postfix.jp/postfix-release/$PFIX_BRANCH/$SOURCE
+         ftp://ftp.reverse.net/pub/$SPELL/$PFIX_BRANCH/$SOURCE
+         http://mirror.ramix.jp/postfix-release/$PFIX_BRANCH/$SOURCE
+         http://linorg.usp.br/$SPELL/release/$PFIX_BRANCH/$SOURCE
+         ftp://ftp.esat.net/mirrors/ftp.porcupine.org/mirrors/postfix-release/$PFIX_BRANCH/$SOURCE
+         ftp://totem.fix.no/pub/$SPELL/$PFIX_BRANCH/$SOURCE
+       )
+      SOURCE2_URL=("${SOURCE_URL[@]/%/.sig}")
          WEB_SITE="http://www.postfix.org/"
           ENTERED=20020125
              DOCS="$DOCS README_FILES RELEASE_NOTES*"
          DOC_DIRS="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://vda.sourceforge.net/)
 EOF
diff --git a/mail/postfix/HISTORY b/mail/postfix/HISTORY
index f4eeba7782..376bcfae94 100644
--- a/mail/postfix/HISTORY
+++ b/mail/postfix/HISTORY
@@ -1,3 +1,7 @@
+2021-05-05 Ismael Luceno <ismael@iodev.co.uk>
+	* PREPARE: removed, no longer needed
+	* CONFIGURE, DETAILS, PRE_BUILD: removed VDA patch and experimental ver
+
 2015-07-02 Vlad Glagolev <stealth@sourcemage.org>
 	* CONFLICTS: added opensmtpd
 
diff --git a/mail/postfix/PREPARE b/mail/postfix/PREPARE
deleted file mode 100755
index 9abf5b2e24..0000000000
--- a/mail/postfix/PREPARE
+++ /dev/null
@@ -1,9 +0,0 @@
-local PFIX_VER=$(installed_version $SPELL) &&
-PFIX_VER=$(echo ${PFIX_VER:0:5} | sed -e 's/\.//g') &&
-
-if [[ $PFIX_VER -lt 255 ]]; then
-    persistent_add POSTFIX_EXP &&
-    POSTFIX_EXP=$PFIX_EXP
-fi &&
-
-config_query POSTFIX_EXP "Build experimental version?" n
diff --git a/mail/postfix/PRE_BUILD b/mail/postfix/PRE_BUILD
index 822ef9fa6a..be0c353053 100755
--- a/mail/postfix/PRE_BUILD
+++ b/mail/postfix/PRE_BUILD
@@ -3,10 +3,4 @@ cd "$SOURCE_DIRECTORY" &&
 
 if ! is_depends_enabled $SPELL db; then
     patch -p0 < "$SPELL_DIRECTORY/no-db.patch"
-fi &&
-
-if [[ "$POSTFIX_VDA" == "y" ]] && [[ "$POSTFIX_EXP" == "n" ]];  then
-    verify_file 3 &&
-    message "${MESSAGE_COLOR}Applying VDA Patch: ${SOURCE3}${DEFAULT_COLOR}"  &&
-    patch -p1 < "${SOURCE_CACHE}/${SOURCE3}"
 fi