Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] PERFORCE change 76720 by David Kowis for review

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

[SM-Commit] PERFORCE change 76720 by David Kowis for review

Chronological Thread  
    < Chronological >       < Thread >
  • From: Perforce Review Daemon <p4review AT smee.org>
  • To: "Andraž " ruskie " Levstik" <ruskie AT mages.ath.cx>, "Andrew Stitt" <a AT t.armory.com>, "Arjan Bouter" <abouter AT gmail.com>, "Arwed von Merkatz" <v.merkatz AT gmx.net>, "SM-Commit Daemon" <sm-commit AT lists.ibiblio.org>, "David Kowis" <dkowis+smgl-p4 AT shlrm.org>, "duane_malcolm" <d.malcolm AT auckland.ac.nz>, "Eric Sandall" <eric AT sandall.us>, "Ethan Grammatikidis" <eekee AT eekee.is-a-geek.org>, "Gareth Clay" <gareth AT caffeinefuelled.co.uk>, "George J. Sherwood" <george AT beernabeer.com>, "Jason Flatt" <jflatt AT sourcemage.org>, "Jeremy Blosser" <jblosser AT sourcemage.org>, "Juuso Alasuutari" <iuso AT sourcemage.org>, "Ladislav Hagara" <ladislav.hagara AT unob.cz>, "Maurizio Boriani" <baux AT member.fsf.org>, "Pieter Lenaerts" <e-type AT sourcemage.org>, "Pol Vinogradov" <vin.public AT gmail.com>, "Robin Cook" <rcook AT wyrms.net>, "Unet" <unet AT sourcemage.org>, "vladimir_marek" <vlmarek AT volny.cz>
  • Subject: [SM-Commit] PERFORCE change 76720 by David Kowis for review
  • Date: Fri, 24 Mar 2006 18:45:01 +0000 (GMT)
Change 76720 by david_kowis@dkowis-kain on 2006/03/24 18:41:41

Updated the postfix spell to 2.2.9 and updated the spell for their
build process

Affected files ...

... //sgl/grimoires/devel/mail/postfix/CONFIGURE#7 edit
... //sgl/grimoires/devel/mail/postfix/CONFLICTS#3 edit
... //sgl/grimoires/devel/mail/postfix/DETAILS#11 edit
... //sgl/grimoires/devel/mail/postfix/FINAL#5 edit
... //sgl/grimoires/devel/mail/postfix/HISTORY#19 edit
... //sgl/grimoires/devel/mail/postfix/INSTALL#7 edit
... //sgl/grimoires/devel/mail/postfix/PRE_BUILD#7 edit
... //sgl/grimoires/devel/mail/postfix/WIP#4 delete
... //sgl/grimoires/devel/mail/postfix/config.patch#2 edit

Differences ...

==== //sgl/grimoires/devel/mail/postfix/CONFIGURE#7 (xtext) ====


==== //sgl/grimoires/devel/mail/postfix/CONFLICTS#3 (xtext) ====

@@ -1,3 +1,4 @@
+conflicts postfix y &&
conflicts courier &&
conflicts esmtp &&
conflicts exim &&

==== //sgl/grimoires/devel/mail/postfix/DETAILS#11 (xtext) ====

@@ -5,6 +5,7 @@
SOURCE_GPG=wietse.pgp:$SOURCE2:ESTABLISHED_UPSTREAM_KEY
SOURCE2_IGNORE=signature
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
+ DOCS="${DOCS} RELEASE_NOTES"

SOURCE_URL[0]=ftp://ftp.porcupine.org/mirrors/postfix-release/official/$SOURCE
SOURCE_URL[1]=ftp://ftp.oav.net/postfix/official/$SOURCE

SOURCE_URL[2]=ftp://ftp.doc.cs.univ-paris8.fr/mirrors/ftp.porcupine.org/postfix-release/official/$SOURCE

==== //sgl/grimoires/devel/mail/postfix/FINAL#5 (xtext) ====

