Gentoo Archives: gentoo-commits

From: Eray Aslan <eras@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: mail-mta/postfix/, mail-mta/postfix/files/
Date: Tue, 04 Feb 2020 10:02:54
Message-Id: 1580810545.829c06c6774da25335bc4d4326dd86f6bbbc44a1.eras@gentoo
1 commit: 829c06c6774da25335bc4d4326dd86f6bbbc44a1
2 Author: Eray Aslan <eras <AT> gentoo <DOT> org>
3 AuthorDate: Tue Feb 4 10:02:25 2020 +0000
4 Commit: Eray Aslan <eras <AT> gentoo <DOT> org>
5 CommitDate: Tue Feb 4 10:02:25 2020 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=829c06c6
7
8 mail-mta/postfix: bump to 3.4.9
9
10 and fix building with gcc-10
11 Closes: https://bugs.gentoo.org/705902
12 Package-Manager: Portage-2.3.87, Repoman-2.3.20
13 Signed-off-by: Eray Aslan <eras <AT> gentoo.org>
14
15 mail-mta/postfix/Manifest | 1 +
16 mail-mta/postfix/files/postfix-gcc10.patch | 64 ++++++
17 mail-mta/postfix/postfix-3.4.9.ebuild | 319 +++++++++++++++++++++++++++++
18 3 files changed, 384 insertions(+)
19
20 diff --git a/mail-mta/postfix/Manifest b/mail-mta/postfix/Manifest
21 index ea4140f49e1..7c5d43e0094 100644
22 --- a/mail-mta/postfix/Manifest
23 +++ b/mail-mta/postfix/Manifest
24 @@ -2,4 +2,5 @@ DIST postfix-3.4.5.tar.gz 4581301 BLAKE2B 9de66cab6eea610fc83e4629980b3e201b4e3f
25 DIST postfix-3.4.6.tar.gz 4571771 BLAKE2B e08b2e6c01fe54fcc7439182783190f4adb81758a1bbcc1bfec71e02dca91a779308f624e081837f7e2deec8666f10bc51238e90cc952de6c8371fb18790604f SHA512 96430d60cf58b9876e52a742dbfe3ca1da4ec82eeea5cd35c6ee4e69714ddd5601561a6663aac51a34b2d64db4f7678d7c5d720ec9ead807b5d7e87e37434961
26 DIST postfix-3.4.7.tar.gz 4572758 BLAKE2B 8d811293672fc2a1e0e3276fadd172d9e130a3e0b5ccbaf27ddf183a50f25ca9bbf5c0a28806bb1f79d5648c4de44edd8ee98192355077e29a0c69a2685878dc SHA512 2bc29a87a65c46d06b6fc51c4cdf22da773e63f19488871e040eba6250bf686eecc7de11e14224018c35b061e66e1759c69dc649d7388f724a58080195209e68
27 DIST postfix-3.4.8.tar.gz 4573099 BLAKE2B cef447c8eeb9e2afbb869a94c5d67680ed7e633ea23108c1c109b632bd3f53f9f666302e8d1dac70affcd7d02d27b71a83b06c8e4564b6187268aa656b4c8132 SHA512 782fe83e4b40c7aadfb4c55850db4c7163dd0f647f4ef133e59f7b47c993b2b4fa6c43ebbc45131caa54d968259f9c8568f47e81bfccda02ab142be52aa95d45
28 +DIST postfix-3.4.9.tar.gz 4573241 BLAKE2B 6f6bd977d4670328aa89a296c0d92d7022a85e289b5197ad46f80e0fb88af565ca93f2affab50c742dd05010aa9a9ea2a68264c07f986ad39a6c1d7d6dec8300 SHA512 9038850d79bf19460d55dede2dd97e6f4bd8255363b4004704e5f0493bf9b1c0729f5bb11663ba6f6ed34177205609f72401b0f55d1d9dbce5398b4603a0a991
29 DIST postfix-3.5-20200203.tar.gz 4639007 BLAKE2B 0a79068183ba9658a8295b9f9faa187baf8e05e01a7b446354625bcf020e1ade205dd82eee039f14f3d75410be9a35f0b29dc25e016e61a2cf8d40b5abb3b032 SHA512 61e9f5554717cbe46b976567e50a247c6aee947b395d40fbdd67e42ec1669bf44bb3b69cd5a7f8e2c6f7dd693c4fac42e7329cdf76f37dcc4b9bfd354522bd06
30
31 diff --git a/mail-mta/postfix/files/postfix-gcc10.patch b/mail-mta/postfix/files/postfix-gcc10.patch
32 new file mode 100644
33 index 00000000000..cd263c5eedb
34 --- /dev/null
35 +++ b/mail-mta/postfix/files/postfix-gcc10.patch
36 @@ -0,0 +1,64 @@
37 +--- a/src/global/mail_params.h 2020-01-21 10:52:36.025753878 +0300
38 ++++ b/src/global/mail_params.h 2020-01-21 10:53:11.173763126 +0300
39 +@@ -3983,23 +3983,23 @@
40 +
41 + #define VAR_TLSP_CLNT_USE_TLS "tlsproxy_client_use_tls"
42 + #define DEF_TLSP_CLNT_USE_TLS "$" VAR_SMTP_USE_TLS
43 +-bool var_tlsp_clnt_use_tls;
44 ++extern bool var_tlsp_clnt_use_tls;
45 +
46 + #define VAR_TLSP_CLNT_ENFORCE_TLS "tlsproxy_client_enforce_tls"
47 + #define DEF_TLSP_CLNT_ENFORCE_TLS "$" VAR_SMTP_ENFORCE_TLS
48 +-bool var_tlsp_clnt_enforce_tls;
49 ++extern bool var_tlsp_clnt_enforce_tls;
50 +
51 + #define VAR_TLSP_CLNT_LEVEL "tlsproxy_client_level"
52 + #define DEF_TLSP_CLNT_LEVEL "$" VAR_SMTP_TLS_LEVEL
53 +-char *var_tlsp_clnt_level;
54 ++extern char *var_tlsp_clnt_level;
55 +
56 + #define VAR_TLSP_CLNT_PER_SITE "tlsproxy_client_per_site"
57 + #define DEF_TLSP_CLNT_PER_SITE "$" VAR_SMTP_TLS_PER_SITE
58 +-char *var_tlsp_clnt_per_site;
59 ++extern char *var_tlsp_clnt_per_site;
60 +
61 + #define VAR_TLSP_CLNT_POLICY "tlsproxy_client_policy"
62 + #define DEF_TLSP_CLNT_POLICY "$" VAR_SMTP_TLS_POLICY
63 +-char *var_tlsp_clnt_policy;
64 ++extern char *var_tlsp_clnt_policy;
65 +
66 + /*
67 + * SMTPD "reject" contact info.
68 +--- a/src/smtpd/smtpd_expand.h 2014-12-07 03:35:34.000000000 +0200
69 ++++ b/src/smtpd/smtpd_expand.h 2020-01-21 11:30:10.270425259 +0300
70 +@@ -18,7 +18,7 @@
71 + /*
72 + * External interface.
73 + */
74 +-VSTRING *smtpd_expand_filter;
75 ++extern VSTRING *smtpd_expand_filter;
76 + void smtpd_expand_init(void);
77 + const char *smtpd_expand_lookup(const char *, int, void *);
78 + int smtpd_expand(SMTPD_STATE *, VSTRING *, const char *, int);
79 +--- a/src/trivial-rewrite/trivial-rewrite.h 2014-10-06 18:02:16.000000000 +0300
80 ++++ b/src/trivial-rewrite/trivial-rewrite.h 2020-01-21 11:29:36.411409526 +0300
81 +@@ -23,7 +23,7 @@
82 + /*
83 + * Connection management.
84 + */
85 +-int server_flags;
86 ++extern int server_flags;
87 +
88 + /*
89 + * rewrite.c
90 +--- a/src/postconf/postconf.h 2018-02-19 04:43:29.000000000 +0300
91 ++++ b/src/postconf/postconf.h 2020-01-21 11:29:07.851401023 +0300
92 +@@ -152,7 +152,7 @@
93 + * Lookup table for master.cf entries. The table is terminated with an entry
94 + * that has a null argv member.
95 + */
96 +-PCF_MASTER_ENT *pcf_master_table;
97 ++extern PCF_MASTER_ENT *pcf_master_table;
98 +
99 + /*
100 + * Line-wrapping support.
101
102 diff --git a/mail-mta/postfix/postfix-3.4.9.ebuild b/mail-mta/postfix/postfix-3.4.9.ebuild
103 new file mode 100644
104 index 00000000000..fc0e7c9a565
105 --- /dev/null
106 +++ b/mail-mta/postfix/postfix-3.4.9.ebuild
107 @@ -0,0 +1,319 @@
108 +# Copyright 1999-2020 Gentoo Authors
109 +# Distributed under the terms of the GNU General Public License v2
110 +
111 +EAPI=7
112 +
113 +inherit flag-o-matic pam systemd toolchain-funcs
114 +
115 +MY_PV="${PV/_rc/-RC}"
116 +MY_SRC="${PN}-${MY_PV}"
117 +MY_URI="ftp://ftp.porcupine.org/mirrors/postfix-release/official"
118 +RC_VER="2.7"
119 +
120 +DESCRIPTION="A fast and secure drop-in replacement for sendmail"
121 +HOMEPAGE="http://www.postfix.org/"
122 +SRC_URI="${MY_URI}/${MY_SRC}.tar.gz"
123 +
124 +LICENSE="|| ( IBM EPL-2.0 )"
125 +SLOT="0"
126 +KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
127 +IUSE="+berkdb cdb dovecot-sasl +eai hardened ldap ldap-bind libressl lmdb memcached mbox mysql nis pam postgres sasl selinux sqlite ssl"
128 +
129 +DEPEND=">=dev-libs/libpcre-3.4
130 + dev-lang/perl
131 + berkdb? ( >=sys-libs/db-3.2:* )
132 + cdb? ( || ( >=dev-db/tinycdb-0.76 >=dev-db/cdb-0.75-r4 ) )
133 + eai? ( dev-libs/icu:= )
134 + ldap? ( net-nds/openldap )
135 + ldap-bind? ( net-nds/openldap[sasl] )
136 + lmdb? ( >=dev-db/lmdb-0.9.11 )
137 + mysql? ( dev-db/mysql-connector-c:0= )
138 + nis? ( net-libs/libnsl )
139 + pam? ( sys-libs/pam )
140 + postgres? ( dev-db/postgresql:* )
141 + sasl? ( >=dev-libs/cyrus-sasl-2 )
142 + sqlite? ( dev-db/sqlite:3 )
143 + ssl? (
144 + !libressl? ( dev-libs/openssl:0= )
145 + libressl? ( >=dev-libs/libressl-2.9.1:0= )
146 + )"
147 +
148 +RDEPEND="${DEPEND}
149 + acct-group/postfix
150 + acct-group/postdrop
151 + acct-user/postfix
152 + memcached? ( net-misc/memcached )
153 + net-mail/mailbase
154 + !mail-mta/courier
155 + !mail-mta/esmtp
156 + !mail-mta/exim
157 + !mail-mta/mini-qmail
158 + !mail-mta/msmtp[mta]
159 + !mail-mta/netqmail
160 + !mail-mta/nullmailer
161 + !mail-mta/qmail-ldap
162 + !mail-mta/sendmail
163 + !mail-mta/opensmtpd
164 + !<mail-mta/ssmtp-2.64-r2
165 + !>=mail-mta/ssmtp-2.64-r2[mta]
166 + !net-mail/fastforward
167 + selinux? ( sec-policy/selinux-postfix )"
168 +
169 +REQUIRED_USE="ldap-bind? ( ldap sasl )"
170 +
171 +S="${WORKDIR}/${MY_SRC}"
172 +
173 +PATCHES=(
174 + "${FILESDIR}/${PN}-libressl-certkey.patch"
175 + "${FILESDIR}/${PN}-libressl-server.patch"
176 + "${FILESDIR}/${PN}-glibc230.patch"
177 + "${FILESDIR}/${PN}-gcc10.patch"
178 +)
179 +
180 +src_prepare() {
181 + default
182 + sed -i -e "/^#define ALIAS_DB_MAP/s|:/etc/aliases|:/etc/mail/aliases|" \
183 + src/util/sys_defs.h || die "sed failed"
184 + # change default paths to better comply with portage standard paths
185 + sed -i -e "s:/usr/local/:/usr/:g" conf/master.cf || die "sed failed"
186 +}
187 +
188 +src_configure() {
189 + for name in CDB LDAP LMDB MYSQL PCRE PGSQL SDBM SQLITE
190 + do
191 + local AUXLIBS_${name}=""
192 + done
193 +
194 + # Make sure LDFLAGS get passed down to the executables.
195 + local mycc="-DHAS_PCRE" mylibs="${LDFLAGS} -ldl"
196 + AUXLIBS_PCRE="$(pcre-config --libs)"
197 +
198 + use pam && mylibs="${mylibs} -lpam"
199 +
200 + if use ldap; then
201 + mycc="${mycc} -DHAS_LDAP"
202 + AUXLIBS_LDAP="-lldap -llber"
203 + fi
204 +
205 + if use mysql; then
206 + mycc="${mycc} -DHAS_MYSQL $(mysql_config --include)"
207 + AUXLIBS_MYSQL="$(mysql_config --libs)"
208 + fi
209 +
210 + if use postgres; then
211 + mycc="${mycc} -DHAS_PGSQL -I$(pg_config --includedir)"
212 + AUXLIBS_PGSQL="-L$(pg_config --libdir) -lpq"
213 + fi
214 +
215 + if use sqlite; then
216 + mycc="${mycc} -DHAS_SQLITE"
217 + AUXLIBS_SQLITE="-lsqlite3 -lpthread"
218 + fi
219 +
220 + if use ssl; then
221 + mycc="${mycc} -DUSE_TLS"
222 + mylibs="${mylibs} -lssl -lcrypto"
223 + fi
224 +
225 + if use lmdb; then
226 + mycc="${mycc} -DHAS_LMDB"
227 + AUXLIBS_LMDB="-llmdb -lpthread"
228 + fi
229 +
230 + if ! use eai; then
231 + mycc="${mycc} -DNO_EAI"
232 + fi
233 +
234 + # broken. and "in other words, not supported" by upstream.
235 + # Use inet_protocols setting in main.cf
236 + #if ! use ipv6; then
237 + # mycc="${mycc} -DNO_IPV6"
238 + #fi
239 +
240 + if use sasl; then
241 + if use dovecot-sasl; then
242 + # Set dovecot as default.
243 + mycc="${mycc} -DDEF_SASL_SERVER=\\\"dovecot\\\""
244 + fi
245 + if use ldap-bind; then
246 + mycc="${mycc} -DUSE_LDAP_SASL"
247 + fi
248 + mycc="${mycc} -DUSE_SASL_AUTH -DUSE_CYRUS_SASL -I/usr/include/sasl"
249 + mylibs="${mylibs} -lsasl2"
250 + elif use dovecot-sasl; then
251 + mycc="${mycc} -DUSE_SASL_AUTH -DDEF_SERVER_SASL_TYPE=\\\"dovecot\\\""
252 + fi
253 +
254 + if ! use nis; then
255 + mycc="${mycc} -DNO_NIS"
256 + fi
257 +
258 + if ! use berkdb; then
259 + mycc="${mycc} -DNO_DB"
260 + if use cdb; then
261 + # change default hash format from Berkeley DB to cdb
262 + mycc="${mycc} -DDEF_DB_TYPE=\\\"cdb\\\""
263 + fi
264 + fi
265 +
266 + if use cdb; then
267 + mycc="${mycc} -DHAS_CDB -I/usr/include/cdb"
268 + # Tinycdb is preferred.
269 + if has_version dev-db/tinycdb ; then
270 + einfo "Building with dev-db/tinycdb"
271 + AUXLIBS_CDB="-lcdb"
272 + else
273 + einfo "Building with dev-db/cdb"
274 + CDB_PATH="/usr/$(get_libdir)"
275 + for i in cdb.a alloc.a buffer.a unix.a byte.a ; do
276 + AUXLIBS_CDB="${AUXLIBS_CDB} ${CDB_PATH}/${i}"
277 + done
278 + fi
279 + fi
280 +
281 + # Robin H. Johnson <robbat2@g.o> 17/Nov/2006
282 + # Fix because infra boxes hit 2Gb .db files that fail a 32-bit fstat signed check.
283 + mycc="${mycc} -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE"
284 + filter-lfs-flags
285 +
286 + # Workaround for bug #76512
287 + if use hardened; then
288 + [[ "$(gcc-version)" == "3.4" ]] && replace-flags -O? -Os
289 + fi
290 +
291 + # Remove annoying C++ comment style warnings - bug #378099
292 + append-flags -Wno-comment
293 +
294 + sed -i -e "/^RANLIB/s/ranlib/$(tc-getRANLIB)/g" "${S}"/makedefs
295 + sed -i -e "/^AR/s/ar/$(tc-getAR)/g" "${S}"/makedefs
296 +
297 + emake makefiles shared=yes dynamicmaps=no pie=yes \
298 + shlib_directory="/usr/$(get_libdir)/postfix/MAIL_VERSION" \
299 + DEBUG="" CC="$(tc-getCC)" OPT="${CFLAGS}" CCARGS="${mycc}" AUXLIBS="${mylibs}" \
300 + AUXLIBS_CDB="${AUXLIBS_CDB}" AUXLIBS_LDAP="${AUXLIBS_LDAP}" \
301 + AUXLIBS_LMDB="${AUXLIBS_LMDB}" AUXLIBS_MYSQL="${AUXLIBS_MYSQL}" \
302 + AUXLIBS_PCRE="${AUXLIBS_PCRE}" AUXLIBS_PGSQL="${AUXLIBS_PGSQL}" \
303 + AUXLIBS_SQLITE="${AUXLIBS_SQLITE}"
304 +}
305 +
306 +src_install () {
307 + LD_LIBRARY_PATH="${S}/lib" \
308 + /bin/sh postfix-install \
309 + -non-interactive \
310 + install_root="${D}" \
311 + config_directory="/etc/postfix" \
312 + manpage_directory="/usr/share/man" \
313 + command_directory="/usr/sbin" \
314 + mailq_path="/usr/bin/mailq" \
315 + newaliases_path="/usr/bin/newaliases" \
316 + sendmail_path="/usr/sbin/sendmail" \
317 + || die "postfix-install failed"
318 +
319 + # Fix spool removal on upgrade
320 + rm -Rf "${D}"/var
321 + keepdir /var/spool/postfix
322 +
323 + # Install rmail for UUCP, closes bug #19127
324 + dobin auxiliary/rmail/rmail
325 +
326 + # Provide another link for legacy FSH
327 + dosym ../sbin/sendmail /usr/$(get_libdir)/sendmail
328 +
329 + # Install qshape, posttls-finger and collate
330 + dobin auxiliary/qshape/qshape.pl
331 + doman man/man1/qshape.1
332 + dobin bin/posttls-finger
333 + doman man/man1/posttls-finger.1
334 + dobin auxiliary/collate/collate.pl
335 + newdoc auxiliary/collate/README README.collate
336 +
337 + # Performance tuning tools and their manuals
338 + dosbin bin/smtp-{source,sink} bin/qmqp-{source,sink}
339 + doman man/man1/smtp-{source,sink}.1 man/man1/qmqp-{source,sink}.1
340 +
341 + # Set proper permissions on required files/directories
342 + keepdir /var/lib/postfix
343 + fowners -R postfix:postfix /var/lib/postfix
344 + fperms 0750 /var/lib/postfix
345 + fowners root:postdrop /usr/sbin/post{drop,queue}
346 + fperms 02755 /usr/sbin/post{drop,queue}
347 +
348 + keepdir /etc/postfix
349 + keepdir /etc/postfix/postfix-files.d
350 + if use mbox; then
351 + mypostconf="mail_spool_directory=/var/spool/mail"
352 + else
353 + mypostconf="home_mailbox=.maildir/"
354 + fi
355 + LD_LIBRARY_PATH="${S}/lib" \
356 + "${D}"/usr/sbin/postconf -c "${D}"/etc/postfix \
357 + -e ${mypostconf} || die "postconf failed"
358 +
359 + insinto /etc/postfix
360 + newins "${FILESDIR}"/smtp.pass saslpass
361 + fperms 600 /etc/postfix/saslpass
362 +
363 + newinitd "${FILESDIR}"/postfix.rc6.${RC_VER} postfix
364 + # do not start mysql/postgres unnecessarily - bug #359913
365 + use mysql || sed -i -e "s/mysql //" "${D}/etc/init.d/postfix"
366 + use postgres || sed -i -e "s/postgresql //" "${D}/etc/init.d/postfix"
367 +
368 + dodoc *README COMPATIBILITY HISTORY PORTING RELEASE_NOTES*
369 + mv "${S}"/examples "${D}"/usr/share/doc/${PF}/
370 + # postfix set-permissions expects uncompressed man files
371 + docompress -x /usr/share/man
372 +
373 + pamd_mimic_system smtp auth account
374 +
375 + if use sasl; then
376 + insinto /etc/sasl2
377 + newins "${FILESDIR}"/smtp.sasl smtpd.conf
378 + fi
379 +
380 + # header files
381 + insinto /usr/include/postfix
382 + doins include/*.h
383 +
384 + if has_version mail-mta/postfix; then
385 + # let the sysadmin decide when to change the compatibility_level
386 + sed -i -e /^compatibility_level/"s/^/#/" "${D}"/etc/postfix/main.cf || die
387 + fi
388 +
389 + systemd_dounit "${FILESDIR}/${PN}.service"
390 +}
391 +
392 +pkg_preinst() {
393 + if has_version '<mail-mta/postfix-3.4'; then
394 + elog
395 + elog "Postfix-3.4 introduces a new master.cf service 'postlog'"
396 + elog "with type 'unix-dgram' that is used by the new postlogd(8) daemon."
397 + elog "Before backing out to an older Postfix version, edit the master.cf"
398 + elog "file and remove the postlog entry."
399 + elog
400 + fi
401 +}
402 +
403 +pkg_postinst() {
404 + if [[ ! -e /etc/mail/aliases.db ]] ; then
405 + ewarn
406 + ewarn "You must edit /etc/mail/aliases to suit your needs"
407 + ewarn "and then run /usr/bin/newaliases. Postfix will not"
408 + ewarn "work correctly without it."
409 + ewarn
410 + fi
411 +
412 + # check and fix file permissions
413 + "${EROOT}"/usr/sbin/postfix set-permissions
414 +
415 + # configure tls
416 + if use ssl ; then
417 + if "${EROOT}"/usr/sbin/postfix tls all-default-client; then
418 + elog "To configure client side TLS settings:"
419 + elog "${EROOT}"/usr/sbin/postfix tls enable-client
420 + fi
421 + if "${EROOT}"/usr/sbin/postfix tls all-default-server; then
422 + elog "To configure server side TLS settings:"
423 + elog "${EROOT}"/usr/sbin/postfix tls enable-server
424 + fi
425 + fi
426 +}