diff options
Diffstat (limited to 'mail-mta')
-rw-r--r-- | mail-mta/Manifest.gz | bin | 2378 -> 2381 bytes | |||
-rw-r--r-- | mail-mta/courier/Manifest | 8 | ||||
-rw-r--r-- | mail-mta/courier/courier-1.1.8-r2.ebuild | 313 | ||||
-rw-r--r-- | mail-mta/courier/courier-1.2.2-r1.ebuild | 315 | ||||
-rw-r--r-- | mail-mta/courier/courier-1.2.3.ebuild | 311 | ||||
-rw-r--r-- | mail-mta/courier/courier-1.3.3.ebuild (renamed from mail-mta/courier/courier-1.2.2.ebuild) | 2 | ||||
-rw-r--r-- | mail-mta/proton-mail-bridge/Manifest | 4 | ||||
-rw-r--r-- | mail-mta/proton-mail-bridge/files/proton-mail-bridge-3.3.2-gui_gentoo.patch | 68 | ||||
-rw-r--r-- | mail-mta/proton-mail-bridge/files/proton-mail-bridge-3.3.2-telemetry_default.patch | 14 | ||||
-rw-r--r-- | mail-mta/proton-mail-bridge/proton-mail-bridge-3.3.2.ebuild | 66 |
10 files changed, 124 insertions, 977 deletions
diff --git a/mail-mta/Manifest.gz b/mail-mta/Manifest.gz Binary files differindex a0b0faef849a..b24aeb161154 100644 --- a/mail-mta/Manifest.gz +++ b/mail-mta/Manifest.gz diff --git a/mail-mta/courier/Manifest b/mail-mta/courier/Manifest index 615dbef6fa0a..7edb277ecdb5 100644 --- a/mail-mta/courier/Manifest +++ b/mail-mta/courier/Manifest @@ -4,13 +4,9 @@ AUX courier-init-r4 4965 BLAKE2B 09f29543599abfb6dd5df058f832e979bde471be3f9d293 AUX norewrite.patch 488 BLAKE2B 663b52ff5936d5c8aa24ce2a226cd803f09a972a2f358b7f81d1711319b4fee2d7a9c4a8b498e8550b27d796939f6ba042790211592e55072bbff6b7f7172ea3 SHA512 5c2329f497951220bb1276058fe7fe2e0eba710fcad65c9ff1143827fec7c8d9745703fbebf624fecf740fb767401eeba9f0e91b09cd891622d01899578326db AUX password.dist 247 BLAKE2B 1803a6663c32ccc74c4dfb1d591a01d4416f9de9c4bf35c9a7ca277c2007b8c29a8899f4285c78eeb8592766457eef0caf377a344adee7a61be15bbf8b80c7de SHA512 f488b0ab1a909c9b878b9f3f3147641a9ed6d8d2ad44c67cd641934b800b18a62de2a7f5f51fdbecfbbcdd7c39c753734984cc0836c905a3b708858e1b91093d DIST courier-1.1.5.tar.bz2 7654159 BLAKE2B 7ad09b4b3c8ec201ea275851aec4efb34861a2881c765228b58063d26f17580fbe8ffe4e882d43b74ed048c3bf711e0eb08cb45eb1ba25ab2073a8c411a6cd4f SHA512 6b7040a73b09a4fc0ad4d93c576d7d7026aa743e5bbfe3ae14d2474dd9cffdb3419eceb14000cc0beeae40886796d9973e9f8611a7ea925cf2e0ab928904038a -DIST courier-1.1.8.tar.bz2 7655220 BLAKE2B 189c87e416fe8d232e1fab8be47ff8258a54de2a6eccf1b02bd2839c6925018ee5b0ff3172ba791076c979d5c15a9dbcac1e7f515b0683066f3ff55369ea91a9 SHA512 9a0d96a20a75794fba57df11305326eb990091bd503763cd091ad29a4b34d9c1576d40c2e2d6eb81f3705e2d4b0a265c174df6e307a60fbbc1dc26110d931133 -DIST courier-1.2.2.tar.bz2 7841858 BLAKE2B 93ff5cbfe6cc8e51c769718a7933c6f7acc7f910fd3c966c3f0703a8775d360b899f846e34174b48152d397d1c7e89f67b511ec31a63641649f015574149deec SHA512 801893f77b3e18e01f3cec4a9d73abe8fc7aaca34d3c853fd5e6007e30c2b47f9e2f54e50fbff5a5bbb5ddb72ddcb5e4b7f862f17146253e44ad61b97bc556b0 DIST courier-1.2.3.tar.bz2 7842828 BLAKE2B eac13d5c36279df1533af1e62e6b7b9fe0d5015f1f602a8291a2e507965a90d80167b6c443a983220de70a5f12ba6c19a1983ea12480e8cc2fe946c5524bfa6e SHA512 72e96d6fb3e91d8f41c46b45601e2ebb0ce790317ddbc6030e02b294c421ef92b6c7a6de5dc463cbad1196cb6f5efe996e34c6aa1381ddd429c3d83fc48e74e6 +DIST courier-1.3.3.tar.bz2 7895876 BLAKE2B bb60630ba6ff3a4faee8096765ab00a417a7bef4bc22c8f0c423ce063c9a51762f015cb6ceadcebbad6032ad0fb30f5ecd5465cf8bc868bd0c8b4d0156838397 SHA512 92565c65392d4b26b519fc814571400d5b91f350e45828da6a274edb85b2875a579aa4a004ed1ecca1b8a9a53f44163231221408b9e90f1bda18ef7cc23e500a EBUILD courier-1.1.5-r3.ebuild 9233 BLAKE2B d0c7f609140f624ee3b971f240766b80bc467d5f9ce649b2ff4591096d48eea997e2a9951fd56bbbb5511557609bcc21c7a5e992931597e52d0a584141eb9c90 SHA512 6563cd00e122b641f4b2147b02edcda05dd6bc6e662a2d4a55fa9f4d5327c3c48931bd4c8d6d536eae05726f91f405d20d534e70a50f1d2193d22a53ba5f6d6f -EBUILD courier-1.1.8-r2.ebuild 9239 BLAKE2B 37bdf7f22ac01545fe89f6a3d63a58ab984c5f27efd0d8a6a5d751b15bd184afb53e92ad04e7fce78cae5557dc960e22ca3135aee5334603804ab00e29a02b47 SHA512 46489020884af61bac01a18dca9704a931ba81ad07f08873511baa15fc401c722c52f882c136eadc36cc46d3f590e48bb7aacff54b129b265384baaf0618da3f -EBUILD courier-1.2.2-r1.ebuild 9457 BLAKE2B 4a8e8dcc45fd9381fb735419c3ba0b445b1f3585d525992f8b165cad294732b3190059374b917a00b38625445b0d574ac9d42697ae2d4af613a918770f483b43 SHA512 5b89f7e14d600edcd90f98eadd1ac0774c83905fa77607884a447ed2a2bd8a1552b91ef3c87e5afa5fc46975a0cda15c8a5b5729a4166501c58b35dea2cb32f2 -EBUILD courier-1.2.2.ebuild 9263 BLAKE2B e5656abf60207172da2e27674b32e4a45d6874c20130c13634c0df07e5e4049ce9bb398eb4e2a0397b94839257cf0cf043d63b3cd2f40d18a974079cfa24f367 SHA512 1ac12e88befc9f6f1e7f9a2ee4e72697c47b4f4575b9ed7dc1ef3df67ee4fe7d9976786f993d394da1956b2fa1f59a8d26739788f16b025e29dee6fed7ee66fc EBUILD courier-1.2.3-r1.ebuild 9262 BLAKE2B 32f26d89242352e5efca6cf729e23242c85f97d3b5c3a3daca30dd0438d6443e104bf53215eed502b8ad26129e747bae0fe4efd22606565bc875f726d92e5909 SHA512 49387aa98741ebc1421f46f241261dd0db0a0351fc139e2b545b8dbbbd9fce8c795a1bdc62270ff76ed00bf7bd6916a18905046188c3d2e92f4892b34db053be -EBUILD courier-1.2.3.ebuild 9263 BLAKE2B e5656abf60207172da2e27674b32e4a45d6874c20130c13634c0df07e5e4049ce9bb398eb4e2a0397b94839257cf0cf043d63b3cd2f40d18a974079cfa24f367 SHA512 1ac12e88befc9f6f1e7f9a2ee4e72697c47b4f4575b9ed7dc1ef3df67ee4fe7d9976786f993d394da1956b2fa1f59a8d26739788f16b025e29dee6fed7ee66fc +EBUILD courier-1.3.3.ebuild 9264 BLAKE2B dc4c4fd2545f16a65437845481230c770a8c180580d67d375927e07d4b1e0462362aa709b6ca29577aaf7573d78920872b5a0e133365875d6bb332a9606ff83e SHA512 e19eb3febe4e230845e11909289562df9b2d92d873a5bd5a549bc60e846dd880f825ac78446f259a6324f1ce59bca6d0acfbc828df1b9e6b648ca1eca661b9e4 MISC metadata.xml 756 BLAKE2B e3d128790b1620d9005c9a14cef1c452488fc8e465b235791cc196f431cb2ea8348aba342b0867282878d0c73392694be0db0686dc048d9345b286c3bccf1cab SHA512 c3fcd1ba4b22f91b1acf49faeee41562a7963b51d37e1593156086b79a1eb4172a12e7226b71a9aa55b5a4ef7d734351752451a2300375d061ae20481778b273 diff --git a/mail-mta/courier/courier-1.1.8-r2.ebuild b/mail-mta/courier/courier-1.1.8-r2.ebuild deleted file mode 100644 index 6862c3007f92..000000000000 --- a/mail-mta/courier/courier-1.1.8-r2.ebuild +++ /dev/null @@ -1,313 +0,0 @@ -# Copyright 1999-2022 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -inherit flag-o-matic multilib - -DESCRIPTION="An MTA designed specifically for maildirs" -HOMEPAGE="https://www.courier-mta.org/" -SRC_URI="mirror://sourceforge/courier/${P}.tar.bz2" - -LICENSE="GPL-3" -SLOT="0" -KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86" -IUSE="postgres ldap mysql pam nls ipv6 spell fax crypt norewrite \ - fam web webmail gnutls" - -DEPEND=" - >=net-libs/courier-authlib-0.71.3 - >=net-libs/courier-unicode-2.2.3:= - net-dns/libidn:= - gnutls? ( net-libs/gnutls:= ) - !gnutls? ( - dev-libs/openssl:0= - ) - >=sys-libs/gdbm-1.8.0:= - dev-libs/libpcre - app-misc/mime-types - fax? ( >=media-libs/netpbm-9.12 app-text/ghostscript-gpl >=net-dialup/mgetty-1.1.28 ) - pam? ( sys-libs/pam ) - mysql? ( dev-db/mysql-connector-c ) - ldap? ( >=net-nds/openldap-1.2.11:= ) - postgres? ( dev-db/postgresql:= ) - spell? ( app-text/aspell ) - fam? ( virtual/fam ) - !mail-filter/maildrop - !mail-mta/esmtp - !mail-mta/exim - !mail-mta/mini-qmail - !mail-mta/msmtp[mta] - !mail-mta/netqmail - !mail-mta/nullmailer - !mail-mta/postfix - !mail-mta/qmail-ldap - !mail-mta/sendmail - !mail-mta/ssmtp[mta] - !mail-mta/opensmtpd - !net-mail/dot-forward - !sys-apps/ucspi-tcp - " - -RDEPEND="${DEPEND} - dev-lang/perl - sys-process/procps" - -# get rid of old style virtual/imapd - bug 350792 -# all blockers really needed? -RDEPEND="${RDEPEND} - !net-mail/bincimap - !net-mail/courier-imap - !net-mail/cyrus-imapd - !net-mail/uw-imap" - -PDEPEND="pam? ( net-mail/mailbase ) - crypt? ( >=app-crypt/gnupg-1.0.4 )" - -src_prepare() { - use norewrite && eapply "${FILESDIR}/norewrite.patch" - default -} - -src_configure() { - filter-flags '-fomit-frame-pointer' - - local myconf - myconf="" - - use ldap && myconf="${myconf} --with-ldapconfig=/etc/courier/maildropldap.conf" - - econf ${myconf} \ - $(use_with fam) \ - $(use_with ipv6) \ - $(use_with spell ispell) \ - $(use_with ldap ldapaliasd) \ - $(use_enable ldap maildroldap) \ - $(use_with gnutls) \ - --with-notice=unicode \ - --enable-mimetypes=/etc/mime.types \ - --prefix=/usr \ - --disable-root-check \ - --mandir=/usr/share/man \ - --sysconfdir=/etc/courier \ - --datadir=/usr/share/courier \ - --sharedstatedir=/var/lib/courier/com \ - --localstatedir=/var/lib/courier \ - --with-piddir=/var/run/courier \ - --with-authdaemonvar=/var/lib/courier/authdaemon \ - --with-mailuser=mail \ - --with-mailgroup=mail \ - --with-paranoid-smtpext \ - --with-db=gdbm \ - --disable-autorenamesent \ - --cache-file="${S}/configuring.cache" \ - --host="${CHOST}" debug=true || die "./configure" -} - -src_compile() { - default -} - -etc_courier() { - # Import existing /etc/courier/file if it exists. - # Add option only if it was not already set or even commented out - file="${1}" ; word="`echo \"${2}\" | sed -e\"s|=.*$||\" -e\"s|^.*opt ||\"`" - [ ! -e "${D}/etc/courier/${file}" ] && [ -e "/etc/courier/${file}" ] && \ - cp "/etc/courier/${file}" "${D}/etc/courier/${file}" - grep -q "${word}" "${D}/etc/courier/${file}" || \ - echo "${2}" >> "${D}/etc/courier/${file}" -} - -etc_courier_chg() { - file="${1}" ; key="${2}" ; value="${3}" ; section="${4}" - [ -z "${section}" ] && section="${2}" - grep -q "${key}" "${file}" && elog "Changing ${file}: ${key} to ${value}" - sed -i -e"/\#\#NAME: ${section}/,+30 s|${key}=.*|${key}=\"${value}\"|g" ${file} -} - -src_install() { - local f - diropts -o mail -g mail - keepdir /var/lib/courier/tmp - keepdir /var/lib/courier/msgs - make install DESTDIR="${D}" || die "install" - make install-configure DESTDIR="${D}" || die "install-configure" - - # init script takes care of this - rm -rf "${D}/var/run" - - # Get rid of files we dont want - if ! use webmail ; then - rm -rf "${D}/usr/$(get_libdir)/courier/courier/webmail" \ - "${D}/usr/$(get_libdir)/courier/courier/sqwebmaild" \ - "${D}/usr/share/courier/sqwebmail/" \ - "${D}/usr/sbin/webmaild" \ - "${D}/usr/sbin/webgpg" \ - "${D}/etc/courier/webmail.authpam" \ - "${D}/var/lib/courier/webmail-logincache" \ - "${D}"/etc/courier/sqwebmaild* - fi - - if ! use web ; then - rm -rf "${D}/usr/share/courier/courierwebadmin/" \ - "${D}/etc/courier/webadmin" - fi - - for dir2keep in $(cd "${D}" && find ./var/lib/courier -type d) ; do - keepdir "$dir2keep" || die "failed running keepdir: $dir2keep" - done - - newinitd "${FILESDIR}/courier-init-r4" "courier" - use fam || sed -i -e's|^.*use famd$||g' "${D}/etc/init.d/courier" - - cd "${D}/etc/courier" - if use webmail ; then - insinto /etc/courier - newins "${FILESDIR}/apache-sqwebmail.inc" apache-sqwebmail.inc - fi - - for f in *.dist ; do cp "${f}" "${f%%.dist}" ; done - if use ldap ; then - [ -e ldapaliasrc ] && ( chown root:mail ldapaliasrc ; chmod 640 ldapaliasrc ) - else - rm -f ldapaliasrc - fi - - ( [ -e /etc/courier/sizelimit ] && cat /etc/courier/sizelimit || echo 0 ) \ - > "${D}/etc/courier/sizelimit" - etc_courier maildroprc "" - etc_courier esmtproutes "" - etc_courier backuprelay "" - etc_courier locallowercase "" - etc_courier bofh "opt BOFHBADMIME=accept" - etc_courier bofh "opt BOFHSPFTRUSTME=1" - etc_courier bofh "opt BOFHSPFHELO=pass,neutral,unknown,none,error,softfail,fail" - etc_courier bofh "opt BOFHSPFHELO=pass,neutral,unknown,none" - etc_courier bofh "opt BOFHSPFFROM=all" - etc_courier bofh "opt BOFHSPFMAILFROM=all" - etc_courier bofh "#opt BOFHSPFHARDERROR=fail" - etc_courier esmtpd "BOFHBADMIME=accept" - etc_courier esmtpd-ssl "BOFHBADMIME=accept" - etc_courier esmtpd-msa "BOFHBADMIME=accept" - - use fam && etc_courier_chg imapd IMAP_CAPABILITY "IMAP4rev1 UIDPLUS CHILDREN NAMESPACE THREAD=ORDEREDSUBJECT THREAD=REFERENCES SORT QUOTA AUTH=CRAM-MD5 AUTH=CRAM-SHA1 AUTH=CRAM-SHA256 IDLE" - use fam || etc_courier_chg imapd IMAP_CAPABILITY "IMAP4rev1 UIDPLUS CHILDREN NAMESPACE THREAD=ORDEREDSUBJECT THREAD=REFERENCES SORT QUOTA AUTH=CRAM-MD5 AUTH=CRAM-SHA1 AUTH=CRAM-SHA256" - - # Fix for a sandbox violation on subsequential merges - # - ticho@gentoo.org, 2005-07-10 - dosym ../share/courier/pop3d /usr/sbin/courier-pop3d - dosym ../share/courier/pop3d-ssl /usr/sbin/courier-pop3d-ssl - dosym ../share/courier/imapd /usr/sbin/courier-imapd - dosym ../share/courier/imapd-ssl /usr/sbin/courier-imapd-ssl - - cd "${S}" - cp imap/README README.imap - use nls && cp unicode/README README.unicode - dodoc AUTHORS BENCHMARKS COPYING* ChangeLog* INSTALL NEWS README* TODO courier/doc/*.txt - dodoc libs/tcpd/README.couriertls - mv "${D}/usr/share/courier/htmldoc" "${D}/usr/share/doc/${PF}/html" - - if use webmail ; then - insinto /usr/$(get_libdir)/courier/courier - insopts -m 755 -o mail -g mail - doins "${S}/courier/webmaild" - fi - - if use web ; then - insinto /etc/courier/webadmin - insopts -m 400 -o mail -g mail - doins "${FILESDIR}/password.dist" - fi - - # avoid name collisions in /usr/sbin, make webadmin match - cd "${D}/usr/sbin" - for f in imapd imapd-ssl pop3d pop3d-ssl ; do mv "${f}" "courier-${f}" ; done - if use web ; then - sed -i -e 's:\$sbindir\/imapd:\$sbindir\/courier-imapd:g' \ - -e 's:\$sbindir\/imapd-ssl:\$sbindir\/courier-imapd-ssl:g' \ - "${D}/usr/share/courier/courierwebadmin/admin-40imap.pl" \ - || ewarn "failed to fix webadmin" - sed -i -e 's:\$sbindir\/pop3d:\$sbindir\/courier-pop3d:g' \ - -e 's:\$sbindir\/pop3d-ssl:\$sbindir\/courier-pop3d-ssl:g' \ - "${D}/usr/share/courier/courierwebadmin/admin-45pop3.pl" \ - || ewarn "failed to fix webadmin" - fi - - # users should be able to send mail. Could be restricted with suictl. - chmod u+s "${D}/usr/bin/sendmail" - - dosym ../bin/sendmail /usr/sbin/sendmail -} - -src_test() { - if [ `whoami` != 'root' ]; then - # Disable valgrind checks - echo '#!/bin/sh' > libs/imap/testsuitevalgrind - emake -j1 check - else - einfo "make check skipped, can't run as root." - einfo "You can enable it with FEATURES=\"userpriv\"" - fi -} - -pkg_postinst() { - use fam && elog "fam daemon is needed for courier-imapd" \ - || ewarn "courier was built without fam support" -} - -pkg_config() { - mailhost="$(hostname)" - export mailhost - - domainname="$(domainname)" - if [ "x$domainname" = "x(none)" ] ; then - domainname="$(echo ${mailhost} | sed -e "s/[^\.]*\.\(.*\)/\1/")" - fi - export domainname - - if [[ -z "${ROOT}" ]] ; then - file="${ROOT}/etc/courier/locals" - if [ ! -f "${file}" ] ; then - echo "localhost" > "${file}"; - echo "${domainname}" >> "${file}"; - fi - file="${ROOT}/etc/courier/esmtpacceptmailfor.dir/${domainname}" - if [ ! -f "${file}" ] ; then - echo "${domainname}" > "${file}" - /usr/sbin/makeacceptmailfor - fi - - file="${ROOT}/etc/courier/smtpaccess/${domainname}" - if [ ! -f "${file}" ] - then - netstat -nr | grep "^[1-9]" | while read network gateway netmask rest - do - i=1 - net="" - TIFS="${IFS}" - IFS="." - for o in "${netmask}" - do - if [ "${o}" == "255" ] - then - [ "_${net}" == "_" ] || net="${net}." - t="$(echo "${network}" | cut -d " " -f ${i})" - net="${net}${t}" - fi - i="$((${i} + 1))" - done - IFS="${TIFS}" - echo "doing configuration - relay control for the network ${net} !" - echo "${net} allow,RELAYCLIENT" >> ${file} - done - /usr/sbin/makesmtpaccess - fi - fi - - echo "creating cert for esmtpd-ssl:" - /usr/sbin/mkesmtpdcert - echo "creating cert for imapd-ssl:" - /usr/sbin/mkpop3dcert - echo "creating cert for pop3d-ssl:" - /usr/sbin/mkimapdcert -} diff --git a/mail-mta/courier/courier-1.2.2-r1.ebuild b/mail-mta/courier/courier-1.2.2-r1.ebuild deleted file mode 100644 index 7ef2ccb961ea..000000000000 --- a/mail-mta/courier/courier-1.2.2-r1.ebuild +++ /dev/null @@ -1,315 +0,0 @@ -# Copyright 1999-2023 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -inherit flag-o-matic - -# Avoids failures on systems with large numbers of users in a group, -# see https://github.com/svarshavchik/courier-libs/pull/30 -PATCHES=( "${FILESDIR}/courier-1.2.2-fix-getgrnam-buffer.diff" ) - -DESCRIPTION="An MTA designed specifically for maildirs" -HOMEPAGE="https://www.courier-mta.org/" -SRC_URI="mirror://sourceforge/courier/${P}.tar.bz2" - -LICENSE="GPL-3" -SLOT="0" -KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86" -IUSE="postgres ldap mysql pam nls ipv6 spell fax crypt norewrite \ - fam web webmail gnutls" - -DEPEND=" - >=net-libs/courier-authlib-0.72.0 - >=net-libs/courier-unicode-2.2.6:= - net-dns/libidn2:= - gnutls? ( net-libs/gnutls:= ) - !gnutls? ( - dev-libs/openssl:0= - ) - >=sys-libs/gdbm-1.8.0:= - dev-libs/libpcre - app-misc/mime-types - fax? ( >=media-libs/netpbm-9.12 app-text/ghostscript-gpl >=net-dialup/mgetty-1.1.28 ) - pam? ( sys-libs/pam ) - mysql? ( dev-db/mysql-connector-c ) - ldap? ( >=net-nds/openldap-1.2.11:= ) - postgres? ( dev-db/postgresql:= ) - spell? ( app-text/aspell ) - fam? ( virtual/fam ) - !mail-filter/maildrop - !mail-mta/esmtp - !mail-mta/exim - !mail-mta/msmtp[mta] - !mail-mta/netqmail - !mail-mta/nullmailer - !mail-mta/postfix - !mail-mta/sendmail - !mail-mta/ssmtp[mta] - !mail-mta/opensmtpd - !net-mail/dot-forward - !sys-apps/ucspi-tcp - " - -RDEPEND="${DEPEND} - dev-lang/perl - sys-process/procps" - -# get rid of old style virtual/imapd - bug 350792 -# all blockers really needed? -RDEPEND="${RDEPEND} - !net-mail/courier-imap - !net-mail/cyrus-imapd" - -PDEPEND="pam? ( net-mail/mailbase ) - crypt? ( >=app-crypt/gnupg-1.0.4 )" - -src_prepare() { - use norewrite && eapply "${FILESDIR}/norewrite.patch" - default -} - -src_configure() { - filter-flags '-fomit-frame-pointer' - - local myconf - myconf="" - - use ldap && myconf="${myconf} --with-ldapconfig=/etc/courier/maildropldap.conf" - - econf ${myconf} \ - $(use_with fam) \ - $(use_with ipv6) \ - $(use_with spell ispell) \ - $(use_with ldap ldapaliasd) \ - $(use_enable ldap maildroldap) \ - $(use_with gnutls) \ - --with-notice=unicode \ - --enable-mimetypes=/etc/mime.types \ - --prefix=/usr \ - --disable-root-check \ - --mandir=/usr/share/man \ - --sysconfdir=/etc/courier \ - --datadir=/usr/share/courier \ - --sharedstatedir=/var/lib/courier/com \ - --localstatedir=/var/lib/courier \ - --with-piddir=/var/run/courier \ - --with-authdaemonvar=/var/lib/courier/authdaemon \ - --with-mailuser=mail \ - --with-mailgroup=mail \ - --with-paranoid-smtpext \ - --with-db=gdbm \ - --disable-autorenamesent \ - --cache-file="${S}/configuring.cache" \ - --host="${CHOST}" debug=true || die "./configure" -} - -src_compile() { - default -} - -etc_courier() { - # Import existing /etc/courier/file if it exists. - # Add option only if it was not already set or even commented out - file="${1}" ; word="`echo \"${2}\" | sed -e\"s|=.*$||\" -e\"s|^.*opt ||\"`" - [ ! -e "${D}/etc/courier/${file}" ] && [ -e "/etc/courier/${file}" ] && \ - cp "/etc/courier/${file}" "${D}/etc/courier/${file}" - grep -q "${word}" "${D}/etc/courier/${file}" || \ - echo "${2}" >> "${D}/etc/courier/${file}" -} - -etc_courier_chg() { - file="${1}" ; key="${2}" ; value="${3}" ; section="${4}" - [ -z "${section}" ] && section="${2}" - grep -q "${key}" "${file}" && elog "Changing ${file}: ${key} to ${value}" - sed -i -e"/\#\#NAME: ${section}/,+30 s|${key}=.*|${key}=\"${value}\"|g" ${file} -} - -src_install() { - local f - diropts -o mail -g mail - keepdir /var/lib/courier/tmp - keepdir /var/lib/courier/msgs - make install DESTDIR="${D}" || die "install" - make install-configure DESTDIR="${D}" || die "install-configure" - - # init script takes care of this - rm -rf "${D}/var/run" - - # Get rid of files we dont want - if ! use webmail ; then - rm -rf "${D}/usr/$(get_libdir)/courier/courier/webmail" \ - "${D}/usr/$(get_libdir)/courier/courier/sqwebmaild" \ - "${D}/usr/share/courier/sqwebmail/" \ - "${D}/usr/sbin/webmaild" \ - "${D}/usr/sbin/webgpg" \ - "${D}/etc/courier/webmail.authpam" \ - "${D}/var/lib/courier/webmail-logincache" \ - "${D}"/etc/courier/sqwebmaild* - fi - - if ! use web ; then - rm -rf "${D}/usr/share/courier/courierwebadmin/" \ - "${D}/etc/courier/webadmin" - fi - - for dir2keep in $(cd "${D}" && find ./var/lib/courier -type d) ; do - keepdir "$dir2keep" || die "failed running keepdir: $dir2keep" - done - - newinitd "${FILESDIR}/courier-init-r4" "courier" - use fam || sed -i -e's|^.*use famd$||g' "${D}/etc/init.d/courier" - - cd "${D}/etc/courier" - if use webmail ; then - insinto /etc/courier - newins "${FILESDIR}/apache-sqwebmail.inc" apache-sqwebmail.inc - fi - - for f in *.dist ; do cp "${f}" "${f%%.dist}" ; done - if use ldap ; then - [ -e ldapaliasrc ] && ( chown root:mail ldapaliasrc ; chmod 640 ldapaliasrc ) - else - rm -f ldapaliasrc - fi - - ( [ -e /etc/courier/sizelimit ] && cat /etc/courier/sizelimit || echo 0 ) \ - > "${D}/etc/courier/sizelimit" - etc_courier maildroprc "" - etc_courier esmtproutes "" - etc_courier backuprelay "" - etc_courier locallowercase "" - etc_courier bofh "opt BOFHBADMIME=accept" - etc_courier bofh "opt BOFHSPFTRUSTME=1" - etc_courier bofh "opt BOFHSPFHELO=pass,neutral,unknown,none,error,softfail,fail" - etc_courier bofh "opt BOFHSPFHELO=pass,neutral,unknown,none" - etc_courier bofh "opt BOFHSPFFROM=all" - etc_courier bofh "opt BOFHSPFMAILFROM=all" - etc_courier bofh "#opt BOFHSPFHARDERROR=fail" - etc_courier esmtpd "BOFHBADMIME=accept" - etc_courier esmtpd-ssl "BOFHBADMIME=accept" - etc_courier esmtpd-msa "BOFHBADMIME=accept" - - use fam && etc_courier_chg imapd IMAP_CAPABILITY "IMAP4rev1 UIDPLUS CHILDREN NAMESPACE THREAD=ORDEREDSUBJECT THREAD=REFERENCES SORT QUOTA AUTH=CRAM-MD5 AUTH=CRAM-SHA1 AUTH=CRAM-SHA256 IDLE" - use fam || etc_courier_chg imapd IMAP_CAPABILITY "IMAP4rev1 UIDPLUS CHILDREN NAMESPACE THREAD=ORDEREDSUBJECT THREAD=REFERENCES SORT QUOTA AUTH=CRAM-MD5 AUTH=CRAM-SHA1 AUTH=CRAM-SHA256" - - # Fix for a sandbox violation on subsequential merges - # - ticho@gentoo.org, 2005-07-10 - dosym ../share/courier/pop3d /usr/sbin/courier-pop3d - dosym ../share/courier/pop3d-ssl /usr/sbin/courier-pop3d-ssl - dosym ../share/courier/imapd /usr/sbin/courier-imapd - dosym ../share/courier/imapd-ssl /usr/sbin/courier-imapd-ssl - - cd "${S}" - cp imap/README README.imap - use nls && cp unicode/README README.unicode - dodoc AUTHORS BENCHMARKS COPYING* ChangeLog* INSTALL NEWS README* TODO courier/doc/*.txt - dodoc libs/tcpd/README.couriertls - mv "${D}/usr/share/courier/htmldoc" "${D}/usr/share/doc/${PF}/html" - - if use webmail ; then - insinto /usr/$(get_libdir)/courier/courier - insopts -m 755 -o mail -g mail - doins "${S}/courier/webmaild" - fi - - if use web ; then - insinto /etc/courier/webadmin - insopts -m 400 -o mail -g mail - doins "${FILESDIR}/password.dist" - fi - - # avoid name collisions in /usr/sbin, make webadmin match - cd "${D}/usr/sbin" - for f in imapd imapd-ssl pop3d pop3d-ssl ; do mv "${f}" "courier-${f}" ; done - if use web ; then - sed -i -e 's:\$sbindir\/imapd:\$sbindir\/courier-imapd:g' \ - -e 's:\$sbindir\/imapd-ssl:\$sbindir\/courier-imapd-ssl:g' \ - "${D}/usr/share/courier/courierwebadmin/admin-40imap.pl" \ - || ewarn "failed to fix webadmin" - sed -i -e 's:\$sbindir\/pop3d:\$sbindir\/courier-pop3d:g' \ - -e 's:\$sbindir\/pop3d-ssl:\$sbindir\/courier-pop3d-ssl:g' \ - "${D}/usr/share/courier/courierwebadmin/admin-45pop3.pl" \ - || ewarn "failed to fix webadmin" - fi - - # users should be able to send mail. Could be restricted with suictl. - chmod u+s "${D}/usr/bin/sendmail" - - dosym ../bin/sendmail /usr/sbin/sendmail -} - -src_test() { - if [ `whoami` != 'root' ]; then - # Disable valgrind checks - echo '#!/bin/sh' > libs/imap/testsuitevalgrind - echo '#!/bin/sh' > libs/maildir/testsuitevalgrind - sed -i -e 's:VALGRIND=:#VALGRIND=:g' libs/maildrop/Makefile* - emake -j1 check - else - einfo "make check skipped, can't run as root." - einfo "You can enable it with FEATURES=\"userpriv\"" - fi -} - -pkg_postinst() { - use fam && elog "fam daemon is needed for courier-imapd" \ - || ewarn "courier was built without fam support" -} - -pkg_config() { - mailhost="$(hostname)" - export mailhost - - domainname="$(domainname)" - if [ "x$domainname" = "x(none)" ] ; then - domainname="$(echo ${mailhost} | sed -e "s/[^\.]*\.\(.*\)/\1/")" - fi - export domainname - - if [[ -z "${ROOT}" ]] ; then - file="${ROOT}/etc/courier/locals" - if [ ! -f "${file}" ] ; then - echo "localhost" > "${file}"; - echo "${domainname}" >> "${file}"; - fi - file="${ROOT}/etc/courier/esmtpacceptmailfor.dir/${domainname}" - if [ ! -f "${file}" ] ; then - echo "${domainname}" > "${file}" - /usr/sbin/makeacceptmailfor - fi - - file="${ROOT}/etc/courier/smtpaccess/${domainname}" - if [ ! -f "${file}" ] - then - netstat -nr | grep "^[1-9]" | while read network gateway netmask rest - do - i=1 - net="" - TIFS="${IFS}" - IFS="." - for o in "${netmask}" - do - if [ "${o}" == "255" ] - then - [ "_${net}" == "_" ] || net="${net}." - t="$(echo "${network}" | cut -d " " -f ${i})" - net="${net}${t}" - fi - i="$((${i} + 1))" - done - IFS="${TIFS}" - echo "doing configuration - relay control for the network ${net} !" - echo "${net} allow,RELAYCLIENT" >> ${file} - done - /usr/sbin/makesmtpaccess - fi - fi - - echo "creating cert for esmtpd-ssl:" - /usr/sbin/mkesmtpdcert - echo "creating cert for imapd-ssl:" - /usr/sbin/mkpop3dcert - echo "creating cert for pop3d-ssl:" - /usr/sbin/mkimapdcert -} diff --git a/mail-mta/courier/courier-1.2.3.ebuild b/mail-mta/courier/courier-1.2.3.ebuild deleted file mode 100644 index b2b4f33d26c3..000000000000 --- a/mail-mta/courier/courier-1.2.3.ebuild +++ /dev/null @@ -1,311 +0,0 @@ -# Copyright 1999-2023 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -inherit flag-o-matic - -DESCRIPTION="An MTA designed specifically for maildirs" -HOMEPAGE="https://www.courier-mta.org/" -SRC_URI="mirror://sourceforge/courier/${P}.tar.bz2" - -LICENSE="GPL-3" -SLOT="0" -KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86" -IUSE="postgres ldap mysql pam nls ipv6 spell fax crypt norewrite \ - fam web webmail gnutls" - -DEPEND=" - >=net-libs/courier-authlib-0.72.0 - >=net-libs/courier-unicode-2.2.6:= - net-dns/libidn2:= - gnutls? ( net-libs/gnutls:= ) - !gnutls? ( - dev-libs/openssl:0= - ) - >=sys-libs/gdbm-1.8.0:= - dev-libs/libpcre - app-misc/mime-types - fax? ( >=media-libs/netpbm-9.12 app-text/ghostscript-gpl >=net-dialup/mgetty-1.1.28 ) - pam? ( sys-libs/pam ) - mysql? ( dev-db/mysql-connector-c ) - ldap? ( >=net-nds/openldap-1.2.11:= ) - postgres? ( dev-db/postgresql:= ) - spell? ( app-text/aspell ) - fam? ( virtual/fam ) - !mail-filter/maildrop - !mail-mta/esmtp - !mail-mta/exim - !mail-mta/msmtp[mta] - !mail-mta/netqmail - !mail-mta/nullmailer - !mail-mta/postfix - !mail-mta/sendmail - !mail-mta/ssmtp[mta] - !mail-mta/opensmtpd - !net-mail/dot-forward - !sys-apps/ucspi-tcp - " - -RDEPEND="${DEPEND} - dev-lang/perl - sys-process/procps" - -# get rid of old style virtual/imapd - bug 350792 -# all blockers really needed? -RDEPEND="${RDEPEND} - !net-mail/courier-imap - !net-mail/cyrus-imapd" - -PDEPEND="pam? ( net-mail/mailbase ) - crypt? ( >=app-crypt/gnupg-1.0.4 )" - -src_prepare() { - use norewrite && eapply "${FILESDIR}/norewrite.patch" - default -} - -src_configure() { - filter-flags '-fomit-frame-pointer' - - local myconf - myconf="" - - use ldap && myconf="${myconf} --with-ldapconfig=/etc/courier/maildropldap.conf" - - econf ${myconf} \ - $(use_with fam) \ - $(use_with ipv6) \ - $(use_with spell ispell) \ - $(use_with ldap ldapaliasd) \ - $(use_enable ldap maildroldap) \ - $(use_with gnutls) \ - --with-notice=unicode \ - --enable-mimetypes=/etc/mime.types \ - --prefix=/usr \ - --disable-root-check \ - --mandir=/usr/share/man \ - --sysconfdir=/etc/courier \ - --datadir=/usr/share/courier \ - --sharedstatedir=/var/lib/courier/com \ - --localstatedir=/var/lib/courier \ - --with-piddir=/var/run/courier \ - --with-authdaemonvar=/var/lib/courier/authdaemon \ - --with-mailuser=mail \ - --with-mailgroup=mail \ - --with-paranoid-smtpext \ - --with-db=gdbm \ - --disable-autorenamesent \ - --cache-file="${S}/configuring.cache" \ - --host="${CHOST}" debug=true || die "./configure" -} - -src_compile() { - default -} - -etc_courier() { - # Import existing /etc/courier/file if it exists. - # Add option only if it was not already set or even commented out - file="${1}" ; word="`echo \"${2}\" | sed -e\"s|=.*$||\" -e\"s|^.*opt ||\"`" - [ ! -e "${D}/etc/courier/${file}" ] && [ -e "/etc/courier/${file}" ] && \ - cp "/etc/courier/${file}" "${D}/etc/courier/${file}" - grep -q "${word}" "${D}/etc/courier/${file}" || \ - echo "${2}" >> "${D}/etc/courier/${file}" -} - -etc_courier_chg() { - file="${1}" ; key="${2}" ; value="${3}" ; section="${4}" - [ -z "${section}" ] && section="${2}" - grep -q "${key}" "${file}" && elog "Changing ${file}: ${key} to ${value}" - sed -i -e"/\#\#NAME: ${section}/,+30 s|${key}=.*|${key}=\"${value}\"|g" ${file} -} - -src_install() { - local f - diropts -o mail -g mail - keepdir /var/lib/courier/tmp - keepdir /var/lib/courier/msgs - make install DESTDIR="${D}" || die "install" - make install-configure DESTDIR="${D}" || die "install-configure" - - # init script takes care of this - rm -rf "${D}/var/run" - - # Get rid of files we dont want - if ! use webmail ; then - rm -rf "${D}/usr/$(get_libdir)/courier/courier/webmail" \ - "${D}/usr/$(get_libdir)/courier/courier/sqwebmaild" \ - "${D}/usr/share/courier/sqwebmail/" \ - "${D}/usr/sbin/webmaild" \ - "${D}/usr/sbin/webgpg" \ - "${D}/etc/courier/webmail.authpam" \ - "${D}/var/lib/courier/webmail-logincache" \ - "${D}"/etc/courier/sqwebmaild* - fi - - if ! use web ; then - rm -rf "${D}/usr/share/courier/courierwebadmin/" \ - "${D}/etc/courier/webadmin" - fi - - for dir2keep in $(cd "${D}" && find ./var/lib/courier -type d) ; do - keepdir "$dir2keep" || die "failed running keepdir: $dir2keep" - done - - newinitd "${FILESDIR}/courier-init-r4" "courier" - use fam || sed -i -e's|^.*use famd$||g' "${D}/etc/init.d/courier" - - cd "${D}/etc/courier" - if use webmail ; then - insinto /etc/courier - newins "${FILESDIR}/apache-sqwebmail.inc" apache-sqwebmail.inc - fi - - for f in *.dist ; do cp "${f}" "${f%%.dist}" ; done - if use ldap ; then - [ -e ldapaliasrc ] && ( chown root:mail ldapaliasrc ; chmod 640 ldapaliasrc ) - else - rm -f ldapaliasrc - fi - - ( [ -e /etc/courier/sizelimit ] && cat /etc/courier/sizelimit || echo 0 ) \ - > "${D}/etc/courier/sizelimit" - etc_courier maildroprc "" - etc_courier esmtproutes "" - etc_courier backuprelay "" - etc_courier locallowercase "" - etc_courier bofh "opt BOFHBADMIME=accept" - etc_courier bofh "opt BOFHSPFTRUSTME=1" - etc_courier bofh "opt BOFHSPFHELO=pass,neutral,unknown,none,error,softfail,fail" - etc_courier bofh "opt BOFHSPFHELO=pass,neutral,unknown,none" - etc_courier bofh "opt BOFHSPFFROM=all" - etc_courier bofh "opt BOFHSPFMAILFROM=all" - etc_courier bofh "#opt BOFHSPFHARDERROR=fail" - etc_courier esmtpd "BOFHBADMIME=accept" - etc_courier esmtpd-ssl "BOFHBADMIME=accept" - etc_courier esmtpd-msa "BOFHBADMIME=accept" - - use fam && etc_courier_chg imapd IMAP_CAPABILITY "IMAP4rev1 UIDPLUS CHILDREN NAMESPACE THREAD=ORDEREDSUBJECT THREAD=REFERENCES SORT QUOTA AUTH=CRAM-MD5 AUTH=CRAM-SHA1 AUTH=CRAM-SHA256 IDLE" - use fam || etc_courier_chg imapd IMAP_CAPABILITY "IMAP4rev1 UIDPLUS CHILDREN NAMESPACE THREAD=ORDEREDSUBJECT THREAD=REFERENCES SORT QUOTA AUTH=CRAM-MD5 AUTH=CRAM-SHA1 AUTH=CRAM-SHA256" - - # Fix for a sandbox violation on subsequential merges - # - ticho@gentoo.org, 2005-07-10 - dosym ../share/courier/pop3d /usr/sbin/courier-pop3d - dosym ../share/courier/pop3d-ssl /usr/sbin/courier-pop3d-ssl - dosym ../share/courier/imapd /usr/sbin/courier-imapd - dosym ../share/courier/imapd-ssl /usr/sbin/courier-imapd-ssl - - cd "${S}" - cp imap/README README.imap - use nls && cp unicode/README README.unicode - dodoc AUTHORS BENCHMARKS COPYING* ChangeLog* INSTALL NEWS README* TODO courier/doc/*.txt - dodoc libs/tcpd/README.couriertls - mv "${D}/usr/share/courier/htmldoc" "${D}/usr/share/doc/${PF}/html" - - if use webmail ; then - insinto /usr/$(get_libdir)/courier/courier - insopts -m 755 -o mail -g mail - doins "${S}/courier/webmaild" - fi - - if use web ; then - insinto /etc/courier/webadmin - insopts -m 400 -o mail -g mail - doins "${FILESDIR}/password.dist" - fi - - # avoid name collisions in /usr/sbin, make webadmin match - cd "${D}/usr/sbin" - for f in imapd imapd-ssl pop3d pop3d-ssl ; do mv "${f}" "courier-${f}" ; done - if use web ; then - sed -i -e 's:\$sbindir\/imapd:\$sbindir\/courier-imapd:g' \ - -e 's:\$sbindir\/imapd-ssl:\$sbindir\/courier-imapd-ssl:g' \ - "${D}/usr/share/courier/courierwebadmin/admin-40imap.pl" \ - || ewarn "failed to fix webadmin" - sed -i -e 's:\$sbindir\/pop3d:\$sbindir\/courier-pop3d:g' \ - -e 's:\$sbindir\/pop3d-ssl:\$sbindir\/courier-pop3d-ssl:g' \ - "${D}/usr/share/courier/courierwebadmin/admin-45pop3.pl" \ - || ewarn "failed to fix webadmin" - fi - - # users should be able to send mail. Could be restricted with suictl. - chmod u+s "${D}/usr/bin/sendmail" - - dosym ../bin/sendmail /usr/sbin/sendmail -} - -src_test() { - if [ `whoami` != 'root' ]; then - # Disable valgrind checks - echo '#!/bin/sh' > libs/imap/testsuitevalgrind - echo '#!/bin/sh' > libs/maildir/testsuitevalgrind - sed -i -e 's:VALGRIND=:#VALGRIND=:g' libs/maildrop/Makefile* - emake -j1 check - else - einfo "make check skipped, can't run as root." - einfo "You can enable it with FEATURES=\"userpriv\"" - fi -} - -pkg_postinst() { - use fam && elog "fam daemon is needed for courier-imapd" \ - || ewarn "courier was built without fam support" -} - -pkg_config() { - mailhost="$(hostname)" - export mailhost - - domainname="$(domainname)" - if [ "x$domainname" = "x(none)" ] ; then - domainname="$(echo ${mailhost} | sed -e "s/[^\.]*\.\(.*\)/\1/")" - fi - export domainname - - if [[ -z "${ROOT}" ]] ; then - file="${ROOT}/etc/courier/locals" - if [ ! -f "${file}" ] ; then - echo "localhost" > "${file}"; - echo "${domainname}" >> "${file}"; - fi - file="${ROOT}/etc/courier/esmtpacceptmailfor.dir/${domainname}" - if [ ! -f "${file}" ] ; then - echo "${domainname}" > "${file}" - /usr/sbin/makeacceptmailfor - fi - - file="${ROOT}/etc/courier/smtpaccess/${domainname}" - if [ ! -f "${file}" ] - then - netstat -nr | grep "^[1-9]" | while read network gateway netmask rest - do - i=1 - net="" - TIFS="${IFS}" - IFS="." - for o in "${netmask}" - do - if [ "${o}" == "255" ] - then - [ "_${net}" == "_" ] || net="${net}." - t="$(echo "${network}" | cut -d " " -f ${i})" - net="${net}${t}" - fi - i="$((${i} + 1))" - done - IFS="${TIFS}" - echo "doing configuration - relay control for the network ${net} !" - echo "${net} allow,RELAYCLIENT" >> ${file} - done - /usr/sbin/makesmtpaccess - fi - fi - - echo "creating cert for esmtpd-ssl:" - /usr/sbin/mkesmtpdcert - echo "creating cert for imapd-ssl:" - /usr/sbin/mkpop3dcert - echo "creating cert for pop3d-ssl:" - /usr/sbin/mkimapdcert -} diff --git a/mail-mta/courier/courier-1.2.2.ebuild b/mail-mta/courier/courier-1.3.3.ebuild index b2b4f33d26c3..5a2068123d54 100644 --- a/mail-mta/courier/courier-1.2.2.ebuild +++ b/mail-mta/courier/courier-1.3.3.ebuild @@ -24,7 +24,7 @@ DEPEND=" dev-libs/openssl:0= ) >=sys-libs/gdbm-1.8.0:= - dev-libs/libpcre + dev-libs/libpcre2 app-misc/mime-types fax? ( >=media-libs/netpbm-9.12 app-text/ghostscript-gpl >=net-dialup/mgetty-1.1.28 ) pam? ( sys-libs/pam ) diff --git a/mail-mta/proton-mail-bridge/Manifest b/mail-mta/proton-mail-bridge/Manifest index e9079925b3c2..35a279caf02a 100644 --- a/mail-mta/proton-mail-bridge/Manifest +++ b/mail-mta/proton-mail-bridge/Manifest @@ -1,9 +1,9 @@ -AUX proton-mail-bridge-3.3.2-telemetry_default.patch 408 BLAKE2B 545e1b849e7a6cd6db0075993e57b77eb1090e3aee8d3c14fb0c0ca22960eaff415b676ee3b3d00b058dcd48f6978a33764bcc1b6ac148126c2bcd2526793ea3 SHA512 b366f69c582af26a3ff93d436bbd9f6759cd6767b95f923a0d124266172d6d480a35424587cf0e41d25823943becd6d986218756adc0a62153c1c02f5da51465 +AUX proton-mail-bridge-3.3.2-gui_gentoo.patch 2760 BLAKE2B fc31a27afd24f8f02f0e1864cbc0b863a480dc94991c30e6498dbfb7ab06243dff14f45db31ff665851feccf523310d0b396f3c8ea46e8416b34330f9080b3cc SHA512 d1955987ea62c4148792372cb34f84e828a9b56c29ae04480b66de1f97435ed54d6bc038ca4bb89b0683fbc0d3befd8f4b1355512805e3bbde635f1a3e3ec3f4 AUX proton-mail-bridge.service-r1 341 BLAKE2B 056e68d9d2f009b60708c5bea58e851b3955e3292e44af114976815f597ca813917b2b74082fae5d0146288aefa9a38993d791272073b23bcff51cbed4f4bbdf SHA512 bafea6004077cb2b5d77ebb9fd48ca925be20987b1a1698b68c9853e9c1d95ac2d0d8d77f78fb2b3e7c1e56d4ea4e7d2dcfeef857df189f1ae51a57ce5d0ac93 DIST proton-mail-bridge-3.1.3-deps.tar.xz 206716212 BLAKE2B 4f79e4428ef37452d0abd288e074ecdce8886393582352117b6df5275e1b2f0f8018145c20b8fa889f6473899fd0fde6b621e52cf2faaa218fdac8238134a19b SHA512 fd948e39afaab15d7318c8b46cffd97823857cd8e1c5ba2b2ed3673fcbf186627b190bd876973fbb71854355f4dfba62663e902651716301685dca5f14f26e81 DIST proton-mail-bridge-3.1.3.tar.gz 4443963 BLAKE2B 2c8fc571612c11c0e281e8f268774e886ba3742b696bdd1180d7cf45525d21d9c062cd3d33acb57a6ceed8dad6b864490c89c090ebfd4bceb4e8c41b19015ae8 SHA512 4f4ca3a2b95c7eed34a13d7f8f296d95717b9c1f95bd157e08c3f21cc752ea3dac5eaefac27662f57f875d9690a5d77a9e15f71406280dcaad6f9054b2ef54b9 DIST proton-mail-bridge-3.3.2-deps.tar.xz 252980292 BLAKE2B 2d7c8961c1ed8a6fb15a26f6b3ee650932b89626c0eea1d3acaf24b5ef6b44a90cb021a051a5f018cf94db5ccb029c4b79390275bca9a39ceeb6b5ef62aa1386 SHA512 52ff54e80635e795462e0bdbd5e02b831478a49225d296ec46ef5591cef173c49bcf63d925d503537d57ccaf65a09424f82d1c8ad8e906d822306ca22bba1121 DIST proton-mail-bridge-3.3.2.tar.gz 4481491 BLAKE2B e00cf4268dcebc7f4eeab5a0738c04e1a809a5633b4d97637ea74aa4ac3eb68dd343b45fef5fca602c4c89faa2d1e05f1c605d9b56ee83d669b07b815f8ae92b SHA512 1b49355f8e816b6a00bf7fad91d0f696efb5ee1f5ea311fd4b92549f715185ea280ac874a759be5d3f8c7ff2309b8f0c3bb37c8502963059b26f4630bc9339f0 EBUILD proton-mail-bridge-3.1.3.ebuild 1304 BLAKE2B d84f2164bf3ccf91321f9041c331cf4a2eaeee3e54197f013f0014363a1dea0020febf047641f54bd8db0da7ac7cd0f849b0012764d0a1269e5e7c40f2875833 SHA512 e5c315f34abd46ecdb477fb35eda3f57b4bc31a49efba49adc3327318172c80a89de5605fea51c284ed5bca2b2e2218d1d165487f59447af5d4392dc53190676 -EBUILD proton-mail-bridge-3.3.2.ebuild 1862 BLAKE2B 1d1d3736541ddcc665e052137e0bb1213a1d7f8c495a45dace38ac1cb4687f9d78b78a1d0da04498964fa515f0ab7cb5e862c266c653b875360ce8f20cff59d1 SHA512 24f7655c104f9f508469568ceca7044c833bafd3853f0d472f11e917800c86973601b3f758edaf7e0cf63b707b24b97d9640075c5ac8bf72e2e7e49a3e0da91f +EBUILD proton-mail-bridge-3.3.2.ebuild 2837 BLAKE2B 0e7bfc382172dcc6d8bbd3015b80a8921c3a5eff64a94e66ee1654aa24acc4506bce648b63d7098d4973ec99f58aae5bab6a2c3b876bc1af3720fac3a7e14cfc SHA512 602d809f1b75f34257b380898efa4f6045233cc380812e25aea2f1dbd68ba7a5ed2a9d32bd80c7f8467c2c36abd0b5a2a163cc0a501bd1d26b18af563f98a8ee MISC metadata.xml 594 BLAKE2B 4a52e340f984c6a6b3175e06221d277e59b1bfa0929ac019ca56d1b0eaf8801122a3ebd596784494c85a9fa78ce99f880288785a9a0465bb6b2b44397ab5a43a SHA512 b8627546fa733b97d5aa78ed51feaafb3623b770b2e434704055c0e5e23731c18adf3a9a25c73dd77d916060d8f112959772bf4102ccda78e2188e91b9e03348 diff --git a/mail-mta/proton-mail-bridge/files/proton-mail-bridge-3.3.2-gui_gentoo.patch b/mail-mta/proton-mail-bridge/files/proton-mail-bridge-3.3.2-gui_gentoo.patch new file mode 100644 index 000000000000..6bf34627039f --- /dev/null +++ b/mail-mta/proton-mail-bridge/files/proton-mail-bridge-3.3.2-gui_gentoo.patch @@ -0,0 +1,68 @@ +--- a/internal/frontend/bridge-gui/bridge-gui/CMakeLists.txt ++++ b/internal/frontend/bridge-gui/bridge-gui/CMakeLists.txt +@@ -165,12 +165,9 @@ + WIN32_EXECUTABLE TRUE + MACOSX_BUNDLE TRUE) + +-install(TARGETS bridge-gui +- RUNTIME DESTINATION "${CMAKE_INSTALL_PREFIX}" +- BUNDLE DESTINATION "${CMAKE_INSTALL_PREFIX}" +- LIBRARY DESTINATION "${CMAKE_INSTALL_PREFIX}" +- ) ++install(TARGETS bridge-gui) + ++if(0) + qt_generate_deploy_app_script( + TARGET bridge-gui + FILENAME_VARIABLE deploy_script +@@ -185,3 +182,4 @@ + endif() + + include(Deploy${DEPLOY_OS}.cmake) ++endif() +--- a/internal/frontend/bridge-gui/bridge-gui/main.cpp ++++ b/internal/frontend/bridge-gui/bridge-gui/main.cpp +@@ -53,7 +53,7 @@ + + QString const bridgeLock = "bridge-v3.lock"; ///< The file name used for the bridge-gui lock file. + QString const bridgeGUILock = "bridge-v3-gui.lock"; ///< The file name used for the bridge-gui lock file. +-QString const exeName = "bridge" + exeSuffix; ///< The bridge executable file name.* ++QString const exeName = "proton-mail-bridge" + exeSuffix; ///< The bridge executable file name.* + qint64 const grpcServiceConfigWaitDelayMs = 180000; ///< The wait delay for the gRPC config file in milliseconds. + QString const waitFlag = "--wait"; ///< The wait command-line flag. + +--- a/internal/frontend/bridge-gui/bridgepp/CMakeLists.txt ++++ b/internal/frontend/bridge-gui/bridgepp/CMakeLists.txt +@@ -161,6 +161,9 @@ + + target_precompile_headers(bridgepp PRIVATE Pch.h) + ++install(TARGETS bridgepp) ++ ++if(0) + #***************************************************************************************************************************************************** + # GoogleTest + #***************************************************************************************************************************************************** +@@ -198,3 +201,4 @@ + + include(GoogleTest) + gtest_discover_tests(bridgepp-test) ++endif() +--- a/internal/frontend/bridge-gui/BridgeSetup.cmake ++++ b/internal/frontend/bridge-gui/BridgeSetup.cmake +@@ -45,6 +45,7 @@ + endif() + + ++if(0) + #**************************************************************************************************************************************************** + # vcpkg, toolchain, and architecture + #**************************************************************************************************************************************************** +@@ -87,4 +88,5 @@ + set(VCPKG_TARGET_TRIPLET x64-windows) + endif() + +-set(CMAKE_TOOLCHAIN_FILE "${VCPKG_ROOT}/scripts/buildsystems/vcpkg.cmake" CACHE STRING "toolchain") +\ No newline at end of file ++set(CMAKE_TOOLCHAIN_FILE "${VCPKG_ROOT}/scripts/buildsystems/vcpkg.cmake" CACHE STRING "toolchain") ++endif() diff --git a/mail-mta/proton-mail-bridge/files/proton-mail-bridge-3.3.2-telemetry_default.patch b/mail-mta/proton-mail-bridge/files/proton-mail-bridge-3.3.2-telemetry_default.patch deleted file mode 100644 index 3c8df6c2ef9d..000000000000 --- a/mail-mta/proton-mail-bridge/files/proton-mail-bridge-3.3.2-telemetry_default.patch +++ /dev/null @@ -1,14 +0,0 @@ -Such things really should be opt-in rather than opt-out, and doubly so given -Gentoo does not package the bridge GUI yet. - ---- a/internal/vault/types_settings.go -+++ b/internal/vault/types_settings.go -@@ -96,7 +96,7 @@ - ShowAllMail: true, - Autostart: true, - AutoUpdate: true, -- TelemetryDisabled: false, -+ TelemetryDisabled: true, - - LastVersion: "0.0.0", - FirstStart: true, diff --git a/mail-mta/proton-mail-bridge/proton-mail-bridge-3.3.2.ebuild b/mail-mta/proton-mail-bridge/proton-mail-bridge-3.3.2.ebuild index 7d85059d6295..013049b4d5c9 100644 --- a/mail-mta/proton-mail-bridge/proton-mail-bridge-3.3.2.ebuild +++ b/mail-mta/proton-mail-bridge/proton-mail-bridge-3.3.2.ebuild @@ -3,7 +3,7 @@ EAPI=8 -inherit go-module systemd xdg-utils +inherit cmake go-module systemd xdg-utils MY_PN="${PN/-mail/}" MY_P="${MY_PN}-${PV}" @@ -22,11 +22,21 @@ IUSE="gui" PROPERTIES="test_network" RESTRICT="test" -RDEPEND="app-crypt/libsecret" +RDEPEND="app-crypt/libsecret + gui? ( + >=dev-libs/protobuf-21.12:= + dev-libs/sentry-native + dev-qt/qtbase:6=[gui,icu,widgets] + dev-qt/qtdeclarative:6=[widgets] + dev-qt/qtsvg:6= + media-libs/mesa + net-libs/grpc:= + ) +" DEPEND="${RDEPEND}" PATCHES=( - "${FILESDIR}"/${PN}-3.3.2-telemetry_default.patch + "${FILESDIR}"/${PN}-3.3.2-gui_gentoo.patch ) S="${WORKDIR}"/${MY_P} @@ -34,14 +44,39 @@ S="${WORKDIR}"/${MY_P} src_prepare() { xdg_environment_reset default + if use gui; then + local PATCHES=() + BUILD_DIR="${WORKDIR}"/gui_build \ + CMAKE_USE_DIR="${S}"/internal/frontend/bridge-gui/bridge-gui \ + cmake_src_prepare + fi +} + +src_configure() { + if use gui; then + # TODO: + # - auto-sync version number between the two executables + # - can we leave BRIDGE_TAG unset? Seems it gets displayed in some info box + local mycmakeargs=( + -DBRIDGE_APP_FULL_NAME="Proton Mail Bridge" + -DBRIDGE_APP_VERSION="${PV}+git" + -DBRIDGE_REPO_ROOT="${S}" + -DBRIDGE_TAG="NOTAG" + -DBRIDGE_VENDOR="Gentoo Linux" + ) + BUILD_DIR="${WORKDIR}"/gui_build \ + CMAKE_USE_DIR="${S}"/internal/frontend/bridge-gui/bridge-gui \ + cmake_src_configure + fi } src_compile() { + emake build-nogui + if use gui; then - eerror "Since version 3.0.0, GUI support in ${PN} requires Qt6 and is therefore currently not available" - die "USE=gui requires Qt6" - else - emake build-nogui + BUILD_DIR="${WORKDIR}"/gui_build \ + CMAKE_USE_DIR="${S}"/internal/frontend/bridge-gui/bridge-gui \ + cmake_src_compile fi } @@ -53,31 +88,32 @@ src_install() { exeinto /usr/bin newexe bridge ${PN} + if use gui; then + BUILD_DIR="${WORKDIR}"/gui_build \ + CMAKE_USE_DIR="${S}"/internal/frontend/bridge-gui/bridge-gui \ + cmake_src_install + mv "${ED}"/usr/bin/bridge-gui "${ED}"/usr/bin/${PN}-gui || die + fi + systemd_newuserunit "${FILESDIR}"/${PN}.service-r1 ${PN}.service einstalldocs } pkg_postinst() { - use gui && xdg_icon_cache_update - if [[ -n "${REPLACING_VERSIONS}" ]]; then local oldver for oldver in ${REPLACING_VERSIONS}; do if ver_test "${oldver}" -lt 3.2.0; then - ewarn "Please note that since version 3.2.0, ${PN} can share usage statistics with upstream." + ewarn "Please note that since version 3.2.0, ${PN} by default shares usage statistics with upstream." ewarn "For details, please see" ewarn ewarn " https://proton.me/support/share-usage-statistics" ewarn - ewarn "Gentoo ebuilds change the default value of the 'send telemetry' setting to disabled." + ewarn "This behaviour can be disabled through ${PN}-gui, under Advanced Settings." ewarn break fi done fi } - -pkg_postrm() { - use gui && xdg_icon_cache_update -} |