sm-commit AT lists.ibiblio.org
Subject: Source Mage code commit list
List archive
[SM-Commit] GIT changes to master grimoire by Ismael Luceno (8f257deb3fd449b976304e3781bf6bda8572b227)
- From: Ismael Luceno <scm AT sourcemage.org>
- To: sm-commit AT lists.ibiblio.org
- Subject: [SM-Commit] GIT changes to master grimoire by Ismael Luceno (8f257deb3fd449b976304e3781bf6bda8572b227)
- Date: Wed, 5 May 2021 18:24:04 +0000
GIT changes to master grimoire by Ismael Luceno <ismael AT sourcemage.org>:
mail/postfix/BUILD | 7 +
mail/postfix/CONFIGURE | 17 +--
mail/postfix/DETAILS | 81
++-----------------
mail/postfix/HISTORY | 10 ++
mail/postfix/PREPARE | 9 --
mail/postfix/PRE_BUILD | 11 --
mail/postfix/no-db.patch | 55 ------------
mail/postfix/patches/0001-Fix-missing-includes.patch | 15 +++
8 files changed, 51 insertions(+), 154 deletions(-)
New commits:
commit 8f257deb3fd449b976304e3781bf6bda8572b227
Author: Ismael Luceno <ismael AT sourcemage.org>
Commit: Ismael Luceno <ismael AT sourcemage.org>
postfix: Fix build against musl
commit 16c3f8ed48e993adfa2e9b366601dfc90cb731be
Author: Ismael Luceno <ismael AT sourcemage.org>
Commit: Ismael Luceno <ismael AT sourcemage.org>
postfix 3.6.0
commit fe29e7c5448cbd0fe5722fdca96f2a8f4c11402e
Author: Ismael Luceno <ismael AT sourcemage.org>
Commit: Ismael Luceno <ismael AT sourcemage.org>
postfix: Update mirrors
commit 203d1d9c4e508c165a282a0990db6b988e87bd3e
Author: Ismael Luceno <ismael AT sourcemage.org>
Commit: Ismael Luceno <ismael AT sourcemage.org>
postfix: Remove experimental branch and VDA patch
diff --git a/mail/postfix/BUILD b/mail/postfix/BUILD
index 14834c6..22d5d66 100755
--- a/mail/postfix/BUILD
+++ b/mail/postfix/BUILD
@@ -9,6 +9,13 @@ install -vm 2775 -d -o mail -g mail
"$INSTALL_ROOT/var/spool/mail" &&
local AUXLIBS="-L$INSTALL_ROOT/usr/lib -L$INSTALL_ROOT/lib -lm" &&
local CCARGS="" &&
+case "$HOST" in
+ (*-musl)
+ # XXX incomplete NIS implementation on musl
+ CCARGS+=' -DNO_NIS'
+ ;;
+esac &&
+
if is_depends_enabled $SPELL pcre; then
AUXLIBS="$AUXLIBS -lpcre" &&
CCARGS="$CCARGS -DHAS_PCRE" &&
diff --git a/mail/postfix/CONFIGURE b/mail/postfix/CONFIGURE
index 8031250..e939e86 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 152cffa..df8cc96 100755
--- a/mail/postfix/DETAILS
+++ b/mail/postfix/DETAILS
@@ -1,88 +1,31 @@
SPELL=postfix
-
-if [[ "${POSTFIX_EXP}" == "y" ]]; then
- VERSION=2.9-20110615
- PFIX_BRANCH=experimental
-else
- VERSION=2.9.11
- PFIX_BRANCH=official
+ VERSION=3.6.0
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/official/$SOURCE
+ http://de.postfix.org/ftpmirror/official/$SOURCE
+ http://archive.mgm51.com/mirrors/postfix-source/official/$SOURCE
+ ftp://ftp.arnes.si/packages/postfix-release/official/$SOURCE
+ ftp://ftp.fu-berlin.de/unix/mail/postfix/official/$SOURCE
+ http://mirror.postfix.jp/postfix-release/official/$SOURCE
+ http://linorg.usp.br/postfix/release/official/$SOURCE
+ ftp://totem.fix.no/pub/postfix/official/$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 f4eeba7..0a97b35 100644
--- a/mail/postfix/HISTORY
+++ b/mail/postfix/HISTORY
@@ -1,3 +1,13 @@
+2021-05-05 Ismael Luceno <ismael AT iodev.co.uk>
+ * PREPARE: removed, no longer needed
+ * CONFIGURE, DETAILS, PRE_BUILD: removed VDA patch and experimental
ver
+ * DETAILS: updated mirrors
+ * DETAILS: updated spell to 3.6.0
+ * no-db.patch: removed, no longer needed
+ * PRE_BUILD: converted to apply_patch_dir
+ * BUILD, patches/0001-Fix-missing-includes.patch:
+ fixed build against musl
+
2015-07-02 Vlad Glagolev <stealth AT sourcemage.org>
* CONFLICTS: added opensmtpd
diff --git a/mail/postfix/PREPARE b/mail/postfix/PREPARE
deleted file mode 100755
index 9abf5b2..0000000
--- 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 822ef9f..c230ad1 100755
--- a/mail/postfix/PRE_BUILD
+++ b/mail/postfix/PRE_BUILD
@@ -1,12 +1,3 @@
default_pre_build &&
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
+apply_patch_dir patches
diff --git a/mail/postfix/no-db.patch b/mail/postfix/no-db.patch
deleted file mode 100644
index 2a38124..0000000
--- a/mail/postfix/no-db.patch
+++ /dev/null
@@ -1,55 +0,0 @@
---- makedefs.orig 2012-11-30 03:53:34.000000000 +0400
-+++ makedefs 2013-01-21 22:02:59.118469530 +0400
-@@ -279,14 +279,14 @@
- elif [ -f /usr/include/db/db.h ]
- then
- CCARGS="$CCARGS -I/usr/include/db"
-- else
-+ # else
- # No, we're not going to try db1 db2 db3 etc.
- # On a properly installed system, Postfix builds
- # by including <db.h> and by linking with -ldb
-- echo "No <db.h> include file found." 1>&2
-- echo "Install the appropriate db*-devel package first."
1>&2
-- echo "See the RELEASE_NOTES file for more information."
1>&2
-- exit 1
-+ # echo "No <db.h> include file found." 1>&2
-+ # echo "Install the appropriate db*-devel package first."
1>&2
-+ # echo "See the RELEASE_NOTES file for more information."
1>&2
-+ # exit 1
- fi
- # GDBM locks the DBM .pag file after open. This breaks
postmap.
- # if [ -f /usr/include/gdbm-ndbm.h ]
-@@ -298,7 +298,7 @@
- # CCARGS="$CCARGS -DHAS_DBM -DPATH_NDBM_H='<gdbm/ndbm.h>'"
- # GDBM_LIBS=gdbm
- # fi
-- SYSLIBS="-ldb"
-+ # SYSLIBS="-ldb"
- for name in nsl resolv $GDBM_LIBS
- do
- for lib in /usr/lib64 /lib64 /usr/lib /lib
---- makedefs.orig 2012-11-30 03:53:34.000000000 +0400
-+++ makedefs 2013-07-20 16:57:49.260069906 +0400
-@@ -358,15 +358,15 @@
- elif [ -f /usr/include/db/db.h ]
- then
- CCARGS="$CCARGS -I/usr/include/db"
-- else
-+ # else
- # On a properly installed system, Postfix builds
- # by including <db.h> and by linking with -ldb
-- echo "No <db.h> include file found." 1>&2
-- echo "Install the appropriate db*-devel package first."
1>&2
-- echo "See the RELEASE_NOTES file for more information."
1>&2
-- exit 1
-+ # echo "No <db.h> include file found." 1>&2
-+ # echo "Install the appropriate db*-devel package first."
1>&2
-+ # echo "See the RELEASE_NOTES file for more information."
1>&2
-+ # exit 1
- fi
-- SYSLIBS="-ldb"
-+ # SYSLIBS="-ldb"
- for name in nsl resolv
- do
- for lib in /usr/lib64 /lib64 /usr/lib /lib
diff --git a/mail/postfix/patches/0001-Fix-missing-includes.patch
b/mail/postfix/patches/0001-Fix-missing-includes.patch
new file mode 100644
index 0000000..7caebdc
--- /dev/null
+++ b/mail/postfix/patches/0001-Fix-missing-includes.patch
@@ -0,0 +1,15 @@
+From: Ismael Luceno <ismael AT iodev.co.uk>
+Subject: [PATCH] Fix missing includes
+
+Upstream-Status: Pending
+
+--- a/src/posttls-finger/posttls-finger.c
++++ b/src/posttls-finger/posttls-finger.c
+@@ -336,6 +336,7 @@
+ #include <ctype.h>
+ #include <stdlib.h>
+ #include <unistd.h>
++#include <stdio.h>
+ #include <signal.h>
+ #include <fcntl.h>
+ #include <errno.h>
- [SM-Commit] GIT changes to master grimoire by Ismael Luceno (8f257deb3fd449b976304e3781bf6bda8572b227), Ismael Luceno, 05/05/2021
Archive powered by MHonArc 2.6.24.