diff --git a/mail/postfix-current/Makefile b/mail/postfix-current/Makefile index 56d1e926bccb..8c35e96adfed 100644 --- a/mail/postfix-current/Makefile +++ b/mail/postfix-current/Makefile @@ -1,122 +1,122 @@ # New ports collection makefile for: postfix-current # Date created: 18 Mar 1999 # Whom: torstenb # # $FreeBSD$ # PORTNAME= postfix -PORTVERSION= 1.1.11-20020719 +PORTVERSION= 1.1.11-20020822 PORTEPOCH= 1 CATEGORIES= mail ipv6 MASTER_SITES= ftp://ftp.porcupine.org/mirrors/postfix-release/experimental/ \ ftp://ftp.aet.tu-cottbus.de/pub/postfix_tls/%SUBDIR%/ \ ftp://ftp.tux.org/pub/net/postfix/experimental/ \ ftp://ftp.utoronto.ca/mirror/packages/postfix/experimental/ \ ftp://ftp.samurai.com/pub/postfix/experimental/ \ ${MASTER_SITE_RINGSERVER:S,%SUBDIR%,net/mail/postfix/experimental/&,} MASTER_SITE_SUBDIR= . old related/postfix DISTNAME= postfix-${PORTVERSION} DIST_SUBDIR= ${PORTNAME} MAINTAINER= khera@kciLink.com USE_SUBMAKE= 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 \ postsuper.1 sendmail.1 MAN5= access.5 aliases.5 canonical.5 pcre_table.5 regexp_table.5 \ relocated.5 transport.5 virtual.5 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 NO_LATEST_LINK= yes CONF1= main.cf master.cf access aliases canonical pcre_table regexp_table \ relocated transport virtual .if !defined(DEBUG) MAKEFILEFLAGS+= DEBUG= .endif MAKEFILEFLAGS+= OPT="${CFLAGS}" SCRIPTS_ENV= WRKDIRPREFIX="${WRKDIRPREFIX}" \ TOUCH="${TOUCH}" \ MKDIR="${MKDIR}" \ pre-fetch: @${SETENV} ${SCRIPTS_ENV} ${SH} ${SCRIPTDIR}/configure.postfix .if exists(${WRKDIRPREFIX}${.CURDIR}/Makefile.inc) .include "${WRKDIRPREFIX}${.CURDIR}/Makefile.inc" .endif post-patch: (cd ${WRKSRC} && ${MAKE} -f Makefile.init makefiles ${MAKEFILEFLAGS} \ CCARGS="${POSTFIX_CCARGS}" AUXLIBS="${POSTFIX_AUXLIBS}" && \ ${ECHO} "all: default" >> Makefile) pre-install: @${SETENV} ${SCRIPTS_ENV} PKG_PREFIX="${PREFIX}" ${SH} ${PKGINSTALL} ${PKGNAME} PRE-INSTALL .if defined(NOPORTDOCS) READMEDIR=no .else READMEDIR=${PREFIX}/share/doc/postfix .endif 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} .for file in ${CONF1} ${INSTALL_DATA} ${WRKSRC}/conf/${file} \ ${PREFIX}/etc/postfix/sample-${file} .endfor @${INSTALL_SCRIPT} \ ${WRKSRC}/auxiliary/rmail/rmail \ ${PREFIX}/bin/rmail # optional TEST binaries .for file in ${BIN1} @${INSTALL_PROGRAM} \ ${WRKSRC}/src/smtpstone/${file} \ ${PREFIX}/sbin .endfor .if !defined(NOPORTDOCS) @${INSTALL} -d -o ${DOCOWN} -g ${DOCGRP} -m 555 ${DOCSDIR} @cd ${WRKSRC}/html && ${INSTALL_DATA} *.html *.gif ${DOCSDIR} && \ ${ECHO_MSG} "Installed HTML documentation in ${DOCSDIR}" .endif post-install: @${SETENV} ${SCRIPTS_ENV} PKG_PREFIX="${PREFIX}" ${SH} ${PKGINSTALL} ${PKGNAME} POST-INSTALL # need to fixup ${PREFIX}/etc/postfix/postfix-files to indicate compressed # man pages, since the ports software compresses them after this step, and # if we run etc/postfix/post-install again during package installation, # it will complain about missing files. @${SETENV} ${SCRIPTS_ENV} ${SH} ${SCRIPTDIR}/fix-files-list @${CAT} ${PKGMESSAGE} post-clean: @${RM} -f ${WRKDIRPREFIX}${.CURDIR}/Makefile.inc .include diff --git a/mail/postfix-current/distinfo b/mail/postfix-current/distinfo index 1f4251577654..018d169b5dfb 100644 --- a/mail/postfix-current/distinfo +++ b/mail/postfix-current/distinfo @@ -1,5 +1,5 @@ -MD5 (postfix/postfix-1.1.11-20020719.tar.gz) = 6e229a63db7233bbd5dc6c86c9dc662d -MD5 (postfix/pfixtls-0.8.11a-1.1.11-20020613-0.9.6d.tar.gz) = 6ed63e3941e8de1a9ca4c884dbc84125 +MD5 (postfix/postfix-1.1.11-20020822.tar.gz) = 1a82f18a9ce23dc7c6d29d7023281067 +MD5 (postfix/pfixtls-0.8.11a-1.1.11-20020822-0.9.6g.tar.gz) = 45661443f25719094ebb537d4865c07e MD5 (postfix/postfix-pg.postfix-1.1.8.patch) = e0f4d910a6d6648d9b48e2244f2764ba MD5 (postfix/postfix-1.1.11+ipv6.patch.gz) = dc2a6362518025583a17305607eb8f0e diff --git a/mail/postfix-current/files/patch-aa b/mail/postfix-current/files/patch-aa index 51b40396bd5e..fa5398945dd7 100644 --- a/mail/postfix-current/files/patch-aa +++ b/mail/postfix-current/files/patch-aa @@ -1,86 +1,88 @@ -*** ./conf/main.cf.orig Fri Jan 4 13:09:04 2002 ---- ./conf/main.cf Tue Jan 8 22:41:50 2002 +*** ./conf/main.cf.orig Thu Aug 22 03:17:14 2002 +--- ./conf/main.cf Thu Aug 29 19:56:21 2002 *************** -*** 31,44 **** +*** 29,43 **** + queue_directory = /var/spool/postfix + # The command_directory parameter specifies the location of all - # postXXX commands. The default value is $program_directory. + # 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). The - # default value is $program_directory. This directory must be owned - # by root. + # 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 # ---- 31,44 ---- +--- 29,43 ---- + queue_directory = /var/spool/postfix + # The command_directory parameter specifies the location of all - # postXXX commands. The default value is $program_directory. + # 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). The - # default value is $program_directory. This directory must be owned - # by root. + # 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 # *************** -*** 325,332 **** +*** 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/ ---- 325,332 ---- +--- 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/ *************** -*** 424,430 **** +*** 444,450 **** # # See also the body_checks example in the sample-filter.cf file. # ! #header_checks = regexp:/etc/postfix/header_checks # FAST ETRN SERVICE # ---- 424,430 ---- +--- 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 # *************** -*** 525,531 **** +*** 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_path: The location of the Postfix on-line manual pages. + # manpage_directory: The location of the Postfix on-line manual pages. # ---- 525,531 ---- +--- 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_path: The location of the Postfix on-line manual pages. + # manpage_directory: The location of the Postfix on-line manual pages. # diff --git a/mail/postfix-current/files/patch-aj b/mail/postfix-current/files/patch-aj index 241d48132551..e0ebb6f5976c 100644 --- a/mail/postfix-current/files/patch-aj +++ b/mail/postfix-current/files/patch-aj @@ -1,24 +1,24 @@ *** ./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 **** # -! program_directory = /usr/libexec/postfix +! daemon_directory = /usr/libexec/postfix --- 220,222 ---- # -! program_directory = !!PREFIX!!/libexec/postfix +! 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 = diff --git a/mail/postfix-current/files/patch-ei b/mail/postfix-current/files/patch-ei deleted file mode 100644 index 8f03b69ccc52..000000000000 --- a/mail/postfix-current/files/patch-ei +++ /dev/null @@ -1,21 +0,0 @@ -*** ./src/smtpd/smtpd.h.orig Thu Sep 14 10:17:23 2000 ---- ./src/smtpd/smtpd.h Thu Sep 14 10:17:38 2000 -*************** -*** 12,19 **** - * SASL library. - */ - #ifdef USE_SASL_AUTH -! #include -! #include - #endif - - /* ---- 12,19 ---- - * SASL library. - */ - #ifdef USE_SASL_AUTH -! #include -! #include - #endif - - /* diff --git a/mail/postfix-current/files/patch-ej b/mail/postfix-current/files/patch-ej deleted file mode 100644 index 329d7bb1cf96..000000000000 --- a/mail/postfix-current/files/patch-ej +++ /dev/null @@ -1,21 +0,0 @@ -*** ./src/smtp/smtp.h.orig Thu Sep 14 13:04:43 2000 ---- ./src/smtp/smtp.h Thu Sep 14 13:04:53 2000 -*************** -*** 12,19 **** - * SASL library. - */ - #ifdef USE_SASL_AUTH -! #include -! #include - #endif - - /* ---- 12,19 ---- - * SASL library. - */ - #ifdef USE_SASL_AUTH -! #include -! #include - #endif - - /* diff --git a/mail/postfix-current/files/patch-lmtp.h b/mail/postfix-current/files/patch-lmtp.h deleted file mode 100644 index 86d5975b2b4d..000000000000 --- a/mail/postfix-current/files/patch-lmtp.h +++ /dev/null @@ -1,13 +0,0 @@ ---- ./src/lmtp/lmtp.h.orig Fri Jan 19 15:43:06 2001 -+++ ./src/lmtp/lmtp.h Sat Feb 3 14:01:09 2001 -@@ -12,8 +12,8 @@ - * SASL library. - */ - #ifdef USE_SASL_AUTH --#include --#include -+#include -+#include - #endif - - /* diff --git a/mail/postfix-current/scripts/configure.postfix b/mail/postfix-current/scripts/configure.postfix index c135fb03c604..a55fe39f2da1 100644 --- a/mail/postfix-current/scripts/configure.postfix +++ b/mail/postfix-current/scripts/configure.postfix @@ -1,155 +1,175 @@ #!/bin/sh # $FreeBSD$ if [ -f ${WRKDIRPREFIX}${CURDIR}/Makefile.inc ]; then exit fi tempfile=`mktemp -t checklist` if [ "${BATCH}" = "yes" ]; then set \"PCRE\" else /usr/bin/dialog --title "Postfix configuration options" --clear \ --checklist "\n\ Please select desired options:" -1 -1 16 \ PCRE "Perl Compatible Regular Expressions" OFF \ SASL "Cyrus SASLv1 (Simple Authentication and Security Layer)" OFF \ +SASL2 "Cyrus SASLv2 (Simple Authentication and Security Layer)" OFF \ DB3 "Berkeley DB3 (required if SASL also built with DB3)" OFF \ MySQL "MySQL map lookups" OFF \ PgSQL "PostgreSQL map lookups" OFF \ OpenLDAP "OpenLDAP map lookups" OFF \ Test "SMTP/LMTP test server and generator" OFF \ -TLS "SSL and TLS (currently broken)" OFF \ +TLS "SSL and TLS" OFF \ IPv6 "IPv6 support (currently broken)" OFF \ 2> $tempfile retval=$? if [ -s $tempfile ]; then set `cat $tempfile` fi rm -f $tempfile case $retval in 0) if [ -z "$*" ]; then echo "Nothing selected" fi ;; 1) echo "Cancel pressed." exit 1 ;; esac fi ${MKDIR} ${WRKDIRPREFIX}${CURDIR} exec > ${WRKDIRPREFIX}${CURDIR}/Makefile.inc echo "PREFIX= ${PREFIX}" SUB_TLS="@comment " SUB_TEST="@comment " while [ "$1" ]; do case $1 in \"PCRE\") echo "LIB_DEPENDS+= pcre.0:\${PORTSDIR}/devel/pcre" echo "POSTFIX_CCARGS+= -DHAS_PCRE -I\${LOCALBASE}/include" echo "POSTFIX_AUXLIBS+= -L\${LOCALBASE}/lib -lpcre" echo "PCRE_SUFFIX= +pcre" SUB_PCRE="" ;; - \"SASL\") - echo "LIB_DEPENDS+= sasl.8:\${PORTSDIR}/security/cyrus-sasl" - echo "POSTFIX_CCARGS+= -DUSE_SASL_AUTH -I\${LOCALBASE}/include" - echo "POSTFIX_AUXLIBS+= -L\${LOCALBASE}/lib -lsasl -lpam -lcrypt" - echo "SASL_SUFFIX= +sasl" - if [ -f ${PREFIX}/lib/libsasl.a ]; then - if nm ${PREFIX}/lib/libsasl.a | grep -wq "mysql_verify_password"; then + \"SASL\") + echo "LIB_DEPENDS+= sasl.8:\${PORTSDIR}/security/cyrus-sasl" + echo "POSTFIX_CCARGS+= -DUSE_SASL_AUTH -I\${LOCALBASE}/include -I\${LOCALBASE}/include/sasl1" + echo "POSTFIX_AUXLIBS+= -L\${LOCALBASE}/lib -lsasl -lpam -lcrypt" + echo "SASL_SUFFIX= +sasl" + if [ -f ${PREFIX}/lib/libsasl.a ]; then + if nm ${PREFIX}/lib/libsasl.a | grep -wq "mysql_verify_password"; then + echo "POSTFIX_CCARGS+= -DHAS_MYSQL -I\${LOCALBASE}/include/mysql" + echo "POSTFIX_AUXLIBS+= \${LOCALBASE}/lib/mysql/libmysqlclient.a -lm -lz" + fi + else + echo "POSTFIX_CCARGS+= -DHAS_MYSQL -I\${LOCALBASE}/include/mysql" + echo "POSTFIX_AUXLIBS+= \${LOCALBASE}/lib/mysql/libmysqlclient.a -lm -lz" + fi + echo ".if exists(/usr/lib/libkrb.a)" + echo "POSTFIX_AUXLIBS+= -lkrb -ldes -lcom_err" + echo ".endif" + SUB_SASL="" + ;; + \"SASL2\") + echo "LIB_DEPENDS+= sasl2.2:\${PORTSDIR}/security/cyrus-sasl2" + echo "POSTFIX_CCARGS+= -DUSE_SASL_AUTH -I\${LOCALBASE}/include -I\${LOCALBASE}/include/sasl" + echo "POSTFIX_AUXLIBS+= -L\${LOCALBASE}/lib -lsasl2 -lpam -lcrypt" + echo "SASL_SUFFIX= +sasl2" + if [ -f ${PREFIX}/lib/libsasl2.a ]; then + if nm ${PREFIX}/lib/libsasl2.a | grep -wq "mysql_verify_password"; then echo "POSTFIX_CCARGS+= -DHAS_MYSQL -I\${LOCALBASE}/include/mysql" echo "POSTFIX_AUXLIBS+= \${LOCALBASE}/lib/mysql/libmysqlclient.a -lm -lz" fi else echo "POSTFIX_CCARGS+= -DHAS_MYSQL -I\${LOCALBASE}/include/mysql" echo "POSTFIX_AUXLIBS+= \${LOCALBASE}/lib/mysql/libmysqlclient.a -lm -lz" fi echo ".if exists(/usr/lib/libkrb.a)" echo "POSTFIX_AUXLIBS+= -lkrb -ldes -lcom_err" echo ".endif" SUB_SASL="" ;; \"TLS\") 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-20020613-0.9.6d.tar.gz" - echo "EXTRA_PATCHES+= \${WRKDIR}/pfixtls-0.8.11a-1.1.11-20020613-0.9.6d/pfixtls.diff" + echo "DISTFILES+= \${DISTNAME}.tar.gz pfixtls-0.8.11a-1.1.11-20020822-0.9.6g.tar.gz" + echo "EXTRA_PATCHES+= \${WRKDIR}/pfixtls-0.8.11a-1.1.11-20020822-0.9.6g/pfixtls.diff" echo "PATCH_STRIP= -p1" echo "TLS_SUFFIX= +tls" SUB_TLS="" ;; \"DB3\") echo "LIB_DEPENDS+= db3.2:\${PORTSDIR}/databases/db3" echo "POSTFIX_CCARGS+= -I\${LOCALBASE}/include/db3" echo "POSTFIX_AUXLIBS+= -L\${LOCALBASE}/lib -ldb3" echo "DB3_SUFFIX= +db3" ;; \"MySQL\") echo "BUILD_DEPENDS+= \${LOCALBASE}/lib/mysql/libmysqlclient.a:\${PORTSDIR}/databases/mysql323-client" echo "POSTFIX_CCARGS+= -DHAS_MYSQL -I\${LOCALBASE}/include/mysql" echo "POSTFIX_AUXLIBS+= \${LOCALBASE}/lib/mysql/libmysqlclient.a -lm -lz" echo "MYSQL_SUFFIX= +mysql" ;; \"PgSQL\") echo "LIB_DEPENDS+= pq.2:\${PORTSDIR}/databases/postgresql7" 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" echo "PATCH_SITES+= http://mat.cc/postfix/" echo "PATCHFILES+= postfix-pg.postfix-1.1.8.patch" echo "PATCH_DIST_STRIP= -p1" ;; \"OpenLDAP\") echo "BUILD_DEPENDS+= \${LOCALBASE}/lib/libldap.a:\${PORTSDIR}/net/openldap" echo "POSTFIX_CCARGS+= -DHAS_LDAP -I\${LOCALBASE}/include" echo "POSTFIX_AUXLIBS+= \${LOCALBASE}/lib/libldap.a \${PREFIX}/lib/liblber.a" echo "OPENLDAP_SUFFIX= +openldap" ;; \"Test\") echo "BIN1= smtp-sink smtp-source" SUB_TEST="" ;; \"IPv6\") if [ `uname -m` != "i386" ]; then /usr/bin/dialog --msgbox "IPv6 patch currently only supported on i386!" 5 60 > /dev/stderr rm -f ${WRKDIRPREFIX}${CURDIR}/Makefile.inc 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 rm -f ${WRKDIRPREFIX}${CURDIR}/Makefile.inc exit 1 fi echo "PATCH_SITES+= http://www.cyber-magic.org/~taka/misc/" echo "PATCHFILES+= postfix-1.1.11+ipv6.patch.gz" echo "PATCH_DIST_STRIP= -p1" echo "IPv6_SUFFIX= +ipv6" echo "" ;; *) echo "Invalid option(s): $*" > /dev/stderr rm -f ${WRKDIRPREFIX}${CURDIR}/Makefile.inc exit 1 ;; esac shift done echo "PLIST_SUB+= SUB_TLS=\"${SUB_TLS}\"" echo "PLIST_SUB+= SUB_TEST=\"${SUB_TEST}\"" # 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= \${PCRE_SUFFIX}\${SASL_SUFFIX}\${DB3_SUFFIX}\${MYSQL_SUFFIX}\${PGSQL_SUFFIX}\${OPENLDAP_SUFFIX}\${TLS_SUFFIX}\${IPv6_SUFFIX}"