--- a/components/postfix/Makefile Wed Mar 30 22:54:17 2016 -0700
+++ b/components/postfix/Makefile Fri Apr 01 19:25:24 2016 -0700
@@ -22,17 +22,20 @@
#
# Copyright (c) 2014, 2016, Oracle and/or its affiliates. All rights reserved.
#
+
BUILD_BITS= 64
+COMPILER = gcc
+
include ../../make-rules/shared-macros.mk
COMPONENT_NAME= postfix
-COMPONENT_VERSION= 2.11.3
+COMPONENT_VERSION= 3.1.0
COMPONENT_PROJECT_URL= http://www.postfix.org
COMPONENT_ARCHIVE_HASH= \
- sha256:04e5146e6e56261baae9f63c590348a4b12ce22d3d46260e26e97233f40802c3
+ sha256:88ac3e92755629077d9363319b1fa0db406efb10c2f22cdbb941bd8ab36fd733
COMPONENT_ARCHIVE_URL= http://mirrors-usa.go-parts.com/$(COMPONENT_NAME)/source/official/$(COMPONENT_ARCHIVE)
-TPNO= 7492
+TPNO= 27578
BUILD_STYLE= justmake
TEST_TARGET= $(NO_TESTS)
@@ -69,6 +72,7 @@
REQUIRED_PACKAGES += database/berkeleydb-5
REQUIRED_PACKAGES += database/sqlite-3
+REQUIRED_PACKAGES += library/icu
REQUIRED_PACKAGES += library/pcre
REQUIRED_PACKAGES += library/security/openssl
REQUIRED_PACKAGES += shell/ksh93
--- a/components/postfix/patches/01-solaris-makedefs.patch Wed Mar 30 22:54:17 2016 -0700
+++ b/components/postfix/patches/01-solaris-makedefs.patch Fri Apr 01 19:25:24 2016 -0700
@@ -1,8 +1,8 @@
Upstream contribution is planned but has not yet occurred.
---- postfix-2.11.1/makedefs.orig 2014-01-16 11:49:11.000000000 -0800
-+++ postfix-2.11.1/makedefs 2014-09-19 13:43:56.091926293 -0700
-@@ -217,9 +217,13 @@
+--- postfix-3.1.0/makedefs.~1~ 2016-02-21 14:39:45.000000000 -0800
++++ postfix-3.1.0/makedefs 2016-04-01 17:53:50.389724370 -0700
+@@ -358,15 +358,22 @@
case $RELEASE in
5.[0-8]|5.[0-8].*) CCARGS="$CCARGS -DNO_CLOSEFROM -DNO_DEV_URANDOM -DNO_FUTIMESAT -DSTREAM_CONNECTIONS";;
esac
@@ -15,6 +15,20 @@
+ # libsocket & libnsl were merged into libc in Solaris 12.
+ case $RELEASE in
+ 5.1[2-9]*) SYSLIBS="-lresolv -ldl"
++ esac
++ # Work around broken str*casecmp(), fixed in Solaris 9. Do
++ # it all here instead of having half the solution in the
++ # sys_defs.h file.
++ case $RELEASE in
++ 5.[0-8]|5.[0-8].*) CCARGS="$CCARGS -Dstrcasecmp=fix_strcasecmp -Dstrncasecmp=fix_strncasecmp"
++ STRCASE="strcasecmp.o"
++ ;;
esac
- # Work around broken str*casecmp(). Do it all here instead
- # of having half the solution in the sys_defs.h file.
+- # Work around broken str*casecmp(). Do it all here instead
+- # of having half the solution in the sys_defs.h file.
+- CCARGS="$CCARGS -Dstrcasecmp=fix_strcasecmp \
+- -Dstrncasecmp=fix_strncasecmp"
+- STRCASE="strcasecmp.o"
+ # Avoid common types of braindamage
+ case "$LD_LIBRARY_PATH" in
+ ?*) error "Don't set LD_LIBRARY_PATH";;
--- a/components/postfix/patches/03-smf-man-tweaks.patch Wed Mar 30 22:54:17 2016 -0700
+++ b/components/postfix/patches/03-smf-man-tweaks.patch Fri Apr 01 19:25:24 2016 -0700
@@ -1,8 +1,11 @@
---- postfix-2.11.3/man/man1/postfix.1.orig 2013-11-21 17:40:50.000000000 -0800
-+++ postfix-2.11.3/man/man1/postfix.1 2015-04-08 14:41:28.034168740 -0700
-@@ -101,6 +101,34 @@
- .IP \fB-v\fR
- Enable verbose logging for debugging purposes. Multiple \fB-v\fR
+This patch was developed in-house. As it is Solaris-specific, it is not
+appropriate for upstream.
+
+--- postfix-3.1.0/man/man1/postfix.1.~1~ 2016-02-14 07:29:27.000000000 -0800
++++ postfix-3.1.0/man/man1/postfix.1 2016-03-29 14:19:02.352177106 -0700
+@@ -107,6 +107,34 @@
+ .IP \fB\-v\fR
+ Enable verbose logging for debugging purposes. Multiple \fB\-v\fR
options make the software increasingly verbose.
+.SS "Service Management"
+.sp
--- a/components/postfix/postfix.p5m Wed Mar 30 22:54:17 2016 -0700
+++ b/components/postfix/postfix.p5m Fri Apr 01 19:25:24 2016 -0700
@@ -51,8 +51,12 @@
file path=etc/postfix/header_checks mode=0644 preserve=true
file path=etc/postfix/main.cf mode=0644 preserve=true
file path=etc/postfix/main.cf.default
+file path=etc/postfix/main.cf.proto mode=0444
file path=etc/postfix/makedefs.out
file path=etc/postfix/master.cf mode=0644 preserve=true
+file path=etc/postfix/master.cf.proto mode=0444
+file path=etc/postfix/postfix-files
+dir path=etc/postfix/postfix-files.d
file path=etc/postfix/relocated mode=0644 preserve=true
file path=etc/postfix/transport mode=0644 preserve=true
file path=etc/postfix/virtual mode=0644 preserve=true
@@ -73,15 +77,12 @@
file path=usr/lib/postfix/flush
hardlink path=usr/lib/postfix/lmtp target=smtp
file path=usr/lib/postfix/local
-file path=usr/lib/postfix/main.cf mode=0444
file path=usr/lib/postfix/master
-file path=usr/lib/postfix/master.cf mode=0444
file path=usr/lib/postfix/nqmgr
file path=usr/lib/postfix/oqmgr
file path=usr/lib/postfix/pickup
file path=usr/lib/postfix/pipe
file path=usr/lib/postfix/post-install
-file path=usr/lib/postfix/postfix-files
file path=usr/lib/postfix/postfix-script
file path=usr/lib/postfix/postfix-wrapper
file path=usr/lib/postfix/postmulti-script