Update to latest snapshot

Remove patches and use REINPLACE_CMD where possible

PR:		45527
Submitted by:	maintainer
This commit is contained in:
David W. Chapman Jr. 2002-11-21 15:38:36 +00:00
parent 118eb9fffc
commit 8a2cbd2c5c
Notes: svn2git 2021-03-31 03:12:20 +00:00
svn path=/head/; revision=70673
54 changed files with 52 additions and 1054 deletions

View file

@ -13,8 +13,8 @@
# POSTFIX_OPTIONS can be set in /etc/make.conf also.
PORTNAME= postfix
PORTVERSION= 1.1.11-20020917
PORTREVISION= 1
PORTVERSION= 1.1.11-20021115
#PORTREVISION= 1
PORTEPOCH= 1
CATEGORIES= mail ipv6
MASTER_SITES= ftp://ftp.porcupine.org/mirrors/postfix-release/experimental/ \
@ -30,6 +30,7 @@ DIST_SUBDIR= ${PORTNAME}
MAINTAINER= khera@kciLink.com
USE_SUBMAKE= yes
USE_REINPLACE= yes
MAN1= mailq.1 newaliases.1 postalias.1 postcat.1 postconf.1 postdrop.1 \
postfix.1 postkick.1 postlock.1 postlog.1 postmap.1 postqueue.1 \
@ -42,6 +43,10 @@ MAN8= bounce.8 cleanup.8 defer.8 error.8 flush.8 lmtp.8 local.8 \
master.8 nqmgr.8 pickup.8 pipe.8 qmgr.8 qmqpd.8 showq.8 smtp.8 \
smtpd.8 spawn.8 trivial-rewrite.8 virtual.8
# TLS patch adds to MAN8 but doesn't have .html file, so avoid trying to
# patch it.
MAN8base=$(MAN8:S/tlsmgr.8//)
NO_LATEST_LINK= yes
CONF1= main.cf master.cf access aliases canonical pcre_table regexp_table \
@ -70,6 +75,27 @@ post-patch:
CCARGS="${POSTFIX_CCARGS}" AUXLIBS="${POSTFIX_AUXLIBS}" && \
${ECHO} "all: default" >> Makefile)
pre-patch:
.for file in ${MAN1}
@${REINPLACE_CMD} -e "s|/etc/postfix|${PREFIX}/etc/postfix|g" \
${WRKSRC}/man/man1/${file} ${WRKSRC}/html/${file}.html
.endfor
.for file in ${MAN5}
@${REINPLACE_CMD} -e "s|/etc/postfix|${PREFIX}/etc/postfix|g" \
${WRKSRC}/man/man5/${file} ${WRKSRC}/html/${file}.html
.endfor
.for file in ${MAN8base}
@${REINPLACE_CMD} -e "s|/etc/postfix|${PREFIX}/etc/postfix|g" \
${WRKSRC}/man/man8/${file} ${WRKSRC}/html/${file}.html
.endfor
.for file in faq rate rewrite uce
@${REINPLACE_CMD} -e "s|/etc/postfix|${PREFIX}/etc/postfix|g" \
${WRKSRC}/html/${file}.html
.endfor
.for file in ${CONF1}
@${REINPLACE_CMD} -e "s|/etc/postfix|${PREFIX}/etc/postfix|g" ${WRKSRC}/conf/${file}
.endfor
pre-install:
@${SETENV} ${SCRIPTS_ENV} PKG_PREFIX="${PREFIX}" ${SH} ${PKGINSTALL} ${PKGNAME} PRE-INSTALL

View file

@ -1,5 +1,4 @@
MD5 (postfix/postfix-1.1.11-20020917.tar.gz) = d5c4edd83db08a4306840fef321bb42a
MD5 (postfix/pfixtls-0.8.11a-1.1.11-20020917-0.9.6g.tar.gz) = 1fc29989315ab5570486929c24187626
MD5 (postfix/postfix-1.1.11-20021115.tar.gz) = dd3c98b616844a3548049bbaa418c296
MD5 (postfix/pfixtls-0.8.11a-1.1.11-20021031-0.9.6g.tar.gz) = 1fc29989315ab5570486929c24187626
MD5 (postfix/postfix-pg.postfix-1.1.8.patch) = e0f4d910a6d6648d9b48e2244f2764ba
MD5 (postfix/postfix-1.1.11+ipv6.patch.gz) = dc2a6362518025583a17305607eb8f0e
MD5 (postfix/tls+ipv6-1.8-pf-1.1.11-20021115.patch) = f01d9a0e28fb3d1a59614f2093ad24f3

View file

@ -1,88 +0,0 @@
*** ./conf/main.cf.orig Thu Aug 22 03:17:14 2002
--- ./conf/main.cf Thu Aug 29 19:56:21 2002
***************
*** 29,43 ****
queue_directory = /var/spool/postfix
# The command_directory parameter specifies the location of all
# postXXX commands.
#
! command_directory = /usr/sbin
# The daemon_directory parameter specifies the location of all Postfix
# daemon programs (i.e. programs listed in the master.cf file). This
# directory must be owned by root.
#
! daemon_directory = /usr/libexec/postfix
# QUEUE AND PROCESS OWNERSHIP
#
--- 29,43 ----
queue_directory = /var/spool/postfix
# The command_directory parameter specifies the location of all
# postXXX commands.
#
! 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). This
# directory must be owned by root.
#
! daemon_directory = !!PREFIX!!/libexec/postfix
# QUEUE AND PROCESS OWNERSHIP
#
***************
*** 326,333 ****
#
# The home_mailbox parameter specifies the optional pathname of a
# mailbox file relative to a user's home directory. The default
! # mailbox file is /var/spool/mail/user or /var/mail/user. Specify
! # "Maildir/" for qmail-style delivery (the / is required).
#
#home_mailbox = Mailbox
#home_mailbox = Maildir/
--- 326,333 ----
#
# The home_mailbox parameter specifies the optional pathname of a
# mailbox file relative to a user's home directory. The default
! # mailbox file is /var/mail/user. Specify "Maildir/" for
! # qmail-style delivery (the / is required).
#
#home_mailbox = Mailbox
#home_mailbox = Maildir/
***************
*** 444,450 ****
#
# See also the body_checks example in the sample-filter.cf file.
#
! #header_checks = regexp:/etc/postfix/header_checks
# FAST ETRN SERVICE
#
--- 444,450 ----
#
# See also the body_checks example in the sample-filter.cf file.
#
! #header_checks = regexp:!!PREFIX!!/etc/postfix/header_checks
# FAST ETRN SERVICE
#
***************
*** 551,557 ****
# commands. This must be a group name with a numerical group ID that
# is not shared with other accounts, not even with the Postfix account.
#
! setgid_group =
# manpage_directory: The location of the Postfix on-line manual pages.
#
--- 551,557 ----
# commands. This must be a group name with a numerical group ID that
# is not shared with other accounts, not even with the Postfix account.
#
! setgid_group = maildrop
# manpage_directory: The location of the Postfix on-line manual pages.
#

