From owner-svn-ports-head@FreeBSD.ORG Mon Jan 28 02:44:35 2013
Return-Path: <owner-svn-ports-head@FreeBSD.ORG>
Delivered-To: svn-ports-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
[IPv6:2001:1900:2254:206a::19:1])
by hub.freebsd.org (Postfix) with ESMTP id 7F141BD8;
Mon, 28 Jan 2013 02:44:35 +0000 (UTC)
(envelope-from sahil@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org
[IPv6:2001:1900:2254:2068::e6a:0])
by mx1.freebsd.org (Postfix) with ESMTP id 58AEB28A;
Mon, 28 Jan 2013 02:44:35 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
by svn.freebsd.org (8.14.5/8.14.5) with ESMTP id r0S2iZbg087988;
Mon, 28 Jan 2013 02:44:35 GMT (envelope-from sahil@svn.freebsd.org)
Received: (from sahil@localhost)
by svn.freebsd.org (8.14.5/8.14.5/Submit) id r0S2iYcr087983;
Mon, 28 Jan 2013 02:44:34 GMT (envelope-from sahil@svn.freebsd.org)
Message-Id: <201301280244.r0S2iYcr087983@svn.freebsd.org>
From: Sahil Tandon <sahil@FreeBSD.org>
Date: Mon, 28 Jan 2013 02:44:34 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
svn-ports-head@freebsd.org
Subject: svn commit: r311091 - in head/mail/postfix26: . files
X-SVN-Group: ports-head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-ports-head@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: SVN commit messages for the ports tree for head
<svn-ports-head.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-ports-head>,
<mailto:svn-ports-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-ports-head>
List-Post: <mailto:svn-ports-head@freebsd.org>
List-Help: <mailto:svn-ports-head-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-ports-head>,
<mailto:svn-ports-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Mon, 28 Jan 2013 02:44:35 -0000
Author: sahil
Date: Mon Jan 28 02:44:33 2013
New Revision: 311091
URL: http://svnweb.freebsd.org/changeset/ports/311091
Log:
Update to 2.6.18 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.
Added:
head/mail/postfix26/files/patch-src-util-inet_proto.c (contents, props changed)
Modified:
head/mail/postfix26/Makefile
head/mail/postfix26/distinfo
head/mail/postfix26/files/patch-src::util::sys_defs.h
head/mail/postfix26/files/pkg-install.in
Modified: head/mail/postfix26/Makefile
==============================================================================
--- head/mail/postfix26/Makefile Mon Jan 28 02:44:04 2013 (r311090)
+++ head/mail/postfix26/Makefile Mon Jan 28 02:44:33 2013 (r311091)
@@ -6,8 +6,7 @@
#
PORTNAME= postfix
-PORTVERSION= 2.6.17
-PORTREVISION= 2
+PORTVERSION= 2.6.18
PORTEPOCH= 1
CATEGORIES= mail ipv6
MASTER_SITES= ftp://ftp.porcupine.org/mirrors/postfix-release/official/ \
Modified: head/mail/postfix26/distinfo
==============================================================================
--- head/mail/postfix26/distinfo Mon Jan 28 02:44:04 2013 (r311090)
+++ head/mail/postfix26/distinfo Mon Jan 28 02:44:33 2013 (r311091)
@@ -1,4 +1,4 @@
-SHA256 (postfix/postfix-2.6.17.tar.gz) = b7c34426bcdaa748ebc66a14b17266706f8049a9e21f3e055586bceffd02d10f
-SIZE (postfix/postfix-2.6.17.tar.gz) = 3327385
+SHA256 (postfix/postfix-2.6.18.tar.gz) = fdefebe46f6398f3feef5d6c58dfe6a26ccf283bb9361b6225c5cccd2a7aeb9e
+SIZE (postfix/postfix-2.6.18.tar.gz) = 3327921
SHA256 (postfix/postfix-2.6.5-vda-ng.patch.gz) = e1c04e9d268dc84832334997e1f593af9877dbd5030708280427a0dc4452e797
SIZE (postfix/postfix-2.6.5-vda-ng.patch.gz) = 12435
Added: head/mail/postfix26/files/patch-src-util-inet_proto.c
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/mail/postfix26/files/patch-src-util-inet_proto.c Mon Jan 28 02:44:33 2013 (r311091)
@@ -0,0 +1,20 @@
+--- src/util/inet_proto.c.orig 2013-01-27 20:38:42.000000000 +0000
++++ src/util/inet_proto.c 2013-01-27 20:39:54.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 */
Modified: head/mail/postfix26/files/patch-src::util::sys_defs.h
==============================================================================
--- head/mail/postfix26/files/patch-src::util::sys_defs.h Mon Jan 28 02:44:04 2013 (r311090)
+++ head/mail/postfix26/files/patch-src::util::sys_defs.h Mon Jan 28 02:44:33 2013 (r311091)
@@ -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:38:47.000000000 +0000
++++ src/util/sys_defs.h 2013-01-27 20:39:28.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) \
Modified: head/mail/postfix26/files/pkg-install.in
==============================================================================
--- head/mail/postfix26/files/pkg-install.in Mon Jan 28 02:44:04 2013 (r311090)
+++ head/mail/postfix26/files/pkg-install.in Mon Jan 28 02:44:33 2013 (r311091)
@@ -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