Date: Sat, 31 Jan 2015 16:59:34 +0000 (UTC) From: Olli Hauer <ohauer@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r378223 - in head/mail/postfix-current: . files Message-ID: <201501311659.t0VGxY1I077743@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: ohauer Date: Sat Jan 31 16:59:33 2015 New Revision: 378223 URL: https://svnweb.freebsd.org/changeset/ports/378223 QAT: https://qat.redports.org/buildarchive/r378223/ Log: - update to postfix-3.0-20150129 - fix build on FreeBSD 11 [1] - use OPENSSL=yes instead including Mk/bsd.openssl.mk - enable TLS as default option. Postfix uses a secure default configuration if TLS is not configured. $ postconf -d | grep use_tls lmtp_use_tls = no postscreen_use_tls = $smtpd_use_tls smtp_use_tls = no smtpd_use_tls = no tlsproxy_use_tls = $smtpd_use_tls Changes: Many fixes, improvements and cleanups. The list is really to long, please read the original Changelog on your favor postfix mirror. [1] Noted by sbruno@ Modified: head/mail/postfix-current/Makefile head/mail/postfix-current/distinfo head/mail/postfix-current/files/patch-makedefs head/mail/postfix-current/pkg-plist Modified: head/mail/postfix-current/Makefile ============================================================================== --- head/mail/postfix-current/Makefile Sat Jan 31 16:58:25 2015 (r378222) +++ head/mail/postfix-current/Makefile Sat Jan 31 16:59:33 2015 (r378223) @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= postfix -DISTVERSION= 2.12-20141228 +DISTVERSION= 3.0-20150129 PORTEPOCH= 4 CATEGORIES= mail ipv6 MASTER_SITES= ftp://ftp.porcupine.org/mirrors/postfix-release/experimental/ \ @@ -22,9 +22,10 @@ LICENSE_NAME= IBM PUBLIC LICENSE VERSION LICENSE_FILE= ${WRKSRC}/LICENSE LICENSE_PERMS= dist-mirror dist-sell pkg-mirror pkg-sell auto-accept -CONFLICTS_INSTALL= courier-0.* postfix-1.* postfix-2.* postfix-base-2.* postfix2[789]-* \ - postfix21?-* sendmail-8.* sendmail+*-8.* smail-3.* zmailer-2.* \ - opensmtpd-[0-9]* postfix-tls-* +CONFLICTS_INSTALL?= courier-0.* opensmtpd-[0-9]* \ + postfix-2.* postfix-base-2.* postfix2[789]-* \ + postfix21?-* postfix-tls-* \ + sendmail-8.* sendmail+*-8.* smail-3.* zmailer-2.* USERS= postfix GROUPS= mail maildrop postfix @@ -43,7 +44,7 @@ OPTIONS_DEFINE= BDB CDB DOCS EAI INST_BA OPTIONS_RADIO= RG1 RG2 OPTIONS_RADIO_RG1= DOVECOT DOVECOT2 OPTIONS_RADIO_RG2= SASLKRB5 SASLKMIT -OPTIONS_DEFAULT= PCRE +OPTIONS_DEFAULT= PCRE TLS PCRE_DESC= Perl Compatible Regular Expressions EAI_DESC= Email Address Internationalization (EAI, RFC 6531..6533) @@ -183,10 +184,12 @@ POSTFIX_AUXLIBS+= -Wl,--rpath,$${KRB5_HO .endif .if ${PORT_OPTIONS:MTLS} -.include "${PORTSDIR}/Mk/bsd.openssl.mk" +USE_OPENSSL= yes POSTFIX_CCARGS+= -DUSE_TLS -I${OPENSSLINC} -# XXX LDFLAGS possible distrubs dynamic building +# XXX LDFLAGS possible breaks dynamic building POSTFIX_AUXLIBS+= -L${OPENSSLLIB} ${LDFLAGS} -lssl -lcrypto +.else +POSTFIX_CCARGS+= -DNO_TLS .endif .if ${PORT_OPTIONS:MSPF} @@ -198,9 +201,6 @@ PATCHFILES+= postfix-2.8.0-libspf2-1.2. PATCH_DIST_STRIP= -p1 POSTFIX_CCARGS+= -DHAVE_NS_TYPE -DHAS_SPF -I${LOCALBASE}/include POSTFIX_AUXLIBS+= -L${LOCALBASE}/lib -lspf2 -PLIST_SUB+= SPF="" -.else -PLIST_SUB+= SPF="@comment " .endif .if ${PORT_OPTIONS:MBDB} @@ -263,9 +263,6 @@ BROKEN= At the moment, VDA support is u .if ${PORT_OPTIONS:MTEST} BINTEST= qmqp-sink qmqp-source smtp-sink smtp-source MANTEST= qmqp-sink.1 qmqp-source.1 smtp-sink.1 smtp-source.1 -PLIST_SUB+= TEST="" -.else -PLIST_SUB+= TEST="@comment " .endif .if ${PORT_OPTIONS:MLMDB} @@ -335,7 +332,8 @@ do-configure: ${MAKEFILEFLAGS} CCARGS="${POSTFIX_CCARGS}" \ shared=yes shlib_directory=${SHLIB_DIRECTORY} \ dynamicmaps=yes \ - ${POSTFIX_DYN_AUXLIBS} AUXLIBS="${POSTFIX_AUXLIBS}" && \ + ${POSTFIX_DYN_AUXLIBS} \ + AUXLIBS="${POSTFIX_AUXLIBS}" && \ ${ECHO} "all: default" >> Makefile) pre-install: Modified: head/mail/postfix-current/distinfo ============================================================================== --- head/mail/postfix-current/distinfo Sat Jan 31 16:58:25 2015 (r378222) +++ head/mail/postfix-current/distinfo Sat Jan 31 16:59:33 2015 (r378223) @@ -1,2 +1,2 @@ -SHA256 (postfix/postfix-2.12-20141228.tar.gz) = e9a6fc4dc8aab6cdbfff15aff58c15bd1839ce294c53afb032f2d1c4b29ddddc -SIZE (postfix/postfix-2.12-20141228.tar.gz) = 4236173 +SHA256 (postfix/postfix-3.0-20150129.tar.gz) = d8055245af463e286513ac143ccfbae6f09ceefb3f7c689f24bcc7413f269fe7 +SIZE (postfix/postfix-3.0-20150129.tar.gz) = 4239461 Modified: head/mail/postfix-current/files/patch-makedefs ============================================================================== --- head/mail/postfix-current/files/patch-makedefs Sat Jan 31 16:58:25 2015 (r378222) +++ head/mail/postfix-current/files/patch-makedefs Sat Jan 31 16:59:33 2015 (r378223) @@ -1,12 +1,17 @@ ---- makedefs.orig 2014-01-20 23:24:30.000000000 +0000 -+++ makedefs 2014-01-20 23:25:24.000000000 +0000 -@@ -158,6 +158,10 @@ +--- makedefs.orig 2015-01-18 00:10:28 UTC ++++ makedefs +@@ -235,6 +235,15 @@ case "$SYSTEM.$RELEASE" in + : ${SHLIB_ENV="LD_LIBRARY_PATH=`pwd`/lib"} + : ${PLUGIN_LD="${CC} -shared"} ;; - FreeBSD.9*) SYSTYPE=FREEBSD9 - ;; -+ FreeBSD.10*) SYSTYPE=FREEBSD10 -+ ;; + FreeBSD.11*) SYSTYPE=FREEBSD11 ++ : ${CC=cc} ++ : ${SHLIB_SUFFIX=.so} ++ : ${SHLIB_CFLAGS=-fPIC} ++ : ${SHLIB_LD="${CC} -shared"' -Wl,-soname,${LIB}'} ++ : ${SHLIB_RPATH='-Wl,-rpath,${SHLIB_DIR}'} ++ : ${SHLIB_ENV="LD_LIBRARY_PATH=`pwd`/lib"} ++ : ${PLUGIN_LD="${CC} -shared"} + ;; DragonFly.*) SYSTYPE=DRAGONFLY ;; Modified: head/mail/postfix-current/pkg-plist ============================================================================== --- head/mail/postfix-current/pkg-plist Sat Jan 31 16:58:25 2015 (r378222) +++ head/mail/postfix-current/pkg-plist Sat Jan 31 16:59:33 2015 (r378223) @@ -141,18 +141,14 @@ libexec/postfix/virtual sbin/postalias sbin/postcat sbin/postconf +@(,maildrop,2755) sbin/postdrop sbin/postfix sbin/postkick sbin/postlock sbin/postlog sbin/postmap sbin/postmulti -@group maildrop -@mode 2755 -sbin/postdrop -sbin/postqueue -@group -@mode +@(,maildrop,2755) sbin/postqueue sbin/postsuper sbin/posttls-finger sbin/sendmail
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201501311659.t0VGxY1I077743>