Skip to Content.
Sympa Menu

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

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 (03f8272e07c29e785fce147c7efea4e7df8559d7)
  • Date: Wed, 22 Oct 2014 14:04:05 -0500

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

mail/postfix/BUILD | 20 +---------------
mail/postfix/CONFIGURE | 31 ++++--------------------
mail/postfix/DETAILS | 1
mail/postfix/HISTORY | 13 +++++++---
mail/postfix/INSTALL | 61
++++++++++++++++---------------------------------
mail/postfix/protected | 1
mail/postfix/volatiles | 1
7 files changed, 40 insertions(+), 88 deletions(-)

New commits:
commit 03f8272e07c29e785fce147c7efea4e7df8559d7
Author: Vlad Glagolev <stealth AT sourcemage.org>
Commit: Vlad Glagolev <stealth AT sourcemage.org>

postfix: ignore running queue files

commit ba473e30185e7ee8b30634e9c02245c1d20315da
Author: Vlad Glagolev <stealth AT sourcemage.org>
Commit: Vlad Glagolev <stealth AT sourcemage.org>

postfix: removed obsolete options + more post-update fixes

diff --git a/mail/postfix/BUILD b/mail/postfix/BUILD
index 80f06e5..14834c6 100755
--- a/mail/postfix/BUILD
+++ b/mail/postfix/BUILD
@@ -76,11 +76,9 @@ if is_depends_enabled $SPELL $(get_spell_provider $SPELL
SSL); then
message "${MESSAGE_COLOR}SSL library requested: Using
$(get_spell_provider $SPELL SSL) 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 &&
+# fix to get man pages to install in /usr/share/man
CCARGS="$CCARGS -DDEF_MANPAGE_DIR=\\\"$INSTALL_ROOT/usr/share/man\\\"" &&

-
# NPTL glibc fix
if glibc_is_nptl; then
AUXLIBS="$AUXLIBS -lpthread"
@@ -91,18 +89,4 @@ make makefiles \
"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
- 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
+make
diff --git a/mail/postfix/CONFIGURE b/mail/postfix/CONFIGURE
index abaef3d..8031250 100755
--- a/mail/postfix/CONFIGURE
+++ b/mail/postfix/CONFIGURE
@@ -6,36 +6,17 @@ if [[ $PFIX_VER -lt 255 ]]; then
POSTFIX_VDA=$VDA
fi &&

-if [[ -f $INSTALL_ROOT/etc/postfix/main.cf ]]; then
- persistent_add POSTFIX_PRE_EXISTING &&
- POSTFIX_PRE_EXISTING="yes" &&
-
- 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}" &&
-
- config_query POSTFIX_FIX_MAINCF "Check for and fix problems in installed
main.cf? (HIGHLY RECOMMENDED)" y
-else
- persistent_add POSTFIX_PRE_EXISTING &&
- POSTFIX_PRE_EXISTING="no" &&
+# removed obsolete configuration settings
+if [[ -n $POSTFIX_PRE_EXISTING ]]; then
+ persistent_remove POSTFIX_PRE_EXISTING
+fi &&

- message "${MESSAGE_COLOR}No pre-existing main.cf found. Doing normal
install.${DEFAULT_COLOR}"
+if [[ -n $POSTFIX_FIX_MAINCF ]]; then
+ persistent_remove POSTFIX_FIX_MAINCF
fi &&

config_query POSTFIX_BENCH "Install smtpstone benckmarking tools?" n &&

-# Config file backup
-#message "${MESSAGE_COLOR}Configuration file loss may expose your system to
SPAM relaying." &&
-#message "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
-
-# 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 &&
-
if [[ "$POSTFIX_EXP" != "y" ]]; then
config_query POSTFIX_VDA "Apply Virtual Delivery Agent (VDA) patch?
(EXPERIMENTAL)" n
fi
diff --git a/mail/postfix/DETAILS b/mail/postfix/DETAILS
index 7bee7c5..152cffa 100755
--- a/mail/postfix/DETAILS
+++ b/mail/postfix/DETAILS
@@ -7,6 +7,7 @@ else
VERSION=2.9.11
PFIX_BRANCH=official
SECURITY_PATCH=1
+ PATCHLEVEL=1
fi

SOURCE=$SPELL-$VERSION.tar.gz
diff --git a/mail/postfix/HISTORY b/mail/postfix/HISTORY
index 3678e39..f4885cb 100644
--- a/mail/postfix/HISTORY
+++ b/mail/postfix/HISTORY
@@ -1,8 +1,13 @@
2014-10-22 Vlad Glagolev <stealth AT sourcemage.org>
- * DETAILS: updated spell to 2.9.11
- * INSTALL: use sorcery function note_config_file() from libtrack;
added
- virtual config file to tracking list; prevent main.cf from trashing
on
- upgrade too; install qmqp-sink tool
+ * DETAILS: updated spell to 2.9.11; PATCHLEVEL=1
+ * INSTALL: dropped unneeded config tracking; install qmqp-sink tool
and
+ all benchmarking utility manual pages; checked build for both castfs
+ and non-castfs installations
+ * BUILD: fixed comment about manual installation; removed sed magic
+ * CONFIGURE: removed obsolete configure options and persistent vars
+ * protected: added, to keep main.cf config file, it is managed by
+ upstream postfix-install script
+ * volatiles: added, for non-tracking of queue files