@@ -11,45 +11,6 @@
newaliases
fi &&

-# look for a backup file
-backup_file=`ls -t -1 -r /etc/postfix-backup* | tail --lines=1` &&
-
-if [ "$backup_file" != "" ]; then
- if [ "$RESTORE" == "n" ]; then
- message "${MESSAGE_COLOR}Restore skipped. (you can still use
$backup_file lather yourself)${DEFAULT_COLOR}"
- else
- message "${MESSAGE_COLOR}Restoring config files... ${DEFAULT_COLOR}"
- tar -C / -xjvPf $backup_file
- fi
-else
- message "${MESSAGE_COLOR}No backup for config files found.
${DEFAULT_COLOR}"
-fi &&
-
-#
-# postfix 2.x.x new directives needed (at least) :
-#
-if [ -e /etc/postfix/master.cf ]; then
-
- local relayCheck=`cat /etc/postfix/master.cf | grep relay` &&
- local proxymapCheck=`cat /etc/postfix/master.cf | grep proxymap` &&
-
- if [ "$relayCheck" == "" ]; then
- if query "${MESSAGE_COLOR}The relay directive is missing in
/etc/postfix/master.cf... Add it now ? ${DEFAULT_COLOR}" y
- then
- echo "# The next line was automatically added:" >>
/etc/postfix/master.cf
- echo "relay unix - - n - - smtp" >>
/etc/postfix/master.cf
- fi
- fi &&
-
- if [ "$proxymapCheck" == "" ]; then
- if query "${MESSAGE_COLOR}The proxymap directive is missing in
/etc/postfix/master.cf... Add it now ? ${DEFAULT_COLOR}" y
- then
- echo "# The next line was automatically added:" >>
/etc/postfix/master.cf
- echo "proxymap unix - - n - -
proxymap" >> /etc/postfix/master.cf
- fi
- fi
-fi &&
-
#
# SSL/TLS warnings
#

==== //sgl/grimoires/devel/mail/postfix/HISTORY#19 (text) ====

@@ -1,3 +1,13 @@
+2006-03-24 David Kowis <dkowis AT shlrm.org>
+ * FINAL: removed backup file restoration
+ * BUILD: made the build process work
+ * postfix-install.patch: added this to make it non-interactive no
matter what
+ * PRE_BUILD: apply postfix-install.patch instead of config.patch
+ The postfix spell modifies config upon install to ensure that it'll
work
+ with any new directives.
+ * DETAILS: added RELEASE_NOTES to the docs
+ * CONFLICTS: made it conflict with itself so that its tracked better.
+
2006-03-12 Karsten Behrmann <BearPerson AT sourcemage.org>
* DETAILS: (automated) Add KEYWORDS


==== //sgl/grimoires/devel/mail/postfix/INSTALL#7 (xtext) ====

@@ -1,10 +1,5 @@
if [[ -z "$POSTFIX_PREVIOUS_VERSION" ]]; then
message 'Performing fresh install...' &&
-echo "$INSTALL_ROOT/usr
-$SOURCE_DIRECTORY/tmp
-$INSTALL_ROOT/etc/postfix
-$INSTALL_ROOT/usr/share/man
-$INSTALL_ROOT/usr/share/docs/postfix" | \
make install
else
message 'Performing upgrade...' &&
@@ -27,10 +22,5 @@
cp src/smtpstone/qmqp-source $INSTALL_ROOT/usr/sbin &&
cp src/smtpstone/smtp-sink $INSTALL_ROOT/usr/sbin &&
cp src/smtpstone/smtp-source $INSTALL_ROOT/usr/sbin
-fi &&
+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/

==== //sgl/grimoires/devel/mail/postfix/PRE_BUILD#7 (xtext) ====

@@ -3,6 +3,7 @@
cd $SOURCE_DIRECTORY &&
unpack_hash ${SOURCE3} ${SOURCE3_HASH} &&