View file

@ -1,11 +0,0 @@
*** ./conf/canonical.orig Tue Mar 7 10:42:58 2000
--- ./conf/canonical Thu Jun 1 21:53:23 2000
***************
*** 7,9 ****
# SYNOPSIS
! # postmap /etc/postfix/canonical
#
--- 7,9 ----
# SYNOPSIS
! # postmap !!PREFIX!!/etc/postfix/canonical
#

View file

@ -1,11 +0,0 @@
*** ./conf/access.orig Tue Mar 7 10:42:58 2000
--- ./conf/access Thu Jun 1 21:53:36 2000
***************
*** 7,9 ****
# SYNOPSIS
! # postmap /etc/postfix/access
#
--- 7,9 ----
# SYNOPSIS
! # postmap !!PREFIX!!/etc/postfix/access
#

View file

@ -1,11 +0,0 @@
*** ./conf/pcre_table.orig Thu Mar 9 20:36:19 2000
--- ./conf/pcre_table Thu Jun 1 22:02:08 2000
***************
*** 7,9 ****
# SYNOPSIS
! # pcre:/etc/postfix/filename
#
--- 7,9 ----
# SYNOPSIS
! # pcre:!!PREFIX!!/etc/postfix/filename
#

View file

@ -1,11 +0,0 @@
*** ./conf/regexp_table.orig Thu Mar 9 20:36:19 2000
--- ./conf/regexp_table Thu Jun 1 22:03:27 2000
***************
*** 7,9 ****
# SYNOPSIS
! # regexp:/etc/postfix/filename
#
--- 7,9 ----
# SYNOPSIS
! # regexp:!!PREFIX!!/etc/postfix/filename
#

View file

@ -1,11 +0,0 @@
*** ./conf/relocated.orig Tue Mar 7 10:42:58 2000
--- ./conf/relocated Thu Jun 1 22:03:59 2000
***************
*** 7,9 ****
# SYNOPSIS
! # postmap /etc/postfix/relocated
#
--- 7,9 ----
# SYNOPSIS
! # postmap !!PREFIX!!/etc/postfix/relocated
#

View file

@ -1,15 +0,0 @@
*** ./conf/sample-auth.cf.orig Sun May 28 17:55:19 2000
--- ./conf/sample-auth.cf Thu Jun 1 22:05:32 2000
***************
*** 91,95 ****
# The Postfix SMTP client opens the lookup table before going to
! # chroot jail, so you can leave the password file in /etc/postfix.
#
! smtp_sasl_password_maps = hash:/etc/postfix/saslpass
--- 91,95 ----
# The Postfix SMTP client opens the lookup table before going to
! # chroot jail, so you can leave the password file in !!PREFIX!!/etc/postfix.
#
! smtp_sasl_password_maps = hash:!!PREFIX!!/etc/postfix/saslpass

View file

@ -1,44 +0,0 @@
*** ./conf/sample-canonical.cf.orig Thu Sep 23 14:10:38 1999
--- ./conf/sample-canonical.cf Thu Jun 1 22:07:23 2000
***************
*** 14,16 ****
#
! # If you use this feature, run "postmap /etc/postfix/canonical" to
# build the necessary DBM or DB file after every change. The changes
--- 14,16 ----
#
! # If you use this feature, run "postmap !!PREFIX!!/etc/postfix/canonical" to
# build the necessary DBM or DB file after every change. The changes
***************
*** 19,24 ****
#
! #canonical_maps = dbm:/etc/postfix/canonical
! #canonical_maps = hash:/etc/postfix/canonical
! #canonical_maps = hash:/etc/postfix/canonical, nis:canonical
! #canonical_maps = hash:/etc/postfix/canonical, netinfo:/canonical
canonical_maps =
--- 19,24 ----
#
! #canonical_maps = dbm:!!PREFIX!!/etc/postfix/canonical
! #canonical_maps = hash:!!PREFIX!!/etc/postfix/canonical
! #canonical_maps = hash:!!PREFIX!!/etc/postfix/canonical, nis:canonical
! #canonical_maps = hash:!!PREFIX!!/etc/postfix/canonical, netinfo:/canonical
canonical_maps =
***************
*** 32,34 ****
#
! #recipient_canonical_maps = hash:/etc/postfix/recipient_canonical
recipient_canonical_maps =
--- 32,34 ----
#
! #recipient_canonical_maps = hash:!!PREFIX!!/etc/postfix/recipient_canonical
recipient_canonical_maps =
***************
*** 46,48 ****
#
! #sender_canonical_maps = hash:/etc/postfix/sender_canonical
sender_canonical_maps =
--- 46,48 ----
#
! #sender_canonical_maps = hash:!!PREFIX!!/etc/postfix/sender_canonical
sender_canonical_maps =

View file

@ -1,18 +0,0 @@
*** ./conf/sample-filter.cf.orig Mon May 29 11:30:44 2000
--- ./conf/sample-filter.cf Thu Jun 1 22:07:58 2000
***************
*** 15,17 ****
#
! header_checks = regexp:/etc/postfix/header_checks
--- 15,17 ----
#
! header_checks = regexp:!!PREFIX!!/etc/postfix/header_checks
***************
*** 26,27 ****
#
! body_checks = regexp:/etc/postfix/body_checks
--- 26,27 ----
#
! body_checks = regexp:!!PREFIX!!/etc/postfix/body_checks

View file

@ -1,24 +0,0 @@
*** ./conf/sample-misc.cf.orig Thu Sep 23 14:10:52 1999
--- ./conf/sample-misc.cf Thu Jun 1 22:09:39 2000
***************
*** 220,222 ****
#
! daemon_directory = /usr/libexec/postfix
--- 220,222 ----
#
! daemon_directory = !!PREFIX!!/libexec/postfix
***************
*** 263,267 ****
# Specify the types and names of databases to use. After change,
! # run "postmap /etc/postfix/relocated", then "postfix reload".
#
! #relocated_maps = hash:/etc/postfix/relocated
relocated_maps =
--- 263,267 ----
# Specify the types and names of databases to use. After change,
! # run "postmap !!PREFIX!!/etc/postfix/relocated", then "postfix reload".
#
! #relocated_maps = hash:!!PREFIX!!/etc/postfix/relocated
relocated_maps =

View file

