diff options
Diffstat (limited to 'net-mail')
46 files changed, 1502 insertions, 311 deletions
diff --git a/net-mail/Manifest.gz b/net-mail/Manifest.gz Binary files differindex ce0afa64fa3f..8f892d64ebb7 100644 --- a/net-mail/Manifest.gz +++ b/net-mail/Manifest.gz diff --git a/net-mail/checkpassword/Manifest b/net-mail/checkpassword/Manifest index 2bd1ccab8c7b..79c52887face 100644 --- a/net-mail/checkpassword/Manifest +++ b/net-mail/checkpassword/Manifest @@ -2,5 +2,5 @@ AUX checkpassword-0.90-errno.patch 242 BLAKE2B 6707ecdb11de768738d99f4800e22f0b7 AUX checkpassword-0.90-exit.patch 294 BLAKE2B f53db5be00b507847a452074f923ae2b03b803b170cda09151c8496a420ad7cb12a65404fad29b1f946c8a6f9bfd039f78334c93289fa2a56c86f5707d94b9dd SHA512 18935a04c6fb273ed5e813b2e4af65ff2c65bce8c7d45e93a28fe59068ba50fd7999c7f01c50834354ce3b79968e773a99e9e402b023f01bdb7183650cb50bd5 AUX checkpassword-0.90-headers.patch 3104 BLAKE2B 4b704b7be3580e87e75968ca4ec235c88ef63ae106068263c40eba929924d8b89792b612969acb0a64ffaa9078de6f29be5eb98da625fae9d0a1983d52fd70ba SHA512 f8e99c0da9baeb43085cdddd97322e42ca6ea56aa45059f1f7f148e9df65274d3a435f539aee3f603484cb89bc388ef52f10bce08f0442991a685d18e49584f2 DIST checkpassword-0.90.tar.gz 15631 BLAKE2B e37f6d08c8a8d487705bd9260d2c3370798697af16f50856ede26866248bbdda2719a24077423d7c9f060053074d34b5ec47d064328f903eddce3fa262f3c559 SHA512 301d574c9f2c4c7fef6afb98818f424a43f644e456c6268234e73da898710b0f4b6797a80d240c270c5319398574349bedf6a2c9757e432f293f85ec8c01f51f -EBUILD checkpassword-0.90-r4.ebuild 903 BLAKE2B 5b8b2b8dd870e44396bd8a4071dcfd36cdd255435a42b055ac6172838cc1c68118c0f543e5bfecd811c4eed1c2ee97905479060374f9cb77b35af23b7ae9de0d SHA512 7ddb1cf0e0bccaa6114d6041344e5407520ec5461ced1801225ac2973b4c3e891c8d93ddcbed47fa8b1e0e851a485c761a6695adb39b6dc360ad3848320479e5 +EBUILD checkpassword-0.90-r4.ebuild 916 BLAKE2B 0c9efadbd44ebe838e81694f0f5f21569573246947cebadfe3963935016965a552e71afce3bfc7f1b3b9bcba557349f5ab4148b9c230ddf12282e92a68b25621 SHA512 0937ba5d43103f65378dbdfe629961f3cde1bb89bb21a4c07c0e12fd083a59ef4714e39fedcd126ac98713db6eb77d78ca0c233ad9b2b1f38575b6da5d357e8a MISC metadata.xml 268 BLAKE2B 914b6995ad966e2b83ec718b2598969b181c119d8805241b0046f69e161ac22a9f769204f4783240056804008475aa406cbd91b9de499ec7840f9595158bd291 SHA512 ffda1db3fd6ac952f41a970e2e496c6a9fd0b12ed11cdf363fd269c3b00f627c6e70421fd545aad61d69594af2e5f43d8ebc197232a39b596d012818fe758850 diff --git a/net-mail/checkpassword/checkpassword-0.90-r4.ebuild b/net-mail/checkpassword/checkpassword-0.90-r4.ebuild index 5020585a2677..ac723ca4c9f3 100644 --- a/net-mail/checkpassword/checkpassword-0.90-r4.ebuild +++ b/net-mail/checkpassword/checkpassword-0.90-r4.ebuild @@ -3,7 +3,7 @@ EAPI=7 -inherit fixheadtails toolchain-funcs +inherit fixheadtails flag-o-matic toolchain-funcs DESCRIPTION="A uniform password checking interface for root applications" HOMEPAGE="https://cr.yp.to/checkpwd.html" diff --git a/net-mail/dovecot/Manifest b/net-mail/dovecot/Manifest index 224b6e3a24f0..b29af1f3140f 100644 --- a/net-mail/dovecot/Manifest +++ b/net-mail/dovecot/Manifest @@ -1,4 +1,5 @@ AUX dovecot-2.3.11.3-apop-fix.patch 2226 BLAKE2B 47971fc29ff3add43ca7ee253c4e1579dd22e603c6692f592c605a742330df80309ee06f8bb811e64de03392e0dee19efe1964229f61209b9f48fb0dd557b7d2 SHA512 6ebc10a6e0ca9f4790cbe57a9e9283838c5fbe124e9be305fcd16e472a5edea97a055700613fb6a1a43fe139537da80a603493f250b34f2179f969da2a09f2cc +AUX dovecot-fix-search-crash.patch 3417 BLAKE2B 3d3b63d7be8d19fea2f159b6191fb1dcb94be4abe6cbbde5984c0c6e55fcb56a6e32bbe07650a2d218b3ecc55ede620e95befff24dce3a562733b119142e216d SHA512 9cb34a7f6de6d19ec7d6e4c3206c5d15f6531f92027d7dbef21284206ddd9f3418d4a1266d2860789dfa56f97579a89f3cafc54f24152f321dddb9b470d9f473 AUX dovecot-unwind-generic.patch 645 BLAKE2B 6598abbd2819f7109d4caacbce5123b8810b93b623956561a12a749cbc582667caa160eac62305067db6037f820c8e1a8bd8a22da09a454afcb9e21209cc5fd3 SHA512 6ede0edd5bd6d1123ff1567886898eee5795baa549c610ba8a3567c0f8fee27d69028aaf8b6067c2f37b915a07e165aa0d6a2d5fb8314deffd61a187b18de4ae AUX dovecot-userdb-passwd-fix.patch 500 BLAKE2B 133e7b13cf3dd1515db5694945abd2d00ecd89c4a766ea873099ebbdd450700e70b80696ba58b21cc4f7160fa3becde6453c9334d41cdad426e3f59bd9e5491e SHA512 18a26eed0c793b0ccee828dc5eafc6448dda94d705597b19c3333f21944e838b677af2884f5fb65eb2f6dc79158ad8b3143b24d3788d841038de6dd24885fc0d AUX dovecot.init-r6 1573 BLAKE2B 206318cbf7a6ef0276cb93237b091dd34dc2603a00f13ed288c787dc81f8902e770f7774c54eba90de49e9634eb93873046a043bd7825cfb65bab5b2ea9ce108 SHA512 982f9897e4a0a5a3957bb12785961c9cde72a2c941f55efdb23e9a26cec19efe89e3be4effe79522c297ea2b258d201db78c19b6e3f9cd5e68d3736c2a0f0063 @@ -12,7 +13,8 @@ DIST dovecot-2.3.11.3.tar.gz 7353412 BLAKE2B 0067989b35fe29c0d23f6ca25712a87fa69 DIST dovecot-2.3.7.2.tar.gz 7076231 BLAKE2B 2cb93aa594db722489063b490469dfe284b1f997b64c9a699b506ccbd04e8e7c2d503ddc12a2598958dfca88560c19487801a728f386b8fea5f637a75b83812e SHA512 172f7f0edb884259e4c050607510aee67a35c3a20b7dd147e7c8a25a04921c18f7d6b5c85af2c69ae8c4d53791550970e471b033dbfae94253e331053b6a317d EBUILD dovecot-2.2.36.4.ebuild 8605 BLAKE2B b649cd8db3cc6ed5fe93a6013a16e7f99a121e35d684fdfa9fc74aec1487f571fb1f59f4433ad89a6bdcd33de0d916b111226a33bdacc084383580c881d98551 SHA512 811bd1cb2ebec984f98d02a975c7774e0449e1b87c26840107d2e93c79ba69f0c8714d2db5c63513233893c0230080d2fd002962aa6b536f12f6ba6d36f7b5a9 EBUILD dovecot-2.3.10.1.ebuild 8629 BLAKE2B 4d664f1ff75b846a2be7dcca52b7189efac3c6f95e40a0af935dd16f857c51db53aa72023e94b4ae86a5bf892475fd4259dc5085ea41a5053b702ced5b2725cd SHA512 d783676c087faaa047de828eb6a38f21a4512e81cea4a1dcb03d4e852518cb520cfa66d88540a63c3805fdc1144f4895d8a4db8269c3bbf93691bcea080dcbec -EBUILD dovecot-2.3.11.3-r1.ebuild 8830 BLAKE2B becfd7b5ea04d99bca605ab6a45a5a009cc43bb4d8bf0a1c86a4686ef8026ce39a609ca80e5d88bcf8cd301caa28d4d899f25e2bde02b183d95a9a1b1717debb SHA512 61e9918c800bc1c074cfddca4e71859f24dc57905f6ebac7dece8e5fe7b6aabebdf691b0126b9aed4c868ee74e2ee4e7a36c042e97ef7f032d6da1f2a24f8f2d +EBUILD dovecot-2.3.11.3-r1.ebuild 8837 BLAKE2B 668d4a31360b252a60ebf808038bdf9c20c67d069098d2aa698a96479e40ffd5f9355fc5c720896d196d9cb4821881caef2cacc341dd9df147bb67bad8c76eaa SHA512 021460cdab894122d2ff9265cb2e909518a362295ae77bb04735d0e995464f9feec7695651055ca78c6716c890f50a976b057e9c7745d3d90740af8efeb550de +EBUILD dovecot-2.3.11.3-r2.ebuild 8882 BLAKE2B 11c3702ab1c2fd8f885ab69c177b03b6ca997aa10b0360b94b9f84e99b195eeb28d27f2dc323b151eda418d7e8c3244100fdfc83521ef0f071530201a584594a SHA512 061968137d1af8c8a1c42c0af82352fac8633896a324488931f12c93c1cc754eb550e819244b348263c15f5b1d4e7645cc55bacc7a57b2ba856d056c8c3920c8 EBUILD dovecot-2.3.11.3.ebuild 8676 BLAKE2B 3ec42d4194a1db2e6090f223af7d9859c85cb134e31dfad5ed53a8d420594c95b4a57634e88ffbfd057a07c346677134dcb980d3bfda253c5cb1a07e5c7638be SHA512 cc1019fbd851ca8a2e27f9ee9d4004730af8b6eea64c00ee99fa816cd5229e8f523cc6f61ba52ebaf0f684d07d1076cbb497e5720c6b9108c00128803f07e8ab EBUILD dovecot-2.3.7.2.ebuild 8717 BLAKE2B 2aef6fffe859d0965f3e809739cdec16165fc4935cda3eae6ea89dce803366ac7fb0ad0dd1a95b3a4ee040a2be61cb44e58e61fb44feb47d0ef9e3496febe30e SHA512 3412f9224528f4872777d580e352e8cd679b7d1a9f88a20594e56358cd026f74343b624205e8ea0972ead3b3c9157a8061ddc7c3181c183fb6caf1d1c2f2f515 MISC metadata.xml 998 BLAKE2B c65428e9f0019e942fc1d634d53c2a85c7f8a699e34cf9c49ae09bfe9ce8a54fd368512f7a4d74f6a10baff949a9fe8021e1e0c009f8315b100fb5736efd34ae SHA512 f285f0928dc0915c8e8cebb966de84f5564be9f7dd3baa7c0cccb3343da75507003aeadf80fe34ffb4b69dd9208997a80fdb47c20bfd65fdc60c43423a00813c diff --git a/net-mail/dovecot/dovecot-2.3.11.3-r1.ebuild b/net-mail/dovecot/dovecot-2.3.11.3-r1.ebuild index 8e907759746f..1c463e0ac87c 100644 --- a/net-mail/dovecot/dovecot-2.3.11.3-r1.ebuild +++ b/net-mail/dovecot/dovecot-2.3.11.3-r1.ebuild @@ -28,7 +28,7 @@ HOMEPAGE="https://www.dovecot.org/" SLOT="0" LICENSE="LGPL-2.1 MIT" -KEYWORDS="~alpha ~amd64 arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86" +KEYWORDS="~alpha ~amd64 arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86" IUSE_DOVECOT_AUTH="kerberos ldap lua mysql pam postgres sqlite vpopmail" IUSE_DOVECOT_COMPRESS="bzip2 lzma lz4 zlib zstd" diff --git a/net-mail/dovecot/dovecot-2.3.11.3-r2.ebuild b/net-mail/dovecot/dovecot-2.3.11.3-r2.ebuild new file mode 100644 index 000000000000..2b42893baff2 --- /dev/null +++ b/net-mail/dovecot/dovecot-2.3.11.3-r2.ebuild @@ -0,0 +1,297 @@ +# Copyright 1999-2020 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +# do not add a ssl USE flag. ssl is mandatory +SSL_DEPS_SKIP=1 +inherit autotools ssl-cert systemd toolchain-funcs + +MY_P="${P/_/.}" +#MY_S="${PN}-ce-${PV}" +major_minor="$(ver_cut 1-2)" +sieve_version="0.5.11" +if [[ ${PV} == *_rc* ]] ; then + rc_dir="rc/" +else + rc_dir="" +fi +SRC_URI="https://dovecot.org/releases/${major_minor}/${rc_dir}${MY_P}.tar.gz + sieve? ( + https://pigeonhole.dovecot.org/releases/${major_minor}/${rc_dir}${PN}-${major_minor}-pigeonhole-${sieve_version}.tar.gz + ) + managesieve? ( + https://pigeonhole.dovecot.org/releases/${major_minor}/${rc_dir}${PN}-${major_minor}-pigeonhole-${sieve_version}.tar.gz + ) " +DESCRIPTION="An IMAP and POP3 server written with security primarily in mind" +HOMEPAGE="https://www.dovecot.org/" + +SLOT="0" +LICENSE="LGPL-2.1 MIT" +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86" + +IUSE_DOVECOT_AUTH="kerberos ldap lua mysql pam postgres sqlite vpopmail" +IUSE_DOVECOT_COMPRESS="bzip2 lzma lz4 zlib zstd" +IUSE_DOVECOT_OTHER="argon2 caps doc ipv6 libressl lucene managesieve rpc selinux sieve solr static-libs suid tcpd textcat unwind" + +IUSE="${IUSE_DOVECOT_AUTH} ${IUSE_DOVECOT_COMPRESS} ${IUSE_DOVECOT_OTHER}" + +DEPEND="argon2? ( dev-libs/libsodium ) + bzip2? ( app-arch/bzip2 ) + caps? ( sys-libs/libcap ) + kerberos? ( virtual/krb5 ) + ldap? ( net-nds/openldap ) + lua? ( dev-lang/lua:* ) + lucene? ( >=dev-cpp/clucene-2.3 ) + lzma? ( app-arch/xz-utils ) + lz4? ( app-arch/lz4 ) + mysql? ( dev-db/mysql-connector-c:0= ) + pam? ( sys-libs/pam ) + postgres? ( dev-db/postgresql:* !dev-db/postgresql[ldap,threads] ) + rpc? ( net-libs/libtirpc net-libs/rpcsvc-proto ) + selinux? ( sec-policy/selinux-dovecot ) + solr? ( net-misc/curl dev-libs/expat ) + sqlite? ( dev-db/sqlite:* ) + !libressl? ( dev-libs/openssl:0= ) + libressl? ( dev-libs/libressl:0= ) + suid? ( acct-group/mail ) + tcpd? ( sys-apps/tcp-wrappers ) + textcat? ( app-text/libexttextcat ) + unwind? ( sys-libs/libunwind ) + vpopmail? ( net-mail/vpopmail ) + zlib? ( sys-libs/zlib ) + zstd? ( app-arch/zstd ) + virtual/libiconv + dev-libs/icu:=" + +RDEPEND="${DEPEND} + acct-group/dovecot + acct-group/dovenull + acct-user/dovecot + acct-user/dovenull + net-mail/mailbase" + +PATCHES=( + "${FILESDIR}/${P}"-apop-fix.patch + "${FILESDIR}/${PN}"-unwind-generic.patch + "${FILESDIR}/${PN}"-fix-search-crash.patch + ) + +pkg_setup() { + if use managesieve && ! use sieve; then + ewarn "managesieve USE flag selected but sieve USE flag unselected" + ewarn "sieve USE flag will be turned on" + fi +} + +src_prepare() { + default + # bug 657108 + #elibtoolize + eautoreconf +} + +src_configure() { + local conf="" + + if use postgres || use mysql || use sqlite; then + conf="${conf} --with-sql" + fi + + # turn valgrind tests off. Bug #340791 + VALGRIND=no econf \ + --with-rundir="${EPREFIX}/run/dovecot" \ + --with-statedir="${EPREFIX}/var/lib/dovecot" \ + --with-moduledir="${EPREFIX}/usr/$(get_libdir)/dovecot" \ + --without-stemmer \ + --disable-rpath \ + --without-libbsd \ + --with-icu \ + --with-ssl \ + --with-systemdsystemunitdir="$(systemd_get_systemunitdir)" \ + $( use_with argon2 sodium ) \ + $( use_with bzip2 bzlib ) \ + $( use_with caps libcap ) \ + $( use_with kerberos gssapi ) \ + $( use_with lua ) \ + $( use_with ldap ) \ + $( use_with lucene ) \ + $( use_with lz4 ) \ + $( use_with lzma ) \ + $( use_with mysql ) \ + $( use_with pam ) \ + $( use_with postgres pgsql ) \ + $( use_with sqlite ) \ + $( use_with solr ) \ + $( use_with tcpd libwrap ) \ + $( use_with textcat ) \ + $( use_with unwind libunwind ) \ + $( use_with vpopmail ) \ + $( use_with zlib ) \ + $( use_with zstd ) \ + $( use_enable static-libs static ) \ + ${conf} + + if use sieve || use managesieve ; then + # The sieve plugin needs this file to be build to determine the plugin + # directory and the list of libraries to link to. + emake dovecot-config + cd "../dovecot-${major_minor}-pigeonhole-${sieve_version}" || die "cd failed" + econf \ + $( use_enable static-libs static ) \ + --localstatedir="${EPREFIX}/var" \ + --enable-shared \ + --with-dovecot="${S}" \ + $( use_with managesieve ) + fi +} + +src_compile() { + default + if use sieve || use managesieve ; then + cd "../dovecot-${major_minor}-pigeonhole-${sieve_version}" || die "cd failed" + emake CC="$(tc-getCC)" CFLAGS="${CFLAGS}" + fi +} + +src_test() { + default + if use sieve || use managesieve ; then + cd "../dovecot-${major_minor}-pigeonhole-${sieve_version}" || die "cd failed" + default + fi +} + +src_install() { + default + + # insecure: + # use suid && fperms u+s /usr/libexec/dovecot/deliver + # better: + if use suid;then + einfo "Changing perms to allow deliver to be suided" + fowners root:mail "/usr/libexec/dovecot/dovecot-lda" + fperms 4750 "/usr/libexec/dovecot/dovecot-lda" + fi + + newinitd "${FILESDIR}"/dovecot.init-r6 dovecot + + rm -rf "${ED}"/usr/share/doc/dovecot + + dodoc AUTHORS NEWS README TODO + dodoc doc/*.{txt,cnf,xml,sh} + docinto example-config + dodoc doc/example-config/*.{conf,ext} + docinto example-config/conf.d + dodoc doc/example-config/conf.d/*.{conf,ext} + docinto wiki + dodoc doc/wiki/* + doman doc/man/*.{1,7} + + # Create the dovecot.conf file from the dovecot-example.conf file that + # the dovecot folks nicely left for us.... + local conf="${ED}/etc/dovecot/dovecot.conf" + local confd="${ED}/etc/dovecot/conf.d" + + insinto /etc/dovecot + doins doc/example-config/*.{conf,ext} + insinto /etc/dovecot/conf.d + doins doc/example-config/conf.d/*.{conf,ext} + fperms 0600 /etc/dovecot/dovecot-{ldap,sql}.conf.ext + rm -f "${confd}/../README" + + # .maildir is the Gentoo default + local mail_location="maildir:~/.maildir" + sed -i -e \ + "s|#mail_location =|mail_location = ${mail_location}|" \ + "${confd}/10-mail.conf" \ + || die "failed to update mail location settings in 10-mail.conf" + + # We're using pam files (imap and pop3) provided by mailbase + if use pam; then + sed -i -e '/driver = pam/,/^[ \t]*}/ s|#args = dovecot|args = "\*"|' \ + "${confd}/auth-system.conf.ext" \ + || die "failed to update PAM settings in auth-system.conf.ext" + # mailbase does not provide a sieve pam file + use managesieve && dosym imap /etc/pam.d/sieve + sed -i -e \ + 's/#!include auth-system.conf.ext/!include auth-system.conf.ext/' \ + "${confd}/10-auth.conf" \ + || die "failed to update PAM settings in 10-auth.conf" + fi + + # Disable ipv6 if necessary + if ! use ipv6; then + sed -i -e 's/^#listen = \*, ::/listen = \*/g' "${conf}" \ + || die "failed to update listen settings in dovecot.conf" + fi + + # Update ssl cert locations + sed -i -e 's:^#ssl = yes:ssl = yes:' "${confd}/10-ssl.conf" \ + || die "ssl conf failed" + sed -i -e 's:^ssl_cert =.*:ssl_cert = </etc/ssl/dovecot/server.pem:' \ + -e 's:^ssl_key =.*:ssl_key = </etc/ssl/dovecot/server.key:' \ + "${confd}/10-ssl.conf" || die "failed to update SSL settings in 10-ssl.conf" + + # Install SQL configuration + if use mysql || use postgres; then + sed -i -e \ + 's/#!include auth-sql.conf.ext/!include auth-sql.conf.ext/' \ + "${confd}/10-auth.conf" || die "failed to update SQL settings in \ + 10-auth.conf" + fi + + # Install LDAP configuration + if use ldap; then + sed -i -e \ + 's/#!include auth-ldap.conf.ext/!include auth-ldap.conf.ext/' \ + "${confd}/10-auth.conf" \ + || die "failed to update ldap settings in 10-auth.conf" + fi + + if use vpopmail; then + sed -i -e \ + 's/#!include auth-vpopmail.conf.ext/!include auth-vpopmail.conf.ext/' \ + "${confd}/10-auth.conf" \ + || die "failed to update vpopmail settings in 10-auth.conf" + fi + + if use sieve || use managesieve ; then + cd "../dovecot-${major_minor}-pigeonhole-${sieve_version}" || die "cd failed" + emake DESTDIR="${ED}" install + sed -i -e \ + 's/^[[:space:]]*#mail_plugins = $mail_plugins/mail_plugins = sieve/' "${confd}/15-lda.conf" \ + || die "failed to update sieve settings in 15-lda.conf" + rm -rf "${ED}"/usr/share/doc/dovecot + docinto example-config/conf.d + dodoc doc/example-config/conf.d/*.conf + insinto /etc/dovecot/conf.d + doins doc/example-config/conf.d/90-sieve{,-extprograms}.conf + use managesieve && doins doc/example-config/conf.d/20-managesieve.conf + docinto sieve/rfc + dodoc doc/rfc/*.txt + docinto sieve/devel + dodoc doc/devel/DESIGN + docinto plugins + dodoc doc/plugins/*.txt + docinto extensions + dodoc doc/extensions/*.txt + docinto locations + dodoc doc/locations/*.txt + doman doc/man/*.{1,7} + fi + + use static-libs || find "${ED}"/usr/lib* -name '*.la' -delete +} + +pkg_postinst() { + # Let's not make a new certificate if we already have one + if ! [[ -e "${ROOT}"/etc/ssl/dovecot/server.pem && \ + -e "${ROOT}"/etc/ssl/dovecot/server.key ]]; then + einfo "Creating SSL certificate" + SSL_ORGANIZATION="${SSL_ORGANIZATION:-Dovecot IMAP Server}" + install_cert /etc/ssl/dovecot/server + fi + + elog "Please read https://doc.dovecot.org/installation_guide/upgrading/ for upgrade notes." +} diff --git a/net-mail/dovecot/files/dovecot-fix-search-crash.patch b/net-mail/dovecot/files/dovecot-fix-search-crash.patch new file mode 100644 index 000000000000..860c070a433a --- /dev/null +++ b/net-mail/dovecot/files/dovecot-fix-search-crash.patch @@ -0,0 +1,91 @@ +gentoo bug #756094 + +From a668d767a710ca18ab6e7177d8e8be22a6b024fb Mon Sep 17 00:00:00 2001 +From: Timo Sirainen <timo.sirainen@open-xchange.com> +Date: Mon, 31 Aug 2020 20:38:42 +0300 +Subject: [PATCH] lib-mail: message_parser_init_from_parts() - Fix crash if + MIME boundaries don't end + +If the last "boundary--" doens't exist, the parsing assert-crashed at +deinit. This mainly happened when searching mails. + +Fixes: +Panic: file message-parser.c: line 175 (message_part_finish): assertion failed: (ctx->nested_parts_count > 0) +--- + src/lib-mail/message-parser.c | 13 ++++++++----- + src/lib-mail/test-message-parser.c | 21 ++++++++++++++++++++- + 2 files changed, 28 insertions(+), 6 deletions(-) + +diff --git a/src/lib-mail/message-parser.c b/src/lib-mail/message-parser.c +index 011dea9050..8baf622e59 100644 +--- a/src/lib-mail/message-parser.c ++++ b/src/lib-mail/message-parser.c +@@ -138,6 +138,7 @@ message_part_append(struct message_parser_ctx *ctx) + struct message_part *parent = ctx->part; + struct message_part *part; + ++ i_assert(!ctx->preparsed); + i_assert(parent != NULL); + i_assert((parent->flags & (MESSAGE_PART_FLAG_MULTIPART | + MESSAGE_PART_FLAG_MESSAGE_RFC822)) != 0); +@@ -171,12 +172,14 @@ static void message_part_finish(struct message_parser_ctx *ctx) + { + struct message_part **const *parent_next_partp; + +- i_assert(ctx->nested_parts_count > 0); +- ctx->nested_parts_count--; ++ if (!ctx->preparsed) { ++ i_assert(ctx->nested_parts_count > 0); ++ ctx->nested_parts_count--; + +- parent_next_partp = array_back(&ctx->next_part_stack); +- array_pop_back(&ctx->next_part_stack); +- ctx->next_part = *parent_next_partp; ++ parent_next_partp = array_back(&ctx->next_part_stack); ++ array_pop_back(&ctx->next_part_stack); ++ ctx->next_part = *parent_next_partp; ++ } + + message_size_add(&ctx->part->parent->body_size, &ctx->part->body_size); + message_size_add(&ctx->part->parent->body_size, &ctx->part->header_size); +diff --git a/src/lib-mail/test-message-parser.c b/src/lib-mail/test-message-parser.c +index 13984f939e..a00f0d6200 100644 +--- a/src/lib-mail/test-message-parser.c ++++ b/src/lib-mail/test-message-parser.c +@@ -178,9 +178,10 @@ static void test_message_parser_small_blocks(void) + static void test_message_parser_stop_early(void) + { + struct message_parser_ctx *parser; +- struct istream *input; ++ struct istream *input, *input2; + struct message_part *parts; + struct message_block block; ++ const char *error; + unsigned int i; + pool_t pool; + int ret; +@@ -198,6 +199,24 @@ static void test_message_parser_stop_early(void) + &block)) > 0) ; + test_assert(ret == 0); + message_parser_deinit(&parser, &parts); ++ ++ /* test preparsed - first re-parse everything with a stream ++ that sees EOF at this position */ ++ input2 = i_stream_create_from_data(test_msg, i); ++ parser = message_parser_init(pool, input2, &set_empty); ++ while ((ret = message_parser_parse_next_block(parser, ++ &block)) > 0) ; ++ test_assert(ret == -1); ++ message_parser_deinit(&parser, &parts); ++ ++ /* now parse from the parts */ ++ i_stream_seek(input2, 0); ++ parser = message_parser_init_from_parts(parts, input2, &set_empty); ++ while ((ret = message_parser_parse_next_block(parser, ++ &block)) > 0) ; ++ test_assert(ret == -1); ++ test_assert(message_parser_deinit_from_parts(&parser, &parts, &error) == 0); ++ i_stream_unref(&input2); + } + + i_stream_unref(&input); diff --git a/net-mail/fetchmail/Manifest b/net-mail/fetchmail/Manifest index e96343c8460a..59e847922b39 100644 --- a/net-mail/fetchmail/Manifest +++ b/net-mail/fetchmail/Manifest @@ -6,9 +6,11 @@ AUX fetchmail.service 204 BLAKE2B 4683577d0da4929b068bd2f49516838644ac399e6ab27f AUX fetchmail_at.service 289 BLAKE2B ab28a4b96625404f5451aa2dd37b671a18d7bf72bb3792d20eecded0ef42f15ddd768470a9dd541a66a495e954632e9b12ba3c0cfb446c4e2832eb9d3993f8c3 SHA512 4f8208a286f2868a466e69919b7c9d965da099b44675105689bcc52b0d16acc8d46e77f6b9a72968e82a6cf900e20d07a9a7373fe26a1ba9c925edf6663180ed DIST fetchmail-6.4.11.tar.xz 1302708 BLAKE2B 660f05c54ea9772de2dd3e584d0d2ff9addfdb7927396330a829f85995a7a2cd818c37762f704030ab73aba6750b62862dc79ad4617d45e948e8a96474fe8258 SHA512 aa7961490e34bffffb571bbc67eccec4bdef046da0a959cb2522e511074c275dbf4d797f9d8d019d7f464baae7ca19194cafeef65b5bc258dbf970d58f2dfd16 DIST fetchmail-6.4.12.tar.xz 1303532 BLAKE2B d37c020b07b342ef4ba95a4b7f017217515e26ec06512350fea2bd58aa4d848a4865d98b1f9440ead544d9c377221f31f97f02499b7799ffa56c1e7dae7b73cf SHA512 277c324bab528a036f2896909b63baaa68d986b79baa24e2ee5cd8ca1d86082d4cd41ca371114fc8ae150eb0f97af50fd5238e88485ad5c701699b69964fe256 +DIST fetchmail-6.4.13.tar.xz 1308248 BLAKE2B 5efe641d3fc19ed5232fbf959dd09e049e6c5b7419b4bf6fbacb2a24e29916d5dd6209cc7e792e733f59482b4c4aa2983a6d5abe6176dc5a82152b0660042cf4 SHA512 fd55a2a199ec83a863780934481df5ec562f0184adef738d37798aaad7b4eb15dfe0075436907784cc1b87f5c89bdf36a9a4df20f60786f6a185d04ab78ee9a4 DIST fetchmail-6.4.8.tar.xz 1282300 BLAKE2B 31b7f9fa31edff534210a2a0764cc6dec461968071a8aa29b1d1e9915ff6b8d2949b128f97d72fafe6d431b06d4e5c6b38d4a3cdba06736bdf8ec1879a991798 SHA512 c1052389baafa3a48186733133130bf69b87c8dda8faa00e82f5947037845b95d3271c8183df729728a351888175174ca11eb18f9adb8b3515860cba95ab8987 EBUILD fetchmail-6.4.11.ebuild 2519 BLAKE2B d693548f12d13da5218deb137abe401690011e563d5a43914f323163a81fe5a75ed6c39fa57bf9544695688e60ac5430444251b3a71173b6e5352f0348c9cbb5 SHA512 13b7bdad5c1d1219c8dcf176181a59a180cdbbaaee0248cc6b3625cf6e07b226319ce6844e6e647673b43b9fafe3b962e71b81c1373e6f96d832cb8caab88e3f EBUILD fetchmail-6.4.12-r1.ebuild 2521 BLAKE2B 499bad8f4cb55b68e999e43fee86262f3a118b5bc9e2c5c712e0ea5610633d5919e8c10413d388ad425b30c5f02942e53a0b91bae36ca06ea8a6ed6d91e89da7 SHA512 27613ef04f854991f6187b7ca4172b926873270ebf47295210dafe712c97ed1b35496587140e2bee6e9b31b6e25cdae2e4de487016c70fda08960f2e7cffe67a EBUILD fetchmail-6.4.12.ebuild 2519 BLAKE2B d693548f12d13da5218deb137abe401690011e563d5a43914f323163a81fe5a75ed6c39fa57bf9544695688e60ac5430444251b3a71173b6e5352f0348c9cbb5 SHA512 13b7bdad5c1d1219c8dcf176181a59a180cdbbaaee0248cc6b3625cf6e07b226319ce6844e6e647673b43b9fafe3b962e71b81c1373e6f96d832cb8caab88e3f +EBUILD fetchmail-6.4.13.ebuild 2521 BLAKE2B 499bad8f4cb55b68e999e43fee86262f3a118b5bc9e2c5c712e0ea5610633d5919e8c10413d388ad425b30c5f02942e53a0b91bae36ca06ea8a6ed6d91e89da7 SHA512 27613ef04f854991f6187b7ca4172b926873270ebf47295210dafe712c97ed1b35496587140e2bee6e9b31b6e25cdae2e4de487016c70fda08960f2e7cffe67a EBUILD fetchmail-6.4.8.ebuild 2511 BLAKE2B ebc8a846792c69dc12b7d8030efbd68994d41e1cab51ec8ef5007ec5b8f036f09ac12a69b5c02efb06fa2eb71e5d24655d844661b50737bb4cad5d8322acf9ec SHA512 03e1eb61afe94c73b103f3a56e016f28eb8ed719c44e2f75cf11d81acec5c911a2485d99a74de8bb6c37710f0e6be0daf55b8a675f98a330d02dceea21b0cea8 MISC metadata.xml 521 BLAKE2B 8e33fe9b7e4e041ed3990e710b9d903cb6284d4ea9675ae781a0b73aa404c97f39718baccfa9441f388848fe82d2e97e6aaba602df4a8d1f6cbc1093081a718d SHA512 e7efcf6511fa7467455e9af104d83f814ee2342a6956ae5b98b39319ddc3b431d8255e5755fa447f3a20ad5caffe8810f343245239657af211e177dd39a7d974 diff --git a/net-mail/fetchmail/fetchmail-6.4.13.ebuild b/net-mail/fetchmail/fetchmail-6.4.13.ebuild new file mode 100644 index 000000000000..157b8118f72b --- /dev/null +++ b/net-mail/fetchmail/fetchmail-6.4.13.ebuild @@ -0,0 +1,107 @@ +# Copyright 1999-2020 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +PYTHON_COMPAT=( python3_{6,7,8,9} ) +PYTHON_REQ_USE="tk" + +inherit autotools python-single-r1 systemd tmpfiles toolchain-funcs + +DESCRIPTION="the legendary remote-mail retrieval and forwarding utility" +HOMEPAGE="https://www.fetchmail.info/" +SRC_URI="mirror://sourceforge/${PN}/${P}.tar.xz" + +LICENSE="GPL-2 public-domain" +SLOT="0" +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris" +IUSE="ssl nls kerberos tk socks libressl" +REQUIRED_USE="tk? ( ${PYTHON_REQUIRED_USE} )" + +RDEPEND="acct-user/fetchmail + ssl? ( + !libressl? ( >=dev-libs/openssl-1.1.1:= ) + libressl? ( dev-libs/libressl:= ) + ) + kerberos? ( + virtual/krb5 + !libressl? ( >=dev-libs/openssl-1.0.2:= ) + libressl? ( dev-libs/libressl:= ) + ) + nls? ( virtual/libintl ) + !elibc_glibc? ( sys-libs/e2fsprogs-libs ) + socks? ( net-proxy/dante ) + tk? ( + ${PYTHON_DEPS} + $(python_gen_cond_dep ' + dev-python/future[${PYTHON_MULTI_USEDEP}] + ') + )" +DEPEND="${RDEPEND} + app-arch/xz-utils + sys-devel/flex + nls? ( sys-devel/gettext )" + +DOCS="FAQ FEATURES NEWS NOTES README README.NTLM README.SSL* TODO" +HTML_DOCS="*.html" +PATCHES=( + "${FILESDIR}"/${PN}-6.3.26-python-optional.patch +) +S=${WORKDIR}/${P/_/.} + +pkg_setup() { + use tk && python-single-r1_pkg_setup +} + +src_prepare() { + default + # don't compile during src_install + use tk && : > "${S}"/py-compile + eautoreconf +} + +src_configure() { + use tk || export PYTHON=: + + econf \ + --enable-RPA \ + --enable-NTLM \ + --enable-SDPS \ + $(use_enable nls) \ + $(use_with ssl ssl "${EPREFIX}/usr") \ + $(use kerberos && echo "--with-ssl=${EPREFIX}/usr") \ + $(use_with kerberos gssapi) \ + $(use_with kerberos kerberos5) \ + --without-hesiod \ + $(use_with socks) +} + +src_compile() { + emake AR="$(tc-getAR)" +} + +src_install() { + default + + newinitd "${FILESDIR}"/fetchmail.initd fetchmail + newconfd "${FILESDIR}"/fetchmail.confd fetchmail + + systemd_dounit "${FILESDIR}"/${PN}.service + systemd_newunit "${FILESDIR}"/${PN}_at.service "${PN}@.service" + dotmpfiles "${FILESDIR}"/${PN}.conf + + docinto contrib + local f + for f in contrib/* ; do + [ -f "${f}" ] && dodoc "${f}" + done + + use tk && python_optimize +} + +pkg_postinst() { + if [[ -z ${REPLACING_VERSIONS} ]]; then + elog "Please see /etc/conf.d/fetchmail if you want to adjust" + elog "the polling delay used by the fetchmail init script." + fi +} diff --git a/net-mail/getmail/Manifest b/net-mail/getmail/Manifest new file mode 100644 index 000000000000..f4fbaeb98d5b --- /dev/null +++ b/net-mail/getmail/Manifest @@ -0,0 +1,3 @@ +DIST getmail-6.9.tar.gz 184415 BLAKE2B 90c6580391c2d0f038d7011f9873eedce009a50edf44923e78dd6547d86bf00398ac539dedba000925dd4b5f125d7f1ef23e3ca47101d25ad2780f7465bf7e16 SHA512 0ba450135c995adb2ef1b7284dd94db1722f0757cd71ac61482fc2fdb2d04c854d530a5d9e919f276c610a4c7d1227aa26e8aac0f384d0f9149ba5068e3029ce +EBUILD getmail-6.9.ebuild 779 BLAKE2B a6f3dc31d52b741ae9da80c8329eee6965ee9f60fe56bae8bbdb2e925a62b09f12b2b05f69242458fbd3e62b293c383cfa2030dbb6acf2dff600190359b83ddb SHA512 89f4806e4357558711546c0de92de6f0af7f463f5170c2b07ebcf2c02f7f9cc9bd90af4b4f9f298b48b1be5908cba58ef1fd63e7353344cfa81e8400ca100b61 +MISC metadata.xml 374 BLAKE2B 2caeda98aec3a70d5a22ab4e23d776794928f84875ff9a7a53a153f3179247ef6f1b2e4b22f4cfef17b18a200353603304b9c7cc3771d7d2a8f7dc53a6920d93 SHA512 2af4508460e5f5847976cf8f7fec4a3f8248a59f59ea4e4492d384e887b77ba6745d6832b90c1637deeaa383c36ef1240842420cbd9be405910e93f8d0b9e2b2 diff --git a/net-mail/getmail/getmail-6.9.ebuild b/net-mail/getmail/getmail-6.9.ebuild new file mode 100644 index 000000000000..ef9a338b2252 --- /dev/null +++ b/net-mail/getmail/getmail-6.9.ebuild @@ -0,0 +1,28 @@ +# Copyright 1999-2020 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +PYTHON_COMPAT=( python3_{7,8,9} ) +PYTHON_REQ_USE="ssl" + +DISTUTILS_USE_SETUPTOOLS=bdepend +inherit distutils-r1 + +DESCRIPTION="A mail retriever with reliable Maildir and mbox delivery" +HOMEPAGE="https://www.getmail6.org/ https://github.com/getmail6/getmail6" +SRC_URI="https://github.com/getmail6/getmail6/archive/v${PV}.tar.gz -> ${P}.tar.gz" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~amd64 ~x86" + +S="${WORKDIR}/getmail6-${PV}" + +python_prepare_all() { + # Use gentoo version number (including revision) for doc dir and remove COPYING file + sed -i -e "s,'getmail-%s' % __version__,'${PF}'," \ + -e "/docs\/COPYING/d" "${S}"/setup.py || die + + distutils-r1_python_prepare_all +} diff --git a/net-mail/getmail/metadata.xml b/net-mail/getmail/metadata.xml new file mode 100644 index 000000000000..3f821c44382d --- /dev/null +++ b/net-mail/getmail/metadata.xml @@ -0,0 +1,12 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<pkgmetadata> + <maintainer type="person"> + <email>r+gentoo@r78.nl</email> + <name>Remco Rijnders</name> + </maintainer> + <maintainer type="project"> + <email>proxy-maint@gentoo.org</email> + <name>Proxy Maintainers</name> + </maintainer> +</pkgmetadata> diff --git a/net-mail/hyperkitty/Manifest b/net-mail/hyperkitty/Manifest index aab8a8724d97..15dd6c94abb6 100644 --- a/net-mail/hyperkitty/Manifest +++ b/net-mail/hyperkitty/Manifest @@ -1,3 +1,3 @@ DIST HyperKitty-1.3.3.tar.gz 1936346 BLAKE2B 8014b62a44989faeb0467779fb53a9e5a0c381bae44fae8102b211a6d3c7dfa63cb76b6cc25ae29bb1b260fdc4bafd9d2c61c39103cc29d76a229263fe704c40 SHA512 4be4630bc0344c3e1633772978880fea996fbf2bb49b728c1d05ae13ab1df8c63b6b7b9b735df32eb2ae31798e76be537748e42c830a63aa01eeff0680f1dc76 -EBUILD hyperkitty-1.3.3.ebuild 1275 BLAKE2B 51783662ec248077bd2fa21d58d355bb3c7f4df5ef8f9254ebcd1df0bb4814c89ec599cf45a64bd957737ac5d99d726f5e1bd67d69ebdbba529c081e4febcd2e SHA512 60f138a2177d9b4745bb4183117f1b3740b285ddaa1cb579574bd326df70e436c38ab65d96140f31bd8440f95094c853678d9914ec47a77fa8868e525e336a20 +EBUILD hyperkitty-1.3.3.ebuild 1326 BLAKE2B db616bdd6acddc624b0b69de5d7437fcb9baa728b65d704df9f3e2e45361b476066cf1f4f0552dcd4d3a00eb5e26581a86f8feda006ace9d83ac7a0a6bb72ea4 SHA512 6b68093de6e854baa5a3b7bbc3b3bb1dc8383f75c385d7dfa393959ea75867b8926d7dd7a7da6d207603cd5111d66022424aab176850762d9b7857cd2b331046 MISC metadata.xml 289 BLAKE2B 3ddd204de3c1bb46a4f5e242ac3488a979e0c7948561216066950f33d134d920e9f0ac04bef185625469d4c2e2943ce6d4acdead82b19ec5a9e7616cb1f52b52 SHA512 f969c6d1ade43b514df8cd10560b70996771f546c709520573aebbce148d7c9ff717f9f7cecf4f39e740acd2eae25bc785c3ea8b4432830a3ddc50e030f1e14f diff --git a/net-mail/hyperkitty/hyperkitty-1.3.3.ebuild b/net-mail/hyperkitty/hyperkitty-1.3.3.ebuild index b14f73909cf6..f6e67ffe7037 100644 --- a/net-mail/hyperkitty/hyperkitty-1.3.3.ebuild +++ b/net-mail/hyperkitty/hyperkitty-1.3.3.ebuild @@ -30,11 +30,13 @@ RDEPEND="dev-python/django[${PYTHON_USEDEP}] dev-python/django-haystack[${PYTHON_USEDEP}] dev-python/django-extensions[${PYTHON_USEDEP}] dev-python/flufl-lock[${PYTHON_USEDEP}] - dev-python/django-q[${PYTHON_USEDEP}]" + dev-python/django-q[${PYTHON_USEDEP}] + dev-python/whoosh[${PYTHON_USEDEP}] + dev-lang/sassc" -BDEPEND="test? ( +BDEPEND="dev-python/isort[${PYTHON_USEDEP}] + test? ( dev-python/mock[${PYTHON_USEDEP}] - dev-python/whoosh[${PYTHON_USEDEP}] dev-python/beautifulsoup[${PYTHON_USEDEP}] dev-python/django-debug-toolbar[${PYTHON_USEDEP}] )" diff --git a/net-mail/imapsync/Manifest b/net-mail/imapsync/Manifest index a409a2041195..8857c44af6f3 100644 --- a/net-mail/imapsync/Manifest +++ b/net-mail/imapsync/Manifest @@ -3,5 +3,5 @@ DIST imapsync-1.836.tar.gz 1741595 BLAKE2B 6502105147cf2f7d13c0af997cab05e3d65a7 DIST imapsync-1.882.tar.gz 1557501 BLAKE2B 92f37d0c6c64569016a15d71d1b95ca08e4a8bb2402a5151f1429260fb37db47ebfc273e2bb73b06ba77974100780924fa3f256565fcd3e77cbff4c7bbf7b56e SHA512 3953cb29b210c283be3fe72f1e1537594415bd5457b469b801625d6c857b982d2b2b3da9528dd1e6ccc6831c022ce495f7a5eaaea04d228bca374f185344f455 EBUILD imapsync-1.592-r1.ebuild 756 BLAKE2B fd235050e9336afebd5c73044791cfafb258455cd022e627cf8611707244684ede95f0ebc28a27432cc7760f1256b4f79067b828f672678d13a09d04aff59f54 SHA512 e04c4ce91b7e9e44356ab9672848dfae3e5150c3a7d5d6be1441fa9691d664c62b3fac655f782b52964ef46c64cd306b57fd48c5ebb182168db1d05ff1cb3300 EBUILD imapsync-1.836.ebuild 921 BLAKE2B 4bdff06ddc043c38875613b673683f2d97b7d25055fb199e22463ca2feb2bad7bed7debaca1102c8141d0169a14033c2d5265748ebcefbd31138ad49e39fa295 SHA512 6e4c5c4bccc4810b379639edf16db43c997d1239a9ba8eb77f29a0ace593f40909039103bf9d0ef3adeda8064b708b05fca4c303b70a394ff0423723b755d481 -EBUILD imapsync-1.882.ebuild 1943 BLAKE2B 09891b19c95241c592ea38f048728be00d65bb862cf960557805abfb56a8883e241a5f0d484c6436866c15480e1fc7ea13920f646c714c674f1d0f02acd86bfd SHA512 71b0698544d99be72aff2b6aa9a9063d3aca64b99e5dc247b77a65e9b57d37d988463d5e2fa9a3887658177e5854be4fa6c2ab2d610fbe4c5f1b54584fa4f44b +EBUILD imapsync-1.882.ebuild 1945 BLAKE2B b1b5dc037a11376e203b421623e93925f35c4e810c09e17ad61af609ed2a1870a172907c702e2234fe8ff48d4c3847570abd3c8e73a35371fadc306142c8d573 SHA512 46c87f17102d085b24b1b39da5ca3576c7c256db6610971745308d951ebd75a69d8c086ff5e68d9afd86b0c06b322a3126a8744ae3c6224e6220d0483883d379 MISC metadata.xml 249 BLAKE2B 0bccb43703238e66606acc0f395e496ed36dc25e319354565dd990baa7ef595a42aa7f931d50b65e9cd77ee72103b8c0210c68fadd54ff8ff6bfaeff60850a9f SHA512 a5b4caa063a5e6f2d954e30608a5051b567fe1e869e1662282d6d12813105152833fb824043f7501d9fdc628cf2ad88c53c90c48798f27f8240e541956f63dce diff --git a/net-mail/imapsync/imapsync-1.882.ebuild b/net-mail/imapsync/imapsync-1.882.ebuild index d3498548fa25..fd46531dcda1 100644 --- a/net-mail/imapsync/imapsync-1.882.ebuild +++ b/net-mail/imapsync/imapsync-1.882.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2018 Gentoo Foundation +# Copyright 1999-2020 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=6 @@ -9,7 +9,7 @@ SRC_URI="https://github.com/${PN}/${PN}/archive/${P}.tar.gz" LICENSE="WTFPL-2" SLOT="0" -KEYWORDS="~amd64 ~x86" +KEYWORDS="~amd64 ~ppc ~x86" # ppc dropped pending keywording of: # dev-perl/App-cpanminus # dev-perl/Data-Uniqid diff --git a/net-mail/isync/Manifest b/net-mail/isync/Manifest index ee9f4f9123ed..1e44a0e31856 100644 --- a/net-mail/isync/Manifest +++ b/net-mail/isync/Manifest @@ -1,4 +1,6 @@ DIST isync-1.3.1.tar.gz 311868 BLAKE2B e7eae36407873b8f9f3c4e9a827e719aefa608994f5a48a93779207148123c7b796f6aa8ad8157f5eb9e863c5845889ad595d23570f12a0520fe997f8282158c SHA512 59d702d41d4a4e72f03cb282b414d0bb859593171763e845bc24d116a74f807a79e5be61f1dd1f59a9ece492322bceac156b08958a246cbfbe7f230fab4cdda2 +DIST isync-1.3.3.tar.gz 315912 BLAKE2B 64a6130fd2e0b6bcb4c57e7e353c1227f65ec84b557419aaff617f9cde186e1e8f906a9448e4642bd1f6db245a769923cb8ec779ac077225c47a16160d3a8b10 SHA512 915824272606f75da8c05fb75872bc5cf528fa555024245094d14a25b190f1b813dd5723e9b87f27f3fbb14b100311ee487bc409d074a68d67e9ab675b12c7a1 EBUILD isync-1.3.1.ebuild 859 BLAKE2B bb36f26b449eacdf714b047e8ab0facbf6487fa1abbe1e2e054ef2775486e9a0fc2af67f701281ecd44c15096daff32760e2360ceefe29cab363ee4924a06f20 SHA512 673c7da19bbab310ba3bb451d274ced14b40f68527828d2fa0fbe551edbd87cb3384f9d6441bb8c81723d7caf779d93f4f34caf7cf6bf4f973147ec992bc3701 -EBUILD isync-9999.ebuild 854 BLAKE2B 12d717502cb4c647106399554d30c5c33faa5bfb29672a79357107ad1905aa40aa59f42d2bfe444f5194f052c6645621fe53399979821f9e8ef595553fd44b5a SHA512 3d4cbae637c0ec0459c81068ba849c1cd813389cb70ab5eecf324ee245540b8d8215cf8e965e8326767a3fd4fcf45404f0ce7af0be9f22b7e123ae5f480a800e +EBUILD isync-1.3.3.ebuild 870 BLAKE2B f53cd1e1bd39fd318159f35dbc507a444a4a07e0d323969971496ba6995af6237dcf50670c8fa1998d9322cbe3069f480c4cc6735ac25bda80ecceda5807a3d5 SHA512 6aabbed6126f463ab6e865f5c8e74fab789648aa9cc81a0bf8bddf9477bbf9e237066b443c2e8aedf9aec56727ff904f9317cb1489c69491cab7b45465b0da38 +EBUILD isync-9999.ebuild 870 BLAKE2B f53cd1e1bd39fd318159f35dbc507a444a4a07e0d323969971496ba6995af6237dcf50670c8fa1998d9322cbe3069f480c4cc6735ac25bda80ecceda5807a3d5 SHA512 6aabbed6126f463ab6e865f5c8e74fab789648aa9cc81a0bf8bddf9477bbf9e237066b443c2e8aedf9aec56727ff904f9317cb1489c69491cab7b45465b0da38 MISC metadata.xml 295 BLAKE2B 018d8692cf8398f0fe616b81594313139e4a2e8d07724fcca621ae325b0ecef76bed8c9142847483240cb5b597c936600152ce92ead3de8ebc66c74e7fd89039 SHA512 74a5fc01fe3cf7826ba041fb90bb6aeb3c1a1e4ba8f3807a17a3defc08d5e2f507f88ac52a458b9707fa5a877dd3f63210227a7637fcd35574c09e073896457f diff --git a/net-mail/isync/isync-1.3.3.ebuild b/net-mail/isync/isync-1.3.3.ebuild new file mode 100644 index 000000000000..74b81bf11ed5 --- /dev/null +++ b/net-mail/isync/isync-1.3.3.ebuild @@ -0,0 +1,45 @@ +# Copyright 1999-2020 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +DESCRIPTION="MailDir mailbox synchronizer" +HOMEPAGE="http://isync.sourceforge.net/" +LICENSE="GPL-2" +SLOT="0" + +if [[ ${PV} == 9999 ]]; then + EGIT_REPO_URI="https://git.code.sf.net/p/${PN}/${PN}" + inherit git-r3 autotools +else + SRC_URI="mirror://sourceforge/${PN}/${PN}/${PV}/${P}.tar.gz" + KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86" +fi + +IUSE="libressl sasl ssl zlib" + +RDEPEND=" + >=sys-libs/db-4.2:= + sasl? ( dev-libs/cyrus-sasl ) + ssl? ( + !libressl? ( >=dev-libs/openssl-0.9.6:0= ) + libressl? ( dev-libs/libressl:0= ) + ) + zlib? ( sys-libs/zlib:0= ) +" +DEPEND=${RDEPEND} +BDEPEND=" + dev-lang/perl +" + +src_prepare() { + default + [[ ${PV} == 9999 ]] && eautoreconf +} + +src_configure() { + econf \ + $(use_with ssl) \ + $(use_with sasl) \ + $(use_with zlib) +} diff --git a/net-mail/isync/isync-9999.ebuild b/net-mail/isync/isync-9999.ebuild index c910f9673b0a..74b81bf11ed5 100644 --- a/net-mail/isync/isync-9999.ebuild +++ b/net-mail/isync/isync-9999.ebuild @@ -1,7 +1,7 @@ # Copyright 1999-2020 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=6 +EAPI=7 DESCRIPTION="MailDir mailbox synchronizer" HOMEPAGE="http://isync.sourceforge.net/" @@ -13,7 +13,7 @@ if [[ ${PV} == 9999 ]]; then inherit git-r3 autotools else SRC_URI="mirror://sourceforge/${PN}/${PN}/${PV}/${P}.tar.gz" - KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86" + KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86" fi IUSE="libressl sasl ssl zlib" @@ -27,7 +27,8 @@ RDEPEND=" ) zlib? ( sys-libs/zlib:0= ) " -DEPEND="${RDEPEND} +DEPEND=${RDEPEND} +BDEPEND=" dev-lang/perl " diff --git a/net-mail/mailgraph/Manifest b/net-mail/mailgraph/Manifest index 6aa9446334d0..f4b103250099 100644 --- a/net-mail/mailgraph/Manifest +++ b/net-mail/mailgraph/Manifest @@ -1,6 +1,7 @@ +AUX mailgraph-1.14-homedir.patch 558 BLAKE2B e558f8a236c80517f81c24913c88ed867759fa454f01eeaa63c4271e338f6dcb9f806ba8b161d911aba8734271ba7110671e9def34c08a5406202b31e9436e32 SHA512 5603c2b8b783b07a809f4cefd4e561f92924b881f1e1c5ff87c4abe0cf32f42a148def08cec95d78de67f07800768e11a434680a9ecaea8442c472570343d660 AUX mailgraph.confd-new 646 BLAKE2B 8c6c55b46340f2909308350c944d4f07ece13da3574800e0d1b6ce32c8a8e3e5ede958175fbeb8c41d2dbec4f4ca7468085ec05305fc3910e0c47b77424cf584 SHA512 1f5b7f35db859be48aa935ba3936fea34653a1c8eaeeb8be0bb01fbc3644a10eaa636a508bfa5b987509ad59d390a52118f5b323a25044184b9e9a8046882710 AUX mailgraph.initd-new 984 BLAKE2B ea3a6eac4eb9694dc48f33365eb846cfbd3f9f75eedae1dd62f05ad355c6cfc8136b899e7f045440700fe3c10a478dae2eb888e876767b1fc135c3bef32c9822 SHA512 e859488178bbb3f229a86f0f61bf0537664c1f6fd0761195e0111458671d8dc69998dad206f629e0dbe9c82248186075655a522b16b969ffd1c50d8ba825d3f1 AUX mailgraph.logrotate-new 773 BLAKE2B 392128208bb8209e93d8802f133cb7b8f3ac0a6ae4453469da1cb3152820910de6b1a4b465166da3c2976faaf06c603cdf453ec9c53aba037bfa5eef4169b46a SHA512 a8fde20eb24964a0ab7efbe5e6ce0adc02e0d91daee519f4dd70049ac2f92fb53f63322128ae8716b64fb1aa28b7a2c55a8c647028ac73aff1687ad312d20baa DIST mailgraph-1.14.tar.gz 22014 BLAKE2B a4d72a557bc7718576d85aed930a0037cb7d83edcba62397d6e9a51ec7967c6ffdf6d310e6bf9b881839313ed4cf1969e40eae1a923bbae45ac71b9593f1805f SHA512 3df0dae010ad166a157eb34a8b1fcf837ab42445d417855ea58937a75b74ca55c06044eefb6077a6117073c39a087bcdf5f58fe35c0e4d9c7d6b18bded7a0193 -EBUILD mailgraph-1.14-r2.ebuild 3340 BLAKE2B a21f4665d70ac4c1504c7a34b248c8a8ecacbf4743d184a6db3618ffc98ddcccaefee8ce7645a0fa9588d5d6bdbfded8813051d65059f1c5c3400814a17e703d SHA512 1aa3f3a13e8767709c4bd75a9a40e3cac6209b7e55854a80086e3ef234eb8ad65a79fecb9f3142d64610b31ead947e02d143b66da5e5e659ebe4a6ffc7a995c3 +EBUILD mailgraph-1.14-r2.ebuild 2805 BLAKE2B 62f5546a58e381dcf60eb5bfccffb11e777bfdfb8bcd326cd07af866a8dffc066084b9623f8f80eddeaddaac3baacf40ef0bf7da5bf4bc1e8da8fdc2f7ea623a SHA512 16f31d92c8d4e14232724b97cb7870828261ca93168888f74c6a777eb37c8f02390fc5aa1b3ce6df76e48d977f31bde98f410e51913af3387a47d21f47029bbc MISC metadata.xml 168 BLAKE2B 5f277cc66dbafa7e7985433f84b0f9a656a176a9b901862e2a8353ca2d4526797dded9696e835b9696c7f72324e94959cfb5a22de49a7e3e61604153886037ab SHA512 00eec08786156434460f5ed77b647579546cf1a86341a4f2c9c9c84326468c2c21dc5101c4277103b19266bb6f788823f4ddf3b9d044da26326d79bf2ac9a274 diff --git a/net-mail/mailgraph/files/mailgraph-1.14-homedir.patch b/net-mail/mailgraph/files/mailgraph-1.14-homedir.patch new file mode 100644 index 000000000000..3d1154f36266 --- /dev/null +++ b/net-mail/mailgraph/files/mailgraph-1.14-homedir.patch @@ -0,0 +1,13 @@ +--- a/mailgraph.cgi ++++ b/mailgraph.cgi +@@ -16,8 +16,8 @@ + my $points_per_sample = 3; + my $ypoints = 160; + my $ypoints_err = 96; +-my $rrd = 'mailgraph.rrd'; # path to where the RRD database is +-my $rrd_virus = 'mailgraph_virus.rrd'; # path to where the Virus RRD database is ++my $rrd = '/var/lib/mailgraph/mailgraph.rrd'; # path to where the RRD database is ++my $rrd_virus = '/var/lib/mailgraph/mailgraph_virus.rrd'; # path to where the Virus RRD database is + my $tmp_dir = '/tmp/mailgraph'; # temporary directory where to store the images + + my @graphs = ( diff --git a/net-mail/mailgraph/mailgraph-1.14-r2.ebuild b/net-mail/mailgraph/mailgraph-1.14-r2.ebuild index 9d60fa3552b1..76c14702b18f 100644 --- a/net-mail/mailgraph/mailgraph-1.14-r2.ebuild +++ b/net-mail/mailgraph/mailgraph-1.14-r2.ebuild @@ -1,8 +1,7 @@ # Copyright 1999-2020 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=4 -inherit eutils user +EAPI=7 DESCRIPTION="A mail statistics RRDtool frontend for Postfix" HOMEPAGE="http://mailgraph.schweikert.ch/" @@ -12,36 +11,20 @@ LICENSE="GPL-2" # Change SLOT to 0 when appropriate SLOT="1.14" KEYWORDS="amd64 x86" -IUSE="" -RDEPEND="dev-lang/perl +# for the RRDs +DEPEND=" + acct-group/mgraph + acct-user/mgraph" +RDEPEND=" + ${DEPEND} + dev-lang/perl dev-perl/File-Tail >=net-analyzer/rrdtool-1.2.2[graph,perl]" -DEPEND=">=sys-apps/sed-4" -pkg_setup() { - # add user and group for mailgraph daemon - # also add mgraph to the group adm so it's able to - # read syslog logfile /var/log/messages (should be owned by - # root:adm with permission 0640) - enewgroup mgraph - enewuser mgraph -1 -1 /var/empty mgraph,adm -} - -src_prepare() { - sed -i \ - -e "s|\(my \$rrd = '\).*'|\1/var/lib/mailgraph/mailgraph.rrd'|" \ - -e "s|\(my \$rrd_virus = '\).*'|\1/var/lib/mailgraph/mailgraph_virus.rrd'|" \ - mailgraph.cgi || die "sed mailgraph.cgi failed" -} +PATCHES=( "${FILESDIR}"/${PN}-1.14-homedir.patch ) src_install() { - # for the RRDs - dodir /var/lib - diropts -omgraph -gmgraph -m0750 - dodir /var/lib/mailgraph - keepdir /var/lib/mailgraph - # log and pid file diropts "" dodir /var/log @@ -61,9 +44,9 @@ src_install() { newbin mailgraph.pl mailgraph # mailgraph CGI script - exeinto /usr/share/${PN} + exeinto /usr/share/mailgraph doexe mailgraph.cgi - insinto /usr/share/${PN} + insinto /usr/share/mailgraph doins mailgraph.css # init/conf files for mailgraph daemon @@ -79,6 +62,7 @@ pkg_postinst() { elog "This can be changed in /etc/conf.d/mailgraph if it doesn't fit." elog "Remember to adjust MG_DAEMON_LOG, MG_DAEMON_PID and MG_DAEMON_RRD" elog "as well!" + ewarn "Please make sure the MG_LOGFILE (default: /var/log/messages) is readable" ewarn "by group adm or change MG_DAEMON_GID in /etc/conf.d/mailgraph accordingly!" ewarn @@ -86,6 +70,7 @@ pkg_postinst() { ewarn "go to the file /var/log/messages or change MG_LOGFILE in" ewarn "/etc/conf.d/mailgraph accordingly! Otherwise mailgraph won't get to know" ewarn "the corresponding events (virus/spam mail found etc.)." + elog elog "Checking for user apache:" if egetent passwd apache >&/dev/null; then @@ -105,6 +90,7 @@ pkg_postinst() { elog elog "\tgpasswd -a <user> mgraph" fi + ewarn ewarn "mailgraph.cgi is installed in /usr/share/${PN}/" ewarn "You need to put it somewhere accessible though a web-server." diff --git a/net-mail/mailman-meta/Manifest b/net-mail/mailman-meta/Manifest new file mode 100644 index 000000000000..8f7d5e8a73b9 --- /dev/null +++ b/net-mail/mailman-meta/Manifest @@ -0,0 +1,2 @@ +EBUILD mailman-meta-3.ebuild 319 BLAKE2B 8ca7b8aa435d3e0b92e7fc47b249950cdb4b78a2ac2cd9e80e701f335f8787a40886c97f692b0d2e56633a6449798fbf82aa2888884251c349fd7ae1656cf39a SHA512 3adb2c0833a65d15a4dd3e972d42c4fa4065db85e8be80869fe171eac36eff60acb1af4d6a9f3840cca689ad094c4540338d9ef27a9a4c2f0dc86fb6b6d18dd6 +MISC metadata.xml 216 BLAKE2B ff21e786382ce75611e7386f0689145fa9b64a7ef8c3c23ff92ef9c0f2bae866fec67838df7ce6608d4f1954f107b8d424103789c62384a04af120eea19053a8 SHA512 6309007f7bf488d882e2769f332c0c76bcc5972bbb60e90f86fc1895b9421494be9b1d962ce7b8a68b484f5bef6e0d6bb67247496b1d5e00e0a6ba55403e1df0 diff --git a/net-mail/mailman-meta/mailman-meta-3.ebuild b/net-mail/mailman-meta/mailman-meta-3.ebuild new file mode 100644 index 000000000000..e5399bc8b028 --- /dev/null +++ b/net-mail/mailman-meta/mailman-meta-3.ebuild @@ -0,0 +1,16 @@ +# Copyright 1999-2020 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +DESCRIPTION="Meta ebuild for GNU Mailman 3" +HOMEPAGE="https://list.org/" + +LICENSE="metapackage" +SLOT="0" +KEYWORDS="~amd64" +IUSE="" + +RDEPEND=">=net-mail/mailman-3.0 + net-mail/postorius + net-mail/hyperkitty" diff --git a/net-mail/mailman-meta/metadata.xml b/net-mail/mailman-meta/metadata.xml new file mode 100644 index 000000000000..1d07f2a1081a --- /dev/null +++ b/net-mail/mailman-meta/metadata.xml @@ -0,0 +1,7 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<pkgmetadata> + <maintainer type="person"> + <email>hanno@gentoo.org</email> + </maintainer> +</pkgmetadata> diff --git a/net-mail/mailman/Manifest b/net-mail/mailman/Manifest index 0c0430cb871b..4c2d088deb8b 100644 --- a/net-mail/mailman/Manifest +++ b/net-mail/mailman/Manifest @@ -1,3 +1,5 @@ DIST mailman-3.3.1.tar.gz 1184548 BLAKE2B e9bf5cec5fec75ae01093003fa9b128f9415c55cc505eda841a807d72177d17dc7609e1e0c20305f5f38c40e01745b4cbc58d1c5ddc43d0799ec601bde92cb54 SHA512 31dc5d0fca7f28579a1e174010ea8ac83d17b5e7ace37f3a86fb73110de412af145a9c3d16cf7b446f80e44a3419b51cce7b56b8de93264751cf771b2c084ddc +DIST mailman-3.3.2.tar.gz 1396750 BLAKE2B f7db82d8cb217d80313ee7a6c28f7b62876a6d176a108b3fafdc744e0a9fcec3d11a0665069a5c27a42d49c22257bfe2ca8f18233d30fc9acb964027fea3bf12 SHA512 af8b300a9fea9e40a9a42f97531cf0fcd36f9b30a88a5b062994ec6480d91a698dbc37f4910045aacf3bedebf7c9ccacdf8d11bb0ee560d11e1eeef266f19b29 EBUILD mailman-3.3.1-r1.ebuild 1474 BLAKE2B 8a2fee127292f2d41fb76b328bb8426fcf4b137f92d8c8d1dca1715eaad95d2f52b7485bd84045ecbf458825d856fbe0cf21676ca7315d2bb94df79913fe621f SHA512 e72cc0b8c7bd17ec5776c0962153933ad494e1d1432bbeac271ed75eb4241ce1d2a5ca1b0c0a9c6dae6beda6baf92d87440b112ecfadd1201e4d98499b031546 -MISC metadata.xml 293 BLAKE2B 374d60f4c201126bc672a15e1d2cc0e8ddac567760932fd51bf0abd758378c92d9c0c9bba81fdee2d30cfcf14c067f46a38e1b55f3ca09ed3c002316b48c1b74 SHA512 9be4ca21301ae46b1c80f63b365a69a855858f3b0f51b5f5dd88f572cce940f068d6de17261de1828b068bbef9061124840b66bd370e120c73b3589048653b8c +EBUILD mailman-3.3.2.ebuild 1402 BLAKE2B 89a4684901834c58bd6cae588f917f686fecd0500df16ec42c26a324c59ddace83c55d2ef3f674b16f1da0d47b8c0d3459751ff64abe1ff67872b770fce5aaed SHA512 577e48ff8745a2221add6e4228ef7851c0762bbeea6d3e1d7e2e17d9b77a5da4b57a402b4de5d3692c069b572049928cf62f00dc0377cde393d4c0985dd42fd9 +MISC metadata.xml 341 BLAKE2B 0666e6113e8f6a96d07865e8e365281376370fb18c64cb060bf75a3ec049481fed396fc3e08fea433ae7103e913ae362cd0df3e6f6187cfd51fb6fed284be186 SHA512 48aed4040c25a4200f406b21901cc83763d65cfaa3f682639b06e8eca663dcb595179435ebe96f1684c65a8d451c55e028e1492b9e986efd802e30b303d3270d diff --git a/net-mail/mailman/mailman-3.3.2.ebuild b/net-mail/mailman/mailman-3.3.2.ebuild new file mode 100644 index 000000000000..825b5d0deff1 --- /dev/null +++ b/net-mail/mailman/mailman-3.3.2.ebuild @@ -0,0 +1,42 @@ +# Copyright 1999-2020 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +PYTHON_COMPAT=( python3_{7,8} ) +DISTUTILS_USE_SETUPTOOLS=rdepend +inherit distutils-r1 + +DESCRIPTION="Mailman -- the GNU mailing list manager" +HOMEPAGE="https://www.list.org" +SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz" + +LICENSE="GPL-3+" +SLOT="3" +KEYWORDS="~amd64" +IUSE="" + +RDEPEND=" + >=dev-python/aiosmtpd-1.1[${PYTHON_USEDEP}] + dev-python/alembic[${PYTHON_USEDEP}] + dev-python/atpublic[${PYTHON_USEDEP}] + >=dev-python/authheaders-0.13.0[${PYTHON_USEDEP}] + >=dev-python/authres-1.0.1[${PYTHON_USEDEP}] + >=dev-python/click-7.0[${PYTHON_USEDEP}] + >=dev-python/dnspython-1.14.0[${PYTHON_USEDEP}] + >=dev-python/falcon-2.0.0[${PYTHON_USEDEP}] + dev-python/flufl-bounce[${PYTHON_USEDEP}] + >=dev-python/flufl-i18n-2.0.1[${PYTHON_USEDEP}] + >=dev-python/flufl-lock-3.1[${PYTHON_USEDEP}] + >=dev-python/importlib_resources-1.5.0[${PYTHON_USEDEP}] + www-servers/gunicorn[${PYTHON_USEDEP}] + dev-python/lazr-config[${PYTHON_USEDEP}] + >=dev-python/python-dateutil-2.0[${PYTHON_USEDEP}] + dev-python/passlib[${PYTHON_USEDEP}] + dev-python/requests[${PYTHON_USEDEP}] + >=dev-python/sqlalchemy-1.2.3[${PYTHON_USEDEP}] + dev-python/zope-component[${PYTHON_USEDEP}] + dev-python/zope-configuration[${PYTHON_USEDEP}] + dev-python/zope-event[${PYTHON_USEDEP}] + >=dev-python/zope-interface-5.0[${PYTHON_USEDEP}] +" diff --git a/net-mail/mailman/metadata.xml b/net-mail/mailman/metadata.xml index 31afb682233d..557d50c69a3f 100644 --- a/net-mail/mailman/metadata.xml +++ b/net-mail/mailman/metadata.xml @@ -5,6 +5,7 @@ <email>hanno@gentoo.org</email> </maintainer> <upstream> - <remote-id type="sourceforge">mailman</remote-id> + <remote-id type="pypi">mailman</remote-id> + <remote-id type="gitlab">mailman/mailman</remote-id> </upstream> </pkgmetadata> diff --git a/net-mail/mu/Manifest b/net-mail/mu/Manifest index 26bd3aadc24e..9fe1f93e7b12 100644 --- a/net-mail/mu/Manifest +++ b/net-mail/mu/Manifest @@ -4,5 +4,5 @@ DIST mu-1.4.12.tar.gz 2309385 BLAKE2B 4f1b7c520a38e5f17471c2a9dc814decc019a4afce DIST mu-1.4.13.tar.gz 2309545 BLAKE2B 9a83e86ab73e325617694f01877a11a93a5bd701cedc776640563f0a5e61946064e201d3f5da2110e1f9583dde9a73e401dd2f018161380435f48f132b2df103 SHA512 0f8e7f75332257e8cfdecf2c27bc23c83420387e40ecf92089232af6c545700a6c4925665b39fc236cacf8b26fa4b81df71775cdbe04c340fe3455c54c0d1bbc EBUILD mu-1.4.10.ebuild 1784 BLAKE2B 27466207a50c1f175b56d6ff17f775fa644b884074d9914e32ae81c7f1887a1e140225a5f2d8875dc5cd18db7563ce58577082d00ad039c54d25207e76499e17 SHA512 e1aad3af510eb9be475b0e983048d63fd0ad007cfe178265daada05be7bd32edc70c9be8a4b097a5a26bf5a2ad0c970565cd33350cd77534ba4320750cfa8018 EBUILD mu-1.4.12.ebuild 1786 BLAKE2B 36766ba266400ab63b36a986f121de47802f9fb46f7fafaab41af1b40ae2cb2c0bfb34edb3cb0f75bbe1926dbdb4f0309afd64c92cb18553711c35b44b96d8aa SHA512 9e89d8989a8c90d2ab14ad99ece718fa78118cbf53563f580be9b67b50700400fb2c96b0e1995390446c5a1f62af28ad926c716a80f5beaf380311c91b123453 -EBUILD mu-1.4.13.ebuild 1753 BLAKE2B f50edadcca0becdf808e69c218253b636139d0cbbaf6de7fe685660abf24284ac5980b7ecbb3447ce953ab0f68fad2777cfbe04d55c6dbfddd509e215d3eddaf SHA512 a9b216c20bf568653376b2d0cd73d3c67f8eef59c196e884b3e5b1a4cfeb2a28edcb46259bb8ba802862f59ec1b3997d1fcd5382cfe747fbb067a050280195e2 +EBUILD mu-1.4.13.ebuild 1763 BLAKE2B f15857a2ce4f44f3eb48b9b29255c7b5d67887355700cf62dd6610897dbe097c2b947ca417c1d62df4d0b88d6cee3124716316e602011dcf78df3f6347112eb1 SHA512 da1e8d73bdb564da83abb29fbdb77ae7264f9e71c33b069fe33e3b4d8f578dbd91fdbaf9129e8e67925e87e7619830adefab1f686cd4355f2275567f1251afb9 MISC metadata.xml 895 BLAKE2B 2a8d3f5aa6673c03df5bcf495aded3bb07316b4833ed84ec3e2d7030f5cbab8333865da6a4bd67bc8ee69e39bc6540d4a77bd7ddf3b1b9fdd7b5a6dfb7278fe6 SHA512 e5e1e9f3084189fbdbc8fb55127b8b3eec4acd7685b0d4c9ab564644f21fcc53520b89f7ced7bb3972c13d577a030175a9665d30ba513112125409082a7ad7c0 diff --git a/net-mail/mu/mu-1.4.13.ebuild b/net-mail/mu/mu-1.4.13.ebuild index 0dfc0d7be4e0..dfabecbea9d1 100644 --- a/net-mail/mu/mu-1.4.13.ebuild +++ b/net-mail/mu/mu-1.4.13.ebuild @@ -11,7 +11,7 @@ SRC_URI="https://github.com/djcb/mu/archive/${PV}.tar.gz -> ${P}.tar.gz" LICENSE="GPL-3+" SLOT="0" -KEYWORDS="~amd64 ~x86" +KEYWORDS="amd64 ~arm ~arm64 x86" IUSE="emacs guile mug" DEPEND=" diff --git a/net-mail/notmuch/Manifest b/net-mail/notmuch/Manifest index cf5ca6ca88e4..a976c89930ca 100644 --- a/net-mail/notmuch/Manifest +++ b/net-mail/notmuch/Manifest @@ -3,9 +3,11 @@ AUX 50notmuch-gentoo.el 291 BLAKE2B f7d4a05ca84f08e2c2779faf8a580f39f7f49f18501e DIST database-v1.tar.xz 204876 BLAKE2B 846a8d2f17edb61ed1c3d3c655becd1f60b4046772058706f13d516f65421a5105593660f1c556907bb2bb9607a3c2521243d1be07bffb70817ad3b8461680ca SHA512 e2d87373e00b65756d7fea40c54fb236d7a37ce839145c3afd99ab26efdc17796e540c021e2c24e521df2d0a01ccbf918994f87a0d83235ff9b109a51555b3d0 DIST notmuch-0.29.3.tar.xz 660536 BLAKE2B bd5d62eba06102acbc0615cd97ac9ff5578c1f68d50b24a79ea9fb1ea77850d84e0713fb648cb04e74a61ac3321ea5ef82db714786adf38ea10d00c5846decff SHA512 b1e0b47ebf2d2de0ccd39976782eb8a7b417e36f2f9d78ef19e27e55719a02ee919508843a0eaf258f58138914ab2e8796d2fc1782b9cfe2d8937abb6184be65 DIST notmuch-0.30.tar.xz 711904 BLAKE2B fb1523f3939b78797e448e804fc52c4fe1e4e8ff87b346917488d3911027b9ccb67b9fddf611f0e960fd1e158463cbe005e038f31bb54549e2a922926dd512bd SHA512 a5c812eb141c293c61b5483eafd31d3e3ab19b2c84429a1558986c415d30ead4afa79db64b2672e9549a40f5eb4c69e54ea5ccccbeeaeb9c783051c3f965a65e +DIST notmuch-0.31.2.tar.xz 713388 BLAKE2B 20029f55206b66e7956316fca2d16ae53a49fc196ea2e730ae5ebd96ce893fa2065b7eee9b625629bbb0d3816a70d98e8943920cf8895ef81a97a1d8dc59dd62 SHA512 b134ef79648cb6fe9f17b2f1b600d651d57359ae9fa576c808b794aa64a09955f0597a624cc3c498da4ef56e44bca6bb485bc402c2dff48cd000959f9a9ceeaa DIST notmuch-0.31.tar.xz 713144 BLAKE2B 91b0a01543e438e6ccb40a01ad0a100a5c6ae15fe832bb29367d4bc288dae5a915f89a743ecee814041caf53430e2593cb4b5f69faaec396ad6dacfe8cc67d2f SHA512 928acc07b9dbed4275e7d39d94202bea7685e9d433a7bf4c07e40e191ed4fe8cf15ac04c18792e46f4605ffac548b942998005d8176a58ad76c82d4085a408e5 EBUILD notmuch-0.29.3-r2.ebuild 5062 BLAKE2B cdf68691f7dbc729d6c95dc974a3fb3b747a33d0b80338fc9b0474a970b78674628c242ce14af83b4d57eee1cba1f3c3d343dfcfffe2d8d0ee628f78b94f8767 SHA512 d76b455c44244eb1775604b0510f96c30aea175492ea4982d9a5b93d8601834a120286f29b8e41c6e694209a09be72727848e24bf5b8b3723729c2458095cc08 EBUILD notmuch-0.30-r1.ebuild 4343 BLAKE2B f53eff50b205bffdb6016118997a5b5176a88ca704999e2b4f3bef4f107a79e7e89e68010fc35bd756aa8cbbe168f73700eba9b33ec8f1ce32a676b1b592e5da SHA512 bde0d770ca18d3c55c79be0b4e6fb360f61bf0f404397448fb311c1cf107b07b5f9633643a04a0e6615acd61934635845d1a2a47283795e3fd69c050939858b1 -EBUILD notmuch-0.31-r1.ebuild 4444 BLAKE2B 3bfc5bf340d8af0f4e351394d41d38de8b73cf959fee108de8ec53690e9b42ecedf0125f90ae2413384d65197f926beac1ced7a8120d2da48e20b85ef1289be0 SHA512 53854173c8b326d9d7e1c7ad826f2f77b61fc605bab54fa9084e41025a91ea14a671bfeaf036ba861b71ceeb83bc0661cd610600e4e9a971c9265ac7d6008c2f +EBUILD notmuch-0.31-r2.ebuild 6375 BLAKE2B 936a7e27bc21361d9692a36dd029d4ccbc28997dd4fda3c72c5ba5b79021be102a39efd6b5d95b4aa59fd008b2d07b5cbfaaef72b4ae31e08febc6b1c396a061 SHA512 6fd4ef53415e8c24b8fdc5ff8bffb548960f12c4b4cbdb001da1bb322604f05d059fd05ed7a90787f9209f1d9e61101ee7af5405b3be133b9efb29efc2ec14e0 +EBUILD notmuch-0.31.2.ebuild 6338 BLAKE2B c46bab536f2feefeb2c2f0baa5305f36b5d24314fb648fdbfa0cc4af6a0f19eab9cf9819c0657a9a48dc00fcbe754313b0f9cb52171e6ac4c13b56fda892117c SHA512 dd3a224b075d0403c693753289113e5f854efa7538095d5c24371c90083fda17efce7c96b6b8358d599c91478da3b61bf9c3456421c42c029280b9031b890d4a EBUILD notmuch-0.31.ebuild 4460 BLAKE2B 21bea26e7e287937cd45a553abb14cb40420b2bb93886165533f6808d4734e594bd0184fb4b8dd6230b2264dc09f80dd89eeea70f678e7a56981e11f743c1121 SHA512 e12a5c8403c7f7e0ce32a1f002a4e6153b01df9436a517f692b18860a919aac83787a59ae6a00820b2d6fae7661a14a4f822d16b79c2e037f539afddfba04f62 -MISC metadata.xml 1229 BLAKE2B 7a7bc05dd0bd1fbfca066e1041d56068c3e8dfd45359be606d0e7703876c831f0b0a39b0dcea4b44f3ec034a16c906bb1ad703143e244c95487d94d9bf9331b4 SHA512 d100677a61010239386889afd5c0f3444c77f5b42309738668c89409bec8f81f2856eb2e5d00d9d495b94a4111df7209f4cc84b830ef346e57c686e5ccbea24e +MISC metadata.xml 1288 BLAKE2B cc1d703a011971c9d6c89237847c84caeb83d1a6b62d95ee9cb1b0138919ea24cce578d7f55cdb749b448d6f2c9c77895285127d9c509532b5b58c66db2528a1 SHA512 68066c76c92534adb837ade1aa93a6e58f2d1b288e9cb75753af2c9dc1feac145be1976163b535f4bd5671f73f0dc93f204fe74ede74c10f081bba1d3be3d1dd diff --git a/net-mail/notmuch/metadata.xml b/net-mail/notmuch/metadata.xml index 799fdb5f19ac..457dfaca90fb 100644 --- a/net-mail/notmuch/metadata.xml +++ b/net-mail/notmuch/metadata.xml @@ -2,14 +2,15 @@ <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> <maintainer type="person"> + <email>gyakovlev@gentoo.org</email> + <name>Georgy Yakovlev</name> + </maintainer> + <maintainer type="person"> <email>gentoo@seichter.de</email> <name>Ralph Seichter</name> </maintainer> - <maintainer type="project"> - <email>proxy-maint@gentoo.org</email> - <name>Proxy Maintainers</name> - </maintainer> <use> + <flag name="apidoc">Provide doxygen generated API docs</flag> <flag name="doc">Install API documentation</flag> <flag name="crypt">Support decryption and verification of PGP/MIME messages and in Emacs UI - encryption; support also S/MIME diff --git a/net-mail/notmuch/notmuch-0.31-r1.ebuild b/net-mail/notmuch/notmuch-0.31-r1.ebuild deleted file mode 100644 index f5fd2cc5cf82..000000000000 --- a/net-mail/notmuch/notmuch-0.31-r1.ebuild +++ /dev/null @@ -1,213 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -DISTUTILS_OPTIONAL=1 -NEED_EMACS="24.1" -PYTHON_COMPAT=( python3_{6,7,8} ) - -inherit bash-completion-r1 distutils-r1 elisp-common eutils flag-o-matic \ - pax-utils toolchain-funcs - -DESCRIPTION="Thread-based e-mail indexer, supporting quick search and tagging" -HOMEPAGE="https://notmuchmail.org/" -SRC_URI="https://notmuchmail.org/releases/${P}.tar.xz - test? ( https://notmuchmail.org/releases/test-databases/database-v1.tar.xz )" - -LICENSE="GPL-3" -# Sub-slot corresponds to major wersion of libnotmuch.so.X.Y. Bump of Y is -# meant to be binary backward compatible. -SLOT="0/5" -KEYWORDS="~alpha ~amd64 ~arm64 ~ppc64 ~x86" -REQUIRED_USE=" - nmbug? ( python ) - python? ( ${PYTHON_REQUIRED_USE} ) - test? ( crypt emacs python valgrind ) -" -IUSE="crypt doc emacs mutt nmbug python test valgrind" -RESTRICT="!test? ( test )" - -BDEPEND=" - virtual/pkgconfig - doc? ( - app-doc/doxygen - dev-python/mock[${PYTHON_USEDEP}] - dev-python/sphinx - sys-apps/texinfo - ) -" -COMMON_DEPEND=" - dev-libs/glib - dev-libs/gmime:3.0[crypt] - >=dev-libs/xapian-1.4.0:= - sys-libs/talloc - sys-libs/zlib - emacs? ( >=app-editors/emacs-${NEED_EMACS}:* ) - python? ( - ${PYTHON_DEPS} - dev-python/cffi - ) -" -DEPEND="${COMMON_DEPEND} - test? ( - >=app-editors/emacs-${NEED_EMACS}:*[libxml2] - app-misc/dtach - sys-devel/gdb - crypt? ( - app-crypt/gnupg - dev-libs/openssl - ) - ) - valgrind? ( dev-util/valgrind ) -" -RDEPEND="${COMMON_DEPEND} - crypt? ( app-crypt/gnupg ) - mutt? ( - dev-perl/File-Which - dev-perl/Mail-Box - dev-perl/MailTools - dev-perl/String-ShellQuote - dev-perl/Term-ReadLine-Gnu - virtual/perl-Digest-SHA - virtual/perl-File-Path - virtual/perl-Getopt-Long - virtual/perl-Pod-Parser - ) - nmbug? ( dev-vcs/git ) -" - -DOCS=( AUTHORS NEWS README ) -SITEFILE="50${PN}-gentoo.el" - -bindings() { - local rc=0 - if use python; then - # CFFI based bindings (recommended) - pushd bindings/python-cffi || die - ${@} - rc=${?} - popd || die - - # Old deprecated bindings, #736204. These are known to cause - # memory loss and other issues. Avoid if at all possible. - pushd bindings/python || die - ${@} - rc=${?} - popd || die - fi - return ${rc} -} - -pkg_setup() { - use emacs && elisp-check-emacs-version -} - -src_unpack() { - unpack "${P}".tar.xz - if use test; then - mkdir -p "${S}"/test/test-databases || die - cp "${DISTDIR}"/database-v1.tar.xz "${S}"/test/test-databases/ || die - fi -} - -src_prepare() { - local _deps="" - default - - # Python bindings - bindings distutils-r1_src_prepare - mv contrib/notmuch-mutt/README contrib/notmuch-mutt/README-mutt || die - - # Override dependencies for 'install' target - use doc && _deps="install-info" - sed -e "s/^install:.\+/install: all ${_deps}/" -i Makefile.local || die - - if use test; then - append-cflags -g - append-cxxflags -g - fi - - if [[ ${CHOST} == *-solaris* ]] ; then - # Non-autoconf configure - append-ldflags -lnsl -lsocket - fi -} - -src_configure() { - python_setup # For sphinx - local _args=( - --bashcompletiondir="$(get_bashcompdir)" - --emacslispdir="${EPREFIX}/${SITELISP}/${PN}" - --emacsetcdir="${EPREFIX}/${SITEETC}/${PN}" - --without-desktop - --without-ruby - --zshcompletiondir="${EPREFIX}/usr/share/zsh/site-functions" - $(use_with emacs) - $(use_with doc api-docs) - ) - tc-export CC CXX - econf "${_args[@]}" -} - -src_compile() { - python_setup # For sphinx - V=1 default - bindings distutils-r1_src_compile - - if use mutt; then - pushd contrib/notmuch-mutt || die - emake notmuch-mutt.1 - popd || die - fi -} - -src_test() { - pax-mark -m notmuch - LD_LIBRARY_PATH="${WORKDIR}/${P}/lib" V=1 default - pax-mark -ze notmuch -} - -src_install() { - default - doman doc/_build/man/man?/*.? - - if use emacs; then - elisp-site-file-install "${FILESDIR}/${SITEFILE}" || die - fi - - if use nmbug; then - dobin devel/nmbug/nmbug - dobin devel/nmbug/notmuch-report - fi - - if use mutt; then - pushd contrib/notmuch-mutt || die - dobin notmuch-mutt - doman notmuch-mutt.1 - insinto /etc/mutt - doins notmuch-mutt.rc - dodoc README-mutt - popd || die - fi - - DOCS="" bindings distutils-r1_src_install -} - -pkg_preinst() { - local _rcfile="/etc/mutt/notmuch-mutt.rc" - if use mutt && ! [[ -e ${ROOT}${_rcfile} ]]; then - elog "To enable notmuch support in mutt, add the following line" - elog "to your mutt config file:" - elog "" - elog " source ${_rcfile}" - fi -} - -pkg_postinst() { - use emacs && elisp-site-regen -} - -pkg_postrm() { - use emacs && elisp-site-regen -} diff --git a/net-mail/notmuch/notmuch-0.31-r2.ebuild b/net-mail/notmuch/notmuch-0.31-r2.ebuild new file mode 100644 index 000000000000..88f4451fc0b1 --- /dev/null +++ b/net-mail/notmuch/notmuch-0.31-r2.ebuild @@ -0,0 +1,276 @@ +# Copyright 1999-2020 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +DISTUTILS_OPTIONAL=1 +NEED_EMACS="24.1" +PYTHON_COMPAT=( python3_{6,7,8,9} pypy3 ) + +inherit bash-completion-r1 desktop distutils-r1 elisp-common eutils flag-o-matic pax-utils toolchain-funcs xdg-utils + +DESCRIPTION="Thread-based e-mail indexer, supporting quick search and tagging" +HOMEPAGE="https://notmuchmail.org/" +SRC_URI="https://notmuchmail.org/releases/${P}.tar.xz + test? ( https://notmuchmail.org/releases/test-databases/database-v1.tar.xz )" + +LICENSE="GPL-3" +# Sub-slot corresponds to major wersion of libnotmuch.so.X.Y. Bump of Y is +# meant to be binary backward compatible. +SLOT="0/5" +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ppc64 ~x86" +REQUIRED_USE=" + apidoc? ( doc ) + nmbug? ( python ) + python? ( ${PYTHON_REQUIRED_USE} ) + test? ( crypt emacs python valgrind ) +" +IUSE="apidoc crypt doc emacs mutt nmbug python test valgrind" +RESTRICT="!test? ( test )" + +BDEPEND=" + virtual/pkgconfig + apidoc? ( + app-doc/doxygen + dev-lang/perl + ) + doc? ( + dev-python/sphinx + sys-apps/texinfo + ) + python? ( dev-python/pytest[${PYTHON_USEDEP}] ) +" + +COMMON_DEPEND=" + dev-libs/glib + dev-libs/gmime:3.0[crypt] + >=dev-libs/xapian-1.4.0:= + sys-libs/talloc + sys-libs/zlib:= + emacs? ( >=app-editors/emacs-${NEED_EMACS}:* ) + python? ( + ${PYTHON_DEPS} + virtual/python-cffi[${PYTHON_USEDEP}] + ) +" + +DEPEND="${COMMON_DEPEND} + test? ( + >=app-editors/emacs-${NEED_EMACS}:*[libxml2] + app-misc/dtach + sys-devel/gdb + crypt? ( + app-crypt/gnupg + dev-libs/openssl + ) + ) + valgrind? ( dev-util/valgrind ) +" + +RDEPEND="${COMMON_DEPEND} + crypt? ( app-crypt/gnupg ) + mutt? ( + dev-perl/File-Which + dev-perl/Mail-Box + dev-perl/MailTools + dev-perl/String-ShellQuote + dev-perl/Term-ReadLine-Gnu + virtual/perl-Digest-SHA + virtual/perl-File-Path + virtual/perl-Getopt-Long + virtual/perl-Pod-Parser + ) + nmbug? ( dev-vcs/git ) +" + +SITEFILE="50${PN}-gentoo.el" + +pkg_setup() { + use emacs && elisp-check-emacs-version +} + +src_unpack() { + unpack "${P}".tar.xz + if use test; then + mkdir -p "${S}"/test/test-databases || die + cp "${DISTDIR}"/database-v1.tar.xz "${S}"/test/test-databases/ || die + fi +} + +src_prepare() { + default + + use python && distutils-r1_src_prepare + + mv contrib/notmuch-mutt/README contrib/notmuch-mutt/README-mutt || die + + # Override 'install' target, we want to install manpages with doman, but let it install texinfo files. + sed -i "s/all install-man install-info/all $(usex doc install-info '')/" "Makefile.local" || die + + use test && append-flags '-g' + + # Non-autoconf configure + [[ ${CHOST} == *-solaris* ]] && append-ldflags '-lnsl' '-lsocket' +} + +src_configure() { + python_setup # For sphinx + + tc-export CC CXX + + local myconf=( + --bashcompletiondir="$(get_bashcompdir)" + --emacslispdir="${EPREFIX}/${SITELISP}/${PN}" + --emacsetcdir="${EPREFIX}/${SITEETC}/${PN}" + --without-desktop + --without-ruby + --zshcompletiondir="${EPREFIX}/usr/share/zsh/site-functions" + $(use_with apidoc api-docs) + $(use_with doc docs) + $(use_with emacs) + ) + + econf "${myconf[@]}" +} + +python_compile() { + pushd bindings/python-cffi > /dev/null || die + distutils-r1_python_compile + popd > /dev/null || die + + # TODO: we want to drop those, research revdeps + pushd bindings/python > /dev/null || die + distutils-r1_python_compile + popd > /dev/null || die +} + +python_compile_all() { + use doc && emake -C bindings/python/docs html +} + +src_compile() { + python_setup # For sphinx + + # prevent race in emacs doc generation + # FileNotFoundError: [Errno 2] No such file or directory: '..work/notmuch-0.31/emacs/notmuch.rsti' + if use emacs; then + use doc && emake -j1 -C emacs docstring.stamp V=1 #nowarn + fi + + emake V=1 + + use python && distutils-r1_src_compile + + if use mutt; then + pushd contrib/notmuch-mutt > /dev/null || die + emake notmuch-mutt.1 + popd > /dev/null || die + fi +} + +python_test() { + # we only have tests for cffi bindings + pushd bindings/python-cffi > /dev/null || die + rm -f tox.ini || die + pytest -vv || die "Tests failed with ${EPYTHON}" + popd > /dev/null || die +} + +src_test() { + local test_failures=() + # NOTMUCH_TEST_SERIALIZE is needed to avoid using gnu parallel (if it's installed) + pax-mark -m notmuch + NOTMUCH_TEST_SERIALIZE=1 \ + LD_LIBRARY_PATH="${S}/lib" \ + nonfatal emake test V=1 OPTIONS="--verbose --tee" || test_failures+=( "'emake tests'" ) + pax-mark -ze notmuch + + # both lib and bin needed for testsuite. + if use python; then + LD_LIBRARY_PATH="${S}/lib" \ + PATH="${S}:${PATH}" \ + nonfatal distutils-r1_src_test || test_failures+=( "'python tests'" ) + fi + + [[ ${test_failures} ]] && die "Tests failed: ${test_failures[@]}" +} + +python_install() { + pushd bindings/python-cffi > /dev/null || die + distutils-r1_python_install + popd > /dev/null || die + + pushd bindings/python > /dev/null || die + distutils-r1_python_install + popd > /dev/null || die +} + +src_install() { + default + + if use doc; then + pushd doc/_build/man/man1 > /dev/null || die + ln notmuch.1 notmuch-setup.1 || die + popd > /dev/null || die + if use apidoc; then + # rename overly generic manpage to avoid clashes + mv doc/_build/man/man3/deprecated.3 \ + doc/_build/man/man3/notmuch-deprecated.3 || die + fi + doman doc/_build/man/man?/*.? + fi + + if use emacs; then + elisp-site-file-install "${FILESDIR}/${SITEFILE}" || die + domenu emacs/notmuch-emacs-mua.desktop + fi + + if use nmbug; then + # TODO: those guys need proper deps + python_fix_shebang devel/nmbug/{nmbug,notmuch-report} + dobin devel/nmbug/{nmbug,notmuch-report} + fi + + if use mutt; then + pushd contrib/notmuch-mutt > /dev/null || die + dobin notmuch-mutt + # this manpage is built by pod2man + doman notmuch-mutt.1 + insinto /etc/mutt + doins notmuch-mutt.rc + dodoc README-mutt + popd > /dev/null || die + fi + + local DOCS=( README{,.rst} INSTALL NEWS ) + einstalldocs + + if use python; then + use doc && local HTML_DOCS=( bindings/python/docs/html/. ) + distutils-r1_src_install + fi +} + +pkg_preinst() { + local _rcfile="/etc/mutt/notmuch-mutt.rc" + if use mutt && ! [[ -e ${ROOT}${_rcfile} ]]; then + elog "To enable notmuch support in mutt, add the following line" + elog "to your mutt config file:" + elog "" + elog " source ${_rcfile}" + fi +} + +pkg_postinst() { + if use emacs; then + elisp-site-regen + xdg_desktop_database_update + fi +} + +pkg_postrm() { + if use emacs; then + elisp-site-regen + xdg_desktop_database_update + fi +} diff --git a/net-mail/notmuch/notmuch-0.31.2.ebuild b/net-mail/notmuch/notmuch-0.31.2.ebuild new file mode 100644 index 000000000000..750021265833 --- /dev/null +++ b/net-mail/notmuch/notmuch-0.31.2.ebuild @@ -0,0 +1,277 @@ +# Copyright 1999-2020 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +DISTUTILS_OPTIONAL=1 +NEED_EMACS="24.1" +PYTHON_COMPAT=( python3_{6,7,8,9} pypy3 ) + +inherit bash-completion-r1 desktop distutils-r1 elisp-common eutils flag-o-matic pax-utils toolchain-funcs xdg-utils + +DESCRIPTION="Thread-based e-mail indexer, supporting quick search and tagging" +HOMEPAGE="https://notmuchmail.org/" +SRC_URI="https://notmuchmail.org/releases/${P}.tar.xz + test? ( https://notmuchmail.org/releases/test-databases/database-v1.tar.xz )" + +LICENSE="GPL-3" +# Sub-slot corresponds to major wersion of libnotmuch.so.X.Y. Bump of Y is +# meant to be binary backward compatible. +SLOT="0/5" +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ppc64 x86" +REQUIRED_USE=" + apidoc? ( doc ) + nmbug? ( python ) + python? ( ${PYTHON_REQUIRED_USE} ) + test? ( crypt emacs python valgrind ) +" +IUSE="apidoc crypt doc emacs mutt nmbug python test valgrind" +RESTRICT="!test? ( test )" + +BDEPEND=" + virtual/pkgconfig + apidoc? ( + app-doc/doxygen + dev-lang/perl + ) + doc? ( + dev-python/sphinx + sys-apps/texinfo + ) + python? ( dev-python/pytest[${PYTHON_USEDEP}] ) +" + +COMMON_DEPEND=" + dev-libs/glib + dev-libs/gmime:3.0[crypt] + >=dev-libs/xapian-1.4.0:= + sys-libs/talloc + sys-libs/zlib:= + emacs? ( >=app-editors/emacs-${NEED_EMACS}:* ) + python? ( + ${PYTHON_DEPS} + virtual/python-cffi[${PYTHON_USEDEP}] + ) +" + +DEPEND="${COMMON_DEPEND} + test? ( + >=app-editors/emacs-${NEED_EMACS}:*[libxml2] + app-misc/dtach + sys-devel/gdb + crypt? ( + app-crypt/gnupg + dev-libs/openssl + ) + ) + valgrind? ( dev-util/valgrind ) +" + +RDEPEND="${COMMON_DEPEND} + crypt? ( app-crypt/gnupg ) + mutt? ( + dev-perl/File-Which + dev-perl/Mail-Box + dev-perl/MailTools + dev-perl/String-ShellQuote + dev-perl/Term-ReadLine-Gnu + virtual/perl-Digest-SHA + virtual/perl-File-Path + virtual/perl-Getopt-Long + virtual/perl-Pod-Parser + ) + nmbug? ( dev-vcs/git ) +" + +SITEFILE="50${PN}-gentoo.el" + +pkg_setup() { + use emacs && elisp-check-emacs-version +} + +src_unpack() { + unpack "${P}".tar.xz + if use test; then + mkdir -p "${S}"/test/test-databases || die + cp "${DISTDIR}"/database-v1.tar.xz "${S}"/test/test-databases/ || die + fi +} + +src_prepare() { + default + + use python && distutils-r1_src_prepare + + mv contrib/notmuch-mutt/README contrib/notmuch-mutt/README-mutt || die + + # Override 'install' target, we want to install manpages with doman, but let it install texinfo files. + sed -i "s/all install-man install-info/all $(usex doc install-info '')/" "Makefile.local" || die + + use test && append-flags '-g' + + # Non-autoconf configure + [[ ${CHOST} == *-solaris* ]] && append-ldflags '-lnsl' '-lsocket' +} + +src_configure() { + python_setup # For sphinx + + tc-export CC CXX + + local myconf=( + --bashcompletiondir="$(get_bashcompdir)" + --emacslispdir="${EPREFIX}/${SITELISP}/${PN}" + --emacsetcdir="${EPREFIX}/${SITEETC}/${PN}" + --without-desktop + --without-ruby + --zshcompletiondir="${EPREFIX}/usr/share/zsh/site-functions" + $(use_with apidoc api-docs) + $(use_with doc docs) + $(use_with emacs) + ) + + econf "${myconf[@]}" +} + +python_compile() { + pushd bindings/python-cffi > /dev/null || die + distutils-r1_python_compile + popd > /dev/null || die + + # TODO: we want to drop those, research revdeps + pushd bindings/python > /dev/null || die + distutils-r1_python_compile + popd > /dev/null || die +} + +python_compile_all() { + use doc && emake -C bindings/python/docs html +} + +src_compile() { + python_setup # For sphinx + + # prevent race in emacs doc generation + # FileNotFoundError: [Errno 2] No such file or directory: '..work/notmuch-0.31/emacs/notmuch.rsti' + if use emacs; then + use doc && emake -j1 -C emacs docstring.stamp V=1 #nowarn + fi + + emake V=1 + + use python && distutils-r1_src_compile + + if use mutt; then + pushd contrib/notmuch-mutt > /dev/null || die + emake notmuch-mutt.1 + popd > /dev/null || die + fi +} + +python_test() { + # we only have tests for cffi bindings + pushd bindings/python-cffi > /dev/null || die + rm -f tox.ini || die + pytest -vv || die "Tests failed with ${EPYTHON}" + popd > /dev/null || die +} + +src_test() { + local test_failures=() + pax-mark -m notmuch + + # NOTMUCH_TEST_SERIALIZE is needed to avoid using gnu parallel (if it's installed) + NOTMUCH_TEST_SERIALIZE=1 \ + LD_LIBRARY_PATH="${S}/lib" \ + nonfatal emake test V=1 OPTIONS="--verbose --tee" || test_failures+=( "'emake tests'" ) + + pax-mark -ze notmuch + + # both lib and bin needed for testsuite. + if use python; then + LD_LIBRARY_PATH="${S}/lib" \ + PATH="${S}:${PATH}" \ + nonfatal distutils-r1_src_test || test_failures+=( "'python tests'" ) + fi + + [[ ${test_failures} ]] && die "Tests failed: ${test_failures[@]}" +} + +python_install() { + pushd bindings/python-cffi > /dev/null || die + distutils-r1_python_install + popd > /dev/null || die + + pushd bindings/python > /dev/null || die + distutils-r1_python_install + popd > /dev/null || die +} + +src_install() { + default + + if use doc; then + pushd doc/_build/man/man1 > /dev/null || die + ln notmuch.1 notmuch-setup.1 || die + popd > /dev/null || die + if use apidoc; then + # rename overly generic manpage to avoid clashes + mv doc/_build/man/man3/deprecated.3 \ + doc/_build/man/man3/notmuch-deprecated.3 || die + fi + doman doc/_build/man/man?/*.? + fi + + if use emacs; then + elisp-site-file-install "${FILESDIR}/${SITEFILE}" || die + domenu emacs/notmuch-emacs-mua.desktop + fi + + if use nmbug; then + python_fix_shebang devel/nmbug/{nmbug,notmuch-report} + dobin devel/nmbug/{nmbug,notmuch-report} + fi + + if use mutt; then + pushd contrib/notmuch-mutt > /dev/null || die + dobin notmuch-mutt + # this manpage is built by pod2man + doman notmuch-mutt.1 + insinto /etc/mutt + doins notmuch-mutt.rc + dodoc README-mutt + popd > /dev/null || die + fi + + local DOCS=( README{,.rst} INSTALL NEWS ) + einstalldocs + + if use python; then + use doc && local HTML_DOCS=( bindings/python/docs/html/. ) + distutils-r1_src_install + fi +} + +pkg_preinst() { + local _rcfile="/etc/mutt/notmuch-mutt.rc" + if use mutt && ! [[ -e ${ROOT}${_rcfile} ]]; then + elog "To enable notmuch support in mutt, add the following line" + elog "to your mutt config file:" + elog "" + elog " source ${_rcfile}" + fi +} + +pkg_postinst() { + if use emacs; then + elisp-site-regen + xdg_desktop_database_update + fi +} + +pkg_postrm() { + if use emacs; then + elisp-site-regen + xdg_desktop_database_update + fi +} diff --git a/net-mail/onionrouter/Manifest b/net-mail/onionrouter/Manifest new file mode 100644 index 000000000000..899ed9081e11 --- /dev/null +++ b/net-mail/onionrouter/Manifest @@ -0,0 +1,5 @@ +AUX onionrouter.service 462 BLAKE2B 83f048d1111167fd99ff2a3bfd791ac8435c01f9a262320ab260bf11d5b66b06453d2b4ea3176bfb6991f34c0d47bfeb5ccfcaafa21063aa4de7aeb0739d1c98 SHA512 8d84a028869a92f746b93eaa5ff6e1544a731893c96f223a67cd9fef8d15c00ba9922a6633e3e2d9cc094f722ccf7a3133ce923ef0b3478bf4e9d2d7d327ae11 +DIST onionrouter-0.6.1.tar.gz 26584 BLAKE2B e1d722ba4e7ec617e39fda54299cd71d9d47bbd34fd44a19ffef8f2349f9b238251b47d01c369223393a9d7f2e0a05c5d8b7dc9f991c7d386ba800086b8cc226 SHA512 5d08e7a7310e69e29eaba2098a62cef4b5044c207f4a78b4cfebfd2a9d18bd812b485793ff7395186d4949ad9604b4e82dc0e9b1200abf03108466bf531a6d15 +EBUILD onionrouter-0.6.1.ebuild 1162 BLAKE2B 14195482f1a67442979a5cc7daa6f513b3a3deb2a3801d6664f464793b28a04f64f991cfde7fe2405fd28e484f81814fb0ed742070028cf61e4a4f3a74287a6e SHA512 01b96089281280ef29c27f0a40d52ccb6f07dc707741e0b041b50533a3f636254bf6ba04e2b62f7404d9c2ab88377b3f428cb587ffd40bb0a783ec8af5534cab +EBUILD onionrouter-9999.ebuild 1162 BLAKE2B 14195482f1a67442979a5cc7daa6f513b3a3deb2a3801d6664f464793b28a04f64f991cfde7fe2405fd28e484f81814fb0ed742070028cf61e4a4f3a74287a6e SHA512 01b96089281280ef29c27f0a40d52ccb6f07dc707741e0b041b50533a3f636254bf6ba04e2b62f7404d9c2ab88377b3f428cb587ffd40bb0a783ec8af5534cab +MISC metadata.xml 248 BLAKE2B 3f65c2f88989989e697a91f6cdd53f41417682b0fdd13820473e04af6cbe434120f2e29e7b08edb18b860b50caf9131f8a69f396e64b85ba10901498cbf2587d SHA512 4784715e9b0407de4537918eb1f7879ab399491e47aa5256dc444fbf13a939a44a591e6f1775992576c082d9e5d0dadce8a968a70fa0f05ca4b17b6aea3e4ac3 diff --git a/net-mail/onionrouter/files/onionrouter.service b/net-mail/onionrouter/files/onionrouter.service new file mode 100644 index 000000000000..bf5d7811f823 --- /dev/null +++ b/net-mail/onionrouter/files/onionrouter.service @@ -0,0 +1,25 @@ +[Unit] +Description=onionrouter +After=network.target tor.service +Before=postfix.service + +[Service] +ExecStart=/usr/bin/onionrouter +Restart=on-failure +RestartSec=10s +DynamicUser=true +PrivateDevices=true +PrivateUsers=true +ProtectClock=true +ProtectControlGroups=true +ProtectHome=true +ProtectKernelLogs=true +ProtectKernelModules=true +ProtectKernelTunables=true +ProtectHostname=true +RestrictRealtime=true +MemoryDenyWriteExecute=true + +[Install] +WantedBy=default.target + diff --git a/net-mail/onionrouter/metadata.xml b/net-mail/onionrouter/metadata.xml new file mode 100644 index 000000000000..fbb8d54dbc4d --- /dev/null +++ b/net-mail/onionrouter/metadata.xml @@ -0,0 +1,8 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<pkgmetadata> + <maintainer type="person"> + <email>candrews@gentoo.org</email> + <name>Craig Andrews</name> + </maintainer> +</pkgmetadata> diff --git a/net-mail/onionrouter/onionrouter-0.6.1.ebuild b/net-mail/onionrouter/onionrouter-0.6.1.ebuild new file mode 100644 index 000000000000..2efd032bc84b --- /dev/null +++ b/net-mail/onionrouter/onionrouter-0.6.1.ebuild @@ -0,0 +1,50 @@ +# Copyright 1999-2020 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +PYTHON_COMPAT=( python3_{7,8,9} ) +DISTUTILS_SINGLE_IMPL=1 +DISTUTILS_USE_SETUPTOOLS=rdepend + +inherit distutils-r1 systemd + +DESCRIPTION=".onion discovery via SRV DNS lookups for use with postfix" +HOMEPAGE="https://pypi.org/project/onionrouter/ https://github.com/ehloonion/onionrouter/" +if [[ ${PV} == *9999 ]] ; then + SRC_URI="" + EGIT_REPO_URI="https://github.com/ehloonion/onionrouter.git" + inherit git-r3 +else + KEYWORDS="~amd64" + SRC_URI="https://pypi.io/packages/source/${PN::1}/${PN}/${P}.tar.gz" +fi +IUSE="test" +RESTRICT="!test? ( test )" + +LICENSE="GPL-3+" +SLOT="0" + +RDEPEND="$(python_gen_cond_dep ' + dev-python/dnspython[${PYTHON_USEDEP}] + dev-python/pyyaml[${PYTHON_USEDEP}] +')" +BDEPEND="$(python_gen_cond_dep ' + test? ( + dev-python/pytest[${PYTHON_USEDEP}] + dev-python/wheel[${PYTHON_USEDEP}] + ) +')" + +distutils_enable_tests pytest + +src_prepare() { + distutils-r1_src_prepare +} + +src_install() { + distutils-r1_src_install + systemd_dounit "${FILESDIR}/${PN}.service" + insinto /etc/onionrouter + doins "${S}/onionrouter/configs/onionrouter.ini" +} diff --git a/net-mail/onionrouter/onionrouter-9999.ebuild b/net-mail/onionrouter/onionrouter-9999.ebuild new file mode 100644 index 000000000000..2efd032bc84b --- /dev/null +++ b/net-mail/onionrouter/onionrouter-9999.ebuild @@ -0,0 +1,50 @@ +# Copyright 1999-2020 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +PYTHON_COMPAT=( python3_{7,8,9} ) +DISTUTILS_SINGLE_IMPL=1 +DISTUTILS_USE_SETUPTOOLS=rdepend + +inherit distutils-r1 systemd + +DESCRIPTION=".onion discovery via SRV DNS lookups for use with postfix" +HOMEPAGE="https://pypi.org/project/onionrouter/ https://github.com/ehloonion/onionrouter/" +if [[ ${PV} == *9999 ]] ; then + SRC_URI="" + EGIT_REPO_URI="https://github.com/ehloonion/onionrouter.git" + inherit git-r3 +else + KEYWORDS="~amd64" + SRC_URI="https://pypi.io/packages/source/${PN::1}/${PN}/${P}.tar.gz" +fi +IUSE="test" +RESTRICT="!test? ( test )" + +LICENSE="GPL-3+" +SLOT="0" + +RDEPEND="$(python_gen_cond_dep ' + dev-python/dnspython[${PYTHON_USEDEP}] + dev-python/pyyaml[${PYTHON_USEDEP}] +')" +BDEPEND="$(python_gen_cond_dep ' + test? ( + dev-python/pytest[${PYTHON_USEDEP}] + dev-python/wheel[${PYTHON_USEDEP}] + ) +')" + +distutils_enable_tests pytest + +src_prepare() { + distutils-r1_src_prepare +} + +src_install() { + distutils-r1_src_install + systemd_dounit "${FILESDIR}/${PN}.service" + insinto /etc/onionrouter + doins "${S}/onionrouter/configs/onionrouter.ini" +} diff --git a/net-mail/popa3d/Manifest b/net-mail/popa3d/Manifest index c5bb6a3ba7e7..c7e309a6465d 100644 --- a/net-mail/popa3d/Manifest +++ b/net-mail/popa3d/Manifest @@ -2,5 +2,5 @@ AUX popa3d-initrc 368 BLAKE2B ff43e20de31313409b7e9930c397cc4585a500ea6d2372206b DIST popa3d-0.5.9-maildir-2.diff.gz 3227 BLAKE2B 09cffef1280cd038c1953c0b14dc7b701231fdff0f18f9cfec4c732e2c2b1b857a01c12671afc510e24860554157bd990be917662ab5dadb9512683da831b4c6 SHA512 7d2ab786e6249acfaadaa544adf49dca42b5628f50aa9f52fd1caa80127adc83afa4623824170c9f3b761a39949fcf3c90edbdbb9fdfbf4e06afaa67cdfbaac3 DIST popa3d-0.6.3-vname-2.diff.gz 947 BLAKE2B 1a64b8de2cbda4757a670aee61e4665bd394f4128763119feacacbdc4921c7a0c128050b3f15f369c4fdea68cc4c595ab1eb48e729a119e1078d4cfd6f874092 SHA512 eba7df6d03d2745272505b62053d0db56ea326a716e43a9133257465f78fc5030cb09b48d79e86f6a982f7d8e9d18ee64aadf261e60a4f0a56357a4a2517a30a DIST popa3d-1.0.2.tar.gz 32848 BLAKE2B 1f0af2f1f12ec255f3f42eb54087f7c4859beee49d55cae60f32b4f5a58a0062c7cd5eae3690d778f3d7f7bea6678fe937b4864a2a7586c12837edf19df57fdf SHA512 e577297b4dafb4091110886a5db07184707475651a8ee3b6369f4cab5676852d7286a3729da46fff9161bc3cd46bdc0d032205dc5609bfb38be69eaeab068906 -EBUILD popa3d-1.0.2-r1.ebuild 4983 BLAKE2B b3ea49f848ca15431a95b310d90abe748da6f515c100ce80446eda738c20b936634b9bee77a04d297b5e88b8958db1052764689bd5dfa82f3a6506365ae84ad8 SHA512 30f4c2f68b089612ab014a9904c7e26a055496b7b4443b92c55fc442601a20ca0553662d3dd81c334afeb4eb485b3fa64e41d361b053d2ad511db768af58ba11 +EBUILD popa3d-1.0.2-r1.ebuild 4923 BLAKE2B 1171c9a00ef7093036bd9a5da62510bac62244b9eb5d9c0841776426fdcbdf46e24abe956e93bf25b87e9da21196cbb4a4ff07bfea34db3cae5c506647c27244 SHA512 16fcd58001b5ab6cffcdae8848f9202628bc8d7ef3e1691205f24d87aa6097bd2444f2f2b4f235f9ff9d68389e810b552c4cc4f4b624233b0c83410a61e48334 MISC metadata.xml 167 BLAKE2B e4dadf27fd344484f2bccb5b904909c89aac568c32e5b3c44bdf139eacefd4b4fae74419f503d2b7da0dccc1b68ba05d777d11292c0f89270d1ac5c9c703e8ca SHA512 7c8decb24ee3a850e38186cf3c7f8933a28017426806870ad6ef9ceb2533be147a2681fc789b535a81cb528af8c29d90d3006e4f250aee23bd7dea4561294e33 diff --git a/net-mail/popa3d/popa3d-1.0.2-r1.ebuild b/net-mail/popa3d/popa3d-1.0.2-r1.ebuild index a668854c980e..3211b59858e1 100644 --- a/net-mail/popa3d/popa3d-1.0.2-r1.ebuild +++ b/net-mail/popa3d/popa3d-1.0.2-r1.ebuild @@ -1,10 +1,32 @@ # Copyright 1999-2020 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=4 -inherit eutils toolchain-funcs user +EAPI=7 + +inherit flag-o-matic toolchain-funcs + +DESCRIPTION="A security oriented POP3 server" +HOMEPAGE="http://www.openwall.com/popa3d/" +SRC_URI=" + http://www.openwall.com/popa3d/${P}.tar.gz + mirror://gentoo/popa3d-0.6.3-vname-2.diff.gz + maildir? ( mirror://gentoo/popa3d-0.5.9-maildir-2.diff.gz )" + +LICENSE="Openwall" +SLOT="0" +KEYWORDS="amd64 ppc sparc x86" +IUSE="pam mbox +maildir" +REQUIRED_USE="^^ ( maildir mbox )" + +DEPEND=" + acct-group/popa3d + acct-user/popa3d + pam? ( + >=sys-libs/pam-0.72 + >=net-mail/mailbase-0.00-r8[pam] + )" +RDEPEND="${DEPEND}" -# # Mailbox format is determined by the 'mbox' and 'maildir' # system USE flags. # @@ -49,46 +71,20 @@ MAX_MAILBOX_OPEN_BYTES=100000000 # Default is 2147483647 MAX_MAILBOX_WORK_BYTES=150000000 # Default is 2147483647 ###### -IUSE="pam mbox +maildir" - -DESCRIPTION="A security oriented POP3 server" -HOMEPAGE="http://www.openwall.com/popa3d/" - -SRC_URI="http://www.openwall.com/popa3d/${P}.tar.gz - mirror://gentoo/popa3d-0.6.3-vname-2.diff.gz - maildir? ( mirror://gentoo/popa3d-0.5.9-maildir-2.diff.gz )" - -LICENSE="Openwall" -SLOT="0" -KEYWORDS="amd64 ppc sparc x86" - -DEPEND=">=sys-apps/sed-4 - pam? ( >=sys-libs/pam-0.72 - >=net-mail/mailbase-0.00-r8[pam] )" -RDEPEND="${DEPEND}" - -REQUIRED_USE="^^ ( maildir mbox )" - pkg_setup() { - echo - ewarn - ewarn "You can customize this ebuild with environmental variables." - ewarn "If you don't set any I'll assume sensible defaults." - ewarn - ewarn "See inside this ebuild for details." - ewarn - echo - - enewgroup popa3d - enewuser popa3d -1 -1 -1 popa3d + einfo "You can customize this ebuild with environmental variables." + einfo "If you don't set any I'll assume sensible defaults." + einfo + einfo "See inside this ebuild for details." } src_prepare() { - epatch "${DISTDIR}"/popa3d-0.6.3-vname-2.diff.gz - use maildir && epatch "${DISTDIR}"/popa3d-0.5.9-maildir-2.diff.gz + eapply "${WORKDIR}"/popa3d-0.6.3-vname-2.diff + use maildir && eapply "${WORKDIR}"/popa3d-0.5.9-maildir-2.diff + eapply_user } -src_compile() { +src_configure() { sed -i \ -e "s:^\(#define MAX_SESSIONS\) .*$:\1 ${MAX_SESSIONS}:" \ -e "s:^\(#define MAX_SESSIONS_PER_SOURCE\).*$:\1 ${MAX_SESSIONS_PER_SOURCE}:" \ @@ -133,7 +129,7 @@ src_compile() { einfo "Authentication method: Virtual." elif use pam ; then einfo "Authentication method: PAM." - LIBS="${LIBS} -lpam" + append-libs -lpam sed -i \ -e "s:^\(#define AUTH_SHADOW\)[[:blank:]].*$:\1 0:" \ -e "s:^\(#define AUTH_PAM\)[[:blank:]].*$:\1 1:" \ @@ -153,7 +149,9 @@ src_compile() { -e '/^CFLAGS =/d' \ -e '/^LDFLAGS =/d' \ Makefile || die "Makefile cleaning failed" +} +src_compile() { emake LIBS="${LIBS} -lcrypt" \ CFLAGS="${CFLAGS}" \ LDFLAGS="${LDFLAGS}" \ @@ -161,8 +159,6 @@ src_compile() { } src_install() { - into /usr - dosbin popa3d doman popa3d.8 dodoc DESIGN INSTALL CHANGES VIRTUAL CONTACT @@ -175,6 +171,6 @@ src_install() { if use pam ; then dodir /etc/pam.d/ - dosym /etc/pam.d/pop /etc/pam.d/popa3d + dosym pop /etc/pam.d/popa3d fi } diff --git a/net-mail/queue-repair/Manifest b/net-mail/queue-repair/Manifest index 949f91345903..122317241e8b 100644 --- a/net-mail/queue-repair/Manifest +++ b/net-mail/queue-repair/Manifest @@ -1,3 +1,3 @@ DIST queue-repair-0.9.0.tar.gz 13913 BLAKE2B 04935bdb8473bad4d785732eabe2df7bd19d8e7b7364e1be516a8f94c6aee15c6f14bd171be8585f087ba0281281285f0695bb79a90a02519aa252a5884bfd7d SHA512 b7c21de207c80c3f764eddae6e60b4d54869f2037f572f98ff4e0a1e34f55ae1feeab5162b4f0f902a5a3c9d631c687057cdfdc4f646d6843d845f31f5b7bf6f -EBUILD queue-repair-0.9.0-r2.ebuild 816 BLAKE2B 947aff25964509108987b359546164b7fc8a8d43eac898ef0eda9ceb440e11a9057be5bf6dede3d1942ede7862cf4a53b6f0b182e0ec723764ae5e59c48048e6 SHA512 9b8bfd9c40480adce979a32d16b492cbe9ca27cb29173e44ffe3c8f6b30b64ad2ad7975d0e26dde2a41b49538679c0357d28b7f9ac97f3850754323e8947fcf5 +EBUILD queue-repair-0.9.0-r2.ebuild 823 BLAKE2B a66813707b55a33cc0c5a0db936ea5e9cd395a453d03b84d2f6fa8efb61ceda37f84c66ff37b71e4810e851733099bdadd1f85425ec52dd132daa230a54ce186 SHA512 eccebefaf936171623aa6f91237b614f7375d634dd0c7b317053f6b6ec1e56b691fa67b5e69d93c8e2a3dbb8d4c14848e762bfd879d53bb401c21d257eb9d266 MISC metadata.xml 490 BLAKE2B 8ec4d8e23a4956f5679a0b5291b03262a4474f3d0d97a5fc3286189f5623c75d859ce8103708dfe3ed1e4e3721165a764b121364f06121289aff047cd60db281 SHA512 bf57215deceddaa74691029e05f52940c0bd1d9262c865980c35786f487d08351e24287c50685ef85514a1e7cc7cb68d527259b369a34d6d06bf8fd4474285b1 diff --git a/net-mail/queue-repair/queue-repair-0.9.0-r2.ebuild b/net-mail/queue-repair/queue-repair-0.9.0-r2.ebuild index 1c3689c51898..1e771646ecc1 100644 --- a/net-mail/queue-repair/queue-repair-0.9.0-r2.ebuild +++ b/net-mail/queue-repair/queue-repair-0.9.0-r2.ebuild @@ -13,7 +13,7 @@ SRC_URI="http://pyropus.ca/software/queue-repair/${P}.tar.gz" LICENSE="GPL-2" SLOT="0" -KEYWORDS="~alpha amd64 arm hppa ~ia64 ~m68k ~mips ppc ppc64 s390 sparc x86" +KEYWORDS="~alpha amd64 arm ~arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 s390 sparc x86" REQUIRED_USE="${PYTHON_REQUIRED_USE}" RESTRICT="test" # no tests diff --git a/net-mail/swaks/Manifest b/net-mail/swaks/Manifest index fa73cecb0a6b..cd39c36aecd7 100644 --- a/net-mail/swaks/Manifest +++ b/net-mail/swaks/Manifest @@ -1,6 +1,8 @@ AUX swaks-perl-5.18.patch 2139 BLAKE2B 03501cda36503a966a1d1d50b94b054d2aaa1584566a64a7e393e4d81fd0f8e456734e0b787723e7aec5caa55b08ab264da897b7bb8ead351250c7402e73e361 SHA512 f5d507e2b2812776f4a35e66a3ace3a9edb3d3c50fc7734304d48a278aa7c3fe725f363d14c61442d11a07e8266bab8ce486c4c9eaae2c5ec7e93484c5ffcb53 DIST swaks-20130209.0.tar.gz 102227 BLAKE2B 4726da81869e137458f1a3776c51ae33215999bef56b1835cf8558166bd756a8186900b83c0bf32a81d1ab1cf23ec379061f4db78ae5efa51de7a6c1a69d0092 SHA512 bf3c639f2c227d8219d5bc98a3d3519886471168c16e38d036283eeb1bb786c80bb80a648637150b3eb1903ef0c0d01bc37fd7b4f55af66a20f7bef18067b118 DIST swaks-20190914.0.tar.gz 120803 BLAKE2B 68731c22fbff5ece5c9589c3767afd6aa4fc781df8c6124a0f57d48a3dff8def31ccae1b043e78f7c066194cfe480a0edeb16e43fcd5e1b1aa75b05e65a2367e SHA512 3167435a73e7729d090cba2431d5828895c25154c36d92e0ebecd5c4e2430ca596d62bb3e6eb3b65eadabd52c8331fe3bb8a492cce3ad247fa113c0af9c67339 +DIST swaks-20201014.0.tar.gz 110953 BLAKE2B 8dd2c681c6c1e66b76bda71f0bc8b88e658565b28c29ae9f02e5c27500619598e5817a442aa82c48fd90be80cd2dc54eda8390ad3d1cb2e00163cc07a526f463 SHA512 8a4e8dc810a9c5943afdbc4db7130e110c42e211d6927ce1cdbab6f81fa49c31490e6c3668ec3cea79580c07b281ce30901b3b4a71325951167158cc9d70d9cc EBUILD swaks-20130209.0-r1.ebuild 973 BLAKE2B 916ee1b50772d67a8453a5745a78da399c7868a11bf33fd9fffbc00295419950d45078e4fc5e3b66d439d32d7289059c40d367b12ac846404931587e212f5c81 SHA512 071d817f0d8b8e60be7c0c012baffbbfd99a1ff717351a750bca7e7fe539c886290c164965f2632f441181f84ca40990ef728fa4d7f08f7abdb25cce2ff62378 EBUILD swaks-20190914.0.ebuild 893 BLAKE2B 40594f87773d93f89871ab6b23342877e8e5dcf53b497a024499e8222315c2b5cf55b63de7e6e2549a7369ff9df694057f33f34a2a1e99f2c33699c587118dde SHA512 8836c89d2cfb902ce75ebd9d95681b73729e43ed83eb9763227a0f082430383b8d265e346943c341558669b1741d3f7964a11aa056221ec1e93cd612ec04d540 +EBUILD swaks-20201014.0.ebuild 1095 BLAKE2B f4766589cf91bd03ea738c656372d6ac67266ad1e2d9bd9db2c8f3156f89dbea7d3627382085b77aec8eb87020ffe631f827b79312b16439280d3724599433c6 SHA512 44ccb9bb28f2d9f85bdd3199496426aa782318c9f3ac70ef6b18302482baf1481b1df60796c1b85e53bd85976364b165626ae9b4cfd84778d49ebbad04905671 MISC metadata.xml 540 BLAKE2B a3271dc0ad82899ef2945c3d42eb2030f08f47d7ae8633d89fe03edfe6b26f36eee4c7da193730360a7e54fae8d1c853cd24012024f33a96debe34330877737e SHA512 a0275812c2941b91adb18befe36ffe5e87a2d4dad904b3c7988e88f0b9252105d4bd35a18259c0c777a5f533632e1d2bbeb28298b0c97e69ddcc902e4919167c diff --git a/net-mail/swaks/swaks-20201014.0.ebuild b/net-mail/swaks/swaks-20201014.0.ebuild new file mode 100644 index 000000000000..0364b7e0eb03 --- /dev/null +++ b/net-mail/swaks/swaks-20201014.0.ebuild @@ -0,0 +1,50 @@ +# Copyright 1999-2020 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +inherit optfeature perl-functions + +DESCRIPTION="Swiss Army Knife SMTP; Command line SMTP testing, including TLS and AUTH" +HOMEPAGE="https://www.jetmore.org/john/code/swaks/ + https://github.com/jetmore/swaks" +SRC_URI="http://www.jetmore.org/john/code/swaks/${P}.tar.gz" +LICENSE="GPL-2+" +SLOT="0" +KEYWORDS="~amd64 ~ppc ~x86" + +RDEPEND=" + dev-perl/Authen-DigestMD5 + dev-perl/Authen-NTLM + dev-perl/CGI + dev-perl/DBI + dev-perl/Email-Send + dev-perl/Email-Valid + dev-perl/Net-DNS + dev-perl/Params-Validate + dev-perl/URI + virtual/perl-Data-Dumper + virtual/perl-Digest-MD5 + virtual/perl-Digest-SHA + virtual/perl-Getopt-Long + virtual/perl-MIME-Base64 + virtual/perl-Time-HiRes + virtual/perl-Time-Local +" +BDEPEND="app-text/txt2man" + +src_compile() { + txt2man -s 1 -t "swaks" -v "Mail tools" doc/ref.txt \ + > swaks.1 \ + || die "man page compilation failed" +} + +src_install() { + dobin swaks + doman swaks.1 + dodoc README.txt doc/*.txt +} + +pkg_postinst() { + optfeature "ssl" dev-perl/IO-Socket-SSL +} |