-#patch the file
-patch -p1 < $SPELL_DIRECTORY/config.patch &&
+#patch the config and the installing script
+#patch -p1 < $SPELL_DIRECTORY/config.patch &&
+patch -p0 < $SPELL_DIRECTORY/postfix-install.patch &&
cd ..

==== //sgl/grimoires/devel/mail/postfix/config.patch#2 (text) ====

@@ -1,6 +1,6 @@
-diff -Naur postfix-2.2.3.orig/conf/postfix-files
postfix-2.2.3/conf/postfix-files
---- postfix-2.2.3.orig/conf/postfix-files 2005-06-03 13:41:20.000000000
-0700
-+++ postfix-2.2.3/conf/postfix-files 2005-06-03 17:50:01.000000000 -0700
+diff -Nuar postfixmoreold/conf/postfix-files
postfixold-2.2.9/conf/postfix-files
+--- postfixmoreold/conf/postfix-files 2005-03-14 07:13:16.000000000 -0600
++++ postfixold-2.2.9/conf/postfix-files 2006-03-24 09:54:51.000000000
-0600
@@ -41,7 +41,6 @@
# it is a good idea to "u" all the files that have special ownership or
# permissions, so that running "make install" fixes any glitches.
@@ -41,9 +41,9 @@
$manpage_directory/man1/mailq.1:f:root:-:644
$manpage_directory/man1/newaliases.1:f:root:-:644
$manpage_directory/man1/postalias.1:f:root:-:644
-diff -Naur postfix-2.2.3.orig/conf/post-install
postfix-2.2.3/conf/post-install
---- postfix-2.2.3.orig/conf/post-install 2005-06-03 13:41:20.000000000
-0700
-+++ postfix-2.2.3/conf/post-install 2005-06-03 21:50:32.000000000 -0700
+diff -Nuar postfixmoreold/conf/post-install
postfixold-2.2.9/conf/post-install
+--- postfixmoreold/conf/post-install 2005-04-15 06:52:19.000000000 -0500
++++ postfixold-2.2.9/conf/post-install 2006-03-24 09:54:51.000000000 -0600
@@ -212,9 +212,8 @@
create-missing) create=1;;
set-perm*) create=1; set_perms=1;;
@@ -151,9 +151,9 @@
# Use file/directory status information in $config_directory/postfix-files.

