diff options
Diffstat (limited to 'mail-mta')
40 files changed, 204 insertions, 3072 deletions
diff --git a/mail-mta/Manifest.gz b/mail-mta/Manifest.gz Binary files differindex 945b36b3ce36..a1b3c041a6e4 100644 --- a/mail-mta/Manifest.gz +++ b/mail-mta/Manifest.gz diff --git a/mail-mta/courier/Manifest b/mail-mta/courier/Manifest index 0c0918262af7..ac9a4b9e67f4 100644 --- a/mail-mta/courier/Manifest +++ b/mail-mta/courier/Manifest @@ -3,5 +3,5 @@ AUX courier-init-r4 4965 BLAKE2B 09f29543599abfb6dd5df058f832e979bde471be3f9d293 AUX norewrite.patch 489 BLAKE2B f4ed2e1af731811d8da96ee817335016c5ec9a77a53ccd194360e95804f71e7c7825511f1831f1575f77cec35d72f12d39c02f8d10524fc189ff64b8a1a7fb9b SHA512 e9e95bd5d1a78b510f6dd7e155999089f123eecfdc16d3b5005b00981a7b6d29827cdddc61035ed3c3edcf0b9907ddfbae76df6503a1a8ef26b4de43a02bfc8e AUX password.dist 247 BLAKE2B 1803a6663c32ccc74c4dfb1d591a01d4416f9de9c4bf35c9a7ca277c2007b8c29a8899f4285c78eeb8592766457eef0caf377a344adee7a61be15bbf8b80c7de SHA512 f488b0ab1a909c9b878b9f3f3147641a9ed6d8d2ad44c67cd641934b800b18a62de2a7f5f51fdbecfbbcdd7c39c753734984cc0836c905a3b708858e1b91093d DIST courier-1.0.5.tar.bz2 7465054 BLAKE2B 55e9ba2a85889e7210652475149f4d3e687fd63a27b44a5a16c888b2f60bb18c4156e3344792585fed2ee3d81770e79c55ce5791842c255b8701bad5d2f8af4e SHA512 99a8e98633da99abd1f6f4e24328d4655526d51dc9fc03ffcb9c1e0cce0e608dedb2ac9511829af4487ff5af4618500d6fbbee26568f2a05e3c9d3cf3b48b2a5 -EBUILD courier-1.0.5.ebuild 9510 BLAKE2B 5ef3589fce9b63670d8cb46978583c06d9f261a71d31f8f80662dda4e95527df51d4afc2434202e08d0f4516722552bbfc776e9c00537cb61aac316991c049ef SHA512 65bcfc0c06b2635466ab6f05ba920cb57b9978c9c167b2b5ff2b25140fdbd1276422f9ffab658b68716bab90a662a739264e517abce9e7bda7a5642b05ce616e +EBUILD courier-1.0.5.ebuild 9508 BLAKE2B f6588fa35657482b9146162b86b4a96dcb2898a27afed98ddc719c05802e3f6754f2f13a32f836ce0e826c689a42fb38827ec2c9e96393d897559fa7e74f6862 SHA512 88ec7b7feaf30bfcfc32216ff07d4d60728a79dafd6de9852fb290cabb392bac93d3a6dbb426f84639489935b519b2df5daf4a73382132d34269d8a676c20029 MISC metadata.xml 755 BLAKE2B 8ec0dd31ad59193d95585ab88f0bac6ced87132444a4136b2c2f80458a11f5296c42283574c3b56c26a31dad25fff530ebbfbf1ef467a1b824d11afe93a6da31 SHA512 de15af05e98deba4d3b297b4301439d892c3ba0d8af30ca459fcac72bf0179de87bf11260b8bfdb3827dd1f0e5123d68817766ffe037cece9c30adb3e8bd8b06 diff --git a/mail-mta/courier/courier-1.0.5.ebuild b/mail-mta/courier/courier-1.0.5.ebuild index b68eddcc407a..21572ce7f808 100644 --- a/mail-mta/courier/courier-1.0.5.ebuild +++ b/mail-mta/courier/courier-1.0.5.ebuild @@ -10,7 +10,7 @@ SRC_URI="mirror://sourceforge/courier/${P}.tar.bz2" LICENSE="GPL-2" SLOT="0" -KEYWORDS="~alpha amd64 arm hppa ia64 ppc ppc64 s390 sh sparc x86" +KEYWORDS="~alpha amd64 arm hppa ~ia64 ppc ppc64 s390 sparc x86" IUSE="postgres ldap libressl mysql pam nls ipv6 spell fax crypt norewrite \ fam web webmail gnutls" diff --git a/mail-mta/exim/Manifest b/mail-mta/exim/Manifest index 0e3de37be580..16fdf00d7dd4 100644 --- a/mail-mta/exim/Manifest +++ b/mail-mta/exim/Manifest @@ -19,14 +19,11 @@ AUX exim.rc10 1135 BLAKE2B abc7247ee8171069f30f954d9e4275fa85f09f5488a372f9c4f7f AUX exim.service 229 BLAKE2B 6d6396ef98b8e7c4fcfa28e24223bd58393387abedfb960284dfd1a297d1612deea6b77e2affeca8c5ff6f7db3eb32717893ed0dc1eaf3525e6969520e8589a3 SHA512 a071e9fb74b5fc2fdf0c73ad64ddfbc3954d8f7095d6a363dacf8c75d72a479fbf6821822ec5c8f3846d7687342e1bd447b97f91ca7b0582e5c98008aac30cca AUX exim.socket 139 BLAKE2B bb8281a98fdac1b52031d5250fd1e658bf5a2c32e24b49ed0daa857d0d32285abf6db23c3d717992c43443ab4bcd97a19ec3811f182200a2d99a48ced6cfb6bc SHA512 db621116907ceb573e6f34581f47c91f751bff593054d7ddc32397b34c7f2405bec184bdb0589d2ac457fa3a61bcba072761e3a6293a99c9c764d2d9fd6069ae AUX exim_at.service 140 BLAKE2B 8624f4a555e2acdc7aaf917952c4152ad00dc063a51076aefa1d023d47d5f7fe8b268f3308734f363ed9628cd8551ccac7fc369657e0fdf65507d2e6419f704c SHA512 11c8133ee15b3e5193c9b1c59aed66c81b6e045dd23310bede9fcde6c88905db5ef08afdb798b53b75a7465915ea1247e980edf95db07a7f9b7bb58ce95fbb5a -DIST exim-4.92.2.tar.xz 1772688 BLAKE2B 618c70e26811d0e6d453a4b88ab1cdb9e337a9ca8ceec50aee665b1493c75157001483cf9721e3d57313a90910d2605717b2c4be4174c2897b3f992af01c1c26 SHA512 d27aca4d4e9df267b0afcbe7b3f74c9ca6e96e7e6eb4d2f86ff00b0e2234eaec90271405eb387a36a2e0d4ec5597b2920753f85318a5618ddbc8af475a7d81cd DIST exim-4.92.3.tar.xz 1773156 BLAKE2B 7866c23c862f5b5aadac709279f9ed376e526e90e8ca09d41c1789041ec0a3ecd48f8d2237e4d462e547efa2178babd5942d3142fef7419e16d1707fe23fa226 SHA512 ca6d6f50653502345511b683859b33aa02faa48454fb2100ff89fed3dcb8af8933e7bce68939365fdee42f96eec0c3b135cf748f4581e92a62be0f0ab093868a DIST exim-4.93.0.4.tar.xz 1804696 BLAKE2B 721336101104d9c71b3bb6f432e382c28ad17d80cdb50d04213989e65a719d906caf8eb95639bfaf7a1bfdd62c7000d9df14484953446ecfca901fd7c708514e SHA512 84951849b69399d6f187d2801760dc0cb9e61c88c7c88aaca4e07e48120199a6be94b2236d058ffeacb8d611dd84056b610d480353c301a3ad5799768dd39d96 -DIST exim-pdf-4.92.2.tar.xz 2039468 BLAKE2B 3542bb5d38267bb06728ada72cfa89f06027b917799e743a1764cb7568cf0ba4cdbc5b40738c3ae41c9540d348810b388d74ad315a201f2740a5a0b79e83f904 SHA512 da90354cd8133103f08b978dd0422fd1a00e5866cd3f40e523d06875fb8b31163d7fe9791f1cf81d15bc63b16fc7f6bb98cf28c3036d054464336c07245b3c91 DIST exim-pdf-4.92.3.tar.xz 2039436 BLAKE2B 8d20e7f0ebfcb573d08b490737923afc2cd2d5837f5c91bd2f3e6b5e637d86a5d5a59123c57ba9219ead675c72bfc46351d5b705d9533fab80bedeeca8bdd580 SHA512 3245a627a924db92e5a50e842e096731d08284f757274b5083ea234707c493abd6f27a3b34a2025e3acff167260df0f4ebe68b9f5832920c5f22c258143ab43f DIST exim-pdf-4.93.0.4.tar.xz 2069744 BLAKE2B 28730134293d87b16d672df66119ff97aaf2d796cf28842bb5bf6831a0be6a186a5cce503200b9fc985aaa14386053ca83c259625949634c5a28937b285247ca SHA512 929b4198a3e8764a64478e7ff5a9c7398ad1990114206b68494b1f1f563c23405c7b440e2f21a9f777e9e3cd3a3398d6faea3b882407f731ef3a767c27fd9361 DIST system_filter.exim.gz 3075 BLAKE2B d05e872b5cef377d29126cda03fc0a74c8777b2119b76ff43da6e8de808035eb9bfcb034a85d81824f135d484e864bfc0629fc1af2c228a7277d5ee7cf9cde79 SHA512 cb358d3ce2499a0bb5920d962a06f2af8486e55ec90c8c928bd8e3aefb279aa57f5f960d5adfcef68bd94110b405eaa144e9629cfe6014a529c79c544600bbf3 -EBUILD exim-4.92.2.ebuild 13568 BLAKE2B bccc420e206454e414336cc66fe238e846fda68a4343eb06706f85c646178502c8ad84d06335b6b7b1ad3d95aab4a1ef666e72159a1a4f4d1b25f71e590a1880 SHA512 77063b234b4516837eabbb334d77dfc0a6e1ea3c5cb8aea477a03791b99ca4876740cc33ff37aacb731abc37509c9e3357cbfa0cf2602eafe5d3878d247fcaec -EBUILD exim-4.92.3.ebuild 13576 BLAKE2B d47a663b87bb780306a65ac95248d6ffa42dd776256edaf1f0c7d9f39a4574bc784ff8b7f50f18ac47e528a2e03a892d54e0cef70ee3119fe8817e356daaca17 SHA512 71273f400536c99b15c0b0b957ee6b51da59756cec18eba7035ad4e3b12481792396c2ab761eff5f454542d5c7b3a376b74a3bbbd9ebf065ca993cd88de73346 -EBUILD exim-4.93.0.4.ebuild 13655 BLAKE2B b88f938e5c1f5fb15b9c859fbbec660e6ae5fd4480056a0561c5bf0ed88c3abc2d3640593a72de939f53abc32ec9d4a0961e5ea2edfdaaded4562656e04658cf SHA512 43c9bf7d1c473741d39fc506befbbc6f86b6bd785dc938240803224c3494ac947b29358eb64c7368fca8a15c3c9e949cb8b11eb74238a587ccb80d95998a4c78 +EBUILD exim-4.92.3.ebuild 13570 BLAKE2B 02fb2498b0c008a121ea2c05ae1071de844629a969508835dc003903bf1393c0c11d5d7c860a65db3ed2ba3325c76d0bee8f6f976f39cf50c7ed7f79efe296d0 SHA512 081feef83e973d073f89c072de78dc355e3f80b83dfb0e3bf509271f25099fc49f018114fc38e8230e48c09eabb7c974c54fb8162c1e6ceac8033dc7f8d2d4b7 +EBUILD exim-4.93.0.4.ebuild 13733 BLAKE2B 5a992002e5d5847672f4d0a7cc037614a1cd952aa7ab85b1977a85fcc41f4b698191a37578e31f98e1d92926a1fbf94e250d7c24a1506380d3b4dad4720de005 SHA512 fcd07f6f04e317cb2baef61afe0bac271f08a68bcb2bd96f23f68b76471ebd88297b84b1735e02acf5df6ec58830086e62463dbcb09a625ab2a8f093f89e4f50 MISC metadata.xml 2457 BLAKE2B c1dcbaedd069b41c4cfb190806b44014229d53cf6d6f72e04b99dc91f223567cb4f30100792aae72658780da0579fa26e6fb8a0266565bcc0c307996d59ac3ed SHA512 9044abccd15525c7676fc218b62d9b663bd155482894eced9c0cfc8a22e8cd7353009adc75a9f3de15b14f267e6ee6b4f4c91d8bd9260931c0b9de6bf48c762f diff --git a/mail-mta/exim/exim-4.92.2.ebuild b/mail-mta/exim/exim-4.92.2.ebuild deleted file mode 100644 index d93a9ac37a4c..000000000000 --- a/mail-mta/exim/exim-4.92.2.ebuild +++ /dev/null @@ -1,581 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI="7" - -inherit db-use toolchain-funcs multilib pam systemd - -IUSE="arc dane dcc +dkim dlfunc dmarc +dnsdb doc dovecot-sasl dsn elibc_glibc exiscan-acl gnutls idn ipv6 ldap libressl lmtp maildir mbx mysql nis pam perl pkcs11 postgres +prdr proxy radius redis sasl selinux spf sqlite srs ssl syslog tcpd +tpda X" -REQUIRED_USE=" - arc? ( dkim spf ) - dane? ( ssl !gnutls ) - dmarc? ( dkim spf ) - gnutls? ( ssl ) - pkcs11? ( ssl ) - spf? ( exiscan-acl ) - srs? ( exiscan-acl ) - !ssl? ( !dkim ) -" -# NOTE on USE="gnutls dane", gnutls[dane] is masked in base, unmasked -# for x86 and amd64 only, due to this, repoman won't allow depending on -# gnutls[dane] for all else. Because we cannot express USE=dane when -# USE=gnutls is in effect only in package.use.mask, the only option we -# have left is to a) ignore the dependency (but that results in bug -# #661164) or b) mask the usage of USE=dane with USE=gnutls. Both are -# incorrect, but b) is the only "correct" view from repoman. - -COMM_URI="https://downloads.exim.org/exim4$([[ ${PV} == *_rc* ]] && echo /test)" - -DESCRIPTION="A highly configurable, drop-in replacement for sendmail" -SRC_URI="${COMM_URI}/${P//rc/RC}.tar.xz - mirror://gentoo/system_filter.exim.gz - doc? ( ${COMM_URI}/${PN}-pdf-${PV//rc/RC}.tar.xz )" -HOMEPAGE="https://www.exim.org/" - -SLOT="0" -LICENSE="GPL-2" -KEYWORDS="~alpha amd64 arm hppa ia64 ppc ppc64 sparc x86 ~x86-solaris" - -COMMON_DEPEND=">=sys-apps/sed-4.0.5 - ( >=sys-libs/db-3.2:= <sys-libs/db-6:= ) - dev-libs/libpcre - idn? ( net-dns/libidn:= net-dns/libidn2:= ) - perl? ( dev-lang/perl:= ) - pam? ( sys-libs/pam ) - tcpd? ( sys-apps/tcp-wrappers ) - ssl? ( - !libressl? ( dev-libs/openssl:0= ) - libressl? ( dev-libs/libressl:= ) - ) - gnutls? ( - net-libs/gnutls:0=[pkcs11?] - dev-libs/libtasn1 - ) - ldap? ( >=net-nds/openldap-2.0.7 ) - nis? ( - elibc_glibc? ( - net-libs/libtirpc - >=net-libs/libnsl-1:= - ) - ) - mysql? ( dev-db/mysql-connector-c:= ) - postgres? ( dev-db/postgresql:= ) - sasl? ( >=dev-libs/cyrus-sasl-2.1.26-r2 ) - redis? ( dev-libs/hiredis ) - spf? ( >=mail-filter/libspf2-1.2.5-r1 ) - dmarc? ( mail-filter/opendmarc ) - srs? ( mail-filter/libsrs_alt ) - X? ( - x11-libs/libX11 - x11-libs/libXmu - x11-libs/libXt - x11-libs/libXaw - ) - sqlite? ( dev-db/sqlite ) - radius? ( net-dialup/freeradius-client ) - virtual/libiconv - elibc_glibc? ( net-libs/libnsl ) - " - # added X check for #57206 -BDEPEND="virtual/pkgconfig" -DEPEND="${COMMON_DEPEND}" -RDEPEND="${COMMON_DEPEND} - !mail-mta/courier - !mail-mta/esmtp - !mail-mta/mini-qmail - !<mail-mta/msmtp-1.4.19-r1 - !>=mail-mta/msmtp-1.4.19-r1[mta] - !mail-mta/netqmail - !mail-mta/nullmailer - !mail-mta/postfix - !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/mailwrapper - >=net-mail/mailbase-0.00-r5 - virtual/logger - dcc? ( mail-filter/dcc ) - selinux? ( sec-policy/selinux-exim ) - " - -PATCHES=( - "${FILESDIR}"/exim-4.69-r1.27021.patch - "${FILESDIR}"/exim-4.92-localscan_dlopen.patch -) - -S=${WORKDIR}/${P//rc/RC} - -src_prepare() { - # Legacy patches which need a respin for -p1 - eapply -p0 "${FILESDIR}"/exim-4.14-tail.patch - eapply -p0 "${FILESDIR}"/exim-4.74-radius-db-ENV-clash.patch # 287426 - eapply -p0 "${FILESDIR}"/exim-4.82-makefile-freebsd.patch # 235785 - eapply -p0 "${FILESDIR}"/exim-4.89-as-needed-ldflags.patch # 352265, 391279 - eapply -p0 "${FILESDIR}"/exim-4.76-crosscompile.patch # 266591 - eapply -p2 "${FILESDIR}"/exim-4.92-fix-eval-expansion-32bit.patch #687554 - - if use maildir ; then - eapply "${FILESDIR}"/exim-4.20-maildir.patch - else - eapply -p0 "${FILESDIR}"/exim-4.80-spool-mail-group.patch # 438606 - fi - - default - - # user Exim believes it should be - MAILUSER=mail - MAILGROUP=mail - if use prefix && [[ ${EUID} != 0 ]] ; then - MAILUSER=$(id -un) - MAILGROUP=$(id -gn) - fi -} - -src_configure() { - # general config and paths - - local aliases="${EPREFIX}/etc/mail/aliases" - sed -i \ - -e "/SYSTEM_ALIASES_FILE/s'SYSTEM_ALIASES_FILE'${aliases}'" \ - src/configure.default || die - - sed -i -e 's/^buildname=.*/buildname=exim-gentoo/' Makefile || die - - if use elibc_musl; then - sed -i -e 's/^LIBS = -lnsl/LIBS =/g' OS/Makefile-Linux || die - fi - - local conffile="${EPREFIX}/etc/exim/exim.conf" - sed -e "48i\CFLAGS=${CFLAGS}" \ - -e "s:BIN_DIRECTORY=/usr/exim/bin:BIN_DIRECTORY=${EPREFIX}/usr/sbin:" \ - -e "s:EXIM_USER=:EXIM_USER=${MAILUSER}:" \ - -e "s:CONFIGURE_FILE=.*$:CONFIGURE_FILE=${conffile}:" \ - -e "s:ZCAT_COMMAND=.*$:ZCAT_COMMAND=${EPREFIX}/bin/zcat:" \ - -e "s:COMPRESS_COMMAND=.*$:COMPRESS_COMMAND=${EPREFIX}/bin/gzip:" \ - src/EDITME > Local/Makefile || die - - # work on Local/Makefile from now on - cd Local - - cat >> Makefile <<- EOC - INFO_DIRECTORY=${EPREFIX}/usr/share/info - PID_FILE_PATH=${EPREFIX}/run/exim.pid - SPOOL_DIRECTORY=${EPREFIX}/var/spool/exim - HAVE_ICONV=yes - EOC - - # if we use libiconv, now is the time to tell so - use !elibc_glibc && use !elibc_musl && \ - echo "EXTRALIBS_EXIM=-liconv" >> Makefile - - # support for IPv6 - if use ipv6; then - cat >> Makefile <<- EOC - HAVE_IPV6=YES - EOC - fi - - # support i18n/IDNA - if use idn; then - cat >> Makefile <<- EOC - SUPPORT_I18N=yes - SUPPORT_I18N_2008=yes - EXTRALIBS_EXIM += -lidn -lidn2 - EOC - fi - - # - # mail storage formats - # - - # mailstore is Exim's traditional storage format - cat >> Makefile <<- EOC - SUPPORT_MAILSTORE=yes - EOC - - # mbox - if use mbx; then - cat >> Makefile <<- EOC - SUPPORT_MBX=yes - EOC - fi - - # maildir - if use maildir; then - cat >> Makefile <<- EOC - SUPPORT_MAILDIR=yes - EOC - fi - - # - # lookup methods - - # use the "native" interfaces to the DBM and CDB libraries, support - # passwd and directory lookups by default - local DB_VERS="5.3 5.1 4.8 4.7 4.6 4.5 4.4 4.3 4.2 3.2" - cat >> Makefile <<- EOC - USE_DB=yes - CFLAGS+=-I$(db_includedir ${DB_VERS}) - DBMLIB=-l$(db_libname ${DB_VERS}) - LOOKUP_CDB=yes - LOOKUP_PASSWD=yes - LOOKUP_DSEARCH=yes - EOC - - if ! use dnsdb; then - # DNSDB lookup is enabled by default - sed -i -e 's:^LOOKUP_DNSDB=yes:# LOOKUP_DNSDB=yes:' Makefile || die - fi - - if use ldap; then - cat >> Makefile <<- EOC - LOOKUP_LDAP=yes - LDAP_LIB_TYPE=OPENLDAP2 - LOOKUP_INCLUDE += -I"${EPREFIX}"/usr/include/ldap - LOOKUP_LIBS += -lldap -llber - EOC - fi - - if use mysql; then - cat >> Makefile <<- EOC - LOOKUP_MYSQL=yes - LOOKUP_INCLUDE += $(mysql_config --include) - LOOKUP_LIBS += $(mysql_config --libs) - EOC - fi - - if use nis; then - cat >> Makefile <<- EOC - LOOKUP_NIS=yes - LOOKUP_NISPLUS=yes - EOC - if use elibc_glibc ; then - cat >> Makefile <<- EOC - CFLAGS += -I"${EPREFIX}"/usr/include/tirpc - EOC - fi - fi - - if use postgres; then - cat >> Makefile <<- EOC - LOOKUP_PGSQL=yes - LOOKUP_INCLUDE += -I$(pg_config --includedir) - LOOKUP_LIBS += -L$(pg_config --libdir) -lpq - EOC - fi - - if use sqlite; then - cat >> Makefile <<- EOC - LOOKUP_SQLITE=yes - LOOKUP_SQLITE_PC=sqlite3 - EOC - fi - - if use redis; then - cat >> Makefile <<- EOC - LOOKUP_REDIS=yes - LOOKUP_LIBS += -lhiredis - EOC - fi - - # Exim monitor, enabled by default, controlled via X USE-flag, - # disable if not requested, bug #46778 - if use X; then - cp ../exim_monitor/EDITME eximon.conf || die - else - sed -i -e '/^EXIM_MONITOR=/s/^/# /' Makefile || die - fi - - # - # features - # - - # content scanning support - if use exiscan-acl; then - cat >> Makefile <<- EOC - WITH_CONTENT_SCAN=yes - EOC - fi - - # DomainKeys Identified Mail, RFC4871 - if ! use dkim; then - # DKIM is enabled by default - cat >> Makefile <<- EOC - DISABLE_DKIM=yes - EOC - fi - - # Per-Recipient-Data-Response - if ! use prdr; then - # PRDR is enabled by default - cat >> Makefile <<- EOC - DISABLE_PRDR=yes - EOC - fi - - # Transport post-delivery actions - if use !tpda && use !dane; then - # EVENT is enabled by default - cat >> Makefile <<- EOC - DISABLE_EVENT=yes - EOC - fi - - # log to syslog - if use syslog; then - local eximlog="${EPREFIX}/var/log/exim/exim_%s.log" - sed -i \ - -e "s:LOG_FILE_PATH=${eximlog}:LOG_FILE_PATH=syslog:" \ - Makefile || die - cat >> Makefile <<- EOC - LOG_FILE_PATH=syslog - EOC - else - cat >> Makefile <<- EOC - LOG_FILE_PATH=${EPREFIX}/var/log/exim/exim_%s.log - EOC - fi - - # starttls support (ssl) - if use ssl; then - echo "SUPPORT_TLS=yes" >> Makefile - if use gnutls; then - echo "USE_GNUTLS=yes" >> Makefile - echo "USE_GNUTLS_PC=gnutls" >> Makefile - use pkcs11 || echo "AVOID_GNUTLS_PKCS11=yes" >> Makefile - else - echo "USE_OPENSSL_PC=openssl" >> Makefile - fi - fi - - # TCP wrappers - if use tcpd; then - cat >> Makefile <<- EOC - USE_TCP_WRAPPERS=yes - EXTRALIBS_EXIM += -lwrap - EOC - fi - - # Light Mail Transport Protocol - if use lmtp; then - cat >> Makefile <<- EOC - TRANSPORT_LMTP=yes - EOC - fi - - # embedded Perl - if use perl; then - cat >> Makefile <<- EOC - EXIM_PERL=perl.o - EOC - fi - - # dlfunc - if use dlfunc; then - cat >> Makefile <<- EOC - EXPAND_DLFUNC=yes - HAVE_LOCAL_SCAN=yes - DLOPEN_LOCAL_SCAN=yes - EOC - fi - - # Proxy Protocol - if use proxy; then - cat >> Makefile <<- EOC - SUPPORT_PROXY=yes - EOC - fi - - # DANE - if use dane; then - cat >> Makefile <<- EOC - SUPPORT_DANE=yes - EOC - fi - - # Sender Policy Framework - if use spf; then - cat >> Makefile <<- EOC - SUPPORT_SPF=yes - EXTRALIBS_EXIM += -lspf2 - EOC - fi - - # - # experimental features - # - - # Authenticated Receive Chain - if use arc; then - echo "EXPERIMENTAL_ARC=yes">> Makefile - fi - - # Distributed Checksum Clearinghouse - if use dcc; then - echo "EXPERIMENTAL_DCC=yes">> Makefile - fi - - # Sender Rewriting Scheme - if use srs; then - cat >> Makefile <<- EOC - EXPERIMENTAL_SRS=yes - EXTRALIBS_EXIM += -lsrs_alt - EOC - fi - - # DMARC - if use dmarc; then - cat >> Makefile <<- EOC - EXPERIMENTAL_DMARC=yes - EXTRALIBS_EXIM += -lopendmarc - EOC - fi - - # Delivery Sender Notifications extra information in fail message - if use dsn; then - cat >> Makefile <<- EOC - EXPERIMENTAL_DSN_INFO=yes - EOC - fi - - # - # authentication (SMTP AUTH) - # - - # standard bits - cat >> Makefile <<- EOC - AUTH_SPA=yes - AUTH_CRAM_MD5=yes - AUTH_PLAINTEXT=yes - EOC - - # Cyrus SASL - if use sasl; then - cat >> Makefile <<- EOC - CYRUS_SASLAUTHD_SOCKET=${EPREFIX}/run/saslauthd/mux - AUTH_CYRUS_SASL=yes - AUTH_LIBS += -lsasl2 - EOC - fi - - # Dovecot - if use dovecot-sasl; then - cat >> Makefile <<- EOC - AUTH_DOVECOT=yes - EOC - fi - - # Pluggable Authentication Modules - if use pam; then - cat >> Makefile <<- EOC - SUPPORT_PAM=yes - AUTH_LIBS += -lpam - EOC - fi - - # Radius - if use radius; then - cat >> Makefile <<- EOC - RADIUS_CONFIG_FILE=${EPREFIX}/etc/radiusclient/radiusclient.conf - RADIUS_LIB_TYPE=RADIUSCLIENTNEW - AUTH_LIBS += -lfreeradius-client - EOC - fi -} - -src_compile() { - emake CC="$(tc-getCC)" HOSTCC="$(tc-getBUILD_CC)" \ - AR="$(tc-getAR) cq" RANLIB="$(tc-getRANLIB)" FULLECHO='' -} - -src_install() { - cd "${S}"/build-exim-gentoo || die - dosbin exim - if use X; then - dosbin eximon.bin - dosbin eximon - fi - fperms 4755 /usr/sbin/exim - - dosym exim /usr/sbin/sendmail - dosym exim /usr/sbin/rsmtp - dosym exim /usr/sbin/rmail - dosym ../sbin/exim /usr/bin/mailq - dosym ../sbin/exim /usr/bin/newaliases - dosym ../sbin/sendmail /usr/lib/sendmail - - for i in exicyclog exim_dbmbuild exim_dumpdb exim_fixdb exim_lock \ - exim_tidydb exinext exiwhat exigrep eximstats exiqsumm exiqgrep \ - convert4r3 convert4r4 exipick - do - dosbin $i - done - - dodoc -r "${S}"/doc/. - doman "${S}"/doc/exim.8 - use dsn && dodoc "${S}"/README.DSN - use doc && dodoc "${WORKDIR}"/${PN}-pdf-${PV//rc/RC}/doc/*.pdf - - # conf files - insinto /etc/exim - newins "${S}"/src/configure.default exim.conf.dist - if use exiscan-acl; then - newins "${S}"/src/configure.default exim.conf.exiscan-acl - fi - doins "${WORKDIR}"/system_filter.exim - doins "${FILESDIR}"/auth_conf.sub - - pamd_mimic system-auth exim auth account - - # headers, #436406 - if use dlfunc ; then - # fixup includes so they actually can be found when including - sed -i \ - -e '/#include "\(config\|store\|mytypes\).h"/s:"\(.\+\)":<exim/\1>:' \ - local_scan.h || die - insinto /usr/include/exim - doins {config,local_scan}.h ../src/{mytypes,store}.h - fi - - insinto /etc/logrotate.d - newins "${FILESDIR}/exim.logrotate" exim - - newinitd "${FILESDIR}"/exim.rc10 exim - newconfd "${FILESDIR}"/exim.confd exim - - systemd_dounit \ - "${FILESDIR}"/{exim.service,exim.socket,exim-submission.socket} - systemd_newunit \ - "${FILESDIR}"/exim_at.service 'exim@.service' - systemd_newunit \ - "${FILESDIR}"/exim-submission_at.service 'exim-submission@.service' - - diropts -m 0750 -o ${MAILUSER} -g ${MAILGROUP} - keepdir /var/log/${PN} -} - -pkg_postinst() { - if [[ ! -f ${EROOT}/etc/exim/exim.conf ]] ; then - einfo "${EROOT}/etc/exim/system_filter.exim is a sample system_filter." - einfo "${EROOT}/etc/exim/auth_conf.sub contains the configuration sub" - einfo "for using smtp auth." - einfo "Please create ${EROOT}/etc/exim/exim.conf from" - einfo " ${EROOT}/etc/exim/exim.conf.dist." - fi - if use dcc ; then - einfo "DCC support is experimental, you can find some limited" - einfo "documentation at the bottom of this prerelease message:" - einfo "http://article.gmane.org/gmane.mail.exim.devel/3579" - fi - use srs && einfo "SRS support is experimental" - if use dmarc ; then - einfo "DMARC support is experimental. See global settings to" - einfo "configure DMARC, for usage see the documentation at " - einfo "experimental-spec.txt." - fi - use dsn && einfo "extra information in fail DSN message is experimental" - elog "The obsolete acl condition 'demime' is removed, the replacements" - elog "are the ACLs acl_smtp_mime and acl_not_smtp_mime" -} diff --git a/mail-mta/exim/exim-4.92.3.ebuild b/mail-mta/exim/exim-4.92.3.ebuild index 22f7f20d3ff3..03bdaab227c0 100644 --- a/mail-mta/exim/exim-4.92.3.ebuild +++ b/mail-mta/exim/exim-4.92.3.ebuild @@ -34,7 +34,7 @@ HOMEPAGE="https://www.exim.org/" SLOT="0" LICENSE="GPL-2" -KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-solaris" +KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ppc ppc64 sparc x86 ~x86-solaris" COMMON_DEPEND=">=sys-apps/sed-4.0.5 ( >=sys-libs/db-3.2:= <sys-libs/db-6:= ) diff --git a/mail-mta/exim/exim-4.93.0.4.ebuild b/mail-mta/exim/exim-4.93.0.4.ebuild index 2fcf22048a1c..a7ac64a9ffb4 100644 --- a/mail-mta/exim/exim-4.93.0.4.ebuild +++ b/mail-mta/exim/exim-4.93.0.4.ebuild @@ -5,7 +5,7 @@ EAPI="7" inherit db-use toolchain-funcs multilib pam systemd -IUSE="arc dane dcc +dkim dlfunc dmarc +dnsdb doc dovecot-sasl dsn elibc_glibc exiscan-acl gnutls idn ipv6 ldap libressl lmtp maildir mbx mysql nis pam perl pkcs11 postgres +prdr proxy radius redis sasl selinux spf sqlite srs +ssl syslog tcpd +tpda X" +IUSE="arc +dane dcc +dkim dlfunc dmarc +dnsdb doc dovecot-sasl dsn elibc_glibc exiscan-acl gnutls idn ipv6 ldap libressl lmtp maildir mbx mysql nis pam perl pkcs11 postgres +prdr proxy radius redis sasl selinux spf sqlite srs +ssl syslog tcpd +tpda X" REQUIRED_USE=" arc? ( dkim spf ) dane? ( ssl !gnutls ) @@ -149,7 +149,7 @@ src_configure() { local conffile="${EPREFIX}/etc/exim/exim.conf" sed -e "48i\CFLAGS=${CFLAGS}" \ -e "s:BIN_DIRECTORY=/usr/exim/bin:BIN_DIRECTORY=${EPREFIX}/usr/sbin:" \ - -e "s:EXIM_USER=:EXIM_USER=${MAILUSER}:" \ + -e "s;EXIM_USER=;EXIM_USER=ref:${MAILUSER};" \ -e "s:CONFIGURE_FILE=.*$:CONFIGURE_FILE=${conffile}:" \ -e "s:ZCAT_COMMAND=.*$:ZCAT_COMMAND=${EPREFIX}/bin/zcat:" \ -e "s:COMPRESS_COMMAND=.*$:COMPRESS_COMMAND=${EPREFIX}/bin/gzip:" \ @@ -166,8 +166,11 @@ src_configure() { EOC # if we use libiconv, now is the time to tell so - use !elibc_glibc && use !elibc_musl && \ - echo "EXTRALIBS_EXIM=-liconv" >> Makefile + if use !elibc_glibc && use !elibc_musl ; then + cat >> Makefile <<- EOC + EXTRALIBS_EXIM=-liconv + EOC + fi # support for IPv6 if use ipv6; then @@ -392,10 +395,9 @@ src_configure() { fi # DANE - if use dane; then - cat >> Makefile <<- EOC - SUPPORT_DANE=yes - EOC + if use !dane; then + # DANE is enabled by default + sed -i -e 's:^SUPPORT_DANE=yes:# SUPPORT_DANE=yes:' Makefile || die fi # DMARC diff --git a/mail-mta/msmtp/Manifest b/mail-mta/msmtp/Manifest index f6fb31e14046..7f60948e0387 100644 --- a/mail-mta/msmtp/Manifest +++ b/mail-mta/msmtp/Manifest @@ -1,5 +1,5 @@ AUX msmtpd.confd 518 BLAKE2B e537ca90e9c4debd53936b227352b73f5ca1e7114ba8daa3121f1979dfc3495996a820276292ec6da63ce79d8f42bafb45c74daacb6778e5b56656aa9688ecbd SHA512 e6f4f39da73aace9f5a4f8e080ca897f51265b8806836366121d61f5367596955eefca377c5fe9c4094f3a9ecbe04801cf38fcc6017c73a9e4b7a68fc9a81528 AUX msmtpd.init 347 BLAKE2B 9faea920dc23ebcdb62b05595acf4f70dd3d654645ed0f5ba6f76316762986c9951905f675c2e527c5e0b5eee2bcf53a14e018d8d64080b97e82da4e3abaa0b8 SHA512 e3080dc1fb7b72b6332ebcd4f807780dc04d32b8d3e5740b62f618d5d8f39f7c2a119604e26282e1d98c1365fff7920944401c399267461fab7ae2cdfdac44d7 DIST msmtp-1.8.7.tar.xz 340908 BLAKE2B 5241acf54d5a6af6ccf2c3bfd33954a5235af2d2cb467e4134401538e60e1847489a7a599359e2d13202ea9637c32a67ec5180372b139e06f6d47f060cba6c8f SHA512 5a079cb90b48853ad812125e8b341f5bcd5f5ba4725d62c37210050896527b63f993aa6393f1d4107636153bf0ed84b0288e88a7e78a119c66b2d58f1e69a67d -EBUILD msmtp-1.8.7-r1.ebuild 3317 BLAKE2B e2e8e0e7341f7599ce75260d5ce1dcfaa679f5cdf9d14b303b99e89fd7cf3d091c0111df1b933788cc3cc81eef8b2420dfc69d87dca64eefb9f2da1637b3f8f7 SHA512 3c2b084a3ef521c60558e065708faaf667157e0b51088636a920e432c5eda3d0a4a88be4e0ac3be40e496016700818c4941cd2beca089fedcd06264bed4899e4 +EBUILD msmtp-1.8.7-r1.ebuild 3318 BLAKE2B 4457fc5562fe18b025597a8d965204d6fec8c97b027857496cf441e0ef465e8d1217a8b2c0eb20fe319e7da9cedca51183a73b90dc4528a7fba090b41d46b0ec SHA512 f722e6f382f8620603183bfc12e7d4b9f855d1054a09686c5f42a0bba7d35a5dc28a03de93ea26e89ae65907ec8981dc07f839e41be33584875c5ba424b11ce9 MISC metadata.xml 470 BLAKE2B 3ea3fcc232512a92126ff900dddf558c06194e473b172655c6960c165669c2323115a2ebf4472c5cbae57062d203b97aeac9b9d65fee5f8a0d6071416325f868 SHA512 c117c6d7f7f28d32dc411049d6a7f7bd70e1b70ff0030c85db2a2df86d1f82353230ca1713d2be7bb10e450d09e9a5749ab2e511b93b39dfe0091eeba41246c9 diff --git a/mail-mta/msmtp/msmtp-1.8.7-r1.ebuild b/mail-mta/msmtp/msmtp-1.8.7-r1.ebuild index f55260ecb18e..ca30389930dc 100644 --- a/mail-mta/msmtp/msmtp-1.8.7-r1.ebuild +++ b/mail-mta/msmtp/msmtp-1.8.7-r1.ebuild @@ -11,7 +11,7 @@ SRC_URI="https://marlam.de/msmtp/releases/${P}.tar.xz" LICENSE="GPL-3" SLOT="0" -KEYWORDS="~alpha amd64 ~arm ~arm64 ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos" +KEYWORDS="~alpha amd64 ~arm ~arm64 ~ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos" IUSE="daemon doc gnome-keyring idn +mta nls sasl ssl vim-syntax" # fcaps.eclass unconditionally defines "filecaps" USE flag which we need for diff --git a/mail-mta/netqmail/Manifest b/mail-mta/netqmail/Manifest index 811b52d4f36b..04ba575761c8 100644 --- a/mail-mta/netqmail/Manifest +++ b/mail-mta/netqmail/Manifest @@ -13,5 +13,5 @@ DIST qmail-103.patch 2104 BLAKE2B 23721b3331c719f3b6deca8b2603bf824b66068d3901a8 DIST qmail-smtputf8.patch 6693 BLAKE2B 1b9cd78e63ab9f2f8ca9f49c49406f603efb31d323bb4423aaa8b970c2c26a7e76496a449a98501765dc1a5e6659d9bfd49a6dafbdba14db9a9594e1d1c9b94f SHA512 8cafdf1a4f1fd41e6b11ee2abddac5c3da4a1d2ab17b5d3847433875a91f867a26eb358ae8c41791f1e77758e5a2c311134a286d888ccd23fbede6d9f0b475c4 DIST qmail-spp-0.42.tar.gz 18689 BLAKE2B df67f10f6daf9601fd074c774c5be4decca59f3e790774d502c28ebd495f9d7523ecebfd37abd333e347151647364d08d3ccc25099c82748bf7b7ea84bb18977 SHA512 03449862886a0ca20fbadab4c94b34b55d185f8df3261bd68aea99e9ded9edfab4477c6b38a8e0295e9b38b0045615da8b1a906a458f28745eadd3c4d882bcbf DIST vu555316.patch 617 BLAKE2B fa98c360cb199fc4367c668d605399cc53ab2d26668f5ed6bbf0c26449fdf584f71fd415d80ba7babb6593dc842ec342aba4f7357ae838e6556d43f1dc76b6d9 SHA512 5d7810360e5eaa8e8ee141fe92c765d9458aa12198a8d0ac702e0630e08d060ad4a1d33690d434f20f5aff79eb200cd8173bebc334c411e340c0198b5d8d1a65 -EBUILD netqmail-1.06-r12.ebuild 4557 BLAKE2B bf8b6c3def85e3c2fe6fa14ef3f1f8805bf1d5b4a88c4a6e5c43ba5fbfa1463d3fbbe01bef509de896eb894e22dccbc6e424fa72406f14e71b7cc7e039317681 SHA512 17e0600389c2c4338f6562cefe9d2b57ce9759ac8cf28d73b67e280aac078fba118f9099498bb8b4906e7787b9bfb4782ba55455d1ad382f9890946806811292 +EBUILD netqmail-1.06-r12.ebuild 4558 BLAKE2B 9adfc66473fb61f908cb90f881fa3f23341df3d2e734e997164c3d6151fc540db39efd6680c289c0f86e3d78ba1fdc49e8f6ba2ef325562ffbf177024af2d3fa SHA512 736fab292b62cd258357a612159485adf80681e1244aa9057d8eb7b8ec2069b5538654653f9ca5d4132139151dcb935c54a9e8395a8aa0517e2f92654ab0d4f5 MISC metadata.xml 720 BLAKE2B 9bd0209a0db8075a22507fb63fa9f045959323da3b4c53e3d9da9d412fd39ff3576dc29c6d2af9db949e5fee4e98e166bbc41ce1d48ba0f8964e85fbe99728bb SHA512 57330a6fa33d3c65b0fe1289f89d356bebca6e7c8ba47cb5edfe53cd74938646ca60e3d001facab1fa5c4071fee7c3a8e0ad2ba2b4604aea3a8525c391991715 diff --git a/mail-mta/netqmail/netqmail-1.06-r12.ebuild b/mail-mta/netqmail/netqmail-1.06-r12.ebuild index 10932c3f33ef..997d508db9fe 100644 --- a/mail-mta/netqmail/netqmail-1.06-r12.ebuild +++ b/mail-mta/netqmail/netqmail-1.06-r12.ebuild @@ -41,7 +41,7 @@ SRC_URI="mirror://qmail/${P}.tar.gz LICENSE="public-domain" SLOT="0" -KEYWORDS="~alpha amd64 arm hppa ia64 ~mips ppc ppc64 ~s390 sparc x86" +KEYWORDS="~alpha amd64 arm hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86" IUSE="authcram gencertdaily highvolume libressl pop3 qmail-spp ssl vanilla" REQUIRED_USE="vanilla? ( !ssl !qmail-spp !highvolume )" RESTRICT="test" diff --git a/mail-mta/nullmailer/Manifest b/mail-mta/nullmailer/Manifest index b80c881be948..a1e39d488825 100644 --- a/mail-mta/nullmailer/Manifest +++ b/mail-mta/nullmailer/Manifest @@ -8,13 +8,6 @@ AUX nullmailer-2.2-fix-test-racecondition.patch 890 BLAKE2B 7d12af8a9b6071f11e70 AUX nullmailer.service 401 BLAKE2B cca2fbdad581638f52a59caea902ca5701ca69e8b0e4a7c8fd87b8bfe3b9c233422ed0d93c0c583778e25998758c70cdf1602e35316739fa27018a590e28c8a5 SHA512 5aebb237972a7ff20a34d40d53d8d3146966c8f12b20695aa718831a6b32ecf4a0cc9d5af41067952c454166d02d52226fcb397b48310907b81deaa2d874adb7 AUX remotes.sample-1.13 969 BLAKE2B f973a3866a31b5d6bf1ac227340df4484b570039c7237a7c4e44516b2ca796c627cd00473f42e1c017865915cf8933f4d3df856ead3439d9e1e97bdded8bf81e SHA512 379d307dc28b60e759ebe701d43508b45bc66560879ba2baa30c11c0a57ff67e55151624b5dd67962cb72b22702d14c309f6b6be59a5dd2d030576cb691bcbc6 AUX remotes.sample-2.0 920 BLAKE2B 26e777624086267e543354f130d3abc9591d832afbd80b8efd1fd2ce2391ed16641877077d90cef7d491a844e94fec3cba0a45dd452aa7f29151dd5873871200 SHA512 21694c7cceb3bdd743e30e2241b5e3293a3ad0fcdc4345d200f2e81c26b72b8a53c6cc3912a4e5f1de6411658a2144803746b44b59d48024cb3de33d72238354 -DIST nullmailer-1.13.tar.gz 205431 BLAKE2B e1eaa94262e3d4d202293d35f7ac610a3a2cb92e403b2fd8dff467788a4f4c0d3a1bbc27b47eeae9d1c493eb8d07c35e056ea7501ad92ec4addae694997561b4 SHA512 96dcb3ddecde77a73e5ca1afa5167d35f965d04999f02cc2ef60b54ea7eb7a006e5cf5678fc34a54d4be4f9fd71bd0f784a8671aca40c70dbc307666c548e1d7 -DIST nullmailer-2.0.tar.gz 249538 BLAKE2B 2340fd0b3e67be0061aedb2a1dc0466c88e1253691c955e960244f2ce330af6798bd43f21908a9f12ce9572489dd5c48288e65ae688cd73a8afedd4f7bb6a49e SHA512 2a7c914c5effcf796f987256ac68836f0ba875cc7f2da1aeb8f23767e15a556da168b8da5cc52d9f800986883bbdbcd49a9610ae220f463164a906c1d82fbce6 DIST nullmailer-2.2.tar.gz 257740 BLAKE2B 18821caa1a377a899e3fedc84530d7c672f345cafb627da05e6c7bcd7d2708d54fc4ff4b761a6a23b2ddbabe73514473a5ec2abf3182dce2f5d3d4fbe3618fed SHA512 21b29d59f3c386c13ce4541ae11dc5cd69f842085479d7fc9a69a540abc608ce5c1825f06bd3566536b392931f7eeb1b2d35addd816849e6f431877bb18c8268 -DIST nullmailer-patches-1.13.tar.xz 8384 BLAKE2B 523547f8abf9b5d05938aad1e22e4195ee49cfe392c515df442a26d2cfb79f959c37e8f860fb196e99075aaa6fe437aaec182e1c1e2057d97cc32cba78a200d0 SHA512 393531e39a92b0978bccbcdf123e05b2cdad1ec8e600825cc24177ba414c1f615995c0344291ebb664f42b384a160c0359fec5ba3308cc14cbc9ceb8577d799c -EBUILD nullmailer-1.13-r5.ebuild 4733 BLAKE2B 185455e5c1c02f275bc9ea817dd05e36591ef525bb37797e799394de392b7d9f7fed138234211460ca8e857fd0ba1bd19f6fdbd91f70a3af4ee1514f9877722a SHA512 a2d997adb60e830f042cb4ae93e7a2f60bae8eb165bbd7a838c45a77e445a42b2501942198ade6311320f3268bee5741a30a33b42649013960b329ba29ab6c06 -EBUILD nullmailer-2.0-r1.ebuild 3641 BLAKE2B 0f856d777485527c4b04ad21077c3646bb2106b69050100e20c663bf895ba1846759a423f23928fec9711ccd7595b8c74183e1d0e6eb51f1f82abc192b5f956d SHA512 bd858bf7830066e10c2ef859d8489a0ab124cb7873e327b14d011d286ab5cae94f4e80d86e64dfd13f1204580e6a57bf0495387f6dd361082a874db655bb69f6 -EBUILD nullmailer-2.0-r2.ebuild 3733 BLAKE2B 51fddc79557a9964fc825db2cf1ed20d1ca1fc86385ac9e878d154e173d68cca5ff7b5a431df984bbe50005c64718e7bafbef4d37b26856a0d4f87569f3487b0 SHA512 5664ca004d9f8556be2118d8f7859b5eeabf088e42e1f0d1d496a99e0c9d68b3d5b9b37723202badbda2b3b9bc46f97c849c51a8e3147d99212be1ac26335760 -EBUILD nullmailer-2.0.ebuild 3644 BLAKE2B 0f498b234679f0690a9644d755a9c1cbcbb2cc2c0288b361bea7977644a993ecf61337ca4c1997c9d221f823fd9ddbc70ffaf5b315c99e8aa99041d7c1b845d2 SHA512 5ac17ea2d17a2967399bdfc87b749d1b152741191b801f6e4fec4a1f6ad1977a2cea9dbabf19a8f62e17a7a32c9d90271fbaa93cd68532a8e6ae41ba126af903 -EBUILD nullmailer-2.2.ebuild 4276 BLAKE2B da45e774d3f78f689ce9f4cbe4266a972f6e8c8be46bb681758b74b873626b785ec8489890c7d2332fce0e49abef8d48ba7555e1cc10a2808b1b26578d1a4504 SHA512 9dd43e5ec03ad40a8e7a74c3ca811a8f727c73722b53340cb9cd62c75d9750b2de4228ebf09ebed5982b7d722870322bc4a2eb64ecb7b5d6d85cbd75971eeb22 +EBUILD nullmailer-2.2-r1.ebuild 4277 BLAKE2B d854bb6a9b83c14213b3dad8ed304e9f7fd468bd1d987e1ad6d6aa29f84f810ce2c882ed6cec10063d45e70b521928777c638a4821e0d662a88af1c3dfc16670 SHA512 c6b520cee7decd5f8100bf79c4428029838673711539cd98af775ac97b87a1b0639a4aa0cde0f64f9cde4f0b922b5c55391c9a2b6534f2de5c61d9c4a168ade2 MISC metadata.xml 462 BLAKE2B 6bb4c3b64b2a26224d66df58a133e26bec2c8db7069f5f94b131c4b09387d707a8d5170f0581c9c5136e79af4b97b5f5c3ca4a649171497957ef4aef4312a2cd SHA512 d1370220b0d410947a347c71c9dca8070b3c4a28a82742f618f605be86099ffd37dce1a7d6ab706248eae290aaaf8de2df57c5b3c8f8e818464b9eb5d26d7719 diff --git a/mail-mta/nullmailer/nullmailer-1.13-r5.ebuild b/mail-mta/nullmailer/nullmailer-1.13-r5.ebuild deleted file mode 100644 index 10966c371bfe..000000000000 --- a/mail-mta/nullmailer/nullmailer-1.13-r5.ebuild +++ /dev/null @@ -1,167 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=5 - -inherit autotools eutils flag-o-matic multilib systemd user - -MY_P="${P/_rc/RC}" - -DEBIAN_PV=1.11 -DEBIAN_PR="2" -DEBIAN_P="${PN}-${DEBIAN_PV}" -DEBIAN_PF="${DEBIAN_P/-/_}-${DEBIAN_PR}" -DEBIAN_SRC="${DEBIAN_PF}.debian.tar.gz" - -DESCRIPTION="Simple relay-only local mail transport agent" -HOMEPAGE="http://untroubled.org/nullmailer/" -SRC_URI=" - http://untroubled.org/${PN}/archive/${MY_P}.tar.gz - https://dev.gentoo.org/~jlec/distfiles/${PN}-patches-${PV}.tar.xz" -# mirror://debian/pool/main/n/${PN}/${DEBIAN_SRC}" - -SLOT="0" -LICENSE="GPL-2" -KEYWORDS="amd64 ppc x86" -IUSE="ssl" - -DEPEND=" - sys-apps/groff - ssl? ( net-libs/gnutls )" -RDEPEND=" - virtual/logger - virtual/shadow - ssl? ( net-libs/gnutls ) - !mail-mta/courier - !mail-mta/esmtp - !mail-mta/exim - !mail-mta/mini-qmail - !mail-mta/msmtp - !mail-mta/netqmail - !mail-mta/postfix - !mail-mta/qmail-ldap - !mail-mta/sendmail - !mail-mta/opensmtpd - !mail-mta/ssmtp" - -S=${WORKDIR}/${MY_P} - -pkg_setup() { - enewgroup nullmail 88 - enewuser nullmail 88 -1 /var/nullmailer nullmail -} - -src_prepare() { -# sed -i -e 's/nullmailer-1.10/nullmailer-1.11/g' \ -# "${WORKDIR}"/debian/patches/*.diff || die -# EPATCH_OPTS="-d ${S} -p1" \ -# epatch "${DISTDIR}"/${DEBIAN_SRC} - # why revert? Ask Robin when he is back! -# EPATCH_OPTS="-d ${WORKDIR} -p0 -R" \ -# epatch "${WORKDIR}"/debian/patches/02_ipv6.diff - # this fixes the debian daemon/syslog to actually compile - - # old debian patches from 1.11 - # DO NOT APPLY patch 0009... It breaks - epatch "${WORKDIR}"/patches/000{1..8}*patch - - epatch "${FILESDIR}"/${P}-unistd.h.patch - - sed -i.orig \ - -e '/^nullmailer_send_LDADD/s, =, = ../lib/cli++/libcli++.a,' \ - "${S}"/src/Makefile.am || die "Sed failed" - sed -i.orig \ - -e '/\$(localstatedir)\/trigger/d' \ - "${S}"/Makefile.am || die "Sed failed" - sed \ - -e "s:^AC_PROG_RANLIB:AC_CHECK_TOOL(AR, ar, false)\nAC_PROG_RANLIB:g" \ - -i configure.in || die - sed -e "s/AM_CONFIG_HEADER/AC_CONFIG_HEADERS/" -i configure.in || die - eautoreconf -} - -src_configure() { - # Note that we pass a different directory below due to bugs in the makefile! - econf \ - --localstatedir=/var \ - $(use_enable ssl tls) -} - -src_install() { - emake DESTDIR="${D}" localstatedir=/var/nullmailer install - - dodoc AUTHORS BUGS HOWTO INSTALL ChangeLog NEWS README TODO - - # A small bit of sample config - insinto /etc/nullmailer - newins "${FILESDIR}"/remotes.sample-${PV} remotes - - # This contains passwords, so should be secure - fperms 0640 /etc/nullmailer/remotes - fowners root:nullmail /etc/nullmailer/remotes - - # daemontools stuff - dodir /var/nullmailer/service{,/log} - - insinto /var/nullmailer/service - newins scripts/nullmailer.run run - fperms 700 /var/nullmailer/service/run - - insinto /var/nullmailer/service/log - newins scripts/nullmailer-log.run run - fperms 700 /var/nullmailer/service/log/run - - # usability - dosym /usr/sbin/sendmail usr/$(get_libdir)/sendmail - - # permissions stuff - keepdir /var/log/nullmailer /var/nullmailer/{tmp,queue} - fperms 770 /var/log/nullmailer /var/nullmailer/{tmp,queue} - fowners nullmail:nullmail /usr/sbin/nullmailer-queue /usr/bin/mailq - fperms 4711 /usr/sbin/nullmailer-queue /usr/bin/mailq - - newinitd "${FILESDIR}"/init.d-nullmailer-r4 nullmailer - systemd_dounit "${FILESDIR}"/${PN}.service -} - -pkg_postinst() { - if [ ! -e "${ROOT}"/var/nullmailer/trigger ]; then - mkfifo "${ROOT}"/var/nullmailer/trigger - fi - chown nullmail:nullmail \ - "${ROOT}"/var/log/nullmailer "${ROOT}"/var/nullmailer/{tmp,queue,trigger} || die - chmod 770 "${ROOT}"/var/log/nullmailer "${ROOT}"/var/nullmailer/{tmp,queue} || die - chmod 660 "${ROOT}"/var/nullmailer/trigger || die - - # This contains passwords, so should be secure - chmod 0640 "${ROOT}"/etc/nullmailer/remotes || die - chown root:nullmail "${ROOT}"/etc/nullmailer/remotes || die - - if [[ -z ${REPLACING_VERSIONS} ]]; then - elog "To create an initial setup, please do:" - elog "emerge --config =${CATEGORY}/${PF}" - fi - #echo - #elog "To start nullmailer at boot you may use either the nullmailer init.d" - #elog "script, or emerge sys-process/supervise-scripts, enable the" - #elog "svscan init.d script and create the following link:" - #elog "ln -fs /var/nullmailer/service /service/nullmailer" - #echo -} - -pkg_postrm() { - if [[ -e "${ROOT}"/var/nullmailer/trigger ]]; then - rm "${ROOT}"/var/nullmailer/trigger || die - fi -} - -pkg_config() { - if [ ! -s "${ROOT}"/etc/nullmailer/me ]; then - einfo "Setting /etc/nullmailer/me" - /bin/hostname --fqdn > "${ROOT}"/etc/nullmailer/me - fi - if [ ! -s "${ROOT}"/etc/nullmailer/defaultdomain ]; then - einfo "Setting /etc/nullmailer/defaultdomain" - /bin/hostname --domain > "${ROOT}"/etc/nullmailer/defaultdomain - fi -} diff --git a/mail-mta/nullmailer/nullmailer-2.0-r1.ebuild b/mail-mta/nullmailer/nullmailer-2.0-r1.ebuild deleted file mode 100644 index e13abd28dd3f..000000000000 --- a/mail-mta/nullmailer/nullmailer-2.0-r1.ebuild +++ /dev/null @@ -1,137 +0,0 @@ -# Copyright 1999-2017 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -inherit autotools eutils flag-o-matic multilib systemd user - -DESCRIPTION="Simple relay-only local mail transport agent" -HOMEPAGE="http://untroubled.org/nullmailer/ https://github.com/bruceg/nullmailer" -SRC_URI="http://untroubled.org/${PN}/archive/${P}.tar.gz" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="amd64 ppc x86" -IUSE="ssl" - -DEPEND=" - sys-apps/groff - ssl? ( net-libs/gnutls:0= )" -RDEPEND=" - virtual/logger - virtual/shadow - ssl? ( net-libs/gnutls:0= ) - !mail-mta/courier - !mail-mta/esmtp - !mail-mta/exim - !mail-mta/mini-qmail - !mail-mta/msmtp - !mail-mta/netqmail - !mail-mta/postfix - !mail-mta/qmail-ldap - !mail-mta/sendmail - !mail-mta/opensmtpd - !mail-mta/ssmtp" - -pkg_setup() { - enewgroup nullmail 88 - enewuser nullmail 88 -1 /var/spool/nullmailer nullmail -} - -src_prepare() { - default - sed -i.orig \ - -e '/\$(localstatedir)\/trigger/d' \ - "${S}"/Makefile.am || die "Sed failed" - sed \ - -e "s:^AC_PROG_RANLIB:AC_CHECK_TOOL(AR, ar, false)\nAC_PROG_RANLIB:g" \ - -i configure.ac || die - sed -e "s/AM_CONFIG_HEADER/AC_CONFIG_HEADERS/" -i configure.ac || die - sed \ - -e "s#/usr/lib#\0exec#" -e "s#/usr/local#/usr#" \ - -e 's:/usr/etc/:/etc/:g' \ - -i doc/nullmailer-send.8 || die - eautoreconf -} - -src_configure() { - # https://github.com/bruceg/nullmailer/pull/31/commits - append-lfs-flags #471102 - econf \ - --localstatedir="${EPREFIX}"/var \ - $(use_enable ssl tls) -} - -src_install() { - default - - # A small bit of sample config - insinto /etc/nullmailer - newins "${FILESDIR}"/remotes.sample-${PV} remotes - - # This contains passwords, so should be secure - fperms 0640 /etc/nullmailer/remotes - fowners root:nullmail /etc/nullmailer/remotes - - # daemontools stuff - dodir /var/spool/nullmailer/service{,/log} - - insinto /var/spool/nullmailer/service - newins scripts/nullmailer.run run - fperms 700 /var/spool/nullmailer/service/run - - insinto /var/spool/nullmailer/service/log - newins scripts/nullmailer-log.run run - fperms 700 /var/spool/nullmailer/service/log/run - - # usability - dosym /usr/sbin/sendmail usr/$(get_libdir)/sendmail - - # permissions stuff - keepdir /var/log/nullmailer /var/spool/nullmailer/{tmp,queue} - fperms 770 /var/log/nullmailer - fowners nullmail:nullmail /usr/sbin/nullmailer-queue /usr/bin/mailq - fperms 4711 /usr/sbin/nullmailer-queue /usr/bin/mailq - - newinitd "${FILESDIR}"/init.d-nullmailer-r6 nullmailer - systemd_dounit scripts/${PN}.service -} - -pkg_postinst() { - if [ ! -e "${EROOT}var/spool/nullmailer/trigger" ]; then - mkfifo "${EROOT}var/spool/nullmailer/trigger" || die - fi - chown nullmail:nullmail \ - "${EROOT}"var/log/nullmailer \ - "${EROOT}"var/spool/nullmailer/{tmp,queue,trigger} || die - chmod 770 \ - "${EROOT}"var/log/nullmailer \ - "${EROOT}"var/spool/nullmailer/{tmp,queue} || die - chmod 660 "${EROOT}"var/spool/nullmailer/trigger || die - - # This contains passwords, so should be secure - chmod 0640 "${EROOT}"etc/nullmailer/remotes || die - chown root:nullmail "${EROOT}"etc/nullmailer/remotes || die - - if [[ -z ${REPLACING_VERSIONS} ]]; then - elog "To create an initial setup, please do:" - elog "emerge --config =${CATEGORY}/${PF}" - fi -} - -pkg_postrm() { - if [[ -e "${EROOT}var/spool/nullmailer/trigger" ]]; then - rm "${EROOT}var/spool/nullmailer/trigger" || die - fi -} - -pkg_config() { - if [ ! -s "${EROOT}etc/nullmailer/me" ]; then - einfo "Setting /etc/nullmailer/me" - hostname --fqdn > "${EROOT}etc/nullmailer/me" - fi - if [ ! -s "${EROOT}etc/nullmailer/defaultdomain" ]; then - einfo "Setting /etc/nullmailer/defaultdomain" - hostname --domain > "${EROOT}etc/nullmailer/defaultdomain" - fi -} diff --git a/mail-mta/nullmailer/nullmailer-2.0-r2.ebuild b/mail-mta/nullmailer/nullmailer-2.0-r2.ebuild deleted file mode 100644 index 1da0d4fe1448..000000000000 --- a/mail-mta/nullmailer/nullmailer-2.0-r2.ebuild +++ /dev/null @@ -1,139 +0,0 @@ -# Copyright 1999-2019 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -inherit autotools eutils flag-o-matic multilib systemd user - -DESCRIPTION="Simple relay-only local mail transport agent" -HOMEPAGE="http://untroubled.org/nullmailer/ https://github.com/bruceg/nullmailer" -SRC_URI="http://untroubled.org/${PN}/archive/${P}.tar.gz" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~amd64 ~ppc ~x86" -IUSE="ssl test" -RESTRICT="!test? ( test )" - -DEPEND=" - sys-apps/groff - ssl? ( net-libs/gnutls:0= ) - test? ( sys-apps/ucspi-tcp[ipv6] sys-process/daemontools )" -RDEPEND=" - virtual/logger - virtual/shadow - ssl? ( net-libs/gnutls:0= ) - !mail-mta/courier - !mail-mta/esmtp - !mail-mta/exim - !mail-mta/mini-qmail - !mail-mta/msmtp - !mail-mta/netqmail - !mail-mta/postfix - !mail-mta/qmail-ldap - !mail-mta/sendmail - !mail-mta/opensmtpd - !mail-mta/ssmtp" - -pkg_setup() { - enewgroup nullmail 88 - enewuser nullmail 88 -1 /var/spool/nullmailer nullmail -} - -src_prepare() { - default - sed -i.orig \ - -e '/\$(localstatedir)\/trigger/d' \ - "${S}"/Makefile.am || die "Sed failed" - sed \ - -e "s:^AC_PROG_RANLIB:AC_CHECK_TOOL(AR, ar, false)\nAC_PROG_RANLIB:g" \ - -i configure.ac || die - sed -e "s/AM_CONFIG_HEADER/AC_CONFIG_HEADERS/" -i configure.ac || die - sed \ - -e "s#/usr/lib#\0exec#" -e "s#/usr/local#/usr#" \ - -e 's:/usr/etc/:/etc/:g' \ - -i doc/nullmailer-send.8 || die - eautoreconf -} - -src_configure() { - # https://github.com/bruceg/nullmailer/pull/31/commits - append-lfs-flags #471102 - econf \ - --localstatedir="${EPREFIX}"/var \ - $(use_enable ssl tls) -} - -src_install() { - default - - # A small bit of sample config - insinto /etc/nullmailer - newins "${FILESDIR}"/remotes.sample-${PV} remotes - - # This contains passwords, so should be secure - fperms 0640 /etc/nullmailer/remotes - fowners root:nullmail /etc/nullmailer/remotes - - # daemontools stuff - dodir /var/spool/nullmailer/service{,/log} - - insinto /var/spool/nullmailer/service - newins scripts/nullmailer.run run - fperms 700 /var/spool/nullmailer/service/run - - insinto /var/spool/nullmailer/service/log - newins scripts/nullmailer-log.run run - fperms 700 /var/spool/nullmailer/service/log/run - - # usability - dosym /usr/sbin/sendmail usr/$(get_libdir)/sendmail - - # permissions stuff - keepdir /var/log/nullmailer /var/spool/nullmailer/{tmp,queue} - fperms 770 /var/log/nullmailer - fowners nullmail:nullmail /usr/sbin/nullmailer-queue /usr/bin/mailq - fperms 4711 /usr/sbin/nullmailer-queue /usr/bin/mailq - - newinitd "${FILESDIR}"/init.d-nullmailer-r6 nullmailer - systemd_dounit scripts/${PN}.service -} - -pkg_postinst() { - if [ ! -e "${EROOT}var/spool/nullmailer/trigger" ]; then - mkfifo "${EROOT}var/spool/nullmailer/trigger" || die - fi - chown nullmail:nullmail \ - "${EROOT}"var/log/nullmailer \ - "${EROOT}"var/spool/nullmailer/{tmp,queue,trigger} || die - chmod 770 \ - "${EROOT}"var/log/nullmailer \ - "${EROOT}"var/spool/nullmailer/{tmp,queue} || die - chmod 660 "${EROOT}"var/spool/nullmailer/trigger || die - - # This contains passwords, so should be secure - chmod 0640 "${EROOT}"etc/nullmailer/remotes || die - chown root:nullmail "${EROOT}"etc/nullmailer/remotes || die - - if [[ -z ${REPLACING_VERSIONS} ]]; then - elog "To create an initial setup, please do:" - elog "emerge --config =${CATEGORY}/${PF}" - fi -} - -pkg_postrm() { - if [[ -e "${EROOT}var/spool/nullmailer/trigger" ]]; then - rm "${EROOT}var/spool/nullmailer/trigger" || die - fi -} - -pkg_config() { - if [ ! -s "${EROOT}etc/nullmailer/me" ]; then - einfo "Setting /etc/nullmailer/me" - hostname --fqdn > "${EROOT}etc/nullmailer/me" - fi - if [ ! -s "${EROOT}etc/nullmailer/defaultdomain" ]; then - einfo "Setting /etc/nullmailer/defaultdomain" - hostname --domain > "${EROOT}etc/nullmailer/defaultdomain" - fi -} diff --git a/mail-mta/nullmailer/nullmailer-2.0.ebuild b/mail-mta/nullmailer/nullmailer-2.0.ebuild deleted file mode 100644 index 9fe5b1675081..000000000000 --- a/mail-mta/nullmailer/nullmailer-2.0.ebuild +++ /dev/null @@ -1,137 +0,0 @@ -# Copyright 1999-2016 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -inherit autotools eutils flag-o-matic multilib systemd user - -DESCRIPTION="Simple relay-only local mail transport agent" -HOMEPAGE="http://untroubled.org/nullmailer/ https://github.com/bruceg/nullmailer" -SRC_URI="http://untroubled.org/${PN}/archive/${P}.tar.gz" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~amd64 ~ppc ~x86" -IUSE="ssl" - -DEPEND=" - sys-apps/groff - ssl? ( net-libs/gnutls:0= )" -RDEPEND=" - virtual/logger - virtual/shadow - ssl? ( net-libs/gnutls:0= ) - !mail-mta/courier - !mail-mta/esmtp - !mail-mta/exim - !mail-mta/mini-qmail - !mail-mta/msmtp - !mail-mta/netqmail - !mail-mta/postfix - !mail-mta/qmail-ldap - !mail-mta/sendmail - !mail-mta/opensmtpd - !mail-mta/ssmtp" - -pkg_setup() { - enewgroup nullmail 88 - enewuser nullmail 88 -1 /var/spool/nullmailer nullmail -} - -src_prepare() { - default - sed -i.orig \ - -e '/\$(localstatedir)\/trigger/d' \ - "${S}"/Makefile.am || die "Sed failed" - sed \ - -e "s:^AC_PROG_RANLIB:AC_CHECK_TOOL(AR, ar, false)\nAC_PROG_RANLIB:g" \ - -i configure.ac || die - sed -e "s/AM_CONFIG_HEADER/AC_CONFIG_HEADERS/" -i configure.ac || die - sed \ - -e "s#/usr/lib#\0exec#" -e "s#/usr/local#/usr#" \ - -e 's:/usr/etc/:/etc/:g' \ - -i doc/nullmailer-send.8 || die - eautoreconf -} - -src_configure() { - # https://github.com/bruceg/nullmailer/pull/31/commits - append-lfs-flags #471102 - econf \ - --localstatedir="${EPREFIX}"/var \ - $(use_enable ssl tls) -} - -src_install() { - default - - # A small bit of sample config - insinto /etc/nullmailer - newins "${FILESDIR}"/remotes.sample-${PV} remotes - - # This contains passwords, so should be secure - fperms 0640 /etc/nullmailer/remotes - fowners root:nullmail /etc/nullmailer/remotes - - # daemontools stuff - dodir /var/spool/nullmailer/service{,/log} - - insinto /var/spool/nullmailer/service - newins scripts/nullmailer.run run - fperms 700 /var/spool/nullmailer/service/run - - insinto /var/spool/nullmailer/service/log - newins scripts/nullmailer-log.run run - fperms 700 /var/spool/nullmailer/service/log/run - - # usability - dosym /usr/sbin/sendmail usr/$(get_libdir)/sendmail - - # permissions stuff - keepdir /var/log/nullmailer /var/spool/nullmailer/{tmp,queue} - fperms 770 /var/log/nullmailer - fowners nullmail:nullmail /usr/sbin/nullmailer-queue /usr/bin/mailq - fperms 4711 /usr/sbin/nullmailer-queue /usr/bin/mailq - - newinitd "${FILESDIR}"/init.d-nullmailer-r5 nullmailer - systemd_dounit scripts/${PN}.service -} - -pkg_postinst() { - if [ ! -e "${EROOT}var/spool/nullmailer/trigger" ]; then - mkfifo "${EROOT}var/spool/nullmailer/trigger" || die - fi - chown nullmail:nullmail \ - "${EROOT}"var/log/nullmailer \ - "${EROOT}"var/spool/nullmailer/{tmp,queue,trigger} || die - chmod 770 \ - "${EROOT}"var/log/nullmailer \ - "${EROOT}"var/spool/nullmailer/{tmp,queue} || die - chmod 660 "${EROOT}"var/spool/nullmailer/trigger || die - - # This contains passwords, so should be secure - chmod 0640 "${EROOT}"etc/nullmailer/remotes || die - chown root:nullmail "${EROOT}"etc/nullmailer/remotes || die - - if [[ -z ${REPLACING_VERSIONS} ]]; then - elog "To create an initial setup, please do:" - elog "emerge --config =${CATEGORY}/${PF}" - fi -} - -pkg_postrm() { - if [[ -e "${EROOT}var/spool/nullmailer/trigger" ]]; then - rm "${EROOT}var/spool/nullmailer/trigger" || die - fi -} - -pkg_config() { - if [ ! -s "${EROOT}etc/nullmailer/me" ]; then - einfo "Setting /etc/nullmailer/me" - hostname --fqdn > "${EROOT}etc/nullmailer/me" - fi - if [ ! -s "${EROOT}etc/nullmailer/defaultdomain" ]; then - einfo "Setting /etc/nullmailer/defaultdomain" - hostname --domain > "${EROOT}etc/nullmailer/defaultdomain" - fi -} diff --git a/mail-mta/nullmailer/nullmailer-2.2.ebuild b/mail-mta/nullmailer/nullmailer-2.2-r1.ebuild index cea54398acb5..051ce2259b9f 100644 --- a/mail-mta/nullmailer/nullmailer-2.2.ebuild +++ b/mail-mta/nullmailer/nullmailer-2.2-r1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2019 Gentoo Authors +# Copyright 1999-2020 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -21,7 +21,7 @@ DEPEND=" " RDEPEND=" virtual/logger - virtual/shadow + sys-apps/shadow ssl? ( net-libs/gnutls:0= ) !mail-mta/courier !mail-mta/esmtp diff --git a/mail-mta/opensmtpd/Manifest b/mail-mta/opensmtpd/Manifest index fe73333c487b..f2100833a1cf 100644 --- a/mail-mta/opensmtpd/Manifest +++ b/mail-mta/opensmtpd/Manifest @@ -1,12 +1,7 @@ -AUX opensmtpd-6.0.3_p1-fix-crash-on-auth.patch 1130 BLAKE2B ca2a207549056dc729c34d394ffcc6b3f565ca3963a7c9b56f9f2a2ed68997f2839716945c412f6ba2340931297a8e0afeebae93ef6d767ec251dbe66b196a05 SHA512 23558294281527c679c563f35103ccaac04efa4c62a1494e9907480c38a554b551b86a838204df8a314f7fa86452cbf816690abedf3b5c0179758a9205616c38 -AUX opensmtpd-6.0.3_p1-openssl_1.1.patch 21039 BLAKE2B 05e6e416f8253bb42d3d0cb213c14d2d07ec8d6beee3058621ac41f7a3815562098be4e5eed863d78443d08ad55f70a94d0c9c031630e87a73388510f4e42c55 SHA512 7e6567889ca823ada283153861806e69cee0185d6dc98aa15675c18ee81d2e118e9bc3a9848551b9f49e772de38234b7d4170e66fb6e6b932a50654b5d9a3806 -AUX opensmtpd-6.0.3_p1-security-fixes.patch 4365 BLAKE2B cd6a64173137cad61bf7d6d5925a7d7147973a1b65eeb49d9c35f2ed72b6adf62e386ca9ab1035d31c114c49338817d5478f4999137e62d92bab18b5428305e4 SHA512 a51994fb8e064d652a319cf0acbf7aa2c30e2335712df3cacbc7b9a403f1e5496b29f7d6e97b81723f543e8f78eee82e02c62762fe5adfc12cf1cf35fa4aa7d1 AUX smtpd.initd 231 BLAKE2B a4991c9226daa2289cb20238dcee0dad8b4ff83474327649b61c7394e46fc929c7792b885f58bf76769567ad2058134b97e5019b508e2edec108a4bafb9cc2b4 SHA512 e4c8386bd7e8d8171172aa181305a55ca67cba6d4c82d77d8846e1bd3301dd9d118bb39dad6c144677f050194de813e4d83e06ea6dd591d4f07da8c4a1edde37 AUX smtpd.pam 147 BLAKE2B 1706fe27cf53621428f563af146d1197dfc59133dda79fe08141ec4ca9b240880ef63da3f27e4fb8b653af4ae413ca42cdeb343e1f4e737b7e6258c0d338223d SHA512 d0574cc732138fefffe3ca78da2d689f0849de70dfd65204c99a98a58b2165eb46b23a1c32b356ea2eaf8abd56a4929c7419b29cec1d6b284e344680bab24086 AUX smtpd.service 138 BLAKE2B c76db1847110622621701cdf1fdb764d26bf28b86a25adf9ae8e0ba15838a2a9ddc677f54f5d5fe191591b2bd5c7f20067fc00b6679f448e25371e27f231589d SHA512 b70b173ac275b871d78bac0e55b2e0c8d8a6538c7f2c4dc86fe67fb37a1ee942e0442353b338b286759618299f51b144396251db13f82c9afa035dcaae11a258 AUX smtpd.socket 114 BLAKE2B e684727be39592dce128cc0ab02f8e5bc4510591dcb2c170b49c120e84319b53e10eae275bc6a26ed8c9d51e53a21e41c551f18afd2441602cefc4e93344d50c SHA512 fbbccb4aab80a4a4612609e590965940642321119a65359cf2490530f81d55706a0105309d321a624d40348f12776724d2cf6b8bf29ea24391e60ef8b8bc8ba2 -DIST opensmtpd-6.0.3p1.tar.gz 699702 BLAKE2B 49f08e8329adc049a562b6ef7efa4c0a39cbcfe8a158cb905cfc726a7302ffe9833ccfb52041340767d55d0f2ae2087e8eac92b7359016c6c76b4d963a334558 SHA512 e579818a0ddbe637deb5a4e40f43eaf797783903ceac18fd89a57581b135b9e407d424e1a70ff7b4b06a0ee50bafb6e8ab2451371917887904b06ff1b55d320f DIST opensmtpd-6.6.4p1.tar.gz 790754 BLAKE2B 18cc19569ae764eff3d672cbfb87df7bd00afcce93705ad128e935c0a47a246c3a6166fca7b6f844c0dd5e728492d8aeb7e0f8a8c1f5a756bf356ae9afb80852 SHA512 267307c91f4fcf21624b0897dfb1f5638b77da7b8d9a02211d734ed2cc5bd39ea7542ae7f200255e2945518fbe7609a0e5aa4e5c6dcb8146014f08b3845c108b -EBUILD opensmtpd-6.0.3_p1-r3.ebuild 1910 BLAKE2B e2f00b235de73368d49e209cabc7f0ef80e2a2fd3e967c91a6fe905fa2b3ea0f3e90085d1c7e4c72a9028c1fb5ecfc6ef1f51daf9ddac3c0109fc3394f2d20e7 SHA512 f8c3bf0561a798a4ff39fbf0b123a84626fc7d0e90c7ef7b7357bda4530c9cfb90f64c853bc2f5424bc594c21e2883a3111db30693e6d4da06e9cbb29be94d1c EBUILD opensmtpd-6.6.4_p1.ebuild 1998 BLAKE2B 6d24269e834350693240f9a0cbbd702994b027102cbaa26c7a98653e2e6f89e3a80fff36c3386a669475520e8b9bdf79f348deb062b6b71f6e88ed6fbf15c2b1 SHA512 bd9791a7fcec94ecc29835942089abb61bdce74e1d442e27072b6c544c505d43d8417dcc1a27a599be1684ec3e0f228e05d3f4bc68a2f78ddeb719683897eece MISC metadata.xml 595 BLAKE2B c13a49c15ec7c4430834682a4428b80e81be9832cbf6fbdd506ce9bcfc625aabf342d094ee83c689e63573cff9bfb2abee86196374c617c75aa487eb83ad0e4c SHA512 aa7344806cd011cec6c7afa277345eb2988f11970ea3038d969efa50d5b1f485f199f15a1b632197700791c2242ed8f712ff3cc382b1491e44c14ee94075a1d5 diff --git a/mail-mta/opensmtpd/files/opensmtpd-6.0.3_p1-fix-crash-on-auth.patch b/mail-mta/opensmtpd/files/opensmtpd-6.0.3_p1-fix-crash-on-auth.patch deleted file mode 100644 index c20b5e0a0ef9..000000000000 --- a/mail-mta/opensmtpd/files/opensmtpd-6.0.3_p1-fix-crash-on-auth.patch +++ /dev/null @@ -1,43 +0,0 @@ -From 9b5f70b93e038df5446bd37a4adac5a0380748e7 Mon Sep 17 00:00:00 2001 -From: johannes <johannes.brechtmann@gmail.com> -Date: Wed, 21 Feb 2018 23:57:11 +0100 -Subject: [PATCH] crypt_checkpass: include HAVE_CRYPT_H definition, add NULL - check - ---- - openbsd-compat/crypt_checkpass.c | 9 ++++++++- - 1 file changed, 8 insertions(+), 1 deletion(-) - -diff --git a/openbsd-compat/crypt_checkpass.c b/openbsd-compat/crypt_checkpass.c -index dafd2dae..d10b3a57 100644 ---- a/openbsd-compat/crypt_checkpass.c -+++ b/openbsd-compat/crypt_checkpass.c -@@ -1,5 +1,6 @@ - /* OPENBSD ORIGINAL: lib/libc/crypt/cryptutil.c */ - -+#include "includes.h" - #include <errno.h> - #ifdef HAVE_CRYPT_H - #include <crypt.h> -@@ -10,6 +11,8 @@ - int - crypt_checkpass(const char *pass, const char *goodhash) - { -+ char *c; -+ - if (goodhash == NULL) - goto fail; - -@@ -17,7 +20,11 @@ crypt_checkpass(const char *pass, const char *goodhash) - if (strlen(goodhash) == 0 && strlen(pass) == 0) - return 0; - -- if (strcmp(crypt(pass, goodhash), goodhash) == 0) -+ c = crypt(pass, goodhash); -+ if (c == NULL) -+ goto fail; -+ -+ if (strcmp(c, goodhash) == 0) - return 0; - - fail: diff --git a/mail-mta/opensmtpd/files/opensmtpd-6.0.3_p1-openssl_1.1.patch b/mail-mta/opensmtpd/files/opensmtpd-6.0.3_p1-openssl_1.1.patch deleted file mode 100644 index 40a62ae92519..000000000000 --- a/mail-mta/opensmtpd/files/opensmtpd-6.0.3_p1-openssl_1.1.patch +++ /dev/null @@ -1,722 +0,0 @@ -Description: Enable support for OpenSSL 1.1 -Author: Sebastian Andrzej Siewior <sebastian@breakpoint.cc> - Ryan Kavanagh <rak@debian.org> -Origin: Debian -Bug: https://github.com/OpenSMTPD/OpenSMTPD/issues/738 -Bug-Debian: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=859544 -Forwarded: https://github.com/OpenSMTPD/OpenSMTPD/pull/825 -Last-Update: 2018-03-18 ---- -This patch header follows DEP-3: http://dep.debian.net/deps/dep3/ -diff --git a/openbsd-compat/libressl.c b/openbsd-compat/libressl.c -index f4f2b52e..d06e006f 100644 ---- a/openbsd-compat/libressl.c -+++ b/openbsd-compat/libressl.c -@@ -81,14 +81,14 @@ SSL_CTX_use_certificate_chain(SSL_CTX *ctx, char *buf, off_t len) - x = ca = NULL; - - if ((in = BIO_new_mem_buf(buf, len)) == NULL) { -- SSLerr(SSL_F_SSL_CTX_USE_CERTIFICATE_CHAIN_FILE, ERR_R_BUF_LIB); -+ SSLerr(SSL_F_SSL_CTX_USE_CERTIFICATE_FILE, ERR_R_BUF_LIB); - goto end; - } - - if ((x = PEM_read_bio_X509(in, NULL, -- ctx->default_passwd_callback, -- ctx->default_passwd_callback_userdata)) == NULL) { -- SSLerr(SSL_F_SSL_CTX_USE_CERTIFICATE_CHAIN_FILE, ERR_R_PEM_LIB); -+ SSL_CTX_get_default_passwd_cb(ctx), -+ SSL_CTX_get_default_passwd_cb_userdata(ctx))) == NULL) { -+ SSLerr(SSL_F_SSL_CTX_USE_CERTIFICATE_FILE, ERR_R_PEM_LIB); - goto end; - } - -@@ -99,14 +99,11 @@ SSL_CTX_use_certificate_chain(SSL_CTX *ctx, char *buf, off_t len) - * the CA certificates. - */ - -- if (ctx->extra_certs != NULL) { -- sk_X509_pop_free(ctx->extra_certs, X509_free); -- ctx->extra_certs = NULL; -- } -+ SSL_CTX_clear_extra_chain_certs(ctx); - - while ((ca = PEM_read_bio_X509(in, NULL, -- ctx->default_passwd_callback, -- ctx->default_passwd_callback_userdata)) != NULL) { -+ SSL_CTX_get_default_passwd_cb(ctx), -+ SSL_CTX_get_default_passwd_cb_userdata(ctx))) != NULL) { - - if (!SSL_CTX_add_extra_chain_cert(ctx, ca)) - goto end; -diff --git a/smtpd/ca.c b/smtpd/ca.c -index e383c6a1..29a44b9b 100644 ---- a/smtpd/ca.c -+++ b/smtpd/ca.c -@@ -170,6 +170,190 @@ ca_verify_cb(int ok, X509_STORE_CTX *ctx) - return ok; - } - -+#if (OPENSSL_VERSION_NUMBER < 0x10100000L) || defined(LIBRESSL_VERSION_NUMBER) -+ -+static int RSA_meth_get_flags(RSA_METHOD *meth) -+{ -+ return meth->flags; -+} -+ -+static int RSA_meth_set_flags(RSA_METHOD *meth, int flags) -+{ -+ meth->flags = flags; -+ return 1; -+} -+ -+static void *RSA_meth_get0_app_data(const RSA_METHOD *meth) -+{ -+ return meth->app_data; -+} -+ -+static int RSA_meth_set0_app_data(RSA_METHOD *meth, void *app_data) -+{ -+ meth->app_data = app_data; -+ return 1; -+} -+ -+static int (*RSA_meth_get_pub_enc(const RSA_METHOD *meth)) -+(int flen, const unsigned char *from, unsigned char *to, RSA *rsa, int padding) -+{ -+ return meth->rsa_pub_enc; -+} -+ -+static int RSA_meth_set_pub_enc(RSA_METHOD *meth, -+ int (*pub_enc) (int flen, const unsigned char *from, -+ unsigned char *to, RSA *rsa, -+ int padding)) -+{ -+ meth->rsa_pub_enc = pub_enc; -+ return 1; -+} -+ -+static int (*RSA_meth_get_pub_dec(const RSA_METHOD *meth)) -+(int flen, const unsigned char *from, unsigned char *to, RSA *rsa, int padding) -+{ -+ return meth->rsa_pub_dec; -+} -+ -+static int (*RSA_meth_get_priv_enc(const RSA_METHOD *meth)) -+(int flen, const unsigned char *from, unsigned char *to, RSA *rsa, int padding) -+{ -+ return meth->rsa_priv_enc; -+} -+ -+int RSA_meth_set_priv_enc(RSA_METHOD *meth, -+ int (*priv_enc) (int flen, const unsigned char *from, -+ unsigned char *to, RSA *rsa, int padding)) -+{ -+ meth->rsa_priv_enc = priv_enc; -+ return 1; -+} -+ -+static int (*RSA_meth_get_priv_dec(const RSA_METHOD *meth)) -+(int flen, const unsigned char *from, unsigned char *to, RSA *rsa, int padding) -+{ -+ return meth->rsa_priv_dec; -+} -+ -+static int RSA_meth_set_priv_dec(RSA_METHOD *meth, -+ int (*priv_dec) (int flen, const unsigned char *from, -+ unsigned char *to, RSA *rsa, int padding)) -+{ -+ meth->rsa_priv_dec = priv_dec; -+ return 1; -+} -+ -+static int (*RSA_meth_get_mod_exp(const RSA_METHOD *meth)) -+ (BIGNUM *r0, const BIGNUM *I, RSA *rsa, BN_CTX *ctx) -+{ -+ return meth->rsa_mod_exp; -+} -+ -+static int RSA_meth_set_mod_exp(RSA_METHOD *meth, -+ int (*mod_exp) (BIGNUM *r0, const BIGNUM *I, RSA *rsa, BN_CTX *ctx)) -+{ -+ meth->rsa_mod_exp = mod_exp; -+ return 1; -+} -+ -+static int (*RSA_meth_get_bn_mod_exp(const RSA_METHOD *meth)) -+(BIGNUM *r, const BIGNUM *a, const BIGNUM *p, const BIGNUM *m, BN_CTX *ctx, BN_MONT_CTX *m_ctx) -+{ -+ return meth->bn_mod_exp; -+} -+ -+static int RSA_meth_set_bn_mod_exp(RSA_METHOD *meth, int (*bn_mod_exp) -+ (BIGNUM *r, const BIGNUM *a, const BIGNUM *p, const BIGNUM *m, -+ BN_CTX *ctx, BN_MONT_CTX *m_ctx)) -+{ -+ meth->bn_mod_exp = bn_mod_exp; -+ return 1; -+} -+ -+static int (*RSA_meth_get_init(const RSA_METHOD *meth)) (RSA *rsa) -+{ -+ return meth->init; -+} -+ -+static int RSA_meth_set_init(RSA_METHOD *meth, int (*init) (RSA *rsa)) -+{ -+ meth->init = init; -+ return 1; -+} -+ -+static int (*RSA_meth_get_finish(const RSA_METHOD *meth)) (RSA *rsa) -+{ -+ return meth->finish; -+} -+ -+static int RSA_meth_set_finish(RSA_METHOD *meth, int (*finish) (RSA *rsa)) -+{ -+ meth->finish = finish; -+ return 1; -+} -+ -+static int (*RSA_meth_get_keygen(const RSA_METHOD *meth)) -+ (RSA *rsa, int bits, BIGNUM *e, BN_GENCB *cb) -+{ -+ return meth->rsa_keygen; -+} -+ -+static int RSA_meth_set_keygen(RSA_METHOD *meth, int (*keygen) -+ (RSA *rsa, int bits, BIGNUM *e, BN_GENCB *cb)) -+{ -+ meth->rsa_keygen = keygen; -+ return 1; -+} -+ -+static int (*RSA_meth_get_verify(const RSA_METHOD *meth)) -+ (int dtype, const unsigned char *m, -+ unsigned int m_length, const unsigned char *sigbuf, -+ unsigned int siglen, const RSA *rsa) -+{ -+ if (meth->flags & RSA_FLAG_SIGN_VER) -+ return meth->rsa_verify; -+ return NULL; -+} -+ -+static int (*RSA_meth_get_sign(const RSA_METHOD *meth)) -+ (int type, -+ const unsigned char *m, unsigned int m_length, -+ unsigned char *sigret, unsigned int *siglen, -+ const RSA *rsa) -+{ -+ if (meth->flags & RSA_FLAG_SIGN_VER) -+ return meth->rsa_sign; -+ return NULL; -+} -+ -+static int RSA_meth_set_pub_dec(RSA_METHOD *meth, -+ int (*pub_dec) (int flen, const unsigned char *from, -+ unsigned char *to, RSA *rsa, int padding)) -+{ -+ meth->rsa_pub_dec = pub_dec; -+ return 1; -+} -+ -+static RSA_METHOD *RSA_meth_new(const char *name, int flags) -+{ -+ RSA_METHOD *meth = malloc(sizeof(*meth)); -+ -+ if (meth != NULL) { -+ memset(meth, 0, sizeof(*meth)); -+ meth->flags = flags; -+ -+ meth->name = strdup(name); -+ if (meth->name != NULL) -+ return meth; -+ -+ free(meth); -+ } -+ -+ return NULL; -+} -+ -+#endif -+ - int - ca_X509_verify(void *certificate, void *chain, const char *CAfile, - const char *CRLfile, const char **errstr) -@@ -201,7 +385,7 @@ end: - *errstr = NULL; - if (ret != 1) { - if (xsc) -- *errstr = X509_verify_cert_error_string(xsc->error); -+ *errstr = X509_verify_cert_error_string(X509_STORE_CTX_get_error(xsc)); - else if (ERR_peek_last_error()) - *errstr = ERR_error_string(ERR_peek_last_error(), NULL); - } -@@ -302,24 +486,9 @@ ca_imsg(struct mproc *p, struct imsg *imsg) - * RSA privsep engine (called from unprivileged processes) - */ - --const RSA_METHOD *rsa_default = NULL; -- --static RSA_METHOD rsae_method = { -- "RSA privsep engine", -- rsae_pub_enc, -- rsae_pub_dec, -- rsae_priv_enc, -- rsae_priv_dec, -- rsae_mod_exp, -- rsae_bn_mod_exp, -- rsae_init, -- rsae_finish, -- 0, -- NULL, -- NULL, -- NULL, -- rsae_keygen --}; -+static const RSA_METHOD *rsa_default = NULL; -+ -+static const char *rsae_method_name = "RSA privsep engine"; - - static int - rsae_send_imsg(int flen, const unsigned char *from, unsigned char *to, -@@ -404,7 +573,7 @@ rsae_pub_enc(int flen,const unsigned char *from, unsigned char *to, RSA *rsa, - int padding) - { - log_debug("debug: %s: %s", proc_name(smtpd_process), __func__); -- return (rsa_default->rsa_pub_enc(flen, from, to, rsa, padding)); -+ return (RSA_meth_get_pub_enc(rsa_default)(flen, from, to, rsa, padding)); - } - - static int -@@ -412,7 +581,7 @@ rsae_pub_dec(int flen,const unsigned char *from, unsigned char *to, RSA *rsa, - int padding) - { - log_debug("debug: %s: %s", proc_name(smtpd_process), __func__); -- return (rsa_default->rsa_pub_dec(flen, from, to, rsa, padding)); -+ return (RSA_meth_get_pub_dec(rsa_default)(flen, from, to, rsa, padding)); - } - - static int -@@ -424,7 +593,7 @@ rsae_priv_enc(int flen, const unsigned char *from, unsigned char *to, RSA *rsa, - return (rsae_send_imsg(flen, from, to, rsa, padding, - IMSG_CA_PRIVENC)); - } -- return (rsa_default->rsa_priv_enc(flen, from, to, rsa, padding)); -+ return (RSA_meth_get_priv_enc(rsa_default)(flen, from, to, rsa, padding)); - } - - static int -@@ -436,14 +605,14 @@ rsae_priv_dec(int flen, const unsigned char *from, unsigned char *to, RSA *rsa, - return (rsae_send_imsg(flen, from, to, rsa, padding, - IMSG_CA_PRIVDEC)); - } -- return (rsa_default->rsa_priv_dec(flen, from, to, rsa, padding)); -+ return (RSA_meth_get_priv_dec(rsa_default)(flen, from, to, rsa, padding)); - } - - static int - rsae_mod_exp(BIGNUM *r0, const BIGNUM *I, RSA *rsa, BN_CTX *ctx) - { - log_debug("debug: %s: %s", proc_name(smtpd_process), __func__); -- return (rsa_default->rsa_mod_exp(r0, I, rsa, ctx)); -+ return (RSA_meth_get_mod_exp(rsa_default)(r0, I, rsa, ctx)); - } - - static int -@@ -451,34 +620,36 @@ rsae_bn_mod_exp(BIGNUM *r, const BIGNUM *a, const BIGNUM *p, - const BIGNUM *m, BN_CTX *ctx, BN_MONT_CTX *m_ctx) - { - log_debug("debug: %s: %s", proc_name(smtpd_process), __func__); -- return (rsa_default->bn_mod_exp(r, a, p, m, ctx, m_ctx)); -+ return (RSA_meth_get_bn_mod_exp(rsa_default)(r, a, p, m, ctx, m_ctx)); - } - - static int - rsae_init(RSA *rsa) - { - log_debug("debug: %s: %s", proc_name(smtpd_process), __func__); -- if (rsa_default->init == NULL) -+ if (RSA_meth_get_init(rsa_default) == NULL) - return (1); -- return (rsa_default->init(rsa)); -+ return (RSA_meth_get_init(rsa_default)(rsa)); - } - - static int - rsae_finish(RSA *rsa) - { - log_debug("debug: %s: %s", proc_name(smtpd_process), __func__); -- if (rsa_default->finish == NULL) -+ if (RSA_meth_get_finish(rsa_default) == NULL) - return (1); -- return (rsa_default->finish(rsa)); -+ return (RSA_meth_get_finish(rsa_default)(rsa)); - } - - static int - rsae_keygen(RSA *rsa, int bits, BIGNUM *e, BN_GENCB *cb) - { - log_debug("debug: %s: %s", proc_name(smtpd_process), __func__); -- return (rsa_default->rsa_keygen(rsa, bits, e, cb)); -+ return (RSA_meth_get_keygen(rsa_default)(rsa, bits, e, cb)); - } - -+static RSA_METHOD *rsae_method; -+ - void - ca_engine_init(void) - { -@@ -490,7 +661,7 @@ ca_engine_init(void) - errstr = "ENGINE_new"; - goto fail; - } -- if (!ENGINE_set_name(e, rsae_method.name)) { -+ if (!ENGINE_set_name(e, rsae_method_name)) { - errstr = "ENGINE_set_name"; - goto fail; - } -@@ -503,25 +674,58 @@ ca_engine_init(void) - goto fail; - } - -+ rsae_method = RSA_meth_new(rsae_method_name, 0); -+ if (!rsae_method) { -+ errstr = "RSA_meth_new"; -+ goto fail; -+ } -+ - if ((name = ENGINE_get_name(e)) == NULL) - name = "unknown RSA engine"; - - log_debug("debug: %s: using %s", __func__, name); - -- if (rsa_default->flags & RSA_FLAG_SIGN_VER) -+ if (RSA_meth_get_sign(rsa_default) || -+ RSA_meth_get_verify(rsa_default)) - fatalx("unsupported RSA engine"); - -- if (rsa_default->rsa_mod_exp == NULL) -- rsae_method.rsa_mod_exp = NULL; -- if (rsa_default->bn_mod_exp == NULL) -- rsae_method.bn_mod_exp = NULL; -- if (rsa_default->rsa_keygen == NULL) -- rsae_method.rsa_keygen = NULL; -- rsae_method.flags = rsa_default->flags | -- RSA_METHOD_FLAG_NO_CHECK; -- rsae_method.app_data = rsa_default->app_data; -- -- if (!ENGINE_set_RSA(e, &rsae_method)) { -+ errstr = "Setting callback"; -+ if (!RSA_meth_set_pub_enc(rsae_method, rsae_pub_enc)) -+ goto fail; -+ if (!RSA_meth_set_pub_dec(rsae_method, rsae_pub_dec)) -+ goto fail; -+ if (!RSA_meth_set_priv_enc(rsae_method, rsae_priv_enc)) -+ goto fail; -+ if (!RSA_meth_set_priv_dec(rsae_method, rsae_priv_dec)) -+ goto fail; -+ -+ if (RSA_meth_get_mod_exp(rsa_default)) { -+ if (!RSA_meth_set_mod_exp(rsae_method, rsae_mod_exp)) -+ goto fail; -+ } -+ -+ if (RSA_meth_get_bn_mod_exp(rsa_default)) -+ if (!RSA_meth_set_bn_mod_exp(rsae_method, rsae_bn_mod_exp)) -+ goto fail; -+ if (!RSA_meth_set_init(rsae_method, rsae_init)) -+ goto fail; -+ if (!RSA_meth_set_finish(rsae_method, rsae_finish)) -+ goto fail; -+ -+ if (RSA_meth_get_keygen(rsa_default)) { -+ if (!RSA_meth_set_keygen(rsae_method, rsae_keygen)) -+ goto fail; -+ } -+ -+ if (!RSA_meth_set_flags(rsae_method, -+ RSA_meth_get_flags(rsa_default) | -+ RSA_METHOD_FLAG_NO_CHECK)) -+ goto fail; -+ -+ if (!RSA_meth_set0_app_data(rsae_method, RSA_meth_get0_app_data(rsa_default))) -+ goto fail; -+ -+ if (!ENGINE_set_RSA(e, rsae_method)) { - errstr = "ENGINE_set_RSA"; - goto fail; - } -diff --git a/smtpd/crypto.c b/smtpd/crypto.c -index 76f98807..01452851 100644 ---- a/smtpd/crypto.c -+++ b/smtpd/crypto.c -@@ -64,7 +64,7 @@ crypto_setup(const char *key, size_t len) - int - crypto_encrypt_file(FILE * in, FILE * out) - { -- EVP_CIPHER_CTX ctx; -+ EVP_CIPHER_CTX *ctx; - uint8_t ibuf[CRYPTO_BUFFER_SIZE]; - uint8_t obuf[CRYPTO_BUFFER_SIZE]; - uint8_t iv[IV_SIZE]; -@@ -91,12 +91,14 @@ crypto_encrypt_file(FILE * in, FILE * out) - if ((w = fwrite(iv, 1, sizeof iv, out)) != sizeof iv) - return 0; - -- EVP_CIPHER_CTX_init(&ctx); -- EVP_EncryptInit_ex(&ctx, EVP_aes_256_gcm(), NULL, cp.key, iv); -+ ctx = EVP_CIPHER_CTX_new(); -+ if (!ctx) -+ return 0; -+ EVP_EncryptInit_ex(ctx, EVP_aes_256_gcm(), NULL, cp.key, iv); - - /* encrypt until end of file */ - while ((r = fread(ibuf, 1, CRYPTO_BUFFER_SIZE, in)) != 0) { -- if (!EVP_EncryptUpdate(&ctx, obuf, &len, ibuf, r)) -+ if (!EVP_EncryptUpdate(ctx, obuf, &len, ibuf, r)) - goto end; - if (len && (w = fwrite(obuf, len, 1, out)) != 1) - goto end; -@@ -105,13 +107,13 @@ crypto_encrypt_file(FILE * in, FILE * out) - goto end; - - /* finalize and write last chunk if any */ -- if (!EVP_EncryptFinal_ex(&ctx, obuf, &len)) -+ if (!EVP_EncryptFinal_ex(ctx, obuf, &len)) - goto end; - if (len && (w = fwrite(obuf, len, 1, out)) != 1) - goto end; - - /* get and append tag */ -- EVP_CIPHER_CTX_ctrl(&ctx, EVP_CTRL_GCM_GET_TAG, sizeof tag, tag); -+ EVP_CIPHER_CTX_ctrl(ctx, EVP_CTRL_GCM_GET_TAG, sizeof tag, tag); - if ((w = fwrite(tag, sizeof tag, 1, out)) != 1) - goto end; - -@@ -119,14 +121,14 @@ crypto_encrypt_file(FILE * in, FILE * out) - ret = 1; - - end: -- EVP_CIPHER_CTX_cleanup(&ctx); -+ EVP_CIPHER_CTX_free(ctx); - return ret; - } - - int - crypto_decrypt_file(FILE * in, FILE * out) - { -- EVP_CIPHER_CTX ctx; -+ EVP_CIPHER_CTX *ctx; - uint8_t ibuf[CRYPTO_BUFFER_SIZE]; - uint8_t obuf[CRYPTO_BUFFER_SIZE]; - uint8_t iv[IV_SIZE]; -@@ -171,11 +173,13 @@ crypto_decrypt_file(FILE * in, FILE * out) - sz -= sizeof tag; - - -- EVP_CIPHER_CTX_init(&ctx); -- EVP_DecryptInit_ex(&ctx, EVP_aes_256_gcm(), NULL, cp.key, iv); -+ ctx = EVP_CIPHER_CTX_new(); -+ if (!ctx) -+ return 0; -+ EVP_DecryptInit_ex(ctx, EVP_aes_256_gcm(), NULL, cp.key, iv); - - /* set expected tag */ -- EVP_CIPHER_CTX_ctrl(&ctx, EVP_CTRL_GCM_SET_TAG, sizeof tag, tag); -+ EVP_CIPHER_CTX_ctrl(ctx, EVP_CTRL_GCM_SET_TAG, sizeof tag, tag); - - /* decrypt until end of ciphertext */ - while (sz) { -@@ -185,7 +189,7 @@ crypto_decrypt_file(FILE * in, FILE * out) - r = fread(ibuf, 1, sz, in); - if (!r) - break; -- if (!EVP_DecryptUpdate(&ctx, obuf, &len, ibuf, r)) -+ if (!EVP_DecryptUpdate(ctx, obuf, &len, ibuf, r)) - goto end; - if (len && (w = fwrite(obuf, len, 1, out)) != 1) - goto end; -@@ -195,7 +199,7 @@ crypto_decrypt_file(FILE * in, FILE * out) - goto end; - - /* finalize, write last chunk if any and perform authentication check */ -- if (!EVP_DecryptFinal_ex(&ctx, obuf, &len)) -+ if (!EVP_DecryptFinal_ex(ctx, obuf, &len)) - goto end; - if (len && (w = fwrite(obuf, len, 1, out)) != 1) - goto end; -@@ -204,14 +208,14 @@ crypto_decrypt_file(FILE * in, FILE * out) - ret = 1; - - end: -- EVP_CIPHER_CTX_cleanup(&ctx); -+ EVP_CIPHER_CTX_free(ctx); - return ret; - } - - size_t - crypto_encrypt_buffer(const char *in, size_t inlen, char *out, size_t outlen) - { -- EVP_CIPHER_CTX ctx; -+ EVP_CIPHER_CTX *ctx; - uint8_t iv[IV_SIZE]; - uint8_t tag[GCM_TAG_SIZE]; - uint8_t version = API_VERSION; -@@ -239,33 +243,35 @@ crypto_encrypt_buffer(const char *in, size_t inlen, char *out, size_t outlen) - memcpy(out + len, iv, sizeof iv); - len += sizeof iv; - -- EVP_CIPHER_CTX_init(&ctx); -- EVP_EncryptInit_ex(&ctx, EVP_aes_256_gcm(), NULL, cp.key, iv); -+ ctx = EVP_CIPHER_CTX_new(); -+ if (!ctx) -+ return 0; -+ EVP_EncryptInit_ex(ctx, EVP_aes_256_gcm(), NULL, cp.key, iv); - - /* encrypt buffer */ -- if (!EVP_EncryptUpdate(&ctx, out + len, &olen, in, inlen)) -+ if (!EVP_EncryptUpdate(ctx, out + len, &olen, in, inlen)) - goto end; - len += olen; - - /* finalize and write last chunk if any */ -- if (!EVP_EncryptFinal_ex(&ctx, out + len, &olen)) -+ if (!EVP_EncryptFinal_ex(ctx, out + len, &olen)) - goto end; - len += olen; - - /* get and append tag */ -- EVP_CIPHER_CTX_ctrl(&ctx, EVP_CTRL_GCM_GET_TAG, sizeof tag, tag); -+ EVP_CIPHER_CTX_ctrl(ctx, EVP_CTRL_GCM_GET_TAG, sizeof tag, tag); - memcpy(out + len, tag, sizeof tag); - ret = len + sizeof tag; - - end: -- EVP_CIPHER_CTX_cleanup(&ctx); -+ EVP_CIPHER_CTX_cleanup(ctx); - return ret; - } - - size_t - crypto_decrypt_buffer(const char *in, size_t inlen, char *out, size_t outlen) - { -- EVP_CIPHER_CTX ctx; -+ EVP_CIPHER_CTX *ctx; - uint8_t iv[IV_SIZE]; - uint8_t tag[GCM_TAG_SIZE]; - int olen; -@@ -292,24 +298,26 @@ crypto_decrypt_buffer(const char *in, size_t inlen, char *out, size_t outlen) - inlen -= sizeof iv; - in += sizeof iv; - -- EVP_CIPHER_CTX_init(&ctx); -- EVP_DecryptInit_ex(&ctx, EVP_aes_256_gcm(), NULL, cp.key, iv); -+ ctx = EVP_CIPHER_CTX_new(); -+ if (!ctx) -+ return 0; -+ EVP_DecryptInit_ex(ctx, EVP_aes_256_gcm(), NULL, cp.key, iv); - - /* set expected tag */ -- EVP_CIPHER_CTX_ctrl(&ctx, EVP_CTRL_GCM_SET_TAG, sizeof tag, tag); -+ EVP_CIPHER_CTX_ctrl(ctx, EVP_CTRL_GCM_SET_TAG, sizeof tag, tag); - - /* decrypt buffer */ -- if (!EVP_DecryptUpdate(&ctx, out, &olen, in, inlen)) -+ if (!EVP_DecryptUpdate(ctx, out, &olen, in, inlen)) - goto end; - len += olen; - - /* finalize, write last chunk if any and perform authentication check */ -- if (!EVP_DecryptFinal_ex(&ctx, out + len, &olen)) -+ if (!EVP_DecryptFinal_ex(ctx, out + len, &olen)) - goto end; - ret = len + olen; - - end: -- EVP_CIPHER_CTX_cleanup(&ctx); -+ EVP_CIPHER_CTX_cleanup(ctx); - return ret; - } - -diff --git a/smtpd/libressl.c b/smtpd/libressl.c -index 57d74389..db78d943 100644 ---- a/smtpd/libressl.c -+++ b/smtpd/libressl.c -@@ -94,10 +94,10 @@ ssl_ctx_use_certificate_chain_bio(SSL_CTX *ctx, BIO *in) - - ERR_clear_error(); /* clear error stack for SSL_CTX_use_certificate() */ - -- x = PEM_read_bio_X509_AUX(in, NULL, ctx->default_passwd_callback, -- ctx->default_passwd_callback_userdata); -+ x = PEM_read_bio_X509_AUX(in, NULL, SSL_CTX_get_default_passwd_cb(ctx), -+ SSL_CTX_get_default_passwd_cb_userdata(ctx)); - if (x == NULL) { -- SSLerr(SSL_F_SSL_CTX_USE_CERTIFICATE_CHAIN_FILE, ERR_R_PEM_LIB); -+ SSLerr(SSL_F_SSL_CTX_USE_CERTIFICATE_FILE, ERR_R_PEM_LIB); - goto end; - } - -@@ -115,14 +115,11 @@ ssl_ctx_use_certificate_chain_bio(SSL_CTX *ctx, BIO *in) - int r; - unsigned long err; - -- if (ctx->extra_certs != NULL) { -- sk_X509_pop_free(ctx->extra_certs, X509_free); -- ctx->extra_certs = NULL; -- } -+ SSL_CTX_clear_extra_chain_certs(ctx); - - while ((ca = PEM_read_bio_X509(in, NULL, -- ctx->default_passwd_callback, -- ctx->default_passwd_callback_userdata)) != NULL) { -+ SSL_CTX_get_default_passwd_cb(ctx), -+ SSL_CTX_get_default_passwd_cb_userdata(ctx))) != NULL) { - r = SSL_CTX_add_extra_chain_cert(ctx, ca); - if (!r) { - X509_free(ca); -@@ -160,7 +157,7 @@ SSL_CTX_use_certificate_chain_mem(SSL_CTX *ctx, void *buf, int len) - - in = BIO_new_mem_buf(buf, len); - if (in == NULL) { -- SSLerr(SSL_F_SSL_CTX_USE_CERTIFICATE_CHAIN_FILE, ERR_R_BUF_LIB); -+ SSLerr(SSL_F_SSL_CTX_USE_CERTIFICATE_FILE, ERR_R_BUF_LIB); - goto end; - } - -diff --git a/smtpd/ssl.c b/smtpd/ssl.c -index b88360eb..0c93d87e 100644 ---- a/smtpd/ssl.c -+++ b/smtpd/ssl.c -@@ -425,7 +425,7 @@ ssl_ctx_fake_private_key(SSL_CTX *ctx, const void *data, size_t datalen, - */ - ret = SSL_CTX_use_PrivateKey(ctx, pkey); - if (!ret) -- SSLerr(SSL_F_SSL_CTX_USE_PRIVATEKEY, ERR_R_SSL_LIB); -+ SSLerr(SSL_F_SSL_CTX_USE_PRIVATEKEY, ERR_R_SYS_LIB); - - if (pkeyptr != NULL) - *pkeyptr = pkey; -diff --git a/smtpd/ssl.h b/smtpd/ssl.h -index 90f018d0..553120d4 100644 ---- a/smtpd/ssl.h -+++ b/smtpd/ssl.h -@@ -73,3 +73,17 @@ void SSL_CTX_set_ecdh_auto(SSL_CTX *, int); - void SSL_CTX_set_dh_auto(SSL_CTX *, int); - #endif - int SSL_CTX_use_certificate_chain_mem(SSL_CTX *, void *, int); -+ -+#if (OPENSSL_VERSION_NUMBER < 0x10100000L) || defined(LIBRESSL_VERSION_NUMBER) -+ -+static inline pem_password_cb *SSL_CTX_get_default_passwd_cb(SSL_CTX *ctx) -+{ -+ return ctx->default_passwd_callback; -+} -+ -+static inline void *SSL_CTX_get_default_passwd_cb_userdata(SSL_CTX *ctx) -+{ -+ return ctx->default_passwd_callback_userdata; -+} -+ -+#endif diff --git a/mail-mta/opensmtpd/files/opensmtpd-6.0.3_p1-security-fixes.patch b/mail-mta/opensmtpd/files/opensmtpd-6.0.3_p1-security-fixes.patch deleted file mode 100644 index b22f3af1fbe4..000000000000 --- a/mail-mta/opensmtpd/files/opensmtpd-6.0.3_p1-security-fixes.patch +++ /dev/null @@ -1,123 +0,0 @@ -diff -ru OpenSMTPD-opensmtpd-6.0.3/smtpd/mta_session.c OpenSMTPD-opensmtpd-6.0.3-fixed/smtpd/mta_session.c ---- OpenSMTPD-opensmtpd-6.0.3/smtpd/mta_session.c 2018-01-04 23:24:01.000000000 +0100 -+++ OpenSMTPD-opensmtpd-6.0.3-fixed/smtpd/mta_session.c 2020-01-29 09:47:24.607457717 +0100 -@@ -1290,40 +1290,20 @@ - break; - - case IO_ERROR: -+ case IO_TLSERROR: - log_debug("debug: mta: %p: IO error: %s", s, io_error(io)); -- if (!s->ready) { -- mta_error(s, "IO Error: %s", io_error(io)); -- mta_connect(s); -- break; -- } -- else if (!(s->flags & (MTA_FORCE_TLS|MTA_FORCE_SMTPS|MTA_FORCE_ANYSSL))) { -- /* error in non-strict SSL negotiation, downgrade to plain */ -- if (s->flags & MTA_TLS) { -- log_info("smtp-out: Error on session %016"PRIx64 -- ": opportunistic TLS failed, " -- "downgrading to plain", s->id); -- s->flags &= ~MTA_TLS; -- s->flags |= MTA_DOWNGRADE_PLAIN; -- mta_connect(s); -- break; -- } -- } -- mta_error(s, "IO Error: %s", io_error(io)); -- mta_free(s); -- break; - -- case IO_TLSERROR: -- log_debug("debug: mta: %p: TLS IO error: %s", s, io_error(io)); -- if (!(s->flags & (MTA_FORCE_TLS|MTA_FORCE_SMTPS|MTA_FORCE_ANYSSL))) { -+ if (s->state == MTA_STARTTLS && s->use_smtp_tls) { - /* error in non-strict SSL negotiation, downgrade to plain */ -- log_info("smtp-out: TLS Error on session %016"PRIx64 -- ": TLS failed, " -+ log_info("smtp-out: Error on session %016"PRIx64 -+ ": opportunistic TLS failed, " - "downgrading to plain", s->id); - s->flags &= ~MTA_TLS; - s->flags |= MTA_DOWNGRADE_PLAIN; - mta_connect(s); - break; - } -+ - mta_error(s, "IO Error: %s", io_error(io)); - mta_free(s); - break; -diff -ru OpenSMTPD-opensmtpd-6.0.3/smtpd/smtp_session.c OpenSMTPD-opensmtpd-6.0.3-fixed/smtpd/smtp_session.c ---- OpenSMTPD-opensmtpd-6.0.3/smtpd/smtp_session.c 2018-01-04 23:24:01.000000000 +0100 -+++ OpenSMTPD-opensmtpd-6.0.3-fixed/smtpd/smtp_session.c 2020-01-29 09:47:24.610791335 +0100 -@@ -2004,25 +2004,23 @@ - memmove(maddr->user, p, strlen(p) + 1); - } - -- if (!valid_localpart(maddr->user) || -- !valid_domainpart(maddr->domain)) { -- /* accept empty return-path in MAIL FROM, required for bounces */ -- if (mailfrom && maddr->user[0] == '\0' && maddr->domain[0] == '\0') -- return (1); -+ /* accept empty return-path in MAIL FROM, required for bounces */ -+ if (mailfrom && maddr->user[0] == '\0' && maddr->domain[0] == '\0') -+ return (1); - -- /* no user-part, reject */ -- if (maddr->user[0] == '\0') -- return (0); -- -- /* no domain, local user */ -- if (maddr->domain[0] == '\0') { -- (void)strlcpy(maddr->domain, domain, -- sizeof(maddr->domain)); -- return (1); -- } -+ /* no or invalid user-part, reject */ -+ if (maddr->user[0] == '\0' || !valid_localpart(maddr->user)) - return (0); -+ -+ /* no domain part, local user */ -+ if (maddr->domain[0] == '\0') { -+ (void)strlcpy(maddr->domain, domain, -+ sizeof(maddr->domain)); - } - -+ if (!valid_domainpart(maddr->domain)) -+ return (0); -+ - return (1); - } - -diff -ru opensmtpd-6.0.3p1/smtpd/mta_session.c opensmtpd-6.0.3p1-modified/smtpd/mta_session.c ---- opensmtpd-6.0.3p1/smtpd/mta_session.c 2018-01-10 21:06:40.000000000 +0800 -+++ opensmtpd-6.0.3p1-modified/smtpd/mta_session.c 2020-02-25 09:57:04.624147227 +0800 -@@ -1214,7 +1214,7 @@ - if (cont) { - if (s->replybuf[0] == '\0') - (void)strlcat(s->replybuf, line, sizeof s->replybuf); -- else { -+ else if (len > 4) { - line = line + 4; - if (isdigit((int)*line) && *(line + 1) == '.' && - isdigit((int)*line+2) && *(line + 3) == '.' && -@@ -1229,7 +1229,9 @@ - /* last line of a reply, check if we're on a continuation to parse out status and ESC. - * if we overflow reply buffer or are not on continuation, log entire last line. - */ -- if (s->replybuf[0] != '\0') { -+ if (s->replybuf[0] == '\0') -+ (void)strlcat(s->replybuf, line, sizeof s->replybuf); -+ else if (len > 4) { - p = line + 4; - if (isdigit((int)*p) && *(p + 1) == '.' && - isdigit((int)*p+2) && *(p + 3) == '.' && -@@ -1238,8 +1240,6 @@ - if (strlcat(s->replybuf, p, sizeof s->replybuf) >= sizeof s->replybuf) - (void)strlcpy(s->replybuf, line, sizeof s->replybuf); - } -- else -- (void)strlcpy(s->replybuf, line, sizeof s->replybuf); - - if (s->state == MTA_QUIT) { - log_info("%016"PRIx64" mta event=closed reason=quit messages=%zu", diff --git a/mail-mta/opensmtpd/opensmtpd-6.0.3_p1-r3.ebuild b/mail-mta/opensmtpd/opensmtpd-6.0.3_p1-r3.ebuild deleted file mode 100644 index 14d9fa69ea4a..000000000000 --- a/mail-mta/opensmtpd/opensmtpd-6.0.3_p1-r3.ebuild +++ /dev/null @@ -1,78 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -inherit pam toolchain-funcs systemd - -DESCRIPTION="Lightweight but featured SMTP daemon from OpenBSD" -HOMEPAGE="https://www.opensmtpd.org" -SRC_URI="https://www.opensmtpd.org/archives/${P/_}.tar.gz" - -LICENSE="ISC BSD BSD-1 BSD-2 BSD-4" -SLOT="0" -KEYWORDS="~amd64 ~arm ~arm64 ~x86" -IUSE="libressl pam +mta" - -DEPEND=" - acct-user/smtpd - acct-user/smtpq - !libressl? ( dev-libs/openssl:0= ) - libressl? ( dev-libs/libressl:0= ) - elibc_musl? ( sys-libs/fts-standalone ) - sys-libs/zlib - pam? ( sys-libs/pam ) - sys-libs/db:= - dev-libs/libevent - app-misc/ca-certificates - net-mail/mailbase - net-libs/libasr - !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/postfix - !mail-mta/qmail-ldap - !mail-mta/sendmail - !mail-mta/ssmtp[mta] -" -RDEPEND="${DEPEND}" - -S=${WORKDIR}/${P/_} -PATCHES=( - "${FILESDIR}/${P}-fix-crash-on-auth.patch" - "${FILESDIR}/${P}-openssl_1.1.patch" - "${FILESDIR}/${P}-security-fixes.patch" -) - -src_configure() { - tc-export AR - AR="$(which "$AR")" econf \ - --with-table-db \ - --with-user-smtpd=smtpd \ - --with-user-queue=smtpq \ - --with-group-queue=smtpq \ - --with-path-socket=/run \ - --with-path-CAfile=/etc/ssl/certs/ca-certificates.crt \ - --sysconfdir=/etc/opensmtpd \ - $(use_with pam auth-pam) -} - -src_install() { - default - newinitd "${FILESDIR}"/smtpd.initd smtpd - systemd_dounit "${FILESDIR}"/smtpd.{service,socket} - use pam && newpamd "${FILESDIR}"/smtpd.pam smtpd - dosym smtpctl /usr/sbin/makemap - dosym smtpctl /usr/sbin/newaliases - if use mta ; then - dodir /usr/sbin - dosym smtpctl /usr/sbin/sendmail - dosym ../sbin/smtpctl /usr/bin/sendmail - mkdir -p "${ED}"/usr/$(get_libdir) || die - ln -s --relative "${ED}"/usr/sbin/smtpctl "${ED}"/usr/$(get_libdir)/sendmail || die - fi -} diff --git a/mail-mta/postfix/Manifest b/mail-mta/postfix/Manifest index 0446b5e350c4..7049d6f06ad6 100644 --- a/mail-mta/postfix/Manifest +++ b/mail-mta/postfix/Manifest @@ -6,16 +6,12 @@ AUX postfix.rc6.2.7 2107 BLAKE2B 291d9e02ffdac79a1c7c64febc5674321e675de341b468b AUX postfix.service 662 BLAKE2B dcf9ceb71ad483b580d126fcb5ac68889cdeb898df3333d38f195227190b73cf0fb41cd68a86e97cfe844cc7f9f095cba0a17afe9ce7c8697e0aa30f5faecde6 SHA512 04b475040b153f488a9358567ff9ee2eb8f263c619dadc23c837d17c19106041296e3652bcaded2be0c7c8b9eee7fd5f2ad55bed3e7f9b3a4bf9655f4762d563 AUX smtp.pass 29 BLAKE2B 589915bd2856fa64e22caa12fca54ef342eb07606de38d3879c13ac395413c84de6c3b733c83cc0625a4433167efcc7d504b2f87fa26c05b2facde9c3d103021 SHA512 a8a940099a77ea0547004daf5392a6efc0cd643f10072803d65e37763012464ad25b1b925ae9e32bffb3c3e8a5d4b2d3bb5619a174d58fdc4ea5d4090db0d365 AUX smtp.sasl 42 BLAKE2B 67e9108101779b6027fa1e5cc7c9256a606d440e15bb037a0da186e6b4983ab26e88ede2f0604737c78144c03e182f66005062f1d49e10443d1ddb9757461d1f SHA512 a48e2bd173c4443dd2c389f6973a541dbcba4223b52b42b409a68d934a7fc82a98d4027267befcd5db6ec628cce6a9dffdf044e6fbd774b6e748f07f4106db47 -DIST postfix-3.4.5.tar.gz 4581301 BLAKE2B 9de66cab6eea610fc83e4629980b3e201b4e3f9185729cb84933aa940b64b7818d0439c5145ea0b635666db92c970e1974f4f439cd3b733c58e1fe5794c046fa SHA512 af59d960b40799f7667935bef8fafb93ae6dcb70abaa77a15cf498571f37fa0429f411f9f08b1b6bfa588d3f572260d14d6d5409f0cd1e82b1c59928b2124c94 -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.10.tar.gz 4573370 BLAKE2B 57ed51539de2c06bdc8d5105ab28b06d9d9ae782255971571c57310b54e187ef5da5191b7145ada81863e247a72fcc576e571848f5ad7ad720afb06ac77c2cf3 SHA512 b337fff8212bfec100d4f415ddb04a4539fad31c7cb555a37e778e7807d70a2a6879ac6d79af96a0593c23189cfaf65e5021fd4e8d39c641ccaabdd06cb7daad DIST postfix-3.4.9.tar.gz 4573241 BLAKE2B 6f6bd977d4670328aa89a296c0d92d7022a85e289b5197ad46f80e0fb88af565ca93f2affab50c742dd05010aa9a9ea2a68264c07f986ad39a6c1d7d6dec8300 SHA512 9038850d79bf19460d55dede2dd97e6f4bd8255363b4004704e5f0493bf9b1c0729f5bb11663ba6f6ed34177205609f72401b0f55d1d9dbce5398b4603a0a991 -DIST postfix-3.5-20200203.tar.gz 4639007 BLAKE2B 0a79068183ba9658a8295b9f9faa187baf8e05e01a7b446354625bcf020e1ade205dd82eee039f14f3d75410be9a35f0b29dc25e016e61a2cf8d40b5abb3b032 SHA512 61e9f5554717cbe46b976567e50a247c6aee947b395d40fbdd67e42ec1669bf44bb3b69cd5a7f8e2c6f7dd693c4fac42e7329cdf76f37dcc4b9bfd354522bd06 -EBUILD postfix-3.4.5-r1.ebuild 8976 BLAKE2B 7969806bbd059e620051e28bba52d02631f7bd014d49e463361cee31e24c0d6e468bc0362b47b713347de62af408c9a03e238370af6255879a1735a9bb9decfb SHA512 5d75712e78423cd9a94ed298351fcf29869779a0ea70e5610997a395f439a861203857b3ad2a0619417d19688c3beb0dbd58ed80fe98d1bf5eae68c595ca2e9b -EBUILD postfix-3.4.6.ebuild 8984 BLAKE2B cc1f4e3e444ba49b36c726a9114bbec2e1db6f93ad5e9366185cd7e6ce573f3b56a3a99c92d15d09e11729f7b71740edd5e1b10f9564001c904a3456a20daf6e SHA512 951cef920c07cd7a50ea4c46715d734894b7b34d0aa6d7c413755b4084e3589dcf39c8c2cfa1b44e5ffa2b137edb71926f3821df6bd1f750470bd9ab3a9eb569 -EBUILD postfix-3.4.7.ebuild 8911 BLAKE2B 77f4c3c147751a8680dae64cee4fc7c0493f192dea33f350dbc419a29b051b30e1d48e16f7939841d38f3d7faf9ca4987d0c37401556e0e0fdbc724aa0f9d0ff SHA512 cfed351b5d81364126ccbb062832de7a907bd1c5653f085e74a95e3f436e5a65bc54f444e9efad3195e71a0d3c636ada51cd642ed0225e5aa15546cab618835c -EBUILD postfix-3.4.8.ebuild 8911 BLAKE2B 77f4c3c147751a8680dae64cee4fc7c0493f192dea33f350dbc419a29b051b30e1d48e16f7939841d38f3d7faf9ca4987d0c37401556e0e0fdbc724aa0f9d0ff SHA512 cfed351b5d81364126ccbb062832de7a907bd1c5653f085e74a95e3f436e5a65bc54f444e9efad3195e71a0d3c636ada51cd642ed0225e5aa15546cab618835c -EBUILD postfix-3.4.9.ebuild 8944 BLAKE2B 2e0467e4a747a1a319a2c2499261f6a7fcae2541324c0671e2d061cb6cb3bec5d716a467b92b90ca7fe1ac968d2a04226c8c608985284a8e80d0ddfbbefce5af SHA512 3d4fd067d781a11d4d9acf67031c5f722061df3b3bc305658db4be814763e6247260cbd149a83d7391a5a473319d7a6e007563d380a11e446bed55a61546defd -EBUILD postfix-3.5_pre20200203.ebuild 8842 BLAKE2B e13ff009b6f4421728233faf20769321540574626a5a64efac770e2b12984335fdf43fc1a1d10705747624e257acce0c10df96c76f5f405649dda8cfb0f0473e SHA512 27b78a27caa1a3c14bd4d88b9700d35d007e8a586bf01f277afbeada87b71906832df4b90b5387122afae2397dca5e2b559b2ce3dd2b8c9236f5281e5c6e0623 +DIST postfix-3.5.0.tar.gz 4609501 BLAKE2B 476520658c64ea2ee8b04896196d83bd2955613a6c2f80c66f8483ff5872bfe4480bf624485be80005c5eb1d73478fc59b90ee5eb44f903da324d5d261124d33 SHA512 7633687c8f9fb4f7204443dda66c1234b8ae121ae750916b23ea7cd16f2fd5944c0e4541c51cbdeb66f51437e3186433bbb9d2b1f538002a3c8aaeb6ddbfe154 +DIST postfix-3.6-20200316.tar.gz 4627687 BLAKE2B 7318cb6e3aadeec6134d6c669e57a4f3fe22a3b940e7214190a346a73e7f7cc9996d685129e0e1a11dda3cbb2270f655aad2b8211d7dc10d870afbf3b357dcbd SHA512 fb13ef3a5b9b6fdc32312a37ac9fd9999103b62eef934da58ee79afd87bb258ebdb5538e5335e98ce797a8de3740d825dec61617c14fe8866132c0ea508d5c95 +EBUILD postfix-3.4.10.ebuild 8940 BLAKE2B f0e8378164c42ddbda74d5eb0742e510603f33a8241110b9a02dc2e4c89979c4cf8966a7acff065a29fc884c5770a2a8bbc5429e07f9bad7f5df0a2092083334 SHA512 c071a9601a57107a3a22fcb0ee47484706bf23f53492fcc18c271829bc97509da8edb26ab7a245b8992a0e48bd77dc111e39262d75bbb999a3a3a9e958dd910e +EBUILD postfix-3.4.9.ebuild 8935 BLAKE2B fcca6dbae7d9ffb6d5397b1c70b23869bc2c4e33d12e840b380a3405278ac6576b8e8bf8138ab6b38aace484b91d3091e46eeb6f3eb2941b3d21853f3389586d SHA512 b89a403c4ab6c14174c2474787e8b9bc9a3b4307475a8b29cb0a224f3c536a0356c0477dd4fbc54e756701d59fe5eb394bcd43a20219b67e49fd7f40b4b43641 +EBUILD postfix-3.5.0.ebuild 8835 BLAKE2B 783402f5b3fb51890afbba59bb042fdfc26726804ede9d523882f759c870fbfcb63a66463100bc8bb5d21e1030c59a887de263239b4e0f9e37f38fd2383ddef7 SHA512 db14226c5259442c15a3c0ef3ec9bb6b00e331840df15764e6eec2f9bb8d6d93475334924445f31e1b8d1460da9d3c24f07f94809e5dea11149e6c7d0e6781ef +EBUILD postfix-3.6_pre20200316.ebuild 8493 BLAKE2B 7a1a7ae0229b01b45b0e1636f46b269f08e5b41fec61f466d89fc0010b67068c6f3d9334d08265692b90ecf25d29f532606f91f5821fca8c7daa6452628cc664 SHA512 013adef4a94c586637f4db2459a7a80a200ca333977d630573591ea55ff0ffdf64ad9f7f8766df8b710f6f87b3301dab05f3f49895b04824345c6606604dd1ce MISC metadata.xml 939 BLAKE2B 01474efe62df1eda9a3ba5976847064d615b3c32d9c71838354ef375c851c7ab4d1fcc2bc0d2945ce3d259fc6a698938cee6d1354c4e0f02f1e66395e377a0c5 SHA512 8602700c2a21b66ecf2c024c06ce23452f7effd9c06a5d58c1ccb351bcdef43a3c89575cc9136efc72fcd4e06ecb0654017b51bb145e7ffeeda771e3f4e7a673 diff --git a/mail-mta/postfix/postfix-3.4.8.ebuild b/mail-mta/postfix/postfix-3.4.10.ebuild index f0bd1f4d4415..96e414111102 100644 --- a/mail-mta/postfix/postfix-3.4.8.ebuild +++ b/mail-mta/postfix/postfix-3.4.10.ebuild @@ -16,7 +16,7 @@ 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" +KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~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 @@ -67,6 +67,7 @@ PATCHES=( "${FILESDIR}/${PN}-libressl-certkey.patch" "${FILESDIR}/${PN}-libressl-server.patch" "${FILESDIR}/${PN}-glibc230.patch" + "${FILESDIR}/${PN}-gcc10.patch" ) src_prepare() { diff --git a/mail-mta/postfix/postfix-3.4.5-r1.ebuild b/mail-mta/postfix/postfix-3.4.5-r1.ebuild deleted file mode 100644 index 001ca67956eb..000000000000 --- a/mail-mta/postfix/postfix-3.4.5-r1.ebuild +++ /dev/null @@ -1,321 +0,0 @@ -# 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 user - -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 ~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} - 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" -) - -pkg_setup() { - # 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" -} - -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.4.6.ebuild b/mail-mta/postfix/postfix-3.4.6.ebuild deleted file mode 100644 index df756f6871ca..000000000000 --- a/mail-mta/postfix/postfix-3.4.6.ebuild +++ /dev/null @@ -1,321 +0,0 @@ -# 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 user - -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 ~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} - 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" -) - -pkg_setup() { - # 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" -} - -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.4.9.ebuild b/mail-mta/postfix/postfix-3.4.9.ebuild index f62330bb7af8..57e4d8c2f258 100644 --- a/mail-mta/postfix/postfix-3.4.9.ebuild +++ b/mail-mta/postfix/postfix-3.4.9.ebuild @@ -16,7 +16,7 @@ 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" +KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ~mips ppc ppc64 ~s390 ~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 diff --git a/mail-mta/postfix/postfix-3.5_pre20200203.ebuild b/mail-mta/postfix/postfix-3.5.0.ebuild index c1f9fa6fc3fa..15887b8c8b9a 100644 --- a/mail-mta/postfix/postfix-3.5_pre20200203.ebuild +++ b/mail-mta/postfix/postfix-3.5.0.ebuild @@ -5,9 +5,9 @@ EAPI=7 inherit flag-o-matic pam systemd toolchain-funcs -MY_PV="${PV/_pre/-}" +MY_PV="${PV/_rc/-RC}" MY_SRC="${PN}-${MY_PV}" -MY_URI="ftp://ftp.porcupine.org/mirrors/postfix-release/experimental" +MY_URI="ftp://ftp.porcupine.org/mirrors/postfix-release/official" RC_VER="2.7" DESCRIPTION="A fast and secure drop-in replacement for sendmail" @@ -16,7 +16,7 @@ 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" +KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~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 diff --git a/mail-mta/postfix/postfix-3.4.7.ebuild b/mail-mta/postfix/postfix-3.6_pre20200316.ebuild index f0bd1f4d4415..e2ad04c2d0a6 100644 --- a/mail-mta/postfix/postfix-3.4.7.ebuild +++ b/mail-mta/postfix/postfix-3.6_pre20200316.ebuild @@ -5,9 +5,9 @@ EAPI=7 inherit flag-o-matic pam systemd toolchain-funcs -MY_PV="${PV/_rc/-RC}" +MY_PV="${PV/_pre/-}" MY_SRC="${PN}-${MY_PV}" -MY_URI="ftp://ftp.porcupine.org/mirrors/postfix-release/official" +MY_URI="ftp://ftp.porcupine.org/mirrors/postfix-release/experimental" RC_VER="2.7" DESCRIPTION="A fast and secure drop-in replacement for sendmail" @@ -16,7 +16,7 @@ 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" +KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~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 @@ -54,8 +54,7 @@ RDEPEND="${DEPEND} !mail-mta/qmail-ldap !mail-mta/sendmail !mail-mta/opensmtpd - !<mail-mta/ssmtp-2.64-r2 - !>=mail-mta/ssmtp-2.64-r2[mta] + !mail-mta/ssmtp[mta] !net-mail/fastforward selinux? ( sec-policy/selinux-postfix )" @@ -66,7 +65,6 @@ S="${WORKDIR}/${MY_SRC}" PATCHES=( "${FILESDIR}/${PN}-libressl-certkey.patch" "${FILESDIR}/${PN}-libressl-server.patch" - "${FILESDIR}/${PN}-glibc230.patch" ) src_prepare() { @@ -281,17 +279,6 @@ src_install() { 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 diff --git a/mail-mta/protonmail-bridge-bin/Manifest b/mail-mta/protonmail-bridge-bin/Manifest index 345ac6cacefe..4cfde11328c5 100644 --- a/mail-mta/protonmail-bridge-bin/Manifest +++ b/mail-mta/protonmail-bridge-bin/Manifest @@ -1,7 +1,7 @@ -DIST protonmail-bridge-1.1.6-1.x86_64.rpm 52547264 BLAKE2B abfc9657e7f15596f12609b9541a7616a405a86d02539340aa406f78c5abf1b766283dd6d954a15ebbb439402290f4a937d6c9a3d5b61de57383142dc878a379 SHA512 65524367fe9bf2a9fee7bb0be1cefc01eadf60494b65be9cb03c7ce73949d92c3312589a6f2801ca3cac89db226250529eefea12b0af744ca1c95ee4fc175435 -DIST protonmail-bridge-1.2.2-1.x86_64.rpm 52777739 BLAKE2B 84c11176e57586f11e0fb511bcdbc98fbc85a563ba68dd44454a9b10e493a01b4414bf776929afa0990f3e1677fd47ab1b6c16e7799e964cff617f8cc5190bd7 SHA512 7dad4fd0ef99925a0e70fa2fbce89b16d900b4fdbe8da7c914451aa60ac47121da0de2a5b475b8e3e5bd024bbe7b67667c8c9733b6e7435c222f034ca9406c58 DIST protonmail-bridge-1.2.3-1.x86_64.rpm 52847419 BLAKE2B 604a1990ced2f9e64e99aad7f729ac48750f2b620036c7e953cc9b16e25187f201d2a148bb03a03bcf48fc72db3faefedd8102a4c099dca2c9c71e766804a6cc SHA512 98a92d1365baac975e3007a4a8d920aa8b5d0166d9c69deb4c9dd4f96cb314a5a60fb7bd43c35c33c89419b63dba5e4dc1526cf8518a0f6db4e3315b4eb8a420 -EBUILD protonmail-bridge-bin-1.1.6.ebuild 8721 BLAKE2B adf78e924e818eda91a6c19ce4058e7a62efbbac902b799721ebb406b9524b0f6b7a29996d741156a254e0e7fbfe14a448ab12ae82c522d8805fbc3ba14fb952 SHA512 3a38bc03ac813656c2e0d7f4e3f30842d4baad81c71c24ecabc2dc946856f73d47facef9174f9b6977304262ae35a3ade84d09eb7192b0926c07995773d3a762 -EBUILD protonmail-bridge-bin-1.2.2.ebuild 8721 BLAKE2B adf78e924e818eda91a6c19ce4058e7a62efbbac902b799721ebb406b9524b0f6b7a29996d741156a254e0e7fbfe14a448ab12ae82c522d8805fbc3ba14fb952 SHA512 3a38bc03ac813656c2e0d7f4e3f30842d4baad81c71c24ecabc2dc946856f73d47facef9174f9b6977304262ae35a3ade84d09eb7192b0926c07995773d3a762 +DIST protonmail-bridge-1.2.5-1.x86_64.rpm 53088686 BLAKE2B af9085e0e0c66894f9c0a8c38a42a0afb32ec17cecd14b89f7d0a5c896aebf3047ba03f6b15aecff7834063166f31351c4b7b32d707e87f8673fa3c1c91b6f69 SHA512 982279b4a8032224b086d98f4e009c4b6423b8696c557c156f044322673b2e6524aab975a7fb527a4a525f7116fbd74af55e5ff75305e404438b18a9e75b657c +DIST protonmail-bridge-1.2.6-1.x86_64.rpm 54560899 BLAKE2B 3f1cd39a5415119e81949ff8c8c6df6a8f64c1a1565ce169c8c1999cc34e9d977677a3cc5539bc2a6de4199792941f5676c86a29bab28a3db667aa62503ff57d SHA512 6ba00aaa99e2faff401017e5471670642f5bcb56b98b38a9e21427c1b4dc1e824a3062805dfdb717ae6d9f994c59f9967f4736e14dad0eb13c456251d96b2928 EBUILD protonmail-bridge-bin-1.2.3.ebuild 8721 BLAKE2B adf78e924e818eda91a6c19ce4058e7a62efbbac902b799721ebb406b9524b0f6b7a29996d741156a254e0e7fbfe14a448ab12ae82c522d8805fbc3ba14fb952 SHA512 3a38bc03ac813656c2e0d7f4e3f30842d4baad81c71c24ecabc2dc946856f73d47facef9174f9b6977304262ae35a3ade84d09eb7192b0926c07995773d3a762 +EBUILD protonmail-bridge-bin-1.2.5.ebuild 11704 BLAKE2B 6dc32db81e7ff15122dd9aeee03ada34c0d9fcbb84a1c20cce62f5b9461483d847d3ef9eb67875d95349b624f1a747bf8a7ec2597676aa78fb6026e9ed9ddc09 SHA512 8f41c1174f6c7e88131e40c9edfffee09f8b23cee769da57e61afb22e6bb298d8019c309c57fc64145a862381d9e019a80f00a4b407eaac99b077c70d49316b1 +EBUILD protonmail-bridge-bin-1.2.6.ebuild 11798 BLAKE2B ace2d6bb0667b283a5c92600be2932068244e48b2ac29acdc12c75af5948a277d1e32cc51d3aa1e2c77982e07ce163913d537a9d26376abf800c1e3d01d8d149 SHA512 631ba09fa87d05082f9d50c30e134f1e20a79f1368885a179f37075544db7e70d0139325c345588c47e9acd63881d54d9f324cb73efe39a92cefc42f968ef190 MISC metadata.xml 477 BLAKE2B 8d29a65220a234802a25b8979e598393883a4e905ed6b114297801b93f82212165749f8317791459314afe1c59c6f5a7c2e871bc85637387bc3decae250cec21 SHA512 7d081e416b0bf6b91e6ba69a1de51c35839ff1512ab3c93be3f161ab5e6a4a554d58549460bb7fb73e1dbaf44f76b673067f0f33c4d775143f500416e096f0bc diff --git a/mail-mta/protonmail-bridge-bin/protonmail-bridge-bin-1.1.6.ebuild b/mail-mta/protonmail-bridge-bin/protonmail-bridge-bin-1.2.5.ebuild index f3a5ead03295..eff632ea197c 100644 --- a/mail-mta/protonmail-bridge-bin/protonmail-bridge-bin-1.1.6.ebuild +++ b/mail-mta/protonmail-bridge-bin/protonmail-bridge-bin-1.2.5.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2019 Gentoo Authors +# Copyright 1999-2020 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -123,7 +123,6 @@ src_prepare() { rm "plugins/sensors/libqtsensors_iio-sensor-proxy.so" || die rm "plugins/sensors/libqtsensors_linuxsys.so" || die rm "plugins/sqldrivers/libqsqlite.so" || die - rm "plugins/sqldrivers/libqsqlmysql.so" || die rm "plugins/sqldrivers/libqsqlpsql.so" || die rm "plugins/xcbglintegrations/libqxcb-egl-integration.so" || die rm "qml/Qt/labs/calendar/libqtlabscalendarplugin.so" || die @@ -138,7 +137,6 @@ src_prepare() { rm "qml/Qt3D/Logic/libquick3dlogicplugin.so" || die rm "qml/Qt3D/Render/libquick3drenderplugin.so" || die rm "qml/QtBluetooth/libdeclarative_bluetooth.so" || die - rm "qml/QtCanvas3D/libqtcanvas3d.so" || die rm "qml/QtGamepad/libdeclarative_gamepad.so" || die rm "qml/QtLocation/libdeclarative_location.so" || die rm "qml/QtMultimedia/libdeclarative_multimedia.so" || die @@ -180,6 +178,51 @@ src_prepare() { rm "qml/QtQuick/Controls.2/Imagine/libqtquickcontrols2imaginestyleplugin.so" || die rm "qml/QtQml/RemoteObjects/libqtqmlremoteobjects.so" || die rm "qml/Qt/labs/location/liblocationlabsplugin.so" || die + rm "lib/libQt5WaylandClient.so.5" || die + rm "lib/libQt5WaylandCompositor.so.5" || die + rm "plugins/canbus/libqtvirtualcanbus.so" || die + rm "plugins/platforminputcontexts/libfcitxplatforminputcontextplugin.so" || die + rm "plugins/platforms/libqwayland-egl.so" || die + rm "plugins/platforms/libqwayland-generic.so" || die + rm "plugins/platforms/libqwayland-xcomposite-egl.so" || die + rm "plugins/platforms/libqwayland-xcomposite-glx.so" || die + rm "plugins/platforms/libqwebgl.so" || die + rm "plugins/position/libqtposition_geoclue2.so" || die + rm "plugins/sqldrivers/libqsqlodbc.so" || die + rm "plugins/virtualkeyboard/libqtvirtualkeyboard_hangul.so" || die + rm "plugins/virtualkeyboard/libqtvirtualkeyboard_openwnn.so" || die + rm "plugins/virtualkeyboard/libqtvirtualkeyboard_pinyin.so" || die + rm "plugins/virtualkeyboard/libqtvirtualkeyboard_tcime.so" || die + rm "plugins/virtualkeyboard/libqtvirtualkeyboard_thai.so" || die + rm "plugins/wayland-decoration-client/libbradient.so" || die + rm "plugins/wayland-graphics-integration-client/libdmabuf-server.so" || die + rm "plugins/wayland-graphics-integration-client/libdrm-egl-server.so" || die + rm "plugins/wayland-graphics-integration-client/libqt-plugin-wayland-egl.so" || die + rm "plugins/wayland-graphics-integration-client/libshm-emulation-server.so" || die + rm "plugins/wayland-graphics-integration-client/libxcomposite-egl.so" || die + rm "plugins/wayland-graphics-integration-client/libxcomposite-glx.so" || die + rm "plugins/wayland-graphics-integration-server/libdmabuf-server.so" || die + rm "plugins/wayland-graphics-integration-server/libdrm-egl-server.so" || die + rm "plugins/wayland-graphics-integration-server/liblinux-dmabuf-unstable-v1.so" || die + rm "plugins/wayland-graphics-integration-server/libqt-plugin-wayland-egl.so" || die + rm "plugins/wayland-graphics-integration-server/libshm-emulation-server.so" || die + rm "plugins/wayland-graphics-integration-server/libwayland-eglstream-controller.so" || die + rm "plugins/wayland-graphics-integration-server/libxcomposite-egl.so" || die + rm "plugins/wayland-graphics-integration-server/libxcomposite-glx.so" || die + rm "plugins/wayland-shell-integration/libfullscreen-shell-v1.so" || die + rm "plugins/wayland-shell-integration/libivi-shell.so" || die + rm "plugins/wayland-shell-integration/libwl-shell.so" || die + rm "plugins/wayland-shell-integration/libxdg-shell-v5.so" || die + rm "plugins/wayland-shell-integration/libxdg-shell-v6.so" || die + rm "plugins/wayland-shell-integration/libxdg-shell.so" || die + rm "qml/QtCharts/libqtchartsqml2.so" || die + rm "qml/QtDataVisualization/libdatavisualizationqml2.so" || die + rm "qml/QtPurchasing/libdeclarative_purchasing.so" || die + rm "qml/QtQuick/VirtualKeyboard/Settings/libqtquickvirtualkeyboardsettingsplugin.so" || die + rm "qml/QtQuick/VirtualKeyboard/Styles/libqtquickvirtualkeyboardstylesplugin.so" || die + rm "qml/QtQuick/VirtualKeyboard/libqtquickvirtualkeyboardplugin.so" || die + rm "qml/QtRemoteObjects/libqtremoteobjects.so" || die + rm "qml/QtWayland/Compositor/libqwaylandcompositorplugin.so" || die default } diff --git a/mail-mta/protonmail-bridge-bin/protonmail-bridge-bin-1.2.2.ebuild b/mail-mta/protonmail-bridge-bin/protonmail-bridge-bin-1.2.6.ebuild index f3a5ead03295..a1f688318f2d 100644 --- a/mail-mta/protonmail-bridge-bin/protonmail-bridge-bin-1.2.2.ebuild +++ b/mail-mta/protonmail-bridge-bin/protonmail-bridge-bin-1.2.6.ebuild @@ -1,9 +1,9 @@ -# Copyright 1999-2019 Gentoo Authors +# Copyright 1999-2020 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 -inherit rpm +inherit rpm xdg-utils DESCRIPTION="Serves ProtonMail to IMAP/SMTP clients" HOMEPAGE="https://protonmail.com/bridge/" @@ -123,7 +123,6 @@ src_prepare() { rm "plugins/sensors/libqtsensors_iio-sensor-proxy.so" || die rm "plugins/sensors/libqtsensors_linuxsys.so" || die rm "plugins/sqldrivers/libqsqlite.so" || die - rm "plugins/sqldrivers/libqsqlmysql.so" || die rm "plugins/sqldrivers/libqsqlpsql.so" || die rm "plugins/xcbglintegrations/libqxcb-egl-integration.so" || die rm "qml/Qt/labs/calendar/libqtlabscalendarplugin.so" || die @@ -138,7 +137,6 @@ src_prepare() { rm "qml/Qt3D/Logic/libquick3dlogicplugin.so" || die rm "qml/Qt3D/Render/libquick3drenderplugin.so" || die rm "qml/QtBluetooth/libdeclarative_bluetooth.so" || die - rm "qml/QtCanvas3D/libqtcanvas3d.so" || die rm "qml/QtGamepad/libdeclarative_gamepad.so" || die rm "qml/QtLocation/libdeclarative_location.so" || die rm "qml/QtMultimedia/libdeclarative_multimedia.so" || die @@ -180,6 +178,51 @@ src_prepare() { rm "qml/QtQuick/Controls.2/Imagine/libqtquickcontrols2imaginestyleplugin.so" || die rm "qml/QtQml/RemoteObjects/libqtqmlremoteobjects.so" || die rm "qml/Qt/labs/location/liblocationlabsplugin.so" || die + rm "lib/libQt5WaylandClient.so.5" || die + rm "lib/libQt5WaylandCompositor.so.5" || die + rm "plugins/canbus/libqtvirtualcanbus.so" || die + rm "plugins/platforminputcontexts/libfcitxplatforminputcontextplugin.so" || die + rm "plugins/platforms/libqwayland-egl.so" || die + rm "plugins/platforms/libqwayland-generic.so" || die + rm "plugins/platforms/libqwayland-xcomposite-egl.so" || die + rm "plugins/platforms/libqwayland-xcomposite-glx.so" || die + rm "plugins/platforms/libqwebgl.so" || die + rm "plugins/position/libqtposition_geoclue2.so" || die + rm "plugins/sqldrivers/libqsqlodbc.so" || die + rm "plugins/virtualkeyboard/libqtvirtualkeyboard_hangul.so" || die + rm "plugins/virtualkeyboard/libqtvirtualkeyboard_openwnn.so" || die + rm "plugins/virtualkeyboard/libqtvirtualkeyboard_pinyin.so" || die + rm "plugins/virtualkeyboard/libqtvirtualkeyboard_tcime.so" || die + rm "plugins/virtualkeyboard/libqtvirtualkeyboard_thai.so" || die + rm "plugins/wayland-decoration-client/libbradient.so" || die + rm "plugins/wayland-graphics-integration-client/libdmabuf-server.so" || die + rm "plugins/wayland-graphics-integration-client/libdrm-egl-server.so" || die + rm "plugins/wayland-graphics-integration-client/libqt-plugin-wayland-egl.so" || die + rm "plugins/wayland-graphics-integration-client/libshm-emulation-server.so" || die + rm "plugins/wayland-graphics-integration-client/libxcomposite-egl.so" || die + rm "plugins/wayland-graphics-integration-client/libxcomposite-glx.so" || die + rm "plugins/wayland-graphics-integration-server/libdmabuf-server.so" || die + rm "plugins/wayland-graphics-integration-server/libdrm-egl-server.so" || die + rm "plugins/wayland-graphics-integration-server/liblinux-dmabuf-unstable-v1.so" || die + rm "plugins/wayland-graphics-integration-server/libqt-plugin-wayland-egl.so" || die + rm "plugins/wayland-graphics-integration-server/libshm-emulation-server.so" || die + rm "plugins/wayland-graphics-integration-server/libwayland-eglstream-controller.so" || die + rm "plugins/wayland-graphics-integration-server/libxcomposite-egl.so" || die + rm "plugins/wayland-graphics-integration-server/libxcomposite-glx.so" || die + rm "plugins/wayland-shell-integration/libfullscreen-shell-v1.so" || die + rm "plugins/wayland-shell-integration/libivi-shell.so" || die + rm "plugins/wayland-shell-integration/libwl-shell.so" || die + rm "plugins/wayland-shell-integration/libxdg-shell-v5.so" || die + rm "plugins/wayland-shell-integration/libxdg-shell-v6.so" || die + rm "plugins/wayland-shell-integration/libxdg-shell.so" || die + rm "qml/QtCharts/libqtchartsqml2.so" || die + rm "qml/QtDataVisualization/libdatavisualizationqml2.so" || die + rm "qml/QtPurchasing/libdeclarative_purchasing.so" || die + rm "qml/QtQuick/VirtualKeyboard/Settings/libqtquickvirtualkeyboardsettingsplugin.so" || die + rm "qml/QtQuick/VirtualKeyboard/Styles/libqtquickvirtualkeyboardstylesplugin.so" || die + rm "qml/QtQuick/VirtualKeyboard/libqtquickvirtualkeyboardplugin.so" || die + rm "qml/QtRemoteObjects/libqtremoteobjects.so" || die + rm "qml/QtWayland/Compositor/libqwaylandcompositorplugin.so" || die default } @@ -195,3 +238,11 @@ src_install() { SEARCH_DIRS_MASK="/usr/lib*/protonmail/bridge" EOF } + +pkg_postinst() { + xdg_icon_cache_update +} + +pkg_postrm() { + xdg_icon_cache_update +} diff --git a/mail-mta/sendmail/Manifest b/mail-mta/sendmail/Manifest index 4e7956029a7f..bf43a0f85413 100644 --- a/mail-mta/sendmail/Manifest +++ b/mail-mta/sendmail/Manifest @@ -1,17 +1,15 @@ AUX libmilter-sharedlib.patch 2843 BLAKE2B d64be1f4f4561a4056bca9784f00b4c965adbf30e99e1b9318162e6a3dad043eb508e925234a586443a8e8fd992f8aee67557f6c3d1e54f644d9c6c8fa7c267a SHA512 31c36b57739946c1b9c7c85307fe5c53c45d7f8cbf427a0f2248db8b74871a6f5a30ef1af524915821aeca54310d28272bcd0a587cb918192214fa5c30e4a8da AUX sendmail 595 BLAKE2B fe4532e30c6bc84effbdd59de70a27e2565fa7b4437c1fdc64ca169adf14702b8fa739123f2b0f0d2069b33939efe0c3382ea51716bf5fb1905f04f6074c8ac2 SHA512 0a1611eeec33a7d7eecff75ed6c8f70abf0d6d8cf4a5242f084da0d4139e0e871239e9893a53782e5dab80c4386c62d96ec03839fc98a497e697fce1f7a149aa -AUX sendmail-8.14.5+db-5.0.patch 432 BLAKE2B 0eb836ba65c932d3feba356dc234bdfd82f84d134ca2e8593b67764cf5a0462fb6a60eb09f7b8e23d39d6474fd7282b1b362d67cef68f8dcf36214ecb553dcea SHA512 f9df3b0560a0620a9875f6e85b1ea0866879aafd3475efa47539f41f4b54a34fe91c752a067fb62634cb71ad09c44b8408bdacddf3d5c47545b49c618eb005ec AUX sendmail-8.14.6-build-system.patch 12909 BLAKE2B 7643aad99583e533246834a069611588dc667ff2c664eb9c6c088d8f340f69306a9e2f56da6f967c34ebdfafcd697498f29f2a05dccce51083b59d9829f4bc8d SHA512 0e03b7cfd7f3002a36fed2fca60240314bac175a502ca9bda8397e7ad07e26faf8d3437bbdcdb9cda4dbc6b4917ca0ed1b5c9126ad246044dc7da8ce3ad70b54 +AUX sendmail-8.15.2-glibc-2.30.patch 1381 BLAKE2B 97822902c9a6fb2ca475a3c3deed93d05d89fc891ef7e45ac4fb7466f8bf549883572f97e190165f79db8b5cff5fcd70b2c52f185294bdbbc022b27a81e2c212 SHA512 fa2bf0a1123c82b000d92ab261039203f0426a1b6c874a1309219456378b7fe656ee2e7dce7fa674f55e6c6e5e8856aea4e32d8e0d3ac67dde934dfc31e48517 AUX sendmail-8.15.2-openssl-1.1.0-fix.patch 4567 BLAKE2B cd4cce44a65428068783e8c924f7cf8a6eb1b5dd8566d307f6709ec2821f55c77891156c6a01155711590bc48e4d7b3deb76b11de04180507f621d5fb323f2e9 SHA512 ffd3b5de59bc745d45039234b0cbbd6b04ee301333661e9d8e0138b0961e9c21d0b6759ac604058cb62ec94fd9cf77732e57065f73c2a147efac306b1e82b92b AUX sendmail-delivered_hdr.patch 341 BLAKE2B a29362584d77bd317de58c1967a9cfb3a2e0d1c5f0b37504d13c1404830687137f9342fe567ea969b40989115a292d947064f37b307c2a3e9b75051ee53d28ff SHA512 1e97ca1b32e6cbb69fe08d4e1c5dee0763ef874537448e60129f71f82bc92c78fc5d9e124568d21188b6e6e2186a1a3c9f1362b0d0734f7e12e2272643238254 AUX sendmail-procmail.mc 295 BLAKE2B ca3a2e0939dbf09ab8e4042737bc8c5489bae114baad9a9c09f1d698ad881fd050e57cec42929709b5635e83d3f6393ea1b70c51e01af8110d145d46ec4ec70a SHA512 eb693fb91acdc3cbc4601d517119300f238c20e86dc0dbc137a209ce56bd5bf7d7a8c9848a143daf932be487d919004da994ba2dbd7494ea5be6e08929549d58 AUX sendmail-starttls-multi-crl.patch 643 BLAKE2B c17c4005f861a4ab29b95e212a55684e655f04dc53da3c78ced3a2228b47376b5ad5eddbdc7e0a339d03c6e701a7e5d403698f07c1a76bf4aa031196131c2d87 SHA512 3028c9aca8b1f69d911b8fa78027acc949b1584fdb5be514ee71cb2860658ed1a13ee964696a93af3e9999c7f02526c046455d8740129d3eea546c272df24bd2 AUX sendmail.mc-r1 285 BLAKE2B 7710e6ae53d3b8e8756a63629a3c6c7f0c8dd21b7f6dc82b9d0bafe426f450132a85f2163f6b832ea6b100eba70c95a4a2927b6a0848faf45891777e0a6eb51d SHA512 f197572f4004cd1f9de4c423d1d5ded382535b9643b32aa8dc03889cdf76bf918702a77a20edde5f2d19276ca7ec473cac5db01c42b0833cda950cfc11cbbf41 -AUX sendmail.service 353 BLAKE2B 9ae842fd4cd5f12ad54359772880bffe7e96f51f6b1e05e4388df34078790e4969367be812738e33651d54f6e7343bd0f44656ff54de7df8c4e40904d789e55d SHA512 3bf4d502c965c56c7d421b1a1b68ab49d42f61d7227bf91d56c527ed1ae1a604aead35a6b774f6e534e9b014f3f6d1e53c00c349df1f2b90a81f70b5d5948012 +AUX sendmail.service 349 BLAKE2B dc154b2fed04553247f3a64e31351377e18f95830dac22b4498f8e2afd7e91844081d7f8eb2efb2e8b9ec9fdf022d919eccb4f383b99c1fa9ec989cc5b69cbde SHA512 4e0f263e5d125cfb0c80f96416ffd1bdb7ce3f53fa78fc516fadd3ef10c6bd6f148e081c2b9f1be4394198fd45713b47520462b70b16bdf6a3c771fa18bbe5e7 AUX site.config.m4 564 BLAKE2B 85bcbe7b9a26071aedf0d1b530c1276d93de21d82972add0908c035a958dc34ebe15941a37add15f24116e3cf2779bf003d965baae10dbbcafdb61f0af453227 SHA512 82d9bbb233e6ffbcef411f8a8184b47aea27f3dc0b41ace053e0107e05a5fe6929d9dd76d3d1baf0ce43be78dc46f40888ad0c93e4f126f6ce0c0372007a262d AUX sm-client.service 418 BLAKE2B a9057cac008c11d3cfd5a4b662cf3fc71a33be79e8890a54e556a258b098ceccc2e9941f62dce868498751bd22f23f45289bc84a8250020b140acbd2b6508b58 SHA512 26e5a64790fd7106e45de0f4dfafb3b648094953bd1831a223ca7c60b7cb75b673fb554b426a6aa0e7dc200a134fd042b4ecc6795641cfddd82bd04e4c7ea324 -DIST sendmail.8.14.9.tar.gz 2114293 BLAKE2B 51c24478724a1dd87e3bbda0bf0e8c9c64bc8f36eaa624752eda50942520a4f19262d2c8cebbb0a02467bb3f49e1e7edd78a69f0327effa3834e4234b289f04c SHA512 a541fe687e9967fb87f2f6c6263ecc698aac42c6a52e81e7ee556f0c3d719b9c996dfccf10cc2e0e5c6d03dd8d3ce79b856b78ca049dd47665e38c77763fa424 DIST sendmail.8.15.2.tar.gz 2207417 BLAKE2B 3d9dfb5bc2b535e30ef2fc61333e12a9b1fc45a5d730d2bed1ef956adb574721833f87aeba0475705b76e0c7d6cf00f9a10025bffb0de6c6b4dae606eb2ec399 SHA512 04feb37316c13b66b1518596507a7da7c16cb0bf1abf10367f7fd888a428fadb093a9efa55342fa55b936c3f0cbdc63b9e2505cd99201a69a0c05b8ad65f49f9 -EBUILD sendmail-8.14.9.ebuild 7038 BLAKE2B e5eeab9989dc4e74fd9763a707bb94afad121d5d5cca6e276e47cb0196781c37f590884e1c2f8ff64a14ba99baffe4186fafa13952bf7bf4617fcd9ecd617c8d SHA512 00169095b070eb1c3e30d2e5e215625dff0677d171c79757c006a1ee1cf171d8ec1e19fd654b56e3da8fe78caa429b8dd8893d639e39bfafdf0015603aabb583 -EBUILD sendmail-8.15.2-r2.ebuild 7220 BLAKE2B bef926cae4d7eec00db753c7ba63f0393a51cba70b90efd4ec6aa76fc47c0871b0f05622893e24846ea923bdf538860871dcb78aeb170f562155e31e3c13502d SHA512 baec1257fd1e4bf7900d9006f560a09f40cb09328215ead62e710594479733a51fd100512134bf5341947d0d22d903032d6ba3b734151e1b747b8510646ca233 +EBUILD sendmail-8.15.2-r2.ebuild 7261 BLAKE2B 531926c58e8dbbfd3fa80ecfcd69bc77770dfe4daa9844094eb3befc683829bb0600f7fb0ffab75d31e8fba5618303de02ee93702d7addc4fef498a528c7582a SHA512 1a18654abb2237ce98a483536315f2196d2bdb891b4e2c7dff88a352dabcdf8a4f40700d9a7ce4319c941e803c0f54d15f9ac45fcf5e6ed59c4dc5dd0b800128 MISC metadata.xml 167 BLAKE2B e4dadf27fd344484f2bccb5b904909c89aac568c32e5b3c44bdf139eacefd4b4fae74419f503d2b7da0dccc1b68ba05d777d11292c0f89270d1ac5c9c703e8ca SHA512 7c8decb24ee3a850e38186cf3c7f8933a28017426806870ad6ef9ceb2533be147a2681fc789b535a81cb528af8c29d90d3006e4f250aee23bd7dea4561294e33 diff --git a/mail-mta/sendmail/files/sendmail-8.14.5+db-5.0.patch b/mail-mta/sendmail/files/sendmail-8.14.5+db-5.0.patch deleted file mode 100644 index 99ecbe081674..000000000000 --- a/mail-mta/sendmail/files/sendmail-8.14.5+db-5.0.patch +++ /dev/null @@ -1,13 +0,0 @@ -Index: sendmail-8.14.4/include/sm/bdb.h -=================================================================== ---- sendmail-8.14.4.orig/include/sm/bdb.h -+++ sendmail-8.14.4/include/sm/bdb.h -@@ -19,7 +19,7 @@ - # define DB_VERSION_MAJOR 1 - # endif /* ! DB_VERSION_MAJOR */ - --# if DB_VERSION_MAJOR >= 4 && DB_VERSION_MINOR >= 1 -+# if (DB_VERSION_MAJOR == 4 && DB_VERSION_MINOR >= 1) || DB_VERSION_MAJOR >= 5 - - # define DBTXN NULL , - diff --git a/mail-mta/sendmail/files/sendmail-8.15.2-glibc-2.30.patch b/mail-mta/sendmail/files/sendmail-8.15.2-glibc-2.30.patch new file mode 100644 index 000000000000..03281d1990fe --- /dev/null +++ b/mail-mta/sendmail/files/sendmail-8.15.2-glibc-2.30.patch @@ -0,0 +1,52 @@ +https://bugs.gentoo.org/700108 + +--- sendmail-8.15.2-r1/libmilter/sm_gethost.c.orig 2014-03-04 19:59:45.000000000 -0500 ++++ sendmail-8.15.2-r1/libmilter/sm_gethost.c 2019-11-15 09:32:25.812406080 -0500 +@@ -51,18 +51,21 @@ + { + bool resv6 = true; + struct hostent *h; +- ++#ifdef RES_USE_INET6 + if (family == AF_INET6) + { + /* From RFC2133, section 6.1 */ + resv6 = bitset(RES_USE_INET6, _res.options); + _res.options |= RES_USE_INET6; + } ++#endif + SM_SET_H_ERRNO(0); + h = gethostbyname(name); ++#ifdef RES_USE_INET6 + if (family == AF_INET6 && !resv6) + _res.options &= ~RES_USE_INET6; + ++#endif + /* the function is supposed to return only the requested family */ + if (h != NULL && h->h_addrtype != family) + { +--- sendmail-8.15.2-r2/sendmail/conf.c.orig 2019-11-14 17:36:41.262218822 -0500 ++++ sendmail-8.15.2-r2/sendmail/conf.c 2019-11-15 09:57:43.550284580 -0500 +@@ -4243,18 +4243,21 @@ + + # else /* HAS_GETHOSTBYNAME2 */ + bool resv6 = true; +- ++#ifdef RES_USE_INET6 + if (family == AF_INET6) + { + /* From RFC2133, section 6.1 */ + resv6 = bitset(RES_USE_INET6, _res.options); + _res.options |= RES_USE_INET6; + } ++#endif + SM_SET_H_ERRNO(0); + h = gethostbyname(name); ++#ifdef RES_USE_INET6 + if (!resv6) + _res.options &= ~RES_USE_INET6; + ++#endif + /* the function is supposed to return only the requested family */ + if (h != NULL && h->h_addrtype != family) + { diff --git a/mail-mta/sendmail/files/sendmail.service b/mail-mta/sendmail/files/sendmail.service index 1aeb769ececc..2d268fa1f870 100644 --- a/mail-mta/sendmail/files/sendmail.service +++ b/mail-mta/sendmail/files/sendmail.service @@ -5,7 +5,7 @@ Wants=sm-client.service [Service] Type=forking -PIDFile=/var/run/sendmail.pid +PIDFile=/run/sendmail.pid ExecStartPre=-/usr/bin/newaliases ExecStartPre=-/bin/rm -f /var/spool/mqueue/xf* ExecStart=/usr/sbin/sendmail -bd -q30m -L sm-mta diff --git a/mail-mta/sendmail/sendmail-8.14.9.ebuild b/mail-mta/sendmail/sendmail-8.14.9.ebuild deleted file mode 100644 index 8454266308d6..000000000000 --- a/mail-mta/sendmail/sendmail-8.14.9.ebuild +++ /dev/null @@ -1,202 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI="5" -inherit eutils multilib systemd toolchain-funcs user - -DESCRIPTION="Widely-used Mail Transport Agent (MTA)" -HOMEPAGE="http://www.sendmail.org/" -SRC_URI="ftp://ftp.sendmail.org/pub/${PN}/${PN}.${PV}.tar.gz" - -LICENSE="Sendmail GPL-2" # GPL-2 is here for initscript -SLOT="0" -KEYWORDS="~alpha amd64 arm hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86" -IUSE="ssl ldap sasl tcpd mbox ipv6 nis sockets" - -DEPEND="net-mail/mailbase - sys-devel/m4 - sasl? ( >=dev-libs/cyrus-sasl-2.1.10 ) - tcpd? ( sys-apps/tcp-wrappers ) - ssl? ( dev-libs/openssl:0= ) - ldap? ( net-nds/openldap ) - >=sys-libs/db-3.2 - !net-mail/vacation - " -RDEPEND="${DEPEND} - >=net-mail/mailbase-0.00 - !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/postfix - !mail-mta/opensmtpd - !mail-mta/qmail-ldap - !<mail-mta/ssmtp-2.64-r2 - !>=mail-mta/ssmtp-2.64-r2[mta]" - -PDEPEND="!mbox? ( mail-filter/procmail )" - -# libmilter library is part of sendmail, but it does not share the version number with it. -# In order to find the right libmilter version number, check SMFI_VERSION definition -# that can be found in ${S}/include/libmilter/mfapi.h (see also SM_LM_VRS_* defines). -# For example, version 1.0.1 has a SMFI_VERSION of 0x01000001. -LIBMILTER_VER=1.0.2 - -pkg_setup() { - enewgroup smmsp 209 - enewuser smmsp 209 -1 /var/spool/mqueue smmsp -} - -src_prepare() { - epatch "${FILESDIR}"/"${PN}"-8.14.6-build-system.patch - epatch "${FILESDIR}"/sendmail-delivered_hdr.patch - epatch "${FILESDIR}"/libmilter-sharedlib.patch - epatch "${FILESDIR}"/"${PN}"-8.14.5+db-5.0.patch - epatch "${FILESDIR}"/sendmail-starttls-multi-crl.patch - - local confCC="$(tc-getCC)" - local confCCOPTS="${CFLAGS}" - local confLDOPTS="${LDFLAGS}" - local confMAPDEF="-DMAP_REGEX" - local conf_sendmail_LIBS="" - use sasl && confLIBS="${confLIBS} -lsasl2" \ - && confENVDEF="${confENVDEF} -DSASL=2" \ - && confCCOPTS="${confCCOPTS} -I/usr/include/sasl" \ - && conf_sendmail_LIBS="${conf_sendmail_LIBS} -lsasl2" - use tcpd && confENVDEF="${confENVDEF} -DTCPWRAPPERS" \ - && confLIBS="${confLIBS} -lwrap" - use ssl && confENVDEF="${confENVDEF} -DSTARTTLS -D_FFR_DEAL_WITH_ERROR_SSL" \ - && confENVDEF="${confENVDEF} -D_FFR_TLS_1" \ - && confLIBS="${confLIBS} -lssl -lcrypto" \ - && conf_sendmail_LIBS="${conf_sendmail_LIBS} -lssl -lcrypto" - use ldap && confMAPDEF="${confMAPDEF} -DLDAPMAP" \ - && confLIBS="${confLIBS} -lldap -llber" - use ipv6 && confENVDEF="${confENVDEF} -DNETINET6" - use nis && confENVDEF="${confENVDEF} -DNIS" - use sockets && confENVDEF="${confENVDEF} -DSOCKETMAP" - sed -e "s:@@confCCOPTS@@:${confCCOPTS}:" \ - -e "s/@@confLDOPTS@@/${confLDOPTS}/" \ - -e "s/@@confCC@@/${confCC}/" \ - -e "s/@@confMAPDEF@@/${confMAPDEF}/" \ - -e "s/@@confENVDEF@@/${confENVDEF}/" \ - -e "s/@@confLIBS@@/${confLIBS}/" \ - -e "s/@@conf_sendmail_LIBS@@/${conf_sendmail_LIBS}/" \ - "${FILESDIR}"/site.config.m4 > devtools/Site/site.config.m4 -} - -src_compile() { - sh Build AR="$(tc-getAR)" RANLIB="$(tc-getRANLIB)" || die "compilation failed in main Build script" - pushd libmilter - sh Build AR="$(tc-getAR)" RANLIB="$(tc-getRANLIB)" MILTER_SOVER=${LIBMILTER_VER} || die "libmilter compilation failed" - popd -} - -src_install() { - local MY_LIBDIR=/usr/$(get_libdir) - local MY_OBJDIR="obj.`uname -s`.`uname -r`.`uname -m`" - dodir /usr/bin ${MY_LIBDIR} /usr/include/libmilter - dodir /usr/share/man/man{1,5,8} /usr/sbin /var/log /usr/share/sendmail-cf - dodir /var/spool/{mqueue,clientmqueue} /etc/conf.d - keepdir /var/spool/{clientmqueue,mqueue} - for dir in libsmutil sendmail mailstats praliases smrsh makemap vacation editmap - do - make DESTDIR="${D}" LIBDIR="${MY_LIBDIR}" MANROOT=/usr/share/man/man \ - SBINOWN=root SBINGRP=root UBINOWN=root UBINGRP=root \ - MANOWN=root MANGRP=root INCOWN=root INCGRP=root \ - LIBOWN=root LIBGRP=root GBINOWN=root GBINGRP=root \ - MSPQOWN=root CFOWN=root CFGRP=root \ - install -C "${MY_OBJDIR}/${dir}" \ - || die "install failed" - done - for dir in rmail mail.local - do - make DESTDIR="${D}" LIBDIR="${MY_LIBDIR}" MANROOT=/usr/share/man/man \ - SBINOWN=root SBINGRP=root UBINOWN=root UBINGRP=root \ - MANOWN=root MANGRP=root INCOWN=root INCGRP=root \ - LIBOWN=root LIBGRP=root GBINOWN=root GBINGRP=root \ - MSPQOWN=root CFOWN=root CFGRP=root \ - force-install -C "${MY_OBJDIR}/${dir}" \ - || die "install failed" - done - - make DESTDIR="${D}" LIBDIR="${MY_LIBDIR}" MANROOT=/usr/share/man/man \ - SBINOWN=root SBINGRP=root UBINOWN=root UBINGRP=root \ - MANOWN=root MANGRP=root INCOWN=root INCGRP=root \ - LIBOWN=root LIBGRP=root GBINOWN=root GBINGRP=root \ - MSPQOWN=root CFOWN=root CFGRP=root \ - MILTER_SOVER=${LIBMILTER_VER} \ - install -C "${MY_OBJDIR}/libmilter" \ - || die "install failed" - - fowners root:smmsp /usr/sbin/sendmail - fperms 2555 /usr/sbin/sendmail - fowners smmsp:smmsp /var/spool/clientmqueue - fperms 770 /var/spool/clientmqueue - fperms 700 /var/spool/mqueue - dosym /usr/sbin/makemap /usr/bin/makemap - dodoc FAQ KNOWNBUGS README RELEASE_NOTES doc/op/op.ps - newdoc sendmail/README README.sendmail - newdoc sendmail/SECURITY SECURITY - newdoc sendmail/TUNING TUNING - newdoc smrsh/README README.smrsh - newdoc libmilter/README README.libmilter - - newdoc cf/README README.cf - newdoc cf/cf/README README.install-cf - cp -pPR cf/* "${D}"/usr/share/sendmail-cf - - docinto contrib - dodoc contrib/* - - insinto /etc/mail - if use mbox - then - newins "${FILESDIR}"/sendmail.mc-r1 sendmail.mc - else - newins "${FILESDIR}"/sendmail-procmail.mc sendmail.mc - fi - m4 "${D}"/usr/share/sendmail-cf/m4/cf.m4 "${D}"/etc/mail/sendmail.mc \ - > "${D}"/etc/mail/sendmail.cf - echo "include(\`/usr/share/sendmail-cf/m4/cf.m4')dnl" \ - > "${D}"/etc/mail/submit.mc - cat "${D}"/usr/share/sendmail-cf/cf/submit.mc >> "${D}"/etc/mail/submit.mc - echo "# local-host-names - include all aliases for your machine here" \ - > "${D}"/etc/mail/local-host-names - cat <<- EOF > "${D}"/etc/mail/trusted-users - # trusted-users - users that can send mail as others without a warning - # apache, mailman, majordomo, uucp are good candidates - EOF - cat <<- EOF > "${D}"/etc/mail/access - # Check the /usr/share/doc/sendmail/README.cf file for a description - # of the format of this file. (search for access_db in that file) - # The /usr/share/doc/sendmail/README.cf is part of the sendmail-doc - # package. - # - - EOF - cat <<- EOF > "${D}"/etc/conf.d/sendmail - # Config file for /etc/init.d/sendmail - # add start-up options here - SENDMAIL_OPTS="-bd -q30m -L sm-mta" # default daemon mode - CLIENTMQUEUE_OPTS="-Ac -q30m -L sm-cm" # clientmqueue - KILL_OPTS="" # add -9/-15/your favorite evil SIG level here - - EOF - if use sasl; then - dodir /etc/sasl2 - cat <<- EOF > "${D}"/etc/sasl2/Sendmail.conf - pwcheck_method: saslauthd - mech_list: PLAIN LOGIN - - EOF - fi - - doinitd "${FILESDIR}"/sendmail - systemd_dounit "${FILESDIR}"/sendmail.service - systemd_dounit "${FILESDIR}"/sm-client.service - - keepdir /usr/adm/sm.bin -} diff --git a/mail-mta/sendmail/sendmail-8.15.2-r2.ebuild b/mail-mta/sendmail/sendmail-8.15.2-r2.ebuild index d3fd92fa5bb7..99feb6efaa4e 100644 --- a/mail-mta/sendmail/sendmail-8.15.2-r2.ebuild +++ b/mail-mta/sendmail/sendmail-8.15.2-r2.ebuild @@ -10,7 +10,7 @@ SRC_URI="ftp://ftp.sendmail.org/pub/${PN}/${PN}.${PV}.tar.gz" LICENSE="Sendmail GPL-2" # GPL-2 is here for initscript SLOT="0" -KEYWORDS="~alpha amd64 arm hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86" +KEYWORDS="~alpha amd64 arm hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86" IUSE="ssl ldap libressl sasl tcpd mbox ipv6 nis sockets" DEPEND="net-mail/mailbase @@ -59,6 +59,7 @@ src_prepare() { eapply "${FILESDIR}"/libmilter-sharedlib.patch eapply -p0 "${FILESDIR}"/sendmail-starttls-multi-crl.patch eapply "${FILESDIR}"/${P}-openssl-1.1.0-fix.patch + eapply "${FILESDIR}"/${P}-glibc-2.30.patch local confCC="$(tc-getCC)" local confCCOPTS="${CFLAGS}" diff --git a/mail-mta/ssmtp/Manifest b/mail-mta/ssmtp/Manifest index 301ea88f9813..127e27f336a6 100644 --- a/mail-mta/ssmtp/Manifest +++ b/mail-mta/ssmtp/Manifest @@ -1,4 +1,4 @@ DIST ssmtp-2.64-patches-4.tar.xz 6928 BLAKE2B 6f1d9a823273298abc58025c94cb288e1e296031580f63ed489a9d2559cd8846761e78c6fdfc1a385e645f990bc739ce3cf3ad0d1c1a3006dd3bd60e4a38c4f4 SHA512 6fa57c0bc5ad363e21bf69fb60f1cbb87ad1ead393a53ab5bd25b709303c321a29ed37ce7fe95b94dae748703bba3b0631fc2a95e40957c5241b5d9f42bc0c4a DIST ssmtp_2.64.orig.tar.bz2 52501 BLAKE2B be158f8d969f98e1a7105bf4b741da960efa2a1c4a941426d6b6ec0677df13a2272fc71a93d2c44fe65c7d0a30e9acc4ec8259ed298b746c8d9ceefd64f95336 SHA512 911752e744420adf58552b9cf3a6e558d8b39103e5ad33a9ed4429b9a3a2091f7674aac11fe9bbd66747a61cdabe6bd638b80efcaadc86b057c12e2e235cca72 -EBUILD ssmtp-2.64-r3.ebuild 3006 BLAKE2B c8029f8e536217af072c40dbf2606f1e164e504e640462678aeeb2466445d91b7b9548f32b5bf1c4558bc7a39cf336d5f58891433a33f6e56ad28e24d7e6f5b5 SHA512 f7e5fce97154d149cad8c8d59655ba7bbafdf8ebd08f47e097c5ca78f20b6708a77691758338f60889d04b749c0383661fad0e118941a5489c26ae3d6ccbd16a +EBUILD ssmtp-2.64-r3.ebuild 3004 BLAKE2B d5780eeb9753eda0c95423b5a4ffd0cf66ce7ae44f8f9312e8761c1bbf86b4601939df0af73cf70d7108c225e66337ad4bbd1106a7b5ef8c3b3ce1b0f02ccc97 SHA512 76f77889458d376405e77d52b74e381eb0ea1dd823aabebaaafad6a23c877b98879e91ab4ec0b8df25e37ce12dc8102aaa905b46b34505fed8781ae47663f43d MISC metadata.xml 259 BLAKE2B eb59516b105b0fdc4b755c3852b714707dba4f5b414eb0eea763db68aa0c5d1971b55866972ef14f1e3e5bc81ccb66975a24b9292aa796edf02877d649a661f2 SHA512 3e7a5afefe4f2095be4347e56af64eef343bbb4920ef80a7d93c88111864e8993f899328af33e736324960d26f30939e29e001e90381548a353ee0089f96a766 diff --git a/mail-mta/ssmtp/ssmtp-2.64-r3.ebuild b/mail-mta/ssmtp/ssmtp-2.64-r3.ebuild index 062e254c12e4..6d621c835f76 100644 --- a/mail-mta/ssmtp/ssmtp-2.64-r3.ebuild +++ b/mail-mta/ssmtp/ssmtp-2.64-r3.ebuild @@ -16,7 +16,7 @@ SRC_URI="mirror://debian/pool/main/s/ssmtp/${P/-/_}.orig.tar.bz2 LICENSE="GPL-2" SLOT="0" -KEYWORDS="~alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" +KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 m68k ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" IUSE="ipv6 libressl +ssl gnutls +mta" DEPEND="ssl? ( |