Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] GIT changes to master grimoire by David Kowis (24f3e112412e5704463065ff8f6b89a4be5ddf83)

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

Chronological Thread  
  • From: David Kowis <scm AT mail.sourcemage.org>
  • To: sm-commit AT lists.ibiblio.org
  • Subject: [SM-Commit] GIT changes to master grimoire by David Kowis (24f3e112412e5704463065ff8f6b89a4be5ddf83)
  • Date: Mon, 14 Aug 2006 08:59:45 -0500

GIT changes to master grimoire by David Kowis <dkowis AT shlrm.org>:

mail/postfix/BUILD | 17 ++++++++++++++++-
mail/postfix/CONFIGURE | 6 ++++++
mail/postfix/DETAILS | 6 +++---
mail/postfix/HISTORY | 6 ++++++
mail/postfix/INSTALL | 16 ++++------------
5 files changed, 35 insertions(+), 16 deletions(-)

New commits:
commit 24f3e112412e5704463065ff8f6b89a4be5ddf83
Author: David Kowis <dkowis AT shlrm.org>
Commit: David Kowis <dkowis AT shlrm.org>

postfix

version bumped to 2.3.2
Fixed manpage_directory at various stages of installation

diff --git a/mail/postfix/BUILD b/mail/postfix/BUILD
index 2024061..c3ea503 100755
--- a/mail/postfix/BUILD
+++ b/mail/postfix/BUILD
@@ -69,4 +69,19 @@ make makefiles \
"OPT=$CFLAGS" \
"AUXLIBS=$AUXLIBS" \
"CCARGS=$CCARGS" &&
-make
+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
+fi
+
diff --git a/mail/postfix/CONFIGURE b/mail/postfix/CONFIGURE
index 42efc84..859a6be 100755
--- a/mail/postfix/CONFIGURE
+++ b/mail/postfix/CONFIGURE
@@ -1,7 +1,13 @@
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"
diff --git a/mail/postfix/DETAILS b/mail/postfix/DETAILS
index d82b2ae..b6e9362 100755
--- a/mail/postfix/DETAILS
+++ b/mail/postfix/DETAILS
@@ -1,5 +1,5 @@
SPELL=postfix
- VERSION=2.2.10
+ VERSION=2.3.2
SOURCE=$SPELL-$VERSION.tar.gz
SOURCE2=$SPELL-$VERSION.tar.gz.sig
SOURCE2_IGNORE=signature
@@ -48,13 +48,13 @@ #Signature URLs
#
# VDA patch
#
- VERSION3=2.2.10-vda
+ VERSION3=2.3.2-vda
NAME3=$SPELL-$VERSION3.patch
SOURCE3=$NAME3.gz
SOURCE3_DIRECTORY=$SOURCE_DIRECTORY
SOURCE3_URL[0]=http://web.onda.com.br/nadal/postfix/VDA/$SOURCE3
SOURCE3_URL[1]=http://ftp.oav.net/others/postfix/VDA/$SOURCE3
-
SOURCE3_HASH=sha512:ba517a8de2a4fc7fc494f326e3af4c5a6edc4a6d03053c4423f1843aa3d2216fd7c072d04d3fdd335c3b4a1321934c7a1ae6c0d72045ffbb66d7a37c0d93e33c
+
SOURCE3_HASH=sha512:982ce436617a19f4eaad932a64684d57b354b05010fbcb4344c2541491aece259fa7d66a21a668dead9c09a653a843f523ba4f0c44ac890aff4e04d7f8fbe176

#
# Postfix main site
diff --git a/mail/postfix/HISTORY b/mail/postfix/HISTORY
index 5c379be..a8a736d 100644
--- a/mail/postfix/HISTORY
+++ b/mail/postfix/HISTORY
@@ -1,3 +1,9 @@
+2006-08-14 David Kowis <dkowis AT shlrm.org>
+ * DETAILS: Version bump 2.3.2
+ * BUILD: added fixing of manpage_directory
+ * CONFIGURE: added question for fixing manpage_directory
+ * INSTALL: added fix for manpage_directory to the default file
+
2006-06-20 David Kowis <dkowis AT shlrm.org>
* PRE_REMOVE, FINAL: forgot to remove the cruft

diff --git a/mail/postfix/INSTALL b/mail/postfix/INSTALL
index 0b76292..49f935f 100755
--- a/mail/postfix/INSTALL
+++ b/mail/postfix/INSTALL
@@ -14,7 +14,10 @@ #the below are the answers to the intera
setgid_group=postdrop \
html_directory=no \
manpage_directory=/usr/share/man \
- readme_directory=no
+ 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
@@ -33,14 +36,3 @@ if [ "$BENCH" == "y" ]; then
cp src/smtpstone/smtp-source ${INSTALL_ROOT}/usr/sbin
fi

-#mkdir -p ${INSTALL_ROOT}/usr/doc/$SPELL &&
-#cp -rf README_FILES ${INSTALL_ROOT}/usr/doc/$SPELL/ &&
-#cp -f INSTALL ${INSTALL_ROOT}/usr/doc/$SPELL/README_FILES &&
-#cp -f RELEASE_NOTES ${INSTALL_ROOT}/usr/doc/$SPELL/README_FILES &&
-#cp -rf html ${INSTALL_ROOT}/usr/doc/$SPELL/ &&
-
-#sedit "s:#mail_spool_directory = /var/spool/mail:mail_spool_directory =
${INSTALL_ROOT}/var/spool/mail:" \
-#${INSTALL_ROOT}/etc/postfix/main.cf &&
-
-#sedit "s|#alias_maps = hash:/etc/aliases$|alias_maps =
hash:${INSTALL_ROOT}/etc/aliases|" \
-#${INSTALL_ROOT}/etc/postfix/main.cf



  • [SM-Commit] GIT changes to master grimoire by David Kowis (24f3e112412e5704463065ff8f6b89a4be5ddf83), David Kowis, 08/14/2006

Archive powered by MHonArc 2.6.24.

Top of Page