From d7ed2b01311f15ba54fe8ea872aab7d59ab2b193 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Fri, 29 Jan 2021 18:03:51 +0000 Subject: gentoo resync : 29.01.2021 --- mail-mta/Manifest.gz | Bin 2550 -> 2548 bytes mail-mta/exim/Manifest | 4 +- mail-mta/exim/exim-4.93.0.4-r1.ebuild | 591 -------------------- mail-mta/exim/exim-4.93.0.4-r2.ebuild | 593 ++++++++++++++++++++ mail-mta/exim/exim-4.94-r1.ebuild | 592 -------------------- mail-mta/exim/exim-4.94-r2.ebuild | 594 +++++++++++++++++++++ mail-mta/protonmail-bridge/Manifest | 4 +- .../protonmail-bridge-1.5.6.ebuild | 451 ---------------- .../protonmail-bridge-1.5.7.ebuild | 451 ++++++++++++++++ mail-mta/sendmail/Manifest | 2 +- mail-mta/sendmail/sendmail-8.16.1.ebuild | 29 +- 11 files changed, 1659 insertions(+), 1652 deletions(-) delete mode 100644 mail-mta/exim/exim-4.93.0.4-r1.ebuild create mode 100644 mail-mta/exim/exim-4.93.0.4-r2.ebuild delete mode 100644 mail-mta/exim/exim-4.94-r1.ebuild create mode 100644 mail-mta/exim/exim-4.94-r2.ebuild delete mode 100644 mail-mta/protonmail-bridge/protonmail-bridge-1.5.6.ebuild create mode 100644 mail-mta/protonmail-bridge/protonmail-bridge-1.5.7.ebuild (limited to 'mail-mta') diff --git a/mail-mta/Manifest.gz b/mail-mta/Manifest.gz index 181daec95b3b..23a2cdcd9f8a 100644 Binary files a/mail-mta/Manifest.gz and b/mail-mta/Manifest.gz differ diff --git a/mail-mta/exim/Manifest b/mail-mta/exim/Manifest index 3aca0f74a67f..89879070d698 100644 --- a/mail-mta/exim/Manifest +++ b/mail-mta/exim/Manifest @@ -26,6 +26,6 @@ DIST exim-4.94.tar.xz 1828824 BLAKE2B 3836ae6427830b16fa366f5ca35431144eb48b922b DIST exim-pdf-4.93.0.4.tar.xz 2069744 BLAKE2B 28730134293d87b16d672df66119ff97aaf2d796cf28842bb5bf6831a0be6a186a5cce503200b9fc985aaa14386053ca83c259625949634c5a28937b285247ca SHA512 929b4198a3e8764a64478e7ff5a9c7398ad1990114206b68494b1f1f563c23405c7b440e2f21a9f777e9e3cd3a3398d6faea3b882407f731ef3a767c27fd9361 DIST exim-pdf-4.94.tar.xz 2089804 BLAKE2B 08f4631e903f1344d76da8dc1dcfd122cd5963bb2efbd54a486e7cf95df9e7ef06aa31dead1243a007656f05c18993f3fda18ba16ba1fde9377ac33324d5fe99 SHA512 d56666b619ba850dfa68de90afc7435bae741d72d18b5837762781ba18032878323ad40978e0113d4b88a01fd7a1d07213e6a74c38d699371d62796b6c3c35cc DIST system_filter.exim.gz 3075 BLAKE2B d05e872b5cef377d29126cda03fc0a74c8777b2119b76ff43da6e8de808035eb9bfcb034a85d81824f135d484e864bfc0629fc1af2c228a7277d5ee7cf9cde79 SHA512 cb358d3ce2499a0bb5920d962a06f2af8486e55ec90c8c928bd8e3aefb279aa57f5f960d5adfcef68bd94110b405eaa144e9629cfe6014a529c79c544600bbf3 -EBUILD exim-4.93.0.4-r1.ebuild 14020 BLAKE2B 2d97b3d39774320271507fdf50f93d9dac88bdaa54b0d8387b2baeb6fff6baee9bc4185b86591f12053f3210b18514f027a6de9a103daad81d871fee837a9c7e SHA512 382c09462376ff6a156ede33316585c38e93a4e5474271f06bd141be20567af2df4e0a26539a219d09cd3b760a754dfc187fd75c712637cc60723b5d2e7f5526 -EBUILD exim-4.94-r1.ebuild 14071 BLAKE2B 45c3311c8b1b6f13c15d5d43bf0ed5713008955c39f29191e2890b97cbed568ea473c1ff41277006735d08ea2d0c410d8ed73457c367dc7fc26a64a7c5824028 SHA512 f1a8b2a59de39c586b1df3370750e9c2daf8cad753120e63edfcecd09471d146896007e7fa7b478c7fcdd908d9929a0dd693f30d323302a942736cf2c28028fd +EBUILD exim-4.93.0.4-r2.ebuild 14043 BLAKE2B f16a191151ed0ed32522c1291cfab414fc08978120cc0e92c967d73040a3d55528dd276d705dce334ffac22e8f217bda391084e6d1b6cb2d2ea6fff8cf8742df SHA512 517b16cf091b60d7ff03db68e17f243d1dd8a34b551d6539f1a01bfbec09584bef2fd4be05397557a592e7ac669709af9df0b6a230e889a930209eb53d7bc42f +EBUILD exim-4.94-r2.ebuild 14094 BLAKE2B 6209011bfe3f3ced3f3bf9e0d3d5113380cae164b3125df7baff787e48ef67532ae7c062152a7732e6d298643e0676c92d9990f6724dbeef16affecad24a0a05 SHA512 77b07c5901593e79ec75029252346e5225981efcd29f659906ff11f8df4390d8aeb88432507a3b5cc68b76a934b2a7a5e9dd277cabcf7dea1eae83aff2f5bd45 MISC metadata.xml 2457 BLAKE2B c1dcbaedd069b41c4cfb190806b44014229d53cf6d6f72e04b99dc91f223567cb4f30100792aae72658780da0579fa26e6fb8a0266565bcc0c307996d59ac3ed SHA512 9044abccd15525c7676fc218b62d9b663bd155482894eced9c0cfc8a22e8cd7353009adc75a9f3de15b14f267e6ee6b4f4c91d8bd9260931c0b9de6bf48c762f diff --git a/mail-mta/exim/exim-4.93.0.4-r1.ebuild b/mail-mta/exim/exim-4.93.0.4-r1.ebuild deleted file mode 100644 index 19d13cef361f..000000000000 --- a/mail-mta/exim/exim-4.93.0.4-r1.ebuild +++ /dev/null @@ -1,591 +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 ) - dkim? ( ssl !gnutls ) - gnutls? ( ssl ) - pkcs11? ( ssl ) - spf? ( exiscan-acl ) - srs? ( exiscan-acl ) -" -# 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. - -SDIR=$([[ ${PV} == *_rc* ]] && echo /test - [[ ${PV} == *.*.*.* ]] && echo /fixes) -COMM_URI="https://downloads.exim.org/exim4${SDIR}" - -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 ~arm64 ~hppa ~ia64 ppc ppc64 sparc x86 ~x86-solaris" - -COMMON_DEPEND=">=sys-apps/sed-4.0.5 - ( >=sys-libs/db-3.2:= =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[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[mta] - !net-mail/mailwrapper - >=net-mail/mailbase-0.00-r5 - virtual/logger - dcc? ( mail-filter/dcc ) - selinux? ( sec-policy/selinux-exim ) - " - -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 "${FILESDIR}"/exim-4.93-as-needed-ldflags.patch # 352265, 391279 - eapply -p0 "${FILESDIR}"/exim-4.76-crosscompile.patch # 266591 - eapply "${FILESDIR}"/exim-4.69-r1.27021.patch - eapply "${FILESDIR}"/exim-4.93-localscan_dlopen.patch - eapply -p2 "${FILESDIR}"/exim-4.93-radius.patch # 720364 - eapply "${FILESDIR}"/exim-4.93-CVE-2020-12783.patch # 722484 - eapply "${FILESDIR}"/exim-4.93-fno-common.patch # 723430 - - if use maildir ; then - eapply "${FILESDIR}"/exim-4.20-maildir.patch - else - eapply -p0 "${FILESDIR}"/exim-4.80-spool-mail-group.patch # 438606 - fi - - eapply_user - - # 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=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:" \ - 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 - if use !elibc_glibc && use !elibc_musl ; then - cat >> Makefile <<- EOC - EXTRALIBS_EXIM=-liconv - EOC - fi - - # 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 - LOOKUP_CDB=yes - LOOKUP_PASSWD=yes - LOOKUP_DSEARCH=yes - # keep include in CFLAGS because exim.h -> dbstuff.h -> db.h - CFLAGS += -I$(db_includedir ${DB_VERS}) - DBMLIB = -l$(db_libname ${DB_VERS}) - 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 - LOOKUP_INCLUDE += -I"${EPREFIX}"/usr/include/tirpc - LOOKUP_LIBS += -lnsl - 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 - cat >> Makefile <<- EOC - EXIM_MONITOR=eximon.bin - EOC - 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 - if use gnutls; then - echo "USE_GNUTLS=yes" >> Makefile - echo "USE_GNUTLS_PC=gnutls $(use dane && echo gnutls-dane)" \ - >> Makefile - use pkcs11 || echo "AVOID_GNUTLS_PKCS11=yes" >> Makefile - else - echo "USE_OPENSSL=yes" >> Makefile - echo "USE_OPENSSL_PC=openssl" >> Makefile - fi - else - echo "DISABLE_TLS=yes" >> Makefile - 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 - # DANE is enabled by default - sed -i -e 's:^SUPPORT_DANE=yes:# SUPPORT_DANE=yes:' Makefile || die - fi - - # DMARC - if use dmarc; then - cat >> Makefile <<- EOC - SUPPORT_DMARC=yes - EXTRALIBS_EXIM += -lopendmarc - 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 - - # 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:"\(.\+\)"::' \ - 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 dmarc ; then - einfo "DMARC support requires ${EROOT}/etc/exim/opendmarc.tlds" - einfo "you can populate this file with the contents downloaded from" - einfo " https://publicsuffix.org/list/public_suffix_list.dat" - 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" - 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.93.0.4-r2.ebuild b/mail-mta/exim/exim-4.93.0.4-r2.ebuild new file mode 100644 index 000000000000..b47b3f94f56d --- /dev/null +++ b/mail-mta/exim/exim-4.93.0.4-r2.ebuild @@ -0,0 +1,593 @@ +# Copyright 1999-2021 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 ) + dkim? ( ssl !gnutls ) + gnutls? ( ssl ) + pkcs11? ( ssl ) + spf? ( exiscan-acl ) + srs? ( exiscan-acl ) +" +# 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. + +SDIR=$([[ ${PV} == *_rc* ]] && echo /test + [[ ${PV} == *.*.*.* ]] && echo /fixes) +COMM_URI="https://downloads.exim.org/exim4${SDIR}" + +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 ~arm64 ~hppa ~ia64 ppc ppc64 sparc x86 ~x86-solaris" + +COMMON_DEPEND=">=sys-apps/sed-4.0.5 + ( >=sys-libs/db-3.2:= =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[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[mta] + !net-mail/mailwrapper + >=net-mail/mailbase-0.00-r5 + virtual/logger + dcc? ( mail-filter/dcc ) + selinux? ( sec-policy/selinux-exim ) + " + +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 "${FILESDIR}"/exim-4.93-as-needed-ldflags.patch # 352265, 391279 + eapply -p0 "${FILESDIR}"/exim-4.76-crosscompile.patch # 266591 + eapply "${FILESDIR}"/exim-4.69-r1.27021.patch + eapply "${FILESDIR}"/exim-4.93-localscan_dlopen.patch + eapply -p2 "${FILESDIR}"/exim-4.93-radius.patch # 720364 + eapply "${FILESDIR}"/exim-4.93-CVE-2020-12783.patch # 722484 + eapply "${FILESDIR}"/exim-4.93-fno-common.patch # 723430 + + if use maildir ; then + eapply "${FILESDIR}"/exim-4.20-maildir.patch + else + eapply -p0 "${FILESDIR}"/exim-4.80-spool-mail-group.patch # 438606 + fi + + eapply_user + + # 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=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:" \ + 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 + if use !elibc_glibc && use !elibc_musl ; then + cat >> Makefile <<- EOC + EXTRALIBS_EXIM=-liconv + EOC + fi + + # 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 + LOOKUP_CDB=yes + LOOKUP_PASSWD=yes + LOOKUP_DSEARCH=yes + # keep include in CFLAGS because exim.h -> dbstuff.h -> db.h + CFLAGS += -I$(db_includedir ${DB_VERS}) + DBMLIB = -l$(db_libname ${DB_VERS}) + 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 + LOOKUP_INCLUDE += -I"${EPREFIX}"/usr/include/tirpc + LOOKUP_LIBS += -lnsl + 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 + cat >> Makefile <<- EOC + EXIM_MONITOR=eximon.bin + EOC + 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 + if use gnutls; then + echo "USE_GNUTLS=yes" >> Makefile + echo "USE_GNUTLS_PC=gnutls $(use dane && echo gnutls-dane)" \ + >> Makefile + use pkcs11 || echo "AVOID_GNUTLS_PKCS11=yes" >> Makefile + else + echo "USE_OPENSSL=yes" >> Makefile + echo "USE_OPENSSL_PC=openssl" >> Makefile + fi + else + echo "DISABLE_TLS=yes" >> Makefile + 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 + # DANE is enabled by default + sed -i -e 's:^SUPPORT_DANE=yes:# SUPPORT_DANE=yes:' Makefile || die + fi + + # DMARC + if use dmarc; then + cat >> Makefile <<- EOC + SUPPORT_DMARC=yes + EXTRALIBS_EXIM += -lopendmarc + 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 + + # 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 + + if use pam; then + pamd_mimic system-auth exim auth account + fi + + # 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:"\(.\+\)"::' \ + 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 dmarc ; then + einfo "DMARC support requires ${EROOT}/etc/exim/opendmarc.tlds" + einfo "you can populate this file with the contents downloaded from" + einfo " https://publicsuffix.org/list/public_suffix_list.dat" + 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" + 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.94-r1.ebuild b/mail-mta/exim/exim-4.94-r1.ebuild deleted file mode 100644 index 52358f32bef5..000000000000 --- a/mail-mta/exim/exim-4.94-r1.ebuild +++ /dev/null @@ -1,592 +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 ) - dkim? ( ssl !gnutls ) - gnutls? ( ssl ) - pkcs11? ( ssl ) - spf? ( exiscan-acl ) - srs? ( exiscan-acl ) -" -# 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. - -SDIR=$([[ ${PV} == *_rc* ]] && echo /test - [[ ${PV} == *.*.*.* ]] && echo /fixes) -COMM_URI="https://downloads.exim.org/exim4${SDIR}" - -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 ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-solaris" - -COMMON_DEPEND=">=sys-apps/sed-4.0.5 - ( >=sys-libs/db-3.2:= =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[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[mta] - !net-mail/mailwrapper - >=net-mail/mailbase-0.00-r5 - virtual/logger - dcc? ( mail-filter/dcc ) - selinux? ( sec-policy/selinux-exim ) - " - -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 "${FILESDIR}"/exim-4.93-as-needed-ldflags.patch # 352265, 391279 - eapply -p0 "${FILESDIR}"/exim-4.76-crosscompile.patch # 266591 - eapply "${FILESDIR}"/exim-4.69-r1.27021.patch - eapply "${FILESDIR}"/exim-4.94-localscan_dlopen.patch - eapply -p2 "${FILESDIR}"/exim-4.94-taint-pam-expansion.patch # drop on NR - - if use maildir ; then - eapply "${FILESDIR}"/exim-4.94-maildir.patch - else - eapply -p0 "${FILESDIR}"/exim-4.80-spool-mail-group.patch # 438606 - fi - - eapply_user - - # 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=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:" \ - 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 - if use !elibc_glibc && use !elibc_musl ; then - cat >> Makefile <<- EOC - EXTRALIBS_EXIM=-liconv - EOC - fi - - # 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 - LOOKUP_CDB=yes - LOOKUP_PASSWD=yes - LOOKUP_DSEARCH=yes - # keep include in CFLAGS because exim.h -> dbstuff.h -> db.h - CFLAGS += -I$(db_includedir ${DB_VERS}) - DBMLIB = -l$(db_libname ${DB_VERS}) - 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 - LOOKUP_INCLUDE += -I"${EPREFIX}"/usr/include/tirpc - LOOKUP_LIBS += -lnsl - 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 - cat >> Makefile <<- EOC - EXIM_MONITOR=eximon.bin - EOC - 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 - if use gnutls; then - echo "USE_GNUTLS=yes" >> Makefile - echo "USE_GNUTLS_PC=gnutls $(use dane && echo gnutls-dane)" \ - >> Makefile - use pkcs11 || echo "AVOID_GNUTLS_PKCS11=yes" >> Makefile - else - echo "USE_OPENSSL=yes" >> Makefile - echo "USE_OPENSSL_PC=openssl" >> Makefile - fi - else - echo "DISABLE_TLS=yes" >> Makefile - 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 - # DANE is enabled by default - sed -i -e 's:^SUPPORT_DANE=yes:# SUPPORT_DANE=yes:' Makefile || die - fi - - # DMARC - if use dmarc; then - cat >> Makefile <<- EOC - SUPPORT_DMARC=yes - EXTRALIBS_EXIM += -lopendmarc - 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 - - # 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:"\(.\+\)"::' \ - 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 dmarc ; then - einfo "DMARC support requires ${EROOT}/etc/exim/opendmarc.tlds" - einfo "you can populate this file with the contents downloaded from" - einfo " https://publicsuffix.org/list/public_suffix_list.dat" - 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" - 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" - einfo - elog "Note that \$local_part is renamed to \$local_part_data, please" - elog "update your affected sections, such as local_delivery transport" -} diff --git a/mail-mta/exim/exim-4.94-r2.ebuild b/mail-mta/exim/exim-4.94-r2.ebuild new file mode 100644 index 000000000000..5fb494208b3d --- /dev/null +++ b/mail-mta/exim/exim-4.94-r2.ebuild @@ -0,0 +1,594 @@ +# Copyright 1999-2021 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 ) + dkim? ( ssl !gnutls ) + gnutls? ( ssl ) + pkcs11? ( ssl ) + spf? ( exiscan-acl ) + srs? ( exiscan-acl ) +" +# 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. + +SDIR=$([[ ${PV} == *_rc* ]] && echo /test + [[ ${PV} == *.*.*.* ]] && echo /fixes) +COMM_URI="https://downloads.exim.org/exim4${SDIR}" + +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 ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-solaris" + +COMMON_DEPEND=">=sys-apps/sed-4.0.5 + ( >=sys-libs/db-3.2:= =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[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[mta] + !net-mail/mailwrapper + >=net-mail/mailbase-0.00-r5 + virtual/logger + dcc? ( mail-filter/dcc ) + selinux? ( sec-policy/selinux-exim ) + " + +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 "${FILESDIR}"/exim-4.93-as-needed-ldflags.patch # 352265, 391279 + eapply -p0 "${FILESDIR}"/exim-4.76-crosscompile.patch # 266591 + eapply "${FILESDIR}"/exim-4.69-r1.27021.patch + eapply "${FILESDIR}"/exim-4.94-localscan_dlopen.patch + eapply -p2 "${FILESDIR}"/exim-4.94-taint-pam-expansion.patch # drop on NR + + if use maildir ; then + eapply "${FILESDIR}"/exim-4.94-maildir.patch + else + eapply -p0 "${FILESDIR}"/exim-4.80-spool-mail-group.patch # 438606 + fi + + eapply_user + + # 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=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:" \ + 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 + if use !elibc_glibc && use !elibc_musl ; then + cat >> Makefile <<- EOC + EXTRALIBS_EXIM=-liconv + EOC + fi + + # 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 + LOOKUP_CDB=yes + LOOKUP_PASSWD=yes + LOOKUP_DSEARCH=yes + # keep include in CFLAGS because exim.h -> dbstuff.h -> db.h + CFLAGS += -I$(db_includedir ${DB_VERS}) + DBMLIB = -l$(db_libname ${DB_VERS}) + 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 + LOOKUP_INCLUDE += -I"${EPREFIX}"/usr/include/tirpc + LOOKUP_LIBS += -lnsl + 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 + cat >> Makefile <<- EOC + EXIM_MONITOR=eximon.bin + EOC + 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 + if use gnutls; then + echo "USE_GNUTLS=yes" >> Makefile + echo "USE_GNUTLS_PC=gnutls $(use dane && echo gnutls-dane)" \ + >> Makefile + use pkcs11 || echo "AVOID_GNUTLS_PKCS11=yes" >> Makefile + else + echo "USE_OPENSSL=yes" >> Makefile + echo "USE_OPENSSL_PC=openssl" >> Makefile + fi + else + echo "DISABLE_TLS=yes" >> Makefile + 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 + # DANE is enabled by default + sed -i -e 's:^SUPPORT_DANE=yes:# SUPPORT_DANE=yes:' Makefile || die + fi + + # DMARC + if use dmarc; then + cat >> Makefile <<- EOC + SUPPORT_DMARC=yes + EXTRALIBS_EXIM += -lopendmarc + 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 + + # 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 + + if use pam; then + pamd_mimic system-auth exim auth account + fi + + # 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:"\(.\+\)"::' \ + 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 dmarc ; then + einfo "DMARC support requires ${EROOT}/etc/exim/opendmarc.tlds" + einfo "you can populate this file with the contents downloaded from" + einfo " https://publicsuffix.org/list/public_suffix_list.dat" + 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" + 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" + einfo + elog "Note that \$local_part is renamed to \$local_part_data, please" + elog "update your affected sections, such as local_delivery transport" +} diff --git a/mail-mta/protonmail-bridge/Manifest b/mail-mta/protonmail-bridge/Manifest index 7d86371362ac..2627e554558a 100644 --- a/mail-mta/protonmail-bridge/Manifest +++ b/mail-mta/protonmail-bridge/Manifest @@ -373,7 +373,7 @@ DIST gopkg.in%2Fyaml.v3%2F@v%2Fv3.0.0-20191120175047-4206685974f2.mod 95 BLAKE2B DIST gopkg.in%2Fyaml.v3%2F@v%2Fv3.0.0-20200313102051-9f266ea9e77c.mod 95 BLAKE2B fbb87f0644ec9da5d4386358d23cdb15b0d23e8212e712f16f338455a3a0ad19fbfd63e92c955c359237ddfa8bb76d6d08280eead24d321668431891eca1e8ab SHA512 307ca9123efc577ca04828996ee9d8edbb51794ccb4b8d9f169ba689e7276aa5f6ae106a04b22b7fab853ffacfebcbf74468b64eaefd57445864c1fbc77fad9d DIST gopkg.in%2Fyaml.v3%2F@v%2Fv3.0.0-20200313102051-9f266ea9e77c.zip 101467 BLAKE2B 8bb0aec8e693a4c0da59f1931e1fdcf6f94a236faba149d5af91e87284f39c693d20be65248eecde739cb555e371804fa6c723a56c69e6d02a347ba908e968b1 SHA512 bee7757d760f5ba1b9f7523af358652a5cb65f2b0064da097f78450871b2636efcbab0298a9871bbb3ce8012bf95a155949251d4f61464dde510097b936b47a8 DIST protonmail-bridge-1.5.4.tar.gz 1838395 BLAKE2B b81cc14f7da259941f4bdfae0f3e06782e22ce959193a34873aea06480658b3cde6e73f01d6796097d8e103b85d32ac845f371faf17aca7210e45667f74b0325 SHA512 83621ceaac54190b9143f67c50ae98ec3ea96bff399f415838561d64cf277e772925793af701b5f493460fb0edced4383253dc5a24264f4a89e30417f12de49f -DIST protonmail-bridge-1.5.6.tar.gz 1843107 BLAKE2B b61a7ca5fadaea9551eb801482a5fe6d4979b67ed61ec421cd8c7a43b4e9d8aef72684f82b4333ea73d119cc232188230686b67d66d662a71539837d0a687dbf SHA512 345091ff5f09e357daea7fb05e04be2803a6632c4cb3ba5c6475799ed5a193e76d23f540a8f77f88fed3098e27dda6ff4334aa9a96eb2c6b88333a8ff33d99d2 +DIST protonmail-bridge-1.5.7.tar.gz 1843039 BLAKE2B 302479620048718eb2f430ad45aa08dbdc94c0db3e32fc7e9b813097fe12a19cb8b1839e32ad0570fe3d350e710612774e8019c60924a6005883e31a7c70621a SHA512 9a0baee9ba4afbf1ef79cf8af36cf971996a3057b1f1cb407cdbf56ac33c0e82b4074aaab9729dc1c924a414ef8551d1b6d7fc8addf4f21d7426ff097fc156c8 EBUILD protonmail-bridge-1.5.4.ebuild 21425 BLAKE2B e863898ac05b61ba37eeb97a4ae0cb3caae5ab16c2288771ec13d0de3287c1b0fd0a1446e79ca46d63f1953148d6b73efa54f756916a4b8d59845cb92464d735 SHA512 12587129d0d9db2aaa32c66262f51b8dbf1fd39442a09221a01cacb59080d6bd53bbdc56558dad630e0831d912631c086040dee4fefbaa29517d2be4adf0992b -EBUILD protonmail-bridge-1.5.6.ebuild 21832 BLAKE2B 819e368d8a8c88a14fa0e40ce4712bf45b5dae1544e7f4563a3f115c5a4cf7475b5619da337c9dbcbda48d6f289a98b324065e360133e30e9792e7fb5acdb48d SHA512 86204433cfbfe790c4d34c76ff3a5ac3c17af489f394898e476d18bfa82b7b53e9d633e3903c3074ada06cf8d64ab3cc2e6715de451882f1c9d2f5287b0546c7 +EBUILD protonmail-bridge-1.5.7.ebuild 21832 BLAKE2B 819e368d8a8c88a14fa0e40ce4712bf45b5dae1544e7f4563a3f115c5a4cf7475b5619da337c9dbcbda48d6f289a98b324065e360133e30e9792e7fb5acdb48d SHA512 86204433cfbfe790c4d34c76ff3a5ac3c17af489f394898e476d18bfa82b7b53e9d633e3903c3074ada06cf8d64ab3cc2e6715de451882f1c9d2f5287b0546c7 MISC metadata.xml 618 BLAKE2B a392fa79076ac6eed79581e425edc46eeaa42e4ff3193fe23845062f4de9e8e9edc067473724707ce07025973f0942bdebc94b10c7f02f1e477835ce969ab556 SHA512 813f43dcdec361b1fd0f354245e7572ef2061500bea09fcf2712c1d44883cfadbd0c37dcf960d5dc34c848530a3dd80abaeb6b5da26fbb81363116ec737a1c84 diff --git a/mail-mta/protonmail-bridge/protonmail-bridge-1.5.6.ebuild b/mail-mta/protonmail-bridge/protonmail-bridge-1.5.6.ebuild deleted file mode 100644 index ac6c8951fc6f..000000000000 --- a/mail-mta/protonmail-bridge/protonmail-bridge-1.5.6.ebuild +++ /dev/null @@ -1,451 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -inherit go-module systemd xdg-utils - -EGO_SUM=( - "github.com/0xAX/notificator v0.0.0-20191016112426-3962a5ea8da1" - "github.com/0xAX/notificator v0.0.0-20191016112426-3962a5ea8da1/go.mod" - "github.com/AndreasBriese/bbloom v0.0.0-20190306092124-e2d15f34fcf9/go.mod" - "github.com/BurntSushi/toml v0.3.1/go.mod" - "github.com/CloudyKit/fastprinter v0.0.0-20200109182630-33d98a066a53/go.mod" - "github.com/CloudyKit/jet/v3 v3.0.0/go.mod" - "github.com/Joker/hpp v1.0.0/go.mod" - "github.com/Masterminds/semver/v3 v3.1.0" - "github.com/Masterminds/semver/v3 v3.1.0/go.mod" - "github.com/ProtonMail/bcrypt v0.0.0-20170924085257-7509ea014998" - "github.com/ProtonMail/bcrypt v0.0.0-20170924085257-7509ea014998/go.mod" - "github.com/ProtonMail/crypto v0.0.0-20200818122824-ed5d25e28db8" - "github.com/ProtonMail/crypto v0.0.0-20200818122824-ed5d25e28db8/go.mod" - "github.com/ProtonMail/docker-credential-helpers v1.1.0" - "github.com/ProtonMail/docker-credential-helpers v1.1.0/go.mod" - "github.com/ProtonMail/go-appdir v1.1.0" - "github.com/ProtonMail/go-appdir v1.1.0/go.mod" - "github.com/ProtonMail/go-apple-mobileconfig v0.0.0-20160701194735-7ea9927a11f6" - "github.com/ProtonMail/go-apple-mobileconfig v0.0.0-20160701194735-7ea9927a11f6/go.mod" - "github.com/ProtonMail/go-autostart v0.0.0-20181114175602-c5272053443a" - "github.com/ProtonMail/go-autostart v0.0.0-20181114175602-c5272053443a/go.mod" - "github.com/ProtonMail/go-imap v0.0.0-20201228133358-4db68cea0cac" - "github.com/ProtonMail/go-imap v0.0.0-20201228133358-4db68cea0cac/go.mod" - "github.com/ProtonMail/go-imap-id v0.0.0-20190926060100-f94a56b9ecde" - "github.com/ProtonMail/go-imap-id v0.0.0-20190926060100-f94a56b9ecde/go.mod" - "github.com/ProtonMail/go-mime v0.0.0-20190923161245-9b5a4261663a" - "github.com/ProtonMail/go-mime v0.0.0-20190923161245-9b5a4261663a/go.mod" - "github.com/ProtonMail/go-rfc5322 v0.4.0" - "github.com/ProtonMail/go-rfc5322 v0.4.0/go.mod" - "github.com/ProtonMail/go-rfc5322 v0.5.0" - "github.com/ProtonMail/go-rfc5322 v0.5.0/go.mod" - "github.com/ProtonMail/go-vcard v0.0.0-20180326232728-33aaa0a0c8a5" - "github.com/ProtonMail/go-vcard v0.0.0-20180326232728-33aaa0a0c8a5/go.mod" - "github.com/ProtonMail/gopenpgp/v2 v2.0.1" - "github.com/ProtonMail/gopenpgp/v2 v2.0.1/go.mod" - "github.com/PuerkitoBio/goquery v1.5.1" - "github.com/PuerkitoBio/goquery v1.5.1/go.mod" - "github.com/Shopify/goreferrer v0.0.0-20181106222321-ec9c9a553398/go.mod" - "github.com/abiosoft/ishell v2.0.0+incompatible" - "github.com/abiosoft/ishell v2.0.0+incompatible/go.mod" - "github.com/abiosoft/readline v0.0.0-20180607040430-155bce2042db" - "github.com/abiosoft/readline v0.0.0-20180607040430-155bce2042db/go.mod" - "github.com/ajg/form v1.5.1/go.mod" - "github.com/allan-simon/go-singleinstance v0.0.0-20160830203053-79edcfdc2dfc" - "github.com/allan-simon/go-singleinstance v0.0.0-20160830203053-79edcfdc2dfc/go.mod" - "github.com/andybalholm/cascadia v1.1.0" - "github.com/andybalholm/cascadia v1.1.0/go.mod" - "github.com/antlr/antlr4 v0.0.0-20201029161626-9a95f0cc3d7c" - "github.com/antlr/antlr4 v0.0.0-20201029161626-9a95f0cc3d7c/go.mod" - "github.com/armon/consul-api v0.0.0-20180202201655-eb2c6b5be1b6/go.mod" - "github.com/aymerick/raymond v2.0.3-0.20180322193309-b565731e1464+incompatible/go.mod" - "github.com/chzyer/logex v1.1.10" - "github.com/chzyer/logex v1.1.10/go.mod" - "github.com/chzyer/test v0.0.0-20180213035817-a1ea475d72b1" - "github.com/chzyer/test v0.0.0-20180213035817-a1ea475d72b1/go.mod" - "github.com/codegangsta/inject v0.0.0-20150114235600-33e0aa1cb7c0/go.mod" - "github.com/coreos/etcd v3.3.10+incompatible/go.mod" - "github.com/coreos/go-etcd v2.0.0+incompatible/go.mod" - "github.com/coreos/go-semver v0.2.0/go.mod" - "github.com/cpuguy83/go-md2man v1.0.10" - "github.com/cpuguy83/go-md2man v1.0.10/go.mod" - "github.com/cpuguy83/go-md2man/v2 v2.0.0-20190314233015-f79a8a8ca69d" - "github.com/cpuguy83/go-md2man/v2 v2.0.0-20190314233015-f79a8a8ca69d/go.mod" - "github.com/creack/pty v1.1.9/go.mod" - "github.com/cucumber/godog v0.8.1" - "github.com/cucumber/godog v0.8.1/go.mod" - "github.com/danieljoos/wincred v1.1.0" - "github.com/danieljoos/wincred v1.1.0/go.mod" - "github.com/davecgh/go-spew v1.1.0/go.mod" - "github.com/davecgh/go-spew v1.1.1" - "github.com/davecgh/go-spew v1.1.1/go.mod" - "github.com/dgraph-io/badger v1.6.0/go.mod" - "github.com/dgrijalva/jwt-go v3.2.0+incompatible/go.mod" - "github.com/dgryski/go-farm v0.0.0-20190423205320-6a90982ecee2/go.mod" - "github.com/dustin/go-humanize v1.0.0/go.mod" - "github.com/eknkc/amber v0.0.0-20171010120322-cdade1c07385/go.mod" - "github.com/emersion/go-imap-appendlimit v0.0.0-20190308131241-25671c986a6a" - "github.com/emersion/go-imap-appendlimit v0.0.0-20190308131241-25671c986a6a/go.mod" - "github.com/emersion/go-imap-idle v0.0.0-20200601154248-f05f54664cc4" - "github.com/emersion/go-imap-idle v0.0.0-20200601154248-f05f54664cc4/go.mod" - "github.com/emersion/go-imap-move v0.0.0-20190710073258-6e5a51a5b342" - "github.com/emersion/go-imap-move v0.0.0-20190710073258-6e5a51a5b342/go.mod" - "github.com/emersion/go-imap-quota v0.0.0-20200423100218-dcfd1b7d2b41" - "github.com/emersion/go-imap-quota v0.0.0-20200423100218-dcfd1b7d2b41/go.mod" - "github.com/emersion/go-imap-unselect v0.0.0-20171113212723-b985794e5f26" - "github.com/emersion/go-imap-unselect v0.0.0-20171113212723-b985794e5f26/go.mod" - "github.com/emersion/go-mbox v1.0.2" - "github.com/emersion/go-mbox v1.0.2/go.mod" - "github.com/emersion/go-message v0.11.1/go.mod" - "github.com/emersion/go-message v0.12.1-0.20200903165315-e1abe21f389a" - "github.com/emersion/go-message v0.12.1-0.20200903165315-e1abe21f389a/go.mod" - "github.com/emersion/go-message v0.12.1-0.20201221184100-40c3f864532b" - "github.com/emersion/go-message v0.12.1-0.20201221184100-40c3f864532b/go.mod" - "github.com/emersion/go-sasl v0.0.0-20191210011802-430746ea8b9b/go.mod" - "github.com/emersion/go-sasl v0.0.0-20200509203442-7bfe0ed36a21" - "github.com/emersion/go-sasl v0.0.0-20200509203442-7bfe0ed36a21/go.mod" - "github.com/emersion/go-smtp v0.14.0" - "github.com/emersion/go-smtp v0.14.0/go.mod" - "github.com/emersion/go-textwrapper v0.0.0-20160606182133-d0e65e56babe" - "github.com/emersion/go-textwrapper v0.0.0-20160606182133-d0e65e56babe/go.mod" - "github.com/emersion/go-textwrapper v0.0.0-20200911093747-65d896831594" - "github.com/emersion/go-textwrapper v0.0.0-20200911093747-65d896831594/go.mod" - "github.com/emersion/go-vcard v0.0.0-20190105225839-8856043f13c5" - "github.com/emersion/go-vcard v0.0.0-20190105225839-8856043f13c5/go.mod" - "github.com/etcd-io/bbolt v1.3.3/go.mod" - "github.com/fasthttp-contrib/websocket v0.0.0-20160511215533-1f3b11f56072/go.mod" - "github.com/fatih/color v1.9.0" - "github.com/fatih/color v1.9.0/go.mod" - "github.com/fatih/structs v1.1.0/go.mod" - "github.com/flynn-archive/go-shlex v0.0.0-20150515145356-3f9db97f8568" - "github.com/flynn-archive/go-shlex v0.0.0-20150515145356-3f9db97f8568/go.mod" - "github.com/fsnotify/fsnotify v1.4.7/go.mod" - "github.com/gavv/httpexpect v2.0.0+incompatible/go.mod" - "github.com/getsentry/sentry-go v0.8.0" - "github.com/getsentry/sentry-go v0.8.0/go.mod" - "github.com/gin-contrib/sse v0.0.0-20190301062529-5545eab6dad3/go.mod" - "github.com/gin-gonic/gin v1.4.0/go.mod" - "github.com/go-check/check v0.0.0-20180628173108-788fd7840127/go.mod" - "github.com/go-errors/errors v1.0.1" - "github.com/go-errors/errors v1.0.1/go.mod" - "github.com/go-martini/martini v0.0.0-20170121215854-22fa46961aab/go.mod" - "github.com/go-resty/resty/v2 v2.3.0" - "github.com/go-resty/resty/v2 v2.3.0/go.mod" - "github.com/gobwas/httphead v0.0.0-20180130184737-2c6c146eadee/go.mod" - "github.com/gobwas/pool v0.2.0/go.mod" - "github.com/gobwas/ws v1.0.2/go.mod" - "github.com/golang/mock v1.4.4" - "github.com/golang/mock v1.4.4/go.mod" - "github.com/golang/protobuf v1.2.0/go.mod" - "github.com/golang/protobuf v1.3.1/go.mod" - "github.com/gomodule/redigo v1.7.1-0.20190724094224-574c33c3df38/go.mod" - "github.com/google/go-cmp v0.4.0/go.mod" - "github.com/google/go-cmp v0.5.1" - "github.com/google/go-cmp v0.5.1/go.mod" - "github.com/google/go-querystring v1.0.0/go.mod" - "github.com/google/gofuzz v1.0.0/go.mod" - "github.com/google/uuid v1.1.1" - "github.com/google/uuid v1.1.1/go.mod" - "github.com/gopherjs/gopherjs v0.0.0-20181017120253-0766667cb4d1/go.mod" - "github.com/gopherjs/gopherjs v0.0.0-20190411002643-bd77b112433e/go.mod" - "github.com/gopherjs/gopherjs v0.0.0-20190430165422-3e4dfb77656c" - "github.com/gopherjs/gopherjs v0.0.0-20190430165422-3e4dfb77656c/go.mod" - "github.com/gorilla/websocket v1.4.1/go.mod" - "github.com/hashicorp/errwrap v1.0.0" - "github.com/hashicorp/errwrap v1.0.0/go.mod" - "github.com/hashicorp/go-multierror v1.1.0" - "github.com/hashicorp/go-multierror v1.1.0/go.mod" - "github.com/hashicorp/go-version v1.2.0/go.mod" - "github.com/hashicorp/hcl v1.0.0/go.mod" - "github.com/hpcloud/tail v1.0.0/go.mod" - "github.com/imkira/go-interpol v1.1.0/go.mod" - "github.com/inconshreveable/mousetrap v1.0.0/go.mod" - "github.com/iris-contrib/blackfriday v2.0.0+incompatible/go.mod" - "github.com/iris-contrib/go.uuid v2.0.0+incompatible/go.mod" - "github.com/iris-contrib/jade v1.1.3/go.mod" - "github.com/iris-contrib/pongo2 v0.0.1/go.mod" - "github.com/iris-contrib/schema v0.0.1/go.mod" - "github.com/jaytaylor/html2text v0.0.0-20200412013138-3577fbdbcff7" - "github.com/jaytaylor/html2text v0.0.0-20200412013138-3577fbdbcff7/go.mod" - "github.com/json-iterator/go v1.1.6/go.mod" - "github.com/json-iterator/go v1.1.9/go.mod" - "github.com/jtolds/gls v4.20.0+incompatible/go.mod" - "github.com/k0kubun/colorstring v0.0.0-20150214042306-9440f1994b88/go.mod" - "github.com/kardianos/osext v0.0.0-20190222173326-2bc1f35cddc0" - "github.com/kardianos/osext v0.0.0-20190222173326-2bc1f35cddc0/go.mod" - "github.com/kataras/golog v0.0.10/go.mod" - "github.com/kataras/iris/v12 v12.1.8/go.mod" - "github.com/kataras/neffos v0.0.14/go.mod" - "github.com/kataras/pio v0.0.2/go.mod" - "github.com/kataras/sitemap v0.0.5/go.mod" - "github.com/keybase/go-keychain v0.0.0-20200502122510-cda31fe0c86d" - "github.com/keybase/go-keychain v0.0.0-20200502122510-cda31fe0c86d/go.mod" - "github.com/keybase/go.dbus v0.0.0-20200324223359-a94be52c0b03/go.mod" - "github.com/klauspost/compress v1.8.2/go.mod" - "github.com/klauspost/compress v1.9.7/go.mod" - "github.com/klauspost/cpuid v1.2.1/go.mod" - "github.com/konsorten/go-windows-terminal-sequences v1.0.1/go.mod" - "github.com/konsorten/go-windows-terminal-sequences v1.0.2/go.mod" - "github.com/kr/pretty v0.1.0/go.mod" - "github.com/kr/pty v1.1.1/go.mod" - "github.com/kr/text v0.1.0/go.mod" - "github.com/kr/text v0.2.0" - "github.com/kr/text v0.2.0/go.mod" - "github.com/labstack/echo/v4 v4.1.11/go.mod" - "github.com/labstack/gommon v0.3.0/go.mod" - "github.com/logrusorgru/aurora v2.0.3+incompatible" - "github.com/logrusorgru/aurora v2.0.3+incompatible/go.mod" - "github.com/magiconair/properties v1.8.0/go.mod" - "github.com/martinlindhe/base36 v1.0.0" - "github.com/martinlindhe/base36 v1.0.0/go.mod" - "github.com/martinlindhe/base36 v1.1.0/go.mod" - "github.com/mattn/go-colorable v0.1.2/go.mod" - "github.com/mattn/go-colorable v0.1.4" - "github.com/mattn/go-colorable v0.1.4/go.mod" - "github.com/mattn/go-isatty v0.0.7/go.mod" - "github.com/mattn/go-isatty v0.0.8/go.mod" - "github.com/mattn/go-isatty v0.0.9/go.mod" - "github.com/mattn/go-isatty v0.0.11" - "github.com/mattn/go-isatty v0.0.11/go.mod" - "github.com/mattn/go-runewidth v0.0.7/go.mod" - "github.com/mattn/go-runewidth v0.0.9" - "github.com/mattn/go-runewidth v0.0.9/go.mod" - "github.com/mattn/goveralls v0.0.2/go.mod" - "github.com/mediocregopher/radix/v3 v3.4.2/go.mod" - "github.com/microcosm-cc/bluemonday v1.0.2/go.mod" - "github.com/miekg/dns v1.1.30" - "github.com/miekg/dns v1.1.30/go.mod" - "github.com/mitchellh/go-homedir v1.1.0/go.mod" - "github.com/mitchellh/mapstructure v1.1.2/go.mod" - "github.com/modern-go/concurrent v0.0.0-20180228061459-e0a39a4cb421/go.mod" - "github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd/go.mod" - "github.com/modern-go/reflect2 v0.0.0-20180701023420-4b7aa43c6742/go.mod" - "github.com/modern-go/reflect2 v1.0.1/go.mod" - "github.com/moul/http2curl v1.0.0/go.mod" - "github.com/myesui/uuid v1.0.0" - "github.com/myesui/uuid v1.0.0/go.mod" - "github.com/nats-io/jwt v0.3.0/go.mod" - "github.com/nats-io/nats.go v1.9.1/go.mod" - "github.com/nats-io/nkeys v0.1.0/go.mod" - "github.com/nats-io/nuid v1.0.1/go.mod" - "github.com/niemeyer/pretty v0.0.0-20200227124842-a10e7caefd8e" - "github.com/niemeyer/pretty v0.0.0-20200227124842-a10e7caefd8e/go.mod" - "github.com/nsf/jsondiff v0.0.0-20200515183724-f29ed568f4ce" - "github.com/nsf/jsondiff v0.0.0-20200515183724-f29ed568f4ce/go.mod" - "github.com/olekukonko/tablewriter v0.0.4" - "github.com/olekukonko/tablewriter v0.0.4/go.mod" - "github.com/onsi/ginkgo v1.6.0/go.mod" - "github.com/onsi/ginkgo v1.10.3/go.mod" - "github.com/onsi/gomega v1.7.1/go.mod" - "github.com/pelletier/go-toml v1.2.0/go.mod" - "github.com/pingcap/errors v0.11.4" - "github.com/pingcap/errors v0.11.4/go.mod" - "github.com/pkg/errors v0.8.1/go.mod" - "github.com/pkg/errors v0.9.1" - "github.com/pkg/errors v0.9.1/go.mod" - "github.com/pmezard/go-difflib v1.0.0" - "github.com/pmezard/go-difflib v1.0.0/go.mod" - "github.com/russross/blackfriday v1.5.2" - "github.com/russross/blackfriday v1.5.2/go.mod" - "github.com/russross/blackfriday/v2 v2.0.1" - "github.com/russross/blackfriday/v2 v2.0.1/go.mod" - "github.com/ryanuber/columnize v2.1.0+incompatible/go.mod" - "github.com/schollz/closestmatch v2.1.0+incompatible/go.mod" - "github.com/sergi/go-diff v1.0.0/go.mod" - "github.com/shurcooL/sanitized_anchor_name v1.0.0" - "github.com/shurcooL/sanitized_anchor_name v1.0.0/go.mod" - "github.com/sirupsen/logrus v1.4.1/go.mod" - "github.com/sirupsen/logrus v1.4.2/go.mod" - "github.com/sirupsen/logrus v1.7.0" - "github.com/sirupsen/logrus v1.7.0/go.mod" - "github.com/skratchdot/open-golang v0.0.0-20200116055534-eef842397966" - "github.com/skratchdot/open-golang v0.0.0-20200116055534-eef842397966/go.mod" - "github.com/smartystreets/assertions v0.0.0-20180927180507-b2de0cb4f26d/go.mod" - "github.com/smartystreets/goconvey v1.6.4/go.mod" - "github.com/spf13/afero v1.1.2/go.mod" - "github.com/spf13/cast v1.3.0/go.mod" - "github.com/spf13/cobra v0.0.5/go.mod" - "github.com/spf13/jwalterweatherman v1.0.0/go.mod" - "github.com/spf13/pflag v1.0.3/go.mod" - "github.com/spf13/viper v1.3.2/go.mod" - "github.com/ssor/bom v0.0.0-20170718123548-6386211fdfcf" - "github.com/ssor/bom v0.0.0-20170718123548-6386211fdfcf/go.mod" - "github.com/stretchr/objx v0.1.0/go.mod" - "github.com/stretchr/objx v0.1.1/go.mod" - "github.com/stretchr/objx v0.2.0" - "github.com/stretchr/objx v0.2.0/go.mod" - "github.com/stretchr/testify v1.2.2/go.mod" - "github.com/stretchr/testify v1.3.0/go.mod" - "github.com/stretchr/testify v1.4.0/go.mod" - "github.com/stretchr/testify v1.5.1/go.mod" - "github.com/stretchr/testify v1.6.1" - "github.com/stretchr/testify v1.6.1/go.mod" - "github.com/therecipe/qt v0.0.0-20200701200531-7f61353ee73e" - "github.com/therecipe/qt v0.0.0-20200701200531-7f61353ee73e/go.mod" - "github.com/twinj/uuid v1.0.0" - "github.com/twinj/uuid v1.0.0/go.mod" - "github.com/ugorji/go v1.1.4/go.mod" - "github.com/ugorji/go v1.1.7/go.mod" - "github.com/ugorji/go/codec v0.0.0-20181204163529-d75b2dcb6bc8/go.mod" - "github.com/ugorji/go/codec v1.1.7/go.mod" - "github.com/urfave/cli v1.22.4" - "github.com/urfave/cli v1.22.4/go.mod" - "github.com/urfave/negroni v1.0.0/go.mod" - "github.com/valyala/bytebufferpool v1.0.0/go.mod" - "github.com/valyala/fasthttp v1.6.0/go.mod" - "github.com/valyala/fasttemplate v1.0.1/go.mod" - "github.com/valyala/tcplisten v0.0.0-20161114210144-ceec8f93295a/go.mod" - "github.com/xeipuuv/gojsonpointer v0.0.0-20180127040702-4e3ac2762d5f/go.mod" - "github.com/xeipuuv/gojsonreference v0.0.0-20180127040603-bd5ef7bd5415/go.mod" - "github.com/xeipuuv/gojsonschema v1.2.0/go.mod" - "github.com/xordataexchange/crypt v0.0.3-0.20170626215501-b2862e3d0a77/go.mod" - "github.com/yalp/jsonpath v0.0.0-20180802001716-5cc68e5049a0/go.mod" - "github.com/yudai/gojsondiff v1.0.0/go.mod" - "github.com/yudai/golcs v0.0.0-20170316035057-ecda9a501e82/go.mod" - "github.com/yudai/pp v2.0.1+incompatible/go.mod" - "go.etcd.io/bbolt v1.3.5" - "go.etcd.io/bbolt v1.3.5/go.mod" - "golang.org/x/mod v0.1.1-0.20191105210325-c90efee705ee/go.mod" - "golang.org/x/net v0.0.0-20180218175443-cbe0f9307d01/go.mod" - "golang.org/x/net v0.0.0-20180906233101-161cd47e91fd/go.mod" - "golang.org/x/net v0.0.0-20181220203305-927f97764cc3/go.mod" - "golang.org/x/net v0.0.0-20190311183353-d8887717615a/go.mod" - "golang.org/x/net v0.0.0-20190327091125-710a502c58a2/go.mod" - "golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod" - "golang.org/x/net v0.0.0-20190420063019-afa5a82059c6/go.mod" - "golang.org/x/net v0.0.0-20190503192946-f4e77d36d62c/go.mod" - "golang.org/x/net v0.0.0-20190620200207-3b0461eec859/go.mod" - "golang.org/x/net v0.0.0-20190827160401-ba9fcec4b297/go.mod" - "golang.org/x/net v0.0.0-20190923162816-aa69164e4478/go.mod" - "golang.org/x/net v0.0.0-20191209160850-c0dbc17a3553/go.mod" - "golang.org/x/net v0.0.0-20200202094626-16171245cfb2/go.mod" - "golang.org/x/net v0.0.0-20200513185701-a91f0712d120/go.mod" - "golang.org/x/net v0.0.0-20200707034311-ab3426394381" - "golang.org/x/net v0.0.0-20200707034311-ab3426394381/go.mod" - "golang.org/x/sync v0.0.0-20180314180146-1d60e4601c6f/go.mod" - "golang.org/x/sync v0.0.0-20190423024810-112230192c58" - "golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod" - "golang.org/x/sync v0.0.0-20190911185100-cd5d95a43a6e" - "golang.org/x/sync v0.0.0-20190911185100-cd5d95a43a6e/go.mod" - "golang.org/x/sys v0.0.0-20180905080454-ebe1bf3edb33/go.mod" - "golang.org/x/sys v0.0.0-20180909124046-d0be0721c37e/go.mod" - "golang.org/x/sys v0.0.0-20181205085412-a5c9d58dba9a/go.mod" - "golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod" - "golang.org/x/sys v0.0.0-20190222072716-a9d3bda3a223/go.mod" - "golang.org/x/sys v0.0.0-20190412213103-97732733099d/go.mod" - "golang.org/x/sys v0.0.0-20190419153524-e8e3143a4f4a/go.mod" - "golang.org/x/sys v0.0.0-20190422165155-953cdadca894/go.mod" - "golang.org/x/sys v0.0.0-20190626221950-04f50cda93cb/go.mod" - "golang.org/x/sys v0.0.0-20190813064441-fde4db37ae7a/go.mod" - "golang.org/x/sys v0.0.0-20190924154521-2837fb4f24fe/go.mod" - "golang.org/x/sys v0.0.0-20191026070338-33540a1f6037/go.mod" - "golang.org/x/sys v0.0.0-20200202164722-d101bd2416d5/go.mod" - "golang.org/x/sys v0.0.0-20200323222414-85ca7c5b95cd" - "golang.org/x/sys v0.0.0-20200323222414-85ca7c5b95cd/go.mod" - "golang.org/x/text v0.3.0/go.mod" - "golang.org/x/text v0.3.2/go.mod" - "golang.org/x/text v0.3.3" - "golang.org/x/text v0.3.3/go.mod" - "golang.org/x/text v0.3.5-0.20201125200606-c27b9fd57aec" - "golang.org/x/text v0.3.5-0.20201125200606-c27b9fd57aec/go.mod" - "golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod" - "golang.org/x/tools v0.0.0-20181221001348-537d06c36207/go.mod" - "golang.org/x/tools v0.0.0-20190327201419-c70d86f8b7cf/go.mod" - "golang.org/x/tools v0.0.0-20190328211700-ab21143f2384/go.mod" - "golang.org/x/tools v0.0.0-20190420181800-aa740d480789/go.mod" - "golang.org/x/tools v0.0.0-20190425150028-36563e24a262/go.mod" - "golang.org/x/tools v0.0.0-20191216052735-49a3e744a425/go.mod" - "golang.org/x/xerrors v0.0.0-20191011141410-1b5146add898/go.mod" - "golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543" - "golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod" - "gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod" - "gopkg.in/check.v1 v1.0.0-20200227125254-8fa46927fb4f" - "gopkg.in/check.v1 v1.0.0-20200227125254-8fa46927fb4f/go.mod" - "gopkg.in/fsnotify.v1 v1.4.7/go.mod" - "gopkg.in/go-playground/assert.v1 v1.2.1/go.mod" - "gopkg.in/go-playground/validator.v8 v8.18.2/go.mod" - "gopkg.in/ini.v1 v1.51.1/go.mod" - "gopkg.in/mgo.v2 v2.0.0-20180705113604-9856a29383ce/go.mod" - "gopkg.in/stretchr/testify.v1 v1.2.2" - "gopkg.in/stretchr/testify.v1 v1.2.2/go.mod" - "gopkg.in/tomb.v1 v1.0.0-20141024135613-dd632973f1e7/go.mod" - "gopkg.in/yaml.v2 v2.2.2/go.mod" - "gopkg.in/yaml.v2 v2.2.4/go.mod" - "gopkg.in/yaml.v2 v2.2.8/go.mod" - "gopkg.in/yaml.v3 v3.0.0-20191120175047-4206685974f2/go.mod" - "gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c" - "gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod" -) - -go-module_set_globals - -MY_PN="proton-bridge-br" -MY_P="${MY_PN}-${PV}" - -DESCRIPTION="Serves ProtonMail to IMAP/SMTP clients" -HOMEPAGE="https://protonmail.com/bridge/ https://github.com/ProtonMail/proton-bridge/" -SRC_URI="https://github.com/ProtonMail/proton-bridge/archive/br-${PV}.tar.gz -> ${P}.tar.gz - ${EGO_SUM_SRC_URI}" - -LICENSE="Apache-2.0 BSD BSD-2 GPL-3+ ISC LGPL-3+ MIT MPL-2.0 Unlicense" -SLOT="0" -KEYWORDS="~amd64" -IUSE="gui" - -# Some of the tests fail without access to a keyring service -RESTRICT="test" - -RDEPEND="app-crypt/libsecret - gui? ( !mail-mta/protonmail-bridge-bin )" # /usr/bin file collision -DEPEND="${RDEPEND}" - -S="${WORKDIR}"/${MY_P} - -src_prepare() { - xdg_environment_reset - default -} - -src_compile() { - if use gui; then - emake \ - QT_DOC_DIR="/usr/share/qt5-doc" \ - QT_PKG_CONFIG=true \ - build - else - emake build-nogui - fi -} - -src_test() { - emake test -} - -src_install() { - # A slight hack to allow this package (which is currently limited to CLI mode) - # and protonmail-bridge-bin (which supports GUI mode) to co-exist. - local bin_name unit_name - if use gui; then - bin_name="${PN}" - unit_name="${FILESDIR}/${PN}.service" - else - bin_name="${PN}-cli" - unit_name="${PN}-cli.service" - sed -e "s|${PN}|${bin_name}|" "${FILESDIR}"/${PN}.service > ${unit_name} || die - fi - - exeinto /usr/bin - newexe proton-bridge ${bin_name} - - systemd_douserunit ${unit_name} - - # FIXME: USE=gui will probably need more files - - einstalldocs -} - -pkg_postinst() { - use gui && xdg_icon_cache_update -} - -pkg_postrm() { - use gui && xdg_icon_cache_update -} diff --git a/mail-mta/protonmail-bridge/protonmail-bridge-1.5.7.ebuild b/mail-mta/protonmail-bridge/protonmail-bridge-1.5.7.ebuild new file mode 100644 index 000000000000..ac6c8951fc6f --- /dev/null +++ b/mail-mta/protonmail-bridge/protonmail-bridge-1.5.7.ebuild @@ -0,0 +1,451 @@ +# Copyright 1999-2021 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +inherit go-module systemd xdg-utils + +EGO_SUM=( + "github.com/0xAX/notificator v0.0.0-20191016112426-3962a5ea8da1" + "github.com/0xAX/notificator v0.0.0-20191016112426-3962a5ea8da1/go.mod" + "github.com/AndreasBriese/bbloom v0.0.0-20190306092124-e2d15f34fcf9/go.mod" + "github.com/BurntSushi/toml v0.3.1/go.mod" + "github.com/CloudyKit/fastprinter v0.0.0-20200109182630-33d98a066a53/go.mod" + "github.com/CloudyKit/jet/v3 v3.0.0/go.mod" + "github.com/Joker/hpp v1.0.0/go.mod" + "github.com/Masterminds/semver/v3 v3.1.0" + "github.com/Masterminds/semver/v3 v3.1.0/go.mod" + "github.com/ProtonMail/bcrypt v0.0.0-20170924085257-7509ea014998" + "github.com/ProtonMail/bcrypt v0.0.0-20170924085257-7509ea014998/go.mod" + "github.com/ProtonMail/crypto v0.0.0-20200818122824-ed5d25e28db8" + "github.com/ProtonMail/crypto v0.0.0-20200818122824-ed5d25e28db8/go.mod" + "github.com/ProtonMail/docker-credential-helpers v1.1.0" + "github.com/ProtonMail/docker-credential-helpers v1.1.0/go.mod" + "github.com/ProtonMail/go-appdir v1.1.0" + "github.com/ProtonMail/go-appdir v1.1.0/go.mod" + "github.com/ProtonMail/go-apple-mobileconfig v0.0.0-20160701194735-7ea9927a11f6" + "github.com/ProtonMail/go-apple-mobileconfig v0.0.0-20160701194735-7ea9927a11f6/go.mod" + "github.com/ProtonMail/go-autostart v0.0.0-20181114175602-c5272053443a" + "github.com/ProtonMail/go-autostart v0.0.0-20181114175602-c5272053443a/go.mod" + "github.com/ProtonMail/go-imap v0.0.0-20201228133358-4db68cea0cac" + "github.com/ProtonMail/go-imap v0.0.0-20201228133358-4db68cea0cac/go.mod" + "github.com/ProtonMail/go-imap-id v0.0.0-20190926060100-f94a56b9ecde" + "github.com/ProtonMail/go-imap-id v0.0.0-20190926060100-f94a56b9ecde/go.mod" + "github.com/ProtonMail/go-mime v0.0.0-20190923161245-9b5a4261663a" + "github.com/ProtonMail/go-mime v0.0.0-20190923161245-9b5a4261663a/go.mod" + "github.com/ProtonMail/go-rfc5322 v0.4.0" + "github.com/ProtonMail/go-rfc5322 v0.4.0/go.mod" + "github.com/ProtonMail/go-rfc5322 v0.5.0" + "github.com/ProtonMail/go-rfc5322 v0.5.0/go.mod" + "github.com/ProtonMail/go-vcard v0.0.0-20180326232728-33aaa0a0c8a5" + "github.com/ProtonMail/go-vcard v0.0.0-20180326232728-33aaa0a0c8a5/go.mod" + "github.com/ProtonMail/gopenpgp/v2 v2.0.1" + "github.com/ProtonMail/gopenpgp/v2 v2.0.1/go.mod" + "github.com/PuerkitoBio/goquery v1.5.1" + "github.com/PuerkitoBio/goquery v1.5.1/go.mod" + "github.com/Shopify/goreferrer v0.0.0-20181106222321-ec9c9a553398/go.mod" + "github.com/abiosoft/ishell v2.0.0+incompatible" + "github.com/abiosoft/ishell v2.0.0+incompatible/go.mod" + "github.com/abiosoft/readline v0.0.0-20180607040430-155bce2042db" + "github.com/abiosoft/readline v0.0.0-20180607040430-155bce2042db/go.mod" + "github.com/ajg/form v1.5.1/go.mod" + "github.com/allan-simon/go-singleinstance v0.0.0-20160830203053-79edcfdc2dfc" + "github.com/allan-simon/go-singleinstance v0.0.0-20160830203053-79edcfdc2dfc/go.mod" + "github.com/andybalholm/cascadia v1.1.0" + "github.com/andybalholm/cascadia v1.1.0/go.mod" + "github.com/antlr/antlr4 v0.0.0-20201029161626-9a95f0cc3d7c" + "github.com/antlr/antlr4 v0.0.0-20201029161626-9a95f0cc3d7c/go.mod" + "github.com/armon/consul-api v0.0.0-20180202201655-eb2c6b5be1b6/go.mod" + "github.com/aymerick/raymond v2.0.3-0.20180322193309-b565731e1464+incompatible/go.mod" + "github.com/chzyer/logex v1.1.10" + "github.com/chzyer/logex v1.1.10/go.mod" + "github.com/chzyer/test v0.0.0-20180213035817-a1ea475d72b1" + "github.com/chzyer/test v0.0.0-20180213035817-a1ea475d72b1/go.mod" + "github.com/codegangsta/inject v0.0.0-20150114235600-33e0aa1cb7c0/go.mod" + "github.com/coreos/etcd v3.3.10+incompatible/go.mod" + "github.com/coreos/go-etcd v2.0.0+incompatible/go.mod" + "github.com/coreos/go-semver v0.2.0/go.mod" + "github.com/cpuguy83/go-md2man v1.0.10" + "github.com/cpuguy83/go-md2man v1.0.10/go.mod" + "github.com/cpuguy83/go-md2man/v2 v2.0.0-20190314233015-f79a8a8ca69d" + "github.com/cpuguy83/go-md2man/v2 v2.0.0-20190314233015-f79a8a8ca69d/go.mod" + "github.com/creack/pty v1.1.9/go.mod" + "github.com/cucumber/godog v0.8.1" + "github.com/cucumber/godog v0.8.1/go.mod" + "github.com/danieljoos/wincred v1.1.0" + "github.com/danieljoos/wincred v1.1.0/go.mod" + "github.com/davecgh/go-spew v1.1.0/go.mod" + "github.com/davecgh/go-spew v1.1.1" + "github.com/davecgh/go-spew v1.1.1/go.mod" + "github.com/dgraph-io/badger v1.6.0/go.mod" + "github.com/dgrijalva/jwt-go v3.2.0+incompatible/go.mod" + "github.com/dgryski/go-farm v0.0.0-20190423205320-6a90982ecee2/go.mod" + "github.com/dustin/go-humanize v1.0.0/go.mod" + "github.com/eknkc/amber v0.0.0-20171010120322-cdade1c07385/go.mod" + "github.com/emersion/go-imap-appendlimit v0.0.0-20190308131241-25671c986a6a" + "github.com/emersion/go-imap-appendlimit v0.0.0-20190308131241-25671c986a6a/go.mod" + "github.com/emersion/go-imap-idle v0.0.0-20200601154248-f05f54664cc4" + "github.com/emersion/go-imap-idle v0.0.0-20200601154248-f05f54664cc4/go.mod" + "github.com/emersion/go-imap-move v0.0.0-20190710073258-6e5a51a5b342" + "github.com/emersion/go-imap-move v0.0.0-20190710073258-6e5a51a5b342/go.mod" + "github.com/emersion/go-imap-quota v0.0.0-20200423100218-dcfd1b7d2b41" + "github.com/emersion/go-imap-quota v0.0.0-20200423100218-dcfd1b7d2b41/go.mod" + "github.com/emersion/go-imap-unselect v0.0.0-20171113212723-b985794e5f26" + "github.com/emersion/go-imap-unselect v0.0.0-20171113212723-b985794e5f26/go.mod" + "github.com/emersion/go-mbox v1.0.2" + "github.com/emersion/go-mbox v1.0.2/go.mod" + "github.com/emersion/go-message v0.11.1/go.mod" + "github.com/emersion/go-message v0.12.1-0.20200903165315-e1abe21f389a" + "github.com/emersion/go-message v0.12.1-0.20200903165315-e1abe21f389a/go.mod" + "github.com/emersion/go-message v0.12.1-0.20201221184100-40c3f864532b" + "github.com/emersion/go-message v0.12.1-0.20201221184100-40c3f864532b/go.mod" + "github.com/emersion/go-sasl v0.0.0-20191210011802-430746ea8b9b/go.mod" + "github.com/emersion/go-sasl v0.0.0-20200509203442-7bfe0ed36a21" + "github.com/emersion/go-sasl v0.0.0-20200509203442-7bfe0ed36a21/go.mod" + "github.com/emersion/go-smtp v0.14.0" + "github.com/emersion/go-smtp v0.14.0/go.mod" + "github.com/emersion/go-textwrapper v0.0.0-20160606182133-d0e65e56babe" + "github.com/emersion/go-textwrapper v0.0.0-20160606182133-d0e65e56babe/go.mod" + "github.com/emersion/go-textwrapper v0.0.0-20200911093747-65d896831594" + "github.com/emersion/go-textwrapper v0.0.0-20200911093747-65d896831594/go.mod" + "github.com/emersion/go-vcard v0.0.0-20190105225839-8856043f13c5" + "github.com/emersion/go-vcard v0.0.0-20190105225839-8856043f13c5/go.mod" + "github.com/etcd-io/bbolt v1.3.3/go.mod" + "github.com/fasthttp-contrib/websocket v0.0.0-20160511215533-1f3b11f56072/go.mod" + "github.com/fatih/color v1.9.0" + "github.com/fatih/color v1.9.0/go.mod" + "github.com/fatih/structs v1.1.0/go.mod" + "github.com/flynn-archive/go-shlex v0.0.0-20150515145356-3f9db97f8568" + "github.com/flynn-archive/go-shlex v0.0.0-20150515145356-3f9db97f8568/go.mod" + "github.com/fsnotify/fsnotify v1.4.7/go.mod" + "github.com/gavv/httpexpect v2.0.0+incompatible/go.mod" + "github.com/getsentry/sentry-go v0.8.0" + "github.com/getsentry/sentry-go v0.8.0/go.mod" + "github.com/gin-contrib/sse v0.0.0-20190301062529-5545eab6dad3/go.mod" + "github.com/gin-gonic/gin v1.4.0/go.mod" + "github.com/go-check/check v0.0.0-20180628173108-788fd7840127/go.mod" + "github.com/go-errors/errors v1.0.1" + "github.com/go-errors/errors v1.0.1/go.mod" + "github.com/go-martini/martini v0.0.0-20170121215854-22fa46961aab/go.mod" + "github.com/go-resty/resty/v2 v2.3.0" + "github.com/go-resty/resty/v2 v2.3.0/go.mod" + "github.com/gobwas/httphead v0.0.0-20180130184737-2c6c146eadee/go.mod" + "github.com/gobwas/pool v0.2.0/go.mod" + "github.com/gobwas/ws v1.0.2/go.mod" + "github.com/golang/mock v1.4.4" + "github.com/golang/mock v1.4.4/go.mod" + "github.com/golang/protobuf v1.2.0/go.mod" + "github.com/golang/protobuf v1.3.1/go.mod" + "github.com/gomodule/redigo v1.7.1-0.20190724094224-574c33c3df38/go.mod" + "github.com/google/go-cmp v0.4.0/go.mod" + "github.com/google/go-cmp v0.5.1" + "github.com/google/go-cmp v0.5.1/go.mod" + "github.com/google/go-querystring v1.0.0/go.mod" + "github.com/google/gofuzz v1.0.0/go.mod" + "github.com/google/uuid v1.1.1" + "github.com/google/uuid v1.1.1/go.mod" + "github.com/gopherjs/gopherjs v0.0.0-20181017120253-0766667cb4d1/go.mod" + "github.com/gopherjs/gopherjs v0.0.0-20190411002643-bd77b112433e/go.mod" + "github.com/gopherjs/gopherjs v0.0.0-20190430165422-3e4dfb77656c" + "github.com/gopherjs/gopherjs v0.0.0-20190430165422-3e4dfb77656c/go.mod" + "github.com/gorilla/websocket v1.4.1/go.mod" + "github.com/hashicorp/errwrap v1.0.0" + "github.com/hashicorp/errwrap v1.0.0/go.mod" + "github.com/hashicorp/go-multierror v1.1.0" + "github.com/hashicorp/go-multierror v1.1.0/go.mod" + "github.com/hashicorp/go-version v1.2.0/go.mod" + "github.com/hashicorp/hcl v1.0.0/go.mod" + "github.com/hpcloud/tail v1.0.0/go.mod" + "github.com/imkira/go-interpol v1.1.0/go.mod" + "github.com/inconshreveable/mousetrap v1.0.0/go.mod" + "github.com/iris-contrib/blackfriday v2.0.0+incompatible/go.mod" + "github.com/iris-contrib/go.uuid v2.0.0+incompatible/go.mod" + "github.com/iris-contrib/jade v1.1.3/go.mod" + "github.com/iris-contrib/pongo2 v0.0.1/go.mod" + "github.com/iris-contrib/schema v0.0.1/go.mod" + "github.com/jaytaylor/html2text v0.0.0-20200412013138-3577fbdbcff7" + "github.com/jaytaylor/html2text v0.0.0-20200412013138-3577fbdbcff7/go.mod" + "github.com/json-iterator/go v1.1.6/go.mod" + "github.com/json-iterator/go v1.1.9/go.mod" + "github.com/jtolds/gls v4.20.0+incompatible/go.mod" + "github.com/k0kubun/colorstring v0.0.0-20150214042306-9440f1994b88/go.mod" + "github.com/kardianos/osext v0.0.0-20190222173326-2bc1f35cddc0" + "github.com/kardianos/osext v0.0.0-20190222173326-2bc1f35cddc0/go.mod" + "github.com/kataras/golog v0.0.10/go.mod" + "github.com/kataras/iris/v12 v12.1.8/go.mod" + "github.com/kataras/neffos v0.0.14/go.mod" + "github.com/kataras/pio v0.0.2/go.mod" + "github.com/kataras/sitemap v0.0.5/go.mod" + "github.com/keybase/go-keychain v0.0.0-20200502122510-cda31fe0c86d" + "github.com/keybase/go-keychain v0.0.0-20200502122510-cda31fe0c86d/go.mod" + "github.com/keybase/go.dbus v0.0.0-20200324223359-a94be52c0b03/go.mod" + "github.com/klauspost/compress v1.8.2/go.mod" + "github.com/klauspost/compress v1.9.7/go.mod" + "github.com/klauspost/cpuid v1.2.1/go.mod" + "github.com/konsorten/go-windows-terminal-sequences v1.0.1/go.mod" + "github.com/konsorten/go-windows-terminal-sequences v1.0.2/go.mod" + "github.com/kr/pretty v0.1.0/go.mod" + "github.com/kr/pty v1.1.1/go.mod" + "github.com/kr/text v0.1.0/go.mod" + "github.com/kr/text v0.2.0" + "github.com/kr/text v0.2.0/go.mod" + "github.com/labstack/echo/v4 v4.1.11/go.mod" + "github.com/labstack/gommon v0.3.0/go.mod" + "github.com/logrusorgru/aurora v2.0.3+incompatible" + "github.com/logrusorgru/aurora v2.0.3+incompatible/go.mod" + "github.com/magiconair/properties v1.8.0/go.mod" + "github.com/martinlindhe/base36 v1.0.0" + "github.com/martinlindhe/base36 v1.0.0/go.mod" + "github.com/martinlindhe/base36 v1.1.0/go.mod" + "github.com/mattn/go-colorable v0.1.2/go.mod" + "github.com/mattn/go-colorable v0.1.4" + "github.com/mattn/go-colorable v0.1.4/go.mod" + "github.com/mattn/go-isatty v0.0.7/go.mod" + "github.com/mattn/go-isatty v0.0.8/go.mod" + "github.com/mattn/go-isatty v0.0.9/go.mod" + "github.com/mattn/go-isatty v0.0.11" + "github.com/mattn/go-isatty v0.0.11/go.mod" + "github.com/mattn/go-runewidth v0.0.7/go.mod" + "github.com/mattn/go-runewidth v0.0.9" + "github.com/mattn/go-runewidth v0.0.9/go.mod" + "github.com/mattn/goveralls v0.0.2/go.mod" + "github.com/mediocregopher/radix/v3 v3.4.2/go.mod" + "github.com/microcosm-cc/bluemonday v1.0.2/go.mod" + "github.com/miekg/dns v1.1.30" + "github.com/miekg/dns v1.1.30/go.mod" + "github.com/mitchellh/go-homedir v1.1.0/go.mod" + "github.com/mitchellh/mapstructure v1.1.2/go.mod" + "github.com/modern-go/concurrent v0.0.0-20180228061459-e0a39a4cb421/go.mod" + "github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd/go.mod" + "github.com/modern-go/reflect2 v0.0.0-20180701023420-4b7aa43c6742/go.mod" + "github.com/modern-go/reflect2 v1.0.1/go.mod" + "github.com/moul/http2curl v1.0.0/go.mod" + "github.com/myesui/uuid v1.0.0" + "github.com/myesui/uuid v1.0.0/go.mod" + "github.com/nats-io/jwt v0.3.0/go.mod" + "github.com/nats-io/nats.go v1.9.1/go.mod" + "github.com/nats-io/nkeys v0.1.0/go.mod" + "github.com/nats-io/nuid v1.0.1/go.mod" + "github.com/niemeyer/pretty v0.0.0-20200227124842-a10e7caefd8e" + "github.com/niemeyer/pretty v0.0.0-20200227124842-a10e7caefd8e/go.mod" + "github.com/nsf/jsondiff v0.0.0-20200515183724-f29ed568f4ce" + "github.com/nsf/jsondiff v0.0.0-20200515183724-f29ed568f4ce/go.mod" + "github.com/olekukonko/tablewriter v0.0.4" + "github.com/olekukonko/tablewriter v0.0.4/go.mod" + "github.com/onsi/ginkgo v1.6.0/go.mod" + "github.com/onsi/ginkgo v1.10.3/go.mod" + "github.com/onsi/gomega v1.7.1/go.mod" + "github.com/pelletier/go-toml v1.2.0/go.mod" + "github.com/pingcap/errors v0.11.4" + "github.com/pingcap/errors v0.11.4/go.mod" + "github.com/pkg/errors v0.8.1/go.mod" + "github.com/pkg/errors v0.9.1" + "github.com/pkg/errors v0.9.1/go.mod" + "github.com/pmezard/go-difflib v1.0.0" + "github.com/pmezard/go-difflib v1.0.0/go.mod" + "github.com/russross/blackfriday v1.5.2" + "github.com/russross/blackfriday v1.5.2/go.mod" + "github.com/russross/blackfriday/v2 v2.0.1" + "github.com/russross/blackfriday/v2 v2.0.1/go.mod" + "github.com/ryanuber/columnize v2.1.0+incompatible/go.mod" + "github.com/schollz/closestmatch v2.1.0+incompatible/go.mod" + "github.com/sergi/go-diff v1.0.0/go.mod" + "github.com/shurcooL/sanitized_anchor_name v1.0.0" + "github.com/shurcooL/sanitized_anchor_name v1.0.0/go.mod" + "github.com/sirupsen/logrus v1.4.1/go.mod" + "github.com/sirupsen/logrus v1.4.2/go.mod" + "github.com/sirupsen/logrus v1.7.0" + "github.com/sirupsen/logrus v1.7.0/go.mod" + "github.com/skratchdot/open-golang v0.0.0-20200116055534-eef842397966" + "github.com/skratchdot/open-golang v0.0.0-20200116055534-eef842397966/go.mod" + "github.com/smartystreets/assertions v0.0.0-20180927180507-b2de0cb4f26d/go.mod" + "github.com/smartystreets/goconvey v1.6.4/go.mod" + "github.com/spf13/afero v1.1.2/go.mod" + "github.com/spf13/cast v1.3.0/go.mod" + "github.com/spf13/cobra v0.0.5/go.mod" + "github.com/spf13/jwalterweatherman v1.0.0/go.mod" + "github.com/spf13/pflag v1.0.3/go.mod" + "github.com/spf13/viper v1.3.2/go.mod" + "github.com/ssor/bom v0.0.0-20170718123548-6386211fdfcf" + "github.com/ssor/bom v0.0.0-20170718123548-6386211fdfcf/go.mod" + "github.com/stretchr/objx v0.1.0/go.mod" + "github.com/stretchr/objx v0.1.1/go.mod" + "github.com/stretchr/objx v0.2.0" + "github.com/stretchr/objx v0.2.0/go.mod" + "github.com/stretchr/testify v1.2.2/go.mod" + "github.com/stretchr/testify v1.3.0/go.mod" + "github.com/stretchr/testify v1.4.0/go.mod" + "github.com/stretchr/testify v1.5.1/go.mod" + "github.com/stretchr/testify v1.6.1" + "github.com/stretchr/testify v1.6.1/go.mod" + "github.com/therecipe/qt v0.0.0-20200701200531-7f61353ee73e" + "github.com/therecipe/qt v0.0.0-20200701200531-7f61353ee73e/go.mod" + "github.com/twinj/uuid v1.0.0" + "github.com/twinj/uuid v1.0.0/go.mod" + "github.com/ugorji/go v1.1.4/go.mod" + "github.com/ugorji/go v1.1.7/go.mod" + "github.com/ugorji/go/codec v0.0.0-20181204163529-d75b2dcb6bc8/go.mod" + "github.com/ugorji/go/codec v1.1.7/go.mod" + "github.com/urfave/cli v1.22.4" + "github.com/urfave/cli v1.22.4/go.mod" + "github.com/urfave/negroni v1.0.0/go.mod" + "github.com/valyala/bytebufferpool v1.0.0/go.mod" + "github.com/valyala/fasthttp v1.6.0/go.mod" + "github.com/valyala/fasttemplate v1.0.1/go.mod" + "github.com/valyala/tcplisten v0.0.0-20161114210144-ceec8f93295a/go.mod" + "github.com/xeipuuv/gojsonpointer v0.0.0-20180127040702-4e3ac2762d5f/go.mod" + "github.com/xeipuuv/gojsonreference v0.0.0-20180127040603-bd5ef7bd5415/go.mod" + "github.com/xeipuuv/gojsonschema v1.2.0/go.mod" + "github.com/xordataexchange/crypt v0.0.3-0.20170626215501-b2862e3d0a77/go.mod" + "github.com/yalp/jsonpath v0.0.0-20180802001716-5cc68e5049a0/go.mod" + "github.com/yudai/gojsondiff v1.0.0/go.mod" + "github.com/yudai/golcs v0.0.0-20170316035057-ecda9a501e82/go.mod" + "github.com/yudai/pp v2.0.1+incompatible/go.mod" + "go.etcd.io/bbolt v1.3.5" + "go.etcd.io/bbolt v1.3.5/go.mod" + "golang.org/x/mod v0.1.1-0.20191105210325-c90efee705ee/go.mod" + "golang.org/x/net v0.0.0-20180218175443-cbe0f9307d01/go.mod" + "golang.org/x/net v0.0.0-20180906233101-161cd47e91fd/go.mod" + "golang.org/x/net v0.0.0-20181220203305-927f97764cc3/go.mod" + "golang.org/x/net v0.0.0-20190311183353-d8887717615a/go.mod" + "golang.org/x/net v0.0.0-20190327091125-710a502c58a2/go.mod" + "golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod" + "golang.org/x/net v0.0.0-20190420063019-afa5a82059c6/go.mod" + "golang.org/x/net v0.0.0-20190503192946-f4e77d36d62c/go.mod" + "golang.org/x/net v0.0.0-20190620200207-3b0461eec859/go.mod" + "golang.org/x/net v0.0.0-20190827160401-ba9fcec4b297/go.mod" + "golang.org/x/net v0.0.0-20190923162816-aa69164e4478/go.mod" + "golang.org/x/net v0.0.0-20191209160850-c0dbc17a3553/go.mod" + "golang.org/x/net v0.0.0-20200202094626-16171245cfb2/go.mod" + "golang.org/x/net v0.0.0-20200513185701-a91f0712d120/go.mod" + "golang.org/x/net v0.0.0-20200707034311-ab3426394381" + "golang.org/x/net v0.0.0-20200707034311-ab3426394381/go.mod" + "golang.org/x/sync v0.0.0-20180314180146-1d60e4601c6f/go.mod" + "golang.org/x/sync v0.0.0-20190423024810-112230192c58" + "golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod" + "golang.org/x/sync v0.0.0-20190911185100-cd5d95a43a6e" + "golang.org/x/sync v0.0.0-20190911185100-cd5d95a43a6e/go.mod" + "golang.org/x/sys v0.0.0-20180905080454-ebe1bf3edb33/go.mod" + "golang.org/x/sys v0.0.0-20180909124046-d0be0721c37e/go.mod" + "golang.org/x/sys v0.0.0-20181205085412-a5c9d58dba9a/go.mod" + "golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod" + "golang.org/x/sys v0.0.0-20190222072716-a9d3bda3a223/go.mod" + "golang.org/x/sys v0.0.0-20190412213103-97732733099d/go.mod" + "golang.org/x/sys v0.0.0-20190419153524-e8e3143a4f4a/go.mod" + "golang.org/x/sys v0.0.0-20190422165155-953cdadca894/go.mod" + "golang.org/x/sys v0.0.0-20190626221950-04f50cda93cb/go.mod" + "golang.org/x/sys v0.0.0-20190813064441-fde4db37ae7a/go.mod" + "golang.org/x/sys v0.0.0-20190924154521-2837fb4f24fe/go.mod" + "golang.org/x/sys v0.0.0-20191026070338-33540a1f6037/go.mod" + "golang.org/x/sys v0.0.0-20200202164722-d101bd2416d5/go.mod" + "golang.org/x/sys v0.0.0-20200323222414-85ca7c5b95cd" + "golang.org/x/sys v0.0.0-20200323222414-85ca7c5b95cd/go.mod" + "golang.org/x/text v0.3.0/go.mod" + "golang.org/x/text v0.3.2/go.mod" + "golang.org/x/text v0.3.3" + "golang.org/x/text v0.3.3/go.mod" + "golang.org/x/text v0.3.5-0.20201125200606-c27b9fd57aec" + "golang.org/x/text v0.3.5-0.20201125200606-c27b9fd57aec/go.mod" + "golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod" + "golang.org/x/tools v0.0.0-20181221001348-537d06c36207/go.mod" + "golang.org/x/tools v0.0.0-20190327201419-c70d86f8b7cf/go.mod" + "golang.org/x/tools v0.0.0-20190328211700-ab21143f2384/go.mod" + "golang.org/x/tools v0.0.0-20190420181800-aa740d480789/go.mod" + "golang.org/x/tools v0.0.0-20190425150028-36563e24a262/go.mod" + "golang.org/x/tools v0.0.0-20191216052735-49a3e744a425/go.mod" + "golang.org/x/xerrors v0.0.0-20191011141410-1b5146add898/go.mod" + "golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543" + "golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod" + "gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod" + "gopkg.in/check.v1 v1.0.0-20200227125254-8fa46927fb4f" + "gopkg.in/check.v1 v1.0.0-20200227125254-8fa46927fb4f/go.mod" + "gopkg.in/fsnotify.v1 v1.4.7/go.mod" + "gopkg.in/go-playground/assert.v1 v1.2.1/go.mod" + "gopkg.in/go-playground/validator.v8 v8.18.2/go.mod" + "gopkg.in/ini.v1 v1.51.1/go.mod" + "gopkg.in/mgo.v2 v2.0.0-20180705113604-9856a29383ce/go.mod" + "gopkg.in/stretchr/testify.v1 v1.2.2" + "gopkg.in/stretchr/testify.v1 v1.2.2/go.mod" + "gopkg.in/tomb.v1 v1.0.0-20141024135613-dd632973f1e7/go.mod" + "gopkg.in/yaml.v2 v2.2.2/go.mod" + "gopkg.in/yaml.v2 v2.2.4/go.mod" + "gopkg.in/yaml.v2 v2.2.8/go.mod" + "gopkg.in/yaml.v3 v3.0.0-20191120175047-4206685974f2/go.mod" + "gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c" + "gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod" +) + +go-module_set_globals + +MY_PN="proton-bridge-br" +MY_P="${MY_PN}-${PV}" + +DESCRIPTION="Serves ProtonMail to IMAP/SMTP clients" +HOMEPAGE="https://protonmail.com/bridge/ https://github.com/ProtonMail/proton-bridge/" +SRC_URI="https://github.com/ProtonMail/proton-bridge/archive/br-${PV}.tar.gz -> ${P}.tar.gz + ${EGO_SUM_SRC_URI}" + +LICENSE="Apache-2.0 BSD BSD-2 GPL-3+ ISC LGPL-3+ MIT MPL-2.0 Unlicense" +SLOT="0" +KEYWORDS="~amd64" +IUSE="gui" + +# Some of the tests fail without access to a keyring service +RESTRICT="test" + +RDEPEND="app-crypt/libsecret + gui? ( !mail-mta/protonmail-bridge-bin )" # /usr/bin file collision +DEPEND="${RDEPEND}" + +S="${WORKDIR}"/${MY_P} + +src_prepare() { + xdg_environment_reset + default +} + +src_compile() { + if use gui; then + emake \ + QT_DOC_DIR="/usr/share/qt5-doc" \ + QT_PKG_CONFIG=true \ + build + else + emake build-nogui + fi +} + +src_test() { + emake test +} + +src_install() { + # A slight hack to allow this package (which is currently limited to CLI mode) + # and protonmail-bridge-bin (which supports GUI mode) to co-exist. + local bin_name unit_name + if use gui; then + bin_name="${PN}" + unit_name="${FILESDIR}/${PN}.service" + else + bin_name="${PN}-cli" + unit_name="${PN}-cli.service" + sed -e "s|${PN}|${bin_name}|" "${FILESDIR}"/${PN}.service > ${unit_name} || die + fi + + exeinto /usr/bin + newexe proton-bridge ${bin_name} + + systemd_douserunit ${unit_name} + + # FIXME: USE=gui will probably need more files + + einstalldocs +} + +pkg_postinst() { + use gui && xdg_icon_cache_update +} + +pkg_postrm() { + use gui && xdg_icon_cache_update +} diff --git a/mail-mta/sendmail/Manifest b/mail-mta/sendmail/Manifest index 47ad7b3ffe5d..707f1ddb711a 100644 --- a/mail-mta/sendmail/Manifest +++ b/mail-mta/sendmail/Manifest @@ -14,5 +14,5 @@ AUX sm-client.service 418 BLAKE2B a9057cac008c11d3cfd5a4b662cf3fc71a33be79e8890a DIST sendmail.8.15.2.tar.gz 2207417 BLAKE2B 3d9dfb5bc2b535e30ef2fc61333e12a9b1fc45a5d730d2bed1ef956adb574721833f87aeba0475705b76e0c7d6cf00f9a10025bffb0de6c6b4dae606eb2ec399 SHA512 04feb37316c13b66b1518596507a7da7c16cb0bf1abf10367f7fd888a428fadb093a9efa55342fa55b936c3f0cbdc63b9e2505cd99201a69a0c05b8ad65f49f9 DIST sendmail.8.16.1.tar.gz 2236402 BLAKE2B 80a9c2f1d04719099703e55f0a0c54fd638cf69b72839d358ae6863c95c9e0965d1b7fdd5b1807bec1ffdf87bca0c7c9ba91060962e6de5da5bf14422f6279ea SHA512 d7d4aac3c6d7505782abdb166204901b8b51cac000d610dfe40eda9eef7441a073af9e8e0b14c8719b07b445f55a1e2c28ac63d663d0daa7f1eafc5a101788b2 EBUILD sendmail-8.15.2-r2.ebuild 7259 BLAKE2B c30fe7036eb3e65dc6c83574984e5ca887c6f9ac6a5cf6eeba929b475cfc0514accf87b7a289f953260f52d30a881197cf9791713161b64daa73816041d8d0ee SHA512 5d0b2189cbbfd8765d71dcdec262841a5b32a38f7393406e92fe72acd4a28825988ece85e2e7dedd83442d00eab04d8518c82d3c7e5094a6c84a7120613368c5 -EBUILD sendmail-8.16.1.ebuild 6372 BLAKE2B eade89d5d472b53edf2732b7322f0a0d88c44d2b6288b9488bf2d52489ec0634ddb866cc5bc9fea3fbd7f3943f293a645acee95fb39e568e08cdf9662cf27a91 SHA512 4953d88700d707d2ef8fb5324211c5eee8de0487fa45a68ad12251bbb6bc86c1df49275cf68be3a7c12cfd5fd10dcb54bb55f5ca544617f50863a3860f957ad6 +EBUILD sendmail-8.16.1.ebuild 6541 BLAKE2B 38a17e69978704632c4e9aab0e59b2b4c92fb8420c2dfd077cd11df98141cff3001809ce8026f4c95193cfead069e09d86e257d9b20c60ee50f9c6cd303a6680 SHA512 1b87bd6e32985ff14c97b73ff819e771ad61ad0b0560b4ffa8faac30db3a4115421cba0fbe8cda1818d136fdae4e1401bb6c3ce1d30b4416a2e261b862fecb86 MISC metadata.xml 167 BLAKE2B e4dadf27fd344484f2bccb5b904909c89aac568c32e5b3c44bdf139eacefd4b4fae74419f503d2b7da0dccc1b68ba05d777d11292c0f89270d1ac5c9c703e8ca SHA512 7c8decb24ee3a850e38186cf3c7f8933a28017426806870ad6ef9ceb2533be147a2681fc789b535a81cb528af8c29d90d3006e4f250aee23bd7dea4561294e33 diff --git a/mail-mta/sendmail/sendmail-8.16.1.ebuild b/mail-mta/sendmail/sendmail-8.16.1.ebuild index bd72f71759ce..edb48e9e4712 100644 --- a/mail-mta/sendmail/sendmail-8.16.1.ebuild +++ b/mail-mta/sendmail/sendmail-8.16.1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -55,6 +55,8 @@ src_prepare() { local confENVDEF="-DMAXDAEMONS=64" local conf_sendmail_LIBS="" + confENVDEF="${confLIBS} -DHAS_GETHOSTBYNAME2=1" + use sasl && confLIBS="${confLIBS} -lsasl2" \ && confENVDEF="${confENVDEF} -DSASL=2" \ && confCCOPTS="${confCCOPTS} -I/usr/include/sasl" \ @@ -87,7 +89,7 @@ src_prepare() { -e "s/@@conf_sendmail_LIBS@@/${conf_sendmail_LIBS}/" \ "${FILESDIR}"/site.config.m4 > devtools/Site/site.config.m4 || die "sed failed" - echo "APPENDDEF(\`confLIBDIRS', \`-L${EROOT}/usr/$(get_libdir)')" >> devtools/Site/site.config.m4 || die "echo failed" + echo "APPENDDEF(\`confLIBDIRS', \`-L${EPREFIX}/usr/$(get_libdir)')" >> devtools/Site/site.config.m4 || die "echo failed" eapply_user } @@ -144,37 +146,38 @@ src_install() { newdoc cf/README README.cf newdoc cf/cf/README README.install-cf - cp -pPR cf/* "${D}"/usr/share/sendmail-cf || die "copy failed" + cp -pPR cf/* "${ED}"/usr/share/sendmail-cf || die "copy failed" docinto contrib dodoc contrib/* insinto /etc/mail - if use mbox - then + 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 || die "cf.m4 failed" + # See discussion on bug #730890 + m4 "${ED}"/usr/share/sendmail-cf/m4/cf.m4 \ + <(grep -v "${EPREFIX}"/usr/share/sendmail-cf/m4/cf.m4 "${ED}"/etc/mail/sendmail.mc) \ + > "${ED}"/etc/mail/sendmail.cf || die "cf.m4 failed" echo "include(\`/usr/share/sendmail-cf/m4/cf.m4')dnl" \ - > "${D}"/etc/mail/submit.mc || die "echo failed" + > "${ED}"/etc/mail/submit.mc || die "echo failed" - cat "${D}"/usr/share/sendmail-cf/cf/submit.mc >> "${D}"/etc/mail/submit.mc || die "submit.mc cat failed" + cat "${ED}"/usr/share/sendmail-cf/cf/submit.mc >> "${ED}"/etc/mail/submit.mc || die "submit.mc cat failed" echo "# local-host-names - include all aliases for your machine here" \ > "${D}"/etc/mail/local-host-names || die "local-host-names echo failed" - cat <<- EOF > "${D}"/etc/mail/trusted-users + cat <<- EOF > "${ED}"/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 + cat <<- EOF > "${ED}"/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 @@ -183,7 +186,7 @@ src_install() { EOF - cat <<- EOF > "${D}"/etc/conf.d/sendmail + cat <<- EOF > "${ED}"/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 @@ -194,7 +197,7 @@ src_install() { if use sasl; then dodir /etc/sasl2 - cat <<- EOF > "${D}"/etc/sasl2/Sendmail.conf + cat <<- EOF > "${ED}"/etc/sasl2/Sendmail.conf pwcheck_method: saslauthd mech_list: PLAIN LOGIN -- cgit v1.2.3