1 |
commit: 44492eeea3382487a87cdab5a9d412b7e8294331 |
2 |
Author: Eray Aslan <eras <AT> gentoo <DOT> org> |
3 |
AuthorDate: Mon Apr 29 06:24:35 2019 +0000 |
4 |
Commit: Eray Aslan <eras <AT> gentoo <DOT> org> |
5 |
CommitDate: Mon Apr 29 06:24:35 2019 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=44492eee |
7 |
|
8 |
mail-mta/postfix: bump to 3.5_pre20190427 |
9 |
|
10 |
Closes: https://github.com/gentoo/gentoo/pull/11853 |
11 |
Package-Manager: Portage-2.3.65, Repoman-2.3.12 |
12 |
Signed-off-by: Eray Aslan <eras <AT> gentoo.org> |
13 |
|
14 |
mail-mta/postfix/Manifest | 2 +- |
15 |
mail-mta/postfix/postfix-3.5_pre20190330.ebuild | 324 --------------------- |
16 |
...30-r1.ebuild => postfix-3.5_pre20190427.ebuild} | 5 +- |
17 |
3 files changed, 4 insertions(+), 327 deletions(-) |
18 |
|
19 |
diff --git a/mail-mta/postfix/Manifest b/mail-mta/postfix/Manifest |
20 |
index 06ca2f062a7..027d953a063 100644 |
21 |
--- a/mail-mta/postfix/Manifest |
22 |
+++ b/mail-mta/postfix/Manifest |
23 |
@@ -3,5 +3,5 @@ DIST postfix-3.2.4.tar.gz 4390376 BLAKE2B 132a6b467f9156d716a92cc7beae0f9a7c47e6 |
24 |
DIST postfix-3.3.1.tar.gz 4420912 BLAKE2B 065fd04cdfa343a6c50a629e8da47fad71465df790ca88adcad4efc7ab273330c39998c6bf503587b8bcba3d87bb98b1be6413e49449e2241258a99217473c11 SHA512 2307f50f8b7dab1db46ebe4ae30bc5682a25b9c49ae5ae65aa95b4620bb5450dd5929977c0f34b9e73a92ca6af36fd8e24167732420a1a2d89167c7a3b197276 |
25 |
DIST postfix-3.3.4.tar.gz 4429964 BLAKE2B 58812a75e7f8e2e89dce3dd8cb8b779c4b90995ce9d1885cec0fc475c8dc267741ea6c7af6e82fc80e3f71244964df9a5fe776c3b09e5e0cad1f59424dfab6b3 SHA512 fccc524167ea3b85f4fe0fc4ad8312f6d684c1900e7c5c355d4522513f74b588bbfcfd28074a8b69ce038982fcaa359abf585a296df4046184c7da6d0405d0ee |
26 |
DIST postfix-3.4.5.tar.gz 4581301 BLAKE2B 9de66cab6eea610fc83e4629980b3e201b4e3f9185729cb84933aa940b64b7818d0439c5145ea0b635666db92c970e1974f4f439cd3b733c58e1fe5794c046fa SHA512 af59d960b40799f7667935bef8fafb93ae6dcb70abaa77a15cf498571f37fa0429f411f9f08b1b6bfa588d3f572260d14d6d5409f0cd1e82b1c59928b2124c94 |
27 |
-DIST postfix-3.5-20190330.tar.gz 4596058 BLAKE2B 0710881919361e6307902f287fb10fd26d27e2e51293b4a297191cd69687477e9e5e3e7bbe1c15ec2e440629eef78574705eda8fbf3e0b7f7440bcfe5ef33366 SHA512 d6e8e7bbc1a47aaa86105c3281c00ed3806e29cb33a27f062a25b92bbb557e8d022f873fb77be65dcf7c8c10c73ed91c61625641649d99a45dbf77c01eac3f85 |
28 |
+DIST postfix-3.5-20190427.tar.gz 4600362 BLAKE2B 2e77228fecaba606b4e5a7bf00f8a3b03a193f0414a42d613c08aa8a829dc13a9f7ea0b8563b0168c603deae37fca15865ee4294a74d635d4074f42466745fcc SHA512 267bfe09d3f5e4a38fbfdfbe8ec8d5a0ce5037eb1cea771b8dda1bcc0495d0ac6ac941ee3f67982169dfcb10cde2b40e9691175b9ac0f8e30416946caa280ad0 |
29 |
DIST postfix-vda-v13-2.10.0.patch 55701 BLAKE2B d8df041bb4ae7457cd066e71b6ae9470840d42edc9990a550ae51356cd62bfb08516250249030da26d1ef475619f0ebd609570d84ce57f8cdc347a2824b29536 SHA512 0b4b53a8cd28abf56eee3b2ed63ca1814251b60816e6ca1143249d25fd6ef7f905bec3134125ac6e851af685db8aae878012113693261529ae2ddbcf1bd93e62 |
30 |
|
31 |
diff --git a/mail-mta/postfix/postfix-3.5_pre20190330.ebuild b/mail-mta/postfix/postfix-3.5_pre20190330.ebuild |
32 |
deleted file mode 100644 |
33 |
index 719df87d4e8..00000000000 |
34 |
--- a/mail-mta/postfix/postfix-3.5_pre20190330.ebuild |
35 |
+++ /dev/null |
36 |
@@ -1,324 +0,0 @@ |
37 |
-# Copyright 1999-2019 Gentoo Authors |
38 |
-# Distributed under the terms of the GNU General Public License v2 |
39 |
- |
40 |
-EAPI=7 |
41 |
- |
42 |
-inherit flag-o-matic pam systemd toolchain-funcs user |
43 |
- |
44 |
-MY_PV="${PV/_pre/-}" |
45 |
-MY_SRC="${PN}-${MY_PV}" |
46 |
-MY_URI="ftp://ftp.porcupine.org/mirrors/postfix-release/experimental" |
47 |
-RC_VER="2.7" |
48 |
- |
49 |
-DESCRIPTION="A fast and secure drop-in replacement for sendmail" |
50 |
-HOMEPAGE="http://www.postfix.org/" |
51 |
-SRC_URI="${MY_URI}/${MY_SRC}.tar.gz" |
52 |
- |
53 |
-LICENSE="|| ( IBM EPL-2.0 )" |
54 |
-SLOT="0" |
55 |
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd" |
56 |
-IUSE="+berkdb cdb dovecot-sasl +eai hardened ldap ldap-bind libressl lmdb memcached mbox mysql nis pam postgres sasl selinux sqlite ssl" |
57 |
- |
58 |
-DEPEND=">=dev-libs/libpcre-3.4 |
59 |
- dev-lang/perl |
60 |
- berkdb? ( >=sys-libs/db-3.2:* ) |
61 |
- cdb? ( || ( >=dev-db/tinycdb-0.76 >=dev-db/cdb-0.75-r4 ) ) |
62 |
- eai? ( dev-libs/icu:= ) |
63 |
- ldap? ( net-nds/openldap ) |
64 |
- ldap-bind? ( net-nds/openldap[sasl] ) |
65 |
- lmdb? ( >=dev-db/lmdb-0.9.11 ) |
66 |
- mysql? ( dev-db/mysql-connector-c:0= ) |
67 |
- nis? ( net-libs/libnsl ) |
68 |
- pam? ( virtual/pam ) |
69 |
- postgres? ( dev-db/postgresql:* ) |
70 |
- sasl? ( >=dev-libs/cyrus-sasl-2 ) |
71 |
- sqlite? ( dev-db/sqlite:3 ) |
72 |
- ssl? ( |
73 |
- !libressl? ( dev-libs/openssl:0= ) |
74 |
- libressl? ( dev-libs/libressl ) |
75 |
- )" |
76 |
- |
77 |
-RDEPEND="${DEPEND} |
78 |
- memcached? ( net-misc/memcached ) |
79 |
- net-mail/mailbase |
80 |
- !mail-mta/courier |
81 |
- !mail-mta/esmtp |
82 |
- !mail-mta/exim |
83 |
- !mail-mta/mini-qmail |
84 |
- !mail-mta/msmtp[mta] |
85 |
- !mail-mta/netqmail |
86 |
- !mail-mta/nullmailer |
87 |
- !mail-mta/qmail-ldap |
88 |
- !mail-mta/sendmail |
89 |
- !mail-mta/opensmtpd |
90 |
- !<mail-mta/ssmtp-2.64-r2 |
91 |
- !>=mail-mta/ssmtp-2.64-r2[mta] |
92 |
- !net-mail/fastforward |
93 |
- selinux? ( sec-policy/selinux-postfix )" |
94 |
- |
95 |
-REQUIRED_USE="ldap-bind? ( ldap sasl )" |
96 |
- |
97 |
-S="${WORKDIR}/${MY_SRC}" |
98 |
- |
99 |
-pkg_setup() { |
100 |
- if use libressl; then |
101 |
- die "LibreSSL patches are not yet available for postfix-3.4 releases." |
102 |
- fi |
103 |
- # Add postfix, postdrop user/group (bug #77565) |
104 |
- enewgroup postfix 207 |
105 |
- enewgroup postdrop 208 |
106 |
- enewuser postfix 207 -1 /var/spool/postfix postfix,mail |
107 |
-} |
108 |
- |
109 |
-src_prepare() { |
110 |
- default |
111 |
- sed -i -e "/^#define ALIAS_DB_MAP/s|:/etc/aliases|:/etc/mail/aliases|" \ |
112 |
- src/util/sys_defs.h || die "sed failed" |
113 |
- # change default paths to better comply with portage standard paths |
114 |
- sed -i -e "s:/usr/local/:/usr/:g" conf/master.cf || die "sed failed" |
115 |
- # libressl support needs work for >=postfix-3.4 |
116 |
- #eapply -p0 "${FILESDIR}/${PN}-libressl.patch" \ |
117 |
- # "${FILESDIR}/${PN}-libressl-runtime.patch" \ |
118 |
- # "${FILESDIR}/${PN}-libressl-eccurve.patch" |
119 |
- # "${FILESDIR}/${PN}-libressl-session-tickets.patch" |
120 |
-} |
121 |
- |
122 |
-src_configure() { |
123 |
- for name in CDB LDAP LMDB MYSQL PCRE PGSQL SDBM SQLITE |
124 |
- do |
125 |
- local AUXLIBS_${name}="" |
126 |
- done |
127 |
- |
128 |
- # Make sure LDFLAGS get passed down to the executables. |
129 |
- local mycc="-DHAS_PCRE" mylibs="${LDFLAGS} -ldl" |
130 |
- AUXLIBS_PCRE="$(pcre-config --libs)" |
131 |
- |
132 |
- use pam && mylibs="${mylibs} -lpam" |
133 |
- |
134 |
- if use ldap; then |
135 |
- mycc="${mycc} -DHAS_LDAP" |
136 |
- AUXLIBS_LDAP="-lldap -llber" |
137 |
- fi |
138 |
- |
139 |
- if use mysql; then |
140 |
- mycc="${mycc} -DHAS_MYSQL $(mysql_config --include)" |
141 |
- AUXLIBS_MYSQL="$(mysql_config --libs)" |
142 |
- fi |
143 |
- |
144 |
- if use postgres; then |
145 |
- mycc="${mycc} -DHAS_PGSQL -I$(pg_config --includedir)" |
146 |
- AUXLIBS_PGSQL="-L$(pg_config --libdir) -lpq" |
147 |
- fi |
148 |
- |
149 |
- if use sqlite; then |
150 |
- mycc="${mycc} -DHAS_SQLITE" |
151 |
- AUXLIBS_SQLITE="-lsqlite3 -lpthread" |
152 |
- fi |
153 |
- |
154 |
- if use ssl; then |
155 |
- mycc="${mycc} -DUSE_TLS" |
156 |
- mylibs="${mylibs} -lssl -lcrypto" |
157 |
- fi |
158 |
- |
159 |
- if use lmdb; then |
160 |
- mycc="${mycc} -DHAS_LMDB" |
161 |
- AUXLIBS_LMDB="-llmdb -lpthread" |
162 |
- fi |
163 |
- |
164 |
- if ! use eai; then |
165 |
- mycc="${mycc} -DNO_EAI" |
166 |
- fi |
167 |
- |
168 |
- # broken. and "in other words, not supported" by upstream. |
169 |
- # Use inet_protocols setting in main.cf |
170 |
- #if ! use ipv6; then |
171 |
- # mycc="${mycc} -DNO_IPV6" |
172 |
- #fi |
173 |
- |
174 |
- if use sasl; then |
175 |
- if use dovecot-sasl; then |
176 |
- # Set dovecot as default. |
177 |
- mycc="${mycc} -DDEF_SASL_SERVER=\\\"dovecot\\\"" |
178 |
- fi |
179 |
- if use ldap-bind; then |
180 |
- mycc="${mycc} -DUSE_LDAP_SASL" |
181 |
- fi |
182 |
- mycc="${mycc} -DUSE_SASL_AUTH -DUSE_CYRUS_SASL -I/usr/include/sasl" |
183 |
- mylibs="${mylibs} -lsasl2" |
184 |
- elif use dovecot-sasl; then |
185 |
- mycc="${mycc} -DUSE_SASL_AUTH -DDEF_SERVER_SASL_TYPE=\\\"dovecot\\\"" |
186 |
- fi |
187 |
- |
188 |
- if ! use nis; then |
189 |
- mycc="${mycc} -DNO_NIS" |
190 |
- fi |
191 |
- |
192 |
- if ! use berkdb; then |
193 |
- mycc="${mycc} -DNO_DB" |
194 |
- if use cdb; then |
195 |
- # change default hash format from Berkeley DB to cdb |
196 |
- mycc="${mycc} -DDEF_DB_TYPE=\\\"cdb\\\"" |
197 |
- fi |
198 |
- fi |
199 |
- |
200 |
- if use cdb; then |
201 |
- mycc="${mycc} -DHAS_CDB -I/usr/include/cdb" |
202 |
- # Tinycdb is preferred. |
203 |
- if has_version dev-db/tinycdb ; then |
204 |
- einfo "Building with dev-db/tinycdb" |
205 |
- AUXLIBS_CDB="-lcdb" |
206 |
- else |
207 |
- einfo "Building with dev-db/cdb" |
208 |
- CDB_PATH="/usr/$(get_libdir)" |
209 |
- for i in cdb.a alloc.a buffer.a unix.a byte.a ; do |
210 |
- AUXLIBS_CDB="${AUXLIBS_CDB} ${CDB_PATH}/${i}" |
211 |
- done |
212 |
- fi |
213 |
- fi |
214 |
- |
215 |
- # Robin H. Johnson <robbat2@g.o> 17/Nov/2006 |
216 |
- # Fix because infra boxes hit 2Gb .db files that fail a 32-bit fstat signed check. |
217 |
- mycc="${mycc} -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE" |
218 |
- filter-lfs-flags |
219 |
- |
220 |
- # Workaround for bug #76512 |
221 |
- if use hardened; then |
222 |
- [[ "$(gcc-version)" == "3.4" ]] && replace-flags -O? -Os |
223 |
- fi |
224 |
- |
225 |
- # Remove annoying C++ comment style warnings - bug #378099 |
226 |
- append-flags -Wno-comment |
227 |
- |
228 |
- sed -i -e "/^RANLIB/s/ranlib/$(tc-getRANLIB)/g" "${S}"/makedefs |
229 |
- sed -i -e "/^AR/s/ar/$(tc-getAR)/g" "${S}"/makedefs |
230 |
- |
231 |
- emake makefiles shared=yes dynamicmaps=no pie=yes \ |
232 |
- shlib_directory="/usr/$(get_libdir)/postfix/MAIL_VERSION" \ |
233 |
- DEBUG="" CC="$(tc-getCC)" OPT="${CFLAGS}" CCARGS="${mycc}" AUXLIBS="${mylibs}" \ |
234 |
- AUXLIBS_CDB="${AUXLIBS_CDB}" AUXLIBS_LDAP="${AUXLIBS_LDAP}" \ |
235 |
- AUXLIBS_LMDB="${AUXLIBS_LMDB}" AUXLIBS_MYSQL="${AUXLIBS_MYSQL}" \ |
236 |
- AUXLIBS_PCRE="${AUXLIBS_PCRE}" AUXLIBS_PGSQL="${AUXLIBS_PGSQL}" \ |
237 |
- AUXLIBS_SQLITE="${AUXLIBS_SQLITE}" |
238 |
-} |
239 |
- |
240 |
-src_install () { |
241 |
- LD_LIBRARY_PATH="${S}/lib" \ |
242 |
- /bin/sh postfix-install \ |
243 |
- -non-interactive \ |
244 |
- install_root="${D}" \ |
245 |
- config_directory="/etc/postfix" \ |
246 |
- manpage_directory="/usr/share/man" \ |
247 |
- command_directory="/usr/sbin" \ |
248 |
- mailq_path="/usr/bin/mailq" \ |
249 |
- newaliases_path="/usr/bin/newaliases" \ |
250 |
- sendmail_path="/usr/sbin/sendmail" \ |
251 |
- || die "postfix-install failed" |
252 |
- |
253 |
- # Fix spool removal on upgrade |
254 |
- rm -Rf "${D}"/var |
255 |
- keepdir /var/spool/postfix |
256 |
- |
257 |
- # Install rmail for UUCP, closes bug #19127 |
258 |
- dobin auxiliary/rmail/rmail |
259 |
- |
260 |
- # Provide another link for legacy FSH |
261 |
- dosym ../sbin/sendmail /usr/$(get_libdir)/sendmail |
262 |
- |
263 |
- # Install qshape, posttls-finger and collate |
264 |
- dobin auxiliary/qshape/qshape.pl |
265 |
- doman man/man1/qshape.1 |
266 |
- dobin bin/posttls-finger |
267 |
- doman man/man1/posttls-finger.1 |
268 |
- dobin auxiliary/collate/collate.pl |
269 |
- newdoc auxiliary/collate/README README.collate |
270 |
- |
271 |
- # Performance tuning tools and their manuals |
272 |
- dosbin bin/smtp-{source,sink} bin/qmqp-{source,sink} |
273 |
- doman man/man1/smtp-{source,sink}.1 man/man1/qmqp-{source,sink}.1 |
274 |
- |
275 |
- # Set proper permissions on required files/directories |
276 |
- keepdir /var/lib/postfix |
277 |
- fowners -R postfix:postfix /var/lib/postfix |
278 |
- fperms 0750 /var/lib/postfix |
279 |
- fowners root:postdrop /usr/sbin/post{drop,queue} |
280 |
- fperms 02755 /usr/sbin/post{drop,queue} |
281 |
- |
282 |
- keepdir /etc/postfix |
283 |
- keepdir /etc/postfix/postfix-files.d |
284 |
- if use mbox; then |
285 |
- mypostconf="mail_spool_directory=/var/spool/mail" |
286 |
- else |
287 |
- mypostconf="home_mailbox=.maildir/" |
288 |
- fi |
289 |
- LD_LIBRARY_PATH="${S}/lib" \ |
290 |
- "${D}"/usr/sbin/postconf -c "${D}"/etc/postfix \ |
291 |
- -e ${mypostconf} || die "postconf failed" |
292 |
- |
293 |
- insinto /etc/postfix |
294 |
- newins "${FILESDIR}"/smtp.pass saslpass |
295 |
- fperms 600 /etc/postfix/saslpass |
296 |
- |
297 |
- newinitd "${FILESDIR}"/postfix.rc6.${RC_VER} postfix |
298 |
- # do not start mysql/postgres unnecessarily - bug #359913 |
299 |
- use mysql || sed -i -e "s/mysql //" "${D}/etc/init.d/postfix" |
300 |
- use postgres || sed -i -e "s/postgresql //" "${D}/etc/init.d/postfix" |
301 |
- |
302 |
- dodoc *README COMPATIBILITY HISTORY PORTING RELEASE_NOTES* |
303 |
- mv "${S}"/examples "${D}"/usr/share/doc/${PF}/ |
304 |
- # postfix set-permissions expects uncompressed man files |
305 |
- docompress -x /usr/share/man |
306 |
- |
307 |
- pamd_mimic_system smtp auth account |
308 |
- |
309 |
- if use sasl; then |
310 |
- insinto /etc/sasl2 |
311 |
- newins "${FILESDIR}"/smtp.sasl smtpd.conf |
312 |
- fi |
313 |
- |
314 |
- # header files |
315 |
- insinto /usr/include/postfix |
316 |
- doins include/*.h |
317 |
- |
318 |
- if has_version mail-mta/postfix; then |
319 |
- # let the sysadmin decide when to change the compatibility_level |
320 |
- sed -i -e /^compatibility_level/"s/^/#/" "${D}"/etc/postfix/main.cf || die |
321 |
- fi |
322 |
- |
323 |
- systemd_dounit "${FILESDIR}/${PN}.service" |
324 |
-} |
325 |
- |
326 |
-pkg_preinst() { |
327 |
- if has_version '<mail-mta/postfix-3.4'; then |
328 |
- elog |
329 |
- elog "Postfix-3.4 introduces a new master.cf service 'postlog'" |
330 |
- elog "with type 'unix-dgram' that is used by the new postlogd(8) daemon." |
331 |
- elog "Before backing out to an older Postfix version, edit the master.cf" |
332 |
- elog "file and remove the postlog entry." |
333 |
- elog |
334 |
- fi |
335 |
-} |
336 |
- |
337 |
-pkg_postinst() { |
338 |
- if [[ ! -e /etc/mail/aliases.db ]] ; then |
339 |
- ewarn |
340 |
- ewarn "You must edit /etc/mail/aliases to suit your needs" |
341 |
- ewarn "and then run /usr/bin/newaliases. Postfix will not" |
342 |
- ewarn "work correctly without it." |
343 |
- ewarn |
344 |
- fi |
345 |
- |
346 |
- # check and fix file permissions |
347 |
- "${EROOT}"/usr/sbin/postfix set-permissions |
348 |
- |
349 |
- # configure tls |
350 |
- if use ssl ; then |
351 |
- if "${EROOT}"/usr/sbin/postfix tls all-default-client; then |
352 |
- elog "To configure client side TLS settings:" |
353 |
- elog "${EROOT}"usr/sbin/postfix tls enable-client |
354 |
- fi |
355 |
- if "${EROOT}"/usr/sbin/postfix tls all-default-server; then |
356 |
- elog "To configure server side TLS settings:" |
357 |
- elog "${EROOT}"usr/sbin/postfix tls enable-server |
358 |
- fi |
359 |
- fi |
360 |
-} |
361 |
|
362 |
diff --git a/mail-mta/postfix/postfix-3.5_pre20190330-r1.ebuild b/mail-mta/postfix/postfix-3.5_pre20190427.ebuild |
363 |
similarity index 98% |
364 |
rename from mail-mta/postfix/postfix-3.5_pre20190330-r1.ebuild |
365 |
rename to mail-mta/postfix/postfix-3.5_pre20190427.ebuild |
366 |
index a9a8032fad5..4df478ad087 100644 |
367 |
--- a/mail-mta/postfix/postfix-3.5_pre20190330-r1.ebuild |
368 |
+++ b/mail-mta/postfix/postfix-3.5_pre20190427.ebuild |
369 |
@@ -35,7 +35,7 @@ DEPEND=">=dev-libs/libpcre-3.4 |
370 |
sqlite? ( dev-db/sqlite:3 ) |
371 |
ssl? ( |
372 |
!libressl? ( dev-libs/openssl:0= ) |
373 |
- libressl? ( >=dev-libs/libressl-2.9.1 ) |
374 |
+ libressl? ( >=dev-libs/libressl-2.9.1:0= ) |
375 |
)" |
376 |
|
377 |
RDEPEND="${DEPEND} |
378 |
@@ -60,7 +60,8 @@ REQUIRED_USE="ldap-bind? ( ldap sasl )" |
379 |
|
380 |
S="${WORKDIR}/${MY_SRC}" |
381 |
|
382 |
-PATCHES=( "${FILESDIR}/${PN}-libressl-certkey.patch" |
383 |
+PATCHES=( |
384 |
+ "${FILESDIR}/${PN}-libressl-certkey.patch" |
385 |
"${FILESDIR}/${PN}-libressl-server.patch" |
386 |
) |