cpet/openbsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

upgrade to postfix 2.5.0

Browse Source
This commit is contained in:
jakob 2008-02-01 16:37:52 +00:00
parent 4b4f8e26d5
commit ac60e4d80e
8 changed files with 35 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
mail/postfix/stable/Makefile
View File

@ -1,7 +1,6 @@
# $OpenBSD: Makefile,v 1.108 2007/10/25 21:05:33 steven Exp $
# $OpenBSD: Makefile,v 1.109 2008/02/01 16:37:52 jakob Exp $
VERSION= 2.4.6
PATCHLEVEL= 0
VERSION= 2.5.0
MASTER_SITES= ${MASTER_SITE_POSTFIX:=official/}

10
mail/postfix/stable/distinfo
View File

@ -1,5 +1,5 @@
MD5 (postfix/postfix-2.4.6.tar.gz) = MDMn9mwT/5Yxc0ZR7hhKiA==
RMD160 (postfix/postfix-2.4.6.tar.gz) = EVs6TrmCcB4p2y5S4pTsjuab2uU=
SHA1 (postfix/postfix-2.4.6.tar.gz) = ImIicH/Y2WPTFzBwysljcMRT/6c=
SHA256 (postfix/postfix-2.4.6.tar.gz) = ANB51jVLs5ebGG2mu+KBtC7qJxZiDaeBvNs23VWO3Mo=
SIZE (postfix/postfix-2.4.6.tar.gz) = 2935249
MD5 (postfix/postfix-2.5.0.tar.gz) = 1kEXqgywbSjO/5e4rL1leQ==
RMD160 (postfix/postfix-2.5.0.tar.gz) = L3wp1jp0e84lntVZbktZ8nmqgZY=
SHA1 (postfix/postfix-2.5.0.tar.gz) = 1hGsO28FNqkyCzVadr00WZfwi3s=
SHA256 (postfix/postfix-2.5.0.tar.gz) = 2nV6yBgfJYrSzkUyoJLhw+dL1lpzp17sbAATC//VPZk=
SIZE (postfix/postfix-2.5.0.tar.gz) = 3153152

2
mail/postfix/stable/files/postfix-disable
View File

@ -1,6 +1,6 @@
#!/bin/sh
#
# $OpenBSD: postfix-disable,v 1.4 2007/04/02 11:37:43 jakob Exp $
# $OpenBSD: postfix-disable,v 1.5 2008/02/01 16:37:53 jakob Exp $
if [ ! -f /etc/mailer.conf.pre-postfix ]; then
echo "can't find /etc/mailer.conf.pre-postfix, postfix not disabled"

2
mail/postfix/stable/files/postfix-enable
View File

@ -1,6 +1,6 @@
#!/bin/sh
#
# $OpenBSD: postfix-enable,v 1.7 2007/04/02 11:37:43 jakob Exp $
# $OpenBSD: postfix-enable,v 1.8 2008/02/01 16:37:53 jakob Exp $
if [ -f /etc/mailer.conf.postfix ]; then
if [ -f /etc/mailer.conf ]; then

15
mail/postfix/stable/files/postfix-install
View File

@ -1,5 +1,5 @@
#!/bin/sh
# $OpenBSD: postfix-install,v 1.1 2007/05/31 10:19:00 espie Exp $
# $OpenBSD: postfix-install,v 1.2 2008/02/01 16:37:53 jakob Exp $
#
# Post-installation setup of postfix
@ -7,6 +7,7 @@ PATH=/bin:/usr/bin:/sbin:/usr/sbin
CONFIG_DIR=${SYSCONFDIR}/postfix
SAMPLE_CONFIG_DIR=${PREFIX}/share/examples/postfix
SPOOL_DIR=/var/spool/postfix
DATA_DIR=/var/postfix
# Function: set up the postfix spool dir / chroot area
#
@ -19,6 +20,9 @@ do_spooldir()
for file in localtime services resolv.conf ; do
install -o root -g wheel -m 644 /etc/$file $SPOOL_DIR/etc
done
echo "-> Creating Postfix data directory under $DATA_DIR"
[ -d $DATA_DIR ] || install -d -o _postfix -g wheel -m 700 $DATA_DIR
}
# Function: replace sendmail binaries with postfix
@ -51,13 +55,13 @@ update_scripts()
#
do_configs()
{
PINSTALL="${CONFIG_DIR}/post-install command_directory=${PREFIX}/sbin"
POSTFIX="${PREFIX}/sbin/postfix"
if [ -d $CONFIG_DIR ]; then
update_scripts
echo ""
$PINSTALL upgrade-configuration
$POSTFIX upgrade-configuration
echo ""
echo "+---------------"
@ -74,15 +78,14 @@ do_configs()
update_scripts
$PINSTALL first-install-reminder
echo "+---------------"
echo "| Configuration files have been installed in $CONFIG_DIR."
echo "| Please update these files to meet your needs."
echo "+---------------"
fi
$PINSTALL set-permissions create-missing
$POSTFIX set-permissions
$POSTFIX check
}
do_mailwrapper

2
mail/postfix/stable/patches/patch-main.cf
View File