2014-10-16 Vlad Glagolev <stealth AT sourcemage.org>
* DETAILS: updated spell to 2.9.10
diff --git a/mail/postfix/INSTALL b/mail/postfix/INSTALL
index ab133ae..00a83ea 100755
--- a/mail/postfix/INSTALL
+++ b/mail/postfix/INSTALL
@@ -1,43 +1,19 @@
-local upstream_conf="main.cf \
- master.cf \
- aliases \
- access \
- canonical \
- generic \
- header_checks \
- relocated \
- transport \
- virtual" &&
-
-for conf_file in ${upstream_conf}; do
- message "${MESSAGE_COLOR}Marking configuration file
${conf_file}...${DEFAULT_COLOR}" &&
- note_config_file "$INSTALL_ROOT/etc/postfix/${conf_file}"
-done &&
-
-if [[ "$POSTFIX_PRE_EXISTING" == "no" ]]; then
- # the below are the answers to the interactive install
- /bin/bash postfix-install -non-interactive \
- install_root="$INSTALL_ROOT" \
- tempdir="$SOURCE_DIRECTORY" \
- config_directory="$INSTALL_ROOT/etc/postfix" \
- daemon_directory="$INSTALL_ROOT/usr/libexec/postfix" \
- command_directory="$INSTALL_ROOT/usr/sbin" \
- queue_directory="$INSTALL_ROOT/var/spool/postfix" \
- sendmail_path="$INSTALL_ROOT/usr/sbin/sendmail" \
- newaliases_path="$INSTALL_ROOT/usr/bin/newaliases" \
- mailq_path="$INSTALL_ROOT/usr/bin/mailq" \
- mail_owner=postfix \
- setgid_group=postdrop \
- html_directory=no \
- manpage_directory="$INSTALL_ROOT/usr/share/man" \
- readme_directory=no &&
-
- # fix the default manpage_directory
- sed -i -e "s|manpage_directory.*=.*|manpage_directory =
$INSTALL_ROOT/usr/share/man|" /etc/postfix/main.cf
-else
- # preexisting install found doing the upgrade, which is unattended
- make upgrade
-fi &&
+# the below are the answers to the interactive install
+/bin/bash postfix-install -non-interactive \
+ install_root="$INSTALL_ROOT" \
+ tempdir="$SOURCE_DIRECTORY" \
+ config_directory="$INSTALL_ROOT/etc/postfix" \
+ daemon_directory="$INSTALL_ROOT/usr/libexec/postfix" \
+ command_directory="$INSTALL_ROOT/usr/sbin" \
+ queue_directory="$INSTALL_ROOT/var/spool/postfix" \
+ sendmail_path="$INSTALL_ROOT/usr/sbin/sendmail" \
+ newaliases_path="$INSTALL_ROOT/usr/bin/newaliases" \
+ mailq_path="$INSTALL_ROOT/usr/bin/mailq" \
+ manpage_directory="$INSTALL_ROOT/usr/share/man" \
+ mail_owner=postfix \
+ setgid_group=postdrop \
+ html_directory=no \
+ readme_directory=no &&

ln -sf ../sbin/sendmail "$INSTALL_ROOT/usr/lib/sendmail" &&
ln -sf postfix/aliases "$INSTALL_ROOT/etc/aliases" &&
@@ -45,7 +21,10 @@ ln -sf postfix/aliases "$INSTALL_ROOT/etc/aliases" &&
if [[ "$POSTFIX_BENCH" == "y" ]]; then
local file &&

+ mkdir -p "$INSTALL_ROOT/usr/share/man/man1" &&
+
for file in qmqp-sink qmqp-source smtp-sink smtp-source; do
- install -v -m 544 "src/smtpstone/$file" "$INSTALL_ROOT/usr/sbin"
+ install -v -m 544 "src/smtpstone/$file" "$INSTALL_ROOT/usr/sbin" &&
+ install -v -m 644 "man/man1/$file.1"
"$INSTALL_ROOT/usr/share/man/man1/"
done
fi
diff --git a/mail/postfix/protected b/mail/postfix/protected
new file mode 100644
index 0000000..e6a69cb
--- /dev/null
+++ b/mail/postfix/protected
@@ -0,0 +1 @@
+^/etc/postfix/main\.cf$
diff --git a/mail/postfix/volatiles b/mail/postfix/volatiles
new file mode 100644
index 0000000..863c34a
--- /dev/null
+++ b/mail/postfix/volatiles
@@ -0,0 +1 @@
+^/var/spool/postfix/



  • [SM-Commit] GIT changes to master grimoire by Vlad Glagolev (03f8272e07c29e785fce147c7efea4e7df8559d7), Vlad Glagolev, 10/22/2014

Archive powered by MHonArc 2.6.24.

Top of Page