test -n "$create" && {
-diff -Naur postfix-2.2.3.orig/postfix-install postfix-2.2.3/postfix-install
---- postfix-2.2.3.orig/postfix-install 2005-06-03 13:41:20.000000000 -0700
-+++ postfix-2.2.3/postfix-install 2005-06-03 21:25:24.000000000 -0700
+diff -Nuar postfixmoreold/postfix-install postfixold-2.2.9/postfix-install
+--- postfixmoreold/postfix-install 2005-02-02 15:39:36.000000000 -0600
++++ postfixold-2.2.9/postfix-install 2006-03-24 09:59:07.000000000 -0600
@@ -302,9 +302,6 @@
tempdir_prompt="a directory for scratch files while installing
Postfix. You must have write permission in this directory."
@@ -164,7 +164,7 @@
daemon_directory_prompt="the final destination directory for
installed Postfix daemon programs. This directory should not be
in the command search path of any users."
-@@ -354,11 +351,10 @@
+@@ -354,27 +351,28 @@

: ${install_root=/}
: ${tempdir=`pwd`}
@@ -173,11 +173,45 @@
# Find out the location of installed configuration files.

-test -z "$non_interactive" && for name in install_root tempdir
config_directory
-+test -z "$non_interactive" && for name in install_root tempdir
- do
- while :
- do
-@@ -387,46 +383,6 @@
+-do
+- while :
+- do
+- echo
+- eval echo Please specify \$${name}_prompt | ${FMT}
+- eval echo \$n "$name: [\$$name]\ \$c"
+- read ans
+- case $ans in
+- "") break;;
+- *) case $ans in
+- /*) eval $name=$ans; break;;
+- *) echo; echo $0: Error: $name should be an absolute path name.
1>&2;;
+- esac;;
+- esac
+- done
+-done
++#test -z "$non_interactive" && for name in install_root tempdir
++#do
++# while :
++# do
++# echo
++# eval echo Please specify \$${name}_prompt | ${FMT}
++# eval echo \$n "$name: [\$$name]\ \$c"
++# read ans
++# case $ans in
++# "") break;;
++# *) case $ans in
++# /*) eval $name=$ans; break;;
++# *) echo; echo $0: Error: $name should be an absolute path name.
1>&2;;
++# esac;;
++# esac
++# done
++#done
++install_root=${INSTALL_ROOT}
++tempdir=${SOURCE_DIRECTORY}
+
+ # In case some systems special-case pathnames beginning with //.
+
+@@ -387,46 +385,6 @@
exit 1
}

@@ -224,7 +258,57 @@
# Use built-in defaults as the final source of parameter settings.

for name in daemon_directory command_directory queue_directory mail_owner \
-@@ -504,7 +460,7 @@
+@@ -442,22 +400,33 @@
+
+ # Override settings manually.
+
+-test -z "$non_interactive" && for name in daemon_directory
command_directory \
+- queue_directory sendmail_path newaliases_path mailq_path mail_owner \
+- setgid_group html_directory manpage_directory readme_directory
+-do
+- while :
+- do
+- echo
+- eval echo Please specify \$${name}_prompt | ${FMT}
+- eval echo \$n "$name: [\$$name]\ \$c"
+- read ans
+- case $ans in
+- "") break;;
+- *) eval $name=$ans; break;;
+- esac
+- done
+-done
++#test -z "$non_interactive" && for name in daemon_directory
command_directory \
++# queue_directory sendmail_path newaliases_path mailq_path mail_owner \
++# setgid_group html_directory manpage_directory readme_directory
++#do
++# while :
++# do
++# echo
++# eval echo Please specify \$${name}_prompt | ${FMT}
++# eval echo \$n "$name: [\$$name]\ \$c"
++# read ans
++# case $ans in
++# "") break;;
++# *) eval $name=$ans; break;;
++# esac
++# done
++#done
++daemon_directory=/usr/libexec/postfix
++command_directory=/usr/sbin
++queue_directory=/var/spool/postfix
++sendmail_path=/usr/sbin/sendmail
++newaliases_path=/usr/bin/newaliases
++mailq_path=/usr/bin/mailq
++mail_owner=postfix
++setgid_group=postdrop
++html_directory=/usr/share/doc/postfix/html
++manpage_directory=/usr/share/man
++readme_directory=/usr/share/doc/postfix
+
+ # Sanity checks
+
+@@ -504,7 +473,7 @@
}
done

@@ -233,7 +317,7 @@
manpage_directory queue_directory html_directory readme_directory
do
eval test -f $install_root\$$path && {
-@@ -571,12 +527,7 @@
+@@ -571,12 +540,7 @@

# Upgrade or first-time installation?

@@ -246,7 +330,7 @@

# Install files, using information from the postfix-files file.

-@@ -657,9 +608,6 @@
+@@ -657,9 +621,6 @@
'$command_directory')
compare_or_replace $mode "$owner" "$group" bin/$file \
$COMMAND_DIRECTORY/$file || exit 1;;
@@ -256,7 +340,7 @@
'$sendmail_path')
check_parent $SENDMAIL_PATH || exit 1
compare_or_replace $mode "$owner" "$group" bin/sendmail \
-@@ -708,21 +656,6 @@
+@@ -708,21 +669,6 @@
# Postfix releases, and software should not suddenly be installed in
# the wrong place when Postfix is being upgraded.



  • [SM-Commit] PERFORCE change 76720 by David Kowis for review, Perforce Review Daemon, 03/24/2006

Archive powered by MHonArc 2.6.24.

Top of Page