snapshot 2.0.0-20030105, no tls patches yet
This commit is contained in:
jakob
parent
2cea4c57ef
commit
ac0194040e
@ -1,6 +1,6 @@
|
||||
# $OpenBSD: Makefile,v 1.58 2002/12/20 16:26:22 jakob Exp $
|
||||
# $OpenBSD: Makefile,v 1.59 2003/01/06 11:37:24 jakob Exp $
|
||||
|
||||
VERSION= 1.1.12-20021219
|
||||
VERSION= 2.0.0-20030105
|
||||
|
||||
DISTNAME= postfix-${VERSION}
|
||||
PKGNAME= postfix-${VERSION}
|
||||
@ -9,18 +9,9 @@ MAINTAINER= Jakob Schlyter <jakob@openbsd.org>
|
||||
|
||||
MASTER_SITES= ${MASTER_SITE_POSTFIX:=experimental/}
|
||||
|
||||
FLAVORS+= sasl2
|
||||
FLAVOR?=
|
||||
|
||||
.if ${FLAVOR:L:Msasl2}
|
||||
LIB_DEPENDS+= sasl2::security/cyrus-sasl2
|
||||
MAKE_CCARGS+= -I${LOCALBASE}/include -I${LOCALBASE}/include/sasl -DUSE_SASL_AUTH
|
||||
MAKE_AUXLIBS+= -L${LOCALBASE}/lib -lsasl2
|
||||
.endif
|
||||
|
||||
TLSVERSION= 0.8.12
|
||||
TLSPFIXVERSION= 1.1.12-20021219
|
||||
TLSSSLVERSION= 0.9.6h
|
||||
TLSDISTNAME= pfixtls-${TLSVERSION}-${TLSPFIXVERSION}-${TLSSSLVERSION}
|
||||
#TLSVERSION= 0.8.12
|
||||
#TLSPFIXVERSION= ${VERSION}
|
||||
#TLSSSLVERSION= 0.9.6h
|
||||
#TLSDISTNAME= pfixtls-${TLSVERSION}-${TLSPFIXVERSION}-${TLSSSLVERSION}
|
||||
|
||||
.include <bsd.port.mk>
|
||||
|
||||
@ -1,6 +1,3 @@
|
||||
MD5 (postfix/pfixtls-0.8.12-1.1.12-20021219-0.9.6h.tar.gz) = 68a5c6eadd4da48692d24b03498d84ce
|
||||
MD5 (postfix/postfix-1.1.12-20021219.tar.gz) = cb6cd21bd9f65a452481c1b11c6a004f
|
||||
RMD160 (postfix/pfixtls-0.8.12-1.1.12-20021219-0.9.6h.tar.gz) = 5f629b3eb155b39ab8df55fa3969c6a7063e0746
|
||||
RMD160 (postfix/postfix-1.1.12-20021219.tar.gz) = ea28fc3982895b131a2026feb06e92df9158fbd0
|
||||
SHA1 (postfix/pfixtls-0.8.12-1.1.12-20021219-0.9.6h.tar.gz) = b9586be2faf15be5f41841da4da25b2f8312b8c4
|
||||
SHA1 (postfix/postfix-1.1.12-20021219.tar.gz) = fdfae8f0dbce188563e4756e4912d83f2e511b6a
|
||||
MD5 (postfix/postfix-2.0.0-20030105.tar.gz) = 778abed487d6b60aaacb93b5a1cbd4b3
|
||||
RMD160 (postfix/postfix-2.0.0-20030105.tar.gz) = 7955cf1bae39e2ae90723bfc02c75d03e900e5c8
|
||||
SHA1 (postfix/postfix-2.0.0-20030105.tar.gz) = fc96ea3e445ec556302698606386a7b4f2b69bf7
|
||||
|
||||
@ -1,6 +1,8 @@
|
||||
--- conf/master.cf.orig Tue Dec 10 10:13:00 2002
|
||||
+++ conf/master.cf Tue Dec 10 10:15:01 2002
|
||||
@@ -69,24 +69,24 @@
|
||||
$OpenBSD: patch-master.cf,v 1.8 2003/01/06 11:37:24 jakob Exp $
|
||||
|
||||
--- conf/master.cf.orig Sat Dec 21 23:49:48 2002
|
||||
+++ conf/master.cf Mon Dec 23 08:13:32 2002
|
||||
@@ -69,26 +69,26 @@
|
||||
# service type private unpriv chroot wakeup maxproc command + args
|
||||
# (yes) (yes) (yes) (never) (50)
|
||||
# ==========================================================================
|
||||
@ -13,6 +15,8 @@
|
||||
-rewrite unix - - n - - trivial-rewrite
|
||||
-bounce unix - - n - 0 bounce
|
||||
-defer unix - - n - 0 bounce
|
||||
-trace unix - - n - 0 bounce
|
||||
-verify unix - - n - 1 verify
|
||||
-flush unix n - n 1000? 0 flush
|
||||
-smtp unix - - n - - smtp
|
||||
-relay unix - - n - - smtp
|
||||
@ -25,6 +29,8 @@
|
||||
+rewrite unix - - - - - trivial-rewrite
|
||||
+bounce unix - - - - 0 bounce
|
||||
+defer unix - - - - 0 bounce
|
||||
+trace unix - - - - 0 bounce
|
||||
+verify unix - - - - 1 verify
|
||||
+flush unix n - - 1000? 0 flush
|
||||
+smtp unix - - - - - smtp
|
||||
+relay unix - - - - - smtp
|
||||
|
||||
@ -74,16 +74,13 @@ Other significant features of interest
|
||||
|
||||
Flavors
|
||||
|
||||
* pcre - Add support for Perl-compatible regular expressions.
|
||||
|
||||
* sasl - Add support for authenticated SMTP.
|
||||
|
||||
* tls - Add support for SSL/TLS using patches from
|
||||
${TLSHOMEPAGE}.
|
||||
|
||||
* ldap - Add support for doing table lookups using LDAP.
|
||||
|
||||
* mysql - Add support for doing table lookups using MySQL.
|
||||
pcre Include support for Perl-compatible regular expressions
|
||||
sasl Include support for authenticated SMTP using Cyrus SASL v1 (deprecated)
|
||||
sasl2 Include support for authenticated SMTP using Cyrus SASL v2 (recommended)
|
||||
tls Include support for SMTP over SSL/TLS
|
||||
ldap Include support for doing table lookups using LDAP
|
||||
mysql Include support for doing table lookups using MySQL
|
||||
|
||||
|
||||
WWW: ${HOMEPAGE}
|
||||
WWW: ${TLSHOMEPAGE}
|
||||
|
||||
@ -1,12 +1,12 @@
|
||||
#!/bin/sh
|
||||
# $OpenBSD: INSTALL,v 1.9 2002/12/21 16:24:48 jakob Exp $
|
||||
# $OpenBSD: INSTALL,v 1.10 2003/01/06 11:37:24 jakob Exp $
|
||||
#
|
||||
# Pre/post-installation setup of postfix
|
||||
|
||||
PATH=/bin:/usr/bin:/sbin:/usr/sbin
|
||||
PREFIX=${PKG_PREFIX:-/usr/local}
|
||||
CONFIG_DIR=/etc/postfix
|
||||
SAMPLE_CONFIG_DIR=$PREFIX/share/examples/postfix
|
||||
SAMPLE_CONFIG_DIR=${PREFIX}/share/examples/postfix
|
||||
SPOOL_DIR=/var/spool/postfix
|
||||
|
||||
# Function: set up postfix user/group accounts.
|
||||
@ -72,53 +72,53 @@ MAILER
|
||||
chmod 644 /etc/mailer.conf.postfix
|
||||
}
|
||||
|
||||
# Function: install the postfix configuration files from the samples
|
||||
# Function: update postfix scripts
|
||||
#
|
||||
do_configs()
|
||||
update_scripts()
|
||||
{
|
||||
if [ -d $CONFIG_DIR ]; then
|
||||
echo ""
|
||||
echo "+---------------"
|
||||
echo "| The existing $1 configuration files in $CONFIG_DIR,"
|
||||
echo "| have NOT been changed. You may want to compare them to the"
|
||||
echo "| current sample files, $SAMPLE_CONFIG_DIR,"
|
||||
echo "| and update your configuration as needed."
|
||||
echo "|"
|
||||
echo "| Existing $CONFIG_DIR/postfix-script, however, will be"
|
||||
echo "| updated to the latest version."
|
||||
echo "+---------------"
|
||||
echo ""
|
||||
else
|
||||
# Install config files.
|
||||
install -d -o root -g wheel -m 755 $CONFIG_DIR
|
||||
install -o root -g wheel -m 644 $SAMPLE_CONFIG_DIR/* $CONFIG_DIR
|
||||
|
||||
# The correct files will be installed later.
|
||||
rm -f $CONFIG_DIR/{postfix-script,postfix-files,post-install}
|
||||
|
||||
# Change group owner
|
||||
chgrp postdrop ${PREFIX}/sbin/postqueue
|
||||
chgrp postdrop ${PREFIX}/sbin/postdrop
|
||||
|
||||
# Fix setgid
|
||||
chmod g+s ${PREFIX}/sbin/postqueue
|
||||
chmod g+s ${PREFIX}/sbin/postdrop
|
||||
|
||||
echo ""
|
||||
echo "+---------------"
|
||||
echo "| The $1 configuration files in $CONFIG_DIR,"
|
||||
echo "| have been installed. Please view these files and change"
|
||||
echo "| the configuration to meet your needs."
|
||||
echo "+---------------"
|
||||
echo ""
|
||||
fi
|
||||
|
||||
rm -f $CONFIG_DIR/{postfix-script,postfix-files,post-install}
|
||||
install -o root -g wheel -m 544 \
|
||||
$SAMPLE_CONFIG_DIR/{postfix-script,post-install} $CONFIG_DIR
|
||||
install -o root -g wheel -m 444 \
|
||||
$SAMPLE_CONFIG_DIR/postfix-files $CONFIG_DIR
|
||||
}
|
||||
|
||||
$CONFIG_DIR/post-install command_directory=${PREFIX}/sbin set-permissions
|
||||
# Function: install the postfix configuration files from the samples
|
||||
#
|
||||
do_configs()
|
||||
{
|
||||
PINSTALL="${CONFIG_DIR}/post-install command_directory=${PREFIX}/sbin"
|
||||
|
||||
if [ -d $CONFIG_DIR ]; then
|
||||
update_scripts
|
||||
|
||||
echo ""
|
||||
$PINSTALL upgrade-configuration
|
||||
echo ""
|
||||
|
||||
echo "+---------------"
|
||||
echo "| The existing configuration files in $CONFIG_DIR has been preserved."
|
||||
echo "| You may want to compare them to the current sample files,"
|
||||
echo "| $SAMPLE_CONFIG_DIR, and update your configuration as needed."
|
||||
echo "|"
|
||||
echo "| $CONFIG_DIR/postfix-{script,install-files} has been updated."
|
||||
echo "+---------------"
|
||||
echo ""
|
||||
else
|
||||
install -d -o root -g wheel -m 755 $CONFIG_DIR
|
||||
install -o root -g wheel -m 644 $SAMPLE_CONFIG_DIR/* $CONFIG_DIR
|
||||
|
||||
update_scripts
|
||||
|
||||
$PINSTALL first-install-reminder
|
||||
|
||||
echo "+---------------"
|
||||
echo "| Configuration files has been installed in $CONFIG_DIR."
|
||||
echo "| Please update these files to meet your needs."
|
||||
echo "+---------------"
|
||||
fi
|
||||
|
||||
$PINSTALL set-permissions create-missing
|
||||
|
||||
grep syslogd_flags /etc/rc.conf{,.local} 2>/dev/null | grep -q postfix
|
||||
if [ $? -eq 1 ]; then
|
||||
@ -127,6 +127,7 @@ do_configs()
|
||||
echo "| Don't forget to add \"-a /var/spool/postfix/dev/log\" to syslogd_flags"
|
||||
echo "| in /etc/rc.conf.local (or /etc/rc.conf) and restart syslogd."
|
||||
echo "+---------------"
|
||||
echo ""
|
||||
fi
|
||||
}
|
||||
|
||||
@ -134,7 +135,18 @@ do_configs()
|
||||
#
|
||||
do_notice()
|
||||
{
|
||||
|
||||
echo "+---------------"
|
||||
echo "| The Postfix SMTP server will reject mail for unknown local users."
|
||||
echo "| If the SMTP server is running chrooted, which is default in OpenBSD,"
|
||||
echo "| you need to keep /etc/{passwd,pwd.db} in sync with"
|
||||
echo "| /var/spool/postfix/etc/{passwd,pwd.db} or adjust the setting of the"
|
||||
echo "| local_recipient_maps parameter in main.cf."
|
||||
echo "|"
|
||||
echo "| For more information, read ${PREFIX}/share/examples/postfix/main.cf"
|
||||
echo "+---------------"
|
||||
echo ""
|
||||
|
||||
echo "+---------------"
|
||||
echo "| Postfix can be set up to replace sendmail entirely. Please read the"
|
||||
echo "| documentation at file:$PREFIX/share/doc/postfix/html/index.html or"
|
||||
@ -166,9 +178,9 @@ case $2 in
|
||||
do_accts
|
||||
;;
|
||||
POST-INSTALL)
|
||||
do_mailwrapper
|
||||
do_spooldir
|
||||
do_configs $1
|
||||
do_mailwrapper
|
||||
do_notice
|
||||
;;
|
||||
*)
|
||||
|
||||
@ -1,9 +0,0 @@
|
||||
+---------------
|
||||
| The Postfix SMTP server will reject mail for unknown local users. If the SMTP
|
||||
| server is running chrooted, which is default in OpenBSD, you need to keep
|
||||
| /etc/{passwd,pwd.db} in sync with /var/spool/postfix/etc/{passwd,pwd.db} or
|
||||
| adjust the setting of the local_recipient_maps parameter in main.cf.
|
||||
|
|
||||
| For more information, read ${PREFIX}/share/examples/postfix/main.cf
|
||||
+---------------
|
||||
|
||||
@ -1,5 +1,6 @@
|
||||
@comment $OpenBSD: PFRAG.tls,v 1.4 2002/06/22 08:59:13 jakob Exp $
|
||||
@comment $OpenBSD: PFRAG.tls,v 1.5 2003/01/06 11:37:24 jakob Exp $
|
||||
libexec/postfix/tlsmgr
|
||||
man/man8/tlsmgr.8
|
||||
share/doc/postfix/tls/conf.html
|
||||
share/doc/postfix/tls/index.html
|
||||
share/doc/postfix/tls/install.html
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
@comment $OpenBSD: PLIST,v 1.14 2002/12/15 22:10:41 jakob Exp $
|
||||
@comment $OpenBSD: PLIST,v 1.15 2003/01/06 11:37:24 jakob Exp $
|
||||
@pkgcfl postfix-*
|
||||
%%tls%%
|
||||
libexec/postfix/bounce
|
||||
@ -11,6 +11,7 @@ libexec/postfix/master
|
||||
libexec/postfix/nqmgr
|
||||
libexec/postfix/pickup
|
||||
libexec/postfix/pipe
|
||||
libexec/postfix/proxymap
|
||||
libexec/postfix/qmgr
|
||||
libexec/postfix/qmqpd
|
||||
libexec/postfix/showq
|
||||
@ -18,6 +19,7 @@ libexec/postfix/smtp
|
||||
libexec/postfix/smtpd
|
||||
libexec/postfix/spawn
|
||||
libexec/postfix/trivial-rewrite
|
||||
libexec/postfix/verify
|
||||
libexec/postfix/virtual
|
||||
man/man1/mailq.1
|
||||
man/man1/newaliases.1
|
||||
@ -52,13 +54,16 @@ man/man8/master.8
|
||||
man/man8/nqmgr.8
|
||||
man/man8/pickup.8
|
||||
man/man8/pipe.8
|
||||
man/man8/proxymap.8
|
||||
man/man8/qmgr.8
|
||||
man/man8/qmqpd.8
|
||||
man/man8/showq.8
|
||||
man/man8/smtp.8
|
||||
man/man8/smtpd.8
|
||||
man/man8/spawn.8
|
||||
man/man8/trace.8
|
||||
man/man8/trivial-rewrite.8
|
||||
man/man8/verify.8
|
||||
man/man8/virtual.8
|
||||
sbin/mailq
|
||||
sbin/postalias
|
||||
@ -116,6 +121,7 @@ share/doc/postfix/html/postlog.1.html
|
||||
share/doc/postfix/html/postmap.1.html
|
||||
share/doc/postfix/html/postqueue.1.html
|
||||
share/doc/postfix/html/postsuper.1.html
|
||||
share/doc/postfix/html/proxymap.8.html
|
||||
share/doc/postfix/html/qmgr.8.html
|
||||
share/doc/postfix/html/qmqpd.8.html
|
||||
share/doc/postfix/html/queuing.html
|
||||
@ -132,11 +138,15 @@ share/doc/postfix/html/small-picture.gif
|
||||
share/doc/postfix/html/smtp.8.html
|
||||
share/doc/postfix/html/smtpd.8.html
|
||||
share/doc/postfix/html/spawn.8.html
|
||||
share/doc/postfix/html/trace.8.html
|
||||
share/doc/postfix/html/transport.5.html
|
||||
share/doc/postfix/html/trivial-rewrite.8.html
|
||||
share/doc/postfix/html/uce.html
|
||||
share/doc/postfix/html/verify.8.html
|
||||
share/doc/postfix/html/virtual.5.html
|
||||
share/doc/postfix/html/virtual.8.html
|
||||
share/doc/postfix/readme/ADDRESS_CLASS_README
|
||||
share/doc/postfix/readme/ADDRESS_VERIFICATION_README
|
||||
share/doc/postfix/readme/DB_README
|
||||
share/doc/postfix/readme/DEBUG_README
|
||||
share/doc/postfix/readme/ETRN_README
|
||||
@ -145,6 +155,7 @@ share/doc/postfix/readme/INSTALL
|
||||
share/doc/postfix/readme/LDAP_README
|
||||
share/doc/postfix/readme/LINUX_README
|
||||
share/doc/postfix/readme/LMTP_README
|
||||
share/doc/postfix/readme/LOCAL_RECIPIENT_README
|
||||
share/doc/postfix/readme/MACOSX_README
|
||||
share/doc/postfix/readme/MAILDROP_README
|
||||
share/doc/postfix/readme/MYSQL_README
|
||||
@ -198,6 +209,7 @@ share/examples/postfix/sample-rewrite.cf
|
||||
share/examples/postfix/sample-smtp.cf
|
||||
share/examples/postfix/sample-smtpd.cf
|
||||
share/examples/postfix/sample-transport.cf
|
||||
share/examples/postfix/sample-verify.cf
|
||||
share/examples/postfix/sample-virtual.cf
|
||||
share/examples/postfix/transport
|
||||
share/examples/postfix/virtual
|
||||
|
||||
Loading…
Reference in New Issue
Block a user