From 4231fb9dfdf80c5e91e7a7586d2066c7af4a17f1 Mon Sep 17 00:00:00 2001 From: Sahil Tandon Date: Mon, 9 May 2011 13:11:13 +0000 Subject: [PATCH] Update to 2.8.3 and point to newer VDA patch. Also address the problem described in ports/155885 by passing additional parameters to the upstream install script. Security: CVE-2011-1720 --- mail/postfix/Makefile | 14 ++++++++++---- mail/postfix/distinfo | 8 ++++---- mail/postfix28/Makefile | 14 ++++++++++---- mail/postfix28/distinfo | 8 ++++---- 4 files changed, 28 insertions(+), 16 deletions(-) diff --git a/mail/postfix/Makefile b/mail/postfix/Makefile index 1b6c9eed1d25..66dd1d58ecfb 100644 --- a/mail/postfix/Makefile +++ b/mail/postfix/Makefile @@ -6,7 +6,7 @@ # PORTNAME= postfix -PORTVERSION= 2.8.2 +PORTVERSION= 2.8.3 PORTEPOCH= 1 CATEGORIES= mail ipv6 MASTER_SITES= ftp://ftp.porcupine.org/mirrors/postfix-release/official/ \ @@ -20,7 +20,7 @@ DIST_SUBDIR= ${PORTNAME} MAINTAINER= sahil@FreeBSD.org COMMENT= A secure alternative to widely-used Sendmail -VDAVERSION= 2.8.0 +VDAVERSION= 2.8.1 CONFLICTS= courier-0.* postfix-1.* postfix-2.[0-79].* postfix-base-2.[0-79].* \ postfix-current-2.* postfix-current-base-2.* sendmail-8.* \ sendmail+*-8.* smail-3.* zmailer-2.* @@ -231,7 +231,7 @@ _REQUIRE+= ypserv .if defined(WITH_VDA) PATCH_SITES+= http://vda.sourceforge.net/VDA/:vda -PATCHFILES+= postfix-vda-${VDAVERSION}.patch:vda +PATCHFILES+= postfix-vda-v10-${VDAVERSION}.patch:vda PATCH_DIST_STRIP= -p1 PLIST_SUB+= VDA="" .else @@ -353,9 +353,15 @@ pre-su-install: do-install: @cd ${WRKSRC} && ${SH} postfix-install -non-interactive install_root=/ tempdir=/tmp \ + config_directory=${ETCDIR} \ + command_directory=${PREFIX}/sbin \ daemon_directory=${DAEMONDIR} \ html_directory=${READMEDIR} \ - readme_directory=${READMEDIR} + mailq_path=${PREFIX}/bin/mailq \ + manpage_directory=${MANPREFIX}/man \ + newaliases_path=${PREFIX}/bin/newaliases \ + readme_directory=${READMEDIR} \ + sendmail_path=${PREFIX}/sbin/sendmail ${INSTALL_SCRIPT} ${WRKSRC}/auxiliary/rmail/rmail ${PREFIX}/bin/rmail ${INSTALL_SCRIPT} ${WRKSRC}/auxiliary/qshape/qshape.pl ${PREFIX}/bin/qshape ${INSTALL_MAN} ${WRKSRC}/man/man1/qshape.1 ${MANPREFIX}/man/man1 diff --git a/mail/postfix/distinfo b/mail/postfix/distinfo index 897218a5359f..2b3b3a25a3ce 100644 --- a/mail/postfix/distinfo +++ b/mail/postfix/distinfo @@ -1,6 +1,6 @@ -SHA256 (postfix/postfix-2.8.2.tar.gz) = 9c50dfd0e9520652a1f584f0ca3c7369d3d975e9d0f4d1d74b6c4ae55965248f -SIZE (postfix/postfix-2.8.2.tar.gz) = 3644570 +SHA256 (postfix/postfix-2.8.3.tar.gz) = 288267caede6ea1c4f155855395aa957998909a4968af431b8057062f7d60b49 +SIZE (postfix/postfix-2.8.3.tar.gz) = 3645105 SHA256 (postfix/postfix-2.8.0-libspf2-1.2.x-0.patch.gz) = e5c38e5bc226cab109c02a4e530ab1aefd3bb06f2169f3e052bdf83d2727aacc SIZE (postfix/postfix-2.8.0-libspf2-1.2.x-0.patch.gz) = 8191 -SHA256 (postfix/postfix-vda-2.8.0.patch) = d5f546751a620bf200e8857311f50d11f9a1beaa234f4b25532b6dfdb5e933e5 -SIZE (postfix/postfix-vda-2.8.0.patch) = 59667 +SHA256 (postfix/postfix-vda-v10-2.8.1.patch) = 13ca7430b68dc19e21ee26c1c1109e1527a656777fa2f224cd3ce2d594435f12 +SIZE (postfix/postfix-vda-v10-2.8.1.patch) = 56777 diff --git a/mail/postfix28/Makefile b/mail/postfix28/Makefile index 1b6c9eed1d25..66dd1d58ecfb 100644 --- a/mail/postfix28/Makefile +++ b/mail/postfix28/Makefile @@ -6,7 +6,7 @@ # PORTNAME= postfix -PORTVERSION= 2.8.2 +PORTVERSION= 2.8.3 PORTEPOCH= 1 CATEGORIES= mail ipv6 MASTER_SITES= ftp://ftp.porcupine.org/mirrors/postfix-release/official/ \ @@ -20,7 +20,7 @@ DIST_SUBDIR= ${PORTNAME} MAINTAINER= sahil@FreeBSD.org COMMENT= A secure alternative to widely-used Sendmail -VDAVERSION= 2.8.0 +VDAVERSION= 2.8.1 CONFLICTS= courier-0.* postfix-1.* postfix-2.[0-79].* postfix-base-2.[0-79].* \ postfix-current-2.* postfix-current-base-2.* sendmail-8.* \ sendmail+*-8.* smail-3.* zmailer-2.* @@ -231,7 +231,7 @@ _REQUIRE+= ypserv .if defined(WITH_VDA) PATCH_SITES+= http://vda.sourceforge.net/VDA/:vda -PATCHFILES+= postfix-vda-${VDAVERSION}.patch:vda +PATCHFILES+= postfix-vda-v10-${VDAVERSION}.patch:vda PATCH_DIST_STRIP= -p1 PLIST_SUB+= VDA="" .else @@ -353,9 +353,15 @@ pre-su-install: do-install: @cd ${WRKSRC} && ${SH} postfix-install -non-interactive install_root=/ tempdir=/tmp \ + config_directory=${ETCDIR} \ + command_directory=${PREFIX}/sbin \ daemon_directory=${DAEMONDIR} \ html_directory=${READMEDIR} \ - readme_directory=${READMEDIR} + mailq_path=${PREFIX}/bin/mailq \ + manpage_directory=${MANPREFIX}/man \ + newaliases_path=${PREFIX}/bin/newaliases \ + readme_directory=${READMEDIR} \ + sendmail_path=${PREFIX}/sbin/sendmail ${INSTALL_SCRIPT} ${WRKSRC}/auxiliary/rmail/rmail ${PREFIX}/bin/rmail ${INSTALL_SCRIPT} ${WRKSRC}/auxiliary/qshape/qshape.pl ${PREFIX}/bin/qshape ${INSTALL_MAN} ${WRKSRC}/man/man1/qshape.1 ${MANPREFIX}/man/man1 diff --git a/mail/postfix28/distinfo b/mail/postfix28/distinfo index 897218a5359f..2b3b3a25a3ce 100644 --- a/mail/postfix28/distinfo +++ b/mail/postfix28/distinfo @@ -1,6 +1,6 @@ -SHA256 (postfix/postfix-2.8.2.tar.gz) = 9c50dfd0e9520652a1f584f0ca3c7369d3d975e9d0f4d1d74b6c4ae55965248f -SIZE (postfix/postfix-2.8.2.tar.gz) = 3644570 +SHA256 (postfix/postfix-2.8.3.tar.gz) = 288267caede6ea1c4f155855395aa957998909a4968af431b8057062f7d60b49 +SIZE (postfix/postfix-2.8.3.tar.gz) = 3645105 SHA256 (postfix/postfix-2.8.0-libspf2-1.2.x-0.patch.gz) = e5c38e5bc226cab109c02a4e530ab1aefd3bb06f2169f3e052bdf83d2727aacc SIZE (postfix/postfix-2.8.0-libspf2-1.2.x-0.patch.gz) = 8191 -SHA256 (postfix/postfix-vda-2.8.0.patch) = d5f546751a620bf200e8857311f50d11f9a1beaa234f4b25532b6dfdb5e933e5 -SIZE (postfix/postfix-vda-2.8.0.patch) = 59667 +SHA256 (postfix/postfix-vda-v10-2.8.1.patch) = 13ca7430b68dc19e21ee26c1c1109e1527a656777fa2f224cd3ce2d594435f12 +SIZE (postfix/postfix-vda-v10-2.8.1.patch) = 56777