@ -1,26 +0,0 @@
*** ./conf/sample-relocated.cf.orig Thu Sep 23 14:11:17 1999
--- ./conf/sample-relocated.cf Thu Jun 1 22:10:43 2000
***************
*** 12,14 ****
#
! # If you use this feature, run "postmap /etc/postfix/relocated" to
# build the necessary DBM or DB file after change, then "postfix
--- 12,14 ----
#
! # If you use this feature, run "postmap !!PREFIX!!/etc/postfix/relocated" to
# build the necessary DBM or DB file after change, then "postfix
***************
*** 16,21 ****
#
! #relocated_maps = dbm:/etc/postfix/relocated
! #relocated_maps = hash:/etc/postfix/relocated
! #relocated_maps = hash:/etc/postfix/relocated, nis:virtual
! #relocated_maps = hash:/etc/postfix/relocated, netinfo:/relocated
relocated_maps =
--- 16,21 ----
#
! #relocated_maps = dbm:!!PREFIX!!/etc/postfix/relocated
! #relocated_maps = hash:!!PREFIX!!/etc/postfix/relocated
! #relocated_maps = hash:!!PREFIX!!/etc/postfix/relocated, nis:virtual
! #relocated_maps = hash:!!PREFIX!!/etc/postfix/relocated, netinfo:/relocated
relocated_maps =

View file

@ -1,11 +0,0 @@
*** ./conf/sample-smtpd.cf.orig Mon Dec 27 19:41:37 1999
--- ./conf/sample-smtpd.cf Thu Jun 1 22:11:22 2000
***************
*** 183,185 ****
#smtpd_sender_restrictions = reject_unknown_sender_domain
! #smtpd_sender_restrictions = reject_unknown_sender_domain, hash:/etc/postfix/access
smtpd_sender_restrictions =
--- 183,185 ----
#smtpd_sender_restrictions = reject_unknown_sender_domain
! #smtpd_sender_restrictions = reject_unknown_sender_domain, hash:!!PREFIX!!/etc/postfix/access
smtpd_sender_restrictions =

View file

@ -1,23 +0,0 @@
*** ./conf/sample-transport.cf.orig Thu Dec 23 10:50:00 1999
--- ./conf/sample-transport.cf Thu Jun 1 22:13:09 2000
***************
*** 10,18 ****
# By default, this feature is disabled. Specify the types of databases
! # to use. If you use this feature, run "postmap /etc/postfix/transport"
# after change, then "postfix reload".
#
! #transport_maps = dbm:/etc/postfix/transport
! #transport_maps = hash:/etc/postfix/transport
! #transport_maps = hash:/etc/postfix/transport, nis:transport
! #transport_maps = hash:/etc/postfix/transport, netinfo:/transport
transport_maps =
--- 10,18 ----
# By default, this feature is disabled. Specify the types of databases
! # to use. If you use this feature, run "postmap !!PREFIX!!/etc/postfix/transport"
# after change, then "postfix reload".
#
! #transport_maps = dbm:!!PREFIX!!/etc/postfix/transport
! #transport_maps = hash:!!PREFIX!!/etc/postfix/transport
! #transport_maps = hash:!!PREFIX!!/etc/postfix/transport, nis:transport
! #transport_maps = hash:!!PREFIX!!/etc/postfix/transport, netinfo:/transport
transport_maps =

View file

@ -1,26 +0,0 @@
*** ./conf/sample-virtual.cf.orig Mon Dec 20 21:00:42 1999
--- ./conf/sample-virtual.cf Thu Jun 1 22:13:32 2000
***************
*** 12,14 ****
#
! # If you use this feature, run "postmap /etc/postfix/virtual" to
# build the necessary DBM or DB file after change.
--- 12,14 ----
#
! # If you use this feature, run "postmap !!PREFIX!!/etc/postfix/virtual" to
# build the necessary DBM or DB file after change.
***************
*** 18,23 ****
#
! #virtual_maps = dbm:/etc/postfix/virtual
! #virtual_maps = hash:/etc/postfix/virtual
! #virtual_maps = hash:/etc/postfix/virtual, nis:virtual
! #virtual_maps = hash:/etc/postfix/virtual, netinfo:/virtual
virtual_maps =
--- 18,23 ----
#
! #virtual_maps = dbm:!!PREFIX!!/etc/postfix/virtual
! #virtual_maps = hash:!!PREFIX!!/etc/postfix/virtual
! #virtual_maps = hash:!!PREFIX!!/etc/postfix/virtual, nis:virtual
! #virtual_maps = hash:!!PREFIX!!/etc/postfix/virtual, netinfo:/virtual
virtual_maps =

View file

@ -1,11 +0,0 @@
*** ./conf/transport.orig Tue Mar 7 10:42:58 2000
--- ./conf/transport Thu Jun 1 22:13:41 2000
***************
*** 7,9 ****
# SYNOPSIS
! # postmap /etc/postfix/transport
#
--- 7,9 ----
# SYNOPSIS
! # postmap !!PREFIX!!/etc/postfix/transport
#

View file

@ -1,11 +0,0 @@
*** ./conf/virtual.orig Tue Mar 7 10:42:59 2000
--- ./conf/virtual Thu Jun 1 22:13:54 2000
***************
*** 7,9 ****
# SYNOPSIS
! # postmap /etc/postfix/virtual
#
--- 7,9 ----
# SYNOPSIS
! # postmap !!PREFIX!!/etc/postfix/virtual
#

View file

@ -1,20 +0,0 @@
*** ./html/mailq.1.html.orig Sat Apr 22 20:28:36 2000
--- ./html/mailq.1.html Thu Jun 1 22:19:24 2000
***************
*** 83,85 ****
The path name of the <b>sendmail.cf</b> file. Postfix con-
! figuration files are kept in <b>/etc/postfix</b>.
--- 83,85 ----
The path name of the <b>sendmail.cf</b> file. Postfix con-
! figuration files are kept in <b>!!PREFIX!!/etc/postfix</b>.
***************
*** 231,233 ****
/var/spool/postfix, mail queue
! /etc/postfix, configuration files
--- 231,233 ----
/var/spool/postfix, mail queue
! !!PREFIX!!/etc/postfix, configuration files

View file

@ -1,20 +0,0 @@
--- ./html/access.5.html.orig Tue Nov 21 21:24:13 2000
+++ ./html/access.5.html Tue Nov 21 21:24:34 2000
@@ -9,7 +9,7 @@
access - format of Postfix access table
<b>SYNOPSIS</b>
- <b>postmap</b> <b>/etc/postfix/access</b>
+ <b>postmap</b> <b>!!PREFIX!!/etc/postfix/access</b>
<b>DESCRIPTION</b>
The optional <b>access</b> table directs the Postfix SMTP server
@@ -21,7 +21,7 @@
that serves as input to the <a href="postmap.1.html"><b>postmap</b>(1)</a> command. The
result, an indexed file in <b>dbm</b> or <b>db</b> format, is used for
fast searching by the mail system. Execute the command
- <b>postmap</b> <b>/etc/postfix/access</b> in order to rebuild the
+ <b>postmap</b> <b>!!PREFIX!!/etc/postfix/access</b> in order to rebuild the
indexed file after changing the access table.
When the table is provided via other means such as NIS,

