Date: Tue, 13 Sep 2016 16:35:30 +0000 (UTC) From: Olli Hauer <ohauer@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r422031 - in branches/2016Q3/mail/postfix: . files Message-ID: <201609131635.u8DGZUDU051179@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: ohauer Date: Tue Sep 13 16:35:29 2016 New Revision: 422031 URL: https://svnweb.freebsd.org/changeset/ports/422031 Log: - fix 2013Q3 build some previous bulk commits are missing, fix the manually PR: 212657 Reported by: fredrik.eriksson_at_loopia.se Approved by: portmgr (implicit) Added: branches/2016Q3/mail/postfix/files/patch-src_tls_tls.h - copied unchanged from r421972, head/mail/postfix/files/patch-src_tls_tls.h Modified: branches/2016Q3/mail/postfix/Makefile branches/2016Q3/mail/postfix/distinfo branches/2016Q3/mail/postfix/files/patch-makedefs branches/2016Q3/mail/postfix/files/patch-src__util__sys_defs.h branches/2016Q3/mail/postfix/files/patch-src_tls_tls__dane.c Modified: branches/2016Q3/mail/postfix/Makefile ============================================================================== --- branches/2016Q3/mail/postfix/Makefile Tue Sep 13 16:17:21 2016 (r422030) +++ branches/2016Q3/mail/postfix/Makefile Tue Sep 13 16:35:29 2016 (r422031) @@ -2,9 +2,9 @@ # $FreeBSD$ PORTNAME= postfix -PORTVERSION= 3.1.1 +PORTVERSION= 3.1.2 PORTEPOCH= 1 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= mail ipv6 MASTER_SITES= ftp://ftp.porcupine.org/mirrors/postfix-release/ \ http://de.postfix.org/ftpmirror/ \ @@ -48,7 +48,7 @@ OPTIONS_RADIO= RG1 OPTIONS_RADIO_RG1= SASLKRB5 SASLKMIT OPTIONS_DEFAULT= PCRE TLS -BDB_USE= BDB=yes +BDB_USES= bdb CDB_LIB_DEPENDS= libcdb.so:databases/tinycdb LDAP_USE= OPENLDAP=yes LMDB_LIB_DEPENDS= liblmdb.so:databases/lmdb @@ -58,7 +58,7 @@ PGSQL_USES= pgsql SASLKMIT_LIB_DEPENDS= libkrb5.so:security/krb5 SASL_LIB_DEPENDS= libsasl2.so:security/cyrus-sasl2 SQLITE_USES= sqlite -TLS_USE= OPENSSL=yes +TLS_USES= ssl CDB_DESC= CDB maps lookups INST_BASE_DESC= Install into /usr and /etc/postfix Modified: branches/2016Q3/mail/postfix/distinfo ============================================================================== --- branches/2016Q3/mail/postfix/distinfo Tue Sep 13 16:17:21 2016 (r422030) +++ branches/2016Q3/mail/postfix/distinfo Tue Sep 13 16:35:29 2016 (r422031) @@ -1,3 +1,3 @@ -TIMESTAMP = 1463345893 -SHA256 (postfix/postfix-3.1.1.tar.gz) = 3deda4c34631970490b1b5fbb559905f93531bf1c7eb00e38b0d0deb1dba9982 -SIZE (postfix/postfix-3.1.1.tar.gz) = 4337295 +TIMESTAMP = 1472342160 +SHA256 (postfix/postfix-3.1.2.tar.gz) = 1ab9b4ee6bf9eb37d2467a63244132aab22ac23b91a72f327334e236b0d30f6b +SIZE (postfix/postfix-3.1.2.tar.gz) = 4337569 Modified: branches/2016Q3/mail/postfix/files/patch-makedefs ============================================================================== --- branches/2016Q3/mail/postfix/files/patch-makedefs Tue Sep 13 16:17:21 2016 (r422030) +++ branches/2016Q3/mail/postfix/files/patch-makedefs Tue Sep 13 16:35:29 2016 (r422031) @@ -1,6 +1,6 @@ ---- makedefs.orig 2015-01-18 00:10:28 UTC +--- makedefs.orig 2016-05-15 16:39:11 UTC +++ makedefs -@@ -235,6 +235,15 @@ case "$SYSTEM.$RELEASE" in +@@ -272,6 +272,24 @@ case "$SYSTEM.$RELEASE" in : ${SHLIB_ENV="LD_LIBRARY_PATH=`pwd`/lib"} : ${PLUGIN_LD="${CC} -shared"} ;; @@ -13,6 +13,15 @@ + : ${SHLIB_ENV="LD_LIBRARY_PATH=`pwd`/lib"} + : ${PLUGIN_LD="${CC} -shared"} + ;; ++ FreeBSD.12*) SYSTYPE=FREEBSD12 ++ : ${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 ;; OpenBSD.2*) SYSTYPE=OPENBSD2 Modified: branches/2016Q3/mail/postfix/files/patch-src__util__sys_defs.h ============================================================================== --- branches/2016Q3/mail/postfix/files/patch-src__util__sys_defs.h Tue Sep 13 16:17:21 2016 (r422030) +++ branches/2016Q3/mail/postfix/files/patch-src__util__sys_defs.h Tue Sep 13 16:35:29 2016 (r422031) @@ -1,10 +1,10 @@ ---- src/util/sys_defs.h.orig 2015-04-19 10:22:40 UTC +--- src/util/sys_defs.h.orig 2016-05-15 16:39:11 UTC +++ src/util/sys_defs.h @@ -26,6 +26,7 @@ #if defined(FREEBSD2) || defined(FREEBSD3) || defined(FREEBSD4) \ || defined(FREEBSD5) || defined(FREEBSD6) || defined(FREEBSD7) \ || defined(FREEBSD8) || defined(FREEBSD9) || defined(FREEBSD10) \ -+ || defined(FREEBSD11) \ ++ || defined(FREEBSD11) || defined(FREEBSD12) \ || defined(BSDI2) || defined(BSDI3) || defined(BSDI4) \ || defined(OPENBSD2) || defined(OPENBSD3) || defined(OPENBSD4) \ - || defined(OPENBSD5) \ + || defined(OPENBSD5) || defined(OPENBSD6) \ Copied: branches/2016Q3/mail/postfix/files/patch-src_tls_tls.h (from r421972, head/mail/postfix/files/patch-src_tls_tls.h) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/2016Q3/mail/postfix/files/patch-src_tls_tls.h Tue Sep 13 16:35:29 2016 (r422031, copy of r421972, head/mail/postfix/files/patch-src_tls_tls.h) @@ -0,0 +1,14 @@ +# fix build against LibreSSL +# Obtained from: http://cvsweb.openbsd.org/cgi-bin/cvsweb/ports/mail/postfix/stable/patches/ +# +--- src/tls/tls.h.orig 2016-02-06 20:09:41 UTC ++++ src/tls/tls.h +@@ -89,7 +89,7 @@ extern const char *str_tls_level(int); + #endif + + /* Backwards compatibility with OpenSSL < 1.1.0 */ +-#if OPENSSL_VERSION_NUMBER < 0x10100000L ++#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER) + #define OpenSSL_version_num SSLeay + #define OpenSSL_version SSLeay_version + #define OPENSSL_VERSION SSLEAY_VERSION Modified: branches/2016Q3/mail/postfix/files/patch-src_tls_tls__dane.c ============================================================================== --- branches/2016Q3/mail/postfix/files/patch-src_tls_tls__dane.c Tue Sep 13 16:17:21 2016 (r422030) +++ branches/2016Q3/mail/postfix/files/patch-src_tls_tls__dane.c Tue Sep 13 16:35:29 2016 (r422031) @@ -5,7 +5,7 @@ tls_check_version(); -#if OPENSSL_VERSION_NUMBER < 0x10100000L -+#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESS_VERSION_NUMBER) ++#if OPENSSL_VERSION_NUMBER < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER) SSL_load_error_strings(); SSL_library_init(); #endif
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201609131635.u8DGZUDU051179>