aboutsummaryrefslogtreecommitdiff
path: root/mail
diff options
context:
space:
mode:
authorPav Lucistnik <pav@FreeBSD.org>2005-02-14 19:48:03 +0000
committerPav Lucistnik <pav@FreeBSD.org>2005-02-14 19:48:03 +0000
commitfbfe713679312a0c12c0da9cd2966fbbae2d59a4 (patch)
treeec11a5fb927994d9f8af76f9e3c936d6ec1312b8 /mail
parent6481f9f9a9338b2ff796a0cd9b39e54ff5500204 (diff)
downloadports-fbfe713679312a0c12c0da9cd2966fbbae2d59a4.tar.gz
ports-fbfe713679312a0c12c0da9cd2966fbbae2d59a4.zip
Notes
Diffstat (limited to 'mail')
-rw-r--r--mail/postfix-current/Makefile43
-rw-r--r--mail/postfix-current/distinfo6
-rw-r--r--mail/postfix-current/files/patch-freebsd623
-rw-r--r--mail/postfix-current/pkg-plist13
-rw-r--r--mail/postfix-current/scripts/configure.postfix64
5 files changed, 42 insertions, 107 deletions
diff --git a/mail/postfix-current/Makefile b/mail/postfix-current/Makefile
index fcb337cfc627..5a75f95471fc 100644
--- a/mail/postfix-current/Makefile
+++ b/mail/postfix-current/Makefile
@@ -7,7 +7,7 @@
# To pre-select options in batch mode, run make like this:
#
-# make -DBATCH POSTFIX_OPTIONS="DB3 IPv6TLS"
+# make -DBATCH POSTFIX_OPTIONS="DB3 TLS"
#
# the options are the same names as in the scripts/configure.postfix file.
# POSTFIX_OPTIONS can be set in /etc/make.conf also.
@@ -15,7 +15,7 @@
# NOTE: PCRE is enabled by default unless you specifically disable it.
PORTNAME= postfix
-PORTVERSIONRAW= 2.2-20041030
+PORTVERSIONRAW= 2.2-20050212
PORTVERSION= ${PORTVERSIONRAW:S/-/./}
PORTEPOCH= 2
CATEGORIES= mail ipv6
@@ -30,7 +30,7 @@ MASTER_SITE_SUBDIR= . old related/postfix
DISTNAME= postfix-${PORTVERSIONRAW}
DIST_SUBDIR= ${PORTNAME}
-MAINTAINER= vivek@khera.org
+MAINTAINER= marcus@corp.grupos.com.br
COMMENT= A secure alternative to widely-used Sendmail
CONFLICTS= courier-0.* postfix-1.* postfix-2.0.* postfix-2.1.* sendmail-8.* sendmail-*-8.* smail-3.* zmailer-2.*
@@ -45,19 +45,16 @@ MAN1= mailq.1 newaliases.1 postalias.1 postcat.1 postconf.1 postdrop.1 \
MAN5= access.5 aliases.5 canonical.5 cidr_table.5 ldap_table.5 \
mysql_table.5 pgsql_table.5 postconf.5 pcre_table.5 \
regexp_table.5 relocated.5 tcp_table.5 transport.5 virtual.5 \
- header_checks.5 body_checks.5 master.5 nisplus_table.5
+ header_checks.5 body_checks.5 master.5 nisplus_table.5 \
+ generic.5
MAN8= anvil.8 bounce.8 cleanup.8 defer.8 error.8 flush.8 lmtp.8 local.8 \
master.8 oqmgr.8 pickup.8 pipe.8 proxymap.8 qmgr.8 qmqpd.8 showq.8 \
smtp.8 smtpd.8 spawn.8 trace.8 trivial-rewrite.8 verify.8 virtual.8 \
- scache.8 discard.8
-
-# TLS patch adds to MAN8 but doesn't have .html file, so avoid trying to
-# patch it.
-MAN8base=$(MAN8:S/tlsmgr.8//)
+ scache.8 discard.8 tlsmgr.8
CONF1= main.cf master.cf access aliases canonical header_checks relocated \
- transport virtual
+ transport virtual generic
README= ADDRESS_CLASS_README ADDRESS_REWRITING_README \
ADDRESS_VERIFICATION_README BACKSCATTER_README \
@@ -70,7 +67,7 @@ README= ADDRESS_CLASS_README ADDRESS_REWRITING_README \
SASL_README SCHEDULER_README SMTPD_ACCESS_README SMTPD_POLICY_README \
SMTPD_PROXY_README STANDARD_CONFIGURATION_README TUNING_README \
ULTRIX_README UUCP_README VERP_README VIRTUAL_README \
- XCLIENT_README XFORWARD_README
+ XCLIENT_README XFORWARD_README IPV6_README TLS_README
.if !defined(DEBUG)
MAKEFILEFLAGS+= DEBUG=
@@ -138,18 +135,18 @@ READMEDIR=${PREFIX}/share/doc/postfix
do-install:
cd ${WRKSRC}; ${SH} postfix-install -non-interactive install_root=/ tempdir=/tmp \
- config_directory=${PREFIX}/etc/postfix \
- daemon_directory=${PREFIX}/libexec/postfix \
- command_directory=${PREFIX}/sbin \
- queue_directory=/var/spool/postfix \
- sendmail_path=${PREFIX}/sbin/sendmail \
- newaliases_path=${PREFIX}/bin/newaliases \
- mailq_path=${PREFIX}/bin/mailq \
- mail_owner=postfix \
- setgid_group=maildrop \
- manpage_directory=${PREFIX}/man \
- sample_directory=${PREFIX}/etc/postfix \
- readme_directory=${READMEDIR}
+ config_directory=${PREFIX}/etc/postfix \
+ daemon_directory=${PREFIX}/libexec/postfix \
+ command_directory=${PREFIX}/sbin \
+ queue_directory=/var/spool/postfix \
+ sendmail_path=${PREFIX}/sbin/sendmail \
+ newaliases_path=${PREFIX}/bin/newaliases \
+ mailq_path=${PREFIX}/bin/mailq \
+ mail_owner=postfix \
+ setgid_group=maildrop \
+ manpage_directory=${PREFIX}/man \
+ sample_directory=${PREFIX}/etc/postfix \
+ readme_directory=${READMEDIR}
.for f in ${CONF1}
${INSTALL_DATA} ${WRKSRC}/conf/${f} \
diff --git a/mail/postfix-current/distinfo b/mail/postfix-current/distinfo
index efc7ce78be36..9e566246bcf8 100644
--- a/mail/postfix-current/distinfo
+++ b/mail/postfix-current/distinfo
@@ -1,4 +1,2 @@
-MD5 (postfix/postfix-2.2-20041030.tar.gz) = f179f5d50d387d2eb82351bdb03dac9e
-SIZE (postfix/postfix-2.2-20041030.tar.gz) = 2106328
-MD5 (postfix/pfixtls-0.8.19-2.2-20040919-0.9.7d.tar.gz) = 2f5df0781abd0390611158b4a5fb63c4
-SIZE (postfix/pfixtls-0.8.19-2.2-20040919-0.9.7d.tar.gz) = 239159
+MD5 (postfix/postfix-2.2-20050212.tar.gz) = 12191a2c250eecc56d944c2050593c16
+SIZE (postfix/postfix-2.2-20050212.tar.gz) = 2397152
diff --git a/mail/postfix-current/files/patch-freebsd6 b/mail/postfix-current/files/patch-freebsd6
index 738e287634a5..bdaef28a172d 100644
--- a/mail/postfix-current/files/patch-freebsd6
+++ b/mail/postfix-current/files/patch-freebsd6
@@ -9,26 +9,3 @@
OpenBSD.2*) SYSTYPE=OPENBSD2
;;
OpenBSD.3*) SYSTYPE=OPENBSD3
---- makedefs.snapshot_orig Wed Apr 14 14:18:06 2004
-+++ makedefs.snapshot Fri Aug 20 15:08:54 2004
-@@ -93,6 +93,8 @@
- ;;
- FreeBSD.5*) SYSTYPE=FREEBSD5
- ;;
-+ FreeBSD.6*) SYSTYPE=FREEBSD5
-+ ;;
- OpenBSD.2*) SYSTYPE=OPENBSD2
- ;;
- OpenBSD.3*) SYSTYPE=OPENBSD3
-===cut-here===
---- makedefs.stable_orig Wed Apr 14 13:59:43 2004
-+++ makedefs.stable Fri Aug 20 15:10:13 2004
-@@ -93,6 +93,8 @@
- ;;
- FreeBSD.5*) SYSTYPE=FREEBSD5
- ;;
-+ FreeBSD.6*) SYSTYPE=FREEBSD5
-+ ;;
- OpenBSD.2*) SYSTYPE=OPENBSD2
- ;;
- OpenBSD.3*) SYSTYPE=OPENBSD3
diff --git a/mail/postfix-current/pkg-plist b/mail/postfix-current/pkg-plist
index 5f20b813f439..39b5e5868ecc 100644
--- a/mail/postfix-current/pkg-plist
+++ b/mail/postfix-current/pkg-plist
@@ -7,7 +7,9 @@
@unexec if cmp -s %D/etc/postfix/relocated %D/etc/postfix/dist-relocated; then rm -f %D/etc/postfix/relocated; fi
@unexec if cmp -s %D/etc/postfix/transport %D/etc/postfix/dist-transport; then rm -f %D/etc/postfix/transport; fi
@unexec if cmp -s %D/etc/postfix/virtual %D/etc/postfix/dist-virtual; then rm -f %D/etc/postfix/virtual; fi
+@unexec if cmp -s %D/etc/postfix/generic %D/etc/postfix/dist-generic; then rm -f %D/etc/postfix/generic; fi
etc/postfix/LICENSE
+etc/postfix/TLS_LICENSE
etc/postfix/main.cf.default
etc/postfix/makedefs.out
etc/postfix/post-install
@@ -22,6 +24,7 @@ etc/postfix/dist-header_checks
etc/postfix/dist-relocated
etc/postfix/dist-transport
etc/postfix/dist-virtual
+etc/postfix/dist-generic
libexec/postfix/anvil
libexec/postfix/bounce
libexec/postfix/cleanup
@@ -46,7 +49,7 @@ libexec/postfix/spawn
libexec/postfix/trivial-rewrite
libexec/postfix/verify
libexec/postfix/virtual
-%%SUB_TLS%%libexec/postfix/tlsmgr
+libexec/postfix/tlsmgr
sbin/postalias
sbin/postcat
sbin/postconf
@@ -93,7 +96,11 @@ bin/mailq
%%PORTDOCS%%%%DOCSDIR%%/FILTER_README.html
%%PORTDOCS%%%%DOCSDIR%%/INSTALL
%%PORTDOCS%%%%DOCSDIR%%/INSTALL.html
-%%PORTDOCS%%%%SUB_IPV6%%%%DOCSDIR%%/IPV6_README
+%%PORTDOCS%%%%DOCSDIR%%/IPV6_README
+%%PORTDOCS%%%%DOCSDIR%%/IPV6_README.html
+%%PORTDOCS%%%%DOCSDIR%%/CDB_README.html
+%%PORTDOCS%%%%DOCSDIR%%/TLS_README
+%%PORTDOCS%%%%DOCSDIR%%/TLS_README.html
%%PORTDOCS%%%%DOCSDIR%%/LDAP_README
%%PORTDOCS%%%%DOCSDIR%%/LDAP_README.html
%%PORTDOCS%%%%DOCSDIR%%/LINUX_README
@@ -215,6 +222,8 @@ bin/mailq
%%PORTDOCS%%%%DOCSDIR%%/verify.8.html
%%PORTDOCS%%%%DOCSDIR%%/virtual.5.html
%%PORTDOCS%%%%DOCSDIR%%/virtual.8.html
+%%PORTDOCS%%%%DOCSDIR%%/tlsmgr.8.html
+%%PORTDOCS%%%%DOCSDIR%%/generic.5.html
%%PORTDOCS%%@dirrm %%DOCSDIR%%
@dirrm libexec/postfix
@unexec rmdir %D/etc/postfix 2>/dev/null || true
diff --git a/mail/postfix-current/scripts/configure.postfix b/mail/postfix-current/scripts/configure.postfix
index 74a4bf8433d8..89eddeaf3490 100644
--- a/mail/postfix-current/scripts/configure.postfix
+++ b/mail/postfix-current/scripts/configure.postfix
@@ -23,9 +23,8 @@ NOPCRE "DISABLE Perl Compatible Regular Expressions" "$status_NOPCRE" \
SASL "Cyrus SASLv1 (Simple Authentication and Security Layer)" "$status_SASL" \
SASL2 "Cyrus SASLv2 (Simple Authentication and Security Layer)" "$status_SASL2" \
SASLKRB "If your SASL requires Kerberos select this option" "$status_SASLKRB" \
-TLS "SSL and TLS (BROKEN)" "$status_TLS" \
-IPv6 "IPv6 support (BROKEN)" "$status_IPv6" \
-IPv6TLS "IPv6 support with SSL and TLS (BROKEN)" "$status_IPv6TLS" \
+SASLKRB5 "If your SASL requires Kerberos5 select this option" "$status_SASLKRB5" \
+TLS "SSL and TLS" "$status_TLS" \
DB3 "Berkeley DB3 (required if SASL also built with DB3)" "$status_DB3" \
DB40 "Berkeley DB4.0 (required if SASL also built with DB4.0)" "$status_DB40" \
DB41 "Berkeley DB4.1 (required if SASL also built with DB4.1)" "$status_DB41" \
@@ -33,7 +32,6 @@ DB42 "Berkeley DB4.2 (required if SASL also built with DB4.2)" "$status_DB42" \
MySQL "MySQL map lookups (choose version with WITH_MYSQL_VER)" "$status_MySQL" \
PgSQL "PostgreSQL v7.4 map lookups" "$status_PgSQL" \
PgSQL73 "PostgreSQL v7.3 map lookups" "$status_PgSQL73" \
-PgSQL72 "PostgreSQL v7.2 map lookups" "$status_PgSQL72" \
OpenLDAP "OpenLDAP map lookups (choose ver. with WITH_OPENLDAP_VER)" "$status_OpenLDAP" \
NIS "NIS map lookups" "$status_NIS" \
Test "SMTP/LMTP test server and generator" "$status_Test" \
@@ -62,9 +60,7 @@ exec > ${WRKDIRPREFIX}${CURDIR}/Makefile.inc
echo "PREFIX= ${PREFIX}"
-SUB_TLS="@comment "
SUB_TEST="@comment "
-SUB_IPV6="@comment "
while [ "$1" ]; do
case $1 in
@@ -104,16 +100,14 @@ while [ "$1" ]; do
SASLKRB)
echo "POSTFIX_AUXLIBS+= -lkrb -lcrypto -lcom_err"
;;
+ SASLKRB5)
+ echo "POSTFIX_AUXLIBS+= -lkrb5 -lcrypto -lcrypt -lcom_err -lasn1 -lroken"
+ ;;
TLS)
- echo "MAN8+= tlsmgr.8"
echo "USE_OPENSSL= yes"
- echo "POSTFIX_CCARGS+= -DHAS_SSL -I\${OPENSSLINC}"
+ echo "POSTFIX_CCARGS+= -DUSE_TLS -I\${OPENSSLINC}"
echo "POSTFIX_AUXLIBS+= -L\${OPENSSLLIB} -lssl -lcrypto"
- echo "DISTFILES+= \${DISTNAME}.tar.gz pfixtls-0.8.19-2.2-20040919-0.9.7d.tar.gz"
- echo "EXTRA_PATCHES+= \${WRKDIR}/pfixtls-0.8.19-2.2-20040919-0.9.7d/pfixtls.diff"
- echo "PATCH_STRIP= -p1"
echo "TLS_SUFFIX= +tls"
- SUB_TLS=""
;;
DB3)
if [ "X$BDB_SELECTED" != "X" ]; then
@@ -170,26 +164,19 @@ while [ "$1" ]; do
echo "MYSQL_SUFFIX= +mysql"
;;
PgSQL)
- echo "POSTGRESQL_PORT?= databases/postgresql7"
+ echo "POSTGRESQL_PORT?= databases/postgresql74-client"
echo "LIB_DEPENDS+= pq.3:\${PORTSDIR}/\${POSTGRESQL_PORT}"
echo "POSTFIX_CCARGS+= -DHAS_PGSQL -I\${LOCALBASE}/include -I\${LOCALBASE}/pgsql/include"
echo "POSTFIX_AUXLIBS+= -L\${LOCALBASE}/lib -L\${LOCALBASE}/pgsql/lib -lpq -lcrypt"
echo "PGSQL_SUFFIX= +pgsql"
;;
PgSQL73)
- echo "POSTGRESQL_PORT?= databases/postgresql73"
+ echo "POSTGRESQL_PORT?= databases/postgresql73-client"
echo "LIB_DEPENDS+= pq.3:\${PORTSDIR}/\${POSTGRESQL_PORT}"
echo "POSTFIX_CCARGS+= -DHAS_PGSQL -I\${LOCALBASE}/include -I\${LOCALBASE}/pgsql/include"
echo "POSTFIX_AUXLIBS+= -L\${LOCALBASE}/lib -L\${LOCALBASE}/pgsql/lib -lpq -lcrypt"
echo "PGSQL_SUFFIX= +pgsql"
;;
- PgSQL72)
- echo "POSTGRESQL_PORT?= databases/postgresql72"
- echo "LIB_DEPENDS+= pq.2:\${PORTSDIR}/\${POSTGRESQL_PORT}"
- echo "POSTFIX_CCARGS+= -DHAS_PGSQL -I\${LOCALBASE}/include -I\${LOCALBASE}/pgsql/include"
- echo "POSTFIX_AUXLIBS+= -L\${LOCALBASE}/lib -L\${LOCALBASE}/pgsql/lib -lpq -lcrypt"
- echo "PGSQL_SUFFIX= +pgsql"
- ;;
OpenLDAP)
echo "USE_OPENLDAP=YES"
echo "POSTFIX_CCARGS+= -DHAS_LDAP -I\${LOCALBASE}/include"
@@ -205,37 +192,6 @@ while [ "$1" ]; do
# echo "MAN1+= smtp-sink.1 smtp-source.1 qmqp-sink.1 qmqp-source.1"
SUB_TEST=""
;;
- IPv6)
- if [ X$SUB_TLS = "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 "PATCH_SITES+= http://www.ipnet6.org/postfix/download/"
- echo "PATCHFILES+= ipv6-1.25-pf-2.2-20040616.patch.gz"
- echo "PATCH_DIST_STRIP= -p1"
- echo "IPv6_SUFFIX= +ipv6"
- echo ""
- IPv6SELECTED=YES
- SUB_IPV6=""
- ;;
- 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 "USE_OPENSSL= yes"
- echo "POSTFIX_CCARGS+= -DHAS_SSL -I\${OPENSSLINC}"
- echo "POSTFIX_AUXLIBS+= -L\${OPENSSLLIB} -lssl -lcrypto"
- echo "PATCH_SITES+= http://www.ipnet6.org/postfix/download/"
- echo "PATCHFILES+= tls+ipv6-1.25-pf-2.2-20040616.patch.gz"
- echo "PATCH_DIST_STRIP= -p1"
- echo "TLS_SUFFIX= +tls+ipv6"
- SUB_TLS=""
- SUB_IPV6=""
- ;;
*)
echo "Unknown option(s): $*" > /dev/stderr
rm -f ${WRKDIRPREFIX}${CURDIR}/Makefile.inc
@@ -245,12 +201,10 @@ while [ "$1" ]; do
shift
done
-echo "PLIST_SUB+= SUB_TLS=\"${SUB_TLS}\""
echo "PLIST_SUB+= SUB_TEST=\"${SUB_TEST}\""
-echo "PLIST_SUB+= SUB_IPV6=\"${SUB_IPV6}\""
# for some reason, if we alter the pkg name this way, the first build (where
# we ask the configure questions) doesn't pick up the extensions, but
# any subsequent build will. so "make; make install" will build twice.
# don't do this for now.
-#echo "PKGNAMESUFFIX= \${NOPCRE_SUFFIX}\${SASL_SUFFIX}\${DB_SUFFIX}\${MYSQL_SUFFIX}\${PGSQL_SUFFIX}\${OPENLDAP_SUFFIX}\${TLS_SUFFIX}\${IPv6_SUFFIX}\${NIS_SUFFIX}"
+#echo "PKGNAMESUFFIX= \${NOPCRE_SUFFIX}\${SASL_SUFFIX}\${DB_SUFFIX}\${MYSQL_SUFFIX}\${PGSQL_SUFFIX}\${OPENLDAP_SUFFIX}\${TLS_SUFFIX}\${NIS_SUFFIX}"