View file

@ -1,20 +0,0 @@
--- ./html/canonical.5.html.orig Tue Nov 21 21:32:38 2000
+++ ./html/canonical.5.html Tue Nov 21 21:33:21 2000
@@ -9,7 +9,7 @@
canonical - format of Postfix canonical table
<b>SYNOPSIS</b>
- <b>postmap</b> <b>/etc/postfix/canonical</b>
+ <b>postmap</b> <b>!!PREFIX!!/etc/postfix/canonical</b>
<b>DESCRIPTION</b>
The optional <b>canonical</b> table specifies an address mapping
@@ -20,7 +20,7 @@
that serves as input to the <a href="postmap.1.html"><b>postmap</b>(1)</a> command. The
result, an indexed file in <b>dbm</b> or <b>db</b> format, is used for
fast searching by the mail system. Execute the command
- <b>postmap</b> <b>/etc/postfix/canonical</b> in order to rebuild the
+ <b>postmap</b> <b>!!PREFIX!!/etc/postfix/canonical</b> in order to rebuild the
indexed file after changing the text file.
When the table is provided via other means such as NIS,

View file

@ -1,11 +0,0 @@
*** ./html/local.8.html.orig Thu Feb 3 21:15:02 2000
--- ./html/local.8.html Thu Jun 1 22:22:30 2000
***************
*** 99,101 ****
The default per-user mailbox is a file in the UNIX mail
! spool directory (<b>/var/mail/</b><i>user</i> or <b>/var/spool/mail/</b><i>user</i>);
the location can be specified with the <b>mail</b><i>_</i><b>spool</b><i>_</i><b>direc-</b>
--- 99,101 ----
The default per-user mailbox is a file in the UNIX mail
! spool directory (<b>/var/mail/</b><i>user</i>);
the location can be specified with the <b>mail</b><i>_</i><b>spool</b><i>_</i><b>direc-</b>

View file

@ -1,10 +0,0 @@
--- ./html/faq.html.orig Sat Oct 28 23:34:51 2000
+++ ./html/faq.html Sat Oct 28 23:36:04 2000
@@ -2572,7 +2572,7 @@
Answer: instead of using <b>/usr/include/ndbm.h</b>, you're building
Postfix with some incompatible third-party file, typically
-<b>/usr/local/include/ndbm.h</b>.
+<b>!!PREFIX!!/include/ndbm.h</b>.
<p>

View file

@ -1,13 +0,0 @@
*** ./html/cleanup.8.html.orig Sun May 28 21:58:41 2000
--- ./html/cleanup.8.html Thu Jun 1 22:29:04 2000
***************
*** 174,177 ****
<b>FILES</b>
! /etc/postfix/canonical*, canonical mapping table
! /etc/postfix/virtual*, virtual mapping table
--- 174,177 ----
<b>FILES</b>
! !!PREFIX!!/etc/postfix/canonical*, canonical mapping table
! !!PREFIX!!/etc/postfix/virtual*, virtual mapping table

View file

@ -1,13 +0,0 @@
*** ./html/master.8.html.orig Tue Mar 7 10:48:56 2000
--- ./html/master.8.html Thu Jun 1 22:29:24 2000
***************
*** 148,151 ****
<b>FILES</b>
! /etc/postfix/main.cf: global configuration file.
! /etc/postfix/master.cf: master process configuration file.
/var/spool/postfix/pid/master.pid: master lock file.
--- 148,151 ----
<b>FILES</b>
! !!PREFIX!!/etc/postfix/main.cf: global configuration file.
! !!PREFIX!!/etc/postfix/master.cf: master process configuration file.
/var/spool/postfix/pid/master.pid: master lock file.

View file

@ -1,11 +0,0 @@
*** ./html/goals.html.orig Sun May 9 15:44:18 1999
--- ./html/goals.html Thu Jun 1 22:30:14 2000
***************
*** 45,47 ****
<li>Compatibility. Postfix is designed to be sendmail-compatible
! to make migration easy. Postfix supports <b>/var[/spool]/mail</b>,
<b>/etc/aliases</b>, <b>NIS</b>, and <b>~/.forward</b> files.
--- 45,47 ----
<li>Compatibility. Postfix is designed to be sendmail-compatible
! to make migration easy. Postfix supports <b>/var/mail</b>,
<b>/etc/aliases</b>, <b>NIS</b>, and <b>~/.forward</b> files.

View file

@ -1,11 +0,0 @@
*** ./html/postdrop.1.html.orig Mon May 3 15:05:12 1999
--- ./html/postdrop.1.html Thu Jun 1 22:30:47 2000
***************
*** 48,50 ****
/var/spool/postfix, mail queue
! /etc/postfix, configuration files
--- 48,50 ----
/var/spool/postfix, mail queue
! !!PREFIX!!/etc/postfix, configuration files

View file

@ -1,42 +0,0 @@
*** ./html/uce.html.orig Fri Dec 31 15:06:07 1999
--- ./html/uce.html Thu Jun 1 22:31:37 2000
***************
*** 126,130 ****
! <dd> <b>header_checks = regexp:/etc/postfix/header_checks</b>
! <dd> <b>header_checks = pcre:/etc/postfix/header_checks</b>
--- 126,130 ----
! <dd> <b>header_checks = regexp:!!PREFIX!!/etc/postfix/header_checks</b>
! <dd> <b>header_checks = pcre:!!PREFIX!!/etc/postfix/header_checks</b>
***************
*** 169,171 ****
! <dd> <b>smtpd_client_restrictions = hash:/etc/postfix/access,
reject_maps_rbl</b>
--- 169,171 ----
! <dd> <b>smtpd_client_restrictions = hash:!!PREFIX!!/etc/postfix/access,
reject_maps_rbl</b>
***************
*** 474,476 ****
! <dd> <b>smtpd_sender_restrictions = hash:/etc/postfix/access,
reject_unknown_sender_domain</b>
--- 474,476 ----
! <dd> <b>smtpd_sender_restrictions = hash:!!PREFIX!!/etc/postfix/access,
reject_unknown_sender_domain</b>
***************
*** 856,858 ****
<dd> <b>smtpd_etrn_restrictions = permit_mynetworks,
! hash:/etc/postfix/etrn_access, reject</b>
--- 856,858 ----
<dd> <b>smtpd_etrn_restrictions = permit_mynetworks,
! hash:!!PREFIX!!/etc/postfix/etrn_access, reject</b>

View file

@ -1,29 +0,0 @@
*** ./html/rate.html.orig Wed Mar 17 17:55:22 1999
--- ./html/rate.html Thu Jun 1 22:32:19 2000
***************
*** 224,226 ****
! <dt>/etc/postfix/main.cf:
--- 224,226 ----
! <dt>!!PREFIX!!/etc/postfix/main.cf:
***************
*** 237,239 ****
! <dt>/etc/postfix/<a href="transport.5.html">transport</a>:
--- 237,239 ----
! <dt>!!PREFIX!!/etc/postfix/<a href="transport.5.html">transport</a>:
***************
*** 253,255 ****
! <dt>/etc/postfix/master.cf:
--- 253,255 ----
! <dt>!!PREFIX!!/etc/postfix/master.cf:

