diff options
author | David W. Chapman Jr. <dwcjr@FreeBSD.org> | 2001-11-30 18:59:24 +0000 |
---|---|---|
committer | David W. Chapman Jr. <dwcjr@FreeBSD.org> | 2001-11-30 18:59:24 +0000 |
commit | 2dc187be1599c367cbbb292f00074f467c87050a (patch) | |
tree | 88e3a22ce1ff424703c66831fba769e6ae5e18d0 /mail | |
parent | Oops, remove NO_MTREE=yes in order to avoid install error. (diff) |
Update to 20011121
Submitted by: osa@freebsd.org.ru
Notes
Notes:
svn path=/head/; revision=50772
Diffstat (limited to 'mail')
-rw-r--r-- | mail/postfix-current/Makefile | 2 | ||||
-rw-r--r-- | mail/postfix-current/distinfo | 4 | ||||
-rw-r--r-- | mail/postfix-current/files/patch-aa | 135 | ||||
-rw-r--r-- | mail/postfix-current/scripts/configure.postfix | 4 |
4 files changed, 71 insertions, 74 deletions
diff --git a/mail/postfix-current/Makefile b/mail/postfix-current/Makefile index a57b69e00904..8d8d553dae15 100644 --- a/mail/postfix-current/Makefile +++ b/mail/postfix-current/Makefile @@ -6,7 +6,7 @@ # PORTNAME= postfix -PORTVERSION= 20011121 +PORTVERSION= 20011127 CATEGORIES= mail ipv6 MASTER_SITES= ftp://ftp.porcupine.org/mirrors/postfix-release/experimental/ \ ftp://ftp.aet.tu-cottbus.de/pub/postfix_tls/%SUBDIR%/ \ diff --git a/mail/postfix-current/distinfo b/mail/postfix-current/distinfo index 146db738f2d1..73802d7ef193 100644 --- a/mail/postfix-current/distinfo +++ b/mail/postfix-current/distinfo @@ -1,2 +1,2 @@ -MD5 (postfix/snapshot-20011121.tar.gz) = 3c79dd6ce991eb6188332b7d79d856ca -MD5 (postfix/pfixtls-0.7.13a-snap20011121-0.9.6b.tar.gz) = 9803b8055d045b4d2515c3ef022f5372 +MD5 (postfix/snapshot-20011127.tar.gz) = b15b79f9e5b385b079f422c5d23ea89b +MD5 (postfix/pfixtls-0.7.13c-snap20011127-0.9.6b.tar.gz) = ca4f1e4e1f2287875fa582fa184b209c diff --git a/mail/postfix-current/files/patch-aa b/mail/postfix-current/files/patch-aa index 74bbbb38d097..bf5ae64dc1cc 100644 --- a/mail/postfix-current/files/patch-aa +++ b/mail/postfix-current/files/patch-aa @@ -1,69 +1,66 @@ -*** ./conf/main.cf.orig Fri Jan 28 09:44:47 2000 ---- ./conf/main.cf Thu Jun 1 22:01:21 2000 -*************** -*** 19,21 **** - # -! command_directory = /usr/sbin - ---- 19,21 ---- - # -! command_directory = !!PREFIX!!/sbin - -*************** -*** 26,28 **** - # -! daemon_directory = /usr/libexec/postfix - ---- 26,28 ---- - # -! daemon_directory = !!PREFIX!!/libexec/postfix - -*************** -*** 43,45 **** - # -! #default_privs = nobody - ---- 43,45 ---- - # -! default_privs = nobody - -*************** -*** 180,182 **** - #alias_database = dbm:/etc/aliases -! #alias_database = dbm:/etc/mail/aliases - #alias_database = hash:/etc/aliases ---- 180,182 ---- - #alias_database = dbm:/etc/aliases -! #alias_database = dbm:/etc/aliases - #alias_database = hash:/etc/aliases -*************** -*** 199,202 **** - # 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). - # ---- 199,202 ---- - # 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). - # -*************** -*** 209,211 **** - # -! #mail_spool_directory = /var/mail - #mail_spool_directory = /var/spool/mail ---- 209,211 ---- - # -! mail_spool_directory = /var/mail - # mail_spool_directory = /var/spool/mail -*************** -*** 274,277 **** - # -! #header_checks = regexp:/etc/postfix/filename -! #header_checks = pcre:/etc/postfix/filename - ---- 274,277 ---- - # -! #header_checks = regexp:!!PREFIX!!/etc/postfix/filename -! #header_checks = pcre:!!PREFIX!!/etc/postfix/filename - +--- ./conf/main.cf.orig Wed Nov 28 13:49:04 2001 ++++ ./conf/main.cf Wed Nov 28 13:53:04 2001 +@@ -31,14 +31,14 @@ + # 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 + + # QUEUE AND PROCESS OWNERSHIP + # +@@ -56,7 +56,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 + # +@@ -306,7 +306,7 @@ + # tables that are not necessarily all under control by Postfix. + # + #alias_database = dbm:/etc/aliases +-#alias_database = dbm:/etc/mail/aliases ++#alias_database = dbm:/etc/aliases + #alias_database = hash:/etc/aliases + #alias_database = hash:/etc/aliases, hash:/opt/majordomo/aliases + +@@ -325,8 +325,8 @@ + # + # 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). ++# mailbox file is /var/mail/user. Specify "Maildir/" for ++# qmail-style delivery (the / is required). + # + #home_mailbox = Mailbox + #home_mailbox = Maildir/ +@@ -335,7 +335,7 @@ + # UNIX-style mailboxes are kept. The default setting depends on the + # system type. + # +-#mail_spool_directory = /var/mail ++mail_spool_directory = /var/mail + #mail_spool_directory = /var/spool/mail + + # The mailbox_command parameter specifies the optional external +@@ -424,7 +424,7 @@ + # + # See also the body_checks example in the sample-filter.cf file. + # +-#header_checks = regexp:/etc/postfix/header_checks ++#header_checks = regexp:!!PREFIX!!/etc/postfix/header_checks + + # FAST ETRN SERVICE + # diff --git a/mail/postfix-current/scripts/configure.postfix b/mail/postfix-current/scripts/configure.postfix index 49b42e12efd4..fdc0976c9386 100644 --- a/mail/postfix-current/scripts/configure.postfix +++ b/mail/postfix-current/scripts/configure.postfix @@ -87,8 +87,8 @@ while [ "$1" ]; do echo "BIN1+= tlsmgr" echo "POSTFIX_CCARGS+= -DHAS_SSL -I/usr/include/openssl" echo "POSTFIX_AUXLIBS+= -lssl -lcrypto" - echo "DISTFILES+= \${DISTNAME}.tar.gz pfixtls-0.7.13a-snap20011121-0.9.6b.tar.gz" - echo "EXTRA_PATCHES+= \${WRKDIR}/pfixtls-0.7.13a-snap20011121-0.9.6b/pfixtls.diff" + echo "DISTFILES+= \${DISTNAME}.tar.gz pfixtls-0.7.13c-snap20011127-0.9.6b.tar.gz" + echo "EXTRA_PATCHES+= \${WRKDIR}/pfixtls-0.7.13c-snap20011127-0.9.6b/pfixtls.diff" echo "PATCH_STRIP= -p1" SUB_TLS="" ;; |