@ -1,4 +1,4 @@
$OpenBSD: patch-main.cf,v 1.6 2007/04/02 11:37:43 jakob Exp $
$OpenBSD: patch-main.cf,v 1.7 2008/02/01 16:37:53 jakob Exp $
--- conf/main.cf.orig Fri Mar 24 21:38:54 2006
+++ conf/main.cf Sat Apr 8 18:43:44 2006
@@ -108,6 +108,9 @@ mail_owner = postfix

21
mail/postfix/stable/patches/patch-master.cf
View File

@ -1,7 +1,6 @@
$OpenBSD: patch-master.cf,v 1.13 2007/04/02 11:37:43 jakob Exp $
--- conf/master.cf.orig Wed Jan 31 22:23:56 2007
+++ conf/master.cf Tue Mar 20 00:53:35 2007
@@ -6,42 +6,42 @@
--- conf/master.cf.orig Sun Jan 13 18:13:45 2008
+++ conf/master.cf Fri Jan 25 12:51:34 2008
@@ -8,8 +8,8 @@
# service type private unpriv chroot wakeup maxproc command + args
# (yes) (yes) (yes) (never) (100)
# ==========================================================================
@ -9,14 +8,13 @@ $OpenBSD: patch-master.cf,v 1.13 2007/04/02 11:37:43 jakob Exp $
-#submission inet n - n - - smtpd
+smtp inet n - - - - smtpd
+#submission inet n - - - - smtpd
# -o smtpd_enforce_tls=yes
# -o smtpd_tls_security_level=encrypt
# -o smtpd_sasl_auth_enable=yes
# -o smtpd_client_restrictions=permit_sasl_authenticated,reject
-#smtps inet n - n - - smtpd
+#smtps inet n - - - - smtpd
# -o smtpd_tls_wrappermode=yes
@@ -19,34 +19,34 @@
# -o smtpd_sasl_auth_enable=yes
# -o smtpd_client_restrictions=permit_sasl_authenticated,reject
# -o milter_macro_daemon_name=ORIGINATING
-#628 inet n - n - - qmqpd
-pickup fifo n - n 60 1 pickup
-cleanup unix n - n - 0 cleanup
@ -42,12 +40,13 @@ $OpenBSD: patch-master.cf,v 1.13 2007/04/02 11:37:43 jakob Exp $
+verify unix - - - - 1 verify
+flush unix n - - 1000? 0 flush
proxymap unix - - n - - proxymap
proxywrite unix - - n - - proxymap
-smtp unix - - n - - smtp
+smtp unix - - - - - smtp
# When relaying mail as backup MX, disable fallback_relay to avoid MX loops
-relay unix - - n - - smtp
+relay unix - - - - - smtp
-o fallback_relay=
-o smtp_fallback_relay=
# -o smtp_helo_timeout=5 -o smtp_connect_timeout=5
-showq unix n - n - - showq
-error unix - - n - - error
@ -68,7 +67,7 @@ $OpenBSD: patch-master.cf,v 1.13 2007/04/02 11:37:43 jakob Exp $
#
# ====================================================================
# Interfaces to non-Postfix software. Be sure to examine the manual
@@ -63,7 +63,7 @@ scache unix - - n - 1 scache
@@ -68,7 +68,7 @@
# The Cyrus deliver program has changed incompatibly, multiple times.
#
#old-cyrus unix - n n - - pipe
@ -77,7 +76,7 @@ $OpenBSD: patch-master.cf,v 1.13 2007/04/02 11:37:43 jakob Exp $
#
# ====================================================================
#
@@ -71,7 +71,7 @@ scache unix - - n - 1 scache
@@ -76,7 +76,7 @@
# Also specify in main.cf: cyrus_destination_recipient_limit=1
#
#cyrus unix - n n - - pipe

5
mail/postfix/stable/pkg/PLIST
View File

@ -1,4 +1,4 @@
@comment $OpenBSD: PLIST,v 1.19 2007/05/31 10:19:00 espie Exp $
@comment $OpenBSD: PLIST,v 1.20 2008/02/01 16:37:53 jakob Exp $
@conflict postfix-*
@newgroup _postfix:507
@newgroup _postdrop:508
@ -7,6 +7,7 @@
@unexec ${PREFIX}/sbin/postfix-disable
@unexec rm -f /etc/mailer.conf.postfix
@extra ${SYSCONFDIR}/postfix/
@extra /var/postfix/
@extra /var/spool/postfix/
libexec/postfix/
libexec/postfix/anvil
@ -151,6 +152,7 @@ share/doc/postfix/html/SMTPD_ACCESS_README.html
share/doc/postfix/html/SMTPD_POLICY_README.html
share/doc/postfix/html/SMTPD_PROXY_README.html
share/doc/postfix/html/STANDARD_CONFIGURATION_README.html
share/doc/postfix/html/STRESS_README.html
share/doc/postfix/html/TLS_LEGACY_README.html
share/doc/postfix/html/TLS_README.html
share/doc/postfix/html/TUNING_README.html
@ -262,6 +264,7 @@ share/doc/postfix/readme/SMTPD_ACCESS_README
share/doc/postfix/readme/SMTPD_POLICY_README
share/doc/postfix/readme/SMTPD_PROXY_README
share/doc/postfix/readme/STANDARD_CONFIGURATION_README
share/doc/postfix/readme/STRESS_README
share/doc/postfix/readme/TLS_LEGACY_README
share/doc/postfix/readme/TLS_README
share/doc/postfix/readme/TUNING_README