Date: Fri, 19 Apr 2019 18:53:13 +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: r499382 - in head/mail/postfix: . files Message-ID: <201904191853.x3JIrDas078072@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: ohauer Date: Fri Apr 19 18:53:13 2019 New Revision: 499382 URL: https://svnweb.freebsd.org/changeset/ports/499382 Log: - update to 3.4.5 - adopt libressl patches from OpenBSD Added: head/mail/postfix/files/patch-src_tls_tls__certkey.c (contents, props changed) Deleted: head/mail/postfix/files/patch-src_global_dict__mysql.c head/mail/postfix/files/patch-src_tls_tls.h head/mail/postfix/files/patch-src_tls_tls__client.c head/mail/postfix/files/patch-src_tls_tls__dane.c head/mail/postfix/files/patch-src_tls_tls__dh.c Modified: head/mail/postfix/Makefile head/mail/postfix/distinfo head/mail/postfix/files/patch-makedefs head/mail/postfix/files/patch-src_posttls-finger_posttls-finger.c head/mail/postfix/files/patch-src_tls_tls__server.c head/mail/postfix/files/patch-src_util_sys__defs.h head/mail/postfix/pkg-plist Modified: head/mail/postfix/Makefile ============================================================================== --- head/mail/postfix/Makefile Fri Apr 19 18:46:59 2019 (r499381) +++ head/mail/postfix/Makefile Fri Apr 19 18:53:13 2019 (r499382) @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= postfix -DISTVERSION= 3.3.4 +DISTVERSION= 3.4.5 PORTREVISION?= 0 PORTEPOCH= 1 CATEGORIES= mail ipv6 Modified: head/mail/postfix/distinfo ============================================================================== --- head/mail/postfix/distinfo Fri Apr 19 18:46:59 2019 (r499381) +++ head/mail/postfix/distinfo Fri Apr 19 18:53:13 2019 (r499382) @@ -1,3 +1,3 @@ -TIMESTAMP = 1553957353 -SHA256 (postfix/postfix-3.3.4.tar.gz) = 847818bb82d0d7e83303a30206330b5d6bd035bbbb0086782cd87dcb8ac99bd3 -SIZE (postfix/postfix-3.3.4.tar.gz) = 4429964 +TIMESTAMP = 1553956821 +SHA256 (postfix/postfix-3.4.5.tar.gz) = 8b2ba54f9d2a049582a0ed3ee2dbe96ba57e278feea9cb4f80e1a61844e6319f +SIZE (postfix/postfix-3.4.5.tar.gz) = 4581301 Modified: head/mail/postfix/files/patch-makedefs ============================================================================== --- head/mail/postfix/files/patch-makedefs Fri Apr 19 18:46:59 2019 (r499381) +++ head/mail/postfix/files/patch-makedefs Fri Apr 19 18:53:13 2019 (r499382) @@ -1,6 +1,6 @@ ---- makedefs.orig 2018-02-03 17:20:46 UTC +--- makedefs.orig 2019-03-10 23:42:59 UTC +++ makedefs -@@ -287,6 +287,33 @@ case "$SYSTEM.$RELEASE" in +@@ -298,6 +298,33 @@ case "$SYSTEM.$RELEASE" in : ${SHLIB_ENV="LD_LIBRARY_PATH=`pwd`/lib"} : ${PLUGIN_LD="${CC} -shared"} ;; Modified: head/mail/postfix/files/patch-src_posttls-finger_posttls-finger.c ============================================================================== --- head/mail/postfix/files/patch-src_posttls-finger_posttls-finger.c Fri Apr 19 18:46:59 2019 (r499381) +++ head/mail/postfix/files/patch-src_posttls-finger_posttls-finger.c Fri Apr 19 18:53:13 2019 (r499382) @@ -1,6 +1,6 @@ ---- src/posttls-finger/posttls-finger.c.orig 2016-08-27 20:27:50 UTC +--- src/posttls-finger/posttls-finger.c.orig 2019-02-12 13:17:45 UTC +++ src/posttls-finger/posttls-finger.c -@@ -1511,7 +1511,8 @@ static int finger(STATE *state) +@@ -1673,7 +1673,8 @@ static int finger(STATE *state) return (0); } @@ -10,7 +10,7 @@ /* ssl_cleanup - free memory allocated in the OpenSSL library */ -@@ -1958,7 +1959,8 @@ int main(int argc, char *argv[]) +@@ -2156,7 +2157,8 @@ int main(int argc, char *argv[]) cleanup(&state); /* OpenSSL 1.1.0 and later (de)initialization is implicit */ Added: head/mail/postfix/files/patch-src_tls_tls__certkey.c ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/mail/postfix/files/patch-src_tls_tls__certkey.c Fri Apr 19 18:53:13 2019 (r499382) @@ -0,0 +1,11 @@ +--- src/tls/tls_certkey.c.orig 2019-03-07 23:57:10 UTC ++++ src/tls/tls_certkey.c +@@ -144,7 +144,7 @@ static void init_pem_load_state(pem_load + + /* use_chain - load cert, key and chain into ctx or ssl */ + +-#if OPENSSL_VERSION_NUMBER >= 0x1010100fUL ++#if OPENSSL_VERSION_NUMBER >= 0x1010100fUL && !defined(LIBRESSL_VERSION_NUMBER) + static int use_chain(pem_load_state_t *st) + { + int ret; Modified: head/mail/postfix/files/patch-src_tls_tls__server.c ============================================================================== --- head/mail/postfix/files/patch-src_tls_tls__server.c Fri Apr 19 18:46:59 2019 (r499381) +++ head/mail/postfix/files/patch-src_tls_tls__server.c Fri Apr 19 18:53:13 2019 (r499382) @@ -1,6 +1,6 @@ ---- src/tls/tls_server.c.orig 2018-11-17 22:33:15 UTC +--- src/tls/tls_server.c.orig 2019-02-18 23:03:54 UTC +++ src/tls/tls_server.c -@@ -517,7 +517,9 @@ TLS_APPL_STATE *tls_server_init(const TL +@@ -518,7 +518,9 @@ TLS_APPL_STATE *tls_server_init(const TL * ticket decryption callback already (since 2.11) asks OpenSSL to * avoid issuing new tickets when the presented ticket is re-usable. */ Modified: head/mail/postfix/files/patch-src_util_sys__defs.h ============================================================================== --- head/mail/postfix/files/patch-src_util_sys__defs.h Fri Apr 19 18:46:59 2019 (r499381) +++ head/mail/postfix/files/patch-src_util_sys__defs.h Fri Apr 19 18:53:13 2019 (r499382) @@ -1,9 +1,10 @@ ---- src/util/sys_defs.h.orig 2017-06-18 19:30:20 UTC +--- src/util/sys_defs.h.orig 2019-03-10 16:58:04 UTC +++ src/util/sys_defs.h -@@ -30,6 +30,7 @@ +@@ -30,7 +30,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(FREEBSD13) \ || defined(BSDI2) || defined(BSDI3) || defined(BSDI4) \ || defined(OPENBSD2) || defined(OPENBSD3) || defined(OPENBSD4) \ Modified: head/mail/postfix/pkg-plist ============================================================================== --- head/mail/postfix/pkg-plist Fri Apr 19 18:46:59 2019 (r499381) +++ head/mail/postfix/pkg-plist Fri Apr 19 18:53:13 2019 (r499382) @@ -61,6 +61,7 @@ libexec/postfix/postfix-files libexec/postfix/postfix-script libexec/postfix/postfix-tls-script libexec/postfix/postfix-wrapper +libexec/postfix/postlogd libexec/postfix/postmulti-script libexec/postfix/postscreen libexec/postfix/proxymap @@ -137,6 +138,7 @@ libexec/postfix/virtual %%BMAN%%man/man8/oqmgr.8.gz %%BMAN%%man/man8/pickup.8.gz %%BMAN%%man/man8/pipe.8.gz +%%BMAN%%man/man8/postlogd.8.gz %%BMAN%%man/man8/postscreen.8.gz %%BMAN%%man/man8/proxymap.8.gz %%BMAN%%man/man8/qmgr.8.gz
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201904191853.x3JIrDas078072>