diff options
author | hubertf <hubertf@pkgsrc.org> | 2001-03-20 12:54:29 +0000 |
---|---|---|
committer | hubertf <hubertf@pkgsrc.org> | 2001-03-20 12:54:29 +0000 |
commit | a333ea118a80f73cc8192d9ae003200ac16db1e3 (patch) | |
tree | 54e480d51d41f925bb1d5690079b531237a11db3 /mail/postfix/patches | |
parent | 1b1053b84e1a4668e88ca65220b50ebfce248dd8 (diff) | |
download | pkgsrc-a333ea118a80f73cc8192d9ae003200ac16db1e3.tar.gz |
replaced by postfix pkg
Diffstat (limited to 'mail/postfix/patches')
-rw-r--r-- | mail/postfix/patches/patch-aa | 244 | ||||
-rw-r--r-- | mail/postfix/patches/patch-af | 52 | ||||
-rw-r--r-- | mail/postfix/patches/patch-ba | 23 |
3 files changed, 0 insertions, 319 deletions
diff --git a/mail/postfix/patches/patch-aa b/mail/postfix/patches/patch-aa deleted file mode 100644 index 521c4ab02c0..00000000000 --- a/mail/postfix/patches/patch-aa +++ /dev/null @@ -1,244 +0,0 @@ -$NetBSD: patch-aa,v 1.5 2001/03/20 12:50:50 hubertf Exp $ - ---- INSTALL.sh.orig Thu Jan 25 11:02:53 2001 -+++ INSTALL.sh Sun Feb 4 14:45:40 2001 -@@ -7,39 +7,39 @@ - umask 022 - - test -t 0 && --cat <<EOF -- --Warning: this script replaces existing sendmail or Postfix programs. --Make backups if you want to be able to recover. -- --In addition to doing a fresh install, this script can change an --existing installation from using a world-writable maildrop to a --group-writable one. It cannot be used to change Postfix queue --file/directory ownership. -- --Before installing files, this script prompts you for some definitions. --Most definitions will be remembered, so you have to specify them --only once. All definitions have a reasonable default value. -- -- install_root - prefix for installed file names (for package building) -- -- tempdir - where to write scratch files -- -- config_directory - directory with Postfix configuration files. -- daemon_directory - directory with Postfix daemon programs. -- command_directory - directory with Postfix administrative commands. -- queue_directory - directory with Postfix queues. -- -- sendmail_path - full pathname of the Postfix sendmail command. -- newaliases_path - full pathname of the Postfix newaliases command. -- mailq_path - full pathname of the Postfix mailq command. -- -- mail_owner - owner of Postfix queue files. -- -- setgid - groupname, e.g., postdrop (default: no). See INSTALL section 12. -- manpages - "no" or path to man tree. Example: /usr/local/man. -- --EOF -+#cat <<EOF -+# -+#Warning: this script replaces existing sendmail or Postfix programs. -+#Make backups if you want to be able to recover. -+# -+#In addition to doing a fresh install, this script can change an -+#existing installation from using a world-writable maildrop to a -+#group-writable one. It cannot be used to change Postfix queue -+#file/directory ownership. -+# -+#Before installing files, this script prompts you for some definitions. -+#Most definitions will be remembered, so you have to specify them -+#only once. All definitions have a reasonable default value. -+# -+# install_root - prefix for installed file names (for package building) -+# -+# tempdir - where to write scratch files -+# -+# config_directory - directory with Postfix configuration files. -+# daemon_directory - directory with Postfix daemon programs. -+# command_directory - directory with Postfix administrative commands. -+# queue_directory - directory with Postfix queues. -+# -+# sendmail_path - full pathname of the Postfix sendmail command. -+# newaliases_path - full pathname of the Postfix newaliases command. -+# mailq_path - full pathname of the Postfix mailq command. -+# -+# mail_owner - owner of Postfix queue files. -+# -+# setgid - groupname, e.g., postdrop (default: no). See INSTALL section 12. -+# manpages - "no" or path to man tree. Example: /usr/local/man. -+# -+#EOF - - # By now, shells must have functions. Ultrix users must use sh5 or lose. - # The following shell functions replace files/symlinks while minimizing -@@ -109,35 +109,32 @@ - - : ${install_root=/} - : ${tempdir=`pwd`} --: ${config_directory=/etc/postfix} --: ${daemon_directory=/usr/libexec/postfix} --: ${command_directory=/usr/sbin} -+: ${config_directory=__PREFIX/share/postfix} -+: ${daemon_directory=__PREFIX/libexec/postfix} -+: ${command_directory=__PREFIX/sbin} - : ${queue_directory=/var/spool/postfix} --if [ -f /usr/lib/sendmail ] -- then : ${sendmail_path=/usr/lib/sendmail} -- else : ${sendmail_path=/usr/sbin/sendmail} --fi --: ${newaliases_path=/usr/bin/newaliases} --: ${mailq_path=/usr/bin/mailq} -+: ${sendmail_path=__PREFIX/libexec/postfix/sendmail} -+#: ${newaliases_path=/usr/bin/newaliases} -+#: ${mailq_path=/usr/bin/mailq} - : ${mail_owner=postfix} --: ${setgid=no} --: ${manpages=/usr/local/man} -+: ${setgid=maildrop} -+: ${manpages=__PREFIX/man} - - # Find out the location of configuration files. - --test -t 0 && --for name in install_root tempdir config_directory --do -- while : -- do -- eval echo \$n "$name: [\$$name]\ \$c" -- read ans -- case $ans in -- "") break;; -- *) eval $name=\$ans; break;; -- esac -- done --done -+#test -t 0 && -+#for name in install_root tempdir config_directory -+#do -+# while : -+# do -+# eval echo \$n "$name: [\$$name]\ \$c" -+# read ans -+# case $ans in -+# "") break;; -+# *) eval $name=\$ans; break;; -+# esac -+# done -+#done - - # Sanity checks - -@@ -159,32 +156,32 @@ - - CONFIG_DIRECTORY=$install_root$config_directory - --test -f $CONFIG_DIRECTORY/main.cf && { -- for name in daemon_directory command_directory queue_directory mail_owner -- do -- eval $name='"`bin/postconf -c $CONFIG_DIRECTORY -h $name`"' || kill $$ -- done --} -+#test -f $CONFIG_DIRECTORY/main.cf && { -+# for name in daemon_directory command_directory queue_directory mail_owner -+# do -+# eval $name='"`bin/postconf -c $CONFIG_DIRECTORY -h $name`"' || kill $$ -+# done -+#} - --test -f $CONFIG_DIRECTORY/install.cf && . $CONFIG_DIRECTORY/install.cf -+#test -f $CONFIG_DIRECTORY/install.cf && . $CONFIG_DIRECTORY/install.cf - - # Override default settings. - --test -t 0 && --for name in daemon_directory command_directory \ -- queue_directory sendmail_path newaliases_path mailq_path mail_owner\ -- setgid manpages --do -- while : -- do -- eval echo \$n "$name: [\$$name]\ \$c" -- read ans -- case $ans in -- "") break;; -- *) eval $name=\$ans; break;; -- esac -- done --done -+#test -t 0 && -+#for name in daemon_directory command_directory \ -+# queue_directory sendmail_path newaliases_path mailq_path mail_owner\ -+# setgid manpages -+#do -+# while : -+# do -+# eval echo \$n "$name: [\$$name]\ \$c" -+# read ans -+# case $ans in -+# "") break;; -+# *) eval $name=\$ans; break;; -+# esac -+# done -+#done - - # Sanity checks - -@@ -232,10 +229,10 @@ - - DAEMON_DIRECTORY=$install_root$daemon_directory - COMMAND_DIRECTORY=$install_root$command_directory --QUEUE_DIRECTORY=$install_root$queue_directory -+QUEUE_DIRECTORY=$queue_directory - SENDMAIL_PATH=$install_root$sendmail_path --NEWALIASES_PATH=$install_root$newaliases_path --MAILQ_PATH=$install_root$mailq_path -+#NEWALIASES_PATH=$install_root$newaliases_path -+#MAILQ_PATH=$install_root$mailq_path - MANPAGES=$install_root$manpages - - # Create any missing directories. -@@ -244,7 +241,7 @@ - test -d $DAEMON_DIRECTORY || mkdir -p $DAEMON_DIRECTORY || exit 1 - test -d $COMMAND_DIRECTORY || mkdir -p $COMMAND_DIRECTORY || exit 1 - test -d $QUEUE_DIRECTORY || mkdir -p $QUEUE_DIRECTORY || exit 1 --for path in $SENDMAIL_PATH $NEWALIASES_PATH $MAILQ_PATH -+for path in $SENDMAIL_PATH - do - dir=`echo $path|sed -e 's/[/][/]*[^/]*$//' -e 's/^$/\//'` - test -d $dir || mkdir -p $dir || exit 1 -@@ -264,8 +261,8 @@ - - test -f bin/sendmail && { - compare_or_replace a+x,go-w bin/sendmail $SENDMAIL_PATH || exit 1 -- compare_or_symlink $SENDMAIL_PATH $NEWALIASES_PATH -- compare_or_symlink $SENDMAIL_PATH $MAILQ_PATH -+# compare_or_symlink $SENDMAIL_PATH $NEWALIASES_PATH -+# compare_or_symlink $SENDMAIL_PATH $MAILQ_PATH - } - - if [ -f $CONFIG_DIRECTORY/main.cf ] -@@ -290,13 +287,13 @@ - "mail_owner = $mail_owner" \ - || exit 1 - --(echo "# This file was generated by $0" --for name in sendmail_path newaliases_path mailq_path setgid manpages --do -- eval echo $name=\$$name --done) >$tempdir/junk || exit 1 --compare_or_move a+x,go-w $tempdir/junk $CONFIG_DIRECTORY/install.cf || exit 1 --rm -f $tempdir/junk -+#(echo "# This file was generated by $0" -+#for name in sendmail_path newaliases_path mailq_path setgid manpages -+#do -+# eval echo $name=\$$name -+#done) >$tempdir/junk || exit 1 -+#compare_or_move a+x,go-w $tempdir/junk $CONFIG_DIRECTORY/install.cf || exit 1 -+#rm -f $tempdir/junk - - # Use set-gid privileges instead of writable maildrop (optional). - diff --git a/mail/postfix/patches/patch-af b/mail/postfix/patches/patch-af deleted file mode 100644 index b42bd467e26..00000000000 --- a/mail/postfix/patches/patch-af +++ /dev/null @@ -1,52 +0,0 @@ -$NetBSD: patch-af,v 1.5 2001/03/20 12:50:51 hubertf Exp $ - ---- conf/main.cf.orig Fri Dec 15 07:44:19 2000 -+++ conf/main.cf Sat Jan 13 16:39:28 2001 -@@ -1,3 +1,5 @@ -+# $NetBSD: patch-af,v 1.5 2001/03/20 12:50:51 hubertf Exp $ -+# - # Global Postfix configuration file. This file lists only a subset - # of all 100+ parameters. See the sample-xxx.cf files for a full list. - # -@@ -28,14 +30,19 @@ - # The command_directory parameter specifies the location of all - # postXXX commands. The default value is $program_directory. - # --command_directory = /usr/sbin -+command_directory = __PREFIX/sbin - - # The daemon_directory parameter specifies the location of all Postfix - # daemon programs (i.e. programs listed in the master.cf file). The - # default value is $program_directory. This directory must be owned - # by root. - # --daemon_directory = /usr/libexec/postfix -+daemon_directory = __PREFIX/libexec/postfix -+ -+# Shared files and etc directory -+etc_directory = /etc/postfix -+share_directory = __PREFIX/share/postfix -+man_directory = __PREFIX/man - - # QUEUE AND PROCESS OWNERSHIP - # -@@ -52,7 +59,7 @@ - # These rights are used in the absence of a recipient user context. - # DO NOT SPECIFY A PRIVILEGED USER OR THE POSTFIX OWNER. - # --#default_privs = nobody -+default_privs = nobody - - # INTERNET HOST AND DOMAIN NAMES - # -@@ -440,8 +447,7 @@ - # the process marches on. If you use an X-based debugger, be sure to - # set up your XAUTHORITY environment variable before starting Postfix. - # --debugger_command = -- PATH=/usr/bin:/usr/X11R6/bin -- xxgdb $daemon_directory/$process_name $process_id & sleep 5 -+debugger_command = PATH=/usr/bin:/usr/X11R6/bin; \ -+ xxgdb $daemon_directory/$process_name $process_id & sleep 5 - - # Other configurable parameters. diff --git a/mail/postfix/patches/patch-ba b/mail/postfix/patches/patch-ba deleted file mode 100644 index 3e1b86bac96..00000000000 --- a/mail/postfix/patches/patch-ba +++ /dev/null @@ -1,23 +0,0 @@ -$NetBSD: patch-ba,v 1.3 2001/03/20 12:50:53 hubertf Exp $ - -fix sprious \ in mail header. - -Message-Id: <20010313174719.35692BC070@spike.porcupine.org> -Subject: PATCH (spurious \ in mail header) -From: wietse@porcupine.org (Wietse Venema) -To: Postfix users <postfix-users@postfix.org> -Date: Tue, 13 Mar 2001 12:47:19 -0500 (EST) - -Index: src/global/tok822_parse.c -diff -u -r1.1 -r1.2 ---- src/global/tok822_parse.c 2001/03/13 17:47:13 1.1 -+++ src/global/tok822_parse.c 2001/03/16 11:57:53 1.2 -@@ -252,7 +252,7 @@ - VSTRING_ADDCH(vp, ')'); - break; - case TOK822_COMMENT_TEXT: -- tok822_copy_quoted(vp, vstring_str(tp->vstr), "()\\\r\n"); -+ tok822_copy_quoted(vp, vstring_str(tp->vstr), "()\\"); - break; - case TOK822_QSTRING: - VSTRING_ADDCH(vp, '"'); |