View file

@ -1,17 +0,0 @@
--- ./html/regexp_table.5.html.orig Wed Sep 18 15:05:45 2002
+++ ./html/regexp_table.5.html Wed Sep 18 15:06:32 2002
@@ -5,11 +5,11 @@
regexp_table - format of Postfix regular expression tables
<b>SYNOPSIS</b>
- <b>regexp:/etc/postfix/</b><i>filename</i>
+ <b>regexp:!!PREFIX!!/etc/postfix/</b><i>filename</i>
- <b>postmap</b> <b>-q</b> <b>"</b><i>string</i><b>"</b> <b>regexp:/etc/postfix/</b><i>filename</i>
+ <b>postmap</b> <b>-q</b> <b>"</b><i>string</i><b>"</b> <b>regexp:!!PREFIX!!/etc/postfix/</b><i>filename</i>
- <b>postmap</b> <b>-q</b> <b>-</b> <b>regexp:/etc/postfix/</b><i>filename</i> &lt;<i>inputfile</i>
+ <b>postmap</b> <b>-q</b> <b>-</b> <b>regexp:!!PREFIX!!/etc/postfix/</b><i>filename</i> &lt;<i>inputfile</i>
<b>DESCRIPTION</b>
The Postfix mail system uses optional tables for address

View file

@ -1,20 +0,0 @@
--- ./html/relocated.5.html.orig Tue Nov 21 21:37:54 2000
+++ ./html/relocated.5.html Tue Nov 21 21:38:08 2000
@@ -9,7 +9,7 @@
relocated - format of Postfix relocated table
<b>SYNOPSIS</b>
- <b>postmap</b> <b>/etc/postfix/relocated</b>
+ <b>postmap</b> <b>!!PREFIX!!/etc/postfix/relocated</b>
<b>DESCRIPTION</b>
The optional <b>relocated</b> table provides the information that
@@ -20,7 +20,7 @@
that serves as input to the <a href="postmap.1.html"><b>postmap</b>(1)</a> command. The
result, an indexed file in <b>dbm</b> or <b>db</b> format, is used for
fast searching by the mail system. Execute the command
- <b>postmap</b> <b>/etc/postfix/relocated</b> in order to rebuild the
+ <b>postmap</b> <b>!!PREFIX!!/etc/postfix/relocated</b> in order to rebuild the
indexed file after changing the relocated table.
When the table is provided via other means such as NIS,

View file

@ -1,56 +0,0 @@
*** ./html/rewrite.html.orig Sat May 8 17:51:41 1999
--- ./html/rewrite.html Thu Jun 1 22:34:21 2000
***************
*** 194,196 ****
! <dd><b>canonical_maps = hash:/etc/postfix/canonical</b>
--- 194,196 ----
! <dd><b>canonical_maps = hash:!!PREFIX!!/etc/postfix/canonical</b>
***************
*** 207,209 ****
! <dd><b>sender_canonical_maps = hash:/etc/postfix/sender_canonical</b>
--- 207,209 ----
! <dd><b>sender_canonical_maps = hash:!!PREFIX!!/etc/postfix/sender_canonical</b>
***************
*** 211,213 ****
! <dd><b>recipient_canonical_maps = hash:/etc/postfix/recipient_canonical</b>
--- 211,213 ----
! <dd><b>recipient_canonical_maps = hash:!!PREFIX!!/etc/postfix/recipient_canonical</b>
***************
*** 295,297 ****
! <dd><b>virtual_maps = hash:/etc/postfix/virtual</b>
--- 295,297 ----
! <dd><b>virtual_maps = hash:!!PREFIX!!/etc/postfix/virtual</b>
***************
*** 323,325 ****
! <dd><b>relocated_maps = hash:/etc/postfix/relocated</b>
--- 323,325 ----
! <dd><b>relocated_maps = hash:!!PREFIX!!/etc/postfix/relocated</b>
***************
*** 348,350 ****
! <dd><b>transport_maps = hash:/etc/postfix/transport</b>
--- 348,350 ----
! <dd><b>transport_maps = hash:!!PREFIX!!/etc/postfix/transport</b>

View file

@ -1,20 +0,0 @@
--- ./html/transport.5.html.orig Tue Nov 21 21:43:00 2000
+++ ./html/transport.5.html Tue Nov 21 21:43:20 2000
@@ -9,7 +9,7 @@
transport - format of Postfix transport table
<b>SYNOPSIS</b>
- <b>postmap</b> <b>/etc/postfix/transport</b>
+ <b>postmap</b> <b>!!PREFIX!!/etc/postfix/transport</b>
<b>DESCRIPTION</b>
The optional <b>transport</b> table specifies a mapping from
@@ -21,7 +21,7 @@
that serves as input to the <a href="postmap.1.html"><b>postmap</b>(1)</a> command. The
result, an indexed file in <b>dbm</b> or <b>db</b> format, is used for
fast searching by the mail system. Execute the command
- <b>postmap</b> <b>/etc/postfix/transport</b> in order to rebuild the
+ <b>postmap</b> <b>!!PREFIX!!/etc/postfix/transport</b> in order to rebuild the
indexed file after changing the transport table.
When the table is provided via other means such as NIS,

View file

@ -1,43 +0,0 @@
--- ./html/virtual.5.html.orig Tue Nov 21 21:46:50 2000
+++ ./html/virtual.5.html Tue Nov 21 21:47:17 2000
@@ -9,7 +9,7 @@
virtual - format of Postfix virtual table
<b>SYNOPSIS</b>
- <b>postmap</b> <b>/etc/postfix/virtual</b>
+ <b>postmap</b> <b>!!PREFIX!!/etc/postfix/virtual</b>
<b>DESCRIPTION</b>
The optional <b>virtual</b> table specifies address redirections
@@ -27,7 +27,7 @@
that serves as input to the <a href="postmap.1.html"><b>postmap</b>(1)</a> command. The
result, an indexed file in <b>dbm</b> or <b>db</b> format, is used for
fast searching by the mail system. Execute the command
- <b>postmap</b> <b>/etc/postfix/virtual</b> in order to rebuild the
+ <b>postmap</b> <b>!!PREFIX!!/etc/postfix/virtual</b> in order to rebuild the
indexed file after changing the text file.
When the table is provided via other means such as NIS,
@@ -52,7 +52,7 @@
Support for a Postfix-style virtual domain looks like:
- /etc/postfix/virtual:
+ !!PREFIX!!/etc/postfix/virtual:
<i>virtual.domain</i> <i>anything</i> (right-hand content does not matter)
<i>postmaster@virtual.domain</i> <i>postmaster</i>
<i>user1@virtual.domain</i> <i>address1</i>
@@ -94,11 +94,11 @@
Support for a Sendmail-style virtual domain looks like:
- /etc/postfix/main.cf:
+ !!PREFIX!!/etc/postfix/main.cf:
mydestination = $myhostname localhost.$mydomain $mydomain
<i>virtual.domain</i>
- /etc/postfix/virtual:
+ !!PREFIX!!/etc/postfix/virtual:
<i>user1@virtual.domain</i> <i>address1</i>
<i>user2@virtual.domain</i> <i>address2,</i> <i>address3</i>

