mail-mta/postfix: bump to 3.4.9
authorEray Aslan <eras@gentoo.org>
Tue, 4 Feb 2020 10:02:25 +0000 (13:02 +0300)
committerEray Aslan <eras@gentoo.org>
Tue, 4 Feb 2020 10:02:25 +0000 (13:02 +0300)
and fix building with gcc-10
Closes: https://bugs.gentoo.org/705902
Package-Manager: Portage-2.3.87, Repoman-2.3.20
Signed-off-by: Eray Aslan <eras@gentoo.org>
mail-mta/postfix/Manifest
mail-mta/postfix/files/postfix-gcc10.patch [new file with mode: 0644]
mail-mta/postfix/postfix-3.4.9.ebuild [new file with mode: 0644]

index ea4140f49e1ef1e53c31c16fbb02c698b229ffb7..7c5d43e0094bfee689afedf9e9342926f6e1b0d9 100644 (file)
@@ -2,4 +2,5 @@ DIST postfix-3.4.5.tar.gz 4581301 BLAKE2B 9de66cab6eea610fc83e4629980b3e201b4e3f
 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.4.8.tar.gz 4573099 BLAKE2B cef447c8eeb9e2afbb869a94c5d67680ed7e633ea23108c1c109b632bd3f53f9f666302e8d1dac70affcd7d02d27b71a83b06c8e4564b6187268aa656b4c8132 SHA512 782fe83e4b40c7aadfb4c55850db4c7163dd0f647f4ef133e59f7b47c993b2b4fa6c43ebbc45131caa54d968259f9c8568f47e81bfccda02ab142be52aa95d45
+DIST postfix-3.4.9.tar.gz 4573241 BLAKE2B 6f6bd977d4670328aa89a296c0d92d7022a85e289b5197ad46f80e0fb88af565ca93f2affab50c742dd05010aa9a9ea2a68264c07f986ad39a6c1d7d6dec8300 SHA512 9038850d79bf19460d55dede2dd97e6f4bd8255363b4004704e5f0493bf9b1c0729f5bb11663ba6f6ed34177205609f72401b0f55d1d9dbce5398b4603a0a991
 DIST postfix-3.5-20200203.tar.gz 4639007 BLAKE2B 0a79068183ba9658a8295b9f9faa187baf8e05e01a7b446354625bcf020e1ade205dd82eee039f14f3d75410be9a35f0b29dc25e016e61a2cf8d40b5abb3b032 SHA512 61e9f5554717cbe46b976567e50a247c6aee947b395d40fbdd67e42ec1669bf44bb3b69cd5a7f8e2c6f7dd693c4fac42e7329cdf76f37dcc4b9bfd354522bd06
diff --git a/mail-mta/postfix/files/postfix-gcc10.patch b/mail-mta/postfix/files/postfix-gcc10.patch
new file mode 100644 (file)
index 0000000..cd263c5
--- /dev/null
@@ -0,0 +1,64 @@
+--- a/src/global/mail_params.h 2020-01-21 10:52:36.025753878 +0300
++++ b/src/global/mail_params.h 2020-01-21 10:53:11.173763126 +0300
+@@ -3983,23 +3983,23 @@
+ #define VAR_TLSP_CLNT_USE_TLS         "tlsproxy_client_use_tls"
+ #define DEF_TLSP_CLNT_USE_TLS         "$" VAR_SMTP_USE_TLS
+-bool    var_tlsp_clnt_use_tls;
++extern bool    var_tlsp_clnt_use_tls;
+ #define VAR_TLSP_CLNT_ENFORCE_TLS     "tlsproxy_client_enforce_tls"
+ #define DEF_TLSP_CLNT_ENFORCE_TLS     "$" VAR_SMTP_ENFORCE_TLS
+-bool    var_tlsp_clnt_enforce_tls;
++extern bool    var_tlsp_clnt_enforce_tls;
+ #define VAR_TLSP_CLNT_LEVEL           "tlsproxy_client_level"
+ #define DEF_TLSP_CLNT_LEVEL           "$" VAR_SMTP_TLS_LEVEL
+-char   *var_tlsp_clnt_level;
++extern char   *var_tlsp_clnt_level;
+ #define VAR_TLSP_CLNT_PER_SITE                "tlsproxy_client_per_site"
+ #define DEF_TLSP_CLNT_PER_SITE                "$" VAR_SMTP_TLS_PER_SITE
+-char   *var_tlsp_clnt_per_site;
++extern char   *var_tlsp_clnt_per_site;
+ #define VAR_TLSP_CLNT_POLICY          "tlsproxy_client_policy"
+ #define DEF_TLSP_CLNT_POLICY          "$" VAR_SMTP_TLS_POLICY
+-char   *var_tlsp_clnt_policy;
++extern char   *var_tlsp_clnt_policy;
+  /*
+   * SMTPD "reject" contact info.
+--- a/src/smtpd/smtpd_expand.h 2014-12-07 03:35:34.000000000 +0200
++++ b/src/smtpd/smtpd_expand.h 2020-01-21 11:30:10.270425259 +0300
+@@ -18,7 +18,7 @@
+  /*
+   * External interface.
+   */
+-VSTRING *smtpd_expand_filter;
++extern VSTRING *smtpd_expand_filter;
+ void    smtpd_expand_init(void);
+ const char *smtpd_expand_lookup(const char *, int, void *);
+ int     smtpd_expand(SMTPD_STATE *, VSTRING *, const char *, int);
+--- a/src/trivial-rewrite/trivial-rewrite.h    2014-10-06 18:02:16.000000000 +0300
++++ b/src/trivial-rewrite/trivial-rewrite.h    2020-01-21 11:29:36.411409526 +0300
+@@ -23,7 +23,7 @@
+  /*
+   * Connection management.
+   */
+-int     server_flags;
++extern int     server_flags;
+  /*
+   * rewrite.c
+--- a/src/postconf/postconf.h  2018-02-19 04:43:29.000000000 +0300
++++ b/src/postconf/postconf.h  2020-01-21 11:29:07.851401023 +0300
+@@ -152,7 +152,7 @@
+   * Lookup table for master.cf entries. The table is terminated with an entry
+   * that has a null argv member.
+   */
+-PCF_MASTER_ENT *pcf_master_table;
++extern PCF_MASTER_ENT *pcf_master_table;
+  /*
+   * Line-wrapping support.
diff --git a/mail-mta/postfix/postfix-3.4.9.ebuild b/mail-mta/postfix/postfix-3.4.9.ebuild
new file mode 100644 (file)
index 0000000..fc0e7c9
--- /dev/null
@@ -0,0 +1,319 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+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"
+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 ~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-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? ( sys-libs/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-2.9.1:0= )
+       )"
+
+RDEPEND="${DEPEND}
+       acct-group/postfix
+       acct-group/postdrop
+       acct-user/postfix
+       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}"
+
+PATCHES=(
+       "${FILESDIR}/${PN}-libressl-certkey.patch"
+       "${FILESDIR}/${PN}-libressl-server.patch"
+       "${FILESDIR}/${PN}-glibc230.patch"
+       "${FILESDIR}/${PN}-gcc10.patch"
+)
+
+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"
+}
+
+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
+}