summaryrefslogtreecommitdiff
path: root/mail-mta/postfix
diff options
context:
space:
mode:
Diffstat (limited to 'mail-mta/postfix')
-rw-r--r--mail-mta/postfix/Manifest14
-rw-r--r--mail-mta/postfix/files/postfix-2.11.1-db6.patch12
-rw-r--r--mail-mta/postfix/metadata.xml2
-rw-r--r--mail-mta/postfix/postfix-3.4.7.ebuild2
-rw-r--r--mail-mta/postfix/postfix-3.4.8.ebuild (renamed from mail-mta/postfix/postfix-2.10.9.ebuild)178
-rw-r--r--mail-mta/postfix/postfix-3.5_pre20191214.ebuild (renamed from mail-mta/postfix/postfix-3.5_pre20191019.ebuild)5
6 files changed, 108 insertions, 105 deletions
diff --git a/mail-mta/postfix/Manifest b/mail-mta/postfix/Manifest
index e1be5147a9e4..3632c59e4fa8 100644
--- a/mail-mta/postfix/Manifest
+++ b/mail-mta/postfix/Manifest
@@ -1,4 +1,3 @@
-AUX postfix-2.11.1-db6.patch 699 BLAKE2B 7d429d118a765fa4ab140b7e88973e1f00372f2983d4dba5a4fbb8b5ee085112dab82a500b598db0daf563356ff1ff367c87b7848a253246ba16694a8c0a1365 SHA512 9a6f00ae2d31b732be929ce647c222871704db02c09af659e260cf1a995bbde7f2045c59b9c33520070f427d4a2b377f6193bf6f9971087bf8df7f0c95d6d824
AUX postfix-glibc230.patch 870 BLAKE2B 5151298b690bcb742c9dee07da11a63e0c96cf0905c648efb9b114462aad1a8355c84be869dde54248c1eedc84f18503ce5af7a9e7fd163c81d642934c87a03c SHA512 930c492f90ae3f3c29ee002efdb717a745df787e064ef4ba6fa28c4c5bd7fef2ef91fbdb3705ed5c81c24053d52103d3969b2d73260aa5d1ccb9654ced401aea
AUX postfix-libressl-certkey.patch 436 BLAKE2B fc9a949e8499163010b117971fc817d070f3eb74371fddbcf1cebae51276eaa30da0e8d9aaad24f775971b5ea54f3df35142bbb66d984245674e6e88728992da SHA512 b3913b1158d1fa46868b9f3ed13a2a464abd5d8f4acabc594c0c19bb3134028231503fa05dcb70b8ca0fcaefae30ea45b6e715d3545c5820b70272367e1127b5
AUX postfix-libressl-server.patch 446 BLAKE2B bd07df754cb0d943dfd3483272399b3271471f09ce9c7062f3ad6ee27fed80b714144b9227ec1e91e66e1d7f8766952534662d512bf3e3a89156632cfc4b72bf SHA512 19eaca88239ab6b7ba5dc3ce36ccaae0ad2994dcfa17fbe2e03a9731d2016398dbebb4068f4ebab6c65a389bc7fa8c27b2e8e447cb9a550da5e0ee9c22879854
@@ -6,15 +5,14 @@ AUX postfix.rc6.2.7 2107 BLAKE2B 291d9e02ffdac79a1c7c64febc5674321e675de341b468b
AUX postfix.service 662 BLAKE2B dcf9ceb71ad483b580d126fcb5ac68889cdeb898df3333d38f195227190b73cf0fb41cd68a86e97cfe844cc7f9f095cba0a17afe9ce7c8697e0aa30f5faecde6 SHA512 04b475040b153f488a9358567ff9ee2eb8f263c619dadc23c837d17c19106041296e3652bcaded2be0c7c8b9eee7fd5f2ad55bed3e7f9b3a4bf9655f4762d563
AUX smtp.pass 29 BLAKE2B 589915bd2856fa64e22caa12fca54ef342eb07606de38d3879c13ac395413c84de6c3b733c83cc0625a4433167efcc7d504b2f87fa26c05b2facde9c3d103021 SHA512 a8a940099a77ea0547004daf5392a6efc0cd643f10072803d65e37763012464ad25b1b925ae9e32bffb3c3e8a5d4b2d3bb5619a174d58fdc4ea5d4090db0d365
AUX smtp.sasl 42 BLAKE2B 67e9108101779b6027fa1e5cc7c9256a606d440e15bb037a0da186e6b4983ab26e88ede2f0604737c78144c03e182f66005062f1d49e10443d1ddb9757461d1f SHA512 a48e2bd173c4443dd2c389f6973a541dbcba4223b52b42b409a68d934a7fc82a98d4027267befcd5db6ec628cce6a9dffdf044e6fbd774b6e748f07f4106db47
-DIST postfix-2.10.9.tar.gz 3820525 BLAKE2B ed1fc10f016cdc63fe2b86c68cca270c98348417babf6d8e05f76fa2550f5cbca95825f14cf54897e66323cdbe6132a1046402b853b6f000ade630277278c748 SHA512 c77df7ccc051bd72271dc5298da0ca4e45397b1ba96fc8be31e095f5b15cd30ebc0b29cf638e76efc65503cb241efd937f2d64aaa97243402c35e2927b7a7b91
DIST postfix-3.4.5.tar.gz 4581301 BLAKE2B 9de66cab6eea610fc83e4629980b3e201b4e3f9185729cb84933aa940b64b7818d0439c5145ea0b635666db92c970e1974f4f439cd3b733c58e1fe5794c046fa SHA512 af59d960b40799f7667935bef8fafb93ae6dcb70abaa77a15cf498571f37fa0429f411f9f08b1b6bfa588d3f572260d14d6d5409f0cd1e82b1c59928b2124c94
DIST postfix-3.4.6.tar.gz 4571771 BLAKE2B e08b2e6c01fe54fcc7439182783190f4adb81758a1bbcc1bfec71e02dca91a779308f624e081837f7e2deec8666f10bc51238e90cc952de6c8371fb18790604f SHA512 96430d60cf58b9876e52a742dbfe3ca1da4ec82eeea5cd35c6ee4e69714ddd5601561a6663aac51a34b2d64db4f7678d7c5d720ec9ead807b5d7e87e37434961
DIST postfix-3.4.7.tar.gz 4572758 BLAKE2B 8d811293672fc2a1e0e3276fadd172d9e130a3e0b5ccbaf27ddf183a50f25ca9bbf5c0a28806bb1f79d5648c4de44edd8ee98192355077e29a0c69a2685878dc SHA512 2bc29a87a65c46d06b6fc51c4cdf22da773e63f19488871e040eba6250bf686eecc7de11e14224018c35b061e66e1759c69dc649d7388f724a58080195209e68
-DIST postfix-3.5-20191019.tar.gz 4608335 BLAKE2B 8a33ee214de5094abc8dada04e4410b52f781698efa5515549a3c6b4b157766735f91f2b26c6115380e1ec5dc004dbd22e5416c649d048037813d437e0a6f602 SHA512 4e4cd32ee9571fdabf87a7848720574ca7ae17cc0c67f0e8682b5535fbbb8d9630c22f58840bec50caee3e479d786c7bfa391ba59734288cd25069cacb4f0514
-DIST postfix-vda-v13-2.10.0.patch 55701 BLAKE2B d8df041bb4ae7457cd066e71b6ae9470840d42edc9990a550ae51356cd62bfb08516250249030da26d1ef475619f0ebd609570d84ce57f8cdc347a2824b29536 SHA512 0b4b53a8cd28abf56eee3b2ed63ca1814251b60816e6ca1143249d25fd6ef7f905bec3134125ac6e851af685db8aae878012113693261529ae2ddbcf1bd93e62
-EBUILD postfix-2.10.9.ebuild 8729 BLAKE2B 70118c3d40415b33554420fc02d1eef03d4116dd196e39b46f584d6ca36998745ee4e4e8bde9721d0521c3c5654d98192a9955e8ee8e1915d01016db476bfa7f SHA512 42f0f15619c1d9143f00878a9335cd86cac5675ab395669222e6d2d449ec63bb573d670c6015c70257d28a5a4e6ad62d40fde30ef84fae5bc8db567ac6ab3de0
+DIST postfix-3.4.8.tar.gz 4573099 BLAKE2B cef447c8eeb9e2afbb869a94c5d67680ed7e633ea23108c1c109b632bd3f53f9f666302e8d1dac70affcd7d02d27b71a83b06c8e4564b6187268aa656b4c8132 SHA512 782fe83e4b40c7aadfb4c55850db4c7163dd0f647f4ef133e59f7b47c993b2b4fa6c43ebbc45131caa54d968259f9c8568f47e81bfccda02ab142be52aa95d45
+DIST postfix-3.5-20191214.tar.gz 4613855 BLAKE2B 1eeb1df9ca06bb862b19718f6d0d781a9cf5c773b8864d74c556e8ed8cc7c6caf67dfea7259ab104e072bb4208d8c2bcb81b2551b13a6767c9f4a8575520939d SHA512 58f90c4bc14a36fdb3e64d6336ca0b290cabecfa465418f1d67b6c3f2196db04a7321223f57d36dbdb3b8887a915f0c54d08b6eed834d90e37934e6478a4ad22
EBUILD postfix-3.4.5-r1.ebuild 8976 BLAKE2B 8825ccc728a83cff1397e8864cd9c49f7d961dd17644537b8600f035fbc112f2c86b96f38e908a91e50f8fcca5a6a87126f4d9160c70b1e0c894b03aab94170f SHA512 77aebbef0215921e04cd73650b5d37a1e0f53bb251bcc8d189ab86ecb2d6f1a50a739c93839a92fefef41667537b3561bc738cfd2fb7bce2f1d4707ba074d142
EBUILD postfix-3.4.6.ebuild 8985 BLAKE2B 9f97b796aaa6901751b93b5c87af8a444adf5aeaa0f5455b5e8a878439e5873205bc578c58c4e2c035539774f4c822182116a80c77df52e394145526cf116e95 SHA512 d5280081a7e717e73fb140dfafbef3cfe4ca796fb8a26b487419fbd9216985c8ec3a2729b27e0e8dae44523268b82d49f6bf18fb3cc0907046edb1e5ed076457
-EBUILD postfix-3.4.7.ebuild 8906 BLAKE2B 8d6543b946497233a19ce62afb91e7edfbf0c6b55b93fb45a5aaa440a7db25f2c1b72bbdc2fda8cc7b7041e6ccee43224015d856c6d00abd75ff30932993357c SHA512 74967d3298314fa2e8187d21808f63e72a21609306a8f197904f0e8109a510ac4db0a2f87e59c28d7d3725245ca7a6ccaace65fe4d6eb3da68c2f49bee9f0239
-EBUILD postfix-3.5_pre20191019.ebuild 8873 BLAKE2B cd049814e94a9289ef6925bf8bada301e161432290930bb6bd50c9a0370f1752b61a7f13abfecc7c25134f04731fecc367be5191d3e26a0e0915ca787c028210 SHA512 1f1078d635e36bdceb9299c8a1dc7e3bd6ac0fa7a50098c3c1f6ba6f3ae394a2836c076182cf326a97b145b6626a87f2e84ca04b936a783c469f4f5d580187cc
-MISC metadata.xml 1023 BLAKE2B f0bcd846c18bf1459ac85c75b6e41c90857d800d49b3efdffdd0106616e453869f43004c9a38395c71e2766b9b7f83b25a702b3b39d6264d83f79481b6cbba43 SHA512 2511ca5d5cc134afa04d1f596084eb2f7102c45e883edf3290c00b2f733b8a1a74ecddcd6b182381ac86da2616097c86a8acedeca199747b33e403b8488067b4
+EBUILD postfix-3.4.7.ebuild 8912 BLAKE2B b364c39428875baa41e9ced900858bca98741977f1fc7c689804c739451793ba5c4d0815379acdcd380f123acf219cd5908eb6e124ecb8cd95524296ae9bd533 SHA512 b658e3fa4c71c5df1a2cde9f0999b4f831d33bec4f6bda7aa4501e11581e42afa9ec9e1176e1159a478f3055976745113134c0c445e2a40fe3470fe590021c5a
+EBUILD postfix-3.4.8.ebuild 8912 BLAKE2B b364c39428875baa41e9ced900858bca98741977f1fc7c689804c739451793ba5c4d0815379acdcd380f123acf219cd5908eb6e124ecb8cd95524296ae9bd533 SHA512 b658e3fa4c71c5df1a2cde9f0999b4f831d33bec4f6bda7aa4501e11581e42afa9ec9e1176e1159a478f3055976745113134c0c445e2a40fe3470fe590021c5a
+EBUILD postfix-3.5_pre20191214.ebuild 8843 BLAKE2B 8b177dbdc898132a85febb3c3558b82c771e23562bf9f006daa9458b8ef9a735f2515f9708ad3dc8ea4d62c3743c5034e6da86b4ec374ee0abbaa2665d4f3269 SHA512 e9521abb9cf67ccda7fd7dcc218c962e35e155fec6cd342dcbfa5e4b24dc5ecd2ab5ec5bc2c3a7dfd4177a236cce33db228a4b25619cdc099c2c40f5d82f4528
+MISC metadata.xml 939 BLAKE2B 01474efe62df1eda9a3ba5976847064d615b3c32d9c71838354ef375c851c7ab4d1fcc2bc0d2945ce3d259fc6a698938cee6d1354c4e0f02f1e66395e377a0c5 SHA512 8602700c2a21b66ecf2c024c06ce23452f7effd9c06a5d58c1ccb351bcdef43a3c89575cc9136efc72fcd4e06ecb0654017b51bb145e7ffeeda771e3f4e7a673
diff --git a/mail-mta/postfix/files/postfix-2.11.1-db6.patch b/mail-mta/postfix/files/postfix-2.11.1-db6.patch
deleted file mode 100644
index 5f5cad406b0c..000000000000
--- a/mail-mta/postfix/files/postfix-2.11.1-db6.patch
+++ /dev/null
@@ -1,12 +0,0 @@
---- src/util/dict_db.c 2012-01-25 00:41:08.000000000 +0000
-+++ src/util/dict_db.c 2014-06-25 18:56:10.000000000 +0000
-@@ -693,7 +688,8 @@
- msg_fatal("set DB cache size %d: %m", dict_db_cache_size);
- if (type == DB_HASH && db->set_h_nelem(db, DICT_DB_NELM) != 0)
- msg_fatal("set DB hash element count %d: %m", DICT_DB_NELM);
--#if DB_VERSION_MAJOR == 5 || (DB_VERSION_MAJOR == 4 && DB_VERSION_MINOR > 0)
-+#if DB_VERSION_MAJOR == 6 || DB_VERSION_MAJOR == 5 || \
-+ (DB_VERSION_MAJOR == 4 && DB_VERSION_MINOR > 0)
- if ((errno = db->open(db, 0, db_path, 0, type, db_flags, 0644)) != 0)
- FREE_RETURN(dict_surrogate(class, path, open_flags, dict_flags,
- "open database %s: %m", db_path));
diff --git a/mail-mta/postfix/metadata.xml b/mail-mta/postfix/metadata.xml
index fe1d9dcbdd67..1193f1cce9d2 100644
--- a/mail-mta/postfix/metadata.xml
+++ b/mail-mta/postfix/metadata.xml
@@ -23,8 +23,6 @@
for lookup tables</flag>
<flag name="lmdb">Add support for using <pkg>dev-db/lmdb</pkg>
for lookup tables</flag>
- <flag name="vda">Add support for virtual delivery agent quota
- enforcing</flag>
</use>
<upstream>
<remote-id type="sourceforge">vda</remote-id>
diff --git a/mail-mta/postfix/postfix-3.4.7.ebuild b/mail-mta/postfix/postfix-3.4.7.ebuild
index 96be7c735d7e..7603315b82de 100644
--- a/mail-mta/postfix/postfix-3.4.7.ebuild
+++ b/mail-mta/postfix/postfix-3.4.7.ebuild
@@ -16,7 +16,7 @@ SRC_URI="${MY_URI}/${MY_SRC}.tar.gz"
LICENSE="|| ( IBM EPL-2.0 )"
SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
IUSE="+berkdb cdb dovecot-sasl +eai hardened ldap ldap-bind libressl lmdb memcached mbox mysql nis pam postgres sasl selinux sqlite ssl"
DEPEND=">=dev-libs/libpcre-3.4
diff --git a/mail-mta/postfix/postfix-2.10.9.ebuild b/mail-mta/postfix/postfix-3.4.8.ebuild
index 44058e81d3e5..7603315b82de 100644
--- a/mail-mta/postfix/postfix-2.10.9.ebuild
+++ b/mail-mta/postfix/postfix-3.4.8.ebuild
@@ -1,44 +1,49 @@
# Copyright 1999-2019 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=5
-inherit eutils multilib ssl-cert toolchain-funcs flag-o-matic pam user versionator systemd
+EAPI=7
-MY_PV="${PV/_pre/-}"
+inherit flag-o-matic pam systemd toolchain-funcs
+
+MY_PV="${PV/_rc/-RC}"
MY_SRC="${PN}-${MY_PV}"
MY_URI="ftp://ftp.porcupine.org/mirrors/postfix-release/official"
-VDA_PV="2.10.0"
-VDA_P="${PN}-vda-v13-${VDA_PV}"
RC_VER="2.7"
DESCRIPTION="A fast and secure drop-in replacement for sendmail"
HOMEPAGE="http://www.postfix.org/"
-SRC_URI="${MY_URI}/${MY_SRC}.tar.gz
- vda? ( http://vda.sourceforge.net/VDA/${VDA_P}.patch ) "
+SRC_URI="${MY_URI}/${MY_SRC}.tar.gz"
-LICENSE="IBM"
+LICENSE="|| ( IBM EPL-2.0 )"
SLOT="0"
-KEYWORDS="~s390"
-IUSE="+berkdb cdb doc dovecot-sasl hardened ldap ldap-bind memcached mbox mysql nis pam postgres sasl selinux sqlite ssl vda"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
+IUSE="+berkdb cdb dovecot-sasl +eai hardened ldap ldap-bind libressl lmdb memcached mbox mysql nis pam postgres sasl selinux sqlite ssl"
DEPEND=">=dev-libs/libpcre-3.4
dev-lang/perl
berkdb? ( >=sys-libs/db-3.2:* )
- cdb? ( || ( >=dev-db/tinycdb-0.76 >=dev-db/cdb-0.75-r1 ) )
+ cdb? ( || ( >=dev-db/tinycdb-0.76 >=dev-db/cdb-0.75-r4 ) )
+ eai? ( dev-libs/icu:= )
ldap? ( net-nds/openldap )
ldap-bind? ( net-nds/openldap[sasl] )
- mysql? ( virtual/mysql )
+ lmdb? ( >=dev-db/lmdb-0.9.11 )
+ mysql? ( dev-db/mysql-connector-c:0= )
+ nis? ( net-libs/libnsl )
pam? ( sys-libs/pam )
postgres? ( dev-db/postgresql:* )
sasl? ( >=dev-libs/cyrus-sasl-2 )
sqlite? ( dev-db/sqlite:3 )
- ssl? ( dev-libs/openssl:0= )"
+ ssl? (
+ !libressl? ( dev-libs/openssl:0= )
+ libressl? ( >=dev-libs/libressl-2.9.1:0= )
+ )"
RDEPEND="${DEPEND}
- dovecot-sasl? ( net-mail/dovecot )
+ acct-group/postfix
+ acct-group/postdrop
+ acct-user/postfix
memcached? ( net-misc/memcached )
net-mail/mailbase
- selinux? ( sec-policy/selinux-postfix )
!mail-mta/courier
!mail-mta/esmtp
!mail-mta/exim
@@ -51,56 +56,57 @@ RDEPEND="${DEPEND}
!mail-mta/opensmtpd
!<mail-mta/ssmtp-2.64-r2
!>=mail-mta/ssmtp-2.64-r2[mta]
- !net-mail/fastforward"
+ !net-mail/fastforward
+ selinux? ( sec-policy/selinux-postfix )"
REQUIRED_USE="ldap-bind? ( ldap sasl )"
S="${WORKDIR}/${MY_SRC}"
-pkg_setup() {
- # Add postfix, postdrop user/group (bug #77565)
- enewgroup postfix 207
- enewgroup postdrop 208
- enewuser postfix 207 -1 /var/spool/postfix postfix,mail
-}
+PATCHES=(
+ "${FILESDIR}/${PN}-libressl-certkey.patch"
+ "${FILESDIR}/${PN}-libressl-server.patch"
+ "${FILESDIR}/${PN}-glibc230.patch"
+)
src_prepare() {
- epatch "${FILESDIR}/${PN}-2.11.1-db6.patch"
- if use vda; then
- epatch "${DISTDIR}"/${VDA_P}.patch
- fi
-
+ default
sed -i -e "/^#define ALIAS_DB_MAP/s|:/etc/aliases|:/etc/mail/aliases|" \
src/util/sys_defs.h || die "sed failed"
-
# change default paths to better comply with portage standard paths
sed -i -e "s:/usr/local/:/usr/:g" conf/master.cf || die "sed failed"
}
src_configure() {
+ for name in CDB LDAP LMDB MYSQL PCRE PGSQL SDBM SQLITE
+ do
+ local AUXLIBS_${name}=""
+ done
+
# Make sure LDFLAGS get passed down to the executables.
- local mycc="-DHAS_PCRE" mylibs="${LDFLAGS} -lpcre -lcrypt -lpthread"
+ local mycc="-DHAS_PCRE" mylibs="${LDFLAGS} -ldl"
+ AUXLIBS_PCRE="$(pcre-config --libs)"
use pam && mylibs="${mylibs} -lpam"
if use ldap; then
mycc="${mycc} -DHAS_LDAP"
- mylibs="${mylibs} -lldap -llber"
+ AUXLIBS_LDAP="-lldap -llber"
fi
if use mysql; then
mycc="${mycc} -DHAS_MYSQL $(mysql_config --include)"
- mylibs="${mylibs} $(mysql_config --libs)"
+ AUXLIBS_MYSQL="$(mysql_config --libs)"
fi
if use postgres; then
mycc="${mycc} -DHAS_PGSQL -I$(pg_config --includedir)"
- mylibs="${mylibs} -lpq -L$(pg_config --libdir)"
+ AUXLIBS_PGSQL="-L$(pg_config --libdir) -lpq"
fi
if use sqlite; then
mycc="${mycc} -DHAS_SQLITE"
- mylibs="${mylibs} -lsqlite3"
+ AUXLIBS_SQLITE="-lsqlite3 -lpthread"
fi
if use ssl; then
@@ -108,6 +114,15 @@ src_configure() {
mylibs="${mylibs} -lssl -lcrypto"
fi
+ if use lmdb; then
+ mycc="${mycc} -DHAS_LMDB"
+ AUXLIBS_LMDB="-llmdb -lpthread"
+ fi
+
+ if ! use eai; then
+ mycc="${mycc} -DNO_EAI"
+ fi
+
# broken. and "in other words, not supported" by upstream.
# Use inet_protocols setting in main.cf
#if ! use ipv6; then
@@ -129,33 +144,30 @@ src_configure() {
fi
if ! use nis; then
- sed -i -e "s|#define HAS_NIS|//#define HAS_NIS|g" \
- src/util/sys_defs.h || die "sed failed"
+ mycc="${mycc} -DNO_NIS"
fi
if ! use berkdb; then
mycc="${mycc} -DNO_DB"
if use cdb; then
# change default hash format from Berkeley DB to cdb
- sed -i -e "s/hash/cdb/" src/util/sys_defs.h || die
+ mycc="${mycc} -DDEF_DB_TYPE=\\\"cdb\\\""
fi
fi
if use cdb; then
mycc="${mycc} -DHAS_CDB -I/usr/include/cdb"
- CDB_LIBS=""
# Tinycdb is preferred.
if has_version dev-db/tinycdb ; then
einfo "Building with dev-db/tinycdb"
- CDB_LIBS="-lcdb"
+ AUXLIBS_CDB="-lcdb"
else
einfo "Building with dev-db/cdb"
CDB_PATH="/usr/$(get_libdir)"
for i in cdb.a alloc.a buffer.a unix.a byte.a ; do
- CDB_LIBS="${CDB_LIBS} ${CDB_PATH}/${i}"
+ AUXLIBS_CDB="${AUXLIBS_CDB} ${CDB_PATH}/${i}"
done
fi
- mylibs="${mylibs} ${CDB_LIBS}"
fi
# Robin H. Johnson <robbat2@gentoo.org> 17/Nov/2006
@@ -173,14 +185,18 @@ src_configure() {
sed -i -e "/^RANLIB/s/ranlib/$(tc-getRANLIB)/g" "${S}"/makedefs
sed -i -e "/^AR/s/ar/$(tc-getAR)/g" "${S}"/makedefs
- emake DEBUG="" CC="$(tc-getCC)" OPT="${CFLAGS}" CCARGS="${mycc}" AUXLIBS="${mylibs}" makefiles
+
+ emake makefiles shared=yes dynamicmaps=no pie=yes \
+ shlib_directory="/usr/$(get_libdir)/postfix/MAIL_VERSION" \
+ DEBUG="" CC="$(tc-getCC)" OPT="${CFLAGS}" CCARGS="${mycc}" AUXLIBS="${mylibs}" \
+ AUXLIBS_CDB="${AUXLIBS_CDB}" AUXLIBS_LDAP="${AUXLIBS_LDAP}" \
+ AUXLIBS_LMDB="${AUXLIBS_LMDB}" AUXLIBS_MYSQL="${AUXLIBS_MYSQL}" \
+ AUXLIBS_PCRE="${AUXLIBS_PCRE}" AUXLIBS_PGSQL="${AUXLIBS_PGSQL}" \
+ AUXLIBS_SQLITE="${AUXLIBS_SQLITE}"
}
src_install () {
- local myconf
- use doc && myconf="readme_directory=\"/usr/share/doc/${PF}/readme\" \
- html_directory=\"/usr/share/doc/${PF}/html\""
-
+ LD_LIBRARY_PATH="${S}/lib" \
/bin/sh postfix-install \
-non-interactive \
install_root="${D}" \
@@ -190,7 +206,6 @@ src_install () {
mailq_path="/usr/bin/mailq" \
newaliases_path="/usr/bin/newaliases" \
sendmail_path="/usr/sbin/sendmail" \
- ${myconf} \
|| die "postfix-install failed"
# Fix spool removal on upgrade
@@ -201,30 +216,35 @@ src_install () {
dobin auxiliary/rmail/rmail
# Provide another link for legacy FSH
- dosym /usr/sbin/sendmail /usr/$(get_libdir)/sendmail
+ dosym ../sbin/sendmail /usr/$(get_libdir)/sendmail
- # Install qshape tool
+ # Install qshape, posttls-finger and collate
dobin auxiliary/qshape/qshape.pl
doman man/man1/qshape.1
+ dobin bin/posttls-finger
+ doman man/man1/posttls-finger.1
+ dobin auxiliary/collate/collate.pl
+ newdoc auxiliary/collate/README README.collate
# Performance tuning tools and their manuals
dosbin bin/smtp-{source,sink} bin/qmqp-{source,sink}
doman man/man1/smtp-{source,sink}.1 man/man1/qmqp-{source,sink}.1
# Set proper permissions on required files/directories
- dodir /var/lib/postfix
keepdir /var/lib/postfix
fowners -R postfix:postfix /var/lib/postfix
fperms 0750 /var/lib/postfix
fowners root:postdrop /usr/sbin/post{drop,queue}
- fperms 02711 /usr/sbin/post{drop,queue}
+ fperms 02755 /usr/sbin/post{drop,queue}
keepdir /etc/postfix
+ keepdir /etc/postfix/postfix-files.d
if use mbox; then
mypostconf="mail_spool_directory=/var/spool/mail"
else
mypostconf="home_mailbox=.maildir/"
fi
+ LD_LIBRARY_PATH="${S}/lib" \
"${D}"/usr/sbin/postconf -c "${D}"/etc/postfix \
-e ${mypostconf} || die "postconf failed"
@@ -238,8 +258,9 @@ src_install () {
use postgres || sed -i -e "s/postgresql //" "${D}/etc/init.d/postfix"
dodoc *README COMPATIBILITY HISTORY PORTING RELEASE_NOTES*
- mv "${D}"/etc/postfix/{*.default,makedefs.out} "${D}"/usr/share/doc/${PF}/
- use doc && mv "${S}"/examples "${D}"/usr/share/doc/${PF}/
+ mv "${S}"/examples "${D}"/usr/share/doc/${PF}/
+ # postfix set-permissions expects uncompressed man files
+ docompress -x /usr/share/man
pamd_mimic_system smtp auth account
@@ -252,42 +273,26 @@ src_install () {
insinto /usr/include/postfix
doins include/*.h
- # Remove unnecessary files
- rm -f "${D}"/etc/postfix/{*LICENSE,access,aliases,canonical,generic}
- rm -f "${D}"/etc/postfix/{header_checks,relocated,transport,virtual}
+ if has_version mail-mta/postfix; then
+ # let the sysadmin decide when to change the compatibility_level
+ sed -i -e /^compatibility_level/"s/^/#/" "${D}"/etc/postfix/main.cf || die
+ fi
systemd_dounit "${FILESDIR}/${PN}.service"
}
pkg_preinst() {
- # Postfix 2.9.
- # default for inet_protocols changed from ipv4 to all in postfix-2.9.
- # check inet_protocols setting in main.cf and modify if necessary to prevent
- # performance loss with useless DNS lookups and useless connection attempts.
- [[ -d ${ROOT}/etc/postfix ]] && {
- if [[ "$(${D}/usr/sbin/postconf -dh inet_protocols)" != "ipv4" ]]; then
- if [[ ! -n "$(${D}/usr/sbin/postconf -c ${ROOT}/etc/postfix -n inet_protocols)" ]];
- then
- ewarn "\nCOMPATIBILITY: adding inet_protocols=ipv4 to main.cf."
- ewarn "That will keep the same behaviour as previous postfix versions."
- ewarn "Specify inet_protocols explicitly if you want to enable IPv6.\n"
- else
- # delete inet_protocols setting. there is already one in /etc/postfix
- sed -i -e /inet_protocols/d "${D}"/etc/postfix/main.cf || die
- fi
+ if has_version '<mail-mta/postfix-3.4'; then
+ elog
+ elog "Postfix-3.4 introduces a new master.cf service 'postlog'"
+ elog "with type 'unix-dgram' that is used by the new postlogd(8) daemon."
+ elog "Before backing out to an older Postfix version, edit the master.cf"
+ elog "file and remove the postlog entry."
+ elog
fi
- }
}
pkg_postinst() {
- # Do not install server.{key,pem) SSL certificates if they already exist
- if use ssl && [[ ! -f "${ROOT}"/etc/ssl/postfix/server.key \
- && ! -f "${ROOT}"/etc/ssl/postfix/server.pem ]] ; then
- SSL_ORGANIZATION="${SSL_ORGANIZATION:-Postfix SMTP Server}"
- install_cert /etc/ssl/postfix/server
- chown postfix:mail "${ROOT}"/etc/ssl/postfix/server.{key,pem}
- fi
-
if [[ ! -e /etc/mail/aliases.db ]] ; then
ewarn
ewarn "You must edit /etc/mail/aliases to suit your needs"
@@ -295,4 +300,19 @@ pkg_postinst() {
ewarn "work correctly without it."
ewarn
fi
+
+ # check and fix file permissions
+ "${EROOT}"/usr/sbin/postfix set-permissions
+
+ # configure tls
+ if use ssl ; then
+ if "${EROOT}"/usr/sbin/postfix tls all-default-client; then
+ elog "To configure client side TLS settings:"
+ elog "${EROOT}"/usr/sbin/postfix tls enable-client
+ fi
+ if "${EROOT}"/usr/sbin/postfix tls all-default-server; then
+ elog "To configure server side TLS settings:"
+ elog "${EROOT}"/usr/sbin/postfix tls enable-server
+ fi
+ fi
}
diff --git a/mail-mta/postfix/postfix-3.5_pre20191019.ebuild b/mail-mta/postfix/postfix-3.5_pre20191214.ebuild
index 267950e32ba9..45fc9fcc8c23 100644
--- a/mail-mta/postfix/postfix-3.5_pre20191019.ebuild
+++ b/mail-mta/postfix/postfix-3.5_pre20191214.ebuild
@@ -16,7 +16,7 @@ SRC_URI="${MY_URI}/${MY_SRC}.tar.gz"
LICENSE="|| ( IBM EPL-2.0 )"
SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
IUSE="+berkdb cdb dovecot-sasl +eai hardened ldap ldap-bind libressl lmdb memcached mbox mysql nis pam postgres sasl selinux sqlite ssl"
DEPEND=">=dev-libs/libpcre-3.4
@@ -54,8 +54,7 @@ RDEPEND="${DEPEND}
!mail-mta/qmail-ldap
!mail-mta/sendmail
!mail-mta/opensmtpd
- !<mail-mta/ssmtp-2.64-r2
- !>=mail-mta/ssmtp-2.64-r2[mta]
+ !mail-mta/ssmtp[mta]
!net-mail/fastforward
selinux? ( sec-policy/selinux-postfix )"
generated by cgit v1.2.3 (git 2.25.1) at 2024-07-19 04:48:04 +0000