[132889] trunk/dports/mail/postfix
jmr at macports.org
jmr at macports.org
Wed Feb 11 21:58:37 PST 2015
Revision: 132889
https://trac.macports.org/changeset/132889
Author: jmr at macports.org
Date: 2015-02-11 21:58:37 -0800 (Wed, 11 Feb 2015)
Log Message:
-----------
postfix: update to 3.0.0
Modified Paths:
--------------
trunk/dports/mail/postfix/Portfile
trunk/dports/mail/postfix/files/patch-mail_params.h
trunk/dports/mail/postfix/files/patch-makedefs
trunk/dports/mail/postfix/files/patch-sys_defs.h
Added Paths:
-----------
trunk/dports/mail/postfix/files/patch-postfix-script
Modified: trunk/dports/mail/postfix/Portfile
===================================================================
--- trunk/dports/mail/postfix/Portfile 2015-02-12 04:13:54 UTC (rev 132888)
+++ trunk/dports/mail/postfix/Portfile 2015-02-12 05:58:37 UTC (rev 132889)
@@ -3,7 +3,7 @@
PortSystem 1.0
name postfix
-version 2.11.3
+version 3.0.0
categories mail
license IBMPL-1
maintainers jmr openmaintainer
@@ -15,8 +15,8 @@
Postfix act as delivery daemon for ezmlm-idx.
homepage http://www.postfix.org/
platforms darwin
-checksums rmd160 9d1f44fc3c772a04a2ecce579c5b8d1feffd6e14 \
- sha256 04e5146e6e56261baae9f63c590348a4b12ce22d3d46260e26e97233f40802c3
+checksums rmd160 6fdfd66f3e6c5029dd4d1c14f40ec86308266ba8 \
+ sha256 c2f2f10aa3e6b7090ba979e9c515e42b3140c5c1c17a33d58787569df7ae0955
master_sites http://archive.mgm51.com/mirrors/postfix-source/official/ \
http://de.postfix.org/ftpmirror/official/ \
@@ -27,20 +27,18 @@
http://cdn.postfix.johnriley.me/mirrors/postfix-release/official/
patchfiles patch-sys_defs.h patch-mail_params.h patch-postfix-install \
- patch-makedefs
+ patch-makedefs patch-postfix-script
post-patch {
- eval reinplace "s|/etc/|${prefix}/etc/|g" \
- [glob ${worksrcpath}/man/man1/*] \
- [glob ${worksrcpath}/man/man5/*] \
- [glob ${worksrcpath}/man/man8/*]
+ reinplace "s|/etc/|${prefix}/etc/|g" \
+ {*}[glob ${worksrcpath}/man/man1/*] \
+ {*}[glob ${worksrcpath}/man/man5/*] \
+ {*}[glob ${worksrcpath}/man/man8/*]
reinplace "s|__PREFIX|${prefix}|g" ${worksrcpath}/src/util/sys_defs.h \
- ${worksrcpath}/src/global/mail_params.h
+ ${worksrcpath}/src/global/mail_params.h \
+ ${worksrcpath}/makedefs
- reinplace "s|ls |/bin/ls |g" \
- ${worksrcpath}/conf/postfix-script
-
# Set main.cf default values
reinplace "s|#default_privs|default_privs|g" \
${worksrcpath}/conf/main.cf
@@ -54,8 +52,8 @@
${worksrcpath}/conf/main.cf
}
-set CCARGS [list -DNO_PCRE]
-set AUXLIBS [list "-L${prefix}/lib"]
+set CCARGS [list -DNO_EAI -DNO_PCRE]
+set AUXLIBS [list -L${prefix}/lib]
if {[variant_isset universal]} {
set CCARGS [concat ${CCARGS} ${configure.universal_cflags}]
set AUXLIBS [concat ${AUXLIBS} ${configure.universal_ldflags}]
@@ -63,23 +61,19 @@
set CCARGS [concat ${CCARGS} ${configure.cc_archflags}]
set AUXLIBS [concat ${AUXLIBS} ${configure.ld_archflags}]
}
-set pf_mail_owner "_postfix"
-set pf_setgid_group "_postdrop"
+set pf_mail_owner _postfix
+set pf_setgid_group _postdrop
set config_files [list main.cf master.cf access aliases canonical generic \
header_checks relocated transport virtual]
# Beginning with Mac OS X 10.5, the user 'postfix' changed to '_postfix'
platform darwin 8 {
- set pf_mail_owner "postfix"
- set pf_setgid_group "postdrop"
+ set pf_mail_owner postfix
+ set pf_setgid_group postdrop
}
-if {${os.major} >= 10 && ${os.platform} eq "darwin"} {
- lappend AUXLIBS -lresolv
-}
-
configure {
- system "cd ${worksrcpath} && ${build.cmd} makefiles CC='${configure.cc}' \
+ system -W ${worksrcpath} "${build.cmd} makefiles CC='${configure.cc}' \
OPT='${configure.optflags}' CCARGS='${CCARGS}' AUXLIBS='${AUXLIBS}'"
}
@@ -93,7 +87,7 @@
destroot.keepdirs ${destroot}${prefix}/var/spool/postfix/public \
${destroot}${prefix}/var/spool/postfix/maildrop \
${destroot}${prefix}/var/lib/postfix
- system "cd ${worksrcpath} && /bin/sh postfix-install -non-interactive \
+ system -W ${worksrcpath} "/bin/sh postfix-install -non-interactive \
install_root=${destroot} \
config_directory=${prefix}/etc/postfix \
queue_directory=${prefix}/var/spool/postfix \
@@ -105,6 +99,7 @@
mailq_path=${prefix}/bin/mailq \
etc_directory=${prefix}/etc/postfix \
share_directory=${prefix}/share/postfix \
+ shlib_directory=${prefix}/lib/postfix \
manpage_directory=${prefix}/share/man \
sample_directory=${prefix}/share/postfix/sample \
readme_directory=${prefix}/share/postfix/readme \
@@ -149,102 +144,108 @@
sudo launchctl unload -w /System/Library/LaunchDaemons/org.postfix.master.plist
"
+variant dovecot_sasl description "add Dovecot SASL support" {
+ lappend CCARGS -DUSE_SASL_AUTH -DDEF_SERVER_SASL_TYPE="dovecot"
+}
+
+variant ldap description "add ldap support via openldap" {
+ depends_lib-append port:openldap
+ lappend CCARGS -DHAS_LDAP
+ lappend AUXLIBS -lldap -llber
+}
+
variant pcre description "add pcre support" {
set CCARGS [ldelete ${CCARGS} -DNO_PCRE]
- lappend CCARGS -DHAS_PCRE "-I${prefix}/include"
- lappend AUXLIBS "-L${prefix}/lib" -lpcre
+ lappend CCARGS -DHAS_PCRE -I${prefix}/include
+ lappend AUXLIBS -lpcre
depends_lib-append port:pcre
}
-variant tls description "add tls support via openssl" {
- depends_lib-append port:openssl
- lappend CCARGS -DUSE_TLS -DHAS_SSL "-I${prefix}/include"
- lappend AUXLIBS -lssl -lcrypto
-}
-
variant sasl description "add sasl support via cyrus-sasl2" {
depends_lib-append port:cyrus-sasl2
- lappend CCARGS -DUSE_CYRUS_SASL -DUSE_SASL_AUTH "-I${prefix}/include/sasl"
+ lappend CCARGS -DUSE_CYRUS_SASL -DUSE_SASL_AUTH -I${prefix}/include/sasl
lappend AUXLIBS -lsasl2
}
-variant ldap description "add ldap support via openldap" {
- depends_lib-append port:openldap
- lappend CCARGS -DHAS_LDAP
- lappend AUXLIBS -lldap -llber
+variant smtputf8 description "add support for UTF-8 email addresses and headers (EAI) via icu" {
+ depends_lib-append port:icu
+ set CCARGS [ldelete ${CCARGS} -DNO_EAI]
+ lappend CCARGS -I${prefix}/include
}
+variant tls description "add tls support via openssl" {
+ depends_lib-append port:openssl
+ lappend CCARGS -DUSE_TLS -DHAS_SSL -I${prefix}/include
+ lappend AUXLIBS -lssl -lcrypto
+}
+
# Keep the mysql5 variant until the mysql5 port is replaced_by mysql51 port.
variant mysql5 conflicts mysql51 mysql55 mysql56 mariadb percona description "add MySQL support via mysql5" {
depends_lib-append path:bin/mysql_config5:mysql5
- lappend CCARGS -DHAS_MYSQL "-I${prefix}/include/mysql5/mysql"
- lappend AUXLIBS "-L${prefix}/lib/mysql5/mysql" -lmysqlclient -lz -lm
+ lappend CCARGS -DHAS_MYSQL -I${prefix}/include/mysql5/mysql
+ lappend AUXLIBS -L${prefix}/lib/mysql5/mysql -lmysqlclient -lz -lm
}
variant mysql51 conflicts mysql5 mysql55 mysql56 mariadb percona description "add MySQL support via mysql51" {
depends_lib-append port:mysql51
- lappend CCARGS -DHAS_MYSQL "-I${prefix}/include/mysql51/mysql"
- lappend AUXLIBS "-L${prefix}/lib/mysql51/mysql" -lmysqlclient -lz -lm
+ lappend CCARGS -DHAS_MYSQL -I${prefix}/include/mysql51/mysql
+ lappend AUXLIBS -L${prefix}/lib/mysql51/mysql -lmysqlclient -lz -lm
}
variant mysql55 conflicts mysql5 mysql51 mysql56 mariadb percona description "add MySQL support via mysql55" {
depends_lib-append port:mysql55
- lappend CCARGS -DHAS_MYSQL "-I${prefix}/include/mysql55/mysql"
- lappend AUXLIBS "-L${prefix}/lib/mysql55/mysql" -lmysqlclient -lz -lm
+ lappend CCARGS -DHAS_MYSQL -I${prefix}/include/mysql55/mysql
+ lappend AUXLIBS -L${prefix}/lib/mysql55/mysql -lmysqlclient -lz -lm
}
variant mysql56 conflicts mysql5 mysql51 mysql55 mariadb percona description "add MySQL support via mysql56" {
depends_lib-append port:mysql56
- lappend CCARGS -DHAS_MYSQL "-I${prefix}/include/mysql56/mysql"
- lappend AUXLIBS "-L${prefix}/lib/mysql56/mysql" -lmysqlclient -lz -lm
+ lappend CCARGS -DHAS_MYSQL -I${prefix}/include/mysql56/mysql
+ lappend AUXLIBS -L${prefix}/lib/mysql56/mysql -lmysqlclient -lz -lm
}
variant mariadb conflicts mysql5 mysql51 mysql55 mysql56 percona description "add MySQL support via mariadb" {
depends_lib-append port:mariadb
- lappend CCARGS -DHAS_MYSQL "-I${prefix}/include/mariadb/mysql"
- lappend AUXLIBS "-L${prefix}/lib/mariadb/mysql" -lmysqlclient -lz -lm
+ lappend CCARGS -DHAS_MYSQL -I${prefix}/include/mariadb/mysql
+ lappend AUXLIBS -L${prefix}/lib/mariadb/mysql -lmysqlclient -lz -lm
}
variant percona conflicts mysql5 mysql51 mysql55 mysql56 mariadb description "add MySQL support via percona" {
depends_lib-append port:percona
- lappend CCARGS -DHAS_MYSQL "-I${prefix}/include/percona/mysql"
- lappend AUXLIBS "-L${prefix}/lib/percona/mysql" -lmysqlclient -lz -lm
+ lappend CCARGS -DHAS_MYSQL -I${prefix}/include/percona/mysql
+ lappend AUXLIBS -L${prefix}/lib/percona/mysql -lmysqlclient -lz -lm
}
variant postgresql83 conflicts postgresql84 postgresql90 postgresql91 postgresql92 description "add postgresql support via postgresql83" {
depends_lib-append port:postgresql83
- lappend CCARGS -DHAS_PGSQL "-I${prefix}/include/postgresql83"
- lappend AUXLIBS "-L${prefix}/lib/postgresql83" -lpq
+ lappend CCARGS -DHAS_PGSQL -I${prefix}/include/postgresql83
+ lappend AUXLIBS -L${prefix}/lib/postgresql83 -lpq
}
variant postgresql84 conflicts postgresql83 postgresql90 postgresql91 postgresql92 description "add postgresql support via postgresql84" {
depends_lib-append port:postgresql84
- lappend CCARGS -DHAS_PGSQL "-I${prefix}/include/postgresql84"
- lappend AUXLIBS "-L${prefix}/lib/postgresql84" -lpq
+ lappend CCARGS -DHAS_PGSQL -I${prefix}/include/postgresql84
+ lappend AUXLIBS -L${prefix}/lib/postgresql84 -lpq
}
variant postgresql90 conflicts postgresql83 postgresql84 postgresql91 postgresql92 description "add postgresql support via postgresql90" {
depends_lib-append port:postgresql90
- lappend CCARGS -DHAS_PGSQL "-I${prefix}/include/postgresql90"
- lappend AUXLIBS "-L${prefix}/lib/postgresql90" -lpq
+ lappend CCARGS -DHAS_PGSQL -I${prefix}/include/postgresql90
+ lappend AUXLIBS -L${prefix}/lib/postgresql90 -lpq
}
variant postgresql91 conflicts postgresql83 postgresql84 postgresql90 postgresql92 description "add postgresql support via postgresql91" {
depends_lib-append port:postgresql91
- lappend CCARGS -DHAS_PGSQL "-I${prefix}/include/postgresql91"
- lappend AUXLIBS "-L${prefix}/lib/postgresql91" -lpq
+ lappend CCARGS -DHAS_PGSQL -I${prefix}/include/postgresql91
+ lappend AUXLIBS -L${prefix}/lib/postgresql91 -lpq
}
variant postgresql92 conflicts postgresql83 postgresql84 postgresql90 postgresql91 description "add postgresql support via postgresql92" {
depends_lib-append port:postgresql92
- lappend CCARGS -DHAS_PGSQL "-I${prefix}/include/postgresql92"
- lappend AUXLIBS "-L${prefix}/lib/postgresql92" -lpq
+ lappend CCARGS -DHAS_PGSQL -I${prefix}/include/postgresql92
+ lappend AUXLIBS -L${prefix}/lib/postgresql92 -lpq
}
-variant dovecot_sasl description "add Dovecot SASL support" {
- lappend CCARGS -DUSE_SASL_AUTH -DDEF_SERVER_SASL_TYPE="dovecot"
-}
-
livecheck.type regex
livecheck.url ftp://ftp.porcupine.org/mirrors/postfix-release/official/
livecheck.regex ${name}-(\[0-9.\]+)${extract.suffix}
Modified: trunk/dports/mail/postfix/files/patch-mail_params.h
===================================================================
--- trunk/dports/mail/postfix/files/patch-mail_params.h 2015-02-12 04:13:54 UTC (rev 132888)
+++ trunk/dports/mail/postfix/files/patch-mail_params.h 2015-02-12 05:58:37 UTC (rev 132889)
@@ -1,6 +1,6 @@
---- src/global/mail_params.h 2013-09-05 12:24:12.000000000 -0700
-+++ src/global/mail_params.h.new 2013-09-05 12:22:41.000000000 -0700
-@@ -241,7 +241,7 @@
+--- src/global/mail_params.h.orig 2015-01-18 11:06:00.000000000 +1100
++++ src/global/mail_params.h 2015-02-12 15:50:26.000000000 +1100
+@@ -269,7 +269,7 @@ extern int var_smtp_mxsess_limit;
*/
#define VAR_QUEUE_DIR "queue_directory"
#ifndef DEF_QUEUE_DIR
@@ -9,7 +9,7 @@
#endif
extern char *var_queue_dir;
-@@ -250,13 +250,13 @@
+@@ -278,13 +278,13 @@ extern char *var_queue_dir;
*/
#define VAR_DAEMON_DIR "daemon_directory"
#ifndef DEF_DAEMON_DIR
@@ -25,8 +25,17 @@
#endif
extern char *var_command_dir;
-@@ -288,7 +288,7 @@
+@@ -302,7 +302,7 @@ extern char *var_pid_dir;
*/
+ #define VAR_DATA_DIR "data_directory"
+ #ifndef DEF_DATA_DIR
+-#define DEF_DATA_DIR "/var/lib/postfix"
++#define DEF_DATA_DIR "__PREFIX/var/lib/postfix"
+ #endif
+ extern char *var_data_dir;
+
+@@ -316,7 +316,7 @@ extern time_t var_starttime;
+ */
#define VAR_CONFIG_DIR "config_directory"
#ifndef DEF_CONFIG_DIR
-#define DEF_CONFIG_DIR "/etc/postfix"
@@ -34,7 +43,7 @@
#endif
extern char *var_config_dir;
-@@ -2489,22 +2489,22 @@
+@@ -2589,22 +2589,22 @@ extern int var_fault_inj_code;
*/
#define VAR_SENDMAIL_PATH "sendmail_path"
#ifndef DEF_SENDMAIL_PATH
@@ -61,3 +70,12 @@
#endif
#define VAR_SAMPLE_DIR "sample_directory"
+@@ -3881,7 +3881,7 @@ extern char *var_smtpd_dns_re_filter;
+ */
+ #define VAR_SHLIB_DIR "shlib_directory"
+ #ifndef DEF_SHLIB_DIR
+-#define DEF_SHLIB_DIR "/usr/lib/postfix"
++#define DEF_SHLIB_DIR "__PREFIX/lib/postfix"
+ #endif
+ extern char *var_shlib_dir;
+
Modified: trunk/dports/mail/postfix/files/patch-makedefs
===================================================================
--- trunk/dports/mail/postfix/files/patch-makedefs 2015-02-12 04:13:54 UTC (rev 132888)
+++ trunk/dports/mail/postfix/files/patch-makedefs 2015-02-12 05:58:37 UTC (rev 132889)
@@ -1,6 +1,6 @@
---- makedefs.orig 2014-01-06 04:18:56.000000000 +1100
-+++ makedefs 2014-01-17 15:34:50.000000000 +1100
-@@ -474,8 +474,7 @@
+--- makedefs.orig 2015-02-09 06:25:15.000000000 +1100
++++ makedefs 2015-02-12 16:37:09.000000000 +1100
+@@ -619,8 +619,7 @@
# Darwin > 1.3 uses awk and flat_namespace
case $RELEASE in
1.[0-3]) AWK=gawk;;
@@ -10,3 +10,29 @@
esac
# Darwin 7 adds IPv6 support, BIND_8_COMPAT, NO_NETINFO
case $RELEASE in
+@@ -636,9 +635,9 @@
+ ?.*) CCARGS="$CCARGS -DRESOLVE_H_NEEDS_NAMESER8_COMPAT_H";;
+ *) CCARGS="$CCARGS -DRESOLVE_H_NEEDS_ARPA_NAMESER_COMPAT_H";;
+ esac
+- # Darwin 11.x (MacOS X 10.7.x), maybe earlier, needs libresolv.
++ # Darwin 10.x (Mac OS X 10.6.x) and later needs libresolv.
+ case $RELEASE in
+- ?.*|10.*) ;;
++ ?.*) ;;
+ *) SYSLIBS="$SYSLIBS -lresolv";;
+ esac
+ # kqueue and/or poll are broken in MacOS X 10.5 (Darwin 9).
+@@ -753,10 +752,10 @@
+ &error) != 14);
+ }
+ EOF
+- ${CC-gcc} -o makedefs.test makedefs.test.c -I/usr/local/include \
+- -L/usr/local/lib -licuuc >/dev/null 2>&1
++ ${CC-gcc} -o makedefs.test makedefs.test.c -I__PREFIX/include \
++ -L__PREFIX/lib -licuuc >/dev/null 2>&1
+ if ./makedefs.test 2>/dev/null ; then
+- SYSLIBS="$SYSLIBS -L/usr/local/lib -licuuc"
++ SYSLIBS="$SYSLIBS -L__PREFIX/lib -licuuc"
+ else
+ CCARGS="$CCARGS -DNO_EAI"
+ fi
Added: trunk/dports/mail/postfix/files/patch-postfix-script
===================================================================
--- trunk/dports/mail/postfix/files/patch-postfix-script (rev 0)
+++ trunk/dports/mail/postfix/files/patch-postfix-script 2015-02-12 05:58:37 UTC (rev 132889)
@@ -0,0 +1,11 @@
+--- conf/postfix-script.orig 2014-06-28 00:05:15.000000000 +1000
++++ conf/postfix-script 2015-02-12 15:38:30.000000000 +1100
+@@ -288,7 +288,7 @@
+
+ # Check Postfix mail_owner-owned directory tree owner.
+
+- find `ls -d $queue_directory/* | \
++ find `/bin/ls -d $queue_directory/* | \
+ egrep '/(saved|incoming|active|defer|deferred|bounce|hold|trace|corrupt|public|private|flush)$'` \
+ ! \( -type p -o -type s \) ! -user $mail_owner \
+ -exec $WARN not owned by $mail_owner: {} \;
Modified: trunk/dports/mail/postfix/files/patch-sys_defs.h
===================================================================
--- trunk/dports/mail/postfix/files/patch-sys_defs.h 2015-02-12 04:13:54 UTC (rev 132888)
+++ trunk/dports/mail/postfix/files/patch-sys_defs.h 2015-02-12 05:58:37 UTC (rev 132889)
@@ -1,6 +1,6 @@
---- src/util/sys_defs.h.orig 2013-09-30 06:51:55.000000000 +1000
-+++ src/util/sys_defs.h 2014-01-17 15:24:37.000000000 +1100
-@@ -228,9 +228,9 @@
+--- src/util/sys_defs.h.orig 2014-12-26 09:33:02.000000000 +1100
++++ src/util/sys_defs.h 2015-02-12 15:40:02.000000000 +1100
+@@ -230,9 +230,9 @@
#define HAS_DB
#define HAS_SA_LEN
#define NATIVE_DB_TYPE "hash"
@@ -12,8 +12,8 @@
#define USE_STATFS
#define STATFS_IN_SYS_MOUNT_H
#define HAS_POSIX_REGEXP
-@@ -245,11 +245,11 @@
- # define HAVE_GETIFADDRS
+@@ -244,11 +244,11 @@
+ #define HAVE_GETIFADDRS
#endif
#define HAS_FUTIMES /* XXX Guessing */
-#define NATIVE_SENDMAIL_PATH "/usr/sbin/sendmail"
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.macosforge.org/pipermail/macports-changes/attachments/20150211/3c43632d/attachment-0001.html>
More information about the macports-changes
mailing list