New commits:
commit acebcb7c74923d8f3f5b40341954bb7087cfcb20
Author: David Kowis <dkowis AT shlrm.org>
Commit: David Kowis <dkowis AT shlrm.org>
Massive updates to postfix. It is at the latest version.
No longer clobbers /etc/postfix/stuff I verified it with md5s
It does two different install methods depending on if there's
an /etc/postfix/main.cf so if they've installed postfix untracked it'll
still
detect smartly and run the upgrade install instead.
I don't anticipate any problems upgrading from old postfix installations
to this new one
So if problems show up, reboot your computer until it's fixed. :P
diff --git a/mail/postfix/BUILD b/mail/postfix/BUILD
index efb898c..2024061 100755
--- a/mail/postfix/BUILD
+++ b/mail/postfix/BUILD
@@ -50,18 +50,14 @@ if [ "$SSL_TLS" == "y" ]; then
fi &&
if [ "$VDA" == "y" ]; then
- message "${MESSAGE_COLOR}Trying to patch Postfix with VDA
support${DEFAULT_COLOR}" &&
- patch -Np1 < $SOURCE5_DIRECTORY/$NAME5 || PATCH_FAILED=true &&
- if [ "$PATCH_FAILED" == "true" ]; then
- message "${MESSAGE_COLOR}Patch failed... please do a cast -r -c
postfix" &&
- message "and answer no to the VDA patch question.${DEFAULT_COLOR}" &&
- return 1
- fi
+ message "${MESSAGE_COLOR}Applying VDA Patch${DEFAULT_COLOR}" &&
+ patch -p1 < $NAME3
fi &&
# fix to get man pages to install in /usr/man
+#sedit "s:/usr/local:${INSTALL_ROOT}/usr:" src/global/mail_params.h &&
+CCARGS="$CCARGS -DDEF_MANPAGE_DIR=\\\"/usr/share/man\\\"" &&
# NPTL glibc fix
if glibc_is_nptl; then
diff --git a/mail/postfix/CONFIGURE b/mail/postfix/CONFIGURE
index c0976a1..42efc84 100755
--- a/mail/postfix/CONFIGURE
+++ b/mail/postfix/CONFIGURE
@@ -1,21 +1,21 @@
-# check if postfix was installed before
-message "${MESSAGE_COLOR}Probing for previously casted
$SPELL...${DEFAULT_COLOR}" &&
-
-if [ ! -f /etc/postfix/main.cf ]; then
- message "${MESSAGE_COLOR}Previous install not detected.${DEFAULT_COLOR}"
+persistent_add POSTFIX_PRE_EXISTING
+if [[ -f /etc/postfix/main.cf ]]; then
+ message "${MESSAGE_COLOR}Pre-existing main.cf found. Doing upgrade
install.${DEFAULT_COLOR}"
+ POSTFIX_PRE_EXISTING="yes"
else
- message "${MESSAGE_COLOR}Previous install detected.${DEFAULT_COLOR}"
+ message "${MESSAGE_COLOR}No pre-existing main.cf found. Doing normal
install.${DEFAULT_COLOR}"
+ POSTFIX_PRE_EXISTING="no"
fi &&
config_query BENCH "install smtpstone benckmarking tools?" n
-message "${MESSAGE_COLOR}smtp configuration files loss may expose your
system to SPAM relaying. 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
+#message "${MESSAGE_COLOR}smtp configuration files loss may expose your
system to SPAM relaying. 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
-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
+#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 spell_ok mysql; then
config_query MYSQL "Add MySQL support?" y
@@ -23,6 +23,18 @@ else
config_query MYSQL "Add MySQL support?" n
fi &&
+if spell_ok postgresql; then
+ config_query POSTGRES "Add Postgresql support?" y
+else
+ config_query POSTGRES "Add Postgresql support?" n
+fi &&
+
+if spell_ok openldap; then
+ config_query LDAP "Add LDAP support?" y
+else
+ config_query LDAP "Add LDAP support?" n
+fi &&
+
if spell_ok linux-pam; then
config_query PAM "Add PAM support?" y
else
@@ -31,29 +43,12 @@ fi &&
if spell_ok openssl; then
config_query SSL "Add SSL support?" y
-else
- config_query SSL "Add SSL support?" n
-fi &&
-
-# SSL and TLS libs both come from openssl :)
-if spell_ok openssl; then
config_query SSL_TLS "Add TLS support?" y
else
+ config_query SSL "Add SSL support?" n
config_query SSL_TLS "Add TLS support?" n
fi &&
#
# Postfix main site
@@ -62,11 +62,9 @@ #
WEB_SITE=http://www.postfix.org/
ENTERED=20020125
UPDATED=20051230
- LICENSE[0]=IBMPL
BUILD_API=2
- MENU_ITEM[0]=${SPELL}
- MENU_EXEC[0]="sendmail"
- MENU_DESC[0]=${SHORT}
+ DOCS="$DOCS README_FILES RELEASE_NOTES* 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
@@ -74,7 +72,5 @@ Sendmail program. Postfix attempts to be
and hopefully secure, while at the same time being sendmail
compatible enough to not upset your users.
-(TLS/SSL patch URL: http://www.aet.tu-cottbus.de/personen/jaenicke/pfixtls)
(VDA patch URL: http://www.oav.net/~kiwi/postfix)
-(Postgressql patch URL: http://www.mat.cc)
EOF
diff --git a/mail/postfix/FINAL b/mail/postfix/FINAL
old mode 100755
new mode 100644
diff --git a/mail/postfix/HISTORY b/mail/postfix/HISTORY
index 3786841..d2e2d19 100644
--- a/mail/postfix/HISTORY
+++ b/mail/postfix/HISTORY
@@ -1,3 +1,16 @@
+2006-06-15 David Kowis <dkowis AT shlrm.org>
+ * DETAILS: updated to 2.2.10
+ * CONFIGURE: rearranged the config questions so the related ones are
together
+ Reworded messages for preexisting installation detection
+ * BUILD: Changed how the man page path was set
+ * SECURITY: Made the message more forceful
+ * INSTALL: modified the install process to mangle through the
"attended" install
+ And put the flag in there to watch out for preexisting installs and
whether or not
+ to use make update or postfix-install
+ `make install` simply calles ${SHELL} postfix-install so I did that
and passed in
+ the configuration parameters that it asks for. Yay for smart
installer scripts
+ * PRE_BUILD: fixed the patch extraction so it actually works
+
2005-12-30 David Kowis <dkowis AT sourcemage.org>
* DETAILS: removed all obsolete patches and updated any that were
still
good, also updated to use gpg signature and had to export wietse's
diff --git a/mail/postfix/INSTALL b/mail/postfix/INSTALL
index be1bdc8..0b76292 100755
--- a/mail/postfix/INSTALL
+++ b/mail/postfix/INSTALL
@@ -1,4 +1,24 @@
-make upgrade &&
+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=/etc/postfix \
+ daemon_directory=/usr/libexec/postfix \
+ command_directory=/usr/sbin \
+ queue_directory=/var/spool/postfix \
+ sendmail_path=/usr/bin/mailq \
+ newaliases_path=/usr/bin/newaliases \
+ mailq_path=/usr/bin/mailq \
+ mail_owner=postfix \
+ setgid_group=postdrop \
+ html_directory=no \
+ manpage_directory=/usr/share/man \
+ readme_directory=no
+else
+ # preexisting install found doing the upgrade, which is unattended
+ make upgrade
+fi &&