diff options
| author | Sahil Tandon <sahil@FreeBSD.org> | 2013-01-28 02:45:24 +0000 |
|---|---|---|
| committer | Sahil Tandon <sahil@FreeBSD.org> | 2013-01-28 02:45:24 +0000 |
| commit | 9cf3da16705555855c566320ff78f97008135ff2 (patch) | |
| tree | 23a7a065e2c03104afdb427efb32a29ad6cd7345 /mail/postfix28/files | |
| parent | e8c48eb21e78aff916cfa9c7879601d8bd25a509 (diff) | |
Notes
Diffstat (limited to 'mail/postfix28/files')
| -rw-r--r-- | mail/postfix28/files/patch-src-util-inet_proto.c | 20 | ||||
| -rw-r--r-- | mail/postfix28/files/patch-src::util::sys_defs.h | 8 | ||||
| -rw-r--r-- | mail/postfix28/files/pkg-install.in | 16 |
3 files changed, 33 insertions, 11 deletions
diff --git a/mail/postfix28/files/patch-src-util-inet_proto.c b/mail/postfix28/files/patch-src-util-inet_proto.c new file mode 100644 index 000000000000..b8578a3ab9e7 --- /dev/null +++ b/mail/postfix28/files/patch-src-util-inet_proto.c @@ -0,0 +1,20 @@ +--- src/util/inet_proto.c.orig 2013-01-27 19:07:09.000000000 +0000 ++++ src/util/inet_proto.c 2013-01-27 19:08:12.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 */ diff --git a/mail/postfix28/files/patch-src::util::sys_defs.h b/mail/postfix28/files/patch-src::util::sys_defs.h index a13c320759ff..76df458b53b2 100644 --- a/mail/postfix28/files/patch-src::util::sys_defs.h +++ b/mail/postfix28/files/patch-src::util::sys_defs.h @@ -1,11 +1,11 @@ ---- 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 19:14:53.000000000 +0000 ++++ src/util/sys_defs.h 2013-01-27 19:15:20.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) \ - || defined(NETBSD1) || defined(NETBSD2) || defined(NETBSD3) \ + || defined(OPENBSD5) \ diff --git a/mail/postfix28/files/pkg-install.in b/mail/postfix28/files/pkg-install.in index 91011cc3301a..1be5afe2e2a4 100644 --- a/mail/postfix28/files/pkg-install.in +++ b/mail/postfix28/files/pkg-install.in @@ -56,7 +56,6 @@ yesno() { done } - if [ "$2" = "POST-INSTALL" ]; then SAMPLES="main.cf master.cf" for file in $SAMPLES @@ -66,13 +65,16 @@ 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 -fi + 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 egrep -q "^sendmail.*${PREFIX}/sbin/sendmail" ${MC} && \ |