Update to 2.7.12 and revise the PKGINSTALL script to

distinguish between upgrades and fresh installs.  Also,
backport an upstream patch that allows Postfix packages
to build in a jail that has IPv6 enabled, but no addresses
assigned on any interface.
This commit is contained in:
Sahil Tandon 2013-01-28 02:45:13 +00:00
parent 0095965973
commit e8c48eb21e
Notes: svn2git 2021-03-31 03:12:20 +00:00
svn path=/head/; revision=311092
5 changed files with 35 additions and 12 deletions

View File

@ -6,8 +6,7 @@
#
PORTNAME= postfix
PORTVERSION= 2.7.11
PORTREVISION= 2
PORTVERSION= 2.7.12
PORTEPOCH= 1
CATEGORIES= mail ipv6
MASTER_SITES= ftp://ftp.porcupine.org/mirrors/postfix-release/official/ \

View File

@ -1,5 +1,5 @@
SHA256 (postfix/postfix-2.7.11.tar.gz) = 4acdf4c1313fed9d1c64826607df4c1e9518281e33ded4a740ca5f3ccdc0e44a
SIZE (postfix/postfix-2.7.11.tar.gz) = 3418624
SHA256 (postfix/postfix-2.7.12.tar.gz) = 529eb64c51bafae93ceea0e8d8cb210f74d5b13d89e877c9e79a496db35f41aa
SIZE (postfix/postfix-2.7.12.tar.gz) = 3419280
SHA256 (postfix/postfix-2.7.1-libspf2-1.2.x-4.patch.gz) = b67efb1ffbcae91f13bf3ed90a5181d4b5bc86ebe15753eaf9db8b2278f5bb16
SIZE (postfix/postfix-2.7.1-libspf2-1.2.x-4.patch.gz) = 8186
SHA256 (postfix/postfix-vda-v10-2.7.8.patch) = 10738a30f2cb00cd05c593caf5b4b9d4ca44927432c1995a9db5c3557d0528db

View File

@ -0,0 +1,20 @@
--- src/util/inet_proto.c.orig 2013-01-27 20:31:06.000000000 +0000
+++ src/util/inet_proto.c 2013-01-27 20:31:41.000000000 +0000
@@ -205,7 +205,7 @@
pf->dns_atype_list = make_unsigned_vector(2, T_AAAA, 0);
pf->sa_family_list = make_uchar_vector(2, AF_INET6, 0);
break;
- } else if (errno == EAFNOSUPPORT) {
+ } else if (errno == EAFNOSUPPORT || errno == EPROTONOSUPPORT) {
msg_fatal("%s: IPv6 support is disabled: %m", context);
} else {
msg_fatal("socket: %m");
@@ -219,7 +219,7 @@
pf->dns_atype_list = make_unsigned_vector(3, T_A, T_AAAA, 0);
pf->sa_family_list = make_uchar_vector(3, AF_INET, AF_INET6, 0);
break;
- } else if (errno == EAFNOSUPPORT) {
+ } else if (errno == EAFNOSUPPORT || errno == EPROTONOSUPPORT) {
msg_warn("%s: IPv6 support is disabled: %m", context);
msg_warn("%s: configuring for IPv4 support only", context);
/* FALLTHROUGH */

View File

@ -1,10 +1,10 @@
--- src/util/sys_defs.h.orig 2011-03-01 19:35:19.000000000 -0500
+++ src/util/sys_defs.h 2011-03-01 19:36:54.000000000 -0500
--- src/util/sys_defs.h.orig 2013-01-27 20:30:58.000000000 +0000
+++ src/util/sys_defs.h 2013-01-27 20:32:04.000000000 +0000
@@ -25,7 +25,7 @@
*/
#if defined(FREEBSD2) || defined(FREEBSD3) || defined(FREEBSD4) \
|| defined(FREEBSD5) || defined(FREEBSD6) || defined(FREEBSD7) \
- || defined(FREEBSD8) \
- || defined(FREEBSD8) || defined(FREEBSD9) \
+ || defined(FREEBSD8) || defined(FREEBSD9) || defined(FREEBSD10) \
|| defined(BSDI2) || defined(BSDI3) || defined(BSDI4) \
|| defined(OPENBSD2) || defined(OPENBSD3) || defined(OPENBSD4) \

View File

@ -65,11 +65,15 @@ if [ "$2" = "POST-INSTALL" ]; then
fi
done
/bin/sh ${DAEMONDIR}/post-install tempdir=/tmp \
daemon_directory=${DAEMONDIR} \
html_directory=${READMEDIR} \
readme_directory=${READMEDIR} \
upgrade-package
cmp ${DAEMONDIR}/main.cf ${ETCDIR}/main.cf >/dev/null 2>&1 \
&& POSTARG="set-permissions" \
|| POSTARG="upgrade-package"
/bin/sh ${DAEMONDIR}/post-install tempdir=/tmp \
daemon_directory=${DAEMONDIR} \
html_directory=${READMEDIR} \
readme_directory=${READMEDIR} \
${POSTARG}
fi
if [ "$2" = "POST-INSTALL" -a -z "${PACKAGE_BUILDING}" -a -f "${MC}" ]; then