commit:     8267b1cce057f59ee23f3a20a0a2bfcb8090ad7d
Author:     Eray Aslan <eras <AT> gentoo <DOT> org>
AuthorDate: Tue Nov 20 05:11:59 2018 +0000
Commit:     Eray Aslan <eras <AT> gentoo <DOT> org>
CommitDate: Tue Nov 20 05:11:59 2018 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8267b1cc

mail-mta/postfix: bump to 3.4_pre20181118

fixes libressl build.  Thanks to Reuben Farrelly
Closes: https://bugs.gentoo.org/670725
Package-Manager: Portage-2.3.51, Repoman-2.3.12
Signed-off-by: Eray Aslan <eras <AT> gentoo.org>

 mail-mta/postfix/Manifest                                     |  2 +-
 mail-mta/postfix/files/postfix-libressl-session-tickets.patch | 11 +++++++++++
 ...-3.4_pre20181104.ebuild => postfix-3.4_pre20181118.ebuild} |  3 ++-
 3 files changed, 14 insertions(+), 2 deletions(-)

diff --git a/mail-mta/postfix/Manifest b/mail-mta/postfix/Manifest
index cfc8d892e7b..46892767fd8 100644
--- a/mail-mta/postfix/Manifest
+++ b/mail-mta/postfix/Manifest
@@ -3,5 +3,5 @@ DIST postfix-3.1.6.tar.gz 4341308 BLAKE2B 
6a5ec763cf96770240f63b35b4532c555cc6e5
 DIST postfix-3.2.4.tar.gz 4390376 BLAKE2B 
132a6b467f9156d716a92cc7beae0f9a7c47e6a2045e83726a5e7305e6f9bf666ebcfb93a9ab1a96ec988431661059d62e926287bd13089eeb4bab3e8f4b9fc7
 SHA512 
6dc583d3b1c98f5c8d6486351bee9f92a98b5379cd0d76d26a382379c112317e7a2a58c3a200477a6d0f831c73395257d1a63170df17ea8a65a4048a7df391f8
 DIST postfix-3.2.6.tar.gz 4395159 BLAKE2B 
2eef28f9189830725c02b98512ca7859770f090cbef3fe453b57fade967fd20f94cd3cd8e8955252dc230e674ed7827fc68ad910cd4fc63029dc2c92ea75f0af
 SHA512 
081751fe9af7612e7ee01a80ceffbc09db60764e12099d2a5e053205d0e7c70c6ef4f96526e1a98780965c43354e0ccd6ef61b4dbe93b249179890b81836c705
 DIST postfix-3.3.1.tar.gz 4420912 BLAKE2B 
065fd04cdfa343a6c50a629e8da47fad71465df790ca88adcad4efc7ab273330c39998c6bf503587b8bcba3d87bb98b1be6413e49449e2241258a99217473c11
 SHA512 
2307f50f8b7dab1db46ebe4ae30bc5682a25b9c49ae5ae65aa95b4620bb5450dd5929977c0f34b9e73a92ca6af36fd8e24167732420a1a2d89167c7a3b197276
-DIST postfix-3.4-20181104.tar.gz 4486863 BLAKE2B 
955bc46c92f6fb44864c7cb1b33f7b1125824b399ec798b4ad9e7a4d5a471d0fe0f4b283f5b026cb4c8ec6f9a942b338498dde7b682e278f1816588ef73e4082
 SHA512 
3159e9e902c63e9b9b585eaa228f5b6a66d0e95004c810ca0a4e4def8c54226071f80cc48bf0ca450f3d9e3df3399623f6ef7194da973e77d8939821f2834380
+DIST postfix-3.4-20181118.tar.gz 4499405 BLAKE2B 
55ffa78c8f695c1c26b4d221297bd423361e8b9da685913e97760ff3efabb9b0ec0ab07a4fea5f2de6c69f764a863f2bdc6dfd3520b3bebe66ad4f717c161628
 SHA512 
e539c3a0c8e664471ee999e268361bc16c3f14d62e903f77cf325480ef8f6cdf2089db777de5cffbc72f23212c888f8698d1b3272a9ad3973ce8693668cbcee5
 DIST postfix-vda-v13-2.10.0.patch 55701 BLAKE2B 
d8df041bb4ae7457cd066e71b6ae9470840d42edc9990a550ae51356cd62bfb08516250249030da26d1ef475619f0ebd609570d84ce57f8cdc347a2824b29536
 SHA512 
0b4b53a8cd28abf56eee3b2ed63ca1814251b60816e6ca1143249d25fd6ef7f905bec3134125ac6e851af685db8aae878012113693261529ae2ddbcf1bd93e62

diff --git a/mail-mta/postfix/files/postfix-libressl-session-tickets.patch 
b/mail-mta/postfix/files/postfix-libressl-session-tickets.patch
new file mode 100644
index 00000000000..fcbc9df63ac
--- /dev/null
+++ b/mail-mta/postfix/files/postfix-libressl-session-tickets.patch
@@ -0,0 +1,11 @@
+--- src/tls/tls_server.c       2018-11-18 20:11:20.120000000 +1100
++++ src/tls/tls_server.c       2018-11-18 20:11:58.430000000 +1100
+@@ -486,7 +486,7 @@
+      * OpenSSL 0.9.8h, while SSL_NO_TICKET was added in 0.9.8f.
+      */
+ #ifdef SSL_OP_NO_TICKET
+-#if !defined(OPENSSL_NO_TLSEXT) && OPENSSL_VERSION_NUMBER >= 0x0090808fL
++#if !defined(OPENSSL_NO_TLSEXT) && OPENSSL_VERSION_NUMBER >= 0x0090808fL && 
!defined(LIBRESSL_VERSION_NUMBER)
+     ticketable = (*var_tls_tkt_cipher && scache_timeout > 0
+                 && !(off & SSL_OP_NO_TICKET));
+     if (ticketable) {

diff --git a/mail-mta/postfix/postfix-3.4_pre20181104.ebuild 
b/mail-mta/postfix/postfix-3.4_pre20181118.ebuild
similarity index 98%
rename from mail-mta/postfix/postfix-3.4_pre20181104.ebuild
rename to mail-mta/postfix/postfix-3.4_pre20181118.ebuild
index f826996c808..653be1a5651 100644
--- a/mail-mta/postfix/postfix-3.4_pre20181104.ebuild
+++ b/mail-mta/postfix/postfix-3.4_pre20181118.ebuild
@@ -74,7 +74,8 @@ src_prepare() {
        sed -i -e "s:/usr/local/:/usr/:g" conf/master.cf || die "sed failed"
        eapply -p0 "${FILESDIR}/${PN}-libressl.patch" \
                "${FILESDIR}/${PN}-libressl-runtime.patch" \
-               "${FILESDIR}/${PN}-libressl-eccurve.patch"
+               "${FILESDIR}/${PN}-libressl-eccurve.patch" \
+               "${FILESDIR}/${PN}-libressl-session-tickets.patch"
 }
 
 src_configure() {

Reply via email to