postfix: update to 3.4.6.
This commit is contained in:
parent
5497ecef19
commit
2c9ad852ad
3 changed files with 42 additions and 12 deletions
17
srcpkgs/postfix/patches/glibc.patch
Normal file
17
srcpkgs/postfix/patches/glibc.patch
Normal file
|
@ -0,0 +1,17 @@
|
||||||
|
--- src/dns/dns_str_resflags.c.orig
|
||||||
|
+++ src/dns/dns_str_resflags.c
|
||||||
|
@@ -60,10 +60,14 @@
|
||||||
|
"RES_DEFNAMES", RES_DEFNAMES,
|
||||||
|
"RES_STAYOPEN", RES_STAYOPEN,
|
||||||
|
"RES_DNSRCH", RES_DNSRCH,
|
||||||
|
+#ifdef RES_INSECURE1
|
||||||
|
"RES_INSECURE1", RES_INSECURE1,
|
||||||
|
"RES_INSECURE2", RES_INSECURE2,
|
||||||
|
+#endif
|
||||||
|
"RES_NOALIASES", RES_NOALIASES,
|
||||||
|
+#ifdef RES_USE_INET6
|
||||||
|
"RES_USE_INET6", RES_USE_INET6,
|
||||||
|
+#endif
|
||||||
|
#ifdef RES_ROTATE
|
||||||
|
"RES_ROTATE", RES_ROTATE,
|
||||||
|
#endif
|
|
@ -106,15 +106,6 @@ Reason: fix compatibility with LibreSSL
|
||||||
|
|
||||||
/*
|
/*
|
||||||
* Initialize the OpenSSL library by the book! To start with, we must
|
* Initialize the OpenSSL library by the book! To start with, we must
|
||||||
@@ -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) {
|
|
||||||
@@ -595,7 +595,7 @@
|
@@ -595,7 +595,7 @@
|
||||||
/*
|
/*
|
||||||
* 2015-12-05: Ephemeral RSA removed from OpenSSL 1.1.0-dev
|
* 2015-12-05: Ephemeral RSA removed from OpenSSL 1.1.0-dev
|
||||||
|
@ -124,3 +115,25 @@ Reason: fix compatibility with LibreSSL
|
||||||
|
|
||||||
/*
|
/*
|
||||||
* According to OpenSSL documentation, a temporary RSA key is needed when
|
* According to OpenSSL documentation, a temporary RSA key is needed when
|
||||||
|
--- src/tls/tls_server.c
|
||||||
|
+++ src/tls/tls_server.c
|
||||||
|
@@ -487,7 +487,7 @@
|
||||||
|
* incomplete.
|
||||||
|
*/
|
||||||
|
#ifdef SSL_OP_NO_TICKET
|
||||||
|
-#ifndef OPENSSL_NO_TLSEXT
|
||||||
|
+#if !defined(OPENSSL_NO_TLSEXT) && !defined(LIBRESSL_VERSION_NUMBER)
|
||||||
|
ticketable = (*var_tls_tkt_cipher && scache_timeout > 0
|
||||||
|
&& !(off & SSL_OP_NO_TICKET));
|
||||||
|
if (ticketable) {
|
||||||
|
--- src/tls/tls_certkey.c.orig
|
||||||
|
+++ src/tls/tls_certkey.c
|
||||||
|
@@ -144,7 +144,7 @@
|
||||||
|
|
||||||
|
/* 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;
|
||||||
|
|
|
@ -1,7 +1,7 @@
|
||||||
# Template file for 'postfix'
|
# Template file for 'postfix'
|
||||||
pkgname=postfix
|
pkgname=postfix
|
||||||
version=3.3.2
|
version=3.4.6
|
||||||
revision=6
|
revision=1
|
||||||
hostmakedepends="perl m4"
|
hostmakedepends="perl m4"
|
||||||
makedepends="icu-devel libldap-devel libmysqlclient-devel pcre-devel
|
makedepends="icu-devel libldap-devel libmysqlclient-devel pcre-devel
|
||||||
postgresql-libs-devel sqlite-devel"
|
postgresql-libs-devel sqlite-devel"
|
||||||
|
@ -10,7 +10,7 @@ maintainer="Juan RP <xtraeme@voidlinux.org>"
|
||||||
license="IPL-1.0, EPL-2.0"
|
license="IPL-1.0, EPL-2.0"
|
||||||
homepage="http://www.postfix.org/"
|
homepage="http://www.postfix.org/"
|
||||||
distfiles="ftp://ftp.porcupine.org/mirrors/postfix-release/official/${pkgname}-${version}.tar.gz"
|
distfiles="ftp://ftp.porcupine.org/mirrors/postfix-release/official/${pkgname}-${version}.tar.gz"
|
||||||
checksum=3c93f31eee49a58e592c31e62a058701cadde11e8e066ea441da19fddad7b35b
|
checksum=d674a9b40602ee30420ee7ff93c3600e8913eeb2ea9bfb0ac1d140dac5dbe326
|
||||||
|
|
||||||
system_accounts="postfix"
|
system_accounts="postfix"
|
||||||
postfix_homedir="/var/spool/postfix"
|
postfix_homedir="/var/spool/postfix"
|
||||||
|
|
Loading…
Reference in a new issue