Gentoo Archives: gentoo-commits

From: Aaron Bauman <bman@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: mail-mta/sendmail/, mail-mta/sendmail/files/
Date: Mon, 17 Aug 2020 03:07:02
Message-Id: 1597633600.c97bd0e2aa41d659ac1a5f39c241c2093c7f4241.bman@gentoo
1 commit: c97bd0e2aa41d659ac1a5f39c241c2093c7f4241
2 Author: Aaron Bauman <bman <AT> gentoo <DOT> org>
3 AuthorDate: Mon Aug 17 02:52:02 2020 +0000
4 Commit: Aaron Bauman <bman <AT> gentoo <DOT> org>
5 CommitDate: Mon Aug 17 03:06:40 2020 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c97bd0e2
7
8 mail-mta/sendmail: bump to 8.16.1
9
10 * Bump due to security issue
11 * Add -D_FFR_TLS_EC to compile options which supports ECDHE and PFS
12 * Stop building libmilter separately and introduce dep on
13 mail-filter/libmilter
14 * By depending on mail-filter/libmilter sendmail no longer installs
15 static-libs.
16 * Add -DMAXDAEMONS=64 to fix IPV6 environments
17 * Fix various QA issues with lack of dies. More to be fixed.
18
19 Bug: https://bugs.gentoo.org/730890
20 Bug: https://bugs.gentoo.org/681232
21 Closes: https://bugs.gentoo.org/542370
22 Closes: https://bugs.gentoo.org/681224
23 Closes: https://bugs.gentoo.org/724548
24 Closes: https://bugs.gentoo.org/606490
25
26 Acked-by: Sam James <sam <AT> gentoo.org>
27 Signed-off-by: Aaron Bauman <bman <AT> gentoo.org>
28
29 mail-mta/sendmail/Manifest | 1 +
30 .../files/sendmail-8.14.6-build-system.patch | 73 +-------
31 mail-mta/sendmail/sendmail-8.16.1.ebuild | 208 +++++++++++++++++++++
32 3 files changed, 219 insertions(+), 63 deletions(-)
33
34 diff --git a/mail-mta/sendmail/Manifest b/mail-mta/sendmail/Manifest
35 index 0134628b792..0b878d0a33c 100644
36 --- a/mail-mta/sendmail/Manifest
37 +++ b/mail-mta/sendmail/Manifest
38 @@ -1 +1,2 @@
39 DIST sendmail.8.15.2.tar.gz 2207417 BLAKE2B 3d9dfb5bc2b535e30ef2fc61333e12a9b1fc45a5d730d2bed1ef956adb574721833f87aeba0475705b76e0c7d6cf00f9a10025bffb0de6c6b4dae606eb2ec399 SHA512 04feb37316c13b66b1518596507a7da7c16cb0bf1abf10367f7fd888a428fadb093a9efa55342fa55b936c3f0cbdc63b9e2505cd99201a69a0c05b8ad65f49f9
40 +DIST sendmail.8.16.1.tar.gz 2236402 BLAKE2B 80a9c2f1d04719099703e55f0a0c54fd638cf69b72839d358ae6863c95c9e0965d1b7fdd5b1807bec1ffdf87bca0c7c9ba91060962e6de5da5bf14422f6279ea SHA512 d7d4aac3c6d7505782abdb166204901b8b51cac000d610dfe40eda9eef7441a073af9e8e0b14c8719b07b445f55a1e2c28ac63d663d0daa7f1eafc5a101788b2
41
42 diff --git a/mail-mta/sendmail/files/sendmail-8.14.6-build-system.patch b/mail-mta/sendmail/files/sendmail-8.14.6-build-system.patch
43 index 3348e921926..c317a4e854f 100644
44 --- a/mail-mta/sendmail/files/sendmail-8.14.6-build-system.patch
45 +++ b/mail-mta/sendmail/files/sendmail-8.14.6-build-system.patch
46 @@ -126,37 +126,25 @@ diff -Nru sendmail-8.14.3.orig/rmail/Makefile.m4 sendmail-8.14.3/rmail/Makefile.
47 divert
48
49 bldFINISH
50 -diff -Nru sendmail-8.14.3.orig/sendmail/Makefile.m4 sendmail-8.14.3/sendmail/Makefile.m4
51 ---- sendmail-8.14.3.orig/sendmail/Makefile.m4.orig 2008-03-27 17:13:33.000000000 +0100
52 -+++ sendmail-8.14.3/sendmail/Makefile.m4 2009-09-20 11:07:24.000000000 +0200
53 -@@ -14,9 +14,9 @@
54 -
55 - dnl hack: /etc/mail is not defined as "location of .cf" in the build system
56 - define(`bldTARGET_INST_DEP', ifdef(`confINST_DEP', `confINST_DEP',
57 --`${DESTDIR}/etc/mail/submit.cf ${DESTDIR}${MSPQ}'))dnl
58 -+`"${DESTDIR}/etc/mail/submit.cf" "${DESTDIR}${MSPQ}"'))dnl
59 - define(`bldTARGET_LINKS', ifdef(`confLINKS', `confLINKS',
60 --`${DESTDIR}${UBINDIR}/newaliases ${DESTDIR}${UBINDIR}/mailq ${DESTDIR}${UBINDIR}/hoststat ${DESTDIR}${UBINDIR}/purgestat')
61 -+`"${DESTDIR}${UBINDIR}/newaliases" "${DESTDIR}${UBINDIR}/mailq" "${DESTDIR}${UBINDIR}/hoststat" "${DESTDIR}${UBINDIR}/purgestat"')
62 - )dnl
63 -
64 - # location of sendmail statistics file (usually /etc/mail/ or /var/log)
65 +
66 +--- a/sendmail/Makefile.m4 2020-08-10 23:14:23.209900406 -0400
67 ++++ b/sendmail/Makefile.m4 2020-08-10 23:23:51.272863753 -0400
68 @@ -43,21 +43,21 @@
69 statistics:
70 ${CP} /dev/null statistics
71 -
72 +
73 -${DESTDIR}/etc/mail/submit.cf:
74 -+"${DESTDIR}/etc/mail/submit.cf":
75 ++${DESTDIR}/etc/mail/submit.cf:
76 @echo "Please read INSTALL if anything fails while installing the binary."
77 @echo "${DESTDIR}/etc/mail/submit.cf will be installed now."
78 cd ${SRCDIR}/cf/cf && make install-submit-cf
79 -
80 +
81 MSPQ=ifdef(`confMSP_QUEUE_DIR', `confMSP_QUEUE_DIR', `/var/spool/clientmqueue')
82 -
83 +
84 -${DESTDIR}${MSPQ}:
85 -+"${DESTDIR}${MSPQ}":
86 ++${DESTDIR}${MSPQ}:
87 @echo "Please read INSTALL if anything fails while installing the binary."
88 - @echo "You must have setup a new user ${MSPQOWN} and a new group ${GBINGRP}"
89 + @echo "You must have set up a new user ${MSPQOWN} and a new group ${GBINGRP}"
90 @echo "as explained in sendmail/SECURITY."
91 - mkdir -p ${DESTDIR}${MSPQ}
92 - chown ${MSPQOWN} ${DESTDIR}${MSPQ}
93 @@ -166,46 +154,5 @@ diff -Nru sendmail-8.14.3.orig/sendmail/Makefile.m4 sendmail-8.14.3/sendmail/Mak
94 + chown ${MSPQOWN} "${DESTDIR}${MSPQ}"
95 + chgrp ${GBINGRP} "${DESTDIR}${MSPQ}"
96 + chmod 0770 "${DESTDIR}${MSPQ}"
97 -
98 - divert(0)
99 -
100 -@@ -68,30 +68,30 @@
101 - divert(bldTARGETS_SECTION)
102 -
103 - install-set-user-id: bldCURRENT_PRODUCT ifdef(`confNO_HELPFILE_INSTALL',, `install-hf') ifdef(`confNO_STATISTICS_INSTALL',, `install-st') ifdef(`confNO_MAN_BUILD',, `install-docs')
104 -- ${INSTALL} -c -o ${S`'BINOWN} -g ${S`'BINGRP} -m ${S`'BINMODE} bldCURRENT_PRODUCT ${DESTDIR}${M`'BINDIR}
105 -+ ${INSTALL} -c -o ${S`'BINOWN} -g ${S`'BINGRP} -m ${S`'BINMODE} bldCURRENT_PRODUCT "${DESTDIR}${M`'BINDIR}"
106 - for i in ${sendmailTARGET_LINKS}; do \
107 - rm -f $$i; \
108 - ${LN} ${LNOPTS} ${M`'BINDIR}/sendmail $$i; \
109 - done
110 -
111 --define(`confMTA_LINKS', `${DESTDIR}${UBINDIR}/newaliases ${DESTDIR}${UBINDIR}/mailq ${DESTDIR}${UBINDIR}/hoststat ${DESTDIR}${UBINDIR}/purgestat')
112 -+define(`confMTA_LINKS', `"${DESTDIR}${UBINDIR}/newaliases" "${DESTDIR}${UBINDIR}/mailq" "${DESTDIR}${UBINDIR}/hoststat" "${DESTDIR}${UBINDIR}/purgestat"')
113 - install-sm-mta: bldCURRENT_PRODUCT
114 -- ${INSTALL} -c -o ${M`'BINOWN} -g ${M`'BINGRP} -m ${M`'BINMODE} bldCURRENT_PRODUCT ${DESTDIR}${M`'BINDIR}/sm-mta
115 -+ ${INSTALL} -c -o ${M`'BINOWN} -g ${M`'BINGRP} -m ${M`'BINMODE} bldCURRENT_PRODUCT "${DESTDIR}${M`'BINDIR}/sm-mta"
116 - for i in confMTA_LINKS; do \
117 - rm -f $$i; \
118 - ${LN} ${LNOPTS} ${M`'BINDIR}/sm-mta $$i; \
119 - done
120 -
121 - install-hf:
122 -- if [ ! -d ${DESTDIR}${HFDIR} ]; then mkdir -p ${DESTDIR}${HFDIR}; else :; fi
123 -- ${INSTALL} -c -o ${UBINOWN} -g ${UBINGRP} -m 444 helpfile ${DESTDIR}${HFFILE}
124 -+ if [ ! -d "${DESTDIR}${HFDIR}" ]; then mkdir -p "${DESTDIR}${HFDIR}"; else :; fi
125 -+ ${INSTALL} -c -o ${UBINOWN} -g ${UBINGRP} -m 444 helpfile "${DESTDIR}${HFFILE}"
126 -
127 - install-st: statistics
128 -- if [ ! -d ${DESTDIR}${STDIR} ]; then mkdir -p ${DESTDIR}${STDIR}; else :; fi
129 -- ${INSTALL} -c -o ${SBINOWN} -g ${UBINGRP} -m ifdef(`confSTMODE', `confSTMODE', `0600') statistics ${DESTDIR}${STPATH}
130 -+ if [ ! -d "${DESTDIR}${STDIR}" ]; then mkdir -p "${DESTDIR}${STDIR}"; else :; fi
131 -+ ${INSTALL} -c -o ${SBINOWN} -g ${UBINGRP} -m ifdef(`confSTMODE', `confSTMODE', `0600') statistics "${DESTDIR}${STPATH}"
132 -
133 --install-submit-st: statistics ${DESTDIR}${MSPQ}
134 -- ${INSTALL} -c -o ${MSPQOWN} -g ${GBINGRP} -m ifdef(`confSTMODE', `confSTMODE', `0600') statistics ${DESTDIR}${MSPQ}/${MSPSTFILE}
135 -+install-submit-st: statistics "${DESTDIR}${MSPQ}"
136 -+ ${INSTALL} -c -o ${MSPQOWN} -g ${GBINGRP} -m ifdef(`confSTMODE', `confSTMODE', `0600') statistics "${DESTDIR}${MSPQ}/${MSPSTFILE}"
137 -
138 +
139 divert(0)
140 - bldPRODUCT_END
141
142 diff --git a/mail-mta/sendmail/sendmail-8.16.1.ebuild b/mail-mta/sendmail/sendmail-8.16.1.ebuild
143 new file mode 100644
144 index 00000000000..fc5113138ed
145 --- /dev/null
146 +++ b/mail-mta/sendmail/sendmail-8.16.1.ebuild
147 @@ -0,0 +1,208 @@
148 +# Copyright 1999-2020 Gentoo Authors
149 +# Distributed under the terms of the GNU General Public License v2
150 +
151 +EAPI=7
152 +
153 +inherit multilib systemd toolchain-funcs
154 +
155 +DESCRIPTION="Widely-used Mail Transport Agent (MTA)"
156 +HOMEPAGE="https://www.sendmail.org/"
157 +SRC_URI="ftp://ftp.sendmail.org/pub/${PN}/${PN}.${PV}.tar.gz"
158 +
159 +LICENSE="Sendmail GPL-2" # GPL-2 is here for initscript
160 +SLOT="0"
161 +KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86"
162 +IUSE="ipv6 ldap libressl mbox nis sasl sockets ssl tcpd"
163 +
164 +DEPEND="net-mail/mailbase
165 + sys-devel/m4
166 + sasl? ( >=dev-libs/cyrus-sasl-2.1.10 )
167 + tcpd? ( sys-apps/tcp-wrappers )
168 + ssl? (
169 + !libressl? ( dev-libs/openssl:0= )
170 + libressl? ( dev-libs/libressl:0= )
171 + )
172 + ldap? ( net-nds/openldap )
173 + sys-libs/db:6.0
174 + !net-mail/vacation
175 + "
176 +RDEPEND="${DEPEND}
177 + acct-group/smmsp
178 + acct-user/smmsp
179 + >=net-mail/mailbase-0.00
180 + >=mail-filter/libmilter-1.0.2_p1-r1
181 + !mail-mta/courier
182 + !mail-mta/esmtp
183 + !mail-mta/exim
184 + !mail-mta/mini-qmail
185 + !mail-mta/msmtp[mta]
186 + !mail-mta/netqmail
187 + !mail-mta/nullmailer
188 + !mail-mta/postfix
189 + !mail-mta/opensmtpd
190 + !mail-mta/qmail-ldap
191 + !>=mail-mta/ssmtp-2.64-r2[mta]"
192 +
193 +PDEPEND="!mbox? ( mail-filter/procmail )"
194 +
195 +src_prepare() {
196 + eapply "${FILESDIR}"/"${PN}"-8.14.6-build-system.patch
197 + eapply -p0 "${FILESDIR}"/sendmail-delivered_hdr.patch
198 +
199 + local confCC="$(tc-getCC)"
200 + local confCCOPTS="${CFLAGS}"
201 + local confLDOPTS="${LDFLAGS}"
202 + local confMAPDEF="-DMAP_REGEX"
203 + local confENVDEF="-DMAXDAEMONS=64"
204 + local conf_sendmail_LIBS=""
205 +
206 + use sasl && confLIBS="${confLIBS} -lsasl2" \
207 + && confENVDEF="${confENVDEF} -DSASL=2" \
208 + && confCCOPTS="${confCCOPTS} -I/usr/include/sasl" \
209 + && conf_sendmail_LIBS="${conf_sendmail_LIBS} -lsasl2"
210 +
211 + use tcpd && confENVDEF="${confENVDEF} -DTCPWRAPPERS" \
212 + && confLIBS="${confLIBS} -lwrap"
213 +
214 + # Bug #542370 - lets add support for modern crypto (PFS)
215 + use ssl && confENVDEF="${confENVDEF} -DSTARTTLS -D_FFR_DEAL_WITH_ERROR_SSL" \
216 + && confENVDEF="${confENVDEF} -D_FFR_TLS_1 -D_FFR_TLS_EC" \
217 + && confLIBS="${confLIBS} -lssl -lcrypto" \
218 + && conf_sendmail_LIBS="${conf_sendmail_LIBS} -lssl -lcrypto"
219 +
220 + use ldap && confMAPDEF="${confMAPDEF} -DLDAPMAP" \
221 + && confLIBS="${confLIBS} -lldap -llber"
222 +
223 + use ipv6 && confENVDEF="${confENVDEF} -DNETINET6"
224 +
225 + use nis && confENVDEF="${confENVDEF} -DNIS"
226 +
227 + use sockets && confENVDEF="${confENVDEF} -DSOCKETMAP"
228 +
229 + sed -e "s:@@confCCOPTS@@:${confCCOPTS}:" \
230 + -e "s/@@confLDOPTS@@/${confLDOPTS}/" \
231 + -e "s/@@confCC@@/${confCC}/" \
232 + -e "s/@@confMAPDEF@@/${confMAPDEF}/" \
233 + -e "s/@@confENVDEF@@/${confENVDEF}/" \
234 + -e "s/@@confLIBS@@/${confLIBS}/" \
235 + -e "s/@@conf_sendmail_LIBS@@/${conf_sendmail_LIBS}/" \
236 + "${FILESDIR}"/site.config.m4 > devtools/Site/site.config.m4 || die "sed failed"
237 +
238 + echo "APPENDDEF(\`confLIBDIRS', \`-L${EROOT}/usr/$(get_libdir)')" >> devtools/Site/site.config.m4 || die "echo failed"
239 +
240 + eapply_user
241 +}
242 +
243 +src_compile() {
244 + sh Build AR="$(tc-getAR)" RANLIB="$(tc-getRANLIB)" || die "compilation failed in main build script"
245 +}
246 +
247 +src_install() {
248 + local MY_LIBDIR=/usr/$(get_libdir)
249 + local MY_OBJDIR="obj.`uname -s`.`uname -r`.`uname -m`"
250 +
251 + dodir /usr/bin ${MY_LIBDIR}
252 + dodir /usr/share/man/man{1,5,8} /usr/sbin /usr/share/sendmail-cf
253 + dodir /var/spool/{mqueue,clientmqueue} /etc/conf.d
254 +
255 + keepdir /var/spool/{clientmqueue,mqueue}
256 +
257 + for dir in libsmutil sendmail mailstats praliases smrsh makemap vacation editmap
258 + do
259 + make DESTDIR="${D}" LIBDIR="${MY_LIBDIR}" MANROOT=/usr/share/man/man \
260 + SBINOWN=root SBINGRP=root UBINOWN=root UBINGRP=root \
261 + MANOWN=root MANGRP=root INCOWN=root INCGRP=root \
262 + LIBOWN=root LIBGRP=root GBINOWN=root GBINGRP=root \
263 + MSPQOWN=root CFOWN=root CFGRP=root \
264 + install -C "${MY_OBJDIR}/${dir}" \
265 + || die "install 1 failed"
266 + done
267 +
268 + for dir in rmail mail.local
269 + do
270 + make DESTDIR="${D}" LIBDIR="${MY_LIBDIR}" MANROOT=/usr/share/man/man \
271 + SBINOWN=root SBINGRP=root UBINOWN=root UBINGRP=root \
272 + MANOWN=root MANGRP=root INCOWN=root INCGRP=root \
273 + LIBOWN=root LIBGRP=root GBINOWN=root GBINGRP=root \
274 + MSPQOWN=root CFOWN=root CFGRP=root \
275 + force-install -C "${MY_OBJDIR}/${dir}" \
276 + || die "install 2 failed"
277 + done
278 +
279 + fowners root:smmsp /usr/sbin/sendmail
280 + fperms 2555 /usr/sbin/sendmail
281 + fowners smmsp:smmsp /var/spool/clientmqueue
282 + fperms 770 /var/spool/clientmqueue
283 + fperms 700 /var/spool/mqueue
284 + dosym /usr/sbin/makemap /usr/bin/makemap
285 + dodoc FAQ KNOWNBUGS README RELEASE_NOTES doc/op/op.ps
286 +
287 + newdoc sendmail/README README.sendmail
288 + newdoc sendmail/SECURITY SECURITY
289 + newdoc sendmail/TUNING TUNING
290 + newdoc smrsh/README README.smrsh
291 +
292 + newdoc cf/README README.cf
293 + newdoc cf/cf/README README.install-cf
294 +
295 + cp -pPR cf/* "${D}"/usr/share/sendmail-cf || die "copy failed"
296 +
297 + docinto contrib
298 + dodoc contrib/*
299 +
300 + insinto /etc/mail
301 +
302 + if use mbox
303 + then
304 + newins "${FILESDIR}"/sendmail.mc-r1 sendmail.mc
305 + else
306 + newins "${FILESDIR}"/sendmail-procmail.mc sendmail.mc
307 + fi
308 +
309 + m4 "${D}"/usr/share/sendmail-cf/m4/cf.m4 "${D}"/etc/mail/sendmail.mc \
310 + > "${D}"/etc/mail/sendmail.cf || die "cf.m4 failed"
311 +
312 + echo "include(\`/usr/share/sendmail-cf/m4/cf.m4')dnl" \
313 + > "${D}"/etc/mail/submit.mc || die "echo failed"
314 +
315 + cat "${D}"/usr/share/sendmail-cf/cf/submit.mc >> "${D}"/etc/mail/submit.mc || die "submit.mc cat failed"
316 +
317 + echo "# local-host-names - include all aliases for your machine here" \
318 + > "${D}"/etc/mail/local-host-names || die "local-host-names echo failed"
319 +
320 + cat <<- EOF > "${D}"/etc/mail/trusted-users
321 + # trusted-users - users that can send mail as others without a warning
322 + # apache, mailman, majordomo, uucp are good candidates
323 + EOF
324 +
325 + cat <<- EOF > "${D}"/etc/mail/access
326 + # Check the /usr/share/doc/sendmail/README.cf file for a description
327 + # of the format of this file. (search for access_db in that file)
328 + # The /usr/share/doc/sendmail/README.cf is part of the sendmail-doc
329 + # package.
330 + #
331 +
332 + EOF
333 +
334 + cat <<- EOF > "${D}"/etc/conf.d/sendmail
335 + # Config file for /etc/init.d/sendmail
336 + # add start-up options here
337 + SENDMAIL_OPTS="-bd -q30m -L sm-mta" # default daemon mode
338 + CLIENTMQUEUE_OPTS="-Ac -q30m -L sm-cm" # clientmqueue
339 + KILL_OPTS="" # add -9/-15/your favorite evil SIG level here
340 +
341 + EOF
342 +
343 + if use sasl; then
344 + dodir /etc/sasl2
345 + cat <<- EOF > "${D}"/etc/sasl2/Sendmail.conf
346 + pwcheck_method: saslauthd
347 + mech_list: PLAIN LOGIN
348 +
349 + EOF
350 + fi
351 +
352 + doinitd "${FILESDIR}"/sendmail
353 + systemd_dounit "${FILESDIR}"/sendmail.service
354 + systemd_dounit "${FILESDIR}"/sm-client.service
355 +}