View file

@ -1,11 +0,0 @@
*** ./man/man1/postdrop.1.orig Mon May 3 15:03:29 1999
--- ./man/man1/postdrop.1 Thu Jun 1 22:38:54 2000
***************
*** 53,55 ****
/var/spool/postfix, mail queue
! /etc/postfix, configuration files
.SH CONFIGURATION PARAMETERS
--- 53,55 ----
/var/spool/postfix, mail queue
! !!PREFIX!!/etc/postfix, configuration files
.SH CONFIGURATION PARAMETERS

View file

@ -1,20 +0,0 @@
*** ./man/man1/sendmail.1.orig Thu Mar 30 14:05:28 2000
--- ./man/man1/sendmail.1 Thu Jun 1 22:39:16 2000
***************
*** 63,65 ****
The path name of the \fBsendmail.cf\fR file. Postfix configuration
! files are kept in \fB/etc/postfix\fR.
.IP "\fB-F \fIfull_name\fR
--- 63,65 ----
The path name of the \fBsendmail.cf\fR file. Postfix configuration
! files are kept in \fB!!PREFIX!!/etc/postfix\fR.
.IP "\fB-F \fIfull_name\fR
***************
*** 173,175 ****
/var/spool/postfix, mail queue
! /etc/postfix, configuration files
.SH CONFIGURATION PARAMETERS
--- 173,175 ----
/var/spool/postfix, mail queue
! !!PREFIX!!/etc/postfix, configuration files
.SH CONFIGURATION PARAMETERS

View file

@ -1,17 +0,0 @@
--- ./man/man5/pcre_table.5.orig Wed Sep 18 15:12:38 2002
+++ ./man/man5/pcre_table.5 Wed Sep 18 15:13:05 2002
@@ -8,11 +8,11 @@
.SH SYNOPSIS
.na
.nf
-\fBpcre:/etc/postfix/\fIfilename\fR
+\fBpcre:!!PREFIX!!/etc/postfix/\fIfilename\fR
-\fBpostmap -q "\fIstring\fB" pcre:/etc/postfix/\fIfilename\fR
+\fBpostmap -q "\fIstring\fB" pcre:!!PREFIX!!/etc/postfix/\fIfilename\fR
-\fBpostmap -q - pcre:/etc/postfix/\fIfilename\fR <\fIinputfile\fR
+\fBpostmap -q - pcre:!!PREFIX!!/etc/postfix/\fIfilename\fR <\fIinputfile\fR
.SH DESCRIPTION
.ad
.fi

View file

@ -1,20 +0,0 @@
*** ./man/man5/access.5.orig Sat Apr 22 20:28:30 2000
--- ./man/man5/access.5 Thu Jun 1 22:39:55 2000
***************
*** 10,12 ****
.nf
! \fBpostmap /etc/postfix/access\fR
.SH DESCRIPTION
--- 10,12 ----
.nf
! \fBpostmap !!PREFIX!!/etc/postfix/access\fR
.SH DESCRIPTION
***************
*** 21,23 ****
is used for fast searching by the mail system. Execute the command
! \fBpostmap /etc/postfix/access\fR in order to rebuild the indexed
file after changing the access table.
--- 21,23 ----
is used for fast searching by the mail system. Execute the command
! \fBpostmap !!PREFIX!!/etc/postfix/access\fR in order to rebuild the indexed
file after changing the access table.

View file

@ -1,20 +0,0 @@
*** ./man/man5/canonical.5.orig Sat Apr 22 20:28:30 2000
--- ./man/man5/canonical.5 Thu Jun 1 22:40:18 2000
***************
*** 10,12 ****
.nf
! \fBpostmap /etc/postfix/canonical\fR
.SH DESCRIPTION
--- 10,12 ----
.nf
! \fBpostmap !!PREFIX!!/etc/postfix/canonical\fR
.SH DESCRIPTION
***************
*** 21,23 ****
is used for fast searching by the mail system. Execute the command
! \fBpostmap /etc/postfix/canonical\fR in order to rebuild the indexed
file after changing the canonical table.
--- 21,23 ----
is used for fast searching by the mail system. Execute the command
! \fBpostmap !!PREFIX!!/etc/postfix/canonical\fR in order to rebuild the indexed
file after changing the canonical table.

View file

@ -1,17 +0,0 @@
--- ./man/man5/regexp_table.5.orig Tue Sep 17 18:54:44 2002
+++ ./man/man5/regexp_table.5 Wed Sep 18 15:14:25 2002
@@ -8,11 +8,11 @@
.SH SYNOPSIS
.na
.nf
-\fBregexp:/etc/postfix/\fIfilename\fR
+\fBregexp:!!PREFIX!!/etc/postfix/\fIfilename\fR
-\fBpostmap -q "\fIstring\fB" regexp:/etc/postfix/\fIfilename\fR
+\fBpostmap -q "\fIstring\fB" regexp:!!PREFIX!!/etc/postfix/\fIfilename\fR
-\fBpostmap -q - regexp:/etc/postfix/\fIfilename\fR <\fIinputfile\fR
+\fBpostmap -q - regexp:!!PREFIX!!/etc/postfix/\fIfilename\fR <\fIinputfile\fR
.SH DESCRIPTION
.ad
.fi

View file

@ -1,20 +0,0 @@
*** ./man/man5/relocated.5.orig Sat Apr 22 20:28:31 2000
--- ./man/man5/relocated.5 Thu Jun 1 22:41:05 2000
***************
*** 10,12 ****
.nf
! \fBpostmap /etc/postfix/relocated\fR
.SH DESCRIPTION
--- 10,12 ----
.nf
! \fBpostmap !!PREFIX!!/etc/postfix/relocated\fR
.SH DESCRIPTION
***************
*** 20,22 ****
is used for fast searching by the mail system. Execute the command
! \fBpostmap /etc/postfix/relocated\fR in order to rebuild the indexed
file after changing the relocated table.
--- 20,22 ----
is used for fast searching by the mail system. Execute the command
! \fBpostmap !!PREFIX!!/etc/postfix/relocated\fR in order to rebuild the indexed
file after changing the relocated table.

View file

