Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] GIT changes to master grimoire by Vlad Glagolev (10b6fb75ac8b8a72538e1e19162d4834d94db3f2)

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

Chronological Thread  
  • From: Vlad Glagolev <scm AT sourcemage.org>
  • To: sm-commit AT lists.ibiblio.org
  • Subject: [SM-Commit] GIT changes to master grimoire by Vlad Glagolev (10b6fb75ac8b8a72538e1e19162d4834d94db3f2)
  • Date: Mon, 21 Jan 2013 12:14:19 -0600

GIT changes to master grimoire by Vlad Glagolev <stealth AT sourcemage.org>:

mail/postfix/BUILD | 14 ++++++++++----
mail/postfix/DEPENDS | 7 +++++--
mail/postfix/DETAILS | 30 +++++++++++++++---------------
mail/postfix/HISTORY | 7 +++++++
mail/postfix/PRE_BUILD | 4 ++++
mail/postfix/no-db.patch | 31 +++++++++++++++++++++++++++++++
6 files changed, 72 insertions(+), 21 deletions(-)

New commits:
commit 10b6fb75ac8b8a72538e1e19162d4834d94db3f2
Author: Vlad Glagolev <stealth AT sourcemage.org>
Commit: Vlad Glagolev <stealth AT sourcemage.org>

postfix: => 2.9.5

diff --git a/mail/postfix/BUILD b/mail/postfix/BUILD
index c8a30fa..2e88705 100755
--- a/mail/postfix/BUILD
+++ b/mail/postfix/BUILD
@@ -2,10 +2,8 @@ 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" &&
+# always correct permissions for older setups
+install -vm 2775 -d -o mail -g mail "$INSTALL_ROOT/var/spool/mail" &&

# We want blank vars
local AUXLIBS="-L$INSTALL_ROOT/usr/lib -L$INSTALL_ROOT/lib -lm" &&
@@ -38,6 +36,14 @@ if is_depends_enabled $SPELL cyrus-sasl; then
message "${MESSAGE_COLOR}Cyrus-SASL requested: Using
Cyrus-SASL${DEFAULT_COLOR}"
fi &&

+if is_depends_enabled $SPELL db; then
+ AUXLIBS="$AUXLIBS -ldb"
+ CCARGS="$CCARGS -DHAS_DB -I$INSTALL_ROOT/usr/include" &&
+ message "${MESSAGE_COLOR}Berkeley DB requested: Using Berkeley
DB${DEFAULT_COLOR}"
+else
+ CCARGS="$CCARGS -DNO_DB"
+fi &&
+
if is_depends_enabled $SPELL sqlite; then
AUXLIBS="$AUXLIBS -lsqlite3"
CCARGS="$CCARGS -DHAS_SQLITE -I$INSTALL_ROOT/usr/include" &&
diff --git a/mail/postfix/DEPENDS b/mail/postfix/DEPENDS
index 4b23bf2..61d65ab 100755
--- a/mail/postfix/DEPENDS
+++ b/mail/postfix/DEPENDS
@@ -1,9 +1,12 @@
-depends db &&
depends pcre &&

+optional_depends db \
+ "" "" \
+ "for hash and btree files support" &&
+
optional_depends sqlite \
"" "" \
- "for SQLite support (via patch)" &&
+ "for SQLite support" &&

optional_depends MYSQL \
"" "" \
diff --git a/mail/postfix/DETAILS b/mail/postfix/DETAILS
index 7efb93e..062c89b 100755
--- a/mail/postfix/DETAILS
+++ b/mail/postfix/DETAILS
@@ -4,7 +4,7 @@ if [[ "${POSTFIX_EXP}" == "y" ]]; then
VERSION=2.9-20110615
PFIX_BRANCH=experimental
else
- VERSION=2.9.2
+ VERSION=2.9.5
PFIX_BRANCH=official
fi

@@ -16,26 +16,26 @@ fi

# Source URLs

SOURCE_URL[0]=ftp://ftp.porcupine.org/mirrors/postfix-release/$PFIX_BRANCH/$SOURCE
- 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[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]=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[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]=http://postfix.bairesweb.com/mirrors/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]=ftp://ftp.tau.ac.il/pub/unix/mail/postfix/$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/postfix/$PFIX_BRANCH/$SOURCE
+ SOURCE_URL[20]=ftp://totem.fix.no/pub/$SPELL/$PFIX_BRANCH/$SOURCE

# Signature URLs
SOURCE2_URL[0]=${SOURCE_URL[0]}.sig
diff --git a/mail/postfix/HISTORY b/mail/postfix/HISTORY
index f6cce7b..9e70540 100644
--- a/mail/postfix/HISTORY
+++ b/mail/postfix/HISTORY
@@ -1,3 +1,10 @@
+2013-01-21 Vlad Glagolev <stealth AT sourcemage.org>
+ * DETAILS: updated spell to 2.9.5; renewed mirror list
+ * BUILD: switched to security mode mail spool
+ * DEPENDS: added ability to drop db support
+ * PRE_BUILD: apply the patch
+ * no-db.patch: added, to properly use -DNO_DB flag
+
2012-12-09 Vlad Glagolev <stealth AT sourcemage.org>
* CONFLICTS: added msmtp, esmtp, courier

diff --git a/mail/postfix/PRE_BUILD b/mail/postfix/PRE_BUILD
index 9e3ee1b..822ef9f 100755
--- a/mail/postfix/PRE_BUILD
+++ b/mail/postfix/PRE_BUILD
@@ -1,6 +1,10 @@
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}"
&&
diff --git a/mail/postfix/no-db.patch b/mail/postfix/no-db.patch
new file mode 100644
index 0000000..e6277f7
--- /dev/null
+++ b/mail/postfix/no-db.patch
@@ -0,0 +1,31 @@
+--- 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



  • [SM-Commit] GIT changes to master grimoire by Vlad Glagolev (10b6fb75ac8b8a72538e1e19162d4834d94db3f2), Vlad Glagolev, 01/21/2013

Archive powered by MHonArc 2.6.24.

Top of Page