summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorEray Aslan <eras@gentoo.org>2019-04-29 09:24:35 +0300
committerEray Aslan <eras@gentoo.org>2019-04-29 09:24:35 +0300
commit44492eeea3382487a87cdab5a9d412b7e8294331 (patch)
tree3cdc4eb0a531a93ab17d4e255780a51425275c4f /mail-mta/postfix
parentdev-ruby/tzinfo: amd64 stable, bug 684548 (diff)
downloadgentoo-44492eeea3382487a87cdab5a9d412b7e8294331.tar.gz
gentoo-44492eeea3382487a87cdab5a9d412b7e8294331.tar.bz2
gentoo-44492eeea3382487a87cdab5a9d412b7e8294331.zip
mail-mta/postfix: bump to 3.5_pre20190427
Closes: https://github.com/gentoo/gentoo/pull/11853 Package-Manager: Portage-2.3.65, Repoman-2.3.12 Signed-off-by: Eray Aslan <eras@gentoo.org>
Diffstat (limited to 'mail-mta/postfix')
-rw-r--r--mail-mta/postfix/Manifest2
-rw-r--r--mail-mta/postfix/postfix-3.5_pre20190330.ebuild324
-rw-r--r--mail-mta/postfix/postfix-3.5_pre20190427.ebuild (renamed from mail-mta/postfix/postfix-3.5_pre20190330-r1.ebuild)5
3 files changed, 4 insertions, 327 deletions
diff --git a/mail-mta/postfix/Manifest b/mail-mta/postfix/Manifest
index 06ca2f062a79..027d953a0635 100644
--- a/mail-mta/postfix/Manifest
+++ b/mail-mta/postfix/Manifest
@@ -3,5 +3,5 @@ DIST postfix-3.2.4.tar.gz 4390376 BLAKE2B 132a6b467f9156d716a92cc7beae0f9a7c47e6
DIST postfix-3.3.1.tar.gz 4420912 BLAKE2B 065fd04cdfa343a6c50a629e8da47fad71465df790ca88adcad4efc7ab273330c39998c6bf503587b8bcba3d87bb98b1be6413e49449e2241258a99217473c11 SHA512 2307f50f8b7dab1db46ebe4ae30bc5682a25b9c49ae5ae65aa95b4620bb5450dd5929977c0f34b9e73a92ca6af36fd8e24167732420a1a2d89167c7a3b197276
DIST postfix-3.3.4.tar.gz 4429964 BLAKE2B 58812a75e7f8e2e89dce3dd8cb8b779c4b90995ce9d1885cec0fc475c8dc267741ea6c7af6e82fc80e3f71244964df9a5fe776c3b09e5e0cad1f59424dfab6b3 SHA512 fccc524167ea3b85f4fe0fc4ad8312f6d684c1900e7c5c355d4522513f74b588bbfcfd28074a8b69ce038982fcaa359abf585a296df4046184c7da6d0405d0ee
DIST postfix-3.4.5.tar.gz 4581301 BLAKE2B 9de66cab6eea610fc83e4629980b3e201b4e3f9185729cb84933aa940b64b7818d0439c5145ea0b635666db92c970e1974f4f439cd3b733c58e1fe5794c046fa SHA512 af59d960b40799f7667935bef8fafb93ae6dcb70abaa77a15cf498571f37fa0429f411f9f08b1b6bfa588d3f572260d14d6d5409f0cd1e82b1c59928b2124c94
-DIST postfix-3.5-20190330.tar.gz 4596058 BLAKE2B 0710881919361e6307902f287fb10fd26d27e2e51293b4a297191cd69687477e9e5e3e7bbe1c15ec2e440629eef78574705eda8fbf3e0b7f7440bcfe5ef33366 SHA512 d6e8e7bbc1a47aaa86105c3281c00ed3806e29cb33a27f062a25b92bbb557e8d022f873fb77be65dcf7c8c10c73ed91c61625641649d99a45dbf77c01eac3f85
+DIST postfix-3.5-20190427.tar.gz 4600362 BLAKE2B 2e77228fecaba606b4e5a7bf00f8a3b03a193f0414a42d613c08aa8a829dc13a9f7ea0b8563b0168c603deae37fca15865ee4294a74d635d4074f42466745fcc SHA512 267bfe09d3f5e4a38fbfdfbe8ec8d5a0ce5037eb1cea771b8dda1bcc0495d0ac6ac941ee3f67982169dfcb10cde2b40e9691175b9ac0f8e30416946caa280ad0
DIST postfix-vda-v13-2.10.0.patch 55701 BLAKE2B d8df041bb4ae7457cd066e71b6ae9470840d42edc9990a550ae51356cd62bfb08516250249030da26d1ef475619f0ebd609570d84ce57f8cdc347a2824b29536 SHA512 0b4b53a8cd28abf56eee3b2ed63ca1814251b60816e6ca1143249d25fd6ef7f905bec3134125ac6e851af685db8aae878012113693261529ae2ddbcf1bd93e62
diff --git a/mail-mta/postfix/postfix-3.5_pre20190330.ebuild b/mail-mta/postfix/postfix-3.5_pre20190330.ebuild
deleted file mode 100644
index 719df87d4e80..000000000000
--- a/mail-mta/postfix/postfix-3.5_pre20190330.ebuild
+++ /dev/null
@@ -1,324 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit flag-o-matic pam systemd toolchain-funcs user
-
-MY_PV="${PV/_pre/-}"
-MY_SRC="${PN}-${MY_PV}"
-MY_URI="ftp://ftp.porcupine.org/mirrors/postfix-release/experimental"
-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"
-
-LICENSE="|| ( IBM EPL-2.0 )"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd"
-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-r4 ) )
- eai? ( dev-libs/icu:= )
- ldap? ( net-nds/openldap )
- ldap-bind? ( net-nds/openldap[sasl] )
- lmdb? ( >=dev-db/lmdb-0.9.11 )
- mysql? ( dev-db/mysql-connector-c:0= )
- nis? ( net-libs/libnsl )
- pam? ( virtual/pam )
- postgres? ( dev-db/postgresql:* )
- sasl? ( >=dev-libs/cyrus-sasl-2 )
- sqlite? ( dev-db/sqlite:3 )
- ssl? (
- !libressl? ( dev-libs/openssl:0= )
- libressl? ( dev-libs/libressl )
- )"
-
-RDEPEND="${DEPEND}
- memcached? ( net-misc/memcached )
- net-mail/mailbase
- !mail-mta/courier
- !mail-mta/esmtp
- !mail-mta/exim
- !mail-mta/mini-qmail
- !mail-mta/msmtp[mta]
- !mail-mta/netqmail
- !mail-mta/nullmailer
- !mail-mta/qmail-ldap
- !mail-mta/sendmail
- !mail-mta/opensmtpd
- !<mail-mta/ssmtp-2.64-r2
- !>=mail-mta/ssmtp-2.64-r2[mta]
- !net-mail/fastforward
- selinux? ( sec-policy/selinux-postfix )"
-
-REQUIRED_USE="ldap-bind? ( ldap sasl )"
-
-S="${WORKDIR}/${MY_SRC}"
-
-pkg_setup() {
- if use libressl; then
- die "LibreSSL patches are not yet available for postfix-3.4 releases."
- fi
- # Add postfix, postdrop user/group (bug #77565)
- enewgroup postfix 207
- enewgroup postdrop 208
- enewuser postfix 207 -1 /var/spool/postfix postfix,mail
-}
-
-src_prepare() {
- 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"
- # libressl support needs work for >=postfix-3.4
- #eapply -p0 "${FILESDIR}/${PN}-libressl.patch" \
- # "${FILESDIR}/${PN}-libressl-runtime.patch" \
- # "${FILESDIR}/${PN}-libressl-eccurve.patch"
- # "${FILESDIR}/${PN}-libressl-session-tickets.patch"
-}
-
-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} -ldl"
- AUXLIBS_PCRE="$(pcre-config --libs)"
-
- use pam && mylibs="${mylibs} -lpam"
-
- if use ldap; then
- mycc="${mycc} -DHAS_LDAP"
- AUXLIBS_LDAP="-lldap -llber"
- fi
-
- if use mysql; then
- mycc="${mycc} -DHAS_MYSQL $(mysql_config --include)"
- AUXLIBS_MYSQL="$(mysql_config --libs)"
- fi
-
- if use postgres; then
- mycc="${mycc} -DHAS_PGSQL -I$(pg_config --includedir)"
- AUXLIBS_PGSQL="-L$(pg_config --libdir) -lpq"
- fi
-
- if use sqlite; then
- mycc="${mycc} -DHAS_SQLITE"
- AUXLIBS_SQLITE="-lsqlite3 -lpthread"
- fi
-
- if use ssl; then
- mycc="${mycc} -DUSE_TLS"
- 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
- # mycc="${mycc} -DNO_IPV6"
- #fi
-
- if use sasl; then
- if use dovecot-sasl; then
- # Set dovecot as default.
- mycc="${mycc} -DDEF_SASL_SERVER=\\\"dovecot\\\""
- fi
- if use ldap-bind; then
- mycc="${mycc} -DUSE_LDAP_SASL"
- fi
- mycc="${mycc} -DUSE_SASL_AUTH -DUSE_CYRUS_SASL -I/usr/include/sasl"
- mylibs="${mylibs} -lsasl2"
- elif use dovecot-sasl; then
- mycc="${mycc} -DUSE_SASL_AUTH -DDEF_SERVER_SASL_TYPE=\\\"dovecot\\\""
- fi
-
- if ! use nis; then
- 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
- mycc="${mycc} -DDEF_DB_TYPE=\\\"cdb\\\""
- fi
- fi
-
- if use cdb; then
- mycc="${mycc} -DHAS_CDB -I/usr/include/cdb"
- # Tinycdb is preferred.
- if has_version dev-db/tinycdb ; then
- einfo "Building with dev-db/tinycdb"
- 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
- AUXLIBS_CDB="${AUXLIBS_CDB} ${CDB_PATH}/${i}"
- done
- fi
- fi
-
- # Robin H. Johnson <robbat2@gentoo.org> 17/Nov/2006
- # Fix because infra boxes hit 2Gb .db files that fail a 32-bit fstat signed check.
- mycc="${mycc} -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE"
- filter-lfs-flags
-
- # Workaround for bug #76512
- if use hardened; then
- [[ "$(gcc-version)" == "3.4" ]] && replace-flags -O? -Os
- fi
-
- # Remove annoying C++ comment style warnings - bug #378099
- append-flags -Wno-comment
-
- sed -i -e "/^RANLIB/s/ranlib/$(tc-getRANLIB)/g" "${S}"/makedefs
- sed -i -e "/^AR/s/ar/$(tc-getAR)/g" "${S}"/makedefs
-
- 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 () {
- LD_LIBRARY_PATH="${S}/lib" \
- /bin/sh postfix-install \
- -non-interactive \
- install_root="${D}" \
- config_directory="/etc/postfix" \
- manpage_directory="/usr/share/man" \
- command_directory="/usr/sbin" \
- mailq_path="/usr/bin/mailq" \
- newaliases_path="/usr/bin/newaliases" \
- sendmail_path="/usr/sbin/sendmail" \
- || die "postfix-install failed"
-
- # Fix spool removal on upgrade
- rm -Rf "${D}"/var
- keepdir /var/spool/postfix
-
- # Install rmail for UUCP, closes bug #19127
- dobin auxiliary/rmail/rmail
-
- # Provide another link for legacy FSH
- dosym ../sbin/sendmail /usr/$(get_libdir)/sendmail
-
- # 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
- 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 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"
-
- insinto /etc/postfix
- newins "${FILESDIR}"/smtp.pass saslpass
- fperms 600 /etc/postfix/saslpass
-
- newinitd "${FILESDIR}"/postfix.rc6.${RC_VER} postfix
- # do not start mysql/postgres unnecessarily - bug #359913
- use mysql || sed -i -e "s/mysql //" "${D}/etc/init.d/postfix"
- use postgres || sed -i -e "s/postgresql //" "${D}/etc/init.d/postfix"
-
- dodoc *README COMPATIBILITY HISTORY PORTING RELEASE_NOTES*
- 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
-
- if use sasl; then
- insinto /etc/sasl2
- newins "${FILESDIR}"/smtp.sasl smtpd.conf
- fi
-
- # header files
- insinto /usr/include/postfix
- doins include/*.h
-
- 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() {
- 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() {
- if [[ ! -e /etc/mail/aliases.db ]] ; then
- ewarn
- ewarn "You must edit /etc/mail/aliases to suit your needs"
- ewarn "and then run /usr/bin/newaliases. Postfix will not"
- 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_pre20190330-r1.ebuild b/mail-mta/postfix/postfix-3.5_pre20190427.ebuild
index a9a8032fad57..4df478ad0871 100644
--- a/mail-mta/postfix/postfix-3.5_pre20190330-r1.ebuild
+++ b/mail-mta/postfix/postfix-3.5_pre20190427.ebuild
@@ -35,7 +35,7 @@ DEPEND=">=dev-libs/libpcre-3.4
sqlite? ( dev-db/sqlite:3 )
ssl? (
!libressl? ( dev-libs/openssl:0= )
- libressl? ( >=dev-libs/libressl-2.9.1 )
+ libressl? ( >=dev-libs/libressl-2.9.1:0= )
)"
RDEPEND="${DEPEND}
@@ -60,7 +60,8 @@ REQUIRED_USE="ldap-bind? ( ldap sasl )"
S="${WORKDIR}/${MY_SRC}"
-PATCHES=( "${FILESDIR}/${PN}-libressl-certkey.patch"
+PATCHES=(
+ "${FILESDIR}/${PN}-libressl-certkey.patch"
"${FILESDIR}/${PN}-libressl-server.patch"
)