@ -1,20 +0,0 @@
*** ./man/man5/transport.5.orig Sat Apr 22 20:28:31 2000
--- ./man/man5/transport.5 Thu Jun 1 22:41:26 2000
***************
*** 10,12 ****
.nf
! \fBpostmap /etc/postfix/transport\fR
.SH DESCRIPTION
--- 10,12 ----
.nf
! \fBpostmap !!PREFIX!!/etc/postfix/transport\fR
.SH DESCRIPTION
***************
*** 21,23 ****
for fast searching by the mail system. Execute the command
! \fBpostmap /etc/postfix/transport\fR in order to rebuild the indexed
file after changing the transport table.
--- 21,23 ----
for fast searching by the mail system. Execute the command
! \fBpostmap !!PREFIX!!/etc/postfix/transport\fR in order to rebuild the indexed
file after changing the transport table.

View file

@ -1,20 +0,0 @@
*** ./man/man5/virtual.5.orig Sat Apr 22 20:28:31 2000
--- ./man/man5/virtual.5 Thu Jun 1 22:41:51 2000
***************
*** 10,12 ****
.nf
! \fBpostmap /etc/postfix/virtual\fR
.SH DESCRIPTION
--- 10,12 ----
.nf
! \fBpostmap !!PREFIX!!/etc/postfix/virtual\fR
.SH DESCRIPTION
***************
*** 26,28 ****
is used for fast searching by the mail system. Execute the command
! \fBpostmap /etc/postfix/virtual\fR in order to rebuild the indexed
file after changing the virtual table.
--- 26,28 ----
is used for fast searching by the mail system. Execute the command
! \fBpostmap !!PREFIX!!/etc/postfix/virtual\fR in order to rebuild the indexed
file after changing the virtual table.

View file

@ -1,13 +0,0 @@
*** ./man/man8/cleanup.8.orig Sun May 28 21:58:32 2000
--- ./man/man8/cleanup.8 Thu Jun 1 22:42:21 2000
***************
*** 136,139 ****
.nf
! /etc/postfix/canonical*, canonical mapping table
! /etc/postfix/virtual*, virtual mapping table
.SH LICENSE
--- 136,139 ----
.nf
! !!PREFIX!!/etc/postfix/canonical*, canonical mapping table
! !!PREFIX!!/etc/postfix/virtual*, virtual mapping table
.SH LICENSE

View file

@ -1,11 +0,0 @@
*** ./man/man8/local.8.orig Thu Feb 3 21:14:53 2000
--- ./man/man8/local.8 Thu Jun 1 22:42:43 2000
***************
*** 96,98 ****
The default per-user mailbox is a file in the UNIX mail spool
! directory (\fB/var/mail/\fIuser\fR or \fB/var/spool/mail/\fIuser\fR);
the location can be specified with the \fBmail_spool_directory\fR
--- 96,98 ----
The default per-user mailbox is a file in the UNIX mail spool
! directory (\fB/var/mail/\fIuser\fR);
the location can be specified with the \fBmail_spool_directory\fR

View file

@ -1,13 +0,0 @@
*** ./man/man8/master.8.orig Tue Mar 7 10:48:19 2000
--- ./man/man8/master.8 Thu Jun 1 22:43:02 2000
***************
*** 120,123 ****
.nf
! /etc/postfix/main.cf: global configuration file.
! /etc/postfix/master.cf: master process configuration file.
/var/spool/postfix/pid/master.pid: master lock file.
--- 120,123 ----
.nf
! !!PREFIX!!/etc/postfix/main.cf: global configuration file.
! !!PREFIX!!/etc/postfix/master.cf: master process configuration file.
/var/spool/postfix/pid/master.pid: master lock file.

View file

@ -1,17 +0,0 @@
--- ./proto/regexp_table.orig Tue Sep 17 18:54:42 2002
+++ ./proto/regexp_table Wed Sep 18 15:16:26 2002
@@ -4,11 +4,11 @@
# SUMMARY
# format of Postfix regular expression tables
# SYNOPSIS
-# \fBregexp:/etc/postfix/\fIfilename\fR
+# \fBregexp:!!PREFIX!!/etc/postfix/\fIfilename\fR
#
-# \fBpostmap -q "\fIstring\fB" regexp:/etc/postfix/\fIfilename\fR
+# \fBpostmap -q "\fIstring\fB" regexp:!!PREFIX!!/etc/postfix/\fIfilename\fR
#
-# \fBpostmap -q - regexp:/etc/postfix/\fIfilename\fR <\fIinputfile\fR
+# \fBpostmap -q - regexp:!!PREFIX!!/etc/postfix/\fIfilename\fR <\fIinputfile\fR
# DESCRIPTION
# The Postfix mail system uses optional tables for address
# rewriting or mail routing. These tables are usually in

View file

@ -1,20 +0,0 @@
*** ./proto/access.orig Sun Apr 9 16:44:45 2000
--- ./proto/access Thu Jun 1 22:45:05 2000
***************
*** 6,8 ****
# SYNOPSIS
! # \fBpostmap /etc/postfix/access\fR
# DESCRIPTION
--- 6,8 ----
# SYNOPSIS
! # \fBpostmap !!PREFIX!!/etc/postfix/access\fR
# DESCRIPTION
***************
*** 15,17 ****
# is used for fast searching by the mail system. Execute the command
! # \fBpostmap /etc/postfix/access\fR in order to rebuild the indexed
# file after changing the access table.
--- 15,17 ----
# is used for fast searching by the mail system. Execute the command
! # \fBpostmap !!PREFIX!!/etc/postfix/access\fR in order to rebuild the indexed
# file after changing the access table.

View file

@ -1,20 +0,0 @@
*** ./proto/canonical.orig Sun Apr 9 16:43:37 2000
--- ./proto/canonical Thu Jun 1 22:45:28 2000
***************
*** 6,8 ****
# SYNOPSIS
! # \fBpostmap /etc/postfix/canonical\fR
# DESCRIPTION
--- 6,8 ----
# SYNOPSIS
! # \fBpostmap !!PREFIX!!/etc/postfix/canonical\fR
# DESCRIPTION
***************
*** 15,17 ****
# is used for fast searching by the mail system. Execute the command
! # \fBpostmap /etc/postfix/canonical\fR in order to rebuild the indexed
# file after changing the canonical table.
--- 15,17 ----
# is used for fast searching by the mail system. Execute the command
! # \fBpostmap !!PREFIX!!/etc/postfix/canonical\fR in order to rebuild the indexed
# file after changing the canonical table.

View file

@ -1,17 +0,0 @@
--- ./proto/pcre_table.orig Tue Sep 17 18:54:38 2002
+++ ./proto/pcre_table Wed Sep 18 15:18:11 2002
@@ -4,11 +4,11 @@
# SUMMARY
# format of Postfix PCRE tables
# SYNOPSIS
-# \fBpcre:/etc/postfix/\fIfilename\fR
+# \fBpcre:!!PREFIX!!/etc/postfix/\fIfilename\fR
#
-# \fBpostmap -q "\fIstring\fB" pcre:/etc/postfix/\fIfilename\fR
+# \fBpostmap -q "\fIstring\fB" pcre:!!PREFIX!!/etc/postfix/\fIfilename\fR
#
-# \fBpostmap -q - pcre:/etc/postfix/\fIfilename\fR <\fIinputfile\fR
+# \fBpostmap -q - pcre:!!PREFIX!!/etc/postfix/\fIfilename\fR <\fIinputfile\fR
# DESCRIPTION
# The Postfix mail system uses optional tables for address
# rewriting or mail routing. These tables are usually in

View file

@ -1,20 +0,0 @@
*** ./proto/relocated.orig Sun Apr 9 16:47:31 2000
--- ./proto/relocated Thu Jun 1 22:46:02 2000
***************
*** 6,8 ****
# SYNOPSIS
! # \fBpostmap /etc/postfix/relocated\fR
# DESCRIPTION
--- 6,8 ----
# SYNOPSIS
! # \fBpostmap !!PREFIX!!/etc/postfix/relocated\fR
# DESCRIPTION
***************
*** 14,16 ****
# is used for fast searching by the mail system. Execute the command
! # \fBpostmap /etc/postfix/relocated\fR in order to rebuild the indexed
# file after changing the relocated table.
--- 14,16 ----
# is used for fast searching by the mail system. Execute the command
! # \fBpostmap !!PREFIX!!/etc/postfix/relocated\fR in order to rebuild the indexed
# file after changing the relocated table.

View file

@ -1,20 +0,0 @@
*** ./proto/transport.orig Sun Apr 9 17:05:45 2000
--- ./proto/transport Thu Jun 1 22:46:23 2000
***************
*** 6,8 ****
# SYNOPSIS
! # \fBpostmap /etc/postfix/transport\fR
# DESCRIPTION
--- 6,8 ----
# SYNOPSIS
! # \fBpostmap !!PREFIX!!/etc/postfix/transport\fR
# DESCRIPTION
***************
*** 15,17 ****
# for fast searching by the mail system. Execute the command
! # \fBpostmap /etc/postfix/transport\fR in order to rebuild the indexed
# file after changing the transport table.
--- 15,17 ----
# for fast searching by the mail system. Execute the command
! # \fBpostmap !!PREFIX!!/etc/postfix/transport\fR in order to rebuild the indexed
# file after changing the transport table.

View file

@ -1,20 +0,0 @@
*** ./proto/virtual.orig Sun Apr 9 17:14:14 2000
--- ./proto/virtual Thu Jun 1 22:46:40 2000
***************
*** 6,8 ****
# SYNOPSIS
! # \fBpostmap /etc/postfix/virtual\fR
# DESCRIPTION
--- 6,8 ----
# SYNOPSIS
! # \fBpostmap !!PREFIX!!/etc/postfix/virtual\fR
# DESCRIPTION
***************
*** 20,22 ****
# is used for fast searching by the mail system. Execute the command
! # \fBpostmap /etc/postfix/virtual\fR in order to rebuild the indexed
# file after changing the virtual table.
--- 20,22 ----
# is used for fast searching by the mail system. Execute the command
! # \fBpostmap !!PREFIX!!/etc/postfix/virtual\fR in order to rebuild the indexed
# file after changing the virtual table.

View file

@ -31,6 +31,7 @@ OpenLDAP "OpenLDAP map lookups" "$status_OpenLDAP" \
Test "SMTP/LMTP test server and generator" "$status_Test" \
TLS "SSL and TLS" "$status_TLS" \
IPv6 "IPv6 support (currently broken)" "$status_IPv6" \
IPv6TLS "IPv6 support with SSL and TLS" "$status_IPv6TLS" \
2> $tempfile
retval=$?
@ -110,8 +111,8 @@ while [ "$1" ]; do
echo "MAN8+= tlsmgr.8"
echo "POSTFIX_CCARGS+= -DHAS_SSL -I/usr/include/openssl"
echo "POSTFIX_AUXLIBS+= -lssl -lcrypto"
echo "DISTFILES+= \${DISTNAME}.tar.gz pfixtls-0.8.11a-1.1.11-20020917-0.9.6g.tar.gz"
echo "EXTRA_PATCHES+= \${WRKDIR}/pfixtls-0.8.11a-1.1.11-20020917-0.9.6g/pfixtls.diff"
echo "DISTFILES+= \${DISTNAME}.tar.gz pfixtls-0.8.11a-1.1.11-20021031-0.9.6g.tar.gz"
echo "EXTRA_PATCHES+= \${WRKDIR}/pfixtls-0.8.11a-1.1.11-20021031-0.9.6g/pfixtls.diff"
echo "PATCH_STRIP= -p1"
echo "TLS_SUFFIX= +tls"
SUB_TLS=""
@ -154,7 +155,7 @@ while [ "$1" ]; do
exit 1
fi
if [ X$SUB_TLS = "X" ]; then
/usr/bin/dialog --msgbox "IPv6 and TLS patch cannot be used simultaneously!" 5 60 > /dev/stderr
/usr/bin/dialog --msgbox "Select exactly one of the IPv6 and TLS patches" 5 60 > /dev/stderr
rm -f ${WRKDIRPREFIX}${CURDIR}/Makefile.inc
exit 1
fi
@ -163,9 +164,25 @@ while [ "$1" ]; do
echo "PATCH_DIST_STRIP= -p1"
echo "IPv6_SUFFIX= +ipv6"
echo ""
IPv6SELECTED=YES
;;
IPv6TLS)
if [ X$SUB_TLS = "X" -o X$IPv6SELECTED != X ]; then
/usr/bin/dialog --msgbox "Select exactly one of the IPv6 and TLS patches" 5 60 > /dev/stderr
rm -f ${WRKDIRPREFIX}${CURDIR}/Makefile.inc
exit 1
fi
echo "MAN8+= tlsmgr.8"
echo "POSTFIX_CCARGS+= -DHAS_SSL -I/usr/include/openssl"
echo "POSTFIX_AUXLIBS+= -lssl -lcrypto"
echo "PATCH_SITES+= ftp://ftp.stack.nl/pub/postfix/tls+ipv6/1.8/"
echo "PATCHFILES+= tls+ipv6-1.8-pf-1.1.11-20021115.patch"
echo "PATCH_DIST_STRIP= -p1"
echo "TLS_SUFFIX= +ipv6+tls"
SUB_TLS=""
;;
*)
echo "Invalid option(s): $*" > /dev/stderr
echo "Unknown option(s): $*" > /dev/stderr
rm -f ${WRKDIRPREFIX}${CURDIR}/Makefile.inc
exit 1
;;